diff --git a/style_caliec/styles/linestring.qml b/style_caliec/styles/linestring.qml
index b091218..600fc0d 100644
--- a/style_caliec/styles/linestring.qml
+++ b/style_caliec/styles/linestring.qml
@@ -309,63 +309,13 @@
         </layer>
       </symbol>
       <symbol type="line" clip_to_extent="1" alpha="1" name="5" force_rhr="0">
-        <layer class="SimpleLine" pass="0" enabled="1" locked="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"/>
-          <data_defined_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </data_defined_properties>
-        </layer>
-        <layer class="SimpleLine" pass="0" enabled="1" locked="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"/>
-          <data_defined_properties>
-            <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
-            </Option>
-          </data_defined_properties>
-        </layer>
         <layer class="MarkerLine" pass="0" enabled="1" locked="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="2" k="interval"/>
           <prop v="3x:0,0,0,0,0,0" k="interval_map_unit_scale"/>
-          <prop v="MapUnit" k="interval_unit"/>
+          <prop v="MM" k="interval_unit"/>
           <prop v="0" k="offset"/>
           <prop v="0" k="offset_along_line"/>
           <prop v="3x:0,0,0,0,0,0" k="offset_along_line_map_unit_scale"/>
@@ -382,7 +332,7 @@
               <Option type="QString" name="type" value="collection"/>
             </Option>
           </data_defined_properties>
-          <symbol type="marker" clip_to_extent="1" alpha="1" name="@5@2" force_rhr="0">
+          <symbol type="marker" clip_to_extent="1" alpha="1" name="@5@0" force_rhr="0">
             <layer class="SimpleMarker" pass="0" enabled="1" locked="0">
               <prop v="0" k="angle"/>
               <prop v="255,0,0,255" k="color"/>
@@ -392,13 +342,13 @@
               <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="124,124,124,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="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"/>
@@ -646,8 +596,8 @@
     </symbols>
   </renderer-v2>
   <labeling type="rule-based">
-    <rules key="{0d1220c6-2ca0-4b14-81eb-7971e3b93928}">
-      <rule filter="&quot;waterway&quot;='river'or&quot;waterway&quot;='stream'" key="{bc5302e1-6df9-4fdc-9575-03fdda15a09a}">
+    <rules key="{d20e95bf-b246-4092-b3d5-19618102fa1f}">
+      <rule filter="&quot;waterway&quot;='river'or&quot;waterway&quot;='stream'" key="{64f8b166-584c-4656-a0ac-03491239a77f}">
         <settings calloutType="simple">
           <text-style fontWordSpacing="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontFamily="Liberation Sans" fieldName="name" namedStyle="Regular" fontSize="10" textColor="0,0,0,255" isExpression="0" blendMode="0" useSubstitutions="0" fontUnderline="0" fontSizeUnit="Point" multilineHeight="1" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" fontStrikeout="0" fontKerning="1" textOpacity="1" fontItalic="0" fontWeight="50">
             <text-buffer bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferDraw="1"/>
@@ -726,7 +676,7 @@
           </callout>
         </settings>
       </rule>
-      <rule filter="&quot;highway&quot; is not null and &quot;name&quot; is not null" key="{e5bd3489-0b74-4da8-8356-a9592ace5339}">
+      <rule filter="&quot;highway&quot; is not null and &quot;name&quot; is not null" key="{f1549d78-e0ae-489b-9186-3d01b3bfab8a}">
         <settings calloutType="simple">
           <text-style fontWordSpacing="0" fontLetterSpacing="0" previewBkgrdColor="255,255,255,255" fontFamily="Liberation Sans" fieldName="name" namedStyle="Regular" fontSize="10" textColor="0,0,0,255" isExpression="0" blendMode="0" useSubstitutions="0" fontUnderline="0" fontSizeUnit="Point" multilineHeight="1" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" fontStrikeout="0" fontKerning="1" textOpacity="1" fontItalic="0" fontWeight="50">
             <text-buffer bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferOpacity="1" bufferSize="1" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferDraw="1"/>
@@ -906,357 +856,14 @@
         </config>
       </editWidget>
     </field>
-    <field name="wheelchair">
+    <field name="width">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="power">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <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/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="bus_bay">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="traffic_calming">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="taxi">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="bus">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <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="mtb:scale:imba">
-      <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/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="access">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </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>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="lanes:backward">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="source:width">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="cycleway:lane">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="tunnel">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <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="destination:forward">
-      <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">
+    <field name="step_count">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -1270,21 +877,42 @@
         </config>
       </editWidget>
     </field>
-    <field name="description">
+    <field name="handrail">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="width">
+    <field name="access">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="tracktype">
+    <field name="material">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="height">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="fence_type">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="natural">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -1298,126 +926,7 @@
         </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="cycleway">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="destination:backward">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="lane_markings">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="noname">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="old_ref">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="destination:symbol">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="source:maxspeed">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="destination">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="layer">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="bridge">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="railway">
-      <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">
+    <field name="footway">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -1431,42 +940,7 @@
         </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">
+    <field name="name:etymology:wikidata">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -1480,6 +954,27 @@
         </config>
       </editWidget>
     </field>
+    <field name="sidewalk">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="oneway">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="maxspeed:type">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
     <field name="maxspeed">
       <editWidget type="TextEdit">
         <config>
@@ -1487,7 +982,28 @@
         </config>
       </editWidget>
     </field>
-    <field name="junction">
+    <field name="lit">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="cycleway:right:segregated">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="cycleway:right">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="cycleway:left">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -1506,90 +1022,28 @@
     <alias name="" field="man_made" index="7"/>
     <alias name="" field="z_order" index="8"/>
     <alias name="" field="other_tags" index="9"/>
-    <alias name="" field="wheelchair" index="10"/>
-    <alias name="" field="power" index="11"/>
-    <alias name="" field="height" index="12"/>
-    <alias name="" field="informal" index="13"/>
-    <alias name="" field="maxwidth" index="14"/>
-    <alias name="" field="bus_bay" index="15"/>
-    <alias name="" field="traffic_calming" index="16"/>
-    <alias name="" field="taxi" index="17"/>
-    <alias name="" field="bus" index="18"/>
-    <alias name="" field="turn:lanes" index="19"/>
-    <alias name="" field="turn:lanes:forward" index="20"/>
-    <alias name="" field="turn:lanes:backward" index="21"/>
-    <alias name="" field="int_ref" index="22"/>
-    <alias name="" field="footway" index="23"/>
-    <alias name="" field="crossing" index="24"/>
-    <alias name="" field="start_date" index="25"/>
-    <alias name="" field="source:url" index="26"/>
-    <alias name="" field="political_division" index="27"/>
-    <alias name="" field="network" index="28"/>
-    <alias name="" field="name:fr" index="29"/>
-    <alias name="" field="embankment" index="30"/>
-    <alias name="" field="ford" index="31"/>
-    <alias name="" field="cycleway:left" index="32"/>
-    <alias name="" field="alt_name" index="33"/>
-    <alias name="" field="excellent" index="34"/>
-    <alias name="" field="mtb:scale:imba" index="35"/>
-    <alias name="" field="maxheight" index="36"/>
-    <alias name="" field="wikipedia" index="37"/>
-    <alias name="" field="note:railway" index="38"/>
-    <alias name="" field="snowmobile" index="39"/>
-    <alias name="" field="motor_vehicle" index="40"/>
-    <alias name="" field="horse" index="41"/>
-    <alias name="" field="access:conditional" index="42"/>
-    <alias name="" field="access" index="43"/>
-    <alias name="" field="trailblazed" index="44"/>
-    <alias name="" field="trail_visibility" index="45"/>
-    <alias name="" field="source:name" index="46"/>
-    <alias name="" field="lanes:forward" index="47"/>
-    <alias name="" field="lanes:backward" index="48"/>
-    <alias name="" field="source:width" index="49"/>
-    <alias name="" field="cycleway:lane" index="50"/>
-    <alias name="" field="tunnel" index="51"/>
-    <alias name="" field="segregated" index="52"/>
-    <alias name="" field="bicycle" index="53"/>
-    <alias name="" field="smoothness" index="54"/>
-    <alias name="" field="mtb:description" index="55"/>
-    <alias name="" field="foot" index="56"/>
-    <alias name="" field="destination:forward" index="57"/>
-    <alias name="" field="sac_scale" index="58"/>
-    <alias name="" field="mtb:scale:uphill" index="59"/>
-    <alias name="" field="mtb:scale" index="60"/>
-    <alias name="" field="incline" index="61"/>
-    <alias name="" field="description" index="62"/>
-    <alias name="" field="width" index="63"/>
-    <alias name="" field="tracktype" index="64"/>
-    <alias name="" field="service" index="65"/>
-    <alias name="" field="boundary" index="66"/>
-    <alias name="" field="admin_level" index="67"/>
-    <alias name="" field="cycleway" index="68"/>
-    <alias name="" field="destination:backward" index="69"/>
-    <alias name="" field="lane_markings" index="70"/>
-    <alias name="" field="noname" index="71"/>
-    <alias name="" field="old_ref" index="72"/>
-    <alias name="" field="destination:symbol" index="73"/>
-    <alias name="" field="source:maxspeed" index="74"/>
-    <alias name="" field="destination" index="75"/>
-    <alias name="" field="layer" index="76"/>
-    <alias name="" field="bridge" index="77"/>
-    <alias name="" field="railway" index="78"/>
-    <alias name="" field="sidewalk" index="79"/>
-    <alias name="" field="lit" index="80"/>
-    <alias name="" field="cycleway:right" index="81"/>
-    <alias name="" field="maxweight" index="82"/>
-    <alias name="" field="maxspeed:type" index="83"/>
-    <alias name="" field="cycleway:both" index="84"/>
-    <alias name="" field="old_name" index="85"/>
-    <alias name="" field="lanes" index="86"/>
-    <alias name="" field="source:name:oc" index="87"/>
-    <alias name="" field="name:oc" index="88"/>
-    <alias name="" field="ref" index="89"/>
-    <alias name="" field="oneway" index="90"/>
-    <alias name="" field="surface" index="91"/>
-    <alias name="" field="maxspeed" index="92"/>
-    <alias name="" field="junction" index="93"/>
+    <alias name="" field="width" index="10"/>
+    <alias name="" field="step_count" index="11"/>
+    <alias name="" field="incline" index="12"/>
+    <alias name="" field="handrail" index="13"/>
+    <alias name="" field="access" index="14"/>
+    <alias name="" field="material" index="15"/>
+    <alias name="" field="height" index="16"/>
+    <alias name="" field="fence_type" index="17"/>
+    <alias name="" field="natural" index="18"/>
+    <alias name="" field="service" index="19"/>
+    <alias name="" field="footway" index="20"/>
+    <alias name="" field="cycleway:both" index="21"/>
+    <alias name="" field="name:etymology:wikidata" index="22"/>
+    <alias name="" field="surface" index="23"/>
+    <alias name="" field="sidewalk" index="24"/>
+    <alias name="" field="oneway" index="25"/>
+    <alias name="" field="maxspeed:type" index="26"/>
+    <alias name="" field="maxspeed" index="27"/>
+    <alias name="" field="lit" index="28"/>
+    <alias name="" field="cycleway:right:segregated" index="29"/>
+    <alias name="" field="cycleway:right" index="30"/>
+    <alias name="" field="cycleway:left" index="31"/>
   </aliases>
   <excludeAttributesWMS/>
   <excludeAttributesWFS/>
@@ -1604,90 +1058,28 @@
     <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="power" 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="mtb:scale:imba" 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="source:width" 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="destination:forward" 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="width" applyOnUpdate="0"/>
-    <default expression="" field="tracktype" applyOnUpdate="0"/>
+    <default expression="" field="step_count" applyOnUpdate="0"/>
+    <default expression="" field="incline" applyOnUpdate="0"/>
+    <default expression="" field="handrail" applyOnUpdate="0"/>
+    <default expression="" field="access" applyOnUpdate="0"/>
+    <default expression="" field="material" applyOnUpdate="0"/>
+    <default expression="" field="height" applyOnUpdate="0"/>
+    <default expression="" field="fence_type" applyOnUpdate="0"/>
+    <default expression="" field="natural" applyOnUpdate="0"/>
     <default expression="" field="service" applyOnUpdate="0"/>
-    <default expression="" field="boundary" applyOnUpdate="0"/>
-    <default expression="" field="admin_level" 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="noname" applyOnUpdate="0"/>
-    <default expression="" field="old_ref" applyOnUpdate="0"/>
-    <default expression="" field="destination:symbol" applyOnUpdate="0"/>
-    <default expression="" field="source:maxspeed" applyOnUpdate="0"/>
-    <default expression="" field="destination" applyOnUpdate="0"/>
-    <default expression="" field="layer" applyOnUpdate="0"/>
-    <default expression="" field="bridge" applyOnUpdate="0"/>
-    <default expression="" field="railway" 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="footway" 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="name:etymology:wikidata" applyOnUpdate="0"/>
     <default expression="" field="surface" applyOnUpdate="0"/>
+    <default expression="" field="sidewalk" applyOnUpdate="0"/>
+    <default expression="" field="oneway" applyOnUpdate="0"/>
+    <default expression="" field="maxspeed:type" applyOnUpdate="0"/>
     <default expression="" field="maxspeed" applyOnUpdate="0"/>
-    <default expression="" field="junction" applyOnUpdate="0"/>
+    <default expression="" field="lit" applyOnUpdate="0"/>
+    <default expression="" field="cycleway:right:segregated" applyOnUpdate="0"/>
+    <default expression="" field="cycleway:right" applyOnUpdate="0"/>
+    <default expression="" field="cycleway:left" applyOnUpdate="0"/>
   </defaults>
   <constraints>
     <constraint unique_strength="1" exp_strength="0" field="fid" constraints="3" notnull_strength="1"/>
@@ -1700,90 +1092,28 @@
     <constraint unique_strength="0" exp_strength="0" field="man_made" constraints="0" notnull_strength="0"/>
     <constraint unique_strength="0" exp_strength="0" field="z_order" constraints="0" notnull_strength="0"/>
     <constraint unique_strength="0" exp_strength="0" field="other_tags" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="wheelchair" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="power" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="height" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="informal" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="maxwidth" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="bus_bay" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="traffic_calming" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="taxi" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="bus" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="turn:lanes" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="turn:lanes:forward" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="turn:lanes:backward" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="int_ref" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="footway" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="crossing" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="start_date" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="source:url" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="political_division" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="network" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="name:fr" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="embankment" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="ford" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="cycleway:left" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="alt_name" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="excellent" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="mtb:scale:imba" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="maxheight" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="wikipedia" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="note:railway" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="snowmobile" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="motor_vehicle" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="horse" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="access:conditional" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="access" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="trailblazed" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="trail_visibility" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="source:name" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="lanes:forward" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="lanes:backward" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="source:width" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="cycleway:lane" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="tunnel" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="segregated" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="bicycle" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="smoothness" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="mtb:description" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="foot" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="destination:forward" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="sac_scale" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="mtb:scale:uphill" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="mtb:scale" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="incline" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="description" constraints="0" notnull_strength="0"/>
     <constraint unique_strength="0" exp_strength="0" field="width" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="tracktype" constraints="0" notnull_strength="0"/>
+    <constraint unique_strength="0" exp_strength="0" field="step_count" constraints="0" notnull_strength="0"/>
+    <constraint unique_strength="0" exp_strength="0" field="incline" constraints="0" notnull_strength="0"/>
+    <constraint unique_strength="0" exp_strength="0" field="handrail" constraints="0" notnull_strength="0"/>
+    <constraint unique_strength="0" exp_strength="0" field="access" constraints="0" notnull_strength="0"/>
+    <constraint unique_strength="0" exp_strength="0" field="material" constraints="0" notnull_strength="0"/>
+    <constraint unique_strength="0" exp_strength="0" field="height" constraints="0" notnull_strength="0"/>
+    <constraint unique_strength="0" exp_strength="0" field="fence_type" constraints="0" notnull_strength="0"/>
+    <constraint unique_strength="0" exp_strength="0" field="natural" constraints="0" notnull_strength="0"/>
     <constraint unique_strength="0" exp_strength="0" field="service" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="boundary" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="admin_level" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="cycleway" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="destination:backward" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="lane_markings" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="noname" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="old_ref" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="destination:symbol" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="source:maxspeed" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="destination" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="layer" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="bridge" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="railway" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="sidewalk" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="lit" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="cycleway:right" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="maxweight" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="maxspeed:type" constraints="0" notnull_strength="0"/>
+    <constraint unique_strength="0" exp_strength="0" field="footway" constraints="0" notnull_strength="0"/>
     <constraint unique_strength="0" exp_strength="0" field="cycleway:both" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="old_name" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="lanes" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="source:name:oc" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="name:oc" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="ref" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="oneway" constraints="0" notnull_strength="0"/>
+    <constraint unique_strength="0" exp_strength="0" field="name:etymology:wikidata" constraints="0" notnull_strength="0"/>
     <constraint unique_strength="0" exp_strength="0" field="surface" constraints="0" notnull_strength="0"/>
+    <constraint unique_strength="0" exp_strength="0" field="sidewalk" constraints="0" notnull_strength="0"/>
+    <constraint unique_strength="0" exp_strength="0" field="oneway" constraints="0" notnull_strength="0"/>
+    <constraint unique_strength="0" exp_strength="0" field="maxspeed:type" constraints="0" notnull_strength="0"/>
     <constraint unique_strength="0" exp_strength="0" field="maxspeed" constraints="0" notnull_strength="0"/>
-    <constraint unique_strength="0" exp_strength="0" field="junction" constraints="0" notnull_strength="0"/>
+    <constraint unique_strength="0" exp_strength="0" field="lit" constraints="0" notnull_strength="0"/>
+    <constraint unique_strength="0" exp_strength="0" field="cycleway:right:segregated" constraints="0" notnull_strength="0"/>
+    <constraint unique_strength="0" exp_strength="0" field="cycleway:right" constraints="0" notnull_strength="0"/>
+    <constraint unique_strength="0" exp_strength="0" field="cycleway:left" constraints="0" notnull_strength="0"/>
   </constraints>
   <constraintExpressions>
     <constraint desc="" exp="" field="fid"/>
@@ -1796,110 +1126,48 @@
     <constraint desc="" exp="" field="man_made"/>
     <constraint desc="" exp="" field="z_order"/>
     <constraint desc="" exp="" field="other_tags"/>
-    <constraint desc="" exp="" field="wheelchair"/>
-    <constraint desc="" exp="" field="power"/>
-    <constraint desc="" exp="" field="height"/>
-    <constraint desc="" exp="" field="informal"/>
-    <constraint desc="" exp="" field="maxwidth"/>
-    <constraint desc="" exp="" field="bus_bay"/>
-    <constraint desc="" exp="" field="traffic_calming"/>
-    <constraint desc="" exp="" field="taxi"/>
-    <constraint desc="" exp="" field="bus"/>
-    <constraint desc="" exp="" field="turn:lanes"/>
-    <constraint desc="" exp="" field="turn:lanes:forward"/>
-    <constraint desc="" exp="" field="turn:lanes:backward"/>
-    <constraint desc="" exp="" field="int_ref"/>
-    <constraint desc="" exp="" field="footway"/>
-    <constraint desc="" exp="" field="crossing"/>
-    <constraint desc="" exp="" field="start_date"/>
-    <constraint desc="" exp="" field="source:url"/>
-    <constraint desc="" exp="" field="political_division"/>
-    <constraint desc="" exp="" field="network"/>
-    <constraint desc="" exp="" field="name:fr"/>
-    <constraint desc="" exp="" field="embankment"/>
-    <constraint desc="" exp="" field="ford"/>
-    <constraint desc="" exp="" field="cycleway:left"/>
-    <constraint desc="" exp="" field="alt_name"/>
-    <constraint desc="" exp="" field="excellent"/>
-    <constraint desc="" exp="" field="mtb:scale:imba"/>
-    <constraint desc="" exp="" field="maxheight"/>
-    <constraint desc="" exp="" field="wikipedia"/>
-    <constraint desc="" exp="" field="note:railway"/>
-    <constraint desc="" exp="" field="snowmobile"/>
-    <constraint desc="" exp="" field="motor_vehicle"/>
-    <constraint desc="" exp="" field="horse"/>
-    <constraint desc="" exp="" field="access:conditional"/>
-    <constraint desc="" exp="" field="access"/>
-    <constraint desc="" exp="" field="trailblazed"/>
-    <constraint desc="" exp="" field="trail_visibility"/>
-    <constraint desc="" exp="" field="source:name"/>
-    <constraint desc="" exp="" field="lanes:forward"/>
-    <constraint desc="" exp="" field="lanes:backward"/>
-    <constraint desc="" exp="" field="source:width"/>
-    <constraint desc="" exp="" field="cycleway:lane"/>
-    <constraint desc="" exp="" field="tunnel"/>
-    <constraint desc="" exp="" field="segregated"/>
-    <constraint desc="" exp="" field="bicycle"/>
-    <constraint desc="" exp="" field="smoothness"/>
-    <constraint desc="" exp="" field="mtb:description"/>
-    <constraint desc="" exp="" field="foot"/>
-    <constraint desc="" exp="" field="destination:forward"/>
-    <constraint desc="" exp="" field="sac_scale"/>
-    <constraint desc="" exp="" field="mtb:scale:uphill"/>
-    <constraint desc="" exp="" field="mtb:scale"/>
-    <constraint desc="" exp="" field="incline"/>
-    <constraint desc="" exp="" field="description"/>
     <constraint desc="" exp="" field="width"/>
-    <constraint desc="" exp="" field="tracktype"/>
+    <constraint desc="" exp="" field="step_count"/>
+    <constraint desc="" exp="" field="incline"/>
+    <constraint desc="" exp="" field="handrail"/>
+    <constraint desc="" exp="" field="access"/>
+    <constraint desc="" exp="" field="material"/>
+    <constraint desc="" exp="" field="height"/>
+    <constraint desc="" exp="" field="fence_type"/>
+    <constraint desc="" exp="" field="natural"/>
     <constraint desc="" exp="" field="service"/>
-    <constraint desc="" exp="" field="boundary"/>
-    <constraint desc="" exp="" field="admin_level"/>
-    <constraint desc="" exp="" field="cycleway"/>
-    <constraint desc="" exp="" field="destination:backward"/>
-    <constraint desc="" exp="" field="lane_markings"/>
-    <constraint desc="" exp="" field="noname"/>
-    <constraint desc="" exp="" field="old_ref"/>
-    <constraint desc="" exp="" field="destination:symbol"/>
-    <constraint desc="" exp="" field="source:maxspeed"/>
-    <constraint desc="" exp="" field="destination"/>
-    <constraint desc="" exp="" field="layer"/>
-    <constraint desc="" exp="" field="bridge"/>
-    <constraint desc="" exp="" field="railway"/>
-    <constraint desc="" exp="" field="sidewalk"/>
-    <constraint desc="" exp="" field="lit"/>
-    <constraint desc="" exp="" field="cycleway:right"/>
-    <constraint desc="" exp="" field="maxweight"/>
-    <constraint desc="" exp="" field="maxspeed:type"/>
+    <constraint desc="" exp="" field="footway"/>
     <constraint desc="" exp="" field="cycleway:both"/>
-    <constraint desc="" exp="" field="old_name"/>
-    <constraint desc="" exp="" field="lanes"/>
-    <constraint desc="" exp="" field="source:name:oc"/>
-    <constraint desc="" exp="" field="name:oc"/>
-    <constraint desc="" exp="" field="ref"/>
-    <constraint desc="" exp="" field="oneway"/>
+    <constraint desc="" exp="" field="name:etymology:wikidata"/>
     <constraint desc="" exp="" field="surface"/>
+    <constraint desc="" exp="" field="sidewalk"/>
+    <constraint desc="" exp="" field="oneway"/>
+    <constraint desc="" exp="" field="maxspeed:type"/>
     <constraint desc="" exp="" field="maxspeed"/>
-    <constraint desc="" exp="" field="junction"/>
+    <constraint desc="" exp="" field="lit"/>
+    <constraint desc="" exp="" field="cycleway:right:segregated"/>
+    <constraint desc="" exp="" field="cycleway:right"/>
+    <constraint desc="" exp="" field="cycleway:left"/>
   </constraintExpressions>
   <expressionfields/>
   <attributeactions>
     <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-    <actionsetting type="5" notificationMessage="" name="OpenStreetMap Browser" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]" isEnabledOnlyWhenEditable="0" icon="" capture="0" id="{4a332aea-845b-44d7-90b8-548a61a8c515}" shortTitle="OpenStreetMap Browser">
+    <actionsetting type="5" notificationMessage="" name="OpenStreetMap Browser" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]" isEnabledOnlyWhenEditable="0" icon="" capture="0" id="{91b36696-6bd3-49a8-a62e-116a09eef79a}" shortTitle="OpenStreetMap Browser">
       <actionScope id="Field"/>
       <actionScope id="Feature"/>
       <actionScope id="Canvas"/>
     </actionsetting>
-    <actionsetting type="1" notificationMessage="" name="Mapillary" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;mapillary&quot;,&quot;[% &quot;mapillary&quot; %]&quot;)" isEnabledOnlyWhenEditable="0" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/mapillary_logo.svg" capture="0" id="{25b21e31-6cae-43d4-8947-d043d5fe562b}" shortTitle="Mapillary">
+    <actionsetting type="1" notificationMessage="" name="Mapillary" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;mapillary&quot;,&quot;[% &quot;mapillary&quot; %]&quot;)" isEnabledOnlyWhenEditable="0" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/mapillary_logo.svg" capture="0" id="{5e2e732d-ffd6-43c4-a286-98f801cfaf36}" shortTitle="Mapillary">
       <actionScope id="Field"/>
       <actionScope id="Feature"/>
       <actionScope id="Canvas"/>
     </actionsetting>
-    <actionsetting type="1" notificationMessage="" name="JOSM" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;josm&quot;,&quot;[% &quot;full_id&quot; %]&quot;)" isEnabledOnlyWhenEditable="0" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/josm_icon.svg" capture="0" id="{4c0f9860-2b5e-44f2-9015-4691579ed36e}" shortTitle="JOSM">
+    <actionsetting type="1" notificationMessage="" name="JOSM" action="from QuickOSM.core.actions import Actions;Actions.run(&quot;josm&quot;,&quot;[% &quot;full_id&quot; %]&quot;)" isEnabledOnlyWhenEditable="0" icon="/home/arnaud/.local/share/QGIS/QGIS3/profiles/default/python/plugins/QuickOSM/resources/icons/josm_icon.svg" capture="0" id="{d1d51242-a425-425b-8b1a-e2b708f50df4}" shortTitle="JOSM">
       <actionScope id="Field"/>
       <actionScope id="Feature"/>
       <actionScope id="Canvas"/>
     </actionsetting>
-    <actionsetting type="5" notificationMessage="" name="User default editor" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]" isEnabledOnlyWhenEditable="0" icon="" capture="0" id="{dfb72ee3-cc39-439d-9e7d-1269a807ce07}" shortTitle="User default editor">
+    <actionsetting type="5" notificationMessage="" name="User default editor" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]" isEnabledOnlyWhenEditable="0" icon="" capture="0" id="{4bac628d-6f46-4850-b909-f1f823a37930}" shortTitle="User default editor">
       <actionScope id="Field"/>
       <actionScope id="Feature"/>
       <actionScope id="Canvas"/>
@@ -1918,90 +1186,28 @@
       <column type="field" name="aerialway" width="-1" hidden="0"/>
       <column type="field" name="z_order" width="-1" hidden="0"/>
       <column type="field" name="other_tags" width="406" hidden="0"/>
-      <column type="field" name="bus" width="-1" hidden="0"/>
       <column type="field" name="sidewalk" width="-1" hidden="0"/>
       <column type="field" name="footway" width="-1" hidden="0"/>
       <column type="field" name="service" width="-1" hidden="0"/>
-      <column type="field" name="motor_vehicle" width="-1" hidden="0"/>
       <column type="field" name="access" width="-1" hidden="0"/>
-      <column type="field" name="alt_name" width="-1" hidden="0"/>
-      <column type="field" name="lanes:forward" width="-1" hidden="0"/>
-      <column type="field" name="lanes:backward" width="-1" hidden="0"/>
       <column type="field" name="width" width="-1" hidden="0"/>
-      <column type="field" name="foot" width="-1" hidden="0"/>
-      <column type="field" name="bicycle" width="-1" hidden="0"/>
-      <column type="field" name="smoothness" width="-1" hidden="0"/>
-      <column type="field" name="tunnel" width="-1" hidden="0"/>
       <column type="field" name="cycleway:both" width="-1" hidden="0"/>
-      <column type="field" name="bus_bay" width="-1" hidden="0"/>
       <column type="field" name="maxspeed:type" width="-1" hidden="0"/>
       <column type="field" name="lit" width="-1" hidden="0"/>
-      <column type="field" name="embankment" width="-1" hidden="0"/>
-      <column type="field" name="cycleway" width="-1" hidden="0"/>
       <column type="field" name="cycleway:right" width="-1" hidden="0"/>
-      <column type="field" name="ref" width="-1" hidden="0"/>
-      <column type="field" name="destination:symbol" width="-1" hidden="0"/>
-      <column type="field" name="destination" width="-1" hidden="0"/>
       <column type="field" name="oneway" width="-1" hidden="0"/>
-      <column type="field" name="old_ref" width="-1" hidden="0"/>
-      <column type="field" name="layer" width="-1" hidden="0"/>
-      <column type="field" name="lanes" width="-1" hidden="0"/>
-      <column type="field" name="bridge" width="-1" hidden="0"/>
-      <column type="field" name="source:maxspeed" width="-1" hidden="0"/>
       <column type="field" name="surface" width="-1" hidden="0"/>
       <column type="field" name="maxspeed" width="-1" hidden="0"/>
-      <column type="field" name="junction" width="-1" hidden="0"/>
-      <column type="field" name="taxi" width="-1" hidden="0"/>
-      <column type="field" name="cycleway:lane" width="-1" hidden="0"/>
-      <column type="field" name="wheelchair" width="-1" hidden="0"/>
       <column type="field" name="height" width="-1" hidden="0"/>
-      <column type="field" name="informal" width="-1" hidden="0"/>
-      <column type="field" name="maxwidth" width="-1" hidden="0"/>
-      <column type="field" name="traffic_calming" width="-1" hidden="0"/>
-      <column type="field" name="turn:lanes" width="-1" hidden="0"/>
-      <column type="field" name="turn:lanes:forward" width="-1" hidden="0"/>
-      <column type="field" name="turn:lanes:backward" width="-1" hidden="0"/>
-      <column type="field" name="int_ref" width="-1" hidden="0"/>
-      <column type="field" name="crossing" width="-1" hidden="0"/>
-      <column type="field" name="start_date" width="-1" hidden="0"/>
-      <column type="field" name="source:url" width="-1" hidden="0"/>
-      <column type="field" name="political_division" width="-1" hidden="0"/>
-      <column type="field" name="network" width="-1" hidden="0"/>
-      <column type="field" name="name:fr" width="-1" hidden="0"/>
-      <column type="field" name="ford" width="-1" hidden="0"/>
       <column type="field" name="cycleway:left" width="-1" hidden="0"/>
-      <column type="field" name="excellent" width="-1" hidden="0"/>
-      <column type="field" name="maxheight" width="-1" hidden="0"/>
-      <column type="field" name="wikipedia" width="-1" hidden="0"/>
-      <column type="field" name="note:railway" width="-1" hidden="0"/>
-      <column type="field" name="snowmobile" width="-1" hidden="0"/>
-      <column type="field" name="horse" width="-1" hidden="0"/>
-      <column type="field" name="access:conditional" width="-1" hidden="0"/>
-      <column type="field" name="trailblazed" width="-1" hidden="0"/>
-      <column type="field" name="trail_visibility" width="-1" hidden="0"/>
-      <column type="field" name="source:name" width="-1" hidden="0"/>
-      <column type="field" name="destination:forward" width="-1" hidden="0"/>
-      <column type="field" name="segregated" width="-1" hidden="0"/>
-      <column type="field" name="mtb:description" width="-1" hidden="0"/>
-      <column type="field" name="sac_scale" width="-1" hidden="0"/>
-      <column type="field" name="mtb:scale:uphill" width="-1" hidden="0"/>
-      <column type="field" name="mtb:scale" width="-1" hidden="0"/>
       <column type="field" name="incline" width="-1" hidden="0"/>
-      <column type="field" name="description" width="-1" hidden="0"/>
-      <column type="field" name="tracktype" width="-1" hidden="0"/>
-      <column type="field" name="boundary" width="-1" hidden="0"/>
-      <column type="field" name="admin_level" width="-1" hidden="0"/>
-      <column type="field" name="noname" width="-1" hidden="0"/>
-      <column type="field" name="destination:backward" width="-1" hidden="0"/>
-      <column type="field" name="lane_markings" width="-1" hidden="0"/>
-      <column type="field" name="railway" width="-1" hidden="0"/>
-      <column type="field" name="source:width" width="-1" hidden="0"/>
-      <column type="field" name="maxweight" width="-1" hidden="0"/>
-      <column type="field" name="old_name" width="-1" hidden="0"/>
-      <column type="field" name="source:name:oc" width="-1" hidden="0"/>
-      <column type="field" name="name:oc" width="-1" hidden="0"/>
-      <column type="field" name="power" width="-1" hidden="0"/>
-      <column type="field" name="mtb:scale:imba" width="-1" hidden="0"/>
+      <column type="field" name="step_count" width="-1" hidden="0"/>
+      <column type="field" name="handrail" width="-1" hidden="0"/>
+      <column type="field" name="material" width="-1" hidden="0"/>
+      <column type="field" name="fence_type" width="-1" hidden="0"/>
+      <column type="field" name="natural" width="-1" hidden="0"/>
+      <column type="field" name="name:etymology:wikidata" width="-1" hidden="0"/>
+      <column type="field" name="cycleway:right:segregated" width="-1" hidden="0"/>
     </columns>
   </attributetableconfig>
   <conditionalstyles>
@@ -2128,6 +1334,7 @@ def my_form_open(dialog, layer, feature):
     <field name="man_made_2" editable="1"/>
     <field name="mapillary" editable="1"/>
     <field name="marked_trail" editable="1"/>
+    <field name="material" editable="1"/>
     <field name="maxheight" editable="1"/>
     <field name="maxheight:forward" editable="1"/>
     <field name="maxspeed" editable="1"/>
@@ -2359,6 +1566,7 @@ def my_form_open(dialog, layer, feature):
     <field labelOnTop="0" name="man_made_2"/>
     <field labelOnTop="0" name="mapillary"/>
     <field labelOnTop="0" name="marked_trail"/>
+    <field labelOnTop="0" name="material"/>
     <field labelOnTop="0" name="maxheight"/>
     <field labelOnTop="0" name="maxheight:forward"/>
     <field labelOnTop="0" name="maxspeed"/>