diff --git a/style_jardin/styles/point.qml b/style_jardin/styles/point.qml
index 20627bd..6b57fac 100644
--- a/style_jardin/styles/point.qml
+++ b/style_jardin/styles/point.qml
@@ -1,30 +1,30 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis minScale="1e+08" version="3.10.4-A Coruña" simplifyMaxScale="1" simplifyDrawingTol="1" simplifyAlgorithm="0" maxScale="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" readOnly="0" simplifyDrawingHints="0" styleCategories="AllStyleCategories" simplifyLocal="1">
+<qgis hasScaleBasedVisibilityFlag="0" labelsEnabled="1" simplifyDrawingTol="1" readOnly="0" maxScale="0" simplifyMaxScale="1" styleCategories="AllStyleCategories" simplifyDrawingHints="0" simplifyAlgorithm="0" version="3.10.4-A Coruña" simplifyLocal="1" minScale="1e+08">
   <flags>
     <Identifiable>1</Identifiable>
     <Removable>1</Removable>
     <Searchable>1</Searchable>
   </flags>
-  <renderer-v2 symbollevels="0" type="RuleRenderer" forceraster="0" enableorderby="0">
+  <renderer-v2 forceraster="0" symbollevels="0" type="RuleRenderer" enableorderby="0">
     <rules key="{b4a7e217-96d3-4a17-a86d-82cb169bb06f}">
-      <rule key="{0b88dc4f-12bb-46c3-b3cd-63c869b8310c}" filter="&quot;amenity&quot;='bench'" label="banc" symbol="0"/>
-      <rule key="{4f58d0e7-0e87-4b1d-b8ec-c0fc23cdecdb}" filter="&quot;barrier&quot;='gate'" label="portail" symbol="1"/>
-      <rule key="{c8c6a164-d2c2-422b-a84c-52df2e743491}" filter="&quot;amenity&quot;='waste_basket'" label="poubelle" symbol="2"/>
-      <rule key="{5c21004d-d780-4834-8bb7-1127b12f9386}" filter="&quot;information&quot;='board'" label="panneau" symbol="3"/>
-      <rule key="{eaef9329-482d-4dff-bb17-ec9b4a21877c}" filter="&quot;natural&quot;='tree_stump'" label="souche" symbol="4"/>
-      <rule key="{165ea62b-bcd4-46f9-a54d-a3c9c5e50d63}" filter="&quot;natural&quot;='tree'" label="arbre" symbol="5"/>
-      <rule key="{33fbb90e-4c36-4eb5-b4a3-66996cb42a5c}" filter="&quot;leisure&quot;='picnic_table'" label="table" symbol="6"/>
-      <rule key="{3b25e8ac-36bc-456a-9ba6-e040edc656fa}" filter="&quot;highway&quot;='street_lamp'" label="lampadaire" symbol="7"/>
-      <rule key="{b949a7d0-328e-45e7-8254-cd249b0e2e6b}" filter="&quot;amenity&quot;='toilets'" label="toilettes" symbol="8"/>
-      <rule key="{b374c9c1-d61f-4eb6-a8b2-e8f06e8f0abb}" filter="&quot;amenity&quot;='drinking_water'" label="point d'eau" symbol="9"/>
-      <rule key="{dbd1cd33-4ca5-4b63-a0c5-4fffc6120d17}" filter="&quot;amenity&quot;='waste_disposal' or &quot;amenity&quot;='recycling'" label="conteneur à déchets" symbol="10"/>
-      <rule key="{38ed40b1-15fd-40d7-aa40-c25e4fcba862}" filter="&quot;amenity&quot;='waste_disposal' or &quot;amenity&quot;='recycling' and &quot;recycling:organic&quot;='yes'" label="bac à compost" symbol="11"/>
-      <rule key="{a5ae8bd5-4e20-4cef-9764-ee84cffbeaa3}" filter="&quot;natural&quot;='shrub'" label="arbuste" symbol="12"/>
-      <rule key="{0e22dce3-ec94-467e-a9a4-215a75fd1928}" filter="&quot;man_made&quot;='insect_hotel'" label="hôtel à insectes" symbol="13"/>
+      <rule filter="&quot;amenity&quot;='bench'" key="{0b88dc4f-12bb-46c3-b3cd-63c869b8310c}" label="banc" symbol="0"/>
+      <rule filter="&quot;barrier&quot;='gate'" key="{4f58d0e7-0e87-4b1d-b8ec-c0fc23cdecdb}" label="portail" symbol="1"/>
+      <rule filter="&quot;amenity&quot;='waste_basket'" key="{c8c6a164-d2c2-422b-a84c-52df2e743491}" label="poubelle" symbol="2"/>
+      <rule filter="&quot;information&quot;='board'" key="{5c21004d-d780-4834-8bb7-1127b12f9386}" label="panneau" symbol="3"/>
+      <rule filter="&quot;natural&quot;='tree_stump'" key="{eaef9329-482d-4dff-bb17-ec9b4a21877c}" label="souche" symbol="4"/>
+      <rule filter="&quot;natural&quot;='tree'" key="{165ea62b-bcd4-46f9-a54d-a3c9c5e50d63}" label="arbre" symbol="5"/>
+      <rule filter="&quot;leisure&quot;='picnic_table'" key="{33fbb90e-4c36-4eb5-b4a3-66996cb42a5c}" label="table" symbol="6"/>
+      <rule filter="&quot;highway&quot;='street_lamp'" key="{3b25e8ac-36bc-456a-9ba6-e040edc656fa}" label="lampadaire" symbol="7"/>
+      <rule filter="&quot;amenity&quot;='toilets'" key="{b949a7d0-328e-45e7-8254-cd249b0e2e6b}" label="toilettes" symbol="8"/>
+      <rule filter="&quot;amenity&quot;='drinking_water'" key="{b374c9c1-d61f-4eb6-a8b2-e8f06e8f0abb}" label="point d'eau" symbol="9"/>
+      <rule filter="&quot;amenity&quot;='waste_disposal' or &quot;amenity&quot;='recycling'" key="{dbd1cd33-4ca5-4b63-a0c5-4fffc6120d17}" label="conteneur à déchets" symbol="10"/>
+      <rule filter="&quot;amenity&quot;='waste_disposal' or &quot;amenity&quot;='recycling' and &quot;recycling:organic&quot;='yes'" key="{38ed40b1-15fd-40d7-aa40-c25e4fcba862}" label="bac à compost" symbol="11"/>
+      <rule filter="&quot;natural&quot;='shrub'" key="{a5ae8bd5-4e20-4cef-9764-ee84cffbeaa3}" label="arbuste" symbol="12"/>
+      <rule filter="&quot;man_made&quot;='insect_hotel'" key="{0e22dce3-ec94-467e-a9a4-215a75fd1928}" label="hôtel à insectes" symbol="13"/>
     </rules>
     <symbols>
-      <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" name="0">
-        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+      <symbol clip_to_extent="1" name="0" type="marker" alpha="1" force_rhr="0">
+        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
           <prop v="0" k="angle"/>
           <prop v="0,0,0,255" k="color"/>
           <prop v="0" k="fixedAspectRatio"/>
@@ -44,15 +44,15 @@
           <prop v="1" k="vertical_anchor_point"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" name="1">
-        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+      <symbol clip_to_extent="1" name="1" type="marker" alpha="1" force_rhr="0">
+        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
           <prop v="0" k="angle"/>
           <prop v="0,0,0,255" k="color"/>
           <prop v="0" k="fixedAspectRatio"/>
@@ -72,15 +72,15 @@
           <prop v="1" k="vertical_anchor_point"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" name="10">
-        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+      <symbol clip_to_extent="1" name="10" type="marker" alpha="1" force_rhr="0">
+        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
           <prop v="0" k="angle"/>
           <prop v="133,182,111,255" k="color"/>
           <prop v="0" k="fixedAspectRatio"/>
@@ -100,15 +100,15 @@
           <prop v="1" k="vertical_anchor_point"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" name="11">
-        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+      <symbol clip_to_extent="1" name="11" type="marker" alpha="1" force_rhr="0">
+        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
           <prop v="0" k="angle"/>
           <prop v="133,182,111,255" k="color"/>
           <prop v="0" k="fixedAspectRatio"/>
@@ -128,15 +128,15 @@
           <prop v="1" k="vertical_anchor_point"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" name="12">
-        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+      <symbol clip_to_extent="1" name="12" type="marker" alpha="1" force_rhr="0">
+        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
           <prop v="0" k="angle"/>
           <prop v="0,0,0,255" k="color"/>
           <prop v="0" k="fixedAspectRatio"/>
@@ -156,15 +156,15 @@
           <prop v="1" k="vertical_anchor_point"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" name="13">
-        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+      <symbol clip_to_extent="1" name="13" type="marker" alpha="1" force_rhr="0">
+        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
           <prop v="0" k="angle"/>
           <prop v="0,0,0,255" k="color"/>
           <prop v="0" k="fixedAspectRatio"/>
@@ -172,27 +172,27 @@
           <prop v="https://forge.chapril.org/linux_alpes/caliec/raw/branch/master/style_jardin/symboles/insectes.svg" k="name"/>
           <prop v="0,0" k="offset"/>
           <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="Pixel" k="offset_unit"/>
+          <prop v="MapUnit" k="offset_unit"/>
           <prop v="35,35,35,255" k="outline_color"/>
           <prop v="0" k="outline_width"/>
           <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
           <prop v="MapUnit" k="outline_width_unit"/>
           <prop v="diameter" k="scale_method"/>
-          <prop v="6" k="size"/>
+          <prop v="3" k="size"/>
           <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
           <prop v="MapUnit" k="size_unit"/>
           <prop v="1" k="vertical_anchor_point"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" name="2">
-        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+      <symbol clip_to_extent="1" name="2" type="marker" alpha="1" force_rhr="0">
+        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
           <prop v="0" k="angle"/>
           <prop v="0,0,0,255" k="color"/>
           <prop v="0" k="fixedAspectRatio"/>
@@ -212,15 +212,15 @@
           <prop v="1" k="vertical_anchor_point"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" name="3">
-        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+      <symbol clip_to_extent="1" name="3" type="marker" alpha="1" force_rhr="0">
+        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
           <prop v="0" k="angle"/>
           <prop v="0,0,0,255" k="color"/>
           <prop v="0" k="fixedAspectRatio"/>
@@ -240,15 +240,15 @@
           <prop v="2" k="vertical_anchor_point"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" name="4">
-        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+      <symbol clip_to_extent="1" name="4" type="marker" alpha="1" force_rhr="0">
+        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
           <prop v="0" k="angle"/>
           <prop v="0,0,0,255" k="color"/>
           <prop v="0" k="fixedAspectRatio"/>
@@ -268,15 +268,15 @@
           <prop v="1" k="vertical_anchor_point"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" name="5">
-        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+      <symbol clip_to_extent="1" name="5" type="marker" alpha="1" force_rhr="0">
+        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
           <prop v="0" k="angle"/>
           <prop v="0,0,0,255" k="color"/>
           <prop v="0" k="fixedAspectRatio"/>
@@ -296,15 +296,15 @@
           <prop v="1" k="vertical_anchor_point"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" name="6">
-        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+      <symbol clip_to_extent="1" name="6" type="marker" alpha="1" force_rhr="0">
+        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
           <prop v="0" k="angle"/>
           <prop v="0,0,0,255" k="color"/>
           <prop v="0" k="fixedAspectRatio"/>
@@ -324,15 +324,15 @@
           <prop v="1" k="vertical_anchor_point"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" name="7">
-        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+      <symbol clip_to_extent="1" name="7" type="marker" alpha="1" force_rhr="0">
+        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
           <prop v="0" k="angle"/>
           <prop v="229,182,54,255" k="color"/>
           <prop v="0" k="fixedAspectRatio"/>
@@ -352,15 +352,15 @@
           <prop v="2" k="vertical_anchor_point"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" name="8">
-        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+      <symbol clip_to_extent="1" name="8" type="marker" alpha="1" force_rhr="0">
+        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
           <prop v="0" k="angle"/>
           <prop v="0,0,0,255" k="color"/>
           <prop v="0" k="fixedAspectRatio"/>
@@ -380,15 +380,15 @@
           <prop v="1" k="vertical_anchor_point"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" name="9">
-        <layer class="SvgMarker" pass="0" locked="0" enabled="1">
+      <symbol clip_to_extent="1" name="9" type="marker" alpha="1" force_rhr="0">
+        <layer class="SvgMarker" enabled="1" pass="0" locked="0">
           <prop v="0" k="angle"/>
           <prop v="232,113,141,255" k="color"/>
           <prop v="0" k="fixedAspectRatio"/>
@@ -408,9 +408,9 @@
           <prop v="1" k="vertical_anchor_point"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -418,14 +418,14 @@
     </symbols>
   </renderer-v2>
   <labeling type="rule-based">
-    <rules key="{be991f9b-be6d-4b24-93fd-47eb13fa0840}">
-      <rule key="{0ca7f7d0-8f06-40e3-9391-9ef7fafcd412}" description="arbre, arbuste" filter="&quot;natural&quot;='shrub' or &quot;natural&quot;='tree'">
+    <rules key="{920e3c10-db3d-4478-965d-d37a93754314}">
+      <rule filter="&quot;natural&quot;='shrub' or &quot;natural&quot;='tree'" description="arbre, arbuste" key="{a0166af0-9850-48f4-9053-bb302b898538}">
         <settings calloutType="simple">
-          <text-style fontItalic="0" useSubstitutions="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOpacity="1" fontLetterSpacing="0" textOrientation="horizontal" namedStyle="Regular" fontKerning="1" fontCapitals="0" blendMode="0" fontUnderline="0" isExpression="0" fontFamily="Liberation Sans" fontWeight="50" multilineHeight="1" fontSizeUnit="Point" textColor="0,0,0,255" fieldName="species:fr" fontWordSpacing="0" fontStrikeout="0" fontSize="10" previewBkgrdColor="255,255,255,255">
-            <text-buffer bufferSize="1" bufferBlendMode="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferNoFill="1" bufferOpacity="1" bufferSizeUnits="MM" bufferDraw="1"/>
-            <background shapeSizeUnit="MM" shapeRotationType="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeDraw="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeSizeType="0" shapeRotation="0" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiX="0" shapeBlendMode="0" shapeOffsetUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetY="0" shapeBorderColor="128,128,128,255">
-              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" name="markerSymbol">
-                <layer class="SimpleMarker" pass="0" locked="0" enabled="1">
+          <text-style fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" useSubstitutions="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontWordSpacing="0" blendMode="0" namedStyle="Regular" fontSize="10" fontUnderline="0" multilineHeight="1" textColor="0,0,0,255" fontItalic="0" fontCapitals="0" fontFamily="Liberation Sans" fontKerning="1" textOpacity="1" fontStrikeout="0" fieldName="species:fr" fontWeight="50" textOrientation="horizontal">
+            <text-buffer bufferBlendMode="0" bufferOpacity="1" bufferDraw="1" bufferNoFill="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM"/>
+            <background shapeSizeX="0" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidth="0" shapeBlendMode="0" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeRadiiY="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeRotation="0" shapeOpacity="1" shapeSizeUnit="MM" shapeSizeType="0" shapeSVGFile="" shapeSizeY="0" shapeType="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeFillColor="255,255,255,255">
+              <symbol clip_to_extent="1" name="markerSymbol" type="marker" alpha="1" force_rhr="0">
+                <layer class="SimpleMarker" enabled="1" pass="0" locked="0">
                   <prop v="0" k="angle"/>
                   <prop v="255,158,23,255" k="color"/>
                   <prop v="1" k="horizontal_anchor_point"/>
@@ -446,54 +446,54 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetDist="1" shadowOffsetUnit="MM" shadowRadiusAlphaOnly="0" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowRadius="1.5" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowOpacity="0.7" shadowBlendMode="6" shadowOffsetAngle="135" shadowColor="0,0,0,255"/>
+            <shadow shadowDraw="0" shadowUnder="0" shadowRadius="1.5" shadowOpacity="0.7" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetUnit="MM" shadowBlendMode="6" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format multilineAlign="3" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0" placeDirectionSymbol="0" autoWrapLength="0" wrapChar="" leftDirectionSymbol="&lt;" decimals="3" rightDirectionSymbol=">" plussign="0" useMaxLineLengthForAutoWrap="1"/>
-          <placement placementFlags="10" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distUnits="MM" dist="0" geometryGenerator="" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" centroidWhole="0" overrunDistance="0" centroidInside="0" repeatDistance="0" rotationAngle="0" fitInPolygonOnly="0" preserveRotation="1" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" placement="0" priority="5" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" layerType="PointGeometry" quadOffset="4" maxCurvedCharAngleOut="-25" offsetUnits="MM" yOffset="0" maxCurvedCharAngleIn="25"/>
-          <rendering maxNumLabels="2000" zIndex="0" limitNumLabels="0" fontMinPixelSize="3" obstacle="1" fontLimitPixelSize="0" scaleMax="0" fontMaxPixelSize="10000" obstacleType="0" upsidedownLabels="0" mergeLines="0" scaleMin="0" displayAll="0" obstacleFactor="1" labelPerPart="0" drawLabels="1" scaleVisibility="0" minFeatureSize="0"/>
+          <text-format wrapChar="" rightDirectionSymbol=">" reverseDirectionSymbol="0" plussign="0" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;"/>
+          <placement labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placement="0" maxCurvedCharAngleIn="25" quadOffset="4" priority="5" yOffset="0" overrunDistance="0" maxCurvedCharAngleOut="-25" repeatDistance="0" placementFlags="10" offsetUnits="MM" geometryGeneratorType="PointGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" dist="0" centroidWhole="0" xOffset="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistanceUnit="MM" fitInPolygonOnly="0" centroidInside="0" layerType="PointGeometry" preserveRotation="1" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" rotationAngle="0" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" repeatDistanceUnits="MM"/>
+          <rendering fontMinPixelSize="3" obstacle="1" scaleVisibility="0" maxNumLabels="2000" scaleMax="0" obstacleType="0" obstacleFactor="1" mergeLines="0" zIndex="0" limitNumLabels="0" minFeatureSize="0" drawLabels="1" labelPerPart="0" fontMaxPixelSize="10000" displayAll="0" scaleMin="0" fontLimitPixelSize="0" upsidedownLabels="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="lineSymbol" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; name=&quot;symbol&quot;>&lt;layer class=&quot;SimpleLine&quot; pass=&quot;0&quot; locked=&quot;0&quot; enabled=&quot;1&quot;>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol clip_to_extent=&quot;1&quot; name=&quot;symbol&quot; type=&quot;line&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot;>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot; locked=&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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -509,18 +509,18 @@
   <blendMode>0</blendMode>
   <featureBlendMode>0</featureBlendMode>
   <layerOpacity>1</layerOpacity>
-  <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
-    <DiagramCategory backgroundColor="#ffffff" penAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" penColor="#000000" rotationOffset="270" sizeScale="3x:0,0,0,0,0,0" width="15" scaleBasedVisibility="0" sizeType="MM" lineSizeType="MM" opacity="1" barWidth="5" height="15" minScaleDenominator="0" enabled="0" diagramOrientation="Up" backgroundAlpha="255" minimumSize="0" labelPlacementMethod="XHeight" maxScaleDenominator="1e+08" penWidth="0" scaleDependency="Area">
+  <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
+    <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" penAlpha="255" minimumSize="0" scaleDependency="Area" rotationOffset="270" penWidth="0" lineSizeType="MM" backgroundColor="#ffffff" penColor="#000000" enabled="0" height="15" maxScaleDenominator="1e+08" diagramOrientation="Up" barWidth="5" sizeScale="3x:0,0,0,0,0,0" width="15" opacity="1" scaleBasedVisibility="0" minScaleDenominator="0" labelPlacementMethod="XHeight" 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 priority="0" zIndex="0" obstacle="0" placement="0" dist="0" linePlacementFlags="18" showAll="1">
+  <DiagramLayerSettings dist="0" linePlacementFlags="18" zIndex="0" obstacle="0" placement="0" priority="0" showAll="1">
     <properties>
       <Option type="Map">
-        <Option type="QString" name="name" value=""/>
+        <Option name="name" type="QString" value=""/>
         <Option name="properties"/>
-        <Option type="QString" name="type" value="collection"/>
+        <Option name="type" type="QString" value="collection"/>
       </Option>
     </properties>
   </DiagramLayerSettings>
@@ -734,187 +734,187 @@
     </field>
   </fieldConfiguration>
   <aliases>
-    <alias index="0" name="" field="fid"/>
-    <alias index="1" name="" field="osm_id"/>
-    <alias index="2" name="" field="name"/>
-    <alias index="3" name="" field="barrier"/>
-    <alias index="4" name="" field="highway"/>
-    <alias index="5" name="" field="ref"/>
-    <alias index="6" name="" field="address"/>
-    <alias index="7" name="" field="is_in"/>
-    <alias index="8" name="" field="place"/>
-    <alias index="9" name="" field="man_made"/>
-    <alias index="10" name="" field="other_tags"/>
-    <alias index="11" name="" field="osm_id_2"/>
-    <alias index="12" name="" field="name_2"/>
-    <alias index="13" name="" field="barrier_2"/>
-    <alias index="14" name="" field="highway_2"/>
-    <alias index="15" name="" field="ref_2"/>
-    <alias index="16" name="" field="address_2"/>
-    <alias index="17" name="" field="is_in_2"/>
-    <alias index="18" name="" field="place_2"/>
-    <alias index="19" name="" field="man_made_2"/>
-    <alias index="20" name="" field="other_tags_2"/>
-    <alias index="21" name="" field="height"/>
-    <alias index="22" name="" field="natural"/>
-    <alias index="23" name="" field="leaf_type"/>
-    <alias index="24" name="" field="leaf_cycle"/>
-    <alias index="25" name="" field="description"/>
-    <alias index="26" name="" field="species:fr"/>
-    <alias index="27" name="" field="image"/>
-    <alias index="28" name="" field="addr:housenumber"/>
+    <alias field="fid" name="" index="0"/>
+    <alias field="osm_id" name="" index="1"/>
+    <alias field="name" name="" index="2"/>
+    <alias field="barrier" name="" index="3"/>
+    <alias field="highway" name="" index="4"/>
+    <alias field="ref" name="" index="5"/>
+    <alias field="address" name="" index="6"/>
+    <alias field="is_in" name="" index="7"/>
+    <alias field="place" name="" index="8"/>
+    <alias field="man_made" name="" index="9"/>
+    <alias field="other_tags" name="" index="10"/>
+    <alias field="osm_id_2" name="" index="11"/>
+    <alias field="name_2" name="" index="12"/>
+    <alias field="barrier_2" name="" index="13"/>
+    <alias field="highway_2" name="" index="14"/>
+    <alias field="ref_2" name="" index="15"/>
+    <alias field="address_2" name="" index="16"/>
+    <alias field="is_in_2" name="" index="17"/>
+    <alias field="place_2" name="" index="18"/>
+    <alias field="man_made_2" name="" index="19"/>
+    <alias field="other_tags_2" name="" index="20"/>
+    <alias field="height" name="" index="21"/>
+    <alias field="natural" name="" index="22"/>
+    <alias field="leaf_type" name="" index="23"/>
+    <alias field="leaf_cycle" name="" index="24"/>
+    <alias field="description" name="" index="25"/>
+    <alias field="species:fr" name="" index="26"/>
+    <alias field="image" name="" index="27"/>
+    <alias field="addr:housenumber" name="" index="28"/>
   </aliases>
   <excludeAttributesWMS/>
   <excludeAttributesWFS/>
   <defaults>
-    <default applyOnUpdate="0" field="fid" expression=""/>
-    <default applyOnUpdate="0" field="osm_id" expression=""/>
-    <default applyOnUpdate="0" field="name" expression=""/>
-    <default applyOnUpdate="0" field="barrier" expression=""/>
-    <default applyOnUpdate="0" field="highway" expression=""/>
-    <default applyOnUpdate="0" field="ref" expression=""/>
-    <default applyOnUpdate="0" field="address" expression=""/>
-    <default applyOnUpdate="0" field="is_in" expression=""/>
-    <default applyOnUpdate="0" field="place" expression=""/>
-    <default applyOnUpdate="0" field="man_made" expression=""/>
-    <default applyOnUpdate="0" field="other_tags" expression=""/>
-    <default applyOnUpdate="0" field="osm_id_2" expression=""/>
-    <default applyOnUpdate="0" field="name_2" expression=""/>
-    <default applyOnUpdate="0" field="barrier_2" expression=""/>
-    <default applyOnUpdate="0" field="highway_2" expression=""/>
-    <default applyOnUpdate="0" field="ref_2" expression=""/>
-    <default applyOnUpdate="0" field="address_2" expression=""/>
-    <default applyOnUpdate="0" field="is_in_2" expression=""/>
-    <default applyOnUpdate="0" field="place_2" expression=""/>
-    <default applyOnUpdate="0" field="man_made_2" expression=""/>
-    <default applyOnUpdate="0" field="other_tags_2" expression=""/>
-    <default applyOnUpdate="0" field="height" expression=""/>
-    <default applyOnUpdate="0" field="natural" expression=""/>
-    <default applyOnUpdate="0" field="leaf_type" expression=""/>
-    <default applyOnUpdate="0" field="leaf_cycle" expression=""/>
-    <default applyOnUpdate="0" field="description" expression=""/>
-    <default applyOnUpdate="0" field="species:fr" expression=""/>
-    <default applyOnUpdate="0" field="image" expression=""/>
-    <default applyOnUpdate="0" field="addr:housenumber" expression=""/>
+    <default field="fid" applyOnUpdate="0" expression=""/>
+    <default field="osm_id" applyOnUpdate="0" expression=""/>
+    <default field="name" applyOnUpdate="0" expression=""/>
+    <default field="barrier" applyOnUpdate="0" expression=""/>
+    <default field="highway" applyOnUpdate="0" expression=""/>
+    <default field="ref" applyOnUpdate="0" expression=""/>
+    <default field="address" applyOnUpdate="0" expression=""/>
+    <default field="is_in" applyOnUpdate="0" expression=""/>
+    <default field="place" applyOnUpdate="0" expression=""/>
+    <default field="man_made" applyOnUpdate="0" expression=""/>
+    <default field="other_tags" applyOnUpdate="0" expression=""/>
+    <default field="osm_id_2" applyOnUpdate="0" expression=""/>
+    <default field="name_2" applyOnUpdate="0" expression=""/>
+    <default field="barrier_2" applyOnUpdate="0" expression=""/>
+    <default field="highway_2" applyOnUpdate="0" expression=""/>
+    <default field="ref_2" applyOnUpdate="0" expression=""/>
+    <default field="address_2" applyOnUpdate="0" expression=""/>
+    <default field="is_in_2" applyOnUpdate="0" expression=""/>
+    <default field="place_2" applyOnUpdate="0" expression=""/>
+    <default field="man_made_2" applyOnUpdate="0" expression=""/>
+    <default field="other_tags_2" applyOnUpdate="0" expression=""/>
+    <default field="height" applyOnUpdate="0" expression=""/>
+    <default field="natural" applyOnUpdate="0" expression=""/>
+    <default field="leaf_type" applyOnUpdate="0" expression=""/>
+    <default field="leaf_cycle" applyOnUpdate="0" expression=""/>
+    <default field="description" applyOnUpdate="0" expression=""/>
+    <default field="species:fr" applyOnUpdate="0" expression=""/>
+    <default field="image" applyOnUpdate="0" expression=""/>
+    <default field="addr:housenumber" applyOnUpdate="0" expression=""/>
   </defaults>
   <constraints>
-    <constraint unique_strength="1" notnull_strength="1" exp_strength="0" constraints="3" field="fid"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="osm_id"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="name"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="barrier"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="highway"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="ref"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="address"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="is_in"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="place"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="man_made"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="other_tags"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="osm_id_2"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="name_2"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="barrier_2"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="highway_2"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="ref_2"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="address_2"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="is_in_2"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="place_2"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="man_made_2"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="other_tags_2"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="height"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="natural"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="leaf_type"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="leaf_cycle"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="description"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="species:fr"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="image"/>
-    <constraint unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0" field="addr:housenumber"/>
+    <constraint field="fid" unique_strength="1" notnull_strength="1" exp_strength="0" constraints="3"/>
+    <constraint field="osm_id" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="name" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="barrier" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="highway" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="ref" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="address" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="is_in" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="place" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="man_made" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="other_tags" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="osm_id_2" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="name_2" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="barrier_2" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="highway_2" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="ref_2" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="address_2" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="is_in_2" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="place_2" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="man_made_2" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="other_tags_2" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="height" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="natural" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="leaf_type" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="leaf_cycle" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="description" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="species:fr" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="image" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="addr:housenumber" unique_strength="0" notnull_strength="0" exp_strength="0" constraints="0"/>
   </constraints>
   <constraintExpressions>
-    <constraint exp="" desc="" field="fid"/>
-    <constraint exp="" desc="" field="osm_id"/>
-    <constraint exp="" desc="" field="name"/>
-    <constraint exp="" desc="" field="barrier"/>
-    <constraint exp="" desc="" field="highway"/>
-    <constraint exp="" desc="" field="ref"/>
-    <constraint exp="" desc="" field="address"/>
-    <constraint exp="" desc="" field="is_in"/>
-    <constraint exp="" desc="" field="place"/>
-    <constraint exp="" desc="" field="man_made"/>
-    <constraint exp="" desc="" field="other_tags"/>
-    <constraint exp="" desc="" field="osm_id_2"/>
-    <constraint exp="" desc="" field="name_2"/>
-    <constraint exp="" desc="" field="barrier_2"/>
-    <constraint exp="" desc="" field="highway_2"/>
-    <constraint exp="" desc="" field="ref_2"/>
-    <constraint exp="" desc="" field="address_2"/>
-    <constraint exp="" desc="" field="is_in_2"/>
-    <constraint exp="" desc="" field="place_2"/>
-    <constraint exp="" desc="" field="man_made_2"/>
-    <constraint exp="" desc="" field="other_tags_2"/>
-    <constraint exp="" desc="" field="height"/>
-    <constraint exp="" desc="" field="natural"/>
-    <constraint exp="" desc="" field="leaf_type"/>
-    <constraint exp="" desc="" field="leaf_cycle"/>
-    <constraint exp="" desc="" field="description"/>
-    <constraint exp="" desc="" field="species:fr"/>
-    <constraint exp="" desc="" field="image"/>
-    <constraint exp="" desc="" field="addr:housenumber"/>
+    <constraint field="fid" exp="" desc=""/>
+    <constraint field="osm_id" exp="" desc=""/>
+    <constraint field="name" exp="" desc=""/>
+    <constraint field="barrier" exp="" desc=""/>
+    <constraint field="highway" exp="" desc=""/>
+    <constraint field="ref" exp="" desc=""/>
+    <constraint field="address" exp="" desc=""/>
+    <constraint field="is_in" exp="" desc=""/>
+    <constraint field="place" exp="" desc=""/>
+    <constraint field="man_made" exp="" desc=""/>
+    <constraint field="other_tags" exp="" desc=""/>
+    <constraint field="osm_id_2" exp="" desc=""/>
+    <constraint field="name_2" exp="" desc=""/>
+    <constraint field="barrier_2" exp="" desc=""/>
+    <constraint field="highway_2" exp="" desc=""/>
+    <constraint field="ref_2" exp="" desc=""/>
+    <constraint field="address_2" exp="" desc=""/>
+    <constraint field="is_in_2" exp="" desc=""/>
+    <constraint field="place_2" exp="" desc=""/>
+    <constraint field="man_made_2" exp="" desc=""/>
+    <constraint field="other_tags_2" exp="" desc=""/>
+    <constraint field="height" exp="" desc=""/>
+    <constraint field="natural" exp="" desc=""/>
+    <constraint field="leaf_type" exp="" desc=""/>
+    <constraint field="leaf_cycle" exp="" desc=""/>
+    <constraint field="description" exp="" desc=""/>
+    <constraint field="species:fr" exp="" desc=""/>
+    <constraint field="image" exp="" desc=""/>
+    <constraint field="addr:housenumber" exp="" desc=""/>
   </constraintExpressions>
   <expressionfields/>
   <attributeactions>
     <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-    <actionsetting shortTitle="OpenStreetMap Browser" id="{38078f68-8354-4ec9-ab8e-5d652182156f}" type="5" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]" icon="" capture="0" notificationMessage="" isEnabledOnlyWhenEditable="0" name="OpenStreetMap Browser">
-      <actionScope id="Feature"/>
+    <actionsetting name="OpenStreetMap Browser" shortTitle="OpenStreetMap Browser" capture="0" type="5" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]" isEnabledOnlyWhenEditable="0" icon="" id="{c1e53595-4107-4850-b405-820f1bd32e31}" notificationMessage="">
       <actionScope id="Field"/>
       <actionScope id="Canvas"/>
+      <actionScope id="Feature"/>
     </actionsetting>
-    <actionsetting shortTitle="Mapillary" id="{64df2d0a-03c1-45b7-9e81-6f996f6aa777}" type="1" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;mapillary&quot;,&quot;[% &quot;mapillary&quot; %]&quot;)" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/mapillary_logo.svg" capture="0" notificationMessage="" isEnabledOnlyWhenEditable="0" name="Mapillary">
-      <actionScope id="Feature"/>
+    <actionsetting name="Mapillary" shortTitle="Mapillary" capture="0" type="1" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;mapillary&quot;,&quot;[% &quot;mapillary&quot; %]&quot;)" isEnabledOnlyWhenEditable="0" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/mapillary_logo.svg" id="{220c23f1-673f-4a54-929d-d9fc3214d1f3}" notificationMessage="">
       <actionScope id="Field"/>
       <actionScope id="Canvas"/>
+      <actionScope id="Feature"/>
     </actionsetting>
-    <actionsetting shortTitle="JOSM" id="{06d9a27b-6ce8-41d7-8bf2-03c94ecaf328}" type="1" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;josm&quot;,&quot;[% &quot;full_id&quot; %]&quot;)" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/josm_icon.svg" capture="0" notificationMessage="" isEnabledOnlyWhenEditable="0" name="JOSM">
-      <actionScope id="Feature"/>
+    <actionsetting name="JOSM" shortTitle="JOSM" capture="0" type="1" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;josm&quot;,&quot;[% &quot;full_id&quot; %]&quot;)" isEnabledOnlyWhenEditable="0" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/josm_icon.svg" id="{a02c3cb0-717d-4d7c-8265-56002963bb33}" notificationMessage="">
       <actionScope id="Field"/>
       <actionScope id="Canvas"/>
+      <actionScope id="Feature"/>
     </actionsetting>
-    <actionsetting shortTitle="User default editor" id="{d505c61b-0786-423e-b0ab-2eabe1368216}" type="5" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]" icon="" capture="0" notificationMessage="" isEnabledOnlyWhenEditable="0" name="User default editor">
-      <actionScope id="Feature"/>
+    <actionsetting name="User default editor" shortTitle="User default editor" capture="0" type="5" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]" isEnabledOnlyWhenEditable="0" icon="" id="{012f5485-3707-4867-b0b8-4d2467afd96f}" notificationMessage="">
       <actionScope id="Field"/>
       <actionScope id="Canvas"/>
+      <actionScope id="Feature"/>
     </actionsetting>
   </attributeactions>
-  <attributetableconfig sortExpression="&quot;other_tags&quot;" actionWidgetStyle="dropDown" sortOrder="1">
+  <attributetableconfig sortOrder="1" actionWidgetStyle="dropDown" sortExpression="&quot;other_tags&quot;">
     <columns>
-      <column type="field" width="-1" name="osm_id" hidden="0"/>
-      <column type="actions" width="-1" hidden="1"/>
-      <column type="field" width="-1" name="barrier" hidden="0"/>
-      <column type="field" width="-1" name="highway" hidden="0"/>
-      <column type="field" width="-1" name="fid" hidden="0"/>
-      <column type="field" width="-1" name="name" hidden="0"/>
-      <column type="field" width="-1" name="ref" hidden="0"/>
-      <column type="field" width="-1" name="place" hidden="0"/>
-      <column type="field" width="-1" name="address" hidden="0"/>
-      <column type="field" width="-1" name="is_in" hidden="0"/>
-      <column type="field" width="-1" name="man_made" hidden="0"/>
-      <column type="field" width="238" name="other_tags" hidden="0"/>
-      <column type="field" width="-1" name="addr:housenumber" hidden="0"/>
-      <column type="field" width="-1" name="natural" hidden="0"/>
-      <column type="field" width="-1" name="description" hidden="0"/>
-      <column type="field" width="-1" name="osm_id_2" hidden="0"/>
-      <column type="field" width="-1" name="name_2" hidden="0"/>
-      <column type="field" width="-1" name="barrier_2" hidden="0"/>
-      <column type="field" width="-1" name="highway_2" hidden="0"/>
-      <column type="field" width="-1" name="ref_2" hidden="0"/>
-      <column type="field" width="-1" name="address_2" hidden="0"/>
-      <column type="field" width="-1" name="is_in_2" hidden="0"/>
-      <column type="field" width="-1" name="place_2" hidden="0"/>
-      <column type="field" width="-1" name="man_made_2" hidden="0"/>
-      <column type="field" width="-1" name="other_tags_2" hidden="0"/>
-      <column type="field" width="-1" name="height" hidden="0"/>
-      <column type="field" width="-1" name="leaf_type" hidden="0"/>
-      <column type="field" width="-1" name="leaf_cycle" hidden="0"/>
-      <column type="field" width="-1" name="species:fr" hidden="0"/>
-      <column type="field" width="-1" name="image" hidden="0"/>
+      <column name="osm_id" hidden="0" type="field" width="-1"/>
+      <column hidden="1" type="actions" width="-1"/>
+      <column name="barrier" hidden="0" type="field" width="-1"/>
+      <column name="highway" hidden="0" type="field" width="-1"/>
+      <column name="fid" hidden="0" type="field" width="-1"/>
+      <column name="name" hidden="0" type="field" width="-1"/>
+      <column name="ref" hidden="0" type="field" width="-1"/>
+      <column name="place" hidden="0" type="field" width="-1"/>
+      <column name="address" hidden="0" type="field" width="-1"/>
+      <column name="is_in" hidden="0" type="field" width="-1"/>
+      <column name="man_made" hidden="0" type="field" width="-1"/>
+      <column name="other_tags" hidden="0" type="field" width="238"/>
+      <column name="addr:housenumber" hidden="0" type="field" width="-1"/>
+      <column name="natural" hidden="0" type="field" width="-1"/>
+      <column name="description" hidden="0" type="field" width="-1"/>
+      <column name="osm_id_2" hidden="0" type="field" width="-1"/>
+      <column name="name_2" hidden="0" type="field" width="-1"/>
+      <column name="barrier_2" hidden="0" type="field" width="-1"/>
+      <column name="highway_2" hidden="0" type="field" width="-1"/>
+      <column name="ref_2" hidden="0" type="field" width="-1"/>
+      <column name="address_2" hidden="0" type="field" width="-1"/>
+      <column name="is_in_2" hidden="0" type="field" width="-1"/>
+      <column name="place_2" hidden="0" type="field" width="-1"/>
+      <column name="man_made_2" hidden="0" type="field" width="-1"/>
+      <column name="other_tags_2" hidden="0" type="field" width="-1"/>
+      <column name="height" hidden="0" type="field" width="-1"/>
+      <column name="leaf_type" hidden="0" type="field" width="-1"/>
+      <column name="leaf_cycle" hidden="0" type="field" width="-1"/>
+      <column name="species:fr" hidden="0" type="field" width="-1"/>
+      <column name="image" hidden="0" type="field" width="-1"/>
     </columns>
   </attributetableconfig>
   <conditionalstyles>
@@ -945,219 +945,219 @@ def my_form_open(dialog, layer, feature):
   <featformsuppress>0</featformsuppress>
   <editorlayout>generatedlayout</editorlayout>
   <editable>
-    <field editable="1" name="SNCF:stop_name"/>
-    <field editable="1" name="abandoned:railway"/>
-    <field editable="1" name="access"/>
-    <field editable="1" name="addr:city"/>
-    <field editable="1" name="addr:housename"/>
-    <field editable="1" name="addr:housenumber"/>
-    <field editable="1" name="addr:postcode"/>
-    <field editable="1" name="addr:street"/>
-    <field editable="1" name="address"/>
-    <field editable="1" name="address_2"/>
-    <field editable="1" name="advertising"/>
-    <field editable="1" name="alt_name"/>
-    <field editable="1" name="amenity"/>
-    <field editable="1" name="backrest"/>
-    <field editable="1" name="barrier"/>
-    <field editable="1" name="barrier_2"/>
-    <field editable="1" name="bench"/>
-    <field editable="1" name="bicycle"/>
-    <field editable="1" name="bicycle_parking"/>
-    <field editable="1" name="blind"/>
-    <field editable="1" name="board:title"/>
-    <field editable="1" name="board_type"/>
-    <field editable="1" name="bollard"/>
-    <field editable="1" name="brand"/>
-    <field editable="1" name="bridge:support"/>
-    <field editable="1" name="bus"/>
-    <field editable="1" name="button_operated"/>
-    <field editable="1" name="capacity"/>
-    <field editable="1" name="capital"/>
-    <field editable="1" name="colour"/>
-    <field editable="1" name="covered"/>
-    <field editable="1" name="crossing"/>
-    <field editable="1" name="crossing:activation"/>
-    <field editable="1" name="crossing:barrier"/>
-    <field editable="1" name="crossing:bell"/>
-    <field editable="1" name="crossing:chicane"/>
-    <field editable="1" name="crossing:island"/>
-    <field editable="1" name="crossing:light"/>
-    <field editable="1" name="crossing:on_demand"/>
-    <field editable="1" name="crossing:saltire"/>
-    <field editable="1" name="crossing:supervision"/>
-    <field editable="1" name="crossing_ref"/>
-    <field editable="1" name="denomination"/>
-    <field editable="1" name="departures_board"/>
-    <field editable="1" name="description"/>
-    <field editable="1" name="description:fr"/>
-    <field editable="1" name="diameter"/>
-    <field editable="1" name="direction"/>
-    <field editable="1" name="disused:railway"/>
-    <field editable="1" name="drinking_water"/>
-    <field editable="1" name="ele"/>
-    <field editable="1" name="emergency"/>
-    <field editable="1" name="entrance"/>
-    <field editable="1" name="fee"/>
-    <field editable="1" name="female"/>
-    <field editable="1" name="fid"/>
-    <field editable="1" name="foot"/>
-    <field editable="1" name="ford"/>
-    <field editable="1" name="full_id"/>
-    <field editable="1" name="genus:fr"/>
-    <field editable="1" name="genus:la"/>
-    <field editable="1" name="hazard"/>
-    <field editable="1" name="height"/>
-    <field editable="1" name="highway"/>
-    <field editable="1" name="highway_2"/>
-    <field editable="1" name="hiking"/>
-    <field editable="1" name="historic"/>
-    <field editable="1" name="history"/>
-    <field editable="1" name="horse"/>
-    <field editable="1" name="image"/>
-    <field editable="1" name="information"/>
-    <field editable="1" name="is_in"/>
-    <field editable="1" name="is_in_2"/>
-    <field editable="1" name="kerb"/>
-    <field editable="1" name="leaf_cycle"/>
-    <field editable="1" name="leaf_type"/>
-    <field editable="1" name="leisure"/>
-    <field editable="1" name="local_ref"/>
-    <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="maxspeed"/>
-    <field editable="1" name="min_age"/>
-    <field editable="1" name="motor_vehicle"/>
-    <field editable="1" name="mountain_pass"/>
-    <field editable="1" name="mtb"/>
-    <field editable="1" name="name"/>
-    <field editable="1" name="name:als"/>
-    <field editable="1" name="name:ca"/>
-    <field editable="1" name="name:de"/>
-    <field editable="1" name="name:fr"/>
-    <field editable="1" name="name:oc"/>
-    <field editable="1" name="name:uk"/>
-    <field editable="1" name="name_2"/>
-    <field editable="1" name="natural"/>
-    <field editable="1" name="network"/>
-    <field editable="1" name="opening_hours"/>
-    <field editable="1" name="operator"/>
-    <field editable="1" name="osm_id"/>
-    <field editable="1" name="osm_id_2"/>
-    <field editable="1" name="osm_type"/>
-    <field editable="1" name="other_tags"/>
-    <field editable="1" name="other_tags_2"/>
-    <field editable="1" name="passenger_information_display"/>
-    <field editable="1" name="place"/>
-    <field editable="1" name="place_2"/>
-    <field editable="1" name="playground"/>
-    <field editable="1" name="post_office:type"/>
-    <field editable="1" name="produce"/>
-    <field editable="1" name="public_transport"/>
-    <field editable="1" name="railway"/>
-    <field editable="1" name="railway:local_operated"/>
-    <field editable="1" name="railway:milestone:catenary_mast"/>
-    <field editable="1" name="railway:name:DB"/>
-    <field editable="1" name="railway:position"/>
-    <field editable="1" name="railway:position:exact"/>
-    <field editable="1" name="railway:ref"/>
-    <field editable="1" name="railway:ref:DB"/>
-    <field editable="1" name="railway:ref:count"/>
-    <field editable="1" name="railway:signal:crossing_distant"/>
-    <field editable="1" name="railway:signal:crossing_distant:form"/>
-    <field editable="1" name="railway:signal:direction"/>
-    <field editable="1" name="railway:signal:distant"/>
-    <field editable="1" name="railway:signal:distant:form"/>
-    <field editable="1" name="railway:signal:distant:height"/>
-    <field editable="1" name="railway:signal:distant:repeated"/>
-    <field editable="1" name="railway:signal:distant:shortened"/>
-    <field editable="1" name="railway:signal:distant:states"/>
-    <field editable="1" name="railway:signal:expected_position"/>
-    <field editable="1" name="railway:signal:expected_position:height"/>
-    <field editable="1" name="railway:signal:main"/>
-    <field editable="1" name="railway:signal:main:form"/>
-    <field editable="1" name="railway:signal:main:function"/>
-    <field editable="1" name="railway:signal:main:height"/>
-    <field editable="1" name="railway:signal:main:states"/>
-    <field editable="1" name="railway:signal:main:substitute_signal"/>
-    <field editable="1" name="railway:signal:main_repeated"/>
-    <field editable="1" name="railway:signal:main_repeated:form"/>
-    <field editable="1" name="railway:signal:minor"/>
-    <field editable="1" name="railway:signal:minor:form"/>
-    <field editable="1" name="railway:signal:minor:height"/>
-    <field editable="1" name="railway:signal:minor:states"/>
-    <field editable="1" name="railway:signal:position"/>
-    <field editable="1" name="railway:signal:shunting"/>
-    <field editable="1" name="railway:signal:shunting:form"/>
-    <field editable="1" name="railway:signal:shunting:height"/>
-    <field editable="1" name="railway:signal:speed_limit"/>
-    <field editable="1" name="railway:signal:speed_limit:form"/>
-    <field editable="1" name="railway:signal:speed_limit:height"/>
-    <field editable="1" name="railway:signal:speed_limit:speed"/>
-    <field editable="1" name="railway:signal:speed_limit_distant"/>
-    <field editable="1" name="railway:signal:speed_limit_distant:form"/>
-    <field editable="1" name="railway:signal:speed_limit_distant:height"/>
-    <field editable="1" name="railway:signal:speed_limit_distant:speed"/>
-    <field editable="1" name="railway:signal:station_distant"/>
-    <field editable="1" name="railway:signal:station_distant:form"/>
-    <field editable="1" name="railway:signal:traversable"/>
-    <field editable="1" name="railway:signal:traversable:type"/>
-    <field editable="1" name="railway:switch"/>
-    <field editable="1" name="railway:switch:electric"/>
-    <field editable="1" name="railway:turnout_side"/>
-    <field editable="1" name="recycling:cans"/>
-    <field editable="1" name="recycling:cardboard"/>
-    <field editable="1" name="recycling:clothes"/>
-    <field editable="1" name="recycling:garden_waste"/>
-    <field editable="1" name="recycling:glass"/>
-    <field editable="1" name="recycling:glass_bottles"/>
-    <field editable="1" name="recycling:green_waste"/>
-    <field editable="1" name="recycling:organic"/>
-    <field editable="1" name="recycling:paper"/>
-    <field editable="1" name="recycling:plastic"/>
-    <field editable="1" name="recycling:plastic_bottles"/>
-    <field editable="1" name="recycling:plastic_packaging"/>
-    <field editable="1" name="recycling_type"/>
-    <field editable="1" name="ref"/>
-    <field editable="1" name="ref:FR:LaPoste"/>
-    <field editable="1" name="ref:FR:SIREN"/>
-    <field editable="1" name="ref_2"/>
-    <field editable="1" name="religion"/>
-    <field editable="1" name="seats"/>
-    <field editable="1" name="segregated"/>
-    <field editable="1" name="shelter"/>
-    <field editable="1" name="sloped_curb"/>
-    <field editable="1" name="source:date"/>
-    <field editable="1" name="source:name:oc"/>
-    <field editable="1" name="species:fr"/>
-    <field editable="1" name="species:la"/>
-    <field editable="1" name="sport"/>
-    <field editable="1" name="start_date"/>
-    <field editable="1" name="stile"/>
-    <field editable="1" name="supervised"/>
-    <field editable="1" name="survey:date"/>
-    <field editable="1" name="swing_gate:type"/>
-    <field editable="1" name="tactile_paving"/>
-    <field editable="1" name="toilets:disposal"/>
-    <field editable="1" name="toilets:position"/>
-    <field editable="1" name="tourism"/>
-    <field editable="1" name="traffic_calming"/>
-    <field editable="1" name="traffic_sign"/>
-    <field editable="1" name="traffic_sign:backward"/>
-    <field editable="1" name="traffic_signals"/>
-    <field editable="1" name="traffic_signals:direction"/>
-    <field editable="1" name="train"/>
-    <field editable="1" name="uic_name"/>
-    <field editable="1" name="uic_ref"/>
-    <field editable="1" name="url"/>
-    <field editable="1" name="waste"/>
-    <field editable="1" name="wheelchair"/>
-    <field editable="1" name="wheelchair:description"/>
-    <field editable="1" name="wikidata"/>
-    <field editable="1" name="wikipedia"/>
+    <field name="SNCF:stop_name" editable="1"/>
+    <field name="abandoned:railway" editable="1"/>
+    <field name="access" editable="1"/>
+    <field name="addr:city" editable="1"/>
+    <field name="addr:housename" editable="1"/>
+    <field name="addr:housenumber" editable="1"/>
+    <field name="addr:postcode" editable="1"/>
+    <field name="addr:street" editable="1"/>
+    <field name="address" editable="1"/>
+    <field name="address_2" editable="1"/>
+    <field name="advertising" editable="1"/>
+    <field name="alt_name" editable="1"/>
+    <field name="amenity" editable="1"/>
+    <field name="backrest" editable="1"/>
+    <field name="barrier" editable="1"/>
+    <field name="barrier_2" editable="1"/>
+    <field name="bench" editable="1"/>
+    <field name="bicycle" editable="1"/>
+    <field name="bicycle_parking" editable="1"/>
+    <field name="blind" editable="1"/>
+    <field name="board:title" editable="1"/>
+    <field name="board_type" editable="1"/>
+    <field name="bollard" editable="1"/>
+    <field name="brand" editable="1"/>
+    <field name="bridge:support" editable="1"/>
+    <field name="bus" editable="1"/>
+    <field name="button_operated" editable="1"/>
+    <field name="capacity" editable="1"/>
+    <field name="capital" editable="1"/>
+    <field name="colour" editable="1"/>
+    <field name="covered" editable="1"/>
+    <field name="crossing" editable="1"/>
+    <field name="crossing:activation" editable="1"/>
+    <field name="crossing:barrier" editable="1"/>
+    <field name="crossing:bell" editable="1"/>
+    <field name="crossing:chicane" editable="1"/>
+    <field name="crossing:island" editable="1"/>
+    <field name="crossing:light" editable="1"/>
+    <field name="crossing:on_demand" editable="1"/>
+    <field name="crossing:saltire" editable="1"/>
+    <field name="crossing:supervision" editable="1"/>
+    <field name="crossing_ref" editable="1"/>
+    <field name="denomination" editable="1"/>
+    <field name="departures_board" editable="1"/>
+    <field name="description" editable="1"/>
+    <field name="description:fr" editable="1"/>
+    <field name="diameter" editable="1"/>
+    <field name="direction" editable="1"/>
+    <field name="disused:railway" editable="1"/>
+    <field name="drinking_water" editable="1"/>
+    <field name="ele" editable="1"/>
+    <field name="emergency" editable="1"/>
+    <field name="entrance" editable="1"/>
+    <field name="fee" editable="1"/>
+    <field name="female" editable="1"/>
+    <field name="fid" editable="1"/>
+    <field name="foot" editable="1"/>
+    <field name="ford" editable="1"/>
+    <field name="full_id" editable="1"/>
+    <field name="genus:fr" editable="1"/>
+    <field name="genus:la" editable="1"/>
+    <field name="hazard" editable="1"/>
+    <field name="height" editable="1"/>
+    <field name="highway" editable="1"/>
+    <field name="highway_2" editable="1"/>
+    <field name="hiking" editable="1"/>
+    <field name="historic" editable="1"/>
+    <field name="history" editable="1"/>
+    <field name="horse" editable="1"/>
+    <field name="image" editable="1"/>
+    <field name="information" editable="1"/>
+    <field name="is_in" editable="1"/>
+    <field name="is_in_2" editable="1"/>
+    <field name="kerb" editable="1"/>
+    <field name="leaf_cycle" editable="1"/>
+    <field name="leaf_type" editable="1"/>
+    <field name="leisure" editable="1"/>
+    <field name="local_ref" editable="1"/>
+    <field name="male" editable="1"/>
+    <field name="man_made" editable="1"/>
+    <field name="man_made_2" editable="1"/>
+    <field name="material" editable="1"/>
+    <field name="max_age" editable="1"/>
+    <field name="maxspeed" editable="1"/>
+    <field name="min_age" editable="1"/>
+    <field name="motor_vehicle" editable="1"/>
+    <field name="mountain_pass" editable="1"/>
+    <field name="mtb" editable="1"/>
+    <field name="name" editable="1"/>
+    <field name="name:als" editable="1"/>
+    <field name="name:ca" editable="1"/>
+    <field name="name:de" editable="1"/>
+    <field name="name:fr" editable="1"/>
+    <field name="name:oc" editable="1"/>
+    <field name="name:uk" editable="1"/>
+    <field name="name_2" editable="1"/>
+    <field name="natural" editable="1"/>
+    <field name="network" editable="1"/>
+    <field name="opening_hours" editable="1"/>
+    <field name="operator" editable="1"/>
+    <field name="osm_id" editable="1"/>
+    <field name="osm_id_2" editable="1"/>
+    <field name="osm_type" editable="1"/>
+    <field name="other_tags" editable="1"/>
+    <field name="other_tags_2" editable="1"/>
+    <field name="passenger_information_display" editable="1"/>
+    <field name="place" editable="1"/>
+    <field name="place_2" editable="1"/>
+    <field name="playground" editable="1"/>
+    <field name="post_office:type" editable="1"/>
+    <field name="produce" editable="1"/>
+    <field name="public_transport" editable="1"/>
+    <field name="railway" editable="1"/>
+    <field name="railway:local_operated" editable="1"/>
+    <field name="railway:milestone:catenary_mast" editable="1"/>
+    <field name="railway:name:DB" editable="1"/>
+    <field name="railway:position" editable="1"/>
+    <field name="railway:position:exact" editable="1"/>
+    <field name="railway:ref" editable="1"/>
+    <field name="railway:ref:DB" editable="1"/>
+    <field name="railway:ref:count" editable="1"/>
+    <field name="railway:signal:crossing_distant" editable="1"/>
+    <field name="railway:signal:crossing_distant:form" editable="1"/>
+    <field name="railway:signal:direction" editable="1"/>
+    <field name="railway:signal:distant" editable="1"/>
+    <field name="railway:signal:distant:form" editable="1"/>
+    <field name="railway:signal:distant:height" editable="1"/>
+    <field name="railway:signal:distant:repeated" editable="1"/>
+    <field name="railway:signal:distant:shortened" editable="1"/>
+    <field name="railway:signal:distant:states" editable="1"/>
+    <field name="railway:signal:expected_position" editable="1"/>
+    <field name="railway:signal:expected_position:height" editable="1"/>
+    <field name="railway:signal:main" editable="1"/>
+    <field name="railway:signal:main:form" editable="1"/>
+    <field name="railway:signal:main:function" editable="1"/>
+    <field name="railway:signal:main:height" editable="1"/>
+    <field name="railway:signal:main:states" editable="1"/>
+    <field name="railway:signal:main:substitute_signal" editable="1"/>
+    <field name="railway:signal:main_repeated" editable="1"/>
+    <field name="railway:signal:main_repeated:form" editable="1"/>
+    <field name="railway:signal:minor" editable="1"/>
+    <field name="railway:signal:minor:form" editable="1"/>
+    <field name="railway:signal:minor:height" editable="1"/>
+    <field name="railway:signal:minor:states" editable="1"/>
+    <field name="railway:signal:position" editable="1"/>
+    <field name="railway:signal:shunting" editable="1"/>
+    <field name="railway:signal:shunting:form" editable="1"/>
+    <field name="railway:signal:shunting:height" editable="1"/>
+    <field name="railway:signal:speed_limit" editable="1"/>
+    <field name="railway:signal:speed_limit:form" editable="1"/>
+    <field name="railway:signal:speed_limit:height" editable="1"/>
+    <field name="railway:signal:speed_limit:speed" editable="1"/>
+    <field name="railway:signal:speed_limit_distant" editable="1"/>
+    <field name="railway:signal:speed_limit_distant:form" editable="1"/>
+    <field name="railway:signal:speed_limit_distant:height" editable="1"/>
+    <field name="railway:signal:speed_limit_distant:speed" editable="1"/>
+    <field name="railway:signal:station_distant" editable="1"/>
+    <field name="railway:signal:station_distant:form" editable="1"/>
+    <field name="railway:signal:traversable" editable="1"/>
+    <field name="railway:signal:traversable:type" editable="1"/>
+    <field name="railway:switch" editable="1"/>
+    <field name="railway:switch:electric" editable="1"/>
+    <field name="railway:turnout_side" editable="1"/>
+    <field name="recycling:cans" editable="1"/>
+    <field name="recycling:cardboard" editable="1"/>
+    <field name="recycling:clothes" editable="1"/>
+    <field name="recycling:garden_waste" editable="1"/>
+    <field name="recycling:glass" editable="1"/>
+    <field name="recycling:glass_bottles" editable="1"/>
+    <field name="recycling:green_waste" editable="1"/>
+    <field name="recycling:organic" editable="1"/>
+    <field name="recycling:paper" editable="1"/>
+    <field name="recycling:plastic" editable="1"/>
+    <field name="recycling:plastic_bottles" editable="1"/>
+    <field name="recycling:plastic_packaging" editable="1"/>
+    <field name="recycling_type" editable="1"/>
+    <field name="ref" editable="1"/>
+    <field name="ref:FR:LaPoste" editable="1"/>
+    <field name="ref:FR:SIREN" editable="1"/>
+    <field name="ref_2" editable="1"/>
+    <field name="religion" editable="1"/>
+    <field name="seats" editable="1"/>
+    <field name="segregated" editable="1"/>
+    <field name="shelter" editable="1"/>
+    <field name="sloped_curb" editable="1"/>
+    <field name="source:date" editable="1"/>
+    <field name="source:name:oc" editable="1"/>
+    <field name="species:fr" editable="1"/>
+    <field name="species:la" editable="1"/>
+    <field name="sport" editable="1"/>
+    <field name="start_date" editable="1"/>
+    <field name="stile" editable="1"/>
+    <field name="supervised" editable="1"/>
+    <field name="survey:date" editable="1"/>
+    <field name="swing_gate:type" editable="1"/>
+    <field name="tactile_paving" editable="1"/>
+    <field name="toilets:disposal" editable="1"/>
+    <field name="toilets:position" editable="1"/>
+    <field name="tourism" editable="1"/>
+    <field name="traffic_calming" editable="1"/>
+    <field name="traffic_sign" editable="1"/>
+    <field name="traffic_sign:backward" editable="1"/>
+    <field name="traffic_signals" editable="1"/>
+    <field name="traffic_signals:direction" editable="1"/>
+    <field name="train" editable="1"/>
+    <field name="uic_name" editable="1"/>
+    <field name="uic_ref" editable="1"/>
+    <field name="url" editable="1"/>
+    <field name="waste" editable="1"/>
+    <field name="wheelchair" editable="1"/>
+    <field name="wheelchair:description" editable="1"/>
+    <field name="wikidata" editable="1"/>
+    <field name="wikipedia" editable="1"/>
   </editable>
   <labelOnTop>
     <field name="SNCF:stop_name" labelOnTop="0"/>