]> git.openstreetmap.org Git - rails.git/blobdiff - config/wiki_pages.yml
projects / rails.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Replace lookup_user_by_id with load_resource
[rails.git] / config / wiki_pages.yml
diff --git a/config/wiki_pages.yml b/config/wiki_pages.yml
index 588fc630ea4a2a198968e550ad218bfde1911892..c7c32cda9755571b0528266212639531632f34d1 100644 (file)
--- a/config/wiki_pages.yml
+++ b/config/wiki_pages.yml
@@ -6,9 +6,14 @@ ar:
   key:
     highway: Ar:Key:highway
     name: Ar:Key:name
   key:
     highway: Ar:Key:highway
     name: Ar:Key:name
+    natural: Ar:Key:natural
+    waterway: Ar:Key:waterway
   tag:
   tag:
+    amenity=restaurant: Ar:Tag:amenity=restaurant
     amenity=school: Ar:Tag:amenity=school
     amenity=school: Ar:Tag:amenity=school
+    amenity=toilets: Ar:Tag:amenity=toilets
     shop=bakery: Ar:Tag:shop=bakery
     shop=bakery: Ar:Tag:shop=bakery
+    shop=mall: Ar:Tag:shop=mall
 az:
   tag:
     craft=locksmith: Az:Tag:craft=locksmith
 az:
   tag:
     craft=locksmith: Az:Tag:craft=locksmith
@@ -17,51 +22,154 @@ bg:
   key:
     building: Bg:Key:building
     lanes: Bg:Key:lanes
   key:
     building: Bg:Key:building
     lanes: Bg:Key:lanes
+    name:bg: Bg:Key:name:bg
+    traffic_calming: Bg:Key:traffic calming
   tag:
   tag:
+    barrier=guard_rail: Bg:Tag:barrier=guard rail
     building=chapel: Bg:Tag:building=chapel
     natural=heath: Bg:Tag:natural=heath
     railway=crossing: Bg:Tag:railway=crossing
     railway=level_crossing: Bg:Tag:railway=level crossing
     building=chapel: Bg:Tag:building=chapel
     natural=heath: Bg:Tag:natural=heath
     railway=crossing: Bg:Tag:railway=crossing
     railway=level_crossing: Bg:Tag:railway=level crossing
-bn:
-  key:
-    highway: Bn:Key:highway
-  tag:
-    highway=residential: Bn:Tag:highway=residential
+    shop=sewing: Bg:Tag:shop=sewing
+    traffic_calming=bump: Bg:Tag:traffic calming=bump
 br:
   key:
     highway: Br:Key:highway
 ca:
   key:
 br:
   key:
     highway: Br:Key:highway
 ca:
   key:
+    aerialway: Ca:Key:aerialway
     amenity: Ca:Key:amenity
     amenity: Ca:Key:amenity
+    bicycle: Ca:Key:bicycle
+    board:title: Ca:Key:board:title
     building: Ca:Key:building
     building: Ca:Key:building
+    city_limit: Ca:Key:city limit
+    contact:facebook: Ca:Key:contact:facebook
+    created_by: Ca:Key:created by
+    facebook: Ca:Key:facebook
+    foot: Ca:Key:foot
     lgbtq: Ca:Key:lgbtq
     name: Ca:Key:name
     lgbtq: Ca:Key:lgbtq
     name: Ca:Key:name
+    name:ca: Ca:Key:name:ca
+    openplaques:id: Ca:Key:openplaques:id
     operator:type: Ca:Key:operator:type
     phone: Ca:Key:phone
     operator:type: Ca:Key:operator:type
     phone: Ca:Key:phone
+    polling_station: Ca:Key:polling station
+    roller_coaster: Ca:Key:roller coaster
     roundtrip: Ca:Key:roundtrip
     wikidata: Ca:Key:wikidata
   tag:
     roundtrip: Ca:Key:roundtrip
     wikidata: Ca:Key:wikidata
   tag:
+    abandoned:amenity=prison: Ca:Tag:abandoned:amenity=prison
     admin_level=2: Ca:Tag:admin level=2
     admin_level=2: Ca:Tag:admin level=2
+    advertising=screen: Ca:Tag:advertising=screen
+    advertising=tarp: Ca:Tag:advertising=tarp
     advertising=wall_painting: Ca:Tag:advertising=wall painting
     advertising=wall_painting: Ca:Tag:advertising=wall painting
+    aerialway=cable_car: Ca:Tag:aerialway=cable car
+    aerialway=canopy: Ca:Tag:aerialway=canopy
+    aerialway=chair_lift: Ca:Tag:aerialway=chair lift
+    aerialway=drag_lift: Ca:Tag:aerialway=drag lift
+    aerialway=gondola: Ca:Tag:aerialway=gondola
+    aerialway=goods: Ca:Tag:aerialway=goods
+    aerialway=j-bar: Ca:Tag:aerialway=j-bar
+    aerialway=magic_carpet: Ca:Tag:aerialway=magic carpet
+    aerialway=mixed_lift: Ca:Tag:aerialway=mixed lift
+    aerialway=platter: Ca:Tag:aerialway=platter
+    aerialway=rope_tow: Ca:Tag:aerialway=rope tow
+    aerialway=station: Ca:Tag:aerialway=station
+    aerialway=t-bar: Ca:Tag:aerialway=t-bar
+    aerialway=zip_line: Ca:Tag:aerialway=zip line
+    aerodrome:type=regional: Ca:Tag:aerodrome:type=regional
+    aeroway=apron: Ca:Tag:aeroway=apron
+    aeroway=gate: Ca:Tag:aeroway=gate
+    aeroway=hangar: Ca:Tag:aeroway=hangar
+    aeroway=helipad: Ca:Tag:aeroway=helipad
+    aeroway=heliport: Ca:Tag:aeroway=heliport
+    aeroway=highway_strip: Ca:Tag:aeroway=highway strip
+    aeroway=holding_position: Ca:Tag:aeroway=holding position
+    aeroway=navigationaid: Ca:Tag:aeroway=navigationaid
+    aeroway=terminal: Ca:Tag:aeroway=terminal
+    aeroway=windsock: Ca:Tag:aeroway=windsock
+    airmark=beacon: Ca:Tag:airmark=beacon
+    amenity=atm: Ca:Tag:amenity=atm
+    amenity=baby_hatch: Ca:Tag:amenity=baby hatch
+    amenity=bank: Ca:Tag:amenity=bank
+    amenity=bar: Ca:Tag:amenity=bar
+    amenity=bicycle_parking: Ca:Tag:amenity=bicycle parking
+    amenity=bicycle_rental: Ca:Tag:amenity=bicycle rental
+    amenity=bicycle_repair_station: Ca:Tag:amenity=bicycle repair station
+    amenity=biergarten: Ca:Tag:amenity=biergarten
+    amenity=bureau_de_change: Ca:Tag:amenity=bureau de change
+    amenity=bus_station: Ca:Tag:amenity=bus station
+    amenity=cafe: Ca:Tag:amenity=cafe
+    amenity=car_rental: Ca:Tag:amenity=car rental
+    amenity=car_wash: Ca:Tag:amenity=car wash
+    amenity=clinic: Ca:Tag:amenity=clinic
+    amenity=college: Ca:Tag:amenity=college
+    amenity=dentist: Ca:Tag:amenity=dentist
+    amenity=doctors: Ca:Tag:amenity=doctors
+    amenity=driving_school: Ca:Tag:amenity=driving school
+    amenity=exhibition_centre: Ca:Tag:amenity=exhibition centre
+    amenity=fast_food: Ca:Tag:amenity=fast food
+    amenity=ferry_terminal: Ca:Tag:amenity=ferry terminal
+    amenity=food_court: Ca:Tag:amenity=food court
+    amenity=fuel: Ca:Tag:amenity=fuel
+    amenity=grit_bin: Ca:Tag:amenity=grit bin
+    amenity=ice_cream: Ca:Tag:amenity=ice cream
+    amenity=kindergarten: Ca:Tag:amenity=kindergarten
+    amenity=language_school: Ca:Tag:amenity=language school
+    amenity=library: Ca:Tag:amenity=library
+    amenity=motorcycle_parking: Ca:Tag:amenity=motorcycle parking
+    amenity=music_school: Ca:Tag:amenity=music school
+    amenity=nightclub: Ca:Tag:amenity=nightclub
+    amenity=nursing_home: Ca:Tag:amenity=nursing home
+    amenity=outfitter: Ca:Tag:amenity=outfitter
+    amenity=parcel_locker: Ca:Tag:amenity=parcel locker
+    amenity=parking: Ca:Tag:amenity=parking
+    amenity=parking_entrance: Ca:Tag:amenity=parking entrance
+    amenity=parking_space: Ca:Tag:amenity=parking space
+    amenity=pharmacy: Ca:Tag:amenity=pharmacy
     amenity=post_box: Ca:Tag:amenity=post box
     amenity=post_box: Ca:Tag:amenity=post box
+    amenity=pub: Ca:Tag:amenity=pub
+    amenity=restaurant: Ca:Tag:amenity=restaurant
+    amenity=school: Ca:Tag:amenity=school
+    amenity=taxi: Ca:Tag:amenity=taxi
+    amenity=toy_library: Ca:Tag:amenity=toy library
+    amenity=university: Ca:Tag:amenity=university
+    amenity=vehicle_inspection: Ca:Tag:amenity=vehicle inspection
     barrier=cable_barrier: Ca:Tag:barrier=cable barrier
     barrier=kerb: Ca:Tag:barrier=kerb
     barrier=cable_barrier: Ca:Tag:barrier=cable barrier
     barrier=kerb: Ca:Tag:barrier=kerb
+    barrier=planter: Ca:Tag:barrier=planter
     building=boathouse: Ca:Tag:building=boathouse
     building=boathouse: Ca:Tag:building=boathouse
+    building=cathedral: Ca:Tag:building=cathedral
     building=hospital: Ca:Tag:building=hospital
     building=hut: Ca:Tag:building=hut
     building=hospital: Ca:Tag:building=hospital
     building=hut: Ca:Tag:building=hut
+    building=residential: Ca:Tag:building=residential
     craft=blacksmith: Ca:Tag:craft=blacksmith
     craft=blacksmith: Ca:Tag:craft=blacksmith
+    craft=restoration: Ca:Tag:craft=restoration
     crossing=traffic_signals: Ca:Tag:crossing=traffic signals
     crossing=traffic_signals: Ca:Tag:crossing=traffic signals
+    cycleway=opposite: Ca:Tag:cycleway=opposite
+    highway=motorway: Ca:Tag:highway=motorway
     highway=residential: Ca:Tag:highway=residential
     landuse=farmland: Ca:Tag:landuse=farmland
     highway=residential: Ca:Tag:highway=residential
     landuse=farmland: Ca:Tag:landuse=farmland
+    landuse=traffic_island: Ca:Tag:landuse=traffic island
     leisure=swimming_pool: Ca:Tag:leisure=swimming pool
     leisure=tanning_salon: Ca:Tag:leisure=tanning salon
     man_made=gantry: Ca:Tag:man made=gantry
     leisure=swimming_pool: Ca:Tag:leisure=swimming pool
     leisure=tanning_salon: Ca:Tag:leisure=tanning salon
     man_made=gantry: Ca:Tag:man made=gantry
+    man_made=wastewater_plant: Ca:Tag:man made=wastewater plant
     name=Herfy: Ca:Tag:name=Herfy
     natural=cliff: Ca:Tag:natural=cliff
     name=Herfy: Ca:Tag:name=Herfy
     natural=cliff: Ca:Tag:natural=cliff
+    network=VE:T:PO: Ca:Tag:network=VE:T:PO
     office=notary: Ca:Tag:office=notary
     office=notary: Ca:Tag:office=notary
+    oneway=yes: Ca:Tag:oneway=yes
+    parking=surface: Ca:Tag:parking=surface
     place=isolated_dwelling: Ca:Tag:place=isolated dwelling
     power=line: Ca:Tag:power=line
     place=isolated_dwelling: Ca:Tag:place=isolated dwelling
     power=line: Ca:Tag:power=line
+    service=aircraft_control: Ca:Tag:service=aircraft control
+    shop=alcohol: Ca:Tag:shop=alcohol
     shop=frozen_food: Ca:Tag:shop=frozen food
     shop=frozen_food: Ca:Tag:shop=frozen food
+    shop=gas: Ca:Tag:shop=gas
+    shop=wigs: Ca:Tag:shop=wigs
+    tactile_paving=no: Ca:Tag:tactile paving=no
+    traffic_sign=city_limit: Ca:Tag:traffic sign=city limit
     vending=books: Ca:Tag:vending=books
 cs:
   key:
     vending=books: Ca:Tag:vending=books
 cs:
   key:
@@ -71,14 +179,15 @@ cs:
     Boundary: Cs:Key:Boundary
     FIXME: Cs:Key:FIXME
     TODO: Cs:Key:TODO
     Boundary: Cs:Key:Boundary
     FIXME: Cs:Key:FIXME
     TODO: Cs:Key:TODO
-    abandoned: Cs:Key:abandoned
     'abandoned:': 'Cs:Key:abandoned:'
     'abandoned:': 'Cs:Key:abandoned:'
+    abandoned:*: Cs:Key:abandoned:*
     abandoned:amenity: Cs:Key:abandoned:amenity
     abutters: Cs:Key:abutters
     access: Cs:Key:access
     access:conditional: Cs:Key:access:conditional
     access:lanes: Cs:Key:access:lanes
     addr: Cs:Key:addr
     abandoned:amenity: Cs:Key:abandoned:amenity
     abutters: Cs:Key:abutters
     access: Cs:Key:access
     access:conditional: Cs:Key:access:conditional
     access:lanes: Cs:Key:access:lanes
     addr: Cs:Key:addr
+    addr:*: Cs:Key:addr:*
     addr:city: Cs:Key:addr:city
     addr:conscriptionnumber: Cs:Key:addr:conscriptionnumber
     addr:country: Cs:Key:addr:country
     addr:city: Cs:Key:addr:city
     addr:conscriptionnumber: Cs:Key:addr:conscriptionnumber
     addr:country: Cs:Key:addr:country
@@ -138,7 +247,6 @@ cs:
     bench: Cs:Key:bench
     bicycle: Cs:Key:bicycle
     bicycle_parking: Cs:Key:bicycle parking
     bench: Cs:Key:bench
     bicycle: Cs:Key:bicycle
     bicycle_parking: Cs:Key:bicycle parking
-    bicycle_road: Cs:Key:bicycle road
     bin: Cs:Key:bin
     biotic_reef:type: Cs:Key:biotic reef:type
     board_type: Cs:Key:board type
     bin: Cs:Key:bin
     biotic_reef:type: Cs:Key:biotic reef:type
     board_type: Cs:Key:board type
@@ -169,7 +277,6 @@ cs:
     building:min_level: Cs:Key:building:min level
     building:part: Cs:Key:building:part
     building:place: Cs:Key:building:place
     building:min_level: Cs:Key:building:min level
     building:part: Cs:Key:building:part
     building:place: Cs:Key:building:place
-    building:ruian:type: Cs:Key:building:ruian:type
     building:use: Cs:Key:building:use
     bulk_purchase: Cs:Key:bulk purchase
     bunker_type: Cs:Key:bunker type
     building:use: Cs:Key:building:use
     bulk_purchase: Cs:Key:bulk purchase
     bunker_type: Cs:Key:bunker type
@@ -218,6 +325,7 @@ cs:
     construction:website: Cs:Key:construction:website
     construction_end_expected: Cs:Key:construction end expected
     contact: Cs:Key:contact
     construction:website: Cs:Key:construction:website
     construction_end_expected: Cs:Key:construction end expected
     contact: Cs:Key:contact
+    contact:*: Cs:Key:contact:*
     contact:email: Cs:Key:contact:email
     contact:facebook: Cs:Key:contact:facebook
     contact:fax: Cs:Key:contact:fax
     contact:email: Cs:Key:contact:email
     contact:facebook: Cs:Key:contact:facebook
     contact:fax: Cs:Key:contact:fax
@@ -261,6 +369,7 @@ cs:
     delivery: Cs:Key:delivery
     demolished: Cs:Key:demolished
     'demolished:': 'Cs:Key:demolished:'
     delivery: Cs:Key:delivery
     demolished: Cs:Key:demolished
     'demolished:': 'Cs:Key:demolished:'
+    demolished:*: Cs:Key:demolished:*
     denomination: Cs:Key:denomination
     denotation: Cs:Key:denotation
     depth: Cs:Key:depth
     denomination: Cs:Key:denomination
     denotation: Cs:Key:denotation
     depth: Cs:Key:depth
@@ -283,6 +392,7 @@ cs:
     distance: Cs:Key:distance
     disused: Cs:Key:disused
     'disused:': 'Cs:Key:disused:'
     distance: Cs:Key:distance
     disused: Cs:Key:disused
     'disused:': 'Cs:Key:disused:'
+    disused:*: Cs:Key:disused:*
     disused:amenity: Cs:Key:disused:amenity
     disused:railway: Cs:Key:disused:railway
     disused:shop: Cs:Key:disused:shop
     disused:amenity: Cs:Key:disused:amenity
     disused:railway: Cs:Key:disused:railway
     disused:shop: Cs:Key:disused:shop
@@ -290,6 +400,7 @@ cs:
     donation:compensation: Cs:Key:donation:compensation
     draft: Cs:Key:draft
     drink: Cs:Key:drink
     donation:compensation: Cs:Key:donation:compensation
     draft: Cs:Key:draft
     drink: Cs:Key:drink
+    drink:*: Cs:Key:drink:*
     drinking_water: Cs:Key:drinking water
     drive_in: Cs:Key:drive in
     drive_through: Cs:Key:drive through
     drinking_water: Cs:Key:drinking water
     drive_in: Cs:Key:drive in
     drive_through: Cs:Key:drive through
@@ -381,7 +492,6 @@ cs:
     historic:period: Cs:Key:historic:period
     horse: Cs:Key:horse
     hour_off: Cs:Key:hour off
     historic:period: Cs:Key:historic:period
     horse: Cs:Key:horse
     hour_off: Cs:Key:hour off
-    hour_on: Cs:Key:hour on
     hov: Cs:Key:hov
     iata: Cs:Key:iata
     icao: Cs:Key:icao
     hov: Cs:Key:hov
     iata: Cs:Key:iata
     icao: Cs:Key:icao
@@ -453,7 +563,6 @@ cs:
     man_made: Cs:Key:man made
     managed: Cs:Key:managed
     manufacturer: Cs:Key:manufacturer
     man_made: Cs:Key:man made
     managed: Cs:Key:managed
     manufacturer: Cs:Key:manufacturer
-    manufacturer:type: Cs:Key:manufacturer:type
     mapillary: Cs:Key:mapillary
     massage: Cs:Key:massage
     material: Cs:Key:material
     mapillary: Cs:Key:mapillary
     massage: Cs:Key:massage
     material: Cs:Key:material
@@ -526,8 +635,8 @@ cs:
     natural: Cs:Key:natural
     navigationaid: Cs:Key:navigationaid
     network: Cs:Key:network
     natural: Cs:Key:natural
     navigationaid: Cs:Key:navigationaid
     network: Cs:Key:network
-    noexit: Cs:Key:noexit
-    noname: Cs:Key:noname
+    'no:': 'Cs:Key:no:'
+    no:*: Cs:Key:no:*
     noref: Cs:Key:noref
     note: Cs:Key:note
     nudism: Cs:Key:nudism
     noref: Cs:Key:noref
     note: Cs:Key:note
     nudism: Cs:Key:nudism
@@ -559,10 +668,6 @@ cs:
     owner: Cs:Key:owner
     parking: Cs:Key:parking
     parking:condition: Cs:Key:parking:condition
     owner: Cs:Key:owner
     parking: Cs:Key:parking
     parking:condition: Cs:Key:parking:condition
-    parking:lane: Cs:Key:parking:lane
-    parking:lane:both: Cs:Key:parking:lane:both
-    parking:lane:left: Cs:Key:parking:lane:left
-    parking:lane:right: Cs:Key:parking:lane:right
     passenger: Cs:Key:passenger
     passing_places: Cs:Key:passing places
     payment: Cs:Key:payment
     passenger: Cs:Key:passenger
     passing_places: Cs:Key:passing places
     payment: Cs:Key:payment
@@ -590,7 +695,6 @@ cs:
     post_box:type: Cs:Key:post box:type
     postal_code: Cs:Key:postal code
     power: Cs:Key:power
     post_box:type: Cs:Key:post box:type
     postal_code: Cs:Key:postal code
     power: Cs:Key:power
-    power_source: Cs:Key:power source
     power_supply: Cs:Key:power supply
     power_supply:schedule: Cs:Key:power supply:schedule
     preschool: Cs:Key:preschool
     power_supply: Cs:Key:power supply
     power_supply:schedule: Cs:Key:power supply:schedule
     preschool: Cs:Key:preschool
@@ -631,6 +735,7 @@ cs:
     reg_ref: Cs:Key:reg ref
     religion: Cs:Key:religion
     'removed:': 'Cs:Key:removed:'
     reg_ref: Cs:Key:reg ref
     religion: Cs:Key:religion
     'removed:': 'Cs:Key:removed:'
+    removed:*: Cs:Key:removed:*
     rental: Cs:Key:rental
     repair: Cs:Key:repair
     reservation: Cs:Key:reservation
     rental: Cs:Key:rental
     repair: Cs:Key:repair
     reservation: Cs:Key:reservation
@@ -649,8 +754,10 @@ cs:
     route_master: Cs:Key:route master
     ruined: Cs:Key:ruined
     'ruined:': 'Cs:Key:ruined:'
     route_master: Cs:Key:route master
     ruined: Cs:Key:ruined
     'ruined:': 'Cs:Key:ruined:'
+    ruined:*: Cs:Key:ruined:*
     ruins: Cs:Key:ruins
     'ruins:': 'Cs:Key:ruins:'
     ruins: Cs:Key:ruins
     'ruins:': 'Cs:Key:ruins:'
+    ruins:*: Cs:Key:ruins:*
     rungs: Cs:Key:rungs
     sac_scale: Cs:Key:sac scale
     safety_rope: Cs:Key:safety rope
     rungs: Cs:Key:rungs
     sac_scale: Cs:Key:sac scale
     safety_rope: Cs:Key:safety rope
@@ -676,7 +783,6 @@ cs:
     shoulder: Cs:Key:shoulder
     sides: Cs:Key:sides
     sidewalk: Cs:Key:sidewalk
     shoulder: Cs:Key:shoulder
     sides: Cs:Key:sides
     sidewalk: Cs:Key:sidewalk
-    site_type: Cs:Key:site type
     size: Cs:Key:size
     ski: Cs:Key:ski
     smokefree: Cs:Key:smokefree
     size: Cs:Key:size
     ski: Cs:Key:ski
     smokefree: Cs:Key:smokefree
@@ -952,6 +1058,7 @@ cs:
     amenity=parking: Cs:Tag:amenity=parking
     amenity=parking_entrance: Cs:Tag:amenity=parking entrance
     amenity=parking_space: Cs:Tag:amenity=parking space
     amenity=parking: Cs:Tag:amenity=parking
     amenity=parking_entrance: Cs:Tag:amenity=parking entrance
     amenity=parking_space: Cs:Tag:amenity=parking space
+    amenity=payment_terminal: Cs:Tag:amenity=payment terminal
     amenity=pharmacy: Cs:Tag:amenity=pharmacy
     amenity=photo_booth: Cs:Tag:amenity=photo booth
     amenity=place_of_worship: Cs:Tag:amenity=place of worship
     amenity=pharmacy: Cs:Tag:amenity=pharmacy
     amenity=photo_booth: Cs:Tag:amenity=photo booth
     amenity=place_of_worship: Cs:Tag:amenity=place of worship
@@ -1008,6 +1115,16 @@ cs:
     amenity=watering_place: Cs:Tag:amenity=watering place
     amenity=winery: Cs:Tag:amenity=winery
     amenity=youth_centre: Cs:Tag:amenity=youth centre
     amenity=watering_place: Cs:Tag:amenity=watering place
     amenity=winery: Cs:Tag:amenity=winery
     amenity=youth_centre: Cs:Tag:amenity=youth centre
+    archaeological_site=city: Cs:Tag:archaeological site=city
+    archaeological_site=fortification: Cs:Tag:archaeological site=fortification
+    archaeological_site=hut_circle: Cs:Tag:archaeological site=hut circle
+    archaeological_site=megalith: Cs:Tag:archaeological site=megalith
+    archaeological_site=necropolis: Cs:Tag:archaeological site=necropolis
+    archaeological_site=petroglyph: Cs:Tag:archaeological site=petroglyph
+    archaeological_site=roman_circus: Cs:Tag:archaeological site=roman circus
+    archaeological_site=roman_villa: Cs:Tag:archaeological site=roman villa
+    archaeological_site=settlement: Cs:Tag:archaeological site=settlement
+    archaeological_site=tumulus: Cs:Tag:archaeological site=tumulus
     atm=yes: Cs:Tag:atm=yes
     attraction=animal: Cs:Tag:attraction=animal
     baby_hatch=yes: Cs:Tag:baby hatch=yes
     atm=yes: Cs:Tag:atm=yes
     attraction=animal: Cs:Tag:attraction=animal
     baby_hatch=yes: Cs:Tag:baby hatch=yes
@@ -1055,6 +1172,7 @@ cs:
     bath:type=onsen: Cs:Tag:bath:type=onsen
     bicycle=designated: Cs:Tag:bicycle=designated
     bicycle=use_sidepath: Cs:Tag:bicycle=use sidepath
     bath:type=onsen: Cs:Tag:bath:type=onsen
     bicycle=designated: Cs:Tag:bicycle=designated
     bicycle=use_sidepath: Cs:Tag:bicycle=use sidepath
+    bicycle_road=yes: Cs:Tag:bicycle road=yes
     boundary=administrative: Cs:Tag:boundary=administrative
     boundary=civil: Cs:Tag:boundary=civil
     boundary=economic: Cs:Tag:boundary=economic
     boundary=administrative: Cs:Tag:boundary=administrative
     boundary=civil: Cs:Tag:boundary=civil
     boundary=economic: Cs:Tag:boundary=economic
@@ -1111,6 +1229,7 @@ cs:
     building=dormitory: Cs:Tag:building=dormitory
     building=farm: Cs:Tag:building=farm
     building=farm_auxiliary: Cs:Tag:building=farm auxiliary
     building=dormitory: Cs:Tag:building=dormitory
     building=farm: Cs:Tag:building=farm
     building=farm_auxiliary: Cs:Tag:building=farm auxiliary
+    building=fire_station: Cs:Tag:building=fire station
     building=garage: Cs:Tag:building=garage
     building=garages: Cs:Tag:building=garages
     building=greenhouse: Cs:Tag:building=greenhouse
     building=garage: Cs:Tag:building=garage
     building=garages: Cs:Tag:building=garages
     building=greenhouse: Cs:Tag:building=greenhouse
@@ -1146,6 +1265,7 @@ cs:
     building=transportation: Cs:Tag:building=transportation
     building=university: Cs:Tag:building=university
     building=warehouse: Cs:Tag:building=warehouse
     building=transportation: Cs:Tag:building=transportation
     building=university: Cs:Tag:building=university
     building=warehouse: Cs:Tag:building=warehouse
+    building=wayside_shrine: Cs:Tag:building=wayside shrine
     building=yes: Cs:Tag:building=yes
     bunker_type=hardened_aircraft_shelter: Cs:Tag:bunker type=hardened aircraft shelter
     bunker_type=munitions: Cs:Tag:bunker type=munitions
     building=yes: Cs:Tag:building=yes
     bunker_type=hardened_aircraft_shelter: Cs:Tag:bunker type=hardened aircraft shelter
     bunker_type=munitions: Cs:Tag:bunker type=munitions
@@ -1541,6 +1661,7 @@ cs:
     leisure=water_park: Cs:Tag:leisure=water park
     leisure=wildlife_hide: Cs:Tag:leisure=wildlife hide
     level_crossing=traffic_signals: Cs:Tag:level crossing=traffic signals
     leisure=water_park: Cs:Tag:leisure=water park
     leisure=wildlife_hide: Cs:Tag:leisure=wildlife hide
     level_crossing=traffic_signals: Cs:Tag:level crossing=traffic signals
+    lifeguard=tower: Cs:Tag:lifeguard=tower
     man_made=adit: Cs:Tag:man made=adit
     man_made=beacon: Cs:Tag:man made=beacon
     man_made=beehive: Cs:Tag:man made=beehive
     man_made=adit: Cs:Tag:man made=adit
     man_made=beacon: Cs:Tag:man made=beacon
     man_made=beehive: Cs:Tag:man made=beehive
@@ -1693,6 +1814,8 @@ cs:
     network=lwn: Cs:Tag:network=lwn
     network=nwn: Cs:Tag:network=nwn
     network=rwn: Cs:Tag:network=rwn
     network=lwn: Cs:Tag:network=lwn
     network=nwn: Cs:Tag:network=nwn
     network=rwn: Cs:Tag:network=rwn
+    noexit=yes: Cs:Tag:noexit=yes
+    noname=yes: Cs:Tag:noname=yes
     office=accountant: Cs:Tag:office=accountant
     office=administrative: Cs:Tag:office=administrative
     office=adoption_agency: Cs:Tag:office=adoption agency
     office=accountant: Cs:Tag:office=accountant
     office=administrative: Cs:Tag:office=administrative
     office=adoption_agency: Cs:Tag:office=adoption agency
@@ -1815,6 +1938,7 @@ cs:
     railway=traverser: Cs:Tag:railway=traverser
     railway=turntable: Cs:Tag:railway=turntable
     railway=wash: Cs:Tag:railway=wash
     railway=traverser: Cs:Tag:railway=traverser
     railway=turntable: Cs:Tag:railway=turntable
     railway=wash: Cs:Tag:railway=wash
+    railway=water_crane: Cs:Tag:railway=water crane
     recycling_type=container: Cs:Tag:recycling type=container
     religion=buddhist: Cs:Tag:religion=buddhist
     religion=christian: Cs:Tag:religion=christian
     recycling_type=container: Cs:Tag:recycling type=container
     religion=buddhist: Cs:Tag:religion=buddhist
     religion=christian: Cs:Tag:religion=christian
@@ -1850,6 +1974,7 @@ cs:
     route=running: Cs:Tag:route=running
     route=ski: Cs:Tag:route=ski
     route=subway: Cs:Tag:route=subway
     route=running: Cs:Tag:route=running
     route=ski: Cs:Tag:route=ski
     route=subway: Cs:Tag:route=subway
+    route=tracks: Cs:Tag:route=tracks
     route=train: Cs:Tag:route=train
     route=tram: Cs:Tag:route=tram
     route=trolleybus: Cs:Tag:route=trolleybus
     route=train: Cs:Tag:route=train
     route=tram: Cs:Tag:route=tram
     route=trolleybus: Cs:Tag:route=trolleybus
@@ -1962,7 +2087,6 @@ cs:
     shop=hearing_aids: Cs:Tag:shop=hearing aids
     shop=herbalist: Cs:Tag:shop=herbalist
     shop=hifi: Cs:Tag:shop=hifi
     shop=hearing_aids: Cs:Tag:shop=hearing aids
     shop=herbalist: Cs:Tag:shop=herbalist
     shop=hifi: Cs:Tag:shop=hifi
-    shop=household: Cs:Tag:shop=household
     shop=houseware: Cs:Tag:shop=houseware
     shop=hunting: Cs:Tag:shop=hunting
     shop=ice_cream: Cs:Tag:shop=ice cream
     shop=houseware: Cs:Tag:shop=houseware
     shop=hunting: Cs:Tag:shop=hunting
     shop=ice_cream: Cs:Tag:shop=ice cream
@@ -2237,12 +2361,14 @@ da:
   key:
     access: Da:Key:access
     amenity: Da:Key:amenity
   key:
     access: Da:Key:access
     amenity: Da:Key:amenity
+    cycleway: Da:Key:cycleway
+    diet:vegan: Da:Key:diet:vegan
     fee: Da:Key:fee
     fee: Da:Key:fee
+    lane_markings: Da:Key:lane markings
     lit: Da:Key:lit
     man_made: Da:Key:man made
     maxheight: Da:Key:maxheight
     maxspeed: Da:Key:maxspeed
     lit: Da:Key:lit
     man_made: Da:Key:man made
     maxheight: Da:Key:maxheight
     maxspeed: Da:Key:maxspeed
-    noexit: Da:Key:noexit
     surface: Da:Key:surface
   tag:
     amenity=community_centre: Da:Tag:amenity=community centre
     surface: Da:Key:surface
   tag:
     amenity=community_centre: Da:Tag:amenity=community centre
@@ -2258,7 +2384,12 @@ da:
     highway=track: Da:Tag:highway=track
     highway=unclassified: Da:Tag:highway=unclassified
     landuse=cemetery: Da:Tag:landuse=cemetery
     highway=track: Da:Tag:highway=track
     highway=unclassified: Da:Tag:highway=unclassified
     landuse=cemetery: Da:Tag:landuse=cemetery
+    landuse=forest: Da:Tag:landuse=forest
     leisure=dog_park: Da:Tag:leisure=dog park
     leisure=dog_park: Da:Tag:leisure=dog park
+    natural=grassland: Da:Tag:natural=grassland
+    natural=heath: Da:Tag:natural=heath
+    natural=wood: Da:Tag:natural=wood
+    noexit=yes: Da:Tag:noexit=yes
     place=hamlet: Da:Tag:place=hamlet
     place=town: Da:Tag:place=town
     place=village: Da:Tag:place=village
     place=hamlet: Da:Tag:place=hamlet
     place=town: Da:Tag:place=town
     place=village: Da:Tag:place=village
@@ -2267,17 +2398,19 @@ da:
     shop=charity: Da:Tag:shop=charity
 de:
   key:
     shop=charity: Da:Tag:shop=charity
 de:
   key:
+    4wd_only: DE:Key:4wd only
     AlpinRes_ID: DE:Key:AlpinRes ID
     Animal: DE:Key:Animal
     Annotations: DE:Key:Annotations
     FIXME: DE:Key:FIXME
     AlpinRes_ID: DE:Key:AlpinRes ID
     Animal: DE:Key:Animal
     Annotations: DE:Key:Annotations
     FIXME: DE:Key:FIXME
-    Key:restaurant: DE:Key:Key:restaurant
     TODO: DE:Key:TODO
     VRS:ref: DE:Key:VRS:ref
     WDPA_ID:ref: DE:Key:WDPA ID:ref
     'abandoned:': 'DE:Key:abandoned:'
     abandoned:*: DE:Key:abandoned:*
     abandoned:amenity: DE:Key:abandoned:amenity
     TODO: DE:Key:TODO
     VRS:ref: DE:Key:VRS:ref
     WDPA_ID:ref: DE:Key:WDPA ID:ref
     'abandoned:': 'DE:Key:abandoned:'
     abandoned:*: DE:Key:abandoned:*
     abandoned:amenity: DE:Key:abandoned:amenity
+    abandoned:highway: DE:Key:abandoned:highway
+    abandoned:landuse: DE:Key:abandoned:landuse
     abandoned:place: DE:Key:abandoned:place
     abandoned:railway: DE:Key:abandoned:railway
     abutters: DE:Key:abutters
     abandoned:place: DE:Key:abandoned:place
     abandoned:railway: DE:Key:abandoned:railway
     abutters: DE:Key:abutters
@@ -2285,6 +2418,7 @@ de:
     access:lanes: DE:Key:access:lanes
     access:offroad: DE:Key:access:offroad
     addr: DE:Key:addr
     access:lanes: DE:Key:access:lanes
     access:offroad: DE:Key:access:offroad
     addr: DE:Key:addr
+    addr:*: DE:Key:addr:*
     addr:city: DE:Key:addr:city
     addr:country: DE:Key:addr:country
     addr:housenumber: DE:Key:addr:housenumber
     addr:city: DE:Key:addr:city
     addr:country: DE:Key:addr:country
     addr:housenumber: DE:Key:addr:housenumber
@@ -2301,10 +2435,16 @@ de:
     aeroway: DE:Key:aeroway
     after_school: DE:Key:after school
     agricultural: DE:Key:agricultural
     aeroway: DE:Key:aeroway
     after_school: DE:Key:after school
     agricultural: DE:Key:agricultural
+    air_conditioning: DE:Key:air conditioning
     alt_name: DE:Key:alt name
     amenity: DE:Key:amenity
     alt_name: DE:Key:alt name
     amenity: DE:Key:amenity
+    announcement: DE:Key:announcement
+    archaeological_site: DE:Key:archaeological site
     architect: DE:Key:architect
     architect: DE:Key:architect
+    architect:wikidata: DE:Key:architect:wikidata
     area: DE:Key:area
     area: DE:Key:area
+    area:highway: DE:Key:area:highway
+    artist:wikidata: DE:Key:artist:wikidata
     artist_name: DE:Key:artist name
     artwork_type: DE:Key:artwork type
     asb: DE:Key:asb
     artist_name: DE:Key:artist name
     artwork_type: DE:Key:artwork type
     asb: DE:Key:asb
@@ -2312,9 +2452,12 @@ de:
     attraction: DE:Key:attraction
     atv:repair: DE:Key:atv:repair
     authentication: DE:Key:authentication
     attraction: DE:Key:attraction
     atv:repair: DE:Key:atv:repair
     authentication: DE:Key:authentication
+    authentication:*: DE:Key:authentication:*
     automated: DE:Key:automated
     automated: DE:Key:automated
+    automatic_door: DE:Key:automatic door
     backcountry: DE:Key:backcountry
     backrest: DE:Key:backrest
     backcountry: DE:Key:backcountry
     backrest: DE:Key:backrest
+    backup_generator: DE:Key:backup generator
     backward: DE:Key:backward
     bakehouse: DE:Key:bakehouse
     barrier: DE:Key:barrier
     backward: DE:Key:backward
     bakehouse: DE:Key:bakehouse
     barrier: DE:Key:barrier
@@ -2322,13 +2465,13 @@ de:
     bath:type: DE:Key:bath:type
     bdouble: DE:Key:bdouble
     beacon:type: DE:Key:beacon:type
     bath:type: DE:Key:bath:type
     bdouble: DE:Key:bdouble
     beacon:type: DE:Key:beacon:type
+    beauty: DE:Key:beauty
     beds: DE:Key:beds
     bench: DE:Key:bench
     bicycle: DE:Key:bicycle
     bicycle:backward: DE:Key:bicycle:backward
     bicycle:conditional: DE:Key:bicycle:conditional
     bicycle_parking: DE:Key:bicycle parking
     beds: DE:Key:beds
     bench: DE:Key:bench
     bicycle: DE:Key:bicycle
     bicycle:backward: DE:Key:bicycle:backward
     bicycle:conditional: DE:Key:bicycle:conditional
     bicycle_parking: DE:Key:bicycle parking
-    bicycle_road: DE:Key:bicycle road
     bike_ride: DE:Key:bike ride
     bin: DE:Key:bin
     biosphärenwirt: DE:Key:biosphärenwirt
     bike_ride: DE:Key:bike ride
     bin: DE:Key:bin
     biosphärenwirt: DE:Key:biosphärenwirt
@@ -2340,16 +2483,21 @@ de:
     books: DE:Key:books
     both: DE:Key:both
     boundary: DE:Key:boundary
     books: DE:Key:books
     both: DE:Key:both
     boundary: DE:Key:boundary
+    branch: DE:Key:branch
     brand: DE:Key:brand
     brand: DE:Key:brand
+    brand:wikidata: DE:Key:brand:wikidata
     breakfast: DE:Key:breakfast
     brewery: DE:Key:brewery
     bridge: DE:Key:bridge
     bridge:movable: DE:Key:bridge:movable
     breakfast: DE:Key:breakfast
     brewery: DE:Key:brewery
     bridge: DE:Key:bridge
     bridge:movable: DE:Key:bridge:movable
+    bridge:name: DE:Key:bridge:name
     bridge:structure: DE:Key:bridge:structure
     bridge:structure: DE:Key:bridge:structure
+    bridge:support: DE:Key:bridge:support
     buiding: DE:Key:buiding
     building: DE:Key:building
     building:architecture: DE:Key:building:architecture
     building:condition: DE:Key:building:condition
     buiding: DE:Key:buiding
     building: DE:Key:building
     building:architecture: DE:Key:building:architecture
     building:condition: DE:Key:building:condition
+    building:flats: DE:Key:building:flats
     building:levels: DE:Key:building:levels
     building:levels:underground: DE:Key:building:levels:underground
     building:material: DE:Key:building:material
     building:levels: DE:Key:building:levels
     building:levels:underground: DE:Key:building:levels:underground
     building:material: DE:Key:building:material
@@ -2362,6 +2510,7 @@ de:
     busway: DE:Key:busway
     button_operated: DE:Key:button operated
     cables: DE:Key:cables
     busway: DE:Key:busway
     button_operated: DE:Key:button operated
     cables: DE:Key:cables
+    camera:type: DE:Key:camera:type
     canoe: DE:Key:canoe
     capacity: DE:Key:capacity
     capacity:charging: DE:Key:capacity:charging
     canoe: DE:Key:canoe
     capacity: DE:Key:capacity
     capacity:charging: DE:Key:capacity:charging
@@ -2389,7 +2538,9 @@ de:
     collection_times: DE:Key:collection times
     colour: DE:Key:colour
     comment: DE:Key:comment
     collection_times: DE:Key:collection times
     colour: DE:Key:colour
     comment: DE:Key:comment
+    communication:*: DE:Key:communication:*
     communication:amateur_radio:repeater: DE:Key:communication:amateur radio:repeater
     communication:amateur_radio:repeater: DE:Key:communication:amateur radio:repeater
+    communication:amateur_radio:sota: DE:Key:communication:amateur radio:sota
     communication:bos: DE:Key:communication:bos
     communication:microwave: DE:Key:communication:microwave
     communication:mobile_phone: DE:Key:communication:mobile phone
     communication:bos: DE:Key:communication:bos
     communication:microwave: DE:Key:communication:microwave
     communication:mobile_phone: DE:Key:communication:mobile phone
@@ -2397,15 +2548,20 @@ de:
     communication:television: DE:Key:communication:television
     community_centre: DE:Key:community centre
     community_centre:for: DE:Key:community centre:for
     communication:television: DE:Key:communication:television
     community_centre: DE:Key:community centre
     community_centre:for: DE:Key:community centre:for
+    company: DE:Key:company
     conditional: DE:Key:conditional
     construction: DE:Key:construction
     conditional: DE:Key:conditional
     construction: DE:Key:construction
+    construction:*: DE:Key:construction:*
     contact: DE:Key:contact
     contact: DE:Key:contact
+    'contact:': 'DE:Key:contact:'
+    contact:*: DE:Key:contact:*
     contact:email: DE:Key:contact:email
     contact:facebook: DE:Key:contact:facebook
     contact:fax: DE:Key:contact:fax
     contact:google_plus: DE:Key:contact:google plus
     contact:mobile: DE:Key:contact:mobile
     contact:phone: DE:Key:contact:phone
     contact:email: DE:Key:contact:email
     contact:facebook: DE:Key:contact:facebook
     contact:fax: DE:Key:contact:fax
     contact:google_plus: DE:Key:contact:google plus
     contact:mobile: DE:Key:contact:mobile
     contact:phone: DE:Key:contact:phone
+    contact:twitter: DE:Key:contact:twitter
     contact:website: DE:Key:contact:website
     content: DE:Key:content
     conveying: DE:Key:conveying
     contact:website: DE:Key:contact:website
     content: DE:Key:content
     conveying: DE:Key:conveying
@@ -2414,12 +2570,14 @@ de:
     craft: DE:Key:craft
     crane:type: DE:Key:crane:type
     created_by: DE:Key:created by
     craft: DE:Key:craft
     crane:type: DE:Key:crane:type
     created_by: DE:Key:created by
+    crop: DE:Key:crop
     crossing: DE:Key:crossing
     crossing:activation: DE:Key:crossing:activation
     crossing:barrier: DE:Key:crossing:barrier
     crossing:bell: DE:Key:crossing:bell
     crossing:island: DE:Key:crossing:island
     crossing:light: DE:Key:crossing:light
     crossing: DE:Key:crossing
     crossing:activation: DE:Key:crossing:activation
     crossing:barrier: DE:Key:crossing:barrier
     crossing:bell: DE:Key:crossing:bell
     crossing:island: DE:Key:crossing:island
     crossing:light: DE:Key:crossing:light
+    crossing:markings: DE:Key:crossing:markings
     crossing:on_demand: DE:Key:crossing:on demand
     crossing:saltire: DE:Key:crossing:saltire
     crossing_ref: DE:Key:crossing ref
     crossing:on_demand: DE:Key:crossing:on demand
     crossing:saltire: DE:Key:crossing:saltire
     crossing_ref: DE:Key:crossing ref
@@ -2430,18 +2588,33 @@ de:
     currency:USD: DE:Key:currency:USD
     currency:others: DE:Key:currency:others
     cutting: DE:Key:cutting
     currency:USD: DE:Key:currency:USD
     currency:others: DE:Key:currency:others
     cutting: DE:Key:cutting
+    cycle_barrier: DE:Key:cycle barrier
+    cycle_barrier:installation: DE:Key:cycle barrier:installation
+    cycle_highway: DE:Key:cycle highway
     cycleway: DE:Key:cycleway
     cycleway:left: DE:Key:cycleway:left
     cycleway: DE:Key:cycleway
     cycleway:left: DE:Key:cycleway:left
+    cycleway:left:oneway: DE:Key:cycleway:left:oneway
     cycleway:right: DE:Key:cycleway:right
     cycleway:right: DE:Key:cycleway:right
+    cycleway:right:oneway: DE:Key:cycleway:right:oneway
     cycleway:surface: DE:Key:cycleway:surface
     cycleway:surface: DE:Key:cycleway:surface
+    'damage:': 'DE:Key:damage:'
+    damage:*: DE:Key:damage:*
+    dance:style: DE:Key:dance:style
+    dance:teaching: DE:Key:dance:teaching
     date: DE:Key:date
     de:amtlicher_gemeindeschluessel: DE:Key:de:amtlicher gemeindeschluessel
     de:regionalschluessel: DE:Key:de:regionalschluessel
     de:strassenschluessel: DE:Key:de:strassenschluessel
     date: DE:Key:date
     de:amtlicher_gemeindeschluessel: DE:Key:de:amtlicher gemeindeschluessel
     de:regionalschluessel: DE:Key:de:regionalschluessel
     de:strassenschluessel: DE:Key:de:strassenschluessel
+    defensive_works: DE:Key:defensive works
     delivery: DE:Key:delivery
     delivery: DE:Key:delivery
+    delivery:partner: DE:Key:delivery:partner
+    'demolished:': 'DE:Key:demolished:'
+    demolished:*: DE:Key:demolished:*
+    demolished:building: DE:Key:demolished:building
     denomination: DE:Key:denomination
     denotation: DE:Key:denotation
     departures_board: DE:Key:departures board
     denomination: DE:Key:denomination
     denotation: DE:Key:denotation
     departures_board: DE:Key:departures board
+    departures_board:speech_output: DE:Key:departures board:speech output
     descent: DE:Key:descent
     description: DE:Key:description
     designation: DE:Key:designation
     descent: DE:Key:descent
     description: DE:Key:description
     designation: DE:Key:designation
@@ -2453,8 +2626,10 @@ de:
     destination:ref:to: DE:Key:destination:ref:to
     destination:symbol: DE:Key:destination:symbol
     destination:to: DE:Key:destination:to
     destination:ref:to: DE:Key:destination:ref:to
     destination:symbol: DE:Key:destination:symbol
     destination:to: DE:Key:destination:to
+    destroyed: DE:Key:destroyed
+    'destroyed:': 'DE:Key:destroyed:'
+    destroyed:*: DE:Key:destroyed:*
     diameter: DE:Key:diameter
     diameter: DE:Key:diameter
-    diaper: DE:Key:diaper
     diet: DE:Key:diet
     diet:*: DE:Key:diet:*
     diet:vegan: DE:Key:diet:vegan
     diet: DE:Key:diet
     diet:*: DE:Key:diet:*
     diet:vegan: DE:Key:diet:vegan
@@ -2465,45 +2640,67 @@ de:
     dispensing: DE:Key:dispensing
     display: DE:Key:display
     distance: DE:Key:distance
     dispensing: DE:Key:dispensing
     display: DE:Key:display
     distance: DE:Key:distance
-    disused: DE:Key:disused
     'disused:': 'DE:Key:disused:'
     'disused:': 'DE:Key:disused:'
+    disused:*: DE:Key:disused:*
     disused:amenity: DE:Key:disused:amenity
     disused:railway: DE:Key:disused:railway
     disused:amenity: DE:Key:disused:amenity
     disused:railway: DE:Key:disused:railway
+    dog: DE:Key:dog
     door: DE:Key:door
     draft: DE:Key:draft
     door: DE:Key:door
     draft: DE:Key:draft
+    drain: DE:Key:drain
     drink: DE:Key:drink
     drink: DE:Key:drink
+    drink:*: DE:Key:drink:*
     drinking_water: DE:Key:drinking water
     drinking_water: DE:Key:drinking water
+    drinking_water:refill: DE:Key:drinking water:refill
     drive_in: DE:Key:drive in
     drive_through: DE:Key:drive through
     duration: DE:Key:duration
     ele: DE:Key:ele
     electrified: DE:Key:electrified
     embankment: DE:Key:embankment
     drive_in: DE:Key:drive in
     drive_through: DE:Key:drive through
     duration: DE:Key:duration
     ele: DE:Key:ele
     electrified: DE:Key:electrified
     embankment: DE:Key:embankment
+    embassy: DE:Key:embassy
     emergency: DE:Key:emergency
     emergency: DE:Key:emergency
+    emergency:phone: DE:Key:emergency:phone
+    emergency_telephone_code: DE:Key:emergency telephone code
     end_date: DE:Key:end date
     end_date: DE:Key:end date
+    enforcement: DE:Key:enforcement
     engineer: DE:Key:engineer
     entrance: DE:Key:entrance
     engineer: DE:Key:engineer
     entrance: DE:Key:entrance
+    est_width: DE:Key:est width
+    exhibit: DE:Key:exhibit
+    exit: DE:Key:exit
     facebook: DE:Key:facebook
     fair_trade: DE:Key:fair trade
     farmyard: DE:Key:farmyard
     facebook: DE:Key:facebook
     fair_trade: DE:Key:fair trade
     farmyard: DE:Key:farmyard
+    fax: DE:Key:fax
     fee: DE:Key:fee
     fence_type: DE:Key:fence type
     fee: DE:Key:fee
     fence_type: DE:Key:fence type
+    fenced: DE:Key:fenced
+    ferry: DE:Key:ferry
     ferry:cable: DE:Key:ferry:cable
     fetish: DE:Key:fetish
     ferry:cable: DE:Key:ferry:cable
     fetish: DE:Key:fetish
+    fire_boundary: DE:Key:fire boundary
     fire_hydrant: DE:Key:fire hydrant
     fire_hydrant: DE:Key:fire hydrant
+    fire_hydrant:diameter: DE:Key:fire hydrant:diameter
     fireplace: DE:Key:fireplace
     fireplace: DE:Key:fireplace
+    fishing: DE:Key:fishing
+    fix_guidepost: DE:Key:fix guidepost
     fixme: DE:Key:fixme
     flag:type: DE:Key:flag:type
     floating: DE:Key:floating
     fixme: DE:Key:fixme
     flag:type: DE:Key:flag:type
     floating: DE:Key:floating
+    flood_prone: DE:Key:flood prone
     foot: DE:Key:foot
     footway: DE:Key:footway
     ford: DE:Key:ford
     foot: DE:Key:foot
     footway: DE:Key:footway
     ford: DE:Key:ford
+    forestry: DE:Key:forestry
     format: DE:Key:format
     format: DE:Key:format
+    format:top: DE:Key:format:top
     fortification_type: DE:Key:fortification type
     forward: DE:Key:forward
     frequency: DE:Key:frequency
     fridge: DE:Key:fridge
     from: DE:Key:from
     fortification_type: DE:Key:fortification type
     forward: DE:Key:forward
     frequency: DE:Key:frequency
     fridge: DE:Key:fridge
     from: DE:Key:from
+    fruit: DE:Key:fruit
     fuel: DE:Key:fuel
     fuel:LH2: DE:Key:fuel:LH2
     garden:style: DE:Key:garden:style
     fuel: DE:Key:fuel
     fuel:LH2: DE:Key:fuel:LH2
     garden:style: DE:Key:garden:style
@@ -2511,18 +2708,27 @@ de:
     gauge: DE:Key:gauge
     generator:method: DE:Key:generator:method
     generator:output: DE:Key:generator:output
     gauge: DE:Key:gauge
     generator:method: DE:Key:generator:method
     generator:output: DE:Key:generator:output
+    generator:output:*: DE:Key:generator:output:*
     generator:output:biogas: DE:Key:generator:output:biogas
     generator:output:biogas: DE:Key:generator:output:biogas
+    generator:output:cold_air: DE:Key:generator:output:cold air
+    generator:output:cold_water: DE:Key:generator:output:cold water
+    generator:output:compressed_air: DE:Key:generator:output:compressed air
     generator:output:electricity: DE:Key:generator:output:electricity
     generator:output:heat: DE:Key:generator:output:heat
     generator:output:electricity: DE:Key:generator:output:electricity
     generator:output:heat: DE:Key:generator:output:heat
+    generator:output:hot_air: DE:Key:generator:output:hot air
     generator:output:hot_water: DE:Key:generator:output:hot water
     generator:output:steam: DE:Key:generator:output:steam
     generator:output:hot_water: DE:Key:generator:output:hot water
     generator:output:steam: DE:Key:generator:output:steam
+    generator:output:vacuum: DE:Key:generator:output:vacuum
     generator:place: DE:Key:generator:place
     generator:place: DE:Key:generator:place
+    generator:plant: DE:Key:generator:plant
     generator:source: DE:Key:generator:source
     generator:type: DE:Key:generator:type
     genus: DE:Key:genus
     generator:source: DE:Key:generator:source
     generator:type: DE:Key:generator:type
     genus: DE:Key:genus
+    genus:de: DE:Key:genus:de
     geological: DE:Key:geological
     golf: DE:Key:golf
     golf:course: DE:Key:golf:course
     geological: DE:Key:geological
     golf: DE:Key:golf
     golf:course: DE:Key:golf:course
+    golf:par: DE:Key:golf:par
     goods: DE:Key:goods
     government: DE:Key:government
     grades: DE:Key:grades
     goods: DE:Key:goods
     government: DE:Key:government
     grades: DE:Key:grades
@@ -2538,7 +2744,9 @@ de:
     hazmat:water: DE:Key:hazmat:water
     healthcare: DE:Key:healthcare
     healthcare:counselling: DE:Key:healthcare:counselling
     hazmat:water: DE:Key:hazmat:water
     healthcare: DE:Key:healthcare
     healthcare:counselling: DE:Key:healthcare:counselling
+    healthcare:speciality: DE:Key:healthcare:speciality
     height: DE:Key:height
     height: DE:Key:height
+    height:hub: DE:Key:height:hub
     heritage: DE:Key:heritage
     hgv: DE:Key:hgv
     hgv_articulated: DE:Key:hgv articulated
     heritage: DE:Key:heritage
     hgv: DE:Key:hgv
     hgv_articulated: DE:Key:hgv articulated
@@ -2557,6 +2765,7 @@ de:
     image: DE:Key:image
     importance: DE:Key:importance
     incline: DE:Key:incline
     image: DE:Key:image
     importance: DE:Key:importance
     incline: DE:Key:incline
+    indoor: DE:Key:indoor
     indoor_seating: DE:Key:indoor seating
     industrial: DE:Key:industrial
     informal: DE:Key:informal
     indoor_seating: DE:Key:indoor seating
     industrial: DE:Key:industrial
     informal: DE:Key:informal
@@ -2565,6 +2774,8 @@ de:
     int_name: DE:Key:int name
     intermittent: DE:Key:intermittent
     internet_access: DE:Key:internet access
     int_name: DE:Key:int name
     intermittent: DE:Key:intermittent
     internet_access: DE:Key:internet access
+    internet_access:fee: DE:Key:internet access:fee
+    internet_access:ssid: DE:Key:internet access:ssid
     interval: DE:Key:interval
     is_in: DE:Key:is in
     is_in:continent: DE:Key:is in:continent
     interval: DE:Key:interval
     is_in: DE:Key:is in
     is_in:continent: DE:Key:is in:continent
@@ -2572,12 +2783,15 @@ de:
     is_in:county: DE:Key:is in:county
     isced:level: DE:Key:isced:level
     junction: DE:Key:junction
     is_in:county: DE:Key:is in:county
     isced:level: DE:Key:isced:level
     junction: DE:Key:junction
+    kerb: DE:Key:kerb
+    kerb:approach_aid: DE:Key:kerb:approach aid
     kids_area: DE:Key:kids area
     kms: DE:Key:kms
     kneipp_water_cure: DE:Key:kneipp water cure
     lamp_type: DE:Key:lamp type
     landfill:waste: DE:Key:landfill:waste
     landuse: DE:Key:landuse
     kids_area: DE:Key:kids area
     kms: DE:Key:kms
     kneipp_water_cure: DE:Key:kneipp water cure
     lamp_type: DE:Key:lamp type
     landfill:waste: DE:Key:landfill:waste
     landuse: DE:Key:landuse
+    lane_markings: DE:Key:lane markings
     lanes: DE:Key:lanes
     lanes:backward: DE:Key:lanes:backward
     lanes:both_ways: DE:Key:lanes:both ways
     lanes: DE:Key:lanes
     lanes:backward: DE:Key:lanes:backward
     lanes:both_ways: DE:Key:lanes:both ways
@@ -2598,6 +2812,8 @@ de:
     length: DE:Key:length
     level: DE:Key:level
     line: DE:Key:line
     length: DE:Key:length
     level: DE:Key:level
     line: DE:Key:line
+    line_attachment: DE:Key:line attachment
+    line_management: DE:Key:line management
     lit: DE:Key:lit
     living_street: DE:Key:living street
     loc_name: DE:Key:loc name
     lit: DE:Key:lit
     living_street: DE:Key:living street
     loc_name: DE:Key:loc name
@@ -2607,13 +2823,14 @@ de:
     lock_name: DE:Key:lock name
     lock_ref: DE:Key:lock ref
     lockable: DE:Key:lockable
     lock_name: DE:Key:lock name
     lock_ref: DE:Key:lock ref
     lockable: DE:Key:lockable
-    lottery: DE:Key:lottery
+    locked: DE:Key:locked
     love_locks: DE:Key:love locks
     lunch: DE:Key:lunch
     man_made: DE:Key:man made
     love_locks: DE:Key:love locks
     lunch: DE:Key:lunch
     man_made: DE:Key:man made
+    managed: DE:Key:managed
     manhole: DE:Key:manhole
     manufacturer: DE:Key:manufacturer
     manhole: DE:Key:manhole
     manufacturer: DE:Key:manufacturer
-    manufacturer:type: DE:Key:manufacturer:type
+    map_type: DE:Key:map type
     mapillary: DE:Key:mapillary
     marker: DE:Key:marker
     massage: DE:Key:massage
     mapillary: DE:Key:mapillary
     marker: DE:Key:marker
     massage: DE:Key:massage
@@ -2630,10 +2847,14 @@ de:
     maxspeed:variable: DE:Key:maxspeed:variable
     maxstay: DE:Key:maxstay
     maxweight: DE:Key:maxweight
     maxspeed:variable: DE:Key:maxspeed:variable
     maxstay: DE:Key:maxstay
     maxweight: DE:Key:maxweight
+    maxweightrating: DE:Key:maxweightrating
+    maxweightrating:hgv: DE:Key:maxweightrating:hgv
     maxwidth: DE:Key:maxwidth
     maxwidth:physical: DE:Key:maxwidth:physical
     maxwidth: DE:Key:maxwidth
     maxwidth:physical: DE:Key:maxwidth:physical
+    meadow: DE:Key:meadow
     megalith_type: DE:Key:megalith type
     memorial: DE:Key:memorial
     megalith_type: DE:Key:megalith type
     memorial: DE:Key:memorial
+    memorial:conflict: DE:Key:memorial:conflict
     memorial:type: DE:Key:memorial:type
     milestone_type: DE:Key:milestone type
     military: DE:Key:military
     memorial:type: DE:Key:memorial:type
     milestone_type: DE:Key:milestone type
     military: DE:Key:military
@@ -2679,16 +2900,20 @@ de:
     name: DE:Key:name
     name:de: DE:Key:name:de
     name:en: DE:Key:name:en
     name: DE:Key:name
     name:de: DE:Key:name:de
     name:en: DE:Key:name:en
+    name:etymology:wikidata: DE:Key:name:etymology:wikidata
+    name:etymology:wikipedia: DE:Key:name:etymology:wikipedia
     name:fr: DE:Key:name:fr
     narrow: DE:Key:narrow
     natural: DE:Key:natural
     navigationaid: DE:Key:navigationaid
     network: DE:Key:network
     name:fr: DE:Key:name:fr
     narrow: DE:Key:narrow
     natural: DE:Key:natural
     navigationaid: DE:Key:navigationaid
     network: DE:Key:network
+    network:wikidata: DE:Key:network:wikidata
     noaddress: DE:Key:noaddress
     noaddress: DE:Key:noaddress
-    noexit: DE:Key:noexit
     noname: DE:Key:noname
     noname: DE:Key:noname
+    noref: DE:Key:noref
     note: DE:Key:note
     nudism: DE:Key:nudism
     note: DE:Key:note
     nudism: DE:Key:nudism
+    number_of_apartments: DE:Key:number of apartments
     nursery: DE:Key:nursery
     object: DE:Key:object
     observatory:type: DE:Key:observatory:type
     nursery: DE:Key:nursery
     object: DE:Key:object
     observatory:type: DE:Key:observatory:type
@@ -2698,10 +2923,12 @@ de:
     old_name: DE:Key:old name
     oneway: DE:Key:oneway
     oneway:bicycle: DE:Key:oneway:bicycle
     old_name: DE:Key:old name
     oneway: DE:Key:oneway
     oneway:bicycle: DE:Key:oneway:bicycle
+    oneway:bus: DE:Key:oneway:bus
     oneway:conditional: DE:Key:oneway:conditional
     oneway:moped: DE:Key:oneway:moped
     onkz: DE:Key:onkz
     openfire: DE:Key:openfire
     oneway:conditional: DE:Key:oneway:conditional
     oneway:moped: DE:Key:oneway:moped
     onkz: DE:Key:onkz
     openfire: DE:Key:openfire
+    opening: DE:Key:opening
     opening_date: DE:Key:opening date
     opening_hours: DE:Key:opening hours
     opening_hours:covid19: DE:Key:opening hours:covid19
     opening_date: DE:Key:opening date
     opening_hours: DE:Key:opening hours
     opening_hours:covid19: DE:Key:opening hours:covid19
@@ -2709,20 +2936,27 @@ de:
     operator: DE:Key:operator
     operator:MNC: DE:Key:operator:MNC
     operator:type: DE:Key:operator:type
     operator: DE:Key:operator
     operator:MNC: DE:Key:operator:MNC
     operator:type: DE:Key:operator:type
+    operator:wikidata: DE:Key:operator:wikidata
     organic: DE:Key:organic
     organic: DE:Key:organic
+    origin: DE:Key:origin
     osak: DE:Key:osak
     osmc:status: DE:Key:osmc:status
     osmc:symbol: DE:Key:osmc:symbol
     outdoor_seating: DE:Key:outdoor seating
     osak: DE:Key:osak
     osmc:status: DE:Key:osmc:status
     osmc:symbol: DE:Key:osmc:symbol
     outdoor_seating: DE:Key:outdoor seating
+    overlap: DE:Key:overlap
     overtaking: DE:Key:overtaking
     par: DE:Key:par
     overtaking: DE:Key:overtaking
     par: DE:Key:par
+    parcel_mail_in: DE:Key:parcel mail in
+    parcel_pickup: DE:Key:parcel pickup
     park_ride: DE:Key:park ride
     parking: DE:Key:parking
     park_ride: DE:Key:park ride
     parking: DE:Key:parking
-    parking:condition: DE:Key:parking:condition
-    parking:lane: DE:Key:parking:lane
-    parking:lane:hgv: DE:Key:parking:lane:hgv
+    parking_space: DE:Key:parking space
     passenger_information_display: DE:Key:passenger information display
     passenger_information_display: DE:Key:passenger information display
+    passenger_information_display:speech_output: DE:Key:passenger information display:speech
+      output
+    passing_places: DE:Key:passing places
     payment: DE:Key:payment
     payment: DE:Key:payment
+    payment:*: DE:Key:payment:*
     permanent_camping: DE:Key:permanent camping
     phone: DE:Key:phone
     pilgrimage: DE:Key:pilgrimage
     permanent_camping: DE:Key:permanent camping
     phone: DE:Key:phone
     pilgrimage: DE:Key:pilgrimage
@@ -2733,25 +2967,41 @@ de:
     plant: DE:Key:plant
     plant:method: DE:Key:plant:method
     plant:output: DE:Key:plant:output
     plant: DE:Key:plant
     plant:method: DE:Key:plant:method
     plant:output: DE:Key:plant:output
+    plant:output:*: DE:Key:plant:output:*
+    plant:output:biogas: DE:Key:plant:output:biogas
+    plant:output:cold_air: DE:Key:plant:output:cold air
+    plant:output:cold_water: DE:Key:plant:output:cold water
+    plant:output:compressed_air: DE:Key:plant:output:compressed air
     plant:output:electricity: DE:Key:plant:output:electricity
     plant:output:electricity: DE:Key:plant:output:electricity
+    plant:output:hot_air: DE:Key:plant:output:hot air
     plant:output:hot_water: DE:Key:plant:output:hot water
     plant:output:hot_water: DE:Key:plant:output:hot water
+    plant:output:steam: DE:Key:plant:output:steam
+    plant:output:vacuum: DE:Key:plant:output:vacuum
     plant:source: DE:Key:plant:source
     plant:source: DE:Key:plant:source
+    platform:width: DE:Key:platform:width
+    platform_lift: DE:Key:platform lift
+    platform_lift:maxlength:physical: DE:Key:platform lift:maxlength:physical
+    platform_lift:maxweight: DE:Key:platform lift:maxweight
+    platform_lift:maxwidth:physical: DE:Key:platform lift:maxwidth:physical
+    platform_lift:portable: DE:Key:platform lift:portable
+    platform_lift:seat: DE:Key:platform lift:seat
+    platform_lift:supervised: DE:Key:platform lift:supervised
     playground: DE:Key:playground
     'playground:': 'DE:Key:playground:'
     playground: DE:Key:playground
     'playground:': 'DE:Key:playground:'
+    playground:*: DE:Key:playground:*
     police: DE:Key:police
     population: DE:Key:population
     post_box:type: DE:Key:post box:type
     post_office: DE:Key:post office
     police: DE:Key:police
     population: DE:Key:population
     post_box:type: DE:Key:post box:type
     post_office: DE:Key:post office
-    post_office:type: DE:Key:post office:type
     postal_code: DE:Key:postal code
     power: DE:Key:power
     postal_code: DE:Key:postal code
     power: DE:Key:power
-    power_rating: DE:Key:power rating
     preschool: DE:Key:preschool
     priority: DE:Key:priority
     priority_road: DE:Key:priority road
     produce: DE:Key:produce
     product: DE:Key:product
     proposed: DE:Key:proposed
     preschool: DE:Key:preschool
     priority: DE:Key:priority
     priority_road: DE:Key:priority road
     produce: DE:Key:produce
     product: DE:Key:product
     proposed: DE:Key:proposed
+    proposed:*: DE:Key:proposed:*
     protect_class: DE:Key:protect class
     protected: DE:Key:protected
     protection_title: DE:Key:protection title
     protect_class: DE:Key:protect class
     protected: DE:Key:protected
     protection_title: DE:Key:protection title
@@ -2766,62 +3016,96 @@ de:
     railway:lzb: DE:Key:railway:lzb
     railway:position: DE:Key:railway:position
     railway:preserved: DE:Key:railway:preserved
     railway:lzb: DE:Key:railway:lzb
     railway:position: DE:Key:railway:position
     railway:preserved: DE:Key:railway:preserved
+    railway:ref: DE:Key:railway:ref
+    railway:signal:distant: DE:Key:railway:signal:distant
+    railway:signal:speed_limit: DE:Key:railway:signal:speed limit
+    railway:signal:speed_limit_distant: DE:Key:railway:signal:speed limit distant
+    railway:tilting: DE:Key:railway:tilting
     railway:track_ref: DE:Key:railway:track ref
     ramp: DE:Key:ramp
     railway:track_ref: DE:Key:railway:track ref
     ramp: DE:Key:ramp
+    ramp:portable: DE:Key:ramp:portable
+    ramp:portable:length: DE:Key:ramp:portable:length
+    ramp:portable:maxweight: DE:Key:ramp:portable:maxweight
+    ramp:portable:maxwidth:physical: DE:Key:ramp:portable:maxwidth:physical
+    ramp:portable:supervised: DE:Key:ramp:portable:supervised
     'razed:': 'DE:Key:razed:'
     'razed:': 'DE:Key:razed:'
+    razed:*: DE:Key:razed:*
     rcn_ref: DE:Key:rcn ref
     recycling:fire_extinguishers: DE:Key:recycling:fire extinguishers
     recycling_type: DE:Key:recycling type
     ref: DE:Key:ref
     ref:IFOPT: DE:Key:ref:IFOPT
     rcn_ref: DE:Key:rcn ref
     recycling:fire_extinguishers: DE:Key:recycling:fire extinguishers
     recycling_type: DE:Key:recycling type
     ref: DE:Key:ref
     ref:IFOPT: DE:Key:ref:IFOPT
+    ref:WDPA: DE:Key:ref:WDPA
     ref:bufa: DE:Key:ref:bufa
     ref:bufa: DE:Key:ref:bufa
+    ref:fgkz: DE:Key:ref:fgkz
     ref:mobil-parken.de: DE:Key:ref:mobil-parken.de
     ref:mobil-parken.de: DE:Key:ref:mobil-parken.de
+    ref:sprockhoff: DE:Key:ref:sprockhoff
     ref_name: DE:Key:ref name
     reg_name: DE:Key:reg name
     religion: DE:Key:religion
     'removed:': 'DE:Key:removed:'
     ref_name: DE:Key:ref name
     reg_name: DE:Key:reg name
     religion: DE:Key:religion
     'removed:': 'DE:Key:removed:'
+    removed:*: DE:Key:removed:*
+    research: DE:Key:research
     reservation: DE:Key:reservation
     reservoir_type: DE:Key:reservoir type
     reservation: DE:Key:reservation
     reservoir_type: DE:Key:reservoir type
+    residential: DE:Key:residential
     resource: DE:Key:resource
     restaurant: DE:Key:restaurant
     resource: DE:Key:resource
     restaurant: DE:Key:restaurant
+    reusable_packaging: DE:Key:reusable packaging
+    reusable_packaging:accept: DE:Key:reusable packaging:accept
+    reusable_packaging:offer: DE:Key:reusable packaging:offer
+    review_requested: DE:Key:review requested
     right: DE:Key:right
     right: DE:Key:right
+    roof:direction: DE:Key:roof:direction
+    roof:height: DE:Key:roof:height
     roof:material: DE:Key:roof:material
     roof:material: DE:Key:roof:material
+    roof:orientation: DE:Key:roof:orientation
+    roof:shape: DE:Key:roof:shape
     room: DE:Key:room
     rooms: DE:Key:rooms
     rotor:diameter: DE:Key:rotor:diameter
     roundtrip: DE:Key:roundtrip
     route: DE:Key:route
     room: DE:Key:room
     rooms: DE:Key:rooms
     rotor:diameter: DE:Key:rotor:diameter
     roundtrip: DE:Key:roundtrip
     route: DE:Key:route
+    route_ref: DE:Key:route ref
     ruins: DE:Key:ruins
     sac_scale: DE:Key:sac scale
     salt: DE:Key:salt
     sauna: DE:Key:sauna
     seamark: DE:Key:seamark
     ruins: DE:Key:ruins
     sac_scale: DE:Key:sac scale
     salt: DE:Key:salt
     sauna: DE:Key:sauna
     seamark: DE:Key:seamark
+    seamark:*: DE:Key:seamark:*
     seamark:fixme: DE:Key:seamark:fixme
     seamark:type: DE:Key:seamark:type
     seasonal: DE:Key:seasonal
     seats: DE:Key:seats
     second_hand: DE:Key:second hand
     segregated: DE:Key:segregated
     seamark:fixme: DE:Key:seamark:fixme
     seamark:type: DE:Key:seamark:type
     seasonal: DE:Key:seasonal
     seats: DE:Key:seats
     second_hand: DE:Key:second hand
     segregated: DE:Key:segregated
+    self_harvesting: DE:Key:self harvesting
     self_service: DE:Key:self service
     service: DE:Key:service
     service:bicycle:rental: DE:Key:service:bicycle:rental
     service:bicycle:repair: DE:Key:service:bicycle:repair
     service:vehicle: DE:Key:service:vehicle
     self_service: DE:Key:self service
     service: DE:Key:service
     service:bicycle:rental: DE:Key:service:bicycle:rental
     service:bicycle:repair: DE:Key:service:bicycle:repair
     service:vehicle: DE:Key:service:vehicle
+    'service:vehicle:': 'DE:Key:service:vehicle:'
+    service:vehicle:*: DE:Key:service:vehicle:*
     service_times: DE:Key:service times
     service_times: DE:Key:service times
+    service_times:wheelchair: DE:Key:service times:wheelchair
+    settlement_type: DE:Key:settlement type
     shelter: DE:Key:shelter
     shelter_type: DE:Key:shelter type
     shooting: DE:Key:shooting
     shop: DE:Key:shop
     short_protection_title: DE:Key:short protection title
     shelter: DE:Key:shelter
     shelter_type: DE:Key:shelter type
     shooting: DE:Key:shooting
     shop: DE:Key:shop
     short_protection_title: DE:Key:short protection title
+    shoulder: DE:Key:shoulder
     shower: DE:Key:shower
     sidewalk: DE:Key:sidewalk
     shower: DE:Key:shower
     sidewalk: DE:Key:sidewalk
-    site_type: DE:Key:site type
+    sidewalk:both:bicycle: DE:Key:sidewalk:both:bicycle
     ski: DE:Key:ski
     smoking: DE:Key:smoking
     smoothness: DE:Key:smoothness
     social_facility: DE:Key:social facility
     social_facility:for: DE:Key:social facility:for
     socket: DE:Key:socket
     ski: DE:Key:ski
     smoking: DE:Key:smoking
     smoothness: DE:Key:smoothness
     social_facility: DE:Key:social facility
     social_facility:for: DE:Key:social facility:for
     socket: DE:Key:socket
+    socket:*: DE:Key:socket:*
     source: DE:Key:source
     source:maxspeed: DE:Key:source:maxspeed
     species: DE:Key:species
     source: DE:Key:source
     source:maxspeed: DE:Key:source:maxspeed
     species: DE:Key:species
@@ -2837,16 +3121,21 @@ de:
     step_count: DE:Key:step count
     stone_type: DE:Key:stone type
     stroller: DE:Key:stroller
     step_count: DE:Key:step count
     stone_type: DE:Key:stone type
     stroller: DE:Key:stroller
+    subject: DE:Key:subject
     substance: DE:Key:substance
     substation: DE:Key:substation
     summit:register: DE:Key:summit:register
     substance: DE:Key:substance
     substation: DE:Key:substation
     summit:register: DE:Key:summit:register
+    supervised: DE:Key:supervised
     support: DE:Key:support
     surface: DE:Key:surface
     support: DE:Key:support
     surface: DE:Key:surface
+    surface:middle: DE:Key:surface:middle
     surveillance: DE:Key:surveillance
     surveillance: DE:Key:surveillance
+    surveillance:type: DE:Key:surveillance:type
     surveillance:zone: DE:Key:surveillance:zone
     survey:date: DE:Key:survey:date
     swimming: DE:Key:swimming
     swimming_pool: DE:Key:swimming pool
     surveillance:zone: DE:Key:surveillance:zone
     survey:date: DE:Key:survey:date
     swimming: DE:Key:swimming
     swimming_pool: DE:Key:swimming pool
+    switch: DE:Key:switch
     symbol: DE:Key:symbol
     tactile_paving: DE:Key:tactile paving
     tactile_writing: DE:Key:tactile writing
     symbol: DE:Key:symbol
     tactile_paving: DE:Key:tactile paving
     tactile_writing: DE:Key:tactile writing
@@ -2891,6 +3180,7 @@ de:
     turn:lanes:backward: DE:Key:turn:lanes:backward
     turn:lanes:forward: DE:Key:turn:lanes:forward
     type: DE:Key:type
     turn:lanes:backward: DE:Key:turn:lanes:backward
     turn:lanes:forward: DE:Key:turn:lanes:forward
     type: DE:Key:type
+    uic_name: DE:Key:uic name
     uic_ref: DE:Key:uic ref
     usage: DE:Key:usage
     utility: DE:Key:utility
     uic_ref: DE:Key:uic ref
     usage: DE:Key:usage
     utility: DE:Key:utility
@@ -2898,19 +3188,26 @@ de:
     vacuum_cleaner: DE:Key:vacuum cleaner
     vehicle: DE:Key:vehicle
     vehicle:conditional: DE:Key:vehicle:conditional
     vacuum_cleaner: DE:Key:vacuum cleaner
     vehicle: DE:Key:vehicle
     vehicle:conditional: DE:Key:vehicle:conditional
+    vending: DE:Key:vending
     verbindung: DE:Key:verbindung
     viewpoint: DE:Key:viewpoint
     visibility: DE:Key:visibility
     verbindung: DE:Key:verbindung
     viewpoint: DE:Key:viewpoint
     visibility: DE:Key:visibility
+    volcano:status: DE:Key:volcano:status
     voltage: DE:Key:voltage
     voltage:primary: DE:Key:voltage:primary
     voltage:secondary: DE:Key:voltage:secondary
     voltage: DE:Key:voltage
     voltage:primary: DE:Key:voltage:primary
     voltage:secondary: DE:Key:voltage:secondary
+    wall: DE:Key:wall
     waste: DE:Key:waste
     water: DE:Key:water
     water_characteristic: DE:Key:water characteristic
     waste: DE:Key:waste
     water: DE:Key:water
     water_characteristic: DE:Key:water characteristic
+    water_well: DE:Key:water well
     waterway: DE:Key:waterway
     website: DE:Key:website
     waterway: DE:Key:waterway
     website: DE:Key:website
+    website:menu: DE:Key:website:menu
+    website:regulation: DE:Key:website:regulation
     wetland: DE:Key:wetland
     wheelchair: DE:Key:wheelchair
     wetland: DE:Key:wetland
     wheelchair: DE:Key:wheelchair
+    wheelchair:description: DE:Key:wheelchair:description
     wholesale: DE:Key:wholesale
     width: DE:Key:width
     wiki:symbol: DE:Key:wiki:symbol
     wholesale: DE:Key:wholesale
     width: DE:Key:width
     wiki:symbol: DE:Key:wiki:symbol
@@ -2922,15 +3219,17 @@ de:
     winter_service: DE:Key:winter service
     wires: DE:Key:wires
     wood: DE:Key:wood
     winter_service: DE:Key:winter service
     wires: DE:Key:wires
     wood: DE:Key:wood
+    wood_provided: DE:Key:wood provided
     workrules: DE:Key:workrules
     xmas:feature: DE:Key:xmas:feature
     workrules: DE:Key:workrules
     xmas:feature: DE:Key:xmas:feature
-    year_of_construction: DE:Key:year of construction
     zero_waste: DE:Key:zero waste
     zone:maxspeed: DE:Key:zone:maxspeed
     zoo: DE:Key:zoo
   tag:
     abandoned:amenity=prison: DE:Tag:abandoned:amenity=prison
     abandoned:amenity=prison_camp: DE:Tag:abandoned:amenity=prison camp
     zero_waste: DE:Key:zero waste
     zone:maxspeed: DE:Key:zone:maxspeed
     zoo: DE:Key:zoo
   tag:
     abandoned:amenity=prison: DE:Tag:abandoned:amenity=prison
     abandoned:amenity=prison_camp: DE:Tag:abandoned:amenity=prison camp
+    abandoned:landuse=landfill: DE:Tag:abandoned:landuse=landfill
+    abandoned:landuse=quarry: DE:Tag:abandoned:landuse=quarry
     abandoned=yes: DE:Tag:abandoned=yes
     access=agricultural: DE:Tag:access=agricultural
     access=customers: DE:Tag:access=customers
     abandoned=yes: DE:Tag:abandoned=yes
     access=agricultural: DE:Tag:access=agricultural
     access=customers: DE:Tag:access=customers
@@ -2939,7 +3238,10 @@ de:
     access=destination: DE:Tag:access=destination
     access=forestry: DE:Tag:access=forestry
     access=no: DE:Tag:access=no
     access=destination: DE:Tag:access=destination
     access=forestry: DE:Tag:access=forestry
     access=no: DE:Tag:access=no
+    access=permissive: DE:Tag:access=permissive
+    access=permit: DE:Tag:access=permit
     access=private: DE:Tag:access=private
     access=private: DE:Tag:access=private
+    access=unknown: DE:Tag:access=unknown
     admin_level=2: DE:Tag:admin level=2
     advertising=column: DE:Tag:advertising=column
     advertising=flag: DE:Tag:advertising=flag
     admin_level=2: DE:Tag:admin level=2
     advertising=column: DE:Tag:advertising=column
     advertising=flag: DE:Tag:advertising=flag
@@ -2977,6 +3279,8 @@ de:
     aeroway=helipad: DE:Tag:aeroway=helipad
     aeroway=heliport: DE:Tag:aeroway=heliport
     aeroway=holding_position: DE:Tag:aeroway=holding position
     aeroway=helipad: DE:Tag:aeroway=helipad
     aeroway=heliport: DE:Tag:aeroway=heliport
     aeroway=holding_position: DE:Tag:aeroway=holding position
+    aeroway=jet_bridge: DE:Tag:aeroway=jet bridge
+    aeroway=launch_complex: DE:Tag:aeroway=launch complex
     aeroway=navigationaid: DE:Tag:aeroway=navigationaid
     aeroway=parking_position: DE:Tag:aeroway=parking position
     aeroway=runway: DE:Tag:aeroway=runway
     aeroway=navigationaid: DE:Tag:aeroway=navigationaid
     aeroway=parking_position: DE:Tag:aeroway=parking position
     aeroway=runway: DE:Tag:aeroway=runway
@@ -2984,6 +3288,8 @@ de:
     aeroway=taxilane: DE:Tag:aeroway=taxilane
     aeroway=taxiway: DE:Tag:aeroway=taxiway
     aeroway=terminal: DE:Tag:aeroway=terminal
     aeroway=taxilane: DE:Tag:aeroway=taxilane
     aeroway=taxiway: DE:Tag:aeroway=taxiway
     aeroway=terminal: DE:Tag:aeroway=terminal
+    aeroway=threshold: DE:Tag:aeroway=threshold
+    aeroway=tower: DE:Tag:aeroway=tower
     aeroway=windsock: DE:Tag:aeroway=windsock
     airmark=beacon: DE:Tag:airmark=beacon
     allotments=plot: DE:Tag:allotments=plot
     aeroway=windsock: DE:Tag:aeroway=windsock
     airmark=beacon: DE:Tag:airmark=beacon
     allotments=plot: DE:Tag:allotments=plot
@@ -3004,6 +3310,7 @@ de:
     amenity=bicycle_parking: DE:Tag:amenity=bicycle parking
     amenity=bicycle_rental: DE:Tag:amenity=bicycle rental
     amenity=bicycle_repair_station: DE:Tag:amenity=bicycle repair station
     amenity=bicycle_parking: DE:Tag:amenity=bicycle parking
     amenity=bicycle_rental: DE:Tag:amenity=bicycle rental
     amenity=bicycle_repair_station: DE:Tag:amenity=bicycle repair station
+    amenity=bicycle_wash: DE:Tag:amenity=bicycle wash
     amenity=biergarten: DE:Tag:amenity=biergarten
     amenity=boat_rental: DE:Tag:amenity=boat rental
     amenity=boat_storage: DE:Tag:amenity=boat storage
     amenity=biergarten: DE:Tag:amenity=biergarten
     amenity=boat_rental: DE:Tag:amenity=boat rental
     amenity=boat_storage: DE:Tag:amenity=boat storage
@@ -3031,9 +3338,14 @@ de:
     amenity=customs: DE:Tag:amenity=customs
     amenity=dancing_school: DE:Tag:amenity=dancing school
     amenity=dentist: DE:Tag:amenity=dentist
     amenity=customs: DE:Tag:amenity=customs
     amenity=dancing_school: DE:Tag:amenity=dancing school
     amenity=dentist: DE:Tag:amenity=dentist
+    amenity=device_charging_station: DE:Tag:amenity=device charging station
     amenity=dive_centre: DE:Tag:amenity=dive centre
     amenity=doctors: DE:Tag:amenity=doctors
     amenity=dive_centre: DE:Tag:amenity=dive centre
     amenity=doctors: DE:Tag:amenity=doctors
+    amenity=dog_parking: DE:Tag:amenity=dog parking
+    amenity=dog_toilet: DE:Tag:amenity=dog toilet
+    amenity=dressing_room: DE:Tag:amenity=dressing room
     amenity=drinking_water: DE:Tag:amenity=drinking water
     amenity=drinking_water: DE:Tag:amenity=drinking water
+    amenity=driver_training: DE:Tag:amenity=driver training
     amenity=driving_school: DE:Tag:amenity=driving school
     amenity=embassy: DE:Tag:amenity=embassy
     amenity=emergency_phone: DE:Tag:amenity=emergency phone
     amenity=driving_school: DE:Tag:amenity=driving school
     amenity=embassy: DE:Tag:amenity=embassy
     amenity=emergency_phone: DE:Tag:amenity=emergency phone
@@ -3045,12 +3357,15 @@ de:
     amenity=fire_hydrant: DE:Tag:amenity=fire hydrant
     amenity=fire_station: DE:Tag:amenity=fire station
     amenity=fish_spa: DE:Tag:amenity=fish spa
     amenity=fire_hydrant: DE:Tag:amenity=fire hydrant
     amenity=fire_station: DE:Tag:amenity=fire station
     amenity=fish_spa: DE:Tag:amenity=fish spa
+    amenity=food_court: DE:Tag:amenity=food court
     amenity=fountain: DE:Tag:amenity=fountain
     amenity=fridge: DE:Tag:amenity=fridge
     amenity=fuel: DE:Tag:amenity=fuel
     amenity=fountain: DE:Tag:amenity=fountain
     amenity=fridge: DE:Tag:amenity=fridge
     amenity=fuel: DE:Tag:amenity=fuel
+    amenity=funeral_hall: DE:Tag:amenity=funeral hall
     amenity=give_box: DE:Tag:amenity=give box
     amenity=grave_yard: DE:Tag:amenity=grave yard
     amenity=grit_bin: DE:Tag:amenity=grit bin
     amenity=give_box: DE:Tag:amenity=give box
     amenity=grave_yard: DE:Tag:amenity=grave yard
     amenity=grit_bin: DE:Tag:amenity=grit bin
+    amenity=hitching_post: DE:Tag:amenity=hitching post
     amenity=hookah_lounge: DE:Tag:amenity=hookah lounge
     amenity=hospice: DE:Tag:amenity=hospice
     amenity=hospital: DE:Tag:amenity=hospital
     amenity=hookah_lounge: DE:Tag:amenity=hookah lounge
     amenity=hospice: DE:Tag:amenity=hospice
     amenity=hospital: DE:Tag:amenity=hospital
@@ -3065,17 +3380,22 @@ de:
     amenity=lavoir: DE:Tag:amenity=lavoir
     amenity=letter_box: DE:Tag:amenity=letter box
     amenity=library: DE:Tag:amenity=library
     amenity=lavoir: DE:Tag:amenity=lavoir
     amenity=letter_box: DE:Tag:amenity=letter box
     amenity=library: DE:Tag:amenity=library
+    amenity=loading_dock: DE:Tag:amenity=loading dock
+    amenity=lost_property_office: DE:Tag:amenity=lost property office
     amenity=lounger: DE:Tag:amenity=lounger
     amenity=marketplace: DE:Tag:amenity=marketplace
     amenity=medical_supply: DE:Tag:amenity=medical supply
     amenity=lounger: DE:Tag:amenity=lounger
     amenity=marketplace: DE:Tag:amenity=marketplace
     amenity=medical_supply: DE:Tag:amenity=medical supply
+    amenity=mobile_library: DE:Tag:amenity=mobile library
     amenity=monastery: DE:Tag:amenity=monastery
     amenity=money_transfer: DE:Tag:amenity=money transfer
     amenity=mortuary: DE:Tag:amenity=mortuary
     amenity=motorcycle_parking: DE:Tag:amenity=motorcycle parking
     amenity=monastery: DE:Tag:amenity=monastery
     amenity=money_transfer: DE:Tag:amenity=money transfer
     amenity=mortuary: DE:Tag:amenity=mortuary
     amenity=motorcycle_parking: DE:Tag:amenity=motorcycle parking
+    amenity=mtb_school: DE:Tag:amenity=mtb school
     amenity=music_school: DE:Tag:amenity=music school
     amenity=music_venue: DE:Tag:amenity=music venue
     amenity=nightclub: DE:Tag:amenity=nightclub
     amenity=nursing_home: DE:Tag:amenity=nursing home
     amenity=music_school: DE:Tag:amenity=music school
     amenity=music_venue: DE:Tag:amenity=music venue
     amenity=nightclub: DE:Tag:amenity=nightclub
     amenity=nursing_home: DE:Tag:amenity=nursing home
+    amenity=parcel_locker: DE:Tag:amenity=parcel locker
     amenity=parking: DE:Tag:amenity=parking
     amenity=parking_entrance: DE:Tag:amenity=parking entrance
     amenity=parking_space: DE:Tag:amenity=parking space
     amenity=parking: DE:Tag:amenity=parking
     amenity=parking_entrance: DE:Tag:amenity=parking entrance
     amenity=parking_space: DE:Tag:amenity=parking space
@@ -3095,17 +3415,20 @@ de:
     amenity=public_bath: DE:Tag:amenity=public bath
     amenity=public_bookcase: DE:Tag:amenity=public bookcase
     amenity=ranger_station: DE:Tag:amenity=ranger station
     amenity=public_bath: DE:Tag:amenity=public bath
     amenity=public_bookcase: DE:Tag:amenity=public bookcase
     amenity=ranger_station: DE:Tag:amenity=ranger station
+    amenity=reception_desk: DE:Tag:amenity=reception desk
     amenity=recycling: DE:Tag:amenity=recycling
     amenity=register_office: DE:Tag:amenity=register office
     amenity=research_institute: DE:Tag:amenity=research institute
     amenity=restaurant: DE:Tag:amenity=restaurant
     amenity=retirement_home: DE:Tag:amenity=retirement home
     amenity=recycling: DE:Tag:amenity=recycling
     amenity=register_office: DE:Tag:amenity=register office
     amenity=research_institute: DE:Tag:amenity=research institute
     amenity=restaurant: DE:Tag:amenity=restaurant
     amenity=retirement_home: DE:Tag:amenity=retirement home
+    amenity=sailing_school: DE:Tag:amenity=sailing school
     amenity=sanitary_dump_station: DE:Tag:amenity=sanitary dump station
     amenity=school: DE:Tag:amenity=school
     amenity=shelter: DE:Tag:amenity=shelter
     amenity=shower: DE:Tag:amenity=shower
     amenity=ski_school: DE:Tag:amenity=ski school
     amenity=smoking_area: DE:Tag:amenity=smoking area
     amenity=sanitary_dump_station: DE:Tag:amenity=sanitary dump station
     amenity=school: DE:Tag:amenity=school
     amenity=shelter: DE:Tag:amenity=shelter
     amenity=shower: DE:Tag:amenity=shower
     amenity=ski_school: DE:Tag:amenity=ski school
     amenity=smoking_area: DE:Tag:amenity=smoking area
+    amenity=snow_removal_station: DE:Tag:amenity=snow removal station
     amenity=social_facility: DE:Tag:amenity=social facility
     amenity=stables: DE:Tag:amenity=stables
     amenity=studio: DE:Tag:amenity=studio
     amenity=social_facility: DE:Tag:amenity=social facility
     amenity=stables: DE:Tag:amenity=stables
     amenity=studio: DE:Tag:amenity=studio
@@ -3115,8 +3438,10 @@ de:
     amenity=ticket_validator: DE:Tag:amenity=ticket validator
     amenity=toilets: DE:Tag:amenity=toilets
     amenity=townhall: DE:Tag:amenity=townhall
     amenity=ticket_validator: DE:Tag:amenity=ticket validator
     amenity=toilets: DE:Tag:amenity=toilets
     amenity=townhall: DE:Tag:amenity=townhall
+    amenity=traffic_park: DE:Tag:amenity=traffic park
     amenity=trolley_bay: DE:Tag:amenity=trolley bay
     amenity=university: DE:Tag:amenity=university
     amenity=trolley_bay: DE:Tag:amenity=trolley bay
     amenity=university: DE:Tag:amenity=university
+    amenity=vacuum_cleaner: DE:Tag:amenity=vacuum cleaner
     amenity=vehicle_inspection: DE:Tag:amenity=vehicle inspection
     amenity=vending_machine: DE:Tag:amenity=vending machine
     amenity=veterinary: DE:Tag:amenity=veterinary
     amenity=vehicle_inspection: DE:Tag:amenity=vehicle inspection
     amenity=vending_machine: DE:Tag:amenity=vending machine
     amenity=veterinary: DE:Tag:amenity=veterinary
@@ -3129,18 +3454,37 @@ de:
     amenity=youth_centre: DE:Tag:amenity=youth centre
     animal=horse_walker: DE:Tag:animal=horse walker
     animal=school: DE:Tag:animal=school
     amenity=youth_centre: DE:Tag:amenity=youth centre
     animal=horse_walker: DE:Tag:animal=horse walker
     animal=school: DE:Tag:animal=school
+    archaeological_site=baths: DE:Tag:archaeological site=baths
+    archaeological_site=city: DE:Tag:archaeological site=city
+    archaeological_site=fortification: DE:Tag:archaeological site=fortification
+    archaeological_site=hut_circle: DE:Tag:archaeological site=hut circle
+    archaeological_site=megalith: DE:Tag:archaeological site=megalith
+    archaeological_site=necropolis: DE:Tag:archaeological site=necropolis
+    archaeological_site=petroglyph: DE:Tag:archaeological site=petroglyph
+    archaeological_site=roman_circus: DE:Tag:archaeological site=roman circus
+    archaeological_site=roman_villa: DE:Tag:archaeological site=roman villa
+    archaeological_site=settlement: DE:Tag:archaeological site=settlement
+    archaeological_site=tumulus: DE:Tag:archaeological site=tumulus
+    artwork_type=architecture: DE:Tag:artwork type=architecture
     artwork_type=bust: DE:Tag:artwork type=bust
     artwork_type=mural: DE:Tag:artwork type=mural
     artwork_type=sculpture: DE:Tag:artwork type=sculpture
     artwork_type=statue: DE:Tag:artwork type=statue
     artwork_type=bust: DE:Tag:artwork type=bust
     artwork_type=mural: DE:Tag:artwork type=mural
     artwork_type=sculpture: DE:Tag:artwork type=sculpture
     artwork_type=statue: DE:Tag:artwork type=statue
+    association=student: DE:Tag:association=student
     atm=yes: DE:Tag:atm=yes
     atm=yes: DE:Tag:atm=yes
+    attraction=alpine_coaster: DE:Tag:attraction=alpine coaster
     attraction=animal: DE:Tag:attraction=animal
     attraction=animal: DE:Tag:attraction=animal
+    attraction=maze: DE:Tag:attraction=maze
     attraction=roller_coaster: DE:Tag:attraction=roller coaster
     attraction=summer_toboggan: DE:Tag:attraction=summer toboggan
     attraction=train: DE:Tag:attraction=train
     attraction=water_slide: DE:Tag:attraction=water slide
     attraction=roller_coaster: DE:Tag:attraction=roller coaster
     attraction=summer_toboggan: DE:Tag:attraction=summer toboggan
     attraction=train: DE:Tag:attraction=train
     attraction=water_slide: DE:Tag:attraction=water slide
+    barrier=barrier_board: DE:Tag:barrier=barrier board
+    barrier=berm: DE:Tag:barrier=berm
     barrier=block: DE:Tag:barrier=block
     barrier=bollard: DE:Tag:barrier=bollard
     barrier=block: DE:Tag:barrier=block
     barrier=bollard: DE:Tag:barrier=bollard
+    barrier=border_control: DE:Tag:barrier=border control
+    barrier=bump_gate: DE:Tag:barrier=bump gate
     barrier=bus_trap: DE:Tag:barrier=bus trap
     barrier=cable_barrier: DE:Tag:barrier=cable barrier
     barrier=cattle_grid: DE:Tag:barrier=cattle grid
     barrier=bus_trap: DE:Tag:barrier=bus trap
     barrier=cable_barrier: DE:Tag:barrier=cable barrier
     barrier=cattle_grid: DE:Tag:barrier=cattle grid
@@ -3158,6 +3502,7 @@ de:
     barrier=hedge: DE:Tag:barrier=hedge
     barrier=hedge_bank: DE:Tag:barrier=hedge bank
     barrier=height_restrictor: DE:Tag:barrier=height restrictor
     barrier=hedge: DE:Tag:barrier=hedge
     barrier=hedge_bank: DE:Tag:barrier=hedge bank
     barrier=height_restrictor: DE:Tag:barrier=height restrictor
+    barrier=horse_jump: DE:Tag:barrier=horse jump
     barrier=jersey_barrier: DE:Tag:barrier=jersey barrier
     barrier=kerb: DE:Tag:barrier=kerb
     barrier=kissing_gate: DE:Tag:barrier=kissing gate
     barrier=jersey_barrier: DE:Tag:barrier=jersey barrier
     barrier=kerb: DE:Tag:barrier=kerb
     barrier=kissing_gate: DE:Tag:barrier=kissing gate
@@ -3169,6 +3514,7 @@ de:
     barrier=sally_port: DE:Tag:barrier=sally port
     barrier=sliding_gate: DE:Tag:barrier=sliding gate
     barrier=spikes: DE:Tag:barrier=spikes
     barrier=sally_port: DE:Tag:barrier=sally port
     barrier=sliding_gate: DE:Tag:barrier=sliding gate
     barrier=spikes: DE:Tag:barrier=spikes
+    barrier=step: DE:Tag:barrier=step
     barrier=stile: DE:Tag:barrier=stile
     barrier=swing_gate: DE:Tag:barrier=swing gate
     barrier=tank_trap: DE:Tag:barrier=tank trap
     barrier=stile: DE:Tag:barrier=stile
     barrier=swing_gate: DE:Tag:barrier=swing gate
     barrier=tank_trap: DE:Tag:barrier=tank trap
@@ -3184,8 +3530,12 @@ de:
     bay=fjord: DE:Tag:bay=fjord
     bicycle=designated: DE:Tag:bicycle=designated
     bicycle=dismount: DE:Tag:bicycle=dismount
     bay=fjord: DE:Tag:bay=fjord
     bicycle=designated: DE:Tag:bicycle=designated
     bicycle=dismount: DE:Tag:bicycle=dismount
+    bicycle=optional_sidepath: DE:Tag:bicycle=optional sidepath
     bicycle=use_sidepath: DE:Tag:bicycle=use sidepath
     bicycle=use_sidepath: DE:Tag:bicycle=use sidepath
+    bicycle_road=yes: DE:Tag:bicycle road=yes
     biosphärenwirt=yes: DE:Tag:biosphärenwirt=yes
     biosphärenwirt=yes: DE:Tag:biosphärenwirt=yes
+    boundary=administrative: DE:Tag:boundary=administrative
+    boundary=low_emission_zone: DE:Tag:boundary=low emission zone
     boundary=marker: DE:Tag:boundary=marker
     boundary=national_park: DE:Tag:boundary=national park
     boundary=postal_code: DE:Tag:boundary=postal code
     boundary=marker: DE:Tag:boundary=marker
     boundary=national_park: DE:Tag:boundary=national park
     boundary=postal_code: DE:Tag:boundary=postal code
@@ -3217,13 +3567,17 @@ de:
     building=bakehouse: DE:Tag:building=bakehouse
     building=barn: DE:Tag:building=barn
     building=boathouse: DE:Tag:building=boathouse
     building=bakehouse: DE:Tag:building=bakehouse
     building=barn: DE:Tag:building=barn
     building=boathouse: DE:Tag:building=boathouse
+    building=bridge: DE:Tag:building=bridge
     building=bungalow: DE:Tag:building=bungalow
     building=bunker: DE:Tag:building=bunker
     building=cabin: DE:Tag:building=cabin
     building=bungalow: DE:Tag:building=bungalow
     building=bunker: DE:Tag:building=bunker
     building=cabin: DE:Tag:building=cabin
+    building=carport: DE:Tag:building=carport
+    building=castle: DE:Tag:building=castle
     building=cathedral: DE:Tag:building=cathedral
     building=chapel: DE:Tag:building=chapel
     building=church: DE:Tag:building=church
     building=civic: DE:Tag:building=civic
     building=cathedral: DE:Tag:building=cathedral
     building=chapel: DE:Tag:building=chapel
     building=church: DE:Tag:building=church
     building=civic: DE:Tag:building=civic
+    building=college: DE:Tag:building=college
     building=commercial: DE:Tag:building=commercial
     building=construction: DE:Tag:building=construction
     building=container: DE:Tag:building=container
     building=commercial: DE:Tag:building=commercial
     building=construction: DE:Tag:building=construction
     building=container: DE:Tag:building=container
@@ -3238,6 +3592,7 @@ de:
     building=garage: DE:Tag:building=garage
     building=garages: DE:Tag:building=garages
     building=gatehouse: DE:Tag:building=gatehouse
     building=garage: DE:Tag:building=garage
     building=garages: DE:Tag:building=garages
     building=gatehouse: DE:Tag:building=gatehouse
+    building=ger: DE:Tag:building=ger
     building=grandstand: DE:Tag:building=grandstand
     building=greenhouse: DE:Tag:building=greenhouse
     building=hangar: DE:Tag:building=hangar
     building=grandstand: DE:Tag:building=grandstand
     building=greenhouse: DE:Tag:building=greenhouse
     building=hangar: DE:Tag:building=hangar
@@ -3249,11 +3604,14 @@ de:
     building=industrial: DE:Tag:building=industrial
     building=kindergarten: DE:Tag:building=kindergarten
     building=kiosk: DE:Tag:building=kiosk
     building=industrial: DE:Tag:building=industrial
     building=kindergarten: DE:Tag:building=kindergarten
     building=kiosk: DE:Tag:building=kiosk
+    building=livestock: DE:Tag:building=livestock
     building=marquee: DE:Tag:building=marquee
     building=mosque: DE:Tag:building=mosque
     building=office: DE:Tag:building=office
     building=marquee: DE:Tag:building=marquee
     building=mosque: DE:Tag:building=mosque
     building=office: DE:Tag:building=office
+    building=outbuilding: DE:Tag:building=outbuilding
     building=parking: DE:Tag:building=parking
     building=pavilion: DE:Tag:building=pavilion
     building=parking: DE:Tag:building=parking
     building=pavilion: DE:Tag:building=pavilion
+    building=presbytery: DE:Tag:building=presbytery
     building=public: DE:Tag:building=public
     building=residential: DE:Tag:building=residential
     building=retail: DE:Tag:building=retail
     building=public: DE:Tag:building=public
     building=residential: DE:Tag:building=residential
     building=retail: DE:Tag:building=retail
@@ -3266,10 +3624,12 @@ de:
     building=shed: DE:Tag:building=shed
     building=shrine: DE:Tag:building=shrine
     building=slurry_tank: DE:Tag:building=slurry tank
     building=shed: DE:Tag:building=shed
     building=shrine: DE:Tag:building=shrine
     building=slurry_tank: DE:Tag:building=slurry tank
+    building=smithy: DE:Tag:building=smithy
     building=sports_hall: DE:Tag:building=sports hall
     building=stable: DE:Tag:building=stable
     building=stadium: DE:Tag:building=stadium
     building=static_caravan: DE:Tag:building=static caravan
     building=sports_hall: DE:Tag:building=sports hall
     building=stable: DE:Tag:building=stable
     building=stadium: DE:Tag:building=stadium
     building=static_caravan: DE:Tag:building=static caravan
+    building=stilt_house: DE:Tag:building=stilt house
     building=sty: DE:Tag:building=sty
     building=supermarket: DE:Tag:building=supermarket
     building=synagogue: DE:Tag:building=synagogue
     building=sty: DE:Tag:building=sty
     building=supermarket: DE:Tag:building=supermarket
     building=synagogue: DE:Tag:building=synagogue
@@ -3278,6 +3638,8 @@ de:
     building=terrace: DE:Tag:building=terrace
     building=toilets: DE:Tag:building=toilets
     building=train_station: DE:Tag:building=train station
     building=terrace: DE:Tag:building=terrace
     building=toilets: DE:Tag:building=toilets
     building=train_station: DE:Tag:building=train station
+    building=transformer_tower: DE:Tag:building=transformer tower
+    building=tree_house: DE:Tag:building=tree house
     building=university: DE:Tag:building=university
     building=warehouse: DE:Tag:building=warehouse
     building=water_tower: DE:Tag:building=water tower
     building=university: DE:Tag:building=university
     building=warehouse: DE:Tag:building=warehouse
     building=water_tower: DE:Tag:building=water tower
@@ -3285,20 +3647,42 @@ de:
     bunker_type=munitions: DE:Tag:bunker type=munitions
     bunker_type=pillbox: DE:Tag:bunker type=pillbox
     by_night=only: DE:Tag:by night=only
     bunker_type=munitions: DE:Tag:bunker type=munitions
     bunker_type=pillbox: DE:Tag:bunker type=pillbox
     by_night=only: DE:Tag:by night=only
+    canoe=portage: DE:Tag:canoe=portage
+    capacity:smoker_free=existing: DE:Tag:capacity:smoker free=existing
+    cargo=container: DE:Tag:cargo=container
     castle_type=castrum: DE:Tag:castle type=castrum
     castle_type=castrum: DE:Tag:castle type=castrum
+    castle_type=citadel: DE:Tag:castle type=citadel
     castle_type=defensive: DE:Tag:castle type=defensive
     castle_type=fortress: DE:Tag:castle type=fortress
     castle_type=defensive: DE:Tag:castle type=defensive
     castle_type=fortress: DE:Tag:castle type=fortress
+    castle_type=kremlin: DE:Tag:castle type=kremlin
     castle_type=manor: DE:Tag:castle type=manor
     castle_type=palace: DE:Tag:castle type=palace
     castle_type=manor: DE:Tag:castle type=manor
     castle_type=palace: DE:Tag:castle type=palace
+    castle_type=shiro: DE:Tag:castle type=shiro
     castle_type=stately: DE:Tag:castle type=stately
     cemetery=grave: DE:Tag:cemetery=grave
     castle_type=stately: DE:Tag:castle type=stately
     cemetery=grave: DE:Tag:cemetery=grave
+    cemetery=sector: DE:Tag:cemetery=sector
     cemetery=war_cemetery: DE:Tag:cemetery=war cemetery
     cemetery=war_cemetery: DE:Tag:cemetery=war cemetery
+    clothes=underwear: DE:Tag:clothes=underwear
     club=automobile: DE:Tag:club=automobile
     club=fan: DE:Tag:club=fan
     club=scout: DE:Tag:club=scout
     club=sport: DE:Tag:club=sport
     club=automobile: DE:Tag:club=automobile
     club=fan: DE:Tag:club=fan
     club=scout: DE:Tag:club=scout
     club=sport: DE:Tag:club=sport
+    club=student: DE:Tag:club=student
     communication=line: DE:Tag:communication=line
     communication=line: DE:Tag:communication=line
+    community_centre=community_hall: DE:Tag:community centre=community hall
+    community_centre=cultural_centre: DE:Tag:community centre=cultural centre
+    community_centre=family_centre: DE:Tag:community centre=family centre
+    community_centre=parish_hall: DE:Tag:community centre=parish hall
+    community_centre=village_hall: DE:Tag:community centre=village hall
+    community_centre=youth_centre: DE:Tag:community centre=youth centre
+    company=construction: DE:Tag:company=construction
+    company=industrial_climbing: DE:Tag:company=industrial climbing
+    company=logistics: DE:Tag:company=logistics
+    company=transport: DE:Tag:company=transport
+    construction=minor: DE:Tag:construction=minor
     construction=yes: DE:Tag:construction=yes
     construction=yes: DE:Tag:construction=yes
+    consulate=consulate_general: DE:Tag:consulate=consulate general
+    consulate=honorary_consul: DE:Tag:consulate=honorary consul
     content=hot_water: DE:Tag:content=hot water
     craft=agricultural_engines: DE:Tag:craft=agricultural engines
     craft=atelier: DE:Tag:craft=atelier
     content=hot_water: DE:Tag:content=hot water
     craft=agricultural_engines: DE:Tag:craft=agricultural engines
     craft=atelier: DE:Tag:craft=atelier
@@ -3317,11 +3701,13 @@ de:
     craft=carpet_layer: DE:Tag:craft=carpet layer
     craft=caterer: DE:Tag:craft=caterer
     craft=chimney_sweeper: DE:Tag:craft=chimney sweeper
     craft=carpet_layer: DE:Tag:craft=carpet layer
     craft=caterer: DE:Tag:craft=caterer
     craft=chimney_sweeper: DE:Tag:craft=chimney sweeper
+    craft=cleaning: DE:Tag:craft=cleaning
     craft=clockmaker: DE:Tag:craft=clockmaker
     craft=confectionery: DE:Tag:craft=confectionery
     craft=cooper: DE:Tag:craft=cooper
     craft=dental_technician: DE:Tag:craft=dental technician
     craft=distillery: DE:Tag:craft=distillery
     craft=clockmaker: DE:Tag:craft=clockmaker
     craft=confectionery: DE:Tag:craft=confectionery
     craft=cooper: DE:Tag:craft=cooper
     craft=dental_technician: DE:Tag:craft=dental technician
     craft=distillery: DE:Tag:craft=distillery
+    craft=door_construction: DE:Tag:craft=door construction
     craft=dressmaker: DE:Tag:craft=dressmaker
     craft=electrican: DE:Tag:craft=electrican
     craft=electrician: DE:Tag:craft=electrician
     craft=dressmaker: DE:Tag:craft=dressmaker
     craft=electrican: DE:Tag:craft=electrican
     craft=electrician: DE:Tag:craft=electrician
@@ -3337,9 +3723,14 @@ de:
     craft=hvac: DE:Tag:craft=hvac
     craft=information_electronics: DE:Tag:craft=information electronics
     craft=insulation: DE:Tag:craft=insulation
     craft=hvac: DE:Tag:craft=hvac
     craft=information_electronics: DE:Tag:craft=information electronics
     craft=insulation: DE:Tag:craft=insulation
+    craft=interior_decorator: DE:Tag:craft=interior decorator
+    craft=interior_work: DE:Tag:craft=interior work
+    craft=jeweller: DE:Tag:craft=jeweller
     craft=joiner: DE:Tag:craft=joiner
     craft=key_cutter: DE:Tag:craft=key cutter
     craft=joiner: DE:Tag:craft=joiner
     craft=key_cutter: DE:Tag:craft=key cutter
+    craft=locksmith: DE:Tag:craft=locksmith
     craft=metal_construction: DE:Tag:craft=metal construction
     craft=metal_construction: DE:Tag:craft=metal construction
+    craft=mint: DE:Tag:craft=mint
     craft=musical_instrument: DE:Tag:craft=musical instrument
     craft=oil_mill: DE:Tag:craft=oil mill
     craft=optician: DE:Tag:craft=optician
     craft=musical_instrument: DE:Tag:craft=musical instrument
     craft=oil_mill: DE:Tag:craft=oil mill
     craft=optician: DE:Tag:craft=optician
@@ -3350,11 +3741,15 @@ de:
     craft=paver: DE:Tag:craft=paver
     craft=photographer: DE:Tag:craft=photographer
     craft=photographic_laboratory: DE:Tag:craft=photographic laboratory
     craft=paver: DE:Tag:craft=paver
     craft=photographer: DE:Tag:craft=photographer
     craft=photographic_laboratory: DE:Tag:craft=photographic laboratory
+    craft=piano_tuner: DE:Tag:craft=piano tuner
     craft=plasterer: DE:Tag:craft=plasterer
     craft=plumber: DE:Tag:craft=plumber
     craft=pottery: DE:Tag:craft=pottery
     craft=plasterer: DE:Tag:craft=plasterer
     craft=plumber: DE:Tag:craft=plumber
     craft=pottery: DE:Tag:craft=pottery
+    craft=printer: DE:Tag:craft=printer
+    craft=printmaker: DE:Tag:craft=printmaker
     craft=roofer: DE:Tag:craft=roofer
     craft=saddler: DE:Tag:craft=saddler
     craft=roofer: DE:Tag:craft=roofer
     craft=saddler: DE:Tag:craft=saddler
+    craft=sailmaker: DE:Tag:craft=sailmaker
     craft=sawmill: DE:Tag:craft=sawmill
     craft=scaffolder: DE:Tag:craft=scaffolder
     craft=sculptor: DE:Tag:craft=sculptor
     craft=sawmill: DE:Tag:craft=sawmill
     craft=scaffolder: DE:Tag:craft=scaffolder
     craft=sculptor: DE:Tag:craft=sculptor
@@ -3362,6 +3757,7 @@ de:
     craft=signmaker: DE:Tag:craft=signmaker
     craft=stand_builder: DE:Tag:craft=stand builder
     craft=stonemason: DE:Tag:craft=stonemason
     craft=signmaker: DE:Tag:craft=signmaker
     craft=stand_builder: DE:Tag:craft=stand builder
     craft=stonemason: DE:Tag:craft=stonemason
+    craft=stove_fitter: DE:Tag:craft=stove fitter
     craft=sun_protection: DE:Tag:craft=sun protection
     craft=tailor: DE:Tag:craft=tailor
     craft=tiler: DE:Tag:craft=tiler
     craft=sun_protection: DE:Tag:craft=sun protection
     craft=tailor: DE:Tag:craft=tailor
     craft=tiler: DE:Tag:craft=tiler
@@ -3378,26 +3774,49 @@ de:
     crane:type=gantry_crane: DE:Tag:crane:type=gantry crane
     crane:type=portal_crane: DE:Tag:crane:type=portal crane
     crane:type=travel_lift: DE:Tag:crane:type=travel lift
     crane:type=gantry_crane: DE:Tag:crane:type=gantry crane
     crane:type=portal_crane: DE:Tag:crane:type=portal crane
     crane:type=travel_lift: DE:Tag:crane:type=travel lift
+    crematorium=pet: DE:Tag:crematorium=pet
     crossing=marked: DE:Tag:crossing=marked
     crossing=marked: DE:Tag:crossing=marked
+    crossing=no: DE:Tag:crossing=no
     crossing=traffic_signals: DE:Tag:crossing=traffic signals
     crossing=uncontrolled: DE:Tag:crossing=uncontrolled
     crossing=unmarked: DE:Tag:crossing=unmarked
     crossing=zebra: DE:Tag:crossing=zebra
     crossing=traffic_signals: DE:Tag:crossing=traffic signals
     crossing=uncontrolled: DE:Tag:crossing=uncontrolled
     crossing=unmarked: DE:Tag:crossing=unmarked
     crossing=zebra: DE:Tag:crossing=zebra
+    cuisine=asian: DE:Tag:cuisine=asian
     cuisine=brazilian: DE:Tag:cuisine=brazilian
     cuisine=brazilian: DE:Tag:cuisine=brazilian
+    cuisine=chinese: DE:Tag:cuisine=chinese
     cuisine=coffee_shop: DE:Tag:cuisine=coffee shop
     cuisine=dessert: DE:Tag:cuisine=dessert
     cuisine=coffee_shop: DE:Tag:cuisine=coffee shop
     cuisine=dessert: DE:Tag:cuisine=dessert
+    cuisine=greek: DE:Tag:cuisine=greek
+    cuisine=indian: DE:Tag:cuisine=indian
+    cuisine=italian: DE:Tag:cuisine=italian
+    cuisine=japanese: DE:Tag:cuisine=japanese
+    cuisine=korean: DE:Tag:cuisine=korean
+    cuisine=pizza: DE:Tag:cuisine=pizza
+    cuisine=regional: DE:Tag:cuisine=regional
+    cuisine=seafood: DE:Tag:cuisine=seafood
+    cuisine=sushi: DE:Tag:cuisine=sushi
+    cuisine=thai: DE:Tag:cuisine=thai
+    cuisine=vietnamese: DE:Tag:cuisine=vietnamese
     cycleway:left=lane: DE:Tag:cycleway:left=lane
     cycleway:right=lane: DE:Tag:cycleway:right=lane
     cycleway:left=lane: DE:Tag:cycleway:left=lane
     cycleway:right=lane: DE:Tag:cycleway:right=lane
+    cycleway:right=share_busway: DE:Tag:cycleway:right=share busway
     cycleway:right=track: DE:Tag:cycleway:right=track
     cycleway:right=track: DE:Tag:cycleway:right=track
+    cycleway=asl: DE:Tag:cycleway=asl
     cycleway=lane: DE:Tag:cycleway=lane
     cycleway=opposite: DE:Tag:cycleway=opposite
     cycleway=opposite_lane: DE:Tag:cycleway=opposite lane
     cycleway=opposite_track: DE:Tag:cycleway=opposite track
     cycleway=lane: DE:Tag:cycleway=lane
     cycleway=opposite: DE:Tag:cycleway=opposite
     cycleway=opposite_lane: DE:Tag:cycleway=opposite lane
     cycleway=opposite_track: DE:Tag:cycleway=opposite track
+    cycleway=separate: DE:Tag:cycleway=separate
     cycleway=share_busway: DE:Tag:cycleway=share busway
     cycleway=share_busway: DE:Tag:cycleway=share busway
+    cycleway=shared_lane: DE:Tag:cycleway=shared lane
     cycleway=track: DE:Tag:cycleway=track
     defensive=bergfried: DE:Tag:defensive=bergfried
     defensive=donjon: DE:Tag:defensive=donjon
     defensive=keep: DE:Tag:defensive=keep
     cycleway=track: DE:Tag:cycleway=track
     defensive=bergfried: DE:Tag:defensive=bergfried
     defensive=donjon: DE:Tag:defensive=donjon
     defensive=keep: DE:Tag:defensive=keep
+    defensive_works=bastion: DE:Tag:defensive works=bastion
+    defensive_works=battery: DE:Tag:defensive works=battery
+    dennert_fir_tree=yes: DE:Tag:dennert fir tree=yes
+    denotation=natural_monument: DE:Tag:denotation=natural monument
     diplomatic=ambassadors_residence: DE:Tag:diplomatic=ambassadors residence
     diplomatic=consulate: DE:Tag:diplomatic=consulate
     diplomatic=consulate_general: DE:Tag:diplomatic=consulate general
     diplomatic=ambassadors_residence: DE:Tag:diplomatic=ambassadors residence
     diplomatic=consulate: DE:Tag:diplomatic=consulate
     diplomatic=consulate_general: DE:Tag:diplomatic=consulate general
@@ -3405,20 +3824,34 @@ de:
     diplomatic=embassy: DE:Tag:diplomatic=embassy
     diplomatic=high_commission: DE:Tag:diplomatic=high commission
     diplomatic=honorary_consulate: DE:Tag:diplomatic=honorary consulate
     diplomatic=embassy: DE:Tag:diplomatic=embassy
     diplomatic=high_commission: DE:Tag:diplomatic=high commission
     diplomatic=honorary_consulate: DE:Tag:diplomatic=honorary consulate
+    diplomatic=liaison: DE:Tag:diplomatic=liaison
     diplomatic=permanent_mission: DE:Tag:diplomatic=permanent mission
     disc_golf=basket: DE:Tag:disc golf=basket
     disc_golf=hole: DE:Tag:disc golf=hole
     diplomatic=permanent_mission: DE:Tag:diplomatic=permanent mission
     disc_golf=basket: DE:Tag:disc golf=basket
     disc_golf=hole: DE:Tag:disc golf=hole
+    disused:landuse=landfill: DE:Tag:disused:landuse=landfill
+    disused=yes: DE:Tag:disused=yes
     dock=drydock: DE:Tag:dock=drydock
     dock=floating: DE:Tag:dock=floating
     electrified=contact_line: DE:Tag:electrified=contact line
     dock=drydock: DE:Tag:dock=drydock
     dock=floating: DE:Tag:dock=floating
     electrified=contact_line: DE:Tag:electrified=contact line
+    electrified=rail: DE:Tag:electrified=rail
+    embassy=branch_embassy: DE:Tag:embassy=branch embassy
+    embassy=delegation: DE:Tag:embassy=delegation
+    embassy=high_commission: DE:Tag:embassy=high commission
+    embassy=mission: DE:Tag:embassy=mission
+    embassy=residence: DE:Tag:embassy=residence
+    embassy=yes: DE:Tag:embassy=yes
     emergency=access_point: DE:Tag:emergency=access point
     emergency=aed: DE:Tag:emergency=aed
     emergency=ambulance_station: DE:Tag:emergency=ambulance station
     emergency=assembly_point: DE:Tag:emergency=assembly point
     emergency=access_point: DE:Tag:emergency=access point
     emergency=aed: DE:Tag:emergency=aed
     emergency=ambulance_station: DE:Tag:emergency=ambulance station
     emergency=assembly_point: DE:Tag:emergency=assembly point
+    emergency=control_centre: DE:Tag:emergency=control centre
     emergency=defibrillator: DE:Tag:emergency=defibrillator
     emergency=defibrillator: DE:Tag:emergency=defibrillator
+    emergency=designated: DE:Tag:emergency=designated
     emergency=drinking_water: DE:Tag:emergency=drinking water
     emergency=dry_riser_inlet: DE:Tag:emergency=dry riser inlet
     emergency=emergency_ward_entrance: DE:Tag:emergency=emergency ward entrance
     emergency=drinking_water: DE:Tag:emergency=drinking water
     emergency=dry_riser_inlet: DE:Tag:emergency=dry riser inlet
     emergency=emergency_ward_entrance: DE:Tag:emergency=emergency ward entrance
+    emergency=fire_alarm_box: DE:Tag:emergency=fire alarm box
+    emergency=fire_blanket: DE:Tag:emergency=fire blanket
     emergency=fire_extinguisher: DE:Tag:emergency=fire extinguisher
     emergency=fire_flapper: DE:Tag:emergency=fire flapper
     emergency=fire_hose: DE:Tag:emergency=fire hose
     emergency=fire_extinguisher: DE:Tag:emergency=fire extinguisher
     emergency=fire_flapper: DE:Tag:emergency=fire flapper
     emergency=fire_hose: DE:Tag:emergency=fire hose
@@ -3428,30 +3861,39 @@ de:
     emergency=fire_water_pond: DE:Tag:emergency=fire water pond
     emergency=first_aid: DE:Tag:emergency=first aid
     emergency=first_aid_kit: DE:Tag:emergency=first aid kit
     emergency=fire_water_pond: DE:Tag:emergency=fire water pond
     emergency=first_aid: DE:Tag:emergency=first aid
     emergency=first_aid_kit: DE:Tag:emergency=first aid kit
+    emergency=key_depot: DE:Tag:emergency=key depot
+    emergency=ladder_site: DE:Tag:emergency=ladder site
     emergency=landing_site: DE:Tag:emergency=landing site
     emergency=life_ring: DE:Tag:emergency=life ring
     emergency=landing_site: DE:Tag:emergency=landing site
     emergency=life_ring: DE:Tag:emergency=life ring
+    emergency=lifeguard: DE:Tag:emergency=lifeguard
     emergency=lifeguard_base: DE:Tag:emergency=lifeguard base
     emergency=lifeguard_place: DE:Tag:emergency=lifeguard place
     emergency=lifeguard_platform: DE:Tag:emergency=lifeguard platform
     emergency=lifeguard_tower: DE:Tag:emergency=lifeguard tower
     emergency=mountain_rescue: DE:Tag:emergency=mountain rescue
     emergency=phone: DE:Tag:emergency=phone
     emergency=lifeguard_base: DE:Tag:emergency=lifeguard base
     emergency=lifeguard_place: DE:Tag:emergency=lifeguard place
     emergency=lifeguard_platform: DE:Tag:emergency=lifeguard platform
     emergency=lifeguard_tower: DE:Tag:emergency=lifeguard tower
     emergency=mountain_rescue: DE:Tag:emergency=mountain rescue
     emergency=phone: DE:Tag:emergency=phone
+    emergency=rescue_box: DE:Tag:emergency=rescue box
     emergency=siren: DE:Tag:emergency=siren
     emergency=suction_point: DE:Tag:emergency=suction point
     emergency=water_rescue_station: DE:Tag:emergency=water rescue station
     emergency=water_tank: DE:Tag:emergency=water tank
     emergency=siren: DE:Tag:emergency=siren
     emergency=suction_point: DE:Tag:emergency=suction point
     emergency=water_rescue_station: DE:Tag:emergency=water rescue station
     emergency=water_tank: DE:Tag:emergency=water tank
+    emergency=yes: DE:Tag:emergency=yes
     emergency_service=technical: DE:Tag:emergency service=technical
     entrance=main: DE:Tag:entrance=main
     entrance=staircase: DE:Tag:entrance=staircase
     entrance=yes: DE:Tag:entrance=yes
     fast_food=cafeteria: DE:Tag:fast food=cafeteria
     emergency_service=technical: DE:Tag:emergency service=technical
     entrance=main: DE:Tag:entrance=main
     entrance=staircase: DE:Tag:entrance=staircase
     entrance=yes: DE:Tag:entrance=yes
     fast_food=cafeteria: DE:Tag:fast food=cafeteria
+    fence_type=railing: DE:Tag:fence type=railing
+    fire_class=*: DE:Tag:fire class=*
     foot=designated: DE:Tag:foot=designated
     foot=designated: DE:Tag:foot=designated
+    foot=yes: DE:Tag:foot=yes
     footway=crossing: DE:Tag:footway=crossing
     footway=sidewalk: DE:Tag:footway=sidewalk
     ford=stepping_stones: DE:Tag:ford=stepping stones
     ford=yes: DE:Tag:ford=yes
     fortification_type=hill_fort: DE:Tag:fortification type=hill fort
     fortification_type=limes: DE:Tag:fortification type=limes
     footway=crossing: DE:Tag:footway=crossing
     footway=sidewalk: DE:Tag:footway=sidewalk
     ford=stepping_stones: DE:Tag:ford=stepping stones
     ford=yes: DE:Tag:ford=yes
     fortification_type=hill_fort: DE:Tag:fortification type=hill fort
     fortification_type=limes: DE:Tag:fortification type=limes
+    fortification_type=motte: DE:Tag:fortification type=motte
     fortification_type=ringfort: DE:Tag:fortification type=ringfort
     fortification_type=sconce: DE:Tag:fortification type=sconce
     garden:type=botanical: DE:Tag:garden:type=botanical
     fortification_type=ringfort: DE:Tag:fortification type=ringfort
     fortification_type=sconce: DE:Tag:fortification type=sconce
     garden:type=botanical: DE:Tag:garden:type=botanical
@@ -3468,6 +3910,7 @@ de:
     generator:method=water-pumped-storage: DE:Tag:generator:method=water-pumped-storage
     generator:method=water-storage: DE:Tag:generator:method=water-storage
     generator:method=wind_turbine: DE:Tag:generator:method=wind turbine
     generator:method=water-pumped-storage: DE:Tag:generator:method=water-pumped-storage
     generator:method=water-storage: DE:Tag:generator:method=water-storage
     generator:method=wind_turbine: DE:Tag:generator:method=wind turbine
+    generator:source=battery: DE:Tag:generator:source=battery
     generator:source=biofuel: DE:Tag:generator:source=biofuel
     generator:source=biogas: DE:Tag:generator:source=biogas
     generator:source=biomass: DE:Tag:generator:source=biomass
     generator:source=biofuel: DE:Tag:generator:source=biofuel
     generator:source=biogas: DE:Tag:generator:source=biogas
     generator:source=biomass: DE:Tag:generator:source=biomass
@@ -3499,10 +3942,16 @@ de:
     generator:type=steam_generator: DE:Tag:generator:type=steam generator
     generator:type=steam_turbine: DE:Tag:generator:type=steam turbine
     generator:type=vertical_axis: DE:Tag:generator:type=vertical axis
     generator:type=steam_generator: DE:Tag:generator:type=steam generator
     generator:type=steam_turbine: DE:Tag:generator:type=steam turbine
     generator:type=vertical_axis: DE:Tag:generator:type=vertical axis
+    geological=fault: DE:Tag:geological=fault
     geological=moraine: DE:Tag:geological=moraine
     geological=outcrop: DE:Tag:geological=outcrop
     geological=palaeontological_site: DE:Tag:geological=palaeontological site
     geological=moraine: DE:Tag:geological=moraine
     geological=outcrop: DE:Tag:geological=outcrop
     geological=palaeontological_site: DE:Tag:geological=palaeontological site
+    geological=rock_glacier: DE:Tag:geological=rock glacier
+    geological=volcanic_caldera_rim: DE:Tag:geological=volcanic caldera rim
+    geological=volcanic_lava_field: DE:Tag:geological=volcanic lava field
+    geological=volcanic_vent: DE:Tag:geological=volcanic vent
     golf=bunker: DE:Tag:golf=bunker
     golf=bunker: DE:Tag:golf=bunker
+    golf=clubhouse: DE:Tag:golf=clubhouse
     golf=driving_range: DE:Tag:golf=driving range
     golf=fairway: DE:Tag:golf=fairway
     golf=green: DE:Tag:golf=green
     golf=driving_range: DE:Tag:golf=driving range
     golf=fairway: DE:Tag:golf=fairway
     golf=green: DE:Tag:golf=green
@@ -3518,6 +3967,7 @@ de:
     government=audit: DE:Tag:government=audit
     government=border_control: DE:Tag:government=border control
     government=cadaster: DE:Tag:government=cadaster
     government=audit: DE:Tag:government=audit
     government=border_control: DE:Tag:government=border control
     government=cadaster: DE:Tag:government=cadaster
+    government=culture: DE:Tag:government=culture
     government=customs: DE:Tag:government=customs
     government=education: DE:Tag:government=education
     government=healthcare: DE:Tag:government=healthcare
     government=customs: DE:Tag:government=customs
     government=education: DE:Tag:government=education
     government=healthcare: DE:Tag:government=healthcare
@@ -3525,36 +3975,68 @@ de:
     government=ministry: DE:Tag:government=ministry
     government=prosecutor: DE:Tag:government=prosecutor
     government=register_office: DE:Tag:government=register office
     government=ministry: DE:Tag:government=ministry
     government=prosecutor: DE:Tag:government=prosecutor
     government=register_office: DE:Tag:government=register office
+    government=social_security: DE:Tag:government=social security
     government=statistics: DE:Tag:government=statistics
     government=tax: DE:Tag:government=tax
     government=youth_welfare_department: DE:Tag:government=youth welfare department
     hazard=animal_crossing: DE:Tag:hazard=animal crossing
     hazard=children: DE:Tag:hazard=children
     government=statistics: DE:Tag:government=statistics
     government=tax: DE:Tag:government=tax
     government=youth_welfare_department: DE:Tag:government=youth welfare department
     hazard=animal_crossing: DE:Tag:hazard=animal crossing
     hazard=children: DE:Tag:hazard=children
+    hazard=curve: DE:Tag:hazard=curve
+    hazard=curves: DE:Tag:hazard=curves
     hazard=cyclists: DE:Tag:hazard=cyclists
     hazard=cyclists: DE:Tag:hazard=cyclists
+    hazard=dangerous_junction: DE:Tag:hazard=dangerous junction
     hazard=falling_rocks: DE:Tag:hazard=falling rocks
     hazard=falling_rocks: DE:Tag:hazard=falling rocks
+    hazard=horse_riders: DE:Tag:hazard=horse riders
+    hazard=leeches: DE:Tag:hazard=leeches
     hazard=minefield: DE:Tag:hazard=minefield
     hazard=queues_likely: DE:Tag:hazard=queues likely
     hazard=school_zone: DE:Tag:hazard=school zone
     hazard=side_winds: DE:Tag:hazard=side winds
     hazard=slippery: DE:Tag:hazard=slippery
     hazmat:water=permissive: DE:Tag:hazmat:water=permissive
     hazard=minefield: DE:Tag:hazard=minefield
     hazard=queues_likely: DE:Tag:hazard=queues likely
     hazard=school_zone: DE:Tag:hazard=school zone
     hazard=side_winds: DE:Tag:hazard=side winds
     hazard=slippery: DE:Tag:hazard=slippery
     hazmat:water=permissive: DE:Tag:hazmat:water=permissive
+    healthcare:speciality=allergology: DE:Tag:healthcare:speciality=allergology
+    healthcare:speciality=anaesthetics: DE:Tag:healthcare:speciality=anaesthetics
+    healthcare:speciality=dermatology: DE:Tag:healthcare:speciality=dermatology
+    healthcare:speciality=general: DE:Tag:healthcare:speciality=general
+    healthcare:speciality=gynaecology: DE:Tag:healthcare:speciality=gynaecology
+    healthcare:speciality=mother_child: DE:Tag:healthcare:speciality=mother child
+    healthcare:speciality=ophthalmology: DE:Tag:healthcare:speciality=ophthalmology
+    healthcare:speciality=orthodontics: DE:Tag:healthcare:speciality=orthodontics
+    healthcare:speciality=otolaryngology: DE:Tag:healthcare:speciality=otolaryngology
+    healthcare:speciality=paediatric_surgery: DE:Tag:healthcare:speciality=paediatric
+      surgery
+    healthcare:speciality=paediatrics: DE:Tag:healthcare:speciality=paediatrics
+    healthcare:speciality=psychiatry: DE:Tag:healthcare:speciality=psychiatry
+    healthcare:speciality=vaccination: DE:Tag:healthcare:speciality=vaccination
+    healthcare=alternative: DE:Tag:healthcare=alternative
+    healthcare=audiologist: DE:Tag:healthcare=audiologist
     healthcare=birthing_center: DE:Tag:healthcare=birthing center
     healthcare=birthing_center: DE:Tag:healthcare=birthing center
+    healthcare=birthing_centre: DE:Tag:healthcare=birthing centre
+    healthcare=blood_bank: DE:Tag:healthcare=blood bank
     healthcare=blood_donation: DE:Tag:healthcare=blood donation
     healthcare=clinic: DE:Tag:healthcare=clinic
     healthcare=blood_donation: DE:Tag:healthcare=blood donation
     healthcare=clinic: DE:Tag:healthcare=clinic
+    healthcare=counselling: DE:Tag:healthcare=counselling
     healthcare=dentist: DE:Tag:healthcare=dentist
     healthcare=dialysis: DE:Tag:healthcare=dialysis
     healthcare=doctor: DE:Tag:healthcare=doctor
     healthcare=hospice: DE:Tag:healthcare=hospice
     healthcare=hospital: DE:Tag:healthcare=hospital
     healthcare=laboratory: DE:Tag:healthcare=laboratory
     healthcare=dentist: DE:Tag:healthcare=dentist
     healthcare=dialysis: DE:Tag:healthcare=dialysis
     healthcare=doctor: DE:Tag:healthcare=doctor
     healthcare=hospice: DE:Tag:healthcare=hospice
     healthcare=hospital: DE:Tag:healthcare=hospital
     healthcare=laboratory: DE:Tag:healthcare=laboratory
+    healthcare=midwife: DE:Tag:healthcare=midwife
+    healthcare=occupational_therapist: DE:Tag:healthcare=occupational therapist
     healthcare=physiotherapist: DE:Tag:healthcare=physiotherapist
     healthcare=physiotherapist: DE:Tag:healthcare=physiotherapist
+    healthcare=podiatrist: DE:Tag:healthcare=podiatrist
+    healthcare=rehabilitation: DE:Tag:healthcare=rehabilitation
+    healthcare=sample_collection: DE:Tag:healthcare=sample collection
     healthcare=speech_therapist: DE:Tag:healthcare=speech therapist
     healthcare=speech_therapist: DE:Tag:healthcare=speech therapist
+    hedge=hedge_bank: DE:Tag:hedge=hedge bank
     highway=abandoned: DE:Tag:highway=abandoned
     highway=access: DE:Tag:highway=access
     highway=bridleway: DE:Tag:highway=bridleway
     highway=bus_guideway: DE:Tag:highway=bus guideway
     highway=bus_stop: DE:Tag:highway=bus stop
     highway=abandoned: DE:Tag:highway=abandoned
     highway=access: DE:Tag:highway=access
     highway=bridleway: DE:Tag:highway=bridleway
     highway=bus_guideway: DE:Tag:highway=bus guideway
     highway=bus_stop: DE:Tag:highway=bus stop
-    highway=byway: DE:Tag:highway=byway
+    highway=busway: DE:Tag:highway=busway
+    highway=construction: DE:Tag:highway=construction
     highway=corridor: DE:Tag:highway=corridor
     highway=crossing: DE:Tag:highway=crossing
     highway=cycleway: DE:Tag:highway=cycleway
     highway=corridor: DE:Tag:highway=corridor
     highway=crossing: DE:Tag:highway=crossing
     highway=cycleway: DE:Tag:highway=cycleway
@@ -3574,6 +4056,7 @@ de:
     highway=motorway_junction: DE:Tag:highway=motorway junction
     highway=motorway_link: DE:Tag:highway=motorway link
     highway=no: DE:Tag:highway=no
     highway=motorway_junction: DE:Tag:highway=motorway junction
     highway=motorway_link: DE:Tag:highway=motorway link
     highway=no: DE:Tag:highway=no
+    highway=noexit: DE:Tag:highway=noexit
     highway=passing_place: DE:Tag:highway=passing place
     highway=path: DE:Tag:highway=path
     highway=pedestrian: DE:Tag:highway=pedestrian
     highway=passing_place: DE:Tag:highway=passing place
     highway=path: DE:Tag:highway=path
     highway=pedestrian: DE:Tag:highway=pedestrian
@@ -3593,6 +4076,7 @@ de:
     highway=service: DE:Tag:highway=service
     highway=services: DE:Tag:highway=services
     highway=speed_camera: DE:Tag:highway=speed camera
     highway=service: DE:Tag:highway=service
     highway=services: DE:Tag:highway=services
     highway=speed_camera: DE:Tag:highway=speed camera
+    highway=speed_display: DE:Tag:highway=speed display
     highway=steps: DE:Tag:highway=steps
     highway=stop: DE:Tag:highway=stop
     highway=street_lamp: DE:Tag:highway=street lamp
     highway=steps: DE:Tag:highway=steps
     highway=stop: DE:Tag:highway=stop
     highway=street_lamp: DE:Tag:highway=street lamp
@@ -3611,6 +4095,7 @@ de:
     highway=unknown: DE:Tag:highway=unknown
     highway=yes: DE:Tag:highway=yes
     historic=aircraft: DE:Tag:historic=aircraft
     highway=unknown: DE:Tag:highway=unknown
     highway=yes: DE:Tag:highway=yes
     historic=aircraft: DE:Tag:historic=aircraft
+    historic=aqueduct: DE:Tag:historic=aqueduct
     historic=archaeological_site: DE:Tag:historic=archaeological site
     historic=battlefield: DE:Tag:historic=battlefield
     historic=bomb_crater: DE:Tag:historic=bomb crater
     historic=archaeological_site: DE:Tag:historic=archaeological site
     historic=battlefield: DE:Tag:historic=battlefield
     historic=bomb_crater: DE:Tag:historic=bomb crater
@@ -3621,8 +4106,11 @@ de:
     historic=charcoal_pile: DE:Tag:historic=charcoal pile
     historic=city_gate: DE:Tag:historic=city gate
     historic=citywalls: DE:Tag:historic=citywalls
     historic=charcoal_pile: DE:Tag:historic=charcoal pile
     historic=city_gate: DE:Tag:historic=city gate
     historic=citywalls: DE:Tag:historic=citywalls
+    historic=farm: DE:Tag:historic=farm
     historic=fort: DE:Tag:historic=fort
     historic=gallows: DE:Tag:historic=gallows
     historic=fort: DE:Tag:historic=fort
     historic=gallows: DE:Tag:historic=gallows
+    historic=highwater_mark: DE:Tag:historic=highwater mark
+    historic=hollow_way: DE:Tag:historic=hollow way
     historic=locomotive: DE:Tag:historic=locomotive
     historic=manor: DE:Tag:historic=manor
     historic=memorial: DE:Tag:historic=memorial
     historic=locomotive: DE:Tag:historic=locomotive
     historic=manor: DE:Tag:historic=manor
     historic=memorial: DE:Tag:historic=memorial
@@ -3642,22 +4130,50 @@ de:
     historic=wayside_cross: DE:Tag:historic=wayside cross
     historic=wayside_shrine: DE:Tag:historic=wayside shrine
     historic=wreck: DE:Tag:historic=wreck
     historic=wayside_cross: DE:Tag:historic=wayside cross
     historic=wayside_shrine: DE:Tag:historic=wayside shrine
     historic=wreck: DE:Tag:historic=wreck
+    holding_position:type=runway: DE:Tag:holding position:type=runway
     horse=designated: DE:Tag:horse=designated
     horse=designated: DE:Tag:horse=designated
+    horse=dismount: DE:Tag:horse=dismount
+    industrial=aluminium_smelting: DE:Tag:industrial=aluminium smelting
+    industrial=asphalt_plant: DE:Tag:industrial=asphalt plant
+    industrial=auto_wrecker: DE:Tag:industrial=auto wrecker
     industrial=bakery: DE:Tag:industrial=bakery
     industrial=bakery: DE:Tag:industrial=bakery
+    industrial=brewery: DE:Tag:industrial=brewery
+    industrial=brickyard: DE:Tag:industrial=brickyard
+    industrial=communication: DE:Tag:industrial=communication
+    industrial=concrete_plant: DE:Tag:industrial=concrete plant
+    industrial=construction_company: DE:Tag:industrial=construction company
+    industrial=data_centre: DE:Tag:industrial=data centre
+    industrial=depot: DE:Tag:industrial=depot
+    industrial=factory: DE:Tag:industrial=factory
+    industrial=gas: DE:Tag:industrial=gas
+    industrial=metal_processing: DE:Tag:industrial=metal processing
+    industrial=mine: DE:Tag:industrial=mine
+    industrial=oil: DE:Tag:industrial=oil
+    industrial=port: DE:Tag:industrial=port
+    industrial=recycling: DE:Tag:industrial=recycling
+    industrial=refinery: DE:Tag:industrial=refinery
+    industrial=sawmill: DE:Tag:industrial=sawmill
     industrial=scrap_yard: DE:Tag:industrial=scrap yard
     industrial=scrap_yard: DE:Tag:industrial=scrap yard
+    industrial=shipyard: DE:Tag:industrial=shipyard
     industrial=slaughterhouse: DE:Tag:industrial=slaughterhouse
     industrial=slaughterhouse: DE:Tag:industrial=slaughterhouse
+    industrial=warehouse: DE:Tag:industrial=warehouse
+    industrial=wellsite: DE:Tag:industrial=wellsite
     information=audioguide: DE:Tag:information=audioguide
     information=board: DE:Tag:information=board
     information=guidepost: DE:Tag:information=guidepost
     information=map: DE:Tag:information=map
     information=office: DE:Tag:information=office
     information=audioguide: DE:Tag:information=audioguide
     information=board: DE:Tag:information=board
     information=guidepost: DE:Tag:information=guidepost
     information=map: DE:Tag:information=map
     information=office: DE:Tag:information=office
+    information=route_marker: DE:Tag:information=route marker
+    information=stele: DE:Tag:information=stele
     information=tactile_map: DE:Tag:information=tactile map
     information=tactile_model: DE:Tag:information=tactile model
     information=terminal: DE:Tag:information=terminal
     information=visitor_centre: DE:Tag:information=visitor centre
     internet_access=wlan: DE:Tag:internet access=wlan
     information=tactile_map: DE:Tag:information=tactile map
     information=tactile_model: DE:Tag:information=tactile model
     information=terminal: DE:Tag:information=terminal
     information=visitor_centre: DE:Tag:information=visitor centre
     internet_access=wlan: DE:Tag:internet access=wlan
+    junction=circular: DE:Tag:junction=circular
     junction=roundabout: DE:Tag:junction=roundabout
     landuse=allotments: DE:Tag:landuse=allotments
     junction=roundabout: DE:Tag:junction=roundabout
     landuse=allotments: DE:Tag:landuse=allotments
+    landuse=animal_keeping: DE:Tag:landuse=animal keeping
     landuse=aquaculture: DE:Tag:landuse=aquaculture
     landuse=basin: DE:Tag:landuse=basin
     landuse=brownfield: DE:Tag:landuse=brownfield
     landuse=aquaculture: DE:Tag:landuse=aquaculture
     landuse=basin: DE:Tag:landuse=basin
     landuse=brownfield: DE:Tag:landuse=brownfield
@@ -3666,6 +4182,7 @@ de:
     landuse=construction: DE:Tag:landuse=construction
     landuse=depot: DE:Tag:landuse=depot
     landuse=education: DE:Tag:landuse=education
     landuse=construction: DE:Tag:landuse=construction
     landuse=depot: DE:Tag:landuse=depot
     landuse=education: DE:Tag:landuse=education
+    landuse=fairground: DE:Tag:landuse=fairground
     landuse=farm: DE:Tag:landuse=farm
     landuse=farmland: DE:Tag:landuse=farmland
     landuse=farmyard: DE:Tag:landuse=farmyard
     landuse=farm: DE:Tag:landuse=farm
     landuse=farmland: DE:Tag:landuse=farmland
     landuse=farmyard: DE:Tag:landuse=farmyard
@@ -3674,6 +4191,7 @@ de:
     landuse=forest: DE:Tag:landuse=forest
     landuse=garages: DE:Tag:landuse=garages
     landuse=grass: DE:Tag:landuse=grass
     landuse=forest: DE:Tag:landuse=forest
     landuse=garages: DE:Tag:landuse=garages
     landuse=grass: DE:Tag:landuse=grass
+    landuse=greenery: DE:Tag:landuse=greenery
     landuse=greenfield: DE:Tag:landuse=greenfield
     landuse=greenhouse_horticulture: DE:Tag:landuse=greenhouse horticulture
     landuse=industrial: DE:Tag:landuse=industrial
     landuse=greenfield: DE:Tag:landuse=greenfield
     landuse=greenhouse_horticulture: DE:Tag:landuse=greenhouse horticulture
     landuse=industrial: DE:Tag:landuse=industrial
@@ -3691,6 +4209,7 @@ de:
     landuse=residential: DE:Tag:landuse=residential
     landuse=retail: DE:Tag:landuse=retail
     landuse=salt_pond: DE:Tag:landuse=salt pond
     landuse=residential: DE:Tag:landuse=residential
     landuse=retail: DE:Tag:landuse=retail
     landuse=salt_pond: DE:Tag:landuse=salt pond
+    landuse=shrubs: DE:Tag:landuse=shrubs
     landuse=village_green: DE:Tag:landuse=village green
     landuse=vineyard: DE:Tag:landuse=vineyard
     lcn=yes: DE:Tag:lcn=yes
     landuse=village_green: DE:Tag:landuse=village green
     landuse=vineyard: DE:Tag:landuse=vineyard
     lcn=yes: DE:Tag:lcn=yes
@@ -3707,6 +4226,7 @@ de:
     leisure=amusement_arcade: DE:Tag:leisure=amusement arcade
     leisure=bandstand: DE:Tag:leisure=bandstand
     leisure=barefoot: DE:Tag:leisure=barefoot
     leisure=amusement_arcade: DE:Tag:leisure=amusement arcade
     leisure=bandstand: DE:Tag:leisure=bandstand
     leisure=barefoot: DE:Tag:leisure=barefoot
+    leisure=bathing_place: DE:Tag:leisure=bathing place
     leisure=beach_resort: DE:Tag:leisure=beach resort
     leisure=bird_hide: DE:Tag:leisure=bird hide
     leisure=bleachers: DE:Tag:leisure=bleachers
     leisure=beach_resort: DE:Tag:leisure=beach resort
     leisure=bird_hide: DE:Tag:leisure=bird hide
     leisure=bleachers: DE:Tag:leisure=bleachers
@@ -3715,6 +4235,7 @@ de:
     leisure=dance: DE:Tag:leisure=dance
     leisure=disc_golf_course: DE:Tag:leisure=disc golf course
     leisure=dog_park: DE:Tag:leisure=dog park
     leisure=dance: DE:Tag:leisure=dance
     leisure=disc_golf_course: DE:Tag:leisure=disc golf course
     leisure=dog_park: DE:Tag:leisure=dog park
+    leisure=escape_game: DE:Tag:leisure=escape game
     leisure=firepit: DE:Tag:leisure=firepit
     leisure=fish_spa: DE:Tag:leisure=fish spa
     leisure=fishing: DE:Tag:leisure=fishing
     leisure=firepit: DE:Tag:leisure=firepit
     leisure=fish_spa: DE:Tag:leisure=fish spa
     leisure=fishing: DE:Tag:leisure=fishing
@@ -3738,7 +4259,9 @@ de:
     leisure=playground: DE:Tag:leisure=playground
     leisure=resort: DE:Tag:leisure=resort
     leisure=sauna: DE:Tag:leisure=sauna
     leisure=playground: DE:Tag:leisure=playground
     leisure=resort: DE:Tag:leisure=resort
     leisure=sauna: DE:Tag:leisure=sauna
+    leisure=schoolyard: DE:Tag:leisure=schoolyard
     leisure=slipway: DE:Tag:leisure=slipway
     leisure=slipway: DE:Tag:leisure=slipway
+    leisure=soccer_golf: DE:Tag:leisure=soccer golf
     leisure=sports_centre: DE:Tag:leisure=sports centre
     leisure=sports_hall: DE:Tag:leisure=sports hall
     leisure=stadium: DE:Tag:leisure=stadium
     leisure=sports_centre: DE:Tag:leisure=sports centre
     leisure=sports_hall: DE:Tag:leisure=sports hall
     leisure=stadium: DE:Tag:leisure=stadium
@@ -3753,45 +4276,69 @@ de:
     level_crossing=automatic_barrier: DE:Tag:level crossing=automatic barrier
     level_crossing=traffic_signals: DE:Tag:level crossing=traffic signals
     level_crossing=uncontrolled: DE:Tag:level crossing=uncontrolled
     level_crossing=automatic_barrier: DE:Tag:level crossing=automatic barrier
     level_crossing=traffic_signals: DE:Tag:level crossing=traffic signals
     level_crossing=uncontrolled: DE:Tag:level crossing=uncontrolled
+    lifeguard=base: DE:Tag:lifeguard=base
+    lifeguard=tower: DE:Tag:lifeguard=tower
     line=bay: DE:Tag:line=bay
     line=busbar: DE:Tag:line=busbar
     location:transition=yes: DE:Tag:location:transition=yes
     line=bay: DE:Tag:line=bay
     line=busbar: DE:Tag:line=busbar
     location:transition=yes: DE:Tag:location:transition=yes
+    location=roof: DE:Tag:location=roof
     location=underground: DE:Tag:location=underground
     location=underground: DE:Tag:location=underground
+    lottery=yes: DE:Tag:lottery=yes
     man_made=MDF: DE:Tag:man made=MDF
     man_made=adit: DE:Tag:man made=adit
     man_made=antenna: DE:Tag:man made=antenna
     man_made=MDF: DE:Tag:man made=MDF
     man_made=adit: DE:Tag:man made=adit
     man_made=antenna: DE:Tag:man made=antenna
+    man_made=architecture_line: DE:Tag:man made=architecture line
     man_made=beacon: DE:Tag:man made=beacon
     man_made=beehive: DE:Tag:man made=beehive
     man_made=breakwater: DE:Tag:man made=breakwater
     man_made=bridge: DE:Tag:man made=bridge
     man_made=bunker_silo: DE:Tag:man made=bunker silo
     man_made=beacon: DE:Tag:man made=beacon
     man_made=beehive: DE:Tag:man made=beehive
     man_made=breakwater: DE:Tag:man made=breakwater
     man_made=bridge: DE:Tag:man made=bridge
     man_made=bunker_silo: DE:Tag:man made=bunker silo
+    man_made=cairn: DE:Tag:man made=cairn
     man_made=carpet_hanger: DE:Tag:man made=carpet hanger
     man_made=carpet_hanger: DE:Tag:man made=carpet hanger
+    man_made=cellar_entrance: DE:Tag:man made=cellar entrance
+    man_made=charge_point: DE:Tag:man made=charge point
     man_made=chimney: DE:Tag:man made=chimney
     man_made=chimney: DE:Tag:man made=chimney
+    man_made=clarifier: DE:Tag:man made=clarifier
+    man_made=clearcut: DE:Tag:man made=clearcut
+    man_made=column: DE:Tag:man made=column
     man_made=communications_tower: DE:Tag:man made=communications tower
     man_made=cooling_tower: DE:Tag:man made=cooling tower
     man_made=communications_tower: DE:Tag:man made=communications tower
     man_made=cooling_tower: DE:Tag:man made=cooling tower
+    man_made=courtyard: DE:Tag:man made=courtyard
     man_made=crane: DE:Tag:man made=crane
     man_made=cross: DE:Tag:man made=cross
     man_made=cutline: DE:Tag:man made=cutline
     man_made=crane: DE:Tag:man made=crane
     man_made=cross: DE:Tag:man made=cross
     man_made=cutline: DE:Tag:man made=cutline
+    man_made=dolphin: DE:Tag:man made=dolphin
     man_made=dovecote: DE:Tag:man made=dovecote
     man_made=dyke: DE:Tag:man made=dyke
     man_made=embankment: DE:Tag:man made=embankment
     man_made=flagpole: DE:Tag:man made=flagpole
     man_made=dovecote: DE:Tag:man made=dovecote
     man_made=dyke: DE:Tag:man made=dyke
     man_made=embankment: DE:Tag:man made=embankment
     man_made=flagpole: DE:Tag:man made=flagpole
+    man_made=flare: DE:Tag:man made=flare
+    man_made=footwear_decontamination: DE:Tag:man made=footwear decontamination
+    man_made=fuel_pump: DE:Tag:man made=fuel pump
+    man_made=gantry: DE:Tag:man made=gantry
     man_made=gasometer: DE:Tag:man made=gasometer
     man_made=gasometer: DE:Tag:man made=gasometer
+    man_made=geoglyph: DE:Tag:man made=geoglyph
     man_made=goods_conveyor: DE:Tag:man made=goods conveyor
     man_made=graduation_tower: DE:Tag:man made=graduation tower
     man_made=groyne: DE:Tag:man made=groyne
     man_made=goods_conveyor: DE:Tag:man made=goods conveyor
     man_made=graduation_tower: DE:Tag:man made=graduation tower
     man_made=groyne: DE:Tag:man made=groyne
+    man_made=guard_stone: DE:Tag:man made=guard stone
+    man_made=guy_wire: DE:Tag:man made=guy wire
+    man_made=heap: DE:Tag:man made=heap
     man_made=hot_water_tank: DE:Tag:man made=hot water tank
     man_made=insect_hotel: DE:Tag:man made=insect hotel
     man_made=kiln: DE:Tag:man made=kiln
     man_made=lighthouse: DE:Tag:man made=lighthouse
     man_made=hot_water_tank: DE:Tag:man made=hot water tank
     man_made=insect_hotel: DE:Tag:man made=insect hotel
     man_made=kiln: DE:Tag:man made=kiln
     man_made=lighthouse: DE:Tag:man made=lighthouse
+    man_made=manhole: DE:Tag:man made=manhole
     man_made=mast: DE:Tag:man made=mast
     man_made=maypole: DE:Tag:man made=maypole
     man_made=mast: DE:Tag:man made=mast
     man_made=maypole: DE:Tag:man made=maypole
+    man_made=milk_churn_stand: DE:Tag:man made=milk churn stand
     man_made=mineshaft: DE:Tag:man made=mineshaft
     man_made=monitoring_station: DE:Tag:man made=monitoring station
     man_made=nesting_site: DE:Tag:man made=nesting site
     man_made=obelisk: DE:Tag:man made=obelisk
     man_made=observatory: DE:Tag:man made=observatory
     man_made=offshore_platform: DE:Tag:man made=offshore platform
     man_made=mineshaft: DE:Tag:man made=mineshaft
     man_made=monitoring_station: DE:Tag:man made=monitoring station
     man_made=nesting_site: DE:Tag:man made=nesting site
     man_made=obelisk: DE:Tag:man made=obelisk
     man_made=observatory: DE:Tag:man made=observatory
     man_made=offshore_platform: DE:Tag:man made=offshore platform
+    man_made=oxidation_ditch: DE:Tag:man made=oxidation ditch
     man_made=petroleum_well: DE:Tag:man made=petroleum well
     man_made=pier: DE:Tag:man made=pier
     man_made=pipeline: DE:Tag:man made=pipeline
     man_made=petroleum_well: DE:Tag:man made=petroleum well
     man_made=pier: DE:Tag:man made=pier
     man_made=pipeline: DE:Tag:man made=pipeline
@@ -3812,6 +4359,8 @@ de:
     man_made=survey_point: DE:Tag:man made=survey point
     man_made=telescope: DE:Tag:man made=telescope
     man_made=tower: DE:Tag:man made=tower
     man_made=survey_point: DE:Tag:man made=survey point
     man_made=telescope: DE:Tag:man made=telescope
     man_made=tower: DE:Tag:man made=tower
+    man_made=urine_deflector: DE:Tag:man made=urine deflector
+    man_made=utility_pole: DE:Tag:man made=utility pole
     man_made=wastewater_plant: DE:Tag:man made=wastewater plant
     man_made=water_tank: DE:Tag:man made=water tank
     man_made=water_tap: DE:Tag:man made=water tap
     man_made=wastewater_plant: DE:Tag:man made=wastewater plant
     man_made=water_tank: DE:Tag:man made=water tank
     man_made=water_tap: DE:Tag:man made=water tap
@@ -3826,6 +4375,8 @@ de:
     manhole=drain: DE:Tag:manhole=drain
     marker=aerial: DE:Tag:marker=aerial
     marker=post: DE:Tag:marker=post
     manhole=drain: DE:Tag:manhole=drain
     marker=aerial: DE:Tag:marker=aerial
     marker=post: DE:Tag:marker=post
+    maxheight=default: DE:Tag:maxheight=default
+    meadow=pasture: DE:Tag:meadow=pasture
     megalith_type=alignment: DE:Tag:megalith type=alignment
     megalith_type=chamber: DE:Tag:megalith type=chamber
     megalith_type=cist: DE:Tag:megalith type=cist
     megalith_type=alignment: DE:Tag:megalith type=alignment
     megalith_type=chamber: DE:Tag:megalith type=chamber
     megalith_type=cist: DE:Tag:megalith type=cist
@@ -3834,28 +4385,39 @@ de:
     megalith_type=menhir: DE:Tag:megalith type=menhir
     megalith_type=nuraghe: DE:Tag:megalith type=nuraghe
     megalith_type=passage_grave: DE:Tag:megalith type=passage grave
     megalith_type=menhir: DE:Tag:megalith type=menhir
     megalith_type=nuraghe: DE:Tag:megalith type=nuraghe
     megalith_type=passage_grave: DE:Tag:megalith type=passage grave
+    megalith_type=ring_cairn: DE:Tag:megalith type=ring cairn
     megalith_type=stone_circle: DE:Tag:megalith type=stone circle
     megalith_type=stone_ship: DE:Tag:megalith type=stone ship
     megalith_type=tholos: DE:Tag:megalith type=tholos
     megalith_type=stone_circle: DE:Tag:megalith type=stone circle
     megalith_type=stone_ship: DE:Tag:megalith type=stone ship
     megalith_type=tholos: DE:Tag:megalith type=tholos
+    megalith_type=well: DE:Tag:megalith type=well
     memorial:type=stolperstein: DE:Tag:memorial:type=stolperstein
     memorial=bust: DE:Tag:memorial=bust
     memorial=ghost_bike: DE:Tag:memorial=ghost bike
     memorial=obelisk: DE:Tag:memorial=obelisk
     memorial=plaque: DE:Tag:memorial=plaque
     memorial:type=stolperstein: DE:Tag:memorial:type=stolperstein
     memorial=bust: DE:Tag:memorial=bust
     memorial=ghost_bike: DE:Tag:memorial=ghost bike
     memorial=obelisk: DE:Tag:memorial=obelisk
     memorial=plaque: DE:Tag:memorial=plaque
+    memorial=sculpture: DE:Tag:memorial=sculpture
     memorial=statue: DE:Tag:memorial=statue
     memorial=stele: DE:Tag:memorial=stele
     memorial=statue: DE:Tag:memorial=statue
     memorial=stele: DE:Tag:memorial=stele
+    memorial=stolperstein: DE:Tag:memorial=stolperstein
     memorial=stone: DE:Tag:memorial=stone
     memorial=war_memorial: DE:Tag:memorial=war memorial
     microbrewery=yes: DE:Tag:microbrewery=yes
     military=airfield: DE:Tag:military=airfield
     military=barracks: DE:Tag:military=barracks
     memorial=stone: DE:Tag:memorial=stone
     memorial=war_memorial: DE:Tag:memorial=war memorial
     microbrewery=yes: DE:Tag:microbrewery=yes
     military=airfield: DE:Tag:military=airfield
     military=barracks: DE:Tag:military=barracks
+    military=base: DE:Tag:military=base
     military=bunker: DE:Tag:military=bunker
     military=bunker: DE:Tag:military=bunker
+    military=checkpoint: DE:Tag:military=checkpoint
     military=danger_area: DE:Tag:military=danger area
     military=naval_base: DE:Tag:military=naval base
     military=nuclear_explosion_site: DE:Tag:military=nuclear explosion site
     military=danger_area: DE:Tag:military=danger area
     military=naval_base: DE:Tag:military=naval base
     military=nuclear_explosion_site: DE:Tag:military=nuclear explosion site
+    military=obstacle_course: DE:Tag:military=obstacle course
     military=range: DE:Tag:military=range
     military=training_area: DE:Tag:military=training area
     military=range: DE:Tag:military=range
     military=training_area: DE:Tag:military=training area
+    military=trench: DE:Tag:military=trench
+    mooring=cruise: DE:Tag:mooring=cruise
+    mooring=guest: DE:Tag:mooring=guest
     motorcycle:type=scooter: DE:Tag:motorcycle:type=scooter
     motorcycle:type=scooter: DE:Tag:motorcycle:type=scooter
+    mountain_pass=yes: DE:Tag:mountain pass=yes
     museum=archaeological: DE:Tag:museum=archaeological
     museum=children: DE:Tag:museum=children
     museum=history: DE:Tag:museum=history
     museum=archaeological: DE:Tag:museum=archaeological
     museum=children: DE:Tag:museum=children
     museum=history: DE:Tag:museum=history
@@ -3869,6 +4431,7 @@ de:
     natural=bare_rock: DE:Tag:natural=bare rock
     natural=bay: DE:Tag:natural=bay
     natural=beach: DE:Tag:natural=beach
     natural=bare_rock: DE:Tag:natural=bare rock
     natural=bay: DE:Tag:natural=bay
     natural=beach: DE:Tag:natural=beach
+    natural=blowhole: DE:Tag:natural=blowhole
     natural=cape: DE:Tag:natural=cape
     natural=cave_entrance: DE:Tag:natural=cave entrance
     natural=cliff: DE:Tag:natural=cliff
     natural=cape: DE:Tag:natural=cape
     natural=cave_entrance: DE:Tag:natural=cave entrance
     natural=cliff: DE:Tag:natural=cliff
@@ -3906,6 +4469,8 @@ de:
     natural=tree: DE:Tag:natural=tree
     natural=tree_group: DE:Tag:natural=tree group
     natural=tree_row: DE:Tag:natural=tree row
     natural=tree: DE:Tag:natural=tree
     natural=tree_group: DE:Tag:natural=tree group
     natural=tree_row: DE:Tag:natural=tree row
+    natural=tree_stump: DE:Tag:natural=tree stump
+    natural=tundra: DE:Tag:natural=tundra
     natural=valley: DE:Tag:natural=valley
     natural=volcano: DE:Tag:natural=volcano
     natural=water: DE:Tag:natural=water
     natural=valley: DE:Tag:natural=valley
     natural=volcano: DE:Tag:natural=volcano
     natural=water: DE:Tag:natural=water
@@ -3928,6 +4493,7 @@ de:
     network=rhn: DE:Tag:network=rhn
     network=rwn: DE:Tag:network=rwn
     network=stadtradhamburg: DE:Tag:network=stadtradhamburg
     network=rhn: DE:Tag:network=rhn
     network=rwn: DE:Tag:network=rwn
     network=stadtradhamburg: DE:Tag:network=stadtradhamburg
+    noexit=yes: DE:Tag:noexit=yes
     observatory:type=astronomical: DE:Tag:observatory:type=astronomical
     observatory:type=gravitational: DE:Tag:observatory:type=gravitational
     office=accountant: DE:Tag:office=accountant
     observatory:type=astronomical: DE:Tag:observatory:type=astronomical
     observatory:type=gravitational: DE:Tag:observatory:type=gravitational
     office=accountant: DE:Tag:office=accountant
@@ -3939,35 +4505,51 @@ de:
     office=chamber: DE:Tag:office=chamber
     office=charity: DE:Tag:office=charity
     office=company: DE:Tag:office=company
     office=chamber: DE:Tag:office=chamber
     office=charity: DE:Tag:office=charity
     office=company: DE:Tag:office=company
+    office=consulting: DE:Tag:office=consulting
+    office=cooperative: DE:Tag:office=cooperative
     office=diplomatic: DE:Tag:office=diplomatic
     office=educational_institution: DE:Tag:office=educational institution
     office=employment_agency: DE:Tag:office=employment agency
     office=energy_supplier: DE:Tag:office=energy supplier
     office=engineer: DE:Tag:office=engineer
     office=estate_agent: DE:Tag:office=estate agent
     office=diplomatic: DE:Tag:office=diplomatic
     office=educational_institution: DE:Tag:office=educational institution
     office=employment_agency: DE:Tag:office=employment agency
     office=energy_supplier: DE:Tag:office=energy supplier
     office=engineer: DE:Tag:office=engineer
     office=estate_agent: DE:Tag:office=estate agent
+    office=financial: DE:Tag:office=financial
+    office=financial_advisor: DE:Tag:office=financial advisor
     office=forestry: DE:Tag:office=forestry
     office=forestry: DE:Tag:office=forestry
+    office=foundation: DE:Tag:office=foundation
     office=geodesist: DE:Tag:office=geodesist
     office=government: DE:Tag:office=government
     office=graphic_design: DE:Tag:office=graphic design
     office=guide: DE:Tag:office=guide
     office=insurance: DE:Tag:office=insurance
     office=lawyer: DE:Tag:office=lawyer
     office=geodesist: DE:Tag:office=geodesist
     office=government: DE:Tag:office=government
     office=graphic_design: DE:Tag:office=graphic design
     office=guide: DE:Tag:office=guide
     office=insurance: DE:Tag:office=insurance
     office=lawyer: DE:Tag:office=lawyer
+    office=logistics: DE:Tag:office=logistics
     office=moving_company: DE:Tag:office=moving company
     office=newspaper: DE:Tag:office=newspaper
     office=ngo: DE:Tag:office=ngo
     office=moving_company: DE:Tag:office=moving company
     office=newspaper: DE:Tag:office=newspaper
     office=ngo: DE:Tag:office=ngo
+    office=notary: DE:Tag:office=notary
     office=parish: DE:Tag:office=parish
     office=parish: DE:Tag:office=parish
+    office=physician: DE:Tag:office=physician
     office=political_party: DE:Tag:office=political party
     office=political_party: DE:Tag:office=political party
+    office=property_management: DE:Tag:office=property management
+    office=quango: DE:Tag:office=quango
     office=religion: DE:Tag:office=religion
     office=research: DE:Tag:office=research
     office=religion: DE:Tag:office=religion
     office=research: DE:Tag:office=research
+    office=security: DE:Tag:office=security
     office=surveyor: DE:Tag:office=surveyor
     office=tax_advisor: DE:Tag:office=tax advisor
     office=telecommunication: DE:Tag:office=telecommunication
     office=therapist: DE:Tag:office=therapist
     office=surveyor: DE:Tag:office=surveyor
     office=tax_advisor: DE:Tag:office=tax advisor
     office=telecommunication: DE:Tag:office=telecommunication
     office=therapist: DE:Tag:office=therapist
+    office=translator: DE:Tag:office=translator
     office=travel_agent: DE:Tag:office=travel agent
     office=travel_agent: DE:Tag:office=travel agent
+    office=tutoring: DE:Tag:office=tutoring
+    office=union: DE:Tag:office=union
+    office=visa: DE:Tag:office=visa
     office=water_utility: DE:Tag:office=water utility
     oneway=-1: DE:Tag:oneway=-1
     oneway=alternating: DE:Tag:oneway=alternating
     oneway=reversible: DE:Tag:oneway=reversible
     office=water_utility: DE:Tag:office=water utility
     oneway=-1: DE:Tag:oneway=-1
     oneway=alternating: DE:Tag:oneway=alternating
     oneway=reversible: DE:Tag:oneway=reversible
+    oneway=yes: DE:Tag:oneway=yes
     operator=Cambio: DE:Tag:operator=Cambio
     operator=CiteeCar: DE:Tag:operator=CiteeCar
     operator=Drive_Carsharing: DE:Tag:operator=Drive Carsharing
     operator=Cambio: DE:Tag:operator=Cambio
     operator=CiteeCar: DE:Tag:operator=CiteeCar
     operator=Drive_Carsharing: DE:Tag:operator=Drive Carsharing
@@ -3977,15 +4559,21 @@ de:
     operator=cambio: DE:Tag:operator=cambio
     operator=stadtmobil: DE:Tag:operator=stadtmobil
     operator=teilAuto: DE:Tag:operator=teilAuto
     operator=cambio: DE:Tag:operator=cambio
     operator=stadtmobil: DE:Tag:operator=stadtmobil
     operator=teilAuto: DE:Tag:operator=teilAuto
-    park_ride: DE:Tag:park ride
+    orchard=meadow_orchard: DE:Tag:orchard=meadow orchard
+    park_ride=hov: DE:Tag:park ride=hov
     parking:lane:hgv=on_street: DE:Tag:parking:lane:hgv=on street
     parking:lane:hgv=on_street: DE:Tag:parking:lane:hgv=on street
+    parking=lane: DE:Tag:parking=lane
     parking=multi-storey: DE:Tag:parking=multi-storey
     parking=street_side: DE:Tag:parking=street side
     parking=multi-storey: DE:Tag:parking=multi-storey
     parking=street_side: DE:Tag:parking=street side
+    parking=surface: DE:Tag:parking=surface
     parking=underground: DE:Tag:parking=underground
     pipeline=marker: DE:Tag:pipeline=marker
     pipeline=substation: DE:Tag:pipeline=substation
     parking=underground: DE:Tag:parking=underground
     pipeline=marker: DE:Tag:pipeline=marker
     pipeline=substation: DE:Tag:pipeline=substation
+    pipeline=surge_tank: DE:Tag:pipeline=surge tank
     pipeline=valve: DE:Tag:pipeline=valve
     pipeline=valve: DE:Tag:pipeline=valve
+    piste:type=downhill: DE:Tag:piste:type=downhill
     piste:type=nordic: DE:Tag:piste:type=nordic
     piste:type=nordic: DE:Tag:piste:type=nordic
+    piste:type=sled: DE:Tag:piste:type=sled
     place=archipelago: DE:Tag:place=archipelago
     place=city: DE:Tag:place=city
     place=city_block: DE:Tag:place=city block
     place=archipelago: DE:Tag:place=archipelago
     place=city: DE:Tag:place=city
     place=city_block: DE:Tag:place=city block
@@ -4008,7 +4596,13 @@ de:
     place=town: DE:Tag:place=town
     place=village: DE:Tag:place=village
     placement=transition: DE:Tag:placement=transition
     place=town: DE:Tag:place=town
     place=village: DE:Tag:place=village
     placement=transition: DE:Tag:placement=transition
+    plant:method=anaerobic_digestion: DE:Tag:plant:method=anaerobic digestion
+    plant:method=gasification: DE:Tag:plant:method=gasification
+    plant:method=run-of-the-river: DE:Tag:plant:method=run-of-the-river
+    plant:method=thermal: DE:Tag:plant:method=thermal
+    plant:method=water-pumped-storage: DE:Tag:plant:method=water-pumped-storage
     plant:method=water-storage: DE:Tag:plant:method=water-storage
     plant:method=water-storage: DE:Tag:plant:method=water-storage
+    plant:source=battery: DE:Tag:plant:source=battery
     plant:source=biomass: DE:Tag:plant:source=biomass
     plant:source=coal: DE:Tag:plant:source=coal
     plant:source=gas: DE:Tag:plant:source=gas
     plant:source=biomass: DE:Tag:plant:source=biomass
     plant:source=coal: DE:Tag:plant:source=coal
     plant:source=gas: DE:Tag:plant:source=gas
@@ -4020,6 +4614,8 @@ de:
     plant:source=wind: DE:Tag:plant:source=wind
     plant:type=combined_cycle: DE:Tag:plant:type=combined cycle
     plant:type=steam_turbine: DE:Tag:plant:type=steam turbine
     plant:source=wind: DE:Tag:plant:source=wind
     plant:type=combined_cycle: DE:Tag:plant:type=combined cycle
     plant:type=steam_turbine: DE:Tag:plant:type=steam turbine
+    playground=hopscotch: DE:Tag:playground=hopscotch
+    playground=structure: DE:Tag:playground=structure
     police=academy: DE:Tag:police=academy
     police=barracks: DE:Tag:police=barracks
     police=car_pound: DE:Tag:police=car pound
     police=academy: DE:Tag:police=academy
     police=barracks: DE:Tag:police=barracks
     police=car_pound: DE:Tag:police=car pound
@@ -4031,8 +4627,11 @@ de:
     police=storage: DE:Tag:police=storage
     police=training_area: DE:Tag:police=training area
     police=yes: DE:Tag:police=yes
     police=storage: DE:Tag:police=storage
     police=training_area: DE:Tag:police=training area
     police=yes: DE:Tag:police=yes
+    port=fishing: DE:Tag:port=fishing
     power=cable: DE:Tag:power=cable
     power=cable_distribution_cabinet: DE:Tag:power=cable distribution cabinet
     power=cable: DE:Tag:power=cable
     power=cable_distribution_cabinet: DE:Tag:power=cable distribution cabinet
+    power=catenary_mast: DE:Tag:power=catenary mast
+    power=compensator: DE:Tag:power=compensator
     power=converter: DE:Tag:power=converter
     power=generator: DE:Tag:power=generator
     power=heliostat: DE:Tag:power=heliostat
     power=converter: DE:Tag:power=converter
     power=generator: DE:Tag:power=generator
     power=heliostat: DE:Tag:power=heliostat
@@ -4059,6 +4658,7 @@ de:
     railway=abandoned: DE:Tag:railway=abandoned
     railway=buffer_stop: DE:Tag:railway=buffer stop
     railway=crossing: DE:Tag:railway=crossing
     railway=abandoned: DE:Tag:railway=abandoned
     railway=buffer_stop: DE:Tag:railway=buffer stop
     railway=crossing: DE:Tag:railway=crossing
+    railway=crossing_box: DE:Tag:railway=crossing box
     railway=derail: DE:Tag:railway=derail
     railway=disused: DE:Tag:railway=disused
     railway=funicular: DE:Tag:railway=funicular
     railway=derail: DE:Tag:railway=derail
     railway=disused: DE:Tag:railway=disused
     railway=funicular: DE:Tag:railway=funicular
@@ -4070,12 +4670,15 @@ de:
     railway=miniature: DE:Tag:railway=miniature
     railway=monorail: DE:Tag:railway=monorail
     railway=narrow_gauge: DE:Tag:railway=narrow gauge
     railway=miniature: DE:Tag:railway=miniature
     railway=monorail: DE:Tag:railway=monorail
     railway=narrow_gauge: DE:Tag:railway=narrow gauge
+    railway=owner_change: DE:Tag:railway=owner change
     railway=platform: DE:Tag:railway=platform
     railway=platform: DE:Tag:railway=platform
+    railway=platform_edge: DE:Tag:railway=platform edge
     railway=preserved: DE:Tag:railway=preserved
     railway=rail: DE:Tag:railway=rail
     railway=rail_brake: DE:Tag:railway=rail brake
     railway=railway_crossing: DE:Tag:railway=railway crossing
     railway=roundhouse: DE:Tag:railway=roundhouse
     railway=preserved: DE:Tag:railway=preserved
     railway=rail: DE:Tag:railway=rail
     railway=rail_brake: DE:Tag:railway=rail brake
     railway=railway_crossing: DE:Tag:railway=railway crossing
     railway=roundhouse: DE:Tag:railway=roundhouse
+    railway=service_station: DE:Tag:railway=service station
     railway=signal: DE:Tag:railway=signal
     railway=signal_box: DE:Tag:railway=signal box
     railway=station: DE:Tag:railway=station
     railway=signal: DE:Tag:railway=signal
     railway=signal_box: DE:Tag:railway=signal box
     railway=station: DE:Tag:railway=station
@@ -4083,7 +4686,9 @@ de:
     railway=subway: DE:Tag:railway=subway
     railway=subway_entrance: DE:Tag:railway=subway entrance
     railway=switch: DE:Tag:railway=switch
     railway=subway: DE:Tag:railway=subway
     railway=subway_entrance: DE:Tag:railway=subway entrance
     railway=switch: DE:Tag:railway=switch
+    railway=train_station_entrance: DE:Tag:railway=train station entrance
     railway=tram: DE:Tag:railway=tram
     railway=tram: DE:Tag:railway=tram
+    railway=tram_crossing: DE:Tag:railway=tram crossing
     railway=tram_level_crossing: DE:Tag:railway=tram level crossing
     railway=tram_stop: DE:Tag:railway=tram stop
     railway=traverser: DE:Tag:railway=traverser
     railway=tram_level_crossing: DE:Tag:railway=tram level crossing
     railway=tram_stop: DE:Tag:railway=tram stop
     railway=traverser: DE:Tag:railway=traverser
@@ -4093,6 +4698,7 @@ de:
     railway=yard: DE:Tag:railway=yard
     recycling_type=centre: DE:Tag:recycling type=centre
     recycling_type=container: DE:Tag:recycling type=container
     railway=yard: DE:Tag:railway=yard
     recycling_type=centre: DE:Tag:recycling type=centre
     recycling_type=container: DE:Tag:recycling type=container
+    refrigerated=yes: DE:Tag:refrigerated=yes
     religion=buddhist: DE:Tag:religion=buddhist
     religion=christian: DE:Tag:religion=christian
     religion=hindu: DE:Tag:religion=hindu
     religion=buddhist: DE:Tag:religion=buddhist
     religion=christian: DE:Tag:religion=christian
     religion=hindu: DE:Tag:religion=hindu
@@ -4102,8 +4708,17 @@ de:
     rental=ski: DE:Tag:rental=ski
     rental=strandkorb: DE:Tag:rental=strandkorb
     repair=assisted_self_service: DE:Tag:repair=assisted self service
     rental=ski: DE:Tag:rental=ski
     rental=strandkorb: DE:Tag:rental=strandkorb
     repair=assisted_self_service: DE:Tag:repair=assisted self service
+    request_stop=yes: DE:Tag:request stop=yes
+    residential=rural: DE:Tag:residential=rural
     residential=urban: DE:Tag:residential=urban
     residential=urban: DE:Tag:residential=urban
+    resource=aggregate: DE:Tag:resource=aggregate
+    road_marking=solid_stop_line: DE:Tag:road marking=solid stop line
+    roller_coaster=station: DE:Tag:roller coaster=station
     roller_coaster=track: DE:Tag:roller coaster=track
     roller_coaster=track: DE:Tag:roller coaster=track
+    roof:shape=flat: DE:Tag:roof:shape=flat
+    roof:shape=gabled: DE:Tag:roof:shape=gabled
+    roof:shape=many: DE:Tag:roof:shape=many
+    roof:shape=skillion: DE:Tag:roof:shape=skillion
     route=bicycle: DE:Tag:route=bicycle
     route=bus: DE:Tag:route=bus
     route=detour: DE:Tag:route=detour
     route=bicycle: DE:Tag:route=bicycle
     route=bus: DE:Tag:route=bus
     route=detour: DE:Tag:route=detour
@@ -4111,6 +4726,7 @@ de:
     route=fitness_trail: DE:Tag:route=fitness trail
     route=foot: DE:Tag:route=foot
     route=hiking: DE:Tag:route=hiking
     route=fitness_trail: DE:Tag:route=fitness trail
     route=foot: DE:Tag:route=foot
     route=hiking: DE:Tag:route=hiking
+    route=historic: DE:Tag:route=historic
     route=horse: DE:Tag:route=horse
     route=inline_skates: DE:Tag:route=inline skates
     route=light_rail: DE:Tag:route=light rail
     route=horse: DE:Tag:route=horse
     route=inline_skates: DE:Tag:route=inline skates
     route=light_rail: DE:Tag:route=light rail
@@ -4122,14 +4738,18 @@ de:
     route=railway: DE:Tag:route=railway
     route=road: DE:Tag:route=road
     route=running: DE:Tag:route=running
     route=railway: DE:Tag:route=railway
     route=road: DE:Tag:route=road
     route=running: DE:Tag:route=running
+    route=share_taxi: DE:Tag:route=share taxi
     route=ski: DE:Tag:route=ski
     route=subway: DE:Tag:route=subway
     route=tracks: DE:Tag:route=tracks
     route=train: DE:Tag:route=train
     route=tram: DE:Tag:route=tram
     route=trolleybus: DE:Tag:route=trolleybus
     route=ski: DE:Tag:route=ski
     route=subway: DE:Tag:route=subway
     route=tracks: DE:Tag:route=tracks
     route=train: DE:Tag:route=train
     route=tram: DE:Tag:route=tram
     route=trolleybus: DE:Tag:route=trolleybus
+    seamark:type=fairway: DE:Tag:seamark:type=fairway
     seamark:type=mooring: DE:Tag:seamark:type=mooring
     seamark:type=rock: DE:Tag:seamark:type=rock
     seamark:type=mooring: DE:Tag:seamark:type=mooring
     seamark:type=rock: DE:Tag:seamark:type=rock
+    segregated=no: DE:Tag:segregated=no
+    segregated=yes: DE:Tag:segregated=yes
     service=aircraft_control: DE:Tag:service=aircraft control
     service=alley: DE:Tag:service=alley
     service=crossover: DE:Tag:service=crossover
     service=aircraft_control: DE:Tag:service=aircraft control
     service=alley: DE:Tag:service=alley
     service=crossover: DE:Tag:service=crossover
@@ -4139,9 +4759,14 @@ de:
     service=siding: DE:Tag:service=siding
     service=spur: DE:Tag:service=spur
     service=yard: DE:Tag:service=yard
     service=siding: DE:Tag:service=siding
     service=spur: DE:Tag:service=spur
     service=yard: DE:Tag:service=yard
+    shelter_type=Wetterpilz: DE:Tag:shelter type=Wetterpilz
     shelter_type=basic_hut: DE:Tag:shelter type=basic hut
     shelter_type=basic_hut: DE:Tag:shelter type=basic hut
+    shelter_type=gazebo: DE:Tag:shelter type=gazebo
     shelter_type=lean_to: DE:Tag:shelter type=lean to
     shelter_type=lean_to: DE:Tag:shelter type=lean to
+    shelter_type=pavilion: DE:Tag:shelter type=pavilion
+    shelter_type=picnic_shelter: DE:Tag:shelter type=picnic shelter
     shelter_type=public_transport: DE:Tag:shelter type=public transport
     shelter_type=public_transport: DE:Tag:shelter type=public transport
+    shelter_type=weather_shelter: DE:Tag:shelter type=weather shelter
     shop=agrarian: DE:Tag:shop=agrarian
     shop=alcohol: DE:Tag:shop=alcohol
     shop=antiques: DE:Tag:shop=antiques
     shop=agrarian: DE:Tag:shop=agrarian
     shop=alcohol: DE:Tag:shop=alcohol
     shop=antiques: DE:Tag:shop=antiques
@@ -4159,6 +4784,7 @@ de:
     shop=bookmaker: DE:Tag:shop=bookmaker
     shop=books: DE:Tag:shop=books
     shop=boutique: DE:Tag:shop=boutique
     shop=bookmaker: DE:Tag:shop=bookmaker
     shop=books: DE:Tag:shop=books
     shop=boutique: DE:Tag:shop=boutique
+    shop=brewing_supplies: DE:Tag:shop=brewing supplies
     shop=butcher: DE:Tag:shop=butcher
     shop=camera: DE:Tag:shop=camera
     shop=candles: DE:Tag:shop=candles
     shop=butcher: DE:Tag:shop=butcher
     shop=camera: DE:Tag:shop=camera
     shop=candles: DE:Tag:shop=candles
@@ -4187,10 +4813,12 @@ de:
     shop=doityourself: DE:Tag:shop=doityourself
     shop=doors: DE:Tag:shop=doors
     shop=dry_cleaning: DE:Tag:shop=dry cleaning
     shop=doityourself: DE:Tag:shop=doityourself
     shop=doors: DE:Tag:shop=doors
     shop=dry_cleaning: DE:Tag:shop=dry cleaning
+    shop=electrical: DE:Tag:shop=electrical
     shop=electronics: DE:Tag:shop=electronics
     shop=equestrian: DE:Tag:shop=equestrian
     shop=erotic: DE:Tag:shop=erotic
     shop=fabric: DE:Tag:shop=fabric
     shop=electronics: DE:Tag:shop=electronics
     shop=equestrian: DE:Tag:shop=equestrian
     shop=erotic: DE:Tag:shop=erotic
     shop=fabric: DE:Tag:shop=fabric
+    shop=fan: DE:Tag:shop=fan
     shop=farm: DE:Tag:shop=farm
     shop=fashion: DE:Tag:shop=fashion
     shop=fashion_accessories: DE:Tag:shop=fashion accessories
     shop=farm: DE:Tag:shop=farm
     shop=fashion: DE:Tag:shop=fashion
     shop=fashion_accessories: DE:Tag:shop=fashion accessories
@@ -4202,10 +4830,12 @@ de:
     shop=frozen_food: DE:Tag:shop=frozen food
     shop=funeral_directors: DE:Tag:shop=funeral directors
     shop=furniture: DE:Tag:shop=furniture
     shop=frozen_food: DE:Tag:shop=frozen food
     shop=funeral_directors: DE:Tag:shop=funeral directors
     shop=furniture: DE:Tag:shop=furniture
+    shop=games: DE:Tag:shop=games
     shop=garden_centre: DE:Tag:shop=garden centre
     shop=gas: DE:Tag:shop=gas
     shop=general: DE:Tag:shop=general
     shop=gift: DE:Tag:shop=gift
     shop=garden_centre: DE:Tag:shop=garden centre
     shop=gas: DE:Tag:shop=gas
     shop=general: DE:Tag:shop=general
     shop=gift: DE:Tag:shop=gift
+    shop=glaziery: DE:Tag:shop=glaziery
     shop=golf: DE:Tag:shop=golf
     shop=greengrocer: DE:Tag:shop=greengrocer
     shop=grocery: DE:Tag:shop=grocery
     shop=golf: DE:Tag:shop=golf
     shop=greengrocer: DE:Tag:shop=greengrocer
     shop=grocery: DE:Tag:shop=grocery
@@ -4248,15 +4878,20 @@ de:
     shop=outpost: DE:Tag:shop=outpost
     shop=paint: DE:Tag:shop=paint
     shop=party: DE:Tag:shop=party
     shop=outpost: DE:Tag:shop=outpost
     shop=paint: DE:Tag:shop=paint
     shop=party: DE:Tag:shop=party
+    shop=pasta: DE:Tag:shop=pasta
     shop=pastry: DE:Tag:shop=pastry
     shop=pawnbroker: DE:Tag:shop=pawnbroker
     shop=perfumery: DE:Tag:shop=perfumery
     shop=pastry: DE:Tag:shop=pastry
     shop=pawnbroker: DE:Tag:shop=pawnbroker
     shop=perfumery: DE:Tag:shop=perfumery
+    shop=pest_control: DE:Tag:shop=pest control
     shop=pet: DE:Tag:shop=pet
     shop=pet_grooming: DE:Tag:shop=pet grooming
     shop=photo: DE:Tag:shop=photo
     shop=pet: DE:Tag:shop=pet
     shop=pet_grooming: DE:Tag:shop=pet grooming
     shop=photo: DE:Tag:shop=photo
+    shop=plant_hire: DE:Tag:shop=plant hire
     shop=pottery: DE:Tag:shop=pottery
     shop=pottery: DE:Tag:shop=pottery
+    shop=power_tools: DE:Tag:shop=power tools
     shop=radiotechnics: DE:Tag:shop=radiotechnics
     shop=religion: DE:Tag:shop=religion
     shop=radiotechnics: DE:Tag:shop=radiotechnics
     shop=religion: DE:Tag:shop=religion
+    shop=repair: DE:Tag:shop=repair
     shop=robot: DE:Tag:shop=robot
     shop=scuba_diving: DE:Tag:shop=scuba diving
     shop=seafood: DE:Tag:shop=seafood
     shop=robot: DE:Tag:shop=robot
     shop=scuba_diving: DE:Tag:shop=scuba diving
     shop=seafood: DE:Tag:shop=seafood
@@ -4277,6 +4912,7 @@ de:
     shop=ticket: DE:Tag:shop=ticket
     shop=tiles: DE:Tag:shop=tiles
     shop=tobacco: DE:Tag:shop=tobacco
     shop=ticket: DE:Tag:shop=ticket
     shop=tiles: DE:Tag:shop=tiles
     shop=tobacco: DE:Tag:shop=tobacco
+    shop=tool_hire: DE:Tag:shop=tool hire
     shop=toys: DE:Tag:shop=toys
     shop=trade: DE:Tag:shop=trade
     shop=travel_agency: DE:Tag:shop=travel agency
     shop=toys: DE:Tag:shop=toys
     shop=trade: DE:Tag:shop=trade
     shop=travel_agency: DE:Tag:shop=travel agency
@@ -4288,12 +4924,16 @@ de:
     shop=video: DE:Tag:shop=video
     shop=video_games: DE:Tag:shop=video games
     shop=watches: DE:Tag:shop=watches
     shop=video: DE:Tag:shop=video
     shop=video_games: DE:Tag:shop=video games
     shop=watches: DE:Tag:shop=watches
+    shop=water: DE:Tag:shop=water
     shop=weapons: DE:Tag:shop=weapons
     shop=wholesale: DE:Tag:shop=wholesale
     shop=wigs: DE:Tag:shop=wigs
     shop=window_blind: DE:Tag:shop=window blind
     shop=weapons: DE:Tag:shop=weapons
     shop=wholesale: DE:Tag:shop=wholesale
     shop=wigs: DE:Tag:shop=wigs
     shop=window_blind: DE:Tag:shop=window blind
+    shop=windows: DE:Tag:shop=windows
     shop=wine: DE:Tag:shop=wine
     shop=wool: DE:Tag:shop=wool
     shop=wine: DE:Tag:shop=wine
     shop=wool: DE:Tag:shop=wool
+    sidewalk=separate: DE:Tag:sidewalk=separate
+    site_type=baths: DE:Tag:site type=baths
     site_type=bigstone: DE:Tag:site type=bigstone
     site_type=fortification: DE:Tag:site type=fortification
     site_type=hut_circle: DE:Tag:site type=hut circle
     site_type=bigstone: DE:Tag:site type=bigstone
     site_type=fortification: DE:Tag:site type=fortification
     site_type=hut_circle: DE:Tag:site type=hut circle
@@ -4306,11 +4946,14 @@ de:
     site_type=tumulus: DE:Tag:site type=tumulus
     social_facility=ambulatory_care: DE:Tag:social facility=ambulatory care
     social_facility=assisted_living: DE:Tag:social facility=assisted living
     site_type=tumulus: DE:Tag:site type=tumulus
     social_facility=ambulatory_care: DE:Tag:social facility=ambulatory care
     social_facility=assisted_living: DE:Tag:social facility=assisted living
+    social_facility=clothing_bank: DE:Tag:social facility=clothing bank
     social_facility=day_care: DE:Tag:social facility=day care
     social_facility=food_bank: DE:Tag:social facility=food bank
     social_facility=group_home: DE:Tag:social facility=group home
     social_facility=hospice: DE:Tag:social facility=hospice
     social_facility=nursing_home: DE:Tag:social facility=nursing home
     social_facility=day_care: DE:Tag:social facility=day care
     social_facility=food_bank: DE:Tag:social facility=food bank
     social_facility=group_home: DE:Tag:social facility=group home
     social_facility=hospice: DE:Tag:social facility=hospice
     social_facility=nursing_home: DE:Tag:social facility=nursing home
+    social_facility=outreach: DE:Tag:social facility=outreach
+    social_facility=shelter: DE:Tag:social facility=shelter
     social_facility=soup_kitchen: DE:Tag:social facility=soup kitchen
     social_facility=workshop: DE:Tag:social facility=workshop
     source=HiRes_aerial_imagery: DE:Tag:source=HiRes aerial imagery
     social_facility=soup_kitchen: DE:Tag:social facility=soup kitchen
     social_facility=workshop: DE:Tag:social facility=workshop
     source=HiRes_aerial_imagery: DE:Tag:source=HiRes aerial imagery
@@ -4328,6 +4971,7 @@ de:
     sport=bobsleigh: DE:Tag:sport=bobsleigh
     sport=boules: DE:Tag:sport=boules
     sport=bowls: DE:Tag:sport=bowls
     sport=bobsleigh: DE:Tag:sport=bobsleigh
     sport=boules: DE:Tag:sport=boules
     sport=bowls: DE:Tag:sport=bowls
+    sport=boxing: DE:Tag:sport=boxing
     sport=canoe: DE:Tag:sport=canoe
     sport=chess: DE:Tag:sport=chess
     sport=cliff_diving: DE:Tag:sport=cliff diving
     sport=canoe: DE:Tag:sport=canoe
     sport=chess: DE:Tag:sport=chess
     sport=cliff_diving: DE:Tag:sport=cliff diving
@@ -4341,6 +4985,8 @@ de:
     sport=dog_racing: DE:Tag:sport=dog racing
     sport=equestrian: DE:Tag:sport=equestrian
     sport=fencing: DE:Tag:sport=fencing
     sport=dog_racing: DE:Tag:sport=dog racing
     sport=equestrian: DE:Tag:sport=equestrian
     sport=fencing: DE:Tag:sport=fencing
+    sport=field_hockey: DE:Tag:sport=field hockey
+    sport=fitness: DE:Tag:sport=fitness
     sport=free_flying: DE:Tag:sport=free flying
     sport=futsal: DE:Tag:sport=futsal
     sport=golf: DE:Tag:sport=golf
     sport=free_flying: DE:Tag:sport=free flying
     sport=futsal: DE:Tag:sport=futsal
     sport=golf: DE:Tag:sport=golf
@@ -4356,6 +5002,7 @@ de:
     sport=motocross: DE:Tag:sport=motocross
     sport=motor: DE:Tag:sport=motor
     sport=multi: DE:Tag:sport=multi
     sport=motocross: DE:Tag:sport=motocross
     sport=motor: DE:Tag:sport=motor
     sport=multi: DE:Tag:sport=multi
+    sport=netball: DE:Tag:sport=netball
     sport=nine_mens_morris: DE:Tag:sport=nine mens morris
     sport=orienteering: DE:Tag:sport=orienteering
     sport=pelota: DE:Tag:sport=pelota
     sport=nine_mens_morris: DE:Tag:sport=nine mens morris
     sport=orienteering: DE:Tag:sport=orienteering
     sport=pelota: DE:Tag:sport=pelota
@@ -4365,6 +5012,7 @@ de:
     sport=sailing: DE:Tag:sport=sailing
     sport=scuba_diving: DE:Tag:sport=scuba diving
     sport=shooting: DE:Tag:sport=shooting
     sport=sailing: DE:Tag:sport=sailing
     sport=scuba_diving: DE:Tag:sport=scuba diving
     sport=shooting: DE:Tag:sport=shooting
+    sport=shot-put: DE:Tag:sport=shot-put
     sport=skateboard: DE:Tag:sport=skateboard
     sport=soccer: DE:Tag:sport=soccer
     sport=swimming: DE:Tag:sport=swimming
     sport=skateboard: DE:Tag:sport=skateboard
     sport=soccer: DE:Tag:sport=soccer
     sport=swimming: DE:Tag:sport=swimming
@@ -4373,26 +5021,46 @@ de:
     sport=tennis: DE:Tag:sport=tennis
     sport=toboggan: DE:Tag:sport=toboggan
     sport=trampoline: DE:Tag:sport=trampoline
     sport=tennis: DE:Tag:sport=tennis
     sport=toboggan: DE:Tag:sport=toboggan
     sport=trampoline: DE:Tag:sport=trampoline
+    sport=ultralight_aviation: DE:Tag:sport=ultralight aviation
     sport=volleyball: DE:Tag:sport=volleyball
     sport=volleyball: DE:Tag:sport=volleyball
+    sport=water_ski: DE:Tag:sport=water ski
+    sport=yoga: DE:Tag:sport=yoga
     station=light_rail: DE:Tag:station=light rail
     station=subway: DE:Tag:station=subway
     station=light_rail: DE:Tag:station=light rail
     station=subway: DE:Tag:station=subway
+    studio=audio: DE:Tag:studio=audio
+    studio=radio: DE:Tag:studio=radio
+    studio=video: DE:Tag:studio=video
+    substance=CNG: DE:Tag:substance=CNG
+    substance=LNG: DE:Tag:substance=LNG
+    substance=gas: DE:Tag:substance=gas
+    substance=hot_water: DE:Tag:substance=hot water
+    substance=oil: DE:Tag:substance=oil
     substation=converter: DE:Tag:substation=converter
     substation=distribution: DE:Tag:substation=distribution
     substation=converter: DE:Tag:substation=converter
     substation=distribution: DE:Tag:substation=distribution
+    substation=generation: DE:Tag:substation=generation
     substation=minor_distribution: DE:Tag:substation=minor distribution
     substation=traction: DE:Tag:substation=traction
     substation=transmission: DE:Tag:substation=transmission
     summit:cross=yes: DE:Tag:summit:cross=yes
     surface=artificial_turf: DE:Tag:surface=artificial turf
     surface=asphalt: DE:Tag:surface=asphalt
     substation=minor_distribution: DE:Tag:substation=minor distribution
     substation=traction: DE:Tag:substation=traction
     substation=transmission: DE:Tag:substation=transmission
     summit:cross=yes: DE:Tag:summit:cross=yes
     surface=artificial_turf: DE:Tag:surface=artificial turf
     surface=asphalt: DE:Tag:surface=asphalt
+    surface=chipseal: DE:Tag:surface=chipseal
     surface=clay: DE:Tag:surface=clay
     surface=cobblestone: DE:Tag:surface=cobblestone
     surface=clay: DE:Tag:surface=clay
     surface=cobblestone: DE:Tag:surface=cobblestone
+    surface=compacted: DE:Tag:surface=compacted
     surface=concrete: DE:Tag:surface=concrete
     surface=concrete:lanes: DE:Tag:surface=concrete:lanes
     surface=concrete: DE:Tag:surface=concrete
     surface=concrete:lanes: DE:Tag:surface=concrete:lanes
+    surface=concrete:plates: DE:Tag:surface=concrete:plates
+    surface=fine_gravel: DE:Tag:surface=fine gravel
+    surface=gravel: DE:Tag:surface=gravel
+    surface=ground: DE:Tag:surface=ground
+    surface=paved: DE:Tag:surface=paved
     surface=paving_stones: DE:Tag:surface=paving stones
     surface=sett: DE:Tag:surface=sett
     surface=tartan: DE:Tag:surface=tartan
     surface=unhewn_cobblestone: DE:Tag:surface=unhewn cobblestone
     surface=unpaved: DE:Tag:surface=unpaved
     surface=paving_stones: DE:Tag:surface=paving stones
     surface=sett: DE:Tag:surface=sett
     surface=tartan: DE:Tag:surface=tartan
     surface=unhewn_cobblestone: DE:Tag:surface=unhewn cobblestone
     surface=unpaved: DE:Tag:surface=unpaved
+    swimming_pool=yes: DE:Tag:swimming pool=yes
     switch=circuit_breaker: DE:Tag:switch=circuit breaker
     switch=disconnector: DE:Tag:switch=disconnector
     switch=mechanical: DE:Tag:switch=mechanical
     switch=circuit_breaker: DE:Tag:switch=circuit breaker
     switch=disconnector: DE:Tag:switch=disconnector
     switch=mechanical: DE:Tag:switch=mechanical
@@ -4400,10 +5068,19 @@ de:
     telescope:type=optical: DE:Tag:telescope:type=optical
     telescope:type=radio: DE:Tag:telescope:type=radio
     theatre:type=amphi: DE:Tag:theatre:type=amphi
     telescope:type=optical: DE:Tag:telescope:type=optical
     telescope:type=radio: DE:Tag:telescope:type=radio
     theatre:type=amphi: DE:Tag:theatre:type=amphi
+    theatre:type=concert_hall: DE:Tag:theatre:type=concert hall
     theatre:type=open_air: DE:Tag:theatre:type=open air
     tomb=cenotaph: DE:Tag:tomb=cenotaph
     theatre:type=open_air: DE:Tag:theatre:type=open air
     tomb=cenotaph: DE:Tag:tomb=cenotaph
+    tomb=columbarium: DE:Tag:tomb=columbarium
+    tomb=crypt: DE:Tag:tomb=crypt
+    tomb=hypogeum: DE:Tag:tomb=hypogeum
     tomb=mausoleum: DE:Tag:tomb=mausoleum
     tomb=mausoleum: DE:Tag:tomb=mausoleum
+    tomb=pyramid: DE:Tag:tomb=pyramid
+    tomb=rock-cut: DE:Tag:tomb=rock-cut
+    tomb=sarcophagus: DE:Tag:tomb=sarcophagus
+    tomb=table: DE:Tag:tomb=table
     tomb=tumulus: DE:Tag:tomb=tumulus
     tomb=tumulus: DE:Tag:tomb=tumulus
+    tomb=vault: DE:Tag:tomb=vault
     tomb=war_grave: DE:Tag:tomb=war grave
     tourism=alpine_hut: DE:Tag:tourism=alpine hut
     tourism=apartment: DE:Tag:tourism=apartment
     tomb=war_grave: DE:Tag:tomb=war grave
     tourism=alpine_hut: DE:Tag:tourism=alpine hut
     tourism=apartment: DE:Tag:tourism=apartment
@@ -4422,10 +5099,12 @@ de:
     tourism=museum: DE:Tag:tourism=museum
     tourism=picnic_site: DE:Tag:tourism=picnic site
     tourism=theme_park: DE:Tag:tourism=theme park
     tourism=museum: DE:Tag:tourism=museum
     tourism=picnic_site: DE:Tag:tourism=picnic site
     tourism=theme_park: DE:Tag:tourism=theme park
+    tourism=trail_riding_rest: DE:Tag:tourism=trail riding rest
     tourism=trail_riding_station: DE:Tag:tourism=trail riding station
     tourism=viewpoint: DE:Tag:tourism=viewpoint
     tourism=wilderness_hut: DE:Tag:tourism=wilderness hut
     tourism=wine_cellar: DE:Tag:tourism=wine cellar
     tourism=trail_riding_station: DE:Tag:tourism=trail riding station
     tourism=viewpoint: DE:Tag:tourism=viewpoint
     tourism=wilderness_hut: DE:Tag:tourism=wilderness hut
     tourism=wine_cellar: DE:Tag:tourism=wine cellar
+    tourism=yes: DE:Tag:tourism=yes
     tourism=zoo: DE:Tag:tourism=zoo
     tower:construction=dish: DE:Tag:tower:construction=dish
     tower:construction=dome: DE:Tag:tower:construction=dome
     tourism=zoo: DE:Tag:tourism=zoo
     tower:construction=dish: DE:Tag:tower:construction=dish
     tower:construction=dome: DE:Tag:tower:construction=dome
@@ -4438,6 +5117,7 @@ de:
     tower:type=communication: DE:Tag:tower:type=communication
     tower:type=cooling: DE:Tag:tower:type=cooling
     tower:type=defensive: DE:Tag:tower:type=defensive
     tower:type=communication: DE:Tag:tower:type=communication
     tower:type=cooling: DE:Tag:tower:type=cooling
     tower:type=defensive: DE:Tag:tower:type=defensive
+    tower:type=diving: DE:Tag:tower:type=diving
     tower:type=donjon: DE:Tag:tower:type=donjon
     tower:type=hose: DE:Tag:tower:type=hose
     tower:type=intake: DE:Tag:tower:type=intake
     tower:type=donjon: DE:Tag:tower:type=donjon
     tower:type=hose: DE:Tag:tower:type=hose
     tower:type=intake: DE:Tag:tower:type=intake
@@ -4448,17 +5128,33 @@ de:
     tower:type=radar: DE:Tag:tower:type=radar
     tower:type=siren: DE:Tag:tower:type=siren
     tower:type=watchtower: DE:Tag:tower:type=watchtower
     tower:type=radar: DE:Tag:tower:type=radar
     tower:type=siren: DE:Tag:tower:type=siren
     tower:type=watchtower: DE:Tag:tower:type=watchtower
+    traffic_calming=bump: DE:Tag:traffic calming=bump
+    traffic_calming=chicane: DE:Tag:traffic calming=chicane
+    traffic_calming=choked_island: DE:Tag:traffic calming=choked island
+    traffic_calming=choked_table: DE:Tag:traffic calming=choked table
+    traffic_calming=choker: DE:Tag:traffic calming=choker
+    traffic_calming=cushion: DE:Tag:traffic calming=cushion
+    traffic_calming=dip: DE:Tag:traffic calming=dip
+    traffic_calming=double_dip: DE:Tag:traffic calming=double dip
     traffic_calming=dynamic_bump: DE:Tag:traffic calming=dynamic bump
     traffic_calming=dynamic_bump: DE:Tag:traffic calming=dynamic bump
+    traffic_calming=hump: DE:Tag:traffic calming=hump
     traffic_calming=island: DE:Tag:traffic calming=island
     traffic_calming=island: DE:Tag:traffic calming=island
+    traffic_calming=mini_bumps: DE:Tag:traffic calming=mini bumps
+    traffic_calming=rumble_strip: DE:Tag:traffic calming=rumble strip
     traffic_calming=table: DE:Tag:traffic calming=table
     traffic_calming=table: DE:Tag:traffic calming=table
+    traffic_calming=yes: DE:Tag:traffic calming=yes
     'traffic_sign=DE:': 'DE:Tag:traffic sign=DE:'
     traffic_sign=DE:1022-10: DE:Tag:traffic sign=DE:1022-10
     'traffic_sign=DE:': 'DE:Tag:traffic sign=DE:'
     traffic_sign=DE:1022-10: DE:Tag:traffic sign=DE:1022-10
+    traffic_sign=DE:103-10: DE:Tag:traffic sign=DE:103-10
+    traffic_sign=DE:103-20: DE:Tag:traffic sign=DE:103-20
     traffic_sign=DE:124: DE:Tag:traffic sign=DE:124
     traffic_sign=DE:124: DE:Tag:traffic sign=DE:124
+    traffic_sign=DE:133-10: DE:Tag:traffic sign=DE:133-10
     traffic_sign=DE:136-10: DE:Tag:traffic sign=DE:136-10
     traffic_sign=DE:142-10: DE:Tag:traffic sign=DE:142-10
     traffic_sign=DE:142.10: DE:Tag:traffic sign=DE:142.10
     traffic_sign=DE:205: DE:Tag:traffic sign=DE:205
     traffic_sign=DE:206: DE:Tag:traffic sign=DE:206
     traffic_sign=DE:136-10: DE:Tag:traffic sign=DE:136-10
     traffic_sign=DE:142-10: DE:Tag:traffic sign=DE:142-10
     traffic_sign=DE:142.10: DE:Tag:traffic sign=DE:142.10
     traffic_sign=DE:205: DE:Tag:traffic sign=DE:205
     traffic_sign=DE:206: DE:Tag:traffic sign=DE:206
+    traffic_sign=DE:208: DE:Tag:traffic sign=DE:208
     traffic_sign=DE:220-10: DE:Tag:traffic sign=DE:220-10
     traffic_sign=DE:220-20: DE:Tag:traffic sign=DE:220-20
     traffic_sign=DE:224: DE:Tag:traffic sign=DE:224
     traffic_sign=DE:220-10: DE:Tag:traffic sign=DE:220-10
     traffic_sign=DE:220-20: DE:Tag:traffic sign=DE:220-20
     traffic_sign=DE:224: DE:Tag:traffic sign=DE:224
@@ -4484,6 +5180,7 @@ de:
     traffic_sign=DE:261: DE:Tag:traffic sign=DE:261
     traffic_sign=DE:267: DE:Tag:traffic sign=DE:267
     traffic_sign=DE:269: DE:Tag:traffic sign=DE:269
     traffic_sign=DE:261: DE:Tag:traffic sign=DE:261
     traffic_sign=DE:267: DE:Tag:traffic sign=DE:267
     traffic_sign=DE:269: DE:Tag:traffic sign=DE:269
+    traffic_sign=DE:272: DE:Tag:traffic sign=DE:272
     traffic_sign=DE:274-10: DE:Tag:traffic sign=DE:274-10
     traffic_sign=DE:274-100: DE:Tag:traffic sign=DE:274-100
     traffic_sign=DE:274-120: DE:Tag:traffic sign=DE:274-120
     traffic_sign=DE:274-10: DE:Tag:traffic sign=DE:274-10
     traffic_sign=DE:274-100: DE:Tag:traffic sign=DE:274-100
     traffic_sign=DE:274-120: DE:Tag:traffic sign=DE:274-120
@@ -4499,8 +5196,11 @@ de:
     traffic_sign=DE:274.1-20: DE:Tag:traffic sign=DE:274.1-20
     traffic_sign=DE:274.2: DE:Tag:traffic sign=DE:274.2
     traffic_sign=DE:274.2-20: DE:Tag:traffic sign=DE:274.2-20
     traffic_sign=DE:274.1-20: DE:Tag:traffic sign=DE:274.1-20
     traffic_sign=DE:274.2: DE:Tag:traffic sign=DE:274.2
     traffic_sign=DE:274.2-20: DE:Tag:traffic sign=DE:274.2-20
+    traffic_sign=DE:276: DE:Tag:traffic sign=DE:276
+    traffic_sign=DE:277: DE:Tag:traffic sign=DE:277
     traffic_sign=DE:282: DE:Tag:traffic sign=DE:282
     traffic_sign=DE:306: DE:Tag:traffic sign=DE:306
     traffic_sign=DE:282: DE:Tag:traffic sign=DE:282
     traffic_sign=DE:306: DE:Tag:traffic sign=DE:306
+    traffic_sign=DE:308: DE:Tag:traffic sign=DE:308
     traffic_sign=DE:310: DE:Tag:traffic sign=DE:310
     traffic_sign=DE:325: DE:Tag:traffic sign=DE:325
     traffic_sign=DE:325.1: DE:Tag:traffic sign=DE:325.1
     traffic_sign=DE:310: DE:Tag:traffic sign=DE:310
     traffic_sign=DE:325: DE:Tag:traffic sign=DE:325
     traffic_sign=DE:325.1: DE:Tag:traffic sign=DE:325.1
@@ -4516,6 +5216,8 @@ de:
     traffic_sign=DE:354: DE:Tag:traffic sign=DE:354
     traffic_sign=DE:357: DE:Tag:traffic sign=DE:357
     traffic_sign=DE:385: DE:Tag:traffic sign=DE:385
     traffic_sign=DE:354: DE:Tag:traffic sign=DE:354
     traffic_sign=DE:357: DE:Tag:traffic sign=DE:357
     traffic_sign=DE:385: DE:Tag:traffic sign=DE:385
+    traffic_sign=DE:386: DE:Tag:traffic sign=DE:386
+    traffic_sign=DE:386.1: DE:Tag:traffic sign=DE:386.1
     traffic_sign=DE:386.3: DE:Tag:traffic sign=DE:386.3
     traffic_sign=DE:394-50: DE:Tag:traffic sign=DE:394-50
     traffic_sign=DE:437: DE:Tag:traffic sign=DE:437
     traffic_sign=DE:386.3: DE:Tag:traffic sign=DE:386.3
     traffic_sign=DE:394-50: DE:Tag:traffic sign=DE:394-50
     traffic_sign=DE:437: DE:Tag:traffic sign=DE:437
@@ -4524,30 +5226,66 @@ de:
     traffic_sign=DE:448: DE:Tag:traffic sign=DE:448
     traffic_sign=DE:449: DE:Tag:traffic sign=DE:449
     traffic_sign=DE:453: DE:Tag:traffic sign=DE:453
     traffic_sign=DE:448: DE:Tag:traffic sign=DE:448
     traffic_sign=DE:449: DE:Tag:traffic sign=DE:449
     traffic_sign=DE:453: DE:Tag:traffic sign=DE:453
+    traffic_sign=DE:600-30: DE:Tag:traffic sign=DE:600-30
+    traffic_sign=DE:600-31: DE:Tag:traffic sign=DE:600-31
+    traffic_sign=DE:600-32: DE:Tag:traffic sign=DE:600-32
+    traffic_sign=DE:600-33: DE:Tag:traffic sign=DE:600-33
+    traffic_sign=DE:600-34: DE:Tag:traffic sign=DE:600-34
     traffic_sign=city_limit: DE:Tag:traffic sign=city limit
     transformer=distribution: DE:Tag:transformer=distribution
     tunnel=building_passage: DE:Tag:tunnel=building passage
     tunnel=culvert: DE:Tag:tunnel=culvert
     traffic_sign=city_limit: DE:Tag:traffic sign=city limit
     transformer=distribution: DE:Tag:transformer=distribution
     tunnel=building_passage: DE:Tag:tunnel=building passage
     tunnel=culvert: DE:Tag:tunnel=culvert
+    type=associatedStreet: DE:Tag:type=associatedStreet
+    type=destination_sign: DE:Tag:type=destination sign
+    type=enforcement: DE:Tag:type=enforcement
     type=waterway: DE:Tag:type=waterway
     type=waterway: DE:Tag:type=waterway
+    usage=branch: DE:Tag:usage=branch
     usage=headrace: DE:Tag:usage=headrace
     usage=industrial: DE:Tag:usage=industrial
     usage=irrigation: DE:Tag:usage=irrigation
     usage=penstock: DE:Tag:usage=penstock
     usage=tailrace: DE:Tag:usage=tailrace
     usage=headrace: DE:Tag:usage=headrace
     usage=industrial: DE:Tag:usage=industrial
     usage=irrigation: DE:Tag:usage=irrigation
     usage=penstock: DE:Tag:usage=penstock
     usage=tailrace: DE:Tag:usage=tailrace
+    usage=tourism: DE:Tag:usage=tourism
     usage=transmission: DE:Tag:usage=transmission
     usage=transmission: DE:Tag:usage=transmission
-    vending: DE:Tag:vending
+    utility=power: DE:Tag:utility=power
+    vehicle=no: DE:Tag:vehicle=no
+    vending=SIM_cards: DE:Tag:vending=SIM cards
+    vending=admission_tickets: DE:Tag:vending=admission tickets
     vending=animal_feed: DE:Tag:vending=animal feed
     vending=animal_feed: DE:Tag:vending=animal feed
+    vending=art: DE:Tag:vending=art
     vending=bicycle_tube: DE:Tag:vending=bicycle tube
     vending=bicycle_tube: DE:Tag:vending=bicycle tube
+    vending=books: DE:Tag:vending=books
     vending=bottle_return: DE:Tag:vending=bottle return
     vending=bread: DE:Tag:vending=bread
     vending=candles: DE:Tag:vending=candles
     vending=bottle_return: DE:Tag:vending=bottle return
     vending=bread: DE:Tag:vending=bread
     vending=candles: DE:Tag:vending=candles
+    vending=chemist: DE:Tag:vending=chemist
     vending=chewing_gums: DE:Tag:vending=chewing gums
     vending=chewing_gums: DE:Tag:vending=chewing gums
+    vending=cigarettes: DE:Tag:vending=cigarettes
     vending=coffee: DE:Tag:vending=coffee
     vending=coffee: DE:Tag:vending=coffee
+    vending=coin_change_machine: DE:Tag:vending=coin change machine
+    vending=condoms: DE:Tag:vending=condoms
+    vending=contact_lenses: DE:Tag:vending=contact lenses
+    vending=drinks: DE:Tag:vending=drinks
+    vending=e-cigarettes: DE:Tag:vending=e-cigarettes
+    vending=eggs: DE:Tag:vending=eggs
+    vending=electronics: DE:Tag:vending=electronics
     vending=elongated_coin: DE:Tag:vending=elongated coin
     vending=excrement_bags: DE:Tag:vending=excrement bags
     vending=elongated_coin: DE:Tag:vending=elongated coin
     vending=excrement_bags: DE:Tag:vending=excrement bags
+    vending=feminine_hygiene: DE:Tag:vending=feminine hygiene
+    vending=first_aid: DE:Tag:vending=first aid
+    vending=fishing_bait: DE:Tag:vending=fishing bait
+    vending=fishing_tackle: DE:Tag:vending=fishing tackle
+    vending=flower_seeds: DE:Tag:vending=flower seeds
     vending=flowers: DE:Tag:vending=flowers
     vending=food: DE:Tag:vending=food
     vending=flowers: DE:Tag:vending=flowers
     vending=food: DE:Tag:vending=food
+    vending=french_fries: DE:Tag:vending=french fries
+    vending=fuel: DE:Tag:vending=fuel
+    vending=gas_bottles: DE:Tag:vending=gas bottles
     vending=ice_cream: DE:Tag:vending=ice cream
     vending=ice_cream: DE:Tag:vending=ice cream
+    vending=ice_cubes: DE:Tag:vending=ice cubes
+    vending=ink_cartridges: DE:Tag:vending=ink cartridges
+    vending=laundry_detergent: DE:Tag:vending=laundry detergent
+    vending=lottery: DE:Tag:vending=lottery
     vending=milk: DE:Tag:vending=milk
     vending=newspapers: DE:Tag:vending=newspapers
     vending=parcel_mail_in: DE:Tag:vending=parcel mail in
     vending=milk: DE:Tag:vending=milk
     vending=newspapers: DE:Tag:vending=newspapers
     vending=parcel_mail_in: DE:Tag:vending=parcel mail in
@@ -4555,26 +5293,46 @@ de:
     vending=parcel_pickup;parcel_mail_in: DE:Tag:vending=parcel pickup;parcel mail
       in
     vending=parking_tickets: DE:Tag:vending=parking tickets
     vending=parcel_pickup;parcel_mail_in: DE:Tag:vending=parcel pickup;parcel mail
       in
     vending=parking_tickets: DE:Tag:vending=parking tickets
+    vending=photos: DE:Tag:vending=photos
+    vending=pizza: DE:Tag:vending=pizza
     vending=public_transport_tickets: DE:Tag:vending=public transport tickets
     vending=sex_toys: DE:Tag:vending=sex toys
     vending=stamps: DE:Tag:vending=stamps
     vending=sweets: DE:Tag:vending=sweets
     vending=public_transport_tickets: DE:Tag:vending=public transport tickets
     vending=sex_toys: DE:Tag:vending=sex toys
     vending=stamps: DE:Tag:vending=stamps
     vending=sweets: DE:Tag:vending=sweets
+    vending=syringes: DE:Tag:vending=syringes
+    vending=telephone_vouchers: DE:Tag:vending=telephone vouchers
+    vending=toll: DE:Tag:vending=toll
     vending=toys: DE:Tag:vending=toys
     vending=toys: DE:Tag:vending=toys
+    vending=umbrellas: DE:Tag:vending=umbrellas
     vending=water: DE:Tag:vending=water
     vending_machine=fuel: DE:Tag:vending machine=fuel
     wall=castle_wall: DE:Tag:wall=castle wall
     wall=dry_stone: DE:Tag:wall=dry stone
     vending=water: DE:Tag:vending=water
     vending_machine=fuel: DE:Tag:vending machine=fuel
     wall=castle_wall: DE:Tag:wall=castle wall
     wall=dry_stone: DE:Tag:wall=dry stone
+    wall=no: DE:Tag:wall=no
     wall=noise_barrier: DE:Tag:wall=noise barrier
     wall=noise_barrier: DE:Tag:wall=noise barrier
+    wall=stone: DE:Tag:wall=stone
+    wall=stone_wall: DE:Tag:wall=stone wall
+    waste=cigarettes: DE:Tag:waste=cigarettes
     waste=dog_excrement: DE:Tag:waste=dog excrement
     waste=dog_excrement: DE:Tag:waste=dog excrement
+    waste=drugs: DE:Tag:waste=drugs
+    waste=oil: DE:Tag:waste=oil
+    waste=organic: DE:Tag:waste=organic
+    waste=pizza_box: DE:Tag:waste=pizza box
+    waste=rubble: DE:Tag:waste=rubble
+    waste=trash: DE:Tag:waste=trash
     water=basin: DE:Tag:water=basin
     water=canal: DE:Tag:water=canal
     water=basin: DE:Tag:water=basin
     water=canal: DE:Tag:water=canal
+    water=ditch: DE:Tag:water=ditch
+    water=harbour: DE:Tag:water=harbour
     water=lagoon: DE:Tag:water=lagoon
     water=lake: DE:Tag:water=lake
     water=lock: DE:Tag:water=lock
     water=lagoon: DE:Tag:water=lagoon
     water=lake: DE:Tag:water=lake
     water=lock: DE:Tag:water=lock
+    water=moat: DE:Tag:water=moat
     water=oxbow: DE:Tag:water=oxbow
     water=pond: DE:Tag:water=pond
     water=reservoir: DE:Tag:water=reservoir
     water=river: DE:Tag:water=river
     water=oxbow: DE:Tag:water=oxbow
     water=pond: DE:Tag:water=pond
     water=reservoir: DE:Tag:water=reservoir
     water=river: DE:Tag:water=river
+    water=stream: DE:Tag:water=stream
     water=wastewater: DE:Tag:water=wastewater
     waterway=boat_lift: DE:Tag:waterway=boat lift
     waterway=boatyard: DE:Tag:waterway=boatyard
     water=wastewater: DE:Tag:water=wastewater
     waterway=boat_lift: DE:Tag:waterway=boat lift
     waterway=boatyard: DE:Tag:waterway=boatyard
@@ -4589,9 +5347,13 @@ de:
     waterway=fuel: DE:Tag:waterway=fuel
     waterway=lock_gate: DE:Tag:waterway=lock gate
     waterway=milestone: DE:Tag:waterway=milestone
     waterway=fuel: DE:Tag:waterway=fuel
     waterway=lock_gate: DE:Tag:waterway=lock gate
     waterway=milestone: DE:Tag:waterway=milestone
+    waterway=portage: DE:Tag:waterway=portage
     waterway=pressurised: DE:Tag:waterway=pressurised
     waterway=pressurised: DE:Tag:waterway=pressurised
+    waterway=rapids: DE:Tag:waterway=rapids
     waterway=river: DE:Tag:waterway=river
     waterway=riverbank: DE:Tag:waterway=riverbank
     waterway=river: DE:Tag:waterway=river
     waterway=riverbank: DE:Tag:waterway=riverbank
+    waterway=security_lock: DE:Tag:waterway=security lock
+    waterway=sluice_gate: DE:Tag:waterway=sluice gate
     waterway=stream: DE:Tag:waterway=stream
     waterway=tidal_channel: DE:Tag:waterway=tidal channel
     waterway=waterfall: DE:Tag:waterway=waterfall
     waterway=stream: DE:Tag:waterway=stream
     waterway=tidal_channel: DE:Tag:waterway=tidal channel
     waterway=waterfall: DE:Tag:waterway=waterfall
@@ -4656,20 +5418,37 @@ el:
     highway=track: El:Tag:highway=track
 en:
   key:
     highway=track: El:Tag:highway=track
 en:
   key:
+    '*:backward': Key:*:backward
+    '*:en': Key:*:en
+    '*:forward': Key:*:forward
+    '*:left': Key:*:left
+    '*:physical': Key:*:physical
+    '*:right': Key:*:right
+    '*:wikidata': Key:*:wikidata
     3dmr: Key:3dmr
     3dr:type: Key:3dr:type
     4wd_only: Key:4wd only
     3dmr: Key:3dmr
     3dr:type: Key:3dr:type
     4wd_only: Key:4wd only
+    :conditional: Key::conditional
     :lanes: Key::lanes
     AND_nosr_r: Key:AND nosr r
     AlpinRes_ID: Key:AlpinRes ID
     CEMT: Key:CEMT
     CLC:code: Key:CLC:code
     :lanes: Key::lanes
     AND_nosr_r: Key:AND nosr r
     AlpinRes_ID: Key:AlpinRes ID
     CEMT: Key:CEMT
     CLC:code: Key:CLC:code
+    Community: Key:Community
     DGPS_correction: Key:DGPS correction
     DGPS_correction: Key:DGPS correction
+    EE:EHIS:id: Key:EE:EHIS:id
+    EE:EHIS:type: Key:EE:EHIS:type
     EHAK:code: Key:EHAK:code
     EH_ref: Key:EH ref
     FIXME: Key:FIXME
     Finance_agent: Key:Finance agent
     EHAK:code: Key:EHAK:code
     EH_ref: Key:EH ref
     FIXME: Key:FIXME
     Finance_agent: Key:Finance agent
+    GNS: Key:GNS
+    'GNS:': 'Key:GNS:'
+    GNS:*: Key:GNS:*
+    GNS:dsg_code: Key:GNS:dsg code
+    GNS:id: Key:GNS:id
     HE_ref: Key:HE ref
     HE_ref: Key:HE ref
+    HFCS: Key:HFCS
     HU:ed_direction: Key:HU:ed direction
     HU:hu-go:length: Key:HU:hu-go:length
     HU:hu-go:milestone: Key:HU:hu-go:milestone
     HU:ed_direction: Key:HU:ed direction
     HU:hu-go:length: Key:HU:hu-go:length
     HU:hu-go:milestone: Key:HU:hu-go:milestone
@@ -4680,29 +5459,36 @@ en:
     INEGI: Key:INEGI
     INEGI:CVE_MUN: Key:INEGI:CVE MUN
     INEGI:MUNID: Key:INEGI:MUNID
     INEGI: Key:INEGI
     INEGI:CVE_MUN: Key:INEGI:CVE MUN
     INEGI:MUNID: Key:INEGI:MUNID
+    ISO3166-1:alpha2: Key:ISO3166-1:alpha2
+    ISO3166-1:alpha3: Key:ISO3166-1:alpha3
     ISO3166-2: Key:ISO3166-2
     KKR:code: Key:KKR:code
     LINZ2OSM:dataset: Key:LINZ2OSM:dataset
     LINZ2OSM:layer: Key:LINZ2OSM:layer
     LINZ2OSM:source_version: Key:LINZ2OSM:source version
     ISO3166-2: Key:ISO3166-2
     KKR:code: Key:KKR:code
     LINZ2OSM:dataset: Key:LINZ2OSM:dataset
     LINZ2OSM:layer: Key:LINZ2OSM:layer
     LINZ2OSM:source_version: Key:LINZ2OSM:source version
+    LINZ:dataset: Key:LINZ:dataset
     LINZ:layer: Key:LINZ:layer
     LINZ:source_version: Key:LINZ:source version
     Lock_ref: Key:Lock ref
     Mapper: Key:Mapper
     LINZ:layer: Key:LINZ:layer
     LINZ:source_version: Key:LINZ:source version
     Lock_ref: Key:Lock ref
     Mapper: Key:Mapper
+    NHD:FCode: Key:NHD:FCode
+    NHD:ReachCode: Key:NHD:ReachCode
     NHS: Key:NHS
     NHS: Key:NHS
+    NSIW: Key:NSIW
+    Oslostandarden: Key:Oslostandarden
     PMSA_ref: Key:PMSA ref
     PMSA_ref: Key:PMSA ref
+    Place:CN: Key:Place:CN
     Power_supply:schedule: Key:Power supply:schedule
     RLIS:bicycle: Key:RLIS:bicycle
     RLIS:reviewed: Key:RLIS:reviewed
     Schalansky_ref: Key:Schalansky ref
     Shop: Key:Shop
     Power_supply:schedule: Key:Power supply:schedule
     RLIS:bicycle: Key:RLIS:bicycle
     RLIS:reviewed: Key:RLIS:reviewed
     Schalansky_ref: Key:Schalansky ref
     Shop: Key:Shop
-    Source: Key:Source
+    TARC: Key:TARC
     TMC: Key:TMC
     TMC:Direction: Key:TMC:Direction
     TMC:LocationCode: Key:TMC:LocationCode
     TMC:NextLocationCode: Key:TMC:NextLocationCode
     TMC:PrevLocationCode: Key:TMC:PrevLocationCode
     TMC: Key:TMC
     TMC:Direction: Key:TMC:Direction
     TMC:LocationCode: Key:TMC:LocationCode
     TMC:NextLocationCode: Key:TMC:NextLocationCode
     TMC:PrevLocationCode: Key:TMC:PrevLocationCode
-    TODO: Key:TODO
     URL: Key:URL
     WDPA_ID:ref: Key:WDPA ID:ref
     WLAN: Key:WLAN
     URL: Key:URL
     WDPA_ID:ref: Key:WDPA ID:ref
     WLAN: Key:WLAN
@@ -4711,40 +5497,53 @@ en:
     abandoned:*: Key:abandoned:*
     abandoned:amenity: Key:abandoned:amenity
     abandoned:building: Key:abandoned:building
     abandoned:*: Key:abandoned:*
     abandoned:amenity: Key:abandoned:amenity
     abandoned:building: Key:abandoned:building
+    abandoned:highway: Key:abandoned:highway
+    abandoned:landuse: Key:abandoned:landuse
     abandoned:place: Key:abandoned:place
     abandoned:railway: Key:abandoned:railway
     abandoned:place: Key:abandoned:place
     abandoned:railway: Key:abandoned:railway
+    abbr_name: Key:abbr name
     abutters: Key:abutters
     access: Key:access
     abutters: Key:abutters
     access: Key:access
-    access:bdouble: Key:access:bdouble
     access:conditional: Key:access:conditional
     access:conditional: Key:access:conditional
+    access:covid19: Key:access:covid19
+    access:delivery: Key:access:delivery
     access:lanes: Key:access:lanes
     access:lanes: Key:access:lanes
-    access:lhv: Key:access:lhv
-    access:roadtrain: Key:access:roadtrain
-    access:roadtrain:trailers: Key:access:roadtrain:trailers
+    access:offroad: Key:access:offroad
+    accuracy:meters: Key:accuracy:meters
+    active_traffic_management: Key:active traffic management
     actuator: Key:actuator
     addr: Key:addr
     actuator: Key:actuator
     addr: Key:addr
+    'addr:': 'Key:addr:'
+    addr:*: Key:addr:*
+    addr:TW:dataset: Key:addr:TW:dataset
     addr:alternatenumber: Key:addr:alternatenumber
     addr:block: Key:addr:block
     addr:block:ar: Key:addr:block:ar
     addr:block:en: Key:addr:block:en
     addr:alternatenumber: Key:addr:alternatenumber
     addr:block: Key:addr:block
     addr:block:ar: Key:addr:block:ar
     addr:block:en: Key:addr:block:en
+    addr:block_number: Key:addr:block number
     addr:borough: Key:addr:borough
     addr:city: Key:addr:city
     addr:city:ar: Key:addr:city:ar
     addr:city:de: Key:addr:city:de
     addr:city:en: Key:addr:city:en
     addr:city:it: Key:addr:city:it
     addr:borough: Key:addr:borough
     addr:city: Key:addr:city
     addr:city:ar: Key:addr:city:ar
     addr:city:de: Key:addr:city:de
     addr:city:en: Key:addr:city:en
     addr:city:it: Key:addr:city:it
+    addr:city:scl: Key:addr:city:scl
     addr:city:simc: Key:addr:city:simc
     addr:city:simc: Key:addr:city:simc
+    addr:city:ur: Key:addr:city:ur
     addr:conscriptionnumber: Key:addr:conscriptionnumber
     addr:country: Key:addr:country
     addr:conscriptionnumber: Key:addr:conscriptionnumber
     addr:country: Key:addr:country
+    addr:county: Key:addr:county
     addr:description: Key:addr:description
     addr:description:ar: Key:addr:description:ar
     addr:district: Key:addr:district
     addr:district:ar: Key:addr:district:ar
     addr:district:en: Key:addr:district:en
     addr:description: Key:addr:description
     addr:description:ar: Key:addr:description:ar
     addr:district: Key:addr:district
     addr:district:ar: Key:addr:district:ar
     addr:district:en: Key:addr:district:en
+    addr:district:ur: Key:addr:district:ur
     addr:door: Key:addr:door
     addr:flats: Key:addr:flats
     addr:floor: Key:addr:floor
     addr:full: Key:addr:full
     addr:door: Key:addr:door
     addr:flats: Key:addr:flats
     addr:floor: Key:addr:floor
     addr:full: Key:addr:full
+    addr:ghanapostgps: Key:addr:ghanapostgps
     addr:hamlet: Key:addr:hamlet
     addr:hamlet:de: Key:addr:hamlet:de
     addr:hamlet:it: Key:addr:hamlet:it
     addr:hamlet: Key:addr:hamlet
     addr:hamlet:de: Key:addr:hamlet:de
     addr:hamlet:it: Key:addr:hamlet:it
@@ -4754,88 +5553,136 @@ en:
     addr:housenumber:ar: Key:addr:housenumber:ar
     addr:inclusion: Key:addr:inclusion
     addr:interpolation: Key:addr:interpolation
     addr:housenumber:ar: Key:addr:housenumber:ar
     addr:inclusion: Key:addr:inclusion
     addr:interpolation: Key:addr:interpolation
+    addr:khasra: Key:addr:khasra
+    addr:milestone: Key:addr:milestone
+    addr:neighborhood: Key:addr:neighborhood
+    addr:neighbourhood: Key:addr:neighbourhood
+    addr:nostreet: Key:addr:nostreet
     addr:place: Key:addr:place
     addr:place:ar: Key:addr:place:ar
     addr:place:de: Key:addr:place:de
     addr:place:en: Key:addr:place:en
     addr:place:it: Key:addr:place:it
     addr:place: Key:addr:place
     addr:place:ar: Key:addr:place:ar
     addr:place:de: Key:addr:place:de
     addr:place:en: Key:addr:place:en
     addr:place:it: Key:addr:place:it
+    addr:plot: Key:addr:plot
+    addr:postbox: Key:addr:postbox
     addr:postcode: Key:addr:postcode
     addr:postcode: Key:addr:postcode
+    addr:postcode:source: Key:addr:postcode:source
     addr:province: Key:addr:province
     addr:province:ar: Key:addr:province:ar
     addr:province:en: Key:addr:province:en
     addr:province: Key:addr:province
     addr:province:ar: Key:addr:province:ar
     addr:province:en: Key:addr:province:en
+    addr:province:ur: Key:addr:province:ur
     addr:provisionalnumber: Key:addr:provisionalnumber
     addr:provisionalnumber: Key:addr:provisionalnumber
+    addr:quarter: Key:addr:quarter
     addr:region: Key:addr:region
     addr:region: Key:addr:region
+    addr:room: Key:addr:room
+    addr:sector: Key:addr:sector
+    addr:source: Key:addr:source
     addr:staircase: Key:addr:staircase
     addr:state: Key:addr:state
     addr:street: Key:addr:street
     addr:street:ar: Key:addr:street:ar
     addr:street:de: Key:addr:street:de
     addr:street:en: Key:addr:street:en
     addr:staircase: Key:addr:staircase
     addr:state: Key:addr:state
     addr:street: Key:addr:street
     addr:street:ar: Key:addr:street:ar
     addr:street:de: Key:addr:street:de
     addr:street:en: Key:addr:street:en
+    addr:street:fr: Key:addr:street:fr
     addr:street:it: Key:addr:street:it
     addr:street:it: Key:addr:street:it
-    addr:street:name: Key:addr:street:name
     addr:street:prefix: Key:addr:street:prefix
     addr:street:sym_ul: Key:addr:street:sym ul
     addr:street:type: Key:addr:street:type
     addr:street:prefix: Key:addr:street:prefix
     addr:street:sym_ul: Key:addr:street:sym ul
     addr:street:type: Key:addr:street:type
+    addr:street:ur: Key:addr:street:ur
     addr:streetnumber: Key:addr:streetnumber
     addr:subdistrict: Key:addr:subdistrict
     addr:subdistrict:ar: Key:addr:subdistrict:ar
     addr:subdistrict:en: Key:addr:subdistrict:en
     addr:suburb: Key:addr:suburb
     addr:streetnumber: Key:addr:streetnumber
     addr:subdistrict: Key:addr:subdistrict
     addr:subdistrict:ar: Key:addr:subdistrict:ar
     addr:subdistrict:en: Key:addr:subdistrict:en
     addr:suburb: Key:addr:suburb
+    addr:subward: Key:addr:subward
+    addr:town: Key:addr:town
+    addr:type: Key:addr:type
     addr:unit: Key:addr:unit
     addr:unit: Key:addr:unit
+    addr:village: Key:addr:village
+    addr:ward: Key:addr:ward
+    address: Key:address
     admin_level: Key:admin level
     admin_level: Key:admin level
+    admin_title: Key:admin title
     adr_les: Key:adr les
     advertising: Key:advertising
     aerialway: Key:aerialway
     aerialway:drag_lift: Key:aerialway:drag lift
     aerialway:duration: Key:aerialway:duration
     adr_les: Key:adr les
     advertising: Key:advertising
     aerialway: Key:aerialway
     aerialway:drag_lift: Key:aerialway:drag lift
     aerialway:duration: Key:aerialway:duration
+    aerialway:occupancy: Key:aerialway:occupancy
+    aerialway:station: Key:aerialway:station
+    aerodrome: Key:aerodrome
     aerodrome:type: Key:aerodrome:type
     aeroway: Key:aeroway
     after_school: Key:after school
     aerodrome:type: Key:aerodrome:type
     aeroway: Key:aeroway
     after_school: Key:after school
+    age: Key:age
     agrarian: Key:agrarian
     agricultural: Key:agricultural
     air_conditioning: Key:air conditioning
     agrarian: Key:agrarian
     agricultural: Key:agricultural
     air_conditioning: Key:air conditioning
-    airconditioned: Key:airconditioned
+    alcohol: Key:alcohol
     alt_name: Key:alt name
     alt_name:ar: Key:alt name:ar
     alt_name: Key:alt name
     alt_name:ar: Key:alt name:ar
+    alt_name:arc: Key:alt name:arc
     alt_name:azb: Key:alt name:azb
     alt_name:be: Key:alt name:be
     alt_name:ckb: Key:alt name:ckb
     alt_name:azb: Key:alt name:azb
     alt_name:be: Key:alt name:be
     alt_name:ckb: Key:alt name:ckb
+    alt_name:de: Key:alt name:de
     alt_name:en: Key:alt name:en
     alt_name:en: Key:alt name:en
+    alt_name:es: Key:alt name:es
     alt_name:fa: Key:alt name:fa
     alt_name:fa: Key:alt name:fa
+    alt_name:fr: Key:alt name:fr
+    alt_name:fur: Key:alt name:fur
     alt_name:glk: Key:alt name:glk
     alt_name:glk: Key:alt name:glk
+    alt_name:gr: Key:alt name:gr
+    alt_name:grc: Key:alt name:grc
+    alt_name:kab-Arab: Key:alt name:kab-Arab
     alt_name:ko: Key:alt name:ko
     alt_name:ks: Key:alt name:ks
     alt_name:lrc: Key:alt name:lrc
     alt_name:mg: Key:alt name:mg
     alt_name:ko: Key:alt name:ko
     alt_name:ks: Key:alt name:ks
     alt_name:lrc: Key:alt name:lrc
     alt_name:mg: Key:alt name:mg
+    alt_name:ms-Arab: Key:alt name:ms-Arab
     alt_name:mzn: Key:alt name:mzn
     alt_name:pl: Key:alt name:pl
     alt_name:pnb: Key:alt name:pnb
     alt_name:ps: Key:alt name:ps
     alt_name:ru: Key:alt name:ru
     alt_name:sd: Key:alt name:sd
     alt_name:mzn: Key:alt name:mzn
     alt_name:pl: Key:alt name:pl
     alt_name:pnb: Key:alt name:pnb
     alt_name:ps: Key:alt name:ps
     alt_name:ru: Key:alt name:ru
     alt_name:sd: Key:alt name:sd
+    alt_name:syc: Key:alt name:syc
     alt_name:th: Key:alt name:th
     alt_name:ug: Key:alt name:ug
     alt_name:ur: Key:alt name:ur
     alt_name:th: Key:alt name:th
     alt_name:ug: Key:alt name:ug
     alt_name:ur: Key:alt name:ur
+    alt_name:zh: Key:alt name:zh
     alt_name_1: Key:alt name 1
     alt_name_1: Key:alt name 1
+    alt_ref: Key:alt ref
     amenity: Key:amenity
     amenity:eftpos: Key:amenity:eftpos
     amenity:restaurant: Key:amenity:restaurant
     animal: Key:animal
     animated: Key:animated
     amenity: Key:amenity
     amenity:eftpos: Key:amenity:eftpos
     amenity:restaurant: Key:amenity:restaurant
     animal: Key:animal
     animated: Key:animated
+    announcement: Key:announcement
+    app:*: Key:app:*
     aquaculture: Key:aquaculture
     aquaculture: Key:aquaculture
+    archaeological_site: Key:archaeological site
+    archaeological_type: Key:archaeological type
+    archaeologist:wikidata: Key:archaeologist:wikidata
     architect: Key:architect
     architect:wikidata: Key:architect:wikidata
     architect:wikipedia: Key:architect:wikipedia
     area: Key:area
     area:aeroway: Key:area:aeroway
     area:highway: Key:area:highway
     architect: Key:architect
     architect:wikidata: Key:architect:wikidata
     architect:wikipedia: Key:architect:wikipedia
     area: Key:area
     area:aeroway: Key:area:aeroway
     area:highway: Key:area:highway
-    artist: Key:artist
+    armrest: Key:armrest
+    artist:note: Key:artist:note
     artist:wikidata: Key:artist:wikidata
     artist:wikidata: Key:artist:wikidata
+    artist:wikipedia: Key:artist:wikipedia
     artist_name: Key:artist name
     artist_name: Key:artist name
+    artwork:subject:wikidata: Key:artwork:subject:wikidata
+    artwork:subject:wikipedia: Key:artwork:subject:wikipedia
     artwork_subject: Key:artwork subject
     artwork_type: Key:artwork type
     asb: Key:asb
     ascent: Key:ascent
     artwork_subject: Key:artwork subject
     artwork_type: Key:artwork type
     asb: Key:asb
     ascent: Key:ascent
+    asphalt:type: Key:asphalt:type
+    assembly_point:bombing: Key:assembly point:bombing
     assembly_point:earthquake: Key:assembly point:earthquake
     assembly_point:fire: Key:assembly point:fire
     assembly_point:flood: Key:assembly point:flood
     assembly_point:earthquake: Key:assembly point:earthquake
     assembly_point:fire: Key:assembly point:fire
     assembly_point:flood: Key:assembly point:flood
@@ -4844,6 +5691,7 @@ en:
     assembly_point:tsunami: Key:assembly point:tsunami
     asset_ref: Key:asset ref
     assisted_trail: Key:assisted trail
     assembly_point:tsunami: Key:assembly point:tsunami
     asset_ref: Key:asset ref
     assisted_trail: Key:assisted trail
+    association: Key:association
     at_bev:addr_date: Key:at bev:addr date
     atmotorway: Key:atmotorway
     attraction: Key:attraction
     at_bev:addr_date: Key:at bev:addr date
     atmotorway: Key:atmotorway
     attraction: Key:attraction
@@ -4852,76 +5700,108 @@ en:
     atv:repair: Key:atv:repair
     atv:sales: Key:atv:sales
     authentication: Key:authentication
     atv:repair: Key:atv:repair
     atv:sales: Key:atv:sales
     authentication: Key:authentication
+    authentication:*: Key:authentication:*
     authentication:app: Key:authentication:app
     authentication:app: Key:authentication:app
+    authentication:disc: Key:authentication:disc
     authentication:membership_card: Key:authentication:membership card
     authentication:nfc: Key:authentication:nfc
     authentication:none: Key:authentication:none
     authentication:phone_call: Key:authentication:phone call
     authentication:short_message: Key:authentication:short message
     authentication:membership_card: Key:authentication:membership card
     authentication:nfc: Key:authentication:nfc
     authentication:none: Key:authentication:none
     authentication:phone_call: Key:authentication:phone call
     authentication:short_message: Key:authentication:short message
+    auto_rickshaw: Key:auto rickshaw
     autoaws: Key:autoaws
     automated: Key:automated
     automatic_door: Key:automatic door
     autonomy: Key:autonomy
     autoaws: Key:autoaws
     automated: Key:automated
     automatic_door: Key:automatic door
     autonomy: Key:autonomy
+    availability: Key:availability
+    avalanche_protection: Key:avalanche protection
+    avalanche_transceiver: Key:avalanche transceiver
+    avz: Key:avz
+    baby: Key:baby
     baby_feeding: Key:baby feeding
     backcountry: Key:backcountry
     backrest: Key:backrest
     baby_feeding: Key:baby feeding
     backcountry: Key:backcountry
     backrest: Key:backrest
+    backup_generator: Key:backup generator
     backward: Key:backward
     bakehouse: Key:bakehouse
     balcony: Key:balcony
     bar: Key:bar
     barrier: Key:barrier
     barrier:personnel: Key:barrier:personnel
     backward: Key:backward
     bakehouse: Key:bakehouse
     balcony: Key:balcony
     bar: Key:bar
     barrier: Key:barrier
     barrier:personnel: Key:barrier:personnel
+    base_function: Key:base function
     baseball: Key:baseball
     baseball: Key:baseball
+    basilica: Key:basilica
     basin: Key:basin
     bath:type: Key:bath:type
     basin: Key:basin
     bath:type: Key:bath:type
+    bbq:type: Key:bbq:type
     bdouble: Key:bdouble
     beacon: Key:beacon
     beacon:colour: Key:beacon:colour
     beacon:function: Key:beacon:function
     beacon:type: Key:beacon:type
     bdouble: Key:bdouble
     beacon: Key:beacon
     beacon:colour: Key:beacon:colour
     beacon:function: Key:beacon:function
     beacon:type: Key:beacon:type
+    beacon:uuid: Key:beacon:uuid
     beauty: Key:beauty
     beds: Key:beds
     bell_tower: Key:bell tower
     bench: Key:bench
     bench:type: Key:bench:type
     beauty: Key:beauty
     beds: Key:beds
     bell_tower: Key:bell tower
     bench: Key:bench
     bench:type: Key:bench:type
+    bettundbike: Key:bettundbike
     bicycle: Key:bicycle
     bicycle:backward: Key:bicycle:backward
     bicycle: Key:bicycle
     bicycle:backward: Key:bicycle:backward
+    bicycle:both: Key:bicycle:both
     bicycle:class:mtb: Key:bicycle:class:mtb
     bicycle:class:mtb:technical: Key:bicycle:class:mtb:technical
     bicycle:conditional: Key:bicycle:conditional
     bicycle:class:mtb: Key:bicycle:class:mtb
     bicycle:class:mtb:technical: Key:bicycle:class:mtb:technical
     bicycle:conditional: Key:bicycle:conditional
+    bicycle:description: Key:bicycle:description
     bicycle:designated:type: Key:bicycle:designated:type
     bicycle:forward: Key:bicycle:forward
     bicycle:designated:type: Key:bicycle:designated:type
     bicycle:forward: Key:bicycle:forward
+    bicycle:left: Key:bicycle:left
     bicycle:oneway: Key:bicycle:oneway
     bicycle:oneway: Key:bicycle:oneway
+    bicycle:physical: Key:bicycle:physical
+    bicycle:right: Key:bicycle:right
     bicycle:type: Key:bicycle:type
     bicycle:type: Key:bicycle:type
+    bicycle_bypass: Key:bicycle bypass
     bicycle_parking: Key:bicycle parking
     bicycle_parking: Key:bicycle parking
-    bicycle_road: Key:bicycle road
+    bike_friend: Key:bike friend
     bike_ride: Key:bike ride
     bin: Key:bin
     biosphärenwirt: Key:biosphärenwirt
     biotic_reef: Key:biotic reef
     biotic_reef:type: Key:biotic reef:type
     bike_ride: Key:bike ride
     bin: Key:bin
     biosphärenwirt: Key:biosphärenwirt
     biotic_reef: Key:biotic reef
     biotic_reef:type: Key:biotic reef:type
-    blind:website: Key:blind:website
-    blind:website:lg: Key:blind:website:lg
     board:title: Key:board:title
     board_type: Key:board type
     boat: Key:boat
     bollard: Key:bollard
     booking: Key:booking
     books: Key:books
     board:title: Key:board:title
     board_type: Key:board type
     boat: Key:boat
     bollard: Key:bollard
     booking: Key:booking
     books: Key:books
+    boot_scraper: Key:boot scraper
+    booth: Key:booth
     border_type: Key:border type
     bot: Key:bot
     both: Key:both
     border_type: Key:border type
     bot: Key:bot
     both: Key:both
+    both_ways: Key:both ways
     bottle: Key:bottle
     bottom:material: Key:bottom:material
     boundary: Key:boundary
     boundary_type: Key:boundary type
     branch: Key:branch
     bottle: Key:bottle
     bottom:material: Key:bottom:material
     boundary: Key:boundary
     boundary_type: Key:boundary type
     branch: Key:branch
-    branch:type: Key:branch:type
     brand: Key:brand
     brand: Key:brand
+    brand:*: Key:brand:*
     brand:ar: Key:brand:ar
     brand:ar: Key:brand:ar
+    brand:azb: Key:brand:azb
+    brand:de: Key:brand:de
+    brand:en: Key:brand:en
+    brand:es: Key:brand:es
+    brand:fr: Key:brand:fr
+    brand:main: Key:brand:main
+    brand:remarketed: Key:brand:remarketed
+    brand:ur: Key:brand:ur
+    brand:website: Key:brand:website
     brand:wikidata: Key:brand:wikidata
     brand:wikipedia: Key:brand:wikipedia
     brand:wikipedia:ar: Key:brand:wikipedia:ar
     brand:wikidata: Key:brand:wikidata
     brand:wikipedia: Key:brand:wikipedia
     brand:wikipedia:ar: Key:brand:wikipedia:ar
+    brand:wikipedia:de: Key:brand:wikipedia:de
+    brand:wikipedia:es: Key:brand:wikipedia:es
     breakfast: Key:breakfast
     brewery: Key:brewery
     bridge: Key:bridge
     breakfast: Key:breakfast
     brewery: Key:brewery
     bridge: Key:bridge
@@ -4930,36 +5810,49 @@ en:
     bridge:movable: Key:bridge:movable
     bridge:name: Key:bridge:name
     bridge:name:ar: Key:bridge:name:ar
     bridge:movable: Key:bridge:movable
     bridge:name: Key:bridge:name
     bridge:name:ar: Key:bridge:name:ar
+    bridge:name:arc: Key:bridge:name:arc
+    bridge:name:de: Key:bridge:name:de
+    bridge:name:fr: Key:bridge:name:fr
+    bridge:name:grc: Key:bridge:name:grc
+    bridge:name:sr: Key:bridge:name:sr
+    bridge:name:syc: Key:bridge:name:syc
     bridge:official_name: Key:bridge:official name
     bridge:old_name: Key:bridge:old name
     bridge:ref: Key:bridge:ref
     bridge:short_name: Key:bridge:short name
     bridge:structure: Key:bridge:structure
     bridge:support: Key:bridge:support
     bridge:official_name: Key:bridge:official name
     bridge:old_name: Key:bridge:old name
     bridge:ref: Key:bridge:ref
     bridge:short_name: Key:bridge:short name
     bridge:structure: Key:bridge:structure
     bridge:support: Key:bridge:support
-    bridge_name: Key:bridge name
+    brine_source: Key:brine source
+    brunch: Key:brunch
+    bubbleid: Key:bubbleid
+    buffer_stop: Key:buffer stop
     building: Key:building
     building: Key:building
-    building:age: Key:building:age
     building:architecture: Key:building:architecture
     building:cladding: Key:building:cladding
     building:architecture: Key:building:architecture
     building:cladding: Key:building:cladding
+    building:color: Key:building:color
     building:colour: Key:building:colour
     building:condition: Key:building:condition
     building:cullis:height: Key:building:cullis:height
     building:colour: Key:building:colour
     building:condition: Key:building:condition
     building:cullis:height: Key:building:cullis:height
+    building:design: Key:building:design
+    building:earthquake-resistant: Key:building:earthquake-resistant
     building:facade:colour: Key:building:facade:colour
     building:fireproof: Key:building:fireproof
     building:flats: Key:building:flats
     building:facade:colour: Key:building:facade:colour
     building:fireproof: Key:building:fireproof
     building:flats: Key:building:flats
-    building:height: Key:building:height
+    building:foundation_height: Key:building:foundation height
+    building:level: Key:building:level
     building:level:1,2,3...: Key:building:level:1,2,3...
     building:levels: Key:building:levels
     building:levels:underground: Key:building:levels:underground
     building:material: Key:building:material
     building:level:1,2,3...: Key:building:level:1,2,3...
     building:levels: Key:building:levels
     building:levels:underground: Key:building:levels:underground
     building:material: Key:building:material
+    building:max_level: Key:building:max level
     building:min_level: Key:building:min level
     building:min_level: Key:building:min level
+    building:name: Key:building:name
     building:obm: Key:building:obm
     building:part: Key:building:part
     building:place: Key:building:place
     building:prefabricated: Key:building:prefabricated
     building:obm: Key:building:obm
     building:part: Key:building:part
     building:place: Key:building:place
     building:prefabricated: Key:building:prefabricated
-    building:roof: Key:building:roof
+    building:quake-resistant: Key:building:quake-resistant
     building:roof:colour: Key:building:roof:colour
     building:roof:colour: Key:building:roof:colour
-    building:roof:shape: Key:building:roof:shape
     building:ruian:type: Key:building:ruian:type
     building:soft_storey: Key:building:soft storey
     building:structure: Key:building:structure
     building:ruian:type: Key:building:ruian:type
     building:soft_storey: Key:building:soft storey
     building:structure: Key:building:structure
@@ -4971,46 +5864,68 @@ en:
     building:walls: Key:building:walls
     bulk_purchase: Key:bulk purchase
     bunker_type: Key:bunker type
     building:walls: Key:building:walls
     bulk_purchase: Key:bulk purchase
     bunker_type: Key:bunker type
+    buried:wikidata: Key:buried:wikidata
+    buried:wikipedia: Key:buried:wikipedia
     bus: Key:bus
     bus:lanes: Key:bus:lanes
     bus: Key:bus
     bus:lanes: Key:bus:lanes
+    bus:lanes:backward: Key:bus:lanes:backward
+    bus:lanes:forward: Key:bus:lanes:forward
     bus_bay: Key:bus bay
     bus_bay: Key:bus bay
+    bus_class:length: Key:bus class:length
     busbar: Key:busbar
     busway: Key:busway
     busway:left: Key:busway:left
     busway:right: Key:busway:right
     busbar: Key:busbar
     busway: Key:busway
     busway:left: Key:busway:left
     busway:right: Key:busway:right
+    butcher: Key:butcher
     button_operated: Key:button operated
     button_operated: Key:button operated
-    cabin:rental: Key:cabin:rental
+    bygningsnr: Key:bygningsnr
     cabins: Key:cabins
     cable_number: Key:cable number
     cables: Key:cables
     cabins: Key:cabins
     cable_number: Key:cable number
     cables: Key:cables
+    cadc:2020: Key:cadc:2020
+    cadet: Key:cadet
     cafe: Key:cafe
     callsign: Key:callsign
     cafe: Key:cafe
     callsign: Key:callsign
+    camera:direction: Key:camera:direction
+    camera:mount: Key:camera:mount
+    camera:type: Key:camera:type
     camp_site: Key:camp site
     camp_type: Key:camp type
     camp_site: Key:camp site
     camp_type: Key:camp type
-    campers: Key:campers
     camping: Key:camping
     camping: Key:camping
-    camra: Key:camra
+    campwild: Key:campwild
     canal: Key:canal
     canoe: Key:canoe
     capacity: Key:capacity
     canal: Key:canal
     canoe: Key:canoe
     capacity: Key:capacity
+    capacity:beds: Key:capacity:beds
+    capacity:cabins: Key:capacity:cabins
     capacity:charging: Key:capacity:charging
     capacity:disabled: Key:capacity:disabled
     capacity:charging: Key:capacity:charging
     capacity:disabled: Key:capacity:disabled
+    capacity:long: Key:capacity:long
     capacity:men: Key:capacity:men
     capacity:men: Key:capacity:men
+    capacity:motorcycle: Key:capacity:motorcycle
     capacity:parent: Key:capacity:parent
     capacity:parent: Key:capacity:parent
+    capacity:persons: Key:capacity:persons
+    capacity:rooms: Key:capacity:rooms
     capacity:seats: Key:capacity:seats
     capacity:seats: Key:capacity:seats
+    capacity:standard: Key:capacity:standard
+    capacity:tents: Key:capacity:tents
+    capacity:truck: Key:capacity:truck
     capacity:women: Key:capacity:women
     capital: Key:capital
     capital_city: Key:capital city
     capacity:women: Key:capacity:women
     capital: Key:capital
     capital_city: Key:capital city
-    car:sales: Key:car:sales
-    car:tyres: Key:car:tyres
+    car_parts: Key:car parts
+    car_repair: Key:car repair
     car_wash: Key:car wash
     caravan: Key:caravan
     caravans: Key:caravans
     cargo: Key:cargo
     cargo_bike: Key:cargo bike
     carpenter: Key:carpenter
     car_wash: Key:car wash
     caravan: Key:caravan
     caravans: Key:caravans
     cargo: Key:cargo
     cargo_bike: Key:cargo bike
     carpenter: Key:carpenter
+    carpool: Key:carpool
     carriage: Key:carriage
     carriageway_ref: Key:carriageway ref
     carriage: Key:carriage
     carriageway_ref: Key:carriageway ref
+    carriageway_ref:left: Key:carriageway ref:left
+    carriageway_ref:right: Key:carriageway ref:right
     casemate: Key:casemate
     cash_withdrawal: Key:cash withdrawal
     cash_withdrawal:currency: Key:cash withdrawal:currency
     casemate: Key:casemate
     cash_withdrawal: Key:cash withdrawal
     cash_withdrawal:currency: Key:cash withdrawal:currency
@@ -5029,10 +5944,10 @@ en:
     cemetery: Key:cemetery
     cemt: Key:cemt
     census:population: Key:census:population
     cemetery: Key:cemetery
     cemt: Key:cemt
     census:population: Key:census:population
-    center_turn_lane: Key:center turn lane
+    central_island:traversable: Key:central island:traversable
     centralkey: Key:centralkey
     centralkey: Key:centralkey
-    centre_turn_lane: Key:centre turn lane
     change: Key:change
     change: Key:change
+    change:lanes: Key:change:lanes
     changesets_count: Key:changesets count
     changing_table: Key:changing table
     changing_table:count: Key:changing table:count
     changesets_count: Key:changesets count
     changing_table: Key:changing table
     changing_table:count: Key:changing table:count
@@ -5040,13 +5955,21 @@ en:
     changing_table:location: Key:changing table:location
     charge: Key:charge
     charity: Key:charity
     changing_table:location: Key:changing table:location
     charge: Key:charge
     charity: Key:charity
+    chchsid: Key:chchsid
     check_date: Key:check date
     check_date: Key:check date
+    check_date:crossing: Key:check date:crossing
+    check_date:opening_hours: Key:check date:opening hours
+    check_date:shelter: Key:check date:shelter
+    check_date:surface: Key:check date:surface
     checkpoint: Key:checkpoint
     checkpoint: Key:checkpoint
+    china_class: Key:china class
+    china_population: Key:china population
+    church:type: Key:church:type
     circuits: Key:circuits
     circumference: Key:circumference
     city_limit: Key:city limit
     clacks_overhead: Key:clacks overhead
     circuits: Key:circuits
     circumference: Key:circumference
     city_limit: Key:city limit
     clacks_overhead: Key:clacks overhead
-    class: Key:class
+    claimed_by: Key:claimed by
     class:bicycle: Key:class:bicycle
     class:bicycle:commute: Key:class:bicycle:commute
     class:bicycle:mtb: Key:class:bicycle:mtb
     class:bicycle: Key:class:bicycle
     class:bicycle:commute: Key:class:bicycle:commute
     class:bicycle:mtb: Key:class:bicycle:mtb
@@ -5061,17 +5984,23 @@ en:
     clli: Key:clli
     closed:note: Key:closed:note
     clothes: Key:clothes
     clli: Key:clli
     closed:note: Key:closed:note
     clothes: Key:clothes
+    clothes:for: Key:clothes:for
     club: Key:club
     club-mate: Key:club-mate
     coach: Key:coach
     coastline:survey_quality: Key:coastline:survey quality
     cocktails: Key:cocktails
     club: Key:club
     club-mate: Key:club-mate
     coach: Key:coach
     coastline:survey_quality: Key:coastline:survey quality
     cocktails: Key:cocktails
-    coffee: Key:coffee
     collection_times: Key:collection times
     collection_times: Key:collection times
+    collection_times:signed: Key:collection times:signed
+    collector: Key:collector
     colonnade: Key:colonnade
     color: Key:color
     colour: Key:colour
     colonnade: Key:colonnade
     color: Key:color
     colour: Key:colour
+    column:architecture: Key:column:architecture
+    column:shape: Key:column:shape
+    column:style: Key:column:style
     comment: Key:comment
     comment: Key:comment
+    communication:*: Key:communication:*
     communication:amateur_radio: Key:communication:amateur radio
     communication:amateur_radio:callsign: Key:communication:amateur radio:callsign
     communication:amateur_radio:link: Key:communication:amateur radio:link
     communication:amateur_radio: Key:communication:amateur radio
     communication:amateur_radio:callsign: Key:communication:amateur radio:callsign
     communication:amateur_radio:link: Key:communication:amateur radio:link
@@ -5081,31 +6010,44 @@ en:
     communication:amateur_radio:repeater:frequency_out: Key:communication:amateur
       radio:repeater:frequency out
     communication:amateur_radio:repeater:modulation: Key:communication:amateur radio:repeater:modulation
     communication:amateur_radio:repeater:frequency_out: Key:communication:amateur
       radio:repeater:frequency out
     communication:amateur_radio:repeater:modulation: Key:communication:amateur radio:repeater:modulation
+    communication:amateur_radio:repeater:power: Key:communication:amateur radio:repeater:power
     communication:amateur_radio:repeater:shift: Key:communication:amateur radio:repeater:shift
     communication:amateur_radio:repeater:toneburst: Key:communication:amateur radio:repeater:toneburst
     communication:amateur_radio:repeater:shift: Key:communication:amateur radio:repeater:shift
     communication:amateur_radio:repeater:toneburst: Key:communication:amateur radio:repeater:toneburst
+    communication:amateur_radio:sota: Key:communication:amateur radio:sota
+    communication:amateur_radio:wca: Key:communication:amateur radio:wca
     communication:bos: Key:communication:bos
     communication:gsm-r: Key:communication:gsm-r
     communication:microwave: Key:communication:microwave
     communication:mobile_phone: Key:communication:mobile phone
     communication:radio: Key:communication:radio
     communication:bos: Key:communication:bos
     communication:gsm-r: Key:communication:gsm-r
     communication:microwave: Key:communication:microwave
     communication:mobile_phone: Key:communication:mobile phone
     communication:radio: Key:communication:radio
+    communication:space: Key:communication:space
     communication:television: Key:communication:television
     community: Key:community
     community_centre: Key:community centre
     community_centre:for: Key:community centre:for
     company: Key:company
     communication:television: Key:communication:television
     community: Key:community
     community_centre: Key:community centre
     community_centre:for: Key:community centre:for
     company: Key:company
+    compensator: Key:compensator
     compressed_air: Key:compressed air
     condition: Key:condition
     conditional: Key:conditional
     condo: Key:condo
     compressed_air: Key:compressed air
     condition: Key:condition
     conditional: Key:conditional
     condo: Key:condo
+    confession_times: Key:confession times
     connection_point: Key:connection point
     connection_point: Key:connection point
+    consecrated: Key:consecrated
     construction: Key:construction
     construction: Key:construction
+    'construction:': 'Key:construction:'
+    construction:*: Key:construction:*
+    construction:building: Key:construction:building
+    construction:highway: Key:construction:highway
     construction:website: Key:construction:website
     construction:website: Key:construction:website
-    construction_end_expected: Key:construction end expected
+    construction_date: Key:construction date
     construction_start_expected: Key:construction start expected
     consulate: Key:consulate
     consulting: Key:consulting
     contact: Key:contact
     construction_start_expected: Key:construction start expected
     consulate: Key:consulate
     consulting: Key:consulting
     contact: Key:contact
+    contact:*: Key:contact:*
     contact:city: Key:contact:city
     contact:city: Key:contact:city
+    contact:country: Key:contact:country
     contact:diaspora: Key:contact:diaspora
     contact:email: Key:contact:email
     contact:facebook: Key:contact:facebook
     contact:diaspora: Key:contact:diaspora
     contact:email: Key:contact:email
     contact:facebook: Key:contact:facebook
@@ -5122,10 +6064,13 @@ en:
     contact:ok: Key:contact:ok
     contact:phone: Key:contact:phone
     contact:pinterest: Key:contact:pinterest
     contact:ok: Key:contact:ok
     contact:phone: Key:contact:phone
     contact:pinterest: Key:contact:pinterest
+    contact:pobox: Key:contact:pobox
     contact:postcode: Key:contact:postcode
     contact:postcode: Key:contact:postcode
+    contact:sip: Key:contact:sip
     contact:skype: Key:contact:skype
     contact:street: Key:contact:street
     contact:telegram: Key:contact:telegram
     contact:skype: Key:contact:skype
     contact:street: Key:contact:street
     contact:telegram: Key:contact:telegram
+    contact:tiktok: Key:contact:tiktok
     contact:twitter: Key:contact:twitter
     contact:vhf: Key:contact:vhf
     contact:viber: Key:contact:viber
     contact:twitter: Key:contact:twitter
     contact:vhf: Key:contact:vhf
     contact:viber: Key:contact:viber
@@ -5136,10 +6081,21 @@ en:
     contact:xing: Key:contact:xing
     contact:xmpp: Key:contact:xmpp
     contact:youtube: Key:contact:youtube
     contact:xing: Key:contact:xing
     contact:xmpp: Key:contact:xmpp
     contact:youtube: Key:contact:youtube
+    contamination: Key:contamination
     content: Key:content
     content: Key:content
+    converted_by: Key:converted by
     conveying: Key:conveying
     cooker: Key:cooker
     conveying: Key:conveying
     cooker: Key:cooker
+    cooling:method: Key:cooling:method
+    corbett: Key:corbett
+    corners: Key:corners
+    cosmha: Key:cosmha
+    counselling: Key:counselling
+    counselling_type:*: Key:counselling type:*
+    count: Key:count
     country: Key:country
     country: Key:country
+    couplings: Key:couplings
+    courts: Key:courts
     covered: Key:covered
     craft: Key:craft
     crane:type: Key:crane:type
     covered: Key:covered
     craft: Key:craft
     crane:type: Key:crane:type
@@ -5147,70 +6103,115 @@ en:
     crop: Key:crop
     crossing: Key:crossing
     crossing:activation: Key:crossing:activation
     crop: Key:crop
     crossing: Key:crossing
     crossing:activation: Key:crossing:activation
+    crossing:aircraft: Key:crossing:aircraft
     crossing:barrier: Key:crossing:barrier
     crossing:bell: Key:crossing:bell
     crossing:barrier: Key:crossing:barrier
     crossing:bell: Key:crossing:bell
+    crossing:chicane: Key:crossing:chicane
     crossing:island: Key:crossing:island
     crossing:light: Key:crossing:light
     crossing:island: Key:crossing:island
     crossing:light: Key:crossing:light
+    crossing:markings: Key:crossing:markings
     crossing:on_demand: Key:crossing:on demand
     crossing:saltire: Key:crossing:saltire
     crossing:on_demand: Key:crossing:on demand
     crossing:saltire: Key:crossing:saltire
+    crossing:signals: Key:crossing:signals
+    crossing:whistle: Key:crossing:whistle
     crossing_ref: Key:crossing ref
     crossing_ref: Key:crossing ref
+    cruising: Key:cruising
+    cs_dir:backward: Key:cs dir:backward
+    cs_dir:forward: Key:cs dir:forward
     cuisine: Key:cuisine
     cultivation_method: Key:cultivation method
     currency: Key:currency
     cuisine: Key:cuisine
     cultivation_method: Key:cultivation method
     currency: Key:currency
+    currency:*: Key:currency:*
     currency:BTC: Key:currency:BTC
     currency:CAD: Key:currency:CAD
     currency:BTC: Key:currency:BTC
     currency:CAD: Key:currency:CAD
+    currency:CHF: Key:currency:CHF
     currency:EUR: Key:currency:EUR
     currency:GBP: Key:currency:GBP
     currency:PLN: Key:currency:PLN
     currency:RUB: Key:currency:RUB
     currency:USD: Key:currency:USD
     currency:EUR: Key:currency:EUR
     currency:GBP: Key:currency:GBP
     currency:PLN: Key:currency:PLN
     currency:RUB: Key:currency:RUB
     currency:USD: Key:currency:USD
+    currency:XBT: Key:currency:XBT
+    currency:XLT: Key:currency:XLT
     currency:XXX: Key:currency:XXX
     currency:others: Key:currency:others
     curve: Key:curve
     currency:XXX: Key:currency:XXX
     currency:others: Key:currency:others
     curve: Key:curve
+    curve:name: Key:curve:name
+    curve:ref: Key:curve:ref
     curves: Key:curves
     curves: Key:curves
+    customers: Key:customers
     cutting: Key:cutting
     cyclability: Key:cyclability
     cycle: Key:cycle
     cutting: Key:cutting
     cyclability: Key:cyclability
     cycle: Key:cycle
+    cycle_barrier: Key:cycle barrier
+    cycle_barrier:installation: Key:cycle barrier:installation
+    cycle_highway: Key:cycle highway
     cycle_network: Key:cycle network
     cycle_network: Key:cycle network
+    cycle_rickshaw: Key:cycle rickshaw
     cyclestreet: Key:cyclestreet
     cyclestreets_id: Key:cyclestreets id
     cycleway: Key:cycleway
     cycleway:both: Key:cycleway:both
     cyclestreet: Key:cyclestreet
     cyclestreets_id: Key:cyclestreets id
     cycleway: Key:cycleway
     cycleway:both: Key:cycleway:both
+    cycleway:both:lane: Key:cycleway:both:lane
+    cycleway:both:oneway: Key:cycleway:both:oneway
     cycleway:buffer: Key:cycleway:buffer
     cycleway:buffer: Key:cycleway:buffer
+    cycleway:foot: Key:cycleway:foot
     cycleway:lane: Key:cycleway:lane
     cycleway:left: Key:cycleway:left
     cycleway:lane: Key:cycleway:lane
     cycleway:left: Key:cycleway:left
+    cycleway:left:buffer: Key:cycleway:left:buffer
     cycleway:left:lane: Key:cycleway:left:lane
     cycleway:left:oneway: Key:cycleway:left:oneway
     cycleway:left:lane: Key:cycleway:left:lane
     cycleway:left:oneway: Key:cycleway:left:oneway
+    cycleway:left:separation: Key:cycleway:left:separation
     cycleway:left=backward: Key:cycleway:left=backward
     cycleway:left=backward: Key:cycleway:left=backward
+    cycleway:oneway: Key:cycleway:oneway
     cycleway:right: Key:cycleway:right
     cycleway:right: Key:cycleway:right
+    cycleway:right:buffer: Key:cycleway:right:buffer
     cycleway:right:lane: Key:cycleway:right:lane
     cycleway:right:oneway: Key:cycleway:right:oneway
     cycleway:right:lane: Key:cycleway:right:lane
     cycleway:right:oneway: Key:cycleway:right:oneway
+    cycleway:right:separation: Key:cycleway:right:separation
     cycleway:right:surface: Key:cycleway:right:surface
     cycleway:right=forward: Key:cycleway:right=forward
     cycleway:right:surface: Key:cycleway:right:surface
     cycleway:right=forward: Key:cycleway:right=forward
+    cycleway:segregated: Key:cycleway:segregated
+    cycleway:separation: Key:cycleway:separation
     cycleway:surface: Key:cycleway:surface
     cycleway:width: Key:cycleway:width
     cycling_width: Key:cycling width
     cycleway:surface: Key:cycleway:surface
     cycleway:width: Key:cycleway:width
     cycling_width: Key:cycling width
+    damage: Key:damage
+    'damage:': 'Key:damage:'
+    damage:*: Key:damage:*
+    damage:date: Key:damage:date
+    damage:event: Key:damage:event
+    damage:event:wikidata: Key:damage:event:wikidata
+    damage:type: Key:damage:type
+    dance:style: Key:dance:style
+    dance:teaching: Key:dance:teaching
+    dark_store: Key:dark store
     date: Key:date
     date: Key:date
-    date_off: Key:date off
-    date_on: Key:date on
-    day_off: Key:day off
-    day_on: Key:day on
     de:amtlicher_gemeindeschluessel: Key:de:amtlicher gemeindeschluessel
     de:regionalschluessel: Key:de:regionalschluessel
     de:strassenschluessel: Key:de:strassenschluessel
     deanery: Key:deanery
     default_language: Key:default language
     de:amtlicher_gemeindeschluessel: Key:de:amtlicher gemeindeschluessel
     de:regionalschluessel: Key:de:regionalschluessel
     de:strassenschluessel: Key:de:strassenschluessel
     deanery: Key:deanery
     default_language: Key:default language
-    dehoga: Key:dehoga
+    defensive_works: Key:defensive works
+    deflection: Key:deflection
     delivery: Key:delivery
     delivery: Key:delivery
+    delivery:*: Key:delivery:*
+    delivery:conditional: Key:delivery:conditional
+    delivery:fee: Key:delivery:fee
+    delivery:partner: Key:delivery:partner
     delivery_point: Key:delivery point
     delivery_point:access: Key:delivery point:access
     delivery_point:type: Key:delivery point:type
     demolished: Key:demolished
     'demolished:': 'Key:demolished:'
     delivery_point: Key:delivery point
     delivery_point:access: Key:delivery point:access
     delivery_point:type: Key:delivery point:type
     demolished: Key:demolished
     'demolished:': 'Key:demolished:'
+    demolished:*: Key:demolished:*
     demolished:building: Key:demolished:building
     demolished:building: Key:demolished:building
+    'demolition:': 'Key:demolition:'
     denomination: Key:denomination
     denotation: Key:denotation
     denomination: Key:denomination
     denotation: Key:denotation
+    department: Key:department
     departures_board: Key:departures board
     departures_board: Key:departures board
+    departures_board:speech_output: Key:departures board:speech output
+    depot: Key:depot
     depth: Key:depth
     depth:clearance: Key:depth:clearance
     depth:dangerous: Key:depth:dangerous
     depth: Key:depth
     depth:clearance: Key:depth:clearance
     depth:dangerous: Key:depth:dangerous
@@ -5223,15 +6224,18 @@ en:
     descent: Key:descent
     description: Key:description
     description:ar: Key:description:ar
     descent: Key:descent
     description: Key:description
     description:ar: Key:description:ar
-    description:restrictions: Key:description:restrictions
-    descriptions:restrictions: Key:descriptions:restrictions
+    description:bicycle: Key:description:bicycle
     design: Key:design
     design:ref: Key:design:ref
     designation: Key:designation
     destination: Key:destination
     destination:ar: Key:destination:ar
     destination:arrow: Key:destination:arrow
     design: Key:design
     design:ref: Key:design:ref
     designation: Key:designation
     destination: Key:destination
     destination:ar: Key:destination:ar
     destination:arrow: Key:destination:arrow
+    destination:arrow:backward: Key:destination:arrow:backward
+    destination:arrow:forward: Key:destination:arrow:forward
     destination:arrow:lanes: Key:destination:arrow:lanes
     destination:arrow:lanes: Key:destination:arrow:lanes
+    destination:arrow:lanes:backward: Key:destination:arrow:lanes:backward
+    destination:arrow:lanes:forward: Key:destination:arrow:lanes:forward
     destination:backward: Key:destination:backward
     destination:colour: Key:destination:colour
     destination:colour:backward: Key:destination:colour:backward
     destination:backward: Key:destination:backward
     destination:colour: Key:destination:colour
     destination:colour:backward: Key:destination:colour:backward
@@ -5245,19 +6249,57 @@ en:
     destination:lanes:forward: Key:destination:lanes:forward
     destination:lang:ar: Key:destination:lang:ar
     destination:lang:ar:lanes: Key:destination:lang:ar:lanes
     destination:lanes:forward: Key:destination:lanes:forward
     destination:lang:ar: Key:destination:lang:ar
     destination:lang:ar:lanes: Key:destination:lang:ar:lanes
+    destination:lang:azb: Key:destination:lang:azb
+    destination:lang:de: Key:destination:lang:de
+    destination:lang:de:lanes: Key:destination:lang:de:lanes
+    destination:lang:es: Key:destination:lang:es
+    destination:lang:es:lanes: Key:destination:lang:es:lanes
+    destination:lang:fr: Key:destination:lang:fr
+    destination:lang:fr:lanes: Key:destination:lang:fr:lanes
+    destination:lang:grc: Key:destination:lang:grc
+    destination:lang:grc:lanes: Key:destination:lang:grc:lanes
+    destination:lang:sr: Key:destination:lang:sr
+    destination:lang:ur: Key:destination:lang:ur
     destination:street:ar: Key:destination:street:ar
     destination:street:lang:ar: Key:destination:street:lang:ar
     destination:street:lang:ar:backward: Key:destination:street:lang:ar:backward
     destination:street:lang:ar:forward: Key:destination:street:lang:ar:forward
     destination:street:ar: Key:destination:street:ar
     destination:street:lang:ar: Key:destination:street:lang:ar
     destination:street:lang:ar:backward: Key:destination:street:lang:ar:backward
     destination:street:lang:ar:forward: Key:destination:street:lang:ar:forward
+    destination:street:lang:arc: Key:destination:street:lang:arc
+    destination:street:lang:azb: Key:destination:street:lang:azb
+    destination:street:lang:azb:backward: Key:destination:street:lang:azb:backward
+    destination:street:lang:azb:forward: Key:destination:street:lang:azb:forward
+    destination:street:lang:de: Key:destination:street:lang:de
+    destination:street:lang:de:backward: Key:destination:street:lang:de:backward
+    destination:street:lang:de:forward: Key:destination:street:lang:de:forward
+    destination:street:lang:fr: Key:destination:street:lang:fr
+    destination:street:lang:fr:backward: Key:destination:street:lang:fr:backward
+    destination:street:lang:fr:forward: Key:destination:street:lang:fr:forward
+    destination:street:lang:grc: Key:destination:street:lang:grc
+    destination:street:lang:grc:backward: Key:destination:street:lang:grc:backward
+    destination:street:lang:grc:forward: Key:destination:street:lang:grc:forward
+    destination:street:lang:sr: Key:destination:street:lang:sr
+    destination:street:lang:sr:backward: Key:destination:street:lang:sr:backward
+    destination:street:lang:sr:forward: Key:destination:street:lang:sr:forward
+    destination:street:lang:syc: Key:destination:street:lang:syc
+    destination:street:lang:ur: Key:destination:street:lang:ur
+    destination:street:lang:ur:backward: Key:destination:street:lang:ur:backward
+    destination:street:lang:ur:forward: Key:destination:street:lang:ur:forward
     destination:symbol: Key:destination:symbol
     destination:to:lang:ar: Key:destination:to:lang:ar
     destination:symbol: Key:destination:symbol
     destination:to:lang:ar: Key:destination:to:lang:ar
+    destination:to:lang:de: Key:destination:to:lang:de
+    destination:to:lang:fr: Key:destination:to:lang:fr
+    destination:to:lang:grc: Key:destination:to:lang:grc
+    destination:to:lang:sr: Key:destination:to:lang:sr
+    destination:wikidata: Key:destination:wikidata
+    destroyed: Key:destroyed
+    'destroyed:': 'Key:destroyed:'
+    destroyed:*: Key:destroyed:*
     detour: Key:detour
     devices: Key:devices
     dewnr:park_id: Key:dewnr:park id
     dewnr:uid: Key:dewnr:uid
     dhm_id: Key:dhm id
     diameter: Key:diameter
     detour: Key:detour
     devices: Key:devices
     dewnr:park_id: Key:dewnr:park id
     dewnr:uid: Key:dewnr:uid
     dhm_id: Key:dhm id
     diameter: Key:diameter
-    diaper: Key:diaper
     dibavod:id: Key:dibavod:id
     diet: Key:diet
     'diet:': 'Key:diet:'
     dibavod:id: Key:dibavod:id
     diet: Key:diet
     'diet:': 'Key:diet:'
@@ -5267,6 +6309,7 @@ en:
     diet:halal: Key:diet:halal
     diet:kosher: Key:diet:kosher
     diet:lactose_free: Key:diet:lactose free
     diet:halal: Key:diet:halal
     diet:kosher: Key:diet:kosher
     diet:lactose_free: Key:diet:lactose free
+    diet:sugar_free: Key:diet:sugar free
     diet:vegan: Key:diet:vegan
     diet:vegetarian: Key:diet:vegetarian
     dinner: Key:dinner
     diet:vegan: Key:diet:vegan
     diet:vegetarian: Key:diet:vegetarian
     dinner: Key:dinner
@@ -5280,8 +6323,13 @@ en:
     diplomatic:services:non-immigrant_visas: Key:diplomatic:services:non-immigrant
       visas
     direction: Key:direction
     diplomatic:services:non-immigrant_visas: Key:diplomatic:services:non-immigrant
       visas
     direction: Key:direction
+    direction_*: Key:direction *
+    direction_*:symbol: Key:direction *:symbol
     direction_east: Key:direction east
     direction_north: Key:direction north
     direction_east: Key:direction east
     direction_north: Key:direction north
+    direction_north:ref: Key:direction north:ref
+    direction_north:route: Key:direction north:route
+    direction_north:symbol: Key:direction north:symbol
     direction_northeast: Key:direction northeast
     direction_northwest: Key:direction northwest
     direction_south: Key:direction south
     direction_northeast: Key:direction northeast
     direction_northwest: Key:direction northwest
     direction_south: Key:direction south
@@ -5292,37 +6340,60 @@ en:
     disabled: Key:disabled
     disabled_spaces: Key:disabled spaces
     disc_golf: Key:disc golf
     disabled: Key:disabled
     disabled_spaces: Key:disabled spaces
     disc_golf: Key:disc golf
+    disease:*: Key:disease:*
     dishwasher: Key:dishwasher
     dispensing: Key:dispensing
     display: Key:display
     dishwasher: Key:dishwasher
     dispensing: Key:dispensing
     display: Key:display
+    display_surface: Key:display surface
+    disputed_by: Key:disputed by
+    dist: Key:dist
+    dist:blue: Key:dist:blue
+    dist:red: Key:dist:red
+    dist:white: Key:dist:white
+    dist:yellow: Key:dist:yellow
     distance: Key:distance
     distance: Key:distance
-    distillery: Key:distillery
+    disused: Key:disused
     'disused:': 'Key:disused:'
     'disused:': 'Key:disused:'
+    disused:*: Key:disused:*
     disused:amenity: Key:disused:amenity
     disused:building: Key:disused:building
     disused:amenity: Key:disused:amenity
     disused:building: Key:disused:building
+    disused:highway: Key:disused:highway
+    disused:landuse: Key:disused:landuse
+    disused:leisure: Key:disused:leisure
     disused:office: Key:disused:office
     disused:place: Key:disused:place
     disused:railway: Key:disused:railway
     disused:shop: Key:disused:shop
     disused:watermill: Key:disused:watermill
     disused:office: Key:disused:office
     disused:place: Key:disused:place
     disused:railway: Key:disused:railway
     disused:shop: Key:disused:shop
     disused:watermill: Key:disused:watermill
+    disused=yes: Key:disused=yes
     divider: Key:divider
     divider: Key:divider
+    dock:height: Key:dock:height
+    dock:width: Key:dock:width
     dog: Key:dog
     dog: Key:dog
+    dog_washing: Key:dog washing
     dominant_taxon: Key:dominant taxon
     dominant_taxon: Key:dominant taxon
+    donald: Key:donald
     donation:compensation: Key:donation:compensation
     donation:compensation:payment: Key:donation:compensation:payment
     donation:compensation:vouchers: Key:donation:compensation:vouchers
     door: Key:door
     donation:compensation: Key:donation:compensation
     donation:compensation:payment: Key:donation:compensation:payment
     donation:compensation:vouchers: Key:donation:compensation:vouchers
     door: Key:door
+    door:height: Key:door:height
+    door:width: Key:door:width
     double_tracked_motor_vehicle: Key:double tracked motor vehicle
     draft: Key:draft
     double_tracked_motor_vehicle: Key:double tracked motor vehicle
     draft: Key:draft
-    drink: Key:drink
+    draisine: Key:draisine
+    dress_code: Key:dress code
+    drink:*: Key:drink:*
     drink:afri-cola: Key:drink:afri-cola
     drink:beer: Key:drink:beer
     drink:club-mate: Key:drink:club-mate
     drink:coffee: Key:drink:coffee
     drink:afri-cola: Key:drink:afri-cola
     drink:beer: Key:drink:beer
     drink:club-mate: Key:drink:club-mate
     drink:coffee: Key:drink:coffee
+    drink:espresso: Key:drink:espresso
     drink:kräusen: Key:drink:kräusen
     drink:milk: Key:drink:milk
     drink:milk-raw: Key:drink:milk-raw
     drink:raw_milk: Key:drink:raw milk
     drink:kräusen: Key:drink:kräusen
     drink:milk: Key:drink:milk
     drink:milk-raw: Key:drink:milk-raw
     drink:raw_milk: Key:drink:raw milk
+    drink:sparkling_wine: Key:drink:sparkling wine
     drink:tea: Key:drink:tea
     drink:wine: Key:drink:wine
     drinkable: Key:drinkable
     drink:tea: Key:drink:tea
     drink:wine: Key:drink:wine
     drinkable: Key:drinkable
@@ -5345,54 +6416,87 @@ en:
     earthquake: Key:earthquake
     earthquake:damage: Key:earthquake:damage
     easy_overtaking: Key:easy overtaking
     earthquake: Key:earthquake
     earthquake:damage: Key:earthquake:damage
     easy_overtaking: Key:easy overtaking
+    education: Key:education
+    education_program: Key:education program
     educational: Key:educational
     educational: Key:educational
+    ekatte: Key:ekatte
     ele: Key:ele
     ele:NHN: Key:ele:NHN
     ele:local: Key:ele:local
     ele: Key:ele
     ele:NHN: Key:ele:NHN
     ele:local: Key:ele:local
+    ele:max: Key:ele:max
+    ele:min: Key:ele:min
+    ele:natural: Key:ele:natural
     ele:wgs84: Key:ele:wgs84
     electric_bicycle: Key:electric bicycle
     ele:wgs84: Key:ele:wgs84
     electric_bicycle: Key:electric bicycle
+    electric_scooter: Key:electric scooter
     electricity: Key:electricity
     electrified: Key:electrified
     electricity: Key:electricity
     electrified: Key:electrified
+    electronics: Key:electronics
     elevator: Key:elevator
     email: Key:email
     embankment: Key:embankment
     elevator: Key:elevator
     email: Key:email
     embankment: Key:embankment
+    embankment:side: Key:embankment:side
+    embankment:type: Key:embankment:type
     embassy: Key:embassy
     embassy: Key:embassy
+    embedded: Key:embedded
     embedded_rails: Key:embedded rails
     embedded_rails:lanes: Key:embedded rails:lanes
     emergency: Key:emergency
     embedded_rails: Key:embedded rails
     embedded_rails:lanes: Key:embedded rails:lanes
     emergency: Key:emergency
+    'emergency:': 'Key:emergency:'
+    emergency:*: Key:emergency:*
+    emergency:_prefix: 'Key:emergency: prefix'
+    emergency:amenity: Key:emergency:amenity
     emergency:phone: Key:emergency:phone
     emergency:phone: Key:emergency:phone
+    emergency:social_facility: Key:emergency:social facility
+    emergency_room: Key:emergency room
+    emergency_telephone_code: Key:emergency telephone code
     employee: Key:employee
     end_date: Key:end date
     employee: Key:employee
     end_date: Key:end date
+    end_date:edtf: Key:end date:edtf
     enforcement: Key:enforcement
     engineer: Key:engineer
     enforcement: Key:enforcement
     engineer: Key:engineer
+    entidad_te: Key:entidad te
     entrance: Key:entrance
     entrance: Key:entrance
-    escalator: Key:escalator
+    entrance:ramp: Key:entrance:ramp
+    ephemeral: Key:ephemeral
+    escooter: Key:escooter
+    esr:user: Key:esr:user
     est_height: Key:est height
     est_length: Key:est length
     est_width: Key:est width
     est_height: Key:est height
     est_length: Key:est length
     est_width: Key:est width
+    estuary: Key:estuary
     etymology: Key:etymology
     etymology: Key:etymology
+    euro_const: Key:euro const
     european_cultural_path: Key:european cultural path
     evacuation_route: Key:evacuation route
     european_cultural_path: Key:european cultural path
     evacuation_route: Key:evacuation route
+    events_venue: Key:events venue
+    excavation: Key:excavation
     exhibit: Key:exhibit
     exit: Key:exit
     exit_to: Key:exit to
     expected_rcn_route_relations: Key:expected rcn route relations
     expressway: Key:expressway
     exhibit: Key:exhibit
     exit: Key:exit
     exit_to: Key:exit to
     expected_rcn_route_relations: Key:expected rcn route relations
     expressway: Key:expressway
+    extinguishing:medium: Key:extinguishing:medium
     facebook: Key:facebook
     faces: Key:faces
     facebook: Key:facebook
     faces: Key:faces
-    factory: Key:factory
     fair_trade: Key:fair trade
     fair_trade: Key:fair trade
+    fallow: Key:fallow
     farming_system: Key:farming system
     farming_system: Key:farming system
+    farmland: Key:farmland
     farmyard: Key:farmyard
     fast_food: Key:fast food
     fax: Key:fax
     fcc:registration_number: Key:fcc:registration number
     fcc:unique_system_identifier: Key:fcc:unique system identifier
     farmyard: Key:farmyard
     fast_food: Key:fast food
     fax: Key:fax
     fcc:registration_number: Key:fcc:registration number
     fcc:unique_system_identifier: Key:fcc:unique system identifier
+    fcode: Key:fcode
+    fdep:landuse_code: Key:fdep:landuse code
     fee: Key:fee
     fee:conditional: Key:fee:conditional
     fee:disabled: Key:fee:disabled
     fee:disabled_assistant: Key:fee:disabled assistant
     fee: Key:fee
     fee:conditional: Key:fee:conditional
     fee:disabled: Key:fee:disabled
     fee:disabled_assistant: Key:fee:disabled assistant
+    feeding:type: Key:feeding:type
     female: Key:female
     female: Key:female
+    female:conditional: Key:female:conditional
     fence_type: Key:fence type
     fenced: Key:fenced
     ferry: Key:ferry
     fence_type: Key:fence type
     fenced: Key:fenced
     ferry: Key:ferry
@@ -5401,37 +6505,61 @@ en:
     fhrs:authority: Key:fhrs:authority
     fhrs:id: Key:fhrs:id
     fhrs:local_authority_id: Key:fhrs:local authority id
     fhrs:authority: Key:fhrs:authority
     fhrs:id: Key:fhrs:id
     fhrs:local_authority_id: Key:fhrs:local authority id
+    fid: Key:fid
     field: Key:field
     finance_agent: Key:finance agent
     field: Key:field
     finance_agent: Key:finance agent
+    fine: Key:fine
     fire: Key:fire
     fire_boundary: Key:fire boundary
     fire: Key:fire
     fire_boundary: Key:fire boundary
+    fire_class: Key:fire class
     fire_hydrant: Key:fire hydrant
     fire_hydrant: Key:fire hydrant
+    fire_hydrant:diameter: Key:fire hydrant:diameter
+    fire_hydrant:diameter:signed: Key:fire hydrant:diameter:signed
+    fire_mains: Key:fire mains
     fire_object:type: Key:fire object:type
     fire_operator: Key:fire operator
     fire_object:type: Key:fire object:type
     fire_operator: Key:fire operator
+    fire_path: Key:fire path
     fire_rank: Key:fire rank
     fire_rank: Key:fire rank
+    fire_service_inlet: Key:fire service inlet
+    fire_sprinkler: Key:fire sprinkler
+    fire_station:type: Key:fire station:type
     firearms: Key:firearms
     fireplace: Key:fireplace
     fishing: Key:fishing
     fitness_station: Key:fitness station
     firearms: Key:firearms
     fireplace: Key:fireplace
     fishing: Key:fishing
     fitness_station: Key:fitness station
+    fix_guidepost: Key:fix guidepost
     fixme: Key:fixme
     fixme: Key:fixme
+    fixme:osmchina: Key:fixme:osmchina
+    flag: Key:flag
     flag:name: Key:flag:name
     flag:type: Key:flag:type
     flag:wikidata: Key:flag:wikidata
     flag:name: Key:flag:name
     flag:type: Key:flag:type
     flag:wikidata: Key:flag:wikidata
+    flashing_lights: Key:flashing lights
     flat_steps: Key:flat steps
     flat_steps: Key:flat steps
+    flats: Key:flats
     flickr: Key:flickr
     floating: Key:floating
     flickr: Key:flickr
     floating: Key:floating
+    flood_date: Key:flood date
     flood_mark: Key:flood mark
     flood_prone: Key:flood prone
     floor:material: Key:floor:material
     flood_mark: Key:flood mark
     flood_prone: Key:flood prone
     floor:material: Key:floor:material
+    flow_direction: Key:flow direction
     flow_rate: Key:flow rate
     food: Key:food
     flow_rate: Key:flow rate
     food: Key:food
+    food:*: Key:food:*
+    food:hot_dog: Key:food:hot dog
+    food:pizza: Key:food:pizza
     foot: Key:foot
     foot:backward: Key:foot:backward
     foot:forward: Key:foot:forward
     foot: Key:foot
     foot:backward: Key:foot:backward
     foot:forward: Key:foot:forward
+    foot_traffic: Key:foot traffic
     footway: Key:footway
     footway:surface: Key:footway:surface
     footway: Key:footway
     footway:surface: Key:footway:surface
+    for: Key:for
+    foraging: Key:foraging
     ford: Key:ford
     forestry: Key:forestry
     ford: Key:ford
     forestry: Key:forestry
+    forklift: Key:forklift
     format: Key:format
     format:top: Key:format:top
     fortification_type: Key:fortification type
     format: Key:format
     format:top: Key:format:top
     fortification_type: Key:fortification type
@@ -5442,6 +6570,19 @@ en:
     fridge: Key:fridge
     from: Key:from
     from:ar: Key:from:ar
     fridge: Key:fridge
     from: Key:from
     from:ar: Key:from:ar
+    from:arc: Key:from:arc
+    from:azb: Key:from:azb
+    from:be: Key:from:be
+    from:de: Key:from:de
+    from:es: Key:from:es
+    from:fr: Key:from:fr
+    from:gr: Key:from:gr
+    from:grc: Key:from:grc
+    from:kk: Key:from:kk
+    from:sr: Key:from:sr
+    from:syc: Key:from:syc
+    from:ug: Key:from:ug
+    from:ur: Key:from:ur
     fruit: Key:fruit
     fuel: Key:fuel
     fuel:1_25: Key:fuel:1 25
     fruit: Key:fruit
     fuel: Key:fuel
     fuel:1_25: Key:fuel:1 25
@@ -5474,16 +6615,22 @@ en:
     fuel:octane_95: Key:fuel:octane 95
     fuel:octane_98: Key:fuel:octane 98
     fuel:svo: Key:fuel:svo
     fuel:octane_95: Key:fuel:octane 95
     fuel:octane_98: Key:fuel:octane 98
     fuel:svo: Key:fuel:svo
+    full_name: Key:full name
     furniture: Key:furniture
     furniture: Key:furniture
+    fut_ref: Key:fut ref
+    fvst:name: Key:fvst:name
     fvst:navnelbnr: Key:fvst:navnelbnr
     gambling: Key:gambling
     garden:style: Key:garden:style
     garden:type: Key:garden:type
     fvst:navnelbnr: Key:fvst:navnelbnr
     gambling: Key:gambling
     garden:style: Key:garden:style
     garden:type: Key:garden:type
+    gate:type: Key:gate:type
     gauge: Key:gauge
     gay: Key:gay
     gauge: Key:gauge
     gay: Key:gay
+    gender: Key:gender
     gender_segregated: Key:gender segregated
     generator:method: Key:generator:method
     generator:output: Key:generator:output
     gender_segregated: Key:gender segregated
     generator:method: Key:generator:method
     generator:output: Key:generator:output
+    generator:output:*: Key:generator:output:*
     generator:output:biogas: Key:generator:output:biogas
     generator:output:cold_air: Key:generator:output:cold air
     generator:output:cold_water: Key:generator:output:cold water
     generator:output:biogas: Key:generator:output:biogas
     generator:output:cold_air: Key:generator:output:cold air
     generator:output:cold_water: Key:generator:output:cold water
@@ -5492,36 +6639,49 @@ en:
     generator:output:heat: Key:generator:output:heat
     generator:output:hot_air: Key:generator:output:hot air
     generator:output:hot_water: Key:generator:output:hot water
     generator:output:heat: Key:generator:output:heat
     generator:output:hot_air: Key:generator:output:hot air
     generator:output:hot_water: Key:generator:output:hot water
+    generator:output:hydrogen: Key:generator:output:hydrogen
     generator:output:steam: Key:generator:output:steam
     generator:output:vacuum: Key:generator:output:vacuum
     generator:place: Key:generator:place
     generator:plant: Key:generator:plant
     generator:solar:modules: Key:generator:solar:modules
     generator:output:steam: Key:generator:output:steam
     generator:output:vacuum: Key:generator:output:vacuum
     generator:place: Key:generator:place
     generator:plant: Key:generator:plant
     generator:solar:modules: Key:generator:solar:modules
+    generator:solar:tracking: Key:generator:solar:tracking
     generator:source: Key:generator:source
     generator:source: Key:generator:source
+    generator:storage: Key:generator:storage
     generator:type: Key:generator:type
     genus: Key:genus
     genus:ar: Key:genus:ar
     genus:de: Key:genus:de
     genus:en: Key:genus:en
     generator:type: Key:generator:type
     genus: Key:genus
     genus:ar: Key:genus:ar
     genus:de: Key:genus:de
     genus:en: Key:genus:en
+    genus:it: Key:genus:it
     genus:ru: Key:genus:ru
     genus:ru: Key:genus:ru
+    genus:wikidata: Key:genus:wikidata
+    geobase:acquisitionTechnique: Key:geobase:acquisitionTechnique
     geocodigo: Key:geocodigo
     geological: Key:geological
     geothermal: Key:geothermal
     geocodigo: Key:geocodigo
     geological: Key:geological
     geothermal: Key:geothermal
+    geyser:type: Key:geyser:type
+    gift: Key:gift
     glacier:part: Key:glacier:part
     glacier:type: Key:glacier:type
     glacier:part: Key:glacier:part
     glacier:type: Key:glacier:type
-    gluten_free: Key:gluten free
+    glideslope: Key:glideslope
     gnis:fcode: Key:gnis:fcode
     gnis:feature_id: Key:gnis:feature id
     gnis:ftype: Key:gnis:ftype
     gnis:id: Key:gnis:id
     gnis:fcode: Key:gnis:fcode
     gnis:feature_id: Key:gnis:feature id
     gnis:ftype: Key:gnis:ftype
     gnis:id: Key:gnis:id
+    gnis:import_uuid: Key:gnis:import uuid
     golf: Key:golf
     golf:course: Key:golf:course
     golf: Key:golf
     golf:course: Key:golf:course
+    golf:par: Key:golf:par
     golf_cart: Key:golf cart
     goods: Key:goods
     government: Key:government
     grades: Key:grades
     golf_cart: Key:golf cart
     goods: Key:goods
     government: Key:government
     grades: Key:grades
+    graham: Key:graham
     grape_variety: Key:grape variety
     grassland: Key:grassland
     grape_variety: Key:grape variety
     grassland: Key:grassland
+    grate: Key:grate
+    green_roof: Key:green roof
     gritting: Key:gritting
     group_only: Key:group only
     gtfs:feed: Key:gtfs:feed
     gritting: Key:gritting
     group_only: Key:group only
     gtfs:feed: Key:gtfs:feed
@@ -5534,11 +6694,14 @@ en:
     gtfs:trip_id:sample: Key:gtfs:trip id:sample
     guest_house: Key:guest house
     guide: Key:guide
     gtfs:trip_id:sample: Key:gtfs:trip id:sample
     guest_house: Key:guest house
     guide: Key:guide
+    guide_type: Key:guide type
     guidepost: Key:guidepost
     guidepost:hiking: Key:guidepost:hiking
     guidepost: Key:guidepost
     guidepost:hiking: Key:guidepost:hiking
+    guidepost_shape: Key:guidepost shape
     gun_emplacement_type: Key:gun emplacement type
     gun_turret: Key:gun turret
     gvr:code: Key:gvr:code
     gun_emplacement_type: Key:gun emplacement type
     gun_turret: Key:gun turret
     gvr:code: Key:gvr:code
+    hand_cart: Key:hand cart
     handicap: Key:handicap
     handle: Key:handle
     handrail: Key:handrail
     handicap: Key:handicap
     handle: Key:handle
     handrail: Key:handrail
@@ -5551,24 +6714,38 @@ en:
     harvest_first_year: Key:harvest first year
     hazard: Key:hazard
     hazard:animal: Key:hazard:animal
     harvest_first_year: Key:harvest first year
     hazard: Key:hazard
     hazard:animal: Key:hazard:animal
+    hazard:backward: Key:hazard:backward
+    hazard:forward: Key:hazard:forward
     hazard_intensity: Key:hazard intensity
     hazard_occurence: Key:hazard occurence
     hazard_occurrence: Key:hazard occurrence
     hazard_prone: Key:hazard prone
     hazard_return_period: Key:hazard return period
     hazard_intensity: Key:hazard intensity
     hazard_occurence: Key:hazard occurence
     hazard_occurrence: Key:hazard occurrence
     hazard_prone: Key:hazard prone
     hazard_return_period: Key:hazard return period
-    hazard_type: Key:hazard type
     hazmat: Key:hazmat
     hazmat: Key:hazmat
+    hazmat:explosive: Key:hazmat:explosive
     hazmat:water: Key:hazmat:water
     headframe: Key:headframe
     hazmat:water: Key:hazmat:water
     headframe: Key:headframe
+    headlight: Key:headlight
+    health_amenity:*: Key:health amenity:*
+    health_amenity:type: Key:health amenity:type
+    health_facility:CD: Key:health facility:CD
+    health_facility:type: Key:health facility:type
+    health_service:*: Key:health service:*
+    health_service:counselling: Key:health service:counselling
+    health_specialty:*: Key:health specialty:*
     healthcare: Key:healthcare
     healthcare:counselling: Key:healthcare:counselling
     healthcare:speciality: Key:healthcare:speciality
     healthcare: Key:healthcare
     healthcare:counselling: Key:healthcare:counselling
     healthcare:speciality: Key:healthcare:speciality
+    heater: Key:heater
     heating: Key:heating
     heating: Key:heating
+    hedge: Key:hedge
     height: Key:height
     height:hub: Key:height:hub
     height: Key:height
     height:hub: Key:height:hub
+    height:range: Key:height:range
     heritage: Key:heritage
     heritage:label:FR: Key:heritage:label:FR
     heritage:operator: Key:heritage:operator
     heritage: Key:heritage
     heritage:label:FR: Key:heritage:label:FR
     heritage:operator: Key:heritage:operator
+    heritage:website: Key:heritage:website
     hgv: Key:hgv
     hgv:national_network: Key:hgv:national network
     hgv_articulated: Key:hgv articulated
     hgv: Key:hgv
     hgv:national_network: Key:hgv:national network
     hgv_articulated: Key:hgv articulated
@@ -5576,26 +6753,34 @@ en:
     highchair: Key:highchair
     highspeed: Key:highspeed
     highway: Key:highway
     highchair: Key:highchair
     highspeed: Key:highspeed
     highway: Key:highway
+    highway:CN: Key:highway:CN
     highway:category: Key:highway:category
     highway:category:pl: Key:highway:category:pl
     highway:class:pl: Key:highway:class:pl
     highway:category: Key:highway:category
     highway:category:pl: Key:highway:category:pl
     highway:class:pl: Key:highway:class:pl
+    highway_authority_ref: Key:highway authority ref
     hiking: Key:hiking
     historic: Key:historic
     historic:civilization: Key:historic:civilization
     historic:era: Key:historic:era
     historic:period: Key:historic:period
     hiking: Key:hiking
     historic: Key:historic
     historic:civilization: Key:historic:civilization
     historic:era: Key:historic:era
     historic:period: Key:historic:period
-    historic_name: Key:historic name
     history: Key:history
     history: Key:history
+    hiv: Key:hiv
+    hiv:test: Key:hiv:test
+    honking: Key:honking
     hoops: Key:hoops
     horse: Key:horse
     horse-drawn_carriage: Key:horse-drawn carriage
     horse_scale: Key:horse scale
     hoops: Key:hoops
     horse: Key:horse
     horse-drawn_carriage: Key:horse-drawn carriage
     horse_scale: Key:horse scale
-    hour_off: Key:hour off
-    hour_on: Key:hour on
+    hospital:level:CN: Key:hospital:level:CN
+    hospital:level:DE: Key:hospital:level:DE
+    host: Key:host
+    hot_water: Key:hot water
     house: Key:house
     hov: Key:hov
     hov:lanes: Key:hov:lanes
     house: Key:house
     hov: Key:hov
     hov:lanes: Key:hov:lanes
+    hov:minimum: Key:hov:minimum
     hunting: Key:hunting
     hunting: Key:hunting
+    hunting_stand: Key:hunting stand
     iata: Key:iata
     icao: Key:icao
     ice_cream: Key:ice cream
     iata: Key:iata
     icao: Key:icao
     ice_cream: Key:ice cream
@@ -5607,8 +6792,10 @@ en:
     ifr: Key:ifr
     ignore_for_routing: Key:ignore for routing
     image: Key:image
     ifr: Key:ifr
     ignore_for_routing: Key:ignore for routing
     image: Key:image
+    image:streetsign: Key:image:streetsign
     imagery_offset: Key:imagery offset
     imagery_used: Key:imagery used
     imagery_offset: Key:imagery offset
     imagery_used: Key:imagery used
+    implicit: Key:implicit
     import: Key:import
     import_uuid: Key:import uuid
     importance: Key:importance
     import: Key:import
     import_uuid: Key:import uuid
     importance: Key:importance
@@ -5621,18 +6808,33 @@ en:
     industrial: Key:industrial
     industry:isic_code: Key:industry:isic code
     infant_bed: Key:infant bed
     industrial: Key:industrial
     industry:isic_code: Key:industry:isic code
     infant_bed: Key:infant bed
+    infection:hiv: Key:infection:hiv
+    info: Key:info
     informal: Key:informal
     information: Key:information
     informal: Key:informal
     information: Key:information
+    inlet: Key:inlet
     inline_skates: Key:inline skates
     inscription: Key:inscription
     inscription:ar: Key:inscription:ar
     inscription:url: Key:inscription:url
     int_name: Key:int name
     int_name:ar: Key:int name:ar
     inline_skates: Key:inline skates
     inscription: Key:inscription
     inscription:ar: Key:inscription:ar
     inscription:url: Key:inscription:url
     int_name: Key:int name
     int_name:ar: Key:int name:ar
+    int_name:arc: Key:int name:arc
+    int_name:de: Key:int name:de
+    int_name:es: Key:int name:es
+    int_name:gr: Key:int name:gr
+    int_name:grc: Key:int name:grc
+    int_name:syc: Key:int name:syc
     int_ref: Key:int ref
     int_ref:ar: Key:int ref:ar
     int_ref: Key:int ref
     int_ref:ar: Key:int ref:ar
+    int_ref:arc: Key:int ref:arc
+    int_ref:de: Key:int ref:de
+    int_ref:es: Key:int ref:es
+    int_ref:fr: Key:int ref:fr
+    int_ref:gr: Key:int ref:gr
+    int_ref:grc: Key:int ref:grc
+    int_ref:syc: Key:int ref:syc
     intermittent: Key:intermittent
     intermittent: Key:intermittent
-    internet: Key:internet
     internet_access: Key:internet access
     internet_access:fee: Key:internet access:fee
     internet_access:operator: Key:internet access:operator
     internet_access: Key:internet access
     internet_access:fee: Key:internet access:fee
     internet_access:operator: Key:internet access:operator
@@ -5662,6 +6864,7 @@ en:
     it:fvg:ctrn:code: Key:it:fvg:ctrn:code
     iucn_level: Key:iucn level
     jel: Key:jel
     it:fvg:ctrn:code: Key:it:fvg:ctrn:code
     iucn_level: Key:iucn level
     jel: Key:jel
+    jetski: Key:jetski
     jetski:rental: Key:jetski:rental
     jetski:sales: Key:jetski:sales
     junction: Key:junction
     jetski:rental: Key:jetski:rental
     jetski:sales: Key:jetski:sales
     junction: Key:junction
@@ -5675,6 +6878,9 @@ en:
     kct_white: Key:kct white
     kct_yellow: Key:kct yellow
     kerb: Key:kerb
     kct_white: Key:kct white
     kct_yellow: Key:kct yellow
     kerb: Key:kerb
+    kerb:approach_aid: Key:kerb:approach aid
+    kerb:height: Key:kerb:height
+    kick_scooter: Key:kick scooter
     kids_area: Key:kids area
     kinky: Key:kinky
     kms: Key:kms
     kids_area: Key:kids area
     kinky: Key:kinky
     kms: Key:kms
@@ -5690,17 +6896,21 @@ en:
     kms:zip_name: Key:kms:zip name
     kms:zip_no: Key:kms:zip no
     kneipp_water_cure: Key:kneipp water cure
     kms:zip_name: Key:kms:zip name
     kms:zip_no: Key:kms:zip no
     kneipp_water_cure: Key:kneipp water cure
-    kp: Key:kp
+    kons:inscription_date: Key:kons:inscription date
     kudish: Key:kudish
     kudish: Key:kudish
+    kurb: Key:kurb
     lacounty:ain: Key:lacounty:ain
     lacounty:bld_id: Key:lacounty:bld id
     ladder: Key:ladder
     lacounty:ain: Key:lacounty:ain
     lacounty:bld_id: Key:lacounty:bld id
     ladder: Key:ladder
+    lamp_flames: Key:lamp flames
     lamp_model: Key:lamp model
     lamp_mount: Key:lamp mount
     lamp_type: Key:lamp type
     lamp_model: Key:lamp model
     lamp_mount: Key:lamp mount
     lamp_type: Key:lamp type
+    landcover: Key:landcover
     landfill:waste: Key:landfill:waste
     landform: Key:landform
     landmark: Key:landmark
     landfill:waste: Key:landfill:waste
     landform: Key:landform
     landmark: Key:landmark
+    landslide: Key:landslide
     landuse: Key:landuse
     lane_markings: Key:lane markings
     lanes: Key:lanes
     landuse: Key:landuse
     lane_markings: Key:lane markings
     lanes: Key:lanes
@@ -5712,19 +6922,32 @@ en:
     lanes:psv:backward: Key:lanes:psv:backward
     lanes:psv:forward: Key:lanes:psv:forward
     language: Key:language
     lanes:psv:backward: Key:lanes:psv:backward
     lanes:psv:forward: Key:lanes:psv:forward
     language: Key:language
+    language:*: Key:language:*
     language:LL: Key:language:LL
     language:ar: Key:language:ar
     language:LL: Key:language:LL
     language:ar: Key:language:ar
+    language:arc: Key:language:arc
     language:azb: Key:language:azb
     language:ckb: Key:language:ckb
     language:azb: Key:language:azb
     language:ckb: Key:language:ckb
+    language:de: Key:language:de
+    language:el: Key:language:el
+    language:es: Key:language:es
     language:fa: Key:language:fa
     language:fa: Key:language:fa
+    language:fr: Key:language:fr
     language:glk: Key:language:glk
     language:glk: Key:language:glk
+    language:gr: Key:language:gr
+    language:grc: Key:language:grc
     language:ks: Key:language:ks
     language:lrc: Key:language:lrc
     language:mzn: Key:language:mzn
     language:ks: Key:language:ks
     language:lrc: Key:language:lrc
     language:mzn: Key:language:mzn
+    language:pa: Key:language:pa
     language:ps: Key:language:ps
     language:sd: Key:language:sd
     language:ps: Key:language:ps
     language:sd: Key:language:sd
+    language:sr: Key:language:sr
+    language:syc: Key:language:syc
     language:ug: Key:language:ug
     language:ur: Key:language:ur
     language:ug: Key:language:ug
     language:ur: Key:language:ur
+    lat: Key:lat
+    latitude: Key:latitude
     lawyer: Key:lawyer
     layer: Key:layer
     lcn: Key:lcn
     lawyer: Key:lawyer
     layer: Key:layer
     lcn: Key:lcn
@@ -5737,50 +6960,83 @@ en:
     length: Key:length
     level: Key:level
     level:ref: Key:level:ref
     length: Key:length
     level: Key:level
     level:ref: Key:level:ref
+    levels: Key:levels
     lgbt: Key:lgbt
     lgbtq: Key:lgbtq
     lhv: Key:lhv
     liaison: Key:liaison
     lgbt: Key:lgbt
     lgbtq: Key:lgbtq
     lhv: Key:lhv
     liaison: Key:liaison
+    license: Key:license
     license_classes: Key:license classes
     license_classes: Key:license classes
+    lifeguard: Key:lifeguard
     light_rail: Key:light rail
     lighting:perceived: Key:lighting:perceived
     line: Key:line
     light_rail: Key:light rail
     lighting:perceived: Key:lighting:perceived
     line: Key:line
+    line_arrangement: Key:line arrangement
     line_attachement: Key:line attachement
     line_attachment: Key:line attachment
     line_management: Key:line management
     listed_status: Key:listed status
     lit: Key:lit
     lit:perceived: Key:lit:perceived
     line_attachement: Key:line attachement
     line_attachment: Key:line attachment
     line_management: Key:line management
     listed_status: Key:listed status
     lit: Key:lit
     lit:perceived: Key:lit:perceived
+    lit_by_led: Key:lit by led
+    livestock: Key:livestock
     living_street: Key:living street
     loading_gauge: Key:loading gauge
     loc_name: Key:loc name
     loc_name:ar: Key:loc name:ar
     living_street: Key:living street
     loading_gauge: Key:loading gauge
     loc_name: Key:loc name
     loc_name:ar: Key:loc name:ar
+    loc_name:de: Key:loc name:de
+    loc_name:es: Key:loc name:es
     loc_name:fa: Key:loc name:fa
     loc_name:fa: Key:loc name:fa
+    loc_name:fr: Key:loc name:fr
+    loc_name:fur: Key:loc name:fur
+    loc_name:gr: Key:loc name:gr
+    loc_name:grc: Key:loc name:grc
     loc_name:ur: Key:loc name:ur
     loc_ref: Key:loc ref
     local_authority:FR: Key:local authority:FR
     local_ref: Key:local ref
     locale: Key:locale
     loc_name:ur: Key:loc name:ur
     loc_ref: Key:loc ref
     local_authority:FR: Key:local authority:FR
     local_ref: Key:local ref
     locale: Key:locale
+    locality: Key:locality
+    localizer: Key:localizer
     localwiki: Key:localwiki
     location: Key:location
     lock: Key:lock
     localwiki: Key:localwiki
     location: Key:location
     lock: Key:lock
+    lock:height: Key:lock:height
     lock_name: Key:lock name
     lock_ref: Key:lock ref
     lockable: Key:lockable
     locked: Key:locked
     locked:conditional: Key:locked:conditional
     lock_name: Key:lock name
     lock_ref: Key:lock ref
     lockable: Key:lockable
     locked: Key:locked
     locked:conditional: Key:locked:conditional
+    locker: Key:locker
+    logainm:*: Key:logainm:*
+    logistics: Key:logistics
+    lojic:bgnum: Key:lojic:bgnum
+    lon: Key:lon
     long_name: Key:long name
     long_name:ar: Key:long name:ar
     long_name: Key:long name
     long_name:ar: Key:long name:ar
+    long_name:arc: Key:long name:arc
     long_name:azb: Key:long name:azb
     long_name:azb: Key:long name:azb
+    long_name:de: Key:long name:de
+    long_name:es: Key:long name:es
     long_name:fa: Key:long name:fa
     long_name:fa: Key:long name:fa
+    long_name:fr: Key:long name:fr
+    long_name:gr: Key:long name:gr
+    long_name:grc: Key:long name:grc
     long_name:pnb: Key:long name:pnb
     long_name:pnb: Key:long name:pnb
+    long_name:sr: Key:long name:sr
+    long_name:syc: Key:long name:syc
     long_name:ur: Key:long name:ur
     long_name:ur: Key:long name:ur
+    longitude: Key:longitude
     lottery: Key:lottery
     love_locks: Key:love locks
     lpn_ref: Key:lpn ref
     luminous: Key:luminous
     lunch: Key:lunch
     lottery: Key:lottery
     love_locks: Key:love locks
     lpn_ref: Key:lpn ref
     luminous: Key:luminous
     lunch: Key:lunch
+    lunch:*: Key:lunch:*
+    lunch:buffet: Key:lunch:buffet
+    lunch:menu: Key:lunch:menu
     lunch:specials: Key:lunch:specials
     lunch:specials: Key:lunch:specials
+    lwn: Key:lwn
     maaamet:ETAK: Key:maaamet:ETAK
     maintained: Key:maintained
     maintenance: Key:maintenance
     maaamet:ETAK: Key:maaamet:ETAK
     maintained: Key:maintained
     maintenance: Key:maintenance
@@ -5789,31 +7045,43 @@ en:
     managed: Key:managed
     manhole: Key:manhole
     manmade: Key:manmade
     managed: Key:managed
     manhole: Key:manhole
     manmade: Key:manmade
+    manual: Key:manual
     manufacturer: Key:manufacturer
     manufacturer: Key:manufacturer
-    manufacturer:type: Key:manufacturer:type
     manufacturer:wikidata: Key:manufacturer:wikidata
     manufacturer:wikidata: Key:manufacturer:wikidata
+    map_size: Key:map size
+    map_type: Key:map type
     mapillary: Key:mapillary
     mapper: Key:mapper
     mapillary: Key:mapillary
     mapper: Key:mapper
+    marilyn: Key:marilyn
     maritime: Key:maritime
     marker: Key:marker
     maritime: Key:maritime
     marker: Key:marker
+    mass_times: Key:mass times
     massage: Key:massage
     massgis:ARTICLE97: Key:massgis:ARTICLE97
     massgis:SITE_NAME: Key:massgis:SITE NAME
     massage: Key:massage
     massgis:ARTICLE97: Key:massgis:ARTICLE97
     massgis:SITE_NAME: Key:massgis:SITE NAME
+    mast:construction: Key:mast:construction
+    mast:type: Key:mast:type
     material: Key:material
     mattress: Key:mattress
     max_age: Key:max age
     material: Key:material
     mattress: Key:mattress
     max_age: Key:max age
+    max_level: Key:max level
     maxage: Key:maxage
     maxaxleload: Key:maxaxleload
     maxbogieweight: Key:maxbogieweight
     maxage: Key:maxage
     maxaxleload: Key:maxaxleload
     maxbogieweight: Key:maxbogieweight
+    maxcharge: Key:maxcharge
     maxdraft: Key:maxdraft
     maxdraft: Key:maxdraft
+    maxdraught: Key:maxdraught
     maxheight: Key:maxheight
     maxheight:legal: Key:maxheight:legal
     maxheight:physical: Key:maxheight:physical
     maxheight: Key:maxheight
     maxheight:legal: Key:maxheight:legal
     maxheight:physical: Key:maxheight:physical
+    maxheight:signed: Key:maxheight:signed
     maxlength: Key:maxlength
     maxlength: Key:maxlength
+    maxlength:physical: Key:maxlength:physical
     maxspeed: Key:maxspeed
     maxspeed:advisory: Key:maxspeed:advisory
     maxspeed:backward: Key:maxspeed:backward
     maxspeed:bus: Key:maxspeed:bus
     maxspeed: Key:maxspeed
     maxspeed:advisory: Key:maxspeed:advisory
     maxspeed:backward: Key:maxspeed:backward
     maxspeed:bus: Key:maxspeed:bus
+    maxspeed:coach: Key:maxspeed:coach
     maxspeed:conditional: Key:maxspeed:conditional
     maxspeed:forward: Key:maxspeed:forward
     maxspeed:hgv: Key:maxspeed:hgv
     maxspeed:conditional: Key:maxspeed:conditional
     maxspeed:forward: Key:maxspeed:forward
     maxspeed:hgv: Key:maxspeed:hgv
@@ -5821,15 +7089,20 @@ en:
     maxspeed:hgv:conditional: Key:maxspeed:hgv:conditional
     maxspeed:hgv:forward: Key:maxspeed:hgv:forward
     maxspeed:lanes: Key:maxspeed:lanes
     maxspeed:hgv:conditional: Key:maxspeed:hgv:conditional
     maxspeed:hgv:forward: Key:maxspeed:hgv:forward
     maxspeed:lanes: Key:maxspeed:lanes
+    maxspeed:night: Key:maxspeed:night
     maxspeed:practical: Key:maxspeed:practical
     maxspeed:practical: Key:maxspeed:practical
-    maxspeed:seasonal:winter: Key:maxspeed:seasonal:winter
+    maxspeed:psv:conditional: Key:maxspeed:psv:conditional
     maxspeed:source: Key:maxspeed:source
     maxspeed:source: Key:maxspeed:source
+    maxspeed:tilting: Key:maxspeed:tilting
     maxspeed:trailer: Key:maxspeed:trailer
     maxspeed:type: Key:maxspeed:type
     maxspeed:variable: Key:maxspeed:variable
     maxspeed:trailer: Key:maxspeed:trailer
     maxspeed:type: Key:maxspeed:type
     maxspeed:variable: Key:maxspeed:variable
+    maxspeed:wet: Key:maxspeed:wet
     maxstay: Key:maxstay
     maxstay: Key:maxstay
-    maxtents: Key:maxtents
+    maxstay:conditional: Key:maxstay:conditional
     maxweight: Key:maxweight
     maxweight: Key:maxweight
+    maxweight:conditional: Key:maxweight:conditional
+    maxweight:delivery: Key:maxweight:delivery
     maxweight:signed: Key:maxweight:signed
     maxweightrating: Key:maxweightrating
     maxweightrating:bus: Key:maxweightrating:bus
     maxweight:signed: Key:maxweight:signed
     maxweightrating: Key:maxweightrating
     maxweightrating:bus: Key:maxweightrating:bus
@@ -5840,27 +7113,43 @@ en:
     mdb_id: Key:mdb id
     meadow: Key:meadow
     measurement: Key:measurement
     mdb_id: Key:mdb id
     meadow: Key:meadow
     measurement: Key:measurement
+    mechanical: Key:mechanical
+    mechanical_coupling: Key:mechanical coupling
+    mechanical_driver: Key:mechanical driver
     medical_supply: Key:medical supply
     medical_supply: Key:medical supply
+    medical_system:*: Key:medical system:*
     megalith_type: Key:megalith type
     membership: Key:membership
     memorial: Key:memorial
     megalith_type: Key:megalith type
     membership: Key:membership
     memorial: Key:memorial
+    memorial:conflict: Key:memorial:conflict
+    memorial:subject: Key:memorial:subject
+    memorial:subject:wikidata: Key:memorial:subject:wikidata
+    memorial:subject:wikipedia: Key:memorial:subject:wikipedia
     memorial:type: Key:memorial:type
     message: Key:message
     mhs:inscription_date: Key:mhs:inscription date
     microbrewery: Key:microbrewery
     memorial:type: Key:memorial:type
     message: Key:message
     mhs:inscription_date: Key:mhs:inscription date
     microbrewery: Key:microbrewery
+    microwave: Key:microwave
     milestone_type: Key:milestone type
     military: Key:military
     milestone_type: Key:milestone type
     military: Key:military
+    military_service: Key:military service
     mimics: Key:mimics
     min_age: Key:min age
     mimics: Key:mimics
     min_age: Key:min age
+    min_distance: Key:min distance
     min_height: Key:min height
     min_height: Key:min height
-    minage: Key:minage
+    min_level: Key:min level
     mindistance: Key:mindistance
     mineshaft_type: Key:mineshaft type
     minibus: Key:minibus
     minspeed: Key:minspeed
     minspeed:lanes: Key:minspeed:lanes
     mindistance: Key:mindistance
     mineshaft_type: Key:mineshaft type
     minibus: Key:minibus
     minspeed: Key:minspeed
     minspeed:lanes: Key:minspeed:lanes
+    minweight: Key:minweight
+    minweight:conditional: Key:minweight:conditional
     mml:class: Key:mml:class
     mml:class: Key:mml:class
+    mobile: Key:mobile
     model: Key:model
     model: Key:model
+    model:wikidata: Key:model:wikidata
+    model:wikipedia: Key:model:wikipedia
     modifier: Key:modifier
     mofa: Key:mofa
     monastery:type: Key:monastery:type
     modifier: Key:modifier
     mofa: Key:mofa
     monastery:type: Key:monastery:type
@@ -5873,6 +7162,7 @@ en:
     monitoring:groundwater: Key:monitoring:groundwater
     monitoring:meteoric_activity: Key:monitoring:meteoric activity
     monitoring:noise: Key:monitoring:noise
     monitoring:groundwater: Key:monitoring:groundwater
     monitoring:meteoric_activity: Key:monitoring:meteoric activity
     monitoring:noise: Key:monitoring:noise
+    monitoring:pedestrian: Key:monitoring:pedestrian
     monitoring:radiation: Key:monitoring:radiation
     monitoring:river_level: Key:monitoring:river level
     monitoring:river_levels: Key:monitoring:river levels
     monitoring:radiation: Key:monitoring:radiation
     monitoring:river_level: Key:monitoring:river level
     monitoring:river_levels: Key:monitoring:river levels
@@ -5886,8 +7176,10 @@ en:
     mooring: Key:mooring
     moped: Key:moped
     motor_vehicle: Key:motor vehicle
     mooring: Key:mooring
     moped: Key:moped
     motor_vehicle: Key:motor vehicle
+    motor_vehicle:conditional: Key:motor vehicle:conditional
     motorboat: Key:motorboat
     motorcar: Key:motorcar
     motorboat: Key:motorboat
     motorcar: Key:motorcar
+    motorcar:conditional: Key:motorcar:conditional
     motorcycle: Key:motorcycle
     motorcycle:clothes: Key:motorcycle:clothes
     motorcycle:conditional: Key:motorcycle:conditional
     motorcycle: Key:motorcycle
     motorcycle:clothes: Key:motorcycle:clothes
     motorcycle:conditional: Key:motorcycle:conditional
@@ -5905,6 +7197,7 @@ en:
     motorcycle:transport: Key:motorcycle:transport
     motorcycle:type: Key:motorcycle:type
     motorcycle:tyres: Key:motorcycle:tyres
     motorcycle:transport: Key:motorcycle:transport
     motorcycle:type: Key:motorcycle:type
     motorcycle:tyres: Key:motorcycle:tyres
+    motorcycle_parking: Key:motorcycle parking
     motorhome: Key:motorhome
     motorroad: Key:motorroad
     motorway: Key:motorway
     motorhome: Key:motorhome
     motorroad: Key:motorroad
     motorway: Key:motorway
@@ -5912,35 +7205,91 @@ en:
     moved: Key:moved
     mtb: Key:mtb
     mtb:description: Key:mtb:description
     moved: Key:moved
     mtb: Key:mtb
     mtb:description: Key:mtb:description
+    mtb:name: Key:mtb:name
     mtb:scale: Key:mtb:scale
     mtb:scale:imba: Key:mtb:scale:imba
     mtb:scale:uphill: Key:mtb:scale:uphill
     mtb:scale: Key:mtb:scale
     mtb:scale:imba: Key:mtb:scale:imba
     mtb:scale:uphill: Key:mtb:scale:uphill
+    mtb:type: Key:mtb:type
     mtb_scale: Key:mtb scale
     mtb_scale: Key:mtb scale
+    munro: Key:munro
+    munro_number: Key:munro number
     museum: Key:museum
     museum: Key:museum
+    museum:subject:wikidata: Key:museum:subject:wikidata
     museum_type: Key:museum type
     musical_instrument: Key:musical instrument
     museum_type: Key:museum type
     musical_instrument: Key:musical instrument
+    musical_instrument:repair: Key:musical instrument:repair
+    naics: Key:naics
     name: Key:name
     name: Key:name
+    name:ab: Key:name:ab
+    name:ace: Key:name:ace
+    name:ady: Key:name:ady
+    name:af: Key:name:af
+    name:ak: Key:name:ak
+    name:aln: Key:name:aln
+    name:alq: Key:name:alq
+    name:alt: Key:name:alt
+    name:am: Key:name:am
+    name:an: Key:name:an
+    name:ang: Key:name:ang
     name:ar: Key:name:ar
     name:ar1: Key:name:ar1
     name:ar: Key:name:ar
     name:ar1: Key:name:ar1
+    name:arc: Key:name:arc
+    name:as: Key:name:as
     name:ast: Key:name:ast
     name:ast: Key:name:ast
+    name:aus: Key:name:aus
+    name:av: Key:name:av
+    name:ay: Key:name:ay
+    name:az: Key:name:az
+    name:az-Arab: Key:name:az-Arab
     name:azb: Key:name:azb
     name:azb: Key:name:azb
+    name:ba: Key:name:ba
+    name:bar: Key:name:bar
     name:be: Key:name:be
     name:be-tarask: Key:name:be-tarask
     name:ber: Key:name:ber
     name:be: Key:name:be
     name:be-tarask: Key:name:be-tarask
     name:ber: Key:name:ber
+    name:bg: Key:name:bg
+    name:bh: Key:name:bh
+    name:bi: Key:name:bi
+    name:bjn: Key:name:bjn
+    name:bm: Key:name:bm
     name:bn: Key:name:bn
     name:bn: Key:name:bn
-    name:botanical: Key:name:botanical
+    name:bn-Arab: Key:name:bn-Arab
+    name:bo: Key:name:bo
     name:br: Key:name:br
     name:br: Key:name:br
+    name:bru: Key:name:bru
+    name:bs: Key:name:bs
+    name:bug: Key:name:bug
     name:ca: Key:name:ca
     name:ca: Key:name:ca
+    name:car: Key:name:car
+    name:carnaval: Key:name:carnaval
+    name:cdo: Key:name:cdo
+    name:ce: Key:name:ce
+    name:ceb: Key:name:ceb
+    name:ch: Key:name:ch
+    name:chm: Key:name:chm
+    name:chp: Key:name:chp
+    name:chr: Key:name:chr
+    name:chy: Key:name:chy
     name:ckb: Key:name:ckb
     name:ckb: Key:name:ckb
+    name:clc: Key:name:clc
+    name:co: Key:name:co
+    name:cr: Key:name:cr
     name:cs: Key:name:cs
     name:cs: Key:name:cs
+    name:csb: Key:name:csb
+    name:cu: Key:name:cu
+    name:cv: Key:name:cv
     name:cy: Key:name:cy
     name:da: Key:name:da
     name:cy: Key:name:cy
     name:da: Key:name:da
+    name:dak: Key:name:dak
     name:de: Key:name:de
     name:de: Key:name:de
+    name:dsb: Key:name:dsb
     name:dv: Key:name:dv
     name:dv: Key:name:dv
+    name:dyu: Key:name:dyu
+    name:dz: Key:name:dz
+    name:ee: Key:name:ee
+    name:egl: Key:name:egl
     name:el: Key:name:el
     name:en: Key:name:en
     name:el: Key:name:el
     name:en: Key:name:en
-    name:en1: Key:name:en1
-    name:en2: Key:name:en2
     name:eo: Key:name:eo
     name:es: Key:name:es
     name:et: Key:name:et
     name:eo: Key:name:eo
     name:es: Key:name:es
     name:et: Key:name:et
@@ -5949,102 +7298,269 @@ en:
     name:etymology:wikipedia: Key:name:etymology:wikipedia
     name:eu: Key:name:eu
     name:fa: Key:name:fa
     name:etymology:wikipedia: Key:name:etymology:wikipedia
     name:eu: Key:name:eu
     name:fa: Key:name:fa
+    name:ff: Key:name:ff
     name:fi: Key:name:fi
     name:fi: Key:name:fi
+    name:fo: Key:name:fo
     name:fr: Key:name:fr
     name:fr: Key:name:fr
+    name:frr: Key:name:frr
+    name:fur: Key:name:fur
     name:fy: Key:name:fy
     name:ga: Key:name:ga
     name:fy: Key:name:fy
     name:ga: Key:name:ga
+    name:gag: Key:name:gag
+    name:gcf: Key:name:gcf
     name:gd: Key:name:gd
     name:gem: Key:name:gem
     name:gl: Key:name:gl
     name:glk: Key:name:glk
     name:gd: Key:name:gd
     name:gem: Key:name:gem
     name:gl: Key:name:gl
     name:glk: Key:name:glk
+    name:gn: Key:name:gn
+    name:gr: Key:name:gr
+    name:grc: Key:name:grc
     name:gsw: Key:name:gsw
     name:gsw: Key:name:gsw
+    name:gu: Key:name:gu
+    name:gv: Key:name:gv
+    name:ha: Key:name:ha
+    name:hak: Key:name:hak
+    name:haw: Key:name:haw
     name:he: Key:name:he
     name:hi: Key:name:hi
     name:he: Key:name:he
     name:hi: Key:name:hi
+    name:hif: Key:name:hif
+    name:hop: Key:name:hop
     name:hr: Key:name:hr
     name:hsb: Key:name:hsb
     name:hr: Key:name:hr
     name:hsb: Key:name:hsb
+    name:ht: Key:name:ht
     name:hu: Key:name:hu
     name:hy: Key:name:hy
     name:hu: Key:name:hu
     name:hy: Key:name:hy
+    name:ia: Key:name:ia
+    name:id: Key:name:id
+    name:ie: Key:name:ie
+    name:ig: Key:name:ig
+    name:ilo: Key:name:ilo
+    name:inh: Key:name:inh
     name:io: Key:name:io
     name:io: Key:name:io
+    name:is: Key:name:is
     name:it: Key:name:it
     name:it: Key:name:it
+    name:iu: Key:name:iu
     name:ja: Key:name:ja
     name:ja-Hira: Key:name:ja-Hira
     name:ja: Key:name:ja
     name:ja-Hira: Key:name:ja-Hira
+    name:ja-Latn: Key:name:ja-Latn
     name:ja_kana: Key:name:ja kana
     name:ja_rm: Key:name:ja rm
     name:jbo: Key:name:jbo
     name:ja_kana: Key:name:ja kana
     name:ja_rm: Key:name:ja rm
     name:jbo: Key:name:jbo
+    name:jv: Key:name:jv
     name:ka: Key:name:ka
     name:ka: Key:name:ka
+    name:ka-Latn: Key:name:ka-Latn
+    name:kaa: Key:name:kaa
     name:kab: Key:name:kab
     name:kab-Arab: Key:name:kab-Arab
     name:kab: Key:name:kab
     name:kab-Arab: Key:name:kab-Arab
+    name:kbd: Key:name:kbd
+    name:kg: Key:name:kg
     name:kk: Key:name:kk
     name:kk-Arab: Key:name:kk-Arab
     name:kk: Key:name:kk
     name:kk-Arab: Key:name:kk-Arab
+    name:kl: Key:name:kl
+    name:km: Key:name:km
+    name:kmr: Key:name:kmr
     name:kn: Key:name:kn
     name:kn:iso15919: Key:name:kn:iso15919
     name:ko: Key:name:ko
     name:ko-Latn: Key:name:ko-Latn
     name:ko_rm: Key:name:ko rm
     name:kn: Key:name:kn
     name:kn:iso15919: Key:name:kn:iso15919
     name:ko: Key:name:ko
     name:ko-Latn: Key:name:ko-Latn
     name:ko_rm: Key:name:ko rm
+    name:koi: Key:name:koi
+    name:kr: Key:name:kr
+    name:krc: Key:name:krc
+    name:krl: Key:name:krl
     name:ks: Key:name:ks
     name:ks: Key:name:ks
+    name:ksh: Key:name:ksh
     name:ku: Key:name:ku
     name:ku-Arab: Key:name:ku-Arab
     name:ku: Key:name:ku
     name:ku-Arab: Key:name:ku-Arab
+    name:kum: Key:name:kum
+    name:kv: Key:name:kv
+    name:kw: Key:name:kw
+    name:ky: Key:name:ky
+    name:ky-Arab: Key:name:ky-Arab
+    name:la: Key:name:la
+    name:lad: Key:name:lad
+    name:lah: Key:name:lah
+    name:language: Key:name:language
+    name:lb: Key:name:lb
+    name:lbe: Key:name:lbe
     name:left: Key:name:left
     name:left:ar: Key:name:left:ar
     name:left: Key:name:left
     name:left:ar: Key:name:left:ar
+    name:left:arc: Key:name:left:arc
+    name:left:de: Key:name:left:de
+    name:left:es: Key:name:left:es
     name:left:fr: Key:name:left:fr
     name:left:fr: Key:name:left:fr
+    name:left:gr: Key:name:left:gr
+    name:left:grc: Key:name:left:grc
+    name:left:syc: Key:name:left:syc
+    name:lez: Key:name:lez
     name:lg: Key:name:lg
     name:lg: Key:name:lg
+    name:li: Key:name:li
+    name:lld: Key:name:lld
+    name:lmo: Key:name:lmo
+    name:ln: Key:name:ln
+    name:lo: Key:name:lo
     name:lrc: Key:name:lrc
     name:lt: Key:name:lt
     name:lv: Key:name:lv
     name:lrc: Key:name:lrc
     name:lt: Key:name:lt
     name:lv: Key:name:lv
+    name:mdf: Key:name:mdf
     name:mg: Key:name:mg
     name:mg: Key:name:mg
+    name:mhn: Key:name:mhn
+    name:mhr: Key:name:mhr
+    name:mi: Key:name:mi
+    name:mic: Key:name:mic
+    name:min: Key:name:min
     name:mk: Key:name:mk
     name:ml: Key:name:ml
     name:mk: Key:name:mk
     name:ml: Key:name:ml
+    name:mn: Key:name:mn
+    name:moe: Key:name:moe
+    name:mos: Key:name:mos
     name:mr: Key:name:mr
     name:mr: Key:name:mr
+    name:ms: Key:name:ms
+    name:ms-Arab: Key:name:ms-Arab
+    name:mt: Key:name:mt
+    name:mtp: Key:name:mtp
+    name:mwl: Key:name:mwl
     name:my: Key:name:my
     name:my: Key:name:my
+    name:myv: Key:name:myv
     name:mzn: Key:name:mzn
     name:mzn: Key:name:mzn
+    name:na: Key:name:na
+    name:nan: Key:name:nan
+    name:nap: Key:name:nap
+    name:nb: Key:name:nb
     name:nds: Key:name:nds
     name:nds-nl: Key:name:nds-nl
     name:nds: Key:name:nds
     name:nds-nl: Key:name:nds-nl
+    name:ne: Key:name:ne
     name:nl: Key:name:nl
     name:nn: Key:name:nn
     name:no: Key:name:no
     name:nl: Key:name:nl
     name:nn: Key:name:nn
     name:no: Key:name:no
+    name:non: Key:name:non
     name:nov: Key:name:nov
     name:nov: Key:name:nov
+    name:nso: Key:name:nso
+    name:oc: Key:name:oc
+    name:oj: Key:name:oj
+    name:om: Key:name:om
+    name:or: Key:name:or
     name:ota: Key:name:ota
     name:ota: Key:name:ota
+    name:pa: Key:name:pa
+    name:pa-Arab: Key:name:pa-Arab
+    name:pa-Aran: Key:name:pa-Aran
+    name:pa-Guru: Key:name:pa-Guru
+    name:pa-IN: Key:name:pa-IN
+    name:pa-PK: Key:name:pa-PK
+    name:pa-Shah: Key:name:pa-Shah
+    name:pag: Key:name:pag
+    name:pap: Key:name:pap
+    name:pfl: Key:name:pfl
+    name:pih: Key:name:pih
+    name:pjt: Key:name:pjt
     name:pl: Key:name:pl
     name:pl: Key:name:pl
+    name:pms: Key:name:pms
     name:pnb: Key:name:pnb
     name:pnb: Key:name:pnb
+    name:pnt: Key:name:pnt
     name:prefix: Key:name:prefix
     name:prefix:be: Key:name:prefix:be
     name:pronunciation: Key:name:pronunciation
     name:ps: Key:name:ps
     name:pt: Key:name:pt
     name:prefix: Key:name:prefix
     name:prefix:be: Key:name:prefix:be
     name:pronunciation: Key:name:pronunciation
     name:ps: Key:name:ps
     name:pt: Key:name:pt
+    name:pwn: Key:name:pwn
+    name:qu: Key:name:qu
     name:right: Key:name:right
     name:right:ar: Key:name:right:ar
     name:right: Key:name:right
     name:right:ar: Key:name:right:ar
+    name:right:arc: Key:name:right:arc
+    name:right:de: Key:name:right:de
+    name:right:es: Key:name:right:es
+    name:right:gr: Key:name:right:gr
+    name:right:grc: Key:name:right:grc
+    name:right:syc: Key:name:right:syc
+    name:rm: Key:name:rm
+    name:rn: Key:name:rn
     name:ro: Key:name:ro
     name:ro: Key:name:ro
+    name:rrm: Key:name:rrm
     name:ru: Key:name:ru
     name:ru:word_stress: Key:name:ru:word stress
     name:ru: Key:name:ru
     name:ru:word_stress: Key:name:ru:word stress
+    name:rue: Key:name:rue
+    name:rw: Key:name:rw
+    name:sa: Key:name:sa
+    name:sah: Key:name:sah
     name:sc: Key:name:sc
     name:sc: Key:name:sc
+    name:scn: Key:name:scn
+    name:sco: Key:name:sco
     name:sd: Key:name:sd
     name:sd: Key:name:sd
+    name:se: Key:name:se
+    name:sg: Key:name:sg
     name:sh: Key:name:sh
     name:sh: Key:name:sh
+    name:shn: Key:name:shn
+    name:si: Key:name:si
+    name:signed: Key:name:signed
     name:sk: Key:name:sk
     name:sk: Key:name:sk
+    name:skr: Key:name:skr
     name:sl: Key:name:sl
     name:sl: Key:name:sl
+    name:sm: Key:name:sm
+    name:sma: Key:name:sma
+    name:sms: Key:name:sms
+    name:sn: Key:name:sn
+    name:so: Key:name:so
+    name:sq: Key:name:sq
+    name:squ: Key:name:squ
     name:sr: Key:name:sr
     name:sr-Latn: Key:name:sr-Latn
     name:sr: Key:name:sr
     name:sr-Latn: Key:name:sr-Latn
+    name:ss: Key:name:ss
+    name:st: Key:name:st
+    name:su: Key:name:su
     name:suffix: Key:name:suffix
     name:sv: Key:name:sv
     name:suffix: Key:name:suffix
     name:sv: Key:name:sv
+    name:sw: Key:name:sw
+    name:syc: Key:name:syc
+    name:szl: Key:name:szl
     name:ta: Key:name:ta
     name:te: Key:name:te
     name:ta: Key:name:ta
     name:te: Key:name:te
+    name:tet: Key:name:tet
+    name:tg: Key:name:tg
     name:th: Key:name:th
     name:th: Key:name:th
+    name:ti: Key:name:ti
+    name:tk: Key:name:tk
+    name:tl: Key:name:tl
     name:tlh: Key:name:tlh
     name:tlh: Key:name:tlh
+    name:tn: Key:name:tn
+    name:to: Key:name:to
     name:tok: Key:name:tok
     name:tok: Key:name:tok
+    name:tpi: Key:name:tpi
     name:tr: Key:name:tr
     name:tr: Key:name:tr
+    name:ts: Key:name:ts
     name:tt: Key:name:tt
     name:tt: Key:name:tt
+    name:tw: Key:name:tw
+    name:ty: Key:name:ty
     name:tzl: Key:name:tzl
     name:tzl: Key:name:tzl
+    name:udm: Key:name:udm
     name:ug: Key:name:ug
     name:uk: Key:name:uk
     name:ur: Key:name:ur
     name:ug: Key:name:ug
     name:uk: Key:name:uk
     name:ur: Key:name:ur
+    name:uz: Key:name:uz
+    name:vep: Key:name:vep
     name:vi: Key:name:vi
     name:vi: Key:name:vi
+    name:vi-Hani: Key:name:vi-Hani
+    name:vls: Key:name:vls
     name:vo: Key:name:vo
     name:vo: Key:name:vo
+    name:vro: Key:name:vro
+    name:wa: Key:name:wa
+    name:war: Key:name:war
+    name:was: Key:name:was
     name:wikipedia: Key:name:wikipedia
     name:wikipedia: Key:name:wikipedia
+    name:wo: Key:name:wo
+    name:xmf: Key:name:xmf
     name:xx: Key:name:xx
     name:xx: Key:name:xx
+    name:yi: Key:name:yi
+    name:yo: Key:name:yo
     name:yue: Key:name:yue
     name:yue: Key:name:yue
+    name:za: Key:name:za
     name:zh: Key:name:zh
     name:zh: Key:name:zh
+    name:zh-Hans: Key:name:zh-Hans
+    name:zh-Hant: Key:name:zh-Hant
     name:zh-sg: Key:name:zh-sg
     name:zh-sg: Key:name:zh-sg
+    name:zu: Key:name:zu
     name_1: Key:name 1
     name_2: Key:name 2
     name_1: Key:name 1
     name_2: Key:name 2
+    naptan:AdministrativeAreaRef: Key:naptan:AdministrativeAreaRef
     naptan:AltCommonName: Key:naptan:AltCommonName
     naptan:AltCrossing: Key:naptan:AltCrossing
     naptan:AltIndicator: Key:naptan:AltIndicator
     naptan:AltCommonName: Key:naptan:AltCommonName
     naptan:AltCrossing: Key:naptan:AltCrossing
     naptan:AltIndicator: Key:naptan:AltIndicator
@@ -6056,12 +7572,15 @@ en:
     naptan:BusStopType: Key:naptan:BusStopType
     naptan:CommonName: Key:naptan:CommonName
     naptan:Crossing: Key:naptan:Crossing
     naptan:BusStopType: Key:naptan:BusStopType
     naptan:CommonName: Key:naptan:CommonName
     naptan:Crossing: Key:naptan:Crossing
+    naptan:Error: Key:naptan:Error
     naptan:Indicator: Key:naptan:Indicator
     naptan:Landmark: Key:naptan:Landmark
     naptan:NaptanCode: Key:naptan:NaptanCode
     naptan:Notes: Key:naptan:Notes
     naptan:PlusbusZoneRef: Key:naptan:PlusbusZoneRef
     naptan:Indicator: Key:naptan:Indicator
     naptan:Landmark: Key:naptan:Landmark
     naptan:NaptanCode: Key:naptan:NaptanCode
     naptan:Notes: Key:naptan:Notes
     naptan:PlusbusZoneRef: Key:naptan:PlusbusZoneRef
+    naptan:RevisionNumber: Key:naptan:RevisionNumber
     naptan:ShortCommonName: Key:naptan:ShortCommonName
     naptan:ShortCommonName: Key:naptan:ShortCommonName
+    naptan:Status: Key:naptan:Status
     naptan:StopAreaCode: Key:naptan:StopAreaCode
     naptan:StopAreaType: Key:naptan:StopAreaType
     naptan:Street: Key:naptan:Street
     naptan:StopAreaCode: Key:naptan:StopAreaCode
     naptan:StopAreaType: Key:naptan:StopAreaType
     naptan:Street: Key:naptan:Street
@@ -6071,15 +7590,8 @@ en:
     nat_name:ar: Key:nat name:ar
     nat_ref: Key:nat ref
     nat_ref:ar: Key:nat ref:ar
     nat_name:ar: Key:nat name:ar
     nat_ref: Key:nat ref
     nat_ref:ar: Key:nat ref:ar
+    nat_ref:fr: Key:nat ref:fr
     natural: Key:natural
     natural: Key:natural
-    naturbase: Key:naturbase
-    naturbase:FORVALTNI: Key:naturbase:FORVALTNI
-    naturbase:IUCN: Key:naturbase:IUCN
-    naturbase:MOBLANDPRI: Key:naturbase:MOBLANDPRI
-    naturbase:OMRADENAVN: Key:naturbase:OMRADENAVN
-    naturbase:VERNEFORM: Key:naturbase:VERNEFORM
-    naturbase:VERNEF_ID: Key:naturbase:VERNEF ID
-    naturbase:VERNEPLAN: Key:naturbase:VERNEPLAN
     naturbase:iid: Key:naturbase:iid
     navibot:categorize: Key:navibot:categorize
     navibot:connect: Key:navibot:connect
     naturbase:iid: Key:naturbase:iid
     navibot:categorize: Key:navibot:categorize
     navibot:connect: Key:navibot:connect
@@ -6090,37 +7602,58 @@ en:
     ncn_ref: Key:ncn ref
     network: Key:network
     network:ar: Key:network:ar
     ncn_ref: Key:ncn ref
     network: Key:network
     network:ar: Key:network:ar
+    network:de: Key:network:de
+    network:fr: Key:network:fr
+    network:grc: Key:network:grc
     network:guid: Key:network:guid
     network:guid: Key:network:guid
+    network:short: Key:network:short
     network:type: Key:network:type
     network:type: Key:network:type
+    network:ur: Key:network:ur
     network:wikidata: Key:network:wikidata
     network:wikidata: Key:network:wikidata
+    network:wikipedia: Key:network:wikipedia
+    nev: Key:nev
+    new_donald: Key:new donald
+    newspaper_tubes: Key:newspaper tubes
+    next_check_date: Key:next check date
     nhd:com_id: Key:nhd:com id
     nhd:fcode: Key:nhd:fcode
     nhd:ftype: Key:nhd:ftype
     nhd:com_id: Key:nhd:com id
     nhd:fcode: Key:nhd:fcode
     nhd:ftype: Key:nhd:ftype
+    nhd:gnis_id: Key:nhd:gnis id
     nhd:reach_code: Key:nhd:reach code
     nhd:reach_code: Key:nhd:reach code
+    nickname: Key:nickname
     no-barnehage:nsrid: Key:no-barnehage:nsrid
     no-barnehage:nsrid: Key:no-barnehage:nsrid
+    'no:': 'Key:no:'
+    no:*: Key:no:*
     noaddress: Key:noaddress
     noexit: Key:noexit
     nohousenumber: Key:nohousenumber
     non_existent_levels: Key:non existent levels
     noaddress: Key:noaddress
     noexit: Key:noexit
     nohousenumber: Key:nohousenumber
     non_existent_levels: Key:non existent levels
-    noname: Key:noname
     nonsquare: Key:nonsquare
     noref: Key:noref
     not: Key:not
     'not:': 'Key:not:'
     nonsquare: Key:nonsquare
     noref: Key:noref
     not: Key:not
     'not:': 'Key:not:'
+    not:*: Key:not:*
+    not:brand:wikidata: Key:not:brand:wikidata
     not:name: Key:not:name
     not:name: Key:not:name
-    not:nccod: Key:not:nccod
+    not:wikidata: Key:not:wikidata
     not_accepted_import:leisure: Key:not accepted import:leisure
     not_served_by: Key:not served by
     note: Key:note
     not_accepted_import:leisure: Key:not accepted import:leisure
     not_served_by: Key:not served by
     note: Key:note
+    note:*: Key:note:*
+    note:addr_place: Key:note:addr place
     note:ar: Key:note:ar
     note:deplacer4mE: Key:note:deplacer4mE
     note:depth: Key:note:depth
     note:en: Key:note:en
     note:ja: Key:note:ja
     note:ar: Key:note:ar
     note:deplacer4mE: Key:note:deplacer4mE
     note:depth: Key:note:depth
     note:en: Key:note:en
     note:ja: Key:note:ja
+    note:name: Key:note:name
     note:pilotage: Key:note:pilotage
     note:pilotage: Key:note:pilotage
-    notes: Key:notes
+    note:project_page: Key:note:project page
     nuclear_explosion:country: Key:nuclear explosion:country
     nuclear_explosion:country: Key:nuclear explosion:country
+    nuclear_explosion:crater_diameter: Key:nuclear explosion:crater diameter
+    nuclear_explosion:hole: Key:nuclear explosion:hole
     nudism: Key:nudism
     nudism: Key:nudism
+    nudism:conditional: Key:nudism:conditional
     number_of_apartments: Key:number of apartments
     nursery: Key:nursery
     nvdb:date: Key:nvdb:date
     number_of_apartments: Key:number of apartments
     nursery: Key:nursery
     nvdb:date: Key:nvdb:date
@@ -6134,29 +7667,45 @@ en:
     object:street: Key:object:street
     observatory:type: Key:observatory:type
     obstacle: Key:obstacle
     object:street: Key:object:street
     observatory:type: Key:observatory:type
     obstacle: Key:obstacle
-    occurrence: Key:occurrence
     office: Key:office
     official_name: Key:official name
     official_name:ar: Key:official name:ar
     office: Key:office
     official_name: Key:official name
     official_name:ar: Key:official name:ar
+    official_name:arc: Key:official name:arc
+    official_name:az-Arab: Key:official name:az-Arab
     official_name:azb: Key:official name:azb
     official_name:be: Key:official name:be
     official_name:ckb: Key:official name:ckb
     official_name:azb: Key:official name:azb
     official_name:be: Key:official name:be
     official_name:ckb: Key:official name:ckb
+    official_name:de: Key:official name:de
+    official_name:en: Key:official name:en
+    official_name:es: Key:official name:es
     official_name:fa: Key:official name:fa
     official_name:fa: Key:official name:fa
+    official_name:fr: Key:official name:fr
+    official_name:fur: Key:official name:fur
     official_name:glk: Key:official name:glk
     official_name:glk: Key:official name:glk
+    official_name:gr: Key:official name:gr
+    official_name:grc: Key:official name:grc
+    official_name:kk-Arab: Key:official name:kk-Arab
+    official_name:kmr: Key:official name:kmr
     official_name:ks: Key:official name:ks
     official_name:lrc: Key:official name:lrc
     official_name:mzn: Key:official name:mzn
     official_name:ks: Key:official name:ks
     official_name:lrc: Key:official name:lrc
     official_name:mzn: Key:official name:mzn
+    official_name:pl: Key:official name:pl
     official_name:pnb: Key:official name:pnb
     official_name:ps: Key:official name:ps
     official_name:pnb: Key:official name:pnb
     official_name:ps: Key:official name:ps
+    official_name:ru: Key:official name:ru
     official_name:sd: Key:official name:sd
     official_name:sd: Key:official name:sd
+    official_name:syc: Key:official name:syc
     official_name:ug: Key:official name:ug
     official_name:ur: Key:official name:ur
     official_ref: Key:official ref
     offshore: Key:offshore
     official_name:ug: Key:official name:ug
     official_name:ur: Key:official name:ur
     official_ref: Key:official ref
     offshore: Key:offshore
+    ohm:name: Key:ohm:name
     ohv: Key:ohv
     ois:fixme: Key:ois:fixme
     ohv: Key:ohv
     ois:fixme: Key:ois:fixme
+    old_addr:housename: Key:old addr:housename
     old_addr:housenumber: Key:old addr:housenumber
     old_addr:place: Key:old addr:place
     old_addr:housenumber: Key:old addr:housenumber
     old_addr:place: Key:old addr:place
+    old_addr:street: Key:old addr:street
     old_name: Key:old name
     old_name:ar: Key:old name:ar
     old_name:azb: Key:old name:azb
     old_name: Key:old name
     old_name:ar: Key:old name:ar
     old_name:azb: Key:old name:azb
@@ -6164,9 +7713,16 @@ en:
     old_name:ckb: Key:old name:ckb
     old_name:de: Key:old name:de
     old_name:en: Key:old name:en
     old_name:ckb: Key:old name:ckb
     old_name:de: Key:old name:de
     old_name:en: Key:old name:en
+    old_name:es: Key:old name:es
     old_name:etymology:wikidata: Key:old name:etymology:wikidata
     old_name:fa: Key:old name:fa
     old_name:etymology:wikidata: Key:old name:etymology:wikidata
     old_name:fa: Key:old name:fa
+    old_name:fr: Key:old name:fr
+    old_name:gr: Key:old name:gr
+    old_name:grc: Key:old name:grc
+    old_name:it: Key:old name:it
+    old_name:ko: Key:old name:ko
     old_name:ks: Key:old name:ks
     old_name:ks: Key:old name:ks
+    old_name:ku-Arab: Key:old name:ku-Arab
     old_name:lrc: Key:old name:lrc
     old_name:pl: Key:old name:pl
     old_name:pnb: Key:old name:pnb
     old_name:lrc: Key:old name:lrc
     old_name:pl: Key:old name:pl
     old_name:pnb: Key:old name:pnb
@@ -6178,47 +7734,68 @@ en:
     old_railway_operator: Key:old railway operator
     old_ref: Key:old ref
     old_ref:ar: Key:old ref:ar
     old_railway_operator: Key:old railway operator
     old_ref: Key:old ref
     old_ref:ar: Key:old ref:ar
+    old_ref:fr: Key:old ref:fr
     old_ref:legislative: Key:old ref:legislative
     old_ref_legislative: Key:old ref legislative
     old_short_name: Key:old short name
     oneclass: Key:oneclass
     oneway: Key:oneway
     oneway:bicycle: Key:oneway:bicycle
     old_ref:legislative: Key:old ref:legislative
     old_ref_legislative: Key:old ref legislative
     old_short_name: Key:old short name
     oneclass: Key:oneclass
     oneway: Key:oneway
     oneway:bicycle: Key:oneway:bicycle
+    oneway:bus: Key:oneway:bus
     oneway:conditional: Key:oneway:conditional
     oneway:foot: Key:oneway:foot
     oneway:conditional: Key:oneway:conditional
     oneway:foot: Key:oneway:foot
-    oneway:moped: Key:oneway:moped
+    oneway:motorcycle: Key:oneway:motorcycle
     oneway:psv: Key:oneway:psv
     oneway:psv: Key:oneway:psv
+    oneway:taxi: Key:oneway:taxi
     onkz: Key:onkz
     ons_code: Key:ons code
     onkz: Key:onkz
     ons_code: Key:ons code
-    open_air: Key:open air
+    openGeoDB:loc_id: Key:openGeoDB:loc id
     openbenches:id: Key:openbenches:id
     openfire: Key:openfire
     openbenches:id: Key:openbenches:id
     openfire: Key:openfire
+    opening: Key:opening
     opening_date: Key:opening date
     opening_hours: Key:opening hours
     opening_hours/Tutorial: Key:opening hours/Tutorial
     opening_date: Key:opening date
     opening_hours: Key:opening hours
     opening_hours/Tutorial: Key:opening hours/Tutorial
+    opening_hours:*: Key:opening hours:*
     opening_hours:atm: Key:opening hours:atm
     opening_hours:atm: Key:opening hours:atm
+    opening_hours:car_repair: Key:opening hours:car repair
     opening_hours:covid19: Key:opening hours:covid19
     opening_hours:drive_through: Key:opening hours:drive through
     opening_hours:kitchen: Key:opening hours:kitchen
     opening_hours:covid19: Key:opening hours:covid19
     opening_hours:drive_through: Key:opening hours:drive through
     opening_hours:kitchen: Key:opening hours:kitchen
+    opening_hours:lifeguard: Key:opening hours:lifeguard
     opening_hours:office: Key:opening hours:office
     opening_hours:office: Key:opening hours:office
+    opening_hours:pharmacy: Key:opening hours:pharmacy
     opening_hours:reception: Key:opening hours:reception
     opening_hours:signed: Key:opening hours:signed
     opening_hours:reception: Key:opening hours:reception
     opening_hours:signed: Key:opening hours:signed
+    opening_hours:store: Key:opening hours:store
     opening_hours:url: Key:opening hours:url
     opening_hours:url: Key:opening hours:url
+    opening_hours:visitors: Key:opening hours:visitors
     opening_hours:workshop: Key:opening hours:workshop
     openplaques:id: Key:openplaques:id
     opensource: Key:opensource
     operational_status: Key:operational status
     operator: Key:operator
     operator:MNC: Key:operator:MNC
     opening_hours:workshop: Key:opening hours:workshop
     openplaques:id: Key:openplaques:id
     opensource: Key:opensource
     operational_status: Key:operational status
     operator: Key:operator
     operator:MNC: Key:operator:MNC
+    operator:abbr: Key:operator:abbr
+    operator:addr: Key:operator:addr
     operator:ar: Key:operator:ar
     operator:be: Key:operator:be
     operator:ar: Key:operator:ar
     operator:be: Key:operator:be
+    operator:de: Key:operator:de
     operator:en: Key:operator:en
     operator:en: Key:operator:en
+    operator:es: Key:operator:es
+    operator:fr: Key:operator:fr
     operator:guid: Key:operator:guid
     operator:guid: Key:operator:guid
+    operator:phone: Key:operator:phone
     operator:ru: Key:operator:ru
     operator:ru: Key:operator:ru
+    operator:short: Key:operator:short
     operator:type: Key:operator:type
     operator:type: Key:operator:type
+    operator:ur: Key:operator:ur
+    operator:website: Key:operator:website
     operator:wikidata: Key:operator:wikidata
     operator:wikipedia: Key:operator:wikipedia
     operator:wikipedia:ar: Key:operator:wikipedia:ar
     operator:wikidata: Key:operator:wikidata
     operator:wikipedia: Key:operator:wikipedia
     operator:wikipedia:ar: Key:operator:wikipedia:ar
+    operator:wikipedia:de: Key:operator:wikipedia:de
+    operator:wikipedia:es: Key:operator:wikipedia:es
     orchard: Key:orchard
     organ: Key:organ
     organic: Key:organic
     orchard: Key:orchard
     organ: Key:organ
     organic: Key:organic
@@ -6245,82 +7822,137 @@ en:
     outdoor: Key:outdoor
     outdoor_seating: Key:outdoor seating
     outdoor_seating:comfort: Key:outdoor seating:comfort
     outdoor: Key:outdoor
     outdoor_seating: Key:outdoor seating
     outdoor_seating:comfort: Key:outdoor seating:comfort
+    outlet: Key:outlet
     oven: Key:oven
     oven: Key:oven
+    overlap: Key:overlap
     overtaking: Key:overtaking
     overtaking:hgv: Key:overtaking:hgv
     owner: Key:owner
     overtaking: Key:overtaking
     overtaking:hgv: Key:overtaking:hgv
     owner: Key:owner
+    owner:wikidata: Key:owner:wikidata
     ownership: Key:ownership
     ownership: Key:ownership
+    panoramax: Key:panoramax
     par: Key:par
     par: Key:par
+    parcel_locker:type: Key:parcel locker:type
+    parcel_mail_in: Key:parcel mail in
+    parcel_pickup: Key:parcel pickup
     parish: Key:parish
     park:type: Key:park:type
     park_ride: Key:park ride
     parking: Key:parking
     parish: Key:parish
     park:type: Key:park:type
     park_ride: Key:park ride
     parking: Key:parking
-    parking:condition: Key:parking:condition
-    parking:condition:both: Key:parking:condition:both
-    parking:condition:left: Key:parking:condition:left
+    parking:both: Key:parking:both
+    parking:both:capacity: Key:parking:both:capacity
+    parking:both:staggered: Key:parking:both:staggered
+    parking:capacity:long: Key:parking:capacity:long
+    parking:capacity:standard: Key:parking:capacity:standard
     parking:condition:right: Key:parking:condition:right
     parking:condition:right: Key:parking:condition:right
-    parking:condition:right:time_interval: Key:parking:condition:right:time interval
-    parking:condition:side: Key:parking:condition:side
-    parking:lane: Key:parking:lane
-    parking:lane:both: Key:parking:lane:both
-    parking:lane:hgv: Key:parking:lane:hgv
-    parking:lane:left: Key:parking:lane:left
-    parking:lane:right: Key:parking:lane:right
-    parking:lane:side: Key:parking:lane:side
-    parking:orientation: Key:parking:orientation
-    parking:street_side: Key:parking:street side
+    parking:fee: Key:parking:fee
+    parking:left: Key:parking:left
+    parking:left:capacity: Key:parking:left:capacity
+    parking:right: Key:parking:right
+    parking:right:capacity: Key:parking:right:capacity
+    parking_space: Key:parking space
     parts: Key:parts
     passage_time: Key:passage time
     passenger: Key:passenger
     passenger_information_display: Key:passenger information display
     parts: Key:parts
     passage_time: Key:passage time
     passenger: Key:passenger
     passenger_information_display: Key:passenger information display
+    passenger_information_display:speech_output: Key:passenger information display:speech
+      output
     passenger_lines: Key:passenger lines
     passing_places: Key:passing places
     passenger_lines: Key:passenger lines
     passing_places: Key:passing places
-    paved: Key:paved
     paved:date: Key:paved:date
     paved:date: Key:paved:date
+    paving_stones:colour: Key:paving stones:colour
     payment: Key:payment
     payment: Key:payment
+    payment:*: Key:payment:*
     payment:account_cards: Key:payment:account cards
     payment:account_cards: Key:payment:account cards
+    payment:alipay: Key:payment:alipay
     payment:american_express: Key:payment:american express
     payment:american_express: Key:payment:american express
+    payment:app: Key:payment:app
+    payment:apple_pay: Key:payment:apple pay
+    payment:bancomat: Key:payment:bancomat
+    payment:bitcoincash: Key:payment:bitcoincash
+    payment:blik: Key:payment:blik
     payment:cards: Key:payment:cards
     payment:cash: Key:payment:cash
     payment:cards: Key:payment:cards
     payment:cash: Key:payment:cash
+    payment:cash:machine: Key:payment:cash:machine
+    payment:cb: Key:payment:cb
+    payment:cheque: Key:payment:cheque
+    payment:china_t-union: Key:payment:china t-union
     payment:clipper: Key:payment:clipper
     payment:coins: Key:payment:coins
     payment:clipper: Key:payment:clipper
     payment:coins: Key:payment:coins
+    payment:coins:denominations: Key:payment:coins:denominations
     payment:contactless: Key:payment:contactless
     payment:credit_cards: Key:payment:credit cards
     payment:contactless: Key:payment:contactless
     payment:credit_cards: Key:payment:credit cards
+    payment:cryptocurrencies: Key:payment:cryptocurrencies
     payment:debit_cards: Key:payment:debit cards
     payment:debit_cards: Key:payment:debit cards
+    payment:description: Key:payment:description
+    payment:diners_club: Key:payment:diners club
     payment:discover_card: Key:payment:discover card
     payment:discover_card: Key:payment:discover card
+    payment:dkv: Key:payment:dkv
     payment:e_zpass: Key:payment:e zpass
     payment:e_zpass: Key:payment:e zpass
+    payment:easycard: Key:payment:easycard
+    payment:edy: Key:payment:edy
     payment:electronic_purses: Key:payment:electronic purses
     payment:electronic_purses: Key:payment:electronic purses
+    payment:ep_easycard: Key:payment:ep easycard
+    payment:ep_geldkarte: Key:payment:ep geldkarte
+    payment:ep_ipass: Key:payment:ep ipass
     payment:fastrak: Key:payment:fastrak
     payment:foo: Key:payment:foo
     payment:girocard: Key:payment:girocard
     payment:good_to_go: Key:payment:good to go
     payment:fastrak: Key:payment:fastrak
     payment:foo: Key:payment:foo
     payment:girocard: Key:payment:girocard
     payment:good_to_go: Key:payment:good to go
+    payment:google_pay: Key:payment:google pay
     payment:i-pass: Key:payment:i-pass
     payment:i-pass: Key:payment:i-pass
+    payment:icsf: Key:payment:icsf
     payment:ipass: Key:payment:ipass
     payment:ipass: Key:payment:ipass
+    payment:jcb: Key:payment:jcb
     payment:k-tag: Key:payment:k-tag
     payment:maestro: Key:payment:maestro
     payment:mastercard: Key:payment:mastercard
     payment:k-tag: Key:payment:k-tag
     payment:maestro: Key:payment:maestro
     payment:mastercard: Key:payment:mastercard
+    payment:mastercard_contactless: Key:payment:mastercard contactless
+    payment:mastercard_debit: Key:payment:mastercard debit
     payment:mir: Key:payment:mir
     payment:mir: Key:payment:mir
+    payment:mobile_phone: Key:payment:mobile phone
     payment:nc_quick_pass: Key:payment:nc quick pass
     payment:none: Key:payment:none
     payment:notes: Key:payment:notes
     payment:nc_quick_pass: Key:payment:nc quick pass
     payment:none: Key:payment:none
     payment:notes: Key:payment:notes
+    payment:notes:denominations: Key:payment:notes:denominations
+    payment:others: Key:payment:others
+    payment:paypal: Key:payment:paypal
     payment:peach_pass: Key:payment:peach pass
     payment:peachpass: Key:payment:peachpass
     payment:pikepass: Key:payment:pikepass
     payment:peach_pass: Key:payment:peach pass
     payment:peachpass: Key:payment:peachpass
     payment:pikepass: Key:payment:pikepass
+    payment:prepaid_ticket: Key:payment:prepaid ticket
     payment:pro100: Key:payment:pro100
     payment:pro100: Key:payment:pro100
+    payment:stored_value_card: Key:payment:stored value card
     payment:sunpass: Key:payment:sunpass
     payment:sunpass: Key:payment:sunpass
+    payment:telephone_cards: Key:payment:telephone cards
+    payment:touchngo: Key:payment:touchngo
+    payment:twint: Key:payment:twint
     payment:u-key: Key:payment:u-key
     payment:u-key: Key:payment:u-key
+    payment:unionpay: Key:payment:unionpay
+    payment:uta: Key:payment:uta
+    payment:v_pay: Key:payment:v pay
     payment:visa: Key:payment:visa
     payment:visa_debit: Key:payment:visa debit
     payment:visa: Key:payment:visa
     payment:visa_debit: Key:payment:visa debit
+    payment:visa_electron: Key:payment:visa electron
+    payment:wechat: Key:payment:wechat
+    payment:wire_transfer: Key:payment:wire transfer
+    pcode: Key:pcode
+    pedagogy: Key:pedagogy
+    period: Key:period
     permanent_camping: Key:permanent camping
     permanent_camping: Key:permanent camping
-    pet_allowed: Key:pet allowed
-    pets_allowed: Key:pets allowed
+    person:date_of_birth: Key:person:date of birth
+    person:date_of_death: Key:person:date of death
+    pet: Key:pet
+    pets: Key:pets
     phoenixbikeguide: Key:phoenixbikeguide
     phone: Key:phone
     phoenixbikeguide: Key:phoenixbikeguide
     phone: Key:phone
-    photo: Key:photo
+    phone:NL: Key:phone:NL
+    phone:mnemonic: Key:phone:mnemonic
     photograph: Key:photograph
     photography: Key:photography
     picnic_table: Key:picnic table
     picture: Key:picture
     photograph: Key:photograph
     photography: Key:photography
     picnic_table: Key:picnic table
     picture: Key:picture
+    piercing: Key:piercing
     pihatie: Key:pihatie
     pilgrimage: Key:pilgrimage
     pilotage: Key:pilotage
     pihatie: Key:pihatie
     pilgrimage: Key:pilgrimage
     pilotage: Key:pilotage
@@ -6329,24 +7961,30 @@ en:
     piste:grooming: Key:piste:grooming
     piste:ref: Key:piste:ref
     piste:type: Key:piste:type
     piste:grooming: Key:piste:grooming
     piste:ref: Key:piste:ref
     piste:type: Key:piste:type
-    pk: Key:pk
+    pitch:net: Key:pitch:net
     place: Key:place
     place: Key:place
+    place:CN: Key:place:CN
     place:PH: Key:place:PH
     place:PH: Key:place:PH
+    place:cn: Key:place:cn
     place:fr: Key:place:fr
     place:ph: Key:place:ph
     place_name: Key:place name
     placement: Key:placement
     placement:end: Key:placement:end
     place:fr: Key:place:fr
     place:ph: Key:place:ph
     place_name: Key:place name
     placement: Key:placement
     placement:end: Key:placement:end
+    placement:forward: Key:placement:forward
     placement:start: Key:placement:start
     planned: Key:planned
     placement:start: Key:placement:start
     planned: Key:planned
+    planned:*: Key:planned:*
     plant: Key:plant
     plant:method: Key:plant:method
     plant:output: Key:plant:output
     plant: Key:plant
     plant:method: Key:plant:method
     plant:output: Key:plant:output
+    plant:output:*: Key:plant:output:*
     plant:output:biogas: Key:plant:output:biogas
     plant:output:cold_air: Key:plant:output:cold air
     plant:output:cold_water: Key:plant:output:cold water
     plant:output:compressed_air: Key:plant:output:compressed air
     plant:output:electricity: Key:plant:output:electricity
     plant:output:biogas: Key:plant:output:biogas
     plant:output:cold_air: Key:plant:output:cold air
     plant:output:cold_water: Key:plant:output:cold water
     plant:output:compressed_air: Key:plant:output:compressed air
     plant:output:electricity: Key:plant:output:electricity
+    plant:output:gas: Key:plant:output:gas
     plant:output:heat: Key:plant:output:heat
     plant:output:hot_air: Key:plant:output:hot air
     plant:output:hot_water: Key:plant:output:hot water
     plant:output:heat: Key:plant:output:heat
     plant:output:hot_air: Key:plant:output:hot air
     plant:output:hot_water: Key:plant:output:hot water
@@ -6356,51 +7994,72 @@ en:
     plant:storage: Key:plant:storage
     plant:type: Key:plant:type
     plant_community: Key:plant community
     plant:storage: Key:plant:storage
     plant:type: Key:plant:type
     plant_community: Key:plant community
+    platform:width: Key:platform:width
+    platform_lift: Key:platform lift
+    platform_lift:maxlength:physical: Key:platform lift:maxlength:physical
+    platform_lift:maxweight: Key:platform lift:maxweight
+    platform_lift:maxwidth:physical: Key:platform lift:maxwidth:physical
+    platform_lift:portable: Key:platform lift:portable
+    platform_lift:seat: Key:platform lift:seat
+    platform_lift:supervised: Key:platform lift:supervised
     platforms: Key:platforms
     platforms: Key:platforms
+    playability: Key:playability
     playground: Key:playground
     'playground:': 'Key:playground:'
     playground: Key:playground
     'playground:': 'Key:playground:'
+    playground:*: Key:playground:*
     playground:theme: Key:playground:theme
     playground:theme: Key:playground:theme
+    pmfsefin:idedif: Key:pmfsefin:idedif
     point: Key:point
     point: Key:point
-    pole:type: Key:pole:type
+    pole: Key:pole
+    poles: Key:poles
     police: Key:police
     police: Key:police
+    political_division: Key:political division
+    political_party: Key:political party
     polling_station: Key:polling station
     population: Key:population
     population:date: Key:population:date
     population_rank: Key:population rank
     polling_station: Key:polling station
     population: Key:population
     population:date: Key:population:date
     population_rank: Key:population rank
+    port: Key:port
     position: Key:position
     position: Key:position
+    position:heading: Key:position:heading
     post_box:design: Key:post box:design
     post_box:design: Key:post box:design
+    post_box:mounting: Key:post box:mounting
     post_box:type: Key:post box:type
     post_box:type: Key:post box:type
-    post_office:type: Key:post office:type
+    post_office: Key:post office
+    post_office:brand: Key:post office:brand
+    post_office:parcel_pickup: Key:post office:parcel pickup
     postal_code: Key:postal code
     postal_code: Key:postal code
+    postal_code:source: Key:postal code:source
     postcode: Key:postcode
     postcode: Key:postcode
+    potholes: Key:potholes
     power: Key:power
     power_output: Key:power output
     power: Key:power
     power_output: Key:power output
-    power_rating: Key:power rating
-    power_source: Key:power source
     power_supply: Key:power supply
     power_supply:schedule: Key:power supply:schedule
     practicability: Key:practicability
     preschool: Key:preschool
     pressure: Key:pressure
     power_supply: Key:power supply
     power_supply:schedule: Key:power supply:schedule
     practicability: Key:practicability
     preschool: Key:preschool
     pressure: Key:pressure
-    previous: Key:previous
-    previous:access: Key:previous:access
-    previous:vehicle: Key:previous:vehicle
+    previously: Key:previously
     priority: Key:priority
     priority_road: Key:priority road
     priority: Key:priority
     priority_road: Key:priority road
+    private: Key:private
     produce: Key:produce
     product: Key:product
     project:eurosha_2012: Key:project:eurosha 2012
     produce: Key:produce
     product: Key:product
     project:eurosha_2012: Key:project:eurosha 2012
+    prominence: Key:prominence
     proposed: Key:proposed
     proposed: Key:proposed
+    proposed:*: Key:proposed:*
     proposed:highway: Key:proposed:highway
     proposed:name: Key:proposed:name
     protect_class: Key:protect class
     proposed:highway: Key:proposed:highway
     proposed:name: Key:proposed:name
     protect_class: Key:protect class
-    protect_id: Key:protect id
     protected: Key:protected
     protection_title: Key:protection title
     protected: Key:protected
     protection_title: Key:protection title
+    provided_for: Key:provided for
     prow_ref: Key:prow ref
     prow_ref: Key:prow ref
-    pruning: Key:pruning
     psv: Key:psv
     psv:lanes: Key:psv:lanes
     psv: Key:psv
     psv:lanes: Key:psv:lanes
+    psv:lanes:backward: Key:psv:lanes:backward
+    psv:lanes:forward: Key:psv:lanes:forward
     public_bookcase:type: Key:public bookcase:type
     public_transport: Key:public transport
     public_transport:version: Key:public transport:version
     public_bookcase:type: Key:public bookcase:type
     public_transport: Key:public transport
     public_transport:version: Key:public transport:version
@@ -6420,53 +8079,80 @@ en:
     radio_transponder:orientation: Key:radio transponder:orientation
     radio_transponder:range: Key:radio transponder:range
     radio_transponder:signal_frequency: Key:radio transponder:signal frequency
     radio_transponder:orientation: Key:radio transponder:orientation
     radio_transponder:range: Key:radio transponder:range
     radio_transponder:signal_frequency: Key:radio transponder:signal frequency
+    railing: Key:railing
     railway: Key:railway
     railway: Key:railway
+    railway:asfa: Key:railway:asfa
     railway:atb: Key:railway:atb
     railway:etcs: Key:railway:etcs
     railway:atb: Key:railway:atb
     railway:etcs: Key:railway:etcs
+    railway:kvb: Key:railway:kvb
     railway:lzb: Key:railway:lzb
     railway:position: Key:railway:position
     railway:lzb: Key:railway:lzb
     railway:position: Key:railway:position
+    railway:position:exact: Key:railway:position:exact
     railway:preserved: Key:railway:preserved
     railway:preserved: Key:railway:preserved
+    railway:ref: Key:railway:ref
+    railway:scmt: Key:railway:scmt
     railway:signal:combined: Key:railway:signal:combined
     railway:signal:distant: Key:railway:signal:distant
     railway:signal:main: Key:railway:signal:main
     railway:signal:speed_limit: Key:railway:signal:speed limit
     railway:signal:speed_limit_distant: Key:railway:signal:speed limit distant
     railway:signal:combined: Key:railway:signal:combined
     railway:signal:distant: Key:railway:signal:distant
     railway:signal:main: Key:railway:signal:main
     railway:signal:speed_limit: Key:railway:signal:speed limit
     railway:signal:speed_limit_distant: Key:railway:signal:speed limit distant
+    railway:tilting: Key:railway:tilting
     railway:track_ref: Key:railway:track ref
     railway:traffic_mode: Key:railway:traffic mode
     railway:track_ref: Key:railway:track ref
     railway:traffic_mode: Key:railway:traffic mode
+    railway:tvm: Key:railway:tvm
     railway:zbs: Key:railway:zbs
     ramp: Key:ramp
     ramp:bicycle: Key:ramp:bicycle
     ramp:luggage: Key:ramp:luggage
     railway:zbs: Key:railway:zbs
     ramp: Key:ramp
     ramp:bicycle: Key:ramp:bicycle
     ramp:luggage: Key:ramp:luggage
+    ramp:portable: Key:ramp:portable
+    ramp:portable:length: Key:ramp:portable:length
+    ramp:portable:maxweight: Key:ramp:portable:maxweight
+    ramp:portable:maxwidth:physical: Key:ramp:portable:maxwidth:physical
+    ramp:portable:supervised: Key:ramp:portable:supervised
     ramp:stroller: Key:ramp:stroller
     ramp:wheelchair: Key:ramp:wheelchair
     ramsar: Key:ramsar
     razed: Key:razed
     'razed:': 'Key:razed:'
     ramp:stroller: Key:ramp:stroller
     ramp:wheelchair: Key:ramp:wheelchair
     ramsar: Key:ramsar
     razed: Key:razed
     'razed:': 'Key:razed:'
+    razed:*: Key:razed:*
     razed:building: Key:razed:building
     razed:building: Key:razed:building
+    razed:railway: Key:razed:railway
     rcn: Key:rcn
     rcn_ref: Key:rcn ref
     real_ale: Key:real ale
     real_cider: Key:real cider
     real_fire: Key:real fire
     rcn: Key:rcn
     rcn_ref: Key:rcn ref
     real_ale: Key:real ale
     real_cider: Key:real cider
     real_fire: Key:real fire
+    reception_desk: Key:reception desk
     recording: Key:recording
     recording: Key:recording
+    recreation_ground: Key:recreation ground
+    recycling:PET: Key:recycling:PET
     recycling:fire_extinguishers: Key:recycling:fire extinguishers
     recycling:fire_extinguishers: Key:recycling:fire extinguishers
+    recycling:green_waste: Key:recycling:green waste
+    recycling:pet_drink_bottles: Key:recycling:pet drink bottles
+    recycling:plastic_bottle_caps: Key:recycling:plastic bottle caps
+    recycling:plastic_bottle_tops: Key:recycling:plastic bottle tops
+    recycling:pmd: Key:recycling:pmd
     recycling_type: Key:recycling type
     red_turn:left: Key:red turn:left
     red_turn:right: Key:red turn:right
     red_turn:right:bicycle: Key:red turn:right:bicycle
     red_turn:straight: Key:red turn:straight
     red_turn:straight:bicycle: Key:red turn:straight:bicycle
     recycling_type: Key:recycling type
     red_turn:left: Key:red turn:left
     red_turn:right: Key:red turn:right
     red_turn:right:bicycle: Key:red turn:right:bicycle
     red_turn:straight: Key:red turn:straight
     red_turn:straight:bicycle: Key:red turn:straight:bicycle
-    red_turn:straight:left: Key:red turn:straight:left
-    red_turn:straight:right: Key:red turn:straight:right
     rednap:latitud: Key:rednap:latitud
     reef: Key:reef
     ref: Key:ref
     ref:AGESIC: Key:ref:AGESIC
     rednap:latitud: Key:rednap:latitud
     reef: Key:reef
     ref: Key:ref
     ref:AGESIC: Key:ref:AGESIC
+    ref:BLfD: Key:ref:BLfD
+    ref:BRN: Key:ref:BRN
     ref:CEF: Key:ref:CEF
     ref:CEF: Key:ref:CEF
+    ref:CNES: Key:ref:CNES
+    ref:DK:cvr: Key:ref:DK:cvr
+    ref:DK:cvr:pnummer: Key:ref:DK:cvr:pnummer
     ref:De_Lijn: Key:ref:De Lijn
     ref:ERDF:gdo: Key:ref:ERDF:gdo
     ref:EU:ENTSOE_EIC: Key:ref:EU:ENTSOE EIC
     ref:EU:EVSE: Key:ref:EU:EVSE
     ref:De_Lijn: Key:ref:De Lijn
     ref:ERDF:gdo: Key:ref:ERDF:gdo
     ref:EU:ENTSOE_EIC: Key:ref:EU:ENTSOE EIC
     ref:EU:EVSE: Key:ref:EU:EVSE
+    ref:EU:bwid: Key:ref:EU:bwid
     ref:FR:42C: Key:ref:FR:42C
     ref:FR:ANFR: Key:ref:FR:ANFR
     ref:FR:ARCEP: Key:ref:FR:ARCEP
     ref:FR:42C: Key:ref:FR:42C
     ref:FR:ANFR: Key:ref:FR:ANFR
     ref:FR:ARCEP: Key:ref:FR:ARCEP
@@ -6474,38 +8160,71 @@ en:
     ref:FR:CEF: Key:ref:FR:CEF
     ref:FR:CRTA: Key:ref:FR:CRTA
     ref:FR:DREAL: Key:ref:FR:DREAL
     ref:FR:CEF: Key:ref:FR:CEF
     ref:FR:CRTA: Key:ref:FR:CRTA
     ref:FR:DREAL: Key:ref:FR:DREAL
+    ref:FR:Enedis: Key:ref:FR:Enedis
     ref:FR:FANTOIR:left: Key:ref:FR:FANTOIR:left
     ref:FR:FANTOIR:right: Key:ref:FR:FANTOIR:right
     ref:FR:FINESS: Key:ref:FR:FINESS
     ref:FR:FANTOIR:left: Key:ref:FR:FANTOIR:left
     ref:FR:FANTOIR:right: Key:ref:FR:FANTOIR:right
     ref:FR:FINESS: Key:ref:FR:FINESS
+    ref:FR:FreeMobile: Key:ref:FR:FreeMobile
     ref:FR:INSEE: Key:ref:FR:INSEE
     ref:FR:IRVE: Key:ref:FR:IRVE
     ref:FR:INSEE: Key:ref:FR:INSEE
     ref:FR:IRVE: Key:ref:FR:IRVE
+    ref:FR:Joconde: Key:ref:FR:Joconde
     ref:FR:LaPoste: Key:ref:FR:LaPoste
     ref:FR:MemorialGenWeb: Key:ref:FR:MemorialGenWeb
     ref:FR:NAF: Key:ref:FR:NAF
     ref:FR:Orange: Key:ref:FR:Orange
     ref:FR:LaPoste: Key:ref:FR:LaPoste
     ref:FR:MemorialGenWeb: Key:ref:FR:MemorialGenWeb
     ref:FR:NAF: Key:ref:FR:NAF
     ref:FR:Orange: Key:ref:FR:Orange
+    ref:FR:Orange:NRO: Key:ref:FR:Orange:NRO
     ref:FR:Orange_mobile: Key:ref:FR:Orange mobile
     ref:FR:PTT: Key:ref:FR:PTT
     ref:FR:Orange_mobile: Key:ref:FR:Orange mobile
     ref:FR:PTT: Key:ref:FR:PTT
+    ref:FR:PTT:NRA: Key:ref:FR:PTT:NRA
     ref:FR:RNA: Key:ref:FR:RNA
     ref:FR:RTE: Key:ref:FR:RTE
     ref:FR:RTE_nom: Key:ref:FR:RTE nom
     ref:FR:SFR: Key:ref:FR:SFR
     ref:FR:SIREN: Key:ref:FR:SIREN
     ref:FR:SIRET: Key:ref:FR:SIRET
     ref:FR:RNA: Key:ref:FR:RNA
     ref:FR:RTE: Key:ref:FR:RTE
     ref:FR:RTE_nom: Key:ref:FR:RTE nom
     ref:FR:SFR: Key:ref:FR:SFR
     ref:FR:SIREN: Key:ref:FR:SIREN
     ref:FR:SIRET: Key:ref:FR:SIRET
+    ref:FR:SITCOM: Key:ref:FR:SITCOM
     ref:FR:fantoir: Key:ref:FR:fantoir
     ref:FR:gdo: Key:ref:FR:gdo
     ref:FR:museofile: Key:ref:FR:museofile
     ref:FR:prix-carburants: Key:ref:FR:prix-carburants
     ref:FR:fantoir: Key:ref:FR:fantoir
     ref:FR:gdo: Key:ref:FR:gdo
     ref:FR:museofile: Key:ref:FR:museofile
     ref:FR:prix-carburants: Key:ref:FR:prix-carburants
+    ref:GB:imher: Key:ref:GB:imher
+    ref:GB:mpan: Key:ref:GB:mpan
+    ref:GB:nhle: Key:ref:GB:nhle
+    ref:GB:nhs_ods: Key:ref:GB:nhs ods
     ref:GB:uprn: Key:ref:GB:uprn
     ref:GB:uprn: Key:ref:GB:uprn
+    ref:GB:usrn: Key:ref:GB:usrn
+    ref:GB:wpd_site: Key:ref:GB:wpd site
+    ref:HMDB: Key:ref:HMDB
     ref:HU:edid: Key:ref:HU:edid
     ref:HU:edid: Key:ref:HU:edid
+    ref:HU:om: Key:ref:HU:om
+    ref:HU:vatin: Key:ref:HU:vatin
+    ref:IE:census2015: Key:ref:IE:census2015
+    ref:IE:lenehan: Key:ref:IE:lenehan
+    ref:IE:niah: Key:ref:IE:niah
+    ref:IE:nm: Key:ref:IE:nm
+    ref:IE:smr: Key:ref:IE:smr
     ref:IFOPT: Key:ref:IFOPT
     ref:IFOPT: Key:ref:IFOPT
+    ref:INEP: Key:ref:INEP
     ref:INSEE: Key:ref:INSEE
     ref:ISTAT: Key:ref:ISTAT
     ref:LILA: Key:ref:LILA
     ref:LOCODE: Key:ref:LOCODE
     ref:INSEE: Key:ref:INSEE
     ref:ISTAT: Key:ref:ISTAT
     ref:LILA: Key:ref:LILA
     ref:LOCODE: Key:ref:LOCODE
+    ref:LV:addr: Key:ref:LV:addr
     ref:NAG:UPRN:1: Key:ref:NAG:UPRN:1
     ref:NBd: Key:ref:NBd
     ref:NLPG:UPRN:1: Key:ref:NLPG:UPRN:1
     ref:NPLG:UPRN:1: Key:ref:NPLG:UPRN:1
     ref:NAG:UPRN:1: Key:ref:NAG:UPRN:1
     ref:NBd: Key:ref:NBd
     ref:NLPG:UPRN:1: Key:ref:NLPG:UPRN:1
     ref:NPLG:UPRN:1: Key:ref:NPLG:UPRN:1
+    ref:ProRail: Key:ref:ProRail
+    ref:REI: Key:ref:REI
+    ref:RS:grad: Key:ref:RS:grad
+    ref:RS:kucni_broj: Key:ref:RS:kucni broj
+    ref:RS:naselje: Key:ref:RS:naselje
+    ref:RS:nkd: Key:ref:RS:nkd
+    ref:RS:okrug: Key:ref:RS:okrug
+    ref:RS:opstina: Key:ref:RS:opstina
+    ref:RS:pokrajina: Key:ref:RS:pokrajina
+    ref:RS:ulica: Key:ref:RS:ulica
+    ref:STIB_MIVB: Key:ref:STIB MIVB
     ref:TECB: Key:ref:TECB
     ref:TECC: Key:ref:TECC
     ref:TECH: Key:ref:TECH
     ref:TECB: Key:ref:TECB
     ref:TECC: Key:ref:TECC
     ref:TECH: Key:ref:TECH
@@ -6513,10 +8232,22 @@ en:
     ref:TECN: Key:ref:TECN
     ref:TECX: Key:ref:TECX
     ref:UAI: Key:ref:UAI
     ref:TECN: Key:ref:TECN
     ref:TECX: Key:ref:TECX
     ref:UAI: Key:ref:UAI
+    'ref:US-TX:': 'Key:ref:US-TX:'
+    ref:US-TX:*: Key:ref:US-TX:*
+    ref:US-TX:thc: Key:ref:US-TX:thc
+    ref:US:CIF: Key:ref:US:CIF
+    ref:US:EIA: Key:ref:US:EIA
     ref:US:EPA: Key:ref:US:EPA
     ref:US:EPA: Key:ref:US:EPA
+    ref:US:MA:SARIS: Key:ref:US:MA:SARIS
+    ref:US:MSHA: Key:ref:US:MSHA
+    ref:US:NID: Key:ref:US:NID
+    ref:US:UT:DEQ:DERRID: Key:ref:US:UT:DEQ:DERRID
     ref:UrbIS: Key:ref:UrbIS
     ref:UrbIS: Key:ref:UrbIS
+    ref:VE:UBIGEO: Key:ref:VE:UBIGEO
     ref:WDPA: Key:ref:WDPA
     ref:WDPA: Key:ref:WDPA
+    ref:alp: Key:ref:alp
     ref:ar: Key:ref:ar
     ref:ar: Key:ref:ar
+    ref:arc: Key:ref:arc
     ref:at:bda: Key:ref:at:bda
     ref:at:gkz: Key:ref:at:gkz
     ref:at:okz: Key:ref:at:okz
     ref:at:bda: Key:ref:at:bda
     ref:at:gkz: Key:ref:at:gkz
     ref:at:okz: Key:ref:at:okz
@@ -6525,27 +8256,61 @@ en:
     ref:bam.brno.cz: Key:ref:bam.brno.cz
     ref:bic: Key:ref:bic
     ref:bufa: Key:ref:bufa
     ref:bam.brno.cz: Key:ref:bam.brno.cz
     ref:bic: Key:ref:bic
     ref:bufa: Key:ref:bufa
+    ref:bygningsnr: Key:ref:bygningsnr
+    ref:cadc:2020: Key:ref:cadc:2020
     ref:cadw: Key:ref:cadw
     ref:cadw: Key:ref:cadw
+    ref:canmore: Key:ref:canmore
+    ref:capad:pa_id: Key:ref:capad:pa id
+    ref:capad:uid: Key:ref:capad:uid
+    ref:caribischopenbaarlichaamcode: Key:ref:caribischopenbaarlichaamcode
     ref:circuits: Key:ref:circuits
     ref:cobe: Key:ref:cobe
     ref:circuits: Key:ref:circuits
     ref:cobe: Key:ref:cobe
+    ref:codcat: Key:ref:codcat
     ref:color: Key:ref:color
     ref:colour: Key:ref:colour
     ref:coop: Key:ref:coop
     ref:crs: Key:ref:crs
     ref:color: Key:ref:color
     ref:colour: Key:ref:colour
     ref:coop: Key:ref:coop
     ref:crs: Key:ref:crs
+    ref:csioz: Key:ref:csioz
     ref:ctb: Key:ref:ctb
     ref:ctb: Key:ref:ctb
+    ref:de: Key:ref:de
     ref:deniirn: Key:ref:deniirn
     ref:deniirn: Key:ref:deniirn
+    ref:dew:park_id: Key:ref:dew:park id
     ref:dhis2: Key:ref:dhis2
     ref:dhis2: Key:ref:dhis2
+    ref:doc: Key:ref:doc
     ref:edubase: Key:ref:edubase
     ref:edubase: Key:ref:edubase
+    ref:edubase:group: Key:ref:edubase:group
     ref:ef: Key:ref:ef
     ref:ef: Key:ref:ef
+    ref:es: Key:ref:es
+    ref:fgkz: Key:ref:fgkz
+    ref:find_a_grave: Key:ref:find a grave
+    ref:gbfs: Key:ref:gbfs
+    ref:gemeentecode: Key:ref:gemeentecode
     ref:gnis: Key:ref:gnis
     ref:gnis: Key:ref:gnis
+    ref:gr: Key:ref:gr
+    ref:grc: Key:ref:grc
+    ref:gsi: Key:ref:gsi
     ref:gss: Key:ref:gss
     ref:gurs:hs_mid: Key:ref:gurs:hs mid
     ref:gss: Key:ref:gss
     ref:gurs:hs_mid: Key:ref:gurs:hs mid
+    ref:gurs:sta_sid: Key:ref:gurs:sta sid
+    ref:gwlnr: Key:ref:gwlnr
     ref:harbour: Key:ref:harbour
     ref:herbarium: Key:ref:herbarium
     ref:harbour: Key:ref:harbour
     ref:herbarium: Key:ref:herbarium
+    ref:hmdb: Key:ref:hmdb
     ref:hsmaq: Key:ref:hsmaq
     ref:hsmaq: Key:ref:hsmaq
+    ref:ico: Key:ref:ico
     ref:industrial: Key:ref:industrial
     ref:industrial: Key:ref:industrial
+    ref:ine: Key:ref:ine
     ref:isil: Key:ref:isil
     ref:kmb: Key:ref:kmb
     ref:isil: Key:ref:isil
     ref:kmb: Key:ref:kmb
+    ref:kons: Key:ref:kons
+    ref:landcode: Key:ref:landcode
+    ref:landsdeelcode: Key:ref:landsdeelcode
+    ref:linz:address_id: Key:ref:linz:address id
+    ref:linz:building_id: Key:ref:linz:building id
+    ref:linz:hydrographic_id: Key:ref:linz:hydrographic id
+    ref:linz:pastoral_lease_id: Key:ref:linz:pastoral lease id
+    ref:linz:place_id: Key:ref:linz:place id
+    ref:linz:topo50_id: Key:ref:linz:topo50 id
     ref:lor: Key:ref:lor
     ref:mcrb: Key:ref:mcrb
     ref:mhs: Key:ref:mhs
     ref:lor: Key:ref:lor
     ref:mcrb: Key:ref:mcrb
     ref:mhs: Key:ref:mhs
@@ -6554,34 +8319,54 @@ en:
     ref:minvskaddress: Key:ref:minvskaddress
     ref:mise: Key:ref:mise
     ref:mobil-parken.de: Key:ref:mobil-parken.de
     ref:minvskaddress: Key:ref:minvskaddress
     ref:mise: Key:ref:mise
     ref:mobil-parken.de: Key:ref:mobil-parken.de
+    ref:msal: Key:ref:msal
+    ref:nid: Key:ref:nid
     ref:nrhp: Key:ref:nrhp
     ref:ortsnetz: Key:ref:ortsnetz
     ref:oslo:tree: Key:ref:oslo:tree
     ref:penndot: Key:ref:penndot
     ref:nrhp: Key:ref:nrhp
     ref:ortsnetz: Key:ref:ortsnetz
     ref:oslo:tree: Key:ref:oslo:tree
     ref:penndot: Key:ref:penndot
+    ref:provinciecode: Key:ref:provinciecode
     ref:psma:lga_pid: Key:ref:psma:lga pid
     ref:psma:loc_pid: Key:ref:psma:loc pid
     ref:raa: Key:ref:raa
     ref:rce: Key:ref:rce
     ref:psma:lga_pid: Key:ref:psma:lga pid
     ref:psma:loc_pid: Key:ref:psma:loc pid
     ref:raa: Key:ref:raa
     ref:rce: Key:ref:rce
+    ref:registered_building: Key:ref:registered building
     ref:ruian: Key:ref:ruian
     ref:ruian:addr: Key:ref:ruian:addr
     ref:ruian:building: Key:ref:ruian:building
     ref:ruian:street: Key:ref:ruian:street
     ref:sandre: Key:ref:sandre
     ref:ruian: Key:ref:ruian
     ref:ruian:addr: Key:ref:ruian:addr
     ref:ruian:building: Key:ref:ruian:building
     ref:ruian:street: Key:ref:ruian:street
     ref:sandre: Key:ref:sandre
+    ref:sboid: Key:ref:sboid
     ref:se:pts:postort: Key:ref:se:pts:postort
     ref:se:scb: Key:ref:se:scb
     ref:seedcode: Key:ref:seedcode
     ref:shop:num: Key:ref:shop:num
     ref:se:pts:postort: Key:ref:se:pts:postort
     ref:se:scb: Key:ref:se:scb
     ref:seedcode: Key:ref:seedcode
     ref:shop:num: Key:ref:shop:num
+    ref:signed: Key:ref:signed
+    ref:siri-sx: Key:ref:siri-sx
     ref:sitp: Key:ref:sitp
     ref:sitp: Key:ref:sitp
+    ref:slnid: Key:ref:slnid
+    ref:sloid: Key:ref:sloid
+    ref:sprockhoff: Key:ref:sprockhoff
     ref:sr:maticni_broj: Key:ref:sr:maticni broj
     ref:sr:maticni_broj: Key:ref:sr:maticni broj
+    ref:ssb_tettsted: Key:ref:ssb tettsted
     ref:statistical: Key:ref:statistical
     ref:statistical: Key:ref:statistical
+    ref:syc: Key:ref:syc
     ref:taskey: Key:ref:taskey
     ref:taskey: Key:ref:taskey
+    ref:temples.ru: Key:ref:temples.ru
+    ref:thc: Key:ref:thc
+    ref:udir_nsr: Key:ref:udir nsr
+    ref:us:nid: Key:ref:us:nid
+    ref:us:ny:swis: Key:ref:us:ny:swis
     ref:vatin: Key:ref:vatin
     ref:vatin:hu: Key:ref:vatin:hu
     ref:vatin: Key:ref:vatin
     ref:vatin:hu: Key:ref:vatin:hu
+    ref:veiligheidsregiocode: Key:ref:veiligheidsregiocode
     ref:vorwahl: Key:ref:vorwahl
     ref:vorwahl: Key:ref:vorwahl
+    ref:waterschapscode: Key:ref:waterschapscode
     ref:wawa: Key:ref:wawa
     ref:whc: Key:ref:whc
     ref:wigos: Key:ref:wigos
     ref:wmo: Key:ref:wmo
     ref:wawa: Key:ref:wawa
     ref:whc: Key:ref:whc
     ref:wigos: Key:ref:wigos
     ref:wmo: Key:ref:wmo
+    ref:woonplaatscode: Key:ref:woonplaatscode
     ref:wpi: Key:ref:wpi
     ref:zsj: Key:ref:zsj
     ref_name: Key:ref name
     ref:wpi: Key:ref:wpi
     ref:zsj: Key:ref:zsj
     ref_name: Key:ref name
@@ -6589,13 +8374,19 @@ en:
     reference_point: Key:reference point
     reg_name: Key:reg name
     reg_name:ar: Key:reg name:ar
     reference_point: Key:reference point
     reg_name: Key:reg name
     reg_name:ar: Key:reg name:ar
+    reg_name:de: Key:reg name:de
+    reg_name:es: Key:reg name:es
+    reg_name:gr: Key:reg name:gr
+    reg_name:grc: Key:reg name:grc
     reg_ref: Key:reg ref
     regelbau: Key:regelbau
     region:type: Key:region:type
     related_law: Key:related law
     religion: Key:religion
     reg_ref: Key:reg ref
     regelbau: Key:regelbau
     region:type: Key:region:type
     related_law: Key:related law
     religion: Key:religion
+    remotely_controllable: Key:remotely controllable
     removed: Key:removed
     'removed:': 'Key:removed:'
     removed: Key:removed
     'removed:': 'Key:removed:'
+    removed:*: Key:removed:*
     removed:amenity: Key:removed:amenity
     removed:building: Key:removed:building
     rental: Key:rental
     removed:amenity: Key:removed:amenity
     removed:building: Key:removed:building
     rental: Key:rental
@@ -6606,14 +8397,20 @@ en:
     reporting_marks: Key:reporting marks
     research: Key:research
     reservation: Key:reservation
     reporting_marks: Key:reporting marks
     research: Key:research
     reservation: Key:reservation
+    reservation:website: Key:reservation:website
     reservoir_type: Key:reservoir type
     residential: Key:residential
     resort: Key:resort
     resource: Key:resource
     restaurant: Key:restaurant
     restriction:conditional: Key:restriction:conditional
     reservoir_type: Key:reservoir type
     residential: Key:residential
     resort: Key:resort
     resource: Key:resource
     restaurant: Key:restaurant
     restriction:conditional: Key:restriction:conditional
+    retaining_wall: Key:retaining wall
     retreat: Key:retreat
     retreat: Key:retreat
-    retroreflecting: Key:retroreflecting
+    reusable_packaging: Key:reusable packaging
+    reusable_packaging:accept: Key:reusable packaging:accept
+    reusable_packaging:offer: Key:reusable packaging:offer
+    revert:id: Key:revert:id
+    review: Key:review
     review_requested: Key:review requested
     rfr: Key:rfr
     rhn_ref: Key:rhn ref
     review_requested: Key:review requested
     rfr: Key:rfr
     rhn_ref: Key:rhn ref
@@ -6626,17 +8423,24 @@ en:
     road_marking: Key:road marking
     roadtrain: Key:roadtrain
     roller_coaster: Key:roller coaster
     road_marking: Key:road marking
     roadtrain: Key:roadtrain
     roller_coaster: Key:roller coaster
+    roller_coaster:track: Key:roller coaster:track
+    roller_coaster:type: Key:roller coaster:type
     roof:colour: Key:roof:colour
     roof:direction: Key:roof:direction
     roof:colour: Key:roof:colour
     roof:direction: Key:roof:direction
+    roof:height: Key:roof:height
+    roof:levels: Key:roof:levels
     roof:material: Key:roof:material
     roof:material: Key:roof:material
+    roof:orientation: Key:roof:orientation
     roof:ridge: Key:roof:ridge
     roof:shape: Key:roof:shape
     room: Key:room
     rooms: Key:rooms
     rotor:diameter: Key:rotor:diameter
     roof:ridge: Key:roof:ridge
     roof:shape: Key:roof:shape
     room: Key:room
     rooms: Key:rooms
     rotor:diameter: Key:rotor:diameter
+    rotor:swept_area: Key:rotor:swept area
     roundtrip: Key:roundtrip
     route: Key:route
     route_availability: Key:route availability
     roundtrip: Key:roundtrip
     route: Key:route
     route_availability: Key:route availability
+    route_marker: Key:route marker
     route_master: Key:route master
     route_ref: Key:route ref
     route_ref:De_Lijn: Key:route ref:De Lijn
     route_master: Key:route master
     route_ref: Key:route ref
     route_ref:De_Lijn: Key:route ref:De Lijn
@@ -6646,15 +8450,20 @@ en:
     route_ref:TECL: Key:route ref:TECL
     route_ref:TECN: Key:route ref:TECN
     route_ref:TECX: Key:route ref:TECX
     route_ref:TECL: Key:route ref:TECL
     route_ref:TECN: Key:route ref:TECN
     route_ref:TECX: Key:route ref:TECX
+    routing:entrance: Key:routing:entrance
     royal_cypher: Key:royal cypher
     royal_cypher:wikidata: Key:royal cypher:wikidata
     rpn_ref: Key:rpn ref
     rtc_rate: Key:rtc rate
     rtsa_scale: Key:rtsa scale
     royal_cypher: Key:royal cypher
     royal_cypher:wikidata: Key:royal cypher:wikidata
     rpn_ref: Key:rpn ref
     rtc_rate: Key:rtc rate
     rtsa_scale: Key:rtsa scale
+    rubber_tires: Key:rubber tires
     ruined: Key:ruined
     'ruined:': 'Key:ruined:'
     ruined: Key:ruined
     'ruined:': 'Key:ruined:'
+    ruined:*: Key:ruined:*
+    ruined:building: Key:ruined:building
     ruins: Key:ruins
     'ruins:': 'Key:ruins:'
     ruins: Key:ruins
     'ruins:': 'Key:ruins:'
+    ruins:*: Key:ruins:*
     rungs: Key:rungs
     rv: Key:rv
     rwn_ref: Key:rwn ref
     rungs: Key:rungs
     rv: Key:rv
     rwn_ref: Key:rwn ref
@@ -6665,7 +8474,10 @@ en:
     safety_rope: Key:safety rope
     safety_rope_side: Key:safety rope side
     sagns_id: Key:sagns id
     safety_rope: Key:safety rope
     safety_rope_side: Key:safety rope side
     sagns_id: Key:sagns id
+    sailboat: Key:sailboat
+    sales: Key:sales
     salt: Key:salt
     salt: Key:salt
+    sample_collection: Key:sample collection
     sanitary_dump_station: Key:sanitary dump station
     sauna: Key:sauna
     sauna:fuel: Key:sauna:fuel
     sanitary_dump_station: Key:sanitary dump station
     sauna: Key:sauna
     sauna:fuel: Key:sauna:fuel
@@ -6674,28 +8486,86 @@ en:
     sauna:water:description: Key:sauna:water:description
     scenic: Key:scenic
     school: Key:school
     sauna:water:description: Key:sauna:water:description
     scenic: Key:scenic
     school: Key:school
+    'school:': 'Key:school:'
+    school:*: Key:school:*
+    school:boarding: Key:school:boarding
+    school:federation:name: Key:school:federation:name
+    school:gender: Key:school:gender
+    school:language: Key:school:language
+    school:selective: Key:school:selective
+    school:trust: Key:school:trust
+    school:trust:name: Key:school:trust:name
+    school:trust:type: Key:school:trust:type
+    school:type: Key:school:type
+    school_bus: Key:school bus
+    scout: Key:scout
+    screen: Key:screen
     scuba_diving:courses: Key:scuba diving:courses
     scuba_diving:rental: Key:scuba diving:rental
     scuba_diving:courses: Key:scuba diving:courses
     scuba_diving:rental: Key:scuba diving:rental
+    sculpture_type: Key:sculpture type
     seamark: Key:seamark
     seamark: Key:seamark
+    'seamark:': 'Key:seamark:'
+    seamark:*: Key:seamark:*
+    seamark:beacon_cardinal:category: Key:seamark:beacon cardinal:category
+    seamark:beacon_cardinal:colour: Key:seamark:beacon cardinal:colour
+    seamark:beacon_cardinal:colour_pattern: Key:seamark:beacon cardinal:colour pattern
+    seamark:beacon_cardinal:shape: Key:seamark:beacon cardinal:shape
+    seamark:beacon_isolated_danger:colour: Key:seamark:beacon isolated danger:colour
+    seamark:beacon_isolated_danger:colour_pattern: Key:seamark:beacon isolated danger:colour
+      pattern
     seamark:beacon_isolated_danger:shape: Key:seamark:beacon isolated danger:shape
     seamark:beacon_isolated_danger:shape: Key:seamark:beacon isolated danger:shape
+    seamark:beacon_lateral:category: Key:seamark:beacon lateral:category
+    seamark:beacon_lateral:colour: Key:seamark:beacon lateral:colour
+    seamark:beacon_lateral:colour_pattern: Key:seamark:beacon lateral:colour pattern
+    seamark:beacon_lateral:reflectivity: Key:seamark:beacon lateral:reflectivity
+    seamark:beacon_lateral:shape: Key:seamark:beacon lateral:shape
+    seamark:beacon_lateral:system: Key:seamark:beacon lateral:system
     seamark:beacon_safe_water:colour: Key:seamark:beacon safe water:colour
     seamark:beacon_safe_water:colour_pattern: Key:seamark:beacon safe water:colour
       pattern
     seamark:beacon_safe_water:shape: Key:seamark:beacon safe water:shape
     seamark:beacon_safe_water:colour: Key:seamark:beacon safe water:colour
     seamark:beacon_safe_water:colour_pattern: Key:seamark:beacon safe water:colour
       pattern
     seamark:beacon_safe_water:shape: Key:seamark:beacon safe water:shape
+    seamark:beacon_special_purpose:category: Key:seamark:beacon special purpose:category
+    seamark:beacon_special_purpose:colour_pattern: Key:seamark:beacon special purpose:colour
+      pattern
+    seamark:beacon_special_purpose:height: Key:seamark:beacon special purpose:height
+    seamark:beacon_special_purpose:shape: Key:seamark:beacon special purpose:shape
+    seamark:berth:category: Key:seamark:berth:category
+    seamark:berth:class: Key:seamark:berth:class
     seamark:bridge:category: Key:seamark:bridge:category
     seamark:bridge:clearance_height: Key:seamark:bridge:clearance height
     seamark:bridge:clearance_height_closed: Key:seamark:bridge:clearance height closed
     seamark:bridge:clearance_height_open: Key:seamark:bridge:clearance height open
     seamark:bridge:clearance_width: Key:seamark:bridge:clearance width
     seamark:bridge:category: Key:seamark:bridge:category
     seamark:bridge:clearance_height: Key:seamark:bridge:clearance height
     seamark:bridge:clearance_height_closed: Key:seamark:bridge:clearance height closed
     seamark:bridge:clearance_height_open: Key:seamark:bridge:clearance height open
     seamark:bridge:clearance_width: Key:seamark:bridge:clearance width
+    seamark:buoy_cardinal:category: Key:seamark:buoy cardinal:category
+    seamark:buoy_cardinal:colour: Key:seamark:buoy cardinal:colour
+    seamark:buoy_cardinal:colour_pattern: Key:seamark:buoy cardinal:colour pattern
+    seamark:buoy_cardinal:shape: Key:seamark:buoy cardinal:shape
+    seamark:buoy_installation:category: Key:seamark:buoy installation:category
+    seamark:buoy_isolated_danger:colour: Key:seamark:buoy isolated danger:colour
+    seamark:buoy_isolated_danger:colour_pattern: Key:seamark:buoy isolated danger:colour
+      pattern
+    seamark:buoy_isolated_danger:shape: Key:seamark:buoy isolated danger:shape
+    seamark:buoy_lateral:category: Key:seamark:buoy lateral:category
+    seamark:buoy_lateral:colour: Key:seamark:buoy lateral:colour
     seamark:buoy_lateral:reflectivity: Key:seamark:buoy lateral:reflectivity
     seamark:buoy_lateral:reflectivity: Key:seamark:buoy lateral:reflectivity
+    seamark:buoy_lateral:shape: Key:seamark:buoy lateral:shape
+    seamark:buoy_lateral:system: Key:seamark:buoy lateral:system
+    seamark:buoy_safe_water:colour: Key:seamark:buoy safe water:colour
+    seamark:buoy_safe_water:colour_pattern: Key:seamark:buoy safe water:colour pattern
+    seamark:buoy_safe_water:shape: Key:seamark:buoy safe water:shape
+    seamark:buoy_special_purpose:category: Key:seamark:buoy special purpose:category
+    seamark:buoy_special_purpose:colour: Key:seamark:buoy special purpose:colour
     seamark:buoy_special_purpose:reflectivity: Key:seamark:buoy special purpose:reflectivity
     seamark:buoy_special_purpose:reflectivity: Key:seamark:buoy special purpose:reflectivity
+    seamark:buoy_special_purpose:shape: Key:seamark:buoy special purpose:shape
     seamark:cable_overhead:category: Key:seamark:cable overhead:category
     seamark:cable_overhead:category: Key:seamark:cable overhead:category
+    seamark:cable_overhead:clearance_height_safe: Key:seamark:cable overhead:clearance
+      height safe
     seamark:cable_overhead:vertical_clearance_safe: Key:seamark:cable overhead:vertical
       clearance safe
     seamark:cable_submarine:category: Key:seamark:cable submarine:category
     seamark:conspicuity: Key:seamark:conspicuity
     seamark:cable_overhead:vertical_clearance_safe: Key:seamark:cable overhead:vertical
       clearance safe
     seamark:cable_submarine:category: Key:seamark:cable submarine:category
     seamark:conspicuity: Key:seamark:conspicuity
+    seamark:crane:category: Key:seamark:crane:category
     seamark:distance_mark:category: Key:seamark:distance mark:category
     seamark:distance_mark:category: Key:seamark:distance mark:category
-    seamark:distance_mark:distance: Key:seamark:distance mark:distance
     seamark:distance_mark:height_units: Key:seamark:distance mark:height units
     seamark:distance_mark:units: Key:seamark:distance mark:units
     seamark:fixme: Key:seamark:fixme
     seamark:distance_mark:height_units: Key:seamark:distance mark:height units
     seamark:distance_mark:units: Key:seamark:distance mark:units
     seamark:fixme: Key:seamark:fixme
@@ -6709,23 +8579,88 @@ en:
     seamark:gate:category: Key:seamark:gate:category
     seamark:gate:clearance_height: Key:seamark:gate:clearance height
     seamark:gate:clearance_width: Key:seamark:gate:clearance width
     seamark:gate:category: Key:seamark:gate:category
     seamark:gate:clearance_height: Key:seamark:gate:clearance height
     seamark:gate:clearance_width: Key:seamark:gate:clearance width
+    seamark:harbour:category: Key:seamark:harbour:category
+    seamark:hulk:category: Key:seamark:hulk:category
     seamark:landmark:category: Key:seamark:landmark:category
     seamark:landmark:conspicuity: Key:seamark:landmark:conspicuity
     seamark:landmark:function: Key:seamark:landmark:function
     seamark:landmark:category: Key:seamark:landmark:category
     seamark:landmark:conspicuity: Key:seamark:landmark:conspicuity
     seamark:landmark:function: Key:seamark:landmark:function
+    seamark:light:1:category: Key:seamark:light:1:category
+    seamark:light:1:character: Key:seamark:light:1:character
+    seamark:light:1:colour: Key:seamark:light:1:colour
+    seamark:light:1:exhibition: Key:seamark:light:1:exhibition
+    seamark:light:1:group: Key:seamark:light:1:group
+    seamark:light:1:height: Key:seamark:light:1:height
+    seamark:light:1:orientation: Key:seamark:light:1:orientation
+    seamark:light:1:period: Key:seamark:light:1:period
+    seamark:light:1:range: Key:seamark:light:1:range
+    seamark:light:1:sector_end: Key:seamark:light:1:sector end
+    seamark:light:1:sector_start: Key:seamark:light:1:sector start
+    seamark:light:1:sequence: Key:seamark:light:1:sequence
+    seamark:light:1:visibility: Key:seamark:light:1:visibility
+    seamark:light:2:character: Key:seamark:light:2:character
+    seamark:light:2:colour: Key:seamark:light:2:colour
+    seamark:light:2:exhibition: Key:seamark:light:2:exhibition
+    seamark:light:2:group: Key:seamark:light:2:group
+    seamark:light:2:height: Key:seamark:light:2:height
+    seamark:light:2:orientation: Key:seamark:light:2:orientation
+    seamark:light:2:period: Key:seamark:light:2:period
+    seamark:light:2:range: Key:seamark:light:2:range
+    seamark:light:2:sector_end: Key:seamark:light:2:sector end
+    seamark:light:2:sector_start: Key:seamark:light:2:sector start
+    seamark:light:2:sequence: Key:seamark:light:2:sequence
+    seamark:light:2:visibility: Key:seamark:light:2:visibility
+    seamark:light:3:character: Key:seamark:light:3:character
+    seamark:light:3:colour: Key:seamark:light:3:colour
+    seamark:light:3:exhibition: Key:seamark:light:3:exhibition
+    seamark:light:3:group: Key:seamark:light:3:group
+    seamark:light:3:height: Key:seamark:light:3:height
+    seamark:light:3:orientation: Key:seamark:light:3:orientation
+    seamark:light:3:period: Key:seamark:light:3:period
+    seamark:light:3:range: Key:seamark:light:3:range
+    seamark:light:3:sector_end: Key:seamark:light:3:sector end
+    seamark:light:3:sector_start: Key:seamark:light:3:sector start
+    seamark:light:3:sequence: Key:seamark:light:3:sequence
+    seamark:light:3:visibility: Key:seamark:light:3:visibility
+    seamark:light:category: Key:seamark:light:category
+    seamark:light:character: Key:seamark:light:character
+    seamark:light:colour: Key:seamark:light:colour
     seamark:light:exhibition: Key:seamark:light:exhibition
     seamark:light:range: Key:seamark:light:range
     seamark:light:exhibition: Key:seamark:light:exhibition
     seamark:light:range: Key:seamark:light:range
+    seamark:light:sector_end: Key:seamark:light:sector end
+    seamark:light:sector_start: Key:seamark:light:sector start
     seamark:light:status: Key:seamark:light:status
     seamark:light:visibility: Key:seamark:light:visibility
     seamark:light:status: Key:seamark:light:status
     seamark:light:visibility: Key:seamark:light:visibility
+    seamark:light_float:colour: Key:seamark:light float:colour
+    seamark:light_float:colour_pattern: Key:seamark:light float:colour pattern
     seamark:light_vessel:colour: Key:seamark:light vessel:colour
     seamark:light_vessel:colour: Key:seamark:light vessel:colour
+    seamark:marine_farm:category: Key:seamark:marine farm:category
+    seamark:mooring:shape: Key:seamark:mooring:shape
     seamark:name: Key:seamark:name
     seamark:name: Key:seamark:name
+    seamark:notice:1:category: Key:seamark:notice:1:category
+    seamark:notice:1:function: Key:seamark:notice:1:function
+    seamark:notice:2:category: Key:seamark:notice:2:category
+    seamark:notice:2:function: Key:seamark:notice:2:function
+    seamark:notice:3:category: Key:seamark:notice:3:category
+    seamark:notice:addition: Key:seamark:notice:addition
+    seamark:notice:category: Key:seamark:notice:category
+    seamark:notice:direction: Key:seamark:notice:direction
+    seamark:notice:function: Key:seamark:notice:function
+    seamark:notice:impact: Key:seamark:notice:impact
+    seamark:notice:orientation: Key:seamark:notice:orientation
+    seamark:notice:system: Key:seamark:notice:system
     seamark:obstruction:category: Key:seamark:obstruction:category
     seamark:obstruction:category: Key:seamark:obstruction:category
+    seamark:obstruction:depth: Key:seamark:obstruction:depth
+    seamark:obstruction:water_level: Key:seamark:obstruction:water level
+    seamark:pile:category: Key:seamark:pile:category
     seamark:pilot_boarding:category: Key:seamark:pilot boarding:category
     seamark:pilot_boarding:category: Key:seamark:pilot boarding:category
+    seamark:pilot_boarding:channel: Key:seamark:pilot boarding:channel
     seamark:pipeline_submarine:category: Key:seamark:pipeline submarine:category
     seamark:pipeline_submarine:name: Key:seamark:pipeline submarine:name
     seamark:pipeline_submarine:product: Key:seamark:pipeline submarine:product
     seamark:platform:category: Key:seamark:platform:category
     seamark:pipeline_submarine:category: Key:seamark:pipeline submarine:category
     seamark:pipeline_submarine:name: Key:seamark:pipeline submarine:name
     seamark:pipeline_submarine:product: Key:seamark:pipeline submarine:product
     seamark:platform:category: Key:seamark:platform:category
+    seamark:platform:construction: Key:seamark:platform:construction
+    seamark:production_area:category: Key:seamark:production area:category
     seamark:radar_reflector: Key:seamark:radar reflector
     seamark:radar_reflector: Key:seamark:radar reflector
-    seamark:radar_station:category: Key:seamark:radar station:category
     seamark:radar_station:channel: Key:seamark:radar station:channel
     seamark:radar_transponder:category: Key:seamark:radar transponder:category
     seamark:radar_transponder:group: Key:seamark:radar transponder:group
     seamark:radar_station:channel: Key:seamark:radar station:channel
     seamark:radar_transponder:category: Key:seamark:radar transponder:category
     seamark:radar_transponder:group: Key:seamark:radar transponder:group
@@ -6735,6 +8670,7 @@ en:
     seamark:radar_transponder:sector_start: Key:seamark:radar transponder:sector start
     seamark:radar_transponder:sequence: Key:seamark:radar transponder:sequence
     seamark:radar_transponder:wavelength: Key:seamark:radar transponder:wavelength
     seamark:radar_transponder:sector_start: Key:seamark:radar transponder:sector start
     seamark:radar_transponder:sequence: Key:seamark:radar transponder:sequence
     seamark:radar_transponder:wavelength: Key:seamark:radar transponder:wavelength
+    seamark:radio_station:category: Key:seamark:radio station:category
     seamark:radio_station:group: Key:seamark:radio station:group
     seamark:reflectivity: Key:seamark:reflectivity
     seamark:restricted_area:category: Key:seamark:restricted area:category
     seamark:radio_station:group: Key:seamark:radio station:group
     seamark:reflectivity: Key:seamark:reflectivity
     seamark:restricted_area:category: Key:seamark:restricted area:category
@@ -6744,49 +8680,150 @@ en:
     seamark:sea_area:category: Key:seamark:sea area:category
     seamark:seabed_area:surface: Key:seamark:seabed area:surface
     seamark:shoreline_construction:category: Key:seamark:shoreline construction:category
     seamark:sea_area:category: Key:seamark:sea area:category
     seamark:seabed_area:surface: Key:seamark:seabed area:surface
     seamark:shoreline_construction:category: Key:seamark:shoreline construction:category
+    seamark:shoreline_construction:construction: Key:seamark:shoreline construction:construction
+    seamark:signal_station_traffic:category: Key:seamark:signal station traffic:category
     seamark:small_craft_facility:category: Key:seamark:small craft facility:category
     seamark:small_craft_facility:category: Key:seamark:small craft facility:category
+    seamark:topmark:colour: Key:seamark:topmark:colour
+    seamark:topmark:colour_pattern: Key:seamark:topmark:colour pattern
+    seamark:topmark:shape: Key:seamark:topmark:shape
     seamark:type: Key:seamark:type
     seamark:type: Key:seamark:type
+    seamark:waterway_gauge:category: Key:seamark:waterway gauge:category
+    seamark:wreck:category: Key:seamark:wreck:category
     seasonal: Key:seasonal
     seasonal:snowfall:regaintime: Key:seasonal:snowfall:regaintime
     seats: Key:seats
     second_hand: Key:second hand
     seasonal: Key:seasonal
     seasonal:snowfall:regaintime: Key:seasonal:snowfall:regaintime
     seats: Key:seats
     second_hand: Key:second hand
+    security_desk: Key:security desk
     segregated: Key:segregated
     self_checkout: Key:self checkout
     self_service: Key:self service
     segregated: Key:segregated
     self_checkout: Key:self checkout
     self_service: Key:self service
+    sells: Key:sells
     sells:tobacco: Key:sells:tobacco
     service: Key:service
     sells:tobacco: Key:sells:tobacco
     service: Key:service
+    service:bicycle: Key:service:bicycle
+    'service:bicycle:': 'Key:service:bicycle:'
+    service:bicycle:*: Key:service:bicycle:*
+    service:bicycle:Bicycle_Sales_and_Service: Key:service:bicycle:Bicycle Sales and
+      Service
     service:bicycle:cleaning: Key:service:bicycle:cleaning
     service:bicycle:diy: Key:service:bicycle:diy
     service:bicycle:cleaning: Key:service:bicycle:cleaning
     service:bicycle:diy: Key:service:bicycle:diy
+    service:bicycle:ebike: Key:service:bicycle:ebike
+    service:bicycle:miscellaneous: Key:service:bicycle:miscellaneous
     service:bicycle:pump: Key:service:bicycle:pump
     service:bicycle:rental: Key:service:bicycle:rental
     service:bicycle:repair: Key:service:bicycle:repair
     service:bicycle:retail: Key:service:bicycle:retail
     service:bicycle:pump: Key:service:bicycle:pump
     service:bicycle:rental: Key:service:bicycle:rental
     service:bicycle:repair: Key:service:bicycle:repair
     service:bicycle:retail: Key:service:bicycle:retail
+    service:bicycle:sales: Key:service:bicycle:sales
     service:bicycle:second_hand: Key:service:bicycle:second hand
     service:bicycle:second_hand: Key:service:bicycle:second hand
+    service:bicycle:spare_parts: Key:service:bicycle:spare parts
+    service:electricity: Key:service:electricity
     service:vehicle: Key:service:vehicle
     service:vehicle: Key:service:vehicle
+    'service:vehicle:': 'Key:service:vehicle:'
+    service:vehicle:*: Key:service:vehicle:*
+    service:vehicle:Car_sales: Key:service:vehicle:Car sales
+    service:vehicle:Sale: Key:service:vehicle:Sale
+    service:vehicle:air_conditioning: Key:service:vehicle:air conditioning
+    service:vehicle:alignment: Key:service:vehicle:alignment
+    service:vehicle:automotive_repair: Key:service:vehicle:automotive repair
+    service:vehicle:batteries: Key:service:vehicle:batteries
+    service:vehicle:body_paint: Key:service:vehicle:body paint
+    service:vehicle:body_repair: Key:service:vehicle:body repair
+    service:vehicle:bodywork: Key:service:vehicle:bodywork
+    service:vehicle:brakes: Key:service:vehicle:brakes
+    service:vehicle:car_buy: Key:service:vehicle:car buy
+    service:vehicle:car_parts: Key:service:vehicle:car parts
+    service:vehicle:car_repair: Key:service:vehicle:car repair
+    service:vehicle:car_sales: Key:service:vehicle:car sales
+    service:vehicle:car_service: Key:service:vehicle:car service
+    service:vehicle:car_wash: Key:service:vehicle:car wash
+    service:vehicle:carwash: Key:service:vehicle:carwash
+    service:vehicle:collision_repair: Key:service:vehicle:collision repair
+    service:vehicle:dealer: Key:service:vehicle:dealer
+    service:vehicle:diagnostics: Key:service:vehicle:diagnostics
+    service:vehicle:electrical: Key:service:vehicle:electrical
+    service:vehicle:engine_repair: Key:service:vehicle:engine repair
+    service:vehicle:exhausts: Key:service:vehicle:exhausts
+    service:vehicle:glass: Key:service:vehicle:glass
+    service:vehicle:glass_repair: Key:service:vehicle:glass repair
+    service:vehicle:inspection: Key:service:vehicle:inspection
     service:vehicle:lpg: Key:service:vehicle:lpg
     service:vehicle:lpg: Key:service:vehicle:lpg
+    service:vehicle:maintenance: Key:service:vehicle:maintenance
+    service:vehicle:motor: Key:service:vehicle:motor
+    service:vehicle:motorbike: Key:service:vehicle:motorbike
+    service:vehicle:muffler: Key:service:vehicle:muffler
+    service:vehicle:new_car_sales: Key:service:vehicle:new car sales
+    service:vehicle:oil: Key:service:vehicle:oil
+    service:vehicle:oil_change: Key:service:vehicle:oil change
+    service:vehicle:paint: Key:service:vehicle:paint
+    service:vehicle:painting: Key:service:vehicle:painting
+    service:vehicle:parts: Key:service:vehicle:parts
+    service:vehicle:rental: Key:service:vehicle:rental
+    service:vehicle:repair: Key:service:vehicle:repair
+    service:vehicle:repairs: Key:service:vehicle:repairs
+    service:vehicle:sale: Key:service:vehicle:sale
+    service:vehicle:sales: Key:service:vehicle:sales
+    service:vehicle:servicing: Key:service:vehicle:servicing
+    service:vehicle:shock_absorbers: Key:service:vehicle:shock absorbers
+    service:vehicle:suspension: Key:service:vehicle:suspension
+    service:vehicle:tires: Key:service:vehicle:tires
+    service:vehicle:towing: Key:service:vehicle:towing
+    service:vehicle:transmission: Key:service:vehicle:transmission
+    service:vehicle:transmission_repair: Key:service:vehicle:transmission repair
+    service:vehicle:truck_repair: Key:service:vehicle:truck repair
+    service:vehicle:tyre_services: Key:service:vehicle:tyre services
+    service:vehicle:tyres_repair: Key:service:vehicle:tyres repair
+    service:vehicle:used_car_sales: Key:service:vehicle:used car sales
+    service:vehicle:welding: Key:service:vehicle:welding
+    service:vehicle:wheels: Key:service:vehicle:wheels
+    service:vehicle:windshields: Key:service:vehicle:windshields
+    service_branch: Key:service branch
     service_times: Key:service times
     service_times: Key:service times
+    service_times:wheelchair: Key:service times:wheelchair
+    settlement:origin: Key:settlement:origin
+    settlement_type: Key:settlement type
+    seveso: Key:seveso
     shade: Key:shade
     shade: Key:shade
+    shape: Key:shape
     share_taxi: Key:share taxi
     shelter: Key:shelter
     shelter_type: Key:shelter type
     ship: Key:ship
     share_taxi: Key:share taxi
     shelter: Key:shelter
     shelter_type: Key:shelter type
     ship: Key:ship
+    ship:type: Key:ship:type
     shoes: Key:shoes
     shooting: Key:shooting
     shop: Key:shop
     short_name: Key:short name
     short_name:ar: Key:short name:ar
     shoes: Key:shoes
     shooting: Key:shooting
     shop: Key:shop
     short_name: Key:short name
     short_name:ar: Key:short name:ar
+    short_name:arc: Key:short name:arc
     short_name:azb: Key:short name:azb
     short_name:ckb: Key:short name:ckb
     short_name:azb: Key:short name:azb
     short_name:ckb: Key:short name:ckb
+    short_name:de: Key:short name:de
+    short_name:es: Key:short name:es
     short_name:fa: Key:short name:fa
     short_name:fa: Key:short name:fa
+    short_name:fr: Key:short name:fr
+    short_name:fur: Key:short name:fur
+    short_name:gr: Key:short name:gr
+    short_name:grc: Key:short name:grc
+    short_name:pl: Key:short name:pl
+    short_name:syc: Key:short name:syc
     short_name:ug: Key:short name:ug
     short_name:ur: Key:short name:ur
     shoulder: Key:shoulder
     shower: Key:shower
     short_name:ug: Key:short name:ug
     short_name:ur: Key:short name:ur
     shoulder: Key:shoulder
     shower: Key:shower
+    shrine: Key:shrine
+    shrubbery:density: Key:shrubbery:density
+    shrubbery:shape: Key:shrubbery:shape
     side_road: Key:side road
     sides: Key:sides
     sidewalk: Key:sidewalk
     side_road: Key:side road
     sides: Key:sides
     sidewalk: Key:sidewalk
+    sidewalk:both: Key:sidewalk:both
+    sidewalk:both:bicycle: Key:sidewalk:both:bicycle
     sidewalk:both:surface: Key:sidewalk:both:surface
     sidewalk:both:surface: Key:sidewalk:both:surface
+    sidewalk:left: Key:sidewalk:left
+    sidewalk:left:bicycle: Key:sidewalk:left:bicycle
     sidewalk:left:surface: Key:sidewalk:left:surface
     sidewalk:left:surface: Key:sidewalk:left:surface
+    sidewalk:right: Key:sidewalk:right
+    sidewalk:right:bicycle: Key:sidewalk:right:bicycle
     sidewalk:right:surface: Key:sidewalk:right:surface
     sidewalk:surface: Key:sidewalk:surface
     sidewalk_orientation: Key:sidewalk orientation
     sidewalk:right:surface: Key:sidewalk:right:surface
     sidewalk:surface: Key:sidewalk:surface
     sidewalk_orientation: Key:sidewalk orientation
@@ -6795,12 +8832,13 @@ en:
     sinkhole: Key:sinkhole
     siren:purpose: Key:siren:purpose
     siren:type: Key:siren:type
     sinkhole: Key:sinkhole
     siren:purpose: Key:siren:purpose
     siren:type: Key:siren:type
-    site_type: Key:site type
+    site: Key:site
     size: Key:size
     ski: Key:ski
     size: Key:size
     ski: Key:ski
-    ski_tour_difficulty: Key:ski tour difficulty
     sl_realtime: Key:sl realtime
     sl_stop_id: Key:sl stop id
     sl_realtime: Key:sl realtime
     sl_stop_id: Key:sl stop id
+    sloped_curb: Key:sloped curb
+    small_electric_vehicle: Key:small electric vehicle
     smokefree: Key:smokefree
     smoking: Key:smoking
     smoking:outside: Key:smoking:outside
     smokefree: Key:smokefree
     smoking: Key:smoking
     smoking:outside: Key:smoking:outside
@@ -6810,58 +8848,139 @@ en:
     snowplowing: Key:snowplowing
     snowplowing:category: Key:snowplowing:category
     snowplowing:operator: Key:snowplowing:operator
     snowplowing: Key:snowplowing
     snowplowing:category: Key:snowplowing:category
     snowplowing:operator: Key:snowplowing:operator
+    snowshoe: Key:snowshoe
     social_facility: Key:social facility
     social_facility:for: Key:social facility:for
     socket: Key:socket
     social_facility: Key:social facility
     social_facility:for: Key:social facility:for
     socket: Key:socket
+    socket:*: Key:socket:*
+    socket:chademo: Key:socket:chademo
     socket:schuko: Key:socket:schuko
     socket:schuko: Key:socket:schuko
+    socket:sev1011_t13: Key:socket:sev1011 t13
+    socket:sev1011_t15: Key:socket:sev1011 t15
+    socket:sev1011_t23: Key:socket:sev1011 t23
+    socket:sev1011_t25: Key:socket:sev1011 t25
     socket:type1: Key:socket:type1
     socket:type2: Key:socket:type2
     socket:type1: Key:socket:type1
     socket:type2: Key:socket:type2
+    socket:type2:output: Key:socket:type2:output
+    socket:type3: Key:socket:type3
     socket:type3c: Key:socket:type3c
     socket:typee: Key:socket:typee
     socket:type3c: Key:socket:type3c
     socket:typee: Key:socket:typee
+    soliciting: Key:soliciting
     sorting_name: Key:sorting name
     sorting_name:ar: Key:sorting name:ar
     sorting_name: Key:sorting name
     sorting_name:ar: Key:sorting name:ar
+    sorting_name:arc: Key:sorting name:arc
     sorting_name:azb: Key:sorting name:azb
     sorting_name:be: Key:sorting name:be
     sorting_name:azb: Key:sorting name:azb
     sorting_name:be: Key:sorting name:be
+    sorting_name:de: Key:sorting name:de
+    sorting_name:es: Key:sorting name:es
     sorting_name:fa: Key:sorting name:fa
     sorting_name:fa: Key:sorting name:fa
+    sorting_name:fr: Key:sorting name:fr
+    sorting_name:gr: Key:sorting name:gr
+    sorting_name:grc: Key:sorting name:grc
+    sorting_name:ks: Key:sorting name:ks
+    sorting_name:ota: Key:sorting name:ota
     sorting_name:ru: Key:sorting name:ru
     sorting_name:ru: Key:sorting name:ru
+    sorting_name:syc: Key:sorting name:syc
     sorting_name:ur: Key:sorting name:ur
     source: Key:source
     source:ProRail: Key:source:ProRail
     source:addr: Key:source:addr
     sorting_name:ur: Key:sorting name:ur
     source: Key:source
     source:ProRail: Key:source:ProRail
     source:addr: Key:source:addr
+    source:addr:date: Key:source:addr:date
+    source:addr:housenumber: Key:source:addr:housenumber
+    source:addr:housenumber:ref: Key:source:addr:housenumber:ref
     source:addr:postcode: Key:source:addr:postcode
     source:addr:postcode: Key:source:addr:postcode
+    source:addr:version: Key:source:addr:version
+    source:address: Key:source:address
+    source:alt_name: Key:source:alt name
     source:ar: Key:source:ar
     source:area: Key:source:area
     source:ar: Key:source:ar
     source:area: Key:source:area
+    source:bicycle: Key:source:bicycle
+    source:bridge: Key:source:bridge
     source:building: Key:source:building
     source:conscriptionnumber: Key:source:conscriptionnumber
     source:building: Key:source:building
     source:conscriptionnumber: Key:source:conscriptionnumber
+    source:damage: Key:source:damage
+    source:data: Key:source:data
     source:date: Key:source:date
     source:date: Key:source:date
+    source:description: Key:source:description
+    source:designation: Key:source:designation
     source:destination: Key:source:destination
     source:destination: Key:source:destination
+    source:ele: Key:source:ele
     source:en: Key:source:en
     source:en: Key:source:en
+    source:file: Key:source:file
     source:footprint: Key:source:footprint
     source:geometry: Key:source:geometry
     source:geometry:date: Key:source:geometry:date
     source:footprint: Key:source:footprint
     source:geometry: Key:source:geometry
     source:geometry:date: Key:source:geometry:date
+    source:geometry:oidn: Key:source:geometry:oidn
     source:geometry:ref: Key:source:geometry:ref
     source:geometry:ref: Key:source:geometry:ref
+    source:geometry:version: Key:source:geometry:version
+    source:height: Key:source:height
+    source:heritage: Key:source:heritage
+    source:hgv: Key:source:hgv
+    source:hgv:national_network: Key:source:hgv:national network
+    source:hgv:state_network: Key:source:hgv:state network
+    source:highway: Key:source:highway
+    source:highway_authority_ref: Key:source:highway authority ref
+    source:highway_classification: Key:source:highway classification
+    source:housenumber: Key:source:housenumber
+    source:id: Key:source:id
     source:imagery: Key:source:imagery
     source:ja: Key:source:ja
     source:imagery: Key:source:imagery
     source:ja: Key:source:ja
+    source:lake: Key:source:lake
     source:lanes: Key:source:lanes
     source:lanes: Key:source:lanes
+    source:lit: Key:source:lit
     source:loc: Key:source:loc
     source:loc: Key:source:loc
+    source:location: Key:source:location
+    source:maxaxleload: Key:source:maxaxleload
     source:maxspeed: Key:source:maxspeed
     source:maxspeed:backward: Key:source:maxspeed:backward
     source:maxspeed:forward: Key:source:maxspeed:forward
     source:name: Key:source:name
     source:name:ar: Key:source:name:ar
     source:maxspeed: Key:source:maxspeed
     source:maxspeed:backward: Key:source:maxspeed:backward
     source:maxspeed:forward: Key:source:maxspeed:forward
     source:name: Key:source:name
     source:name:ar: Key:source:name:ar
+    source:name:arc: Key:source:name:arc
+    source:name:azb: Key:source:name:azb
     source:name:br: Key:source:name:br
     source:name:date: Key:source:name:date
     source:name:br: Key:source:name:br
     source:name:date: Key:source:name:date
+    source:name:de: Key:source:name:de
+    source:name:fr: Key:source:name:fr
+    source:name:grc: Key:source:name:grc
+    source:name:oc: Key:source:name:oc
+    source:name:sr: Key:source:name:sr
+    source:name:syc: Key:source:name:syc
+    source:name:ur: Key:source:name:ur
+    source:old_name: Key:source:old name
+    source:old_ref:fap: Key:source:old ref:fap
     source:oneway: Key:source:oneway
     source:oneway: Key:source:oneway
+    source:opening_hours: Key:source:opening hours
     source:outline: Key:source:outline
     source:outline: Key:source:outline
+    source:pkey: Key:source:pkey
     source:population: Key:source:population
     source:position: Key:source:position
     source:population: Key:source:population
     source:position: Key:source:position
+    source:postal_code: Key:source:postal code
     source:postcode: Key:source:postcode
     source:postcode: Key:source:postcode
+    source:power: Key:source:power
+    source:prow_ref: Key:source:prow ref
     source:ref: Key:source:ref
     source:ref: Key:source:ref
+    source:ro: Key:source:ro
     source:shape: Key:source:shape
     source:shape: Key:source:shape
+    source:street: Key:source:street
+    source:streetnumber: Key:source:streetnumber
+    source:surface: Key:source:surface
     source:taxon: Key:source:taxon
     source:tracer: Key:source:tracer
     source:taxon: Key:source:taxon
     source:tracer: Key:source:tracer
+    source:url: Key:source:url
+    source:version: Key:source:version
+    source:wfs: Key:source:wfs
+    source:wheelchair: Key:source:wheelchair
+    source:width: Key:source:width
     source:zoomlevel: Key:source:zoomlevel
     source:zoomlevel: Key:source:zoomlevel
+    source_date: Key:source date
     source_ref: Key:source ref
     source_ref: Key:source ref
+    source_ref:maxspeed: Key:source ref:maxspeed
+    source_ref:name: Key:source ref:name
+    source_ref:url: Key:source ref:url
+    source_type_imagery: Key:source type imagery
+    spacing: Key:spacing
+    specialized_education: Key:specialized education
     species: Key:species
     species:FR: Key:species:FR
     species:ar: Key:species:ar
     species: Key:species
     species:FR: Key:species:FR
     species:ar: Key:species:ar
@@ -6872,6 +8991,7 @@ en:
     species:no: Key:species:no
     species:ru: Key:species:ru
     species:wikidata: Key:species:wikidata
     species:no: Key:species:no
     species:ru: Key:species:ru
     species:wikidata: Key:species:wikidata
+    species:wikipedia: Key:species:wikipedia
     speech_input: Key:speech input
     speech_input:lg: Key:speech input:lg
     speech_output: Key:speech output
     speech_input: Key:speech input
     speech_input:lg: Key:speech input:lg
     speech_output: Key:speech output
@@ -6882,29 +9002,35 @@ en:
     speisebezirk: Key:speisebezirk
     sport: Key:sport
     sqkm: Key:sqkm
     speisebezirk: Key:speisebezirk
     sport: Key:sport
     sqkm: Key:sqkm
+    ssvz: Key:ssvz
+    stage_door: Key:stage door
     stairs: Key:stairs
     stamps: Key:stamps
     stairs: Key:stairs
     stamps: Key:stamps
+    standing: Key:standing
     stars: Key:stars
     start_date: Key:start date
     stars: Key:stars
     start_date: Key:start date
+    start_date:edtf: Key:start date:edtf
     state: Key:state
     station: Key:station
     state: Key:state
     station: Key:station
+    statue: Key:statue
     status: Key:status
     step:contrast: Key:step:contrast
     step_count: Key:step count
     steps: Key:steps
     status: Key:status
     step:contrast: Key:step:contrast
     step_count: Key:step count
     steps: Key:steps
-    stile: Key:stile
+    stilts: Key:stilts
     stone_type: Key:stone type
     stop: Key:stop
     stone_type: Key:stone type
     stop: Key:stop
+    stop:direction: Key:stop:direction
     stop_id: Key:stop id
     storage_area: Key:storage area
     stove: Key:stove
     stranded: Key:stranded
     strapline: Key:strapline
     stream: Key:stream
     stop_id: Key:stop id
     storage_area: Key:storage area
     stove: Key:stove
     stranded: Key:stranded
     strapline: Key:strapline
     stream: Key:stream
+    street_lamp: Key:street lamp
     stroller: Key:stroller
     structure: Key:structure
     studio: Key:studio
     stroller: Key:stroller
     structure: Key:structure
     studio: Key:studio
-    sub_sea: Key:sub sea
     subject: Key:subject
     subject:wikidata: Key:subject:wikidata
     subject:wikipedia: Key:subject:wikipedia
     subject: Key:subject
     subject:wikidata: Key:subject:wikidata
     subject:wikipedia: Key:subject:wikipedia
@@ -6918,13 +9044,21 @@ en:
     support: Key:support
     support:notinsel: Key:support:notinsel
     surface: Key:surface
     support: Key:support
     support:notinsel: Key:support:notinsel
     surface: Key:surface
+    surface:colour: Key:surface:colour
     surface:grade: Key:surface:grade
     surface:grade: Key:surface:grade
+    surface:middle: Key:surface:middle
+    surface:note: Key:surface:note
+    surface_survey: Key:surface survey
     surveillance: Key:surveillance
     surveillance:type: Key:surveillance:type
     surveillance:zone: Key:surveillance:zone
     survey:date: Key:survey:date
     surveillance: Key:surveillance
     surveillance:type: Key:surveillance:type
     surveillance:zone: Key:surveillance:zone
     survey:date: Key:survey:date
+    survey_point:datum_aligned: Key:survey point:datum aligned
+    survey_point:purpose: Key:survey point:purpose
+    survey_point:structure: Key:survey point:structure
     sustrans_ref: Key:sustrans ref
     swimming: Key:swimming
     sustrans_ref: Key:sustrans ref
     swimming: Key:swimming
+    swimming_lanes: Key:swimming lanes
     swimming_pool: Key:swimming pool
     switch: Key:switch
     symbol: Key:symbol
     swimming_pool: Key:swimming pool
     switch: Key:switch
     symbol: Key:symbol
@@ -6933,6 +9067,8 @@ en:
     tactile_writing: Key:tactile writing
     tactile_writing:braille:ar: Key:tactile writing:braille:ar
     tactile_writing:braille:de: Key:tactile writing:braille:de
     tactile_writing: Key:tactile writing
     tactile_writing:braille:ar: Key:tactile writing:braille:ar
     tactile_writing:braille:de: Key:tactile writing:braille:de
+    tactile_writing:braille:es: Key:tactile writing:braille:es
+    tactile_writing:braille:fr: Key:tactile writing:braille:fr
     tactile_writing:braille:lg: Key:tactile writing:braille:lg
     tactile_writing:computer_braille:lg: Key:tactile writing:computer braille:lg
     tactile_writing:embossed_printed_letters: Key:tactile writing:embossed printed
     tactile_writing:braille:lg: Key:tactile writing:braille:lg
     tactile_writing:computer_braille:lg: Key:tactile writing:computer braille:lg
     tactile_writing:embossed_printed_letters: Key:tactile writing:embossed printed
@@ -6945,16 +9081,19 @@ en:
     tailor:bespoke_tailoring: Key:tailor:bespoke tailoring
     takeaway: Key:takeaway
     tank: Key:tank
     tailor:bespoke_tailoring: Key:tailor:bespoke tailoring
     takeaway: Key:takeaway
     tank: Key:tank
+    tank_cleaning_truck: Key:tank cleaning truck
     tank_trap: Key:tank trap
     target: Key:target
     taxi: Key:taxi
     taxon: Key:taxon
     tank_trap: Key:tank trap
     target: Key:target
     taxi: Key:taxi
     taxon: Key:taxon
+    taxon:wikidata: Key:taxon:wikidata
     technical_type: Key:technical type
     technology: Key:technology
     telecom: Key:telecom
     telecom:medium: Key:telecom:medium
     telescope:type: Key:telescope:type
     television: Key:television
     technical_type: Key:technical type
     technology: Key:technology
     telecom: Key:telecom
     telecom:medium: Key:telecom:medium
     telescope:type: Key:telescope:type
     television: Key:television
+    temperature: Key:temperature
     temporary: Key:temporary
     tenant: Key:tenant
     tents: Key:tents
     temporary: Key:temporary
     tenant: Key:tenant
     tents: Key:tents
@@ -6964,6 +9103,7 @@ en:
     teryt:simc: Key:teryt:simc
     teryt:stan_na: Key:teryt:stan na
     teryt:terc: Key:teryt:terc
     teryt:simc: Key:teryt:simc
     teryt:stan_na: Key:teryt:stan na
     teryt:terc: Key:teryt:terc
+    thatcher_name: Key:thatcher name
     theatre:genre: Key:theatre:genre
     theatre:type: Key:theatre:type
     theme: Key:theme
     theatre:genre: Key:theatre:genre
     theatre:type: Key:theatre:type
     theme: Key:theme
@@ -6972,11 +9112,14 @@ en:
     ticks: Key:ticks
     tidal: Key:tidal
     tiger: Key:tiger
     ticks: Key:ticks
     tidal: Key:tidal
     tiger: Key:tiger
+    'tiger:': 'Key:tiger:'
+    tiger:*: Key:tiger:*
     tiger:CLASSFP: Key:tiger:CLASSFP
     tiger:CPI: Key:tiger:CPI
     tiger:FUNCSTAT: Key:tiger:FUNCSTAT
     tiger:LSAD: Key:tiger:LSAD
     tiger:MTFCC: Key:tiger:MTFCC
     tiger:CLASSFP: Key:tiger:CLASSFP
     tiger:CPI: Key:tiger:CPI
     tiger:FUNCSTAT: Key:tiger:FUNCSTAT
     tiger:LSAD: Key:tiger:LSAD
     tiger:MTFCC: Key:tiger:MTFCC
+    tiger:NAME: Key:tiger:NAME
     tiger:PLACENS: Key:tiger:PLACENS
     tiger:cfcc: Key:tiger:cfcc
     tiger:county: Key:tiger:county
     tiger:PLACENS: Key:tiger:PLACENS
     tiger:cfcc: Key:tiger:cfcc
     tiger:county: Key:tiger:county
@@ -6988,23 +9131,40 @@ en:
     timezone: Key:timezone
     to: Key:to
     to:ar: Key:to:ar
     timezone: Key:timezone
     to: Key:to
     to:ar: Key:to:ar
+    to:arc: Key:to:arc
+    to:azb: Key:to:azb
+    to:be: Key:to:be
+    to:de: Key:to:de
+    to:es: Key:to:es
+    to:fr: Key:to:fr
+    to:gr: Key:to:gr
+    to:grc: Key:to:grc
+    to:kk: Key:to:kk
+    to:sr: Key:to:sr
+    to:syc: Key:to:syc
+    to:ug: Key:to:ug
+    to:ur: Key:to:ur
     tobacco: Key:tobacco
     tobacco: Key:tobacco
-    todo: Key:todo
     toilets: Key:toilets
     toilets:paper_supplied: Key:toilets:paper supplied
     toilets: Key:toilets
     toilets:paper_supplied: Key:toilets:paper supplied
+    toilets:unisex: Key:toilets:unisex
     toilets:wheelchair: Key:toilets:wheelchair
     toll: Key:toll
     toll:hgv: Key:toll:hgv
     toilets:wheelchair: Key:toilets:wheelchair
     toll: Key:toll
     toll:hgv: Key:toll:hgv
+    toll:hov: Key:toll:hov
     toll:motorcycle: Key:toll:motorcycle
     tomb: Key:tomb
     toll:motorcycle: Key:toll:motorcycle
     tomb: Key:tomb
+    topless: Key:topless
     topmark: Key:topmark
     topmark:colour: Key:topmark:colour
     touring: Key:touring
     tourism: Key:tourism
     topmark: Key:topmark
     topmark:colour: Key:topmark:colour
     touring: Key:touring
     tourism: Key:tourism
+    tourism:level:CN: Key:tourism:level:CN
     tourist_bus: Key:tourist bus
     tower:construction: Key:tower:construction
     tower:type: Key:tower:type
     townhall:type: Key:townhall:type
     tourist_bus: Key:tourist bus
     tower:construction: Key:tower:construction
     tower:type: Key:tower:type
     townhall:type: Key:townhall:type
+    towpath: Key:towpath
     tracks: Key:tracks
     tracktype: Key:tracktype
     traffic: Key:traffic
     tracks: Key:tracks
     tracktype: Key:tracktype
     traffic: Key:traffic
@@ -7016,6 +9176,7 @@ en:
     traffic_sign:forward: Key:traffic sign:forward
     traffic_signals: Key:traffic signals
     traffic_signals:arrow: Key:traffic signals:arrow
     traffic_sign:forward: Key:traffic sign:forward
     traffic_signals: Key:traffic signals
     traffic_signals:arrow: Key:traffic signals:arrow
+    traffic_signals:bicycle_early_release: Key:traffic signals:bicycle early release
     traffic_signals:countdown: Key:traffic signals:countdown
     traffic_signals:direction: Key:traffic signals:direction
     traffic_signals:floor_vibration: Key:traffic signals:floor vibration
     traffic_signals:countdown: Key:traffic signals:countdown
     traffic_signals:direction: Key:traffic signals:direction
     traffic_signals:floor_vibration: Key:traffic signals:floor vibration
@@ -7028,17 +9189,24 @@ en:
     traffic_signals:vibration: Key:traffic signals:vibration
     trail_visibility: Key:trail visibility
     trailblazed: Key:trailblazed
     traffic_signals:vibration: Key:traffic signals:vibration
     trail_visibility: Key:trail visibility
     trailblazed: Key:trailblazed
+    trailblazed:visibility: Key:trailblazed:visibility
     trailer: Key:trailer
     trailer:rental: Key:trailer:rental
     train: Key:train
     trailer: Key:trailer
     trailer:rental: Key:trailer:rental
     train: Key:train
+    training: Key:training
     tram: Key:tram
     transformer: Key:transformer
     transformer:devices: Key:transformer:devices
     tram: Key:tram
     transformer: Key:transformer
     transformer:devices: Key:transformer:devices
+    tree:ref: Key:tree:ref
     tree_lined: Key:tree lined
     trees: Key:trees
     trench: Key:trench
     tree_lined: Key:tree lined
     trees: Key:trees
     trench: Key:trench
+    trolley:deposit: Key:trolley:deposit
     trolley_wire: Key:trolley wire
     trolleybus: Key:trolleybus
     trolley_wire: Key:trolley wire
     trolleybus: Key:trolleybus
+    trolleybus_class:length: Key:trolleybus class:length
+    truck:parts: Key:truck:parts
+    truck:sales: Key:truck:sales
     truck_wash: Key:truck wash
     ts_calle: Key:ts calle
     ts_codigo: Key:ts codigo
     truck_wash: Key:truck wash
     ts_calle: Key:ts calle
     ts_codigo: Key:ts codigo
@@ -7050,6 +9218,12 @@ en:
     tunnel: Key:tunnel
     tunnel:name: Key:tunnel:name
     tunnel:name:ar: Key:tunnel:name:ar
     tunnel: Key:tunnel
     tunnel:name: Key:tunnel:name
     tunnel:name:ar: Key:tunnel:name:ar
+    tunnel:name:arc: Key:tunnel:name:arc
+    tunnel:name:de: Key:tunnel:name:de
+    tunnel:name:fr: Key:tunnel:name:fr
+    tunnel:name:grc: Key:tunnel:name:grc
+    tunnel:name:sr: Key:tunnel:name:sr
+    tunnel:name:syc: Key:tunnel:name:syc
     turn: Key:turn
     turn:backward: Key:turn:backward
     turn:bicycle:lanes: Key:turn:bicycle:lanes
     turn: Key:turn
     turn:backward: Key:turn:backward
     turn:bicycle:lanes: Key:turn:bicycle:lanes
@@ -7071,11 +9245,15 @@ en:
     uir_adr:ADRESA_KOD: Key:uir adr:ADRESA KOD
     unisex: Key:unisex
     unit: Key:unit
     uir_adr:ADRESA_KOD: Key:uir adr:ADRESA KOD
     unisex: Key:unisex
     unit: Key:unit
-    unnamed: Key:unnamed
     unsigned: Key:unsigned
     unsigned_ref: Key:unsigned ref
     unsigned: Key:unsigned
     unsigned_ref: Key:unsigned ref
+    urban: Key:urban
     url: Key:url
     url: Key:url
+    url:bathing_water: Key:url:bathing water
+    url:imher: Key:url:imher
+    url:registered_building: Key:url:registered building
     url:restrictions: Key:url:restrictions
     url:restrictions: Key:url:restrictions
+    us:ny:swis: Key:us:ny:swis
     usage: Key:usage
     user_defined_other: Key:user defined other
     utahagrc:parcelid: Key:utahagrc:parcelid
     usage: Key:usage
     user_defined_other: Key:user defined other
     utahagrc:parcelid: Key:utahagrc:parcelid
@@ -7083,15 +9261,17 @@ en:
     vaccination: Key:vaccination
     vacuum_cleaner: Key:vacuum cleaner
     validate:ants:yellow: Key:validate:ants:yellow
     vaccination: Key:vaccination
     vacuum_cleaner: Key:vacuum cleaner
     validate:ants:yellow: Key:validate:ants:yellow
-    validate:no_name: Key:validate:no name
-    validate:no_ref: Key:validate:no ref
+    valley: Key:valley
     valve: Key:valve
     vegan: Key:vegan
     vegetarian: Key:vegetarian
     vehicle: Key:vehicle
     vehicle:conditional: Key:vehicle:conditional
     valve: Key:valve
     vegan: Key:vegan
     vegetarian: Key:vegetarian
     vehicle: Key:vehicle
     vehicle:conditional: Key:vehicle:conditional
+    vehicle:wikidata: Key:vehicle:wikidata
+    vehicle:wikipedia: Key:vehicle:wikipedia
     vending: Key:vending
     verge: Key:verge
     vending: Key:vending
     verge: Key:verge
+    vessel: Key:vessel
     vhf: Key:vhf
     via: Key:via
     via_ferrata_scale: Key:via ferrata scale
     vhf: Key:vhf
     via: Key:via
     via_ferrata_scale: Key:via ferrata scale
@@ -7103,23 +9283,36 @@ en:
     voltage: Key:voltage
     voltage:primary: Key:voltage:primary
     voltage:secondary: Key:voltage:secondary
     voltage: Key:voltage
     voltage:primary: Key:voltage:primary
     voltage:secondary: Key:voltage:secondary
+    voltage:tertiary: Key:voltage:tertiary
     walk-in: Key:walk-in
     walk-in: Key:walk-in
+    walkup_window: Key:walkup window
+    wall: Key:wall
     wall:material: Key:wall:material
     wall:material: Key:wall:material
+    ward: Key:ward
+    warehouse: Key:warehouse
+    'was:': 'Key:was:'
+    was:*: Key:was:*
+    was:amenity: Key:was:amenity
     washing_machine: Key:washing machine
     waste: Key:waste
     waste_basket: Key:waste basket
     water: Key:water
     water_characteristic: Key:water characteristic
     water_point: Key:water point
     washing_machine: Key:washing machine
     waste: Key:waste
     waste_basket: Key:waste basket
     water: Key:water
     water_characteristic: Key:water characteristic
     water_point: Key:water point
+    water_slide: Key:water slide
     water_source: Key:water source
     water_system: Key:water system
     water_source: Key:water source
     water_system: Key:water system
+    water_well: Key:water well
     waterway: Key:waterway
     weather_protection: Key:weather protection
     website: Key:website
     waterway: Key:waterway
     weather_protection: Key:weather protection
     website: Key:website
+    'website:': 'Key:website:'
+    website:*: Key:website:*
     website:booking: Key:website:booking
     website:map: Key:website:map
     website:menu: Key:website:menu
     website:orders: Key:website:orders
     website:booking: Key:website:booking
     website:map: Key:website:map
     website:menu: Key:website:menu
     website:orders: Key:website:orders
+    website:regulation: Key:website:regulation
     website:stock: Key:website:stock
     wetland: Key:wetland
     wheelchair: Key:wheelchair
     website:stock: Key:website:stock
     wetland: Key:wetland
     wheelchair: Key:wheelchair
@@ -7128,20 +9321,24 @@ en:
     wholesale: Key:wholesale
     width: Key:width
     width:carriageway: Key:width:carriageway
     wholesale: Key:wholesale
     width: Key:width
     width:carriageway: Key:width:carriageway
+    width:effective: Key:width:effective
     wifi: Key:wifi
     wiki:symbol: Key:wiki:symbol
     wikidata: Key:wikidata
     wikimedia_commons: Key:wikimedia commons
     wikipedia: Key:wikipedia
     wikipedia:ar: Key:wikipedia:ar
     wifi: Key:wifi
     wiki:symbol: Key:wiki:symbol
     wikidata: Key:wikidata
     wikimedia_commons: Key:wikimedia commons
     wikipedia: Key:wikipedia
     wikipedia:ar: Key:wikipedia:ar
+    wikipedia:arc: Key:wikipedia:arc
     wikipedia:azb: Key:wikipedia:azb
     wikipedia:be: Key:wikipedia:be
     wikipedia:ckb: Key:wikipedia:ckb
     wikipedia:de: Key:wikipedia:de
     wikipedia:en: Key:wikipedia:en
     wikipedia:azb: Key:wikipedia:azb
     wikipedia:be: Key:wikipedia:be
     wikipedia:ckb: Key:wikipedia:ckb
     wikipedia:de: Key:wikipedia:de
     wikipedia:en: Key:wikipedia:en
+    wikipedia:es: Key:wikipedia:es
     wikipedia:fa: Key:wikipedia:fa
     wikipedia:fr: Key:wikipedia:fr
     wikipedia:glk: Key:wikipedia:glk
     wikipedia:fa: Key:wikipedia:fa
     wikipedia:fr: Key:wikipedia:fr
     wikipedia:glk: Key:wikipedia:glk
+    wikipedia:grc: Key:wikipedia:grc
     wikipedia:ks: Key:wikipedia:ks
     wikipedia:lrc: Key:wikipedia:lrc
     wikipedia:mzn: Key:wikipedia:mzn
     wikipedia:ks: Key:wikipedia:ks
     wikipedia:lrc: Key:wikipedia:lrc
     wikipedia:mzn: Key:wikipedia:mzn
@@ -7152,21 +9349,21 @@ en:
     wikipedia:ug: Key:wikipedia:ug
     wikipedia:ur: Key:wikipedia:ur
     windings: Key:windings
     wikipedia:ug: Key:wikipedia:ug
     wikipedia:ur: Key:wikipedia:ur
     windings: Key:windings
+    windings:auto: Key:windings:auto
     windings:configuration: Key:windings:configuration
     windings:primary: Key:windings:primary
     windings:secondary: Key:windings:secondary
     windings:tertiary: Key:windings:tertiary
     windmill:type: Key:windmill:type
     windmill:vanes: Key:windmill:vanes
     windings:configuration: Key:windings:configuration
     windings:primary: Key:windings:primary
     windings:secondary: Key:windings:secondary
     windings:tertiary: Key:windings:tertiary
     windmill:type: Key:windmill:type
     windmill:vanes: Key:windmill:vanes
-    wine:grape: Key:wine:grape
+    window: Key:window
+    windows: Key:windows
     wine:region: Key:wine:region
     wine:region: Key:wine:region
-    wine:type: Key:wine:type
-    wine:vineyard: Key:wine:vineyard
-    winery: Key:winery
     winter_road: Key:winter road
     winter_room: Key:winter room
     winter_service: Key:winter service
     winter_service:gritting: Key:winter service:gritting
     winter_road: Key:winter road
     winter_room: Key:winter room
     winter_service: Key:winter service
     winter_service:gritting: Key:winter service:gritting
+    winter_service:heating: Key:winter service:heating
     winter_service:priority: Key:winter service:priority
     winter_service:salting: Key:winter service:salting
     wires: Key:wires
     winter_service:priority: Key:winter service:priority
     winter_service:salting: Key:winter service:salting
     wires: Key:wires
@@ -7174,11 +9371,12 @@ en:
     wood: Key:wood
     wood_available: Key:wood available
     wood_provided: Key:wood provided
     wood: Key:wood
     wood_available: Key:wood available
     wood_provided: Key:wood provided
-    woody_species_100m: Key:woody species 100m
+    working: Key:working
     workrules: Key:workrules
     works: Key:works
     workshop: Key:workshop
     worship: Key:worship
     workrules: Key:workrules
     works: Key:works
     workshop: Key:workshop
     worship: Key:worship
+    wreck:type: Key:wreck:type
     www.prezzibenzina.it: Key:www.prezzibenzina.it
     xmas:feature: Key:xmas:feature
     xmpp: Key:xmpp
     www.prezzibenzina.it: Key:www.prezzibenzina.it
     xmas:feature: Key:xmas:feature
     xmpp: Key:xmpp
@@ -7201,13 +9399,22 @@ en:
     FIXME=Position_estimated: Tag:FIXME=Position estimated
     abandoned:amenity=prison: Tag:abandoned:amenity=prison
     abandoned:amenity=prison_camp: Tag:abandoned:amenity=prison camp
     FIXME=Position_estimated: Tag:FIXME=Position estimated
     abandoned:amenity=prison: Tag:abandoned:amenity=prison
     abandoned:amenity=prison_camp: Tag:abandoned:amenity=prison camp
+    abandoned:landuse=landfill: Tag:abandoned:landuse=landfill
+    abandoned:landuse=quarry: Tag:abandoned:landuse=quarry
+    abandoned:railway=rail: Tag:abandoned:railway=rail
+    abandoned:railway=station: Tag:abandoned:railway=station
     abandoned=yes: Tag:abandoned=yes
     abandoned=yes: Tag:abandoned=yes
+    abutters=retail: Tag:abutters=retail
     access=agricultural: Tag:access=agricultural
     access=agricultural: Tag:access=agricultural
+    access=bdouble: Tag:access=bdouble
     access=customers: Tag:access=customers
     access=delivery: Tag:access=delivery
     access=designated: Tag:access=designated
     access=customers: Tag:access=customers
     access=delivery: Tag:access=delivery
     access=designated: Tag:access=designated
+    access=destination: Tag:access=destination
+    access=employees: Tag:access=employees
     access=exclusion_zone: Tag:access=exclusion zone
     access=forestry: Tag:access=forestry
     access=exclusion_zone: Tag:access=exclusion zone
     access=forestry: Tag:access=forestry
+    access=licence: Tag:access=licence
     access=license: Tag:access=license
     access=no: Tag:access=no
     access=official: Tag:access=official
     access=license: Tag:access=license
     access=no: Tag:access=no
     access=official: Tag:access=official
@@ -7215,12 +9422,17 @@ en:
     access=permit: Tag:access=permit
     access=private: Tag:access=private
     access=public: Tag:access=public
     access=permit: Tag:access=permit
     access=private: Tag:access=private
     access=public: Tag:access=public
+    access=residents: Tag:access=residents
     access=restricted: Tag:access=restricted
     access=restricted: Tag:access=restricted
+    access=students: Tag:access=students
+    access=unknown: Tag:access=unknown
     access=use_sidepath: Tag:access=use sidepath
     actuator=electric_motor: Tag:actuator=electric motor
     actuator=hydraulic_cylinder: Tag:actuator=hydraulic cylinder
     actuator=manual: Tag:actuator=manual
     actuator=pneumatic_cylinder: Tag:actuator=pneumatic cylinder
     access=use_sidepath: Tag:access=use sidepath
     actuator=electric_motor: Tag:actuator=electric motor
     actuator=hydraulic_cylinder: Tag:actuator=hydraulic cylinder
     actuator=manual: Tag:actuator=manual
     actuator=pneumatic_cylinder: Tag:actuator=pneumatic cylinder
+    addr:TW:dataset=137998: Tag:addr:TW:dataset=137998
+    addr:type=water: Tag:addr:type=water
     admin_level=1: Tag:admin level=1
     admin_level=10: Tag:admin level=10
     admin_level=11: Tag:admin level=11
     admin_level=1: Tag:admin level=1
     admin_level=10: Tag:admin level=10
     admin_level=11: Tag:admin level=11
@@ -7236,6 +9448,7 @@ en:
     advertising=board: Tag:advertising=board
     advertising=column: Tag:advertising=column
     advertising=flag: Tag:advertising=flag
     advertising=board: Tag:advertising=board
     advertising=column: Tag:advertising=column
     advertising=flag: Tag:advertising=flag
+    advertising=funding_sign: Tag:advertising=funding sign
     advertising=poster_box: Tag:advertising=poster box
     advertising=screen: Tag:advertising=screen
     advertising=sculpture: Tag:advertising=sculpture
     advertising=poster_box: Tag:advertising=poster box
     advertising=screen: Tag:advertising=screen
     advertising=sculpture: Tag:advertising=sculpture
@@ -7258,6 +9471,7 @@ en:
     aerialway=platter: Tag:aerialway=platter
     aerialway=pylon: Tag:aerialway=pylon
     aerialway=rope_tow: Tag:aerialway=rope tow
     aerialway=platter: Tag:aerialway=platter
     aerialway=pylon: Tag:aerialway=pylon
     aerialway=rope_tow: Tag:aerialway=rope tow
+    aerialway=ropetow: Tag:aerialway=ropetow
     aerialway=station: Tag:aerialway=station
     aerialway=t-bar: Tag:aerialway=t-bar
     aerialway=zip_line: Tag:aerialway=zip line
     aerialway=station: Tag:aerialway=station
     aerialway=t-bar: Tag:aerialway=t-bar
     aerialway=zip_line: Tag:aerialway=zip line
@@ -7267,11 +9481,20 @@ en:
     aerodrome:type=military: Tag:aerodrome:type=military
     aerodrome:type=private: Tag:aerodrome:type=private
     aerodrome:type=regional: Tag:aerodrome:type=regional
     aerodrome:type=military: Tag:aerodrome:type=military
     aerodrome:type=private: Tag:aerodrome:type=private
     aerodrome:type=regional: Tag:aerodrome:type=regional
+    aerospace:product=robot: Tag:aerospace:product=robot
+    aerospace:product=rocket: Tag:aerospace:product=rocket
+    aerospace:product=satellite: Tag:aerospace:product=satellite
+    aerospace:product=spacecraft: Tag:aerospace:product=spacecraft
+    aerospace:product=spacecraft_propulsion: Tag:aerospace:product=spacecraft propulsion
     aeroway=aerodrome: Tag:aeroway=aerodrome
     aeroway=aerodrome: Tag:aeroway=aerodrome
+    aeroway=aircraft_crossing: Tag:aeroway=aircraft crossing
     aeroway=airport: Tag:aeroway=airport
     aeroway=airstrip: Tag:aeroway=airstrip
     aeroway=airport: Tag:aeroway=airport
     aeroway=airstrip: Tag:aeroway=airstrip
+    aeroway=airtanker_base: Tag:aeroway=airtanker base
     aeroway=apron: Tag:aeroway=apron
     aeroway=arresting_gear: Tag:aeroway=arresting gear
     aeroway=apron: Tag:aeroway=apron
     aeroway=arresting_gear: Tag:aeroway=arresting gear
+    aeroway=displaced_threshold: Tag:aeroway=displaced threshold
+    aeroway=flame_trench: Tag:aeroway=flame trench
     aeroway=fuel: Tag:aeroway=fuel
     aeroway=gate: Tag:aeroway=gate
     aeroway=hangar: Tag:aeroway=hangar
     aeroway=fuel: Tag:aeroway=fuel
     aeroway=gate: Tag:aeroway=gate
     aeroway=hangar: Tag:aeroway=hangar
@@ -7279,16 +9502,25 @@ en:
     aeroway=heliport: Tag:aeroway=heliport
     aeroway=highway_strip: Tag:aeroway=highway strip
     aeroway=holding_position: Tag:aeroway=holding position
     aeroway=heliport: Tag:aeroway=heliport
     aeroway=highway_strip: Tag:aeroway=highway strip
     aeroway=holding_position: Tag:aeroway=holding position
+    aeroway=holding_position_line: Tag:aeroway=holding position line
+    aeroway=jet_bridge: Tag:aeroway=jet bridge
     aeroway=landingpad: Tag:aeroway=landingpad
     aeroway=landingpad: Tag:aeroway=landingpad
+    aeroway=launch_complex: Tag:aeroway=launch complex
     aeroway=launchpad: Tag:aeroway=launchpad
     aeroway=navigationaid: Tag:aeroway=navigationaid
     aeroway=launchpad: Tag:aeroway=launchpad
     aeroway=navigationaid: Tag:aeroway=navigationaid
+    aeroway=papi: Tag:aeroway=papi
     aeroway=parking_position: Tag:aeroway=parking position
     aeroway=runway: Tag:aeroway=runway
     aeroway=spaceport: Tag:aeroway=spaceport
     aeroway=parking_position: Tag:aeroway=parking position
     aeroway=runway: Tag:aeroway=runway
     aeroway=spaceport: Tag:aeroway=spaceport
+    aeroway=stopway: Tag:aeroway=stopway
     aeroway=taxilane: Tag:aeroway=taxilane
     aeroway=taxiway: Tag:aeroway=taxiway
     aeroway=terminal: Tag:aeroway=terminal
     aeroway=taxilane: Tag:aeroway=taxilane
     aeroway=taxiway: Tag:aeroway=taxiway
     aeroway=terminal: Tag:aeroway=terminal
+    aeroway=threshold: Tag:aeroway=threshold
+    aeroway=tower: Tag:aeroway=tower
     aeroway=windsock: Tag:aeroway=windsock
     aeroway=windsock: Tag:aeroway=windsock
+    air_rescue_service=aeromedical: Tag:air rescue service=aeromedical
+    air_rescue_service=search_and_rescue: Tag:air rescue service=search and rescue
     airmark=beacon: Tag:airmark=beacon
     ale_supply=limited: Tag:ale supply=limited
     allotments=plot: Tag:allotments=plot
     airmark=beacon: Tag:airmark=beacon
     ale_supply=limited: Tag:ale supply=limited
     allotments=plot: Tag:allotments=plot
@@ -7299,9 +9531,10 @@ en:
     amenity=ambulance_station: Tag:amenity=ambulance station
     amenity=animal_boarding: Tag:amenity=animal boarding
     amenity=animal_breeding: Tag:amenity=animal breeding
     amenity=ambulance_station: Tag:amenity=ambulance station
     amenity=animal_boarding: Tag:amenity=animal boarding
     amenity=animal_breeding: Tag:amenity=animal breeding
+    amenity=animal_effluent_disposal: Tag:amenity=animal effluent disposal
+    amenity=animal_hitch: Tag:amenity=animal hitch
     amenity=animal_shelter: Tag:amenity=animal shelter
     amenity=animal_training: Tag:amenity=animal training
     amenity=animal_shelter: Tag:amenity=animal shelter
     amenity=animal_training: Tag:amenity=animal training
-    amenity=architect_office: Tag:amenity=architect office
     amenity=archive: Tag:amenity=archive
     amenity=arts_centre: Tag:amenity=arts centre
     amenity=artwork: Tag:amenity=artwork
     amenity=archive: Tag:amenity=archive
     amenity=arts_centre: Tag:amenity=arts centre
     amenity=artwork: Tag:amenity=artwork
@@ -7312,15 +9545,16 @@ en:
     amenity=bank: Tag:amenity=bank
     amenity=bar: Tag:amenity=bar
     amenity=bbq: Tag:amenity=bbq
     amenity=bank: Tag:amenity=bank
     amenity=bar: Tag:amenity=bar
     amenity=bbq: Tag:amenity=bbq
+    amenity=bear_box: Tag:amenity=bear box
     amenity=bench: Tag:amenity=bench
     amenity=bicycle_library: Tag:amenity=bicycle library
     amenity=bicycle_parking: Tag:amenity=bicycle parking
     amenity=bicycle_rental: Tag:amenity=bicycle rental
     amenity=bicycle_repair_station: Tag:amenity=bicycle repair station
     amenity=bicycle_trailer_sharing: Tag:amenity=bicycle trailer sharing
     amenity=bench: Tag:amenity=bench
     amenity=bicycle_library: Tag:amenity=bicycle library
     amenity=bicycle_parking: Tag:amenity=bicycle parking
     amenity=bicycle_rental: Tag:amenity=bicycle rental
     amenity=bicycle_repair_station: Tag:amenity=bicycle repair station
     amenity=bicycle_trailer_sharing: Tag:amenity=bicycle trailer sharing
+    amenity=bicycle_wash: Tag:amenity=bicycle wash
     amenity=biergarten: Tag:amenity=biergarten
     amenity=bike_parking: Tag:amenity=bike parking
     amenity=biergarten: Tag:amenity=biergarten
     amenity=bike_parking: Tag:amenity=bike parking
-    amenity=bikeshed: Tag:amenity=bikeshed
     amenity=binoculars: Tag:amenity=binoculars
     amenity=bird_bath: Tag:amenity=bird bath
     amenity=blood_bank: Tag:amenity=blood bank
     amenity=binoculars: Tag:amenity=binoculars
     amenity=bird_bath: Tag:amenity=bird bath
     amenity=blood_bank: Tag:amenity=blood bank
@@ -7329,6 +9563,7 @@ en:
     amenity=boat_storage: Tag:amenity=boat storage
     amenity=brothel: Tag:amenity=brothel
     amenity=bts: Tag:amenity=bts
     amenity=boat_storage: Tag:amenity=boat storage
     amenity=brothel: Tag:amenity=brothel
     amenity=bts: Tag:amenity=bts
+    amenity=buggy_parking: Tag:amenity=buggy parking
     amenity=bureau_de_change: Tag:amenity=bureau de change
     amenity=bus_station: Tag:amenity=bus station
     amenity=bus_stop: Tag:amenity=bus stop
     amenity=bureau_de_change: Tag:amenity=bureau de change
     amenity=bus_station: Tag:amenity=bus station
     amenity=bus_stop: Tag:amenity=bus stop
@@ -7342,7 +9577,10 @@ en:
     amenity=carpet_washing: Tag:amenity=carpet washing
     amenity=carwash: Tag:amenity=carwash
     amenity=casino: Tag:amenity=casino
     amenity=carpet_washing: Tag:amenity=carpet washing
     amenity=carwash: Tag:amenity=carwash
     amenity=casino: Tag:amenity=casino
+    amenity=chair: Tag:amenity=chair
+    amenity=changing_room: Tag:amenity=changing room
     amenity=charging_station: Tag:amenity=charging station
     amenity=charging_station: Tag:amenity=charging station
+    amenity=checkpoint: Tag:amenity=checkpoint
     amenity=childcare: Tag:amenity=childcare
     amenity=cinema: Tag:amenity=cinema
     amenity=citymap_post: Tag:amenity=citymap post
     amenity=childcare: Tag:amenity=childcare
     amenity=cinema: Tag:amenity=cinema
     amenity=citymap_post: Tag:amenity=citymap post
@@ -7351,16 +9589,17 @@ en:
     amenity=clock: Tag:amenity=clock
     amenity=clothes_dryer: Tag:amenity=clothes dryer
     amenity=club: Tag:amenity=club
     amenity=clock: Tag:amenity=clock
     amenity=clothes_dryer: Tag:amenity=clothes dryer
     amenity=club: Tag:amenity=club
+    amenity=clubhouse: Tag:amenity=clubhouse
     amenity=coast_guard: Tag:amenity=coast guard
     amenity=coast_radar_station: Tag:amenity=coast radar station
     amenity=college: Tag:amenity=college
     amenity=coast_guard: Tag:amenity=coast guard
     amenity=coast_radar_station: Tag:amenity=coast radar station
     amenity=college: Tag:amenity=college
-    amenity=community_center: Tag:amenity=community center
     amenity=community_centre: Tag:amenity=community centre
     amenity=compressed_air: Tag:amenity=compressed air
     amenity=concert_hall: Tag:amenity=concert hall
     amenity=concession_stand: Tag:amenity=concession stand
     amenity=conference_centre: Tag:amenity=conference centre
     amenity=consulate: Tag:amenity=consulate
     amenity=community_centre: Tag:amenity=community centre
     amenity=compressed_air: Tag:amenity=compressed air
     amenity=concert_hall: Tag:amenity=concert hall
     amenity=concession_stand: Tag:amenity=concession stand
     amenity=conference_centre: Tag:amenity=conference centre
     amenity=consulate: Tag:amenity=consulate
+    amenity=convention_centre: Tag:amenity=convention centre
     amenity=courthouse: Tag:amenity=courthouse
     amenity=coworking_space: Tag:amenity=coworking space
     amenity=crematorium: Tag:amenity=crematorium
     amenity=courthouse: Tag:amenity=courthouse
     amenity=coworking_space: Tag:amenity=coworking space
     amenity=crematorium: Tag:amenity=crematorium
@@ -7377,9 +9616,11 @@ en:
     amenity=doctor: Tag:amenity=doctor
     amenity=doctors: Tag:amenity=doctors
     amenity=dog_bin: Tag:amenity=dog bin
     amenity=doctor: Tag:amenity=doctor
     amenity=doctors: Tag:amenity=doctors
     amenity=dog_bin: Tag:amenity=dog bin
+    amenity=dog_parking: Tag:amenity=dog parking
     amenity=dog_toilet: Tag:amenity=dog toilet
     amenity=dog_waste_bin: Tag:amenity=dog waste bin
     amenity=dojo: Tag:amenity=dojo
     amenity=dog_toilet: Tag:amenity=dog toilet
     amenity=dog_waste_bin: Tag:amenity=dog waste bin
     amenity=dojo: Tag:amenity=dojo
+    amenity=dormitory: Tag:amenity=dormitory
     amenity=dressing_room: Tag:amenity=dressing room
     amenity=drinking_water: Tag:amenity=drinking water
     amenity=driver_training: Tag:amenity=driver training
     amenity=dressing_room: Tag:amenity=dressing room
     amenity=drinking_water: Tag:amenity=drinking water
     amenity=driver_training: Tag:amenity=driver training
@@ -7389,7 +9630,9 @@ en:
     amenity=education: Tag:amenity=education
     amenity=embassy: Tag:amenity=embassy
     amenity=emergency_phone: Tag:amenity=emergency phone
     amenity=education: Tag:amenity=education
     amenity=embassy: Tag:amenity=embassy
     amenity=emergency_phone: Tag:amenity=emergency phone
+    amenity=emergency_service: Tag:amenity=emergency service
     amenity=ev_charging: Tag:amenity=ev charging
     amenity=ev_charging: Tag:amenity=ev charging
+    amenity=events_centre: Tag:amenity=events centre
     amenity=events_venue: Tag:amenity=events venue
     amenity=exercise_point: Tag:amenity=exercise point
     amenity=exhibition_centre: Tag:amenity=exhibition centre
     amenity=events_venue: Tag:amenity=events venue
     amenity=exercise_point: Tag:amenity=exercise point
     amenity=exhibition_centre: Tag:amenity=exhibition centre
@@ -7400,12 +9643,15 @@ en:
     amenity=financial_advice: Tag:amenity=financial advice
     amenity=fire_hydrant: Tag:amenity=fire hydrant
     amenity=fire_station: Tag:amenity=fire station
     amenity=financial_advice: Tag:amenity=financial advice
     amenity=fire_hydrant: Tag:amenity=fire hydrant
     amenity=fire_station: Tag:amenity=fire station
-    amenity=first_aid: Tag:amenity=first aid
-    amenity=firstaid: Tag:amenity=firstaid
+    amenity=first_aid_school: Tag:amenity=first aid school
+    amenity=fish_cleaning: Tag:amenity=fish cleaning
     amenity=fish_spa: Tag:amenity=fish spa
     amenity=fitness_station: Tag:amenity=fitness station
     amenity=food_court: Tag:amenity=food court
     amenity=fish_spa: Tag:amenity=fish spa
     amenity=fitness_station: Tag:amenity=fitness station
     amenity=food_court: Tag:amenity=food court
+    amenity=food_sharing: Tag:amenity=food sharing
+    amenity=foot_shower: Tag:amenity=foot shower
     amenity=fountain: Tag:amenity=fountain
     amenity=fountain: Tag:amenity=fountain
+    amenity=freeshop: Tag:amenity=freeshop
     amenity=fridge: Tag:amenity=fridge
     amenity=fuel: Tag:amenity=fuel
     amenity=funeral_hall: Tag:amenity=funeral hall
     amenity=fridge: Tag:amenity=fridge
     amenity=fuel: Tag:amenity=fuel
     amenity=funeral_hall: Tag:amenity=funeral hall
@@ -7421,6 +9667,7 @@ en:
     amenity=health_post: Tag:amenity=health post
     amenity=hitching_post: Tag:amenity=hitching post
     amenity=hookah_lounge: Tag:amenity=hookah lounge
     amenity=health_post: Tag:amenity=health post
     amenity=hitching_post: Tag:amenity=hitching post
     amenity=hookah_lounge: Tag:amenity=hookah lounge
+    amenity=horse_parking: Tag:amenity=horse parking
     amenity=hospice: Tag:amenity=hospice
     amenity=hospital: Tag:amenity=hospital
     amenity=hotel: Tag:amenity=hotel
     amenity=hospice: Tag:amenity=hospice
     amenity=hospital: Tag:amenity=hospital
     amenity=hotel: Tag:amenity=hotel
@@ -7431,40 +9678,52 @@ en:
     amenity=jobcentre: Tag:amenity=jobcentre
     amenity=juice_bar: Tag:amenity=juice bar
     amenity=karaoke_box: Tag:amenity=karaoke box
     amenity=jobcentre: Tag:amenity=jobcentre
     amenity=juice_bar: Tag:amenity=juice bar
     amenity=karaoke_box: Tag:amenity=karaoke box
+    amenity=kick-scooter_parking: Tag:amenity=kick-scooter parking
+    amenity=kick-scooter_rental: Tag:amenity=kick-scooter rental
     amenity=kindergarten: Tag:amenity=kindergarten
     amenity=kiosk: Tag:amenity=kiosk
     amenity=kitchen: Tag:amenity=kitchen
     amenity=kneipp_water_cure: Tag:amenity=kneipp water cure
     amenity=language_school: Tag:amenity=language school
     amenity=lavoir: Tag:amenity=lavoir
     amenity=kindergarten: Tag:amenity=kindergarten
     amenity=kiosk: Tag:amenity=kiosk
     amenity=kitchen: Tag:amenity=kitchen
     amenity=kneipp_water_cure: Tag:amenity=kneipp water cure
     amenity=language_school: Tag:amenity=language school
     amenity=lavoir: Tag:amenity=lavoir
+    amenity=left_luggage: Tag:amenity=left luggage
     amenity=letter_box: Tag:amenity=letter box
     amenity=library: Tag:amenity=library
     amenity=letter_box: Tag:amenity=letter box
     amenity=library: Tag:amenity=library
+    amenity=library_dropoff: Tag:amenity=library dropoff
     amenity=life_ring: Tag:amenity=life ring
     amenity=lifeboat_station: Tag:amenity=lifeboat station
     amenity=loading_dock: Tag:amenity=loading dock
     amenity=life_ring: Tag:amenity=life ring
     amenity=lifeboat_station: Tag:amenity=lifeboat station
     amenity=loading_dock: Tag:amenity=loading dock
+    amenity=locker: Tag:amenity=locker
     amenity=lost_property_office: Tag:amenity=lost property office
     amenity=lounger: Tag:amenity=lounger
     amenity=love_hotel: Tag:amenity=love hotel
     amenity=lost_property_office: Tag:amenity=lost property office
     amenity=lounger: Tag:amenity=lounger
     amenity=love_hotel: Tag:amenity=love hotel
+    amenity=luggage_locker: Tag:amenity=luggage locker
+    amenity=mailroom: Tag:amenity=mailroom
     amenity=marae: Tag:amenity=marae
     amenity=marketplace: Tag:amenity=marketplace
     amenity=marae: Tag:amenity=marae
     amenity=marketplace: Tag:amenity=marketplace
+    amenity=meditation_centre: Tag:amenity=meditation centre
     amenity=microwave: Tag:amenity=microwave
     amenity=milk_dispenser: Tag:amenity=milk dispenser
     amenity=mist_spraying_cooler: Tag:amenity=mist spraying cooler
     amenity=mobile_library: Tag:amenity=mobile library
     amenity=mobile_money_agent: Tag:amenity=mobile money agent
     amenity=microwave: Tag:amenity=microwave
     amenity=milk_dispenser: Tag:amenity=milk dispenser
     amenity=mist_spraying_cooler: Tag:amenity=mist spraying cooler
     amenity=mobile_library: Tag:amenity=mobile library
     amenity=mobile_money_agent: Tag:amenity=mobile money agent
+    amenity=mobility_scooter_rental: Tag:amenity=mobility scooter rental
     amenity=monastery: Tag:amenity=monastery
     amenity=money_transfer: Tag:amenity=money transfer
     amenity=mortuary: Tag:amenity=mortuary
     amenity=motorcycle_parking: Tag:amenity=motorcycle parking
     amenity=motorcycle_rental: Tag:amenity=motorcycle rental
     amenity=motorcycle_taxi: Tag:amenity=motorcycle taxi
     amenity=monastery: Tag:amenity=monastery
     amenity=money_transfer: Tag:amenity=money transfer
     amenity=mortuary: Tag:amenity=mortuary
     amenity=motorcycle_parking: Tag:amenity=motorcycle parking
     amenity=motorcycle_rental: Tag:amenity=motorcycle rental
     amenity=motorcycle_taxi: Tag:amenity=motorcycle taxi
+    amenity=mtb_school: Tag:amenity=mtb school
     amenity=music_school: Tag:amenity=music school
     amenity=music_venue: Tag:amenity=music venue
     amenity=nightclub: Tag:amenity=nightclub
     amenity=nursery: Tag:amenity=nursery
     amenity=nursing_home: Tag:amenity=nursing home
     amenity=office: Tag:amenity=office
     amenity=music_school: Tag:amenity=music school
     amenity=music_venue: Tag:amenity=music venue
     amenity=nightclub: Tag:amenity=nightclub
     amenity=nursery: Tag:amenity=nursery
     amenity=nursing_home: Tag:amenity=nursing home
     amenity=office: Tag:amenity=office
+    amenity=osmica: Tag:amenity=osmica
     amenity=outfitter: Tag:amenity=outfitter
     amenity=outfitter: Tag:amenity=outfitter
+    amenity=parcel_locker: Tag:amenity=parcel locker
     amenity=park: Tag:amenity=park
     amenity=parking: Tag:amenity=parking
     amenity=parking_entrance: Tag:amenity=parking entrance
     amenity=park: Tag:amenity=park
     amenity=parking: Tag:amenity=parking
     amenity=parking_entrance: Tag:amenity=parking entrance
@@ -7475,6 +9734,7 @@ en:
     amenity=pharmacy: Tag:amenity=pharmacy
     amenity=photo_booth: Tag:amenity=photo booth
     amenity=piano: Tag:amenity=piano
     amenity=pharmacy: Tag:amenity=pharmacy
     amenity=photo_booth: Tag:amenity=photo booth
     amenity=piano: Tag:amenity=piano
+    amenity=place_of_mourning: Tag:amenity=place of mourning
     amenity=place_of_worship: Tag:amenity=place of worship
     amenity=planetarium: Tag:amenity=planetarium
     amenity=police: Tag:amenity=police
     amenity=place_of_worship: Tag:amenity=place of worship
     amenity=planetarium: Tag:amenity=planetarium
     amenity=police: Tag:amenity=police
@@ -7498,6 +9758,8 @@ en:
     amenity=refugee_housing: Tag:amenity=refugee housing
     amenity=refugee_site: Tag:amenity=refugee site
     amenity=register_office: Tag:amenity=register office
     amenity=refugee_housing: Tag:amenity=refugee housing
     amenity=refugee_site: Tag:amenity=refugee site
     amenity=register_office: Tag:amenity=register office
+    amenity=rehearsal_studio: Tag:amenity=rehearsal studio
+    amenity=relay_box: Tag:amenity=relay box
     amenity=rescue_box: Tag:amenity=rescue box
     amenity=rescue_station: Tag:amenity=rescue station
     amenity=research_institute: Tag:amenity=research institute
     amenity=rescue_box: Tag:amenity=rescue box
     amenity=rescue_station: Tag:amenity=rescue station
     amenity=research_institute: Tag:amenity=research institute
@@ -7508,10 +9770,10 @@ en:
     amenity=sanatorium: Tag:amenity=sanatorium
     amenity=sanitary_dump_station: Tag:amenity=sanitary dump station
     amenity=sauna: Tag:amenity=sauna
     amenity=sanatorium: Tag:amenity=sanatorium
     amenity=sanitary_dump_station: Tag:amenity=sanitary dump station
     amenity=sauna: Tag:amenity=sauna
-    amenity=sceptic_tank: Tag:amenity=sceptic tank
     amenity=school: Tag:amenity=school
     amenity=school: Tag:amenity=school
+    amenity=scooter_rental: Tag:amenity=scooter rental
     amenity=seat: Tag:amenity=seat
     amenity=seat: Tag:amenity=seat
-    amenity=septic_tank: Tag:amenity=septic tank
+    amenity=security_booth: Tag:amenity=security booth
     amenity=shelter: Tag:amenity=shelter
     amenity=shop: Tag:amenity=shop
     amenity=shower: Tag:amenity=shower
     amenity=shelter: Tag:amenity=shelter
     amenity=shop: Tag:amenity=shop
     amenity=shower: Tag:amenity=shower
@@ -7530,9 +9792,12 @@ en:
     amenity=street_lamp: Tag:amenity=street lamp
     amenity=street_light: Tag:amenity=street light
     amenity=stripclub: Tag:amenity=stripclub
     amenity=street_lamp: Tag:amenity=street lamp
     amenity=street_light: Tag:amenity=street light
     amenity=stripclub: Tag:amenity=stripclub
+    amenity=stroller_parking: Tag:amenity=stroller parking
+    amenity=student_accommodation: Tag:amenity=student accommodation
     amenity=studio: Tag:amenity=studio
     amenity=surf_school: Tag:amenity=surf school
     amenity=swimming_pool: Tag:amenity=swimming pool
     amenity=studio: Tag:amenity=studio
     amenity=surf_school: Tag:amenity=surf school
     amenity=swimming_pool: Tag:amenity=swimming pool
+    amenity=swimming_school: Tag:amenity=swimming school
     amenity=swingerclub: Tag:amenity=swingerclub
     amenity=table: Tag:amenity=table
     amenity=taxi: Tag:amenity=taxi
     amenity=swingerclub: Tag:amenity=swingerclub
     amenity=table: Tag:amenity=table
     amenity=taxi: Tag:amenity=taxi
@@ -7546,7 +9811,10 @@ en:
     amenity=tourist_bus_parking: Tag:amenity=tourist bus parking
     amenity=townhall: Tag:amenity=townhall
     amenity=toy_library: Tag:amenity=toy library
     amenity=tourist_bus_parking: Tag:amenity=tourist bus parking
     amenity=townhall: Tag:amenity=townhall
     amenity=toy_library: Tag:amenity=toy library
+    amenity=trade_school: Tag:amenity=trade school
+    amenity=traffic_park: Tag:amenity=traffic park
     amenity=trailer_park: Tag:amenity=trailer park
     amenity=trailer_park: Tag:amenity=trailer park
+    amenity=training: Tag:amenity=training
     amenity=trolley_bay: Tag:amenity=trolley bay
     amenity=tuition: Tag:amenity=tuition
     amenity=university: Tag:amenity=university
     amenity=trolley_bay: Tag:amenity=trolley bay
     amenity=tuition: Tag:amenity=tuition
     amenity=university: Tag:amenity=university
@@ -7557,56 +9825,118 @@ en:
     amenity=veterinary: Tag:amenity=veterinary
     amenity=veterinary_pharmacy: Tag:amenity=veterinary pharmacy
     amenity=vivarium: Tag:amenity=vivarium
     amenity=veterinary: Tag:amenity=veterinary
     amenity=veterinary_pharmacy: Tag:amenity=veterinary pharmacy
     amenity=vivarium: Tag:amenity=vivarium
+    amenity=warehouse: Tag:amenity=warehouse
     amenity=washing_machine: Tag:amenity=washing machine
     amenity=waste_basket: Tag:amenity=waste basket
     amenity=waste_disposal: Tag:amenity=waste disposal
     amenity=washing_machine: Tag:amenity=washing machine
     amenity=waste_basket: Tag:amenity=waste basket
     amenity=waste_disposal: Tag:amenity=waste disposal
+    amenity=waste_dump_site: Tag:amenity=waste dump site
     amenity=waste_transfer_station: Tag:amenity=waste transfer station
     amenity=water: Tag:amenity=water
     amenity=water_point: Tag:amenity=water point
     amenity=watering_place: Tag:amenity=watering place
     amenity=weighbridge: Tag:amenity=weighbridge
     amenity=waste_transfer_station: Tag:amenity=waste transfer station
     amenity=water: Tag:amenity=water
     amenity=water_point: Tag:amenity=water point
     amenity=watering_place: Tag:amenity=watering place
     amenity=weighbridge: Tag:amenity=weighbridge
+    amenity=whirlpool: Tag:amenity=whirlpool
     amenity=winery: Tag:amenity=winery
     amenity=winery: Tag:amenity=winery
+    amenity=workshop: Tag:amenity=workshop
     amenity=yacht_club: Tag:amenity=yacht club
     amenity=youth_centre: Tag:amenity=youth centre
     amenity=yacht_club: Tag:amenity=yacht club
     amenity=youth_centre: Tag:amenity=youth centre
-    aminety=sceptic_tank: Tag:aminety=sceptic tank
     animal=horse_walker: Tag:animal=horse walker
     animal=school: Tag:animal=school
     animal_breeding=gamecock: Tag:animal breeding=gamecock
     animal=horse_walker: Tag:animal=horse walker
     animal=school: Tag:animal=school
     animal_breeding=gamecock: Tag:animal breeding=gamecock
+    animal_hitch=ring: Tag:animal hitch=ring
     animal_shelter:sanctuary=yes: Tag:animal shelter:sanctuary=yes
     animated=trivision_blades: Tag:animated=trivision blades
     animated=winding_posters: Tag:animated=winding posters
     anthropogenic=yes: Tag:anthropogenic=yes
     animal_shelter:sanctuary=yes: Tag:animal shelter:sanctuary=yes
     animated=trivision_blades: Tag:animated=trivision blades
     animated=winding_posters: Tag:animated=winding posters
     anthropogenic=yes: Tag:anthropogenic=yes
+    aquaculture=fish: Tag:aquaculture=fish
+    aquaculture=seaweed: Tag:aquaculture=seaweed
+    archaeological_site=amphitheatre: Tag:archaeological site=amphitheatre
+    archaeological_site=baths: Tag:archaeological site=baths
+    archaeological_site=city: Tag:archaeological site=city
+    archaeological_site=cliff_dwelling: Tag:archaeological site=cliff dwelling
+    archaeological_site=crannog: Tag:archaeological site=crannog
+    archaeological_site=desert_kite: Tag:archaeological site=desert kite
+    archaeological_site=earthwork: Tag:archaeological site=earthwork
+    archaeological_site=enclosure: Tag:archaeological site=enclosure
+    archaeological_site=field_system: Tag:archaeological site=field system
+    archaeological_site=fortification: Tag:archaeological site=fortification
+    archaeological_site=grave_field: Tag:archaeological site=grave field
+    archaeological_site=hut_circle: Tag:archaeological site=hut circle
+    archaeological_site=megalith: Tag:archaeological site=megalith
+    archaeological_site=minilith: Tag:archaeological site=minilith
+    archaeological_site=necropolis: Tag:archaeological site=necropolis
+    archaeological_site=petroglyph: Tag:archaeological site=petroglyph
+    archaeological_site=roman_circus: Tag:archaeological site=roman circus
+    archaeological_site=roman_villa: Tag:archaeological site=roman villa
+    archaeological_site=settlement: Tag:archaeological site=settlement
+    archaeological_site=souterrain: Tag:archaeological site=souterrain
+    archaeological_site=tumulus: Tag:archaeological site=tumulus
     area:highway=cycleway: Tag:area:highway=cycleway
     area:highway=footway: Tag:area:highway=footway
     area:highway=path: Tag:area:highway=path
     area:highway=pedestrian: Tag:area:highway=pedestrian
     area:highway=cycleway: Tag:area:highway=cycleway
     area:highway=footway: Tag:area:highway=footway
     area:highway=path: Tag:area:highway=path
     area:highway=pedestrian: Tag:area:highway=pedestrian
+    area:highway=steps: Tag:area:highway=steps
+    area:highway=trunk: Tag:area:highway=trunk
+    area:highway=trunk_link: Tag:area:highway=trunk link
     area:highway=turning_circle: Tag:area:highway=turning circle
     area:highway=turning_circle: Tag:area:highway=turning circle
+    artwork_subject=sheela-na-gig: Tag:artwork subject=sheela-na-gig
     artwork_type=architecture: Tag:artwork type=architecture
     artwork_type=bust: Tag:artwork type=bust
     artwork_type=architecture: Tag:artwork type=architecture
     artwork_type=bust: Tag:artwork type=bust
+    artwork_type=graffiti: Tag:artwork type=graffiti
+    artwork_type=land_art: Tag:artwork type=land art
     artwork_type=mural: Tag:artwork type=mural
     artwork_type=relief: Tag:artwork type=relief
     artwork_type=sculpture: Tag:artwork type=sculpture
     artwork_type=statue: Tag:artwork type=statue
     artwork_type=stone: Tag:artwork type=stone
     artwork_type=mural: Tag:artwork type=mural
     artwork_type=relief: Tag:artwork type=relief
     artwork_type=sculpture: Tag:artwork type=sculpture
     artwork_type=statue: Tag:artwork type=statue
     artwork_type=stone: Tag:artwork type=stone
+    asphalt:type=dense: Tag:asphalt:type=dense
+    asphalt:type=porous: Tag:asphalt:type=porous
+    asphalt:type=porous:double: Tag:asphalt:type=porous:double
+    asphalt:type=stone_mastic: Tag:asphalt:type=stone mastic
+    asphalt:type=thin_surface_layer: Tag:asphalt:type=thin surface layer
     assembly_point:earthquake=yes: Tag:assembly point:earthquake=yes
     assembly_point:fire=yes: Tag:assembly point:fire=yes
     assembly_point:flood=yes: Tag:assembly point:flood=yes
     assembly_point:landslide=yes: Tag:assembly point:landslide=yes
     assembly_point:tornado=yes: Tag:assembly point:tornado=yes
     assembly_point:tsunami=yes: Tag:assembly point:tsunami=yes
     assembly_point:earthquake=yes: Tag:assembly point:earthquake=yes
     assembly_point:fire=yes: Tag:assembly point:fire=yes
     assembly_point:flood=yes: Tag:assembly point:flood=yes
     assembly_point:landslide=yes: Tag:assembly point:landslide=yes
     assembly_point:tornado=yes: Tag:assembly point:tornado=yes
     assembly_point:tsunami=yes: Tag:assembly point:tsunami=yes
+    association=student: Tag:association=student
+    athletics=cross_country: Tag:athletics=cross country
+    athletics=discus_throw: Tag:athletics=discus throw
+    athletics=hammer_throw: Tag:athletics=hammer throw
+    athletics=high_jump: Tag:athletics=high jump
+    athletics=javelin_throw: Tag:athletics=javelin throw
+    athletics=long_jump: Tag:athletics=long jump
+    athletics=pole_vault: Tag:athletics=pole vault
+    athletics=running: Tag:athletics=running
+    athletics=shot_put: Tag:athletics=shot put
+    athletics=sprint: Tag:athletics=sprint
+    athletics=steeplechase: Tag:athletics=steeplechase
+    athletics=triple_jump: Tag:athletics=triple jump
     atm=no: Tag:atm=no
     atm=yes: Tag:atm=yes
     attraction=alpine_coaster: Tag:attraction=alpine coaster
     atm=no: Tag:atm=no
     atm=yes: Tag:atm=yes
     attraction=alpine_coaster: Tag:attraction=alpine coaster
+    attraction=amusement_ride: Tag:attraction=amusement ride
     attraction=animal: Tag:attraction=animal
     attraction=animal: Tag:attraction=animal
+    attraction=big_wheel: Tag:attraction=big wheel
+    attraction=boat_ride: Tag:attraction=boat ride
+    attraction=carousel: Tag:attraction=carousel
     attraction=maze: Tag:attraction=maze
     attraction=roller_coaster: Tag:attraction=roller coaster
     attraction=summer_toboggan: Tag:attraction=summer toboggan
     attraction=train: Tag:attraction=train
     attraction=water_slide: Tag:attraction=water slide
     attraction=maze: Tag:attraction=maze
     attraction=roller_coaster: Tag:attraction=roller coaster
     attraction=summer_toboggan: Tag:attraction=summer toboggan
     attraction=train: Tag:attraction=train
     attraction=water_slide: Tag:attraction=water slide
+    autonomy=excluded: Tag:autonomy=excluded
+    autonomy=exclusive: Tag:autonomy=exclusive
+    autonomy=mixed: Tag:autonomy=mixed
+    avalanche_protection=snow_bridge: Tag:avalanche protection=snow bridge
     baby_hatch=yes: Tag:baby hatch=yes
     bakehouse: Tag:bakehouse
     baking_oven: Tag:baking oven
     baby_hatch=yes: Tag:baby hatch=yes
     bakehouse: Tag:bakehouse
     baking_oven: Tag:baking oven
+    barrier=avalanche_protection: Tag:barrier=avalanche protection
     barrier=bar: Tag:barrier=bar
     barrier=bar: Tag:barrier=bar
+    barrier=barricade: Tag:barrier=barricade
+    barrier=barrier_board: Tag:barrier=barrier board
     barrier=berm: Tag:barrier=berm
     barrier=block: Tag:barrier=block
     barrier=bollard: Tag:barrier=bollard
     barrier=berm: Tag:barrier=berm
     barrier=block: Tag:barrier=block
     barrier=bollard: Tag:barrier=bollard
@@ -7620,16 +9950,21 @@ en:
     barrier=chech_hedgehog: Tag:barrier=chech hedgehog
     barrier=chicane: Tag:barrier=chicane
     barrier=city_wall: Tag:barrier=city wall
     barrier=chech_hedgehog: Tag:barrier=chech hedgehog
     barrier=chicane: Tag:barrier=chicane
     barrier=city_wall: Tag:barrier=city wall
+    barrier=coupure: Tag:barrier=coupure
+    barrier=curb: Tag:barrier=curb
     barrier=cycle_barrier: Tag:barrier=cycle barrier
     barrier=czech_hedgehog: Tag:barrier=czech hedgehog
     barrier=debris: Tag:barrier=debris
     barrier=ditch: Tag:barrier=ditch
     barrier=cycle_barrier: Tag:barrier=cycle barrier
     barrier=czech_hedgehog: Tag:barrier=czech hedgehog
     barrier=debris: Tag:barrier=debris
     barrier=ditch: Tag:barrier=ditch
+    barrier=dug-in_tyres: Tag:barrier=dug-in tyres
     barrier=embankment: Tag:barrier=embankment
     barrier=entrance: Tag:barrier=entrance
     barrier=fence: Tag:barrier=fence
     barrier=embankment: Tag:barrier=embankment
     barrier=entrance: Tag:barrier=entrance
     barrier=fence: Tag:barrier=fence
+    barrier=foldable_pie_slice: Tag:barrier=foldable pie slice
     barrier=full-height_turnstile: Tag:barrier=full-height turnstile
     barrier=gate: Tag:barrier=gate
     barrier=guard_rail: Tag:barrier=guard rail
     barrier=full-height_turnstile: Tag:barrier=full-height turnstile
     barrier=gate: Tag:barrier=gate
     barrier=guard_rail: Tag:barrier=guard rail
+    barrier=ha-ha: Tag:barrier=ha-ha
     barrier=haha: Tag:barrier=haha
     barrier=hampshire_gate: Tag:barrier=hampshire gate
     barrier=handrail: Tag:barrier=handrail
     barrier=haha: Tag:barrier=haha
     barrier=hampshire_gate: Tag:barrier=hampshire gate
     barrier=handrail: Tag:barrier=handrail
@@ -7640,18 +9975,20 @@ en:
     barrier=horse_stile: Tag:barrier=horse stile
     barrier=jersey_barrier: Tag:barrier=jersey barrier
     barrier=kent_carriage_gap: Tag:barrier=kent carriage gap
     barrier=horse_stile: Tag:barrier=horse stile
     barrier=jersey_barrier: Tag:barrier=jersey barrier
     barrier=kent_carriage_gap: Tag:barrier=kent carriage gap
-    barrier=kent_carriage_gate: Tag:barrier=kent carriage gate
     barrier=kerb: Tag:barrier=kerb
     barrier=kissing_gate: Tag:barrier=kissing gate
     barrier=lift_gate: Tag:barrier=lift gate
     barrier=log: Tag:barrier=log
     barrier=kerb: Tag:barrier=kerb
     barrier=kissing_gate: Tag:barrier=kissing gate
     barrier=lift_gate: Tag:barrier=lift gate
     barrier=log: Tag:barrier=log
+    barrier=lych_gate: Tag:barrier=lych gate
     barrier=motorcycle_barrier: Tag:barrier=motorcycle barrier
     barrier=motorcycle_barrier: Tag:barrier=motorcycle barrier
+    barrier=planter: Tag:barrier=planter
     barrier=retaining_wall: Tag:barrier=retaining wall
     barrier=rope: Tag:barrier=rope
     barrier=sally_port: Tag:barrier=sally port
     barrier=retaining_wall: Tag:barrier=retaining wall
     barrier=rope: Tag:barrier=rope
     barrier=sally_port: Tag:barrier=sally port
-    barrier=select_acces: Tag:barrier=select acces
+    barrier=sliding_beam: Tag:barrier=sliding beam
     barrier=sliding_gate: Tag:barrier=sliding gate
     barrier=spikes: Tag:barrier=spikes
     barrier=sliding_gate: Tag:barrier=sliding gate
     barrier=spikes: Tag:barrier=spikes
+    barrier=steeplechase_jump: Tag:barrier=steeplechase jump
     barrier=step: Tag:barrier=step
     barrier=stile: Tag:barrier=stile
     barrier=sump_buster: Tag:barrier=sump buster
     barrier=step: Tag:barrier=step
     barrier=stile: Tag:barrier=stile
     barrier=sump_buster: Tag:barrier=sump buster
@@ -7662,32 +9999,61 @@ en:
     barrier=turnstile: Tag:barrier=turnstile
     barrier=tyres: Tag:barrier=tyres
     barrier=wall: Tag:barrier=wall
     barrier=turnstile: Tag:barrier=turnstile
     barrier=tyres: Tag:barrier=tyres
     barrier=wall: Tag:barrier=wall
+    barrier=wedge: Tag:barrier=wedge
     barrier=wicket_gate: Tag:barrier=wicket gate
     barrier=wicket_gate: Tag:barrier=wicket gate
+    barrier=wire_fence: Tag:barrier=wire fence
+    barrier=wood_fence: Tag:barrier=wood fence
     barrier=yes: Tag:barrier=yes
     baseball=softball: Tag:baseball=softball
     barrier=yes: Tag:barrier=yes
     baseball=softball: Tag:baseball=softball
+    basin=aeration: Tag:basin=aeration
     basin=cooling: Tag:basin=cooling
     basin=detention: Tag:basin=detention
     basin=cooling: Tag:basin=cooling
     basin=detention: Tag:basin=detention
+    basin=evaporation: Tag:basin=evaporation
+    basin=footbath: Tag:basin=footbath
     basin=infiltration: Tag:basin=infiltration
     basin=retention: Tag:basin=retention
     basin=infiltration: Tag:basin=infiltration
     basin=retention: Tag:basin=retention
+    basin=settling: Tag:basin=settling
+    basin=stormwater: Tag:basin=stormwater
+    basin=water_regeneration: Tag:basin=water regeneration
+    bath:type=foot_bath: Tag:bath:type=foot bath
     bath:type=hammam: Tag:bath:type=hammam
     bath:type=hot_spring: Tag:bath:type=hot spring
     bath:type=hammam: Tag:bath:type=hammam
     bath:type=hot_spring: Tag:bath:type=hot spring
+    bath:type=lake: Tag:bath:type=lake
     bath:type=onsen: Tag:bath:type=onsen
     bath:type=onsen: Tag:bath:type=onsen
+    bath:type=pool: Tag:bath:type=pool
+    bath:type=river: Tag:bath:type=river
+    bath:type=sea: Tag:bath:type=sea
     bath:type=thermal: Tag:bath:type=thermal
     bay=fjord: Tag:bay=fjord
     bbq=yes: Tag:bbq=yes
     bath:type=thermal: Tag:bath:type=thermal
     bay=fjord: Tag:bay=fjord
     bbq=yes: Tag:bbq=yes
+    beacon:type=DME: Tag:beacon:type=DME
     beacon:type=DVOR: Tag:beacon:type=DVOR
     beacon:type=ILS: Tag:beacon:type=ILS
     beacon:type=DVOR: Tag:beacon:type=DVOR
     beacon:type=ILS: Tag:beacon:type=ILS
+    beacon:type=MM: Tag:beacon:type=MM
     beacon:type=NDB: Tag:beacon:type=NDB
     beacon:type=NDB: Tag:beacon:type=NDB
+    beacon:type=OM: Tag:beacon:type=OM
     beacon:type=TACAN: Tag:beacon:type=TACAN
     beacon:type=VOR: Tag:beacon:type=VOR
     beacon:type=TACAN: Tag:beacon:type=TACAN
     beacon:type=VOR: Tag:beacon:type=VOR
+    beacon:type=VORTAC: Tag:beacon:type=VORTAC
+    beauty=spa: Tag:beauty=spa
+    bench=wave_lounger: Tag:bench=wave lounger
+    bicycle:backward=optional_sidepath: Tag:bicycle:backward=optional sidepath
     bicycle:backward=use_sidepath: Tag:bicycle:backward=use sidepath
     bicycle:backward=use_sidepath: Tag:bicycle:backward=use sidepath
+    bicycle:forward=optional_sidepath: Tag:bicycle:forward=optional sidepath
     bicycle:forward=use_sidepath: Tag:bicycle:forward=use sidepath
     bicycle=designated: Tag:bicycle=designated
     bicycle=dismount: Tag:bicycle=dismount
     bicycle=no: Tag:bicycle=no
     bicycle=official: Tag:bicycle=official
     bicycle:forward=use_sidepath: Tag:bicycle:forward=use sidepath
     bicycle=designated: Tag:bicycle=designated
     bicycle=dismount: Tag:bicycle=dismount
     bicycle=no: Tag:bicycle=no
     bicycle=official: Tag:bicycle=official
+    bicycle=optional_sidepath: Tag:bicycle=optional sidepath
+    bicycle=permissive: Tag:bicycle=permissive
+    bicycle=private: Tag:bicycle=private
     bicycle=use_sidepath: Tag:bicycle=use sidepath
     bicycle=yes: Tag:bicycle=yes
     bicycle=use_sidepath: Tag:bicycle=use sidepath
     bicycle=yes: Tag:bicycle=yes
+    bicycle_parking=stands: Tag:bicycle parking=stands
+    bicycle_parking=wall_loops: Tag:bicycle parking=wall loops
+    bicycle_parking=wide_stands: Tag:bicycle parking=wide stands
+    bicycle_road=yes: Tag:bicycle road=yes
     biosphärenwirt=yes: Tag:biosphärenwirt=yes
     birds_nest=stork: Tag:birds nest=stork
     board_type=board: Tag:board type=board
     biosphärenwirt=yes: Tag:biosphärenwirt=yes
     birds_nest=stork: Tag:birds nest=stork
     board_type=board: Tag:board type=board
@@ -7699,17 +10065,33 @@ en:
     boat:type=pedalo: Tag:boat:type=pedalo
     boat:type=rowing: Tag:boat:type=rowing
     boat:type=sailing: Tag:boat:type=sailing
     boat:type=pedalo: Tag:boat:type=pedalo
     boat:type=rowing: Tag:boat:type=rowing
     boat:type=sailing: Tag:boat:type=sailing
-    border_type=fishery: Tag:border type=fishery
-    border_type=harbour_limits: Tag:border type=harbour limits
+    boat=rental: Tag:boat=rental
+    books=comic: Tag:books=comic
+    books=textbook: Tag:books=textbook
+    border_type=eez: Tag:border type=eez
+    border_type=nation: Tag:border type=nation
+    border_zone=5km_zone: Tag:border zone=5km zone
+    boules=bocce: Tag:boules=bocce
+    boules=boule_de_fort: Tag:boules=boule de fort
+    boules=breton: Tag:boules=breton
+    boules=lyonnaise: Tag:boules=lyonnaise
+    boules=petanque: Tag:boules=petanque
     boundary=aboriginal_lands: Tag:boundary=aboriginal lands
     boundary=administrative: Tag:boundary=administrative
     boundary=aboriginal_lands: Tag:boundary=aboriginal lands
     boundary=administrative: Tag:boundary=administrative
+    boundary=administrative_cooperation: Tag:boundary=administrative cooperation
+    boundary=border_zone: Tag:boundary=border zone
     boundary=census: Tag:boundary=census
     boundary=civil: Tag:boundary=civil
     boundary=census: Tag:boundary=census
     boundary=civil: Tag:boundary=civil
+    boundary=disputed: Tag:boundary=disputed
     boundary=economic: Tag:boundary=economic
     boundary=economic: Tag:boundary=economic
+    boundary=enclave: Tag:boundary=enclave
+    boundary=exclave: Tag:boundary=exclave
+    boundary=forest: Tag:boundary=forest
     boundary=forest_compartment: Tag:boundary=forest compartment
     boundary=forestry_compartment: Tag:boundary=forestry compartment
     boundary=hazard: Tag:boundary=hazard
     boundary=historic: Tag:boundary=historic
     boundary=forest_compartment: Tag:boundary=forest compartment
     boundary=forestry_compartment: Tag:boundary=forestry compartment
     boundary=hazard: Tag:boundary=hazard
     boundary=historic: Tag:boundary=historic
+    boundary=limited_traffic_zone: Tag:boundary=limited traffic zone
     boundary=local_authority: Tag:boundary=local authority
     boundary=low_emission_zone: Tag:boundary=low emission zone
     boundary=maritime: Tag:boundary=maritime
     boundary=local_authority: Tag:boundary=local authority
     boundary=low_emission_zone: Tag:boundary=low emission zone
     boundary=maritime: Tag:boundary=maritime
@@ -7724,16 +10106,21 @@ en:
     boundary=regional_park: Tag:boundary=regional park
     boundary=safety_region: Tag:boundary=safety region
     boundary=special_economic_zone: Tag:boundary=special economic zone
     boundary=regional_park: Tag:boundary=regional park
     boundary=safety_region: Tag:boundary=safety region
     boundary=special_economic_zone: Tag:boundary=special economic zone
+    boundary=statistical: Tag:boundary=statistical
     boundary=timezone: Tag:boundary=timezone
     boundary=timezone: Tag:boundary=timezone
+    boundary=treaty: Tag:boundary=treaty
     boundary=urban: Tag:boundary=urban
     boundary=vice_county: Tag:boundary=vice county
     boundary=waste_collection: Tag:boundary=waste collection
     boundary=water_protection_area: Tag:boundary=water protection area
     boundary=urban: Tag:boundary=urban
     boundary=vice_county: Tag:boundary=vice county
     boundary=waste_collection: Tag:boundary=waste collection
     boundary=water_protection_area: Tag:boundary=water protection area
+    brand=Deutsche_Post: Tag:brand=Deutsche Post
+    brand=Eroski: Tag:brand=Eroski
     brand=Harley-Davidson: Tag:brand=Harley-Davidson
     brand=KTM: Tag:brand=KTM
     brand=Louis_Motorrad: Tag:brand=Louis Motorrad
     brand=Moto_Guzzi: Tag:brand=Moto Guzzi
     brand=Polo_Motorrad: Tag:brand=Polo Motorrad
     brand=Harley-Davidson: Tag:brand=Harley-Davidson
     brand=KTM: Tag:brand=KTM
     brand=Louis_Motorrad: Tag:brand=Louis Motorrad
     brand=Moto_Guzzi: Tag:brand=Moto Guzzi
     brand=Polo_Motorrad: Tag:brand=Polo Motorrad
+    brand=Spar: Tag:brand=Spar
     brand=Triumph: Tag:brand=Triumph
     brand=Zero: Tag:brand=Zero
     bridge:movable=bascule: Tag:bridge:movable=bascule
     brand=Triumph: Tag:brand=Triumph
     brand=Zero: Tag:brand=Zero
     bridge:movable=bascule: Tag:bridge:movable=bascule
@@ -7752,16 +10139,26 @@ en:
     bridge:structure=simple-suspension: Tag:bridge:structure=simple-suspension
     bridge:structure=suspension: Tag:bridge:structure=suspension
     bridge:structure=truss: Tag:bridge:structure=truss
     bridge:structure=simple-suspension: Tag:bridge:structure=simple-suspension
     bridge:structure=suspension: Tag:bridge:structure=suspension
     bridge:structure=truss: Tag:bridge:structure=truss
+    bridge:support=abutment: Tag:bridge:support=abutment
+    bridge:support=lift_pier: Tag:bridge:support=lift pier
+    bridge:support=pier: Tag:bridge:support=pier
+    bridge:support=pivot_pier: Tag:bridge:support=pivot pier
+    bridge:support=pylon: Tag:bridge:support=pylon
     bridge=aqueduct: Tag:bridge=aqueduct
     bridge=boardwalk: Tag:bridge=boardwalk
     bridge=cantilever: Tag:bridge=cantilever
     bridge=covered: Tag:bridge=covered
     bridge=drawbridge: Tag:bridge=drawbridge
     bridge=aqueduct: Tag:bridge=aqueduct
     bridge=boardwalk: Tag:bridge=boardwalk
     bridge=cantilever: Tag:bridge=cantilever
     bridge=covered: Tag:bridge=covered
     bridge=drawbridge: Tag:bridge=drawbridge
+    bridge=log_bridge: Tag:bridge=log bridge
     bridge=movable: Tag:bridge=movable
     bridge=simple_brunnel: Tag:bridge=simple brunnel
     bridge=trestle: Tag:bridge=trestle
     bridge=viaduct: Tag:bridge=viaduct
     bridge=movable: Tag:bridge=movable
     bridge=simple_brunnel: Tag:bridge=simple brunnel
     bridge=trestle: Tag:bridge=trestle
     bridge=viaduct: Tag:bridge=viaduct
+    building:part=balcony: Tag:building:part=balcony
+    building:part=corridor: Tag:building:part=corridor
+    building:part=porch: Tag:building:part=porch
     building:use=stable: Tag:building:use=stable
     building:use=stable: Tag:building:use=stable
+    building:use=warehouse: Tag:building:use=warehouse
     building=*: Tag:building=*
     building=Y: Tag:building=Y
     building=abandoned: Tag:building=abandoned
     building=*: Tag:building=*
     building=Y: Tag:building=Y
     building=abandoned: Tag:building=abandoned
@@ -7770,6 +10167,9 @@ en:
     building=bakehouse: Tag:building=bakehouse
     building=barn: Tag:building=barn
     building=barracks: Tag:building=barracks
     building=bakehouse: Tag:building=bakehouse
     building=barn: Tag:building=barn
     building=barracks: Tag:building=barracks
+    building=bath: Tag:building=bath
+    building=beach_hut: Tag:building=beach hut
+    building=bell_tower: Tag:building=bell tower
     building=boathouse: Tag:building=boathouse
     building=brewery: Tag:building=brewery
     building=bridge: Tag:building=bridge
     building=boathouse: Tag:building=boathouse
     building=brewery: Tag:building=brewery
     building=bridge: Tag:building=bridge
@@ -7780,6 +10180,7 @@ en:
     building=castle: Tag:building=castle
     building=cathedral: Tag:building=cathedral
     building=central_office: Tag:building=central office
     building=castle: Tag:building=castle
     building=cathedral: Tag:building=cathedral
     building=central_office: Tag:building=central office
+    building=changing_rooms: Tag:building=changing rooms
     building=chapel: Tag:building=chapel
     building=church: Tag:building=church
     building=civic: Tag:building=civic
     building=chapel: Tag:building=chapel
     building=church: Tag:building=church
     building=civic: Tag:building=civic
@@ -7792,17 +10193,25 @@ en:
     building=construction: Tag:building=construction
     building=container: Tag:building=container
     building=convent: Tag:building=convent
     building=construction: Tag:building=construction
     building=container: Tag:building=container
     building=convent: Tag:building=convent
+    building=corridor: Tag:building=corridor
     building=cowshed: Tag:building=cowshed
     building=cowshed: Tag:building=cowshed
+    building=damaged: Tag:building=damaged
+    building=data_center: Tag:building=data center
+    building=data_centre: Tag:building=data centre
+    building=demountable: Tag:building=demountable
     building=detached: Tag:building=detached
     building=digester: Tag:building=digester
     building=disused: Tag:building=disused
     building=dormitory: Tag:building=dormitory
     building=detached: Tag:building=detached
     building=digester: Tag:building=digester
     building=disused: Tag:building=disused
     building=dormitory: Tag:building=dormitory
+    building=dovecote: Tag:building=dovecote
     building=entrance: Tag:building=entrance
     building=exit: Tag:building=exit
     building=factory: Tag:building=factory
     building=farm: Tag:building=farm
     building=farm_auxiliary: Tag:building=farm auxiliary
     building=entrance: Tag:building=entrance
     building=exit: Tag:building=exit
     building=factory: Tag:building=factory
     building=farm: Tag:building=farm
     building=farm_auxiliary: Tag:building=farm auxiliary
+    building=fire_lookout: Tag:building=fire lookout
     building=fire_station: Tag:building=fire station
     building=fire_station: Tag:building=fire station
+    building=fixme: Tag:building=fixme
     building=font: Tag:building=font
     building=fort: Tag:building=fort
     building=funeral_hall: Tag:building=funeral hall
     building=font: Tag:building=font
     building=fort: Tag:building=fort
     building=funeral_hall: Tag:building=funeral hall
@@ -7811,10 +10220,15 @@ en:
     building=gatehouse: Tag:building=gatehouse
     building=ger: Tag:building=ger
     building=glasshouse: Tag:building=glasshouse
     building=gatehouse: Tag:building=gatehouse
     building=ger: Tag:building=ger
     building=glasshouse: Tag:building=glasshouse
+    building=goat_shed: Tag:building=goat shed
     building=government: Tag:building=government
     building=grandstand: Tag:building=grandstand
     building=greenhouse: Tag:building=greenhouse
     building=ground_station: Tag:building=ground station
     building=government: Tag:building=government
     building=grandstand: Tag:building=grandstand
     building=greenhouse: Tag:building=greenhouse
     building=ground_station: Tag:building=ground station
+    building=guard_post: Tag:building=guard post
+    building=guardhouse: Tag:building=guardhouse
+    building=gurdwara: Tag:building=gurdwara
+    building=hall_of_residence: Tag:building=hall of residence
     building=hangar: Tag:building=hangar
     building=hospital: Tag:building=hospital
     building=hotel: Tag:building=hotel
     building=hangar: Tag:building=hangar
     building=hospital: Tag:building=hospital
     building=hotel: Tag:building=hotel
@@ -7823,7 +10237,10 @@ en:
     building=hut: Tag:building=hut
     building=industrial: Tag:building=industrial
     building=kindergarten: Tag:building=kindergarten
     building=hut: Tag:building=hut
     building=industrial: Tag:building=industrial
     building=kindergarten: Tag:building=kindergarten
+    building=kingdom_hall: Tag:building=kingdom hall
     building=kiosk: Tag:building=kiosk
     building=kiosk: Tag:building=kiosk
+    building=lighthouse: Tag:building=lighthouse
+    building=livestock: Tag:building=livestock
     building=manufacture: Tag:building=manufacture
     building=marquee: Tag:building=marquee
     building=military: Tag:building=military
     building=manufacture: Tag:building=manufacture
     building=marquee: Tag:building=marquee
     building=military: Tag:building=military
@@ -7831,11 +10248,19 @@ en:
     building=mosque: Tag:building=mosque
     building=museum: Tag:building=museum
     building=office: Tag:building=office
     building=mosque: Tag:building=mosque
     building=museum: Tag:building=museum
     building=office: Tag:building=office
+    building=other: Tag:building=other
+    building=outbuilding: Tag:building=outbuilding
+    building=pagoda: Tag:building=pagoda
     building=palace: Tag:building=palace
     building=parking: Tag:building=parking
     building=pavilion: Tag:building=pavilion
     building=palace: Tag:building=palace
     building=parking: Tag:building=parking
     building=pavilion: Tag:building=pavilion
+    building=planned: Tag:building=planned
+    building=porch: Tag:building=porch
+    building=presbytery: Tag:building=presbytery
     building=proposed: Tag:building=proposed
     building=public: Tag:building=public
     building=proposed: Tag:building=proposed
     building=public: Tag:building=public
+    building=quonset_hut: Tag:building=quonset hut
+    building=railway: Tag:building=railway
     building=religious: Tag:building=religious
     building=remote_digital_terminal: Tag:building=remote digital terminal
     building=residential: Tag:building=residential
     building=religious: Tag:building=religious
     building=remote_digital_terminal: Tag:building=remote digital terminal
     building=residential: Tag:building=residential
@@ -7843,15 +10268,20 @@ en:
     building=riding_hall: Tag:building=riding hall
     building=roof: Tag:building=roof
     building=roundhouse: Tag:building=roundhouse
     building=riding_hall: Tag:building=riding hall
     building=roof: Tag:building=roof
     building=roundhouse: Tag:building=roundhouse
+    building=row_houses: Tag:building=row houses
     building=ruins: Tag:building=ruins
     building=school: Tag:building=school
     building=ruins: Tag:building=ruins
     building=school: Tag:building=school
+    building=security_booth: Tag:building=security booth
     building=semi: Tag:building=semi
     building=semidetached_house: Tag:building=semidetached house
     building=service: Tag:building=service
     building=shed: Tag:building=shed
     building=semi: Tag:building=semi
     building=semidetached_house: Tag:building=semidetached house
     building=service: Tag:building=service
     building=shed: Tag:building=shed
+    building=shepherd_shelter: Tag:building=shepherd shelter
     building=ship: Tag:building=ship
     building=shrine: Tag:building=shrine
     building=ship: Tag:building=ship
     building=shrine: Tag:building=shrine
+    building=silo: Tag:building=silo
     building=slurry_tank: Tag:building=slurry tank
     building=slurry_tank: Tag:building=slurry tank
+    building=smithy: Tag:building=smithy
     building=sports_centre: Tag:building=sports centre
     building=sports_hall: Tag:building=sports hall
     building=stable: Tag:building=stable
     building=sports_centre: Tag:building=sports centre
     building=sports_hall: Tag:building=sports hall
     building=stable: Tag:building=stable
@@ -7867,6 +10297,8 @@ en:
     building=tent: Tag:building=tent
     building=terrace: Tag:building=terrace
     building=toilets: Tag:building=toilets
     building=tent: Tag:building=tent
     building=terrace: Tag:building=terrace
     building=toilets: Tag:building=toilets
+    building=tower: Tag:building=tower
+    building=townhall: Tag:building=townhall
     building=train_station: Tag:building=train station
     building=transformer_tower: Tag:building=transformer tower
     building=transportation: Tag:building=transportation
     building=train_station: Tag:building=train station
     building=transformer_tower: Tag:building=transformer tower
     building=transportation: Tag:building=transportation
@@ -7878,17 +10310,23 @@ en:
     building=unidentified: Tag:building=unidentified
     building=university: Tag:building=university
     building=unknown: Tag:building=unknown
     building=unidentified: Tag:building=unidentified
     building=university: Tag:building=university
     building=unknown: Tag:building=unknown
+    building=venta: Tag:building=venta
     building=warehouse: Tag:building=warehouse
     building=water_tower: Tag:building=water tower
     building=warehouse: Tag:building=warehouse
     building=water_tower: Tag:building=water tower
+    building=wayside_shrine: Tag:building=wayside shrine
+    building=windmill: Tag:building=windmill
     building=yes: Tag:building=yes
     building=yes: Tag:building=yes
+    bunker_type=bomb_shelter: Tag:bunker type=bomb shelter
     bunker_type=gun_emplacement: Tag:bunker type=gun emplacement
     bunker_type=hardened_aircraft_shelter: Tag:bunker type=hardened aircraft shelter
     bunker_type=munitions: Tag:bunker type=munitions
     bunker_type=gun_emplacement: Tag:bunker type=gun emplacement
     bunker_type=hardened_aircraft_shelter: Tag:bunker type=hardened aircraft shelter
     bunker_type=munitions: Tag:bunker type=munitions
+    bunker_type=nuclear: Tag:bunker type=nuclear
     bunker_type=personnel_shelter: Tag:bunker type=personnel shelter
     bunker_type=pillbox: Tag:bunker type=pillbox
     bunker_type=technical: Tag:bunker type=technical
     bus=minibus: Tag:bus=minibus
     bus=no: Tag:bus=no
     bunker_type=personnel_shelter: Tag:bunker type=personnel shelter
     bunker_type=pillbox: Tag:bunker type=pillbox
     bunker_type=technical: Tag:bunker type=technical
     bus=minibus: Tag:bus=minibus
     bus=no: Tag:bus=no
+    bus=school: Tag:bus=school
     bus=yes: Tag:bus=yes
     busbar=flexible: Tag:busbar=flexible
     busbar=rigid: Tag:busbar=rigid
     bus=yes: Tag:bus=yes
     busbar=flexible: Tag:busbar=flexible
     busbar=rigid: Tag:busbar=rigid
@@ -7898,14 +10336,24 @@ en:
     busway=opposite_lane: Tag:busway=opposite lane
     by_night=only: Tag:by night=only
     cabin:rental=yes: Tag:cabin:rental=yes
     busway=opposite_lane: Tag:busway=opposite lane
     by_night=only: Tag:by night=only
     cabin:rental=yes: Tag:cabin:rental=yes
+    cadet=ambulance: Tag:cadet=ambulance
+    cadet=emergency_services: Tag:cadet=emergency services
+    cadet=fire: Tag:cadet=fire
+    cadet=lifeguard: Tag:cadet=lifeguard
+    cadet=military: Tag:cadet=military
+    cadet=police: Tag:cadet=police
     cafe=time-cafe: Tag:cafe=time-cafe
     cafe=time_cafe: Tag:cafe=time cafe
     camp_site=basic: Tag:camp site=basic
     camp_site=camp_pitch: Tag:camp site=camp pitch
     camp_site=deluxe: Tag:camp site=deluxe
     cafe=time-cafe: Tag:cafe=time-cafe
     cafe=time_cafe: Tag:cafe=time cafe
     camp_site=basic: Tag:camp site=basic
     camp_site=camp_pitch: Tag:camp site=camp pitch
     camp_site=deluxe: Tag:camp site=deluxe
+    camp_site=reception: Tag:camp site=reception
     camp_site=serviced: Tag:camp site=serviced
     camp_site=standard: Tag:camp site=standard
     camp_site=serviced: Tag:camp site=serviced
     camp_site=standard: Tag:camp site=standard
+    camra=yes: Tag:camra=yes
     canal=qanat: Tag:canal=qanat
     canal=qanat: Tag:canal=qanat
+    canoe=portage: Tag:canoe=portage
+    canoe=put_in: Tag:canoe=put in
     capital=4: Tag:capital=4
     capital=5: Tag:capital=5
     capital=6: Tag:capital=6
     capital=4: Tag:capital=4
     capital=5: Tag:capital=5
     capital=6: Tag:capital=6
@@ -7913,8 +10361,12 @@ en:
     car:type=hgv: Tag:car:type=hgv
     car=no: Tag:car=no
     car=yes: Tag:car=yes
     car:type=hgv: Tag:car:type=hgv
     car=no: Tag:car=no
     car=yes: Tag:car=yes
+    caravan_site=motorhome_stopover: Tag:caravan site=motorhome stopover
+    cargo=container: Tag:cargo=container
+    cargo=liquid_bulk: Tag:cargo=liquid bulk
     carpenter=joiner: Tag:carpenter=joiner
     castle_type=castrum: Tag:castle type=castrum
     carpenter=joiner: Tag:carpenter=joiner
     castle_type=castrum: Tag:castle type=castrum
+    castle_type=citadel: Tag:castle type=citadel
     castle_type=defensive: Tag:castle type=defensive
     castle_type=fortress: Tag:castle type=fortress
     castle_type=kremlin: Tag:castle type=kremlin
     castle_type=defensive: Tag:castle type=defensive
     castle_type=fortress: Tag:castle type=fortress
     castle_type=kremlin: Tag:castle type=kremlin
@@ -7922,36 +10374,133 @@ en:
     castle_type=palace: Tag:castle type=palace
     castle_type=shiro: Tag:castle type=shiro
     castle_type=stately: Tag:castle type=stately
     castle_type=palace: Tag:castle type=palace
     castle_type=shiro: Tag:castle type=shiro
     castle_type=stately: Tag:castle type=stately
+    cave=grotto: Tag:cave=grotto
+    cemetery=burial_forest: Tag:cemetery=burial forest
+    cemetery=cillín: Tag:cemetery=cillín
     cemetery=grave: Tag:cemetery=grave
     cemetery=sector: Tag:cemetery=sector
     cemetery=war_cemetery: Tag:cemetery=war cemetery
     cemetery=grave: Tag:cemetery=grave
     cemetery=sector: Tag:cemetery=sector
     cemetery=war_cemetery: Tag:cemetery=war cemetery
+    cemetery=wood: Tag:cemetery=wood
+    center_turn_lane=yes: Tag:center turn lane=yes
+    china_class=cun: Tag:china class=cun
     clothes=fashion: Tag:clothes=fashion
     clothes=fashion: Tag:clothes=fashion
+    clothes=luxury: Tag:clothes=luxury
     clothes=motorcycle: Tag:clothes=motorcycle
     clothes=sports: Tag:clothes=sports
     clothes=motorcycle: Tag:clothes=motorcycle
     clothes=sports: Tag:clothes=sports
+    clothes=swimwear: Tag:clothes=swimwear
     clothes=underwear: Tag:clothes=underwear
     clothes=underwear: Tag:clothes=underwear
+    clothes=uniforms: Tag:clothes=uniforms
+    clothes=unisex: Tag:clothes=unisex
+    clothes=vintage: Tag:clothes=vintage
+    clothes=wedding: Tag:clothes=wedding
     clothes=women: Tag:clothes=women
     clothes=women;men: Tag:clothes=women;men
     clothes=women;men;children: Tag:clothes=women;men;children
     clothes=women: Tag:clothes=women
     clothes=women;men: Tag:clothes=women;men
     clothes=women;men;children: Tag:clothes=women;men;children
+    clothes=workwear: Tag:clothes=workwear
     club=amateur_radio: Tag:club=amateur radio
     club=amateur_radio: Tag:club=amateur radio
+    club=art: Tag:club=art
     club=automobile: Tag:club=automobile
     club=automobile: Tag:club=automobile
+    club=baduk: Tag:club=baduk
+    club=bicycle: Tag:club=bicycle
+    club=cadet: Tag:club=cadet
+    club=card_games: Tag:club=card games
+    club=chess: Tag:club=chess
+    club=computer: Tag:club=computer
     club=fan: Tag:club=fan
     club=fan: Tag:club=fan
+    club=fishing: Tag:club=fishing
+    club=freemasonry: Tag:club=freemasonry
+    club=golf: Tag:club=golf
+    club=hunting: Tag:club=hunting
+    club=linux: Tag:club=linux
+    club=military_cadets: Tag:club=military cadets
     club=motorcycle: Tag:club=motorcycle
     club=motorcycle: Tag:club=motorcycle
+    club=music: Tag:club=music
+    club=nudism: Tag:club=nudism
+    club=sailing: Tag:club=sailing
     club=scout: Tag:club=scout
     club=scuba_diving: Tag:club=scuba diving
     club=scout: Tag:club=scout
     club=scuba_diving: Tag:club=scuba diving
+    club=social: Tag:club=social
     club=sport: Tag:club=sport
     club=sport: Tag:club=sport
+    club=student: Tag:club=student
+    club=tourism: Tag:club=tourism
+    club=veterans: Tag:club=veterans
+    club=youth: Tag:club=youth
+    club=youth_movement: Tag:club=youth movement
     coastline:survey_quality=complete: Tag:coastline:survey quality=complete
     coastline:survey_quality=inadequate: Tag:coastline:survey quality=inadequate
     coastline:survey_quality=complete: Tag:coastline:survey quality=complete
     coastline:survey_quality=inadequate: Tag:coastline:survey quality=inadequate
+    coastline=bogus: Tag:coastline=bogus
     collection_times:signed=no: Tag:collection times:signed=no
     collection_times:signed=no: Tag:collection times:signed=no
+    communication:radio=fm: Tag:communication:radio=fm
+    communication:television=dvb-t: Tag:communication:television=dvb-t
+    communication:television=dvb-t2: Tag:communication:television=dvb-t2
     communication=line: Tag:communication=line
     communication=mobile_phone: Tag:communication=mobile phone
     communication=line: Tag:communication=line
     communication=mobile_phone: Tag:communication=mobile phone
+    community_centre=club_home: Tag:community centre=club home
+    community_centre=community_hall: Tag:community centre=community hall
+    community_centre=cultural_centre: Tag:community centre=cultural centre
+    community_centre=family_centre: Tag:community centre=family centre
+    community_centre=parish_hall: Tag:community centre=parish hall
+    community_centre=village_hall: Tag:community centre=village hall
+    community_centre=youth_centre: Tag:community centre=youth centre
     company=aerospace: Tag:company=aerospace
     company=aerospace: Tag:company=aerospace
+    company=catalog: Tag:company=catalog
+    company=construction: Tag:company=construction
+    company=industrial_climbing: Tag:company=industrial climbing
+    company=internet_shop: Tag:company=internet shop
+    company=it: Tag:company=it
+    company=logistics: Tag:company=logistics
+    company=robot: Tag:company=robot
+    company=software_development: Tag:company=software development
+    company=transport: Tag:company=transport
+    compensator=filter: Tag:compensator=filter
+    compensator=series_capacitor: Tag:compensator=series capacitor
+    compensator=series_reactor: Tag:compensator=series reactor
+    compensator=shunt_capacitor: Tag:compensator=shunt capacitor
+    compensator=shunt_reactor: Tag:compensator=shunt reactor
+    compensator=statcom: Tag:compensator=statcom
+    compensator=static_var: Tag:compensator=static var
+    compensator=synchronous_condenser: Tag:compensator=synchronous condenser
+    compensator=voltage_regulator: Tag:compensator=voltage regulator
+    construction:power=plant: Tag:construction:power=plant
+    construction=apartments: Tag:construction=apartments
+    construction=house: Tag:construction=house
+    construction=office: Tag:construction=office
+    construction=shed: Tag:construction=shed
+    construction=steps: Tag:construction=steps
     construction=yes: Tag:construction=yes
     consulate=consular_agency: Tag:consulate=consular agency
     consulate=consular_office: Tag:consulate=consular office
     consulate=consulate_general: Tag:consulate=consulate general
     consulate=honorary_consul: Tag:consulate=honorary consul
     construction=yes: Tag:construction=yes
     consulate=consular_agency: Tag:consulate=consular agency
     consulate=consular_office: Tag:consulate=consular office
     consulate=consulate_general: Tag:consulate=consulate general
     consulate=honorary_consul: Tag:consulate=honorary consul
+    consulate=residence: Tag:consulate=residence
     consulate=yes: Tag:consulate=yes
     consulate=yes: Tag:consulate=yes
+    content=LNG: Tag:content=LNG
+    content=LPG: Tag:content=LPG
+    content=beer: Tag:content=beer
+    content=crop: Tag:content=crop
+    content=drinking_water: Tag:content=drinking water
+    content=fuel: Tag:content=fuel
+    content=gas: Tag:content=gas
+    content=grain: Tag:content=grain
+    content=grit: Tag:content=grit
     content=hot_water: Tag:content=hot water
     content=hot_water: Tag:content=hot water
+    content=manure: Tag:content=manure
+    content=natural_gas: Tag:content=natural gas
+    content=oil: Tag:content=oil
+    content=salt: Tag:content=salt
+    content=sewage: Tag:content=sewage
+    content=silage: Tag:content=silage
+    content=slurry: Tag:content=slurry
+    content=wastewater: Tag:content=wastewater
+    content=water: Tag:content=water
+    content=wine: Tag:content=wine
+    content=zement: Tag:content=zement
+    cooling:method=air_cooling: Tag:cooling:method=air cooling
+    cooling:method=dry_cooling: Tag:cooling:method=dry cooling
+    cooling:method=mechanical_draft: Tag:cooling:method=mechanical draft
+    cooperative=agricultural: Tag:cooperative=agricultural
+    covered=no: Tag:covered=no
+    covered=yes: Tag:covered=yes
     craft=agricultural_engines: Tag:craft=agricultural engines
     craft=atelier: Tag:craft=atelier
     craft=bag_repair: Tag:craft=bag repair
     craft=agricultural_engines: Tag:craft=agricultural engines
     craft=atelier: Tag:craft=atelier
     craft=bag_repair: Tag:craft=bag repair
@@ -7964,6 +10513,7 @@ en:
     craft=brewery: Tag:craft=brewery
     craft=builder: Tag:craft=builder
     craft=cabinet_maker: Tag:craft=cabinet maker
     craft=brewery: Tag:craft=brewery
     craft=builder: Tag:craft=builder
     craft=cabinet_maker: Tag:craft=cabinet maker
+    craft=candlemaker: Tag:craft=candlemaker
     craft=car_painter: Tag:craft=car painter
     craft=car_repair: Tag:craft=car repair
     craft=carpenter: Tag:craft=carpenter
     craft=car_painter: Tag:craft=car painter
     craft=car_repair: Tag:craft=car repair
     craft=carpenter: Tag:craft=carpenter
@@ -7972,6 +10522,7 @@ en:
     craft=caterer: Tag:craft=caterer
     craft=cheese: Tag:craft=cheese
     craft=chimney_sweeper: Tag:craft=chimney sweeper
     craft=caterer: Tag:craft=caterer
     craft=cheese: Tag:craft=cheese
     craft=chimney_sweeper: Tag:craft=chimney sweeper
+    craft=cleaning: Tag:craft=cleaning
     craft=clockmaker: Tag:craft=clockmaker
     craft=confectionery: Tag:craft=confectionery
     craft=cooper: Tag:craft=cooper
     craft=clockmaker: Tag:craft=clockmaker
     craft=confectionery: Tag:craft=confectionery
     craft=cooper: Tag:craft=cooper
@@ -7994,10 +10545,14 @@ en:
     craft=hvac: Tag:craft=hvac
     craft=information_electronics: Tag:craft=information electronics
     craft=insulation: Tag:craft=insulation
     craft=hvac: Tag:craft=hvac
     craft=information_electronics: Tag:craft=information electronics
     craft=insulation: Tag:craft=insulation
+    craft=interior_decorator: Tag:craft=interior decorator
+    craft=interior_work: Tag:craft=interior work
     craft=jeweller: Tag:craft=jeweller
     craft=joiner: Tag:craft=joiner
     craft=key_cutter: Tag:craft=key cutter
     craft=jeweller: Tag:craft=jeweller
     craft=joiner: Tag:craft=joiner
     craft=key_cutter: Tag:craft=key cutter
+    craft=laboratory: Tag:craft=laboratory
     craft=lacquerer: Tag:craft=lacquerer
     craft=lacquerer: Tag:craft=lacquerer
+    craft=lapidary: Tag:craft=lapidary
     craft=leather: Tag:craft=leather
     craft=locksmith: Tag:craft=locksmith
     craft=luthier: Tag:craft=luthier
     craft=leather: Tag:craft=leather
     craft=locksmith: Tag:craft=locksmith
     craft=luthier: Tag:craft=luthier
@@ -8011,6 +10566,7 @@ en:
     craft=paperhanger: Tag:craft=paperhanger
     craft=parquet_layer: Tag:craft=parquet layer
     craft=paver: Tag:craft=paver
     craft=paperhanger: Tag:craft=paperhanger
     craft=parquet_layer: Tag:craft=parquet layer
     craft=paver: Tag:craft=paver
+    craft=pest_control: Tag:craft=pest control
     craft=photographer: Tag:craft=photographer
     craft=photographic_laboratory: Tag:craft=photographic laboratory
     craft=piano_tuner: Tag:craft=piano tuner
     craft=photographer: Tag:craft=photographer
     craft=photographic_laboratory: Tag:craft=photographic laboratory
     craft=piano_tuner: Tag:craft=piano tuner
@@ -8032,9 +10588,11 @@ en:
     craft=signmaker: Tag:craft=signmaker
     craft=stand_builder: Tag:craft=stand builder
     craft=stonemason: Tag:craft=stonemason
     craft=signmaker: Tag:craft=signmaker
     craft=stand_builder: Tag:craft=stand builder
     craft=stonemason: Tag:craft=stonemason
+    craft=stove_fitter: Tag:craft=stove fitter
     craft=sun_protection: Tag:craft=sun protection
     craft=sweep: Tag:craft=sweep
     craft=tailor: Tag:craft=tailor
     craft=sun_protection: Tag:craft=sun protection
     craft=sweep: Tag:craft=sweep
     craft=tailor: Tag:craft=tailor
+    craft=tatami: Tag:craft=tatami
     craft=tiler: Tag:craft=tiler
     craft=tinsmith: Tag:craft=tinsmith
     craft=toolmaker: Tag:craft=toolmaker
     craft=tiler: Tag:craft=tiler
     craft=tinsmith: Tag:craft=tinsmith
     craft=toolmaker: Tag:craft=toolmaker
@@ -8042,13 +10600,16 @@ en:
     craft=upholsterer: Tag:craft=upholsterer
     craft=watchmaker: Tag:craft=watchmaker
     craft=water_well_drilling: Tag:craft=water well drilling
     craft=upholsterer: Tag:craft=upholsterer
     craft=watchmaker: Tag:craft=watchmaker
     craft=water_well_drilling: Tag:craft=water well drilling
+    craft=weaver: Tag:craft=weaver
     craft=welder: Tag:craft=welder
     craft=window_construction: Tag:craft=window construction
     craft=winery: Tag:craft=winery
     crane:type=floor-mounted_crane: Tag:crane:type=floor-mounted crane
     crane:type=gantry_crane: Tag:crane:type=gantry crane
     crane:type=portal_crane: Tag:crane:type=portal crane
     craft=welder: Tag:craft=welder
     craft=window_construction: Tag:craft=window construction
     craft=winery: Tag:craft=winery
     crane:type=floor-mounted_crane: Tag:crane:type=floor-mounted crane
     crane:type=gantry_crane: Tag:crane:type=gantry crane
     crane:type=portal_crane: Tag:crane:type=portal crane
+    crane:type=tower_crane: Tag:crane:type=tower crane
     crane:type=travel_lift: Tag:crane:type=travel lift
     crane:type=travel_lift: Tag:crane:type=travel lift
+    crematorium=pet: Tag:crematorium=pet
     crop=asparagus: Tag:crop=asparagus
     crop=aspargus: Tag:crop=aspargus
     crop=bananas: Tag:crop=bananas
     crop=asparagus: Tag:crop=asparagus
     crop=aspargus: Tag:crop=aspargus
     crop=bananas: Tag:crop=bananas
@@ -8076,6 +10637,10 @@ en:
     crop=sunflower: Tag:crop=sunflower
     crop=tea: Tag:crop=tea
     crop=wheat: Tag:crop=wheat
     crop=sunflower: Tag:crop=sunflower
     crop=tea: Tag:crop=tea
     crop=wheat: Tag:crop=wheat
+    crossing:whistle=optional: Tag:crossing:whistle=optional
+    crossing:whistle=wayside: Tag:crossing:whistle=wayside
+    crossing:whistle=yes: Tag:crossing:whistle=yes
+    crossing=informal: Tag:crossing=informal
     crossing=marked: Tag:crossing=marked
     crossing=no: Tag:crossing=no
     crossing=traffic_signals: Tag:crossing=traffic signals
     crossing=marked: Tag:crossing=marked
     crossing=no: Tag:crossing=no
     crossing=traffic_signals: Tag:crossing=traffic signals
@@ -8083,21 +10648,94 @@ en:
     crossing=unknown: Tag:crossing=unknown
     crossing=unmarked: Tag:crossing=unmarked
     crossing=zebra: Tag:crossing=zebra
     crossing=unknown: Tag:crossing=unknown
     crossing=unmarked: Tag:crossing=unmarked
     crossing=zebra: Tag:crossing=zebra
+    crossing_ref=delineated: Tag:crossing ref=delineated
+    crossing_ref=zebra: Tag:crossing ref=zebra
+    cuisine=american: Tag:cuisine=american
+    cuisine=arepa: Tag:cuisine=arepa
+    cuisine=asian: Tag:cuisine=asian
+    cuisine=açaí: Tag:cuisine=açaí
+    cuisine=bagel: Tag:cuisine=bagel
     cuisine=barbecue: Tag:cuisine=barbecue
     cuisine=barbecue: Tag:cuisine=barbecue
+    cuisine=beef_bowl: Tag:cuisine=beef bowl
     cuisine=brazilian: Tag:cuisine=brazilian
     cuisine=brunch: Tag:cuisine=brunch
     cuisine=bubble_tea: Tag:cuisine=bubble tea
     cuisine=brazilian: Tag:cuisine=brazilian
     cuisine=brunch: Tag:cuisine=brunch
     cuisine=bubble_tea: Tag:cuisine=bubble tea
+    cuisine=burger: Tag:cuisine=burger
+    cuisine=cake: Tag:cuisine=cake
+    cuisine=catalan: Tag:cuisine=catalan
+    cuisine=chicken: Tag:cuisine=chicken
+    cuisine=chinese: Tag:cuisine=chinese
     cuisine=coffee_shop: Tag:cuisine=coffee shop
     cuisine=coffee_shop: Tag:cuisine=coffee shop
+    cuisine=couscous: Tag:cuisine=couscous
+    cuisine=crepe: Tag:cuisine=crepe
+    cuisine=curry: Tag:cuisine=curry
     cuisine=dessert: Tag:cuisine=dessert
     cuisine=dessert: Tag:cuisine=dessert
+    cuisine=donut: Tag:cuisine=donut
+    cuisine=dumpling: Tag:cuisine=dumpling
+    cuisine=dumplings: Tag:cuisine=dumplings
     cuisine=empanada: Tag:cuisine=empanada
     cuisine=empanada: Tag:cuisine=empanada
+    cuisine=fish: Tag:cuisine=fish
     cuisine=fish_and_chips: Tag:cuisine=fish and chips
     cuisine=fish_and_chips: Tag:cuisine=fish and chips
+    cuisine=french: Tag:cuisine=french
     cuisine=friture: Tag:cuisine=friture
     cuisine=friture: Tag:cuisine=friture
+    cuisine=frozen_yogurt: Tag:cuisine=frozen yogurt
+    cuisine=german: Tag:cuisine=german
+    cuisine=greek: Tag:cuisine=greek
+    cuisine=grill: Tag:cuisine=grill
+    cuisine=gyros: Tag:cuisine=gyros
+    cuisine=hot_dog: Tag:cuisine=hot dog
+    cuisine=hot_pot: Tag:cuisine=hot pot
+    cuisine=hotdog: Tag:cuisine=hotdog
+    cuisine=hotpot: Tag:cuisine=hotpot
+    cuisine=ice_cream: Tag:cuisine=ice cream
+    cuisine=indian: Tag:cuisine=indian
+    cuisine=italian: Tag:cuisine=italian
+    cuisine=japanese: Tag:cuisine=japanese
+    cuisine=jause: Tag:cuisine=jause
+    cuisine=kebab: Tag:cuisine=kebab
+    cuisine=korean: Tag:cuisine=korean
+    cuisine=mediterranean: Tag:cuisine=mediterranean
+    cuisine=mexican: Tag:cuisine=mexican
+    cuisine=noodle: Tag:cuisine=noodle
+    cuisine=pakistani: Tag:cuisine=pakistani
+    cuisine=pancake: Tag:cuisine=pancake
+    cuisine=pasta: Tag:cuisine=pasta
+    cuisine=pastry: Tag:cuisine=pastry
+    cuisine=pie: Tag:cuisine=pie
+    cuisine=pizza: Tag:cuisine=pizza
+    cuisine=ramen: Tag:cuisine=ramen
+    cuisine=regional: Tag:cuisine=regional
+    cuisine=sandwich: Tag:cuisine=sandwich
+    cuisine=sausage: Tag:cuisine=sausage
+    cuisine=seafood: Tag:cuisine=seafood
+    cuisine=soup: Tag:cuisine=soup
+    cuisine=spanish: Tag:cuisine=spanish
+    cuisine=steak: Tag:cuisine=steak
+    cuisine=steak_house: Tag:cuisine=steak house
+    cuisine=strudel: Tag:cuisine=strudel
+    cuisine=sushi: Tag:cuisine=sushi
+    cuisine=tapas: Tag:cuisine=tapas
+    cuisine=tea: Tag:cuisine=tea
+    cuisine=tea_house: Tag:cuisine=tea house
     cuisine=tea_shop: Tag:cuisine=tea shop
     cuisine=tea_shop: Tag:cuisine=tea shop
+    cuisine=teahouse: Tag:cuisine=teahouse
+    cuisine=tex-mex: Tag:cuisine=tex-mex
+    cuisine=thai: Tag:cuisine=thai
+    cuisine=turkish: Tag:cuisine=turkish
+    cuisine=vietnamese: Tag:cuisine=vietnamese
+    cuisine=waffle: Tag:cuisine=waffle
+    cuisine=wings: Tag:cuisine=wings
+    culvert=box: Tag:culvert=box
+    culvert=inverted_siphon: Tag:culvert=inverted siphon
+    culvert=pipe: Tag:culvert=pipe
     curve=hairpin: Tag:curve=hairpin
     curve=loop: Tag:curve=loop
     curves=extended: Tag:curves=extended
     curves=serpentine: Tag:curves=serpentine
     curve=hairpin: Tag:curve=hairpin
     curve=loop: Tag:curve=loop
     curves=extended: Tag:curves=extended
     curves=serpentine: Tag:curves=serpentine
+    cycle_network=BE-VLG:cycle_highway: Tag:cycle network=BE-VLG:cycle highway
     cycle_network=EuroVelo: Tag:cycle network=EuroVelo
     cycle_network=EuroVelo: Tag:cycle network=EuroVelo
+    cycle_network=JP:prefectural: Tag:cycle network=JP:prefectural
+    cycle_network=US: Tag:cycle network=US
     cycle_network=US:CA:SF: Tag:cycle network=US:CA:SF
     cycle_network=US:GA: Tag:cycle network=US:GA
     cycle_network=US:LA:NO: Tag:cycle network=US:LA:NO
     cycle_network=US:CA:SF: Tag:cycle network=US:CA:SF
     cycle_network=US:GA: Tag:cycle network=US:GA
     cycle_network=US:LA:NO: Tag:cycle network=US:LA:NO
@@ -8107,41 +10745,94 @@ en:
     cycle_network=US:OH: Tag:cycle network=US:OH
     cycle_network=US:PA: Tag:cycle network=US:PA
     cycle_network=US:US: Tag:cycle network=US:US
     cycle_network=US:OH: Tag:cycle network=US:OH
     cycle_network=US:PA: Tag:cycle network=US:PA
     cycle_network=US:US: Tag:cycle network=US:US
+    cycle_network=US:USA: Tag:cycle network=US:USA
     cycle_network=cycle_highway: Tag:cycle network=cycle highway
     cycleway:both=lane: Tag:cycleway:both=lane
     cycle_network=cycle_highway: Tag:cycle network=cycle highway
     cycleway:both=lane: Tag:cycleway:both=lane
+    cycleway:both=no: Tag:cycleway:both=no
+    cycleway:both=separate: Tag:cycleway:both=separate
+    cycleway:both=shared_lane: Tag:cycleway:both=shared lane
+    cycleway:foot=designated: Tag:cycleway:foot=designated
+    cycleway:foot=no: Tag:cycleway:foot=no
     cycleway:left=lane: Tag:cycleway:left=lane
     cycleway:left=lane: Tag:cycleway:left=lane
+    cycleway:left=no: Tag:cycleway:left=no
     cycleway:left=opposite_lane: Tag:cycleway:left=opposite lane
     cycleway:left=opposite_track: Tag:cycleway:left=opposite track
     cycleway:left=opposite_lane: Tag:cycleway:left=opposite lane
     cycleway:left=opposite_track: Tag:cycleway:left=opposite track
+    cycleway:left=separate: Tag:cycleway:left=separate
+    cycleway:left=share_busway: Tag:cycleway:left=share busway
+    cycleway:left=shared_lane: Tag:cycleway:left=shared lane
     cycleway:left=track: Tag:cycleway:left=track
     cycleway:right=lane: Tag:cycleway:right=lane
     cycleway:left=track: Tag:cycleway:left=track
     cycleway:right=lane: Tag:cycleway:right=lane
+    cycleway:right=no: Tag:cycleway:right=no
     cycleway:right=opposite_lane: Tag:cycleway:right=opposite lane
     cycleway:right=opposite_track: Tag:cycleway:right=opposite track
     cycleway:right=opposite_lane: Tag:cycleway:right=opposite lane
     cycleway:right=opposite_track: Tag:cycleway:right=opposite track
+    cycleway:right=separate: Tag:cycleway:right=separate
+    cycleway:right=share_busway: Tag:cycleway:right=share busway
+    cycleway:right=shared_lane: Tag:cycleway:right=shared lane
     cycleway:right=track: Tag:cycleway:right=track
     cycleway:right=track: Tag:cycleway:right=track
+    cycleway:surface=sand: Tag:cycleway:surface=sand
     cycleway=asl: Tag:cycleway=asl
     cycleway=bike_box: Tag:cycleway=bike box
     cycleway=crossing: Tag:cycleway=crossing
     cycleway=lane: Tag:cycleway=lane
     cycleway=asl: Tag:cycleway=asl
     cycleway=bike_box: Tag:cycleway=bike box
     cycleway=crossing: Tag:cycleway=crossing
     cycleway=lane: Tag:cycleway=lane
+    cycleway=no: Tag:cycleway=no
     cycleway=opposite: Tag:cycleway=opposite
     cycleway=opposite_lane: Tag:cycleway=opposite lane
     cycleway=opposite_share_busway: Tag:cycleway=opposite share busway
     cycleway=opposite_shared_busway: Tag:cycleway=opposite shared busway
     cycleway=opposite_track: Tag:cycleway=opposite track
     cycleway=opposite: Tag:cycleway=opposite
     cycleway=opposite_lane: Tag:cycleway=opposite lane
     cycleway=opposite_share_busway: Tag:cycleway=opposite share busway
     cycleway=opposite_shared_busway: Tag:cycleway=opposite shared busway
     cycleway=opposite_track: Tag:cycleway=opposite track
+    cycleway=proposed: Tag:cycleway=proposed
+    cycleway=separate: Tag:cycleway=separate
     cycleway=share_busway: Tag:cycleway=share busway
     cycleway=shared_busway: Tag:cycleway=shared busway
     cycleway=share_busway: Tag:cycleway=share busway
     cycleway=shared_busway: Tag:cycleway=shared busway
+    cycleway=shared_lane: Tag:cycleway=shared lane
     cycleway=sidepath: Tag:cycleway=sidepath
     cycleway=sidepath: Tag:cycleway=sidepath
+    cycleway=sidewalk: Tag:cycleway=sidewalk
     cycleway=track: Tag:cycleway=track
     cycleway=track: Tag:cycleway=track
+    damage:event=war: Tag:damage:event=war
+    damage:type=explosion: Tag:damage:type=explosion
+    damage:type=war: Tag:damage:type=war
     dataset=buildings: Tag:dataset=buildings
     defensive=bergfried: Tag:defensive=bergfried
     defensive=donjon: Tag:defensive=donjon
     defensive=keep: Tag:defensive=keep
     dataset=buildings: Tag:dataset=buildings
     defensive=bergfried: Tag:defensive=bergfried
     defensive=donjon: Tag:defensive=donjon
     defensive=keep: Tag:defensive=keep
+    defensive_works=bastion: Tag:defensive works=bastion
+    defensive_works=battery: Tag:defensive works=battery
+    delivery=shipment: Tag:delivery=shipment
     demolished=yes: Tag:demolished=yes
     dennert_fir_tree=yes: Tag:dennert fir tree=yes
     demolished=yes: Tag:demolished=yes
     dennert_fir_tree=yes: Tag:dennert fir tree=yes
+    denomination=catholic: Tag:denomination=catholic
+    denomination=iglesia_filipina_independiente: Tag:denomination=iglesia filipina
+      independiente
+    denomination=jodo_shinshu: Tag:denomination=jodo shinshu
+    denomination=jodo_shu: Tag:denomination=jodo shu
     denomination=la_luz_del_mundo: Tag:denomination=la luz del mundo
     denomination=mormon: Tag:denomination=mormon
     denomination=la_luz_del_mundo: Tag:denomination=la luz del mundo
     denomination=mormon: Tag:denomination=mormon
+    denomination=nichiren: Tag:denomination=nichiren
     denomination=reformed: Tag:denomination=reformed
     denomination=reformed: Tag:denomination=reformed
+    denomination=shingon_shu: Tag:denomination=shingon shu
+    denomination=soto: Tag:denomination=soto
+    denomination=tiantai: Tag:denomination=tiantai
+    denotation=agricultural: Tag:denotation=agricultural
+    denotation=avenue: Tag:denotation=avenue
     denotation=cluster: Tag:denotation=cluster
     denotation=cluster: Tag:denotation=cluster
+    denotation=landmark: Tag:denotation=landmark
+    denotation=natural_monument: Tag:denotation=natural monument
+    denotation=urban: Tag:denotation=urban
+    denotation=windbreak: Tag:denotation=windbreak
+    designation=barangay: Tag:designation=barangay
+    designation=byway_open_to_all_traffic: Tag:designation=byway open to all traffic
+    designation=civil_parish: Tag:designation=civil parish
     designation=common: Tag:designation=common
     designation=common: Tag:designation=common
+    designation=core_path: Tag:designation=core path
+    designation=public_bridleway: Tag:designation=public bridleway
+    designation=public_footpath: Tag:designation=public footpath
+    designation=quiet_lane: Tag:designation=quiet lane
+    designation=restricted_byway: Tag:designation=restricted byway
+    designation=shared_path: Tag:designation=shared path
     destroyed=yes: Tag:destroyed=yes
     destroyed=yes: Tag:destroyed=yes
+    diet:kosher=only: Tag:diet:kosher=only
+    diet:kosher=yes: Tag:diet:kosher=yes
+    diet:meat=yes: Tag:diet:meat=yes
     diplomatic=ambassadors_residence: Tag:diplomatic=ambassadors residence
     diplomatic=consulate: Tag:diplomatic=consulate
     diplomatic=consulate_general: Tag:diplomatic=consulate general
     diplomatic=ambassadors_residence: Tag:diplomatic=ambassadors residence
     diplomatic=consulate: Tag:diplomatic=consulate
     diplomatic=consulate_general: Tag:diplomatic=consulate general
@@ -8154,16 +10845,35 @@ en:
     disc_golf=basket: Tag:disc golf=basket
     disc_golf=hole: Tag:disc golf=hole
     disc_golf=tee: Tag:disc golf=tee
     disc_golf=basket: Tag:disc golf=basket
     disc_golf=hole: Tag:disc golf=hole
     disc_golf=tee: Tag:disc golf=tee
+    distillery=whisky: Tag:distillery=whisky
+    disused:landuse=landfill: Tag:disused:landuse=landfill
+    disused:landuse=quarry: Tag:disused:landuse=quarry
+    disused:railway=halt: Tag:disused:railway=halt
+    disused:railway=level_crossing: Tag:disused:railway=level crossing
+    disused:railway=rail: Tag:disused:railway=rail
+    disused:railway=station: Tag:disused:railway=station
     disused=yes: Tag:disused=yes
     dock=drydock: Tag:dock=drydock
     dock=floating: Tag:dock=floating
     dock=tidal: Tag:dock=tidal
     disused=yes: Tag:disused=yes
     dock=drydock: Tag:dock=drydock
     dock=floating: Tag:dock=floating
     dock=tidal: Tag:dock=tidal
+    dog=designated: Tag:dog=designated
+    dog=leashed: Tag:dog=leashed
+    dog=no: Tag:dog=no
+    dog=outside: Tag:dog=outside
+    dog=unleashed: Tag:dog=unleashed
+    dog=yes: Tag:dog=yes
+    drink=beer: Tag:drink=beer
     driveway=pipestem: Tag:driveway=pipestem
     dual_carriageway=no: Tag:dual carriageway=no
     dual_carriageway=yes: Tag:dual carriageway=yes
     driveway=pipestem: Tag:driveway=pipestem
     dual_carriageway=no: Tag:dual carriageway=no
     dual_carriageway=yes: Tag:dual carriageway=yes
+    education=centre: Tag:education=centre
+    education=exercise_area: Tag:education=exercise area
+    education=school: Tag:education=school
     electrified=4th_rail: Tag:electrified=4th rail
     electrified=contact_line: Tag:electrified=contact line
     electrified=rail: Tag:electrified=rail
     electrified=4th_rail: Tag:electrified=4th rail
     electrified=contact_line: Tag:electrified=contact line
     electrified=rail: Tag:electrified=rail
+    electronics_repair=phone: Tag:electronics repair=phone
+    embankment=dyke: Tag:embankment=dyke
     embassy=branch_embassy: Tag:embassy=branch embassy
     embassy=delegation: Tag:embassy=delegation
     embassy=high_commission: Tag:embassy=high commission
     embassy=branch_embassy: Tag:embassy=branch embassy
     embassy=delegation: Tag:embassy=delegation
     embassy=high_commission: Tag:embassy=high commission
@@ -8177,26 +10887,39 @@ en:
     emergency:social_facility=shelter: Tag:emergency:social facility=shelter
     emergency=access_point: Tag:emergency=access point
     emergency=aed: Tag:emergency=aed
     emergency:social_facility=shelter: Tag:emergency:social facility=shelter
     emergency=access_point: Tag:emergency=access point
     emergency=aed: Tag:emergency=aed
+    emergency=air_rescue_service: Tag:emergency=air rescue service
+    emergency=air_rescue_sevice: Tag:emergency=air rescue sevice
     emergency=ambulance_station: Tag:emergency=ambulance station
     emergency=assembly_point: Tag:emergency=assembly point
     emergency=ambulance_station: Tag:emergency=ambulance station
     emergency=assembly_point: Tag:emergency=assembly point
+    emergency=bleed_control_kit: Tag:emergency=bleed control kit
     emergency=coast_guard: Tag:emergency=coast guard
     emergency=coast_guard: Tag:emergency=coast guard
+    emergency=control_centre: Tag:emergency=control centre
     emergency=defibrilator: Tag:emergency=defibrilator
     emergency=defibrillator: Tag:emergency=defibrillator
     emergency=defibrilator: Tag:emergency=defibrilator
     emergency=defibrillator: Tag:emergency=defibrillator
+    emergency=designated: Tag:emergency=designated
+    emergency=disaster_help_point: Tag:emergency=disaster help point
     emergency=disaster_response: Tag:emergency=disaster response
     emergency=drinking_water: Tag:emergency=drinking water
     emergency=dry_riser: Tag:emergency=dry riser
     emergency=dry_riser_inlet: Tag:emergency=dry riser inlet
     emergency=emergency_ward_entrance: Tag:emergency=emergency ward entrance
     emergency=fire_alarm_box: Tag:emergency=fire alarm box
     emergency=disaster_response: Tag:emergency=disaster response
     emergency=drinking_water: Tag:emergency=drinking water
     emergency=dry_riser: Tag:emergency=dry riser
     emergency=dry_riser_inlet: Tag:emergency=dry riser inlet
     emergency=emergency_ward_entrance: Tag:emergency=emergency ward entrance
     emergency=fire_alarm_box: Tag:emergency=fire alarm box
+    emergency=fire_blanket: Tag:emergency=fire blanket
+    emergency=fire_equipment: Tag:emergency=fire equipment
     emergency=fire_extinguisher: Tag:emergency=fire extinguisher
     emergency=fire_flapper: Tag:emergency=fire flapper
     emergency=fire_hose: Tag:emergency=fire hose
     emergency=fire_hydrant: Tag:emergency=fire hydrant
     emergency=fire_extinguisher: Tag:emergency=fire extinguisher
     emergency=fire_flapper: Tag:emergency=fire flapper
     emergency=fire_hose: Tag:emergency=fire hose
     emergency=fire_hydrant: Tag:emergency=fire hydrant
+    emergency=fire_lookout: Tag:emergency=fire lookout
     emergency=fire_point_stand: Tag:emergency=fire point stand
     emergency=fire_sand_bin: Tag:emergency=fire sand bin
     emergency=fire_point_stand: Tag:emergency=fire point stand
     emergency=fire_sand_bin: Tag:emergency=fire sand bin
+    emergency=fire_service_inlet: Tag:emergency=fire service inlet
+    emergency=fire_station: Tag:emergency=fire station
     emergency=fire_water_pond: Tag:emergency=fire water pond
     emergency=first_aid: Tag:emergency=first aid
     emergency=first_aid_kit: Tag:emergency=first aid kit
     emergency=fire_water_pond: Tag:emergency=fire water pond
     emergency=first_aid: Tag:emergency=first aid
     emergency=first_aid_kit: Tag:emergency=first aid kit
+    emergency=key_depot: Tag:emergency=key depot
+    emergency=ladder_site: Tag:emergency=ladder site
     emergency=landing_site: Tag:emergency=landing site
     emergency=life_ring: Tag:emergency=life ring
     emergency=lifeboat_station: Tag:emergency=lifeboat station
     emergency=landing_site: Tag:emergency=landing site
     emergency=life_ring: Tag:emergency=life ring
     emergency=lifeboat_station: Tag:emergency=lifeboat station
@@ -8206,10 +10929,13 @@ en:
     emergency=lifeguard_platform: Tag:emergency=lifeguard platform
     emergency=lifeguard_tower: Tag:emergency=lifeguard tower
     emergency=marine_refuge: Tag:emergency=marine refuge
     emergency=lifeguard_platform: Tag:emergency=lifeguard platform
     emergency=lifeguard_tower: Tag:emergency=lifeguard tower
     emergency=marine_refuge: Tag:emergency=marine refuge
+    emergency=marine_rescue: Tag:emergency=marine rescue
     emergency=mountain_rescue: Tag:emergency=mountain rescue
     emergency=phone: Tag:emergency=phone
     emergency=rescue_box: Tag:emergency=rescue box
     emergency=mountain_rescue: Tag:emergency=mountain rescue
     emergency=phone: Tag:emergency=phone
     emergency=rescue_box: Tag:emergency=rescue box
+    emergency=rescue_buoy: Tag:emergency=rescue buoy
     emergency=ses_station: Tag:emergency=ses station
     emergency=ses_station: Tag:emergency=ses station
+    emergency=shower: Tag:emergency=shower
     emergency=siamese: Tag:emergency=siamese
     emergency=siren: Tag:emergency=siren
     emergency=slipway: Tag:emergency=slipway
     emergency=siamese: Tag:emergency=siamese
     emergency=siren: Tag:emergency=siren
     emergency=slipway: Tag:emergency=slipway
@@ -8217,22 +10943,56 @@ en:
     emergency=sprinkler_connection: Tag:emergency=sprinkler connection
     emergency=standpipe: Tag:emergency=standpipe
     emergency=suction_point: Tag:emergency=suction point
     emergency=sprinkler_connection: Tag:emergency=sprinkler connection
     emergency=standpipe: Tag:emergency=standpipe
     emergency=suction_point: Tag:emergency=suction point
+    emergency=throw_bag: Tag:emergency=throw bag
+    emergency=water_rescue: Tag:emergency=water rescue
     emergency=water_rescue_station: Tag:emergency=water rescue station
     emergency=water_tank: Tag:emergency=water tank
     emergency=wet_riser: Tag:emergency=wet riser
     emergency=yes: Tag:emergency=yes
     emergency_service=technical: Tag:emergency service=technical
     emergency=water_rescue_station: Tag:emergency=water rescue station
     emergency=water_tank: Tag:emergency=water tank
     emergency=wet_riser: Tag:emergency=wet riser
     emergency=yes: Tag:emergency=yes
     emergency_service=technical: Tag:emergency service=technical
+    entrance=entrance: Tag:entrance=entrance
+    entrance=exit: Tag:entrance=exit
+    entrance=fire_exit: Tag:entrance=fire exit
     entrance=garage: Tag:entrance=garage
     entrance=garage: Tag:entrance=garage
+    entrance=gate: Tag:entrance=gate
     entrance=main: Tag:entrance=main
     entrance=main_entrance: Tag:entrance=main entrance
     entrance=main: Tag:entrance=main
     entrance=main_entrance: Tag:entrance=main entrance
+    entrance=secondary: Tag:entrance=secondary
+    entrance=shop: Tag:entrance=shop
     entrance=staircase: Tag:entrance=staircase
     entrance=yes: Tag:entrance=yes
     entrance=staircase: Tag:entrance=staircase
     entrance=yes: Tag:entrance=yes
-    esperanto=esperanto: Tag:esperanto=esperanto
     esperanto=yes: Tag:esperanto=yes
     esperanto=yes: Tag:esperanto=yes
-    estuary=yes: Tag:estuary=yes
+    exit=emergency: Tag:exit=emergency
     faculty=aerospace: Tag:faculty=aerospace
     faculty=aerospace: Tag:faculty=aerospace
+    faculty=engineering: Tag:faculty=engineering
+    farmland=arable: Tag:farmland=arable
+    farmland=pasture: Tag:farmland=pasture
+    farmyard=stockyard: Tag:farmyard=stockyard
     fast_food=cafeteria: Tag:fast food=cafeteria
     fast_food=cafeteria: Tag:fast food=cafeteria
+    fcode=45800: Tag:fcode=45800
+    fence_type=railing: Tag:fence type=railing
+    fire_hydrant:position=green: Tag:fire hydrant:position=green
+    fire_hydrant:position=lane: Tag:fire hydrant:position=lane
+    fire_hydrant:position=parking_lot: Tag:fire hydrant:position=parking lot
+    fire_hydrant:position=sidewalk: Tag:fire hydrant:position=sidewalk
+    fire_hydrant:type=pillar: Tag:fire hydrant:type=pillar
+    fire_hydrant:type=pipe: Tag:fire hydrant:type=pipe
+    fire_hydrant:type=underground: Tag:fire hydrant:type=underground
+    fire_hydrant:type=wall: Tag:fire hydrant:type=wall
+    fire_mains=dry: Tag:fire mains=dry
+    fire_mains=wet: Tag:fire mains=wet
+    fire_mains=yes: Tag:fire mains=yes
+    fire_path=yes: Tag:fire path=yes
+    fire_service_inlet=underground: Tag:fire service inlet=underground
+    fire_service_inlet=wall: Tag:fire service inlet=wall
+    fire_sprinkler=dry: Tag:fire sprinkler=dry
+    fire_sprinkler=pre-action: Tag:fire sprinkler=pre-action
+    fire_sprinkler=wet: Tag:fire sprinkler=wet
+    fire_sprinkler=yes: Tag:fire sprinkler=yes
     fixme=Position_estimated: Tag:fixme=Position estimated
     fixme=Position_estimated: Tag:fixme=Position estimated
+    fixme=name: Tag:fixme=name
+    fixme=position_estimated: Tag:fixme=position estimated
+    fixme=verify_name: Tag:fixme=verify name
     flag:type=advertising: Tag:flag:type=advertising
     flag:type=athletic: Tag:flag:type=athletic
     flag:type=governmental: Tag:flag:type=governmental
     flag:type=advertising: Tag:flag:type=advertising
     flag:type=athletic: Tag:flag:type=athletic
     flag:type=governmental: Tag:flag:type=governmental
@@ -8242,20 +11002,40 @@ en:
     flag:type=organisation: Tag:flag:type=organisation
     flag:type=regional: Tag:flag:type=regional
     flag:type=religious: Tag:flag:type=religious
     flag:type=organisation: Tag:flag:type=organisation
     flag:type=regional: Tag:flag:type=regional
     flag:type=religious: Tag:flag:type=religious
+    floating=yes: Tag:floating=yes
     flood_mark=painting: Tag:flood mark=painting
     flood_mark=plaque: Tag:flood mark=plaque
     flood_mark=painting: Tag:flood mark=painting
     flood_mark=plaque: Tag:flood mark=plaque
+    floor:material=wood: Tag:floor:material=wood
     flow_direction=both: Tag:flow direction=both
     flow_direction=both: Tag:flow direction=both
+    foldable_pie_slice: Tag:foldable pie slice
     foot=designated: Tag:foot=designated
     foot=designated: Tag:foot=designated
+    foot=destination: Tag:foot=destination
+    foot=no: Tag:foot=no
     foot=official: Tag:foot=official
     foot=official: Tag:foot=official
+    foot=permissive: Tag:foot=permissive
+    foot=private: Tag:foot=private
     foot=use_sidepath: Tag:foot=use sidepath
     foot=use_sidepath: Tag:foot=use sidepath
+    foot=yes: Tag:foot=yes
+    footway:surface=rock: Tag:footway:surface=rock
+    footway:surface=unpaved: Tag:footway:surface=unpaved
     footway=access_aisle: Tag:footway=access aisle
     footway=access_aisle: Tag:footway=access aisle
+    footway=alley: Tag:footway=alley
+    footway=both: Tag:footway=both
     footway=crossing: Tag:footway=crossing
     footway=crossing: Tag:footway=crossing
+    footway=left: Tag:footway=left
+    footway=none: Tag:footway=none
+    footway=path: Tag:footway=path
+    footway=right: Tag:footway=right
     footway=sidewalk: Tag:footway=sidewalk
     footway=sidewalk: Tag:footway=sidewalk
+    footway=traffic_island: Tag:footway=traffic island
+    footway=yes: Tag:footway=yes
     ford=boat: Tag:ford=boat
     ford=stepping_stones: Tag:ford=stepping stones
     ford=yes: Tag:ford=yes
     fortification_type=hill_fort: Tag:fortification type=hill fort
     fortification_type=limes: Tag:fortification type=limes
     ford=boat: Tag:ford=boat
     ford=stepping_stones: Tag:ford=stepping stones
     ford=yes: Tag:ford=yes
     fortification_type=hill_fort: Tag:fortification type=hill fort
     fortification_type=limes: Tag:fortification type=limes
+    fortification_type=motte: Tag:fortification type=motte
+    fortification_type=pa: Tag:fortification type=pa
     fortification_type=ring_ditch: Tag:fortification type=ring ditch
     fortification_type=ringfort: Tag:fortification type=ringfort
     fortification_type=sconce: Tag:fortification type=sconce
     fortification_type=ring_ditch: Tag:fortification type=ring ditch
     fortification_type=ringfort: Tag:fortification type=ringfort
     fortification_type=sconce: Tag:fortification type=sconce
@@ -8263,7 +11043,14 @@ en:
     fountain=drinking: Tag:fountain=drinking
     fountain=nasone: Tag:fountain=nasone
     fountain=roman_wolf: Tag:fountain=roman wolf
     fountain=drinking: Tag:fountain=drinking
     fountain=nasone: Tag:fountain=nasone
     fountain=roman_wolf: Tag:fountain=roman wolf
+    fountain=sebilj: Tag:fountain=sebilj
+    fountain=stone_block: Tag:fountain=stone block
+    fountain=toret: Tag:fountain=toret
+    fountain=viktorija_zdenac: Tag:fountain=viktorija zdenac
+    fountain=wallace: Tag:fountain=wallace
+    garden:type=arboretum: Tag:garden:type=arboretum
     garden:type=botanical: Tag:garden:type=botanical
     garden:type=botanical: Tag:garden:type=botanical
+    garden:type=monastery: Tag:garden:type=monastery
     generator:method=anaerobic_digestion: Tag:generator:method=anaerobic digestion
     generator:method=barrage: Tag:generator:method=barrage
     generator:method=combustion: Tag:generator:method=combustion
     generator:method=anaerobic_digestion: Tag:generator:method=anaerobic digestion
     generator:method=barrage: Tag:generator:method=barrage
     generator:method=combustion: Tag:generator:method=combustion
@@ -8279,6 +11066,17 @@ en:
     generator:method=wind_turbine: Tag:generator:method=wind turbine
     generator:plant=intermediate: Tag:generator:plant=intermediate
     generator:plant=output: Tag:generator:plant=output
     generator:method=wind_turbine: Tag:generator:method=wind turbine
     generator:plant=intermediate: Tag:generator:plant=intermediate
     generator:plant=output: Tag:generator:plant=output
+    generator:solar:tracking=alt-azimuth: Tag:generator:solar:tracking=alt-azimuth
+    generator:solar:tracking=dual_axis: Tag:generator:solar:tracking=dual axis
+    generator:solar:tracking=horizontal: Tag:generator:solar:tracking=horizontal
+    generator:solar:tracking=horizontal_tilted: Tag:generator:solar:tracking=horizontal
+      tilted
+    generator:solar:tracking=no: Tag:generator:solar:tracking=no
+    generator:solar:tracking=single_axis: Tag:generator:solar:tracking=single axis
+    generator:solar:tracking=tilted: Tag:generator:solar:tracking=tilted
+    generator:solar:tracking=tip-tilt: Tag:generator:solar:tracking=tip-tilt
+    generator:solar:tracking=vertical: Tag:generator:solar:tracking=vertical
+    generator:solar:tracking=yes: Tag:generator:solar:tracking=yes
     generator:source=battery: Tag:generator:source=battery
     generator:source=biofuel: Tag:generator:source=biofuel
     generator:source=biogas: Tag:generator:source=biogas
     generator:source=battery: Tag:generator:source=battery
     generator:source=biofuel: Tag:generator:source=biofuel
     generator:source=biogas: Tag:generator:source=biogas
@@ -8297,6 +11095,7 @@ en:
     generator:source=waste: Tag:generator:source=waste
     generator:source=wave: Tag:generator:source=wave
     generator:source=wind: Tag:generator:source=wind
     generator:source=waste: Tag:generator:source=waste
     generator:source=wave: Tag:generator:source=wave
     generator:source=wind: Tag:generator:source=wind
+    generator:type=PWR: Tag:generator:type=PWR
     generator:type=boiler: Tag:generator:type=boiler
     generator:type=combined_cycle: Tag:generator:type=combined cycle
     generator:type=francis_turbine: Tag:generator:type=francis turbine
     generator:type=boiler: Tag:generator:type=boiler
     generator:type=combined_cycle: Tag:generator:type=combined cycle
     generator:type=francis_turbine: Tag:generator:type=francis turbine
@@ -8305,6 +11104,7 @@ en:
     generator:type=horizontal_axis: Tag:generator:type=horizontal axis
     generator:type=hydrodynamic_screw: Tag:generator:type=hydrodynamic screw
     generator:type=kaplan_turbine: Tag:generator:type=kaplan turbine
     generator:type=horizontal_axis: Tag:generator:type=horizontal axis
     generator:type=hydrodynamic_screw: Tag:generator:type=hydrodynamic screw
     generator:type=kaplan_turbine: Tag:generator:type=kaplan turbine
+    generator:type=lithium_ion: Tag:generator:type=lithium ion
     generator:type=pelton_turbine: Tag:generator:type=pelton turbine
     generator:type=reciprocating_engine: Tag:generator:type=reciprocating engine
     generator:type=solar_photovoltaic_panel: Tag:generator:type=solar photovoltaic
     generator:type=pelton_turbine: Tag:generator:type=pelton turbine
     generator:type=reciprocating_engine: Tag:generator:type=reciprocating engine
     generator:type=solar_photovoltaic_panel: Tag:generator:type=solar photovoltaic
@@ -8313,11 +11113,26 @@ en:
     generator:type=steam_generator: Tag:generator:type=steam generator
     generator:type=steam_turbine: Tag:generator:type=steam turbine
     generator:type=vertical_axis: Tag:generator:type=vertical axis
     generator:type=steam_generator: Tag:generator:type=steam generator
     generator:type=steam_turbine: Tag:generator:type=steam turbine
     generator:type=vertical_axis: Tag:generator:type=vertical axis
+    generator:type=water_wheel: Tag:generator:type=water wheel
     generator:type=zuppinger_water_wheel: Tag:generator:type=zuppinger water wheel
     generator:type=zuppinger_water_wheel: Tag:generator:type=zuppinger water wheel
+    genus=Acer: Tag:genus=Acer
+    geological=columnar_jointing: Tag:geological=columnar jointing
+    geological=fault: Tag:geological=fault
+    geological=giants_kettle: Tag:geological=giants kettle
+    geological=glacial_erratic: Tag:geological=glacial erratic
+    geological=hoodoo: Tag:geological=hoodoo
+    geological=meteor_crater: Tag:geological=meteor crater
     geological=moraine: Tag:geological=moraine
     geological=outcrop: Tag:geological=outcrop
     geological=palaeontological_site: Tag:geological=palaeontological site
     geological=moraine: Tag:geological=moraine
     geological=outcrop: Tag:geological=outcrop
     geological=palaeontological_site: Tag:geological=palaeontological site
+    geological=rock_glacier: Tag:geological=rock glacier
+    geological=volcanic_caldera: Tag:geological=volcanic caldera
+    geological=volcanic_caldera_rim: Tag:geological=volcanic caldera rim
+    geological=volcanic_lava_field: Tag:geological=volcanic lava field
+    geological=volcanic_lava_flow: Tag:geological=volcanic lava flow
+    geological=volcanic_vent: Tag:geological=volcanic vent
     glacier:type=mountain: Tag:glacier:type=mountain
     glacier:type=mountain: Tag:glacier:type=mountain
+    glacier:type=rock: Tag:glacier:type=rock
     glideslope=yes: Tag:glideslope=yes
     golf=bunker: Tag:golf=bunker
     golf=cartpath: Tag:golf=cartpath
     glideslope=yes: Tag:glideslope=yes
     golf=bunker: Tag:golf=bunker
     golf=cartpath: Tag:golf=cartpath
@@ -8337,11 +11152,20 @@ en:
     government=aerospace: Tag:government=aerospace
     government=archive: Tag:government=archive
     government=audit: Tag:government=audit
     government=aerospace: Tag:government=aerospace
     government=archive: Tag:government=archive
     government=audit: Tag:government=audit
+    government=bailiff: Tag:government=bailiff
     government=border_control: Tag:government=border control
     government=border_control: Tag:government=border control
+    government=building_control: Tag:government=building control
+    government=building_inspection: Tag:government=building inspection
     government=cadaster: Tag:government=cadaster
     government=cadaster: Tag:government=cadaster
+    government=culture: Tag:government=culture
     government=customs: Tag:government=customs
     government=data_protection: Tag:government=data protection
     government=customs: Tag:government=customs
     government=data_protection: Tag:government=data protection
+    government=education: Tag:government=education
+    government=emergency: Tag:government=emergency
     government=healthcare: Tag:government=healthcare
     government=healthcare: Tag:government=healthcare
+    government=heritage: Tag:government=heritage
+    government=it: Tag:government=it
+    government=justice: Tag:government=justice
     government=legislative: Tag:government=legislative
     government=ministry: Tag:government=ministry
     government=parliament: Tag:government=parliament
     government=legislative: Tag:government=legislative
     government=ministry: Tag:government=ministry
     government=parliament: Tag:government=parliament
@@ -8349,10 +11173,17 @@ en:
     government=register_office: Tag:government=register office
     government=statistics: Tag:government=statistics
     government=tax: Tag:government=tax
     government=register_office: Tag:government=register office
     government=statistics: Tag:government=statistics
     government=tax: Tag:government=tax
+    government=transportation: Tag:government=transportation
     government=youth_welfare_department: Tag:government=youth welfare department
     grass=amenity_grassland: Tag:grass=amenity grassland
     grit_bin: Tag:grit bin
     government=youth_welfare_department: Tag:government=youth welfare department
     grass=amenity_grassland: Tag:grass=amenity grassland
     grit_bin: Tag:grit bin
+    guest_house=agritourism: Tag:guest house=agritourism
+    guest_house=albergue: Tag:guest house=albergue
+    guest_house=bed_and_breakfast: Tag:guest house=bed and breakfast
+    guest_house=kontrakan: Tag:guest house=kontrakan
+    guest_house=student_accomodation: Tag:guest house=student accomodation
     guidepost=simple: Tag:guidepost=simple
     guidepost=simple: Tag:guidepost=simple
+    handle=crank: Tag:handle=crank
     handle=lever: Tag:handle=lever
     handle=wheel: Tag:handle=wheel
     harbour:category=RoRo: Tag:harbour:category=RoRo
     handle=lever: Tag:handle=lever
     handle=wheel: Tag:handle=wheel
     harbour:category=RoRo: Tag:harbour:category=RoRo
@@ -8373,42 +11204,154 @@ en:
     harbour:category=yacht: Tag:harbour:category=yacht
     harbour=marina: Tag:harbour=marina
     hazard=animal_crossing: Tag:hazard=animal crossing
     harbour:category=yacht: Tag:harbour:category=yacht
     harbour=marina: Tag:harbour=marina
     hazard=animal_crossing: Tag:hazard=animal crossing
+    hazard=archery_range: Tag:hazard=archery range
+    hazard=avalanche: Tag:hazard=avalanche
+    hazard=biohazard: Tag:hazard=biohazard
     hazard=bump: Tag:hazard=bump
     hazard=children: Tag:hazard=children
     hazard=contamination: Tag:hazard=contamination
     hazard=curve: Tag:hazard=curve
     hazard=curves: Tag:hazard=curves
     hazard=cyclists: Tag:hazard=cyclists
     hazard=bump: Tag:hazard=bump
     hazard=children: Tag:hazard=children
     hazard=contamination: Tag:hazard=contamination
     hazard=curve: Tag:hazard=curve
     hazard=curves: Tag:hazard=curves
     hazard=cyclists: Tag:hazard=cyclists
+    hazard=damaged_road: Tag:hazard=damaged road
     hazard=dangerous_junction: Tag:hazard=dangerous junction
     hazard=dip: Tag:hazard=dip
     hazard=dangerous_junction: Tag:hazard=dangerous junction
     hazard=dip: Tag:hazard=dip
+    hazard=electricity: Tag:hazard=electricity
+    hazard=emergency_vehicles: Tag:hazard=emergency vehicles
     hazard=falling_rocks: Tag:hazard=falling rocks
     hazard=falling_rocks: Tag:hazard=falling rocks
+    hazard=flood: Tag:hazard=flood
+    hazard=flooding: Tag:hazard=flooding
+    hazard=fog: Tag:hazard=fog
+    hazard=frail_pedestrians: Tag:hazard=frail pedestrians
     hazard=frost_heave: Tag:hazard=frost heave
     hazard=frost_heave: Tag:hazard=frost heave
+    hazard=ground_clearance: Tag:hazard=ground clearance
+    hazard=hole: Tag:hazard=hole
     hazard=horse_riders: Tag:hazard=horse riders
     hazard=ice: Tag:hazard=ice
     hazard=horse_riders: Tag:hazard=horse riders
     hazard=ice: Tag:hazard=ice
+    hazard=illegal_crossing: Tag:hazard=illegal crossing
     hazard=landslide: Tag:hazard=landslide
     hazard=landslide: Tag:hazard=landslide
+    hazard=leeches: Tag:hazard=leeches
     hazard=loose_gravel: Tag:hazard=loose gravel
     hazard=low_flying_aircraft: Tag:hazard=low flying aircraft
     hazard=minefield: Tag:hazard=minefield
     hazard=nuclear: Tag:hazard=nuclear
     hazard=pedestrians: Tag:hazard=pedestrians
     hazard=queues_likely: Tag:hazard=queues likely
     hazard=loose_gravel: Tag:hazard=loose gravel
     hazard=low_flying_aircraft: Tag:hazard=low flying aircraft
     hazard=minefield: Tag:hazard=minefield
     hazard=nuclear: Tag:hazard=nuclear
     hazard=pedestrians: Tag:hazard=pedestrians
     hazard=queues_likely: Tag:hazard=queues likely
+    hazard=quicksand: Tag:hazard=quicksand
+    hazard=road_narrows: Tag:hazard=road narrows
+    hazard=roadworks: Tag:hazard=roadworks
+    hazard=roundabout: Tag:hazard=roundabout
     hazard=school_zone: Tag:hazard=school zone
     hazard=shooting_range: Tag:hazard=shooting range
     hazard=side_winds: Tag:hazard=side winds
     hazard=school_zone: Tag:hazard=school zone
     hazard=shooting_range: Tag:hazard=shooting range
     hazard=side_winds: Tag:hazard=side winds
+    hazard=silver_zone: Tag:hazard=silver zone
     hazard=slippery: Tag:hazard=slippery
     hazard=slippery: Tag:hazard=slippery
+    hazard=traffic_signals: Tag:hazard=traffic signals
     hazard=turn: Tag:hazard=turn
     hazard=turns: Tag:hazard=turns
     hazard=unexploded_ordnance: Tag:hazard=unexploded ordnance
     hazard=turn: Tag:hazard=turn
     hazard=turns: Tag:hazard=turns
     hazard=unexploded_ordnance: Tag:hazard=unexploded ordnance
+    hazard=washout: Tag:hazard=washout
     hazard_prone=yes: Tag:hazard prone=yes
     hazard_type=avalanche: Tag:hazard type=avalanche
     hazard_type=flood: Tag:hazard type=flood
     hazard_type=landslide: Tag:hazard type=landslide
     hazmat:water=permissive: Tag:hazmat:water=permissive
     hazard_prone=yes: Tag:hazard prone=yes
     hazard_type=avalanche: Tag:hazard type=avalanche
     hazard_type=flood: Tag:hazard type=flood
     hazard_type=landslide: Tag:hazard type=landslide
     hazmat:water=permissive: Tag:hazmat:water=permissive
+    headlight=required: Tag:headlight=required
+    health_facility:type=office: Tag:health facility:type=office
     healthcare:speciality=abortion: Tag:healthcare:speciality=abortion
     healthcare:speciality=abortion: Tag:healthcare:speciality=abortion
+    healthcare:speciality=allergology: Tag:healthcare:speciality=allergology
+    healthcare:speciality=anaesthetics: Tag:healthcare:speciality=anaesthetics
+    healthcare:speciality=analytic: Tag:healthcare:speciality=analytic
+    healthcare:speciality=animal-assisted: Tag:healthcare:speciality=animal-assisted
+    healthcare:speciality=behavior: Tag:healthcare:speciality=behavior
+    healthcare:speciality=biochemistry: Tag:healthcare:speciality=biochemistry
+    healthcare:speciality=biological_haematology: Tag:healthcare:speciality=biological
+      haematology
+    healthcare:speciality=biology: Tag:healthcare:speciality=biology
+    healthcare:speciality=blood_check: Tag:healthcare:speciality=blood check
+    healthcare:speciality=body: Tag:healthcare:speciality=body
+    healthcare:speciality=cardiac_surgery: Tag:healthcare:speciality=cardiac surgery
+    healthcare:speciality=cardiology: Tag:healthcare:speciality=cardiology
+    healthcare:speciality=cardiothoracic_surgery: Tag:healthcare:speciality=cardiothoracic
+      surgery
+    healthcare:speciality=child_psychiatry: Tag:healthcare:speciality=child psychiatry
+    healthcare:speciality=chiropractic: Tag:healthcare:speciality=chiropractic
+    healthcare:speciality=clinical_pathology: Tag:healthcare:speciality=clinical pathology
+    healthcare:speciality=community: Tag:healthcare:speciality=community
+    healthcare:speciality=dental_oral_maxillo_facial_surgery: Tag:healthcare:speciality=dental
+      oral maxillo facial surgery
+    healthcare:speciality=depth: Tag:healthcare:speciality=depth
+    healthcare:speciality=dermatology: Tag:healthcare:speciality=dermatology
+    healthcare:speciality=dermatovenereology: Tag:healthcare:speciality=dermatovenereology
+    healthcare:speciality=diagnostic_radiology: Tag:healthcare:speciality=diagnostic
+      radiology
+    healthcare:speciality=emergency: Tag:healthcare:speciality=emergency
+    healthcare:speciality=endocrinology: Tag:healthcare:speciality=endocrinology
+    healthcare:speciality=expressive: Tag:healthcare:speciality=expressive
+    healthcare:speciality=fertility: Tag:healthcare:speciality=fertility
+    healthcare:speciality=gastroenterological_surgery: Tag:healthcare:speciality=gastroenterological
+      surgery
+    healthcare:speciality=gastroenterology: Tag:healthcare:speciality=gastroenterology
+    healthcare:speciality=general: Tag:healthcare:speciality=general
+    healthcare:speciality=geriatrics: Tag:healthcare:speciality=geriatrics
+    healthcare:speciality=gynaecology: Tag:healthcare:speciality=gynaecology
+    healthcare:speciality=haematology: Tag:healthcare:speciality=haematology
+    healthcare:speciality=hepatology: Tag:healthcare:speciality=hepatology
+    healthcare:speciality=humanistic: Tag:healthcare:speciality=humanistic
+    healthcare:speciality=immunology: Tag:healthcare:speciality=immunology
+    healthcare:speciality=infectious_diseases: Tag:healthcare:speciality=infectious
+      diseases
+    healthcare:speciality=intensive: Tag:healthcare:speciality=intensive
+    healthcare:speciality=internal: Tag:healthcare:speciality=internal
+    healthcare:speciality=maxillofacial_surgery: Tag:healthcare:speciality=maxillofacial
+      surgery
+    healthcare:speciality=microbiology: Tag:healthcare:speciality=microbiology
+    healthcare:speciality=neonatology: Tag:healthcare:speciality=neonatology
+    healthcare:speciality=nephrology: Tag:healthcare:speciality=nephrology
+    healthcare:speciality=neurology: Tag:healthcare:speciality=neurology
+    healthcare:speciality=neurophysiology: Tag:healthcare:speciality=neurophysiology
+    healthcare:speciality=neuropsychiatry: Tag:healthcare:speciality=neuropsychiatry
+    healthcare:speciality=neurosurgery: Tag:healthcare:speciality=neurosurgery
+    healthcare:speciality=nuclear: Tag:healthcare:speciality=nuclear
+    healthcare:speciality=occupational: Tag:healthcare:speciality=occupational
+    healthcare:speciality=oncology: Tag:healthcare:speciality=oncology
+    healthcare:speciality=ophthalmology: Tag:healthcare:speciality=ophthalmology
+    healthcare:speciality=orthodontics: Tag:healthcare:speciality=orthodontics
+    healthcare:speciality=orthopaedics: Tag:healthcare:speciality=orthopaedics
+    healthcare:speciality=otolaryngology: Tag:healthcare:speciality=otolaryngology
+    healthcare:speciality=paediatric_surgery: Tag:healthcare:speciality=paediatric
+      surgery
+    healthcare:speciality=paediatrics: Tag:healthcare:speciality=paediatrics
+    healthcare:speciality=palliative: Tag:healthcare:speciality=palliative
+    healthcare:speciality=pathology: Tag:healthcare:speciality=pathology
+    healthcare:speciality=pharmacology: Tag:healthcare:speciality=pharmacology
+    healthcare:speciality=physiatry: Tag:healthcare:speciality=physiatry
+    healthcare:speciality=plastic_surgery: Tag:healthcare:speciality=plastic surgery
+    healthcare:speciality=podiatry: Tag:healthcare:speciality=podiatry
+    healthcare:speciality=proctology: Tag:healthcare:speciality=proctology
+    healthcare:speciality=psychiatry: Tag:healthcare:speciality=psychiatry
+    healthcare:speciality=pulmonology: Tag:healthcare:speciality=pulmonology
+    healthcare:speciality=radiology: Tag:healthcare:speciality=radiology
+    healthcare:speciality=radiotherapy: Tag:healthcare:speciality=radiotherapy
+    healthcare:speciality=rheumatology: Tag:healthcare:speciality=rheumatology
+    healthcare:speciality=schema: Tag:healthcare:speciality=schema
+    healthcare:speciality=socio: Tag:healthcare:speciality=socio
+    healthcare:speciality=stomatology: Tag:healthcare:speciality=stomatology
+    healthcare:speciality=surgery: Tag:healthcare:speciality=surgery
+    healthcare:speciality=surgical_oncology: Tag:healthcare:speciality=surgical oncology
+    healthcare:speciality=systemic: Tag:healthcare:speciality=systemic
+    healthcare:speciality=thoracic_surgery: Tag:healthcare:speciality=thoracic surgery
+    healthcare:speciality=transplant: Tag:healthcare:speciality=transplant
+    healthcare:speciality=trauma: Tag:healthcare:speciality=trauma
+    healthcare:speciality=tropical: Tag:healthcare:speciality=tropical
+    healthcare:speciality=urology: Tag:healthcare:speciality=urology
     healthcare:speciality=vaccination: Tag:healthcare:speciality=vaccination
     healthcare:speciality=vaccination: Tag:healthcare:speciality=vaccination
+    healthcare:speciality=vascular_surgery: Tag:healthcare:speciality=vascular surgery
+    healthcare:speciality=venereology: Tag:healthcare:speciality=venereology
     healthcare=alternative: Tag:healthcare=alternative
     healthcare=audiologist: Tag:healthcare=audiologist
     healthcare=birthing_center: Tag:healthcare=birthing center
     healthcare=alternative: Tag:healthcare=alternative
     healthcare=audiologist: Tag:healthcare=audiologist
     healthcare=birthing_center: Tag:healthcare=birthing center
+    healthcare=birthing_centre: Tag:healthcare=birthing centre
     healthcare=blood_bank: Tag:healthcare=blood bank
     healthcare=blood_donation: Tag:healthcare=blood donation
     healthcare=centre: Tag:healthcare=centre
     healthcare=blood_bank: Tag:healthcare=blood bank
     healthcare=blood_donation: Tag:healthcare=blood donation
     healthcare=centre: Tag:healthcare=centre
@@ -8418,6 +11361,7 @@ en:
     healthcare=dentist: Tag:healthcare=dentist
     healthcare=dialysis: Tag:healthcare=dialysis
     healthcare=doctor: Tag:healthcare=doctor
     healthcare=dentist: Tag:healthcare=dentist
     healthcare=dialysis: Tag:healthcare=dialysis
     healthcare=doctor: Tag:healthcare=doctor
+    healthcare=health_post: Tag:healthcare=health post
     healthcare=hospice: Tag:healthcare=hospice
     healthcare=hospital: Tag:healthcare=hospital
     healthcare=laboratory: Tag:healthcare=laboratory
     healthcare=hospice: Tag:healthcare=hospice
     healthcare=hospital: Tag:healthcare=hospital
     healthcare=laboratory: Tag:healthcare=laboratory
@@ -8432,17 +11376,24 @@ en:
     healthcare=podiatrist: Tag:healthcare=podiatrist
     healthcare=psychotherapist: Tag:healthcare=psychotherapist
     healthcare=rehabilitation: Tag:healthcare=rehabilitation
     healthcare=podiatrist: Tag:healthcare=podiatrist
     healthcare=psychotherapist: Tag:healthcare=psychotherapist
     healthcare=rehabilitation: Tag:healthcare=rehabilitation
+    healthcare=sample_collection: Tag:healthcare=sample collection
     healthcare=speech_therapist: Tag:healthcare=speech therapist
     healthcare=vaccination_centre: Tag:healthcare=vaccination centre
     healthcare=speech_therapist: Tag:healthcare=speech therapist
     healthcare=vaccination_centre: Tag:healthcare=vaccination centre
+    healthcare=yes: Tag:healthcare=yes
+    hedge=hedge_bank: Tag:hedge=hedge bank
+    heritage:operator=BLfD: Tag:heritage:operator=BLfD
+    heritage:operator=kons: Tag:heritage:operator=kons
+    heritage:operator=nrhp: Tag:heritage:operator=nrhp
     hgv=discouraged: Tag:hgv=discouraged
     hgv=discouraged: Tag:hgv=discouraged
+    hgv=no: Tag:hgv=no
+    hgv=yes: Tag:hgv=yes
     highway=Bus_guideway: Tag:highway=Bus guideway
     highway=abandoned: Tag:highway=abandoned
     highway=access: Tag:highway=access
     highway=Bus_guideway: Tag:highway=Bus guideway
     highway=abandoned: Tag:highway=abandoned
     highway=access: Tag:highway=access
-    highway=bazaar: Tag:highway=bazaar
     highway=bridleway: Tag:highway=bridleway
     highway=bus_guideway: Tag:highway=bus guideway
     highway=bus_stop: Tag:highway=bus stop
     highway=bridleway: Tag:highway=bridleway
     highway=bus_guideway: Tag:highway=bus guideway
     highway=bus_stop: Tag:highway=bus stop
-    highway=byway: Tag:highway=byway
+    highway=busway: Tag:highway=busway
     highway=cattle_grid: Tag:highway=cattle grid
     highway=construction: Tag:highway=construction
     highway=corridor: Tag:highway=corridor
     highway=cattle_grid: Tag:highway=cattle grid
     highway=construction: Tag:highway=construction
     highway=corridor: Tag:highway=corridor
@@ -8458,9 +11409,6 @@ en:
     highway=ford: Tag:highway=ford
     highway=gate: Tag:highway=gate
     highway=give_way: Tag:highway=give way
     highway=ford: Tag:highway=ford
     highway=gate: Tag:highway=gate
     highway=give_way: Tag:highway=give way
-    highway=green_lane: Tag:highway=green lane
-    highway=incline: Tag:highway=incline
-    highway=incline_steep: Tag:highway=incline steep
     highway=living_street: Tag:highway=living street
     highway=milestone: Tag:highway=milestone
     highway=mini_roundabout: Tag:highway=mini roundabout
     highway=living_street: Tag:highway=living street
     highway=milestone: Tag:highway=milestone
     highway=mini_roundabout: Tag:highway=mini roundabout
@@ -8477,6 +11425,7 @@ en:
     highway=platform: Tag:highway=platform
     highway=primary: Tag:highway=primary
     highway=primary_link: Tag:highway=primary link
     highway=platform: Tag:highway=platform
     highway=primary: Tag:highway=primary
     highway=primary_link: Tag:highway=primary link
+    highway=priority: Tag:highway=priority
     highway=proposed: Tag:highway=proposed
     highway=raceway: Tag:highway=raceway
     highway=razed: Tag:highway=razed
     highway=proposed: Tag:highway=proposed
     highway=raceway: Tag:highway=raceway
     highway=razed: Tag:highway=razed
@@ -8487,11 +11436,9 @@ en:
     highway=secondary_link: Tag:highway=secondary link
     highway=service: Tag:highway=service
     highway=services: Tag:highway=services
     highway=secondary_link: Tag:highway=secondary link
     highway=service: Tag:highway=service
     highway=services: Tag:highway=services
-    highway=skyway: Tag:highway=skyway
     highway=speed_camera: Tag:highway=speed camera
     highway=speed_display: Tag:highway=speed display
     highway=steps: Tag:highway=steps
     highway=speed_camera: Tag:highway=speed camera
     highway=speed_display: Tag:highway=speed display
     highway=steps: Tag:highway=steps
-    highway=stile: Tag:highway=stile
     highway=stop: Tag:highway=stop
     highway=street_lamp: Tag:highway=street lamp
     highway=tertiary: Tag:highway=tertiary
     highway=stop: Tag:highway=stop
     highway=street_lamp: Tag:highway=street lamp
     highway=tertiary: Tag:highway=tertiary
@@ -8513,8 +11460,10 @@ en:
     highway=via_ferrata: Tag:highway=via ferrata
     highway=yes: Tag:highway=yes
     highway=yield: Tag:highway=yield
     highway=via_ferrata: Tag:highway=via ferrata
     highway=yes: Tag:highway=yes
     highway=yield: Tag:highway=yield
+    historic:railway=station: Tag:historic:railway=station
     historic=abandoned: Tag:historic=abandoned
     historic=aircraft: Tag:historic=aircraft
     historic=abandoned: Tag:historic=abandoned
     historic=aircraft: Tag:historic=aircraft
+    historic=anchor: Tag:historic=anchor
     historic=aqueduct: Tag:historic=aqueduct
     historic=archaeological_site: Tag:historic=archaeological site
     historic=battlefield: Tag:historic=battlefield
     historic=aqueduct: Tag:historic=aqueduct
     historic=archaeological_site: Tag:historic=archaeological site
     historic=battlefield: Tag:historic=battlefield
@@ -8524,48 +11473,65 @@ en:
     historic=cannon: Tag:historic=cannon
     historic=castle: Tag:historic=castle
     historic=castle_wall: Tag:historic=castle wall
     historic=cannon: Tag:historic=cannon
     historic=castle: Tag:historic=castle
     historic=castle_wall: Tag:historic=castle wall
+    historic=cemetery: Tag:historic=cemetery
     historic=charcoal_pile: Tag:historic=charcoal pile
     historic=church: Tag:historic=church
     historic=city_gate: Tag:historic=city gate
     historic=city_wall: Tag:historic=city wall
     historic=citywalls: Tag:historic=citywalls
     historic=charcoal_pile: Tag:historic=charcoal pile
     historic=church: Tag:historic=church
     historic=city_gate: Tag:historic=city gate
     historic=city_wall: Tag:historic=city wall
     historic=citywalls: Tag:historic=citywalls
+    historic=creamery: Tag:historic=creamery
     historic=district: Tag:historic=district
     historic=district: Tag:historic=district
-    historic=event: Tag:historic=event
     historic=farm: Tag:historic=farm
     historic=flood_mark: Tag:historic=flood mark
     historic=farm: Tag:historic=farm
     historic=flood_mark: Tag:historic=flood mark
+    historic=folly: Tag:historic=folly
     historic=fort: Tag:historic=fort
     historic=gallows: Tag:historic=gallows
     historic=heritage: Tag:historic=heritage
     historic=fort: Tag:historic=fort
     historic=gallows: Tag:historic=gallows
     historic=heritage: Tag:historic=heritage
+    historic=high_cross: Tag:historic=high cross
     historic=highwater_mark: Tag:historic=highwater mark
     historic=highwater_mark: Tag:historic=highwater mark
+    historic=hollow_way: Tag:historic=hollow way
     historic=house: Tag:historic=house
     historic=locomotive: Tag:historic=locomotive
     historic=manor: Tag:historic=manor
     historic=house: Tag:historic=house
     historic=locomotive: Tag:historic=locomotive
     historic=manor: Tag:historic=manor
+    historic=market_cross: Tag:historic=market cross
+    historic=martello_tower: Tag:historic=martello tower
+    historic=mass_path: Tag:historic=mass path
     historic=memorial: Tag:historic=memorial
     historic=memorial: Tag:historic=memorial
+    historic=meteor_crater: Tag:historic=meteor crater
     historic=milestone: Tag:historic=milestone
     historic=mine: Tag:historic=mine
     historic=mine_shaft: Tag:historic=mine shaft
     historic=milestone: Tag:historic=milestone
     historic=mine: Tag:historic=mine
     historic=mine_shaft: Tag:historic=mine shaft
+    historic=missile: Tag:historic=missile
     historic=monastery: Tag:historic=monastery
     historic=monument: Tag:historic=monument
     historic=monastery: Tag:historic=monastery
     historic=monument: Tag:historic=monument
+    historic=mosque: Tag:historic=mosque
+    historic=ogham_stone: Tag:historic=ogham stone
     historic=optical_telegraph: Tag:historic=optical telegraph
     historic=pa: Tag:historic=pa
     historic=paleontological_site: Tag:historic=paleontological site
     historic=pillory: Tag:historic=pillory
     historic=railway_car: Tag:historic=railway car
     historic=rampart: Tag:historic=rampart
     historic=optical_telegraph: Tag:historic=optical telegraph
     historic=pa: Tag:historic=pa
     historic=paleontological_site: Tag:historic=paleontological site
     historic=pillory: Tag:historic=pillory
     historic=railway_car: Tag:historic=railway car
     historic=rampart: Tag:historic=rampart
+    historic=road: Tag:historic=road
     historic=ruins: Tag:historic=ruins
     historic=rune_stone: Tag:historic=rune stone
     historic=shieling: Tag:historic=shieling
     historic=ship: Tag:historic=ship
     historic=ruins: Tag:historic=ruins
     historic=rune_stone: Tag:historic=rune stone
     historic=shieling: Tag:historic=shieling
     historic=ship: Tag:historic=ship
+    historic=stećak: Tag:historic=stećak
+    historic=stećak_necropolis: Tag:historic=stećak necropolis
     historic=stone: Tag:historic=stone
     historic=tank: Tag:historic=tank
     historic=stone: Tag:historic=stone
     historic=tank: Tag:historic=tank
+    historic=temple: Tag:historic=temple
     historic=tomb: Tag:historic=tomb
     historic=tower: Tag:historic=tower
     historic=tree_shrine: Tag:historic=tree shrine
     historic=vehicle: Tag:historic=vehicle
     historic=tomb: Tag:historic=tomb
     historic=tower: Tag:historic=tower
     historic=tree_shrine: Tag:historic=tree shrine
     historic=vehicle: Tag:historic=vehicle
+    historic=venta: Tag:historic=venta
     historic=wayside_chapel: Tag:historic=wayside chapel
     historic=wayside_cross: Tag:historic=wayside cross
     historic=wayside_shrine: Tag:historic=wayside shrine
     historic=wreck: Tag:historic=wreck
     historic=wayside_chapel: Tag:historic=wayside chapel
     historic=wayside_cross: Tag:historic=wayside cross
     historic=wayside_shrine: Tag:historic=wayside shrine
     historic=wreck: Tag:historic=wreck
+    historic=yes: Tag:historic=yes
     holding_position:type=ILS: Tag:holding position:type=ILS
     holding_position:type=intermediate: Tag:holding position:type=intermediate
     holding_position:type=runway: Tag:holding position:type=runway
     holding_position:type=ILS: Tag:holding position:type=ILS
     holding_position:type=intermediate: Tag:holding position:type=intermediate
     holding_position:type=runway: Tag:holding position:type=runway
@@ -8573,39 +11539,63 @@ en:
     holding_position=intermediate: Tag:holding position=intermediate
     holding_position=runway: Tag:holding position=runway
     horse=designated: Tag:horse=designated
     holding_position=intermediate: Tag:holding position=intermediate
     holding_position=runway: Tag:holding position=runway
     horse=designated: Tag:horse=designated
+    horse=dismount: Tag:horse=dismount
     house=bungalow: Tag:house=bungalow
     house=detached: Tag:house=detached
     house=bungalow: Tag:house=bungalow
     house=detached: Tag:house=detached
+    house=link-detached: Tag:house=link-detached
+    house=maisonette: Tag:house=maisonette
     house=semi-detached: Tag:house=semi-detached
     house=terrace: Tag:house=terrace
     house=terraced: Tag:house=terraced
     house=semi-detached: Tag:house=semi-detached
     house=terrace: Tag:house=terrace
     house=terraced: Tag:house=terraced
+    hov=yes: Tag:hov=yes
     hunting=raised_hide: Tag:hunting=raised hide
     hunting=raised_hide: Tag:hunting=raised hide
+    ice_skates=kluning: Tag:ice skates=kluning
+    incline=down: Tag:incline=down
+    incline=up: Tag:incline=up
+    incline=up/down: Tag:incline=up/down
     indoor=area: Tag:indoor=area
     indoor=corridor: Tag:indoor=corridor
     indoor=door: Tag:indoor=door
     indoor=room: Tag:indoor=room
     indoor=wall: Tag:indoor=wall
     indoor=area: Tag:indoor=area
     indoor=corridor: Tag:indoor=corridor
     indoor=door: Tag:indoor=door
     indoor=room: Tag:indoor=room
     indoor=wall: Tag:indoor=wall
+    indoor=yes: Tag:indoor=yes
     indoormark=beacon: Tag:indoormark=beacon
     indoormark=beacon: Tag:indoormark=beacon
+    industrial=aerospace: Tag:industrial=aerospace
     industrial=aluminium_smelting: Tag:industrial=aluminium smelting
     industrial=aluminium_smelting: Tag:industrial=aluminium smelting
+    industrial=asphalt_plant: Tag:industrial=asphalt plant
     industrial=auto_wrecker: Tag:industrial=auto wrecker
     industrial=bakery: Tag:industrial=bakery
     industrial=brewery: Tag:industrial=brewery
     industrial=auto_wrecker: Tag:industrial=auto wrecker
     industrial=bakery: Tag:industrial=bakery
     industrial=brewery: Tag:industrial=brewery
+    industrial=brickworks: Tag:industrial=brickworks
     industrial=brickyard: Tag:industrial=brickyard
     industrial=brickyard: Tag:industrial=brickyard
+    industrial=communication: Tag:industrial=communication
+    industrial=concrete_plant: Tag:industrial=concrete plant
+    industrial=construction_company: Tag:industrial=construction company
+    industrial=data_centre: Tag:industrial=data centre
     industrial=depot: Tag:industrial=depot
     industrial=distributor: Tag:industrial=distributor
     industrial=factory: Tag:industrial=factory
     industrial=fish_farm: Tag:industrial=fish farm
     industrial=food_industry: Tag:industrial=food industry
     industrial=depot: Tag:industrial=depot
     industrial=distributor: Tag:industrial=distributor
     industrial=factory: Tag:industrial=factory
     industrial=fish_farm: Tag:industrial=fish farm
     industrial=food_industry: Tag:industrial=food industry
+    industrial=food_processing: Tag:industrial=food processing
     industrial=furniture: Tag:industrial=furniture
     industrial=furniture: Tag:industrial=furniture
+    industrial=gas: Tag:industrial=gas
     industrial=grinding_mill: Tag:industrial=grinding mill
     industrial=heating_station: Tag:industrial=heating station
     industrial=ice_factory: Tag:industrial=ice factory
     industrial=grinding_mill: Tag:industrial=grinding mill
     industrial=heating_station: Tag:industrial=heating station
     industrial=ice_factory: Tag:industrial=ice factory
+    industrial=integrated_circuit: Tag:industrial=integrated circuit
     industrial=machine_shop: Tag:industrial=machine shop
     industrial=machine_shop: Tag:industrial=machine shop
+    industrial=metal_processing: Tag:industrial=metal processing
     industrial=mine: Tag:industrial=mine
     industrial=mobile_equipment: Tag:industrial=mobile equipment
     industrial=oil: Tag:industrial=oil
     industrial=oil_mill: Tag:industrial=oil mill
     industrial=port: Tag:industrial=port
     industrial=mine: Tag:industrial=mine
     industrial=mobile_equipment: Tag:industrial=mobile equipment
     industrial=oil: Tag:industrial=oil
     industrial=oil_mill: Tag:industrial=oil mill
     industrial=port: Tag:industrial=port
+    industrial=quarry: Tag:industrial=quarry
+    industrial=recycling: Tag:industrial=recycling
+    industrial=refinery: Tag:industrial=refinery
     industrial=rice_mill: Tag:industrial=rice mill
     industrial=rice_mill: Tag:industrial=rice mill
+    industrial=rocket_engine_test: Tag:industrial=rocket engine test
     industrial=salt_pond: Tag:industrial=salt pond
     industrial=sawmill: Tag:industrial=sawmill
     industrial=scrap_yard: Tag:industrial=scrap yard
     industrial=salt_pond: Tag:industrial=salt pond
     industrial=sawmill: Tag:industrial=sawmill
     industrial=scrap_yard: Tag:industrial=scrap yard
@@ -8615,6 +11605,7 @@ en:
     industrial=warehouse: Tag:industrial=warehouse
     industrial=well_cluster: Tag:industrial=well cluster
     industrial=wellsite: Tag:industrial=wellsite
     industrial=warehouse: Tag:industrial=warehouse
     industrial=well_cluster: Tag:industrial=well cluster
     industrial=wellsite: Tag:industrial=wellsite
+    industrial=winery: Tag:industrial=winery
     information=audioguide: Tag:information=audioguide
     information=board: Tag:information=board
     information=finger-post: Tag:information=finger-post
     information=audioguide: Tag:information=audioguide
     information=board: Tag:information=board
     information=finger-post: Tag:information=finger-post
@@ -8623,10 +11614,20 @@ en:
     information=guidepost: Tag:information=guidepost
     information=map: Tag:information=map
     information=office: Tag:information=office
     information=guidepost: Tag:information=guidepost
     information=map: Tag:information=map
     information=office: Tag:information=office
+    information=route_marker: Tag:information=route marker
+    information=sign: Tag:information=sign
+    information=stele: Tag:information=stele
     information=tactile_map: Tag:information=tactile map
     information=tactile_model: Tag:information=tactile model
     information=terminal: Tag:information=terminal
     information=visitor_centre: Tag:information=visitor centre
     information=tactile_map: Tag:information=tactile map
     information=tactile_model: Tag:information=tactile model
     information=terminal: Tag:information=terminal
     information=visitor_centre: Tag:information=visitor centre
+    inlet=bell_mouth: Tag:inlet=bell mouth
+    inlet=direct: Tag:inlet=direct
+    inlet=grate: Tag:inlet=grate
+    inlet=kerb_grate: Tag:inlet=kerb grate
+    inlet=kerb_opening: Tag:inlet=kerb opening
+    inlet=screen: Tag:inlet=screen
+    inlet=valve: Tag:inlet=valve
     insurance=health: Tag:insurance=health
     internet_access=no: Tag:internet access=no
     internet_access=terminal: Tag:internet access=terminal
     insurance=health: Tag:insurance=health
     internet_access=no: Tag:internet access=no
     internet_access=terminal: Tag:internet access=terminal
@@ -8635,6 +11636,8 @@ en:
     internet_access=yes: Tag:internet access=yes
     irrigation=pivot: Tag:irrigation=pivot
     irrigation=yes: Tag:irrigation=yes
     internet_access=yes: Tag:internet access=yes
     irrigation=pivot: Tag:irrigation=pivot
     irrigation=yes: Tag:irrigation=yes
+    is_legal_sidepath: Tag:is legal sidepath
+    jeepney=yes: Tag:jeepney=yes
     jetski:rental=yes: Tag:jetski:rental=yes
     junction=circular: Tag:junction=circular
     junction=crossing: Tag:junction=crossing
     jetski:rental=yes: Tag:jetski:rental=yes
     junction=circular: Tag:junction=circular
     junction=crossing: Tag:junction=crossing
@@ -8642,9 +11645,11 @@ en:
     junction=jughandle: Tag:junction=jughandle
     junction=roundabout: Tag:junction=roundabout
     junction=spui: Tag:junction=spui
     junction=jughandle: Tag:junction=jughandle
     junction=roundabout: Tag:junction=roundabout
     junction=spui: Tag:junction=spui
+    junction=uncontrolled: Tag:junction=uncontrolled
     junction=yes: Tag:junction=yes
     karst=yes: Tag:karst=yes
     landcover=dunes: Tag:landcover=dunes
     junction=yes: Tag:junction=yes
     karst=yes: Tag:karst=yes
     landcover=dunes: Tag:landcover=dunes
+    landcover=flowerbed: Tag:landcover=flowerbed
     landcover=grass: Tag:landcover=grass
     landcover=gravel: Tag:landcover=gravel
     landcover=greenery: Tag:landcover=greenery
     landcover=grass: Tag:landcover=grass
     landcover=gravel: Tag:landcover=gravel
     landcover=greenery: Tag:landcover=greenery
@@ -8678,6 +11683,7 @@ en:
     landmark=windmill: Tag:landmark=windmill
     landmark=windmotor: Tag:landmark=windmotor
     landmark=windsock: Tag:landmark=windsock
     landmark=windmill: Tag:landmark=windmill
     landmark=windmotor: Tag:landmark=windmotor
     landmark=windsock: Tag:landmark=windsock
+    landuse:secondary: Tag:landuse:secondary
     landuse=agriculture: Tag:landuse=agriculture
     landuse=allotments: Tag:landuse=allotments
     landuse=animal_keeping: Tag:landuse=animal keeping
     landuse=agriculture: Tag:landuse=agriculture
     landuse=allotments: Tag:landuse=allotments
     landuse=animal_keeping: Tag:landuse=animal keeping
@@ -8687,6 +11693,7 @@ en:
     landuse=breeding: Tag:landuse=breeding
     landuse=brownfield: Tag:landuse=brownfield
     landuse=building_site: Tag:landuse=building site
     landuse=breeding: Tag:landuse=breeding
     landuse=brownfield: Tag:landuse=brownfield
     landuse=building_site: Tag:landuse=building site
+    landuse=canal: Tag:landuse=canal
     landuse=cemetery: Tag:landuse=cemetery
     landuse=churchyard: Tag:landuse=churchyard
     landuse=civic_admin: Tag:landuse=civic admin
     landuse=cemetery: Tag:landuse=cemetery
     landuse=churchyard: Tag:landuse=churchyard
     landuse=civic_admin: Tag:landuse=civic admin
@@ -8695,36 +11702,46 @@ en:
     landuse=construction: Tag:landuse=construction
     landuse=depot: Tag:landuse=depot
     landuse=education: Tag:landuse=education
     landuse=construction: Tag:landuse=construction
     landuse=depot: Tag:landuse=depot
     landuse=education: Tag:landuse=education
+    landuse=fairground: Tag:landuse=fairground
     landuse=farm: Tag:landuse=farm
     landuse=farmland: Tag:landuse=farmland
     landuse=farmyard: Tag:landuse=farmyard
     landuse=field: Tag:landuse=field
     landuse=farm: Tag:landuse=farm
     landuse=farmland: Tag:landuse=farmland
     landuse=farmyard: Tag:landuse=farmyard
     landuse=field: Tag:landuse=field
+    landuse=fish_pond: Tag:landuse=fish pond
     landuse=fishfarm: Tag:landuse=fishfarm
     landuse=flowerbed: Tag:landuse=flowerbed
     landuse=forest: Tag:landuse=forest
     landuse=fishfarm: Tag:landuse=fishfarm
     landuse=flowerbed: Tag:landuse=flowerbed
     landuse=forest: Tag:landuse=forest
+    landuse=forestry: Tag:landuse=forestry
     landuse=garages: Tag:landuse=garages
     landuse=grass: Tag:landuse=grass
     landuse=grave_yard: Tag:landuse=grave yard
     landuse=garages: Tag:landuse=garages
     landuse=grass: Tag:landuse=grass
     landuse=grave_yard: Tag:landuse=grave yard
+    landuse=greenery: Tag:landuse=greenery
     landuse=greenfield: Tag:landuse=greenfield
     landuse=greenhouse_horticulture: Tag:landuse=greenhouse horticulture
     landuse=harbour: Tag:landuse=harbour
     landuse=greenfield: Tag:landuse=greenfield
     landuse=greenhouse_horticulture: Tag:landuse=greenhouse horticulture
     landuse=harbour: Tag:landuse=harbour
+    landuse=healthcare: Tag:landuse=healthcare
     landuse=highway: Tag:landuse=highway
     landuse=highway: Tag:landuse=highway
+    landuse=house: Tag:landuse=house
     landuse=industrial: Tag:landuse=industrial
     landuse=institutional: Tag:landuse=institutional
     landuse=landfill: Tag:landuse=landfill
     landuse=industrial: Tag:landuse=industrial
     landuse=institutional: Tag:landuse=institutional
     landuse=landfill: Tag:landuse=landfill
+    landuse=livestock: Tag:landuse=livestock
     landuse=logging: Tag:landuse=logging
     landuse=meadow: Tag:landuse=meadow
     landuse=meadow_orchard: Tag:landuse=meadow orchard
     landuse=military: Tag:landuse=military
     landuse=observatory: Tag:landuse=observatory
     landuse=orchard: Tag:landuse=orchard
     landuse=logging: Tag:landuse=logging
     landuse=meadow: Tag:landuse=meadow
     landuse=meadow_orchard: Tag:landuse=meadow orchard
     landuse=military: Tag:landuse=military
     landuse=observatory: Tag:landuse=observatory
     landuse=orchard: Tag:landuse=orchard
+    landuse=paddy: Tag:landuse=paddy
     landuse=peat_cutting: Tag:landuse=peat cutting
     landuse=plant_nursery: Tag:landuse=plant nursery
     landuse=plantation: Tag:landuse=plantation
     landuse=pond: Tag:landuse=pond
     landuse=port: Tag:landuse=port
     landuse=prison: Tag:landuse=prison
     landuse=peat_cutting: Tag:landuse=peat cutting
     landuse=plant_nursery: Tag:landuse=plant nursery
     landuse=plantation: Tag:landuse=plantation
     landuse=pond: Tag:landuse=pond
     landuse=port: Tag:landuse=port
     landuse=prison: Tag:landuse=prison
+    landuse=public_works: Tag:landuse=public works
     landuse=quarry: Tag:landuse=quarry
     landuse=quarry: Tag:landuse=quarry
+    landuse=radio: Tag:landuse=radio
     landuse=railway: Tag:landuse=railway
     landuse=recreation_ground: Tag:landuse=recreation ground
     landuse=religious: Tag:landuse=religious
     landuse=railway: Tag:landuse=railway
     landuse=recreation_ground: Tag:landuse=recreation ground
     landuse=religious: Tag:landuse=religious
@@ -8734,6 +11751,9 @@ en:
     landuse=residential: Tag:landuse=residential
     landuse=retail: Tag:landuse=retail
     landuse=salt_pond: Tag:landuse=salt pond
     landuse=residential: Tag:landuse=residential
     landuse=retail: Tag:landuse=retail
     landuse=salt_pond: Tag:landuse=salt pond
+    landuse=school: Tag:landuse=school
+    landuse=shrubs: Tag:landuse=shrubs
+    landuse=static_caravan: Tag:landuse=static caravan
     landuse=street: Tag:landuse=street
     landuse=traffic_island: Tag:landuse=traffic island
     landuse=trees: Tag:landuse=trees
     landuse=street: Tag:landuse=street
     landuse=traffic_island: Tag:landuse=traffic island
     landuse=trees: Tag:landuse=trees
@@ -8747,7 +11767,10 @@ en:
     landuse=winter_sports: Tag:landuse=winter sports
     landuse=wood: Tag:landuse=wood
     landuse=wood_(Don't_use): Tag:landuse=wood (Don't use)
     landuse=winter_sports: Tag:landuse=winter sports
     landuse=wood: Tag:landuse=wood
     landuse=wood_(Don't_use): Tag:landuse=wood (Don't use)
+    landuse=yes: Tag:landuse=yes
     lane=buffered: Tag:lane=buffered
     lane=buffered: Tag:lane=buffered
+    lane_markings=no: Tag:lane markings=no
+    lawyer=bailiff: Tag:lawyer=bailiff
     lawyer=notary: Tag:lawyer=notary
     leaf_cycle=deciduous: Tag:leaf cycle=deciduous
     leaf_cycle=evergreen: Tag:leaf cycle=evergreen
     lawyer=notary: Tag:lawyer=notary
     leaf_cycle=deciduous: Tag:leaf cycle=deciduous
     leaf_cycle=evergreen: Tag:leaf cycle=evergreen
@@ -8762,23 +11785,28 @@ en:
     leisure=adult_gaming_centre: Tag:leisure=adult gaming centre
     leisure=amusement_arcade: Tag:leisure=amusement arcade
     leisure=arena: Tag:leisure=arena
     leisure=adult_gaming_centre: Tag:leisure=adult gaming centre
     leisure=amusement_arcade: Tag:leisure=amusement arcade
     leisure=arena: Tag:leisure=arena
+    leisure=axe_throwing: Tag:leisure=axe throwing
     leisure=bandstand: Tag:leisure=bandstand
     leisure=barefoot: Tag:leisure=barefoot
     leisure=bathing_place: Tag:leisure=bathing place
     leisure=bbq: Tag:leisure=bbq
     leisure=beach: Tag:leisure=beach
     leisure=beach_resort: Tag:leisure=beach resort
     leisure=bandstand: Tag:leisure=bandstand
     leisure=barefoot: Tag:leisure=barefoot
     leisure=bathing_place: Tag:leisure=bathing place
     leisure=bbq: Tag:leisure=bbq
     leisure=beach: Tag:leisure=beach
     leisure=beach_resort: Tag:leisure=beach resort
+    leisure=bingo_hall: Tag:leisure=bingo hall
     leisure=bird_hide: Tag:leisure=bird hide
     leisure=bleachers: Tag:leisure=bleachers
     leisure=bowling_alley: Tag:leisure=bowling alley
     leisure=casino: Tag:leisure=casino
     leisure=club: Tag:leisure=club
     leisure=bird_hide: Tag:leisure=bird hide
     leisure=bleachers: Tag:leisure=bleachers
     leisure=bowling_alley: Tag:leisure=bowling alley
     leisure=casino: Tag:leisure=casino
     leisure=club: Tag:leisure=club
+    leisure=club_house: Tag:leisure=club house
     leisure=common: Tag:leisure=common
     leisure=dance: Tag:leisure=dance
     leisure=dancing: Tag:leisure=dancing
     leisure=disc_golf_course: Tag:leisure=disc golf course
     leisure=dog_park: Tag:leisure=dog park
     leisure=escape_game: Tag:leisure=escape game
     leisure=common: Tag:leisure=common
     leisure=dance: Tag:leisure=dance
     leisure=dancing: Tag:leisure=dancing
     leisure=disc_golf_course: Tag:leisure=disc golf course
     leisure=dog_park: Tag:leisure=dog park
     leisure=escape_game: Tag:leisure=escape game
+    leisure=events: Tag:leisure=events
+    leisure=festival_grounds: Tag:leisure=festival grounds
     leisure=firepit: Tag:leisure=firepit
     leisure=fishing: Tag:leisure=fishing
     leisure=fitness_centre: Tag:leisure=fitness centre
     leisure=firepit: Tag:leisure=firepit
     leisure=fishing: Tag:leisure=fishing
     leisure=fitness_centre: Tag:leisure=fitness centre
@@ -8788,22 +11816,29 @@ en:
     leisure=garden: Tag:leisure=garden
     leisure=golf_course: Tag:leisure=golf course
     leisure=hackerspace: Tag:leisure=hackerspace
     leisure=garden: Tag:leisure=garden
     leisure=golf_course: Tag:leisure=golf course
     leisure=hackerspace: Tag:leisure=hackerspace
+    leisure=hammock: Tag:leisure=hammock
     leisure=horse_riding: Tag:leisure=horse riding
     leisure=hot_spring: Tag:leisure=hot spring
     leisure=horse_riding: Tag:leisure=horse riding
     leisure=hot_spring: Tag:leisure=hot spring
+    leisure=hot_tub: Tag:leisure=hot tub
     leisure=ice_rink: Tag:leisure=ice rink
     leisure=indoor_play: Tag:leisure=indoor play
     leisure=landscape_reserve: Tag:leisure=landscape reserve
     leisure=marina: Tag:leisure=marina
     leisure=ice_rink: Tag:leisure=ice rink
     leisure=indoor_play: Tag:leisure=indoor play
     leisure=landscape_reserve: Tag:leisure=landscape reserve
     leisure=marina: Tag:leisure=marina
+    leisure=maze: Tag:leisure=maze
     leisure=miniature_golf: Tag:leisure=miniature golf
     leisure=miniature_golf: Tag:leisure=miniature golf
+    leisure=music_venue: Tag:leisure=music venue
     leisure=nature_reserve: Tag:leisure=nature reserve
     leisure=outdoor_seating: Tag:leisure=outdoor seating
     leisure=paddling_pool: Tag:leisure=paddling pool
     leisure=park: Tag:leisure=park
     leisure=nature_reserve: Tag:leisure=nature reserve
     leisure=outdoor_seating: Tag:leisure=outdoor seating
     leisure=paddling_pool: Tag:leisure=paddling pool
     leisure=park: Tag:leisure=park
+    leisure=parklet: Tag:leisure=parklet
     leisure=picnic: Tag:leisure=picnic
     leisure=picnic_site: Tag:leisure=picnic site
     leisure=picnic_table: Tag:leisure=picnic table
     leisure=pitch: Tag:leisure=pitch
     leisure=playground: Tag:leisure=playground
     leisure=picnic: Tag:leisure=picnic
     leisure=picnic_site: Tag:leisure=picnic site
     leisure=picnic_table: Tag:leisure=picnic table
     leisure=pitch: Tag:leisure=pitch
     leisure=playground: Tag:leisure=playground
+    leisure=practice_pitch: Tag:leisure=practice pitch
+    leisure=recreation_centre: Tag:leisure=recreation centre
     leisure=recreation_ground: Tag:leisure=recreation ground
     leisure=red_light_district: Tag:leisure=red light district
     leisure=resort: Tag:leisure=resort
     leisure=recreation_ground: Tag:leisure=recreation ground
     leisure=red_light_district: Tag:leisure=red light district
     leisure=resort: Tag:leisure=resort
@@ -8819,6 +11854,7 @@ en:
     leisure=sports_hall: Tag:leisure=sports hall
     leisure=stadium: Tag:leisure=stadium
     leisure=summer_camp: Tag:leisure=summer camp
     leisure=sports_hall: Tag:leisure=sports hall
     leisure=stadium: Tag:leisure=stadium
     leisure=summer_camp: Tag:leisure=summer camp
+    leisure=sunbathing: Tag:leisure=sunbathing
     leisure=swimming_area: Tag:leisure=swimming area
     leisure=swimming_pool: Tag:leisure=swimming pool
     leisure=table_tennis_table: Tag:leisure=table tennis table
     leisure=swimming_area: Tag:leisure=swimming area
     leisure=swimming_pool: Tag:leisure=swimming pool
     leisure=table_tennis_table: Tag:leisure=table tennis table
@@ -8829,6 +11865,7 @@ en:
     leisure=video_arcade: Tag:leisure=video arcade
     leisure=village_swing: Tag:leisure=village swing
     leisure=water_park: Tag:leisure=water park
     leisure=video_arcade: Tag:leisure=video arcade
     leisure=village_swing: Tag:leisure=village swing
     leisure=water_park: Tag:leisure=water park
+    leisure=wellness: Tag:leisure=wellness
     leisure=wildlife_hide: Tag:leisure=wildlife hide
     level_crossing=automatic_barrier: Tag:level crossing=automatic barrier
     level_crossing=traffic_signals: Tag:level crossing=traffic signals
     leisure=wildlife_hide: Tag:leisure=wildlife hide
     level_crossing=automatic_barrier: Tag:level crossing=automatic barrier
     level_crossing=traffic_signals: Tag:level crossing=traffic signals
@@ -8836,9 +11873,19 @@ en:
     liaison=liaison_office: Tag:liaison=liaison office
     liaison=representative_office: Tag:liaison=representative office
     liaison=subnational: Tag:liaison=subnational
     liaison=liaison_office: Tag:liaison=liaison office
     liaison=representative_office: Tag:liaison=representative office
     liaison=subnational: Tag:liaison=subnational
+    lifeguard=base: Tag:lifeguard=base
+    lifeguard=tower: Tag:lifeguard=tower
     line=bay: Tag:line=bay
     line=busbar: Tag:line=busbar
     line=substation: Tag:line=substation
     line=bay: Tag:line=bay
     line=busbar: Tag:line=busbar
     line=substation: Tag:line=substation
+    line_arrangement=delta: Tag:line arrangement=delta
+    line_arrangement=horizontal: Tag:line arrangement=horizontal
+    line_arrangement=semi_horizontal: Tag:line arrangement=semi horizontal
+    line_arrangement=semi_vertical: Tag:line arrangement=semi vertical
+    line_arrangement=square: Tag:line arrangement=square
+    line_arrangement=triangular: Tag:line arrangement=triangular
+    line_arrangement=unarranged: Tag:line arrangement=unarranged
+    line_arrangement=vertical: Tag:line arrangement=vertical
     line_attachment=anchor: Tag:line attachment=anchor
     line_attachment=pin: Tag:line attachment=pin
     line_attachment=pulley: Tag:line attachment=pulley
     line_attachment=anchor: Tag:line attachment=anchor
     line_attachment=pin: Tag:line attachment=pin
     line_attachment=pulley: Tag:line attachment=pulley
@@ -8855,30 +11902,60 @@ en:
     locality=townland: Tag:locality=townland
     localizer=yes: Tag:localizer=yes
     location:transition=yes: Tag:location:transition=yes
     locality=townland: Tag:locality=townland
     localizer=yes: Tag:localizer=yes
     location:transition=yes: Tag:location:transition=yes
+    location=cave: Tag:location=cave
+    location=indoor: Tag:location=indoor
+    location=outdoor: Tag:location=outdoor
     location=overground: Tag:location=overground
     location=overhead: Tag:location=overhead
     location=overground: Tag:location=overground
     location=overhead: Tag:location=overhead
+    location=roof: Tag:location=roof
+    location=rooftop: Tag:location=rooftop
+    location=surface: Tag:location=surface
     location=underground: Tag:location=underground
     location=underwater: Tag:location=underwater
     location=underground: Tag:location=underground
     location=underwater: Tag:location=underwater
+    logistics=goods_distribution: Tag:logistics=goods distribution
+    logistics=railway: Tag:logistics=railway
+    logistics=spaceflight: Tag:logistics=spaceflight
+    lottery=yes: Tag:lottery=yes
     maintenance=gritting: Tag:maintenance=gritting
     man_made=MDF: Tag:man made=MDF
     man_made=adit: Tag:man made=adit
     maintenance=gritting: Tag:maintenance=gritting
     man_made=MDF: Tag:man made=MDF
     man_made=adit: Tag:man made=adit
+    man_made=advertising: Tag:man made=advertising
+    man_made=aircraft: Tag:man made=aircraft
     man_made=animal_trap: Tag:man made=animal trap
     man_made=antenna: Tag:man made=antenna
     man_made=archimedes_screw: Tag:man made=archimedes screw
     man_made=animal_trap: Tag:man made=animal trap
     man_made=antenna: Tag:man made=antenna
     man_made=archimedes_screw: Tag:man made=archimedes screw
+    man_made=architecture_line: Tag:man made=architecture line
+    man_made=avalanche_protection: Tag:man made=avalanche protection
+    man_made=basin: Tag:man made=basin
     man_made=beacon: Tag:man made=beacon
     man_made=beehive: Tag:man made=beehive
     man_made=beacon: Tag:man made=beacon
     man_made=beehive: Tag:man made=beehive
+    man_made=bell: Tag:man made=bell
+    man_made=bioreactor: Tag:man made=bioreactor
+    man_made=bioswale: Tag:man made=bioswale
+    man_made=bird_feeder: Tag:man made=bird feeder
+    man_made=bird_perch: Tag:man made=bird perch
+    man_made=borehole: Tag:man made=borehole
     man_made=breakwater: Tag:man made=breakwater
     man_made=bridge: Tag:man made=bridge
     man_made=bunker_silo: Tag:man made=bunker silo
     man_made=cairn: Tag:man made=cairn
     man_made=campanile: Tag:man made=campanile
     man_made=carpet_hanger: Tag:man made=carpet hanger
     man_made=breakwater: Tag:man made=breakwater
     man_made=bridge: Tag:man made=bridge
     man_made=bunker_silo: Tag:man made=bunker silo
     man_made=cairn: Tag:man made=cairn
     man_made=campanile: Tag:man made=campanile
     man_made=carpet_hanger: Tag:man made=carpet hanger
+    man_made=cellar_entrance: Tag:man made=cellar entrance
+    man_made=charge_point: Tag:man made=charge point
     man_made=chiller: Tag:man made=chiller
     man_made=chimney: Tag:man made=chimney
     man_made=chiller: Tag:man made=chiller
     man_made=chimney: Tag:man made=chimney
+    man_made=chute_block: Tag:man made=chute block
+    man_made=clarifier: Tag:man made=clarifier
     man_made=clearcut: Tag:man made=clearcut
     man_made=clearcut: Tag:man made=clearcut
+    man_made=clothes_line: Tag:man made=clothes line
+    man_made=column: Tag:man made=column
     man_made=communications_tower: Tag:man made=communications tower
     man_made=compass_rose: Tag:man made=compass rose
     man_made=communications_tower: Tag:man made=communications tower
     man_made=compass_rose: Tag:man made=compass rose
+    man_made=compressor: Tag:man made=compressor
+    man_made=cooling: Tag:man made=cooling
     man_made=cooling_tower: Tag:man made=cooling tower
     man_made=cooling_tower: Tag:man made=cooling tower
+    man_made=courtyard: Tag:man made=courtyard
     man_made=crane: Tag:man made=crane
     man_made=cross: Tag:man made=cross
     man_made=cut_line: Tag:man made=cut line
     man_made=crane: Tag:man made=crane
     man_made=cross: Tag:man made=cross
     man_made=cut_line: Tag:man made=cut line
@@ -8888,40 +11965,66 @@ en:
     man_made=dolphin: Tag:man made=dolphin
     man_made=dovecote: Tag:man made=dovecote
     man_made=drinking_fountain: Tag:man made=drinking fountain
     man_made=dolphin: Tag:man made=dolphin
     man_made=dovecote: Tag:man made=dovecote
     man_made=drinking_fountain: Tag:man made=drinking fountain
+    man_made=duck_decoy: Tag:man made=duck decoy
     man_made=dyke: Tag:man made=dyke
     man_made=embankment: Tag:man made=embankment
     man_made=dyke: Tag:man made=dyke
     man_made=embankment: Tag:man made=embankment
+    man_made=excavation: Tag:man made=excavation
+    man_made=ferry_cable: Tag:man made=ferry cable
     man_made=flagpole: Tag:man made=flagpole
     man_made=flare: Tag:man made=flare
     man_made=floating_storage: Tag:man made=floating storage
     man_made=footwear_decontamination: Tag:man made=footwear decontamination
     man_made=flagpole: Tag:man made=flagpole
     man_made=flare: Tag:man made=flare
     man_made=floating_storage: Tag:man made=floating storage
     man_made=footwear_decontamination: Tag:man made=footwear decontamination
+    man_made=foundation: Tag:man made=foundation
     man_made=frost_fan: Tag:man made=frost fan
     man_made=frost_fan: Tag:man made=frost fan
+    man_made=fuel_column: Tag:man made=fuel column
+    man_made=fuel_pump: Tag:man made=fuel pump
+    man_made=funding_sign: Tag:man made=funding sign
     man_made=gantry: Tag:man made=gantry
     man_made=gantry: Tag:man made=gantry
+    man_made=gas_dehydrator: Tag:man made=gas dehydrator
     man_made=gas_well: Tag:man made=gas well
     man_made=gasometer: Tag:man made=gasometer
     man_made=geoglyph: Tag:man made=geoglyph
     man_made=goods_conveyor: Tag:man made=goods conveyor
     man_made=graduation_tower: Tag:man made=graduation tower
     man_made=groyne: Tag:man made=groyne
     man_made=gas_well: Tag:man made=gas well
     man_made=gasometer: Tag:man made=gasometer
     man_made=geoglyph: Tag:man made=geoglyph
     man_made=goods_conveyor: Tag:man made=goods conveyor
     man_made=graduation_tower: Tag:man made=graduation tower
     man_made=groyne: Tag:man made=groyne
+    man_made=guard_stone: Tag:man made=guard stone
     man_made=guy: Tag:man made=guy
     man_made=guy: Tag:man made=guy
+    man_made=guy_wire: Tag:man made=guy wire
+    man_made=heap: Tag:man made=heap
+    man_made=hongsalmun: Tag:man made=hongsalmun
     man_made=hot_water_tank: Tag:man made=hot water tank
     man_made=hot_water_tank: Tag:man made=hot water tank
+    man_made=hunting_stand: Tag:man made=hunting stand
     man_made=ice_house: Tag:man made=ice house
     man_made=ice_house: Tag:man made=ice house
+    man_made=iljumun: Tag:man made=iljumun
     man_made=insect_hotel: Tag:man made=insect hotel
     man_made=jetty: Tag:man made=jetty
     man_made=kiln: Tag:man made=kiln
     man_made=insect_hotel: Tag:man made=insect hotel
     man_made=jetty: Tag:man made=jetty
     man_made=kiln: Tag:man made=kiln
+    man_made=lamp: Tag:man made=lamp
     man_made=launch_pad: Tag:man made=launch pad
     man_made=levee: Tag:man made=levee
     man_made=lighthouse: Tag:man made=lighthouse
     man_made=launch_pad: Tag:man made=launch pad
     man_made=levee: Tag:man made=levee
     man_made=lighthouse: Tag:man made=lighthouse
+    man_made=loudspeaker: Tag:man made=loudspeaker
     man_made=manhole: Tag:man made=manhole
     man_made=mast: Tag:man made=mast
     man_made=maypole: Tag:man made=maypole
     man_made=measurement_station: Tag:man made=measurement station
     man_made=manhole: Tag:man made=manhole
     man_made=mast: Tag:man made=mast
     man_made=maypole: Tag:man made=maypole
     man_made=measurement_station: Tag:man made=measurement station
+    man_made=meridian_marker: Tag:man made=meridian marker
+    man_made=milk-churn-stand: Tag:man made=milk-churn-stand
+    man_made=milk_churn_stand: Tag:man made=milk churn stand
     man_made=mineshaft: Tag:man made=mineshaft
     man_made=monitoring_station: Tag:man made=monitoring station
     man_made=mineshaft: Tag:man made=mineshaft
     man_made=monitoring_station: Tag:man made=monitoring station
+    man_made=mountaineers_mailbox: Tag:man made=mountaineers mailbox
+    man_made=mounting_block: Tag:man made=mounting block
     man_made=nesting_site: Tag:man made=nesting site
     man_made=obelisk: Tag:man made=obelisk
     man_made=observatory: Tag:man made=observatory
     man_made=offshore_platform: Tag:man made=offshore platform
     man_made=nesting_site: Tag:man made=nesting site
     man_made=obelisk: Tag:man made=obelisk
     man_made=observatory: Tag:man made=observatory
     man_made=offshore_platform: Tag:man made=offshore platform
+    man_made=oil_gas_separator: Tag:man made=oil gas separator
     man_made=oil_well: Tag:man made=oil well
     man_made=oil_well: Tag:man made=oil well
+    man_made=outfall: Tag:man made=outfall
+    man_made=oxidation_ditch: Tag:man made=oxidation ditch
+    man_made=paifang: Tag:man made=paifang
+    man_made=pavement_light: Tag:man made=pavement light
     man_made=petroleum_well: Tag:man made=petroleum well
     man_made=pier: Tag:man made=pier
     man_made=pillar: Tag:man made=pillar
     man_made=petroleum_well: Tag:man made=petroleum well
     man_made=pier: Tag:man made=pier
     man_made=pillar: Tag:man made=pillar
@@ -8930,34 +12033,52 @@ en:
     man_made=power_hydro: Tag:man made=power hydro
     man_made=power_nuclear: Tag:man made=power nuclear
     man_made=power_wind: Tag:man made=power wind
     man_made=power_hydro: Tag:man made=power hydro
     man_made=power_nuclear: Tag:man made=power nuclear
     man_made=power_wind: Tag:man made=power wind
+    man_made=process_tank: Tag:man made=process tank
     man_made=pump: Tag:man made=pump
     man_made=pumping_rig: Tag:man made=pumping rig
     man_made=pumping_station: Tag:man made=pumping station
     man_made=qanat: Tag:man made=qanat
     man_made=quay: Tag:man made=quay
     man_made=reservoir_covered: Tag:man made=reservoir covered
     man_made=pump: Tag:man made=pump
     man_made=pumping_rig: Tag:man made=pumping rig
     man_made=pumping_station: Tag:man made=pumping station
     man_made=qanat: Tag:man made=qanat
     man_made=quay: Tag:man made=quay
     man_made=reservoir_covered: Tag:man made=reservoir covered
+    man_made=ruins: Tag:man made=ruins
     man_made=satellite_dish: Tag:man made=satellite dish
     man_made=school_sentry: Tag:man made=school sentry
     man_made=septic_tank: Tag:man made=septic tank
     man_made=satellite_dish: Tag:man made=satellite dish
     man_made=school_sentry: Tag:man made=school sentry
     man_made=septic_tank: Tag:man made=septic tank
+    man_made=sewage: Tag:man made=sewage
+    man_made=sewer_vent: Tag:man made=sewer vent
+    man_made=sign: Tag:man made=sign
     man_made=silo: Tag:man made=silo
     man_made=ski_jump: Tag:man made=ski jump
     man_made=silo: Tag:man made=silo
     man_made=ski_jump: Tag:man made=ski jump
+    man_made=slurry_basin: Tag:man made=slurry basin
     man_made=snow_cannon: Tag:man made=snow cannon
     man_made=snow_fence: Tag:man made=snow fence
     man_made=snow_net: Tag:man made=snow net
     man_made=spoil_heap: Tag:man made=spoil heap
     man_made=spring_box: Tag:man made=spring box
     man_made=snow_cannon: Tag:man made=snow cannon
     man_made=snow_fence: Tag:man made=snow fence
     man_made=snow_net: Tag:man made=snow net
     man_made=spoil_heap: Tag:man made=spoil heap
     man_made=spring_box: Tag:man made=spring box
+    man_made=stećak: Tag:man made=stećak
     man_made=storage_tank: Tag:man made=storage tank
     man_made=street_cabinet: Tag:man made=street cabinet
     man_made=storage_tank: Tag:man made=storage tank
     man_made=street_cabinet: Tag:man made=street cabinet
+    man_made=stupa: Tag:man made=stupa
     man_made=submarine_cable: Tag:man made=submarine cable
     man_made=summit_cross: Tag:man made=summit cross
     man_made=surveillance: Tag:man made=surveillance
     man_made=survey_point: Tag:man made=survey point
     man_made=submarine_cable: Tag:man made=submarine cable
     man_made=summit_cross: Tag:man made=summit cross
     man_made=surveillance: Tag:man made=surveillance
     man_made=survey_point: Tag:man made=survey point
+    man_made=tailings_pond: Tag:man made=tailings pond
+    man_made=telephone_box: Tag:man made=telephone box
+    man_made=telephone_exchange: Tag:man made=telephone exchange
     man_made=telescope: Tag:man made=telescope
     man_made=tell: Tag:man made=tell
     man_made=threshing_floor: Tag:man made=threshing floor
     man_made=telescope: Tag:man made=telescope
     man_made=tell: Tag:man made=tell
     man_made=threshing_floor: Tag:man made=threshing floor
+    man_made=tomb: Tag:man made=tomb
+    man_made=torii: Tag:man made=torii
     man_made=tower: Tag:man made=tower
     man_made=tunnel: Tag:man made=tunnel
     man_made=tower: Tag:man made=tower
     man_made=tunnel: Tag:man made=tunnel
+    man_made=urine_deflector: Tag:man made=urine deflector
     man_made=utility_pole: Tag:man made=utility pole
     man_made=utility_pole: Tag:man made=utility pole
+    man_made=ventilation_shaft: Tag:man made=ventilation shaft
+    man_made=video_wall: Tag:man made=video wall
+    man_made=warehouse: Tag:man made=warehouse
+    man_made=wastewater_basin: Tag:man made=wastewater basin
     man_made=wastewater_plant: Tag:man made=wastewater plant
     man_made=water_tank: Tag:man made=water tank
     man_made=water_tap: Tag:man made=water tap
     man_made=wastewater_plant: Tag:man made=wastewater plant
     man_made=water_tank: Tag:man made=water tank
     man_made=water_tap: Tag:man made=water tap
@@ -8971,28 +12092,59 @@ en:
     man_made=windmill: Tag:man made=windmill
     man_made=windpump: Tag:man made=windpump
     man_made=works: Tag:man made=works
     man_made=windmill: Tag:man made=windmill
     man_made=windpump: Tag:man made=windpump
     man_made=works: Tag:man made=works
+    man_made_aircraft: Tag:man made aircraft
     manhole=drain: Tag:manhole=drain
     manhole=telecom: Tag:manhole=telecom
     map_type=topo: Tag:map type=topo
     maritime=yes: Tag:maritime=yes
     marker=aerial: Tag:marker=aerial
     marker=ground: Tag:marker=ground
     manhole=drain: Tag:manhole=drain
     manhole=telecom: Tag:manhole=telecom
     map_type=topo: Tag:map type=topo
     maritime=yes: Tag:maritime=yes
     marker=aerial: Tag:marker=aerial
     marker=ground: Tag:marker=ground
+    marker=paddle: Tag:marker=paddle
     marker=pedestal: Tag:marker=pedestal
     marker=plate: Tag:marker=plate
     marker=post: Tag:marker=post
     marker=stone: Tag:marker=stone
     material=concrete: Tag:material=concrete
     marker=pedestal: Tag:marker=pedestal
     marker=plate: Tag:marker=plate
     marker=post: Tag:marker=post
     marker=stone: Tag:marker=stone
     material=concrete: Tag:material=concrete
+    material=epoxy: Tag:material=epoxy
+    material=paving_stones: Tag:material=paving stones
     maxheight=default: Tag:maxheight=default
     maxheight=default: Tag:maxheight=default
+    maxspeed:type=GB:motorway: Tag:maxspeed:type=GB:motorway
+    maxspeed:type=GB:nsl_dual: Tag:maxspeed:type=GB:nsl dual
+    maxspeed:type=GB:nsl_restricted: Tag:maxspeed:type=GB:nsl restricted
+    maxspeed:type=GB:nsl_single: Tag:maxspeed:type=GB:nsl single
+    maxspeed:type=GB:zone20: Tag:maxspeed:type=GB:zone20
+    maxspeed:type=NL:living_street: Tag:maxspeed:type=NL:living street
+    maxspeed:type=NL:motorroad: Tag:maxspeed:type=NL:motorroad
+    maxspeed:type=NL:motorway: Tag:maxspeed:type=NL:motorway
+    maxspeed:type=NL:rural: Tag:maxspeed:type=NL:rural
+    maxspeed:type=NL:urban: Tag:maxspeed:type=NL:urban
+    maxspeed:type=PL:rural: Tag:maxspeed:type=PL:rural
+    maxspeed:type=PL:urban: Tag:maxspeed:type=PL:urban
+    maxspeed:type=sign: Tag:maxspeed:type=sign
+    maxspeed=implicit: Tag:maxspeed=implicit
     maxweight:signed=no: Tag:maxweight:signed=no
     maxweight:signed=no: Tag:maxweight:signed=no
+    meadow=paddock: Tag:meadow=paddock
+    meadow=pasture: Tag:meadow=pasture
+    mechanical_coupling=nodding_donkey: Tag:mechanical coupling=nodding donkey
+    mechanical_driver=combustion_engine: Tag:mechanical driver=combustion engine
+    mechanical_driver=cylinder: Tag:mechanical driver=cylinder
+    mechanical_driver=electric_motor: Tag:mechanical driver=electric motor
+    mechanical_driver=manual: Tag:mechanical driver=manual
+    mechanical_driver=reciprocating_solenoid: Tag:mechanical driver=reciprocating
+      solenoid
+    mechanical_driver=turbine: Tag:mechanical driver=turbine
     medical=aed: Tag:medical=aed
     medical=aed: Tag:medical=aed
+    medical_system:western=yes: Tag:medical system:western=yes
     megalith_type=alignment: Tag:megalith type=alignment
     megalith_type=chamber: Tag:megalith type=chamber
     megalith_type=cist: Tag:megalith type=cist
     megalith_type=dolmen: Tag:megalith type=dolmen
     megalith_type=alignment: Tag:megalith type=alignment
     megalith_type=chamber: Tag:megalith type=chamber
     megalith_type=cist: Tag:megalith type=cist
     megalith_type=dolmen: Tag:megalith type=dolmen
+    megalith_type=gallery_grave: Tag:megalith type=gallery grave
     megalith_type=long_barrow: Tag:megalith type=long barrow
     megalith_type=menhir: Tag:megalith type=menhir
     megalith_type=nuraghe: Tag:megalith type=nuraghe
     megalith_type=passage_grave: Tag:megalith type=passage grave
     megalith_type=long_barrow: Tag:megalith type=long barrow
     megalith_type=menhir: Tag:megalith type=menhir
     megalith_type=nuraghe: Tag:megalith type=nuraghe
     megalith_type=passage_grave: Tag:megalith type=passage grave
+    megalith_type=ring_cairn: Tag:megalith type=ring cairn
     megalith_type=stone_circle: Tag:megalith type=stone circle
     megalith_type=stone_ship: Tag:megalith type=stone ship
     megalith_type=tholos: Tag:megalith type=tholos
     megalith_type=stone_circle: Tag:megalith type=stone circle
     megalith_type=stone_ship: Tag:megalith type=stone ship
     megalith_type=tholos: Tag:megalith type=tholos
@@ -9003,35 +12155,55 @@ en:
     memorial:type=statue: Tag:memorial:type=statue
     memorial:type=stele: Tag:memorial:type=stele
     memorial:type=stolperstein: Tag:memorial:type=stolperstein
     memorial:type=statue: Tag:memorial:type=statue
     memorial:type=stele: Tag:memorial:type=stele
     memorial:type=stolperstein: Tag:memorial:type=stolperstein
+    memorial=bench: Tag:memorial=bench
     memorial=blue_plaque: Tag:memorial=blue plaque
     memorial=bust: Tag:memorial=bust
     memorial=blue_plaque: Tag:memorial=blue plaque
     memorial=bust: Tag:memorial=bust
+    memorial=cenotaph: Tag:memorial=cenotaph
     memorial=cross: Tag:memorial=cross
     memorial=cross: Tag:memorial=cross
+    memorial=flood_mark: Tag:memorial=flood mark
     memorial=ghost_bike: Tag:memorial=ghost bike
     memorial=ghost_bike: Tag:memorial=ghost bike
+    memorial=immortality_tower: Tag:memorial=immortality tower
+    memorial=khachkar: Tag:memorial=khachkar
     memorial=obelisk: Tag:memorial=obelisk
     memorial=plaque: Tag:memorial=plaque
     memorial=obelisk: Tag:memorial=obelisk
     memorial=plaque: Tag:memorial=plaque
+    memorial=sculpture: Tag:memorial=sculpture
     memorial=statue: Tag:memorial=statue
     memorial=stele: Tag:memorial=stele
     memorial=stolperstein: Tag:memorial=stolperstein
     memorial=stone: Tag:memorial=stone
     memorial=storm_surge_post: Tag:memorial=storm surge post
     memorial=statue: Tag:memorial=statue
     memorial=stele: Tag:memorial=stele
     memorial=stolperstein: Tag:memorial=stolperstein
     memorial=stone: Tag:memorial=stone
     memorial=storm_surge_post: Tag:memorial=storm surge post
+    memorial=vehicle: Tag:memorial=vehicle
     memorial=war_memorial: Tag:memorial=war memorial
     memorial=war_memorial: Tag:memorial=war memorial
+    message=funding: Tag:message=funding
     microbrewery=yes: Tag:microbrewery=yes
     microbrewery=yes: Tag:microbrewery=yes
+    military=academy: Tag:military=academy
     military=airfield: Tag:military=airfield
     military=ammunition: Tag:military=ammunition
     military=barracks: Tag:military=barracks
     military=airfield: Tag:military=airfield
     military=ammunition: Tag:military=ammunition
     military=barracks: Tag:military=barracks
+    military=base: Tag:military=base
+    military=bombcrater: Tag:military=bombcrater
     military=bunker: Tag:military=bunker
     military=checkpoint: Tag:military=checkpoint
     military=danger_area: Tag:military=danger area
     military=bunker: Tag:military=bunker
     military=checkpoint: Tag:military=checkpoint
     military=danger_area: Tag:military=danger area
+    military=depot: Tag:military=depot
     military=exclusion_zone: Tag:military=exclusion zone
     military=launchpad: Tag:military=launchpad
     military=exclusion_zone: Tag:military=exclusion zone
     military=launchpad: Tag:military=launchpad
+    military=missile: Tag:military=missile
     military=naval_base: Tag:military=naval base
     military=nuclear_explosion_site: Tag:military=nuclear explosion site
     military=obstacle_course: Tag:military=obstacle course
     military=office: Tag:military=office
     military=range: Tag:military=range
     military=naval_base: Tag:military=naval base
     military=nuclear_explosion_site: Tag:military=nuclear explosion site
     military=obstacle_course: Tag:military=obstacle course
     military=office: Tag:military=office
     military=range: Tag:military=range
+    military=school: Tag:military=school
     military=training_area: Tag:military=training area
     military=trench: Tag:military=trench
     military=training_area: Tag:military=training area
     military=trench: Tag:military=trench
+    military_service=air_force: Tag:military service=air force
+    military_service=army: Tag:military service=army
+    military_service=coast_guard: Tag:military service=coast guard
+    military_service=marines: Tag:military service=marines
+    military_service=navy: Tag:military service=navy
     mofa=use_sidepath: Tag:mofa=use sidepath
     mofa=use_sidepath: Tag:mofa=use sidepath
+    monument=statue: Tag:monument=statue
     mooring=commercial: Tag:mooring=commercial
     mooring=cruise: Tag:mooring=cruise
     mooring=declaration: Tag:mooring=declaration
     mooring=commercial: Tag:mooring=commercial
     mooring=cruise: Tag:mooring=cruise
     mooring=declaration: Tag:mooring=declaration
@@ -9043,12 +12215,22 @@ en:
     mooring=spm: Tag:mooring=spm
     mooring=visitor: Tag:mooring=visitor
     moped=use_sidepath: Tag:moped=use sidepath
     mooring=spm: Tag:mooring=spm
     mooring=visitor: Tag:mooring=visitor
     moped=use_sidepath: Tag:moped=use sidepath
-    motorcycle:type=electric: Tag:motorcycle:type=electric
-    motorcycle:type=sportbike: Tag:motorcycle:type=sportbike
+    motor_vehicle=agricultural: Tag:motor vehicle=agricultural
+    motor_vehicle=delivery: Tag:motor vehicle=delivery
+    motor_vehicle=destination: Tag:motor vehicle=destination
+    motor_vehicle=forestry: Tag:motor vehicle=forestry
+    motor_vehicle=no: Tag:motor vehicle=no
+    motor_vehicle=private: Tag:motor vehicle=private
+    motor_vehicle=yes: Tag:motor vehicle=yes
+    motorcycle=no: Tag:motorcycle=no
+    motorcycle=yes: Tag:motorcycle=yes
+    motorroad=no: Tag:motorroad=no
     mountain_pass=yes: Tag:mountain pass=yes
     museum=aerospace: Tag:museum=aerospace
     mountain_pass=yes: Tag:mountain pass=yes
     museum=aerospace: Tag:museum=aerospace
+    museum=agriculture: Tag:museum=agriculture
     museum=archaeological: Tag:museum=archaeological
     museum=art: Tag:museum=art
     museum=archaeological: Tag:museum=archaeological
     museum=art: Tag:museum=art
+    museum=aviation: Tag:museum=aviation
     museum=children: Tag:museum=children
     museum=history: Tag:museum=history
     museum=living_history: Tag:museum=living history
     museum=children: Tag:museum=children
     museum=history: Tag:museum=history
     museum=living_history: Tag:museum=living history
@@ -9059,6 +12241,7 @@ en:
     museum=railway: Tag:museum=railway
     museum=technology: Tag:museum=technology
     museum=transport: Tag:museum=transport
     museum=railway: Tag:museum=railway
     museum=technology: Tag:museum=technology
     museum=transport: Tag:museum=transport
+    name:signed=no: Tag:name:signed=no
     name=7-Eleven: Tag:name=7-Eleven
     name=BMO: Tag:name=BMO
     name=BMO_Bank_of_Montreal: Tag:name=BMO Bank of Montreal
     name=7-Eleven: Tag:name=7-Eleven
     name=BMO: Tag:name=BMO
     name=BMO_Bank_of_Montreal: Tag:name=BMO Bank of Montreal
@@ -9068,16 +12251,21 @@ en:
     name=Costco: Tag:name=Costco
     name=Dollarama: Tag:name=Dollarama
     name=Domino's_Pizza: Tag:name=Domino's Pizza
     name=Costco: Tag:name=Costco
     name=Dollarama: Tag:name=Dollarama
     name=Domino's_Pizza: Tag:name=Domino's Pizza
+    name=Fossil: Tag:name=Fossil
     name=Herfy: Tag:name=Herfy
     name=Jollibee: Tag:name=Jollibee
     name=KFC: Tag:name=KFC
     name=McDonald's: Tag:name=McDonald's
     name=Herfy: Tag:name=Herfy
     name=Jollibee: Tag:name=Jollibee
     name=KFC: Tag:name=KFC
     name=McDonald's: Tag:name=McDonald's
+    name=NHS: Tag:name=NHS
+    name=Starbucks: Tag:name=Starbucks
     name=Subway: Tag:name=Subway
     name=The_Church_of_Jesus_Christ_of_Latter-day_Saints: Tag:name=The Church of Jesus
       Christ of Latter-day Saints
     name=Subway: Tag:name=Subway
     name=The_Church_of_Jesus_Christ_of_Latter-day_Saints: Tag:name=The Church of Jesus
       Christ of Latter-day Saints
+    name=Tim_Hortons: Tag:name=Tim Hortons
     name=Walmart: Tag:name=Walmart
     name=Wendy's: Tag:name=Wendy's
     name=Продукты: Tag:name=Продукты
     name=Walmart: Tag:name=Walmart
     name=Wendy's: Tag:name=Wendy's
     name=Продукты: Tag:name=Продукты
+    naptan:verified=no: Tag:naptan:verified=no
     natural=anthill: Tag:natural=anthill
     natural=arch: Tag:natural=arch
     natural=arete: Tag:natural=arete
     natural=anthill: Tag:natural=anthill
     natural=arch: Tag:natural=arch
     natural=arete: Tag:natural=arete
@@ -9088,13 +12276,16 @@ en:
     natural=beach: Tag:natural=beach
     natural=bedrock: Tag:natural=bedrock
     natural=birds_nest: Tag:natural=birds nest
     natural=beach: Tag:natural=beach
     natural=bedrock: Tag:natural=bedrock
     natural=birds_nest: Tag:natural=birds nest
+    natural=blockfield: Tag:natural=blockfield
     natural=blowhole: Tag:natural=blowhole
     natural=blowhole: Tag:natural=blowhole
+    natural=caldera: Tag:natural=caldera
     natural=cape: Tag:natural=cape
     natural=cave_entrance: Tag:natural=cave entrance
     natural=cliff: Tag:natural=cliff
     natural=cloud: Tag:natural=cloud
     natural=coastline: Tag:natural=coastline
     natural=col: Tag:natural=col
     natural=cape: Tag:natural=cape
     natural=cave_entrance: Tag:natural=cave entrance
     natural=cliff: Tag:natural=cliff
     natural=cloud: Tag:natural=cloud
     natural=coastline: Tag:natural=coastline
     natural=col: Tag:natural=col
+    natural=couloir: Tag:natural=couloir
     natural=crater: Tag:natural=crater
     natural=crevasse: Tag:natural=crevasse
     natural=desert: Tag:natural=desert
     natural=crater: Tag:natural=crater
     natural=crevasse: Tag:natural=crevasse
     natural=desert: Tag:natural=desert
@@ -9103,13 +12294,16 @@ en:
     natural=esker: Tag:natural=esker
     natural=fell: Tag:natural=fell
     natural=fjord: Tag:natural=fjord
     natural=esker: Tag:natural=esker
     natural=fell: Tag:natural=fell
     natural=fjord: Tag:natural=fjord
+    natural=fumarole: Tag:natural=fumarole
     natural=geothermal: Tag:natural=geothermal
     natural=geothermal_area: Tag:natural=geothermal area
     natural=geothermal_field: Tag:natural=geothermal field
     natural=geyser: Tag:natural=geyser
     natural=glacier: Tag:natural=glacier
     natural=gorge: Tag:natural=gorge
     natural=geothermal: Tag:natural=geothermal
     natural=geothermal_area: Tag:natural=geothermal area
     natural=geothermal_field: Tag:natural=geothermal field
     natural=geyser: Tag:natural=geyser
     natural=glacier: Tag:natural=glacier
     natural=gorge: Tag:natural=gorge
+    natural=grass: Tag:natural=grass
     natural=grassland: Tag:natural=grassland
     natural=grassland: Tag:natural=grassland
+    natural=gulf: Tag:natural=gulf
     natural=gully: Tag:natural=gully
     natural=heath: Tag:natural=heath
     natural=hill: Tag:natural=hill
     natural=gully: Tag:natural=gully
     natural=heath: Tag:natural=heath
     natural=hill: Tag:natural=hill
@@ -9122,9 +12316,9 @@ en:
     natural=lava: Tag:natural=lava
     natural=marsh: Tag:natural=marsh
     natural=meadow: Tag:natural=meadow
     natural=lava: Tag:natural=lava
     natural=marsh: Tag:natural=marsh
     natural=meadow: Tag:natural=meadow
+    natural=meteor_crater: Tag:natural=meteor crater
     natural=moor: Tag:natural=moor
     natural=moraine: Tag:natural=moraine
     natural=moor: Tag:natural=moor
     natural=moraine: Tag:natural=moraine
-    natural=moss: Tag:natural=moss
     natural=mountain_range: Tag:natural=mountain range
     natural=mud: Tag:natural=mud
     natural=naled: Tag:natural=naled
     natural=mountain_range: Tag:natural=mountain range
     natural=mud: Tag:natural=mud
     natural=naled: Tag:natural=naled
@@ -9135,8 +12329,10 @@ en:
     natural=plateau: Tag:natural=plateau
     natural=reef: Tag:natural=reef
     natural=ridge: Tag:natural=ridge
     natural=plateau: Tag:natural=plateau
     natural=reef: Tag:natural=reef
     natural=ridge: Tag:natural=ridge
+    natural=riverbank: Tag:natural=riverbank
     natural=riverbed: Tag:natural=riverbed
     natural=rock: Tag:natural=rock
     natural=riverbed: Tag:natural=riverbed
     natural=rock: Tag:natural=rock
+    natural=rock_overhang: Tag:natural=rock overhang
     natural=rocks: Tag:natural=rocks
     natural=saddle: Tag:natural=saddle
     natural=sand: Tag:natural=sand
     natural=rocks: Tag:natural=rocks
     natural=saddle: Tag:natural=saddle
     natural=sand: Tag:natural=sand
@@ -9145,12 +12341,14 @@ en:
     natural=shingle: Tag:natural=shingle
     natural=shoal: Tag:natural=shoal
     natural=shrub: Tag:natural=shrub
     natural=shingle: Tag:natural=shingle
     natural=shoal: Tag:natural=shoal
     natural=shrub: Tag:natural=shrub
+    natural=shrubbery: Tag:natural=shrubbery
     natural=sinkhole: Tag:natural=sinkhole
     natural=spring: Tag:natural=spring
     natural=stone: Tag:natural=stone
     natural=strait: Tag:natural=strait
     natural=termite_mound: Tag:natural=termite mound
     natural=tree: Tag:natural=tree
     natural=sinkhole: Tag:natural=sinkhole
     natural=spring: Tag:natural=spring
     natural=stone: Tag:natural=stone
     natural=strait: Tag:natural=strait
     natural=termite_mound: Tag:natural=termite mound
     natural=tree: Tag:natural=tree
+    natural=tree_group: Tag:natural=tree group
     natural=tree_row: Tag:natural=tree row
     natural=tree_stump: Tag:natural=tree stump
     natural=tundra: Tag:natural=tundra
     natural=tree_row: Tag:natural=tree row
     natural=tree_stump: Tag:natural=tree stump
     natural=tundra: Tag:natural=tundra
@@ -9162,40 +12360,96 @@ en:
     natural=wood: Tag:natural=wood
     navigationaid=als: Tag:navigationaid=als
     navigationaid=papi: Tag:navigationaid=papi
     natural=wood: Tag:natural=wood
     navigationaid=als: Tag:navigationaid=als
     navigationaid=papi: Tag:navigationaid=papi
+    navigationaid=rwe: Tag:navigationaid=rwe
+    navigationaid=txc: Tag:navigationaid=txc
+    navigationaid=txe: Tag:navigationaid=txe
     navigationaid=vasi: Tag:navigationaid=vasi
     nest_platform=yes: Tag:nest platform=yes
     navigationaid=vasi: Tag:navigationaid=vasi
     nest_platform=yes: Tag:nest platform=yes
+    network:type=node_network: Tag:network:type=node network
     network=BR: Tag:network=BR
     network=BR:ES: Tag:network=BR:ES
     network=BR:MG: Tag:network=BR:MG
     network=BR:PB: Tag:network=BR:PB
     network=BR: Tag:network=BR
     network=BR:ES: Tag:network=BR:ES
     network=BR:MG: Tag:network=BR:MG
     network=BR:PB: Tag:network=BR:PB
+    network=Barrie_Transit: Tag:network=Barrie Transit
+    network=CA:ON:York: Tag:network=CA:ON:York
+    network=CA:ON:primary: Tag:network=CA:ON:primary
+    network=CA:ON:secondary: Tag:network=CA:ON:secondary
+    network=CA:ON:tertiary: Tag:network=CA:ON:tertiary
+    network=CA:transcanada: Tag:network=CA:transcanada
+    network=CA:transcanada:namedRoute: Tag:network=CA:transcanada:namedRoute
     network=CN:AH: Tag:network=CN:AH
     network=CN:JS: Tag:network=CN:JS
     network=CN:AH: Tag:network=CN:AH
     network=CN:JS: Tag:network=CN:JS
+    network=CN:expressway: Tag:network=CN:expressway
     network=CN:national: Tag:network=CN:national
     network=CR:national: Tag:network=CR:national
     network=CN:national: Tag:network=CN:national
     network=CR:national: Tag:network=CR:national
+    network=ETS: Tag:network=ETS
     network=Flinkster: Tag:network=Flinkster
     network=JP:national: Tag:network=JP:national
     network=Flinkster: Tag:network=Flinkster
     network=JP:national: Tag:network=JP:national
+    network=JP:prefectural: Tag:network=JP:prefectural
     network=JP:prefectural:nagano: Tag:network=JP:prefectural:nagano
     network=JP:prefectural:nagano: Tag:network=JP:prefectural:nagano
+    network=NL:A: Tag:network=NL:A
+    network=NL:N: Tag:network=NL:N
+    network=NL:R:IJmuiden: Tag:network=NL:R:IJmuiden
+    network=NL:R:Ommen: Tag:network=NL:R:Ommen
+    network=NL:R:Schouwen: Tag:network=NL:R:Schouwen
+    network=NL:R:Sluis: Tag:network=NL:R:Sluis
+    network=NL:R:Spaarnwoude: Tag:network=NL:R:Spaarnwoude
+    network=NL:R:Voorthuizen: Tag:network=NL:R:Voorthuizen
+    network=NL:S:Amsterdam: Tag:network=NL:S:Amsterdam
+    network=NL:S:Den_Haag: Tag:network=NL:S:Den Haag
+    network=NL:S:Heerlen: Tag:network=NL:S:Heerlen
+    network=NL:S:Nijmegen: Tag:network=NL:S:Nijmegen
+    network=NL:S:Parkstad: Tag:network=NL:S:Parkstad
+    network=NL:S:Rotterdam: Tag:network=NL:S:Rotterdam
+    network=NL:S:Zaanstad: Tag:network=NL:S:Zaanstad
+    network=NL:binnenstedelijke_ring: Tag:network=NL:binnenstedelijke ring
+    network=NL:ring: Tag:network=NL:ring
+    network=NZ:SH: Tag:network=NZ:SH
+    network=NZ:UR: Tag:network=NZ:UR
+    network=SE:LS: Tag:network=SE:LS
+    network=SE:LV: Tag:network=SE:LV
+    network=SE:RV: Tag:network=SE:RV
+    network=TTC: Tag:network=TTC
     network=US:ADHS: Tag:network=US:ADHS
     network=US:AK: Tag:network=US:AK
     network=US:AL: Tag:network=US:AL
     network=US:AR: Tag:network=US:AR
     network=US:ADHS: Tag:network=US:ADHS
     network=US:AK: Tag:network=US:AK
     network=US:AL: Tag:network=US:AL
     network=US:AR: Tag:network=US:AR
+    network=US:AS: Tag:network=US:AS
     network=US:AZ: Tag:network=US:AZ
     network=US:AZ: Tag:network=US:AZ
+    network=US:AZ:Business: Tag:network=US:AZ:Business
+    network=US:AZ:Loop: Tag:network=US:AZ:Loop
+    network=US:AZ:Maricopa: Tag:network=US:AZ:Maricopa
+    network=US:AZ:Mohave: Tag:network=US:AZ:Mohave
+    network=US:AZ:Scenic: Tag:network=US:AZ:Scenic
+    network=US:BIA: Tag:network=US:BIA
     network=US:CA: Tag:network=US:CA
     network=US:CA: Tag:network=US:CA
+    network=US:CA:CR: Tag:network=US:CA:CR
     network=US:CO: Tag:network=US:CO
     network=US:CT: Tag:network=US:CT
     network=US:DC: Tag:network=US:DC
     network=US:DE: Tag:network=US:DE
     network=US:FL: Tag:network=US:FL
     network=US:CO: Tag:network=US:CO
     network=US:CT: Tag:network=US:CT
     network=US:DC: Tag:network=US:DC
     network=US:DE: Tag:network=US:DE
     network=US:FL: Tag:network=US:FL
+    network=US:FL:CR: Tag:network=US:FL:CR
     network=US:FL:Toll: Tag:network=US:FL:Toll
     network=US:GA: Tag:network=US:GA
     network=US:FL:Toll: Tag:network=US:FL:Toll
     network=US:GA: Tag:network=US:GA
+    network=US:GU: Tag:network=US:GU
     network=US:HI: Tag:network=US:HI
     network=US:I: Tag:network=US:I
     network=US:HI: Tag:network=US:HI
     network=US:I: Tag:network=US:I
+    network=US:I:Alternate: Tag:network=US:I:Alternate
+    network=US:I:Business:Loop: Tag:network=US:I:Business:Loop
+    network=US:I:Business:Spur: Tag:network=US:I:Business:Spur
+    network=US:I:Future: Tag:network=US:I:Future
     network=US:IA: Tag:network=US:IA
     network=US:IA: Tag:network=US:IA
+    network=US:IA:CR: Tag:network=US:IA:CR
     network=US:ID: Tag:network=US:ID
     network=US:IL: Tag:network=US:IL
     network=US:ID: Tag:network=US:ID
     network=US:IL: Tag:network=US:IL
+    network=US:IL:Cook:Chicago:Skyway: Tag:network=US:IL:Cook:Chicago:Skyway
     network=US:IN: Tag:network=US:IN
     network=US:IN: Tag:network=US:IN
+    network=US:IN:Toll: Tag:network=US:IN:Toll
     network=US:KS: Tag:network=US:KS
     network=US:KY: Tag:network=US:KY
     network=US:KS: Tag:network=US:KS
     network=US:KY: Tag:network=US:KY
+    network=US:KY:AA: Tag:network=US:KY:AA
+    network=US:KY:Parkway: Tag:network=US:KY:Parkway
     network=US:LA: Tag:network=US:LA
     network=US:MA: Tag:network=US:MA
     network=US:MD: Tag:network=US:MD
     network=US:LA: Tag:network=US:LA
     network=US:MA: Tag:network=US:MA
     network=US:MD: Tag:network=US:MD
@@ -9204,18 +12458,24 @@ en:
     network=US:MN: Tag:network=US:MN
     network=US:MO: Tag:network=US:MO
     network=US:MO:Supplemental: Tag:network=US:MO:Supplemental
     network=US:MN: Tag:network=US:MN
     network=US:MO: Tag:network=US:MO
     network=US:MO:Supplemental: Tag:network=US:MO:Supplemental
+    network=US:MP: Tag:network=US:MP
     network=US:MS: Tag:network=US:MS
     network=US:MT: Tag:network=US:MT
     network=US:MT:secondary: Tag:network=US:MT:secondary
     network=US:NC: Tag:network=US:NC
     network=US:ND: Tag:network=US:ND
     network=US:NE: Tag:network=US:NE
     network=US:MS: Tag:network=US:MS
     network=US:MT: Tag:network=US:MT
     network=US:MT:secondary: Tag:network=US:MT:secondary
     network=US:NC: Tag:network=US:NC
     network=US:ND: Tag:network=US:ND
     network=US:NE: Tag:network=US:NE
+    network=US:NE:Link: Tag:network=US:NE:Link
+    network=US:NE:Rec: Tag:network=US:NE:Rec
+    network=US:NE:Spur: Tag:network=US:NE:Spur
     network=US:NH: Tag:network=US:NH
     network=US:NJ: Tag:network=US:NJ
     network=US:NJ:Atlantic: Tag:network=US:NJ:Atlantic
     network=US:NJ:Bergen: Tag:network=US:NJ:Bergen
     network=US:NJ:CR: Tag:network=US:NJ:CR
     network=US:NH: Tag:network=US:NH
     network=US:NJ: Tag:network=US:NJ
     network=US:NJ:Atlantic: Tag:network=US:NJ:Atlantic
     network=US:NJ:Bergen: Tag:network=US:NJ:Bergen
     network=US:NJ:CR: Tag:network=US:NJ:CR
+    network=US:NJ:Camden: Tag:network=US:NJ:Camden
     network=US:NJ:Cumberland: Tag:network=US:NJ:Cumberland
     network=US:NJ:Cumberland: Tag:network=US:NJ:Cumberland
+    network=US:NJ:Gloucester: Tag:network=US:NJ:Gloucester
     network=US:NJ:Passaic: Tag:network=US:NJ:Passaic
     network=US:NM: Tag:network=US:NM
     network=US:NV: Tag:network=US:NV
     network=US:NJ:Passaic: Tag:network=US:NJ:Passaic
     network=US:NM: Tag:network=US:NM
     network=US:NV: Tag:network=US:NV
@@ -9286,6 +12546,7 @@ en:
     network=US:OH:HOL: Tag:network=US:OH:HOL
     network=US:OH:JEF: Tag:network=US:OH:JEF
     network=US:OH:KNO: Tag:network=US:OH:KNO
     network=US:OH:HOL: Tag:network=US:OH:HOL
     network=US:OH:JEF: Tag:network=US:OH:JEF
     network=US:OH:KNO: Tag:network=US:OH:KNO
+    network=US:OH:LAK: Tag:network=US:OH:LAK
     network=US:OH:LAW: Tag:network=US:OH:LAW
     network=US:OH:LIC: Tag:network=US:OH:LIC
     network=US:OH:LOG: Tag:network=US:OH:LOG
     network=US:OH:LAW: Tag:network=US:OH:LAW
     network=US:OH:LIC: Tag:network=US:OH:LIC
     network=US:OH:LOG: Tag:network=US:OH:LOG
@@ -9314,6 +12575,7 @@ en:
     network=US:OH:STA: Tag:network=US:OH:STA
     network=US:OH:SUM: Tag:network=US:OH:SUM
     network=US:OH:SUM:Bath: Tag:network=US:OH:SUM:Bath
     network=US:OH:STA: Tag:network=US:OH:STA
     network=US:OH:SUM: Tag:network=US:OH:SUM
     network=US:OH:SUM:Bath: Tag:network=US:OH:SUM:Bath
+    network=US:OH:TRU: Tag:network=US:OH:TRU
     network=US:OH:TUS: Tag:network=US:OH:TUS
     network=US:OH:UNI: Tag:network=US:OH:UNI
     network=US:OH:VIN: Tag:network=US:OH:VIN
     network=US:OH:TUS: Tag:network=US:OH:TUS
     network=US:OH:UNI: Tag:network=US:OH:UNI
     network=US:OH:VIN: Tag:network=US:OH:VIN
@@ -9326,32 +12588,54 @@ en:
     network=US:OH:WYA: Tag:network=US:OH:WYA
     network=US:OK: Tag:network=US:OK
     network=US:OR: Tag:network=US:OR
     network=US:OH:WYA: Tag:network=US:OH:WYA
     network=US:OK: Tag:network=US:OK
     network=US:OR: Tag:network=US:OR
+    network=US:OR:Named: Tag:network=US:OR:Named
     network=US:PA: Tag:network=US:PA
     network=US:PA:Turnpike: Tag:network=US:PA:Turnpike
     network=US:RI: Tag:network=US:RI
     network=US:SC: Tag:network=US:SC
     network=US:SD: Tag:network=US:SD
     network=US:PA: Tag:network=US:PA
     network=US:PA:Turnpike: Tag:network=US:PA:Turnpike
     network=US:RI: Tag:network=US:RI
     network=US:SC: Tag:network=US:SC
     network=US:SD: Tag:network=US:SD
+    network=US:SD:Lincoln: Tag:network=US:SD:Lincoln
+    network=US:SD:Minnehaha: Tag:network=US:SD:Minnehaha
+    network=US:SD:Spink: Tag:network=US:SD:Spink
+    network=US:SD:Turner: Tag:network=US:SD:Turner
+    network=US:SD:Union: Tag:network=US:SD:Union
     network=US:TN: Tag:network=US:TN
     network=US:TN: Tag:network=US:TN
+    network=US:TN:primary: Tag:network=US:TN:primary
+    network=US:TN:secondary: Tag:network=US:TN:secondary
     network=US:TX: Tag:network=US:TX
     network=US:TX:Beltway: Tag:network=US:TX:Beltway
     network=US:TX:FM: Tag:network=US:TX:FM
     network=US:TX:Loop: Tag:network=US:TX:Loop
     network=US:TX:NASA: Tag:network=US:TX:NASA
     network=US:TX: Tag:network=US:TX
     network=US:TX:Beltway: Tag:network=US:TX:Beltway
     network=US:TX:FM: Tag:network=US:TX:FM
     network=US:TX:Loop: Tag:network=US:TX:Loop
     network=US:TX:NASA: Tag:network=US:TX:NASA
+    network=US:TX:PA: Tag:network=US:TX:PA
     network=US:TX:Park: Tag:network=US:TX:Park
     network=US:TX:RM: Tag:network=US:TX:RM
     network=US:TX:Recreational: Tag:network=US:TX:Recreational
     network=US:TX:Spur: Tag:network=US:TX:Spur
     network=US:TX:Park: Tag:network=US:TX:Park
     network=US:TX:RM: Tag:network=US:TX:RM
     network=US:TX:Recreational: Tag:network=US:TX:Recreational
     network=US:TX:Spur: Tag:network=US:TX:Spur
+    network=US:TX:Van_Zandt: Tag:network=US:TX:Van Zandt
     network=US:TX:Wood: Tag:network=US:TX:Wood
     network=US:US: Tag:network=US:US
     network=US:TX:Wood: Tag:network=US:TX:Wood
     network=US:US: Tag:network=US:US
+    network=US:US:Alternate: Tag:network=US:US:Alternate
+    network=US:US:Business: Tag:network=US:US:Business
+    network=US:US:Bypass: Tag:network=US:US:Bypass
+    network=US:US:Historic: Tag:network=US:US:Historic
+    network=US:US:Spur: Tag:network=US:US:Spur
+    network=US:US:Truck: Tag:network=US:US:Truck
     network=US:UT: Tag:network=US:UT
     network=US:VA: Tag:network=US:VA
     network=US:VA:Secondary: Tag:network=US:VA:Secondary
     network=US:VA:secondary: Tag:network=US:VA:secondary
     network=US:UT: Tag:network=US:UT
     network=US:VA: Tag:network=US:VA
     network=US:VA:Secondary: Tag:network=US:VA:Secondary
     network=US:VA:secondary: Tag:network=US:VA:secondary
+    network=US:VI: Tag:network=US:VI
     network=US:VT: Tag:network=US:VT
     network=US:WA: Tag:network=US:WA
     network=US:WI: Tag:network=US:WI
     network=US:VT: Tag:network=US:VT
     network=US:WA: Tag:network=US:WA
     network=US:WI: Tag:network=US:WI
+    network=US:WI:Rustic: Tag:network=US:WI:Rustic
     network=US:WV: Tag:network=US:WV
     network=US:WV:Berkeley: Tag:network=US:WV:Berkeley
     network=US:WV: Tag:network=US:WV
     network=US:WV:Berkeley: Tag:network=US:WV:Berkeley
+    network=US:WV:County: Tag:network=US:WV:County
+    network=US:WV:Gilmer: Tag:network=US:WV:Gilmer
+    network=US:WV:HARP: Tag:network=US:WV:HARP
+    network=US:WV:Mason: Tag:network=US:WV:Mason
     network=US:WV:McDowell: Tag:network=US:WV:McDowell
     network=US:WV:Mercer: Tag:network=US:WV:Mercer
     network=US:WY: Tag:network=US:WY
     network=US:WV:McDowell: Tag:network=US:WV:McDowell
     network=US:WV:Mercer: Tag:network=US:WV:Mercer
     network=US:WY: Tag:network=US:WY
@@ -9359,9 +12643,12 @@ en:
     network=VE:R:PO: Tag:network=VE:R:PO
     network=VE:T:PO: Tag:network=VE:T:PO
     network=VE:ramal:portuguesa: Tag:network=VE:ramal:portuguesa
     network=VE:R:PO: Tag:network=VE:R:PO
     network=VE:T:PO: Tag:network=VE:T:PO
     network=VE:ramal:portuguesa: Tag:network=VE:ramal:portuguesa
+    network=VIVA: Tag:network=VIVA
+    network=York_Region_Transit: Tag:network=York Region Transit
     network=call-a-bike: Tag:network=call-a-bike
     network=cambio/stadtmobil: Tag:network=cambio/stadtmobil
     network=cambio_stadtmobil: Tag:network=cambio stadtmobil
     network=call-a-bike: Tag:network=call-a-bike
     network=cambio/stadtmobil: Tag:network=cambio/stadtmobil
     network=cambio_stadtmobil: Tag:network=cambio stadtmobil
+    network=e-road: Tag:network=e-road
     network=e-waterway: Tag:network=e-waterway
     network=icn: Tag:network=icn
     network=iwn: Tag:network=iwn
     network=e-waterway: Tag:network=e-waterway
     network=icn: Tag:network=icn
     network=iwn: Tag:network=iwn
@@ -9380,9 +12667,13 @@ en:
     network=rmn: Tag:network=rmn
     network=rpn: Tag:network=rpn
     network=rwn: Tag:network=rwn
     network=rmn: Tag:network=rmn
     network=rpn: Tag:network=rpn
     network=rwn: Tag:network=rwn
+    network=sk:national: Tag:network=sk:national
     nhd:fcode=46003: Tag:nhd:fcode=46003
     nhd:ftype=StreamRiver: Tag:nhd:ftype=StreamRiver
     noexit=no: Tag:noexit=no
     nhd:fcode=46003: Tag:nhd:fcode=46003
     nhd:ftype=StreamRiver: Tag:nhd:ftype=StreamRiver
     noexit=no: Tag:noexit=no
+    noexit=yes: Tag:noexit=yes
+    noname=yes: Tag:noname=yes
+    nonsquare=yes: Tag:nonsquare=yes
     observatory:type=astronomical: Tag:observatory:type=astronomical
     observatory:type=gravitational: Tag:observatory:type=gravitational
     observatory:type=meteorological: Tag:observatory:type=meteorological
     observatory:type=astronomical: Tag:observatory:type=astronomical
     observatory:type=gravitational: Tag:observatory:type=gravitational
     observatory:type=meteorological: Tag:observatory:type=meteorological
@@ -9393,11 +12684,19 @@ en:
     office=adoption_agency: Tag:office=adoption agency
     office=advertising_agency: Tag:office=advertising agency
     office=architect: Tag:office=architect
     office=adoption_agency: Tag:office=adoption agency
     office=advertising_agency: Tag:office=advertising agency
     office=architect: Tag:office=architect
+    office=archive: Tag:office=archive
     office=association: Tag:office=association
     office=bail_bond_agent: Tag:office=bail bond agent
     office=association: Tag:office=association
     office=bail_bond_agent: Tag:office=bail bond agent
+    office=call_center: Tag:office=call center
+    office=call_centre: Tag:office=call centre
+    office=camping: Tag:office=camping
+    office=chamber: Tag:office=chamber
     office=charity: Tag:office=charity
     office=company: Tag:office=company
     office=charity: Tag:office=charity
     office=company: Tag:office=company
+    office=construction_company: Tag:office=construction company
     office=consulting: Tag:office=consulting
     office=consulting: Tag:office=consulting
+    office=cooperative: Tag:office=cooperative
+    office=courier: Tag:office=courier
     office=coworking: Tag:office=coworking
     office=diplomatic: Tag:office=diplomatic
     office=educational_institution: Tag:office=educational institution
     office=coworking: Tag:office=coworking
     office=diplomatic: Tag:office=diplomatic
     office=educational_institution: Tag:office=educational institution
@@ -9406,18 +12705,25 @@ en:
     office=engineer: Tag:office=engineer
     office=estate_agent: Tag:office=estate agent
     office=financial: Tag:office=financial
     office=engineer: Tag:office=engineer
     office=estate_agent: Tag:office=estate agent
     office=financial: Tag:office=financial
+    office=financial_advisor: Tag:office=financial advisor
     office=forestry: Tag:office=forestry
     office=foundation: Tag:office=foundation
     office=geodesist: Tag:office=geodesist
     office=government: Tag:office=government
     office=graphic_design: Tag:office=graphic design
     office=guide: Tag:office=guide
     office=forestry: Tag:office=forestry
     office=foundation: Tag:office=foundation
     office=geodesist: Tag:office=geodesist
     office=government: Tag:office=government
     office=graphic_design: Tag:office=graphic design
     office=guide: Tag:office=guide
+    office=harbour_master: Tag:office=harbour master
     office=healthcare: Tag:office=healthcare
     office=healthcare: Tag:office=healthcare
+    office=highway: Tag:office=highway
+    office=information: Tag:office=information
     office=insurance: Tag:office=insurance
     office=insurance: Tag:office=insurance
+    office=interior_design: Tag:office=interior design
     office=international_organization: Tag:office=international organization
     office=it: Tag:office=it
     office=lawyer: Tag:office=lawyer
     office=international_organization: Tag:office=international organization
     office=it: Tag:office=it
     office=lawyer: Tag:office=lawyer
+    office=lifeguard: Tag:office=lifeguard
     office=logistics: Tag:office=logistics
     office=logistics: Tag:office=logistics
+    office=lost_property: Tag:office=lost property
     office=medical: Tag:office=medical
     office=moving_company: Tag:office=moving company
     office=newspaper: Tag:office=newspaper
     office=medical: Tag:office=medical
     office=moving_company: Tag:office=moving company
     office=newspaper: Tag:office=newspaper
@@ -9426,15 +12732,21 @@ en:
     office=notary: Tag:office=notary
     office=occupational_safety: Tag:office=occupational safety
     office=parish: Tag:office=parish
     office=notary: Tag:office=notary
     office=occupational_safety: Tag:office=occupational safety
     office=parish: Tag:office=parish
+    office=physician: Tag:office=physician
     office=political_party: Tag:office=political party
     office=political_party: Tag:office=political party
+    office=politician: Tag:office=politician
     office=private_investigator: Tag:office=private investigator
     office=property_management: Tag:office=property management
     office=private_investigator: Tag:office=private investigator
     office=property_management: Tag:office=property management
+    office=publisher: Tag:office=publisher
     office=quango: Tag:office=quango
     office=real_estate_agent: Tag:office=real estate agent
     office=realtor: Tag:office=realtor
     office=quango: Tag:office=quango
     office=real_estate_agent: Tag:office=real estate agent
     office=realtor: Tag:office=realtor
+    office=reception: Tag:office=reception
     office=register: Tag:office=register
     office=religion: Tag:office=religion
     office=register: Tag:office=register
     office=religion: Tag:office=religion
+    office=rental: Tag:office=rental
     office=research: Tag:office=research
     office=research: Tag:office=research
+    office=school: Tag:office=school
     office=security: Tag:office=security
     office=supervised_injection_site: Tag:office=supervised injection site
     office=surveyor: Tag:office=surveyor
     office=security: Tag:office=security
     office=supervised_injection_site: Tag:office=supervised injection site
     office=surveyor: Tag:office=surveyor
@@ -9443,23 +12755,48 @@ en:
     office=telecommunication: Tag:office=telecommunication
     office=therapist: Tag:office=therapist
     office=tourist_accommodation: Tag:office=tourist accommodation
     office=telecommunication: Tag:office=telecommunication
     office=therapist: Tag:office=therapist
     office=tourist_accommodation: Tag:office=tourist accommodation
+    office=translator: Tag:office=translator
+    office=transport: Tag:office=transport
     office=travel_agent: Tag:office=travel agent
     office=travel_agent: Tag:office=travel agent
+    office=tutoring: Tag:office=tutoring
     office=union: Tag:office=union
     office=university: Tag:office=university
     office=visa: Tag:office=visa
     office=water_utility: Tag:office=water utility
     office=union: Tag:office=union
     office=university: Tag:office=university
     office=visa: Tag:office=visa
     office=water_utility: Tag:office=water utility
+    office=wedding_planner: Tag:office=wedding planner
     office=yes: Tag:office=yes
     office=yes: Tag:office=yes
+    on_demand=yes: Tag:on demand=yes
     oneway:bicycle=yes: Tag:oneway:bicycle=yes
     oneway:bicycle=yes: Tag:oneway:bicycle=yes
+    oneway:bus=no: Tag:oneway:bus=no
+    oneway:moped=no: Tag:oneway:moped=no
+    oneway:motorcycle=no: Tag:oneway:motorcycle=no
+    oneway:psv=no: Tag:oneway:psv=no
     oneway=-1: Tag:oneway=-1
     oneway=alternating: Tag:oneway=alternating
     oneway=reversible: Tag:oneway=reversible
     oneway=-1: Tag:oneway=-1
     oneway=alternating: Tag:oneway=alternating
     oneway=reversible: Tag:oneway=reversible
+    oneway=yes: Tag:oneway=yes
     opening_hours:signed=no: Tag:opening hours:signed=no
     opening_hours:signed=no: Tag:opening hours:signed=no
+    opening_hours=24/7: Tag:opening hours=24/7
     operational_status=closed: Tag:operational status=closed
     operational_status=closed: Tag:operational status=closed
+    operational_status=out_of_order: Tag:operational status=out of order
+    operator=Bundesrepublik_Deutschland: Tag:operator=Bundesrepublik Deutschland
     operator=Cambio: Tag:operator=Cambio
     operator=CiteeCar: Tag:operator=CiteeCar
     operator=Drive_Carsharing: Tag:operator=Drive Carsharing
     operator=Cambio: Tag:operator=Cambio
     operator=CiteeCar: Tag:operator=CiteeCar
     operator=Drive_Carsharing: Tag:operator=Drive Carsharing
+    operator=Enedis: Tag:operator=Enedis
     operator=Flinkster: Tag:operator=Flinkster
     operator=GRDF: Tag:operator=GRDF
     operator=Flinkster: Tag:operator=Flinkster
     operator=GRDF: Tag:operator=GRDF
+    operator=GRTgaz: Tag:operator=GRTgaz
+    operator=Havenbedrijf_Rotterdam_N.V.: Tag:operator=Havenbedrijf Rotterdam N.V.
+    operator=Koninkrijk_der_Nederlanden: Tag:operator=Koninkrijk der Nederlanden
+    operator=Land_Aruba: Tag:operator=Land Aruba
+    operator=Land_Curaçao: Tag:operator=Land Curaçao
+    operator=Land_Sint_Maarten: Tag:operator=Land Sint Maarten
+    operator=Orange: Tag:operator=Orange
+    operator=ProRail: Tag:operator=ProRail
+    operator=RTE: Tag:operator=RTE
+    operator=Rijkswaterstaat: Tag:operator=Rijkswaterstaat
+    operator=Staat_der_Nederlanden: Tag:operator=Staat der Nederlanden
     operator=Stadtmobil: Tag:operator=Stadtmobil
     operator=book-n-drive: Tag:operator=book-n-drive
     operator=cambio: Tag:operator=cambio
     operator=Stadtmobil: Tag:operator=Stadtmobil
     operator=book-n-drive: Tag:operator=book-n-drive
     operator=cambio: Tag:operator=cambio
@@ -9467,13 +12804,30 @@ en:
     operator=stadtmobil: Tag:operator=stadtmobil
     operator=teilAuto: Tag:operator=teilAuto
     orchard=meadow_orchard: Tag:orchard=meadow orchard
     operator=stadtmobil: Tag:operator=stadtmobil
     operator=teilAuto: Tag:operator=teilAuto
     orchard=meadow_orchard: Tag:orchard=meadow orchard
+    outdoor_seating=terrace: Tag:outdoor seating=terrace
+    outlet=bell_mouth: Tag:outlet=bell mouth
+    outlet=direct: Tag:outlet=direct
+    outlet=noise_barrier: Tag:outlet=noise barrier
+    outlet=screen: Tag:outlet=screen
+    outlet=sock: Tag:outlet=sock
+    outlet=valve: Tag:outlet=valve
+    ownership=private: Tag:ownership=private
+    park_ride=hov: Tag:park ride=hov
+    parking:both=street_side: Tag:parking:both=street side
     parking:lane:hgv=on_street: Tag:parking:lane:hgv=on street
     parking:lane:hgv=on_street: Tag:parking:lane:hgv=on street
+    parking:left=lane: Tag:parking:left=lane
+    parking:left=street_side: Tag:parking:left=street side
+    parking:orientation=perpendicular: Tag:parking:orientation=perpendicular
+    parking:right=street_side: Tag:parking:right=street side
     parking=lane: Tag:parking=lane
     parking=layby: Tag:parking=layby
     parking=multi-storey: Tag:parking=multi-storey
     parking=lane: Tag:parking=lane
     parking=layby: Tag:parking=layby
     parking=multi-storey: Tag:parking=multi-storey
+    parking=on_kerb: Tag:parking=on kerb
     parking=street_side: Tag:parking=street side
     parking=surface: Tag:parking=surface
     parking=underground: Tag:parking=underground
     parking=street_side: Tag:parking=street side
     parking=surface: Tag:parking=surface
     parking=underground: Tag:parking=underground
+    parking_space=charging: Tag:parking space=charging
+    parking_space=disabled: Tag:parking space=disabled
     passenger=international: Tag:passenger=international
     passenger=local: Tag:passenger=local
     passenger=national: Tag:passenger=national
     passenger=international: Tag:passenger=international
     passenger=local: Tag:passenger=local
     passenger=national: Tag:passenger=national
@@ -9484,6 +12838,7 @@ en:
     passenger=yes: Tag:passenger=yes
     path=crossing: Tag:path=crossing
     path=desire: Tag:path=desire
     passenger=yes: Tag:passenger=yes
     path=crossing: Tag:path=crossing
     path=desire: Tag:path=desire
+    path=sidewalk: Tag:path=sidewalk
     physically_present=no: Tag:physically present=no
     pilotage=boarding_point: Tag:pilotage=boarding point
     pilotage=office: Tag:pilotage=office
     physically_present=no: Tag:physically present=no
     pilotage=boarding_point: Tag:pilotage=boarding point
     pilotage=office: Tag:pilotage=office
@@ -9493,9 +12848,11 @@ en:
     pipeline=valve: Tag:pipeline=valve
     piste:type=connection: Tag:piste:type=connection
     piste:type=downhill: Tag:piste:type=downhill
     pipeline=valve: Tag:pipeline=valve
     piste:type=connection: Tag:piste:type=connection
     piste:type=downhill: Tag:piste:type=downhill
+    piste:type=hike: Tag:piste:type=hike
     piste:type=nordic: Tag:piste:type=nordic
     piste:type=ski_jump: Tag:piste:type=ski jump
     piste:type=ski_jump_landing: Tag:piste:type=ski jump landing
     piste:type=nordic: Tag:piste:type=nordic
     piste:type=ski_jump: Tag:piste:type=ski jump
     piste:type=ski_jump_landing: Tag:piste:type=ski jump landing
+    piste:type=sled: Tag:piste:type=sled
     place=allotments: Tag:place=allotments
     place=archipelago: Tag:place=archipelago
     place=borough: Tag:place=borough
     place=allotments: Tag:place=allotments
     place=archipelago: Tag:place=archipelago
     place=borough: Tag:place=borough
@@ -9515,6 +12872,7 @@ en:
     place=neighbourhood: Tag:place=neighbourhood
     place=ocean: Tag:place=ocean
     place=plot: Tag:place=plot
     place=neighbourhood: Tag:place=neighbourhood
     place=ocean: Tag:place=ocean
     place=plot: Tag:place=plot
+    place=polder: Tag:place=polder
     place=province: Tag:place=province
     place=quarter: Tag:place=quarter
     place=region: Tag:place=region
     place=province: Tag:place=province
     place=quarter: Tag:place=quarter
     place=region: Tag:place=region
@@ -9522,35 +12880,67 @@ en:
     place=shieling: Tag:place=shieling
     place=square: Tag:place=square
     place=state: Tag:place=state
     place=shieling: Tag:place=shieling
     place=square: Tag:place=square
     place=state: Tag:place=state
+    place=subcounty: Tag:place=subcounty
     place=suburb: Tag:place=suburb
     place=town: Tag:place=town
     place=village: Tag:place=village
     place=suburb: Tag:place=suburb
     place=town: Tag:place=town
     place=village: Tag:place=village
+    place_of_mourning=yes: Tag:place of mourning=yes
+    place_of_worship=holy_well: Tag:place of worship=holy well
+    place_of_worship=lourdes_grotto: Tag:place of worship=lourdes grotto
+    place_of_worship=mass_rock: Tag:place of worship=mass rock
+    place_of_worship=musalla: Tag:place of worship=musalla
     placement=right_of:1: Tag:placement=right of:1
     placement=transition: Tag:placement=transition
     placement=right_of:1: Tag:placement=right of:1
     placement=transition: Tag:placement=transition
+    plant:method=anaerobic_digestion: Tag:plant:method=anaerobic digestion
+    plant:method=barrage: Tag:plant:method=barrage
     plant:method=combustion: Tag:plant:method=combustion
     plant:method=combustion: Tag:plant:method=combustion
+    plant:method=fission: Tag:plant:method=fission
     plant:method=gasification: Tag:plant:method=gasification
     plant:method=gasification: Tag:plant:method=gasification
+    plant:method=lithium-ion: Tag:plant:method=lithium-ion
     plant:method=photovoltaic: Tag:plant:method=photovoltaic
     plant:method=run-of-the-river: Tag:plant:method=run-of-the-river
     plant:method=thermal: Tag:plant:method=thermal
     plant:method=water-pumped-storage: Tag:plant:method=water-pumped-storage
     plant:method=water-storage: Tag:plant:method=water-storage
     plant:method=photovoltaic: Tag:plant:method=photovoltaic
     plant:method=run-of-the-river: Tag:plant:method=run-of-the-river
     plant:method=thermal: Tag:plant:method=thermal
     plant:method=water-pumped-storage: Tag:plant:method=water-pumped-storage
     plant:method=water-storage: Tag:plant:method=water-storage
+    plant:method=wind_turbine: Tag:plant:method=wind turbine
     plant:source=battery: Tag:plant:source=battery
     plant:source=battery: Tag:plant:source=battery
+    plant:source=biogas: Tag:plant:source=biogas
     plant:source=biomass: Tag:plant:source=biomass
     plant:source=coal: Tag:plant:source=coal
     plant:source=biomass: Tag:plant:source=biomass
     plant:source=coal: Tag:plant:source=coal
+    plant:source=diesel: Tag:plant:source=diesel
+    plant:source=flywheel: Tag:plant:source=flywheel
     plant:source=gas: Tag:plant:source=gas
     plant:source=geothermal: Tag:plant:source=geothermal
     plant:source=hydro: Tag:plant:source=hydro
     plant:source=nuclear: Tag:plant:source=nuclear
     plant:source=oil: Tag:plant:source=oil
     plant:source=solar: Tag:plant:source=solar
     plant:source=gas: Tag:plant:source=gas
     plant:source=geothermal: Tag:plant:source=geothermal
     plant:source=hydro: Tag:plant:source=hydro
     plant:source=nuclear: Tag:plant:source=nuclear
     plant:source=oil: Tag:plant:source=oil
     plant:source=solar: Tag:plant:source=solar
+    plant:source=tidal: Tag:plant:source=tidal
     plant:source=waste: Tag:plant:source=waste
     plant:source=wind: Tag:plant:source=wind
     plant:type=combined_cycle: Tag:plant:type=combined cycle
     plant:type=gas_turbine: Tag:plant:type=gas turbine
     plant:source=waste: Tag:plant:source=waste
     plant:source=wind: Tag:plant:source=wind
     plant:type=combined_cycle: Tag:plant:type=combined cycle
     plant:type=gas_turbine: Tag:plant:type=gas turbine
+    plant:type=lithium_ion: Tag:plant:type=lithium ion
+    plant:type=reciprocating_engine: Tag:plant:type=reciprocating engine
     plant:type=solar_photovoltaic_panel: Tag:plant:type=solar photovoltaic panel
     plant:type=steam_turbine: Tag:plant:type=steam turbine
     plant:type=solar_photovoltaic_panel: Tag:plant:type=solar photovoltaic panel
     plant:type=steam_turbine: Tag:plant:type=steam turbine
+    playground=balancebeam: Tag:playground=balancebeam
+    playground=bridge: Tag:playground=bridge
+    playground=climbingframe: Tag:playground=climbingframe
+    playground=climbingwall: Tag:playground=climbingwall
+    playground=funnel_ball: Tag:playground=funnel ball
+    playground=hopscotch: Tag:playground=hopscotch
+    playground=horizontal_bar: Tag:playground=horizontal bar
+    playground=map: Tag:playground=map
+    playground=playhouse: Tag:playground=playhouse
+    playground=sandpit: Tag:playground=sandpit
+    playground=sledding: Tag:playground=sledding
     playground=slide: Tag:playground=slide
     playground=structure: Tag:playground=structure
     playground=slide: Tag:playground=slide
     playground=structure: Tag:playground=structure
+    playground=teenshelter: Tag:playground=teenshelter
+    playground=tetherball: Tag:playground=tetherball
+    playground=tunnel_tube: Tag:playground=tunnel tube
+    playground=youth_bench: Tag:playground=youth bench
     pole=transition: Tag:pole=transition
     police=academy: Tag:police=academy
     police=barracks: Tag:police=barracks
     pole=transition: Tag:pole=transition
     police=academy: Tag:police=academy
     police=barracks: Tag:police=barracks
@@ -9564,6 +12954,17 @@ en:
     police=storage: Tag:police=storage
     police=training_area: Tag:police=training area
     police=yes: Tag:police=yes
     police=storage: Tag:police=storage
     police=training_area: Tag:police=training area
     police=yes: Tag:police=yes
+    political_division=NL:kamerkieskring: Tag:political division=NL:kamerkieskring
+    political_division=NL:statenkieskring: Tag:political division=NL:statenkieskring
+    political_division=TR:TBMM: Tag:political division=TR:TBMM
+    political_division=congressional_district: Tag:political division=congressional
+      district
+    political_division=euro_const: Tag:political division=euro const
+    political_division=linguistic_community: Tag:political division=linguistic community
+    port=cargo: Tag:port=cargo
+    port=fishing: Tag:port=fishing
+    port=roro: Tag:port=roro
+    post_office=post_partner: Tag:post office=post partner
     power=antenna_line: Tag:power=antenna line
     power=busbar: Tag:power=busbar
     power=cable: Tag:power=cable
     power=antenna_line: Tag:power=antenna line
     power=busbar: Tag:power=busbar
     power=cable: Tag:power=cable
@@ -9574,7 +12975,6 @@ en:
     power=connection: Tag:power=connection
     power=converter: Tag:power=converter
     power=generator: Tag:power=generator
     power=connection: Tag:power=connection
     power=converter: Tag:power=converter
     power=generator: Tag:power=generator
-    power=grounding: Tag:power=grounding
     power=heliostat: Tag:power=heliostat
     power=insulator: Tag:power=insulator
     power=line: Tag:power=line
     power=heliostat: Tag:power=heliostat
     power=insulator: Tag:power=insulator
     power=line: Tag:power=line
@@ -9598,19 +12998,40 @@ en:
     priority=regional: Tag:priority=regional
     prison_camp=concentration_camp: Tag:prison camp=concentration camp
     prison_camp=extermination_camp: Tag:prison camp=extermination camp
     priority=regional: Tag:priority=regional
     prison_camp=concentration_camp: Tag:prison camp=concentration camp
     prison_camp=extermination_camp: Tag:prison camp=extermination camp
-    private=employees: Tag:private=employees
+    private=government: Tag:private=government
+    private=members: Tag:private=members
+    private=students: Tag:private=students
+    product=beer: Tag:product=beer
+    product=bricks: Tag:product=bricks
+    product=concrete: Tag:product=concrete
+    product=electronics: Tag:product=electronics
+    product=food: Tag:product=food
+    product=furniture: Tag:product=furniture
+    product=machinery: Tag:product=machinery
+    product=oil: Tag:product=oil
+    product=packaging: Tag:product=packaging
+    product=rice: Tag:product=rice
+    product=steel: Tag:product=steel
+    product=sugar: Tag:product=sugar
+    protect_class=11: Tag:protect class=11
+    protect_class=13: Tag:protect class=13
     protect_class=19: Tag:protect class=19
     protect_class=1a: Tag:protect class=1a
     protect_class=1b: Tag:protect class=1b
     protect_class=2: Tag:protect class=2
     protect_class=21: Tag:protect class=21
     protect_class=19: Tag:protect class=19
     protect_class=1a: Tag:protect class=1a
     protect_class=1b: Tag:protect class=1b
     protect_class=2: Tag:protect class=2
     protect_class=21: Tag:protect class=21
+    protect_class=22: Tag:protect class=22
     protect_class=3: Tag:protect class=3
     protect_class=4: Tag:protect class=4
     protect_class=5: Tag:protect class=5
     protect_class=6: Tag:protect class=6
     protected_area=nature_reserve: Tag:protected area=nature reserve
     protect_class=3: Tag:protect class=3
     protect_class=4: Tag:protect class=4
     protect_class=5: Tag:protect class=5
     protect_class=6: Tag:protect class=6
     protected_area=nature_reserve: Tag:protected area=nature reserve
+    protected_area=recreation: Tag:protected area=recreation
     pseudo=yes: Tag:pseudo=yes
     psv=designated: Tag:psv=designated
     pseudo=yes: Tag:pseudo=yes
     psv=designated: Tag:psv=designated
+    psv=no: Tag:psv=no
+    psv=yes: Tag:psv=yes
+    public_transport=no: Tag:public transport=no
     public_transport=pay_scale_area: Tag:public transport=pay scale area
     public_transport=platform: Tag:public transport=platform
     public_transport=pole: Tag:public transport=pole
     public_transport=pay_scale_area: Tag:public transport=pay scale area
     public_transport=platform: Tag:public transport=platform
     public_transport=pole: Tag:public transport=pole
@@ -9620,6 +13041,19 @@ en:
     pump=manual: Tag:pump=manual
     pump=no: Tag:pump=no
     pump=powered: Tag:pump=powered
     pump=manual: Tag:pump=manual
     pump=no: Tag:pump=no
     pump=powered: Tag:pump=powered
+    pump_mechanism=axial_flow: Tag:pump mechanism=axial flow
+    pump_mechanism=centrifugal: Tag:pump mechanism=centrifugal
+    pump_mechanism=diaphragm: Tag:pump mechanism=diaphragm
+    pump_mechanism=eductor_jet: Tag:pump mechanism=eductor jet
+    pump_mechanism=gear: Tag:pump mechanism=gear
+    pump_mechanism=peristaltic: Tag:pump mechanism=peristaltic
+    pump_mechanism=piston: Tag:pump mechanism=piston
+    pump_mechanism=progressive_cavity: Tag:pump mechanism=progressive cavity
+    pump_mechanism=pulser: Tag:pump mechanism=pulser
+    pump_mechanism=ram: Tag:pump mechanism=ram
+    pump_mechanism=rope: Tag:pump mechanism=rope
+    pump_mechanism=rotary_vane: Tag:pump mechanism=rotary vane
+    pump_mechanism=screw: Tag:pump mechanism=screw
     raba:id=1100: Tag:raba:id=1100
     raba:id=1160: Tag:raba:id=1160
     raba:id=1180: Tag:raba:id=1180
     raba:id=1100: Tag:raba:id=1100
     raba:id=1160: Tag:raba:id=1160
     raba:id=1180: Tag:raba:id=1180
@@ -9640,17 +13074,20 @@ en:
     radio_transponder:category=rotating_pattern: Tag:radio transponder:category=rotating
       pattern
     railway:radio=gsm-r: Tag:railway:radio=gsm-r
     radio_transponder:category=rotating_pattern: Tag:radio transponder:category=rotating
       pattern
     railway:radio=gsm-r: Tag:railway:radio=gsm-r
-    railway=PRT: Tag:railway=PRT
     railway=Subway: Tag:railway=Subway
     railway=abandoned: Tag:railway=abandoned
     railway=Subway: Tag:railway=Subway
     railway=abandoned: Tag:railway=abandoned
+    railway=border: Tag:railway=border
     railway=buffer_stop: Tag:railway=buffer stop
     railway=buffer_stop: Tag:railway=buffer stop
+    railway=construction: Tag:railway=construction
     railway=crossing: Tag:railway=crossing
     railway=crossing: Tag:railway=crossing
+    railway=crossing_box: Tag:railway=crossing box
     railway=crossing_controller: Tag:railway=crossing controller
     railway=derail: Tag:railway=derail
     railway=diamond: Tag:railway=diamond
     railway=disused: Tag:railway=disused
     railway=funicular: Tag:railway=funicular
     railway=halt: Tag:railway=halt
     railway=crossing_controller: Tag:railway=crossing controller
     railway=derail: Tag:railway=derail
     railway=diamond: Tag:railway=diamond
     railway=disused: Tag:railway=disused
     railway=funicular: Tag:railway=funicular
     railway=halt: Tag:railway=halt
+    railway=hirail_access: Tag:railway=hirail access
     railway=junction: Tag:railway=junction
     railway=level_crossing: Tag:railway=level crossing
     railway=light_rail: Tag:railway=light rail
     railway=junction: Tag:railway=junction
     railway=level_crossing: Tag:railway=level crossing
     railway=light_rail: Tag:railway=light rail
@@ -9658,13 +13095,17 @@ en:
     railway=miniature: Tag:railway=miniature
     railway=monorail: Tag:railway=monorail
     railway=narrow_gauge: Tag:railway=narrow gauge
     railway=miniature: Tag:railway=miniature
     railway=monorail: Tag:railway=monorail
     railway=narrow_gauge: Tag:railway=narrow gauge
+    railway=owner_change: Tag:railway=owner change
+    railway=phone: Tag:railway=phone
     railway=platform: Tag:railway=platform
     railway=platform_edge: Tag:railway=platform edge
     railway=preserved: Tag:railway=preserved
     railway=rail: Tag:railway=rail
     railway=rail_brake: Tag:railway=rail brake
     railway=railway_crossing: Tag:railway=railway crossing
     railway=platform: Tag:railway=platform
     railway=platform_edge: Tag:railway=platform edge
     railway=preserved: Tag:railway=preserved
     railway=rail: Tag:railway=rail
     railway=rail_brake: Tag:railway=rail brake
     railway=railway_crossing: Tag:railway=railway crossing
+    railway=razed: Tag:railway=razed
     railway=roundhouse: Tag:railway=roundhouse
     railway=roundhouse: Tag:railway=roundhouse
+    railway=service_station: Tag:railway=service station
     railway=signal: Tag:railway=signal
     railway=signal_box: Tag:railway=signal box
     railway=spur_junction: Tag:railway=spur junction
     railway=signal: Tag:railway=signal
     railway=signal_box: Tag:railway=signal box
     railway=spur_junction: Tag:railway=spur junction
@@ -9683,10 +13124,14 @@ en:
     railway=wash: Tag:railway=wash
     railway=water_crane: Tag:railway=water crane
     railway=water_tower: Tag:railway=water tower
     railway=wash: Tag:railway=wash
     railway=water_crane: Tag:railway=water crane
     railway=water_tower: Tag:railway=water tower
+    railway=workshop: Tag:railway=workshop
     railway=yard: Tag:railway=yard
     reclaimed=yes: Tag:reclaimed=yes
     railway=yard: Tag:railway=yard
     reclaimed=yes: Tag:reclaimed=yes
+    recreation_ground=showground: Tag:recreation ground=showground
     recycling_type=centre: Tag:recycling type=centre
     recycling_type=centre: Tag:recycling type=centre
+    recycling_type=container: Tag:recycling type=container
     refitted=yes: Tag:refitted=yes
     refitted=yes: Tag:refitted=yes
+    refrigerated=yes: Tag:refrigerated=yes
     refugee=yes: Tag:refugee=yes
     religion=buddhist: Tag:religion=buddhist
     religion=christian: Tag:religion=christian
     refugee=yes: Tag:refugee=yes
     religion=buddhist: Tag:religion=buddhist
     religion=christian: Tag:religion=christian
@@ -9695,31 +13140,77 @@ en:
     religion=jewish: Tag:religion=jewish
     religion=multifaith: Tag:religion=multifaith
     religion=muslim: Tag:religion=muslim
     religion=jewish: Tag:religion=jewish
     religion=multifaith: Tag:religion=multifaith
     religion=muslim: Tag:religion=muslim
+    religion=none: Tag:religion=none
     religion=pagan: Tag:religion=pagan
     religion=self-realization_fellowship: Tag:religion=self-realization fellowship
     religion=pagan: Tag:religion=pagan
     religion=self-realization_fellowship: Tag:religion=self-realization fellowship
+    religion=shamanic: Tag:religion=shamanic
     religion=shinto: Tag:religion=shinto
     religion=sikh: Tag:religion=sikh
     religion=taoist: Tag:religion=taoist
     religion=zoroastrian: Tag:religion=zoroastrian
     rental=appliance: Tag:rental=appliance
     religion=shinto: Tag:religion=shinto
     religion=sikh: Tag:religion=sikh
     religion=taoist: Tag:religion=taoist
     religion=zoroastrian: Tag:religion=zoroastrian
     rental=appliance: Tag:rental=appliance
+    rental=boat: Tag:rental=boat
+    rental=clothes: Tag:rental=clothes
+    rental=event: Tag:rental=event
+    rental=quadracycle: Tag:rental=quadracycle
     rental=ski: Tag:rental=ski
     rental=strandkorb: Tag:rental=strandkorb
     rental=trailer: Tag:rental=trailer
     repair=assisted_self_service: Tag:repair=assisted self service
     rental=ski: Tag:rental=ski
     rental=strandkorb: Tag:rental=strandkorb
     rental=trailer: Tag:rental=trailer
     repair=assisted_self_service: Tag:repair=assisted self service
+    repair=yes: Tag:repair=yes
     request_stop=yes: Tag:request stop=yes
     research=aerospace: Tag:research=aerospace
     residential=apartments: Tag:residential=apartments
     request_stop=yes: Tag:request stop=yes
     research=aerospace: Tag:research=aerospace
     residential=apartments: Tag:residential=apartments
+    residential=block: Tag:residential=block
+    residential=condominium: Tag:residential=condominium
+    residential=duplex: Tag:residential=duplex
     residential=halting_site: Tag:residential=halting site
     residential=halting_site: Tag:residential=halting site
+    residential=irregular_settlement: Tag:residential=irregular settlement
     residential=rural: Tag:residential=rural
     residential=rural: Tag:residential=rural
+    residential=single_family: Tag:residential=single family
+    residential=slum: Tag:residential=slum
+    residential=terrace: Tag:residential=terrace
+    residential=trailer_park: Tag:residential=trailer park
     residential=university: Tag:residential=university
     residential=urban: Tag:residential=urban
     resource=aggregate: Tag:resource=aggregate
     residential=university: Tag:residential=university
     residential=urban: Tag:residential=urban
     resource=aggregate: Tag:resource=aggregate
+    resource=coal: Tag:resource=coal
     resource=gravel: Tag:resource=gravel
     resource=sand: Tag:resource=sand
     resource=gravel: Tag:resource=gravel
     resource=sand: Tag:resource=sand
-    rfr=yes: Tag:rfr=yes
+    restriction:bicycle=stop: Tag:restriction:bicycle=stop
+    restriction=no_right_turn_on_red: Tag:restriction=no right turn on red
+    retaining_wall=flood_wall: Tag:retaining wall=flood wall
     road_marking=solid_stop_line: Tag:road marking=solid stop line
     road_marking=solid_stop_line: Tag:road marking=solid stop line
+    roller_coaster=station: Tag:roller coaster=station
+    roller_coaster=support: Tag:roller coaster=support
     roller_coaster=track: Tag:roller coaster=track
     roller_coaster=track: Tag:roller coaster=track
+    roof:shape=butterfly: Tag:roof:shape=butterfly
+    roof:shape=cone: Tag:roof:shape=cone
+    roof:shape=crosspitched: Tag:roof:shape=crosspitched
+    roof:shape=dome: Tag:roof:shape=dome
+    roof:shape=flat: Tag:roof:shape=flat
+    roof:shape=gabled: Tag:roof:shape=gabled
+    roof:shape=gabled_height_moved: Tag:roof:shape=gabled height moved
+    roof:shape=gambrel: Tag:roof:shape=gambrel
+    roof:shape=half-hipped: Tag:roof:shape=half-hipped
+    roof:shape=half_hipped: Tag:roof:shape=half hipped
+    roof:shape=hip-and-gable: Tag:roof:shape=hip-and-gable
+    roof:shape=hipped: Tag:roof:shape=hipped
+    roof:shape=hipped-and-gable: Tag:roof:shape=hipped-and-gable
+    roof:shape=hipped-and-gabled: Tag:roof:shape=hipped-and-gabled
+    roof:shape=mansard: Tag:roof:shape=mansard
+    roof:shape=many: Tag:roof:shape=many
+    roof:shape=onion: Tag:roof:shape=onion
+    roof:shape=parabolic: Tag:roof:shape=parabolic
+    roof:shape=pyramidal: Tag:roof:shape=pyramidal
+    roof:shape=round: Tag:roof:shape=round
+    roof:shape=sawtooth: Tag:roof:shape=sawtooth
+    roof:shape=side_half-hipped: Tag:roof:shape=side half-hipped
+    roof:shape=side_hipped: Tag:roof:shape=side hipped
+    roof:shape=skillion: Tag:roof:shape=skillion
+    roundabout=turbo: Tag:roundabout=turbo
     route=aqueduct: Tag:route=aqueduct
     route=aqueduct: Tag:route=aqueduct
+    route=atv: Tag:route=atv
     route=bicycle: Tag:route=bicycle
     route=boat: Tag:route=boat
     route=bus: Tag:route=bus
     route=bicycle: Tag:route=bicycle
     route=boat: Tag:route=boat
     route=bus: Tag:route=bus
@@ -9728,11 +13219,12 @@ en:
     route=coach: Tag:route=coach
     route=detour: Tag:route=detour
     route=evacuation: Tag:route=evacuation
     route=coach: Tag:route=coach
     route=detour: Tag:route=detour
     route=evacuation: Tag:route=evacuation
-    route=ferrata: Tag:route=ferrata
     route=ferry: Tag:route=ferry
     route=fitness_trail: Tag:route=fitness trail
     route=foot: Tag:route=foot
     route=ferry: Tag:route=ferry
     route=fitness_trail: Tag:route=fitness trail
     route=foot: Tag:route=foot
+    route=funicular: Tag:route=funicular
     route=hiking: Tag:route=hiking
     route=hiking: Tag:route=hiking
+    route=historic: Tag:route=historic
     route=horse: Tag:route=horse
     route=inline_skates: Tag:route=inline skates
     route=light_rail: Tag:route=light rail
     route=horse: Tag:route=horse
     route=inline_skates: Tag:route=inline skates
     route=light_rail: Tag:route=light rail
@@ -9758,15 +13250,53 @@ en:
     route=trolleybus: Tag:route=trolleybus
     route=waterway: Tag:route=waterway
     route=worship: Tag:route=worship
     route=trolleybus: Tag:route=trolleybus
     route=waterway: Tag:route=waterway
     route=worship: Tag:route=worship
+    rugby=league: Tag:rugby=league
+    rugby=union: Tag:rugby=union
+    ruins=mosque: Tag:ruins=mosque
+    ruins=temple: Tag:ruins=temple
+    runway=displaced_threshold: Tag:runway=displaced threshold
     sailing:tours=yes: Tag:sailing:tours=yes
     sailing:tours=yes: Tag:sailing:tours=yes
+    school:gender=female: Tag:school:gender=female
+    school:gender=male: Tag:school:gender=male
+    school:gender=mixed: Tag:school:gender=mixed
+    school=entrance: Tag:school=entrance
     seamark:beacon_cardinal:colour_pattern=horizontal: Tag:seamark:beacon cardinal:colour
       pattern=horizontal
     seamark:beacon_cardinal:colour_pattern=horizontal: Tag:seamark:beacon cardinal:colour
       pattern=horizontal
-    seamark:beacon_cardinal:shape=tower: Tag:seamark:beacon cardinal:shape=tower
     seamark:beacon_isolated_danger:colour=black;red;black: Tag:seamark:beacon isolated
       danger:colour=black;red;black
     seamark:beacon_isolated_danger:colour_pattern=horizontal: Tag:seamark:beacon isolated
       danger:colour pattern=horizontal
     seamark:beacon_isolated_danger:shape=tower: Tag:seamark:beacon isolated danger:shape=tower
     seamark:beacon_isolated_danger:colour=black;red;black: Tag:seamark:beacon isolated
       danger:colour=black;red;black
     seamark:beacon_isolated_danger:colour_pattern=horizontal: Tag:seamark:beacon isolated
       danger:colour pattern=horizontal
     seamark:beacon_isolated_danger:shape=tower: Tag:seamark:beacon isolated danger:shape=tower
+    seamark:beacon_lateral:category=channel_left: Tag:seamark:beacon lateral:category=channel
+      left
+    seamark:beacon_lateral:category=channel_left_bank: Tag:seamark:beacon lateral:category=channel
+      left bank
+    seamark:beacon_lateral:category=channel_right: Tag:seamark:beacon lateral:category=channel
+      right
+    seamark:beacon_lateral:category=channel_right_bank: Tag:seamark:beacon lateral:category=channel
+      right bank
+    seamark:beacon_lateral:category=crossover_left: Tag:seamark:beacon lateral:category=crossover
+      left
+    seamark:beacon_lateral:category=crossover_right: Tag:seamark:beacon lateral:category=crossover
+      right
+    seamark:beacon_lateral:category=danger_left: Tag:seamark:beacon lateral:category=danger
+      left
+    seamark:beacon_lateral:category=danger_right: Tag:seamark:beacon lateral:category=danger
+      right
+    seamark:beacon_lateral:category=harbour_left: Tag:seamark:beacon lateral:category=harbour
+      left
+    seamark:beacon_lateral:category=harbour_right: Tag:seamark:beacon lateral:category=harbour
+      right
+    seamark:beacon_lateral:category=port: Tag:seamark:beacon lateral:category=port
+    seamark:beacon_lateral:category=preferred_channel_port: Tag:seamark:beacon lateral:category=preferred
+      channel port
+    seamark:beacon_lateral:category=preferred_channel_starboard: Tag:seamark:beacon
+      lateral:category=preferred channel starboard
+    seamark:beacon_lateral:category=starboard: Tag:seamark:beacon lateral:category=starboard
+    seamark:beacon_lateral:category=waterway_left: Tag:seamark:beacon lateral:category=waterway
+      left
+    seamark:beacon_lateral:category=waterway_right: Tag:seamark:beacon lateral:category=waterway
+      right
     seamark:beacon_lateral:colour=green: Tag:seamark:beacon lateral:colour=green
     seamark:beacon_lateral:colour=green;red;green: Tag:seamark:beacon lateral:colour=green;red;green
     seamark:beacon_lateral:colour=green;white;green;white: Tag:seamark:beacon lateral:colour=green;white;green;white
     seamark:beacon_lateral:colour=green: Tag:seamark:beacon lateral:colour=green
     seamark:beacon_lateral:colour=green;red;green: Tag:seamark:beacon lateral:colour=green;red;green
     seamark:beacon_lateral:colour=green;white;green;white: Tag:seamark:beacon lateral:colour=green;white;green;white
@@ -9781,10 +13311,9 @@ en:
     seamark:beacon_lateral:shape=tower: Tag:seamark:beacon lateral:shape=tower
     seamark:beacon_lateral:shape=withy: Tag:seamark:beacon lateral:shape=withy
     seamark:beacon_safe_water:colour=red;white: Tag:seamark:beacon safe water:colour=red;white
     seamark:beacon_lateral:shape=tower: Tag:seamark:beacon lateral:shape=tower
     seamark:beacon_lateral:shape=withy: Tag:seamark:beacon lateral:shape=withy
     seamark:beacon_safe_water:colour=red;white: Tag:seamark:beacon safe water:colour=red;white
-    seamark:beacon_safe_water:colour_pattern=vertical: Tag:seamark:beacon safe water:colour
-      pattern=vertical
     seamark:beacon_safe_water:shape=tower: Tag:seamark:beacon safe water:shape=tower
     seamark:beacon_special_purpose:category=cable: Tag:seamark:beacon special purpose:category=cable
     seamark:beacon_safe_water:shape=tower: Tag:seamark:beacon safe water:shape=tower
     seamark:beacon_special_purpose:category=cable: Tag:seamark:beacon special purpose:category=cable
+    seamark:beacon_special_purpose:category=leading: Tag:seamark:beacon special purpose:category=leading
     seamark:beacon_special_purpose:category=notice: Tag:seamark:beacon special purpose:category=notice
     seamark:beacon_special_purpose:category=racing: Tag:seamark:beacon special purpose:category=racing
     seamark:beacon_special_purpose:category=warning: Tag:seamark:beacon special purpose:category=warning
     seamark:beacon_special_purpose:category=notice: Tag:seamark:beacon special purpose:category=notice
     seamark:beacon_special_purpose:category=racing: Tag:seamark:beacon special purpose:category=racing
     seamark:beacon_special_purpose:category=warning: Tag:seamark:beacon special purpose:category=warning
@@ -9797,24 +13326,52 @@ en:
     seamark:beacon_special_purpose:colour=white: Tag:seamark:beacon special purpose:colour=white
     seamark:beacon_special_purpose:colour=yellow: Tag:seamark:beacon special purpose:colour=yellow
     seamark:beacon_special_purpose:shape=cairn: Tag:seamark:beacon special purpose:shape=cairn
     seamark:beacon_special_purpose:colour=white: Tag:seamark:beacon special purpose:colour=white
     seamark:beacon_special_purpose:colour=yellow: Tag:seamark:beacon special purpose:colour=yellow
     seamark:beacon_special_purpose:shape=cairn: Tag:seamark:beacon special purpose:shape=cairn
+    seamark:beacon_special_purpose:shape=lattice: Tag:seamark:beacon special purpose:shape=lattice
+    seamark:beacon_special_purpose:shape=pile: Tag:seamark:beacon special purpose:shape=pile
     seamark:beacon_special_purpose:shape=pole: Tag:seamark:beacon special purpose:shape=pole
     seamark:beacon_special_purpose:shape=tower: Tag:seamark:beacon special purpose:shape=tower
     seamark:beacon_special_purpose:shape=pole: Tag:seamark:beacon special purpose:shape=pole
     seamark:beacon_special_purpose:shape=tower: Tag:seamark:beacon special purpose:shape=tower
-    seamark:buoy_cardinal:colour_pattern=horizontal: Tag:seamark:buoy cardinal:colour
-      pattern=horizontal
+    seamark:buoy_cardinal:category=east: Tag:seamark:buoy cardinal:category=east
+    seamark:buoy_cardinal:category=north: Tag:seamark:buoy cardinal:category=north
+    seamark:buoy_cardinal:category=south: Tag:seamark:buoy cardinal:category=south
+    seamark:buoy_cardinal:category=west: Tag:seamark:buoy cardinal:category=west
     seamark:buoy_cardinal:shape=can: Tag:seamark:buoy cardinal:shape=can
     seamark:buoy_cardinal:shape=conical: Tag:seamark:buoy cardinal:shape=conical
     seamark:buoy_cardinal:shape=pillar: Tag:seamark:buoy cardinal:shape=pillar
     seamark:buoy_cardinal:shape=spar: Tag:seamark:buoy cardinal:shape=spar
     seamark:buoy_cardinal:shape=spherical: Tag:seamark:buoy cardinal:shape=spherical
     seamark:buoy_cardinal:shape=can: Tag:seamark:buoy cardinal:shape=can
     seamark:buoy_cardinal:shape=conical: Tag:seamark:buoy cardinal:shape=conical
     seamark:buoy_cardinal:shape=pillar: Tag:seamark:buoy cardinal:shape=pillar
     seamark:buoy_cardinal:shape=spar: Tag:seamark:buoy cardinal:shape=spar
     seamark:buoy_cardinal:shape=spherical: Tag:seamark:buoy cardinal:shape=spherical
-    seamark:buoy_isolated_danger:colour=black;red;black: Tag:seamark:buoy isolated
-      danger:colour=black;red;black
-    seamark:buoy_isolated_danger:colour_pattern=horizontal: Tag:seamark:buoy isolated
-      danger:colour pattern=horizontal
     seamark:buoy_isolated_danger:shape=can: Tag:seamark:buoy isolated danger:shape=can
     seamark:buoy_isolated_danger:shape=conical: Tag:seamark:buoy isolated danger:shape=conical
     seamark:buoy_isolated_danger:shape=pillar: Tag:seamark:buoy isolated danger:shape=pillar
     seamark:buoy_isolated_danger:shape=spar: Tag:seamark:buoy isolated danger:shape=spar
     seamark:buoy_isolated_danger:shape=spherical: Tag:seamark:buoy isolated danger:shape=spherical
     seamark:buoy_isolated_danger:shape=can: Tag:seamark:buoy isolated danger:shape=can
     seamark:buoy_isolated_danger:shape=conical: Tag:seamark:buoy isolated danger:shape=conical
     seamark:buoy_isolated_danger:shape=pillar: Tag:seamark:buoy isolated danger:shape=pillar
     seamark:buoy_isolated_danger:shape=spar: Tag:seamark:buoy isolated danger:shape=spar
     seamark:buoy_isolated_danger:shape=spherical: Tag:seamark:buoy isolated danger:shape=spherical
+    seamark:buoy_lateral:category=bridge_pier: Tag:seamark:buoy lateral:category=bridge
+      pier
+    seamark:buoy_lateral:category=channel_left: Tag:seamark:buoy lateral:category=channel
+      left
+    seamark:buoy_lateral:category=channel_right: Tag:seamark:buoy lateral:category=channel
+      right
+    seamark:buoy_lateral:category=channel_separation: Tag:seamark:buoy lateral:category=channel
+      separation
+    seamark:buoy_lateral:category=danger_left: Tag:seamark:buoy lateral:category=danger
+      left
+    seamark:buoy_lateral:category=danger_right: Tag:seamark:buoy lateral:category=danger
+      right
+    seamark:buoy_lateral:category=port: Tag:seamark:buoy lateral:category=port
+    seamark:buoy_lateral:category=preferred_channel_port: Tag:seamark:buoy lateral:category=preferred
+      channel port
+    seamark:buoy_lateral:category=preferred_channel_starboard: Tag:seamark:buoy lateral:category=preferred
+      channel starboard
+    seamark:buoy_lateral:category=starboard: Tag:seamark:buoy lateral:category=starboard
+    seamark:buoy_lateral:category=turnoff_left: Tag:seamark:buoy lateral:category=turnoff
+      left
+    seamark:buoy_lateral:category=turnoff_right: Tag:seamark:buoy lateral:category=turnoff
+      right
+    seamark:buoy_lateral:category=waterway_left: Tag:seamark:buoy lateral:category=waterway
+      left
+    seamark:buoy_lateral:category=waterway_right: Tag:seamark:buoy lateral:category=waterway
+      right
+    seamark:buoy_lateral:category=waterway_separation: Tag:seamark:buoy lateral:category=waterway
+      separation
     seamark:buoy_lateral:colour=green: Tag:seamark:buoy lateral:colour=green
     seamark:buoy_lateral:colour=green;red;green: Tag:seamark:buoy lateral:colour=green;red;green
     seamark:buoy_lateral:colour=green;white;green;white: Tag:seamark:buoy lateral:colour=green;white;green;white
     seamark:buoy_lateral:colour=green: Tag:seamark:buoy lateral:colour=green
     seamark:buoy_lateral:colour=green;red;green: Tag:seamark:buoy lateral:colour=green;red;green
     seamark:buoy_lateral:colour=green;white;green;white: Tag:seamark:buoy lateral:colour=green;white;green;white
@@ -9827,8 +13384,6 @@ en:
     seamark:buoy_lateral:shape=can: Tag:seamark:buoy lateral:shape=can
     seamark:buoy_lateral:shape=conical: Tag:seamark:buoy lateral:shape=conical
     seamark:buoy_lateral:shape=pillar: Tag:seamark:buoy lateral:shape=pillar
     seamark:buoy_lateral:shape=can: Tag:seamark:buoy lateral:shape=can
     seamark:buoy_lateral:shape=conical: Tag:seamark:buoy lateral:shape=conical
     seamark:buoy_lateral:shape=pillar: Tag:seamark:buoy lateral:shape=pillar
-    seamark:buoy_lateral:shape=spar: Tag:seamark:buoy lateral:shape=spar
-    seamark:buoy_lateral:shape=spherical: Tag:seamark:buoy lateral:shape=spherical
     seamark:buoy_safe_water:colour=red;white: Tag:seamark:buoy safe water:colour=red;white
     seamark:buoy_safe_water:colour_pattern=vertical: Tag:seamark:buoy safe water:colour
       pattern=vertical
     seamark:buoy_safe_water:colour=red;white: Tag:seamark:buoy safe water:colour=red;white
     seamark:buoy_safe_water:colour_pattern=vertical: Tag:seamark:buoy safe water:colour
       pattern=vertical
@@ -9837,8 +13392,14 @@ en:
     seamark:buoy_safe_water:shape=pillar: Tag:seamark:buoy safe water:shape=pillar
     seamark:buoy_safe_water:shape=spar: Tag:seamark:buoy safe water:shape=spar
     seamark:buoy_safe_water:shape=spherical: Tag:seamark:buoy safe water:shape=spherical
     seamark:buoy_safe_water:shape=pillar: Tag:seamark:buoy safe water:shape=pillar
     seamark:buoy_safe_water:shape=spar: Tag:seamark:buoy safe water:shape=spar
     seamark:buoy_safe_water:shape=spherical: Tag:seamark:buoy safe water:shape=spherical
+    seamark:buoy_special_purpose:category=mooring: Tag:seamark:buoy special purpose:category=mooring
+    seamark:buoy_special_purpose:category=no_entry: Tag:seamark:buoy special purpose:category=no
+      entry
     seamark:buoy_special_purpose:category=odas: Tag:seamark:buoy special purpose:category=odas
     seamark:buoy_special_purpose:category=racing: Tag:seamark:buoy special purpose:category=racing
     seamark:buoy_special_purpose:category=odas: Tag:seamark:buoy special purpose:category=odas
     seamark:buoy_special_purpose:category=racing: Tag:seamark:buoy special purpose:category=racing
+    seamark:buoy_special_purpose:category=recreation_zone: Tag:seamark:buoy special
+      purpose:category=recreation zone
+    seamark:buoy_special_purpose:category=warning: Tag:seamark:buoy special purpose:category=warning
     seamark:buoy_special_purpose:colour=black: Tag:seamark:buoy special purpose:colour=black
     seamark:buoy_special_purpose:colour=blue: Tag:seamark:buoy special purpose:colour=blue
     seamark:buoy_special_purpose:colour=green: Tag:seamark:buoy special purpose:colour=green
     seamark:buoy_special_purpose:colour=black: Tag:seamark:buoy special purpose:colour=black
     seamark:buoy_special_purpose:colour=blue: Tag:seamark:buoy special purpose:colour=blue
     seamark:buoy_special_purpose:colour=green: Tag:seamark:buoy special purpose:colour=green
@@ -9861,6 +13422,8 @@ en:
     seamark:buoy_special_purpose:shape=super-buoy: Tag:seamark:buoy special purpose:shape=super-buoy
     seamark:cable_overhead:category=power: Tag:seamark:cable overhead:category=power
     seamark:cable_overhead:category=telephone: Tag:seamark:cable overhead:category=telephone
     seamark:buoy_special_purpose:shape=super-buoy: Tag:seamark:buoy special purpose:shape=super-buoy
     seamark:cable_overhead:category=power: Tag:seamark:cable overhead:category=power
     seamark:cable_overhead:category=telephone: Tag:seamark:cable overhead:category=telephone
+    seamark:cable_overhead:category=transmission: Tag:seamark:cable overhead:category=transmission
+    seamark:cable_submarine:category=power: Tag:seamark:cable submarine:category=power
     seamark:conspicuity=conspicious: Tag:seamark:conspicuity=conspicious
     seamark:conspicuity=conspicuous: Tag:seamark:conspicuity=conspicuous
     seamark:distance_mark:category=board: Tag:seamark:distance mark:category=board
     seamark:conspicuity=conspicious: Tag:seamark:conspicuity=conspicious
     seamark:conspicuity=conspicuous: Tag:seamark:conspicuity=conspicuous
     seamark:distance_mark:category=board: Tag:seamark:distance mark:category=board
@@ -9877,28 +13440,19 @@ en:
     seamark:fog_signal:category=siren: Tag:seamark:fog signal:category=siren
     seamark:fog_signal:category=whistle: Tag:seamark:fog signal:category=whistle
     seamark:fog_signal=yes: Tag:seamark:fog signal=yes
     seamark:fog_signal:category=siren: Tag:seamark:fog signal:category=siren
     seamark:fog_signal:category=whistle: Tag:seamark:fog signal:category=whistle
     seamark:fog_signal=yes: Tag:seamark:fog signal=yes
+    seamark:harbour:category=fishing: Tag:seamark:harbour:category=fishing
     seamark:harbour:category=marina: Tag:seamark:harbour:category=marina
     seamark:harbour:category=marina: Tag:seamark:harbour:category=marina
-    seamark:landmark:category=cairn: Tag:seamark:landmark:category=cairn
     seamark:landmark:category=cemetery: Tag:seamark:landmark:category=cemetery
     seamark:landmark:category=cemetery: Tag:seamark:landmark:category=cemetery
-    seamark:landmark:category=chimney: Tag:seamark:landmark:category=chimney
     seamark:landmark:category=column: Tag:seamark:landmark:category=column
     seamark:landmark:category=column: Tag:seamark:landmark:category=column
-    seamark:landmark:category=cross: Tag:seamark:landmark:category=cross
-    seamark:landmark:category=dish_aerial: Tag:seamark:landmark:category=dish aerial
     seamark:landmark:category=dome: Tag:seamark:landmark:category=dome
     seamark:landmark:category=dome: Tag:seamark:landmark:category=dome
-    seamark:landmark:category=flagstaff: Tag:seamark:landmark:category=flagstaff
     seamark:landmark:category=flare_stack: Tag:seamark:landmark:category=flare stack
     seamark:landmark:category=flare_stack: Tag:seamark:landmark:category=flare stack
-    seamark:landmark:category=mast: Tag:seamark:landmark:category=mast
     seamark:landmark:category=memorial: Tag:seamark:landmark:category=memorial
     seamark:landmark:category=minaret: Tag:seamark:landmark:category=minaret
     seamark:landmark:category=memorial: Tag:seamark:landmark:category=memorial
     seamark:landmark:category=minaret: Tag:seamark:landmark:category=minaret
-    seamark:landmark:category=monument: Tag:seamark:landmark:category=monument
     seamark:landmark:category=obelisk: Tag:seamark:landmark:category=obelisk
     seamark:landmark:category=radar_scanner: Tag:seamark:landmark:category=radar scanner
     seamark:landmark:category=obelisk: Tag:seamark:landmark:category=obelisk
     seamark:landmark:category=radar_scanner: Tag:seamark:landmark:category=radar scanner
-    seamark:landmark:category=spire: Tag:seamark:landmark:category=spire
     seamark:landmark:category=statue: Tag:seamark:landmark:category=statue
     seamark:landmark:category=statue: Tag:seamark:landmark:category=statue
-    seamark:landmark:category=tower: Tag:seamark:landmark:category=tower
     seamark:landmark:category=windmill: Tag:seamark:landmark:category=windmill
     seamark:landmark:category=windmotor: Tag:seamark:landmark:category=windmotor
     seamark:landmark:category=windmill: Tag:seamark:landmark:category=windmill
     seamark:landmark:category=windmotor: Tag:seamark:landmark:category=windmotor
-    seamark:landmark:category=windsock: Tag:seamark:landmark:category=windsock
     seamark:landmark:conspicuity=conspicuous: Tag:seamark:landmark:conspicuity=conspicuous
     seamark:landmark:function=buddhist_temple: Tag:seamark:landmark:function=buddhist
       temple
     seamark:landmark:conspicuity=conspicuous: Tag:seamark:landmark:conspicuity=conspicuous
     seamark:landmark:function=buddhist_temple: Tag:seamark:landmark:function=buddhist
       temple
@@ -9911,6 +13465,9 @@ en:
       shrine
     seamark:landmark:function=tempel: Tag:seamark:landmark:function=tempel
     seamark:landmark:function=temple: Tag:seamark:landmark:function=temple
       shrine
     seamark:landmark:function=tempel: Tag:seamark:landmark:function=tempel
     seamark:landmark:function=temple: Tag:seamark:landmark:function=temple
+    seamark:light:1:category=directional: Tag:seamark:light:1:category=directional
+    seamark:light:1:category=lower: Tag:seamark:light:1:category=lower
+    seamark:light:1:category=upper: Tag:seamark:light:1:category=upper
     seamark:light:category=aero: Tag:seamark:light:category=aero
     seamark:light:category=air_obstruction: Tag:seamark:light:category=air obstruction
     seamark:light:category=directional: Tag:seamark:light:category=directional
     seamark:light:category=aero: Tag:seamark:light:category=aero
     seamark:light:category=air_obstruction: Tag:seamark:light:category=air obstruction
     seamark:light:category=directional: Tag:seamark:light:category=directional
@@ -9934,10 +13491,27 @@ en:
     seamark:light:visibility=intensified: Tag:seamark:light:visibility=intensified
     seamark:light:visibility=part_obscured: Tag:seamark:light:visibility=part obscured
     seamark:light:visibility=unintensified: Tag:seamark:light:visibility=unintensified
     seamark:light:visibility=intensified: Tag:seamark:light:visibility=intensified
     seamark:light:visibility=part_obscured: Tag:seamark:light:visibility=part obscured
     seamark:light:visibility=unintensified: Tag:seamark:light:visibility=unintensified
+    seamark:mooring:category=dolphin: Tag:seamark:mooring:category=dolphin
+    seamark:mooring:category=pile: Tag:seamark:mooring:category=pile
     seamark:mooring:category=wall: Tag:seamark:mooring:category=wall
     seamark:mooring:category=wall: Tag:seamark:mooring:category=wall
+    seamark:notice:category=ferry_independent: Tag:seamark:notice:category=ferry independent
+    seamark:notice:category=ferry_non_independent: Tag:seamark:notice:category=ferry
+      non independent
+    seamark:notice:category=limited_headroom: Tag:seamark:notice:category=limited
+      headroom
+    seamark:notice:category=no_anchoring: Tag:seamark:notice:category=no anchoring
+    seamark:notice:category=no_berthing: Tag:seamark:notice:category=no berthing
+    seamark:notice:category=no_entry: Tag:seamark:notice:category=no entry
+    seamark:notice:category=speed_limit: Tag:seamark:notice:category=speed limit
+    seamark:notice:function=information: Tag:seamark:notice:function=information
+    seamark:notice:function=prohibition: Tag:seamark:notice:function=prohibition
+    seamark:notice:function=recommendation: Tag:seamark:notice:function=recommendation
+    seamark:notice:function=regulation: Tag:seamark:notice:function=regulation
+    seamark:notice:function=restriction: Tag:seamark:notice:function=restriction
     seamark:obstruction:category=boom: Tag:seamark:obstruction:category=boom
     seamark:radar_transponder:category=racon: Tag:seamark:radar transponder:category=racon
     seamark:radar_transponder:category=ramark: Tag:seamark:radar transponder:category=ramark
     seamark:obstruction:category=boom: Tag:seamark:obstruction:category=boom
     seamark:radar_transponder:category=racon: Tag:seamark:radar transponder:category=racon
     seamark:radar_transponder:category=ramark: Tag:seamark:radar transponder:category=ramark
+    seamark:radio_station:category=ais: Tag:seamark:radio station:category=ais
     seamark:radio_station:category=chiaka: Tag:seamark:radio station:category=chiaka
     seamark:radio_station:category=commercial_broadcast: Tag:seamark:radio station:category=commercial
       broadcast
     seamark:radio_station:category=chiaka: Tag:seamark:radio station:category=chiaka
     seamark:radio_station:category=commercial_broadcast: Tag:seamark:radio station:category=commercial
       broadcast
@@ -9945,6 +13519,9 @@ en:
       communication
     seamark:radio_station:category=time_signal: Tag:seamark:radio station:category=time
       signal
       communication
     seamark:radio_station:category=time_signal: Tag:seamark:radio station:category=time
       signal
+    seamark:rescue_station:category=lifeboat: Tag:seamark:rescue station:category=lifeboat
+    seamark:rescue_station:category=lifeboat_on_mooring: Tag:seamark:rescue station:category=lifeboat
+      on mooring
     seamark:restricted_area:category=ecological_reserve: Tag:seamark:restricted area:category=ecological
       reserve
     seamark:restricted_area:category=foul_ground: Tag:seamark:restricted area:category=foul
     seamark:restricted_area:category=ecological_reserve: Tag:seamark:restricted area:category=ecological
       reserve
     seamark:restricted_area:category=foul_ground: Tag:seamark:restricted area:category=foul
@@ -9986,6 +13563,14 @@ en:
       speed
     seamark:restricted_area:restriction=turning_prohibited: Tag:seamark:restricted
       area:restriction=turning prohibited
       speed
     seamark:restricted_area:restriction=turning_prohibited: Tag:seamark:restricted
       area:restriction=turning prohibited
+    seamark:sea_area:category=narrows: Tag:seamark:sea area:category=narrows
+    seamark:sea_area:category=shoal: Tag:seamark:sea area:category=shoal
+    seamark:shoreline_construction:category=breakwater: Tag:seamark:shoreline construction:category=breakwater
+    seamark:shoreline_construction:category=fender: Tag:seamark:shoreline construction:category=fender
+    seamark:shoreline_construction:category=groyne: Tag:seamark:shoreline construction:category=groyne
+    seamark:shoreline_construction:category=training_wall: Tag:seamark:shoreline construction:category=training
+      wall
+    seamark:signal_station_traffic:category=lock: Tag:seamark:signal station traffic:category=lock
     seamark:small_craft_facility:category=boat_hoist: Tag:seamark:small craft facility:category=boat
       hoist
     seamark:small_craft_facility:category=boatyard: Tag:seamark:small craft facility:category=boatyard
     seamark:small_craft_facility:category=boat_hoist: Tag:seamark:small craft facility:category=boat
       hoist
     seamark:small_craft_facility:category=boatyard: Tag:seamark:small craft facility:category=boatyard
@@ -9993,7 +13578,10 @@ en:
     seamark:small_craft_facility:category=electricity: Tag:seamark:small craft facility:category=electricity
     seamark:small_craft_facility:category=fuel_station: Tag:seamark:small craft facility:category=fuel
       station
     seamark:small_craft_facility:category=electricity: Tag:seamark:small craft facility:category=electricity
     seamark:small_craft_facility:category=fuel_station: Tag:seamark:small craft facility:category=fuel
       station
+    seamark:small_craft_facility:category=launderette: Tag:seamark:small craft facility:category=launderette
     seamark:small_craft_facility:category=laundrette: Tag:seamark:small craft facility:category=laundrette
     seamark:small_craft_facility:category=laundrette: Tag:seamark:small craft facility:category=laundrette
+    seamark:small_craft_facility:category=nautical_club: Tag:seamark:small craft facility:category=nautical
+      club
     seamark:small_craft_facility:category=pump-out: Tag:seamark:small craft facility:category=pump-out
     seamark:small_craft_facility:category=showers: Tag:seamark:small craft facility:category=showers
     seamark:small_craft_facility:category=slipway: Tag:seamark:small craft facility:category=slipway
     seamark:small_craft_facility:category=pump-out: Tag:seamark:small craft facility:category=pump-out
     seamark:small_craft_facility:category=showers: Tag:seamark:small craft facility:category=showers
     seamark:small_craft_facility:category=slipway: Tag:seamark:small craft facility:category=slipway
@@ -10004,17 +13592,12 @@ en:
     seamark:small_craft_facility:category=water_tap: Tag:seamark:small craft facility:category=water
       tap
     seamark:topmark:colour=black: Tag:seamark:topmark:colour=black
     seamark:small_craft_facility:category=water_tap: Tag:seamark:small craft facility:category=water
       tap
     seamark:topmark:colour=black: Tag:seamark:topmark:colour=black
-    seamark:topmark:colour=green: Tag:seamark:topmark:colour=green
     seamark:topmark:colour=grey: Tag:seamark:topmark:colour=grey
     seamark:topmark:colour=orange: Tag:seamark:topmark:colour=orange
     seamark:topmark:colour=grey: Tag:seamark:topmark:colour=grey
     seamark:topmark:colour=orange: Tag:seamark:topmark:colour=orange
-    seamark:topmark:colour=red: Tag:seamark:topmark:colour=red
     seamark:topmark:colour=white: Tag:seamark:topmark:colour=white
     seamark:topmark:colour=white: Tag:seamark:topmark:colour=white
-    seamark:topmark:colour=yellow: Tag:seamark:topmark:colour=yellow
     seamark:topmark:shape=2_cones_base_together: Tag:seamark:topmark:shape=2 cones
       base together
     seamark:topmark:shape=2_cones_down: Tag:seamark:topmark:shape=2 cones down
     seamark:topmark:shape=2_cones_base_together: Tag:seamark:topmark:shape=2 cones
       base together
     seamark:topmark:shape=2_cones_down: Tag:seamark:topmark:shape=2 cones down
-    seamark:topmark:shape=2_cones_point_together: Tag:seamark:topmark:shape=2 cones
-      point together
     seamark:topmark:shape=2_cones_up: Tag:seamark:topmark:shape=2 cones up
     seamark:topmark:shape=2_spheres: Tag:seamark:topmark:shape=2 spheres
     seamark:topmark:shape=board: Tag:seamark:topmark:shape=board
     seamark:topmark:shape=2_cones_up: Tag:seamark:topmark:shape=2 cones up
     seamark:topmark:shape=2_spheres: Tag:seamark:topmark:shape=2 spheres
     seamark:topmark:shape=board: Tag:seamark:topmark:shape=board
@@ -10026,55 +13609,89 @@ en:
     seamark:topmark:shape=diamond: Tag:seamark:topmark:shape=diamond
     seamark:topmark:shape=flag: Tag:seamark:topmark:shape=flag
     seamark:topmark:shape=rectangle: Tag:seamark:topmark:shape=rectangle
     seamark:topmark:shape=diamond: Tag:seamark:topmark:shape=diamond
     seamark:topmark:shape=flag: Tag:seamark:topmark:shape=flag
     seamark:topmark:shape=rectangle: Tag:seamark:topmark:shape=rectangle
-    seamark:topmark:shape=rhombus: Tag:seamark:topmark:shape=rhombus
     seamark:topmark:shape=sphere: Tag:seamark:topmark:shape=sphere
     seamark:topmark:shape=square: Tag:seamark:topmark:shape=square
     seamark:topmark:shape=upright-cross: Tag:seamark:topmark:shape=upright-cross
     seamark:topmark:shape=upright_cross: Tag:seamark:topmark:shape=upright cross
     seamark:topmark:shape=sphere: Tag:seamark:topmark:shape=sphere
     seamark:topmark:shape=square: Tag:seamark:topmark:shape=square
     seamark:topmark:shape=upright-cross: Tag:seamark:topmark:shape=upright-cross
     seamark:topmark:shape=upright_cross: Tag:seamark:topmark:shape=upright cross
-    seamark:topmark:shape=x-shape: Tag:seamark:topmark:shape=x-shape
     seamark:type=anchorage: Tag:seamark:type=anchorage
     seamark:type=beacon_cardinal: Tag:seamark:type=beacon cardinal
     seamark:type=beacon_isolated_danger: Tag:seamark:type=beacon isolated danger
     seamark:type=beacon_lateral: Tag:seamark:type=beacon lateral
     seamark:type=anchorage: Tag:seamark:type=anchorage
     seamark:type=beacon_cardinal: Tag:seamark:type=beacon cardinal
     seamark:type=beacon_isolated_danger: Tag:seamark:type=beacon isolated danger
     seamark:type=beacon_lateral: Tag:seamark:type=beacon lateral
+    seamark:type=beacon_safe_water: Tag:seamark:type=beacon safe water
     seamark:type=beacon_special_purpose: Tag:seamark:type=beacon special purpose
     seamark:type=berth: Tag:seamark:type=berth
     seamark:type=bridge: Tag:seamark:type=bridge
     seamark:type=beacon_special_purpose: Tag:seamark:type=beacon special purpose
     seamark:type=berth: Tag:seamark:type=berth
     seamark:type=bridge: Tag:seamark:type=bridge
+    seamark:type=bunker_station: Tag:seamark:type=bunker station
     seamark:type=buoy_cardinal: Tag:seamark:type=buoy cardinal
     seamark:type=buoy_cardinal: Tag:seamark:type=buoy cardinal
+    seamark:type=buoy_installation: Tag:seamark:type=buoy installation
+    seamark:type=buoy_isolated_danger: Tag:seamark:type=buoy isolated danger
     seamark:type=buoy_lateral: Tag:seamark:type=buoy lateral
     seamark:type=buoy_safe_water: Tag:seamark:type=buoy safe water
     seamark:type=buoy_special_purpose: Tag:seamark:type=buoy special purpose
     seamark:type=buoy_lateral: Tag:seamark:type=buoy lateral
     seamark:type=buoy_safe_water: Tag:seamark:type=buoy safe water
     seamark:type=buoy_special_purpose: Tag:seamark:type=buoy special purpose
+    seamark:type=cable_area: Tag:seamark:type=cable area
     seamark:type=cable_overhead: Tag:seamark:type=cable overhead
     seamark:type=cable_submarine: Tag:seamark:type=cable submarine
     seamark:type=cable_overhead: Tag:seamark:type=cable overhead
     seamark:type=cable_submarine: Tag:seamark:type=cable submarine
+    seamark:type=calling-in_point: Tag:seamark:type=calling-in point
     seamark:type=causeway: Tag:seamark:type=causeway
     seamark:type=checkpoint: Tag:seamark:type=checkpoint
     seamark:type=causeway: Tag:seamark:type=causeway
     seamark:type=checkpoint: Tag:seamark:type=checkpoint
+    seamark:type=coastguard_station: Tag:seamark:type=coastguard station
     seamark:type=communication_area: Tag:seamark:type=communication area
     seamark:type=communication_area: Tag:seamark:type=communication area
+    seamark:type=crane: Tag:seamark:type=crane
     seamark:type=distance_mark: Tag:seamark:type=distance mark
     seamark:type=distance_mark: Tag:seamark:type=distance mark
+    seamark:type=dredged_area: Tag:seamark:type=dredged area
     seamark:type=dry_dock: Tag:seamark:type=dry dock
     seamark:type=dry_dock: Tag:seamark:type=dry dock
+    seamark:type=dumping_ground: Tag:seamark:type=dumping ground
     seamark:type=exceptional_structure: Tag:seamark:type=exceptional structure
     seamark:type=exceptional_structure: Tag:seamark:type=exceptional structure
+    seamark:type=fairway: Tag:seamark:type=fairway
     seamark:type=gate: Tag:seamark:type=gate
     seamark:type=harbour: Tag:seamark:type=harbour
     seamark:type=gate: Tag:seamark:type=gate
     seamark:type=harbour: Tag:seamark:type=harbour
+    seamark:type=hulk: Tag:seamark:type=hulk
     seamark:type=landmark: Tag:seamark:type=landmark
     seamark:type=light: Tag:seamark:type=light
     seamark:type=landmark: Tag:seamark:type=landmark
     seamark:type=light: Tag:seamark:type=light
+    seamark:type=light_float: Tag:seamark:type=light float
     seamark:type=light_major: Tag:seamark:type=light major
     seamark:type=light_minor: Tag:seamark:type=light minor
     seamark:type=light_major: Tag:seamark:type=light major
     seamark:type=light_minor: Tag:seamark:type=light minor
+    seamark:type=light_vessel: Tag:seamark:type=light vessel
     seamark:type=lock_basin: Tag:seamark:type=lock basin
     seamark:type=lock_basin: Tag:seamark:type=lock basin
+    seamark:type=marine_farm: Tag:seamark:type=marine farm
     seamark:type=mooring: Tag:seamark:type=mooring
     seamark:type=navigation_line: Tag:seamark:type=navigation line
     seamark:type=notice: Tag:seamark:type=notice
     seamark:type=mooring: Tag:seamark:type=mooring
     seamark:type=navigation_line: Tag:seamark:type=navigation line
     seamark:type=notice: Tag:seamark:type=notice
+    seamark:type=obstruction: Tag:seamark:type=obstruction
     seamark:type=pile: Tag:seamark:type=pile
     seamark:type=pile: Tag:seamark:type=pile
+    seamark:type=pilot_boarding: Tag:seamark:type=pilot boarding
     seamark:type=pipeline_submarine: Tag:seamark:type=pipeline submarine
     seamark:type=platform: Tag:seamark:type=platform
     seamark:type=pipeline_submarine: Tag:seamark:type=pipeline submarine
     seamark:type=platform: Tag:seamark:type=platform
-    seamark:type=radar_transponder: Tag:seamark:type=radar transponder
+    seamark:type=production_area: Tag:seamark:type=production area
+    seamark:type=radar_reflector: Tag:seamark:type=radar reflector
+    seamark:type=radar_station: Tag:seamark:type=radar station
+    seamark:type=radio_station: Tag:seamark:type=radio station
     seamark:type=recommended_track: Tag:seamark:type=recommended track
     seamark:type=recommended_track: Tag:seamark:type=recommended track
+    seamark:type=rescue_station: Tag:seamark:type=rescue station
     seamark:type=restricted_area: Tag:seamark:type=restricted area
     seamark:type=rock: Tag:seamark:type=rock
     seamark:type=restricted_area: Tag:seamark:type=restricted area
     seamark:type=rock: Tag:seamark:type=rock
+    seamark:type=sea_area: Tag:seamark:type=sea area
+    seamark:type=seaplane_landing_area: Tag:seamark:type=seaplane landing area
+    seamark:type=separation_boundary: Tag:seamark:type=separation boundary
+    seamark:type=separation_lane: Tag:seamark:type=separation lane
+    seamark:type=separation_line: Tag:seamark:type=separation line
+    seamark:type=separation_zone: Tag:seamark:type=separation zone
+    seamark:type=shoreline_construction: Tag:seamark:type=shoreline construction
     seamark:type=signal_station_traffic: Tag:seamark:type=signal station traffic
     seamark:type=signal_station_warning: Tag:seamark:type=signal station warning
     seamark:type=small_craft_facility: Tag:seamark:type=small craft facility
     seamark:type=signal_station_traffic: Tag:seamark:type=signal station traffic
     seamark:type=signal_station_warning: Tag:seamark:type=signal station warning
     seamark:type=small_craft_facility: Tag:seamark:type=small craft facility
+    seamark:type=virtual_aton: Tag:seamark:type=virtual aton
+    seamark:type=waterway_gauge: Tag:seamark:type=waterway gauge
     seamark:type=wreck: Tag:seamark:type=wreck
     seamark:type=wreck: Tag:seamark:type=wreck
+    seamark:wreck:category=dangerous: Tag:seamark:wreck:category=dangerous
+    seamark:wreck:category=hull_showing: Tag:seamark:wreck:category=hull showing
+    seamark:wreck:category=non-dangerous: Tag:seamark:wreck:category=non-dangerous
     seamark=landmark: Tag:seamark=landmark
     seamark=landmark: Tag:seamark=landmark
+    second_hand=only: Tag:second hand=only
+    second_hand=yes: Tag:second hand=yes
     segregated=no: Tag:segregated=no
     segregated=yes: Tag:segregated=yes
     segregated=no: Tag:segregated=no
     segregated=yes: Tag:segregated=yes
+    service:vehicle:tyres=yes: Tag:service:vehicle:tyres=yes
     service=aircraft_control: Tag:service=aircraft control
     service=alley: Tag:service=alley
     service=bus: Tag:service=bus
     service=aircraft_control: Tag:service=aircraft control
     service=alley: Tag:service=alley
     service=bus: Tag:service=bus
@@ -10086,24 +13703,40 @@ en:
     service=driveway: Tag:service=driveway
     service=driveway2: Tag:service=driveway2
     service=emergency_access: Tag:service=emergency access
     service=driveway: Tag:service=driveway
     service=driveway2: Tag:service=driveway2
     service=emergency_access: Tag:service=emergency access
+    service=fuel: Tag:service=fuel
     service=irrigation: Tag:service=irrigation
     service=parking_aisle: Tag:service=parking aisle
     service=parts: Tag:service=parts
     service=irrigation: Tag:service=irrigation
     service=parking_aisle: Tag:service=parking aisle
     service=parts: Tag:service=parts
+    service=pipestem: Tag:service=pipestem
     service=repair: Tag:service=repair
     service=siding: Tag:service=siding
     service=repair: Tag:service=repair
     service=siding: Tag:service=siding
+    service=slipway: Tag:service=slipway
     service=spur: Tag:service=spur
     service=tyres: Tag:service=tyres
     service=yard: Tag:service=yard
     service=spur: Tag:service=spur
     service=tyres: Tag:service=tyres
     service=yard: Tag:service=yard
+    sett:style=portuguese: Tag:sett:style=portuguese
+    seveso=seuil_bas: Tag:seveso=seuil bas
+    seveso=seuil_haut: Tag:seveso=seuil haut
+    shelter_type=Wetterpilz: Tag:shelter type=Wetterpilz
     shelter_type=basic_hut: Tag:shelter type=basic hut
     shelter_type=basic_hut: Tag:shelter type=basic hut
+    shelter_type=changing_rooms: Tag:shelter type=changing rooms
     shelter_type=field_shelter: Tag:shelter type=field shelter
     shelter_type=field_shelter: Tag:shelter type=field shelter
+    shelter_type=gazebo: Tag:shelter type=gazebo
     shelter_type=lean_to: Tag:shelter type=lean to
     shelter_type=lean_to: Tag:shelter type=lean to
+    shelter_type=nuclear: Tag:shelter type=nuclear
+    shelter_type=pavilion: Tag:shelter type=pavilion
     shelter_type=picnic_shelter: Tag:shelter type=picnic shelter
     shelter_type=public_transport: Tag:shelter type=public transport
     shelter_type=picnic_shelter: Tag:shelter type=picnic shelter
     shelter_type=public_transport: Tag:shelter type=public transport
+    shelter_type=rock_shelter: Tag:shelter type=rock shelter
+    shelter_type=shopping_cart: Tag:shelter type=shopping cart
+    shelter_type=sun_shelter: Tag:shelter type=sun shelter
     shelter_type=weather_shelter: Tag:shelter type=weather shelter
     shelter_type=weather_shelter: Tag:shelter type=weather shelter
+    shelter_type=wetterpilz: Tag:shelter type=wetterpilz
+    shelter_type=wildlife_hide: Tag:shelter type=wildlife hide
     shop=*: Tag:shop=*
     shop=3d_printing: Tag:shop=3d printing
     shop=Alko: Tag:shop=Alko
     shop=*: Tag:shop=*
     shop=3d_printing: Tag:shop=3d printing
     shop=Alko: Tag:shop=Alko
-    shop=_business_machines: Tag:shop= business machines
+    shop=accessories: Tag:shop=accessories
     shop=adult: Tag:shop=adult
     shop=agrarian: Tag:shop=agrarian
     shop=alcohol: Tag:shop=alcohol
     shop=adult: Tag:shop=adult
     shop=agrarian: Tag:shop=agrarian
     shop=alcohol: Tag:shop=alcohol
@@ -10120,19 +13753,24 @@ en:
     shop=bag: Tag:shop=bag
     shop=bakery: Tag:shop=bakery
     shop=bathroom_furnishing: Tag:shop=bathroom furnishing
     shop=bag: Tag:shop=bag
     shop=bakery: Tag:shop=bakery
     shop=bathroom_furnishing: Tag:shop=bathroom furnishing
+    shop=bbq: Tag:shop=bbq
     shop=beauty: Tag:shop=beauty
     shop=bed: Tag:shop=bed
     shop=betting: Tag:shop=betting
     shop=beverages: Tag:shop=beverages
     shop=bicycle: Tag:shop=bicycle
     shop=beauty: Tag:shop=beauty
     shop=bed: Tag:shop=bed
     shop=betting: Tag:shop=betting
     shop=beverages: Tag:shop=beverages
     shop=bicycle: Tag:shop=bicycle
-    shop=board: Tag:shop=board
+    shop=bicycle_repair: Tag:shop=bicycle repair
     shop=boat: Tag:shop=boat
     shop=boat: Tag:shop=boat
+    shop=boat_parts: Tag:shop=boat parts
+    shop=boat_repair: Tag:shop=boat repair
     shop=bookmaker: Tag:shop=bookmaker
     shop=books: Tag:shop=books
     shop=boutique: Tag:shop=boutique
     shop=brewing_supplies: Tag:shop=brewing supplies
     shop=bookmaker: Tag:shop=bookmaker
     shop=books: Tag:shop=books
     shop=boutique: Tag:shop=boutique
     shop=brewing_supplies: Tag:shop=brewing supplies
+    shop=building_materials: Tag:shop=building materials
     shop=business_machines: Tag:shop=business machines
     shop=butcher: Tag:shop=butcher
     shop=business_machines: Tag:shop=business machines
     shop=butcher: Tag:shop=butcher
+    shop=cafe: Tag:shop=cafe
     shop=camera: Tag:shop=camera
     shop=candles: Tag:shop=candles
     shop=cannabis: Tag:shop=cannabis
     shop=camera: Tag:shop=camera
     shop=candles: Tag:shop=candles
     shop=cannabis: Tag:shop=cannabis
@@ -10143,6 +13781,7 @@ en:
     shop=car_service: Tag:shop=car service
     shop=caravan: Tag:shop=caravan
     shop=carpet: Tag:shop=carpet
     shop=car_service: Tag:shop=car service
     shop=caravan: Tag:shop=caravan
     shop=carpet: Tag:shop=carpet
+    shop=catalogue: Tag:shop=catalogue
     shop=cell_phones: Tag:shop=cell phones
     shop=ceramics: Tag:shop=ceramics
     shop=chandler: Tag:shop=chandler
     shop=cell_phones: Tag:shop=cell phones
     shop=ceramics: Tag:shop=ceramics
     shop=chandler: Tag:shop=chandler
@@ -10150,6 +13789,7 @@ en:
     shop=cheese: Tag:shop=cheese
     shop=chemist: Tag:shop=chemist
     shop=chocolate: Tag:shop=chocolate
     shop=cheese: Tag:shop=cheese
     shop=chemist: Tag:shop=chemist
     shop=chocolate: Tag:shop=chocolate
+    shop=christmas: Tag:shop=christmas
     shop=clothes: Tag:shop=clothes
     shop=coffee: Tag:shop=coffee
     shop=collector: Tag:shop=collector
     shop=clothes: Tag:shop=clothes
     shop=coffee: Tag:shop=coffee
     shop=collector: Tag:shop=collector
@@ -10165,6 +13805,7 @@ en:
     shop=dairy: Tag:shop=dairy
     shop=deli: Tag:shop=deli
     shop=delicatessen: Tag:shop=delicatessen
     shop=dairy: Tag:shop=dairy
     shop=deli: Tag:shop=deli
     shop=delicatessen: Tag:shop=delicatessen
+    shop=dentures: Tag:shop=dentures
     shop=department_store: Tag:shop=department store
     shop=discount: Tag:shop=discount
     shop=dive: Tag:shop=dive
     shop=department_store: Tag:shop=department store
     shop=discount: Tag:shop=discount
     shop=dive: Tag:shop=dive
@@ -10173,19 +13814,21 @@ en:
     shop=doors: Tag:shop=doors
     shop=dry_cleaning: Tag:shop=dry cleaning
     shop=e-cigarette: Tag:shop=e-cigarette
     shop=doors: Tag:shop=doors
     shop=dry_cleaning: Tag:shop=dry cleaning
     shop=e-cigarette: Tag:shop=e-cigarette
-    shop=edible_seeds: Tag:shop=edible seeds
+    shop=eggs: Tag:shop=eggs
     shop=electrical: Tag:shop=electrical
     shop=electronics: Tag:shop=electronics
     shop=energy: Tag:shop=energy
     shop=equestrian: Tag:shop=equestrian
     shop=erotic: Tag:shop=erotic
     shop=electrical: Tag:shop=electrical
     shop=electronics: Tag:shop=electronics
     shop=energy: Tag:shop=energy
     shop=equestrian: Tag:shop=equestrian
     shop=erotic: Tag:shop=erotic
+    shop=esoteric: Tag:shop=esoteric
     shop=estate_agent: Tag:shop=estate agent
     shop=fabric: Tag:shop=fabric
     shop=fabrics: Tag:shop=fabrics
     shop=estate_agent: Tag:shop=estate agent
     shop=fabric: Tag:shop=fabric
     shop=fabrics: Tag:shop=fabrics
+    shop=fan: Tag:shop=fan
     shop=farm: Tag:shop=farm
     shop=fashion: Tag:shop=fashion
     shop=fashion_accessories: Tag:shop=fashion accessories
     shop=farm: Tag:shop=farm
     shop=fashion: Tag:shop=fashion
     shop=fashion_accessories: Tag:shop=fashion accessories
-    shop=firearms: Tag:shop=firearms
+    shop=fast_food: Tag:shop=fast food
     shop=fireplace: Tag:shop=fireplace
     shop=fireworks: Tag:shop=fireworks
     shop=fish: Tag:shop=fish
     shop=fireplace: Tag:shop=fireplace
     shop=fireworks: Tag:shop=fireworks
     shop=fish: Tag:shop=fish
@@ -10208,6 +13851,7 @@ en:
     shop=games: Tag:shop=games
     shop=garden_centre: Tag:shop=garden centre
     shop=garden_furniture: Tag:shop=garden furniture
     shop=games: Tag:shop=games
     shop=garden_centre: Tag:shop=garden centre
     shop=garden_furniture: Tag:shop=garden furniture
+    shop=garden_machinery: Tag:shop=garden machinery
     shop=gas: Tag:shop=gas
     shop=general: Tag:shop=general
     shop=general_store: Tag:shop=general store
     shop=gas: Tag:shop=gas
     shop=general: Tag:shop=general
     shop=general_store: Tag:shop=general store
@@ -10215,8 +13859,11 @@ en:
     shop=gift: Tag:shop=gift
     shop=glass: Tag:shop=glass
     shop=glaziery: Tag:shop=glaziery
     shop=gift: Tag:shop=gift
     shop=glass: Tag:shop=glass
     shop=glaziery: Tag:shop=glaziery
+    shop=gold_buyer: Tag:shop=gold buyer
     shop=golf: Tag:shop=golf
     shop=golf: Tag:shop=golf
+    shop=golf_cart: Tag:shop=golf cart
     shop=greengrocer: Tag:shop=greengrocer
     shop=greengrocer: Tag:shop=greengrocer
+    shop=grill: Tag:shop=grill
     shop=grocery: Tag:shop=grocery
     shop=groundskeeping: Tag:shop=groundskeeping
     shop=gun: Tag:shop=gun
     shop=grocery: Tag:shop=grocery
     shop=groundskeeping: Tag:shop=groundskeeping
     shop=gun: Tag:shop=gun
@@ -10239,6 +13886,7 @@ en:
     shop=houseware: Tag:shop=houseware
     shop=hunting: Tag:shop=hunting
     shop=hvac: Tag:shop=hvac
     shop=houseware: Tag:shop=houseware
     shop=hunting: Tag:shop=hunting
     shop=hvac: Tag:shop=hvac
+    shop=hydroponics: Tag:shop=hydroponics
     shop=ice_cream: Tag:shop=ice cream
     shop=insurance: Tag:shop=insurance
     shop=interior_decoration: Tag:shop=interior decoration
     shop=ice_cream: Tag:shop=ice cream
     shop=insurance: Tag:shop=insurance
     shop=interior_decoration: Tag:shop=interior decoration
@@ -10248,10 +13896,13 @@ en:
     shop=junk_yard: Tag:shop=junk yard
     shop=kiosk: Tag:shop=kiosk
     shop=kitchen: Tag:shop=kitchen
     shop=junk_yard: Tag:shop=junk yard
     shop=kiosk: Tag:shop=kiosk
     shop=kitchen: Tag:shop=kitchen
+    shop=kitchenware: Tag:shop=kitchenware
+    shop=knives: Tag:shop=knives
     shop=lamps: Tag:shop=lamps
     shop=laundromat: Tag:shop=laundromat
     shop=laundry: Tag:shop=laundry
     shop=leather: Tag:shop=leather
     shop=lamps: Tag:shop=lamps
     shop=laundromat: Tag:shop=laundromat
     shop=laundry: Tag:shop=laundry
     shop=leather: Tag:shop=leather
+    shop=leatherworking: Tag:shop=leatherworking
     shop=lighting: Tag:shop=lighting
     shop=locksmith: Tag:shop=locksmith
     shop=lottery: Tag:shop=lottery
     shop=lighting: Tag:shop=lighting
     shop=locksmith: Tag:shop=locksmith
     shop=lottery: Tag:shop=lottery
@@ -10263,6 +13914,7 @@ en:
     shop=medical: Tag:shop=medical
     shop=medical_supply: Tag:shop=medical supply
     shop=military_surplus: Tag:shop=military surplus
     shop=medical: Tag:shop=medical
     shop=medical_supply: Tag:shop=medical supply
     shop=military_surplus: Tag:shop=military surplus
+    shop=mobile_equipment: Tag:shop=mobile equipment
     shop=mobile_home: Tag:shop=mobile home
     shop=mobile_phone: Tag:shop=mobile phone
     shop=mobility_scooter: Tag:shop=mobility scooter
     shop=mobile_home: Tag:shop=mobile home
     shop=mobile_phone: Tag:shop=mobile phone
     shop=mobility_scooter: Tag:shop=mobility scooter
@@ -10273,9 +13925,11 @@ en:
     shop=motorcycle_parts: Tag:shop=motorcycle parts
     shop=motorcycle_repair: Tag:shop=motorcycle repair
     shop=motorhome: Tag:shop=motorhome
     shop=motorcycle_parts: Tag:shop=motorcycle parts
     shop=motorcycle_repair: Tag:shop=motorcycle repair
     shop=motorhome: Tag:shop=motorhome
+    shop=motorsports: Tag:shop=motorsports
     shop=music: Tag:shop=music
     shop=musical_instrument: Tag:shop=musical instrument
     shop=musical_instruments: Tag:shop=musical instruments
     shop=music: Tag:shop=music
     shop=musical_instrument: Tag:shop=musical instrument
     shop=musical_instruments: Tag:shop=musical instruments
+    shop=new_age: Tag:shop=new age
     shop=newsagent: Tag:shop=newsagent
     shop=no: Tag:shop=no
     shop=nutrition_supplements: Tag:shop=nutrition supplements
     shop=newsagent: Tag:shop=newsagent
     shop=no: Tag:shop=no
     shop=nutrition_supplements: Tag:shop=nutrition supplements
@@ -10283,13 +13937,16 @@ en:
     shop=office_supplies: Tag:shop=office supplies
     shop=optician: Tag:shop=optician
     shop=organic: Tag:shop=organic
     shop=office_supplies: Tag:shop=office supplies
     shop=optician: Tag:shop=optician
     shop=organic: Tag:shop=organic
+    shop=orthopedics: Tag:shop=orthopedics
     shop=outdoor: Tag:shop=outdoor
     shop=outdoor: Tag:shop=outdoor
+    shop=outdoor_power_equipment: Tag:shop=outdoor power equipment
     shop=outpost: Tag:shop=outpost
     shop=paint: Tag:shop=paint
     shop=party: Tag:shop=party
     shop=pasta: Tag:shop=pasta
     shop=pastry: Tag:shop=pastry
     shop=pawnbroker: Tag:shop=pawnbroker
     shop=outpost: Tag:shop=outpost
     shop=paint: Tag:shop=paint
     shop=party: Tag:shop=party
     shop=pasta: Tag:shop=pasta
     shop=pastry: Tag:shop=pastry
     shop=pawnbroker: Tag:shop=pawnbroker
+    shop=peanut_butter: Tag:shop=peanut butter
     shop=perfume: Tag:shop=perfume
     shop=perfumery: Tag:shop=perfumery
     shop=pest_control: Tag:shop=pest control
     shop=perfume: Tag:shop=perfume
     shop=perfumery: Tag:shop=perfumery
     shop=pest_control: Tag:shop=pest control
@@ -10299,7 +13956,11 @@ en:
     shop=photo: Tag:shop=photo
     shop=photo_studio: Tag:shop=photo studio
     shop=photography: Tag:shop=photography
     shop=photo: Tag:shop=photo
     shop=photo_studio: Tag:shop=photo studio
     shop=photography: Tag:shop=photography
+    shop=piercing: Tag:shop=piercing
+    shop=plant_hire: Tag:shop=plant hire
     shop=pottery: Tag:shop=pottery
     shop=pottery: Tag:shop=pottery
+    shop=power_tools: Tag:shop=power tools
+    shop=preserving_glassware: Tag:shop=preserving glassware
     shop=printer_ink: Tag:shop=printer ink
     shop=printing: Tag:shop=printing
     shop=psychic: Tag:shop=psychic
     shop=printer_ink: Tag:shop=printer ink
     shop=printing: Tag:shop=printing
     shop=psychic: Tag:shop=psychic
@@ -10309,26 +13970,34 @@ en:
     shop=recreational_vehicle: Tag:shop=recreational vehicle
     shop=religion: Tag:shop=religion
     shop=rental: Tag:shop=rental
     shop=recreational_vehicle: Tag:shop=recreational vehicle
     shop=religion: Tag:shop=religion
     shop=rental: Tag:shop=rental
+    shop=repair: Tag:shop=repair
     shop=rice: Tag:shop=rice
     shop=robot: Tag:shop=robot
     shop=rice: Tag:shop=rice
     shop=robot: Tag:shop=robot
+    shop=safety_equipment: Tag:shop=safety equipment
+    shop=salon: Tag:shop=salon
+    shop=sauna: Tag:shop=sauna
     shop=scooter: Tag:shop=scooter
     shop=scuba_diving: Tag:shop=scuba diving
     shop=seafood: Tag:shop=seafood
     shop=second_hand: Tag:shop=second hand
     shop=security: Tag:shop=security
     shop=sewing: Tag:shop=sewing
     shop=scooter: Tag:shop=scooter
     shop=scuba_diving: Tag:shop=scuba diving
     shop=seafood: Tag:shop=seafood
     shop=second_hand: Tag:shop=second hand
     shop=security: Tag:shop=security
     shop=sewing: Tag:shop=sewing
+    shop=shed: Tag:shop=shed
     shop=ship_chandler: Tag:shop=ship chandler
     shop=shoe_repair: Tag:shop=shoe repair
     shop=shoes: Tag:shop=shoes
     shop=shopping_centre: Tag:shop=shopping centre
     shop=skate: Tag:shop=skate
     shop=ski: Tag:shop=ski
     shop=ship_chandler: Tag:shop=ship chandler
     shop=shoe_repair: Tag:shop=shoe repair
     shop=shoes: Tag:shop=shoes
     shop=shopping_centre: Tag:shop=shopping centre
     shop=skate: Tag:shop=skate
     shop=ski: Tag:shop=ski
+    shop=smartshop: Tag:shop=smartshop
+    shop=snack: Tag:shop=snack
     shop=snowmobile: Tag:shop=snowmobile
     shop=solarium: Tag:shop=solarium
     shop=souvenir: Tag:shop=souvenir
     shop=spare_parts: Tag:shop=spare parts
     shop=spices: Tag:shop=spices
     shop=sports: Tag:shop=sports
     shop=snowmobile: Tag:shop=snowmobile
     shop=solarium: Tag:shop=solarium
     shop=souvenir: Tag:shop=souvenir
     shop=spare_parts: Tag:shop=spare parts
     shop=spices: Tag:shop=spices
     shop=sports: Tag:shop=sports
+    shop=stairs: Tag:shop=stairs
     shop=stationery: Tag:shop=stationery
     shop=storage_rental: Tag:shop=storage rental
     shop=street_vendor: Tag:shop=street vendor
     shop=stationery: Tag:shop=stationery
     shop=storage_rental: Tag:shop=storage rental
     shop=street_vendor: Tag:shop=street vendor
@@ -10339,6 +14008,7 @@ en:
     shop=tailor: Tag:shop=tailor
     shop=tattoo: Tag:shop=tattoo
     shop=tea: Tag:shop=tea
     shop=tailor: Tag:shop=tailor
     shop=tattoo: Tag:shop=tattoo
     shop=tea: Tag:shop=tea
+    shop=telecommunication: Tag:shop=telecommunication
     shop=ticket: Tag:shop=ticket
     shop=tickets: Tag:shop=tickets
     shop=tiles: Tag:shop=tiles
     shop=ticket: Tag:shop=ticket
     shop=tickets: Tag:shop=tickets
     shop=tiles: Tag:shop=tiles
@@ -10364,30 +14034,31 @@ en:
     shop=video_games: Tag:shop=video games
     shop=watches: Tag:shop=watches
     shop=water: Tag:shop=water
     shop=video_games: Tag:shop=video games
     shop=watches: Tag:shop=watches
     shop=water: Tag:shop=water
+    shop=water_filters: Tag:shop=water filters
+    shop=water_sports: Tag:shop=water sports
     shop=weapons: Tag:shop=weapons
     shop=weapons: Tag:shop=weapons
+    shop=wellness: Tag:shop=wellness
     shop=wholesale: Tag:shop=wholesale
     shop=wigs: Tag:shop=wigs
     shop=window: Tag:shop=window
     shop=window_blind: Tag:shop=window blind
     shop=wholesale: Tag:shop=wholesale
     shop=wigs: Tag:shop=wigs
     shop=window: Tag:shop=window
     shop=window_blind: Tag:shop=window blind
+    shop=window_tinting: Tag:shop=window tinting
     shop=windows: Tag:shop=windows
     shop=wine: Tag:shop=wine
     shop=winery: Tag:shop=winery
     shop=wool: Tag:shop=wool
     shop=yes: Tag:shop=yes
     shop=windows: Tag:shop=windows
     shop=wine: Tag:shop=wine
     shop=winery: Tag:shop=winery
     shop=wool: Tag:shop=wool
     shop=yes: Tag:shop=yes
+    sidewalk:both:surface=rock: Tag:sidewalk:both:surface=rock
+    sidewalk:left=separate: Tag:sidewalk:left=separate
+    sidewalk:right=separate: Tag:sidewalk:right=separate
+    sidewalk=separate: Tag:sidewalk=separate
     signal_station=bridge: Tag:signal station=bridge
     signal_station=bridge: Tag:signal station=bridge
-    signal_station=control: Tag:signal station=control
-    signal_station=distress: Tag:signal station=distress
     signal_station=firing: Tag:signal station=firing
     signal_station=firing: Tag:signal station=firing
-    signal_station=ice: Tag:signal station=ice
     signal_station=international_port_traffic: Tag:signal station=international port
       traffic
     signal_station=lock: Tag:signal station=lock
     signal_station=international_port_traffic: Tag:signal station=international port
       traffic
     signal_station=lock: Tag:signal station=lock
-    signal_station=storm: Tag:signal station=storm
-    signal_station=stream: Tag:signal station=stream
-    signal_station=tide: Tag:signal station=tide
     signal_station=tide_gauge: Tag:signal station=tide gauge
     signal_station=tide_scale: Tag:signal station=tide scale
     signal_station=tide_gauge: Tag:signal station=tide gauge
     signal_station=tide_scale: Tag:signal station=tide scale
-    signal_station=time: Tag:signal station=time
     signal_station=traffic: Tag:signal station=traffic
     signal_station=weather: Tag:signal station=weather
     signpost=forestry_compartment: Tag:signpost=forestry compartment
     signal_station=traffic: Tag:signal station=traffic
     signal_station=weather: Tag:signal station=weather
     signpost=forestry_compartment: Tag:signpost=forestry compartment
@@ -10398,21 +14069,30 @@ en:
     sinkhole=ponor: Tag:sinkhole=ponor
     site=parking: Tag:site=parking
     site=piste: Tag:site=piste
     sinkhole=ponor: Tag:sinkhole=ponor
     site=parking: Tag:site=parking
     site=piste: Tag:site=piste
+    site=venue: Tag:site=venue
+    site_type=baths: Tag:site type=baths
     site_type=bigstone: Tag:site type=bigstone
     site_type=city: Tag:site type=city
     site_type=bigstone: Tag:site type=bigstone
     site_type=city: Tag:site type=city
+    site_type=crannog: Tag:site type=crannog
+    site_type=enclosure: Tag:site type=enclosure
     site_type=fortification: Tag:site type=fortification
     site_type=hut_circle: Tag:site type=hut circle
     site_type=megalith: Tag:site type=megalith
     site_type=minilith: Tag:site type=minilith
     site_type=necropolis: Tag:site type=necropolis
     site_type=petroglyph: Tag:site type=petroglyph
     site_type=fortification: Tag:site type=fortification
     site_type=hut_circle: Tag:site type=hut circle
     site_type=megalith: Tag:site type=megalith
     site_type=minilith: Tag:site type=minilith
     site_type=necropolis: Tag:site type=necropolis
     site_type=petroglyph: Tag:site type=petroglyph
+    site_type=ringfort: Tag:site type=ringfort
     site_type=roman_circus: Tag:site type=roman circus
     site_type=roman_villa: Tag:site type=roman villa
     site_type=settlement: Tag:site type=settlement
     site_type=tumulus: Tag:site type=tumulus
     site_type=roman_circus: Tag:site type=roman circus
     site_type=roman_villa: Tag:site type=roman villa
     site_type=settlement: Tag:site type=settlement
     site_type=tumulus: Tag:site type=tumulus
+    social_facility:for=disabled: Tag:social facility:for=disabled
+    social_facility:for=homeless: Tag:social facility:for=homeless
+    social_facility:for=senior: Tag:social facility:for=senior
     social_facility=ambulatory_care: Tag:social facility=ambulatory care
     social_facility=assisted_living: Tag:social facility=assisted living
     social_facility=clothing_bank: Tag:social facility=clothing bank
     social_facility=ambulatory_care: Tag:social facility=ambulatory care
     social_facility=assisted_living: Tag:social facility=assisted living
     social_facility=clothing_bank: Tag:social facility=clothing bank
+    social_facility=dairy_kitchen: Tag:social facility=dairy kitchen
     social_facility=day_care: Tag:social facility=day care
     social_facility=food_bank: Tag:social facility=food bank
     social_facility=group_home: Tag:social facility=group home
     social_facility=day_care: Tag:social facility=day care
     social_facility=food_bank: Tag:social facility=food bank
     social_facility=group_home: Tag:social facility=group home
@@ -10422,21 +14102,36 @@ en:
     social_facility=shelter: Tag:social facility=shelter
     social_facility=soup_kitchen: Tag:social facility=soup kitchen
     social_facility=workshop: Tag:social facility=workshop
     social_facility=shelter: Tag:social facility=shelter
     social_facility=soup_kitchen: Tag:social facility=soup kitchen
     social_facility=workshop: Tag:social facility=workshop
+    source:addr:postcode=Isle_of_Man_Government_Land_Registry_Land_Transactions: Tag:source:addr:postcode=Isle
+      of Man Government Land Registry Land Transactions
+    source:addr:postcode=Isle_of_Man_Government_Planning_Applications: Tag:source:addr:postcode=Isle
+      of Man Government Planning Applications
     source:addr=GURS: Tag:source:addr=GURS
     source:addr=GURS: Tag:source:addr=GURS
+    source:addr=ЕГРН: Tag:source:addr=ЕГРН
     source:ele=barometric: Tag:source:ele=barometric
     source:geometry=ACT2016: Tag:source:geometry=ACT2016
     source:geometry=ACTMapiRoads: Tag:source:geometry=ACTMapiRoads
     source:geometry=ACTMapiTP: Tag:source:geometry=ACTMapiTP
     source:geometry=Bing: Tag:source:geometry=Bing
     source:ele=barometric: Tag:source:ele=barometric
     source:geometry=ACT2016: Tag:source:geometry=ACT2016
     source:geometry=ACTMapiRoads: Tag:source:geometry=ACTMapiRoads
     source:geometry=ACTMapiTP: Tag:source:geometry=ACTMapiTP
     source:geometry=Bing: Tag:source:geometry=Bing
+    source:geometry=GURS: Tag:source:geometry=GURS
     source:geometry=LPI_NSW_Imagery: Tag:source:geometry=LPI NSW Imagery
     source:geometry=NPWS_Estate: Tag:source:geometry=NPWS Estate
     source:geometry=NSW_LPI_Base_Map: Tag:source:geometry=NSW LPI Base Map
     source:geometry=NSW_LPI_Imagery: Tag:source:geometry=NSW LPI Imagery
     source:geometry=PSMA_Admin_Boundaries: Tag:source:geometry=PSMA Admin Boundaries
     source:geometry=LPI_NSW_Imagery: Tag:source:geometry=LPI NSW Imagery
     source:geometry=NPWS_Estate: Tag:source:geometry=NPWS Estate
     source:geometry=NSW_LPI_Base_Map: Tag:source:geometry=NSW LPI Base Map
     source:geometry=NSW_LPI_Imagery: Tag:source:geometry=NSW LPI Imagery
     source:geometry=PSMA_Admin_Boundaries: Tag:source:geometry=PSMA Admin Boundaries
+    source:maxspeed=BE-BRU:urban: Tag:source:maxspeed=BE-BRU:urban
+    source:maxspeed=BE-VLG:rural: Tag:source:maxspeed=BE-VLG:rural
+    source:maxspeed=BE-VLG:urban: Tag:source:maxspeed=BE-VLG:urban
+    source:maxspeed=BE-WAL:rural: Tag:source:maxspeed=BE-WAL:rural
+    source:maxspeed=BE-WAL:urban: Tag:source:maxspeed=BE-WAL:urban
+    source:maxspeed=RU:urban: Tag:source:maxspeed=RU:urban
     source:maxspeed=implicit: Tag:source:maxspeed=implicit
     source:maxspeed=implicit: Tag:source:maxspeed=implicit
+    source:maxspeed=sign: Tag:source:maxspeed=sign
     source:name=LPI_NSW_Base_Map: Tag:source:name=LPI NSW Base Map
     source:name=NPWS_Estate: Tag:source:name=NPWS Estate
     source:name=NSW_LPI_Base_Map: Tag:source:name=NSW LPI Base Map
     source:name=LPI_NSW_Base_Map: Tag:source:name=LPI NSW Base Map
     source:name=NPWS_Estate: Tag:source:name=NPWS Estate
     source:name=NSW_LPI_Base_Map: Tag:source:name=NSW LPI Base Map
+    source:population=IBGE_2010: Tag:source:population=IBGE 2010
+    source:population=IBGE_2022: Tag:source:population=IBGE 2022
     source:position=NPWS_Estate: Tag:source:position=NPWS Estate
     source=ACT2016: Tag:source=ACT2016
     source=ACT2017: Tag:source=ACT2017
     source:position=NPWS_Estate: Tag:source:position=NPWS Estate
     source=ACT2016: Tag:source=ACT2016
     source=ACT2017: Tag:source=ACT2017
@@ -10446,15 +14141,20 @@ en:
     source=DNT_Oslo_og_Omegn: Tag:source=DNT Oslo og Omegn
     source=GURS: Tag:source=GURS
     source=Gazetteer_of_Australia_2012: Tag:source=Gazetteer of Australia 2012
     source=DNT_Oslo_og_Omegn: Tag:source=DNT Oslo og Omegn
     source=GURS: Tag:source=GURS
     source=Gazetteer_of_Australia_2012: Tag:source=Gazetteer of Australia 2012
+    source=Google: Tag:source=Google
+    source=Google,_2010-01-21: Tag:source=Google, 2010-01-21
     source=HiRes_aerial_imagery: Tag:source=HiRes aerial imagery
     source=HiRes_aerial_imagery: Tag:source=HiRes aerial imagery
+    source=IBGE: Tag:source=IBGE
     source=Isle_of_Man_Government_1:25000_map_(2007): Tag:source=Isle of Man Government
       1:25000 map (2007)
     source=Isle_of_Man_Government_aerial_imagery_(2001): Tag:source=Isle of Man Government
       aerial imagery (2001)
     source=Isle_of_Man_Government_1:25000_map_(2007): Tag:source=Isle of Man Government
       1:25000 map (2007)
     source=Isle_of_Man_Government_aerial_imagery_(2001): Tag:source=Isle of Man Government
       aerial imagery (2001)
+    source=Kartverket: Tag:source=Kartverket
     source=LPI_NSW_Base_Map: Tag:source=LPI NSW Base Map
     source=LPI_NSW_Imagery: Tag:source=LPI NSW Imagery
     source=NAIP: Tag:source=NAIP
     source=NPWS_Estate: Tag:source=NPWS Estate
     source=LPI_NSW_Base_Map: Tag:source=LPI NSW Base Map
     source=LPI_NSW_Imagery: Tag:source=LPI NSW Imagery
     source=NAIP: Tag:source=NAIP
     source=NPWS_Estate: Tag:source=NPWS Estate
+    source=NSW_LPI_BaseMap: Tag:source=NSW LPI BaseMap
     source=NSW_LPI_Base_Map: Tag:source=NSW LPI Base Map
     source=NSW_LPI_Imagery: Tag:source=NSW LPI Imagery
     source=Naturbase: Tag:source=Naturbase
     source=NSW_LPI_Base_Map: Tag:source=NSW LPI Base Map
     source=NSW_LPI_Imagery: Tag:source=NSW LPI Imagery
     source=Naturbase: Tag:source=Naturbase
@@ -10469,12 +14169,15 @@ en:
     source=VicMap_ParkRes: Tag:source=VicMap ParkRes
     source=YahooJapan/ALPSMAP: Tag:source=YahooJapan/ALPSMAP
     source=gurs: Tag:source=gurs
     source=VicMap_ParkRes: Tag:source=VicMap ParkRes
     source=YahooJapan/ALPSMAP: Tag:source=YahooJapan/ALPSMAP
     source=gurs: Tag:source=gurs
+    source=www.geoportal.gov.pl: Tag:source=www.geoportal.gov.pl
     sport=10pin: Tag:sport=10pin
     sport=8pin: Tag:sport=8pin
     sport=9pin: Tag:sport=9pin
     sport=BASE: Tag:sport=BASE
     sport=10pin: Tag:sport=10pin
     sport=8pin: Tag:sport=8pin
     sport=9pin: Tag:sport=9pin
     sport=BASE: Tag:sport=BASE
+    sport=aerobics: Tag:sport=aerobics
     sport=aikido: Tag:sport=aikido
     sport=american_football: Tag:sport=american football
     sport=aikido: Tag:sport=aikido
     sport=american_football: Tag:sport=american football
+    sport=american_handball: Tag:sport=american handball
     sport=archery: Tag:sport=archery
     sport=association_football: Tag:sport=association football
     sport=athletics: Tag:sport=athletics
     sport=archery: Tag:sport=archery
     sport=association_football: Tag:sport=association football
     sport=athletics: Tag:sport=athletics
@@ -10482,6 +14185,7 @@ en:
     sport=badminton: Tag:sport=badminton
     sport=balle_pelote: Tag:sport=balle pelote
     sport=bandy: Tag:sport=bandy
     sport=badminton: Tag:sport=badminton
     sport=balle_pelote: Tag:sport=balle pelote
     sport=bandy: Tag:sport=bandy
+    sport=barre: Tag:sport=barre
     sport=base: Tag:sport=base
     sport=baseball: Tag:sport=baseball
     sport=basketball: Tag:sport=basketball
     sport=base: Tag:sport=base
     sport=baseball: Tag:sport=baseball
     sport=basketball: Tag:sport=basketball
@@ -10493,10 +14197,13 @@ en:
     sport=bmx: Tag:sport=bmx
     sport=bobsleigh: Tag:sport=bobsleigh
     sport=boules: Tag:sport=boules
     sport=bmx: Tag:sport=bmx
     sport=bobsleigh: Tag:sport=bobsleigh
     sport=boules: Tag:sport=boules
+    sport=bowling: Tag:sport=bowling
     sport=bowls: Tag:sport=bowls
     sport=boxing: Tag:sport=boxing
     sport=bullfighting: Tag:sport=bullfighting
     sport=bowls: Tag:sport=bowls
     sport=boxing: Tag:sport=boxing
     sport=bullfighting: Tag:sport=bullfighting
+    sport=calisthenics: Tag:sport=calisthenics
     sport=canadian_football: Tag:sport=canadian football
     sport=canadian_football: Tag:sport=canadian football
+    sport=candlepin: Tag:sport=candlepin
     sport=canoe: Tag:sport=canoe
     sport=canoe_polo: Tag:sport=canoe polo
     sport=chess: Tag:sport=chess
     sport=canoe: Tag:sport=canoe
     sport=canoe_polo: Tag:sport=canoe polo
     sport=chess: Tag:sport=chess
@@ -10510,6 +14217,8 @@ en:
     sport=croquet: Tag:sport=croquet
     sport=crossfit: Tag:sport=crossfit
     sport=curling: Tag:sport=curling
     sport=croquet: Tag:sport=croquet
     sport=crossfit: Tag:sport=crossfit
     sport=curling: Tag:sport=curling
+    sport=cycle_ball: Tag:sport=cycle ball
+    sport=cycle_polo: Tag:sport=cycle polo
     sport=cycling: Tag:sport=cycling
     sport=dancing: Tag:sport=dancing
     sport=darts: Tag:sport=darts
     sport=cycling: Tag:sport=cycling
     sport=dancing: Tag:sport=dancing
     sport=darts: Tag:sport=darts
@@ -10517,23 +14226,31 @@ en:
     sport=diving: Tag:sport=diving
     sport=dog_agility: Tag:sport=dog agility
     sport=dog_racing: Tag:sport=dog racing
     sport=diving: Tag:sport=diving
     sport=dog_agility: Tag:sport=dog agility
     sport=dog_racing: Tag:sport=dog racing
+    sport=dragon_boat: Tag:sport=dragon boat
     sport=equestrian: Tag:sport=equestrian
     sport=fencing: Tag:sport=fencing
     sport=field_hockey: Tag:sport=field hockey
     sport=fitness: Tag:sport=fitness
     sport=equestrian: Tag:sport=equestrian
     sport=fencing: Tag:sport=fencing
     sport=field_hockey: Tag:sport=field hockey
     sport=fitness: Tag:sport=fitness
+    sport=five-a-side: Tag:sport=five-a-side
     sport=fives: Tag:sport=fives
     sport=floorball: Tag:sport=floorball
     sport=fives: Tag:sport=fives
     sport=floorball: Tag:sport=floorball
+    sport=football: Tag:sport=football
     sport=footballgolf: Tag:sport=footballgolf
     sport=footballgolf: Tag:sport=footballgolf
+    sport=four_square: Tag:sport=four square
     sport=free_flying: Tag:sport=free flying
     sport=free_flying: Tag:sport=free flying
+    sport=funnel_ball: Tag:sport=funnel ball
     sport=futsal: Tag:sport=futsal
     sport=gaelic_football: Tag:sport=gaelic football
     sport=gaelic_games: Tag:sport=gaelic games
     sport=futsal: Tag:sport=futsal
     sport=gaelic_football: Tag:sport=gaelic football
     sport=gaelic_games: Tag:sport=gaelic games
+    sport=gaga: Tag:sport=gaga
     sport=golf: Tag:sport=golf
     sport=gymnastics: Tag:sport=gymnastics
     sport=handball: Tag:sport=handball
     sport=hapkido: Tag:sport=hapkido
     sport=golf: Tag:sport=golf
     sport=gymnastics: Tag:sport=gymnastics
     sport=handball: Tag:sport=handball
     sport=hapkido: Tag:sport=hapkido
+    sport=hiking: Tag:sport=hiking
     sport=hockey: Tag:sport=hockey
     sport=horse_racing: Tag:sport=horse racing
     sport=hockey: Tag:sport=hockey
     sport=horse_racing: Tag:sport=horse racing
+    sport=horse_riding: Tag:sport=horse riding
     sport=horseshoes: Tag:sport=horseshoes
     sport=ice_hockey: Tag:sport=ice hockey
     sport=ice_skating: Tag:sport=ice skating
     sport=horseshoes: Tag:sport=horseshoes
     sport=ice_hockey: Tag:sport=ice hockey
     sport=ice_skating: Tag:sport=ice skating
@@ -10564,6 +14281,7 @@ en:
     sport=parachuting: Tag:sport=parachuting
     sport=paragliding: Tag:sport=paragliding
     sport=parkour: Tag:sport=parkour
     sport=parachuting: Tag:sport=parachuting
     sport=paragliding: Tag:sport=paragliding
     sport=parkour: Tag:sport=parkour
+    sport=pedal_car_racing: Tag:sport=pedal car racing
     sport=pelota: Tag:sport=pelota
     sport=pesäpallo: Tag:sport=pesäpallo
     sport=petanque: Tag:sport=petanque
     sport=pelota: Tag:sport=pelota
     sport=pesäpallo: Tag:sport=pesäpallo
     sport=petanque: Tag:sport=petanque
@@ -10581,6 +14299,7 @@ en:
     sport=rugby_league: Tag:sport=rugby league
     sport=rugby_union: Tag:sport=rugby union
     sport=running: Tag:sport=running
     sport=rugby_league: Tag:sport=rugby league
     sport=rugby_union: Tag:sport=rugby union
     sport=running: Tag:sport=running
+    sport=safety_training: Tag:sport=safety training
     sport=sailing: Tag:sport=sailing
     sport=scuba_diving: Tag:sport=scuba diving
     sport=shooting: Tag:sport=shooting
     sport=sailing: Tag:sport=sailing
     sport=scuba_diving: Tag:sport=scuba diving
     sport=shooting: Tag:sport=shooting
@@ -10604,30 +14323,62 @@ en:
     sport=taekwondo: Tag:sport=taekwondo
     sport=team_handball: Tag:sport=team handball
     sport=tennis: Tag:sport=tennis
     sport=taekwondo: Tag:sport=taekwondo
     sport=team_handball: Tag:sport=team handball
     sport=tennis: Tag:sport=tennis
+    sport=teqball: Tag:sport=teqball
+    sport=tetherball: Tag:sport=tetherball
     sport=toboggan: Tag:sport=toboggan
     sport=toboggan: Tag:sport=toboggan
+    sport=touch_football: Tag:sport=touch football
     sport=trampoline: Tag:sport=trampoline
     sport=trampoline: Tag:sport=trampoline
+    sport=trugo: Tag:sport=trugo
     sport=ultimate: Tag:sport=ultimate
     sport=ultimate: Tag:sport=ultimate
+    sport=ultralight_aviation: Tag:sport=ultralight aviation
     sport=volleyball: Tag:sport=volleyball
     sport=wakeboarding: Tag:sport=wakeboarding
     sport=water_polo: Tag:sport=water polo
     sport=water_ski: Tag:sport=water ski
     sport=volleyball: Tag:sport=volleyball
     sport=wakeboarding: Tag:sport=wakeboarding
     sport=water_polo: Tag:sport=water polo
     sport=water_ski: Tag:sport=water ski
+    sport=water_sports: Tag:sport=water sports
     sport=weightlifting: Tag:sport=weightlifting
     sport=windsurfing: Tag:sport=windsurfing
     sport=wrestling: Tag:sport=wrestling
     sport=yoga: Tag:sport=yoga
     sport=weightlifting: Tag:sport=weightlifting
     sport=windsurfing: Tag:sport=windsurfing
     sport=wrestling: Tag:sport=wrestling
     sport=yoga: Tag:sport=yoga
+    sport=zurkhaneh_sport: Tag:sport=zurkhaneh sport
     sports=aikido: Tag:sports=aikido
     sports=athletics: Tag:sports=athletics
     spring:type=hot: Tag:spring:type=hot
     station=funicular: Tag:station=funicular
     station=light_rail: Tag:station=light rail
     sports=aikido: Tag:sports=aikido
     sports=athletics: Tag:sports=athletics
     spring:type=hot: Tag:spring:type=hot
     station=funicular: Tag:station=funicular
     station=light_rail: Tag:station=light rail
+    station=monorail: Tag:station=monorail
     station=subway: Tag:station=subway
     station=subway: Tag:station=subway
+    statue=animal: Tag:statue=animal
+    statue=buddha: Tag:statue=buddha
+    statue=equestrian: Tag:statue=equestrian
+    statue=virgin: Tag:statue=virgin
+    stile=stepover: Tag:stile=stepover
+    stone_type=khachkar: Tag:stone type=khachkar
     stream=intermittent: Tag:stream=intermittent
     stream=intermittent: Tag:stream=intermittent
+    street_cabinet=cable_tv: Tag:street cabinet=cable tv
+    street_cabinet=gas: Tag:street cabinet=gas
+    street_cabinet=postal_service: Tag:street cabinet=postal service
+    street_cabinet=power: Tag:street cabinet=power
+    street_cabinet=sewerage: Tag:street cabinet=sewerage
+    street_cabinet=street_lighting: Tag:street cabinet=street lighting
+    street_cabinet=telecom: Tag:street cabinet=telecom
+    street_cabinet=water: Tag:street cabinet=water
+    street_cabinet=water_management: Tag:street cabinet=water management
     street_vendor=yes: Tag:street vendor=yes
     studio=audio: Tag:studio=audio
     studio=radio: Tag:studio=radio
     studio=television: Tag:studio=television
     studio=video: Tag:studio=video
     submarine=yes: Tag:submarine=yes
     street_vendor=yes: Tag:street vendor=yes
     studio=audio: Tag:studio=audio
     studio=radio: Tag:studio=radio
     studio=television: Tag:studio=television
     studio=video: Tag:studio=video
     submarine=yes: Tag:submarine=yes
+    substance=CNG: Tag:substance=CNG
+    substance=LNG: Tag:substance=LNG
+    substance=cng: Tag:substance=cng
+    substance=gas: Tag:substance=gas
+    substance=hot_water: Tag:substance=hot water
+    substance=oil: Tag:substance=oil
+    substance=rainwater: Tag:substance=rainwater
+    substance=sewage: Tag:substance=sewage
+    substance=water: Tag:substance=water
     substation=compensation: Tag:substation=compensation
     substation=converter: Tag:substation=converter
     substation=distribution: Tag:substation=distribution
     substation=compensation: Tag:substation=compensation
     substation=converter: Tag:substation=converter
     substation=distribution: Tag:substation=distribution
@@ -10640,37 +14391,93 @@ en:
     substation=transmission: Tag:substation=transmission
     summit:cross=yes: Tag:summit:cross=yes
     surface=acrylic: Tag:surface=acrylic
     substation=transmission: Tag:substation=transmission
     summit:cross=yes: Tag:summit:cross=yes
     surface=acrylic: Tag:surface=acrylic
+    surface=artificial_grass: Tag:surface=artificial grass
     surface=artificial_turf: Tag:surface=artificial turf
     surface=asphalt: Tag:surface=asphalt
     surface=artificial_turf: Tag:surface=artificial turf
     surface=asphalt: Tag:surface=asphalt
+    surface=bitmac: Tag:surface=bitmac
+    surface=brick: Tag:surface=brick
+    surface=bricks: Tag:surface=bricks
+    surface=carpet: Tag:surface=carpet
+    surface=cement: Tag:surface=cement
+    surface=chipseal: Tag:surface=chipseal
     surface=clay: Tag:surface=clay
     surface=cobblestone: Tag:surface=cobblestone
     surface=compacted: Tag:surface=compacted
     surface=concrete: Tag:surface=concrete
     surface=concrete:lanes: Tag:surface=concrete:lanes
     surface=concrete:plates: Tag:surface=concrete:plates
     surface=clay: Tag:surface=clay
     surface=cobblestone: Tag:surface=cobblestone
     surface=compacted: Tag:surface=compacted
     surface=concrete: Tag:surface=concrete
     surface=concrete:lanes: Tag:surface=concrete:lanes
     surface=concrete:plates: Tag:surface=concrete:plates
+    surface=decoturf: Tag:surface=decoturf
+    surface=dirt: Tag:surface=dirt
+    surface=earth: Tag:surface=earth
+    surface=fine_gravel: Tag:surface=fine gravel
+    surface=granite: Tag:surface=granite
+    surface=grass: Tag:surface=grass
+    surface=grass_paver: Tag:surface=grass paver
+    surface=gravel: Tag:surface=gravel
+    surface=ground: Tag:surface=ground
+    surface=hard: Tag:surface=hard
+    surface=hard_court: Tag:surface=hard court
+    surface=linoleum: Tag:surface=linoleum
+    surface=marble: Tag:surface=marble
     surface=metal: Tag:surface=metal
     surface=metal: Tag:surface=metal
+    surface=metal_grid: Tag:surface=metal grid
+    surface=mud: Tag:surface=mud
     surface=paved: Tag:surface=paved
     surface=paving_stones: Tag:surface=paving stones
     surface=paved: Tag:surface=paved
     surface=paving_stones: Tag:surface=paving stones
+    surface=paving_stones:30: Tag:surface=paving stones:30
+    surface=pebblestone: Tag:surface=pebblestone
     surface=rock: Tag:surface=rock
     surface=rock: Tag:surface=rock
+    surface=rocks: Tag:surface=rocks
+    surface=rubber: Tag:surface=rubber
+    surface=sand: Tag:surface=sand
     surface=sett: Tag:surface=sett
     surface=sett: Tag:surface=sett
+    surface=shells: Tag:surface=shells
+    surface=snow: Tag:surface=snow
+    surface=soil: Tag:surface=soil
+    surface=stepping_stones: Tag:surface=stepping stones
+    surface=tarmac: Tag:surface=tarmac
+    surface=tarmacadam: Tag:surface=tarmacadam
     surface=tartan: Tag:surface=tartan
     surface=tartan: Tag:surface=tartan
+    surface=trail: Tag:surface=trail
+    surface=turf: Tag:surface=turf
     surface=unhewn_cobblestone: Tag:surface=unhewn cobblestone
     surface=unpaved: Tag:surface=unpaved
     surface=wood: Tag:surface=wood
     surface=unhewn_cobblestone: Tag:surface=unhewn cobblestone
     surface=unpaved: Tag:surface=unpaved
     surface=wood: Tag:surface=wood
+    surface=woodchips: Tag:surface=woodchips
+    survey_point:datum_aligned=no: Tag:survey point:datum aligned=no
+    survey_point:datum_aligned=yes: Tag:survey point:datum aligned=yes
+    survey_point:purpose=both: Tag:survey point:purpose=both
+    survey_point:purpose=horizontal: Tag:survey point:purpose=horizontal
+    survey_point:purpose=vertical: Tag:survey point:purpose=vertical
+    survey_point:structure=beacon: Tag:survey point:structure=beacon
+    survey_point:structure=block: Tag:survey point:structure=block
+    survey_point:structure=bracket: Tag:survey point:structure=bracket
+    survey_point:structure=cut: Tag:survey point:structure=cut
+    survey_point:structure=indented_pin: Tag:survey point:structure=indented pin
+    survey_point:structure=magnet: Tag:survey point:structure=magnet
+    survey_point:structure=medallion: Tag:survey point:structure=medallion
+    survey_point:structure=pillar: Tag:survey point:structure=pillar
+    survey_point:structure=pin: Tag:survey point:structure=pin
+    survey_point:structure=plaque: Tag:survey point:structure=plaque
+    survey_point:structure=pole: Tag:survey point:structure=pole
     swimming_pool=yes: Tag:swimming pool=yes
     switch=circuit_breaker: Tag:switch=circuit breaker
     switch=disconnector: Tag:switch=disconnector
     switch=earthing: Tag:switch=earthing
     switch=mechanical: Tag:switch=mechanical
     swimming_pool=yes: Tag:swimming pool=yes
     switch=circuit_breaker: Tag:switch=circuit breaker
     switch=disconnector: Tag:switch=disconnector
     switch=earthing: Tag:switch=earthing
     switch=mechanical: Tag:switch=mechanical
+    symbol=Knafelčeva_markacija: Tag:symbol=Knafelčeva markacija
     tactile_paving=incorrect: Tag:tactile paving=incorrect
     tactile_paving=no: Tag:tactile paving=no
     tactile_paving=partial: Tag:tactile paving=partial
     tactile_paving=yes: Tag:tactile paving=yes
     tank_trap=czech_hedgehog: Tag:tank trap=czech hedgehog
     tactile_paving=incorrect: Tag:tactile paving=incorrect
     tactile_paving=no: Tag:tactile paving=no
     tactile_paving=partial: Tag:tactile paving=partial
     tactile_paving=yes: Tag:tactile paving=yes
     tank_trap=czech_hedgehog: Tag:tank trap=czech hedgehog
+    taxi_type=motorcycle: Tag:taxi type=motorcycle
+    taxi_vehicle=motorcycle: Tag:taxi vehicle=motorcycle
     telecom:medium=coaxial: Tag:telecom:medium=coaxial
     telecom:medium=copper: Tag:telecom:medium=copper
     telecom:medium=fibre: Tag:telecom:medium=fibre
     telecom=antenna: Tag:telecom=antenna
     telecom:medium=coaxial: Tag:telecom:medium=coaxial
     telecom:medium=copper: Tag:telecom:medium=copper
     telecom:medium=fibre: Tag:telecom:medium=fibre
     telecom=antenna: Tag:telecom=antenna
+    telecom=central_office: Tag:telecom=central office
     telecom=connection_point: Tag:telecom=connection point
     telecom=cross-connect: Tag:telecom=cross-connect
     telecom=data_center: Tag:telecom=data center
     telecom=connection_point: Tag:telecom=connection point
     telecom=cross-connect: Tag:telecom=cross-connect
     telecom=data_center: Tag:telecom=data center
@@ -10678,20 +14485,26 @@ en:
     telecom=datacenter: Tag:telecom=datacenter
     telecom=distribution_point: Tag:telecom=distribution point
     telecom=exchange: Tag:telecom=exchange
     telecom=datacenter: Tag:telecom=datacenter
     telecom=distribution_point: Tag:telecom=distribution point
     telecom=exchange: Tag:telecom=exchange
+    telecom=outdoor_dslam: Tag:telecom=outdoor dslam
     telecom=remote_digital_terminal: Tag:telecom=remote digital terminal
     telecom=remote_terminal: Tag:telecom=remote terminal
     telecom=service_device: Tag:telecom=service device
     telecom=remote_digital_terminal: Tag:telecom=remote digital terminal
     telecom=remote_terminal: Tag:telecom=remote terminal
     telecom=service_device: Tag:telecom=service device
+    telecom=street_cabinet: Tag:telecom=street cabinet
     telescope:type=optical: Tag:telescope:type=optical
     telescope:type=radio: Tag:telescope:type=radio
     telescope:type=optical: Tag:telescope:type=optical
     telescope:type=radio: Tag:telescope:type=radio
+    theatre:genre=philharmonic: Tag:theatre:genre=philharmonic
     theatre:type=amphi: Tag:theatre:type=amphi
     theatre:type=concert_hall: Tag:theatre:type=concert hall
     theatre:type=open_air: Tag:theatre:type=open air
     theatre:type=opera_house: Tag:theatre:type=opera house
     tickets:public_transport_subscription=yes: Tag:tickets:public transport subscription=yes
     theatre:type=amphi: Tag:theatre:type=amphi
     theatre:type=concert_hall: Tag:theatre:type=concert hall
     theatre:type=open_air: Tag:theatre:type=open air
     theatre:type=opera_house: Tag:theatre:type=opera house
     tickets:public_transport_subscription=yes: Tag:tickets:public transport subscription=yes
+    toilets:access=customers: Tag:toilets:access=customers
+    toll:designated=yes: Tag:toll:designated=yes
     toll=yes: Tag:toll=yes
     tomb=cenotaph: Tag:tomb=cenotaph
     tomb=columbarium: Tag:tomb=columbarium
     tomb=crypt: Tag:tomb=crypt
     toll=yes: Tag:toll=yes
     tomb=cenotaph: Tag:tomb=cenotaph
     tomb=columbarium: Tag:tomb=columbarium
     tomb=crypt: Tag:tomb=crypt
+    tomb=dolmen: Tag:tomb=dolmen
     tomb=hypogeum: Tag:tomb=hypogeum
     tomb=mausoleum: Tag:tomb=mausoleum
     tomb=obelisk: Tag:tomb=obelisk
     tomb=hypogeum: Tag:tomb=hypogeum
     tomb=mausoleum: Tag:tomb=mausoleum
     tomb=obelisk: Tag:tomb=obelisk
@@ -10718,13 +14531,16 @@ en:
     tourism=guest_house: Tag:tourism=guest house
     tourism=hostel: Tag:tourism=hostel
     tourism=hotel: Tag:tourism=hotel
     tourism=guest_house: Tag:tourism=guest house
     tourism=hostel: Tag:tourism=hostel
     tourism=hotel: Tag:tourism=hotel
+    tourism=hunting_lodge: Tag:tourism=hunting lodge
     tourism=information: Tag:tourism=information
     tourism=motel: Tag:tourism=motel
     tourism=museum: Tag:tourism=museum
     tourism=picnic_site: Tag:tourism=picnic site
     tourism=resort: Tag:tourism=resort
     tourism=information: Tag:tourism=information
     tourism=motel: Tag:tourism=motel
     tourism=museum: Tag:tourism=museum
     tourism=picnic_site: Tag:tourism=picnic site
     tourism=resort: Tag:tourism=resort
+    tourism=spa_resort: Tag:tourism=spa resort
     tourism=theme_park: Tag:tourism=theme park
     tourism=tourism-attraction: Tag:tourism=tourism-attraction
     tourism=theme_park: Tag:tourism=theme park
     tourism=tourism-attraction: Tag:tourism=tourism-attraction
+    tourism=trail_riding_rest: Tag:tourism=trail riding rest
     tourism=trail_riding_station: Tag:tourism=trail riding station
     tourism=viewpoint: Tag:tourism=viewpoint
     tourism=wilderness_hut: Tag:tourism=wilderness hut
     tourism=trail_riding_station: Tag:tourism=trail riding station
     tourism=viewpoint: Tag:tourism=viewpoint
     tourism=wilderness_hut: Tag:tourism=wilderness hut
@@ -10738,46 +14554,78 @@ en:
     tower:construction=guyed_tube: Tag:tower:construction=guyed tube
     tower:construction=lattice: Tag:tower:construction=lattice
     tower:type: Tag:tower:type
     tower:construction=guyed_tube: Tag:tower:construction=guyed tube
     tower:construction=lattice: Tag:tower:construction=lattice
     tower:type: Tag:tower:type
+    tower:type=anchor: Tag:tower:type=anchor
     tower:type=bell_tower: Tag:tower:type=bell tower
     tower:type=bridge: Tag:tower:type=bridge
     tower:type=bell_tower: Tag:tower:type=bell tower
     tower:type=bridge: Tag:tower:type=bridge
+    tower:type=clock: Tag:tower:type=clock
     tower:type=communication: Tag:tower:type=communication
     tower:type=cooling: Tag:tower:type=cooling
     tower:type=defensive: Tag:tower:type=defensive
     tower:type=communication: Tag:tower:type=communication
     tower:type=cooling: Tag:tower:type=cooling
     tower:type=defensive: Tag:tower:type=defensive
+    tower:type=diving: Tag:tower:type=diving
     tower:type=donjon: Tag:tower:type=donjon
     tower:type=hose: Tag:tower:type=hose
     tower:type=intake: Tag:tower:type=intake
     tower:type=lattice: Tag:tower:type=lattice
     tower:type=donjon: Tag:tower:type=donjon
     tower:type=hose: Tag:tower:type=hose
     tower:type=intake: Tag:tower:type=intake
     tower:type=lattice: Tag:tower:type=lattice
+    tower:type=launch_tower: Tag:tower:type=launch tower
     tower:type=lighting: Tag:tower:type=lighting
     tower:type=lighting: Tag:tower:type=lighting
+    tower:type=lightning_protection: Tag:tower:type=lightning protection
+    tower:type=lightning_rod: Tag:tower:type=lightning rod
     tower:type=minaret: Tag:tower:type=minaret
     tower:type=monitoring: Tag:tower:type=monitoring
     tower:type=monument: Tag:tower:type=monument
     tower:type=observation: Tag:tower:type=observation
     tower:type=minaret: Tag:tower:type=minaret
     tower:type=monitoring: Tag:tower:type=monitoring
     tower:type=monument: Tag:tower:type=monument
     tower:type=observation: Tag:tower:type=observation
+    tower:type=popinjay: Tag:tower:type=popinjay
     tower:type=radar: Tag:tower:type=radar
     tower:type=siren: Tag:tower:type=siren
     tower:type=suspension: Tag:tower:type=suspension
     tower:type=radar: Tag:tower:type=radar
     tower:type=siren: Tag:tower:type=siren
     tower:type=suspension: Tag:tower:type=suspension
+    tower:type=transposing: Tag:tower:type=transposing
     tower:type=watchtower: Tag:tower:type=watchtower
     tower:type=watchtower: Tag:tower:type=watchtower
+    townhall:type=barangay: Tag:townhall:type=barangay
+    townhall:type=town: Tag:townhall:type=town
+    trade=agricultural_supplies: Tag:trade=agricultural supplies
+    trade=building_supplies: Tag:trade=building supplies
+    trade=timber: Tag:trade=timber
     trade=wood: Tag:trade=wood
     traffic=local: Tag:traffic=local
     traffic=national: Tag:traffic=national
     traffic=regional: Tag:traffic=regional
     traffic=suburban: Tag:traffic=suburban
     traffic=urban: Tag:traffic=urban
     trade=wood: Tag:trade=wood
     traffic=local: Tag:traffic=local
     traffic=national: Tag:traffic=national
     traffic=regional: Tag:traffic=regional
     traffic=suburban: Tag:traffic=suburban
     traffic=urban: Tag:traffic=urban
+    traffic_calming=bump: Tag:traffic calming=bump
+    traffic_calming=chicane: Tag:traffic calming=chicane
+    traffic_calming=choked_island: Tag:traffic calming=choked island
+    traffic_calming=choked_table: Tag:traffic calming=choked table
+    traffic_calming=choker: Tag:traffic calming=choker
+    traffic_calming=cushion: Tag:traffic calming=cushion
+    traffic_calming=dip: Tag:traffic calming=dip
     traffic_calming=double_dip: Tag:traffic calming=double dip
     traffic_calming=dynamic_bump: Tag:traffic calming=dynamic bump
     traffic_calming=double_dip: Tag:traffic calming=double dip
     traffic_calming=dynamic_bump: Tag:traffic calming=dynamic bump
+    traffic_calming=hump: Tag:traffic calming=hump
     traffic_calming=island: Tag:traffic calming=island
     traffic_calming=island: Tag:traffic calming=island
+    traffic_calming=mini_bumps: Tag:traffic calming=mini bumps
+    traffic_calming=painted_island: Tag:traffic calming=painted island
+    traffic_calming=painted_table: Tag:traffic calming=painted table
+    traffic_calming=rumble_strip: Tag:traffic calming=rumble strip
     traffic_calming=table: Tag:traffic calming=table
     traffic_calming=table: Tag:traffic calming=table
+    traffic_calming=yes: Tag:traffic calming=yes
     traffic_sign:backward=DE:325.1: Tag:traffic sign:backward=DE:325.1
     traffic_sign:backward=DE:325.2: Tag:traffic sign:backward=DE:325.2
     traffic_sign:forward=DE:325.1: Tag:traffic sign:forward=DE:325.1
     traffic_sign:forward=DE:325.2: Tag:traffic sign:forward=DE:325.2
     traffic_sign:backward=DE:325.1: Tag:traffic sign:backward=DE:325.1
     traffic_sign:backward=DE:325.2: Tag:traffic sign:backward=DE:325.2
     traffic_sign:forward=DE:325.1: Tag:traffic sign:forward=DE:325.1
     traffic_sign:forward=DE:325.2: Tag:traffic sign:forward=DE:325.2
+    traffic_sign=AT:52.1: Tag:traffic sign=AT:52.1
+    traffic_sign=AT:52.17a-a: Tag:traffic sign=AT:52.17a-a
     traffic_sign=CH:2.59.3: Tag:traffic sign=CH:2.59.3
     traffic_sign=CH:2.59.5: Tag:traffic sign=CH:2.59.5
     traffic_sign=DE:1022-10: Tag:traffic sign=DE:1022-10
     traffic_sign=CH:2.59.3: Tag:traffic sign=CH:2.59.3
     traffic_sign=CH:2.59.5: Tag:traffic sign=CH:2.59.5
     traffic_sign=DE:1022-10: Tag:traffic sign=DE:1022-10
+    traffic_sign=DE:103-10: Tag:traffic sign=DE:103-10
+    traffic_sign=DE:103-20: Tag:traffic sign=DE:103-20
     traffic_sign=DE:124: Tag:traffic sign=DE:124
     traffic_sign=DE:124: Tag:traffic sign=DE:124
+    traffic_sign=DE:133-10: Tag:traffic sign=DE:133-10
     traffic_sign=DE:136-10: Tag:traffic sign=DE:136-10
     traffic_sign=DE:142-10: Tag:traffic sign=DE:142-10
     traffic_sign=DE:205: Tag:traffic sign=DE:205
     traffic_sign=DE:206: Tag:traffic sign=DE:206
     traffic_sign=DE:136-10: Tag:traffic sign=DE:136-10
     traffic_sign=DE:142-10: Tag:traffic sign=DE:142-10
     traffic_sign=DE:205: Tag:traffic sign=DE:205
     traffic_sign=DE:206: Tag:traffic sign=DE:206
+    traffic_sign=DE:208: Tag:traffic sign=DE:208
     traffic_sign=DE:220-10: Tag:traffic sign=DE:220-10
     traffic_sign=DE:220-20: Tag:traffic sign=DE:220-20
     traffic_sign=DE:224: Tag:traffic sign=DE:224
     traffic_sign=DE:220-10: Tag:traffic sign=DE:220-10
     traffic_sign=DE:220-20: Tag:traffic sign=DE:220-20
     traffic_sign=DE:224: Tag:traffic sign=DE:224
@@ -10803,6 +14651,7 @@ en:
     traffic_sign=DE:261: Tag:traffic sign=DE:261
     traffic_sign=DE:267: Tag:traffic sign=DE:267
     traffic_sign=DE:269: Tag:traffic sign=DE:269
     traffic_sign=DE:261: Tag:traffic sign=DE:261
     traffic_sign=DE:267: Tag:traffic sign=DE:267
     traffic_sign=DE:269: Tag:traffic sign=DE:269
+    traffic_sign=DE:272: Tag:traffic sign=DE:272
     traffic_sign=DE:274-10: Tag:traffic sign=DE:274-10
     traffic_sign=DE:274-100: Tag:traffic sign=DE:274-100
     traffic_sign=DE:274-120: Tag:traffic sign=DE:274-120
     traffic_sign=DE:274-10: Tag:traffic sign=DE:274-10
     traffic_sign=DE:274-100: Tag:traffic sign=DE:274-100
     traffic_sign=DE:274-120: Tag:traffic sign=DE:274-120
@@ -10818,8 +14667,11 @@ en:
     traffic_sign=DE:274.1-20: Tag:traffic sign=DE:274.1-20
     traffic_sign=DE:274.2: Tag:traffic sign=DE:274.2
     traffic_sign=DE:274.2-20: Tag:traffic sign=DE:274.2-20
     traffic_sign=DE:274.1-20: Tag:traffic sign=DE:274.1-20
     traffic_sign=DE:274.2: Tag:traffic sign=DE:274.2
     traffic_sign=DE:274.2-20: Tag:traffic sign=DE:274.2-20
+    traffic_sign=DE:276: Tag:traffic sign=DE:276
+    traffic_sign=DE:277: Tag:traffic sign=DE:277
     traffic_sign=DE:282: Tag:traffic sign=DE:282
     traffic_sign=DE:306: Tag:traffic sign=DE:306
     traffic_sign=DE:282: Tag:traffic sign=DE:282
     traffic_sign=DE:306: Tag:traffic sign=DE:306
+    traffic_sign=DE:308: Tag:traffic sign=DE:308
     traffic_sign=DE:310: Tag:traffic sign=DE:310
     traffic_sign=DE:325: Tag:traffic sign=DE:325
     traffic_sign=DE:325.1: Tag:traffic sign=DE:325.1
     traffic_sign=DE:310: Tag:traffic sign=DE:310
     traffic_sign=DE:325: Tag:traffic sign=DE:325
     traffic_sign=DE:325.1: Tag:traffic sign=DE:325.1
@@ -10835,6 +14687,7 @@ en:
     traffic_sign=DE:354: Tag:traffic sign=DE:354
     traffic_sign=DE:357: Tag:traffic sign=DE:357
     traffic_sign=DE:385: Tag:traffic sign=DE:385
     traffic_sign=DE:354: Tag:traffic sign=DE:354
     traffic_sign=DE:357: Tag:traffic sign=DE:357
     traffic_sign=DE:385: Tag:traffic sign=DE:385
+    traffic_sign=DE:386.1: Tag:traffic sign=DE:386.1
     traffic_sign=DE:386.3: Tag:traffic sign=DE:386.3
     traffic_sign=DE:394-50: Tag:traffic sign=DE:394-50
     traffic_sign=DE:437: Tag:traffic sign=DE:437
     traffic_sign=DE:386.3: Tag:traffic sign=DE:386.3
     traffic_sign=DE:394-50: Tag:traffic sign=DE:394-50
     traffic_sign=DE:437: Tag:traffic sign=DE:437
@@ -10843,25 +14696,50 @@ en:
     traffic_sign=DE:448: Tag:traffic sign=DE:448
     traffic_sign=DE:449: Tag:traffic sign=DE:449
     traffic_sign=DE:453: Tag:traffic sign=DE:453
     traffic_sign=DE:448: Tag:traffic sign=DE:448
     traffic_sign=DE:449: Tag:traffic sign=DE:449
     traffic_sign=DE:453: Tag:traffic sign=DE:453
+    traffic_sign=DE:600-35: Tag:traffic sign=DE:600-35
+    traffic_sign=DE:600-36: Tag:traffic sign=DE:600-36
+    traffic_sign=DE:600-37: Tag:traffic sign=DE:600-37
+    traffic_sign=DE:600-38: Tag:traffic sign=DE:600-38
+    traffic_sign=DE:600-39: Tag:traffic sign=DE:600-39
     traffic_sign=NL:A01-30-ZB: Tag:traffic sign=NL:A01-30-ZB
     traffic_sign=NL:C15: Tag:traffic sign=NL:C15
     traffic_sign=NL:G07: Tag:traffic sign=NL:G07
     traffic_sign=NL:G11: Tag:traffic sign=NL:G11
     traffic_sign=NL:G12a: Tag:traffic sign=NL:G12a
     traffic_sign=NL:G13: Tag:traffic sign=NL:G13
     traffic_sign=NL:A01-30-ZB: Tag:traffic sign=NL:A01-30-ZB
     traffic_sign=NL:C15: Tag:traffic sign=NL:C15
     traffic_sign=NL:G07: Tag:traffic sign=NL:G07
     traffic_sign=NL:G11: Tag:traffic sign=NL:G11
     traffic_sign=NL:G12a: Tag:traffic sign=NL:G12a
     traffic_sign=NL:G13: Tag:traffic sign=NL:G13
+    traffic_sign=NL:G7: Tag:traffic sign=NL:G7
+    traffic_sign=NL:L51: Tag:traffic sign=NL:L51
+    traffic_sign=PL:A-1: Tag:traffic sign=PL:A-1
+    traffic_sign=PL:A-2: Tag:traffic sign=PL:A-2
+    traffic_sign=PL:D-42: Tag:traffic sign=PL:D-42
+    traffic_sign=PL:D-43: Tag:traffic sign=PL:D-43
+    traffic_sign=US:MD:M1-5: Tag:traffic sign=US:MD:M1-5
     traffic_sign=city_limit: Tag:traffic sign=city limit
     traffic_sign=city_limit: Tag:traffic sign=city limit
+    traffic_sign=give_way: Tag:traffic sign=give way
+    traffic_sign=speedometer_test: Tag:traffic sign=speedometer test
     traffic_sign=stop: Tag:traffic sign=stop
     traffic_sign=stop: Tag:traffic sign=stop
+    traffic_sign=variable_message: Tag:traffic sign=variable message
+    traffic_signals=continuous_green: Tag:traffic signals=continuous green
     traffic_signals=tram_priority: Tag:traffic signals=tram priority
     trailer:type=motorcycle: Tag:trailer:type=motorcycle
     trailhead: Tag:trailhead
     train=no: Tag:train=no
     train=yes: Tag:train=yes
     traffic_signals=tram_priority: Tag:traffic signals=tram priority
     trailer:type=motorcycle: Tag:trailer:type=motorcycle
     trailhead: Tag:trailhead
     train=no: Tag:train=no
     train=yes: Tag:train=yes
+    training=art: Tag:training=art
+    training=aviation: Tag:training=aviation
+    training=bicycle: Tag:training=bicycle
+    training=computer: Tag:training=computer
+    training=driving: Tag:training=driving
+    training=language: Tag:training=language
+    training=music: Tag:training=music
+    training=sport: Tag:training=sport
     tram=yes: Tag:tram=yes
     transformer=auto: Tag:transformer=auto
     transformer=auxiliary: Tag:transformer=auxiliary
     transformer=converter: Tag:transformer=converter
     transformer=distribution: Tag:transformer=distribution
     transformer=generator: Tag:transformer=generator
     tram=yes: Tag:tram=yes
     transformer=auto: Tag:transformer=auto
     transformer=auxiliary: Tag:transformer=auxiliary
     transformer=converter: Tag:transformer=converter
     transformer=distribution: Tag:transformer=distribution
     transformer=generator: Tag:transformer=generator
+    transformer=main: Tag:transformer=main
     transformer=phase_angle_regulator: Tag:transformer=phase angle regulator
     transformer=traction: Tag:transformer=traction
     transformer=yes: Tag:transformer=yes
     transformer=phase_angle_regulator: Tag:transformer=phase angle regulator
     transformer=traction: Tag:transformer=traction
     transformer=yes: Tag:transformer=yes
@@ -10870,26 +14748,35 @@ en:
     trees=banana_plants: Tag:trees=banana plants
     trees=blueberry_plants: Tag:trees=blueberry plants
     trees=cacao_trees: Tag:trees=cacao trees
     trees=banana_plants: Tag:trees=banana plants
     trees=blueberry_plants: Tag:trees=blueberry plants
     trees=cacao_trees: Tag:trees=cacao trees
+    trees=cashew_trees: Tag:trees=cashew trees
     trees=coconut_palms: Tag:trees=coconut palms
     trees=coffea_plants: Tag:trees=coffea plants
     trees=date_palms: Tag:trees=date palms
     trees=coconut_palms: Tag:trees=coconut palms
     trees=coffea_plants: Tag:trees=coffea plants
     trees=date_palms: Tag:trees=date palms
+    trees=durian_trees: Tag:trees=durian trees
     trees=hop_plants: Tag:trees=hop plants
     trees=hop_plants: Tag:trees=hop plants
+    trees=mango_trees: Tag:trees=mango trees
     trees=oil_palms: Tag:trees=oil palms
     trees=olive_trees: Tag:trees=olive trees
     trees=orange_trees: Tag:trees=orange trees
     trees=papaya_trees: Tag:trees=papaya trees
     trees=pineapple_plants: Tag:trees=pineapple plants
     trees=oil_palms: Tag:trees=oil palms
     trees=olive_trees: Tag:trees=olive trees
     trees=orange_trees: Tag:trees=orange trees
     trees=papaya_trees: Tag:trees=papaya trees
     trees=pineapple_plants: Tag:trees=pineapple plants
+    trees=rubber_trees: Tag:trees=rubber trees
     trees=tea_plants: Tag:trees=tea plants
     tunnel=avalanche_protector: Tag:tunnel=avalanche protector
     tunnel=building_passage: Tag:tunnel=building passage
     trees=tea_plants: Tag:trees=tea plants
     tunnel=avalanche_protector: Tag:tunnel=avalanche protector
     tunnel=building_passage: Tag:tunnel=building passage
+    tunnel=canal: Tag:tunnel=canal
     tunnel=culvert: Tag:tunnel=culvert
     tunnel=flooded: Tag:tunnel=flooded
     tunnel=culvert: Tag:tunnel=culvert
     tunnel=flooded: Tag:tunnel=flooded
+    turn:lanes=slide_left: Tag:turn:lanes=slide left
+    turn:lanes=slide_right: Tag:turn:lanes=slide right
     two_sided=yes: Tag:two sided=yes
     two_sided=yes: Tag:two sided=yes
+    type=associatedStreet: Tag:type=associatedStreet
     type=benchmark: Tag:type=benchmark
     type=boundary: Tag:type=boundary
     type=destination_sign: Tag:type=destination sign
     type=enforcement: Tag:type=enforcement
     type=fixed_point: Tag:type=fixed point
     type=benchmark: Tag:type=benchmark
     type=boundary: Tag:type=boundary
     type=destination_sign: Tag:type=destination sign
     type=enforcement: Tag:type=enforcement
     type=fixed_point: Tag:type=fixed point
+    type=health: Tag:type=health
     type=multipolygon: Tag:type=multipolygon
     type=observation_spot: Tag:type=observation spot
     type=public_transport: Tag:type=public transport
     type=multipolygon: Tag:type=multipolygon
     type=observation_spot: Tag:type=observation spot
     type=public_transport: Tag:type=public transport
@@ -10898,6 +14785,7 @@ en:
     type=site: Tag:type=site
     type=superroute: Tag:type=superroute
     type=triangulation: Tag:type=triangulation
     type=site: Tag:type=site
     type=superroute: Tag:type=superroute
     type=triangulation: Tag:type=triangulation
+    type=turnlanes:turns: Tag:type=turnlanes:turns
     type=waterway: Tag:type=waterway
     usage=branch: Tag:usage=branch
     usage=distribution: Tag:usage=distribution
     type=waterway: Tag:type=waterway
     usage=branch: Tag:usage=branch
     usage=distribution: Tag:usage=distribution
@@ -10922,6 +14810,7 @@ en:
     utility=gas: Tag:utility=gas
     utility=heating: Tag:utility=heating
     utility=hydrant: Tag:utility=hydrant
     utility=gas: Tag:utility=gas
     utility=heating: Tag:utility=heating
     utility=hydrant: Tag:utility=hydrant
+    utility=loudspeaker: Tag:utility=loudspeaker
     utility=oil: Tag:utility=oil
     utility=power: Tag:utility=power
     utility=sewerage: Tag:utility=sewerage
     utility=oil: Tag:utility=oil
     utility=power: Tag:utility=power
     utility=sewerage: Tag:utility=sewerage
@@ -10933,11 +14822,21 @@ en:
     valley=balka: Tag:valley=balka
     valve=ball: Tag:valve=ball
     valve=butterfly: Tag:valve=butterfly
     valley=balka: Tag:valley=balka
     valve=ball: Tag:valve=ball
     valve=butterfly: Tag:valve=butterfly
+    valve=check: Tag:valve=check
     valve=gate: Tag:valve=gate
     valve=globe: Tag:valve=globe
     valve=gate: Tag:valve=gate
     valve=globe: Tag:valve=globe
+    valve=hollow_jet: Tag:valve=hollow jet
     valve=needle: Tag:valve=needle
     valve=plug: Tag:valve=plug
     valve=spool: Tag:valve=spool
     valve=needle: Tag:valve=needle
     valve=plug: Tag:valve=plug
     valve=spool: Tag:valve=spool
+    vehicle=agricultural: Tag:vehicle=agricultural
+    vehicle=customers: Tag:vehicle=customers
+    vehicle=destination: Tag:vehicle=destination
+    vehicle=forestry: Tag:vehicle=forestry
+    vehicle=no: Tag:vehicle=no
+    vehicle=permit: Tag:vehicle=permit
+    vehicle=private: Tag:vehicle=private
+    vehicle=yes: Tag:vehicle=yes
     vending: Tag:vending
     vending=SIM-cards: Tag:vending=SIM-cards
     vending=SIM_cards: Tag:vending=SIM cards
     vending: Tag:vending
     vending=SIM-cards: Tag:vending=SIM-cards
     vending=SIM_cards: Tag:vending=SIM cards
@@ -10954,10 +14853,13 @@ en:
     vending=chewing_gums: Tag:vending=chewing gums
     vending=cigarettes: Tag:vending=cigarettes
     vending=coffee: Tag:vending=coffee
     vending=chewing_gums: Tag:vending=chewing gums
     vending=cigarettes: Tag:vending=cigarettes
     vending=coffee: Tag:vending=coffee
+    vending=coin_change_machine: Tag:vending=coin change machine
+    vending=coin_rolls: Tag:vending=coin rolls
     vending=condoms: Tag:vending=condoms
     vending=contact_lenses: Tag:vending=contact lenses
     vending=drinks: Tag:vending=drinks
     vending=e-cigarettes: Tag:vending=e-cigarettes
     vending=condoms: Tag:vending=condoms
     vending=contact_lenses: Tag:vending=contact lenses
     vending=drinks: Tag:vending=drinks
     vending=e-cigarettes: Tag:vending=e-cigarettes
+    vending=eggs: Tag:vending=eggs
     vending=electronics: Tag:vending=electronics
     vending=elongated_coin: Tag:vending=elongated coin
     vending=excrement_bags: Tag:vending=excrement bags
     vending=electronics: Tag:vending=electronics
     vending=elongated_coin: Tag:vending=elongated coin
     vending=excrement_bags: Tag:vending=excrement bags
@@ -10965,13 +14867,16 @@ en:
     vending=first_aid: Tag:vending=first aid
     vending=fishing_bait: Tag:vending=fishing bait
     vending=fishing_tackle: Tag:vending=fishing tackle
     vending=first_aid: Tag:vending=first aid
     vending=fishing_bait: Tag:vending=fishing bait
     vending=fishing_tackle: Tag:vending=fishing tackle
+    vending=flower_seeds: Tag:vending=flower seeds
     vending=flowers: Tag:vending=flowers
     vending=food: Tag:vending=food
     vending=fuel: Tag:vending=fuel
     vending=flowers: Tag:vending=flowers
     vending=food: Tag:vending=food
     vending=fuel: Tag:vending=fuel
+    vending=gas_bottles: Tag:vending=gas bottles
     vending=ice_cream: Tag:vending=ice cream
     vending=ice_cubes: Tag:vending=ice cubes
     vending=ink_cartridges: Tag:vending=ink cartridges
     vending=laundry_detergent: Tag:vending=laundry detergent
     vending=ice_cream: Tag:vending=ice cream
     vending=ice_cubes: Tag:vending=ice cubes
     vending=ink_cartridges: Tag:vending=ink cartridges
     vending=laundry_detergent: Tag:vending=laundry detergent
+    vending=lottery: Tag:vending=lottery
     vending=milk: Tag:vending=milk
     vending=news_papers: Tag:vending=news papers
     vending=newspapers: Tag:vending=newspapers
     vending=milk: Tag:vending=milk
     vending=news_papers: Tag:vending=news papers
     vending=newspapers: Tag:vending=newspapers
@@ -10981,6 +14886,7 @@ en:
     vending=parking_tickets: Tag:vending=parking tickets
     vending=pet_food: Tag:vending=pet food
     vending=photo: Tag:vending=photo
     vending=parking_tickets: Tag:vending=parking tickets
     vending=pet_food: Tag:vending=pet food
     vending=photo: Tag:vending=photo
+    vending=photos: Tag:vending=photos
     vending=pizza: Tag:vending=pizza
     vending=public_transport_plans: Tag:vending=public transport plans
     vending=public_transport_tickets: Tag:vending=public transport tickets
     vending=pizza: Tag:vending=pizza
     vending=public_transport_plans: Tag:vending=public transport plans
     vending=public_transport_tickets: Tag:vending=public transport tickets
@@ -10996,25 +14902,50 @@ en:
     vending=water: Tag:vending=water
     vending_machine: Tag:vending machine
     vending_machine=fuel: Tag:vending machine=fuel
     vending=water: Tag:vending=water
     vending_machine: Tag:vending machine
     vending_machine=fuel: Tag:vending machine=fuel
+    wall=brick: Tag:wall=brick
     wall=castle_wall: Tag:wall=castle wall
     wall=castle_wall: Tag:wall=castle wall
+    wall=concrete: Tag:wall=concrete
+    wall=concrete_block: Tag:wall=concrete block
     wall=dry_stone: Tag:wall=dry stone
     wall=dry_stone: Tag:wall=dry stone
+    wall=flint: Tag:wall=flint
+    wall=flood_wall: Tag:wall=flood wall
+    wall=gabion:value: Tag:wall=gabion:value
     wall=no: Tag:wall=no
     wall=noise_barrier: Tag:wall=noise barrier
     wall=no: Tag:wall=no
     wall=noise_barrier: Tag:wall=noise barrier
+    wall=pise:value: Tag:wall=pise:value
     wall=seawall: Tag:wall=seawall
     wall=seawall: Tag:wall=seawall
+    wall=stone: Tag:wall=stone
+    wall=stone_wall: Tag:wall=stone wall
     wall=tire_barrier: Tag:wall=tire barrier
     wall=training_wall: Tag:wall=training wall
     wall=tire_barrier: Tag:wall=tire barrier
     wall=training_wall: Tag:wall=training wall
+    waste=ash: Tag:waste=ash
+    waste=cigarettes: Tag:waste=cigarettes
     waste=dog_excrement: Tag:waste=dog excrement
     waste=dog_excrement: Tag:waste=dog excrement
+    waste=drugs: Tag:waste=drugs
+    waste=oil: Tag:waste=oil
+    waste=organic: Tag:waste=organic
+    waste=pizza_box: Tag:waste=pizza box
+    waste=rubble: Tag:waste=rubble
+    waste=sharps: Tag:waste=sharps
+    waste=trash: Tag:waste=trash
     water=basin: Tag:water=basin
     water=canal: Tag:water=canal
     water=ditch: Tag:water=ditch
     water=basin: Tag:water=basin
     water=canal: Tag:water=canal
     water=ditch: Tag:water=ditch
+    water=dock: Tag:water=dock
     water=drain: Tag:water=drain
     water=drain: Tag:water=drain
+    water=fish_pass: Tag:water=fish pass
+    water=fishpond: Tag:water=fishpond
+    water=harbour: Tag:water=harbour
     water=intermittent: Tag:water=intermittent
     water=intermittent: Tag:water=intermittent
+    water=kolk: Tag:water=kolk
     water=lagoon: Tag:water=lagoon
     water=lake: Tag:water=lake
     water=lock: Tag:water=lock
     water=lagoon: Tag:water=lagoon
     water=lake: Tag:water=lake
     water=lock: Tag:water=lock
+    water=mere: Tag:water=mere
     water=moat: Tag:water=moat
     water=oxbow: Tag:water=oxbow
     water=pond: Tag:water=pond
     water=moat: Tag:water=moat
     water=oxbow: Tag:water=oxbow
     water=pond: Tag:water=pond
+    water=rapids: Tag:water=rapids
     water=reflecting_pool: Tag:water=reflecting pool
     water=reservoir: Tag:water=reservoir
     water=river: Tag:water=river
     water=reflecting_pool: Tag:water=reflecting pool
     water=reservoir: Tag:water=reservoir
     water=river: Tag:water=river
@@ -11023,6 +14954,7 @@ en:
     water=swale: Tag:water=swale
     water=tidal: Tag:water=tidal
     water=wastewater: Tag:water=wastewater
     water=swale: Tag:water=swale
     water=tidal: Tag:water=tidal
     water=wastewater: Tag:water=wastewater
+    water_source=groundwater: Tag:water source=groundwater
     water_source=main: Tag:water source=main
     water_source=river: Tag:water source=river
     waterway=artificial: Tag:waterway=artificial
     water_source=main: Tag:water source=main
     water_source=river: Tag:water source=river
     waterway=artificial: Tag:waterway=artificial
@@ -11030,6 +14962,7 @@ en:
     waterway=boatyard: Tag:waterway=boatyard
     waterway=brook: Tag:waterway=brook
     waterway=canal: Tag:waterway=canal
     waterway=boatyard: Tag:waterway=boatyard
     waterway=brook: Tag:waterway=brook
     waterway=canal: Tag:waterway=canal
+    waterway=canoe_pass: Tag:waterway=canoe pass
     waterway=dam: Tag:waterway=dam
     waterway=deep_well: Tag:waterway=deep well
     waterway=derelict_canal: Tag:waterway=derelict canal
     waterway=dam: Tag:waterway=dam
     waterway=deep_well: Tag:waterway=deep well
     waterway=derelict_canal: Tag:waterway=derelict canal
@@ -11038,10 +14971,10 @@ en:
     waterway=drain: Tag:waterway=drain
     waterway=dredged_area: Tag:waterway=dredged area
     waterway=drystream: Tag:waterway=drystream
     waterway=drain: Tag:waterway=drain
     waterway=dredged_area: Tag:waterway=dredged area
     waterway=drystream: Tag:waterway=drystream
-    waterway=estuary: Tag:waterway=estuary
     waterway=fairway: Tag:waterway=fairway
     waterway=fish_pass: Tag:waterway=fish pass
     waterway=floating_barrier: Tag:waterway=floating barrier
     waterway=fairway: Tag:waterway=fairway
     waterway=fish_pass: Tag:waterway=fish pass
     waterway=floating_barrier: Tag:waterway=floating barrier
+    waterway=flow_control: Tag:waterway=flow control
     waterway=fuel: Tag:waterway=fuel
     waterway=lock_gate: Tag:waterway=lock gate
     waterway=milestone: Tag:waterway=milestone
     waterway=fuel: Tag:waterway=fuel
     waterway=lock_gate: Tag:waterway=lock gate
     waterway=milestone: Tag:waterway=milestone
@@ -11052,10 +14985,11 @@ en:
     waterway=rapids: Tag:waterway=rapids
     waterway=river: Tag:waterway=river
     waterway=riverbank: Tag:waterway=riverbank
     waterway=rapids: Tag:waterway=rapids
     waterway=river: Tag:waterway=river
     waterway=riverbank: Tag:waterway=riverbank
-    waterway=riverbed: Tag:waterway=riverbed
     waterway=sanitary_dump_station: Tag:waterway=sanitary dump station
     waterway=seaway: Tag:waterway=seaway
     waterway=sanitary_dump_station: Tag:waterway=sanitary dump station
     waterway=seaway: Tag:waterway=seaway
+    waterway=security_lock: Tag:waterway=security lock
     waterway=sluice_gate: Tag:waterway=sluice gate
     waterway=sluice_gate: Tag:waterway=sluice gate
+    waterway=soakhole: Tag:waterway=soakhole
     waterway=spillway: Tag:waterway=spillway
     waterway=stream: Tag:waterway=stream
     waterway=stream_end: Tag:waterway=stream end
     waterway=spillway: Tag:waterway=spillway
     waterway=stream: Tag:waterway=stream
     waterway=stream_end: Tag:waterway=stream end
@@ -11066,7 +15000,9 @@ en:
     waterway=water_point: Tag:waterway=water point
     waterway=waterfall: Tag:waterway=waterfall
     waterway=weir: Tag:waterway=weir
     waterway=water_point: Tag:waterway=water point
     waterway=waterfall: Tag:waterway=waterfall
     waterway=weir: Tag:waterway=weir
+    weather_control=launchpad: Tag:weather control=launchpad
     wetland=bog: Tag:wetland=bog
     wetland=bog: Tag:wetland=bog
+    wetland=dambo: Tag:wetland=dambo
     wetland=fen: Tag:wetland=fen
     wetland=mangrove: Tag:wetland=mangrove
     wetland=marsh: Tag:wetland=marsh
     wetland=fen: Tag:wetland=fen
     wetland=mangrove: Tag:wetland=mangrove
     wetland=marsh: Tag:wetland=marsh
@@ -11078,10 +15014,22 @@ en:
     wetland=swamp: Tag:wetland=swamp
     wetland=tidalflat: Tag:wetland=tidalflat
     wetland=wet_meadow: Tag:wetland=wet meadow
     wetland=swamp: Tag:wetland=swamp
     wetland=tidalflat: Tag:wetland=tidalflat
     wetland=wet_meadow: Tag:wetland=wet meadow
+    wood=coniferous: Tag:wood=coniferous
     wood=eucalypt: Tag:wood=eucalypt
     wood=evergreen: Tag:wood=evergreen
     wood=nipa_palm: Tag:wood=nipa palm
     worship=stations_of_the_cross: Tag:worship=stations of the cross
     wood=eucalypt: Tag:wood=eucalypt
     wood=evergreen: Tag:wood=evergreen
     wood=nipa_palm: Tag:wood=nipa palm
     worship=stations_of_the_cross: Tag:worship=stations of the cross
+    zone:traffic=BE-BRU:urban: Tag:zone:traffic=BE-BRU:urban
+    zone:traffic=BE-VLG:rural: Tag:zone:traffic=BE-VLG:rural
+    zone:traffic=BE-VLG:urban: Tag:zone:traffic=BE-VLG:urban
+    zone:traffic=BE-WAL:rural: Tag:zone:traffic=BE-WAL:rural
+    zone:traffic=BE-WAL:urban: Tag:zone:traffic=BE-WAL:urban
+    zone:traffic=BE:motorway: Tag:zone:traffic=BE:motorway
+    zone:traffic=DE:motorway: Tag:zone:traffic=DE:motorway
+    zone:traffic=DE:rural: Tag:zone:traffic=DE:rural
+    zone:traffic=DE:urban: Tag:zone:traffic=DE:urban
+    zone:traffic=NL:rural: Tag:zone:traffic=NL:rural
+    zone:traffic=NL:urban: Tag:zone:traffic=NL:urban
     zoo=aviary: Tag:zoo=aviary
     zoo=birds: Tag:zoo=birds
     zoo=butterfly: Tag:zoo=butterfly
     zoo=aviary: Tag:zoo=aviary
     zoo=birds: Tag:zoo=birds
     zoo=butterfly: Tag:zoo=butterfly
@@ -11092,21 +15040,47 @@ en:
     zoo=safari_park: Tag:zoo=safari park
     zoo=wildlife_park: Tag:zoo=wildlife park
 eo:
     zoo=safari_park: Tag:zoo=safari park
     zoo=wildlife_park: Tag:zoo=wildlife park
 eo:
+  key:
+    bench: Eo:Key:bench
+    diet: Eo:Key:diet
+    diet:*: Eo:Key:diet:*
+    diet:vegan: Eo:Key:diet:vegan
+    diet:vegetarian: Eo:Key:diet:vegetarian
+    website:menu: Eo:Key:website:menu
   tag:
   tag:
+    aeroway=windsock: Eo:Tag:aeroway=windsock
+    amenity=bench: Eo:Tag:amenity=bench
+    amenity=cafe: Eo:Tag:amenity=cafe
+    amenity=fast_food: Eo:Tag:amenity=fast food
+    amenity=restaurant: Eo:Tag:amenity=restaurant
     craft=tinsmith: Eo:Tag:craft=tinsmith
     craft=tinsmith: Eo:Tag:craft=tinsmith
-    esperanto=esperanto: Eo:Tag:esperanto=esperanto
     esperanto=yes: Eo:Tag:esperanto=yes
     esperanto=yes: Eo:Tag:esperanto=yes
+    generator:source=solar: Eo:Tag:generator:source=solar
+    highway=cycleway: Eo:Tag:highway=cycleway
+    highway=street_lamp: Eo:Tag:highway=street lamp
+    leisure=picnic_table: Eo:Tag:leisure=picnic table
+    place=country: Eo:Tag:place=country
+    place=hamlet: Eo:Tag:place=hamlet
+    place=village: Eo:Tag:place=village
+    shop=bakery: Eo:Tag:shop=bakery
+    waterway=river: Eo:Tag:waterway=river
 es:
   key:
 es:
   key:
+    4wd_only: ES:Key:4wd only
+    AlpinRes_ID: ES:Key:AlpinRes ID
     abandoned: ES:Key:abandoned
     'abandoned:': 'ES:Key:abandoned:'
     abandoned: ES:Key:abandoned
     'abandoned:': 'ES:Key:abandoned:'
+    abandoned:*: ES:Key:abandoned:*
     abandoned:place: ES:Key:abandoned:place
     abandoned:railway: ES:Key:abandoned:railway
     abutters: ES:Key:abutters
     access: ES:Key:access
     addr: ES:Key:addr
     abandoned:place: ES:Key:abandoned:place
     abandoned:railway: ES:Key:abandoned:railway
     abutters: ES:Key:abutters
     access: ES:Key:access
     addr: ES:Key:addr
+    addr:*: ES:Key:addr:*
     addr:city: ES:Key:addr:city
     addr:city: ES:Key:addr:city
+    addr:conscriptionnumber: ES:Key:addr:conscriptionnumber
     addr:country: ES:Key:addr:country
     addr:country: ES:Key:addr:country
+    addr:county: ES:Key:addr:county
     addr:district: ES:Key:addr:district
     addr:flats: ES:Key:addr:flats
     addr:floor: ES:Key:addr:floor
     addr:district: ES:Key:addr:district
     addr:flats: ES:Key:addr:flats
     addr:floor: ES:Key:addr:floor
@@ -11117,6 +15091,7 @@ es:
     addr:inclusion: ES:Key:addr:inclusion
     addr:interpolation: ES:Key:addr:interpolation
     addr:place: ES:Key:addr:place
     addr:inclusion: ES:Key:addr:inclusion
     addr:interpolation: ES:Key:addr:interpolation
     addr:place: ES:Key:addr:place
+    addr:postbox: ES:Key:addr:postbox
     addr:postcode: ES:Key:addr:postcode
     addr:province: ES:Key:addr:province
     addr:state: ES:Key:addr:state
     addr:postcode: ES:Key:addr:postcode
     addr:province: ES:Key:addr:province
     addr:state: ES:Key:addr:state
@@ -11124,9 +15099,12 @@ es:
     addr:subdistrict: ES:Key:addr:subdistrict
     addr:suburb: ES:Key:addr:suburb
     admin_level: ES:Key:admin level
     addr:subdistrict: ES:Key:addr:subdistrict
     addr:suburb: ES:Key:addr:suburb
     admin_level: ES:Key:admin level
+    advertising: ES:Key:advertising
     aerialway: ES:Key:aerialway
     aeroway: ES:Key:aeroway
     after_school: ES:Key:after school
     aerialway: ES:Key:aerialway
     aeroway: ES:Key:aeroway
     after_school: ES:Key:after school
+    agricultural: ES:Key:agricultural
+    alt_name: ES:Key:alt name
     amenity: ES:Key:amenity
     architect: ES:Key:architect
     area: ES:Key:area
     amenity: ES:Key:amenity
     architect: ES:Key:architect
     area: ES:Key:area
@@ -11134,49 +15112,108 @@ es:
     artist_name: ES:Key:artist name
     artwork_subject: ES:Key:artwork subject
     artwork_type: ES:Key:artwork type
     artist_name: ES:Key:artist name
     artwork_subject: ES:Key:artwork subject
     artwork_type: ES:Key:artwork type
+    attribution: ES:Key:attribution
+    atv: ES:Key:atv
+    avalanche_protection: ES:Key:avalanche protection
+    backrest: ES:Key:backrest
     barrier: ES:Key:barrier
     barrier: ES:Key:barrier
+    basin: ES:Key:basin
+    bdouble: ES:Key:bdouble
+    beauty: ES:Key:beauty
     beds: ES:Key:beds
     beds: ES:Key:beds
+    bench: ES:Key:bench
+    bicycle: ES:Key:bicycle
     bicycle_parking: ES:Key:bicycle parking
     bicycle_parking: ES:Key:bicycle parking
-    bicycle_road: ES:Key:bicycle road
+    bin: ES:Key:bin
+    board:title: ES:Key:board:title
+    boat: ES:Key:boat
+    bollard: ES:Key:bollard
     books: ES:Key:books
     books: ES:Key:books
+    border_type: ES:Key:border type
+    boundary: ES:Key:boundary
     branch: ES:Key:branch
     brand: ES:Key:brand
     brewery: ES:Key:brewery
     bridge: ES:Key:bridge
     bridge:structure: ES:Key:bridge:structure
     building: ES:Key:building
     branch: ES:Key:branch
     brand: ES:Key:brand
     brewery: ES:Key:brewery
     bridge: ES:Key:bridge
     bridge:structure: ES:Key:bridge:structure
     building: ES:Key:building
+    building:colour: ES:Key:building:colour
     building:fireproof: ES:Key:building:fireproof
     building:flats: ES:Key:building:flats
     building:levels: ES:Key:building:levels
     building:levels:underground: ES:Key:building:levels:underground
     building:material: ES:Key:building:material
     building:fireproof: ES:Key:building:fireproof
     building:flats: ES:Key:building:flats
     building:levels: ES:Key:building:levels
     building:levels:underground: ES:Key:building:levels:underground
     building:material: ES:Key:building:material
+    building:max_level: ES:Key:building:max level
     building:min_level: ES:Key:building:min level
     building:part: ES:Key:building:part
     building:soft_storey: ES:Key:building:soft storey
     building:use: ES:Key:building:use
     building:min_level: ES:Key:building:min level
     building:part: ES:Key:building:part
     building:soft_storey: ES:Key:building:soft storey
     building:use: ES:Key:building:use
+    bus: ES:Key:bus
     bus_bay: ES:Key:bus bay
     busway: ES:Key:busway
     capital: ES:Key:capital
     bus_bay: ES:Key:bus bay
     busway: ES:Key:busway
     capital: ES:Key:capital
+    car_wash: ES:Key:car wash
+    cash_withdrawal: ES:Key:cash withdrawal
+    castle_type: ES:Key:castle type
     cemetery: ES:Key:cemetery
     cemetery: ES:Key:cemetery
+    change: ES:Key:change
     changesets_count: ES:Key:changesets count
     changesets_count: ES:Key:changesets count
+    charge: ES:Key:charge
     check_date: ES:Key:check date
     circumference: ES:Key:circumference
     check_date: ES:Key:check date
     circumference: ES:Key:circumference
+    city_limit: ES:Key:city limit
+    closed:note: ES:Key:closed:note
     clothes: ES:Key:clothes
     club: ES:Key:club
     collection_times: ES:Key:collection times
     clothes: ES:Key:clothes
     club: ES:Key:club
     collection_times: ES:Key:collection times
+    colour: ES:Key:colour
     comment: ES:Key:comment
     communication:amateur_radio: ES:Key:communication:amateur radio
     communication:radio: ES:Key:communication:radio
     communication:television: ES:Key:communication:television
     community_centre: ES:Key:community centre
     community_centre:for: ES:Key:community centre:for
     comment: ES:Key:comment
     communication:amateur_radio: ES:Key:communication:amateur radio
     communication:radio: ES:Key:communication:radio
     communication:television: ES:Key:communication:television
     community_centre: ES:Key:community centre
     community_centre:for: ES:Key:community centre:for
+    condition: ES:Key:condition
+    condo: ES:Key:condo
     construction: ES:Key:construction
     consulting: ES:Key:consulting
     contact: ES:Key:contact
     construction: ES:Key:construction
     consulting: ES:Key:consulting
     contact: ES:Key:contact
+    contact:*: ES:Key:contact:*
+    contact:city: ES:Key:contact:city
+    contact:diaspora: ES:Key:contact:diaspora
+    contact:email: ES:Key:contact:email
     contact:facebook: ES:Key:contact:facebook
     contact:facebook: ES:Key:contact:facebook
+    contact:fax: ES:Key:contact:fax
+    contact:flickr: ES:Key:contact:flickr
+    contact:foursquare: ES:Key:contact:foursquare
+    contact:gnusocial: ES:Key:contact:gnusocial
+    contact:housenumber: ES:Key:contact:housenumber
+    contact:instagram: ES:Key:contact:instagram
+    contact:linkedin: ES:Key:contact:linkedin
+    contact:mastodon: ES:Key:contact:mastodon
+    contact:mobile: ES:Key:contact:mobile
+    contact:ok: ES:Key:contact:ok
+    contact:phone: ES:Key:contact:phone
+    contact:pinterest: ES:Key:contact:pinterest
+    contact:pobox: ES:Key:contact:pobox
+    contact:postcode: ES:Key:contact:postcode
+    contact:sip: ES:Key:contact:sip
+    contact:skype: ES:Key:contact:skype
+    contact:street: ES:Key:contact:street
+    contact:telegram: ES:Key:contact:telegram
     contact:twitter: ES:Key:contact:twitter
     contact:twitter: ES:Key:contact:twitter
+    contact:vhf: ES:Key:contact:vhf
+    contact:viber: ES:Key:contact:viber
+    contact:vk: ES:Key:contact:vk
+    contact:webcam: ES:Key:contact:webcam
+    contact:website: ES:Key:contact:website
+    contact:whatsapp: ES:Key:contact:whatsapp
+    contact:xing: ES:Key:contact:xing
+    contact:youtube: ES:Key:contact:youtube
     content: ES:Key:content
     conveying: ES:Key:conveying
     content: ES:Key:content
     conveying: ES:Key:conveying
+    cooker: ES:Key:cooker
+    country: ES:Key:country
     covered: ES:Key:covered
     craft: ES:Key:craft
     created_by: ES:Key:created by
     covered: ES:Key:covered
     craft: ES:Key:craft
     created_by: ES:Key:created by
@@ -11186,61 +15223,113 @@ es:
     cuisine: ES:Key:cuisine
     currency: ES:Key:currency
     cutting: ES:Key:cutting
     cuisine: ES:Key:cuisine
     currency: ES:Key:currency
     cutting: ES:Key:cutting
+    cycle_rickshaw: ES:Key:cycle rickshaw
+    cyclestreets_id: ES:Key:cyclestreets id
     cycleway: ES:Key:cycleway
     cycleway:both: ES:Key:cycleway:both
     cycleway: ES:Key:cycleway
     cycleway:both: ES:Key:cycleway:both
+    cycleway:buffer: ES:Key:cycleway:buffer
     cycleway:lane: ES:Key:cycleway:lane
     cycleway:left: ES:Key:cycleway:left
     cycleway:right: ES:Key:cycleway:right
     cycleway:lane: ES:Key:cycleway:lane
     cycleway:left: ES:Key:cycleway:left
     cycleway:right: ES:Key:cycleway:right
+    cycleway:right:oneway: ES:Key:cycleway:right:oneway
+    cycleway:surface: ES:Key:cycleway:surface
     delivery: ES:Key:delivery
     delivery: ES:Key:delivery
+    'demolished:': 'ES:Key:demolished:'
+    demolished:*: ES:Key:demolished:*
     denotation: ES:Key:denotation
     description: ES:Key:description
     denotation: ES:Key:denotation
     description: ES:Key:description
+    designation: ES:Key:designation
     destination: ES:Key:destination
     destination: ES:Key:destination
-    diaper: ES:Key:diaper
     diet: ES:Key:diet
     diet:*: ES:Key:diet:*
     diet:kosher: ES:Key:diet:kosher
     diet: ES:Key:diet
     diet:*: ES:Key:diet:*
     diet:kosher: ES:Key:diet:kosher
+    diet:vegan: ES:Key:diet:vegan
+    diet:vegetarian: ES:Key:diet:vegetarian
+    direction: ES:Key:direction
     dispensing: ES:Key:dispensing
     distance: ES:Key:distance
     disused: ES:Key:disused
     'disused:': 'ES:Key:disused:'
     dispensing: ES:Key:dispensing
     distance: ES:Key:distance
     disused: ES:Key:disused
     'disused:': 'ES:Key:disused:'
+    disused:*: ES:Key:disused:*
     disused:railway: ES:Key:disused:railway
     disused:railway: ES:Key:disused:railway
+    divipola: ES:Key:divipola
+    drain: ES:Key:drain
+    drinking_water: ES:Key:drinking water
+    drive_in: ES:Key:drive in
+    drive_through: ES:Key:drive through
+    dual_carriageway: ES:Key:dual carriageway
+    ele: ES:Key:ele
+    ele:natural: ES:Key:ele:natural
+    electric_bicycle: ES:Key:electric bicycle
+    electrified: ES:Key:electrified
     email: ES:Key:email
     embankment: ES:Key:embankment
     email: ES:Key:email
     embankment: ES:Key:embankment
+    embedded_rails: ES:Key:embedded rails
     emergency: ES:Key:emergency
     emergency: ES:Key:emergency
+    emergency:phone: ES:Key:emergency:phone
     end_date: ES:Key:end date
     end_date: ES:Key:end date
+    enforcement: ES:Key:enforcement
     engineer: ES:Key:engineer
     engineer: ES:Key:engineer
+    entidad_te: ES:Key:entidad te
     entrance: ES:Key:entrance
     entrance: ES:Key:entrance
+    est_width: ES:Key:est width
     evacuation_route: ES:Key:evacuation route
     facebook: ES:Key:facebook
     fair_trade: ES:Key:fair trade
     evacuation_route: ES:Key:evacuation route
     facebook: ES:Key:facebook
     fair_trade: ES:Key:fair trade
+    fax: ES:Key:fax
     fee: ES:Key:fee
     fence_type: ES:Key:fence type
     fee: ES:Key:fee
     fence_type: ES:Key:fence type
+    fire_boundary: ES:Key:fire boundary
+    fire_object:type: ES:Key:fire object:type
+    fire_operator: ES:Key:fire operator
+    fire_rank: ES:Key:fire rank
     fishing: ES:Key:fishing
     fixme: ES:Key:fixme
     fishing: ES:Key:fishing
     fixme: ES:Key:fixme
+    flag:type: ES:Key:flag:type
+    flood_date: ES:Key:flood date
+    flood_mark: ES:Key:flood mark
     flood_prone: ES:Key:flood prone
     foot: ES:Key:foot
     foot:backward: ES:Key:foot:backward
     footway: ES:Key:footway
     ford: ES:Key:ford
     flood_prone: ES:Key:flood prone
     foot: ES:Key:foot
     foot:backward: ES:Key:foot:backward
     footway: ES:Key:footway
     ford: ES:Key:ford
+    forestry: ES:Key:forestry
+    frequency: ES:Key:frequency
     from: ES:Key:from
     fuel:diesel_G2: ES:Key:fuel:diesel G2
     garden:style: ES:Key:garden:style
     garden:type: ES:Key:garden:type
     gauge: ES:Key:gauge
     from: ES:Key:from
     fuel:diesel_G2: ES:Key:fuel:diesel G2
     garden:style: ES:Key:garden:style
     garden:type: ES:Key:garden:type
     gauge: ES:Key:gauge
+    generator:method: ES:Key:generator:method
     generator:output: ES:Key:generator:output
     generator:source: ES:Key:generator:source
     generator:output: ES:Key:generator:output
     generator:source: ES:Key:generator:source
+    generator:type: ES:Key:generator:type
     genus: ES:Key:genus
     geological: ES:Key:geological
     genus: ES:Key:genus
     geological: ES:Key:geological
+    golf_cart: ES:Key:golf cart
+    goods: ES:Key:goods
     government: ES:Key:government
     grassland: ES:Key:grassland
     government: ES:Key:government
     grassland: ES:Key:grassland
+    handrail: ES:Key:handrail
+    hazard: ES:Key:hazard
     hazard_prone: ES:Key:hazard prone
     hazard_prone: ES:Key:hazard prone
+    hazmat: ES:Key:hazmat
     healthcare: ES:Key:healthcare
     healthcare:counselling: ES:Key:healthcare:counselling
     healthcare: ES:Key:healthcare
     healthcare:counselling: ES:Key:healthcare:counselling
+    healthcare:speciality: ES:Key:healthcare:speciality
     height: ES:Key:height
     heritage: ES:Key:heritage
     height: ES:Key:height
     heritage: ES:Key:heritage
+    hgv: ES:Key:hgv
+    highchair: ES:Key:highchair
+    highspeed: ES:Key:highspeed
     highway: ES:Key:highway
     historic: ES:Key:historic
     historic:civilization: ES:Key:historic:civilization
     highway: ES:Key:highway
     historic: ES:Key:historic
     historic:civilization: ES:Key:historic:civilization
+    horse: ES:Key:horse
+    house: ES:Key:house
+    iata: ES:Key:iata
+    icao: ES:Key:icao
+    ice_road: ES:Key:ice road
     image: ES:Key:image
     imagery_used: ES:Key:imagery used
     incline: ES:Key:incline
     image: ES:Key:image
     imagery_used: ES:Key:imagery used
     incline: ES:Key:incline
@@ -11248,44 +15337,81 @@ es:
     industrial: ES:Key:industrial
     informal: ES:Key:informal
     information: ES:Key:information
     industrial: ES:Key:industrial
     informal: ES:Key:informal
     information: ES:Key:information
+    inline_skates: ES:Key:inline skates
     inscription: ES:Key:inscription
     inscription: ES:Key:inscription
+    int_name: ES:Key:int name
+    int_ref: ES:Key:int ref
     intermittent: ES:Key:intermittent
     intermittent: ES:Key:intermittent
+    internet_access: ES:Key:internet access
+    internet_access:fee: ES:Key:internet access:fee
     interval: ES:Key:interval
     irrigated: ES:Key:irrigated
     is_in: ES:Key:is in
     is_in:continent: ES:Key:is in:continent
     is_in:country: ES:Key:is in:country
     isced:level: ES:Key:isced:level
     interval: ES:Key:interval
     irrigated: ES:Key:irrigated
     is_in: ES:Key:is in
     is_in:continent: ES:Key:is in:continent
     is_in:country: ES:Key:is in:country
     isced:level: ES:Key:isced:level
+    junction: ES:Key:junction
     kerb: ES:Key:kerb
     kerb: ES:Key:kerb
+    kids_area: ES:Key:kids area
+    kitchen: ES:Key:kitchen
     ladder: ES:Key:ladder
     landuse: ES:Key:landuse
     lane_markings: ES:Key:lane markings
     lanes: ES:Key:lanes
     lanes:psv: ES:Key:lanes:psv
     lawyer: ES:Key:lawyer
     ladder: ES:Key:ladder
     landuse: ES:Key:landuse
     lane_markings: ES:Key:lane markings
     lanes: ES:Key:lanes
     lanes:psv: ES:Key:lanes:psv
     lawyer: ES:Key:lawyer
+    layer: ES:Key:layer
+    lcn_ref: ES:Key:lcn ref
     leaf_cycle: ES:Key:leaf cycle
     leaf_type: ES:Key:leaf type
     leisure: ES:Key:leisure
     length: ES:Key:length
     level: ES:Key:level
     lgbtq: ES:Key:lgbtq
     leaf_cycle: ES:Key:leaf cycle
     leaf_type: ES:Key:leaf type
     leisure: ES:Key:leisure
     length: ES:Key:length
     level: ES:Key:level
     lgbtq: ES:Key:lgbtq
+    lhv: ES:Key:lhv
+    lifeguard: ES:Key:lifeguard
+    line: ES:Key:line
+    lit: ES:Key:lit
+    lit:perceived: ES:Key:lit:perceived
+    loc_name: ES:Key:loc name
+    loc_ref: ES:Key:loc ref
     local_ref: ES:Key:local ref
     locale: ES:Key:locale
     local_ref: ES:Key:local ref
     locale: ES:Key:locale
+    localwiki: ES:Key:localwiki
     location: ES:Key:location
     location: ES:Key:location
+    lock: ES:Key:lock
     man_made: ES:Key:man made
     manhole: ES:Key:manhole
     manufacturer: ES:Key:manufacturer
     mapillary: ES:Key:mapillary
     material: ES:Key:material
     man_made: ES:Key:man made
     manhole: ES:Key:manhole
     manufacturer: ES:Key:manufacturer
     mapillary: ES:Key:mapillary
     material: ES:Key:material
+    max_age: ES:Key:max age
+    maxaxleload: ES:Key:maxaxleload
+    maxbogieweight: ES:Key:maxbogieweight
     maxheight: ES:Key:maxheight
     maxheight: ES:Key:maxheight
+    maxlength: ES:Key:maxlength
     maxspeed: ES:Key:maxspeed
     maxspeed:advisory: ES:Key:maxspeed:advisory
     maxspeed:practical: ES:Key:maxspeed:practical
     maxspeed: ES:Key:maxspeed
     maxspeed:advisory: ES:Key:maxspeed:advisory
     maxspeed:practical: ES:Key:maxspeed:practical
+    maxstay: ES:Key:maxstay
+    maxweight: ES:Key:maxweight
+    maxwidth: ES:Key:maxwidth
     memorial: ES:Key:memorial
     memorial: ES:Key:memorial
+    microwave: ES:Key:microwave
+    military: ES:Key:military
+    min_age: ES:Key:min age
     min_height: ES:Key:min height
     min_height: ES:Key:min height
+    minspeed: ES:Key:minspeed
+    mofa: ES:Key:mofa
     monitoring:galileo: ES:Key:monitoring:galileo
     monitoring:glonass: ES:Key:monitoring:glonass
     monitoring:gps: ES:Key:monitoring:gps
     monitoring:galileo: ES:Key:monitoring:galileo
     monitoring:glonass: ES:Key:monitoring:glonass
     monitoring:gps: ES:Key:monitoring:gps
+    mooring: ES:Key:mooring
+    moped: ES:Key:moped
+    motor_vehicle: ES:Key:motor vehicle
+    motorboat: ES:Key:motorboat
+    motorcar: ES:Key:motorcar
+    motorcycle: ES:Key:motorcycle
     motorcycle:clothes: ES:Key:motorcycle:clothes
     motorcycle:parts: ES:Key:motorcycle:parts
     motorcycle:rental: ES:Key:motorcycle:rental
     motorcycle:clothes: ES:Key:motorcycle:clothes
     motorcycle:parts: ES:Key:motorcycle:parts
     motorcycle:rental: ES:Key:motorcycle:rental
@@ -11296,46 +15422,76 @@ es:
     motorhome: ES:Key:motorhome
     motorroad: ES:Key:motorroad
     mountain_pass: ES:Key:mountain pass
     motorhome: ES:Key:motorhome
     motorroad: ES:Key:motorroad
     mountain_pass: ES:Key:mountain pass
+    mtb:description: ES:Key:mtb:description
+    mtb:scale: ES:Key:mtb:scale
+    mtb:scale:imba: ES:Key:mtb:scale:imba
+    mtb:scale:uphill: ES:Key:mtb:scale:uphill
     museum: ES:Key:museum
     museum_type: ES:Key:museum type
     musical_instrument: ES:Key:musical instrument
     name: ES:Key:name
     museum: ES:Key:museum
     museum_type: ES:Key:museum type
     musical_instrument: ES:Key:musical instrument
     name: ES:Key:name
+    name:es: ES:Key:name:es
+    name:etymology: ES:Key:name:etymology
+    name:etymology:wikidata: ES:Key:name:etymology:wikidata
+    name:eu-x-gaceria: ES:Key:name:eu-x-gaceria
+    name:hop: ES:Key:name:hop
+    name:left: ES:Key:name:left
+    name:mtp: ES:Key:name:mtp
+    name:right: ES:Key:name:right
+    name:signed: ES:Key:name:signed
     narrow: ES:Key:narrow
     narrow: ES:Key:narrow
+    nat_name: ES:Key:nat name
+    nat_ref: ES:Key:nat ref
     natural: ES:Key:natural
     natural: ES:Key:natural
+    ncn_ref: ES:Key:ncn ref
     network:type: ES:Key:network:type
     noaddress: ES:Key:noaddress
     network:type: ES:Key:network:type
     noaddress: ES:Key:noaddress
-    noexit: ES:Key:noexit
     nohousenumber: ES:Key:nohousenumber
     non_existent_levels: ES:Key:non existent levels
     nohousenumber: ES:Key:nohousenumber
     non_existent_levels: ES:Key:non existent levels
-    noname: ES:Key:noname
     'not:': 'ES:Key:not:'
     'not:': 'ES:Key:not:'
+    not:*: ES:Key:not:*
     note: ES:Key:note
     nudism: ES:Key:nudism
     object: ES:Key:object
     office: ES:Key:office
     note: ES:Key:note
     nudism: ES:Key:nudism
     object: ES:Key:object
     office: ES:Key:office
+    official_name: ES:Key:official name
     old_name: ES:Key:old name
     old_name: ES:Key:old name
+    old_ref: ES:Key:old ref
     oneway: ES:Key:oneway
     oneway: ES:Key:oneway
+    oneway:bicycle: ES:Key:oneway:bicycle
     oneway:psv: ES:Key:oneway:psv
     oneway:psv: ES:Key:oneway:psv
+    openbenches:id: ES:Key:openbenches:id
+    opening_date: ES:Key:opening date
     opening_hours: ES:Key:opening hours
     opening_hours:covid19: ES:Key:opening hours:covid19
     opening_hours: ES:Key:opening hours
     opening_hours:covid19: ES:Key:opening hours:covid19
+    openplaques:id: ES:Key:openplaques:id
     operator: ES:Key:operator
     operator:type: ES:Key:operator:type
     organic: ES:Key:organic
     orienteering: ES:Key:orienteering
     origin: ES:Key:origin
     operator: ES:Key:operator
     operator:type: ES:Key:operator:type
     organic: ES:Key:organic
     orienteering: ES:Key:orienteering
     origin: ES:Key:origin
+    orv: ES:Key:orv
     osmc:symbol: ES:Key:osmc:symbol
     osmc:symbol: ES:Key:osmc:symbol
+    outdoor_seating:comfort: ES:Key:outdoor seating:comfort
+    oven: ES:Key:oven
     overtaking: ES:Key:overtaking
     owner: ES:Key:owner
     ownership: ES:Key:ownership
     parking: ES:Key:parking
     overtaking: ES:Key:overtaking
     owner: ES:Key:owner
     ownership: ES:Key:ownership
     parking: ES:Key:parking
-    parking:lane: ES:Key:parking:lane
+    parking:both: ES:Key:parking:both
+    parking:left: ES:Key:parking:left
+    parking:right: ES:Key:parking:right
     passenger: ES:Key:passenger
     passenger: ES:Key:passenger
+    passenger_lines: ES:Key:passenger lines
+    passing_places: ES:Key:passing places
     payment: ES:Key:payment
     phone: ES:Key:phone
     place: ES:Key:place
     placement: ES:Key:placement
     police: ES:Key:police
     payment: ES:Key:payment
     phone: ES:Key:phone
     place: ES:Key:place
     placement: ES:Key:placement
     police: ES:Key:police
+    political_division: ES:Key:political division
     population: ES:Key:population
     population: ES:Key:population
+    potholes: ES:Key:potholes
     power: ES:Key:power
     prepayment: ES:Key:prepayment
     prepayment:*: ES:Key:prepayment:*
     power: ES:Key:power
     prepayment: ES:Key:prepayment
     prepayment:*: ES:Key:prepayment:*
@@ -11353,19 +15509,31 @@ es:
     pump: ES:Key:pump
     railway: ES:Key:railway
     railway:preserved: ES:Key:railway:preserved
     pump: ES:Key:pump
     railway: ES:Key:railway
     railway:preserved: ES:Key:railway:preserved
+    railway:track_ref: ES:Key:railway:track ref
     ramp: ES:Key:ramp
     ramp: ES:Key:ramp
+    rcn_ref: ES:Key:rcn ref
+    real_ale: ES:Key:real ale
+    recycling_type: ES:Key:recycling type
     ref: ES:Key:ref
     ref:bic: ES:Key:ref:bic
     ref: ES:Key:ref
     ref:bic: ES:Key:ref:bic
+    ref:codcat: ES:Key:ref:codcat
     ref:color: ES:Key:ref:color
     ref:colour: ES:Key:ref:colour
     ref:color: ES:Key:ref:color
     ref:colour: ES:Key:ref:colour
+    ref:ine: ES:Key:ref:ine
     ref:isil: ES:Key:ref:isil
     ref:isil: ES:Key:ref:isil
+    reg_name: ES:Key:reg name
+    reg_ref: ES:Key:reg ref
     related_law: ES:Key:related law
     religion: ES:Key:religion
     'removed:': 'ES:Key:removed:'
     related_law: ES:Key:related law
     religion: ES:Key:religion
     'removed:': 'ES:Key:removed:'
+    removed:*: ES:Key:removed:*
     reservation: ES:Key:reservation
     residential: ES:Key:residential
     resource: ES:Key:resource
     reservation: ES:Key:reservation
     residential: ES:Key:residential
     resource: ES:Key:resource
+    restaurant: ES:Key:restaurant
+    retreat: ES:Key:retreat
     review_requested: ES:Key:review requested
     review_requested: ES:Key:review requested
+    roadtrain: ES:Key:roadtrain
     roller_coaster: ES:Key:roller coaster
     roof:colour: ES:Key:roof:colour
     roof:direction: ES:Key:roof:direction
     roller_coaster: ES:Key:roller coaster
     roof:colour: ES:Key:roof:colour
     roof:direction: ES:Key:roof:direction
@@ -11377,49 +15545,80 @@ es:
     route_ref: ES:Key:route ref
     ruins: ES:Key:ruins
     'ruins:': 'ES:Key:ruins:'
     route_ref: ES:Key:route ref
     ruins: ES:Key:ruins
     'ruins:': 'ES:Key:ruins:'
+    ruins:*: ES:Key:ruins:*
     rungs: ES:Key:rungs
     sac_scale: ES:Key:sac scale
     safety_rope: ES:Key:safety rope
     seasonal: ES:Key:seasonal
     seats: ES:Key:seats
     rungs: ES:Key:rungs
     sac_scale: ES:Key:sac scale
     safety_rope: ES:Key:safety rope
     seasonal: ES:Key:seasonal
     seats: ES:Key:seats
+    second_hand: ES:Key:second hand
+    segregated: ES:Key:segregated
+    self_service: ES:Key:self service
+    service: ES:Key:service
     service:bicycle:diy: ES:Key:service:bicycle:diy
     service:bicycle:diy: ES:Key:service:bicycle:diy
+    service_times: ES:Key:service times
     shelter: ES:Key:shelter
     shelter: ES:Key:shelter
+    shelter_type: ES:Key:shelter type
+    shooting: ES:Key:shooting
     shop: ES:Key:shop
     shop: ES:Key:shop
+    short_name: ES:Key:short name
     shoulder: ES:Key:shoulder
     sidewalk: ES:Key:sidewalk
     shoulder: ES:Key:shoulder
     sidewalk: ES:Key:sidewalk
-    site_type: ES:Key:site type
+    ski: ES:Key:ski
+    smoothness: ES:Key:smoothness
     social_facility: ES:Key:social facility
     social_facility:for: ES:Key:social facility:for
     social_facility: ES:Key:social facility
     social_facility:for: ES:Key:social facility:for
+    sorting_name: ES:Key:sorting name
     source: ES:Key:source
     source: ES:Key:source
+    source:geometry: ES:Key:source:geometry
+    source:name: ES:Key:source:name
+    source:ref: ES:Key:source:ref
+    source_ref: ES:Key:source ref
     species: ES:Key:species
     species: ES:Key:species
+    species:de: ES:Key:species:de
+    speed_pedelec: ES:Key:speed pedelec
     sport: ES:Key:sport
     stars: ES:Key:stars
     start_date: ES:Key:start date
     stop: ES:Key:stop
     sport: ES:Key:sport
     stars: ES:Key:stars
     start_date: ES:Key:start date
     stop: ES:Key:stop
+    substance: ES:Key:substance
     supervised: ES:Key:supervised
     support: ES:Key:support
     surface: ES:Key:surface
     surveillance: ES:Key:surveillance
     surveillance:type: ES:Key:surveillance:type
     surveillance:zone: ES:Key:surveillance:zone
     supervised: ES:Key:supervised
     support: ES:Key:support
     surface: ES:Key:surface
     surveillance: ES:Key:surveillance
     surveillance:type: ES:Key:surveillance:type
     surveillance:zone: ES:Key:surveillance:zone
+    survey:date: ES:Key:survey:date
     symbol: ES:Key:symbol
     symbol: ES:Key:symbol
+    tactile_paving: ES:Key:tactile paving
     takeaway: ES:Key:takeaway
     takeaway: ES:Key:takeaway
+    tank: ES:Key:tank
     taxi: ES:Key:taxi
     taxi: ES:Key:taxi
+    telecom: ES:Key:telecom
     tents: ES:Key:tents
     theatre:type: ES:Key:theatre:type
     tents: ES:Key:tents
     theatre:type: ES:Key:theatre:type
+    tidal: ES:Key:tidal
     to: ES:Key:to
     todo: ES:Key:todo
     toilets: ES:Key:toilets
     toilets:wheelchair: ES:Key:toilets:wheelchair
     to: ES:Key:to
     todo: ES:Key:todo
     toilets: ES:Key:toilets
     toilets:wheelchair: ES:Key:toilets:wheelchair
+    toll: ES:Key:toll
     tourism: ES:Key:tourism
     tourist_bus: ES:Key:tourist bus
     tower:construction: ES:Key:tower:construction
     tourism: ES:Key:tourism
     tourist_bus: ES:Key:tourist bus
     tower:construction: ES:Key:tower:construction
+    tracks: ES:Key:tracks
     tracktype: ES:Key:tracktype
     traffic: ES:Key:traffic
     traffic_calming: ES:Key:traffic calming
     traffic_sign: ES:Key:traffic sign
     traffic_signals: ES:Key:traffic signals
     tracktype: ES:Key:tracktype
     traffic: ES:Key:traffic
     traffic_calming: ES:Key:traffic calming
     traffic_sign: ES:Key:traffic sign
     traffic_signals: ES:Key:traffic signals
+    traffic_signals:countdown: ES:Key:traffic signals:countdown
     traffic_signals:direction: ES:Key:traffic signals:direction
     traffic_signals:direction: ES:Key:traffic signals:direction
+    trail_visibility: ES:Key:trail visibility
+    trailblazed: ES:Key:trailblazed
+    trailblazed:visibility: ES:Key:trailblazed:visibility
+    train: ES:Key:train
+    transformer: ES:Key:transformer
     tree_lined: ES:Key:tree lined
     trolley_wire: ES:Key:trolley wire
     trolleybus: ES:Key:trolleybus
     tree_lined: ES:Key:tree lined
     trolley_wire: ES:Key:trolley wire
     trolleybus: ES:Key:trolleybus
@@ -11427,73 +15626,151 @@ es:
     turn: ES:Key:turn
     twitter: ES:Key:twitter
     type: ES:Key:type
     turn: ES:Key:turn
     twitter: ES:Key:twitter
     type: ES:Key:type
+    unisex: ES:Key:unisex
     unnamed: ES:Key:unnamed
     url: ES:Key:url
     unnamed: ES:Key:unnamed
     url: ES:Key:url
+    usage: ES:Key:usage
     vaccination: ES:Key:vaccination
     vehicle: ES:Key:vehicle
     vaccination: ES:Key:vaccination
     vehicle: ES:Key:vehicle
+    vending: ES:Key:vending
     via: ES:Key:via
     via: ES:Key:via
+    voltage: ES:Key:voltage
+    walking_time: ES:Key:walking time
+    wall: ES:Key:wall
+    waste: ES:Key:waste
     water: ES:Key:water
     water: ES:Key:water
+    water_source: ES:Key:water source
     waterway: ES:Key:waterway
     website: ES:Key:website
     waterway: ES:Key:waterway
     website: ES:Key:website
+    website:booking: ES:Key:website:booking
     wetland: ES:Key:wetland
     wheelchair: ES:Key:wheelchair
     wheelchair:description: ES:Key:wheelchair:description
     wholesale: ES:Key:wholesale
     wetland: ES:Key:wetland
     wheelchair: ES:Key:wheelchair
     wheelchair:description: ES:Key:wheelchair:description
     wholesale: ES:Key:wholesale
+    width: ES:Key:width
     wikidata: ES:Key:wikidata
     wikimedia_commons: ES:Key:wikimedia commons
     wikipedia: ES:Key:wikipedia
     wikidata: ES:Key:wikidata
     wikimedia_commons: ES:Key:wikimedia commons
     wikipedia: ES:Key:wikipedia
+    winter_road: ES:Key:winter road
+    xmas:feature: ES:Key:xmas:feature
   tag:
   tag:
+    abandoned:amenity=prison: ES:Tag:abandoned:amenity=prison
     abandoned:amenity=prison_camp: ES:Tag:abandoned:amenity=prison camp
     abandoned:amenity=prison_camp: ES:Tag:abandoned:amenity=prison camp
+    abutters=commercial: ES:Tag:abutters=commercial
+    abutters=industrial: ES:Tag:abutters=industrial
+    abutters=mixed: ES:Tag:abutters=mixed
+    abutters=residential: ES:Tag:abutters=residential
+    abutters=retail: ES:Tag:abutters=retail
+    access=agricultural: ES:Tag:access=agricultural
     access=customers: ES:Tag:access=customers
     access=customers: ES:Tag:access=customers
+    access=delivery: ES:Tag:access=delivery
+    access=designated: ES:Tag:access=designated
+    access=forestry: ES:Tag:access=forestry
+    access=no: ES:Tag:access=no
+    access=permit: ES:Tag:access=permit
     access=private: ES:Tag:access=private
     access=private: ES:Tag:access=private
+    admin_level=10: ES:Tag:admin level=10
+    admin_level=11: ES:Tag:admin level=11
     admin_level=2: ES:Tag:admin level=2
     admin_level=2: ES:Tag:admin level=2
+    admin_level=3: ES:Tag:admin level=3
+    admin_level=4: ES:Tag:admin level=4
+    admin_level=5: ES:Tag:admin level=5
+    admin_level=6: ES:Tag:admin level=6
+    admin_level=7: ES:Tag:admin level=7
+    admin_level=8: ES:Tag:admin level=8
+    admin_level=9: ES:Tag:admin level=9
+    advertising=billboard: ES:Tag:advertising=billboard
     advertising=board: ES:Tag:advertising=board
     advertising=column: ES:Tag:advertising=column
     advertising=board: ES:Tag:advertising=board
     advertising=column: ES:Tag:advertising=column
+    advertising=flag: ES:Tag:advertising=flag
+    advertising=poster_box: ES:Tag:advertising=poster box
+    advertising=screen: ES:Tag:advertising=screen
+    advertising=sculpture: ES:Tag:advertising=sculpture
+    advertising=sign: ES:Tag:advertising=sign
+    advertising=tarp: ES:Tag:advertising=tarp
     advertising=totem: ES:Tag:advertising=totem
     advertising=wall_painting: ES:Tag:advertising=wall painting
     aerialway=cable_car: ES:Tag:aerialway=cable car
     advertising=totem: ES:Tag:advertising=totem
     advertising=wall_painting: ES:Tag:advertising=wall painting
     aerialway=cable_car: ES:Tag:aerialway=cable car
+    aerialway=canopy: ES:Tag:aerialway=canopy
+    aerialway=chair_lift: ES:Tag:aerialway=chair lift
+    aerialway=drag_lift: ES:Tag:aerialway=drag lift
     aerialway=gondola: ES:Tag:aerialway=gondola
     aerialway=gondola: ES:Tag:aerialway=gondola
+    aerialway=goods: ES:Tag:aerialway=goods
+    aerialway=j-bar: ES:Tag:aerialway=j-bar
+    aerialway=magic_carpet: ES:Tag:aerialway=magic carpet
+    aerialway=mixed_lift: ES:Tag:aerialway=mixed lift
+    aerialway=platter: ES:Tag:aerialway=platter
     aerialway=pylon: ES:Tag:aerialway=pylon
     aerialway=pylon: ES:Tag:aerialway=pylon
+    aerialway=rope_tow: ES:Tag:aerialway=rope tow
+    aerialway=ropetow: ES:Tag:aerialway=ropetow
     aerialway=station: ES:Tag:aerialway=station
     aerialway=station: ES:Tag:aerialway=station
+    aerialway=t-bar: ES:Tag:aerialway=t-bar
+    aerialway=zip_line: ES:Tag:aerialway=zip line
     aerodrome:type=regional: ES:Tag:aerodrome:type=regional
     aeroway=aerodrome: ES:Tag:aeroway=aerodrome
     aerodrome:type=regional: ES:Tag:aerodrome:type=regional
     aeroway=aerodrome: ES:Tag:aeroway=aerodrome
+    aeroway=aircraft_crossing: ES:Tag:aeroway=aircraft crossing
     aeroway=apron: ES:Tag:aeroway=apron
     aeroway=apron: ES:Tag:aeroway=apron
+    aeroway=fuel: ES:Tag:aeroway=fuel
     aeroway=gate: ES:Tag:aeroway=gate
     aeroway=hangar: ES:Tag:aeroway=hangar
     aeroway=helipad: ES:Tag:aeroway=helipad
     aeroway=heliport: ES:Tag:aeroway=heliport
     aeroway=holding_position: ES:Tag:aeroway=holding position
     aeroway=gate: ES:Tag:aeroway=gate
     aeroway=hangar: ES:Tag:aeroway=hangar
     aeroway=helipad: ES:Tag:aeroway=helipad
     aeroway=heliport: ES:Tag:aeroway=heliport
     aeroway=holding_position: ES:Tag:aeroway=holding position
+    aeroway=launch_complex: ES:Tag:aeroway=launch complex
+    aeroway=launchpad: ES:Tag:aeroway=launchpad
     aeroway=navigationaid: ES:Tag:aeroway=navigationaid
     aeroway=navigationaid: ES:Tag:aeroway=navigationaid
+    aeroway=parking_position: ES:Tag:aeroway=parking position
     aeroway=runway: ES:Tag:aeroway=runway
     aeroway=runway: ES:Tag:aeroway=runway
+    aeroway=spaceport: ES:Tag:aeroway=spaceport
     aeroway=taxiway: ES:Tag:aeroway=taxiway
     aeroway=terminal: ES:Tag:aeroway=terminal
     aeroway=windsock: ES:Tag:aeroway=windsock
     airmark=beacon: ES:Tag:airmark=beacon
     aeroway=taxiway: ES:Tag:aeroway=taxiway
     aeroway=terminal: ES:Tag:aeroway=terminal
     aeroway=windsock: ES:Tag:aeroway=windsock
     airmark=beacon: ES:Tag:airmark=beacon
+    allotments=plot: ES:Tag:allotments=plot
+    amenity=animal_boarding: ES:Tag:amenity=animal boarding
+    amenity=animal_breeding: ES:Tag:amenity=animal breeding
     amenity=animal_shelter: ES:Tag:amenity=animal shelter
     amenity=archive: ES:Tag:amenity=archive
     amenity=arts_centre: ES:Tag:amenity=arts centre
     amenity=atm: ES:Tag:amenity=atm
     amenity=animal_shelter: ES:Tag:amenity=animal shelter
     amenity=archive: ES:Tag:amenity=archive
     amenity=arts_centre: ES:Tag:amenity=arts centre
     amenity=atm: ES:Tag:amenity=atm
+    amenity=audiologist: ES:Tag:amenity=audiologist
+    amenity=baby_hatch: ES:Tag:amenity=baby hatch
     amenity=baking_oven: ES:Tag:amenity=baking oven
     amenity=bank: ES:Tag:amenity=bank
     amenity=bar: ES:Tag:amenity=bar
     amenity=bbq: ES:Tag:amenity=bbq
     amenity=baking_oven: ES:Tag:amenity=baking oven
     amenity=bank: ES:Tag:amenity=bank
     amenity=bar: ES:Tag:amenity=bar
     amenity=bbq: ES:Tag:amenity=bbq
+    amenity=bear_box: ES:Tag:amenity=bear box
     amenity=bench: ES:Tag:amenity=bench
     amenity=bicycle_library: ES:Tag:amenity=bicycle library
     amenity=bicycle_parking: ES:Tag:amenity=bicycle parking
     amenity=bicycle_rental: ES:Tag:amenity=bicycle rental
     amenity=bench: ES:Tag:amenity=bench
     amenity=bicycle_library: ES:Tag:amenity=bicycle library
     amenity=bicycle_parking: ES:Tag:amenity=bicycle parking
     amenity=bicycle_rental: ES:Tag:amenity=bicycle rental
+    amenity=bicycle_repair_station: ES:Tag:amenity=bicycle repair station
     amenity=biergarten: ES:Tag:amenity=biergarten
     amenity=biergarten: ES:Tag:amenity=biergarten
+    amenity=binoculars: ES:Tag:amenity=binoculars
+    amenity=blood_bank: ES:Tag:amenity=blood bank
+    amenity=boat_rental: ES:Tag:amenity=boat rental
+    amenity=boat_sharing: ES:Tag:amenity=boat sharing
     amenity=boat_storage: ES:Tag:amenity=boat storage
     amenity=brothel: ES:Tag:amenity=brothel
     amenity=boat_storage: ES:Tag:amenity=boat storage
     amenity=brothel: ES:Tag:amenity=brothel
+    amenity=bureau_de_change: ES:Tag:amenity=bureau de change
     amenity=bus_station: ES:Tag:amenity=bus station
     amenity=cafe: ES:Tag:amenity=cafe
     amenity=bus_station: ES:Tag:amenity=bus station
     amenity=cafe: ES:Tag:amenity=cafe
+    amenity=canteen: ES:Tag:amenity=canteen
     amenity=car_rental: ES:Tag:amenity=car rental
     amenity=car_rental: ES:Tag:amenity=car rental
+    amenity=car_sharing: ES:Tag:amenity=car sharing
     amenity=car_wash: ES:Tag:amenity=car wash
     amenity=car_wash: ES:Tag:amenity=car wash
+    amenity=casino: ES:Tag:amenity=casino
+    amenity=chair: ES:Tag:amenity=chair
+    amenity=charging_station: ES:Tag:amenity=charging station
     amenity=childcare: ES:Tag:amenity=childcare
     amenity=childcare: ES:Tag:amenity=childcare
+    amenity=cinema: ES:Tag:amenity=cinema
     amenity=clinic: ES:Tag:amenity=clinic
     amenity=clock: ES:Tag:amenity=clock
     amenity=clinic: ES:Tag:amenity=clinic
     amenity=clock: ES:Tag:amenity=clock
+    amenity=clothes_dryer: ES:Tag:amenity=clothes dryer
     amenity=college: ES:Tag:amenity=college
     amenity=community_centre: ES:Tag:amenity=community centre
     amenity=compressed_air: ES:Tag:amenity=compressed air
     amenity=college: ES:Tag:amenity=college
     amenity=community_centre: ES:Tag:amenity=community centre
     amenity=compressed_air: ES:Tag:amenity=compressed air
+    amenity=concert_hall: ES:Tag:amenity=concert hall
     amenity=conference_centre: ES:Tag:amenity=conference centre
     amenity=courthouse: ES:Tag:amenity=courthouse
     amenity=coworking_space: ES:Tag:amenity=coworking space
     amenity=conference_centre: ES:Tag:amenity=conference centre
     amenity=courthouse: ES:Tag:amenity=courthouse
     amenity=coworking_space: ES:Tag:amenity=coworking space
@@ -11502,42 +15779,70 @@ es:
     amenity=dancing_school: ES:Tag:amenity=dancing school
     amenity=dentist: ES:Tag:amenity=dentist
     amenity=device_charging_station: ES:Tag:amenity=device charging station
     amenity=dancing_school: ES:Tag:amenity=dancing school
     amenity=dentist: ES:Tag:amenity=dentist
     amenity=device_charging_station: ES:Tag:amenity=device charging station
+    amenity=dive_centre: ES:Tag:amenity=dive centre
     amenity=doctors: ES:Tag:amenity=doctors
     amenity=doctors: ES:Tag:amenity=doctors
+    amenity=dog_toilet: ES:Tag:amenity=dog toilet
+    amenity=dojo: ES:Tag:amenity=dojo
+    amenity=dressing_room: ES:Tag:amenity=dressing room
     amenity=drinking_water: ES:Tag:amenity=drinking water
     amenity=drinking_water: ES:Tag:amenity=drinking water
+    amenity=driver_training: ES:Tag:amenity=driver training
     amenity=driving_school: ES:Tag:amenity=driving school
     amenity=driving_school: ES:Tag:amenity=driving school
+    amenity=dryer: ES:Tag:amenity=dryer
     amenity=embassy: ES:Tag:amenity=embassy
     amenity=embassy: ES:Tag:amenity=embassy
+    amenity=events_centre: ES:Tag:amenity=events centre
     amenity=events_venue: ES:Tag:amenity=events venue
     amenity=exhibition_centre: ES:Tag:amenity=exhibition centre
     amenity=fast_food: ES:Tag:amenity=fast food
     amenity=events_venue: ES:Tag:amenity=events venue
     amenity=exhibition_centre: ES:Tag:amenity=exhibition centre
     amenity=fast_food: ES:Tag:amenity=fast food
+    amenity=feeding_place: ES:Tag:amenity=feeding place
     amenity=ferry_terminal: ES:Tag:amenity=ferry terminal
     amenity=ferry_terminal: ES:Tag:amenity=ferry terminal
+    amenity=festival_grounds: ES:Tag:amenity=festival grounds
+    amenity=financial_advice: ES:Tag:amenity=financial advice
     amenity=fire_station: ES:Tag:amenity=fire station
     amenity=food_court: ES:Tag:amenity=food court
     amenity=fountain: ES:Tag:amenity=fountain
     amenity=fuel: ES:Tag:amenity=fuel
     amenity=funeral_hall: ES:Tag:amenity=funeral hall
     amenity=gambling: ES:Tag:amenity=gambling
     amenity=fire_station: ES:Tag:amenity=fire station
     amenity=food_court: ES:Tag:amenity=food court
     amenity=fountain: ES:Tag:amenity=fountain
     amenity=fuel: ES:Tag:amenity=fuel
     amenity=funeral_hall: ES:Tag:amenity=funeral hall
     amenity=gambling: ES:Tag:amenity=gambling
+    amenity=game_feeding: ES:Tag:amenity=game feeding
     amenity=give_box: ES:Tag:amenity=give box
     amenity=grave_yard: ES:Tag:amenity=grave yard
     amenity=give_box: ES:Tag:amenity=give box
     amenity=grave_yard: ES:Tag:amenity=grave yard
+    amenity=grit_bin: ES:Tag:amenity=grit bin
     amenity=harbourmaster: ES:Tag:amenity=harbourmaster
     amenity=harbourmaster: ES:Tag:amenity=harbourmaster
+    amenity=hitching_post: ES:Tag:amenity=hitching post
+    amenity=hookah_lounge: ES:Tag:amenity=hookah lounge
     amenity=hospital: ES:Tag:amenity=hospital
     amenity=hospital: ES:Tag:amenity=hospital
+    amenity=hunting_stand: ES:Tag:amenity=hunting stand
     amenity=ice_cream: ES:Tag:amenity=ice cream
     amenity=internet_cafe: ES:Tag:amenity=internet cafe
     amenity=jobcentre: ES:Tag:amenity=jobcentre
     amenity=karaoke_box: ES:Tag:amenity=karaoke box
     amenity=ice_cream: ES:Tag:amenity=ice cream
     amenity=internet_cafe: ES:Tag:amenity=internet cafe
     amenity=jobcentre: ES:Tag:amenity=jobcentre
     amenity=karaoke_box: ES:Tag:amenity=karaoke box
+    amenity=kick-scooter_rental: ES:Tag:amenity=kick-scooter rental
     amenity=kindergarten: ES:Tag:amenity=kindergarten
     amenity=kindergarten: ES:Tag:amenity=kindergarten
+    amenity=kitchen: ES:Tag:amenity=kitchen
+    amenity=kneipp_water_cure: ES:Tag:amenity=kneipp water cure
     amenity=language_school: ES:Tag:amenity=language school
     amenity=lavoir: ES:Tag:amenity=lavoir
     amenity=letter_box: ES:Tag:amenity=letter box
     amenity=library: ES:Tag:amenity=library
     amenity=language_school: ES:Tag:amenity=language school
     amenity=lavoir: ES:Tag:amenity=lavoir
     amenity=letter_box: ES:Tag:amenity=letter box
     amenity=library: ES:Tag:amenity=library
+    amenity=life_ring: ES:Tag:amenity=life ring
+    amenity=loading_dock: ES:Tag:amenity=loading dock
+    amenity=lost_property_office: ES:Tag:amenity=lost property office
     amenity=lounger: ES:Tag:amenity=lounger
     amenity=love_hotel: ES:Tag:amenity=love hotel
     amenity=lounger: ES:Tag:amenity=lounger
     amenity=love_hotel: ES:Tag:amenity=love hotel
+    amenity=marae: ES:Tag:amenity=marae
     amenity=marketplace: ES:Tag:amenity=marketplace
     amenity=mobile_library: ES:Tag:amenity=mobile library
     amenity=marketplace: ES:Tag:amenity=marketplace
     amenity=mobile_library: ES:Tag:amenity=mobile library
+    amenity=mobile_money_agent: ES:Tag:amenity=mobile money agent
+    amenity=monastery: ES:Tag:amenity=monastery
+    amenity=money_transfer: ES:Tag:amenity=money transfer
     amenity=mortuary: ES:Tag:amenity=mortuary
     amenity=motorcycle_parking: ES:Tag:amenity=motorcycle parking
     amenity=mortuary: ES:Tag:amenity=mortuary
     amenity=motorcycle_parking: ES:Tag:amenity=motorcycle parking
+    amenity=motorcycle_rental: ES:Tag:amenity=motorcycle rental
     amenity=music_school: ES:Tag:amenity=music school
     amenity=nightclub: ES:Tag:amenity=nightclub
     amenity=nursing_home: ES:Tag:amenity=nursing home
     amenity=music_school: ES:Tag:amenity=music school
     amenity=nightclub: ES:Tag:amenity=nightclub
     amenity=nursing_home: ES:Tag:amenity=nursing home
+    amenity=outfitter: ES:Tag:amenity=outfitter
+    amenity=parcel_locker: ES:Tag:amenity=parcel locker
     amenity=parking: ES:Tag:amenity=parking
     amenity=parking_entrance: ES:Tag:amenity=parking entrance
     amenity=parking_space: ES:Tag:amenity=parking space
     amenity=parking: ES:Tag:amenity=parking
     amenity=parking_entrance: ES:Tag:amenity=parking entrance
     amenity=parking_space: ES:Tag:amenity=parking space
@@ -11545,93 +15850,198 @@ es:
     amenity=payment_terminal: ES:Tag:amenity=payment terminal
     amenity=pharmacy: ES:Tag:amenity=pharmacy
     amenity=photo_booth: ES:Tag:amenity=photo booth
     amenity=payment_terminal: ES:Tag:amenity=payment terminal
     amenity=pharmacy: ES:Tag:amenity=pharmacy
     amenity=photo_booth: ES:Tag:amenity=photo booth
+    amenity=piano: ES:Tag:amenity=piano
+    amenity=place_of_mourning: ES:Tag:amenity=place of mourning
     amenity=place_of_worship: ES:Tag:amenity=place of worship
     amenity=planetarium: ES:Tag:amenity=planetarium
     amenity=police: ES:Tag:amenity=police
     amenity=place_of_worship: ES:Tag:amenity=place of worship
     amenity=planetarium: ES:Tag:amenity=planetarium
     amenity=police: ES:Tag:amenity=police
+    amenity=polling_station: ES:Tag:amenity=polling station
     amenity=post_box: ES:Tag:amenity=post box
     amenity=post_depot: ES:Tag:amenity=post depot
     amenity=post_office: ES:Tag:amenity=post office
     amenity=prep_school: ES:Tag:amenity=prep school
     amenity=post_box: ES:Tag:amenity=post box
     amenity=post_depot: ES:Tag:amenity=post depot
     amenity=post_office: ES:Tag:amenity=post office
     amenity=prep_school: ES:Tag:amenity=prep school
+    amenity=printer: ES:Tag:amenity=printer
+    amenity=prison: ES:Tag:amenity=prison
     amenity=prison_camp: ES:Tag:amenity=prison camp
     amenity=pub: ES:Tag:amenity=pub
     amenity=prison_camp: ES:Tag:amenity=prison camp
     amenity=pub: ES:Tag:amenity=pub
+    amenity=public_bath: ES:Tag:amenity=public bath
     amenity=public_bookcase: ES:Tag:amenity=public bookcase
     amenity=public_building: ES:Tag:amenity=public building
     amenity=public_bookcase: ES:Tag:amenity=public bookcase
     amenity=public_building: ES:Tag:amenity=public building
+    amenity=ranger_station: ES:Tag:amenity=ranger station
     amenity=recycling: ES:Tag:amenity=recycling
     amenity=refugee_housing: ES:Tag:amenity=refugee housing
     amenity=recycling: ES:Tag:amenity=recycling
     amenity=refugee_housing: ES:Tag:amenity=refugee housing
+    amenity=refugee_site: ES:Tag:amenity=refugee site
+    amenity=relay_box: ES:Tag:amenity=relay box
     amenity=research_institute: ES:Tag:amenity=research institute
     amenity=restaurant: ES:Tag:amenity=restaurant
     amenity=retirement_home: ES:Tag:amenity=retirement home
     amenity=research_institute: ES:Tag:amenity=research institute
     amenity=restaurant: ES:Tag:amenity=restaurant
     amenity=retirement_home: ES:Tag:amenity=retirement home
+    amenity=sanatorium: ES:Tag:amenity=sanatorium
+    amenity=sanitary_dump_station: ES:Tag:amenity=sanitary dump station
     amenity=school: ES:Tag:amenity=school
     amenity=seat: ES:Tag:amenity=seat
     amenity=shelter: ES:Tag:amenity=shelter
     amenity=shower: ES:Tag:amenity=shower
     amenity=school: ES:Tag:amenity=school
     amenity=seat: ES:Tag:amenity=seat
     amenity=shelter: ES:Tag:amenity=shelter
     amenity=shower: ES:Tag:amenity=shower
+    amenity=ski_rental: ES:Tag:amenity=ski rental
     amenity=ski_school: ES:Tag:amenity=ski school
     amenity=ski_school: ES:Tag:amenity=ski school
+    amenity=smoking_area: ES:Tag:amenity=smoking area
     amenity=social_centre: ES:Tag:amenity=social centre
     amenity=social_centre: ES:Tag:amenity=social centre
+    amenity=social_club: ES:Tag:amenity=social club
     amenity=social_facility: ES:Tag:amenity=social facility
     amenity=sport_school: ES:Tag:amenity=sport school
     amenity=social_facility: ES:Tag:amenity=social facility
     amenity=sport_school: ES:Tag:amenity=sport school
+    amenity=stage: ES:Tag:amenity=stage
     amenity=stool: ES:Tag:amenity=stool
     amenity=stripclub: ES:Tag:amenity=stripclub
     amenity=studio: ES:Tag:amenity=studio
     amenity=stool: ES:Tag:amenity=stool
     amenity=stripclub: ES:Tag:amenity=stripclub
     amenity=studio: ES:Tag:amenity=studio
+    amenity=surf_school: ES:Tag:amenity=surf school
+    amenity=swingerclub: ES:Tag:amenity=swingerclub
+    amenity=table: ES:Tag:amenity=table
     amenity=taxi: ES:Tag:amenity=taxi
     amenity=taxi: ES:Tag:amenity=taxi
+    amenity=telephone: ES:Tag:amenity=telephone
     amenity=television: ES:Tag:amenity=television
     amenity=theatre: ES:Tag:amenity=theatre
     amenity=television: ES:Tag:amenity=television
     amenity=theatre: ES:Tag:amenity=theatre
+    amenity=ticket_validator: ES:Tag:amenity=ticket validator
+    amenity=toilets: ES:Tag:amenity=toilets
     amenity=tourist_bus_parking: ES:Tag:amenity=tourist bus parking
     amenity=townhall: ES:Tag:amenity=townhall
     amenity=toy_library: ES:Tag:amenity=toy library
     amenity=tourist_bus_parking: ES:Tag:amenity=tourist bus parking
     amenity=townhall: ES:Tag:amenity=townhall
     amenity=toy_library: ES:Tag:amenity=toy library
+    amenity=traffic_park: ES:Tag:amenity=traffic park
+    amenity=training: ES:Tag:amenity=training
+    amenity=trolley_bay: ES:Tag:amenity=trolley bay
     amenity=university: ES:Tag:amenity=university
     amenity=university: ES:Tag:amenity=university
+    amenity=vacuum_cleaner: ES:Tag:amenity=vacuum cleaner
     amenity=vehicle_inspection: ES:Tag:amenity=vehicle inspection
     amenity=vehicle_inspection: ES:Tag:amenity=vehicle inspection
+    amenity=vehicle_ramp: ES:Tag:amenity=vehicle ramp
     amenity=vending_machine: ES:Tag:amenity=vending machine
     amenity=veterinary: ES:Tag:amenity=veterinary
     amenity=vending_machine: ES:Tag:amenity=vending machine
     amenity=veterinary: ES:Tag:amenity=veterinary
+    amenity=washing_machine: ES:Tag:amenity=washing machine
     amenity=waste_basket: ES:Tag:amenity=waste basket
     amenity=waste_disposal: ES:Tag:amenity=waste disposal
     amenity=waste_basket: ES:Tag:amenity=waste basket
     amenity=waste_disposal: ES:Tag:amenity=waste disposal
+    amenity=waste_dump_site: ES:Tag:amenity=waste dump site
+    amenity=waste_transfer_station: ES:Tag:amenity=waste transfer station
     amenity=water_point: ES:Tag:amenity=water point
     amenity=watering_place: ES:Tag:amenity=watering place
     amenity=weighbridge: ES:Tag:amenity=weighbridge
     amenity=youth_centre: ES:Tag:amenity=youth centre
     amenity=water_point: ES:Tag:amenity=water point
     amenity=watering_place: ES:Tag:amenity=watering place
     amenity=weighbridge: ES:Tag:amenity=weighbridge
     amenity=youth_centre: ES:Tag:amenity=youth centre
+    animal=horse_walker: ES:Tag:animal=horse walker
     animal=school: ES:Tag:animal=school
     anthropogenic=yes: ES:Tag:anthropogenic=yes
     animal=school: ES:Tag:animal=school
     anthropogenic=yes: ES:Tag:anthropogenic=yes
+    archaeological_site=megalith: ES:Tag:archaeological site=megalith
+    archaeological_site=petroglyph: ES:Tag:archaeological site=petroglyph
+    archaeological_site=settlement: ES:Tag:archaeological site=settlement
+    archaeological_site=tumulus: ES:Tag:archaeological site=tumulus
     area:highway=cycleway: ES:Tag:area:highway=cycleway
     area:highway=footway: ES:Tag:area:highway=footway
     area:highway=path: ES:Tag:area:highway=path
     area:highway=pedestrian: ES:Tag:area:highway=pedestrian
     area:highway=cycleway: ES:Tag:area:highway=cycleway
     area:highway=footway: ES:Tag:area:highway=footway
     area:highway=path: ES:Tag:area:highway=path
     area:highway=pedestrian: ES:Tag:area:highway=pedestrian
+    area=yes: ES:Tag:area=yes
+    artwork_type=graffiti: ES:Tag:artwork type=graffiti
+    artwork_type=sculpture: ES:Tag:artwork type=sculpture
+    artwork_type=statue: ES:Tag:artwork type=statue
+    atm=yes: ES:Tag:atm=yes
     attraction=roller_coaster: ES:Tag:attraction=roller coaster
     attraction=water_slide: ES:Tag:attraction=water slide
     attraction=roller_coaster: ES:Tag:attraction=roller coaster
     attraction=water_slide: ES:Tag:attraction=water slide
+    avalanche_protection=snow_bridge: ES:Tag:avalanche protection=snow bridge
     barrier=block: ES:Tag:barrier=block
     barrier=bollard: ES:Tag:barrier=bollard
     barrier=border_control: ES:Tag:barrier=border control
     barrier=block: ES:Tag:barrier=block
     barrier=bollard: ES:Tag:barrier=bollard
     barrier=border_control: ES:Tag:barrier=border control
+    barrier=bump_gate: ES:Tag:barrier=bump gate
+    barrier=bus_trap: ES:Tag:barrier=bus trap
     barrier=cable_barrier: ES:Tag:barrier=cable barrier
     barrier=cable_barrier: ES:Tag:barrier=cable barrier
+    barrier=cattle_grid: ES:Tag:barrier=cattle grid
     barrier=chain: ES:Tag:barrier=chain
     barrier=city_wall: ES:Tag:barrier=city wall
     barrier=chain: ES:Tag:barrier=chain
     barrier=city_wall: ES:Tag:barrier=city wall
+    barrier=coupure: ES:Tag:barrier=coupure
+    barrier=cycle_barrier: ES:Tag:barrier=cycle barrier
     barrier=debris: ES:Tag:barrier=debris
     barrier=debris: ES:Tag:barrier=debris
+    barrier=ditch: ES:Tag:barrier=ditch
     barrier=entrance: ES:Tag:barrier=entrance
     barrier=fence: ES:Tag:barrier=fence
     barrier=entrance: ES:Tag:barrier=entrance
     barrier=fence: ES:Tag:barrier=fence
+    barrier=full-height_turnstile: ES:Tag:barrier=full-height turnstile
     barrier=gate: ES:Tag:barrier=gate
     barrier=guard_rail: ES:Tag:barrier=guard rail
     barrier=gate: ES:Tag:barrier=gate
     barrier=guard_rail: ES:Tag:barrier=guard rail
+    barrier=haha: ES:Tag:barrier=haha
+    barrier=hampshire_gate: ES:Tag:barrier=hampshire gate
     barrier=handrail: ES:Tag:barrier=handrail
     barrier=hedge: ES:Tag:barrier=hedge
     barrier=height_restrictor: ES:Tag:barrier=height restrictor
     barrier=handrail: ES:Tag:barrier=handrail
     barrier=hedge: ES:Tag:barrier=hedge
     barrier=height_restrictor: ES:Tag:barrier=height restrictor
+    barrier=horse_jump: ES:Tag:barrier=horse jump
+    barrier=horse_stile: ES:Tag:barrier=horse stile
     barrier=jersey_barrier: ES:Tag:barrier=jersey barrier
     barrier=jersey_barrier: ES:Tag:barrier=jersey barrier
+    barrier=kent_carriage_gap: ES:Tag:barrier=kent carriage gap
     barrier=kerb: ES:Tag:barrier=kerb
     barrier=kerb: ES:Tag:barrier=kerb
+    barrier=kissing_gate: ES:Tag:barrier=kissing gate
     barrier=lift_gate: ES:Tag:barrier=lift gate
     barrier=lift_gate: ES:Tag:barrier=lift gate
+    barrier=log: ES:Tag:barrier=log
+    barrier=motorcycle_barrier: ES:Tag:barrier=motorcycle barrier
+    barrier=planter: ES:Tag:barrier=planter
     barrier=retaining_wall: ES:Tag:barrier=retaining wall
     barrier=rope: ES:Tag:barrier=rope
     barrier=sally_port: ES:Tag:barrier=sally port
     barrier=retaining_wall: ES:Tag:barrier=retaining wall
     barrier=rope: ES:Tag:barrier=rope
     barrier=sally_port: ES:Tag:barrier=sally port
+    barrier=sliding_gate: ES:Tag:barrier=sliding gate
     barrier=spikes: ES:Tag:barrier=spikes
     barrier=spikes: ES:Tag:barrier=spikes
+    barrier=step: ES:Tag:barrier=step
+    barrier=stile: ES:Tag:barrier=stile
+    barrier=sump_buster: ES:Tag:barrier=sump buster
     barrier=swing_gate: ES:Tag:barrier=swing gate
     barrier=swing_gate: ES:Tag:barrier=swing gate
+    barrier=tank_trap: ES:Tag:barrier=tank trap
     barrier=toll_booth: ES:Tag:barrier=toll booth
     barrier=toll_booth: ES:Tag:barrier=toll booth
+    barrier=turnstile: ES:Tag:barrier=turnstile
     barrier=tyres: ES:Tag:barrier=tyres
     barrier=wall: ES:Tag:barrier=wall
     barrier=tyres: ES:Tag:barrier=tyres
     barrier=wall: ES:Tag:barrier=wall
+    barrier=wicket_gate: ES:Tag:barrier=wicket gate
+    barrier=yes: ES:Tag:barrier=yes
+    basin=detention: ES:Tag:basin=detention
+    basin=evaporation: ES:Tag:basin=evaporation
+    basin=infiltration: ES:Tag:basin=infiltration
+    basin=retention: ES:Tag:basin=retention
+    bicycle=no: ES:Tag:bicycle=no
     bicycle=use_sidepath: ES:Tag:bicycle=use sidepath
     bicycle=use_sidepath: ES:Tag:bicycle=use sidepath
+    bicycle=yes: ES:Tag:bicycle=yes
+    bicycle_road=yes: ES:Tag:bicycle road=yes
+    border_type=baseline: ES:Tag:border type=baseline
+    border_type=contiguous: ES:Tag:border type=contiguous
+    border_type=eez: ES:Tag:border type=eez
+    border_type=nation: ES:Tag:border type=nation
+    border_type=territorial: ES:Tag:border type=territorial
+    boundary=aboriginal_lands: ES:Tag:boundary=aboriginal lands
     boundary=administrative: ES:Tag:boundary=administrative
     boundary=administrative: ES:Tag:boundary=administrative
+    boundary=administrative_cooperation: ES:Tag:boundary=administrative cooperation
+    boundary=border_zone: ES:Tag:boundary=border zone
+    boundary=census: ES:Tag:boundary=census
+    boundary=civil: ES:Tag:boundary=civil
+    boundary=disputed: ES:Tag:boundary=disputed
+    boundary=exclave: ES:Tag:boundary=exclave
+    boundary=forest: ES:Tag:boundary=forest
+    boundary=forest_compartment: ES:Tag:boundary=forest compartment
+    boundary=hazard: ES:Tag:boundary=hazard
+    boundary=historic: ES:Tag:boundary=historic
+    boundary=limited_traffic_zone: ES:Tag:boundary=limited traffic zone
+    boundary=local_authority: ES:Tag:boundary=local authority
+    boundary=low_emission_zone: ES:Tag:boundary=low emission zone
+    boundary=maritime: ES:Tag:boundary=maritime
+    boundary=marker: ES:Tag:boundary=marker
+    boundary=military_district: ES:Tag:boundary=military district
     boundary=national_park: ES:Tag:boundary=national park
     boundary=national_park: ES:Tag:boundary=national park
+    boundary=place: ES:Tag:boundary=place
     boundary=political: ES:Tag:boundary=political
     boundary=political: ES:Tag:boundary=political
+    boundary=postal_code: ES:Tag:boundary=postal code
     boundary=protected_area: ES:Tag:boundary=protected area
     boundary=regional_park: ES:Tag:boundary=regional park
     boundary=protected_area: ES:Tag:boundary=protected area
     boundary=regional_park: ES:Tag:boundary=regional park
+    boundary=religious_administration: ES:Tag:boundary=religious administration
+    boundary=safety_region: ES:Tag:boundary=safety region
+    boundary=special_economic_zone: ES:Tag:boundary=special economic zone
+    boundary=urban: ES:Tag:boundary=urban
+    boundary=water_protection_area: ES:Tag:boundary=water protection area
+    bridge:structure=beam: ES:Tag:bridge:structure=beam
     bridge=aqueduct: ES:Tag:bridge=aqueduct
     bridge=aqueduct: ES:Tag:bridge=aqueduct
+    bridge=boardwalk: ES:Tag:bridge=boardwalk
     bridge=viaduct: ES:Tag:bridge=viaduct
     bridge=viaduct: ES:Tag:bridge=viaduct
+    bridge=yes: ES:Tag:bridge=yes
     building=apartments: ES:Tag:building=apartments
     building=bakehouse: ES:Tag:building=bakehouse
     building=barn: ES:Tag:building=barn
     building=apartments: ES:Tag:building=apartments
     building=bakehouse: ES:Tag:building=bakehouse
     building=barn: ES:Tag:building=barn
+    building=barracks: ES:Tag:building=barracks
+    building=beach_hut: ES:Tag:building=beach hut
     building=boathouse: ES:Tag:building=boathouse
     building=brewery: ES:Tag:building=brewery
     building=bridge: ES:Tag:building=bridge
     building=boathouse: ES:Tag:building=boathouse
     building=brewery: ES:Tag:building=brewery
     building=bridge: ES:Tag:building=bridge
@@ -11639,6 +16049,7 @@ es:
     building=bunker: ES:Tag:building=bunker
     building=cabin: ES:Tag:building=cabin
     building=carport: ES:Tag:building=carport
     building=bunker: ES:Tag:building=bunker
     building=cabin: ES:Tag:building=cabin
     building=carport: ES:Tag:building=carport
+    building=castle: ES:Tag:building=castle
     building=cathedral: ES:Tag:building=cathedral
     building=chapel: ES:Tag:building=chapel
     building=church: ES:Tag:building=church
     building=cathedral: ES:Tag:building=cathedral
     building=chapel: ES:Tag:building=chapel
     building=church: ES:Tag:building=church
@@ -11649,6 +16060,7 @@ es:
     building=construction: ES:Tag:building=construction
     building=container: ES:Tag:building=container
     building=cowshed: ES:Tag:building=cowshed
     building=construction: ES:Tag:building=construction
     building=container: ES:Tag:building=container
     building=cowshed: ES:Tag:building=cowshed
+    building=data_center: ES:Tag:building=data center
     building=detached: ES:Tag:building=detached
     building=digester: ES:Tag:building=digester
     building=dormitory: ES:Tag:building=dormitory
     building=detached: ES:Tag:building=detached
     building=digester: ES:Tag:building=digester
     building=dormitory: ES:Tag:building=dormitory
@@ -11670,12 +16082,15 @@ es:
     building=hut: ES:Tag:building=hut
     building=industrial: ES:Tag:building=industrial
     building=kindergarten: ES:Tag:building=kindergarten
     building=hut: ES:Tag:building=hut
     building=industrial: ES:Tag:building=industrial
     building=kindergarten: ES:Tag:building=kindergarten
+    building=kingdom_hall: ES:Tag:building=kingdom hall
     building=kiosk: ES:Tag:building=kiosk
     building=kiosk: ES:Tag:building=kiosk
+    building=military: ES:Tag:building=military
     building=monastery: ES:Tag:building=monastery
     building=mosque: ES:Tag:building=mosque
     building=office: ES:Tag:building=office
     building=parking: ES:Tag:building=parking
     building=pavilion: ES:Tag:building=pavilion
     building=monastery: ES:Tag:building=monastery
     building=mosque: ES:Tag:building=mosque
     building=office: ES:Tag:building=office
     building=parking: ES:Tag:building=parking
     building=pavilion: ES:Tag:building=pavilion
+    building=presbytery: ES:Tag:building=presbytery
     building=public: ES:Tag:building=public
     building=religious: ES:Tag:building=religious
     building=residential: ES:Tag:building=residential
     building=public: ES:Tag:building=public
     building=religious: ES:Tag:building=religious
     building=residential: ES:Tag:building=residential
@@ -11690,10 +16105,13 @@ es:
     building=shed: ES:Tag:building=shed
     building=shrine: ES:Tag:building=shrine
     building=slurry_tank: ES:Tag:building=slurry tank
     building=shed: ES:Tag:building=shed
     building=shrine: ES:Tag:building=shrine
     building=slurry_tank: ES:Tag:building=slurry tank
+    building=sports_centre: ES:Tag:building=sports centre
     building=sports_hall: ES:Tag:building=sports hall
     building=stable: ES:Tag:building=stable
     building=stadium: ES:Tag:building=stadium
     building=static_caravan: ES:Tag:building=static caravan
     building=sports_hall: ES:Tag:building=sports hall
     building=stable: ES:Tag:building=stable
     building=stadium: ES:Tag:building=stadium
     building=static_caravan: ES:Tag:building=static caravan
+    building=stilt_house: ES:Tag:building=stilt house
+    building=storage_tank: ES:Tag:building=storage tank
     building=sty: ES:Tag:building=sty
     building=supermarket: ES:Tag:building=supermarket
     building=synagogue: ES:Tag:building=synagogue
     building=sty: ES:Tag:building=sty
     building=supermarket: ES:Tag:building=supermarket
     building=synagogue: ES:Tag:building=synagogue
@@ -11708,12 +16126,50 @@ es:
     building=university: ES:Tag:building=university
     building=warehouse: ES:Tag:building=warehouse
     building=water_tower: ES:Tag:building=water tower
     building=university: ES:Tag:building=university
     building=warehouse: ES:Tag:building=warehouse
     building=water_tower: ES:Tag:building=water tower
+    building=yes: ES:Tag:building=yes
+    busway=lane: ES:Tag:busway=lane
     castle_type=manor: ES:Tag:castle type=manor
     castle_type=manor: ES:Tag:castle type=manor
+    cemetery=cillín: ES:Tag:cemetery=cillín
     cemetery=grave: ES:Tag:cemetery=grave
     cemetery=grave: ES:Tag:cemetery=grave
+    cemetery=sector: ES:Tag:cemetery=sector
+    cemetery=war_cemetery: ES:Tag:cemetery=war cemetery
     clothes=fashion: ES:Tag:clothes=fashion
     clothes=fashion: ES:Tag:clothes=fashion
+    clothes=luxury: ES:Tag:clothes=luxury
+    clothes=motorcycle: ES:Tag:clothes=motorcycle
+    clothes=sports: ES:Tag:clothes=sports
+    clothes=swimwear: ES:Tag:clothes=swimwear
+    clothes=underwear: ES:Tag:clothes=underwear
+    clothes=unisex: ES:Tag:clothes=unisex
+    clothes=wedding: ES:Tag:clothes=wedding
+    clothes=women: ES:Tag:clothes=women
+    clothes=women;men: ES:Tag:clothes=women;men
+    clothes=women;men;children: ES:Tag:clothes=women;men;children
+    club=amateur_radio: ES:Tag:club=amateur radio
+    club=automobile: ES:Tag:club=automobile
+    club=bicycle: ES:Tag:club=bicycle
+    club=cadet: ES:Tag:club=cadet
+    club=card_games: ES:Tag:club=card games
+    club=chess: ES:Tag:club=chess
+    club=fan: ES:Tag:club=fan
+    club=fishing: ES:Tag:club=fishing
+    club=freemasonry: ES:Tag:club=freemasonry
+    club=golf: ES:Tag:club=golf
+    club=linux: ES:Tag:club=linux
+    club=motorcycle: ES:Tag:club=motorcycle
+    club=music: ES:Tag:club=music
+    club=nudism: ES:Tag:club=nudism
+    club=sailing: ES:Tag:club=sailing
     club=scout: ES:Tag:club=scout
     club=scout: ES:Tag:club=scout
+    club=scuba_diving: ES:Tag:club=scuba diving
+    club=social: ES:Tag:club=social
     club=sport: ES:Tag:club=sport
     club=sport: ES:Tag:club=sport
+    club=tourism: ES:Tag:club=tourism
+    club=youth_movement: ES:Tag:club=youth movement
+    company=logistics: ES:Tag:company=logistics
+    covered=yes: ES:Tag:covered=yes
     craft=agricultural_engines: ES:Tag:craft=agricultural engines
     craft=agricultural_engines: ES:Tag:craft=agricultural engines
+    craft=atelier: ES:Tag:craft=atelier
+    craft=bag_repair: ES:Tag:craft=bag repair
     craft=bakery: ES:Tag:craft=bakery
     craft=basket_maker: ES:Tag:craft=basket maker
     craft=beekeeper: ES:Tag:craft=beekeeper
     craft=bakery: ES:Tag:craft=bakery
     craft=basket_maker: ES:Tag:craft=basket maker
     craft=beekeeper: ES:Tag:craft=beekeeper
@@ -11722,63 +16178,256 @@ es:
     craft=bookbinder: ES:Tag:craft=bookbinder
     craft=brewery: ES:Tag:craft=brewery
     craft=builder: ES:Tag:craft=builder
     craft=bookbinder: ES:Tag:craft=bookbinder
     craft=brewery: ES:Tag:craft=brewery
     craft=builder: ES:Tag:craft=builder
+    craft=cabinet_maker: ES:Tag:craft=cabinet maker
+    craft=car_painter: ES:Tag:craft=car painter
+    craft=carpenter: ES:Tag:craft=carpenter
+    craft=carpet_cleaner: ES:Tag:craft=carpet cleaner
     craft=carpet_layer: ES:Tag:craft=carpet layer
     craft=caterer: ES:Tag:craft=caterer
     craft=carpet_layer: ES:Tag:craft=carpet layer
     craft=caterer: ES:Tag:craft=caterer
+    craft=cheese: ES:Tag:craft=cheese
     craft=chimney_sweeper: ES:Tag:craft=chimney sweeper
     craft=chimney_sweeper: ES:Tag:craft=chimney sweeper
+    craft=cleaning: ES:Tag:craft=cleaning
     craft=clockmaker: ES:Tag:craft=clockmaker
     craft=confectionery: ES:Tag:craft=confectionery
     craft=clockmaker: ES:Tag:craft=clockmaker
     craft=confectionery: ES:Tag:craft=confectionery
+    craft=cooper: ES:Tag:craft=cooper
     craft=dental_technician: ES:Tag:craft=dental technician
     craft=distillery: ES:Tag:craft=distillery
     craft=dental_technician: ES:Tag:craft=dental technician
     craft=distillery: ES:Tag:craft=distillery
+    craft=door_construction: ES:Tag:craft=door construction
+    craft=dressmaker: ES:Tag:craft=dressmaker
     craft=electrician: ES:Tag:craft=electrician
     craft=electronics_repair: ES:Tag:craft=electronics repair
     craft=electrician: ES:Tag:craft=electrician
     craft=electronics_repair: ES:Tag:craft=electronics repair
+    craft=embroiderer: ES:Tag:craft=embroiderer
     craft=engraver: ES:Tag:craft=engraver
     craft=engraver: ES:Tag:craft=engraver
+    craft=floorer: ES:Tag:craft=floorer
     craft=gardener: ES:Tag:craft=gardener
     craft=gardener: ES:Tag:craft=gardener
+    craft=glassblower: ES:Tag:craft=glassblower
     craft=glaziery: ES:Tag:craft=glaziery
     craft=glaziery: ES:Tag:craft=glaziery
+    craft=goldsmith: ES:Tag:craft=goldsmith
+    craft=grinding_mill: ES:Tag:craft=grinding mill
     craft=handicraft: ES:Tag:craft=handicraft
     craft=hvac: ES:Tag:craft=hvac
     craft=information_electronics: ES:Tag:craft=information electronics
     craft=handicraft: ES:Tag:craft=handicraft
     craft=hvac: ES:Tag:craft=hvac
     craft=information_electronics: ES:Tag:craft=information electronics
+    craft=insulation: ES:Tag:craft=insulation
+    craft=interior_work: ES:Tag:craft=interior work
     craft=jeweller: ES:Tag:craft=jeweller
     craft=jeweller: ES:Tag:craft=jeweller
+    craft=joiner: ES:Tag:craft=joiner
+    craft=key_cutter: ES:Tag:craft=key cutter
+    craft=lapidary: ES:Tag:craft=lapidary
+    craft=leather: ES:Tag:craft=leather
+    craft=locksmith: ES:Tag:craft=locksmith
     craft=luthier: ES:Tag:craft=luthier
     craft=metal_construction: ES:Tag:craft=metal construction
     craft=luthier: ES:Tag:craft=luthier
     craft=metal_construction: ES:Tag:craft=metal construction
+    craft=mint: ES:Tag:craft=mint
     craft=musical_instrument: ES:Tag:craft=musical instrument
     craft=oil_mill: ES:Tag:craft=oil mill
     craft=optician: ES:Tag:craft=optician
     craft=musical_instrument: ES:Tag:craft=musical instrument
     craft=oil_mill: ES:Tag:craft=oil mill
     craft=optician: ES:Tag:craft=optician
+    craft=organ_builder: ES:Tag:craft=organ builder
+    craft=painter: ES:Tag:craft=painter
+    craft=parquet_layer: ES:Tag:craft=parquet layer
+    craft=paver: ES:Tag:craft=paver
     craft=photographer: ES:Tag:craft=photographer
     craft=photographer: ES:Tag:craft=photographer
+    craft=photographic_laboratory: ES:Tag:craft=photographic laboratory
+    craft=piano_tuner: ES:Tag:craft=piano tuner
+    craft=plasterer: ES:Tag:craft=plasterer
     craft=plumber: ES:Tag:craft=plumber
     craft=pottery: ES:Tag:craft=pottery
     craft=printer: ES:Tag:craft=printer
     craft=plumber: ES:Tag:craft=plumber
     craft=pottery: ES:Tag:craft=pottery
     craft=printer: ES:Tag:craft=printer
+    craft=printmaker: ES:Tag:craft=printmaker
+    craft=restoration: ES:Tag:craft=restoration
+    craft=rigger: ES:Tag:craft=rigger
+    craft=roofer: ES:Tag:craft=roofer
+    craft=saddler: ES:Tag:craft=saddler
+    craft=sailmaker: ES:Tag:craft=sailmaker
+    craft=sawmill: ES:Tag:craft=sawmill
+    craft=scaffolder: ES:Tag:craft=scaffolder
+    craft=sculptor: ES:Tag:craft=sculptor
+    craft=sewing: ES:Tag:craft=sewing
     craft=shoemaker: ES:Tag:craft=shoemaker
     craft=shoemaker: ES:Tag:craft=shoemaker
+    craft=signmaker: ES:Tag:craft=signmaker
+    craft=stand_builder: ES:Tag:craft=stand builder
+    craft=stonemason: ES:Tag:craft=stonemason
+    craft=stove_fitter: ES:Tag:craft=stove fitter
+    craft=sun_protection: ES:Tag:craft=sun protection
     craft=tailor: ES:Tag:craft=tailor
     craft=tiler: ES:Tag:craft=tiler
     craft=tailor: ES:Tag:craft=tailor
     craft=tiler: ES:Tag:craft=tiler
+    craft=tinsmith: ES:Tag:craft=tinsmith
+    craft=toolmaker: ES:Tag:craft=toolmaker
+    craft=turner: ES:Tag:craft=turner
     craft=upholsterer: ES:Tag:craft=upholsterer
     craft=watchmaker: ES:Tag:craft=watchmaker
     craft=upholsterer: ES:Tag:craft=upholsterer
     craft=watchmaker: ES:Tag:craft=watchmaker
+    craft=water_well_drilling: ES:Tag:craft=water well drilling
+    craft=weaver: ES:Tag:craft=weaver
+    craft=welder: ES:Tag:craft=welder
+    craft=window_construction: ES:Tag:craft=window construction
+    craft=winery: ES:Tag:craft=winery
+    crop=soy: ES:Tag:crop=soy
+    crop=sugarcane: ES:Tag:crop=sugarcane
     crossing=marked: ES:Tag:crossing=marked
     crossing=marked: ES:Tag:crossing=marked
+    crossing=no: ES:Tag:crossing=no
     crossing=traffic_signals: ES:Tag:crossing=traffic signals
     crossing=traffic_signals: ES:Tag:crossing=traffic signals
+    crossing=uncontrolled: ES:Tag:crossing=uncontrolled
+    crossing=unmarked: ES:Tag:crossing=unmarked
     crossing=zebra: ES:Tag:crossing=zebra
     crossing=zebra: ES:Tag:crossing=zebra
+    cuisine=american: ES:Tag:cuisine=american
+    cuisine=asian: ES:Tag:cuisine=asian
+    cuisine=bagel: ES:Tag:cuisine=bagel
+    cuisine=barbecue: ES:Tag:cuisine=barbecue
+    cuisine=brazilian: ES:Tag:cuisine=brazilian
+    cuisine=brunch: ES:Tag:cuisine=brunch
+    cuisine=bubble_tea: ES:Tag:cuisine=bubble tea
+    cuisine=burger: ES:Tag:cuisine=burger
+    cuisine=cake: ES:Tag:cuisine=cake
+    cuisine=catalan: ES:Tag:cuisine=catalan
+    cuisine=chicken: ES:Tag:cuisine=chicken
+    cuisine=chinese: ES:Tag:cuisine=chinese
+    cuisine=coffee_shop: ES:Tag:cuisine=coffee shop
+    cuisine=couscous: ES:Tag:cuisine=couscous
+    cuisine=crepe: ES:Tag:cuisine=crepe
+    cuisine=curry: ES:Tag:cuisine=curry
+    cuisine=dessert: ES:Tag:cuisine=dessert
+    cuisine=donut: ES:Tag:cuisine=donut
+    cuisine=doughnut: ES:Tag:cuisine=doughnut
+    cuisine=dumplings: ES:Tag:cuisine=dumplings
+    cuisine=empanada: ES:Tag:cuisine=empanada
+    cuisine=fish: ES:Tag:cuisine=fish
+    cuisine=fish_and_chips: ES:Tag:cuisine=fish and chips
+    cuisine=french: ES:Tag:cuisine=french
+    cuisine=fried_food: ES:Tag:cuisine=fried food
+    cuisine=friture: ES:Tag:cuisine=friture
+    cuisine=german: ES:Tag:cuisine=german
+    cuisine=greek: ES:Tag:cuisine=greek
+    cuisine=grill: ES:Tag:cuisine=grill
+    cuisine=gyro: ES:Tag:cuisine=gyro
+    cuisine=gyros: ES:Tag:cuisine=gyros
+    cuisine=hot_dog: ES:Tag:cuisine=hot dog
+    cuisine=hot_pot: ES:Tag:cuisine=hot pot
+    cuisine=ice_cream: ES:Tag:cuisine=ice cream
+    cuisine=indian: ES:Tag:cuisine=indian
+    cuisine=italian: ES:Tag:cuisine=italian
+    cuisine=japanese: ES:Tag:cuisine=japanese
+    cuisine=kebab: ES:Tag:cuisine=kebab
+    cuisine=korean: ES:Tag:cuisine=korean
+    cuisine=mediterranean: ES:Tag:cuisine=mediterranean
+    cuisine=mexican: ES:Tag:cuisine=mexican
+    cuisine=noodle: ES:Tag:cuisine=noodle
+    cuisine=pakistani: ES:Tag:cuisine=pakistani
+    cuisine=pancake: ES:Tag:cuisine=pancake
+    cuisine=pasta: ES:Tag:cuisine=pasta
+    cuisine=pie: ES:Tag:cuisine=pie
+    cuisine=pizza: ES:Tag:cuisine=pizza
+    cuisine=regional: ES:Tag:cuisine=regional
+    cuisine=sandwich: ES:Tag:cuisine=sandwich
+    cuisine=seafood: ES:Tag:cuisine=seafood
+    cuisine=soup: ES:Tag:cuisine=soup
+    cuisine=spanish: ES:Tag:cuisine=spanish
+    cuisine=steak_house: ES:Tag:cuisine=steak house
+    cuisine=strudel: ES:Tag:cuisine=strudel
+    cuisine=sushi: ES:Tag:cuisine=sushi
+    cuisine=tapas: ES:Tag:cuisine=tapas
+    cuisine=tea_shop: ES:Tag:cuisine=tea shop
+    cuisine=teahouse: ES:Tag:cuisine=teahouse
+    cuisine=thai: ES:Tag:cuisine=thai
+    cuisine=turkish: ES:Tag:cuisine=turkish
+    cuisine=vietnamese: ES:Tag:cuisine=vietnamese
+    cuisine=waffle: ES:Tag:cuisine=waffle
+    cuisine=wings: ES:Tag:cuisine=wings
+    cycleway:both=lane: ES:Tag:cycleway:both=lane
+    cycleway:both=no: ES:Tag:cycleway:both=no
+    cycleway:left=lane: ES:Tag:cycleway:left=lane
+    cycleway:left=share_busway: ES:Tag:cycleway:left=share busway
+    cycleway:left=shared_busway: ES:Tag:cycleway:left=shared busway
+    cycleway:left=shared_lane: ES:Tag:cycleway:left=shared lane
+    cycleway:left=track: ES:Tag:cycleway:left=track
     cycleway:right=lane: ES:Tag:cycleway:right=lane
     cycleway:right=lane: ES:Tag:cycleway:right=lane
+    cycleway:right=share_busway: ES:Tag:cycleway:right=share busway
+    cycleway:right=shared_lane: ES:Tag:cycleway:right=shared lane
     cycleway:right=track: ES:Tag:cycleway:right=track
     cycleway:right=track: ES:Tag:cycleway:right=track
+    cycleway=asl: ES:Tag:cycleway=asl
+    cycleway=crossing: ES:Tag:cycleway=crossing
     cycleway=lane: ES:Tag:cycleway=lane
     cycleway=lane: ES:Tag:cycleway=lane
+    cycleway=no: ES:Tag:cycleway=no
+    cycleway=opposite: ES:Tag:cycleway=opposite
     cycleway=opposite_lane: ES:Tag:cycleway=opposite lane
     cycleway=opposite_lane: ES:Tag:cycleway=opposite lane
+    cycleway=opposite_share_busway: ES:Tag:cycleway=opposite share busway
     cycleway=opposite_track: ES:Tag:cycleway=opposite track
     cycleway=opposite_track: ES:Tag:cycleway=opposite track
+    cycleway=proposed: ES:Tag:cycleway=proposed
+    cycleway=separate: ES:Tag:cycleway=separate
     cycleway=share_busway: ES:Tag:cycleway=share busway
     cycleway=share_busway: ES:Tag:cycleway=share busway
+    cycleway=shared_lane: ES:Tag:cycleway=shared lane
     cycleway=track: ES:Tag:cycleway=track
     cycleway=track: ES:Tag:cycleway=track
+    denomination=mormon: ES:Tag:denomination=mormon
+    designation=byway_open_to_all_traffic: ES:Tag:designation=byway open to all traffic
+    designation=civil_parish: ES:Tag:designation=civil parish
+    designation=common: ES:Tag:designation=common
+    designation=core_path: ES:Tag:designation=core path
+    designation=public_bridleway: ES:Tag:designation=public bridleway
+    designation=public_footpath: ES:Tag:designation=public footpath
+    designation=restricted_byway: ES:Tag:designation=restricted byway
+    disused=yes: ES:Tag:disused=yes
+    embankment=yes: ES:Tag:embankment=yes
+    emergency=access_point: ES:Tag:emergency=access point
     emergency=ambulance_station: ES:Tag:emergency=ambulance station
     emergency=ambulance_station: ES:Tag:emergency=ambulance station
+    emergency=assembly_point: ES:Tag:emergency=assembly point
     emergency=defibrillator: ES:Tag:emergency=defibrillator
     emergency=defibrillator: ES:Tag:emergency=defibrillator
+    emergency=drinking_water: ES:Tag:emergency=drinking water
     emergency=dry_riser: ES:Tag:emergency=dry riser
     emergency=dry_riser: ES:Tag:emergency=dry riser
+    emergency=dry_riser_inlet: ES:Tag:emergency=dry riser inlet
     emergency=emergency_ward_entrance: ES:Tag:emergency=emergency ward entrance
     emergency=emergency_ward_entrance: ES:Tag:emergency=emergency ward entrance
+    emergency=fire_alarm_box: ES:Tag:emergency=fire alarm box
     emergency=fire_extinguisher: ES:Tag:emergency=fire extinguisher
     emergency=fire_hose: ES:Tag:emergency=fire hose
     emergency=fire_hydrant: ES:Tag:emergency=fire hydrant
     emergency=fire_extinguisher: ES:Tag:emergency=fire extinguisher
     emergency=fire_hose: ES:Tag:emergency=fire hose
     emergency=fire_hydrant: ES:Tag:emergency=fire hydrant
+    emergency=fire_lookout: ES:Tag:emergency=fire lookout
+    emergency=fire_water_pond: ES:Tag:emergency=fire water pond
+    emergency=first_aid: ES:Tag:emergency=first aid
+    emergency=first_aid_kit: ES:Tag:emergency=first aid kit
     emergency=landing_site: ES:Tag:emergency=landing site
     emergency=landing_site: ES:Tag:emergency=landing site
+    emergency=life_ring: ES:Tag:emergency=life ring
+    emergency=lifeboat_station: ES:Tag:emergency=lifeboat station
+    emergency=lifeguard: ES:Tag:emergency=lifeguard
+    emergency=lifeguard_place: ES:Tag:emergency=lifeguard place
+    emergency=lifeguard_tower: ES:Tag:emergency=lifeguard tower
+    emergency=marine_refuge: ES:Tag:emergency=marine refuge
+    emergency=marine_rescue: ES:Tag:emergency=marine rescue
+    emergency=mountain_rescue: ES:Tag:emergency=mountain rescue
     emergency=phone: ES:Tag:emergency=phone
     emergency=ses_station: ES:Tag:emergency=ses station
     emergency=phone: ES:Tag:emergency=phone
     emergency=ses_station: ES:Tag:emergency=ses station
+    emergency=shower: ES:Tag:emergency=shower
+    emergency=siamese: ES:Tag:emergency=siamese
+    emergency=siren: ES:Tag:emergency=siren
+    emergency=slipway: ES:Tag:emergency=slipway
+    emergency=sprinkler_connection: ES:Tag:emergency=sprinkler connection
+    emergency=standpipe: ES:Tag:emergency=standpipe
+    emergency=suction_point: ES:Tag:emergency=suction point
+    emergency=water_tank: ES:Tag:emergency=water tank
     emergency=yes: ES:Tag:emergency=yes
     emergency=yes: ES:Tag:emergency=yes
+    entrance=staircase: ES:Tag:entrance=staircase
+    fence_type=barbed_wire: ES:Tag:fence type=barbed wire
+    fence_type=bars: ES:Tag:fence type=bars
+    fence_type=chain_link: ES:Tag:fence type=chain link
+    fence_type=concrete: ES:Tag:fence type=concrete
+    fence_type=corrugated_metal: ES:Tag:fence type=corrugated metal
+    fence_type=electric: ES:Tag:fence type=electric
+    fence_type=metal: ES:Tag:fence type=metal
+    fence_type=pole: ES:Tag:fence type=pole
+    fence_type=railing: ES:Tag:fence type=railing
+    fence_type=roundpole: ES:Tag:fence type=roundpole
+    fence_type=split_rail: ES:Tag:fence type=split rail
+    fence_type=wire: ES:Tag:fence type=wire
+    fence_type=wood: ES:Tag:fence type=wood
+    flood_mark=painting: ES:Tag:flood mark=painting
+    flood_mark=plaque: ES:Tag:flood mark=plaque
     flow_direction=both: ES:Tag:flow direction=both
     flow_direction=both: ES:Tag:flow direction=both
+    foot=use_sidepath: ES:Tag:foot=use sidepath
+    foot=yes: ES:Tag:foot=yes
+    footway=access_aisle: ES:Tag:footway=access aisle
     footway=crossing: ES:Tag:footway=crossing
     footway=sidewalk: ES:Tag:footway=sidewalk
     ford=stepping_stones: ES:Tag:ford=stepping stones
     ford=yes: ES:Tag:ford=yes
     footway=crossing: ES:Tag:footway=crossing
     footway=sidewalk: ES:Tag:footway=sidewalk
     ford=stepping_stones: ES:Tag:ford=stepping stones
     ford=yes: ES:Tag:ford=yes
+    fountain=bubbler: ES:Tag:fountain=bubbler
     garden:type=botanical: ES:Tag:garden:type=botanical
     garden:type=botanical: ES:Tag:garden:type=botanical
+    generator:method=combustion: ES:Tag:generator:method=combustion
     generator:method=photovoltaic: ES:Tag:generator:method=photovoltaic
     generator:method=thermal: ES:Tag:generator:method=thermal
     generator:method=wind_turbine: ES:Tag:generator:method=wind turbine
     generator:method=photovoltaic: ES:Tag:generator:method=photovoltaic
     generator:method=thermal: ES:Tag:generator:method=thermal
     generator:method=wind_turbine: ES:Tag:generator:method=wind turbine
@@ -11790,9 +16439,14 @@ es:
       panel
     generator:type=solar_thermal_collector: ES:Tag:generator:type=solar thermal collector
     generator:type=vertical_axis: ES:Tag:generator:type=vertical axis
       panel
     generator:type=solar_thermal_collector: ES:Tag:generator:type=solar thermal collector
     generator:type=vertical_axis: ES:Tag:generator:type=vertical axis
+    geological=columnar_jointing: ES:Tag:geological=columnar jointing
+    geological=fault: ES:Tag:geological=fault
     geological=moraine: ES:Tag:geological=moraine
     geological=outcrop: ES:Tag:geological=outcrop
     geological=palaeontological_site: ES:Tag:geological=palaeontological site
     geological=moraine: ES:Tag:geological=moraine
     geological=outcrop: ES:Tag:geological=outcrop
     geological=palaeontological_site: ES:Tag:geological=palaeontological site
+    geological=volcanic_caldera_rim: ES:Tag:geological=volcanic caldera rim
+    geological=volcanic_lava_field: ES:Tag:geological=volcanic lava field
+    geological=volcanic_vent: ES:Tag:geological=volcanic vent
     golf=bunker: ES:Tag:golf=bunker
     golf=clubhouse: ES:Tag:golf=clubhouse
     golf=driving_range: ES:Tag:golf=driving range
     golf=bunker: ES:Tag:golf=bunker
     golf=clubhouse: ES:Tag:golf=clubhouse
     golf=driving_range: ES:Tag:golf=driving range
@@ -11817,29 +16471,68 @@ es:
     government=statistics: ES:Tag:government=statistics
     government=tax: ES:Tag:government=tax
     government=youth_welfare_department: ES:Tag:government=youth welfare department
     government=statistics: ES:Tag:government=statistics
     government=tax: ES:Tag:government=tax
     government=youth_welfare_department: ES:Tag:government=youth welfare department
+    hazard=animal_crossing: ES:Tag:hazard=animal crossing
+    hazard=bump: ES:Tag:hazard=bump
+    hazard=contamination: ES:Tag:hazard=contamination
+    hazard=cyclists: ES:Tag:hazard=cyclists
+    hazard=dangerous_junction: ES:Tag:hazard=dangerous junction
+    hazard=horse_riders: ES:Tag:hazard=horse riders
+    hazard=queues_likely: ES:Tag:hazard=queues likely
+    hazard=slippery: ES:Tag:hazard=slippery
     healthcare:speciality=vaccination: ES:Tag:healthcare:speciality=vaccination
     healthcare:speciality=vaccination: ES:Tag:healthcare:speciality=vaccination
+    healthcare=alternative: ES:Tag:healthcare=alternative
+    healthcare=audiologist: ES:Tag:healthcare=audiologist
     healthcare=birthing_center: ES:Tag:healthcare=birthing center
     healthcare=birthing_center: ES:Tag:healthcare=birthing center
+    healthcare=birthing_centre: ES:Tag:healthcare=birthing centre
+    healthcare=blood_bank: ES:Tag:healthcare=blood bank
+    healthcare=blood_donation: ES:Tag:healthcare=blood donation
+    healthcare=centre: ES:Tag:healthcare=centre
+    healthcare=clinic: ES:Tag:healthcare=clinic
+    healthcare=community_health_worker: ES:Tag:healthcare=community health worker
+    healthcare=counselling: ES:Tag:healthcare=counselling
+    healthcare=dentist: ES:Tag:healthcare=dentist
+    healthcare=dialysis: ES:Tag:healthcare=dialysis
     healthcare=doctor: ES:Tag:healthcare=doctor
     healthcare=doctor: ES:Tag:healthcare=doctor
+    healthcare=hospice: ES:Tag:healthcare=hospice
     healthcare=hospital: ES:Tag:healthcare=hospital
     healthcare=laboratory: ES:Tag:healthcare=laboratory
     healthcare=midwife: ES:Tag:healthcare=midwife
     healthcare=hospital: ES:Tag:healthcare=hospital
     healthcare=laboratory: ES:Tag:healthcare=laboratory
     healthcare=midwife: ES:Tag:healthcare=midwife
+    healthcare=nurse: ES:Tag:healthcare=nurse
+    healthcare=nutrition_counselling: ES:Tag:healthcare=nutrition counselling
+    healthcare=occupational_therapist: ES:Tag:healthcare=occupational therapist
+    healthcare=optometrist: ES:Tag:healthcare=optometrist
+    healthcare=pharmacy: ES:Tag:healthcare=pharmacy
+    healthcare=physiotherapist: ES:Tag:healthcare=physiotherapist
     healthcare=podiatrist: ES:Tag:healthcare=podiatrist
     healthcare=podiatrist: ES:Tag:healthcare=podiatrist
+    healthcare=postpartum_care: ES:Tag:healthcare=postpartum care
+    healthcare=psychotherapist: ES:Tag:healthcare=psychotherapist
+    healthcare=rehabilitation: ES:Tag:healthcare=rehabilitation
+    healthcare=sample_collection: ES:Tag:healthcare=sample collection
+    healthcare=speech_therapist: ES:Tag:healthcare=speech therapist
+    healthcare=vaccination_centre: ES:Tag:healthcare=vaccination centre
+    healthcare=yes: ES:Tag:healthcare=yes
+    hedge=hedge_bank: ES:Tag:hedge=hedge bank
     highway=bridleway: ES:Tag:highway=bridleway
     highway=bus_guideway: ES:Tag:highway=bus guideway
     highway=bus_stop: ES:Tag:highway=bus stop
     highway=bridleway: ES:Tag:highway=bridleway
     highway=bus_guideway: ES:Tag:highway=bus guideway
     highway=bus_stop: ES:Tag:highway=bus stop
-    highway=byway: ES:Tag:highway=byway
+    highway=busway: ES:Tag:highway=busway
+    highway=construction: ES:Tag:highway=construction
     highway=corridor: ES:Tag:highway=corridor
     highway=crossing: ES:Tag:highway=crossing
     highway=cycleway: ES:Tag:highway=cycleway
     highway=elevator: ES:Tag:highway=elevator
     highway=emergency_access_point: ES:Tag:highway=emergency access point
     highway=corridor: ES:Tag:highway=corridor
     highway=crossing: ES:Tag:highway=crossing
     highway=cycleway: ES:Tag:highway=cycleway
     highway=elevator: ES:Tag:highway=elevator
     highway=emergency_access_point: ES:Tag:highway=emergency access point
+    highway=emergency_bay: ES:Tag:highway=emergency bay
     highway=escape: ES:Tag:highway=escape
     highway=footway: ES:Tag:highway=footway
     highway=escape: ES:Tag:highway=escape
     highway=footway: ES:Tag:highway=footway
+    highway=give_way: ES:Tag:highway=give way
     highway=living_street: ES:Tag:highway=living street
     highway=milestone: ES:Tag:highway=milestone
     highway=living_street: ES:Tag:highway=living street
     highway=milestone: ES:Tag:highway=milestone
+    highway=mini_roundabout: ES:Tag:highway=mini roundabout
     highway=motorway: ES:Tag:highway=motorway
     highway=motorway_junction: ES:Tag:highway=motorway junction
     highway=motorway_link: ES:Tag:highway=motorway link
     highway=motorway: ES:Tag:highway=motorway
     highway=motorway_junction: ES:Tag:highway=motorway junction
     highway=motorway_link: ES:Tag:highway=motorway link
+    highway=passing_place: ES:Tag:highway=passing place
     highway=path: ES:Tag:highway=path
     highway=pedestrian: ES:Tag:highway=pedestrian
     highway=platform: ES:Tag:highway=platform
     highway=path: ES:Tag:highway=path
     highway=pedestrian: ES:Tag:highway=pedestrian
     highway=platform: ES:Tag:highway=platform
@@ -11854,82 +16547,158 @@ es:
     highway=secondary: ES:Tag:highway=secondary
     highway=secondary_link: ES:Tag:highway=secondary link
     highway=service: ES:Tag:highway=service
     highway=secondary: ES:Tag:highway=secondary
     highway=secondary_link: ES:Tag:highway=secondary link
     highway=service: ES:Tag:highway=service
+    highway=services: ES:Tag:highway=services
     highway=speed_camera: ES:Tag:highway=speed camera
     highway=speed_display: ES:Tag:highway=speed display
     highway=steps: ES:Tag:highway=steps
     highway=stop: ES:Tag:highway=stop
     highway=street_lamp: ES:Tag:highway=street lamp
     highway=tertiary: ES:Tag:highway=tertiary
     highway=speed_camera: ES:Tag:highway=speed camera
     highway=speed_display: ES:Tag:highway=speed display
     highway=steps: ES:Tag:highway=steps
     highway=stop: ES:Tag:highway=stop
     highway=street_lamp: ES:Tag:highway=street lamp
     highway=tertiary: ES:Tag:highway=tertiary
+    highway=tertiary_link: ES:Tag:highway=tertiary link
+    highway=toll_gantry: ES:Tag:highway=toll gantry
     highway=track: ES:Tag:highway=track
     highway=track: ES:Tag:highway=track
+    highway=traffic_mirror: ES:Tag:highway=traffic mirror
     highway=traffic_signals: ES:Tag:highway=traffic signals
     highway=trailhead: ES:Tag:highway=trailhead
     highway=trunk: ES:Tag:highway=trunk
     highway=traffic_signals: ES:Tag:highway=traffic signals
     highway=trailhead: ES:Tag:highway=trailhead
     highway=trunk: ES:Tag:highway=trunk
+    highway=trunk_link: ES:Tag:highway=trunk link
     highway=turning_circle: ES:Tag:highway=turning circle
     highway=turning_loop: ES:Tag:highway=turning loop
     highway=unclassified: ES:Tag:highway=unclassified
     highway=turning_circle: ES:Tag:highway=turning circle
     highway=turning_loop: ES:Tag:highway=turning loop
     highway=unclassified: ES:Tag:highway=unclassified
+    historic=aircraft: ES:Tag:historic=aircraft
     historic=aqueduct: ES:Tag:historic=aqueduct
     historic=archaeological_site: ES:Tag:historic=archaeological site
     historic=aqueduct: ES:Tag:historic=aqueduct
     historic=archaeological_site: ES:Tag:historic=archaeological site
+    historic=battlefield: ES:Tag:historic=battlefield
+    historic=bomb_crater: ES:Tag:historic=bomb crater
     historic=boundary_stone: ES:Tag:historic=boundary stone
     historic=boundary_stone: ES:Tag:historic=boundary stone
+    historic=building: ES:Tag:historic=building
+    historic=cannon: ES:Tag:historic=cannon
+    historic=castle: ES:Tag:historic=castle
+    historic=castle_wall: ES:Tag:historic=castle wall
+    historic=cattle_crush: ES:Tag:historic=cattle crush
+    historic=cemetery: ES:Tag:historic=cemetery
+    historic=charcoal_pile: ES:Tag:historic=charcoal pile
+    historic=church: ES:Tag:historic=church
+    historic=city_gate: ES:Tag:historic=city gate
+    historic=citywalls: ES:Tag:historic=citywalls
+    historic=creamery: ES:Tag:historic=creamery
     historic=district: ES:Tag:historic=district
     historic=farm: ES:Tag:historic=farm
     historic=district: ES:Tag:historic=district
     historic=farm: ES:Tag:historic=farm
+    historic=flood_mark: ES:Tag:historic=flood mark
+    historic=fort: ES:Tag:historic=fort
+    historic=gallows: ES:Tag:historic=gallows
     historic=heritage: ES:Tag:historic=heritage
     historic=heritage: ES:Tag:historic=heritage
+    historic=highwater_mark: ES:Tag:historic=highwater mark
+    historic=house: ES:Tag:historic=house
+    historic=locomotive: ES:Tag:historic=locomotive
     historic=manor: ES:Tag:historic=manor
     historic=memorial: ES:Tag:historic=memorial
     historic=milestone: ES:Tag:historic=milestone
     historic=mine: ES:Tag:historic=mine
     historic=manor: ES:Tag:historic=manor
     historic=memorial: ES:Tag:historic=memorial
     historic=milestone: ES:Tag:historic=milestone
     historic=mine: ES:Tag:historic=mine
+    historic=mine_shaft: ES:Tag:historic=mine shaft
+    historic=monastery: ES:Tag:historic=monastery
+    historic=monument: ES:Tag:historic=monument
+    historic=optical_telegraph: ES:Tag:historic=optical telegraph
+    historic=pa: ES:Tag:historic=pa
     historic=pillory: ES:Tag:historic=pillory
     historic=pillory: ES:Tag:historic=pillory
+    historic=railway_car: ES:Tag:historic=railway car
     historic=ruins: ES:Tag:historic=ruins
     historic=ruins: ES:Tag:historic=ruins
+    historic=rune_stone: ES:Tag:historic=rune stone
+    historic=ship: ES:Tag:historic=ship
+    historic=stone: ES:Tag:historic=stone
+    historic=tank: ES:Tag:historic=tank
     historic=tomb: ES:Tag:historic=tomb
     historic=tomb: ES:Tag:historic=tomb
+    historic=tower: ES:Tag:historic=tower
+    historic=vehicle: ES:Tag:historic=vehicle
     historic=wayside_cross: ES:Tag:historic=wayside cross
     historic=wayside_shrine: ES:Tag:historic=wayside shrine
     historic=wreck: ES:Tag:historic=wreck
     historic=wayside_cross: ES:Tag:historic=wayside cross
     historic=wayside_shrine: ES:Tag:historic=wayside shrine
     historic=wreck: ES:Tag:historic=wreck
+    historic=yes: ES:Tag:historic=yes
+    ice_road=yes: ES:Tag:ice road=yes
+    indoor=yes: ES:Tag:indoor=yes
     industrial=auto_wrecker: ES:Tag:industrial=auto wrecker
     industrial=auto_wrecker: ES:Tag:industrial=auto wrecker
+    industrial=bakery: ES:Tag:industrial=bakery
+    industrial=brickyard: ES:Tag:industrial=brickyard
     industrial=depot: ES:Tag:industrial=depot
     industrial=depot: ES:Tag:industrial=depot
+    industrial=distributor: ES:Tag:industrial=distributor
     industrial=factory: ES:Tag:industrial=factory
     industrial=factory: ES:Tag:industrial=factory
+    industrial=grinding_mill: ES:Tag:industrial=grinding mill
+    industrial=heating_station: ES:Tag:industrial=heating station
+    industrial=mine: ES:Tag:industrial=mine
+    industrial=oil: ES:Tag:industrial=oil
+    industrial=port: ES:Tag:industrial=port
+    industrial=salt_pond: ES:Tag:industrial=salt pond
+    industrial=sawmill: ES:Tag:industrial=sawmill
     industrial=scrap_yard: ES:Tag:industrial=scrap yard
     industrial=scrap_yard: ES:Tag:industrial=scrap yard
+    industrial=shipyard: ES:Tag:industrial=shipyard
+    industrial=slaughterhouse: ES:Tag:industrial=slaughterhouse
     industrial=warehouse: ES:Tag:industrial=warehouse
     industrial=warehouse: ES:Tag:industrial=warehouse
+    industrial=well_cluster: ES:Tag:industrial=well cluster
+    industrial=wellsite: ES:Tag:industrial=wellsite
     information=board: ES:Tag:information=board
     information=guidepost: ES:Tag:information=guidepost
     information=map: ES:Tag:information=map
     information=office: ES:Tag:information=office
     information=tactile_map: ES:Tag:information=tactile map
     information=visitor_centre: ES:Tag:information=visitor centre
     information=board: ES:Tag:information=board
     information=guidepost: ES:Tag:information=guidepost
     information=map: ES:Tag:information=map
     information=office: ES:Tag:information=office
     information=tactile_map: ES:Tag:information=tactile map
     information=visitor_centre: ES:Tag:information=visitor centre
+    insurance=health: ES:Tag:insurance=health
+    internet_access=no: ES:Tag:internet access=no
     internet_access=wlan: ES:Tag:internet access=wlan
     internet_access=wlan: ES:Tag:internet access=wlan
+    internet_access=yes: ES:Tag:internet access=yes
     junction=circular: ES:Tag:junction=circular
     junction=roundabout: ES:Tag:junction=roundabout
     junction=circular: ES:Tag:junction=circular
     junction=roundabout: ES:Tag:junction=roundabout
+    junction=yes: ES:Tag:junction=yes
     karst=yes: ES:Tag:karst=yes
     landcover=grass: ES:Tag:landcover=grass
     landcover=trees: ES:Tag:landcover=trees
     landuse=allotments: ES:Tag:landuse=allotments
     karst=yes: ES:Tag:karst=yes
     landcover=grass: ES:Tag:landcover=grass
     landcover=trees: ES:Tag:landcover=trees
     landuse=allotments: ES:Tag:landuse=allotments
+    landuse=animal_keeping: ES:Tag:landuse=animal keeping
     landuse=apiary: ES:Tag:landuse=apiary
     landuse=aquaculture: ES:Tag:landuse=aquaculture
     landuse=basin: ES:Tag:landuse=basin
     landuse=brownfield: ES:Tag:landuse=brownfield
     landuse=cemetery: ES:Tag:landuse=cemetery
     landuse=commercial: ES:Tag:landuse=commercial
     landuse=apiary: ES:Tag:landuse=apiary
     landuse=aquaculture: ES:Tag:landuse=aquaculture
     landuse=basin: ES:Tag:landuse=basin
     landuse=brownfield: ES:Tag:landuse=brownfield
     landuse=cemetery: ES:Tag:landuse=cemetery
     landuse=commercial: ES:Tag:landuse=commercial
+    landuse=conservation: ES:Tag:landuse=conservation
     landuse=construction: ES:Tag:landuse=construction
     landuse=depot: ES:Tag:landuse=depot
     landuse=construction: ES:Tag:landuse=construction
     landuse=depot: ES:Tag:landuse=depot
+    landuse=education: ES:Tag:landuse=education
     landuse=farmland: ES:Tag:landuse=farmland
     landuse=farmyard: ES:Tag:landuse=farmyard
     landuse=farmland: ES:Tag:landuse=farmland
     landuse=farmyard: ES:Tag:landuse=farmyard
+    landuse=flowerbed: ES:Tag:landuse=flowerbed
     landuse=forest: ES:Tag:landuse=forest
     landuse=forest: ES:Tag:landuse=forest
+    landuse=forestry: ES:Tag:landuse=forestry
     landuse=garages: ES:Tag:landuse=garages
     landuse=grass: ES:Tag:landuse=grass
     landuse=garages: ES:Tag:landuse=garages
     landuse=grass: ES:Tag:landuse=grass
+    landuse=greenery: ES:Tag:landuse=greenery
     landuse=greenfield: ES:Tag:landuse=greenfield
     landuse=greenhouse_horticulture: ES:Tag:landuse=greenhouse horticulture
     landuse=greenfield: ES:Tag:landuse=greenfield
     landuse=greenhouse_horticulture: ES:Tag:landuse=greenhouse horticulture
+    landuse=harbour: ES:Tag:landuse=harbour
+    landuse=highway: ES:Tag:landuse=highway
     landuse=industrial: ES:Tag:landuse=industrial
     landuse=landfill: ES:Tag:landuse=landfill
     landuse=industrial: ES:Tag:landuse=industrial
     landuse=landfill: ES:Tag:landuse=landfill
+    landuse=logging: ES:Tag:landuse=logging
     landuse=meadow: ES:Tag:landuse=meadow
     landuse=meadow_orchard: ES:Tag:landuse=meadow orchard
     landuse=meadow: ES:Tag:landuse=meadow
     landuse=meadow_orchard: ES:Tag:landuse=meadow orchard
+    landuse=military: ES:Tag:landuse=military
     landuse=orchard: ES:Tag:landuse=orchard
     landuse=orchard: ES:Tag:landuse=orchard
+    landuse=peat_cutting: ES:Tag:landuse=peat cutting
     landuse=plant_nursery: ES:Tag:landuse=plant nursery
     landuse=plant_nursery: ES:Tag:landuse=plant nursery
+    landuse=port: ES:Tag:landuse=port
     landuse=quarry: ES:Tag:landuse=quarry
     landuse=quarry: ES:Tag:landuse=quarry
+    landuse=railway: ES:Tag:landuse=railway
     landuse=recreation_ground: ES:Tag:landuse=recreation ground
     landuse=recreation_ground: ES:Tag:landuse=recreation ground
+    landuse=religious: ES:Tag:landuse=religious
     landuse=reservoir: ES:Tag:landuse=reservoir
     landuse=reservoir: ES:Tag:landuse=reservoir
+    landuse=reservoir_watershed: ES:Tag:landuse=reservoir watershed
     landuse=residential: ES:Tag:landuse=residential
     landuse=retail: ES:Tag:landuse=retail
     landuse=salt_pond: ES:Tag:landuse=salt pond
     landuse=traffic_island: ES:Tag:landuse=traffic island
     landuse=village_green: ES:Tag:landuse=village green
     landuse=residential: ES:Tag:landuse=residential
     landuse=retail: ES:Tag:landuse=retail
     landuse=salt_pond: ES:Tag:landuse=salt pond
     landuse=traffic_island: ES:Tag:landuse=traffic island
     landuse=village_green: ES:Tag:landuse=village green
+    landuse=vineyard: ES:Tag:landuse=vineyard
+    landuse=winter_sports: ES:Tag:landuse=winter sports
+    lawyer=notary: ES:Tag:lawyer=notary
     leaf_cycle=deciduous: ES:Tag:leaf cycle=deciduous
     leaf_cycle=evergreen: ES:Tag:leaf cycle=evergreen
     leaf_cycle=mixed: ES:Tag:leaf cycle=mixed
     leaf_cycle=deciduous: ES:Tag:leaf cycle=deciduous
     leaf_cycle=evergreen: ES:Tag:leaf cycle=evergreen
     leaf_cycle=mixed: ES:Tag:leaf cycle=mixed
@@ -11939,11 +16708,16 @@ es:
     leaf_type=leafless: ES:Tag:leaf type=leafless
     leaf_type=mixed: ES:Tag:leaf type=mixed
     leaf_type=needleleaved: ES:Tag:leaf type=needleleaved
     leaf_type=leafless: ES:Tag:leaf type=leafless
     leaf_type=mixed: ES:Tag:leaf type=mixed
     leaf_type=needleleaved: ES:Tag:leaf type=needleleaved
+    leisure=adult_gaming_centre: ES:Tag:leisure=adult gaming centre
+    leisure=amusement_arcade: ES:Tag:leisure=amusement arcade
     leisure=bandstand: ES:Tag:leisure=bandstand
     leisure=bandstand: ES:Tag:leisure=bandstand
+    leisure=barefoot: ES:Tag:leisure=barefoot
+    leisure=beach_resort: ES:Tag:leisure=beach resort
     leisure=bird_hide: ES:Tag:leisure=bird hide
     leisure=bleachers: ES:Tag:leisure=bleachers
     leisure=bowling_alley: ES:Tag:leisure=bowling alley
     leisure=common: ES:Tag:leisure=common
     leisure=bird_hide: ES:Tag:leisure=bird hide
     leisure=bleachers: ES:Tag:leisure=bleachers
     leisure=bowling_alley: ES:Tag:leisure=bowling alley
     leisure=common: ES:Tag:leisure=common
+    leisure=dance: ES:Tag:leisure=dance
     leisure=disc_golf_course: ES:Tag:leisure=disc golf course
     leisure=dog_park: ES:Tag:leisure=dog park
     leisure=escape_game: ES:Tag:leisure=escape game
     leisure=disc_golf_course: ES:Tag:leisure=disc golf course
     leisure=dog_park: ES:Tag:leisure=dog park
     leisure=escape_game: ES:Tag:leisure=escape game
@@ -11955,106 +16729,195 @@ es:
     leisure=golf_course: ES:Tag:leisure=golf course
     leisure=hackerspace: ES:Tag:leisure=hackerspace
     leisure=horse_riding: ES:Tag:leisure=horse riding
     leisure=golf_course: ES:Tag:leisure=golf course
     leisure=hackerspace: ES:Tag:leisure=hackerspace
     leisure=horse_riding: ES:Tag:leisure=horse riding
+    leisure=ice_rink: ES:Tag:leisure=ice rink
     leisure=marina: ES:Tag:leisure=marina
     leisure=miniature_golf: ES:Tag:leisure=miniature golf
     leisure=nature_reserve: ES:Tag:leisure=nature reserve
     leisure=outdoor_seating: ES:Tag:leisure=outdoor seating
     leisure=park: ES:Tag:leisure=park
     leisure=marina: ES:Tag:leisure=marina
     leisure=miniature_golf: ES:Tag:leisure=miniature golf
     leisure=nature_reserve: ES:Tag:leisure=nature reserve
     leisure=outdoor_seating: ES:Tag:leisure=outdoor seating
     leisure=park: ES:Tag:leisure=park
+    leisure=picnic: ES:Tag:leisure=picnic
     leisure=picnic_table: ES:Tag:leisure=picnic table
     leisure=pitch: ES:Tag:leisure=pitch
     leisure=playground: ES:Tag:leisure=playground
     leisure=picnic_table: ES:Tag:leisure=picnic table
     leisure=pitch: ES:Tag:leisure=pitch
     leisure=playground: ES:Tag:leisure=playground
+    leisure=resort: ES:Tag:leisure=resort
     leisure=sauna: ES:Tag:leisure=sauna
     leisure=schoolyard: ES:Tag:leisure=schoolyard
     leisure=slipway: ES:Tag:leisure=slipway
     leisure=sports_centre: ES:Tag:leisure=sports centre
     leisure=sports_hall: ES:Tag:leisure=sports hall
     leisure=stadium: ES:Tag:leisure=stadium
     leisure=sauna: ES:Tag:leisure=sauna
     leisure=schoolyard: ES:Tag:leisure=schoolyard
     leisure=slipway: ES:Tag:leisure=slipway
     leisure=sports_centre: ES:Tag:leisure=sports centre
     leisure=sports_hall: ES:Tag:leisure=sports hall
     leisure=stadium: ES:Tag:leisure=stadium
+    leisure=summer_camp: ES:Tag:leisure=summer camp
+    leisure=swimming_area: ES:Tag:leisure=swimming area
     leisure=swimming_pool: ES:Tag:leisure=swimming pool
     leisure=swimming_pool: ES:Tag:leisure=swimming pool
+    leisure=table_tennis_table: ES:Tag:leisure=table tennis table
     leisure=tanning_salon: ES:Tag:leisure=tanning salon
     leisure=track: ES:Tag:leisure=track
     leisure=tanning_salon: ES:Tag:leisure=tanning salon
     leisure=track: ES:Tag:leisure=track
+    leisure=trampoline_park: ES:Tag:leisure=trampoline park
     leisure=water_park: ES:Tag:leisure=water park
     leisure=water_park: ES:Tag:leisure=water park
+    leisure=wildlife_hide: ES:Tag:leisure=wildlife hide
+    lifeguard=tower: ES:Tag:lifeguard=tower
+    line=bay: ES:Tag:line=bay
+    line=busbar: ES:Tag:line=busbar
+    location=outdoor: ES:Tag:location=outdoor
     man_made=adit: ES:Tag:man made=adit
     man_made=archimedes_screw: ES:Tag:man made=archimedes screw
     man_made=adit: ES:Tag:man made=adit
     man_made=archimedes_screw: ES:Tag:man made=archimedes screw
+    man_made=beacon: ES:Tag:man made=beacon
     man_made=beehive: ES:Tag:man made=beehive
     man_made=breakwater: ES:Tag:man made=breakwater
     man_made=bridge: ES:Tag:man made=bridge
     man_made=beehive: ES:Tag:man made=beehive
     man_made=breakwater: ES:Tag:man made=breakwater
     man_made=bridge: ES:Tag:man made=bridge
+    man_made=bunker_silo: ES:Tag:man made=bunker silo
+    man_made=carpet_hanger: ES:Tag:man made=carpet hanger
     man_made=chimney: ES:Tag:man made=chimney
     man_made=clearcut: ES:Tag:man made=clearcut
     man_made=chimney: ES:Tag:man made=chimney
     man_made=clearcut: ES:Tag:man made=clearcut
+    man_made=column: ES:Tag:man made=column
+    man_made=communications_tower: ES:Tag:man made=communications tower
     man_made=compass_rose: ES:Tag:man made=compass rose
     man_made=compass_rose: ES:Tag:man made=compass rose
+    man_made=crane: ES:Tag:man made=crane
     man_made=cross: ES:Tag:man made=cross
     man_made=cutline: ES:Tag:man made=cutline
     man_made=cross: ES:Tag:man made=cross
     man_made=cutline: ES:Tag:man made=cutline
+    man_made=dovecote: ES:Tag:man made=dovecote
     man_made=drinking_fountain: ES:Tag:man made=drinking fountain
     man_made=dyke: ES:Tag:man made=dyke
     man_made=embankment: ES:Tag:man made=embankment
     man_made=flagpole: ES:Tag:man made=flagpole
     man_made=gantry: ES:Tag:man made=gantry
     man_made=drinking_fountain: ES:Tag:man made=drinking fountain
     man_made=dyke: ES:Tag:man made=dyke
     man_made=embankment: ES:Tag:man made=embankment
     man_made=flagpole: ES:Tag:man made=flagpole
     man_made=gantry: ES:Tag:man made=gantry
+    man_made=gasometer: ES:Tag:man made=gasometer
     man_made=geoglyph: ES:Tag:man made=geoglyph
     man_made=geoglyph: ES:Tag:man made=geoglyph
+    man_made=goods_conveyor: ES:Tag:man made=goods conveyor
+    man_made=groyne: ES:Tag:man made=groyne
+    man_made=guard_stone: ES:Tag:man made=guard stone
+    man_made=ice_house: ES:Tag:man made=ice house
+    man_made=insect_hotel: ES:Tag:man made=insect hotel
+    man_made=kiln: ES:Tag:man made=kiln
+    man_made=lighthouse: ES:Tag:man made=lighthouse
+    man_made=manhole: ES:Tag:man made=manhole
     man_made=mast: ES:Tag:man made=mast
     man_made=mast: ES:Tag:man made=mast
+    man_made=mineshaft: ES:Tag:man made=mineshaft
     man_made=monitoring_station: ES:Tag:man made=monitoring station
     man_made=nesting_site: ES:Tag:man made=nesting site
     man_made=monitoring_station: ES:Tag:man made=monitoring station
     man_made=nesting_site: ES:Tag:man made=nesting site
+    man_made=obelisk: ES:Tag:man made=obelisk
     man_made=observatory: ES:Tag:man made=observatory
     man_made=observatory: ES:Tag:man made=observatory
+    man_made=offshore_platform: ES:Tag:man made=offshore platform
+    man_made=petroleum_well: ES:Tag:man made=petroleum well
     man_made=pier: ES:Tag:man made=pier
     man_made=pier: ES:Tag:man made=pier
+    man_made=pipeline: ES:Tag:man made=pipeline
     man_made=planter: ES:Tag:man made=planter
     man_made=power_wind: ES:Tag:man made=power wind
     man_made=planter: ES:Tag:man made=planter
     man_made=power_wind: ES:Tag:man made=power wind
+    man_made=pump: ES:Tag:man made=pump
     man_made=pumping_rig: ES:Tag:man made=pumping rig
     man_made=pumping_station: ES:Tag:man made=pumping station
     man_made=pumping_rig: ES:Tag:man made=pumping rig
     man_made=pumping_station: ES:Tag:man made=pumping station
+    man_made=quay: ES:Tag:man made=quay
     man_made=reservoir_covered: ES:Tag:man made=reservoir covered
     man_made=reservoir_covered: ES:Tag:man made=reservoir covered
+    man_made=silo: ES:Tag:man made=silo
+    man_made=snow_fence: ES:Tag:man made=snow fence
+    man_made=snow_net: ES:Tag:man made=snow net
     man_made=storage_tank: ES:Tag:man made=storage tank
     man_made=street_cabinet: ES:Tag:man made=street cabinet
     man_made=storage_tank: ES:Tag:man made=storage tank
     man_made=street_cabinet: ES:Tag:man made=street cabinet
+    man_made=stupa: ES:Tag:man made=stupa
     man_made=surveillance: ES:Tag:man made=surveillance
     man_made=survey_point: ES:Tag:man made=survey point
     man_made=surveillance: ES:Tag:man made=surveillance
     man_made=survey_point: ES:Tag:man made=survey point
+    man_made=tailings_pond: ES:Tag:man made=tailings pond
     man_made=telescope: ES:Tag:man made=telescope
     man_made=tell: ES:Tag:man made=tell
     man_made=telescope: ES:Tag:man made=telescope
     man_made=tell: ES:Tag:man made=tell
+    man_made=threshing_floor: ES:Tag:man made=threshing floor
     man_made=tower: ES:Tag:man made=tower
     man_made=tower: ES:Tag:man made=tower
+    man_made=video_wall: ES:Tag:man made=video wall
     man_made=wastewater_plant: ES:Tag:man made=wastewater plant
     man_made=water_tap: ES:Tag:man made=water tap
     man_made=water_tower: ES:Tag:man made=water tower
     man_made=water_well: ES:Tag:man made=water well
     man_made=water_works: ES:Tag:man made=water works
     man_made=watermill: ES:Tag:man made=watermill
     man_made=wastewater_plant: ES:Tag:man made=wastewater plant
     man_made=water_tap: ES:Tag:man made=water tap
     man_made=water_tower: ES:Tag:man made=water tower
     man_made=water_well: ES:Tag:man made=water well
     man_made=water_works: ES:Tag:man made=water works
     man_made=watermill: ES:Tag:man made=watermill
+    man_made=wildlife_crossing: ES:Tag:man made=wildlife crossing
     man_made=wildlife_opening: ES:Tag:man made=wildlife opening
     man_made=wildlife_opening: ES:Tag:man made=wildlife opening
+    man_made=windmill: ES:Tag:man made=windmill
     man_made=windpump: ES:Tag:man made=windpump
     man_made=works: ES:Tag:man made=works
     man_made=windpump: ES:Tag:man made=windpump
     man_made=works: ES:Tag:man made=works
+    man_made=yes: ES:Tag:man made=yes
     manhole=drain: ES:Tag:manhole=drain
     manhole=drain: ES:Tag:manhole=drain
+    memorial:type=stolperstein: ES:Tag:memorial:type=stolperstein
     memorial=blue_plaque: ES:Tag:memorial=blue plaque
     memorial=bust: ES:Tag:memorial=bust
     memorial=blue_plaque: ES:Tag:memorial=blue plaque
     memorial=bust: ES:Tag:memorial=bust
+    memorial=cenotaph: ES:Tag:memorial=cenotaph
     memorial=cross: ES:Tag:memorial=cross
     memorial=cross: ES:Tag:memorial=cross
+    memorial=flood_mark: ES:Tag:memorial=flood mark
     memorial=ghost_bike: ES:Tag:memorial=ghost bike
     memorial=obelisk: ES:Tag:memorial=obelisk
     memorial=plaque: ES:Tag:memorial=plaque
     memorial=ghost_bike: ES:Tag:memorial=ghost bike
     memorial=obelisk: ES:Tag:memorial=obelisk
     memorial=plaque: ES:Tag:memorial=plaque
+    memorial=sculpture: ES:Tag:memorial=sculpture
     memorial=statue: ES:Tag:memorial=statue
     memorial=stele: ES:Tag:memorial=stele
     memorial=stolperstein: ES:Tag:memorial=stolperstein
     memorial=stone: ES:Tag:memorial=stone
     memorial=war_memorial: ES:Tag:memorial=war memorial
     memorial=statue: ES:Tag:memorial=statue
     memorial=stele: ES:Tag:memorial=stele
     memorial=stolperstein: ES:Tag:memorial=stolperstein
     memorial=stone: ES:Tag:memorial=stone
     memorial=war_memorial: ES:Tag:memorial=war memorial
+    military=airfield: ES:Tag:military=airfield
+    military=barracks: ES:Tag:military=barracks
+    military=base: ES:Tag:military=base
+    military=bunker: ES:Tag:military=bunker
+    military=checkpoint: ES:Tag:military=checkpoint
+    military=danger_area: ES:Tag:military=danger area
     military=naval_base: ES:Tag:military=naval base
     military=naval_base: ES:Tag:military=naval base
+    military=nuclear_explosion_site: ES:Tag:military=nuclear explosion site
+    military=obstacle_course: ES:Tag:military=obstacle course
+    military=office: ES:Tag:military=office
+    military=range: ES:Tag:military=range
     military=training_area: ES:Tag:military=training area
     military=training_area: ES:Tag:military=training area
+    military=trench: ES:Tag:military=trench
+    mooring=guest: ES:Tag:mooring=guest
+    mountain_pass=yes: ES:Tag:mountain pass=yes
+    name:signed=no: ES:Tag:name:signed=no
     name=Dollarama: ES:Tag:name=Dollarama
     name=Herfy: ES:Tag:name=Herfy
     name=Dollarama: ES:Tag:name=Dollarama
     name=Herfy: ES:Tag:name=Herfy
+    name=The_Church_of_Jesus_Christ_of_Latter-day_Saints: ES:Tag:name=The Church of
+      Jesus Christ of Latter-day Saints
+    narrow=yes: ES:Tag:narrow=yes
+    natural=anthill: ES:Tag:natural=anthill
+    natural=arch: ES:Tag:natural=arch
     natural=arete: ES:Tag:natural=arete
     natural=arete: ES:Tag:natural=arete
+    natural=atoll: ES:Tag:natural=atoll
     natural=avalanche_dam: ES:Tag:natural=avalanche dam
     natural=bare_rock: ES:Tag:natural=bare rock
     natural=bay: ES:Tag:natural=bay
     natural=beach: ES:Tag:natural=beach
     natural=avalanche_dam: ES:Tag:natural=avalanche dam
     natural=bare_rock: ES:Tag:natural=bare rock
     natural=bay: ES:Tag:natural=bay
     natural=beach: ES:Tag:natural=beach
+    natural=birds_nest: ES:Tag:natural=birds nest
     natural=blowhole: ES:Tag:natural=blowhole
     natural=blowhole: ES:Tag:natural=blowhole
+    natural=cape: ES:Tag:natural=cape
     natural=cave_entrance: ES:Tag:natural=cave entrance
     natural=cliff: ES:Tag:natural=cliff
     natural=coastline: ES:Tag:natural=coastline
     natural=cave_entrance: ES:Tag:natural=cave entrance
     natural=cliff: ES:Tag:natural=cliff
     natural=coastline: ES:Tag:natural=coastline
+    natural=col: ES:Tag:natural=col
+    natural=couloir: ES:Tag:natural=couloir
+    natural=crevasse: ES:Tag:natural=crevasse
     natural=desert: ES:Tag:natural=desert
     natural=desert: ES:Tag:natural=desert
+    natural=dune: ES:Tag:natural=dune
     natural=earth_bank: ES:Tag:natural=earth bank
     natural=esker: ES:Tag:natural=esker
     natural=fell: ES:Tag:natural=fell
     natural=earth_bank: ES:Tag:natural=earth bank
     natural=esker: ES:Tag:natural=esker
     natural=fell: ES:Tag:natural=fell
+    natural=fumarole: ES:Tag:natural=fumarole
+    natural=geothermal: ES:Tag:natural=geothermal
+    natural=geothermal_area: ES:Tag:natural=geothermal area
+    natural=geothermal_field: ES:Tag:natural=geothermal field
     natural=geyser: ES:Tag:natural=geyser
     natural=glacier: ES:Tag:natural=glacier
     natural=gorge: ES:Tag:natural=gorge
     natural=geyser: ES:Tag:natural=geyser
     natural=glacier: ES:Tag:natural=glacier
     natural=gorge: ES:Tag:natural=gorge
+    natural=grass: ES:Tag:natural=grass
     natural=grassland: ES:Tag:natural=grassland
     natural=grassland: ES:Tag:natural=grassland
+    natural=gully: ES:Tag:natural=gully
     natural=heath: ES:Tag:natural=heath
     natural=hill: ES:Tag:natural=hill
     natural=heath: ES:Tag:natural=heath
     natural=hill: ES:Tag:natural=hill
+    natural=hot_spring: ES:Tag:natural=hot spring
+    natural=isthmus: ES:Tag:natural=isthmus
+    natural=landform: ES:Tag:natural=landform
+    natural=landslide: ES:Tag:natural=landslide
     natural=meadow: ES:Tag:natural=meadow
     natural=moor: ES:Tag:natural=moor
     natural=meadow: ES:Tag:natural=meadow
     natural=moor: ES:Tag:natural=moor
+    natural=mountain_range: ES:Tag:natural=mountain range
     natural=mud: ES:Tag:natural=mud
     natural=naled: ES:Tag:natural=naled
     natural=peak: ES:Tag:natural=peak
     natural=mud: ES:Tag:natural=mud
     natural=naled: ES:Tag:natural=naled
     natural=peak: ES:Tag:natural=peak
+    natural=peninsula: ES:Tag:natural=peninsula
+    natural=plant: ES:Tag:natural=plant
+    natural=reef: ES:Tag:natural=reef
     natural=ridge: ES:Tag:natural=ridge
     natural=riverbed: ES:Tag:natural=riverbed
     natural=rock: ES:Tag:natural=rock
     natural=ridge: ES:Tag:natural=ridge
     natural=riverbed: ES:Tag:natural=riverbed
     natural=rock: ES:Tag:natural=rock
@@ -12063,14 +16926,21 @@ es:
     natural=scree: ES:Tag:natural=scree
     natural=scrub: ES:Tag:natural=scrub
     natural=shingle: ES:Tag:natural=shingle
     natural=scree: ES:Tag:natural=scree
     natural=scrub: ES:Tag:natural=scrub
     natural=shingle: ES:Tag:natural=shingle
+    natural=shoal: ES:Tag:natural=shoal
+    natural=shrub: ES:Tag:natural=shrub
+    natural=shrubbery: ES:Tag:natural=shrubbery
     natural=sinkhole: ES:Tag:natural=sinkhole
     natural=spring: ES:Tag:natural=spring
     natural=stone: ES:Tag:natural=stone
     natural=sinkhole: ES:Tag:natural=sinkhole
     natural=spring: ES:Tag:natural=spring
     natural=stone: ES:Tag:natural=stone
+    natural=strait: ES:Tag:natural=strait
+    natural=termite_mound: ES:Tag:natural=termite mound
     natural=tree: ES:Tag:natural=tree
     natural=tree_row: ES:Tag:natural=tree row
     natural=tree_stump: ES:Tag:natural=tree stump
     natural=tree: ES:Tag:natural=tree
     natural=tree_row: ES:Tag:natural=tree row
     natural=tree_stump: ES:Tag:natural=tree stump
+    natural=tundra: ES:Tag:natural=tundra
     natural=valley: ES:Tag:natural=valley
     natural=volcano: ES:Tag:natural=volcano
     natural=valley: ES:Tag:natural=valley
     natural=volcano: ES:Tag:natural=volcano
+    natural=wallow: ES:Tag:natural=wallow
     natural=water: ES:Tag:natural=water
     natural=wetland: ES:Tag:natural=wetland
     natural=wood: ES:Tag:natural=wood
     natural=water: ES:Tag:natural=water
     natural=wetland: ES:Tag:natural=wetland
     natural=wood: ES:Tag:natural=wood
@@ -12079,24 +16949,33 @@ es:
     network=VE:R:PO: ES:Tag:network=VE:R:PO
     network=VE:T:PO: ES:Tag:network=VE:T:PO
     network=VE:ramal:portuguesa: ES:Tag:network=VE:ramal:portuguesa
     network=VE:R:PO: ES:Tag:network=VE:R:PO
     network=VE:T:PO: ES:Tag:network=VE:T:PO
     network=VE:ramal:portuguesa: ES:Tag:network=VE:ramal:portuguesa
+    noexit=yes: ES:Tag:noexit=yes
+    noname=yes: ES:Tag:noname=yes
     office=accountant: ES:Tag:office=accountant
     office=administrative: ES:Tag:office=administrative
     office=advertising_agency: ES:Tag:office=advertising agency
     office=architect: ES:Tag:office=architect
     office=association: ES:Tag:office=association
     office=accountant: ES:Tag:office=accountant
     office=administrative: ES:Tag:office=administrative
     office=advertising_agency: ES:Tag:office=advertising agency
     office=architect: ES:Tag:office=architect
     office=association: ES:Tag:office=association
+    office=chamber: ES:Tag:office=chamber
     office=charity: ES:Tag:office=charity
     office=company: ES:Tag:office=company
     office=charity: ES:Tag:office=charity
     office=company: ES:Tag:office=company
+    office=construction_company: ES:Tag:office=construction company
     office=consulting: ES:Tag:office=consulting
     office=consulting: ES:Tag:office=consulting
+    office=courier: ES:Tag:office=courier
     office=coworking: ES:Tag:office=coworking
     office=coworking: ES:Tag:office=coworking
+    office=diplomatic: ES:Tag:office=diplomatic
     office=educational_institution: ES:Tag:office=educational institution
     office=employment_agency: ES:Tag:office=employment agency
     office=energy_supplier: ES:Tag:office=energy supplier
     office=engineer: ES:Tag:office=engineer
     office=estate_agent: ES:Tag:office=estate agent
     office=financial: ES:Tag:office=financial
     office=educational_institution: ES:Tag:office=educational institution
     office=employment_agency: ES:Tag:office=employment agency
     office=energy_supplier: ES:Tag:office=energy supplier
     office=engineer: ES:Tag:office=engineer
     office=estate_agent: ES:Tag:office=estate agent
     office=financial: ES:Tag:office=financial
+    office=financial_advisor: ES:Tag:office=financial advisor
     office=forestry: ES:Tag:office=forestry
     office=foundation: ES:Tag:office=foundation
     office=forestry: ES:Tag:office=forestry
     office=foundation: ES:Tag:office=foundation
+    office=geodesist: ES:Tag:office=geodesist
     office=government: ES:Tag:office=government
     office=government: ES:Tag:office=government
+    office=graphic_design: ES:Tag:office=graphic design
     office=guide: ES:Tag:office=guide
     office=insurance: ES:Tag:office=insurance
     office=it: ES:Tag:office=it
     office=guide: ES:Tag:office=guide
     office=insurance: ES:Tag:office=insurance
     office=it: ES:Tag:office=it
@@ -12109,24 +16988,38 @@ es:
     office=occupational_safety: ES:Tag:office=occupational safety
     office=parish: ES:Tag:office=parish
     office=political_party: ES:Tag:office=political party
     office=occupational_safety: ES:Tag:office=occupational safety
     office=parish: ES:Tag:office=parish
     office=political_party: ES:Tag:office=political party
+    office=politician: ES:Tag:office=politician
     office=private_investigator: ES:Tag:office=private investigator
     office=property_management: ES:Tag:office=property management
     office=private_investigator: ES:Tag:office=private investigator
     office=property_management: ES:Tag:office=property management
+    office=publisher: ES:Tag:office=publisher
     office=quango: ES:Tag:office=quango
     office=religion: ES:Tag:office=religion
     office=research: ES:Tag:office=research
     office=quango: ES:Tag:office=quango
     office=religion: ES:Tag:office=religion
     office=research: ES:Tag:office=research
+    office=security: ES:Tag:office=security
     office=surveyor: ES:Tag:office=surveyor
     office=tax: ES:Tag:office=tax
     office=tax_advisor: ES:Tag:office=tax advisor
     office=telecommunication: ES:Tag:office=telecommunication
     office=therapist: ES:Tag:office=therapist
     office=travel_agent: ES:Tag:office=travel agent
     office=surveyor: ES:Tag:office=surveyor
     office=tax: ES:Tag:office=tax
     office=tax_advisor: ES:Tag:office=tax advisor
     office=telecommunication: ES:Tag:office=telecommunication
     office=therapist: ES:Tag:office=therapist
     office=travel_agent: ES:Tag:office=travel agent
+    office=union: ES:Tag:office=union
     office=visa: ES:Tag:office=visa
     office=water_utility: ES:Tag:office=water utility
     office=yes: ES:Tag:office=yes
     office=visa: ES:Tag:office=visa
     office=water_utility: ES:Tag:office=water utility
     office=yes: ES:Tag:office=yes
+    oneway:bicycle=yes: ES:Tag:oneway:bicycle=yes
+    oneway=-1: ES:Tag:oneway=-1
     oneway=reversible: ES:Tag:oneway=reversible
     oneway=reversible: ES:Tag:oneway=reversible
+    oneway=yes: ES:Tag:oneway=yes
+    opening_hours=24/7: ES:Tag:opening hours=24/7
     operator=GRDF: ES:Tag:operator=GRDF
     operator=GRDF: ES:Tag:operator=GRDF
+    parking=lane: ES:Tag:parking=lane
+    parking=multi-storey: ES:Tag:parking=multi-storey
     parking=street_side: ES:Tag:parking=street side
     parking=street_side: ES:Tag:parking=street side
+    parking=surface: ES:Tag:parking=surface
+    parking=underground: ES:Tag:parking=underground
     passenger=yes: ES:Tag:passenger=yes
     passenger=yes: ES:Tag:passenger=yes
+    passing_places=yes: ES:Tag:passing places=yes
+    physically_present=no: ES:Tag:physically present=no
     place=allotments: ES:Tag:place=allotments
     place=archipelago: ES:Tag:place=archipelago
     place=borough: ES:Tag:place=borough
     place=allotments: ES:Tag:place=allotments
     place=archipelago: ES:Tag:place=archipelago
     place=borough: ES:Tag:place=borough
@@ -12155,6 +17048,11 @@ es:
     place=suburb: ES:Tag:place=suburb
     place=town: ES:Tag:place=town
     place=village: ES:Tag:place=village
     place=suburb: ES:Tag:place=suburb
     place=town: ES:Tag:place=town
     place=village: ES:Tag:place=village
+    plant:method=photovoltaic: ES:Tag:plant:method=photovoltaic
+    plant:method=thermal: ES:Tag:plant:method=thermal
+    plant:source=solar: ES:Tag:plant:source=solar
+    playground=hopscotch: ES:Tag:playground=hopscotch
+    playground=structure: ES:Tag:playground=structure
     police=barracks: ES:Tag:police=barracks
     police=car_pound: ES:Tag:police=car pound
     police=checkpoint: ES:Tag:police=checkpoint
     police=barracks: ES:Tag:police=barracks
     police=car_pound: ES:Tag:police=car pound
     police=checkpoint: ES:Tag:police=checkpoint
@@ -12165,13 +17063,36 @@ es:
     police=storage: ES:Tag:police=storage
     police=training_area: ES:Tag:police=training area
     police=yes: ES:Tag:police=yes
     police=storage: ES:Tag:police=storage
     police=training_area: ES:Tag:police=training area
     police=yes: ES:Tag:police=yes
+    power=cable: ES:Tag:power=cable
+    power=catenary_mast: ES:Tag:power=catenary mast
+    power=compensator: ES:Tag:power=compensator
+    power=connection: ES:Tag:power=connection
+    power=converter: ES:Tag:power=converter
     power=generator: ES:Tag:power=generator
     power=heliostat: ES:Tag:power=heliostat
     power=generator: ES:Tag:power=generator
     power=heliostat: ES:Tag:power=heliostat
+    power=insulator: ES:Tag:power=insulator
     power=line: ES:Tag:power=line
     power=line: ES:Tag:power=line
+    power=minor_line: ES:Tag:power=minor line
+    power=plant: ES:Tag:power=plant
     power=pole: ES:Tag:power=pole
     power=pole: ES:Tag:power=pole
+    power=portal: ES:Tag:power=portal
     power=substation: ES:Tag:power=substation
     power=substation: ES:Tag:power=substation
+    power=switch: ES:Tag:power=switch
+    power=switchgear: ES:Tag:power=switchgear
+    power=terminal: ES:Tag:power=terminal
     power=tower: ES:Tag:power=tower
     power=transformer: ES:Tag:power=transformer
     power=tower: ES:Tag:power=tower
     power=transformer: ES:Tag:power=transformer
+    protect_class=11: ES:Tag:protect class=11
+    protect_class=13: ES:Tag:protect class=13
+    protect_class=19: ES:Tag:protect class=19
+    protect_class=1a: ES:Tag:protect class=1a
+    protect_class=1b: ES:Tag:protect class=1b
+    protect_class=2: ES:Tag:protect class=2
+    protect_class=21: ES:Tag:protect class=21
+    protect_class=3: ES:Tag:protect class=3
+    protect_class=4: ES:Tag:protect class=4
+    protect_class=5: ES:Tag:protect class=5
+    protect_class=6: ES:Tag:protect class=6
     public_transport=platform: ES:Tag:public transport=platform
     public_transport=station: ES:Tag:public transport=station
     public_transport=stop_area: ES:Tag:public transport=stop area
     public_transport=platform: ES:Tag:public transport=platform
     public_transport=station: ES:Tag:public transport=station
     public_transport=stop_area: ES:Tag:public transport=stop area
@@ -12179,30 +17100,72 @@ es:
     pump=manual: ES:Tag:pump=manual
     pump=no: ES:Tag:pump=no
     pump=powered: ES:Tag:pump=powered
     pump=manual: ES:Tag:pump=manual
     pump=no: ES:Tag:pump=no
     pump=powered: ES:Tag:pump=powered
+    railway=abandoned: ES:Tag:railway=abandoned
+    railway=buffer_stop: ES:Tag:railway=buffer stop
+    railway=construction: ES:Tag:railway=construction
     railway=crossing: ES:Tag:railway=crossing
     railway=crossing: ES:Tag:railway=crossing
+    railway=crossing_box: ES:Tag:railway=crossing box
+    railway=derail: ES:Tag:railway=derail
     railway=disused: ES:Tag:railway=disused
     railway=disused: ES:Tag:railway=disused
+    railway=funicular: ES:Tag:railway=funicular
+    railway=halt: ES:Tag:railway=halt
     railway=level_crossing: ES:Tag:railway=level crossing
     railway=light_rail: ES:Tag:railway=light rail
     railway=milestone: ES:Tag:railway=milestone
     railway=level_crossing: ES:Tag:railway=level crossing
     railway=light_rail: ES:Tag:railway=light rail
     railway=milestone: ES:Tag:railway=milestone
+    railway=miniature: ES:Tag:railway=miniature
     railway=monorail: ES:Tag:railway=monorail
     railway=narrow_gauge: ES:Tag:railway=narrow gauge
     railway=platform: ES:Tag:railway=platform
     railway=monorail: ES:Tag:railway=monorail
     railway=narrow_gauge: ES:Tag:railway=narrow gauge
     railway=platform: ES:Tag:railway=platform
+    railway=preserved: ES:Tag:railway=preserved
     railway=rail: ES:Tag:railway=rail
     railway=rail: ES:Tag:railway=rail
+    railway=railway_crossing: ES:Tag:railway=railway crossing
+    railway=roundhouse: ES:Tag:railway=roundhouse
+    railway=signal: ES:Tag:railway=signal
+    railway=signal_box: ES:Tag:railway=signal box
     railway=station: ES:Tag:railway=station
     railway=station: ES:Tag:railway=station
+    railway=stop: ES:Tag:railway=stop
     railway=subway: ES:Tag:railway=subway
     railway=subway_entrance: ES:Tag:railway=subway entrance
     railway=subway: ES:Tag:railway=subway
     railway=subway_entrance: ES:Tag:railway=subway entrance
+    railway=switch: ES:Tag:railway=switch
+    railway=train_station_entrance: ES:Tag:railway=train station entrance
     railway=tram: ES:Tag:railway=tram
     railway=tram: ES:Tag:railway=tram
+    railway=tram_level_crossing: ES:Tag:railway=tram level crossing
     railway=tram_stop: ES:Tag:railway=tram stop
     railway=tram_stop: ES:Tag:railway=tram stop
+    railway=traverser: ES:Tag:railway=traverser
+    railway=turntable: ES:Tag:railway=turntable
+    railway=wash: ES:Tag:railway=wash
+    railway=water_crane: ES:Tag:railway=water crane
     railway=yard: ES:Tag:railway=yard
     railway=yard: ES:Tag:railway=yard
+    recycling_type=centre: ES:Tag:recycling type=centre
     religion=christian: ES:Tag:religion=christian
     religion=christian: ES:Tag:religion=christian
+    residential=apartments: ES:Tag:residential=apartments
+    residential=halting_site: ES:Tag:residential=halting site
+    residential=rural: ES:Tag:residential=rural
+    residential=trailer_park: ES:Tag:residential=trailer park
     residential=university: ES:Tag:residential=university
     residential=university: ES:Tag:residential=university
+    residential=urban: ES:Tag:residential=urban
+    resource=aggregate: ES:Tag:resource=aggregate
+    resource=gravel: ES:Tag:resource=gravel
+    resource=sand: ES:Tag:resource=sand
     roller_coaster=track: ES:Tag:roller coaster=track
     roller_coaster=track: ES:Tag:roller coaster=track
+    roof:shape=side_hipped: ES:Tag:roof:shape=side hipped
+    route=bicycle: ES:Tag:route=bicycle
     route=bus: ES:Tag:route=bus
     route=bus: ES:Tag:route=bus
+    route=canoe: ES:Tag:route=canoe
+    route=detour: ES:Tag:route=detour
     route=ferry: ES:Tag:route=ferry
     route=ferry: ES:Tag:route=ferry
+    route=foot: ES:Tag:route=foot
+    route=hiking: ES:Tag:route=hiking
+    route=horse: ES:Tag:route=horse
+    route=inline_skates: ES:Tag:route=inline skates
     route=light_rail: ES:Tag:route=light rail
     route=monorail: ES:Tag:route=monorail
     route=light_rail: ES:Tag:route=light rail
     route=monorail: ES:Tag:route=monorail
+    route=mtb: ES:Tag:route=mtb
+    route=piste: ES:Tag:route=piste
     route=railway: ES:Tag:route=railway
     route=road: ES:Tag:route=road
     route=railway: ES:Tag:route=railway
     route=road: ES:Tag:route=road
+    route=running: ES:Tag:route=running
+    route=ski: ES:Tag:route=ski
     route=subway: ES:Tag:route=subway
     route=train: ES:Tag:route=train
     route=tram: ES:Tag:route=tram
     route=subway: ES:Tag:route=subway
     route=train: ES:Tag:route=train
     route=tram: ES:Tag:route=tram
@@ -12211,168 +17174,449 @@ es:
     route=worship: ES:Tag:route=worship
     service=aircraft_control: ES:Tag:service=aircraft control
     service=alley: ES:Tag:service=alley
     route=worship: ES:Tag:route=worship
     service=aircraft_control: ES:Tag:service=aircraft control
     service=alley: ES:Tag:service=alley
+    service=busway: ES:Tag:service=busway
     service=crossover: ES:Tag:service=crossover
     service=drive-through: ES:Tag:service=drive-through
     service=driveway: ES:Tag:service=driveway
     service=emergency_access: ES:Tag:service=emergency access
     service=parking_aisle: ES:Tag:service=parking aisle
     service=siding: ES:Tag:service=siding
     service=crossover: ES:Tag:service=crossover
     service=drive-through: ES:Tag:service=drive-through
     service=driveway: ES:Tag:service=driveway
     service=emergency_access: ES:Tag:service=emergency access
     service=parking_aisle: ES:Tag:service=parking aisle
     service=siding: ES:Tag:service=siding
+    service=spur: ES:Tag:service=spur
+    service=yard: ES:Tag:service=yard
+    shelter_type=Wetterpilz: ES:Tag:shelter type=Wetterpilz
     shelter_type=basic_hut: ES:Tag:shelter type=basic hut
     shelter_type=basic_hut: ES:Tag:shelter type=basic hut
+    shelter_type=changing_rooms: ES:Tag:shelter type=changing rooms
+    shelter_type=field_shelter: ES:Tag:shelter type=field shelter
+    shelter_type=gazebo: ES:Tag:shelter type=gazebo
     shelter_type=lean_to: ES:Tag:shelter type=lean to
     shelter_type=lean_to: ES:Tag:shelter type=lean to
+    shelter_type=pavilion: ES:Tag:shelter type=pavilion
     shelter_type=public_transport: ES:Tag:shelter type=public transport
     shop=agrarian: ES:Tag:shop=agrarian
     shop=alcohol: ES:Tag:shop=alcohol
     shelter_type=public_transport: ES:Tag:shelter type=public transport
     shop=agrarian: ES:Tag:shop=agrarian
     shop=alcohol: ES:Tag:shop=alcohol
+    shop=anime: ES:Tag:shop=anime
+    shop=antiques: ES:Tag:shop=antiques
     shop=appliance: ES:Tag:shop=appliance
     shop=art: ES:Tag:shop=art
     shop=appliance: ES:Tag:shop=appliance
     shop=art: ES:Tag:shop=art
+    shop=atv: ES:Tag:shop=atv
     shop=baby_goods: ES:Tag:shop=baby goods
     shop=baby_goods: ES:Tag:shop=baby goods
+    shop=bag: ES:Tag:shop=bag
     shop=bakery: ES:Tag:shop=bakery
     shop=bathroom_furnishing: ES:Tag:shop=bathroom furnishing
     shop=bakery: ES:Tag:shop=bakery
     shop=bathroom_furnishing: ES:Tag:shop=bathroom furnishing
+    shop=bbq: ES:Tag:shop=bbq
+    shop=beauty: ES:Tag:shop=beauty
     shop=bed: ES:Tag:shop=bed
     shop=beverages: ES:Tag:shop=beverages
     shop=bicycle: ES:Tag:shop=bicycle
     shop=bed: ES:Tag:shop=bed
     shop=beverages: ES:Tag:shop=beverages
     shop=bicycle: ES:Tag:shop=bicycle
+    shop=boat: ES:Tag:shop=boat
+    shop=boat_parts: ES:Tag:shop=boat parts
+    shop=boat_repair: ES:Tag:shop=boat repair
     shop=bookmaker: ES:Tag:shop=bookmaker
     shop=books: ES:Tag:shop=books
     shop=bookmaker: ES:Tag:shop=bookmaker
     shop=books: ES:Tag:shop=books
+    shop=boutique: ES:Tag:shop=boutique
+    shop=brewing_supplies: ES:Tag:shop=brewing supplies
     shop=butcher: ES:Tag:shop=butcher
     shop=butcher: ES:Tag:shop=butcher
+    shop=camera: ES:Tag:shop=camera
+    shop=candles: ES:Tag:shop=candles
+    shop=cannabis: ES:Tag:shop=cannabis
+    shop=canoe_hire: ES:Tag:shop=canoe hire
     shop=car: ES:Tag:shop=car
     shop=car_parts: ES:Tag:shop=car parts
     shop=car_repair: ES:Tag:shop=car repair
     shop=car: ES:Tag:shop=car
     shop=car_parts: ES:Tag:shop=car parts
     shop=car_repair: ES:Tag:shop=car repair
+    shop=caravan: ES:Tag:shop=caravan
     shop=carpet: ES:Tag:shop=carpet
     shop=charity: ES:Tag:shop=charity
     shop=carpet: ES:Tag:shop=carpet
     shop=charity: ES:Tag:shop=charity
+    shop=cheese: ES:Tag:shop=cheese
     shop=chemist: ES:Tag:shop=chemist
     shop=chocolate: ES:Tag:shop=chocolate
     shop=clothes: ES:Tag:shop=clothes
     shop=chemist: ES:Tag:shop=chemist
     shop=chocolate: ES:Tag:shop=chocolate
     shop=clothes: ES:Tag:shop=clothes
+    shop=coffee: ES:Tag:shop=coffee
     shop=collector: ES:Tag:shop=collector
     shop=computer: ES:Tag:shop=computer
     shop=confectionery: ES:Tag:shop=confectionery
     shop=convenience: ES:Tag:shop=convenience
     shop=copyshop: ES:Tag:shop=copyshop
     shop=collector: ES:Tag:shop=collector
     shop=computer: ES:Tag:shop=computer
     shop=confectionery: ES:Tag:shop=confectionery
     shop=convenience: ES:Tag:shop=convenience
     shop=copyshop: ES:Tag:shop=copyshop
+    shop=cosmetics: ES:Tag:shop=cosmetics
+    shop=country_store: ES:Tag:shop=country store
     shop=craft: ES:Tag:shop=craft
     shop=craft: ES:Tag:shop=craft
+    shop=curtain: ES:Tag:shop=curtain
     shop=dairy: ES:Tag:shop=dairy
     shop=deli: ES:Tag:shop=deli
     shop=dairy: ES:Tag:shop=dairy
     shop=deli: ES:Tag:shop=deli
+    shop=dentures: ES:Tag:shop=dentures
     shop=department_store: ES:Tag:shop=department store
     shop=doityourself: ES:Tag:shop=doityourself
     shop=department_store: ES:Tag:shop=department store
     shop=doityourself: ES:Tag:shop=doityourself
+    shop=doors: ES:Tag:shop=doors
+    shop=dry_cleaning: ES:Tag:shop=dry cleaning
+    shop=e-cigarette: ES:Tag:shop=e-cigarette
     shop=electrical: ES:Tag:shop=electrical
     shop=electronics: ES:Tag:shop=electronics
     shop=energy: ES:Tag:shop=energy
     shop=electrical: ES:Tag:shop=electrical
     shop=electronics: ES:Tag:shop=electronics
     shop=energy: ES:Tag:shop=energy
+    shop=equestrian: ES:Tag:shop=equestrian
     shop=erotic: ES:Tag:shop=erotic
     shop=erotic: ES:Tag:shop=erotic
+    shop=esoteric: ES:Tag:shop=esoteric
+    shop=estate_agent: ES:Tag:shop=estate agent
     shop=fabric: ES:Tag:shop=fabric
     shop=fabric: ES:Tag:shop=fabric
+    shop=farm: ES:Tag:shop=farm
+    shop=fashion: ES:Tag:shop=fashion
     shop=fashion_accessories: ES:Tag:shop=fashion accessories
     shop=fireplace: ES:Tag:shop=fireplace
     shop=fashion_accessories: ES:Tag:shop=fashion accessories
     shop=fireplace: ES:Tag:shop=fireplace
+    shop=fireworks: ES:Tag:shop=fireworks
     shop=fishing: ES:Tag:shop=fishing
     shop=fishing: ES:Tag:shop=fishing
+    shop=flooring: ES:Tag:shop=flooring
     shop=florist: ES:Tag:shop=florist
     shop=food: ES:Tag:shop=food
     shop=florist: ES:Tag:shop=florist
     shop=food: ES:Tag:shop=food
+    shop=frame: ES:Tag:shop=frame
+    shop=free_flying: ES:Tag:shop=free flying
+    shop=frozen_food: ES:Tag:shop=frozen food
+    shop=fuel: ES:Tag:shop=fuel
     shop=funeral_directors: ES:Tag:shop=funeral directors
     shop=furniture: ES:Tag:shop=furniture
     shop=games: ES:Tag:shop=games
     shop=garden_centre: ES:Tag:shop=garden centre
     shop=funeral_directors: ES:Tag:shop=funeral directors
     shop=furniture: ES:Tag:shop=furniture
     shop=games: ES:Tag:shop=games
     shop=garden_centre: ES:Tag:shop=garden centre
+    shop=garden_furniture: ES:Tag:shop=garden furniture
     shop=gas: ES:Tag:shop=gas
     shop=gas: ES:Tag:shop=gas
+    shop=general: ES:Tag:shop=general
     shop=gift: ES:Tag:shop=gift
     shop=glaziery: ES:Tag:shop=glaziery
     shop=gift: ES:Tag:shop=gift
     shop=glaziery: ES:Tag:shop=glaziery
+    shop=golf: ES:Tag:shop=golf
     shop=greengrocer: ES:Tag:shop=greengrocer
     shop=greengrocer: ES:Tag:shop=greengrocer
+    shop=grocery: ES:Tag:shop=grocery
+    shop=groundskeeping: ES:Tag:shop=groundskeeping
+    shop=haberdashery: ES:Tag:shop=haberdashery
     shop=hairdresser: ES:Tag:shop=hairdresser
     shop=hairdresser: ES:Tag:shop=hairdresser
+    shop=hairdresser_supply: ES:Tag:shop=hairdresser supply
     shop=hardware: ES:Tag:shop=hardware
     shop=health_food: ES:Tag:shop=health food
     shop=hearing_aids: ES:Tag:shop=hearing aids
     shop=hardware: ES:Tag:shop=hardware
     shop=health_food: ES:Tag:shop=health food
     shop=hearing_aids: ES:Tag:shop=hearing aids
+    shop=hifi: ES:Tag:shop=hifi
+    shop=honey: ES:Tag:shop=honey
+    shop=hookah: ES:Tag:shop=hookah
+    shop=household_linen: ES:Tag:shop=household linen
     shop=houseware: ES:Tag:shop=houseware
     shop=hunting: ES:Tag:shop=hunting
     shop=hvac: ES:Tag:shop=hvac
     shop=ice_cream: ES:Tag:shop=ice cream
     shop=insurance: ES:Tag:shop=insurance
     shop=houseware: ES:Tag:shop=houseware
     shop=hunting: ES:Tag:shop=hunting
     shop=hvac: ES:Tag:shop=hvac
     shop=ice_cream: ES:Tag:shop=ice cream
     shop=insurance: ES:Tag:shop=insurance
+    shop=interior_decoration: ES:Tag:shop=interior decoration
     shop=jetski: ES:Tag:shop=jetski
     shop=jewelry: ES:Tag:shop=jewelry
     shop=kiosk: ES:Tag:shop=kiosk
     shop=kitchen: ES:Tag:shop=kitchen
     shop=jetski: ES:Tag:shop=jetski
     shop=jewelry: ES:Tag:shop=jewelry
     shop=kiosk: ES:Tag:shop=kiosk
     shop=kitchen: ES:Tag:shop=kitchen
+    shop=lamps: ES:Tag:shop=lamps
     shop=laundry: ES:Tag:shop=laundry
     shop=laundry: ES:Tag:shop=laundry
+    shop=leather: ES:Tag:shop=leather
+    shop=lighting: ES:Tag:shop=lighting
     shop=locksmith: ES:Tag:shop=locksmith
     shop=lottery: ES:Tag:shop=lottery
     shop=mall: ES:Tag:shop=mall
     shop=locksmith: ES:Tag:shop=locksmith
     shop=lottery: ES:Tag:shop=lottery
     shop=mall: ES:Tag:shop=mall
+    shop=maps: ES:Tag:shop=maps
+    shop=massage: ES:Tag:shop=massage
     shop=medical: ES:Tag:shop=medical
     shop=medical_supply: ES:Tag:shop=medical supply
     shop=medical: ES:Tag:shop=medical
     shop=medical_supply: ES:Tag:shop=medical supply
+    shop=military_surplus: ES:Tag:shop=military surplus
+    shop=mobile_home: ES:Tag:shop=mobile home
     shop=mobile_phone: ES:Tag:shop=mobile phone
     shop=mobile_phone: ES:Tag:shop=mobile phone
+    shop=mobility_scooter: ES:Tag:shop=mobility scooter
     shop=model: ES:Tag:shop=model
     shop=model: ES:Tag:shop=model
+    shop=money_lender: ES:Tag:shop=money lender
     shop=motorcycle: ES:Tag:shop=motorcycle
     shop=motorcycle: ES:Tag:shop=motorcycle
+    shop=motorcycle_parts: ES:Tag:shop=motorcycle parts
     shop=motorcycle_repair: ES:Tag:shop=motorcycle repair
     shop=motorcycle_repair: ES:Tag:shop=motorcycle repair
+    shop=motorsports: ES:Tag:shop=motorsports
     shop=music: ES:Tag:shop=music
     shop=musical_instrument: ES:Tag:shop=musical instrument
     shop=music: ES:Tag:shop=music
     shop=musical_instrument: ES:Tag:shop=musical instrument
+    shop=newsagent: ES:Tag:shop=newsagent
+    shop=nutrition_supplements: ES:Tag:shop=nutrition supplements
     shop=nuts: ES:Tag:shop=nuts
     shop=optician: ES:Tag:shop=optician
     shop=nuts: ES:Tag:shop=nuts
     shop=optician: ES:Tag:shop=optician
+    shop=organic: ES:Tag:shop=organic
     shop=outdoor: ES:Tag:shop=outdoor
     shop=outdoor: ES:Tag:shop=outdoor
+    shop=outpost: ES:Tag:shop=outpost
     shop=paint: ES:Tag:shop=paint
     shop=party: ES:Tag:shop=party
     shop=paint: ES:Tag:shop=paint
     shop=party: ES:Tag:shop=party
+    shop=pasta: ES:Tag:shop=pasta
     shop=pastry: ES:Tag:shop=pastry
     shop=pawnbroker: ES:Tag:shop=pawnbroker
     shop=perfumery: ES:Tag:shop=perfumery
     shop=pastry: ES:Tag:shop=pastry
     shop=pawnbroker: ES:Tag:shop=pawnbroker
     shop=perfumery: ES:Tag:shop=perfumery
+    shop=pest_control: ES:Tag:shop=pest control
     shop=pet: ES:Tag:shop=pet
     shop=pet_grooming: ES:Tag:shop=pet grooming
     shop=photo: ES:Tag:shop=photo
     shop=pet: ES:Tag:shop=pet
     shop=pet_grooming: ES:Tag:shop=pet grooming
     shop=photo: ES:Tag:shop=photo
+    shop=plant_hire: ES:Tag:shop=plant hire
     shop=pottery: ES:Tag:shop=pottery
     shop=pottery: ES:Tag:shop=pottery
+    shop=power_tools: ES:Tag:shop=power tools
+    shop=printer_ink: ES:Tag:shop=printer ink
+    shop=printing: ES:Tag:shop=printing
+    shop=psychic: ES:Tag:shop=psychic
+    shop=pyrotechnics: ES:Tag:shop=pyrotechnics
     shop=radiotechnics: ES:Tag:shop=radiotechnics
     shop=radiotechnics: ES:Tag:shop=radiotechnics
+    shop=religion: ES:Tag:shop=religion
     shop=rental: ES:Tag:shop=rental
     shop=rental: ES:Tag:shop=rental
+    shop=repair: ES:Tag:shop=repair
     shop=rice: ES:Tag:shop=rice
     shop=rice: ES:Tag:shop=rice
+    shop=robot: ES:Tag:shop=robot
+    shop=scooter: ES:Tag:shop=scooter
+    shop=scuba_diving: ES:Tag:shop=scuba diving
     shop=seafood: ES:Tag:shop=seafood
     shop=second_hand: ES:Tag:shop=second hand
     shop=security: ES:Tag:shop=security
     shop=sewing: ES:Tag:shop=sewing
     shop=shoe_repair: ES:Tag:shop=shoe repair
     shop=shoes: ES:Tag:shop=shoes
     shop=seafood: ES:Tag:shop=seafood
     shop=second_hand: ES:Tag:shop=second hand
     shop=security: ES:Tag:shop=security
     shop=sewing: ES:Tag:shop=sewing
     shop=shoe_repair: ES:Tag:shop=shoe repair
     shop=shoes: ES:Tag:shop=shoes
+    shop=shopping_centre: ES:Tag:shop=shopping centre
+    shop=skate: ES:Tag:shop=skate
+    shop=ski: ES:Tag:shop=ski
+    shop=snowmobile: ES:Tag:shop=snowmobile
+    shop=souvenir: ES:Tag:shop=souvenir
+    shop=spices: ES:Tag:shop=spices
     shop=sports: ES:Tag:shop=sports
     shop=sports: ES:Tag:shop=sports
+    shop=stairs: ES:Tag:shop=stairs
     shop=stationery: ES:Tag:shop=stationery
     shop=storage_rental: ES:Tag:shop=storage rental
     shop=supermarket: ES:Tag:shop=supermarket
     shop=stationery: ES:Tag:shop=stationery
     shop=storage_rental: ES:Tag:shop=storage rental
     shop=supermarket: ES:Tag:shop=supermarket
+    shop=surf: ES:Tag:shop=surf
+    shop=swimming_pool: ES:Tag:shop=swimming pool
+    shop=tailor: ES:Tag:shop=tailor
     shop=tattoo: ES:Tag:shop=tattoo
     shop=tea: ES:Tag:shop=tea
     shop=tattoo: ES:Tag:shop=tattoo
     shop=tea: ES:Tag:shop=tea
+    shop=telecommunication: ES:Tag:shop=telecommunication
     shop=ticket: ES:Tag:shop=ticket
     shop=tiles: ES:Tag:shop=tiles
     shop=ticket: ES:Tag:shop=ticket
     shop=tiles: ES:Tag:shop=tiles
+    shop=tobacco: ES:Tag:shop=tobacco
+    shop=tool_hire: ES:Tag:shop=tool hire
     shop=toys: ES:Tag:shop=toys
     shop=toys: ES:Tag:shop=toys
+    shop=tractor: ES:Tag:shop=tractor
     shop=trade: ES:Tag:shop=trade
     shop=trade: ES:Tag:shop=trade
+    shop=trailer: ES:Tag:shop=trailer
     shop=travel_agency: ES:Tag:shop=travel agency
     shop=travel_agency: ES:Tag:shop=travel agency
+    shop=trophy: ES:Tag:shop=trophy
+    shop=truck: ES:Tag:shop=truck
+    shop=truck_repair: ES:Tag:shop=truck repair
     shop=tyres: ES:Tag:shop=tyres
     shop=vacant: ES:Tag:shop=vacant
     shop=tyres: ES:Tag:shop=tyres
     shop=vacant: ES:Tag:shop=vacant
+    shop=vacuum_cleaner: ES:Tag:shop=vacuum cleaner
     shop=variety_store: ES:Tag:shop=variety store
     shop=variety_store: ES:Tag:shop=variety store
+    shop=video: ES:Tag:shop=video
     shop=video_games: ES:Tag:shop=video games
     shop=watches: ES:Tag:shop=watches
     shop=water: ES:Tag:shop=water
     shop=video_games: ES:Tag:shop=video games
     shop=watches: ES:Tag:shop=watches
     shop=water: ES:Tag:shop=water
+    shop=water_sports: ES:Tag:shop=water sports
     shop=weapons: ES:Tag:shop=weapons
     shop=wholesale: ES:Tag:shop=wholesale
     shop=weapons: ES:Tag:shop=weapons
     shop=wholesale: ES:Tag:shop=wholesale
+    shop=wigs: ES:Tag:shop=wigs
     shop=window_blind: ES:Tag:shop=window blind
     shop=window_blind: ES:Tag:shop=window blind
+    shop=windows: ES:Tag:shop=windows
+    shop=wine: ES:Tag:shop=wine
+    shop=wool: ES:Tag:shop=wool
     shop=yes: ES:Tag:shop=yes
     sinkhole=estavelle: ES:Tag:sinkhole=estavelle
     shop=yes: ES:Tag:shop=yes
     sinkhole=estavelle: ES:Tag:sinkhole=estavelle
+    site_type=megalith: ES:Tag:site type=megalith
+    site_type=petroglyph: ES:Tag:site type=petroglyph
+    site_type=settlement: ES:Tag:site type=settlement
+    site_type=tumulus: ES:Tag:site type=tumulus
+    social_facility=assisted_living: ES:Tag:social facility=assisted living
     social_facility=clothing_bank: ES:Tag:social facility=clothing bank
     social_facility=food_bank: ES:Tag:social facility=food bank
     social_facility=clothing_bank: ES:Tag:social facility=clothing bank
     social_facility=food_bank: ES:Tag:social facility=food bank
+    social_facility=group_home: ES:Tag:social facility=group home
     social_facility=nursing_home: ES:Tag:social facility=nursing home
     social_facility=nursing_home: ES:Tag:social facility=nursing home
+    social_facility=outreach: ES:Tag:social facility=outreach
     social_facility=soup_kitchen: ES:Tag:social facility=soup kitchen
     source:geometry=Bing: ES:Tag:source:geometry=Bing
     social_facility=soup_kitchen: ES:Tag:social facility=soup kitchen
     source:geometry=Bing: ES:Tag:source:geometry=Bing
+    source=extrapolation: ES:Tag:source=extrapolation
+    source=historical: ES:Tag:source=historical
+    source=image: ES:Tag:source=image
+    source=knowledge: ES:Tag:source=knowledge
+    source=survey: ES:Tag:source=survey
+    source=voice: ES:Tag:source=voice
+    sport=10pin: ES:Tag:sport=10pin
+    sport=8pin: ES:Tag:sport=8pin
+    sport=9pin: ES:Tag:sport=9pin
+    sport=aikido: ES:Tag:sport=aikido
+    sport=american_football: ES:Tag:sport=american football
+    sport=american_handball: ES:Tag:sport=american handball
+    sport=archery: ES:Tag:sport=archery
+    sport=athletics: ES:Tag:sport=athletics
+    sport=australian_football: ES:Tag:sport=australian football
+    sport=badminton: ES:Tag:sport=badminton
+    sport=balle_pelote: ES:Tag:sport=balle pelote
+    sport=bandy: ES:Tag:sport=bandy
+    sport=baseball: ES:Tag:sport=baseball
+    sport=basketball: ES:Tag:sport=basketball
+    sport=batting_cage: ES:Tag:sport=batting cage
+    sport=beachvolleyball: ES:Tag:sport=beachvolleyball
+    sport=biathlon: ES:Tag:sport=biathlon
+    sport=billiards: ES:Tag:sport=billiards
+    sport=bmx: ES:Tag:sport=bmx
+    sport=bobsleigh: ES:Tag:sport=bobsleigh
     sport=boules: ES:Tag:sport=boules
     sport=boules: ES:Tag:sport=boules
+    sport=bowls: ES:Tag:sport=bowls
+    sport=boxing: ES:Tag:sport=boxing
     sport=bullfighting: ES:Tag:sport=bullfighting
     sport=bullfighting: ES:Tag:sport=bullfighting
+    sport=canadian_football: ES:Tag:sport=canadian football
+    sport=canoe: ES:Tag:sport=canoe
+    sport=canoe_polo: ES:Tag:sport=canoe polo
     sport=chess: ES:Tag:sport=chess
     sport=chess: ES:Tag:sport=chess
+    sport=cliff_diving: ES:Tag:sport=cliff diving
+    sport=climbing: ES:Tag:sport=climbing
+    sport=climbing_adventure: ES:Tag:sport=climbing adventure
+    sport=cockfighting: ES:Tag:sport=cockfighting
+    sport=cricket: ES:Tag:sport=cricket
+    sport=cricket_nets: ES:Tag:sport=cricket nets
+    sport=croquet: ES:Tag:sport=croquet
+    sport=crossfit: ES:Tag:sport=crossfit
+    sport=curling: ES:Tag:sport=curling
+    sport=cycle_polo: ES:Tag:sport=cycle polo
     sport=cycling: ES:Tag:sport=cycling
     sport=cycling: ES:Tag:sport=cycling
+    sport=darts: ES:Tag:sport=darts
+    sport=disc_golf: ES:Tag:sport=disc golf
+    sport=dog_agility: ES:Tag:sport=dog agility
+    sport=dog_racing: ES:Tag:sport=dog racing
     sport=equestrian: ES:Tag:sport=equestrian
     sport=equestrian: ES:Tag:sport=equestrian
+    sport=fencing: ES:Tag:sport=fencing
+    sport=field_hockey: ES:Tag:sport=field hockey
+    sport=fitness: ES:Tag:sport=fitness
+    sport=five-a-side: ES:Tag:sport=five-a-side
+    sport=floorball: ES:Tag:sport=floorball
+    sport=four_square: ES:Tag:sport=four square
+    sport=free_flying: ES:Tag:sport=free flying
     sport=futsal: ES:Tag:sport=futsal
     sport=futsal: ES:Tag:sport=futsal
+    sport=gaelic_games: ES:Tag:sport=gaelic games
+    sport=gaga: ES:Tag:sport=gaga
+    sport=golf: ES:Tag:sport=golf
+    sport=gymnastics: ES:Tag:sport=gymnastics
     sport=handball: ES:Tag:sport=handball
     sport=handball: ES:Tag:sport=handball
+    sport=hapkido: ES:Tag:sport=hapkido
+    sport=horse_racing: ES:Tag:sport=horse racing
+    sport=horseshoes: ES:Tag:sport=horseshoes
+    sport=ice_hockey: ES:Tag:sport=ice hockey
+    sport=ice_skating: ES:Tag:sport=ice skating
+    sport=ice_stock: ES:Tag:sport=ice stock
+    sport=judo: ES:Tag:sport=judo
+    sport=karate: ES:Tag:sport=karate
+    sport=karting: ES:Tag:sport=karting
+    sport=kickboxing: ES:Tag:sport=kickboxing
+    sport=kitesurfing: ES:Tag:sport=kitesurfing
+    sport=korfball: ES:Tag:sport=korfball
+    sport=krachtbal: ES:Tag:sport=krachtbal
+    sport=lacrosse: ES:Tag:sport=lacrosse
+    sport=laser_tag: ES:Tag:sport=laser tag
+    sport=long_jump: ES:Tag:sport=long jump
+    sport=martial_arts: ES:Tag:sport=martial arts
+    sport=miniature_golf: ES:Tag:sport=miniature golf
     sport=model_aerodrome: ES:Tag:sport=model aerodrome
     sport=motocross: ES:Tag:sport=motocross
     sport=motor: ES:Tag:sport=motor
     sport=multi: ES:Tag:sport=multi
     sport=model_aerodrome: ES:Tag:sport=model aerodrome
     sport=motocross: ES:Tag:sport=motocross
     sport=motor: ES:Tag:sport=motor
     sport=multi: ES:Tag:sport=multi
+    sport=netball: ES:Tag:sport=netball
+    sport=nine_mens_morris: ES:Tag:sport=nine mens morris
+    sport=obstacle_course: ES:Tag:sport=obstacle course
     sport=orienteering: ES:Tag:sport=orienteering
     sport=paddle_tennis: ES:Tag:sport=paddle tennis
     sport=padel: ES:Tag:sport=padel
     sport=paintball: ES:Tag:sport=paintball
     sport=orienteering: ES:Tag:sport=orienteering
     sport=paddle_tennis: ES:Tag:sport=paddle tennis
     sport=padel: ES:Tag:sport=padel
     sport=paintball: ES:Tag:sport=paintball
+    sport=parachuting: ES:Tag:sport=parachuting
+    sport=parkour: ES:Tag:sport=parkour
     sport=pelota: ES:Tag:sport=pelota
     sport=pelota: ES:Tag:sport=pelota
+    sport=pesäpallo: ES:Tag:sport=pesäpallo
+    sport=pickleball: ES:Tag:sport=pickleball
+    sport=pilates: ES:Tag:sport=pilates
+    sport=pole_dance: ES:Tag:sport=pole dance
+    sport=polo: ES:Tag:sport=polo
+    sport=racquet: ES:Tag:sport=racquet
+    sport=rc_car: ES:Tag:sport=rc car
+    sport=roller_hockey: ES:Tag:sport=roller hockey
+    sport=roller_skating: ES:Tag:sport=roller skating
+    sport=rowing: ES:Tag:sport=rowing
+    sport=rugby: ES:Tag:sport=rugby
+    sport=rugby_league: ES:Tag:sport=rugby league
+    sport=rugby_union: ES:Tag:sport=rugby union
+    sport=running: ES:Tag:sport=running
+    sport=safety_training: ES:Tag:sport=safety training
+    sport=sailing: ES:Tag:sport=sailing
+    sport=scuba_diving: ES:Tag:sport=scuba diving
     sport=shooting: ES:Tag:sport=shooting
     sport=shooting: ES:Tag:sport=shooting
+    sport=shot-put: ES:Tag:sport=shot-put
+    sport=shuffleboard: ES:Tag:sport=shuffleboard
+    sport=skateboard: ES:Tag:sport=skateboard
+    sport=ski_jumping: ES:Tag:sport=ski jumping
+    sport=skiing: ES:Tag:sport=skiing
+    sport=snooker: ES:Tag:sport=snooker
     sport=soccer: ES:Tag:sport=soccer
     sport=soccer: ES:Tag:sport=soccer
+    sport=softball: ES:Tag:sport=softball
+    sport=speedway: ES:Tag:sport=speedway
+    sport=squash: ES:Tag:sport=squash
+    sport=sumo: ES:Tag:sport=sumo
+    sport=surfing: ES:Tag:sport=surfing
+    sport=swimming: ES:Tag:sport=swimming
+    sport=table_soccer: ES:Tag:sport=table soccer
     sport=table_tennis: ES:Tag:sport=table tennis
     sport=table_tennis: ES:Tag:sport=table tennis
+    sport=taekwondo: ES:Tag:sport=taekwondo
+    sport=tennis: ES:Tag:sport=tennis
+    sport=tetherball: ES:Tag:sport=tetherball
+    sport=toboggan: ES:Tag:sport=toboggan
+    sport=trampoline: ES:Tag:sport=trampoline
+    sport=trugo: ES:Tag:sport=trugo
+    sport=ultimate: ES:Tag:sport=ultimate
+    sport=volleyball: ES:Tag:sport=volleyball
+    sport=wakeboarding: ES:Tag:sport=wakeboarding
     sport=water_polo: ES:Tag:sport=water polo
     sport=water_polo: ES:Tag:sport=water polo
+    sport=water_ski: ES:Tag:sport=water ski
+    sport=weightlifting: ES:Tag:sport=weightlifting
+    sport=wrestling: ES:Tag:sport=wrestling
+    sport=yoga: ES:Tag:sport=yoga
+    sport=zurkhaneh_sport: ES:Tag:sport=zurkhaneh sport
     station=subway: ES:Tag:station=subway
     station=subway: ES:Tag:station=subway
+    stile=stepover: ES:Tag:stile=stepover
     street_vendor=yes: ES:Tag:street vendor=yes
     street_vendor=yes: ES:Tag:street vendor=yes
+    substation=distribution: ES:Tag:substation=distribution
+    substation=minor_distribution: ES:Tag:substation=minor distribution
+    substation=transmission: ES:Tag:substation=transmission
+    surface=acrylic: ES:Tag:surface=acrylic
+    surface=artificial_turf: ES:Tag:surface=artificial turf
     surface=asphalt: ES:Tag:surface=asphalt
     surface=asphalt: ES:Tag:surface=asphalt
+    surface=carpet: ES:Tag:surface=carpet
+    surface=chipseal: ES:Tag:surface=chipseal
+    surface=clay: ES:Tag:surface=clay
+    surface=cobblestone: ES:Tag:surface=cobblestone
     surface=compacted: ES:Tag:surface=compacted
     surface=concrete: ES:Tag:surface=concrete
     surface=compacted: ES:Tag:surface=compacted
     surface=concrete: ES:Tag:surface=concrete
+    surface=concrete:lanes: ES:Tag:surface=concrete:lanes
+    surface=concrete:plates: ES:Tag:surface=concrete:plates
+    surface=dirt: ES:Tag:surface=dirt
+    surface=earth: ES:Tag:surface=earth
+    surface=fine_gravel: ES:Tag:surface=fine gravel
+    surface=grass: ES:Tag:surface=grass
+    surface=grass_paver: ES:Tag:surface=grass paver
+    surface=gravel: ES:Tag:surface=gravel
+    surface=ground: ES:Tag:surface=ground
+    surface=ice: ES:Tag:surface=ice
+    surface=metal: ES:Tag:surface=metal
+    surface=metal_grid: ES:Tag:surface=metal grid
+    surface=mud: ES:Tag:surface=mud
+    surface=paved: ES:Tag:surface=paved
+    surface=paving_stones: ES:Tag:surface=paving stones
+    surface=pebblestone: ES:Tag:surface=pebblestone
+    surface=rock: ES:Tag:surface=rock
+    surface=salt: ES:Tag:surface=salt
+    surface=sand: ES:Tag:surface=sand
+    surface=sett: ES:Tag:surface=sett
+    surface=snow: ES:Tag:surface=snow
+    surface=stepping_stones: ES:Tag:surface=stepping stones
     surface=tartan: ES:Tag:surface=tartan
     surface=tartan: ES:Tag:surface=tartan
+    surface=unhewn_cobblestone: ES:Tag:surface=unhewn cobblestone
     surface=unpaved: ES:Tag:surface=unpaved
     surface=unpaved: ES:Tag:surface=unpaved
+    surface=wood: ES:Tag:surface=wood
+    surface=woodchips: ES:Tag:surface=woodchips
     switch=disconnector: ES:Tag:switch=disconnector
     switch=disconnector: ES:Tag:switch=disconnector
+    tactile_paving=no: ES:Tag:tactile paving=no
+    tactile_paving=yes: ES:Tag:tactile paving=yes
     telecom=connection_point: ES:Tag:telecom=connection point
     telecom=connection_point: ES:Tag:telecom=connection point
+    telecom=data_center: ES:Tag:telecom=data center
+    telecom=distribution_point: ES:Tag:telecom=distribution point
+    telecom=exchange: ES:Tag:telecom=exchange
     telecom=service_device: ES:Tag:telecom=service device
     theatre:type=open_air: ES:Tag:theatre:type=open air
     telecom=service_device: ES:Tag:telecom=service device
     theatre:type=open_air: ES:Tag:theatre:type=open air
+    tidal=yes: ES:Tag:tidal=yes
+    toll=yes: ES:Tag:toll=yes
     tomb=cenotaph: ES:Tag:tomb=cenotaph
     tomb=columbarium: ES:Tag:tomb=columbarium
     tomb=mausoleum: ES:Tag:tomb=mausoleum
     tomb=cenotaph: ES:Tag:tomb=cenotaph
     tomb=columbarium: ES:Tag:tomb=columbarium
     tomb=mausoleum: ES:Tag:tomb=mausoleum
@@ -12384,7 +17628,9 @@ es:
     tourism=aquarium: ES:Tag:tourism=aquarium
     tourism=artwork: ES:Tag:tourism=artwork
     tourism=attraction: ES:Tag:tourism=attraction
     tourism=aquarium: ES:Tag:tourism=aquarium
     tourism=artwork: ES:Tag:tourism=artwork
     tourism=attraction: ES:Tag:tourism=attraction
+    tourism=camp_pitch: ES:Tag:tourism=camp pitch
     tourism=camp_site: ES:Tag:tourism=camp site
     tourism=camp_site: ES:Tag:tourism=camp site
+    tourism=caravan_site: ES:Tag:tourism=caravan site
     tourism=chalet: ES:Tag:tourism=chalet
     tourism=gallery: ES:Tag:tourism=gallery
     tourism=guest_house: ES:Tag:tourism=guest house
     tourism=chalet: ES:Tag:tourism=chalet
     tourism=gallery: ES:Tag:tourism=gallery
     tourism=guest_house: ES:Tag:tourism=guest house
@@ -12394,60 +17640,177 @@ es:
     tourism=motel: ES:Tag:tourism=motel
     tourism=museum: ES:Tag:tourism=museum
     tourism=picnic_site: ES:Tag:tourism=picnic site
     tourism=motel: ES:Tag:tourism=motel
     tourism=museum: ES:Tag:tourism=museum
     tourism=picnic_site: ES:Tag:tourism=picnic site
+    tourism=theme_park: ES:Tag:tourism=theme park
     tourism=trail_riding_station: ES:Tag:tourism=trail riding station
     tourism=viewpoint: ES:Tag:tourism=viewpoint
     tourism=wilderness_hut: ES:Tag:tourism=wilderness hut
     tourism=wine_cellar: ES:Tag:tourism=wine cellar
     tourism=trail_riding_station: ES:Tag:tourism=trail riding station
     tourism=viewpoint: ES:Tag:tourism=viewpoint
     tourism=wilderness_hut: ES:Tag:tourism=wilderness hut
     tourism=wine_cellar: ES:Tag:tourism=wine cellar
+    tourism=yes: ES:Tag:tourism=yes
+    tourism=zoo: ES:Tag:tourism=zoo
     tower:type=bell_tower: ES:Tag:tower:type=bell tower
     tower:type=communication: ES:Tag:tower:type=communication
     tower:type=cooling: ES:Tag:tower:type=cooling
     tower:type=defensive: ES:Tag:tower:type=defensive
     tower:type=bell_tower: ES:Tag:tower:type=bell tower
     tower:type=communication: ES:Tag:tower:type=communication
     tower:type=cooling: ES:Tag:tower:type=cooling
     tower:type=defensive: ES:Tag:tower:type=defensive
+    tower:type=lightning_protection: ES:Tag:tower:type=lightning protection
     tower:type=minaret: ES:Tag:tower:type=minaret
     tower:type=observation: ES:Tag:tower:type=observation
     tower:type=watchtower: ES:Tag:tower:type=watchtower
     tower:type=minaret: ES:Tag:tower:type=minaret
     tower:type=observation: ES:Tag:tower:type=observation
     tower:type=watchtower: ES:Tag:tower:type=watchtower
+    tracktype=grade1: ES:Tag:tracktype=grade1
+    tracktype=grade2: ES:Tag:tracktype=grade2
+    tracktype=grade3: ES:Tag:tracktype=grade3
+    tracktype=grade4: ES:Tag:tracktype=grade4
+    tracktype=grade5: ES:Tag:tracktype=grade5
+    traffic_calming=bump: ES:Tag:traffic calming=bump
+    traffic_calming=cushion: ES:Tag:traffic calming=cushion
+    traffic_calming=dip: ES:Tag:traffic calming=dip
+    traffic_calming=hump: ES:Tag:traffic calming=hump
     traffic_calming=island: ES:Tag:traffic calming=island
     traffic_calming=island: ES:Tag:traffic calming=island
+    traffic_calming=rumble_strip: ES:Tag:traffic calming=rumble strip
+    traffic_calming=table: ES:Tag:traffic calming=table
+    traffic_sign=city_limit: ES:Tag:traffic sign=city limit
+    transformer=distribution: ES:Tag:transformer=distribution
+    trees=apple_trees: ES:Tag:trees=apple trees
     trees=oil_palms: ES:Tag:trees=oil palms
     trees=oil_palms: ES:Tag:trees=oil palms
+    trees=olive_trees: ES:Tag:trees=olive trees
     tunnel=building_passage: ES:Tag:tunnel=building passage
     tunnel=culvert: ES:Tag:tunnel=culvert
     tunnel=building_passage: ES:Tag:tunnel=building passage
     tunnel=culvert: ES:Tag:tunnel=culvert
+    tunnel=flooded: ES:Tag:tunnel=flooded
+    tunnel=yes: ES:Tag:tunnel=yes
     type=public_transport: ES:Tag:type=public transport
     type=waterway: ES:Tag:type=waterway
     type=public_transport: ES:Tag:type=public transport
     type=waterway: ES:Tag:type=waterway
+    usage=main: ES:Tag:usage=main
+    vending=SIM_cards: ES:Tag:vending=SIM cards
+    vending=admission_tickets: ES:Tag:vending=admission tickets
+    vending=animal_feed: ES:Tag:vending=animal feed
+    vending=art: ES:Tag:vending=art
+    vending=bicycle_tube: ES:Tag:vending=bicycle tube
     vending=books: ES:Tag:vending=books
     vending=books: ES:Tag:vending=books
+    vending=bottle_return: ES:Tag:vending=bottle return
     vending=bread: ES:Tag:vending=bread
     vending=bread: ES:Tag:vending=bread
+    vending=candles: ES:Tag:vending=candles
     vending=chemist: ES:Tag:vending=chemist
     vending=chemist: ES:Tag:vending=chemist
+    vending=chewing_gums: ES:Tag:vending=chewing gums
+    vending=cigarettes: ES:Tag:vending=cigarettes
+    vending=coffee: ES:Tag:vending=coffee
     vending=condoms: ES:Tag:vending=condoms
     vending=condoms: ES:Tag:vending=condoms
+    vending=contact_lenses: ES:Tag:vending=contact lenses
+    vending=drinks: ES:Tag:vending=drinks
+    vending=e-cigarettes: ES:Tag:vending=e-cigarettes
+    vending=electronics: ES:Tag:vending=electronics
+    vending=elongated_coin: ES:Tag:vending=elongated coin
     vending=excrement_bags: ES:Tag:vending=excrement bags
     vending=excrement_bags: ES:Tag:vending=excrement bags
+    vending=feminine_hygiene: ES:Tag:vending=feminine hygiene
+    vending=first_aid: ES:Tag:vending=first aid
     vending=fishing_bait: ES:Tag:vending=fishing bait
     vending=fishing_tackle: ES:Tag:vending=fishing tackle
     vending=fishing_bait: ES:Tag:vending=fishing bait
     vending=fishing_tackle: ES:Tag:vending=fishing tackle
+    vending=flower_seeds: ES:Tag:vending=flower seeds
     vending=flowers: ES:Tag:vending=flowers
     vending=flowers: ES:Tag:vending=flowers
+    vending=food: ES:Tag:vending=food
+    vending=fuel: ES:Tag:vending=fuel
     vending=ice_cream: ES:Tag:vending=ice cream
     vending=ice_cream: ES:Tag:vending=ice cream
+    vending=ice_cubes: ES:Tag:vending=ice cubes
     vending=milk: ES:Tag:vending=milk
     vending=milk: ES:Tag:vending=milk
+    vending=newspapers: ES:Tag:vending=newspapers
     vending=parcel_mail_in: ES:Tag:vending=parcel mail in
     vending=parcel_pickup: ES:Tag:vending=parcel pickup
     vending=parcel_mail_in: ES:Tag:vending=parcel mail in
     vending=parcel_pickup: ES:Tag:vending=parcel pickup
+    vending=parcel_pickup;parcel_mail_in: ES:Tag:vending=parcel pickup;parcel mail
+      in
     vending=parking_tickets: ES:Tag:vending=parking tickets
     vending=parking_tickets: ES:Tag:vending=parking tickets
+    vending=pizza: ES:Tag:vending=pizza
+    vending=public_transport_tickets: ES:Tag:vending=public transport tickets
+    vending=stamps: ES:Tag:vending=stamps
+    vending=sweets: ES:Tag:vending=sweets
+    vending=syringes: ES:Tag:vending=syringes
+    vending=telephone_vouchers: ES:Tag:vending=telephone vouchers
+    vending=toll: ES:Tag:vending=toll
+    vending=toys: ES:Tag:vending=toys
+    vending=water: ES:Tag:vending=water
+    wall=brick: ES:Tag:wall=brick
+    wall=castle_wall: ES:Tag:wall=castle wall
+    wall=concrete: ES:Tag:wall=concrete
+    wall=concrete_block: ES:Tag:wall=concrete block
     wall=dry_stone: ES:Tag:wall=dry stone
     wall=dry_stone: ES:Tag:wall=dry stone
+    wall=flint: ES:Tag:wall=flint
+    wall=flood_wall: ES:Tag:wall=flood wall
+    wall=gabion:value: ES:Tag:wall=gabion:value
+    wall=no: ES:Tag:wall=no
+    wall=noise_barrier: ES:Tag:wall=noise barrier
+    wall=pise:value: ES:Tag:wall=pise:value
+    wall=seawall: ES:Tag:wall=seawall
+    wall=stone: ES:Tag:wall=stone
+    wall=stone_wall: ES:Tag:wall=stone wall
     wall=tire_barrier: ES:Tag:wall=tire barrier
     wall=tire_barrier: ES:Tag:wall=tire barrier
+    waste=cigarettes: ES:Tag:waste=cigarettes
+    waste=dog_excrement: ES:Tag:waste=dog excrement
+    waste=drugs: ES:Tag:waste=drugs
+    waste=oil: ES:Tag:waste=oil
+    waste=organic: ES:Tag:waste=organic
+    waste=pizza_box: ES:Tag:waste=pizza box
+    waste=rubble: ES:Tag:waste=rubble
+    waste=sharps: ES:Tag:waste=sharps
+    waste=trash: ES:Tag:waste=trash
+    water=basin: ES:Tag:water=basin
+    water=canal: ES:Tag:water=canal
+    water=ditch: ES:Tag:water=ditch
+    water=dock: ES:Tag:water=dock
+    water=drain: ES:Tag:water=drain
+    water=fish_pass: ES:Tag:water=fish pass
+    water=harbour: ES:Tag:water=harbour
     water=lagoon: ES:Tag:water=lagoon
     water=lake: ES:Tag:water=lake
     water=lagoon: ES:Tag:water=lagoon
     water=lake: ES:Tag:water=lake
+    water=lock: ES:Tag:water=lock
+    water=moat: ES:Tag:water=moat
+    water=oxbow: ES:Tag:water=oxbow
     water=pond: ES:Tag:water=pond
     water=pond: ES:Tag:water=pond
+    water=rapids: ES:Tag:water=rapids
+    water=reflecting_pool: ES:Tag:water=reflecting pool
     water=reservoir: ES:Tag:water=reservoir
     water=reservoir: ES:Tag:water=reservoir
+    water=river: ES:Tag:water=river
+    water=stream: ES:Tag:water=stream
+    water=stream_pool: ES:Tag:water=stream pool
+    water=wastewater: ES:Tag:water=wastewater
+    waterway=boat_lift: ES:Tag:waterway=boat lift
+    waterway=boatyard: ES:Tag:waterway=boatyard
     waterway=canal: ES:Tag:waterway=canal
     waterway=dam: ES:Tag:waterway=dam
     waterway=canal: ES:Tag:waterway=canal
     waterway=dam: ES:Tag:waterway=dam
+    waterway=derelict_canal: ES:Tag:waterway=derelict canal
     waterway=ditch: ES:Tag:waterway=ditch
     waterway=dock: ES:Tag:waterway=dock
     waterway=drain: ES:Tag:waterway=drain
     waterway=ditch: ES:Tag:waterway=ditch
     waterway=dock: ES:Tag:waterway=dock
     waterway=drain: ES:Tag:waterway=drain
+    waterway=dredged_area: ES:Tag:waterway=dredged area
+    waterway=drystream: ES:Tag:waterway=drystream
+    waterway=fairway: ES:Tag:waterway=fairway
+    waterway=fish_pass: ES:Tag:waterway=fish pass
+    waterway=floating_barrier: ES:Tag:waterway=floating barrier
+    waterway=fuel: ES:Tag:waterway=fuel
+    waterway=lock_gate: ES:Tag:waterway=lock gate
     waterway=milestone: ES:Tag:waterway=milestone
     waterway=milestone: ES:Tag:waterway=milestone
+    waterway=portage: ES:Tag:waterway=portage
+    waterway=pressurised: ES:Tag:waterway=pressurised
+    waterway=rapids: ES:Tag:waterway=rapids
     waterway=river: ES:Tag:waterway=river
     waterway=riverbank: ES:Tag:waterway=riverbank
     waterway=river: ES:Tag:waterway=river
     waterway=riverbank: ES:Tag:waterway=riverbank
+    waterway=security_lock: ES:Tag:waterway=security lock
+    waterway=sluice_gate: ES:Tag:waterway=sluice gate
+    waterway=soakhole: ES:Tag:waterway=soakhole
     waterway=stream: ES:Tag:waterway=stream
     waterway=stream: ES:Tag:waterway=stream
+    waterway=tidal_channel: ES:Tag:waterway=tidal channel
+    waterway=turning_point: ES:Tag:waterway=turning point
     waterway=water_point: ES:Tag:waterway=water point
     waterway=water_point: ES:Tag:waterway=water point
+    waterway=waterfall: ES:Tag:waterway=waterfall
     waterway=weir: ES:Tag:waterway=weir
     wetland=bog: ES:Tag:wetland=bog
     waterway=weir: ES:Tag:waterway=weir
     wetland=bog: ES:Tag:wetland=bog
+    wetland=mangrove: ES:Tag:wetland=mangrove
+    wetland=reedbed: ES:Tag:wetland=reedbed
     wetland=tidalflat: ES:Tag:wetland=tidalflat
     wetland=wet_meadow: ES:Tag:wetland=wet meadow
     wetland=tidalflat: ES:Tag:wetland=tidalflat
     wetland=wet_meadow: ES:Tag:wetland=wet meadow
+    winter_road=yes: ES:Tag:winter road=yes
     worship=stations_of_the_cross: ES:Tag:worship=stations of the cross
     worship=stations_of_the_cross: ES:Tag:worship=stations of the cross
+    zoo=falconry: ES:Tag:zoo=falconry
 et:
   key:
     addr: Et:Key:addr
 et:
   key:
     addr: Et:Key:addr
+    addr:*: Et:Key:addr:*
     amenity: Et:Key:amenity
     backrest: Et:Key:backrest
     highway: Et:Key:highway
     amenity: Et:Key:amenity
     backrest: Et:Key:backrest
     highway: Et:Key:highway
@@ -12461,6 +17824,8 @@ et:
 fa:
   key:
     addr: Fa:Key:addr
 fa:
   key:
     addr: Fa:Key:addr
+    addr:*: Fa:Key:addr:*
+    alt_name: Fa:Key:alt name
     area: Fa:Key:area
     barrier: Fa:Key:barrier
     bridge: Fa:Key:bridge
     area: Fa:Key:area
     barrier: Fa:Key:barrier
     bridge: Fa:Key:bridge
@@ -12468,11 +17833,11 @@ fa:
     enforcement: Fa:Key:enforcement
     highway: Fa:Key:highway
     intermittent: Fa:Key:intermittent
     enforcement: Fa:Key:enforcement
     highway: Fa:Key:highway
     intermittent: Fa:Key:intermittent
+    layer: Fa:Key:layer
     level: Fa:Key:level
     loc_name: Fa:Key:loc name
     name: Fa:Key:name
     name:etymology: Fa:Key:name:etymology
     level: Fa:Key:level
     loc_name: Fa:Key:loc name
     name: Fa:Key:name
     name:etymology: Fa:Key:name:etymology
-    noexit: Fa:Key:noexit
     roof:shape: Fa:Key:roof:shape
     source: Fa:Key:source
     traffic_calming: Fa:Key:traffic calming
     roof:shape: Fa:Key:roof:shape
     source: Fa:Key:source
     traffic_calming: Fa:Key:traffic calming
@@ -12480,8 +17845,10 @@ fa:
   tag:
     amenity=fountain: Fa:Tag:amenity=fountain
     amenity=fuel: Fa:Tag:amenity=fuel
   tag:
     amenity=fountain: Fa:Tag:amenity=fountain
     amenity=fuel: Fa:Tag:amenity=fuel
+    amenity=vehicle_inspection: Fa:Tag:amenity=vehicle inspection
     barrier=block: Fa:Tag:barrier=block
     barrier=cable_barrier: Fa:Tag:barrier=cable barrier
     barrier=block: Fa:Tag:barrier=block
     barrier=cable_barrier: Fa:Tag:barrier=cable barrier
+    canal=qanat: Fa:Tag:canal=qanat
     highway=footway: Fa:Tag:highway=footway
     highway=path: Fa:Tag:highway=path
     highway=residential: Fa:Tag:highway=residential
     highway=footway: Fa:Tag:highway=footway
     highway=path: Fa:Tag:highway=path
     highway=residential: Fa:Tag:highway=residential
@@ -12492,12 +17859,16 @@ fa:
     highway=tertiary: Fa:Tag:highway=tertiary
     highway=track: Fa:Tag:highway=track
     highway=unclassified: Fa:Tag:highway=unclassified
     highway=tertiary: Fa:Tag:highway=tertiary
     highway=track: Fa:Tag:highway=track
     highway=unclassified: Fa:Tag:highway=unclassified
+    junction=jughandle: Fa:Tag:junction=jughandle
     junction=yes: Fa:Tag:junction=yes
     man_made=qanat: Fa:Tag:man made=qanat
     junction=yes: Fa:Tag:junction=yes
     man_made=qanat: Fa:Tag:man made=qanat
+    man_made=water_tower: Fa:Tag:man made=water tower
     natural=peak: Fa:Tag:natural=peak
     natural=ridge: Fa:Tag:natural=ridge
     natural=peak: Fa:Tag:natural=peak
     natural=ridge: Fa:Tag:natural=ridge
+    noexit=yes: Fa:Tag:noexit=yes
     office=quango: Fa:Tag:office=quango
     place=country: Fa:Tag:place=country
     office=quango: Fa:Tag:office=quango
     place=country: Fa:Tag:place=country
+    railway=level_crossing: Fa:Tag:railway=level crossing
     service=alley: Fa:Tag:service=alley
     shop=bookmaker: Fa:Tag:shop=bookmaker
     shop=garden_centre: Fa:Tag:shop=garden centre
     service=alley: Fa:Tag:service=alley
     shop=bookmaker: Fa:Tag:shop=bookmaker
     shop=garden_centre: Fa:Tag:shop=garden centre
@@ -12505,38 +17876,51 @@ fa:
     waterway=drain: Fa:Tag:waterway=drain
 fi:
   key:
     waterway=drain: Fa:Tag:waterway=drain
 fi:
   key:
+    access: Fi:Key:access
     addr: Fi:Key:addr
     addr: Fi:Key:addr
+    addr:*: Fi:Key:addr:*
     amenity: Fi:Key:amenity
     bicycle_parking: Fi:Key:bicycle parking
     bridge: Fi:Key:bridge
     crossing: Fi:Key:crossing
     amenity: Fi:Key:amenity
     bicycle_parking: Fi:Key:bicycle parking
     bridge: Fi:Key:bridge
     crossing: Fi:Key:crossing
+    crossing:barrier: Fi:Key:crossing:barrier
+    crossing:bell: Fi:Key:crossing:bell
+    crossing:light: Fi:Key:crossing:light
+    crossing:saltire: Fi:Key:crossing:saltire
     description: Fi:Key:description
     disused: Fi:Key:disused
     ele: Fi:Key:ele
     embankment: Fi:Key:embankment
     entrance: Fi:Key:entrance
     description: Fi:Key:description
     disused: Fi:Key:disused
     ele: Fi:Key:ele
     embankment: Fi:Key:embankment
     entrance: Fi:Key:entrance
+    fee: Fi:Key:fee
     hazmat: Fi:Key:hazmat
     lanes: Fi:Key:lanes
     layer: Fi:Key:layer
     leisure: Fi:Key:leisure
     hazmat: Fi:Key:hazmat
     lanes: Fi:Key:lanes
     layer: Fi:Key:layer
     leisure: Fi:Key:leisure
+    lit: Fi:Key:lit
     man_made: Fi:Key:man made
     manhole: Fi:Key:manhole
     maxspeed: Fi:Key:maxspeed
     man_made: Fi:Key:man made
     manhole: Fi:Key:manhole
     maxspeed: Fi:Key:maxspeed
+    memorial: Fi:Key:memorial
+    memorial:conflict: Fi:Key:memorial:conflict
+    minspeed: Fi:Key:minspeed
     mtb:scale: Fi:Key:mtb:scale
     name: Fi:Key:name
     mtb:scale: Fi:Key:mtb:scale
     name: Fi:Key:name
+    name:sv: Fi:Key:name:sv
     narrow: Fi:Key:narrow
     natural: Fi:Key:natural
     note: Fi:Key:note
     operator: Fi:Key:operator
     narrow: Fi:Key:narrow
     natural: Fi:Key:natural
     note: Fi:Key:note
     operator: Fi:Key:operator
-    parking:lane: Fi:Key:parking:lane
-    parking:lane:both: Fi:Key:parking:lane:both
     pihatie: Fi:Key:pihatie
     place: Fi:Key:place
     priority_road: Fi:Key:priority road
     pyörä_väistää_aina_autoa: Fi:Key:pyörä väistää aina autoa
     pihatie: Fi:Key:pihatie
     place: Fi:Key:place
     priority_road: Fi:Key:priority road
     pyörä_väistää_aina_autoa: Fi:Key:pyörä väistää aina autoa
+    self_checkout: Fi:Key:self checkout
+    self_service: Fi:Key:self service
     shop: Fi:Key:shop
     snowmobile: Fi:Key:snowmobile
     snowplowing: Fi:Key:snowplowing
     shop: Fi:Key:shop
     snowmobile: Fi:Key:snowmobile
     snowplowing: Fi:Key:snowplowing
+    start_date: Fi:Key:start date
     surface: Fi:Key:surface
     tracktype: Fi:Key:tracktype
     traffic_calming: Fi:Key:traffic calming
     surface: Fi:Key:surface
     tracktype: Fi:Key:tracktype
     traffic_calming: Fi:Key:traffic calming
@@ -12545,15 +17929,19 @@ fi:
     waterway: Fi:Key:waterway
     wheelchair: Fi:Key:wheelchair
     width: Fi:Key:width
     waterway: Fi:Key:waterway
     wheelchair: Fi:Key:wheelchair
     width: Fi:Key:width
+    winter_service: Fi:Key:winter service
   tag:
     amenity=atm: Fi:Tag:amenity=atm
     amenity=baby_hatch: Fi:Tag:amenity=baby hatch
     amenity=bank: Fi:Tag:amenity=bank
   tag:
     amenity=atm: Fi:Tag:amenity=atm
     amenity=baby_hatch: Fi:Tag:amenity=baby hatch
     amenity=bank: Fi:Tag:amenity=bank
+    amenity=bench: Fi:Tag:amenity=bench
     amenity=bicycle_parking: Fi:Tag:amenity=bicycle parking
     amenity=bicycle_rental: Fi:Tag:amenity=bicycle rental
     amenity=bureau_de_change: Fi:Tag:amenity=bureau de change
     amenity=car_rental: Fi:Tag:amenity=car rental
     amenity=car_sharing: Fi:Tag:amenity=car sharing
     amenity=bicycle_parking: Fi:Tag:amenity=bicycle parking
     amenity=bicycle_rental: Fi:Tag:amenity=bicycle rental
     amenity=bureau_de_change: Fi:Tag:amenity=bureau de change
     amenity=car_rental: Fi:Tag:amenity=car rental
     amenity=car_sharing: Fi:Tag:amenity=car sharing
+    amenity=car_wash: Fi:Tag:amenity=car wash
+    amenity=carpet_washing: Fi:Tag:amenity=carpet washing
     amenity=cinema: Fi:Tag:amenity=cinema
     amenity=courthouse: Fi:Tag:amenity=courthouse
     amenity=crematorium: Fi:Tag:amenity=crematorium
     amenity=cinema: Fi:Tag:amenity=cinema
     amenity=courthouse: Fi:Tag:amenity=courthouse
     amenity=crematorium: Fi:Tag:amenity=crematorium
@@ -12572,23 +17960,31 @@ fi:
     amenity=theatre: Fi:Tag:amenity=theatre
     amenity=townhall: Fi:Tag:amenity=townhall
     amenity=veterinary: Fi:Tag:amenity=veterinary
     amenity=theatre: Fi:Tag:amenity=theatre
     amenity=townhall: Fi:Tag:amenity=townhall
     amenity=veterinary: Fi:Tag:amenity=veterinary
+    building=church: Fi:Tag:building=church
     building=garage: Fi:Tag:building=garage
     building=garages: Fi:Tag:building=garages
     building=garage: Fi:Tag:building=garage
     building=garages: Fi:Tag:building=garages
+    hazard=curve: Fi:Tag:hazard=curve
+    hazard=curves: Fi:Tag:hazard=curves
     highway=crossing: Fi:Tag:highway=crossing
     highway=footway: Fi:Tag:highway=footway
     highway=crossing: Fi:Tag:highway=crossing
     highway=footway: Fi:Tag:highway=footway
+    highway=give_way: Fi:Tag:highway=give way
     highway=secondary: Fi:Tag:highway=secondary
     highway=speed_camera: Fi:Tag:highway=speed camera
     highway=steps: Fi:Tag:highway=steps
     highway=secondary: Fi:Tag:highway=secondary
     highway=speed_camera: Fi:Tag:highway=speed camera
     highway=steps: Fi:Tag:highway=steps
+    highway=stop: Fi:Tag:highway=stop
     highway=tertiary: Fi:Tag:highway=tertiary
     highway=track: Fi:Tag:highway=track
     highway=unclassified: Fi:Tag:highway=unclassified
     leisure=dance: Fi:Tag:leisure=dance
     leisure=dog_park: Fi:Tag:leisure=dog park
     leisure=slipway: Fi:Tag:leisure=slipway
     highway=tertiary: Fi:Tag:highway=tertiary
     highway=track: Fi:Tag:highway=track
     highway=unclassified: Fi:Tag:highway=unclassified
     leisure=dance: Fi:Tag:leisure=dance
     leisure=dog_park: Fi:Tag:leisure=dog park
     leisure=slipway: Fi:Tag:leisure=slipway
+    man_made=flagpole: Fi:Tag:man made=flagpole
+    man_made=milk_churn_stand: Fi:Tag:man made=milk churn stand
     man_made=wastewater_plant: Fi:Tag:man made=wastewater plant
     man_made=watermill: Fi:Tag:man made=watermill
     natural=tree: Fi:Tag:natural=tree
     natural=wetland: Fi:Tag:natural=wetland
     man_made=wastewater_plant: Fi:Tag:man made=wastewater plant
     man_made=watermill: Fi:Tag:man made=watermill
     natural=tree: Fi:Tag:natural=tree
     natural=wetland: Fi:Tag:natural=wetland
+    place=village: Fi:Tag:place=village
     power=line: Fi:Tag:power=line
     power=minor_line: Fi:Tag:power=minor line
     power=pole: Fi:Tag:power=pole
     power=line: Fi:Tag:power=line
     power=minor_line: Fi:Tag:power=minor line
     power=pole: Fi:Tag:power=pole
@@ -12596,6 +17992,7 @@ fi:
     railway=crossing: Fi:Tag:railway=crossing
     railway=level_crossing: Fi:Tag:railway=level crossing
     service=parking_aisle: Fi:Tag:service=parking aisle
     railway=crossing: Fi:Tag:railway=crossing
     railway=level_crossing: Fi:Tag:railway=level crossing
     service=parking_aisle: Fi:Tag:service=parking aisle
+    shelter_type=lean_to: Fi:Tag:shelter type=lean to
     shop=bakery: Fi:Tag:shop=bakery
     shop=bicycle: Fi:Tag:shop=bicycle
     shop=butcher: Fi:Tag:shop=butcher
     shop=bakery: Fi:Tag:shop=bakery
     shop=bicycle: Fi:Tag:shop=bicycle
     shop=butcher: Fi:Tag:shop=butcher
@@ -12612,10 +18009,12 @@ fr:
     FIXME: FR:Key:FIXME
     abandoned: FR:Key:abandoned
     'abandoned:': 'FR:Key:abandoned:'
     FIXME: FR:Key:FIXME
     abandoned: FR:Key:abandoned
     'abandoned:': 'FR:Key:abandoned:'
+    abandoned:*: FR:Key:abandoned:*
     abutters: FR:Key:abutters
     access: FR:Key:access
     actuator: FR:Key:actuator
     addr: FR:Key:addr
     abutters: FR:Key:abutters
     access: FR:Key:access
     actuator: FR:Key:actuator
     addr: FR:Key:addr
+    addr:*: FR:Key:addr:*
     addr:floor: FR:Key:addr:floor
     addr:housenumber: FR:Key:addr:housenumber
     addr:place: FR:Key:addr:place
     addr:floor: FR:Key:addr:floor
     addr:housenumber: FR:Key:addr:housenumber
     addr:place: FR:Key:addr:place
@@ -12624,23 +18023,38 @@ fr:
     admin_level: FR:Key:admin level
     advertising: FR:Key:advertising
     aeroway: FR:Key:aeroway
     admin_level: FR:Key:admin level
     advertising: FR:Key:advertising
     aeroway: FR:Key:aeroway
+    agrarian: FR:Key:agrarian
+    agricultural: FR:Key:agricultural
+    air_conditioning: FR:Key:air conditioning
     alt_name: FR:Key:alt name
     amenity: FR:Key:amenity
     animal: FR:Key:animal
     animated: FR:Key:animated
     alt_name: FR:Key:alt name
     amenity: FR:Key:amenity
     animal: FR:Key:animal
     animated: FR:Key:animated
+    architect: FR:Key:architect
     area: FR:Key:area
     area: FR:Key:area
+    area:highway: FR:Key:area:highway
+    armrest: FR:Key:armrest
     artist_name: FR:Key:artist name
     artwork_type: FR:Key:artwork type
     artist_name: FR:Key:artist name
     artwork_type: FR:Key:artwork type
+    assembly_point:tornado: FR:Key:assembly point:tornado
     attraction: FR:Key:attraction
     attraction: FR:Key:attraction
+    authentication: FR:Key:authentication
+    authentication:*: FR:Key:authentication:*
+    avalanche_transceiver: FR:Key:avalanche transceiver
+    backcountry: FR:Key:backcountry
     backrest: FR:Key:backrest
     backward: FR:Key:backward
     backrest: FR:Key:backrest
     backward: FR:Key:backward
+    bakehouse: FR:Key:bakehouse
     barrier: FR:Key:barrier
     baseball: FR:Key:baseball
     barrier: FR:Key:barrier
     baseball: FR:Key:baseball
+    basilica: FR:Key:basilica
     basin: FR:Key:basin
     bench: FR:Key:bench
     basin: FR:Key:basin
     bench: FR:Key:bench
+    bench:type: FR:Key:bench:type
     bicycle: FR:Key:bicycle
     bicycle: FR:Key:bicycle
+    bicycle_bypass: FR:Key:bicycle bypass
     bicycle_parking: FR:Key:bicycle parking
     bicycle_parking: FR:Key:bicycle parking
-    bicycle_road: FR:Key:bicycle road
+    bin: FR:Key:bin
     board_type: FR:Key:board type
     boat: FR:Key:boat
     bollard: FR:Key:bollard
     board_type: FR:Key:board type
     boat: FR:Key:boat
     bollard: FR:Key:bollard
@@ -12655,57 +18069,82 @@ fr:
     building:flats: FR:Key:building:flats
     building:levels: FR:Key:building:levels
     building:material: FR:Key:building:material
     building:flats: FR:Key:building:flats
     building:levels: FR:Key:building:levels
     building:material: FR:Key:building:material
+    building:min_level: FR:Key:building:min level
     building:part: FR:Key:building:part
     building:prefabricated: FR:Key:building:prefabricated
     building:part: FR:Key:building:part
     building:prefabricated: FR:Key:building:prefabricated
+    building:soft_storey: FR:Key:building:soft storey
     building:use: FR:Key:building:use
     bulk_purchase: FR:Key:bulk purchase
     bus: FR:Key:bus
     busway: FR:Key:busway
     building:use: FR:Key:building:use
     bulk_purchase: FR:Key:bulk purchase
     bus: FR:Key:bus
     busway: FR:Key:busway
+    cables: FR:Key:cables
     cafe: FR:Key:cafe
     cafe: FR:Key:cafe
+    camera:direction: FR:Key:camera:direction
     camp_site: FR:Key:camp site
     capacity: FR:Key:capacity
     camp_site: FR:Key:camp site
     capacity: FR:Key:capacity
+    capacity:charging: FR:Key:capacity:charging
     capacity:disabled: FR:Key:capacity:disabled
     cargo: FR:Key:cargo
     capacity:disabled: FR:Key:capacity:disabled
     cargo: FR:Key:cargo
+    cargo_bike: FR:Key:cargo bike
     carpool: FR:Key:carpool
     carpool: FR:Key:carpool
+    carriage: FR:Key:carriage
     cash_withdrawal: FR:Key:cash withdrawal
     cash_withdrawal: FR:Key:cash withdrawal
+    changesets_count: FR:Key:changesets count
     charge: FR:Key:charge
     check_date: FR:Key:check date
     charge: FR:Key:charge
     check_date: FR:Key:check date
+    circuits: FR:Key:circuits
     class:bicycle:commute: FR:Key:class:bicycle:commute
     clothes: FR:Key:clothes
     club: FR:Key:club
     class:bicycle:commute: FR:Key:class:bicycle:commute
     clothes: FR:Key:clothes
     club: FR:Key:club
+    cocktails: FR:Key:cocktails
     collection_times: FR:Key:collection times
     color: FR:Key:color
     colour: FR:Key:colour
     comment: FR:Key:comment
     communication:bos: FR:Key:communication:bos
     collection_times: FR:Key:collection times
     color: FR:Key:color
     colour: FR:Key:colour
     comment: FR:Key:comment
     communication:bos: FR:Key:communication:bos
+    community: FR:Key:community
     community_centre: FR:Key:community centre
     community_centre:for: FR:Key:community centre:for
     community_centre: FR:Key:community centre
     community_centre:for: FR:Key:community centre:for
+    compensator: FR:Key:compensator
     connection_point: FR:Key:connection point
     construction: FR:Key:construction
     connection_point: FR:Key:connection point
     construction: FR:Key:construction
+    consulate: FR:Key:consulate
     contact: FR:Key:contact
     contact: FR:Key:contact
+    contact:*: FR:Key:contact:*
     contact:email: FR:Key:contact:email
     contact:email: FR:Key:contact:email
+    contact:facebook: FR:Key:contact:facebook
     contact:fax: FR:Key:contact:fax
     contact:phone: FR:Key:contact:phone
     contact:fax: FR:Key:contact:fax
     contact:phone: FR:Key:contact:phone
+    contact:twitter: FR:Key:contact:twitter
     contact:vhf: FR:Key:contact:vhf
     contact:webcam: FR:Key:contact:webcam
     contact:website: FR:Key:contact:website
     content: FR:Key:content
     contact:vhf: FR:Key:contact:vhf
     contact:webcam: FR:Key:contact:webcam
     contact:website: FR:Key:contact:website
     content: FR:Key:content
+    conveying: FR:Key:conveying
     covered: FR:Key:covered
     craft: FR:Key:craft
     crop: FR:Key:crop
     crossing: FR:Key:crossing
     crossing:activation: FR:Key:crossing:activation
     crossing:island: FR:Key:crossing:island
     covered: FR:Key:covered
     craft: FR:Key:craft
     crop: FR:Key:crop
     crossing: FR:Key:crossing
     crossing:activation: FR:Key:crossing:activation
     crossing:island: FR:Key:crossing:island
+    crossing:marking: FR:Key:crossing:marking
+    crossing:markings: FR:Key:crossing:markings
     cuisine: FR:Key:cuisine
     currency: FR:Key:currency
     cuisine: FR:Key:cuisine
     currency: FR:Key:currency
+    currency:XLT: FR:Key:currency:XLT
     cutting: FR:Key:cutting
     cutting: FR:Key:cutting
+    cycle_barrier: FR:Key:cycle barrier
+    cycle_barrier:installation: FR:Key:cycle barrier:installation
     cyclestreet: FR:Key:cyclestreet
     cycleway: FR:Key:cycleway
     cycleway:lane: FR:Key:cycleway:lane
     cycleway:left: FR:Key:cycleway:left
     cyclestreet: FR:Key:cyclestreet
     cycleway: FR:Key:cycleway
     cycleway:lane: FR:Key:cycleway:lane
     cycleway:left: FR:Key:cycleway:left
+    defensive_works: FR:Key:defensive works
+    deflection: FR:Key:deflection
     delivery: FR:Key:delivery
     denomination: FR:Key:denomination
     denotation: FR:Key:denotation
     delivery: FR:Key:delivery
     denomination: FR:Key:denomination
     denotation: FR:Key:denotation
+    departures_board: FR:Key:departures board
     description: FR:Key:description
     design: FR:Key:design
     designation: FR:Key:designation
     description: FR:Key:description
     design: FR:Key:design
     designation: FR:Key:designation
@@ -12715,17 +18154,32 @@ fr:
     diet:kosher: FR:Key:diet:kosher
     diet:vegan: FR:Key:diet:vegan
     diet:vegetarian: FR:Key:diet:vegetarian
     diet:kosher: FR:Key:diet:kosher
     diet:vegan: FR:Key:diet:vegan
     diet:vegetarian: FR:Key:diet:vegetarian
+    diocese: FR:Key:diocese
     diplomatic: FR:Key:diplomatic
     direction: FR:Key:direction
     diplomatic: FR:Key:diplomatic
     direction: FR:Key:direction
+    disabled: FR:Key:disabled
+    disc_golf: FR:Key:disc golf
     dispensing: FR:Key:dispensing
     dispensing: FR:Key:dispensing
+    display: FR:Key:display
     distance: FR:Key:distance
     distance: FR:Key:distance
+    'disused:': 'FR:Key:disused:'
+    disused:*: FR:Key:disused:*
+    divider: FR:Key:divider
+    dock:height: FR:Key:dock:height
+    dock:width: FR:Key:dock:width
+    dog: FR:Key:dog
     door: FR:Key:door
     door: FR:Key:door
+    door:height: FR:Key:door:height
+    door:width: FR:Key:door:width
+    drain: FR:Key:drain
     drink: FR:Key:drink
     drink: FR:Key:drink
+    drink:*: FR:Key:drink:*
     drinking_water: FR:Key:drinking water
     drinking_water:refill: FR:Key:drinking water:refill
     drive_in: FR:Key:drive in
     drive_through: FR:Key:drive through
     dryer: FR:Key:dryer
     drinking_water: FR:Key:drinking water
     drinking_water:refill: FR:Key:drinking water:refill
     drive_in: FR:Key:drive in
     drive_through: FR:Key:drive through
     dryer: FR:Key:dryer
+    duration: FR:Key:duration
     ele: FR:Key:ele
     email: FR:Key:email
     embankment: FR:Key:embankment
     ele: FR:Key:ele
     email: FR:Key:email
     embankment: FR:Key:embankment
@@ -12741,18 +18195,21 @@ fr:
     fee: FR:Key:fee
     female: FR:Key:female
     fence_type: FR:Key:fence type
     fee: FR:Key:fee
     female: FR:Key:female
     fence_type: FR:Key:fence type
+    fire_path: FR:Key:fire path
     fishing: FR:Key:fishing
     fixme: FR:Key:fixme
     floating: FR:Key:floating
     flood_prone: FR:Key:flood prone
     foot: FR:Key:foot
     footway: FR:Key:footway
     fishing: FR:Key:fishing
     fixme: FR:Key:fixme
     floating: FR:Key:floating
     flood_prone: FR:Key:flood prone
     foot: FR:Key:foot
     footway: FR:Key:footway
+    foraging: FR:Key:foraging
     ford: FR:Key:ford
     format: FR:Key:format
     forward: FR:Key:forward
     fuel: FR:Key:fuel
     garden:style: FR:Key:garden:style
     garden:type: FR:Key:garden:type
     ford: FR:Key:ford
     format: FR:Key:format
     forward: FR:Key:forward
     fuel: FR:Key:fuel
     garden:style: FR:Key:garden:style
     garden:type: FR:Key:garden:type
+    gay: FR:Key:gay
     generator:method: FR:Key:generator:method
     generator:output: FR:Key:generator:output
     generator:output:battery_charging: FR:Key:generator:output:battery charging
     generator:method: FR:Key:generator:method
     generator:output: FR:Key:generator:output
     generator:output:battery_charging: FR:Key:generator:output:battery charging
@@ -12771,8 +18228,13 @@ fr:
     government: FR:Key:government
     grande_circulation: FR:Key:grande circulation
     handle: FR:Key:handle
     government: FR:Key:government
     grande_circulation: FR:Key:grande circulation
     handle: FR:Key:handle
+    handrail: FR:Key:handrail
     happy_hours: FR:Key:happy hours
     happy_hours: FR:Key:happy hours
+    hazard: FR:Key:hazard
+    hazmat: FR:Key:hazmat
+    health_facility:CD: FR:Key:health facility:CD
     healthcare: FR:Key:healthcare
     healthcare: FR:Key:healthcare
+    healthcare:speciality: FR:Key:healthcare:speciality
     height: FR:Key:height
     heritage: FR:Key:heritage
     high_water_mark: FR:Key:high water mark
     height: FR:Key:height
     heritage: FR:Key:heritage
     high_water_mark: FR:Key:high water mark
@@ -12783,19 +18245,26 @@ fr:
     horse: FR:Key:horse
     hov: FR:Key:hov
     image: FR:Key:image
     horse: FR:Key:horse
     hov: FR:Key:hov
     image: FR:Key:image
+    imagery_used: FR:Key:imagery used
     incline: FR:Key:incline
     indoor: FR:Key:indoor
     incline: FR:Key:incline
     indoor: FR:Key:indoor
+    indoor_seating: FR:Key:indoor seating
+    informal: FR:Key:informal
     information: FR:Key:information
     information: FR:Key:information
+    inlet: FR:Key:inlet
     inscription: FR:Key:inscription
     int_name: FR:Key:int name
     intermittent: FR:Key:intermittent
     inscription: FR:Key:inscription
     int_name: FR:Key:int name
     intermittent: FR:Key:intermittent
+    internet_access:ssid: FR:Key:internet access:ssid
     interval: FR:Key:interval
     interval: FR:Key:interval
+    isced:level: FR:Key:isced:level
     junction: FR:Key:junction
     kerb: FR:Key:kerb
     kindergarten:FR: FR:Key:kindergarten:FR
     ladder: FR:Key:ladder
     landfill:waste: FR:Key:landfill:waste
     landuse: FR:Key:landuse
     junction: FR:Key:junction
     kerb: FR:Key:kerb
     kindergarten:FR: FR:Key:kindergarten:FR
     ladder: FR:Key:ladder
     landfill:waste: FR:Key:landfill:waste
     landuse: FR:Key:landuse
+    lane_markings: FR:Key:lane markings
     lanes: FR:Key:lanes
     layer: FR:Key:layer
     leaf_type: FR:Key:leaf type
     lanes: FR:Key:lanes
     layer: FR:Key:layer
     leaf_type: FR:Key:leaf type
@@ -12805,9 +18274,12 @@ fr:
     length: FR:Key:length
     level: FR:Key:level
     lgbtq: FR:Key:lgbtq
     length: FR:Key:length
     level: FR:Key:level
     lgbtq: FR:Key:lgbtq
+    lifeguard: FR:Key:lifeguard
+    line_arrangement: FR:Key:line arrangement
     line_attachment: FR:Key:line attachment
     line_management: FR:Key:line management
     lit: FR:Key:lit
     line_attachment: FR:Key:line attachment
     line_management: FR:Key:line management
     lit: FR:Key:lit
+    lit:perceived: FR:Key:lit:perceived
     loc_name: FR:Key:loc name
     local_authority:FR: FR:Key:local authority:FR
     location: FR:Key:location
     loc_name: FR:Key:loc name
     local_authority:FR: FR:Key:local authority:FR
     location: FR:Key:location
@@ -12833,19 +18305,27 @@ fr:
     maxstay: FR:Key:maxstay
     maxweight: FR:Key:maxweight
     maxwidth: FR:Key:maxwidth
     maxstay: FR:Key:maxstay
     maxweight: FR:Key:maxweight
     maxwidth: FR:Key:maxwidth
+    mechanical_coupling: FR:Key:mechanical coupling
+    mechanical_driver: FR:Key:mechanical driver
+    medical_supply: FR:Key:medical supply
     memorial: FR:Key:memorial
     message: FR:Key:message
     microbrewery: FR:Key:microbrewery
     military: FR:Key:military
     min_age: FR:Key:min age
     minage: FR:Key:minage
     memorial: FR:Key:memorial
     message: FR:Key:message
     microbrewery: FR:Key:microbrewery
     military: FR:Key:military
     min_age: FR:Key:min age
     minage: FR:Key:minage
+    model: FR:Key:model
     monitoring:bicycle: FR:Key:monitoring:bicycle
     monitoring:bicycle: FR:Key:monitoring:bicycle
+    monitoring:groundwater: FR:Key:monitoring:groundwater
     monitoring:meteoric_activity: FR:Key:monitoring:meteoric activity
     monitoring:meteoric_activity: FR:Key:monitoring:meteoric activity
+    monitoring:noise: FR:Key:monitoring:noise
     monitoring:water_level: FR:Key:monitoring:water level
     mooring: FR:Key:mooring
     motorboat: FR:Key:motorboat
     motorcycle:parking: FR:Key:motorcycle:parking
     monitoring:water_level: FR:Key:monitoring:water level
     mooring: FR:Key:mooring
     motorboat: FR:Key:motorboat
     motorcycle:parking: FR:Key:motorcycle:parking
+    motorroad: FR:Key:motorroad
     mountain_pass: FR:Key:mountain pass
     mountain_pass: FR:Key:mountain pass
+    mtb: FR:Key:mtb
     mtb:scale: FR:Key:mtb:scale
     name: FR:Key:name
     name:br: FR:Key:name:br
     mtb:scale: FR:Key:mtb:scale
     name: FR:Key:name
     name:br: FR:Key:name:br
@@ -12855,9 +18335,7 @@ fr:
     nat_name: FR:Key:nat name
     natural: FR:Key:natural
     network: FR:Key:network
     nat_name: FR:Key:nat name
     natural: FR:Key:natural
     network: FR:Key:network
-    noexit: FR:Key:noexit
     non_existent_levels: FR:Key:non existent levels
     non_existent_levels: FR:Key:non existent levels
-    noname: FR:Key:noname
     noref: FR:Key:noref
     note: FR:Key:note
     nudism: FR:Key:nudism
     noref: FR:Key:noref
     note: FR:Key:note
     nudism: FR:Key:nudism
@@ -12869,24 +18347,33 @@ fr:
     open_air: FR:Key:open air
     openbenches:id: FR:Key:openbenches:id
     openfire: FR:Key:openfire
     open_air: FR:Key:open air
     openbenches:id: FR:Key:openbenches:id
     openfire: FR:Key:openfire
+    opening: FR:Key:opening
     opening_date: FR:Key:opening date
     opening_hours: FR:Key:opening hours
     opening_hours:covid19: FR:Key:opening hours:covid19
     openplaques:id: FR:Key:openplaques:id
     operator: FR:Key:operator
     operator:type: FR:Key:operator:type
     opening_date: FR:Key:opening date
     opening_hours: FR:Key:opening hours
     opening_hours:covid19: FR:Key:opening hours:covid19
     openplaques:id: FR:Key:openplaques:id
     operator: FR:Key:operator
     operator:type: FR:Key:operator:type
+    operator:wikidata: FR:Key:operator:wikidata
     organic: FR:Key:organic
     organic: FR:Key:organic
+    origin: FR:Key:origin
     outdoor_seating: FR:Key:outdoor seating
     outdoor_seating: FR:Key:outdoor seating
+    outlet: FR:Key:outlet
+    overlap: FR:Key:overlap
     overtaking: FR:Key:overtaking
     overtaking: FR:Key:overtaking
+    overtaking:hgv: FR:Key:overtaking:hgv
     owner: FR:Key:owner
     owner: FR:Key:owner
+    par: FR:Key:par
+    parish: FR:Key:parish
+    park_ride: FR:Key:park ride
     parking: FR:Key:parking
     parking: FR:Key:parking
-    parking:condition: FR:Key:parking:condition
-    parking:lane: FR:Key:parking:lane
+    parking_space: FR:Key:parking space
     paved:date: FR:Key:paved:date
     payment: FR:Key:payment
     payment:MoyenDePaiement: FR:Key:payment:MoyenDePaiement
     payment:credit_cards: FR:Key:payment:credit cards
     payment:foo: FR:Key:payment:foo
     paved:date: FR:Key:paved:date
     payment: FR:Key:payment
     payment:MoyenDePaiement: FR:Key:payment:MoyenDePaiement
     payment:credit_cards: FR:Key:payment:credit cards
     payment:foo: FR:Key:payment:foo
+    pedagogy: FR:Key:pedagogy
     permanent: FR:Key:permanent
     phone: FR:Key:phone
     pilgrimage: FR:Key:pilgrimage
     permanent: FR:Key:permanent
     phone: FR:Key:phone
     pilgrimage: FR:Key:pilgrimage
@@ -12894,10 +18381,12 @@ fr:
     piste:grooming: FR:Key:piste:grooming
     place: FR:Key:place
     place:fr: FR:Key:place:fr
     piste:grooming: FR:Key:piste:grooming
     place: FR:Key:place
     place:fr: FR:Key:place:fr
+    plant: FR:Key:plant
     plant:output: FR:Key:plant:output
     playground: FR:Key:playground
     plant:output: FR:Key:plant:output
     playground: FR:Key:playground
+    police: FR:Key:police
     post_box:type: FR:Key:post box:type
     post_box:type: FR:Key:post box:type
-    post_office:type: FR:Key:post office:type
+    post_office: FR:Key:post office
     power: FR:Key:power
     power_supply: FR:Key:power supply
     priority: FR:Key:priority
     power: FR:Key:power
     power_supply: FR:Key:power supply
     priority: FR:Key:priority
@@ -12907,14 +18396,24 @@ fr:
     public_bookcase:type: FR:Key:public bookcase:type
     public_transport: FR:Key:public transport
     pump: FR:Key:pump
     public_bookcase:type: FR:Key:public bookcase:type
     public_transport: FR:Key:public transport
     pump: FR:Key:pump
+    pump_mechanism: FR:Key:pump mechanism
     railway: FR:Key:railway
     railway: FR:Key:railway
+    railway:etcs: FR:Key:railway:etcs
+    railway:kvb: FR:Key:railway:kvb
+    railway:position: FR:Key:railway:position
+    railway:preserved: FR:Key:railway:preserved
+    railway:scmt: FR:Key:railway:scmt
     railway:track_ref: FR:Key:railway:track ref
     railway:track_ref: FR:Key:railway:track ref
+    railway:tvm: FR:Key:railway:tvm
     ramp: FR:Key:ramp
     ramp: FR:Key:ramp
+    ramp:luggage: FR:Key:ramp:luggage
     ref: FR:Key:ref
     ref: FR:Key:ref
+    ref:CD:CNOP: FR:Key:ref:CD:CNOP
     ref:CEF: FR:Key:ref:CEF
     ref:ERDF:gdo: FR:Key:ref:ERDF:gdo
     ref:EU:EVSE: FR:Key:ref:EU:EVSE
     ref:FR:42C: FR:Key:ref:FR:42C
     ref:CEF: FR:Key:ref:CEF
     ref:ERDF:gdo: FR:Key:ref:ERDF:gdo
     ref:EU:EVSE: FR:Key:ref:EU:EVSE
     ref:FR:42C: FR:Key:ref:FR:42C
+    ref:FR:ANFR: FR:Key:ref:FR:ANFR
     ref:FR:ARCEP: FR:Key:ref:FR:ARCEP
     ref:FR:CEF: FR:Key:ref:FR:CEF
     ref:FR:CNC: FR:Key:ref:FR:CNC
     ref:FR:ARCEP: FR:Key:ref:FR:ARCEP
     ref:FR:CEF: FR:Key:ref:FR:CEF
     ref:FR:CNC: FR:Key:ref:FR:CNC
@@ -12922,6 +18421,8 @@ fr:
     ref:FR:DREAL: FR:Key:ref:FR:DREAL
     ref:FR:FANTOIR: FR:Key:ref:FR:FANTOIR
     ref:FR:FINESS: FR:Key:ref:FR:FINESS
     ref:FR:DREAL: FR:Key:ref:FR:DREAL
     ref:FR:FANTOIR: FR:Key:ref:FR:FANTOIR
     ref:FR:FINESS: FR:Key:ref:FR:FINESS
+    ref:FR:FreeMobile: FR:Key:ref:FR:FreeMobile
+    ref:FR:Joconde: FR:Key:ref:FR:Joconde
     ref:FR:MemorialGenWeb: FR:Key:ref:FR:MemorialGenWeb
     ref:FR:NAF: FR:Key:ref:FR:NAF
     ref:FR:Orange: FR:Key:ref:FR:Orange
     ref:FR:MemorialGenWeb: FR:Key:ref:FR:MemorialGenWeb
     ref:FR:NAF: FR:Key:ref:FR:NAF
     ref:FR:Orange: FR:Key:ref:FR:Orange
@@ -12933,6 +18434,11 @@ fr:
     ref:FR:SFR: FR:Key:ref:FR:SFR
     ref:FR:SIREN: FR:Key:ref:FR:SIREN
     ref:FR:SIRET: FR:Key:ref:FR:SIRET
     ref:FR:SFR: FR:Key:ref:FR:SFR
     ref:FR:SIREN: FR:Key:ref:FR:SIREN
     ref:FR:SIRET: FR:Key:ref:FR:SIRET
+    ref:FR:SITCOM: FR:Key:ref:FR:SITCOM
+    ref:FR:SNCF: FR:Key:ref:FR:SNCF
+    ref:FR:SNCF-Réseau: FR:Key:ref:FR:SNCF-Réseau
+    ref:FR:SNCF_Reseau: FR:Key:ref:FR:SNCF Reseau
+    ref:FR:SNCF_Réseau: FR:Key:ref:FR:SNCF Réseau
     ref:FR:commune: FR:Key:ref:FR:commune
     ref:FR:gdo: FR:Key:ref:FR:gdo
     ref:FR:museofile: FR:Key:ref:FR:museofile
     ref:FR:commune: FR:Key:ref:FR:commune
     ref:FR:gdo: FR:Key:ref:FR:gdo
     ref:FR:museofile: FR:Key:ref:FR:museofile
@@ -12940,16 +18446,24 @@ fr:
     ref:RTE:codnat: FR:Key:ref:RTE:codnat
     ref:UAI: FR:Key:ref:UAI
     ref:mhs: FR:Key:ref:mhs
     ref:RTE:codnat: FR:Key:ref:RTE:codnat
     ref:UAI: FR:Key:ref:UAI
     ref:mhs: FR:Key:ref:mhs
+    ref:refuges.info: FR:Key:ref:refuges.info
+    ref:refugesinfo: FR:Key:ref:refugesinfo
     ref:sandre: FR:Key:ref:sandre
     reg_name: FR:Key:reg name
     religion: FR:Key:religion
     ref:sandre: FR:Key:ref:sandre
     reg_name: FR:Key:reg name
     religion: FR:Key:religion
+    repair: FR:Key:repair
     repeat_on: FR:Key:repeat on
     reservation: FR:Key:reservation
     residential: FR:Key:residential
     resource: FR:Key:resource
     repeat_on: FR:Key:repeat on
     reservation: FR:Key:reservation
     residential: FR:Key:residential
     resource: FR:Key:resource
+    reusable_packaging: FR:Key:reusable packaging
+    reusable_packaging:accept: FR:Key:reusable packaging:accept
+    reusable_packaging:offer: FR:Key:reusable packaging:offer
     right: FR:Key:right
     roof:direction: FR:Key:roof:direction
     right: FR:Key:right
     roof:direction: FR:Key:roof:direction
+    roof:levels: FR:Key:roof:levels
     roof:material: FR:Key:roof:material
     roof:material: FR:Key:roof:material
+    roof:shape: FR:Key:roof:shape
     room: FR:Key:room
     ruins: FR:Key:ruins
     sac_scale: FR:Key:sac scale
     room: FR:Key:room
     ruins: FR:Key:ruins
     sac_scale: FR:Key:sac scale
@@ -12959,8 +18473,15 @@ fr:
     seasonal: FR:Key:seasonal
     second_hand: FR:Key:second hand
     segregated: FR:Key:segregated
     seasonal: FR:Key:seasonal
     second_hand: FR:Key:second hand
     segregated: FR:Key:segregated
+    self_checkout: FR:Key:self checkout
     self_service: FR:Key:self service
     service: FR:Key:service
     self_service: FR:Key:self service
     service: FR:Key:service
+    service:bicycle:diy: FR:Key:service:bicycle:diy
+    service:bicycle:miscellaneous: FR:Key:service:bicycle:miscellaneous
+    service:bicycle:rental: FR:Key:service:bicycle:rental
+    service:bicycle:repair: FR:Key:service:bicycle:repair
+    service:bicycle:retail: FR:Key:service:bicycle:retail
+    service:bicycle:second_hand: FR:Key:service:bicycle:second hand
     service_times: FR:Key:service times
     shelter: FR:Key:shelter
     shelter_type: FR:Key:shelter type
     service_times: FR:Key:service times
     shelter: FR:Key:shelter
     shelter_type: FR:Key:shelter type
@@ -12972,6 +18493,7 @@ fr:
     sinkhole: FR:Key:sinkhole
     size: FR:Key:size
     smoothness: FR:Key:smoothness
     sinkhole: FR:Key:sinkhole
     size: FR:Key:size
     smoothness: FR:Key:smoothness
+    snowmobile: FR:Key:snowmobile
     social_facility: FR:Key:social facility
     social_facility:for: FR:Key:social facility:for
     source: FR:Key:source
     social_facility: FR:Key:social facility
     social_facility:for: FR:Key:social facility:for
     source: FR:Key:source
@@ -12979,8 +18501,10 @@ fr:
     source:maxspeed: FR:Key:source:maxspeed
     source:maxwidth: FR:Key:source:maxwidth
     source:name:br: FR:Key:source:name:br
     source:maxspeed: FR:Key:source:maxspeed
     source:maxwidth: FR:Key:source:maxwidth
     source:name:br: FR:Key:source:name:br
+    spacing: FR:Key:spacing
     species: FR:Key:species
     species:fr: FR:Key:species:fr
     species: FR:Key:species
     species:fr: FR:Key:species:fr
+    species:wikidata: FR:Key:species:wikidata
     sport: FR:Key:sport
     stairs: FR:Key:stairs
     start_date: FR:Key:start date
     sport: FR:Key:sport
     stairs: FR:Key:stairs
     start_date: FR:Key:start date
@@ -12988,23 +18512,32 @@ fr:
     step:contrast: FR:Key:step:contrast
     step_count: FR:Key:step count
     stop: FR:Key:stop
     step:contrast: FR:Key:step:contrast
     step_count: FR:Key:step count
     stop: FR:Key:stop
+    substation: FR:Key:substation
     support: FR:Key:support
     surface: FR:Key:surface
     surveillance: FR:Key:surveillance
     support: FR:Key:support
     surface: FR:Key:surface
     surveillance: FR:Key:surveillance
+    surveillance:type: FR:Key:surveillance:type
+    surveillance:zone: FR:Key:surveillance:zone
     survey:date: FR:Key:survey:date
     switch: FR:Key:switch
     symbol: FR:Key:symbol
     tactile_paving: FR:Key:tactile paving
     survey:date: FR:Key:survey:date
     switch: FR:Key:switch
     symbol: FR:Key:symbol
     tactile_paving: FR:Key:tactile paving
+    tactile_writing: FR:Key:tactile writing
     takeaway: FR:Key:takeaway
     takeaway: FR:Key:takeaway
+    taxi: FR:Key:taxi
     telecom: FR:Key:telecom
     telecom:medium: FR:Key:telecom:medium
     telecom: FR:Key:telecom
     telecom:medium: FR:Key:telecom:medium
+    terrace: FR:Key:terrace
     tickets:public_transport_subscription: FR:Key:tickets:public transport subscription
     tidal: FR:Key:tidal
     timezone: FR:Key:timezone
     tickets:public_transport_subscription: FR:Key:tickets:public transport subscription
     tidal: FR:Key:tidal
     timezone: FR:Key:timezone
+    tobacco: FR:Key:tobacco
+    toilets: FR:Key:toilets
     toilets:wheelchair: FR:Key:toilets:wheelchair
     toll: FR:Key:toll
     tourism: FR:Key:tourism
     tower:type: FR:Key:tower:type
     toilets:wheelchair: FR:Key:toilets:wheelchair
     toll: FR:Key:toll
     tourism: FR:Key:tourism
     tower:type: FR:Key:tower:type
+    townhall:type: FR:Key:townhall:type
     tracktype: FR:Key:tracktype
     traffic_calming: FR:Key:traffic calming
     traffic_sign: FR:Key:traffic sign
     tracktype: FR:Key:tracktype
     traffic_calming: FR:Key:traffic calming
     traffic_sign: FR:Key:traffic sign
@@ -13030,27 +18563,41 @@ fr:
     vine_row_orientation: FR:Key:vine row orientation
     visibility: FR:Key:visibility
     voltage: FR:Key:voltage
     vine_row_orientation: FR:Key:vine row orientation
     visibility: FR:Key:visibility
     voltage: FR:Key:voltage
+    voltage:primary: FR:Key:voltage:primary
+    voltage:secondary: FR:Key:voltage:secondary
+    voltage:tertiary: FR:Key:voltage:tertiary
     waste: FR:Key:waste
     water: FR:Key:water
     waste: FR:Key:waste
     water: FR:Key:water
+    water_source: FR:Key:water source
     waterway: FR:Key:waterway
     website: FR:Key:website
     waterway: FR:Key:waterway
     website: FR:Key:website
+    website:booking: FR:Key:website:booking
     wetland: FR:Key:wetland
     wheelchair: FR:Key:wheelchair
     wheelchair:description: FR:Key:wheelchair:description
     width: FR:Key:width
     wetland: FR:Key:wetland
     wheelchair: FR:Key:wheelchair
     wheelchair:description: FR:Key:wheelchair:description
     width: FR:Key:width
+    width:carriageway: FR:Key:width:carriageway
     wikidata: FR:Key:wikidata
     wikimedia_commons: FR:Key:wikimedia commons
     wikipedia: FR:Key:wikipedia
     windings: FR:Key:windings
     wikidata: FR:Key:wikidata
     wikimedia_commons: FR:Key:wikimedia commons
     wikipedia: FR:Key:wikipedia
     windings: FR:Key:windings
+    windings:auto: FR:Key:windings:auto
+    winter_service: FR:Key:winter service
+    wires: FR:Key:wires
     xmas:feature: FR:Key:xmas:feature
     xmas:feature: FR:Key:xmas:feature
-    year_of_construction: FR:Key:year of construction
+    zero_waste: FR:Key:zero waste
+    zone:maxspeed: FR:Key:zone:maxspeed
+    zoo: FR:Key:zoo
   tag:
   tag:
-    Bascule_publique: FR:Tag:Bascule publique
     FIXME=Position_estimated: FR:Tag:FIXME=Position estimated
     FIXME=Position_estimated: FR:Tag:FIXME=Position estimated
+    Man_made=video_wall: FR:Tag:Man made=video wall
+    abandoned:amenity=prison_camp: FR:Tag:abandoned:amenity=prison camp
     abandoned=yes: FR:Tag:abandoned=yes
     access=customers: FR:Tag:access=customers
     access=designated: FR:Tag:access=designated
     access=no: FR:Tag:access=no
     abandoned=yes: FR:Tag:abandoned=yes
     access=customers: FR:Tag:access=customers
     access=designated: FR:Tag:access=designated
     access=no: FR:Tag:access=no
+    access=permissive: FR:Tag:access=permissive
+    access=permit: FR:Tag:access=permit
     access=private: FR:Tag:access=private
     actuator=electric_motor: FR:Tag:actuator=electric motor
     actuator=hydraulic_cylinder: FR:Tag:actuator=hydraulic cylinder
     access=private: FR:Tag:access=private
     actuator=electric_motor: FR:Tag:actuator=electric motor
     actuator=hydraulic_cylinder: FR:Tag:actuator=hydraulic cylinder
@@ -13069,7 +18616,7 @@ fr:
     advertising=wall_painting: FR:Tag:advertising=wall painting
     aerialway=cable_car: FR:Tag:aerialway=cable car
     aerialway=chair_lift: FR:Tag:aerialway=chair lift
     advertising=wall_painting: FR:Tag:advertising=wall painting
     aerialway=cable_car: FR:Tag:aerialway=cable car
     aerialway=chair_lift: FR:Tag:aerialway=chair lift
-    aeroway=aerodrome: FR:Tag:aeroway=aerodrome
+    aeroway=airtanker_base: FR:Tag:aeroway=airtanker base
     aeroway=apron: FR:Tag:aeroway=apron
     aeroway=gate: FR:Tag:aeroway=gate
     aeroway=hangar: FR:Tag:aeroway=hangar
     aeroway=apron: FR:Tag:aeroway=apron
     aeroway=gate: FR:Tag:aeroway=gate
     aeroway=hangar: FR:Tag:aeroway=hangar
@@ -13078,20 +18625,25 @@ fr:
     aeroway=parking_position: FR:Tag:aeroway=parking position
     aeroway=runway: FR:Tag:aeroway=runway
     aeroway=taxiway: FR:Tag:aeroway=taxiway
     aeroway=parking_position: FR:Tag:aeroway=parking position
     aeroway=runway: FR:Tag:aeroway=runway
     aeroway=taxiway: FR:Tag:aeroway=taxiway
+    aeroway=windsock: FR:Tag:aeroway=windsock
     amenity=animal_boarding: FR:Tag:amenity=animal boarding
     amenity=animal_breeding: FR:Tag:amenity=animal breeding
     amenity=animal_shelter: FR:Tag:amenity=animal shelter
     amenity=arts_centre: FR:Tag:amenity=arts centre
     amenity=atm: FR:Tag:amenity=atm
     amenity=animal_boarding: FR:Tag:amenity=animal boarding
     amenity=animal_breeding: FR:Tag:amenity=animal breeding
     amenity=animal_shelter: FR:Tag:amenity=animal shelter
     amenity=arts_centre: FR:Tag:amenity=arts centre
     amenity=atm: FR:Tag:amenity=atm
+    amenity=baby_hatch: FR:Tag:amenity=baby hatch
+    amenity=baking_oven: FR:Tag:amenity=baking oven
     amenity=bank: FR:Tag:amenity=bank
     amenity=bar: FR:Tag:amenity=bar
     amenity=bbq: FR:Tag:amenity=bbq
     amenity=bench: FR:Tag:amenity=bench
     amenity=bank: FR:Tag:amenity=bank
     amenity=bar: FR:Tag:amenity=bar
     amenity=bbq: FR:Tag:amenity=bbq
     amenity=bench: FR:Tag:amenity=bench
+    amenity=bicycle_library: FR:Tag:amenity=bicycle library
     amenity=bicycle_parking: FR:Tag:amenity=bicycle parking
     amenity=bicycle_rental: FR:Tag:amenity=bicycle rental
     amenity=bicycle_repair_station: FR:Tag:amenity=bicycle repair station
     amenity=biergarten: FR:Tag:amenity=biergarten
     amenity=binoculars: FR:Tag:amenity=binoculars
     amenity=bicycle_parking: FR:Tag:amenity=bicycle parking
     amenity=bicycle_rental: FR:Tag:amenity=bicycle rental
     amenity=bicycle_repair_station: FR:Tag:amenity=bicycle repair station
     amenity=biergarten: FR:Tag:amenity=biergarten
     amenity=binoculars: FR:Tag:amenity=binoculars
+    amenity=bird_bath: FR:Tag:amenity=bird bath
     amenity=boat_rental: FR:Tag:amenity=boat rental
     amenity=boat_sharing: FR:Tag:amenity=boat sharing
     amenity=brothel: FR:Tag:amenity=brothel
     amenity=boat_rental: FR:Tag:amenity=boat rental
     amenity=boat_sharing: FR:Tag:amenity=boat sharing
     amenity=brothel: FR:Tag:amenity=brothel
@@ -13100,11 +18652,13 @@ fr:
     amenity=car_pooling: FR:Tag:amenity=car pooling
     amenity=car_rental: FR:Tag:amenity=car rental
     amenity=car_sharing: FR:Tag:amenity=car sharing
     amenity=car_pooling: FR:Tag:amenity=car pooling
     amenity=car_rental: FR:Tag:amenity=car rental
     amenity=car_sharing: FR:Tag:amenity=car sharing
+    amenity=car_wash: FR:Tag:amenity=car wash
     amenity=casino: FR:Tag:amenity=casino
     amenity=charging_station: FR:Tag:amenity=charging station
     amenity=childcare: FR:Tag:amenity=childcare
     amenity=cinema: FR:Tag:amenity=cinema
     amenity=clinic: FR:Tag:amenity=clinic
     amenity=casino: FR:Tag:amenity=casino
     amenity=charging_station: FR:Tag:amenity=charging station
     amenity=childcare: FR:Tag:amenity=childcare
     amenity=cinema: FR:Tag:amenity=cinema
     amenity=clinic: FR:Tag:amenity=clinic
+    amenity=clock: FR:Tag:amenity=clock
     amenity=college: FR:Tag:amenity=college
     amenity=community_center: FR:Tag:amenity=community center
     amenity=community_centre: FR:Tag:amenity=community centre
     amenity=college: FR:Tag:amenity=college
     amenity=community_center: FR:Tag:amenity=community center
     amenity=community_centre: FR:Tag:amenity=community centre
@@ -13116,19 +18670,25 @@ fr:
     amenity=dentist: FR:Tag:amenity=dentist
     amenity=device_charging_station: FR:Tag:amenity=device charging station
     amenity=doctors: FR:Tag:amenity=doctors
     amenity=dentist: FR:Tag:amenity=dentist
     amenity=device_charging_station: FR:Tag:amenity=device charging station
     amenity=doctors: FR:Tag:amenity=doctors
+    amenity=dog_parking: FR:Tag:amenity=dog parking
     amenity=dog_toilet: FR:Tag:amenity=dog toilet
     amenity=dog_toilet: FR:Tag:amenity=dog toilet
+    amenity=dressing_room: FR:Tag:amenity=dressing room
     amenity=drinking_water: FR:Tag:amenity=drinking water
     amenity=drinking_water: FR:Tag:amenity=drinking water
+    amenity=driver_training: FR:Tag:amenity=driver training
     amenity=driving_school: FR:Tag:amenity=driving school
     amenity=dryer: FR:Tag:amenity=dryer
     amenity=embassy: FR:Tag:amenity=embassy
     amenity=events_venue: FR:Tag:amenity=events venue
     amenity=fast_food: FR:Tag:amenity=fast food
     amenity=feeding_place: FR:Tag:amenity=feeding place
     amenity=driving_school: FR:Tag:amenity=driving school
     amenity=dryer: FR:Tag:amenity=dryer
     amenity=embassy: FR:Tag:amenity=embassy
     amenity=events_venue: FR:Tag:amenity=events venue
     amenity=fast_food: FR:Tag:amenity=fast food
     amenity=feeding_place: FR:Tag:amenity=feeding place
+    amenity=ferry_terminal: FR:Tag:amenity=ferry terminal
+    amenity=fire_hydrant: FR:Tag:amenity=fire hydrant
     amenity=fire_station: FR:Tag:amenity=fire station
     amenity=food_court: FR:Tag:amenity=food court
     amenity=fountain: FR:Tag:amenity=fountain
     amenity=fuel: FR:Tag:amenity=fuel
     amenity=funeral_hall: FR:Tag:amenity=funeral hall
     amenity=fire_station: FR:Tag:amenity=fire station
     amenity=food_court: FR:Tag:amenity=food court
     amenity=fountain: FR:Tag:amenity=fountain
     amenity=fuel: FR:Tag:amenity=fuel
     amenity=funeral_hall: FR:Tag:amenity=funeral hall
+    amenity=game_feeding: FR:Tag:amenity=game feeding
     amenity=give_box: FR:Tag:amenity=give box
     amenity=grave_yard: FR:Tag:amenity=grave yard
     amenity=grit_bin: FR:Tag:amenity=grit bin
     amenity=give_box: FR:Tag:amenity=give box
     amenity=grave_yard: FR:Tag:amenity=grave yard
     amenity=grit_bin: FR:Tag:amenity=grit bin
@@ -13137,25 +18697,36 @@ fr:
     amenity=hospital: FR:Tag:amenity=hospital
     amenity=hunting_stand: FR:Tag:amenity=hunting stand
     amenity=ice_cream: FR:Tag:amenity=ice cream
     amenity=hospital: FR:Tag:amenity=hospital
     amenity=hunting_stand: FR:Tag:amenity=hunting stand
     amenity=ice_cream: FR:Tag:amenity=ice cream
+    amenity=karaoke_box: FR:Tag:amenity=karaoke box
     amenity=kindergarten: FR:Tag:amenity=kindergarten
     amenity=kindergarten: FR:Tag:amenity=kindergarten
+    amenity=language_school: FR:Tag:amenity=language school
     amenity=lavoir: FR:Tag:amenity=lavoir
     amenity=letter_box: FR:Tag:amenity=letter box
     amenity=library: FR:Tag:amenity=library
     amenity=lavoir: FR:Tag:amenity=lavoir
     amenity=letter_box: FR:Tag:amenity=letter box
     amenity=library: FR:Tag:amenity=library
+    amenity=library_dropoff: FR:Tag:amenity=library dropoff
     amenity=loading_dock: FR:Tag:amenity=loading dock
     amenity=loading_dock: FR:Tag:amenity=loading dock
+    amenity=locker: FR:Tag:amenity=locker
+    amenity=lounger: FR:Tag:amenity=lounger
     amenity=love_hotel: FR:Tag:amenity=love hotel
     amenity=love_hotel: FR:Tag:amenity=love hotel
+    amenity=mailroom: FR:Tag:amenity=mailroom
     amenity=marae: FR:Tag:amenity=marae
     amenity=marketplace: FR:Tag:amenity=marketplace
     amenity=marae: FR:Tag:amenity=marae
     amenity=marketplace: FR:Tag:amenity=marketplace
+    amenity=mist_spraying_cooler: FR:Tag:amenity=mist spraying cooler
     amenity=monastery: FR:Tag:amenity=monastery
     amenity=mortuary: FR:Tag:amenity=mortuary
     amenity=motorcycle_parking: FR:Tag:amenity=motorcycle parking
     amenity=music_school: FR:Tag:amenity=music school
     amenity=nightclub: FR:Tag:amenity=nightclub
     amenity=nursing_home: FR:Tag:amenity=nursing home
     amenity=monastery: FR:Tag:amenity=monastery
     amenity=mortuary: FR:Tag:amenity=mortuary
     amenity=motorcycle_parking: FR:Tag:amenity=motorcycle parking
     amenity=music_school: FR:Tag:amenity=music school
     amenity=nightclub: FR:Tag:amenity=nightclub
     amenity=nursing_home: FR:Tag:amenity=nursing home
+    amenity=nutritionist: FR:Tag:amenity=nutritionist
+    amenity=parcel_locker: FR:Tag:amenity=parcel locker
     amenity=parking: FR:Tag:amenity=parking
     amenity=parking_entrance: FR:Tag:amenity=parking entrance
     amenity=parking_space: FR:Tag:amenity=parking space
     amenity=parking: FR:Tag:amenity=parking
     amenity=parking_entrance: FR:Tag:amenity=parking entrance
     amenity=parking_space: FR:Tag:amenity=parking space
+    amenity=payment_centre: FR:Tag:amenity=payment centre
     amenity=pharmacy: FR:Tag:amenity=pharmacy
     amenity=photo_booth: FR:Tag:amenity=photo booth
     amenity=pharmacy: FR:Tag:amenity=pharmacy
     amenity=photo_booth: FR:Tag:amenity=photo booth
+    amenity=place_of_mourning: FR:Tag:amenity=place of mourning
     amenity=place_of_worship: FR:Tag:amenity=place of worship
     amenity=planetarium: FR:Tag:amenity=planetarium
     amenity=police: FR:Tag:amenity=police
     amenity=place_of_worship: FR:Tag:amenity=place of worship
     amenity=planetarium: FR:Tag:amenity=planetarium
     amenity=police: FR:Tag:amenity=police
@@ -13163,8 +18734,10 @@ fr:
     amenity=post_box: FR:Tag:amenity=post box
     amenity=post_depot: FR:Tag:amenity=post depot
     amenity=post_office: FR:Tag:amenity=post office
     amenity=post_box: FR:Tag:amenity=post box
     amenity=post_depot: FR:Tag:amenity=post depot
     amenity=post_office: FR:Tag:amenity=post office
+    amenity=printer: FR:Tag:amenity=printer
     amenity=prison: FR:Tag:amenity=prison
     amenity=pub: FR:Tag:amenity=pub
     amenity=prison: FR:Tag:amenity=prison
     amenity=pub: FR:Tag:amenity=pub
+    amenity=public_bath: FR:Tag:amenity=public bath
     amenity=public_bookcase: FR:Tag:amenity=public bookcase
     amenity=reception_desk: FR:Tag:amenity=reception desk
     amenity=recycling: FR:Tag:amenity=recycling
     amenity=public_bookcase: FR:Tag:amenity=public bookcase
     amenity=reception_desk: FR:Tag:amenity=reception desk
     amenity=recycling: FR:Tag:amenity=recycling
@@ -13182,9 +18755,12 @@ fr:
     amenity=taxi: FR:Tag:amenity=taxi
     amenity=telephone: FR:Tag:amenity=telephone
     amenity=theatre: FR:Tag:amenity=theatre
     amenity=taxi: FR:Tag:amenity=taxi
     amenity=telephone: FR:Tag:amenity=telephone
     amenity=theatre: FR:Tag:amenity=theatre
+    amenity=ticket_validator: FR:Tag:amenity=ticket validator
     amenity=toilets: FR:Tag:amenity=toilets
     amenity=townhall: FR:Tag:amenity=townhall
     amenity=toy_library: FR:Tag:amenity=toy library
     amenity=toilets: FR:Tag:amenity=toilets
     amenity=townhall: FR:Tag:amenity=townhall
     amenity=toy_library: FR:Tag:amenity=toy library
+    amenity=traffic_park: FR:Tag:amenity=traffic park
+    amenity=trolley_bay: FR:Tag:amenity=trolley bay
     amenity=university: FR:Tag:amenity=university
     amenity=vacuum_cleaner: FR:Tag:amenity=vacuum cleaner
     amenity=vehicle_inspection: FR:Tag:amenity=vehicle inspection
     amenity=university: FR:Tag:amenity=university
     amenity=vacuum_cleaner: FR:Tag:amenity=vacuum cleaner
     amenity=vehicle_inspection: FR:Tag:amenity=vehicle inspection
@@ -13202,6 +18778,9 @@ fr:
     artwork_type=sculpture: FR:Tag:artwork type=sculpture
     atm=yes: FR:Tag:atm=yes
     attraction=animal: FR:Tag:attraction=animal
     artwork_type=sculpture: FR:Tag:artwork type=sculpture
     atm=yes: FR:Tag:atm=yes
     attraction=animal: FR:Tag:attraction=animal
+    attraction=water_slide: FR:Tag:attraction=water slide
+    barrier=bar: FR:Tag:barrier=bar
+    barrier=barrier_board: FR:Tag:barrier=barrier board
     barrier=block: FR:Tag:barrier=block
     barrier=bollard: FR:Tag:barrier=bollard
     barrier=border_control: FR:Tag:barrier=border control
     barrier=block: FR:Tag:barrier=block
     barrier=bollard: FR:Tag:barrier=bollard
     barrier=border_control: FR:Tag:barrier=border control
@@ -13235,7 +18814,6 @@ fr:
     barrier=retaining_wall: FR:Tag:barrier=retaining wall
     barrier=rope: FR:Tag:barrier=rope
     barrier=sally_port: FR:Tag:barrier=sally port
     barrier=retaining_wall: FR:Tag:barrier=retaining wall
     barrier=rope: FR:Tag:barrier=rope
     barrier=sally_port: FR:Tag:barrier=sally port
-    barrier=select_acces: FR:Tag:barrier=select acces
     barrier=spikes: FR:Tag:barrier=spikes
     barrier=stile: FR:Tag:barrier=stile
     barrier=sump_buster: FR:Tag:barrier=sump buster
     barrier=spikes: FR:Tag:barrier=spikes
     barrier=stile: FR:Tag:barrier=stile
     barrier=sump_buster: FR:Tag:barrier=sump buster
@@ -13247,8 +18825,13 @@ fr:
     basin=detention: FR:Tag:basin=detention
     basin=infiltration: FR:Tag:basin=infiltration
     basin=retention: FR:Tag:basin=retention
     basin=detention: FR:Tag:basin=detention
     basin=infiltration: FR:Tag:basin=infiltration
     basin=retention: FR:Tag:basin=retention
+    bicycle=designated: FR:Tag:bicycle=designated
+    bicycle=dismount: FR:Tag:bicycle=dismount
     bicycle=use_sidepath: FR:Tag:bicycle=use sidepath
     bicycle=use_sidepath: FR:Tag:bicycle=use sidepath
+    bicycle_road=yes: FR:Tag:bicycle road=yes
+    boules=petanque: FR:Tag:boules=petanque
     boundary=administrative: FR:Tag:boundary=administrative
     boundary=administrative: FR:Tag:boundary=administrative
+    boundary=religious_administration: FR:Tag:boundary=religious administration
     boundary=special_economic_zone: FR:Tag:boundary=special economic zone
     brand=Trilib': FR:Tag:brand=Trilib'
     bridge=aqueduct: FR:Tag:bridge=aqueduct
     boundary=special_economic_zone: FR:Tag:boundary=special economic zone
     brand=Trilib': FR:Tag:brand=Trilib'
     bridge=aqueduct: FR:Tag:bridge=aqueduct
@@ -13257,7 +18840,9 @@ fr:
     bridge=movable: FR:Tag:bridge=movable
     bridge=trestle: FR:Tag:bridge=trestle
     bridge=viaduct: FR:Tag:bridge=viaduct
     bridge=movable: FR:Tag:bridge=movable
     bridge=trestle: FR:Tag:bridge=trestle
     bridge=viaduct: FR:Tag:bridge=viaduct
+    building:prefabricated=yes: FR:Tag:building:prefabricated=yes
     building=apartments: FR:Tag:building=apartments
     building=apartments: FR:Tag:building=apartments
+    building=bakehouse: FR:Tag:building=bakehouse
     building=barn: FR:Tag:building=barn
     building=bridge: FR:Tag:building=bridge
     building=cabin: FR:Tag:building=cabin
     building=barn: FR:Tag:building=barn
     building=bridge: FR:Tag:building=bridge
     building=cabin: FR:Tag:building=cabin
@@ -13265,8 +18850,11 @@ fr:
     building=church: FR:Tag:building=church
     building=commercial: FR:Tag:building=commercial
     building=construction: FR:Tag:building=construction
     building=church: FR:Tag:building=church
     building=commercial: FR:Tag:building=commercial
     building=construction: FR:Tag:building=construction
+    building=data_center: FR:Tag:building=data center
     building=detached: FR:Tag:building=detached
     building=detached: FR:Tag:building=detached
+    building=digester: FR:Tag:building=digester
     building=farm: FR:Tag:building=farm
     building=farm: FR:Tag:building=farm
+    building=fire_lookout: FR:Tag:building=fire lookout
     building=fire_station: FR:Tag:building=fire station
     building=garage: FR:Tag:building=garage
     building=garages: FR:Tag:building=garages
     building=fire_station: FR:Tag:building=fire station
     building=garage: FR:Tag:building=garage
     building=garages: FR:Tag:building=garages
@@ -13274,6 +18862,7 @@ fr:
     building=ger: FR:Tag:building=ger
     building=grandstand: FR:Tag:building=grandstand
     building=greenhouse: FR:Tag:building=greenhouse
     building=ger: FR:Tag:building=ger
     building=grandstand: FR:Tag:building=grandstand
     building=greenhouse: FR:Tag:building=greenhouse
+    building=guardhouse: FR:Tag:building=guardhouse
     building=hangar: FR:Tag:building=hangar
     building=hotel: FR:Tag:building=hotel
     building=house: FR:Tag:building=house
     building=hangar: FR:Tag:building=hangar
     building=hotel: FR:Tag:building=hotel
     building=house: FR:Tag:building=house
@@ -13288,16 +18877,35 @@ fr:
     building=roof: FR:Tag:building=roof
     building=ruins: FR:Tag:building=ruins
     building=semidetached_house: FR:Tag:building=semidetached house
     building=roof: FR:Tag:building=roof
     building=ruins: FR:Tag:building=ruins
     building=semidetached_house: FR:Tag:building=semidetached house
+    building=service: FR:Tag:building=service
     building=shed: FR:Tag:building=shed
     building=shed: FR:Tag:building=shed
+    building=ship: FR:Tag:building=ship
+    building=slurry_tank: FR:Tag:building=slurry tank
     building=sports_hall: FR:Tag:building=sports hall
     building=stable: FR:Tag:building=stable
     building=stadium: FR:Tag:building=stadium
     building=sports_hall: FR:Tag:building=sports hall
     building=stable: FR:Tag:building=stable
     building=stadium: FR:Tag:building=stadium
+    building=static_caravan: FR:Tag:building=static caravan
+    building=stilt_house: FR:Tag:building=stilt house
     building=sty: FR:Tag:building=sty
     building=sty: FR:Tag:building=sty
+    building=tent: FR:Tag:building=tent
     building=terrace: FR:Tag:building=terrace
     building=warehouse: FR:Tag:building=warehouse
     cafe=time-cafe: FR:Tag:cafe=time-cafe
     building=terrace: FR:Tag:building=terrace
     building=warehouse: FR:Tag:building=warehouse
     cafe=time-cafe: FR:Tag:cafe=time-cafe
+    cemetery=war_cemetery: FR:Tag:cemetery=war cemetery
+    club=cadet: FR:Tag:club=cadet
     club=sport: FR:Tag:club=sport
     club=sport: FR:Tag:club=sport
+    compensator=filter: FR:Tag:compensator=filter
+    compensator=series_capacitor: FR:Tag:compensator=series capacitor
+    compensator=series_reactor: FR:Tag:compensator=series reactor
+    compensator=shunt_capacitor: FR:Tag:compensator=shunt capacitor
+    compensator=shunt_reactor: FR:Tag:compensator=shunt reactor
+    compensator=statcom: FR:Tag:compensator=statcom
+    compensator=static_var: FR:Tag:compensator=static var
+    compensator=synchronous_condenser: FR:Tag:compensator=synchronous condenser
+    compensator=voltage_regulator: FR:Tag:compensator=voltage regulator
     construction=yes: FR:Tag:construction=yes
     construction=yes: FR:Tag:construction=yes
+    consulate=consulate_general: FR:Tag:consulate=consulate general
+    consulate=residence: FR:Tag:consulate=residence
     craft=agricultural_engines: FR:Tag:craft=agricultural engines
     craft=bakery: FR:Tag:craft=bakery
     craft=basket_maker: FR:Tag:craft=basket maker
     craft=agricultural_engines: FR:Tag:craft=agricultural engines
     craft=bakery: FR:Tag:craft=bakery
     craft=basket_maker: FR:Tag:craft=basket maker
@@ -13378,18 +18986,31 @@ fr:
     craft=welder: FR:Tag:craft=welder
     craft=window_construction: FR:Tag:craft=window construction
     craft=winery: FR:Tag:craft=winery
     craft=welder: FR:Tag:craft=welder
     craft=window_construction: FR:Tag:craft=window construction
     craft=winery: FR:Tag:craft=winery
+    crossing=marked: FR:Tag:crossing=marked
+    crossing=unmarked: FR:Tag:crossing=unmarked
     crossing=zebra: FR:Tag:crossing=zebra
     crossing=zebra: FR:Tag:crossing=zebra
+    crossing_ref=zebra: FR:Tag:crossing ref=zebra
     cuisine=coffee_shop: FR:Tag:cuisine=coffee shop
     cuisine=coffee_shop: FR:Tag:cuisine=coffee shop
+    cuisine=sushi: FR:Tag:cuisine=sushi
+    cuisine=teahouse: FR:Tag:cuisine=teahouse
     cycleway:right=lane: FR:Tag:cycleway:right=lane
     cycleway=asl: FR:Tag:cycleway=asl
     cycleway=bike_box: FR:Tag:cycleway=bike box
     cycleway:right=lane: FR:Tag:cycleway:right=lane
     cycleway=asl: FR:Tag:cycleway=asl
     cycleway=bike_box: FR:Tag:cycleway=bike box
+    cycleway=lane: FR:Tag:cycleway=lane
     cycleway=opposite: FR:Tag:cycleway=opposite
     cycleway=opposite_lane: FR:Tag:cycleway=opposite lane
     cycleway=opposite: FR:Tag:cycleway=opposite
     cycleway=opposite_lane: FR:Tag:cycleway=opposite lane
+    cycleway=proposed: FR:Tag:cycleway=proposed
     cycleway=share_busway: FR:Tag:cycleway=share busway
     cycleway=share_busway: FR:Tag:cycleway=share busway
+    cycleway=shared_lane: FR:Tag:cycleway=shared lane
+    diplomatic=consulate: FR:Tag:diplomatic=consulate
+    diplomatic=embassy: FR:Tag:diplomatic=embassy
+    diplomatic=liaison: FR:Tag:diplomatic=liaison
     disused=yes: FR:Tag:disused=yes
     emergency=access_point: FR:Tag:emergency=access point
     disused=yes: FR:Tag:disused=yes
     emergency=access_point: FR:Tag:emergency=access point
+    emergency=air_rescue_service: FR:Tag:emergency=air rescue service
     emergency=ambulance_station: FR:Tag:emergency=ambulance station
     emergency=assembly_point: FR:Tag:emergency=assembly point
     emergency=ambulance_station: FR:Tag:emergency=ambulance station
     emergency=assembly_point: FR:Tag:emergency=assembly point
+    emergency=control_centre: FR:Tag:emergency=control centre
     emergency=defibrillator: FR:Tag:emergency=defibrillator
     emergency=dry_riser_inlet: FR:Tag:emergency=dry riser inlet
     emergency=emergency_ward_entrance: FR:Tag:emergency=emergency ward entrance
     emergency=defibrillator: FR:Tag:emergency=defibrillator
     emergency=dry_riser_inlet: FR:Tag:emergency=dry riser inlet
     emergency=emergency_ward_entrance: FR:Tag:emergency=emergency ward entrance
@@ -13398,6 +19019,7 @@ fr:
     emergency=fire_flapper: FR:Tag:emergency=fire flapper
     emergency=fire_hose: FR:Tag:emergency=fire hose
     emergency=fire_hydrant: FR:Tag:emergency=fire hydrant
     emergency=fire_flapper: FR:Tag:emergency=fire flapper
     emergency=fire_hose: FR:Tag:emergency=fire hose
     emergency=fire_hydrant: FR:Tag:emergency=fire hydrant
+    emergency=fire_lookout: FR:Tag:emergency=fire lookout
     emergency=fire_sand_bin: FR:Tag:emergency=fire sand bin
     emergency=fire_water_pond: FR:Tag:emergency=fire water pond
     emergency=landing_site: FR:Tag:emergency=landing site
     emergency=fire_sand_bin: FR:Tag:emergency=fire sand bin
     emergency=fire_water_pond: FR:Tag:emergency=fire water pond
     emergency=landing_site: FR:Tag:emergency=landing site
@@ -13411,35 +19033,49 @@ fr:
     emergency=water_rescue_station: FR:Tag:emergency=water rescue station
     emergency=water_tank: FR:Tag:emergency=water tank
     fast_food=cafeteria: FR:Tag:fast food=cafeteria
     emergency=water_rescue_station: FR:Tag:emergency=water rescue station
     emergency=water_tank: FR:Tag:emergency=water tank
     fast_food=cafeteria: FR:Tag:fast food=cafeteria
+    foot=designated: FR:Tag:foot=designated
+    footway=access_aisle: FR:Tag:footway=access aisle
     footway=crossing: FR:Tag:footway=crossing
     footway=sidewalk: FR:Tag:footway=sidewalk
     footway=crossing: FR:Tag:footway=crossing
     footway=sidewalk: FR:Tag:footway=sidewalk
+    footway=traffic_island: FR:Tag:footway=traffic island
     generator:method=combustion: FR:Tag:generator:method=combustion
     generator:method=fission: FR:Tag:generator:method=fission
     generator:method=fusion: FR:Tag:generator:method=fusion
     generator:method=gasification: FR:Tag:generator:method=gasification
     generator:method=photovoltaic: FR:Tag:generator:method=photovoltaic
     generator:method=thermal: FR:Tag:generator:method=thermal
     generator:method=combustion: FR:Tag:generator:method=combustion
     generator:method=fission: FR:Tag:generator:method=fission
     generator:method=fusion: FR:Tag:generator:method=fusion
     generator:method=gasification: FR:Tag:generator:method=gasification
     generator:method=photovoltaic: FR:Tag:generator:method=photovoltaic
     generator:method=thermal: FR:Tag:generator:method=thermal
+    generator:method=water-pumped-storage: FR:Tag:generator:method=water-pumped-storage
     generator:source=biofuel: FR:Tag:generator:source=biofuel
     generator:source=biogas: FR:Tag:generator:source=biogas
     generator:source=biomass: FR:Tag:generator:source=biomass
     generator:source=coal: FR:Tag:generator:source=coal
     generator:source=biofuel: FR:Tag:generator:source=biofuel
     generator:source=biogas: FR:Tag:generator:source=biogas
     generator:source=biomass: FR:Tag:generator:source=biomass
     generator:source=coal: FR:Tag:generator:source=coal
+    generator:source=diesel: FR:Tag:generator:source=diesel
     generator:source=gas: FR:Tag:generator:source=gas
     generator:source=hydro: FR:Tag:generator:source=hydro
     generator:source=nuclear: FR:Tag:generator:source=nuclear
     generator:source=oil: FR:Tag:generator:source=oil
     generator:source=solar: FR:Tag:generator:source=solar
     generator:source=tidal: FR:Tag:generator:source=tidal
     generator:source=gas: FR:Tag:generator:source=gas
     generator:source=hydro: FR:Tag:generator:source=hydro
     generator:source=nuclear: FR:Tag:generator:source=nuclear
     generator:source=oil: FR:Tag:generator:source=oil
     generator:source=solar: FR:Tag:generator:source=solar
     generator:source=tidal: FR:Tag:generator:source=tidal
+    generator:source=waste: FR:Tag:generator:source=waste
     generator:source=wind: FR:Tag:generator:source=wind
     government=ministry: FR:Tag:government=ministry
     government=register_office: FR:Tag:government=register office
     government=tax: FR:Tag:government=tax
     generator:source=wind: FR:Tag:generator:source=wind
     government=ministry: FR:Tag:government=ministry
     government=register_office: FR:Tag:government=register office
     government=tax: FR:Tag:government=tax
+    handle=lever: FR:Tag:handle=lever
     handle=wheel: FR:Tag:handle=wheel
     handle=wheel: FR:Tag:handle=wheel
+    hazard=dangerous_junction: FR:Tag:hazard=dangerous junction
     healthcare=blood_donation: FR:Tag:healthcare=blood donation
     healthcare=blood_donation: FR:Tag:healthcare=blood donation
+    healthcare=clinic: FR:Tag:healthcare=clinic
+    healthcare=doctor: FR:Tag:healthcare=doctor
     healthcare=laboratory: FR:Tag:healthcare=laboratory
     healthcare=laboratory: FR:Tag:healthcare=laboratory
+    healthcare=nurse: FR:Tag:healthcare=nurse
     healthcare=physiotherapist: FR:Tag:healthcare=physiotherapist
     healthcare=physiotherapist: FR:Tag:healthcare=physiotherapist
+    healthcare=sample_collection: FR:Tag:healthcare=sample collection
+    healthcare=vaccination_centre: FR:Tag:healthcare=vaccination centre
     highway=bridleway: FR:Tag:highway=bridleway
     highway=bus_guideway: FR:Tag:highway=bus guideway
     highway=bus_stop: FR:Tag:highway=bus stop
     highway=bridleway: FR:Tag:highway=bridleway
     highway=bus_guideway: FR:Tag:highway=bus guideway
     highway=bus_stop: FR:Tag:highway=bus stop
+    highway=busway: FR:Tag:highway=busway
     highway=crossing: FR:Tag:highway=crossing
     highway=cycleway: FR:Tag:highway=cycleway
     highway=elevator: FR:Tag:highway=elevator
     highway=crossing: FR:Tag:highway=crossing
     highway=cycleway: FR:Tag:highway=cycleway
     highway=elevator: FR:Tag:highway=elevator
@@ -13470,9 +19106,11 @@ fr:
     highway=stop: FR:Tag:highway=stop
     highway=street_lamp: FR:Tag:highway=street lamp
     highway=tertiary: FR:Tag:highway=tertiary
     highway=stop: FR:Tag:highway=stop
     highway=street_lamp: FR:Tag:highway=street lamp
     highway=tertiary: FR:Tag:highway=tertiary
+    highway=toll_gantry: FR:Tag:highway=toll gantry
     highway=track: FR:Tag:highway=track
     highway=traffic_mirror: FR:Tag:highway=traffic mirror
     highway=traffic_signals: FR:Tag:highway=traffic signals
     highway=track: FR:Tag:highway=track
     highway=traffic_mirror: FR:Tag:highway=traffic mirror
     highway=traffic_signals: FR:Tag:highway=traffic signals
+    highway=trailhead: FR:Tag:highway=trailhead
     highway=trunk: FR:Tag:highway=trunk
     highway=turning_circle: FR:Tag:highway=turning circle
     highway=unclassified: FR:Tag:highway=unclassified
     highway=trunk: FR:Tag:highway=trunk
     highway=turning_circle: FR:Tag:highway=turning circle
     highway=unclassified: FR:Tag:highway=unclassified
@@ -13517,6 +19155,7 @@ fr:
     information=office: FR:Tag:information=office
     information=terminal: FR:Tag:information=terminal
     junction=roundabout: FR:Tag:junction=roundabout
     information=office: FR:Tag:information=office
     information=terminal: FR:Tag:information=terminal
     junction=roundabout: FR:Tag:junction=roundabout
+    junction=yes: FR:Tag:junction=yes
     landcover=grass: FR:Tag:landcover=grass
     landuse=allotments: FR:Tag:landuse=allotments
     landuse=animal_keeping: FR:Tag:landuse=animal keeping
     landcover=grass: FR:Tag:landcover=grass
     landuse=allotments: FR:Tag:landuse=allotments
     landuse=animal_keeping: FR:Tag:landuse=animal keeping
@@ -13526,27 +19165,34 @@ fr:
     landuse=cemetery: FR:Tag:landuse=cemetery
     landuse=commercial: FR:Tag:landuse=commercial
     landuse=construction: FR:Tag:landuse=construction
     landuse=cemetery: FR:Tag:landuse=cemetery
     landuse=commercial: FR:Tag:landuse=commercial
     landuse=construction: FR:Tag:landuse=construction
+    landuse=education: FR:Tag:landuse=education
+    landuse=fairground: FR:Tag:landuse=fairground
     landuse=farm: FR:Tag:landuse=farm
     landuse=farmland: FR:Tag:landuse=farmland
     landuse=farmyard: FR:Tag:landuse=farmyard
     landuse=flowerbed: FR:Tag:landuse=flowerbed
     landuse=forest: FR:Tag:landuse=forest
     landuse=farm: FR:Tag:landuse=farm
     landuse=farmland: FR:Tag:landuse=farmland
     landuse=farmyard: FR:Tag:landuse=farmyard
     landuse=flowerbed: FR:Tag:landuse=flowerbed
     landuse=forest: FR:Tag:landuse=forest
+    landuse=forestry: FR:Tag:landuse=forestry
     landuse=garages: FR:Tag:landuse=garages
     landuse=grass: FR:Tag:landuse=grass
     landuse=greenhouse_horticulture: FR:Tag:landuse=greenhouse horticulture
     landuse=industrial: FR:Tag:landuse=industrial
     landuse=landfill: FR:Tag:landuse=landfill
     landuse=meadow: FR:Tag:landuse=meadow
     landuse=garages: FR:Tag:landuse=garages
     landuse=grass: FR:Tag:landuse=grass
     landuse=greenhouse_horticulture: FR:Tag:landuse=greenhouse horticulture
     landuse=industrial: FR:Tag:landuse=industrial
     landuse=landfill: FR:Tag:landuse=landfill
     landuse=meadow: FR:Tag:landuse=meadow
+    landuse=military: FR:Tag:landuse=military
     landuse=orchard: FR:Tag:landuse=orchard
     landuse=plant_nursery: FR:Tag:landuse=plant nursery
     landuse=pond: FR:Tag:landuse=pond
     landuse=quarry: FR:Tag:landuse=quarry
     landuse=orchard: FR:Tag:landuse=orchard
     landuse=plant_nursery: FR:Tag:landuse=plant nursery
     landuse=pond: FR:Tag:landuse=pond
     landuse=quarry: FR:Tag:landuse=quarry
+    landuse=recreation_ground: FR:Tag:landuse=recreation ground
     landuse=religious: FR:Tag:landuse=religious
     landuse=residential: FR:Tag:landuse=residential
     landuse=retail: FR:Tag:landuse=retail
     landuse=salt_pond: FR:Tag:landuse=salt pond
     landuse=village_green: FR:Tag:landuse=village green
     landuse=religious: FR:Tag:landuse=religious
     landuse=residential: FR:Tag:landuse=residential
     landuse=retail: FR:Tag:landuse=retail
     landuse=salt_pond: FR:Tag:landuse=salt pond
     landuse=village_green: FR:Tag:landuse=village green
+    landuse=vineyard: FR:Tag:landuse=vineyard
     leaf_cycle=deciduous: FR:Tag:leaf cycle=deciduous
     leaf_cycle=deciduous: FR:Tag:leaf cycle=deciduous
+    leaf_type=needleleaved: FR:Tag:leaf type=needleleaved
     leisure=bandstand: FR:Tag:leisure=bandstand
     leisure=bird_hide: FR:Tag:leisure=bird hide
     leisure=bleachers: FR:Tag:leisure=bleachers
     leisure=bandstand: FR:Tag:leisure=bandstand
     leisure=bird_hide: FR:Tag:leisure=bird hide
     leisure=bleachers: FR:Tag:leisure=bleachers
@@ -13562,13 +19208,15 @@ fr:
     leisure=golf_course: FR:Tag:leisure=golf course
     leisure=hackerspace: FR:Tag:leisure=hackerspace
     leisure=horse_riding: FR:Tag:leisure=horse riding
     leisure=golf_course: FR:Tag:leisure=golf course
     leisure=hackerspace: FR:Tag:leisure=hackerspace
     leisure=horse_riding: FR:Tag:leisure=horse riding
-    leisure=miniature_golf: FR:Tag:leisure=miniature golf
+    leisure=ice_rink: FR:Tag:leisure=ice rink
+    leisure=outdoor_seating: FR:Tag:leisure=outdoor seating
     leisure=paddling_pool: FR:Tag:leisure=paddling pool
     leisure=park: FR:Tag:leisure=park
     leisure=picnic_table: FR:Tag:leisure=picnic table
     leisure=pitch: FR:Tag:leisure=pitch
     leisure=playground: FR:Tag:leisure=playground
     leisure=sauna: FR:Tag:leisure=sauna
     leisure=paddling_pool: FR:Tag:leisure=paddling pool
     leisure=park: FR:Tag:leisure=park
     leisure=picnic_table: FR:Tag:leisure=picnic table
     leisure=pitch: FR:Tag:leisure=pitch
     leisure=playground: FR:Tag:leisure=playground
     leisure=sauna: FR:Tag:leisure=sauna
+    leisure=schoolyard: FR:Tag:leisure=schoolyard
     leisure=slipway: FR:Tag:leisure=slipway
     leisure=sports_centre: FR:Tag:leisure=sports centre
     leisure=stadium: FR:Tag:leisure=stadium
     leisure=slipway: FR:Tag:leisure=slipway
     leisure=sports_centre: FR:Tag:leisure=sports centre
     leisure=stadium: FR:Tag:leisure=stadium
@@ -13577,20 +19225,38 @@ fr:
     leisure=tanning_salon: FR:Tag:leisure=tanning salon
     leisure=track: FR:Tag:leisure=track
     leisure=water_park: FR:Tag:leisure=water park
     leisure=tanning_salon: FR:Tag:leisure=tanning salon
     leisure=track: FR:Tag:leisure=track
     leisure=water_park: FR:Tag:leisure=water park
+    lifeguard=base: FR:Tag:lifeguard=base
+    lifeguard=tower: FR:Tag:lifeguard=tower
     line_attachment=anchor: FR:Tag:line attachment=anchor
     line_attachment=pin: FR:Tag:line attachment=pin
     line_attachment=pulley: FR:Tag:line attachment=pulley
     line_attachment=suspension: FR:Tag:line attachment=suspension
     line_management=branch: FR:Tag:line management=branch
     line_attachment=anchor: FR:Tag:line attachment=anchor
     line_attachment=pin: FR:Tag:line attachment=pin
     line_attachment=pulley: FR:Tag:line attachment=pulley
     line_attachment=suspension: FR:Tag:line attachment=suspension
     line_management=branch: FR:Tag:line management=branch
+    line_management=cross: FR:Tag:line management=cross
     line_management=split: FR:Tag:line management=split
     line_management=split: FR:Tag:line management=split
+    line_management=straight: FR:Tag:line management=straight
+    line_management=termination: FR:Tag:line management=termination
+    line_management=transition: FR:Tag:line management=transition
+    line_management=transpose: FR:Tag:line management=transpose
+    location=overground: FR:Tag:location=overground
+    location=underground: FR:Tag:location=underground
     man_made=adit: FR:Tag:man made=adit
     man_made=adit: FR:Tag:man made=adit
+    man_made=architecture_line: FR:Tag:man made=architecture line
     man_made=beehive: FR:Tag:man made=beehive
     man_made=bridge: FR:Tag:man made=bridge
     man_made=beehive: FR:Tag:man made=beehive
     man_made=bridge: FR:Tag:man made=bridge
+    man_made=bunker_silo: FR:Tag:man made=bunker silo
     man_made=carpet_hanger: FR:Tag:man made=carpet hanger
     man_made=carpet_hanger: FR:Tag:man made=carpet hanger
+    man_made=cellar_entrance: FR:Tag:man made=cellar entrance
+    man_made=chimney: FR:Tag:man made=chimney
+    man_made=cross: FR:Tag:man made=cross
     man_made=cutline: FR:Tag:man made=cutline
     man_made=dovecote: FR:Tag:man made=dovecote
     man_made=cutline: FR:Tag:man made=cutline
     man_made=dovecote: FR:Tag:man made=dovecote
+    man_made=embankment: FR:Tag:man made=embankment
     man_made=flagpole: FR:Tag:man made=flagpole
     man_made=flare: FR:Tag:man made=flare
     man_made=flagpole: FR:Tag:man made=flagpole
     man_made=flare: FR:Tag:man made=flare
+    man_made=gantry: FR:Tag:man made=gantry
+    man_made=goods_conveyor: FR:Tag:man made=goods conveyor
+    man_made=heap: FR:Tag:man made=heap
     man_made=ice_house: FR:Tag:man made=ice house
     man_made=insect_hotel: FR:Tag:man made=insect hotel
     man_made=kiln: FR:Tag:man made=kiln
     man_made=ice_house: FR:Tag:man made=ice house
     man_made=insect_hotel: FR:Tag:man made=insect hotel
     man_made=kiln: FR:Tag:man made=kiln
@@ -13598,16 +19264,23 @@ fr:
     man_made=mast: FR:Tag:man made=mast
     man_made=mineshaft: FR:Tag:man made=mineshaft
     man_made=monitoring_station: FR:Tag:man made=monitoring station
     man_made=mast: FR:Tag:man made=mast
     man_made=mineshaft: FR:Tag:man made=mineshaft
     man_made=monitoring_station: FR:Tag:man made=monitoring station
+    man_made=nesting_site: FR:Tag:man made=nesting site
+    man_made=outfall: FR:Tag:man made=outfall
     man_made=petroleum_well: FR:Tag:man made=petroleum well
     man_made=pier: FR:Tag:man made=pier
     man_made=planter: FR:Tag:man made=planter
     man_made=petroleum_well: FR:Tag:man made=petroleum well
     man_made=pier: FR:Tag:man made=pier
     man_made=planter: FR:Tag:man made=planter
+    man_made=pump: FR:Tag:man made=pump
     man_made=pumping_rig: FR:Tag:man made=pumping rig
     man_made=reservoir_covered: FR:Tag:man made=reservoir covered
     man_made=snow_cannon: FR:Tag:man made=snow cannon
     man_made=street_cabinet: FR:Tag:man made=street cabinet
     man_made=surveillance: FR:Tag:man made=surveillance
     man_made=survey_point: FR:Tag:man made=survey point
     man_made=pumping_rig: FR:Tag:man made=pumping rig
     man_made=reservoir_covered: FR:Tag:man made=reservoir covered
     man_made=snow_cannon: FR:Tag:man made=snow cannon
     man_made=street_cabinet: FR:Tag:man made=street cabinet
     man_made=surveillance: FR:Tag:man made=surveillance
     man_made=survey_point: FR:Tag:man made=survey point
+    man_made=torii: FR:Tag:man made=torii
     man_made=tower: FR:Tag:man made=tower
     man_made=tower: FR:Tag:man made=tower
+    man_made=utility_pole: FR:Tag:man made=utility pole
+    man_made=ventilation_shaft: FR:Tag:man made=ventilation shaft
+    man_made=video_wall: FR:Tag:man made=video wall
     man_made=wastewater_plant: FR:Tag:man made=wastewater plant
     man_made=water_tap: FR:Tag:man made=water tap
     man_made=water_tower: FR:Tag:man made=water tower
     man_made=wastewater_plant: FR:Tag:man made=wastewater plant
     man_made=water_tap: FR:Tag:man made=water tap
     man_made=water_tower: FR:Tag:man made=water tower
@@ -13617,20 +19290,28 @@ fr:
     man_made=wildlife_crossing: FR:Tag:man made=wildlife crossing
     man_made=windmill: FR:Tag:man made=windmill
     man_made=windpump: FR:Tag:man made=windpump
     man_made=wildlife_crossing: FR:Tag:man made=wildlife crossing
     man_made=windmill: FR:Tag:man made=windmill
     man_made=windpump: FR:Tag:man made=windpump
-    man_made_chimney: FR:Tag:man made chimney
     marker=aerial: FR:Tag:marker=aerial
     marker=ground: FR:Tag:marker=ground
     marker=pedestal: FR:Tag:marker=pedestal
     marker=plate: FR:Tag:marker=plate
     marker=post: FR:Tag:marker=post
     marker=stone: FR:Tag:marker=stone
     marker=aerial: FR:Tag:marker=aerial
     marker=ground: FR:Tag:marker=ground
     marker=pedestal: FR:Tag:marker=pedestal
     marker=plate: FR:Tag:marker=plate
     marker=post: FR:Tag:marker=post
     marker=stone: FR:Tag:marker=stone
+    material=concrete: FR:Tag:material=concrete
+    mechanical_driver=combustion_engine: FR:Tag:mechanical driver=combustion engine
+    mechanical_driver=manual: FR:Tag:mechanical driver=manual
+    mechanical_driver=reciprocating_solenoid: FR:Tag:mechanical driver=reciprocating
+      solenoid
     medical=aed: FR:Tag:medical=aed
     medical=aed: FR:Tag:medical=aed
+    megalith_type=menhir: FR:Tag:megalith type=menhir
     memorial=ghost_bike: FR:Tag:memorial=ghost bike
     memorial=plaque: FR:Tag:memorial=plaque
     memorial=ghost_bike: FR:Tag:memorial=ghost bike
     memorial=plaque: FR:Tag:memorial=plaque
+    memorial=war_memorial: FR:Tag:memorial=war memorial
     microbrewery=yes: FR:Tag:microbrewery=yes
     military=bunker: FR:Tag:military=bunker
     microbrewery=yes: FR:Tag:microbrewery=yes
     military=bunker: FR:Tag:military=bunker
+    natural=anthill: FR:Tag:natural=anthill
     natural=bare_rock: FR:Tag:natural=bare rock
     natural=beach: FR:Tag:natural=beach
     natural=bare_rock: FR:Tag:natural=bare rock
     natural=beach: FR:Tag:natural=beach
+    natural=blockfield: FR:Tag:natural=blockfield
     natural=cave_entrance: FR:Tag:natural=cave entrance
     natural=cliff: FR:Tag:natural=cliff
     natural=coastline: FR:Tag:natural=coastline
     natural=cave_entrance: FR:Tag:natural=cave entrance
     natural=cliff: FR:Tag:natural=cliff
     natural=coastline: FR:Tag:natural=coastline
@@ -13640,6 +19321,7 @@ fr:
     natural=isthmus: FR:Tag:natural=isthmus
     natural=peak: FR:Tag:natural=peak
     natural=peninsula: FR:Tag:natural=peninsula
     natural=isthmus: FR:Tag:natural=isthmus
     natural=peak: FR:Tag:natural=peak
     natural=peninsula: FR:Tag:natural=peninsula
+    natural=rock: FR:Tag:natural=rock
     natural=saddle: FR:Tag:natural=saddle
     natural=scree: FR:Tag:natural=scree
     natural=scrub: FR:Tag:natural=scrub
     natural=saddle: FR:Tag:natural=saddle
     natural=scree: FR:Tag:natural=scree
     natural=scrub: FR:Tag:natural=scrub
@@ -13649,10 +19331,16 @@ fr:
     natural=stone: FR:Tag:natural=stone
     natural=tree: FR:Tag:natural=tree
     natural=tree_row: FR:Tag:natural=tree row
     natural=stone: FR:Tag:natural=stone
     natural=tree: FR:Tag:natural=tree
     natural=tree_row: FR:Tag:natural=tree row
+    natural=tree_stump: FR:Tag:natural=tree stump
     natural=volcano: FR:Tag:natural=volcano
     natural=water: FR:Tag:natural=water
     natural=wetland: FR:Tag:natural=wetland
     natural=wood: FR:Tag:natural=wood
     natural=volcano: FR:Tag:natural=volcano
     natural=water: FR:Tag:natural=water
     natural=wetland: FR:Tag:natural=wetland
     natural=wood: FR:Tag:natural=wood
+    network:type=node_network: FR:Tag:network:type=node network
+    network=lcn: FR:Tag:network=lcn
+    noexit=yes: FR:Tag:noexit=yes
+    noname=no: FR:Tag:noname=no
+    noname=yes: FR:Tag:noname=yes
     office=advertising_agency: FR:Tag:office=advertising agency
     office=association: FR:Tag:office=association
     office=company: FR:Tag:office=company
     office=advertising_agency: FR:Tag:office=advertising agency
     office=association: FR:Tag:office=association
     office=company: FR:Tag:office=company
@@ -13667,29 +19355,75 @@ fr:
     office=logistics: FR:Tag:office=logistics
     office=newspaper: FR:Tag:office=newspaper
     office=ngo: FR:Tag:office=ngo
     office=logistics: FR:Tag:office=logistics
     office=newspaper: FR:Tag:office=newspaper
     office=ngo: FR:Tag:office=ngo
+    office=parish: FR:Tag:office=parish
+    office=personal_service: FR:Tag:office=personal service
     office=political_party: FR:Tag:office=political party
     office=political_party: FR:Tag:office=political party
+    office=publisher: FR:Tag:office=publisher
     office=religion: FR:Tag:office=religion
     office=religion: FR:Tag:office=religion
+    office=supervised_injection_site: FR:Tag:office=supervised injection site
+    office=surveyor: FR:Tag:office=surveyor
+    office=travel_agent: FR:Tag:office=travel agent
+    oneway=yes: FR:Tag:oneway=yes
+    opening_hours:signed=no: FR:Tag:opening hours:signed=no
+    operator=EDF: FR:Tag:operator=EDF
     operator=ERDF: FR:Tag:operator=ERDF
     operator=Enedis: FR:Tag:operator=Enedis
     operator=GRDF: FR:Tag:operator=GRDF
     operator=ERDF: FR:Tag:operator=ERDF
     operator=Enedis: FR:Tag:operator=Enedis
     operator=GRDF: FR:Tag:operator=GRDF
+    operator=GRTgaz: FR:Tag:operator=GRTgaz
+    operator=Orange: FR:Tag:operator=Orange
+    operator=RTE: FR:Tag:operator=RTE
+    operator=Régie_Gaz_Électricité_de_Sallanches: FR:Tag:operator=Régie Gaz Électricité
+      de Sallanches
+    operator=SNCF_Réseau: FR:Tag:operator=SNCF Réseau
+    outdoor_seating=terrace: FR:Tag:outdoor seating=terrace
+    outlet=bell_mouth: FR:Tag:outlet=bell mouth
+    outlet=direct: FR:Tag:outlet=direct
+    outlet=noise_barrier: FR:Tag:outlet=noise barrier
+    outlet=screen: FR:Tag:outlet=screen
+    outlet=sock: FR:Tag:outlet=sock
+    outlet=valve: FR:Tag:outlet=valve
     parking=street_side: FR:Tag:parking=street side
     parking=street_side: FR:Tag:parking=street side
+    parking=surface: FR:Tag:parking=surface
+    parking_space=disabled: FR:Tag:parking space=disabled
+    pipeline=substation: FR:Tag:pipeline=substation
+    pipeline=surge_tank: FR:Tag:pipeline=surge tank
     pipeline=valve: FR:Tag:pipeline=valve
     piste:type=nordic: FR:Tag:piste:type=nordic
     place=city: FR:Tag:place=city
     pipeline=valve: FR:Tag:pipeline=valve
     piste:type=nordic: FR:Tag:piste:type=nordic
     place=city: FR:Tag:place=city
+    place=country: FR:Tag:place=country
+    place=county: FR:Tag:place=county
+    place=district: FR:Tag:place=district
     place=hamlet: FR:Tag:place=hamlet
     place=island: FR:Tag:place=island
     place=isolated_dwelling: FR:Tag:place=isolated dwelling
     place=locality: FR:Tag:place=locality
     place=municipality: FR:Tag:place=municipality
     place=neighbourhood: FR:Tag:place=neighbourhood
     place=hamlet: FR:Tag:place=hamlet
     place=island: FR:Tag:place=island
     place=isolated_dwelling: FR:Tag:place=isolated dwelling
     place=locality: FR:Tag:place=locality
     place=municipality: FR:Tag:place=municipality
     place=neighbourhood: FR:Tag:place=neighbourhood
+    place=province: FR:Tag:place=province
+    place=region: FR:Tag:place=region
     place=square: FR:Tag:place=square
     place=square: FR:Tag:place=square
+    place=state: FR:Tag:place=state
     place=suburb: FR:Tag:place=suburb
     place=town: FR:Tag:place=town
     place=village: FR:Tag:place=village
     plant:source=nuclear: FR:Tag:plant:source=nuclear
     place=suburb: FR:Tag:place=suburb
     place=town: FR:Tag:place=town
     place=village: FR:Tag:place=village
     plant:source=nuclear: FR:Tag:plant:source=nuclear
+    police=academy: FR:Tag:police=academy
+    police=barracks: FR:Tag:police=barracks
+    police=car_pound: FR:Tag:police=car pound
+    police=checkpoint: FR:Tag:police=checkpoint
+    police=detention: FR:Tag:police=detention
+    police=naval_base: FR:Tag:police=naval base
+    police=offices: FR:Tag:police=offices
+    police=range: FR:Tag:police=range
+    police=storage: FR:Tag:police=storage
+    police=training_area: FR:Tag:police=training area
+    police=yes: FR:Tag:police=yes
+    post_office=post_partner: FR:Tag:post office=post partner
     power=cable: FR:Tag:power=cable
     power=cable: FR:Tag:power=cable
+    power=catenary_mast: FR:Tag:power=catenary mast
     power=circuit: FR:Tag:power=circuit
     power=compensator: FR:Tag:power=compensator
     power=circuit: FR:Tag:power=circuit
     power=compensator: FR:Tag:power=compensator
+    power=connection: FR:Tag:power=connection
     power=converter: FR:Tag:power=converter
     power=generator: FR:Tag:power=generator
     power=heliostat: FR:Tag:power=heliostat
     power=converter: FR:Tag:power=converter
     power=generator: FR:Tag:power=generator
     power=heliostat: FR:Tag:power=heliostat
@@ -13703,30 +19437,40 @@ fr:
     power=sub_station: FR:Tag:power=sub station
     power=substation: FR:Tag:power=substation
     power=switch: FR:Tag:power=switch
     power=sub_station: FR:Tag:power=sub station
     power=substation: FR:Tag:power=substation
     power=switch: FR:Tag:power=switch
+    power=switchgear: FR:Tag:power=switchgear
     power=terminal: FR:Tag:power=terminal
     power=tower: FR:Tag:power=tower
     power=transformer: FR:Tag:power=transformer
     public_transport=platform: FR:Tag:public transport=platform
     power=terminal: FR:Tag:power=terminal
     power=tower: FR:Tag:power=tower
     power=transformer: FR:Tag:power=transformer
     public_transport=platform: FR:Tag:public transport=platform
+    public_transport=platform_section: FR:Tag:public transport=platform section
     public_transport=station: FR:Tag:public transport=station
     public_transport=stop_area: FR:Tag:public transport=stop area
     public_transport=stop_position: FR:Tag:public transport=stop position
     pump=powered: FR:Tag:pump=powered
     public_transport=station: FR:Tag:public transport=station
     public_transport=stop_area: FR:Tag:public transport=stop area
     public_transport=stop_position: FR:Tag:public transport=stop position
     pump=powered: FR:Tag:pump=powered
+    railway=abandoned: FR:Tag:railway=abandoned
     railway=crossing: FR:Tag:railway=crossing
     railway=disused: FR:Tag:railway=disused
     railway=funicular: FR:Tag:railway=funicular
     railway=halt: FR:Tag:railway=halt
     railway=level_crossing: FR:Tag:railway=level crossing
     railway=crossing: FR:Tag:railway=crossing
     railway=disused: FR:Tag:railway=disused
     railway=funicular: FR:Tag:railway=funicular
     railway=halt: FR:Tag:railway=halt
     railway=level_crossing: FR:Tag:railway=level crossing
+    railway=milestone: FR:Tag:railway=milestone
     railway=miniature: FR:Tag:railway=miniature
     railway=narrow_gauge: FR:Tag:railway=narrow gauge
     railway=miniature: FR:Tag:railway=miniature
     railway=narrow_gauge: FR:Tag:railway=narrow gauge
+    railway=platform_marker: FR:Tag:railway=platform marker
+    railway=platform_section: FR:Tag:railway=platform section
     railway=preserved: FR:Tag:railway=preserved
     railway=rail: FR:Tag:railway=rail
     railway=preserved: FR:Tag:railway=preserved
     railway=rail: FR:Tag:railway=rail
+    railway=signal: FR:Tag:railway=signal
     railway=station: FR:Tag:railway=station
     railway=subway: FR:Tag:railway=subway
     railway=subway_entrance: FR:Tag:railway=subway entrance
     railway=switch: FR:Tag:railway=switch
     railway=tram: FR:Tag:railway=tram
     railway=tram_stop: FR:Tag:railway=tram stop
     railway=station: FR:Tag:railway=station
     railway=subway: FR:Tag:railway=subway
     railway=subway_entrance: FR:Tag:railway=subway entrance
     railway=switch: FR:Tag:railway=switch
     railway=tram: FR:Tag:railway=tram
     railway=tram_stop: FR:Tag:railway=tram stop
+    railway=wash: FR:Tag:railway=wash
     railway=water_crane: FR:Tag:railway=water crane
     railway=water_crane: FR:Tag:railway=water crane
+    recycling_type=centre: FR:Tag:recycling type=centre
+    recycling_type=container: FR:Tag:recycling type=container
     religion=buddhist: FR:Tag:religion=buddhist
     religion=christian: FR:Tag:religion=christian
     religion=hindu: FR:Tag:religion=hindu
     religion=buddhist: FR:Tag:religion=buddhist
     religion=christian: FR:Tag:religion=christian
     religion=hindu: FR:Tag:religion=hindu
@@ -13739,11 +19483,15 @@ fr:
     religion=taoist: FR:Tag:religion=taoist
     religion=zoroastrian: FR:Tag:religion=zoroastrian
     repair=assisted_self_service: FR:Tag:repair=assisted self service
     religion=taoist: FR:Tag:religion=taoist
     religion=zoroastrian: FR:Tag:religion=zoroastrian
     repair=assisted_self_service: FR:Tag:repair=assisted self service
+    request_stop=yes: FR:Tag:request stop=yes
+    residential=halting_site: FR:Tag:residential=halting site
     route=bicycle: FR:Tag:route=bicycle
     route=bus: FR:Tag:route=bus
     route=coach: FR:Tag:route=coach
     route=ferry: FR:Tag:route=ferry
     route=fitness_trail: FR:Tag:route=fitness trail
     route=bicycle: FR:Tag:route=bicycle
     route=bus: FR:Tag:route=bus
     route=coach: FR:Tag:route=coach
     route=ferry: FR:Tag:route=ferry
     route=fitness_trail: FR:Tag:route=fitness trail
+    route=foot: FR:Tag:route=foot
+    route=hiking: FR:Tag:route=hiking
     route=piste: FR:Tag:route=piste
     route=railway: FR:Tag:route=railway
     route=subway: FR:Tag:route=subway
     route=piste: FR:Tag:route=piste
     route=railway: FR:Tag:route=railway
     route=subway: FR:Tag:route=subway
@@ -13756,7 +19504,10 @@ fr:
     service=driveway: FR:Tag:service=driveway
     service=parking_aisle: FR:Tag:service=parking aisle
     shelter_type=basic_hut: FR:Tag:shelter type=basic hut
     service=driveway: FR:Tag:service=driveway
     service=parking_aisle: FR:Tag:service=parking aisle
     shelter_type=basic_hut: FR:Tag:shelter type=basic hut
+    shelter_type=changing_rooms: FR:Tag:shelter type=changing rooms
     shelter_type=lean_to: FR:Tag:shelter type=lean to
     shelter_type=lean_to: FR:Tag:shelter type=lean to
+    shelter_type=public_transport: FR:Tag:shelter type=public transport
+    shelter_type=shopping_cart: FR:Tag:shelter type=shopping cart
     shop=agrarian: FR:Tag:shop=agrarian
     shop=alcohol: FR:Tag:shop=alcohol
     shop=anime: FR:Tag:shop=anime
     shop=agrarian: FR:Tag:shop=agrarian
     shop=alcohol: FR:Tag:shop=alcohol
     shop=anime: FR:Tag:shop=anime
@@ -13783,13 +19534,13 @@ fr:
     shop=confectionery: FR:Tag:shop=confectionery
     shop=convenience: FR:Tag:shop=convenience
     shop=copyshop: FR:Tag:shop=copyshop
     shop=confectionery: FR:Tag:shop=confectionery
     shop=convenience: FR:Tag:shop=convenience
     shop=copyshop: FR:Tag:shop=copyshop
+    shop=cosmetics: FR:Tag:shop=cosmetics
     shop=deli: FR:Tag:shop=deli
     shop=department_store: FR:Tag:shop=department store
     shop=dive: FR:Tag:shop=dive
     shop=doityourself: FR:Tag:shop=doityourself
     shop=dry_cleaning: FR:Tag:shop=dry cleaning
     shop=e-cigarette: FR:Tag:shop=e-cigarette
     shop=deli: FR:Tag:shop=deli
     shop=department_store: FR:Tag:shop=department store
     shop=dive: FR:Tag:shop=dive
     shop=doityourself: FR:Tag:shop=doityourself
     shop=dry_cleaning: FR:Tag:shop=dry cleaning
     shop=e-cigarette: FR:Tag:shop=e-cigarette
-    shop=electronics: FR:Tag:shop=electronics
     shop=erotic: FR:Tag:shop=erotic
     shop=farm: FR:Tag:shop=farm
     shop=fashion: FR:Tag:shop=fashion
     shop=erotic: FR:Tag:shop=erotic
     shop=farm: FR:Tag:shop=farm
     shop=fashion: FR:Tag:shop=fashion
@@ -13800,7 +19551,9 @@ fr:
     shop=funeral_directors: FR:Tag:shop=funeral directors
     shop=furnace: FR:Tag:shop=furnace
     shop=furniture: FR:Tag:shop=furniture
     shop=funeral_directors: FR:Tag:shop=funeral directors
     shop=furnace: FR:Tag:shop=furnace
     shop=furniture: FR:Tag:shop=furniture
+    shop=games: FR:Tag:shop=games
     shop=garden_centre: FR:Tag:shop=garden centre
     shop=garden_centre: FR:Tag:shop=garden centre
+    shop=general: FR:Tag:shop=general
     shop=gift: FR:Tag:shop=gift
     shop=greengrocer: FR:Tag:shop=greengrocer
     shop=haberdashery: FR:Tag:shop=haberdashery
     shop=gift: FR:Tag:shop=gift
     shop=greengrocer: FR:Tag:shop=greengrocer
     shop=haberdashery: FR:Tag:shop=haberdashery
@@ -13814,10 +19567,13 @@ fr:
     shop=kiosk: FR:Tag:shop=kiosk
     shop=kitchen: FR:Tag:shop=kitchen
     shop=laundry: FR:Tag:shop=laundry
     shop=kiosk: FR:Tag:shop=kiosk
     shop=kitchen: FR:Tag:shop=kitchen
     shop=laundry: FR:Tag:shop=laundry
+    shop=mall: FR:Tag:shop=mall
+    shop=massage: FR:Tag:shop=massage
     shop=medical_supply: FR:Tag:shop=medical supply
     shop=military_surplus: FR:Tag:shop=military surplus
     shop=mobile_phone: FR:Tag:shop=mobile phone
     shop=motorcycle: FR:Tag:shop=motorcycle
     shop=medical_supply: FR:Tag:shop=medical supply
     shop=military_surplus: FR:Tag:shop=military surplus
     shop=mobile_phone: FR:Tag:shop=mobile phone
     shop=motorcycle: FR:Tag:shop=motorcycle
+    shop=music: FR:Tag:shop=music
     shop=newsagent: FR:Tag:shop=newsagent
     shop=optician: FR:Tag:shop=optician
     shop=outdoor: FR:Tag:shop=outdoor
     shop=newsagent: FR:Tag:shop=newsagent
     shop=optician: FR:Tag:shop=optician
     shop=outdoor: FR:Tag:shop=outdoor
@@ -13827,20 +19583,28 @@ fr:
     shop=pet_grooming: FR:Tag:shop=pet grooming
     shop=pharmacy: FR:Tag:shop=pharmacy
     shop=photo: FR:Tag:shop=photo
     shop=pet_grooming: FR:Tag:shop=pet grooming
     shop=pharmacy: FR:Tag:shop=pharmacy
     shop=photo: FR:Tag:shop=photo
+    shop=printing: FR:Tag:shop=printing
     shop=second_hand: FR:Tag:shop=second hand
     shop=sewing: FR:Tag:shop=sewing
     shop=shoes: FR:Tag:shop=shoes
     shop=stationery: FR:Tag:shop=stationery
     shop=second_hand: FR:Tag:shop=second hand
     shop=sewing: FR:Tag:shop=sewing
     shop=shoes: FR:Tag:shop=shoes
     shop=stationery: FR:Tag:shop=stationery
+    shop=storage_rental: FR:Tag:shop=storage rental
+    shop=street_vendor: FR:Tag:shop=street vendor
     shop=supermarket: FR:Tag:shop=supermarket
     shop=supermarket: FR:Tag:shop=supermarket
+    shop=tattoo: FR:Tag:shop=tattoo
     shop=ticket: FR:Tag:shop=ticket
     shop=ticket: FR:Tag:shop=ticket
+    shop=tobacco: FR:Tag:shop=tobacco
     shop=toys: FR:Tag:shop=toys
     shop=trade: FR:Tag:shop=trade
     shop=vacant: FR:Tag:shop=vacant
     shop=variety_store: FR:Tag:shop=variety store
     shop=video: FR:Tag:shop=video
     shop=video_games: FR:Tag:shop=video games
     shop=toys: FR:Tag:shop=toys
     shop=trade: FR:Tag:shop=trade
     shop=vacant: FR:Tag:shop=vacant
     shop=variety_store: FR:Tag:shop=variety store
     shop=video: FR:Tag:shop=video
     shop=video_games: FR:Tag:shop=video games
+    shop=weapons: FR:Tag:shop=weapons
+    shop=window_blind: FR:Tag:shop=window blind
     sinkhole=estavelle: FR:Tag:sinkhole=estavelle
     social_facility=ambulatory_care: FR:Tag:social facility=ambulatory care
     sinkhole=estavelle: FR:Tag:sinkhole=estavelle
     social_facility=ambulatory_care: FR:Tag:social facility=ambulatory care
+    sport=10pin: FR:Tag:sport=10pin
     sport=8pin: FR:Tag:sport=8pin
     sport=archery: FR:Tag:sport=archery
     sport=billiards: FR:Tag:sport=billiards
     sport=8pin: FR:Tag:sport=8pin
     sport=archery: FR:Tag:sport=archery
     sport=billiards: FR:Tag:sport=billiards
@@ -13854,6 +19618,8 @@ fr:
     sport=free_flying: FR:Tag:sport=free flying
     sport=hockey: FR:Tag:sport=hockey
     sport=horse_racing: FR:Tag:sport=horse racing
     sport=free_flying: FR:Tag:sport=free flying
     sport=hockey: FR:Tag:sport=hockey
     sport=horse_racing: FR:Tag:sport=horse racing
+    sport=motocross: FR:Tag:sport=motocross
+    sport=pelota: FR:Tag:sport=pelota
     sport=rugby_league: FR:Tag:sport=rugby league
     sport=rugby_union: FR:Tag:sport=rugby union
     sport=sailing: FR:Tag:sport=sailing
     sport=rugby_league: FR:Tag:sport=rugby league
     sport=rugby_union: FR:Tag:sport=rugby union
     sport=sailing: FR:Tag:sport=sailing
@@ -13863,7 +19629,14 @@ fr:
     sport=swimming: FR:Tag:sport=swimming
     sport=table_soccer: FR:Tag:sport=table soccer
     sport=table_tennis: FR:Tag:sport=table tennis
     sport=swimming: FR:Tag:sport=swimming
     sport=table_soccer: FR:Tag:sport=table soccer
     sport=table_tennis: FR:Tag:sport=table tennis
+    substation=converter: FR:Tag:substation=converter
+    substation=distribution: FR:Tag:substation=distribution
+    substation=generation: FR:Tag:substation=generation
+    substation=industrial: FR:Tag:substation=industrial
+    substation=minor_distribution: FR:Tag:substation=minor distribution
     substation=traction: FR:Tag:substation=traction
     substation=traction: FR:Tag:substation=traction
+    substation=transition: FR:Tag:substation=transition
+    substation=transmission: FR:Tag:substation=transmission
     switch=circuit_breaker: FR:Tag:switch=circuit breaker
     switch=disconnector: FR:Tag:switch=disconnector
     switch=earthing: FR:Tag:switch=earthing
     switch=circuit_breaker: FR:Tag:switch=circuit breaker
     switch=disconnector: FR:Tag:switch=disconnector
     switch=earthing: FR:Tag:switch=earthing
@@ -13900,15 +19673,32 @@ fr:
     tourism=viewpoint: FR:Tag:tourism=viewpoint
     tourism=wilderness_hut: FR:Tag:tourism=wilderness hut
     tourism=zoo: FR:Tag:tourism=zoo
     tourism=viewpoint: FR:Tag:tourism=viewpoint
     tourism=wilderness_hut: FR:Tag:tourism=wilderness hut
     tourism=zoo: FR:Tag:tourism=zoo
+    tower:construction=lattice: FR:Tag:tower:construction=lattice
     tower:type=bell_tower: FR:Tag:tower:type=bell tower
     tower:type=communication: FR:Tag:tower:type=communication
     tower:type=hose: FR:Tag:tower:type=hose
     tower:type=bell_tower: FR:Tag:tower:type=bell tower
     tower:type=communication: FR:Tag:tower:type=communication
     tower:type=hose: FR:Tag:tower:type=hose
+    traffic_calming=bump: FR:Tag:traffic calming=bump
+    traffic_calming=chicane: FR:Tag:traffic calming=chicane
+    traffic_calming=choked_island: FR:Tag:traffic calming=choked island
+    traffic_calming=choked_table: FR:Tag:traffic calming=choked table
+    traffic_calming=choker: FR:Tag:traffic calming=choker
+    traffic_calming=cushion: FR:Tag:traffic calming=cushion
+    traffic_calming=dip: FR:Tag:traffic calming=dip
+    traffic_calming=double_dip: FR:Tag:traffic calming=double dip
+    traffic_calming=dynamic_bump: FR:Tag:traffic calming=dynamic bump
+    traffic_calming=hump: FR:Tag:traffic calming=hump
+    traffic_calming=island: FR:Tag:traffic calming=island
+    traffic_calming=rumble_strip: FR:Tag:traffic calming=rumble strip
     traffic_calming=table: FR:Tag:traffic calming=table
     traffic_sign=city_limit: FR:Tag:traffic sign=city limit
     transformer=auxiliary: FR:Tag:transformer=auxiliary
     traffic_calming=table: FR:Tag:traffic calming=table
     traffic_sign=city_limit: FR:Tag:traffic sign=city limit
     transformer=auxiliary: FR:Tag:transformer=auxiliary
+    transformer=converter: FR:Tag:transformer=converter
     transformer=distribution: FR:Tag:transformer=distribution
     transformer=generator: FR:Tag:transformer=generator
     transformer=distribution: FR:Tag:transformer=distribution
     transformer=generator: FR:Tag:transformer=generator
+    transformer=main: FR:Tag:transformer=main
+    transformer=phase_angle_regulator: FR:Tag:transformer=phase angle regulator
     transformer=traction: FR:Tag:transformer=traction
     transformer=traction: FR:Tag:transformer=traction
+    tunnel=building_passage: FR:Tag:tunnel=building passage
     tunnel=culvert: FR:Tag:tunnel=culvert
     tunnel=flooded: FR:Tag:tunnel=flooded
     type=waterway: FR:Tag:type=waterway
     tunnel=culvert: FR:Tag:tunnel=culvert
     tunnel=flooded: FR:Tag:tunnel=flooded
     type=waterway: FR:Tag:type=waterway
@@ -13917,13 +19707,21 @@ fr:
     usage=penstock: FR:Tag:usage=penstock
     usage=spillway: FR:Tag:usage=spillway
     usage=tailrace: FR:Tag:usage=tailrace
     usage=penstock: FR:Tag:usage=penstock
     usage=spillway: FR:Tag:usage=spillway
     usage=tailrace: FR:Tag:usage=tailrace
+    usage=transmission: FR:Tag:usage=transmission
+    utility=chemical: FR:Tag:utility=chemical
+    utility=gas: FR:Tag:utility=gas
+    utility=heating: FR:Tag:utility=heating
+    utility=oil: FR:Tag:utility=oil
     utility=power: FR:Tag:utility=power
     utility=power: FR:Tag:utility=power
+    utility=sewerage: FR:Tag:utility=sewerage
     utility=street_lighting: FR:Tag:utility=street lighting
     utility=telecom: FR:Tag:utility=telecom
     utility=street_lighting: FR:Tag:utility=street lighting
     utility=telecom: FR:Tag:utility=telecom
+    utility=water: FR:Tag:utility=water
     valve=ball: FR:Tag:valve=ball
     valve=butterfly: FR:Tag:valve=butterfly
     valve=gate: FR:Tag:valve=gate
     valve=globe: FR:Tag:valve=globe
     valve=ball: FR:Tag:valve=ball
     valve=butterfly: FR:Tag:valve=butterfly
     valve=gate: FR:Tag:valve=gate
     valve=globe: FR:Tag:valve=globe
+    valve=hollow_jet: FR:Tag:valve=hollow jet
     valve=needle: FR:Tag:valve=needle
     valve=plug: FR:Tag:valve=plug
     vending=bread: FR:Tag:vending=bread
     valve=needle: FR:Tag:valve=needle
     valve=plug: FR:Tag:valve=plug
     vending=bread: FR:Tag:vending=bread
@@ -13944,11 +19742,15 @@ fr:
     vending=sweets: FR:Tag:vending=sweets
     vending=water: FR:Tag:vending=water
     wall=no: FR:Tag:wall=no
     vending=sweets: FR:Tag:vending=sweets
     vending=water: FR:Tag:vending=water
     wall=no: FR:Tag:wall=no
+    wall=noise_barrier: FR:Tag:wall=noise barrier
+    waste=cigarettes: FR:Tag:waste=cigarettes
     waste=dog_excrement: FR:Tag:waste=dog excrement
     water=pond: FR:Tag:water=pond
     water=reservoir: FR:Tag:water=reservoir
     waste=dog_excrement: FR:Tag:waste=dog excrement
     water=pond: FR:Tag:water=pond
     water=reservoir: FR:Tag:water=reservoir
+    water=river: FR:Tag:water=river
     waterway=boatyard: FR:Tag:waterway=boatyard
     waterway=canal: FR:Tag:waterway=canal
     waterway=boatyard: FR:Tag:waterway=boatyard
     waterway=canal: FR:Tag:waterway=canal
+    waterway=canoe_pass: FR:Tag:waterway=canoe pass
     waterway=dam: FR:Tag:waterway=dam
     waterway=ditch: FR:Tag:waterway=ditch
     waterway=dock: FR:Tag:waterway=dock
     waterway=dam: FR:Tag:waterway=dam
     waterway=ditch: FR:Tag:waterway=ditch
     waterway=dock: FR:Tag:waterway=dock
@@ -13959,11 +19761,107 @@ fr:
     waterway=river: FR:Tag:waterway=river
     waterway=riverbank: FR:Tag:waterway=riverbank
     waterway=stream: FR:Tag:waterway=stream
     waterway=river: FR:Tag:waterway=river
     waterway=riverbank: FR:Tag:waterway=riverbank
     waterway=stream: FR:Tag:waterway=stream
+    waterway=tidal_channel: FR:Tag:waterway=tidal channel
     waterway=waterfall: FR:Tag:waterway=waterfall
     waterway=weir: FR:Tag:waterway=weir
     waterway=waterfall: FR:Tag:waterway=waterfall
     waterway=weir: FR:Tag:waterway=weir
+    wetland=mangrove: FR:Tag:wetland=mangrove
     wetland=marsh: FR:Tag:wetland=marsh
     wetland=reedbed: FR:Tag:wetland=reedbed
     wetland=swamp: FR:Tag:wetland=swamp
     wetland=marsh: FR:Tag:wetland=marsh
     wetland=reedbed: FR:Tag:wetland=reedbed
     wetland=swamp: FR:Tag:wetland=swamp
+    zoo=aviary: FR:Tag:zoo=aviary
+    zoo=birds: FR:Tag:zoo=birds
+    zoo=butterfly: FR:Tag:zoo=butterfly
+    zoo=enclosure: FR:Tag:zoo=enclosure
+    zoo=falconry: FR:Tag:zoo=falconry
+    zoo=petting_zoo: FR:Tag:zoo=petting zoo
+    zoo=reptile: FR:Tag:zoo=reptile
+    zoo=safari_park: FR:Tag:zoo=safari park
+    zoo=wildlife_park: FR:Tag:zoo=wildlife park
+gcf:
+  key:
+    club: Gcf:Key:club
+    name: Gcf:Key:name
+    name:gcf: Gcf:Key:name:gcf
+    name:ht: Gcf:Key:name:ht
+  tag:
+    amenity=bench: Gcf:Tag:amenity=bench
+    amenity=binoculars: Gcf:Tag:amenity=binoculars
+    amenity=brothel: Gcf:Tag:amenity=brothel
+    amenity=clock: Gcf:Tag:amenity=clock
+    amenity=fuel: Gcf:Tag:amenity=fuel
+    amenity=ice_cream: Gcf:Tag:amenity=ice cream
+    amenity=lounger: Gcf:Tag:amenity=lounger
+    amenity=love_hotel: Gcf:Tag:amenity=love hotel
+    amenity=prison: Gcf:Tag:amenity=prison
+    amenity=smoking_area: Gcf:Tag:amenity=smoking area
+    amenity=telephone: Gcf:Tag:amenity=telephone
+    amenity=toilets: Gcf:Tag:amenity=toilets
+    amenity=waste_basket: Gcf:Tag:amenity=waste basket
+    craft=sawmill: Gcf:Tag:craft=sawmill
+    craft=tiler: Gcf:Tag:craft=tiler
+    cuisine=burger: Gcf:Tag:cuisine=burger
+    cuisine=chinese: Gcf:Tag:cuisine=chinese
+    cuisine=french: Gcf:Tag:cuisine=french
+    cuisine=indian: Gcf:Tag:cuisine=indian
+    cuisine=pizza: Gcf:Tag:cuisine=pizza
+    emergency=defibrillator: Gcf:Tag:emergency=defibrillator
+    emergency=siren: Gcf:Tag:emergency=siren
+    highway=primary: Gcf:Tag:highway=primary
+    highway=services: Gcf:Tag:highway=services
+    highway=street_lamp: Gcf:Tag:highway=street lamp
+    historic=aircraft: Gcf:Tag:historic=aircraft
+    historic=cannon: Gcf:Tag:historic=cannon
+    junction=yes: Gcf:Tag:junction=yes
+    landuse=cemetery: Gcf:Tag:landuse=cemetery
+    leisure=garden: Gcf:Tag:leisure=garden
+    leisure=water_park: Gcf:Tag:leisure=water park
+    man_made=water_tower: Gcf:Tag:man made=water tower
+    man_made=water_works: Gcf:Tag:man made=water works
+    man_made=watermill: Gcf:Tag:man made=watermill
+    man_made=windmill: Gcf:Tag:man made=windmill
+    natural=hill: Gcf:Tag:natural=hill
+    natural=shrub: Gcf:Tag:natural=shrub
+    natural=tree: Gcf:Tag:natural=tree
+    noname=yes: Gcf:Tag:noname=yes
+    place=hamlet: Gcf:Tag:place=hamlet
+    place=island: Gcf:Tag:place=island
+    place=islet: Gcf:Tag:place=islet
+    place=locality: Gcf:Tag:place=locality
+    power=tower: Gcf:Tag:power=tower
+    railway=abandoned: Gcf:Tag:railway=abandoned
+    railway=crossing: Gcf:Tag:railway=crossing
+    railway=level_crossing: Gcf:Tag:railway=level crossing
+    shop=bag: Gcf:Tag:shop=bag
+    shop=bicycle: Gcf:Tag:shop=bicycle
+    shop=cannabis: Gcf:Tag:shop=cannabis
+    shop=cheese: Gcf:Tag:shop=cheese
+    shop=chocolate: Gcf:Tag:shop=chocolate
+    shop=clothes: Gcf:Tag:shop=clothes
+    shop=convenience: Gcf:Tag:shop=convenience
+    shop=doityourself: Gcf:Tag:shop=doityourself
+    shop=doors: Gcf:Tag:shop=doors
+    shop=erotic: Gcf:Tag:shop=erotic
+    shop=florist: Gcf:Tag:shop=florist
+    shop=greengrocer: Gcf:Tag:shop=greengrocer
+    shop=honey: Gcf:Tag:shop=honey
+    shop=mall: Gcf:Tag:shop=mall
+    shop=mobile_phone: Gcf:Tag:shop=mobile phone
+    shop=optician: Gcf:Tag:shop=optician
+    shop=pest_control: Gcf:Tag:shop=pest control
+    shop=pet: Gcf:Tag:shop=pet
+    shop=supermarket: Gcf:Tag:shop=supermarket
+    shop=tea: Gcf:Tag:shop=tea
+    shop=tiles: Gcf:Tag:shop=tiles
+    shop=watches: Gcf:Tag:shop=watches
+    shop=water: Gcf:Tag:shop=water
+    sport=cycling: Gcf:Tag:sport=cycling
+    sport_feature=goal: Gcf:Tag:sport feature=goal
+    tourism=hotel: Gcf:Tag:tourism=hotel
+    traffic_sign=variable_message: Gcf:Tag:traffic sign=variable message
+    waterway=canal: Gcf:Tag:waterway=canal
+    waterway=drain: Gcf:Tag:waterway=drain
+    waterway=river: Gcf:Tag:waterway=river
+    waterway=stream: Gcf:Tag:waterway=stream
 gl:
   key:
     contact:facebook: Gl:Key:contact:facebook
 gl:
   key:
     contact:facebook: Gl:Key:contact:facebook
@@ -13990,6 +19888,8 @@ gl:
     emergency=emergency_ward_entrance: Gl:Tag:emergency=emergency ward entrance
     emergency=yes: Gl:Tag:emergency=yes
     leisure=outdoor_seating: Gl:Tag:leisure=outdoor seating
     emergency=emergency_ward_entrance: Gl:Tag:emergency=emergency ward entrance
     emergency=yes: Gl:Tag:emergency=yes
     leisure=outdoor_seating: Gl:Tag:leisure=outdoor seating
+    natural=bare_rock: Gl:Tag:natural=bare rock
+    natural=stone: Gl:Tag:natural=stone
     natural=tree_row: Gl:Tag:natural=tree row
     railway=tram: Gl:Tag:railway=tram
     shop=vacant: Gl:Tag:shop=vacant
     natural=tree_row: Gl:Tag:natural=tree row
     railway=tram: Gl:Tag:railway=tram
     shop=vacant: Gl:Tag:shop=vacant
@@ -14003,6 +19903,8 @@ he:
     fax: He:Key:fax
 hr:
   key:
     fax: He:Key:fax
 hr:
   key:
+    addr: Hr:Key:addr
+    addr:*: Hr:Key:addr:*
     amenity: Hr:Key:amenity
     historic: Hr:Key:historic
     leisure: Hr:Key:leisure
     amenity: Hr:Key:amenity
     historic: Hr:Key:historic
     leisure: Hr:Key:leisure
@@ -14016,6 +19918,7 @@ hr:
   tag:
     amenity=atm: Hr:Tag:amenity=atm
     amenity=bank: Hr:Tag:amenity=bank
   tag:
     amenity=atm: Hr:Tag:amenity=atm
     amenity=bank: Hr:Tag:amenity=bank
+    amenity=school: Hr:Tag:amenity=school
 ht:
   key:
     intermittent: Ht:Key:intermittent
 ht:
   key:
     intermittent: Ht:Key:intermittent
@@ -14038,6 +19941,7 @@ hu:
     height: Hu:Key:height
     highway: Hu:Key:highway
     incline: Hu:Key:incline
     height: Hu:Key:height
     highway: Hu:Key:highway
     incline: Hu:Key:incline
+    intermittent: Hu:Key:intermittent
     jel: Hu:Key:jel
     landuse: Hu:Key:landuse
     leisure: Hu:Key:leisure
     jel: Hu:Key:jel
     landuse: Hu:Key:landuse
     leisure: Hu:Key:leisure
@@ -14045,18 +19949,23 @@ hu:
     man_made: Hu:Key:man made
     maxspeed: Hu:Key:maxspeed
     minspeed: Hu:Key:minspeed
     man_made: Hu:Key:man made
     maxspeed: Hu:Key:maxspeed
     minspeed: Hu:Key:minspeed
+    name: Hu:Key:name
+    name:hu: Hu:Key:name:hu
     natural: Hu:Key:natural
     obstacle: Hu:Key:obstacle
     office: Hu:Key:office
     place: Hu:Key:place
     railway: Hu:Key:railway
     ref:HU:edid: Hu:Key:ref:HU:edid
     natural: Hu:Key:natural
     obstacle: Hu:Key:obstacle
     office: Hu:Key:office
     place: Hu:Key:place
     railway: Hu:Key:railway
     ref:HU:edid: Hu:Key:ref:HU:edid
+    ref:HU:om: Hu:Key:ref:HU:om
     shop: Hu:Key:shop
     shop: Hu:Key:shop
+    smoothness: Hu:Key:smoothness
     surface: Hu:Key:surface
     symbol: Hu:Key:symbol
     tourism: Hu:Key:tourism
     tracktype: Hu:Key:tracktype
     turn: Hu:Key:turn
     surface: Hu:Key:surface
     symbol: Hu:Key:symbol
     tourism: Hu:Key:tourism
     tracktype: Hu:Key:tracktype
     turn: Hu:Key:turn
+    water: Hu:Key:water
     waterway: Hu:Key:waterway
     wheelchair: Hu:Key:wheelchair
     width: Hu:Key:width
     waterway: Hu:Key:waterway
     wheelchair: Hu:Key:wheelchair
     width: Hu:Key:width
@@ -14064,23 +19973,38 @@ hu:
   tag:
     barrier=bollard: Hu:Tag:barrier=bollard
     boundary=administrative: Hu:Tag:boundary=administrative
   tag:
     barrier=bollard: Hu:Tag:barrier=bollard
     boundary=administrative: Hu:Tag:boundary=administrative
+    highway=service: Hu:Tag:highway=service
     highway=street_lamp: Hu:Tag:highway=street lamp
     highway=street_lamp: Hu:Tag:highway=street lamp
+    highway=track: Hu:Tag:highway=track
+    highway=traffic_signals: Hu:Tag:highway=traffic signals
+    highway=unclassified: Hu:Tag:highway=unclassified
     leaf_cycle=deciduous: Hu:Tag:leaf cycle=deciduous
     leaf_cycle=evergreen: Hu:Tag:leaf cycle=evergreen
     leaf_type=needleleaved: Hu:Tag:leaf type=needleleaved
     leaf_cycle=deciduous: Hu:Tag:leaf cycle=deciduous
     leaf_cycle=evergreen: Hu:Tag:leaf cycle=evergreen
     leaf_type=needleleaved: Hu:Tag:leaf type=needleleaved
+    leisure=swimming_pool: Hu:Tag:leisure=swimming pool
+    natural=spring: Hu:Tag:natural=spring
     natural=wallow: Hu:Tag:natural=wallow
     natural=wallow: Hu:Tag:natural=wallow
+    natural=water: Hu:Tag:natural=water
     railway=level_crossing: Hu:Tag:railway=level crossing
     railway=level_crossing: Hu:Tag:railway=level crossing
+    refitted=yes: Hu:Tag:refitted=yes
 id:
 id:
+  key:
+    boundary: Id:Key:boundary
+    place: Id:Key:place
   tag:
   tag:
+    guest_house=student_accomodation: Id:Tag:guest house=student accomodation
     highway=track: Id:Tag:highway=track
     place=square: Id:Tag:place=square
     shop=pawnbroker: Id:Tag:shop=pawnbroker
     highway=track: Id:Tag:highway=track
     place=square: Id:Tag:place=square
     shop=pawnbroker: Id:Tag:shop=pawnbroker
+    tourism=guest_house: Id:Tag:tourism=guest house
     waterway=tidal_channel: Id:Tag:waterway=tidal channel
 it:
   key:
     waterway=tidal_channel: Id:Tag:waterway=tidal channel
 it:
   key:
+    abandoned: IT:Key:abandoned
     abutters: IT:Key:abutters
     access: IT:Key:access
     addr: IT:Key:addr
     abutters: IT:Key:abutters
     access: IT:Key:access
     addr: IT:Key:addr
+    addr:*: IT:Key:addr:*
     addr:housenumber: IT:Key:addr:housenumber
     addr:postcode: IT:Key:addr:postcode
     addr:street: IT:Key:addr:street
     addr:housenumber: IT:Key:addr:housenumber
     addr:postcode: IT:Key:addr:postcode
     addr:street: IT:Key:addr:street
@@ -14092,6 +20016,8 @@ it:
     backrest: IT:Key:backrest
     barrier: IT:Key:barrier
     basin: IT:Key:basin
     backrest: IT:Key:backrest
     barrier: IT:Key:barrier
     basin: IT:Key:basin
+    beauty: IT:Key:beauty
+    bell_tower: IT:Key:bell tower
     bicycle: IT:Key:bicycle
     bicycle_parking: IT:Key:bicycle parking
     books: IT:Key:books
     bicycle: IT:Key:bicycle
     bicycle_parking: IT:Key:bicycle parking
     books: IT:Key:books
@@ -14103,17 +20029,26 @@ it:
     building:levels: IT:Key:building:levels
     cables: IT:Key:cables
     capacity: IT:Key:capacity
     building:levels: IT:Key:building:levels
     cables: IT:Key:cables
     capacity: IT:Key:capacity
+    castle_type: IT:Key:castle type
     circuits: IT:Key:circuits
     circuits: IT:Key:circuits
+    cocktails: IT:Key:cocktails
     communication:amateur_radio:callsign: IT:Key:communication:amateur radio:callsign
     communication:amateur_radio:repeater: IT:Key:communication:amateur radio:repeater
     communication:bos: IT:Key:communication:bos
     communication:mobile_phone: IT:Key:communication:mobile phone
     construction: IT:Key:construction
     communication:amateur_radio:callsign: IT:Key:communication:amateur radio:callsign
     communication:amateur_radio:repeater: IT:Key:communication:amateur radio:repeater
     communication:bos: IT:Key:communication:bos
     communication:mobile_phone: IT:Key:communication:mobile phone
     construction: IT:Key:construction
+    contact: IT:Key:contact
+    contact:*: IT:Key:contact:*
     contact:facebook: IT:Key:contact:facebook
     contact:facebook: IT:Key:contact:facebook
+    contact:twitter: IT:Key:contact:twitter
+    covered: IT:Key:covered
     craft: IT:Key:craft
     crossing: IT:Key:crossing
     craft: IT:Key:craft
     crossing: IT:Key:crossing
+    crossing:markings: IT:Key:crossing:markings
     cutting: IT:Key:cutting
     cutting: IT:Key:cutting
+    cyclestreet: IT:Key:cyclestreet
     cycleway: IT:Key:cycleway
     cycleway: IT:Key:cycleway
+    delivery: IT:Key:delivery
     denomination: IT:Key:denomination
     description: IT:Key:description
     destination: IT:Key:destination
     denomination: IT:Key:denomination
     description: IT:Key:description
     destination: IT:Key:destination
@@ -14121,18 +20056,26 @@ it:
     diet:*: IT:Key:diet:*
     diet:vegan: IT:Key:diet:vegan
     diet:vegetarian: IT:Key:diet:vegetarian
     diet:*: IT:Key:diet:*
     diet:vegan: IT:Key:diet:vegan
     diet:vegetarian: IT:Key:diet:vegetarian
+    direction: IT:Key:direction
     'disused:': 'IT:Key:disused:'
     'disused:': 'IT:Key:disused:'
+    disused:*: IT:Key:disused:*
     drink: IT:Key:drink
     drink: IT:Key:drink
+    drink:*: IT:Key:drink:*
     ele: IT:Key:ele
     embankment: IT:Key:embankment
     enforcement: IT:Key:enforcement
     ele: IT:Key:ele
     embankment: IT:Key:embankment
     enforcement: IT:Key:enforcement
+    est_width: IT:Key:est width
     fee: IT:Key:fee
     fence_type: IT:Key:fence type
     fee: IT:Key:fee
     fence_type: IT:Key:fence type
+    fireplace: IT:Key:fireplace
+    floating: IT:Key:floating
     ford: IT:Key:ford
     ford: IT:Key:ford
+    fruit: IT:Key:fruit
     fuel: IT:Key:fuel
     garden:type: IT:Key:garden:type
     generator:output: IT:Key:generator:output
     geological: IT:Key:geological
     fuel: IT:Key:fuel
     garden:type: IT:Key:garden:type
     generator:output: IT:Key:generator:output
     geological: IT:Key:geological
+    grassland: IT:Key:grassland
     guest_house: IT:Key:guest house
     height: IT:Key:height
     highway: IT:Key:highway
     guest_house: IT:Key:guest house
     height: IT:Key:height
     highway: IT:Key:highway
@@ -14143,19 +20086,27 @@ it:
     kerb: IT:Key:kerb
     landuse: IT:Key:landuse
     lanes:psv: IT:Key:lanes:psv
     kerb: IT:Key:kerb
     landuse: IT:Key:landuse
     lanes:psv: IT:Key:lanes:psv
+    layer: IT:Key:layer
     leisure: IT:Key:leisure
     leisure: IT:Key:leisure
+    length: IT:Key:length
+    lit: IT:Key:lit
+    lit_by_led: IT:Key:lit by led
     lock: IT:Key:lock
     man_made: IT:Key:man made
     manhole: IT:Key:manhole
     lock: IT:Key:lock
     man_made: IT:Key:man made
     manhole: IT:Key:manhole
+    manufacturer: IT:Key:manufacturer
     material: IT:Key:material
     maxaxleload: IT:Key:maxaxleload
     maxheight: IT:Key:maxheight
     maxlength: IT:Key:maxlength
     maxspeed: IT:Key:maxspeed
     material: IT:Key:material
     maxaxleload: IT:Key:maxaxleload
     maxheight: IT:Key:maxheight
     maxlength: IT:Key:maxlength
     maxspeed: IT:Key:maxspeed
+    maxstay: IT:Key:maxstay
     maxweight: IT:Key:maxweight
     maxwidth: IT:Key:maxwidth
     military: IT:Key:military
     maxweight: IT:Key:maxweight
     maxwidth: IT:Key:maxwidth
     military: IT:Key:military
+    mofa: IT:Key:mofa
     mooring: IT:Key:mooring
     mooring: IT:Key:mooring
+    motorcycle: IT:Key:motorcycle
     motorcycle:clothes: IT:Key:motorcycle:clothes
     motorcycle:parts: IT:Key:motorcycle:parts
     motorcycle:rental: IT:Key:motorcycle:rental
     motorcycle:clothes: IT:Key:motorcycle:clothes
     motorcycle:parts: IT:Key:motorcycle:parts
     motorcycle:rental: IT:Key:motorcycle:rental
@@ -14163,12 +20114,14 @@ it:
     motorcycle:sales: IT:Key:motorcycle:sales
     motorcycle:type: IT:Key:motorcycle:type
     motorcycle:tyres: IT:Key:motorcycle:tyres
     motorcycle:sales: IT:Key:motorcycle:sales
     motorcycle:type: IT:Key:motorcycle:type
     motorcycle:tyres: IT:Key:motorcycle:tyres
+    motorroad: IT:Key:motorroad
     mountain_pass: IT:Key:mountain pass
     mtb:scale: IT:Key:mtb:scale
     mtb:scale:imba: IT:Key:mtb:scale:imba
     name: IT:Key:name
     mountain_pass: IT:Key:mountain pass
     mtb:scale: IT:Key:mtb:scale
     mtb:scale:imba: IT:Key:mtb:scale:imba
     name: IT:Key:name
+    name:left: IT:Key:name:left
+    name:right: IT:Key:name:right
     natural: IT:Key:natural
     natural: IT:Key:natural
-    noexit: IT:Key:noexit
     nohousenumber: IT:Key:nohousenumber
     note: IT:Key:note
     office: IT:Key:office
     nohousenumber: IT:Key:nohousenumber
     note: IT:Key:note
     office: IT:Key:office
@@ -14177,6 +20130,7 @@ it:
     operator: IT:Key:operator
     organic: IT:Key:organic
     osmc:symbol: IT:Key:osmc:symbol
     operator: IT:Key:operator
     organic: IT:Key:organic
     osmc:symbol: IT:Key:osmc:symbol
+    oven: IT:Key:oven
     parking: IT:Key:parking
     parking:lane:both: IT:Key:parking:lane:both
     passing_places: IT:Key:passing places
     parking: IT:Key:parking
     parking:lane:both: IT:Key:parking:lane:both
     passing_places: IT:Key:passing places
@@ -14187,7 +20141,9 @@ it:
     proposed: IT:Key:proposed
     pump: IT:Key:pump
     railway: IT:Key:railway
     proposed: IT:Key:proposed
     pump: IT:Key:pump
     railway: IT:Key:railway
+    recycling_type: IT:Key:recycling type
     ref: IT:Key:ref
     ref: IT:Key:ref
+    ref:REI: IT:Key:ref:REI
     ref:catasto: IT:Key:ref:catasto
     ref:mise: IT:Key:ref:mise
     ref:msal: IT:Key:ref:msal
     ref:catasto: IT:Key:ref:catasto
     ref:mise: IT:Key:ref:mise
     ref:msal: IT:Key:ref:msal
@@ -14197,6 +20153,7 @@ it:
     roof:shape: IT:Key:roof:shape
     roundtrip: IT:Key:roundtrip
     route: IT:Key:route
     roof:shape: IT:Key:roof:shape
     roundtrip: IT:Key:roundtrip
     route: IT:Key:route
+    ruins:*: IT:Key:ruins:*
     sac_scale: IT:Key:sac scale
     second_hand: IT:Key:second hand
     service: IT:Key:service
     sac_scale: IT:Key:sac scale
     second_hand: IT:Key:second hand
     service: IT:Key:service
@@ -14208,12 +20165,18 @@ it:
     shop: IT:Key:shop
     sidewalk: IT:Key:sidewalk
     smoothness: IT:Key:smoothness
     shop: IT:Key:shop
     sidewalk: IT:Key:sidewalk
     smoothness: IT:Key:smoothness
+    social_facility:for: IT:Key:social facility:for
     sport: IT:Key:sport
     sport: IT:Key:sport
+    stamps: IT:Key:stamps
     stop: IT:Key:stop
     surface: IT:Key:surface
     surveillance: IT:Key:surveillance
     tank_trap: IT:Key:tank trap
     stop: IT:Key:stop
     surface: IT:Key:surface
     surveillance: IT:Key:surveillance
     tank_trap: IT:Key:tank trap
+    taxi: IT:Key:taxi
+    telecom: IT:Key:telecom
+    tobacco: IT:Key:tobacco
     tourism: IT:Key:tourism
     tourism: IT:Key:tourism
+    tower:type: IT:Key:tower:type
     tracktype: IT:Key:tracktype
     traffic_calming: IT:Key:traffic calming
     trail_visibility: IT:Key:trail visibility
     tracktype: IT:Key:tracktype
     traffic_calming: IT:Key:traffic calming
     trail_visibility: IT:Key:trail visibility
@@ -14229,6 +20192,7 @@ it:
     zone:maxspeed: IT:Key:zone:maxspeed
   tag:
     access=customers: IT:Tag:access=customers
     zone:maxspeed: IT:Key:zone:maxspeed
   tag:
     access=customers: IT:Tag:access=customers
+    aerialway=magic_carpet: IT:Tag:aerialway=magic carpet
     aeroway=aerodrome: IT:Tag:aeroway=aerodrome
     aeroway=airstrip: IT:Tag:aeroway=airstrip
     aeroway=apron: IT:Tag:aeroway=apron
     aeroway=aerodrome: IT:Tag:aeroway=aerodrome
     aeroway=airstrip: IT:Tag:aeroway=airstrip
     aeroway=apron: IT:Tag:aeroway=apron
@@ -14248,6 +20212,8 @@ it:
     amenity=animal_boarding: IT:Tag:amenity=animal boarding
     amenity=animal_breeding: IT:Tag:amenity=animal breeding
     amenity=animal_shelter: IT:Tag:amenity=animal shelter
     amenity=animal_boarding: IT:Tag:amenity=animal boarding
     amenity=animal_breeding: IT:Tag:amenity=animal breeding
     amenity=animal_shelter: IT:Tag:amenity=animal shelter
+    amenity=atm: IT:Tag:amenity=atm
+    amenity=baby_hatch: IT:Tag:amenity=baby hatch
     amenity=bank: IT:Tag:amenity=bank
     amenity=bar: IT:Tag:amenity=bar
     amenity=bbq: IT:Tag:amenity=bbq
     amenity=bank: IT:Tag:amenity=bank
     amenity=bar: IT:Tag:amenity=bar
     amenity=bbq: IT:Tag:amenity=bbq
@@ -14257,7 +20223,10 @@ it:
     amenity=cafe: IT:Tag:amenity=cafe
     amenity=cinema: IT:Tag:amenity=cinema
     amenity=college: IT:Tag:amenity=college
     amenity=cafe: IT:Tag:amenity=cafe
     amenity=cinema: IT:Tag:amenity=cinema
     amenity=college: IT:Tag:amenity=college
+    amenity=dancing_school: IT:Tag:amenity=dancing school
     amenity=dentist: IT:Tag:amenity=dentist
     amenity=dentist: IT:Tag:amenity=dentist
+    amenity=dive_centre: IT:Tag:amenity=dive centre
+    amenity=dog_parking: IT:Tag:amenity=dog parking
     amenity=driving_school: IT:Tag:amenity=driving school
     amenity=fast_food: IT:Tag:amenity=fast food
     amenity=fire_station: IT:Tag:amenity=fire station
     amenity=driving_school: IT:Tag:amenity=driving school
     amenity=fast_food: IT:Tag:amenity=fast food
     amenity=fire_station: IT:Tag:amenity=fire station
@@ -14267,8 +20236,13 @@ it:
     amenity=hunting_stand: IT:Tag:amenity=hunting stand
     amenity=ice_cream: IT:Tag:amenity=ice cream
     amenity=kindergarten: IT:Tag:amenity=kindergarten
     amenity=hunting_stand: IT:Tag:amenity=hunting stand
     amenity=ice_cream: IT:Tag:amenity=ice cream
     amenity=kindergarten: IT:Tag:amenity=kindergarten
+    amenity=lavoir: IT:Tag:amenity=lavoir
     amenity=milk_dispenser: IT:Tag:amenity=milk dispenser
     amenity=milk_dispenser: IT:Tag:amenity=milk dispenser
+    amenity=nightclub: IT:Tag:amenity=nightclub
+    amenity=parcel_locker: IT:Tag:amenity=parcel locker
     amenity=parking: IT:Tag:amenity=parking
     amenity=parking: IT:Tag:amenity=parking
+    amenity=payment_terminal: IT:Tag:amenity=payment terminal
+    amenity=pharmacy: IT:Tag:amenity=pharmacy
     amenity=photo_booth: IT:Tag:amenity=photo booth
     amenity=place_of_worship: IT:Tag:amenity=place of worship
     amenity=police: IT:Tag:amenity=police
     amenity=photo_booth: IT:Tag:amenity=photo booth
     amenity=place_of_worship: IT:Tag:amenity=place of worship
     amenity=police: IT:Tag:amenity=police
@@ -14278,10 +20252,13 @@ it:
     amenity=recycling: IT:Tag:amenity=recycling
     amenity=restaurant: IT:Tag:amenity=restaurant
     amenity=school: IT:Tag:amenity=school
     amenity=recycling: IT:Tag:amenity=recycling
     amenity=restaurant: IT:Tag:amenity=restaurant
     amenity=school: IT:Tag:amenity=school
+    amenity=ski_school: IT:Tag:amenity=ski school
     amenity=spa: IT:Tag:amenity=spa
     amenity=taxi: IT:Tag:amenity=taxi
     amenity=university: IT:Tag:amenity=university
     amenity=waste_basket: IT:Tag:amenity=waste basket
     amenity=spa: IT:Tag:amenity=spa
     amenity=taxi: IT:Tag:amenity=taxi
     amenity=university: IT:Tag:amenity=university
     amenity=waste_basket: IT:Tag:amenity=waste basket
+    amenity=watering_place: IT:Tag:amenity=watering place
+    amenity=weighbridge: IT:Tag:amenity=weighbridge
     barrier=block: IT:Tag:barrier=block
     barrier=bollard: IT:Tag:barrier=bollard
     barrier=border_control: IT:Tag:barrier=border control
     barrier=block: IT:Tag:barrier=block
     barrier=bollard: IT:Tag:barrier=bollard
     barrier=border_control: IT:Tag:barrier=border control
@@ -14315,6 +20292,7 @@ it:
     barrier=rope: IT:Tag:barrier=rope
     barrier=sally_port: IT:Tag:barrier=sally port
     barrier=spikes: IT:Tag:barrier=spikes
     barrier=rope: IT:Tag:barrier=rope
     barrier=sally_port: IT:Tag:barrier=sally port
     barrier=spikes: IT:Tag:barrier=spikes
+    barrier=step: IT:Tag:barrier=step
     barrier=stile: IT:Tag:barrier=stile
     barrier=sump_buster: IT:Tag:barrier=sump buster
     barrier=swing_gate: IT:Tag:barrier=swing gate
     barrier=stile: IT:Tag:barrier=stile
     barrier=sump_buster: IT:Tag:barrier=sump buster
     barrier=swing_gate: IT:Tag:barrier=swing gate
@@ -14322,10 +20300,18 @@ it:
     barrier=toll_booth: IT:Tag:barrier=toll booth
     barrier=turnstile: IT:Tag:barrier=turnstile
     barrier=wall: IT:Tag:barrier=wall
     barrier=toll_booth: IT:Tag:barrier=toll booth
     barrier=turnstile: IT:Tag:barrier=turnstile
     barrier=wall: IT:Tag:barrier=wall
+    barrier=yes: IT:Tag:barrier=yes
+    bicycle_road=yes: IT:Tag:bicycle road=yes
     bridge=boardwalk: IT:Tag:bridge=boardwalk
     bridge=boardwalk: IT:Tag:bridge=boardwalk
+    building=bridge: IT:Tag:building=bridge
+    building=hospital: IT:Tag:building=hospital
     building=residential: IT:Tag:building=residential
     building=retail: IT:Tag:building=retail
     building=residential: IT:Tag:building=residential
     building=retail: IT:Tag:building=retail
+    building=roof: IT:Tag:building=roof
+    building=ruins: IT:Tag:building=ruins
     building=train_station: IT:Tag:building=train station
     building=train_station: IT:Tag:building=train station
+    building=yes: IT:Tag:building=yes
+    castle_type=fortress: IT:Tag:castle type=fortress
     craft=agricultural_engines: IT:Tag:craft=agricultural engines
     craft=bakery: IT:Tag:craft=bakery
     craft=basket_maker: IT:Tag:craft=basket maker
     craft=agricultural_engines: IT:Tag:craft=agricultural engines
     craft=bakery: IT:Tag:craft=bakery
     craft=basket_maker: IT:Tag:craft=basket maker
@@ -14406,6 +20392,7 @@ it:
     esperanto=yes: IT:Tag:esperanto=yes
     footway=crossing: IT:Tag:footway=crossing
     footway=sidewalk: IT:Tag:footway=sidewalk
     esperanto=yes: IT:Tag:esperanto=yes
     footway=crossing: IT:Tag:footway=crossing
     footway=sidewalk: IT:Tag:footway=sidewalk
+    generator:source=nuclear: IT:Tag:generator:source=nuclear
     geological=moraine: IT:Tag:geological=moraine
     geological=outcrop: IT:Tag:geological=outcrop
     geological=palaeontological_site: IT:Tag:geological=palaeontological site
     geological=moraine: IT:Tag:geological=moraine
     geological=outcrop: IT:Tag:geological=outcrop
     geological=palaeontological_site: IT:Tag:geological=palaeontological site
@@ -14436,7 +20423,10 @@ it:
     highway=trunk: IT:Tag:highway=trunk
     highway=trunk_link: IT:Tag:highway=trunk link
     historic=archaeological_site: IT:Tag:historic=archaeological site
     highway=trunk: IT:Tag:highway=trunk
     highway=trunk_link: IT:Tag:highway=trunk link
     historic=archaeological_site: IT:Tag:historic=archaeological site
+    historic=castle: IT:Tag:historic=castle
+    historic=castle_wall: IT:Tag:historic=castle wall
     historic=locomotive: IT:Tag:historic=locomotive
     historic=locomotive: IT:Tag:historic=locomotive
+    historic=monument: IT:Tag:historic=monument
     historic=paleontological_site: IT:Tag:historic=paleontological site
     historic=wayside_shrine: IT:Tag:historic=wayside shrine
     industrial=auto_wrecker: IT:Tag:industrial=auto wrecker
     historic=paleontological_site: IT:Tag:historic=paleontological site
     historic=wayside_shrine: IT:Tag:historic=wayside shrine
     industrial=auto_wrecker: IT:Tag:industrial=auto wrecker
@@ -14444,9 +20434,11 @@ it:
     junction=roundabout: IT:Tag:junction=roundabout
     junction=yes: IT:Tag:junction=yes
     landuse=cemetery: IT:Tag:landuse=cemetery
     junction=roundabout: IT:Tag:junction=roundabout
     junction=yes: IT:Tag:junction=yes
     landuse=cemetery: IT:Tag:landuse=cemetery
+    landuse=civic_admin: IT:Tag:landuse=civic admin
     landuse=construction: IT:Tag:landuse=construction
     landuse=flowerbed: IT:Tag:landuse=flowerbed
     landuse=greenhouse_horticulture: IT:Tag:landuse=greenhouse horticulture
     landuse=construction: IT:Tag:landuse=construction
     landuse=flowerbed: IT:Tag:landuse=flowerbed
     landuse=greenhouse_horticulture: IT:Tag:landuse=greenhouse horticulture
+    landuse=residential: IT:Tag:landuse=residential
     landuse=retail: IT:Tag:landuse=retail
     landuse=salt_pond: IT:Tag:landuse=salt pond
     leisure=beach_resort: IT:Tag:leisure=beach resort
     landuse=retail: IT:Tag:landuse=retail
     landuse=salt_pond: IT:Tag:landuse=salt pond
     leisure=beach_resort: IT:Tag:leisure=beach resort
@@ -14454,23 +20446,31 @@ it:
     leisure=garden: IT:Tag:leisure=garden
     leisure=marina: IT:Tag:leisure=marina
     leisure=nature_reserve: IT:Tag:leisure=nature reserve
     leisure=garden: IT:Tag:leisure=garden
     leisure=marina: IT:Tag:leisure=marina
     leisure=nature_reserve: IT:Tag:leisure=nature reserve
+    leisure=park: IT:Tag:leisure=park
     leisure=playground: IT:Tag:leisure=playground
     leisure=swimming_pool: IT:Tag:leisure=swimming pool
     leisure=track: IT:Tag:leisure=track
     man_made=cairn: IT:Tag:man made=cairn
     leisure=playground: IT:Tag:leisure=playground
     leisure=swimming_pool: IT:Tag:leisure=swimming pool
     leisure=track: IT:Tag:leisure=track
     man_made=cairn: IT:Tag:man made=cairn
+    man_made=compass_rose: IT:Tag:man made=compass rose
+    man_made=courtyard: IT:Tag:man made=courtyard
+    man_made=flare: IT:Tag:man made=flare
     man_made=goods_conveyor: IT:Tag:man made=goods conveyor
     man_made=mast: IT:Tag:man made=mast
     man_made=works: IT:Tag:man made=works
     man_made=goods_conveyor: IT:Tag:man made=goods conveyor
     man_made=mast: IT:Tag:man made=mast
     man_made=works: IT:Tag:man made=works
+    meadow=pasture: IT:Tag:meadow=pasture
     memorial=stolperstein: IT:Tag:memorial=stolperstein
     natural=bare_rock: IT:Tag:natural=bare rock
     natural=cape: IT:Tag:natural=cape
     natural=grassland: IT:Tag:natural=grassland
     natural=palaeontological_site: IT:Tag:natural=palaeontological site
     natural=scree: IT:Tag:natural=scree
     memorial=stolperstein: IT:Tag:memorial=stolperstein
     natural=bare_rock: IT:Tag:natural=bare rock
     natural=cape: IT:Tag:natural=cape
     natural=grassland: IT:Tag:natural=grassland
     natural=palaeontological_site: IT:Tag:natural=palaeontological site
     natural=scree: IT:Tag:natural=scree
+    natural=shrub: IT:Tag:natural=shrub
     natural=spring: IT:Tag:natural=spring
     natural=tree_row: IT:Tag:natural=tree row
     natural=wetland: IT:Tag:natural=wetland
     natural=spring: IT:Tag:natural=spring
     natural=tree_row: IT:Tag:natural=tree row
     natural=wetland: IT:Tag:natural=wetland
+    noexit=yes: IT:Tag:noexit=yes
     office=foundation: IT:Tag:office=foundation
     office=foundation: IT:Tag:office=foundation
+    office=graphic_design: IT:Tag:office=graphic design
     office=it: IT:Tag:office=it
     oneway=alternating: IT:Tag:oneway=alternating
     parking=street_side: IT:Tag:parking=street side
     office=it: IT:Tag:office=it
     oneway=alternating: IT:Tag:oneway=alternating
     parking=street_side: IT:Tag:parking=street side
@@ -14502,9 +20502,11 @@ it:
     place=suburb: IT:Tag:place=suburb
     place=town: IT:Tag:place=town
     place=village: IT:Tag:place=village
     place=suburb: IT:Tag:place=suburb
     place=town: IT:Tag:place=town
     place=village: IT:Tag:place=village
+    plant:source=nuclear: IT:Tag:plant:source=nuclear
     power=cable: IT:Tag:power=cable
     power=cable_distribution_cabinet: IT:Tag:power=cable distribution cabinet
     power=generator: IT:Tag:power=generator
     power=cable: IT:Tag:power=cable
     power=cable_distribution_cabinet: IT:Tag:power=cable distribution cabinet
     power=generator: IT:Tag:power=generator
+    power=heliostat: IT:Tag:power=heliostat
     power=line: IT:Tag:power=line
     power=plant: IT:Tag:power=plant
     power=pole: IT:Tag:power=pole
     power=line: IT:Tag:power=line
     power=plant: IT:Tag:power=plant
     power=pole: IT:Tag:power=pole
@@ -14540,6 +20542,7 @@ it:
     shop=confectionery: IT:Tag:shop=confectionery
     shop=convenience: IT:Tag:shop=convenience
     shop=deli: IT:Tag:shop=deli
     shop=confectionery: IT:Tag:shop=confectionery
     shop=convenience: IT:Tag:shop=convenience
     shop=deli: IT:Tag:shop=deli
+    shop=dry_cleaning: IT:Tag:shop=dry cleaning
     shop=electrical: IT:Tag:shop=electrical
     shop=electronics: IT:Tag:shop=electronics
     shop=farm: IT:Tag:shop=farm
     shop=electrical: IT:Tag:shop=electrical
     shop=electronics: IT:Tag:shop=electronics
     shop=farm: IT:Tag:shop=farm
@@ -14555,15 +20558,18 @@ it:
     shop=newsagent: IT:Tag:shop=newsagent
     shop=pastry: IT:Tag:shop=pastry
     shop=pet_grooming: IT:Tag:shop=pet grooming
     shop=newsagent: IT:Tag:shop=newsagent
     shop=pastry: IT:Tag:shop=pastry
     shop=pet_grooming: IT:Tag:shop=pet grooming
+    shop=pottery: IT:Tag:shop=pottery
     shop=radiotechnics: IT:Tag:shop=radiotechnics
     shop=robot: IT:Tag:shop=robot
     shop=seafood: IT:Tag:shop=seafood
     shop=radiotechnics: IT:Tag:shop=radiotechnics
     shop=robot: IT:Tag:shop=robot
     shop=seafood: IT:Tag:shop=seafood
+    shop=shoes: IT:Tag:shop=shoes
     shop=souvenir: IT:Tag:shop=souvenir
     shop=supermarket: IT:Tag:shop=supermarket
     shop=tea: IT:Tag:shop=tea
     shop=tobacco: IT:Tag:shop=tobacco
     shop=tyres: IT:Tag:shop=tyres
     shop=wine: IT:Tag:shop=wine
     shop=souvenir: IT:Tag:shop=souvenir
     shop=supermarket: IT:Tag:shop=supermarket
     shop=tea: IT:Tag:shop=tea
     shop=tobacco: IT:Tag:shop=tobacco
     shop=tyres: IT:Tag:shop=tyres
     shop=wine: IT:Tag:shop=wine
+    shop=yes: IT:Tag:shop=yes
     sport=balle_pelote: IT:Tag:sport=balle pelote
     sport=climbing: IT:Tag:sport=climbing
     sport=hockey: IT:Tag:sport=hockey
     sport=balle_pelote: IT:Tag:sport=balle pelote
     sport=climbing: IT:Tag:sport=climbing
     sport=hockey: IT:Tag:sport=hockey
@@ -14571,11 +20577,16 @@ it:
     sport=roller_hockey: IT:Tag:sport=roller hockey
     sport=surfing: IT:Tag:sport=surfing
     summit:cross=yes: IT:Tag:summit:cross=yes
     sport=roller_hockey: IT:Tag:sport=roller hockey
     sport=surfing: IT:Tag:sport=surfing
     summit:cross=yes: IT:Tag:summit:cross=yes
+    telecom=data_center: IT:Tag:telecom=data center
+    telecom=exchange: IT:Tag:telecom=exchange
     tourism=aquarium: IT:Tag:tourism=aquarium
     tourism=artwork: IT:Tag:tourism=artwork
     tourism=museum: IT:Tag:tourism=museum
     tourism=aquarium: IT:Tag:tourism=aquarium
     tourism=artwork: IT:Tag:tourism=artwork
     tourism=museum: IT:Tag:tourism=museum
+    tourism=picnic_site: IT:Tag:tourism=picnic site
+    vending=parcel_pickup: IT:Tag:vending=parcel pickup
     vending=parking_tickets: IT:Tag:vending=parking tickets
     vending=toll: IT:Tag:vending=toll
     vending=parking_tickets: IT:Tag:vending=parking tickets
     vending=toll: IT:Tag:vending=toll
+    water=basin: IT:Tag:water=basin
     waterway=ditch: IT:Tag:waterway=ditch
     waterway=river: IT:Tag:waterway=river
     waterway=stream: IT:Tag:waterway=stream
     waterway=ditch: IT:Tag:waterway=ditch
     waterway=river: IT:Tag:waterway=river
     waterway=stream: IT:Tag:waterway=stream
@@ -14590,9 +20601,10 @@ ja:
     abandoned:amenity: JA:Key:abandoned:amenity
     abutters: JA:Key:abutters
     access: JA:Key:access
     abandoned:amenity: JA:Key:abandoned:amenity
     abutters: JA:Key:abutters
     access: JA:Key:access
-    access:bdouble: JA:Key:access:bdouble
     access:lanes: JA:Key:access:lanes
     addr: JA:Key:addr
     access:lanes: JA:Key:access:lanes
     addr: JA:Key:addr
+    addr:*: JA:Key:addr:*
+    addr:block_number: JA:Key:addr:block number
     addr:city: JA:Key:addr:city
     addr:country: JA:Key:addr:country
     addr:county: JA:Key:addr:county
     addr:city: JA:Key:addr:city
     addr:country: JA:Key:addr:country
     addr:county: JA:Key:addr:county
@@ -14610,7 +20622,6 @@ ja:
     addr:region: JA:Key:addr:region
     addr:state: JA:Key:addr:state
     addr:street: JA:Key:addr:street
     addr:region: JA:Key:addr:region
     addr:state: JA:Key:addr:state
     addr:street: JA:Key:addr:street
-    addr:street:name: JA:Key:addr:street:name
     addr:street:prefix: JA:Key:addr:street:prefix
     addr:street:type: JA:Key:addr:street:type
     addr:subdistrict: JA:Key:addr:subdistrict
     addr:street:prefix: JA:Key:addr:street:prefix
     addr:street:type: JA:Key:addr:street:type
     addr:subdistrict: JA:Key:addr:subdistrict
@@ -14626,6 +20637,8 @@ ja:
     alt_name: JA:Key:alt name
     amenity: JA:Key:amenity
     animated: JA:Key:animated
     alt_name: JA:Key:alt name
     amenity: JA:Key:amenity
     animated: JA:Key:animated
+    aquaculture: JA:Key:aquaculture
+    archaeological_site: JA:Key:archaeological site
     architect: JA:Key:architect
     area: JA:Key:area
     area:highway: JA:Key:area:highway
     architect: JA:Key:architect
     area: JA:Key:area
     area:highway: JA:Key:area:highway
@@ -14652,10 +20665,11 @@ ja:
     beds: JA:Key:beds
     bell_tower: JA:Key:bell tower
     bench: JA:Key:bench
     beds: JA:Key:beds
     bell_tower: JA:Key:bell tower
     bench: JA:Key:bench
+    bench:type: JA:Key:bench:type
     bicycle: JA:Key:bicycle
     bicycle_parking: JA:Key:bicycle parking
     bicycle: JA:Key:bicycle
     bicycle_parking: JA:Key:bicycle parking
-    bicycle_road: JA:Key:bicycle road
     bin: JA:Key:bin
     bin: JA:Key:bin
+    biotic_reef:type: JA:Key:biotic reef:type
     board_type: JA:Key:board type
     boat: JA:Key:boat
     bollard: JA:Key:bollard
     board_type: JA:Key:board type
     boat: JA:Key:boat
     bollard: JA:Key:bollard
@@ -14679,10 +20693,10 @@ ja:
     bridge:short_name: JA:Key:bridge:short name
     bridge:structure: JA:Key:bridge:structure
     bridge:support: JA:Key:bridge:support
     bridge:short_name: JA:Key:bridge:short name
     bridge:structure: JA:Key:bridge:structure
     bridge:support: JA:Key:bridge:support
-    bridge_name: JA:Key:bridge name
     building: JA:Key:building
     building:architecture: JA:Key:building:architecture
     building:colour: JA:Key:building:colour
     building: JA:Key:building
     building:architecture: JA:Key:building:architecture
     building:colour: JA:Key:building:colour
+    building:earthquake-resistant: JA:Key:building:earthquake-resistant
     building:fireproof: JA:Key:building:fireproof
     building:flats: JA:Key:building:flats
     building:levels: JA:Key:building:levels
     building:fireproof: JA:Key:building:fireproof
     building:flats: JA:Key:building:flats
     building:levels: JA:Key:building:levels
@@ -14691,6 +20705,7 @@ ja:
     building:min_level: JA:Key:building:min level
     building:part: JA:Key:building:part
     building:parts: JA:Key:building:parts
     building:min_level: JA:Key:building:min level
     building:part: JA:Key:building:part
     building:parts: JA:Key:building:parts
+    building:quake-resistant: JA:Key:building:quake-resistant
     building:units: JA:Key:building:units
     building:use: JA:Key:building:use
     bulk_purchase: JA:Key:bulk purchase
     building:units: JA:Key:building:units
     building:use: JA:Key:building:use
     bulk_purchase: JA:Key:bulk purchase
@@ -14704,8 +20719,11 @@ ja:
     camp_type: JA:Key:camp type
     capacity: JA:Key:capacity
     capacity:disabled: JA:Key:capacity:disabled
     camp_type: JA:Key:camp type
     capacity: JA:Key:capacity
     capacity:disabled: JA:Key:capacity:disabled
+    capacity:long: JA:Key:capacity:long
+    capacity:standard: JA:Key:capacity:standard
     capital: JA:Key:capital
     car_wash: JA:Key:car wash
     capital: JA:Key:capital
     car_wash: JA:Key:car wash
+    carpenter: JA:Key:carpenter
     carriage: JA:Key:carriage
     castle_type: JA:Key:castle type
     cave:name: JA:Key:cave:name
     carriage: JA:Key:carriage
     castle_type: JA:Key:castle type
     cave:name: JA:Key:cave:name
@@ -14722,12 +20740,14 @@ ja:
     comment: JA:Key:comment
     communication:mobile_phone: JA:Key:communication:mobile phone
     community_centre: JA:Key:community centre
     comment: JA:Key:comment
     communication:mobile_phone: JA:Key:communication:mobile phone
     community_centre: JA:Key:community centre
+    community_centre:for: JA:Key:community centre:for
     condition: JA:Key:condition
     conditional: JA:Key:conditional
     construction: JA:Key:construction
     construction:website: JA:Key:construction:website
     construction_end_expected: JA:Key:construction end expected
     contact: JA:Key:contact
     condition: JA:Key:condition
     conditional: JA:Key:conditional
     construction: JA:Key:construction
     construction:website: JA:Key:construction:website
     construction_end_expected: JA:Key:construction end expected
     contact: JA:Key:contact
+    contact:*: JA:Key:contact:*
     contact:email: JA:Key:contact:email
     contact:facebook: JA:Key:contact:facebook
     contact:fax: JA:Key:contact:fax
     contact:email: JA:Key:contact:email
     contact:facebook: JA:Key:contact:facebook
     contact:fax: JA:Key:contact:fax
@@ -14751,6 +20771,7 @@ ja:
     crossing:light: JA:Key:crossing:light
     crossing:on_demand: JA:Key:crossing:on demand
     crossing:saltire: JA:Key:crossing:saltire
     crossing:light: JA:Key:crossing:light
     crossing:on_demand: JA:Key:crossing:on demand
     crossing:saltire: JA:Key:crossing:saltire
+    crossing:signals: JA:Key:crossing:signals
     crossing_ref: JA:Key:crossing ref
     cuisine: JA:Key:cuisine
     currency: JA:Key:currency
     crossing_ref: JA:Key:crossing ref
     cuisine: JA:Key:cuisine
     currency: JA:Key:currency
@@ -14759,14 +20780,13 @@ ja:
     cutting: JA:Key:cutting
     cycle_network: JA:Key:cycle network
     cycleway: JA:Key:cycleway
     cutting: JA:Key:cutting
     cycle_network: JA:Key:cycle network
     cycleway: JA:Key:cycleway
+    cycleway:both: JA:Key:cycleway:both
     cycleway:left: JA:Key:cycleway:left
     cycleway:right: JA:Key:cycleway:right
     cycleway:left: JA:Key:cycleway:left
     cycleway:right: JA:Key:cycleway:right
-    cycleway=lane: JA:Key:cycleway=lane
-    cycleway=opposite_track: JA:Key:cycleway=opposite track
-    cycleway=track: JA:Key:cycleway=track
     date: JA:Key:date
     delivery: JA:Key:delivery
     'demolished:': 'JA:Key:demolished:'
     date: JA:Key:date
     delivery: JA:Key:delivery
     'demolished:': 'JA:Key:demolished:'
+    demolished:*: JA:Key:demolished:*
     denomination: JA:Key:denomination
     denotation: JA:Key:denotation
     departures_board: JA:Key:departures board
     denomination: JA:Key:denomination
     denotation: JA:Key:denotation
     departures_board: JA:Key:departures board
@@ -14778,7 +20798,6 @@ ja:
     destination:lanes: JA:Key:destination:lanes
     detour: JA:Key:detour
     diameter: JA:Key:diameter
     destination:lanes: JA:Key:destination:lanes
     detour: JA:Key:detour
     diameter: JA:Key:diameter
-    diaper: JA:Key:diaper
     diet: JA:Key:diet
     diet:*: JA:Key:diet:*
     direction: JA:Key:direction
     diet: JA:Key:diet
     diet:*: JA:Key:diet:*
     direction: JA:Key:direction
@@ -14787,6 +20806,8 @@ ja:
     distance: JA:Key:distance
     disused: JA:Key:disused
     'disused:': 'JA:Key:disused:'
     distance: JA:Key:distance
     disused: JA:Key:disused
     'disused:': 'JA:Key:disused:'
+    disused:*: JA:Key:disused:*
+    divider: JA:Key:divider
     dog: JA:Key:dog
     donation:compensation: JA:Key:donation:compensation
     door: JA:Key:door
     dog: JA:Key:dog
     donation:compensation: JA:Key:donation:compensation
     door: JA:Key:door
@@ -14803,11 +20824,14 @@ ja:
     email: JA:Key:email
     embankment: JA:Key:embankment
     emergency: JA:Key:emergency
     email: JA:Key:email
     embankment: JA:Key:embankment
     emergency: JA:Key:emergency
+    emergency:*: JA:Key:emergency:*
+    emergency:amenity: JA:Key:emergency:amenity
     end_date: JA:Key:end date
     enforcement: JA:Key:enforcement
     entrance: JA:Key:entrance
     est_width: JA:Key:est width
     evacuation_route: JA:Key:evacuation route
     end_date: JA:Key:end date
     enforcement: JA:Key:enforcement
     entrance: JA:Key:entrance
     est_width: JA:Key:est width
     evacuation_route: JA:Key:evacuation route
+    exhibit: JA:Key:exhibit
     exit: JA:Key:exit
     exit_to: JA:Key:exit to
     expressway: JA:Key:expressway
     exit: JA:Key:exit
     exit_to: JA:Key:exit to
     expressway: JA:Key:expressway
@@ -14823,6 +20847,9 @@ ja:
     ferry: JA:Key:ferry
     fire_boundary: JA:Key:fire boundary
     fire_hydrant: JA:Key:fire hydrant
     ferry: JA:Key:ferry
     fire_boundary: JA:Key:fire boundary
     fire_hydrant: JA:Key:fire hydrant
+    fire_mains: JA:Key:fire mains
+    fire_service_inlet: JA:Key:fire service inlet
+    fire_sprinkler: JA:Key:fire sprinkler
     fireplace: JA:Key:fireplace
     fishing: JA:Key:fishing
     fixme: JA:Key:fixme
     fireplace: JA:Key:fireplace
     fishing: JA:Key:fishing
     fixme: JA:Key:fixme
@@ -14847,6 +20874,7 @@ ja:
     fuel:octane_91: JA:Key:fuel:octane 91
     fuel:octane_98: JA:Key:fuel:octane 98
     furniture: JA:Key:furniture
     fuel:octane_91: JA:Key:fuel:octane 91
     fuel:octane_98: JA:Key:fuel:octane 98
     furniture: JA:Key:furniture
+    gambling: JA:Key:gambling
     garden:style: JA:Key:garden:style
     garden:type: JA:Key:garden:type
     gauge: JA:Key:gauge
     garden:style: JA:Key:garden:style
     garden:type: JA:Key:garden:type
     gauge: JA:Key:gauge
@@ -14870,6 +20898,7 @@ ja:
     golf: JA:Key:golf
     goods: JA:Key:goods
     government: JA:Key:government
     golf: JA:Key:golf
     goods: JA:Key:goods
     government: JA:Key:government
+    grape_variety: JA:Key:grape variety
     grassland: JA:Key:grassland
     group_only: JA:Key:group only
     guest_house: JA:Key:guest house
     grassland: JA:Key:grassland
     group_only: JA:Key:group only
     guest_house: JA:Key:guest house
@@ -14878,8 +20907,8 @@ ja:
     happy_hours: JA:Key:happy hours
     harbour: JA:Key:harbour
     harbour:category: JA:Key:harbour:category
     happy_hours: JA:Key:happy hours
     harbour: JA:Key:harbour
     harbour:category: JA:Key:harbour:category
+    hazard: JA:Key:hazard
     hazard_prone: JA:Key:hazard prone
     hazard_prone: JA:Key:hazard prone
-    hazard_type: JA:Key:hazard type
     hazmat: JA:Key:hazmat
     healthcare: JA:Key:healthcare
     healthcare:speciality: JA:Key:healthcare:speciality
     hazmat: JA:Key:hazmat
     healthcare: JA:Key:healthcare
     healthcare:speciality: JA:Key:healthcare:speciality
@@ -14898,6 +20927,7 @@ ja:
     hov: JA:Key:hov
     iata: JA:Key:iata
     icao: JA:Key:icao
     hov: JA:Key:hov
     iata: JA:Key:iata
     icao: JA:Key:icao
+    ice_cream: JA:Key:ice cream
     ice_road: JA:Key:ice road
     ignore_for_routing: JA:Key:ignore for routing
     image: JA:Key:image
     ice_road: JA:Key:ice road
     ignore_for_routing: JA:Key:ignore for routing
     image: JA:Key:image
@@ -14927,12 +20957,15 @@ ja:
     is_in:province: JA:Key:is in:province
     is_in:state: JA:Key:is in:state
     junction: JA:Key:junction
     is_in:province: JA:Key:is in:province
     is_in:state: JA:Key:is in:state
     junction: JA:Key:junction
+    junction:ref: JA:Key:junction:ref
+    karaoke: JA:Key:karaoke
     kerb: JA:Key:kerb
     kids_area: JA:Key:kids area
     ladder: JA:Key:ladder
     lamp_mount: JA:Key:lamp mount
     landmark: JA:Key:landmark
     landuse: JA:Key:landuse
     kerb: JA:Key:kerb
     kids_area: JA:Key:kids area
     ladder: JA:Key:ladder
     lamp_mount: JA:Key:lamp mount
     landmark: JA:Key:landmark
     landuse: JA:Key:landuse
+    lane_markings: JA:Key:lane markings
     lanes: JA:Key:lanes
     lanes:bus: JA:Key:lanes:bus
     lanes:psv: JA:Key:lanes:psv
     lanes: JA:Key:lanes
     lanes:bus: JA:Key:lanes:bus
     lanes:psv: JA:Key:lanes:psv
@@ -14948,6 +20981,7 @@ ja:
     length: JA:Key:length
     level: JA:Key:level
     lgbtq: JA:Key:lgbtq
     length: JA:Key:length
     level: JA:Key:level
     lgbtq: JA:Key:lgbtq
+    license_classes: JA:Key:license classes
     lit: JA:Key:lit
     living_street: JA:Key:living street
     loc_name: JA:Key:loc name
     lit: JA:Key:lit
     living_street: JA:Key:living street
     loc_name: JA:Key:loc name
@@ -14964,8 +20998,8 @@ ja:
     managed: JA:Key:managed
     manhole: JA:Key:manhole
     manufacturer: JA:Key:manufacturer
     managed: JA:Key:managed
     manhole: JA:Key:manhole
     manufacturer: JA:Key:manufacturer
-    manufacturer:type: JA:Key:manufacturer:type
     mapillary: JA:Key:mapillary
     mapillary: JA:Key:mapillary
+    marker: JA:Key:marker
     massage: JA:Key:massage
     material: JA:Key:material
     max_age: JA:Key:max age
     massage: JA:Key:massage
     material: JA:Key:material
     max_age: JA:Key:max age
@@ -14986,6 +21020,7 @@ ja:
     microbrewery: JA:Key:microbrewery
     milestone_type: JA:Key:milestone type
     military: JA:Key:military
     microbrewery: JA:Key:microbrewery
     milestone_type: JA:Key:milestone type
     military: JA:Key:military
+    military_service: JA:Key:military service
     min_age: JA:Key:min age
     min_height: JA:Key:min height
     minspeed: JA:Key:minspeed
     min_age: JA:Key:min age
     min_height: JA:Key:min height
     minspeed: JA:Key:minspeed
@@ -15029,8 +21064,8 @@ ja:
     ncn_ref: JA:Key:ncn ref
     network: JA:Key:network
     network:wikidata: JA:Key:network:wikidata
     ncn_ref: JA:Key:ncn ref
     network: JA:Key:network
     network:wikidata: JA:Key:network:wikidata
-    noexit: JA:Key:noexit
-    noname: JA:Key:noname
+    'no:': 'JA:Key:no:'
+    no:*: JA:Key:no:*
     noref: JA:Key:noref
     note: JA:Key:note
     note:ja: JA:Key:note:ja
     noref: JA:Key:noref
     note: JA:Key:note
     note:ja: JA:Key:note:ja
@@ -15060,13 +21095,15 @@ ja:
     outdoor_seating: JA:Key:outdoor seating
     overtaking: JA:Key:overtaking
     owner: JA:Key:owner
     outdoor_seating: JA:Key:outdoor seating
     overtaking: JA:Key:overtaking
     owner: JA:Key:owner
+    parcel_mail_in: JA:Key:parcel mail in
     park_ride: JA:Key:park ride
     parking: JA:Key:parking
     park_ride: JA:Key:park ride
     parking: JA:Key:parking
-    parking:condition: JA:Key:parking:condition
-    parking:lane: JA:Key:parking:lane
+    parking:capacity:long: JA:Key:parking:capacity:long
+    parking:capacity:standard: JA:Key:parking:capacity:standard
     passenger_information_display: JA:Key:passenger information display
     passing_places: JA:Key:passing places
     payment: JA:Key:payment
     passenger_information_display: JA:Key:passenger information display
     passing_places: JA:Key:passing places
     payment: JA:Key:payment
+    payment:*: JA:Key:payment:*
     payment:coins: JA:Key:payment:coins
     phone: JA:Key:phone
     pilgrimage: JA:Key:pilgrimage
     payment:coins: JA:Key:payment:coins
     phone: JA:Key:phone
     pilgrimage: JA:Key:pilgrimage
@@ -15081,10 +21118,10 @@ ja:
     post_box:type: JA:Key:post box:type
     postal_code: JA:Key:postal code
     power: JA:Key:power
     post_box:type: JA:Key:post box:type
     postal_code: JA:Key:postal code
     power: JA:Key:power
-    power_source: JA:Key:power source
     power_supply: JA:Key:power supply
     priority: JA:Key:priority
     priority_road: JA:Key:priority road
     power_supply: JA:Key:power supply
     priority: JA:Key:priority
     priority_road: JA:Key:priority road
+    private: JA:Key:private
     produce: JA:Key:produce
     product: JA:Key:product
     proposed: JA:Key:proposed
     produce: JA:Key:produce
     product: JA:Key:product
     proposed: JA:Key:proposed
@@ -15116,6 +21153,7 @@ ja:
     religion: JA:Key:religion
     removed: JA:Key:removed
     'removed:': 'JA:Key:removed:'
     religion: JA:Key:religion
     removed: JA:Key:removed
     'removed:': 'JA:Key:removed:'
+    removed:*: JA:Key:removed:*
     rental: JA:Key:rental
     repair: JA:Key:repair
     reservation: JA:Key:reservation
     rental: JA:Key:rental
     repair: JA:Key:repair
     reservation: JA:Key:reservation
@@ -15123,6 +21161,7 @@ ja:
     resource: JA:Key:resource
     right: JA:Key:right
     roadtrain: JA:Key:roadtrain
     resource: JA:Key:resource
     right: JA:Key:right
     roadtrain: JA:Key:roadtrain
+    roller_coaster: JA:Key:roller coaster
     roof:colour: JA:Key:roof:colour
     roof:material: JA:Key:roof:material
     room: JA:Key:room
     roof:colour: JA:Key:roof:colour
     roof:material: JA:Key:roof:material
     room: JA:Key:room
@@ -15135,6 +21174,7 @@ ja:
     sac_scale: JA:Key:sac scale
     salt: JA:Key:salt
     sauna: JA:Key:sauna
     sac_scale: JA:Key:sac scale
     salt: JA:Key:salt
     sauna: JA:Key:sauna
+    school: JA:Key:school
     seamark:fixme: JA:Key:seamark:fixme
     seamark:type: JA:Key:seamark:type
     seasonal: JA:Key:seasonal
     seamark:fixme: JA:Key:seamark:fixme
     seamark:type: JA:Key:seamark:type
     seasonal: JA:Key:seasonal
@@ -15187,8 +21227,10 @@ ja:
     step_count: JA:Key:step count
     stile: JA:Key:stile
     stone_type: JA:Key:stone type
     step_count: JA:Key:step count
     stile: JA:Key:stile
     stone_type: JA:Key:stone type
+    stop: JA:Key:stop
     stream: JA:Key:stream
     stroller: JA:Key:stroller
     stream: JA:Key:stream
     stroller: JA:Key:stroller
+    sub_sea: JA:Key:sub sea
     substance: JA:Key:substance
     subway: JA:Key:subway
     supervised: JA:Key:supervised
     substance: JA:Key:substance
     subway: JA:Key:subway
     supervised: JA:Key:supervised
@@ -15196,6 +21238,7 @@ ja:
     surface: JA:Key:surface
     surveillance: JA:Key:surveillance
     survey:date: JA:Key:survey:date
     surface: JA:Key:surface
     surveillance: JA:Key:surveillance
     survey:date: JA:Key:survey:date
+    survey_point:structure: JA:Key:survey point:structure
     swimming_pool: JA:Key:swimming pool
     tactile_paving: JA:Key:tactile paving
     tactile_writing: JA:Key:tactile writing
     swimming_pool: JA:Key:swimming pool
     tactile_paving: JA:Key:tactile paving
     tactile_writing: JA:Key:tactile writing
@@ -15203,9 +21246,11 @@ ja:
     tank: JA:Key:tank
     taxi: JA:Key:taxi
     taxon: JA:Key:taxon
     tank: JA:Key:tank
     taxi: JA:Key:taxi
     taxon: JA:Key:taxon
+    telecom: JA:Key:telecom
     tenant: JA:Key:tenant
     tents: JA:Key:tents
     theatre:type: JA:Key:theatre:type
     tenant: JA:Key:tenant
     tents: JA:Key:tents
     theatre:type: JA:Key:theatre:type
+    theme: JA:Key:theme
     tickets:public_transport: JA:Key:tickets:public transport
     tickets:public_transport_subscription: JA:Key:tickets:public transport subscription
     tidal: JA:Key:tidal
     tickets:public_transport: JA:Key:tickets:public transport
     tickets:public_transport_subscription: JA:Key:tickets:public transport subscription
     tidal: JA:Key:tidal
@@ -15232,6 +21277,7 @@ ja:
     traffic_signals:vibration: JA:Key:traffic signals:vibration
     trail_visibility: JA:Key:trail visibility
     train: JA:Key:train
     traffic_signals:vibration: JA:Key:traffic signals:vibration
     trail_visibility: JA:Key:trail visibility
     train: JA:Key:train
+    training: JA:Key:training
     tram: JA:Key:tram
     trees: JA:Key:trees
     trolley_wire: JA:Key:trolley wire
     tram: JA:Key:tram
     trees: JA:Key:trees
     trolley_wire: JA:Key:trolley wire
@@ -15245,6 +21291,7 @@ ja:
     unsigned_ref: JA:Key:unsigned ref
     url: JA:Key:url
     usage: JA:Key:usage
     unsigned_ref: JA:Key:unsigned ref
     url: JA:Key:url
     usage: JA:Key:usage
+    utility: JA:Key:utility
     vehicle: JA:Key:vehicle
     viewpoint: JA:Key:viewpoint
     visibility: JA:Key:visibility
     vehicle: JA:Key:vehicle
     viewpoint: JA:Key:viewpoint
     visibility: JA:Key:visibility
@@ -15257,6 +21304,7 @@ ja:
     water_source: JA:Key:water source
     waterway: JA:Key:waterway
     website: JA:Key:website
     water_source: JA:Key:water source
     waterway: JA:Key:waterway
     website: JA:Key:website
+    website:*: JA:Key:website:*
     wetland: JA:Key:wetland
     wheelchair: JA:Key:wheelchair
     wholesale: JA:Key:wholesale
     wetland: JA:Key:wetland
     wheelchair: JA:Key:wheelchair
     wholesale: JA:Key:wholesale
@@ -15275,6 +21323,7 @@ ja:
     yh:TYPE: JA:Key:yh:TYPE
     yh:WIDTH: JA:Key:yh:WIDTH
     yh:WIDTH_RANK: JA:Key:yh:WIDTH RANK
     yh:TYPE: JA:Key:yh:TYPE
     yh:WIDTH: JA:Key:yh:WIDTH
     yh:WIDTH_RANK: JA:Key:yh:WIDTH RANK
+    zone:maxspeed: JA:Key:zone:maxspeed
     zone:traffic: JA:Key:zone:traffic
     zoo: JA:Key:zoo
   tag:
     zone:traffic: JA:Key:zone:traffic
     zoo: JA:Key:zoo
   tag:
@@ -15288,6 +21337,8 @@ ja:
     access=license: JA:Tag:access=license
     access=no: JA:Tag:access=no
     access=official: JA:Tag:access=official
     access=license: JA:Tag:access=license
     access=no: JA:Tag:access=no
     access=official: JA:Tag:access=official
+    access=permissive: JA:Tag:access=permissive
+    access=permit: JA:Tag:access=permit
     access=private: JA:Tag:access=private
     access=unknown: JA:Tag:access=unknown
     admin_level=10: JA:Tag:admin level=10
     access=private: JA:Tag:access=private
     access=unknown: JA:Tag:access=unknown
     admin_level=10: JA:Tag:admin level=10
@@ -15327,10 +21378,12 @@ ja:
     aerialway=zip_line: JA:Tag:aerialway=zip line
     aeroway=aerodrome: JA:Tag:aeroway=aerodrome
     aeroway=apron: JA:Tag:aeroway=apron
     aerialway=zip_line: JA:Tag:aerialway=zip line
     aeroway=aerodrome: JA:Tag:aeroway=aerodrome
     aeroway=apron: JA:Tag:aeroway=apron
+    aeroway=fuel: JA:Tag:aeroway=fuel
     aeroway=gate: JA:Tag:aeroway=gate
     aeroway=hangar: JA:Tag:aeroway=hangar
     aeroway=helipad: JA:Tag:aeroway=helipad
     aeroway=heliport: JA:Tag:aeroway=heliport
     aeroway=gate: JA:Tag:aeroway=gate
     aeroway=hangar: JA:Tag:aeroway=hangar
     aeroway=helipad: JA:Tag:aeroway=helipad
     aeroway=heliport: JA:Tag:aeroway=heliport
+    aeroway=holding_position: JA:Tag:aeroway=holding position
     aeroway=parking_position: JA:Tag:aeroway=parking position
     aeroway=runway: JA:Tag:aeroway=runway
     aeroway=taxiway: JA:Tag:aeroway=taxiway
     aeroway=parking_position: JA:Tag:aeroway=parking position
     aeroway=runway: JA:Tag:aeroway=runway
     aeroway=taxiway: JA:Tag:aeroway=taxiway
@@ -15341,10 +21394,12 @@ ja:
     amenity=animal_boarding: JA:Tag:amenity=animal boarding
     amenity=animal_breeding: JA:Tag:amenity=animal breeding
     amenity=animal_shelter: JA:Tag:amenity=animal shelter
     amenity=animal_boarding: JA:Tag:amenity=animal boarding
     amenity=animal_breeding: JA:Tag:amenity=animal breeding
     amenity=animal_shelter: JA:Tag:amenity=animal shelter
+    amenity=animal_training: JA:Tag:amenity=animal training
     amenity=archive: JA:Tag:amenity=archive
     amenity=arts_centre: JA:Tag:amenity=arts centre
     amenity=atm: JA:Tag:amenity=atm
     amenity=baby_hatch: JA:Tag:amenity=baby hatch
     amenity=archive: JA:Tag:amenity=archive
     amenity=arts_centre: JA:Tag:amenity=arts centre
     amenity=atm: JA:Tag:amenity=atm
     amenity=baby_hatch: JA:Tag:amenity=baby hatch
+    amenity=baking_oven: JA:Tag:amenity=baking oven
     amenity=bank: JA:Tag:amenity=bank
     amenity=bar: JA:Tag:amenity=bar
     amenity=bbq: JA:Tag:amenity=bbq
     amenity=bank: JA:Tag:amenity=bank
     amenity=bar: JA:Tag:amenity=bar
     amenity=bbq: JA:Tag:amenity=bbq
@@ -15353,6 +21408,7 @@ ja:
     amenity=bicycle_rental: JA:Tag:amenity=bicycle rental
     amenity=bicycle_repair_station: JA:Tag:amenity=bicycle repair station
     amenity=biergarten: JA:Tag:amenity=biergarten
     amenity=bicycle_rental: JA:Tag:amenity=bicycle rental
     amenity=bicycle_repair_station: JA:Tag:amenity=bicycle repair station
     amenity=biergarten: JA:Tag:amenity=biergarten
+    amenity=binoculars: JA:Tag:amenity=binoculars
     amenity=boat_sharing: JA:Tag:amenity=boat sharing
     amenity=boat_storage: JA:Tag:amenity=boat storage
     amenity=brothel: JA:Tag:amenity=brothel
     amenity=boat_sharing: JA:Tag:amenity=boat sharing
     amenity=boat_storage: JA:Tag:amenity=boat storage
     amenity=brothel: JA:Tag:amenity=brothel
@@ -15370,63 +21426,86 @@ ja:
     amenity=clinic: JA:Tag:amenity=clinic
     amenity=clock: JA:Tag:amenity=clock
     amenity=college: JA:Tag:amenity=college
     amenity=clinic: JA:Tag:amenity=clinic
     amenity=clock: JA:Tag:amenity=clock
     amenity=college: JA:Tag:amenity=college
+    amenity=community_center: JA:Tag:amenity=community center
     amenity=community_centre: JA:Tag:amenity=community centre
     amenity=compressed_air: JA:Tag:amenity=compressed air
     amenity=community_centre: JA:Tag:amenity=community centre
     amenity=compressed_air: JA:Tag:amenity=compressed air
+    amenity=conference_centre: JA:Tag:amenity=conference centre
+    amenity=consulate: JA:Tag:amenity=consulate
     amenity=courthouse: JA:Tag:amenity=courthouse
     amenity=coworking_space: JA:Tag:amenity=coworking space
     amenity=crematorium: JA:Tag:amenity=crematorium
     amenity=crypt: JA:Tag:amenity=crypt
     amenity=courthouse: JA:Tag:amenity=courthouse
     amenity=coworking_space: JA:Tag:amenity=coworking space
     amenity=crematorium: JA:Tag:amenity=crematorium
     amenity=crypt: JA:Tag:amenity=crypt
+    amenity=customs: JA:Tag:amenity=customs
     amenity=dentist: JA:Tag:amenity=dentist
     amenity=dentist: JA:Tag:amenity=dentist
+    amenity=device_charging_station: JA:Tag:amenity=device charging station
     amenity=doctor: JA:Tag:amenity=doctor
     amenity=doctors: JA:Tag:amenity=doctors
     amenity=dojo: JA:Tag:amenity=dojo
     amenity=doctor: JA:Tag:amenity=doctor
     amenity=doctors: JA:Tag:amenity=doctors
     amenity=dojo: JA:Tag:amenity=dojo
+    amenity=dressing_room: JA:Tag:amenity=dressing room
     amenity=drinking_water: JA:Tag:amenity=drinking water
     amenity=drinking_water: JA:Tag:amenity=drinking water
+    amenity=driver_training: JA:Tag:amenity=driver training
     amenity=driving_school: JA:Tag:amenity=driving school
     amenity=embassy: JA:Tag:amenity=embassy
     amenity=emergency_phone: JA:Tag:amenity=emergency phone
     amenity=driving_school: JA:Tag:amenity=driving school
     amenity=embassy: JA:Tag:amenity=embassy
     amenity=emergency_phone: JA:Tag:amenity=emergency phone
+    amenity=emergency_service: JA:Tag:amenity=emergency service
     amenity=events_venue: JA:Tag:amenity=events venue
     amenity=events_venue: JA:Tag:amenity=events venue
+    amenity=exhibition_centre: JA:Tag:amenity=exhibition centre
     amenity=fast_food: JA:Tag:amenity=fast food
     amenity=fast_food: JA:Tag:amenity=fast food
+    amenity=feeding_place: JA:Tag:amenity=feeding place
     amenity=ferry_terminal: JA:Tag:amenity=ferry terminal
     amenity=financial_advice: JA:Tag:amenity=financial advice
     amenity=fire_station: JA:Tag:amenity=fire station
     amenity=food_court: JA:Tag:amenity=food court
     amenity=fountain: JA:Tag:amenity=fountain
     amenity=fuel: JA:Tag:amenity=fuel
     amenity=ferry_terminal: JA:Tag:amenity=ferry terminal
     amenity=financial_advice: JA:Tag:amenity=financial advice
     amenity=fire_station: JA:Tag:amenity=fire station
     amenity=food_court: JA:Tag:amenity=food court
     amenity=fountain: JA:Tag:amenity=fountain
     amenity=fuel: JA:Tag:amenity=fuel
+    amenity=funeral_hall: JA:Tag:amenity=funeral hall
     amenity=gambling: JA:Tag:amenity=gambling
     amenity=game_feeding: JA:Tag:amenity=game feeding
     amenity=grave_yard: JA:Tag:amenity=grave yard
     amenity=grit_bin: JA:Tag:amenity=grit bin
     amenity=gambling: JA:Tag:amenity=gambling
     amenity=game_feeding: JA:Tag:amenity=game feeding
     amenity=grave_yard: JA:Tag:amenity=grave yard
     amenity=grit_bin: JA:Tag:amenity=grit bin
+    amenity=hookah_lounge: JA:Tag:amenity=hookah lounge
     amenity=hospital: JA:Tag:amenity=hospital
     amenity=hunting_stand: JA:Tag:amenity=hunting stand
     amenity=ice_cream: JA:Tag:amenity=ice cream
     amenity=internet_cafe: JA:Tag:amenity=internet cafe
     amenity=hospital: JA:Tag:amenity=hospital
     amenity=hunting_stand: JA:Tag:amenity=hunting stand
     amenity=ice_cream: JA:Tag:amenity=ice cream
     amenity=internet_cafe: JA:Tag:amenity=internet cafe
+    amenity=juice_bar: JA:Tag:amenity=juice bar
     amenity=karaoke_box: JA:Tag:amenity=karaoke box
     amenity=kindergarten: JA:Tag:amenity=kindergarten
     amenity=karaoke_box: JA:Tag:amenity=karaoke box
     amenity=kindergarten: JA:Tag:amenity=kindergarten
+    amenity=kiosk: JA:Tag:amenity=kiosk
     amenity=language_school: JA:Tag:amenity=language school
     amenity=language_school: JA:Tag:amenity=language school
+    amenity=lavoir: JA:Tag:amenity=lavoir
     amenity=letter_box: JA:Tag:amenity=letter box
     amenity=library: JA:Tag:amenity=library
     amenity=letter_box: JA:Tag:amenity=letter box
     amenity=library: JA:Tag:amenity=library
+    amenity=library_dropoff: JA:Tag:amenity=library dropoff
     amenity=loading_dock: JA:Tag:amenity=loading dock
     amenity=lounger: JA:Tag:amenity=lounger
     amenity=love_hotel: JA:Tag:amenity=love hotel
     amenity=marketplace: JA:Tag:amenity=marketplace
     amenity=microwave: JA:Tag:amenity=microwave
     amenity=loading_dock: JA:Tag:amenity=loading dock
     amenity=lounger: JA:Tag:amenity=lounger
     amenity=love_hotel: JA:Tag:amenity=love hotel
     amenity=marketplace: JA:Tag:amenity=marketplace
     amenity=microwave: JA:Tag:amenity=microwave
+    amenity=mist_spraying_cooler: JA:Tag:amenity=mist spraying cooler
+    amenity=mobile_library: JA:Tag:amenity=mobile library
     amenity=monastery: JA:Tag:amenity=monastery
     amenity=money_transfer: JA:Tag:amenity=money transfer
     amenity=monastery: JA:Tag:amenity=monastery
     amenity=money_transfer: JA:Tag:amenity=money transfer
+    amenity=mortuary: JA:Tag:amenity=mortuary
     amenity=motorcycle_parking: JA:Tag:amenity=motorcycle parking
     amenity=music_school: JA:Tag:amenity=music school
     amenity=motorcycle_parking: JA:Tag:amenity=motorcycle parking
     amenity=music_school: JA:Tag:amenity=music school
+    amenity=music_venue: JA:Tag:amenity=music venue
     amenity=nightclub: JA:Tag:amenity=nightclub
     amenity=nursing_home: JA:Tag:amenity=nursing home
     amenity=nightclub: JA:Tag:amenity=nightclub
     amenity=nursing_home: JA:Tag:amenity=nursing home
+    amenity=parcel_locker: JA:Tag:amenity=parcel locker
     amenity=parking: JA:Tag:amenity=parking
     amenity=parking_entrance: JA:Tag:amenity=parking entrance
     amenity=parking_space: JA:Tag:amenity=parking space
     amenity=payment_terminal: JA:Tag:amenity=payment terminal
     amenity=pharmacy: JA:Tag:amenity=pharmacy
     amenity=photo_booth: JA:Tag:amenity=photo booth
     amenity=parking: JA:Tag:amenity=parking
     amenity=parking_entrance: JA:Tag:amenity=parking entrance
     amenity=parking_space: JA:Tag:amenity=parking space
     amenity=payment_terminal: JA:Tag:amenity=payment terminal
     amenity=pharmacy: JA:Tag:amenity=pharmacy
     amenity=photo_booth: JA:Tag:amenity=photo booth
+    amenity=piano: JA:Tag:amenity=piano
     amenity=place_of_worship: JA:Tag:amenity=place of worship
     amenity=planetarium: JA:Tag:amenity=planetarium
     amenity=police: JA:Tag:amenity=police
     amenity=polling_station: JA:Tag:amenity=polling station
     amenity=post_box: JA:Tag:amenity=post box
     amenity=place_of_worship: JA:Tag:amenity=place of worship
     amenity=planetarium: JA:Tag:amenity=planetarium
     amenity=police: JA:Tag:amenity=police
     amenity=polling_station: JA:Tag:amenity=polling station
     amenity=post_box: JA:Tag:amenity=post box
+    amenity=post_depot: JA:Tag:amenity=post depot
     amenity=post_office: JA:Tag:amenity=post office
     amenity=prep_school: JA:Tag:amenity=prep school
     amenity=printer: JA:Tag:amenity=printer
     amenity=post_office: JA:Tag:amenity=post office
     amenity=prep_school: JA:Tag:amenity=prep school
     amenity=printer: JA:Tag:amenity=printer
@@ -15435,20 +21514,25 @@ ja:
     amenity=public_bath: JA:Tag:amenity=public bath
     amenity=public_bookcase: JA:Tag:amenity=public bookcase
     amenity=public_building: JA:Tag:amenity=public building
     amenity=public_bath: JA:Tag:amenity=public bath
     amenity=public_bookcase: JA:Tag:amenity=public bookcase
     amenity=public_building: JA:Tag:amenity=public building
+    amenity=reception_desk: JA:Tag:amenity=reception desk
     amenity=recycling: JA:Tag:amenity=recycling
     amenity=recycling: JA:Tag:amenity=recycling
+    amenity=refugee_site: JA:Tag:amenity=refugee site
     amenity=register_office: JA:Tag:amenity=register office
     amenity=research_institute: JA:Tag:amenity=research institute
     amenity=restaurant: JA:Tag:amenity=restaurant
     amenity=retirement_home: JA:Tag:amenity=retirement home
     amenity=register_office: JA:Tag:amenity=register office
     amenity=research_institute: JA:Tag:amenity=research institute
     amenity=restaurant: JA:Tag:amenity=restaurant
     amenity=retirement_home: JA:Tag:amenity=retirement home
+    amenity=sailing_school: JA:Tag:amenity=sailing school
     amenity=sanitary_dump_station: JA:Tag:amenity=sanitary dump station
     amenity=sauna: JA:Tag:amenity=sauna
     amenity=school: JA:Tag:amenity=school
     amenity=sanitary_dump_station: JA:Tag:amenity=sanitary dump station
     amenity=sauna: JA:Tag:amenity=sauna
     amenity=school: JA:Tag:amenity=school
+    amenity=security_booth: JA:Tag:amenity=security booth
     amenity=shelter: JA:Tag:amenity=shelter
     amenity=shower: JA:Tag:amenity=shower
     amenity=ski_school: JA:Tag:amenity=ski school
     amenity=smoking_area: JA:Tag:amenity=smoking area
     amenity=social_centre: JA:Tag:amenity=social centre
     amenity=social_facility: JA:Tag:amenity=social facility
     amenity=shelter: JA:Tag:amenity=shelter
     amenity=shower: JA:Tag:amenity=shower
     amenity=ski_school: JA:Tag:amenity=ski school
     amenity=smoking_area: JA:Tag:amenity=smoking area
     amenity=social_centre: JA:Tag:amenity=social centre
     amenity=social_facility: JA:Tag:amenity=social facility
+    amenity=stage: JA:Tag:amenity=stage
     amenity=stripclub: JA:Tag:amenity=stripclub
     amenity=studio: JA:Tag:amenity=studio
     amenity=swimming_pool: JA:Tag:amenity=swimming pool
     amenity=stripclub: JA:Tag:amenity=stripclub
     amenity=studio: JA:Tag:amenity=studio
     amenity=swimming_pool: JA:Tag:amenity=swimming pool
@@ -15456,8 +21540,13 @@ ja:
     amenity=taxi: JA:Tag:amenity=taxi
     amenity=telephone: JA:Tag:amenity=telephone
     amenity=theatre: JA:Tag:amenity=theatre
     amenity=taxi: JA:Tag:amenity=taxi
     amenity=telephone: JA:Tag:amenity=telephone
     amenity=theatre: JA:Tag:amenity=theatre
+    amenity=ticket_validator: JA:Tag:amenity=ticket validator
     amenity=toilets: JA:Tag:amenity=toilets
     amenity=townhall: JA:Tag:amenity=townhall
     amenity=toilets: JA:Tag:amenity=toilets
     amenity=townhall: JA:Tag:amenity=townhall
+    amenity=toy_library: JA:Tag:amenity=toy library
+    amenity=trade_school: JA:Tag:amenity=trade school
+    amenity=traffic_park: JA:Tag:amenity=traffic park
+    amenity=training: JA:Tag:amenity=training
     amenity=university: JA:Tag:amenity=university
     amenity=vehicle_inspection: JA:Tag:amenity=vehicle inspection
     amenity=vending_machine: JA:Tag:amenity=vending machine
     amenity=university: JA:Tag:amenity=university
     amenity=vehicle_inspection: JA:Tag:amenity=vehicle inspection
     amenity=vending_machine: JA:Tag:amenity=vending machine
@@ -15468,7 +21557,12 @@ ja:
     amenity=water: JA:Tag:amenity=water
     amenity=water_point: JA:Tag:amenity=water point
     amenity=watering_place: JA:Tag:amenity=watering place
     amenity=water: JA:Tag:amenity=water
     amenity=water_point: JA:Tag:amenity=water point
     amenity=watering_place: JA:Tag:amenity=watering place
+    amenity=weighbridge: JA:Tag:amenity=weighbridge
     amenity=winery: JA:Tag:amenity=winery
     amenity=winery: JA:Tag:amenity=winery
+    artwork_type=bust: JA:Tag:artwork type=bust
+    artwork_type=mural: JA:Tag:artwork type=mural
+    artwork_type=sculpture: JA:Tag:artwork type=sculpture
+    artwork_type=statue: JA:Tag:artwork type=statue
     assembly_point:earthquake=yes: JA:Tag:assembly point:earthquake=yes
     assembly_point:tsunami=yes: JA:Tag:assembly point:tsunami=yes
     atm=yes: JA:Tag:atm=yes
     assembly_point:earthquake=yes: JA:Tag:assembly point:earthquake=yes
     assembly_point:tsunami=yes: JA:Tag:assembly point:tsunami=yes
     atm=yes: JA:Tag:atm=yes
@@ -15492,6 +21586,7 @@ ja:
     barrier=kissing_gate: JA:Tag:barrier=kissing gate
     barrier=lift_gate: JA:Tag:barrier=lift gate
     barrier=log: JA:Tag:barrier=log
     barrier=kissing_gate: JA:Tag:barrier=kissing gate
     barrier=lift_gate: JA:Tag:barrier=lift gate
     barrier=log: JA:Tag:barrier=log
+    barrier=planter: JA:Tag:barrier=planter
     barrier=retaining_wall: JA:Tag:barrier=retaining wall
     barrier=sally_port: JA:Tag:barrier=sally port
     barrier=stile: JA:Tag:barrier=stile
     barrier=retaining_wall: JA:Tag:barrier=retaining wall
     barrier=sally_port: JA:Tag:barrier=sally port
     barrier=stile: JA:Tag:barrier=stile
@@ -15503,15 +21598,18 @@ ja:
     bay=fjord: JA:Tag:bay=fjord
     bicycle=designated: JA:Tag:bicycle=designated
     bicycle=use_sidepath: JA:Tag:bicycle=use sidepath
     bay=fjord: JA:Tag:bay=fjord
     bicycle=designated: JA:Tag:bicycle=designated
     bicycle=use_sidepath: JA:Tag:bicycle=use sidepath
+    bicycle_road=yes: JA:Tag:bicycle road=yes
     boundary=administrative: JA:Tag:boundary=administrative
     boundary=civil: JA:Tag:boundary=civil
     boundary=economic: JA:Tag:boundary=economic
     boundary=administrative: JA:Tag:boundary=administrative
     boundary=civil: JA:Tag:boundary=civil
     boundary=economic: JA:Tag:boundary=economic
+    boundary=hazard: JA:Tag:boundary=hazard
     boundary=historic: JA:Tag:boundary=historic
     boundary=local_authority: JA:Tag:boundary=local authority
     boundary=maritime: JA:Tag:boundary=maritime
     boundary=military_district: JA:Tag:boundary=military district
     boundary=national: JA:Tag:boundary=national
     boundary=national_park: JA:Tag:boundary=national park
     boundary=historic: JA:Tag:boundary=historic
     boundary=local_authority: JA:Tag:boundary=local authority
     boundary=maritime: JA:Tag:boundary=maritime
     boundary=military_district: JA:Tag:boundary=military district
     boundary=national: JA:Tag:boundary=national
     boundary=national_park: JA:Tag:boundary=national park
+    boundary=place: JA:Tag:boundary=place
     boundary=political: JA:Tag:boundary=political
     boundary=postal_code: JA:Tag:boundary=postal code
     boundary=protected_area: JA:Tag:boundary=protected area
     boundary=political: JA:Tag:boundary=political
     boundary=postal_code: JA:Tag:boundary=postal code
     boundary=protected_area: JA:Tag:boundary=protected area
@@ -15540,6 +21638,7 @@ ja:
     bridge=trestle: JA:Tag:bridge=trestle
     bridge=viaduct: JA:Tag:bridge=viaduct
     building=apartments: JA:Tag:building=apartments
     bridge=trestle: JA:Tag:bridge=trestle
     bridge=viaduct: JA:Tag:bridge=viaduct
     building=apartments: JA:Tag:building=apartments
+    building=bakehouse: JA:Tag:building=bakehouse
     building=barn: JA:Tag:building=barn
     building=bridge: JA:Tag:building=bridge
     building=bungalow: JA:Tag:building=bungalow
     building=barn: JA:Tag:building=barn
     building=bridge: JA:Tag:building=bridge
     building=bungalow: JA:Tag:building=bungalow
@@ -15560,6 +21659,7 @@ ja:
     building=entrance: JA:Tag:building=entrance
     building=farm: JA:Tag:building=farm
     building=farm_auxiliary: JA:Tag:building=farm auxiliary
     building=entrance: JA:Tag:building=entrance
     building=farm: JA:Tag:building=farm
     building=farm_auxiliary: JA:Tag:building=farm auxiliary
+    building=fire_lookout: JA:Tag:building=fire lookout
     building=garage: JA:Tag:building=garage
     building=garages: JA:Tag:building=garages
     building=greenhouse: JA:Tag:building=greenhouse
     building=garage: JA:Tag:building=garage
     building=garages: JA:Tag:building=garages
     building=greenhouse: JA:Tag:building=greenhouse
@@ -15603,7 +21703,10 @@ ja:
     bus=no: JA:Tag:bus=no
     busway=opposite_lane: JA:Tag:busway=opposite lane
     castle_type=fortress: JA:Tag:castle type=fortress
     bus=no: JA:Tag:bus=no
     busway=opposite_lane: JA:Tag:busway=opposite lane
     castle_type=fortress: JA:Tag:castle type=fortress
+    castle_type=shiro: JA:Tag:castle type=shiro
     cemetery=grave: JA:Tag:cemetery=grave
     cemetery=grave: JA:Tag:cemetery=grave
+    cemetery=sector: JA:Tag:cemetery=sector
+    clothes=wedding: JA:Tag:clothes=wedding
     club=fan: JA:Tag:club=fan
     craft=agricultural_engines: JA:Tag:craft=agricultural engines
     craft=basket_maker: JA:Tag:craft=basket maker
     club=fan: JA:Tag:club=fan
     craft=agricultural_engines: JA:Tag:craft=agricultural engines
     craft=basket_maker: JA:Tag:craft=basket maker
@@ -15626,9 +21729,11 @@ ja:
     craft=floorer: JA:Tag:craft=floorer
     craft=gardener: JA:Tag:craft=gardener
     craft=glaziery: JA:Tag:craft=glaziery
     craft=floorer: JA:Tag:craft=floorer
     craft=gardener: JA:Tag:craft=gardener
     craft=glaziery: JA:Tag:craft=glaziery
+    craft=grinding_mill: JA:Tag:craft=grinding mill
     craft=handicraft: JA:Tag:craft=handicraft
     craft=hvac: JA:Tag:craft=hvac
     craft=insulation: JA:Tag:craft=insulation
     craft=handicraft: JA:Tag:craft=handicraft
     craft=hvac: JA:Tag:craft=hvac
     craft=insulation: JA:Tag:craft=insulation
+    craft=interior_decorator: JA:Tag:craft=interior decorator
     craft=jeweller: JA:Tag:craft=jeweller
     craft=joiner: JA:Tag:craft=joiner
     craft=key_cutter: JA:Tag:craft=key cutter
     craft=jeweller: JA:Tag:craft=jeweller
     craft=joiner: JA:Tag:craft=joiner
     craft=key_cutter: JA:Tag:craft=key cutter
@@ -15665,12 +21770,23 @@ ja:
     craft=window_construction: JA:Tag:craft=window construction
     craft=winery: JA:Tag:craft=winery
     crop=rice: JA:Tag:crop=rice
     craft=window_construction: JA:Tag:craft=window construction
     craft=winery: JA:Tag:craft=winery
     crop=rice: JA:Tag:crop=rice
+    cuisine=barbecue: JA:Tag:cuisine=barbecue
     cuisine=brazilian: JA:Tag:cuisine=brazilian
     cuisine=coffee_shop: JA:Tag:cuisine=coffee shop
     cuisine=dessert: JA:Tag:cuisine=dessert
     cuisine=brazilian: JA:Tag:cuisine=brazilian
     cuisine=coffee_shop: JA:Tag:cuisine=coffee shop
     cuisine=dessert: JA:Tag:cuisine=dessert
+    cuisine=dumpling: JA:Tag:cuisine=dumpling
+    cuisine=japanese: JA:Tag:cuisine=japanese
+    cuisine=regional: JA:Tag:cuisine=regional
+    cuisine=sushi: JA:Tag:cuisine=sushi
+    cycle_network=JP:prefectural: JA:Tag:cycle network=JP:prefectural
+    cycleway:both=no: JA:Tag:cycleway:both=no
+    cycleway:left=no: JA:Tag:cycleway:left=no
+    cycleway:right=no: JA:Tag:cycleway:right=no
     cycleway=lane: JA:Tag:cycleway=lane
     cycleway=lane: JA:Tag:cycleway=lane
+    cycleway=no: JA:Tag:cycleway=no
     cycleway=opposite_track: JA:Tag:cycleway=opposite track
     cycleway=share_busway: JA:Tag:cycleway=share busway
     cycleway=opposite_track: JA:Tag:cycleway=opposite track
     cycleway=share_busway: JA:Tag:cycleway=share busway
+    cycleway=shared_lane: JA:Tag:cycleway=shared lane
     cycleway=track: JA:Tag:cycleway=track
     denomination=jodo_shinshu: JA:Tag:denomination=jodo shinshu
     denomination=jodo_shu: JA:Tag:denomination=jodo shu
     cycleway=track: JA:Tag:cycleway=track
     denomination=jodo_shinshu: JA:Tag:denomination=jodo shinshu
     denomination=jodo_shu: JA:Tag:denomination=jodo shu
@@ -15678,6 +21794,9 @@ ja:
     denomination=shingon_shu: JA:Tag:denomination=shingon shu
     denomination=soto: JA:Tag:denomination=soto
     denomination=tiantai: JA:Tag:denomination=tiantai
     denomination=shingon_shu: JA:Tag:denomination=shingon shu
     denomination=soto: JA:Tag:denomination=soto
     denomination=tiantai: JA:Tag:denomination=tiantai
+    diplomatic=consulate: JA:Tag:diplomatic=consulate
+    diplomatic=embassy: JA:Tag:diplomatic=embassy
+    emergency:social_facility=shelter: JA:Tag:emergency:social facility=shelter
     emergency=ambulance_station: JA:Tag:emergency=ambulance station
     emergency=assembly_point: JA:Tag:emergency=assembly point
     emergency=defibrillator: JA:Tag:emergency=defibrillator
     emergency=ambulance_station: JA:Tag:emergency=ambulance station
     emergency=assembly_point: JA:Tag:emergency=assembly point
     emergency=defibrillator: JA:Tag:emergency=defibrillator
@@ -15687,13 +21806,18 @@ ja:
     emergency=fire_extinguisher: JA:Tag:emergency=fire extinguisher
     emergency=fire_hose: JA:Tag:emergency=fire hose
     emergency=fire_hydrant: JA:Tag:emergency=fire hydrant
     emergency=fire_extinguisher: JA:Tag:emergency=fire extinguisher
     emergency=fire_hose: JA:Tag:emergency=fire hose
     emergency=fire_hydrant: JA:Tag:emergency=fire hydrant
+    emergency=fire_lookout: JA:Tag:emergency=fire lookout
+    emergency=fire_service_inlet: JA:Tag:emergency=fire service inlet
     emergency=fire_water_pond: JA:Tag:emergency=fire water pond
     emergency=fire_water_pond: JA:Tag:emergency=fire water pond
+    emergency=landing_site: JA:Tag:emergency=landing site
     emergency=lifeguard_tower: JA:Tag:emergency=lifeguard tower
     emergency=phone: JA:Tag:emergency=phone
     emergency=siren: JA:Tag:emergency=siren
     emergency=lifeguard_tower: JA:Tag:emergency=lifeguard tower
     emergency=phone: JA:Tag:emergency=phone
     emergency=siren: JA:Tag:emergency=siren
+    emergency=suction_point: JA:Tag:emergency=suction point
     emergency=water_tank: JA:Tag:emergency=water tank
     entrance=main: JA:Tag:entrance=main
     entrance=staircase: JA:Tag:entrance=staircase
     emergency=water_tank: JA:Tag:emergency=water tank
     entrance=main: JA:Tag:entrance=main
     entrance=staircase: JA:Tag:entrance=staircase
+    fast_food=cafeteria: JA:Tag:fast food=cafeteria
     foot=designated: JA:Tag:foot=designated
     foot=private: JA:Tag:foot=private
     footway=crossing: JA:Tag:footway=crossing
     foot=designated: JA:Tag:foot=designated
     foot=private: JA:Tag:foot=private
     footway=crossing: JA:Tag:footway=crossing
@@ -15744,6 +21868,7 @@ ja:
     generator:type=steam_generator: JA:Tag:generator:type=steam generator
     generator:type=steam_turbine: JA:Tag:generator:type=steam turbine
     generator:type=vertical_axis: JA:Tag:generator:type=vertical axis
     generator:type=steam_generator: JA:Tag:generator:type=steam generator
     generator:type=steam_turbine: JA:Tag:generator:type=steam turbine
     generator:type=vertical_axis: JA:Tag:generator:type=vertical axis
+    geological=fault: JA:Tag:geological=fault
     geological=moraine: JA:Tag:geological=moraine
     geological=outcrop: JA:Tag:geological=outcrop
     geological=palaeontological_site: JA:Tag:geological=palaeontological site
     geological=moraine: JA:Tag:geological=moraine
     geological=outcrop: JA:Tag:geological=outcrop
     geological=palaeontological_site: JA:Tag:geological=palaeontological site
@@ -15751,14 +21876,20 @@ ja:
     golf=driving_range: JA:Tag:golf=driving range
     golf=fairway: JA:Tag:golf=fairway
     goods=destination: JA:Tag:goods=destination
     golf=driving_range: JA:Tag:golf=driving range
     golf=fairway: JA:Tag:golf=fairway
     goods=destination: JA:Tag:goods=destination
+    government=audit: JA:Tag:government=audit
     government=ministry: JA:Tag:government=ministry
     government=prosecutor: JA:Tag:government=prosecutor
     government=register_office: JA:Tag:government=register office
     government=tax: JA:Tag:government=tax
     government=ministry: JA:Tag:government=ministry
     government=prosecutor: JA:Tag:government=prosecutor
     government=register_office: JA:Tag:government=register office
     government=tax: JA:Tag:government=tax
+    government=transportation: JA:Tag:government=transportation
     guidepost=simple: JA:Tag:guidepost=simple
     guidepost=simple: JA:Tag:guidepost=simple
+    healthcare:speciality=gynaecology: JA:Tag:healthcare:speciality=gynaecology
     healthcare=blood_donation: JA:Tag:healthcare=blood donation
     healthcare=blood_donation: JA:Tag:healthcare=blood donation
+    healthcare=doctor: JA:Tag:healthcare=doctor
+    healthcare=vaccination_centre: JA:Tag:healthcare=vaccination centre
     hgv=designated: JA:Tag:hgv=designated
     hgv=destination: JA:Tag:hgv=destination
     hgv=designated: JA:Tag:hgv=designated
     hgv=destination: JA:Tag:hgv=destination
+    hgv=no: JA:Tag:hgv=no
     highway=bridleway: JA:Tag:highway=bridleway
     highway=bus_guideway: JA:Tag:highway=bus guideway
     highway=bus_stop: JA:Tag:highway=bus stop
     highway=bridleway: JA:Tag:highway=bridleway
     highway=bus_guideway: JA:Tag:highway=bus guideway
     highway=bus_stop: JA:Tag:highway=bus stop
@@ -15767,6 +21898,7 @@ ja:
     highway=cycleway: JA:Tag:highway=cycleway
     highway=elevator: JA:Tag:highway=elevator
     highway=emergency_access_point: JA:Tag:highway=emergency access point
     highway=cycleway: JA:Tag:highway=cycleway
     highway=elevator: JA:Tag:highway=elevator
     highway=emergency_access_point: JA:Tag:highway=emergency access point
+    highway=emergency_bay: JA:Tag:highway=emergency bay
     highway=escape: JA:Tag:highway=escape
     highway=footway: JA:Tag:highway=footway
     highway=ford: JA:Tag:highway=ford
     highway=escape: JA:Tag:highway=escape
     highway=footway: JA:Tag:highway=footway
     highway=ford: JA:Tag:highway=ford
@@ -15796,6 +21928,7 @@ ja:
     highway=stop: JA:Tag:highway=stop
     highway=street_lamp: JA:Tag:highway=street lamp
     highway=tertiary: JA:Tag:highway=tertiary
     highway=stop: JA:Tag:highway=stop
     highway=street_lamp: JA:Tag:highway=street lamp
     highway=tertiary: JA:Tag:highway=tertiary
+    highway=toll_gantry: JA:Tag:highway=toll gantry
     highway=track: JA:Tag:highway=track
     highway=traffic_mirror: JA:Tag:highway=traffic mirror
     highway=traffic_signals: JA:Tag:highway=traffic signals
     highway=track: JA:Tag:highway=track
     highway=traffic_mirror: JA:Tag:highway=traffic mirror
     highway=traffic_signals: JA:Tag:highway=traffic signals
@@ -15807,6 +21940,7 @@ ja:
     historic=archaeological_site: JA:Tag:historic=archaeological site
     historic=battlefield: JA:Tag:historic=battlefield
     historic=boundary_stone: JA:Tag:historic=boundary stone
     historic=archaeological_site: JA:Tag:historic=archaeological site
     historic=battlefield: JA:Tag:historic=battlefield
     historic=boundary_stone: JA:Tag:historic=boundary stone
+    historic=building: JA:Tag:historic=building
     historic=cannon: JA:Tag:historic=cannon
     historic=castle: JA:Tag:historic=castle
     historic=charcoal_pile: JA:Tag:historic=charcoal pile
     historic=cannon: JA:Tag:historic=cannon
     historic=castle: JA:Tag:historic=castle
     historic=charcoal_pile: JA:Tag:historic=charcoal pile
@@ -15817,6 +21951,7 @@ ja:
     historic=gallows: JA:Tag:historic=gallows
     historic=heritage: JA:Tag:historic=heritage
     historic=highwater_mark: JA:Tag:historic=highwater mark
     historic=gallows: JA:Tag:historic=gallows
     historic=heritage: JA:Tag:historic=heritage
     historic=highwater_mark: JA:Tag:historic=highwater mark
+    historic=house: JA:Tag:historic=house
     historic=locomotive: JA:Tag:historic=locomotive
     historic=memorial: JA:Tag:historic=memorial
     historic=milestone: JA:Tag:historic=milestone
     historic=locomotive: JA:Tag:historic=locomotive
     historic=memorial: JA:Tag:historic=memorial
     historic=milestone: JA:Tag:historic=milestone
@@ -15824,6 +21959,7 @@ ja:
     historic=monument: JA:Tag:historic=monument
     historic=optical_telegraph: JA:Tag:historic=optical telegraph
     historic=pillory: JA:Tag:historic=pillory
     historic=monument: JA:Tag:historic=monument
     historic=optical_telegraph: JA:Tag:historic=optical telegraph
     historic=pillory: JA:Tag:historic=pillory
+    historic=road: JA:Tag:historic=road
     historic=ruins: JA:Tag:historic=ruins
     historic=rune_stone: JA:Tag:historic=rune stone
     historic=ship: JA:Tag:historic=ship
     historic=ruins: JA:Tag:historic=ruins
     historic=rune_stone: JA:Tag:historic=rune stone
     historic=ship: JA:Tag:historic=ship
@@ -15868,6 +22004,7 @@ ja:
     junction=circular: JA:Tag:junction=circular
     junction=roundabout: JA:Tag:junction=roundabout
     junction=yes: JA:Tag:junction=yes
     junction=circular: JA:Tag:junction=circular
     junction=roundabout: JA:Tag:junction=roundabout
     junction=yes: JA:Tag:junction=yes
+    landcover=trees: JA:Tag:landcover=trees
     landuse=allotments: JA:Tag:landuse=allotments
     landuse=aquaculture: JA:Tag:landuse=aquaculture
     landuse=basin: JA:Tag:landuse=basin
     landuse=allotments: JA:Tag:landuse=allotments
     landuse=aquaculture: JA:Tag:landuse=aquaculture
     landuse=basin: JA:Tag:landuse=basin
@@ -15877,9 +22014,11 @@ ja:
     landuse=commercial: JA:Tag:landuse=commercial
     landuse=construction: JA:Tag:landuse=construction
     landuse=depot: JA:Tag:landuse=depot
     landuse=commercial: JA:Tag:landuse=commercial
     landuse=construction: JA:Tag:landuse=construction
     landuse=depot: JA:Tag:landuse=depot
+    landuse=education: JA:Tag:landuse=education
     landuse=farm: JA:Tag:landuse=farm
     landuse=farmland: JA:Tag:landuse=farmland
     landuse=farmyard: JA:Tag:landuse=farmyard
     landuse=farm: JA:Tag:landuse=farm
     landuse=farmland: JA:Tag:landuse=farmland
     landuse=farmyard: JA:Tag:landuse=farmyard
+    landuse=flowerbed: JA:Tag:landuse=flowerbed
     landuse=forest: JA:Tag:landuse=forest
     landuse=garages: JA:Tag:landuse=garages
     landuse=grass: JA:Tag:landuse=grass
     landuse=forest: JA:Tag:landuse=forest
     landuse=garages: JA:Tag:landuse=garages
     landuse=grass: JA:Tag:landuse=grass
@@ -15891,6 +22030,7 @@ ja:
     landuse=meadow: JA:Tag:landuse=meadow
     landuse=military: JA:Tag:landuse=military
     landuse=orchard: JA:Tag:landuse=orchard
     landuse=meadow: JA:Tag:landuse=meadow
     landuse=military: JA:Tag:landuse=military
     landuse=orchard: JA:Tag:landuse=orchard
+    landuse=paddy: JA:Tag:landuse=paddy
     landuse=peat_cutting: JA:Tag:landuse=peat cutting
     landuse=plant_nursery: JA:Tag:landuse=plant nursery
     landuse=port: JA:Tag:landuse=port
     landuse=peat_cutting: JA:Tag:landuse=peat cutting
     landuse=plant_nursery: JA:Tag:landuse=plant nursery
     landuse=port: JA:Tag:landuse=port
@@ -15907,6 +22047,7 @@ ja:
     landuse=vineyard: JA:Tag:landuse=vineyard
     landuse=winter_sports: JA:Tag:landuse=winter sports
     landuse=wood: JA:Tag:landuse=wood
     landuse=vineyard: JA:Tag:landuse=vineyard
     landuse=winter_sports: JA:Tag:landuse=winter sports
     landuse=wood: JA:Tag:landuse=wood
+    lane_markings=no: JA:Tag:lane markings=no
     leaf_cycle=deciduous: JA:Tag:leaf cycle=deciduous
     leaf_cycle=evergreen: JA:Tag:leaf cycle=evergreen
     leaf_cycle=mixed: JA:Tag:leaf cycle=mixed
     leaf_cycle=deciduous: JA:Tag:leaf cycle=deciduous
     leaf_cycle=evergreen: JA:Tag:leaf cycle=evergreen
     leaf_cycle=mixed: JA:Tag:leaf cycle=mixed
@@ -15919,8 +22060,10 @@ ja:
     leisure=adult_gaming_centre: JA:Tag:leisure=adult gaming centre
     leisure=amusement_arcade: JA:Tag:leisure=amusement arcade
     leisure=bandstand: JA:Tag:leisure=bandstand
     leisure=adult_gaming_centre: JA:Tag:leisure=adult gaming centre
     leisure=amusement_arcade: JA:Tag:leisure=amusement arcade
     leisure=bandstand: JA:Tag:leisure=bandstand
+    leisure=bathing_place: JA:Tag:leisure=bathing place
     leisure=beach_resort: JA:Tag:leisure=beach resort
     leisure=bird_hide: JA:Tag:leisure=bird hide
     leisure=beach_resort: JA:Tag:leisure=beach resort
     leisure=bird_hide: JA:Tag:leisure=bird hide
+    leisure=bleachers: JA:Tag:leisure=bleachers
     leisure=bowling_alley: JA:Tag:leisure=bowling alley
     leisure=common: JA:Tag:leisure=common
     leisure=dance: JA:Tag:leisure=dance
     leisure=bowling_alley: JA:Tag:leisure=bowling alley
     leisure=common: JA:Tag:leisure=common
     leisure=dance: JA:Tag:leisure=dance
@@ -15929,6 +22072,7 @@ ja:
     leisure=firepit: JA:Tag:leisure=firepit
     leisure=fishing: JA:Tag:leisure=fishing
     leisure=fitness_centre: JA:Tag:leisure=fitness centre
     leisure=firepit: JA:Tag:leisure=firepit
     leisure=fishing: JA:Tag:leisure=fishing
     leisure=fitness_centre: JA:Tag:leisure=fitness centre
+    leisure=fitness_station: JA:Tag:leisure=fitness station
     leisure=garden: JA:Tag:leisure=garden
     leisure=golf_course: JA:Tag:leisure=golf course
     leisure=hackerspace: JA:Tag:leisure=hackerspace
     leisure=garden: JA:Tag:leisure=garden
     leisure=golf_course: JA:Tag:leisure=golf course
     leisure=hackerspace: JA:Tag:leisure=hackerspace
@@ -15937,11 +22081,15 @@ ja:
     leisure=marina: JA:Tag:leisure=marina
     leisure=miniature_golf: JA:Tag:leisure=miniature golf
     leisure=nature_reserve: JA:Tag:leisure=nature reserve
     leisure=marina: JA:Tag:leisure=marina
     leisure=miniature_golf: JA:Tag:leisure=miniature golf
     leisure=nature_reserve: JA:Tag:leisure=nature reserve
+    leisure=outdoor_seating: JA:Tag:leisure=outdoor seating
+    leisure=paddling_pool: JA:Tag:leisure=paddling pool
     leisure=park: JA:Tag:leisure=park
     leisure=picnic_table: JA:Tag:leisure=picnic table
     leisure=pitch: JA:Tag:leisure=pitch
     leisure=playground: JA:Tag:leisure=playground
     leisure=park: JA:Tag:leisure=park
     leisure=picnic_table: JA:Tag:leisure=picnic table
     leisure=pitch: JA:Tag:leisure=pitch
     leisure=playground: JA:Tag:leisure=playground
+    leisure=resort: JA:Tag:leisure=resort
     leisure=sauna: JA:Tag:leisure=sauna
     leisure=sauna: JA:Tag:leisure=sauna
+    leisure=schoolyard: JA:Tag:leisure=schoolyard
     leisure=slipway: JA:Tag:leisure=slipway
     leisure=sports_centre: JA:Tag:leisure=sports centre
     leisure=sports_hall: JA:Tag:leisure=sports hall
     leisure=slipway: JA:Tag:leisure=slipway
     leisure=sports_centre: JA:Tag:leisure=sports centre
     leisure=sports_hall: JA:Tag:leisure=sports hall
@@ -15949,19 +22097,29 @@ ja:
     leisure=summer_camp: JA:Tag:leisure=summer camp
     leisure=swimming_area: JA:Tag:leisure=swimming area
     leisure=swimming_pool: JA:Tag:leisure=swimming pool
     leisure=summer_camp: JA:Tag:leisure=summer camp
     leisure=swimming_area: JA:Tag:leisure=swimming area
     leisure=swimming_pool: JA:Tag:leisure=swimming pool
+    leisure=tanning_salon: JA:Tag:leisure=tanning salon
     leisure=track: JA:Tag:leisure=track
     leisure=water_park: JA:Tag:leisure=water park
     leisure=track: JA:Tag:leisure=track
     leisure=water_park: JA:Tag:leisure=water park
+    lifeguard=tower: JA:Tag:lifeguard=tower
     line=bay: JA:Tag:line=bay
     line=busbar: JA:Tag:line=busbar
     man_made=adit: JA:Tag:man made=adit
     line=bay: JA:Tag:line=bay
     line=busbar: JA:Tag:line=busbar
     man_made=adit: JA:Tag:man made=adit
+    man_made=animal_trap: JA:Tag:man made=animal trap
+    man_made=avalanche_protection: JA:Tag:man made=avalanche protection
     man_made=beacon: JA:Tag:man made=beacon
     man_made=beacon: JA:Tag:man made=beacon
+    man_made=beehive: JA:Tag:man made=beehive
     man_made=breakwater: JA:Tag:man made=breakwater
     man_made=bridge: JA:Tag:man made=bridge
     man_made=bunker_silo: JA:Tag:man made=bunker silo
     man_made=breakwater: JA:Tag:man made=breakwater
     man_made=bridge: JA:Tag:man made=bridge
     man_made=bunker_silo: JA:Tag:man made=bunker silo
+    man_made=cairn: JA:Tag:man made=cairn
     man_made=campanile: JA:Tag:man made=campanile
     man_made=campanile: JA:Tag:man made=campanile
+    man_made=cellar_entrance: JA:Tag:man made=cellar entrance
+    man_made=chiller: JA:Tag:man made=chiller
     man_made=chimney: JA:Tag:man made=chimney
     man_made=clearcut: JA:Tag:man made=clearcut
     man_made=chimney: JA:Tag:man made=chimney
     man_made=clearcut: JA:Tag:man made=clearcut
+    man_made=column: JA:Tag:man made=column
     man_made=communications_tower: JA:Tag:man made=communications tower
     man_made=communications_tower: JA:Tag:man made=communications tower
+    man_made=courtyard: JA:Tag:man made=courtyard
     man_made=crane: JA:Tag:man made=crane
     man_made=cross: JA:Tag:man made=cross
     man_made=cutline: JA:Tag:man made=cutline
     man_made=crane: JA:Tag:man made=crane
     man_made=cross: JA:Tag:man made=cross
     man_made=cutline: JA:Tag:man made=cutline
@@ -15971,8 +22129,10 @@ ja:
     man_made=embankment: JA:Tag:man made=embankment
     man_made=flagpole: JA:Tag:man made=flagpole
     man_made=flare: JA:Tag:man made=flare
     man_made=embankment: JA:Tag:man made=embankment
     man_made=flagpole: JA:Tag:man made=flagpole
     man_made=flare: JA:Tag:man made=flare
+    man_made=gantry: JA:Tag:man made=gantry
     man_made=gasometer: JA:Tag:man made=gasometer
     man_made=geoglyph: JA:Tag:man made=geoglyph
     man_made=gasometer: JA:Tag:man made=gasometer
     man_made=geoglyph: JA:Tag:man made=geoglyph
+    man_made=goods_conveyor: JA:Tag:man made=goods conveyor
     man_made=groyne: JA:Tag:man made=groyne
     man_made=hot_water_tank: JA:Tag:man made=hot water tank
     man_made=insect_hotel: JA:Tag:man made=insect hotel
     man_made=groyne: JA:Tag:man made=groyne
     man_made=hot_water_tank: JA:Tag:man made=hot water tank
     man_made=insect_hotel: JA:Tag:man made=insect hotel
@@ -15986,19 +22146,26 @@ ja:
     man_made=petroleum_well: JA:Tag:man made=petroleum well
     man_made=pier: JA:Tag:man made=pier
     man_made=pipeline: JA:Tag:man made=pipeline
     man_made=petroleum_well: JA:Tag:man made=petroleum well
     man_made=pier: JA:Tag:man made=pier
     man_made=pipeline: JA:Tag:man made=pipeline
+    man_made=planter: JA:Tag:man made=planter
     man_made=power_hydro: JA:Tag:man made=power hydro
     man_made=pumping_station: JA:Tag:man made=pumping station
     man_made=reservoir_covered: JA:Tag:man made=reservoir covered
     man_made=power_hydro: JA:Tag:man made=power hydro
     man_made=pumping_station: JA:Tag:man made=pumping station
     man_made=reservoir_covered: JA:Tag:man made=reservoir covered
+    man_made=satellite_dish: JA:Tag:man made=satellite dish
     man_made=silo: JA:Tag:man made=silo
     man_made=snow_fence: JA:Tag:man made=snow fence
     man_made=snow_net: JA:Tag:man made=snow net
     man_made=storage_tank: JA:Tag:man made=storage tank
     man_made=street_cabinet: JA:Tag:man made=street cabinet
     man_made=silo: JA:Tag:man made=silo
     man_made=snow_fence: JA:Tag:man made=snow fence
     man_made=snow_net: JA:Tag:man made=snow net
     man_made=storage_tank: JA:Tag:man made=storage tank
     man_made=street_cabinet: JA:Tag:man made=street cabinet
+    man_made=stupa: JA:Tag:man made=stupa
     man_made=surveillance: JA:Tag:man made=surveillance
     man_made=survey_point: JA:Tag:man made=survey point
     man_made=telescope: JA:Tag:man made=telescope
     man_made=surveillance: JA:Tag:man made=surveillance
     man_made=survey_point: JA:Tag:man made=survey point
     man_made=telescope: JA:Tag:man made=telescope
+    man_made=torii: JA:Tag:man made=torii
     man_made=tower: JA:Tag:man made=tower
     man_made=tower: JA:Tag:man made=tower
+    man_made=tunnel: JA:Tag:man made=tunnel
+    man_made=utility_pole: JA:Tag:man made=utility pole
     man_made=wastewater_plant: JA:Tag:man made=wastewater plant
     man_made=wastewater_plant: JA:Tag:man made=wastewater plant
+    man_made=water_tap: JA:Tag:man made=water tap
     man_made=water_tower: JA:Tag:man made=water tower
     man_made=water_well: JA:Tag:man made=water well
     man_made=water_works: JA:Tag:man made=water works
     man_made=water_tower: JA:Tag:man made=water tower
     man_made=water_well: JA:Tag:man made=water well
     man_made=water_works: JA:Tag:man made=water works
@@ -16008,10 +22175,12 @@ ja:
     man_made=windpump: JA:Tag:man made=windpump
     man_made=works: JA:Tag:man made=works
     manhole=telecom: JA:Tag:manhole=telecom
     man_made=windpump: JA:Tag:man made=windpump
     man_made=works: JA:Tag:man made=works
     manhole=telecom: JA:Tag:manhole=telecom
+    memorial=plaque: JA:Tag:memorial=plaque
     memorial=stele: JA:Tag:memorial=stele
     microbrewery=yes: JA:Tag:microbrewery=yes
     military=airfield: JA:Tag:military=airfield
     military=ammunition: JA:Tag:military=ammunition
     memorial=stele: JA:Tag:memorial=stele
     microbrewery=yes: JA:Tag:microbrewery=yes
     military=airfield: JA:Tag:military=airfield
     military=ammunition: JA:Tag:military=ammunition
+    military=base: JA:Tag:military=base
     military=bunker: JA:Tag:military=bunker
     military=checkpoint: JA:Tag:military=checkpoint
     military=danger_area: JA:Tag:military=danger area
     military=bunker: JA:Tag:military=bunker
     military=checkpoint: JA:Tag:military=checkpoint
     military=danger_area: JA:Tag:military=danger area
@@ -16024,28 +22193,37 @@ ja:
     moped=destination: JA:Tag:moped=destination
     motor_vehicle=destination: JA:Tag:motor vehicle=destination
     motorcar=destination: JA:Tag:motorcar=destination
     moped=destination: JA:Tag:moped=destination
     motor_vehicle=destination: JA:Tag:motor vehicle=destination
     motorcar=destination: JA:Tag:motorcar=destination
+    motorcar=no: JA:Tag:motorcar=no
     motorcycle=destination: JA:Tag:motorcycle=destination
     motorcycle=destination: JA:Tag:motorcycle=destination
+    mountain_pass=yes: JA:Tag:mountain pass=yes
     natural=anthill: JA:Tag:natural=anthill
     natural=anthill: JA:Tag:natural=anthill
+    natural=arch: JA:Tag:natural=arch
     natural=arete: JA:Tag:natural=arete
     natural=bare_rock: JA:Tag:natural=bare rock
     natural=bay: JA:Tag:natural=bay
     natural=beach: JA:Tag:natural=beach
     natural=blowhole: JA:Tag:natural=blowhole
     natural=arete: JA:Tag:natural=arete
     natural=bare_rock: JA:Tag:natural=bare rock
     natural=bay: JA:Tag:natural=bay
     natural=beach: JA:Tag:natural=beach
     natural=blowhole: JA:Tag:natural=blowhole
+    natural=cape: JA:Tag:natural=cape
     natural=cave_entrance: JA:Tag:natural=cave entrance
     natural=cliff: JA:Tag:natural=cliff
     natural=coastline: JA:Tag:natural=coastline
     natural=desert: JA:Tag:natural=desert
     natural=fell: JA:Tag:natural=fell
     natural=cave_entrance: JA:Tag:natural=cave entrance
     natural=cliff: JA:Tag:natural=cliff
     natural=coastline: JA:Tag:natural=coastline
     natural=desert: JA:Tag:natural=desert
     natural=fell: JA:Tag:natural=fell
+    natural=fumarole: JA:Tag:natural=fumarole
     natural=geyser: JA:Tag:natural=geyser
     natural=glacier: JA:Tag:natural=glacier
     natural=gorge: JA:Tag:natural=gorge
     natural=grassland: JA:Tag:natural=grassland
     natural=heath: JA:Tag:natural=heath
     natural=geyser: JA:Tag:natural=geyser
     natural=glacier: JA:Tag:natural=glacier
     natural=gorge: JA:Tag:natural=gorge
     natural=grassland: JA:Tag:natural=grassland
     natural=heath: JA:Tag:natural=heath
+    natural=hill: JA:Tag:natural=hill
     natural=hot_spring: JA:Tag:natural=hot spring
     natural=hot_spring: JA:Tag:natural=hot spring
+    natural=isthmus: JA:Tag:natural=isthmus
     natural=land: JA:Tag:natural=land
     natural=moor: JA:Tag:natural=moor
     natural=mud: JA:Tag:natural=mud
     natural=peak: JA:Tag:natural=peak
     natural=land: JA:Tag:natural=land
     natural=moor: JA:Tag:natural=moor
     natural=mud: JA:Tag:natural=mud
     natural=peak: JA:Tag:natural=peak
+    natural=peninsula: JA:Tag:natural=peninsula
+    natural=reef: JA:Tag:natural=reef
     natural=ridge: JA:Tag:natural=ridge
     natural=riverbed: JA:Tag:natural=riverbed
     natural=rock: JA:Tag:natural=rock
     natural=ridge: JA:Tag:natural=ridge
     natural=riverbed: JA:Tag:natural=riverbed
     natural=rock: JA:Tag:natural=rock
@@ -16055,9 +22233,11 @@ ja:
     natural=scrub: JA:Tag:natural=scrub
     natural=shingle: JA:Tag:natural=shingle
     natural=shoal: JA:Tag:natural=shoal
     natural=scrub: JA:Tag:natural=scrub
     natural=shingle: JA:Tag:natural=shingle
     natural=shoal: JA:Tag:natural=shoal
+    natural=shrub: JA:Tag:natural=shrub
     natural=sinkhole: JA:Tag:natural=sinkhole
     natural=spring: JA:Tag:natural=spring
     natural=stone: JA:Tag:natural=stone
     natural=sinkhole: JA:Tag:natural=sinkhole
     natural=spring: JA:Tag:natural=spring
     natural=stone: JA:Tag:natural=stone
+    natural=strait: JA:Tag:natural=strait
     natural=tree: JA:Tag:natural=tree
     natural=tree_row: JA:Tag:natural=tree row
     natural=tree_stump: JA:Tag:natural=tree stump
     natural=tree: JA:Tag:natural=tree
     natural=tree_row: JA:Tag:natural=tree row
     natural=tree_stump: JA:Tag:natural=tree stump
@@ -16076,29 +22256,49 @@ ja:
     network=jp:prefectural:nagano: JA:Tag:network=jp:prefectural:nagano
     network=ncn: JA:Tag:network=ncn
     network=nwn: JA:Tag:network=nwn
     network=jp:prefectural:nagano: JA:Tag:network=jp:prefectural:nagano
     network=ncn: JA:Tag:network=ncn
     network=nwn: JA:Tag:network=nwn
+    noexit=yes: JA:Tag:noexit=yes
+    noname=yes: JA:Tag:noname=yes
     office=accountant: JA:Tag:office=accountant
     office=administrative: JA:Tag:office=administrative
     office=accountant: JA:Tag:office=accountant
     office=administrative: JA:Tag:office=administrative
+    office=advertising_agency: JA:Tag:office=advertising agency
     office=architect: JA:Tag:office=architect
     office=architect: JA:Tag:office=architect
+    office=association: JA:Tag:office=association
+    office=charity: JA:Tag:office=charity
     office=company: JA:Tag:office=company
     office=company: JA:Tag:office=company
+    office=construction_company: JA:Tag:office=construction company
+    office=cooperative: JA:Tag:office=cooperative
+    office=courier: JA:Tag:office=courier
+    office=diplomatic: JA:Tag:office=diplomatic
+    office=educational_institution: JA:Tag:office=educational institution
     office=employment_agency: JA:Tag:office=employment agency
     office=estate_agent: JA:Tag:office=estate agent
     office=employment_agency: JA:Tag:office=employment agency
     office=estate_agent: JA:Tag:office=estate agent
+    office=financial: JA:Tag:office=financial
+    office=financial_advisor: JA:Tag:office=financial advisor
+    office=geodesist: JA:Tag:office=geodesist
     office=government: JA:Tag:office=government
     office=insurance: JA:Tag:office=insurance
     office=it: JA:Tag:office=it
     office=lawyer: JA:Tag:office=lawyer
     office=logistics: JA:Tag:office=logistics
     office=government: JA:Tag:office=government
     office=insurance: JA:Tag:office=insurance
     office=it: JA:Tag:office=it
     office=lawyer: JA:Tag:office=lawyer
     office=logistics: JA:Tag:office=logistics
+    office=moving_company: JA:Tag:office=moving company
     office=newspaper: JA:Tag:office=newspaper
     office=ngo: JA:Tag:office=ngo
     office=political_party: JA:Tag:office=political party
     office=newspaper: JA:Tag:office=newspaper
     office=ngo: JA:Tag:office=ngo
     office=political_party: JA:Tag:office=political party
+    office=politician: JA:Tag:office=politician
     office=quango: JA:Tag:office=quango
     office=real_estate_agent: JA:Tag:office=real estate agent
     office=religion: JA:Tag:office=religion
     office=research: JA:Tag:office=research
     office=quango: JA:Tag:office=quango
     office=real_estate_agent: JA:Tag:office=real estate agent
     office=religion: JA:Tag:office=religion
     office=research: JA:Tag:office=research
+    office=security: JA:Tag:office=security
+    office=surveyor: JA:Tag:office=surveyor
     office=tax_advisor: JA:Tag:office=tax advisor
     office=telecommunication: JA:Tag:office=telecommunication
     office=tax_advisor: JA:Tag:office=tax advisor
     office=telecommunication: JA:Tag:office=telecommunication
+    office=therapist: JA:Tag:office=therapist
+    office=tutoring: JA:Tag:office=tutoring
     oneway=alternating: JA:Tag:oneway=alternating
     oneway=reversible: JA:Tag:oneway=reversible
     parking=layby: JA:Tag:parking=layby
     oneway=alternating: JA:Tag:oneway=alternating
     oneway=reversible: JA:Tag:oneway=reversible
     parking=layby: JA:Tag:parking=layby
+    parking=multi-storey: JA:Tag:parking=multi-storey
     parking=street_side: JA:Tag:parking=street side
     parking=surface: JA:Tag:parking=surface
     place=archipelago: JA:Tag:place=archipelago
     parking=street_side: JA:Tag:parking=street side
     parking=surface: JA:Tag:parking=surface
     place=archipelago: JA:Tag:place=archipelago
@@ -16121,6 +22321,10 @@ ja:
     place=town: JA:Tag:place=town
     place=village: JA:Tag:place=village
     plant:method=photovoltaic: JA:Tag:plant:method=photovoltaic
     place=town: JA:Tag:place=town
     place=village: JA:Tag:place=village
     plant:method=photovoltaic: JA:Tag:plant:method=photovoltaic
+    plant:method=thermal: JA:Tag:plant:method=thermal
+    plant:source=solar: JA:Tag:plant:source=solar
+    police=academy: JA:Tag:police=academy
+    post_office=post_partner: JA:Tag:post office=post partner
     power=catenary_mast: JA:Tag:power=catenary mast
     power=compensator: JA:Tag:power=compensator
     power=generator: JA:Tag:power=generator
     power=catenary_mast: JA:Tag:power=catenary mast
     power=compensator: JA:Tag:power=compensator
     power=generator: JA:Tag:power=generator
@@ -16129,12 +22333,15 @@ ja:
     power=minor_line: JA:Tag:power=minor line
     power=plant: JA:Tag:power=plant
     power=pole: JA:Tag:power=pole
     power=minor_line: JA:Tag:power=minor line
     power=plant: JA:Tag:power=plant
     power=pole: JA:Tag:power=pole
+    power=portal: JA:Tag:power=portal
     power=station: JA:Tag:power=station
     power=sub_station: JA:Tag:power=sub station
     power=substation: JA:Tag:power=substation
     power=switchgear: JA:Tag:power=switchgear
     power=tower: JA:Tag:power=tower
     power=transformer: JA:Tag:power=transformer
     power=station: JA:Tag:power=station
     power=sub_station: JA:Tag:power=sub station
     power=substation: JA:Tag:power=substation
     power=switchgear: JA:Tag:power=switchgear
     power=tower: JA:Tag:power=tower
     power=transformer: JA:Tag:power=transformer
+    product=rice: JA:Tag:product=rice
+    protect_class=2: JA:Tag:protect class=2
     public_transport=platform: JA:Tag:public transport=platform
     public_transport=station: JA:Tag:public transport=station
     public_transport=stop_area: JA:Tag:public transport=stop area
     public_transport=platform: JA:Tag:public transport=platform
     public_transport=station: JA:Tag:public transport=station
     public_transport=stop_area: JA:Tag:public transport=stop area
@@ -16177,9 +22384,11 @@ ja:
     religion=christian: JA:Tag:religion=christian
     religion=muslim: JA:Tag:religion=muslim
     religion=shinto: JA:Tag:religion=shinto
     religion=christian: JA:Tag:religion=christian
     religion=muslim: JA:Tag:religion=muslim
     religion=shinto: JA:Tag:religion=shinto
+    residential=apartments: JA:Tag:residential=apartments
     residential=rural: JA:Tag:residential=rural
     resource=sand: JA:Tag:resource=sand
     roller_coaster=track: JA:Tag:roller coaster=track
     residential=rural: JA:Tag:residential=rural
     resource=sand: JA:Tag:resource=sand
     roller_coaster=track: JA:Tag:roller coaster=track
+    roof:shape=gabled: JA:Tag:roof:shape=gabled
     route=bicycle: JA:Tag:route=bicycle
     route=bus: JA:Tag:route=bus
     route=ferry: JA:Tag:route=ferry
     route=bicycle: JA:Tag:route=bicycle
     route=bus: JA:Tag:route=bus
     route=ferry: JA:Tag:route=ferry
@@ -16204,9 +22413,12 @@ ja:
     service=siding: JA:Tag:service=siding
     service=spur: JA:Tag:service=spur
     service=yard: JA:Tag:service=yard
     service=siding: JA:Tag:service=siding
     service=spur: JA:Tag:service=spur
     service=yard: JA:Tag:service=yard
+    shelter_type=gazebo: JA:Tag:shelter type=gazebo
+    shop=agrarian: JA:Tag:shop=agrarian
     shop=alcohol: JA:Tag:shop=alcohol
     shop=anime: JA:Tag:shop=anime
     shop=antiques: JA:Tag:shop=antiques
     shop=alcohol: JA:Tag:shop=alcohol
     shop=anime: JA:Tag:shop=anime
     shop=antiques: JA:Tag:shop=antiques
+    shop=appliance: JA:Tag:shop=appliance
     shop=art: JA:Tag:shop=art
     shop=baby_goods: JA:Tag:shop=baby goods
     shop=bag: JA:Tag:shop=bag
     shop=art: JA:Tag:shop=art
     shop=baby_goods: JA:Tag:shop=baby goods
     shop=bag: JA:Tag:shop=bag
@@ -16260,6 +22472,7 @@ ja:
     shop=fireplace: JA:Tag:shop=fireplace
     shop=fishing: JA:Tag:shop=fishing
     shop=fishmonger: JA:Tag:shop=fishmonger
     shop=fireplace: JA:Tag:shop=fireplace
     shop=fishing: JA:Tag:shop=fishing
     shop=fishmonger: JA:Tag:shop=fishmonger
+    shop=flooring: JA:Tag:shop=flooring
     shop=florist: JA:Tag:shop=florist
     shop=frame: JA:Tag:shop=frame
     shop=frozen_food: JA:Tag:shop=frozen food
     shop=florist: JA:Tag:shop=florist
     shop=frame: JA:Tag:shop=frame
     shop=frozen_food: JA:Tag:shop=frozen food
@@ -16274,8 +22487,10 @@ ja:
     shop=gift: JA:Tag:shop=gift
     shop=glass: JA:Tag:shop=glass
     shop=glaziery: JA:Tag:shop=glaziery
     shop=gift: JA:Tag:shop=gift
     shop=glass: JA:Tag:shop=glass
     shop=glaziery: JA:Tag:shop=glaziery
+    shop=gold_buyer: JA:Tag:shop=gold buyer
     shop=golf: JA:Tag:shop=golf
     shop=greengrocer: JA:Tag:shop=greengrocer
     shop=golf: JA:Tag:shop=golf
     shop=greengrocer: JA:Tag:shop=greengrocer
+    shop=grocery: JA:Tag:shop=grocery
     shop=hairdresser: JA:Tag:shop=hairdresser
     shop=hardware: JA:Tag:shop=hardware
     shop=health: JA:Tag:shop=health
     shop=hairdresser: JA:Tag:shop=hairdresser
     shop=hardware: JA:Tag:shop=hardware
     shop=health: JA:Tag:shop=health
@@ -16283,9 +22498,11 @@ ja:
     shop=hearing_aids: JA:Tag:shop=hearing aids
     shop=herbalist: JA:Tag:shop=herbalist
     shop=hifi: JA:Tag:shop=hifi
     shop=hearing_aids: JA:Tag:shop=hearing aids
     shop=herbalist: JA:Tag:shop=herbalist
     shop=hifi: JA:Tag:shop=hifi
+    shop=household_linen: JA:Tag:shop=household linen
     shop=houseware: JA:Tag:shop=houseware
     shop=hunting: JA:Tag:shop=hunting
     shop=ice_cream: JA:Tag:shop=ice cream
     shop=houseware: JA:Tag:shop=houseware
     shop=hunting: JA:Tag:shop=hunting
     shop=ice_cream: JA:Tag:shop=ice cream
+    shop=insurance: JA:Tag:shop=insurance
     shop=interior_decoration: JA:Tag:shop=interior decoration
     shop=jewelry: JA:Tag:shop=jewelry
     shop=junk_yard: JA:Tag:shop=junk yard
     shop=interior_decoration: JA:Tag:shop=interior decoration
     shop=jewelry: JA:Tag:shop=jewelry
     shop=junk_yard: JA:Tag:shop=junk yard
@@ -16302,6 +22519,7 @@ ja:
     shop=medical: JA:Tag:shop=medical
     shop=medical_supply: JA:Tag:shop=medical supply
     shop=mobile_phone: JA:Tag:shop=mobile phone
     shop=medical: JA:Tag:shop=medical
     shop=medical_supply: JA:Tag:shop=medical supply
     shop=mobile_phone: JA:Tag:shop=mobile phone
+    shop=mobility_scooter: JA:Tag:shop=mobility scooter
     shop=model: JA:Tag:shop=model
     shop=money_lender: JA:Tag:shop=money lender
     shop=moneylender: JA:Tag:shop=moneylender
     shop=model: JA:Tag:shop=model
     shop=money_lender: JA:Tag:shop=money lender
     shop=moneylender: JA:Tag:shop=moneylender
@@ -16311,6 +22529,7 @@ ja:
     shop=musical_instrument: JA:Tag:shop=musical instrument
     shop=newsagent: JA:Tag:shop=newsagent
     shop=nutrition_supplements: JA:Tag:shop=nutrition supplements
     shop=musical_instrument: JA:Tag:shop=musical instrument
     shop=newsagent: JA:Tag:shop=newsagent
     shop=nutrition_supplements: JA:Tag:shop=nutrition supplements
+    shop=nuts: JA:Tag:shop=nuts
     shop=optician: JA:Tag:shop=optician
     shop=organic: JA:Tag:shop=organic
     shop=outdoor: JA:Tag:shop=outdoor
     shop=optician: JA:Tag:shop=optician
     shop=organic: JA:Tag:shop=organic
     shop=outdoor: JA:Tag:shop=outdoor
@@ -16324,16 +22543,20 @@ ja:
     shop=pharmacy: JA:Tag:shop=pharmacy
     shop=photo: JA:Tag:shop=photo
     shop=printing: JA:Tag:shop=printing
     shop=pharmacy: JA:Tag:shop=pharmacy
     shop=photo: JA:Tag:shop=photo
     shop=printing: JA:Tag:shop=printing
+    shop=psychic: JA:Tag:shop=psychic
     shop=pyrotechnics: JA:Tag:shop=pyrotechnics
     shop=radiotechnics: JA:Tag:shop=radiotechnics
     shop=religion: JA:Tag:shop=religion
     shop=pyrotechnics: JA:Tag:shop=pyrotechnics
     shop=radiotechnics: JA:Tag:shop=radiotechnics
     shop=religion: JA:Tag:shop=religion
+    shop=rental: JA:Tag:shop=rental
     shop=rice: JA:Tag:shop=rice
     shop=scuba_diving: JA:Tag:shop=scuba diving
     shop=seafood: JA:Tag:shop=seafood
     shop=second_hand: JA:Tag:shop=second hand
     shop=rice: JA:Tag:shop=rice
     shop=scuba_diving: JA:Tag:shop=scuba diving
     shop=seafood: JA:Tag:shop=seafood
     shop=second_hand: JA:Tag:shop=second hand
+    shop=security: JA:Tag:shop=security
     shop=sewing: JA:Tag:shop=sewing
     shop=shoe_repair: JA:Tag:shop=shoe repair
     shop=shoes: JA:Tag:shop=shoes
     shop=sewing: JA:Tag:shop=sewing
     shop=shoe_repair: JA:Tag:shop=shoe repair
     shop=shoes: JA:Tag:shop=shoes
+    shop=shopping_centre: JA:Tag:shop=shopping centre
     shop=souvenir: JA:Tag:shop=souvenir
     shop=spices: JA:Tag:shop=spices
     shop=sports: JA:Tag:shop=sports
     shop=souvenir: JA:Tag:shop=souvenir
     shop=spices: JA:Tag:shop=spices
     shop=sports: JA:Tag:shop=sports
@@ -16359,11 +22582,13 @@ ja:
     shop=watches: JA:Tag:shop=watches
     shop=weapons: JA:Tag:shop=weapons
     shop=wholesale: JA:Tag:shop=wholesale
     shop=watches: JA:Tag:shop=watches
     shop=weapons: JA:Tag:shop=weapons
     shop=wholesale: JA:Tag:shop=wholesale
+    shop=wigs: JA:Tag:shop=wigs
     shop=window_blind: JA:Tag:shop=window blind
     shop=wine: JA:Tag:shop=wine
     shop=wool: JA:Tag:shop=wool
     shop=yes: JA:Tag:shop=yes
     shop=園芸店: JA:Tag:shop=園芸店
     shop=window_blind: JA:Tag:shop=window blind
     shop=wine: JA:Tag:shop=wine
     shop=wool: JA:Tag:shop=wool
     shop=yes: JA:Tag:shop=yes
     shop=園芸店: JA:Tag:shop=園芸店
+    site=parking: JA:Tag:site=parking
     ski=designated: JA:Tag:ski=designated
     snowmobile=designated: JA:Tag:snowmobile=designated
     social_facility=ambulatory_care: JA:Tag:social facility=ambulatory care
     ski=designated: JA:Tag:ski=designated
     snowmobile=designated: JA:Tag:snowmobile=designated
     social_facility=ambulatory_care: JA:Tag:social facility=ambulatory care
@@ -16381,7 +22606,10 @@ ja:
     sport=baseball: JA:Tag:sport=baseball
     sport=basketball: JA:Tag:sport=basketball
     sport=billiards: JA:Tag:sport=billiards
     sport=baseball: JA:Tag:sport=baseball
     sport=basketball: JA:Tag:sport=basketball
     sport=billiards: JA:Tag:sport=billiards
+    sport=equestrian: JA:Tag:sport=equestrian
     sport=golf: JA:Tag:sport=golf
     sport=golf: JA:Tag:sport=golf
+    sport=handball: JA:Tag:sport=handball
+    sport=horse_racing: JA:Tag:sport=horse racing
     sport=judo: JA:Tag:sport=judo
     sport=motocross: JA:Tag:sport=motocross
     sport=multi: JA:Tag:sport=multi
     sport=judo: JA:Tag:sport=judo
     sport=motocross: JA:Tag:sport=motocross
     sport=multi: JA:Tag:sport=multi
@@ -16394,7 +22622,11 @@ ja:
     sport=water_ski: JA:Tag:sport=water ski
     station=light_rail: JA:Tag:station=light rail
     station=subway: JA:Tag:station=subway
     sport=water_ski: JA:Tag:sport=water ski
     station=light_rail: JA:Tag:station=light rail
     station=subway: JA:Tag:station=subway
+    street_vendor=yes: JA:Tag:street vendor=yes
     surface=asphalt: JA:Tag:surface=asphalt
     surface=asphalt: JA:Tag:surface=asphalt
+    telescope:type=optical: JA:Tag:telescope:type=optical
+    telescope:type=radio: JA:Tag:telescope:type=radio
+    theatre:type=concert_hall: JA:Tag:theatre:type=concert hall
     tourism=alpine_hut: JA:Tag:tourism=alpine hut
     tourism=apartment: JA:Tag:tourism=apartment
     tourism=aquarium: JA:Tag:tourism=aquarium
     tourism=alpine_hut: JA:Tag:tourism=alpine hut
     tourism=apartment: JA:Tag:tourism=apartment
     tourism=aquarium: JA:Tag:tourism=aquarium
@@ -16420,26 +22652,50 @@ ja:
     tourism=wine_cellar: JA:Tag:tourism=wine cellar
     tourism=zoo: JA:Tag:tourism=zoo
     tower:construction=dish: JA:Tag:tower:construction=dish
     tourism=wine_cellar: JA:Tag:tourism=wine cellar
     tourism=zoo: JA:Tag:tourism=zoo
     tower:construction=dish: JA:Tag:tower:construction=dish
+    traffic_calming=bump: JA:Tag:traffic calming=bump
+    traffic_calming=chicane: JA:Tag:traffic calming=chicane
+    traffic_calming=choker: JA:Tag:traffic calming=choker
+    traffic_calming=cushion: JA:Tag:traffic calming=cushion
+    traffic_calming=hump: JA:Tag:traffic calming=hump
     traffic_calming=island: JA:Tag:traffic calming=island
     traffic_calming=island: JA:Tag:traffic calming=island
+    traffic_calming=mini_bumps: JA:Tag:traffic calming=mini bumps
+    traffic_calming=rumble_strip: JA:Tag:traffic calming=rumble strip
     traffic_calming=table: JA:Tag:traffic calming=table
     traffic_sign=city_limit: JA:Tag:traffic sign=city limit
     traffic_calming=table: JA:Tag:traffic calming=table
     traffic_sign=city_limit: JA:Tag:traffic sign=city limit
+    training=computer: JA:Tag:training=computer
+    training=music: JA:Tag:training=music
+    tunnel=avalanche_protector: JA:Tag:tunnel=avalanche protector
+    tunnel=building_passage: JA:Tag:tunnel=building passage
     tunnel=culvert: JA:Tag:tunnel=culvert
     type=public_transport: JA:Tag:type=public transport
     type=waterway: JA:Tag:type=waterway
     tunnel=culvert: JA:Tag:tunnel=culvert
     type=public_transport: JA:Tag:type=public transport
     type=waterway: JA:Tag:type=waterway
+    usage=irrigation: JA:Tag:usage=irrigation
+    usage=test: JA:Tag:usage=test
+    usage=transportation: JA:Tag:usage=transportation
+    utility=chemical: JA:Tag:utility=chemical
+    utility=street_lighting: JA:Tag:utility=street lighting
     vehicle=destination: JA:Tag:vehicle=destination
     vending=bread: JA:Tag:vending=bread
     vending=excrement_bags: JA:Tag:vending=excrement bags
     vehicle=destination: JA:Tag:vehicle=destination
     vending=bread: JA:Tag:vending=bread
     vending=excrement_bags: JA:Tag:vending=excrement bags
+    vending=fishing_bait: JA:Tag:vending=fishing bait
+    vending=food: JA:Tag:vending=food
     vending=fuel: JA:Tag:vending=fuel
     vending=fuel: JA:Tag:vending=fuel
+    vending=ice_cream: JA:Tag:vending=ice cream
     vending=milk: JA:Tag:vending=milk
     vending=parcel_pickup: JA:Tag:vending=parcel pickup
     vending=parcel_pickup;parcel_mail_in: JA:Tag:vending=parcel pickup;parcel mail
       in
     vending=parking_tickets: JA:Tag:vending=parking tickets
     vending=photo: JA:Tag:vending=photo
     vending=milk: JA:Tag:vending=milk
     vending=parcel_pickup: JA:Tag:vending=parcel pickup
     vending=parcel_pickup;parcel_mail_in: JA:Tag:vending=parcel pickup;parcel mail
       in
     vending=parking_tickets: JA:Tag:vending=parking tickets
     vending=photo: JA:Tag:vending=photo
+    vending=public_transport_tickets: JA:Tag:vending=public transport tickets
     wall=no: JA:Tag:wall=no
     wall=noise_barrier: JA:Tag:wall=noise barrier
     water=intermittent: JA:Tag:water=intermittent
     wall=no: JA:Tag:wall=no
     wall=noise_barrier: JA:Tag:wall=noise barrier
     water=intermittent: JA:Tag:water=intermittent
+    water=lake: JA:Tag:water=lake
     water=lock: JA:Tag:water=lock
     water=lock: JA:Tag:water=lock
+    water=pond: JA:Tag:water=pond
+    water=reservoir: JA:Tag:water=reservoir
+    water=river: JA:Tag:water=river
     water=wastewater: JA:Tag:water=wastewater
     waterway=boat_lift: JA:Tag:waterway=boat lift
     waterway=boatyard: JA:Tag:waterway=boatyard
     water=wastewater: JA:Tag:water=wastewater
     waterway=boat_lift: JA:Tag:waterway=boat lift
     waterway=boatyard: JA:Tag:waterway=boatyard
@@ -16460,6 +22716,7 @@ ja:
     waterway=offshore_field: JA:Tag:waterway=offshore field
     waterway=river: JA:Tag:waterway=river
     waterway=seaway: JA:Tag:waterway=seaway
     waterway=offshore_field: JA:Tag:waterway=offshore field
     waterway=river: JA:Tag:waterway=river
     waterway=seaway: JA:Tag:waterway=seaway
+    waterway=sluice_gate: JA:Tag:waterway=sluice gate
     waterway=stream: JA:Tag:waterway=stream
     waterway=turning_point: JA:Tag:waterway=turning point
     waterway=water_point: JA:Tag:waterway=water point
     waterway=stream: JA:Tag:waterway=stream
     waterway=turning_point: JA:Tag:waterway=turning point
     waterway=water_point: JA:Tag:waterway=water point
@@ -16477,43 +22734,185 @@ ja:
     wetland=wet_meadow: JA:Tag:wetland=wet meadow
 ko:
   key:
     wetland=wet_meadow: JA:Tag:wetland=wet meadow
 ko:
   key:
+    3dr:type: Ko:Key:3dr:type
     addr: Ko:Key:addr
     addr: Ko:Key:addr
+    addr:*: Ko:Key:addr:*
     aerialway: Ko:Key:aerialway
     aerialway: Ko:Key:aerialway
+    alt_name: Ko:Key:alt name
     amenity: Ko:Key:amenity
     amenity: Ko:Key:amenity
+    architect: Ko:Key:architect
+    artist_name: Ko:Key:artist name
+    attraction: Ko:Key:attraction
+    attribution: Ko:Key:attribution
+    automatic_door: Ko:Key:automatic door
+    books: Ko:Key:books
+    brand: Ko:Key:brand
+    brand:wikidata: Ko:Key:brand:wikidata
+    brand:wikipedia: Ko:Key:brand:wikipedia
+    building: Ko:Key:building
+    building:earthquake-resistant: Ko:Key:building:earthquake-resistant
+    building:levels: Ko:Key:building:levels
+    building:quake-resistant: Ko:Key:building:quake-resistant
+    bus_bay: Ko:Key:bus bay
+    busway: Ko:Key:busway
+    contact:facebook: Ko:Key:contact:facebook
+    contact:twitter: Ko:Key:contact:twitter
+    covered: Ko:Key:covered
     crossing: Ko:Key:crossing
     crossing: Ko:Key:crossing
+    cuisine: Ko:Key:cuisine
     denotation: Ko:Key:denotation
     denotation: Ko:Key:denotation
+    diet:vegan: Ko:Key:diet:vegan
     drink: Ko:Key:drink
     drink: Ko:Key:drink
+    drive_through: Ko:Key:drive through
     ele: Ko:Key:ele
     emergency: Ko:Key:emergency
     ele: Ko:Key:ele
     emergency: Ko:Key:emergency
+    fire_mains: Ko:Key:fire mains
+    fuel: Ko:Key:fuel
+    healthcare: Ko:Key:healthcare
+    heritage: Ko:Key:heritage
     highway: Ko:Key:highway
     highway: Ko:Key:highway
+    historic: Ko:Key:historic
+    indoor: Ko:Key:indoor
     intermittent: Ko:Key:intermittent
     intermittent: Ko:Key:intermittent
+    junction: Ko:Key:junction
+    landuse: Ko:Key:landuse
+    lanes:psv: Ko:Key:lanes:psv
     leisure: Ko:Key:leisure
     level: Ko:Key:level
     line: Ko:Key:line
     local_ref: Ko:Key:local ref
     name: Ko:Key:name
     leisure: Ko:Key:leisure
     level: Ko:Key:level
     line: Ko:Key:line
     local_ref: Ko:Key:local ref
     name: Ko:Key:name
+    name:ja: Ko:Key:name:ja
+    name:ko: Ko:Key:name:ko
     operator:type: Ko:Key:operator:type
     reservation: Ko:Key:reservation
     operator:type: Ko:Key:operator:type
     reservation: Ko:Key:reservation
+    residential: Ko:Key:residential
+    review_requested: Ko:Key:review requested
+    roundtrip: Ko:Key:roundtrip
+    route_ref: Ko:Key:route ref
     self_service: Ko:Key:self service
     self_service: Ko:Key:self service
+    shop: Ko:Key:shop
     smoothness: Ko:Key:smoothness
     smoothness: Ko:Key:smoothness
+    social_facility: Ko:Key:social facility
     tenant: Ko:Key:tenant
     tenant: Ko:Key:tenant
+    toll: Ko:Key:toll
     townhall:type: Ko:Key:townhall:type
     tracktype: Ko:Key:tracktype
     townhall:type: Ko:Key:townhall:type
     tracktype: Ko:Key:tracktype
+    traffic_sign: Ko:Key:traffic sign
+    traffic_signals: Ko:Key:traffic signals
+    traffic_signals:floor_vibration: Ko:Key:traffic signals:floor vibration
+    traffic_signals:sound: Ko:Key:traffic signals:sound
+    trolley:deposit: Ko:Key:trolley:deposit
     tunnel: Ko:Key:tunnel
     turn: Ko:Key:turn
     tunnel: Ko:Key:tunnel
     turn: Ko:Key:turn
+    was:amenity: Ko:Key:was:amenity
+    water: Ko:Key:water
+    waterway: Ko:Key:waterway
+    website: Ko:Key:website
     wheelchair: Ko:Key:wheelchair
     wikipedia: Ko:Key:wikipedia
   tag:
     wheelchair: Ko:Key:wheelchair
     wikipedia: Ko:Key:wikipedia
   tag:
+    access=agricultural: Ko:Tag:access=agricultural
+    access=delivery: Ko:Tag:access=delivery
     access=designated: Ko:Tag:access=designated
     aerialway=cable_car: Ko:Tag:aerialway=cable car
     access=designated: Ko:Tag:access=designated
     aerialway=cable_car: Ko:Tag:aerialway=cable car
+    amenity=animal_boarding: Ko:Tag:amenity=animal boarding
+    amenity=animal_shelter: Ko:Tag:amenity=animal shelter
+    amenity=arts_centre: Ko:Tag:amenity=arts centre
+    amenity=atm: Ko:Tag:amenity=atm
+    amenity=baking_oven: Ko:Tag:amenity=baking oven
+    amenity=bank: Ko:Tag:amenity=bank
+    amenity=bench: Ko:Tag:amenity=bench
+    amenity=bicycle_parking: Ko:Tag:amenity=bicycle parking
+    amenity=bicycle_repair_station: Ko:Tag:amenity=bicycle repair station
+    amenity=bureau_de_change: Ko:Tag:amenity=bureau de change
+    amenity=bus_station: Ko:Tag:amenity=bus station
+    amenity=cafe: Ko:Tag:amenity=cafe
+    amenity=car_rental: Ko:Tag:amenity=car rental
+    amenity=car_sharing: Ko:Tag:amenity=car sharing
+    amenity=car_wash: Ko:Tag:amenity=car wash
+    amenity=charging_station: Ko:Tag:amenity=charging station
+    amenity=cinema: Ko:Tag:amenity=cinema
+    amenity=clinic: Ko:Tag:amenity=clinic
+    amenity=clock: Ko:Tag:amenity=clock
+    amenity=college: Ko:Tag:amenity=college
+    amenity=community_centre: Ko:Tag:amenity=community centre
+    amenity=courthouse: Ko:Tag:amenity=courthouse
+    amenity=coworking_space: Ko:Tag:amenity=coworking space
+    amenity=crematorium: Ko:Tag:amenity=crematorium
+    amenity=crypt: Ko:Tag:amenity=crypt
+    amenity=dentist: Ko:Tag:amenity=dentist
+    amenity=dive_centre: Ko:Tag:amenity=dive centre
+    amenity=doctors: Ko:Tag:amenity=doctors
+    amenity=drinking_water: Ko:Tag:amenity=drinking water
+    amenity=driving_school: Ko:Tag:amenity=driving school
+    amenity=fast_food: Ko:Tag:amenity=fast food
+    amenity=ferry_terminal: Ko:Tag:amenity=ferry terminal
+    amenity=fire_station: Ko:Tag:amenity=fire station
+    amenity=food_court: Ko:Tag:amenity=food court
+    amenity=fountain: Ko:Tag:amenity=fountain
     amenity=fuel: Ko:Tag:amenity=fuel
     amenity=fuel: Ko:Tag:amenity=fuel
+    amenity=grave_yard: Ko:Tag:amenity=grave yard
+    amenity=grit_bin: Ko:Tag:amenity=grit bin
+    amenity=hospital: Ko:Tag:amenity=hospital
+    amenity=ice_cream: Ko:Tag:amenity=ice cream
+    amenity=internet_cafe: Ko:Tag:amenity=internet cafe
+    amenity=kindergarten: Ko:Tag:amenity=kindergarten
+    amenity=language_school: Ko:Tag:amenity=language school
+    amenity=library: Ko:Tag:amenity=library
+    amenity=marketplace: Ko:Tag:amenity=marketplace
+    amenity=motorcycle_parking: Ko:Tag:amenity=motorcycle parking
+    amenity=music_school: Ko:Tag:amenity=music school
+    amenity=nursing_home: Ko:Tag:amenity=nursing home
+    amenity=parking: Ko:Tag:amenity=parking
+    amenity=parking_entrance: Ko:Tag:amenity=parking entrance
+    amenity=parking_space: Ko:Tag:amenity=parking space
+    amenity=pharmacy: Ko:Tag:amenity=pharmacy
+    amenity=planetarium: Ko:Tag:amenity=planetarium
+    amenity=police: Ko:Tag:amenity=police
     amenity=prep_school: Ko:Tag:amenity=prep school
     amenity=prep_school: Ko:Tag:amenity=prep school
+    amenity=public_bookcase: Ko:Tag:amenity=public bookcase
+    amenity=restaurant: Ko:Tag:amenity=restaurant
+    amenity=school: Ko:Tag:amenity=school
+    amenity=shelter: Ko:Tag:amenity=shelter
+    amenity=social_centre: Ko:Tag:amenity=social centre
+    amenity=social_facility: Ko:Tag:amenity=social facility
+    amenity=studio: Ko:Tag:amenity=studio
     amenity=taxi: Ko:Tag:amenity=taxi
     amenity=taxi: Ko:Tag:amenity=taxi
+    amenity=theatre: Ko:Tag:amenity=theatre
     amenity=townhall: Ko:Tag:amenity=townhall
     amenity=townhall: Ko:Tag:amenity=townhall
+    amenity=trolley_bay: Ko:Tag:amenity=trolley bay
+    amenity=university: Ko:Tag:amenity=university
+    amenity=veterinary: Ko:Tag:amenity=veterinary
     barrier=kerb: Ko:Tag:barrier=kerb
     barrier=kerb: Ko:Tag:barrier=kerb
+    building:part=porch: Ko:Tag:building:part=porch
+    building=abandoned: Ko:Tag:building=abandoned
+    building=apartments: Ko:Tag:building=apartments
+    building=bakehouse: Ko:Tag:building=bakehouse
+    building=cabin: Ko:Tag:building=cabin
+    building=gatehouse: Ko:Tag:building=gatehouse
+    building=greenhouse: Ko:Tag:building=greenhouse
+    building=house: Ko:Tag:building=house
+    building=parking: Ko:Tag:building=parking
+    building=shrine: Ko:Tag:building=shrine
+    bunker_type=bomb_shelter: Ko:Tag:bunker type=bomb shelter
+    cemetery=grave: Ko:Tag:cemetery=grave
+    content=fuel: Ko:Tag:content=fuel
     craft=tailor: Ko:Tag:craft=tailor
     craft=tailor: Ko:Tag:craft=tailor
+    crop=rice: Ko:Tag:crop=rice
+    crossing=traffic_signals: Ko:Tag:crossing=traffic signals
+    cuisine=korean: Ko:Tag:cuisine=korean
+    fire_mains=dry: Ko:Tag:fire mains=dry
+    fire_mains=wet: Ko:Tag:fire mains=wet
     ford=stepping_stones: Ko:Tag:ford=stepping stones
     ford=stepping_stones: Ko:Tag:ford=stepping stones
+    geological=columnar_jointing: Ko:Tag:geological=columnar jointing
+    hazard=school_zone: Ko:Tag:hazard=school zone
+    hazard=silver_zone: Ko:Tag:hazard=silver zone
+    healthcare=blood_donation: Ko:Tag:healthcare=blood donation
+    healthcare=laboratory: Ko:Tag:healthcare=laboratory
     highway=bus_stop: Ko:Tag:highway=bus stop
     highway=bus_stop: Ko:Tag:highway=bus stop
+    highway=busway: Ko:Tag:highway=busway
+    highway=corridor: Ko:Tag:highway=corridor
     highway=elevator: Ko:Tag:highway=elevator
     highway=motorway: Ko:Tag:highway=motorway
     highway=motorway_link: Ko:Tag:highway=motorway link
     highway=elevator: Ko:Tag:highway=elevator
     highway=motorway: Ko:Tag:highway=motorway
     highway=motorway_link: Ko:Tag:highway=motorway link
@@ -16524,32 +22923,111 @@ ko:
     highway=services: Ko:Tag:highway=services
     highway=stop: Ko:Tag:highway=stop
     highway=tertiary: Ko:Tag:highway=tertiary
     highway=services: Ko:Tag:highway=services
     highway=stop: Ko:Tag:highway=stop
     highway=tertiary: Ko:Tag:highway=tertiary
+    highway=toll_gantry: Ko:Tag:highway=toll gantry
     highway=track: Ko:Tag:highway=track
     highway=track: Ko:Tag:highway=track
+    highway=traffic_signals: Ko:Tag:highway=traffic signals
+    highway=trailhead: Ko:Tag:highway=trailhead
     highway=trunk: Ko:Tag:highway=trunk
     highway=trunk: Ko:Tag:highway=trunk
+    highway=unclassified: Ko:Tag:highway=unclassified
+    historic=archaeological_site: Ko:Tag:historic=archaeological site
+    historic=boundary_stone: Ko:Tag:historic=boundary stone
+    junction=yes: Ko:Tag:junction=yes
+    landuse=allotments: Ko:Tag:landuse=allotments
+    landuse=cemetery: Ko:Tag:landuse=cemetery
+    landuse=commercial: Ko:Tag:landuse=commercial
+    landuse=construction: Ko:Tag:landuse=construction
+    landuse=education: Ko:Tag:landuse=education
     landuse=farmland: Ko:Tag:landuse=farmland
     landuse=farmland: Ko:Tag:landuse=farmland
+    landuse=farmyard: Ko:Tag:landuse=farmyard
+    landuse=forest: Ko:Tag:landuse=forest
+    landuse=greenery: Ko:Tag:landuse=greenery
+    landuse=greenhouse_horticulture: Ko:Tag:landuse=greenhouse horticulture
+    landuse=industrial: Ko:Tag:landuse=industrial
+    landuse=meadow: Ko:Tag:landuse=meadow
+    landuse=paddy: Ko:Tag:landuse=paddy
+    landuse=residential: Ko:Tag:landuse=residential
     landuse=retail: Ko:Tag:landuse=retail
     landuse=retail: Ko:Tag:landuse=retail
+    landuse=shrubs: Ko:Tag:landuse=shrubs
     landuse=traffic_island: Ko:Tag:landuse=traffic island
     leisure=disc_golf_course: Ko:Tag:leisure=disc golf course
     leisure=garden: Ko:Tag:leisure=garden
     landuse=traffic_island: Ko:Tag:landuse=traffic island
     leisure=disc_golf_course: Ko:Tag:leisure=disc golf course
     leisure=garden: Ko:Tag:leisure=garden
+    leisure=park: Ko:Tag:leisure=park
+    man_made=hongsalmun: Ko:Tag:man made=hongsalmun
+    man_made=iljumun: Ko:Tag:man made=iljumun
     man_made=mast: Ko:Tag:man made=mast
     man_made=mast: Ko:Tag:man made=mast
+    man_made=planter: Ko:Tag:man made=planter
+    man_made=sign: Ko:Tag:man made=sign
     man_made=surveillance: Ko:Tag:man made=surveillance
     man_made=surveillance: Ko:Tag:man made=surveillance
+    megalith_type=dolmen: Ko:Tag:megalith type=dolmen
+    military=range: Ko:Tag:military=range
+    natural=blockfield: Ko:Tag:natural=blockfield
     natural=grassland: Ko:Tag:natural=grassland
     natural=grassland: Ko:Tag:natural=grassland
+    natural=scree: Ko:Tag:natural=scree
     natural=spring: Ko:Tag:natural=spring
     natural=tree: Ko:Tag:natural=tree
     natural=spring: Ko:Tag:natural=spring
     natural=tree: Ko:Tag:natural=tree
+    natural=wetland: Ko:Tag:natural=wetland
+    noname=yes: Ko:Tag:noname=yes
+    office=cooperative: Ko:Tag:office=cooperative
+    office=coworking: Ko:Tag:office=coworking
+    parking=underground: Ko:Tag:parking=underground
     place=hamlet: Ko:Tag:place=hamlet
     place=town: Ko:Tag:place=town
     place=hamlet: Ko:Tag:place=hamlet
     place=town: Ko:Tag:place=town
+    place=village: Ko:Tag:place=village
+    public_transport=platform: Ko:Tag:public transport=platform
+    public_transport=stop_area: Ko:Tag:public transport=stop area
+    railway=rail: Ko:Tag:railway=rail
+    religion=shamanic: Ko:Tag:religion=shamanic
+    roof:shape=hip-and-gable: Ko:Tag:roof:shape=hip-and-gable
+    roof:shape=hipped-and-gable: Ko:Tag:roof:shape=hipped-and-gable
+    roof:shape=hipped-and-gabled: Ko:Tag:roof:shape=hipped-and-gabled
+    route=foot: Ko:Tag:route=foot
+    service=driveway: Ko:Tag:service=driveway
+    shelter_type=public_transport: Ko:Tag:shelter type=public transport
+    shop=baby_goods: Ko:Tag:shop=baby goods
+    shop=bag: Ko:Tag:shop=bag
+    shop=bakery: Ko:Tag:shop=bakery
+    shop=boutique: Ko:Tag:shop=boutique
+    shop=butcher: Ko:Tag:shop=butcher
+    shop=cheese: Ko:Tag:shop=cheese
+    shop=chocolate: Ko:Tag:shop=chocolate
+    shop=clothes: Ko:Tag:shop=clothes
+    shop=coffee: Ko:Tag:shop=coffee
+    shop=confectionery: Ko:Tag:shop=confectionery
     shop=convenience: Ko:Tag:shop=convenience
     shop=cosmetics: Ko:Tag:shop=cosmetics
     shop=convenience: Ko:Tag:shop=convenience
     shop=cosmetics: Ko:Tag:shop=cosmetics
+    shop=dairy: Ko:Tag:shop=dairy
+    shop=department_store: Ko:Tag:shop=department store
+    shop=energy: Ko:Tag:shop=energy
+    shop=farm: Ko:Tag:shop=farm
+    shop=frozen_food: Ko:Tag:shop=frozen food
     shop=garden_centre: Ko:Tag:shop=garden centre
     shop=gift: Ko:Tag:shop=gift
     shop=garden_centre: Ko:Tag:shop=garden centre
     shop=gift: Ko:Tag:shop=gift
+    shop=greengrocer: Ko:Tag:shop=greengrocer
+    shop=health_food: Ko:Tag:shop=health food
+    shop=ice_cream: Ko:Tag:shop=ice cream
+    shop=mall: Ko:Tag:shop=mall
+    shop=outdoor: Ko:Tag:shop=outdoor
+    shop=pasta: Ko:Tag:shop=pasta
+    shop=pastry: Ko:Tag:shop=pastry
+    shop=seafood: Ko:Tag:shop=seafood
+    shop=spices: Ko:Tag:shop=spices
+    shop=supermarket: Ko:Tag:shop=supermarket
+    shop=tea: Ko:Tag:shop=tea
+    shop=wholesale: Ko:Tag:shop=wholesale
+    shop=wine: Ko:Tag:shop=wine
+    sport=martial_arts: Ko:Tag:sport=martial arts
+    sport=taekwondo: Ko:Tag:sport=taekwondo
+    surface=mud: Ko:Tag:surface=mud
+    toll=yes: Ko:Tag:toll=yes
     tourism=attraction: Ko:Tag:tourism=attraction
     tourism=attraction: Ko:Tag:tourism=attraction
+    traffic_calming=island: Ko:Tag:traffic calming=island
     waterway=ditch: Ko:Tag:waterway=ditch
     waterway=ditch: Ko:Tag:waterway=ditch
+    waterway=drain: Ko:Tag:waterway=drain
+    waterway=tidal_channel: Ko:Tag:waterway=tidal channel
+    wetland=bog: Ko:Tag:wetland=bog
 lt:
   key:
     cycleway: Lt:Key:cycleway
 lt:
   key:
     cycleway: Lt:Key:cycleway
-lv:
-  key:
-    highway: Lv:Key:highway
 ms:
   tag:
     highway=motorway: Ms:Tag:highway=motorway
 ms:
   tag:
     highway=motorway: Ms:Tag:highway=motorway
@@ -16560,19 +23038,19 @@ ms:
     highway=tertiary: Ms:Tag:highway=tertiary
     highway=trunk: Ms:Tag:highway=trunk
     highway=unclassified: Ms:Tag:highway=unclassified
     highway=tertiary: Ms:Tag:highway=tertiary
     highway=trunk: Ms:Tag:highway=trunk
     highway=unclassified: Ms:Tag:highway=unclassified
-my:
-  tag:
-    craft=agricultural_engines: My:Tag:craft=agricultural engines
 ne:
   key:
     tracktype: Ne:Key:tracktype
   tag:
 ne:
   key:
     tracktype: Ne:Key:tracktype
   tag:
-    landuse=meadow: Ne:Tag:landuse=meadow
+    barrier=kerb: Ne:Tag:barrier=kerb
     natural=scrub: Ne:Tag:natural=scrub
     natural=scrub: Ne:Tag:natural=scrub
+    place=hamlet: Ne:Tag:place=hamlet
 nl:
   key:
     AND_nosr_r: NL:Key:AND nosr r
 nl:
   key:
     AND_nosr_r: NL:Key:AND nosr r
+    access: NL:Key:access
     addr: NL:Key:addr
     addr: NL:Key:addr
+    addr:*: NL:Key:addr:*
     addr:city: NL:Key:addr:city
     addr:country: NL:Key:addr:country
     addr:housename: NL:Key:addr:housename
     addr:city: NL:Key:addr:city
     addr:country: NL:Key:addr:country
     addr:housename: NL:Key:addr:housename
@@ -16584,7 +23062,8 @@ nl:
     barrier: NL:Key:barrier
     bench: NL:Key:bench
     bicycle: NL:Key:bicycle
     barrier: NL:Key:barrier
     bench: NL:Key:bench
     bicycle: NL:Key:bicycle
-    bicycle_road: NL:Key:bicycle road
+    bollard: NL:Key:bollard
+    brand:website: NL:Key:brand:website
     building: NL:Key:building
     circumference: NL:Key:circumference
     color: NL:Key:color
     building: NL:Key:building
     circumference: NL:Key:circumference
     color: NL:Key:color
@@ -16599,18 +23078,22 @@ nl:
     fence_type: NL:Key:fence type
     fenced: NL:Key:fenced
     from: NL:Key:from
     fence_type: NL:Key:fence type
     fenced: NL:Key:fenced
     from: NL:Key:from
+    historic: NL:Key:historic
     internet_access: NL:Key:internet access
     landuse: NL:Key:landuse
     leaf_cycle: NL:Key:leaf cycle
     leisure: NL:Key:leisure
     man_made: NL:Key:man made
     internet_access: NL:Key:internet access
     landuse: NL:Key:landuse
     leaf_cycle: NL:Key:leaf cycle
     leisure: NL:Key:leisure
     man_made: NL:Key:man made
+    mdb_id: NL:Key:mdb id
     military: NL:Key:military
     name: NL:Key:name
     natural: NL:Key:natural
     network: NL:Key:network
     network:type: NL:Key:network:type
     office: NL:Key:office
     military: NL:Key:military
     name: NL:Key:name
     natural: NL:Key:natural
     network: NL:Key:network
     network:type: NL:Key:network:type
     office: NL:Key:office
+    oneway: NL:Key:oneway
     place: NL:Key:place
     place: NL:Key:place
+    playground: NL:Key:playground
     population: NL:Key:population
     power_supply:schedule: NL:Key:power supply:schedule
     public_transport: NL:Key:public transport
     population: NL:Key:population
     power_supply:schedule: NL:Key:power supply:schedule
     public_transport: NL:Key:public transport
@@ -16627,30 +23110,41 @@ nl:
     turn:lanes: NL:Key:turn:lanes
     type: NL:Key:type
     waste: NL:Key:waste
     turn:lanes: NL:Key:turn:lanes
     type: NL:Key:type
     waste: NL:Key:waste
+    water: NL:Key:water
+    waterway: NL:Key:waterway
     wheelchair: NL:Key:wheelchair
     xmas:feature: NL:Key:xmas:feature
   tag:
     wheelchair: NL:Key:wheelchair
     xmas:feature: NL:Key:xmas:feature
   tag:
+    amenity=baby_hatch: NL:Tag:amenity=baby hatch
     amenity=bank: NL:Tag:amenity=bank
     amenity=bench: NL:Tag:amenity=bench
     amenity=bank: NL:Tag:amenity=bank
     amenity=bench: NL:Tag:amenity=bench
+    amenity=bicycle_parking: NL:Tag:amenity=bicycle parking
     amenity=cafe: NL:Tag:amenity=cafe
     amenity=drinking_water: NL:Tag:amenity=drinking water
     amenity=grave_yard: NL:Tag:amenity=grave yard
     amenity=parking: NL:Tag:amenity=parking
     amenity=post_office: NL:Tag:amenity=post office
     amenity=toilets: NL:Tag:amenity=toilets
     amenity=cafe: NL:Tag:amenity=cafe
     amenity=drinking_water: NL:Tag:amenity=drinking water
     amenity=grave_yard: NL:Tag:amenity=grave yard
     amenity=parking: NL:Tag:amenity=parking
     amenity=post_office: NL:Tag:amenity=post office
     amenity=toilets: NL:Tag:amenity=toilets
+    amenity=university: NL:Tag:amenity=university
     amenity=vending_machine: NL:Tag:amenity=vending machine
     amenity=waste_basket: NL:Tag:amenity=waste basket
     barrier=bollard: NL:Tag:barrier=bollard
     amenity=vending_machine: NL:Tag:amenity=vending machine
     amenity=waste_basket: NL:Tag:amenity=waste basket
     barrier=bollard: NL:Tag:barrier=bollard
+    barrier=cattle_grid: NL:Tag:barrier=cattle grid
     barrier=fence: NL:Tag:barrier=fence
     barrier=hedge: NL:Tag:barrier=hedge
     barrier=sump_buster: NL:Tag:barrier=sump buster
     barrier=fence: NL:Tag:barrier=fence
     barrier=hedge: NL:Tag:barrier=hedge
     barrier=sump_buster: NL:Tag:barrier=sump buster
+    bicycle_road=yes: NL:Tag:bicycle road=yes
+    building=castle: NL:Tag:building=castle
     building=entrance: NL:Tag:building=entrance
     building=entrance: NL:Tag:building=entrance
+    emergency=access_point: NL:Tag:emergency=access point
+    emergency=yes: NL:Tag:emergency=yes
     footway=sidewalk: NL:Tag:footway=sidewalk
     healthcare=blood_donation: NL:Tag:healthcare=blood donation
     highway=emergency_bay: NL:Tag:highway=emergency bay
     highway=footway: NL:Tag:highway=footway
     highway=motorway: NL:Tag:highway=motorway
     highway=path: NL:Tag:highway=path
     footway=sidewalk: NL:Tag:footway=sidewalk
     healthcare=blood_donation: NL:Tag:healthcare=blood donation
     highway=emergency_bay: NL:Tag:highway=emergency bay
     highway=footway: NL:Tag:highway=footway
     highway=motorway: NL:Tag:highway=motorway
     highway=path: NL:Tag:highway=path
+    highway=residential: NL:Tag:highway=residential
     highway=trailhead: NL:Tag:highway=trailhead
     historic=monument: NL:Tag:historic=monument
     information=tactile_map: NL:Tag:information=tactile map
     highway=trailhead: NL:Tag:highway=trailhead
     historic=monument: NL:Tag:historic=monument
     information=tactile_map: NL:Tag:information=tactile map
@@ -16659,8 +23153,22 @@ nl:
     landuse=grass: NL:Tag:landuse=grass
     landuse=industrial: NL:Tag:landuse=industrial
     leaf_cycle=deciduous: NL:Tag:leaf cycle=deciduous
     landuse=grass: NL:Tag:landuse=grass
     landuse=industrial: NL:Tag:landuse=industrial
     leaf_cycle=deciduous: NL:Tag:leaf cycle=deciduous
+    leisure=playground: NL:Tag:leisure=playground
     man_made=windmill: NL:Tag:man made=windmill
     natural=tree: NL:Tag:natural=tree
     man_made=windmill: NL:Tag:man made=windmill
     natural=tree: NL:Tag:natural=tree
+    network=NL:A: NL:Tag:network=NL:A
+    network=NL:N: NL:Tag:network=NL:N
+    network=NL:R:Ommen: NL:Tag:network=NL:R:Ommen
+    network=NL:R:Schouwen: NL:Tag:network=NL:R:Schouwen
+    network=NL:R:Spaarnwoude: NL:Tag:network=NL:R:Spaarnwoude
+    network=NL:R:Voorthuizen: NL:Tag:network=NL:R:Voorthuizen
+    network=NL:S:Amsterdam: NL:Tag:network=NL:S:Amsterdam
+    network=NL:S:Den_Haag: NL:Tag:network=NL:S:Den Haag
+    network=NL:S:Heerlen: NL:Tag:network=NL:S:Heerlen
+    network=NL:S:Nijmegen: NL:Tag:network=NL:S:Nijmegen
+    network=NL:S:Rotterdam: NL:Tag:network=NL:S:Rotterdam
+    network=NL:S:Zaanstad: NL:Tag:network=NL:S:Zaanstad
+    network=e-road: NL:Tag:network=e-road
     office=architect: NL:Tag:office=architect
     office=yes: NL:Tag:office=yes
     public_transport=platform: NL:Tag:public transport=platform
     office=architect: NL:Tag:office=architect
     office=yes: NL:Tag:office=yes
     public_transport=platform: NL:Tag:public transport=platform
@@ -16673,6 +23181,7 @@ nl:
     shop=motorcycle: NL:Tag:shop=motorcycle
     sport=floorball: NL:Tag:sport=floorball
     sport=miniature_golf: NL:Tag:sport=miniature golf
     shop=motorcycle: NL:Tag:shop=motorcycle
     sport=floorball: NL:Tag:sport=floorball
     sport=miniature_golf: NL:Tag:sport=miniature golf
+    sport=scuba_diving: NL:Tag:sport=scuba diving
     sport=squash: NL:Tag:sport=squash
     tourism=chalet: NL:Tag:tourism=chalet
     traffic_sign=NL:A01-30-ZB: NL:Tag:traffic sign=NL:A01-30-ZB
     sport=squash: NL:Tag:sport=squash
     tourism=chalet: NL:Tag:tourism=chalet
     traffic_sign=NL:A01-30-ZB: NL:Tag:traffic sign=NL:A01-30-ZB
@@ -16709,7 +23218,53 @@ no:
     natural=tree: No:Tag:natural=tree
 oc:
   key:
     natural=tree: No:Tag:natural=tree
 oc:
   key:
+    craft: Oc:Key:craft
+    highway: Oc:Key:highway
     name:oc: Oc:Key:name:oc
     name:oc: Oc:Key:name:oc
+    place: Oc:Key:place
+    public_transport: Oc:Key:public transport
+    second_hand: Oc:Key:second hand
+  tag:
+    craft=agricultural_engines: Oc:Tag:craft=agricultural engines
+    craft=bakery: Oc:Tag:craft=bakery
+    craft=basket_maker: Oc:Tag:craft=basket maker
+    craft=beekeeper: Oc:Tag:craft=beekeeper
+    craft=blacksmith: Oc:Tag:craft=blacksmith
+    craft=boatbuilder: Oc:Tag:craft=boatbuilder
+    craft=bookbinder: Oc:Tag:craft=bookbinder
+    craft=brewery: Oc:Tag:craft=brewery
+    craft=builder: Oc:Tag:craft=builder
+    craft=cabinet_maker: Oc:Tag:craft=cabinet maker
+    craft=carpenter: Oc:Tag:craft=carpenter
+    craft=caterer: Oc:Tag:craft=caterer
+    craft=chimney_sweeper: Oc:Tag:craft=chimney sweeper
+    craft=clockmaker: Oc:Tag:craft=clockmaker
+    craft=confectionery: Oc:Tag:craft=confectionery
+    craft=cooper: Oc:Tag:craft=cooper
+    craft=distillery: Oc:Tag:craft=distillery
+    craft=dressmaker: Oc:Tag:craft=dressmaker
+    craft=electrician: Oc:Tag:craft=electrician
+    craft=embroiderer: Oc:Tag:craft=embroiderer
+    craft=engraver: Oc:Tag:craft=engraver
+    craft=floorer: Oc:Tag:craft=floorer
+    craft=gardener: Oc:Tag:craft=gardener
+    craft=glaziery: Oc:Tag:craft=glaziery
+    craft=jeweller: Oc:Tag:craft=jeweller
+    craft=key_cutter: Oc:Tag:craft=key cutter
+    craft=leather: Oc:Tag:craft=leather
+    craft=mint: Oc:Tag:craft=mint
+    craft=oil_mill: Oc:Tag:craft=oil mill
+    craft=optician: Oc:Tag:craft=optician
+    craft=paver: Oc:Tag:craft=paver
+    craft=printer: Oc:Tag:craft=printer
+    craft=sailmaker: Oc:Tag:craft=sailmaker
+    craft=tailor: Oc:Tag:craft=tailor
+    natural=cave_entrance: Oc:Tag:natural=cave entrance
+    office=association: Oc:Tag:office=association
+    shop=second_hand: Oc:Tag:shop=second hand
+pa:
+  key:
+    name:pnb: Pa:Key:name:pnb
 pl:
   key:
     3dr:type: Pl:Key:3dr:type
 pl:
   key:
     3dr:type: Pl:Key:3dr:type
@@ -16718,11 +23273,13 @@ pl:
     FIXME: Pl:Key:FIXME
     abandoned: Pl:Key:abandoned
     'abandoned:': 'Pl:Key:abandoned:'
     FIXME: Pl:Key:FIXME
     abandoned: Pl:Key:abandoned
     'abandoned:': 'Pl:Key:abandoned:'
+    abandoned:*: Pl:Key:abandoned:*
     abandoned:railway: Pl:Key:abandoned:railway
     abutters: Pl:Key:abutters
     access: Pl:Key:access
     actuator: Pl:Key:actuator
     addr: Pl:Key:addr
     abandoned:railway: Pl:Key:abandoned:railway
     abutters: Pl:Key:abutters
     access: Pl:Key:access
     actuator: Pl:Key:actuator
     addr: Pl:Key:addr
+    addr:*: Pl:Key:addr:*
     addr:city: Pl:Key:addr:city
     addr:country: Pl:Key:addr:country
     addr:county: Pl:Key:addr:county
     addr:city: Pl:Key:addr:city
     addr:country: Pl:Key:addr:country
     addr:county: Pl:Key:addr:county
@@ -16746,6 +23303,7 @@ pl:
     aerialway: Pl:Key:aerialway
     aerialway:drag_lift: Pl:Key:aerialway:drag lift
     aeroway: Pl:Key:aeroway
     aerialway: Pl:Key:aerialway
     aerialway:drag_lift: Pl:Key:aerialway:drag lift
     aeroway: Pl:Key:aeroway
+    after_school: Pl:Key:after school
     agrarian: Pl:Key:agrarian
     agricultural: Pl:Key:agricultural
     alt_name: Pl:Key:alt name
     agrarian: Pl:Key:agrarian
     agricultural: Pl:Key:agricultural
     alt_name: Pl:Key:alt name
@@ -16756,6 +23314,7 @@ pl:
     artist_name: Pl:Key:artist name
     artwork_subject: Pl:Key:artwork subject
     artwork_type: Pl:Key:artwork type
     artist_name: Pl:Key:artist name
     artwork_subject: Pl:Key:artwork subject
     artwork_type: Pl:Key:artwork type
+    atm: Pl:Key:atm
     automated: Pl:Key:automated
     automatic_door: Pl:Key:automatic door
     backrest: Pl:Key:backrest
     automated: Pl:Key:automated
     automatic_door: Pl:Key:automatic door
     backrest: Pl:Key:backrest
@@ -16769,7 +23328,6 @@ pl:
     bench: Pl:Key:bench
     bicycle: Pl:Key:bicycle
     bicycle_parking: Pl:Key:bicycle parking
     bench: Pl:Key:bench
     bicycle: Pl:Key:bicycle
     bicycle_parking: Pl:Key:bicycle parking
-    bicycle_road: Pl:Key:bicycle road
     bin: Pl:Key:bin
     biotic_reef:type: Pl:Key:biotic reef:type
     board_type: Pl:Key:board type
     bin: Pl:Key:bin
     biotic_reef:type: Pl:Key:biotic reef:type
     board_type: Pl:Key:board type
@@ -16781,6 +23339,7 @@ pl:
     bridge:movable: Pl:Key:bridge:movable
     bridge:structure: Pl:Key:bridge:structure
     bridge:support: Pl:Key:bridge:support
     bridge:movable: Pl:Key:bridge:movable
     bridge:structure: Pl:Key:bridge:structure
     bridge:support: Pl:Key:bridge:support
+    brine_source: Pl:Key:brine source
     budynek: Pl:Key:budynek
     building: Pl:Key:building
     building:architecture: Pl:Key:building:architecture
     budynek: Pl:Key:budynek
     building: Pl:Key:building
     building:architecture: Pl:Key:building:architecture
@@ -16805,7 +23364,9 @@ pl:
     cargo: Pl:Key:cargo
     castle_type: Pl:Key:castle type
     cemetery: Pl:Key:cemetery
     cargo: Pl:Key:cargo
     castle_type: Pl:Key:castle type
     cemetery: Pl:Key:cemetery
+    charge: Pl:Key:charge
     check_date: Pl:Key:check date
     check_date: Pl:Key:check date
+    church:type: Pl:Key:church:type
     circuits: Pl:Key:circuits
     circumference: Pl:Key:circumference
     clothes: Pl:Key:clothes
     circuits: Pl:Key:circuits
     circumference: Pl:Key:circumference
     clothes: Pl:Key:clothes
@@ -16822,6 +23383,8 @@ pl:
     construction_end_expected: Pl:Key:construction end expected
     construction_start_expected: Pl:Key:construction start expected
     contact: Pl:Key:contact
     construction_end_expected: Pl:Key:construction end expected
     construction_start_expected: Pl:Key:construction start expected
     contact: Pl:Key:contact
+    contact:*: Pl:Key:contact:*
+    contact:phone: Pl:Key:contact:phone
     content: Pl:Key:content
     conveying: Pl:Key:conveying
     country: Pl:Key:country
     content: Pl:Key:content
     conveying: Pl:Key:conveying
     country: Pl:Key:country
@@ -16831,10 +23394,13 @@ pl:
     crop: Pl:Key:crop
     crossing: Pl:Key:crossing
     crossing:island: Pl:Key:crossing:island
     crop: Pl:Key:crop
     crossing: Pl:Key:crossing
     crossing:island: Pl:Key:crossing:island
+    crossing:markings: Pl:Key:crossing:markings
     cuisine: Pl:Key:cuisine
     currency: Pl:Key:currency
     cuisine: Pl:Key:cuisine
     currency: Pl:Key:currency
+    currency:*: Pl:Key:currency:*
     cutting: Pl:Key:cutting
     cycleway: Pl:Key:cycleway
     cutting: Pl:Key:cutting
     cycleway: Pl:Key:cycleway
+    cycleway:surface: Pl:Key:cycleway:surface
     deanery: Pl:Key:deanery
     delivery: Pl:Key:delivery
     denomination: Pl:Key:denomination
     deanery: Pl:Key:deanery
     delivery: Pl:Key:delivery
     denomination: Pl:Key:denomination
@@ -16847,6 +23413,7 @@ pl:
     diameter: Pl:Key:diameter
     diet: Pl:Key:diet
     'diet:': 'Pl:Key:diet:'
     diameter: Pl:Key:diameter
     diet: Pl:Key:diet
     'diet:': 'Pl:Key:diet:'
+    diet:*: Pl:Key:diet:*
     diet:halal: Pl:Key:diet:halal
     diet:kosher: Pl:Key:diet:kosher
     diet:vegan: Pl:Key:diet:vegan
     diet:halal: Pl:Key:diet:halal
     diet:kosher: Pl:Key:diet:kosher
     diet:vegan: Pl:Key:diet:vegan
@@ -16858,7 +23425,9 @@ pl:
     distance: Pl:Key:distance
     door: Pl:Key:door
     drink: Pl:Key:drink
     distance: Pl:Key:distance
     door: Pl:Key:door
     drink: Pl:Key:drink
+    drink:*: Pl:Key:drink:*
     drinking_water: Pl:Key:drinking water
     drinking_water: Pl:Key:drinking water
+    drinking_water:refill: Pl:Key:drinking water:refill
     driving_side: Pl:Key:driving side
     dryer: Pl:Key:dryer
     duration: Pl:Key:duration
     driving_side: Pl:Key:driving side
     dryer: Pl:Key:dryer
     duration: Pl:Key:duration
@@ -16870,8 +23439,10 @@ pl:
     end_date: Pl:Key:end date
     entrance: Pl:Key:entrance
     est_width: Pl:Key:est width
     end_date: Pl:Key:end date
     entrance: Pl:Key:entrance
     est_width: Pl:Key:est width
+    faces: Pl:Key:faces
     fair_trade: Pl:Key:fair trade
     farmyard: Pl:Key:farmyard
     fair_trade: Pl:Key:fair trade
     farmyard: Pl:Key:farmyard
+    fast_food: Pl:Key:fast food
     fee: Pl:Key:fee
     female: Pl:Key:female
     fence_type: Pl:Key:fence type
     fee: Pl:Key:fee
     female: Pl:Key:female
     fence_type: Pl:Key:fence type
@@ -16881,6 +23452,7 @@ pl:
     fire_path: Pl:Key:fire path
     fishing: Pl:Key:fishing
     fixme: Pl:Key:fixme
     fire_path: Pl:Key:fire path
     fishing: Pl:Key:fishing
     fixme: Pl:Key:fixme
+    flashing_lights: Pl:Key:flashing lights
     floating: Pl:Key:floating
     flood_mark: Pl:Key:flood mark
     flood_prone: Pl:Key:flood prone
     floating: Pl:Key:floating
     flood_mark: Pl:Key:flood mark
     flood_prone: Pl:Key:flood prone
@@ -16902,6 +23474,8 @@ pl:
     government: Pl:Key:government
     grades: Pl:Key:grades
     handrail: Pl:Key:handrail
     government: Pl:Key:government
     grades: Pl:Key:grades
     handrail: Pl:Key:handrail
+    hazard: Pl:Key:hazard
+    hazmat: Pl:Key:hazmat
     healthcare: Pl:Key:healthcare
     healthcare:speciality: Pl:Key:healthcare:speciality
     height: Pl:Key:height
     healthcare: Pl:Key:healthcare
     healthcare:speciality: Pl:Key:healthcare:speciality
     height: Pl:Key:height
@@ -16946,7 +23520,6 @@ pl:
     junction: Pl:Key:junction
     kerb: Pl:Key:kerb
     landfill:waste: Pl:Key:landfill:waste
     junction: Pl:Key:junction
     kerb: Pl:Key:kerb
     landfill:waste: Pl:Key:landfill:waste
-    landmark: Pl:Key:landmark
     landuse: Pl:Key:landuse
     lanes: Pl:Key:lanes
     lanes:psv: Pl:Key:lanes:psv
     landuse: Pl:Key:landuse
     lanes: Pl:Key:lanes
     lanes:psv: Pl:Key:lanes:psv
@@ -16962,10 +23535,10 @@ pl:
     location: Pl:Key:location
     lock: Pl:Key:lock
     lock_name: Pl:Key:lock name
     location: Pl:Key:location
     lock: Pl:Key:lock
     lock_name: Pl:Key:lock name
-    lottery: Pl:Key:lottery
     male: Pl:Key:male
     man_made: Pl:Key:man made
     manhole: Pl:Key:manhole
     male: Pl:Key:male
     man_made: Pl:Key:man made
     manhole: Pl:Key:manhole
+    marker: Pl:Key:marker
     material: Pl:Key:material
     max_age: Pl:Key:max age
     maxage: Pl:Key:maxage
     material: Pl:Key:material
     max_age: Pl:Key:max age
     maxage: Pl:Key:maxage
@@ -16979,11 +23552,13 @@ pl:
     maxspeed:practical: Pl:Key:maxspeed:practical
     maxstay: Pl:Key:maxstay
     maxweight: Pl:Key:maxweight
     maxspeed:practical: Pl:Key:maxspeed:practical
     maxstay: Pl:Key:maxstay
     maxweight: Pl:Key:maxweight
+    maxweightrating: Pl:Key:maxweightrating
     maxwidth: Pl:Key:maxwidth
     maxwidth:physical: Pl:Key:maxwidth:physical
     megalith_type: Pl:Key:megalith type
     memorial: Pl:Key:memorial
     memorial:type: Pl:Key:memorial:type
     maxwidth: Pl:Key:maxwidth
     maxwidth:physical: Pl:Key:maxwidth:physical
     megalith_type: Pl:Key:megalith type
     memorial: Pl:Key:memorial
     memorial:type: Pl:Key:memorial:type
+    message: Pl:Key:message
     military: Pl:Key:military
     min_age: Pl:Key:min age
     min_height: Pl:Key:min height
     military: Pl:Key:military
     min_age: Pl:Key:min age
     min_height: Pl:Key:min height
@@ -17000,14 +23575,16 @@ pl:
     moved: Pl:Key:moved
     name: Pl:Key:name
     name:etymology: Pl:Key:name:etymology
     moved: Pl:Key:moved
     name: Pl:Key:name
     name:etymology: Pl:Key:name:etymology
+    name:rue: Pl:Key:name:rue
     nat_ref: Pl:Key:nat ref
     natural: Pl:Key:natural
     network: Pl:Key:network
     nat_ref: Pl:Key:nat ref
     natural: Pl:Key:natural
     network: Pl:Key:network
-    noexit: Pl:Key:noexit
     non_existent_levels: Pl:Key:non existent levels
     note: Pl:Key:note
     nudism: Pl:Key:nudism
     non_existent_levels: Pl:Key:non existent levels
     note: Pl:Key:note
     nudism: Pl:Key:nudism
+    nursery: Pl:Key:nursery
     office: Pl:Key:office
     office: Pl:Key:office
+    old_addr:housenumber: Pl:Key:old addr:housenumber
     old_name: Pl:Key:old name
     old_ref: Pl:Key:old ref
     oneway: Pl:Key:oneway
     old_name: Pl:Key:old name
     old_ref: Pl:Key:old ref
     oneway: Pl:Key:oneway
@@ -17021,12 +23598,14 @@ pl:
     overtaking: Pl:Key:overtaking
     owner: Pl:Key:owner
     ownership: Pl:Key:ownership
     overtaking: Pl:Key:overtaking
     owner: Pl:Key:owner
     ownership: Pl:Key:ownership
+    parcel_mail_in: Pl:Key:parcel mail in
+    parcel_pickup: Pl:Key:parcel pickup
     parish: Pl:Key:parish
     parking: Pl:Key:parking
     parish: Pl:Key:parish
     parking: Pl:Key:parking
-    parking:lane: Pl:Key:parking:lane
     passenger_information_display: Pl:Key:passenger information display
     passing_places: Pl:Key:passing places
     payment: Pl:Key:payment
     passenger_information_display: Pl:Key:passenger information display
     passing_places: Pl:Key:passing places
     payment: Pl:Key:payment
+    phone: Pl:Key:phone
     pipeline: Pl:Key:pipeline
     place: Pl:Key:place
     place_name: Pl:Key:place name
     pipeline: Pl:Key:pipeline
     place: Pl:Key:place
     place_name: Pl:Key:place name
@@ -17035,6 +23614,7 @@ pl:
     population: Pl:Key:population
     post_box:type: Pl:Key:post box:type
     power: Pl:Key:power
     population: Pl:Key:population
     post_box:type: Pl:Key:post box:type
     power: Pl:Key:power
+    preschool: Pl:Key:preschool
     pressure: Pl:Key:pressure
     priority: Pl:Key:priority
     produce: Pl:Key:produce
     pressure: Pl:Key:pressure
     priority: Pl:Key:priority
     produce: Pl:Key:produce
@@ -17046,32 +23626,42 @@ pl:
     pump: Pl:Key:pump
     railway: Pl:Key:railway
     railway:area: Pl:Key:railway:area
     pump: Pl:Key:pump
     railway: Pl:Key:railway
     railway:area: Pl:Key:railway:area
+    railway:position: Pl:Key:railway:position
     ramp: Pl:Key:ramp
     razed: Pl:Key:razed
     'razed:': 'Pl:Key:razed:'
     ramp: Pl:Key:ramp
     razed: Pl:Key:razed
     'razed:': 'Pl:Key:razed:'
+    razed:*: Pl:Key:razed:*
+    recycling:plastic_bottle_tops: Pl:Key:recycling:plastic bottle tops
     recycling_type: Pl:Key:recycling type
     reef: Pl:Key:reef
     ref: Pl:Key:ref
     recycling_type: Pl:Key:recycling type
     reef: Pl:Key:reef
     ref: Pl:Key:ref
+    ref:csioz: Pl:Key:ref:csioz
     reference_point: Pl:Key:reference point
     reg_ref: Pl:Key:reg ref
     religion: Pl:Key:religion
     'removed:': 'Pl:Key:removed:'
     reference_point: Pl:Key:reference point
     reg_ref: Pl:Key:reg ref
     religion: Pl:Key:religion
     'removed:': 'Pl:Key:removed:'
+    removed:*: Pl:Key:removed:*
     repair: Pl:Key:repair
     repeat_on: Pl:Key:repeat on
     reservation: Pl:Key:reservation
     residential: Pl:Key:residential
     resource: Pl:Key:resource
     repair: Pl:Key:repair
     repeat_on: Pl:Key:repeat on
     reservation: Pl:Key:reservation
     residential: Pl:Key:residential
     resource: Pl:Key:resource
+    river:waterway_distance: Pl:Key:river:waterway distance
     roof:colour: Pl:Key:roof:colour
     roof:colour: Pl:Key:roof:colour
+    roof:direction: Pl:Key:roof:direction
     roof:material: Pl:Key:roof:material
     roof:shape: Pl:Key:roof:shape
     room: Pl:Key:room
     route: Pl:Key:route
     route_master: Pl:Key:route master
     'ruined:': 'Pl:Key:ruined:'
     roof:material: Pl:Key:roof:material
     roof:shape: Pl:Key:roof:shape
     room: Pl:Key:room
     route: Pl:Key:route
     route_master: Pl:Key:route master
     'ruined:': 'Pl:Key:ruined:'
+    ruined:*: Pl:Key:ruined:*
     ruins: Pl:Key:ruins
     'ruins:': 'Pl:Key:ruins:'
     ruins: Pl:Key:ruins
     'ruins:': 'Pl:Key:ruins:'
+    ruins:*: Pl:Key:ruins:*
     sac_scale: Pl:Key:sac scale
     seamark:fixme: Pl:Key:seamark:fixme
     sac_scale: Pl:Key:sac scale
     seamark:fixme: Pl:Key:seamark:fixme
+    seamark:marine_farm:category: Pl:Key:seamark:marine farm:category
     seasonal: Pl:Key:seasonal
     second_hand: Pl:Key:second hand
     segregated: Pl:Key:segregated
     seasonal: Pl:Key:seasonal
     second_hand: Pl:Key:second hand
     segregated: Pl:Key:segregated
@@ -17081,8 +23671,8 @@ pl:
     shelter_type: Pl:Key:shelter type
     shop: Pl:Key:shop
     shower: Pl:Key:shower
     shelter_type: Pl:Key:shelter type
     shop: Pl:Key:shop
     shower: Pl:Key:shower
+    shrine: Pl:Key:shrine
     sidewalk: Pl:Key:sidewalk
     sidewalk: Pl:Key:sidewalk
-    site_type: Pl:Key:site type
     size: Pl:Key:size
     smokefree: Pl:Key:smokefree
     smoking: Pl:Key:smoking
     size: Pl:Key:size
     smokefree: Pl:Key:smokefree
     smoking: Pl:Key:smoking
@@ -17110,6 +23700,7 @@ pl:
     symbol: Pl:Key:symbol
     tactile_paving: Pl:Key:tactile paving
     takeaway: Pl:Key:takeaway
     symbol: Pl:Key:symbol
     tactile_paving: Pl:Key:tactile paving
     takeaway: Pl:Key:takeaway
+    tank_cleaning_truck: Pl:Key:tank cleaning truck
     target: Pl:Key:target
     taxon: Pl:Key:taxon
     tents: Pl:Key:tents
     target: Pl:Key:target
     taxon: Pl:Key:taxon
     tents: Pl:Key:tents
@@ -17138,8 +23729,10 @@ pl:
     trees: Pl:Key:trees
     trolley_wire: Pl:Key:trolley wire
     trolleybus: Pl:Key:trolleybus
     trees: Pl:Key:trees
     trolley_wire: Pl:Key:trolley wire
     trolleybus: Pl:Key:trolleybus
+    truck_wash: Pl:Key:truck wash
     tunnel: Pl:Key:tunnel
     turn: Pl:Key:turn
     tunnel: Pl:Key:tunnel
     turn: Pl:Key:turn
+    turn:bicycle:lanes: Pl:Key:turn:bicycle:lanes
     turn:lanes: Pl:Key:turn:lanes
     type: Pl:Key:type
     unisex: Pl:Key:unisex
     turn:lanes: Pl:Key:turn:lanes
     type: Pl:Key:type
     unisex: Pl:Key:unisex
@@ -17175,12 +23768,14 @@ pl:
     access=license: Pl:Tag:access=license
     access=no: Pl:Tag:access=no
     access=official: Pl:Tag:access=official
     access=license: Pl:Tag:access=license
     access=no: Pl:Tag:access=no
     access=official: Pl:Tag:access=official
+    access=permissive: Pl:Tag:access=permissive
     access=private: Pl:Tag:access=private
     actuator=hydraulic_cylinder: Pl:Tag:actuator=hydraulic cylinder
     advertising=billboard: Pl:Tag:advertising=billboard
     advertising=board: Pl:Tag:advertising=board
     advertising=column: Pl:Tag:advertising=column
     advertising=flag: Pl:Tag:advertising=flag
     access=private: Pl:Tag:access=private
     actuator=hydraulic_cylinder: Pl:Tag:actuator=hydraulic cylinder
     advertising=billboard: Pl:Tag:advertising=billboard
     advertising=board: Pl:Tag:advertising=board
     advertising=column: Pl:Tag:advertising=column
     advertising=flag: Pl:Tag:advertising=flag
+    advertising=funding_sign: Pl:Tag:advertising=funding sign
     advertising=poster_box: Pl:Tag:advertising=poster box
     advertising=screen: Pl:Tag:advertising=screen
     advertising=sculpture: Pl:Tag:advertising=sculpture
     advertising=poster_box: Pl:Tag:advertising=poster box
     advertising=screen: Pl:Tag:advertising=screen
     advertising=sculpture: Pl:Tag:advertising=sculpture
@@ -17190,6 +23785,7 @@ pl:
     advertising=wall_painting: Pl:Tag:advertising=wall painting
     aeroway=hangar: Pl:Tag:aeroway=hangar
     aeroway=helipad: Pl:Tag:aeroway=helipad
     advertising=wall_painting: Pl:Tag:advertising=wall painting
     aeroway=hangar: Pl:Tag:aeroway=hangar
     aeroway=helipad: Pl:Tag:aeroway=helipad
+    aeroway=tower: Pl:Tag:aeroway=tower
     allotments=plot: Pl:Tag:allotments=plot
     amenity=administration: Pl:Tag:amenity=administration
     amenity=animal_boarding: Pl:Tag:amenity=animal boarding
     allotments=plot: Pl:Tag:allotments=plot
     amenity=administration: Pl:Tag:amenity=administration
     amenity=animal_boarding: Pl:Tag:amenity=animal boarding
@@ -17222,6 +23818,7 @@ pl:
     amenity=clinic: Pl:Tag:amenity=clinic
     amenity=cloakroom: Pl:Tag:amenity=cloakroom
     amenity=clock: Pl:Tag:amenity=clock
     amenity=clinic: Pl:Tag:amenity=clinic
     amenity=cloakroom: Pl:Tag:amenity=cloakroom
     amenity=clock: Pl:Tag:amenity=clock
+    amenity=clothes_dryer: Pl:Tag:amenity=clothes dryer
     amenity=coast_guard: Pl:Tag:amenity=coast guard
     amenity=college: Pl:Tag:amenity=college
     amenity=community_centre: Pl:Tag:amenity=community centre
     amenity=coast_guard: Pl:Tag:amenity=coast guard
     amenity=college: Pl:Tag:amenity=college
     amenity=community_centre: Pl:Tag:amenity=community centre
@@ -17281,6 +23878,7 @@ pl:
     amenity=music_venue: Pl:Tag:amenity=music venue
     amenity=nightclub: Pl:Tag:amenity=nightclub
     amenity=nursing_home: Pl:Tag:amenity=nursing home
     amenity=music_venue: Pl:Tag:amenity=music venue
     amenity=nightclub: Pl:Tag:amenity=nightclub
     amenity=nursing_home: Pl:Tag:amenity=nursing home
+    amenity=parcel_locker: Pl:Tag:amenity=parcel locker
     amenity=parking: Pl:Tag:amenity=parking
     amenity=parking_entrance: Pl:Tag:amenity=parking entrance
     amenity=parking_space: Pl:Tag:amenity=parking space
     amenity=parking: Pl:Tag:amenity=parking
     amenity=parking_entrance: Pl:Tag:amenity=parking entrance
     amenity=parking_space: Pl:Tag:amenity=parking space
@@ -17325,6 +23923,8 @@ pl:
     amenity=toilets: Pl:Tag:amenity=toilets
     amenity=tourist_bus_parking: Pl:Tag:amenity=tourist bus parking
     amenity=townhall: Pl:Tag:amenity=townhall
     amenity=toilets: Pl:Tag:amenity=toilets
     amenity=tourist_bus_parking: Pl:Tag:amenity=tourist bus parking
     amenity=townhall: Pl:Tag:amenity=townhall
+    amenity=traffic_park: Pl:Tag:amenity=traffic park
+    amenity=training: Pl:Tag:amenity=training
     amenity=trolley_bay: Pl:Tag:amenity=trolley bay
     amenity=university: Pl:Tag:amenity=university
     amenity=vacuum_cleaner: Pl:Tag:amenity=vacuum cleaner
     amenity=trolley_bay: Pl:Tag:amenity=trolley bay
     amenity=university: Pl:Tag:amenity=university
     amenity=vacuum_cleaner: Pl:Tag:amenity=vacuum cleaner
@@ -17337,6 +23937,14 @@ pl:
     amenity=waste_disposal: Pl:Tag:amenity=waste disposal
     amenity=waste_transfer_station: Pl:Tag:amenity=waste transfer station
     amenity=water_point: Pl:Tag:amenity=water point
     amenity=waste_disposal: Pl:Tag:amenity=waste disposal
     amenity=waste_transfer_station: Pl:Tag:amenity=waste transfer station
     amenity=water_point: Pl:Tag:amenity=water point
+    archaeological_site=city: Pl:Tag:archaeological site=city
+    archaeological_site=fortification: Pl:Tag:archaeological site=fortification
+    archaeological_site=hut_circle: Pl:Tag:archaeological site=hut circle
+    archaeological_site=megalith: Pl:Tag:archaeological site=megalith
+    archaeological_site=necropolis: Pl:Tag:archaeological site=necropolis
+    archaeological_site=petroglyph: Pl:Tag:archaeological site=petroglyph
+    archaeological_site=settlement: Pl:Tag:archaeological site=settlement
+    archaeological_site=tumulus: Pl:Tag:archaeological site=tumulus
     area:highway=cycleway: Pl:Tag:area:highway=cycleway
     area:highway=footway: Pl:Tag:area:highway=footway
     area:highway=path: Pl:Tag:area:highway=path
     area:highway=cycleway: Pl:Tag:area:highway=cycleway
     area:highway=footway: Pl:Tag:area:highway=footway
     area:highway=path: Pl:Tag:area:highway=path
@@ -17344,8 +23952,6 @@ pl:
     artwork_type=dwarf: Pl:Tag:artwork type=dwarf
     artwork_type=sculpture: Pl:Tag:artwork type=sculpture
     artwork_type=statue: Pl:Tag:artwork type=statue
     artwork_type=dwarf: Pl:Tag:artwork type=dwarf
     artwork_type=sculpture: Pl:Tag:artwork type=sculpture
     artwork_type=statue: Pl:Tag:artwork type=statue
-    atm=no: Pl:Tag:atm=no
-    atm=yes: Pl:Tag:atm=yes
     attraction=animal: Pl:Tag:attraction=animal
     attraction=summer_toboggan: Pl:Tag:attraction=summer toboggan
     attraction=train: Pl:Tag:attraction=train
     attraction=animal: Pl:Tag:attraction=animal
     attraction=summer_toboggan: Pl:Tag:attraction=summer toboggan
     attraction=train: Pl:Tag:attraction=train
@@ -17371,11 +23977,14 @@ pl:
     barrier=retaining_wall: Pl:Tag:barrier=retaining wall
     barrier=sally_port: Pl:Tag:barrier=sally port
     barrier=spikes: Pl:Tag:barrier=spikes
     barrier=retaining_wall: Pl:Tag:barrier=retaining wall
     barrier=sally_port: Pl:Tag:barrier=sally port
     barrier=spikes: Pl:Tag:barrier=spikes
+    barrier=stile: Pl:Tag:barrier=stile
     barrier=toll_booth: Pl:Tag:barrier=toll booth
     barrier=turnstile: Pl:Tag:barrier=turnstile
     barrier=wall: Pl:Tag:barrier=wall
     bicycle=use_sidepath: Pl:Tag:bicycle=use sidepath
     barrier=toll_booth: Pl:Tag:barrier=toll booth
     barrier=turnstile: Pl:Tag:barrier=turnstile
     barrier=wall: Pl:Tag:barrier=wall
     bicycle=use_sidepath: Pl:Tag:bicycle=use sidepath
+    bicycle_road=yes: Pl:Tag:bicycle road=yes
     boundary=administrative: Pl:Tag:boundary=administrative
     boundary=administrative: Pl:Tag:boundary=administrative
+    boundary=border_zone: Pl:Tag:boundary=border zone
     boundary=civil: Pl:Tag:boundary=civil
     boundary=economic: Pl:Tag:boundary=economic
     boundary=historic: Pl:Tag:boundary=historic
     boundary=civil: Pl:Tag:boundary=civil
     boundary=economic: Pl:Tag:boundary=economic
     boundary=historic: Pl:Tag:boundary=historic
@@ -17454,8 +24063,10 @@ pl:
     building=manufacture: Pl:Tag:building=manufacture
     building=mosque: Pl:Tag:building=mosque
     building=office: Pl:Tag:building=office
     building=manufacture: Pl:Tag:building=manufacture
     building=mosque: Pl:Tag:building=mosque
     building=office: Pl:Tag:building=office
+    building=outbuilding: Pl:Tag:building=outbuilding
     building=parking: Pl:Tag:building=parking
     building=pavilion: Pl:Tag:building=pavilion
     building=parking: Pl:Tag:building=parking
     building=pavilion: Pl:Tag:building=pavilion
+    building=presbytery: Pl:Tag:building=presbytery
     building=public: Pl:Tag:building=public
     building=residential: Pl:Tag:building=residential
     building=retail: Pl:Tag:building=retail
     building=public: Pl:Tag:building=public
     building=residential: Pl:Tag:building=residential
     building=retail: Pl:Tag:building=retail
@@ -17486,9 +24097,11 @@ pl:
     building=university: Pl:Tag:building=university
     building=warehouse: Pl:Tag:building=warehouse
     building=water_tower: Pl:Tag:building=water tower
     building=university: Pl:Tag:building=university
     building=warehouse: Pl:Tag:building=warehouse
     building=water_tower: Pl:Tag:building=water tower
+    building=wayside_shrine: Pl:Tag:building=wayside shrine
     bunker_type=gun_emplacement: Pl:Tag:bunker type=gun emplacement
     bunker_type=technical: Pl:Tag:bunker type=technical
     busway=lane: Pl:Tag:busway=lane
     bunker_type=gun_emplacement: Pl:Tag:bunker type=gun emplacement
     bunker_type=technical: Pl:Tag:bunker type=technical
     busway=lane: Pl:Tag:busway=lane
+    canoe=put_in: Pl:Tag:canoe=put in
     castle_type=castrum: Pl:Tag:castle type=castrum
     castle_type=defensive: Pl:Tag:castle type=defensive
     castle_type=fortress: Pl:Tag:castle type=fortress
     castle_type=castrum: Pl:Tag:castle type=castrum
     castle_type=defensive: Pl:Tag:castle type=defensive
     castle_type=fortress: Pl:Tag:castle type=fortress
@@ -17496,9 +24109,13 @@ pl:
     castle_type=palace: Pl:Tag:castle type=palace
     castle_type=stately: Pl:Tag:castle type=stately
     cemetery=grave: Pl:Tag:cemetery=grave
     castle_type=palace: Pl:Tag:castle type=palace
     castle_type=stately: Pl:Tag:castle type=stately
     cemetery=grave: Pl:Tag:cemetery=grave
+    cemetery=sector: Pl:Tag:cemetery=sector
     club=fan: Pl:Tag:club=fan
     club=fan: Pl:Tag:club=fan
+    club=linux: Pl:Tag:club=linux
     club=scout: Pl:Tag:club=scout
     club=sport: Pl:Tag:club=sport
     club=scout: Pl:Tag:club=scout
     club=sport: Pl:Tag:club=sport
+    company=logistics: Pl:Tag:company=logistics
+    construction=footpath: Pl:Tag:construction=footpath
     craft=agricultural_engines: Pl:Tag:craft=agricultural engines
     craft=bakery: Pl:Tag:craft=bakery
     craft=basket_maker: Pl:Tag:craft=basket maker
     craft=agricultural_engines: Pl:Tag:craft=agricultural engines
     craft=bakery: Pl:Tag:craft=bakery
     craft=basket_maker: Pl:Tag:craft=basket maker
@@ -17529,6 +24146,8 @@ pl:
     craft=information_electronics: Pl:Tag:craft=information electronics
     craft=jeweller: Pl:Tag:craft=jeweller
     craft=joiner: Pl:Tag:craft=joiner
     craft=information_electronics: Pl:Tag:craft=information electronics
     craft=jeweller: Pl:Tag:craft=jeweller
     craft=joiner: Pl:Tag:craft=joiner
+    craft=key_cutter: Pl:Tag:craft=key cutter
+    craft=metal_construction: Pl:Tag:craft=metal construction
     craft=oil_mill: Pl:Tag:craft=oil mill
     craft=painter: Pl:Tag:craft=painter
     craft=pottery: Pl:Tag:craft=pottery
     craft=oil_mill: Pl:Tag:craft=oil mill
     craft=painter: Pl:Tag:craft=painter
     craft=pottery: Pl:Tag:craft=pottery
@@ -17538,16 +24157,20 @@ pl:
     craft=stonemason: Pl:Tag:craft=stonemason
     craft=sun_protection: Pl:Tag:craft=sun protection
     craft=tailor: Pl:Tag:craft=tailor
     craft=stonemason: Pl:Tag:craft=stonemason
     craft=sun_protection: Pl:Tag:craft=sun protection
     craft=tailor: Pl:Tag:craft=tailor
+    craft=tinsmith: Pl:Tag:craft=tinsmith
     craft=watchmaker: Pl:Tag:craft=watchmaker
     craft=window_construction: Pl:Tag:craft=window construction
     craft=winery: Pl:Tag:craft=winery
     craft=watchmaker: Pl:Tag:craft=watchmaker
     craft=window_construction: Pl:Tag:craft=window construction
     craft=winery: Pl:Tag:craft=winery
+    crossing=no: Pl:Tag:crossing=no
     cuisine=coffee_shop: Pl:Tag:cuisine=coffee shop
     cuisine=coffee_shop: Pl:Tag:cuisine=coffee shop
+    cycleway=asl: Pl:Tag:cycleway=asl
     cycleway=lane: Pl:Tag:cycleway=lane
     cycleway=opposite: Pl:Tag:cycleway=opposite
     cycleway=opposite_lane: Pl:Tag:cycleway=opposite lane
     cycleway=opposite_track: Pl:Tag:cycleway=opposite track
     cycleway=share_busway: Pl:Tag:cycleway=share busway
     cycleway=track: Pl:Tag:cycleway=track
     cycleway=lane: Pl:Tag:cycleway=lane
     cycleway=opposite: Pl:Tag:cycleway=opposite
     cycleway=opposite_lane: Pl:Tag:cycleway=opposite lane
     cycleway=opposite_track: Pl:Tag:cycleway=opposite track
     cycleway=share_busway: Pl:Tag:cycleway=share busway
     cycleway=track: Pl:Tag:cycleway=track
+    diplomatic=consulate: Pl:Tag:diplomatic=consulate
     emergency=ambulance_station: Pl:Tag:emergency=ambulance station
     emergency=defibrillator: Pl:Tag:emergency=defibrillator
     emergency=emergency_ward_entrance: Pl:Tag:emergency=emergency ward entrance
     emergency=ambulance_station: Pl:Tag:emergency=ambulance station
     emergency=defibrillator: Pl:Tag:emergency=defibrillator
     emergency=emergency_ward_entrance: Pl:Tag:emergency=emergency ward entrance
@@ -17566,6 +24189,7 @@ pl:
     emergency=suction_point: Pl:Tag:emergency=suction point
     emergency=water_rescue_station: Pl:Tag:emergency=water rescue station
     emergency=water_tank: Pl:Tag:emergency=water tank
     emergency=suction_point: Pl:Tag:emergency=suction point
     emergency=water_rescue_station: Pl:Tag:emergency=water rescue station
     emergency=water_tank: Pl:Tag:emergency=water tank
+    entrance=garage: Pl:Tag:entrance=garage
     entrance=main: Pl:Tag:entrance=main
     fast_food=cafeteria: Pl:Tag:fast food=cafeteria
     footway=crossing: Pl:Tag:footway=crossing
     entrance=main: Pl:Tag:entrance=main
     fast_food=cafeteria: Pl:Tag:fast food=cafeteria
     footway=crossing: Pl:Tag:footway=crossing
@@ -17573,14 +24197,27 @@ pl:
     ford=stepping_stones: Pl:Tag:ford=stepping stones
     garden:type=botanical: Pl:Tag:garden:type=botanical
     geological=moraine: Pl:Tag:geological=moraine
     ford=stepping_stones: Pl:Tag:ford=stepping stones
     garden:type=botanical: Pl:Tag:garden:type=botanical
     geological=moraine: Pl:Tag:geological=moraine
+    government=audit: Pl:Tag:government=audit
+    government=building_control: Pl:Tag:government=building control
+    government=building_inspection: Pl:Tag:government=building inspection
+    government=cadaster: Pl:Tag:government=cadaster
     government=customs: Pl:Tag:government=customs
     government=customs: Pl:Tag:government=customs
+    government=education: Pl:Tag:government=education
+    government=healthcare: Pl:Tag:government=healthcare
+    government=heritage: Pl:Tag:government=heritage
     government=ministry: Pl:Tag:government=ministry
     government=prosecutor: Pl:Tag:government=prosecutor
     government=ministry: Pl:Tag:government=ministry
     government=prosecutor: Pl:Tag:government=prosecutor
+    hazard=illegal_crossing: Pl:Tag:hazard=illegal crossing
+    hazard=minefield: Pl:Tag:hazard=minefield
+    hazard=quicksand: Pl:Tag:hazard=quicksand
     healthcare=dentist: Pl:Tag:healthcare=dentist
     healthcare=dialysis: Pl:Tag:healthcare=dialysis
     healthcare=dentist: Pl:Tag:healthcare=dentist
     healthcare=dialysis: Pl:Tag:healthcare=dialysis
+    healthcare=doctor: Pl:Tag:healthcare=doctor
+    healthcare=hospice: Pl:Tag:healthcare=hospice
     healthcare=laboratory: Pl:Tag:healthcare=laboratory
     healthcare=nutrition_counselling: Pl:Tag:healthcare=nutrition counselling
     healthcare=physiotherapist: Pl:Tag:healthcare=physiotherapist
     healthcare=laboratory: Pl:Tag:healthcare=laboratory
     healthcare=nutrition_counselling: Pl:Tag:healthcare=nutrition counselling
     healthcare=physiotherapist: Pl:Tag:healthcare=physiotherapist
+    healthcare=sample_collection: Pl:Tag:healthcare=sample collection
     highway=abandoned: Pl:Tag:highway=abandoned
     highway=bridleway: Pl:Tag:highway=bridleway
     highway=bus_guideway: Pl:Tag:highway=bus guideway
     highway=abandoned: Pl:Tag:highway=abandoned
     highway=bridleway: Pl:Tag:highway=bridleway
     highway=bus_guideway: Pl:Tag:highway=bus guideway
@@ -17633,6 +24270,7 @@ pl:
     historic=aircraft: Pl:Tag:historic=aircraft
     historic=archaeological_site: Pl:Tag:historic=archaeological site
     historic=battlefield: Pl:Tag:historic=battlefield
     historic=aircraft: Pl:Tag:historic=aircraft
     historic=archaeological_site: Pl:Tag:historic=archaeological site
     historic=battlefield: Pl:Tag:historic=battlefield
+    historic=castle: Pl:Tag:historic=castle
     historic=city_gate: Pl:Tag:historic=city gate
     historic=heritage: Pl:Tag:historic=heritage
     historic=memorial: Pl:Tag:historic=memorial
     historic=city_gate: Pl:Tag:historic=city gate
     historic=heritage: Pl:Tag:historic=heritage
     historic=memorial: Pl:Tag:historic=memorial
@@ -17643,6 +24281,7 @@ pl:
     historic=tree_shrine: Pl:Tag:historic=tree shrine
     historic=wayside_cross: Pl:Tag:historic=wayside cross
     historic=wayside_shrine: Pl:Tag:historic=wayside shrine
     historic=tree_shrine: Pl:Tag:historic=tree shrine
     historic=wayside_cross: Pl:Tag:historic=wayside cross
     historic=wayside_shrine: Pl:Tag:historic=wayside shrine
+    indoormark=beacon: Pl:Tag:indoormark=beacon
     industrial=aluminium_smelting: Pl:Tag:industrial=aluminium smelting
     industrial=auto_wrecker: Pl:Tag:industrial=auto wrecker
     industrial=bakery: Pl:Tag:industrial=bakery
     industrial=aluminium_smelting: Pl:Tag:industrial=aluminium smelting
     industrial=auto_wrecker: Pl:Tag:industrial=auto wrecker
     industrial=bakery: Pl:Tag:industrial=bakery
@@ -17675,6 +24314,7 @@ pl:
     information=office: Pl:Tag:information=office
     information=terminal: Pl:Tag:information=terminal
     internet_access=wlan: Pl:Tag:internet access=wlan
     information=office: Pl:Tag:information=office
     information=terminal: Pl:Tag:information=terminal
     internet_access=wlan: Pl:Tag:internet access=wlan
+    irrigation=pivot: Pl:Tag:irrigation=pivot
     junction=roundabout: Pl:Tag:junction=roundabout
     landcover=grass: Pl:Tag:landcover=grass
     landcover=trees: Pl:Tag:landcover=trees
     junction=roundabout: Pl:Tag:junction=roundabout
     landcover=grass: Pl:Tag:landcover=grass
     landcover=trees: Pl:Tag:landcover=trees
@@ -17768,6 +24408,7 @@ pl:
     leisure=soccer_golf: Pl:Tag:leisure=soccer golf
     leisure=social_club: Pl:Tag:leisure=social club
     leisure=sports_centre: Pl:Tag:leisure=sports centre
     leisure=soccer_golf: Pl:Tag:leisure=soccer golf
     leisure=social_club: Pl:Tag:leisure=social club
     leisure=sports_centre: Pl:Tag:leisure=sports centre
+    leisure=sports_hall: Pl:Tag:leisure=sports hall
     leisure=stadium: Pl:Tag:leisure=stadium
     leisure=summer_camp: Pl:Tag:leisure=summer camp
     leisure=swimming_area: Pl:Tag:leisure=swimming area
     leisure=stadium: Pl:Tag:leisure=stadium
     leisure=summer_camp: Pl:Tag:leisure=summer camp
     leisure=swimming_area: Pl:Tag:leisure=swimming area
@@ -17780,7 +24421,9 @@ pl:
     leisure=video_arcade: Pl:Tag:leisure=video arcade
     leisure=water_park: Pl:Tag:leisure=water park
     leisure=wildlife_hide: Pl:Tag:leisure=wildlife hide
     leisure=video_arcade: Pl:Tag:leisure=video arcade
     leisure=water_park: Pl:Tag:leisure=water park
     leisure=wildlife_hide: Pl:Tag:leisure=wildlife hide
+    lifeguard=tower: Pl:Tag:lifeguard=tower
     location:transition=yes: Pl:Tag:location:transition=yes
     location:transition=yes: Pl:Tag:location:transition=yes
+    lottery=yes: Pl:Tag:lottery=yes
     man_made=adit: Pl:Tag:man made=adit
     man_made=antenna: Pl:Tag:man made=antenna
     man_made=beacon: Pl:Tag:man made=beacon
     man_made=adit: Pl:Tag:man made=adit
     man_made=antenna: Pl:Tag:man made=antenna
     man_made=beacon: Pl:Tag:man made=beacon
@@ -17799,20 +24442,24 @@ pl:
     man_made=cross: Pl:Tag:man made=cross
     man_made=cutline: Pl:Tag:man made=cutline
     man_made=dovecote: Pl:Tag:man made=dovecote
     man_made=cross: Pl:Tag:man made=cross
     man_made=cutline: Pl:Tag:man made=cutline
     man_made=dovecote: Pl:Tag:man made=dovecote
+    man_made=drinking_fountain: Pl:Tag:man made=drinking fountain
     man_made=dyke: Pl:Tag:man made=dyke
     man_made=embankment: Pl:Tag:man made=embankment
     man_made=flagpole: Pl:Tag:man made=flagpole
     man_made=flare: Pl:Tag:man made=flare
     man_made=floating_storage: Pl:Tag:man made=floating storage
     man_made=dyke: Pl:Tag:man made=dyke
     man_made=embankment: Pl:Tag:man made=embankment
     man_made=flagpole: Pl:Tag:man made=flagpole
     man_made=flare: Pl:Tag:man made=flare
     man_made=floating_storage: Pl:Tag:man made=floating storage
+    man_made=funding_sign: Pl:Tag:man made=funding sign
     man_made=gasometer: Pl:Tag:man made=gasometer
     man_made=geoglyph: Pl:Tag:man made=geoglyph
     man_made=goods_conveyor: Pl:Tag:man made=goods conveyor
     man_made=graduation_tower: Pl:Tag:man made=graduation tower
     man_made=groyne: Pl:Tag:man made=groyne
     man_made=gasometer: Pl:Tag:man made=gasometer
     man_made=geoglyph: Pl:Tag:man made=geoglyph
     man_made=goods_conveyor: Pl:Tag:man made=goods conveyor
     man_made=graduation_tower: Pl:Tag:man made=graduation tower
     man_made=groyne: Pl:Tag:man made=groyne
+    man_made=heap: Pl:Tag:man made=heap
     man_made=insect_hotel: Pl:Tag:man made=insect hotel
     man_made=kiln: Pl:Tag:man made=kiln
     man_made=lighthouse: Pl:Tag:man made=lighthouse
     man_made=mast: Pl:Tag:man made=mast
     man_made=insect_hotel: Pl:Tag:man made=insect hotel
     man_made=kiln: Pl:Tag:man made=kiln
     man_made=lighthouse: Pl:Tag:man made=lighthouse
     man_made=mast: Pl:Tag:man made=mast
+    man_made=milk_churn_stand: Pl:Tag:man made=milk churn stand
     man_made=mineshaft: Pl:Tag:man made=mineshaft
     man_made=monitoring_station: Pl:Tag:man made=monitoring station
     man_made=nesting_site: Pl:Tag:man made=nesting site
     man_made=mineshaft: Pl:Tag:man made=mineshaft
     man_made=monitoring_station: Pl:Tag:man made=monitoring station
     man_made=nesting_site: Pl:Tag:man made=nesting site
@@ -17862,15 +24509,18 @@ pl:
     megalith_type=stone_ship: Pl:Tag:megalith type=stone ship
     megalith_type=tholos: Pl:Tag:megalith type=tholos
     megalith_type=well: Pl:Tag:megalith type=well
     megalith_type=stone_ship: Pl:Tag:megalith type=stone ship
     megalith_type=tholos: Pl:Tag:megalith type=tholos
     megalith_type=well: Pl:Tag:megalith type=well
+    memorial=bench: Pl:Tag:memorial=bench
     memorial=blue_plaque: Pl:Tag:memorial=blue plaque
     memorial=bust: Pl:Tag:memorial=bust
     memorial=obelisk: Pl:Tag:memorial=obelisk
     memorial=plaque: Pl:Tag:memorial=plaque
     memorial=blue_plaque: Pl:Tag:memorial=blue plaque
     memorial=bust: Pl:Tag:memorial=bust
     memorial=obelisk: Pl:Tag:memorial=obelisk
     memorial=plaque: Pl:Tag:memorial=plaque
+    memorial=sculpture: Pl:Tag:memorial=sculpture
     memorial=statue: Pl:Tag:memorial=statue
     memorial=stele: Pl:Tag:memorial=stele
     memorial=stolperstein: Pl:Tag:memorial=stolperstein
     memorial=stone: Pl:Tag:memorial=stone
     memorial=war_memorial: Pl:Tag:memorial=war memorial
     memorial=statue: Pl:Tag:memorial=statue
     memorial=stele: Pl:Tag:memorial=stele
     memorial=stolperstein: Pl:Tag:memorial=stolperstein
     memorial=stone: Pl:Tag:memorial=stone
     memorial=war_memorial: Pl:Tag:memorial=war memorial
+    message=funding: Pl:Tag:message=funding
     military=ammunition: Pl:Tag:military=ammunition
     military=barracks: Pl:Tag:military=barracks
     military=bunker: Pl:Tag:military=bunker
     military=ammunition: Pl:Tag:military=ammunition
     military=barracks: Pl:Tag:military=barracks
     military=bunker: Pl:Tag:military=bunker
@@ -17931,6 +24581,7 @@ pl:
     natural=shingle: Pl:Tag:natural=shingle
     natural=shoal: Pl:Tag:natural=shoal
     natural=shrub: Pl:Tag:natural=shrub
     natural=shingle: Pl:Tag:natural=shingle
     natural=shoal: Pl:Tag:natural=shoal
     natural=shrub: Pl:Tag:natural=shrub
+    natural=shrubbery: Pl:Tag:natural=shrubbery
     natural=sinkhole: Pl:Tag:natural=sinkhole
     natural=spring: Pl:Tag:natural=spring
     natural=stone: Pl:Tag:natural=stone
     natural=sinkhole: Pl:Tag:natural=sinkhole
     natural=spring: Pl:Tag:natural=spring
     natural=stone: Pl:Tag:natural=stone
@@ -17942,6 +24593,7 @@ pl:
     natural=wood: Pl:Tag:natural=wood
     network=lhn: Pl:Tag:network=lhn
     network=rhn: Pl:Tag:network=rhn
     natural=wood: Pl:Tag:natural=wood
     network=lhn: Pl:Tag:network=lhn
     network=rhn: Pl:Tag:network=rhn
+    noexit=yes: Pl:Tag:noexit=yes
     office=accountant: Pl:Tag:office=accountant
     office=adoption_agency: Pl:Tag:office=adoption agency
     office=advertising_agency: Pl:Tag:office=advertising agency
     office=accountant: Pl:Tag:office=accountant
     office=adoption_agency: Pl:Tag:office=adoption agency
     office=advertising_agency: Pl:Tag:office=advertising agency
@@ -17949,6 +24601,8 @@ pl:
     office=association: Pl:Tag:office=association
     office=charity: Pl:Tag:office=charity
     office=company: Pl:Tag:office=company
     office=association: Pl:Tag:office=association
     office=charity: Pl:Tag:office=charity
     office=company: Pl:Tag:office=company
+    office=courier: Pl:Tag:office=courier
+    office=diplomatic: Pl:Tag:office=diplomatic
     office=educational_institution: Pl:Tag:office=educational institution
     office=employment_agency: Pl:Tag:office=employment agency
     office=energy_supplier: Pl:Tag:office=energy supplier
     office=educational_institution: Pl:Tag:office=educational institution
     office=employment_agency: Pl:Tag:office=employment agency
     office=energy_supplier: Pl:Tag:office=energy supplier
@@ -17981,8 +24635,11 @@ pl:
     oneway=alternating: Pl:Tag:oneway=alternating
     oneway=reversible: Pl:Tag:oneway=reversible
     parking:lane:hgv=on_street: Pl:Tag:parking:lane:hgv=on street
     oneway=alternating: Pl:Tag:oneway=alternating
     oneway=reversible: Pl:Tag:oneway=reversible
     parking:lane:hgv=on_street: Pl:Tag:parking:lane:hgv=on street
+    parking=layby: Pl:Tag:parking=layby
     parking=multi-storey: Pl:Tag:parking=multi-storey
     parking=multi-storey: Pl:Tag:parking=multi-storey
+    parking=street_side: Pl:Tag:parking=street side
     parking=underground: Pl:Tag:parking=underground
     parking=underground: Pl:Tag:parking=underground
+    path=crossing: Pl:Tag:path=crossing
     place=allotments: Pl:Tag:place=allotments
     place=archipelago: Pl:Tag:place=archipelago
     place=borough: Pl:Tag:place=borough
     place=allotments: Pl:Tag:place=allotments
     place=archipelago: Pl:Tag:place=archipelago
     place=borough: Pl:Tag:place=borough
@@ -18012,6 +24669,20 @@ pl:
     place=suburb: Pl:Tag:place=suburb
     place=town: Pl:Tag:place=town
     place=village: Pl:Tag:place=village
     place=suburb: Pl:Tag:place=suburb
     place=town: Pl:Tag:place=town
     place=village: Pl:Tag:place=village
+    place_of_worship=mass_rock: Pl:Tag:place of worship=mass rock
+    playground=balancebeam: Pl:Tag:playground=balancebeam
+    playground=bridge: Pl:Tag:playground=bridge
+    playground=climbingframe: Pl:Tag:playground=climbingframe
+    playground=climbingwall: Pl:Tag:playground=climbingwall
+    playground=hopscotch: Pl:Tag:playground=hopscotch
+    playground=map: Pl:Tag:playground=map
+    playground=playhouse: Pl:Tag:playground=playhouse
+    playground=sandpit: Pl:Tag:playground=sandpit
+    playground=sledding: Pl:Tag:playground=sledding
+    playground=slide: Pl:Tag:playground=slide
+    playground=structure: Pl:Tag:playground=structure
+    playground=teenshelter: Pl:Tag:playground=teenshelter
+    playground=youth_bench: Pl:Tag:playground=youth bench
     power=cable: Pl:Tag:power=cable
     power=cable_distribution_cabinet: Pl:Tag:power=cable distribution cabinet
     power=catenary_mast: Pl:Tag:power=catenary mast
     power=cable: Pl:Tag:power=cable
     power=cable_distribution_cabinet: Pl:Tag:power=cable distribution cabinet
     power=catenary_mast: Pl:Tag:power=catenary mast
@@ -18069,6 +24740,7 @@ pl:
     railway=water_crane: Pl:Tag:railway=water crane
     railway=water_tower: Pl:Tag:railway=water tower
     railway=yard: Pl:Tag:railway=yard
     railway=water_crane: Pl:Tag:railway=water crane
     railway=water_tower: Pl:Tag:railway=water tower
     railway=yard: Pl:Tag:railway=yard
+    refrigerated=yes: Pl:Tag:refrigerated=yes
     religion=christian: Pl:Tag:religion=christian
     religion=jewish: Pl:Tag:religion=jewish
     religion=muslim: Pl:Tag:religion=muslim
     religion=christian: Pl:Tag:religion=christian
     religion=jewish: Pl:Tag:religion=jewish
     religion=muslim: Pl:Tag:religion=muslim
@@ -18077,10 +24749,15 @@ pl:
     residential=rural: Pl:Tag:residential=rural
     residential=university: Pl:Tag:residential=university
     residential=urban: Pl:Tag:residential=urban
     residential=rural: Pl:Tag:residential=rural
     residential=university: Pl:Tag:residential=university
     residential=urban: Pl:Tag:residential=urban
+    route=bus: Pl:Tag:route=bus
     route=emergency_access: Pl:Tag:route=emergency access
     route=hiking: Pl:Tag:route=hiking
     route=horse: Pl:Tag:route=horse
     route=running: Pl:Tag:route=running
     route=emergency_access: Pl:Tag:route=emergency access
     route=hiking: Pl:Tag:route=hiking
     route=horse: Pl:Tag:route=horse
     route=running: Pl:Tag:route=running
+    route=tram: Pl:Tag:route=tram
+    route=worship: Pl:Tag:route=worship
+    seamark:type=marine_farm: Pl:Tag:seamark:type=marine farm
+    segregated=no: Pl:Tag:segregated=no
     service=alley: Pl:Tag:service=alley
     service=drive-through: Pl:Tag:service=drive-through
     service=driveway: Pl:Tag:service=driveway
     service=alley: Pl:Tag:service=alley
     service=drive-through: Pl:Tag:service=drive-through
     service=driveway: Pl:Tag:service=driveway
@@ -18152,6 +24829,7 @@ pl:
     shop=fishmonger: Pl:Tag:shop=fishmonger
     shop=flooring: Pl:Tag:shop=flooring
     shop=florist: Pl:Tag:shop=florist
     shop=fishmonger: Pl:Tag:shop=fishmonger
     shop=flooring: Pl:Tag:shop=flooring
     shop=florist: Pl:Tag:shop=florist
+    shop=food: Pl:Tag:shop=food
     shop=frame: Pl:Tag:shop=frame
     shop=frozen_food: Pl:Tag:shop=frozen food
     shop=fuel: Pl:Tag:shop=fuel
     shop=frame: Pl:Tag:shop=frame
     shop=frozen_food: Pl:Tag:shop=frozen food
     shop=fuel: Pl:Tag:shop=fuel
@@ -18164,6 +24842,7 @@ pl:
     shop=gift: Pl:Tag:shop=gift
     shop=golf: Pl:Tag:shop=golf
     shop=greengrocer: Pl:Tag:shop=greengrocer
     shop=gift: Pl:Tag:shop=gift
     shop=golf: Pl:Tag:shop=golf
     shop=greengrocer: Pl:Tag:shop=greengrocer
+    shop=grocery: Pl:Tag:shop=grocery
     shop=haberdashery: Pl:Tag:shop=haberdashery
     shop=hairdresser: Pl:Tag:shop=hairdresser
     shop=hairdresser_supply: Pl:Tag:shop=hairdresser supply
     shop=haberdashery: Pl:Tag:shop=haberdashery
     shop=hairdresser: Pl:Tag:shop=hairdresser
     shop=hairdresser_supply: Pl:Tag:shop=hairdresser supply
@@ -18173,6 +24852,7 @@ pl:
     shop=herbalist: Pl:Tag:shop=herbalist
     shop=hifi: Pl:Tag:shop=hifi
     shop=honey: Pl:Tag:shop=honey
     shop=herbalist: Pl:Tag:shop=herbalist
     shop=hifi: Pl:Tag:shop=hifi
     shop=honey: Pl:Tag:shop=honey
+    shop=hookah: Pl:Tag:shop=hookah
     shop=household_linen: Pl:Tag:shop=household linen
     shop=houseware: Pl:Tag:shop=houseware
     shop=hunting: Pl:Tag:shop=hunting
     shop=household_linen: Pl:Tag:shop=household linen
     shop=houseware: Pl:Tag:shop=houseware
     shop=hunting: Pl:Tag:shop=hunting
@@ -18201,6 +24881,7 @@ pl:
     shop=musical_instrument: Pl:Tag:shop=musical instrument
     shop=newsagent: Pl:Tag:shop=newsagent
     shop=nutrition_supplements: Pl:Tag:shop=nutrition supplements
     shop=musical_instrument: Pl:Tag:shop=musical instrument
     shop=newsagent: Pl:Tag:shop=newsagent
     shop=nutrition_supplements: Pl:Tag:shop=nutrition supplements
+    shop=nuts: Pl:Tag:shop=nuts
     shop=optician: Pl:Tag:shop=optician
     shop=outdoor: Pl:Tag:shop=outdoor
     shop=outpost: Pl:Tag:shop=outpost
     shop=optician: Pl:Tag:shop=optician
     shop=outdoor: Pl:Tag:shop=outdoor
     shop=outpost: Pl:Tag:shop=outpost
@@ -18212,15 +24893,20 @@ pl:
     shop=pet: Pl:Tag:shop=pet
     shop=pet_grooming: Pl:Tag:shop=pet grooming
     shop=photo: Pl:Tag:shop=photo
     shop=pet: Pl:Tag:shop=pet
     shop=pet_grooming: Pl:Tag:shop=pet grooming
     shop=photo: Pl:Tag:shop=photo
+    shop=photo_studio: Pl:Tag:shop=photo studio
     shop=pottery: Pl:Tag:shop=pottery
     shop=pottery: Pl:Tag:shop=pottery
+    shop=power_tools: Pl:Tag:shop=power tools
     shop=printer_ink: Pl:Tag:shop=printer ink
     shop=printer_ink: Pl:Tag:shop=printer ink
+    shop=psychic: Pl:Tag:shop=psychic
     shop=pyrotechnics: Pl:Tag:shop=pyrotechnics
     shop=radiotechnics: Pl:Tag:shop=radiotechnics
     shop=religion: Pl:Tag:shop=religion
     shop=rental: Pl:Tag:shop=rental
     shop=pyrotechnics: Pl:Tag:shop=pyrotechnics
     shop=radiotechnics: Pl:Tag:shop=radiotechnics
     shop=religion: Pl:Tag:shop=religion
     shop=rental: Pl:Tag:shop=rental
+    shop=rice: Pl:Tag:shop=rice
     shop=scuba_diving: Pl:Tag:shop=scuba diving
     shop=seafood: Pl:Tag:shop=seafood
     shop=second_hand: Pl:Tag:shop=second hand
     shop=scuba_diving: Pl:Tag:shop=scuba diving
     shop=seafood: Pl:Tag:shop=seafood
     shop=second_hand: Pl:Tag:shop=second hand
+    shop=security: Pl:Tag:shop=security
     shop=sewing: Pl:Tag:shop=sewing
     shop=shoe_repair: Pl:Tag:shop=shoe repair
     shop=shoes: Pl:Tag:shop=shoes
     shop=sewing: Pl:Tag:shop=sewing
     shop=shoe_repair: Pl:Tag:shop=shoe repair
     shop=shoes: Pl:Tag:shop=shoes
@@ -18235,14 +24921,18 @@ pl:
     shop=tailor: Pl:Tag:shop=tailor
     shop=tattoo: Pl:Tag:shop=tattoo
     shop=tea: Pl:Tag:shop=tea
     shop=tailor: Pl:Tag:shop=tailor
     shop=tattoo: Pl:Tag:shop=tattoo
     shop=tea: Pl:Tag:shop=tea
+    shop=telecommunication: Pl:Tag:shop=telecommunication
     shop=ticket: Pl:Tag:shop=ticket
     shop=tiles: Pl:Tag:shop=tiles
     shop=tobacco: Pl:Tag:shop=tobacco
     shop=tool_hire: Pl:Tag:shop=tool hire
     shop=toys: Pl:Tag:shop=toys
     shop=trade: Pl:Tag:shop=trade
     shop=ticket: Pl:Tag:shop=ticket
     shop=tiles: Pl:Tag:shop=tiles
     shop=tobacco: Pl:Tag:shop=tobacco
     shop=tool_hire: Pl:Tag:shop=tool hire
     shop=toys: Pl:Tag:shop=toys
     shop=trade: Pl:Tag:shop=trade
+    shop=trailer: Pl:Tag:shop=trailer
     shop=travel_agency: Pl:Tag:shop=travel agency
     shop=trophy: Pl:Tag:shop=trophy
     shop=travel_agency: Pl:Tag:shop=travel agency
     shop=trophy: Pl:Tag:shop=trophy
+    shop=truck: Pl:Tag:shop=truck
+    shop=truck_repair: Pl:Tag:shop=truck repair
     shop=tyres: Pl:Tag:shop=tyres
     shop=vacant: Pl:Tag:shop=vacant
     shop=vacuum_cleaner: Pl:Tag:shop=vacuum cleaner
     shop=tyres: Pl:Tag:shop=tyres
     shop=vacant: Pl:Tag:shop=vacant
     shop=vacuum_cleaner: Pl:Tag:shop=vacuum cleaner
@@ -18272,11 +24962,18 @@ pl:
     sport=9pin: Pl:Tag:sport=9pin
     sport=aikido: Pl:Tag:sport=aikido
     sport=american_football: Pl:Tag:sport=american football
     sport=9pin: Pl:Tag:sport=9pin
     sport=aikido: Pl:Tag:sport=aikido
     sport=american_football: Pl:Tag:sport=american football
+    sport=calisthenics: Pl:Tag:sport=calisthenics
+    sport=canoe: Pl:Tag:sport=canoe
     sport=climbing: Pl:Tag:sport=climbing
     sport=equestrian: Pl:Tag:sport=equestrian
     sport=ice_hockey: Pl:Tag:sport=ice hockey
     sport=soccer: Pl:Tag:sport=soccer
     sport=climbing: Pl:Tag:sport=climbing
     sport=equestrian: Pl:Tag:sport=equestrian
     sport=ice_hockey: Pl:Tag:sport=ice hockey
     sport=soccer: Pl:Tag:sport=soccer
+    sport=table_soccer: Pl:Tag:sport=table soccer
+    sport=teqball: Pl:Tag:sport=teqball
+    sport=weightlifting: Pl:Tag:sport=weightlifting
+    surface=asphalt: Pl:Tag:surface=asphalt
     surface=concrete:lanes: Pl:Tag:surface=concrete:lanes
     surface=concrete:lanes: Pl:Tag:surface=concrete:lanes
+    tomb=columbarium: Pl:Tag:tomb=columbarium
     tourism=alpine_hut: Pl:Tag:tourism=alpine hut
     tourism=apartment: Pl:Tag:tourism=apartment
     tourism=aquarium: Pl:Tag:tourism=aquarium
     tourism=alpine_hut: Pl:Tag:tourism=alpine hut
     tourism=apartment: Pl:Tag:tourism=apartment
     tourism=aquarium: Pl:Tag:tourism=aquarium
@@ -18301,6 +24998,8 @@ pl:
     tourism=wilderness_hut: Pl:Tag:tourism=wilderness hut
     tourism=wine_cellar: Pl:Tag:tourism=wine cellar
     tourism=zoo: Pl:Tag:tourism=zoo
     tourism=wilderness_hut: Pl:Tag:tourism=wilderness hut
     tourism=wine_cellar: Pl:Tag:tourism=wine cellar
     tourism=zoo: Pl:Tag:tourism=zoo
+    tower:construction=dish: Pl:Tag:tower:construction=dish
+    tower:construction=lattice: Pl:Tag:tower:construction=lattice
     tower:type=bell_tower: Pl:Tag:tower:type=bell tower
     tower:type=bridge: Pl:Tag:tower:type=bridge
     tower:type=communication: Pl:Tag:tower:type=communication
     tower:type=bell_tower: Pl:Tag:tower:type=bell tower
     tower:type=bridge: Pl:Tag:tower:type=bridge
     tower:type=communication: Pl:Tag:tower:type=communication
@@ -18312,16 +25011,19 @@ pl:
     tower:type=observation: Pl:Tag:tower:type=observation
     traffic_calming=island: Pl:Tag:traffic calming=island
     traffic_calming=table: Pl:Tag:traffic calming=table
     tower:type=observation: Pl:Tag:tower:type=observation
     traffic_calming=island: Pl:Tag:traffic calming=island
     traffic_calming=table: Pl:Tag:traffic calming=table
+    traffic_sign=PL:D-42: Pl:Tag:traffic sign=PL:D-42
+    traffic_sign=PL:D-43: Pl:Tag:traffic sign=PL:D-43
     traffic_sign=city_limit: Pl:Tag:traffic sign=city limit
     tunnel=culvert: Pl:Tag:tunnel=culvert
     type=public_transport: Pl:Tag:type=public transport
     traffic_sign=city_limit: Pl:Tag:traffic sign=city limit
     tunnel=culvert: Pl:Tag:tunnel=culvert
     type=public_transport: Pl:Tag:type=public transport
-    vending: Pl:Tag:vending
     vending=admission_tickets: Pl:Tag:vending=admission tickets
     vending=bottle_return: Pl:Tag:vending=bottle return
     vending=candles: Pl:Tag:vending=candles
     vending=cigarettes: Pl:Tag:vending=cigarettes
     vending=drinks: Pl:Tag:vending=drinks
     vending=admission_tickets: Pl:Tag:vending=admission tickets
     vending=bottle_return: Pl:Tag:vending=bottle return
     vending=candles: Pl:Tag:vending=candles
     vending=cigarettes: Pl:Tag:vending=cigarettes
     vending=drinks: Pl:Tag:vending=drinks
+    vending=e-cigarettes: Pl:Tag:vending=e-cigarettes
     vending=feminine_hygiene: Pl:Tag:vending=feminine hygiene
     vending=feminine_hygiene: Pl:Tag:vending=feminine hygiene
+    vending=flowers: Pl:Tag:vending=flowers
     vending=food: Pl:Tag:vending=food
     vending=fuel: Pl:Tag:vending=fuel
     vending=milk: Pl:Tag:vending=milk
     vending=food: Pl:Tag:vending=food
     vending=fuel: Pl:Tag:vending=fuel
     vending=milk: Pl:Tag:vending=milk
@@ -18330,7 +25032,9 @@ pl:
       in
     vending=parking_tickets: Pl:Tag:vending=parking tickets
     vending=public_transport_tickets: Pl:Tag:vending=public transport tickets
       in
     vending=parking_tickets: Pl:Tag:vending=parking tickets
     vending=public_transport_tickets: Pl:Tag:vending=public transport tickets
+    vending=raw_milk: Pl:Tag:vending=raw milk
     vending=sweets: Pl:Tag:vending=sweets
     vending=sweets: Pl:Tag:vending=sweets
+    vending=water: Pl:Tag:vending=water
     wall=dry_stone: Pl:Tag:wall=dry stone
     wall=no: Pl:Tag:wall=no
     wall=noise_barrier: Pl:Tag:wall=noise barrier
     wall=dry_stone: Pl:Tag:wall=dry stone
     wall=no: Pl:Tag:wall=no
     wall=noise_barrier: Pl:Tag:wall=noise barrier
@@ -18387,6 +25091,7 @@ pl:
     wood=deciduous: Pl:Tag:wood=deciduous
     wood=evergreen: Pl:Tag:wood=evergreen
     wood=mixed: Pl:Tag:wood=mixed
     wood=deciduous: Pl:Tag:wood=deciduous
     wood=evergreen: Pl:Tag:wood=evergreen
     wood=mixed: Pl:Tag:wood=mixed
+    zone=parking: Pl:Tag:zone=parking
     zoo=aviary: Pl:Tag:zoo=aviary
     zoo=birds: Pl:Tag:zoo=birds
     zoo=butterfly: Pl:Tag:zoo=butterfly
     zoo=aviary: Pl:Tag:zoo=aviary
     zoo=birds: Pl:Tag:zoo=birds
     zoo=butterfly: Pl:Tag:zoo=butterfly
@@ -18394,6 +25099,24 @@ pl:
     zoo=falconry: Pl:Tag:zoo=falconry
     zoo=petting_zoo: Pl:Tag:zoo=petting zoo
     zoo=reptile: Pl:Tag:zoo=reptile
     zoo=falconry: Pl:Tag:zoo=falconry
     zoo=petting_zoo: Pl:Tag:zoo=petting zoo
     zoo=reptile: Pl:Tag:zoo=reptile
+pnb:
+  key:
+    building: Pnb:Key:building
+    name:pnb: Pnb:Key:name:pnb
+proposal:
+  key:
+    gtfs:feed: Proposal:Key:gtfs:feed
+    gtfs:name: Proposal:Key:gtfs:name
+    gtfs:release_date: Proposal:Key:gtfs:release date
+    gtfs:route_id: Proposal:Key:gtfs:route id
+    gtfs:shape_id: Proposal:Key:gtfs:shape id
+    gtfs:trip_id: Proposal:Key:gtfs:trip id
+    gtfs:trip_id:sample: Proposal:Key:gtfs:trip id:sample
+    logistics: Proposal:Key:logistics
+    operator:guid: Proposal:Key:operator:guid
+  tag:
+    boundary=economic: Proposal:Tag:boundary=economic
+    landuse=breeding: Proposal:Tag:landuse=breeding
 pt:
   key:
     IBGE:CD_ADMINIS: Pt:Key:IBGE:CD ADMINIS
 pt:
   key:
     IBGE:CD_ADMINIS: Pt:Key:IBGE:CD ADMINIS
@@ -18403,6 +25126,7 @@ pt:
     abutters: Pt:Key:abutters
     access: Pt:Key:access
     addr: Pt:Key:addr
     abutters: Pt:Key:abutters
     access: Pt:Key:access
     addr: Pt:Key:addr
+    addr:*: Pt:Key:addr:*
     addr:housenumber: Pt:Key:addr:housenumber
     addr:place: Pt:Key:addr:place
     admin_level: Pt:Key:admin level
     addr:housenumber: Pt:Key:addr:housenumber
     addr:place: Pt:Key:addr:place
     admin_level: Pt:Key:admin level
@@ -18414,7 +25138,6 @@ pt:
     beds: Pt:Key:beds
     bicycle: Pt:Key:bicycle
     bicycle_parking: Pt:Key:bicycle parking
     beds: Pt:Key:beds
     bicycle: Pt:Key:bicycle
     bicycle_parking: Pt:Key:bicycle parking
-    bicycle_road: Pt:Key:bicycle road
     boat: Pt:Key:boat
     border_type: Pt:Key:border type
     boundary: Pt:Key:boundary
     boat: Pt:Key:boat
     border_type: Pt:Key:border type
     boundary: Pt:Key:boundary
@@ -18429,8 +25152,10 @@ pt:
     cables: Pt:Key:cables
     capacity: Pt:Key:capacity
     charge: Pt:Key:charge
     cables: Pt:Key:cables
     capacity: Pt:Key:capacity
     charge: Pt:Key:charge
+    communication:mobile_phone: Pt:Key:communication:mobile phone
     construction: Pt:Key:construction
     contact: Pt:Key:contact
     construction: Pt:Key:construction
     contact: Pt:Key:contact
+    contact:*: Pt:Key:contact:*
     country: Pt:Key:country
     craft: Pt:Key:craft
     created_by: Pt:Key:created by
     country: Pt:Key:country
     craft: Pt:Key:craft
     created_by: Pt:Key:created by
@@ -18442,6 +25167,7 @@ pt:
     description: Pt:Key:description
     diet:*: Pt:Key:diet:*
     diet:vegan: Pt:Key:diet:vegan
     description: Pt:Key:description
     diet:*: Pt:Key:diet:*
     diet:vegan: Pt:Key:diet:vegan
+    direction: Pt:Key:direction
     dispensing: Pt:Key:dispensing
     display: Pt:Key:display
     drinking_water: Pt:Key:drinking water
     dispensing: Pt:Key:dispensing
     display: Pt:Key:display
     drinking_water: Pt:Key:drinking water
@@ -18451,6 +25177,8 @@ pt:
     electrified: Pt:Key:electrified
     embankment: Pt:Key:embankment
     emergency: Pt:Key:emergency
     electrified: Pt:Key:electrified
     embankment: Pt:Key:embankment
     emergency: Pt:Key:emergency
+    fee: Pt:Key:fee
+    fee:conditional: Pt:Key:fee:conditional
     fence_type: Pt:Key:fence type
     fenced: Pt:Key:fenced
     ferry: Pt:Key:ferry
     fence_type: Pt:Key:fence type
     fenced: Pt:Key:fenced
     ferry: Pt:Key:ferry
@@ -18476,10 +25204,12 @@ pt:
     ice_road: Pt:Key:ice road
     incline: Pt:Key:incline
     industrial: Pt:Key:industrial
     ice_road: Pt:Key:ice road
     incline: Pt:Key:incline
     industrial: Pt:Key:industrial
+    inscription: Pt:Key:inscription
     intermittent: Pt:Key:intermittent
     internet_access: Pt:Key:internet access
     internet_access:ssid: Pt:Key:internet access:ssid
     is_in: Pt:Key:is in
     intermittent: Pt:Key:intermittent
     internet_access: Pt:Key:internet access
     internet_access:ssid: Pt:Key:internet access:ssid
     is_in: Pt:Key:is in
+    isced:level: Pt:Key:isced:level
     jetski:sales: Pt:Key:jetski:sales
     junction: Pt:Key:junction
     landuse: Pt:Key:landuse
     jetski:sales: Pt:Key:jetski:sales
     junction: Pt:Key:junction
     landuse: Pt:Key:landuse
@@ -18491,6 +25221,7 @@ pt:
     lit: Pt:Key:lit
     lock: Pt:Key:lock
     man_made: Pt:Key:man made
     lit: Pt:Key:lit
     lock: Pt:Key:lock
     man_made: Pt:Key:man made
+    manhole: Pt:Key:manhole
     material: Pt:Key:material
     maxdraught: Pt:Key:maxdraught
     maxheight: Pt:Key:maxheight
     material: Pt:Key:material
     maxdraught: Pt:Key:maxdraught
     maxheight: Pt:Key:maxheight
@@ -18513,8 +25244,7 @@ pt:
     mtb: Pt:Key:mtb
     name: Pt:Key:name
     natural: Pt:Key:natural
     mtb: Pt:Key:mtb
     name: Pt:Key:name
     natural: Pt:Key:natural
-    noexit: Pt:Key:noexit
-    noname: Pt:Key:noname
+    nohousenumber: Pt:Key:nohousenumber
     note: Pt:Key:note
     office: Pt:Key:office
     oneway: Pt:Key:oneway
     note: Pt:Key:note
     office: Pt:Key:office
     oneway: Pt:Key:oneway
@@ -18526,10 +25256,12 @@ pt:
     passing_places: Pt:Key:passing places
     place: Pt:Key:place
     placement: Pt:Key:placement
     passing_places: Pt:Key:passing places
     place: Pt:Key:place
     placement: Pt:Key:placement
+    pmfsefin:idedif: Pt:Key:pmfsefin:idedif
     police: Pt:Key:police
     population: Pt:Key:population
     postal_code: Pt:Key:postal code
     power: Pt:Key:power
     police: Pt:Key:police
     population: Pt:Key:population
     postal_code: Pt:Key:postal code
     power: Pt:Key:power
+    priority: Pt:Key:priority
     product: Pt:Key:product
     psv: Pt:Key:psv
     public_transport: Pt:Key:public transport
     product: Pt:Key:product
     psv: Pt:Key:psv
     public_transport: Pt:Key:public transport
@@ -18537,14 +25269,18 @@ pt:
     railway: Pt:Key:railway
     recording: Pt:Key:recording
     ref: Pt:Key:ref
     railway: Pt:Key:railway
     recording: Pt:Key:recording
     ref: Pt:Key:ref
+    ref:CNES: Pt:Key:ref:CNES
+    ref:INEP: Pt:Key:ref:INEP
     ref:bag: Pt:Key:ref:bag
     ref:vatin: Pt:Key:ref:vatin
     religion: Pt:Key:religion
     ref:bag: Pt:Key:ref:bag
     ref:vatin: Pt:Key:ref:vatin
     religion: Pt:Key:religion
+    residential: Pt:Key:residential
     roof:material: Pt:Key:roof:material
     rooms: Pt:Key:rooms
     route: Pt:Key:route
     sac_scale: Pt:Key:sac scale
     seamark: Pt:Key:seamark
     roof:material: Pt:Key:roof:material
     rooms: Pt:Key:rooms
     route: Pt:Key:route
     sac_scale: Pt:Key:sac scale
     seamark: Pt:Key:seamark
+    seamark:*: Pt:Key:seamark:*
     seasonal: Pt:Key:seasonal
     second_hand: Pt:Key:second hand
     segregated: Pt:Key:segregated
     seasonal: Pt:Key:seasonal
     second_hand: Pt:Key:second hand
     segregated: Pt:Key:segregated
@@ -18566,9 +25302,12 @@ pt:
     tactile_paving: Pt:Key:tactile paving
     takeaway: Pt:Key:takeaway
     tiger: Pt:Key:tiger
     tactile_paving: Pt:Key:tactile paving
     takeaway: Pt:Key:takeaway
     tiger: Pt:Key:tiger
+    tiger:*: Pt:Key:tiger:*
+    toll:hgv: Pt:Key:toll:hgv
     tourism: Pt:Key:tourism
     tracktype: Pt:Key:tracktype
     traffic_calming: Pt:Key:traffic calming
     tourism: Pt:Key:tourism
     tracktype: Pt:Key:tracktype
     traffic_calming: Pt:Key:traffic calming
+    traffic_sign:direction: Pt:Key:traffic sign:direction
     traffic_signals: Pt:Key:traffic signals
     trail_visibility: Pt:Key:trail visibility
     tunnel: Pt:Key:tunnel
     traffic_signals: Pt:Key:traffic signals
     trail_visibility: Pt:Key:trail visibility
     tunnel: Pt:Key:tunnel
@@ -18579,6 +25318,7 @@ pt:
     waterway: Pt:Key:waterway
     wetland: Pt:Key:wetland
     wheelchair: Pt:Key:wheelchair
     waterway: Pt:Key:waterway
     wetland: Pt:Key:wetland
     wheelchair: Pt:Key:wheelchair
+    wiki:symbol: Pt:Key:wiki:symbol
     wikidata: Pt:Key:wikidata
     wikipedia: Pt:Key:wikipedia
     winter_road: Pt:Key:winter road
     wikidata: Pt:Key:wikidata
     wikipedia: Pt:Key:wikipedia
     winter_road: Pt:Key:winter road
@@ -18614,7 +25354,6 @@ pt:
     aeroway=windsock: Pt:Tag:aeroway=windsock
     amenity=animal_boarding: Pt:Tag:amenity=animal boarding
     amenity=animal_shelter: Pt:Tag:amenity=animal shelter
     aeroway=windsock: Pt:Tag:aeroway=windsock
     amenity=animal_boarding: Pt:Tag:amenity=animal boarding
     amenity=animal_shelter: Pt:Tag:amenity=animal shelter
-    amenity=architect_office: Pt:Tag:amenity=architect office
     amenity=archive: Pt:Tag:amenity=archive
     amenity=arts_centre: Pt:Tag:amenity=arts centre
     amenity=atm: Pt:Tag:amenity=atm
     amenity=archive: Pt:Tag:amenity=archive
     amenity=arts_centre: Pt:Tag:amenity=arts centre
     amenity=atm: Pt:Tag:amenity=atm
@@ -18753,11 +25492,13 @@ pt:
     barrier=retaining_wall: Pt:Tag:barrier=retaining wall
     barrier=toll_booth: Pt:Tag:barrier=toll booth
     barrier=wall: Pt:Tag:barrier=wall
     barrier=retaining_wall: Pt:Tag:barrier=retaining wall
     barrier=toll_booth: Pt:Tag:barrier=toll booth
     barrier=wall: Pt:Tag:barrier=wall
+    bicycle_road=yes: Pt:Tag:bicycle road=yes
     boundary=administrative: Pt:Tag:boundary=administrative
     boundary=civil: Pt:Tag:boundary=civil
     boundary=maritime: Pt:Tag:boundary=maritime
     boundary=national_park: Pt:Tag:boundary=national park
     boundary=political: Pt:Tag:boundary=political
     boundary=administrative: Pt:Tag:boundary=administrative
     boundary=civil: Pt:Tag:boundary=civil
     boundary=maritime: Pt:Tag:boundary=maritime
     boundary=national_park: Pt:Tag:boundary=national park
     boundary=political: Pt:Tag:boundary=political
+    boundary=postal_code: Pt:Tag:boundary=postal code
     boundary=protected_area: Pt:Tag:boundary=protected area
     bridge=boardwalk: Pt:Tag:bridge=boardwalk
     bridge=viaduct: Pt:Tag:bridge=viaduct
     boundary=protected_area: Pt:Tag:boundary=protected area
     bridge=boardwalk: Pt:Tag:bridge=boardwalk
     bridge=viaduct: Pt:Tag:bridge=viaduct
@@ -18765,6 +25506,8 @@ pt:
     building=chapel: Pt:Tag:building=chapel
     building=church: Pt:Tag:building=church
     building=commercial: Pt:Tag:building=commercial
     building=chapel: Pt:Tag:building=chapel
     building=church: Pt:Tag:building=church
     building=commercial: Pt:Tag:building=commercial
+    building=conservatory: Pt:Tag:building=conservatory
+    building=guardhouse: Pt:Tag:building=guardhouse
     building=house: Pt:Tag:building=house
     building=residential: Pt:Tag:building=residential
     building=roof: Pt:Tag:building=roof
     building=house: Pt:Tag:building=house
     building=residential: Pt:Tag:building=residential
     building=roof: Pt:Tag:building=roof
@@ -18773,6 +25516,7 @@ pt:
     building=shed: Pt:Tag:building=shed
     building=university: Pt:Tag:building=university
     building=yes: Pt:Tag:building=yes
     building=shed: Pt:Tag:building=shed
     building=university: Pt:Tag:building=university
     building=yes: Pt:Tag:building=yes
+    castle_type=stately: Pt:Tag:castle type=stately
     craft=agricultural_engines: Pt:Tag:craft=agricultural engines
     craft=atelier: Pt:Tag:craft=atelier
     craft=basket_maker: Pt:Tag:craft=basket maker
     craft=agricultural_engines: Pt:Tag:craft=agricultural engines
     craft=atelier: Pt:Tag:craft=atelier
     craft=basket_maker: Pt:Tag:craft=basket maker
@@ -18832,17 +25576,23 @@ pt:
     emergency=phone: Pt:Tag:emergency=phone
     emergency=siren: Pt:Tag:emergency=siren
     footway=crossing: Pt:Tag:footway=crossing
     emergency=phone: Pt:Tag:emergency=phone
     emergency=siren: Pt:Tag:emergency=siren
     footway=crossing: Pt:Tag:footway=crossing
+    generator:source=solar: Pt:Tag:generator:source=solar
     geological=palaeontological_site: Pt:Tag:geological=palaeontological site
     government=cadaster: Pt:Tag:government=cadaster
     healthcare=blood_donation: Pt:Tag:healthcare=blood donation
     geological=palaeontological_site: Pt:Tag:geological=palaeontological site
     government=cadaster: Pt:Tag:government=cadaster
     healthcare=blood_donation: Pt:Tag:healthcare=blood donation
+    healthcare=doctor: Pt:Tag:healthcare=doctor
+    healthcare=psychotherapist: Pt:Tag:healthcare=psychotherapist
+    healthcare=vaccination_centre: Pt:Tag:healthcare=vaccination centre
     highway=bridleway: Pt:Tag:highway=bridleway
     highway=bus_guideway: Pt:Tag:highway=bus guideway
     highway=bus_stop: Pt:Tag:highway=bus stop
     highway=bridleway: Pt:Tag:highway=bridleway
     highway=bus_guideway: Pt:Tag:highway=bus guideway
     highway=bus_stop: Pt:Tag:highway=bus stop
+    highway=busway: Pt:Tag:highway=busway
     highway=corridor: Pt:Tag:highway=corridor
     highway=crossing: Pt:Tag:highway=crossing
     highway=cycleway: Pt:Tag:highway=cycleway
     highway=elevator: Pt:Tag:highway=elevator
     highway=emergency_access_point: Pt:Tag:highway=emergency access point
     highway=corridor: Pt:Tag:highway=corridor
     highway=crossing: Pt:Tag:highway=crossing
     highway=cycleway: Pt:Tag:highway=cycleway
     highway=elevator: Pt:Tag:highway=elevator
     highway=emergency_access_point: Pt:Tag:highway=emergency access point
+    highway=escape: Pt:Tag:highway=escape
     highway=footway: Pt:Tag:highway=footway
     highway=ford: Pt:Tag:highway=ford
     highway=give_way: Pt:Tag:highway=give way
     highway=footway: Pt:Tag:highway=footway
     highway=ford: Pt:Tag:highway=ford
     highway=give_way: Pt:Tag:highway=give way
@@ -18893,12 +25643,14 @@ pt:
     historic=wayside_cross: Pt:Tag:historic=wayside cross
     historic=wayside_shrine: Pt:Tag:historic=wayside shrine
     historic=wreck: Pt:Tag:historic=wreck
     historic=wayside_cross: Pt:Tag:historic=wayside cross
     historic=wayside_shrine: Pt:Tag:historic=wayside shrine
     historic=wreck: Pt:Tag:historic=wreck
+    industrial=slaughterhouse: Pt:Tag:industrial=slaughterhouse
     junction=roundabout: Pt:Tag:junction=roundabout
     landuse=allotments: Pt:Tag:landuse=allotments
     landuse=basin: Pt:Tag:landuse=basin
     landuse=brownfield: Pt:Tag:landuse=brownfield
     landuse=cemetery: Pt:Tag:landuse=cemetery
     landuse=commercial: Pt:Tag:landuse=commercial
     junction=roundabout: Pt:Tag:junction=roundabout
     landuse=allotments: Pt:Tag:landuse=allotments
     landuse=basin: Pt:Tag:landuse=basin
     landuse=brownfield: Pt:Tag:landuse=brownfield
     landuse=cemetery: Pt:Tag:landuse=cemetery
     landuse=commercial: Pt:Tag:landuse=commercial
+    landuse=education: Pt:Tag:landuse=education
     landuse=farm: Pt:Tag:landuse=farm
     landuse=farmyard: Pt:Tag:landuse=farmyard
     landuse=forest: Pt:Tag:landuse=forest
     landuse=farm: Pt:Tag:landuse=farm
     landuse=farmyard: Pt:Tag:landuse=farmyard
     landuse=forest: Pt:Tag:landuse=forest
@@ -18939,9 +25691,11 @@ pt:
     leisure=slipway: Pt:Tag:leisure=slipway
     leisure=sports_centre: Pt:Tag:leisure=sports centre
     leisure=stadium: Pt:Tag:leisure=stadium
     leisure=slipway: Pt:Tag:leisure=slipway
     leisure=sports_centre: Pt:Tag:leisure=sports centre
     leisure=stadium: Pt:Tag:leisure=stadium
+    leisure=swimming_area: Pt:Tag:leisure=swimming area
     leisure=swimming_pool: Pt:Tag:leisure=swimming pool
     leisure=track: Pt:Tag:leisure=track
     leisure=water_park: Pt:Tag:leisure=water park
     leisure=swimming_pool: Pt:Tag:leisure=swimming pool
     leisure=track: Pt:Tag:leisure=track
     leisure=water_park: Pt:Tag:leisure=water park
+    lottery=yes: Pt:Tag:lottery=yes
     man_made=adit: Pt:Tag:man made=adit
     man_made=antenna: Pt:Tag:man made=antenna
     man_made=beacon: Pt:Tag:man made=beacon
     man_made=adit: Pt:Tag:man made=adit
     man_made=antenna: Pt:Tag:man made=antenna
     man_made=beacon: Pt:Tag:man made=beacon
@@ -18975,6 +25729,7 @@ pt:
     man_made=watermill: Pt:Tag:man made=watermill
     man_made=windmill: Pt:Tag:man made=windmill
     man_made=works: Pt:Tag:man made=works
     man_made=watermill: Pt:Tag:man made=watermill
     man_made=windmill: Pt:Tag:man made=windmill
     man_made=works: Pt:Tag:man made=works
+    manhole=drain: Pt:Tag:manhole=drain
     memorial=bust: Pt:Tag:memorial=bust
     military=airfield: Pt:Tag:military=airfield
     military=barracks: Pt:Tag:military=barracks
     memorial=bust: Pt:Tag:memorial=bust
     military=airfield: Pt:Tag:military=airfield
     military=barracks: Pt:Tag:military=barracks
@@ -19009,9 +25764,12 @@ pt:
     natural=wetland: Pt:Tag:natural=wetland
     natural=wood: Pt:Tag:natural=wood
     noexit=no: Pt:Tag:noexit=no
     natural=wetland: Pt:Tag:natural=wetland
     natural=wood: Pt:Tag:natural=wood
     noexit=no: Pt:Tag:noexit=no
+    noexit=yes: Pt:Tag:noexit=yes
+    noname=yes: Pt:Tag:noname=yes
     office=accountant: Pt:Tag:office=accountant
     office=administrative: Pt:Tag:office=administrative
     office=architect: Pt:Tag:office=architect
     office=accountant: Pt:Tag:office=accountant
     office=administrative: Pt:Tag:office=administrative
     office=architect: Pt:Tag:office=architect
+    office=association: Pt:Tag:office=association
     office=company: Pt:Tag:office=company
     office=educational_institution: Pt:Tag:office=educational institution
     office=employment_agency: Pt:Tag:office=employment agency
     office=company: Pt:Tag:office=company
     office=educational_institution: Pt:Tag:office=educational institution
     office=employment_agency: Pt:Tag:office=employment agency
@@ -19082,6 +25840,7 @@ pt:
     railway=tram: Pt:Tag:railway=tram
     railway=tram_stop: Pt:Tag:railway=tram stop
     railway=turntable: Pt:Tag:railway=turntable
     railway=tram: Pt:Tag:railway=tram
     railway=tram_stop: Pt:Tag:railway=tram stop
     railway=turntable: Pt:Tag:railway=turntable
+    residential=university: Pt:Tag:residential=university
     route=bus: Pt:Tag:route=bus
     route=detour: Pt:Tag:route=detour
     route=ferry: Pt:Tag:route=ferry
     route=bus: Pt:Tag:route=bus
     route=detour: Pt:Tag:route=detour
     route=ferry: Pt:Tag:route=ferry
@@ -19095,6 +25854,7 @@ pt:
     service=siding: Pt:Tag:service=siding
     service=spur: Pt:Tag:service=spur
     service=yard: Pt:Tag:service=yard
     service=siding: Pt:Tag:service=siding
     service=spur: Pt:Tag:service=spur
     service=yard: Pt:Tag:service=yard
+    sett:style=portuguese: Pt:Tag:sett:style=portuguese
     shop=alcohol: Pt:Tag:shop=alcohol
     shop=anime: Pt:Tag:shop=anime
     shop=art: Pt:Tag:shop=art
     shop=alcohol: Pt:Tag:shop=alcohol
     shop=anime: Pt:Tag:shop=anime
     shop=art: Pt:Tag:shop=art
@@ -19137,6 +25897,7 @@ pt:
     shop=erotic: Pt:Tag:shop=erotic
     shop=fabric: Pt:Tag:shop=fabric
     shop=farm: Pt:Tag:shop=farm
     shop=erotic: Pt:Tag:shop=erotic
     shop=fabric: Pt:Tag:shop=fabric
     shop=farm: Pt:Tag:shop=farm
+    shop=fireplace: Pt:Tag:shop=fireplace
     shop=fishing: Pt:Tag:shop=fishing
     shop=florist: Pt:Tag:shop=florist
     shop=frame: Pt:Tag:shop=frame
     shop=fishing: Pt:Tag:shop=fishing
     shop=florist: Pt:Tag:shop=florist
     shop=frame: Pt:Tag:shop=frame
@@ -19183,12 +25944,15 @@ pt:
     shop=pawnbroker: Pt:Tag:shop=pawnbroker
     shop=perfumery: Pt:Tag:shop=perfumery
     shop=pet: Pt:Tag:shop=pet
     shop=pawnbroker: Pt:Tag:shop=pawnbroker
     shop=perfumery: Pt:Tag:shop=perfumery
     shop=pet: Pt:Tag:shop=pet
+    shop=pet_grooming: Pt:Tag:shop=pet grooming
     shop=photo: Pt:Tag:shop=photo
     shop=pyrotechnics: Pt:Tag:shop=pyrotechnics
     shop=radiotechnics: Pt:Tag:shop=radiotechnics
     shop=scuba_diving: Pt:Tag:shop=scuba diving
     shop=seafood: Pt:Tag:shop=seafood
     shop=second_hand: Pt:Tag:shop=second hand
     shop=photo: Pt:Tag:shop=photo
     shop=pyrotechnics: Pt:Tag:shop=pyrotechnics
     shop=radiotechnics: Pt:Tag:shop=radiotechnics
     shop=scuba_diving: Pt:Tag:shop=scuba diving
     shop=seafood: Pt:Tag:shop=seafood
     shop=second_hand: Pt:Tag:shop=second hand
+    shop=security: Pt:Tag:shop=security
+    shop=sewing: Pt:Tag:shop=sewing
     shop=shoes: Pt:Tag:shop=shoes
     shop=spices: Pt:Tag:shop=spices
     shop=sports: Pt:Tag:shop=sports
     shop=shoes: Pt:Tag:shop=shoes
     shop=spices: Pt:Tag:shop=spices
     shop=sports: Pt:Tag:shop=sports
@@ -19210,7 +25974,11 @@ pt:
     sport=10pin: Pt:Tag:sport=10pin
     sport=9pin: Pt:Tag:sport=9pin
     sport=golf: Pt:Tag:sport=golf
     sport=10pin: Pt:Tag:sport=10pin
     sport=9pin: Pt:Tag:sport=9pin
     sport=golf: Pt:Tag:sport=golf
+    sport=rc_car: Pt:Tag:sport=rc car
     sport=soccer: Pt:Tag:sport=soccer
     sport=soccer: Pt:Tag:sport=soccer
+    surface=sett: Pt:Tag:surface=sett
+    surface=unpaved: Pt:Tag:surface=unpaved
+    taxi_vehicle=motorcycle: Pt:Tag:taxi vehicle=motorcycle
     tourism=alpine_hut: Pt:Tag:tourism=alpine hut
     tourism=artwork: Pt:Tag:tourism=artwork
     tourism=attraction: Pt:Tag:tourism=attraction
     tourism=alpine_hut: Pt:Tag:tourism=alpine hut
     tourism=artwork: Pt:Tag:tourism=artwork
     tourism=attraction: Pt:Tag:tourism=attraction
@@ -19367,7 +26135,6 @@ pt-br:
     nat_ref: Pt-br:Key:nat ref
     natural: Pt-br:Key:natural
     ncn_ref: Pt-br:Key:ncn ref
     nat_ref: Pt-br:Key:nat ref
     natural: Pt-br:Key:natural
     ncn_ref: Pt-br:Key:ncn ref
-    noname: Pt-br:Key:noname
     office: Pt-br:Key:office
     official_name: Pt-br:Key:official name
     old_name: Pt-br:Key:old name
     office: Pt-br:Key:office
     official_name: Pt-br:Key:official name
     old_name: Pt-br:Key:old name
@@ -19444,7 +26211,6 @@ pt-br:
     aeroway=terminal: Pt-br:Tag:aeroway=terminal
     aeroway=windsock: Pt-br:Tag:aeroway=windsock
     amenity=animal_boarding: Pt-br:Tag:amenity=animal boarding
     aeroway=terminal: Pt-br:Tag:aeroway=terminal
     aeroway=windsock: Pt-br:Tag:aeroway=windsock
     amenity=animal_boarding: Pt-br:Tag:amenity=animal boarding
-    amenity=architect_office: Pt-br:Tag:amenity=architect office
     amenity=arts_centre: Pt-br:Tag:amenity=arts centre
     amenity=atm: Pt-br:Tag:amenity=atm
     amenity=baby_hatch: Pt-br:Tag:amenity=baby hatch
     amenity=arts_centre: Pt-br:Tag:amenity=arts centre
     amenity=atm: Pt-br:Tag:amenity=atm
     amenity=baby_hatch: Pt-br:Tag:amenity=baby hatch
@@ -19751,6 +26517,7 @@ pt-br:
     natural=water: Pt-br:Tag:natural=water
     natural=wetland: Pt-BR:Tag:natural=wetland
     natural=wood: Pt-br:Tag:natural=wood
     natural=water: Pt-br:Tag:natural=water
     natural=wetland: Pt-BR:Tag:natural=wetland
     natural=wood: Pt-br:Tag:natural=wood
+    noname=yes: Pt-br:Tag:noname=yes
     office=accountant: Pt-br:Tag:office=accountant
     office=administrative: Pt-br:Tag:office=administrative
     office=architect: Pt-br:Tag:office=architect
     office=accountant: Pt-br:Tag:office=accountant
     office=administrative: Pt-br:Tag:office=administrative
     office=architect: Pt-br:Tag:office=architect
@@ -19961,76 +26728,140 @@ ro:
 ru:
   key:
     3dmr: RU:Key:3dmr
 ru:
   key:
     3dmr: RU:Key:3dmr
+    3dr:type: RU:Key:3dr:type
+    4wd_only: RU:Key:4wd only
+    AlpinRes_ID: RU:Key:AlpinRes ID
+    CLC:code: RU:Key:CLC:code
+    EH_ref: RU:Key:EH ref
+    HE_ref: RU:Key:HE ref
     abandoned: RU:Key:abandoned
     'abandoned:': 'RU:Key:abandoned:'
     abandoned: RU:Key:abandoned
     'abandoned:': 'RU:Key:abandoned:'
+    abandoned:*: RU:Key:abandoned:*
+    abandoned:amenity: RU:Key:abandoned:amenity
+    abandoned:landuse: RU:Key:abandoned:landuse
     abandoned:place: RU:Key:abandoned:place
     abandoned:place: RU:Key:abandoned:place
-    abandoned:place=yes: RU:Key:abandoned:place=yes
     abandoned:railway: RU:Key:abandoned:railway
     abutters: RU:Key:abutters
     access: RU:Key:access
     abandoned:railway: RU:Key:abandoned:railway
     abutters: RU:Key:abutters
     access: RU:Key:access
-    access:bdouble: RU:Key:access:bdouble
-    access:lhv: RU:Key:access:lhv
-    access:roadtrain: RU:Key:access:roadtrain
-    access:roadtrain:trailers: RU:Key:access:roadtrain:trailers
+    access:lanes: RU:Key:access:lanes
     addr: RU:Key:addr
     addr: RU:Key:addr
+    'addr:': 'RU:Key:addr:'
+    addr:*: RU:Key:addr:*
+    addr:block: RU:Key:addr:block
     addr:city: RU:Key:addr:city
     addr:city: RU:Key:addr:city
+    addr:conscriptionnumber: RU:Key:addr:conscriptionnumber
     addr:country: RU:Key:addr:country
     addr:country: RU:Key:addr:country
+    addr:district: RU:Key:addr:district
+    addr:door: RU:Key:addr:door
     addr:flats: RU:Key:addr:flats
     addr:floor: RU:Key:addr:floor
     addr:flats: RU:Key:addr:flats
     addr:floor: RU:Key:addr:floor
+    addr:full: RU:Key:addr:full
+    addr:hamlet: RU:Key:addr:hamlet
     addr:housename: RU:Key:addr:housename
     addr:housenumber: RU:Key:addr:housenumber
     addr:housename: RU:Key:addr:housename
     addr:housenumber: RU:Key:addr:housenumber
+    addr:inclusion: RU:Key:addr:inclusion
     addr:interpolation: RU:Key:addr:interpolation
     addr:letter: RU:Key:addr:letter
     addr:place: RU:Key:addr:place
     addr:postcode: RU:Key:addr:postcode
     addr:interpolation: RU:Key:addr:interpolation
     addr:letter: RU:Key:addr:letter
     addr:place: RU:Key:addr:place
     addr:postcode: RU:Key:addr:postcode
+    addr:province: RU:Key:addr:province
+    addr:region: RU:Key:addr:region
+    addr:sector: RU:Key:addr:sector
+    addr:state: RU:Key:addr:state
     addr:street: RU:Key:addr:street
     addr:street: RU:Key:addr:street
+    addr:streetnumber: RU:Key:addr:streetnumber
+    addr:subdistrict: RU:Key:addr:subdistrict
     addr:suburb: RU:Key:addr:suburb
     addr:suburb: RU:Key:addr:suburb
+    addr:unit: RU:Key:addr:unit
+    admin_level: RU:Key:admin level
     advertising: RU:Key:advertising
     aerialway: RU:Key:aerialway
     advertising: RU:Key:advertising
     aerialway: RU:Key:aerialway
+    aerialway:duration: RU:Key:aerialway:duration
+    aerialway:occupancy: RU:Key:aerialway:occupancy
+    aerialway:station: RU:Key:aerialway:station
+    aerodrome:type: RU:Key:aerodrome:type
     aeroway: RU:Key:aeroway
     aeroway: RU:Key:aeroway
+    after_school: RU:Key:after school
     agricultural: RU:Key:agricultural
     alt_name: RU:Key:alt name
     amenity: RU:Key:amenity
     agricultural: RU:Key:agricultural
     alt_name: RU:Key:alt name
     amenity: RU:Key:amenity
+    animal: RU:Key:animal
     architect: RU:Key:architect
     area: RU:Key:area
     architect: RU:Key:architect
     area: RU:Key:area
+    area:aeroway: RU:Key:area:aeroway
     area:highway: RU:Key:area:highway
     area:highway: RU:Key:area:highway
+    armrest: RU:Key:armrest
     artist_name: RU:Key:artist name
     artwork_type: RU:Key:artwork type
     artist_name: RU:Key:artist name
     artwork_type: RU:Key:artwork type
+    assisted_trail: RU:Key:assisted trail
+    association: RU:Key:association
     attraction: RU:Key:attraction
     attribution: RU:Key:attribution
     atv:sales: RU:Key:atv:sales
     attraction: RU:Key:attraction
     attribution: RU:Key:attribution
     atv:sales: RU:Key:atv:sales
+    baby: RU:Key:baby
+    baby_feeding: RU:Key:baby feeding
     backcountry: RU:Key:backcountry
     backcountry: RU:Key:backcountry
+    backrest: RU:Key:backrest
     backward: RU:Key:backward
     backward: RU:Key:backward
+    balcony: RU:Key:balcony
     barrier: RU:Key:barrier
     barrier: RU:Key:barrier
+    barrier:personnel: RU:Key:barrier:personnel
+    basin: RU:Key:basin
+    beacon: RU:Key:beacon
+    beacon:type: RU:Key:beacon:type
+    beds: RU:Key:beds
     bench: RU:Key:bench
     bicycle: RU:Key:bicycle
     bench: RU:Key:bench
     bicycle: RU:Key:bicycle
+    bicycle:backward: RU:Key:bicycle:backward
+    bicycle:designated:type: RU:Key:bicycle:designated:type
+    bicycle:forward: RU:Key:bicycle:forward
+    bicycle:type: RU:Key:bicycle:type
+    bicycle_bypass: RU:Key:bicycle bypass
     bicycle_parking: RU:Key:bicycle parking
     bicycle_parking: RU:Key:bicycle parking
+    bike_ride: RU:Key:bike ride
     bin: RU:Key:bin
     bin: RU:Key:bin
+    board:title: RU:Key:board:title
     board_type: RU:Key:board type
     boat: RU:Key:boat
     board_type: RU:Key:board type
     boat: RU:Key:boat
+    booking: RU:Key:booking
     books: RU:Key:books
     border_type: RU:Key:border type
     both: RU:Key:both
     boundary: RU:Key:boundary
     brand: RU:Key:brand
     brand:wikidata: RU:Key:brand:wikidata
     books: RU:Key:books
     border_type: RU:Key:border type
     both: RU:Key:both
     boundary: RU:Key:boundary
     brand: RU:Key:brand
     brand:wikidata: RU:Key:brand:wikidata
+    brewery: RU:Key:brewery
     bridge: RU:Key:bridge
     bridge: RU:Key:bridge
+    bridge:alt_name: RU:Key:bridge:alt name
+    bridge:loc_name: RU:Key:bridge:loc name
+    bridge:movable: RU:Key:bridge:movable
     bridge:name: RU:Key:bridge:name
     bridge:name: RU:Key:bridge:name
+    bridge:official_name: RU:Key:bridge:official name
+    bridge:old_name: RU:Key:bridge:old name
+    bridge:ref: RU:Key:bridge:ref
+    bridge:short_name: RU:Key:bridge:short name
     bridge:structure: RU:Key:bridge:structure
     bridge:support: RU:Key:bridge:support
     bridge:structure: RU:Key:bridge:structure
     bridge:support: RU:Key:bridge:support
-    bridge_name: RU:Key:bridge name
     building: RU:Key:building
     building:architecture: RU:Key:building:architecture
     building: RU:Key:building
     building:architecture: RU:Key:building:architecture
+    building:cladding: RU:Key:building:cladding
+    building:color: RU:Key:building:color
+    building:colour: RU:Key:building:colour
     building:condition: RU:Key:building:condition
     building:condition: RU:Key:building:condition
+    building:fireproof: RU:Key:building:fireproof
     building:flats: RU:Key:building:flats
     building:flats: RU:Key:building:flats
-    building:height: RU:Key:building:height
+    building:foundation_height: RU:Key:building:foundation height
     building:levels: RU:Key:building:levels
     building:levels:underground: RU:Key:building:levels:underground
     building:material: RU:Key:building:material
     building:min_level: RU:Key:building:min level
     building:levels: RU:Key:building:levels
     building:levels:underground: RU:Key:building:levels:underground
     building:material: RU:Key:building:material
     building:min_level: RU:Key:building:min level
+    building:obm: RU:Key:building:obm
     building:part: RU:Key:building:part
     building:parts: RU:Key:building:parts
     building:part: RU:Key:building:part
     building:parts: RU:Key:building:parts
+    building:place: RU:Key:building:place
     building:prefabricated: RU:Key:building:prefabricated
     building:prefabricated: RU:Key:building:prefabricated
+    building:quake-resistant: RU:Key:building:quake-resistant
+    building:ruian:type: RU:Key:building:ruian:type
     building:soft_storey: RU:Key:building:soft storey
     building:structure: RU:Key:building:structure
     building:units: RU:Key:building:units
     building:soft_storey: RU:Key:building:soft storey
     building:structure: RU:Key:building:structure
     building:units: RU:Key:building:units
@@ -20039,117 +26870,253 @@ ru:
     building:use:pl: RU:Key:building:use:pl
     bunker_type: RU:Key:bunker type
     bus: RU:Key:bus
     building:use:pl: RU:Key:building:use:pl
     bunker_type: RU:Key:bunker type
     bus: RU:Key:bus
+    bus:lanes: RU:Key:bus:lanes
+    bus_bay: RU:Key:bus bay
+    bus_class: RU:Key:bus class
+    bus_class:length: RU:Key:bus class:length
+    bus_class:passengers: RU:Key:bus class:passengers
+    cabins: RU:Key:cabins
+    cable_number: RU:Key:cable number
+    cadet: RU:Key:cadet
     cafe: RU:Key:cafe
     cafe: RU:Key:cafe
+    camera:type: RU:Key:camera:type
     camp_site: RU:Key:camp site
     camp_site: RU:Key:camp site
+    camp_type: RU:Key:camp type
     capacity: RU:Key:capacity
     capacity: RU:Key:capacity
+    capacity:beds: RU:Key:capacity:beds
+    capacity:cabins: RU:Key:capacity:cabins
+    capacity:charging: RU:Key:capacity:charging
+    capacity:disabled: RU:Key:capacity:disabled
+    capacity:persons: RU:Key:capacity:persons
+    capacity:rooms: RU:Key:capacity:rooms
+    capacity:tents: RU:Key:capacity:tents
     capital: RU:Key:capital
     capital: RU:Key:capital
+    capital_city: RU:Key:capital city
+    car_wash: RU:Key:car wash
     caravan: RU:Key:caravan
     caravan: RU:Key:caravan
+    cash_withdrawal: RU:Key:cash withdrawal
     castle_type: RU:Key:castle type
     castle_type: RU:Key:castle type
+    castle_type:de: RU:Key:castle type:de
     cemetery: RU:Key:cemetery
     cemetery: RU:Key:cemetery
+    census:population: RU:Key:census:population
+    changing_table: RU:Key:changing table
+    changing_table:count: RU:Key:changing table:count
+    changing_table:fee: RU:Key:changing table:fee
+    changing_table:location: RU:Key:changing table:location
+    charge: RU:Key:charge
     check_date: RU:Key:check date
     check_date: RU:Key:check date
+    check_date:opening_hours: RU:Key:check date:opening hours
     checkpoint: RU:Key:checkpoint
     checkpoint: RU:Key:checkpoint
+    church:type: RU:Key:church:type
+    circumference: RU:Key:circumference
+    city_limit: RU:Key:city limit
+    class:bicycle: RU:Key:class:bicycle
     clli: RU:Key:clli
     clothes: RU:Key:clothes
     club: RU:Key:club
     colour: RU:Key:colour
     comment: RU:Key:comment
     clli: RU:Key:clli
     clothes: RU:Key:clothes
     club: RU:Key:club
     colour: RU:Key:colour
     comment: RU:Key:comment
+    communication:bos: RU:Key:communication:bos
     community_centre: RU:Key:community centre
     community_centre: RU:Key:community centre
+    community_centre:for: RU:Key:community centre:for
+    company: RU:Key:company
+    compressed_air: RU:Key:compressed air
     condo: RU:Key:condo
     condo: RU:Key:condo
+    consecrated: RU:Key:consecrated
     construction: RU:Key:construction
     construction: RU:Key:construction
+    construction:addr: RU:Key:construction:addr
+    construction:addr:*: RU:Key:construction:addr:*
+    consulting: RU:Key:consulting
     contact: RU:Key:contact
     contact: RU:Key:contact
+    contact:*: RU:Key:contact:*
+    contact:email: RU:Key:contact:email
     contact:facebook: RU:Key:contact:facebook
     contact:fax: RU:Key:contact:fax
     contact:phone: RU:Key:contact:phone
     contact:vk: RU:Key:contact:vk
     contact:website: RU:Key:contact:website
     conveying: RU:Key:conveying
     contact:facebook: RU:Key:contact:facebook
     contact:fax: RU:Key:contact:fax
     contact:phone: RU:Key:contact:phone
     contact:vk: RU:Key:contact:vk
     contact:website: RU:Key:contact:website
     conveying: RU:Key:conveying
+    cooker: RU:Key:cooker
     covered: RU:Key:covered
     craft: RU:Key:craft
     created_by: RU:Key:created by
     crop: RU:Key:crop
     crossing: RU:Key:crossing
     covered: RU:Key:covered
     craft: RU:Key:craft
     created_by: RU:Key:created by
     crop: RU:Key:crop
     crossing: RU:Key:crossing
+    crossing:aircraft: RU:Key:crossing:aircraft
+    crossing:island: RU:Key:crossing:island
     cuisine: RU:Key:cuisine
     currency: RU:Key:currency
     cutting: RU:Key:cutting
     cuisine: RU:Key:cuisine
     currency: RU:Key:currency
     cutting: RU:Key:cutting
+    cycle_barrier: RU:Key:cycle barrier
+    cycle_barrier:installation: RU:Key:cycle barrier:installation
+    cycle_highway: RU:Key:cycle highway
+    cycle_network: RU:Key:cycle network
+    cyclestreet: RU:Key:cyclestreet
+    cyclestreets_id: RU:Key:cyclestreets id
     cycleway: RU:Key:cycleway
     cycleway: RU:Key:cycleway
+    cycleway:both: RU:Key:cycleway:both
+    cycleway:buffer: RU:Key:cycleway:buffer
+    cycleway:foot: RU:Key:cycleway:foot
+    cycleway:lane: RU:Key:cycleway:lane
+    cycleway:left: RU:Key:cycleway:left
+    cycleway:left:buffer: RU:Key:cycleway:left:buffer
+    cycleway:left:lane: RU:Key:cycleway:left:lane
+    cycleway:left:oneway: RU:Key:cycleway:left:oneway
+    cycleway:right: RU:Key:cycleway:right
+    cycleway:right:buffer: RU:Key:cycleway:right:buffer
+    cycleway:right:lane: RU:Key:cycleway:right:lane
+    cycleway:right:oneway: RU:Key:cycleway:right:oneway
+    cycleway:right:surface: RU:Key:cycleway:right:surface
+    cycleway:segregated: RU:Key:cycleway:segregated
+    cycleway:surface: RU:Key:cycleway:surface
+    dance:style: RU:Key:dance:style
+    dance:teaching: RU:Key:dance:teaching
     delivery: RU:Key:delivery
     delivery: RU:Key:delivery
+    delivery:partner: RU:Key:delivery:partner
     denomination: RU:Key:denomination
     denomination: RU:Key:denomination
+    denotation: RU:Key:denotation
+    department: RU:Key:department
     departures_board: RU:Key:departures board
     departures_board: RU:Key:departures board
+    depth: RU:Key:depth
     description: RU:Key:description
     description:ru: RU:Key:description:ru
     design:code:SPb: RU:Key:design:code:SPb
     design:ref: RU:Key:design:ref
     designation: RU:Key:designation
     description: RU:Key:description
     description:ru: RU:Key:description:ru
     design:code:SPb: RU:Key:design:code:SPb
     design:ref: RU:Key:design:ref
     designation: RU:Key:designation
-    diaper: RU:Key:diaper
+    diplomatic: RU:Key:diplomatic
     direction: RU:Key:direction
     dispensing: RU:Key:dispensing
     direction: RU:Key:direction
     dispensing: RU:Key:dispensing
+    dist: RU:Key:dist
     disused: RU:Key:disused
     'disused:': 'RU:Key:disused:'
     disused: RU:Key:disused
     'disused:': 'RU:Key:disused:'
+    disused:*: RU:Key:disused:*
+    disused:landuse: RU:Key:disused:landuse
+    disused:leisure: RU:Key:disused:leisure
+    disused:place: RU:Key:disused:place
     disused:shop: RU:Key:disused:shop
     dog: RU:Key:dog
     disused:shop: RU:Key:disused:shop
     dog: RU:Key:dog
-    door: RU:Key:door
+    double_tracked_motor_vehicle: RU:Key:double tracked motor vehicle
+    draft: RU:Key:draft
+    drain: RU:Key:drain
+    drink:beer: RU:Key:drink:beer
     drinking_water: RU:Key:drinking water
     drinking_water:legal: RU:Key:drinking water:legal
     drive_in: RU:Key:drive in
     drive_through: RU:Key:drive through
     driving_side: RU:Key:driving side
     drinking_water: RU:Key:drinking water
     drinking_water:legal: RU:Key:drinking water:legal
     drive_in: RU:Key:drive in
     drive_through: RU:Key:drive through
     driving_side: RU:Key:driving side
+    dryer: RU:Key:dryer
+    duration: RU:Key:duration
+    easy_overtaking: RU:Key:easy overtaking
+    education: RU:Key:education
     ele: RU:Key:ele
     ele: RU:Key:ele
+    electric_bicycle: RU:Key:electric bicycle
+    electricity: RU:Key:electricity
     electrified: RU:Key:electrified
     email: RU:Key:email
     embankment: RU:Key:embankment
     emergency: RU:Key:emergency
     electrified: RU:Key:electrified
     email: RU:Key:email
     embankment: RU:Key:embankment
     emergency: RU:Key:emergency
+    engineer: RU:Key:engineer
     entrance: RU:Key:entrance
     entrance: RU:Key:entrance
+    esr:user: RU:Key:esr:user
     est_width: RU:Key:est width
     est_width: RU:Key:est width
+    exhibit: RU:Key:exhibit
     exit: RU:Key:exit
     exit: RU:Key:exit
+    expressway: RU:Key:expressway
+    faculty: RU:Key:faculty
     fast_food: RU:Key:fast food
     fax: RU:Key:fax
     fast_food: RU:Key:fast food
     fax: RU:Key:fax
+    fdep:landuse_code: RU:Key:fdep:landuse code
     fee: RU:Key:fee
     fee: RU:Key:fee
+    feeding:type: RU:Key:feeding:type
+    female: RU:Key:female
     fence_type: RU:Key:fence type
     fence_type: RU:Key:fence type
+    ferry: RU:Key:ferry
+    ferry:cable: RU:Key:ferry:cable
     fire_boundary: RU:Key:fire boundary
     fire_object:type: RU:Key:fire object:type
     fire_operator: RU:Key:fire operator
     fire_rank: RU:Key:fire rank
     fire_station:type: RU:Key:fire station:type
     fire_boundary: RU:Key:fire boundary
     fire_object:type: RU:Key:fire object:type
     fire_operator: RU:Key:fire operator
     fire_rank: RU:Key:fire rank
     fire_station:type: RU:Key:fire station:type
+    fireplace: RU:Key:fireplace
+    fishing: RU:Key:fishing
     fixme: RU:Key:fixme
     fixme: RU:Key:fixme
+    flats: RU:Key:flats
+    flood_date: RU:Key:flood date
     foot: RU:Key:foot
     footway: RU:Key:footway
     ford: RU:Key:ford
     foot: RU:Key:foot
     footway: RU:Key:footway
     ford: RU:Key:ford
+    fortification_type: RU:Key:fortification type
     forward: RU:Key:forward
     forward: RU:Key:forward
+    fountain: RU:Key:fountain
     fuel: RU:Key:fuel
     fuel:cng: RU:Key:fuel:cng
     fuel:lpg: RU:Key:fuel:lpg
     furniture: RU:Key:furniture
     garden:style: RU:Key:garden:style
     fuel: RU:Key:fuel
     fuel:cng: RU:Key:fuel:cng
     fuel:lpg: RU:Key:fuel:lpg
     furniture: RU:Key:furniture
     garden:style: RU:Key:garden:style
+    garden:type: RU:Key:garden:type
     gas: RU:Key:gas
     gauge: RU:Key:gauge
     generator:output: RU:Key:generator:output
     generator:source: RU:Key:generator:source
     genus: RU:Key:genus
     gas: RU:Key:gas
     gauge: RU:Key:gauge
     generator:output: RU:Key:generator:output
     generator:source: RU:Key:generator:source
     genus: RU:Key:genus
+    glideslope: RU:Key:glideslope
+    golf:par: RU:Key:golf:par
+    government: RU:Key:government
+    grades: RU:Key:grades
     grassland: RU:Key:grassland
     grassland: RU:Key:grassland
+    group_only: RU:Key:group only
+    guest_house: RU:Key:guest house
+    guide: RU:Key:guide
+    guide_type: RU:Key:guide type
+    guidepost: RU:Key:guidepost
+    guidepost:hiking: RU:Key:guidepost:hiking
     gvr:code: RU:Key:gvr:code
     handrail: RU:Key:handrail
     gvr:code: RU:Key:gvr:code
     handrail: RU:Key:handrail
+    hazard: RU:Key:hazard
+    hazard:animal: RU:Key:hazard:animal
+    hazmat: RU:Key:hazmat
+    health_facility:CD: RU:Key:health facility:CD
     healthcare: RU:Key:healthcare
     height: RU:Key:height
     healthcare: RU:Key:healthcare
     height: RU:Key:height
+    heritage: RU:Key:heritage
+    heritage:operator: RU:Key:heritage:operator
+    heritage:website: RU:Key:heritage:website
     hgv: RU:Key:hgv
     highway: RU:Key:highway
     hgv: RU:Key:hgv
     highway: RU:Key:highway
+    hiking: RU:Key:hiking
     historic: RU:Key:historic
     historic: RU:Key:historic
+    historic:civilization: RU:Key:historic:civilization
     horse: RU:Key:horse
     horse: RU:Key:horse
+    horse_scale: RU:Key:horse scale
     iata: RU:Key:iata
     ice_road: RU:Key:ice road
     iata: RU:Key:iata
     ice_road: RU:Key:ice road
+    icn_ref: RU:Key:icn ref
+    ifr: RU:Key:ifr
     image: RU:Key:image
     incline: RU:Key:incline
     indoor: RU:Key:indoor
     industrial: RU:Key:industrial
     image: RU:Key:image
     incline: RU:Key:incline
     indoor: RU:Key:indoor
     industrial: RU:Key:industrial
+    infant_bed: RU:Key:infant bed
+    informal: RU:Key:informal
     information: RU:Key:information
     inscription: RU:Key:inscription
     int_name: RU:Key:int name
     intermittent: RU:Key:intermittent
     internet_access: RU:Key:internet access
     information: RU:Key:information
     inscription: RU:Key:inscription
     int_name: RU:Key:int name
     intermittent: RU:Key:intermittent
     internet_access: RU:Key:internet access
+    irrigation: RU:Key:irrigation
+    is_in: RU:Key:is in
+    isced:level: RU:Key:isced:level
+    isced:level:1997: RU:Key:isced:level:1997
+    isced:level:2011: RU:Key:isced:level:2011
+    jetski:rental: RU:Key:jetski:rental
     junction: RU:Key:junction
     karaoke: RU:Key:karaoke
     kerb: RU:Key:kerb
     junction: RU:Key:junction
     karaoke: RU:Key:karaoke
     kerb: RU:Key:kerb
+    kneipp_water_cure: RU:Key:kneipp water cure
+    kons:inscription_date: RU:Key:kons:inscription date
     ladder: RU:Key:ladder
     lamp_mount: RU:Key:lamp mount
     ladder: RU:Key:ladder
     lamp_mount: RU:Key:lamp mount
+    landfill:waste: RU:Key:landfill:waste
     landmark: RU:Key:landmark
     landuse: RU:Key:landuse
     lanes: RU:Key:lanes
     landmark: RU:Key:landmark
     landuse: RU:Key:landuse
     lanes: RU:Key:lanes
@@ -20161,17 +27128,25 @@ ru:
     leisure: RU:Key:leisure
     length: RU:Key:length
     level: RU:Key:level
     leisure: RU:Key:leisure
     length: RU:Key:length
     level: RU:Key:level
+    level:ref: RU:Key:level:ref
     license_classes: RU:Key:license classes
     license_classes: RU:Key:license classes
+    listed_status: RU:Key:listed status
     lit: RU:Key:lit
     living_street: RU:Key:living street
     loc_name: RU:Key:loc name
     loc_ref: RU:Key:loc ref
     lit: RU:Key:lit
     living_street: RU:Key:living street
     loc_name: RU:Key:loc name
     loc_ref: RU:Key:loc ref
+    localizer: RU:Key:localizer
     location: RU:Key:location
     lock: RU:Key:lock
     location: RU:Key:location
     lock: RU:Key:lock
+    locked: RU:Key:locked
+    maintained: RU:Key:maintained
     man_made: RU:Key:man made
     managed: RU:Key:managed
     manhole: RU:Key:manhole
     man_made: RU:Key:man made
     managed: RU:Key:managed
     manhole: RU:Key:manhole
+    map_type: RU:Key:map type
+    mapillary: RU:Key:mapillary
     material: RU:Key:material
     material: RU:Key:material
+    mattress: RU:Key:mattress
     max_age: RU:Key:max age
     maxaxleload: RU:Key:maxaxleload
     maxbogieweight: RU:Key:maxbogieweight
     max_age: RU:Key:max age
     maxaxleload: RU:Key:maxaxleload
     maxbogieweight: RU:Key:maxbogieweight
@@ -20180,110 +27155,229 @@ ru:
     maxspeed: RU:Key:maxspeed
     maxspeed:practical: RU:Key:maxspeed:practical
     maxstay: RU:Key:maxstay
     maxspeed: RU:Key:maxspeed
     maxspeed:practical: RU:Key:maxspeed:practical
     maxstay: RU:Key:maxstay
-    maxtents: RU:Key:maxtents
     maxweight: RU:Key:maxweight
     maxweight: RU:Key:maxweight
+    maxweight:signed: RU:Key:maxweight:signed
+    maxweightrating: RU:Key:maxweightrating
     maxwidth: RU:Key:maxwidth
     maxwidth: RU:Key:maxwidth
+    mcrb:criteria: RU:Key:mcrb:criteria
+    measurement: RU:Key:measurement
+    memorial: RU:Key:memorial
+    memorial:subject: RU:Key:memorial:subject
     memorial:type: RU:Key:memorial:type
     military: RU:Key:military
     min_height: RU:Key:min height
     memorial:type: RU:Key:memorial:type
     military: RU:Key:military
     min_height: RU:Key:min height
+    mindistance: RU:Key:mindistance
     minspeed: RU:Key:minspeed
     minspeed: RU:Key:minspeed
+    minweight: RU:Key:minweight
+    model:wikidata: RU:Key:model:wikidata
+    model:wikipedia: RU:Key:model:wikipedia
+    monitoring:groundwater: RU:Key:monitoring:groundwater
     moped: RU:Key:moped
     motor_vehicle: RU:Key:motor vehicle
     moped: RU:Key:moped
     motor_vehicle: RU:Key:motor vehicle
+    motorcar: RU:Key:motorcar
     motorcycle: RU:Key:motorcycle
     motorcycle: RU:Key:motorcycle
+    motorcycle:*: RU:Key:motorcycle:*
+    motorcycle:clothes: RU:Key:motorcycle:clothes
+    motorcycle:parking: RU:Key:motorcycle:parking
+    motorcycle:parts: RU:Key:motorcycle:parts
+    motorcycle:rental: RU:Key:motorcycle:rental
+    motorcycle:repair: RU:Key:motorcycle:repair
+    motorcycle:sales: RU:Key:motorcycle:sales
+    motorcycle:storage: RU:Key:motorcycle:storage
+    motorcycle:theme: RU:Key:motorcycle:theme
+    motorcycle:tours: RU:Key:motorcycle:tours
+    motorcycle:training: RU:Key:motorcycle:training
+    motorcycle:transport: RU:Key:motorcycle:transport
+    motorcycle:type: RU:Key:motorcycle:type
+    motorcycle:tyres: RU:Key:motorcycle:tyres
     motorroad: RU:Key:motorroad
     mountain_pass: RU:Key:mountain pass
     motorroad: RU:Key:motorroad
     mountain_pass: RU:Key:mountain pass
+    mtb:description: RU:Key:mtb:description
+    mtb:name: RU:Key:mtb:name
     mtb:scale: RU:Key:mtb:scale
     mtb:scale: RU:Key:mtb:scale
+    mtb:type: RU:Key:mtb:type
+    museum: RU:Key:museum
+    museum_type: RU:Key:museum type
     name: RU:Key:name
     name: RU:Key:name
+    name:be: RU:Key:name:be
+    name:etymology:wikidata: RU:Key:name:etymology:wikidata
     name:ru: RU:Key:name:ru
     name:ru:word_stress: RU:Key:name:ru:word stress
     name:ru: RU:Key:name:ru
     name:ru:word_stress: RU:Key:name:ru:word stress
+    name:vi-Hani: RU:Key:name:vi-Hani
+    narrow: RU:Key:narrow
     nat_name: RU:Key:nat name
     nat_ref: RU:Key:nat ref
     natural: RU:Key:natural
     nat_name: RU:Key:nat name
     nat_ref: RU:Key:nat ref
     natural: RU:Key:natural
+    navigationaid: RU:Key:navigationaid
+    ncn: RU:Key:ncn
+    ncn_milepost: RU:Key:ncn milepost
+    ncn_ref: RU:Key:ncn ref
+    network: RU:Key:network
+    newspaper_tubes: RU:Key:newspaper tubes
+    next_check_date: RU:Key:next check date
+    no_overtaking: RU:Key:no overtaking
     noaddress: RU:Key:noaddress
     noaddress: RU:Key:noaddress
-    noexit: RU:Key:noexit
-    noname: RU:Key:noname
+    nohousenumber: RU:Key:nohousenumber
     note: RU:Key:note
     note: RU:Key:note
+    nursery: RU:Key:nursery
     office: RU:Key:office
     office: RU:Key:office
+    office/Обзор_офисов: RU:Key:office/Обзор офисов
     official_name: RU:Key:official name
     official_short_type: RU:Key:official short type
     old_name: RU:Key:old name
     old_ref: RU:Key:old ref
     oneway: RU:Key:oneway
     official_name: RU:Key:official name
     official_short_type: RU:Key:official short type
     old_name: RU:Key:old name
     old_ref: RU:Key:old ref
     oneway: RU:Key:oneway
+    oneway:bicycle: RU:Key:oneway:bicycle
+    openfire: RU:Key:openfire
     opening_date: RU:Key:opening date
     opening_hours: RU:Key:opening hours
     opening_date: RU:Key:opening date
     opening_hours: RU:Key:opening hours
+    opening_hours:covid19: RU:Key:opening hours:covid19
     opening_hours:kitchen: RU:Key:opening hours:kitchen
     opening_hours:kitchen: RU:Key:opening hours:kitchen
+    opening_hours:reception: RU:Key:opening hours:reception
     operator: RU:Key:operator
     operator:ref:inn: RU:Key:operator:ref:inn
     operator:type: RU:Key:operator:type
     operator: RU:Key:operator
     operator:ref:inn: RU:Key:operator:ref:inn
     operator:type: RU:Key:operator:type
+    operator:wikipedia: RU:Key:operator:wikipedia
+    orientation: RU:Key:orientation
     origin: RU:Key:origin
     origin: RU:Key:origin
+    oven: RU:Key:oven
     overtaking: RU:Key:overtaking
     owner: RU:Key:owner
     ownership: RU:Key:ownership
     overtaking: RU:Key:overtaking
     owner: RU:Key:owner
     ownership: RU:Key:ownership
+    park_ride: RU:Key:park ride
     parking: RU:Key:parking
     parking: RU:Key:parking
-    parking:lane: RU:Key:parking:lane
-    parking:lane:both: RU:Key:parking:lane:both
-    parking:lane:left: RU:Key:parking:lane:left
-    parking:lane:right: RU:Key:parking:lane:right
+    parking:condition:right: RU:Key:parking:condition:right
+    parking_space: RU:Key:parking space
     passenger_information_display: RU:Key:passenger information display
     passing_places: RU:Key:passing places
     paved:date: RU:Key:paved:date
     payment: RU:Key:payment
     passenger_information_display: RU:Key:passenger information display
     passing_places: RU:Key:passing places
     paved:date: RU:Key:paved:date
     payment: RU:Key:payment
+    payment:*: RU:Key:payment:*
+    payment:coins: RU:Key:payment:coins
     payment:credit_cards: RU:Key:payment:credit cards
     payment:notes: RU:Key:payment:notes
     payment:credit_cards: RU:Key:payment:credit cards
     payment:notes: RU:Key:payment:notes
+    pedagogy: RU:Key:pedagogy
+    permanent_camping: RU:Key:permanent camping
+    pets: RU:Key:pets
     phone: RU:Key:phone
     phone: RU:Key:phone
+    picnic_table: RU:Key:picnic table
     pipeline: RU:Key:pipeline
     pipeline: RU:Key:pipeline
+    piste:grooming: RU:Key:piste:grooming
     piste:type: RU:Key:piste:type
     place: RU:Key:place
     piste:type: RU:Key:piste:type
     place: RU:Key:place
+    place:CN: RU:Key:place:CN
+    place:PH: RU:Key:place:PH
     placement: RU:Key:placement
     playground: RU:Key:playground
     placement: RU:Key:placement
     playground: RU:Key:playground
+    'playground:': 'RU:Key:playground:'
+    playground:*: RU:Key:playground:*
+    playground:theme: RU:Key:playground:theme
     police: RU:Key:police
     police: RU:Key:police
+    political_party: RU:Key:political party
     population: RU:Key:population
     postal_code: RU:Key:postal code
     power: RU:Key:power
     population: RU:Key:population
     postal_code: RU:Key:postal code
     power: RU:Key:power
-    power_source: RU:Key:power source
+    preschool: RU:Key:preschool
     previous: RU:Key:previous
     previous:access: RU:Key:previous:access
     previous:vehicle: RU:Key:previous:vehicle
     priority_road: RU:Key:priority road
     product: RU:Key:product
     previous: RU:Key:previous
     previous:access: RU:Key:previous:access
     previous:vehicle: RU:Key:previous:vehicle
     priority_road: RU:Key:priority road
     product: RU:Key:product
+    proposed: RU:Key:proposed
     psv: RU:Key:psv
     public_bookcase:type: RU:Key:public bookcase:type
     psv: RU:Key:psv
     public_bookcase:type: RU:Key:public bookcase:type
+    public_transport: RU:Key:public transport
     pump: RU:Key:pump
     railway: RU:Key:railway
     pump: RU:Key:pump
     railway: RU:Key:railway
+    railway:track_ref: RU:Key:railway:track ref
     ramp: RU:Key:ramp
     ramp: RU:Key:ramp
+    ramp:bicycle: RU:Key:ramp:bicycle
+    recreation_ground: RU:Key:recreation ground
+    recycling:*: RU:Key:recycling:*
     recycling:fire_extinguishers: RU:Key:recycling:fire extinguishers
     recycling:fire_extinguishers: RU:Key:recycling:fire extinguishers
+    recycling:plastic_bottle_caps: RU:Key:recycling:plastic bottle caps
+    recycling:plastic_bottle_tops: RU:Key:recycling:plastic bottle tops
+    recycling:pmd: RU:Key:recycling:pmd
     recycling_type: RU:Key:recycling type
     ref: RU:Key:ref
     recycling_type: RU:Key:recycling type
     ref: RU:Key:ref
+    ref:BLfD: RU:Key:ref:BLfD
+    ref:GB:imher: RU:Key:ref:GB:imher
+    ref:GB:nhle: RU:Key:ref:GB:nhle
+    ref:IE:niah: RU:Key:ref:IE:niah
+    ref:RS:nkd: RU:Key:ref:RS:nkd
+    ref:canmore: RU:Key:ref:canmore
+    ref:kons: RU:Key:ref:kons
+    ref:mobil-parken.de: RU:Key:ref:mobil-parken.de
+    ref:nrhp: RU:Key:ref:nrhp
     ref:ruian:building: RU:Key:ref:ruian:building
     ref:ruian:building: RU:Key:ref:ruian:building
+    ref:sprockhoff: RU:Key:ref:sprockhoff
+    ref:ssb_tettsted: RU:Key:ref:ssb tettsted
+    ref:whc: RU:Key:ref:whc
     reference: RU:Key:reference
     refitted: RU:Key:refitted
     reg_name: RU:Key:reg name
     reg_ref: RU:Key:reg ref
     reference: RU:Key:reference
     refitted: RU:Key:refitted
     reg_name: RU:Key:reg name
     reg_ref: RU:Key:reg ref
+    region:type: RU:Key:region:type
     religion: RU:Key:religion
     religion: RU:Key:religion
+    removed:building: RU:Key:removed:building
+    rental: RU:Key:rental
+    research: RU:Key:research
+    reservation: RU:Key:reservation
+    reservoir_type: RU:Key:reservoir type
+    residential: RU:Key:residential
     resort: RU:Key:resort
     resource: RU:Key:resource
     resort: RU:Key:resort
     resource: RU:Key:resource
+    restaurant: RU:Key:restaurant
+    retreat: RU:Key:retreat
+    review_requested: RU:Key:review requested
+    rhn_ref: RU:Key:rhn ref
     right: RU:Key:right
     right: RU:Key:right
+    roller_coaster: RU:Key:roller coaster
+    roller_coaster:track: RU:Key:roller coaster:track
+    roller_coaster:type: RU:Key:roller coaster:type
     roof:direction: RU:Key:roof:direction
     roof:material: RU:Key:roof:material
     room: RU:Key:room
     rooms: RU:Key:rooms
     roof:direction: RU:Key:roof:direction
     roof:material: RU:Key:roof:material
     room: RU:Key:room
     rooms: RU:Key:rooms
+    roundtrip: RU:Key:roundtrip
     route: RU:Key:route
     rtsa_scale: RU:Key:rtsa scale
     ruined: RU:Key:ruined
     'ruined:': 'RU:Key:ruined:'
     route: RU:Key:route
     rtsa_scale: RU:Key:rtsa scale
     ruined: RU:Key:ruined
     'ruined:': 'RU:Key:ruined:'
+    ruined:*: RU:Key:ruined:*
+    ruined:building: RU:Key:ruined:building
     ruins: RU:Key:ruins
     ruins: RU:Key:ruins
+    rungs: RU:Key:rungs
     sac_scale: RU:Key:sac scale
     sac_scale: RU:Key:sac scale
+    sailboat: RU:Key:sailboat
     salt: RU:Key:salt
     sanitary_dump_station: RU:Key:sanitary dump station
     salt: RU:Key:salt
     sanitary_dump_station: RU:Key:sanitary dump station
+    sauna: RU:Key:sauna
+    school: RU:Key:school
+    school:type: RU:Key:school:type
+    school_bus: RU:Key:school bus
+    scout: RU:Key:scout
+    scuba_diving:rental: RU:Key:scuba diving:rental
+    sculpture_type: RU:Key:sculpture type
     seasonal: RU:Key:seasonal
     seasonal:snowfall:regaintime: RU:Key:seasonal:snowfall:regaintime
     second_hand: RU:Key:second hand
     service: RU:Key:service
     seasonal: RU:Key:seasonal
     seasonal:snowfall:regaintime: RU:Key:seasonal:snowfall:regaintime
     second_hand: RU:Key:second hand
     service: RU:Key:service
+    service:bicycle: RU:Key:service:bicycle
+    service:bicycle:*: RU:Key:service:bicycle:*
+    service:bicycle:cleaning: RU:Key:service:bicycle:cleaning
+    service:bicycle:diy: RU:Key:service:bicycle:diy
+    service:bicycle:pump: RU:Key:service:bicycle:pump
+    service:bicycle:rental: RU:Key:service:bicycle:rental
+    service:bicycle:repair: RU:Key:service:bicycle:repair
+    service:bicycle:retail: RU:Key:service:bicycle:retail
     service_times: RU:Key:service times
     shelter: RU:Key:shelter
     shelter_type: RU:Key:shelter type
     service_times: RU:Key:service times
     shelter: RU:Key:shelter
     shelter_type: RU:Key:shelter type
+    ship:type: RU:Key:ship:type
     shooting: RU:Key:shooting
     shop: RU:Key:shop
     shooting: RU:Key:shooting
     shop: RU:Key:shop
+    shoulder: RU:Key:shoulder
     side_road: RU:Key:side road
     sidewalk: RU:Key:sidewalk
     sinkhole: RU:Key:sinkhole
     side_road: RU:Key:side road
     sidewalk: RU:Key:sidewalk
     sinkhole: RU:Key:sinkhole
@@ -20291,44 +27385,85 @@ ru:
     smoothness: RU:Key:smoothness
     snowplowing: RU:Key:snowplowing
     social_facility: RU:Key:social facility
     smoothness: RU:Key:smoothness
     snowplowing: RU:Key:snowplowing
     social_facility: RU:Key:social facility
+    social_facility:for: RU:Key:social facility:for
+    socket: RU:Key:socket
     sorting_name: RU:Key:sorting name
     source: RU:Key:source
     source:addr: RU:Key:source:addr
     source:maxspeed: RU:Key:source:maxspeed
     source:taxon: RU:Key:source:taxon
     sorting_name: RU:Key:sorting name
     source: RU:Key:source
     source:addr: RU:Key:source:addr
     source:maxspeed: RU:Key:source:maxspeed
     source:taxon: RU:Key:source:taxon
+    source_ref: RU:Key:source ref
     species: RU:Key:species
     species: RU:Key:species
+    speed_pedelec: RU:Key:speed pedelec
     sport: RU:Key:sport
     start_date: RU:Key:start date
     sport: RU:Key:sport
     start_date: RU:Key:start date
+    statue: RU:Key:statue
     step_count: RU:Key:step count
     step_count: RU:Key:step count
+    stove: RU:Key:stove
+    studio: RU:Key:studio
     substance: RU:Key:substance
     substance: RU:Key:substance
+    supervised: RU:Key:supervised
     surface: RU:Key:surface
     surface: RU:Key:surface
+    surface:colour: RU:Key:surface:colour
     surveillance: RU:Key:surveillance
     survey:date: RU:Key:survey:date
     surveillance: RU:Key:surveillance
     survey:date: RU:Key:survey:date
+    survey_point:purpose: RU:Key:survey point:purpose
+    survey_point:structure: RU:Key:survey point:structure
+    sustrans_ref: RU:Key:sustrans ref
+    swimming: RU:Key:swimming
+    swimming_pool: RU:Key:swimming pool
+    symbol: RU:Key:symbol
     tactile_paving: RU:Key:tactile paving
     taxon: RU:Key:taxon
     technology: RU:Key:technology
     tactile_paving: RU:Key:tactile paving
     taxon: RU:Key:taxon
     technology: RU:Key:technology
+    television: RU:Key:television
+    tents: RU:Key:tents
+    terrace: RU:Key:terrace
+    theatre:genre: RU:Key:theatre:genre
+    theatre:type: RU:Key:theatre:type
+    tidal: RU:Key:tidal
     todo: RU:Key:todo
     toilets: RU:Key:toilets
     toilets:wheelchair: RU:Key:toilets:wheelchair
     toll: RU:Key:toll
     tourism: RU:Key:tourism
     todo: RU:Key:todo
     toilets: RU:Key:toilets
     toilets:wheelchair: RU:Key:toilets:wheelchair
     toll: RU:Key:toll
     tourism: RU:Key:tourism
+    tourist_bus: RU:Key:tourist bus
     tower:type: RU:Key:tower:type
     tower:type: RU:Key:tower:type
+    townhall:type: RU:Key:townhall:type
     tracktype: RU:Key:tracktype
     traffic_calming: RU:Key:traffic calming
     traffic_sign: RU:Key:traffic sign
     traffic_signals: RU:Key:traffic signals
     tracktype: RU:Key:tracktype
     traffic_calming: RU:Key:traffic calming
     traffic_sign: RU:Key:traffic sign
     traffic_signals: RU:Key:traffic signals
+    traffic_signals:sections: RU:Key:traffic signals:sections
+    traffic_signals:timing: RU:Key:traffic signals:timing
     trail_visibility: RU:Key:trail visibility
     trail_visibility: RU:Key:trail visibility
+    trailer:rental: RU:Key:trailer:rental
+    training: RU:Key:training
     tram: RU:Key:tram
     tram: RU:Key:tram
+    trolley_wire: RU:Key:trolley wire
     trolleybus: RU:Key:trolleybus
     tunnel: RU:Key:tunnel
     turn: RU:Key:turn
     turn:lanes: RU:Key:turn:lanes
     type: RU:Key:type
     trolleybus: RU:Key:trolleybus
     tunnel: RU:Key:tunnel
     turn: RU:Key:turn
     turn:lanes: RU:Key:turn:lanes
     type: RU:Key:type
+    url: RU:Key:url
     usage: RU:Key:usage
     usage: RU:Key:usage
+    vaccination: RU:Key:vaccination
     vehicle: RU:Key:vehicle
     vehicle: RU:Key:vehicle
+    vehicle:wikidata: RU:Key:vehicle:wikidata
+    vehicle:wikipedia: RU:Key:vehicle:wikipedia
+    vending: RU:Key:vending
+    view: RU:Key:view
+    viewpoint: RU:Key:viewpoint
+    visibility: RU:Key:visibility
+    volcano:status: RU:Key:volcano:status
     voltage: RU:Key:voltage
     voltage: RU:Key:voltage
+    was:amenity: RU:Key:was:amenity
+    washing_machine: RU:Key:washing machine
     waste: RU:Key:waste
     water: RU:Key:water
     waste: RU:Key:waste
     water: RU:Key:water
+    water_source: RU:Key:water source
+    water_system: RU:Key:water system
     waterway: RU:Key:waterway
     website: RU:Key:website
     wheelchair: RU:Key:wheelchair
     waterway: RU:Key:waterway
     website: RU:Key:website
     wheelchair: RU:Key:wheelchair
@@ -20338,9 +27473,22 @@ ru:
     wikipedia: RU:Key:wikipedia
     wikipedia:ru: RU:Key:wikipedia:ru
     winter_road: RU:Key:winter road
     wikipedia: RU:Key:wikipedia
     wikipedia:ru: RU:Key:wikipedia:ru
     winter_road: RU:Key:winter road
+    winter_service: RU:Key:winter service
     wood: RU:Key:wood
     xmas:feature: RU:Key:xmas:feature
     wood: RU:Key:wood
     xmas:feature: RU:Key:xmas:feature
+    zone:traffic: RU:Key:zone:traffic
+    zoo: RU:Key:zoo
   tag:
   tag:
+    abandoned:amenity=prison: RU:Tag:abandoned:amenity=prison
+    abandoned:amenity=prison_camp: RU:Tag:abandoned:amenity=prison camp
+    abandoned:landuse=landfill: RU:Tag:abandoned:landuse=landfill
+    abandoned:landuse=quarry: RU:Tag:abandoned:landuse=quarry
+    abandoned:place=yes: RU:Tag:abandoned:place=yes
+    abutters=commercial: RU:Tag:abutters=commercial
+    abutters=industrial: RU:Tag:abutters=industrial
+    abutters=mixed: RU:Tag:abutters=mixed
+    abutters=residential: RU:Tag:abutters=residential
+    abutters=retail: RU:Tag:abutters=retail
     access=customers: RU:Tag:access=customers
     access=delivery: RU:Tag:access=delivery
     access=designated: RU:Tag:access=designated
     access=customers: RU:Tag:access=customers
     access=delivery: RU:Tag:access=delivery
     access=designated: RU:Tag:access=designated
@@ -20351,48 +27499,117 @@ ru:
     access=permissive: RU:Tag:access=permissive
     access=private: RU:Tag:access=private
     access=unknown: RU:Tag:access=unknown
     access=permissive: RU:Tag:access=permissive
     access=private: RU:Tag:access=private
     access=unknown: RU:Tag:access=unknown
-    access=yes: RU:Tag:access=yes
+    admin_level=2: RU:Tag:admin level=2
     advertising=board: RU:Tag:advertising=board
     advertising=flag: RU:Tag:advertising=flag
     advertising=screen: RU:Tag:advertising=screen
     advertising=sculpture: RU:Tag:advertising=sculpture
     advertising=wall_painting: RU:Tag:advertising=wall painting
     advertising=board: RU:Tag:advertising=board
     advertising=flag: RU:Tag:advertising=flag
     advertising=screen: RU:Tag:advertising=screen
     advertising=sculpture: RU:Tag:advertising=sculpture
     advertising=wall_painting: RU:Tag:advertising=wall painting
+    aerialway:drag_lift=j-bar: RU:Tag:aerialway:drag lift=j-bar
+    aerialway:drag_lift=platter: RU:Tag:aerialway:drag lift=platter
+    aerialway:drag_lift=t-bar: RU:Tag:aerialway:drag lift=t-bar
+    aerialway=cable_car: RU:Tag:aerialway=cable car
+    aerialway=canopy: RU:Tag:aerialway=canopy
+    aerialway=chair_lift: RU:Tag:aerialway=chair lift
+    aerialway=drag_lift: RU:Tag:aerialway=drag lift
+    aerialway=gondola: RU:Tag:aerialway=gondola
+    aerialway=goods: RU:Tag:aerialway=goods
+    aerialway=j-bar: RU:Tag:aerialway=j-bar
+    aerialway=magic_carpet: RU:Tag:aerialway=magic carpet
+    aerialway=mixed_lift: RU:Tag:aerialway=mixed lift
+    aerialway=platter: RU:Tag:aerialway=platter
+    aerialway=pylon: RU:Tag:aerialway=pylon
+    aerialway=rope_tow: RU:Tag:aerialway=rope tow
+    aerialway=station: RU:Tag:aerialway=station
+    aerialway=t-bar: RU:Tag:aerialway=t-bar
+    aerialway=zip_line: RU:Tag:aerialway=zip line
     aerodrome:type=airfield: RU:Tag:aerodrome:type=airfield
     aerodrome:type=airfield: RU:Tag:aerodrome:type=airfield
+    aerodrome:type=gliding: RU:Tag:aerodrome:type=gliding
+    aerodrome:type=international: RU:Tag:aerodrome:type=international
+    aerodrome:type=military: RU:Tag:aerodrome:type=military
+    aerodrome:type=private: RU:Tag:aerodrome:type=private
+    aerodrome:type=regional: RU:Tag:aerodrome:type=regional
+    aerospace:product=robot: RU:Tag:aerospace:product=robot
+    aerospace:product=rocket: RU:Tag:aerospace:product=rocket
+    aerospace:product=satellite: RU:Tag:aerospace:product=satellite
+    aerospace:product=spacecraft: RU:Tag:aerospace:product=spacecraft
+    aerospace:product=spacecraft_propulsion: RU:Tag:aerospace:product=spacecraft propulsion
     aeroway=aerodrome: RU:Tag:aeroway=aerodrome
     aeroway=aerodrome: RU:Tag:aeroway=aerodrome
+    aeroway=aircraft_crossing: RU:Tag:aeroway=aircraft crossing
+    aeroway=airport: RU:Tag:aeroway=airport
+    aeroway=airstrip: RU:Tag:aeroway=airstrip
+    aeroway=airtanker_base: RU:Tag:aeroway=airtanker base
     aeroway=apron: RU:Tag:aeroway=apron
     aeroway=apron: RU:Tag:aeroway=apron
+    aeroway=arresting_gear: RU:Tag:aeroway=arresting gear
+    aeroway=flame_trench: RU:Tag:aeroway=flame trench
+    aeroway=fuel: RU:Tag:aeroway=fuel
     aeroway=gate: RU:Tag:aeroway=gate
     aeroway=hangar: RU:Tag:aeroway=hangar
     aeroway=helipad: RU:Tag:aeroway=helipad
     aeroway=heliport: RU:Tag:aeroway=heliport
     aeroway=gate: RU:Tag:aeroway=gate
     aeroway=hangar: RU:Tag:aeroway=hangar
     aeroway=helipad: RU:Tag:aeroway=helipad
     aeroway=heliport: RU:Tag:aeroway=heliport
+    aeroway=highway_strip: RU:Tag:aeroway=highway strip
+    aeroway=holding_position: RU:Tag:aeroway=holding position
+    aeroway=jet_bridge: RU:Tag:aeroway=jet bridge
+    aeroway=landingpad: RU:Tag:aeroway=landingpad
+    aeroway=launch_complex: RU:Tag:aeroway=launch complex
+    aeroway=launchpad: RU:Tag:aeroway=launchpad
     aeroway=navigationaid: RU:Tag:aeroway=navigationaid
     aeroway=navigationaid: RU:Tag:aeroway=navigationaid
+    aeroway=papi: RU:Tag:aeroway=papi
+    aeroway=parking_position: RU:Tag:aeroway=parking position
     aeroway=runway: RU:Tag:aeroway=runway
     aeroway=runway: RU:Tag:aeroway=runway
+    aeroway=spaceport: RU:Tag:aeroway=spaceport
+    aeroway=stopway: RU:Tag:aeroway=stopway
+    aeroway=taxilane: RU:Tag:aeroway=taxilane
     aeroway=taxiway: RU:Tag:aeroway=taxiway
     aeroway=terminal: RU:Tag:aeroway=terminal
     aeroway=taxiway: RU:Tag:aeroway=taxiway
     aeroway=terminal: RU:Tag:aeroway=terminal
+    aeroway=threshold: RU:Tag:aeroway=threshold
+    aeroway=tower: RU:Tag:aeroway=tower
     aeroway=windsock: RU:Tag:aeroway=windsock
     aeroway=windsock: RU:Tag:aeroway=windsock
+    airmark=beacon: RU:Tag:airmark=beacon
+    allotments=plot: RU:Tag:allotments=plot
     amenity=animal_boarding: RU:Tag:amenity=animal boarding
     amenity=animal_breeding: RU:Tag:amenity=animal breeding
     amenity=animal_boarding: RU:Tag:amenity=animal boarding
     amenity=animal_breeding: RU:Tag:amenity=animal breeding
+    amenity=animal_hitch: RU:Tag:amenity=animal hitch
     amenity=animal_shelter: RU:Tag:amenity=animal shelter
     amenity=animal_shelter: RU:Tag:amenity=animal shelter
+    amenity=animal_training: RU:Tag:amenity=animal training
+    amenity=archive: RU:Tag:amenity=archive
     amenity=arts_centre: RU:Tag:amenity=arts centre
     amenity=atm: RU:Tag:amenity=atm
     amenity=baby_hatch: RU:Tag:amenity=baby hatch
     amenity=arts_centre: RU:Tag:amenity=arts centre
     amenity=atm: RU:Tag:amenity=atm
     amenity=baby_hatch: RU:Tag:amenity=baby hatch
+    amenity=baking_oven: RU:Tag:amenity=baking oven
     amenity=bank: RU:Tag:amenity=bank
     amenity=bar: RU:Tag:amenity=bar
     amenity=bbq: RU:Tag:amenity=bbq
     amenity=bank: RU:Tag:amenity=bank
     amenity=bar: RU:Tag:amenity=bar
     amenity=bbq: RU:Tag:amenity=bbq
+    amenity=bear_box: RU:Tag:amenity=bear box
     amenity=bench: RU:Tag:amenity=bench
     amenity=bench: RU:Tag:amenity=bench
+    amenity=bicycle_library: RU:Tag:amenity=bicycle library
     amenity=bicycle_parking: RU:Tag:amenity=bicycle parking
     amenity=bicycle_rental: RU:Tag:amenity=bicycle rental
     amenity=bicycle_repair_station: RU:Tag:amenity=bicycle repair station
     amenity=bicycle_parking: RU:Tag:amenity=bicycle parking
     amenity=bicycle_rental: RU:Tag:amenity=bicycle rental
     amenity=bicycle_repair_station: RU:Tag:amenity=bicycle repair station
+    amenity=bicycle_trailer_sharing: RU:Tag:amenity=bicycle trailer sharing
+    amenity=bicycle_wash: RU:Tag:amenity=bicycle wash
     amenity=biergarten: RU:Tag:amenity=biergarten
     amenity=biergarten: RU:Tag:amenity=biergarten
+    amenity=binoculars: RU:Tag:amenity=binoculars
+    amenity=bird_bath: RU:Tag:amenity=bird bath
+    amenity=blood_bank: RU:Tag:amenity=blood bank
+    amenity=boat_rental: RU:Tag:amenity=boat rental
+    amenity=boat_sharing: RU:Tag:amenity=boat sharing
     amenity=boat_storage: RU:Tag:amenity=boat storage
     amenity=border_control: RU:Tag:amenity=border control
     amenity=brothel: RU:Tag:amenity=brothel
     amenity=boat_storage: RU:Tag:amenity=boat storage
     amenity=border_control: RU:Tag:amenity=border control
     amenity=brothel: RU:Tag:amenity=brothel
+    amenity=buggy_parking: RU:Tag:amenity=buggy parking
     amenity=bureau_de_change: RU:Tag:amenity=bureau de change
     amenity=bus_station: RU:Tag:amenity=bus station
     amenity=cafe: RU:Tag:amenity=cafe
     amenity=bureau_de_change: RU:Tag:amenity=bureau de change
     amenity=bus_station: RU:Tag:amenity=bus station
     amenity=cafe: RU:Tag:amenity=cafe
+    amenity=canteen: RU:Tag:amenity=canteen
+    amenity=car_pooling: RU:Tag:amenity=car pooling
     amenity=car_rental: RU:Tag:amenity=car rental
     amenity=car_sharing: RU:Tag:amenity=car sharing
     amenity=car_wash: RU:Tag:amenity=car wash
     amenity=car_rental: RU:Tag:amenity=car rental
     amenity=car_sharing: RU:Tag:amenity=car sharing
     amenity=car_wash: RU:Tag:amenity=car wash
+    amenity=carpet_washing: RU:Tag:amenity=carpet washing
     amenity=casino: RU:Tag:amenity=casino
     amenity=casino: RU:Tag:amenity=casino
+    amenity=chair: RU:Tag:amenity=chair
+    amenity=changing_room: RU:Tag:amenity=changing room
     amenity=charging_station: RU:Tag:amenity=charging station
     amenity=checkpoint: RU:Tag:amenity=checkpoint
     amenity=childcare: RU:Tag:amenity=childcare
     amenity=charging_station: RU:Tag:amenity=charging station
     amenity=checkpoint: RU:Tag:amenity=checkpoint
     amenity=childcare: RU:Tag:amenity=childcare
@@ -20404,72 +27621,134 @@ ru:
     amenity=college: RU:Tag:amenity=college
     amenity=community_centre: RU:Tag:amenity=community centre
     amenity=compressed_air: RU:Tag:amenity=compressed air
     amenity=college: RU:Tag:amenity=college
     amenity=community_centre: RU:Tag:amenity=community centre
     amenity=compressed_air: RU:Tag:amenity=compressed air
+    amenity=concert_hall: RU:Tag:amenity=concert hall
+    amenity=conference_centre: RU:Tag:amenity=conference centre
+    amenity=convention_centre: RU:Tag:amenity=convention centre
     amenity=courthouse: RU:Tag:amenity=courthouse
     amenity=coworking_space: RU:Tag:amenity=coworking space
     amenity=crematorium: RU:Tag:amenity=crematorium
     amenity=courthouse: RU:Tag:amenity=courthouse
     amenity=coworking_space: RU:Tag:amenity=coworking space
     amenity=crematorium: RU:Tag:amenity=crematorium
+    amenity=crypt: RU:Tag:amenity=crypt
     amenity=customs: RU:Tag:amenity=customs
     amenity=customs: RU:Tag:amenity=customs
+    amenity=dancing_school: RU:Tag:amenity=dancing school
     amenity=dentist: RU:Tag:amenity=dentist
     amenity=device_charging_station: RU:Tag:amenity=device charging station
     amenity=dentist: RU:Tag:amenity=dentist
     amenity=device_charging_station: RU:Tag:amenity=device charging station
+    amenity=dive_centre: RU:Tag:amenity=dive centre
+    amenity=doctor: RU:Tag:amenity=doctor
     amenity=doctors: RU:Tag:amenity=doctors
     amenity=doctors: RU:Tag:amenity=doctors
+    amenity=dog_bin: RU:Tag:amenity=dog bin
+    amenity=dog_parking: RU:Tag:amenity=dog parking
+    amenity=dog_toilet: RU:Tag:amenity=dog toilet
     amenity=dojo: RU:Tag:amenity=dojo
     amenity=dojo: RU:Tag:amenity=dojo
+    amenity=dormitory: RU:Tag:amenity=dormitory
+    amenity=dressing_room: RU:Tag:amenity=dressing room
     amenity=drinking_water: RU:Tag:amenity=drinking water
     amenity=driver_training: RU:Tag:amenity=driver training
     amenity=driving_school: RU:Tag:amenity=driving school
     amenity=drinking_water: RU:Tag:amenity=drinking water
     amenity=driver_training: RU:Tag:amenity=driver training
     amenity=driving_school: RU:Tag:amenity=driving school
+    amenity=dryer: RU:Tag:amenity=dryer
+    amenity=education: RU:Tag:amenity=education
     amenity=embassy: RU:Tag:amenity=embassy
     amenity=embassy: RU:Tag:amenity=embassy
+    amenity=emergency_service: RU:Tag:amenity=emergency service
+    amenity=events_centre: RU:Tag:amenity=events centre
+    amenity=events_venue: RU:Tag:amenity=events venue
+    amenity=exhibition_centre: RU:Tag:amenity=exhibition centre
     amenity=fast_food: RU:Tag:amenity=fast food
     amenity=feeding_place: RU:Tag:amenity=feeding place
     amenity=ferry_terminal: RU:Tag:amenity=ferry terminal
     amenity=fast_food: RU:Tag:amenity=fast food
     amenity=feeding_place: RU:Tag:amenity=feeding place
     amenity=ferry_terminal: RU:Tag:amenity=ferry terminal
+    amenity=festival_grounds: RU:Tag:amenity=festival grounds
     amenity=financial_advice: RU:Tag:amenity=financial advice
     amenity=fire_station: RU:Tag:amenity=fire station
     amenity=financial_advice: RU:Tag:amenity=financial advice
     amenity=fire_station: RU:Tag:amenity=fire station
+    amenity=first_aid_school: RU:Tag:amenity=first aid school
     amenity=fish_spa: RU:Tag:amenity=fish spa
     amenity=food_court: RU:Tag:amenity=food court
     amenity=fish_spa: RU:Tag:amenity=fish spa
     amenity=food_court: RU:Tag:amenity=food court
+    amenity=food_sharing: RU:Tag:amenity=food sharing
+    amenity=foot_shower: RU:Tag:amenity=foot shower
     amenity=fountain: RU:Tag:amenity=fountain
     amenity=fountain: RU:Tag:amenity=fountain
+    amenity=freeshop: RU:Tag:amenity=freeshop
     amenity=fridge: RU:Tag:amenity=fridge
     amenity=fuel: RU:Tag:amenity=fuel
     amenity=fridge: RU:Tag:amenity=fridge
     amenity=fuel: RU:Tag:amenity=fuel
+    amenity=funeral_hall: RU:Tag:amenity=funeral hall
+    amenity=gambling: RU:Tag:amenity=gambling
     amenity=game_feeding: RU:Tag:amenity=game feeding
     amenity=game_feeding: RU:Tag:amenity=game feeding
+    amenity=give_box: RU:Tag:amenity=give box
     amenity=grave_yard: RU:Tag:amenity=grave yard
     amenity=grit_bin: RU:Tag:amenity=grit bin
     amenity=harbourmaster: RU:Tag:amenity=harbourmaster
     amenity=grave_yard: RU:Tag:amenity=grave yard
     amenity=grit_bin: RU:Tag:amenity=grit bin
     amenity=harbourmaster: RU:Tag:amenity=harbourmaster
+    amenity=health_post: RU:Tag:amenity=health post
+    amenity=hitching_post: RU:Tag:amenity=hitching post
     amenity=hookah_lounge: RU:Tag:amenity=hookah lounge
     amenity=hospice: RU:Tag:amenity=hospice
     amenity=hospital: RU:Tag:amenity=hospital
     amenity=hookah_lounge: RU:Tag:amenity=hookah lounge
     amenity=hospice: RU:Tag:amenity=hospice
     amenity=hospital: RU:Tag:amenity=hospital
+    amenity=hunting_stand: RU:Tag:amenity=hunting stand
     amenity=ice_cream: RU:Tag:amenity=ice cream
     amenity=ice_cream: RU:Tag:amenity=ice cream
+    amenity=internet_cafe: RU:Tag:amenity=internet cafe
+    amenity=juice_bar: RU:Tag:amenity=juice bar
+    amenity=karaoke_box: RU:Tag:amenity=karaoke box
+    amenity=kick-scooter_parking: RU:Tag:amenity=kick-scooter parking
+    amenity=kick-scooter_rental: RU:Tag:amenity=kick-scooter rental
     amenity=kindergarten: RU:Tag:amenity=kindergarten
     amenity=kitchen: RU:Tag:amenity=kitchen
     amenity=kneipp_water_cure: RU:Tag:amenity=kneipp water cure
     amenity=language_school: RU:Tag:amenity=language school
     amenity=kindergarten: RU:Tag:amenity=kindergarten
     amenity=kitchen: RU:Tag:amenity=kitchen
     amenity=kneipp_water_cure: RU:Tag:amenity=kneipp water cure
     amenity=language_school: RU:Tag:amenity=language school
+    amenity=lavoir: RU:Tag:amenity=lavoir
     amenity=letter_box: RU:Tag:amenity=letter box
     amenity=library: RU:Tag:amenity=library
     amenity=letter_box: RU:Tag:amenity=letter box
     amenity=library: RU:Tag:amenity=library
+    amenity=library_dropoff: RU:Tag:amenity=library dropoff
     amenity=loading_dock: RU:Tag:amenity=loading dock
     amenity=loading_dock: RU:Tag:amenity=loading dock
+    amenity=locker: RU:Tag:amenity=locker
+    amenity=lost_property_office: RU:Tag:amenity=lost property office
+    amenity=lounger: RU:Tag:amenity=lounger
     amenity=love_hotel: RU:Tag:amenity=love hotel
     amenity=love_hotel: RU:Tag:amenity=love hotel
+    amenity=mailroom: RU:Tag:amenity=mailroom
     amenity=marae: RU:Tag:amenity=marae
     amenity=marketplace: RU:Tag:amenity=marketplace
     amenity=marae: RU:Tag:amenity=marae
     amenity=marketplace: RU:Tag:amenity=marketplace
+    amenity=mist_spraying_cooler: RU:Tag:amenity=mist spraying cooler
     amenity=mobile_library: RU:Tag:amenity=mobile library
     amenity=mobile_library: RU:Tag:amenity=mobile library
+    amenity=mobile_money_agent: RU:Tag:amenity=mobile money agent
     amenity=monastery: RU:Tag:amenity=monastery
     amenity=monastery: RU:Tag:amenity=monastery
+    amenity=money_transfer: RU:Tag:amenity=money transfer
     amenity=mortuary: RU:Tag:amenity=mortuary
     amenity=motorcycle_parking: RU:Tag:amenity=motorcycle parking
     amenity=mortuary: RU:Tag:amenity=mortuary
     amenity=motorcycle_parking: RU:Tag:amenity=motorcycle parking
+    amenity=motorcycle_rental: RU:Tag:amenity=motorcycle rental
+    amenity=motorcycle_taxi: RU:Tag:amenity=motorcycle taxi
+    amenity=music_school: RU:Tag:amenity=music school
+    amenity=music_venue: RU:Tag:amenity=music venue
     amenity=nightclub: RU:Tag:amenity=nightclub
     amenity=nightclub: RU:Tag:amenity=nightclub
+    amenity=nursery: RU:Tag:amenity=nursery
     amenity=nursing_home: RU:Tag:amenity=nursing home
     amenity=nursing_home: RU:Tag:amenity=nursing home
+    amenity=parcel_locker: RU:Tag:amenity=parcel locker
+    amenity=park: RU:Tag:amenity=park
     amenity=parking: RU:Tag:amenity=parking
     amenity=parking_entrance: RU:Tag:amenity=parking entrance
     amenity=parking_space: RU:Tag:amenity=parking space
     amenity=parking: RU:Tag:amenity=parking
     amenity=parking_entrance: RU:Tag:amenity=parking entrance
     amenity=parking_space: RU:Tag:amenity=parking space
+    amenity=payment_centre: RU:Tag:amenity=payment centre
     amenity=payment_terminal: RU:Tag:amenity=payment terminal
     amenity=pharmacy: RU:Tag:amenity=pharmacy
     amenity=payment_terminal: RU:Tag:amenity=payment terminal
     amenity=pharmacy: RU:Tag:amenity=pharmacy
+    amenity=photo_booth: RU:Tag:amenity=photo booth
+    amenity=place_of_mourning: RU:Tag:amenity=place of mourning
     amenity=place_of_worship: RU:Tag:amenity=place of worship
     amenity=planetarium: RU:Tag:amenity=planetarium
     amenity=police: RU:Tag:amenity=police
     amenity=polling_station: RU:Tag:amenity=polling station
     amenity=post_box: RU:Tag:amenity=post box
     amenity=place_of_worship: RU:Tag:amenity=place of worship
     amenity=planetarium: RU:Tag:amenity=planetarium
     amenity=police: RU:Tag:amenity=police
     amenity=polling_station: RU:Tag:amenity=polling station
     amenity=post_box: RU:Tag:amenity=post box
+    amenity=post_depot: RU:Tag:amenity=post depot
     amenity=post_office: RU:Tag:amenity=post office
     amenity=post_office: RU:Tag:amenity=post office
+    amenity=prep_school: RU:Tag:amenity=prep school
+    amenity=preschool: RU:Tag:amenity=preschool
     amenity=prison: RU:Tag:amenity=prison
     amenity=prison: RU:Tag:amenity=prison
+    amenity=prison_camp: RU:Tag:amenity=prison camp
     amenity=pub: RU:Tag:amenity=pub
     amenity=pub: RU:Tag:amenity=pub
+    amenity=public_bath: RU:Tag:amenity=public bath
     amenity=public_bookcase: RU:Tag:amenity=public bookcase
     amenity=public_building: RU:Tag:amenity=public building
     amenity=public_bookcase: RU:Tag:amenity=public bookcase
     amenity=public_building: RU:Tag:amenity=public building
+    amenity=ranger_station: RU:Tag:amenity=ranger station
+    amenity=reception_desk: RU:Tag:amenity=reception desk
     amenity=recycling: RU:Tag:amenity=recycling
     amenity=recycling: RU:Tag:amenity=recycling
+    amenity=refugee_site: RU:Tag:amenity=refugee site
     amenity=register_office: RU:Tag:amenity=register office
     amenity=rescue_station: RU:Tag:amenity=rescue station
     amenity=research_institute: RU:Tag:amenity=research institute
     amenity=restaurant: RU:Tag:amenity=restaurant
     amenity=register_office: RU:Tag:amenity=register office
     amenity=rescue_station: RU:Tag:amenity=rescue station
     amenity=research_institute: RU:Tag:amenity=research institute
     amenity=restaurant: RU:Tag:amenity=restaurant
+    amenity=sailing_school: RU:Tag:amenity=sailing school
     amenity=sanatorium: RU:Tag:amenity=sanatorium
     amenity=sanitary_dump_station: RU:Tag:amenity=sanitary dump station
     amenity=sauna: RU:Tag:amenity=sauna
     amenity=sanatorium: RU:Tag:amenity=sanatorium
     amenity=sanitary_dump_station: RU:Tag:amenity=sanitary dump station
     amenity=sauna: RU:Tag:amenity=sauna
@@ -20478,20 +27757,36 @@ ru:
     amenity=shelter: RU:Tag:amenity=shelter
     amenity=shop: RU:Tag:amenity=shop
     amenity=shower: RU:Tag:amenity=shower
     amenity=shelter: RU:Tag:amenity=shelter
     amenity=shop: RU:Tag:amenity=shop
     amenity=shower: RU:Tag:amenity=shower
+    amenity=ski_rental: RU:Tag:amenity=ski rental
+    amenity=ski_school: RU:Tag:amenity=ski school
     amenity=smoking_area: RU:Tag:amenity=smoking area
     amenity=smoking_area: RU:Tag:amenity=smoking area
+    amenity=social_centre: RU:Tag:amenity=social centre
+    amenity=social_club: RU:Tag:amenity=social club
     amenity=social_facility: RU:Tag:amenity=social facility
     amenity=social_facility: RU:Tag:amenity=social facility
+    amenity=stables: RU:Tag:amenity=stables
+    amenity=stage: RU:Tag:amenity=stage
     amenity=stool: RU:Tag:amenity=stool
     amenity=stripclub: RU:Tag:amenity=stripclub
     amenity=stool: RU:Tag:amenity=stool
     amenity=stripclub: RU:Tag:amenity=stripclub
+    amenity=student_accommodation: RU:Tag:amenity=student accommodation
     amenity=studio: RU:Tag:amenity=studio
     amenity=studio: RU:Tag:amenity=studio
+    amenity=surf_school: RU:Tag:amenity=surf school
     amenity=swingerclub: RU:Tag:amenity=swingerclub
     amenity=table: RU:Tag:amenity=table
     amenity=taxi: RU:Tag:amenity=taxi
     amenity=telephone: RU:Tag:amenity=telephone
     amenity=television: RU:Tag:amenity=television
     amenity=theatre: RU:Tag:amenity=theatre
     amenity=swingerclub: RU:Tag:amenity=swingerclub
     amenity=table: RU:Tag:amenity=table
     amenity=taxi: RU:Tag:amenity=taxi
     amenity=telephone: RU:Tag:amenity=telephone
     amenity=television: RU:Tag:amenity=television
     amenity=theatre: RU:Tag:amenity=theatre
+    amenity=ticket_validator: RU:Tag:amenity=ticket validator
+    amenity=toilet: RU:Tag:amenity=toilet
     amenity=toilets: RU:Tag:amenity=toilets
     amenity=toilets: RU:Tag:amenity=toilets
+    amenity=tourist_bus_parking: RU:Tag:amenity=tourist bus parking
     amenity=townhall: RU:Tag:amenity=townhall
     amenity=townhall: RU:Tag:amenity=townhall
+    amenity=toy_library: RU:Tag:amenity=toy library
+    amenity=trade_school: RU:Tag:amenity=trade school
+    amenity=traffic_park: RU:Tag:amenity=traffic park
+    amenity=training: RU:Tag:amenity=training
     amenity=trolley_bay: RU:Tag:amenity=trolley bay
     amenity=trolley_bay: RU:Tag:amenity=trolley bay
+    amenity=tuition: RU:Tag:amenity=tuition
     amenity=university: RU:Tag:amenity=university
     amenity=vacuum_cleaner: RU:Tag:amenity=vacuum cleaner
     amenity=vehicle_inspection: RU:Tag:amenity=vehicle inspection
     amenity=university: RU:Tag:amenity=university
     amenity=vacuum_cleaner: RU:Tag:amenity=vacuum cleaner
     amenity=vehicle_inspection: RU:Tag:amenity=vehicle inspection
@@ -20499,22 +27794,51 @@ ru:
     amenity=vending_machine: RU:Tag:amenity=vending machine
     amenity=veterinary: RU:Tag:amenity=veterinary
     amenity=veterinary_pharmacy: RU:Tag:amenity=veterinary pharmacy
     amenity=vending_machine: RU:Tag:amenity=vending machine
     amenity=veterinary: RU:Tag:amenity=veterinary
     amenity=veterinary_pharmacy: RU:Tag:amenity=veterinary pharmacy
+    amenity=vivarium: RU:Tag:amenity=vivarium
     amenity=washing_machine: RU:Tag:amenity=washing machine
     amenity=waste_basket: RU:Tag:amenity=waste basket
     amenity=waste_disposal: RU:Tag:amenity=waste disposal
     amenity=washing_machine: RU:Tag:amenity=washing machine
     amenity=waste_basket: RU:Tag:amenity=waste basket
     amenity=waste_disposal: RU:Tag:amenity=waste disposal
+    amenity=waste_dump_site: RU:Tag:amenity=waste dump site
+    amenity=waste_transfer_station: RU:Tag:amenity=waste transfer station
     amenity=water_point: RU:Tag:amenity=water point
     amenity=watering_place: RU:Tag:amenity=watering place
     amenity=weighbridge: RU:Tag:amenity=weighbridge
     amenity=water_point: RU:Tag:amenity=water point
     amenity=watering_place: RU:Tag:amenity=watering place
     amenity=weighbridge: RU:Tag:amenity=weighbridge
+    amenity=whirlpool: RU:Tag:amenity=whirlpool
+    amenity=workshop: RU:Tag:amenity=workshop
+    animal=horse_walker: RU:Tag:animal=horse walker
+    animal=school: RU:Tag:animal=school
     animated=trivision_blades: RU:Tag:animated=trivision blades
     animated=winding_posters: RU:Tag:animated=winding posters
     anthropogenic=yes: RU:Tag:anthropogenic=yes
     animated=trivision_blades: RU:Tag:animated=trivision blades
     animated=winding_posters: RU:Tag:animated=winding posters
     anthropogenic=yes: RU:Tag:anthropogenic=yes
+    aquaculture=fish: RU:Tag:aquaculture=fish
+    aquaculture=seaweed: RU:Tag:aquaculture=seaweed
+    archaeological_site=fortification: RU:Tag:archaeological site=fortification
+    archaeological_site=grave_field: RU:Tag:archaeological site=grave field
+    archaeological_site=petroglyph: RU:Tag:archaeological site=petroglyph
+    area:highway=cycleway: RU:Tag:area:highway=cycleway
+    artwork_type=architecture: RU:Tag:artwork type=architecture
+    artwork_type=bust: RU:Tag:artwork type=bust
+    artwork_type=land_art: RU:Tag:artwork type=land art
+    artwork_type=mural: RU:Tag:artwork type=mural
+    artwork_type=relief: RU:Tag:artwork type=relief
     artwork_type=sculpture: RU:Tag:artwork type=sculpture
     artwork_type=statue: RU:Tag:artwork type=statue
     artwork_type=sculpture: RU:Tag:artwork type=sculpture
     artwork_type=statue: RU:Tag:artwork type=statue
+    artwork_type=stone: RU:Tag:artwork type=stone
+    association=student: RU:Tag:association=student
     atm=yes: RU:Tag:atm=yes
     atm=yes: RU:Tag:atm=yes
+    attraction=alpine_coaster: RU:Tag:attraction=alpine coaster
+    attraction=amusement_ride: RU:Tag:attraction=amusement ride
     attraction=animal: RU:Tag:attraction=animal
     attraction=animal: RU:Tag:attraction=animal
+    attraction=big_wheel: RU:Tag:attraction=big wheel
+    attraction=boat_ride: RU:Tag:attraction=boat ride
+    attraction=carousel: RU:Tag:attraction=carousel
+    attraction=maze: RU:Tag:attraction=maze
+    attraction=roller_coaster: RU:Tag:attraction=roller coaster
     attraction=summer_toboggan: RU:Tag:attraction=summer toboggan
     attraction=train: RU:Tag:attraction=train
     attraction=water_slide: RU:Tag:attraction=water slide
     attraction=summer_toboggan: RU:Tag:attraction=summer toboggan
     attraction=train: RU:Tag:attraction=train
     attraction=water_slide: RU:Tag:attraction=water slide
+    baby_hatch=yes: RU:Tag:baby hatch=yes
+    barrier=avalanche_protection: RU:Tag:barrier=avalanche protection
     barrier=block: RU:Tag:barrier=block
     barrier=bollard: RU:Tag:barrier=bollard
     barrier=border_control: RU:Tag:barrier=border control
     barrier=block: RU:Tag:barrier=block
     barrier=bollard: RU:Tag:barrier=bollard
     barrier=border_control: RU:Tag:barrier=border control
@@ -20525,9 +27849,11 @@ ru:
     barrier=chain: RU:Tag:barrier=chain
     barrier=chech_hedgehog: RU:Tag:barrier=chech hedgehog
     barrier=city_wall: RU:Tag:barrier=city wall
     barrier=chain: RU:Tag:barrier=chain
     barrier=chech_hedgehog: RU:Tag:barrier=chech hedgehog
     barrier=city_wall: RU:Tag:barrier=city wall
+    barrier=cycle_barrier: RU:Tag:barrier=cycle barrier
     barrier=czech_hedgehog: RU:Tag:barrier=czech hedgehog
     barrier=debris: RU:Tag:barrier=debris
     barrier=ditch: RU:Tag:barrier=ditch
     barrier=czech_hedgehog: RU:Tag:barrier=czech hedgehog
     barrier=debris: RU:Tag:barrier=debris
     barrier=ditch: RU:Tag:barrier=ditch
+    barrier=dug-in_tyres: RU:Tag:barrier=dug-in tyres
     barrier=entrance: RU:Tag:barrier=entrance
     barrier=fence: RU:Tag:barrier=fence
     barrier=full-height_turnstile: RU:Tag:barrier=full-height turnstile
     barrier=entrance: RU:Tag:barrier=entrance
     barrier=fence: RU:Tag:barrier=fence
     barrier=full-height_turnstile: RU:Tag:barrier=full-height turnstile
@@ -20538,37 +27864,112 @@ ru:
     barrier=hedge: RU:Tag:barrier=hedge
     barrier=hedge_bank: RU:Tag:barrier=hedge bank
     barrier=height_restrictor: RU:Tag:barrier=height restrictor
     barrier=hedge: RU:Tag:barrier=hedge
     barrier=hedge_bank: RU:Tag:barrier=hedge bank
     barrier=height_restrictor: RU:Tag:barrier=height restrictor
+    barrier=horse_jump: RU:Tag:barrier=horse jump
+    barrier=horse_stile: RU:Tag:barrier=horse stile
     barrier=kerb: RU:Tag:barrier=kerb
     barrier=lift_gate: RU:Tag:barrier=lift gate
     barrier=log: RU:Tag:barrier=log
     barrier=kerb: RU:Tag:barrier=kerb
     barrier=lift_gate: RU:Tag:barrier=lift gate
     barrier=log: RU:Tag:barrier=log
+    barrier=motorcycle_barrier: RU:Tag:barrier=motorcycle barrier
     barrier=retaining_wall: RU:Tag:barrier=retaining wall
     barrier=sally_port: RU:Tag:barrier=sally port
     barrier=retaining_wall: RU:Tag:barrier=retaining wall
     barrier=sally_port: RU:Tag:barrier=sally port
+    barrier=sliding_beam: RU:Tag:barrier=sliding beam
     barrier=sliding_gate: RU:Tag:barrier=sliding gate
     barrier=sliding_gate: RU:Tag:barrier=sliding gate
+    barrier=steeplechase_jump: RU:Tag:barrier=steeplechase jump
+    barrier=stile: RU:Tag:barrier=stile
     barrier=swing_gate: RU:Tag:barrier=swing gate
     barrier=tank_trap: RU:Tag:barrier=tank trap
     barrier=toll_booth: RU:Tag:barrier=toll booth
     barrier=turnstile: RU:Tag:barrier=turnstile
     barrier=swing_gate: RU:Tag:barrier=swing gate
     barrier=tank_trap: RU:Tag:barrier=tank trap
     barrier=toll_booth: RU:Tag:barrier=toll booth
     barrier=turnstile: RU:Tag:barrier=turnstile
+    barrier=tyres: RU:Tag:barrier=tyres
     barrier=wall: RU:Tag:barrier=wall
     barrier=wall: RU:Tag:barrier=wall
+    barrier=wicket_gate: RU:Tag:barrier=wicket gate
+    barrier=yes: RU:Tag:barrier=yes
+    basin=cooling: RU:Tag:basin=cooling
+    basin=detention: RU:Tag:basin=detention
+    basin=evaporation: RU:Tag:basin=evaporation
+    basin=footbath: RU:Tag:basin=footbath
+    basin=infiltration: RU:Tag:basin=infiltration
+    basin=retention: RU:Tag:basin=retention
+    basin=water_regeneration: RU:Tag:basin=water regeneration
+    bath:type=foot_bath: RU:Tag:bath:type=foot bath
+    bath:type=hammam: RU:Tag:bath:type=hammam
+    bath:type=hot_spring: RU:Tag:bath:type=hot spring
+    bath:type=lake: RU:Tag:bath:type=lake
+    bath:type=onsen: RU:Tag:bath:type=onsen
+    bath:type=pool: RU:Tag:bath:type=pool
+    bath:type=river: RU:Tag:bath:type=river
+    bath:type=sea: RU:Tag:bath:type=sea
+    bath:type=thermal: RU:Tag:bath:type=thermal
+    bbq=yes: RU:Tag:bbq=yes
+    beacon:type=DME: RU:Tag:beacon:type=DME
+    beacon:type=DVOR: RU:Tag:beacon:type=DVOR
+    beacon:type=ILS: RU:Tag:beacon:type=ILS
+    beacon:type=MM: RU:Tag:beacon:type=MM
+    beacon:type=NDB: RU:Tag:beacon:type=NDB
+    beacon:type=OM: RU:Tag:beacon:type=OM
+    beacon:type=TACAN: RU:Tag:beacon:type=TACAN
+    beacon:type=VOR: RU:Tag:beacon:type=VOR
+    beacon:type=VORTAC: RU:Tag:beacon:type=VORTAC
+    bench=wave_lounger: RU:Tag:bench=wave lounger
+    bicycle:backward=use_sidepath: RU:Tag:bicycle:backward=use sidepath
+    bicycle:forward=use_sidepath: RU:Tag:bicycle:forward=use sidepath
     bicycle=designated: RU:Tag:bicycle=designated
     bicycle=designated: RU:Tag:bicycle=designated
+    bicycle=dismount: RU:Tag:bicycle=dismount
+    bicycle=no: RU:Tag:bicycle=no
+    bicycle=permissive: RU:Tag:bicycle=permissive
+    bicycle=use_sidepath: RU:Tag:bicycle=use sidepath
+    bicycle=yes: RU:Tag:bicycle=yes
+    bicycle_parking=stands: RU:Tag:bicycle parking=stands
+    bicycle_parking=wall_loops: RU:Tag:bicycle parking=wall loops
+    bicycle_parking=wide_stands: RU:Tag:bicycle parking=wide stands
+    bicycle_road=yes: RU:Tag:bicycle road=yes
+    board_type=board: RU:Tag:board type=board
+    boat:rental=yes: RU:Tag:boat:rental=yes
+    border_zone=5km_zone: RU:Tag:border zone=5km zone
     boundary=administrative: RU:Tag:boundary=administrative
     boundary=administrative: RU:Tag:boundary=administrative
+    boundary=border_zone: RU:Tag:boundary=border zone
     boundary=forest_compartment: RU:Tag:boundary=forest compartment
     boundary=forest_compartment: RU:Tag:boundary=forest compartment
-    boundary=forestry_compartment: RU:Tag:boundary=forestry compartment
+    boundary=national_park: RU:Tag:boundary=national park
+    boundary=place: RU:Tag:boundary=place
     boundary=postal_code: RU:Tag:boundary=postal code
     boundary=protected_area: RU:Tag:boundary=protected area
     boundary=postal_code: RU:Tag:boundary=postal code
     boundary=protected_area: RU:Tag:boundary=protected area
+    boundary=regional_park: RU:Tag:boundary=regional park
+    boundary=waste_collection: RU:Tag:boundary=waste collection
+    boundary=water_protection_area: RU:Tag:boundary=water protection area
     bridge:movable=bascule: RU:Tag:bridge:movable=bascule
     bridge:movable=drawbridge: RU:Tag:bridge:movable=drawbridge
     bridge:movable=lift: RU:Tag:bridge:movable=lift
     bridge:movable=bascule: RU:Tag:bridge:movable=bascule
     bridge:movable=drawbridge: RU:Tag:bridge:movable=drawbridge
     bridge:movable=lift: RU:Tag:bridge:movable=lift
+    bridge:movable=retractable: RU:Tag:bridge:movable=retractable
     bridge:movable=submersible: RU:Tag:bridge:movable=submersible
     bridge:movable=swing: RU:Tag:bridge:movable=swing
     bridge:movable=submersible: RU:Tag:bridge:movable=submersible
     bridge:movable=swing: RU:Tag:bridge:movable=swing
+    bridge:movable=tilt: RU:Tag:bridge:movable=tilt
     bridge:movable=transporter: RU:Tag:bridge:movable=transporter
     bridge:structure=arch: RU:Tag:bridge:structure=arch
     bridge:structure=beam: RU:Tag:bridge:structure=beam
     bridge:structure=cable-stayed: RU:Tag:bridge:structure=cable-stayed
     bridge:movable=transporter: RU:Tag:bridge:movable=transporter
     bridge:structure=arch: RU:Tag:bridge:structure=arch
     bridge:structure=beam: RU:Tag:bridge:structure=beam
     bridge:structure=cable-stayed: RU:Tag:bridge:structure=cable-stayed
+    bridge:structure=floating: RU:Tag:bridge:structure=floating
     bridge:structure=humpback: RU:Tag:bridge:structure=humpback
     bridge:structure=humpback: RU:Tag:bridge:structure=humpback
+    bridge:structure=simple-suspension: RU:Tag:bridge:structure=simple-suspension
     bridge:structure=suspension: RU:Tag:bridge:structure=suspension
     bridge:structure=suspension: RU:Tag:bridge:structure=suspension
+    bridge:structure=truss: RU:Tag:bridge:structure=truss
+    bridge:support=abutment: RU:Tag:bridge:support=abutment
+    bridge:support=lift_pier: RU:Tag:bridge:support=lift pier
+    bridge:support=pier: RU:Tag:bridge:support=pier
+    bridge:support=pivot_pier: RU:Tag:bridge:support=pivot pier
+    bridge:support=pylon: RU:Tag:bridge:support=pylon
     bridge=aqueduct: RU:Tag:bridge=aqueduct
     bridge=aqueduct: RU:Tag:bridge=aqueduct
+    bridge=boardwalk: RU:Tag:bridge=boardwalk
     bridge=cantilever: RU:Tag:bridge=cantilever
     bridge=covered: RU:Tag:bridge=covered
     bridge=cantilever: RU:Tag:bridge=cantilever
     bridge=covered: RU:Tag:bridge=covered
+    bridge=drawbridge: RU:Tag:bridge=drawbridge
+    bridge=movable: RU:Tag:bridge=movable
+    bridge=simple_brunnel: RU:Tag:bridge=simple brunnel
+    bridge=trestle: RU:Tag:bridge=trestle
+    bridge=viaduct: RU:Tag:bridge=viaduct
+    building:part=balcony: RU:Tag:building:part=balcony
+    building:part=porch: RU:Tag:building:part=porch
+    building:prefabricated=yes: RU:Tag:building:prefabricated=yes
+    building:use=stable: RU:Tag:building:use=stable
     building=*: RU:Tag:building=*
     building=Y: RU:Tag:building=Y
     building=abandoned: RU:Tag:building=abandoned
     building=*: RU:Tag:building=*
     building=Y: RU:Tag:building=Y
     building=abandoned: RU:Tag:building=abandoned
@@ -20576,6 +27977,8 @@ ru:
     building=apartments: RU:Tag:building=apartments
     building=bakehouse: RU:Tag:building=bakehouse
     building=barn: RU:Tag:building=barn
     building=apartments: RU:Tag:building=apartments
     building=bakehouse: RU:Tag:building=bakehouse
     building=barn: RU:Tag:building=barn
+    building=barracks: RU:Tag:building=barracks
+    building=beach_hut: RU:Tag:building=beach hut
     building=boathouse: RU:Tag:building=boathouse
     building=brewery: RU:Tag:building=brewery
     building=bridge: RU:Tag:building=bridge
     building=boathouse: RU:Tag:building=boathouse
     building=brewery: RU:Tag:building=brewery
     building=bridge: RU:Tag:building=bridge
@@ -20583,8 +27986,10 @@ ru:
     building=bunker: RU:Tag:building=bunker
     building=cabin: RU:Tag:building=cabin
     building=carport: RU:Tag:building=carport
     building=bunker: RU:Tag:building=bunker
     building=cabin: RU:Tag:building=cabin
     building=carport: RU:Tag:building=carport
+    building=castle: RU:Tag:building=castle
     building=cathedral: RU:Tag:building=cathedral
     building=central_office: RU:Tag:building=central office
     building=cathedral: RU:Tag:building=cathedral
     building=central_office: RU:Tag:building=central office
+    building=changing_rooms: RU:Tag:building=changing rooms
     building=chapel: RU:Tag:building=chapel
     building=church: RU:Tag:building=church
     building=civic: RU:Tag:building=civic
     building=chapel: RU:Tag:building=chapel
     building=church: RU:Tag:building=church
     building=civic: RU:Tag:building=civic
@@ -20593,28 +27998,39 @@ ru:
     building=commercial: RU:Tag:building=commercial
     building=condominium: RU:Tag:building=condominium
     building=conservatory: RU:Tag:building=conservatory
     building=commercial: RU:Tag:building=commercial
     building=condominium: RU:Tag:building=condominium
     building=conservatory: RU:Tag:building=conservatory
+    building=constructie: RU:Tag:building=constructie
     building=construction: RU:Tag:building=construction
     building=container: RU:Tag:building=container
     building=convent: RU:Tag:building=convent
     building=cowshed: RU:Tag:building=cowshed
     building=construction: RU:Tag:building=construction
     building=container: RU:Tag:building=container
     building=convent: RU:Tag:building=convent
     building=cowshed: RU:Tag:building=cowshed
+    building=damaged: RU:Tag:building=damaged
+    building=data_center: RU:Tag:building=data center
+    building=demountable: RU:Tag:building=demountable
     building=detached: RU:Tag:building=detached
     building=digester: RU:Tag:building=digester
     building=disused: RU:Tag:building=disused
     building=dormitory: RU:Tag:building=dormitory
     building=entrance: RU:Tag:building=entrance
     building=detached: RU:Tag:building=detached
     building=digester: RU:Tag:building=digester
     building=disused: RU:Tag:building=disused
     building=dormitory: RU:Tag:building=dormitory
     building=entrance: RU:Tag:building=entrance
+    building=factory: RU:Tag:building=factory
     building=farm: RU:Tag:building=farm
     building=farm_auxiliary: RU:Tag:building=farm auxiliary
     building=farm: RU:Tag:building=farm
     building=farm_auxiliary: RU:Tag:building=farm auxiliary
+    building=fire_lookout: RU:Tag:building=fire lookout
     building=fire_station: RU:Tag:building=fire station
     building=fire_station: RU:Tag:building=fire station
+    building=fixme: RU:Tag:building=fixme
     building=font: RU:Tag:building=font
     building=font: RU:Tag:building=font
+    building=fort: RU:Tag:building=fort
     building=funeral_hall: RU:Tag:building=funeral hall
     building=garage: RU:Tag:building=garage
     building=garages: RU:Tag:building=garages
     building=gatehouse: RU:Tag:building=gatehouse
     building=ger: RU:Tag:building=ger
     building=funeral_hall: RU:Tag:building=funeral hall
     building=garage: RU:Tag:building=garage
     building=garages: RU:Tag:building=garages
     building=gatehouse: RU:Tag:building=gatehouse
     building=ger: RU:Tag:building=ger
+    building=glasshouse: RU:Tag:building=glasshouse
     building=government: RU:Tag:building=government
     building=grandstand: RU:Tag:building=grandstand
     building=greenhouse: RU:Tag:building=greenhouse
     building=ground_station: RU:Tag:building=ground station
     building=government: RU:Tag:building=government
     building=grandstand: RU:Tag:building=grandstand
     building=greenhouse: RU:Tag:building=greenhouse
     building=ground_station: RU:Tag:building=ground station
+    building=guardhouse: RU:Tag:building=guardhouse
+    building=hall_of_residence: RU:Tag:building=hall of residence
     building=hangar: RU:Tag:building=hangar
     building=hospital: RU:Tag:building=hospital
     building=hotel: RU:Tag:building=hotel
     building=hangar: RU:Tag:building=hangar
     building=hospital: RU:Tag:building=hospital
     building=hotel: RU:Tag:building=hotel
@@ -20624,20 +28040,30 @@ ru:
     building=industrial: RU:Tag:building=industrial
     building=kindergarten: RU:Tag:building=kindergarten
     building=kiosk: RU:Tag:building=kiosk
     building=industrial: RU:Tag:building=industrial
     building=kindergarten: RU:Tag:building=kindergarten
     building=kiosk: RU:Tag:building=kiosk
+    building=lighthouse: RU:Tag:building=lighthouse
+    building=livestock: RU:Tag:building=livestock
     building=manufacture: RU:Tag:building=manufacture
     building=marquee: RU:Tag:building=marquee
     building=manufacture: RU:Tag:building=manufacture
     building=marquee: RU:Tag:building=marquee
+    building=military: RU:Tag:building=military
     building=monastery: RU:Tag:building=monastery
     building=mosque: RU:Tag:building=mosque
     building=museum: RU:Tag:building=museum
     building=office: RU:Tag:building=office
     building=monastery: RU:Tag:building=monastery
     building=mosque: RU:Tag:building=mosque
     building=museum: RU:Tag:building=museum
     building=office: RU:Tag:building=office
+    building=other: RU:Tag:building=other
+    building=outbuilding: RU:Tag:building=outbuilding
+    building=palace: RU:Tag:building=palace
     building=parking: RU:Tag:building=parking
     building=pavilion: RU:Tag:building=pavilion
     building=parking: RU:Tag:building=parking
     building=pavilion: RU:Tag:building=pavilion
+    building=porch: RU:Tag:building=porch
+    building=presbytery: RU:Tag:building=presbytery
+    building=proposed: RU:Tag:building=proposed
     building=public: RU:Tag:building=public
     building=religious: RU:Tag:building=religious
     building=residential: RU:Tag:building=residential
     building=retail: RU:Tag:building=retail
     building=riding_hall: RU:Tag:building=riding hall
     building=roof: RU:Tag:building=roof
     building=public: RU:Tag:building=public
     building=religious: RU:Tag:building=religious
     building=residential: RU:Tag:building=residential
     building=retail: RU:Tag:building=retail
     building=riding_hall: RU:Tag:building=riding hall
     building=roof: RU:Tag:building=roof
+    building=roundhouse: RU:Tag:building=roundhouse
     building=ruins: RU:Tag:building=ruins
     building=school: RU:Tag:building=school
     building=semi: RU:Tag:building=semi
     building=ruins: RU:Tag:building=ruins
     building=school: RU:Tag:building=school
     building=semi: RU:Tag:building=semi
@@ -20662,6 +28088,7 @@ ru:
     building=tent: RU:Tag:building=tent
     building=terrace: RU:Tag:building=terrace
     building=toilets: RU:Tag:building=toilets
     building=tent: RU:Tag:building=tent
     building=terrace: RU:Tag:building=terrace
     building=toilets: RU:Tag:building=toilets
+    building=tower: RU:Tag:building=tower
     building=train_station: RU:Tag:building=train station
     building=transformer_tower: RU:Tag:building=transformer tower
     building=transportation: RU:Tag:building=transportation
     building=train_station: RU:Tag:building=train station
     building=transformer_tower: RU:Tag:building=transformer tower
     building=transportation: RU:Tag:building=transportation
@@ -20675,10 +28102,26 @@ ru:
     building=unknown: RU:Tag:building=unknown
     building=warehouse: RU:Tag:building=warehouse
     building=water_tower: RU:Tag:building=water tower
     building=unknown: RU:Tag:building=unknown
     building=warehouse: RU:Tag:building=warehouse
     building=water_tower: RU:Tag:building=water tower
+    building=wayside_shrine: RU:Tag:building=wayside shrine
+    building=windmill: RU:Tag:building=windmill
     building=yes: RU:Tag:building=yes
     building=yes: RU:Tag:building=yes
+    bunker_type=nuclear: RU:Tag:bunker type=nuclear
     bunker_type=pillbox: RU:Tag:bunker type=pillbox
     bunker_type=pillbox: RU:Tag:bunker type=pillbox
+    busway=lane: RU:Tag:busway=lane
     cafe=time-cafe: RU:Tag:cafe=time-cafe
     cafe=time_cafe: RU:Tag:cafe=time cafe
     cafe=time-cafe: RU:Tag:cafe=time-cafe
     cafe=time_cafe: RU:Tag:cafe=time cafe
+    camp_site=basic: RU:Tag:camp site=basic
+    camp_site=camp_pitch: RU:Tag:camp site=camp pitch
+    camp_site=deluxe: RU:Tag:camp site=deluxe
+    camp_site=serviced: RU:Tag:camp site=serviced
+    camp_site=standard: RU:Tag:camp site=standard
+    canoe=put_in: RU:Tag:canoe=put in
+    capital=4: RU:Tag:capital=4
+    capital=5: RU:Tag:capital=5
+    capital=6: RU:Tag:capital=6
+    capital=yes: RU:Tag:capital=yes
+    castle_type=castrum: RU:Tag:castle type=castrum
+    castle_type=citadel: RU:Tag:castle type=citadel
     castle_type=defensive: RU:Tag:castle type=defensive
     castle_type=fortress: RU:Tag:castle type=fortress
     castle_type=kremlin: RU:Tag:castle type=kremlin
     castle_type=defensive: RU:Tag:castle type=defensive
     castle_type=fortress: RU:Tag:castle type=fortress
     castle_type=kremlin: RU:Tag:castle type=kremlin
@@ -20686,8 +28129,54 @@ ru:
     castle_type=palace: RU:Tag:castle type=palace
     castle_type=shiro: RU:Tag:castle type=shiro
     castle_type=stately: RU:Tag:castle type=stately
     castle_type=palace: RU:Tag:castle type=palace
     castle_type=shiro: RU:Tag:castle type=shiro
     castle_type=stately: RU:Tag:castle type=stately
+    cemetery=burial_forest: RU:Tag:cemetery=burial forest
     cemetery=grave: RU:Tag:cemetery=grave
     cemetery=grave: RU:Tag:cemetery=grave
+    cemetery=sector: RU:Tag:cemetery=sector
+    cemetery=war_cemetery: RU:Tag:cemetery=war cemetery
+    cemetery=wood: RU:Tag:cemetery=wood
+    clothes=motorcycle: RU:Tag:clothes=motorcycle
+    clothes=swimwear: RU:Tag:clothes=swimwear
+    clothes=vintage: RU:Tag:clothes=vintage
+    clothes=women;men;children: RU:Tag:clothes=women;men;children
+    clothes=workwear: RU:Tag:clothes=workwear
+    club=amateur_radio: RU:Tag:club=amateur radio
+    club=art: RU:Tag:club=art
+    club=automobile: RU:Tag:club=automobile
+    club=bicycle: RU:Tag:club=bicycle
+    club=cadet: RU:Tag:club=cadet
+    club=card_games: RU:Tag:club=card games
+    club=chess: RU:Tag:club=chess
+    club=motorcycle: RU:Tag:club=motorcycle
+    club=sailing: RU:Tag:club=sailing
+    club=social: RU:Tag:club=social
+    club=sport: RU:Tag:club=sport
+    club=student: RU:Tag:club=student
+    community_centre=club_home: RU:Tag:community centre=club home
+    community_centre=community_hall: RU:Tag:community centre=community hall
+    community_centre=cultural_centre: RU:Tag:community centre=cultural centre
+    community_centre=family_centre: RU:Tag:community centre=family centre
+    community_centre=parish_hall: RU:Tag:community centre=parish hall
+    community_centre=village_hall: RU:Tag:community centre=village hall
+    community_centre=youth_centre: RU:Tag:community centre=youth centre
+    company=aerospace: RU:Tag:company=aerospace
+    company=catalog: RU:Tag:company=catalog
+    company=construction: RU:Tag:company=construction
+    company=industrial_climbing: RU:Tag:company=industrial climbing
+    company=internet_shop: RU:Tag:company=internet shop
+    company=it: RU:Tag:company=it
+    company=logistics: RU:Tag:company=logistics
+    company=robot: RU:Tag:company=robot
+    company=software_development: RU:Tag:company=software development
+    company=transport: RU:Tag:company=transport
+    construction=apartments: RU:Tag:construction=apartments
+    content=sewage: RU:Tag:content=sewage
+    content=slurry: RU:Tag:content=slurry
+    content=wastewater: RU:Tag:content=wastewater
+    content=water: RU:Tag:content=water
+    covered=no: RU:Tag:covered=no
+    covered=yes: RU:Tag:covered=yes
     craft=agricultural_engines: RU:Tag:craft=agricultural engines
     craft=agricultural_engines: RU:Tag:craft=agricultural engines
+    craft=bakery: RU:Tag:craft=bakery
     craft=basket_maker: RU:Tag:craft=basket maker
     craft=beekeeper: RU:Tag:craft=beekeeper
     craft=blacksmith: RU:Tag:craft=blacksmith
     craft=basket_maker: RU:Tag:craft=basket maker
     craft=beekeeper: RU:Tag:craft=beekeeper
     craft=blacksmith: RU:Tag:craft=blacksmith
@@ -20698,10 +28187,12 @@ ru:
     craft=carpet_layer: RU:Tag:craft=carpet layer
     craft=caterer: RU:Tag:craft=caterer
     craft=clockmaker: RU:Tag:craft=clockmaker
     craft=carpet_layer: RU:Tag:craft=carpet layer
     craft=caterer: RU:Tag:craft=caterer
     craft=clockmaker: RU:Tag:craft=clockmaker
+    craft=distillery: RU:Tag:craft=distillery
     craft=dressmaker: RU:Tag:craft=dressmaker
     craft=electrician: RU:Tag:craft=electrician
     craft=glaziery: RU:Tag:craft=glaziery
     craft=handicraft: RU:Tag:craft=handicraft
     craft=dressmaker: RU:Tag:craft=dressmaker
     craft=electrician: RU:Tag:craft=electrician
     craft=glaziery: RU:Tag:craft=glaziery
     craft=handicraft: RU:Tag:craft=handicraft
+    craft=hvac: RU:Tag:craft=hvac
     craft=key_cutter: RU:Tag:craft=key cutter
     craft=photographer: RU:Tag:craft=photographer
     craft=roofer: RU:Tag:craft=roofer
     craft=key_cutter: RU:Tag:craft=key cutter
     craft=photographer: RU:Tag:craft=photographer
     craft=roofer: RU:Tag:craft=roofer
@@ -20709,32 +28200,174 @@ ru:
     craft=stonemason: RU:Tag:craft=stonemason
     craft=tailor: RU:Tag:craft=tailor
     craft=window_construction: RU:Tag:craft=window construction
     craft=stonemason: RU:Tag:craft=stonemason
     craft=tailor: RU:Tag:craft=tailor
     craft=window_construction: RU:Tag:craft=window construction
+    craft=winery: RU:Tag:craft=winery
+    crematorium=pet: RU:Tag:crematorium=pet
     crop=grape: RU:Tag:crop=grape
     crop=hop: RU:Tag:crop=hop
     crop=grape: RU:Tag:crop=grape
     crop=hop: RU:Tag:crop=hop
+    crossing=traffic_signals: RU:Tag:crossing=traffic signals
+    crossing=uncontrolled: RU:Tag:crossing=uncontrolled
+    cuisine=kebab: RU:Tag:cuisine=kebab
+    culvert=box: RU:Tag:culvert=box
+    culvert=inverted_siphon: RU:Tag:culvert=inverted siphon
+    culvert=pipe: RU:Tag:culvert=pipe
+    cycle_network=EuroVelo: RU:Tag:cycle network=EuroVelo
+    cycle_network=JP:prefectural: RU:Tag:cycle network=JP:prefectural
+    cycle_network=US: RU:Tag:cycle network=US
+    cycle_network=US:USA: RU:Tag:cycle network=US:USA
+    cycleway:both=lane: RU:Tag:cycleway:both=lane
+    cycleway:both=no: RU:Tag:cycleway:both=no
+    cycleway:both=separate: RU:Tag:cycleway:both=separate
+    cycleway:foot=designated: RU:Tag:cycleway:foot=designated
+    cycleway:foot=no: RU:Tag:cycleway:foot=no
+    cycleway:left=lane: RU:Tag:cycleway:left=lane
+    cycleway:left=no: RU:Tag:cycleway:left=no
+    cycleway:left=opposite_lane: RU:Tag:cycleway:left=opposite lane
+    cycleway:left=separate: RU:Tag:cycleway:left=separate
+    cycleway:left=share_busway: RU:Tag:cycleway:left=share busway
+    cycleway:left=track: RU:Tag:cycleway:left=track
+    cycleway:right=lane: RU:Tag:cycleway:right=lane
+    cycleway:right=no: RU:Tag:cycleway:right=no
+    cycleway:right=opposite_lane: RU:Tag:cycleway:right=opposite lane
+    cycleway:right=separate: RU:Tag:cycleway:right=separate
+    cycleway:right=share_busway: RU:Tag:cycleway:right=share busway
+    cycleway:right=shared_lane: RU:Tag:cycleway:right=shared lane
+    cycleway:right=track: RU:Tag:cycleway:right=track
+    cycleway=asl: RU:Tag:cycleway=asl
+    cycleway=bike_box: RU:Tag:cycleway=bike box
+    cycleway=lane: RU:Tag:cycleway=lane
+    cycleway=no: RU:Tag:cycleway=no
+    cycleway=opposite: RU:Tag:cycleway=opposite
     cycleway=opposite_lane: RU:Tag:cycleway=opposite lane
     cycleway=opposite_lane: RU:Tag:cycleway=opposite lane
+    cycleway=opposite_track: RU:Tag:cycleway=opposite track
+    cycleway=separate: RU:Tag:cycleway=separate
+    cycleway=share_busway: RU:Tag:cycleway=share busway
+    cycleway=shared_lane: RU:Tag:cycleway=shared lane
+    cycleway=sidepath: RU:Tag:cycleway=sidepath
+    cycleway=sidewalk: RU:Tag:cycleway=sidewalk
+    cycleway=track: RU:Tag:cycleway=track
+    defensive=bergfried: RU:Tag:defensive=bergfried
+    defensive=donjon: RU:Tag:defensive=donjon
+    defensive=keep: RU:Tag:defensive=keep
+    denomination=catholic: RU:Tag:denomination=catholic
+    diplomatic=consulate_general: RU:Tag:diplomatic=consulate general
+    disused:landuse=landfill: RU:Tag:disused:landuse=landfill
+    disused:landuse=quarry: RU:Tag:disused:landuse=quarry
+    dog=designated: RU:Tag:dog=designated
+    dog=leashed: RU:Tag:dog=leashed
+    dog=no: RU:Tag:dog=no
+    dog=outside: RU:Tag:dog=outside
+    dog=unleashed: RU:Tag:dog=unleashed
+    dog=yes: RU:Tag:dog=yes
+    drain=disperse: RU:Tag:drain=disperse
+    drain=no: RU:Tag:drain=no
+    dual_carriageway=yes: RU:Tag:dual carriageway=yes
+    education=centre: RU:Tag:education=centre
+    education=exercise_area: RU:Tag:education=exercise area
+    education=school: RU:Tag:education=school
     emergency=ambulance_station: RU:Tag:emergency=ambulance station
     emergency=ambulance_station: RU:Tag:emergency=ambulance station
+    emergency=emergency_ward_entrance: RU:Tag:emergency=emergency ward entrance
     emergency=fire_extinguisher: RU:Tag:emergency=fire extinguisher
     emergency=fire_hose: RU:Tag:emergency=fire hose
     emergency=fire_hydrant: RU:Tag:emergency=fire hydrant
     emergency=fire_water_pond: RU:Tag:emergency=fire water pond
     emergency=fire_extinguisher: RU:Tag:emergency=fire extinguisher
     emergency=fire_hose: RU:Tag:emergency=fire hose
     emergency=fire_hydrant: RU:Tag:emergency=fire hydrant
     emergency=fire_water_pond: RU:Tag:emergency=fire water pond
+    emergency=landing_site: RU:Tag:emergency=landing site
     emergency=phone: RU:Tag:emergency=phone
     emergency=suction_point: RU:Tag:emergency=suction point
     emergency=water_tank: RU:Tag:emergency=water tank
     emergency=phone: RU:Tag:emergency=phone
     emergency=suction_point: RU:Tag:emergency=suction point
     emergency=water_tank: RU:Tag:emergency=water tank
+    entrance=garage: RU:Tag:entrance=garage
     entrance=staircase: RU:Tag:entrance=staircase
     entrance=staircase: RU:Tag:entrance=staircase
+    entrance=yes: RU:Tag:entrance=yes
+    faculty=aerospace: RU:Tag:faculty=aerospace
+    faculty=engineering: RU:Tag:faculty=engineering
     fast_food=cafeteria: RU:Tag:fast food=cafeteria
     fast_food=cafeteria: RU:Tag:fast food=cafeteria
+    fence_type=railing: RU:Tag:fence type=railing
+    fitness_station=sit-up: RU:Tag:fitness station=sit-up
     foot=designated: RU:Tag:foot=designated
     foot=designated: RU:Tag:foot=designated
+    foot=destination: RU:Tag:foot=destination
+    foot=permissive: RU:Tag:foot=permissive
+    foot=yes: RU:Tag:foot=yes
+    footway=access_aisle: RU:Tag:footway=access aisle
     footway=crossing: RU:Tag:footway=crossing
     footway=sidewalk: RU:Tag:footway=sidewalk
     footway=crossing: RU:Tag:footway=crossing
     footway=sidewalk: RU:Tag:footway=sidewalk
+    footway=traffic_island: RU:Tag:footway=traffic island
+    ford=stepping_stones: RU:Tag:ford=stepping stones
+    ford=yes: RU:Tag:ford=yes
+    fortification_type=hill_fort: RU:Tag:fortification type=hill fort
+    fortification_type=limes: RU:Tag:fortification type=limes
+    fortification_type=motte: RU:Tag:fortification type=motte
+    fortification_type=pa: RU:Tag:fortification type=pa
+    fortification_type=ring_ditch: RU:Tag:fortification type=ring ditch
+    fortification_type=ringfort: RU:Tag:fortification type=ringfort
+    fortification_type=sconce: RU:Tag:fortification type=sconce
     generator:method=anaerobic_digestion: RU:Tag:generator:method=anaerobic digestion
     generator:source=hydro: RU:Tag:generator:source=hydro
     generator:type=boiler: RU:Tag:generator:type=boiler
     geological=palaeontological_site: RU:Tag:geological=palaeontological site
     generator:method=anaerobic_digestion: RU:Tag:generator:method=anaerobic digestion
     generator:source=hydro: RU:Tag:generator:source=hydro
     generator:type=boiler: RU:Tag:generator:type=boiler
     geological=palaeontological_site: RU:Tag:geological=palaeontological site
+    geological=volcanic_caldera: RU:Tag:geological=volcanic caldera
+    geological=volcanic_caldera_rim: RU:Tag:geological=volcanic caldera rim
+    geological=volcanic_lava_field: RU:Tag:geological=volcanic lava field
+    golf=bunker: RU:Tag:golf=bunker
+    golf=clubhouse: RU:Tag:golf=clubhouse
+    golf=driving_range: RU:Tag:golf=driving range
+    golf=fairway: RU:Tag:golf=fairway
+    golf=green: RU:Tag:golf=green
+    golf=hole: RU:Tag:golf=hole
+    golf=rough: RU:Tag:golf=rough
+    golf=tee: RU:Tag:golf=tee
+    government=administrative: RU:Tag:government=administrative
+    government=aerospace: RU:Tag:government=aerospace
+    government=archive: RU:Tag:government=archive
+    government=audit: RU:Tag:government=audit
+    government=bailiff: RU:Tag:government=bailiff
+    government=border_control: RU:Tag:government=border control
+    government=cadaster: RU:Tag:government=cadaster
+    government=culture: RU:Tag:government=culture
     government=customs: RU:Tag:government=customs
     government=customs: RU:Tag:government=customs
+    government=data_protection: RU:Tag:government=data protection
+    government=education: RU:Tag:government=education
+    government=emergency: RU:Tag:government=emergency
+    government=healthcare: RU:Tag:government=healthcare
+    government=heritage: RU:Tag:government=heritage
+    government=it: RU:Tag:government=it
+    government=justice: RU:Tag:government=justice
+    government=legislative: RU:Tag:government=legislative
+    government=ministry: RU:Tag:government=ministry
+    government=parliament: RU:Tag:government=parliament
+    government=prosecutor: RU:Tag:government=prosecutor
+    government=register_office: RU:Tag:government=register office
+    government=social_security: RU:Tag:government=social security
+    government=statistics: RU:Tag:government=statistics
+    government=tax: RU:Tag:government=tax
+    government=transportation: RU:Tag:government=transportation
+    government=youth_welfare_department: RU:Tag:government=youth welfare department
+    grass=amenity_grassland: RU:Tag:grass=amenity grassland
+    guest_house=agritourism: RU:Tag:guest house=agritourism
+    guest_house=albergue: RU:Tag:guest house=albergue
+    guest_house=bed_and_breakfast: RU:Tag:guest house=bed and breakfast
+    guest_house=kontrakan: RU:Tag:guest house=kontrakan
+    guest_house=student_accomodation: RU:Tag:guest house=student accomodation
+    hazard=animal_crossing: RU:Tag:hazard=animal crossing
+    hazard=horse_riders: RU:Tag:hazard=horse riders
+    hazard=landslide: RU:Tag:hazard=landslide
+    hazard=leeches: RU:Tag:hazard=leeches
+    hazard=turn: RU:Tag:hazard=turn
+    health_facility:type=office: RU:Tag:health facility:type=office
+    healthcare:speciality=abortion: RU:Tag:healthcare:speciality=abortion
+    healthcare=blood_bank: RU:Tag:healthcare=blood bank
     healthcare=blood_donation: RU:Tag:healthcare=blood donation
     healthcare=blood_donation: RU:Tag:healthcare=blood donation
+    healthcare=doctor: RU:Tag:healthcare=doctor
     healthcare=laboratory: RU:Tag:healthcare=laboratory
     healthcare=laboratory: RU:Tag:healthcare=laboratory
+    healthcare=nurse: RU:Tag:healthcare=nurse
+    healthcare=podiatrist: RU:Tag:healthcare=podiatrist
+    healthcare=sample_collection: RU:Tag:healthcare=sample collection
+    healthcare=vaccination_centre: RU:Tag:healthcare=vaccination centre
+    heritage:operator=BLfD: RU:Tag:heritage:operator=BLfD
+    heritage:operator=kons: RU:Tag:heritage:operator=kons
+    heritage:operator=nrhp: RU:Tag:heritage:operator=nrhp
     highway=bridleway: RU:Tag:highway=bridleway
     highway=bus_guideway: RU:Tag:highway=bus guideway
     highway=bus_stop: RU:Tag:highway=bus stop
     highway=bridleway: RU:Tag:highway=bridleway
     highway=bus_guideway: RU:Tag:highway=bus guideway
     highway=bus_stop: RU:Tag:highway=bus stop
+    highway=busway: RU:Tag:highway=busway
     highway=construction: RU:Tag:highway=construction
     highway=crossing: RU:Tag:highway=crossing
     highway=cycleway: RU:Tag:highway=cycleway
     highway=construction: RU:Tag:highway=construction
     highway=crossing: RU:Tag:highway=crossing
     highway=cycleway: RU:Tag:highway=cycleway
@@ -20779,24 +28412,36 @@ ru:
     highway=trunk_link: RU:Tag:highway=trunk link
     highway=turning_circle: RU:Tag:highway=turning circle
     highway=unclassified: RU:Tag:highway=unclassified
     highway=trunk_link: RU:Tag:highway=trunk link
     highway=turning_circle: RU:Tag:highway=turning circle
     highway=unclassified: RU:Tag:highway=unclassified
+    historic:railway=station: RU:Tag:historic:railway=station
+    historic=abandoned: RU:Tag:historic=abandoned
     historic=aircraft: RU:Tag:historic=aircraft
     historic=aqueduct: RU:Tag:historic=aqueduct
     historic=archaeological_site: RU:Tag:historic=archaeological site
     historic=battlefield: RU:Tag:historic=battlefield
     historic=aircraft: RU:Tag:historic=aircraft
     historic=aqueduct: RU:Tag:historic=aqueduct
     historic=archaeological_site: RU:Tag:historic=archaeological site
     historic=battlefield: RU:Tag:historic=battlefield
+    historic=bomb_crater: RU:Tag:historic=bomb crater
     historic=boundary_stone: RU:Tag:historic=boundary stone
     historic=boundary_stone: RU:Tag:historic=boundary stone
+    historic=building: RU:Tag:historic=building
     historic=cannon: RU:Tag:historic=cannon
     historic=castle: RU:Tag:historic=castle
     historic=castle_wall: RU:Tag:historic=castle wall
     historic=cannon: RU:Tag:historic=cannon
     historic=castle: RU:Tag:historic=castle
     historic=castle_wall: RU:Tag:historic=castle wall
+    historic=cemetery: RU:Tag:historic=cemetery
+    historic=charcoal_pile: RU:Tag:historic=charcoal pile
+    historic=church: RU:Tag:historic=church
     historic=city_gate: RU:Tag:historic=city gate
     historic=citywalls: RU:Tag:historic=citywalls
     historic=city_gate: RU:Tag:historic=city gate
     historic=citywalls: RU:Tag:historic=citywalls
+    historic=district: RU:Tag:historic=district
     historic=farm: RU:Tag:historic=farm
     historic=farm: RU:Tag:historic=farm
+    historic=flood_mark: RU:Tag:historic=flood mark
     historic=fort: RU:Tag:historic=fort
     historic=gallows: RU:Tag:historic=gallows
     historic=heritage: RU:Tag:historic=heritage
     historic=highwater_mark: RU:Tag:historic=highwater mark
     historic=fort: RU:Tag:historic=fort
     historic=gallows: RU:Tag:historic=gallows
     historic=heritage: RU:Tag:historic=heritage
     historic=highwater_mark: RU:Tag:historic=highwater mark
+    historic=hollow_way: RU:Tag:historic=hollow way
+    historic=house: RU:Tag:historic=house
     historic=locomotive: RU:Tag:historic=locomotive
     historic=manor: RU:Tag:historic=manor
     historic=memorial: RU:Tag:historic=memorial
     historic=locomotive: RU:Tag:historic=locomotive
     historic=manor: RU:Tag:historic=manor
     historic=memorial: RU:Tag:historic=memorial
+    historic=meteor_crater: RU:Tag:historic=meteor crater
     historic=milestone: RU:Tag:historic=milestone
     historic=mine: RU:Tag:historic=mine
     historic=monastery: RU:Tag:historic=monastery
     historic=milestone: RU:Tag:historic=milestone
     historic=mine: RU:Tag:historic=mine
     historic=monastery: RU:Tag:historic=monastery
@@ -20804,6 +28449,7 @@ ru:
     historic=optical_telegraph: RU:Tag:historic=optical telegraph
     historic=pa: RU:Tag:historic=pa
     historic=pillory: RU:Tag:historic=pillory
     historic=optical_telegraph: RU:Tag:historic=optical telegraph
     historic=pa: RU:Tag:historic=pa
     historic=pillory: RU:Tag:historic=pillory
+    historic=road: RU:Tag:historic=road
     historic=ruins: RU:Tag:historic=ruins
     historic=rune_stone: RU:Tag:historic=rune stone
     historic=ship: RU:Tag:historic=ship
     historic=ruins: RU:Tag:historic=ruins
     historic=rune_stone: RU:Tag:historic=rune stone
     historic=ship: RU:Tag:historic=ship
@@ -20814,49 +28460,143 @@ ru:
     historic=wayside_cross: RU:Tag:historic=wayside cross
     historic=wayside_shrine: RU:Tag:historic=wayside shrine
     historic=wreck: RU:Tag:historic=wreck
     historic=wayside_cross: RU:Tag:historic=wayside cross
     historic=wayside_shrine: RU:Tag:historic=wayside shrine
     historic=wreck: RU:Tag:historic=wreck
+    historic=yes: RU:Tag:historic=yes
     horse=designated: RU:Tag:horse=designated
     horse=designated: RU:Tag:horse=designated
+    horse=dismount: RU:Tag:horse=dismount
+    industrial=aerospace: RU:Tag:industrial=aerospace
+    industrial=aluminium_smelting: RU:Tag:industrial=aluminium smelting
+    industrial=asphalt_plant: RU:Tag:industrial=asphalt plant
+    industrial=auto_wrecker: RU:Tag:industrial=auto wrecker
+    industrial=bakery: RU:Tag:industrial=bakery
+    industrial=brewery: RU:Tag:industrial=brewery
+    industrial=brickyard: RU:Tag:industrial=brickyard
+    industrial=communication: RU:Tag:industrial=communication
+    industrial=depot: RU:Tag:industrial=depot
+    industrial=distributor: RU:Tag:industrial=distributor
     industrial=factory: RU:Tag:industrial=factory
     industrial=factory: RU:Tag:industrial=factory
+    industrial=fish_farm: RU:Tag:industrial=fish farm
+    industrial=food_industry: RU:Tag:industrial=food industry
+    industrial=food_processing: RU:Tag:industrial=food processing
+    industrial=furniture: RU:Tag:industrial=furniture
+    industrial=gas: RU:Tag:industrial=gas
+    industrial=grinding_mill: RU:Tag:industrial=grinding mill
+    industrial=heating_station: RU:Tag:industrial=heating station
+    industrial=ice_factory: RU:Tag:industrial=ice factory
+    industrial=integrated_circuit: RU:Tag:industrial=integrated circuit
+    industrial=machine_shop: RU:Tag:industrial=machine shop
+    industrial=metal_processing: RU:Tag:industrial=metal processing
+    industrial=mine: RU:Tag:industrial=mine
+    industrial=mobile_equipment: RU:Tag:industrial=mobile equipment
+    industrial=oil: RU:Tag:industrial=oil
+    industrial=oil_mill: RU:Tag:industrial=oil mill
+    industrial=port: RU:Tag:industrial=port
+    industrial=refinery: RU:Tag:industrial=refinery
+    industrial=rice_mill: RU:Tag:industrial=rice mill
+    industrial=rocket_engine_test: RU:Tag:industrial=rocket engine test
+    industrial=salt_pond: RU:Tag:industrial=salt pond
+    industrial=sawmill: RU:Tag:industrial=sawmill
+    industrial=scrap_yard: RU:Tag:industrial=scrap yard
+    industrial=shipyard: RU:Tag:industrial=shipyard
+    industrial=slaughterhouse: RU:Tag:industrial=slaughterhouse
+    industrial=steelmaking: RU:Tag:industrial=steelmaking
     industrial=warehouse: RU:Tag:industrial=warehouse
     industrial=well_cluster: RU:Tag:industrial=well cluster
     industrial=warehouse: RU:Tag:industrial=warehouse
     industrial=well_cluster: RU:Tag:industrial=well cluster
+    industrial=wellsite: RU:Tag:industrial=wellsite
+    industrial=winery: RU:Tag:industrial=winery
+    information=audioguide: RU:Tag:information=audioguide
     information=board: RU:Tag:information=board
     information=guidepost: RU:Tag:information=guidepost
     information=board: RU:Tag:information=board
     information=guidepost: RU:Tag:information=guidepost
+    information=map: RU:Tag:information=map
     information=office: RU:Tag:information=office
     information=office: RU:Tag:information=office
+    information=route_marker: RU:Tag:information=route marker
+    information=sign: RU:Tag:information=sign
+    information=stele: RU:Tag:information=stele
+    information=tactile_map: RU:Tag:information=tactile map
+    information=tactile_model: RU:Tag:information=tactile model
+    information=terminal: RU:Tag:information=terminal
+    information=visitor_centre: RU:Tag:information=visitor centre
+    irrigation=yes: RU:Tag:irrigation=yes
+    junction=circular: RU:Tag:junction=circular
     junction=roundabout: RU:Tag:junction=roundabout
     junction=roundabout: RU:Tag:junction=roundabout
+    landcover=grass: RU:Tag:landcover=grass
+    landmark=windsock: RU:Tag:landmark=windsock
+    landuse=agriculture: RU:Tag:landuse=agriculture
     landuse=allotments: RU:Tag:landuse=allotments
     landuse=animal_keeping: RU:Tag:landuse=animal keeping
     landuse=allotments: RU:Tag:landuse=allotments
     landuse=animal_keeping: RU:Tag:landuse=animal keeping
+    landuse=apiary: RU:Tag:landuse=apiary
+    landuse=aquaculture: RU:Tag:landuse=aquaculture
     landuse=basin: RU:Tag:landuse=basin
     landuse=brownfield: RU:Tag:landuse=brownfield
     landuse=cemetery: RU:Tag:landuse=cemetery
     landuse=basin: RU:Tag:landuse=basin
     landuse=brownfield: RU:Tag:landuse=brownfield
     landuse=cemetery: RU:Tag:landuse=cemetery
+    landuse=churchyard: RU:Tag:landuse=churchyard
+    landuse=civic_admin: RU:Tag:landuse=civic admin
     landuse=commercial: RU:Tag:landuse=commercial
     landuse=commercial: RU:Tag:landuse=commercial
+    landuse=conservation: RU:Tag:landuse=conservation
     landuse=construction: RU:Tag:landuse=construction
     landuse=depot: RU:Tag:landuse=depot
     landuse=construction: RU:Tag:landuse=construction
     landuse=depot: RU:Tag:landuse=depot
+    landuse=education: RU:Tag:landuse=education
+    landuse=fairground: RU:Tag:landuse=fairground
     landuse=farm: RU:Tag:landuse=farm
     landuse=farm: RU:Tag:landuse=farm
+    landuse=farmland: RU:Tag:landuse=farmland
+    landuse=farmyard: RU:Tag:landuse=farmyard
+    landuse=field: RU:Tag:landuse=field
+    landuse=fish_pond: RU:Tag:landuse=fish pond
+    landuse=fishfarm: RU:Tag:landuse=fishfarm
     landuse=flowerbed: RU:Tag:landuse=flowerbed
     landuse=forest: RU:Tag:landuse=forest
     landuse=flowerbed: RU:Tag:landuse=flowerbed
     landuse=forest: RU:Tag:landuse=forest
+    landuse=forestry: RU:Tag:landuse=forestry
     landuse=garages: RU:Tag:landuse=garages
     landuse=grass: RU:Tag:landuse=grass
     landuse=garages: RU:Tag:landuse=garages
     landuse=grass: RU:Tag:landuse=grass
+    landuse=greenery: RU:Tag:landuse=greenery
+    landuse=greenfield: RU:Tag:landuse=greenfield
     landuse=greenhouse_horticulture: RU:Tag:landuse=greenhouse horticulture
     landuse=greenhouse_horticulture: RU:Tag:landuse=greenhouse horticulture
+    landuse=harbour: RU:Tag:landuse=harbour
+    landuse=highway: RU:Tag:landuse=highway
+    landuse=house: RU:Tag:landuse=house
     landuse=industrial: RU:Tag:landuse=industrial
     landuse=institutional: RU:Tag:landuse=institutional
     landuse=landfill: RU:Tag:landuse=landfill
     landuse=industrial: RU:Tag:landuse=industrial
     landuse=institutional: RU:Tag:landuse=institutional
     landuse=landfill: RU:Tag:landuse=landfill
+    landuse=livestock: RU:Tag:landuse=livestock
     landuse=logging: RU:Tag:landuse=logging
     landuse=meadow: RU:Tag:landuse=meadow
     landuse=logging: RU:Tag:landuse=logging
     landuse=meadow: RU:Tag:landuse=meadow
+    landuse=meadow_orchard: RU:Tag:landuse=meadow orchard
     landuse=military: RU:Tag:landuse=military
     landuse=military: RU:Tag:landuse=military
+    landuse=observatory: RU:Tag:landuse=observatory
     landuse=orchard: RU:Tag:landuse=orchard
     landuse=orchard: RU:Tag:landuse=orchard
+    landuse=paddy: RU:Tag:landuse=paddy
     landuse=peat_cutting: RU:Tag:landuse=peat cutting
     landuse=plant_nursery: RU:Tag:landuse=plant nursery
     landuse=peat_cutting: RU:Tag:landuse=peat cutting
     landuse=plant_nursery: RU:Tag:landuse=plant nursery
+    landuse=plantation: RU:Tag:landuse=plantation
     landuse=pond: RU:Tag:landuse=pond
     landuse=port: RU:Tag:landuse=port
     landuse=pond: RU:Tag:landuse=pond
     landuse=port: RU:Tag:landuse=port
+    landuse=prison: RU:Tag:landuse=prison
+    landuse=public_works: RU:Tag:landuse=public works
     landuse=quarry: RU:Tag:landuse=quarry
     landuse=quarry: RU:Tag:landuse=quarry
+    landuse=radio: RU:Tag:landuse=radio
     landuse=railway: RU:Tag:landuse=railway
     landuse=recreation_ground: RU:Tag:landuse=recreation ground
     landuse=railway: RU:Tag:landuse=railway
     landuse=recreation_ground: RU:Tag:landuse=recreation ground
+    landuse=religious: RU:Tag:landuse=religious
+    landuse=research: RU:Tag:landuse=research
     landuse=reservoir: RU:Tag:landuse=reservoir
     landuse=reservoir: RU:Tag:landuse=reservoir
+    landuse=reservoir_watershed: RU:Tag:landuse=reservoir watershed
     landuse=residential: RU:Tag:landuse=residential
     landuse=retail: RU:Tag:landuse=retail
     landuse=salt_pond: RU:Tag:landuse=salt pond
     landuse=residential: RU:Tag:landuse=residential
     landuse=retail: RU:Tag:landuse=retail
     landuse=salt_pond: RU:Tag:landuse=salt pond
+    landuse=school: RU:Tag:landuse=school
+    landuse=shrubs: RU:Tag:landuse=shrubs
+    landuse=static_caravan: RU:Tag:landuse=static caravan
+    landuse=street: RU:Tag:landuse=street
+    landuse=traffic_island: RU:Tag:landuse=traffic island
+    landuse=trees: RU:Tag:landuse=trees
     landuse=turbary: RU:Tag:landuse=turbary
     landuse=village_green: RU:Tag:landuse=village green
     landuse=vineyard: RU:Tag:landuse=vineyard
     landuse=turbary: RU:Tag:landuse=turbary
     landuse=village_green: RU:Tag:landuse=village green
     landuse=vineyard: RU:Tag:landuse=vineyard
+    landuse=well: RU:Tag:landuse=well
+    landuse=wellsite: RU:Tag:landuse=wellsite
+    landuse=wholesale: RU:Tag:landuse=wholesale
+    landuse=winter_sports: RU:Tag:landuse=winter sports
+    landuse=wood: RU:Tag:landuse=wood
+    landuse=yes: RU:Tag:landuse=yes
     leaf_cycle=deciduous: RU:Tag:leaf cycle=deciduous
     leaf_cycle=evergreen: RU:Tag:leaf cycle=evergreen
     leaf_cycle=mixed: RU:Tag:leaf cycle=mixed
     leaf_cycle=deciduous: RU:Tag:leaf cycle=deciduous
     leaf_cycle=evergreen: RU:Tag:leaf cycle=evergreen
     leaf_cycle=mixed: RU:Tag:leaf cycle=mixed
@@ -20864,38 +28604,95 @@ ru:
     leaf_type=leafless: RU:Tag:leaf type=leafless
     leaf_type=mixed: RU:Tag:leaf type=mixed
     leaf_type=needleleaved: RU:Tag:leaf type=needleleaved
     leaf_type=leafless: RU:Tag:leaf type=leafless
     leaf_type=mixed: RU:Tag:leaf type=mixed
     leaf_type=needleleaved: RU:Tag:leaf type=needleleaved
+    leisure=adult_gaming_centre: RU:Tag:leisure=adult gaming centre
+    leisure=amusement_arcade: RU:Tag:leisure=amusement arcade
+    leisure=arena: RU:Tag:leisure=arena
+    leisure=axe_throwing: RU:Tag:leisure=axe throwing
     leisure=bandstand: RU:Tag:leisure=bandstand
     leisure=bandstand: RU:Tag:leisure=bandstand
+    leisure=barefoot: RU:Tag:leisure=barefoot
+    leisure=bathing_place: RU:Tag:leisure=bathing place
+    leisure=bbq: RU:Tag:leisure=bbq
+    leisure=beach: RU:Tag:leisure=beach
     leisure=beach_resort: RU:Tag:leisure=beach resort
     leisure=beach_resort: RU:Tag:leisure=beach resort
+    leisure=bingo_hall: RU:Tag:leisure=bingo hall
+    leisure=bird_hide: RU:Tag:leisure=bird hide
+    leisure=bleachers: RU:Tag:leisure=bleachers
+    leisure=bowling_alley: RU:Tag:leisure=bowling alley
+    leisure=casino: RU:Tag:leisure=casino
+    leisure=club: RU:Tag:leisure=club
     leisure=common: RU:Tag:leisure=common
     leisure=dance: RU:Tag:leisure=dance
     leisure=common: RU:Tag:leisure=common
     leisure=dance: RU:Tag:leisure=dance
+    leisure=disc_golf_course: RU:Tag:leisure=disc golf course
+    leisure=dog_park: RU:Tag:leisure=dog park
     leisure=escape_game: RU:Tag:leisure=escape game
     leisure=firepit: RU:Tag:leisure=firepit
     leisure=escape_game: RU:Tag:leisure=escape game
     leisure=firepit: RU:Tag:leisure=firepit
+    leisure=fishing: RU:Tag:leisure=fishing
     leisure=fitness_centre: RU:Tag:leisure=fitness centre
     leisure=fitness_station: RU:Tag:leisure=fitness station
     leisure=fitness_centre: RU:Tag:leisure=fitness centre
     leisure=fitness_station: RU:Tag:leisure=fitness station
+    leisure=foot_bath: RU:Tag:leisure=foot bath
+    leisure=gambling: RU:Tag:leisure=gambling
     leisure=garden: RU:Tag:leisure=garden
     leisure=garden: RU:Tag:leisure=garden
+    leisure=golf_course: RU:Tag:leisure=golf course
     leisure=hackerspace: RU:Tag:leisure=hackerspace
     leisure=horse_riding: RU:Tag:leisure=horse riding
     leisure=hackerspace: RU:Tag:leisure=hackerspace
     leisure=horse_riding: RU:Tag:leisure=horse riding
+    leisure=hot_spring: RU:Tag:leisure=hot spring
+    leisure=hot_tub: RU:Tag:leisure=hot tub
     leisure=ice_rink: RU:Tag:leisure=ice rink
     leisure=ice_rink: RU:Tag:leisure=ice rink
+    leisure=indoor_play: RU:Tag:leisure=indoor play
     leisure=marina: RU:Tag:leisure=marina
     leisure=miniature_golf: RU:Tag:leisure=miniature golf
     leisure=marina: RU:Tag:leisure=marina
     leisure=miniature_golf: RU:Tag:leisure=miniature golf
+    leisure=nature_reserve: RU:Tag:leisure=nature reserve
+    leisure=outdoor_seating: RU:Tag:leisure=outdoor seating
+    leisure=paddling_pool: RU:Tag:leisure=paddling pool
     leisure=park: RU:Tag:leisure=park
     leisure=park: RU:Tag:leisure=park
+    leisure=parklet: RU:Tag:leisure=parklet
+    leisure=picnic: RU:Tag:leisure=picnic
+    leisure=picnic_table: RU:Tag:leisure=picnic table
     leisure=pitch: RU:Tag:leisure=pitch
     leisure=playground: RU:Tag:leisure=playground
     leisure=pitch: RU:Tag:leisure=pitch
     leisure=playground: RU:Tag:leisure=playground
+    leisure=recreation_ground: RU:Tag:leisure=recreation ground
+    leisure=red_light_district: RU:Tag:leisure=red light district
     leisure=resort: RU:Tag:leisure=resort
     leisure=resort: RU:Tag:leisure=resort
+    leisure=sailing_club: RU:Tag:leisure=sailing club
+    leisure=sauna: RU:Tag:leisure=sauna
+    leisure=schoolyard: RU:Tag:leisure=schoolyard
+    leisure=shooting_ground: RU:Tag:leisure=shooting ground
+    leisure=ski_playground: RU:Tag:leisure=ski playground
     leisure=slipway: RU:Tag:leisure=slipway
     leisure=slipway: RU:Tag:leisure=slipway
+    leisure=soccer_golf: RU:Tag:leisure=soccer golf
+    leisure=social_club: RU:Tag:leisure=social club
     leisure=sports_centre: RU:Tag:leisure=sports centre
     leisure=sports_hall: RU:Tag:leisure=sports hall
     leisure=stadium: RU:Tag:leisure=stadium
     leisure=summer_camp: RU:Tag:leisure=summer camp
     leisure=sports_centre: RU:Tag:leisure=sports centre
     leisure=sports_hall: RU:Tag:leisure=sports hall
     leisure=stadium: RU:Tag:leisure=stadium
     leisure=summer_camp: RU:Tag:leisure=summer camp
+    leisure=sunbathing: RU:Tag:leisure=sunbathing
+    leisure=swimming_area: RU:Tag:leisure=swimming area
     leisure=swimming_pool: RU:Tag:leisure=swimming pool
     leisure=swimming_pool: RU:Tag:leisure=swimming pool
+    leisure=tanning_salon: RU:Tag:leisure=tanning salon
     leisure=track: RU:Tag:leisure=track
     leisure=track: RU:Tag:leisure=track
+    leisure=trampoline_park: RU:Tag:leisure=trampoline park
+    leisure=turkish_bath: RU:Tag:leisure=turkish bath
+    leisure=video_arcade: RU:Tag:leisure=video arcade
+    leisure=village_swing: RU:Tag:leisure=village swing
     leisure=water_park: RU:Tag:leisure=water park
     leisure=water_park: RU:Tag:leisure=water park
+    leisure=wellness: RU:Tag:leisure=wellness
+    leisure=wildlife_hide: RU:Tag:leisure=wildlife hide
+    lifeguard=base: RU:Tag:lifeguard=base
+    lifeguard=tower: RU:Tag:lifeguard=tower
     location=overground: RU:Tag:location=overground
     location=overhead: RU:Tag:location=overhead
     location=overground: RU:Tag:location=overground
     location=overhead: RU:Tag:location=overhead
+    location=roof: RU:Tag:location=roof
+    location=rooftop: RU:Tag:location=rooftop
     location=underground: RU:Tag:location=underground
     location=underwater: RU:Tag:location=underwater
     location=underground: RU:Tag:location=underground
     location=underwater: RU:Tag:location=underwater
+    logistics=aerospace: RU:Tag:logistics=aerospace
+    logistics=goods_distribution: RU:Tag:logistics=goods distribution
     man_made=adit: RU:Tag:man made=adit
     man_made=adit: RU:Tag:man made=adit
+    man_made=animal_trap: RU:Tag:man made=animal trap
+    man_made=archimedes_screw: RU:Tag:man made=archimedes screw
+    man_made=architecture_line: RU:Tag:man made=architecture line
     man_made=beacon: RU:Tag:man made=beacon
     man_made=beacon: RU:Tag:man made=beacon
+    man_made=beehive: RU:Tag:man made=beehive
     man_made=breakwater: RU:Tag:man made=breakwater
     man_made=bridge: RU:Tag:man made=bridge
     man_made=bunker_silo: RU:Tag:man made=bunker silo
     man_made=breakwater: RU:Tag:man made=breakwater
     man_made=bridge: RU:Tag:man made=bridge
     man_made=bunker_silo: RU:Tag:man made=bunker silo
@@ -20914,26 +28711,39 @@ ru:
     man_made=embankment: RU:Tag:man made=embankment
     man_made=flagpole: RU:Tag:man made=flagpole
     man_made=flare: RU:Tag:man made=flare
     man_made=embankment: RU:Tag:man made=embankment
     man_made=flagpole: RU:Tag:man made=flagpole
     man_made=flare: RU:Tag:man made=flare
+    man_made=floating_storage: RU:Tag:man made=floating storage
+    man_made=fuel_column: RU:Tag:man made=fuel column
+    man_made=gas_well: RU:Tag:man made=gas well
     man_made=geoglyph: RU:Tag:man made=geoglyph
     man_made=geoglyph: RU:Tag:man made=geoglyph
+    man_made=guard_stone: RU:Tag:man made=guard stone
+    man_made=insect_hotel: RU:Tag:man made=insect hotel
+    man_made=launch_pad: RU:Tag:man made=launch pad
     man_made=lighthouse: RU:Tag:man made=lighthouse
     man_made=mast: RU:Tag:man made=mast
     man_made=mineshaft: RU:Tag:man made=mineshaft
     man_made=monitoring_station: RU:Tag:man made=monitoring station
     man_made=lighthouse: RU:Tag:man made=lighthouse
     man_made=mast: RU:Tag:man made=mast
     man_made=mineshaft: RU:Tag:man made=mineshaft
     man_made=monitoring_station: RU:Tag:man made=monitoring station
+    man_made=mounting_block: RU:Tag:man made=mounting block
+    man_made=nesting_site: RU:Tag:man made=nesting site
     man_made=obelisk: RU:Tag:man made=obelisk
     man_made=observatory: RU:Tag:man made=observatory
     man_made=obelisk: RU:Tag:man made=obelisk
     man_made=observatory: RU:Tag:man made=observatory
+    man_made=offshore_platform: RU:Tag:man made=offshore platform
+    man_made=oil_well: RU:Tag:man made=oil well
     man_made=petroleum_well: RU:Tag:man made=petroleum well
     man_made=pier: RU:Tag:man made=pier
     man_made=pillar: RU:Tag:man made=pillar
     man_made=pipeline: RU:Tag:man made=pipeline
     man_made=petroleum_well: RU:Tag:man made=petroleum well
     man_made=pier: RU:Tag:man made=pier
     man_made=pillar: RU:Tag:man made=pillar
     man_made=pipeline: RU:Tag:man made=pipeline
+    man_made=pumping_rig: RU:Tag:man made=pumping rig
     man_made=pumping_station: RU:Tag:man made=pumping station
     man_made=reservoir_covered: RU:Tag:man made=reservoir covered
     man_made=silo: RU:Tag:man made=silo
     man_made=pumping_station: RU:Tag:man made=pumping station
     man_made=reservoir_covered: RU:Tag:man made=reservoir covered
     man_made=silo: RU:Tag:man made=silo
+    man_made=spoil_heap: RU:Tag:man made=spoil heap
     man_made=storage_tank: RU:Tag:man made=storage tank
     man_made=street_cabinet: RU:Tag:man made=street cabinet
     man_made=surveillance: RU:Tag:man made=surveillance
     man_made=survey_point: RU:Tag:man made=survey point
     man_made=telescope: RU:Tag:man made=telescope
     man_made=tower: RU:Tag:man made=tower
     man_made=storage_tank: RU:Tag:man made=storage tank
     man_made=street_cabinet: RU:Tag:man made=street cabinet
     man_made=surveillance: RU:Tag:man made=surveillance
     man_made=survey_point: RU:Tag:man made=survey point
     man_made=telescope: RU:Tag:man made=telescope
     man_made=tower: RU:Tag:man made=tower
+    man_made=wastewater_basin: RU:Tag:man made=wastewater basin
     man_made=wastewater_plant: RU:Tag:man made=wastewater plant
     man_made=water_tap: RU:Tag:man made=water tap
     man_made=water_tower: RU:Tag:man made=water tower
     man_made=wastewater_plant: RU:Tag:man made=wastewater plant
     man_made=water_tap: RU:Tag:man made=water tap
     man_made=water_tower: RU:Tag:man made=water tower
@@ -20941,23 +28751,63 @@ ru:
     man_made=water_works: RU:Tag:man made=water works
     man_made=watermill: RU:Tag:man made=watermill
     man_made=wildlife_crossing: RU:Tag:man made=wildlife crossing
     man_made=water_works: RU:Tag:man made=water works
     man_made=watermill: RU:Tag:man made=watermill
     man_made=wildlife_crossing: RU:Tag:man made=wildlife crossing
+    man_made=wildlife_opening: RU:Tag:man made=wildlife opening
     man_made=windmill: RU:Tag:man made=windmill
     man_made=works: RU:Tag:man made=works
     manhole=drain: RU:Tag:manhole=drain
     man_made=windmill: RU:Tag:man made=windmill
     man_made=works: RU:Tag:man made=works
     manhole=drain: RU:Tag:manhole=drain
+    marker=post: RU:Tag:marker=post
+    maxweight:signed=no: RU:Tag:maxweight:signed=no
+    meadow=paddock: RU:Tag:meadow=paddock
+    meadow=pasture: RU:Tag:meadow=pasture
+    medical_system:western=yes: RU:Tag:medical system:western=yes
+    memorial=cenotaph: RU:Tag:memorial=cenotaph
+    memorial=flood_mark: RU:Tag:memorial=flood mark
+    memorial=ghost_bike: RU:Tag:memorial=ghost bike
+    memorial=obelisk: RU:Tag:memorial=obelisk
     memorial=stele: RU:Tag:memorial=stele
     memorial=stele: RU:Tag:memorial=stele
+    microbrewery=yes: RU:Tag:microbrewery=yes
     military=airfield: RU:Tag:military=airfield
     military=barracks: RU:Tag:military=barracks
     military=airfield: RU:Tag:military=airfield
     military=barracks: RU:Tag:military=barracks
+    military=bombcrater: RU:Tag:military=bombcrater
     military=bunker: RU:Tag:military=bunker
     military=checkpoint: RU:Tag:military=checkpoint
     military=bunker: RU:Tag:military=bunker
     military=checkpoint: RU:Tag:military=checkpoint
+    military=depot: RU:Tag:military=depot
+    military=launchpad: RU:Tag:military=launchpad
     military=naval_base: RU:Tag:military=naval base
     military=training_area: RU:Tag:military=training area
     military=naval_base: RU:Tag:military=naval base
     military=training_area: RU:Tag:military=training area
+    military=trench: RU:Tag:military=trench
+    monument=statue: RU:Tag:monument=statue
+    motor_vehicle=agricultural: RU:Tag:motor vehicle=agricultural
+    motor_vehicle=delivery: RU:Tag:motor vehicle=delivery
+    motor_vehicle=forestry: RU:Tag:motor vehicle=forestry
+    motor_vehicle=no: RU:Tag:motor vehicle=no
+    motor_vehicle=private: RU:Tag:motor vehicle=private
+    motorcycle=no: RU:Tag:motorcycle=no
+    motorcycle=yes: RU:Tag:motorcycle=yes
+    museum=aerospace: RU:Tag:museum=aerospace
+    museum=agriculture: RU:Tag:museum=agriculture
+    museum=archaeological: RU:Tag:museum=archaeological
+    museum=art: RU:Tag:museum=art
+    museum=aviation: RU:Tag:museum=aviation
+    museum=children: RU:Tag:museum=children
+    museum=history: RU:Tag:museum=history
+    museum=living_history: RU:Tag:museum=living history
+    museum=local: RU:Tag:museum=local
+    museum=military: RU:Tag:museum=military
+    museum=nature: RU:Tag:museum=nature
+    museum=open_air: RU:Tag:museum=open air
+    museum=railway: RU:Tag:museum=railway
+    museum=technology: RU:Tag:museum=technology
+    museum=transport: RU:Tag:museum=transport
     name=Продукты: RU:Tag:name=Продукты
     natural=arete: RU:Tag:natural=arete
     natural=bare_rock: RU:Tag:natural=bare rock
     natural=beach: RU:Tag:natural=beach
     name=Продукты: RU:Tag:name=Продукты
     natural=arete: RU:Tag:natural=arete
     natural=bare_rock: RU:Tag:natural=bare rock
     natural=beach: RU:Tag:natural=beach
+    natural=caldera: RU:Tag:natural=caldera
     natural=cave_entrance: RU:Tag:natural=cave entrance
     natural=cliff: RU:Tag:natural=cliff
     natural=coastline: RU:Tag:natural=coastline
     natural=cave_entrance: RU:Tag:natural=cave entrance
     natural=cliff: RU:Tag:natural=cliff
     natural=coastline: RU:Tag:natural=coastline
+    natural=crater: RU:Tag:natural=crater
     natural=desert: RU:Tag:natural=desert
     natural=earth_bank: RU:Tag:natural=earth bank
     natural=fell: RU:Tag:natural=fell
     natural=desert: RU:Tag:natural=desert
     natural=earth_bank: RU:Tag:natural=earth bank
     natural=fell: RU:Tag:natural=fell
@@ -20966,7 +28816,9 @@ ru:
     natural=grassland: RU:Tag:natural=grassland
     natural=gully: RU:Tag:natural=gully
     natural=heath: RU:Tag:natural=heath
     natural=grassland: RU:Tag:natural=grassland
     natural=gully: RU:Tag:natural=gully
     natural=heath: RU:Tag:natural=heath
+    natural=hill: RU:Tag:natural=hill
     natural=hot_spring: RU:Tag:natural=hot spring
     natural=hot_spring: RU:Tag:natural=hot spring
+    natural=meteor_crater: RU:Tag:natural=meteor crater
     natural=mud: RU:Tag:natural=mud
     natural=peak: RU:Tag:natural=peak
     natural=ridge: RU:Tag:natural=ridge
     natural=mud: RU:Tag:natural=mud
     natural=peak: RU:Tag:natural=peak
     natural=ridge: RU:Tag:natural=ridge
@@ -20975,59 +28827,180 @@ ru:
     natural=scree: RU:Tag:natural=scree
     natural=scrub: RU:Tag:natural=scrub
     natural=shingle: RU:Tag:natural=shingle
     natural=scree: RU:Tag:natural=scree
     natural=scrub: RU:Tag:natural=scrub
     natural=shingle: RU:Tag:natural=shingle
+    natural=shrubbery: RU:Tag:natural=shrubbery
     natural=sinkhole: RU:Tag:natural=sinkhole
     natural=spring: RU:Tag:natural=spring
     natural=stone: RU:Tag:natural=stone
     natural=tree: RU:Tag:natural=tree
     natural=tree_row: RU:Tag:natural=tree row
     natural=sinkhole: RU:Tag:natural=sinkhole
     natural=spring: RU:Tag:natural=spring
     natural=stone: RU:Tag:natural=stone
     natural=tree: RU:Tag:natural=tree
     natural=tree_row: RU:Tag:natural=tree row
+    natural=tree_stump: RU:Tag:natural=tree stump
+    natural=tundra: RU:Tag:natural=tundra
     natural=valley: RU:Tag:natural=valley
     natural=volcano: RU:Tag:natural=volcano
     natural=water: RU:Tag:natural=water
     natural=wetland: RU:Tag:natural=wetland
     natural=wood: RU:Tag:natural=wood
     natural=valley: RU:Tag:natural=valley
     natural=volcano: RU:Tag:natural=volcano
     natural=water: RU:Tag:natural=water
     natural=wetland: RU:Tag:natural=wetland
     natural=wood: RU:Tag:natural=wood
+    navigationaid=als: RU:Tag:navigationaid=als
+    navigationaid=papi: RU:Tag:navigationaid=papi
+    navigationaid=rwe: RU:Tag:navigationaid=rwe
+    navigationaid=txc: RU:Tag:navigationaid=txc
+    navigationaid=txe: RU:Tag:navigationaid=txe
+    navigationaid=vasi: RU:Tag:navigationaid=vasi
+    network=lhn: RU:Tag:network=lhn
+    network=rhn: RU:Tag:network=rhn
+    noexit=yes: RU:Tag:noexit=yes
+    noname=yes: RU:Tag:noname=yes
     office=accountant: RU:Tag:office=accountant
     office=administrative: RU:Tag:office=administrative
     office=accountant: RU:Tag:office=accountant
     office=administrative: RU:Tag:office=administrative
+    office=adoption_agency: RU:Tag:office=adoption agency
+    office=advertising_agency: RU:Tag:office=advertising agency
     office=architect: RU:Tag:office=architect
     office=architect: RU:Tag:office=architect
+    office=archive: RU:Tag:office=archive
+    office=association: RU:Tag:office=association
+    office=bail_bond_agent: RU:Tag:office=bail bond agent
+    office=chamber: RU:Tag:office=chamber
+    office=charity: RU:Tag:office=charity
     office=company: RU:Tag:office=company
     office=company: RU:Tag:office=company
+    office=construction_company: RU:Tag:office=construction company
+    office=consulting: RU:Tag:office=consulting
+    office=courier: RU:Tag:office=courier
+    office=coworking: RU:Tag:office=coworking
+    office=diplomatic: RU:Tag:office=diplomatic
     office=educational_institution: RU:Tag:office=educational institution
     office=employment_agency: RU:Tag:office=employment agency
     office=educational_institution: RU:Tag:office=educational institution
     office=employment_agency: RU:Tag:office=employment agency
+    office=energy_supplier: RU:Tag:office=energy supplier
+    office=engineer: RU:Tag:office=engineer
     office=estate_agent: RU:Tag:office=estate agent
     office=estate_agent: RU:Tag:office=estate agent
+    office=financial: RU:Tag:office=financial
+    office=financial_advisor: RU:Tag:office=financial advisor
+    office=forestry: RU:Tag:office=forestry
+    office=foundation: RU:Tag:office=foundation
+    office=geodesist: RU:Tag:office=geodesist
     office=government: RU:Tag:office=government
     office=government: RU:Tag:office=government
+    office=graphic_design: RU:Tag:office=graphic design
+    office=guide: RU:Tag:office=guide
+    office=harbour_master: RU:Tag:office=harbour master
+    office=healthcare: RU:Tag:office=healthcare
     office=insurance: RU:Tag:office=insurance
     office=insurance: RU:Tag:office=insurance
+    office=international_organization: RU:Tag:office=international organization
     office=it: RU:Tag:office=it
     office=lawyer: RU:Tag:office=lawyer
     office=logistics: RU:Tag:office=logistics
     office=it: RU:Tag:office=it
     office=lawyer: RU:Tag:office=lawyer
     office=logistics: RU:Tag:office=logistics
+    office=lost_property: RU:Tag:office=lost property
+    office=medical: RU:Tag:office=medical
+    office=moving_company: RU:Tag:office=moving company
     office=newspaper: RU:Tag:office=newspaper
     office=ngo: RU:Tag:office=ngo
     office=newspaper: RU:Tag:office=newspaper
     office=ngo: RU:Tag:office=ngo
+    office=notary: RU:Tag:office=notary
+    office=occupational_safety: RU:Tag:office=occupational safety
+    office=parish: RU:Tag:office=parish
     office=political_party: RU:Tag:office=political party
     office=political_party: RU:Tag:office=political party
+    office=politician: RU:Tag:office=politician
+    office=private_investigator: RU:Tag:office=private investigator
+    office=property_management: RU:Tag:office=property management
+    office=publisher: RU:Tag:office=publisher
+    office=quango: RU:Tag:office=quango
+    office=real_estate_agent: RU:Tag:office=real estate agent
+    office=register: RU:Tag:office=register
+    office=religion: RU:Tag:office=religion
     office=research: RU:Tag:office=research
     office=research: RU:Tag:office=research
+    office=school: RU:Tag:office=school
+    office=security: RU:Tag:office=security
+    office=supervised_injection_site: RU:Tag:office=supervised injection site
+    office=surveyor: RU:Tag:office=surveyor
+    office=tax: RU:Tag:office=tax
+    office=tax_advisor: RU:Tag:office=tax advisor
     office=telecommunication: RU:Tag:office=telecommunication
     office=telecommunication: RU:Tag:office=telecommunication
+    office=therapist: RU:Tag:office=therapist
+    office=tourist_accommodation: RU:Tag:office=tourist accommodation
+    office=translator: RU:Tag:office=translator
     office=travel_agent: RU:Tag:office=travel agent
     office=travel_agent: RU:Tag:office=travel agent
+    office=tutoring: RU:Tag:office=tutoring
+    office=union: RU:Tag:office=union
+    office=university: RU:Tag:office=university
+    office=visa: RU:Tag:office=visa
+    office=water_utility: RU:Tag:office=water utility
+    office=yes: RU:Tag:office=yes
+    oneway:bicycle=yes: RU:Tag:oneway:bicycle=yes
+    oneway:moped=no: RU:Tag:oneway:moped=no
+    oneway=alternating: RU:Tag:oneway=alternating
+    oneway=reversible: RU:Tag:oneway=reversible
+    oneway=yes: RU:Tag:oneway=yes
     opening_hours=24/7: RU:Tag:opening hours=24/7
     opening_hours=24/7: RU:Tag:opening hours=24/7
+    outlet=direct: RU:Tag:outlet=direct
     overtaking=backward: RU:Tag:overtaking=backward
     overtaking=both: RU:Tag:overtaking=both
     overtaking=forward: RU:Tag:overtaking=forward
     overtaking=no: RU:Tag:overtaking=no
     overtaking=yes: RU:Tag:overtaking=yes
     overtaking=backward: RU:Tag:overtaking=backward
     overtaking=both: RU:Tag:overtaking=both
     overtaking=forward: RU:Tag:overtaking=forward
     overtaking=no: RU:Tag:overtaking=no
     overtaking=yes: RU:Tag:overtaking=yes
+    park_ride=hov: RU:Tag:park ride=hov
+    parking:orientation=perpendicular: RU:Tag:parking:orientation=perpendicular
+    parking=lane: RU:Tag:parking=lane
+    parking=layby: RU:Tag:parking=layby
+    parking=multi-storey: RU:Tag:parking=multi-storey
+    parking=on_kerb: RU:Tag:parking=on kerb
+    parking=street_side: RU:Tag:parking=street side
+    parking=surface: RU:Tag:parking=surface
+    parking=underground: RU:Tag:parking=underground
+    parking_space=charging: RU:Tag:parking space=charging
+    parking_space=disabled: RU:Tag:parking space=disabled
+    path=desire: RU:Tag:path=desire
+    path=sidewalk: RU:Tag:path=sidewalk
     pipeline=marker: RU:Tag:pipeline=marker
     pipeline=substation: RU:Tag:pipeline=substation
     pipeline=marker: RU:Tag:pipeline=marker
     pipeline=substation: RU:Tag:pipeline=substation
+    pipeline=surge_tank: RU:Tag:pipeline=surge tank
+    pipeline=valve: RU:Tag:pipeline=valve
+    piste:type=sled: RU:Tag:piste:type=sled
     place=allotments: RU:Tag:place=allotments
     place=archipelago: RU:Tag:place=archipelago
     place=allotments: RU:Tag:place=allotments
     place=archipelago: RU:Tag:place=archipelago
+    place=borough: RU:Tag:place=borough
     place=city: RU:Tag:place=city
     place=city: RU:Tag:place=city
+    place=city_block: RU:Tag:place=city block
+    place=continent: RU:Tag:place=continent
+    place=country: RU:Tag:place=country
+    place=county: RU:Tag:place=county
+    place=district: RU:Tag:place=district
+    place=farm: RU:Tag:place=farm
     place=hamlet: RU:Tag:place=hamlet
     place=island: RU:Tag:place=island
     place=islet: RU:Tag:place=islet
     place=isolated_dwelling: RU:Tag:place=isolated dwelling
     place=locality: RU:Tag:place=locality
     place=hamlet: RU:Tag:place=hamlet
     place=island: RU:Tag:place=island
     place=islet: RU:Tag:place=islet
     place=isolated_dwelling: RU:Tag:place=isolated dwelling
     place=locality: RU:Tag:place=locality
+    place=municipality: RU:Tag:place=municipality
     place=neighbourhood: RU:Tag:place=neighbourhood
     place=neighbourhood: RU:Tag:place=neighbourhood
+    place=ocean: RU:Tag:place=ocean
+    place=plot: RU:Tag:place=plot
+    place=polder: RU:Tag:place=polder
+    place=province: RU:Tag:place=province
     place=quarter: RU:Tag:place=quarter
     place=quarter: RU:Tag:place=quarter
+    place=region: RU:Tag:place=region
+    place=sea: RU:Tag:place=sea
     place=square: RU:Tag:place=square
     place=square: RU:Tag:place=square
+    place=state: RU:Tag:place=state
+    place=subcounty: RU:Tag:place=subcounty
     place=suburb: RU:Tag:place=suburb
     place=town: RU:Tag:place=town
     place=village: RU:Tag:place=village
     place=suburb: RU:Tag:place=suburb
     place=town: RU:Tag:place=town
     place=village: RU:Tag:place=village
+    place_of_mourning=yes: RU:Tag:place of mourning=yes
+    playground=balancebeam: RU:Tag:playground=balancebeam
+    playground=bridge: RU:Tag:playground=bridge
+    playground=climbingframe: RU:Tag:playground=climbingframe
+    playground=climbingwall: RU:Tag:playground=climbingwall
+    playground=funnel_ball: RU:Tag:playground=funnel ball
+    playground=hopscotch: RU:Tag:playground=hopscotch
+    playground=horizontal_bar: RU:Tag:playground=horizontal bar
+    playground=map: RU:Tag:playground=map
+    playground=playhouse: RU:Tag:playground=playhouse
+    playground=sandpit: RU:Tag:playground=sandpit
+    playground=sledding: RU:Tag:playground=sledding
     playground=slide: RU:Tag:playground=slide
     playground=structure: RU:Tag:playground=structure
     playground=slide: RU:Tag:playground=slide
     playground=structure: RU:Tag:playground=structure
+    playground=teenshelter: RU:Tag:playground=teenshelter
+    playground=tunnel_tube: RU:Tag:playground=tunnel tube
+    playground=youth_bench: RU:Tag:playground=youth bench
     police=barracks: RU:Tag:police=barracks
     police=barracks: RU:Tag:police=barracks
+    police=car_pound: RU:Tag:police=car pound
+    post_office=post_partner: RU:Tag:post office=post partner
     power=compensator: RU:Tag:power=compensator
     power=generator: RU:Tag:power=generator
     power=heliostat: RU:Tag:power=heliostat
     power=compensator: RU:Tag:power=compensator
     power=generator: RU:Tag:power=generator
     power=heliostat: RU:Tag:power=heliostat
@@ -21040,13 +29013,31 @@ ru:
     power=substation: RU:Tag:power=substation
     power=tower: RU:Tag:power=tower
     power=transformer: RU:Tag:power=transformer
     power=substation: RU:Tag:power=substation
     power=tower: RU:Tag:power=tower
     power=transformer: RU:Tag:power=transformer
+    prison_camp=concentration_camp: RU:Tag:prison camp=concentration camp
+    product=beer: RU:Tag:product=beer
+    product=bricks: RU:Tag:product=bricks
+    product=concrete: RU:Tag:product=concrete
+    product=electronics: RU:Tag:product=electronics
+    product=food: RU:Tag:product=food
+    product=furniture: RU:Tag:product=furniture
+    product=machinery: RU:Tag:product=machinery
+    product=oil: RU:Tag:product=oil
+    product=packaging: RU:Tag:product=packaging
+    product=rice: RU:Tag:product=rice
+    product=steel: RU:Tag:product=steel
+    product=sugar: RU:Tag:product=sugar
+    protect_class=22: RU:Tag:protect class=22
     public_transport=platform: RU:Tag:public transport=platform
     public_transport=station: RU:Tag:public transport=station
     public_transport=platform: RU:Tag:public transport=platform
     public_transport=station: RU:Tag:public transport=station
+    public_transport=stop_area: RU:Tag:public transport=stop area
     public_transport=stop_position: RU:Tag:public transport=stop position
     public_transport=stop_position: RU:Tag:public transport=stop position
+    pump=manual: RU:Tag:pump=manual
+    pump=no: RU:Tag:pump=no
     pump=powered: RU:Tag:pump=powered
     railway=abandoned: RU:Tag:railway=abandoned
     railway=crossing: RU:Tag:railway=crossing
     railway=disused: RU:Tag:railway=disused
     pump=powered: RU:Tag:pump=powered
     railway=abandoned: RU:Tag:railway=abandoned
     railway=crossing: RU:Tag:railway=crossing
     railway=disused: RU:Tag:railway=disused
+    railway=halt: RU:Tag:railway=halt
     railway=level_crossing: RU:Tag:railway=level crossing
     railway=light_rail: RU:Tag:railway=light rail
     railway=miniature: RU:Tag:railway=miniature
     railway=level_crossing: RU:Tag:railway=level crossing
     railway=light_rail: RU:Tag:railway=light rail
     railway=miniature: RU:Tag:railway=miniature
@@ -21055,21 +29046,65 @@ ru:
     railway=rail: RU:Tag:railway=rail
     railway=railway_crossing: RU:Tag:railway=railway crossing
     railway=roundhouse: RU:Tag:railway=roundhouse
     railway=rail: RU:Tag:railway=rail
     railway=railway_crossing: RU:Tag:railway=railway crossing
     railway=roundhouse: RU:Tag:railway=roundhouse
+    railway=signal_box: RU:Tag:railway=signal box
     railway=station: RU:Tag:railway=station
     railway=station: RU:Tag:railway=station
+    railway=stop: RU:Tag:railway=stop
     railway=subway: RU:Tag:railway=subway
     railway=subway_entrance: RU:Tag:railway=subway entrance
     railway=tram: RU:Tag:railway=tram
     railway=subway: RU:Tag:railway=subway
     railway=subway_entrance: RU:Tag:railway=subway entrance
     railway=tram: RU:Tag:railway=tram
+    railway=tram_stop: RU:Tag:railway=tram stop
     railway=turntable: RU:Tag:railway=turntable
     railway=turntable: RU:Tag:railway=turntable
+    railway=wash: RU:Tag:railway=wash
+    recreation_ground=showground: RU:Tag:recreation ground=showground
+    recycling_type=centre: RU:Tag:recycling type=centre
+    recycling_type=container: RU:Tag:recycling type=container
     religion=pagan: RU:Tag:religion=pagan
     religion=pagan: RU:Tag:religion=pagan
+    religion=shamanic: RU:Tag:religion=shamanic
     religion=zoroastrian: RU:Tag:religion=zoroastrian
     religion=zoroastrian: RU:Tag:religion=zoroastrian
+    rental=boat: RU:Tag:rental=boat
+    rental=clothes: RU:Tag:rental=clothes
+    rental=quadracycle: RU:Tag:rental=quadracycle
+    rental=ski: RU:Tag:rental=ski
+    request_stop=yes: RU:Tag:request stop=yes
+    research=aerospace: RU:Tag:research=aerospace
     residential=apartments: RU:Tag:residential=apartments
     residential=apartments: RU:Tag:residential=apartments
+    residential=block: RU:Tag:residential=block
+    residential=condominium: RU:Tag:residential=condominium
+    residential=duplex: RU:Tag:residential=duplex
+    residential=halting_site: RU:Tag:residential=halting site
+    residential=informal_settlement: RU:Tag:residential=informal settlement
+    residential=irregular_settlement: RU:Tag:residential=irregular settlement
     residential=rural: RU:Tag:residential=rural
     residential=rural: RU:Tag:residential=rural
+    residential=single_family: RU:Tag:residential=single family
+    residential=slum: RU:Tag:residential=slum
+    residential=terrace: RU:Tag:residential=terrace
+    residential=trailer_park: RU:Tag:residential=trailer park
+    residential=university: RU:Tag:residential=university
     residential=urban: RU:Tag:residential=urban
     residential=urban: RU:Tag:residential=urban
+    roller_coaster=station: RU:Tag:roller coaster=station
+    roller_coaster=support: RU:Tag:roller coaster=support
+    roller_coaster=track: RU:Tag:roller coaster=track
+    route=bicycle: RU:Tag:route=bicycle
     route=bus: RU:Tag:route=bus
     route=ferry: RU:Tag:route=ferry
     route=bus: RU:Tag:route=bus
     route=ferry: RU:Tag:route=ferry
+    route=hiking: RU:Tag:route=hiking
+    route=horse: RU:Tag:route=horse
+    route=mtb: RU:Tag:route=mtb
+    route=piste: RU:Tag:route=piste
     route=railway: RU:Tag:route=railway
     route=railway: RU:Tag:route=railway
+    route=share_taxi: RU:Tag:route=share taxi
+    route=ski: RU:Tag:route=ski
+    route=tracks: RU:Tag:route=tracks
     route=train: RU:Tag:route=train
     route=tram: RU:Tag:route=tram
     route=train: RU:Tag:route=train
     route=tram: RU:Tag:route=tram
+    route=transhumance: RU:Tag:route=transhumance
+    runway=displaced_threshold: RU:Tag:runway=displaced threshold
+    school=entrance: RU:Tag:school=entrance
+    seamark:wreck:category=dangerous: RU:Tag:seamark:wreck:category=dangerous
+    seamark:wreck:category=hull_showing: RU:Tag:seamark:wreck:category=hull showing
+    seamark:wreck:category=non-dangerous: RU:Tag:seamark:wreck:category=non-dangerous
+    service:vehicle:tyres=yes: RU:Tag:service:vehicle:tyres=yes
+    service=aircraft_control: RU:Tag:service=aircraft control
     service=alley: RU:Tag:service=alley
     service=crossover: RU:Tag:service=crossover
     service=dealer: RU:Tag:service=dealer
     service=alley: RU:Tag:service=alley
     service=crossover: RU:Tag:service=crossover
     service=dealer: RU:Tag:service=dealer
@@ -21079,7 +29114,20 @@ ru:
     service=parts: RU:Tag:service=parts
     service=repair: RU:Tag:service=repair
     service=tyres: RU:Tag:service=tyres
     service=parts: RU:Tag:service=parts
     service=repair: RU:Tag:service=repair
     service=tyres: RU:Tag:service=tyres
+    shelter_type=Wetterpilz: RU:Tag:shelter type=Wetterpilz
+    shelter_type=basic_hut: RU:Tag:shelter type=basic hut
+    shelter_type=changing_rooms: RU:Tag:shelter type=changing rooms
+    shelter_type=field_shelter: RU:Tag:shelter type=field shelter
+    shelter_type=gazebo: RU:Tag:shelter type=gazebo
+    shelter_type=lean_to: RU:Tag:shelter type=lean to
+    shelter_type=pavilion: RU:Tag:shelter type=pavilion
+    shelter_type=picnic_shelter: RU:Tag:shelter type=picnic shelter
     shelter_type=public_transport: RU:Tag:shelter type=public transport
     shelter_type=public_transport: RU:Tag:shelter type=public transport
+    shelter_type=rock_shelter: RU:Tag:shelter type=rock shelter
+    shelter_type=sun_shelter: RU:Tag:shelter type=sun shelter
+    shelter_type=weather_shelter: RU:Tag:shelter type=weather shelter
+    shelter_type=wetterpilz: RU:Tag:shelter type=wetterpilz
+    shop=3d_printing: RU:Tag:shop=3d printing
     shop=agrarian: RU:Tag:shop=agrarian
     shop=alcohol: RU:Tag:shop=alcohol
     shop=anime: RU:Tag:shop=anime
     shop=agrarian: RU:Tag:shop=agrarian
     shop=alcohol: RU:Tag:shop=alcohol
     shop=anime: RU:Tag:shop=anime
@@ -21093,8 +29141,10 @@ ru:
     shop=bed: RU:Tag:shop=bed
     shop=beverages: RU:Tag:shop=beverages
     shop=bicycle: RU:Tag:shop=bicycle
     shop=bed: RU:Tag:shop=bed
     shop=beverages: RU:Tag:shop=beverages
     shop=bicycle: RU:Tag:shop=bicycle
+    shop=boat: RU:Tag:shop=boat
     shop=books: RU:Tag:shop=books
     shop=boutique: RU:Tag:shop=boutique
     shop=books: RU:Tag:shop=books
     shop=boutique: RU:Tag:shop=boutique
+    shop=brewing_supplies: RU:Tag:shop=brewing supplies
     shop=butcher: RU:Tag:shop=butcher
     shop=car: RU:Tag:shop=car
     shop=car_parts: RU:Tag:shop=car parts
     shop=butcher: RU:Tag:shop=butcher
     shop=car: RU:Tag:shop=car
     shop=car_parts: RU:Tag:shop=car parts
@@ -21147,7 +29197,9 @@ ru:
     shop=household_linen: RU:Tag:shop=household linen
     shop=houseware: RU:Tag:shop=houseware
     shop=hunting: RU:Tag:shop=hunting
     shop=household_linen: RU:Tag:shop=household linen
     shop=houseware: RU:Tag:shop=houseware
     shop=hunting: RU:Tag:shop=hunting
+    shop=hvac: RU:Tag:shop=hvac
     shop=interior_decoration: RU:Tag:shop=interior decoration
     shop=interior_decoration: RU:Tag:shop=interior decoration
+    shop=jetski: RU:Tag:shop=jetski
     shop=jewelry: RU:Tag:shop=jewelry
     shop=kiosk: RU:Tag:shop=kiosk
     shop=kitchen: RU:Tag:shop=kitchen
     shop=jewelry: RU:Tag:shop=jewelry
     shop=kiosk: RU:Tag:shop=kiosk
     shop=kitchen: RU:Tag:shop=kitchen
@@ -21156,9 +29208,12 @@ ru:
     shop=mall: RU:Tag:shop=mall
     shop=massage: RU:Tag:shop=massage
     shop=medical_supply: RU:Tag:shop=medical supply
     shop=mall: RU:Tag:shop=mall
     shop=massage: RU:Tag:shop=massage
     shop=medical_supply: RU:Tag:shop=medical supply
+    shop=mobile_equipment: RU:Tag:shop=mobile equipment
     shop=mobile_phone: RU:Tag:shop=mobile phone
     shop=money_lender: RU:Tag:shop=money lender
     shop=motorcycle: RU:Tag:shop=motorcycle
     shop=mobile_phone: RU:Tag:shop=mobile phone
     shop=money_lender: RU:Tag:shop=money lender
     shop=motorcycle: RU:Tag:shop=motorcycle
+    shop=motorcycle_parts: RU:Tag:shop=motorcycle parts
+    shop=motorcycle_repair: RU:Tag:shop=motorcycle repair
     shop=music: RU:Tag:shop=music
     shop=musical_instrument: RU:Tag:shop=musical instrument
     shop=newsagent: RU:Tag:shop=newsagent
     shop=music: RU:Tag:shop=music
     shop=musical_instrument: RU:Tag:shop=musical instrument
     shop=newsagent: RU:Tag:shop=newsagent
@@ -21167,17 +29222,22 @@ ru:
     shop=outdoor: RU:Tag:shop=outdoor
     shop=outpost: RU:Tag:shop=outpost
     shop=paint: RU:Tag:shop=paint
     shop=outdoor: RU:Tag:shop=outdoor
     shop=outpost: RU:Tag:shop=outpost
     shop=paint: RU:Tag:shop=paint
+    shop=pastry: RU:Tag:shop=pastry
     shop=pawnbroker: RU:Tag:shop=pawnbroker
     shop=pet: RU:Tag:shop=pet
     shop=pet_grooming: RU:Tag:shop=pet grooming
     shop=pawnbroker: RU:Tag:shop=pawnbroker
     shop=pet: RU:Tag:shop=pet
     shop=pet_grooming: RU:Tag:shop=pet grooming
+    shop=photo: RU:Tag:shop=photo
     shop=power_tools: RU:Tag:shop=power tools
     shop=pyrotechnics: RU:Tag:shop=pyrotechnics
     shop=radiotechnics: RU:Tag:shop=radiotechnics
     shop=religion: RU:Tag:shop=religion
     shop=power_tools: RU:Tag:shop=power tools
     shop=pyrotechnics: RU:Tag:shop=pyrotechnics
     shop=radiotechnics: RU:Tag:shop=radiotechnics
     shop=religion: RU:Tag:shop=religion
+    shop=rental: RU:Tag:shop=rental
+    shop=safety_equipment: RU:Tag:shop=safety equipment
     shop=seafood: RU:Tag:shop=seafood
     shop=second_hand: RU:Tag:shop=second hand
     shop=security: RU:Tag:shop=security
     shop=ship_chandler: RU:Tag:shop=ship chandler
     shop=seafood: RU:Tag:shop=seafood
     shop=second_hand: RU:Tag:shop=second hand
     shop=security: RU:Tag:shop=security
     shop=ship_chandler: RU:Tag:shop=ship chandler
+    shop=shoe_repair: RU:Tag:shop=shoe repair
     shop=shoes: RU:Tag:shop=shoes
     shop=spices: RU:Tag:shop=spices
     shop=sports: RU:Tag:shop=sports
     shop=shoes: RU:Tag:shop=shoes
     shop=spices: RU:Tag:shop=spices
     shop=sports: RU:Tag:shop=sports
@@ -21189,6 +29249,7 @@ ru:
     shop=tobacco: RU:Tag:shop=tobacco
     shop=toys: RU:Tag:shop=toys
     shop=trade: RU:Tag:shop=trade
     shop=tobacco: RU:Tag:shop=tobacco
     shop=toys: RU:Tag:shop=toys
     shop=trade: RU:Tag:shop=trade
+    shop=trailer: RU:Tag:shop=trailer
     shop=travel_agency: RU:Tag:shop=travel agency
     shop=tyres: RU:Tag:shop=tyres
     shop=vacant: RU:Tag:shop=vacant
     shop=travel_agency: RU:Tag:shop=travel agency
     shop=tyres: RU:Tag:shop=tyres
     shop=vacant: RU:Tag:shop=vacant
@@ -21199,24 +29260,97 @@ ru:
     shop=watches: RU:Tag:shop=watches
     shop=wholesale: RU:Tag:shop=wholesale
     shop=window_blind: RU:Tag:shop=window blind
     shop=watches: RU:Tag:shop=watches
     shop=wholesale: RU:Tag:shop=wholesale
     shop=window_blind: RU:Tag:shop=window blind
+    shop=wine: RU:Tag:shop=wine
+    shop=winery: RU:Tag:shop=winery
     signpost=forestry_compartment: RU:Tag:signpost=forestry compartment
     sinkhole=bluehole: RU:Tag:sinkhole=bluehole
     site_type=fortification: RU:Tag:site type=fortification
     signpost=forestry_compartment: RU:Tag:signpost=forestry compartment
     sinkhole=bluehole: RU:Tag:sinkhole=bluehole
     site_type=fortification: RU:Tag:site type=fortification
+    social_facility:for=disabled: RU:Tag:social facility:for=disabled
+    social_facility:for=homeless: RU:Tag:social facility:for=homeless
+    social_facility:for=senior: RU:Tag:social facility:for=senior
+    social_facility=ambulatory_care: RU:Tag:social facility=ambulatory care
+    social_facility=dairy_kitchen: RU:Tag:social facility=dairy kitchen
     social_facility=group_home: RU:Tag:social facility=group home
     social_facility=group_home: RU:Tag:social facility=group home
+    source:addr=ЕГРН: RU:Tag:source:addr=ЕГРН
+    source:maxspeed=sign: RU:Tag:source:maxspeed=sign
     sport=archery: RU:Tag:sport=archery
     sport=archery: RU:Tag:sport=archery
+    sport=cycling: RU:Tag:sport=cycling
+    sport=dog_racing: RU:Tag:sport=dog racing
+    sport=equestrian: RU:Tag:sport=equestrian
+    sport=funnel_ball: RU:Tag:sport=funnel ball
     sport=futsal: RU:Tag:sport=futsal
     sport=futsal: RU:Tag:sport=futsal
+    sport=golf: RU:Tag:sport=golf
     sport=horse_racing: RU:Tag:sport=horse racing
     sport=horse_racing: RU:Tag:sport=horse racing
+    sport=karting: RU:Tag:sport=karting
+    sport=model_aerodrome: RU:Tag:sport=model aerodrome
     sport=motocross: RU:Tag:sport=motocross
     sport=motor: RU:Tag:sport=motor
     sport=motocross: RU:Tag:sport=motocross
     sport=motor: RU:Tag:sport=motor
+    sport=pedal_car_racing: RU:Tag:sport=pedal car racing
+    sport=sailing: RU:Tag:sport=sailing
     sport=scuba_diving: RU:Tag:sport=scuba diving
     sport=shooting: RU:Tag:sport=shooting
     sport=scuba_diving: RU:Tag:sport=scuba diving
     sport=shooting: RU:Tag:sport=shooting
+    sport=swimming: RU:Tag:sport=swimming
+    sport=ultralight_aviation: RU:Tag:sport=ultralight aviation
+    statue=animal: RU:Tag:statue=animal
+    statue=equestrian: RU:Tag:statue=equestrian
+    statue=virgin: RU:Tag:statue=virgin
+    studio=audio: RU:Tag:studio=audio
+    studio=radio: RU:Tag:studio=radio
+    studio=television: RU:Tag:studio=television
+    studio=video: RU:Tag:studio=video
+    substance=CNG: RU:Tag:substance=CNG
+    substance=gas: RU:Tag:substance=gas
+    substance=oil: RU:Tag:substance=oil
+    substance=water: RU:Tag:substance=water
     summit:cross=yes: RU:Tag:summit:cross=yes
     summit:cross=yes: RU:Tag:summit:cross=yes
+    surface=carpet: RU:Tag:surface=carpet
+    surface=chipseal: RU:Tag:surface=chipseal
+    surface=compacted: RU:Tag:surface=compacted
+    surface=concrete: RU:Tag:surface=concrete
+    surface=unpaved: RU:Tag:surface=unpaved
+    survey_point:purpose=both: RU:Tag:survey point:purpose=both
+    survey_point:purpose=horizontal: RU:Tag:survey point:purpose=horizontal
+    survey_point:purpose=vertical: RU:Tag:survey point:purpose=vertical
+    survey_point:structure=beacon: RU:Tag:survey point:structure=beacon
+    survey_point:structure=block: RU:Tag:survey point:structure=block
+    survey_point:structure=bracket: RU:Tag:survey point:structure=bracket
+    survey_point:structure=cut: RU:Tag:survey point:structure=cut
+    survey_point:structure=indented_pin: RU:Tag:survey point:structure=indented pin
+    survey_point:structure=medallion: RU:Tag:survey point:structure=medallion
+    survey_point:structure=pillar: RU:Tag:survey point:structure=pillar
+    survey_point:structure=pin: RU:Tag:survey point:structure=pin
+    survey_point:structure=plaque: RU:Tag:survey point:structure=plaque
+    survey_point:structure=pole: RU:Tag:survey point:structure=pole
+    swimming_pool=yes: RU:Tag:swimming pool=yes
     tank_trap=czech_hedgehog: RU:Tag:tank trap=czech hedgehog
     tank_trap=czech_hedgehog: RU:Tag:tank trap=czech hedgehog
+    taxi_type=motorcycle: RU:Tag:taxi type=motorcycle
+    taxi_vehicle=motorcycle: RU:Tag:taxi vehicle=motorcycle
+    theatre:genre=philharmonic: RU:Tag:theatre:genre=philharmonic
+    theatre:type=amphi: RU:Tag:theatre:type=amphi
+    theatre:type=concert_hall: RU:Tag:theatre:type=concert hall
+    theatre:type=open_air: RU:Tag:theatre:type=open air
+    theatre:type=opera_house: RU:Tag:theatre:type=opera house
+    toll:designated=yes: RU:Tag:toll:designated=yes
+    tomb=cenotaph: RU:Tag:tomb=cenotaph
+    tomb=columbarium: RU:Tag:tomb=columbarium
+    tomb=crypt: RU:Tag:tomb=crypt
+    tomb=hypogeum: RU:Tag:tomb=hypogeum
+    tomb=mausoleum: RU:Tag:tomb=mausoleum
+    tomb=pyramid: RU:Tag:tomb=pyramid
+    tomb=rock-cut: RU:Tag:tomb=rock-cut
+    tomb=sarcophagus: RU:Tag:tomb=sarcophagus
+    tomb=table: RU:Tag:tomb=table
+    tomb=tumulus: RU:Tag:tomb=tumulus
+    tomb=vault: RU:Tag:tomb=vault
     tomb=war_grave: RU:Tag:tomb=war grave
     tomb=war_grave: RU:Tag:tomb=war grave
+    tourism=accommodation: RU:Tag:tourism=accommodation
+    tourism=alpine_hut: RU:Tag:tourism=alpine hut
     tourism=apartment: RU:Tag:tourism=apartment
     tourism=aquarium: RU:Tag:tourism=aquarium
     tourism=artwork: RU:Tag:tourism=artwork
     tourism=attraction: RU:Tag:tourism=attraction
     tourism=apartment: RU:Tag:tourism=apartment
     tourism=aquarium: RU:Tag:tourism=aquarium
     tourism=artwork: RU:Tag:tourism=artwork
     tourism=attraction: RU:Tag:tourism=attraction
+    tourism=bed_and_breakfast: RU:Tag:tourism=bed and breakfast
+    tourism=camp_pitch: RU:Tag:tourism=camp pitch
     tourism=camp_site: RU:Tag:tourism=camp site
     tourism=caravan_site: RU:Tag:tourism=caravan site
     tourism=chalet: RU:Tag:tourism=chalet
     tourism=camp_site: RU:Tag:tourism=camp site
     tourism=caravan_site: RU:Tag:tourism=caravan site
     tourism=chalet: RU:Tag:tourism=chalet
@@ -21228,17 +29362,151 @@ ru:
     tourism=motel: RU:Tag:tourism=motel
     tourism=museum: RU:Tag:tourism=museum
     tourism=picnic_site: RU:Tag:tourism=picnic site
     tourism=motel: RU:Tag:tourism=motel
     tourism=museum: RU:Tag:tourism=museum
     tourism=picnic_site: RU:Tag:tourism=picnic site
+    tourism=resort: RU:Tag:tourism=resort
+    tourism=spa_resort: RU:Tag:tourism=spa resort
     tourism=theme_park: RU:Tag:tourism=theme park
     tourism=theme_park: RU:Tag:tourism=theme park
+    tourism=trail_riding_rest: RU:Tag:tourism=trail riding rest
+    tourism=trail_riding_station: RU:Tag:tourism=trail riding station
     tourism=viewpoint: RU:Tag:tourism=viewpoint
     tourism=viewpoint: RU:Tag:tourism=viewpoint
+    tourism=wilderness_hut: RU:Tag:tourism=wilderness hut
+    tourism=wine_cellar: RU:Tag:tourism=wine cellar
+    tourism=yes: RU:Tag:tourism=yes
+    tourism=zoo: RU:Tag:tourism=zoo
     tower:type=bell_tower: RU:Tag:tower:type=bell tower
     tower:type=cooling: RU:Tag:tower:type=cooling
     tower:type=bell_tower: RU:Tag:tower:type=bell tower
     tower:type=cooling: RU:Tag:tower:type=cooling
+    tower:type=defensive: RU:Tag:tower:type=defensive
+    tower:type=launch_tower: RU:Tag:tower:type=launch tower
     tower:type=lighting: RU:Tag:tower:type=lighting
     tower:type=lighting: RU:Tag:tower:type=lighting
+    tower:type=lightning_protection: RU:Tag:tower:type=lightning protection
+    townhall:type=barangay: RU:Tag:townhall:type=barangay
+    townhall:type=town: RU:Tag:townhall:type=town
+    trade=agricultural_supplies: RU:Tag:trade=agricultural supplies
+    trade=building_supplies: RU:Tag:trade=building supplies
+    trade=timber: RU:Tag:trade=timber
+    trade=wood: RU:Tag:trade=wood
+    traffic_calming=hump: RU:Tag:traffic calming=hump
+    traffic_calming=rumble_strip: RU:Tag:traffic calming=rumble strip
     traffic_calming=table: RU:Tag:traffic calming=table
     traffic_calming=table: RU:Tag:traffic calming=table
+    traffic_sign=NL:L51: RU:Tag:traffic sign=NL:L51
+    traffic_sign=city_limit: RU:Tag:traffic sign=city limit
+    traffic_signals=continuous_green: RU:Tag:traffic signals=continuous green
+    trailer:type=motorcycle: RU:Tag:trailer:type=motorcycle
+    training=art: RU:Tag:training=art
+    training=aviation: RU:Tag:training=aviation
+    training=bicycle: RU:Tag:training=bicycle
+    training=computer: RU:Tag:training=computer
+    training=driving: RU:Tag:training=driving
+    training=language: RU:Tag:training=language
+    training=music: RU:Tag:training=music
+    training=sport: RU:Tag:training=sport
+    tunnel=building_passage: RU:Tag:tunnel=building passage
     tunnel=culvert: RU:Tag:tunnel=culvert
     tunnel=culvert: RU:Tag:tunnel=culvert
+    type=health: RU:Tag:type=health
     type=site: RU:Tag:type=site
     type=waterway: RU:Tag:type=waterway
     type=site: RU:Tag:type=site
     type=waterway: RU:Tag:type=waterway
+    usage=facility: RU:Tag:usage=facility
+    usage=flare_header: RU:Tag:usage=flare header
+    usage=flowline: RU:Tag:usage=flowline
+    usage=gathering: RU:Tag:usage=gathering
+    usage=injection: RU:Tag:usage=injection
+    usage=irrigation: RU:Tag:usage=irrigation
+    usage=penstock: RU:Tag:usage=penstock
+    usage=spillway: RU:Tag:usage=spillway
+    vehicle=no: RU:Tag:vehicle=no
+    vehicle=private: RU:Tag:vehicle=private
+    vending=SIM_cards: RU:Tag:vending=SIM cards
+    vending=admission_tickets: RU:Tag:vending=admission tickets
+    vending=animal_feed: RU:Tag:vending=animal feed
+    vending=art: RU:Tag:vending=art
+    vending=bicycle_tube: RU:Tag:vending=bicycle tube
+    vending=books: RU:Tag:vending=books
+    vending=bottle_return: RU:Tag:vending=bottle return
+    vending=bread: RU:Tag:vending=bread
+    vending=candles: RU:Tag:vending=candles
+    vending=chemist: RU:Tag:vending=chemist
+    vending=chewing_gums: RU:Tag:vending=chewing gums
+    vending=cigarettes: RU:Tag:vending=cigarettes
+    vending=coffee: RU:Tag:vending=coffee
+    vending=coin_change_machine: RU:Tag:vending=coin change machine
+    vending=coin_rolls: RU:Tag:vending=coin rolls
+    vending=condoms: RU:Tag:vending=condoms
+    vending=contact_lenses: RU:Tag:vending=contact lenses
+    vending=drinks: RU:Tag:vending=drinks
+    vending=e-cigarettes: RU:Tag:vending=e-cigarettes
+    vending=eggs: RU:Tag:vending=eggs
+    vending=electronics: RU:Tag:vending=electronics
+    vending=elongated_coin: RU:Tag:vending=elongated coin
+    vending=excrement_bags: RU:Tag:vending=excrement bags
+    vending=feminine_hygiene: RU:Tag:vending=feminine hygiene
+    vending=first_aid: RU:Tag:vending=first aid
+    vending=fishing_bait: RU:Tag:vending=fishing bait
+    vending=fishing_tackle: RU:Tag:vending=fishing tackle
+    vending=flower_seeds: RU:Tag:vending=flower seeds
+    vending=flowers: RU:Tag:vending=flowers
+    vending=food: RU:Tag:vending=food
+    vending=fuel: RU:Tag:vending=fuel
+    vending=gas_bottles: RU:Tag:vending=gas bottles
+    vending=ice_cream: RU:Tag:vending=ice cream
+    vending=ice_cubes: RU:Tag:vending=ice cubes
+    vending=ink_cartridges: RU:Tag:vending=ink cartridges
+    vending=laundry_detergent: RU:Tag:vending=laundry detergent
+    vending=lottery: RU:Tag:vending=lottery
+    vending=milk: RU:Tag:vending=milk
+    vending=newspapers: RU:Tag:vending=newspapers
+    vending=parcel_mail_in: RU:Tag:vending=parcel mail in
     vending=parcel_pickup: RU:Tag:vending=parcel pickup
     vending=parcel_pickup: RU:Tag:vending=parcel pickup
+    vending=parcel_pickup;parcel_mail_in: RU:Tag:vending=parcel pickup;parcel mail
+      in
+    vending=parking_tickets: RU:Tag:vending=parking tickets
+    vending=pet_food: RU:Tag:vending=pet food
+    vending=photos: RU:Tag:vending=photos
+    vending=pizza: RU:Tag:vending=pizza
+    vending=public_transport_plans: RU:Tag:vending=public transport plans
+    vending=public_transport_tickets: RU:Tag:vending=public transport tickets
+    vending=raw_milk: RU:Tag:vending=raw milk
+    vending=sex_toys: RU:Tag:vending=sex toys
+    vending=stamps: RU:Tag:vending=stamps
+    vending=sweets: RU:Tag:vending=sweets
+    vending=syringes: RU:Tag:vending=syringes
+    vending=telephone_vouchers: RU:Tag:vending=telephone vouchers
+    vending=toll: RU:Tag:vending=toll
+    vending=toys: RU:Tag:vending=toys
+    vending=umbrellas: RU:Tag:vending=umbrellas
+    vending=water: RU:Tag:vending=water
+    vending_machine=fuel: RU:Tag:vending machine=fuel
+    wall=noise_barrier: RU:Tag:wall=noise barrier
+    waste=cigarettes: RU:Tag:waste=cigarettes
+    waste=dog_excrement: RU:Tag:waste=dog excrement
+    waste=drugs: RU:Tag:waste=drugs
+    waste=oil: RU:Tag:waste=oil
+    waste=organic: RU:Tag:waste=organic
+    waste=pizza_box: RU:Tag:waste=pizza box
+    waste=rubble: RU:Tag:waste=rubble
+    waste=sharps: RU:Tag:waste=sharps
+    waste=trash: RU:Tag:waste=trash
+    water=basin: RU:Tag:water=basin
+    water=canal: RU:Tag:water=canal
+    water=ditch: RU:Tag:water=ditch
+    water=drain: RU:Tag:water=drain
+    water=fish_pass: RU:Tag:water=fish pass
+    water=intermittent: RU:Tag:water=intermittent
+    water=lagoon: RU:Tag:water=lagoon
+    water=lake: RU:Tag:water=lake
+    water=lock: RU:Tag:water=lock
+    water=moat: RU:Tag:water=moat
+    water=oxbow: RU:Tag:water=oxbow
+    water=pond: RU:Tag:water=pond
+    water=rapids: RU:Tag:water=rapids
+    water=reflecting_pool: RU:Tag:water=reflecting pool
+    water=reservoir: RU:Tag:water=reservoir
     water=river: RU:Tag:water=river
     water=river: RU:Tag:water=river
+    water=stream: RU:Tag:water=stream
+    water=stream_pool: RU:Tag:water=stream pool
+    water=tidal: RU:Tag:water=tidal
+    water=wastewater: RU:Tag:water=wastewater
+    water_source=groundwater: RU:Tag:water source=groundwater
+    water_source=main: RU:Tag:water source=main
+    water_source=river: RU:Tag:water source=river
     waterway=boatyard: RU:Tag:waterway=boatyard
     waterway=brook: RU:Tag:waterway=brook
     waterway=canal: RU:Tag:waterway=canal
     waterway=boatyard: RU:Tag:waterway=boatyard
     waterway=brook: RU:Tag:waterway=brook
     waterway=canal: RU:Tag:waterway=canal
@@ -21247,28 +29515,59 @@ ru:
     waterway=dock: RU:Tag:waterway=dock
     waterway=drain: RU:Tag:waterway=drain
     waterway=drystream: RU:Tag:waterway=drystream
     waterway=dock: RU:Tag:waterway=dock
     waterway=drain: RU:Tag:waterway=drain
     waterway=drystream: RU:Tag:waterway=drystream
+    waterway=fairway: RU:Tag:waterway=fairway
+    waterway=fish_pass: RU:Tag:waterway=fish pass
     waterway=lock_gate: RU:Tag:waterway=lock gate
     waterway=lock_gate: RU:Tag:waterway=lock gate
+    waterway=offshore_field: RU:Tag:waterway=offshore field
     waterway=rapids: RU:Tag:waterway=rapids
     waterway=river: RU:Tag:waterway=river
     waterway=riverbank: RU:Tag:waterway=riverbank
     waterway=rapids: RU:Tag:waterway=rapids
     waterway=river: RU:Tag:waterway=river
     waterway=riverbank: RU:Tag:waterway=riverbank
+    waterway=spillway: RU:Tag:waterway=spillway
     waterway=stream: RU:Tag:waterway=stream
     waterway=turning_point: RU:Tag:waterway=turning point
     waterway=stream: RU:Tag:waterway=stream
     waterway=turning_point: RU:Tag:waterway=turning point
+    waterway=water_point: RU:Tag:waterway=water point
+    waterway=waterfall: RU:Tag:waterway=waterfall
     waterway=weir: RU:Tag:waterway=weir
     wood=coniferous: RU:Tag:wood=coniferous
     wood=mixed: RU:Tag:wood=mixed
     waterway=weir: RU:Tag:waterway=weir
     wood=coniferous: RU:Tag:wood=coniferous
     wood=mixed: RU:Tag:wood=mixed
+    zoo=aviary: RU:Tag:zoo=aviary
+    zoo=birds: RU:Tag:zoo=birds
+    zoo=butterfly: RU:Tag:zoo=butterfly
+    zoo=enclosure: RU:Tag:zoo=enclosure
+    zoo=falconry: RU:Tag:zoo=falconry
     zoo=petting_zoo: RU:Tag:zoo=petting zoo
     zoo=petting_zoo: RU:Tag:zoo=petting zoo
+    zoo=reptile: RU:Tag:zoo=reptile
+    zoo=safari_park: RU:Tag:zoo=safari park
+    zoo=wildlife_park: RU:Tag:zoo=wildlife park
 sh:
   key:
 sh:
   key:
+    addr: Sh:Key:addr
     tracktype: Sh:Key:tracktype
 sk:
   key:
     addr:conscriptionnumber: Sk:Key:addr:conscriptionnumber
     addr:streetnumber: Sk:Key:addr:streetnumber
     note: Sk:Key:note
     tracktype: Sh:Key:tracktype
 sk:
   key:
     addr:conscriptionnumber: Sk:Key:addr:conscriptionnumber
     addr:streetnumber: Sk:Key:addr:streetnumber
     note: Sk:Key:note
+    ref:ico: Sk:Key:ref:ico
     ref:minvskaddress: Sk:Key:ref:minvskaddress
     ref:minvskaddress: Sk:Key:ref:minvskaddress
+  tag:
+    refitted=yes: Sk:Tag:refitted=yes
+skr:
+  key:
+    name:skr: Skr:Key:name:skr
 sq:
   key:
     highway: Sq:Key:highway
 sq:
   key:
     highway: Sq:Key:highway
+sr:
+  key:
+    ref:RS:grad: Sr:Key:ref:RS:grad
+    ref:RS:kucni_broj: Sr:Key:ref:RS:kucni broj
+    ref:RS:naselje: Sr:Key:ref:RS:naselje
+    ref:RS:okrug: Sr:Key:ref:RS:okrug
+    ref:RS:opstina: Sr:Key:ref:RS:opstina
+    ref:RS:pokrajina: Sr:Key:ref:RS:pokrajina
+    ref:RS:ulica: Sr:Key:ref:RS:ulica
+    ref:sr:maticni_broj: Sr:Key:ref:sr:maticni broj
 sv:
   key:
     access: Sv:Key:access
 sv:
   key:
     access: Sv:Key:access
@@ -21279,6 +29578,7 @@ sv:
     amenity=place_of_worship: Sv:Tag:amenity=place of worship
     amenity=recycling: Sv:Tag:amenity=recycling
     amenity=townhall: Sv:Tag:amenity=townhall
     amenity=place_of_worship: Sv:Tag:amenity=place of worship
     amenity=recycling: Sv:Tag:amenity=recycling
     amenity=townhall: Sv:Tag:amenity=townhall
+    barrier=hampshire_gate: Sv:Tag:barrier=hampshire gate
     highway=path: Sv:Tag:highway=path
     highway=rest_area: Sv:Tag:highway=rest area
     highway=track: Sv:Tag:highway=track
     highway=path: Sv:Tag:highway=path
     highway=rest_area: Sv:Tag:highway=rest area
     highway=track: Sv:Tag:highway=track
@@ -21290,6 +29590,16 @@ sv:
 talk:
   key:
     real_fire: Talk:Key:real fire
 talk:
   key:
     real_fire: Talk:Key:real fire
+    trail_visibility: Talk:Key:trail visibility
+tl:
+  key:
+    fixme: Tl:Key:fixme
+  tag:
+    amenity=clothes_dryer: Tl:Tag:amenity=clothes dryer
+    fast_food=cafeteria: Tl:Tag:fast food=cafeteria
+    man_made=bridge: Tl:Tag:man made=bridge
+    natural=bay: Tl:Tag:natural=bay
+    place=city: Tl:Tag:place=city
 tr:
   key:
     amenity: Tr:Key:amenity
 tr:
   key:
     amenity: Tr:Key:amenity
@@ -21297,6 +29607,7 @@ tr:
     highway: Tr:Key:highway
     historic: Tr:Key:historic
     leisure: Tr:Key:leisure
     highway: Tr:Key:highway
     historic: Tr:Key:historic
     leisure: Tr:Key:leisure
+    natural: Tr:Key:natural
     shop: Tr:Key:shop
     sport: Tr:Key:sport
   tag:
     shop: Tr:Key:shop
     sport: Tr:Key:sport
   tag:
@@ -21309,9 +29620,13 @@ tr:
     highway=trunk: Tr:Tag:highway=trunk
 uk:
   key:
     highway=trunk: Tr:Tag:highway=trunk
 uk:
   key:
+    abandoned:building: Uk:Key:abandoned:building
     abutters: Uk:Key:abutters
     access: Uk:Key:access
     addr: Uk:Key:addr
     abutters: Uk:Key:abutters
     access: Uk:Key:access
     addr: Uk:Key:addr
+    addr:*: Uk:Key:addr:*
+    addr:block: Uk:Key:addr:block
+    addr:block_number: Uk:Key:addr:block number
     addr:city: Uk:Key:addr:city
     addr:country: Uk:Key:addr:country
     addr:district: Uk:Key:addr:district
     addr:city: Uk:Key:addr:city
     addr:country: Uk:Key:addr:country
     addr:district: Uk:Key:addr:district
@@ -21325,12 +29640,19 @@ uk:
     addr:inclusion: Uk:Key:addr:inclusion
     addr:interpolation: Uk:Key:addr:interpolation
     addr:place: Uk:Key:addr:place
     addr:inclusion: Uk:Key:addr:inclusion
     addr:interpolation: Uk:Key:addr:interpolation
     addr:place: Uk:Key:addr:place
+    addr:postbox: Uk:Key:addr:postbox
     addr:postcode: Uk:Key:addr:postcode
     addr:province: Uk:Key:addr:province
     addr:postcode: Uk:Key:addr:postcode
     addr:province: Uk:Key:addr:province
+    addr:room: Uk:Key:addr:room
     addr:state: Uk:Key:addr:state
     addr:street: Uk:Key:addr:street
     addr:state: Uk:Key:addr:state
     addr:street: Uk:Key:addr:street
+    addr:subdistrict: Uk:Key:addr:subdistrict
+    addr:suburb: Uk:Key:addr:suburb
     addr:unit: Uk:Key:addr:unit
     admin_level: Uk:Key:admin level
     addr:unit: Uk:Key:addr:unit
     admin_level: Uk:Key:admin level
+    aerialway: Uk:Key:aerialway
+    aerodrome:type: Uk:Key:aerodrome:type
+    aeroway: Uk:Key:aeroway
     alt_name: Uk:Key:alt name
     amenity: Uk:Key:amenity
     arcade: Uk:Key:arcade
     alt_name: Uk:Key:alt name
     amenity: Uk:Key:amenity
     arcade: Uk:Key:arcade
@@ -21343,12 +29665,16 @@ uk:
     bench: Uk:Key:bench
     bicycle: Uk:Key:bicycle
     bicycle_parking: Uk:Key:bicycle parking
     bench: Uk:Key:bench
     bicycle: Uk:Key:bicycle
     bicycle_parking: Uk:Key:bicycle parking
+    bike_ride: Uk:Key:bike ride
     border_type: Uk:Key:border type
     boundary: Uk:Key:boundary
     border_type: Uk:Key:border type
     boundary: Uk:Key:boundary
+    brand: Uk:Key:brand
     bridge: Uk:Key:bridge
     building: Uk:Key:building
     building:levels: Uk:Key:building:levels
     bridge: Uk:Key:bridge
     building: Uk:Key:building
     building:levels: Uk:Key:building:levels
+    building:part: Uk:Key:building:part
     capital: Uk:Key:capital
     capital: Uk:Key:capital
+    cemetery: Uk:Key:cemetery
     colonnade: Uk:Key:colonnade
     comment: Uk:Key:comment
     covered: Uk:Key:covered
     colonnade: Uk:Key:colonnade
     comment: Uk:Key:comment
     covered: Uk:Key:covered
@@ -21356,10 +29682,17 @@ uk:
     crane:type: Uk:Key:crane:type
     crossing: Uk:Key:crossing
     cutting: Uk:Key:cutting
     crane:type: Uk:Key:crane:type
     crossing: Uk:Key:crossing
     cutting: Uk:Key:cutting
+    'damage:': 'Uk:Key:damage:'
+    damage:*: Uk:Key:damage:*
     date: Uk:Key:date
     date: Uk:Key:date
+    denotation: Uk:Key:denotation
     description: Uk:Key:description
     destination: Uk:Key:destination
     description: Uk:Key:description
     destination: Uk:Key:destination
+    'destroyed:': 'Uk:Key:destroyed:'
+    destroyed:*: Uk:Key:destroyed:*
+    email: Uk:Key:email
     embankment: Uk:Key:embankment
     embankment: Uk:Key:embankment
+    embedded_rails: Uk:Key:embedded rails
     emergency: Uk:Key:emergency
     entrance: Uk:Key:entrance
     est_width: Uk:Key:est width
     emergency: Uk:Key:emergency
     entrance: Uk:Key:entrance
     est_width: Uk:Key:est width
@@ -21367,10 +29700,17 @@ uk:
     footway: Uk:Key:footway
     ford: Uk:Key:ford
     forward: Uk:Key:forward
     footway: Uk:Key:footway
     ford: Uk:Key:ford
     forward: Uk:Key:forward
+    gauge: Uk:Key:gauge
     government: Uk:Key:government
     government: Uk:Key:government
+    hazard: Uk:Key:hazard
     height: Uk:Key:height
     height: Uk:Key:height
+    heritage: Uk:Key:heritage
     highway: Uk:Key:highway
     historic: Uk:Key:historic
     highway: Uk:Key:highway
     historic: Uk:Key:historic
+    iata: Uk:Key:iata
+    icao: Uk:Key:icao
+    indoor: Uk:Key:indoor
+    informal: Uk:Key:informal
     inscription: Uk:Key:inscription
     inscription:url: Uk:Key:inscription:url
     int_name: Uk:Key:int name
     inscription: Uk:Key:inscription
     inscription:url: Uk:Key:inscription:url
     int_name: Uk:Key:int name
@@ -21392,14 +29732,16 @@ uk:
     name:de: Uk:Key:name:de
     name:el: Uk:Key:name:el
     name:en: Uk:Key:name:en
     name:de: Uk:Key:name:de
     name:el: Uk:Key:name:el
     name:en: Uk:Key:name:en
+    name:etymology: Uk:Key:name:etymology
     name:fr: Uk:Key:name:fr
     name:ja: Uk:Key:name:ja
     name:lg: Uk:Key:name:lg
     name:fr: Uk:Key:name:fr
     name:ja: Uk:Key:name:ja
     name:lg: Uk:Key:name:lg
+    name:pronunciation: Uk:Key:name:pronunciation
     name:ru: Uk:Key:name:ru
     name:uk: Uk:Key:name:uk
     nat_name: Uk:Key:nat name
     natural: Uk:Key:natural
     name:ru: Uk:Key:name:ru
     name:uk: Uk:Key:name:uk
     nat_name: Uk:Key:nat name
     natural: Uk:Key:natural
-    noname: Uk:Key:noname
+    nohousenumber: Uk:Key:nohousenumber
     note: Uk:Key:note
     office: Uk:Key:office
     official_name: Uk:Key:official name
     note: Uk:Key:note
     office: Uk:Key:office
     official_name: Uk:Key:official name
@@ -21410,8 +29752,11 @@ uk:
     oneway:moped: Uk:Key:oneway:moped
     opening_hours: Uk:Key:opening hours
     opening_hours/Tutorial: Uk:Key:opening hours/Tutorial
     oneway:moped: Uk:Key:oneway:moped
     opening_hours: Uk:Key:opening hours
     opening_hours/Tutorial: Uk:Key:opening hours/Tutorial
+    operator: Uk:Key:operator
     park_ride: Uk:Key:park ride
     park_ride: Uk:Key:park ride
+    phone: Uk:Key:phone
     place: Uk:Key:place
     place: Uk:Key:place
+    placement: Uk:Key:placement
     playground: Uk:Key:playground
     police: Uk:Key:police
     population: Uk:Key:population
     playground: Uk:Key:playground
     police: Uk:Key:police
     population: Uk:Key:population
@@ -21434,6 +29779,8 @@ uk:
     short_name: Uk:Key:short name
     short_name:ru: Uk:Key:short name:ru
     sidewalk: Uk:Key:sidewalk
     short_name: Uk:Key:short name
     short_name:ru: Uk:Key:short name:ru
     sidewalk: Uk:Key:sidewalk
+    smoothness: Uk:Key:smoothness
+    social_facility:for: Uk:Key:social facility:for
     sorting_name: Uk:Key:sorting name
     source: Uk:Key:source
     source:addr: Uk:Key:source:addr
     sorting_name: Uk:Key:sorting name
     source: Uk:Key:source
     source:addr: Uk:Key:source:addr
@@ -21442,7 +29789,9 @@ uk:
     surface: Uk:Key:surface
     tracktype: Uk:Key:tracktype
     traffic_sign: Uk:Key:traffic sign
     surface: Uk:Key:surface
     tracktype: Uk:Key:tracktype
     traffic_sign: Uk:Key:traffic sign
+    traffic_signals: Uk:Key:traffic signals
     tunnel: Uk:Key:tunnel
     tunnel: Uk:Key:tunnel
+    turn: Uk:Key:turn
     type: Uk:Key:type
     url: Uk:Key:url
     vehicle: Uk:Key:vehicle
     type: Uk:Key:type
     url: Uk:Key:url
     vehicle: Uk:Key:vehicle
@@ -21457,49 +29806,374 @@ uk:
     admin_level=2: Uk:Tag:admin level=2
     admin_level=4: Uk:Tag:admin level=4
     admin_level=6: Uk:Tag:admin level=6
     admin_level=2: Uk:Tag:admin level=2
     admin_level=4: Uk:Tag:admin level=4
     admin_level=6: Uk:Tag:admin level=6
+    aerialway=cable_car: Uk:Tag:aerialway=cable car
+    aerialway=chair_lift: Uk:Tag:aerialway=chair lift
+    aerialway=gondola: Uk:Tag:aerialway=gondola
+    aeroway=aerodrome: Uk:Tag:aeroway=aerodrome
+    aeroway=fuel: Uk:Tag:aeroway=fuel
+    aeroway=gate: Uk:Tag:aeroway=gate
+    aeroway=helipad: Uk:Tag:aeroway=helipad
+    aeroway=heliport: Uk:Tag:aeroway=heliport
+    aeroway=runway: Uk:Tag:aeroway=runway
+    aeroway=terminal: Uk:Tag:aeroway=terminal
+    allotments=plot: Uk:Tag:allotments=plot
+    amenity=animal_boarding: Uk:Tag:amenity=animal boarding
+    amenity=animal_breeding: Uk:Tag:amenity=animal breeding
+    amenity=animal_shelter: Uk:Tag:amenity=animal shelter
+    amenity=animal_training: Uk:Tag:amenity=animal training
+    amenity=archive: Uk:Tag:amenity=archive
+    amenity=arts_centre: Uk:Tag:amenity=arts centre
     amenity=atm: Uk:Tag:amenity=atm
     amenity=atm: Uk:Tag:amenity=atm
+    amenity=baby_hatch: Uk:Tag:amenity=baby hatch
+    amenity=baking_oven: Uk:Tag:amenity=baking oven
+    amenity=bank: Uk:Tag:amenity=bank
+    amenity=bar: Uk:Tag:amenity=bar
+    amenity=bbq: Uk:Tag:amenity=bbq
+    amenity=bear_box: Uk:Tag:amenity=bear box
     amenity=bench: Uk:Tag:amenity=bench
     amenity=bench: Uk:Tag:amenity=bench
+    amenity=bicycle_library: Uk:Tag:amenity=bicycle library
     amenity=bicycle_parking: Uk:Tag:amenity=bicycle parking
     amenity=bicycle_rental: Uk:Tag:amenity=bicycle rental
     amenity=bicycle_parking: Uk:Tag:amenity=bicycle parking
     amenity=bicycle_rental: Uk:Tag:amenity=bicycle rental
+    amenity=bicycle_repair_station: Uk:Tag:amenity=bicycle repair station
+    amenity=bicycle_trailer_sharing: Uk:Tag:amenity=bicycle trailer sharing
+    amenity=biergarten: Uk:Tag:amenity=biergarten
+    amenity=bird_bath: Uk:Tag:amenity=bird bath
+    amenity=blood_bank: Uk:Tag:amenity=blood bank
+    amenity=boat_rental: Uk:Tag:amenity=boat rental
+    amenity=boat_sharing: Uk:Tag:amenity=boat sharing
+    amenity=boat_storage: Uk:Tag:amenity=boat storage
+    amenity=brothel: Uk:Tag:amenity=brothel
+    amenity=bureau_de_change: Uk:Tag:amenity=bureau de change
+    amenity=bus_station: Uk:Tag:amenity=bus station
+    amenity=cafe: Uk:Tag:amenity=cafe
+    amenity=canteen: Uk:Tag:amenity=canteen
+    amenity=car_pooling: Uk:Tag:amenity=car pooling
+    amenity=car_rental: Uk:Tag:amenity=car rental
+    amenity=car_sharing: Uk:Tag:amenity=car sharing
+    amenity=car_wash: Uk:Tag:amenity=car wash
+    amenity=carpet_washing: Uk:Tag:amenity=carpet washing
+    amenity=casino: Uk:Tag:amenity=casino
+    amenity=chair: Uk:Tag:amenity=chair
+    amenity=charging_station: Uk:Tag:amenity=charging station
+    amenity=childcare: Uk:Tag:amenity=childcare
+    amenity=cinema: Uk:Tag:amenity=cinema
     amenity=clinic: Uk:Tag:amenity=clinic
     amenity=clinic: Uk:Tag:amenity=clinic
+    amenity=cloakroom: Uk:Tag:amenity=cloakroom
+    amenity=clock: Uk:Tag:amenity=clock
+    amenity=clothes_dryer: Uk:Tag:amenity=clothes dryer
+    amenity=clubhouse: Uk:Tag:amenity=clubhouse
+    amenity=coast_guard: Uk:Tag:amenity=coast guard
+    amenity=coast_radar_station: Uk:Tag:amenity=coast radar station
+    amenity=college: Uk:Tag:amenity=college
+    amenity=community_centre: Uk:Tag:amenity=community centre
+    amenity=compressed_air: Uk:Tag:amenity=compressed air
+    amenity=concert_hall: Uk:Tag:amenity=concert hall
+    amenity=conference_centre: Uk:Tag:amenity=conference centre
+    amenity=courthouse: Uk:Tag:amenity=courthouse
+    amenity=coworking_space: Uk:Tag:amenity=coworking space
+    amenity=crematorium: Uk:Tag:amenity=crematorium
+    amenity=crypt: Uk:Tag:amenity=crypt
+    amenity=dancing_school: Uk:Tag:amenity=dancing school
+    amenity=dentist: Uk:Tag:amenity=dentist
+    amenity=device_charging_station: Uk:Tag:amenity=device charging station
+    amenity=dive_centre: Uk:Tag:amenity=dive centre
+    amenity=doctors: Uk:Tag:amenity=doctors
+    amenity=dog_parking: Uk:Tag:amenity=dog parking
+    amenity=dog_toilet: Uk:Tag:amenity=dog toilet
+    amenity=dojo: Uk:Tag:amenity=dojo
+    amenity=dormitory: Uk:Tag:amenity=dormitory
+    amenity=dressing_room: Uk:Tag:amenity=dressing room
     amenity=drinking_water: Uk:Tag:amenity=drinking water
     amenity=drinking_water: Uk:Tag:amenity=drinking water
+    amenity=driver_training: Uk:Tag:amenity=driver training
+    amenity=driving_school: Uk:Tag:amenity=driving school
+    amenity=dryer: Uk:Tag:amenity=dryer
+    amenity=emergency_service: Uk:Tag:amenity=emergency service
+    amenity=events_centre: Uk:Tag:amenity=events centre
+    amenity=events_venue: Uk:Tag:amenity=events venue
+    amenity=exhibition_centre: Uk:Tag:amenity=exhibition centre
+    amenity=fast_food: Uk:Tag:amenity=fast food
+    amenity=feeding_place: Uk:Tag:amenity=feeding place
+    amenity=ferry_terminal: Uk:Tag:amenity=ferry terminal
+    amenity=fire_station: Uk:Tag:amenity=fire station
+    amenity=first_aid_school: Uk:Tag:amenity=first aid school
+    amenity=fish_spa: Uk:Tag:amenity=fish spa
+    amenity=food_court: Uk:Tag:amenity=food court
+    amenity=food_sharing: Uk:Tag:amenity=food sharing
+    amenity=fountain: Uk:Tag:amenity=fountain
+    amenity=freeshop: Uk:Tag:amenity=freeshop
+    amenity=fridge: Uk:Tag:amenity=fridge
     amenity=fuel: Uk:Tag:amenity=fuel
     amenity=fuel: Uk:Tag:amenity=fuel
+    amenity=funeral_hall: Uk:Tag:amenity=funeral hall
+    amenity=gambling: Uk:Tag:amenity=gambling
+    amenity=game_feeding: Uk:Tag:amenity=game feeding
+    amenity=give_box: Uk:Tag:amenity=give box
     amenity=grave_yard: Uk:Tag:amenity=grave yard
     amenity=grave_yard: Uk:Tag:amenity=grave yard
+    amenity=grit_bin: Uk:Tag:amenity=grit bin
+    amenity=health_post: Uk:Tag:amenity=health post
+    amenity=hitching_post: Uk:Tag:amenity=hitching post
+    amenity=hookah_lounge: Uk:Tag:amenity=hookah lounge
     amenity=hospital: Uk:Tag:amenity=hospital
     amenity=hospital: Uk:Tag:amenity=hospital
+    amenity=hunting_stand: Uk:Tag:amenity=hunting stand
+    amenity=ice_cream: Uk:Tag:amenity=ice cream
+    amenity=internet_cafe: Uk:Tag:amenity=internet cafe
+    amenity=juice_bar: Uk:Tag:amenity=juice bar
+    amenity=karaoke_box: Uk:Tag:amenity=karaoke box
     amenity=kindergarten: Uk:Tag:amenity=kindergarten
     amenity=kiosk: Uk:Tag:amenity=kiosk
     amenity=kindergarten: Uk:Tag:amenity=kindergarten
     amenity=kiosk: Uk:Tag:amenity=kiosk
+    amenity=kitchen: Uk:Tag:amenity=kitchen
+    amenity=kneipp_water_cure: Uk:Tag:amenity=kneipp water cure
+    amenity=language_school: Uk:Tag:amenity=language school
+    amenity=lavoir: Uk:Tag:amenity=lavoir
+    amenity=letter_box: Uk:Tag:amenity=letter box
+    amenity=library: Uk:Tag:amenity=library
+    amenity=library_dropoff: Uk:Tag:amenity=library dropoff
+    amenity=loading_dock: Uk:Tag:amenity=loading dock
+    amenity=locker: Uk:Tag:amenity=locker
+    amenity=lounger: Uk:Tag:amenity=lounger
+    amenity=love_hotel: Uk:Tag:amenity=love hotel
+    amenity=luggage_locker: Uk:Tag:amenity=luggage locker
+    amenity=mailroom: Uk:Tag:amenity=mailroom
+    amenity=marae: Uk:Tag:amenity=marae
+    amenity=marketplace: Uk:Tag:amenity=marketplace
+    amenity=microwave: Uk:Tag:amenity=microwave
+    amenity=mist_spraying_cooler: Uk:Tag:amenity=mist spraying cooler
+    amenity=mobile_library: Uk:Tag:amenity=mobile library
+    amenity=mobile_money_agent: Uk:Tag:amenity=mobile money agent
+    amenity=monastery: Uk:Tag:amenity=monastery
+    amenity=money_transfer: Uk:Tag:amenity=money transfer
+    amenity=mortuary: Uk:Tag:amenity=mortuary
+    amenity=motorcycle_parking: Uk:Tag:amenity=motorcycle parking
+    amenity=motorcycle_rental: Uk:Tag:amenity=motorcycle rental
+    amenity=motorcycle_taxi: Uk:Tag:amenity=motorcycle taxi
+    amenity=music_school: Uk:Tag:amenity=music school
+    amenity=music_venue: Uk:Tag:amenity=music venue
+    amenity=nightclub: Uk:Tag:amenity=nightclub
+    amenity=nursing_home: Uk:Tag:amenity=nursing home
+    amenity=osmica: Uk:Tag:amenity=osmica
+    amenity=parcel_locker: Uk:Tag:amenity=parcel locker
     amenity=park: Uk:Tag:amenity=park
     amenity=parking: Uk:Tag:amenity=parking
     amenity=park: Uk:Tag:amenity=park
     amenity=parking: Uk:Tag:amenity=parking
+    amenity=parking_entrance: Uk:Tag:amenity=parking entrance
+    amenity=parking_space: Uk:Tag:amenity=parking space
+    amenity=payment_centre: Uk:Tag:amenity=payment centre
     amenity=payment_terminal: Uk:Tag:amenity=payment terminal
     amenity=pharmacy: Uk:Tag:amenity=pharmacy
     amenity=payment_terminal: Uk:Tag:amenity=payment terminal
     amenity=pharmacy: Uk:Tag:amenity=pharmacy
+    amenity=photo_booth: Uk:Tag:amenity=photo booth
+    amenity=piano: Uk:Tag:amenity=piano
+    amenity=place_of_mourning: Uk:Tag:amenity=place of mourning
     amenity=place_of_worship: Uk:Tag:amenity=place of worship
     amenity=place_of_worship: Uk:Tag:amenity=place of worship
+    amenity=planetarium: Uk:Tag:amenity=planetarium
+    amenity=police: Uk:Tag:amenity=police
+    amenity=polling_station: Uk:Tag:amenity=polling station
+    amenity=post_box: Uk:Tag:amenity=post box
+    amenity=post_depot: Uk:Tag:amenity=post depot
     amenity=post_office: Uk:Tag:amenity=post office
     amenity=post_office: Uk:Tag:amenity=post office
+    amenity=prep_school: Uk:Tag:amenity=prep school
+    amenity=printer: Uk:Tag:amenity=printer
+    amenity=prison: Uk:Tag:amenity=prison
+    amenity=prison_camp: Uk:Tag:amenity=prison camp
+    amenity=pub: Uk:Tag:amenity=pub
+    amenity=public_bath: Uk:Tag:amenity=public bath
+    amenity=public_bookcase: Uk:Tag:amenity=public bookcase
+    amenity=public_building: Uk:Tag:amenity=public building
+    amenity=ranger_station: Uk:Tag:amenity=ranger station
+    amenity=reception_desk: Uk:Tag:amenity=reception desk
+    amenity=recycling: Uk:Tag:amenity=recycling
+    amenity=refugee_site: Uk:Tag:amenity=refugee site
+    amenity=relay_box: Uk:Tag:amenity=relay box
+    amenity=rescue_station: Uk:Tag:amenity=rescue station
+    amenity=research_institute: Uk:Tag:amenity=research institute
+    amenity=restaurant: Uk:Tag:amenity=restaurant
+    amenity=retirement_home: Uk:Tag:amenity=retirement home
+    amenity=rv_storage: Uk:Tag:amenity=rv storage
+    amenity=sailing_school: Uk:Tag:amenity=sailing school
+    amenity=sanatorium: Uk:Tag:amenity=sanatorium
+    amenity=sanitary_dump_station: Uk:Tag:amenity=sanitary dump station
     amenity=school: Uk:Tag:amenity=school
     amenity=school: Uk:Tag:amenity=school
+    amenity=scooter_rental: Uk:Tag:amenity=scooter rental
+    amenity=seat: Uk:Tag:amenity=seat
+    amenity=security_booth: Uk:Tag:amenity=security booth
     amenity=shelter: Uk:Tag:amenity=shelter
     amenity=shelter: Uk:Tag:amenity=shelter
+    amenity=shower: Uk:Tag:amenity=shower
+    amenity=ski_rental: Uk:Tag:amenity=ski rental
+    amenity=ski_school: Uk:Tag:amenity=ski school
+    amenity=smoking_area: Uk:Tag:amenity=smoking area
+    amenity=snow_removal_station: Uk:Tag:amenity=snow removal station
+    amenity=social_centre: Uk:Tag:amenity=social centre
+    amenity=social_club: Uk:Tag:amenity=social club
+    amenity=social_facility: Uk:Tag:amenity=social facility
+    amenity=stripclub: Uk:Tag:amenity=stripclub
+    amenity=studio: Uk:Tag:amenity=studio
+    amenity=swingerclub: Uk:Tag:amenity=swingerclub
+    amenity=taxi: Uk:Tag:amenity=taxi
+    amenity=telephone: Uk:Tag:amenity=telephone
+    amenity=theatre: Uk:Tag:amenity=theatre
+    amenity=toilets: Uk:Tag:amenity=toilets
+    amenity=townhall: Uk:Tag:amenity=townhall
+    amenity=toy_library: Uk:Tag:amenity=toy library
+    amenity=traffic_park: Uk:Tag:amenity=traffic park
+    amenity=training: Uk:Tag:amenity=training
     amenity=university: Uk:Tag:amenity=university
     amenity=university: Uk:Tag:amenity=university
+    amenity=vehicle_inspection: Uk:Tag:amenity=vehicle inspection
+    amenity=vending_machine: Uk:Tag:amenity=vending machine
+    amenity=veterinary: Uk:Tag:amenity=veterinary
+    amenity=waste_basket: Uk:Tag:amenity=waste basket
+    amenity=waste_disposal: Uk:Tag:amenity=waste disposal
+    amenity=waste_transfer_station: Uk:Tag:amenity=waste transfer station
+    amenity=water_point: Uk:Tag:amenity=water point
+    amenity=watering_place: Uk:Tag:amenity=watering place
+    barrier=debris: Uk:Tag:barrier=debris
+    barrier=entrance: Uk:Tag:barrier=entrance
+    barrier=gate: Uk:Tag:barrier=gate
+    barrier=guard_rail: Uk:Tag:barrier=guard rail
+    barrier=handrail: Uk:Tag:barrier=handrail
+    barrier=jersey_barrier: Uk:Tag:barrier=jersey barrier
+    barrier=planter: Uk:Tag:barrier=planter
     barrier=retaining_wall: Uk:Tag:barrier=retaining wall
     barrier=retaining_wall: Uk:Tag:barrier=retaining wall
+    barrier=wicket_gate: Uk:Tag:barrier=wicket gate
     boundary=administrative: Uk:Tag:boundary=administrative
     boundary=administrative: Uk:Tag:boundary=administrative
+    boundary=disputed: Uk:Tag:boundary=disputed
+    boundary=forest_compartment: Uk:Tag:boundary=forest compartment
     boundary=historic: Uk:Tag:boundary=historic
     boundary=historic: Uk:Tag:boundary=historic
+    boundary=political: Uk:Tag:boundary=political
     boundary=postal_code: Uk:Tag:boundary=postal code
     boundary=postal_code: Uk:Tag:boundary=postal code
+    building=apartments: Uk:Tag:building=apartments
+    building=bakehouse: Uk:Tag:building=bakehouse
+    building=barn: Uk:Tag:building=barn
+    building=barracks: Uk:Tag:building=barracks
+    building=beach_hut: Uk:Tag:building=beach hut
+    building=bridge: Uk:Tag:building=bridge
+    building=bungalow: Uk:Tag:building=bungalow
+    building=bunker: Uk:Tag:building=bunker
+    building=cabin: Uk:Tag:building=cabin
+    building=carport: Uk:Tag:building=carport
+    building=castle: Uk:Tag:building=castle
+    building=cathedral: Uk:Tag:building=cathedral
+    building=chapel: Uk:Tag:building=chapel
     building=church: Uk:Tag:building=church
     building=church: Uk:Tag:building=church
+    building=civic: Uk:Tag:building=civic
+    building=college: Uk:Tag:building=college
     building=commercial: Uk:Tag:building=commercial
     building=commercial: Uk:Tag:building=commercial
+    building=conservatory: Uk:Tag:building=conservatory
+    building=construction: Uk:Tag:building=construction
+    building=container: Uk:Tag:building=container
+    building=cowshed: Uk:Tag:building=cowshed
+    building=detached: Uk:Tag:building=detached
+    building=digester: Uk:Tag:building=digester
+    building=dormitory: Uk:Tag:building=dormitory
+    building=farm: Uk:Tag:building=farm
+    building=farm_auxiliary: Uk:Tag:building=farm auxiliary
+    building=fire_station: Uk:Tag:building=fire station
+    building=garage: Uk:Tag:building=garage
+    building=garages: Uk:Tag:building=garages
+    building=gatehouse: Uk:Tag:building=gatehouse
+    building=ger: Uk:Tag:building=ger
+    building=government: Uk:Tag:building=government
+    building=grandstand: Uk:Tag:building=grandstand
+    building=greenhouse: Uk:Tag:building=greenhouse
+    building=hangar: Uk:Tag:building=hangar
     building=hospital: Uk:Tag:building=hospital
     building=hospital: Uk:Tag:building=hospital
+    building=hotel: Uk:Tag:building=hotel
+    building=house: Uk:Tag:building=house
+    building=houseboat: Uk:Tag:building=houseboat
+    building=hut: Uk:Tag:building=hut
+    building=industrial: Uk:Tag:building=industrial
+    building=kindergarten: Uk:Tag:building=kindergarten
+    building=kingdom_hall: Uk:Tag:building=kingdom hall
+    building=kiosk: Uk:Tag:building=kiosk
+    building=livestock: Uk:Tag:building=livestock
+    building=military: Uk:Tag:building=military
+    building=monastery: Uk:Tag:building=monastery
+    building=mosque: Uk:Tag:building=mosque
+    building=museum: Uk:Tag:building=museum
+    building=office: Uk:Tag:building=office
+    building=parking: Uk:Tag:building=parking
+    building=pavilion: Uk:Tag:building=pavilion
+    building=presbytery: Uk:Tag:building=presbytery
+    building=public: Uk:Tag:building=public
+    building=religious: Uk:Tag:building=religious
+    building=residential: Uk:Tag:building=residential
+    building=retail: Uk:Tag:building=retail
+    building=riding_hall: Uk:Tag:building=riding hall
+    building=roof: Uk:Tag:building=roof
+    building=roundhouse: Uk:Tag:building=roundhouse
+    building=ruins: Uk:Tag:building=ruins
+    building=school: Uk:Tag:building=school
+    building=semidetached_house: Uk:Tag:building=semidetached house
+    building=service: Uk:Tag:building=service
+    building=shed: Uk:Tag:building=shed
+    building=shrine: Uk:Tag:building=shrine
+    building=silo: Uk:Tag:building=silo
+    building=slurry_tank: Uk:Tag:building=slurry tank
+    building=sports_hall: Uk:Tag:building=sports hall
+    building=stable: Uk:Tag:building=stable
+    building=stadium: Uk:Tag:building=stadium
+    building=static_caravan: Uk:Tag:building=static caravan
+    building=stilt_house: Uk:Tag:building=stilt house
+    building=storage_tank: Uk:Tag:building=storage tank
+    building=sty: Uk:Tag:building=sty
+    building=supermarket: Uk:Tag:building=supermarket
+    building=synagogue: Uk:Tag:building=synagogue
+    building=temple: Uk:Tag:building=temple
+    building=tent: Uk:Tag:building=tent
+    building=terrace: Uk:Tag:building=terrace
+    building=toilets: Uk:Tag:building=toilets
+    building=tower: Uk:Tag:building=tower
+    building=train_station: Uk:Tag:building=train station
+    building=transformer_tower: Uk:Tag:building=transformer tower
+    building=transportation: Uk:Tag:building=transportation
+    building=tree_house: Uk:Tag:building=tree house
+    building=university: Uk:Tag:building=university
+    building=warehouse: Uk:Tag:building=warehouse
+    building=water_tower: Uk:Tag:building=water tower
+    building=yes: Uk:Tag:building=yes
+    cemetery=grave: Uk:Tag:cemetery=grave
+    cemetery=sector: Uk:Tag:cemetery=sector
     craft=agricultural_engines: Uk:Tag:craft=agricultural engines
     craft=agricultural_engines: Uk:Tag:craft=agricultural engines
+    craft=bakery: Uk:Tag:craft=bakery
+    craft=basket_maker: Uk:Tag:craft=basket maker
+    craft=blacksmith: Uk:Tag:craft=blacksmith
     craft=bookbinder: Uk:Tag:craft=bookbinder
     craft=bookbinder: Uk:Tag:craft=bookbinder
+    craft=builder: Uk:Tag:craft=builder
+    craft=clockmaker: Uk:Tag:craft=clockmaker
+    craft=handicraft: Uk:Tag:craft=handicraft
+    craft=metal_construction: Uk:Tag:craft=metal construction
+    craft=optician: Uk:Tag:craft=optician
+    craft=sewing: Uk:Tag:craft=sewing
+    craft=stonemason: Uk:Tag:craft=stonemason
+    craft=tailor: Uk:Tag:craft=tailor
+    crossing=traffic_signals: Uk:Tag:crossing=traffic signals
+    crossing=uncontrolled: Uk:Tag:crossing=uncontrolled
+    crossing=unmarked: Uk:Tag:crossing=unmarked
+    cuisine=ukrainian: Uk:Tag:cuisine=ukrainian
+    emergency=assembly_point: Uk:Tag:emergency=assembly point
     emergency=fire_hydrant: Uk:Tag:emergency=fire hydrant
     emergency=fire_water_pond: Uk:Tag:emergency=fire water pond
     emergency=suction_point: Uk:Tag:emergency=suction point
     emergency=water_tank: Uk:Tag:emergency=water tank
     emergency=fire_hydrant: Uk:Tag:emergency=fire hydrant
     emergency=fire_water_pond: Uk:Tag:emergency=fire water pond
     emergency=suction_point: Uk:Tag:emergency=suction point
     emergency=water_tank: Uk:Tag:emergency=water tank
+    entrance=garage: Uk:Tag:entrance=garage
+    entrance=main: Uk:Tag:entrance=main
+    entrance=secondary: Uk:Tag:entrance=secondary
     entrance=staircase: Uk:Tag:entrance=staircase
     entrance=staircase: Uk:Tag:entrance=staircase
+    entrance=yes: Uk:Tag:entrance=yes
     footway=crossing: Uk:Tag:footway=crossing
     footway=sidewalk: Uk:Tag:footway=sidewalk
     footway=crossing: Uk:Tag:footway=crossing
     footway=sidewalk: Uk:Tag:footway=sidewalk
+    generator:method=run-of-the-river: Uk:Tag:generator:method=run-of-the-river
+    generator:method=water-pumped-storage: Uk:Tag:generator:method=water-pumped-storage
+    generator:method=water-storage: Uk:Tag:generator:method=water-storage
+    generator:source=hydro: Uk:Tag:generator:source=hydro
     government=legislative: Uk:Tag:government=legislative
     government=ministry: Uk:Tag:government=ministry
     government=prosecutor: Uk:Tag:government=prosecutor
     government=tax: Uk:Tag:government=tax
     highway=bridleway: Uk:Tag:highway=bridleway
     government=legislative: Uk:Tag:government=legislative
     government=ministry: Uk:Tag:government=ministry
     government=prosecutor: Uk:Tag:government=prosecutor
     government=tax: Uk:Tag:government=tax
     highway=bridleway: Uk:Tag:highway=bridleway
+    highway=bus_guideway: Uk:Tag:highway=bus guideway
+    highway=busway: Uk:Tag:highway=busway
     highway=construction: Uk:Tag:highway=construction
     highway=construction: Uk:Tag:highway=construction
+    highway=corridor: Uk:Tag:highway=corridor
+    highway=crossing: Uk:Tag:highway=crossing
     highway=cycleway: Uk:Tag:highway=cycleway
     highway=cycleway: Uk:Tag:highway=cycleway
+    highway=escape: Uk:Tag:highway=escape
     highway=footway: Uk:Tag:highway=footway
     highway=ford: Uk:Tag:highway=ford
     highway=living_street: Uk:Tag:highway=living street
     highway=footway: Uk:Tag:highway=footway
     highway=ford: Uk:Tag:highway=ford
     highway=living_street: Uk:Tag:highway=living street
@@ -21508,16 +30182,21 @@ uk:
     highway=motorway_link: Uk:Tag:highway=motorway link
     highway=path: Uk:Tag:highway=path
     highway=pedestrian: Uk:Tag:highway=pedestrian
     highway=motorway_link: Uk:Tag:highway=motorway link
     highway=path: Uk:Tag:highway=path
     highway=pedestrian: Uk:Tag:highway=pedestrian
+    highway=platform: Uk:Tag:highway=platform
     highway=primary: Uk:Tag:highway=primary
     highway=primary: Uk:Tag:highway=primary
+    highway=raceway: Uk:Tag:highway=raceway
     highway=residential: Uk:Tag:highway=residential
     highway=road: Uk:Tag:highway=road
     highway=secondary: Uk:Tag:highway=secondary
     highway=service: Uk:Tag:highway=service
     highway=steps: Uk:Tag:highway=steps
     highway=residential: Uk:Tag:highway=residential
     highway=road: Uk:Tag:highway=road
     highway=secondary: Uk:Tag:highway=secondary
     highway=service: Uk:Tag:highway=service
     highway=steps: Uk:Tag:highway=steps
+    highway=street_lamp: Uk:Tag:highway=street lamp
     highway=tertiary: Uk:Tag:highway=tertiary
     highway=track: Uk:Tag:highway=track
     highway=traffic_mirror: Uk:Tag:highway=traffic mirror
     highway=tertiary: Uk:Tag:highway=tertiary
     highway=track: Uk:Tag:highway=track
     highway=traffic_mirror: Uk:Tag:highway=traffic mirror
+    highway=traffic_signals: Uk:Tag:highway=traffic signals
     highway=trunk: Uk:Tag:highway=trunk
     highway=trunk: Uk:Tag:highway=trunk
+    highway=turning_circle: Uk:Tag:highway=turning circle
     highway=unclassified: Uk:Tag:highway=unclassified
     historic=aircraft: Uk:Tag:historic=aircraft
     historic=cannon: Uk:Tag:historic=cannon
     highway=unclassified: Uk:Tag:highway=unclassified
     historic=aircraft: Uk:Tag:historic=aircraft
     historic=cannon: Uk:Tag:historic=cannon
@@ -21528,19 +30207,46 @@ uk:
     historic=vehicle: Uk:Tag:historic=vehicle
     historic=wayside_cross: Uk:Tag:historic=wayside cross
     industrial=bakery: Uk:Tag:industrial=bakery
     historic=vehicle: Uk:Tag:historic=vehicle
     historic=wayside_cross: Uk:Tag:historic=wayside cross
     industrial=bakery: Uk:Tag:industrial=bakery
+    landuse=allotments: Uk:Tag:landuse=allotments
+    landuse=brownfield: Uk:Tag:landuse=brownfield
     landuse=cemetery: Uk:Tag:landuse=cemetery
     landuse=cemetery: Uk:Tag:landuse=cemetery
+    landuse=construction: Uk:Tag:landuse=construction
+    landuse=education: Uk:Tag:landuse=education
     landuse=flowerbed: Uk:Tag:landuse=flowerbed
     landuse=forest: Uk:Tag:landuse=forest
     landuse=flowerbed: Uk:Tag:landuse=flowerbed
     landuse=forest: Uk:Tag:landuse=forest
+    landuse=greenfield: Uk:Tag:landuse=greenfield
+    landuse=greenhouse_horticulture: Uk:Tag:landuse=greenhouse horticulture
     landuse=hop_garden: Uk:Tag:landuse=hop garden
     landuse=hop_garden: Uk:Tag:landuse=hop garden
+    landuse=industrial: Uk:Tag:landuse=industrial
     landuse=meadow: Uk:Tag:landuse=meadow
     landuse=residential: Uk:Tag:landuse=residential
     landuse=village_green: Uk:Tag:landuse=village green
     landuse=meadow: Uk:Tag:landuse=meadow
     landuse=residential: Uk:Tag:landuse=residential
     landuse=village_green: Uk:Tag:landuse=village green
+    landuse=vineyard: Uk:Tag:landuse=vineyard
     leaf_cycle=evergreen: Uk:Tag:leaf cycle=evergreen
     leaf_cycle=evergreen: Uk:Tag:leaf cycle=evergreen
+    leisure=bandstand: Uk:Tag:leisure=bandstand
+    leisure=bleachers: Uk:Tag:leisure=bleachers
     leisure=common: Uk:Tag:leisure=common
     leisure=common: Uk:Tag:leisure=common
+    leisure=ice_rink: Uk:Tag:leisure=ice rink
+    leisure=miniature_golf: Uk:Tag:leisure=miniature golf
+    leisure=playground: Uk:Tag:leisure=playground
+    leisure=water_park: Uk:Tag:leisure=water park
+    man_made=beehive: Uk:Tag:man made=beehive
+    man_made=carpet_hanger: Uk:Tag:man made=carpet hanger
+    man_made=chimney: Uk:Tag:man made=chimney
+    man_made=clearcut: Uk:Tag:man made=clearcut
+    man_made=courtyard: Uk:Tag:man made=courtyard
     man_made=cross: Uk:Tag:man made=cross
     man_made=embankment: Uk:Tag:man made=embankment
     man_made=cross: Uk:Tag:man made=cross
     man_made=embankment: Uk:Tag:man made=embankment
+    man_made=flare: Uk:Tag:man made=flare
+    man_made=goods_conveyor: Uk:Tag:man made=goods conveyor
+    man_made=manhole: Uk:Tag:man made=manhole
+    man_made=observatory: Uk:Tag:man made=observatory
     man_made=pier: Uk:Tag:man made=pier
     man_made=pier: Uk:Tag:man made=pier
+    man_made=reservoir_covered: Uk:Tag:man made=reservoir covered
+    man_made=water_tower: Uk:Tag:man made=water tower
     man_made=water_well: Uk:Tag:man made=water well
     man_made=water_well: Uk:Tag:man made=water well
+    man_made=works: Uk:Tag:man made=works
+    museum=children: Uk:Tag:museum=children
     natural=bare_rock: Uk:Tag:natural=bare rock
     natural=birds_nest: Uk:Tag:natural=birds nest
     natural=cliff: Uk:Tag:natural=cliff
     natural=bare_rock: Uk:Tag:natural=bare rock
     natural=birds_nest: Uk:Tag:natural=birds nest
     natural=cliff: Uk:Tag:natural=cliff
@@ -21550,16 +30256,25 @@ uk:
     natural=heath: Uk:Tag:natural=heath
     natural=scree: Uk:Tag:natural=scree
     natural=scrub: Uk:Tag:natural=scrub
     natural=heath: Uk:Tag:natural=heath
     natural=scree: Uk:Tag:natural=scree
     natural=scrub: Uk:Tag:natural=scrub
+    natural=spring: Uk:Tag:natural=spring
     natural=tree: Uk:Tag:natural=tree
     natural=tree_row: Uk:Tag:natural=tree row
     natural=tree: Uk:Tag:natural=tree
     natural=tree_row: Uk:Tag:natural=tree row
+    natural=tree_stump: Uk:Tag:natural=tree stump
     natural=valley: Uk:Tag:natural=valley
     natural=water: Uk:Tag:natural=water
     natural=wood: Uk:Tag:natural=wood
     natural=valley: Uk:Tag:natural=valley
     natural=water: Uk:Tag:natural=water
     natural=wood: Uk:Tag:natural=wood
+    noname=yes: Uk:Tag:noname=yes
+    observatory:type=astronomical: Uk:Tag:observatory:type=astronomical
+    observatory:type=meteorological: Uk:Tag:observatory:type=meteorological
     office=accountant: Uk:Tag:office=accountant
     office=accountant: Uk:Tag:office=accountant
+    office=advertising_agency: Uk:Tag:office=advertising agency
     office=architect: Uk:Tag:office=architect
     office=architect: Uk:Tag:office=architect
+    office=charity: Uk:Tag:office=charity
     office=company: Uk:Tag:office=company
     office=employment_agency: Uk:Tag:office=employment agency
     office=company: Uk:Tag:office=company
     office=employment_agency: Uk:Tag:office=employment agency
+    office=energy_supplier: Uk:Tag:office=energy supplier
     office=estate_agent: Uk:Tag:office=estate agent
     office=estate_agent: Uk:Tag:office=estate agent
+    office=financial: Uk:Tag:office=financial
     office=government: Uk:Tag:office=government
     office=insurance: Uk:Tag:office=insurance
     office=it: Uk:Tag:office=it
     office=government: Uk:Tag:office=government
     office=insurance: Uk:Tag:office=insurance
     office=it: Uk:Tag:office=it
@@ -21567,9 +30282,12 @@ uk:
     office=newspaper: Uk:Tag:office=newspaper
     office=ngo: Uk:Tag:office=ngo
     office=quango: Uk:Tag:office=quango
     office=newspaper: Uk:Tag:office=newspaper
     office=ngo: Uk:Tag:office=ngo
     office=quango: Uk:Tag:office=quango
+    office=real_estate_agent: Uk:Tag:office=real estate agent
     office=research: Uk:Tag:office=research
     office=telecommunication: Uk:Tag:office=telecommunication
     office=travel_agent: Uk:Tag:office=travel agent
     office=research: Uk:Tag:office=research
     office=telecommunication: Uk:Tag:office=telecommunication
     office=travel_agent: Uk:Tag:office=travel agent
+    oneway=alternating: Uk:Tag:oneway=alternating
+    opening_hours=24/7: Uk:Tag:opening hours=24/7
     place=archipelago: Uk:Tag:place=archipelago
     place=borough: Uk:Tag:place=borough
     place=city: Uk:Tag:place=city
     place=archipelago: Uk:Tag:place=archipelago
     place=borough: Uk:Tag:place=borough
     place=city: Uk:Tag:place=city
@@ -21598,32 +30316,66 @@ uk:
     place=town: Uk:Tag:place=town
     place=village: Uk:Tag:place=village
     police=offices: Uk:Tag:police=offices
     place=town: Uk:Tag:place=town
     place=village: Uk:Tag:place=village
     police=offices: Uk:Tag:police=offices
+    post_office=post_partner: Uk:Tag:post office=post partner
+    product=food: Uk:Tag:product=food
     pump=powered: Uk:Tag:pump=powered
     railway=abandoned: Uk:Tag:railway=abandoned
     pump=powered: Uk:Tag:pump=powered
     railway=abandoned: Uk:Tag:railway=abandoned
+    railway=crossing: Uk:Tag:railway=crossing
+    railway=disused: Uk:Tag:railway=disused
     railway=halt: Uk:Tag:railway=halt
     railway=halt: Uk:Tag:railway=halt
+    railway=miniature: Uk:Tag:railway=miniature
     railway=rail: Uk:Tag:railway=rail
     railway=rail: Uk:Tag:railway=rail
+    railway=roundhouse: Uk:Tag:railway=roundhouse
     railway=station: Uk:Tag:railway=station
     railway=tram: Uk:Tag:railway=tram
     railway=station: Uk:Tag:railway=station
     railway=tram: Uk:Tag:railway=tram
+    railway=water_crane: Uk:Tag:railway=water crane
     religion=christian: Uk:Tag:religion=christian
     religion=christian: Uk:Tag:religion=christian
+    request_stop=yes: Uk:Tag:request stop=yes
+    residential=apartments: Uk:Tag:residential=apartments
     residential=rural: Uk:Tag:residential=rural
     residential=rural: Uk:Tag:residential=rural
+    residential=single_family: Uk:Tag:residential=single family
     residential=urban: Uk:Tag:residential=urban
     route=train: Uk:Tag:route=train
     shop=antiques: Uk:Tag:shop=antiques
     shop=baby_goods: Uk:Tag:shop=baby goods
     residential=urban: Uk:Tag:residential=urban
     route=train: Uk:Tag:route=train
     shop=antiques: Uk:Tag:shop=antiques
     shop=baby_goods: Uk:Tag:shop=baby goods
+    shop=bakery: Uk:Tag:shop=bakery
     shop=bicycle: Uk:Tag:shop=bicycle
     shop=bicycle: Uk:Tag:shop=bicycle
+    shop=brewing_supplies: Uk:Tag:shop=brewing supplies
+    shop=confectionery: Uk:Tag:shop=confectionery
+    shop=games: Uk:Tag:shop=games
+    shop=ice_cream: Uk:Tag:shop=ice cream
     shop=optician: Uk:Tag:shop=optician
     shop=second_hand: Uk:Tag:shop=second hand
     shop=optician: Uk:Tag:shop=optician
     shop=second_hand: Uk:Tag:shop=second hand
+    shop=sewing: Uk:Tag:shop=sewing
+    shop=variety_store: Uk:Tag:shop=variety store
     sport=Swimming: Uk:Tag:sport=Swimming
     sport=Swimming: Uk:Tag:sport=Swimming
+    sport=multi: Uk:Tag:sport=multi
+    sport=parachuting: Uk:Tag:sport=parachuting
     sport=paragliding: Uk:Tag:sport=paragliding
     sport=paragliding: Uk:Tag:sport=paragliding
+    sport=rugby: Uk:Tag:sport=rugby
     sport=shooting: Uk:Tag:sport=shooting
     sport=skiing: Uk:Tag:sport=skiing
     sport=swimming: Uk:Tag:sport=swimming
     sport=shooting: Uk:Tag:sport=shooting
     sport=skiing: Uk:Tag:sport=skiing
     sport=swimming: Uk:Tag:sport=swimming
+    tourism=hostel: Uk:Tag:tourism=hostel
+    tourism=motel: Uk:Tag:tourism=motel
+    tunnel=avalanche_protector: Uk:Tag:tunnel=avalanche protector
+    tunnel=building_passage: Uk:Tag:tunnel=building passage
     type=boundary: Uk:Tag:type=boundary
     vending=bicycle_tube: Uk:Tag:vending=bicycle tube
     type=boundary: Uk:Tag:type=boundary
     vending=bicycle_tube: Uk:Tag:vending=bicycle tube
+    water=river: Uk:Tag:water=river
+    waterway=dam: Uk:Tag:waterway=dam
+    waterway=ditch: Uk:Tag:waterway=ditch
+    waterway=drain: Uk:Tag:waterway=drain
+    waterway=fuel: Uk:Tag:waterway=fuel
     waterway=riverbank: Uk:Tag:waterway=riverbank
     waterway=riverbank: Uk:Tag:waterway=riverbank
+    waterway=weir: Uk:Tag:waterway=weir
+user:
+  key:
+    Community: User:Key:Community
 vi:
   key:
     addr: Vi:Key:addr
 vi:
   key:
     addr: Vi:Key:addr
+    addr:*: Vi:Key:addr:*
     highway: Vi:Key:highway
   tag:
     highway=primary: Vi:Tag:highway=primary
     highway: Vi:Key:highway
   tag:
     highway=primary: Vi:Tag:highway=primary
@@ -21676,81 +30428,214 @@ yue:
     man_made=gasometer: Yue:Tag:man made=gasometer
     residential=university: Yue:Tag:residential=university
     tourism=attraction: Yue:Tag:tourism=attraction
     man_made=gasometer: Yue:Tag:man made=gasometer
     residential=university: Yue:Tag:residential=university
     tourism=attraction: Yue:Tag:tourism=attraction
+zh hans:
+  key:
+    name:etymology: Zh hans:Key:name:etymology
 zh-hans:
   key:
 zh-hans:
   key:
+    abutters: Zh-hans:Key:abutters
     access: Zh-hans:Key:access
     access: Zh-hans:Key:access
+    admin_level: Zh-hans:Key:admin level
     amenity: Zh-hans:Key:amenity
     amenity: Zh-hans:Key:amenity
+    attraction: Zh-hans:Key:attraction
     building: Zh-hans:Key:building
     building:part: Zh-hans:Key:building:part
     building: Zh-hans:Key:building
     building:part: Zh-hans:Key:building:part
+    cables: Zh-hans:Key:cables
+    china_class: Zh-hans:Key:china class
+    china_population: Zh-hans:Key:china population
+    circuits: Zh-hans:Key:circuits
+    construction: Zh-hans:Key:construction
     cuisine: Zh-hans:Key:cuisine
     cuisine: Zh-hans:Key:cuisine
+    cycleway: Zh-hans:Key:cycleway
+    cycleway:both: Zh-hans:Key:cycleway:both
     ele: Zh-hans:Key:ele
     entrance: Zh-hans:Key:entrance
     ele: Zh-hans:Key:ele
     entrance: Zh-hans:Key:entrance
+    exit_to: Zh-hans:Key:exit to
+    fixme:osmchina: Zh-hans:Key:fixme:osmchina
     foot: Zh-hans:Key:foot
     foot: Zh-hans:Key:foot
+    gauge: Zh-hans:Key:gauge
+    generator:source: Zh-hans:Key:generator:source
+    government: Zh-hans:Key:government
+    healthcare: Zh-hans:Key:healthcare
     height: Zh-hans:Key:height
     height: Zh-hans:Key:height
+    highspeed: Zh-hans:Key:highspeed
     highway: Zh-hans:Key:highway
     highway: Zh-hans:Key:highway
+    informal: Zh-hans:Key:informal
+    information: Zh-hans:Key:information
     landuse: Zh-hans:Key:landuse
     landuse: Zh-hans:Key:landuse
+    layer: Zh-hans:Key:layer
     leisure: Zh-hans:Key:leisure
     leisure: Zh-hans:Key:leisure
+    material: Zh-hans:Key:material
+    military: Zh-hans:Key:military
     motorcycle: Zh-hans:Key:motorcycle
     name: Zh-hans:Key:name
     motorcycle: Zh-hans:Key:motorcycle
     name: Zh-hans:Key:name
+    name:etymology: Zh-hans:Key:name:etymology
     oneway: Zh-hans:Key:oneway
     oneway: Zh-hans:Key:oneway
+    opening_hours:covid19: Zh-hans:Key:opening hours:covid19
     overtaking: Zh-hans:Key:overtaking
     overtaking: Zh-hans:Key:overtaking
-    parking:lane: Zh-hans:Key:parking:lane
+    parking: Zh-hans:Key:parking
     place: Zh-hans:Key:place
     place: Zh-hans:Key:place
+    place:CN: Zh-hans:Key:place:CN
+    place:cn: Zh-hans:Key:place:cn
     plant:method: Zh-hans:Key:plant:method
     plant:method: Zh-hans:Key:plant:method
+    population: Zh-hans:Key:population
+    power: Zh-hans:Key:power
+    proposed: Zh-hans:Key:proposed
     railway: Zh-hans:Key:railway
     railway:etcs: Zh-hans:Key:railway:etcs
     railway:lzb: Zh-hans:Key:railway:lzb
     ref: Zh-hans:Key:ref
     railway: Zh-hans:Key:railway
     railway:etcs: Zh-hans:Key:railway:etcs
     railway:lzb: Zh-hans:Key:railway:lzb
     ref: Zh-hans:Key:ref
+    removed:building: Zh-hans:Key:removed:building
     residential: Zh-hans:Key:residential
     roof:direction: Zh-hans:Key:roof:direction
     roof:shape: Zh-hans:Key:roof:shape
     residential: Zh-hans:Key:residential
     roof:direction: Zh-hans:Key:roof:direction
     roof:shape: Zh-hans:Key:roof:shape
+    substation: Zh-hans:Key:substation
     surface: Zh-hans:Key:surface
     toll: Zh-hans:Key:toll
     turn: Zh-hans:Key:turn
     surface: Zh-hans:Key:surface
     toll: Zh-hans:Key:toll
     turn: Zh-hans:Key:turn
+    uic_ref: Zh-hans:Key:uic ref
     waterway: Zh-hans:Key:waterway
     wheelchair: Zh-hans:Key:wheelchair
   tag:
     waterway: Zh-hans:Key:waterway
     wheelchair: Zh-hans:Key:wheelchair
   tag:
+    admin_level=2: Zh-hans:Tag:admin level=2
+    aeroway=parking_position: Zh-hans:Tag:aeroway=parking position
+    aeroway=windsock: Zh-hans:Tag:aeroway=windsock
     amenity=bar: Zh-hans:Tag:amenity=bar
     amenity=bar: Zh-hans:Tag:amenity=bar
+    amenity=bicycle_rental: Zh-hans:Tag:amenity=bicycle rental
+    amenity=bus_station: Zh-hans:Tag:amenity=bus station
     amenity=cafe: Zh-hans:Tag:amenity=cafe
     amenity=cafe: Zh-hans:Tag:amenity=cafe
+    amenity=crematorium: Zh-hans:Tag:amenity=crematorium
+    amenity=driver_training: Zh-hans:Tag:amenity=driver training
+    amenity=driving_school: Zh-hans:Tag:amenity=driving school
+    amenity=fuel: Zh-hans:Tag:amenity=fuel
+    amenity=grave_yard: Zh-hans:Tag:amenity=grave yard
+    amenity=karaoke_box: Zh-hans:Tag:amenity=karaoke box
+    amenity=kindergarten: Zh-hans:Tag:amenity=kindergarten
+    amenity=mortuary: Zh-hans:Tag:amenity=mortuary
+    amenity=parcel_locker: Zh-hans:Tag:amenity=parcel locker
+    amenity=school: Zh-hans:Tag:amenity=school
+    amenity=shelter: Zh-hans:Tag:amenity=shelter
     amenity=toilets: Zh-hans:Tag:amenity=toilets
     barrier=toll_booth: Zh-hans:Tag:barrier=toll booth
     barrier=wall: Zh-hans:Tag:barrier=wall
     amenity=toilets: Zh-hans:Tag:amenity=toilets
     barrier=toll_booth: Zh-hans:Tag:barrier=toll booth
     barrier=wall: Zh-hans:Tag:barrier=wall
+    beacon:type=VOR: Zh-hans:Tag:beacon:type=VOR
+    books=textbook: Zh-hans:Tag:books=textbook
+    boundary=administrative: Zh-hans:Tag:boundary=administrative
+    boundary=exclave: Zh-hans:Tag:boundary=exclave
     bridge:structure=humpback: Zh-hans:Tag:bridge:structure=humpback
     bridge:structure=humpback: Zh-hans:Tag:bridge:structure=humpback
+    building=apartments: Zh-hans:Tag:building=apartments
     building=detached: Zh-hans:Tag:building=detached
     building=detached: Zh-hans:Tag:building=detached
+    building=hospital: Zh-hans:Tag:building=hospital
+    building=office: Zh-hans:Tag:building=office
+    building=school: Zh-hans:Tag:building=school
+    building=service: Zh-hans:Tag:building=service
+    cemetery=grave: Zh-hans:Tag:cemetery=grave
+    crossing=traffic_signals: Zh-hans:Tag:crossing=traffic signals
+    cuisine=asian: Zh-hans:Tag:cuisine=asian
+    cuisine=chinese: Zh-hans:Tag:cuisine=chinese
+    cuisine=hot_pot: Zh-hans:Tag:cuisine=hot pot
+    emergency=emergency_ward_entrance: Zh-hans:Tag:emergency=emergency ward entrance
     generator:source=wind: Zh-hans:Tag:generator:source=wind
     highway=bus_stop: Zh-hans:Tag:highway=bus stop
     generator:source=wind: Zh-hans:Tag:generator:source=wind
     highway=bus_stop: Zh-hans:Tag:highway=bus stop
+    highway=construction: Zh-hans:Tag:highway=construction
+    highway=cycleway: Zh-hans:Tag:highway=cycleway
+    highway=escape: Zh-hans:Tag:highway=escape
     highway=footway: Zh-hans:Tag:highway=footway
     highway=footway: Zh-hans:Tag:highway=footway
+    highway=living_street: Zh-hans:Tag:highway=living street
+    highway=motorway: Zh-hans:Tag:highway=motorway
+    highway=motorway_junction: Zh-hans:Tag:highway=motorway junction
+    highway=motorway_link: Zh-hans:Tag:highway=motorway link
+    highway=pedestrian: Zh-hans:Tag:highway=pedestrian
+    highway=primary: Zh-hans:Tag:highway=primary
+    highway=primary_link: Zh-hans:Tag:highway=primary link
+    highway=proposed: Zh-hans:Tag:highway=proposed
     highway=residential: Zh-hans:Tag:highway=residential
     highway=residential: Zh-hans:Tag:highway=residential
+    highway=road: Zh-hans:Tag:highway=road
+    highway=secondary: Zh-hans:Tag:highway=secondary
+    highway=secondary_link: Zh-hans:Tag:highway=secondary link
+    highway=service: Zh-hans:Tag:highway=service
+    highway=speed_camera: Zh-hans:Tag:highway=speed camera
     highway=tertiary: Zh-hans:Tag:highway=tertiary
     highway=tertiary: Zh-hans:Tag:highway=tertiary
+    highway=tertiary_link: Zh-hans:Tag:highway=tertiary link
     highway=toll_gantry: Zh-hans:Tag:highway=toll gantry
     highway=toll_gantry: Zh-hans:Tag:highway=toll gantry
+    highway=track: Zh-hans:Tag:highway=track
     highway=traffic_signals: Zh-hans:Tag:highway=traffic signals
     highway=traffic_signals: Zh-hans:Tag:highway=traffic signals
+    highway=trunk: Zh-hans:Tag:highway=trunk
+    highway=trunk_link: Zh-hans:Tag:highway=trunk link
+    highway=unclassified: Zh-hans:Tag:highway=unclassified
     historic=stone: Zh-hans:Tag:historic=stone
     historic=stone: Zh-hans:Tag:historic=stone
+    industrial=slaughterhouse: Zh-hans:Tag:industrial=slaughterhouse
+    information=office: Zh-hans:Tag:information=office
+    landuse=allotments: Zh-hans:Tag:landuse=allotments
+    landuse=brownfield: Zh-hans:Tag:landuse=brownfield
     landuse=commercial: Zh-hans:Tag:landuse=commercial
     landuse=commercial: Zh-hans:Tag:landuse=commercial
+    landuse=construction: Zh-hans:Tag:landuse=construction
     landuse=forest: Zh-hans:Tag:landuse=forest
     landuse=forest: Zh-hans:Tag:landuse=forest
+    landuse=greenfield: Zh-hans:Tag:landuse=greenfield
+    landuse=greenhouse_horticulture: Zh-hans:Tag:landuse=greenhouse horticulture
+    landuse=industrial: Zh-hans:Tag:landuse=industrial
+    landuse=military: Zh-hans:Tag:landuse=military
+    landuse=paddy: Zh-hans:Tag:landuse=paddy
+    landuse=residential: Zh-hans:Tag:landuse=residential
+    landuse=retail: Zh-hans:Tag:landuse=retail
+    leisure=nature_reserve: Zh-hans:Tag:leisure=nature reserve
+    line=bay: Zh-hans:Tag:line=bay
+    line=busbar: Zh-hans:Tag:line=busbar
     man_made=antenna: Zh-hans:Tag:man made=antenna
     man_made=dyke: Zh-hans:Tag:man made=dyke
     man_made=antenna: Zh-hans:Tag:man made=antenna
     man_made=dyke: Zh-hans:Tag:man made=dyke
+    man_made=flagpole: Zh-hans:Tag:man made=flagpole
+    man_made=paifang: Zh-hans:Tag:man made=paifang
     natural=sand: Zh-hans:Tag:natural=sand
     natural=sand: Zh-hans:Tag:natural=sand
+    natural=shingle: Zh-hans:Tag:natural=shingle
+    natural=shrubbery: Zh-hans:Tag:natural=shrubbery
     natural=wood: Zh-hans:Tag:natural=wood
     network=CN:AH: Zh-hans:Tag:network=CN:AH
     network=CN:JS: Zh-hans:Tag:network=CN:JS
     natural=wood: Zh-hans:Tag:natural=wood
     network=CN:AH: Zh-hans:Tag:network=CN:AH
     network=CN:JS: Zh-hans:Tag:network=CN:JS
+    network=CN:expressway: Zh-hans:Tag:network=CN:expressway
     network=CN:national: Zh-hans:Tag:network=CN:national
     office=government: Zh-hans:Tag:office=government
     network=CN:national: Zh-hans:Tag:network=CN:national
     office=government: Zh-hans:Tag:office=government
+    office=political_party: Zh-hans:Tag:office=political party
     place=hamlet: Zh-hans:Tag:place=hamlet
     place=hamlet: Zh-hans:Tag:place=hamlet
+    power=cable: Zh-hans:Tag:power=cable
+    power=catenary_mast: Zh-hans:Tag:power=catenary mast
+    power=compensator: Zh-hans:Tag:power=compensator
+    power=converter: Zh-hans:Tag:power=converter
+    power=generator: Zh-hans:Tag:power=generator
+    power=heliostat: Zh-hans:Tag:power=heliostat
+    power=insulator: Zh-hans:Tag:power=insulator
     power=line: Zh-hans:Tag:power=line
     power=line: Zh-hans:Tag:power=line
+    power=minor_line: Zh-hans:Tag:power=minor line
+    power=portal: Zh-hans:Tag:power=portal
+    power=substation: Zh-hans:Tag:power=substation
+    power=switch: Zh-hans:Tag:power=switch
+    power=terminal: Zh-hans:Tag:power=terminal
     power=tower: Zh-hans:Tag:power=tower
     power=tower: Zh-hans:Tag:power=tower
+    power=transformer: Zh-hans:Tag:power=transformer
+    public_transport=stop_position: Zh-hans:Tag:public transport=stop position
     railway=light_rail: Zh-hans:Tag:railway=light rail
     railway=light_rail: Zh-hans:Tag:railway=light rail
+    railway=monorail: Zh-hans:Tag:railway=monorail
     railway=subway: Zh-hans:Tag:railway=subway
     railway=subway_entrance: Zh-hans:Tag:railway=subway entrance
     railway=traverser: Zh-hans:Tag:railway=traverser
     railway=subway: Zh-hans:Tag:railway=subway
     railway=subway_entrance: Zh-hans:Tag:railway=subway entrance
     railway=traverser: Zh-hans:Tag:railway=traverser
+    railway=yard: Zh-hans:Tag:railway=yard
     route=light_rail: Zh-hans:Tag:route=light rail
     route=light_rail: Zh-hans:Tag:route=light rail
+    route=road: Zh-hans:Tag:route=road
     route=subway: Zh-hans:Tag:route=subway
     route=subway: Zh-hans:Tag:route=subway
+    service=drive-through: Zh-hans:Tag:service=drive-through
     service=parking_aisle: Zh-hans:Tag:service=parking aisle
     service=parking_aisle: Zh-hans:Tag:service=parking aisle
+    shop=storage_rental: Zh-hans:Tag:shop=storage rental
     station=light_rail: Zh-hans:Tag:station=light rail
     station=subway: Zh-hans:Tag:station=subway
     station=light_rail: Zh-hans:Tag:station=light rail
     station=subway: Zh-hans:Tag:station=subway
+    substation=transmission: Zh-hans:Tag:substation=transmission
     surface=acrylic: Zh-hans:Tag:surface=acrylic
     surface=artificial_turf: Zh-hans:Tag:surface=artificial turf
     surface=tartan: Zh-hans:Tag:surface=tartan
     surface=acrylic: Zh-hans:Tag:surface=acrylic
     surface=artificial_turf: Zh-hans:Tag:surface=artificial turf
     surface=tartan: Zh-hans:Tag:surface=tartan
+    tourism=aquarium: Zh-hans:Tag:tourism=aquarium
+    tourism=attraction: Zh-hans:Tag:tourism=attraction
+    tourism=information: Zh-hans:Tag:tourism=information
     vending=ice_cream: Zh-hans:Tag:vending=ice cream
     vending=ice_cream: Zh-hans:Tag:vending=ice cream
+    waterway=ditch: Zh-hans:Tag:waterway=ditch
+    waterway=river: Zh-hans:Tag:waterway=river
     waterway=weir: Zh-hans:Tag:waterway=weir
 zh-hant:
   key:
     waterway=weir: Zh-hans:Tag:waterway=weir
 zh-hant:
   key:
@@ -21758,6 +30643,7 @@ zh-hant:
     aeroway: Zh-hant:Key:aeroway
     amenity: Zh-hant:Key:amenity
     bridge: Zh-hant:Key:bridge
     aeroway: Zh-hant:Key:aeroway
     amenity: Zh-hant:Key:amenity
     bridge: Zh-hant:Key:bridge
+    building: Zh-hant:Key:building
     conveying: Zh-hant:Key:conveying
     covered: Zh-hant:Key:covered
     cutting: Zh-hant:Key:cutting
     conveying: Zh-hant:Key:conveying
     covered: Zh-hant:Key:covered
     cutting: Zh-hant:Key:cutting
@@ -21771,7 +30657,6 @@ zh-hant:
     layer: Zh-hant:Key:layer
     maxspeed: Zh-hant:Key:maxspeed
     name: Zh-hant:Key:name
     layer: Zh-hant:Key:layer
     maxspeed: Zh-hant:Key:maxspeed
     name: Zh-hant:Key:name
-    noexit: Zh-hant:Key:noexit
     office: Zh-hant:Key:office
     oneway: Zh-hant:Key:oneway
     opening_hours: Zh-hant:Key:opening hours
     office: Zh-hant:Key:office
     oneway: Zh-hant:Key:oneway
     opening_hours: Zh-hant:Key:opening hours
@@ -21802,6 +30687,7 @@ zh-hant:
     amenity=toilets: Zh-hant:Tag:amenity=toilets
     barrier=toll_booth: Zh-hant:Tag:barrier=toll booth
     building=roof: Zh-hant:Tag:building=roof
     amenity=toilets: Zh-hant:Tag:amenity=toilets
     barrier=toll_booth: Zh-hant:Tag:barrier=toll booth
     building=roof: Zh-hant:Tag:building=roof
+    healthcare=postpartum_care: Zh-hant:Tag:healthcare=postpartum care
     highway=bus_guideway: Zh-hant:Tag:highway=bus guideway
     highway=bus_stop: Zh-hant:Tag:highway=bus stop
     highway=footway: Zh-hant:Tag:highway=footway
     highway=bus_guideway: Zh-hant:Tag:highway=bus guideway
     highway=bus_stop: Zh-hant:Tag:highway=bus stop
     highway=footway: Zh-hant:Tag:highway=footway
@@ -21823,6 +30709,7 @@ zh-hant:
     highway=unclassified: Zh-hant:Tag:highway=unclassified
     historic=aircraft: Zh-hant:Tag:historic=aircraft
     landuse=cemetery: Zh-hant:Tag:landuse=cemetery
     highway=unclassified: Zh-hant:Tag:highway=unclassified
     historic=aircraft: Zh-hant:Tag:historic=aircraft
     landuse=cemetery: Zh-hant:Tag:landuse=cemetery
+    landuse=paddy: Zh-hant:Tag:landuse=paddy
     leisure=adult_gaming_centre: Zh-hant:Tag:leisure=adult gaming centre
     leisure=firepit: Zh-hant:Tag:leisure=firepit
     leisure=fitness_centre: Zh-hant:Tag:leisure=fitness centre
     leisure=adult_gaming_centre: Zh-hant:Tag:leisure=adult gaming centre
     leisure=firepit: Zh-hant:Tag:leisure=firepit
     leisure=fitness_centre: Zh-hant:Tag:leisure=fitness centre
@@ -21830,6 +30717,7 @@ zh-hant:
     man_made=embankment: Zh-hant:Tag:man made=embankment
     natural=peak: Zh-hant:Tag:natural=peak
     natural=scree: Zh-hant:Tag:natural=scree
     man_made=embankment: Zh-hant:Tag:man made=embankment
     natural=peak: Zh-hant:Tag:natural=peak
     natural=scree: Zh-hant:Tag:natural=scree
+    noexit=yes: Zh-hant:Tag:noexit=yes
     power=plant: Zh-hant:Tag:power=plant
     railway=rail: Zh-hant:Tag:railway=rail
     service=alley: Zh-hant:Tag:service=alley
     power=plant: Zh-hant:Tag:power=plant
     railway=rail: Zh-hant:Tag:railway=rail
     service=alley: Zh-hant:Tag:service=alley
The OpenStreetMap web site