diff --git a/style_caliec/styles/linestring.qml b/style_caliec/styles/linestring.qml
index 0c02673..c19a026 100644
--- a/style_caliec/styles/linestring.qml
+++ b/style_caliec/styles/linestring.qml
@@ -1,594 +1,619 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis readOnly="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" simplifyMaxScale="1" version="3.10.4-A Coruña" minScale="1e+08" simplifyLocal="1" labelsEnabled="1" simplifyDrawingHints="1" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" maxScale="0">
+<qgis maxScale="0" simplifyDrawingHints="1" simplifyLocal="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" simplifyMaxScale="1" version="3.10.4-A Coruña" readOnly="0" minScale="1e+08" labelsEnabled="1">
   <flags>
     <Identifiable>1</Identifiable>
     <Removable>1</Removable>
     <Searchable>1</Searchable>
   </flags>
-  <renderer-v2 symbollevels="1" type="RuleRenderer" forceraster="0" enableorderby="0">
+  <renderer-v2 symbollevels="1" enableorderby="0" forceraster="0" type="RuleRenderer">
     <rules key="{129f6cf8-aa75-48cf-b691-24d3444e2b54}">
-      <rule symbol="0" label="clôture" filter="&quot;barrier&quot;='fence'" key="{1a510d65-0068-471e-9308-7459cd087491}"/>
-      <rule symbol="1" label="mur" filter="&quot;barrier&quot;='wall' or &quot;barrier&quot;='retaining_wall'" key="{a6e99132-537a-4948-86b5-8a65f769f21c}"/>
-      <rule symbol="2" label="haie" filter="&quot;barrier&quot;='hedge'" key="{5fd61f11-9766-4c13-8461-46cbfde5e90f}"/>
-      <rule symbol="3" label="digue" filter="&quot;man_made&quot;='dyke'" key="{9350847a-7763-4cd4-a9d0-4b1336c3aa67}"/>
-      <rule symbol="4" label="rivière" filter="&quot;waterway&quot;='river' or &quot;waterway&quot;='stream'" key="{3067fb57-79a9-4ed2-880a-2d91943ce66a}"/>
-      <rule symbol="5" label="escalier" filter="&quot;highway&quot;='steps'" key="{6eb81f3c-bc99-41b9-b35a-afdee5606037}"/>
-      <rule symbol="6" label="rue, route" filter="&quot;highway&quot;='primary' or &quot;highway&quot;='secondary' or &quot;highway&quot;='tertiary' or &quot;highway&quot;='residential' or &quot;highway&quot;='service' or&quot;highway&quot;='unclassified'" key="{2577b237-e0ad-418e-91e5-b30104eccaba}"/>
-      <rule symbol="7" label="sentier, chemin piéton" filter="&quot;highway&quot;='path' or &quot;highway&quot;='footway'" key="{9f9b2742-9499-437e-bee3-ec35588d9c75}"/>
-      <rule symbol="8" label="piste" filter="&quot;highway&quot;='track'" key="{32ab4ffd-6eb5-4497-81c0-c07bf261fca9}"/>
-      <rule symbol="9" label="canal" filter="&quot;waterway&quot;='canal'" key="{0819eb16-d95f-4f3f-9dd2-a5a7f989d83d}"/>
+      <rule symbol="0" key="{1a510d65-0068-471e-9308-7459cd087491}" filter="&quot;barrier&quot;='fence'" label="clôture"/>
+      <rule symbol="1" key="{a6e99132-537a-4948-86b5-8a65f769f21c}" filter="&quot;barrier&quot;='wall' or &quot;barrier&quot;='retaining_wall'" label="mur"/>
+      <rule symbol="2" key="{5fd61f11-9766-4c13-8461-46cbfde5e90f}" filter="&quot;barrier&quot;='hedge'" label="haie"/>
+      <rule symbol="3" key="{9350847a-7763-4cd4-a9d0-4b1336c3aa67}" filter="&quot;man_made&quot;='dyke'" label="digue"/>
+      <rule symbol="4" key="{3067fb57-79a9-4ed2-880a-2d91943ce66a}" filter="&quot;waterway&quot;='river' or &quot;waterway&quot;='stream'" label="rivière"/>
+      <rule symbol="5" key="{6eb81f3c-bc99-41b9-b35a-afdee5606037}" filter="&quot;highway&quot;='steps'" label="escalier"/>
+      <rule symbol="6" key="{2577b237-e0ad-418e-91e5-b30104eccaba}" filter="&quot;highway&quot;='primary' or &quot;highway&quot;='secondary' or &quot;highway&quot;='tertiary' or &quot;highway&quot;='residential' or &quot;highway&quot;='service' or&quot;highway&quot;='unclassified'" label="rue, route"/>
+      <rule symbol="7" key="{9f9b2742-9499-437e-bee3-ec35588d9c75}" filter="&quot;highway&quot;='path' or &quot;highway&quot;='footway'" label="sentier, chemin piéton"/>
+      <rule symbol="8" key="{32ab4ffd-6eb5-4497-81c0-c07bf261fca9}" filter="&quot;highway&quot;='track'" label="piste"/>
+      <rule symbol="9" key="{0819eb16-d95f-4f3f-9dd2-a5a7f989d83d}" filter="&quot;waterway&quot;='canal'" label="canal"/>
     </rules>
     <symbols>
-      <symbol clip_to_extent="1" type="line" name="0" force_rhr="0" alpha="1">
-        <layer locked="1" enabled="1" class="SimpleLine" pass="0">
-          <prop v="round" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <prop v="MM" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="round" k="joinstyle"/>
-          <prop v="0,0,0,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="0.4" k="line_width"/>
-          <prop v="MM" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="0" k="use_custom_dash"/>
-          <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+      <symbol clip_to_extent="1" name="0" alpha="1" type="line" force_rhr="0">
+        <layer enabled="1" class="SimpleLine" locked="1" pass="0">
+          <prop k="capstyle" v="round"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="round"/>
+          <prop k="line_color" v="0,0,0,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="0.4"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <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>
-        <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-          <prop v="4" k="average_angle_length"/>
-          <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-          <prop v="MM" k="average_angle_unit"/>
-          <prop v="3" k="interval"/>
-          <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-          <prop v="MapUnit" k="interval_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="0" k="offset_along_line"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-          <prop v="MM" k="offset_along_line_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="interval" k="placement"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="1" k="rotate"/>
+        <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+          <prop k="average_angle_length" v="4"/>
+          <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="average_angle_unit" v="MM"/>
+          <prop k="interval" v="3"/>
+          <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="interval_unit" v="MapUnit"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_along_line" v="0"/>
+          <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_along_line_unit" v="MM"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="placement" v="interval"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="rotate" v="1"/>
           <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>
-          <symbol clip_to_extent="1" type="marker" name="@0@1" force_rhr="0" alpha="1">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop v="0" k="angle"/>
-              <prop v="255,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="line" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.2" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MM" k="outline_width_unit"/>
-              <prop v="diameter" k="scale_method"/>
-              <prop v="1" 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"/>
+          <symbol clip_to_extent="1" name="@0@1" alpha="1" type="marker" force_rhr="0">
+            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="255,0,0,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="line"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.2"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MM"/>
+              <prop k="scale_method" v="diameter"/>
+              <prop k="size" v="1"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MapUnit"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <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>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="line" name="1" force_rhr="0" alpha="1">
-        <layer locked="0" enabled="1" class="SimpleLine" 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"/>
-          <prop v="MM" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="132,132,132,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="2" k="line_width"/>
-          <prop v="MM" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="0" k="use_custom_dash"/>
-          <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+      <symbol clip_to_extent="1" name="1" alpha="1" type="line" force_rhr="0">
+        <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+          <prop k="capstyle" v="square"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MapUnit"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="line_color" v="164,164,164,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="2"/>
+          <prop k="line_width_unit" v="MapUnit"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MapUnit"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <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>
+        <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+          <prop k="capstyle" v="square"/>
+          <prop k="customdash" v="0.66;2.5"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MapUnit"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="round"/>
+          <prop k="line_color" v="83,83,83,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="2"/>
+          <prop k="line_width_unit" v="MapUnit"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MapUnit"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="use_custom_dash" v="1"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <data_defined_properties>
+            <Option type="Map">
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="line" name="2" force_rhr="0" alpha="1">
-        <layer locked="0" enabled="1" class="SimpleLine" pass="0">
-          <prop v="round" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <prop v="MM" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="round" k="joinstyle"/>
-          <prop v="4,159,66,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="2" k="line_width"/>
-          <prop v="MM" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="0" k="use_custom_dash"/>
-          <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+      <symbol clip_to_extent="1" name="2" alpha="1" type="line" force_rhr="0">
+        <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+          <prop k="capstyle" v="round"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="round"/>
+          <prop k="line_color" v="4,159,66,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="2"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <effect enabled="0" type="effectStack">
             <effect type="dropShadow">
-              <prop v="13" k="blend_mode"/>
-              <prop v="2.645" k="blur_level"/>
-              <prop v="MM" k="blur_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="2" k="draw_mode"/>
-              <prop v="0" k="enabled"/>
-              <prop v="135" k="offset_angle"/>
-              <prop v="2" k="offset_distance"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_unit_scale"/>
-              <prop v="1" k="opacity"/>
+              <prop k="blend_mode" v="13"/>
+              <prop k="blur_level" v="2.645"/>
+              <prop k="blur_unit" v="MM"/>
+              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="draw_mode" v="2"/>
+              <prop k="enabled" v="0"/>
+              <prop k="offset_angle" v="135"/>
+              <prop k="offset_distance" v="2"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="opacity" v="1"/>
             </effect>
             <effect type="outerGlow">
-              <prop v="0" k="blend_mode"/>
-              <prop v="0.7935" k="blur_level"/>
-              <prop v="MM" k="blur_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-              <prop v="0,0,255,255" k="color1"/>
-              <prop v="0,255,0,255" k="color2"/>
-              <prop v="0" k="color_type"/>
-              <prop v="0" k="discrete"/>
-              <prop v="2" k="draw_mode"/>
-              <prop v="1" k="enabled"/>
-              <prop v="0.5" k="opacity"/>
-              <prop v="gradient" k="rampType"/>
-              <prop v="83,255,129,255" k="single_color"/>
-              <prop v="2" k="spread"/>
-              <prop v="MM" k="spread_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
+              <prop k="blend_mode" v="0"/>
+              <prop k="blur_level" v="0.7935"/>
+              <prop k="blur_unit" v="MM"/>
+              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color1" v="0,0,255,255"/>
+              <prop k="color2" v="0,255,0,255"/>
+              <prop k="color_type" v="0"/>
+              <prop k="discrete" v="0"/>
+              <prop k="draw_mode" v="2"/>
+              <prop k="enabled" v="1"/>
+              <prop k="opacity" v="0.5"/>
+              <prop k="rampType" v="gradient"/>
+              <prop k="single_color" v="83,255,129,255"/>
+              <prop k="spread" v="2"/>
+              <prop k="spread_unit" v="MM"/>
+              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
             </effect>
             <effect type="drawSource">
-              <prop v="0" k="blend_mode"/>
-              <prop v="2" k="draw_mode"/>
-              <prop v="1" k="enabled"/>
-              <prop v="1" k="opacity"/>
+              <prop k="blend_mode" v="0"/>
+              <prop k="draw_mode" v="2"/>
+              <prop k="enabled" v="1"/>
+              <prop k="opacity" v="1"/>
             </effect>
             <effect type="outerGlow">
-              <prop v="13" k="blend_mode"/>
-              <prop v="2.645" k="blur_level"/>
-              <prop v="MM" k="blur_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-              <prop v="0,0,255,255" k="color1"/>
-              <prop v="0,255,0,255" k="color2"/>
-              <prop v="0" k="color_type"/>
-              <prop v="0" k="discrete"/>
-              <prop v="2" k="draw_mode"/>
-              <prop v="0" k="enabled"/>
-              <prop v="0.146" k="opacity"/>
-              <prop v="gradient" k="rampType"/>
-              <prop v="255,255,255,255" k="single_color"/>
-              <prop v="2" k="spread"/>
-              <prop v="MM" k="spread_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
+              <prop k="blend_mode" v="13"/>
+              <prop k="blur_level" v="2.645"/>
+              <prop k="blur_unit" v="MM"/>
+              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color1" v="0,0,255,255"/>
+              <prop k="color2" v="0,255,0,255"/>
+              <prop k="color_type" v="0"/>
+              <prop k="discrete" v="0"/>
+              <prop k="draw_mode" v="2"/>
+              <prop k="enabled" v="0"/>
+              <prop k="opacity" v="0.146"/>
+              <prop k="rampType" v="gradient"/>
+              <prop k="single_color" v="255,255,255,255"/>
+              <prop k="spread" v="2"/>
+              <prop k="spread_unit" v="MM"/>
+              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
             </effect>
             <effect type="innerGlow">
-              <prop v="0" k="blend_mode"/>
-              <prop v="0.7935" k="blur_level"/>
-              <prop v="MM" k="blur_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-              <prop v="0,0,255,255" k="color1"/>
-              <prop v="0,255,0,255" k="color2"/>
-              <prop v="0" k="color_type"/>
-              <prop v="0" k="discrete"/>
-              <prop v="2" k="draw_mode"/>
-              <prop v="0" k="enabled"/>
-              <prop v="0.386" k="opacity"/>
-              <prop v="gradient" k="rampType"/>
-              <prop v="255,255,255,255" k="single_color"/>
-              <prop v="2" k="spread"/>
-              <prop v="MM" k="spread_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
+              <prop k="blend_mode" v="0"/>
+              <prop k="blur_level" v="0.7935"/>
+              <prop k="blur_unit" v="MM"/>
+              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color1" v="0,0,255,255"/>
+              <prop k="color2" v="0,255,0,255"/>
+              <prop k="color_type" v="0"/>
+              <prop k="discrete" v="0"/>
+              <prop k="draw_mode" v="2"/>
+              <prop k="enabled" v="0"/>
+              <prop k="opacity" v="0.386"/>
+              <prop k="rampType" v="gradient"/>
+              <prop k="single_color" v="255,255,255,255"/>
+              <prop k="spread" v="2"/>
+              <prop k="spread_unit" v="MM"/>
+              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
             </effect>
           </effect>
           <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 clip_to_extent="1" type="line" name="3" force_rhr="0" alpha="1">
-        <layer locked="0" enabled="1" class="SimpleLine" 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"/>
-          <prop v="MM" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0,0,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="0.66" k="line_width"/>
-          <prop v="MM" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="0" k="use_custom_dash"/>
-          <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+      <symbol clip_to_extent="1" name="3" alpha="1" type="line" force_rhr="0">
+        <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+          <prop k="capstyle" v="square"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="line_color" v="0,0,0,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="0.66"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <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 clip_to_extent="1" type="line" name="4" force_rhr="0" alpha="1">
-        <layer locked="0" enabled="1" class="SimpleLine" 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"/>
-          <prop v="MM" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="25,140,255,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="6" k="line_width"/>
-          <prop v="RenderMetersInMapUnits" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="0" k="use_custom_dash"/>
-          <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+      <symbol clip_to_extent="1" name="4" alpha="1" type="line" force_rhr="0">
+        <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+          <prop k="capstyle" v="square"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="line_color" v="25,140,255,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="6"/>
+          <prop k="line_width_unit" v="RenderMetersInMapUnits"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <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 clip_to_extent="1" type="line" name="5" force_rhr="0" alpha="1">
-        <layer locked="0" enabled="1" class="SimpleLine" 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"/>
-          <prop v="MapUnit" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="round" k="joinstyle"/>
-          <prop v="0,0,0,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="0.86" k="line_width"/>
-          <prop v="MapUnit" k="line_width_unit"/>
-          <prop v="-1.4" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MapUnit" k="offset_unit"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="0" k="use_custom_dash"/>
-          <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+      <symbol clip_to_extent="1" name="5" alpha="1" type="line" force_rhr="0">
+        <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+          <prop k="capstyle" v="square"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MapUnit"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="round"/>
+          <prop k="line_color" v="0,0,0,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="0.86"/>
+          <prop k="line_width_unit" v="MapUnit"/>
+          <prop k="offset" v="-1.4"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MapUnit"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <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>
-        <layer locked="0" enabled="1" class="SimpleLine" 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"/>
-          <prop v="MapUnit" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="0,0,0,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="0.86" k="line_width"/>
-          <prop v="MapUnit" k="line_width_unit"/>
-          <prop v="1.4" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MapUnit" k="offset_unit"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="0" k="use_custom_dash"/>
-          <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+        <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+          <prop k="capstyle" v="square"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MapUnit"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="line_color" v="0,0,0,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="0.86"/>
+          <prop k="line_width_unit" v="MapUnit"/>
+          <prop k="offset" v="1.4"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MapUnit"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <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>
-        <layer locked="0" enabled="1" class="MarkerLine" pass="0">
-          <prop v="4" k="average_angle_length"/>
-          <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
-          <prop v="MM" k="average_angle_unit"/>
-          <prop v="1.5" k="interval"/>
-          <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-          <prop v="MapUnit" k="interval_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="0" k="offset_along_line"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
-          <prop v="MapUnit" k="offset_along_line_unit"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MapUnit" k="offset_unit"/>
-          <prop v="interval" k="placement"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="1" k="rotate"/>
+        <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+          <prop k="average_angle_length" v="4"/>
+          <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="average_angle_unit" v="MM"/>
+          <prop k="interval" v="1.5"/>
+          <prop k="interval_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="interval_unit" v="MapUnit"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_along_line" v="0"/>
+          <prop k="offset_along_line_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_along_line_unit" v="MapUnit"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MapUnit"/>
+          <prop k="placement" v="interval"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="rotate" v="1"/>
           <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>
-          <symbol clip_to_extent="1" type="marker" name="@5@2" force_rhr="0" alpha="1">
-            <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-              <prop v="0" k="angle"/>
-              <prop v="255,0,0,255" k="color"/>
-              <prop v="1" k="horizontal_anchor_point"/>
-              <prop v="bevel" k="joinstyle"/>
-              <prop v="line" k="name"/>
-              <prop v="0,0" k="offset"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-              <prop v="MapUnit" k="offset_unit"/>
-              <prop v="0,0,0,255" k="outline_color"/>
-              <prop v="solid" k="outline_style"/>
-              <prop v="0.6" k="outline_width"/>
-              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-              <prop v="MapUnit" k="outline_width_unit"/>
-              <prop v="area" k="scale_method"/>
-              <prop v="1.7" 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"/>
+          <symbol clip_to_extent="1" name="@5@2" alpha="1" type="marker" force_rhr="0">
+            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <prop k="angle" v="0"/>
+              <prop k="color" v="255,0,0,255"/>
+              <prop k="horizontal_anchor_point" v="1"/>
+              <prop k="joinstyle" v="bevel"/>
+              <prop k="name" v="line"/>
+              <prop k="offset" v="0,0"/>
+              <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="offset_unit" v="MapUnit"/>
+              <prop k="outline_color" v="0,0,0,255"/>
+              <prop k="outline_style" v="solid"/>
+              <prop k="outline_width" v="0.6"/>
+              <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="outline_width_unit" v="MapUnit"/>
+              <prop k="scale_method" v="area"/>
+              <prop k="size" v="1.7"/>
+              <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="size_unit" v="MapUnit"/>
+              <prop k="vertical_anchor_point" v="1"/>
               <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>
         </layer>
       </symbol>
-      <symbol clip_to_extent="1" type="line" name="6" force_rhr="0" alpha="1">
-        <layer locked="0" enabled="1" class="SimpleLine" pass="5">
-          <prop v="square" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <prop v="MapUnit" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="203,203,203,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="5" k="line_width"/>
-          <prop v="MapUnit" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MapUnit" k="offset_unit"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="0" k="use_custom_dash"/>
-          <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+      <symbol clip_to_extent="1" name="6" alpha="1" type="line" force_rhr="0">
+        <layer enabled="1" class="SimpleLine" locked="0" pass="5">
+          <prop k="capstyle" v="square"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MapUnit"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="line_color" v="203,203,203,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="5"/>
+          <prop k="line_width_unit" v="MapUnit"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MapUnit"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <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 clip_to_extent="1" type="line" name="7" force_rhr="0" alpha="1">
-        <layer locked="0" enabled="1" class="SimpleLine" pass="0">
-          <prop v="round" k="capstyle"/>
-          <prop v="0.66;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <prop v="MM" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="round" k="joinstyle"/>
-          <prop v="219,30,42,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="1" k="line_width"/>
-          <prop v="MM" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MM" k="offset_unit"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="1" k="use_custom_dash"/>
-          <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+      <symbol clip_to_extent="1" name="7" alpha="1" type="line" force_rhr="0">
+        <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+          <prop k="capstyle" v="round"/>
+          <prop k="customdash" v="0.66;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MM"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="round"/>
+          <prop k="line_color" v="219,30,42,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="1"/>
+          <prop k="line_width_unit" v="MM"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MM"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="use_custom_dash" v="1"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <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 clip_to_extent="1" type="line" name="8" force_rhr="0" alpha="1">
-        <layer locked="1" enabled="1" class="SimpleLine" pass="4">
-          <prop v="round" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <prop v="RenderMetersInMapUnits" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="round" k="joinstyle"/>
-          <prop v="0,0,0,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="3" k="line_width"/>
-          <prop v="RenderMetersInMapUnits" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="RenderMetersInMapUnits" k="offset_unit"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="0" k="use_custom_dash"/>
-          <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+      <symbol clip_to_extent="1" name="8" alpha="1" type="line" force_rhr="0">
+        <layer enabled="1" class="SimpleLine" locked="1" pass="4">
+          <prop k="capstyle" v="round"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="RenderMetersInMapUnits"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="round"/>
+          <prop k="line_color" v="0,0,0,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="3"/>
+          <prop k="line_width_unit" v="RenderMetersInMapUnits"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="RenderMetersInMapUnits"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <effect enabled="1" type="effectStack">
             <effect type="dropShadow">
-              <prop v="13" k="blend_mode"/>
-              <prop v="2.645" k="blur_level"/>
-              <prop v="MM" k="blur_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="2" k="draw_mode"/>
-              <prop v="0" k="enabled"/>
-              <prop v="135" k="offset_angle"/>
-              <prop v="2" k="offset_distance"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_unit_scale"/>
-              <prop v="1" k="opacity"/>
+              <prop k="blend_mode" v="13"/>
+              <prop k="blur_level" v="2.645"/>
+              <prop k="blur_unit" v="MM"/>
+              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="draw_mode" v="2"/>
+              <prop k="enabled" v="0"/>
+              <prop k="offset_angle" v="135"/>
+              <prop k="offset_distance" v="2"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="opacity" v="1"/>
             </effect>
             <effect type="outerGlow">
-              <prop v="0" k="blend_mode"/>
-              <prop v="2.645" k="blur_level"/>
-              <prop v="MM" k="blur_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-              <prop v="0,0,255,255" k="color1"/>
-              <prop v="0,255,0,255" k="color2"/>
-              <prop v="0" k="color_type"/>
-              <prop v="0" k="discrete"/>
-              <prop v="2" k="draw_mode"/>
-              <prop v="0" k="enabled"/>
-              <prop v="0.5" k="opacity"/>
-              <prop v="gradient" k="rampType"/>
-              <prop v="255,255,255,255" k="single_color"/>
-              <prop v="2" k="spread"/>
-              <prop v="MM" k="spread_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
+              <prop k="blend_mode" v="0"/>
+              <prop k="blur_level" v="2.645"/>
+              <prop k="blur_unit" v="MM"/>
+              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color1" v="0,0,255,255"/>
+              <prop k="color2" v="0,255,0,255"/>
+              <prop k="color_type" v="0"/>
+              <prop k="discrete" v="0"/>
+              <prop k="draw_mode" v="2"/>
+              <prop k="enabled" v="0"/>
+              <prop k="opacity" v="0.5"/>
+              <prop k="rampType" v="gradient"/>
+              <prop k="single_color" v="255,255,255,255"/>
+              <prop k="spread" v="2"/>
+              <prop k="spread_unit" v="MM"/>
+              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
             </effect>
             <effect type="drawSource">
-              <prop v="18" k="blend_mode"/>
-              <prop v="2" k="draw_mode"/>
-              <prop v="1" k="enabled"/>
-              <prop v="1" k="opacity"/>
+              <prop k="blend_mode" v="18"/>
+              <prop k="draw_mode" v="2"/>
+              <prop k="enabled" v="1"/>
+              <prop k="opacity" v="1"/>
             </effect>
             <effect type="innerShadow">
-              <prop v="13" k="blend_mode"/>
-              <prop v="2.645" k="blur_level"/>
-              <prop v="MM" k="blur_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-              <prop v="0,0,0,255" k="color"/>
-              <prop v="2" k="draw_mode"/>
-              <prop v="0" k="enabled"/>
-              <prop v="135" k="offset_angle"/>
-              <prop v="2" k="offset_distance"/>
-              <prop v="MM" k="offset_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="offset_unit_scale"/>
-              <prop v="1" k="opacity"/>
+              <prop k="blend_mode" v="13"/>
+              <prop k="blur_level" v="2.645"/>
+              <prop k="blur_unit" v="MM"/>
+              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color" v="0,0,0,255"/>
+              <prop k="draw_mode" v="2"/>
+              <prop k="enabled" v="0"/>
+              <prop k="offset_angle" v="135"/>
+              <prop k="offset_distance" v="2"/>
+              <prop k="offset_unit" v="MM"/>
+              <prop k="offset_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="opacity" v="1"/>
             </effect>
             <effect type="innerGlow">
-              <prop v="0" k="blend_mode"/>
-              <prop v="2.645" k="blur_level"/>
-              <prop v="MM" k="blur_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="blur_unit_scale"/>
-              <prop v="0,0,255,255" k="color1"/>
-              <prop v="0,255,0,255" k="color2"/>
-              <prop v="0" k="color_type"/>
-              <prop v="0" k="discrete"/>
-              <prop v="2" k="draw_mode"/>
-              <prop v="0" k="enabled"/>
-              <prop v="0.5" k="opacity"/>
-              <prop v="gradient" k="rampType"/>
-              <prop v="255,255,255,255" k="single_color"/>
-              <prop v="2" k="spread"/>
-              <prop v="MM" k="spread_unit"/>
-              <prop v="3x:0,0,0,0,0,0" k="spread_unit_scale"/>
+              <prop k="blend_mode" v="0"/>
+              <prop k="blur_level" v="2.645"/>
+              <prop k="blur_unit" v="MM"/>
+              <prop k="blur_unit_scale" v="3x:0,0,0,0,0,0"/>
+              <prop k="color1" v="0,0,255,255"/>
+              <prop k="color2" v="0,255,0,255"/>
+              <prop k="color_type" v="0"/>
+              <prop k="discrete" v="0"/>
+              <prop k="draw_mode" v="2"/>
+              <prop k="enabled" v="0"/>
+              <prop k="opacity" v="0.5"/>
+              <prop k="rampType" v="gradient"/>
+              <prop k="single_color" v="255,255,255,255"/>
+              <prop k="spread" v="2"/>
+              <prop k="spread_unit" v="MM"/>
+              <prop k="spread_unit_scale" v="3x:0,0,0,0,0,0"/>
             </effect>
           </effect>
           <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>
-        <layer locked="0" enabled="1" class="SimpleLine" pass="4">
-          <prop v="round" k="capstyle"/>
-          <prop v="5;2" k="customdash"/>
-          <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-          <prop v="RenderMetersInMapUnits" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="round" k="joinstyle"/>
-          <prop v="243,188,84,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="2.43396" k="line_width"/>
-          <prop v="RenderMetersInMapUnits" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="RenderMetersInMapUnits" k="offset_unit"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="0" k="use_custom_dash"/>
-          <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+        <layer enabled="1" class="SimpleLine" locked="0" pass="4">
+          <prop k="capstyle" v="round"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="RenderMetersInMapUnits"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="round"/>
+          <prop k="line_color" v="243,188,84,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="2.43396"/>
+          <prop k="line_width_unit" v="RenderMetersInMapUnits"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="RenderMetersInMapUnits"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <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 clip_to_extent="1" type="line" name="9" force_rhr="0" alpha="1">
-        <layer locked="0" enabled="1" class="SimpleLine" 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"/>
-          <prop v="MapUnit" k="customdash_unit"/>
-          <prop v="0" k="draw_inside_polygon"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="25,140,255,255" k="line_color"/>
-          <prop v="solid" k="line_style"/>
-          <prop v="1" k="line_width"/>
-          <prop v="MapUnit" k="line_width_unit"/>
-          <prop v="0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="MapUnit" k="offset_unit"/>
-          <prop v="0" k="ring_filter"/>
-          <prop v="0" k="use_custom_dash"/>
-          <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+      <symbol clip_to_extent="1" name="9" alpha="1" type="line" force_rhr="0">
+        <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+          <prop k="capstyle" v="square"/>
+          <prop k="customdash" v="5;2"/>
+          <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="customdash_unit" v="MapUnit"/>
+          <prop k="draw_inside_polygon" v="0"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="line_color" v="25,140,255,255"/>
+          <prop k="line_style" v="solid"/>
+          <prop k="line_width" v="1"/>
+          <prop k="line_width_unit" v="MapUnit"/>
+          <prop k="offset" v="0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="MapUnit"/>
+          <prop k="ring_filter" v="0"/>
+          <prop k="use_custom_dash" v="0"/>
+          <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
           <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>
@@ -596,161 +621,161 @@
     </symbols>
   </renderer-v2>
   <labeling type="rule-based">
-    <rules key="{08af8f14-e91c-475b-95e5-6c6ef35b0e76}">
-      <rule filter="&quot;waterway&quot;='river'or&quot;waterway&quot;='stream'" key="{df1b754b-25ba-427f-aa65-9030228b62e4}">
+    <rules key="{b7a94663-67c2-49ae-bf0d-6475c69f0f59}">
+      <rule key="{3d7173be-a2bf-4c0c-945e-2970a65d97e3}" filter="&quot;waterway&quot;='river'or&quot;waterway&quot;='stream'">
         <settings calloutType="simple">
-          <text-style fieldName="name" fontWordSpacing="0" namedStyle="Regular" fontKerning="1" fontSizeUnit="Point" textOrientation="horizontal" fontFamily="Liberation Sans" fontCapitals="0" fontItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" blendMode="0" textOpacity="1" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" useSubstitutions="0">
-            <text-buffer bufferDraw="1" bufferSize="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferBlendMode="0" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeSizeY="0" shapeBorderWidth="0" shapeRotation="0" shapeRadiiUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeRotationType="0" shapeOffsetX="0" shapeBlendMode="0" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeDraw="0" shapeOffsetY="0" shapeSizeType="0" shapeSizeX="0" shapeOpacity="1">
-              <symbol clip_to_extent="1" type="marker" name="markerSymbol" force_rhr="0" alpha="1">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="232,113,141,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="35,35,35,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+          <text-style previewBkgrdColor="255,255,255,255" fontStrikeout="0" textOpacity="1" fontLetterSpacing="0" textColor="0,0,0,255" blendMode="0" fontWordSpacing="0" fieldName="name" fontKerning="1" isExpression="0" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" fontFamily="Liberation Sans" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" namedStyle="Regular" fontWeight="50" multilineHeight="1" fontSize="10" fontItalic="0" fontUnderline="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="1" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255"/>
+            <background shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetX="0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeType="0" shapeRadiiUnit="MM" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeBlendMode="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeDraw="0" shapeSVGFile="" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeUnit="MM" shapeType="0">
+              <symbol clip_to_extent="1" name="markerSymbol" alpha="1" type="marker" force_rhr="0">
+                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="232,113,141,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="35,35,35,255"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <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 shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetUnit="MM" shadowBlendMode="6" shadowUnder="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowScale="100" shadowOpacity="0.7" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5"/>
             <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 autoWrapLength="0" addDirectionSymbol="0" formatNumbers="0" multilineAlign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" useMaxLineLengthForAutoWrap="1" plussign="0" wrapChar="" rightDirectionSymbol=">"/>
-          <placement offsetUnits="MM" repeatDistance="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" fitInPolygonOnly="0" rotationAngle="0" priority="5" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" overrunDistance="0" preserveRotation="1" overrunDistanceUnit="MM" dist="0" centroidInside="0" geometryGeneratorEnabled="0" maxCurvedCharAngleIn="25" geometryGenerator="" placement="3" maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" quadOffset="4" repeatDistanceUnits="MM" yOffset="0" placementFlags="9" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" layerType="LineGeometry"/>
-          <rendering fontMinPixelSize="3" drawLabels="1" fontMaxPixelSize="10000" mergeLines="0" scaleMin="0" displayAll="0" obstacleFactor="1" scaleVisibility="0" obstacleType="0" labelPerPart="0" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" limitNumLabels="0" scaleMax="0" maxNumLabels="2000" obstacle="1"/>
+          <text-format addDirectionSymbol="0" autoWrapLength="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" rightDirectionSymbol=">"/>
+          <placement dist="0" geometryGeneratorType="PointGeometry" offsetUnits="MM" offsetType="0" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" preserveRotation="1" placement="3" fitInPolygonOnly="0" rotationAngle="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" geometryGeneratorEnabled="0" placementFlags="9" priority="5" overrunDistance="0" repeatDistance="0" xOffset="0" centroidWhole="0" layerType="LineGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distUnits="MM" yOffset="0" quadOffset="4" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" geometryGenerator=""/>
+          <rendering mergeLines="0" limitNumLabels="0" obstacle="1" labelPerPart="0" obstacleType="0" fontMaxPixelSize="10000" obstacleFactor="1" fontLimitPixelSize="0" scaleVisibility="0" drawLabels="1" fontMinPixelSize="3" maxNumLabels="2000" scaleMax="0" upsidedownLabels="0" zIndex="0" scaleMin="0" displayAll="0" minFeatureSize="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 clip_to_extent=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&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 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; alpha=&quot;1&quot; type=&quot;line&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 k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </rule>
-      <rule filter="&quot;highway&quot; is not null and &quot;name&quot; is not null" key="{c9f1d287-73e0-4ab2-b3e5-c3b9b5746f6b}">
+      <rule key="{3e3d0bb1-46cc-4e2b-90d8-49cbbaa4a921}" filter="&quot;highway&quot; is not null and &quot;name&quot; is not null">
         <settings calloutType="simple">
-          <text-style fieldName="name" fontWordSpacing="0" namedStyle="Regular" fontKerning="1" fontSizeUnit="Point" textOrientation="horizontal" fontFamily="Liberation Sans" fontCapitals="0" fontItalic="0" isExpression="0" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontUnderline="0" fontLetterSpacing="0" blendMode="0" textOpacity="1" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" useSubstitutions="0">
-            <text-buffer bufferDraw="1" bufferSize="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128" bufferBlendMode="0" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeSizeY="0" shapeBorderWidth="0" shapeRotation="0" shapeRadiiUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeRotationType="0" shapeOffsetX="0" shapeBlendMode="0" shapeSVGFile="" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiY="0" shapeBorderWidthUnit="MM" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeDraw="0" shapeOffsetY="0" shapeSizeType="0" shapeSizeX="0" shapeOpacity="1">
-              <symbol clip_to_extent="1" type="marker" name="markerSymbol" force_rhr="0" alpha="1">
-                <layer locked="0" enabled="1" class="SimpleMarker" pass="0">
-                  <prop v="0" k="angle"/>
-                  <prop v="114,155,111,255" k="color"/>
-                  <prop v="1" k="horizontal_anchor_point"/>
-                  <prop v="bevel" k="joinstyle"/>
-                  <prop v="circle" k="name"/>
-                  <prop v="0,0" k="offset"/>
-                  <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                  <prop v="MM" k="offset_unit"/>
-                  <prop v="35,35,35,255" k="outline_color"/>
-                  <prop v="solid" k="outline_style"/>
-                  <prop v="0" k="outline_width"/>
-                  <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-                  <prop v="MM" k="outline_width_unit"/>
-                  <prop v="diameter" k="scale_method"/>
-                  <prop v="2" k="size"/>
-                  <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-                  <prop v="MM" k="size_unit"/>
-                  <prop v="1" k="vertical_anchor_point"/>
+          <text-style previewBkgrdColor="255,255,255,255" fontStrikeout="0" textOpacity="1" fontLetterSpacing="0" textColor="0,0,0,255" blendMode="0" fontWordSpacing="0" fieldName="name" fontKerning="1" isExpression="0" fontCapitals="0" fontSizeUnit="Point" useSubstitutions="0" fontFamily="Liberation Sans" fontSizeMapUnitScale="3x:0,0,0,0,0,0" textOrientation="horizontal" namedStyle="Regular" fontWeight="50" multilineHeight="1" fontSize="10" fontItalic="0" fontUnderline="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferJoinStyle="128" bufferBlendMode="0" bufferDraw="1" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255"/>
+            <background shapeOffsetUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeOffsetX="0" shapeRadiiX="0" shapeBorderWidth="0" shapeSizeY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeSizeType="0" shapeRadiiUnit="MM" shapeRadiiY="0" shapeFillColor="255,255,255,255" shapeBorderWidthUnit="MM" shapeOpacity="1" shapeBlendMode="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeDraw="0" shapeSVGFile="" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeUnit="MM" shapeType="0">
+              <symbol clip_to_extent="1" name="markerSymbol" alpha="1" type="marker" force_rhr="0">
+                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                  <prop k="angle" v="0"/>
+                  <prop k="color" v="114,155,111,255"/>
+                  <prop k="horizontal_anchor_point" v="1"/>
+                  <prop k="joinstyle" v="bevel"/>
+                  <prop k="name" v="circle"/>
+                  <prop k="offset" v="0,0"/>
+                  <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="offset_unit" v="MM"/>
+                  <prop k="outline_color" v="35,35,35,255"/>
+                  <prop k="outline_style" v="solid"/>
+                  <prop k="outline_width" v="0"/>
+                  <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="outline_width_unit" v="MM"/>
+                  <prop k="scale_method" v="diameter"/>
+                  <prop k="size" v="2"/>
+                  <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                  <prop k="size_unit" v="MM"/>
+                  <prop k="vertical_anchor_point" v="1"/>
                   <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 shadowScale="100" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetUnit="MM" shadowBlendMode="6" shadowUnder="0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowBlendMode="6" shadowDraw="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowScale="100" shadowOpacity="0.7" shadowUnder="0" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5"/>
             <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 autoWrapLength="0" addDirectionSymbol="0" formatNumbers="0" multilineAlign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" decimals="3" useMaxLineLengthForAutoWrap="1" plussign="0" wrapChar="" rightDirectionSymbol=">"/>
-          <placement offsetUnits="MM" repeatDistance="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" fitInPolygonOnly="0" rotationAngle="0" priority="5" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" xOffset="0" overrunDistance="0" preserveRotation="1" overrunDistanceUnit="MM" dist="0" centroidInside="0" geometryGeneratorEnabled="0" maxCurvedCharAngleIn="25" geometryGenerator="" placement="3" maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" quadOffset="4" repeatDistanceUnits="MM" yOffset="0" placementFlags="9" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" layerType="LineGeometry"/>
-          <rendering fontMinPixelSize="3" drawLabels="1" fontMaxPixelSize="10000" mergeLines="0" scaleMin="0" displayAll="0" obstacleFactor="1" scaleVisibility="0" obstacleType="0" labelPerPart="0" fontLimitPixelSize="0" minFeatureSize="0" upsidedownLabels="0" zIndex="0" limitNumLabels="0" scaleMax="0" maxNumLabels="2000" obstacle="1"/>
+          <text-format addDirectionSymbol="0" autoWrapLength="0" leftDirectionSymbol="&lt;" formatNumbers="0" multilineAlign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" rightDirectionSymbol=">"/>
+          <placement dist="0" geometryGeneratorType="PointGeometry" offsetUnits="MM" offsetType="0" maxCurvedCharAngleOut="-25" overrunDistanceUnit="MM" preserveRotation="1" placement="3" fitInPolygonOnly="0" rotationAngle="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" geometryGeneratorEnabled="0" placementFlags="9" priority="5" overrunDistance="0" repeatDistance="0" xOffset="0" centroidWhole="0" layerType="LineGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" distUnits="MM" yOffset="0" quadOffset="4" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" geometryGenerator=""/>
+          <rendering mergeLines="0" limitNumLabels="0" obstacle="1" labelPerPart="0" obstacleType="0" fontMaxPixelSize="10000" obstacleFactor="1" fontLimitPixelSize="0" scaleVisibility="0" drawLabels="1" fontMinPixelSize="3" maxNumLabels="2000" scaleMax="0" upsidedownLabels="0" zIndex="0" scaleMin="0" displayAll="0" minFeatureSize="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 clip_to_extent=&quot;1&quot; type=&quot;line&quot; name=&quot;symbol&quot; force_rhr=&quot;0&quot; alpha=&quot;1&quot;>&lt;layer locked=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&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 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; alpha=&quot;1&quot; type=&quot;line&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 k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
@@ -758,30 +783,30 @@
     </rules>
   </labeling>
   <customproperties>
-    <property value="full_id" key="dualview/previewExpressions"/>
-    <property value="0" key="embeddedWidgets/count"/>
-    <property value="quickosm_query" key="variableNames"/>
-    <property value="&lt;osm-script bbox=&quot;44.08902897426553,6.24723494052887,44.089850630280395,6.249284148216248&quot;>&#xa;  &lt;union into=&quot;_&quot;>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;amenity&quot; modv=&quot;&quot; v=&quot;bench&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;barrier&quot; modv=&quot;&quot; v=&quot;gate&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;amenity&quot; modv=&quot;&quot; v=&quot;trash&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;way&quot;>&#xa;      &lt;has-kv k=&quot;building&quot; modv=&quot;&quot; v=&quot;&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;information&quot; modv=&quot;&quot; v=&quot;board&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;natural&quot; modv=&quot;&quot; v=&quot;tree_stump&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;natural&quot; modv=&quot;&quot; v=&quot;tree&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;way&quot;>&#xa;      &lt;has-kv k=&quot;barrier&quot; modv=&quot;&quot; v=&quot;wall&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;leisure&quot; modv=&quot;&quot; v=&quot;playground&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;leisure&quot; modv=&quot;&quot; v=&quot;picnic_table&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;way&quot;>&#xa;      &lt;has-kv k=&quot;barrier&quot; modv=&quot;&quot; v=&quot;fence&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;way&quot;>&#xa;      &lt;has-kv k=&quot;landuse&quot; modv=&quot;&quot; v=&quot;grass&quot;/>&#xa;    &lt;/query>&#xa;  &lt;/union>&#xa;  &lt;print e=&quot;&quot; from=&quot;_&quot; geometry=&quot;skeleton&quot; ids=&quot;yes&quot; limit=&quot;&quot; mode=&quot;body&quot; n=&quot;&quot; order=&quot;id&quot; s=&quot;&quot; w=&quot;&quot;/>&#xa;  &lt;recurse from=&quot;_&quot; into=&quot;_&quot; type=&quot;down&quot;/>&#xa;  &lt;print e=&quot;&quot; from=&quot;_&quot; geometry=&quot;skeleton&quot; ids=&quot;yes&quot; limit=&quot;&quot; mode=&quot;body&quot; n=&quot;&quot; order=&quot;id&quot; s=&quot;&quot; w=&quot;&quot;/>&#xa;&lt;/osm-script>" key="variableValues"/>
+    <property key="dualview/previewExpressions" value="full_id"/>
+    <property key="embeddedWidgets/count" value="0"/>
+    <property key="variableNames" value="quickosm_query"/>
+    <property key="variableValues" value="&lt;osm-script bbox=&quot;44.08902897426553,6.24723494052887,44.089850630280395,6.249284148216248&quot;>&#xa;  &lt;union into=&quot;_&quot;>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;amenity&quot; modv=&quot;&quot; v=&quot;bench&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;barrier&quot; modv=&quot;&quot; v=&quot;gate&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;amenity&quot; modv=&quot;&quot; v=&quot;trash&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;way&quot;>&#xa;      &lt;has-kv k=&quot;building&quot; modv=&quot;&quot; v=&quot;&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;information&quot; modv=&quot;&quot; v=&quot;board&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;natural&quot; modv=&quot;&quot; v=&quot;tree_stump&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;natural&quot; modv=&quot;&quot; v=&quot;tree&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;way&quot;>&#xa;      &lt;has-kv k=&quot;barrier&quot; modv=&quot;&quot; v=&quot;wall&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;leisure&quot; modv=&quot;&quot; v=&quot;playground&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;node&quot;>&#xa;      &lt;has-kv k=&quot;leisure&quot; modv=&quot;&quot; v=&quot;picnic_table&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;way&quot;>&#xa;      &lt;has-kv k=&quot;barrier&quot; modv=&quot;&quot; v=&quot;fence&quot;/>&#xa;    &lt;/query>&#xa;    &lt;query into=&quot;_&quot; type=&quot;way&quot;>&#xa;      &lt;has-kv k=&quot;landuse&quot; modv=&quot;&quot; v=&quot;grass&quot;/>&#xa;    &lt;/query>&#xa;  &lt;/union>&#xa;  &lt;print e=&quot;&quot; from=&quot;_&quot; geometry=&quot;skeleton&quot; ids=&quot;yes&quot; limit=&quot;&quot; mode=&quot;body&quot; n=&quot;&quot; order=&quot;id&quot; s=&quot;&quot; w=&quot;&quot;/>&#xa;  &lt;recurse from=&quot;_&quot; into=&quot;_&quot; type=&quot;down&quot;/>&#xa;  &lt;print e=&quot;&quot; from=&quot;_&quot; geometry=&quot;skeleton&quot; ids=&quot;yes&quot; limit=&quot;&quot; mode=&quot;body&quot; n=&quot;&quot; order=&quot;id&quot; s=&quot;&quot; w=&quot;&quot;/>&#xa;&lt;/osm-script>"/>
   </customproperties>
   <blendMode>0</blendMode>
   <featureBlendMode>0</featureBlendMode>
   <layerOpacity>1</layerOpacity>
-  <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-    <DiagramCategory scaleBasedVisibility="0" opacity="1" backgroundColor="#ffffff" scaleDependency="Area" diagramOrientation="Up" enabled="0" labelPlacementMethod="XHeight" height="15" minScaleDenominator="0" sizeType="MM" barWidth="5" minimumSize="0" lineSizeType="MM" penColor="#000000" lineSizeScale="3x:0,0,0,0,0,0" sizeScale="3x:0,0,0,0,0,0" maxScaleDenominator="1e+08" backgroundAlpha="255" width="15" penAlpha="255" rotationOffset="270" penWidth="0">
-      <fontProperties style="" description="Liberation Sans,10,-1,5,50,0,0,0,0,0"/>
-      <attribute color="#000000" label="" field=""/>
+  <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+    <DiagramCategory barWidth="5" maxScaleDenominator="1e+08" width="15" backgroundAlpha="255" scaleDependency="Area" minimumSize="0" minScaleDenominator="0" backgroundColor="#ffffff" labelPlacementMethod="XHeight" height="15" penWidth="0" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" scaleBasedVisibility="0" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" rotationOffset="270" penAlpha="255" opacity="1" sizeType="MM" lineSizeType="MM" penColor="#000000">
+      <fontProperties description="Liberation Sans,10,-1,5,50,0,0,0,0,0" style=""/>
+      <attribute field="" label="" color="#000000"/>
     </DiagramCategory>
   </SingleCategoryDiagramRenderer>
-  <DiagramLayerSettings dist="0" priority="0" placement="2" linePlacementFlags="18" zIndex="0" showAll="1" obstacle="0">
+  <DiagramLayerSettings priority="0" obstacle="0" linePlacementFlags="18" zIndex="0" placement="2" dist="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>
-  <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+  <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
     <activeChecks/>
     <checkConfiguration/>
   </geometryOptions>
@@ -856,14 +881,28 @@
         </config>
       </editWidget>
     </field>
-    <field name="smoothness">
+    <field name="wheelchair">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="cycleway:lane">
+    <field name="height">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="informal">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="maxwidth">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -877,49 +916,7 @@
         </config>
       </editWidget>
     </field>
-    <field name="tunnel">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="footway">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="embankment">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="service">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="sidewalk">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="cycleway:right:segregated">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="width">
+    <field name="traffic_calming">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -933,20 +930,6 @@
         </config>
       </editWidget>
     </field>
-    <field name="motor_vehicle">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="foot">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
     <field name="bus">
       <editWidget type="TextEdit">
         <config>
@@ -954,7 +937,161 @@
         </config>
       </editWidget>
     </field>
-    <field name="bicycle">
+    <field name="turn:lanes">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="turn:lanes:forward">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="turn:lanes:backward">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="int_ref">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="footway">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="crossing">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="start_date">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="source:url">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="political_division">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="network">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="name:fr">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="embankment">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="ford">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="cycleway:left">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="alt_name">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="excellent">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="maxheight">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="wikipedia">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="note:railway">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="snowmobile">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="motor_vehicle">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="horse">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="access:conditional">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -968,6 +1105,27 @@
         </config>
       </editWidget>
     </field>
+    <field name="trailblazed">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="trail_visibility">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="source:name">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
     <field name="lanes:forward">
       <editWidget type="TextEdit">
         <config>
@@ -982,28 +1140,133 @@
         </config>
       </editWidget>
     </field>
-    <field name="alt_name">
+    <field name="destination:forward">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="maxspeed:type">
+    <field name="cycleway:lane">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="cycleway:both">
+    <field name="tunnel">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="cycleway:right">
+    <field name="segregated">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="bicycle">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="smoothness">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="mtb:description">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="foot">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="sac_scale">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="mtb:scale:uphill">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="mtb:scale">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="incline">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="description">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="history">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="tracktype">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="service">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="boundary">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="admin_level">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="noname">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -1017,14 +1280,21 @@
         </config>
       </editWidget>
     </field>
-    <field name="lit">
+    <field name="destination:backward">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="ref">
+    <field name="lane_markings">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="old_ref">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -1045,21 +1315,7 @@
         </config>
       </editWidget>
     </field>
-    <field name="oneway">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="old_ref">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="maxweight:signed">
+    <field name="source:maxspeed">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -1073,13 +1329,6 @@
         </config>
       </editWidget>
     </field>
-    <field name="lanes">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
     <field name="bridge">
       <editWidget type="TextEdit">
         <config>
@@ -1087,14 +1336,112 @@
         </config>
       </editWidget>
     </field>
-    <field name="surface">
+    <field name="railway">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="source:maxspeed">
+    <field name="width">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="source:width">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="sidewalk">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="lit">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="cycleway:right">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="maxweight">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="maxspeed:type">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="cycleway:both">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="old_name">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="lanes">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="source:name:oc">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="name:oc">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="ref">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="oneway">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="surface">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -1117,153 +1464,291 @@
     </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="highway"/>
-    <alias index="4" name="" field="waterway"/>
-    <alias index="5" name="" field="aerialway"/>
-    <alias index="6" name="" field="barrier"/>
-    <alias index="7" name="" field="man_made"/>
-    <alias index="8" name="" field="z_order"/>
-    <alias index="9" name="" field="other_tags"/>
-    <alias index="10" name="" field="smoothness"/>
-    <alias index="11" name="" field="cycleway:lane"/>
-    <alias index="12" name="" field="bus_bay"/>
-    <alias index="13" name="" field="tunnel"/>
-    <alias index="14" name="" field="footway"/>
-    <alias index="15" name="" field="embankment"/>
-    <alias index="16" name="" field="service"/>
-    <alias index="17" name="" field="sidewalk"/>
-    <alias index="18" name="" field="cycleway:right:segregated"/>
-    <alias index="19" name="" field="width"/>
-    <alias index="20" name="" field="taxi"/>
-    <alias index="21" name="" field="motor_vehicle"/>
-    <alias index="22" name="" field="foot"/>
-    <alias index="23" name="" field="bus"/>
-    <alias index="24" name="" field="bicycle"/>
-    <alias index="25" name="" field="access"/>
-    <alias index="26" name="" field="lanes:forward"/>
-    <alias index="27" name="" field="lanes:backward"/>
-    <alias index="28" name="" field="alt_name"/>
-    <alias index="29" name="" field="maxspeed:type"/>
-    <alias index="30" name="" field="cycleway:both"/>
-    <alias index="31" name="" field="cycleway:right"/>
-    <alias index="32" name="" field="cycleway"/>
-    <alias index="33" name="" field="lit"/>
-    <alias index="34" name="" field="ref"/>
-    <alias index="35" name="" field="destination:symbol"/>
-    <alias index="36" name="" field="destination"/>
-    <alias index="37" name="" field="oneway"/>
-    <alias index="38" name="" field="old_ref"/>
-    <alias index="39" name="" field="maxweight:signed"/>
-    <alias index="40" name="" field="layer"/>
-    <alias index="41" name="" field="lanes"/>
-    <alias index="42" name="" field="bridge"/>
-    <alias index="43" name="" field="surface"/>
-    <alias index="44" name="" field="source:maxspeed"/>
-    <alias index="45" name="" field="maxspeed"/>
-    <alias index="46" name="" field="junction"/>
+    <alias name="" index="0" field="fid"/>
+    <alias name="" index="1" field="osm_id"/>
+    <alias name="" index="2" field="name"/>
+    <alias name="" index="3" field="highway"/>
+    <alias name="" index="4" field="waterway"/>
+    <alias name="" index="5" field="aerialway"/>
+    <alias name="" index="6" field="barrier"/>
+    <alias name="" index="7" field="man_made"/>
+    <alias name="" index="8" field="z_order"/>
+    <alias name="" index="9" field="other_tags"/>
+    <alias name="" index="10" field="wheelchair"/>
+    <alias name="" index="11" field="height"/>
+    <alias name="" index="12" field="informal"/>
+    <alias name="" index="13" field="maxwidth"/>
+    <alias name="" index="14" field="bus_bay"/>
+    <alias name="" index="15" field="traffic_calming"/>
+    <alias name="" index="16" field="taxi"/>
+    <alias name="" index="17" field="bus"/>
+    <alias name="" index="18" field="turn:lanes"/>
+    <alias name="" index="19" field="turn:lanes:forward"/>
+    <alias name="" index="20" field="turn:lanes:backward"/>
+    <alias name="" index="21" field="int_ref"/>
+    <alias name="" index="22" field="footway"/>
+    <alias name="" index="23" field="crossing"/>
+    <alias name="" index="24" field="start_date"/>
+    <alias name="" index="25" field="source:url"/>
+    <alias name="" index="26" field="political_division"/>
+    <alias name="" index="27" field="network"/>
+    <alias name="" index="28" field="name:fr"/>
+    <alias name="" index="29" field="embankment"/>
+    <alias name="" index="30" field="ford"/>
+    <alias name="" index="31" field="cycleway:left"/>
+    <alias name="" index="32" field="alt_name"/>
+    <alias name="" index="33" field="excellent"/>
+    <alias name="" index="34" field="maxheight"/>
+    <alias name="" index="35" field="wikipedia"/>
+    <alias name="" index="36" field="note:railway"/>
+    <alias name="" index="37" field="snowmobile"/>
+    <alias name="" index="38" field="motor_vehicle"/>
+    <alias name="" index="39" field="horse"/>
+    <alias name="" index="40" field="access:conditional"/>
+    <alias name="" index="41" field="access"/>
+    <alias name="" index="42" field="trailblazed"/>
+    <alias name="" index="43" field="trail_visibility"/>
+    <alias name="" index="44" field="source:name"/>
+    <alias name="" index="45" field="lanes:forward"/>
+    <alias name="" index="46" field="lanes:backward"/>
+    <alias name="" index="47" field="destination:forward"/>
+    <alias name="" index="48" field="cycleway:lane"/>
+    <alias name="" index="49" field="tunnel"/>
+    <alias name="" index="50" field="segregated"/>
+    <alias name="" index="51" field="bicycle"/>
+    <alias name="" index="52" field="smoothness"/>
+    <alias name="" index="53" field="mtb:description"/>
+    <alias name="" index="54" field="foot"/>
+    <alias name="" index="55" field="sac_scale"/>
+    <alias name="" index="56" field="mtb:scale:uphill"/>
+    <alias name="" index="57" field="mtb:scale"/>
+    <alias name="" index="58" field="incline"/>
+    <alias name="" index="59" field="description"/>
+    <alias name="" index="60" field="history"/>
+    <alias name="" index="61" field="tracktype"/>
+    <alias name="" index="62" field="service"/>
+    <alias name="" index="63" field="boundary"/>
+    <alias name="" index="64" field="admin_level"/>
+    <alias name="" index="65" field="noname"/>
+    <alias name="" index="66" field="cycleway"/>
+    <alias name="" index="67" field="destination:backward"/>
+    <alias name="" index="68" field="lane_markings"/>
+    <alias name="" index="69" field="old_ref"/>
+    <alias name="" index="70" field="destination:symbol"/>
+    <alias name="" index="71" field="destination"/>
+    <alias name="" index="72" field="source:maxspeed"/>
+    <alias name="" index="73" field="layer"/>
+    <alias name="" index="74" field="bridge"/>
+    <alias name="" index="75" field="railway"/>
+    <alias name="" index="76" field="width"/>
+    <alias name="" index="77" field="source:width"/>
+    <alias name="" index="78" field="sidewalk"/>
+    <alias name="" index="79" field="lit"/>
+    <alias name="" index="80" field="cycleway:right"/>
+    <alias name="" index="81" field="maxweight"/>
+    <alias name="" index="82" field="maxspeed:type"/>
+    <alias name="" index="83" field="cycleway:both"/>
+    <alias name="" index="84" field="old_name"/>
+    <alias name="" index="85" field="lanes"/>
+    <alias name="" index="86" field="source:name:oc"/>
+    <alias name="" index="87" field="name:oc"/>
+    <alias name="" index="88" field="ref"/>
+    <alias name="" index="89" field="oneway"/>
+    <alias name="" index="90" field="surface"/>
+    <alias name="" index="91" field="maxspeed"/>
+    <alias name="" index="92" field="junction"/>
   </aliases>
   <excludeAttributesWMS/>
   <excludeAttributesWFS/>
   <defaults>
-    <default applyOnUpdate="0" expression="" field="fid"/>
-    <default applyOnUpdate="0" expression="" field="osm_id"/>
-    <default applyOnUpdate="0" expression="" field="name"/>
-    <default applyOnUpdate="0" expression="" field="highway"/>
-    <default applyOnUpdate="0" expression="" field="waterway"/>
-    <default applyOnUpdate="0" expression="" field="aerialway"/>
-    <default applyOnUpdate="0" expression="" field="barrier"/>
-    <default applyOnUpdate="0" expression="" field="man_made"/>
-    <default applyOnUpdate="0" expression="" field="z_order"/>
-    <default applyOnUpdate="0" expression="" field="other_tags"/>
-    <default applyOnUpdate="0" expression="" field="smoothness"/>
-    <default applyOnUpdate="0" expression="" field="cycleway:lane"/>
-    <default applyOnUpdate="0" expression="" field="bus_bay"/>
-    <default applyOnUpdate="0" expression="" field="tunnel"/>
-    <default applyOnUpdate="0" expression="" field="footway"/>
-    <default applyOnUpdate="0" expression="" field="embankment"/>
-    <default applyOnUpdate="0" expression="" field="service"/>
-    <default applyOnUpdate="0" expression="" field="sidewalk"/>
-    <default applyOnUpdate="0" expression="" field="cycleway:right:segregated"/>
-    <default applyOnUpdate="0" expression="" field="width"/>
-    <default applyOnUpdate="0" expression="" field="taxi"/>
-    <default applyOnUpdate="0" expression="" field="motor_vehicle"/>
-    <default applyOnUpdate="0" expression="" field="foot"/>
-    <default applyOnUpdate="0" expression="" field="bus"/>
-    <default applyOnUpdate="0" expression="" field="bicycle"/>
-    <default applyOnUpdate="0" expression="" field="access"/>
-    <default applyOnUpdate="0" expression="" field="lanes:forward"/>
-    <default applyOnUpdate="0" expression="" field="lanes:backward"/>
-    <default applyOnUpdate="0" expression="" field="alt_name"/>
-    <default applyOnUpdate="0" expression="" field="maxspeed:type"/>
-    <default applyOnUpdate="0" expression="" field="cycleway:both"/>
-    <default applyOnUpdate="0" expression="" field="cycleway:right"/>
-    <default applyOnUpdate="0" expression="" field="cycleway"/>
-    <default applyOnUpdate="0" expression="" field="lit"/>
-    <default applyOnUpdate="0" expression="" field="ref"/>
-    <default applyOnUpdate="0" expression="" field="destination:symbol"/>
-    <default applyOnUpdate="0" expression="" field="destination"/>
-    <default applyOnUpdate="0" expression="" field="oneway"/>
-    <default applyOnUpdate="0" expression="" field="old_ref"/>
-    <default applyOnUpdate="0" expression="" field="maxweight:signed"/>
-    <default applyOnUpdate="0" expression="" field="layer"/>
-    <default applyOnUpdate="0" expression="" field="lanes"/>
-    <default applyOnUpdate="0" expression="" field="bridge"/>
-    <default applyOnUpdate="0" expression="" field="surface"/>
-    <default applyOnUpdate="0" expression="" field="source:maxspeed"/>
-    <default applyOnUpdate="0" expression="" field="maxspeed"/>
-    <default applyOnUpdate="0" expression="" field="junction"/>
+    <default expression="" field="fid" applyOnUpdate="0"/>
+    <default expression="" field="osm_id" applyOnUpdate="0"/>
+    <default expression="" field="name" applyOnUpdate="0"/>
+    <default expression="" field="highway" applyOnUpdate="0"/>
+    <default expression="" field="waterway" applyOnUpdate="0"/>
+    <default expression="" field="aerialway" applyOnUpdate="0"/>
+    <default expression="" field="barrier" applyOnUpdate="0"/>
+    <default expression="" field="man_made" applyOnUpdate="0"/>
+    <default expression="" field="z_order" applyOnUpdate="0"/>
+    <default expression="" field="other_tags" applyOnUpdate="0"/>
+    <default expression="" field="wheelchair" applyOnUpdate="0"/>
+    <default expression="" field="height" applyOnUpdate="0"/>
+    <default expression="" field="informal" applyOnUpdate="0"/>
+    <default expression="" field="maxwidth" applyOnUpdate="0"/>
+    <default expression="" field="bus_bay" applyOnUpdate="0"/>
+    <default expression="" field="traffic_calming" applyOnUpdate="0"/>
+    <default expression="" field="taxi" applyOnUpdate="0"/>
+    <default expression="" field="bus" applyOnUpdate="0"/>
+    <default expression="" field="turn:lanes" applyOnUpdate="0"/>
+    <default expression="" field="turn:lanes:forward" applyOnUpdate="0"/>
+    <default expression="" field="turn:lanes:backward" applyOnUpdate="0"/>
+    <default expression="" field="int_ref" applyOnUpdate="0"/>
+    <default expression="" field="footway" applyOnUpdate="0"/>
+    <default expression="" field="crossing" applyOnUpdate="0"/>
+    <default expression="" field="start_date" applyOnUpdate="0"/>
+    <default expression="" field="source:url" applyOnUpdate="0"/>
+    <default expression="" field="political_division" applyOnUpdate="0"/>
+    <default expression="" field="network" applyOnUpdate="0"/>
+    <default expression="" field="name:fr" applyOnUpdate="0"/>
+    <default expression="" field="embankment" applyOnUpdate="0"/>
+    <default expression="" field="ford" applyOnUpdate="0"/>
+    <default expression="" field="cycleway:left" applyOnUpdate="0"/>
+    <default expression="" field="alt_name" applyOnUpdate="0"/>
+    <default expression="" field="excellent" applyOnUpdate="0"/>
+    <default expression="" field="maxheight" applyOnUpdate="0"/>
+    <default expression="" field="wikipedia" applyOnUpdate="0"/>
+    <default expression="" field="note:railway" applyOnUpdate="0"/>
+    <default expression="" field="snowmobile" applyOnUpdate="0"/>
+    <default expression="" field="motor_vehicle" applyOnUpdate="0"/>
+    <default expression="" field="horse" applyOnUpdate="0"/>
+    <default expression="" field="access:conditional" applyOnUpdate="0"/>
+    <default expression="" field="access" applyOnUpdate="0"/>
+    <default expression="" field="trailblazed" applyOnUpdate="0"/>
+    <default expression="" field="trail_visibility" applyOnUpdate="0"/>
+    <default expression="" field="source:name" applyOnUpdate="0"/>
+    <default expression="" field="lanes:forward" applyOnUpdate="0"/>
+    <default expression="" field="lanes:backward" applyOnUpdate="0"/>
+    <default expression="" field="destination:forward" applyOnUpdate="0"/>
+    <default expression="" field="cycleway:lane" applyOnUpdate="0"/>
+    <default expression="" field="tunnel" applyOnUpdate="0"/>
+    <default expression="" field="segregated" applyOnUpdate="0"/>
+    <default expression="" field="bicycle" applyOnUpdate="0"/>
+    <default expression="" field="smoothness" applyOnUpdate="0"/>
+    <default expression="" field="mtb:description" applyOnUpdate="0"/>
+    <default expression="" field="foot" applyOnUpdate="0"/>
+    <default expression="" field="sac_scale" applyOnUpdate="0"/>
+    <default expression="" field="mtb:scale:uphill" applyOnUpdate="0"/>
+    <default expression="" field="mtb:scale" applyOnUpdate="0"/>
+    <default expression="" field="incline" applyOnUpdate="0"/>
+    <default expression="" field="description" applyOnUpdate="0"/>
+    <default expression="" field="history" applyOnUpdate="0"/>
+    <default expression="" field="tracktype" applyOnUpdate="0"/>
+    <default expression="" field="service" applyOnUpdate="0"/>
+    <default expression="" field="boundary" applyOnUpdate="0"/>
+    <default expression="" field="admin_level" applyOnUpdate="0"/>
+    <default expression="" field="noname" applyOnUpdate="0"/>
+    <default expression="" field="cycleway" applyOnUpdate="0"/>
+    <default expression="" field="destination:backward" applyOnUpdate="0"/>
+    <default expression="" field="lane_markings" applyOnUpdate="0"/>
+    <default expression="" field="old_ref" applyOnUpdate="0"/>
+    <default expression="" field="destination:symbol" applyOnUpdate="0"/>
+    <default expression="" field="destination" applyOnUpdate="0"/>
+    <default expression="" field="source:maxspeed" applyOnUpdate="0"/>
+    <default expression="" field="layer" applyOnUpdate="0"/>
+    <default expression="" field="bridge" applyOnUpdate="0"/>
+    <default expression="" field="railway" applyOnUpdate="0"/>
+    <default expression="" field="width" applyOnUpdate="0"/>
+    <default expression="" field="source:width" applyOnUpdate="0"/>
+    <default expression="" field="sidewalk" applyOnUpdate="0"/>
+    <default expression="" field="lit" applyOnUpdate="0"/>
+    <default expression="" field="cycleway:right" applyOnUpdate="0"/>
+    <default expression="" field="maxweight" applyOnUpdate="0"/>
+    <default expression="" field="maxspeed:type" applyOnUpdate="0"/>
+    <default expression="" field="cycleway:both" applyOnUpdate="0"/>
+    <default expression="" field="old_name" applyOnUpdate="0"/>
+    <default expression="" field="lanes" applyOnUpdate="0"/>
+    <default expression="" field="source:name:oc" applyOnUpdate="0"/>
+    <default expression="" field="name:oc" applyOnUpdate="0"/>
+    <default expression="" field="ref" applyOnUpdate="0"/>
+    <default expression="" field="oneway" applyOnUpdate="0"/>
+    <default expression="" field="surface" applyOnUpdate="0"/>
+    <default expression="" field="maxspeed" applyOnUpdate="0"/>
+    <default expression="" field="junction" applyOnUpdate="0"/>
   </defaults>
   <constraints>
-    <constraint constraints="3" unique_strength="1" exp_strength="0" notnull_strength="1" field="fid"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="osm_id"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="name"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="highway"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="waterway"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="aerialway"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="barrier"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="man_made"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="z_order"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="other_tags"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="smoothness"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="cycleway:lane"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="bus_bay"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="tunnel"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="footway"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="embankment"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="service"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="sidewalk"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="cycleway:right:segregated"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="width"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="taxi"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="motor_vehicle"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="foot"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="bus"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="bicycle"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="access"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="lanes:forward"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="lanes:backward"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="alt_name"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="maxspeed:type"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="cycleway:both"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="cycleway:right"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="cycleway"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="lit"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="ref"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="destination:symbol"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="destination"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="oneway"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="old_ref"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="maxweight:signed"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="layer"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="lanes"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="bridge"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="surface"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="source:maxspeed"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="maxspeed"/>
-    <constraint constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0" field="junction"/>
+    <constraint field="fid" constraints="3" unique_strength="1" notnull_strength="1" exp_strength="0"/>
+    <constraint field="osm_id" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="name" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="highway" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="waterway" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="aerialway" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="barrier" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="man_made" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="z_order" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="other_tags" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="wheelchair" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="height" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="informal" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="maxwidth" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="bus_bay" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="traffic_calming" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="taxi" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="bus" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="turn:lanes" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="turn:lanes:forward" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="turn:lanes:backward" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="int_ref" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="footway" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="crossing" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="start_date" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="source:url" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="political_division" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="network" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="name:fr" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="embankment" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="ford" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="cycleway:left" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="alt_name" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="excellent" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="maxheight" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="wikipedia" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="note:railway" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="snowmobile" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="motor_vehicle" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="horse" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="access:conditional" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="access" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="trailblazed" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="trail_visibility" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="source:name" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="lanes:forward" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="lanes:backward" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="destination:forward" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="cycleway:lane" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="tunnel" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="segregated" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="bicycle" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="smoothness" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="mtb:description" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="foot" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="sac_scale" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="mtb:scale:uphill" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="mtb:scale" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="incline" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="description" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="history" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="tracktype" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="service" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="boundary" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="admin_level" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="noname" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="cycleway" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="destination:backward" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="lane_markings" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="old_ref" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="destination:symbol" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="destination" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="source:maxspeed" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="layer" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="bridge" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="railway" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="width" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="source:width" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="sidewalk" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="lit" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="cycleway:right" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="maxweight" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="maxspeed:type" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="cycleway:both" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="old_name" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="lanes" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="source:name:oc" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="name:oc" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="ref" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="oneway" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="surface" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="maxspeed" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
+    <constraint field="junction" constraints="0" unique_strength="0" notnull_strength="0" exp_strength="0"/>
   </constraints>
   <constraintExpressions>
     <constraint exp="" desc="" field="fid"/>
@@ -1276,118 +1761,210 @@
     <constraint exp="" desc="" field="man_made"/>
     <constraint exp="" desc="" field="z_order"/>
     <constraint exp="" desc="" field="other_tags"/>
-    <constraint exp="" desc="" field="smoothness"/>
-    <constraint exp="" desc="" field="cycleway:lane"/>
+    <constraint exp="" desc="" field="wheelchair"/>
+    <constraint exp="" desc="" field="height"/>
+    <constraint exp="" desc="" field="informal"/>
+    <constraint exp="" desc="" field="maxwidth"/>
     <constraint exp="" desc="" field="bus_bay"/>
-    <constraint exp="" desc="" field="tunnel"/>
-    <constraint exp="" desc="" field="footway"/>
-    <constraint exp="" desc="" field="embankment"/>
-    <constraint exp="" desc="" field="service"/>
-    <constraint exp="" desc="" field="sidewalk"/>
-    <constraint exp="" desc="" field="cycleway:right:segregated"/>
-    <constraint exp="" desc="" field="width"/>
+    <constraint exp="" desc="" field="traffic_calming"/>
     <constraint exp="" desc="" field="taxi"/>
-    <constraint exp="" desc="" field="motor_vehicle"/>
-    <constraint exp="" desc="" field="foot"/>
     <constraint exp="" desc="" field="bus"/>
-    <constraint exp="" desc="" field="bicycle"/>
+    <constraint exp="" desc="" field="turn:lanes"/>
+    <constraint exp="" desc="" field="turn:lanes:forward"/>
+    <constraint exp="" desc="" field="turn:lanes:backward"/>
+    <constraint exp="" desc="" field="int_ref"/>
+    <constraint exp="" desc="" field="footway"/>
+    <constraint exp="" desc="" field="crossing"/>
+    <constraint exp="" desc="" field="start_date"/>
+    <constraint exp="" desc="" field="source:url"/>
+    <constraint exp="" desc="" field="political_division"/>
+    <constraint exp="" desc="" field="network"/>
+    <constraint exp="" desc="" field="name:fr"/>
+    <constraint exp="" desc="" field="embankment"/>
+    <constraint exp="" desc="" field="ford"/>
+    <constraint exp="" desc="" field="cycleway:left"/>
+    <constraint exp="" desc="" field="alt_name"/>
+    <constraint exp="" desc="" field="excellent"/>
+    <constraint exp="" desc="" field="maxheight"/>
+    <constraint exp="" desc="" field="wikipedia"/>
+    <constraint exp="" desc="" field="note:railway"/>
+    <constraint exp="" desc="" field="snowmobile"/>
+    <constraint exp="" desc="" field="motor_vehicle"/>
+    <constraint exp="" desc="" field="horse"/>
+    <constraint exp="" desc="" field="access:conditional"/>
     <constraint exp="" desc="" field="access"/>
+    <constraint exp="" desc="" field="trailblazed"/>
+    <constraint exp="" desc="" field="trail_visibility"/>
+    <constraint exp="" desc="" field="source:name"/>
     <constraint exp="" desc="" field="lanes:forward"/>
     <constraint exp="" desc="" field="lanes:backward"/>
-    <constraint exp="" desc="" field="alt_name"/>
-    <constraint exp="" desc="" field="maxspeed:type"/>
-    <constraint exp="" desc="" field="cycleway:both"/>
-    <constraint exp="" desc="" field="cycleway:right"/>
+    <constraint exp="" desc="" field="destination:forward"/>
+    <constraint exp="" desc="" field="cycleway:lane"/>
+    <constraint exp="" desc="" field="tunnel"/>
+    <constraint exp="" desc="" field="segregated"/>
+    <constraint exp="" desc="" field="bicycle"/>
+    <constraint exp="" desc="" field="smoothness"/>
+    <constraint exp="" desc="" field="mtb:description"/>
+    <constraint exp="" desc="" field="foot"/>
+    <constraint exp="" desc="" field="sac_scale"/>
+    <constraint exp="" desc="" field="mtb:scale:uphill"/>
+    <constraint exp="" desc="" field="mtb:scale"/>
+    <constraint exp="" desc="" field="incline"/>
+    <constraint exp="" desc="" field="description"/>
+    <constraint exp="" desc="" field="history"/>
+    <constraint exp="" desc="" field="tracktype"/>
+    <constraint exp="" desc="" field="service"/>
+    <constraint exp="" desc="" field="boundary"/>
+    <constraint exp="" desc="" field="admin_level"/>
+    <constraint exp="" desc="" field="noname"/>
     <constraint exp="" desc="" field="cycleway"/>
-    <constraint exp="" desc="" field="lit"/>
-    <constraint exp="" desc="" field="ref"/>
+    <constraint exp="" desc="" field="destination:backward"/>
+    <constraint exp="" desc="" field="lane_markings"/>
+    <constraint exp="" desc="" field="old_ref"/>
     <constraint exp="" desc="" field="destination:symbol"/>
     <constraint exp="" desc="" field="destination"/>
-    <constraint exp="" desc="" field="oneway"/>
-    <constraint exp="" desc="" field="old_ref"/>
-    <constraint exp="" desc="" field="maxweight:signed"/>
-    <constraint exp="" desc="" field="layer"/>
-    <constraint exp="" desc="" field="lanes"/>
-    <constraint exp="" desc="" field="bridge"/>
-    <constraint exp="" desc="" field="surface"/>
     <constraint exp="" desc="" field="source:maxspeed"/>
+    <constraint exp="" desc="" field="layer"/>
+    <constraint exp="" desc="" field="bridge"/>
+    <constraint exp="" desc="" field="railway"/>
+    <constraint exp="" desc="" field="width"/>
+    <constraint exp="" desc="" field="source:width"/>
+    <constraint exp="" desc="" field="sidewalk"/>
+    <constraint exp="" desc="" field="lit"/>
+    <constraint exp="" desc="" field="cycleway:right"/>
+    <constraint exp="" desc="" field="maxweight"/>
+    <constraint exp="" desc="" field="maxspeed:type"/>
+    <constraint exp="" desc="" field="cycleway:both"/>
+    <constraint exp="" desc="" field="old_name"/>
+    <constraint exp="" desc="" field="lanes"/>
+    <constraint exp="" desc="" field="source:name:oc"/>
+    <constraint exp="" desc="" field="name:oc"/>
+    <constraint exp="" desc="" field="ref"/>
+    <constraint exp="" desc="" field="oneway"/>
+    <constraint exp="" desc="" field="surface"/>
     <constraint exp="" desc="" field="maxspeed"/>
     <constraint exp="" desc="" field="junction"/>
   </constraintExpressions>
   <expressionfields/>
   <attributeactions>
-    <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
-    <actionsetting isEnabledOnlyWhenEditable="0" id="{4c4a0a6f-8873-49ae-8d84-3184b519fe29}" icon="" shortTitle="OpenStreetMap Browser" capture="0" type="5" name="OpenStreetMap Browser" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]" notificationMessage="">
-      <actionScope id="Canvas"/>
+    <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+    <actionsetting icon="" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]" isEnabledOnlyWhenEditable="0" name="OpenStreetMap Browser" id="{0bbf5312-3a2d-44d6-b3f5-27f3fbf8c5c7}" capture="0" type="5" shortTitle="OpenStreetMap Browser" notificationMessage="">
       <actionScope id="Feature"/>
       <actionScope id="Field"/>
+      <actionScope id="Canvas"/>
     </actionsetting>
-    <actionsetting isEnabledOnlyWhenEditable="0" id="{8f36e89c-e524-4867-b292-08d79d114a14}" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/mapillary_logo.svg" shortTitle="Mapillary" capture="0" type="1" name="Mapillary" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;mapillary&quot;,&quot;[% &quot;mapillary&quot; %]&quot;)" notificationMessage="">
-      <actionScope id="Canvas"/>
+    <actionsetting icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/mapillary_logo.svg" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;mapillary&quot;,&quot;[% &quot;mapillary&quot; %]&quot;)" isEnabledOnlyWhenEditable="0" name="Mapillary" id="{2b186796-b910-4cb6-8a0c-54d99dcc314f}" capture="0" type="1" shortTitle="Mapillary" notificationMessage="">
       <actionScope id="Feature"/>
       <actionScope id="Field"/>
+      <actionScope id="Canvas"/>
     </actionsetting>
-    <actionsetting isEnabledOnlyWhenEditable="0" id="{ea689263-a7d6-4b13-8495-f14da32d2fb4}" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/josm_icon.svg" shortTitle="JOSM" capture="0" type="1" name="JOSM" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;josm&quot;,&quot;[% &quot;full_id&quot; %]&quot;)" notificationMessage="">
-      <actionScope id="Canvas"/>
+    <actionsetting icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/josm_icon.svg" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;josm&quot;,&quot;[% &quot;full_id&quot; %]&quot;)" isEnabledOnlyWhenEditable="0" name="JOSM" id="{9c81310f-2346-4bf3-9e94-f2268c5ce574}" capture="0" type="1" shortTitle="JOSM" notificationMessage="">
       <actionScope id="Feature"/>
       <actionScope id="Field"/>
+      <actionScope id="Canvas"/>
     </actionsetting>
-    <actionsetting isEnabledOnlyWhenEditable="0" id="{a997d041-d8ee-4801-8459-25adeff1a7db}" icon="" shortTitle="User default editor" capture="0" type="5" name="User default editor" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]" notificationMessage="">
-      <actionScope id="Canvas"/>
+    <actionsetting icon="" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]" isEnabledOnlyWhenEditable="0" name="User default editor" id="{8c2924e2-670a-4f18-998c-063e85a1a0db}" capture="0" type="5" shortTitle="User default editor" notificationMessage="">
       <actionScope id="Feature"/>
       <actionScope id="Field"/>
+      <actionScope id="Canvas"/>
     </actionsetting>
   </attributeactions>
-  <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+  <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
     <columns>
-      <column type="field" name="osm_id" hidden="0" width="-1"/>
-      <column type="actions" hidden="1" width="-1"/>
-      <column type="field" name="name" hidden="0" width="-1"/>
-      <column type="field" name="waterway" hidden="0" width="-1"/>
-      <column type="field" name="highway" hidden="0" width="-1"/>
-      <column type="field" name="barrier" hidden="0" width="-1"/>
-      <column type="field" name="man_made" hidden="0" width="-1"/>
-      <column type="field" name="fid" hidden="0" width="-1"/>
-      <column type="field" name="aerialway" hidden="0" width="-1"/>
-      <column type="field" name="z_order" hidden="0" width="-1"/>
-      <column type="field" name="other_tags" hidden="0" width="406"/>
-      <column type="field" name="bus" hidden="0" width="-1"/>
-      <column type="field" name="sidewalk" hidden="0" width="-1"/>
-      <column type="field" name="footway" hidden="0" width="-1"/>
-      <column type="field" name="service" hidden="0" width="-1"/>
-      <column type="field" name="motor_vehicle" hidden="0" width="-1"/>
-      <column type="field" name="access" hidden="0" width="-1"/>
-      <column type="field" name="alt_name" hidden="0" width="-1"/>
-      <column type="field" name="lanes:forward" hidden="0" width="-1"/>
-      <column type="field" name="lanes:backward" hidden="0" width="-1"/>
-      <column type="field" name="width" hidden="0" width="-1"/>
-      <column type="field" name="foot" hidden="0" width="-1"/>
-      <column type="field" name="bicycle" hidden="0" width="-1"/>
-      <column type="field" name="smoothness" hidden="0" width="-1"/>
-      <column type="field" name="tunnel" hidden="0" width="-1"/>
-      <column type="field" name="cycleway:both" hidden="0" width="-1"/>
-      <column type="field" name="bus_bay" hidden="0" width="-1"/>
-      <column type="field" name="maxspeed:type" hidden="0" width="-1"/>
-      <column type="field" name="lit" hidden="0" width="-1"/>
-      <column type="field" name="embankment" hidden="0" width="-1"/>
-      <column type="field" name="cycleway" hidden="0" width="-1"/>
-      <column type="field" name="cycleway:right" hidden="0" width="-1"/>
-      <column type="field" name="ref" hidden="0" width="-1"/>
-      <column type="field" name="destination:symbol" hidden="0" width="-1"/>
-      <column type="field" name="destination" hidden="0" width="-1"/>
-      <column type="field" name="oneway" hidden="0" width="-1"/>
-      <column type="field" name="old_ref" hidden="0" width="-1"/>
-      <column type="field" name="layer" hidden="0" width="-1"/>
-      <column type="field" name="lanes" hidden="0" width="-1"/>
-      <column type="field" name="bridge" hidden="0" width="-1"/>
-      <column type="field" name="source:maxspeed" hidden="0" width="-1"/>
-      <column type="field" name="surface" hidden="0" width="-1"/>
-      <column type="field" name="maxspeed" hidden="0" width="-1"/>
-      <column type="field" name="junction" hidden="0" width="-1"/>
-      <column type="field" name="taxi" hidden="0" width="-1"/>
-      <column type="field" name="cycleway:lane" hidden="0" width="-1"/>
-      <column type="field" name="cycleway:right:segregated" hidden="0" width="-1"/>
-      <column type="field" name="maxweight:signed" hidden="0" width="-1"/>
+      <column name="osm_id" width="-1" type="field" hidden="0"/>
+      <column width="-1" type="actions" hidden="1"/>
+      <column name="name" width="-1" type="field" hidden="0"/>
+      <column name="waterway" width="-1" type="field" hidden="0"/>
+      <column name="highway" width="-1" type="field" hidden="0"/>
+      <column name="barrier" width="-1" type="field" hidden="0"/>
+      <column name="man_made" width="-1" type="field" hidden="0"/>
+      <column name="fid" width="-1" type="field" hidden="0"/>
+      <column name="aerialway" width="-1" type="field" hidden="0"/>
+      <column name="z_order" width="-1" type="field" hidden="0"/>
+      <column name="other_tags" width="406" type="field" hidden="0"/>
+      <column name="bus" width="-1" type="field" hidden="0"/>
+      <column name="sidewalk" width="-1" type="field" hidden="0"/>
+      <column name="footway" width="-1" type="field" hidden="0"/>
+      <column name="service" width="-1" type="field" hidden="0"/>
+      <column name="motor_vehicle" width="-1" type="field" hidden="0"/>
+      <column name="access" width="-1" type="field" hidden="0"/>
+      <column name="alt_name" width="-1" type="field" hidden="0"/>
+      <column name="lanes:forward" width="-1" type="field" hidden="0"/>
+      <column name="lanes:backward" width="-1" type="field" hidden="0"/>
+      <column name="width" width="-1" type="field" hidden="0"/>
+      <column name="foot" width="-1" type="field" hidden="0"/>
+      <column name="bicycle" width="-1" type="field" hidden="0"/>
+      <column name="smoothness" width="-1" type="field" hidden="0"/>
+      <column name="tunnel" width="-1" type="field" hidden="0"/>
+      <column name="cycleway:both" width="-1" type="field" hidden="0"/>
+      <column name="bus_bay" width="-1" type="field" hidden="0"/>
+      <column name="maxspeed:type" width="-1" type="field" hidden="0"/>
+      <column name="lit" width="-1" type="field" hidden="0"/>
+      <column name="embankment" width="-1" type="field" hidden="0"/>
+      <column name="cycleway" width="-1" type="field" hidden="0"/>
+      <column name="cycleway:right" width="-1" type="field" hidden="0"/>
+      <column name="ref" width="-1" type="field" hidden="0"/>
+      <column name="destination:symbol" width="-1" type="field" hidden="0"/>
+      <column name="destination" width="-1" type="field" hidden="0"/>
+      <column name="oneway" width="-1" type="field" hidden="0"/>
+      <column name="old_ref" width="-1" type="field" hidden="0"/>
+      <column name="layer" width="-1" type="field" hidden="0"/>
+      <column name="lanes" width="-1" type="field" hidden="0"/>
+      <column name="bridge" width="-1" type="field" hidden="0"/>
+      <column name="source:maxspeed" width="-1" type="field" hidden="0"/>
+      <column name="surface" width="-1" type="field" hidden="0"/>
+      <column name="maxspeed" width="-1" type="field" hidden="0"/>
+      <column name="junction" width="-1" type="field" hidden="0"/>
+      <column name="taxi" width="-1" type="field" hidden="0"/>
+      <column name="cycleway:lane" width="-1" type="field" hidden="0"/>
+      <column name="wheelchair" width="-1" type="field" hidden="0"/>
+      <column name="height" width="-1" type="field" hidden="0"/>
+      <column name="informal" width="-1" type="field" hidden="0"/>
+      <column name="maxwidth" width="-1" type="field" hidden="0"/>
+      <column name="traffic_calming" width="-1" type="field" hidden="0"/>
+      <column name="turn:lanes" width="-1" type="field" hidden="0"/>
+      <column name="turn:lanes:forward" width="-1" type="field" hidden="0"/>
+      <column name="turn:lanes:backward" width="-1" type="field" hidden="0"/>
+      <column name="int_ref" width="-1" type="field" hidden="0"/>
+      <column name="crossing" width="-1" type="field" hidden="0"/>
+      <column name="start_date" width="-1" type="field" hidden="0"/>
+      <column name="source:url" width="-1" type="field" hidden="0"/>
+      <column name="political_division" width="-1" type="field" hidden="0"/>
+      <column name="network" width="-1" type="field" hidden="0"/>
+      <column name="name:fr" width="-1" type="field" hidden="0"/>
+      <column name="ford" width="-1" type="field" hidden="0"/>
+      <column name="cycleway:left" width="-1" type="field" hidden="0"/>
+      <column name="excellent" width="-1" type="field" hidden="0"/>
+      <column name="maxheight" width="-1" type="field" hidden="0"/>
+      <column name="wikipedia" width="-1" type="field" hidden="0"/>
+      <column name="note:railway" width="-1" type="field" hidden="0"/>
+      <column name="snowmobile" width="-1" type="field" hidden="0"/>
+      <column name="horse" width="-1" type="field" hidden="0"/>
+      <column name="access:conditional" width="-1" type="field" hidden="0"/>
+      <column name="trailblazed" width="-1" type="field" hidden="0"/>
+      <column name="trail_visibility" width="-1" type="field" hidden="0"/>
+      <column name="source:name" width="-1" type="field" hidden="0"/>
+      <column name="destination:forward" width="-1" type="field" hidden="0"/>
+      <column name="segregated" width="-1" type="field" hidden="0"/>
+      <column name="mtb:description" width="-1" type="field" hidden="0"/>
+      <column name="sac_scale" width="-1" type="field" hidden="0"/>
+      <column name="mtb:scale:uphill" width="-1" type="field" hidden="0"/>
+      <column name="mtb:scale" width="-1" type="field" hidden="0"/>
+      <column name="incline" width="-1" type="field" hidden="0"/>
+      <column name="description" width="-1" type="field" hidden="0"/>
+      <column name="history" width="-1" type="field" hidden="0"/>
+      <column name="tracktype" width="-1" type="field" hidden="0"/>
+      <column name="boundary" width="-1" type="field" hidden="0"/>
+      <column name="admin_level" width="-1" type="field" hidden="0"/>
+      <column name="noname" width="-1" type="field" hidden="0"/>
+      <column name="destination:backward" width="-1" type="field" hidden="0"/>
+      <column name="lane_markings" width="-1" type="field" hidden="0"/>
+      <column name="railway" width="-1" type="field" hidden="0"/>
+      <column name="source:width" width="-1" type="field" hidden="0"/>
+      <column name="maxweight" width="-1" type="field" hidden="0"/>
+      <column name="old_name" width="-1" type="field" hidden="0"/>
+      <column name="source:name:oc" width="-1" type="field" hidden="0"/>
+      <column name="name:oc" width="-1" type="field" hidden="0"/>
     </columns>
   </attributetableconfig>
   <conditionalstyles>
@@ -1418,386 +1995,386 @@ def my_form_open(dialog, layer, feature):
   <featformsuppress>0</featformsuppress>
   <editorlayout>generatedlayout</editorlayout>
   <editable>
-    <field editable="1" name="access"/>
-    <field editable="1" name="access:conditional"/>
-    <field editable="1" name="access:lanes"/>
-    <field editable="1" name="access:lanes:backward"/>
-    <field editable="1" name="admin_level"/>
-    <field editable="1" name="aerialway"/>
-    <field editable="1" name="aerialway_2"/>
-    <field editable="1" name="alt_name"/>
-    <field editable="1" name="barrier"/>
-    <field editable="1" name="barrier_2"/>
-    <field editable="1" name="bicycle"/>
-    <field editable="1" name="boundary"/>
-    <field editable="1" name="bridge"/>
-    <field editable="1" name="bridge:name"/>
-    <field editable="1" name="bridge:structure"/>
-    <field editable="1" name="bus"/>
-    <field editable="1" name="bus:forward"/>
-    <field editable="1" name="bus_bay"/>
-    <field editable="1" name="busway:right"/>
-    <field editable="1" name="change:lanes"/>
-    <field editable="1" name="crossing"/>
-    <field editable="1" name="cutting"/>
-    <field editable="1" name="cycleway"/>
-    <field editable="1" name="cycleway:both"/>
-    <field editable="1" name="cycleway:both:lane"/>
-    <field editable="1" name="cycleway:lane"/>
-    <field editable="1" name="cycleway:left"/>
-    <field editable="1" name="cycleway:right"/>
-    <field editable="1" name="cycleway:right:lane"/>
-    <field editable="1" name="cycleway:right:segregated"/>
-    <field editable="1" name="departures_board"/>
-    <field editable="1" name="description"/>
-    <field editable="1" name="destination"/>
-    <field editable="1" name="destination:backward"/>
-    <field editable="1" name="destination:colour"/>
-    <field editable="1" name="destination:colour:lanes"/>
-    <field editable="1" name="destination:forward"/>
-    <field editable="1" name="destination:lanes"/>
-    <field editable="1" name="destination:ref"/>
-    <field editable="1" name="destination:ref:lanes"/>
-    <field editable="1" name="destination:symbol"/>
-    <field editable="1" name="destination:symbol:lanes"/>
-    <field editable="1" name="distance"/>
-    <field editable="1" name="embankment"/>
-    <field editable="1" name="excellent"/>
-    <field editable="1" name="fence_type"/>
-    <field editable="1" name="fid"/>
-    <field editable="1" name="foot"/>
-    <field editable="1" name="footway"/>
-    <field editable="1" name="ford"/>
-    <field editable="1" name="full_id"/>
-    <field editable="1" name="handrail"/>
-    <field editable="1" name="height"/>
-    <field editable="1" name="hgv"/>
-    <field editable="1" name="highway"/>
-    <field editable="1" name="highway_2"/>
-    <field editable="1" name="history"/>
-    <field editable="1" name="horse"/>
-    <field editable="1" name="incline"/>
-    <field editable="1" name="informal"/>
-    <field editable="1" name="int_ref"/>
-    <field editable="1" name="intermittent"/>
-    <field editable="1" name="junction"/>
-    <field editable="1" name="lane_markings"/>
-    <field editable="1" name="lanes"/>
-    <field editable="1" name="lanes:backward"/>
-    <field editable="1" name="lanes:both_ways"/>
-    <field editable="1" name="lanes:forward"/>
-    <field editable="1" name="lanes:hgv"/>
-    <field editable="1" name="layer"/>
-    <field editable="1" name="leisure"/>
-    <field editable="1" name="level"/>
-    <field editable="1" name="lit"/>
-    <field editable="1" name="living_street"/>
-    <field editable="1" name="local_name"/>
-    <field editable="1" name="local_ref"/>
-    <field editable="1" name="man_made"/>
-    <field editable="1" name="man_made_2"/>
-    <field editable="1" name="marked_trail"/>
-    <field editable="1" name="maxheight"/>
-    <field editable="1" name="maxheight:forward"/>
-    <field editable="1" name="maxspeed"/>
-    <field editable="1" name="maxspeed:advisory"/>
-    <field editable="1" name="maxspeed:backward"/>
-    <field editable="1" name="maxspeed:backward:conditional"/>
-    <field editable="1" name="maxspeed:conditional"/>
-    <field editable="1" name="maxspeed:forward"/>
-    <field editable="1" name="maxspeed:forward:conditional"/>
-    <field editable="1" name="maxspeed:hazmat"/>
-    <field editable="1" name="maxspeed:hgv"/>
-    <field editable="1" name="maxspeed:lanes"/>
-    <field editable="1" name="maxspeed:source"/>
-    <field editable="1" name="maxspeed:type"/>
-    <field editable="1" name="maxweight"/>
-    <field editable="1" name="maxweight:forward"/>
-    <field editable="1" name="maxweight:signed"/>
-    <field editable="1" name="maxwidth"/>
-    <field editable="1" name="motor_vehicle"/>
-    <field editable="1" name="motorcar"/>
-    <field editable="1" name="motorcycle"/>
-    <field editable="1" name="motorroad"/>
-    <field editable="1" name="motorway"/>
-    <field editable="1" name="mtb"/>
-    <field editable="1" name="mtb:description"/>
-    <field editable="1" name="mtb:scale"/>
-    <field editable="1" name="mtb:scale:uphill"/>
-    <field editable="1" name="name"/>
-    <field editable="1" name="name:etymology:wikidata"/>
-    <field editable="1" name="name:fr"/>
-    <field editable="1" name="name:oc"/>
-    <field editable="1" name="name:ru"/>
-    <field editable="1" name="name:wikidata"/>
-    <field editable="1" name="name_2"/>
-    <field editable="1" name="natural"/>
-    <field editable="1" name="network"/>
-    <field editable="1" name="noname"/>
-    <field editable="1" name="note:railway"/>
-    <field editable="1" name="old_name"/>
-    <field editable="1" name="old_ref"/>
-    <field editable="1" name="oneway"/>
-    <field editable="1" name="oneway:bicycle"/>
-    <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="parking:lane:both"/>
-    <field editable="1" name="parking:lane:left"/>
-    <field editable="1" name="parking:lane:right"/>
-    <field editable="1" name="paved"/>
-    <field editable="1" name="piste:difficulty"/>
-    <field editable="1" name="piste:type"/>
-    <field editable="1" name="placement"/>
-    <field editable="1" name="political_division"/>
-    <field editable="1" name="psv"/>
-    <field editable="1" name="psv:forward"/>
-    <field editable="1" name="psv:lanes:backward"/>
-    <field editable="1" name="public_transport"/>
-    <field editable="1" name="railway"/>
-    <field editable="1" name="railway:end_date"/>
-    <field editable="1" name="railway:start_date"/>
-    <field editable="1" name="ramp"/>
-    <field editable="1" name="ref"/>
-    <field editable="1" name="ref:FR:FANTOIR"/>
-    <field editable="1" name="ref:sandre"/>
-    <field editable="1" name="route"/>
-    <field editable="1" name="sac_scale"/>
-    <field editable="1" name="sac_scale_ref"/>
-    <field editable="1" name="segregated"/>
-    <field editable="1" name="service"/>
-    <field editable="1" name="sidewalk"/>
-    <field editable="1" name="smoothness"/>
-    <field editable="1" name="smoothness:date"/>
-    <field editable="1" name="snowmobile"/>
-    <field editable="1" name="source:maxspeed"/>
-    <field editable="1" name="source:maxspeed:backward"/>
-    <field editable="1" name="source:maxspeed:forward"/>
-    <field editable="1" name="source:name"/>
-    <field editable="1" name="source:name:oc"/>
-    <field editable="1" name="source:url"/>
-    <field editable="1" name="source:width"/>
-    <field editable="1" name="start_date"/>
-    <field editable="1" name="step_count"/>
-    <field editable="1" name="surface"/>
-    <field editable="1" name="survey_date"/>
-    <field editable="1" name="taxi"/>
-    <field editable="1" name="toll"/>
-    <field editable="1" name="tourism"/>
-    <field editable="1" name="tracktype"/>
-    <field editable="1" name="traffic_calming"/>
-    <field editable="1" name="trail_visibility"/>
-    <field editable="1" name="trailblazed"/>
-    <field editable="1" name="transit:lanes"/>
-    <field editable="1" name="tunnel"/>
-    <field editable="1" name="tunnel:name"/>
-    <field editable="1" name="turn:lanes"/>
-    <field editable="1" name="turn:lanes:backward"/>
-    <field editable="1" name="turn:lanes:forward"/>
-    <field editable="1" name="type"/>
-    <field editable="1" name="waterway"/>
-    <field editable="1" name="waterway_2"/>
-    <field editable="1" name="weight"/>
-    <field editable="1" name="wheelchair"/>
-    <field editable="1" name="width"/>
-    <field editable="1" name="wikidata"/>
-    <field editable="1" name="wikipedia"/>
-    <field editable="1" name="z_order"/>
-    <field editable="1" name="z_order_2"/>
+    <field name="access" editable="1"/>
+    <field name="access:conditional" editable="1"/>
+    <field name="access:lanes" editable="1"/>
+    <field name="access:lanes:backward" editable="1"/>
+    <field name="admin_level" editable="1"/>
+    <field name="aerialway" editable="1"/>
+    <field name="aerialway_2" editable="1"/>
+    <field name="alt_name" editable="1"/>
+    <field name="barrier" editable="1"/>
+    <field name="barrier_2" editable="1"/>
+    <field name="bicycle" editable="1"/>
+    <field name="boundary" editable="1"/>
+    <field name="bridge" editable="1"/>
+    <field name="bridge:name" editable="1"/>
+    <field name="bridge:structure" editable="1"/>
+    <field name="bus" editable="1"/>
+    <field name="bus:forward" editable="1"/>
+    <field name="bus_bay" editable="1"/>
+    <field name="busway:right" editable="1"/>
+    <field name="change:lanes" editable="1"/>
+    <field name="crossing" editable="1"/>
+    <field name="cutting" editable="1"/>
+    <field name="cycleway" editable="1"/>
+    <field name="cycleway:both" editable="1"/>
+    <field name="cycleway:both:lane" editable="1"/>
+    <field name="cycleway:lane" editable="1"/>
+    <field name="cycleway:left" editable="1"/>
+    <field name="cycleway:right" editable="1"/>
+    <field name="cycleway:right:lane" editable="1"/>
+    <field name="cycleway:right:segregated" editable="1"/>
+    <field name="departures_board" editable="1"/>
+    <field name="description" editable="1"/>
+    <field name="destination" editable="1"/>
+    <field name="destination:backward" editable="1"/>
+    <field name="destination:colour" editable="1"/>
+    <field name="destination:colour:lanes" editable="1"/>
+    <field name="destination:forward" editable="1"/>
+    <field name="destination:lanes" editable="1"/>
+    <field name="destination:ref" editable="1"/>
+    <field name="destination:ref:lanes" editable="1"/>
+    <field name="destination:symbol" editable="1"/>
+    <field name="destination:symbol:lanes" editable="1"/>
+    <field name="distance" editable="1"/>
+    <field name="embankment" editable="1"/>
+    <field name="excellent" editable="1"/>
+    <field name="fence_type" editable="1"/>
+    <field name="fid" editable="1"/>
+    <field name="foot" editable="1"/>
+    <field name="footway" editable="1"/>
+    <field name="ford" editable="1"/>
+    <field name="full_id" editable="1"/>
+    <field name="handrail" editable="1"/>
+    <field name="height" editable="1"/>
+    <field name="hgv" editable="1"/>
+    <field name="highway" editable="1"/>
+    <field name="highway_2" editable="1"/>
+    <field name="history" editable="1"/>
+    <field name="horse" editable="1"/>
+    <field name="incline" editable="1"/>
+    <field name="informal" editable="1"/>
+    <field name="int_ref" editable="1"/>
+    <field name="intermittent" editable="1"/>
+    <field name="junction" editable="1"/>
+    <field name="lane_markings" editable="1"/>
+    <field name="lanes" editable="1"/>
+    <field name="lanes:backward" editable="1"/>
+    <field name="lanes:both_ways" editable="1"/>
+    <field name="lanes:forward" editable="1"/>
+    <field name="lanes:hgv" editable="1"/>
+    <field name="layer" editable="1"/>
+    <field name="leisure" editable="1"/>
+    <field name="level" editable="1"/>
+    <field name="lit" editable="1"/>
+    <field name="living_street" editable="1"/>
+    <field name="local_name" editable="1"/>
+    <field name="local_ref" editable="1"/>
+    <field name="man_made" editable="1"/>
+    <field name="man_made_2" editable="1"/>
+    <field name="marked_trail" editable="1"/>
+    <field name="maxheight" editable="1"/>
+    <field name="maxheight:forward" editable="1"/>
+    <field name="maxspeed" editable="1"/>
+    <field name="maxspeed:advisory" editable="1"/>
+    <field name="maxspeed:backward" editable="1"/>
+    <field name="maxspeed:backward:conditional" editable="1"/>
+    <field name="maxspeed:conditional" editable="1"/>
+    <field name="maxspeed:forward" editable="1"/>
+    <field name="maxspeed:forward:conditional" editable="1"/>
+    <field name="maxspeed:hazmat" editable="1"/>
+    <field name="maxspeed:hgv" editable="1"/>
+    <field name="maxspeed:lanes" editable="1"/>
+    <field name="maxspeed:source" editable="1"/>
+    <field name="maxspeed:type" editable="1"/>
+    <field name="maxweight" editable="1"/>
+    <field name="maxweight:forward" editable="1"/>
+    <field name="maxweight:signed" editable="1"/>
+    <field name="maxwidth" editable="1"/>
+    <field name="motor_vehicle" editable="1"/>
+    <field name="motorcar" editable="1"/>
+    <field name="motorcycle" editable="1"/>
+    <field name="motorroad" editable="1"/>
+    <field name="motorway" editable="1"/>
+    <field name="mtb" editable="1"/>
+    <field name="mtb:description" editable="1"/>
+    <field name="mtb:scale" editable="1"/>
+    <field name="mtb:scale:uphill" editable="1"/>
+    <field name="name" editable="1"/>
+    <field name="name:etymology:wikidata" editable="1"/>
+    <field name="name:fr" editable="1"/>
+    <field name="name:oc" editable="1"/>
+    <field name="name:ru" editable="1"/>
+    <field name="name:wikidata" editable="1"/>
+    <field name="name_2" editable="1"/>
+    <field name="natural" editable="1"/>
+    <field name="network" editable="1"/>
+    <field name="noname" editable="1"/>
+    <field name="note:railway" editable="1"/>
+    <field name="old_name" editable="1"/>
+    <field name="old_ref" editable="1"/>
+    <field name="oneway" editable="1"/>
+    <field name="oneway:bicycle" 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="parking:lane:both" editable="1"/>
+    <field name="parking:lane:left" editable="1"/>
+    <field name="parking:lane:right" editable="1"/>
+    <field name="paved" editable="1"/>
+    <field name="piste:difficulty" editable="1"/>
+    <field name="piste:type" editable="1"/>
+    <field name="placement" editable="1"/>
+    <field name="political_division" editable="1"/>
+    <field name="psv" editable="1"/>
+    <field name="psv:forward" editable="1"/>
+    <field name="psv:lanes:backward" editable="1"/>
+    <field name="public_transport" editable="1"/>
+    <field name="railway" editable="1"/>
+    <field name="railway:end_date" editable="1"/>
+    <field name="railway:start_date" editable="1"/>
+    <field name="ramp" editable="1"/>
+    <field name="ref" editable="1"/>
+    <field name="ref:FR:FANTOIR" editable="1"/>
+    <field name="ref:sandre" editable="1"/>
+    <field name="route" editable="1"/>
+    <field name="sac_scale" editable="1"/>
+    <field name="sac_scale_ref" editable="1"/>
+    <field name="segregated" editable="1"/>
+    <field name="service" editable="1"/>
+    <field name="sidewalk" editable="1"/>
+    <field name="smoothness" editable="1"/>
+    <field name="smoothness:date" editable="1"/>
+    <field name="snowmobile" editable="1"/>
+    <field name="source:maxspeed" editable="1"/>
+    <field name="source:maxspeed:backward" editable="1"/>
+    <field name="source:maxspeed:forward" editable="1"/>
+    <field name="source:name" editable="1"/>
+    <field name="source:name:oc" editable="1"/>
+    <field name="source:url" editable="1"/>
+    <field name="source:width" editable="1"/>
+    <field name="start_date" editable="1"/>
+    <field name="step_count" editable="1"/>
+    <field name="surface" editable="1"/>
+    <field name="survey_date" editable="1"/>
+    <field name="taxi" editable="1"/>
+    <field name="toll" editable="1"/>
+    <field name="tourism" editable="1"/>
+    <field name="tracktype" editable="1"/>
+    <field name="traffic_calming" editable="1"/>
+    <field name="trail_visibility" editable="1"/>
+    <field name="trailblazed" editable="1"/>
+    <field name="transit:lanes" editable="1"/>
+    <field name="tunnel" editable="1"/>
+    <field name="tunnel:name" editable="1"/>
+    <field name="turn:lanes" editable="1"/>
+    <field name="turn:lanes:backward" editable="1"/>
+    <field name="turn:lanes:forward" editable="1"/>
+    <field name="type" editable="1"/>
+    <field name="waterway" editable="1"/>
+    <field name="waterway_2" editable="1"/>
+    <field name="weight" editable="1"/>
+    <field name="wheelchair" editable="1"/>
+    <field name="width" editable="1"/>
+    <field name="wikidata" editable="1"/>
+    <field name="wikipedia" editable="1"/>
+    <field name="z_order" editable="1"/>
+    <field name="z_order_2" editable="1"/>
   </editable>
   <labelOnTop>
-    <field labelOnTop="0" name="access"/>
-    <field labelOnTop="0" name="access:conditional"/>
-    <field labelOnTop="0" name="access:lanes"/>
-    <field labelOnTop="0" name="access:lanes:backward"/>
-    <field labelOnTop="0" name="admin_level"/>
-    <field labelOnTop="0" name="aerialway"/>
-    <field labelOnTop="0" name="aerialway_2"/>
-    <field labelOnTop="0" name="alt_name"/>
-    <field labelOnTop="0" name="barrier"/>
-    <field labelOnTop="0" name="barrier_2"/>
-    <field labelOnTop="0" name="bicycle"/>
-    <field labelOnTop="0" name="boundary"/>
-    <field labelOnTop="0" name="bridge"/>
-    <field labelOnTop="0" name="bridge:name"/>
-    <field labelOnTop="0" name="bridge:structure"/>
-    <field labelOnTop="0" name="bus"/>
-    <field labelOnTop="0" name="bus:forward"/>
-    <field labelOnTop="0" name="bus_bay"/>
-    <field labelOnTop="0" name="busway:right"/>
-    <field labelOnTop="0" name="change:lanes"/>
-    <field labelOnTop="0" name="crossing"/>
-    <field labelOnTop="0" name="cutting"/>
-    <field labelOnTop="0" name="cycleway"/>
-    <field labelOnTop="0" name="cycleway:both"/>
-    <field labelOnTop="0" name="cycleway:both:lane"/>
-    <field labelOnTop="0" name="cycleway:lane"/>
-    <field labelOnTop="0" name="cycleway:left"/>
-    <field labelOnTop="0" name="cycleway:right"/>
-    <field labelOnTop="0" name="cycleway:right:lane"/>
-    <field labelOnTop="0" name="cycleway:right:segregated"/>
-    <field labelOnTop="0" name="departures_board"/>
-    <field labelOnTop="0" name="description"/>
-    <field labelOnTop="0" name="destination"/>
-    <field labelOnTop="0" name="destination:backward"/>
-    <field labelOnTop="0" name="destination:colour"/>
-    <field labelOnTop="0" name="destination:colour:lanes"/>
-    <field labelOnTop="0" name="destination:forward"/>
-    <field labelOnTop="0" name="destination:lanes"/>
-    <field labelOnTop="0" name="destination:ref"/>
-    <field labelOnTop="0" name="destination:ref:lanes"/>
-    <field labelOnTop="0" name="destination:symbol"/>
-    <field labelOnTop="0" name="destination:symbol:lanes"/>
-    <field labelOnTop="0" name="distance"/>
-    <field labelOnTop="0" name="embankment"/>
-    <field labelOnTop="0" name="excellent"/>
-    <field labelOnTop="0" name="fence_type"/>
-    <field labelOnTop="0" name="fid"/>
-    <field labelOnTop="0" name="foot"/>
-    <field labelOnTop="0" name="footway"/>
-    <field labelOnTop="0" name="ford"/>
-    <field labelOnTop="0" name="full_id"/>
-    <field labelOnTop="0" name="handrail"/>
-    <field labelOnTop="0" name="height"/>
-    <field labelOnTop="0" name="hgv"/>
-    <field labelOnTop="0" name="highway"/>
-    <field labelOnTop="0" name="highway_2"/>
-    <field labelOnTop="0" name="history"/>
-    <field labelOnTop="0" name="horse"/>
-    <field labelOnTop="0" name="incline"/>
-    <field labelOnTop="0" name="informal"/>
-    <field labelOnTop="0" name="int_ref"/>
-    <field labelOnTop="0" name="intermittent"/>
-    <field labelOnTop="0" name="junction"/>
-    <field labelOnTop="0" name="lane_markings"/>
-    <field labelOnTop="0" name="lanes"/>
-    <field labelOnTop="0" name="lanes:backward"/>
-    <field labelOnTop="0" name="lanes:both_ways"/>
-    <field labelOnTop="0" name="lanes:forward"/>
-    <field labelOnTop="0" name="lanes:hgv"/>
-    <field labelOnTop="0" name="layer"/>
-    <field labelOnTop="0" name="leisure"/>
-    <field labelOnTop="0" name="level"/>
-    <field labelOnTop="0" name="lit"/>
-    <field labelOnTop="0" name="living_street"/>
-    <field labelOnTop="0" name="local_name"/>
-    <field labelOnTop="0" name="local_ref"/>
-    <field labelOnTop="0" name="man_made"/>
-    <field labelOnTop="0" name="man_made_2"/>
-    <field labelOnTop="0" name="marked_trail"/>
-    <field labelOnTop="0" name="maxheight"/>
-    <field labelOnTop="0" name="maxheight:forward"/>
-    <field labelOnTop="0" name="maxspeed"/>
-    <field labelOnTop="0" name="maxspeed:advisory"/>
-    <field labelOnTop="0" name="maxspeed:backward"/>
-    <field labelOnTop="0" name="maxspeed:backward:conditional"/>
-    <field labelOnTop="0" name="maxspeed:conditional"/>
-    <field labelOnTop="0" name="maxspeed:forward"/>
-    <field labelOnTop="0" name="maxspeed:forward:conditional"/>
-    <field labelOnTop="0" name="maxspeed:hazmat"/>
-    <field labelOnTop="0" name="maxspeed:hgv"/>
-    <field labelOnTop="0" name="maxspeed:lanes"/>
-    <field labelOnTop="0" name="maxspeed:source"/>
-    <field labelOnTop="0" name="maxspeed:type"/>
-    <field labelOnTop="0" name="maxweight"/>
-    <field labelOnTop="0" name="maxweight:forward"/>
-    <field labelOnTop="0" name="maxweight:signed"/>
-    <field labelOnTop="0" name="maxwidth"/>
-    <field labelOnTop="0" name="motor_vehicle"/>
-    <field labelOnTop="0" name="motorcar"/>
-    <field labelOnTop="0" name="motorcycle"/>
-    <field labelOnTop="0" name="motorroad"/>
-    <field labelOnTop="0" name="motorway"/>
-    <field labelOnTop="0" name="mtb"/>
-    <field labelOnTop="0" name="mtb:description"/>
-    <field labelOnTop="0" name="mtb:scale"/>
-    <field labelOnTop="0" name="mtb:scale:uphill"/>
-    <field labelOnTop="0" name="name"/>
-    <field labelOnTop="0" name="name:etymology:wikidata"/>
-    <field labelOnTop="0" name="name:fr"/>
-    <field labelOnTop="0" name="name:oc"/>
-    <field labelOnTop="0" name="name:ru"/>
-    <field labelOnTop="0" name="name:wikidata"/>
-    <field labelOnTop="0" name="name_2"/>
-    <field labelOnTop="0" name="natural"/>
-    <field labelOnTop="0" name="network"/>
-    <field labelOnTop="0" name="noname"/>
-    <field labelOnTop="0" name="note:railway"/>
-    <field labelOnTop="0" name="old_name"/>
-    <field labelOnTop="0" name="old_ref"/>
-    <field labelOnTop="0" name="oneway"/>
-    <field labelOnTop="0" name="oneway:bicycle"/>
-    <field labelOnTop="0" name="operator"/>
-    <field labelOnTop="0" name="osm_id"/>
-    <field labelOnTop="0" name="osm_id_2"/>
-    <field labelOnTop="0" name="osm_type"/>
-    <field labelOnTop="0" name="other_tags"/>
-    <field labelOnTop="0" name="other_tags_2"/>
-    <field labelOnTop="0" name="parking:lane:both"/>
-    <field labelOnTop="0" name="parking:lane:left"/>
-    <field labelOnTop="0" name="parking:lane:right"/>
-    <field labelOnTop="0" name="paved"/>
-    <field labelOnTop="0" name="piste:difficulty"/>
-    <field labelOnTop="0" name="piste:type"/>
-    <field labelOnTop="0" name="placement"/>
-    <field labelOnTop="0" name="political_division"/>
-    <field labelOnTop="0" name="psv"/>
-    <field labelOnTop="0" name="psv:forward"/>
-    <field labelOnTop="0" name="psv:lanes:backward"/>
-    <field labelOnTop="0" name="public_transport"/>
-    <field labelOnTop="0" name="railway"/>
-    <field labelOnTop="0" name="railway:end_date"/>
-    <field labelOnTop="0" name="railway:start_date"/>
-    <field labelOnTop="0" name="ramp"/>
-    <field labelOnTop="0" name="ref"/>
-    <field labelOnTop="0" name="ref:FR:FANTOIR"/>
-    <field labelOnTop="0" name="ref:sandre"/>
-    <field labelOnTop="0" name="route"/>
-    <field labelOnTop="0" name="sac_scale"/>
-    <field labelOnTop="0" name="sac_scale_ref"/>
-    <field labelOnTop="0" name="segregated"/>
-    <field labelOnTop="0" name="service"/>
-    <field labelOnTop="0" name="sidewalk"/>
-    <field labelOnTop="0" name="smoothness"/>
-    <field labelOnTop="0" name="smoothness:date"/>
-    <field labelOnTop="0" name="snowmobile"/>
-    <field labelOnTop="0" name="source:maxspeed"/>
-    <field labelOnTop="0" name="source:maxspeed:backward"/>
-    <field labelOnTop="0" name="source:maxspeed:forward"/>
-    <field labelOnTop="0" name="source:name"/>
-    <field labelOnTop="0" name="source:name:oc"/>
-    <field labelOnTop="0" name="source:url"/>
-    <field labelOnTop="0" name="source:width"/>
-    <field labelOnTop="0" name="start_date"/>
-    <field labelOnTop="0" name="step_count"/>
-    <field labelOnTop="0" name="surface"/>
-    <field labelOnTop="0" name="survey_date"/>
-    <field labelOnTop="0" name="taxi"/>
-    <field labelOnTop="0" name="toll"/>
-    <field labelOnTop="0" name="tourism"/>
-    <field labelOnTop="0" name="tracktype"/>
-    <field labelOnTop="0" name="traffic_calming"/>
-    <field labelOnTop="0" name="trail_visibility"/>
-    <field labelOnTop="0" name="trailblazed"/>
-    <field labelOnTop="0" name="transit:lanes"/>
-    <field labelOnTop="0" name="tunnel"/>
-    <field labelOnTop="0" name="tunnel:name"/>
-    <field labelOnTop="0" name="turn:lanes"/>
-    <field labelOnTop="0" name="turn:lanes:backward"/>
-    <field labelOnTop="0" name="turn:lanes:forward"/>
-    <field labelOnTop="0" name="type"/>
-    <field labelOnTop="0" name="waterway"/>
-    <field labelOnTop="0" name="waterway_2"/>
-    <field labelOnTop="0" name="weight"/>
-    <field labelOnTop="0" name="wheelchair"/>
-    <field labelOnTop="0" name="width"/>
-    <field labelOnTop="0" name="wikidata"/>
-    <field labelOnTop="0" name="wikipedia"/>
-    <field labelOnTop="0" name="z_order"/>
-    <field labelOnTop="0" name="z_order_2"/>
+    <field name="access" labelOnTop="0"/>
+    <field name="access:conditional" labelOnTop="0"/>
+    <field name="access:lanes" labelOnTop="0"/>
+    <field name="access:lanes:backward" labelOnTop="0"/>
+    <field name="admin_level" labelOnTop="0"/>
+    <field name="aerialway" labelOnTop="0"/>
+    <field name="aerialway_2" labelOnTop="0"/>
+    <field name="alt_name" labelOnTop="0"/>
+    <field name="barrier" labelOnTop="0"/>
+    <field name="barrier_2" labelOnTop="0"/>
+    <field name="bicycle" labelOnTop="0"/>
+    <field name="boundary" labelOnTop="0"/>
+    <field name="bridge" labelOnTop="0"/>
+    <field name="bridge:name" labelOnTop="0"/>
+    <field name="bridge:structure" labelOnTop="0"/>
+    <field name="bus" labelOnTop="0"/>
+    <field name="bus:forward" labelOnTop="0"/>
+    <field name="bus_bay" labelOnTop="0"/>
+    <field name="busway:right" labelOnTop="0"/>
+    <field name="change:lanes" labelOnTop="0"/>
+    <field name="crossing" labelOnTop="0"/>
+    <field name="cutting" labelOnTop="0"/>
+    <field name="cycleway" labelOnTop="0"/>
+    <field name="cycleway:both" labelOnTop="0"/>
+    <field name="cycleway:both:lane" labelOnTop="0"/>
+    <field name="cycleway:lane" labelOnTop="0"/>
+    <field name="cycleway:left" labelOnTop="0"/>
+    <field name="cycleway:right" labelOnTop="0"/>
+    <field name="cycleway:right:lane" labelOnTop="0"/>
+    <field name="cycleway:right:segregated" labelOnTop="0"/>
+    <field name="departures_board" labelOnTop="0"/>
+    <field name="description" labelOnTop="0"/>
+    <field name="destination" labelOnTop="0"/>
+    <field name="destination:backward" labelOnTop="0"/>
+    <field name="destination:colour" labelOnTop="0"/>
+    <field name="destination:colour:lanes" labelOnTop="0"/>
+    <field name="destination:forward" labelOnTop="0"/>
+    <field name="destination:lanes" labelOnTop="0"/>
+    <field name="destination:ref" labelOnTop="0"/>
+    <field name="destination:ref:lanes" labelOnTop="0"/>
+    <field name="destination:symbol" labelOnTop="0"/>
+    <field name="destination:symbol:lanes" labelOnTop="0"/>
+    <field name="distance" labelOnTop="0"/>
+    <field name="embankment" labelOnTop="0"/>
+    <field name="excellent" labelOnTop="0"/>
+    <field name="fence_type" labelOnTop="0"/>
+    <field name="fid" labelOnTop="0"/>
+    <field name="foot" labelOnTop="0"/>
+    <field name="footway" labelOnTop="0"/>
+    <field name="ford" labelOnTop="0"/>
+    <field name="full_id" labelOnTop="0"/>
+    <field name="handrail" labelOnTop="0"/>
+    <field name="height" labelOnTop="0"/>
+    <field name="hgv" labelOnTop="0"/>
+    <field name="highway" labelOnTop="0"/>
+    <field name="highway_2" labelOnTop="0"/>
+    <field name="history" labelOnTop="0"/>
+    <field name="horse" labelOnTop="0"/>
+    <field name="incline" labelOnTop="0"/>
+    <field name="informal" labelOnTop="0"/>
+    <field name="int_ref" labelOnTop="0"/>
+    <field name="intermittent" labelOnTop="0"/>
+    <field name="junction" labelOnTop="0"/>
+    <field name="lane_markings" labelOnTop="0"/>
+    <field name="lanes" labelOnTop="0"/>
+    <field name="lanes:backward" labelOnTop="0"/>
+    <field name="lanes:both_ways" labelOnTop="0"/>
+    <field name="lanes:forward" labelOnTop="0"/>
+    <field name="lanes:hgv" labelOnTop="0"/>
+    <field name="layer" labelOnTop="0"/>
+    <field name="leisure" labelOnTop="0"/>
+    <field name="level" labelOnTop="0"/>
+    <field name="lit" labelOnTop="0"/>
+    <field name="living_street" labelOnTop="0"/>
+    <field name="local_name" labelOnTop="0"/>
+    <field name="local_ref" labelOnTop="0"/>
+    <field name="man_made" labelOnTop="0"/>
+    <field name="man_made_2" labelOnTop="0"/>
+    <field name="marked_trail" labelOnTop="0"/>
+    <field name="maxheight" labelOnTop="0"/>
+    <field name="maxheight:forward" labelOnTop="0"/>
+    <field name="maxspeed" labelOnTop="0"/>
+    <field name="maxspeed:advisory" labelOnTop="0"/>
+    <field name="maxspeed:backward" labelOnTop="0"/>
+    <field name="maxspeed:backward:conditional" labelOnTop="0"/>
+    <field name="maxspeed:conditional" labelOnTop="0"/>
+    <field name="maxspeed:forward" labelOnTop="0"/>
+    <field name="maxspeed:forward:conditional" labelOnTop="0"/>
+    <field name="maxspeed:hazmat" labelOnTop="0"/>
+    <field name="maxspeed:hgv" labelOnTop="0"/>
+    <field name="maxspeed:lanes" labelOnTop="0"/>
+    <field name="maxspeed:source" labelOnTop="0"/>
+    <field name="maxspeed:type" labelOnTop="0"/>
+    <field name="maxweight" labelOnTop="0"/>
+    <field name="maxweight:forward" labelOnTop="0"/>
+    <field name="maxweight:signed" labelOnTop="0"/>
+    <field name="maxwidth" labelOnTop="0"/>
+    <field name="motor_vehicle" labelOnTop="0"/>
+    <field name="motorcar" labelOnTop="0"/>
+    <field name="motorcycle" labelOnTop="0"/>
+    <field name="motorroad" labelOnTop="0"/>
+    <field name="motorway" labelOnTop="0"/>
+    <field name="mtb" labelOnTop="0"/>
+    <field name="mtb:description" labelOnTop="0"/>
+    <field name="mtb:scale" labelOnTop="0"/>
+    <field name="mtb:scale:uphill" labelOnTop="0"/>
+    <field name="name" labelOnTop="0"/>
+    <field name="name:etymology:wikidata" labelOnTop="0"/>
+    <field name="name:fr" labelOnTop="0"/>
+    <field name="name:oc" labelOnTop="0"/>
+    <field name="name:ru" labelOnTop="0"/>
+    <field name="name:wikidata" labelOnTop="0"/>
+    <field name="name_2" labelOnTop="0"/>
+    <field name="natural" labelOnTop="0"/>
+    <field name="network" labelOnTop="0"/>
+    <field name="noname" labelOnTop="0"/>
+    <field name="note:railway" labelOnTop="0"/>
+    <field name="old_name" labelOnTop="0"/>
+    <field name="old_ref" labelOnTop="0"/>
+    <field name="oneway" labelOnTop="0"/>
+    <field name="oneway:bicycle" labelOnTop="0"/>
+    <field name="operator" labelOnTop="0"/>
+    <field name="osm_id" labelOnTop="0"/>
+    <field name="osm_id_2" labelOnTop="0"/>
+    <field name="osm_type" labelOnTop="0"/>
+    <field name="other_tags" labelOnTop="0"/>
+    <field name="other_tags_2" labelOnTop="0"/>
+    <field name="parking:lane:both" labelOnTop="0"/>
+    <field name="parking:lane:left" labelOnTop="0"/>
+    <field name="parking:lane:right" labelOnTop="0"/>
+    <field name="paved" labelOnTop="0"/>
+    <field name="piste:difficulty" labelOnTop="0"/>
+    <field name="piste:type" labelOnTop="0"/>
+    <field name="placement" labelOnTop="0"/>
+    <field name="political_division" labelOnTop="0"/>
+    <field name="psv" labelOnTop="0"/>
+    <field name="psv:forward" labelOnTop="0"/>
+    <field name="psv:lanes:backward" labelOnTop="0"/>
+    <field name="public_transport" labelOnTop="0"/>
+    <field name="railway" labelOnTop="0"/>
+    <field name="railway:end_date" labelOnTop="0"/>
+    <field name="railway:start_date" labelOnTop="0"/>
+    <field name="ramp" labelOnTop="0"/>
+    <field name="ref" labelOnTop="0"/>
+    <field name="ref:FR:FANTOIR" labelOnTop="0"/>
+    <field name="ref:sandre" labelOnTop="0"/>
+    <field name="route" labelOnTop="0"/>
+    <field name="sac_scale" labelOnTop="0"/>
+    <field name="sac_scale_ref" labelOnTop="0"/>
+    <field name="segregated" labelOnTop="0"/>
+    <field name="service" labelOnTop="0"/>
+    <field name="sidewalk" labelOnTop="0"/>
+    <field name="smoothness" labelOnTop="0"/>
+    <field name="smoothness:date" labelOnTop="0"/>
+    <field name="snowmobile" labelOnTop="0"/>
+    <field name="source:maxspeed" labelOnTop="0"/>
+    <field name="source:maxspeed:backward" labelOnTop="0"/>
+    <field name="source:maxspeed:forward" labelOnTop="0"/>
+    <field name="source:name" labelOnTop="0"/>
+    <field name="source:name:oc" labelOnTop="0"/>
+    <field name="source:url" labelOnTop="0"/>
+    <field name="source:width" labelOnTop="0"/>
+    <field name="start_date" labelOnTop="0"/>
+    <field name="step_count" labelOnTop="0"/>
+    <field name="surface" labelOnTop="0"/>
+    <field name="survey_date" labelOnTop="0"/>
+    <field name="taxi" labelOnTop="0"/>
+    <field name="toll" labelOnTop="0"/>
+    <field name="tourism" labelOnTop="0"/>
+    <field name="tracktype" labelOnTop="0"/>
+    <field name="traffic_calming" labelOnTop="0"/>
+    <field name="trail_visibility" labelOnTop="0"/>
+    <field name="trailblazed" labelOnTop="0"/>
+    <field name="transit:lanes" labelOnTop="0"/>
+    <field name="tunnel" labelOnTop="0"/>
+    <field name="tunnel:name" labelOnTop="0"/>
+    <field name="turn:lanes" labelOnTop="0"/>
+    <field name="turn:lanes:backward" labelOnTop="0"/>
+    <field name="turn:lanes:forward" labelOnTop="0"/>
+    <field name="type" labelOnTop="0"/>
+    <field name="waterway" labelOnTop="0"/>
+    <field name="waterway_2" labelOnTop="0"/>
+    <field name="weight" labelOnTop="0"/>
+    <field name="wheelchair" labelOnTop="0"/>
+    <field name="width" labelOnTop="0"/>
+    <field name="wikidata" labelOnTop="0"/>
+    <field name="wikipedia" labelOnTop="0"/>
+    <field name="z_order" labelOnTop="0"/>
+    <field name="z_order_2" labelOnTop="0"/>
   </labelOnTop>
   <widgets/>
   <previewExpression>full_id</previewExpression>