diff --git a/style_caliec/styles/multipolygon.qml b/style_caliec/styles/multipolygon.qml
index 2607f3f..087bf1d 100644
--- a/style_caliec/styles/multipolygon.qml
+++ b/style_caliec/styles/multipolygon.qml
@@ -1,31 +1,31 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis minScale="1e+08" simplifyDrawingHints="1" simplifyAlgorithm="0" version="3.10.4-A Coruña" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyLocal="1" styleCategories="AllStyleCategories" simplifyDrawingTol="1" labelsEnabled="1" simplifyMaxScale="1" readOnly="0">
+<qgis version="3.10.4-A Coruña" styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" minScale="1e+08" simplifyDrawingTol="1" simplifyLocal="1" simplifyMaxScale="1" readOnly="0" simplifyAlgorithm="0" labelsEnabled="1" maxScale="0" simplifyDrawingHints="1">
   <flags>
     <Identifiable>1</Identifiable>
     <Removable>1</Removable>
     <Searchable>1</Searchable>
   </flags>
-  <renderer-v2 type="RuleRenderer" symbollevels="1" forceraster="0" enableorderby="0">
+  <renderer-v2 forceraster="0" symbollevels="1" type="RuleRenderer" enableorderby="0">
     <rules key="{235a67ea-a656-47c2-91a1-3c94e2926f62}">
-      <rule label="bâtiment" symbol="0" key="{f69f1a82-2331-4139-9487-e27714a58a63}" filter="&quot;building&quot;&lt;>'' and &quot;building&quot;&lt;>'roof' and &quot;building&quot;&lt;>'school' and (&quot;wall&quot;&lt;>'no' or &quot;wall&quot; is null)"/>
-      <rule label="toit,auvent,préau" symbol="1" key="{8ebeef7b-d705-4058-a39e-7197da6c1e62}" filter="&quot;building&quot;='roof' or &quot;wall&quot;='no'"/>
-      <rule label="bâtiment scolaire" symbol="2" key="{7fac4521-2a9c-476d-b288-3d53f8fa735f}" filter="&quot;building&quot;='school' and (&quot;wall&quot;&lt;>'no' or &quot;wall&quot; is null)"/>
-      <rule label="cabanon" symbol="3" key="{bc2342be-b587-40e8-8c25-1043595b314d}" filter="&quot;building&quot;='shed'"/>
-      <rule label="terrain" symbol="4" key="{37c906be-b2ec-4cc7-aefc-9eb829be9a07}" filter="&quot;leisure&quot;='pitch'"/>
-      <rule label="herbe" symbol="5" key="{af8ca696-fc2e-4142-945a-24b6a15acc48}" filter="&quot;landuse&quot;='grass' or &quot;landuse&quot;='meadow' or &quot;natural&quot;='grassland' or &quot;natural&quot;='meadow' or &quot;surface&quot;='grass'"/>
-      <rule label="eau" symbol="6" key="{933821c2-969e-44c3-ac11-8153737ba71a}" filter="&quot;natural&quot;='water' or &quot;waterway&quot;='riverbank'"/>
-      <rule label="lit de rivière" symbol="7" key="{e91700e9-45b0-4885-8be1-33970cf2f64c}" filter="&quot;natural&quot;='shingle'"/>
-      <rule label="zone boisée" symbol="8" key="{d883fe46-fc8d-4155-bcc0-65764a0241bc}" filter="&quot;landuse&quot;='forest' or &quot;natural&quot;='wood'"/>
-      <rule label="jeux" symbol="9" key="{8c3c98f2-264c-476a-b640-821dcea5a4ca}" filter="&quot;leisure&quot;='playground'"/>
-      <rule label="parking" symbol="10" key="{e3686adf-ee38-49b7-8bd8-1cc388b5203c}" filter="&quot;amenity&quot;='parking'"/>
-      <rule label="champ" symbol="11" key="{b908d622-4193-4ced-8781-7bb5b8930e60}" filter="&quot;landuse&quot;='farmland'"/>
-      <rule label="sable compact" symbol="12" key="{91315a6f-0cbd-4c57-acbc-fbfaae87bbe8}" filter="&quot;surface&quot;='compacted'"/>
-      <rule label="jardin" symbol="13" key="{94f96529-7b1e-4ee8-9751-a52e1c01b8fd}" filter="&quot;leisure&quot;='garden'"/>
-      <rule label="chemin" symbol="14" key="{59fe37ca-9fe0-452d-b1ff-0bbb47e2c5f4}" filter="&quot;area:highway&quot;='path'"/>
+      <rule filter="&quot;building&quot;&lt;>'' and &quot;building&quot;&lt;>'roof' and &quot;building&quot;&lt;>'school' and (&quot;wall&quot;&lt;>'no' or &quot;wall&quot; is null)" label="bâtiment" symbol="0" key="{f69f1a82-2331-4139-9487-e27714a58a63}"/>
+      <rule filter="&quot;building&quot;='roof' or &quot;wall&quot;='no'" label="toit,auvent,préau" symbol="1" key="{8ebeef7b-d705-4058-a39e-7197da6c1e62}"/>
+      <rule filter="&quot;building&quot;='school' and (&quot;wall&quot;&lt;>'no' or &quot;wall&quot; is null)" label="bâtiment scolaire" symbol="2" key="{7fac4521-2a9c-476d-b288-3d53f8fa735f}"/>
+      <rule filter="&quot;building&quot;='shed'" label="cabanon" symbol="3" key="{bc2342be-b587-40e8-8c25-1043595b314d}"/>
+      <rule filter="&quot;leisure&quot;='pitch'" label="terrain" symbol="4" key="{37c906be-b2ec-4cc7-aefc-9eb829be9a07}"/>
+      <rule filter="&quot;landuse&quot;='grass' or &quot;landuse&quot;='meadow' or &quot;natural&quot;='grassland' or &quot;natural&quot;='meadow' or &quot;surface&quot;='grass'" label="herbe" symbol="5" key="{af8ca696-fc2e-4142-945a-24b6a15acc48}"/>
+      <rule filter="&quot;natural&quot;='water' or &quot;waterway&quot;='riverbank'" label="eau" symbol="6" key="{933821c2-969e-44c3-ac11-8153737ba71a}"/>
+      <rule filter="&quot;natural&quot;='shingle'" label="lit de rivière" symbol="7" key="{e91700e9-45b0-4885-8be1-33970cf2f64c}"/>
+      <rule filter="&quot;landuse&quot;='forest' or &quot;natural&quot;='wood'" label="zone boisée" symbol="8" key="{d883fe46-fc8d-4155-bcc0-65764a0241bc}"/>
+      <rule filter="&quot;leisure&quot;='playground'" label="jeux" symbol="9" key="{8c3c98f2-264c-476a-b640-821dcea5a4ca}"/>
+      <rule filter="&quot;amenity&quot;='parking'" label="parking" symbol="10" key="{e3686adf-ee38-49b7-8bd8-1cc388b5203c}"/>
+      <rule filter="&quot;landuse&quot;='farmland'" label="champ" symbol="11" key="{b908d622-4193-4ced-8781-7bb5b8930e60}"/>
+      <rule filter="&quot;surface&quot;='compacted'" label="sable compact" symbol="12" key="{91315a6f-0cbd-4c57-acbc-fbfaae87bbe8}"/>
+      <rule filter="&quot;leisure&quot;='garden'" label="jardin" symbol="13" key="{94f96529-7b1e-4ee8-9751-a52e1c01b8fd}"/>
+      <rule filter="&quot;area:highway&quot;='path'" label="chemin" symbol="14" key="{59fe37ca-9fe0-452d-b1ff-0bbb47e2c5f4}"/>
     </rules>
     <symbols>
-      <symbol type="fill" name="0" force_rhr="0" clip_to_extent="1" alpha="1">
-        <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+      <symbol alpha="1" name="0" type="fill" clip_to_extent="1" force_rhr="0">
+        <layer enabled="1" class="SimpleFill" locked="0" pass="20">
           <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
           <prop v="209,209,209,255" k="color"/>
           <prop v="bevel" k="joinstyle"/>
@@ -39,13 +39,13 @@
           <prop v="solid" k="style"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" locked="0" pass="0" class="LinePatternFill">
+        <layer enabled="1" class="LinePatternFill" locked="0" pass="20">
           <prop v="45" k="angle"/>
           <prop v="0,0,255,255" k="color"/>
           <prop v="1" k="distance"/>
@@ -61,13 +61,13 @@
           <prop v="MM" k="outline_width_unit"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <symbol type="line" name="@0@1" force_rhr="0" clip_to_extent="1" alpha="1">
-            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+          <symbol alpha="1" name="@0@1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
               <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"/>
@@ -86,17 +86,17 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol type="fill" name="1" force_rhr="0" clip_to_extent="1" alpha="0.5">
-        <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+      <symbol alpha="0.5" name="1" type="fill" clip_to_extent="1" force_rhr="0">
+        <layer enabled="1" class="SimpleFill" locked="0" pass="0">
           <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
           <prop v="229,229,229,128" k="color"/>
           <prop v="bevel" k="joinstyle"/>
@@ -110,13 +110,13 @@
           <prop v="solid" k="style"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" locked="0" pass="0" class="LinePatternFill">
+        <layer enabled="1" class="LinePatternFill" locked="0" pass="0">
           <prop v="45" k="angle"/>
           <prop v="0,0,0,255" k="color"/>
           <prop v="3" k="distance"/>
@@ -132,13 +132,13 @@
           <prop v="MM" k="outline_width_unit"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <symbol type="line" name="@1@1" force_rhr="0" clip_to_extent="1" alpha="1">
-            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+          <symbol alpha="1" name="@1@1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
               <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"/>
@@ -157,17 +157,17 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol type="fill" name="10" force_rhr="0" clip_to_extent="1" alpha="1">
-        <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+      <symbol alpha="1" name="10" type="fill" clip_to_extent="1" force_rhr="0">
+        <layer enabled="1" class="SimpleFill" locked="0" pass="0">
           <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
           <prop v="232,234,234,255" k="color"/>
           <prop v="bevel" k="joinstyle"/>
@@ -181,15 +181,15 @@
           <prop v="solid" k="style"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="fill" name="11" force_rhr="0" clip_to_extent="1" alpha="1">
-        <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+      <symbol alpha="1" name="11" type="fill" clip_to_extent="1" force_rhr="0">
+        <layer enabled="1" class="SimpleFill" locked="0" pass="0">
           <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
           <prop v="187,233,166,255" k="color"/>
           <prop v="bevel" k="joinstyle"/>
@@ -203,13 +203,13 @@
           <prop v="solid" k="style"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" locked="0" pass="0" class="SVGFill">
+        <layer enabled="1" class="SVGFill" locked="0" pass="0">
           <prop v="0" k="angle"/>
           <prop v="0,0,255,255" k="color"/>
           <prop v="35,35,35,255" k="outline_color"/>
@@ -224,13 +224,13 @@
           <prop v="6" k="width"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <symbol type="line" name="@11@1" force_rhr="0" clip_to_extent="1" alpha="1">
-            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+          <symbol alpha="1" name="@11@1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
               <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"/>
@@ -249,17 +249,17 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol type="fill" name="12" force_rhr="0" clip_to_extent="1" alpha="1">
-        <layer enabled="1" locked="0" pass="0" class="SVGFill">
+      <symbol alpha="1" name="12" type="fill" clip_to_extent="1" force_rhr="0">
+        <layer enabled="1" class="SVGFill" locked="0" pass="0">
           <prop v="0" k="angle"/>
           <prop v="183,72,75,255" k="color"/>
           <prop v="35,35,35,255" k="outline_color"/>
@@ -274,13 +274,13 @@
           <prop v="20" k="width"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <symbol type="line" name="@12@0" force_rhr="0" clip_to_extent="1" alpha="1">
-            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+          <symbol alpha="1" name="@12@0" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
               <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"/>
@@ -299,17 +299,17 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol type="fill" name="13" force_rhr="0" clip_to_extent="1" alpha="1">
-        <layer enabled="1" locked="0" pass="0" class="PointPatternFill">
+      <symbol alpha="1" name="13" type="fill" clip_to_extent="1" force_rhr="0">
+        <layer enabled="1" class="PointPatternFill" locked="0" pass="0">
           <prop v="1.2" k="displacement_x"/>
           <prop v="3x:0,0,0,0,0,0" k="displacement_x_map_unit_scale"/>
           <prop v="MM" k="displacement_x_unit"/>
@@ -332,13 +332,13 @@
           <prop v="MM" k="outline_width_unit"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <symbol type="marker" name="@13@0" force_rhr="0" clip_to_extent="1" alpha="1">
-            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+          <symbol alpha="1" name="@13@0" type="marker" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
               <prop v="0" k="angle"/>
               <prop v="77,175,74,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -359,15 +359,15 @@
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
-        <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+        <layer enabled="1" class="SimpleLine" locked="0" pass="0">
           <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"/>
@@ -386,15 +386,15 @@
           <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="fill" name="14" force_rhr="0" clip_to_extent="1" alpha="1">
-        <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+      <symbol alpha="1" name="14" type="fill" clip_to_extent="1" force_rhr="0">
+        <layer enabled="1" class="SimpleFill" locked="0" pass="0">
           <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
           <prop v="179,90,42,255" k="color"/>
           <prop v="bevel" k="joinstyle"/>
@@ -408,15 +408,15 @@
           <prop v="solid" k="style"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="fill" name="2" force_rhr="0" clip_to_extent="1" alpha="1">
-        <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+      <symbol alpha="1" name="2" type="fill" clip_to_extent="1" force_rhr="0">
+        <layer enabled="1" class="SimpleFill" locked="0" pass="0">
           <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
           <prop v="231,229,183,255" k="color"/>
           <prop v="bevel" k="joinstyle"/>
@@ -430,13 +430,13 @@
           <prop v="solid" k="style"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" locked="0" pass="0" class="LinePatternFill">
+        <layer enabled="1" class="LinePatternFill" locked="0" pass="0">
           <prop v="45" k="angle"/>
           <prop v="0,0,255,255" k="color"/>
           <prop v="1" k="distance"/>
@@ -452,13 +452,13 @@
           <prop v="MM" k="outline_width_unit"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <symbol type="line" name="@2@1" force_rhr="0" clip_to_extent="1" alpha="1">
-            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+          <symbol alpha="1" name="@2@1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
               <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"/>
@@ -477,17 +477,17 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol type="fill" name="3" force_rhr="0" clip_to_extent="1" alpha="1">
-        <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+      <symbol alpha="1" name="3" type="fill" clip_to_extent="1" force_rhr="0">
+        <layer enabled="1" class="SimpleFill" locked="0" pass="0">
           <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
           <prop v="187,169,2,255" k="color"/>
           <prop v="bevel" k="joinstyle"/>
@@ -501,13 +501,13 @@
           <prop v="solid" k="style"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" locked="0" pass="0" class="LinePatternFill">
+        <layer enabled="1" class="LinePatternFill" locked="0" pass="0">
           <prop v="45" k="angle"/>
           <prop v="55,126,184,255" k="color"/>
           <prop v="2" k="distance"/>
@@ -523,13 +523,13 @@
           <prop v="MM" k="outline_width_unit"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <symbol type="line" name="@3@1" force_rhr="0" clip_to_extent="1" alpha="1">
-            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+          <symbol alpha="1" name="@3@1" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
               <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"/>
@@ -548,15 +548,15 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
-        <layer enabled="1" locked="0" pass="0" class="LinePatternFill">
+        <layer enabled="1" class="LinePatternFill" locked="0" pass="0">
           <prop v="0" k="angle"/>
           <prop v="55,126,184,255" k="color"/>
           <prop v="2" k="distance"/>
@@ -572,13 +572,13 @@
           <prop v="MM" k="outline_width_unit"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <symbol type="line" name="@3@2" force_rhr="0" clip_to_extent="1" alpha="1">
-            <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+          <symbol alpha="1" name="@3@2" type="line" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
               <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"/>
@@ -597,15 +597,15 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
-        <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+        <layer enabled="1" class="SimpleLine" locked="0" pass="0">
           <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"/>
@@ -624,15 +624,15 @@
           <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="fill" name="4" force_rhr="0" clip_to_extent="1" alpha="1">
-        <layer enabled="1" locked="0" pass="10" class="SimpleFill">
+      <symbol alpha="1" name="4" type="fill" clip_to_extent="1" force_rhr="0">
+        <layer enabled="1" class="SimpleFill" locked="0" pass="10">
           <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"/>
@@ -646,15 +646,15 @@
           <prop v="no" k="style"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="fill" name="5" force_rhr="0" clip_to_extent="1" alpha="1">
-        <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+      <symbol alpha="1" name="5" type="fill" clip_to_extent="1" force_rhr="0">
+        <layer enabled="1" class="SimpleFill" locked="0" pass="0">
           <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
           <prop v="95,255,95,255" k="color"/>
           <prop v="bevel" k="joinstyle"/>
@@ -668,15 +668,15 @@
           <prop v="solid" k="style"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="fill" name="6" force_rhr="0" clip_to_extent="1" alpha="1">
-        <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+      <symbol alpha="1" name="6" type="fill" clip_to_extent="1" force_rhr="0">
+        <layer enabled="1" class="SimpleFill" locked="0" pass="0">
           <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
           <prop v="25,140,255,255" k="color"/>
           <prop v="bevel" k="joinstyle"/>
@@ -690,15 +690,15 @@
           <prop v="solid" k="style"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="fill" name="7" force_rhr="0" clip_to_extent="1" alpha="1">
-        <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+      <symbol alpha="1" name="7" type="fill" clip_to_extent="1" force_rhr="0">
+        <layer enabled="1" class="SimpleFill" locked="0" pass="0">
           <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
           <prop v="255,246,205,255" k="color"/>
           <prop v="bevel" k="joinstyle"/>
@@ -712,13 +712,13 @@
           <prop v="solid" k="style"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" locked="0" pass="0" class="PointPatternFill">
+        <layer enabled="1" class="PointPatternFill" locked="0" pass="0">
           <prop v="1.2" k="displacement_x"/>
           <prop v="3x:0,0,0,0,0,0" k="displacement_x_map_unit_scale"/>
           <prop v="MM" k="displacement_x_unit"/>
@@ -741,13 +741,13 @@
           <prop v="MM" k="outline_width_unit"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <symbol type="marker" name="@7@1" force_rhr="0" clip_to_extent="1" alpha="1">
-            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+          <symbol alpha="1" name="@7@1" type="marker" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
               <prop v="0" k="angle"/>
               <prop v="0,0,0,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -768,15 +768,15 @@
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
-        <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+        <layer enabled="1" class="SimpleLine" locked="0" pass="0">
           <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"/>
@@ -795,15 +795,15 @@
           <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol type="fill" name="8" force_rhr="0" clip_to_extent="1" alpha="1">
-        <layer enabled="1" locked="0" pass="0" class="SimpleFill">
+      <symbol alpha="1" name="8" type="fill" clip_to_extent="1" force_rhr="0">
+        <layer enabled="1" class="SimpleFill" locked="0" pass="0">
           <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
           <prop v="0,142,54,255" k="color"/>
           <prop v="bevel" k="joinstyle"/>
@@ -817,13 +817,13 @@
           <prop v="solid" k="style"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" locked="0" pass="0" class="PointPatternFill">
+        <layer enabled="1" class="PointPatternFill" locked="0" pass="0">
           <prop v="1.2" k="displacement_x"/>
           <prop v="3x:0,0,0,0,0,0" k="displacement_x_map_unit_scale"/>
           <prop v="MM" k="displacement_x_unit"/>
@@ -846,13 +846,13 @@
           <prop v="MM" k="outline_width_unit"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <symbol type="marker" name="@8@1" force_rhr="0" clip_to_extent="1" alpha="1">
-            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+          <symbol alpha="1" name="@8@1" type="marker" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
               <prop v="0" k="angle"/>
               <prop v="77,175,74,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -873,17 +873,17 @@
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
       </symbol>
-      <symbol type="fill" name="9" force_rhr="0" clip_to_extent="1" alpha="1">
-        <layer enabled="1" locked="0" pass="10" class="SimpleFill">
+      <symbol alpha="1" name="9" type="fill" clip_to_extent="1" force_rhr="0">
+        <layer enabled="1" class="SimpleFill" locked="0" pass="10">
           <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
           <prop v="127,255,211,255" k="color"/>
           <prop v="bevel" k="joinstyle"/>
@@ -897,13 +897,13 @@
           <prop v="solid" k="style"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
         </layer>
-        <layer enabled="1" locked="0" pass="10" class="PointPatternFill">
+        <layer enabled="1" class="PointPatternFill" locked="0" pass="10">
           <prop v="1.2" k="displacement_x"/>
           <prop v="3x:0,0,0,0,0,0" k="displacement_x_map_unit_scale"/>
           <prop v="MM" k="displacement_x_unit"/>
@@ -926,13 +926,13 @@
           <prop v="MM" k="outline_width_unit"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <symbol type="marker" name="@9@1" force_rhr="0" clip_to_extent="1" alpha="1">
-            <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+          <symbol alpha="1" name="@9@1" type="marker" clip_to_extent="1" force_rhr="0">
+            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
               <prop v="0" k="angle"/>
               <prop v="77,175,74,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
@@ -953,15 +953,15 @@
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </layer>
-        <layer enabled="1" locked="0" pass="10" class="SimpleLine">
+        <layer enabled="1" class="SimpleLine" locked="0" pass="10">
           <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"/>
@@ -980,9 +980,9 @@
           <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -990,14 +990,14 @@
     </symbols>
   </renderer-v2>
   <labeling type="rule-based">
-    <rules key="{e09f3f8b-2b05-4ff1-8048-a6bd42882ae4}">
-      <rule description="parking" key="{31695add-b3f9-40c5-bfef-eb7070217b8d}" filter="&quot;amenity&quot;='parking'">
+    <rules key="{268c98db-f83d-4643-a9ef-e4bd467f6b2f}">
+      <rule description="parking" filter="&quot;amenity&quot;='parking'" key="{9392b38f-1d27-4d17-9225-6ed63382eb50}">
         <settings calloutType="simple">
-          <text-style textColor="0,149,255,255" fontKerning="1" previewBkgrdColor="255,255,255,255" textOpacity="1" fontSizeUnit="MapUnit" multilineHeight="1" fontItalic="0" textOrientation="horizontal" fontLetterSpacing="0" fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fieldName="'P'" fontSize="10" useSubstitutions="0" fontWeight="75" fontUnderline="0" namedStyle="Bold" fontFamily="Liberation Sans" fontCapitals="0" fontWordSpacing="0" blendMode="0" isExpression="1">
-            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferBlendMode="0" bufferSizeUnits="MM" bufferNoFill="1" bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferOpacity="1" bufferSize="1"/>
-            <background shapeOffsetY="0" shapeType="0" shapeOffsetUnit="MM" shapeSVGFile="" shapeRadiiY="0" shapeRotationType="0" shapeJoinStyle="64" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeBlendMode="0" shapeSizeType="0" shapeDraw="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeSizeX="0" shapeBorderWidth="0" shapeSizeY="0" shapeRotation="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeOffsetX="0">
-              <symbol type="marker" name="markerSymbol" force_rhr="0" clip_to_extent="1" alpha="1">
-                <layer enabled="1" locked="0" pass="0" class="SimpleMarker">
+          <text-style textOrientation="horizontal" fontLetterSpacing="0" fontFamily="Liberation Sans" fieldName="'P'" fontKerning="1" fontSize="10" fontUnderline="0" fontWeight="75" fontWordSpacing="0" previewBkgrdColor="255,255,255,255" fontItalic="0" useSubstitutions="0" namedStyle="Bold" fontSizeUnit="MapUnit" fontStrikeout="0" multilineHeight="1" textOpacity="1" fontCapitals="0" isExpression="1" blendMode="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textColor="0,149,255,255">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSize="1" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferJoinStyle="128"/>
+            <background shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeDraw="0" shapeType="0" shapeSizeUnit="MM" shapeRotationType="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeRadiiX="0" shapeFillColor="255,255,255,255" shapeSizeType="0" shapeRadiiY="0" shapeJoinStyle="64" shapeOffsetX="0">
+              <symbol alpha="1" name="markerSymbol" type="marker" clip_to_extent="1" force_rhr="0">
+                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
                   <prop v="0" k="angle"/>
                   <prop v="164,113,88,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -1018,54 +1018,54 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowDraw="0" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetGlobal="1" shadowRadius="1.5" shadowScale="100"/>
+            <shadow shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.7" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowScale="100" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadius="1.5" shadowOffsetDist="1" shadowOffsetGlobal="1"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format rightDirectionSymbol=">" addDirectionSymbol="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" plussign="0" autoWrapLength="0" useMaxLineLengthForAutoWrap="1" decimals="3" wrapChar="" multilineAlign="0" formatNumbers="0" placeDirectionSymbol="0"/>
-          <placement distMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" overrunDistance="0" fitInPolygonOnly="0" yOffset="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" repeatDistanceUnits="MM" quadOffset="4" maxCurvedCharAngleOut="-25" rotationAngle="0" xOffset="0" maxCurvedCharAngleIn="25" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" dist="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" geometryGenerator="" layerType="PolygonGeometry" geometryGeneratorType="PointGeometry" distUnits="MM" priority="5" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" placement="0" geometryGeneratorEnabled="0" preserveRotation="1" placementFlags="10" overrunDistanceUnit="MM"/>
-          <rendering labelPerPart="0" limitNumLabels="0" scaleMax="0" obstacle="1" displayAll="0" fontMinPixelSize="3" upsidedownLabels="0" scaleMin="0" fontMaxPixelSize="10000" mergeLines="0" zIndex="0" scaleVisibility="0" fontLimitPixelSize="0" obstacleType="0" maxNumLabels="2000" obstacleFactor="1" drawLabels="1" minFeatureSize="0"/>
+          <text-format addDirectionSymbol="0" placeDirectionSymbol="0" rightDirectionSymbol=">" leftDirectionSymbol="&lt;" formatNumbers="0" useMaxLineLengthForAutoWrap="1" decimals="3" reverseDirectionSymbol="0" autoWrapLength="0" multilineAlign="0" plussign="0" wrapChar=""/>
+          <placement repeatDistanceUnits="MM" centroidInside="0" dist="0" maxCurvedCharAngleOut="-25" offsetType="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" geometryGeneratorType="PointGeometry" placement="0" yOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" geometryGeneratorEnabled="0" offsetUnits="MM" centroidWhole="0" priority="5" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" preserveRotation="1" distUnits="MM" layerType="PolygonGeometry" repeatDistance="0" rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placementFlags="10" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" overrunDistance="0"/>
+          <rendering scaleMax="0" zIndex="0" scaleVisibility="0" labelPerPart="0" drawLabels="1" upsidedownLabels="0" obstacleType="0" fontMinPixelSize="3" scaleMin="0" obstacle="1" limitNumLabels="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" maxNumLabels="2000" obstacleFactor="1" mergeLines="0" displayAll="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+              <Option name="anchorPoint" value="pole_of_inaccessibility" type="QString"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="&lt;symbol type=&quot;line&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot;>&lt;layer enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot;>&lt;prop 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 value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option name="drawToAllParts" value="false" type="bool"/>
+              <Option name="enabled" value="0" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol alpha=&quot;1&quot; name=&quot;symbol&quot; type=&quot;line&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot;>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&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 name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="minLength" value="0" type="double"/>
+              <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="minLengthUnit" value="MM" type="QString"/>
+              <Option name="offsetFromAnchor" value="0" type="double"/>
+              <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+              <Option name="offsetFromLabel" value="0" type="double"/>
+              <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+              <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
             </Option>
           </callout>
         </settings>
@@ -1131,28 +1131,28 @@
   <blendMode>0</blendMode>
   <featureBlendMode>0</featureBlendMode>
   <layerOpacity>1</layerOpacity>
-  <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-    <DiagramCategory maxScaleDenominator="1e+08" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" lineSizeType="MM" rotationOffset="270" enabled="0" penColor="#000000" minScaleDenominator="0" width="15" sizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" sizeType="MM" height="15" penWidth="0" diagramOrientation="Up" penAlpha="255" backgroundColor="#ffffff" barWidth="5" scaleBasedVisibility="0" labelPlacementMethod="XHeight" minimumSize="0">
+  <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+    <DiagramCategory backgroundColor="#ffffff" penAlpha="255" minScaleDenominator="0" scaleDependency="Area" minimumSize="0" rotationOffset="270" penWidth="0" height="15" lineSizeType="MM" width="15" opacity="1" enabled="0" sizeType="MM" maxScaleDenominator="1e+08" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" penColor="#000000" barWidth="5" backgroundAlpha="255">
       <fontProperties description="Liberation Sans,10,-1,5,50,0,0,0,0,0" style=""/>
-      <attribute color="#000000" field="" label=""/>
+      <attribute field="" label="" color="#000000"/>
     </DiagramCategory>
   </SingleCategoryDiagramRenderer>
-  <DiagramLayerSettings zIndex="0" linePlacementFlags="18" obstacle="0" showAll="1" priority="0" dist="0" placement="1">
+  <DiagramLayerSettings priority="0" showAll="1" zIndex="0" placement="1" linePlacementFlags="18" dist="0" obstacle="0">
     <properties>
       <Option type="Map">
-        <Option value="" type="QString" name="name"/>
+        <Option name="name" value="" type="QString"/>
         <Option name="properties"/>
-        <Option value="collection" type="QString" name="type"/>
+        <Option name="type" value="collection" type="QString"/>
       </Option>
     </properties>
   </DiagramLayerSettings>
   <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
     <activeChecks/>
     <checkConfiguration type="Map">
-      <Option type="Map" name="QgsGeometryGapCheck">
-        <Option value="0" type="double" name="allowedGapsBuffer"/>
-        <Option value="false" type="bool" name="allowedGapsEnabled"/>
-        <Option value="" type="QString" name="allowedGapsLayer"/>
+      <Option name="QgsGeometryGapCheck" type="Map">
+        <Option name="allowedGapsBuffer" value="0" type="double"/>
+        <Option name="allowedGapsEnabled" value="false" type="bool"/>
+        <Option name="allowedGapsLayer" value="" type="QString"/>
       </Option>
     </checkConfiguration>
   </geometryOptions>
@@ -1339,154 +1339,14 @@
         </config>
       </editWidget>
     </field>
-    <field name="school:FR">
+    <field name="material">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="ref:UAI">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="phone">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="operator:type">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="opening_hours">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="contact:street">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="contact:housenumber">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="check_date:opening_hours">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="addr:street">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="addr:postcode">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="addr:housenumber">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="addr:city">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="fee">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="access">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="surface">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="highway">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="roof:shape">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="roof:levels">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="description">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="building:levels">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="wall">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="leaf_type">
+    <field name="emergency">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -1514,42 +1374,112 @@
         </config>
       </editWidget>
     </field>
-    <field name="wikipedia">
+    <field name="capacity">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="wikidata">
+    <field name="parking">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="start_date">
+    <field name="highway">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="source:url">
+    <field name="surface">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="ref:INSEE">
+    <field name="leaf_type">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="political_division">
+    <field name="wheelchair">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="wall">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="building:min_level">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="building:levels">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="roof:shape">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="roof:material">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="water">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="supervised">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="fee">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="description">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="access">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -1584,301 +1514,251 @@
     <alias name="" field="sport" index="23"/>
     <alias name="" field="tourism" index="24"/>
     <alias name="" field="other_tags" index="25"/>
-    <alias name="" field="school:FR" index="26"/>
-    <alias name="" field="ref:UAI" index="27"/>
-    <alias name="" field="phone" index="28"/>
-    <alias name="" field="operator:type" index="29"/>
-    <alias name="" field="opening_hours" index="30"/>
-    <alias name="" field="contact:street" index="31"/>
-    <alias name="" field="contact:housenumber" index="32"/>
-    <alias name="" field="check_date:opening_hours" index="33"/>
-    <alias name="" field="addr:street" index="34"/>
-    <alias name="" field="addr:postcode" index="35"/>
-    <alias name="" field="addr:housenumber" index="36"/>
-    <alias name="" field="addr:city" index="37"/>
-    <alias name="" field="fee" index="38"/>
-    <alias name="" field="access" index="39"/>
-    <alias name="" field="surface" index="40"/>
-    <alias name="" field="highway" index="41"/>
-    <alias name="" field="roof:shape" index="42"/>
-    <alias name="" field="roof:levels" index="43"/>
-    <alias name="" field="description" index="44"/>
-    <alias name="" field="building:levels" index="45"/>
-    <alias name="" field="wall" index="46"/>
-    <alias name="" field="leaf_type" index="47"/>
-    <alias name="" field="CLC:year" index="48"/>
-    <alias name="" field="CLC:id" index="49"/>
-    <alias name="" field="CLC:code" index="50"/>
-    <alias name="" field="wikipedia" index="51"/>
-    <alias name="" field="wikidata" index="52"/>
-    <alias name="" field="start_date" index="53"/>
-    <alias name="" field="source:url" index="54"/>
-    <alias name="" field="ref:INSEE" index="55"/>
-    <alias name="" field="political_division" index="56"/>
+    <alias name="" field="material" index="26"/>
+    <alias name="" field="emergency" index="27"/>
+    <alias name="" field="CLC:year" index="28"/>
+    <alias name="" field="CLC:id" index="29"/>
+    <alias name="" field="CLC:code" index="30"/>
+    <alias name="" field="capacity" index="31"/>
+    <alias name="" field="parking" index="32"/>
+    <alias name="" field="highway" index="33"/>
+    <alias name="" field="surface" index="34"/>
+    <alias name="" field="leaf_type" index="35"/>
+    <alias name="" field="wheelchair" index="36"/>
+    <alias name="" field="wall" index="37"/>
+    <alias name="" field="building:min_level" index="38"/>
+    <alias name="" field="building:levels" index="39"/>
+    <alias name="" field="roof:shape" index="40"/>
+    <alias name="" field="roof:material" index="41"/>
+    <alias name="" field="water" index="42"/>
+    <alias name="" field="supervised" index="43"/>
+    <alias name="" field="fee" index="44"/>
+    <alias name="" field="description" index="45"/>
+    <alias name="" field="access" index="46"/>
   </aliases>
   <excludeAttributesWMS/>
   <excludeAttributesWFS/>
   <defaults>
-    <default field="fid" expression="" applyOnUpdate="0"/>
-    <default field="osm_id" expression="" applyOnUpdate="0"/>
-    <default field="osm_way_id" expression="" applyOnUpdate="0"/>
-    <default field="name" expression="" applyOnUpdate="0"/>
-    <default field="type" expression="" applyOnUpdate="0"/>
-    <default field="aeroway" expression="" applyOnUpdate="0"/>
-    <default field="amenity" expression="" applyOnUpdate="0"/>
-    <default field="admin_level" expression="" applyOnUpdate="0"/>
-    <default field="barrier" expression="" applyOnUpdate="0"/>
-    <default field="boundary" expression="" applyOnUpdate="0"/>
-    <default field="building" expression="" applyOnUpdate="0"/>
-    <default field="craft" expression="" applyOnUpdate="0"/>
-    <default field="geological" expression="" applyOnUpdate="0"/>
-    <default field="historic" expression="" applyOnUpdate="0"/>
-    <default field="land_area" expression="" applyOnUpdate="0"/>
-    <default field="landuse" expression="" applyOnUpdate="0"/>
-    <default field="leisure" expression="" applyOnUpdate="0"/>
-    <default field="man_made" expression="" applyOnUpdate="0"/>
-    <default field="military" expression="" applyOnUpdate="0"/>
-    <default field="natural" expression="" applyOnUpdate="0"/>
-    <default field="office" expression="" applyOnUpdate="0"/>
-    <default field="place" expression="" applyOnUpdate="0"/>
-    <default field="shop" expression="" applyOnUpdate="0"/>
-    <default field="sport" expression="" applyOnUpdate="0"/>
-    <default field="tourism" expression="" applyOnUpdate="0"/>
-    <default field="other_tags" expression="" applyOnUpdate="0"/>
-    <default field="school:FR" expression="" applyOnUpdate="0"/>
-    <default field="ref:UAI" expression="" applyOnUpdate="0"/>
-    <default field="phone" expression="" applyOnUpdate="0"/>
-    <default field="operator:type" expression="" applyOnUpdate="0"/>
-    <default field="opening_hours" expression="" applyOnUpdate="0"/>
-    <default field="contact:street" expression="" applyOnUpdate="0"/>
-    <default field="contact:housenumber" expression="" applyOnUpdate="0"/>
-    <default field="check_date:opening_hours" expression="" applyOnUpdate="0"/>
-    <default field="addr:street" expression="" applyOnUpdate="0"/>
-    <default field="addr:postcode" expression="" applyOnUpdate="0"/>
-    <default field="addr:housenumber" expression="" applyOnUpdate="0"/>
-    <default field="addr:city" expression="" applyOnUpdate="0"/>
-    <default field="fee" expression="" applyOnUpdate="0"/>
-    <default field="access" expression="" applyOnUpdate="0"/>
-    <default field="surface" expression="" applyOnUpdate="0"/>
-    <default field="highway" expression="" applyOnUpdate="0"/>
-    <default field="roof:shape" expression="" applyOnUpdate="0"/>
-    <default field="roof:levels" expression="" applyOnUpdate="0"/>
-    <default field="description" expression="" applyOnUpdate="0"/>
-    <default field="building:levels" expression="" applyOnUpdate="0"/>
-    <default field="wall" expression="" applyOnUpdate="0"/>
-    <default field="leaf_type" expression="" applyOnUpdate="0"/>
-    <default field="CLC:year" expression="" applyOnUpdate="0"/>
-    <default field="CLC:id" expression="" applyOnUpdate="0"/>
-    <default field="CLC:code" expression="" applyOnUpdate="0"/>
-    <default field="wikipedia" expression="" applyOnUpdate="0"/>
-    <default field="wikidata" expression="" applyOnUpdate="0"/>
-    <default field="start_date" expression="" applyOnUpdate="0"/>
-    <default field="source:url" expression="" applyOnUpdate="0"/>
-    <default field="ref:INSEE" expression="" applyOnUpdate="0"/>
-    <default field="political_division" expression="" applyOnUpdate="0"/>
+    <default applyOnUpdate="0" field="fid" expression=""/>
+    <default applyOnUpdate="0" field="osm_id" expression=""/>
+    <default applyOnUpdate="0" field="osm_way_id" expression=""/>
+    <default applyOnUpdate="0" field="name" expression=""/>
+    <default applyOnUpdate="0" field="type" expression=""/>
+    <default applyOnUpdate="0" field="aeroway" expression=""/>
+    <default applyOnUpdate="0" field="amenity" expression=""/>
+    <default applyOnUpdate="0" field="admin_level" expression=""/>
+    <default applyOnUpdate="0" field="barrier" expression=""/>
+    <default applyOnUpdate="0" field="boundary" expression=""/>
+    <default applyOnUpdate="0" field="building" expression=""/>
+    <default applyOnUpdate="0" field="craft" expression=""/>
+    <default applyOnUpdate="0" field="geological" expression=""/>
+    <default applyOnUpdate="0" field="historic" expression=""/>
+    <default applyOnUpdate="0" field="land_area" expression=""/>
+    <default applyOnUpdate="0" field="landuse" expression=""/>
+    <default applyOnUpdate="0" field="leisure" expression=""/>
+    <default applyOnUpdate="0" field="man_made" expression=""/>
+    <default applyOnUpdate="0" field="military" expression=""/>
+    <default applyOnUpdate="0" field="natural" expression=""/>
+    <default applyOnUpdate="0" field="office" expression=""/>
+    <default applyOnUpdate="0" field="place" expression=""/>
+    <default applyOnUpdate="0" field="shop" expression=""/>
+    <default applyOnUpdate="0" field="sport" expression=""/>
+    <default applyOnUpdate="0" field="tourism" expression=""/>
+    <default applyOnUpdate="0" field="other_tags" expression=""/>
+    <default applyOnUpdate="0" field="material" expression=""/>
+    <default applyOnUpdate="0" field="emergency" expression=""/>
+    <default applyOnUpdate="0" field="CLC:year" expression=""/>
+    <default applyOnUpdate="0" field="CLC:id" expression=""/>
+    <default applyOnUpdate="0" field="CLC:code" expression=""/>
+    <default applyOnUpdate="0" field="capacity" expression=""/>
+    <default applyOnUpdate="0" field="parking" expression=""/>
+    <default applyOnUpdate="0" field="highway" expression=""/>
+    <default applyOnUpdate="0" field="surface" expression=""/>
+    <default applyOnUpdate="0" field="leaf_type" expression=""/>
+    <default applyOnUpdate="0" field="wheelchair" expression=""/>
+    <default applyOnUpdate="0" field="wall" expression=""/>
+    <default applyOnUpdate="0" field="building:min_level" expression=""/>
+    <default applyOnUpdate="0" field="building:levels" expression=""/>
+    <default applyOnUpdate="0" field="roof:shape" expression=""/>
+    <default applyOnUpdate="0" field="roof:material" expression=""/>
+    <default applyOnUpdate="0" field="water" expression=""/>
+    <default applyOnUpdate="0" field="supervised" expression=""/>
+    <default applyOnUpdate="0" field="fee" expression=""/>
+    <default applyOnUpdate="0" field="description" expression=""/>
+    <default applyOnUpdate="0" field="access" expression=""/>
   </defaults>
   <constraints>
-    <constraint exp_strength="0" field="fid" constraints="3" unique_strength="1" notnull_strength="1"/>
-    <constraint exp_strength="0" field="osm_id" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="osm_way_id" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="name" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="type" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="aeroway" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="amenity" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="admin_level" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="barrier" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="boundary" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="building" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="craft" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="geological" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="historic" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="land_area" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="landuse" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="leisure" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="man_made" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="military" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="natural" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="office" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="place" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="shop" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="sport" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="tourism" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="other_tags" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="school:FR" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="ref:UAI" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="phone" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="operator:type" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="opening_hours" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="contact:street" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="contact:housenumber" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="check_date:opening_hours" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="addr:street" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="addr:postcode" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="addr:housenumber" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="addr:city" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="fee" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="access" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="surface" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="highway" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="roof:shape" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="roof:levels" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="description" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="building:levels" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="wall" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="leaf_type" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="CLC:year" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="CLC:id" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="CLC:code" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="wikipedia" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="wikidata" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="start_date" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="source:url" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="ref:INSEE" constraints="0" unique_strength="0" notnull_strength="0"/>
-    <constraint exp_strength="0" field="political_division" constraints="0" unique_strength="0" notnull_strength="0"/>
+    <constraint unique_strength="1" notnull_strength="1" constraints="3" field="fid" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="osm_id" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="osm_way_id" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="name" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="type" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="aeroway" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="amenity" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="admin_level" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="barrier" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="boundary" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="building" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="craft" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="geological" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="historic" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="land_area" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="landuse" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="leisure" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="man_made" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="military" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="natural" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="office" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="place" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="shop" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="sport" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="tourism" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="other_tags" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="material" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="emergency" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="CLC:year" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="CLC:id" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="CLC:code" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="capacity" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="parking" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="highway" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="surface" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="leaf_type" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="wheelchair" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="wall" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="building:min_level" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="building:levels" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="roof:shape" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="roof:material" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="water" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="supervised" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="fee" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="description" exp_strength="0"/>
+    <constraint unique_strength="0" notnull_strength="0" constraints="0" field="access" exp_strength="0"/>
   </constraints>
   <constraintExpressions>
-    <constraint field="fid" desc="" exp=""/>
-    <constraint field="osm_id" desc="" exp=""/>
-    <constraint field="osm_way_id" desc="" exp=""/>
-    <constraint field="name" desc="" exp=""/>
-    <constraint field="type" desc="" exp=""/>
-    <constraint field="aeroway" desc="" exp=""/>
-    <constraint field="amenity" desc="" exp=""/>
-    <constraint field="admin_level" desc="" exp=""/>
-    <constraint field="barrier" desc="" exp=""/>
-    <constraint field="boundary" desc="" exp=""/>
-    <constraint field="building" desc="" exp=""/>
-    <constraint field="craft" desc="" exp=""/>
-    <constraint field="geological" desc="" exp=""/>
-    <constraint field="historic" desc="" exp=""/>
-    <constraint field="land_area" desc="" exp=""/>
-    <constraint field="landuse" desc="" exp=""/>
-    <constraint field="leisure" desc="" exp=""/>
-    <constraint field="man_made" desc="" exp=""/>
-    <constraint field="military" desc="" exp=""/>
-    <constraint field="natural" desc="" exp=""/>
-    <constraint field="office" desc="" exp=""/>
-    <constraint field="place" desc="" exp=""/>
-    <constraint field="shop" desc="" exp=""/>
-    <constraint field="sport" desc="" exp=""/>
-    <constraint field="tourism" desc="" exp=""/>
-    <constraint field="other_tags" desc="" exp=""/>
-    <constraint field="school:FR" desc="" exp=""/>
-    <constraint field="ref:UAI" desc="" exp=""/>
-    <constraint field="phone" desc="" exp=""/>
-    <constraint field="operator:type" desc="" exp=""/>
-    <constraint field="opening_hours" desc="" exp=""/>
-    <constraint field="contact:street" desc="" exp=""/>
-    <constraint field="contact:housenumber" desc="" exp=""/>
-    <constraint field="check_date:opening_hours" desc="" exp=""/>
-    <constraint field="addr:street" desc="" exp=""/>
-    <constraint field="addr:postcode" desc="" exp=""/>
-    <constraint field="addr:housenumber" desc="" exp=""/>
-    <constraint field="addr:city" desc="" exp=""/>
-    <constraint field="fee" desc="" exp=""/>
-    <constraint field="access" desc="" exp=""/>
-    <constraint field="surface" desc="" exp=""/>
-    <constraint field="highway" desc="" exp=""/>
-    <constraint field="roof:shape" desc="" exp=""/>
-    <constraint field="roof:levels" desc="" exp=""/>
-    <constraint field="description" desc="" exp=""/>
-    <constraint field="building:levels" desc="" exp=""/>
-    <constraint field="wall" desc="" exp=""/>
-    <constraint field="leaf_type" desc="" exp=""/>
-    <constraint field="CLC:year" desc="" exp=""/>
-    <constraint field="CLC:id" desc="" exp=""/>
-    <constraint field="CLC:code" desc="" exp=""/>
-    <constraint field="wikipedia" desc="" exp=""/>
-    <constraint field="wikidata" desc="" exp=""/>
-    <constraint field="start_date" desc="" exp=""/>
-    <constraint field="source:url" desc="" exp=""/>
-    <constraint field="ref:INSEE" desc="" exp=""/>
-    <constraint field="political_division" desc="" exp=""/>
+    <constraint exp="" desc="" field="fid"/>
+    <constraint exp="" desc="" field="osm_id"/>
+    <constraint exp="" desc="" field="osm_way_id"/>
+    <constraint exp="" desc="" field="name"/>
+    <constraint exp="" desc="" field="type"/>
+    <constraint exp="" desc="" field="aeroway"/>
+    <constraint exp="" desc="" field="amenity"/>
+    <constraint exp="" desc="" field="admin_level"/>
+    <constraint exp="" desc="" field="barrier"/>
+    <constraint exp="" desc="" field="boundary"/>
+    <constraint exp="" desc="" field="building"/>
+    <constraint exp="" desc="" field="craft"/>
+    <constraint exp="" desc="" field="geological"/>
+    <constraint exp="" desc="" field="historic"/>
+    <constraint exp="" desc="" field="land_area"/>
+    <constraint exp="" desc="" field="landuse"/>
+    <constraint exp="" desc="" field="leisure"/>
+    <constraint exp="" desc="" field="man_made"/>
+    <constraint exp="" desc="" field="military"/>
+    <constraint exp="" desc="" field="natural"/>
+    <constraint exp="" desc="" field="office"/>
+    <constraint exp="" desc="" field="place"/>
+    <constraint exp="" desc="" field="shop"/>
+    <constraint exp="" desc="" field="sport"/>
+    <constraint exp="" desc="" field="tourism"/>
+    <constraint exp="" desc="" field="other_tags"/>
+    <constraint exp="" desc="" field="material"/>
+    <constraint exp="" desc="" field="emergency"/>
+    <constraint exp="" desc="" field="CLC:year"/>
+    <constraint exp="" desc="" field="CLC:id"/>
+    <constraint exp="" desc="" field="CLC:code"/>
+    <constraint exp="" desc="" field="capacity"/>
+    <constraint exp="" desc="" field="parking"/>
+    <constraint exp="" desc="" field="highway"/>
+    <constraint exp="" desc="" field="surface"/>
+    <constraint exp="" desc="" field="leaf_type"/>
+    <constraint exp="" desc="" field="wheelchair"/>
+    <constraint exp="" desc="" field="wall"/>
+    <constraint exp="" desc="" field="building:min_level"/>
+    <constraint exp="" desc="" field="building:levels"/>
+    <constraint exp="" desc="" field="roof:shape"/>
+    <constraint exp="" desc="" field="roof:material"/>
+    <constraint exp="" desc="" field="water"/>
+    <constraint exp="" desc="" field="supervised"/>
+    <constraint exp="" desc="" field="fee"/>
+    <constraint exp="" desc="" field="description"/>
+    <constraint exp="" desc="" field="access"/>
   </constraintExpressions>
   <expressionfields/>
   <attributeactions>
     <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
-    <actionsetting id="{227521d1-4b79-4959-99c8-2ed5d0bdd1a7}" type="5" shortTitle="OpenStreetMap Browser" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]" capture="0" name="OpenStreetMap Browser" isEnabledOnlyWhenEditable="0" notificationMessage="" icon="">
-      <actionScope id="Field"/>
+    <actionsetting name="OpenStreetMap Browser" notificationMessage="" shortTitle="OpenStreetMap Browser" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]" capture="0" icon="" type="5" id="{c1826141-af65-4158-9d0c-0f99a31810aa}" isEnabledOnlyWhenEditable="0">
       <actionScope id="Canvas"/>
+      <actionScope id="Field"/>
       <actionScope id="Feature"/>
     </actionsetting>
-    <actionsetting id="{a995edb6-7e7a-456d-9513-86e20eceec69}" type="1" shortTitle="Mapillary" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;mapillary&quot;,&quot;[% &quot;mapillary&quot; %]&quot;)" capture="0" name="Mapillary" isEnabledOnlyWhenEditable="0" notificationMessage="" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/mapillary_logo.svg">
-      <actionScope id="Field"/>
+    <actionsetting name="Mapillary" notificationMessage="" shortTitle="Mapillary" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;mapillary&quot;,&quot;[% &quot;mapillary&quot; %]&quot;)" capture="0" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/mapillary_logo.svg" type="1" id="{79012363-ee5d-4f7d-826b-3ef89370b129}" isEnabledOnlyWhenEditable="0">
       <actionScope id="Canvas"/>
+      <actionScope id="Field"/>
       <actionScope id="Feature"/>
     </actionsetting>
-    <actionsetting id="{27474191-0fec-4415-b2fc-c98ca38e0827}" type="1" shortTitle="JOSM" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;josm&quot;,&quot;[% &quot;full_id&quot; %]&quot;)" capture="0" name="JOSM" isEnabledOnlyWhenEditable="0" notificationMessage="" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/josm_icon.svg">
-      <actionScope id="Field"/>
+    <actionsetting name="JOSM" notificationMessage="" shortTitle="JOSM" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;josm&quot;,&quot;[% &quot;full_id&quot; %]&quot;)" capture="0" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/josm_icon.svg" type="1" id="{5b0314d7-d914-4fa3-b7bd-feb8d0edf010}" isEnabledOnlyWhenEditable="0">
       <actionScope id="Canvas"/>
+      <actionScope id="Field"/>
       <actionScope id="Feature"/>
     </actionsetting>
-    <actionsetting id="{86656a68-2776-42a6-a2d1-f932d0d7838b}" type="5" shortTitle="User default editor" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]" capture="0" name="User default editor" isEnabledOnlyWhenEditable="0" notificationMessage="" icon="">
-      <actionScope id="Field"/>
+    <actionsetting name="User default editor" notificationMessage="" shortTitle="User default editor" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]" capture="0" icon="" type="5" id="{e0be7a76-e295-4b26-85a3-8c08e2b24abc}" isEnabledOnlyWhenEditable="0">
       <actionScope id="Canvas"/>
+      <actionScope id="Field"/>
       <actionScope id="Feature"/>
     </actionsetting>
   </attributeactions>
   <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
     <columns>
-      <column type="field" name="osm_id" hidden="0" width="-1"/>
-      <column type="field" name="building" hidden="0" width="-1"/>
-      <column type="actions" hidden="1" width="-1"/>
-      <column type="field" name="name" hidden="0" width="-1"/>
-      <column type="field" name="leisure" hidden="0" width="-1"/>
-      <column type="field" name="fid" hidden="0" width="-1"/>
-      <column type="field" name="landuse" hidden="0" width="-1"/>
-      <column type="field" name="natural" hidden="0" width="-1"/>
-      <column type="field" name="boundary" hidden="0" width="-1"/>
-      <column type="field" name="type" hidden="0" width="-1"/>
-      <column type="field" name="osm_way_id" hidden="0" width="-1"/>
-      <column type="field" name="aeroway" hidden="0" width="-1"/>
-      <column type="field" name="amenity" hidden="0" width="-1"/>
-      <column type="field" name="admin_level" hidden="0" width="-1"/>
-      <column type="field" name="barrier" hidden="0" width="-1"/>
-      <column type="field" name="craft" hidden="0" width="-1"/>
-      <column type="field" name="geological" hidden="0" width="-1"/>
-      <column type="field" name="historic" hidden="0" width="-1"/>
-      <column type="field" name="land_area" hidden="0" width="-1"/>
-      <column type="field" name="man_made" hidden="0" width="-1"/>
-      <column type="field" name="military" hidden="0" width="-1"/>
-      <column type="field" name="office" hidden="0" width="-1"/>
-      <column type="field" name="place" hidden="0" width="-1"/>
-      <column type="field" name="shop" hidden="0" width="-1"/>
-      <column type="field" name="sport" hidden="0" width="-1"/>
-      <column type="field" name="tourism" hidden="0" width="-1"/>
-      <column type="field" name="other_tags" hidden="0" width="-1"/>
-      <column type="field" name="school:FR" hidden="0" width="-1"/>
-      <column type="field" name="ref:UAI" hidden="0" width="-1"/>
-      <column type="field" name="addr:street" hidden="0" width="-1"/>
-      <column type="field" name="wall" hidden="0" width="-1"/>
-      <column type="field" name="description" hidden="0" width="-1"/>
-      <column type="field" name="addr:postcode" hidden="0" width="-1"/>
-      <column type="field" name="addr:city" hidden="0" width="-1"/>
-      <column type="field" name="phone" hidden="0" width="-1"/>
-      <column type="field" name="operator:type" hidden="0" width="-1"/>
-      <column type="field" name="opening_hours" hidden="0" width="-1"/>
-      <column type="field" name="contact:street" hidden="0" width="-1"/>
-      <column type="field" name="contact:housenumber" hidden="0" width="-1"/>
-      <column type="field" name="check_date:opening_hours" hidden="0" width="-1"/>
-      <column type="field" name="addr:housenumber" hidden="0" width="-1"/>
-      <column type="field" name="fee" hidden="0" width="-1"/>
-      <column type="field" name="access" hidden="0" width="-1"/>
-      <column type="field" name="surface" hidden="0" width="-1"/>
-      <column type="field" name="highway" hidden="0" width="-1"/>
-      <column type="field" name="roof:shape" hidden="0" width="-1"/>
-      <column type="field" name="roof:levels" hidden="0" width="-1"/>
-      <column type="field" name="building:levels" hidden="0" width="-1"/>
-      <column type="field" name="leaf_type" hidden="0" width="-1"/>
-      <column type="field" name="CLC:year" hidden="0" width="-1"/>
-      <column type="field" name="CLC:id" hidden="0" width="-1"/>
-      <column type="field" name="CLC:code" hidden="0" width="-1"/>
-      <column type="field" name="wikipedia" hidden="0" width="-1"/>
-      <column type="field" name="wikidata" hidden="0" width="-1"/>
-      <column type="field" name="start_date" hidden="0" width="-1"/>
-      <column type="field" name="source:url" hidden="0" width="-1"/>
-      <column type="field" name="ref:INSEE" hidden="0" width="-1"/>
-      <column type="field" name="political_division" hidden="0" width="-1"/>
+      <column name="osm_id" hidden="0" width="-1" type="field"/>
+      <column name="building" hidden="0" width="-1" type="field"/>
+      <column hidden="1" width="-1" type="actions"/>
+      <column name="name" hidden="0" width="-1" type="field"/>
+      <column name="leisure" hidden="0" width="-1" type="field"/>
+      <column name="fid" hidden="0" width="-1" type="field"/>
+      <column name="landuse" hidden="0" width="-1" type="field"/>
+      <column name="natural" hidden="0" width="-1" type="field"/>
+      <column name="boundary" hidden="0" width="-1" type="field"/>
+      <column name="type" hidden="0" width="-1" type="field"/>
+      <column name="osm_way_id" hidden="0" width="-1" type="field"/>
+      <column name="aeroway" hidden="0" width="-1" type="field"/>
+      <column name="amenity" hidden="0" width="-1" type="field"/>
+      <column name="admin_level" hidden="0" width="-1" type="field"/>
+      <column name="barrier" hidden="0" width="-1" type="field"/>
+      <column name="craft" hidden="0" width="-1" type="field"/>
+      <column name="geological" hidden="0" width="-1" type="field"/>
+      <column name="historic" hidden="0" width="-1" type="field"/>
+      <column name="land_area" hidden="0" width="-1" type="field"/>
+      <column name="man_made" hidden="0" width="-1" type="field"/>
+      <column name="military" hidden="0" width="-1" type="field"/>
+      <column name="office" hidden="0" width="-1" type="field"/>
+      <column name="place" hidden="0" width="-1" type="field"/>
+      <column name="shop" hidden="0" width="-1" type="field"/>
+      <column name="sport" hidden="0" width="-1" type="field"/>
+      <column name="tourism" hidden="0" width="-1" type="field"/>
+      <column name="other_tags" hidden="0" width="-1" type="field"/>
+      <column name="wall" hidden="0" width="-1" type="field"/>
+      <column name="description" hidden="0" width="-1" type="field"/>
+      <column name="fee" hidden="0" width="-1" type="field"/>
+      <column name="access" hidden="0" width="-1" type="field"/>
+      <column name="surface" hidden="0" width="-1" type="field"/>
+      <column name="highway" hidden="0" width="-1" type="field"/>
+      <column name="roof:shape" hidden="0" width="-1" type="field"/>
+      <column name="building:levels" hidden="0" width="-1" type="field"/>
+      <column name="leaf_type" hidden="0" width="-1" type="field"/>
+      <column name="CLC:year" hidden="0" width="-1" type="field"/>
+      <column name="CLC:id" hidden="0" width="-1" type="field"/>
+      <column name="CLC:code" hidden="0" width="-1" type="field"/>
+      <column name="material" hidden="0" width="-1" type="field"/>
+      <column name="emergency" hidden="0" width="-1" type="field"/>
+      <column name="capacity" hidden="0" width="-1" type="field"/>
+      <column name="parking" hidden="0" width="-1" type="field"/>
+      <column name="wheelchair" hidden="0" width="-1" type="field"/>
+      <column name="building:min_level" hidden="0" width="-1" type="field"/>
+      <column name="roof:material" hidden="0" width="-1" type="field"/>
+      <column name="water" hidden="0" width="-1" type="field"/>
+      <column name="supervised" hidden="0" width="-1" type="field"/>
     </columns>
   </attributetableconfig>
   <conditionalstyles>
@@ -1931,7 +1811,9 @@ def my_form_open(dialog, layer, feature):
     <field editable="1" name="boundary_2"/>
     <field editable="1" name="building"/>
     <field editable="1" name="building:levels"/>
+    <field editable="1" name="building:min_level"/>
     <field editable="1" name="building_2"/>
+    <field editable="1" name="capacity"/>
     <field editable="1" name="check_date:opening_hours"/>
     <field editable="1" name="contact:housenumber"/>
     <field editable="1" name="contact:phone"/>
@@ -1966,6 +1848,7 @@ def my_form_open(dialog, layer, feature):
     <field editable="1" name="male"/>
     <field editable="1" name="man_made"/>
     <field editable="1" name="man_made_2"/>
+    <field editable="1" name="material"/>
     <field editable="1" name="max_age"/>
     <field editable="1" name="military"/>
     <field editable="1" name="military_2"/>
@@ -2001,6 +1884,7 @@ def my_form_open(dialog, layer, feature):
     <field editable="1" name="ref:UAI"/>
     <field editable="1" name="religion"/>
     <field editable="1" name="roof:levels"/>
+    <field editable="1" name="roof:material"/>
     <field editable="1" name="roof:shape"/>
     <field editable="1" name="school:FR"/>
     <field editable="1" name="shop"/>
@@ -2051,7 +1935,9 @@ def my_form_open(dialog, layer, feature):
     <field name="boundary_2" labelOnTop="0"/>
     <field name="building" labelOnTop="0"/>
     <field name="building:levels" labelOnTop="0"/>
+    <field name="building:min_level" labelOnTop="0"/>
     <field name="building_2" labelOnTop="0"/>
+    <field name="capacity" labelOnTop="0"/>
     <field name="check_date:opening_hours" labelOnTop="0"/>
     <field name="contact:housenumber" labelOnTop="0"/>
     <field name="contact:phone" labelOnTop="0"/>
@@ -2086,6 +1972,7 @@ def my_form_open(dialog, layer, feature):
     <field name="male" labelOnTop="0"/>
     <field name="man_made" labelOnTop="0"/>
     <field name="man_made_2" labelOnTop="0"/>
+    <field name="material" labelOnTop="0"/>
     <field name="max_age" labelOnTop="0"/>
     <field name="military" labelOnTop="0"/>
     <field name="military_2" labelOnTop="0"/>
@@ -2121,6 +2008,7 @@ def my_form_open(dialog, layer, feature):
     <field name="ref:UAI" labelOnTop="0"/>
     <field name="religion" labelOnTop="0"/>
     <field name="roof:levels" labelOnTop="0"/>
+    <field name="roof:material" labelOnTop="0"/>
     <field name="roof:shape" labelOnTop="0"/>
     <field name="school:FR" labelOnTop="0"/>
     <field name="shop" labelOnTop="0"/>