diff --git a/style_caliec/styles/multipolygon.qml b/style_caliec/styles/multipolygon.qml
index 265bd60..81260f4 100644
--- a/style_caliec/styles/multipolygon.qml
+++ b/style_caliec/styles/multipolygon.qml
@@ -1298,8 +1298,8 @@
     </symbols>
   </renderer-v2>
   <labeling type="rule-based">
-    <rules key="{98494f59-644f-47ae-acff-d57fad3e8738}">
-      <rule description="parking" key="{05ba4889-5b2a-49f9-8b10-d7e25e6d8216}" filter="&quot;amenity&quot;='parking'">
+    <rules key="{b710a411-6f35-4f77-a07d-d3c1be4ba2d9}">
+      <rule description="parking" key="{3d94d10d-1ab8-4241-a2fb-0c8ec04bdd90}" filter="&quot;amenity&quot;='parking'">
         <settings calloutType="simple">
           <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontLetterSpacing="0" textOpacity="1" textOrientation="horizontal" fontItalic="0" fontWordSpacing="0" fontWeight="75" fontSize="10" previewBkgrdColor="255,255,255,255" fontStrikeout="0" fontKerning="1" textColor="0,149,255,255" fieldName="'P'" fontCapitals="0" fontUnderline="0" namedStyle="Bold" fontSizeUnit="MapUnit" isExpression="1" fontFamily="Liberation Sans" multilineHeight="1" useSubstitutions="0">
             <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferDraw="0"/>
@@ -1378,7 +1378,7 @@
           </callout>
         </settings>
       </rule>
-      <rule description="jeux" key="{cf74eaa0-69c5-498c-b273-deb5e0d23df1}" filter="&quot;leisure&quot;='playground'">
+      <rule description="jeux" key="{53d8b2e7-06b5-4a13-9b28-de392a839bca}" filter="&quot;leisure&quot;='playground'">
         <settings calloutType="simple">
           <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" blendMode="0" fontLetterSpacing="0" textOpacity="1" textOrientation="horizontal" fontItalic="0" fontWordSpacing="0" fontWeight="50" fontSize="10" previewBkgrdColor="255,255,255,255" fontStrikeout="0" fontKerning="1" textColor="0,0,0,255" fieldName="'parc à jeux'" fontCapitals="0" fontUnderline="0" namedStyle="Regular" fontSizeUnit="Point" isExpression="1" fontFamily="Liberation Sans" multilineHeight="1" useSubstitutions="0">
             <text-buffer bufferSize="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferDraw="1"/>
@@ -1726,49 +1726,56 @@
         </config>
       </editWidget>
     </field>
-    <field name="operator">
+    <field name="shelter_type">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="leaf_type">
+    <field name="club">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="addr:city">
+    <field name="supervised">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="residential">
+    <field name="maxheight">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="swimming">
+    <field name="phone">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="seamark:type">
+    <field name="ref:FR:BMPM:GRPT">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="seamark:restricted_area:restriction">
+    <field name="operator:wikidata">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="smoothness">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -1789,21 +1796,147 @@
         </config>
       </editWidget>
     </field>
-    <field name="roof:shape">
+    <field name="seamark:type">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="roof:levels">
+    <field name="seamark:harbour:category">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="building:levels">
+    <field name="addr:city">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="residential">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="lit">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="highway">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="school:FR">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="ref:UAI">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="operator:type">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="religion">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="supermarket:FR">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="supermarket">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="brand:wikipedia">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="brand:wikidata">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="brand">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="operator">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="access">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="disused">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="bunker_type">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="bunker">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="abandoned:building">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -1817,7 +1950,28 @@
         </config>
       </editWidget>
     </field>
-    <field name="material">
+    <field name="public_transport">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="level">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="floating">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="ferry">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -1845,20 +1999,6 @@
         </config>
       </editWidget>
     </field>
-    <field name="landcover">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
-    <field name="access">
-      <editWidget type="TextEdit">
-        <config>
-          <Option/>
-        </config>
-      </editWidget>
-    </field>
     <field name="surface">
       <editWidget type="TextEdit">
         <config>
@@ -2622,130 +2762,150 @@
     <alias name="" field="sport" index="23"/>
     <alias name="" field="tourism" index="24"/>
     <alias name="" field="other_tags" index="25"/>
-    <alias name="" field="operator" index="26"/>
-    <alias name="" field="leaf_type" index="27"/>
-    <alias name="" field="addr:city" index="28"/>
-    <alias name="" field="residential" index="29"/>
-    <alias name="" field="swimming" index="30"/>
-    <alias name="" field="seamark:type" index="31"/>
-    <alias name="" field="seamark:restricted_area:restriction" index="32"/>
-    <alias name="" field="parking" index="33"/>
-    <alias name="" field="fee" index="34"/>
-    <alias name="" field="roof:shape" index="35"/>
-    <alias name="" field="roof:levels" index="36"/>
-    <alias name="" field="building:levels" index="37"/>
-    <alias name="" field="wall" index="38"/>
-    <alias name="" field="material" index="39"/>
-    <alias name="" field="ref:FR:FANTOIR" index="40"/>
-    <alias name="" field="addr:street" index="41"/>
-    <alias name="" field="addr:housenumber" index="42"/>
-    <alias name="" field="landcover" index="43"/>
-    <alias name="" field="access" index="44"/>
-    <alias name="" field="surface" index="45"/>
-    <alias name="" field="short_name:oc" index="46"/>
-    <alias name="" field="short_name:fr" index="47"/>
-    <alias name="" field="short_name:en" index="48"/>
-    <alias name="" field="name:sv" index="49"/>
-    <alias name="" field="name:sr-Latn" index="50"/>
-    <alias name="" field="name:sco" index="51"/>
-    <alias name="" field="name:pa" index="52"/>
-    <alias name="" field="name:mk" index="53"/>
-    <alias name="" field="name:ka" index="54"/>
-    <alias name="" field="name:is" index="55"/>
-    <alias name="" field="name:hy" index="56"/>
-    <alias name="" field="name:hr" index="57"/>
-    <alias name="" field="name:he" index="58"/>
-    <alias name="" field="name:gl" index="59"/>
-    <alias name="" field="name:et" index="60"/>
-    <alias name="" field="name:cs" index="61"/>
-    <alias name="" field="name:bn" index="62"/>
-    <alias name="" field="gns:uni" index="63"/>
-    <alias name="" field="gns:dsg" index="64"/>
-    <alias name="" field="alt_name:no" index="65"/>
-    <alias name="" field="region:type" index="66"/>
-    <alias name="" field="ref:aveo" index="67"/>
-    <alias name="" field="addr:postcode" index="68"/>
-    <alias name="" field="website:regulation" index="69"/>
-    <alias name="" field="holiday_zone" index="70"/>
-    <alias name="" field="boundary_type:FR" index="71"/>
-    <alias name="" field="short_name" index="72"/>
-    <alias name="" field="official_name:ar" index="73"/>
-    <alias name="" field="official_name" index="74"/>
-    <alias name="" field="local_authority:FR" index="75"/>
-    <alias name="" field="start_date" index="76"/>
-    <alias name="" field="source:url" index="77"/>
-    <alias name="" field="name:de" index="78"/>
-    <alias name="" field="political_division" index="79"/>
-    <alias name="" field="protection_title" index="80"/>
-    <alias name="" field="protect_class" index="81"/>
-    <alias name="" field="ref:FR:SIREN" index="82"/>
-    <alias name="" field="disused:local_authority:FR" index="83"/>
-    <alias name="" field="wikipedia:oc" index="84"/>
-    <alias name="" field="old_name" index="85"/>
-    <alias name="" field="name:zh" index="86"/>
-    <alias name="" field="name:vi" index="87"/>
-    <alias name="" field="name:tt" index="88"/>
-    <alias name="" field="name:tr" index="89"/>
-    <alias name="" field="name:sr" index="90"/>
-    <alias name="" field="name:mzn" index="91"/>
-    <alias name="" field="name:la" index="92"/>
-    <alias name="" field="name:ku" index="93"/>
-    <alias name="" field="name:ko" index="94"/>
-    <alias name="" field="name:kn" index="95"/>
-    <alias name="" field="name:kmr" index="96"/>
-    <alias name="" field="name:kk-Arab" index="97"/>
-    <alias name="" field="name:ja" index="98"/>
-    <alias name="" field="name:ckb" index="99"/>
-    <alias name="" field="name:azb" index="100"/>
-    <alias name="" field="name:1794-01-06--1794-02-12" index="101"/>
-    <alias name="" field="alt_name:vi" index="102"/>
-    <alias name="" field="alt_name:ar" index="103"/>
-    <alias name="" field="postal_code" index="104"/>
-    <alias name="" field="population:date" index="105"/>
-    <alias name="" field="alt_name:oc" index="106"/>
-    <alias name="" field="alt_name:fr" index="107"/>
-    <alias name="" field="admin_type:FR" index="108"/>
-    <alias name="" field="website" index="109"/>
-    <alias name="" field="source:population" index="110"/>
-    <alias name="" field="name:zh-Hant" index="111"/>
-    <alias name="" field="name:zh-Hans" index="112"/>
-    <alias name="" field="name:uk" index="113"/>
-    <alias name="" field="name:sl" index="114"/>
-    <alias name="" field="name:ro" index="115"/>
-    <alias name="" field="name:pt" index="116"/>
-    <alias name="" field="name:pl" index="117"/>
-    <alias name="" field="name:lt" index="118"/>
-    <alias name="" field="name:it" index="119"/>
-    <alias name="" field="name:hu" index="120"/>
-    <alias name="" field="name:eu" index="121"/>
-    <alias name="" field="name:eo" index="122"/>
-    <alias name="" field="name:en" index="123"/>
-    <alias name="" field="name:be" index="124"/>
-    <alias name="" field="name:ast" index="125"/>
-    <alias name="" field="image" index="126"/>
-    <alias name="" field="wikipedia" index="127"/>
-    <alias name="" field="wikidata" index="128"/>
-    <alias name="" field="source:name:oc" index="129"/>
-    <alias name="" field="source:name:br" index="130"/>
-    <alias name="" field="ref:nuts:3" index="131"/>
-    <alias name="" field="ref:nuts" index="132"/>
-    <alias name="" field="ref:INSEE" index="133"/>
-    <alias name="" field="ref" index="134"/>
-    <alias name="" field="population" index="135"/>
-    <alias name="" field="name:ur" index="136"/>
-    <alias name="" field="name:ru" index="137"/>
-    <alias name="" field="name:pnb" index="138"/>
-    <alias name="" field="name:oc" index="139"/>
-    <alias name="" field="name:fr" index="140"/>
-    <alias name="" field="name:fa" index="141"/>
-    <alias name="" field="name:es" index="142"/>
-    <alias name="" field="name:el" index="143"/>
-    <alias name="" field="name:ca" index="144"/>
-    <alias name="" field="name:br" index="145"/>
-    <alias name="" field="name:ar" index="146"/>
-    <alias name="" field="border_type" index="147"/>
-    <alias name="" field="alt_name" index="148"/>
-    <alias name="" field="ISO3166-2" index="149"/>
+    <alias name="" field="shelter_type" index="26"/>
+    <alias name="" field="club" index="27"/>
+    <alias name="" field="supervised" index="28"/>
+    <alias name="" field="maxheight" index="29"/>
+    <alias name="" field="phone" index="30"/>
+    <alias name="" field="ref:FR:BMPM:GRPT" index="31"/>
+    <alias name="" field="operator:wikidata" index="32"/>
+    <alias name="" field="smoothness" index="33"/>
+    <alias name="" field="parking" index="34"/>
+    <alias name="" field="fee" index="35"/>
+    <alias name="" field="seamark:type" index="36"/>
+    <alias name="" field="seamark:harbour:category" index="37"/>
+    <alias name="" field="addr:city" index="38"/>
+    <alias name="" field="residential" index="39"/>
+    <alias name="" field="lit" index="40"/>
+    <alias name="" field="highway" index="41"/>
+    <alias name="" field="school:FR" index="42"/>
+    <alias name="" field="ref:UAI" index="43"/>
+    <alias name="" field="operator:type" index="44"/>
+    <alias name="" field="religion" index="45"/>
+    <alias name="" field="supermarket:FR" index="46"/>
+    <alias name="" field="supermarket" index="47"/>
+    <alias name="" field="brand:wikipedia" index="48"/>
+    <alias name="" field="brand:wikidata" index="49"/>
+    <alias name="" field="brand" index="50"/>
+    <alias name="" field="operator" index="51"/>
+    <alias name="" field="access" index="52"/>
+    <alias name="" field="disused" index="53"/>
+    <alias name="" field="bunker_type" index="54"/>
+    <alias name="" field="bunker" index="55"/>
+    <alias name="" field="abandoned:building" index="56"/>
+    <alias name="" field="wall" index="57"/>
+    <alias name="" field="public_transport" index="58"/>
+    <alias name="" field="level" index="59"/>
+    <alias name="" field="floating" index="60"/>
+    <alias name="" field="ferry" index="61"/>
+    <alias name="" field="ref:FR:FANTOIR" index="62"/>
+    <alias name="" field="addr:street" index="63"/>
+    <alias name="" field="addr:housenumber" index="64"/>
+    <alias name="" field="surface" index="65"/>
+    <alias name="" field="short_name:oc" index="66"/>
+    <alias name="" field="short_name:fr" index="67"/>
+    <alias name="" field="short_name:en" index="68"/>
+    <alias name="" field="name:sv" index="69"/>
+    <alias name="" field="name:sr-Latn" index="70"/>
+    <alias name="" field="name:sco" index="71"/>
+    <alias name="" field="name:pa" index="72"/>
+    <alias name="" field="name:mk" index="73"/>
+    <alias name="" field="name:ka" index="74"/>
+    <alias name="" field="name:is" index="75"/>
+    <alias name="" field="name:hy" index="76"/>
+    <alias name="" field="name:hr" index="77"/>
+    <alias name="" field="name:he" index="78"/>
+    <alias name="" field="name:gl" index="79"/>
+    <alias name="" field="name:et" index="80"/>
+    <alias name="" field="name:cs" index="81"/>
+    <alias name="" field="name:bn" index="82"/>
+    <alias name="" field="gns:uni" index="83"/>
+    <alias name="" field="gns:dsg" index="84"/>
+    <alias name="" field="alt_name:no" index="85"/>
+    <alias name="" field="region:type" index="86"/>
+    <alias name="" field="ref:aveo" index="87"/>
+    <alias name="" field="addr:postcode" index="88"/>
+    <alias name="" field="website:regulation" index="89"/>
+    <alias name="" field="holiday_zone" index="90"/>
+    <alias name="" field="boundary_type:FR" index="91"/>
+    <alias name="" field="short_name" index="92"/>
+    <alias name="" field="official_name:ar" index="93"/>
+    <alias name="" field="official_name" index="94"/>
+    <alias name="" field="local_authority:FR" index="95"/>
+    <alias name="" field="start_date" index="96"/>
+    <alias name="" field="source:url" index="97"/>
+    <alias name="" field="name:de" index="98"/>
+    <alias name="" field="political_division" index="99"/>
+    <alias name="" field="protection_title" index="100"/>
+    <alias name="" field="protect_class" index="101"/>
+    <alias name="" field="ref:FR:SIREN" index="102"/>
+    <alias name="" field="disused:local_authority:FR" index="103"/>
+    <alias name="" field="wikipedia:oc" index="104"/>
+    <alias name="" field="old_name" index="105"/>
+    <alias name="" field="name:zh" index="106"/>
+    <alias name="" field="name:vi" index="107"/>
+    <alias name="" field="name:tt" index="108"/>
+    <alias name="" field="name:tr" index="109"/>
+    <alias name="" field="name:sr" index="110"/>
+    <alias name="" field="name:mzn" index="111"/>
+    <alias name="" field="name:la" index="112"/>
+    <alias name="" field="name:ku" index="113"/>
+    <alias name="" field="name:ko" index="114"/>
+    <alias name="" field="name:kn" index="115"/>
+    <alias name="" field="name:kmr" index="116"/>
+    <alias name="" field="name:kk-Arab" index="117"/>
+    <alias name="" field="name:ja" index="118"/>
+    <alias name="" field="name:ckb" index="119"/>
+    <alias name="" field="name:azb" index="120"/>
+    <alias name="" field="name:1794-01-06--1794-02-12" index="121"/>
+    <alias name="" field="alt_name:vi" index="122"/>
+    <alias name="" field="alt_name:ar" index="123"/>
+    <alias name="" field="postal_code" index="124"/>
+    <alias name="" field="population:date" index="125"/>
+    <alias name="" field="alt_name:oc" index="126"/>
+    <alias name="" field="alt_name:fr" index="127"/>
+    <alias name="" field="admin_type:FR" index="128"/>
+    <alias name="" field="website" index="129"/>
+    <alias name="" field="source:population" index="130"/>
+    <alias name="" field="name:zh-Hant" index="131"/>
+    <alias name="" field="name:zh-Hans" index="132"/>
+    <alias name="" field="name:uk" index="133"/>
+    <alias name="" field="name:sl" index="134"/>
+    <alias name="" field="name:ro" index="135"/>
+    <alias name="" field="name:pt" index="136"/>
+    <alias name="" field="name:pl" index="137"/>
+    <alias name="" field="name:lt" index="138"/>
+    <alias name="" field="name:it" index="139"/>
+    <alias name="" field="name:hu" index="140"/>
+    <alias name="" field="name:eu" index="141"/>
+    <alias name="" field="name:eo" index="142"/>
+    <alias name="" field="name:en" index="143"/>
+    <alias name="" field="name:be" index="144"/>
+    <alias name="" field="name:ast" index="145"/>
+    <alias name="" field="image" index="146"/>
+    <alias name="" field="wikipedia" index="147"/>
+    <alias name="" field="wikidata" index="148"/>
+    <alias name="" field="source:name:oc" index="149"/>
+    <alias name="" field="source:name:br" index="150"/>
+    <alias name="" field="ref:nuts:3" index="151"/>
+    <alias name="" field="ref:nuts" index="152"/>
+    <alias name="" field="ref:INSEE" index="153"/>
+    <alias name="" field="ref" index="154"/>
+    <alias name="" field="population" index="155"/>
+    <alias name="" field="name:ur" index="156"/>
+    <alias name="" field="name:ru" index="157"/>
+    <alias name="" field="name:pnb" index="158"/>
+    <alias name="" field="name:oc" index="159"/>
+    <alias name="" field="name:fr" index="160"/>
+    <alias name="" field="name:fa" index="161"/>
+    <alias name="" field="name:es" index="162"/>
+    <alias name="" field="name:el" index="163"/>
+    <alias name="" field="name:ca" index="164"/>
+    <alias name="" field="name:br" index="165"/>
+    <alias name="" field="name:ar" index="166"/>
+    <alias name="" field="border_type" index="167"/>
+    <alias name="" field="alt_name" index="168"/>
+    <alias name="" field="ISO3166-2" index="169"/>
   </aliases>
   <excludeAttributesWMS/>
   <excludeAttributesWFS/>
@@ -2776,25 +2936,45 @@
     <default applyOnUpdate="0" field="sport" expression=""/>
     <default applyOnUpdate="0" field="tourism" expression=""/>
     <default applyOnUpdate="0" field="other_tags" expression=""/>
-    <default applyOnUpdate="0" field="operator" expression=""/>
-    <default applyOnUpdate="0" field="leaf_type" expression=""/>
-    <default applyOnUpdate="0" field="addr:city" expression=""/>
-    <default applyOnUpdate="0" field="residential" expression=""/>
-    <default applyOnUpdate="0" field="swimming" expression=""/>
-    <default applyOnUpdate="0" field="seamark:type" expression=""/>
-    <default applyOnUpdate="0" field="seamark:restricted_area:restriction" expression=""/>
+    <default applyOnUpdate="0" field="shelter_type" expression=""/>
+    <default applyOnUpdate="0" field="club" expression=""/>
+    <default applyOnUpdate="0" field="supervised" expression=""/>
+    <default applyOnUpdate="0" field="maxheight" expression=""/>
+    <default applyOnUpdate="0" field="phone" expression=""/>
+    <default applyOnUpdate="0" field="ref:FR:BMPM:GRPT" expression=""/>
+    <default applyOnUpdate="0" field="operator:wikidata" expression=""/>
+    <default applyOnUpdate="0" field="smoothness" expression=""/>
     <default applyOnUpdate="0" field="parking" expression=""/>
     <default applyOnUpdate="0" field="fee" expression=""/>
-    <default applyOnUpdate="0" field="roof:shape" expression=""/>
-    <default applyOnUpdate="0" field="roof:levels" expression=""/>
-    <default applyOnUpdate="0" field="building:levels" expression=""/>
+    <default applyOnUpdate="0" field="seamark:type" expression=""/>
+    <default applyOnUpdate="0" field="seamark:harbour:category" expression=""/>
+    <default applyOnUpdate="0" field="addr:city" expression=""/>
+    <default applyOnUpdate="0" field="residential" expression=""/>
+    <default applyOnUpdate="0" field="lit" expression=""/>
+    <default applyOnUpdate="0" field="highway" expression=""/>
+    <default applyOnUpdate="0" field="school:FR" expression=""/>
+    <default applyOnUpdate="0" field="ref:UAI" expression=""/>
+    <default applyOnUpdate="0" field="operator:type" expression=""/>
+    <default applyOnUpdate="0" field="religion" expression=""/>
+    <default applyOnUpdate="0" field="supermarket:FR" expression=""/>
+    <default applyOnUpdate="0" field="supermarket" expression=""/>
+    <default applyOnUpdate="0" field="brand:wikipedia" expression=""/>
+    <default applyOnUpdate="0" field="brand:wikidata" expression=""/>
+    <default applyOnUpdate="0" field="brand" expression=""/>
+    <default applyOnUpdate="0" field="operator" expression=""/>
+    <default applyOnUpdate="0" field="access" expression=""/>
+    <default applyOnUpdate="0" field="disused" expression=""/>
+    <default applyOnUpdate="0" field="bunker_type" expression=""/>
+    <default applyOnUpdate="0" field="bunker" expression=""/>
+    <default applyOnUpdate="0" field="abandoned:building" expression=""/>
     <default applyOnUpdate="0" field="wall" expression=""/>
-    <default applyOnUpdate="0" field="material" expression=""/>
+    <default applyOnUpdate="0" field="public_transport" expression=""/>
+    <default applyOnUpdate="0" field="level" expression=""/>
+    <default applyOnUpdate="0" field="floating" expression=""/>
+    <default applyOnUpdate="0" field="ferry" expression=""/>
     <default applyOnUpdate="0" field="ref:FR:FANTOIR" expression=""/>
     <default applyOnUpdate="0" field="addr:street" expression=""/>
     <default applyOnUpdate="0" field="addr:housenumber" expression=""/>
-    <default applyOnUpdate="0" field="landcover" expression=""/>
-    <default applyOnUpdate="0" field="access" expression=""/>
     <default applyOnUpdate="0" field="surface" expression=""/>
     <default applyOnUpdate="0" field="short_name:oc" expression=""/>
     <default applyOnUpdate="0" field="short_name:fr" expression=""/>
@@ -2928,25 +3108,45 @@
     <constraint constraints="0" notnull_strength="0" field="sport" unique_strength="0" exp_strength="0"/>
     <constraint constraints="0" notnull_strength="0" field="tourism" unique_strength="0" exp_strength="0"/>
     <constraint constraints="0" notnull_strength="0" field="other_tags" unique_strength="0" exp_strength="0"/>
-    <constraint constraints="0" notnull_strength="0" field="operator" unique_strength="0" exp_strength="0"/>
-    <constraint constraints="0" notnull_strength="0" field="leaf_type" unique_strength="0" exp_strength="0"/>
-    <constraint constraints="0" notnull_strength="0" field="addr:city" unique_strength="0" exp_strength="0"/>
-    <constraint constraints="0" notnull_strength="0" field="residential" unique_strength="0" exp_strength="0"/>
-    <constraint constraints="0" notnull_strength="0" field="swimming" unique_strength="0" exp_strength="0"/>
-    <constraint constraints="0" notnull_strength="0" field="seamark:type" unique_strength="0" exp_strength="0"/>
-    <constraint constraints="0" notnull_strength="0" field="seamark:restricted_area:restriction" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="shelter_type" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="club" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="supervised" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="maxheight" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="phone" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="ref:FR:BMPM:GRPT" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="operator:wikidata" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="smoothness" unique_strength="0" exp_strength="0"/>
     <constraint constraints="0" notnull_strength="0" field="parking" unique_strength="0" exp_strength="0"/>
     <constraint constraints="0" notnull_strength="0" field="fee" unique_strength="0" exp_strength="0"/>
-    <constraint constraints="0" notnull_strength="0" field="roof:shape" unique_strength="0" exp_strength="0"/>
-    <constraint constraints="0" notnull_strength="0" field="roof:levels" unique_strength="0" exp_strength="0"/>
-    <constraint constraints="0" notnull_strength="0" field="building:levels" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="seamark:type" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="seamark:harbour:category" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="addr:city" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="residential" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="lit" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="highway" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="school:FR" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="ref:UAI" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="operator:type" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="religion" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="supermarket:FR" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="supermarket" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="brand:wikipedia" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="brand:wikidata" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="brand" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="operator" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="access" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="disused" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="bunker_type" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="bunker" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="abandoned:building" unique_strength="0" exp_strength="0"/>
     <constraint constraints="0" notnull_strength="0" field="wall" unique_strength="0" exp_strength="0"/>
-    <constraint constraints="0" notnull_strength="0" field="material" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="public_transport" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="level" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="floating" unique_strength="0" exp_strength="0"/>
+    <constraint constraints="0" notnull_strength="0" field="ferry" unique_strength="0" exp_strength="0"/>
     <constraint constraints="0" notnull_strength="0" field="ref:FR:FANTOIR" unique_strength="0" exp_strength="0"/>
     <constraint constraints="0" notnull_strength="0" field="addr:street" unique_strength="0" exp_strength="0"/>
     <constraint constraints="0" notnull_strength="0" field="addr:housenumber" unique_strength="0" exp_strength="0"/>
-    <constraint constraints="0" notnull_strength="0" field="landcover" unique_strength="0" exp_strength="0"/>
-    <constraint constraints="0" notnull_strength="0" field="access" unique_strength="0" exp_strength="0"/>
     <constraint constraints="0" notnull_strength="0" field="surface" unique_strength="0" exp_strength="0"/>
     <constraint constraints="0" notnull_strength="0" field="short_name:oc" unique_strength="0" exp_strength="0"/>
     <constraint constraints="0" notnull_strength="0" field="short_name:fr" unique_strength="0" exp_strength="0"/>
@@ -3080,25 +3280,45 @@
     <constraint field="sport" desc="" exp=""/>
     <constraint field="tourism" desc="" exp=""/>
     <constraint field="other_tags" desc="" exp=""/>
-    <constraint field="operator" desc="" exp=""/>
-    <constraint field="leaf_type" desc="" exp=""/>
-    <constraint field="addr:city" desc="" exp=""/>
-    <constraint field="residential" desc="" exp=""/>
-    <constraint field="swimming" desc="" exp=""/>
-    <constraint field="seamark:type" desc="" exp=""/>
-    <constraint field="seamark:restricted_area:restriction" desc="" exp=""/>
+    <constraint field="shelter_type" desc="" exp=""/>
+    <constraint field="club" desc="" exp=""/>
+    <constraint field="supervised" desc="" exp=""/>
+    <constraint field="maxheight" desc="" exp=""/>
+    <constraint field="phone" desc="" exp=""/>
+    <constraint field="ref:FR:BMPM:GRPT" desc="" exp=""/>
+    <constraint field="operator:wikidata" desc="" exp=""/>
+    <constraint field="smoothness" desc="" exp=""/>
     <constraint field="parking" desc="" exp=""/>
     <constraint field="fee" desc="" exp=""/>
-    <constraint field="roof:shape" desc="" exp=""/>
-    <constraint field="roof:levels" desc="" exp=""/>
-    <constraint field="building:levels" desc="" exp=""/>
+    <constraint field="seamark:type" desc="" exp=""/>
+    <constraint field="seamark:harbour:category" desc="" exp=""/>
+    <constraint field="addr:city" desc="" exp=""/>
+    <constraint field="residential" desc="" exp=""/>
+    <constraint field="lit" desc="" exp=""/>
+    <constraint field="highway" desc="" exp=""/>
+    <constraint field="school:FR" desc="" exp=""/>
+    <constraint field="ref:UAI" desc="" exp=""/>
+    <constraint field="operator:type" desc="" exp=""/>
+    <constraint field="religion" desc="" exp=""/>
+    <constraint field="supermarket:FR" desc="" exp=""/>
+    <constraint field="supermarket" desc="" exp=""/>
+    <constraint field="brand:wikipedia" desc="" exp=""/>
+    <constraint field="brand:wikidata" desc="" exp=""/>
+    <constraint field="brand" desc="" exp=""/>
+    <constraint field="operator" desc="" exp=""/>
+    <constraint field="access" desc="" exp=""/>
+    <constraint field="disused" desc="" exp=""/>
+    <constraint field="bunker_type" desc="" exp=""/>
+    <constraint field="bunker" desc="" exp=""/>
+    <constraint field="abandoned:building" desc="" exp=""/>
     <constraint field="wall" desc="" exp=""/>
-    <constraint field="material" desc="" exp=""/>
+    <constraint field="public_transport" desc="" exp=""/>
+    <constraint field="level" desc="" exp=""/>
+    <constraint field="floating" desc="" exp=""/>
+    <constraint field="ferry" desc="" exp=""/>
     <constraint field="ref:FR:FANTOIR" desc="" exp=""/>
     <constraint field="addr:street" desc="" exp=""/>
     <constraint field="addr:housenumber" desc="" exp=""/>
-    <constraint field="landcover" desc="" exp=""/>
-    <constraint field="access" desc="" exp=""/>
     <constraint field="surface" desc="" exp=""/>
     <constraint field="short_name:oc" desc="" exp=""/>
     <constraint field="short_name:fr" desc="" exp=""/>
@@ -3208,22 +3428,22 @@
   <expressionfields/>
   <attributeactions>
     <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
-    <actionsetting notificationMessage="" id="{46d78000-0772-4b4d-8a40-198a9604648c}" name="OpenStreetMap Browser" type="5" capture="0" isEnabledOnlyWhenEditable="0" shortTitle="OpenStreetMap Browser" icon="" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]">
+    <actionsetting notificationMessage="" id="{0c6fd2b9-d480-4fb7-9c38-9626cdfc150e}" name="OpenStreetMap Browser" type="5" capture="0" isEnabledOnlyWhenEditable="0" shortTitle="OpenStreetMap Browser" icon="" action="http://www.openstreetmap.org/browse/[% &quot;osm_type&quot; %]/[% &quot;osm_id&quot; %]">
       <actionScope id="Field"/>
       <actionScope id="Canvas"/>
       <actionScope id="Feature"/>
     </actionsetting>
-    <actionsetting notificationMessage="" id="{65259686-1f4e-47d2-934f-28beb38ccf39}" name="Mapillary" type="1" capture="0" isEnabledOnlyWhenEditable="0" shortTitle="Mapillary" 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;)">
+    <actionsetting notificationMessage="" id="{ba2e55b4-1c02-430b-81ea-3bb2673152bf}" name="Mapillary" type="1" capture="0" isEnabledOnlyWhenEditable="0" shortTitle="Mapillary" 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;)">
       <actionScope id="Field"/>
       <actionScope id="Canvas"/>
       <actionScope id="Feature"/>
     </actionsetting>
-    <actionsetting notificationMessage="" id="{4e0c9682-554b-4a0f-9a9e-e844b864d71f}" name="JOSM" type="1" capture="0" isEnabledOnlyWhenEditable="0" shortTitle="JOSM" 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;)">
+    <actionsetting notificationMessage="" id="{267e4ec1-0001-4c2e-8751-fcae24cc97e2}" name="JOSM" type="1" capture="0" isEnabledOnlyWhenEditable="0" shortTitle="JOSM" 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;)">
       <actionScope id="Field"/>
       <actionScope id="Canvas"/>
       <actionScope id="Feature"/>
     </actionsetting>
-    <actionsetting notificationMessage="" id="{7041c343-dffc-4f36-9971-4c5364de11c0}" name="User default editor" type="5" capture="0" isEnabledOnlyWhenEditable="0" shortTitle="User default editor" icon="" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]">
+    <actionsetting notificationMessage="" id="{e2a0912f-9b73-4ef9-be69-e694d7e7e8e7}" name="User default editor" type="5" capture="0" isEnabledOnlyWhenEditable="0" shortTitle="User default editor" icon="" action="http://www.openstreetmap.org/edit?[% &quot;osm_type&quot; %]=[% &quot;osm_id&quot; %]">
       <actionScope id="Field"/>
       <actionScope id="Canvas"/>
       <actionScope id="Feature"/>
@@ -3259,25 +3479,45 @@
       <column name="tourism" type="field" width="-1" hidden="0"/>
       <column name="other_tags" type="field" width="-1" hidden="0"/>
       <column name="wall" type="field" width="-1" hidden="0"/>
+      <column name="school:FR" type="field" width="-1" hidden="0"/>
+      <column name="ref:UAI" type="field" width="-1" hidden="0"/>
+      <column name="operator:type" type="field" width="-1" hidden="0"/>
       <column name="addr:street" type="field" width="-1" hidden="0"/>
       <column name="access" type="field" width="-1" hidden="0"/>
-      <column name="building:levels" type="field" width="-1" hidden="0"/>
       <column name="short_name" type="field" width="-1" hidden="0"/>
-      <column name="operator" type="field" width="-1" hidden="0"/>
-      <column name="leaf_type" type="field" width="-1" hidden="0"/>
-      <column name="addr:city" type="field" width="-1" hidden="0"/>
-      <column name="residential" type="field" width="-1" hidden="0"/>
-      <column name="swimming" type="field" width="-1" hidden="0"/>
-      <column name="seamark:type" type="field" width="-1" hidden="0"/>
-      <column name="seamark:restricted_area:restriction" type="field" width="-1" hidden="0"/>
+      <column name="shelter_type" type="field" width="-1" hidden="0"/>
+      <column name="club" type="field" width="-1" hidden="0"/>
+      <column name="supervised" type="field" width="-1" hidden="0"/>
+      <column name="maxheight" type="field" width="-1" hidden="0"/>
+      <column name="phone" type="field" width="-1" hidden="0"/>
+      <column name="ref:FR:BMPM:GRPT" type="field" width="-1" hidden="0"/>
+      <column name="operator:wikidata" type="field" width="-1" hidden="0"/>
+      <column name="smoothness" type="field" width="-1" hidden="0"/>
       <column name="parking" type="field" width="-1" hidden="0"/>
       <column name="fee" type="field" width="-1" hidden="0"/>
-      <column name="roof:shape" type="field" width="-1" hidden="0"/>
-      <column name="roof:levels" type="field" width="-1" hidden="0"/>
-      <column name="material" type="field" width="-1" hidden="0"/>
+      <column name="seamark:type" type="field" width="-1" hidden="0"/>
+      <column name="seamark:harbour:category" type="field" width="-1" hidden="0"/>
+      <column name="addr:city" type="field" width="-1" hidden="0"/>
+      <column name="residential" type="field" width="-1" hidden="0"/>
+      <column name="lit" type="field" width="-1" hidden="0"/>
+      <column name="highway" type="field" width="-1" hidden="0"/>
+      <column name="religion" type="field" width="-1" hidden="0"/>
+      <column name="supermarket:FR" type="field" width="-1" hidden="0"/>
+      <column name="supermarket" type="field" width="-1" hidden="0"/>
+      <column name="brand:wikipedia" type="field" width="-1" hidden="0"/>
+      <column name="brand:wikidata" type="field" width="-1" hidden="0"/>
+      <column name="brand" type="field" width="-1" hidden="0"/>
+      <column name="operator" type="field" width="-1" hidden="0"/>
+      <column name="disused" type="field" width="-1" hidden="0"/>
+      <column name="bunker_type" type="field" width="-1" hidden="0"/>
+      <column name="bunker" type="field" width="-1" hidden="0"/>
+      <column name="abandoned:building" type="field" width="-1" hidden="0"/>
+      <column name="public_transport" type="field" width="-1" hidden="0"/>
+      <column name="level" type="field" width="-1" hidden="0"/>
+      <column name="floating" type="field" width="-1" hidden="0"/>
+      <column name="ferry" type="field" width="-1" hidden="0"/>
       <column name="ref:FR:FANTOIR" type="field" width="-1" hidden="0"/>
       <column name="addr:housenumber" type="field" width="-1" hidden="0"/>
-      <column name="landcover" type="field" width="-1" hidden="0"/>
       <column name="surface" type="field" width="-1" hidden="0"/>
       <column name="short_name:oc" type="field" width="-1" hidden="0"/>
       <column name="short_name:fr" type="field" width="-1" hidden="0"/>
@@ -3416,6 +3656,7 @@ def my_form_open(dialog, layer, feature):
     <field name="CLC:id" editable="1"/>
     <field name="CLC:year" editable="1"/>
     <field name="ISO3166-2" editable="1"/>
+    <field name="abandoned:building" editable="1"/>
     <field name="access" editable="1"/>
     <field name="addr:city" editable="1"/>
     <field name="addr:housenumber" editable="1"/>
@@ -3441,13 +3682,19 @@ def my_form_open(dialog, layer, feature):
     <field name="boundary" editable="1"/>
     <field name="boundary_2" editable="1"/>
     <field name="boundary_type:FR" editable="1"/>
+    <field name="brand" editable="1"/>
+    <field name="brand:wikidata" editable="1"/>
+    <field name="brand:wikipedia" editable="1"/>
     <field name="building" editable="1"/>
     <field name="building:levels" editable="1"/>
     <field name="building:min_level" editable="1"/>
     <field name="building_2" editable="1"/>
+    <field name="bunker" editable="1"/>
+    <field name="bunker_type" editable="1"/>
     <field name="capacity" editable="1"/>
     <field name="changing_table" editable="1"/>
     <field name="check_date:opening_hours" editable="1"/>
+    <field name="club" editable="1"/>
     <field name="contact:housenumber" editable="1"/>
     <field name="contact:phone" editable="1"/>
     <field name="contact:street" editable="1"/>
@@ -3456,13 +3703,16 @@ def my_form_open(dialog, layer, feature):
     <field name="crop" editable="1"/>
     <field name="denomination" editable="1"/>
     <field name="description" editable="1"/>
+    <field name="disused" editable="1"/>
     <field name="disused:amenity" editable="1"/>
     <field name="disused:local_authority:FR" editable="1"/>
     <field name="emergency" editable="1"/>
     <field name="fee" editable="1"/>
     <field name="female" editable="1"/>
     <field name="fence_type" editable="1"/>
+    <field name="ferry" editable="1"/>
     <field name="fid" editable="1"/>
+    <field name="floating" editable="1"/>
     <field name="full_id" editable="1"/>
     <field name="garden:style" editable="1"/>
     <field name="garden:type" editable="1"/>
@@ -3479,19 +3729,21 @@ def my_form_open(dialog, layer, feature):
     <field name="image" editable="1"/>
     <field name="land_area" editable="1"/>
     <field name="land_area_2" editable="1"/>
-    <field name="landcover" editable="1"/>
     <field name="landuse" editable="1"/>
     <field name="landuse_2" editable="1"/>
     <field name="layer" editable="1"/>
     <field name="leaf_type" editable="1"/>
     <field name="leisure" editable="1"/>
     <field name="leisure_2" editable="1"/>
+    <field name="level" editable="1"/>
+    <field name="lit" editable="1"/>
     <field name="local_authority:FR" editable="1"/>
     <field name="male" editable="1"/>
     <field name="man_made" editable="1"/>
     <field name="man_made_2" editable="1"/>
     <field name="material" editable="1"/>
     <field name="max_age" editable="1"/>
+    <field name="maxheight" editable="1"/>
     <field name="military" editable="1"/>
     <field name="military_2" editable="1"/>
     <field name="min_age" editable="1"/>
@@ -3564,6 +3816,7 @@ def my_form_open(dialog, layer, feature):
     <field name="opening_hours" editable="1"/>
     <field name="operator" editable="1"/>
     <field name="operator:type" editable="1"/>
+    <field name="operator:wikidata" editable="1"/>
     <field name="operator_type" editable="1"/>
     <field name="osm_id" editable="1"/>
     <field name="osm_id_2" editable="1"/>
@@ -3582,7 +3835,9 @@ def my_form_open(dialog, layer, feature):
     <field name="postal_code" editable="1"/>
     <field name="protect_class" editable="1"/>
     <field name="protection_title" editable="1"/>
+    <field name="public_transport" editable="1"/>
     <field name="ref" editable="1"/>
+    <field name="ref:FR:BMPM:GRPT" editable="1"/>
     <field name="ref:FR:FANTOIR" editable="1"/>
     <field name="ref:FR:FINESS" editable="1"/>
     <field name="ref:FR:SIREN" editable="1"/>
@@ -3599,14 +3854,16 @@ def my_form_open(dialog, layer, feature):
     <field name="roof:material" editable="1"/>
     <field name="roof:shape" editable="1"/>
     <field name="school:FR" editable="1"/>
-    <field name="seamark:restricted_area:restriction" editable="1"/>
+    <field name="seamark:harbour:category" editable="1"/>
     <field name="seamark:type" editable="1"/>
+    <field name="shelter_type" editable="1"/>
     <field name="shop" editable="1"/>
     <field name="shop_2" editable="1"/>
     <field name="short_name" editable="1"/>
     <field name="short_name:en" editable="1"/>
     <field name="short_name:fr" editable="1"/>
     <field name="short_name:oc" editable="1"/>
+    <field name="smoothness" editable="1"/>
     <field name="social_facility" editable="1"/>
     <field name="social_facility:for" editable="1"/>
     <field name="source:name:br" editable="1"/>
@@ -3617,9 +3874,10 @@ def my_form_open(dialog, layer, feature):
     <field name="sport_2" editable="1"/>
     <field name="start_date" editable="1"/>
     <field name="street_cabinet" editable="1"/>
+    <field name="supermarket" editable="1"/>
+    <field name="supermarket:FR" editable="1"/>
     <field name="supervised" editable="1"/>
     <field name="surface" editable="1"/>
-    <field name="swimming" editable="1"/>
     <field name="tourism" editable="1"/>
     <field name="tourism_2" editable="1"/>
     <field name="type" editable="1"/>
@@ -3639,6 +3897,7 @@ def my_form_open(dialog, layer, feature):
     <field labelOnTop="0" name="CLC:id"/>
     <field labelOnTop="0" name="CLC:year"/>
     <field labelOnTop="0" name="ISO3166-2"/>
+    <field labelOnTop="0" name="abandoned:building"/>
     <field labelOnTop="0" name="access"/>
     <field labelOnTop="0" name="addr:city"/>
     <field labelOnTop="0" name="addr:housenumber"/>
@@ -3664,13 +3923,19 @@ def my_form_open(dialog, layer, feature):
     <field labelOnTop="0" name="boundary"/>
     <field labelOnTop="0" name="boundary_2"/>
     <field labelOnTop="0" name="boundary_type:FR"/>
+    <field labelOnTop="0" name="brand"/>
+    <field labelOnTop="0" name="brand:wikidata"/>
+    <field labelOnTop="0" name="brand:wikipedia"/>
     <field labelOnTop="0" name="building"/>
     <field labelOnTop="0" name="building:levels"/>
     <field labelOnTop="0" name="building:min_level"/>
     <field labelOnTop="0" name="building_2"/>
+    <field labelOnTop="0" name="bunker"/>
+    <field labelOnTop="0" name="bunker_type"/>
     <field labelOnTop="0" name="capacity"/>
     <field labelOnTop="0" name="changing_table"/>
     <field labelOnTop="0" name="check_date:opening_hours"/>
+    <field labelOnTop="0" name="club"/>
     <field labelOnTop="0" name="contact:housenumber"/>
     <field labelOnTop="0" name="contact:phone"/>
     <field labelOnTop="0" name="contact:street"/>
@@ -3679,13 +3944,16 @@ def my_form_open(dialog, layer, feature):
     <field labelOnTop="0" name="crop"/>
     <field labelOnTop="0" name="denomination"/>
     <field labelOnTop="0" name="description"/>
+    <field labelOnTop="0" name="disused"/>
     <field labelOnTop="0" name="disused:amenity"/>
     <field labelOnTop="0" name="disused:local_authority:FR"/>
     <field labelOnTop="0" name="emergency"/>
     <field labelOnTop="0" name="fee"/>
     <field labelOnTop="0" name="female"/>
     <field labelOnTop="0" name="fence_type"/>
+    <field labelOnTop="0" name="ferry"/>
     <field labelOnTop="0" name="fid"/>
+    <field labelOnTop="0" name="floating"/>
     <field labelOnTop="0" name="full_id"/>
     <field labelOnTop="0" name="garden:style"/>
     <field labelOnTop="0" name="garden:type"/>
@@ -3702,19 +3970,21 @@ def my_form_open(dialog, layer, feature):
     <field labelOnTop="0" name="image"/>
     <field labelOnTop="0" name="land_area"/>
     <field labelOnTop="0" name="land_area_2"/>
-    <field labelOnTop="0" name="landcover"/>
     <field labelOnTop="0" name="landuse"/>
     <field labelOnTop="0" name="landuse_2"/>
     <field labelOnTop="0" name="layer"/>
     <field labelOnTop="0" name="leaf_type"/>
     <field labelOnTop="0" name="leisure"/>
     <field labelOnTop="0" name="leisure_2"/>
+    <field labelOnTop="0" name="level"/>
+    <field labelOnTop="0" name="lit"/>
     <field labelOnTop="0" name="local_authority:FR"/>
     <field labelOnTop="0" name="male"/>
     <field labelOnTop="0" name="man_made"/>
     <field labelOnTop="0" name="man_made_2"/>
     <field labelOnTop="0" name="material"/>
     <field labelOnTop="0" name="max_age"/>
+    <field labelOnTop="0" name="maxheight"/>
     <field labelOnTop="0" name="military"/>
     <field labelOnTop="0" name="military_2"/>
     <field labelOnTop="0" name="min_age"/>
@@ -3787,6 +4057,7 @@ def my_form_open(dialog, layer, feature):
     <field labelOnTop="0" name="opening_hours"/>
     <field labelOnTop="0" name="operator"/>
     <field labelOnTop="0" name="operator:type"/>
+    <field labelOnTop="0" name="operator:wikidata"/>
     <field labelOnTop="0" name="operator_type"/>
     <field labelOnTop="0" name="osm_id"/>
     <field labelOnTop="0" name="osm_id_2"/>
@@ -3805,7 +4076,9 @@ def my_form_open(dialog, layer, feature):
     <field labelOnTop="0" name="postal_code"/>
     <field labelOnTop="0" name="protect_class"/>
     <field labelOnTop="0" name="protection_title"/>
+    <field labelOnTop="0" name="public_transport"/>
     <field labelOnTop="0" name="ref"/>
+    <field labelOnTop="0" name="ref:FR:BMPM:GRPT"/>
     <field labelOnTop="0" name="ref:FR:FANTOIR"/>
     <field labelOnTop="0" name="ref:FR:FINESS"/>
     <field labelOnTop="0" name="ref:FR:SIREN"/>
@@ -3822,14 +4095,16 @@ def my_form_open(dialog, layer, feature):
     <field labelOnTop="0" name="roof:material"/>
     <field labelOnTop="0" name="roof:shape"/>
     <field labelOnTop="0" name="school:FR"/>
-    <field labelOnTop="0" name="seamark:restricted_area:restriction"/>
+    <field labelOnTop="0" name="seamark:harbour:category"/>
     <field labelOnTop="0" name="seamark:type"/>
+    <field labelOnTop="0" name="shelter_type"/>
     <field labelOnTop="0" name="shop"/>
     <field labelOnTop="0" name="shop_2"/>
     <field labelOnTop="0" name="short_name"/>
     <field labelOnTop="0" name="short_name:en"/>
     <field labelOnTop="0" name="short_name:fr"/>
     <field labelOnTop="0" name="short_name:oc"/>
+    <field labelOnTop="0" name="smoothness"/>
     <field labelOnTop="0" name="social_facility"/>
     <field labelOnTop="0" name="social_facility:for"/>
     <field labelOnTop="0" name="source:name:br"/>
@@ -3840,9 +4115,10 @@ def my_form_open(dialog, layer, feature):
     <field labelOnTop="0" name="sport_2"/>
     <field labelOnTop="0" name="start_date"/>
     <field labelOnTop="0" name="street_cabinet"/>
+    <field labelOnTop="0" name="supermarket"/>
+    <field labelOnTop="0" name="supermarket:FR"/>
     <field labelOnTop="0" name="supervised"/>
     <field labelOnTop="0" name="surface"/>
-    <field labelOnTop="0" name="swimming"/>
     <field labelOnTop="0" name="tourism"/>
     <field labelOnTop="0" name="tourism_2"/>
     <field labelOnTop="0" name="type"/>