]> git.openstreetmap.org Git - rails.git/blobdiff - config/wiki_pages.yml
Merge remote-tracking branch 'upstream/pull/5341'
[rails.git] / config / wiki_pages.yml
index b646dec8e9204bf2ab0dcdbcf29cf0b69f2f7e20..c7c32cda9755571b0528266212639531632f34d1 100644 (file)
@@ -9,8 +9,11 @@ ar:
     natural: Ar:Key:natural
     waterway: Ar:Key:waterway
   tag:
+    amenity=restaurant: Ar:Tag:amenity=restaurant
     amenity=school: Ar:Tag:amenity=school
+    amenity=toilets: Ar:Tag:amenity=toilets
     shop=bakery: Ar:Tag:shop=bakery
+    shop=mall: Ar:Tag:shop=mall
 az:
   tag:
     craft=locksmith: Az:Tag:craft=locksmith
@@ -20,6 +23,7 @@ bg:
     building: Bg:Key:building
     lanes: Bg:Key:lanes
     name:bg: Bg:Key:name:bg
+    traffic_calming: Bg:Key:traffic calming
   tag:
     barrier=guard_rail: Bg:Tag:barrier=guard rail
     building=chapel: Bg:Tag:building=chapel
@@ -27,6 +31,7 @@ bg:
     railway=crossing: Bg:Tag:railway=crossing
     railway=level_crossing: Bg:Tag:railway=level crossing
     shop=sewing: Bg:Tag:shop=sewing
+    traffic_calming=bump: Bg:Tag:traffic calming=bump
 br:
   key:
     highway: Br:Key:highway
@@ -41,6 +46,7 @@ ca:
     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
     name:ca: Ca:Key:name:ca
@@ -136,6 +142,7 @@ ca:
     building=cathedral: Ca:Tag:building=cathedral
     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=restoration: Ca:Tag:craft=restoration
     crossing=traffic_signals: Ca:Tag:crossing=traffic signals
@@ -159,6 +166,8 @@ ca:
     service=aircraft_control: Ca:Tag:service=aircraft control
     shop=alcohol: Ca:Tag:shop=alcohol
     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
@@ -170,7 +179,6 @@ cs:
     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:amenity: Cs:Key:abandoned:amenity
@@ -239,7 +247,6 @@ cs:
     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
@@ -556,7 +563,6 @@ cs:
     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
@@ -629,7 +635,8 @@ cs:
     natural: Cs:Key:natural
     navigationaid: Cs:Key:navigationaid
     network: Cs:Key:network
-    noexit: Cs:Key:noexit
+    'no:': 'Cs:Key:no:'
+    no:*: Cs:Key:no:*
     noref: Cs:Key:noref
     note: Cs:Key:note
     nudism: Cs:Key:nudism
@@ -776,7 +783,6 @@ cs:
     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
@@ -1052,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=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
@@ -1165,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
+    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
@@ -1221,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=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
@@ -1805,6 +1814,7 @@ cs:
     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
@@ -2077,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=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
@@ -2352,13 +2361,14 @@ da:
   key:
     access: Da:Key:access
     amenity: Da:Key:amenity
+    cycleway: Da:Key:cycleway
     diet:vegan: Da:Key:diet:vegan
     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
-    noexit: Da:Key:noexit
     surface: Da:Key:surface
   tag:
     amenity=community_centre: Da:Tag:amenity=community centre
@@ -2374,7 +2384,12 @@ da:
     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
+    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
@@ -2383,6 +2398,7 @@ da:
     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
@@ -2394,6 +2410,7 @@ de:
     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
@@ -2421,10 +2438,13 @@ de:
     air_conditioning: DE:Key:air conditioning
     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:wikidata: DE:Key:architect:wikidata
     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
@@ -2432,10 +2452,12 @@ de:
     attraction: DE:Key:attraction
     atv:repair: DE:Key:atv:repair
     authentication: DE:Key:authentication
+    authentication:*: DE:Key:authentication:*
     automated: DE:Key:automated
     automatic_door: DE:Key:automatic door
     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
@@ -2450,7 +2472,6 @@ de:
     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
@@ -2464,6 +2485,7 @@ de:
     boundary: DE:Key:boundary
     branch: DE:Key:branch
     brand: DE:Key:brand
+    brand:wikidata: DE:Key:brand:wikidata
     breakfast: DE:Key:breakfast
     brewery: DE:Key:brewery
     bridge: DE:Key:bridge
@@ -2516,7 +2538,9 @@ de:
     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: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
@@ -2527,6 +2551,7 @@ de:
     company: DE:Key:company
     conditional: DE:Key:conditional
     construction: DE:Key:construction
+    construction:*: DE:Key:construction:*
     contact: DE:Key:contact
     'contact:': 'DE:Key:contact:'
     contact:*: DE:Key:contact:*
@@ -2536,6 +2561,7 @@ de:
     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
@@ -2551,6 +2577,7 @@ de:
     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
@@ -2587,6 +2614,7 @@ de:
     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
@@ -2603,6 +2631,7 @@ de:
     destroyed:*: DE:Key:destroyed:*
     diameter: DE:Key:diameter
     diet: DE:Key:diet
+    diet:*: DE:Key:diet:*
     diet:vegan: DE:Key:diet:vegan
     diet:vegetarian: DE:Key:diet:vegetarian
     dinner: DE:Key:dinner
@@ -2629,6 +2658,7 @@ de:
     ele: DE:Key:ele
     electrified: DE:Key:electrified
     embankment: DE:Key:embankment
+    embassy: DE:Key:embassy
     emergency: DE:Key:emergency
     emergency:phone: DE:Key:emergency:phone
     emergency_telephone_code: DE:Key:emergency telephone code
@@ -2637,6 +2667,7 @@ de:
     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
@@ -2644,16 +2675,20 @@ de:
     fax: DE:Key:fax
     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
     fire_boundary: DE:Key:fire boundary
     fire_hydrant: DE:Key:fire hydrant
     fire_hydrant:diameter: DE:Key:fire hydrant:diameter
     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
+    flood_prone: DE:Key:flood prone
     foot: DE:Key:foot
     footway: DE:Key:footway
     ford: DE:Key:ford
@@ -2673,19 +2708,27 @@ de:
     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: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: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:vacuum: DE:Key:generator:output:vacuum
     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
+    genus:de: DE:Key:genus:de
     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
@@ -2703,6 +2746,7 @@ de:
     healthcare:counselling: DE:Key:healthcare:counselling
     healthcare:speciality: DE:Key:healthcare:speciality
     height: DE:Key:height
+    height:hub: DE:Key:height:hub
     heritage: DE:Key:heritage
     hgv: DE:Key:hgv
     hgv_articulated: DE:Key:hgv articulated
@@ -2731,6 +2775,7 @@ de:
     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
@@ -2739,6 +2784,7 @@ de:
     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
@@ -2784,6 +2830,7 @@ de:
     managed: DE:Key:managed
     manhole: DE:Key:manhole
     manufacturer: DE:Key:manufacturer
+    map_type: DE:Key:map type
     mapillary: DE:Key:mapillary
     marker: DE:Key:marker
     massage: DE:Key:massage
@@ -2853,13 +2900,15 @@ de:
     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
+    network:wikidata: DE:Key:network:wikidata
     noaddress: DE:Key:noaddress
-    noexit: DE:Key:noexit
     noname: DE:Key:noname
     noref: DE:Key:noref
     note: DE:Key:note
@@ -2887,6 +2936,7 @@ de:
     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
     origin: DE:Key:origin
     osak: DE:Key:osak
@@ -2902,8 +2952,11 @@ de:
     parking: DE:Key:parking
     parking_space: DE:Key:parking space
     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:*
     permanent_camping: DE:Key:permanent camping
     phone: DE:Key:phone
     pilgrimage: DE:Key:pilgrimage
@@ -2914,9 +2967,25 @@ de:
     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:hot_air: DE:Key:plant:output:hot air
     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
+    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:*
@@ -2932,6 +3001,7 @@ de:
     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
@@ -2953,6 +3023,11 @@ de:
     railway:tilting: DE:Key:railway:tilting
     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:*
     rcn_ref: DE:Key:rcn ref
@@ -2960,6 +3035,7 @@ de:
     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:fgkz: DE:Key:ref:fgkz
     ref:mobil-parken.de: DE:Key:ref:mobil-parken.de
@@ -2969,6 +3045,7 @@ de:
     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
     residential: DE:Key:residential
@@ -2995,6 +3072,7 @@ de:
     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
@@ -3007,8 +3085,11 @@ de:
     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: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
@@ -3024,6 +3105,7 @@ de:
     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
@@ -3106,6 +3188,7 @@ de:
     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
@@ -3136,9 +3219,9 @@ de:
     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
-    year_of_construction: DE:Key:year of construction
     zero_waste: DE:Key:zero waste
     zone:maxspeed: DE:Key:zone:maxspeed
     zoo: DE:Key:zoo
@@ -3146,6 +3229,7 @@ de:
     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
@@ -3196,6 +3280,7 @@ de:
     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
@@ -3203,6 +3288,8 @@ de:
     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
@@ -3223,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_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
@@ -3327,6 +3415,7 @@ 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=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
@@ -3366,6 +3455,7 @@ de:
     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
@@ -3375,10 +3465,12 @@ de:
     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
+    association=student: DE:Tag:association=student
     atm=yes: DE:Tag:atm=yes
     attraction=alpine_coaster: DE:Tag:attraction=alpine coaster
     attraction=animal: DE:Tag:attraction=animal
@@ -3440,8 +3532,10 @@ de:
     bicycle=dismount: DE:Tag:bicycle=dismount
     bicycle=optional_sidepath: DE:Tag:bicycle=optional 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
     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
@@ -3478,6 +3572,7 @@ de:
     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
@@ -3509,6 +3604,7 @@ de:
     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
@@ -3552,6 +3648,7 @@ de:
     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=citadel: DE:Tag:castle type=citadel
@@ -3570,12 +3667,22 @@ de:
     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
+    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
     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
@@ -3667,6 +3774,7 @@ 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
+    crematorium=pet: DE:Tag:crematorium=pet
     crossing=marked: DE:Tag:crossing=marked
     crossing=no: DE:Tag:crossing=no
     crossing=traffic_signals: DE:Tag:crossing=traffic signals
@@ -3707,6 +3815,8 @@ de:
     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
@@ -3714,6 +3824,7 @@ de:
     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
@@ -3722,15 +3833,25 @@ de:
     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=control_centre: DE:Tag:emergency=control centre
     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=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
@@ -3763,6 +3884,7 @@ de:
     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=yes: DE:Tag:foot=yes
     footway=crossing: DE:Tag:footway=crossing
@@ -3788,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: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
@@ -3823,10 +3946,12 @@ de:
     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=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
@@ -3870,12 +3995,18 @@ de:
     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
@@ -3894,6 +4025,7 @@ de:
     healthcare=midwife: DE:Tag:healthcare=midwife
     healthcare=occupational_therapist: DE:Tag:healthcare=occupational therapist
     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
@@ -3924,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=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
@@ -3973,6 +4106,7 @@ de:
     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=highwater_mark: DE:Tag:historic=highwater mark
@@ -3996,6 +4130,7 @@ de:
     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=dismount: DE:Tag:horse=dismount
     industrial=aluminium_smelting: DE:Tag:industrial=aluminium smelting
@@ -4029,6 +4164,7 @@ de:
     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
@@ -4046,6 +4182,7 @@ de:
     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
@@ -4089,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=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
@@ -4097,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=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
@@ -4142,6 +4281,7 @@ de:
     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
     lottery=yes: DE:Tag:lottery=yes
     man_made=MDF: DE:Tag:man made=MDF
@@ -4156,11 +4296,14 @@ de:
     man_made=cairn: DE:Tag:man made=cairn
     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=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=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
@@ -4171,8 +4314,10 @@ de:
     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=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
@@ -4186,12 +4331,14 @@ de:
     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=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=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
@@ -4212,6 +4359,7 @@ 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=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
@@ -4228,6 +4376,7 @@ de:
     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
@@ -4236,6 +4385,7 @@ 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=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
@@ -4245,8 +4395,10 @@ de:
     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=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
@@ -4279,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=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
@@ -4340,6 +4493,7 @@ de:
     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
@@ -4352,6 +4506,7 @@ de:
     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
@@ -4361,6 +4516,7 @@ de:
     office=financial: DE:Tag:office=financial
     office=financial_advisor: DE:Tag:office=financial advisor
     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
@@ -4376,6 +4532,7 @@ de:
     office=physician: DE:Tag:office=physician
     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=security: DE:Tag:office=security
@@ -4385,6 +4542,7 @@ de:
     office=therapist: DE:Tag:office=therapist
     office=translator: DE:Tag:office=translator
     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
@@ -4402,7 +4560,7 @@ de:
     operator=stadtmobil: DE:Tag:operator=stadtmobil
     operator=teilAuto: DE:Tag:operator=teilAuto
     orchard=meadow_orchard: DE:Tag:orchard=meadow orchard
-    park_ride: DE:Tag:park ride
+    park_ride=hov: DE:Tag:park ride=hov
     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
@@ -4411,8 +4569,11 @@ de:
     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
+    piste:type=downhill: DE:Tag:piste:type=downhill
     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
@@ -4435,6 +4596,11 @@ de:
     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:source=battery: DE:Tag:plant:source=battery
     plant:source=biomass: DE:Tag:plant:source=biomass
@@ -4652,6 +4818,7 @@ de:
     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
@@ -4663,6 +4830,7 @@ de:
     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
@@ -4714,11 +4882,13 @@ de:
     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=plant_hire: DE:Tag:shop=plant hire
     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=repair: DE:Tag:shop=repair
@@ -4754,12 +4924,15 @@ de:
     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=windows: DE:Tag:shop=windows
     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
@@ -4798,6 +4971,7 @@ de:
     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
@@ -4811,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=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
@@ -4826,6 +5002,7 @@ de:
     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
@@ -4844,6 +5021,7 @@ de:
     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=water_ski: DE:Tag:sport=water ski
     sport=yoga: DE:Tag:sport=yoga
@@ -4890,6 +5068,7 @@ 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
+    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
     tomb=columbarium: DE:Tag:tomb=columbarium
@@ -4899,6 +5078,7 @@ de:
     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=vault: DE:Tag:tomb=vault
     tomb=war_grave: DE:Tag:tomb=war grave
@@ -4924,6 +5104,7 @@ de:
     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
@@ -4949,6 +5130,8 @@ de:
     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
@@ -4959,6 +5142,7 @@ de:
     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=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:103-10: DE:Tag:traffic sign=DE:103-10
@@ -4970,6 +5154,7 @@ de:
     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
@@ -5015,6 +5200,7 @@ de:
     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: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
@@ -5049,6 +5235,8 @@ de:
     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
     usage=branch: DE:Tag:usage=branch
@@ -5057,24 +5245,47 @@ de:
     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
+    utility=power: DE:Tag:utility=power
     vehicle=no: DE:Tag:vehicle=no
-    vending: DE:Tag:vending
+    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=art: DE:Tag:vending=art
     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=chemist: DE:Tag:vending=chemist
     vending=chewing_gums: DE:Tag:vending=chewing gums
+    vending=cigarettes: DE:Tag:vending=cigarettes
     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=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=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_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
@@ -5082,12 +5293,17 @@ de:
     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=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=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
@@ -5106,6 +5322,7 @@ de:
     waste=trash: DE:Tag:waste=trash
     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
@@ -5115,6 +5332,7 @@ de:
     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
@@ -5135,6 +5353,7 @@ de:
     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
@@ -5217,6 +5436,8 @@ en:
     CLC:code: Key:CLC:code
     Community: Key:Community
     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
@@ -5268,7 +5489,6 @@ en:
     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
@@ -5278,18 +5498,22 @@ en:
     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
+    abbr_name: Key:abbr name
     abutters: Key:abutters
     access: Key:access
     access:conditional: Key:access:conditional
     access:covid19: Key:access:covid19
+    access:delivery: Key:access:delivery
     access:lanes: Key:access:lanes
-    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
+    'addr:': 'Key:addr:'
     addr:*: Key:addr:*
     addr:TW:dataset: Key:addr:TW:dataset
     addr:alternatenumber: Key:addr:alternatenumber
@@ -5319,6 +5543,7 @@ en:
     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
@@ -5328,7 +5553,9 @@ en:
     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
@@ -5345,7 +5572,9 @@ en:
     addr:province:en: Key:addr:province:en
     addr:province:ur: Key:addr:province:ur
     addr:provisionalnumber: Key:addr:provisionalnumber
+    addr:quarter: Key:addr:quarter
     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
@@ -5354,6 +5583,7 @@ en:
     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:prefix: Key:addr:street:prefix
     addr:street:sym_ul: Key:addr:street:sym ul
@@ -5364,9 +5594,13 @@ en:
     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:village: Key:addr:village
+    addr:ward: Key:addr:ward
+    address: Key:address
     admin_level: Key:admin level
     admin_title: Key:admin title
     adr_les: Key:adr les
@@ -5376,6 +5610,7 @@ en:
     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
@@ -5383,6 +5618,7 @@ en:
     agrarian: Key:agrarian
     agricultural: Key:agricultural
     air_conditioning: Key:air conditioning
+    alcohol: Key:alcohol
     alt_name: Key:alt name
     alt_name:ar: Key:alt name:ar
     alt_name:arc: Key:alt name:arc
@@ -5394,6 +5630,7 @@ en:
     alt_name:es: Key:alt name:es
     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:gr: Key:alt name:gr
     alt_name:grc: Key:alt name:grc
@@ -5415,11 +5652,13 @@ en:
     alt_name:ur: Key:alt name:ur
     alt_name:zh: Key:alt name:zh
     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
+    announcement: Key:announcement
     app:*: Key:app:*
     aquaculture: Key:aquaculture
     archaeological_site: Key:archaeological site
@@ -5431,6 +5670,7 @@ en:
     area: Key:area
     area:aeroway: Key:area:aeroway
     area:highway: Key:area:highway
+    armrest: Key:armrest
     artist:note: Key:artist:note
     artist:wikidata: Key:artist:wikidata
     artist:wikipedia: Key:artist:wikipedia
@@ -5441,6 +5681,8 @@ en:
     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
@@ -5458,7 +5700,9 @@ en:
     atv:repair: Key:atv:repair
     atv:sales: Key:atv:sales
     authentication: Key:authentication
+    authentication:*: Key:authentication:*
     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
@@ -5469,6 +5713,7 @@ en:
     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
@@ -5476,6 +5721,7 @@ en:
     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
@@ -5484,6 +5730,7 @@ en:
     barrier:personnel: Key:barrier:personnel
     base_function: Key:base function
     baseball: Key:baseball
+    basilica: Key:basilica
     basin: Key:basin
     bath:type: Key:bath:type
     bbq:type: Key:bbq:type
@@ -5492,43 +5739,47 @@ en:
     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
+    bettundbike: Key:bettundbike
     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:description: Key:bicycle:description
     bicycle:designated:type: Key:bicycle:designated:type
     bicycle:forward: Key:bicycle:forward
     bicycle:left: Key:bicycle:left
     bicycle:oneway: Key:bicycle:oneway
+    bicycle:physical: Key:bicycle:physical
     bicycle:right: Key:bicycle:right
     bicycle:type: Key:bicycle:type
     bicycle_bypass: Key:bicycle bypass
     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
-    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
+    boot_scraper: Key:boot scraper
     booth: Key:booth
     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
@@ -5583,6 +5834,7 @@ en:
     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
@@ -5594,10 +5846,12 @@ en:
     building:material: Key:building:material
     building:max_level: Key:building:max 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:quake-resistant: Key:building:quake-resistant
     building:roof:colour: Key:building:roof:colour
     building:ruian:type: Key:building:ruian:type
     building:soft_storey: Key:building:soft storey
@@ -5611,6 +5865,7 @@ en:
     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:lanes:backward: Key:bus:lanes:backward
@@ -5624,7 +5879,6 @@ en:
     butcher: Key:butcher
     button_operated: Key:button operated
     bygningsnr: Key:bygningsnr
-    cabin:rental: Key:cabin:rental
     cabins: Key:cabins
     cable_number: Key:cable number
     cables: Key:cables
@@ -5633,23 +5887,33 @@ en:
     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
-    campers: Key:campers
     camping: Key:camping
     campwild: Key:campwild
     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:long: Key:capacity:long
     capacity:men: Key:capacity:men
+    capacity:motorcycle: Key:capacity:motorcycle
     capacity:parent: Key:capacity:parent
+    capacity:persons: Key:capacity:persons
+    capacity:rooms: Key:capacity:rooms
     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
+    car_parts: Key:car parts
     car_repair: Key:car repair
     car_wash: Key:car wash
     caravan: Key:caravan
@@ -5680,6 +5944,7 @@ en:
     cemetery: Key:cemetery
     cemt: Key:cemt
     census:population: Key:census:population
+    central_island:traversable: Key:central island:traversable
     centralkey: Key:centralkey
     change: Key:change
     change:lanes: Key:change:lanes
@@ -5705,7 +5970,6 @@ en:
     city_limit: Key:city limit
     clacks_overhead: Key:clacks overhead
     claimed_by: Key:claimed by
-    class: Key:class
     class:bicycle: Key:class:bicycle
     class:bicycle:commute: Key:class:bicycle:commute
     class:bicycle:mtb: Key:class:bicycle:mtb
@@ -5726,8 +5990,9 @@ en:
     coach: Key:coach
     coastline:survey_quality: Key:coastline:survey quality
     cocktails: Key:cocktails
-    coffee: Key:coffee
     collection_times: Key:collection times
+    collection_times:signed: Key:collection times:signed
+    collector: Key:collector
     colonnade: Key:colonnade
     color: Key:color
     colour: Key:colour
@@ -5735,6 +6000,7 @@ en:
     column:shape: Key:column:shape
     column:style: Key:column:style
     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
@@ -5747,11 +6013,14 @@ en:
     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: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:space: Key:communication:space
     communication:television: Key:communication:television
     community: Key:community
     community_centre: Key:community centre
@@ -5766,9 +6035,12 @@ en:
     connection_point: Key:connection point
     consecrated: Key:consecrated
     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_end_expected: Key:construction end expected
+    construction_date: Key:construction date
     construction_start_expected: Key:construction start expected
     consulate: Key:consulate
     consulting: Key:consulting
@@ -5815,10 +6087,12 @@ en:
     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
     couplings: Key:couplings
     courts: Key:courts
@@ -5839,6 +6113,7 @@ en:
     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
     cruising: Key:cruising
     cs_dir:backward: Key:cs dir:backward
@@ -5849,18 +6124,21 @@ en:
     currency:*: Key:currency:*
     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:XBT: Key:currency:XBT
+    currency:XLT: Key:currency:XLT
     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
+    customers: Key:customers
     cutting: Key:cutting
     cyclability: Key:cyclability
     cycle: Key:cycle
@@ -5874,19 +6152,26 @@ en:
     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:foot: Key:cycleway:foot
     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:separation: Key:cycleway:left:separation
     cycleway:left=backward: Key:cycleway:left=backward
+    cycleway:oneway: Key:cycleway:oneway
     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:separation: Key:cycleway:right:separation
     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
@@ -5895,9 +6180,11 @@ en:
     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
     de:amtlicher_gemeindeschluessel: Key:de:amtlicher gemeindeschluessel
     de:regionalschluessel: Key:de:regionalschluessel
@@ -5906,8 +6193,10 @@ en:
     default_language: Key:default language
     defensive_works: Key:defensive works
     deflection: Key:deflection
-    dehoga: Key:dehoga
     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
@@ -5919,7 +6208,9 @@ en:
     'demolition:': 'Key:demolition:'
     denomination: Key:denomination
     denotation: Key:denotation
+    department: Key:department
     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
@@ -5933,15 +6224,18 @@ en:
     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
+    destination:arrow:backward: Key:destination:arrow:backward
+    destination:arrow:forward: Key:destination:arrow:forward
     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
@@ -6015,6 +6309,7 @@ en:
     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
@@ -6028,8 +6323,13 @@ en:
     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_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
@@ -6046,14 +6346,19 @@ en:
     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
-    distillery: Key:distillery
     disused: Key:disused
     'disused:': 'Key:disused:'
     disused:*: Key:disused:*
     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
@@ -6065,7 +6370,9 @@ en:
     dock:height: Key:dock:height
     dock:width: Key:dock:width
     dog: Key:dog
+    dog_washing: Key:dog washing
     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
@@ -6076,7 +6383,6 @@ en:
     draft: Key:draft
     draisine: Key:draisine
     dress_code: Key:dress code
-    drink: Key:drink
     drink:*: Key:drink:*
     drink:afri-cola: Key:drink:afri-cola
     drink:beer: Key:drink:beer
@@ -6087,6 +6393,7 @@ en:
     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
@@ -6110,6 +6417,7 @@ en:
     earthquake:damage: Key:earthquake:damage
     easy_overtaking: Key:easy overtaking
     education: Key:education
+    education_program: Key:education program
     educational: Key:educational
     ekatte: Key:ekatte
     ele: Key:ele
@@ -6128,6 +6436,7 @@ en:
     email: Key:email
     embankment: Key:embankment
     embankment:side: Key:embankment:side
+    embankment:type: Key:embankment:type
     embassy: Key:embassy
     embedded: Key:embedded
     embedded_rails: Key:embedded rails
@@ -6136,15 +6445,19 @@ en:
     'emergency:': 'Key:emergency:'
     emergency:*: Key:emergency:*
     emergency:_prefix: 'Key:emergency: prefix'
+    emergency:amenity: Key:emergency:amenity
     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
+    end_date:edtf: Key:end date:edtf
     enforcement: Key:enforcement
     engineer: Key:engineer
     entidad_te: Key:entidad te
     entrance: Key:entrance
+    entrance:ramp: Key:entrance:ramp
     ephemeral: Key:ephemeral
     escooter: Key:escooter
     esr:user: Key:esr:user
@@ -6163,9 +6476,9 @@ en:
     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
-    factory: Key:factory
     fair_trade: Key:fair trade
     fallow: Key:fallow
     farming_system: Key:farming system
@@ -6175,6 +6488,7 @@ en:
     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
@@ -6197,13 +6511,17 @@ en:
     fine: Key:fine
     fire: Key:fire
     fire_boundary: Key:fire boundary
+    fire_class: Key:fire class
     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_path: Key:fire path
     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
@@ -6225,11 +6543,16 @@ en:
     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
+    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_traffic: Key:foot traffic
     footway: Key:footway
     footway:surface: Key:footway:surface
     for: Key:for
@@ -6292,18 +6615,22 @@ en:
     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
     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
+    gate:type: Key:gate:type
     gauge: Key:gauge
     gay: Key:gay
     gender: Key:gender
     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
@@ -6318,7 +6645,9 @@ en:
     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:storage: Key:generator:storage
     generator:type: Key:generator:type
     genus: Key:genus
     genus:ar: Key:genus:ar
@@ -6332,9 +6661,10 @@ en:
     geological: Key:geological
     geothermal: Key:geothermal
     geyser:type: Key:geyser:type
+    gift: Key:gift
     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
@@ -6342,12 +6672,15 @@ en:
     gnis:import_uuid: Key:gnis:import uuid
     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
+    graham: Key:graham
     grape_variety: Key:grape variety
     grassland: Key:grassland
+    grate: Key:grate
     green_roof: Key:green roof
     gritting: Key:gritting
     group_only: Key:group only
@@ -6364,6 +6697,7 @@ en:
     guide_type: Key:guide type
     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
@@ -6380,12 +6714,13 @@ en:
     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_type: Key:hazard type
     hazmat: Key:hazmat
     hazmat:explosive: Key:hazmat:explosive
     hazmat:water: Key:hazmat:water
@@ -6393,6 +6728,7 @@ en:
     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
@@ -6405,9 +6741,11 @@ en:
     hedge: Key:hedge
     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:website: Key:heritage:website
     hgv: Key:hgv
     hgv:national_network: Key:hgv:national network
     hgv_articulated: Key:hgv articulated
@@ -6415,6 +6753,7 @@ en:
     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
@@ -6427,11 +6766,13 @@ en:
     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
     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
@@ -6451,6 +6792,7 @@ en:
     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
     implicit: Key:implicit
@@ -6467,6 +6809,7 @@ en:
     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
     inlet: Key:inlet
@@ -6535,6 +6878,7 @@ en:
     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
@@ -6558,12 +6902,15 @@ en:
     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
+    landcover: Key:landcover
     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
@@ -6575,6 +6922,7 @@ en:
     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:arc: Key:language:arc
@@ -6598,6 +6946,8 @@ en:
     language:syc: Key:language:syc
     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
@@ -6610,6 +6960,7 @@ en:
     length: Key:length
     level: Key:level
     level:ref: Key:level:ref
+    levels: Key:levels
     lgbt: Key:lgbt
     lgbtq: Key:lgbtq
     lhv: Key:lhv
@@ -6620,6 +6971,7 @@ en:
     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
@@ -6627,6 +6979,7 @@ en:
     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
@@ -6635,6 +6988,7 @@ en:
     loc_name:es: Key:loc name:es
     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
@@ -6642,14 +6996,22 @@ en:
     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
+    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
+    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:arc: Key:long name:arc
@@ -6664,12 +7026,17 @@ en:
     long_name:sr: Key:long name:sr
     long_name:syc: Key:long name:syc
     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
+    lunch:*: Key:lunch:*
+    lunch:buffet: Key:lunch:buffet
+    lunch:menu: Key:lunch:menu
     lunch:specials: Key:lunch:specials
+    lwn: Key:lwn
     maaamet:ETAK: Key:maaamet:ETAK
     maintained: Key:maintained
     maintenance: Key:maintenance
@@ -6678,18 +7045,22 @@ en:
     managed: Key:managed
     manhole: Key:manhole
     manmade: Key:manmade
+    manual: Key:manual
     manufacturer: Key:manufacturer
     manufacturer:wikidata: Key:manufacturer:wikidata
     map_size: Key:map size
     map_type: Key:map type
     mapillary: Key:mapillary
     mapper: Key:mapper
+    marilyn: Key:marilyn
     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
+    mast:construction: Key:mast:construction
+    mast:type: Key:mast:type
     material: Key:material
     mattress: Key:mattress
     max_age: Key:max age
@@ -6710,6 +7081,7 @@ en:
     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
@@ -6717,18 +7089,20 @@ en:
     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:psv:conditional: Key:maxspeed:psv:conditional
-    maxspeed:seasonal:winter: Key:maxspeed:seasonal:winter
     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:wet: Key:maxspeed:wet
     maxstay: Key:maxstay
     maxstay:conditional: Key:maxstay:conditional
-    maxtents: Key:maxtents
     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
@@ -6764,7 +7138,6 @@ en:
     min_distance: Key:min distance
     min_height: Key:min height
     min_level: Key:min level
-    minage: Key:minage
     mindistance: Key:mindistance
     mineshaft_type: Key:mineshaft type
     minibus: Key:minibus
@@ -6773,6 +7146,7 @@ en:
     minweight: Key:minweight
     minweight:conditional: Key:minweight:conditional
     mml:class: Key:mml:class
+    mobile: Key:mobile
     model: Key:model
     model:wikidata: Key:model:wikidata
     model:wikipedia: Key:model:wikipedia
@@ -6824,7 +7198,6 @@ en:
     motorcycle:type: Key:motorcycle:type
     motorcycle:tyres: Key:motorcycle:tyres
     motorcycle_parking: Key:motorcycle parking
-    motorcycles: Key:motorcycles
     motorhome: Key:motorhome
     motorroad: Key:motorroad
     motorway: Key:motorway
@@ -6832,10 +7205,14 @@ en:
     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:type: Key:mtb:type
     mtb_scale: Key:mtb scale
+    munro: Key:munro
+    munro_number: Key:munro number
     museum: Key:museum
     museum:subject:wikidata: Key:museum:subject:wikidata
     museum_type: Key:museum type
@@ -6848,6 +7225,8 @@ en:
     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
@@ -6864,12 +7243,14 @@ en:
     name:az-Arab: Key:name:az-Arab
     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: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-Arab: Key:name:bn-Arab
@@ -6886,22 +7267,27 @@ en:
     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:clc: Key:name:clc
     name:co: Key:name:co
+    name:cr: Key:name:cr
     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:dak: Key:name:dak
     name:de: Key:name:de
     name:dsb: Key:name:dsb
     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:eo: Key:name:eo
@@ -6920,6 +7306,7 @@ en:
     name:fur: Key:name:fur
     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
@@ -6932,6 +7319,7 @@ en:
     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
@@ -7007,6 +7395,7 @@ en:
     name:lez: Key:name:lez
     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
@@ -7015,22 +7404,27 @@ en:
     name:lv: Key:name:lv
     name:mdf: Key:name:mdf
     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:mn: Key:name:mn
+    name:moe: Key:name:moe
     name:mos: Key:name:mos
     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:myv: Key:name:myv
     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
@@ -7039,9 +7433,11 @@ en:
     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: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
@@ -7058,7 +7454,9 @@ en:
     name:pih: Key:name:pih
     name:pjt: Key:name:pjt
     name:pl: Key:name:pl
+    name:pms: Key:name:pms
     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
@@ -7077,6 +7475,7 @@ en:
     name:rm: Key:name:rm
     name:rn: Key:name:rn
     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:rue: Key:name:rue
@@ -7098,9 +7497,11 @@ en:
     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:ss: Key:name:ss
@@ -7135,12 +7536,15 @@ en:
     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-Hani: Key:name:vi-Hani
     name:vls: Key:name:vls
     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:wo: Key:name:wo
     name:xmf: Key:name:xmf
@@ -7188,14 +7592,6 @@ en:
     nat_ref:ar: Key:nat ref:ar
     nat_ref:fr: Key:nat ref:fr
     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
@@ -7210,19 +7606,24 @@ en:
     network:fr: Key:network:fr
     network:grc: Key:network:grc
     network:guid: Key:network:guid
+    network:short: Key:network:short
     network:type: Key:network:type
     network:ur: Key:network:ur
     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:gnis_id: Key:nhd:gnis id
     nhd:reach_code: Key:nhd:reach code
-    no: Key:no
+    nickname: Key:nickname
     no-barnehage:nsrid: Key:no-barnehage:nsrid
     'no:': 'Key:no:'
+    no:*: Key:no:*
     noaddress: Key:noaddress
     noexit: Key:noexit
     nohousenumber: Key:nohousenumber
@@ -7234,7 +7635,6 @@ en:
     not:*: Key:not:*
     not:brand:wikidata: Key:not:brand:wikidata
     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
@@ -7249,8 +7649,9 @@ en:
     note:name: Key:note:name
     note:pilotage: Key:note:pilotage
     note:project_page: Key:note:project page
-    notes: Key:notes
     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:conditional: Key:nudism:conditional
     number_of_apartments: Key:number of apartments
@@ -7279,6 +7680,7 @@ en:
     official_name:es: Key:official name:es
     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:gr: Key:official name:gr
     official_name:grc: Key:official name:grc
@@ -7317,6 +7719,7 @@ en:
     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:ku-Arab: Key:old name:ku-Arab
@@ -7346,13 +7749,16 @@ en:
     oneway:taxi: Key:oneway:taxi
     onkz: Key:onkz
     ons_code: Key:ons code
+    openGeoDB:loc_id: Key:openGeoDB:loc id
     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_hours:*: Key:opening hours:*
     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
@@ -7424,7 +7830,9 @@ en:
     owner: Key:owner
     owner:wikidata: Key:owner:wikidata
     ownership: Key:ownership
+    panoramax: Key:panoramax
     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
@@ -7432,18 +7840,25 @@ en:
     park_ride: Key:park ride
     parking: Key:parking
     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: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
+    passenger_information_display:speech_output: Key:passenger information display:speech
+      output
     passenger_lines: Key:passenger lines
     passing_places: Key:passing places
-    paved: Key:paved
     paved:date: Key:paved:date
     paving_stones:colour: Key:paving stones:colour
     payment: Key:payment
@@ -7458,8 +7873,10 @@ en:
     payment:blik: Key:payment:blik
     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:coins:denominations: Key:payment:coins:denominations
@@ -7519,11 +7936,17 @@ en:
     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
+    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
+    phone:NL: Key:phone:NL
     phone:mnemonic: Key:phone:mnemonic
     photograph: Key:photograph
     photography: Key:photography
@@ -7551,14 +7974,17 @@ en:
     placement:forward: Key:placement:forward
     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: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: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
@@ -7568,6 +7994,14 @@ en:
     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
     playability: Key:playability
     playground: Key:playground
@@ -7577,6 +8011,7 @@ en:
     pmfsefin:idedif: Key:pmfsefin:idedif
     point: Key:point
     pole: Key:pole
+    poles: Key:poles
     police: Key:police
     political_division: Key:political division
     political_party: Key:political party
@@ -7586,6 +8021,7 @@ en:
     population_rank: Key:population rank
     port: Key:port
     position: Key:position
+    position:heading: Key:position:heading
     post_box:design: Key:post box:design
     post_box:mounting: Key:post box:mounting
     post_box:type: Key:post box:type
@@ -7603,9 +8039,6 @@ en:
     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
@@ -7613,6 +8046,7 @@ en:
     produce: Key:produce
     product: Key:product
     project:eurosha_2012: Key:project:eurosha 2012
+    prominence: Key:prominence
     proposed: Key:proposed
     proposed:*: Key:proposed:*
     proposed:highway: Key:proposed:highway
@@ -7622,7 +8056,6 @@ en:
     protection_title: Key:protection title
     provided_for: Key:provided for
     prow_ref: Key:prow ref
-    pruning: Key:pruning
     psv: Key:psv
     psv:lanes: Key:psv:lanes
     psv:lanes:backward: Key:psv:lanes:backward
@@ -7648,11 +8081,13 @@ en:
     radio_transponder:signal_frequency: Key:radio transponder:signal frequency
     railing: Key:railing
     railway: Key:railway
+    railway:asfa: Key:railway:asfa
     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:position:exact: Key:railway:position:exact
     railway:preserved: Key:railway:preserved
     railway:ref: Key:railway:ref
     railway:scmt: Key:railway:scmt
@@ -7669,6 +8104,11 @@ en:
     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
@@ -7676,6 +8116,7 @@ en:
     'razed:': 'Key:razed:'
     razed:*: Key:razed:*
     razed:building: Key:razed:building
+    razed:railway: Key:razed:railway
     rcn: Key:rcn
     rcn_ref: Key:rcn ref
     real_ale: Key:real ale
@@ -7686,6 +8127,7 @@ en:
     recreation_ground: Key:recreation ground
     recycling:PET: Key:recycling:PET
     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
@@ -7696,15 +8138,16 @@ en:
     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
+    ref:BLfD: Key:ref:BLfD
+    ref:BRN: Key:ref:BRN
     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
@@ -7717,9 +8160,11 @@ en:
     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:FreeMobile: Key:ref:FR:FreeMobile
     ref:FR:INSEE: Key:ref:FR:INSEE
     ref:FR:IRVE: Key:ref:FR:IRVE
     ref:FR:Joconde: Key:ref:FR:Joconde
@@ -7737,20 +8182,26 @@ en:
     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: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: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: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:INEP: Key:ref:INEP
@@ -7766,11 +8217,13 @@ en:
     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
@@ -7782,11 +8235,17 @@ en:
     '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: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:VE:UBIGEO: Key:ref:VE:UBIGEO
     ref:WDPA: Key:ref:WDPA
+    ref:alp: Key:ref:alp
     ref:ar: Key:ref:ar
     ref:arc: Key:ref:arc
     ref:at:bda: Key:ref:at:bda
@@ -7803,8 +8262,10 @@ en:
     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:codcat: Key:ref:codcat
     ref:color: Key:ref:color
     ref:colour: Key:ref:colour
     ref:coop: Key:ref:coop
@@ -7823,6 +8284,7 @@ en:
     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:gr: Key:ref:gr
     ref:grc: Key:ref:grc
@@ -7835,11 +8297,14 @@ en:
     ref:herbarium: Key:ref:herbarium
     ref:hmdb: Key:ref:hmdb
     ref:hsmaq: Key:ref:hsmaq
+    ref:ico: Key:ref:ico
     ref:industrial: Key:ref:industrial
     ref:ine: Key:ref:ine
     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
@@ -7860,10 +8325,12 @@ en:
     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: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
@@ -7878,6 +8345,7 @@ en:
     ref:siri-sx: Key:ref:siri-sx
     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:ssb_tettsted: Key:ref:ssb tettsted
@@ -7887,14 +8355,18 @@ en:
     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:veiligheidsregiocode: Key:ref:veiligheidsregiocode
     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:woonplaatscode: Key:ref:woonplaatscode
     ref:wpi: Key:ref:wpi
     ref:zsj: Key:ref:zsj
     ref_name: Key:ref name
@@ -7925,6 +8397,7 @@ en:
     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
@@ -7936,6 +8409,8 @@ en:
     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
@@ -7958,7 +8433,6 @@ en:
     roof:orientation: Key:roof:orientation
     roof:ridge: Key:roof:ridge
     roof:shape: Key:roof:shape
-    rooftop: Key:rooftop
     room: Key:room
     rooms: Key:rooms
     rotor:diameter: Key:rotor:diameter
@@ -7966,6 +8440,7 @@ en:
     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
@@ -7975,14 +8450,17 @@ en:
     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
+    rubber_tires: Key:rubber tires
     ruined: Key:ruined
     'ruined:': 'Key:ruined:'
     ruined:*: Key:ruined:*
+    ruined:building: Key:ruined:building
     ruins: Key:ruins
     'ruins:': 'Key:ruins:'
     ruins:*: Key:ruins:*
@@ -7997,6 +8475,7 @@ en:
     safety_rope_side: Key:safety rope side
     sagns_id: Key:sagns id
     sailboat: Key:sailboat
+    sales: Key:sales
     salt: Key:salt
     sample_collection: Key:sample collection
     sanitary_dump_station: Key:sanitary dump station
@@ -8008,6 +8487,7 @@ en:
     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
@@ -8017,6 +8497,7 @@ en:
     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
@@ -8216,30 +8697,98 @@ en:
     segregated: Key:segregated
     self_checkout: Key:self checkout
     self_service: Key:self service
+    sells: Key:sells
     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: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:sales: Key:service:bicycle:sales
     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: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: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:wheelchair: Key:service times:wheelchair
+    settlement:origin: Key:settlement:origin
     settlement_type: Key:settlement type
     seveso: Key:seveso
     shade: Key:shade
+    shape: Key:shape
     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
@@ -8252,6 +8801,7 @@ en:
     short_name:es: Key:short name:es
     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
@@ -8283,7 +8833,6 @@ en:
     siren:purpose: Key:siren:purpose
     siren:type: Key:siren:type
     site: Key:site
-    site_type: Key:site type
     size: Key:size
     ski: Key:ski
     sl_realtime: Key:sl realtime
@@ -8303,8 +8852,13 @@ en:
     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: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:type2:output: Key:socket:type2:output
@@ -8421,10 +8975,12 @@ en:
     source:zoomlevel: Key:source:zoomlevel
     source_date: Key:source date
     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
@@ -8453,6 +9009,7 @@ en:
     standing: Key:standing
     stars: Key:stars
     start_date: Key:start date
+    start_date:edtf: Key:start date:edtf
     state: Key:state
     station: Key:station
     statue: Key:statue
@@ -8460,7 +9017,6 @@ en:
     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
@@ -8492,6 +9048,7 @@ en:
     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
@@ -8588,7 +9145,6 @@ en:
     to:ug: Key:to:ug
     to:ur: Key:to:ur
     tobacco: Key:tobacco
-    todo: Key:todo
     toilets: Key:toilets
     toilets:paper_supplied: Key:toilets:paper supplied
     toilets:unisex: Key:toilets:unisex
@@ -8603,10 +9159,12 @@ en:
     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
+    towpath: Key:towpath
     tracks: Key:tracks
     tracktype: Key:tracktype
     traffic: Key:traffic
@@ -8646,6 +9204,9 @@ en:
     trolley:deposit: Key:trolley:deposit
     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
@@ -8686,7 +9247,11 @@ en:
     unit: Key:unit
     unsigned: Key:unsigned
     unsigned_ref: Key:unsigned ref
+    urban: Key:urban
     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
     us:ny:swis: Key:us:ny:swis
     usage: Key:usage
@@ -8696,7 +9261,7 @@ en:
     vaccination: Key:vaccination
     vacuum_cleaner: Key:vacuum cleaner
     validate:ants:yellow: Key:validate:ants:yellow
-    validate:no_name: Key:validate:no name
+    valley: Key:valley
     valve: Key:valve
     vegan: Key:vegan
     vegetarian: Key:vegetarian
@@ -8706,6 +9271,7 @@ en:
     vehicle:wikipedia: Key:vehicle:wikipedia
     vending: Key:vending
     verge: Key:verge
+    vessel: Key:vessel
     vhf: Key:vhf
     via: Key:via
     via_ferrata_scale: Key:via ferrata scale
@@ -8719,10 +9285,14 @@ en:
     voltage:secondary: Key:voltage:secondary
     voltage:tertiary: Key:voltage:tertiary
     walk-in: Key:walk-in
+    walkup_window: Key:walkup window
     wall: Key:wall
     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
@@ -8734,9 +9304,10 @@ en:
     water_system: Key:water system
     water_well: Key:water well
     waterway: Key:waterway
-    waterway:type: Key:waterway:type
     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
@@ -8750,6 +9321,7 @@ en:
     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
@@ -8785,11 +9357,8 @@ en:
     windmill:type: Key:windmill:type
     windmill:vanes: Key:windmill:vanes
     window: Key:window
-    wine:grape: Key:wine:grape
+    windows: Key:windows
     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
@@ -8832,6 +9401,7 @@ en:
     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
     abutters=retail: Tag:abutters=retail
@@ -8911,6 +9481,11 @@ en:
     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=aircraft_crossing: Tag:aeroway=aircraft crossing
     aeroway=airport: Tag:aeroway=airport
@@ -8918,6 +9493,8 @@ en:
     aeroway=airtanker_base: Tag:aeroway=airtanker base
     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
@@ -8928,6 +9505,7 @@ en:
     aeroway=holding_position_line: Tag:aeroway=holding position line
     aeroway=jet_bridge: Tag:aeroway=jet bridge
     aeroway=landingpad: Tag:aeroway=landingpad
+    aeroway=launch_complex: Tag:aeroway=launch complex
     aeroway=launchpad: Tag:aeroway=launchpad
     aeroway=navigationaid: Tag:aeroway=navigationaid
     aeroway=papi: Tag:aeroway=papi
@@ -8938,8 +9516,11 @@ en:
     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
+    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
@@ -8971,6 +9552,7 @@ en:
     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=binoculars: Tag:amenity=binoculars
@@ -9061,6 +9643,8 @@ en:
     amenity=financial_advice: Tag:amenity=financial advice
     amenity=fire_hydrant: Tag:amenity=fire hydrant
     amenity=fire_station: Tag:amenity=fire station
+    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
@@ -9094,6 +9678,7 @@ en:
     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
@@ -9101,6 +9686,7 @@ en:
     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=library_dropoff: Tag:amenity=library dropoff
@@ -9121,6 +9707,7 @@ en:
     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
@@ -9238,6 +9825,7 @@ en:
     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
@@ -9260,9 +9848,15 @@ en:
     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
@@ -9275,6 +9869,7 @@ en:
     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
@@ -9287,17 +9882,25 @@ en:
     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=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
+    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
+    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
@@ -9348,10 +9951,12 @@ en:
     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=dug-in_tyres: Tag:barrier=dug-in tyres
     barrier=embankment: Tag:barrier=embankment
     barrier=entrance: Tag:barrier=entrance
     barrier=fence: Tag:barrier=fence
@@ -9396,6 +10001,8 @@ en:
     barrier=wall: Tag:barrier=wall
     barrier=wedge: Tag:barrier=wedge
     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
     basin=aeration: Tag:basin=aeration
@@ -9406,23 +10013,34 @@ en:
     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=lake: Tag:bath:type=lake
     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
+    beacon:type=DME: Tag:beacon:type=DME
     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=OM: Tag:beacon:type=OM
     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:forward=optional_sidepath: Tag:bicycle:forward=optional sidepath
     bicycle:forward=use_sidepath: Tag:bicycle:forward=use sidepath
-    bicycle:type=logistics: Tag:bicycle:type=logistics
     bicycle=designated: Tag:bicycle=designated
     bicycle=dismount: Tag:bicycle=dismount
     bicycle=no: Tag:bicycle=no
@@ -9434,6 +10052,8 @@ en:
     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
@@ -9449,7 +10069,6 @@ en:
     books=comic: Tag:books=comic
     books=textbook: Tag:books=textbook
     border_type=eez: Tag:border type=eez
-    border_type=harbour_limits: Tag:border type=harbour limits
     border_type=nation: Tag:border type=nation
     border_zone=5km_zone: Tag:border zone=5km zone
     boules=bocce: Tag:boules=bocce
@@ -9487,6 +10106,7 @@ 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=statistical: Tag:boundary=statistical
     boundary=timezone: Tag:boundary=timezone
     boundary=treaty: Tag:boundary=treaty
     boundary=urban: Tag:boundary=urban
@@ -9529,13 +10149,16 @@ en:
     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
     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=warehouse: Tag:building:use=warehouse
     building=*: Tag:building=*
     building=Y: Tag:building=Y
     building=abandoned: Tag:building=abandoned
@@ -9544,7 +10167,9 @@ en:
     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
@@ -9568,7 +10193,9 @@ en:
     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=damaged: Tag:building=damaged
     building=data_center: Tag:building=data center
     building=data_centre: Tag:building=data centre
     building=demountable: Tag:building=demountable
@@ -9584,6 +10211,7 @@ en:
     building=farm_auxiliary: Tag:building=farm auxiliary
     building=fire_lookout: Tag:building=fire lookout
     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
@@ -9592,6 +10220,7 @@ en:
     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
@@ -9611,6 +10240,7 @@ en:
     building=kingdom_hall: Tag:building=kingdom hall
     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
@@ -9618,6 +10248,7 @@ en:
     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
@@ -9666,6 +10297,7 @@ en:
     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
@@ -9678,14 +10310,17 @@ en:
     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=wayside_shrine: Tag:building=wayside shrine
     building=windmill: Tag:building=windmill
     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=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
@@ -9718,6 +10353,7 @@ en:
     camra=yes: Tag:camra=yes
     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
@@ -9725,6 +10361,7 @@ en:
     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
@@ -9737,12 +10374,15 @@ en:
     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=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=luxury: Tag:clothes=luxury
     clothes=motorcycle: Tag:clothes=motorcycle
@@ -9756,9 +10396,11 @@ en:
     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=art: Tag:club=art
     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
@@ -9779,6 +10421,7 @@ en:
     club=scuba_diving: Tag:club=scuba diving
     club=social: Tag:club=social
     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
@@ -9787,17 +10430,26 @@ en:
     coastline:survey_quality=inadequate: Tag:coastline:survey quality=inadequate
     coastline=bogus: Tag:coastline=bogus
     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
     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=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
@@ -9814,6 +10466,7 @@ en:
     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
@@ -9829,6 +10482,7 @@ en:
     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=manure: Tag:content=manure
     content=natural_gas: Tag:content=natural gas
@@ -9844,6 +10498,7 @@ en:
     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
@@ -9858,6 +10513,7 @@ en:
     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
@@ -9894,6 +10550,7 @@ en:
     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=lapidary: Tag:craft=lapidary
     craft=leather: Tag:craft=leather
@@ -9909,6 +10566,7 @@ en:
     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
@@ -9934,6 +10592,7 @@ en:
     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
@@ -9950,6 +10609,7 @@ en:
     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
+    crematorium=pet: Tag:crematorium=pet
     crop=asparagus: Tag:crop=asparagus
     crop=aspargus: Tag:crop=aspargus
     crop=bananas: Tag:crop=bananas
@@ -9977,6 +10637,10 @@ en:
     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
@@ -9987,7 +10651,9 @@ en:
     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=beef_bowl: Tag:cuisine=beef bowl
@@ -10012,12 +10678,14 @@ en:
     cuisine=fish_and_chips: Tag:cuisine=fish and chips
     cuisine=french: Tag:cuisine=french
     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
@@ -10038,13 +10706,16 @@ en:
     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=teahouse: Tag:cuisine=teahouse
@@ -10054,13 +10725,16 @@ en:
     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
     cycle_network=BE-VLG:cycle_highway: Tag:cycle network=BE-VLG:cycle highway
     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
@@ -10075,6 +10749,7 @@ en:
     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
@@ -10111,7 +10786,11 @@ en:
     cycleway=shared_busway: Tag:cycleway=shared busway
     cycleway=shared_lane: Tag:cycleway=shared lane
     cycleway=sidepath: Tag:cycleway=sidepath
+    cycleway=sidewalk: Tag:cycleway=sidewalk
     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
@@ -10121,6 +10800,7 @@ en:
     delivery=shipment: Tag:delivery=shipment
     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
@@ -10138,13 +10818,17 @@ en:
     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=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
     diet:kosher=only: Tag:diet:kosher=only
     diet:kosher=yes: Tag:diet:kosher=yes
@@ -10161,8 +10845,12 @@ en:
     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
@@ -10171,8 +10859,10 @@ en:
     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
@@ -10197,9 +10887,13 @@ en:
     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=bleed_control_kit: Tag:emergency=bleed control kit
     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=designated: Tag:emergency=designated
@@ -10210,6 +10904,7 @@ en:
     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
@@ -10218,6 +10913,7 @@ en:
     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_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
@@ -10237,6 +10933,7 @@ en:
     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=shower: Tag:emergency=shower
     emergency=siamese: Tag:emergency=siamese
@@ -10246,11 +10943,14 @@ en:
     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
+    entrance=entrance: Tag:entrance=entrance
     entrance=exit: Tag:entrance=exit
     entrance=fire_exit: Tag:entrance=fire exit
     entrance=garage: Tag:entrance=garage
@@ -10261,7 +10961,6 @@ en:
     entrance=shop: Tag:entrance=shop
     entrance=staircase: Tag:entrance=staircase
     entrance=yes: Tag:entrance=yes
-    esperanto=esperanto: Tag:esperanto=esperanto
     esperanto=yes: Tag:esperanto=yes
     exit=emergency: Tag:exit=emergency
     faculty=aerospace: Tag:faculty=aerospace
@@ -10280,8 +10979,20 @@ en:
     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=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
@@ -10324,6 +11035,7 @@ en:
     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
@@ -10331,10 +11043,12 @@ en:
     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=monastery: Tag:garden:type=monastery
     generator:method=anaerobic_digestion: Tag:generator:method=anaerobic digestion
@@ -10352,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: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
@@ -10370,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: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
@@ -10378,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=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
@@ -10386,15 +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=water_wheel: Tag:generator:type=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=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=rock: Tag:glacier:type=rock
     glideslope=yes: Tag:glideslope=yes
     golf=bunker: Tag:golf=bunker
     golf=cartpath: Tag:golf=cartpath
@@ -10416,12 +11154,18 @@ en:
     government=audit: Tag:government=audit
     government=bailiff: Tag:government=bailiff
     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=culture: Tag:government=culture
     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=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
@@ -10429,10 +11173,15 @@ en:
     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
+    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
     handle=crank: Tag:handle=crank
     handle=lever: Tag:handle=lever
@@ -10470,6 +11219,8 @@ en:
     hazard=electricity: Tag:hazard=electricity
     hazard=emergency_vehicles: Tag:hazard=emergency vehicles
     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
@@ -10493,6 +11244,7 @@ en:
     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=traffic_signals: Tag:hazard=traffic signals
     hazard=turn: Tag:hazard=turn
@@ -10509,6 +11261,8 @@ en:
     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
@@ -10521,6 +11275,7 @@ en:
     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
@@ -10532,6 +11287,7 @@ en:
       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
@@ -10578,6 +11334,8 @@ en:
     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
@@ -10623,13 +11381,15 @@ en:
     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=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=bazaar: Tag:highway=bazaar
     highway=bridleway: Tag:highway=bridleway
     highway=bus_guideway: Tag:highway=bus guideway
     highway=bus_stop: Tag:highway=bus stop
@@ -10649,7 +11409,6 @@ en:
     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=living_street: Tag:highway=living street
     highway=milestone: Tag:highway=milestone
     highway=mini_roundabout: Tag:highway=mini roundabout
@@ -10666,6 +11425,7 @@ en:
     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
@@ -10676,12 +11436,10 @@ en:
     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=stop: Tag:highway=stop
-    highway=street: Tag:highway=street
     highway=street_lamp: Tag:highway=street lamp
     highway=tertiary: Tag:highway=tertiary
     highway=tertiary_link: Tag:highway=tertiary link
@@ -10723,25 +11481,30 @@ en:
     historic=citywalls: Tag:historic=citywalls
     historic=creamery: Tag:historic=creamery
     historic=district: Tag:historic=district
-    historic=event: Tag:historic=event
     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=high_cross: Tag:historic=high cross
     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=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=meteor_crater: Tag:historic=meteor crater
     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=mosque: Tag:historic=mosque
     historic=ogham_stone: Tag:historic=ogham stone
     historic=optical_telegraph: Tag:historic=optical telegraph
     historic=pa: Tag:historic=pa
@@ -10754,8 +11517,11 @@ en:
     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=temple: Tag:historic=temple
     historic=tomb: Tag:historic=tomb
     historic=tower: Tag:historic=tower
     historic=tree_shrine: Tag:historic=tree shrine
@@ -10794,6 +11560,7 @@ en:
     indoor=wall: Tag:indoor=wall
     indoor=yes: Tag:indoor=yes
     indoormark=beacon: Tag:indoormark=beacon
+    industrial=aerospace: Tag:industrial=aerospace
     industrial=aluminium_smelting: Tag:industrial=aluminium smelting
     industrial=asphalt_plant: Tag:industrial=asphalt plant
     industrial=auto_wrecker: Tag:industrial=auto wrecker
@@ -10817,7 +11584,6 @@ en:
     industrial=heating_station: Tag:industrial=heating station
     industrial=ice_factory: Tag:industrial=ice factory
     industrial=integrated_circuit: Tag:industrial=integrated circuit
-    industrial=logistics: Tag:industrial=logistics
     industrial=machine_shop: Tag:industrial=machine shop
     industrial=metal_processing: Tag:industrial=metal processing
     industrial=mine: Tag:industrial=mine
@@ -10829,6 +11595,7 @@ en:
     industrial=recycling: Tag:industrial=recycling
     industrial=refinery: Tag:industrial=refinery
     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
@@ -10869,6 +11636,7 @@ en:
     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
@@ -10881,6 +11649,7 @@ en:
     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
@@ -10924,6 +11693,7 @@ en:
     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
@@ -10932,6 +11702,7 @@ en:
     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
@@ -10961,6 +11732,7 @@ en:
     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
@@ -10981,6 +11753,7 @@ en:
     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
@@ -10997,6 +11770,7 @@ en:
     landuse=yes: Tag:landuse=yes
     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
@@ -11042,6 +11816,7 @@ en:
     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=hot_tub: Tag:leisure=hot tub
@@ -11103,6 +11878,14 @@ en:
     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
@@ -11119,19 +11902,25 @@ en:
     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=roof: Tag:location=roof
+    location=rooftop: Tag:location=rooftop
     location=surface: Tag:location=surface
     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
     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
@@ -11140,9 +11929,11 @@ en:
     man_made=basin: Tag:man made=basin
     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
@@ -11151,19 +11942,21 @@ en:
     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=chute_block: Tag:man made=chute block
     man_made=clarifier: Tag:man made=clarifier
     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=compressor: Tag:man made=compressor
     man_made=cooling: Tag:man made=cooling
     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=cricket_nets: Tag:man made=cricket nets
     man_made=cross: Tag:man made=cross
     man_made=cut_line: Tag:man made=cut line
     man_made=cutline: Tag:man made=cutline
@@ -11172,6 +11965,7 @@ 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=duck_decoy: Tag:man made=duck decoy
     man_made=dyke: Tag:man made=dyke
     man_made=embankment: Tag:man made=embankment
     man_made=excavation: Tag:man made=excavation
@@ -11180,10 +11974,13 @@ en:
     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=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=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
@@ -11198,6 +11995,7 @@ en:
     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=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
@@ -11205,11 +12003,14 @@ en:
     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=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=mountaineers_mailbox: Tag:man made=mountaineers mailbox
@@ -11223,6 +12024,7 @@ en:
     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
@@ -11231,16 +12033,20 @@ 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=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=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=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=slurry_basin: Tag:man made=slurry basin
@@ -11249,6 +12055,7 @@ en:
     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=stupa: Tag:man made=stupa
@@ -11266,9 +12073,11 @@ en:
     man_made=torii: Tag:man made=torii
     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=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
@@ -11283,6 +12092,7 @@ en:
     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
@@ -11298,17 +12108,31 @@ en:
     material=epoxy: Tag:material=epoxy
     material=paving_stones: Tag:material=paving stones
     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
+    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_system:western=yes: Tag:medical system:western=yes
     megalith_type=alignment: Tag:megalith type=alignment
@@ -11338,6 +12162,7 @@ en:
     memorial=cross: Tag:memorial=cross
     memorial=flood_mark: Tag:memorial=flood mark
     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
@@ -11356,12 +12181,14 @@ en:
     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=depot: Tag:military=depot
     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
@@ -11376,6 +12203,7 @@ en:
     military_service=marines: Tag:military service=marines
     military_service=navy: Tag:military service=navy
     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
@@ -11387,12 +12215,13 @@ en:
     mooring=spm: Tag:mooring=spm
     mooring=visitor: Tag:mooring=visitor
     moped=use_sidepath: Tag:moped=use sidepath
+    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:type=electric: Tag:motorcycle:type=electric
-    motorcycle:type=sportbike: Tag:motorcycle:type=sportbike
     motorcycle=no: Tag:motorcycle=no
     motorcycle=yes: Tag:motorcycle=yes
     motorroad=no: Tag:motorroad=no
@@ -11447,7 +12276,9 @@ en:
     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=caldera: Tag:natural=caldera
     natural=cape: Tag:natural=cape
     natural=cave_entrance: Tag:natural=cave entrance
     natural=cliff: Tag:natural=cliff
@@ -11472,6 +12303,7 @@ en:
     natural=gorge: Tag:natural=gorge
     natural=grass: Tag:natural=grass
     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
@@ -11484,6 +12316,7 @@ en:
     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=mountain_range: Tag:natural=mountain range
@@ -11527,6 +12360,9 @@ en:
     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
     network:type=node_network: Tag:network:type=node network
@@ -11549,6 +12385,7 @@ en:
     network=ETS: Tag:network=ETS
     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=NL:A: Tag:network=NL:A
     network=NL:N: Tag:network=NL:N
@@ -11579,9 +12416,11 @@ en:
     network=US:AR: Tag:network=US:AR
     network=US:AS: Tag:network=US:AS
     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:CR: Tag:network=US:CA:CR
@@ -11736,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: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
@@ -11748,6 +12588,7 @@ 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: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
@@ -11755,6 +12596,8 @@ en:
     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:primary: Tag:network=US:TN:primary
@@ -11828,6 +12671,7 @@ en:
     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
@@ -11871,10 +12715,13 @@ en:
     office=harbour_master: Tag:office=harbour master
     office=healthcare: Tag:office=healthcare
     office=highway: Tag:office=highway
+    office=information: Tag:office=information
     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=lifeguard: Tag:office=lifeguard
     office=logistics: Tag:office=logistics
     office=lost_property: Tag:office=lost property
     office=medical: Tag:office=medical
@@ -11899,6 +12746,7 @@ en:
     office=religion: Tag:office=religion
     office=rental: Tag:office=rental
     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
@@ -11939,6 +12787,7 @@ en:
     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
@@ -11966,6 +12815,7 @@ en:
     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: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
@@ -11976,6 +12826,8 @@ en:
     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
@@ -12000,6 +12852,7 @@ en:
     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
@@ -12019,6 +12872,7 @@ en:
     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
@@ -12034,28 +12888,40 @@ en:
     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
+    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=fission: Tag:plant:method=fission
     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=wind_turbine: Tag:plant:method=wind turbine
     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=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=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: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
     playground=balancebeam: Tag:playground=balancebeam
@@ -12073,6 +12939,7 @@ en:
     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
@@ -12089,6 +12956,7 @@ en:
     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
@@ -12107,7 +12975,6 @@ en:
     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
@@ -12131,6 +12998,8 @@ en:
     priority=regional: Tag:priority=regional
     prison_camp=concentration_camp: Tag:prison camp=concentration camp
     prison_camp=extermination_camp: Tag:prison camp=extermination camp
+    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
@@ -12151,6 +13020,7 @@ en:
     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
@@ -12161,6 +13031,7 @@ en:
     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
@@ -12203,11 +13074,11 @@ en:
     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=border: Tag:railway=border
     railway=buffer_stop: Tag:railway=buffer stop
+    railway=construction: Tag:railway=construction
     railway=crossing: Tag:railway=crossing
     railway=crossing_box: Tag:railway=crossing box
     railway=crossing_controller: Tag:railway=crossing controller
@@ -12225,6 +13096,7 @@ en:
     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
@@ -12271,6 +13143,7 @@ en:
     religion=none: Tag:religion=none
     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
@@ -12288,11 +13161,14 @@ en:
     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=irregular_settlement: Tag:residential=irregular settlement
     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
@@ -12301,22 +13177,38 @@ en:
     resource=coal: Tag:resource=coal
     resource=gravel: Tag:resource=gravel
     resource=sand: Tag:resource=sand
+    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
     roller_coaster=station: Tag:roller coaster=station
     roller_coaster=support: Tag:roller coaster=support
     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=atv: Tag:route=atv
     route=bicycle: Tag:route=bicycle
@@ -12358,6 +13250,11 @@ en:
     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
     school:gender=female: Tag:school:gender=female
     school:gender=male: Tag:school:gender=male
@@ -12545,27 +13442,17 @@ en:
     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:landmark:category=cairn: Tag:seamark:landmark:category=cairn
     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=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=flagstaff: Tag:seamark:landmark:category=flagstaff
     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=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=spire: Tag:seamark:landmark:category=spire
     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=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
@@ -12776,6 +13663,7 @@ en:
     seamark:type=pipeline_submarine: Tag:seamark:type=pipeline submarine
     seamark:type=platform: Tag:seamark:type=platform
     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
@@ -12839,12 +13727,15 @@ en:
     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=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=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=_business_machines: Tag:shop= business machines
     shop=accessories: Tag:shop=accessories
     shop=adult: Tag:shop=adult
     shop=agrarian: Tag:shop=agrarian
@@ -12869,7 +13760,6 @@ en:
     shop=beverages: Tag:shop=beverages
     shop=bicycle: Tag:shop=bicycle
     shop=bicycle_repair: Tag:shop=bicycle repair
-    shop=board: Tag:shop=board
     shop=boat: Tag:shop=boat
     shop=boat_parts: Tag:shop=boat parts
     shop=boat_repair: Tag:shop=boat repair
@@ -12880,6 +13770,7 @@ en:
     shop=building_materials: Tag:shop=building materials
     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
@@ -12890,6 +13781,7 @@ en:
     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
@@ -12897,6 +13789,7 @@ en:
     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
@@ -12921,7 +13814,7 @@ en:
     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
@@ -12931,12 +13824,11 @@ en:
     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_accesories: Tag:shop=fashion accesories
     shop=fashion_accessories: Tag:shop=fashion accessories
     shop=fast_food: Tag:shop=fast food
-    shop=firearms: Tag:shop=firearms
     shop=fireplace: Tag:shop=fireplace
     shop=fireworks: Tag:shop=fireworks
     shop=fish: Tag:shop=fish
@@ -12959,6 +13851,7 @@ en:
     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
@@ -13004,10 +13897,12 @@ en:
     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=leatherworking: Tag:shop=leatherworking
     shop=lighting: Tag:shop=lighting
     shop=locksmith: Tag:shop=locksmith
     shop=lottery: Tag:shop=lottery
@@ -13019,6 +13914,7 @@ en:
     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
@@ -13041,6 +13937,7 @@ en:
     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_power_equipment: Tag:shop=outdoor power equipment
     shop=outpost: Tag:shop=outpost
@@ -13049,6 +13946,7 @@ en:
     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
@@ -13058,8 +13956,11 @@ en:
     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=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
@@ -13072,19 +13973,23 @@ en:
     shop=repair: Tag:shop=repair
     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=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=smartshop: Tag:shop=smartshop
     shop=snack: Tag:shop=snack
     shop=snowmobile: Tag:shop=snowmobile
     shop=solarium: Tag:shop=solarium
@@ -13129,6 +14034,7 @@ en:
     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=wellness: Tag:shop=wellness
@@ -13180,10 +14086,13 @@ en:
     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=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
@@ -13193,7 +14102,12 @@ en:
     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=Đ•Đ“Đ Đť: Tag:source:addr=Đ•Đ“Đ Đť
     source:ele=barometric: Tag:source:ele=barometric
     source:geometry=ACT2016: Tag:source:geometry=ACT2016
     source:geometry=ACTMapiRoads: Tag:source:geometry=ACTMapiRoads
@@ -13210,10 +14124,14 @@ en:
     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=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: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
@@ -13226,6 +14144,7 @@ en:
     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=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
@@ -13266,6 +14185,7 @@ en:
     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
@@ -13277,11 +14197,13 @@ en:
     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=calisthenics: Tag:sport=calisthenics
     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
@@ -13325,8 +14247,10 @@ en:
     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=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
@@ -13399,12 +14323,14 @@ en:
     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=touch_football: Tag:sport=touch football
     sport=trampoline: Tag:sport=trampoline
     sport=trugo: Tag:sport=trugo
     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
@@ -13423,12 +14349,21 @@ en:
     station=monorail: Tag:station=monorail
     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
+    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
@@ -13471,13 +14406,19 @@ en:
     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_grid: Tag:surface=metal grid
     surface=mud: Tag:surface=mud
@@ -13490,6 +14431,7 @@ en:
     surface=rubber: Tag:surface=rubber
     surface=sand: Tag:surface=sand
     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
@@ -13497,6 +14439,7 @@ en:
     surface=tarmacadam: Tag:surface=tarmacadam
     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
@@ -13522,6 +14465,7 @@ en:
     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
@@ -13548,6 +14492,7 @@ en:
     telecom=street_cabinet: Tag:telecom=street cabinet
     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
@@ -13586,11 +14531,13 @@ en:
     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=spa_resort: Tag:tourism=spa resort
     tourism=theme_park: Tag:tourism=theme park
     tourism=tourism-attraction: Tag:tourism=tourism-attraction
     tourism=trail_riding_rest: Tag:tourism=trail riding rest
@@ -13610,6 +14557,7 @@ en:
     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=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
@@ -13618,7 +14566,10 @@ en:
     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=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
@@ -13629,6 +14580,8 @@ en:
     tower:type=suspension: Tag:tower:type=suspension
     tower:type=transposing: Tag:tower:type=transposing
     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
@@ -13654,6 +14607,7 @@ en:
     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=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
@@ -13671,6 +14625,7 @@ en:
     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
@@ -13716,6 +14671,7 @@ en:
     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: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
@@ -13751,6 +14707,7 @@ en:
     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
@@ -13770,6 +14727,7 @@ en:
     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
@@ -13874,6 +14832,7 @@ en:
     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
@@ -13917,6 +14876,7 @@ en:
     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
@@ -13974,6 +14934,7 @@ en:
     water=dock: Tag:water=dock
     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=kolk: Tag:water=kolk
@@ -13993,6 +14954,7 @@ en:
     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
@@ -14000,6 +14962,7 @@ en:
     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
@@ -14011,6 +14974,7 @@ en:
     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
@@ -14021,7 +14985,6 @@ en:
     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=security_lock: Tag:waterway=security lock
@@ -14037,7 +15000,9 @@ en:
     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=dambo: Tag:wetland=dambo
     wetland=fen: Tag:wetland=fen
     wetland=mangrove: Tag:wetland=mangrove
     wetland=marsh: Tag:wetland=marsh
@@ -14059,6 +15024,7 @@ en:
     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
@@ -14077,6 +15043,7 @@ 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
@@ -14087,7 +15054,6 @@ eo:
     amenity=fast_food: Eo:Tag:amenity=fast food
     amenity=restaurant: Eo:Tag:amenity=restaurant
     craft=tinsmith: Eo:Tag:craft=tinsmith
-    esperanto=esperanto: Eo:Tag:esperanto=esperanto
     esperanto=yes: Eo:Tag:esperanto=yes
     generator:source=solar: Eo:Tag:generator:source=solar
     highway=cycleway: Eo:Tag:highway=cycleway
@@ -14109,9 +15075,6 @@ es:
     abandoned:railway: ES:Key:abandoned:railway
     abutters: ES:Key:abutters
     access: ES:Key:access
-    access:lhv: ES:Key:access:lhv
-    access:roadtrain: ES:Key:access:roadtrain
-    access:roadtrain:trailers: ES:Key:access:roadtrain:trailers
     addr: ES:Key:addr
     addr:*: ES:Key:addr:*
     addr:city: ES:Key:addr:city
@@ -14161,7 +15124,7 @@ es:
     bench: ES:Key:bench
     bicycle: ES:Key:bicycle
     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
@@ -14260,6 +15223,7 @@ es:
     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
@@ -14288,6 +15252,7 @@ es:
     'disused:': 'ES:Key:disused:'
     disused:*: ES:Key:disused:*
     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
@@ -14468,9 +15433,12 @@ es:
     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
     nat_name: ES:Key:nat name
     nat_ref: ES:Key:nat ref
@@ -14478,7 +15446,6 @@ es:
     ncn_ref: ES:Key:ncn ref
     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
     'not:': 'ES:Key:not:'
@@ -14493,6 +15460,7 @@ es:
     oneway: ES:Key:oneway
     oneway:bicycle: ES:Key:oneway:bicycle
     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
@@ -14510,7 +15478,11 @@ es:
     owner: ES:Key:owner
     ownership: ES:Key:ownership
     parking: ES:Key:parking
+    parking:both: ES:Key:parking:both
+    parking:left: ES:Key:parking:left
+    parking:right: ES:Key:parking:right
     passenger: ES:Key:passenger
+    passenger_lines: ES:Key:passenger lines
     passing_places: ES:Key:passing places
     payment: ES:Key:payment
     phone: ES:Key:phone
@@ -14544,8 +15516,10 @@ es:
     recycling_type: ES:Key:recycling type
     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:ine: ES:Key:ref:ine
     ref:isil: ES:Key:ref:isil
     reg_name: ES:Key:reg name
     reg_ref: ES:Key:reg ref
@@ -14557,7 +15531,6 @@ es:
     residential: ES:Key:residential
     resource: ES:Key:resource
     restaurant: ES:Key:restaurant
-    restriction: ES:Key:restriction
     retreat: ES:Key:retreat
     review_requested: ES:Key:review requested
     roadtrain: ES:Key:roadtrain
@@ -14743,6 +15716,8 @@ es:
     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=parking_position: ES:Tag:aeroway=parking position
     aeroway=runway: ES:Tag:aeroway=runway
@@ -14917,6 +15892,7 @@ es:
     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
@@ -14946,6 +15922,7 @@ es:
     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
     archaeological_site=megalith: ES:Tag:archaeological site=megalith
@@ -14957,7 +15934,9 @@ es:
     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
@@ -15081,6 +16060,7 @@ es:
     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
@@ -15318,6 +16298,7 @@ es:
     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
@@ -15420,6 +16401,7 @@ es:
     emergency=suction_point: ES:Tag:emergency=suction point
     emergency=water_tank: ES:Tag:emergency=water tank
     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
@@ -15607,6 +16589,7 @@ es:
     historic=gallows: ES:Tag:historic=gallows
     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
@@ -15658,11 +16641,13 @@ es:
     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=yes: ES:Tag:internet access=yes
     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
@@ -15713,6 +16698,7 @@ es:
     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
@@ -15773,7 +16759,6 @@ es:
     line=bay: ES:Tag:line=bay
     line=busbar: ES:Tag:line=busbar
     location=outdoor: ES:Tag:location=outdoor
-    lock=yes: ES:Tag:lock=yes
     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
@@ -15801,6 +16786,8 @@ es:
     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
@@ -15819,6 +16806,7 @@ es:
     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=quay: ES:Tag:man made=quay
     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
@@ -15877,6 +16865,7 @@ es:
     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=The_Church_of_Jesus_Christ_of_Latter-day_Saints: ES:Tag:name=The Church of
@@ -15960,6 +16949,7 @@ 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
+    noexit=yes: ES:Tag:noexit=yes
     noname=yes: ES:Tag:noname=yes
     office=accountant: ES:Tag:office=accountant
     office=administrative: ES:Tag:office=administrative
@@ -16029,6 +17019,7 @@ es:
     parking=underground: ES:Tag:parking=underground
     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
@@ -16136,6 +17127,7 @@ es:
     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_level_crossing: ES:Tag:railway=tram level crossing
     railway=tram_stop: ES:Tag:railway=tram stop
@@ -16156,6 +17148,7 @@ es:
     resource=gravel: ES:Tag:resource=gravel
     resource=sand: ES:Tag:resource=sand
     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=canoe: ES:Tag:route=canoe
@@ -16264,7 +17257,6 @@ es:
     shop=fabric: ES:Tag:shop=fabric
     shop=farm: ES:Tag:shop=farm
     shop=fashion: ES:Tag:shop=fashion
-    shop=fashion_accesories: ES:Tag:shop=fashion accesories
     shop=fashion_accessories: ES:Tag:shop=fashion accessories
     shop=fireplace: ES:Tag:shop=fireplace
     shop=fireworks: ES:Tag:shop=fireworks
@@ -16659,6 +17651,7 @@ es:
     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
@@ -16811,6 +17804,7 @@ es:
     wetland=reedbed: ES:Tag:wetland=reedbed
     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
     zoo=falconry: ES:Tag:zoo=falconry
 et:
@@ -16844,7 +17838,6 @@ fa:
     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
@@ -16872,6 +17865,7 @@ fa:
     man_made=water_tower: Fa:Tag:man made=water tower
     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
     railway=level_crossing: Fa:Tag:railway=level crossing
@@ -16882,26 +17876,37 @@ fa:
     waterway=drain: Fa:Tag:waterway=drain
 fi:
   key:
+    access: Fi:Key:access
     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
+    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
+    fee: Fi:Key:fee
     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
+    memorial: Fi:Key:memorial
+    memorial:conflict: Fi:Key:memorial:conflict
+    minspeed: Fi:Key:minspeed
     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
@@ -16910,9 +17915,12 @@ fi:
     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
+    start_date: Fi:Key:start date
     surface: Fi:Key:surface
     tracktype: Fi:Key:tracktype
     traffic_calming: Fi:Key:traffic calming
@@ -16926,11 +17934,14 @@ fi:
     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=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
@@ -16949,19 +17960,26 @@ fi:
     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
+    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=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=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
+    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
@@ -16974,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
+    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
@@ -17006,6 +18025,7 @@ fr:
     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
@@ -17013,10 +18033,13 @@ fr:
     architect: FR:Key:architect
     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
+    assembly_point:tornado: FR:Key:assembly point:tornado
     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
@@ -17024,13 +18047,13 @@ fr:
     bakehouse: FR:Key:bakehouse
     barrier: FR:Key:barrier
     baseball: FR:Key:baseball
+    basilica: FR:Key:basilica
     basin: FR:Key:basin
     bench: FR:Key:bench
     bench:type: FR:Key:bench:type
     bicycle: FR:Key:bicycle
     bicycle_bypass: FR:Key:bicycle bypass
     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
@@ -17054,6 +18077,7 @@ fr:
     bulk_purchase: FR:Key:bulk purchase
     bus: FR:Key:bus
     busway: FR:Key:busway
+    cables: FR:Key:cables
     cafe: FR:Key:cafe
     camera:direction: FR:Key:camera:direction
     camp_site: FR:Key:camp site
@@ -17072,6 +18096,7 @@ fr:
     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
@@ -17090,6 +18115,7 @@ fr:
     contact:facebook: FR:Key:contact:facebook
     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
@@ -17105,6 +18131,7 @@ fr:
     crossing:markings: FR:Key:crossing:markings
     cuisine: FR:Key:cuisine
     currency: FR:Key:currency
+    currency:XLT: FR:Key:currency:XLT
     cutting: FR:Key:cutting
     cycle_barrier: FR:Key:cycle barrier
     cycle_barrier:installation: FR:Key:cycle barrier:installation
@@ -17146,11 +18173,13 @@ fr:
     door:width: FR:Key:door:width
     drain: FR:Key:drain
     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
+    duration: FR:Key:duration
     ele: FR:Key:ele
     email: FR:Key:email
     embankment: FR:Key:embankment
@@ -17220,6 +18249,7 @@ fr:
     incline: FR:Key:incline
     indoor: FR:Key:indoor
     indoor_seating: FR:Key:indoor seating
+    informal: FR:Key:informal
     information: FR:Key:information
     inlet: FR:Key:inlet
     inscription: FR:Key:inscription
@@ -17227,6 +18257,7 @@ fr:
     intermittent: FR:Key:intermittent
     internet_access:ssid: FR:Key:internet access:ssid
     interval: FR:Key:interval
+    isced:level: FR:Key:isced:level
     junction: FR:Key:junction
     kerb: FR:Key:kerb
     kindergarten:FR: FR:Key:kindergarten:FR
@@ -17244,9 +18275,11 @@ fr:
     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
+    lit:perceived: FR:Key:lit:perceived
     loc_name: FR:Key:loc name
     local_authority:FR: FR:Key:local authority:FR
     location: FR:Key:location
@@ -17292,6 +18325,7 @@ fr:
     motorcycle:parking: FR:Key:motorcycle:parking
     motorroad: FR:Key:motorroad
     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
@@ -17301,7 +18335,6 @@ fr:
     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
     noref: FR:Key:noref
     note: FR:Key:note
@@ -17321,7 +18354,9 @@ fr:
     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
+    origin: FR:Key:origin
     outdoor_seating: FR:Key:outdoor seating
     outlet: FR:Key:outlet
     overlap: FR:Key:overlap
@@ -17329,6 +18364,7 @@ fr:
     overtaking:hgv: FR:Key:overtaking:hgv
     owner: FR:Key:owner
     par: FR:Key:par
+    parish: FR:Key:parish
     park_ride: FR:Key:park ride
     parking: FR:Key:parking
     parking_space: FR:Key:parking space
@@ -17337,6 +18373,7 @@ fr:
     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
@@ -17350,7 +18387,6 @@ fr:
     police: FR:Key:police
     post_box:type: FR:Key:post box:type
     post_office: FR:Key:post office
-    post_office:type: FR:Key:post office:type
     power: FR:Key:power
     power_supply: FR:Key:power supply
     priority: FR:Key:priority
@@ -17362,12 +18398,15 @@ fr:
     pump: FR:Key:pump
     pump_mechanism: FR:Key:pump mechanism
     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:tvm: FR:Key:railway:tvm
     ramp: FR:Key:ramp
+    ramp:luggage: FR:Key:ramp:luggage
     ref: FR:Key:ref
     ref:CD:CNOP: FR:Key:ref:CD:CNOP
     ref:CEF: FR:Key:ref:CEF
@@ -17382,6 +18421,7 @@ 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: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
@@ -17394,6 +18434,7 @@ 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: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
@@ -17405,6 +18446,8 @@ fr:
     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
@@ -17434,8 +18477,11 @@ fr:
     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
@@ -17485,10 +18531,13 @@ fr:
     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
+    townhall:type: FR:Key:townhall:type
     tracktype: FR:Key:tracktype
     traffic_calming: FR:Key:traffic calming
     traffic_sign: FR:Key:traffic sign
@@ -17534,14 +18583,14 @@ fr:
     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
-    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:
-    Bascule_publique: FR:Tag:Bascule publique
     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
@@ -17582,6 +18631,7 @@ fr:
     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
@@ -17631,6 +18681,7 @@ fr:
     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
@@ -17648,16 +18699,19 @@ fr:
     amenity=ice_cream: FR:Tag:amenity=ice cream
     amenity=karaoke_box: FR:Tag:amenity=karaoke box
     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=library_dropoff: FR:Tag:amenity=library dropoff
     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=mailroom: FR:Tag:amenity=mailroom
     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
@@ -17724,6 +18778,9 @@ fr:
     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
@@ -17768,8 +18825,11 @@ fr:
     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_road=yes: FR:Tag:bicycle road=yes
+    boules=petanque: FR:Tag:boules=petanque
     boundary=administrative: FR:Tag:boundary=administrative
     boundary=religious_administration: FR:Tag:boundary=religious administration
     boundary=special_economic_zone: FR:Tag:boundary=special economic zone
@@ -17802,6 +18862,7 @@ fr:
     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
@@ -17816,12 +18877,14 @@ fr:
     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=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=static_caravan: FR:Tag:building=static caravan
     building=stilt_house: FR:Tag:building=stilt house
     building=sty: FR:Tag:building=sty
     building=tent: FR:Tag:building=tent
@@ -17928,10 +18991,12 @@ fr:
     crossing=zebra: FR:Tag:crossing=zebra
     crossing_ref=zebra: FR:Tag:crossing ref=zebra
     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=lane: FR:Tag:cycleway=lane
     cycleway=opposite: FR:Tag:cycleway=opposite
     cycleway=opposite_lane: FR:Tag:cycleway=opposite lane
     cycleway=proposed: FR:Tag:cycleway=proposed
@@ -17942,8 +19007,10 @@ fr:
     diplomatic=liaison: FR:Tag:diplomatic=liaison
     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=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
@@ -17966,6 +19033,7 @@ 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
+    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
@@ -17976,6 +19044,7 @@ fr:
     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
@@ -17999,6 +19068,7 @@ fr:
     healthcare=clinic: FR:Tag:healthcare=clinic
     healthcare=doctor: FR:Tag:healthcare=doctor
     healthcare=laboratory: FR:Tag:healthcare=laboratory
+    healthcare=nurse: FR:Tag:healthcare=nurse
     healthcare=physiotherapist: FR:Tag:healthcare=physiotherapist
     healthcare=sample_collection: FR:Tag:healthcare=sample collection
     healthcare=vaccination_centre: FR:Tag:healthcare=vaccination centre
@@ -18096,6 +19166,7 @@ fr:
     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
@@ -18161,14 +19232,22 @@ fr:
     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=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=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=bunker_silo: FR:Tag:man made=bunker silo
     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
@@ -18176,6 +19255,8 @@ fr:
     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
@@ -18183,9 +19264,12 @@ 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=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=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
@@ -18195,6 +19279,8 @@ fr:
     man_made=torii: FR:Tag:man made=torii
     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
@@ -18204,7 +19290,6 @@ 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_chimney: FR:Tag:man made chimney
     marker=aerial: FR:Tag:marker=aerial
     marker=ground: FR:Tag:marker=ground
     marker=pedestal: FR:Tag:marker=pedestal
@@ -18212,7 +19297,10 @@ fr:
     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
     megalith_type=menhir: FR:Tag:megalith type=menhir
     memorial=ghost_bike: FR:Tag:memorial=ghost bike
@@ -18220,8 +19308,10 @@ fr:
     memorial=war_memorial: FR:Tag:memorial=war memorial
     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=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
@@ -18247,6 +19337,8 @@ fr:
     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
@@ -18271,6 +19363,7 @@ fr:
     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
@@ -18291,18 +19384,25 @@ fr:
     outlet=valve: FR:Tag:outlet=valve
     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
+    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=province: FR:Tag:place=province
+    place=region: FR:Tag:place=region
     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
@@ -18318,9 +19418,12 @@ fr:
     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=catenary_mast: FR:Tag:power=catenary mast
     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
@@ -18339,6 +19442,7 @@ fr:
     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
@@ -18349,10 +19453,14 @@ fr:
     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=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=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
@@ -18362,6 +19470,7 @@ fr:
     railway=wash: FR:Tag:railway=wash
     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
@@ -18398,6 +19507,7 @@ fr:
     shelter_type=changing_rooms: FR:Tag:shelter type=changing rooms
     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
@@ -18473,10 +19583,13 @@ fr:
     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=storage_rental: FR:Tag:shop=storage rental
+    shop=street_vendor: FR:Tag:shop=street vendor
     shop=supermarket: FR:Tag:shop=supermarket
     shop=tattoo: FR:Tag:shop=tattoo
     shop=ticket: FR:Tag:shop=ticket
@@ -18506,6 +19619,7 @@ fr:
     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
@@ -18517,6 +19631,7 @@ fr:
     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
@@ -18593,7 +19708,10 @@ fr:
     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=sewerage: FR:Tag:utility=sewerage
     utility=street_lighting: FR:Tag:utility=street lighting
@@ -18624,6 +19742,7 @@ fr:
     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
@@ -18631,6 +19750,7 @@ fr:
     water=river: FR:Tag:water=river
     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
@@ -18647,7 +19767,6 @@ fr:
     wetland=mangrove: FR:Tag:wetland=mangrove
     wetland=marsh: FR:Tag:wetland=marsh
     wetland=reedbed: FR:Tag:wetland=reedbed
-    wetland=saltern: FR:Tag:wetland=saltern
     wetland=swamp: FR:Tag:wetland=swamp
     zoo=aviary: FR:Tag:zoo=aviary
     zoo=birds: FR:Tag:zoo=birds
@@ -18662,14 +19781,18 @@ gcf:
   key:
     club: Gcf:Key:club
     name: Gcf:Key:name
-    name:gcf: GCF:Key:name:gcf
+    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
@@ -18682,9 +19805,12 @@ gcf:
     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
@@ -18712,6 +19838,7 @@ gcf:
     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
@@ -18814,6 +19941,7 @@ hu:
     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
@@ -18821,12 +19949,15 @@ hu:
     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
+    ref:HU:om: Hu:Key:ref:HU:om
     shop: Hu:Key:shop
     smoothness: Hu:Key:smoothness
     surface: Hu:Key:surface
@@ -18834,6 +19965,7 @@ hu:
     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
@@ -18841,18 +19973,30 @@ hu:
   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=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
+    leisure=swimming_pool: Hu:Tag:leisure=swimming pool
+    natural=spring: Hu:Tag:natural=spring
     natural=wallow: Hu:Tag:natural=wallow
+    natural=water: Hu:Tag:natural=water
     railway=level_crossing: Hu:Tag:railway=level crossing
+    refitted=yes: Hu:Tag:refitted=yes
 id:
+  key:
+    boundary: Id:Key:boundary
+    place: Id:Key:place
   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
+    tourism=guest_house: Id:Tag:tourism=guest house
     waterway=tidal_channel: Id:Tag:waterway=tidal channel
 it:
   key:
@@ -18873,9 +20017,9 @@ it:
     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
-    bicycle_road: IT:Key:bicycle road
     books: IT:Key:books
     boundary: IT:Key:boundary
     brewery: IT:Key:brewery
@@ -18916,6 +20060,7 @@ it:
     'disused:': 'IT:Key:disused:'
     disused:*: IT:Key:disused:*
     drink: IT:Key:drink
+    drink:*: IT:Key:drink:*
     ele: IT:Key:ele
     embankment: IT:Key:embankment
     enforcement: IT:Key:enforcement
@@ -18930,6 +20075,7 @@ it:
     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
@@ -18940,8 +20086,10 @@ it:
     kerb: IT:Key:kerb
     landuse: IT:Key:landuse
     lanes:psv: IT:Key:lanes:psv
+    layer: IT:Key:layer
     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
@@ -18952,6 +20100,7 @@ it:
     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
@@ -18973,7 +20122,6 @@ it:
     name:left: IT:Key:name:left
     name:right: IT:Key:name:right
     natural: IT:Key:natural
-    noexit: IT:Key:noexit
     nohousenumber: IT:Key:nohousenumber
     note: IT:Key:note
     office: IT:Key:office
@@ -19005,6 +20153,7 @@ it:
     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
@@ -19016,6 +20165,7 @@ it:
     shop: IT:Key:shop
     sidewalk: IT:Key:sidewalk
     smoothness: IT:Key:smoothness
+    social_facility:for: IT:Key:social facility:for
     sport: IT:Key:sport
     stamps: IT:Key:stamps
     stop: IT:Key:stop
@@ -19063,6 +20213,7 @@ it:
     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
@@ -19087,6 +20238,7 @@ it:
     amenity=kindergarten: IT:Tag:amenity=kindergarten
     amenity=lavoir: IT:Tag:amenity=lavoir
     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=payment_terminal: IT:Tag:amenity=payment terminal
@@ -19148,13 +20300,17 @@ it:
     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
     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=roof: IT:Tag:building=roof
+    building=ruins: IT:Tag:building=ruins
     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
@@ -19282,6 +20438,7 @@ it:
     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
@@ -19300,6 +20457,7 @@ it:
     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
@@ -19310,6 +20468,7 @@ it:
     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=graphic_design: IT:Tag:office=graphic design
     office=it: IT:Tag:office=it
@@ -19427,6 +20586,7 @@ it:
     vending=parcel_pickup: IT:Tag:vending=parcel pickup
     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
@@ -19444,6 +20604,7 @@ ja:
     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
@@ -19476,6 +20637,8 @@ ja:
     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
@@ -19502,9 +20665,9 @@ ja:
     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_road: JA:Key:bicycle road
     bin: JA:Key:bin
     biotic_reef:type: JA:Key:biotic reef:type
     board_type: JA:Key:board type
@@ -19533,6 +20696,7 @@ ja:
     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
@@ -19541,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: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
@@ -19554,8 +20719,11 @@ ja:
     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
+    carpenter: JA:Key:carpenter
     carriage: JA:Key:carriage
     castle_type: JA:Key:castle type
     cave:name: JA:Key:cave:name
@@ -19572,6 +20740,7 @@ ja:
     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
@@ -19602,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:signals: JA:Key:crossing:signals
     crossing_ref: JA:Key:crossing ref
     cuisine: JA:Key:cuisine
     currency: JA:Key:currency
@@ -19613,9 +20783,6 @@ ja:
     cycleway:both: JA:Key:cycleway:both
     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:'
@@ -19657,6 +20824,8 @@ ja:
     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
@@ -19678,6 +20847,9 @@ ja:
     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
@@ -19702,6 +20874,7 @@ ja:
     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
@@ -19734,8 +20907,8 @@ ja:
     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_type: JA:Key:hazard type
     hazmat: JA:Key:hazmat
     healthcare: JA:Key:healthcare
     healthcare:speciality: JA:Key:healthcare:speciality
@@ -19785,6 +20958,7 @@ ja:
     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
@@ -19824,8 +20998,8 @@ ja:
     managed: JA:Key:managed
     manhole: JA:Key:manhole
     manufacturer: JA:Key:manufacturer
-    manufacturer:type: JA:Key:manufacturer:type
     mapillary: JA:Key:mapillary
+    marker: JA:Key:marker
     massage: JA:Key:massage
     material: JA:Key:material
     max_age: JA:Key:max age
@@ -19890,7 +21064,8 @@ ja:
     ncn_ref: JA:Key:ncn ref
     network: JA:Key:network
     network:wikidata: JA:Key:network:wikidata
-    noexit: JA:Key:noexit
+    'no:': 'JA:Key:no:'
+    no:*: JA:Key:no:*
     noref: JA:Key:noref
     note: JA:Key:note
     note:ja: JA:Key:note:ja
@@ -19923,9 +21098,12 @@ ja:
     parcel_mail_in: JA:Key:parcel mail in
     park_ride: JA:Key:park ride
     parking: JA:Key:parking
+    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
+    payment:*: JA:Key:payment:*
     payment:coins: JA:Key:payment:coins
     phone: JA:Key:phone
     pilgrimage: JA:Key:pilgrimage
@@ -19943,6 +21121,7 @@ ja:
     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
@@ -19995,6 +21174,7 @@ ja:
     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
@@ -20058,6 +21238,7 @@ ja:
     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
@@ -20065,6 +21246,7 @@ ja:
     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
@@ -20095,6 +21277,7 @@ ja:
     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
@@ -20108,6 +21291,7 @@ ja:
     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
@@ -20120,6 +21304,7 @@ ja:
     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
@@ -20131,7 +21316,6 @@ ja:
     winter_road: JA:Key:winter road
     wires: JA:Key:wires
     wood: JA:Key:wood
-    year_of_construction: JA:Key:year of construction
     yh:LINE_NAME: JA:Key:yh:LINE NAME
     yh:LINE_NUM: JA:Key:yh:LINE NUM
     yh:STRUCTURE: JA:Key:yh:STRUCTURE
@@ -20139,6 +21323,7 @@ ja:
     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:
@@ -20153,6 +21338,7 @@ ja:
     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
@@ -20192,6 +21378,7 @@ ja:
     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
@@ -20207,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_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=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
@@ -20219,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=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
@@ -20239,6 +21429,7 @@ ja:
     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=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
@@ -20246,16 +21437,21 @@ ja:
     amenity=crypt: JA:Tag:amenity=crypt
     amenity=customs: JA:Tag:amenity=customs
     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=dressing_room: JA:Tag:amenity=dressing room
     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=emergency_service: JA:Tag:amenity=emergency service
     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=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
@@ -20267,25 +21463,33 @@ ja:
     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=juice_bar: JA:Tag:amenity=juice bar
     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=lavoir: JA:Tag:amenity=lavoir
     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=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=mortuary: JA:Tag:amenity=mortuary
     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=parcel_locker: JA:Tag:amenity=parcel locker
@@ -20301,6 +21505,7 @@ ja:
     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
@@ -20309,21 +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=reception_desk: JA:Tag:amenity=reception desk
     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=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=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=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
@@ -20334,6 +21543,10 @@ ja:
     amenity=ticket_validator: JA:Tag:amenity=ticket validator
     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
@@ -20344,6 +21557,7 @@ ja:
     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
     artwork_type=bust: JA:Tag:artwork type=bust
     artwork_type=mural: JA:Tag:artwork type=mural
@@ -20372,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=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
@@ -20383,15 +21598,18 @@ ja:
     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=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=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
@@ -20420,6 +21638,7 @@ ja:
     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
@@ -20440,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=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
@@ -20485,6 +21705,8 @@ ja:
     castle_type=fortress: JA:Tag:castle type=fortress
     castle_type=shiro: JA:Tag:castle type=shiro
     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
@@ -20511,6 +21733,7 @@ ja:
     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
@@ -20547,10 +21770,15 @@ ja:
     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=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
@@ -20566,6 +21794,9 @@ ja:
     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
@@ -20575,14 +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_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=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=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
+    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
@@ -20633,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
+    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
@@ -20645,11 +21881,15 @@ ja:
     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
+    healthcare:speciality=gynaecology: JA:Tag:healthcare:speciality=gynaecology
     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=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
@@ -20700,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=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
@@ -20710,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=house: JA:Tag:historic=house
     historic=locomotive: JA:Tag:historic=locomotive
     historic=memorial: JA:Tag:historic=memorial
     historic=milestone: JA:Tag:historic=milestone
@@ -20717,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=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
@@ -20775,6 +22018,7 @@ ja:
     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
@@ -20786,6 +22030,7 @@ ja:
     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
@@ -20815,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=bathing_place: JA:Tag:leisure=bathing place
     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
@@ -20825,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=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
@@ -20833,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=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=resort: JA:Tag:leisure=resort
     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
@@ -20845,21 +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=tanning_salon: JA:Tag:leisure=tanning salon
     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
+    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=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=cairn: JA:Tag:man made=cairn
     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=column: JA:Tag:man made=column
     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
@@ -20872,6 +22132,7 @@ ja:
     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=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
@@ -20885,20 +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=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=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=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=torii: JA:Tag:man made=torii
     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=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
@@ -20908,6 +22175,7 @@ ja:
     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
@@ -20925,8 +22193,11 @@ ja:
     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
+    mountain_pass=yes: JA:Tag:mountain pass=yes
     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
@@ -20938,11 +22209,13 @@ ja:
     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=hill: JA:Tag:natural=hill
     natural=hot_spring: JA:Tag:natural=hot spring
     natural=isthmus: JA:Tag:natural=isthmus
     natural=land: JA:Tag:natural=land
@@ -20950,6 +22223,7 @@ ja:
     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
@@ -20982,30 +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
+    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=advertising_agency: JA:Tag:office=advertising agency
     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=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=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=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=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=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=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
+    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
@@ -21028,6 +22321,10 @@ ja:
     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
@@ -21036,6 +22333,7 @@ ja:
     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
@@ -21090,6 +22388,7 @@ ja:
     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
@@ -21115,9 +22414,11 @@ ja:
     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=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
@@ -21171,6 +22472,7 @@ ja:
     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
@@ -21185,8 +22487,10 @@ ja:
     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=grocery: JA:Tag:shop=grocery
     shop=hairdresser: JA:Tag:shop=hairdresser
     shop=hardware: JA:Tag:shop=hardware
     shop=health: JA:Tag:shop=health
@@ -21194,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=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=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
@@ -21223,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=nuts: JA:Tag:shop=nuts
     shop=optician: JA:Tag:shop=optician
     shop=organic: JA:Tag:shop=organic
     shop=outdoor: JA:Tag:shop=outdoor
@@ -21236,13 +22543,16 @@ ja:
     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=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=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
@@ -21272,6 +22582,7 @@ ja:
     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
@@ -21295,8 +22606,10 @@ ja:
     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=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
@@ -21309,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
+    street_vendor=yes: JA:Tag:street vendor=yes
     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
@@ -21335,12 +22652,28 @@ ja:
     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=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
+    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
+    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
@@ -21383,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=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
@@ -21400,44 +22734,86 @@ ja:
     wetland=wet_meadow: JA:Tag:wetland=wet meadow
 ko:
   key:
+    3dr:type: Ko:Key:3dr:type
     addr: Ko:Key:addr
     addr:*: Ko:Key:addr:*
     aerialway: Ko:Key:aerialway
+    alt_name: Ko:Key:alt name
     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
+    cuisine: Ko:Key:cuisine
     denotation: Ko:Key:denotation
+    diet:vegan: Ko:Key:diet:vegan
     drink: Ko:Key:drink
+    drive_through: Ko:Key:drive through
     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
+    historic: Ko:Key:historic
+    indoor: Ko:Key:indoor
     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
+    name:ja: Ko:Key:name:ja
+    name:ko: Ko:Key:name:ko
     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
     shop: Ko:Key:shop
     smoothness: Ko:Key:smoothness
     social_facility: Ko:Key:social facility
     tenant: Ko:Key:tenant
+    toll: Ko:Key:toll
     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
+    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:
+    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
     amenity=animal_boarding: Ko:Tag:amenity=animal boarding
@@ -21476,6 +22852,7 @@ ko:
     amenity=food_court: Ko:Tag:amenity=food court
     amenity=fountain: Ko:Tag:amenity=fountain
     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
@@ -21497,6 +22874,7 @@ ko:
     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
@@ -21513,13 +22891,28 @@ ko:
     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
+    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
+    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=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
@@ -21530,34 +22923,66 @@ ko:
     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=traffic_signals: Ko:Tag:highway=traffic signals
+    highway=trailhead: Ko:Tag:highway=trailhead
     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=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=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
+    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=planter: Ko:Tag:man made=planter
+    man_made=sign: Ko:Tag:man made=sign
     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=scree: Ko:Tag:natural=scree
     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=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
@@ -21581,6 +23006,7 @@ ko:
     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
@@ -21591,9 +23017,14 @@ ko:
     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
     traffic_calming=island: Ko:Tag:traffic calming=island
     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
@@ -21611,7 +23042,9 @@ ne:
   key:
     tracktype: Ne:Key:tracktype
   tag:
+    barrier=kerb: Ne:Tag:barrier=kerb
     natural=scrub: Ne:Tag:natural=scrub
+    place=hamlet: Ne:Tag:place=hamlet
 nl:
   key:
     AND_nosr_r: NL:Key:AND nosr r
@@ -21629,7 +23062,6 @@ nl:
     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
@@ -21652,12 +23084,14 @@ nl:
     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
+    oneway: NL:Key:oneway
     place: NL:Key:place
     playground: NL:Key:playground
     population: NL:Key:population
@@ -21681,6 +23115,7 @@ nl:
     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=bicycle_parking: NL:Tag:amenity=bicycle parking
@@ -21694,9 +23129,11 @@ nl:
     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
+    bicycle_road=yes: NL:Tag:bicycle road=yes
     building=castle: NL:Tag:building=castle
     building=entrance: NL:Tag:building=entrance
     emergency=access_point: NL:Tag:emergency=access point
@@ -21866,6 +23303,7 @@ pl:
     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
@@ -21890,7 +23328,6 @@ pl:
     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
@@ -21927,6 +23364,7 @@ pl:
     cargo: Pl:Key:cargo
     castle_type: Pl:Key:castle type
     cemetery: Pl:Key:cemetery
+    charge: Pl:Key:charge
     check_date: Pl:Key:check date
     church:type: Pl:Key:church:type
     circuits: Pl:Key:circuits
@@ -21956,6 +23394,7 @@ pl:
     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
     currency:*: Pl:Key:currency:*
@@ -21974,6 +23413,7 @@ pl:
     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
@@ -21985,6 +23425,7 @@ pl:
     distance: Pl:Key:distance
     door: Pl:Key:door
     drink: Pl:Key:drink
+    drink:*: Pl:Key:drink:*
     drinking_water: Pl:Key:drinking water
     drinking_water:refill: Pl:Key:drinking water:refill
     driving_side: Pl:Key:driving side
@@ -21998,6 +23439,7 @@ pl:
     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
     fast_food: Pl:Key:fast food
@@ -22010,6 +23452,7 @@ pl:
     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
@@ -22095,6 +23538,7 @@ pl:
     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
@@ -22131,13 +23575,14 @@ pl:
     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
-    noexit: Pl:Key:noexit
     non_existent_levels: Pl:Key:non existent levels
     note: Pl:Key:note
     nudism: Pl:Key:nudism
+    nursery: Pl:Key:nursery
     office: Pl:Key:office
     old_addr:housenumber: Pl:Key:old addr:housenumber
     old_name: Pl:Key:old name
@@ -22169,6 +23614,7 @@ pl:
     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
@@ -22180,6 +23626,7 @@ pl:
     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:'
@@ -22199,6 +23646,7 @@ pl:
     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:direction: Pl:Key:roof:direction
     roof:material: Pl:Key:roof:material
@@ -22225,7 +23673,6 @@ pl:
     shower: Pl:Key:shower
     shrine: Pl:Key:shrine
     sidewalk: Pl:Key:sidewalk
-    site_type: Pl:Key:site type
     size: Pl:Key:size
     smokefree: Pl:Key:smokefree
     smoking: Pl:Key:smoking
@@ -22535,6 +23982,7 @@ pl:
     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=border_zone: Pl:Tag:boundary=border zone
     boundary=civil: Pl:Tag:boundary=civil
@@ -22653,6 +24101,7 @@ pl:
     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
@@ -22721,6 +24170,7 @@ pl:
     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
@@ -22747,8 +24197,14 @@ pl:
     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=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
     hazard=illegal_crossing: Pl:Tag:hazard=illegal crossing
@@ -22952,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=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
@@ -23002,6 +24459,7 @@ pl:
     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
@@ -23135,6 +24593,7 @@ pl:
     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
@@ -23143,6 +24602,7 @@ pl:
     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
@@ -23209,6 +24669,7 @@ pl:
     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
@@ -23368,6 +24829,7 @@ pl:
     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
@@ -23380,6 +24842,7 @@ pl:
     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
@@ -23430,7 +24893,9 @@ pl:
     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=power_tools: Pl:Tag:shop=power tools
     shop=printer_ink: Pl:Tag:shop=printer ink
     shop=psychic: Pl:Tag:shop=psychic
     shop=pyrotechnics: Pl:Tag:shop=pyrotechnics
@@ -23456,6 +24921,7 @@ pl:
     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
@@ -23497,13 +24963,17 @@ pl:
     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=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
+    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
@@ -23542,11 +25012,10 @@ pl:
     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=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
-    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
@@ -23634,9 +25103,20 @@ pnb:
   key:
     building: Pnb:Key:building
     name:pnb: Pnb:Key:name:pnb
-proposed features/eo:
+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:
-    esperanto=esperanto: Proposed features/Eo:Tag:esperanto=esperanto
+    boundary=economic: Proposal:Tag:boundary=economic
+    landuse=breeding: Proposal:Tag:landuse=breeding
 pt:
   key:
     IBGE:CD_ADMINIS: Pt:Key:IBGE:CD ADMINIS
@@ -23658,7 +25138,6 @@ pt:
     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
@@ -23688,6 +25167,7 @@ pt:
     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
@@ -23764,7 +25244,6 @@ pt:
     mtb: Pt:Key:mtb
     name: Pt:Key:name
     natural: Pt:Key:natural
-    noexit: Pt:Key:noexit
     nohousenumber: Pt:Key:nohousenumber
     note: Pt:Key:note
     office: Pt:Key:office
@@ -23801,6 +25280,7 @@ pt:
     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
@@ -23827,6 +25307,7 @@ pt:
     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
@@ -24011,6 +25492,7 @@ pt:
     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
@@ -24025,6 +25507,7 @@ pt:
     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
@@ -24281,6 +25764,7 @@ pt:
     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
@@ -24460,6 +25944,7 @@ pt:
     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
@@ -25252,15 +26737,15 @@ ru:
     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:railway: RU:Key:abandoned:railway
     abutters: RU:Key:abutters
     access: RU:Key:access
     access:lanes: RU:Key:access:lanes
-    access:lhv: RU:Key:access:lhv
-    access:roadtrain: RU:Key:access:roadtrain
-    access:roadtrain:trailers: RU:Key:access:roadtrain:trailers
     addr: RU:Key:addr
+    'addr:': 'RU:Key:addr:'
     addr:*: RU:Key:addr:*
     addr:block: RU:Key:addr:block
     addr:city: RU:Key:addr:city
@@ -25281,6 +26766,7 @@ ru:
     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:streetnumber: RU:Key:addr:streetnumber
@@ -25304,6 +26790,7 @@ ru:
     area: RU:Key:area
     area:aeroway: RU:Key:area:aeroway
     area:highway: RU:Key:area:highway
+    armrest: RU:Key:armrest
     artist_name: RU:Key:artist name
     artwork_type: RU:Key:artwork type
     assisted_trail: RU:Key:assisted trail
@@ -25314,6 +26801,7 @@ ru:
     baby: RU:Key:baby
     baby_feeding: RU:Key:baby feeding
     backcountry: RU:Key:backcountry
+    backrest: RU:Key:backrest
     backward: RU:Key:backward
     balcony: RU:Key:balcony
     barrier: RU:Key:barrier
@@ -25330,7 +26818,6 @@ ru:
     bicycle:type: RU:Key:bicycle:type
     bicycle_bypass: RU:Key:bicycle bypass
     bicycle_parking: RU:Key:bicycle parking
-    bicycle_road: RU:Key:bicycle road
     bike_ride: RU:Key:bike ride
     bin: RU:Key:bin
     board:title: RU:Key:board:title
@@ -25373,6 +26860,7 @@ ru:
     building:parts: RU:Key:building:parts
     building:place: RU:Key:building:place
     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
@@ -25394,15 +26882,23 @@ ru:
     camera:type: RU:Key:camera:type
     camp_site: RU:Key:camp site
     camp_type: RU:Key:camp type
-    campers: RU:Key:campers
     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_city: RU:Key:capital city
+    car_wash: RU:Key:car wash
     caravan: RU:Key:caravan
+    cash_withdrawal: RU:Key:cash withdrawal
     castle_type: RU:Key:castle type
     castle_type:de: RU:Key:castle type:de
     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
@@ -25412,6 +26908,7 @@ ru:
     check_date:opening_hours: RU:Key:check date:opening hours
     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
@@ -25421,6 +26918,7 @@ ru:
     comment: RU:Key:comment
     communication:bos: RU:Key:communication:bos
     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
@@ -25461,9 +26959,11 @@ ru:
     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
@@ -25477,6 +26977,7 @@ ru:
     denotation: RU:Key:denotation
     department: RU:Key:department
     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
@@ -25485,10 +26986,13 @@ ru:
     diplomatic: RU:Key:diplomatic
     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: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
     double_tracked_motor_vehicle: RU:Key:double tracked motor vehicle
@@ -25518,7 +27022,6 @@ ru:
     exhibit: RU:Key:exhibit
     exit: RU:Key:exit
     expressway: RU:Key:expressway
-    factory: RU:Key:factory
     faculty: RU:Key:faculty
     fast_food: RU:Key:fast food
     fax: RU:Key:fax
@@ -25556,6 +27059,8 @@ ru:
     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
@@ -25570,10 +27075,12 @@ ru:
     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
     heritage: RU:Key:heritage
     heritage:operator: RU:Key:heritage:operator
+    heritage:website: RU:Key:heritage:website
     hgv: RU:Key:hgv
     highway: RU:Key:highway
     hiking: RU:Key:hiking
@@ -25596,6 +27103,7 @@ ru:
     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
@@ -25604,6 +27112,7 @@ ru:
     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
@@ -25621,10 +27130,12 @@ ru:
     level: RU:Key:level
     level:ref: RU:Key:level:ref
     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
+    localizer: RU:Key:localizer
     location: RU:Key:location
     lock: RU:Key:lock
     locked: RU:Key:locked
@@ -25644,7 +27155,6 @@ ru:
     maxspeed: RU:Key:maxspeed
     maxspeed:practical: RU:Key:maxspeed:practical
     maxstay: RU:Key:maxstay
-    maxtents: RU:Key:maxtents
     maxweight: RU:Key:maxweight
     maxweight:signed: RU:Key:maxweight:signed
     maxweightrating: RU:Key:maxweightrating
@@ -25659,6 +27169,8 @@ ru:
     mindistance: RU:Key:mindistance
     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
@@ -25681,14 +27193,18 @@ ru:
     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:type: RU:Key:mtb:type
     museum: RU:Key:museum
     museum_type: RU:Key:museum type
     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: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
@@ -25697,10 +27213,10 @@ ru:
     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
-    noexit: RU:Key:noexit
     nohousenumber: RU:Key:nohousenumber
     note: RU:Key:note
     nursery: RU:Key:nursery
@@ -25721,18 +27237,22 @@ ru:
     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
+    oven: RU:Key:oven
     overtaking: RU:Key:overtaking
     owner: RU:Key:owner
     ownership: RU:Key:ownership
     park_ride: RU:Key:park ride
     parking: RU:Key:parking
+    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
+    payment:*: RU:Key:payment:*
     payment:coins: RU:Key:payment:coins
     payment:credit_cards: RU:Key:payment:credit cards
     payment:notes: RU:Key:payment:notes
@@ -25742,8 +27262,11 @@ ru:
     phone: RU:Key:phone
     picnic_table: RU:Key:picnic table
     pipeline: RU:Key:pipeline
+    piste:grooming: RU:Key:piste:grooming
     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
     'playground:': 'RU:Key:playground:'
@@ -25770,24 +27293,33 @@ ru:
     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: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
+    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: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
+    region:type: RU:Key:region:type
     religion: RU:Key:religion
+    removed:building: RU:Key:removed:building
     rental: RU:Key:rental
     research: RU:Key:research
     reservation: RU:Key:reservation
@@ -25795,6 +27327,8 @@ ru:
     residential: RU:Key:residential
     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
@@ -25811,6 +27345,7 @@ ru:
     ruined: RU:Key:ruined
     'ruined:': 'RU:Key:ruined:'
     ruined:*: RU:Key:ruined:*
+    ruined:building: RU:Key:ruined:building
     ruins: RU:Key:ruins
     rungs: RU:Key:rungs
     sac_scale: RU:Key:sac scale
@@ -25820,6 +27355,7 @@ ru:
     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
@@ -25838,6 +27374,7 @@ ru:
     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
     shoulder: RU:Key:shoulder
@@ -25848,6 +27385,8 @@ ru:
     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
@@ -25861,12 +27400,15 @@ ru:
     statue: RU:Key:statue
     step_count: RU:Key:step count
     stove: RU:Key:stove
+    studio: RU:Key:studio
     substance: RU:Key:substance
     supervised: RU:Key:supervised
     surface: RU:Key:surface
     surface:colour: RU:Key:surface:colour
     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
@@ -25879,11 +27421,13 @@ ru:
     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
+    tourist_bus: RU:Key:tourist bus
     tower:type: RU:Key:tower:type
     townhall:type: RU:Key:townhall:type
     tracktype: RU:Key:tracktype
@@ -25906,11 +27450,15 @@ ru:
     usage: RU:Key:usage
     vaccination: RU:Key:vaccination
     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
+    was:amenity: RU:Key:was:amenity
     washing_machine: RU:Key:washing machine
     waste: RU:Key:waste
     water: RU:Key:water
@@ -25931,7 +27479,10 @@ ru:
     zone:traffic: RU:Key:zone:traffic
     zoo: RU:Key:zoo
   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
@@ -25978,6 +27529,11 @@ ru:
     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=aircraft_crossing: RU:Tag:aeroway=aircraft crossing
     aeroway=airport: RU:Tag:aeroway=airport
@@ -25985,6 +27541,7 @@ ru:
     aeroway=airtanker_base: RU:Tag:aeroway=airtanker base
     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
@@ -25992,7 +27549,9 @@ ru:
     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=papi: RU:Tag:aeroway=papi
@@ -26003,31 +27562,38 @@ ru:
     aeroway=taxilane: RU:Tag:aeroway=taxilane
     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
     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_hitch: RU:Tag:amenity=animal hitch
     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=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=bear_box: RU:Tag:amenity=bear box
     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_trailer_sharing: RU:Tag:amenity=bicycle trailer sharing
+    amenity=bicycle_wash: RU:Tag:amenity=bicycle wash
     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
@@ -26035,10 +27601,14 @@ ru:
     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=carpet_washing: RU:Tag:amenity=carpet washing
     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
@@ -26051,15 +27621,22 @@ ru:
     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=crypt: RU:Tag:amenity=crypt
     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=dive_centre: RU:Tag:amenity=dive centre
+    amenity=doctor: RU:Tag:amenity=doctor
     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=dormitory: RU:Tag:amenity=dormitory
@@ -26067,22 +27644,32 @@ ru:
     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=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=festival_grounds: RU:Tag:amenity=festival grounds
     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=food_sharing: RU:Tag:amenity=food sharing
+    amenity=foot_shower: RU:Tag:amenity=foot shower
     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=funeral_hall: RU:Tag:amenity=funeral hall
     amenity=gambling: RU:Tag:amenity=gambling
     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
@@ -26093,39 +27680,57 @@ ru:
     amenity=hospital: RU:Tag:amenity=hospital
     amenity=hunting_stand: RU:Tag:amenity=hunting stand
     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=lavoir: RU:Tag:amenity=lavoir
     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=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=mailroom: RU:Tag:amenity=mailroom
     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_money_agent: RU:Tag:amenity=mobile money agent
     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=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=nursery: RU:Tag:amenity=nursery
     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=payment_centre: RU:Tag:amenity=payment centre
     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=post_depot: RU:Tag:amenity=post depot
     amenity=post_office: RU:Tag:amenity=post office
     amenity=prep_school: RU:Tag:amenity=prep school
     amenity=preschool: RU:Tag:amenity=preschool
@@ -26136,7 +27741,9 @@ ru:
     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=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
@@ -26150,25 +27757,33 @@ ru:
     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=social_centre: RU:Tag:amenity=social centre
+    amenity=social_club: RU:Tag:amenity=social club
     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=student_accommodation: RU:Tag:amenity=student accommodation
     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=ticket_validator: RU:Tag:amenity=ticket validator
+    amenity=toilet: RU:Tag:amenity=toilet
     amenity=toilets: RU:Tag:amenity=toilets
     amenity=tourist_bus_parking: RU:Tag:amenity=tourist bus parking
     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=tuition: RU:Tag:amenity=tuition
@@ -26188,22 +27803,28 @@ ru:
     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
+    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=stone: RU:Tag:artwork type=stone
+    association=student: RU:Tag:association=student
     atm=yes: RU:Tag:atm=yes
     attraction=alpine_coaster: RU:Tag:attraction=alpine coaster
     attraction=amusement_ride: RU:Tag:attraction=amusement ride
@@ -26217,6 +27838,7 @@ ru:
     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
@@ -26231,6 +27853,7 @@ ru:
     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
@@ -26257,6 +27880,7 @@ ru:
     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=wicket_gate: RU:Tag:barrier=wicket gate
     barrier=yes: RU:Tag:barrier=yes
@@ -26267,12 +27891,26 @@ ru:
     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
@@ -26283,6 +27921,8 @@ ru:
     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
@@ -26294,6 +27934,7 @@ ru:
     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
@@ -26325,7 +27966,10 @@ ru:
     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
@@ -26345,6 +27989,7 @@ ru:
     building=castle: RU:Tag:building=castle
     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
@@ -26358,6 +28003,7 @@ ru:
     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
@@ -26370,6 +28016,7 @@ ru:
     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=fixme: RU:Tag:building=fixme
     building=font: RU:Tag:building=font
     building=fort: RU:Tag:building=fort
     building=funeral_hall: RU:Tag:building=funeral hall
@@ -26382,6 +28029,8 @@ ru:
     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
@@ -26392,6 +28041,7 @@ ru:
     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=military: RU:Tag:building=military
@@ -26399,6 +28049,7 @@ ru:
     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
@@ -26412,6 +28063,7 @@ ru:
     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
@@ -26436,6 +28088,7 @@ ru:
     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
@@ -26452,7 +28105,9 @@ ru:
     building=wayside_shrine: RU:Tag:building=wayside shrine
     building=windmill: RU:Tag:building=windmill
     building=yes: RU:Tag:building=yes
+    bunker_type=nuclear: RU:Tag:bunker type=nuclear
     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
     camp_site=basic: RU:Tag:camp site=basic
@@ -26460,6 +28115,11 @@ ru:
     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
@@ -26473,32 +28133,48 @@ ru:
     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=bakery: RU:Tag:craft=bakery
     craft=basket_maker: RU:Tag:craft=basket maker
@@ -26525,14 +28201,22 @@ ru:
     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
+    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
@@ -26559,14 +28243,19 @@ ru:
     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
@@ -26606,6 +28295,7 @@ ru:
     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
@@ -26613,8 +28303,9 @@ ru:
     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
-    glideslope=yes: RU:Tag:glideslope=yes
     golf=bunker: RU:Tag:golf=bunker
     golf=clubhouse: RU:Tag:golf=clubhouse
     golf=driving_range: RU:Tag:golf=driving range
@@ -26634,8 +28325,11 @@ ru:
     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
@@ -26644,26 +28338,36 @@ ru:
     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=doctor: RU:Tag:healthcare=doctor
     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=busway: RU:Tag:highway=busway
     highway=construction: RU:Tag:highway=construction
     highway=crossing: RU:Tag:highway=crossing
     highway=cycleway: RU:Tag:highway=cycleway
@@ -26737,6 +28441,7 @@ ru:
     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
@@ -26758,7 +28463,9 @@ ru:
     historic=yes: RU:Tag:historic=yes
     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
@@ -26777,6 +28484,7 @@ ru:
     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
@@ -26784,6 +28492,7 @@ ru:
     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
@@ -26806,6 +28515,7 @@ ru:
     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
     landcover=grass: RU:Tag:landcover=grass
@@ -26825,6 +28535,7 @@ ru:
     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=farmland: RU:Tag:landuse=farmland
     landuse=farmyard: RU:Tag:landuse=farmyard
@@ -26852,6 +28563,7 @@ ru:
     landuse=military: RU:Tag:landuse=military
     landuse=observatory: RU:Tag:landuse=observatory
     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=plantation: RU:Tag:landuse=plantation
@@ -26872,6 +28584,7 @@ ru:
     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
@@ -26966,12 +28679,14 @@ ru:
     leisure=wildlife_hide: RU:Tag:leisure=wildlife hide
     lifeguard=base: RU:Tag:lifeguard=base
     lifeguard=tower: RU:Tag:lifeguard=tower
-    localizer=yes: RU:Tag:localizer=yes
     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
     logistics=aerospace: RU:Tag:logistics=aerospace
+    logistics=goods_distribution: RU:Tag:logistics=goods distribution
     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
@@ -27001,6 +28716,7 @@ ru:
     man_made=gas_well: RU:Tag:man made=gas well
     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
@@ -27039,7 +28755,10 @@ ru:
     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
@@ -27049,15 +28768,20 @@ ru:
     microbrewery=yes: RU:Tag:microbrewery=yes
     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=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=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
-    motorcycle:type=electric: RU:Tag:motorcycle:type=electric
-    motorcycle:type=sportbike: RU:Tag:motorcycle:type=sportbike
+    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
@@ -27079,9 +28803,11 @@ ru:
     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=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
@@ -27090,7 +28816,9 @@ ru:
     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=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
@@ -27105,6 +28833,7 @@ ru:
     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
@@ -27113,9 +28842,13 @@ ru:
     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
@@ -27171,6 +28904,7 @@ ru:
     office=register: RU:Tag:office=register
     office=religion: RU:Tag:office=religion
     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
@@ -27199,6 +28933,7 @@ ru:
     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
@@ -27207,26 +28942,46 @@ ru:
     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=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=borough: RU:Tag:place=borough
     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=municipality: RU:Tag:place=municipality
     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=region: RU:Tag:place=region
+    place=sea: RU:Tag:place=sea
     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_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
@@ -27241,6 +28996,7 @@ ru:
     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=car_pound: RU:Tag:police=car pound
@@ -27257,6 +29013,7 @@ ru:
     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
@@ -27269,6 +29026,7 @@ ru:
     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=stop_area: RU:Tag:public transport=stop area
@@ -27301,18 +29059,24 @@ ru:
     recycling_type=centre: RU:Tag:recycling type=centre
     recycling_type=container: RU:Tag:recycling type=container
     religion=pagan: RU:Tag:religion=pagan
+    religion=shamanic: RU:Tag:religion=shamanic
     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=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=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
@@ -27326,12 +29090,15 @@ ru:
     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=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=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
@@ -27347,10 +29114,19 @@ ru:
     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=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
@@ -27432,6 +29208,7 @@ ru:
     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
@@ -27455,6 +29232,7 @@ ru:
     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
@@ -27487,9 +29265,14 @@ ru:
     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
+    source:addr=Đ•Đ“Đ Đť: RU:Tag:source:addr=Đ•Đ“Đ Đť
+    source:maxspeed=sign: RU:Tag:source:maxspeed=sign
     sport=archery: RU:Tag:sport=archery
     sport=cycling: RU:Tag:sport=cycling
     sport=dog_racing: RU:Tag:sport=dog racing
@@ -27507,9 +29290,14 @@ ru:
     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
@@ -27520,10 +29308,24 @@ ru:
     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
     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
@@ -27561,6 +29363,7 @@ ru:
     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=trail_riding_rest: RU:Tag:tourism=trail riding rest
     tourism=trail_riding_station: RU:Tag:tourism=trail riding station
@@ -27572,7 +29375,11 @@ ru:
     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=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
@@ -27582,9 +29389,11 @@ ru:
     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
@@ -27600,18 +29409,71 @@ ru:
     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;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
@@ -27642,6 +29504,7 @@ ru:
     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
@@ -27685,6 +29548,7 @@ sk:
     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
   tag:
     refitted=yes: Sk:Tag:refitted=yes
@@ -27697,10 +29561,12 @@ sq:
 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:
@@ -27712,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
+    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
@@ -27723,10 +29590,16 @@ sv:
 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
@@ -27734,6 +29607,7 @@ tr:
     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:
@@ -27769,6 +29643,7 @@ uk:
     addr:postbox: Uk:Key:addr:postbox
     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:subdistrict: Uk:Key:addr:subdistrict
@@ -27797,6 +29672,7 @@ uk:
     bridge: Uk:Key:bridge
     building: Uk:Key:building
     building:levels: Uk:Key:building:levels
+    building:part: Uk:Key:building:part
     capital: Uk:Key:capital
     cemetery: Uk:Key:cemetery
     colonnade: Uk:Key:colonnade
@@ -27824,6 +29700,7 @@ uk:
     footway: Uk:Key:footway
     ford: Uk:Key:ford
     forward: Uk:Key:forward
+    gauge: Uk:Key:gauge
     government: Uk:Key:government
     hazard: Uk:Key:hazard
     height: Uk:Key:height
@@ -27832,6 +29709,7 @@ uk:
     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
@@ -27876,6 +29754,7 @@ uk:
     opening_hours/Tutorial: Uk:Key:opening hours/Tutorial
     operator: Uk:Key:operator
     park_ride: Uk:Key:park ride
+    phone: Uk:Key:phone
     place: Uk:Key:place
     placement: Uk:Key:placement
     playground: Uk:Key:playground
@@ -27901,6 +29780,7 @@ uk:
     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
@@ -27909,7 +29789,9 @@ uk:
     surface: Uk:Key:surface
     tracktype: Uk:Key:tracktype
     traffic_sign: Uk:Key:traffic sign
+    traffic_signals: Uk:Key:traffic signals
     tunnel: Uk:Key:tunnel
+    turn: Uk:Key:turn
     type: Uk:Key:type
     url: Uk:Key:url
     vehicle: Uk:Key:vehicle
     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=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=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_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=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=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=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=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=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=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=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=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=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=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=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=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=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=retaining_wall: Uk:Tag:barrier=retaining wall
     barrier=wicket_gate: Uk:Tag:barrier=wicket gate
     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=political: Uk:Tag:boundary=political
     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=civic: Uk:Tag:building=civic
+    building=college: Uk:Tag:building=college
     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=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
@@ -28009,6 +30142,11 @@ uk:
     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
@@ -28033,6 +30171,7 @@ uk:
     highway=busway: Uk:Tag:highway=busway
     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=escape: Uk:Tag:highway=escape
     highway=footway: Uk:Tag:highway=footway
@@ -28055,6 +30194,7 @@ uk:
     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=turning_circle: Uk:Tag:highway=turning circle
     highway=unclassified: Uk:Tag:highway=unclassified
@@ -28091,8 +30231,10 @@ uk:
     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=flare: Uk:Tag:man made=flare
@@ -28144,6 +30286,8 @@ uk:
     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
@@ -28172,6 +30316,7 @@ uk:
     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
@@ -28185,7 +30330,10 @@ uk:
     railway=tram: Uk:Tag:railway=tram
     railway=water_crane: Uk:Tag:railway=water crane
     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=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
@@ -28199,15 +30347,19 @@ uk:
     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=multi: Uk:Tag:sport=multi
     sport=parachuting: Uk:Tag:sport=parachuting
     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
     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
     water=river: Uk:Tag:water=river
@@ -28283,12 +30435,15 @@ zh-hans:
   key:
     abutters: Zh-hans:Key:abutters
     access: Zh-hans:Key:access
+    admin_level: Zh-hans:Key:admin level
     amenity: Zh-hans:Key:amenity
     attraction: Zh-hans:Key:attraction
     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
     cycleway: Zh-hans:Key:cycleway
@@ -28300,6 +30455,7 @@ zh-hans:
     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
     highspeed: Zh-hans:Key:highspeed
@@ -28342,6 +30498,7 @@ zh-hans:
     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=bicycle_rental: Zh-hans:Tag:amenity=bicycle rental
@@ -28352,20 +30509,25 @@ zh-hans:
     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
+    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
     building=apartments: Zh-hans:Tag:building=apartments
     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
@@ -28375,6 +30537,7 @@ zh-hans:
     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
+    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
@@ -28404,12 +30567,15 @@ zh-hans:
     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=construction: Zh-hans:Tag:landuse=construction
     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
@@ -28418,6 +30584,7 @@ zh-hans:
     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=shingle: Zh-hans:Tag:natural=shingle
     natural=shrubbery: Zh-hans:Tag:natural=shrubbery
@@ -28490,7 +30657,6 @@ zh-hant:
     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
@@ -28543,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
+    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
@@ -28550,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
+    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