]> git.openstreetmap.org Git - rails.git/blobdiff - config/wiki_pages.yml
Merge remote-tracking branch 'upstream/pull/2519'
[rails.git] / config / wiki_pages.yml
index 7555362c5b95cc03b4b5aaf0953e89f36ec96a49..2579814246af53cece5c97e506e5393be934a8d0 100644 (file)
@@ -29,6 +29,7 @@ bn:
 ca:
   key:
     amenity: Ca:Key:amenity
+    lgbtq: Ca:Key:lgbtq
     name: Ca:Key:name
     operator:type: Ca:Key:operator:type
     phone: Ca:Key:phone
@@ -146,7 +147,6 @@ cs:
     building:part: Cs:Key:building:part
     building:place: Cs:Key:building:place
     building:ruian:type: Cs:Key:building:ruian:type
-    building:type: Cs:Key:building:type
     building:use: Cs:Key:building:use
     bulk_purchase: Cs:Key:bulk purchase
     bunker_type: Cs:Key:bunker type
@@ -970,6 +970,7 @@ cs:
     amenity=ticket_booth: Cs:Tag:amenity=ticket booth
     amenity=toilets: Cs:Tag:amenity=toilets
     amenity=townhall: Cs:Tag:amenity=townhall
+    amenity=trolley_bay: Cs:Tag:amenity=trolley bay
     amenity=university: Cs:Tag:amenity=university
     amenity=vacuum_cleaner: Cs:Tag:amenity=vacuum cleaner
     amenity=vehicle_inspection: Cs:Tag:amenity=vehicle inspection
@@ -1553,7 +1554,6 @@ cs:
     man_made=petroleum_well: Cs:Tag:man made=petroleum well
     man_made=pier: Cs:Tag:man made=pier
     man_made=pipeline: Cs:Tag:man made=pipeline
-    man_made=power_fossil: Cs:Tag:man made=power fossil
     man_made=power_hydro: Cs:Tag:man made=power hydro
     man_made=power_nuclear: Cs:Tag:man made=power nuclear
     man_made=power_wind: Cs:Tag:man made=power wind
@@ -1695,6 +1695,7 @@ cs:
     office=newspaper: Cs:Tag:office=newspaper
     office=ngo: Cs:Tag:office=ngo
     office=notary: Cs:Tag:office=notary
+    office=parish: Cs:Tag:office=parish
     office=political_party: Cs:Tag:office=political party
     office=private_investigator: Cs:Tag:office=private investigator
     office=quango: Cs:Tag:office=quango
@@ -2076,6 +2077,7 @@ cs:
     sport=bowls: Cs:Tag:sport=bowls
     sport=boxing: Cs:Tag:sport=boxing
     sport=canadian_football: Cs:Tag:sport=canadian football
+    sport=motocross: Cs:Tag:sport=motocross
     station=light_rail: Cs:Tag:station=light rail
     station=subway: Cs:Tag:station=subway
     summit:cross=yes: Cs:Tag:summit:cross=yes
@@ -2214,6 +2216,7 @@ da:
     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
@@ -2255,6 +2258,7 @@ de:
     addr:housenumber: DE:Key:addr:housenumber
     addr:inclusion: DE:Key:addr:inclusion
     addr:interpolation: DE:Key:addr:interpolation
+    addr:place: DE:Key:addr:place
     addr:postcode: DE:Key:addr:postcode
     addr:street: DE:Key:addr:street
     addr:suburb: DE:Key:addr:suburb
@@ -2271,6 +2275,7 @@ de:
     artwork_type: DE:Key:artwork type
     asb: DE:Key:asb
     ascent: DE:Key:ascent
+    attraction: DE:Key:attraction
     authentication: DE:Key:authentication
     automated: DE:Key:automated
     backcountry: DE:Key:backcountry
@@ -2310,8 +2315,10 @@ de:
     building:levels:underground: DE:Key:building:levels:underground
     building:material: DE:Key:building:material
     building:part: DE:Key:building:part
+    bulk_purchase: DE:Key:bulk purchase
     bunker_type: DE:Key:bunker type
     bus: DE:Key:bus
+    bus_bay: DE:Key:bus bay
     busway: DE:Key:busway
     cables: DE:Key:cables
     canoe: DE:Key:canoe
@@ -2348,6 +2355,7 @@ de:
     contact:facebook: DE:Key:contact:facebook
     contact:fax: DE:Key:contact:fax
     contact:google_plus: DE:Key:contact:google plus
+    contact:mobile: DE:Key:contact:mobile
     contact:phone: DE:Key:contact:phone
     contact:website: DE:Key:contact:website
     content: DE:Key:content
@@ -2355,11 +2363,13 @@ de:
     country: DE:Key:country
     covered: DE:Key:covered
     craft: DE:Key:craft
+    crane:type: DE:Key:crane:type
     created_by: DE:Key:created by
     crossing: DE:Key:crossing
     crossing:activation: DE:Key:crossing:activation
     crossing:barrier: DE:Key:crossing:barrier
     crossing:bell: DE:Key:crossing:bell
+    crossing:island: DE:Key:crossing:island
     crossing:light: DE:Key:crossing:light
     crossing:on_demand: DE:Key:crossing:on demand
     crossing:saltire: DE:Key:crossing:saltire
@@ -2373,6 +2383,7 @@ de:
     cycleway: DE:Key:cycleway
     cycleway:left: DE:Key:cycleway:left
     cycleway:right: DE:Key:cycleway:right
+    cycleway:surface: DE:Key:cycleway:surface
     date: DE:Key:date
     de:amtlicher_gemeindeschluessel: DE:Key:de:amtlicher gemeindeschluessel
     de:regionalschluessel: DE:Key:de:regionalschluessel
@@ -2430,6 +2441,7 @@ de:
     fortification_type: DE:Key:fortification type
     forward: DE:Key:forward
     frequency: DE:Key:frequency
+    fridge: DE:Key:fridge
     from: DE:Key:from
     fuel: DE:Key:fuel
     fuel:LH2: DE:Key:fuel:LH2
@@ -2452,12 +2464,15 @@ de:
     government: DE:Key:government
     group_only: DE:Key:group only
     guest_house: DE:Key:guest house
-    hazard: DE:Key:hazard
+    harbour: DE:Key:harbour
     hazmat: DE:Key:hazmat
+    hazmat:water: DE:Key:hazmat:water
     healthcare: DE:Key:healthcare
+    healthcare:counselling: DE:Key:healthcare:counselling
     height: DE:Key:height
     heritage: DE:Key:heritage
     hgv: DE:Key:hgv
+    hgv_articulated: DE:Key:hgv articulated
     highspeed: DE:Key:highspeed
     highway: DE:Key:highway
     hiking: DE:Key:hiking
@@ -2466,6 +2481,7 @@ de:
     historic:period: DE:Key:historic:period
     horse: DE:Key:horse
     horse_scale: DE:Key:horse scale
+    ice_cream: DE:Key:ice cream
     ice_road: DE:Key:ice road
     image: DE:Key:image
     importance: DE:Key:importance
@@ -2478,8 +2494,11 @@ de:
     int_name: DE:Key:int name
     intermittent: DE:Key:intermittent
     internet_access: DE:Key:internet access
+    interval: DE:Key:interval
     is_in: DE:Key:is in
     is_in:continent: DE:Key:is in:continent
+    is_in:country: DE:Key:is in:country
+    is_in:county: DE:Key:is in:county
     junction: DE:Key:junction
     kids_area: DE:Key:kids area
     kms: DE:Key:kms
@@ -2487,7 +2506,9 @@ de:
     landfill:waste: DE:Key:landfill:waste
     landuse: DE:Key:landuse
     lanes: DE:Key:lanes
+    lanes:backward: DE:Key:lanes:backward
     lanes:bus: DE:Key:lanes:bus
+    lanes:forward: DE:Key:lanes:forward
     lanes:psv: DE:Key:lanes:psv
     lanes:psv:backward: DE:Key:lanes:psv:backward
     lanes:psv:forward: DE:Key:lanes:psv:forward
@@ -2502,6 +2523,7 @@ de:
     level: DE:Key:level
     line: DE:Key:line
     lit: DE:Key:lit
+    living_street: DE:Key:living street
     loc_name: DE:Key:loc name
     location: DE:Key:location
     lock: DE:Key:lock
@@ -2522,6 +2544,8 @@ de:
     maxheight: DE:Key:maxheight
     maxlength: DE:Key:maxlength
     maxspeed: DE:Key:maxspeed
+    maxspeed:backward: DE:Key:maxspeed:backward
+    maxspeed:forward: DE:Key:maxspeed:forward
     maxspeed:type: DE:Key:maxspeed:type
     maxstay: DE:Key:maxstay
     maxweight: DE:Key:maxweight
@@ -2532,6 +2556,7 @@ de:
     milestone_type: DE:Key:milestone type
     military: DE:Key:military
     min_age: DE:Key:min age
+    mindistance: DE:Key:mindistance
     mineshaft_type: DE:Key:mineshaft type
     minspeed: DE:Key:minspeed
     minspeed:lanes: DE:Key:minspeed:lanes
@@ -2557,7 +2582,6 @@ de:
     motorcycle:clothes: DE:Key:motorcycle:clothes
     motorcycle:conditional: DE:Key:motorcycle:conditional
     motorcycle:parking: DE:Key:motorcycle:parking
-    motorcycle:parts: DE:Key:motorcycle:parts
     motorcycle:rental: DE:Key:motorcycle:rental
     motorcycle:repair: DE:Key:motorcycle:repair
     motorcycle:sales: DE:Key:motorcycle:sales
@@ -2580,6 +2604,7 @@ de:
     note: DE:Key:note
     nudism: DE:Key:nudism
     nursery: DE:Key:nursery
+    object: DE:Key:object
     observatory:type: DE:Key:observatory:type
     office: DE:Key:office
     official_name: DE:Key:official name
@@ -2603,6 +2628,7 @@ de:
     overtaking: DE:Key:overtaking
     par: DE:Key:par
     parking: DE:Key:parking
+    parking:condition: DE:Key:parking:condition
     parking:lane: DE:Key:parking:lane
     parking:lane:hgv: DE:Key:parking:lane:hgv
     passenger_information_display: DE:Key:passenger information display
@@ -2614,6 +2640,7 @@ de:
     place: DE:Key:place
     placement: DE:Key:placement
     plant: DE:Key:plant
+    plant:method: DE:Key:plant:method
     plant:output: DE:Key:plant:output
     plant:output:electricity: DE:Key:plant:output:electricity
     plant:output:hot_water: DE:Key:plant:output:hot water
@@ -2621,6 +2648,7 @@ de:
     playground: DE:Key:playground
     'playground:': 'DE:Key:playground:'
     population: DE:Key:population
+    post_box:type: DE:Key:post box:type
     post_office: DE:Key:post office
     post_office:type: DE:Key:post office:type
     postal_code: DE:Key:postal code
@@ -2636,6 +2664,7 @@ de:
     psv: DE:Key:psv
     public_bookcase:type: DE:Key:public bookcase:type
     public_transport: DE:Key:public transport
+    public_transport:tied_with: DE:Key:public transport:tied with
     pump: DE:Key:pump
     rack: DE:Key:rack
     railway: DE:Key:railway
@@ -2657,6 +2686,7 @@ de:
     room: DE:Key:room
     rooms: DE:Key:rooms
     rotor:diameter: DE:Key:rotor:diameter
+    roundtrip: DE:Key:roundtrip
     route: DE:Key:route
     ruins: DE:Key:ruins
     sac_scale: DE:Key:sac scale
@@ -2713,7 +2743,11 @@ de:
     tactile_writing: DE:Key:tactile writing
     takeaway: DE:Key:takeaway
     target: DE:Key:target
+    telecom:medium: DE:Key:telecom:medium
     telescope:type: DE:Key:telescope:type
+    tents: DE:Key:tents
+    theatre:genre: DE:Key:theatre:genre
+    theatre:type: DE:Key:theatre:type
     tidal: DE:Key:tidal
     to: DE:Key:to
     todo: DE:Key:todo
@@ -2738,6 +2772,8 @@ de:
     tunnel: DE:Key:tunnel
     turn: DE:Key:turn
     turn:lanes: DE:Key:turn:lanes
+    turn:lanes:backward: DE:Key:turn:lanes:backward
+    turn:lanes:forward: DE:Key:turn:lanes:forward
     type: DE:Key:type
     usage: DE:Key:usage
     vehicle: DE:Key:vehicle
@@ -2745,6 +2781,8 @@ de:
     viewpoint: DE:Key:viewpoint
     visibility: DE:Key:visibility
     voltage: DE:Key:voltage
+    voltage:primary: DE:Key:voltage:primary
+    voltage:secondary: DE:Key:voltage:secondary
     waste: DE:Key:waste
     water: DE:Key:water
     water_characteristic: DE:Key:water characteristic
@@ -2759,11 +2797,13 @@ de:
     wikimedia_commons: DE:Key:wikimedia commons
     wikipedia: DE:Key:wikipedia
     winter_road: DE:Key:winter road
+    winter_service: DE:Key:winter service
     wires: DE:Key:wires
     wood: DE:Key:wood
     workrules: DE:Key:workrules
     xmas:feature: DE:Key:xmas:feature
     year_of_construction: DE:Key:year of construction
+    zero_waste: DE:Key:zero waste
     zone:maxspeed: DE:Key:zone:maxspeed
     zoo: DE:Key:zoo
   tag:
@@ -2792,12 +2832,15 @@ de:
     aeroway=hangar: DE:Tag:aeroway=hangar
     aeroway=helipad: DE:Tag:aeroway=helipad
     aeroway=heliport: DE:Tag:aeroway=heliport
+    aeroway=holding_position: DE:Tag:aeroway=holding position
     aeroway=navigationaid: DE:Tag:aeroway=navigationaid
     aeroway=parking_position: DE:Tag:aeroway=parking position
     aeroway=runway: DE:Tag:aeroway=runway
     aeroway=spaceport: DE:Tag:aeroway=spaceport
+    aeroway=taxilane: DE:Tag:aeroway=taxilane
     aeroway=taxiway: DE:Tag:aeroway=taxiway
     aeroway=terminal: DE:Tag:aeroway=terminal
+    aeroway=windsock: DE:Tag:aeroway=windsock
     airmark=beacon: DE:Tag:airmark=beacon
     amenity=administration: DE:Tag:amenity=administration
     amenity=animal_boarding: DE:Tag:amenity=animal boarding
@@ -2817,10 +2860,12 @@ de:
     amenity=bicycle_repair_station: DE:Tag:amenity=bicycle repair station
     amenity=biergarten: DE:Tag:amenity=biergarten
     amenity=boat_rental: DE:Tag:amenity=boat rental
+    amenity=boat_storage: DE:Tag:amenity=boat storage
     amenity=brothel: DE:Tag:amenity=brothel
     amenity=bureau_de_change: DE:Tag:amenity=bureau de change
     amenity=bus_station: DE:Tag:amenity=bus station
     amenity=cafe: DE:Tag:amenity=cafe
+    amenity=car_pooling: DE:Tag:amenity=car pooling
     amenity=car_rental: DE:Tag:amenity=car rental
     amenity=car_sharing: DE:Tag:amenity=car sharing
     amenity=car_wash: DE:Tag:amenity=car wash
@@ -2854,23 +2899,28 @@ de:
     amenity=fire_station: DE:Tag:amenity=fire station
     amenity=fish_spa: DE:Tag:amenity=fish spa
     amenity=fountain: DE:Tag:amenity=fountain
+    amenity=fridge: DE:Tag:amenity=fridge
     amenity=fuel: DE:Tag:amenity=fuel
     amenity=grave_yard: DE:Tag:amenity=grave yard
     amenity=grit_bin: DE:Tag:amenity=grit bin
     amenity=hookah_lounge: DE:Tag:amenity=hookah lounge
+    amenity=hospice: DE:Tag:amenity=hospice
     amenity=hospital: DE:Tag:amenity=hospital
     amenity=hunting_stand: DE:Tag:amenity=hunting stand
     amenity=ice_cream: DE:Tag:amenity=ice cream
     amenity=internet_cafe: DE:Tag:amenity=internet cafe
     amenity=kindergarten: DE:Tag:amenity=kindergarten
+    amenity=kitchen: DE:Tag:amenity=kitchen
     amenity=kneipp_water_cure: DE:Tag:amenity=kneipp water cure
     amenity=language_school: DE:Tag:amenity=language school
     amenity=library: DE:Tag:amenity=library
     amenity=marketplace: DE:Tag:amenity=marketplace
     amenity=medical_supply: DE:Tag:amenity=medical supply
     amenity=monastery: DE:Tag:amenity=monastery
+    amenity=money_transfer: DE:Tag:amenity=money transfer
     amenity=motorcycle_parking: DE:Tag:amenity=motorcycle parking
     amenity=music_school: DE:Tag:amenity=music school
+    amenity=music_venue: DE:Tag:amenity=music venue
     amenity=nightclub: DE:Tag:amenity=nightclub
     amenity=nursing_home: DE:Tag:amenity=nursing home
     amenity=parking: DE:Tag:amenity=parking
@@ -2882,6 +2932,7 @@ de:
     amenity=planetarium: DE:Tag:amenity=planetarium
     amenity=police: DE:Tag:amenity=police
     amenity=post_box: DE:Tag:amenity=post box
+    amenity=post_depot: DE:Tag:amenity=post depot
     amenity=post_office: DE:Tag:amenity=post office
     amenity=prison: DE:Tag:amenity=prison
     amenity=prison_camp: DE:Tag:amenity=prison camp
@@ -2915,16 +2966,20 @@ de:
     amenity=vending_machine: DE:Tag:amenity=vending machine
     amenity=veterinary: DE:Tag:amenity=veterinary
     amenity=waste_basket: DE:Tag:amenity=waste basket
+    amenity=waste_disposal: DE:Tag:amenity=waste disposal
     amenity=waste_transfer_station: DE:Tag:amenity=waste transfer station
     amenity=water_point: DE:Tag:amenity=water point
     amenity=watering_place: DE:Tag:amenity=watering place
     amenity=weighbridge: DE:Tag:amenity=weighbridge
     amenity=youth_centre: DE:Tag:amenity=youth centre
+    animal=horse_walker: DE:Tag:animal=horse walker
     animal=school: DE:Tag:animal=school
     artwork_type=sculpture: DE:Tag:artwork type=sculpture
     artwork_type=statue: DE:Tag:artwork type=statue
     atm=yes: DE:Tag:atm=yes
     attraction=animal: DE:Tag:attraction=animal
+    attraction=roller_coaster: DE:Tag:attraction=roller coaster
+    attraction=summer_toboggan: DE:Tag:attraction=summer toboggan
     attraction=train: DE:Tag:attraction=train
     attraction=water_slide: DE:Tag:attraction=water slide
     barrier=block: DE:Tag:barrier=block
@@ -2935,15 +2990,20 @@ de:
     barrier=ditch: DE:Tag:barrier=ditch
     barrier=entrance: DE:Tag:barrier=entrance
     barrier=fence: DE:Tag:barrier=fence
+    barrier=full-height_turnstile: DE:Tag:barrier=full-height turnstile
     barrier=gate: DE:Tag:barrier=gate
+    barrier=guard_rail: DE:Tag:barrier=guard rail
     barrier=hedge: DE:Tag:barrier=hedge
     barrier=hedge_bank: DE:Tag:barrier=hedge bank
     barrier=height_restrictor: DE:Tag:barrier=height restrictor
+    barrier=kerb: DE:Tag:barrier=kerb
     barrier=kissing_gate: DE:Tag:barrier=kissing gate
     barrier=lift_gate: DE:Tag:barrier=lift gate
     barrier=retaining_wall: DE:Tag:barrier=retaining wall
     barrier=sally_port: DE:Tag:barrier=sally port
+    barrier=stile: DE:Tag:barrier=stile
     barrier=toll_booth: DE:Tag:barrier=toll booth
+    barrier=turnstile: DE:Tag:barrier=turnstile
     barrier=wall: DE:Tag:barrier=wall
     bath:type=hammam: DE:Tag:bath:type=hammam
     bath:type=thermal: DE:Tag:bath:type=thermal
@@ -2986,6 +3046,7 @@ de:
     building=civic: DE:Tag:building=civic
     building=commercial: DE:Tag:building=commercial
     building=container: DE:Tag:building=container
+    building=cowshed: DE:Tag:building=cowshed
     building=detached: DE:Tag:building=detached
     building=dormitory: DE:Tag:building=dormitory
     building=entrance: DE:Tag:building=entrance
@@ -3004,6 +3065,7 @@ de:
     building=marquee: DE:Tag:building=marquee
     building=mosque: DE:Tag:building=mosque
     building=parking: DE:Tag:building=parking
+    building=pavilion: DE:Tag:building=pavilion
     building=public: DE:Tag:building=public
     building=residential: DE:Tag:building=residential
     building=retail: DE:Tag:building=retail
@@ -3041,6 +3103,7 @@ de:
     club=scout: DE:Tag:club=scout
     club=sport: DE:Tag:club=sport
     communication=line: DE:Tag:communication=line
+    construction=yes: DE:Tag:construction=yes
     craft=agricultural_engines: DE:Tag:craft=agricultural engines
     craft=basket_maker: DE:Tag:craft=basket maker
     craft=beekeeper: DE:Tag:craft=beekeeper
@@ -3053,6 +3116,7 @@ de:
     craft=carpet_layer: DE:Tag:craft=carpet layer
     craft=caterer: DE:Tag:craft=caterer
     craft=chimney_sweeper: DE:Tag:craft=chimney sweeper
+    craft=confectionery: DE:Tag:craft=confectionery
     craft=cooper: DE:Tag:craft=cooper
     craft=dental_technician: DE:Tag:craft=dental technician
     craft=distillery: DE:Tag:craft=distillery
@@ -3091,6 +3155,10 @@ de:
     craft=watchmaker: DE:Tag:craft=watchmaker
     craft=window_construction: DE:Tag:craft=window construction
     craft=winery: DE:Tag:craft=winery
+    crane:type=floor-mounted_crane: DE:Tag:crane:type=floor-mounted crane
+    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
     cuisine=coffee_shop: DE:Tag:cuisine=coffee shop
     cycleway:left=lane: DE:Tag:cycleway:left=lane
     cycleway:right=lane: DE:Tag:cycleway:right=lane
@@ -3135,6 +3203,7 @@ de:
     emergency=water_rescue_station: DE:Tag:emergency=water rescue station
     emergency_service=technical: DE:Tag:emergency service=technical
     entrance=main: DE:Tag:entrance=main
+    entrance=staircase: DE:Tag:entrance=staircase
     entrance=yes: DE:Tag:entrance=yes
     foot=designated: DE:Tag:foot=designated
     footway=crossing: DE:Tag:footway=crossing
@@ -3201,6 +3270,7 @@ de:
     golf=rough: DE:Tag:golf=rough
     golf=tee: DE:Tag:golf=tee
     golf=water_hazard: DE:Tag:golf=water hazard
+    government=archive: DE:Tag:government=archive
     government=cadaster: DE:Tag:government=cadaster
     government=customs: DE:Tag:government=customs
     government=healthcare: DE:Tag:government=healthcare
@@ -3212,7 +3282,9 @@ de:
     government=youth_welfare_department: DE:Tag:government=youth welfare department
     hazmat:water=permissive: DE:Tag:hazmat:water=permissive
     healthcare=blood_donation: DE:Tag:healthcare=blood donation
+    healthcare=dentist: DE:Tag:healthcare=dentist
     healthcare=laboratory: DE:Tag:healthcare=laboratory
+    healthcare=physiotherapist: DE:Tag:healthcare=physiotherapist
     highway=abandoned: DE:Tag:highway=abandoned
     highway=access: DE:Tag:highway=access
     highway=bridleway: DE:Tag:highway=bridleway
@@ -3264,6 +3336,7 @@ de:
     highway=tertiary: DE:Tag:highway=tertiary
     highway=tertiary_link: DE:Tag:highway=tertiary link
     highway=track: DE:Tag:highway=track
+    highway=traffic_mirror: DE:Tag:highway=traffic mirror
     highway=traffic_sign: DE:Tag:highway=traffic sign
     highway=traffic_signals: DE:Tag:highway=traffic signals
     highway=trunk: DE:Tag:highway=trunk
@@ -3278,6 +3351,7 @@ de:
     historic=battlefield: DE:Tag:historic=battlefield
     historic=bomb_crater: DE:Tag:historic=bomb crater
     historic=boundary_stone: DE:Tag:historic=boundary stone
+    historic=cannon: DE:Tag:historic=cannon
     historic=castle: DE:Tag:historic=castle
     historic=charcoal_pile: DE:Tag:historic=charcoal pile
     historic=city_gate: DE:Tag:historic=city gate
@@ -3289,6 +3363,7 @@ de:
     historic=memorial: DE:Tag:historic=memorial
     historic=milestone: DE:Tag:historic=milestone
     historic=mine: DE:Tag:historic=mine
+    historic=mine_shaft: DE:Tag:historic=mine shaft
     historic=monastery: DE:Tag:historic=monastery
     historic=monument: DE:Tag:historic=monument
     historic=optical_telegraph: DE:Tag:historic=optical telegraph
@@ -3386,12 +3461,14 @@ de:
     leisure=sauna: DE:Tag:leisure=sauna
     leisure=slipway: DE:Tag:leisure=slipway
     leisure=sports_centre: DE:Tag:leisure=sports centre
+    leisure=sports_hall: DE:Tag:leisure=sports hall
     leisure=stadium: DE:Tag:leisure=stadium
     leisure=swimming_area: DE:Tag:leisure=swimming area
     leisure=swimming_pool: DE:Tag:leisure=swimming pool
     leisure=table_tennis_table: DE:Tag:leisure=table tennis table
     leisure=tanning_salon: DE:Tag:leisure=tanning salon
     leisure=track: DE:Tag:leisure=track
+    leisure=trampoline_park: DE:Tag:leisure=trampoline park
     leisure=water_park: DE:Tag:leisure=water park
     leisure=wildlife_hide: DE:Tag:leisure=wildlife hide
     level_crossing=automatic_barrier: DE:Tag:level crossing=automatic barrier
@@ -3413,17 +3490,20 @@ de:
     man_made=crane: DE:Tag:man made=crane
     man_made=cross: DE:Tag:man made=cross
     man_made=cutline: DE:Tag:man made=cutline
+    man_made=dovecote: DE:Tag:man made=dovecote
     man_made=dyke: DE:Tag:man made=dyke
     man_made=embankment: DE:Tag:man made=embankment
     man_made=flagpole: DE:Tag:man made=flagpole
     man_made=gasometer: DE:Tag:man made=gasometer
     man_made=goods_conveyor: DE:Tag:man made=goods conveyor
+    man_made=graduation_tower: DE:Tag:man made=graduation tower
     man_made=groyne: DE:Tag:man made=groyne
     man_made=hot_water_tank: DE:Tag:man made=hot water tank
     man_made=insect_hotel: DE:Tag:man made=insect hotel
     man_made=kiln: DE:Tag:man made=kiln
     man_made=lighthouse: DE:Tag:man made=lighthouse
     man_made=mast: DE:Tag:man made=mast
+    man_made=maypole: DE:Tag:man made=maypole
     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
@@ -3436,6 +3516,7 @@ de:
     man_made=power_wind: DE:Tag:man made=power wind
     man_made=pumping_station: DE:Tag:man made=pumping station
     man_made=reservoir_covered: DE:Tag:man made=reservoir covered
+    man_made=satellite_dish: DE:Tag:man made=satellite dish
     man_made=silo: DE:Tag:man made=silo
     man_made=snow_cannon: DE:Tag:man made=snow cannon
     man_made=spoil_heap: DE:Tag:man made=spoil heap
@@ -3483,14 +3564,18 @@ de:
     military=range: DE:Tag:military=range
     military=training_area: DE:Tag:military=training area
     motorcycle:type=scooter: DE:Tag:motorcycle:type=scooter
+    museum=children: DE:Tag:museum=children
     museum=history: DE:Tag:museum=history
     museum=local: DE:Tag:museum=local
+    museum=nature: DE:Tag:museum=nature
+    museum=open_air: DE:Tag:museum=open air
     museum=railway: DE:Tag:museum=railway
     natural=anthill: DE:Tag:natural=anthill
     natural=arete: DE:Tag:natural=arete
     natural=bare_rock: DE:Tag:natural=bare rock
     natural=bay: DE:Tag:natural=bay
     natural=beach: DE:Tag:natural=beach
+    natural=cape: DE:Tag:natural=cape
     natural=cave_entrance: DE:Tag:natural=cave entrance
     natural=cliff: DE:Tag:natural=cliff
     natural=coastline: DE:Tag:natural=coastline
@@ -3498,13 +3583,16 @@ de:
     natural=fell: DE:Tag:natural=fell
     natural=geyser: DE:Tag:natural=geyser
     natural=glacier: DE:Tag:natural=glacier
+    natural=gorge: DE:Tag:natural=gorge
     natural=grassland: DE:Tag:natural=grassland
     natural=gully: DE:Tag:natural=gully
     natural=heath: DE:Tag:natural=heath
     natural=hot_spring: DE:Tag:natural=hot spring
+    natural=isthmus: DE:Tag:natural=isthmus
     natural=moor: DE:Tag:natural=moor
     natural=mud: DE:Tag:natural=mud
     natural=peak: DE:Tag:natural=peak
+    natural=peninsula: DE:Tag:natural=peninsula
     natural=reef: DE:Tag:natural=reef
     natural=ridge: DE:Tag:natural=ridge
     natural=rock: DE:Tag:natural=rock
@@ -3514,13 +3602,16 @@ de:
     natural=scrub: DE:Tag:natural=scrub
     natural=shingle: DE:Tag:natural=shingle
     natural=shoal: DE:Tag:natural=shoal
+    natural=shrub: DE:Tag:natural=shrub
     natural=sinkhole: DE:Tag:natural=sinkhole
     natural=spring: DE:Tag:natural=spring
     natural=stone: DE:Tag:natural=stone
+    natural=strait: DE:Tag:natural=strait
     natural=termite_mound: DE:Tag:natural=termite mound
     natural=tree: DE:Tag:natural=tree
     natural=tree_group: DE:Tag:natural=tree group
     natural=tree_row: DE:Tag:natural=tree row
+    natural=valley: DE:Tag:natural=valley
     natural=volcano: DE:Tag:natural=volcano
     natural=water: DE:Tag:natural=water
     natural=wetland: DE:Tag:natural=wetland
@@ -3543,10 +3634,12 @@ de:
     observatory:type=astronomical: DE:Tag:observatory:type=astronomical
     office=accountant: DE:Tag:office=accountant
     office=administrative: DE:Tag:office=administrative
+    office=adoption_agency: DE:Tag:office=adoption agency
     office=advertising_agency: DE:Tag:office=advertising agency
     office=architect: DE:Tag:office=architect
     office=association: DE:Tag:office=association
     office=charity: DE:Tag:office=charity
+    office=diplomatic: DE:Tag:office=diplomatic
     office=employment_agency: DE:Tag:office=employment agency
     office=energy_supplier: DE:Tag:office=energy supplier
     office=estate_agent: DE:Tag:office=estate agent
@@ -3578,6 +3671,8 @@ de:
     operator=teilAuto: DE:Tag:operator=teilAuto
     park_ride: DE:Tag:park ride
     parking:lane:hgv=on_street: DE:Tag:parking:lane:hgv=on street
+    parking=multi-storey: DE:Tag:parking=multi-storey
+    parking=underground: DE:Tag:parking=underground
     pipeline=marker: DE:Tag:pipeline=marker
     pipeline=substation: DE:Tag:pipeline=substation
     pipeline=valve: DE:Tag:pipeline=valve
@@ -3592,6 +3687,7 @@ de:
     place=islet: DE:Tag:place=islet
     place=isolated_dwelling: DE:Tag:place=isolated dwelling
     place=locality: DE:Tag:place=locality
+    place=municipality: DE:Tag:place=municipality
     place=neighbourhood: DE:Tag:place=neighbourhood
     place=square: DE:Tag:place=square
     place=state: DE:Tag:place=state
@@ -3599,6 +3695,15 @@ de:
     place=town: DE:Tag:place=town
     place=village: DE:Tag:place=village
     placement=transition: DE:Tag:placement=transition
+    plant:source=biomass: DE:Tag:plant:source=biomass
+    plant:source=coal: DE:Tag:plant:source=coal
+    plant:source=gas: DE:Tag:plant:source=gas
+    plant:source=geothermal: DE:Tag:plant:source=geothermal
+    plant:source=hydro: DE:Tag:plant:source=hydro
+    plant:source=nuclear: DE:Tag:plant:source=nuclear
+    plant:source=solar: DE:Tag:plant:source=solar
+    plant:source=waste: DE:Tag:plant:source=waste
+    plant:source=wind: DE:Tag:plant:source=wind
     power=cable: DE:Tag:power=cable
     power=cable_distribution_cabinet: DE:Tag:power=cable distribution cabinet
     power=converter: DE:Tag:power=converter
@@ -3663,6 +3768,7 @@ de:
     religion=muslim: DE:Tag:religion=muslim
     religion=shinto: DE:Tag:religion=shinto
     rental=strandkorb: DE:Tag:rental=strandkorb
+    roller_coaster=track: DE:Tag:roller coaster=track
     route=bicycle: DE:Tag:route=bicycle
     route=bus: DE:Tag:route=bus
     route=ferry: DE:Tag:route=ferry
@@ -3685,9 +3791,12 @@ de:
     route=train: DE:Tag:route=train
     route=tram: DE:Tag:route=tram
     route=trolleybus: DE:Tag:route=trolleybus
+    seamark:type=rock: DE:Tag:seamark:type=rock
+    service=aircraft_control: DE:Tag:service=aircraft control
     service=alley: DE:Tag:service=alley
     service=crossover: DE:Tag:service=crossover
     service=driveway: DE:Tag:service=driveway
+    service=emergency_access: DE:Tag:service=emergency access
     service=parking_aisle: DE:Tag:service=parking aisle
     service=siding: DE:Tag:service=siding
     service=spur: DE:Tag:service=spur
@@ -3697,6 +3806,7 @@ de:
     shop=agrarian: DE:Tag:shop=agrarian
     shop=alcohol: DE:Tag:shop=alcohol
     shop=antiques: DE:Tag:shop=antiques
+    shop=appliance: DE:Tag:shop=appliance
     shop=art: DE:Tag:shop=art
     shop=atv: DE:Tag:shop=atv
     shop=baby_goods: DE:Tag:shop=baby goods
@@ -3743,6 +3853,7 @@ de:
     shop=fabric: DE:Tag:shop=fabric
     shop=farm: DE:Tag:shop=farm
     shop=fashion: DE:Tag:shop=fashion
+    shop=fashion_accessories: DE:Tag:shop=fashion accessories
     shop=fireplace: DE:Tag:shop=fireplace
     shop=fishing: DE:Tag:shop=fishing
     shop=flooring: DE:Tag:shop=flooring
@@ -3793,7 +3904,9 @@ de:
     shop=pawnbroker: DE:Tag:shop=pawnbroker
     shop=perfumery: DE:Tag:shop=perfumery
     shop=pet: DE:Tag:shop=pet
+    shop=pet_grooming: DE:Tag:shop=pet grooming
     shop=photo: DE:Tag:shop=photo
+    shop=pottery: DE:Tag:shop=pottery
     shop=religion: DE:Tag:shop=religion
     shop=robot: DE:Tag:shop=robot
     shop=scuba_diving: DE:Tag:shop=scuba diving
@@ -3808,6 +3921,7 @@ de:
     shop=storage_rental: DE:Tag:shop=storage rental
     shop=supermarket: DE:Tag:shop=supermarket
     shop=swimming_pool: DE:Tag:shop=swimming pool
+    shop=tailor: DE:Tag:shop=tailor
     shop=tattoo: DE:Tag:shop=tattoo
     shop=tea: DE:Tag:shop=tea
     shop=ticket: DE:Tag:shop=ticket
@@ -3851,10 +3965,13 @@ de:
     source=HiRes_aerial_imagery: DE:Tag:source=HiRes aerial imagery
     sport=10pin: DE:Tag:sport=10pin
     sport=9pin: DE:Tag:sport=9pin
+    sport=american_football: DE:Tag:sport=american football
     sport=archery: DE:Tag:sport=archery
     sport=athletics: DE:Tag:sport=athletics
+    sport=badminton: DE:Tag:sport=badminton
     sport=baseball: DE:Tag:sport=baseball
     sport=basketball: DE:Tag:sport=basketball
+    sport=bmx: DE:Tag:sport=bmx
     sport=bobsleigh: DE:Tag:sport=bobsleigh
     sport=chess: DE:Tag:sport=chess
     sport=climbing: DE:Tag:sport=climbing
@@ -3863,6 +3980,7 @@ de:
     sport=fencing: DE:Tag:sport=fencing
     sport=free_flying: DE:Tag:sport=free flying
     sport=golf: DE:Tag:sport=golf
+    sport=handball: DE:Tag:sport=handball
     sport=horse_racing: DE:Tag:sport=horse racing
     sport=ice_skating: DE:Tag:sport=ice skating
     sport=judo: DE:Tag:sport=judo
@@ -3870,6 +3988,8 @@ de:
     sport=motocross: DE:Tag:sport=motocross
     sport=motor: DE:Tag:sport=motor
     sport=multi: DE:Tag:sport=multi
+    sport=rc_car: DE:Tag:sport=rc car
+    sport=running: DE:Tag:sport=running
     sport=sailing: DE:Tag:sport=sailing
     sport=scuba_diving: DE:Tag:sport=scuba diving
     sport=shooting: DE:Tag:sport=shooting
@@ -3891,7 +4011,12 @@ de:
     substation=transmission: DE:Tag:substation=transmission
     summit:cross=yes: DE:Tag:summit:cross=yes
     surface=asphalt: DE:Tag:surface=asphalt
+    telecom=exchange: DE:Tag:telecom=exchange
+    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=open_air: DE:Tag:theatre:type=open air
+    tomb=war_grave: DE:Tag:tomb=war grave
     tourism=alpine_hut: DE:Tag:tourism=alpine hut
     tourism=apartment: DE:Tag:tourism=apartment
     tourism=aquarium: DE:Tag:tourism=aquarium
@@ -3935,8 +4060,62 @@ de:
     tower:type=radar: DE:Tag:tower:type=radar
     tower:type=siren: DE:Tag:tower:type=siren
     tower:type=watchtower: DE:Tag:tower:type=watchtower
+    traffic_sign=DE:205: DE:Tag:traffic sign=DE:205
+    traffic_sign=DE:206: DE:Tag:traffic sign=DE:206
+    traffic_sign=DE:220-10: DE:Tag:traffic sign=DE:220-10
+    traffic_sign=DE:220-20: DE:Tag:traffic sign=DE:220-20
+    traffic_sign=DE:224: DE:Tag:traffic sign=DE:224
+    traffic_sign=DE:237: DE:Tag:traffic sign=DE:237
+    traffic_sign=DE:239: DE:Tag:traffic sign=DE:239
+    traffic_sign=DE:240: DE:Tag:traffic sign=DE:240
+    traffic_sign=DE:241: DE:Tag:traffic sign=DE:241
+    traffic_sign=DE:241-30: DE:Tag:traffic sign=DE:241-30
+    traffic_sign=DE:241-31: DE:Tag:traffic sign=DE:241-31
+    traffic_sign=DE:242: DE:Tag:traffic sign=DE:242
+    traffic_sign=DE:242.1: DE:Tag:traffic sign=DE:242.1
+    traffic_sign=DE:242.2: DE:Tag:traffic sign=DE:242.2
+    traffic_sign=DE:244: DE:Tag:traffic sign=DE:244
+    traffic_sign=DE:244.1: DE:Tag:traffic sign=DE:244.1
+    traffic_sign=DE:245: DE:Tag:traffic sign=DE:245
+    traffic_sign=DE:250: DE:Tag:traffic sign=DE:250
+    traffic_sign=DE:253: DE:Tag:traffic sign=DE:253
+    traffic_sign=DE:254: DE:Tag:traffic sign=DE:254
+    traffic_sign=DE:257-51: DE:Tag:traffic sign=DE:257-51
+    traffic_sign=DE:258: DE:Tag:traffic sign=DE:258
+    traffic_sign=DE:259: DE:Tag:traffic sign=DE:259
+    traffic_sign=DE:260: DE:Tag:traffic sign=DE:260
+    traffic_sign=DE:261: DE:Tag:traffic sign=DE:261
+    traffic_sign=DE:267: DE:Tag:traffic sign=DE:267
+    traffic_sign=DE:269: DE:Tag:traffic sign=DE:269
+    traffic_sign=DE:274-10: DE:Tag:traffic sign=DE:274-10
+    traffic_sign=DE:274-100: DE:Tag:traffic sign=DE:274-100
+    traffic_sign=DE:274-120: DE:Tag:traffic sign=DE:274-120
+    traffic_sign=DE:274-130: DE:Tag:traffic sign=DE:274-130
+    traffic_sign=DE:274-20: DE:Tag:traffic sign=DE:274-20
+    traffic_sign=DE:274-30: DE:Tag:traffic sign=DE:274-30
+    traffic_sign=DE:274-40: DE:Tag:traffic sign=DE:274-40
+    traffic_sign=DE:274-50: DE:Tag:traffic sign=DE:274-50
+    traffic_sign=DE:274-60: DE:Tag:traffic sign=DE:274-60
+    traffic_sign=DE:274-70: DE:Tag:traffic sign=DE:274-70
+    traffic_sign=DE:274-80: DE:Tag:traffic sign=DE:274-80
+    traffic_sign=DE:274.1: DE:Tag:traffic sign=DE:274.1
+    traffic_sign=DE:274.2: DE:Tag:traffic sign=DE:274.2
+    traffic_sign=DE:282: DE:Tag:traffic sign=DE:282
+    traffic_sign=DE:306: DE:Tag:traffic sign=DE:306
+    traffic_sign=DE:325: DE:Tag:traffic sign=DE:325
+    traffic_sign=DE:325.1: DE:Tag:traffic sign=DE:325.1
+    traffic_sign=DE:325.2: DE:Tag:traffic sign=DE:325.2
+    traffic_sign=DE:357: DE:Tag:traffic sign=DE:357
+    traffic_sign=DE:386.3: DE:Tag:traffic sign=DE:386.3
+    traffic_sign=DE:448: DE:Tag:traffic sign=DE:448
+    traffic_sign=DE:449: DE:Tag:traffic sign=DE:449
     traffic_sign=city_limit: DE:Tag:traffic sign=city limit
     tunnel=culvert: DE:Tag:tunnel=culvert
+    usage=headrace: DE:Tag:usage=headrace
+    usage=irrigation: DE:Tag:usage=irrigation
+    usage=penstock: DE:Tag:usage=penstock
+    usage=tailrace: DE:Tag:usage=tailrace
+    usage=transmission: DE:Tag:usage=transmission
     vending: DE:Tag:vending
     vending=animal_feed: DE:Tag:vending=animal feed
     vending=bicycle_tube: DE:Tag:vending=bicycle tube
@@ -3963,6 +4142,9 @@ de:
     vending=toys: DE:Tag:vending=toys
     vending=water: DE:Tag:vending=water
     vending_machine=fuel: DE:Tag:vending machine=fuel
+    wall=castle_wall: DE:Tag:wall=castle wall
+    wall=dry_stone: DE:Tag:wall=dry stone
+    wall=noise_barrier: DE:Tag:wall=noise barrier
     water=canal: DE:Tag:water=canal
     water=lagoon: DE:Tag:water=lagoon
     water=lake: DE:Tag:water=lake
@@ -3984,6 +4166,7 @@ de:
     waterway=fuel: DE:Tag:waterway=fuel
     waterway=lock_gate: DE:Tag:waterway=lock gate
     waterway=milestone: DE:Tag:waterway=milestone
+    waterway=pressurised: DE:Tag:waterway=pressurised
     waterway=river: DE:Tag:waterway=river
     waterway=riverbank: DE:Tag:waterway=riverbank
     waterway=stream: DE:Tag:waterway=stream
@@ -3993,6 +4176,7 @@ de:
     wetland=fen: DE:Tag:wetland=fen
     wetland=mangrove: DE:Tag:wetland=mangrove
     wetland=marsh: DE:Tag:wetland=marsh
+    wetland=mud: DE:Tag:wetland=mud
     wetland=reedbed: DE:Tag:wetland=reedbed
     wetland=saltern: DE:Tag:wetland=saltern
     wetland=saltmarsh: DE:Tag:wetland=saltmarsh
@@ -4001,6 +4185,7 @@ de:
     wetland=wet_meadow: DE:Tag:wetland=wet meadow
     zoo=aviary: DE:Tag:zoo=aviary
     zoo=birds: DE:Tag:zoo=birds
+    zoo=butterfly: DE:Tag:zoo=butterfly
     zoo=enclosure: DE:Tag:zoo=enclosure
     zoo=falconry: DE:Tag:zoo=falconry
     zoo=petting_zoo: DE:Tag:zoo=petting zoo
@@ -4014,6 +4199,7 @@ el:
     building:levels: El:Key:building:levels
     height: El:Key:height
     shop: El:Key:shop
+    surface: El:Key:surface
   tag:
     amenity=bar: El:Tag:amenity=bar
     amenity=bbq: El:Tag:amenity=bbq
@@ -4039,6 +4225,10 @@ el:
     amenity=school: El:Tag:amenity=school
     amenity=taxi: El:Tag:amenity=taxi
     amenity=university: El:Tag:amenity=university
+    highway=motorway: El:Tag:highway=motorway
+    highway=service: El:Tag:highway=service
+    highway=tertiary: El:Tag:highway=tertiary
+    highway=track: El:Tag:highway=track
 en:
   key:
     3dmr: Key:3dmr
@@ -4089,6 +4279,7 @@ en:
     'abandoned:': 'Key:abandoned:'
     abandoned:*: Key:abandoned:*
     abandoned:amenity: Key:abandoned:amenity
+    abandoned:place: Key:abandoned:place
     abandoned:railway: Key:abandoned:railway
     abutters: Key:abutters
     access: Key:access
@@ -4098,6 +4289,7 @@ en:
     access:lhv: Key:access:lhv
     access:roadtrain: Key:access:roadtrain
     access:roadtrain:trailers: Key:access:roadtrain:trailers
+    actuator: Key:actuator
     addr: Key:addr
     addr:alternatenumber: Key:addr:alternatenumber
     addr:block: Key:addr:block
@@ -4121,6 +4313,7 @@ en:
     addr:housenumber: Key:addr:housenumber
     addr:inclusion: Key:addr:inclusion
     addr:interpolation: Key:addr:interpolation
+    addr:municipality: Key:addr:municipality
     addr:place: Key:addr:place
     addr:place:de: Key:addr:place:de
     addr:place:it: Key:addr:place:it
@@ -4128,6 +4321,7 @@ en:
     addr:province: Key:addr:province
     addr:provisionalnumber: Key:addr:provisionalnumber
     addr:region: Key:addr:region
+    addr:staircase: Key:addr:staircase
     addr:state: Key:addr:state
     addr:street: Key:addr:street
     addr:street:de: Key:addr:street:de
@@ -4146,10 +4340,10 @@ en:
     aerialway: Key:aerialway
     aerialway:drag_lift: Key:aerialway:drag lift
     aerialway:duration: Key:aerialway:duration
-    aerodrome: Key:aerodrome
     aerodrome:type: Key:aerodrome:type
     aeroway: Key:aeroway
     after_school: Key:after school
+    agrarian: Key:agrarian
     agricultural: Key:agricultural
     air_conditioning: Key:air conditioning
     airconditioned: Key:airconditioned
@@ -4169,25 +4363,37 @@ en:
     animal: Key:animal
     animated: Key:animated
     architect: Key:architect
+    architect:wikidata: Key:architect:wikidata
     architect:wikipedia: Key:architect:wikipedia
     area: Key:area
     area:highway: Key:area:highway
+    artist:wikidata: Key:artist:wikidata
     artist_name: Key:artist name
     artwork_subject: Key:artwork subject
     artwork_type: Key:artwork type
     asb: Key:asb
     ascent: Key:ascent
+    assembly_point:earthquake: Key:assembly point:earthquake
+    assembly_point:fire: Key:assembly point:fire
+    assembly_point:flood: Key:assembly point:flood
+    assembly_point:landslide: Key:assembly point:landslide
+    assembly_point:tornado: Key:assembly point:tornado
+    assembly_point:tsunami: Key:assembly point:tsunami
     asset_ref: Key:asset ref
     assisted_trail: Key:assisted trail
+    at_bev:addr_date: Key:at bev:addr date
+    attraction: Key:attraction
     attribution: Key:attribution
     atv: Key:atv
     atv:sales: Key:atv:sales
     authentication: Key:authentication
+    autoaws: Key:autoaws
     automated: Key:automated
     automatic_door: Key:automatic door
     backcountry: Key:backcountry
     backrest: Key:backrest
     backward: Key:backward
+    balcony: Key:balcony
     bar: Key:bar
     barrier: Key:barrier
     barrier:personnel: Key:barrier:personnel
@@ -4222,8 +4428,10 @@ en:
     books: Key:books
     border_type: Key:border type
     both: Key:both
+    bottle: Key:bottle
     bottom:material: Key:bottom:material
     boundary: Key:boundary
+    boundary_type: Key:boundary type
     branch: Key:branch
     brand: Key:brand
     brand:wikidata: Key:brand:wikidata
@@ -4261,7 +4469,7 @@ en:
     building:roof: Key:building:roof
     building:roof:colour: Key:building:roof:colour
     building:ruian:type: Key:building:ruian:type
-    building:type: Key:building:type
+    building:soft_storey: Key:building:soft storey
     building:units: Key:building:units
     building:usage:pl: Key:building:usage:pl
     building:use: Key:building:use
@@ -4269,27 +4477,34 @@ en:
     bunker_type: Key:bunker type
     bus: Key:bus
     bus_bay: Key:bus bay
+    busbar: Key:busbar
     busway: Key:busway
     busway:left: Key:busway:left
     busway:right: Key:busway:right
     button_operated: Key:button operated
+    cabin:rental: Key:cabin:rental
+    cabins: Key:cabins
     cable_number: Key:cable number
     cables: Key:cables
     cafe: Key:cafe
     camp_site: Key:camp site
     camp_type: Key:camp type
     campers: Key:campers
+    canal: Key:canal
     canoe: Key:canoe
     capacity: Key:capacity
+    capacity:charging: Key:capacity:charging
     capacity:disabled: Key:capacity:disabled
     capacity:parent: Key:capacity:parent
     capacity:women: Key:capacity:women
     capital: Key:capital
     capital_city: Key:capital city
+    car: Key:car
     car_wash: Key:car wash
     caravan: Key:caravan
     caravans: Key:caravans
     cargo: Key:cargo
+    cargo:container: Key:cargo:container
     carriage: Key:carriage
     carriageway_ref: Key:carriageway ref
     casemate: Key:casemate
@@ -4305,6 +4520,10 @@ en:
     centre_turn_lane: Key:centre turn lane
     change: Key:change
     changesets_count: Key:changesets count
+    changing_table: Key:changing table
+    changing_table:count: Key:changing table:count
+    changing_table:fee: Key:changing table:fee
+    changing_table:location: Key:changing table:location
     charge: Key:charge
     charity: Key:charity
     check_date: Key:check date
@@ -4340,21 +4559,31 @@ en:
     comment: Key:comment
     communication:amateur_radio: Key:communication:amateur radio
     communication:amateur_radio:repeater: Key:communication:amateur radio:repeater
+    communication:amateur_radio:repeater:ctcss: Key:communication:amateur radio:repeater:ctcss
+    communication:amateur_radio:repeater:dcs: Key:communication:amateur radio:repeater:dcs
+    communication:amateur_radio:repeater:frequency_out: Key:communication:amateur
+      radio:repeater:frequency out
+    communication:amateur_radio:repeater:modulation: Key:communication:amateur radio:repeater:modulation
+    communication:amateur_radio:repeater:shift: Key:communication:amateur radio:repeater:shift
+    communication:amateur_radio:repeater:toneburst: Key:communication:amateur radio:repeater:toneburst
     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:television: Key:communication:television
+    community: Key:community
     community_centre: Key:community centre
     community_centre:for: Key:community centre:for
     condition: Key:condition
     conditional: Key:conditional
     condo: Key:condo
+    connection_point: Key:connection point
     construction: Key:construction
     construction:website: Key:construction:website
     construction_end_expected: Key:construction end expected
     construction_start_expected: Key:construction start expected
+    consulate: Key:consulate
     contact: Key:contact
     contact:diaspora: Key:contact:diaspora
     contact:email: Key:contact:email
@@ -4367,7 +4596,9 @@ en:
     contact:instagram: Key:contact:instagram
     contact:linkedin: Key:contact:linkedin
     contact:mastodon: Key:contact:mastodon
+    contact:mobile: Key:contact:mobile
     contact:phone: Key:contact:phone
+    contact:pinterest: Key:contact:pinterest
     contact:skype: Key:contact:skype
     contact:telegram: Key:contact:telegram
     contact:twitter: Key:contact:twitter
@@ -4385,15 +4616,18 @@ en:
     country: Key:country
     covered: Key:covered
     craft: Key:craft
+    crane:type: Key:crane:type
     created_by: Key:created by
     crop: Key:crop
     crossing: Key:crossing
     crossing:activation: Key:crossing:activation
     crossing:barrier: Key:crossing:barrier
     crossing:bell: Key:crossing:bell
+    crossing:island: Key:crossing:island
     crossing:light: Key:crossing:light
     crossing:on_demand: Key:crossing:on demand
     crossing:saltire: Key:crossing:saltire
+    crossing_ref: Key:crossing ref
     cuisine: Key:cuisine
     cultivation_method: Key:cultivation method
     currency: Key:currency
@@ -4417,9 +4651,12 @@ en:
     cycleway:buffer: Key:cycleway:buffer
     cycleway:lane: Key:cycleway:lane
     cycleway:left: Key:cycleway:left
+    cycleway:left:oneway: Key:cycleway:left:oneway
     cycleway:left=backward: Key:cycleway:left=backward
     cycleway:right: Key:cycleway:right
+    cycleway:right:oneway: Key:cycleway:right:oneway
     cycleway:right=forward: Key:cycleway:right=forward
+    cycleway:surface: Key:cycleway:surface
     date: Key:date
     date_off: Key:date off
     date_on: Key:date on
@@ -4464,6 +4701,8 @@ en:
     destination:lanes:forward: Key:destination:lanes:forward
     detour: Key:detour
     devices: Key:devices
+    dewnr:park_id: Key:dewnr:park id
+    dewnr:uid: Key:dewnr:uid
     dhm_id: Key:dhm id
     diameter: Key:diameter
     diaper: Key:diaper
@@ -4478,10 +4717,12 @@ en:
     diet:lactose_free: Key:diet:lactose free
     diet:vegan: Key:diet:vegan
     diet:vegetarian: Key:diet:vegetarian
+    dinner: Key:dinner
     diocese: Key:diocese
     diplomatic: Key:diplomatic
     diplomatic:receiving_country: Key:diplomatic:receiving country
     diplomatic:sending_country: Key:diplomatic:sending country
+    diplomatic:services: Key:diplomatic:services
     direction: Key:direction
     dirtbike:scale: Key:dirtbike:scale
     disabled: Key:disabled
@@ -4493,8 +4734,10 @@ en:
     disused: Key:disused
     'disused:': 'Key:disused:'
     disused:amenity: Key:disused:amenity
+    disused:place: Key:disused:place
     disused:railway: Key:disused:railway
     disused:shop: Key:disused:shop
+    disused:watermill: Key:disused:watermill
     dog: Key:dog
     dominant_taxon: Key:dominant taxon
     donation:compensation: Key:donation:compensation
@@ -4504,11 +4747,14 @@ en:
     draft: Key:draft
     drink: Key:drink
     drink:afri-cola: Key:drink:afri-cola
+    drink:beer: Key:drink:beer
     drink:club-mate: Key:drink:club-mate
+    drink:coffee: Key:drink:coffee
     drink:kräusen: Key:drink:kräusen
     drink:milk: Key:drink:milk
     drink:milk-raw: Key:drink:milk-raw
     drink:raw_milk: Key:drink:raw milk
+    drink:tea: Key:drink:tea
     drinkable: Key:drinkable
     drinking_water: Key:drinking water
     drinking_water:legal: Key:drinking water:legal
@@ -4520,6 +4766,7 @@ en:
     drive_thru: Key:drive thru
     driving_side: Key:driving side
     dryer: Key:dryer
+    drying:room: Key:drying:room
     duration: Key:duration
     earthquake: Key:earthquake
     earthquake:damage: Key:earthquake:damage
@@ -4531,7 +4778,11 @@ en:
     electrified: Key:electrified
     email: Key:email
     embankment: Key:embankment
+    embassy: Key:embassy
+    embedded_rails: Key:embedded rails
+    embedded_rails:lanes: Key:embedded rails:lanes
     emergency: Key:emergency
+    employee: Key:employee
     end_date: Key:end date
     enforcement: Key:enforcement
     entrance: Key:entrance
@@ -4544,6 +4795,7 @@ en:
     exhibit: Key:exhibit
     exit: Key:exit
     exit_to: Key:exit to
+    expected_rcn_route_relations: Key:expected rcn route relations
     expressway: Key:expressway
     facebook: Key:facebook
     faces: Key:faces
@@ -4565,7 +4817,7 @@ en:
     fetish: Key:fetish
     fhrs:authority: Key:fhrs:authority
     fhrs:id: Key:fhrs:id
-    fhrs:rating: Key:fhrs:rating
+    fhrs:local_authority_id: Key:fhrs:local authority id
     field: Key:field
     finance_agent: Key:finance agent
     fire_boundary: Key:fire boundary
@@ -4576,12 +4828,15 @@ en:
     fireplace: Key:fireplace
     fishing: Key:fishing
     fixme: Key:fixme
+    flag:wikidata: Key:flag:wikidata
+    flat_steps: Key:flat steps
     flickr: Key:flickr
     floating: Key:floating
     flood_mark: Key:flood mark
     flood_prone: Key:flood prone
     floor:material: Key:floor:material
     flow_rate: Key:flow rate
+    food: Key:food
     foot: Key:foot
     footway: Key:footway
     ford: Key:ford
@@ -4627,14 +4882,12 @@ en:
     fuel:octane_98: Key:fuel:octane 98
     fuel:svo: Key:fuel:svo
     furniture: Key:furniture
-    further: Key:further
-    further:access: Key:further:access
-    further:vehicle: Key:further:vehicle
     fvst:navnelbnr: Key:fvst:navnelbnr
     gambling: Key:gambling
     garden:style: Key:garden:style
     garden:type: Key:garden:type
     gauge: Key:gauge
+    gay: Key:gay
     gender_segregated: Key:gender segregated
     generator:method: Key:generator:method
     generator:output: Key:generator:output
@@ -4680,6 +4933,7 @@ en:
     gun_turret: Key:gun turret
     gvr:code: Key:gvr:code
     handicap: Key:handicap
+    handle: Key:handle
     handrail: Key:handrail
     handrail:center: Key:handrail:center
     handrail:left: Key:handrail:left
@@ -4687,7 +4941,6 @@ en:
     happy_hours: Key:happy hours
     harbour: Key:harbour
     harbour:category: Key:harbour:category
-    hazard: Key:hazard
     hazard_intensity: Key:hazard intensity
     hazard_occurence: Key:hazard occurence
     hazard_occurrence: Key:hazard occurrence
@@ -4696,11 +4949,14 @@ en:
     hazard_type: Key:hazard type
     hazmat: Key:hazmat
     hazmat:water: Key:hazmat:water
+    headframe: Key:headframe
     healthcare: Key:healthcare
+    healthcare:counselling: Key:healthcare:counselling
     healthcare:speciality: Key:healthcare:speciality
     height: Key:height
     height:hub: Key:height:hub
     heritage: Key:heritage
+    heritage:label:FR: Key:heritage:label:FR
     hgv: Key:hgv
     hgv_articulated: Key:hgv articulated
     high_water_mark: Key:high water mark
@@ -4715,6 +4971,7 @@ en:
     historic:period: Key:historic:period
     historic_name: Key:historic name
     history: Key:history
+    hoops: Key:hoops
     horse: Key:horse
     horse-drawn_carriage: Key:horse-drawn carriage
     horse_scale: Key:horse scale
@@ -4757,6 +5014,10 @@ en:
     internet: Key:internet
     internet_access: Key:internet access
     internet_access:fee: Key:internet access:fee
+    internet_access:operator: Key:internet access:operator
+    internet_access:ssid: Key:internet access:ssid
+    interval: Key:interval
+    irrigation: Key:irrigation
     is_hazard_prone: Key:is hazard prone
     is_in: Key:is in
     is_in:archipelago: Key:is in:archipelago
@@ -4765,6 +5026,7 @@ en:
     is_in:continent: Key:is in:continent
     is_in:country: Key:is in:country
     is_in:country_code: Key:is in:country code
+    is_in:county: Key:is in:county
     is_in:island: Key:is in:island
     is_in:municipality: Key:is in:municipality
     is_in:ocean: Key:is in:ocean
@@ -4776,6 +5038,7 @@ en:
     is_in:ward: Key:is in:ward
     isced:level: Key:isced:level
     it:fvg:ctrn:code: Key:it:fvg:ctrn:code
+    iucn_level: Key:iucn level
     jel: Key:jel
     jetski:sales: Key:jetski:sales
     junction: Key:junction
@@ -4804,10 +5067,10 @@ en:
     kneipp_water_cure: Key:kneipp water cure
     kp: Key:kp
     kudish: Key:kudish
-    label: Key:label
     lacounty:ain: Key:lacounty:ain
     lacounty:bld_id: Key:lacounty:bld id
     ladder: Key:ladder
+    lamp_model: Key:lamp model
     lamp_mount: Key:lamp mount
     lamp_type: Key:lamp type
     landfill:waste: Key:landfill:waste
@@ -4821,9 +5084,11 @@ en:
     lanes:psv: Key:lanes:psv
     lanes:psv:backward: Key:lanes:psv:backward
     lanes:psv:forward: Key:lanes:psv:forward
+    language: Key:language
     language:LL: Key:language:LL
     lawyer: Key:lawyer
     layer: Key:layer
+    lcn: Key:lcn
     lcn_ref: Key:lcn ref
     leaf_cycle: Key:leaf cycle
     leaf_type: Key:leaf type
@@ -4833,7 +5098,12 @@ en:
     leisure: Key:leisure
     length: Key:length
     level: Key:level
+    level:ref: Key:level:ref
+    lgbt: Key:lgbt
+    lgbtq: Key:lgbtq
     lhv: Key:lhv
+    liaison: Key:liaison
+    license_classes: Key:license classes
     lighting:perceived: Key:lighting:perceived
     line: Key:line
     lines: Key:lines
@@ -4847,6 +5117,7 @@ en:
     loc_ref: Key:loc ref
     local_ref: Key:local ref
     locale: Key:locale
+    localwiki: Key:localwiki
     location: Key:location
     lock: Key:lock
     lock_name: Key:lock name
@@ -4855,6 +5126,7 @@ en:
     long_name:ar: Key:long name:ar
     lottery: Key:lottery
     love_locks: Key:love locks
+    lpn_ref: Key:lpn ref
     luminous: Key:luminous
     lunch: Key:lunch
     lunch:specials: Key:lunch:specials
@@ -4864,12 +5136,15 @@ en:
     man_made: Key:man made
     managed: Key:managed
     manhole: Key:manhole
+    manmade: Key:manmade
     manufacturer: Key:manufacturer
     manufacturer:type: Key:manufacturer:type
+    manufacturer:wikidata: Key:manufacturer:wikidata
     mapillary: Key:mapillary
     maritime: Key:maritime
     massage: Key:massage
     material: Key:material
+    mattress: Key:mattress
     max_age: Key:max age
     maxage: Key:maxage
     maxaxleload: Key:maxaxleload
@@ -4884,11 +5159,17 @@ en:
     maxspeed:conditional: Key:maxspeed:conditional
     maxspeed:forward: Key:maxspeed:forward
     maxspeed:hgv: Key:maxspeed:hgv
+    maxspeed:lanes: Key:maxspeed:lanes
     maxspeed:practical: Key:maxspeed:practical
+    maxspeed:seasonal:winter: Key:maxspeed:seasonal:winter
     maxspeed:source: Key:maxspeed:source
     maxspeed:type: Key:maxspeed:type
+    maxspeed:variable: Key:maxspeed:variable
     maxstay: Key:maxstay
     maxweight: Key:maxweight
+    maxweightrating: Key:maxweightrating
+    maxweightrating:bus: Key:maxweightrating:bus
+    maxweightrating:hgv: Key:maxweightrating:hgv
     maxwidth: Key:maxwidth
     maxwidth:physical: Key:maxwidth:physical
     mcrb:criteria: Key:mcrb:criteria
@@ -4912,6 +5193,7 @@ en:
     minspeed: Key:minspeed
     minspeed:lanes: Key:minspeed:lanes
     mofa: Key:mofa
+    monastery:type: Key:monastery:type
     monitoring:air_quality: Key:monitoring:air quality
     monitoring:bicycle: Key:monitoring:bicycle
     monitoring:galileo: Key:monitoring:galileo
@@ -4944,6 +5226,7 @@ en:
     motorcycle:repair: Key:motorcycle:repair
     motorcycle:sales: Key:motorcycle:sales
     motorcycle:scale: Key:motorcycle:scale
+    motorcycle:theme: Key:motorcycle:theme
     motorcycle:type: Key:motorcycle:type
     motorcycle:tyres: Key:motorcycle:tyres
     motorhome: Key:motorhome
@@ -4962,6 +5245,7 @@ en:
     musical_instrument: Key:musical instrument
     name: Key:name
     name:ar: Key:name:ar
+    name:ar1: Key:name:ar1
     name:be: Key:name:be
     name:be-tarask: Key:name:be-tarask
     name:ber: Key:name:ber
@@ -4976,10 +5260,13 @@ en:
     name:dv: Key:name:dv
     name:el: Key:name:el
     name:en: Key:name:en
+    name:en1: Key:name:en1
+    name:en2: Key:name:en2
     name:eo: Key:name:eo
     name:es: Key:name:es
     name:et: Key:name:et
     name:etymology: Key:name:etymology
+    name:etymology:wikidata: Key:name:etymology:wikidata
     name:etymology:wikipedia: Key:name:etymology:wikipedia
     name:eu: Key:name:eu
     name:fa: Key:name:fa
@@ -4988,9 +5275,11 @@ en:
     name:fy: Key:name:fy
     name:ga: Key:name:ga
     name:gd: Key:name:gd
+    name:gem: Key:name:gem
     name:he: Key:name:he
     name:hi: Key:name:hi
     name:hr: Key:name:hr
+    name:hsb: Key:name:hsb
     name:hu: Key:name:hu
     name:hy: Key:name:hy
     name:io: Key:name:io
@@ -5000,6 +5289,7 @@ en:
     name:jbo: Key:name:jbo
     name:ka: Key:name:ka
     name:kab: Key:name:kab
+    name:kk: Key:name:kk
     name:kn: Key:name:kn
     name:kn:iso15919: Key:name:kn:iso15919
     name:ko: Key:name:ko
@@ -5016,6 +5306,8 @@ en:
     name:mk: Key:name:mk
     name:ml: Key:name:ml
     name:mr: Key:name:mr
+    name:my: Key:name:my
+    name:nds: Key:name:nds
     name:nds-nl: Key:name:nds-nl
     name:nl: Key:name:nl
     name:nn: Key:name:nn
@@ -5043,15 +5335,22 @@ en:
     name:th: Key:name:th
     name:tok: Key:name:tok
     name:tr: Key:name:tr
+    name:tt: Key:name:tt
     name:tzl: Key:name:tzl
     name:uk: Key:name:uk
     name:ur: Key:name:ur
+    name:vi: Key:name:vi
     name:vo: Key:name:vo
     name:wikipedia: Key:name:wikipedia
     name:yue: Key:name:yue
     name:zh: Key:name:zh
     name:zh-sg: Key:name:zh-sg
     name_1: Key:name 1
+    name_2: Key:name 2
+    naptan:AtcoCode: Key:naptan:AtcoCode
+    naptan:Indicator: Key:naptan:Indicator
+    naptan:NaptanCode: Key:naptan:NaptanCode
+    naptan:Street: Key:naptan:Street
     narrow: Key:narrow
     nat_name: Key:nat name
     nat_name:ar: Key:nat name:ar
@@ -5070,6 +5369,7 @@ en:
     navibot:connect: Key:navibot:connect
     navigationaid: Key:navigationaid
     ncat: Key:ncat
+    ncn: Key:ncn
     ncn_milepost: Key:ncn milepost
     ncn_ref: Key:ncn ref
     network: Key:network
@@ -5077,9 +5377,14 @@ en:
     no-barnehage:nsrid: Key:no-barnehage:nsrid
     noaddress: Key:noaddress
     noexit: Key:noexit
+    nohousenumber: Key:nohousenumber
     non_existent_levels: Key:non existent levels
     noname: Key:noname
+    nonsquare: Key:nonsquare
     noref: Key:noref
+    not: Key:not
+    'not:': 'Key:not:'
+    not:name: Key:not:name
     not:nccod: Key:not:nccod
     not_served_by: Key:not served by
     note: Key:note
@@ -5089,6 +5394,7 @@ en:
     note:ja: Key:note:ja
     note:pilotage: Key:note:pilotage
     notes: Key:notes
+    nuclear_explosion:country: Key:nuclear explosion:country
     nudism: Key:nudism
     nursery: Key:nursery
     nvdb:date: Key:nvdb:date
@@ -5102,10 +5408,13 @@ en:
     official_name:be: Key:official name:be
     official_ref: Key:official ref
     offshore: Key:offshore
+    ohv: Key:ohv
     ois:fixme: Key:ois:fixme
     old_name: Key:old name
     old_name:ar: Key:old name:ar
     old_name:be: Key:old name:be
+    old_name:de: Key:old name:de
+    old_name:en: Key:old name:en
     old_name:etymology:wikidata: Key:old name:etymology:wikidata
     old_name:pl: Key:old name:pl
     old_name:ru: Key:old name:ru
@@ -5114,10 +5423,12 @@ en:
     old_ref: Key:old ref
     old_ref:legislative: Key:old ref:legislative
     old_ref_legislative: Key:old ref legislative
+    old_short_name: Key:old short name
     oneclass: Key:oneclass
     oneway: Key:oneway
     oneway:bicycle: Key:oneway:bicycle
     oneway:moped: Key:oneway:moped
+    oneway:psv: Key:oneway:psv
     onkz: Key:onkz
     openbenches:id: Key:openbenches:id
     openfire: Key:openfire
@@ -5134,16 +5445,21 @@ en:
     operator:en: Key:operator:en
     operator:ru: Key:operator:ru
     operator:type: Key:operator:type
+    operator:wikidata: Key:operator:wikidata
     operator:wikipedia: Key:operator:wikipedia
+    organ: Key:organ
     organic: Key:organic
     orientation: Key:orientation
     orienteering: Key:orienteering
     origin: Key:origin
     orv: Key:orv
     osak: Key:osak
+    osak:house_no: Key:osak:house no
     osak:identifier: Key:osak:identifier
+    osak:municipality_name: Key:osak:municipality name
     osak:municipality_no: Key:osak:municipality no
     osak:revision: Key:osak:revision
+    osak:street: Key:osak:street
     osak:street_name: Key:osak:street name
     osak:street_no: Key:osak:street no
     osak:subdivision: Key:osak:subdivision
@@ -5162,6 +5478,7 @@ en:
     par: Key:par
     parish: Key:parish
     park:type: Key:park:type
+    park_ride: Key:park ride
     parking: Key:parking
     parking:condition: Key:parking:condition
     parking:condition:both: Key:parking:condition:both
@@ -5204,6 +5521,8 @@ en:
     phone: Key:phone
     photo: Key:photo
     photograph: Key:photograph
+    photography: Key:photography
+    picnic_table: Key:picnic table
     picture: Key:picture
     pilgrimage: Key:pilgrimage
     pilotage: Key:pilotage
@@ -5221,11 +5540,14 @@ en:
     placement: Key:placement
     planned: Key:planned
     plant: Key:plant
+    plant:method: Key:plant:method
     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:heat: Key:plant:output:heat
     plant:output:hot_air: Key:plant:output:hot air
     plant:output:hot_water: Key:plant:output:hot water
     plant:output:steam: Key:plant:output:steam
@@ -5252,6 +5574,7 @@ en:
     power_source: Key:power source
     power_supply: Key:power supply
     power_supply:schedule: Key:power supply:schedule
+    practicability: Key:practicability
     preschool: Key:preschool
     pressure: Key:pressure
     previous: Key:previous
@@ -5262,6 +5585,7 @@ en:
     produce: Key:produce
     product: Key:product
     proposed: Key:proposed
+    proposed:name: Key:proposed:name
     protect_class: Key:protect class
     protect_id: Key:protect id
     protected: Key:protected
@@ -5287,6 +5611,7 @@ en:
     radio_transponder:range: Key:radio transponder:range
     radio_transponder:signal_frequency: Key:radio transponder:signal frequency
     railway: Key:railway
+    railway:lzb: Key:railway:lzb
     railway:position: Key:railway:position
     railway:preserved: Key:railway:preserved
     railway:signal:combined: Key:railway:signal:combined
@@ -5303,6 +5628,7 @@ en:
     ramsar: Key:ramsar
     razed: Key:razed
     'razed:': 'Key:razed:'
+    rcn: Key:rcn
     rcn_ref: Key:rcn ref
     real_ale: Key:real ale
     real_cider: Key:real cider
@@ -5337,6 +5663,7 @@ en:
     ref:IFOPT: Key:ref:IFOPT
     ref:INSEE: Key:ref:INSEE
     ref:ISTAT: Key:ref:ISTAT
+    ref:NAG:UPRN:1: Key:ref:NAG:UPRN:1
     ref:NLPG:UPRN:1: Key:ref:NLPG:UPRN:1
     ref:NPLG:UPRN:1: Key:ref:NPLG:UPRN:1
     ref:TECB: Key:ref:TECB
@@ -5346,19 +5673,27 @@ en:
     ref:TECN: Key:ref:TECN
     ref:TECX: Key:ref:TECX
     ref:UAI: Key:ref:UAI
+    ref:US:EPA: Key:ref:US:EPA
     ref:UrbIS: Key:ref:UrbIS
+    ref:WDPA: Key:ref:WDPA
     ref:ar: Key:ref:ar
     ref:at:gkz: Key:ref:at:gkz
     ref:at:okz: Key:ref:at:okz
     ref:bag: Key:ref:bag
+    ref:bag:old: Key:ref:bag:old
     ref:bam.brno.cz: Key:ref:bam.brno.cz
     ref:bic: Key:ref:bic
     ref:bufa: Key:ref:bufa
+    ref:cadw: Key:ref:cadw
+    ref:circuits: Key:ref:circuits
     ref:cobe: Key:ref:cobe
     ref:color: Key:ref:color
     ref:colour: Key:ref:colour
+    ref:coop: Key:ref:coop
     ref:ctb: Key:ref:ctb
     ref:edubase: Key:ref:edubase
+    ref:gurs:hs_mid: Key:ref:gurs:hs mid
+    ref:herbarium: Key:ref:herbarium
     ref:isil: Key:ref:isil
     ref:kmb: Key:ref:kmb
     ref:lor: Key:ref:lor
@@ -5399,6 +5734,7 @@ en:
     'removed:': 'Key:removed:'
     rental: Key:rental
     repair: Key:repair
+    repd:id: Key:repd:id
     repeat_on: Key:repeat on
     reservation: Key:reservation
     residential: Key:residential
@@ -5407,13 +5743,18 @@ en:
     restriction:conditional: Key:restriction:conditional
     retreat: Key:retreat
     retroreflecting: Key:retroreflecting
+    review_requested: Key:review requested
     rfr: Key:rfr
+    rhn_ref: Key:rhn ref
     right: Key:right
     right/left/both: Key:right/left/both
     right:country: Key:right:country
+    rin_ref: Key:rin ref
     river:waterway_distance: Key:river:waterway distance
+    rmn_ref: Key:rmn ref
     road_marking: Key:road marking
     roadtrain: Key:roadtrain
+    roller_coaster: Key:roller coaster
     roof:colour: Key:roof:colour
     roof:direction: Key:roof:direction
     roof:material: Key:roof:material
@@ -5435,6 +5776,7 @@ en:
     route_ref:TECX: Key:route ref:TECX
     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
     ruined: Key:ruined
@@ -5532,6 +5874,7 @@ en:
     seats: Key:seats
     second_hand: Key:second hand
     segregated: Key:segregated
+    self_checkout: Key:self checkout
     self_service: Key:self service
     sells:tobacco: Key:sells:tobacco
     service: Key:service
@@ -5540,6 +5883,7 @@ en:
     service:bicycle:repair: Key:service:bicycle:repair
     service:bicycle:retail: Key:service:bicycle:retail
     service:bicycle:second_hand: Key:service:bicycle:second hand
+    service:vehicle: Key:service:vehicle
     service_times: Key:service times
     shade: Key:shade
     share_taxi: Key:share taxi
@@ -5558,6 +5902,8 @@ en:
     sidewalk_orientation: Key:sidewalk orientation
     sign: Key:sign
     sinkhole: Key:sinkhole
+    siren:purpose: Key:siren:purpose
+    siren:type: Key:siren:type
     site_type: Key:site type
     size: Key:size
     ski: Key:ski
@@ -5629,6 +5975,7 @@ en:
     stone_type: Key:stone type
     stop: Key:stop
     storage_area: Key:storage area
+    stove: Key:stove
     stranded: Key:stranded
     strapline: Key:strapline
     stream: Key:stream
@@ -5636,7 +5983,9 @@ en:
     structure: Key:structure
     sub_sea: Key:sub sea
     subject: Key:subject
+    subject:wikidata: Key:subject:wikidata
     subject:wikipedia: Key:subject:wikipedia
+    submarine: Key:submarine
     subsea: Key:subsea
     substance: Key:substance
     substation: Key:substation
@@ -5653,6 +6002,7 @@ en:
     swimming_pool: Key:swimming pool
     switch: Key:switch
     symbol: Key:symbol
+    table_d_hote: Key:table d hote
     tactile_map: Key:tactile map
     tactile_paving: Key:tactile paving
     tactile_writing: Key:tactile writing
@@ -5674,19 +6024,28 @@ en:
     technical_type: Key:technical type
     technology: Key:technology
     telecom: Key:telecom
+    telecom:medium: Key:telecom:medium
     telescope:type: Key:telescope:type
     temporary: Key:temporary
     tenant: Key:tenant
     tents: Key:tents
+    terrace: Key:terrace
     teryt: Key:teryt
     teryt:simc: Key:teryt:simc
     teryt:terc: Key:teryt:terc
+    theatre:genre: Key:theatre:genre
+    theatre:type: Key:theatre:type
     theme: Key:theme
     tickets:public_transport: Key:tickets:public transport
     tickets:public_transport_subscription: Key:tickets:public transport subscription
     ticks: Key:ticks
     tidal: Key:tidal
     tiger: Key:tiger
+    tiger:CLASSFP: Key:tiger:CLASSFP
+    tiger:CPI: Key:tiger:CPI
+    tiger:FUNCSTAT: Key:tiger:FUNCSTAT
+    tiger:LSAD: Key:tiger:LSAD
+    tiger:MTFCC: Key:tiger:MTFCC
     tiger:PLACENS: Key:tiger:PLACENS
     tiger:cfcc: Key:tiger:cfcc
     tiger:county: Key:tiger:county
@@ -5698,11 +6057,11 @@ en:
     tobacco: Key:tobacco
     todo: Key:todo
     toilets: Key:toilets
-    toilets:type: Key:toilets:type
     toilets:wheelchair: Key:toilets:wheelchair
     toll: Key:toll
     toll:hgv: Key:toll:hgv
     toll:motorcycle: Key:toll:motorcycle
+    tomb: Key:tomb
     topmark: Key:topmark
     topmark:colour: Key:topmark:colour
     touring: Key:touring
@@ -5717,11 +6076,14 @@ en:
     traffic:hourly: Key:traffic:hourly
     traffic_calming: Key:traffic calming
     traffic_sign: Key:traffic sign
+    traffic_sign:backward: Key:traffic sign:backward
+    traffic_sign:forward: Key:traffic sign:forward
     traffic_signals: Key:traffic signals
     traffic_signals:arrow: Key:traffic signals:arrow
     traffic_signals:direction: Key:traffic signals:direction
     traffic_signals:floor_vibration: Key:traffic signals:floor vibration
     traffic_signals:minimap: Key:traffic signals:minimap
+    traffic_signals:override_indicator: Key:traffic signals:override indicator
     traffic_signals:sound: Key:traffic signals:sound
     traffic_signals:turn: Key:traffic signals:turn
     traffic_signals:turn:backward: Key:traffic signals:turn:backward
@@ -5732,14 +6094,17 @@ en:
     trailer: Key:trailer
     train: Key:train
     tram: Key:tram
+    transformer: Key:transformer
     transformer:devices: Key:transformer:devices
     trees: Key:trees
     trench: Key:trench
     trolley_wire: Key:trolley wire
     trolleybus: Key:trolleybus
+    truck_wash: Key:truck wash
     tsunami: Key:tsunami
     tsunami:damage: Key:tsunami:damage
     tunnel: Key:tunnel
+    tunnel:name: Key:tunnel:name
     turn: Key:turn
     turn:backward: Key:turn:backward
     turn:both_ways: Key:turn:both ways
@@ -5748,6 +6113,7 @@ en:
     turn:lanes:backward: Key:turn:lanes:backward
     turn:lanes:both_ways: Key:turn:lanes:both ways
     turn:lanes:forward: Key:turn:lanes:forward
+    turn_to_close: Key:turn to close
     turning_radius: Key:turning radius
     twitter: Key:twitter
     type: Key:type
@@ -5767,15 +6133,21 @@ en:
     validate:ants:yellow: Key:validate:ants:yellow
     validate:no_name: Key:validate:no name
     validate:no_ref: Key:validate:no ref
+    valve: Key:valve
     vegan: Key:vegan
     vegetarian: Key:vegetarian
     vehicle: Key:vehicle
     vehicle:conditional: Key:vehicle:conditional
+    vending: Key:vending
     verge: Key:verge
+    via_ferrata_scale: Key:via ferrata scale
+    view: Key:view
     viewpoint: Key:viewpoint
     vine_row_orientation: Key:vine row orientation
     visibility: Key:visibility
     voltage: Key:voltage
+    voltage:primary: Key:voltage:primary
+    voltage:secondary: Key:voltage:secondary
     wall:material: Key:wall:material
     washing_machine: Key:washing machine
     waste: Key:waste
@@ -5783,12 +6155,15 @@ en:
     water: Key:water
     water_characteristic: Key:water characteristic
     water_point: Key:water point
+    water_source: Key:water source
     water_system: Key:water system
     waterway: Key:waterway
     way_area: Key:way area
     website: Key:website
+    website:stock: Key:website:stock
     wetland: Key:wetland
     wheelchair: Key:wheelchair
+    wheelchair:description: Key:wheelchair:description
     whitewater:rapid_grade: Key:whitewater:rapid grade
     wholesale: Key:wholesale
     width: Key:width
@@ -5833,6 +6208,7 @@ en:
     yh:TOTYUMONO: Key:yh:TOTYUMONO
     yh:TYPE: Key:yh:TYPE
     yh:WIDTH_RANK: Key:yh:WIDTH RANK
+    zero_waste: Key:zero waste
     zone: Key:zone
     zone:De_Lijn: Key:zone:De Lijn
     zone:TEC: Key:zone:TEC
@@ -5851,7 +6227,10 @@ en:
     access=no: Tag:access=no
     access=official: Tag:access=official
     access=private: Tag:access=private
+    access=restricted: Tag:access=restricted
     access=use_sidepath: Tag:access=use sidepath
+    actuator=electric_motor: Tag:actuator=electric motor
+    actuator=hydraulic_cylinder: Tag:actuator=hydraulic cylinder
     admin_level=1: Tag:admin level=1
     admin_level=10: Tag:admin level=10
     admin_level=11: Tag:admin level=11
@@ -5895,6 +6274,7 @@ en:
     aerodrome:type=airfield: Tag:aerodrome:type=airfield
     aerodrome:type=gliding: Tag:aerodrome:type=gliding
     aerodrome:type=international: Tag:aerodrome:type=international
+    aerodrome:type=military: Tag:aerodrome:type=military
     aerodrome:type=private: Tag:aerodrome:type=private
     aerodrome:type=regional: Tag:aerodrome:type=regional
     aeroway=aerodrome: Tag:aeroway=aerodrome
@@ -5929,6 +6309,7 @@ en:
     amenity=animal_boarding: Tag:amenity=animal boarding
     amenity=animal_breeding: Tag:amenity=animal breeding
     amenity=animal_shelter: Tag:amenity=animal shelter
+    amenity=animal_training: Tag:amenity=animal training
     amenity=architect_office: Tag:amenity=architect office
     amenity=archive: Tag:amenity=archive
     amenity=arts_centre: Tag:amenity=arts centre
@@ -5946,6 +6327,9 @@ en:
     amenity=bicycle_repair_station: Tag:amenity=bicycle repair station
     amenity=bicycle_trailer_sharing: Tag:amenity=bicycle trailer sharing
     amenity=biergarten: Tag:amenity=biergarten
+    amenity=bike_parking: Tag:amenity=bike parking
+    amenity=bikeshed: Tag:amenity=bikeshed
+    amenity=bird_bath: Tag:amenity=bird bath
     amenity=boat_rental: Tag:amenity=boat rental
     amenity=boat_sharing: Tag:amenity=boat sharing
     amenity=boat_storage: Tag:amenity=boat storage
@@ -5995,10 +6379,13 @@ en:
     amenity=doctor: Tag:amenity=doctor
     amenity=doctors: Tag:amenity=doctors
     amenity=dog_bin: Tag:amenity=dog bin
+    amenity=dog_toilet: Tag:amenity=dog toilet
     amenity=dog_waste_bin: Tag:amenity=dog waste bin
     amenity=dojo: Tag:amenity=dojo
     amenity=dressing_room: Tag:amenity=dressing room
     amenity=drinking_water: Tag:amenity=drinking water
+    amenity=driver_training: Tag:amenity=driver training
+    amenity=driver_training_area: Tag:amenity=driver training area
     amenity=driving_school: Tag:amenity=driving school
     amenity=dryer: Tag:amenity=dryer
     amenity=education: Tag:amenity=education
@@ -6040,6 +6427,7 @@ en:
     amenity=internet_cafe: Tag:amenity=internet cafe
     amenity=jobcentre: Tag:amenity=jobcentre
     amenity=juice_bar: Tag:amenity=juice bar
+    amenity=karaoke_box: Tag:amenity=karaoke box
     amenity=kindergarten: Tag:amenity=kindergarten
     amenity=kiosk: Tag:amenity=kiosk
     amenity=kitchen: Tag:amenity=kitchen
@@ -6082,7 +6470,9 @@ en:
     amenity=police: Tag:amenity=police
     amenity=polling_station: Tag:amenity=polling station
     amenity=post_box: Tag:amenity=post box
+    amenity=post_depot: Tag:amenity=post depot
     amenity=post_office: Tag:amenity=post office
+    amenity=prep_school: Tag:amenity=prep school
     amenity=preschool: Tag:amenity=preschool
     amenity=printer: Tag:amenity=printer
     amenity=prison: Tag:amenity=prison
@@ -6102,6 +6492,7 @@ en:
     amenity=research_institute: Tag:amenity=research institute
     amenity=restaurant: Tag:amenity=restaurant
     amenity=retirement_home: Tag:amenity=retirement home
+    amenity=sailing_school: Tag:amenity=sailing school
     amenity=sanatorium: Tag:amenity=sanatorium
     amenity=sanitary_dump_station: Tag:amenity=sanitary dump station
     amenity=sauna: Tag:amenity=sauna
@@ -6125,6 +6516,7 @@ en:
     amenity=street_light: Tag:amenity=street light
     amenity=stripclub: Tag:amenity=stripclub
     amenity=studio: Tag:amenity=studio
+    amenity=surf_school: Tag:amenity=surf school
     amenity=swimming_pool: Tag:amenity=swimming pool
     amenity=swingerclub: Tag:amenity=swingerclub
     amenity=table: Tag:amenity=table
@@ -6136,6 +6528,7 @@ en:
     amenity=ticket_validator: Tag:amenity=ticket validator
     amenity=toilet: Tag:amenity=toilet
     amenity=toilets: Tag:amenity=toilets
+    amenity=tourist_bus_parking: Tag:amenity=tourist bus parking
     amenity=townhall: Tag:amenity=townhall
     amenity=trolley_bay: Tag:amenity=trolley bay
     amenity=tuition: Tag:amenity=tuition
@@ -6161,18 +6554,28 @@ en:
     aminety=sceptic_tank: Tag:aminety=sceptic tank
     animal=horse_walker: Tag:animal=horse walker
     animal=school: Tag:animal=school
+    animal_breeding=gamecock: Tag:animal breeding=gamecock
     animated=trivision_blades: Tag:animated=trivision blades
     animated=winding_posters: Tag:animated=winding posters
+    anthropogenic=yes: Tag:anthropogenic=yes
     area:highway=cycleway: Tag:area:highway=cycleway
     area:highway=footway: Tag:area:highway=footway
     area:highway=path: Tag:area:highway=path
     area:highway=pedestrian: Tag:area:highway=pedestrian
     artwork_type=sculpture: Tag:artwork type=sculpture
     artwork_type=statue: Tag:artwork type=statue
+    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
     atm=no: Tag:atm=no
     atm=yes: Tag:atm=yes
     attraction=animal: Tag:attraction=animal
     attraction=maze: Tag:attraction=maze
+    attraction=roller_coaster: Tag:attraction=roller coaster
+    attraction=summer_toboggan: Tag:attraction=summer toboggan
     attraction=train: Tag:attraction=train
     attraction=water_slide: Tag:attraction=water slide
     baby_hatch=yes: Tag:baby hatch=yes
@@ -6193,6 +6596,7 @@ en:
     barrier=czech_hedgehog: Tag:barrier=czech hedgehog
     barrier=debris: Tag:barrier=debris
     barrier=ditch: Tag:barrier=ditch
+    barrier=embankment: Tag:barrier=embankment
     barrier=entrance: Tag:barrier=entrance
     barrier=fence: Tag:barrier=fence
     barrier=full-height_turnstile: Tag:barrier=full-height turnstile
@@ -6225,6 +6629,7 @@ en:
     barrier=swing_gate: Tag:barrier=swing gate
     barrier=tank_trap: Tag:barrier=tank trap
     barrier=toll_booth: Tag:barrier=toll booth
+    barrier=tree: Tag:barrier=tree
     barrier=turnstile: Tag:barrier=turnstile
     barrier=wall: Tag:barrier=wall
     baseball=softball: Tag:baseball=softball
@@ -6233,19 +6638,31 @@ en:
     bath:type=onsen: Tag:bath:type=onsen
     bath:type=thermal: Tag:bath:type=thermal
     bay=fjord: Tag:bay=fjord
+    bbq=yes: Tag:bbq=yes
     bicycle=designated: Tag:bicycle=designated
     bicycle=official: Tag:bicycle=official
     bicycle=use_sidepath: Tag:bicycle=use sidepath
     biosphärenwirt=yes: Tag:biosphärenwirt=yes
+    birds_nest=stork: Tag:birds nest=stork
+    boat:rental=yes: Tag:boat:rental=yes
+    boat:type=canoe: Tag:boat:type=canoe
+    boat:type=dinghy: Tag:boat:type=dinghy
+    boat:type=kayak: Tag:boat:type=kayak
+    boat:type=motorboat: Tag:boat:type=motorboat
+    boat:type=pedalo: Tag:boat:type=pedalo
+    boat:type=rowing: Tag:boat:type=rowing
+    boat:type=sailing: Tag:boat:type=sailing
     border_type=IALA: Tag:border type=IALA
     border_type=fishery: Tag:border type=fishery
     border_type=harbour_limits: Tag:border type=harbour limits
+    boundary=aboriginal_lands: Tag:boundary=aboriginal lands
     boundary=administrative: Tag:boundary=administrative
     boundary=civil: Tag:boundary=civil
     boundary=economic: Tag:boundary=economic
     boundary=forest_compartment: Tag:boundary=forest compartment
     boundary=historic: Tag:boundary=historic
     boundary=local_authority: Tag:boundary=local authority
+    boundary=low_emission_zone: Tag:boundary=low emission zone
     boundary=maritime: Tag:boundary=maritime
     boundary=marker: Tag:boundary=marker
     boundary=military_district: Tag:boundary=military district
@@ -6262,6 +6679,7 @@ en:
     brand=Harley-Davidson: Tag:brand=Harley-Davidson
     brand=KTM: Tag:brand=KTM
     brand=Moto_Guzzi: Tag:brand=Moto Guzzi
+    brand=Triumph: Tag:brand=Triumph
     brand=Zero: Tag:brand=Zero
     bridge:movable=bascule: Tag:bridge:movable=bascule
     bridge:movable=drawbridge: Tag:bridge:movable=drawbridge
@@ -6321,6 +6739,7 @@ en:
     building=font: Tag:building=font
     building=garage: Tag:building=garage
     building=garages: Tag:building=garages
+    building=ger: Tag:building=ger
     building=government: Tag:building=government
     building=grandstand: Tag:building=grandstand
     building=greenhouse: Tag:building=greenhouse
@@ -6341,6 +6760,7 @@ en:
     building=parking: Tag:building=parking
     building=pavilion: Tag:building=pavilion
     building=public: Tag:building=public
+    building=religious: Tag:building=religious
     building=remote_digital_terminal: Tag:building=remote digital terminal
     building=residential: Tag:building=residential
     building=retail: Tag:building=retail
@@ -6365,11 +6785,13 @@ en:
     building=synagogue: Tag:building=synagogue
     building=tech_cab: Tag:building=tech cab
     building=temple: Tag:building=temple
+    building=tent: Tag:building=tent
     building=terrace: Tag:building=terrace
     building=toilets: Tag:building=toilets
     building=train_station: Tag:building=train station
     building=transformer_tower: Tag:building=transformer tower
     building=transportation: Tag:building=transportation
+    building=trullo: Tag:building=trullo
     building=university: Tag:building=university
     building=warehouse: Tag:building=warehouse
     building=water_tower: Tag:building=water tower
@@ -6379,11 +6801,26 @@ en:
     bunker_type=munitions: Tag:bunker type=munitions
     bunker_type=pillbox: Tag:bunker type=pillbox
     bunker_type=technical: Tag:bunker type=technical
+    bus=yes: Tag:bus=yes
+    busbar=flexible: Tag:busbar=flexible
+    busbar=rigid: Tag:busbar=rigid
     busway:left=lane: Tag:busway:left=lane
     busway:right=lane: Tag:busway:right=lane
     busway=lane: Tag:busway=lane
     busway=opposite_lane: Tag:busway=opposite lane
     cafe=time-cafe: Tag:cafe=time-cafe
+    camp_site=basic: Tag:camp site=basic
+    camp_site=camp_pitch: Tag:camp site=camp pitch
+    camp_site=deluxe: Tag:camp site=deluxe
+    camp_site=serviced: Tag:camp site=serviced
+    camp_site=standard: Tag:camp site=standard
+    canal=qanat: Tag:canal=qanat
+    capital=4: Tag:capital=4
+    capital=5: Tag:capital=5
+    capital=6: Tag:capital=6
+    capital=yes: Tag:capital=yes
+    car:type=hgv: Tag:car:type=hgv
+    cargo=container: Tag:cargo=container
     castle_type=castrum: Tag:castle type=castrum
     castle_type=defensive: Tag:castle type=defensive
     castle_type=fortress: Tag:castle type=fortress
@@ -6393,19 +6830,32 @@ en:
     castle_type=shiro: Tag:castle type=shiro
     castle_type=stately: Tag:castle type=stately
     cemetery=grave: Tag:cemetery=grave
+    cemetery=war_cemetery: Tag:cemetery=war cemetery
+    clothes=fashion: Tag:clothes=fashion
     clothes=motorcycle: Tag:clothes=motorcycle
     clothes=sports: Tag:clothes=sports
     clothes=underwear: Tag:clothes=underwear
+    clothes=women: Tag:clothes=women
+    clothes=women;men: Tag:clothes=women;men
+    clothes=women;men;children: Tag:clothes=women;men;children
     club=amateur_radio: Tag:club=amateur radio
     club=automobile: Tag:club=automobile
     club=fan: Tag:club=fan
+    club=motorcycle: Tag:club=motorcycle
     club=scout: Tag:club=scout
     club=sport: Tag:club=sport
     coastline:survey_quality=complete: Tag:coastline:survey quality=complete
     coastline:survey_quality=inadequate: Tag:coastline:survey quality=inadequate
+    collection_times:signed=no: Tag:collection times:signed=no
     communication=line: Tag:communication=line
     construction=yes: Tag:construction=yes
+    consulate=consular_agency: Tag:consulate=consular agency
+    consulate=consular_office: Tag:consulate=consular office
+    consulate=consulate_general: Tag:consulate=consulate general
+    consulate=honorary_consul: Tag:consulate=honorary consul
+    consulate=yes: Tag:consulate=yes
     craft=agricultural_engines: Tag:craft=agricultural engines
+    craft=bag_repair: Tag:craft=bag repair
     craft=bakery: Tag:craft=bakery
     craft=basket_maker: Tag:craft=basket maker
     craft=beekeeper: Tag:craft=beekeeper
@@ -6434,6 +6884,7 @@ en:
     craft=floorer: Tag:craft=floorer
     craft=gardener: Tag:craft=gardener
     craft=glaziery: Tag:craft=glaziery
+    craft=goldsmith: Tag:craft=goldsmith
     craft=grinding_mill: Tag:craft=grinding mill
     craft=handicraft: Tag:craft=handicraft
     craft=hvac: Tag:craft=hvac
@@ -6442,7 +6893,10 @@ en:
     craft=jeweller: Tag:craft=jeweller
     craft=joiner: Tag:craft=joiner
     craft=key_cutter: Tag:craft=key cutter
+    craft=lacquerer: Tag:craft=lacquerer
+    craft=leather: Tag:craft=leather
     craft=locksmith: Tag:craft=locksmith
+    craft=luthier: Tag:craft=luthier
     craft=metal_construction: Tag:craft=metal construction
     craft=mint: Tag:craft=mint
     craft=musical_instrument: Tag:craft=musical instrument
@@ -6452,13 +6906,16 @@ en:
     craft=painter: Tag:craft=painter
     craft=paperhanger: Tag:craft=paperhanger
     craft=parquet_layer: Tag:craft=parquet layer
+    craft=paver: Tag:craft=paver
     craft=photographer: Tag:craft=photographer
     craft=photographic_laboratory: Tag:craft=photographic laboratory
     craft=piano_tuner: Tag:craft=piano tuner
     craft=plasterer: Tag:craft=plasterer
     craft=plumber: Tag:craft=plumber
     craft=pottery: Tag:craft=pottery
+    craft=printer: Tag:craft=printer
     craft=printmaker: Tag:craft=printmaker
+    craft=restoration: Tag:craft=restoration
     craft=rigger: Tag:craft=rigger
     craft=roofer: Tag:craft=roofer
     craft=saddler: Tag:craft=saddler
@@ -6468,6 +6925,7 @@ en:
     craft=sculptor: Tag:craft=sculptor
     craft=sewing: Tag:craft=sewing
     craft=shoemaker: Tag:craft=shoemaker
+    craft=signmaker: Tag:craft=signmaker
     craft=stand_builder: Tag:craft=stand builder
     craft=stonemason: Tag:craft=stonemason
     craft=sun_protection: Tag:craft=sun protection
@@ -6479,13 +6937,19 @@ en:
     craft=turner: Tag:craft=turner
     craft=upholsterer: Tag:craft=upholsterer
     craft=watchmaker: Tag:craft=watchmaker
+    craft=welder: Tag:craft=welder
     craft=window_construction: Tag:craft=window construction
     craft=winery: Tag:craft=winery
+    crane:type=floor-mounted_crane: Tag:crane:type=floor-mounted crane
+    crane:type=gantry_crane: Tag:crane:type=gantry crane
+    crane:type=portal_crane: Tag:crane:type=portal crane
+    crane:type=travel_lift: Tag:crane:type=travel lift
     crop=asparagus: Tag:crop=asparagus
     crop=aspargus: Tag:crop=aspargus
     crop=bananas: Tag:crop=bananas
     crop=barley: Tag:crop=barley
     crop=cassava: Tag:crop=cassava
+    crop=cereal: Tag:crop=cereal
     crop=coffee: Tag:crop=coffee
     crop=corn: Tag:crop=corn
     crop=flowers: Tag:crop=flowers
@@ -6498,13 +6962,17 @@ en:
     crop=rape: Tag:crop=rape
     crop=rice: Tag:crop=rice
     crop=rye: Tag:crop=rye
+    crop=soy: Tag:crop=soy
     crop=strawberry: Tag:crop=strawberry
     crop=sugar: Tag:crop=sugar
+    crop=sunflower: Tag:crop=sunflower
     crop=tea: Tag:crop=tea
     crop=wheat: Tag:crop=wheat
     crossing=unknown: Tag:crossing=unknown
+    crossing=zebra: Tag:crossing=zebra
     cuisine=brazilian: Tag:cuisine=brazilian
     cuisine=brunch: Tag:cuisine=brunch
+    cuisine=bubble_tea: Tag:cuisine=bubble tea
     cuisine=coffee_shop: Tag:cuisine=coffee shop
     cuisine=dessert: Tag:cuisine=dessert
     cuisine=tea_shop: Tag:cuisine=tea shop
@@ -6518,9 +6986,11 @@ en:
     cycle_network=US:PA: Tag:cycle network=US:PA
     cycle_network=US:US: Tag:cycle network=US:US
     cycleway:left=lane: Tag:cycleway:left=lane
+    cycleway:left=opposite_lane: Tag:cycleway:left=opposite lane
     cycleway:left=opposite_track: Tag:cycleway:left=opposite track
     cycleway:left=track: Tag:cycleway:left=track
     cycleway:right=lane: Tag:cycleway:right=lane
+    cycleway:right=opposite_lane: Tag:cycleway:right=opposite lane
     cycleway:right=opposite_track: Tag:cycleway:right=opposite track
     cycleway:right=track: Tag:cycleway:right=track
     cycleway=asl: Tag:cycleway=asl
@@ -6541,9 +7011,11 @@ en:
     defensive=keep: Tag:defensive=keep
     demolished=yes: Tag:demolished=yes
     dennert_fir_tree=yes: Tag:dennert fir tree=yes
+    denomination=la_luz_del_mundo: Tag:denomination=la luz del mundo
     denomination=mormon: Tag:denomination=mormon
     denomination=reformed: Tag:denomination=reformed
     denotation=cluster: Tag:denotation=cluster
+    designation=common: Tag:designation=common
     destroyed=yes: Tag:destroyed=yes
     diplomatic=ambassadors_residence: Tag:diplomatic=ambassadors residence
     diplomatic=consulate: Tag:diplomatic=consulate
@@ -6552,12 +7024,21 @@ en:
     diplomatic=embassy: Tag:diplomatic=embassy
     diplomatic=high_commission: Tag:diplomatic=high commission
     diplomatic=honorary_consulate: Tag:diplomatic=honorary consulate
+    diplomatic=liaison: Tag:diplomatic=liaison
     diplomatic=permanent_mission: Tag:diplomatic=permanent mission
     dock=drydock: Tag:dock=drydock
     dock=floating: Tag:dock=floating
     dock=tidal: Tag:dock=tidal
     electrified=contact_line: Tag:electrified=contact line
     electrified=rail: Tag:electrified=rail
+    embassy=branch_embassy: Tag:embassy=branch embassy
+    embassy=delegation: Tag:embassy=delegation
+    embassy=high_commission: Tag:embassy=high commission
+    embassy=interests_section: Tag:embassy=interests section
+    embassy=mission: Tag:embassy=mission
+    embassy=nunciature: Tag:embassy=nunciature
+    embassy=residence: Tag:embassy=residence
+    embassy=yes: Tag:embassy=yes
     emergency=access_point: Tag:emergency=access point
     emergency=aed: Tag:emergency=aed
     emergency=ambulance_station: Tag:emergency=ambulance station
@@ -6569,7 +7050,6 @@ en:
     emergency=dry_riser: Tag:emergency=dry riser
     emergency=dry_riser_inlet: Tag:emergency=dry riser inlet
     emergency=emergency_ward_entrance: Tag:emergency=emergency ward entrance
-    emergency=fire_alarm: Tag:emergency=fire alarm
     emergency=fire_alarm_box: Tag:emergency=fire alarm box
     emergency=fire_extinguisher: Tag:emergency=fire extinguisher
     emergency=fire_flapper: Tag:emergency=fire flapper
@@ -6603,6 +7083,7 @@ en:
     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=main: Tag:entrance=main
     entrance=staircase: Tag:entrance=staircase
@@ -6612,6 +7093,7 @@ en:
     fast_food=cafeteria: Tag:fast food=cafeteria
     flood_mark=painting: Tag:flood mark=painting
     flood_mark=plaque: Tag:flood mark=plaque
+    flow_direction=both: Tag:flow direction=both
     foot=designated: Tag:foot=designated
     foot=official: Tag:foot=official
     footway=crossing: Tag:footway=crossing
@@ -6644,6 +7126,7 @@ en:
     generator:source=biogas: Tag:generator:source=biogas
     generator:source=biomass: Tag:generator:source=biomass
     generator:source=coal: Tag:generator:source=coal
+    generator:source=diesel: Tag:generator:source=diesel
     generator:source=gas: Tag:generator:source=gas
     generator:source=gasoline: Tag:generator:source=gasoline
     generator:source=geothermal: Tag:generator:source=geothermal
@@ -6676,16 +7159,20 @@ en:
     geological=moraine: Tag:geological=moraine
     geological=outcrop: Tag:geological=outcrop
     geological=palaeontological_site: Tag:geological=palaeontological site
+    glideslope=yes: Tag:glideslope=yes
     golf=bunker: Tag:golf=bunker
+    golf=cartpath: Tag:golf=cartpath
     golf=driving_range: Tag:golf=driving range
     golf=fairway: Tag:golf=fairway
     golf=green: Tag:golf=green
     golf=hole: Tag:golf=hole
     golf=lateral_water_hazard: Tag:golf=lateral water hazard
+    golf=path: Tag:golf=path
     golf=pin: Tag:golf=pin
     golf=rough: Tag:golf=rough
     golf=tee: Tag:golf=tee
     golf=water_hazard: Tag:golf=water hazard
+    government=archive: Tag:government=archive
     government=audit: Tag:government=audit
     government=cadaster: Tag:government=cadaster
     government=customs: Tag:government=customs
@@ -6696,8 +7183,11 @@ en:
     government=statistics: Tag:government=statistics
     government=tax: Tag:government=tax
     government=youth_welfare_department: Tag:government=youth welfare department
+    grass=amenity_grassland: Tag:grass=amenity grassland
     grit_bin: Tag:grit bin
     guidepost=simple: Tag:guidepost=simple
+    handle=lever: Tag:handle=lever
+    handle=wheel: Tag:handle=wheel
     harbour:category=RoRo: Tag:harbour:category=RoRo
     harbour:category=bulk: Tag:harbour:category=bulk
     harbour:category=container: Tag:harbour:category=container
@@ -6721,7 +7211,11 @@ en:
     hazard_type=landslide: Tag:hazard type=landslide
     hazmat:water=permissive: Tag:hazmat:water=permissive
     healthcare=blood_donation: Tag:healthcare=blood donation
+    healthcare=dentist: Tag:healthcare=dentist
     healthcare=laboratory: Tag:healthcare=laboratory
+    healthcare=nutrition_counseling: Tag:healthcare=nutrition counseling
+    healthcare=nutrition_counselling: Tag:healthcare=nutrition counselling
+    healthcare=physiotherapist: Tag:healthcare=physiotherapist
     highway=Bus_guideway: Tag:highway=Bus guideway
     highway=abandoned: Tag:highway=abandoned
     highway=access: Tag:highway=access
@@ -6731,9 +7225,11 @@ en:
     highway=bus_stop: Tag:highway=bus stop
     highway=byway: Tag:highway=byway
     highway=cattle_grid: Tag:highway=cattle grid
+    highway=construction: Tag:highway=construction
     highway=corridor: Tag:highway=corridor
     highway=crossing: Tag:highway=crossing
     highway=cycleway: Tag:highway=cycleway
+    highway=cycleway_link: Tag:highway=cycleway link
     highway=disused: Tag:highway=disused
     highway=elevator: Tag:highway=elevator
     highway=emergency_access_point: Tag:highway=emergency access point
@@ -6743,6 +7239,7 @@ 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=incline: Tag:highway=incline
     highway=incline_steep: Tag:highway=incline steep
     highway=living_street: Tag:highway=living street
@@ -6760,6 +7257,7 @@ en:
     highway=planned: Tag:highway=planned
     highway=platform: Tag:highway=platform
     highway=primary: Tag:highway=primary
+    highway=primary_link: Tag:highway=primary link
     highway=proposed: Tag:highway=proposed
     highway=raceway: Tag:highway=raceway
     highway=razed: Tag:highway=razed
@@ -6767,8 +7265,10 @@ en:
     highway=rest_area: Tag:highway=rest area
     highway=road: Tag:highway=road
     highway=secondary: Tag:highway=secondary
+    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
@@ -6776,11 +7276,14 @@ en:
     highway=stop: Tag:highway=stop
     highway=street_lamp: Tag:highway=street lamp
     highway=tertiary: Tag:highway=tertiary
+    highway=tertiary_link: Tag:highway=tertiary link
     highway=toll_booth: Tag:highway=toll booth
+    highway=toll_gantry: Tag:highway=toll gantry
     highway=track: Tag:highway=track
     highway=traffic_mirror: Tag:highway=traffic mirror
     highway=traffic_signals: Tag:highway=traffic signals
     highway=trail: Tag:highway=trail
+    highway=trailhead: Tag:highway=trailhead
     highway=trunk: Tag:highway=trunk
     highway=trunk_link: Tag:highway=trunk link
     highway=turning_circle: Tag:highway=turning circle
@@ -6825,16 +7328,22 @@ en:
     historic=paleontological_site: Tag:historic=paleontological site
     historic=pillory: Tag:historic=pillory
     historic=railway_car: Tag:historic=railway car
+    historic=rampart: Tag:historic=rampart
     historic=ruins: Tag:historic=ruins
     historic=rune_stone: Tag:historic=rune stone
     historic=shieling: Tag:historic=shieling
     historic=ship: Tag:historic=ship
     historic=stone: Tag:historic=stone
+    historic=tank: Tag:historic=tank
     historic=tomb: Tag:historic=tomb
+    historic=tower: Tag:historic=tower
     historic=tree_shrine: Tag:historic=tree shrine
     historic=wayside_cross: Tag:historic=wayside cross
     historic=wayside_shrine: Tag:historic=wayside shrine
     historic=wreck: Tag:historic=wreck
+    holding_position=ILS: Tag:holding position=ILS
+    holding_position=intermediate: Tag:holding position=intermediate
+    holding_position=runway: Tag:holding position=runway
     horse=designated: Tag:horse=designated
     hunting=raised_hide: Tag:hunting=raised hide
     indoor=area: Tag:indoor=area
@@ -6877,14 +7386,23 @@ en:
     information=tactile_map: Tag:information=tactile map
     information=tactile_model: Tag:information=tactile model
     information=terminal: Tag:information=terminal
+    insurance=health: Tag:insurance=health
+    internet_access=no: Tag:internet access=no
+    internet_access=terminal: Tag:internet access=terminal
+    internet_access=wired: Tag:internet access=wired
     internet_access=wlan: Tag:internet access=wlan
+    internet_access=yes: Tag:internet access=yes
     irrigation=pivot: Tag:irrigation=pivot
+    irrigation=yes: Tag:irrigation=yes
+    jetski:rental=yes: Tag:jetski:rental=yes
     junction=circular: Tag:junction=circular
     junction=crossing: Tag:junction=crossing
     junction=filter: Tag:junction=filter
     junction=jughandle: Tag:junction=jughandle
     junction=roundabout: Tag:junction=roundabout
+    junction=spui: Tag:junction=spui
     junction=yes: Tag:junction=yes
+    karst=yes: Tag:karst=yes
     landcover=grass: Tag:landcover=grass
     landcover=gravel: Tag:landcover=gravel
     landcover=trees: Tag:landcover=trees
@@ -6922,6 +7440,7 @@ en:
     landuse=building_site: Tag:landuse=building site
     landuse=cemetery: Tag:landuse=cemetery
     landuse=churchyard: Tag:landuse=churchyard
+    landuse=civic_admin: Tag:landuse=civic admin
     landuse=commercial: Tag:landuse=commercial
     landuse=conservation: Tag:landuse=conservation
     landuse=construction: Tag:landuse=construction
@@ -6942,10 +7461,10 @@ en:
     landuse=highway: Tag:landuse=highway
     landuse=hop_garden: Tag:landuse=hop garden
     landuse=industrial: Tag:landuse=industrial
-    landuse=institutional: Tag:landuse=institutional
     landuse=landfill: Tag:landuse=landfill
     landuse=logging: Tag:landuse=logging
     landuse=meadow: Tag:landuse=meadow
+    landuse=meadow_orchard: Tag:landuse=meadow orchard
     landuse=military: Tag:landuse=military
     landuse=observatory: Tag:landuse=observatory
     landuse=orchard: Tag:landuse=orchard
@@ -6971,6 +7490,7 @@ en:
     landuse=vineyard: Tag:landuse=vineyard
     landuse=well: Tag:landuse=well
     landuse=wellsite: Tag:landuse=wellsite
+    landuse=wholesale: Tag:landuse=wholesale
     landuse=winter_sport: Tag:landuse=winter sport
     landuse=winter_sports: Tag:landuse=winter sports
     landuse=wood: Tag:landuse=wood
@@ -7040,6 +7560,7 @@ en:
     leisure=soccer_golf: Tag:leisure=soccer golf
     leisure=social_club: Tag:leisure=social club
     leisure=sports_centre: Tag:leisure=sports centre
+    leisure=sports_hall: Tag:leisure=sports hall
     leisure=stadium: Tag:leisure=stadium
     leisure=summer_camp: Tag:leisure=summer camp
     leisure=swimming_area: Tag:leisure=swimming area
@@ -7055,13 +7576,21 @@ en:
     level_crossing=automatic_barrier: Tag:level crossing=automatic barrier
     level_crossing=traffic_signals: Tag:level crossing=traffic signals
     level_crossing=uncontrolled: Tag:level crossing=uncontrolled
+    liaison=liaison_office: Tag:liaison=liaison office
+    liaison=representative_office: Tag:liaison=representative office
+    liaison=subnational: Tag:liaison=subnational
     line=bay: Tag:line=bay
     line=busbar: Tag:line=busbar
     line=substation: Tag:line=substation
     lines=phone: Tag:lines=phone
     locality=subtownland: Tag:locality=subtownland
     locality=townland: Tag:locality=townland
+    localizer=yes: Tag:localizer=yes
     location:transition=yes: Tag:location:transition=yes
+    location=overground: Tag:location=overground
+    location=overhead: Tag:location=overhead
+    location=underground: Tag:location=underground
+    location=underwater: Tag:location=underwater
     maintenance=gritting: Tag:maintenance=gritting
     man_made=MDF: Tag:man made=MDF
     man_made=adit: Tag:man made=adit
@@ -7076,6 +7605,7 @@ en:
     man_made=cairn: Tag:man made=cairn
     man_made=campanile: Tag:man made=campanile
     man_made=carpet_hanger: Tag:man made=carpet hanger
+    man_made=chiller: Tag:man made=chiller
     man_made=chimney: Tag:man made=chimney
     man_made=clearcut: Tag:man made=clearcut
     man_made=communications_tower: Tag:man made=communications tower
@@ -7096,9 +7626,11 @@ en:
     man_made=floating_storage: Tag:man made=floating storage
     man_made=footwear_decontamination: Tag:man made=footwear decontamination
     man_made=frost_fan: Tag:man made=frost fan
+    man_made=gas_well: Tag:man made=gas well
     man_made=gasometer: Tag:man made=gasometer
     man_made=geoglyph: Tag:man made=geoglyph
     man_made=goods_conveyor: Tag:man made=goods conveyor
+    man_made=graduation_tower: Tag:man made=graduation tower
     man_made=ground_station: Tag:man made=ground station
     man_made=groyne: Tag:man made=groyne
     man_made=guy: Tag:man made=guy
@@ -7108,7 +7640,9 @@ en:
     man_made=kiln: Tag:man made=kiln
     man_made=levee: Tag:man made=levee
     man_made=lighthouse: Tag:man made=lighthouse
+    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=mineshaft: Tag:man made=mineshaft
     man_made=monitoring_station: Tag:man made=monitoring station
@@ -7121,14 +7655,16 @@ en:
     man_made=pier: Tag:man made=pier
     man_made=pillar: Tag:man made=pillar
     man_made=pipeline: Tag:man made=pipeline
-    man_made=power_fossil: Tag:man made=power fossil
+    man_made=planter: Tag:man made=planter
     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=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=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=silo: Tag:man made=silo
@@ -7160,6 +7696,7 @@ en:
     man_made=works: Tag:man made=works
     manhole=drain: Tag:manhole=drain
     manhole=telecom: Tag:manhole=telecom
+    maritime=yes: Tag:maritime=yes
     maxheight=default: Tag:maxheight=default
     medical=aed: Tag:medical=aed
     medical=witchdoctor: Tag:medical=witchdoctor
@@ -7183,6 +7720,7 @@ en:
     memorial:type=stolperstein: Tag:memorial:type=stolperstein
     memorial=blue_plaque: Tag:memorial=blue plaque
     memorial=bust: Tag:memorial=bust
+    memorial=ghost_bike: Tag:memorial=ghost bike
     memorial=obelisk: Tag:memorial=obelisk
     memorial=plaque: Tag:memorial=plaque
     memorial=statue: Tag:memorial=statue
@@ -7216,12 +7754,12 @@ en:
     mooring=sbm: Tag:mooring=sbm
     mooring=spm: Tag:mooring=spm
     mooring=visitor: Tag:mooring=visitor
-    motorcycle:theme=yes: Tag:motorcycle:theme=yes
     motorcycle:type=electric: Tag:motorcycle:type=electric
     motorcycle:type=sportbike: Tag:motorcycle:type=sportbike
-    motorcycle_friendly=customary: Tag:motorcycle friendly=customary
+    mountain_pass=yes: Tag:mountain pass=yes
     museum=archaeological: Tag:museum=archaeological
     museum=art: Tag:museum=art
+    museum=children: Tag:museum=children
     museum=history: Tag:museum=history
     museum=living_history: Tag:museum=living history
     museum=local: Tag:museum=local
@@ -7240,6 +7778,7 @@ en:
     name=Costco: Tag:name=Costco
     name=Dollarama: Tag:name=Dollarama
     name=Domino's_Pizza: Tag:name=Domino's Pizza
+    name=Herfy: Tag:name=Herfy
     name=KFC: Tag:name=KFC
     name=McDonald's: Tag:name=McDonald's
     name=Subway: Tag:name=Subway
@@ -7249,6 +7788,7 @@ en:
     name=Продукты: Tag:name=Продукты
     natural=anthill: Tag:natural=anthill
     natural=arete: Tag:natural=arete
+    natural=atoll: Tag:natural=atoll
     natural=avalanche_dam: Tag:natural=avalanche dam
     natural=bare_rock: Tag:natural=bare rock
     natural=bay: Tag:natural=bay
@@ -7262,7 +7802,6 @@ en:
     natural=cliff: Tag:natural=cliff
     natural=cloud: Tag:natural=cloud
     natural=coastline: Tag:natural=coastline
-    natural=continental_shelf: Tag:natural=continental shelf
     natural=crater: Tag:natural=crater
     natural=crevasse: Tag:natural=crevasse
     natural=desert: Tag:natural=desert
@@ -7276,11 +7815,13 @@ en:
     natural=geothermal_field: Tag:natural=geothermal field
     natural=geyser: Tag:natural=geyser
     natural=glacier: Tag:natural=glacier
+    natural=gorge: Tag:natural=gorge
     natural=grassland: Tag:natural=grassland
     natural=gully: Tag:natural=gully
     natural=heath: Tag:natural=heath
     natural=hill: Tag:natural=hill
     natural=hot_spring: Tag:natural=hot spring
+    natural=isthmus: Tag:natural=isthmus
     natural=lake: Tag:natural=lake
     natural=land: Tag:natural=land
     natural=landform: Tag:natural=landform
@@ -7291,11 +7832,14 @@ en:
     natural=moor: Tag:natural=moor
     natural=moraine: Tag:natural=moraine
     natural=moss: Tag:natural=moss
+    natural=mountain_range: Tag:natural=mountain range
     natural=mud: Tag:natural=mud
     natural=naled: Tag:natural=naled
     natural=palaeontological_site: Tag:natural=palaeontological site
     natural=peak: Tag:natural=peak
+    natural=peninsula: Tag:natural=peninsula
     natural=plant: Tag:natural=plant
+    natural=plateau: Tag:natural=plateau
     natural=reef: Tag:natural=reef
     natural=ridge: Tag:natural=ridge
     natural=riverbed: Tag:natural=riverbed
@@ -7323,6 +7867,7 @@ en:
     natural=water: Tag:natural=water
     natural=wetland: Tag:natural=wetland
     natural=wood: Tag:natural=wood
+    nest_platform=yes: Tag:nest platform=yes
     network=BR: Tag:network=BR
     network=BR:ES: Tag:network=BR:ES
     network=BR:MG: Tag:network=BR:MG
@@ -7490,7 +8035,11 @@ en:
     network=US:WI: Tag:network=US:WI
     network=US:WV: Tag:network=US:WV
     network=US:WV:Berkeley: Tag:network=US:WV:Berkeley
+    network=US:WV:McDowell: Tag:network=US:WV:McDowell
+    network=US:WV:Mercer: Tag:network=US:WV:Mercer
     network=US:WY: Tag:network=US:WY
+    network=VE:R:PO: Tag:network=VE:R:PO
+    network=VE:ramal:portuguesa: Tag:network=VE:ramal:portuguesa
     network=call-a-bike: Tag:network=call-a-bike
     network=cambio/stadtmobil: Tag:network=cambio/stadtmobil
     network=cambio_stadtmobil: Tag:network=cambio stadtmobil
@@ -7513,6 +8062,7 @@ en:
     network=rwn: Tag:network=rwn
     noexit=no: Tag:noexit=no
     observatory:type=astronomical: Tag:observatory:type=astronomical
+    observatory:type=meteorological: Tag:observatory:type=meteorological
     odbl=clean: Tag:odbl=clean
     office:realtor: Tag:office:realtor
     office=accountant: Tag:office=accountant
@@ -7521,9 +8071,11 @@ en:
     office=advertising_agency: Tag:office=advertising agency
     office=architect: Tag:office=architect
     office=association: Tag:office=association
+    office=bail_bond_agent: Tag:office=bail bond agent
     office=charity: Tag:office=charity
     office=company: Tag:office=company
     office=coworking: Tag:office=coworking
+    office=diplomatic: Tag:office=diplomatic
     office=educational_institution: Tag:office=educational institution
     office=employment_agency: Tag:office=employment agency
     office=energy_supplier: Tag:office=energy supplier
@@ -7562,10 +8114,12 @@ en:
     office=therapist: Tag:office=therapist
     office=tourist_accommodation: Tag:office=tourist accommodation
     office=travel_agent: Tag:office=travel agent
+    office=visa: Tag:office=visa
     office=water_utility: Tag:office=water utility
     office=yes: Tag:office=yes
     oneway=alternating: Tag:oneway=alternating
     oneway=reversible: Tag:oneway=reversible
+    opening_hours:signed=no: Tag:opening hours:signed=no
     operator=Cambio: Tag:operator=Cambio
     operator=CiteeCar: Tag:operator=CiteeCar
     operator=Drive_Carsharing: Tag:operator=Drive Carsharing
@@ -7576,9 +8130,10 @@ en:
     operator=independent: Tag:operator=independent
     operator=stadtmobil: Tag:operator=stadtmobil
     operator=teilAuto: Tag:operator=teilAuto
-    organ: Tag:organ
     parking:lane:hgv=on_street: Tag:parking:lane:hgv=on street
+    parking=multi-storey: Tag:parking=multi-storey
     parking=surface: Tag:parking=surface
+    parking=underground: Tag:parking=underground
     passenger=international: Tag:passenger=international
     passenger=local: Tag:passenger=local
     passenger=national: Tag:passenger=national
@@ -7605,15 +8160,18 @@ en:
     place=continent: Tag:place=continent
     place=country: Tag:place=country
     place=county: Tag:place=county
+    place=district: Tag:place=district
     place=farm: Tag:place=farm
     place=hamlet: Tag:place=hamlet
     place=island: Tag:place=island
     place=islet: Tag:place=islet
     place=isolated_dwelling: Tag:place=isolated dwelling
     place=locality: Tag:place=locality
+    place=municipality: Tag:place=municipality
     place=neighbourhood: Tag:place=neighbourhood
     place=ocean: Tag:place=ocean
     place=plot: Tag:place=plot
+    place=province: Tag:place=province
     place=quarter: Tag:place=quarter
     place=region: Tag:place=region
     place=sea: Tag:place=sea
@@ -7625,7 +8183,33 @@ en:
     place=village: Tag:place=village
     placement=right_of:1: Tag:placement=right of:1
     placement=transition: Tag:placement=transition
+    plant:method=photovoltaic: Tag:plant:method=photovoltaic
+    plant:method=thermal: Tag:plant:method=thermal
+    plant:source=biomass: Tag:plant:source=biomass
+    plant:source=coal: Tag:plant:source=coal
+    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=waste: Tag:plant:source=waste
+    plant:source=wind: Tag:plant:source=wind
+    playground=slide: Tag:playground=slide
+    playground=structure: Tag:playground=structure
     pole=transition: Tag:pole=transition
+    police=barracks: Tag:police=barracks
+    police=car_pound: Tag:police=car pound
+    police=car_repair: Tag:police=car repair
+    police=checkpoint: Tag:police=checkpoint
+    police=detention: Tag:police=detention
+    police=naval_base: Tag:police=naval base
+    police=offices: Tag:police=offices
+    police=range: Tag:police=range
+    police=storage: Tag:police=storage
+    police=training_area: Tag:police=training area
+    police=yes: Tag:police=yes
+    power=antenna_line: Tag:power=antenna line
     power=busbar: Tag:power=busbar
     power=cable: Tag:power=cable
     power=cable_distribution_cabinet: Tag:power=cable distribution cabinet
@@ -7633,6 +8217,7 @@ en:
     power=compensator: Tag:power=compensator
     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
@@ -7656,6 +8241,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=employees: Tag:private=employees
+    pseudo=yes: Tag:pseudo=yes
     psv=designated: Tag:psv=designated
     public_transport=pay_scale_area: Tag:public transport=pay scale area
     public_transport=platform: Tag:public transport=platform
@@ -7726,7 +8313,7 @@ en:
     railway=water_crane: Tag:railway=water crane
     railway=water_tower: Tag:railway=water tower
     railway=yard: Tag:railway=yard
-    recycling_type=container: Tag:recycling type=container
+    refitted=yes: Tag:refitted=yes
     religion=buddhist: Tag:religion=buddhist
     religion=christian: Tag:religion=christian
     religion=hindu: Tag:religion=hindu
@@ -7742,12 +8329,16 @@ en:
     religion=zoroastrian: Tag:religion=zoroastrian
     rental=ski: Tag:rental=ski
     rental=strandkorb: Tag:rental=strandkorb
+    rental=trailer: Tag:rental=trailer
+    repair=assisted_self_service: Tag:repair=assisted self service
     residential=rural: Tag:residential=rural
     residential=university: Tag:residential=university
     residential=urban: Tag:residential=urban
     resource=aggregate: Tag:resource=aggregate
     resource=gravel: Tag:resource=gravel
     resource=sand: Tag:resource=sand
+    rfr=yes: Tag:rfr=yes
+    roller_coaster=track: Tag:roller coaster=track
     route=aqueduct: Tag:route=aqueduct
     route=bicycle: Tag:route=bicycle
     route=bus: Tag:route=bus
@@ -7782,6 +8373,8 @@ en:
     route=tram: Tag:route=tram
     route=transhumance: Tag:route=transhumance
     route=trolleybus: Tag:route=trolleybus
+    route=worship: Tag:route=worship
+    sailing:tours=yes: Tag:sailing:tours=yes
     seamark:beacon_cardinal:colour_pattern=horizontal: Tag:seamark:beacon cardinal:colour
       pattern=horizontal
     seamark:beacon_cardinal:shape=tower: Tag:seamark:beacon cardinal:shape=tower
@@ -8097,6 +8690,7 @@ en:
     seamark=landmark: Tag:seamark=landmark
     segregated=no: Tag:segregated=no
     segregated=yes: Tag:segregated=yes
+    service=aircraft_control: Tag:service=aircraft control
     service=alley: Tag:service=alley
     service=bus: Tag:service=bus
     service=crossover: Tag:service=crossover
@@ -8104,6 +8698,7 @@ en:
     service=drive_through: Tag:service=drive through
     service=driveway: Tag:service=driveway
     service=emergency_access: Tag:service=emergency access
+    service=irrigation: Tag:service=irrigation
     service=parking_aisle: Tag:service=parking aisle
     service=parts: Tag:service=parts
     service=siding: Tag:service=siding
@@ -8112,10 +8707,12 @@ en:
     shelter_type=basic_hut: Tag:shelter type=basic hut
     shelter_type=field_shelter: Tag:shelter type=field shelter
     shelter_type=lean_to: Tag:shelter type=lean to
+    shelter_type=picnic_shelter: Tag:shelter type=picnic shelter
     shelter_type=public_transport: Tag:shelter type=public transport
     shop=*: Tag:shop=*
     shop=Alko: Tag:shop=Alko
     shop=_business_machines: Tag:shop= business machines
+    shop=adult: Tag:shop=adult
     shop=agrarian: Tag:shop=agrarian
     shop=alcohol: Tag:shop=alcohol
     shop=anime: Tag:shop=anime
@@ -8147,10 +8744,12 @@ en:
     shop=camera: Tag:shop=camera
     shop=candles: Tag:shop=candles
     shop=cannabis: Tag:shop=cannabis
+    shop=canoe_hire: Tag:shop=canoe hire
     shop=car: Tag:shop=car
     shop=car_parts: Tag:shop=car parts
     shop=car_repair: Tag:shop=car repair
     shop=car_service: Tag:shop=car service
+    shop=caravan: Tag:shop=caravan
     shop=carpet: Tag:shop=carpet
     shop=cell_phones: Tag:shop=cell phones
     shop=ceramics: Tag:shop=ceramics
@@ -8193,6 +8792,7 @@ en:
     shop=fabrics: Tag:shop=fabrics
     shop=farm: Tag:shop=farm
     shop=fashion: Tag:shop=fashion
+    shop=fashion_accessories: Tag:shop=fashion accessories
     shop=firearms: Tag:shop=firearms
     shop=fireplace: Tag:shop=fireplace
     shop=fireworks: Tag:shop=fireworks
@@ -8226,6 +8826,7 @@ en:
     shop=golf: Tag:shop=golf
     shop=greengrocer: Tag:shop=greengrocer
     shop=grocery: Tag:shop=grocery
+    shop=groundskeeping: Tag:shop=groundskeeping
     shop=gun: Tag:shop=gun
     shop=guns: Tag:shop=guns
     shop=haberdashery: Tag:shop=haberdashery
@@ -8240,8 +8841,10 @@ en:
     shop=hifi: Tag:shop=hifi
     shop=hobby: Tag:shop=hobby
     shop=hookah: Tag:shop=hookah
+    shop=household_linen: Tag:shop=household linen
     shop=houseware: Tag:shop=houseware
     shop=hunting: Tag:shop=hunting
+    shop=hvac: Tag:shop=hvac
     shop=ice_cream: Tag:shop=ice cream
     shop=insurance: Tag:shop=insurance
     shop=interior_decoration: Tag:shop=interior decoration
@@ -8259,17 +8862,21 @@ en:
     shop=locksmith: Tag:shop=locksmith
     shop=lottery: Tag:shop=lottery
     shop=mall: Tag:shop=mall
+    shop=manufactured_home: Tag:shop=manufactured home
+    shop=maps: Tag:shop=maps
     shop=marine: Tag:shop=marine
     shop=massage: Tag:shop=massage
     shop=medical: Tag:shop=medical
     shop=medical_supply: Tag:shop=medical supply
     shop=military_surplus: Tag:shop=military surplus
+    shop=mobile_home: Tag:shop=mobile home
     shop=mobile_phone: Tag:shop=mobile phone
     shop=model: Tag:shop=model
     shop=money_lender: Tag:shop=money lender
     shop=moneylender: Tag:shop=moneylender
     shop=motorcycle: Tag:shop=motorcycle
     shop=motorcycle_repair: Tag:shop=motorcycle repair
+    shop=motorhome: Tag:shop=motorhome
     shop=music: Tag:shop=music
     shop=musical_instrument: Tag:shop=musical instrument
     shop=musical_instruments: Tag:shop=musical instruments
@@ -8280,6 +8887,7 @@ en:
     shop=optician: Tag:shop=optician
     shop=organic: Tag:shop=organic
     shop=outdoor: Tag:shop=outdoor
+    shop=outpost: Tag:shop=outpost
     shop=paint: Tag:shop=paint
     shop=party: Tag:shop=party
     shop=pasta: Tag:shop=pasta
@@ -8287,6 +8895,7 @@ en:
     shop=pawnbroker: Tag:shop=pawnbroker
     shop=perfume: Tag:shop=perfume
     shop=perfumery: Tag:shop=perfumery
+    shop=pest_control: Tag:shop=pest control
     shop=pet: Tag:shop=pet
     shop=pet_grooming: Tag:shop=pet grooming
     shop=pharmacy: Tag:shop=pharmacy
@@ -8299,12 +8908,14 @@ en:
     shop=pyrotechnics: Tag:shop=pyrotechnics
     shop=pépinière: Tag:shop=pépinière
     shop=radiotechnics: Tag:shop=radiotechnics
+    shop=recreational_vehicle: Tag:shop=recreational vehicle
     shop=religion: Tag:shop=religion
     shop=rental: Tag:shop=rental
     shop=robot: Tag:shop=robot
     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=ship_chandler: Tag:shop=ship chandler
     shop=shoe_repair: Tag:shop=shoe repair
@@ -8319,6 +8930,7 @@ en:
     shop=sports: Tag:shop=sports
     shop=stationery: Tag:shop=stationery
     shop=storage_rental: Tag:shop=storage rental
+    shop=street_vendor: Tag:shop=street vendor
     shop=supermarket: Tag:shop=supermarket
     shop=swimming_pool: Tag:shop=swimming pool
     shop=systembolaget: Tag:shop=systembolaget
@@ -8333,9 +8945,11 @@ en:
     shop=toy: Tag:shop=toy
     shop=toys: Tag:shop=toys
     shop=trade: Tag:shop=trade
+    shop=trailer: Tag:shop=trailer
     shop=travel_agency: Tag:shop=travel agency
     shop=trophy: Tag:shop=trophy
     shop=tyres: Tag:shop=tyres
+    shop=underwear: Tag:shop=underwear
     shop=vacant: Tag:shop=vacant
     shop=vacuum_cleaner: Tag:shop=vacuum cleaner
     shop=variety_store: Tag:shop=variety store
@@ -8370,12 +8984,18 @@ en:
     signal_station=time: Tag:signal station=time
     signal_station=traffic: Tag:signal station=traffic
     signal_station=weather: Tag:signal station=weather
+    sinkhole=bluehole: Tag:sinkhole=bluehole
+    sinkhole=doline: Tag:sinkhole=doline
+    sinkhole=estavelle: Tag:sinkhole=estavelle
+    sinkhole=pit: Tag:sinkhole=pit
+    sinkhole=ponor: Tag:sinkhole=ponor
     site=piste: Tag:site=piste
     site_type=bigstone: Tag:site type=bigstone
     site_type=city: Tag:site type=city
     site_type=fortification: Tag:site type=fortification
     site_type=hut_circle: Tag:site type=hut circle
     site_type=megalith: Tag:site type=megalith
+    site_type=minilith: Tag:site type=minilith
     site_type=necropolis: Tag:site type=necropolis
     site_type=petroglyph: Tag:site type=petroglyph
     site_type=roman_circus: Tag:site type=roman circus
@@ -8400,6 +9020,7 @@ en:
     source:geometry=ACTMapiRoads: Tag:source:geometry=ACTMapiRoads
     source:geometry=ACTMapiTP: Tag:source:geometry=ACTMapiTP
     source:geometry=Bing: Tag:source:geometry=Bing
+    source:geometry=LPI_NSW_Imagery: Tag:source:geometry=LPI NSW Imagery
     source:geometry=NPWS_Estate: Tag:source:geometry=NPWS Estate
     source:geometry=NSW_LPI_Base_Map: Tag:source:geometry=NSW LPI Base Map
     source:geometry=NSW_LPI_Imagery: Tag:source:geometry=NSW LPI Imagery
@@ -8415,6 +9036,7 @@ en:
     source=Bymiljøetaten: Tag:source=Bymiljøetaten
     source=DNT_Oslo_og_Omegn: Tag:source=DNT Oslo og Omegn
     source=GURS: Tag:source=GURS
+    source=Gazetteer_of_Australia_2012: Tag:source=Gazetteer of Australia 2012
     source=HiRes_aerial_imagery: Tag:source=HiRes aerial imagery
     source=Isle_of_Man_Government_1:25000_map_(2007): Tag:source=Isle of Man Government
       1:25000 map (2007)
@@ -8429,7 +9051,10 @@ en:
     source=Naturbase: Tag:source=Naturbase
     source=PGS: Tag:source=PGS
     source=RABA-KGZ: Tag:source=RABA-KGZ
+    source=SA_Conservation_Reserve_Boundaries: Tag:source=SA Conservation Reserve
+      Boundaries
     source=Schadow1_Expeditions: Tag:source=Schadow1 Expeditions
+    source=VicMap_ParkRes: Tag:source=VicMap ParkRes
     source=YahooJapan/ALPSMAP: Tag:source=YahooJapan/ALPSMAP
     source=gurs: Tag:source=gurs
     sport=10pin: Tag:sport=10pin
@@ -8470,6 +9095,7 @@ en:
     sport=croquet: Tag:sport=croquet
     sport=curling: Tag:sport=curling
     sport=cycling: Tag:sport=cycling
+    sport=dancing: Tag:sport=dancing
     sport=darts: Tag:sport=darts
     sport=disc_golf: Tag:sport=disc golf
     sport=diving: Tag:sport=diving
@@ -8477,6 +9103,7 @@ en:
     sport=equestrian: Tag:sport=equestrian
     sport=fencing: Tag:sport=fencing
     sport=field_hockey: Tag:sport=field hockey
+    sport=fitness: Tag:sport=fitness
     sport=fives: Tag:sport=fives
     sport=footballgolf: Tag:sport=footballgolf
     sport=free_flying: Tag:sport=free flying
@@ -8513,6 +9140,7 @@ en:
     sport=parachuting: Tag:sport=parachuting
     sport=paragliding: Tag:sport=paragliding
     sport=pelota: Tag:sport=pelota
+    sport=pole_dance: Tag:sport=pole dance
     sport=racquet: Tag:sport=racquet
     sport=rc_car: Tag:sport=rc car
     sport=roller_skating: Tag:sport=roller skating
@@ -8544,35 +9172,73 @@ en:
     sport=water_polo: Tag:sport=water polo
     sport=water_ski: Tag:sport=water ski
     sport=weightlifting: Tag:sport=weightlifting
+    sport=windsurfing: Tag:sport=windsurfing
     sport=wrestling: Tag:sport=wrestling
     sport=yoga: Tag:sport=yoga
     sports=aikido: Tag:sports=aikido
     sports=athletics: Tag:sports=athletics
     spring:type=hot: Tag:spring:type=hot
+    station=funicular: Tag:station=funicular
     station=light_rail: Tag:station=light rail
     station=subway: Tag:station=subway
+    submarine=yes: Tag:submarine=yes
     substation=compensation: Tag:substation=compensation
     substation=converter: Tag:substation=converter
     substation=distribution: Tag:substation=distribution
+    substation=generation: Tag:substation=generation
     substation=industrial: Tag:substation=industrial
+    substation=measurement: Tag:substation=measurement
     substation=minor_distribution: Tag:substation=minor distribution
     substation=traction: Tag:substation=traction
     substation=transition: Tag:substation=transition
     substation=transmission: Tag:substation=transmission
     summit:cross=yes: Tag:summit:cross=yes
+    surface=asphalt: Tag:surface=asphalt
+    surface=cobblestone: Tag:surface=cobblestone
+    surface=compacted: Tag:surface=compacted
+    surface=concrete: Tag:surface=concrete
+    surface=concrete:lanes: Tag:surface=concrete:lanes
+    surface=concrete:plates: Tag:surface=concrete:plates
+    surface=metal: Tag:surface=metal
+    surface=paved: Tag:surface=paved
+    surface=paving_stones: Tag:surface=paving stones
+    surface=sett: Tag:surface=sett
+    surface=unhewn_cobblestone: Tag:surface=unhewn cobblestone
+    surface=unpaved: Tag:surface=unpaved
+    surface=wood: Tag:surface=wood
+    swimming_pool=yes: Tag:swimming pool=yes
     switch=circuit_breaker: Tag:switch=circuit breaker
     switch=disconnector: Tag:switch=disconnector
     switch=earthing: Tag:switch=earthing
     switch=mechanical: Tag:switch=mechanical
     tank_trap=czech_hedgehog: Tag:tank trap=czech hedgehog
+    telecom:medium=coaxial: Tag:telecom:medium=coaxial
+    telecom:medium=copper: Tag:telecom:medium=copper
+    telecom:medium=fibre: Tag:telecom:medium=fibre
+    telecom=connection_point: Tag:telecom=connection point
     telecom=cross-connect: Tag:telecom=cross-connect
     telecom=data_center: Tag:telecom=data center
     telecom=data_centre: Tag:telecom=data centre
     telecom=datacenter: Tag:telecom=datacenter
+    telecom=exchange: Tag:telecom=exchange
     telecom=remote_digital_terminal: Tag:telecom=remote digital terminal
     telecom=remote_terminal: Tag:telecom=remote terminal
+    telecom=service_device: Tag:telecom=service device
     telescope:type=optical: Tag:telescope:type=optical
     telescope:type=radio: Tag:telescope:type=radio
+    theatre:type=amphi: Tag:theatre:type=amphi
+    theatre:type=open_air: Tag:theatre:type=open air
+    tickets:public_transport_subscription=yes: Tag:tickets:public transport subscription=yes
+    tomb=columbarium: Tag:tomb=columbarium
+    tomb=crypt: Tag:tomb=crypt
+    tomb=hypogeum: Tag:tomb=hypogeum
+    tomb=mausoleum: Tag:tomb=mausoleum
+    tomb=pyramid: Tag:tomb=pyramid
+    tomb=rock-cut: Tag:tomb=rock-cut
+    tomb=sarcophagus: Tag:tomb=sarcophagus
+    tomb=tumulus: Tag:tomb=tumulus
+    tomb=vault: Tag:tomb=vault
+    tomb=war_grave: Tag:tomb=war grave
     tourism=accommodation: Tag:tourism=accommodation
     tourism=alpine_hut: Tag:tourism=alpine hut
     tourism=apartment: Tag:tourism=apartment
@@ -8580,6 +9246,7 @@ en:
     tourism=artwork: Tag:tourism=artwork
     tourism=attraction: Tag:tourism=attraction
     tourism=bed_and_breakfast: Tag:tourism=bed and breakfast
+    tourism=camp_pitch: Tag:tourism=camp pitch
     tourism=camp_site: Tag:tourism=camp site
     tourism=caravan_site: Tag:tourism=caravan site
     tourism=chalet: Tag:tourism=chalet
@@ -8631,8 +9298,61 @@ en:
     traffic=urban: Tag:traffic=urban
     traffic_calming=island: Tag:traffic calming=island
     traffic_calming=table: Tag:traffic calming=table
+    traffic_sign=DE:205: Tag:traffic sign=DE:205
+    traffic_sign=DE:206: Tag:traffic sign=DE:206
+    traffic_sign=DE:220-10: Tag:traffic sign=DE:220-10
+    traffic_sign=DE:220-20: Tag:traffic sign=DE:220-20
+    traffic_sign=DE:224: Tag:traffic sign=DE:224
+    traffic_sign=DE:237: Tag:traffic sign=DE:237
+    traffic_sign=DE:239: Tag:traffic sign=DE:239
+    traffic_sign=DE:240: Tag:traffic sign=DE:240
+    traffic_sign=DE:241: Tag:traffic sign=DE:241
+    traffic_sign=DE:241-30: Tag:traffic sign=DE:241-30
+    traffic_sign=DE:241-31: Tag:traffic sign=DE:241-31
+    traffic_sign=DE:242: Tag:traffic sign=DE:242
+    traffic_sign=DE:242.1: Tag:traffic sign=DE:242.1
+    traffic_sign=DE:242.2: Tag:traffic sign=DE:242.2
+    traffic_sign=DE:244: Tag:traffic sign=DE:244
+    traffic_sign=DE:244.1: Tag:traffic sign=DE:244.1
+    traffic_sign=DE:245: Tag:traffic sign=DE:245
+    traffic_sign=DE:250: Tag:traffic sign=DE:250
+    traffic_sign=DE:253: Tag:traffic sign=DE:253
+    traffic_sign=DE:254: Tag:traffic sign=DE:254
+    traffic_sign=DE:257-51: Tag:traffic sign=DE:257-51
+    traffic_sign=DE:258: Tag:traffic sign=DE:258
+    traffic_sign=DE:259: Tag:traffic sign=DE:259
+    traffic_sign=DE:260: Tag:traffic sign=DE:260
+    traffic_sign=DE:261: Tag:traffic sign=DE:261
+    traffic_sign=DE:267: Tag:traffic sign=DE:267
+    traffic_sign=DE:269: Tag:traffic sign=DE:269
+    traffic_sign=DE:274-10: Tag:traffic sign=DE:274-10
+    traffic_sign=DE:274-100: Tag:traffic sign=DE:274-100
+    traffic_sign=DE:274-120: Tag:traffic sign=DE:274-120
+    traffic_sign=DE:274-130: Tag:traffic sign=DE:274-130
+    traffic_sign=DE:274-20: Tag:traffic sign=DE:274-20
+    traffic_sign=DE:274-30: Tag:traffic sign=DE:274-30
+    traffic_sign=DE:274-40: Tag:traffic sign=DE:274-40
+    traffic_sign=DE:274-50: Tag:traffic sign=DE:274-50
+    traffic_sign=DE:274-60: Tag:traffic sign=DE:274-60
+    traffic_sign=DE:274-70: Tag:traffic sign=DE:274-70
+    traffic_sign=DE:274-80: Tag:traffic sign=DE:274-80
+    traffic_sign=DE:274.1: Tag:traffic sign=DE:274.1
+    traffic_sign=DE:274.2: Tag:traffic sign=DE:274.2
+    traffic_sign=DE:282: Tag:traffic sign=DE:282
+    traffic_sign=DE:306: Tag:traffic sign=DE:306
+    traffic_sign=DE:325: Tag:traffic sign=DE:325
+    traffic_sign=DE:325.1: Tag:traffic sign=DE:325.1
+    traffic_sign=DE:325.2: Tag:traffic sign=DE:325.2
+    traffic_sign=DE:357: Tag:traffic sign=DE:357
+    traffic_sign=DE:386.3: Tag:traffic sign=DE:386.3
+    traffic_sign=DE:448: Tag:traffic sign=DE:448
+    traffic_sign=DE:449: Tag:traffic sign=DE:449
     traffic_sign=city_limit: Tag:traffic sign=city limit
+    traffic_sign=stop: Tag:traffic sign=stop
+    trailer:type=motorcycle: Tag:trailer:type=motorcycle
+    trailhead: Tag:trailhead
     transformer=auto: Tag:transformer=auto
+    transformer=auxiliary: Tag:transformer=auxiliary
     transformer=converter: Tag:transformer=converter
     transformer=distribution: Tag:transformer=distribution
     transformer=generator: Tag:transformer=generator
@@ -8645,11 +9365,17 @@ en:
     type=AutoPASS: Tag:type=AutoPASS
     type=autopass: Tag:type=autopass
     type=benchmark: Tag:type=benchmark
-    type=defaults: Tag:type=defaults
+    type=boundary: Tag:type=boundary
+    type=enforcement: Tag:type=enforcement
     type=fixed_point: Tag:type=fixed point
+    type=multipolygon: Tag:type=multipolygon
     type=observation_spot: Tag:type=observation spot
     type=public_transport: Tag:type=public transport
+    type=restriction: Tag:type=restriction
+    type=route: Tag:type=route
+    type=site: Tag:type=site
     type=triangulation: Tag:type=triangulation
+    type=waterway: Tag:type=waterway
     usage=distribution: Tag:usage=distribution
     usage=facility: Tag:usage=facility
     usage=flare_header: Tag:usage=flare header
@@ -8662,6 +9388,13 @@ en:
     usage=spillway: Tag:usage=spillway
     usage=tailrace: Tag:usage=tailrace
     usage=transmission: Tag:usage=transmission
+    valve=ball: Tag:valve=ball
+    valve=butterfly: Tag:valve=butterfly
+    valve=gate: Tag:valve=gate
+    valve=globe: Tag:valve=globe
+    valve=needle: Tag:valve=needle
+    valve=plug: Tag:valve=plug
+    valve=spool: Tag:valve=spool
     vending: Tag:vending
     vending=SIM-cards: Tag:vending=SIM-cards
     vending=SIM_cards: Tag:vending=SIM cards
@@ -8717,6 +9450,7 @@ en:
     vending=water: Tag:vending=water
     vending_machine: Tag:vending machine
     vending_machine=fuel: Tag:vending machine=fuel
+    wall=castle_wall: Tag:wall=castle wall
     wall=dry_stone: Tag:wall=dry stone
     wall=no: Tag:wall=no
     wall=noise_barrier: Tag:wall=noise barrier
@@ -8734,6 +9468,8 @@ en:
     water=river: Tag:water=river
     water=tidal: Tag:water=tidal
     water=wastewater: Tag:water=wastewater
+    water_source=main: Tag:water source=main
+    water_source=river: Tag:water source=river
     waterway=boat_lift: Tag:waterway=boat lift
     waterway=boatyard: Tag:waterway=boatyard
     waterway=brook: Tag:waterway=brook
@@ -8754,8 +9490,8 @@ en:
     waterway=milestone: Tag:waterway=milestone
     waterway=mooring: Tag:waterway=mooring
     waterway=offshore_field: Tag:waterway=offshore field
+    waterway=portage: Tag:waterway=portage
     waterway=pressurised: Tag:waterway=pressurised
-    waterway=rapids: Tag:waterway=rapids
     waterway=river: Tag:waterway=river
     waterway=riverbank: Tag:waterway=riverbank
     waterway=sanitary_dump_station: Tag:waterway=sanitary dump station
@@ -8764,6 +9500,7 @@ en:
     waterway=stream: Tag:waterway=stream
     waterway=stream_end: Tag:waterway=stream end
     waterway=swept_area: Tag:waterway=swept area
+    waterway=tidal_channel: Tag:waterway=tidal channel
     waterway=turning_point: Tag:waterway=turning point
     waterway=wadi: Tag:waterway=wadi
     waterway=water_point: Tag:waterway=water point
@@ -8786,6 +9523,7 @@ en:
     wood=nipa_palm: Tag:wood=nipa palm
     zoo=aviary: Tag:zoo=aviary
     zoo=birds: Tag:zoo=birds
+    zoo=butterfly: Tag:zoo=butterfly
     zoo=enclosure: Tag:zoo=enclosure
     zoo=falconry: Tag:zoo=falconry
     zoo=petting_zoo: Tag:zoo=petting zoo
@@ -8796,6 +9534,8 @@ eo:
   key:
     esperanto: Eo:Key:esperanto
   tag:
+    craft=tinsmith: Eo:Tag:craft=tinsmith
+    esperanto=esperanto: Eo:Tag:esperanto=esperanto
     esperanto=yes: Eo:Tag:esperanto=yes
 es:
   key:
@@ -8821,18 +9561,23 @@ es:
     addr:street: ES:Key:addr:street
     addr:subdistrict: ES:Key:addr:subdistrict
     addr:suburb: ES:Key:addr:suburb
+    admin_level: ES:Key:admin level
     aerialway: ES:Key:aerialway
     aeroway: ES:Key:aeroway
     amenity: ES:Key:amenity
+    area: ES:Key:area
     area:highway: ES:Key:area:highway
     artist_name: ES:Key:artist name
     artwork_subject: ES:Key:artwork subject
+    artwork_type: ES:Key:artwork type
     barrier: ES:Key:barrier
     bicycle_parking: ES:Key:bicycle parking
     bicycle_road: ES:Key:bicycle road
+    books: ES:Key:books
     branch: ES:Key:branch
     brand: ES:Key:brand
     brewery: ES:Key:brewery
+    bridge: ES:Key:bridge
     bridge:structure: ES:Key:bridge:structure
     building: ES:Key:building
     building:levels: ES:Key:building:levels
@@ -8840,18 +9585,24 @@ es:
     building:part: ES:Key:building:part
     bus_bay: ES:Key:bus bay
     busway: ES:Key:busway
+    capital: ES:Key:capital
     cemetery: ES:Key:cemetery
     check_date: ES:Key:check date
     circumference: ES:Key:circumference
     clothes: ES:Key:clothes
     club: ES:Key:club
+    collection_times: ES:Key:collection times
     comment: ES:Key:comment
     construction: ES:Key:construction
     contact: ES:Key:contact
+    contact:facebook: ES:Key:contact:facebook
+    contact:twitter: ES:Key:contact:twitter
     content: ES:Key:content
     conveying: ES:Key:conveying
     craft: ES:Key:craft
+    created_by: ES:Key:created by
     crossing: ES:Key:crossing
+    crossing:island: ES:Key:crossing:island
     cuisine: ES:Key:cuisine
     cutting: ES:Key:cutting
     cycleway: ES:Key:cycleway
@@ -8861,6 +9612,7 @@ es:
     description: ES:Key:description
     destination: ES:Key:destination
     diaper: ES:Key:diaper
+    diet: ES:Key:diet
     diet:*: ES:Key:diet:*
     disused: ES:Key:disused
     'disused:': 'ES:Key:disused:'
@@ -8870,6 +9622,7 @@ es:
     end_date: ES:Key:end date
     entrance: ES:Key:entrance
     evacuation_route: ES:Key:evacuation route
+    facebook: ES:Key:facebook
     fair_trade: ES:Key:fair trade
     fee: ES:Key:fee
     fence_type: ES:Key:fence type
@@ -8881,6 +9634,7 @@ es:
     garden:type: ES:Key:garden:type
     generator:output: ES:Key:generator:output
     generator:source: ES:Key:generator:source
+    genus: ES:Key:genus
     geological: ES:Key:geological
     government: ES:Key:government
     grassland: ES:Key:grassland
@@ -8895,8 +9649,12 @@ es:
     incline: ES:Key:incline
     indoor: ES:Key:indoor
     industrial: ES:Key:industrial
+    information: ES:Key:information
+    inscription: ES:Key:inscription
     intermittent: ES:Key:intermittent
+    interval: ES:Key:interval
     is_in: ES:Key:is in
+    is_in:country: ES:Key:is in:country
     kerb: ES:Key:kerb
     ladder: ES:Key:ladder
     landuse: ES:Key:landuse
@@ -8905,6 +9663,8 @@ es:
     leaf_cycle: ES:Key:leaf cycle
     leaf_type: ES:Key:leaf type
     leisure: ES:Key:leisure
+    level: ES:Key:level
+    lgbtq: ES:Key:lgbtq
     local_ref: ES:Key:local ref
     locale: ES:Key:locale
     location: ES:Key:location
@@ -8926,13 +9686,16 @@ es:
     name: ES:Key:name
     natural: ES:Key:natural
     noexit: ES:Key:noexit
+    noname: ES:Key:noname
     note: ES:Key:note
     office: ES:Key:office
     oneway: ES:Key:oneway
+    oneway:psv: ES:Key:oneway:psv
     opening_hours: ES:Key:opening hours
     operator: ES:Key:operator
     operator:type: ES:Key:operator:type
     organic: ES:Key:organic
+    orienteering: ES:Key:orienteering
     origin: ES:Key:origin
     osmc:symbol: ES:Key:osmc:symbol
     overtaking: ES:Key:overtaking
@@ -8944,13 +9707,16 @@ es:
     phone: ES:Key:phone
     place: ES:Key:place
     placement: ES:Key:placement
+    police: ES:Key:police
     population: ES:Key:population
     power: ES:Key:power
     prepayment: ES:Key:prepayment
     prepayment:*: ES:Key:prepayment:*
     priority: ES:Key:priority
+    priority_road: ES:Key:priority road
     product: ES:Key:product
     proposed: ES:Key:proposed
+    psv: ES:Key:psv
     public_bookcase:type: ES:Key:public bookcase:type
     public_transport: ES:Key:public transport
     public_transport:version: ES:Key:public transport:version
@@ -8986,10 +9752,16 @@ es:
     species: ES:Key:species
     sport: ES:Key:sport
     stars: ES:Key:stars
+    stop: ES:Key:stop
+    supervised: ES:Key:supervised
     support: ES:Key:support
     surface: ES:Key:surface
+    surveillance: ES:Key:surveillance
+    surveillance:type: ES:Key:surveillance:type
+    surveillance:zone: ES:Key:surveillance:zone
     symbol: ES:Key:symbol
     takeaway: ES:Key:takeaway
+    taxi: ES:Key:taxi
     todo: ES:Key:todo
     tourism: ES:Key:tourism
     tracktype: ES:Key:tracktype
@@ -9002,6 +9774,7 @@ es:
     trolleybus: ES:Key:trolleybus
     tunnel: ES:Key:tunnel
     turn: ES:Key:turn
+    twitter: ES:Key:twitter
     type: ES:Key:type
     unnamed: ES:Key:unnamed
     url: ES:Key:url
@@ -9016,6 +9789,9 @@ es:
   tag:
     abandoned:amenity=prison_camp: ES:Tag:abandoned:amenity=prison camp
     access=customers: ES:Tag:access=customers
+    advertising=board: ES:Tag:advertising=board
+    advertising=column: ES:Tag:advertising=column
+    advertising=totem: ES:Tag:advertising=totem
     aerialway=cable_car: ES:Tag:aerialway=cable car
     aerialway=gondola: ES:Tag:aerialway=gondola
     aerialway=station: ES:Tag:aerialway=station
@@ -9049,6 +9825,7 @@ es:
     amenity=college: ES:Tag:amenity=college
     amenity=community_centre: ES:Tag:amenity=community centre
     amenity=compressed_air: ES:Tag:amenity=compressed air
+    amenity=conference_centre: ES:Tag:amenity=conference centre
     amenity=courthouse: ES:Tag:amenity=courthouse
     amenity=coworking_space: ES:Tag:amenity=coworking space
     amenity=crematorium: ES:Tag:amenity=crematorium
@@ -9072,6 +9849,7 @@ es:
     amenity=internet_cafe: ES:Tag:amenity=internet cafe
     amenity=kindergarten: ES:Tag:amenity=kindergarten
     amenity=language_school: ES:Tag:amenity=language school
+    amenity=lavoir: ES:Tag:amenity=lavoir
     amenity=library: ES:Tag:amenity=library
     amenity=love_hotel: ES:Tag:amenity=love hotel
     amenity=marketplace: ES:Tag:amenity=marketplace
@@ -9113,12 +9891,15 @@ es:
     amenity=waste_disposal: ES:Tag:amenity=waste disposal
     amenity=water_point: ES:Tag:amenity=water point
     amenity=watering_place: ES:Tag:amenity=watering place
+    amenity=weighbridge: ES:Tag:amenity=weighbridge
     amenity=youth_centre: ES:Tag:amenity=youth centre
     animal=school: ES:Tag:animal=school
+    anthropogenic=yes: ES:Tag:anthropogenic=yes
     area:highway=cycleway: ES:Tag:area:highway=cycleway
     area:highway=footway: ES:Tag:area:highway=footway
     area:highway=path: ES:Tag:area:highway=path
     area:highway=pedestrian: ES:Tag:area:highway=pedestrian
+    attraction=water_slide: ES:Tag:attraction=water slide
     barrier=block: ES:Tag:barrier=block
     barrier=bollard: ES:Tag:barrier=bollard
     barrier=cable_barrier: ES:Tag:barrier=cable barrier
@@ -9136,6 +9917,7 @@ es:
     barrier=lift_gate: ES:Tag:barrier=lift gate
     barrier=retaining_wall: ES:Tag:barrier=retaining wall
     barrier=rope: ES:Tag:barrier=rope
+    barrier=spikes: ES:Tag:barrier=spikes
     barrier=swing_gate: ES:Tag:barrier=swing gate
     barrier=toll_booth: ES:Tag:barrier=toll booth
     barrier=wall: ES:Tag:barrier=wall
@@ -9145,6 +9927,7 @@ es:
     boundary=protected_area: ES:Tag:boundary=protected area
     boundary=regional_park: ES:Tag:boundary=regional park
     bridge=aqueduct: ES:Tag:bridge=aqueduct
+    bridge=viaduct: ES:Tag:bridge=viaduct
     building=apartments: ES:Tag:building=apartments
     building=barn: ES:Tag:building=barn
     building=boathouse: ES:Tag:building=boathouse
@@ -9156,6 +9939,7 @@ es:
     building=church: ES:Tag:building=church
     building=civic: ES:Tag:building=civic
     building=commercial: ES:Tag:building=commercial
+    building=conservatory: ES:Tag:building=conservatory
     building=construction: ES:Tag:building=construction
     building=container: ES:Tag:building=container
     building=detached: ES:Tag:building=detached
@@ -9218,7 +10002,9 @@ es:
     craft=pottery: ES:Tag:craft=pottery
     craft=tailor: ES:Tag:craft=tailor
     craft=tiler: ES:Tag:craft=tiler
+    craft=upholsterer: ES:Tag:craft=upholsterer
     craft=watchmaker: ES:Tag:craft=watchmaker
+    crossing=zebra: ES:Tag:crossing=zebra
     cycleway=lane: ES:Tag:cycleway=lane
     cycleway=share_busway: ES:Tag:cycleway=share busway
     cycleway=track: ES:Tag:cycleway=track
@@ -9230,8 +10016,11 @@ es:
     emergency=landing_site: ES:Tag:emergency=landing site
     emergency=phone: ES:Tag:emergency=phone
     emergency=ses_station: ES:Tag:emergency=ses station
+    flow_direction=both: ES:Tag:flow direction=both
     footway=crossing: ES:Tag:footway=crossing
     footway=sidewalk: ES:Tag:footway=sidewalk
+    ford=yes: ES:Tag:ford=yes
+    garden:type=botanical: ES:Tag:garden:type=botanical
     generator:method=photovoltaic: ES:Tag:generator:method=photovoltaic
     generator:method=thermal: ES:Tag:generator:method=thermal
     generator:method=wind_turbine: ES:Tag:generator:method=wind turbine
@@ -9244,6 +10033,8 @@ es:
     generator:type=solar_thermal_collector: ES:Tag:generator:type=solar thermal collector
     generator:type=vertical_axis: ES:Tag:generator:type=vertical axis
     geological=moraine: ES:Tag:geological=moraine
+    geological=outcrop: ES:Tag:geological=outcrop
+    geological=palaeontological_site: ES:Tag:geological=palaeontological site
     government=register_office: ES:Tag:government=register office
     highway=bridleway: ES:Tag:highway=bridleway
     highway=bus_guideway: ES:Tag:highway=bus guideway
@@ -9281,6 +10072,7 @@ es:
     highway=turning_circle: ES:Tag:highway=turning circle
     highway=turning_loop: ES:Tag:highway=turning loop
     highway=unclassified: ES:Tag:highway=unclassified
+    historic=aqueduct: ES:Tag:historic=aqueduct
     historic=archaeological_site: ES:Tag:historic=archaeological site
     historic=boundary_stone: ES:Tag:historic=boundary stone
     historic=farm: ES:Tag:historic=farm
@@ -9292,7 +10084,9 @@ es:
     historic=tomb: ES:Tag:historic=tomb
     historic=wayside_shrine: ES:Tag:historic=wayside shrine
     historic=wreck: ES:Tag:historic=wreck
+    industrial=auto_wrecker: ES:Tag:industrial=auto wrecker
     industrial=factory: ES:Tag:industrial=factory
+    industrial=scrap_yard: ES:Tag:industrial=scrap yard
     information=board: ES:Tag:information=board
     information=guidepost: ES:Tag:information=guidepost
     information=map: ES:Tag:information=map
@@ -9300,10 +10094,12 @@ es:
     internet_access=wlan: ES:Tag:internet access=wlan
     junction=circular: ES:Tag:junction=circular
     junction=roundabout: ES:Tag:junction=roundabout
+    karst=yes: ES:Tag:karst=yes
     landcover=grass: ES:Tag:landcover=grass
     landcover=trees: ES:Tag:landcover=trees
     landuse=allotments: ES:Tag:landuse=allotments
     landuse=apiary: ES:Tag:landuse=apiary
+    landuse=aquaculture: ES:Tag:landuse=aquaculture
     landuse=basin: ES:Tag:landuse=basin
     landuse=brownfield: ES:Tag:landuse=brownfield
     landuse=cemetery: ES:Tag:landuse=cemetery
@@ -9328,7 +10124,11 @@ es:
     landuse=salt_pond: ES:Tag:landuse=salt pond
     landuse=traffic_island: ES:Tag:landuse=traffic island
     landuse=village_green: ES:Tag:landuse=village green
+    leaf_cycle=deciduous: ES:Tag:leaf cycle=deciduous
     leaf_cycle=evergreen: ES:Tag:leaf cycle=evergreen
+    leaf_cycle=mixed: ES:Tag:leaf cycle=mixed
+    leaf_cycle=semi_deciduous: ES:Tag:leaf cycle=semi deciduous
+    leaf_cycle=semi_evergreen: ES:Tag:leaf cycle=semi evergreen
     leaf_type=broadleaved: ES:Tag:leaf type=broadleaved
     leaf_type=leafless: ES:Tag:leaf type=leafless
     leaf_type=mixed: ES:Tag:leaf type=mixed
@@ -9353,15 +10153,21 @@ es:
     leisure=pitch: ES:Tag:leisure=pitch
     leisure=playground: ES:Tag:leisure=playground
     leisure=sports_centre: ES:Tag:leisure=sports centre
+    leisure=sports_hall: ES:Tag:leisure=sports hall
     leisure=swimming_pool: ES:Tag:leisure=swimming pool
+    leisure=tanning_salon: ES:Tag:leisure=tanning salon
     leisure=track: ES:Tag:leisure=track
     leisure=water_park: ES:Tag:leisure=water park
     man_made=adit: ES:Tag:man made=adit
     man_made=archimedes_screw: ES:Tag:man made=archimedes screw
     man_made=beehive: ES:Tag:man made=beehive
+    man_made=breakwater: ES:Tag:man made=breakwater
     man_made=bridge: ES:Tag:man made=bridge
+    man_made=chimney: ES:Tag:man made=chimney
     man_made=cross: ES:Tag:man made=cross
     man_made=cutline: ES:Tag:man made=cutline
+    man_made=drinking_fountain: ES:Tag:man made=drinking fountain
+    man_made=dyke: ES:Tag:man made=dyke
     man_made=embankment: ES:Tag:man made=embankment
     man_made=flagpole: ES:Tag:man made=flagpole
     man_made=mast: ES:Tag:man made=mast
@@ -9369,13 +10175,17 @@ es:
     man_made=nesting_site: ES:Tag:man made=nesting site
     man_made=observatory: ES:Tag:man made=observatory
     man_made=pier: ES:Tag:man made=pier
+    man_made=planter: ES:Tag:man made=planter
     man_made=power_wind: ES:Tag:man made=power wind
     man_made=pumping_rig: ES:Tag:man made=pumping rig
     man_made=pumping_station: ES:Tag:man made=pumping station
     man_made=reservoir_covered: ES:Tag:man made=reservoir covered
     man_made=storage_tank: ES:Tag:man made=storage tank
+    man_made=surveillance: ES:Tag:man made=surveillance
     man_made=survey_point: ES:Tag:man made=survey point
     man_made=telescope: ES:Tag:man made=telescope
+    man_made=tell: ES:Tag:man made=tell
+    man_made=tower: ES:Tag:man made=tower
     man_made=wastewater_plant: ES:Tag:man made=wastewater plant
     man_made=water_tap: ES:Tag:man made=water tap
     man_made=water_tower: ES:Tag:man made=water tower
@@ -9384,8 +10194,10 @@ es:
     man_made=watermill: ES:Tag:man made=watermill
     man_made=wildlife_opening: ES:Tag:man made=wildlife opening
     man_made=windpump: ES:Tag:man made=windpump
+    manhole=drain: ES:Tag:manhole=drain
     memorial=blue_plaque: ES:Tag:memorial=blue plaque
     memorial=bust: ES:Tag:memorial=bust
+    memorial=ghost_bike: ES:Tag:memorial=ghost bike
     memorial=obelisk: ES:Tag:memorial=obelisk
     memorial=plaque: ES:Tag:memorial=plaque
     memorial=statue: ES:Tag:memorial=statue
@@ -9397,20 +10209,26 @@ es:
     military=training_area: ES:Tag:military=training area
     name=Dollarama: ES:Tag:name=Dollarama
     natural=arete: ES:Tag:natural=arete
+    natural=avalanche_dam: ES:Tag:natural=avalanche dam
     natural=bare_rock: ES:Tag:natural=bare rock
     natural=bay: ES:Tag:natural=bay
     natural=beach: ES:Tag:natural=beach
+    natural=blowhole: ES:Tag:natural=blowhole
     natural=cave_entrance: ES:Tag:natural=cave entrance
     natural=cliff: ES:Tag:natural=cliff
     natural=coastline: ES:Tag:natural=coastline
+    natural=desert: ES:Tag:natural=desert
     natural=esker: ES:Tag:natural=esker
     natural=fell: ES:Tag:natural=fell
     natural=geyser: ES:Tag:natural=geyser
     natural=glacier: ES:Tag:natural=glacier
+    natural=gorge: ES:Tag:natural=gorge
     natural=grassland: ES:Tag:natural=grassland
     natural=heath: ES:Tag:natural=heath
+    natural=meadow: ES:Tag:natural=meadow
     natural=moor: ES:Tag:natural=moor
     natural=mud: ES:Tag:natural=mud
+    natural=naled: ES:Tag:natural=naled
     natural=peak: ES:Tag:natural=peak
     natural=ridge: ES:Tag:natural=ridge
     natural=riverbed: ES:Tag:natural=riverbed
@@ -9425,15 +10243,19 @@ es:
     natural=stone: ES:Tag:natural=stone
     natural=tree: ES:Tag:natural=tree
     natural=tree_row: ES:Tag:natural=tree row
+    natural=tree_stump: ES:Tag:natural=tree stump
     natural=valley: ES:Tag:natural=valley
     natural=volcano: ES:Tag:natural=volcano
     natural=water: ES:Tag:natural=water
     natural=wetland: ES:Tag:natural=wetland
     natural=wood: ES:Tag:natural=wood
+    network=VE:R:PO: ES:Tag:network=VE:R:PO
+    network=VE:ramal:portuguesa: ES:Tag:network=VE:ramal:portuguesa
     office=administrative: ES:Tag:office=administrative
     office=advertising_agency: ES:Tag:office=advertising agency
     office=association: ES:Tag:office=association
     office=company: ES:Tag:office=company
+    office=energy_supplier: ES:Tag:office=energy supplier
     office=engineer: ES:Tag:office=engineer
     office=estate_agent: ES:Tag:office=estate agent
     office=foundation: ES:Tag:office=foundation
@@ -9457,18 +10279,27 @@ es:
     office=tax: ES:Tag:office=tax
     office=therapist: ES:Tag:office=therapist
     office=water_utility: ES:Tag:office=water utility
+    oneway=reversible: ES:Tag:oneway=reversible
     passenger=yes: ES:Tag:passenger=yes
     place=borough: ES:Tag:place=borough
     place=city: ES:Tag:place=city
     place=city_block: ES:Tag:place=city block
+    place=country: ES:Tag:place=country
+    place=county: ES:Tag:place=county
+    place=district: ES:Tag:place=district
     place=hamlet: ES:Tag:place=hamlet
     place=island: ES:Tag:place=island
     place=islet: ES:Tag:place=islet
     place=isolated_dwelling: ES:Tag:place=isolated dwelling
+    place=municipality: ES:Tag:place=municipality
     place=neighbourhood: ES:Tag:place=neighbourhood
     place=plot: ES:Tag:place=plot
+    place=province: ES:Tag:place=province
+    place=region: ES:Tag:place=region
     place=square: ES:Tag:place=square
+    place=state: ES:Tag:place=state
     place=suburb: ES:Tag:place=suburb
+    place=town: ES:Tag:place=town
     place=village: ES:Tag:place=village
     power=generator: ES:Tag:power=generator
     power=heliostat: ES:Tag:power=heliostat
@@ -9491,12 +10322,17 @@ es:
     railway=yard: ES:Tag:railway=yard
     route=bus: ES:Tag:route=bus
     route=transhumance: ES:Tag:route=transhumance
+    service=aircraft_control: ES:Tag:service=aircraft control
+    service=alley: ES:Tag:service=alley
     service=crossover: ES:Tag:service=crossover
     service=driveway: ES:Tag:service=driveway
     service=parking_aisle: ES:Tag:service=parking aisle
     service=siding: ES:Tag:service=siding
+    shelter_type=basic_hut: ES:Tag:shelter type=basic hut
     shelter_type=lean_to: ES:Tag:shelter type=lean to
+    shop=agrarian: ES:Tag:shop=agrarian
     shop=alcohol: ES:Tag:shop=alcohol
+    shop=art: ES:Tag:shop=art
     shop=baby_goods: ES:Tag:shop=baby goods
     shop=bakery: ES:Tag:shop=bakery
     shop=bed: ES:Tag:shop=bed
@@ -9519,6 +10355,9 @@ es:
     shop=doityourself: ES:Tag:shop=doityourself
     shop=electrical: ES:Tag:shop=electrical
     shop=electronics: ES:Tag:shop=electronics
+    shop=energy: ES:Tag:shop=energy
+    shop=fabric: ES:Tag:shop=fabric
+    shop=fashion_accessories: ES:Tag:shop=fashion accessories
     shop=florist: ES:Tag:shop=florist
     shop=funeral_directors: ES:Tag:shop=funeral directors
     shop=games: ES:Tag:shop=games
@@ -9567,7 +10406,10 @@ es:
     shop=video_games: ES:Tag:shop=video games
     shop=watches: ES:Tag:shop=watches
     shop=water: ES:Tag:shop=water
+    shop=wholesale: ES:Tag:shop=wholesale
     shop=window_blind: ES:Tag:shop=window blind
+    shop=yes: ES:Tag:shop=yes
+    sinkhole=estavelle: ES:Tag:sinkhole=estavelle
     social_facility=clothing_bank: ES:Tag:social facility=clothing bank
     social_facility=food_bank: ES:Tag:social facility=food bank
     social_facility=nursing_home: ES:Tag:social facility=nursing home
@@ -9580,25 +10422,41 @@ es:
     sport=model_aerodrome: ES:Tag:sport=model aerodrome
     sport=motocross: ES:Tag:sport=motocross
     sport=motor: ES:Tag:sport=motor
+    sport=orienteering: ES:Tag:sport=orienteering
     sport=paddle_tennis: ES:Tag:sport=paddle tennis
     sport=padel: ES:Tag:sport=padel
     sport=paintball: ES:Tag:sport=paintball
+    sport=pelota: ES:Tag:sport=pelota
     sport=shooting: ES:Tag:sport=shooting
     sport=soccer: ES:Tag:sport=soccer
+    surface=asphalt: ES:Tag:surface=asphalt
+    switch=disconnector: ES:Tag:switch=disconnector
+    telecom=connection_point: ES:Tag:telecom=connection point
+    telecom=service_device: ES:Tag:telecom=service device
     tourism=alpine_hut: ES:Tag:tourism=alpine hut
     tourism=apartment: ES:Tag:tourism=apartment
     tourism=artwork: ES:Tag:tourism=artwork
     tourism=attraction: ES:Tag:tourism=attraction
     tourism=camp_site: ES:Tag:tourism=camp site
     tourism=chalet: ES:Tag:tourism=chalet
+    tourism=gallery: ES:Tag:tourism=gallery
     tourism=guest_house: ES:Tag:tourism=guest house
     tourism=hostel: ES:Tag:tourism=hostel
     tourism=hotel: ES:Tag:tourism=hotel
+    tourism=information: ES:Tag:tourism=information
     tourism=motel: ES:Tag:tourism=motel
     tourism=museum: ES:Tag:tourism=museum
     tourism=picnic_site: ES:Tag:tourism=picnic site
     tourism=trail_riding_station: ES:Tag:tourism=trail riding station
     tourism=viewpoint: ES:Tag:tourism=viewpoint
+    tourism=wilderness_hut: ES:Tag:tourism=wilderness hut
+    tower:type=bell_tower: ES:Tag:tower:type=bell tower
+    tower:type=communication: ES:Tag:tower:type=communication
+    tower:type=cooling: ES:Tag:tower:type=cooling
+    tower:type=defensive: ES:Tag:tower:type=defensive
+    tower:type=minaret: ES:Tag:tower:type=minaret
+    tower:type=observation: ES:Tag:tower:type=observation
+    tower:type=watchtower: ES:Tag:tower:type=watchtower
     traffic_calming=island: ES:Tag:traffic calming=island
     tunnel=culvert: ES:Tag:tunnel=culvert
     type=public_transport: ES:Tag:type=public transport
@@ -9609,9 +10467,13 @@ es:
     vending=milk: ES:Tag:vending=milk
     vending=parking_tickets: ES:Tag:vending=parking tickets
     wall=dry_stone: ES:Tag:wall=dry stone
+    water=lagoon: ES:Tag:water=lagoon
+    water=lake: ES:Tag:water=lake
     water=reservoir: ES:Tag:water=reservoir
+    waterway=canal: ES:Tag:waterway=canal
     waterway=dam: ES:Tag:waterway=dam
     waterway=ditch: ES:Tag:waterway=ditch
+    waterway=drain: ES:Tag:waterway=drain
     waterway=milestone: ES:Tag:waterway=milestone
     waterway=river: ES:Tag:waterway=river
     waterway=riverbank: ES:Tag:waterway=riverbank
@@ -9619,6 +10481,7 @@ es:
     waterway=water_point: ES:Tag:waterway=water point
     waterway=weir: ES:Tag:waterway=weir
     wetland=tidalflat: ES:Tag:wetland=tidalflat
+    wetland=wet_meadow: ES:Tag:wetland=wet meadow
 et:
   key:
     addr: Et:Key:addr
@@ -9634,20 +10497,40 @@ et:
     building=roof: Et:Tag:building=roof
 fa:
   key:
+    addr: Fa:Key:addr
     area: Fa:Key:area
+    barrier: Fa:Key:barrier
     bridge: Fa:Key:bridge
+    comment: Fa:Key:comment
     enforcement: Fa:Key:enforcement
     highway: Fa:Key:highway
+    intermittent: Fa:Key:intermittent
     level: Fa:Key:level
+    loc_name: Fa:Key:loc name
     name: Fa:Key:name
     noexit: Fa:Key:noexit
     source: Fa:Key:source
     traffic_calming: Fa:Key:traffic calming
   tag:
     amenity=fountain: Fa:Tag:amenity=fountain
+    amenity=fuel: Fa:Tag:amenity=fuel
+    barrier=cable_barrier: Fa:Tag:barrier=cable barrier
     highway=footway: Fa:Tag:highway=footway
+    highway=path: Fa:Tag:highway=path
+    highway=residential: Fa:Tag:highway=residential
+    highway=road: Fa:Tag:highway=road
+    highway=secondary: Fa:Tag:highway=secondary
+    highway=secondary_link: Fa:Tag:highway=secondary link
     highway=service: Fa:Tag:highway=service
+    highway=tertiary: Fa:Tag:highway=tertiary
+    highway=track: Fa:Tag:highway=track
+    highway=unclassified: Fa:Tag:highway=unclassified
+    junction=yes: Fa:Tag:junction=yes
+    man_made=qanat: Fa:Tag:man made=qanat
+    place=country: Fa:Tag:place=country
+    service=alley: Fa:Tag:service=alley
     shop=garden_centre: Fa:Tag:shop=garden centre
+    tower:type=cooling: Fa:Tag:tower:type=cooling
     waterway=drain: Fa:Tag:waterway=drain
 fi:
   key:
@@ -9711,6 +10594,7 @@ fi:
     amenity=police: Fi:Tag:amenity=police
     amenity=prison: Fi:Tag:amenity=prison
     amenity=recycling: Fi:Tag:amenity=recycling
+    amenity=school: Fi:Tag:amenity=school
     amenity=telephone: Fi:Tag:amenity=telephone
     amenity=theatre: Fi:Tag:amenity=theatre
     amenity=townhall: Fi:Tag:amenity=townhall
@@ -9753,8 +10637,10 @@ fr:
   key:
     CEMT: FR:Key:CEMT
     FIXME: FR:Key:FIXME
+    'abandoned:': 'FR:Key:abandoned:'
     abutters: FR:Key:abutters
     access: FR:Key:access
+    actuator: FR:Key:actuator
     addr: FR:Key:addr
     addr:floor: FR:Key:addr:floor
     addr:housenumber: FR:Key:addr:housenumber
@@ -9779,6 +10665,7 @@ fr:
     bench: FR:Key:bench
     bicycle: FR:Key:bicycle
     bicycle_parking: FR:Key:bicycle parking
+    board_type: FR:Key:board type
     boat: FR:Key:boat
     bollard: FR:Key:bollard
     books: FR:Key:books
@@ -9794,6 +10681,9 @@ fr:
     building:use: FR:Key:building:use
     bulk_purchase: FR:Key:bulk purchase
     bus: FR:Key:bus
+    busway: FR:Key:busway
+    cafe: FR:Key:cafe
+    camp_site: FR:Key:camp site
     capacity: FR:Key:capacity
     capacity:disabled: FR:Key:capacity:disabled
     check_date: FR:Key:check date
@@ -9804,6 +10694,9 @@ fr:
     color: FR:Key:color
     colour: FR:Key:colour
     comment: FR:Key:comment
+    communication:bos: FR:Key:communication:bos
+    community_centre: FR:Key:community centre
+    connection_point: FR:Key:connection point
     construction: FR:Key:construction
     contact: FR:Key:contact
     contact:email: FR:Key:contact:email
@@ -9817,17 +10710,22 @@ fr:
     craft: FR:Key:craft
     crop: FR:Key:crop
     crossing: FR:Key:crossing
+    crossing:island: FR:Key:crossing:island
     cuisine: FR:Key:cuisine
     currency: FR:Key:currency
     cutting: FR:Key:cutting
+    cyclestreet: FR:Key:cyclestreet
     cycleway: FR:Key:cycleway
     cycleway:lane: FR:Key:cycleway:lane
     delivery: FR:Key:delivery
     denomination: FR:Key:denomination
+    denotation: FR:Key:denotation
     description: FR:Key:description
     designation: FR:Key:designation
     destination: FR:Key:destination
+    diet: FR:Key:diet
     diet:*: FR:Key:diet:*
+    diet:vegetarian: FR:Key:diet:vegetarian
     diplomatic: FR:Key:diplomatic
     direction: FR:Key:direction
     dispensing: FR:Key:dispensing
@@ -9835,6 +10733,7 @@ fr:
     'disused:': 'FR:Key:disused:'
     door: FR:Key:door
     drink: FR:Key:drink
+    dryer: FR:Key:dryer
     ele: FR:Key:ele
     email: FR:Key:email
     embankment: FR:Key:embankment
@@ -9842,7 +10741,9 @@ fr:
     enforcement: FR:Key:enforcement
     entrance: FR:Key:entrance
     est_width: FR:Key:est width
+    exit: FR:Key:exit
     fair_trade: FR:Key:fair trade
+    fast_food: FR:Key:fast food
     fax: FR:Key:fax
     fee: FR:Key:fee
     female: FR:Key:female
@@ -9872,7 +10773,9 @@ fr:
     generator:plant: FR:Key:generator:plant
     generator:source: FR:Key:generator:source
     geological: FR:Key:geological
+    government: FR:Key:government
     grande_circulation: FR:Key:grande circulation
+    happy_hours: FR:Key:happy hours
     healthcare: FR:Key:healthcare
     height: FR:Key:height
     heritage: FR:Key:heritage
@@ -9883,10 +10786,12 @@ fr:
     horse: FR:Key:horse
     hov: FR:Key:hov
     incline: FR:Key:incline
+    indoor: FR:Key:indoor
     information: FR:Key:information
     inscription: FR:Key:inscription
     int_name: FR:Key:int name
     intermittent: FR:Key:intermittent
+    interval: FR:Key:interval
     junction: FR:Key:junction
     kindergarten:FR: FR:Key:kindergarten:FR
     ladder: FR:Key:ladder
@@ -9901,6 +10806,7 @@ fr:
     level: FR:Key:level
     lit: FR:Key:lit
     loc_name: FR:Key:loc name
+    location: FR:Key:location
     lock: FR:Key:lock
     lock_name: FR:Key:lock name
     lock_ref: FR:Key:lock ref
@@ -9908,6 +10814,8 @@ fr:
     man_made: FR:Key:man made
     manhole: FR:Key:manhole
     manufacturer: FR:Key:manufacturer
+    mapillary: FR:Key:mapillary
+    material: FR:Key:material
     max_age: FR:Key:max age
     maxage: FR:Key:maxage
     maxaxleload: FR:Key:maxaxleload
@@ -9936,8 +10844,10 @@ fr:
     natural: FR:Key:natural
     network: FR:Key:network
     noexit: FR:Key:noexit
+    non_existent_levels: FR:Key:non existent levels
     noname: FR:Key:noname
     note: FR:Key:note
+    nudism: FR:Key:nudism
     office: FR:Key:office
     official_name: FR:Key:official name
     old_name: FR:Key:old name
@@ -9951,12 +10861,19 @@ fr:
     organic: FR:Key:organic
     outdoor_seating: FR:Key:outdoor seating
     overtaking: FR:Key:overtaking
+    owner: FR:Key:owner
     parking: FR:Key:parking
     parking:condition: FR:Key:parking:condition
     parking:lane: FR:Key:parking:lane
     paved:date: FR:Key:paved:date
+    payment: FR:Key:payment
+    payment:MoyenDePaiement: FR:Key:payment:MoyenDePaiement
+    payment:credit_cards: FR:Key:payment:credit cards
+    payment:foo: FR:Key:payment:foo
     permanent: FR:Key:permanent
     phone: FR:Key:phone
+    piste:difficulty: FR:Key:piste:difficulty
+    piste:grooming: FR:Key:piste:grooming
     place: FR:Key:place
     place:fr: FR:Key:place:fr
     plant:output: FR:Key:plant:output
@@ -9999,9 +10916,12 @@ fr:
     reg_name: FR:Key:reg name
     religion: FR:Key:religion
     repeat_on: FR:Key:repeat on
+    reservation: FR:Key:reservation
+    residential: FR:Key:residential
     resource: FR:Key:resource
     right: FR:Key:right
     roof:material: FR:Key:roof:material
+    room: FR:Key:room
     ruins: FR:Key:ruins
     sac_scale: FR:Key:sac scale
     salt: FR:Key:salt
@@ -10009,15 +10929,20 @@ fr:
     seamark:fixme: FR:Key:seamark:fixme
     second_hand: FR:Key:second hand
     segregated: FR:Key:segregated
+    self_service: FR:Key:self service
     service: FR:Key:service
+    service_times: FR:Key:service times
+    shelter: FR:Key:shelter
     shelter_type: FR:Key:shelter type
     shop: FR:Key:shop
     short_name: FR:Key:short name
     sides: FR:Key:sides
+    sidewalk: FR:Key:sidewalk
     sinkhole: FR:Key:sinkhole
     size: FR:Key:size
     smoothness: FR:Key:smoothness
     social_facility: FR:Key:social facility
+    social_facility:for: FR:Key:social facility:for
     source: FR:Key:source
     source:date: FR:Key:source:date
     source:maxspeed: FR:Key:source:maxspeed
@@ -10025,6 +10950,8 @@ fr:
     species: FR:Key:species
     species:fr: FR:Key:species:fr
     sport: FR:Key:sport
+    stairs: FR:Key:stairs
+    start_date: FR:Key:start date
     step:condition: FR:Key:step:condition
     step:contrast: FR:Key:step:contrast
     step_count: FR:Key:step count
@@ -10036,17 +10963,21 @@ fr:
     symbol: FR:Key:symbol
     tactile_paving: FR:Key:tactile paving
     takeaway: FR:Key:takeaway
+    telecom: FR:Key:telecom
+    tickets:public_transport_subscription: FR:Key:tickets:public transport subscription
     tidal: FR:Key:tidal
     timezone: FR:Key:timezone
     toilets:wheelchair: FR:Key:toilets:wheelchair
     toll: FR:Key:toll
     tourism: FR:Key:tourism
+    tower:type: FR:Key:tower:type
     tracktype: FR:Key:tracktype
     traffic_calming: FR:Key:traffic calming
     traffic_sign: FR:Key:traffic sign
     traffic_signals:direction: FR:Key:traffic signals:direction
     traffic_signals:sound: FR:Key:traffic signals:sound
     trail_visibility: FR:Key:trail visibility
+    transformer: FR:Key:transformer
     trees: FR:Key:trees
     tunnel: FR:Key:tunnel
     turn: FR:Key:turn
@@ -10057,6 +10988,7 @@ fr:
     unisex: FR:Key:unisex
     url: FR:Key:url
     usage: FR:Key:usage
+    valve: FR:Key:valve
     visibility: FR:Key:visibility
     voltage: FR:Key:voltage
     waste: FR:Key:waste
@@ -10065,6 +10997,7 @@ fr:
     website: FR:Key:website
     wetland: FR:Key:wetland
     wheelchair: FR:Key:wheelchair
+    wheelchair:description: FR:Key:wheelchair:description
     width: FR:Key:width
     wikidata: FR:Key:wikidata
     wikimedia_commons: FR:Key:wikimedia commons
@@ -10075,6 +11008,7 @@ fr:
     Bascule_publique: FR:Tag:Bascule publique
     FIXME=Position_estimated: FR:Tag:FIXME=Position estimated
     abandoned=yes: FR:Tag:abandoned=yes
+    access=customers: FR:Tag:access=customers
     access=designated: FR:Tag:access=designated
     access=no: FR:Tag:access=no
     access=private: FR:Tag:access=private
@@ -10087,8 +11021,13 @@ fr:
     aerialway=cable_car: FR:Tag:aerialway=cable car
     aerialway=chair_lift: FR:Tag:aerialway=chair lift
     aeroway=aerodrome: FR:Tag:aeroway=aerodrome
+    aeroway=apron: FR:Tag:aeroway=apron
+    aeroway=gate: FR:Tag:aeroway=gate
+    aeroway=hangar: FR:Tag:aeroway=hangar
     aeroway=helipad: FR:Tag:aeroway=helipad
+    aeroway=parking_position: FR:Tag:aeroway=parking position
     aeroway=runway: FR:Tag:aeroway=runway
+    aeroway=taxiway: FR:Tag:aeroway=taxiway
     amenity=animal_boarding: FR:Tag:amenity=animal boarding
     amenity=animal_breeding: FR:Tag:amenity=animal breeding
     amenity=animal_shelter: FR:Tag:amenity=animal shelter
@@ -10102,9 +11041,11 @@ fr:
     amenity=bicycle_rental: FR:Tag:amenity=bicycle rental
     amenity=bicycle_repair_station: FR:Tag:amenity=bicycle repair station
     amenity=biergarten: FR:Tag:amenity=biergarten
+    amenity=boat_sharing: FR:Tag:amenity=boat sharing
     amenity=brothel: FR:Tag:amenity=brothel
     amenity=bus_station: FR:Tag:amenity=bus station
     amenity=cafe: FR:Tag:amenity=cafe
+    amenity=car_pooling: FR:Tag:amenity=car pooling
     amenity=car_rental: FR:Tag:amenity=car rental
     amenity=car_sharing: FR:Tag:amenity=car sharing
     amenity=charging_station: FR:Tag:amenity=charging station
@@ -10122,7 +11063,9 @@ fr:
     amenity=doctors: FR:Tag:amenity=doctors
     amenity=drinking_water: FR:Tag:amenity=drinking water
     amenity=driving_school: FR:Tag:amenity=driving school
+    amenity=dryer: FR:Tag:amenity=dryer
     amenity=embassy: FR:Tag:amenity=embassy
+    amenity=events_venue: FR:Tag:amenity=events venue
     amenity=fast_food: FR:Tag:amenity=fast food
     amenity=feeding_place: FR:Tag:amenity=feeding place
     amenity=fire_station: FR:Tag:amenity=fire station
@@ -10130,15 +11073,19 @@ fr:
     amenity=fountain: FR:Tag:amenity=fountain
     amenity=fuel: FR:Tag:amenity=fuel
     amenity=grave_yard: FR:Tag:amenity=grave yard
+    amenity=grit_bin: FR:Tag:amenity=grit bin
     amenity=hookah_lounge: FR:Tag:amenity=hookah lounge
     amenity=hospital: FR:Tag:amenity=hospital
     amenity=hunting_stand: FR:Tag:amenity=hunting stand
+    amenity=ice_cream: FR:Tag:amenity=ice cream
     amenity=kindergarten: FR:Tag:amenity=kindergarten
     amenity=lavoir: FR:Tag:amenity=lavoir
     amenity=letter_box: FR:Tag:amenity=letter box
     amenity=library: FR:Tag:amenity=library
     amenity=love_hotel: FR:Tag:amenity=love hotel
+    amenity=marae: FR:Tag:amenity=marae
     amenity=marketplace: FR:Tag:amenity=marketplace
+    amenity=mortuary: FR:Tag:amenity=mortuary
     amenity=motorcycle_parking: FR:Tag:amenity=motorcycle parking
     amenity=nightclub: FR:Tag:amenity=nightclub
     amenity=parking: FR:Tag:amenity=parking
@@ -10154,15 +11101,18 @@ fr:
     amenity=prison: FR:Tag:amenity=prison
     amenity=pub: FR:Tag:amenity=pub
     amenity=public_bookcase: FR:Tag:amenity=public bookcase
+    amenity=reception_desk: FR:Tag:amenity=reception desk
     amenity=recycling: FR:Tag:amenity=recycling
     amenity=restaurant: FR:Tag:amenity=restaurant
     amenity=sanitary_dump_station: FR:Tag:amenity=sanitary dump station
     amenity=school: FR:Tag:amenity=school
     amenity=shelter: FR:Tag:amenity=shelter
+    amenity=smoking_area: FR:Tag:amenity=smoking area
     amenity=social_centre: FR:Tag:amenity=social centre
     amenity=social_facility: FR:Tag:amenity=social facility
     amenity=stripclub: FR:Tag:amenity=stripclub
     amenity=swingerclub: FR:Tag:amenity=swingerclub
+    amenity=table: FR:Tag:amenity=table
     amenity=taxi: FR:Tag:amenity=taxi
     amenity=telephone: FR:Tag:amenity=telephone
     amenity=theatre: FR:Tag:amenity=theatre
@@ -10173,12 +11123,14 @@ fr:
     amenity=vehicle_inspection: FR:Tag:amenity=vehicle inspection
     amenity=vending_machine: FR:Tag:amenity=vending machine
     amenity=veterinary: FR:Tag:amenity=veterinary
+    amenity=washing_machine: FR:Tag:amenity=washing machine
     amenity=waste_basket: FR:Tag:amenity=waste basket
     amenity=waste_disposal: FR:Tag:amenity=waste disposal
     amenity=water_point: FR:Tag:amenity=water point
     amenity=watering_place: FR:Tag:amenity=watering place
     amenity=weighbridge: FR:Tag:amenity=weighbridge
     animal=horse_walker: FR:Tag:animal=horse walker
+    anthropogenic=yes: FR:Tag:anthropogenic=yes
     atm=yes: FR:Tag:atm=yes
     barrier=block: FR:Tag:barrier=block
     barrier=bollard: FR:Tag:barrier=bollard
@@ -10188,6 +11140,7 @@ fr:
     barrier=fence: FR:Tag:barrier=fence
     barrier=gate: FR:Tag:barrier=gate
     barrier=guard_rail: FR:Tag:barrier=guard rail
+    barrier=hampshire_gate: FR:Tag:barrier=hampshire gate
     barrier=hedge: FR:Tag:barrier=hedge
     barrier=hedge_bank: FR:Tag:barrier=hedge bank
     barrier=horse_stile: FR:Tag:barrier=horse stile
@@ -10195,10 +11148,12 @@ fr:
     barrier=retaining_wall: FR:Tag:barrier=retaining wall
     barrier=rope: FR:Tag:barrier=rope
     barrier=select_acces: FR:Tag:barrier=select acces
+    barrier=turnstile: FR:Tag:barrier=turnstile
     barrier=wall: FR:Tag:barrier=wall
     bicycle=use_sidepath: FR:Tag:bicycle=use sidepath
     boundary=administrative: FR:Tag:boundary=administrative
     brand=Trilib': FR:Tag:brand=Trilib'
+    bridge=boardwalk: FR:Tag:bridge=boardwalk
     building=apartments: FR:Tag:building=apartments
     building=barn: FR:Tag:building=barn
     building=cabin: FR:Tag:building=cabin
@@ -10206,32 +11161,40 @@ fr:
     building=church: FR:Tag:building=church
     building=commercial: FR:Tag:building=commercial
     building=construction: FR:Tag:building=construction
+    building=detached: FR:Tag:building=detached
     building=farm: FR:Tag:building=farm
     building=garage: FR:Tag:building=garage
     building=garages: FR:Tag:building=garages
+    building=grandstand: FR:Tag:building=grandstand
     building=greenhouse: FR:Tag:building=greenhouse
     building=hangar: FR:Tag:building=hangar
     building=hotel: FR:Tag:building=hotel
     building=house: FR:Tag:building=house
     building=hut: FR:Tag:building=hut
     building=kiosk: FR:Tag:building=kiosk
+    building=pavilion: FR:Tag:building=pavilion
     building=public: FR:Tag:building=public
     building=residential: FR:Tag:building=residential
     building=riding_hall: FR:Tag:building=riding hall
     building=roof: FR:Tag:building=roof
     building=ruins: FR:Tag:building=ruins
     building=shed: FR:Tag:building=shed
+    building=sports_hall: FR:Tag:building=sports hall
     building=stable: FR:Tag:building=stable
     building=stadium: FR:Tag:building=stadium
     building=sty: FR:Tag:building=sty
     building=terrace: FR:Tag:building=terrace
     building=warehouse: FR:Tag:building=warehouse
+    cafe=time-cafe: FR:Tag:cafe=time-cafe
     club=sport: FR:Tag:club=sport
     construction=yes: FR:Tag:construction=yes
     craft=agricultural_engines: FR:Tag:craft=agricultural engines
     craft=bakery: FR:Tag:craft=bakery
     craft=basket_maker: FR:Tag:craft=basket maker
     craft=beekeeper: FR:Tag:craft=beekeeper
+    craft=blacksmith: FR:Tag:craft=blacksmith
+    craft=boatbuilder: FR:Tag:craft=boatbuilder
+    craft=bookbinder: FR:Tag:craft=bookbinder
     craft=brewery: FR:Tag:craft=brewery
     craft=builder: FR:Tag:craft=builder
     craft=cabinet_maker: FR:Tag:craft=cabinet maker
@@ -10240,31 +11203,91 @@ fr:
     craft=carpet_layer: FR:Tag:craft=carpet layer
     craft=caterer: FR:Tag:craft=caterer
     craft=chimney_sweeper: FR:Tag:craft=chimney sweeper
+    craft=clockmaker: FR:Tag:craft=clockmaker
+    craft=confectionery: FR:Tag:craft=confectionery
+    craft=cooper: FR:Tag:craft=cooper
+    craft=dental_technician: FR:Tag:craft=dental technician
     craft=distillery: FR:Tag:craft=distillery
+    craft=dressmaker: FR:Tag:craft=dressmaker
     craft=electrician: FR:Tag:craft=electrician
+    craft=electronics_repair: FR:Tag:craft=electronics repair
+    craft=embroiderer: FR:Tag:craft=embroiderer
+    craft=engraver: FR:Tag:craft=engraver
     craft=floorer: FR:Tag:craft=floorer
     craft=gardener: FR:Tag:craft=gardener
+    craft=glaziery: FR:Tag:craft=glaziery
+    craft=goldsmith: FR:Tag:craft=goldsmith
+    craft=grinding_mill: FR:Tag:craft=grinding mill
     craft=handicraft: FR:Tag:craft=handicraft
     craft=hvac: FR:Tag:craft=hvac
     craft=insulation: FR:Tag:craft=insulation
     craft=jeweller: FR:Tag:craft=jeweller
     craft=joiner: FR:Tag:craft=joiner
     craft=key_cutter: FR:Tag:craft=key cutter
+    craft=leather: FR:Tag:craft=leather
     craft=locksmith: FR:Tag:craft=locksmith
+    craft=luthier: FR:Tag:craft=luthier
     craft=metal_construction: FR:Tag:craft=metal construction
+    craft=mint: FR:Tag:craft=mint
+    craft=musical_instrument: FR:Tag:craft=musical instrument
+    craft=oil_mill: FR:Tag:craft=oil mill
+    craft=optician: FR:Tag:craft=optician
+    craft=organ_builder: FR:Tag:craft=organ builder
+    craft=painter: FR:Tag:craft=painter
+    craft=parquet_layer: FR:Tag:craft=parquet layer
+    craft=paver: FR:Tag:craft=paver
     craft=photographer: FR:Tag:craft=photographer
+    craft=photographic_laboratory: FR:Tag:craft=photographic laboratory
+    craft=piano_tuner: FR:Tag:craft=piano tuner
+    craft=plasterer: FR:Tag:craft=plasterer
+    craft=plumber: FR:Tag:craft=plumber
+    craft=pottery: FR:Tag:craft=pottery
+    craft=printer: FR:Tag:craft=printer
+    craft=printmaker: FR:Tag:craft=printmaker
+    craft=restoration: FR:Tag:craft=restoration
+    craft=rigger: FR:Tag:craft=rigger
+    craft=roofer: FR:Tag:craft=roofer
+    craft=saddler: FR:Tag:craft=saddler
+    craft=sailmaker: FR:Tag:craft=sailmaker
+    craft=sawmill: FR:Tag:craft=sawmill
+    craft=scaffolder: FR:Tag:craft=scaffolder
+    craft=sculptor: FR:Tag:craft=sculptor
+    craft=shoemaker: FR:Tag:craft=shoemaker
+    craft=signmaker: FR:Tag:craft=signmaker
+    craft=stand_builder: FR:Tag:craft=stand builder
+    craft=stonemason: FR:Tag:craft=stonemason
+    craft=sun_protection: FR:Tag:craft=sun protection
+    craft=tailor: FR:Tag:craft=tailor
+    craft=tiler: FR:Tag:craft=tiler
+    craft=tinsmith: FR:Tag:craft=tinsmith
+    craft=toolmaker: FR:Tag:craft=toolmaker
+    craft=turner: FR:Tag:craft=turner
+    craft=upholsterer: FR:Tag:craft=upholsterer
+    craft=watchmaker: FR:Tag:craft=watchmaker
+    craft=welder: FR:Tag:craft=welder
+    craft=window_construction: FR:Tag:craft=window construction
+    craft=winery: FR:Tag:craft=winery
+    crossing=zebra: FR:Tag:crossing=zebra
     cuisine=coffee_shop: FR:Tag:cuisine=coffee shop
+    cycleway:right=lane: FR:Tag:cycleway:right=lane
     cycleway=asl: FR:Tag:cycleway=asl
     cycleway=bike_box: FR:Tag:cycleway=bike box
     cycleway=opposite: FR:Tag:cycleway=opposite
     cycleway=opposite_lane: FR:Tag:cycleway=opposite lane
+    cycleway=share_busway: FR:Tag:cycleway=share busway
     disused=yes: FR:Tag:disused=yes
     emergency=aed: FR:Tag:emergency=aed
     emergency=defibrillator: FR:Tag:emergency=defibrillator
+    emergency=emergency_ward_entrance: FR:Tag:emergency=emergency ward entrance
     emergency=fire_extinguisher: FR:Tag:emergency=fire extinguisher
+    emergency=fire_hose: FR:Tag:emergency=fire hose
     emergency=fire_hydrant: FR:Tag:emergency=fire hydrant
     emergency=phone: FR:Tag:emergency=phone
+    emergency=siren: FR:Tag:emergency=siren
+    emergency=suction_point: FR:Tag:emergency=suction point
     emergency=water_rescue_station: FR:Tag:emergency=water rescue station
+    fast_food=cafeteria: FR:Tag:fast food=cafeteria
+    footway=crossing: FR:Tag:footway=crossing
     footway=sidewalk: FR:Tag:footway=sidewalk
     generator:method=combustion: FR:Tag:generator:method=combustion
     generator:method=fission: FR:Tag:generator:method=fission
@@ -10283,6 +11306,7 @@ fr:
     generator:source=solar: FR:Tag:generator:source=solar
     generator:source=tidal: FR:Tag:generator:source=tidal
     generator:source=wind: FR:Tag:generator:source=wind
+    handle=wheel: FR:Tag:handle=wheel
     healthcare=laboratory: FR:Tag:healthcare=laboratory
     highway=bridleway: FR:Tag:highway=bridleway
     highway=bus_guideway: FR:Tag:highway=bus guideway
@@ -10311,6 +11335,7 @@ fr:
     highway=service: FR:Tag:highway=service
     highway=services: FR:Tag:highway=services
     highway=speed_camera: FR:Tag:highway=speed camera
+    highway=speed_display: FR:Tag:highway=speed display
     highway=steps: FR:Tag:highway=steps
     highway=stop: FR:Tag:highway=stop
     highway=tertiary: FR:Tag:highway=tertiary
@@ -10348,14 +11373,24 @@ fr:
     historic=wayside_cross: FR:Tag:historic=wayside cross
     historic=wayside_shrine: FR:Tag:historic=wayside shrine
     historic=wreck: FR:Tag:historic=wreck
+    indoor=area: FR:Tag:indoor=area
+    indoor=corridor: FR:Tag:indoor=corridor
+    indoor=room: FR:Tag:indoor=room
+    indoor=wall: FR:Tag:indoor=wall
     industrial=brewery: FR:Tag:industrial=brewery
+    information=audioguide: FR:Tag:information=audioguide
+    information=board: FR:Tag:information=board
     information=guidepost: FR:Tag:information=guidepost
     information=map: FR:Tag:information=map
+    information=office: FR:Tag:information=office
+    information=terminal: FR:Tag:information=terminal
     junction=roundabout: FR:Tag:junction=roundabout
     landcover=grass: FR:Tag:landcover=grass
     landuse=allotments: FR:Tag:landuse=allotments
     landuse=animal_keeping: FR:Tag:landuse=animal keeping
+    landuse=apiary: FR:Tag:landuse=apiary
     landuse=basin: FR:Tag:landuse=basin
+    landuse=brownfield: FR:Tag:landuse=brownfield
     landuse=cemetery: FR:Tag:landuse=cemetery
     landuse=commercial: FR:Tag:landuse=commercial
     landuse=construction: FR:Tag:landuse=construction
@@ -10379,6 +11414,9 @@ fr:
     landuse=village_green: FR:Tag:landuse=village green
     leaf_cycle=deciduous: FR:Tag:leaf cycle=deciduous
     leisure=bandstand: FR:Tag:leisure=bandstand
+    leisure=bleachers: FR:Tag:leisure=bleachers
+    leisure=bowling_alley: FR:Tag:leisure=bowling alley
+    leisure=dance: FR:Tag:leisure=dance
     leisure=dog_park: FR:Tag:leisure=dog park
     leisure=escape_game: FR:Tag:leisure=escape game
     leisure=firepit: FR:Tag:leisure=firepit
@@ -10394,14 +11432,17 @@ fr:
     leisure=picnic_table: FR:Tag:leisure=picnic table
     leisure=pitch: FR:Tag:leisure=pitch
     leisure=playground: FR:Tag:leisure=playground
+    leisure=sauna: FR:Tag:leisure=sauna
     leisure=slipway: FR:Tag:leisure=slipway
     leisure=sports_centre: FR:Tag:leisure=sports centre
     leisure=stadium: FR:Tag:leisure=stadium
     leisure=swimming_area: FR:Tag:leisure=swimming area
     leisure=swimming_pool: FR:Tag:leisure=swimming pool
+    leisure=tanning_salon: FR:Tag:leisure=tanning salon
     leisure=track: FR:Tag:leisure=track
     leisure=water_park: FR:Tag:leisure=water park
     man_made=adit: FR:Tag:man made=adit
+    man_made=beehive: FR:Tag:man made=beehive
     man_made=carpet_hanger: FR:Tag:man made=carpet hanger
     man_made=cutline: FR:Tag:man made=cutline
     man_made=dovecote: FR:Tag:man made=dovecote
@@ -10412,7 +11453,9 @@ 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=petroleum_well: FR:Tag:man made=petroleum well
     man_made=pier: FR:Tag:man made=pier
+    man_made=pumping_rig: FR:Tag:man made=pumping rig
     man_made=reservoir_covered: FR:Tag:man made=reservoir covered
     man_made=street_cabinet: FR:Tag:man made=street cabinet
     man_made=surveillance: FR:Tag:man made=surveillance
@@ -10437,7 +11480,9 @@ fr:
     natural=glacier: FR:Tag:natural=glacier
     natural=grassland: FR:Tag:natural=grassland
     natural=heath: FR:Tag:natural=heath
+    natural=isthmus: FR:Tag:natural=isthmus
     natural=peak: FR:Tag:natural=peak
+    natural=peninsula: FR:Tag:natural=peninsula
     natural=saddle: FR:Tag:natural=saddle
     natural=scree: FR:Tag:natural=scree
     natural=scrub: FR:Tag:natural=scrub
@@ -10451,6 +11496,7 @@ fr:
     natural=wetland: FR:Tag:natural=wetland
     office=association: FR:Tag:office=association
     office=company: FR:Tag:office=company
+    office=educational_institution: FR:Tag:office=educational institution
     office=employment_agency: FR:Tag:office=employment agency
     office=estate_agent: FR:Tag:office=estate agent
     office=foundation: FR:Tag:office=foundation
@@ -10458,6 +11504,7 @@ fr:
     office=insurance: FR:Tag:office=insurance
     office=lawyer: FR:Tag:office=lawyer
     office=ngo: FR:Tag:office=ngo
+    piste:type=nordic: FR:Tag:piste:type=nordic
     place=city: FR:Tag:place=city
     place=hamlet: FR:Tag:place=hamlet
     place=island: FR:Tag:place=island
@@ -10503,8 +11550,10 @@ fr:
     railway=station: FR:Tag:railway=station
     railway=subway: FR:Tag:railway=subway
     railway=subway_entrance: FR:Tag:railway=subway entrance
+    railway=switch: FR:Tag:railway=switch
     railway=tram: FR:Tag:railway=tram
     railway=tram_stop: FR:Tag:railway=tram stop
+    railway=water_crane: FR:Tag:railway=water crane
     religion=buddhist: FR:Tag:religion=buddhist
     religion=christian: FR:Tag:religion=christian
     religion=hindu: FR:Tag:religion=hindu
@@ -10516,12 +11565,19 @@ fr:
     religion=sikh: FR:Tag:religion=sikh
     religion=taoist: FR:Tag:religion=taoist
     religion=zoroastrian: FR:Tag:religion=zoroastrian
+    repair=assisted_self_service: FR:Tag:repair=assisted self service
     route=bicycle: FR:Tag:route=bicycle
+    route=bus: FR:Tag:route=bus
     route=coach: FR:Tag:route=coach
+    route=ferry: FR:Tag:route=ferry
     route=fitness_trail: FR:Tag:route=fitness trail
     route=piste: FR:Tag:route=piste
     route=railway: FR:Tag:route=railway
+    route=subway: FR:Tag:route=subway
+    route=tram: FR:Tag:route=tram
     route=transhumance: FR:Tag:route=transhumance
+    segregated=no: FR:Tag:segregated=no
+    segregated=yes: FR:Tag:segregated=yes
     service=alley: FR:Tag:service=alley
     service=driveway: FR:Tag:service=driveway
     service=parking_aisle: FR:Tag:service=parking aisle
@@ -10537,6 +11593,7 @@ fr:
     shop=bed: FR:Tag:shop=bed
     shop=beverages: FR:Tag:shop=beverages
     shop=bicycle: FR:Tag:shop=bicycle
+    shop=boat: FR:Tag:shop=boat
     shop=books: FR:Tag:shop=books
     shop=boutique: FR:Tag:shop=boutique
     shop=butcher: FR:Tag:shop=butcher
@@ -10560,6 +11617,7 @@ fr:
     shop=erotic: FR:Tag:shop=erotic
     shop=farm: FR:Tag:shop=farm
     shop=fashion: FR:Tag:shop=fashion
+    shop=fashion_accessories: FR:Tag:shop=fashion accessories
     shop=florist: FR:Tag:shop=florist
     shop=frame: FR:Tag:shop=frame
     shop=frozen_food: FR:Tag:shop=frozen food
@@ -10571,11 +11629,13 @@ fr:
     shop=haberdashery: FR:Tag:shop=haberdashery
     shop=hairdresser: FR:Tag:shop=hairdresser
     shop=hardware: FR:Tag:shop=hardware
+    shop=household_linen: FR:Tag:shop=household linen
     shop=hunting: FR:Tag:shop=hunting
     shop=interior_decoration: FR:Tag:shop=interior decoration
     shop=jewelry: FR:Tag:shop=jewelry
     shop=kiosk: FR:Tag:shop=kiosk
     shop=kitchen: FR:Tag:shop=kitchen
+    shop=laundry: FR:Tag:shop=laundry
     shop=medical_supply: FR:Tag:shop=medical supply
     shop=military_surplus: FR:Tag:shop=military surplus
     shop=mobile_phone: FR:Tag:shop=mobile phone
@@ -10584,7 +11644,9 @@ fr:
     shop=optician: FR:Tag:shop=optician
     shop=outdoor: FR:Tag:shop=outdoor
     shop=pastry: FR:Tag:shop=pastry
+    shop=pest_control: FR:Tag:shop=pest control
     shop=pet: FR:Tag:shop=pet
+    shop=pet_grooming: FR:Tag:shop=pet grooming
     shop=pharmacy: FR:Tag:shop=pharmacy
     shop=photo: FR:Tag:shop=photo
     shop=second_hand: FR:Tag:shop=second hand
@@ -10597,25 +11659,41 @@ fr:
     shop=vacant: FR:Tag:shop=vacant
     shop=video: FR:Tag:shop=video
     shop=video_games: FR:Tag:shop=video games
+    sinkhole=estavelle: FR:Tag:sinkhole=estavelle
     sport=8pin: FR:Tag:sport=8pin
     sport=archery: FR:Tag:sport=archery
+    sport=billiards: FR:Tag:sport=billiards
+    sport=bmx: FR:Tag:sport=bmx
     sport=boules: FR:Tag:sport=boules
     sport=climbing: FR:Tag:sport=climbing
+    sport=darts: FR:Tag:sport=darts
     sport=equestrian: FR:Tag:sport=equestrian
+    sport=fencing: FR:Tag:sport=fencing
     sport=free_flying: FR:Tag:sport=free flying
     sport=horse_racing: FR:Tag:sport=horse racing
+    sport=sailing: FR:Tag:sport=sailing
     sport=shooting: FR:Tag:sport=shooting
+    sport=skateboard: FR:Tag:sport=skateboard
     sport=soccer: FR:Tag:sport=soccer
+    sport=swimming: FR:Tag:sport=swimming
+    sport=table_soccer: FR:Tag:sport=table soccer
+    sport=table_tennis: FR:Tag:sport=table tennis
+    substation=traction: FR:Tag:substation=traction
     switch=circuit_breaker: FR:Tag:switch=circuit breaker
     switch=disconnector: FR:Tag:switch=disconnector
     switch=earthing: FR:Tag:switch=earthing
     switch=mechanical: FR:Tag:switch=mechanical
+    telecom=connection_point: FR:Tag:telecom=connection point
+    telecom=data_center: FR:Tag:telecom=data center
+    telecom=exchange: FR:Tag:telecom=exchange
+    telecom=service_device: FR:Tag:telecom=service device
     tickets:public_transport=yes: FR:Tag:tickets:public transport=yes
     tourism=alpine_hut: FR:Tag:tourism=alpine hut
     tourism=apartment: FR:Tag:tourism=apartment
     tourism=aquarium: FR:Tag:tourism=aquarium
     tourism=artwork: FR:Tag:tourism=artwork
     tourism=attraction: FR:Tag:tourism=attraction
+    tourism=camp_pitch: FR:Tag:tourism=camp pitch
     tourism=camp_site: FR:Tag:tourism=camp site
     tourism=caravan_site: FR:Tag:tourism=caravan site
     tourism=chalet: FR:Tag:tourism=chalet
@@ -10632,8 +11710,14 @@ fr:
     tourism=viewpoint: FR:Tag:tourism=viewpoint
     tourism=wilderness_hut: FR:Tag:tourism=wilderness hut
     tourism=zoo: FR:Tag:tourism=zoo
+    tower:type=bell_tower: FR:Tag:tower:type=bell tower
     tower:type=communication: FR:Tag:tower:type=communication
+    tower:type=hose: FR:Tag:tower:type=hose
     traffic_sign=city_limit: FR:Tag:traffic sign=city limit
+    transformer=auxiliary: FR:Tag:transformer=auxiliary
+    transformer=distribution: FR:Tag:transformer=distribution
+    transformer=generator: FR:Tag:transformer=generator
+    transformer=traction: FR:Tag:transformer=traction
     tunnel=culvert: FR:Tag:tunnel=culvert
     tunnel=flooded: FR:Tag:tunnel=flooded
     usage=headrace: FR:Tag:usage=headrace
@@ -10658,6 +11742,7 @@ fr:
     vending=sweets: FR:Tag:vending=sweets
     vending=water: FR:Tag:vending=water
     wall=no: FR:Tag:wall=no
+    waste=dog_excrement: FR:Tag:waste=dog excrement
     water=reservoir: FR:Tag:water=reservoir
     waterway=boatyard: FR:Tag:waterway=boatyard
     waterway=canal: FR:Tag:waterway=canal
@@ -10684,13 +11769,23 @@ gl:
     sport: Gl:Key:sport
     tourism: Gl:Key:tourism
     tunnel: Gl:Key:tunnel
+    twitter: Gl:Key:twitter
     wheelchair: Gl:Key:wheelchair
   tag:
     amenity=recycling: Gl:Tag:amenity=recycling
+    barrier=fence: Gl:Tag:barrier=fence
+    barrier=hedge: Gl:Tag:barrier=hedge
+    barrier=kerb: Gl:Tag:barrier=kerb
+    leisure=outdoor_seating: Gl:Tag:leisure=outdoor seating
+    natural=tree_row: Gl:Tag:natural=tree row
     railway=tram: Gl:Tag:railway=tram
     social_facility=nursing_home: Gl:Tag:social facility=nursing home
     sport=padel: Gl:Tag:sport=padel
     waterway=dock: Gl:Tag:waterway=dock
+    waterway=weir: Gl:Tag:waterway=weir
+he:
+  key:
+    fax: He:Key:fax
 hr:
   key:
     amenity: Hr:Key:amenity
@@ -10725,11 +11820,13 @@ hu:
     crossing:barrier: Hu:Key:crossing:barrier
     denomination: Hu:Key:denomination
     destination: Hu:Key:destination
+    height: Hu:Key:height
     highway: Hu:Key:highway
-    incline: HU:Key:incline
+    incline: Hu:Key:incline
     jel: Hu:Key:jel
     landuse: Hu:Key:landuse
     leisure: Hu:Key:leisure
+    length: Hu:Key:length
     man_made: Hu:Key:man made
     maxspeed: Hu:Key:maxspeed
     minspeed: Hu:Key:minspeed
@@ -10747,8 +11844,10 @@ hu:
     turn: Hu:Key:turn
     waterway: Hu:Key:waterway
     wheelchair: Hu:Key:wheelchair
+    width: Hu:Key:width
     wood: Hu:Key:wood
   tag:
+    barrier=bollard: Hu:Tag:barrier=bollard
     boundary=administrative: Hu:Tag:boundary=administrative
     highway=street_lamp: Hu:Tag:highway=street lamp
     natural=wallow: Hu:Tag:natural=wallow
@@ -10773,6 +11872,7 @@ it:
     backrest: IT:Key:backrest
     barrier: IT:Key:barrier
     basin: IT:Key:basin
+    bicycle: IT:Key:bicycle
     bicycle_parking: IT:Key:bicycle parking
     boundary: IT:Key:boundary
     bridge: IT:Key:bridge
@@ -10801,6 +11901,7 @@ it:
     fee: IT:Key:fee
     fence_type: IT:Key:fence type
     ford: IT:Key:ford
+    fuel: IT:Key:fuel
     garden:type: IT:Key:garden:type
     generator:output: IT:Key:generator:output
     geological: IT:Key:geological
@@ -10818,6 +11919,7 @@ it:
     maxaxleload: IT:Key:maxaxleload
     maxheight: IT:Key:maxheight
     maxlength: IT:Key:maxlength
+    maxspeed: IT:Key:maxspeed
     maxweight: IT:Key:maxweight
     maxwidth: IT:Key:maxwidth
     military: IT:Key:military
@@ -10835,6 +11937,7 @@ it:
     name: IT:Key:name
     natural: IT:Key:natural
     noexit: IT:Key:noexit
+    nohousenumber: IT:Key:nohousenumber
     note: IT:Key:note
     office: IT:Key:office
     oneway: IT:Key:oneway
@@ -10842,6 +11945,7 @@ it:
     operator: IT:Key:operator
     organic: IT:Key:organic
     osmc:symbol: IT:Key:osmc:symbol
+    parking: IT:Key:parking
     parking:lane:both: IT:Key:parking:lane:both
     passing_places: IT:Key:passing places
     place: IT:Key:place
@@ -10938,20 +12042,44 @@ it:
     barrier=bollard: IT:Tag:barrier=bollard
     barrier=border_control: IT:Tag:barrier=border control
     barrier=bump_gate: IT:Tag:barrier=bump gate
+    barrier=bus_trap: IT:Tag:barrier=bus trap
     barrier=cable_barrier: IT:Tag:barrier=cable barrier
+    barrier=cattle_grid: IT:Tag:barrier=cattle grid
+    barrier=chain: IT:Tag:barrier=chain
     barrier=city_wall: IT:Tag:barrier=city wall
+    barrier=cycle_barrier: IT:Tag:barrier=cycle barrier
+    barrier=debris: IT:Tag:barrier=debris
     barrier=ditch: IT:Tag:barrier=ditch
+    barrier=entrance: IT:Tag:barrier=entrance
     barrier=fence: IT:Tag:barrier=fence
+    barrier=full-height_turnstile: IT:Tag:barrier=full-height turnstile
+    barrier=gate: IT:Tag:barrier=gate
     barrier=guard_rail: IT:Tag:barrier=guard rail
+    barrier=hampshire_gate: IT:Tag:barrier=hampshire gate
     barrier=handrail: IT:Tag:barrier=handrail
     barrier=hedge: IT:Tag:barrier=hedge
+    barrier=height_restrictor: IT:Tag:barrier=height restrictor
+    barrier=horse_stile: IT:Tag:barrier=horse stile
     barrier=jersey_barrier: IT:Tag:barrier=jersey barrier
+    barrier=kent_carriage_gap: IT:Tag:barrier=kent carriage gap
     barrier=kerb: IT:Tag:barrier=kerb
+    barrier=kissing_gate: IT:Tag:barrier=kissing gate
+    barrier=lift_gate: IT:Tag:barrier=lift gate
+    barrier=log: IT:Tag:barrier=log
+    barrier=motorcycle_barrier: IT:Tag:barrier=motorcycle barrier
     barrier=retaining_wall: IT:Tag:barrier=retaining wall
+    barrier=rope: IT:Tag:barrier=rope
+    barrier=sally_port: IT:Tag:barrier=sally port
+    barrier=spikes: IT:Tag:barrier=spikes
+    barrier=stile: IT:Tag:barrier=stile
+    barrier=sump_buster: IT:Tag:barrier=sump buster
+    barrier=swing_gate: IT:Tag:barrier=swing gate
     barrier=tank_trap: IT:Tag:barrier=tank trap
     barrier=toll_booth: IT:Tag:barrier=toll booth
+    barrier=turnstile: IT:Tag:barrier=turnstile
     barrier=wall: IT:Tag:barrier=wall
     building=residential: IT:Tag:building=residential
+    building=retail: IT:Tag:building=retail
     building=train_station: IT:Tag:building=train station
     craft=agricultural_engines: IT:Tag:craft=agricultural engines
     craft=bakery: IT:Tag:craft=bakery
@@ -11024,6 +12152,8 @@ it:
     craft=watchmaker: IT:Tag:craft=watchmaker
     craft=window_construction: IT:Tag:craft=window construction
     craft=winery: IT:Tag:craft=winery
+    emergency=assembly_point: IT:Tag:emergency=assembly point
+    emergency=emergency_ward_entrance: IT:Tag:emergency=emergency ward entrance
     emergency=fire_hydrant: IT:Tag:emergency=fire hydrant
     footway=crossing: IT:Tag:footway=crossing
     footway=sidewalk: IT:Tag:footway=sidewalk
@@ -11061,9 +12191,11 @@ it:
     industrial=auto_wrecker: IT:Tag:industrial=auto wrecker
     internet_access=wlan: IT:Tag:internet access=wlan
     junction=roundabout: IT:Tag:junction=roundabout
+    junction=yes: IT:Tag:junction=yes
     landuse=cemetery: IT:Tag:landuse=cemetery
     landuse=construction: IT:Tag:landuse=construction
     landuse=greenhouse_horticulture: IT:Tag:landuse=greenhouse horticulture
+    landuse=retail: IT:Tag:landuse=retail
     landuse=salt_pond: IT:Tag:landuse=salt pond
     leisure=beach_resort: IT:Tag:leisure=beach resort
     leisure=dog_park: IT:Tag:leisure=dog park
@@ -11086,6 +12218,33 @@ it:
     office=foundation: IT:Tag:office=foundation
     office=it: IT:Tag:office=it
     oneway=alternating: IT:Tag:oneway=alternating
+    place=allotments: IT:Tag:place=allotments
+    place=archipelago: IT:Tag:place=archipelago
+    place=borough: IT:Tag:place=borough
+    place=city: IT:Tag:place=city
+    place=city_block: IT:Tag:place=city block
+    place=continent: IT:Tag:place=continent
+    place=country: IT:Tag:place=country
+    place=county: IT:Tag:place=county
+    place=district: IT:Tag:place=district
+    place=farm: IT:Tag:place=farm
+    place=hamlet: IT:Tag:place=hamlet
+    place=island: IT:Tag:place=island
+    place=islet: IT:Tag:place=islet
+    place=isolated_dwelling: IT:Tag:place=isolated dwelling
+    place=locality: IT:Tag:place=locality
+    place=municipality: IT:Tag:place=municipality
+    place=neighbourhood: IT:Tag:place=neighbourhood
+    place=ocean: IT:Tag:place=ocean
+    place=plot: IT:Tag:place=plot
+    place=province: IT:Tag:place=province
+    place=quarter: IT:Tag:place=quarter
+    place=region: IT:Tag:place=region
+    place=sea: IT:Tag:place=sea
+    place=square: IT:Tag:place=square
+    place=state: IT:Tag:place=state
+    place=suburb: IT:Tag:place=suburb
+    place=town: IT:Tag:place=town
     place=village: IT:Tag:place=village
     power=cable: IT:Tag:power=cable
     power=cable_distribution_cabinet: IT:Tag:power=cable distribution cabinet
@@ -11134,6 +12293,7 @@ it:
     shop=motorcycle: IT:Tag:shop=motorcycle
     shop=newsagent: IT:Tag:shop=newsagent
     shop=pastry: IT:Tag:shop=pastry
+    shop=radiotechnics: IT:Tag:shop=radiotechnics
     shop=seafood: IT:Tag:shop=seafood
     shop=souvenir: IT:Tag:shop=souvenir
     shop=supermarket: IT:Tag:shop=supermarket
@@ -11194,24 +12354,35 @@ ja:
     aerialway:drag_lift: JA:Key:aerialway:drag lift
     aeroway: JA:Key:aeroway
     agricultural: JA:Key:agricultural
+    air_conditioning: JA:Key:air conditioning
     alt_name: JA:Key:alt name
     amenity: JA:Key:amenity
+    animated: JA:Key:animated
     architect: JA:Key:architect
     area: JA:Key:area
     area:highway: JA:Key:area:highway
+    artist_name: JA:Key:artist name
+    artwork_subject: JA:Key:artwork subject
     artwork_type: JA:Key:artwork type
     ascent: JA:Key:ascent
+    assembly_point:earthquake: JA:Key:assembly point:earthquake
+    assembly_point:tsunami: JA:Key:assembly point:tsunami
+    attraction: JA:Key:attraction
     attribution: JA:Key:attribution
     atv: JA:Key:atv
     automated: JA:Key:automated
+    automatic_door: JA:Key:automatic door
     backrest: JA:Key:backrest
     backward: JA:Key:backward
     bar: JA:Key:bar
     barrier: JA:Key:barrier
     baseball: JA:Key:baseball
     basin: JA:Key:basin
+    bath:type: JA:Key:bath:type
+    bbq: JA:Key:bbq
     bdouble: JA:Key:bdouble
     beds: JA:Key:beds
+    bell_tower: JA:Key:bell tower
     bench: JA:Key:bench
     bicycle: JA:Key:bicycle
     bicycle_parking: JA:Key:bicycle parking
@@ -11220,6 +12391,7 @@ ja:
     board_type: JA:Key:board type
     boat: JA:Key:boat
     bollard: JA:Key:bollard
+    booking: JA:Key:booking
     books: JA:Key:books
     border_type: JA:Key:border type
     both: JA:Key:both
@@ -11227,6 +12399,7 @@ ja:
     branch: JA:Key:branch
     brand: JA:Key:brand
     brand:wikidata: JA:Key:brand:wikidata
+    brand:wikipedia: JA:Key:brand:wikipedia
     breakfast: JA:Key:breakfast
     brewery: JA:Key:brewery
     bridge: JA:Key:bridge
@@ -11246,25 +12419,33 @@ ja:
     building:fireproof: JA:Key:building:fireproof
     building:flats: JA:Key:building:flats
     building:levels: JA:Key:building:levels
+    building:levels:underground: JA:Key:building:levels:underground
     building:material: JA:Key:building:material
     building:min_level: JA:Key:building:min level
     building:part: JA:Key:building:part
     building:parts: JA:Key:building:parts
     building:units: JA:Key:building:units
     building:use: JA:Key:building:use
+    bulk_purchase: JA:Key:bulk purchase
     bunker_type: JA:Key:bunker type
     bus: JA:Key:bus
     busway: JA:Key:busway
+    button_operated: JA:Key:button operated
     cable_number: JA:Key:cable number
+    cafe: JA:Key:cafe
+    camp_site: JA:Key:camp site
     camp_type: JA:Key:camp type
     capacity: JA:Key:capacity
     capacity:disabled: JA:Key:capacity:disabled
     capital: JA:Key:capital
+    car: JA:Key:car
+    car_wash: JA:Key:car wash
     carriage: JA:Key:carriage
     castle_type: JA:Key:castle type
     cave:name: JA:Key:cave:name
     cemetery: JA:Key:cemetery
     change: JA:Key:change
+    charge: JA:Key:charge
     check_date: JA:Key:check date
     checkpoint: JA:Key:checkpoint
     circumference: JA:Key:circumference
@@ -11273,6 +12454,8 @@ ja:
     collection_times: JA:Key:collection times
     colour: JA:Key:colour
     comment: JA:Key:comment
+    communication:mobile_phone: JA:Key:communication:mobile phone
+    community_centre: JA:Key:community centre
     condition: JA:Key:condition
     conditional: JA:Key:conditional
     construction: JA:Key:construction
@@ -11298,6 +12481,7 @@ ja:
     crossing:activation: JA:Key:crossing:activation
     crossing:barrier: JA:Key:crossing:barrier
     crossing:bell: JA:Key:crossing:bell
+    crossing:island: JA:Key:crossing:island
     crossing:light: JA:Key:crossing:light
     crossing:on_demand: JA:Key:crossing:on demand
     crossing:saltire: JA:Key:crossing:saltire
@@ -11312,10 +12496,12 @@ ja:
     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:'
     denomination: JA:Key:denomination
     denotation: JA:Key:denotation
+    departures_board: JA:Key:departures board
     depth: JA:Key:depth
     descent: JA:Key:descent
     description: JA:Key:description
@@ -11324,6 +12510,7 @@ ja:
     destination:lanes: JA:Key:destination:lanes
     detour: JA:Key:detour
     diameter: JA:Key:diameter
+    diaper: JA:Key:diaper
     diet: JA:Key:diet
     diet:*: JA:Key:diet:*
     direction: JA:Key:direction
@@ -11334,11 +12521,13 @@ ja:
     'disused:': 'JA:Key:disused:'
     dog: JA:Key:dog
     donation:compensation: JA:Key:donation:compensation
+    door: JA:Key:door
     drink: JA:Key:drink
     drinking_water: JA:Key:drinking water
     drive_in: JA:Key:drive in
     drive_through: JA:Key:drive through
     driving_side: JA:Key:driving side
+    dryer: JA:Key:dryer
     duration: JA:Key:duration
     easy_overtaking: JA:Key:easy overtaking
     ele: JA:Key:ele
@@ -11350,20 +12539,27 @@ ja:
     enforcement: JA:Key:enforcement
     entrance: JA:Key:entrance
     est_width: JA:Key:est width
+    evacuation_route: JA:Key:evacuation route
     exit: JA:Key:exit
     exit_to: JA:Key:exit to
     expressway: JA:Key:expressway
     facebook: JA:Key:facebook
+    faces: JA:Key:faces
     fair_trade: JA:Key:fair trade
+    fast_food: JA:Key:fast food
     fax: JA:Key:fax
     fee: JA:Key:fee
+    female: JA:Key:female
     fence_type: JA:Key:fence type
     fenced: JA:Key:fenced
     ferry: JA:Key:ferry
     fire_boundary: JA:Key:fire boundary
+    fire_hydrant: JA:Key:fire hydrant
     fireplace: JA:Key:fireplace
     fishing: JA:Key:fishing
     fixme: JA:Key:fixme
+    floating: JA:Key:floating
+    flood_mark: JA:Key:flood mark
     flood_prone: JA:Key:flood prone
     foot: JA:Key:foot
     footway: JA:Key:footway
@@ -11371,7 +12567,10 @@ ja:
     forestry: JA:Key:forestry
     format: JA:Key:format
     forward: JA:Key:forward
+    free_refill: JA:Key:free refill
     frequency: JA:Key:frequency
+    from: JA:Key:from
+    fruit: JA:Key:fruit
     fuel: JA:Key:fuel
     fuel:diesel: JA:Key:fuel:diesel
     fuel:lpg: JA:Key:fuel:lpg
@@ -11402,11 +12601,14 @@ ja:
     goods: JA:Key:goods
     government: JA:Key:government
     grassland: JA:Key:grassland
+    group_only: JA:Key:group only
     guest_house: JA:Key:guest house
     guidepost: JA:Key:guidepost
     handrail: JA:Key:handrail
     happy_hours: JA:Key:happy hours
     harbour: JA:Key:harbour
+    harbour:category: JA:Key:harbour:category
+    hazard_prone: JA:Key:hazard prone
     hazard_type: JA:Key:hazard type
     hazmat: JA:Key:hazmat
     healthcare: JA:Key:healthcare
@@ -11429,7 +12631,9 @@ ja:
     ice_road: JA:Key:ice road
     ignore_for_routing: JA:Key:ignore for routing
     image: JA:Key:image
+    imagery_used: JA:Key:imagery used
     incline: JA:Key:incline
+    incline:across: JA:Key:incline:across
     indoor: JA:Key:indoor
     indoor_seating: JA:Key:indoor seating
     indoormark: JA:Key:indoormark
@@ -11443,6 +12647,7 @@ ja:
     intermittent: JA:Key:intermittent
     internet_access: JA:Key:internet access
     internet_access:fee: JA:Key:internet access:fee
+    interval: JA:Key:interval
     is_in: JA:Key:is in
     is_in:city: JA:Key:is in:city
     is_in:continent: JA:Key:is in:continent
@@ -11453,6 +12658,9 @@ ja:
     is_in:state: JA:Key:is in:state
     junction: JA:Key:junction
     kerb: JA:Key:kerb
+    kids_area: JA:Key:kids area
+    ladder: JA:Key:ladder
+    lamp_mount: JA:Key:lamp mount
     landmark: JA:Key:landmark
     landuse: JA:Key:landuse
     lanes: JA:Key:lanes
@@ -11468,6 +12676,7 @@ ja:
     leisure: JA:Key:leisure
     length: JA:Key:length
     level: JA:Key:level
+    lgbtq: JA:Key:lgbtq
     lit: JA:Key:lit
     living_street: JA:Key:living street
     loc_name: JA:Key:loc name
@@ -11476,10 +12685,16 @@ ja:
     location: JA:Key:location
     lock: JA:Key:lock
     lock_name: JA:Key:lock name
+    lockable: JA:Key:lockable
+    lottery: JA:Key:lottery
+    male: JA:Key:male
     man_made: JA:Key:man made
     managed: JA:Key:managed
     manhole: JA:Key:manhole
+    manufacturer: JA:Key:manufacturer
     manufacturer:type: JA:Key:manufacturer:type
+    mapillary: JA:Key:mapillary
+    massage: JA:Key:massage
     material: JA:Key:material
     max_age: JA:Key:max age
     maxaxleload: JA:Key:maxaxleload
@@ -11488,13 +12703,19 @@ ja:
     maxlength: JA:Key:maxlength
     maxspeed: JA:Key:maxspeed
     maxspeed:advisory: JA:Key:maxspeed:advisory
+    maxspeed:variable: JA:Key:maxspeed:variable
     maxstay: JA:Key:maxstay
     maxweight: JA:Key:maxweight
     maxwidth: JA:Key:maxwidth
     maxwidth:physical: JA:Key:maxwidth:physical
+    membership: JA:Key:membership
+    memorial: JA:Key:memorial
+    message: JA:Key:message
     microbrewery: JA:Key:microbrewery
+    milestone_type: JA:Key:milestone type
     military: JA:Key:military
     min_age: JA:Key:min age
+    min_height: JA:Key:min height
     minspeed: JA:Key:minspeed
     monitoring:air_quality: JA:Key:monitoring:air quality
     monitoring:gps: JA:Key:monitoring:gps
@@ -11510,10 +12731,12 @@ ja:
     motorhome: JA:Key:motorhome
     motorroad: JA:Key:motorroad
     mountain_pass: JA:Key:mountain pass
+    moved: JA:Key:moved
     mtb: JA:Key:mtb
     mtb:scale: JA:Key:mtb:scale
     mtb:scale:uphill: JA:Key:mtb:scale:uphill
     museum: JA:Key:museum
+    museum_type: JA:Key:museum type
     name: JA:Key:name
     name:cs: JA:Key:name:cs
     name:de: JA:Key:name:de
@@ -11533,8 +12756,11 @@ ja:
     network: JA:Key:network
     noexit: JA:Key:noexit
     noname: JA:Key:noname
+    noref: JA:Key:noref
     note: JA:Key:note
     note:ja: JA:Key:note:ja
+    nudism: JA:Key:nudism
+    obstacle: JA:Key:obstacle
     office: JA:Key:office
     official_name: JA:Key:official name
     official_ref: JA:Key:official ref
@@ -11542,9 +12768,11 @@ ja:
     old_ref: JA:Key:old ref
     oneway: JA:Key:oneway
     oneway:bicycle: JA:Key:oneway:bicycle
+    openbenches:id: JA:Key:openbenches:id
     openfire: JA:Key:openfire
     opening_date: JA:Key:opening date
     opening_hours: JA:Key:opening hours
+    openplaques:id: JA:Key:openplaques:id
     operator: JA:Key:operator
     operator:ja: JA:Key:operator:ja
     operator:type: JA:Key:operator:type
@@ -11554,6 +12782,7 @@ ja:
     outdoor_seating: JA:Key:outdoor seating
     overtaking: JA:Key:overtaking
     owner: JA:Key:owner
+    park_ride: JA:Key:park ride
     parking: JA:Key:parking
     parking:condition: JA:Key:parking:condition
     parking:lane: JA:Key:parking:lane
@@ -11562,12 +12791,16 @@ ja:
     payment: JA:Key:payment
     payment:coins: JA:Key:payment:coins
     phone: JA:Key:phone
+    pilgrimage: JA:Key:pilgrimage
     piste:difficulty: JA:Key:piste:difficulty
     piste:type: JA:Key:piste:type
     place: JA:Key:place
+    plant: JA:Key:plant
     plant:output: JA:Key:plant:output
     playground: JA:Key:playground
+    police: JA:Key:police
     population: JA:Key:population
+    post_box:type: JA:Key:post box:type
     postal_code: JA:Key:postal code
     power: JA:Key:power
     power_source: JA:Key:power source
@@ -11578,6 +12811,7 @@ ja:
     product: JA:Key:product
     proposed: JA:Key:proposed
     protect_class: JA:Key:protect class
+    protected: JA:Key:protected
     psv: JA:Key:psv
     public_bookcase:type: JA:Key:public bookcase:type
     public_transport: JA:Key:public transport
@@ -11589,9 +12823,12 @@ ja:
     railway:track_ref: JA:Key:railway:track ref
     ramp: JA:Key:ramp
     rcn_ref: JA:Key:rcn ref
+    real_fire: JA:Key:real fire
     recording: JA:Key:recording
     recycling_type: JA:Key:recycling type
+    reef: JA:Key:reef
     ref: JA:Key:ref
+    ref:cobe: JA:Key:ref:cobe
     ref:isil: JA:Key:ref:isil
     ref:shop:num: JA:Key:ref:shop:num
     ref:vatin: JA:Key:ref:vatin
@@ -11601,6 +12838,8 @@ ja:
     religion: JA:Key:religion
     removed: JA:Key:removed
     'removed:': 'JA:Key:removed:'
+    rental: JA:Key:rental
+    repair: JA:Key:repair
     reservation: JA:Key:reservation
     residential: JA:Key:residential
     resource: JA:Key:resource
@@ -11617,8 +12856,11 @@ ja:
     ruins: JA:Key:ruins
     sac_scale: JA:Key:sac scale
     salt: JA:Key:salt
+    sauna: JA:Key:sauna
     seamark:fixme: JA:Key:seamark:fixme
     seamark:type: JA:Key:seamark:type
+    seasonal: JA:Key:seasonal
+    seats: JA:Key:seats
     second_hand: JA:Key:second hand
     segregated: JA:Key:segregated
     self_service: JA:Key:self service
@@ -11626,11 +12868,14 @@ ja:
     service_times: JA:Key:service times
     shelter: JA:Key:shelter
     shelter_type: JA:Key:shelter type
+    shooting: JA:Key:shooting
     shop: JA:Key:shop
     short_name: JA:Key:short name
+    shoulder: JA:Key:shoulder
     shower: JA:Key:shower
     sides: JA:Key:sides
     sidewalk: JA:Key:sidewalk
+    sidewalk_orientation: JA:Key:sidewalk orientation
     size: JA:Key:size
     smokefree: JA:Key:smokefree
     smoking: JA:Key:smoking
@@ -11654,18 +12899,24 @@ ja:
     species: JA:Key:species
     speech_output: JA:Key:speech output
     sport: JA:Key:sport
+    stamps: JA:Key:stamps
     stars: JA:Key:stars
     start_date: JA:Key:start date
     station: JA:Key:station
+    step:contrast: JA:Key:step:contrast
     step_count: JA:Key:step count
     stile: JA:Key:stile
+    stone_type: JA:Key:stone type
     stream: JA:Key:stream
+    stroller: JA:Key:stroller
     substance: JA:Key:substance
     subway: JA:Key:subway
+    supervised: JA:Key:supervised
     support: JA:Key:support
     surface: JA:Key:surface
     surveillance: JA:Key:surveillance
     survey:date: JA:Key:survey:date
+    swimming_pool: JA:Key:swimming pool
     tactile_paving: JA:Key:tactile paving
     tactile_writing: JA:Key:tactile writing
     takeaway: JA:Key:takeaway
@@ -11674,20 +12925,31 @@ ja:
     taxon: JA:Key:taxon
     tenant: JA:Key:tenant
     tents: JA:Key:tents
+    theatre:type: JA:Key:theatre:type
     tickets:public_transport: JA:Key:tickets:public transport
     tickets:public_transport_subscription: JA:Key:tickets:public transport subscription
     tidal: JA:Key:tidal
+    to: JA:Key:to
+    tobacco: JA:Key:tobacco
     todo: JA:Key:todo
+    toilets: JA:Key:toilets
     toilets:wheelchair: JA:Key:toilets:wheelchair
     toll: JA:Key:toll
+    tomb: JA:Key:tomb
     tourism: JA:Key:tourism
+    tourist_bus: JA:Key:tourist bus
     tower:type: JA:Key:tower:type
+    townhall:type: JA:Key:townhall:type
     tracks: JA:Key:tracks
     tracktype: JA:Key:tracktype
+    traffic: JA:Key:traffic
     traffic_calming: JA:Key:traffic calming
     traffic_sign: JA:Key:traffic sign
     traffic_signals: JA:Key:traffic signals
+    traffic_signals:floor_vibration: JA:Key:traffic signals:floor vibration
+    traffic_signals:minimap: JA:Key:traffic signals:minimap
     traffic_signals:sound: JA:Key:traffic signals:sound
+    traffic_signals:vibration: JA:Key:traffic signals:vibration
     trail_visibility: JA:Key:trail visibility
     train: JA:Key:train
     tram: JA:Key:tram
@@ -11699,15 +12961,20 @@ ja:
     turn:lanes: JA:Key:turn:lanes
     twitter: JA:Key:twitter
     type: JA:Key:type
+    unisex: JA:Key:unisex
     unsigned_ref: JA:Key:unsigned ref
     url: JA:Key:url
     usage: JA:Key:usage
     vehicle: JA:Key:vehicle
+    viewpoint: JA:Key:viewpoint
     visibility: JA:Key:visibility
     voltage: JA:Key:voltage
+    washing_machine: JA:Key:washing machine
     waste: JA:Key:waste
     water: JA:Key:water
+    water_characteristic: JA:Key:water characteristic
     water_point: JA:Key:water point
+    water_source: JA:Key:water source
     waterway: JA:Key:waterway
     website: JA:Key:website
     wetland: JA:Key:wetland
@@ -11729,7 +12996,9 @@ ja:
     yh:WIDTH: JA:Key:yh:WIDTH
     yh:WIDTH_RANK: JA:Key:yh:WIDTH RANK
     zone:traffic: JA:Key:zone:traffic
+    zoo: JA:Key:zoo
   tag:
+    abandoned:amenity=prison: JA:Tag:abandoned:amenity=prison
     access=agricultural: JA:Tag:access=agricultural
     access=customers: JA:Tag:access=customers
     access=delivery: JA:Tag:access=delivery
@@ -11791,6 +13060,7 @@ 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=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
@@ -11809,6 +13079,7 @@ ja:
     amenity=bus_station: JA:Tag:amenity=bus station
     amenity=cafe: JA:Tag:amenity=cafe
     amenity=car_rental: JA:Tag:amenity=car rental
+    amenity=car_repair: JA:Tag:amenity=car repair
     amenity=car_sharing: JA:Tag:amenity=car sharing
     amenity=car_wash: JA:Tag:amenity=car wash
     amenity=casino: JA:Tag:amenity=casino
@@ -11853,6 +13124,7 @@ ja:
     amenity=library: JA:Tag:amenity=library
     amenity=love_hotel: JA:Tag:amenity=love hotel
     amenity=marketplace: JA:Tag:amenity=marketplace
+    amenity=microwave: JA:Tag:amenity=microwave
     amenity=monastery: JA:Tag:amenity=monastery
     amenity=motorcycle_parking: JA:Tag:amenity=motorcycle parking
     amenity=music_school: JA:Tag:amenity=music school
@@ -11861,13 +13133,17 @@ ja:
     amenity=parking: JA:Tag:amenity=parking
     amenity=parking_entrance: JA:Tag:amenity=parking entrance
     amenity=parking_space: JA:Tag:amenity=parking space
+    amenity=payment_terminal: JA:Tag:amenity=payment terminal
     amenity=pharmacy: JA:Tag:amenity=pharmacy
     amenity=photo_booth: JA:Tag:amenity=photo booth
     amenity=place_of_worship: JA:Tag:amenity=place of worship
     amenity=planetarium: JA:Tag:amenity=planetarium
     amenity=police: JA:Tag:amenity=police
+    amenity=polling_station: JA:Tag:amenity=polling station
     amenity=post_box: JA:Tag:amenity=post box
     amenity=post_office: JA:Tag:amenity=post office
+    amenity=prep_school: JA:Tag:amenity=prep school
+    amenity=printer: JA:Tag:amenity=printer
     amenity=prison: JA:Tag:amenity=prison
     amenity=pub: JA:Tag:amenity=pub
     amenity=public_bath: JA:Tag:amenity=public bath
@@ -11888,12 +13164,14 @@ ja:
     amenity=stripclub: JA:Tag:amenity=stripclub
     amenity=studio: JA:Tag:amenity=studio
     amenity=swimming_pool: JA:Tag:amenity=swimming pool
+    amenity=table: JA:Tag:amenity=table
     amenity=taxi: JA:Tag:amenity=taxi
     amenity=telephone: JA:Tag:amenity=telephone
     amenity=theatre: JA:Tag:amenity=theatre
     amenity=toilets: JA:Tag:amenity=toilets
     amenity=townhall: JA:Tag:amenity=townhall
     amenity=university: JA:Tag:amenity=university
+    amenity=vehicle_inspection: JA:Tag:amenity=vehicle inspection
     amenity=vending_machine: JA:Tag:amenity=vending machine
     amenity=veterinary: JA:Tag:amenity=veterinary
     amenity=waste_basket: JA:Tag:amenity=waste basket
@@ -11902,6 +13180,9 @@ ja:
     amenity=water: JA:Tag:amenity=water
     amenity=water_point: JA:Tag:amenity=water point
     amenity=watering_place: JA:Tag:amenity=watering place
+    amenity=winery: JA:Tag:amenity=winery
+    assembly_point:earthquake=yes: JA:Tag:assembly point:earthquake=yes
+    assembly_point:tsunami=yes: JA:Tag:assembly point:tsunami=yes
     atm=yes: JA:Tag:atm=yes
     attraction=animal: JA:Tag:attraction=animal
     attraction=train: JA:Tag:attraction=train
@@ -11930,6 +13211,8 @@ ja:
     barrier=toll_booth: JA:Tag:barrier=toll booth
     barrier=turnstile: JA:Tag:barrier=turnstile
     barrier=wall: JA:Tag:barrier=wall
+    bath:type=onsen: JA:Tag:bath:type=onsen
+    bay=fjord: JA:Tag:bay=fjord
     bicycle=designated: JA:Tag:bicycle=designated
     bicycle=use_sidepath: JA:Tag:bicycle=use sidepath
     boundary=administrative: JA:Tag:boundary=administrative
@@ -11974,10 +13257,12 @@ ja:
     building=bungalow: JA:Tag:building=bungalow
     building=bunker: JA:Tag:building=bunker
     building=cabin: JA:Tag:building=cabin
+    building=carport: JA:Tag:building=carport
     building=cathedral: JA:Tag:building=cathedral
     building=chapel: JA:Tag:building=chapel
     building=church: JA:Tag:building=church
     building=civic: JA:Tag:building=civic
+    building=college: JA:Tag:building=college
     building=commercial: JA:Tag:building=commercial
     building=construction: JA:Tag:building=construction
     building=cowshed: JA:Tag:building=cowshed
@@ -12052,6 +13337,7 @@ ja:
     craft=hvac: JA:Tag:craft=hvac
     craft=insulation: JA:Tag:craft=insulation
     craft=jeweller: JA:Tag:craft=jeweller
+    craft=joiner: JA:Tag:craft=joiner
     craft=key_cutter: JA:Tag:craft=key cutter
     craft=locksmith: JA:Tag:craft=locksmith
     craft=metal_construction: JA:Tag:craft=metal construction
@@ -12064,6 +13350,7 @@ ja:
     craft=plasterer: JA:Tag:craft=plasterer
     craft=plumber: JA:Tag:craft=plumber
     craft=pottery: JA:Tag:craft=pottery
+    craft=printer: JA:Tag:craft=printer
     craft=rigger: JA:Tag:craft=rigger
     craft=roofer: JA:Tag:craft=roofer
     craft=saddler: JA:Tag:craft=saddler
@@ -12072,6 +13359,7 @@ ja:
     craft=scaffolder: JA:Tag:craft=scaffolder
     craft=sculptor: JA:Tag:craft=sculptor
     craft=shoemaker: JA:Tag:craft=shoemaker
+    craft=signmaker: JA:Tag:craft=signmaker
     craft=stand_builder: JA:Tag:craft=stand builder
     craft=stonemason: JA:Tag:craft=stonemason
     craft=sun_protection: JA:Tag:craft=sun protection
@@ -12098,6 +13386,7 @@ ja:
     denomination=soto: JA:Tag:denomination=soto
     denomination=tiantai: JA:Tag:denomination=tiantai
     emergency=ambulance_station: JA:Tag:emergency=ambulance station
+    emergency=assembly_point: JA:Tag:emergency=assembly point
     emergency=defibrillator: JA:Tag:emergency=defibrillator
     emergency=fire_extinguisher: JA:Tag:emergency=fire extinguisher
     emergency=fire_hose: JA:Tag:emergency=fire hose
@@ -12112,6 +13401,7 @@ ja:
     foot=private: JA:Tag:foot=private
     footway=crossing: JA:Tag:footway=crossing
     footway=sidewalk: JA:Tag:footway=sidewalk
+    ford=stepping_stones: JA:Tag:ford=stepping stones
     generator:method=anaerobic_digestion: JA:Tag:generator:method=anaerobic digestion
     generator:method=barrage: JA:Tag:generator:method=barrage
     generator:method=combustion: JA:Tag:generator:method=combustion
@@ -12236,6 +13526,7 @@ ja:
     historic=ruins: JA:Tag:historic=ruins
     historic=rune_stone: JA:Tag:historic=rune stone
     historic=ship: JA:Tag:historic=ship
+    historic=stone: JA:Tag:historic=stone
     historic=tomb: JA:Tag:historic=tomb
     historic=tree_shrine: JA:Tag:historic=tree shrine
     historic=wayside_cross: JA:Tag:historic=wayside cross
@@ -12375,6 +13666,7 @@ ja:
     man_made=flagpole: JA:Tag:man made=flagpole
     man_made=flare: JA:Tag:man made=flare
     man_made=gasometer: JA:Tag:man made=gasometer
+    man_made=geoglyph: JA:Tag:man made=geoglyph
     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
@@ -12409,6 +13701,7 @@ ja:
     man_made=windmill: JA:Tag:man made=windmill
     man_made=windpump: JA:Tag:man made=windpump
     man_made=works: JA:Tag:man made=works
+    manhole=telecom: JA:Tag:manhole=telecom
     microbrewery=yes: JA:Tag:microbrewery=yes
     military=airfield: JA:Tag:military=airfield
     military=ammunition: JA:Tag:military=ammunition
@@ -12419,10 +13712,12 @@ ja:
     military=office: JA:Tag:military=office
     military=range: JA:Tag:military=range
     military=trench: JA:Tag:military=trench
+    natural=anthill: JA:Tag:natural=anthill
     natural=arete: JA:Tag:natural=arete
     natural=bare_rock: JA:Tag:natural=bare rock
     natural=bay: JA:Tag:natural=bay
     natural=beach: JA:Tag:natural=beach
+    natural=blowhole: JA:Tag:natural=blowhole
     natural=cave_entrance: JA:Tag:natural=cave entrance
     natural=cliff: JA:Tag:natural=cliff
     natural=coastline: JA:Tag:natural=coastline
@@ -12430,6 +13725,7 @@ ja:
     natural=fell: JA:Tag:natural=fell
     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=hot_spring: JA:Tag:natural=hot spring
@@ -12477,6 +13773,7 @@ ja:
     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=newspaper: JA:Tag:office=newspaper
     office=ngo: JA:Tag:office=ngo
     office=political_party: JA:Tag:office=political party
@@ -12561,6 +13858,8 @@ ja:
     religion=muslim: JA:Tag:religion=muslim
     religion=shinto: JA:Tag:religion=shinto
     residential=rural: JA:Tag:residential=rural
+    resource=sand: JA:Tag:resource=sand
+    roller_coaster=track: JA:Tag:roller coaster=track
     route=bicycle: JA:Tag:route=bicycle
     route=bus: JA:Tag:route=bus
     route=ferry: JA:Tag:route=ferry
@@ -12637,6 +13936,7 @@ ja:
     shop=fabric: JA:Tag:shop=fabric
     shop=farm: JA:Tag:shop=farm
     shop=fashion: JA:Tag:shop=fashion
+    shop=fashion_accessories: JA:Tag:shop=fashion accessories
     shop=fireplace: JA:Tag:shop=fireplace
     shop=fishing: JA:Tag:shop=fishing
     shop=fishmonger: JA:Tag:shop=fishmonger
@@ -12653,6 +13953,7 @@ ja:
     shop=gift: JA:Tag:shop=gift
     shop=glass: JA:Tag:shop=glass
     shop=glaziery: JA:Tag:shop=glaziery
+    shop=golf: JA:Tag:shop=golf
     shop=greengrocer: JA:Tag:shop=greengrocer
     shop=hairdresser: JA:Tag:shop=hairdresser
     shop=hardware: JA:Tag:shop=hardware
@@ -12738,6 +14039,7 @@ ja:
     shop=wholesale: JA:Tag:shop=wholesale
     shop=window_blind: JA:Tag:shop=window blind
     shop=wine: JA:Tag:shop=wine
+    shop=wool: JA:Tag:shop=wool
     shop=yes: JA:Tag:shop=yes
     ski=designated: JA:Tag:ski=designated
     snowmobile=designated: JA:Tag:snowmobile=designated
@@ -12794,6 +14096,7 @@ ja:
     tourism=wilderness_hut: JA:Tag:tourism=wilderness hut
     tourism=wine_cellar: JA:Tag:tourism=wine cellar
     tourism=zoo: JA:Tag:tourism=zoo
+    tower:construction=dish: JA:Tag:tower:construction=dish
     traffic_calming=island: JA:Tag:traffic calming=island
     traffic_calming=table: JA:Tag:traffic calming=table
     traffic_sign=city_limit: JA:Tag:traffic sign=city limit
@@ -12809,8 +14112,10 @@ ja:
     vending=parking_tickets: JA:Tag:vending=parking tickets
     vending=photo: JA:Tag:vending=photo
     wall=no: JA:Tag:wall=no
+    wall=noise_barrier: JA:Tag:wall=noise barrier
     water=intermittent: JA:Tag:water=intermittent
     water=lock: JA:Tag:water=lock
+    water=wastewater: JA:Tag:water=wastewater
     waterway=boat_lift: JA:Tag:waterway=boat lift
     waterway=boatyard: JA:Tag:waterway=boatyard
     waterway=brook: JA:Tag:waterway=brook
@@ -12851,20 +14156,33 @@ ko:
     aerialway: Ko:Key:aerialway
     amenity: Ko:Key:amenity
     crossing: Ko:Key:crossing
+    drink: Ko:Key:drink
     ele: Ko:Key:ele
     emergency: Ko:Key:emergency
     highway: Ko:Key:highway
     intermittent: Ko:Key:intermittent
     leisure: Ko:Key:leisure
+    level: Ko:Key:level
+    line: Ko:Key:line
     local_ref: Ko:Key:local ref
     name: Ko:Key:name
     operator:type: Ko:Key:operator:type
+    reservation: Ko:Key:reservation
+    self_service: Ko:Key:self service
+    smoothness: Ko:Key:smoothness
+    tenant: Ko:Key:tenant
+    townhall:type: Ko:Key:townhall:type
     tracktype: Ko:Key:tracktype
+    tunnel: Ko:Key:tunnel
+    turn: Ko:Key:turn
     wheelchair: Ko:Key:wheelchair
     wikipedia: Ko:Key:wikipedia
   tag:
+    access=designated: Ko:Tag:access=designated
     aerialway=cable_car: Ko:Tag:aerialway=cable car
     amenity=fuel: Ko:Tag:amenity=fuel
+    amenity=taxi: Ko:Tag:amenity=taxi
+    amenity=townhall: Ko:Tag:amenity=townhall
     barrier=kerb: Ko:Tag:barrier=kerb
     craft=tailor: Ko:Tag:craft=tailor
     ford=stepping_stones: Ko:Tag:ford=stepping stones
@@ -12872,20 +14190,31 @@ ko:
     highway=elevator: Ko:Tag:highway=elevator
     highway=motorway: Ko:Tag:highway=motorway
     highway=motorway_link: Ko:Tag:highway=motorway link
+    highway=path: Ko:Tag:highway=path
+    highway=primary: Ko:Tag:highway=primary
+    highway=secondary: Ko:Tag:highway=secondary
     highway=service: Ko:Tag:highway=service
     highway=services: Ko:Tag:highway=services
     highway=stop: Ko:Tag:highway=stop
+    highway=tertiary: Ko:Tag:highway=tertiary
     highway=track: Ko:Tag:highway=track
     highway=trunk: Ko:Tag:highway=trunk
     landuse=farmland: Ko:Tag:landuse=farmland
     landuse=retail: Ko:Tag:landuse=retail
     landuse=traffic_island: Ko:Tag:landuse=traffic island
     leisure=disc_golf_course: Ko:Tag:leisure=disc golf course
+    leisure=garden: Ko:Tag:leisure=garden
     man_made=mast: Ko:Tag:man made=mast
+    man_made=surveillance: Ko:Tag:man made=surveillance
+    natural=grassland: Ko:Tag:natural=grassland
+    natural=spring: Ko:Tag:natural=spring
     place=hamlet: Ko:Tag:place=hamlet
+    place=town: Ko:Tag:place=town
     shop=convenience: Ko:Tag:shop=convenience
+    shop=cosmetics: Ko:Tag:shop=cosmetics
     shop=garden_centre: Ko:Tag:shop=garden centre
     shop=gift: Ko:Tag:shop=gift
+    tourism=attraction: Ko:Tag:tourism=attraction
 lt:
   key:
     cycleway: Lt:Key:cycleway
@@ -12895,7 +14224,7 @@ lv:
 ms:
   tag:
     highway=motorway: Ms:Tag:highway=motorway
-    highway=primary: MS:Tag:highway=primary
+    highway=primary: Ms:Tag:highway=primary
     highway=residential: Ms:Tag:highway=residential
     highway=secondary: Ms:Tag:highway=secondary
     highway=service: Ms:Tag:highway=service
@@ -12923,6 +14252,7 @@ nl:
     backrest: NL:Key:backrest
     barrier: NL:Key:barrier
     bench: NL:Key:bench
+    bicycle: NL:Key:bicycle
     bicycle_road: NL:Key:bicycle road
     building: NL:Key:building
     circumference: NL:Key:circumference
@@ -12949,6 +14279,7 @@ nl:
     power_supply:schedule: NL:Key:power supply:schedule
     public_transport: NL:Key:public transport
     ref:bag: NL:Key:ref:bag
+    ref:bag:old: NL:Key:ref:bag:old
     religion: NL:Key:religion
     route_master: NL:Key:route master
     scenic: NL:Key:scenic
@@ -12992,6 +14323,8 @@ nl:
     leaf_cycle=deciduous: NL:Tag:leaf cycle=deciduous
     man_made=windmill: NL:Tag:man made=windmill
     natural=tree: NL:Tag:natural=tree
+    office=architect: NL:Tag:office=architect
+    office=yes: NL:Tag:office=yes
     public_transport=platform: NL:Tag:public transport=platform
     public_transport=station: NL:Tag:public transport=station
     public_transport=stop_area: NL:Tag:public transport=stop area
@@ -12999,6 +14332,7 @@ nl:
     shop=car: NL:Tag:shop=car
     shop=department_store: NL:Tag:shop=department store
     shop=greengrocer: NL:Tag:shop=greengrocer
+    shop=motorcycle: NL:Tag:shop=motorcycle
     tourism=chalet: NL:Tag:tourism=chalet
     vending=parking_tickets: NL:Tag:vending=parking tickets
     zoo=petting_zoo: NL:Tag:zoo=petting zoo
@@ -13031,40 +14365,65 @@ oc:
     name:oc: Oc:Key:name:oc
 pl:
   key:
+    3dr:type: Pl:Key:3dr:type
     4wd_only: Pl:Key:4wd only
     CEMT: Pl:Key:CEMT
     FIXME: Pl:Key:FIXME
+    abandoned: Pl:Key:abandoned
     'abandoned:': 'Pl:Key:abandoned:'
+    abandoned:railway: Pl:Key:abandoned:railway
     abutters: Pl:Key:abutters
     access: Pl:Key:access
+    actuator: Pl:Key:actuator
     addr: Pl:Key:addr
     addr:city: Pl:Key:addr:city
+    addr:country: Pl:Key:addr:country
     addr:county: Pl:Key:addr:county
+    addr:district: Pl:Key:addr:district
     addr:flats: Pl:Key:addr:flats
+    addr:floor: Pl:Key:addr:floor
+    addr:hamlet: Pl:Key:addr:hamlet
+    addr:housenumber: Pl:Key:addr:housenumber
     addr:municipality: Pl:Key:addr:municipality
     addr:place: Pl:Key:addr:place
+    addr:postcode: Pl:Key:addr:postcode
+    addr:province: Pl:Key:addr:province
+    addr:state: Pl:Key:addr:state
+    addr:street: Pl:Key:addr:street
+    addr:subdistrict: Pl:Key:addr:subdistrict
     addr:suburb: Pl:Key:addr:suburb
     addr:village: Pl:Key:addr:village
+    admin_level: Pl:Key:admin level
     adr_les: Pl:Key:adr les
     advertising: Pl:Key:advertising
     aerialway: Pl:Key:aerialway
+    aerialway:drag_lift: Pl:Key:aerialway:drag lift
     aeroway: Pl:Key:aeroway
+    agrarian: Pl:Key:agrarian
     agricultural: Pl:Key:agricultural
     alt_name: Pl:Key:alt name
     amenity: Pl:Key:amenity
+    architect: Pl:Key:architect
     area: Pl:Key:area
     area:highway: Pl:Key:area:highway
+    artist_name: Pl:Key:artist name
+    artwork_subject: Pl:Key:artwork subject
     artwork_type: Pl:Key:artwork type
     automated: Pl:Key:automated
     automatic_door: Pl:Key:automatic door
     backrest: Pl:Key:backrest
     bar: Pl:Key:bar
     barrier: Pl:Key:barrier
+    basin: Pl:Key:basin
+    bath:type: Pl:Key:bath:type
     beds: Pl:Key:beds
+    bell_tower: Pl:Key:bell tower
     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
     bollard: Pl:Key:bollard
     border_type: Pl:Key:border type
@@ -13088,25 +14447,41 @@ pl:
     building:use: Pl:Key:building:use
     bunker_type: Pl:Key:bunker type
     bus: Pl:Key:bus
+    busbar: Pl:Key:busbar
     busway: Pl:Key:busway
     button_operated: Pl:Key:button operated
+    cables: Pl:Key:cables
     capacity: Pl:Key:capacity
+    capital: Pl:Key:capital
+    cargo: Pl:Key:cargo
     castle_type: Pl:Key:castle type
     cemetery: Pl:Key:cemetery
+    check_date: Pl:Key:check date
+    circuits: Pl:Key:circuits
     circumference: Pl:Key:circumference
     club: Pl:Key:club
     colour: Pl:Key:colour
     comment: Pl:Key:comment
+    communication:microwave: Pl:Key:communication:microwave
     communication:mobile_phone: Pl:Key:communication:mobile phone
+    communication:radio: Pl:Key:communication:radio
+    communication:television: Pl:Key:communication:television
+    community_centre: Pl:Key:community centre
+    community_centre:for: Pl:Key:community centre:for
     construction: Pl:Key:construction
     construction_end_expected: Pl:Key:construction end expected
     construction_start_expected: Pl:Key:construction start expected
     contact: Pl:Key:contact
+    content: Pl:Key:content
+    conveying: Pl:Key:conveying
     country: Pl:Key:country
     covered: Pl:Key:covered
     craft: Pl:Key:craft
+    crane:type: Pl:Key:crane:type
     crop: Pl:Key:crop
     crossing: Pl:Key:crossing
+    crossing:island: Pl:Key:crossing:island
+    cuisine: Pl:Key:cuisine
     currency: Pl:Key:currency
     cutting: Pl:Key:cutting
     cycleway: Pl:Key:cycleway
@@ -13117,15 +14492,19 @@ pl:
     description: Pl:Key:description
     designation: Pl:Key:designation
     destination: Pl:Key:destination
+    diameter: Pl:Key:diameter
     diet: Pl:Key:diet
     'diet:': 'Pl:Key:diet:'
     diet:halal: Pl:Key:diet:halal
     diet:kosher: Pl:Key:diet:kosher
+    diet:vegan: Pl:Key:diet:vegan
+    diet:vegetarian: Pl:Key:diet:vegetarian
     diocese: Pl:Key:diocese
     diplomatic: Pl:Key:diplomatic
     direction: Pl:Key:direction
     dispensing: Pl:Key:dispensing
     distance: Pl:Key:distance
+    door: Pl:Key:door
     drink: Pl:Key:drink
     drinking_water: Pl:Key:drinking water
     driving_side: Pl:Key:driving side
@@ -13133,6 +14512,7 @@ pl:
     duration: Pl:Key:duration
     ele: Pl:Key:ele
     electrified: Pl:Key:electrified
+    email: Pl:Key:email
     embankment: Pl:Key:embankment
     emergency: Pl:Key:emergency
     end_date: Pl:Key:end date
@@ -13140,32 +14520,53 @@ pl:
     est_width: Pl:Key:est width
     fair_trade: Pl:Key:fair trade
     fee: Pl:Key:fee
+    female: Pl:Key:female
     fence_type: Pl:Key:fence type
+    field: Pl:Key:field
     fire_boundary: Pl:Key:fire boundary
+    fire_hydrant: Pl:Key:fire hydrant
     fishing: Pl:Key:fishing
     fixme: Pl:Key:fixme
+    floating: Pl:Key:floating
     flood_mark: Pl:Key:flood mark
     flood_prone: Pl:Key:flood prone
     foot: Pl:Key:foot
     footway: Pl:Key:footway
     ford: Pl:Key:ford
+    fortification_type: Pl:Key:fortification type
+    fountain: Pl:Key:fountain
+    fridge: Pl:Key:fridge
     fuel: Pl:Key:fuel
+    gambling: Pl:Key:gambling
+    garden:style: Pl:Key:garden:style
+    garden:type: Pl:Key:garden:type
     gauge: Pl:Key:gauge
     generator:output: Pl:Key:generator:output
     genus: Pl:Key:genus
+    geological: Pl:Key:geological
+    government: Pl:Key:government
     handrail: Pl:Key:handrail
     healthcare: Pl:Key:healthcare
+    healthcare:speciality: Pl:Key:healthcare:speciality
     height: Pl:Key:height
+    heritage: Pl:Key:heritage
     hgv: Pl:Key:hgv
     highway: Pl:Key:highway
+    highway:category:pl: Pl:Key:highway:category:pl
+    highway:class:pl: Pl:Key:highway:class:pl
     highway_(propozycja_zmian): Pl:Key:highway (propozycja zmian)
     historic: Pl:Key:historic
+    historic:civilization: Pl:Key:historic:civilization
+    historic:era: Pl:Key:historic:era
+    historic:period: Pl:Key:historic:period
     horse: Pl:Key:horse
     ice_road: Pl:Key:ice road
     incline: Pl:Key:incline
+    indoor: Pl:Key:indoor
     industrial: Pl:Key:industrial
     information: Pl:Key:information
     inscription: Pl:Key:inscription
+    int_name: Pl:Key:int name
     intermittent: Pl:Key:intermittent
     internet_access: Pl:Key:internet access
     is_in: Pl:Key:is in
@@ -13186,22 +14587,32 @@ pl:
     is_in:suburb: Pl:Key:is in:suburb
     is_in:town: Pl:Key:is in:town
     is_in:village: Pl:Key:is in:village
+    isced:level: Pl:Key:isced:level
     junction: Pl:Key:junction
     kerb: Pl:Key:kerb
+    landfill:waste: Pl:Key:landfill:waste
+    landmark: Pl:Key:landmark
     landuse: Pl:Key:landuse
     lanes: Pl:Key:lanes
     lanes:psv: Pl:Key:lanes:psv
     layer: Pl:Key:layer
+    leaf_cycle: Pl:Key:leaf cycle
     leaf_type: Pl:Key:leaf type
     leisure: Pl:Key:leisure
     length: Pl:Key:length
+    level: Pl:Key:level
     lit: Pl:Key:lit
+    loc_name: Pl:Key:loc name
+    loc_ref: Pl:Key:loc ref
     location: Pl:Key:location
     lock: Pl:Key:lock
     lock_name: Pl:Key:lock name
+    male: Pl:Key:male
     man_made: Pl:Key:man made
     manhole: Pl:Key:manhole
+    material: Pl:Key:material
     max_age: Pl:Key:max age
+    maxage: Pl:Key:maxage
     maxaxleload: Pl:Key:maxaxleload
     maxheight: Pl:Key:maxheight
     maxheight:legal: Pl:Key:maxheight:legal
@@ -13214,10 +14625,13 @@ pl:
     maxweight: Pl:Key:maxweight
     maxwidth: Pl:Key:maxwidth
     maxwidth:physical: Pl:Key:maxwidth:physical
+    megalith_type: Pl:Key:megalith type
+    memorial: Pl:Key:memorial
     memorial:type: Pl:Key:memorial:type
     military: Pl:Key:military
     min_age: Pl:Key:min age
     min_height: Pl:Key:min height
+    minage: Pl:Key:minage
     minspeed: Pl:Key:minspeed
     mofa: Pl:Key:mofa
     monitoring:air_quality: Pl:Key:monitoring:air quality
@@ -13227,15 +14641,24 @@ pl:
     motorcycle: Pl:Key:motorcycle
     motorroad: Pl:Key:motorroad
     mountain_pass: Pl:Key:mountain pass
+    moved: Pl:Key:moved
     name: Pl:Key:name
+    name:etymology: Pl:Key:name:etymology
+    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
     office: Pl:Key:office
+    old_name: Pl:Key:old name
+    old_ref: Pl:Key:old ref
     oneway: Pl:Key:oneway
+    opening_date: Pl:Key:opening date
     opening_hours: Pl:Key:opening hours
     operator: Pl:Key:operator
+    operator:type: Pl:Key:operator:type
     organic: Pl:Key:organic
     overtaking: Pl:Key:overtaking
     owner: Pl:Key:owner
@@ -13244,11 +14667,15 @@ pl:
     parking: Pl:Key:parking
     parking:lane: Pl:Key:parking:lane
     passing_places: Pl:Key:passing places
+    pipeline: Pl:Key:pipeline
     place: Pl:Key:place
     place_name: Pl:Key:place name
+    placement: Pl:Key:placement
     playground: Pl:Key:playground
     population: Pl:Key:population
+    post_box:type: Pl:Key:post box:type
     power: Pl:Key:power
+    pressure: Pl:Key:pressure
     priority: Pl:Key:priority
     produce: Pl:Key:produce
     product: Pl:Key:product
@@ -13263,11 +14690,18 @@ pl:
     razed: Pl:Key:razed
     'razed:': 'Pl:Key:razed:'
     recycling_type: Pl:Key:recycling type
+    reef: Pl:Key:reef
+    ref: Pl:Key:ref
+    reference_point: Pl:Key:reference point
+    reg_ref: Pl:Key:reg ref
     religion: Pl:Key:religion
     'removed:': 'Pl:Key:removed:'
     repair: Pl:Key:repair
+    repeat_on: Pl:Key:repeat on
+    residential: Pl:Key:residential
     resource: Pl:Key:resource
     roof:material: Pl:Key:roof:material
+    room: Pl:Key:room
     route: Pl:Key:route
     route_master: Pl:Key:route master
     'ruined:': 'Pl:Key:ruined:'
@@ -13275,13 +14709,20 @@ pl:
     'ruins:': 'Pl:Key:ruins:'
     sac_scale: Pl:Key:sac scale
     seamark:fixme: Pl:Key:seamark:fixme
+    seasonal: Pl:Key:seasonal
     second_hand: Pl:Key:second hand
+    segregated: Pl:Key:segregated
     service: Pl:Key:service
     service_times: Pl:Key:service times
     shelter: Pl:Key:shelter
     shelter_type: Pl:Key:shelter type
     shop: Pl:Key:shop
+    shower: Pl:Key:shower
     sidewalk: Pl:Key:sidewalk
+    site_type: Pl:Key:site type
+    size: Pl:Key:size
+    smokefree: Pl:Key:smokefree
+    smoking: Pl:Key:smoking
     smoothness: Pl:Key:smoothness
     social_facility: Pl:Key:social facility
     social_facility:for: Pl:Key:social facility:for
@@ -13289,9 +14730,15 @@ pl:
     source:maxspeed: Pl:Key:source:maxspeed
     species: Pl:Key:species
     sport: Pl:Key:sport
+    stairs: Pl:Key:stairs
     start_date: Pl:Key:start date
     step_count: Pl:Key:step count
+    stone_type: Pl:Key:stone type
     strapline: Pl:Key:strapline
+    subsea: Pl:Key:subsea
+    substance: Pl:Key:substance
+    supervised: Pl:Key:supervised
+    support: Pl:Key:support
     surface: Pl:Key:surface
     surveillance: Pl:Key:surveillance
     surveillance:type: Pl:Key:surveillance:type
@@ -13300,11 +14747,16 @@ pl:
     tactile_paving: Pl:Key:tactile paving
     target: Pl:Key:target
     taxon: Pl:Key:taxon
+    tents: Pl:Key:tents
+    tidal: Pl:Key:tidal
     toilets: Pl:Key:toilets
     toilets:wheelchair: Pl:Key:toilets:wheelchair
     toll: Pl:Key:toll
     tomb: Pl:Key:tomb
     tourism: Pl:Key:tourism
+    tower:construction: Pl:Key:tower:construction
+    tower:type: Pl:Key:tower:type
+    tracks: Pl:Key:tracks
     tracktype: Pl:Key:tracktype
     traffic_calming: Pl:Key:traffic calming
     traffic_signals: Pl:Key:traffic signals
@@ -13318,29 +14770,40 @@ pl:
     trailer: Pl:Key:trailer
     train: Pl:Key:train
     tram: Pl:Key:tram
+    trees: Pl:Key:trees
+    trolley_wire: Pl:Key:trolley wire
     trolleybus: Pl:Key:trolleybus
     tunnel: Pl:Key:tunnel
     turn: Pl:Key:turn
     turn:lanes: Pl:Key:turn:lanes
     type: Pl:Key:type
+    unisex: Pl:Key:unisex
     url: Pl:Key:url
     usage: Pl:Key:usage
     vehicle: Pl:Key:vehicle
     voltage: Pl:Key:voltage
     washing_machine: Pl:Key:washing machine
+    waste: Pl:Key:waste
     water: Pl:Key:water
+    water_characteristic: Pl:Key:water characteristic
+    water_point: Pl:Key:water point
     waterway: Pl:Key:waterway
     website: Pl:Key:website
     wetland: Pl:Key:wetland
     wheelchair: Pl:Key:wheelchair
+    wheelchair:description: Pl:Key:wheelchair:description
     wholesale: Pl:Key:wholesale
     width: Pl:Key:width
     wikipedia: Pl:Key:wikipedia
     winter_road: Pl:Key:winter road
+    wires: Pl:Key:wires
     wood: Pl:Key:wood
+    xmas:feature: Pl:Key:xmas:feature
     zone:traffic: Pl:Key:zone:traffic
     zoo: Pl:Key:zoo
   tag:
+    abandoned:amenity=prison: Pl:Tag:abandoned:amenity=prison
+    abandoned:amenity=prison_camp: Pl:Tag:abandoned:amenity=prison camp
     access=customers: Pl:Tag:access=customers
     access=designated: Pl:Tag:access=designated
     access=exclusion_zone: Pl:Tag:access=exclusion zone
@@ -13348,6 +14811,7 @@ pl:
     access=no: Pl:Tag:access=no
     access=official: Pl:Tag:access=official
     access=private: Pl:Tag:access=private
+    actuator=hydraulic_cylinder: Pl:Tag:actuator=hydraulic cylinder
     advertising=billboard: Pl:Tag:advertising=billboard
     advertising=board: Pl:Tag:advertising=board
     advertising=column: Pl:Tag:advertising=column
@@ -13385,14 +14849,27 @@ pl:
     amenity=car_pooling: Pl:Tag:amenity=car pooling
     amenity=car_wash: Pl:Tag:amenity=car wash
     amenity=casino: Pl:Tag:amenity=casino
+    amenity=charging_station: Pl:Tag:amenity=charging station
+    amenity=childcare: Pl:Tag:amenity=childcare
+    amenity=cinema: Pl:Tag:amenity=cinema
     amenity=clinic: Pl:Tag:amenity=clinic
+    amenity=cloakroom: Pl:Tag:amenity=cloakroom
+    amenity=clock: Pl:Tag:amenity=clock
+    amenity=coast_guard: Pl:Tag:amenity=coast guard
     amenity=college: Pl:Tag:amenity=college
+    amenity=community_centre: Pl:Tag:amenity=community centre
     amenity=compressed_air: Pl:Tag:amenity=compressed air
+    amenity=concert_hall: Pl:Tag:amenity=concert hall
+    amenity=concession_stand: Pl:Tag:amenity=concession stand
     amenity=conference_centre: Pl:Tag:amenity=conference centre
+    amenity=courthouse: Pl:Tag:amenity=courthouse
     amenity=coworking_space: Pl:Tag:amenity=coworking space
     amenity=crematorium: Pl:Tag:amenity=crematorium
     amenity=crypt: Pl:Tag:amenity=crypt
+    amenity=customs: Pl:Tag:amenity=customs
     amenity=dentist: Pl:Tag:amenity=dentist
+    amenity=device_charging_station: Pl:Tag:amenity=device charging station
+    amenity=dive_centre: Pl:Tag:amenity=dive centre
     amenity=doctors: Pl:Tag:amenity=doctors
     amenity=drinking_water: Pl:Tag:amenity=drinking water
     amenity=driving_school: Pl:Tag:amenity=driving school
     amenity=fast_food: Pl:Tag:amenity=fast food
     amenity=feeding_place: Pl:Tag:amenity=feeding place
     amenity=ferry_terminal: Pl:Tag:amenity=ferry terminal
+    amenity=festival_grounds: Pl:Tag:amenity=festival grounds
+    amenity=financial_advice: Pl:Tag:amenity=financial advice
     amenity=fire_station: Pl:Tag:amenity=fire station
     amenity=food_court: Pl:Tag:amenity=food court
+    amenity=fountain: Pl:Tag:amenity=fountain
+    amenity=fridge: Pl:Tag:amenity=fridge
     amenity=fuel: Pl:Tag:amenity=fuel
+    amenity=gambling: Pl:Tag:amenity=gambling
     amenity=game_feeding: Pl:Tag:amenity=game feeding
     amenity=grave_yard: Pl:Tag:amenity=grave yard
+    amenity=grit_bin: Pl:Tag:amenity=grit bin
     amenity=hookah_lounge: Pl:Tag:amenity=hookah lounge
+    amenity=hospice: Pl:Tag:amenity=hospice
     amenity=hospital: Pl:Tag:amenity=hospital
     amenity=hunting_stand: Pl:Tag:amenity=hunting stand
     amenity=ice_cream: Pl:Tag:amenity=ice cream
+    amenity=internet_cafe: Pl:Tag:amenity=internet cafe
     amenity=kindergarten: Pl:Tag:amenity=kindergarten
+    amenity=language_school: Pl:Tag:amenity=language school
     amenity=lavoir: Pl:Tag:amenity=lavoir
+    amenity=letter_box: Pl:Tag:amenity=letter box
     amenity=library: Pl:Tag:amenity=library
+    amenity=loading_dock: Pl:Tag:amenity=loading dock
     amenity=lounger: Pl:Tag:amenity=lounger
     amenity=marketplace: Pl:Tag:amenity=marketplace
+    amenity=monastery: Pl:Tag:amenity=monastery
+    amenity=money_transfer: Pl:Tag:amenity=money transfer
     amenity=mortuary: Pl:Tag:amenity=mortuary
+    amenity=motorcycle_parking: Pl:Tag:amenity=motorcycle parking
+    amenity=motorcycle_rental: Pl:Tag:amenity=motorcycle rental
+    amenity=music_school: Pl:Tag:amenity=music school
     amenity=music_venue: Pl:Tag:amenity=music venue
     amenity=nightclub: Pl:Tag:amenity=nightclub
+    amenity=nursing_home: Pl:Tag:amenity=nursing home
     amenity=parking: Pl:Tag:amenity=parking
     amenity=parking_entrance: Pl:Tag:amenity=parking entrance
     amenity=parking_space: Pl:Tag:amenity=parking space
     amenity=payment_centre: Pl:Tag:amenity=payment centre
     amenity=pharmacy: Pl:Tag:amenity=pharmacy
+    amenity=photo_booth: Pl:Tag:amenity=photo booth
     amenity=place_of_worship: Pl:Tag:amenity=place of worship
+    amenity=planetarium: Pl:Tag:amenity=planetarium
+    amenity=police: Pl:Tag:amenity=police
+    amenity=polling_station: Pl:Tag:amenity=polling station
     amenity=post_box: Pl:Tag:amenity=post box
     amenity=post_office: Pl:Tag:amenity=post office
     amenity=prison: Pl:Tag:amenity=prison
+    amenity=prison_camp: Pl:Tag:amenity=prison camp
     amenity=pub: Pl:Tag:amenity=pub
+    amenity=public_bath: Pl:Tag:amenity=public bath
     amenity=public_bookcase: Pl:Tag:amenity=public bookcase
+    amenity=public_building: Pl:Tag:amenity=public building
+    amenity=ranger_station: Pl:Tag:amenity=ranger station
     amenity=recycling: Pl:Tag:amenity=recycling
+    amenity=refugee_housing: Pl:Tag:amenity=refugee housing
+    amenity=research_institute: Pl:Tag:amenity=research institute
     amenity=restaurant: Pl:Tag:amenity=restaurant
+    amenity=sanitary_dump_station: Pl:Tag:amenity=sanitary dump station
+    amenity=sauna: Pl:Tag:amenity=sauna
     amenity=school: Pl:Tag:amenity=school
     amenity=shelter: Pl:Tag:amenity=shelter
+    amenity=shop: Pl:Tag:amenity=shop
     amenity=shower: Pl:Tag:amenity=shower
+    amenity=smoking_area: Pl:Tag:amenity=smoking area
     amenity=snow_removal_station: Pl:Tag:amenity=snow removal station
+    amenity=social_centre: Pl:Tag:amenity=social centre
     amenity=social_facility: Pl:Tag:amenity=social facility
+    amenity=stripclub: Pl:Tag:amenity=stripclub
+    amenity=studio: Pl:Tag:amenity=studio
+    amenity=table: Pl:Tag:amenity=table
     amenity=taxi: Pl:Tag:amenity=taxi
+    amenity=theatre: Pl:Tag:amenity=theatre
+    amenity=ticket_validator: Pl:Tag:amenity=ticket validator
     amenity=toilets: Pl:Tag:amenity=toilets
+    amenity=tourist_bus_parking: Pl:Tag:amenity=tourist bus parking
+    amenity=townhall: Pl:Tag:amenity=townhall
     amenity=university: Pl:Tag:amenity=university
+    amenity=vacuum_cleaner: Pl:Tag:amenity=vacuum cleaner
     amenity=vehicle_inspection: Pl:Tag:amenity=vehicle inspection
     amenity=vehicle_ramp: Pl:Tag:amenity=vehicle ramp
     amenity=vending_machine: Pl:Tag:amenity=vending machine
     amenity=veterinary: Pl:Tag:amenity=veterinary
     amenity=washing_machine: Pl:Tag:amenity=washing machine
+    amenity=waste_basket: Pl:Tag:amenity=waste basket
     amenity=waste_disposal: Pl:Tag:amenity=waste disposal
+    amenity=waste_transfer_station: Pl:Tag:amenity=waste transfer station
     amenity=water_point: Pl:Tag:amenity=water point
     area:highway=cycleway: Pl:Tag:area:highway=cycleway
     area:highway=footway: Pl:Tag:area:highway=footway
     area:highway=path: Pl:Tag:area:highway=path
     area:highway=pedestrian: Pl:Tag:area:highway=pedestrian
+    artwork_type=sculpture: Pl:Tag:artwork type=sculpture
+    artwork_type=statue: Pl:Tag:artwork type=statue
     atm=no: Pl:Tag:atm=no
     atm=yes: Pl:Tag:atm=yes
     attraction=animal: Pl:Tag:attraction=animal
+    attraction=summer_toboggan: Pl:Tag:attraction=summer toboggan
     attraction=train: Pl:Tag:attraction=train
     barrier=block: Pl:Tag:barrier=block
     barrier=bollard: Pl:Tag:barrier=bollard
@@ -13474,6 +14996,7 @@ pl:
     barrier=kerb: Pl:Tag:barrier=kerb
     barrier=lift_gate: Pl:Tag:barrier=lift gate
     barrier=retaining_wall: Pl:Tag:barrier=retaining wall
+    barrier=sally_port: Pl:Tag:barrier=sally port
     barrier=spikes: Pl:Tag:barrier=spikes
     barrier=toll_booth: Pl:Tag:barrier=toll booth
     barrier=turnstile: Pl:Tag:barrier=turnstile
@@ -13516,9 +15039,13 @@ pl:
     bridge=simple_brunnel: Pl:Tag:bridge=simple brunnel
     bridge=trestle: Pl:Tag:bridge=trestle
     bridge=viaduct: Pl:Tag:bridge=viaduct
+    building=allotment_house: Pl:Tag:building=allotment house
     building=apartments: Pl:Tag:building=apartments
     building=barn: Pl:Tag:building=barn
+    building=boathouse: Pl:Tag:building=boathouse
+    building=brewery: Pl:Tag:building=brewery
     building=bridge: Pl:Tag:building=bridge
+    building=bungalow: Pl:Tag:building=bungalow
     building=bunker: Pl:Tag:building=bunker
     building=cabin: Pl:Tag:building=cabin
     building=carport: Pl:Tag:building=carport
@@ -13526,8 +15053,11 @@ pl:
     building=chapel: Pl:Tag:building=chapel
     building=church: Pl:Tag:building=church
     building=civic: Pl:Tag:building=civic
+    building=college: Pl:Tag:building=college
     building=commercial: Pl:Tag:building=commercial
+    building=conservatory: Pl:Tag:building=conservatory
     building=construction: Pl:Tag:building=construction
+    building=container: Pl:Tag:building=container
     building=cowshed: Pl:Tag:building=cowshed
     building=detached: Pl:Tag:building=detached
     building=dormitory: Pl:Tag:building=dormitory
@@ -13542,11 +15072,16 @@ pl:
     building=hospital: Pl:Tag:building=hospital
     building=hotel: Pl:Tag:building=hotel
     building=house: Pl:Tag:building=house
+    building=houseboat: Pl:Tag:building=houseboat
     building=hut: Pl:Tag:building=hut
     building=industrial: Pl:Tag:building=industrial
+    building=kindergarten: Pl:Tag:building=kindergarten
+    building=kiosk: Pl:Tag:building=kiosk
     building=manufacture: Pl:Tag:building=manufacture
     building=mosque: Pl:Tag:building=mosque
     building=office: Pl:Tag:building=office
+    building=parking: Pl:Tag:building=parking
+    building=pavilion: Pl:Tag:building=pavilion
     building=public: Pl:Tag:building=public
     building=residential: Pl:Tag:building=residential
     building=retail: Pl:Tag:building=retail
@@ -13554,18 +15089,29 @@ pl:
     building=roof: Pl:Tag:building=roof
     building=ruins: Pl:Tag:building=ruins
     building=school: Pl:Tag:building=school
+    building=semidetached_house: Pl:Tag:building=semidetached house
     building=service: Pl:Tag:building=service
     building=shed: Pl:Tag:building=shed
+    building=shrine: Pl:Tag:building=shrine
+    building=slurry_tank: Pl:Tag:building=slurry tank
+    building=sports_centre: Pl:Tag:building=sports centre
+    building=sports_hall: Pl:Tag:building=sports hall
     building=stable: Pl:Tag:building=stable
+    building=stadium: Pl:Tag:building=stadium
+    building=static_caravan: Pl:Tag:building=static caravan
+    building=stilt_house: Pl:Tag:building=stilt house
     building=sty: Pl:Tag:building=sty
     building=supermarket: Pl:Tag:building=supermarket
     building=synagogue: Pl:Tag:building=synagogue
+    building=temple: Pl:Tag:building=temple
     building=terrace: Pl:Tag:building=terrace
     building=toilets: Pl:Tag:building=toilets
     building=train_station: Pl:Tag:building=train station
+    building=transformer_tower: Pl:Tag:building=transformer tower
     building=transportation: Pl:Tag:building=transportation
     building=university: Pl:Tag:building=university
     building=warehouse: Pl:Tag:building=warehouse
+    building=water_tower: Pl:Tag:building=water tower
     bunker_type=gun_emplacement: Pl:Tag:bunker type=gun emplacement
     bunker_type=technical: Pl:Tag:bunker type=technical
     busway=lane: Pl:Tag:busway=lane
@@ -13589,18 +15135,39 @@ pl:
     craft=brewery: Pl:Tag:craft=brewery
     craft=builder: Pl:Tag:craft=builder
     craft=cabinet_maker: Pl:Tag:craft=cabinet maker
+    craft=car_repair: Pl:Tag:craft=car repair
+    craft=carpenter: Pl:Tag:craft=carpenter
     craft=caterer: Pl:Tag:craft=caterer
+    craft=chimney_sweeper: Pl:Tag:craft=chimney sweeper
+    craft=clockmaker: Pl:Tag:craft=clockmaker
+    craft=dental_technician: Pl:Tag:craft=dental technician
+    craft=distillery: Pl:Tag:craft=distillery
+    craft=dressmaker: Pl:Tag:craft=dressmaker
+    craft=electrician: Pl:Tag:craft=electrician
+    craft=electronics_repair: Pl:Tag:craft=electronics repair
     craft=embroiderer: Pl:Tag:craft=embroiderer
     craft=engraver: Pl:Tag:craft=engraver
+    craft=gardener: Pl:Tag:craft=gardener
+    craft=glaziery: Pl:Tag:craft=glaziery
     craft=grinding_mill: Pl:Tag:craft=grinding mill
+    craft=handicraft: Pl:Tag:craft=handicraft
     craft=hvac: Pl:Tag:craft=hvac
+    craft=information_electronics: Pl:Tag:craft=information electronics
+    craft=jeweller: Pl:Tag:craft=jeweller
+    craft=joiner: Pl:Tag:craft=joiner
     craft=oil_mill: Pl:Tag:craft=oil mill
     craft=painter: Pl:Tag:craft=painter
+    craft=pottery: Pl:Tag:craft=pottery
     craft=roofer: Pl:Tag:craft=roofer
     craft=sawmill: Pl:Tag:craft=sawmill
     craft=shoemaker: Pl:Tag:craft=shoemaker
     craft=stonemason: Pl:Tag:craft=stonemason
+    craft=sun_protection: Pl:Tag:craft=sun protection
+    craft=tailor: Pl:Tag:craft=tailor
+    craft=watchmaker: Pl:Tag:craft=watchmaker
+    craft=window_construction: Pl:Tag:craft=window construction
     craft=winery: Pl:Tag:craft=winery
+    cuisine=coffee_shop: Pl:Tag:cuisine=coffee shop
     cycleway=lane: Pl:Tag:cycleway=lane
     cycleway=opposite: Pl:Tag:cycleway=opposite
     cycleway=opposite_lane: Pl:Tag:cycleway=opposite lane
@@ -13608,22 +15175,30 @@ pl:
     cycleway=share_busway: Pl:Tag:cycleway=share busway
     cycleway=track: Pl:Tag:cycleway=track
     emergency=aed: Pl:Tag:emergency=aed
+    emergency=ambulance_station: Pl:Tag:emergency=ambulance station
     emergency=defibrillator: Pl:Tag:emergency=defibrillator
+    emergency=emergency_ward_entrance: Pl:Tag:emergency=emergency ward entrance
+    emergency=fire_alarm_box: Pl:Tag:emergency=fire alarm box
     emergency=fire_extinguisher: Pl:Tag:emergency=fire extinguisher
     emergency=fire_flapper: Pl:Tag:emergency=fire flapper
     emergency=fire_hose: Pl:Tag:emergency=fire hose
     emergency=fire_hydrant: Pl:Tag:emergency=fire hydrant
     emergency=fire_water_pond: Pl:Tag:emergency=fire water pond
+    emergency=landing_site: Pl:Tag:emergency=landing site
     emergency=lifeguard_base: Pl:Tag:emergency=lifeguard base
     emergency=lifeguard_place: Pl:Tag:emergency=lifeguard place
     emergency=lifeguard_platform: Pl:Tag:emergency=lifeguard platform
     emergency=lifeguard_tower: Pl:Tag:emergency=lifeguard tower
     emergency=phone: Pl:Tag:emergency=phone
     emergency=suction_point: Pl:Tag:emergency=suction point
+    emergency=water_rescue_station: Pl:Tag:emergency=water rescue station
     emergency=water_tank: Pl:Tag:emergency=water tank
+    entrance=main: Pl:Tag:entrance=main
     footway=crossing: Pl:Tag:footway=crossing
     footway=sidewalk: Pl:Tag:footway=sidewalk
     ford=stepping_stones: Pl:Tag:ford=stepping stones
+    garden:type=botanical: Pl:Tag:garden:type=botanical
+    geological=moraine: Pl:Tag:geological=moraine
     government=ministry: Pl:Tag:government=ministry
     government=prosecutor: Pl:Tag:government=prosecutor
     healthcare=laboratory: Pl:Tag:healthcare=laboratory
@@ -13645,7 +15220,6 @@ pl:
     highway=milestone: Pl:Tag:highway=milestone
     highway=mini_roundabout: Pl:Tag:highway=mini roundabout
     highway=motorway: Pl:Tag:highway=motorway
-    highway=motorway_(propozycja_zmian): Pl:Tag:highway=motorway (propozycja zmian)
     highway=motorway_junction: Pl:Tag:highway=motorway junction
     highway=motorway_link: Pl:Tag:highway=motorway link
     highway=passing_place: Pl:Tag:highway=passing place
@@ -13671,42 +15245,70 @@ pl:
     highway=track: Pl:Tag:highway=track
     highway=traffic_mirror: Pl:Tag:highway=traffic mirror
     highway=traffic_signals: Pl:Tag:highway=traffic signals
+    highway=trailhead: Pl:Tag:highway=trailhead
     highway=trunk: Pl:Tag:highway=trunk
     highway=trunk_link: Pl:Tag:highway=trunk link
     highway=turning_circle: Pl:Tag:highway=turning circle
     highway=turning_loop: Pl:Tag:highway=turning loop
     highway=unclassified: Pl:Tag:highway=unclassified
+    historic=aircraft: Pl:Tag:historic=aircraft
+    historic=archaeological_site: Pl:Tag:historic=archaeological site
     historic=battlefield: Pl:Tag:historic=battlefield
     historic=city_gate: Pl:Tag:historic=city gate
+    historic=heritage: Pl:Tag:historic=heritage
     historic=memorial: Pl:Tag:historic=memorial
     historic=monument: Pl:Tag:historic=monument
     historic=ruins: Pl:Tag:historic=ruins
+    historic=stone: Pl:Tag:historic=stone
     historic=tomb: Pl:Tag:historic=tomb
     historic=tree_shrine: Pl:Tag:historic=tree shrine
     historic=wayside_cross: Pl:Tag:historic=wayside cross
     historic=wayside_shrine: Pl:Tag:historic=wayside shrine
     industrial=aluminium_smelting: Pl:Tag:industrial=aluminium smelting
+    industrial=auto_wrecker: Pl:Tag:industrial=auto wrecker
     industrial=bakery: Pl:Tag:industrial=bakery
     industrial=brewery: Pl:Tag:industrial=brewery
+    industrial=brickyard: Pl:Tag:industrial=brickyard
+    industrial=depot: Pl:Tag:industrial=depot
+    industrial=distributor: Pl:Tag:industrial=distributor
+    industrial=factory: Pl:Tag:industrial=factory
     industrial=furniture: Pl:Tag:industrial=furniture
     industrial=grinding_mill: Pl:Tag:industrial=grinding mill
+    industrial=heating_station: Pl:Tag:industrial=heating station
+    industrial=ice_factory: Pl:Tag:industrial=ice factory
     industrial=machine_shop: Pl:Tag:industrial=machine shop
+    industrial=mine: Pl:Tag:industrial=mine
     industrial=mobile_equipment: Pl:Tag:industrial=mobile equipment
+    industrial=oil: Pl:Tag:industrial=oil
     industrial=oil_mill: Pl:Tag:industrial=oil mill
+    industrial=port: Pl:Tag:industrial=port
     industrial=salt_pond: Pl:Tag:industrial=salt pond
     industrial=sawmill: Pl:Tag:industrial=sawmill
+    industrial=scrap_yard: Pl:Tag:industrial=scrap yard
     industrial=shipyard: Pl:Tag:industrial=shipyard
+    industrial=slaughterhouse: Pl:Tag:industrial=slaughterhouse
+    industrial=steelmaking: Pl:Tag:industrial=steelmaking
+    industrial=warehouse: Pl:Tag:industrial=warehouse
+    industrial=well_cluster: Pl:Tag:industrial=well cluster
     information=board: Pl:Tag:information=board
     information=guidepost: Pl:Tag:information=guidepost
     information=map: Pl:Tag:information=map
     information=office: Pl:Tag:information=office
     information=terminal: Pl:Tag:information=terminal
+    internet_access=wlan: Pl:Tag:internet access=wlan
     junction=roundabout: Pl:Tag:junction=roundabout
+    landcover=grass: Pl:Tag:landcover=grass
+    landcover=trees: Pl:Tag:landcover=trees
+    landuse=agriculture: Pl:Tag:landuse=agriculture
     landuse=allotments: Pl:Tag:landuse=allotments
     landuse=animal_keeping: Pl:Tag:landuse=animal keeping
     landuse=apiary: Pl:Tag:landuse=apiary
+    landuse=aquaculture: Pl:Tag:landuse=aquaculture
+    landuse=basin: Pl:Tag:landuse=basin
     landuse=brownfield: Pl:Tag:landuse=brownfield
     landuse=cemetery: Pl:Tag:landuse=cemetery
+    landuse=churchyard: Pl:Tag:landuse=churchyard
+    landuse=civic_admin: Pl:Tag:landuse=civic admin
     landuse=commercial: Pl:Tag:landuse=commercial
     landuse=construction: Pl:Tag:landuse=construction
     landuse=depot: Pl:Tag:landuse=depot
@@ -13715,6 +15317,7 @@ pl:
     landuse=farmyard: Pl:Tag:landuse=farmyard
     landuse=flowerbed: Pl:Tag:landuse=flowerbed
     landuse=forest: Pl:Tag:landuse=forest
+    landuse=garages: Pl:Tag:landuse=garages
     landuse=grass: Pl:Tag:landuse=grass
     landuse=greenfield: Pl:Tag:landuse=greenfield
     landuse=greenhouse_horticulture: Pl:Tag:landuse=greenhouse horticulture
@@ -13722,16 +15325,26 @@ pl:
     landuse=landfill: Pl:Tag:landuse=landfill
     landuse=meadow: Pl:Tag:landuse=meadow
     landuse=military: Pl:Tag:landuse=military
+    landuse=orchard: Pl:Tag:landuse=orchard
+    landuse=peat_cutting: Pl:Tag:landuse=peat cutting
     landuse=plant_nursery: Pl:Tag:landuse=plant nursery
     landuse=quarry: Pl:Tag:landuse=quarry
     landuse=railway: Pl:Tag:landuse=railway
     landuse=recreation_ground: Pl:Tag:landuse=recreation ground
     landuse=religious: Pl:Tag:landuse=religious
+    landuse=reservoir: Pl:Tag:landuse=reservoir
     landuse=residential: Pl:Tag:landuse=residential
     landuse=retail: Pl:Tag:landuse=retail
     landuse=salt_pond: Pl:Tag:landuse=salt pond
+    landuse=street: Pl:Tag:landuse=street
     landuse=traffic_island: Pl:Tag:landuse=traffic island
     landuse=village_green: Pl:Tag:landuse=village green
+    landuse=vineyard: Pl:Tag:landuse=vineyard
+    landuse=winter_sports: Pl:Tag:landuse=winter sports
+    leaf_type=broadleaved: Pl:Tag:leaf type=broadleaved
+    leaf_type=leafless: Pl:Tag:leaf type=leafless
+    leaf_type=mixed: Pl:Tag:leaf type=mixed
+    leaf_type=needleleaved: Pl:Tag:leaf type=needleleaved
     leisure=adult_gaming_centre: Pl:Tag:leisure=adult gaming centre
     leisure=amusement_arcade: Pl:Tag:leisure=amusement arcade
     leisure=bandstand: Pl:Tag:leisure=bandstand
     leisure=video_arcade: Pl:Tag:leisure=video arcade
     leisure=water_park: Pl:Tag:leisure=water park
     leisure=wildlife_hide: Pl:Tag:leisure=wildlife hide
+    location:transition=yes: Pl:Tag:location:transition=yes
     man_made=adit: Pl:Tag:man made=adit
+    man_made=antenna: Pl:Tag:man made=antenna
     man_made=beacon: Pl:Tag:man made=beacon
     man_made=beehive: Pl:Tag:man made=beehive
+    man_made=breakwater: Pl:Tag:man made=breakwater
     man_made=bridge: Pl:Tag:man made=bridge
     man_made=bunker_silo: Pl:Tag:man made=bunker silo
+    man_made=cairn: Pl:Tag:man made=cairn
     man_made=campanile: Pl:Tag:man made=campanile
+    man_made=carpet_hanger: Pl:Tag:man made=carpet hanger
     man_made=chimney: Pl:Tag:man made=chimney
     man_made=clearcut: Pl:Tag:man made=clearcut
+    man_made=communications_tower: Pl:Tag:man made=communications tower
+    man_made=cooling_tower: Pl:Tag:man made=cooling tower
+    man_made=crane: Pl:Tag:man made=crane
     man_made=cross: Pl:Tag:man made=cross
     man_made=cutline: Pl:Tag:man made=cutline
+    man_made=dovecote: Pl:Tag:man made=dovecote
     man_made=dyke: Pl:Tag:man made=dyke
     man_made=embankment: Pl:Tag:man made=embankment
+    man_made=flagpole: Pl:Tag:man made=flagpole
+    man_made=flare: Pl:Tag:man made=flare
+    man_made=floating_storage: Pl:Tag:man made=floating storage
     man_made=gasometer: Pl:Tag:man made=gasometer
+    man_made=geoglyph: Pl:Tag:man made=geoglyph
+    man_made=goods_conveyor: Pl:Tag:man made=goods conveyor
+    man_made=graduation_tower: Pl:Tag:man made=graduation tower
+    man_made=groyne: Pl:Tag:man made=groyne
     man_made=insect_hotel: Pl:Tag:man made=insect hotel
     man_made=kiln: Pl:Tag:man made=kiln
+    man_made=lighthouse: Pl:Tag:man made=lighthouse
+    man_made=mast: Pl:Tag:man made=mast
     man_made=mineshaft: Pl:Tag:man made=mineshaft
     man_made=monitoring_station: Pl:Tag:man made=monitoring station
+    man_made=nesting_site: Pl:Tag:man made=nesting site
+    man_made=obelisk: Pl:Tag:man made=obelisk
+    man_made=observatory: Pl:Tag:man made=observatory
+    man_made=offshore_platform: Pl:Tag:man made=offshore platform
+    man_made=oil_well: Pl:Tag:man made=oil well
     man_made=petroleum_well: Pl:Tag:man made=petroleum well
+    man_made=pier: Pl:Tag:man made=pier
+    man_made=pipeline: Pl:Tag:man made=pipeline
+    man_made=pumping_rig: Pl:Tag:man made=pumping rig
     man_made=pumping_station: Pl:Tag:man made=pumping station
+    man_made=quay: Pl:Tag:man made=quay
     man_made=reservoir_covered: Pl:Tag:man made=reservoir covered
     man_made=silo: Pl:Tag:man made=silo
+    man_made=snow_cannon: Pl:Tag:man made=snow cannon
+    man_made=snow_fence: Pl:Tag:man made=snow fence
+    man_made=snow_net: Pl:Tag:man made=snow net
+    man_made=spoil_heap: Pl:Tag:man made=spoil heap
     man_made=storage_tank: Pl:Tag:man made=storage tank
+    man_made=street_cabinet: Pl:Tag:man made=street cabinet
+    man_made=submarine_cable: Pl:Tag:man made=submarine cable
     man_made=surveillance: Pl:Tag:man made=surveillance
     man_made=survey_point: Pl:Tag:man made=survey point
+    man_made=telescope: Pl:Tag:man made=telescope
     man_made=tower: Pl:Tag:man made=tower
+    man_made=wastewater_plant: Pl:Tag:man made=wastewater plant
     man_made=water_tap: Pl:Tag:man made=water tap
     man_made=water_tower: Pl:Tag:man made=water tower
     man_made=water_well: Pl:Tag:man made=water well
+    man_made=water_works: Pl:Tag:man made=water works
     man_made=watermill: Pl:Tag:man made=watermill
+    man_made=wildlife_crossing: Pl:Tag:man made=wildlife crossing
+    man_made=wildlife_opening: Pl:Tag:man made=wildlife opening
     man_made=windmill: Pl:Tag:man made=windmill
     man_made=windpump: Pl:Tag:man made=windpump
     man_made=works: Pl:Tag:man made=works
+    megalith_type=alignment: Pl:Tag:megalith type=alignment
+    megalith_type=chamber: Pl:Tag:megalith type=chamber
+    megalith_type=cist: Pl:Tag:megalith type=cist
+    megalith_type=dolmen: Pl:Tag:megalith type=dolmen
+    megalith_type=long_barrow: Pl:Tag:megalith type=long barrow
+    megalith_type=menhir: Pl:Tag:megalith type=menhir
+    megalith_type=nuraghe: Pl:Tag:megalith type=nuraghe
+    megalith_type=passage_grave: Pl:Tag:megalith type=passage grave
+    megalith_type=stone_circle: Pl:Tag:megalith type=stone circle
+    megalith_type=stone_ship: Pl:Tag:megalith type=stone ship
+    megalith_type=tholos: Pl:Tag:megalith type=tholos
+    megalith_type=well: Pl:Tag:megalith type=well
+    memorial=blue_plaque: Pl:Tag:memorial=blue plaque
+    memorial=bust: Pl:Tag:memorial=bust
+    memorial=obelisk: Pl:Tag:memorial=obelisk
+    memorial=plaque: Pl:Tag:memorial=plaque
+    memorial=statue: Pl:Tag:memorial=statue
+    memorial=stele: Pl:Tag:memorial=stele
+    memorial=stolperstein: Pl:Tag:memorial=stolperstein
+    memorial=stone: Pl:Tag:memorial=stone
+    memorial=war_memorial: Pl:Tag:memorial=war memorial
+    military=ammunition: Pl:Tag:military=ammunition
+    military=barracks: Pl:Tag:military=barracks
     military=bunker: Pl:Tag:military=bunker
+    military=checkpoint: Pl:Tag:military=checkpoint
     military=danger_area: Pl:Tag:military=danger area
+    military=naval_base: Pl:Tag:military=naval base
     military=nuclear_explosion_site: Pl:Tag:military=nuclear explosion site
+    military=obstacle_course: Pl:Tag:military=obstacle course
+    military=office: Pl:Tag:military=office
     military=range: Pl:Tag:military=range
+    military=training_area: Pl:Tag:military=training area
     military=trench: Pl:Tag:military=trench
     mooring=ferry: Pl:Tag:mooring=ferry
     natural=arete: Pl:Tag:natural=arete
@@ -13831,23 +15510,35 @@ pl:
     natural=bay: Pl:Tag:natural=bay
     natural=beach: Pl:Tag:natural=beach
     natural=bedrock: Pl:Tag:natural=bedrock
+    natural=birds_nest: Pl:Tag:natural=birds nest
+    natural=blowhole: Pl:Tag:natural=blowhole
     natural=cape: Pl:Tag:natural=cape
     natural=cave_entrance: Pl:Tag:natural=cave entrance
     natural=cliff: Pl:Tag:natural=cliff
+    natural=coastline: Pl:Tag:natural=coastline
     natural=desert: Pl:Tag:natural=desert
     natural=earth_bank: Pl:Tag:natural=earth bank
     natural=esker: Pl:Tag:natural=esker
     natural=fell: Pl:Tag:natural=fell
+    natural=geothermal: Pl:Tag:natural=geothermal
+    natural=geyser: Pl:Tag:natural=geyser
+    natural=glacier: Pl:Tag:natural=glacier
+    natural=gorge: Pl:Tag:natural=gorge
     natural=grassland: Pl:Tag:natural=grassland
     natural=gully: Pl:Tag:natural=gully
     natural=heath: Pl:Tag:natural=heath
+    natural=hill: Pl:Tag:natural=hill
     natural=hot_spring: Pl:Tag:natural=hot spring
     natural=lake: Pl:Tag:natural=lake
     natural=landslide: Pl:Tag:natural=landslide
+    natural=lava: Pl:Tag:natural=lava
     natural=moor: Pl:Tag:natural=moor
     natural=moraine: Pl:Tag:natural=moraine
+    natural=moss: Pl:Tag:natural=moss
     natural=mud: Pl:Tag:natural=mud
     natural=peak: Pl:Tag:natural=peak
+    natural=peninsula: Pl:Tag:natural=peninsula
+    natural=plant: Pl:Tag:natural=plant
     natural=reef: Pl:Tag:natural=reef
     natural=ridge: Pl:Tag:natural=ridge
     natural=riverbed: Pl:Tag:natural=riverbed
@@ -13858,6 +15549,7 @@ pl:
     natural=scrub: Pl:Tag:natural=scrub
     natural=shingle: Pl:Tag:natural=shingle
     natural=shoal: Pl:Tag:natural=shoal
+    natural=shrub: Pl:Tag:natural=shrub
     natural=sinkhole: Pl:Tag:natural=sinkhole
     natural=spring: Pl:Tag:natural=spring
     natural=stone: Pl:Tag:natural=stone
@@ -13899,27 +15591,57 @@ pl:
     office=quango: Pl:Tag:office=quango
     office=religion: Pl:Tag:office=religion
     office=research: Pl:Tag:office=research
+    office=tax: Pl:Tag:office=tax
     office=tax_advisor: Pl:Tag:office=tax advisor
     office=telecommunication: Pl:Tag:office=telecommunication
     office=therapist: Pl:Tag:office=therapist
     office=tourist_accommodation: Pl:Tag:office=tourist accommodation
     office=water_utility: Pl:Tag:office=water utility
+    oneway=alternating: Pl:Tag:oneway=alternating
+    oneway=reversible: Pl:Tag:oneway=reversible
     parking:lane:hgv=on_street: Pl:Tag:parking:lane:hgv=on street
+    parking=multi-storey: Pl:Tag:parking=multi-storey
+    parking=underground: Pl:Tag:parking=underground
     place=allotments: Pl:Tag:place=allotments
+    place=archipelago: Pl:Tag:place=archipelago
+    place=borough: Pl:Tag:place=borough
     place=city: Pl:Tag:place=city
+    place=city_block: Pl:Tag:place=city block
+    place=continent: Pl:Tag:place=continent
+    place=country: Pl:Tag:place=country
+    place=county: Pl:Tag:place=county
+    place=district: Pl:Tag:place=district
     place=farm: Pl:Tag:place=farm
     place=hamlet: Pl:Tag:place=hamlet
+    place=island: Pl:Tag:place=island
+    place=islet: Pl:Tag:place=islet
     place=isolated_dwelling: Pl:Tag:place=isolated dwelling
     place=locality: Pl:Tag:place=locality
+    place=municipality: Pl:Tag:place=municipality
     place=neighbourhood: Pl:Tag:place=neighbourhood
+    place=ocean: Pl:Tag:place=ocean
+    place=plot: Pl:Tag:place=plot
+    place=powiat: Pl:Tag:place=powiat
+    place=province: Pl:Tag:place=province
+    place=quarter: Pl:Tag:place=quarter
+    place=region: Pl:Tag:place=region
+    place=sea: Pl:Tag:place=sea
     place=square: Pl:Tag:place=square
+    place=state: Pl:Tag:place=state
     place=suburb: Pl:Tag:place=suburb
     place=town: Pl:Tag:place=town
     place=village: Pl:Tag:place=village
+    power=cable: Pl:Tag:power=cable
+    power=cable_distribution_cabinet: Pl:Tag:power=cable distribution cabinet
+    power=catenary_mast: Pl:Tag:power=catenary mast
+    power=converter: Pl:Tag:power=converter
     power=generator: Pl:Tag:power=generator
+    power=heliostat: Pl:Tag:power=heliostat
     power=line: Pl:Tag:power=line
     power=minor_line: Pl:Tag:power=minor line
+    power=plant: Pl:Tag:power=plant
     power=pole: Pl:Tag:power=pole
+    power=portal: Pl:Tag:power=portal
     power=sub_station: Pl:Tag:power=sub station
     power=substation: Pl:Tag:power=substation
     power=tower: Pl:Tag:power=tower
@@ -13932,16 +15654,51 @@ pl:
     railway=buffer_stop: Pl:Tag:railway=buffer stop
     railway=crossing: Pl:Tag:railway=crossing
     railway=crossing_controller: Pl:Tag:railway=crossing controller
+    railway=derail: Pl:Tag:railway=derail
     railway=disused: Pl:Tag:railway=disused
+    railway=funicular: Pl:Tag:railway=funicular
+    railway=halt: Pl:Tag:railway=halt
+    railway=junction: Pl:Tag:railway=junction
     railway=level_crossing: Pl:Tag:railway=level crossing
+    railway=light_rail: Pl:Tag:railway=light rail
+    railway=milestone: Pl:Tag:railway=milestone
+    railway=miniature: Pl:Tag:railway=miniature
+    railway=monorail: Pl:Tag:railway=monorail
+    railway=narrow_gauge: Pl:Tag:railway=narrow gauge
+    railway=platform: Pl:Tag:railway=platform
+    railway=platform_edge: Pl:Tag:railway=platform edge
+    railway=preserved: Pl:Tag:railway=preserved
     railway=rail: Pl:Tag:railway=rail
+    railway=rail_brake: Pl:Tag:railway=rail brake
+    railway=railway_crossing: Pl:Tag:railway=railway crossing
+    railway=roundhouse: Pl:Tag:railway=roundhouse
+    railway=signal: Pl:Tag:railway=signal
+    railway=signal_box: Pl:Tag:railway=signal box
+    railway=spur_junction: Pl:Tag:railway=spur junction
+    railway=station: Pl:Tag:railway=station
+    railway=stop: Pl:Tag:railway=stop
+    railway=subway: Pl:Tag:railway=subway
+    railway=subway_entrance: Pl:Tag:railway=subway entrance
+    railway=switch: Pl:Tag:railway=switch
+    railway=tram: Pl:Tag:railway=tram
     railway=tram_stop: Pl:Tag:railway=tram stop
+    railway=traverser: Pl:Tag:railway=traverser
+    railway=turntable: Pl:Tag:railway=turntable
+    railway=wash: Pl:Tag:railway=wash
+    railway=water_crane: Pl:Tag:railway=water crane
+    railway=water_tower: Pl:Tag:railway=water tower
+    railway=yard: Pl:Tag:railway=yard
     religion=christian: Pl:Tag:religion=christian
     religion=jewish: Pl:Tag:religion=jewish
     religion=muslim: Pl:Tag:religion=muslim
     religion=pagan: Pl:Tag:religion=pagan
+    religion=shinto: Pl:Tag:religion=shinto
+    residential=rural: Pl:Tag:residential=rural
+    residential=university: Pl:Tag:residential=university
+    residential=urban: Pl:Tag:residential=urban
     route=hiking: Pl:Tag:route=hiking
     route=horse: Pl:Tag:route=horse
+    route=running: Pl:Tag:route=running
     service=alley: Pl:Tag:service=alley
     service=drive-through: Pl:Tag:service=drive-through
     service=driveway: Pl:Tag:service=driveway
@@ -14002,6 +15759,7 @@ pl:
     shop=houseware: Pl:Tag:shop=houseware
     shop=hunting: Pl:Tag:shop=hunting
     shop=ice_cream: Pl:Tag:shop=ice cream
+    shop=junk_yard: Pl:Tag:shop=junk yard
     shop=kiosk: Pl:Tag:shop=kiosk
     shop=kitchen: Pl:Tag:shop=kitchen
     shop=laundry: Pl:Tag:shop=laundry
@@ -14009,10 +15767,13 @@ pl:
     shop=lighting: Pl:Tag:shop=lighting
     shop=mall: Pl:Tag:shop=mall
     shop=medical_supply: Pl:Tag:shop=medical supply
+    shop=musical_instrument: Pl:Tag:shop=musical instrument
+    shop=nutrition_supplements: Pl:Tag:shop=nutrition supplements
     shop=optician: Pl:Tag:shop=optician
     shop=pastry: Pl:Tag:shop=pastry
     shop=pet: Pl:Tag:shop=pet
     shop=pet_grooming: Pl:Tag:shop=pet grooming
+    shop=pottery: Pl:Tag:shop=pottery
     shop=pyrotechnics: Pl:Tag:shop=pyrotechnics
     shop=religion: Pl:Tag:shop=religion
     shop=rental: Pl:Tag:shop=rental
@@ -14034,6 +15795,15 @@ pl:
     shop=wholesale: Pl:Tag:shop=wholesale
     shop=wine: Pl:Tag:shop=wine
     shop=yes: Pl:Tag:shop=yes
+    site_type=bigstone: Pl:Tag:site type=bigstone
+    site_type=city: Pl:Tag:site type=city
+    site_type=fortification: Pl:Tag:site type=fortification
+    site_type=hut_circle: Pl:Tag:site type=hut circle
+    site_type=megalith: Pl:Tag:site type=megalith
+    site_type=necropolis: Pl:Tag:site type=necropolis
+    site_type=petroglyph: Pl:Tag:site type=petroglyph
+    site_type=settlement: Pl:Tag:site type=settlement
+    site_type=tumulus: Pl:Tag:site type=tumulus
     social_facility=outreach: Pl:Tag:social facility=outreach
     sport=10pin: Pl:Tag:sport=10pin
     sport=9pin: Pl:Tag:sport=9pin
@@ -14043,6 +15813,7 @@ pl:
     sport=equestrian: Pl:Tag:sport=equestrian
     sport=ice_hockey: Pl:Tag:sport=ice hockey
     sport=soccer: Pl:Tag:sport=soccer
+    surface=concrete:lanes: Pl:Tag:surface=concrete:lanes
     tourism=alpine_hut: Pl:Tag:tourism=alpine hut
     tourism=apartment: Pl:Tag:tourism=apartment
     tourism=aquarium: Pl:Tag:tourism=aquarium
@@ -14068,9 +15839,11 @@ pl:
     tourism=wine_cellar: Pl:Tag:tourism=wine cellar
     tourism=zoo: Pl:Tag:tourism=zoo
     tower:type=bell_tower: Pl:Tag:tower:type=bell tower
+    tower:type=bridge: Pl:Tag:tower:type=bridge
     tower:type=communication: Pl:Tag:tower:type=communication
     tower:type=cooling: Pl:Tag:tower:type=cooling
     tower:type=defensive: Pl:Tag:tower:type=defensive
+    tower:type=hose: Pl:Tag:tower:type=hose
     tower:type=lighting: Pl:Tag:tower:type=lighting
     tower:type=minaret: Pl:Tag:tower:type=minaret
     tower:type=observation: Pl:Tag:tower:type=observation
@@ -14079,15 +15852,35 @@ pl:
     traffic_sign=city_limit: Pl:Tag:traffic sign=city limit
     tunnel=culvert: Pl:Tag:tunnel=culvert
     type=public_transport: Pl:Tag:type=public transport
+    vending: Pl:Tag:vending
+    vending=admission_tickets: Pl:Tag:vending=admission tickets
     vending=bottle_return: Pl:Tag:vending=bottle return
     vending=candles: Pl:Tag:vending=candles
+    vending=cigarettes: Pl:Tag:vending=cigarettes
+    vending=drinks: Pl:Tag:vending=drinks
+    vending=feminine_hygiene: Pl:Tag:vending=feminine hygiene
     vending=food: Pl:Tag:vending=food
     vending=fuel: Pl:Tag:vending=fuel
     vending=milk: Pl:Tag:vending=milk
+    vending=newspapers: Pl:Tag:vending=newspapers
+    vending=parcel_pickup;parcel_mail_in: Pl:Tag:vending=parcel pickup;parcel mail
+      in
+    vending=parking_tickets: Pl:Tag:vending=parking tickets
+    vending=public_transport_tickets: Pl:Tag:vending=public transport tickets
+    vending=sweets: Pl:Tag:vending=sweets
+    wall=dry_stone: Pl:Tag:wall=dry stone
+    wall=no: Pl:Tag:wall=no
     wall=noise_barrier: Pl:Tag:wall=noise barrier
+    waste=dog_excrement: Pl:Tag:waste=dog excrement
+    water=canal: Pl:Tag:water=canal
+    water=lagoon: Pl:Tag:water=lagoon
     water=lake: Pl:Tag:water=lake
     water=lock: Pl:Tag:water=lock
+    water=oxbow: Pl:Tag:water=oxbow
+    water=pond: Pl:Tag:water=pond
     water=reservoir: Pl:Tag:water=reservoir
+    water=river: Pl:Tag:water=river
+    water=wastewater: Pl:Tag:water=wastewater
     waterway=boat_lift: Pl:Tag:waterway=boat lift
     waterway=boatyard: Pl:Tag:waterway=boatyard
     waterway=brook: Pl:Tag:waterway=brook
@@ -14131,6 +15924,13 @@ pl:
     wood=deciduous: Pl:Tag:wood=deciduous
     wood=evergreen: Pl:Tag:wood=evergreen
     wood=mixed: Pl:Tag:wood=mixed
+    zoo=aviary: Pl:Tag:zoo=aviary
+    zoo=birds: Pl:Tag:zoo=birds
+    zoo=butterfly: Pl:Tag:zoo=butterfly
+    zoo=enclosure: Pl:Tag:zoo=enclosure
+    zoo=falconry: Pl:Tag:zoo=falconry
+    zoo=petting_zoo: Pl:Tag:zoo=petting zoo
+    zoo=reptile: Pl:Tag:zoo=reptile
 pt:
   key:
     IBGE:CD_ADMINIS: Pt:Key:IBGE:CD ADMINIS
@@ -14141,14 +15941,17 @@ pt:
     access: Pt:Key:access
     addr: Pt:Key:addr
     addr:housenumber: Pt:Key:addr:housenumber
+    addr:place: Pt:Key:addr:place
     admin_level: Pt:Key:admin level
     aerialway: Pt:Key:aerialway
     aeroway: Pt:Key:aeroway
     amenity: Pt:Key:amenity
     area: Pt:Key:area
     barrier: Pt:Key:barrier
+    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
@@ -14172,8 +15975,10 @@ pt:
     cycleway: Pt:Key:cycleway
     denomination: Pt:Key:denomination
     diet:*: Pt:Key:diet:*
+    diet:vegan: Pt:Key:diet:vegan
     dispensing: Pt:Key:dispensing
     display: Pt:Key:display
+    drive_through: Pt:Key:drive through
     driving_side: Pt:Key:driving side
     ele: Pt:Key:ele
     electrified: Pt:Key:electrified
@@ -14238,8 +16043,10 @@ pt:
     opening_hours: Pt:Key:opening hours
     operator: Pt:Key:operator
     overtaking: Pt:Key:overtaking
+    park_ride: Pt:Key:park ride
     passing_places: Pt:Key:passing places
     place: Pt:Key:place
+    placement: Pt:Key:placement
     population: Pt:Key:population
     postal_code: Pt:Key:postal code
     power: Pt:Key:power
@@ -14270,8 +16077,10 @@ pt:
     source: Pt:Key:source
     sport: Pt:Key:sport
     substance: Pt:Key:substance
+    supervised: Pt:Key:supervised
     surface: Pt:Key:surface
     survey:date: Pt:Key:survey:date
+    takeaway: Pt:Key:takeaway
     tiger: Pt:Key:tiger
     tourism: Pt:Key:tourism
     tracktype: Pt:Key:tracktype
@@ -14314,15 +16123,19 @@ pt:
     aeroway=navigationaid: Pt:Tag:aeroway=navigationaid
     aeroway=parking_position: Pt:Tag:aeroway=parking position
     aeroway=runway: Pt:Tag:aeroway=runway
+    aeroway=spaceport: Pt:Tag:aeroway=spaceport
     aeroway=taxilane: Pt:Tag:aeroway=taxilane
     aeroway=taxiway: Pt:Tag:aeroway=taxiway
     aeroway=terminal: Pt:Tag:aeroway=terminal
     aeroway=windsock: Pt:Tag:aeroway=windsock
     amenity=animal_boarding: Pt:Tag:amenity=animal boarding
+    amenity=animal_shelter: Pt:Tag:amenity=animal shelter
     amenity=architect_office: Pt:Tag:amenity=architect office
+    amenity=archive: Pt:Tag:amenity=archive
     amenity=arts_centre: Pt:Tag:amenity=arts centre
     amenity=atm: Pt:Tag:amenity=atm
     amenity=baby_hatch: Pt:Tag:amenity=baby hatch
+    amenity=baking_oven: Pt:Tag:amenity=baking oven
     amenity=bank: Pt:Tag:amenity=bank
     amenity=bar: Pt:Tag:amenity=bar
     amenity=bbq: Pt:Tag:amenity=bbq
@@ -14332,6 +16145,8 @@ pt:
     amenity=bicycle_repair_station: Pt:Tag:amenity=bicycle repair station
     amenity=biergarten: Pt:Tag:amenity=biergarten
     amenity=blood_donation: Pt:Tag:amenity=blood donation
+    amenity=boat_rental: Pt:Tag:amenity=boat rental
+    amenity=boat_sharing: Pt:Tag:amenity=boat sharing
     amenity=brothel: Pt:Tag:amenity=brothel
     amenity=bureau_de_change: Pt:Tag:amenity=bureau de change
     amenity=bus_station: Pt:Tag:amenity=bus station
@@ -14347,8 +16162,11 @@ pt:
     amenity=college: Pt:Tag:amenity=college
     amenity=community_centre: Pt:Tag:amenity=community centre
     amenity=courthouse: Pt:Tag:amenity=courthouse
+    amenity=coworking_space: Pt:Tag:amenity=coworking space
     amenity=crematorium: Pt:Tag:amenity=crematorium
+    amenity=crypt: Pt:Tag:amenity=crypt
     amenity=dentist: Pt:Tag:amenity=dentist
+    amenity=dive_centre: Pt:Tag:amenity=dive centre
     amenity=doctors: Pt:Tag:amenity=doctors
     amenity=dojo: Pt:Tag:amenity=dojo
     amenity=drinking_water: Pt:Tag:amenity=drinking water
@@ -14364,6 +16182,7 @@ pt:
     amenity=fountain: Pt:Tag:amenity=fountain
     amenity=fuel: Pt:Tag:amenity=fuel
     amenity=gambling: Pt:Tag:amenity=gambling
+    amenity=game_feeding: Pt:Tag:amenity=game feeding
     amenity=grave_yard: Pt:Tag:amenity=grave yard
     amenity=grit_bin: Pt:Tag:amenity=grit bin
     amenity=hospital: Pt:Tag:amenity=hospital
@@ -14371,7 +16190,10 @@ pt:
     amenity=ice_cream: Pt:Tag:amenity=ice cream
     amenity=internet_cafe: Pt:Tag:amenity=internet cafe
     amenity=kindergarten: Pt:Tag:amenity=kindergarten
+    amenity=kitchen: Pt:Tag:amenity=kitchen
+    amenity=kneipp_water_cure: Pt:Tag:amenity=kneipp water cure
     amenity=language_school: Pt:Tag:amenity=language school
+    amenity=lavoir: Pt:Tag:amenity=lavoir
     amenity=letter_box: Pt:Tag:amenity=letter box
     amenity=library: Pt:Tag:amenity=library
     amenity=love_hotel: Pt:Tag:amenity=love hotel
@@ -14384,6 +16206,7 @@ pt:
     amenity=parking_entrance: Pt:Tag:amenity=parking entrance
     amenity=parking_space: Pt:Tag:amenity=parking space
     amenity=pharmacy: Pt:Tag:amenity=pharmacy
+    amenity=photo_booth: Pt:Tag:amenity=photo booth
     amenity=place_of_worship: Pt:Tag:amenity=place of worship
     amenity=planetarium: Pt:Tag:amenity=planetarium
     amenity=police: Pt:Tag:amenity=police
@@ -14391,24 +16214,35 @@ pt:
     amenity=post_office: Pt:Tag:amenity=post office
     amenity=prison: Pt:Tag:amenity=prison
     amenity=pub: Pt:Tag:amenity=pub
+    amenity=public_bath: Pt:Tag:amenity=public bath
+    amenity=public_bookcase: Pt:Tag:amenity=public bookcase
     amenity=public_building: Pt:Tag:amenity=public building
+    amenity=ranger_station: Pt:Tag:amenity=ranger station
     amenity=recycling: Pt:Tag:amenity=recycling
     amenity=register_office: Pt:Tag:amenity=register office
+    amenity=rescue_station: Pt:Tag:amenity=rescue station
+    amenity=research_institute: Pt:Tag:amenity=research institute
     amenity=restaurant: Pt:Tag:amenity=restaurant
+    amenity=sanitary_dump_station: Pt:Tag:amenity=sanitary dump station
     amenity=sauna: Pt:Tag:amenity=sauna
     amenity=school: Pt:Tag:amenity=school
     amenity=shelter: Pt:Tag:amenity=shelter
+    amenity=shower: Pt:Tag:amenity=shower
     amenity=social_centre: Pt:Tag:amenity=social centre
     amenity=social_facility: Pt:Tag:amenity=social facility
     amenity=stripclub: Pt:Tag:amenity=stripclub
     amenity=studio: Pt:Tag:amenity=studio
+    amenity=surf_school: Pt:Tag:amenity=surf school
     amenity=swingerclub: Pt:Tag:amenity=swingerclub
+    amenity=table: Pt:Tag:amenity=table
     amenity=taxi: Pt:Tag:amenity=taxi
     amenity=telephone: Pt:Tag:amenity=telephone
     amenity=theatre: Pt:Tag:amenity=theatre
+    amenity=ticket_validator: Pt:Tag:amenity=ticket validator
     amenity=toilets: Pt:Tag:amenity=toilets
     amenity=townhall: Pt:Tag:amenity=townhall
     amenity=university: Pt:Tag:amenity=university
+    amenity=vehicle_inspection: Pt:Tag:amenity=vehicle inspection
     amenity=vending_machine: Pt:Tag:amenity=vending machine
     amenity=veterinary: Pt:Tag:amenity=veterinary
     amenity=waste_basket: Pt:Tag:amenity=waste basket
@@ -14438,6 +16272,7 @@ pt:
     boundary=national_park: Pt:Tag:boundary=national park
     boundary=political: Pt:Tag:boundary=political
     boundary=protected_area: Pt:Tag:boundary=protected area
+    bridge=boardwalk: Pt:Tag:bridge=boardwalk
     bridge=viaduct: Pt:Tag:bridge=viaduct
     building=church: Pt:Tag:building=church
     building=commercial: Pt:Tag:building=commercial
@@ -14504,6 +16339,7 @@ pt:
     emergency=phone: Pt:Tag:emergency=phone
     emergency=siren: Pt:Tag:emergency=siren
     geological=palaeontological_site: Pt:Tag:geological=palaeontological site
+    government=cadaster: Pt:Tag:government=cadaster
     healthcare=blood_donation: Pt:Tag:healthcare=blood donation
     highway=bridleway: Pt:Tag:highway=bridleway
     highway=bus_guideway: Pt:Tag:highway=bus guideway
@@ -14661,6 +16497,7 @@ pt:
     natural=spring: Pt:Tag:natural=spring
     natural=stone: Pt:Tag:natural=stone
     natural=tree: Pt:Tag:natural=tree
+    natural=tree_row: Pt:Tag:natural=tree row
     natural=volcano: Pt:Tag:natural=volcano
     natural=water: Pt:Tag:natural=water
     natural=wetland: Pt:Tag:natural=wetland
@@ -14684,18 +16521,30 @@ pt:
     office=surveyor: Pt:Tag:office=surveyor
     office=telecommunication: Pt:Tag:office=telecommunication
     office=travel_agent: Pt:Tag:office=travel agent
+    place=allotments: Pt:Tag:place=allotments
+    place=archipelago: Pt:Tag:place=archipelago
+    place=borough: Pt:Tag:place=borough
     place=city: Pt:Tag:place=city
+    place=city_block: Pt:Tag:place=city block
     place=continent: Pt:Tag:place=continent
     place=country: Pt:Tag:place=country
     place=county: Pt:Tag:place=county
+    place=district: Pt:Tag:place=district
     place=farm: Pt:Tag:place=farm
     place=hamlet: Pt:Tag:place=hamlet
     place=island: Pt:Tag:place=island
     place=islet: Pt:Tag:place=islet
     place=isolated_dwelling: Pt:Tag:place=isolated dwelling
     place=locality: Pt:Tag:place=locality
+    place=municipality: Pt:Tag:place=municipality
+    place=neighbourhood: Pt:Tag:place=neighbourhood
+    place=ocean: Pt:Tag:place=ocean
     place=plot: Pt:Tag:place=plot
+    place=province: Pt:Tag:place=province
+    place=quarter: Pt:Tag:place=quarter
     place=region: Pt:Tag:place=region
+    place=sea: Pt:Tag:place=sea
+    place=square: Pt:Tag:place=square
     place=state: Pt:Tag:place=state
     place=suburb: Pt:Tag:place=suburb
     place=town: Pt:Tag:place=town
@@ -14874,6 +16723,7 @@ pt:
     tourism=zoo: Pt:Tag:tourism=zoo
     traffic_calming=island: Pt:Tag:traffic calming=island
     traffic_calming=table: Pt:Tag:traffic calming=table
+    tunnel=culvert: Pt:Tag:tunnel=culvert
     vending=bicycle_tube: Pt:Tag:vending=bicycle tube
     waterway=boatyard: Pt:Tag:waterway=boatyard
     waterway=canal: Pt:Tag:waterway=canal
@@ -15602,12 +17452,15 @@ ro:
 ru:
   key:
     abandoned: RU:Key:abandoned
+    'abandoned:': 'RU:Key:abandoned:'
     abutters: RU:Key:abutters
     access: RU:Key:access
+    access:lhv: RU:Key:access:lhv
     addr: RU:Key:addr
     addr:city: RU:Key:addr:city
     addr:country: RU:Key:addr:country
     addr:flats: RU:Key:addr:flats
+    addr:floor: RU:Key:addr:floor
     addr:housename: RU:Key:addr:housename
     addr:housenumber: RU:Key:addr:housenumber
     addr:interpolation: RU:Key:addr:interpolation
@@ -15616,17 +17469,20 @@ ru:
     addr:postcode: RU:Key:addr:postcode
     addr:street: RU:Key:addr:street
     addr:suburb: RU:Key:addr:suburb
+    advertising: RU:Key:advertising
     aerialway: RU:Key:aerialway
     aeroway: RU:Key:aeroway
     agricultural: RU:Key:agricultural
     alt_name: RU:Key:alt name
     amenity: RU:Key:amenity
-    anthropogenic: RU:Key:anthropogenic
     architect: RU:Key:architect
     area: RU:Key:area
     area:highway: RU:Key:area:highway
     artist_name: RU:Key:artist name
     artwork_type: RU:Key:artwork type
+    attraction: RU:Key:attraction
+    attribution: RU:Key:attribution
+    atv:sales: RU:Key:atv:sales
     backcountry: RU:Key:backcountry
     barrier: RU:Key:barrier
     bench: RU:Key:bench
@@ -15635,14 +17491,18 @@ ru:
     bin: RU:Key:bin
     board_type: RU:Key:board type
     boat: RU:Key:boat
+    books: RU:Key:books
     border_type: RU:Key:border type
     boundary: RU:Key:boundary
     brand: RU:Key:brand
     brand:wikidata: RU:Key:brand:wikidata
     bridge: RU:Key:bridge
+    bridge:name: RU:Key:bridge:name
     bridge:support: RU:Key:bridge:support
+    bridge_name: RU:Key:bridge name
     building: RU:Key:building
     building:architecture: RU:Key:building:architecture
+    building:condition: RU:Key:building:condition
     building:height: RU:Key:building:height
     building:levels: RU:Key:building:levels
     building:levels:underground: RU:Key:building:levels:underground
@@ -15655,6 +17515,8 @@ ru:
     bus: RU:Key:bus
     cafe: RU:Key:cafe
     capacity: RU:Key:capacity
+    caravan: RU:Key:caravan
+    castle_type: RU:Key:castle type
     cemetery: RU:Key:cemetery
     check_date: RU:Key:check date
     checkpoint: RU:Key:checkpoint
@@ -15677,10 +17539,12 @@ ru:
     crop: RU:Key:crop
     crossing: RU:Key:crossing
     cuisine: RU:Key:cuisine
+    currency: RU:Key:currency
     cutting: RU:Key:cutting
     cycleway: RU:Key:cycleway
     delivery: RU:Key:delivery
     denomination: RU:Key:denomination
+    departures_board: RU:Key:departures board
     description: RU:Key:description
     description:ru: RU:Key:description:ru
     design:code:SPb: RU:Key:design:code:SPb
@@ -15692,8 +17556,10 @@ ru:
     disused: RU:Key:disused
     'disused:': 'RU:Key:disused:'
     disused:shop: RU:Key:disused:shop
+    dog: RU:Key:dog
     drinking_water: RU:Key:drinking water
     drive_in: RU:Key:drive in
+    drive_through: RU:Key:drive through
     driving_side: RU:Key:driving side
     ele: RU:Key:ele
     electrified: RU:Key:electrified
@@ -15707,7 +17573,6 @@ ru:
     fax: RU:Key:fax
     fee: RU:Key:fee
     fence_type: RU:Key:fence type
-    ferry: RU:Key:ferry
     fire_boundary: RU:Key:fire boundary
     fire_object:type: RU:Key:fire object:type
     fire_operator: RU:Key:fire operator
@@ -15721,9 +17586,6 @@ ru:
     fuel:cng: RU:Key:fuel:cng
     fuel:lpg: RU:Key:fuel:lpg
     furniture: RU:Key:furniture
-    further: RU:Key:further
-    further:access: RU:Key:further:access
-    further:vehicle: RU:Key:further:vehicle
     garden:style: RU:Key:garden:style
     gas: RU:Key:gas
     gauge: RU:Key:gauge
@@ -15751,6 +17613,7 @@ ru:
     internet_access: RU:Key:internet access
     junction: RU:Key:junction
     kerb: RU:Key:kerb
+    ladder: RU:Key:ladder
     lamp_mount: RU:Key:lamp mount
     landmark: RU:Key:landmark
     landuse: RU:Key:landuse
@@ -15762,6 +17625,7 @@ ru:
     leisure: RU:Key:leisure
     length: RU:Key:length
     level: RU:Key:level
+    license_classes: RU:Key:license classes
     lit: RU:Key:lit
     living_street: RU:Key:living street
     loc_name: RU:Key:loc name
@@ -15772,6 +17636,7 @@ ru:
     managed: RU:Key:managed
     manhole: RU:Key:manhole
     material: RU:Key:material
+    max_age: RU:Key:max age
     maxaxleload: RU:Key:maxaxleload
     maxbogieweight: RU:Key:maxbogieweight
     maxheight: RU:Key:maxheight
@@ -15781,6 +17646,7 @@ ru:
     maxstay: RU:Key:maxstay
     maxweight: RU:Key:maxweight
     maxwidth: RU:Key:maxwidth
+    memorial:type: RU:Key:memorial:type
     military: RU:Key:military
     min_height: RU:Key:min height
     minspeed: RU:Key:minspeed
@@ -15798,6 +17664,7 @@ ru:
     natural: RU:Key:natural
     noaddress: RU:Key:noaddress
     noexit: RU:Key:noexit
+    noname: RU:Key:noname
     note: RU:Key:note
     office: RU:Key:office
     official_name: RU:Key:official name
@@ -15820,6 +17687,7 @@ ru:
     parking:lane:both: RU:Key:parking:lane:both
     parking:lane:left: RU:Key:parking:lane:left
     parking:lane:right: RU:Key:parking:lane:right
+    passenger_information_display: RU:Key:passenger information display
     passing_places: RU:Key:passing places
     paved:date: RU:Key:paved:date
     payment: RU:Key:payment
@@ -15829,6 +17697,7 @@ ru:
     pipeline: RU:Key:pipeline
     piste:type: RU:Key:piste:type
     place: RU:Key:place
+    placement: RU:Key:placement
     playground: RU:Key:playground
     police: RU:Key:police
     population: RU:Key:population
@@ -15894,11 +17763,13 @@ ru:
     surveillance: RU:Key:surveillance
     survey:date: RU:Key:survey:date
     tactile_paving: RU:Key:tactile paving
+    taxon: RU:Key:taxon
     todo: RU:Key:todo
     toilets: RU:Key:toilets
     toilets:wheelchair: RU:Key:toilets:wheelchair
     toll: RU:Key:toll
     tourism: RU:Key:tourism
+    tower:type: RU:Key:tower:type
     tracktype: RU:Key:tracktype
     traffic_calming: RU:Key:traffic calming
     traffic_sign: RU:Key:traffic sign
@@ -15925,7 +17796,6 @@ ru:
     winter_road: RU:Key:winter road
     wood: RU:Key:wood
   tag:
-    access=agricultural: RU:Tag:access=agricultural
     access=customers: RU:Tag:access=customers
     access=delivery: RU:Tag:access=delivery
     access=designated: RU:Tag:access=designated
@@ -15937,6 +17807,12 @@ ru:
     access=private: RU:Tag:access=private
     access=unknown: RU:Tag:access=unknown
     access=yes: RU:Tag:access=yes
+    advertising=board: RU:Tag:advertising=board
+    advertising=flag: RU:Tag:advertising=flag
+    advertising=screen: RU:Tag:advertising=screen
+    advertising=sculpture: RU:Tag:advertising=sculpture
+    advertising=wall_painting: RU:Tag:advertising=wall painting
+    aerodrome:type=airfield: RU:Tag:aerodrome:type=airfield
     aeroway=aerodrome: RU:Tag:aeroway=aerodrome
     aeroway=apron: RU:Tag:aeroway=apron
     aeroway=gate: RU:Tag:aeroway=gate
@@ -15974,6 +17850,7 @@ ru:
     amenity=childcare: RU:Tag:amenity=childcare
     amenity=cinema: RU:Tag:amenity=cinema
     amenity=clinic: RU:Tag:amenity=clinic
+    amenity=cloakroom: RU:Tag:amenity=cloakroom
     amenity=clock: RU:Tag:amenity=clock
     amenity=clothes_dryer: RU:Tag:amenity=clothes dryer
     amenity=college: RU:Tag:amenity=college
@@ -15983,30 +17860,41 @@ ru:
     amenity=coworking_space: RU:Tag:amenity=coworking space
     amenity=crematorium: RU:Tag:amenity=crematorium
     amenity=dentist: RU:Tag:amenity=dentist
+    amenity=device_charging_station: RU:Tag:amenity=device charging station
     amenity=doctors: RU:Tag:amenity=doctors
     amenity=dojo: RU:Tag:amenity=dojo
     amenity=drinking_water: RU:Tag:amenity=drinking water
     amenity=driving_school: RU:Tag:amenity=driving school
     amenity=embassy: RU:Tag:amenity=embassy
     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=financial_advice: RU:Tag:amenity=financial advice
     amenity=fire_station: RU:Tag:amenity=fire station
     amenity=fish_spa: RU:Tag:amenity=fish spa
     amenity=food_court: RU:Tag:amenity=food court
     amenity=fountain: RU:Tag:amenity=fountain
+    amenity=fridge: RU:Tag:amenity=fridge
     amenity=fuel: RU:Tag:amenity=fuel
+    amenity=game_feeding: RU:Tag:amenity=game feeding
     amenity=grave_yard: RU:Tag:amenity=grave yard
     amenity=grit_bin: RU:Tag:amenity=grit bin
+    amenity=harbourmaster: RU:Tag:amenity=harbourmaster
     amenity=hookah_lounge: RU:Tag:amenity=hookah lounge
+    amenity=hospice: RU:Tag:amenity=hospice
     amenity=hospital: RU:Tag:amenity=hospital
     amenity=ice_cream: RU:Tag:amenity=ice cream
     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=letter_box: RU:Tag:amenity=letter box
     amenity=library: RU:Tag:amenity=library
     amenity=loading_dock: RU:Tag:amenity=loading dock
     amenity=love_hotel: RU:Tag:amenity=love hotel
+    amenity=marae: RU:Tag:amenity=marae
     amenity=marketplace: RU:Tag:amenity=marketplace
+    amenity=mobile_library: RU:Tag:amenity=mobile library
     amenity=monastery: RU:Tag:amenity=monastery
     amenity=mortuary: RU:Tag:amenity=mortuary
     amenity=motorcycle_parking: RU:Tag:amenity=motorcycle parking
@@ -16036,46 +17924,77 @@ ru:
     amenity=sanitary_dump_station: RU:Tag:amenity=sanitary dump station
     amenity=sauna: RU:Tag:amenity=sauna
     amenity=school: RU:Tag:amenity=school
+    amenity=seat: RU:Tag:amenity=seat
     amenity=shelter: RU:Tag:amenity=shelter
     amenity=shop: RU:Tag:amenity=shop
     amenity=shower: RU:Tag:amenity=shower
     amenity=smoking_area: RU:Tag:amenity=smoking area
     amenity=social_facility: RU:Tag:amenity=social facility
+    amenity=stool: RU:Tag:amenity=stool
     amenity=stripclub: RU:Tag:amenity=stripclub
     amenity=studio: RU:Tag:amenity=studio
+    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=toilets: RU:Tag:amenity=toilets
     amenity=townhall: RU:Tag:amenity=townhall
+    amenity=trolley_bay: RU:Tag:amenity=trolley bay
     amenity=university: RU:Tag:amenity=university
+    amenity=vacuum_cleaner: RU:Tag:amenity=vacuum cleaner
+    amenity=vehicle_inspection: RU:Tag:amenity=vehicle inspection
     amenity=vehicle_ramp: RU:Tag:amenity=vehicle ramp
     amenity=vending_machine: RU:Tag:amenity=vending machine
     amenity=veterinary: RU:Tag:amenity=veterinary
+    amenity=veterinary_pharmacy: RU:Tag:amenity=veterinary pharmacy
+    amenity=washing_machine: RU:Tag:amenity=washing machine
     amenity=waste_basket: RU:Tag:amenity=waste basket
     amenity=waste_disposal: RU:Tag:amenity=waste disposal
     amenity=water_point: RU:Tag:amenity=water point
     amenity=watering_place: RU:Tag:amenity=watering place
     amenity=weighbridge: RU:Tag:amenity=weighbridge
+    animated=trivision_blades: RU:Tag:animated=trivision blades
+    animated=winding_posters: RU:Tag:animated=winding posters
+    anthropogenic=yes: RU:Tag:anthropogenic=yes
+    artwork_type=sculpture: RU:Tag:artwork type=sculpture
+    artwork_type=statue: RU:Tag:artwork type=statue
     atm=yes: RU:Tag:atm=yes
+    attraction=animal: RU:Tag:attraction=animal
+    attraction=summer_toboggan: RU:Tag:attraction=summer toboggan
+    attraction=train: RU:Tag:attraction=train
+    attraction=water_slide: RU:Tag:attraction=water slide
     barrier=block: RU:Tag:barrier=block
     barrier=bollard: RU:Tag:barrier=bollard
     barrier=border_control: RU:Tag:barrier=border control
+    barrier=bump_gate: RU:Tag:barrier=bump gate
+    barrier=bus_trap: RU:Tag:barrier=bus trap
+    barrier=cable_barrier: RU:Tag:barrier=cable barrier
     barrier=cattle_grid: RU:Tag:barrier=cattle grid
+    barrier=chain: RU:Tag:barrier=chain
     barrier=chech_hedgehog: RU:Tag:barrier=chech hedgehog
     barrier=city_wall: RU:Tag:barrier=city wall
     barrier=czech_hedgehog: RU:Tag:barrier=czech hedgehog
+    barrier=debris: RU:Tag:barrier=debris
     barrier=ditch: RU:Tag:barrier=ditch
     barrier=entrance: RU:Tag:barrier=entrance
     barrier=fence: RU:Tag:barrier=fence
     barrier=full-height_turnstile: RU:Tag:barrier=full-height turnstile
     barrier=gate: RU:Tag:barrier=gate
+    barrier=guard_rail: RU:Tag:barrier=guard rail
+    barrier=hampshire_gate: RU:Tag:barrier=hampshire gate
     barrier=handrail: RU:Tag:barrier=handrail
     barrier=hedge: RU:Tag:barrier=hedge
+    barrier=hedge_bank: RU:Tag:barrier=hedge bank
+    barrier=height_restrictor: RU:Tag:barrier=height restrictor
     barrier=kerb: RU:Tag:barrier=kerb
     barrier=lift_gate: RU:Tag:barrier=lift gate
+    barrier=log: RU:Tag:barrier=log
     barrier=retaining_wall: RU:Tag:barrier=retaining wall
     barrier=sally_port: RU:Tag:barrier=sally port
+    barrier=swing_gate: RU:Tag:barrier=swing gate
+    barrier=tank_trap: RU:Tag:barrier=tank trap
     barrier=toll_booth: RU:Tag:barrier=toll booth
     barrier=turnstile: RU:Tag:barrier=turnstile
     barrier=wall: RU:Tag:barrier=wall
@@ -16114,6 +18033,7 @@ ru:
     building=detached: RU:Tag:building=detached
     building=dormitory: RU:Tag:building=dormitory
     building=entrance: RU:Tag:building=entrance
+    building=farm_auxiliary: RU:Tag:building=farm auxiliary
     building=font: RU:Tag:building=font
     building=garage: RU:Tag:building=garage
     building=garages: RU:Tag:building=garages
@@ -16138,6 +18058,7 @@ ru:
     building=service: RU:Tag:building=service
     building=shed: RU:Tag:building=shed
     building=stable: RU:Tag:building=stable
+    building=sty: RU:Tag:building=sty
     building=synagogue: RU:Tag:building=synagogue
     building=train_station: RU:Tag:building=train station
     building=transportation: RU:Tag:building=transportation
@@ -16146,6 +18067,13 @@ ru:
     building=water_tower: RU:Tag:building=water tower
     bunker_type=pillbox: RU:Tag:bunker type=pillbox
     cafe=time-cafe: RU:Tag:cafe=time-cafe
+    castle_type=defensive: RU:Tag:castle type=defensive
+    castle_type=fortress: RU:Tag:castle type=fortress
+    castle_type=kremlin: RU:Tag:castle type=kremlin
+    castle_type=manor: RU:Tag:castle type=manor
+    castle_type=palace: RU:Tag:castle type=palace
+    castle_type=shiro: RU:Tag:castle type=shiro
+    castle_type=stately: RU:Tag:castle type=stately
     cemetery=grave: RU:Tag:cemetery=grave
     craft=agricultural_engines: RU:Tag:craft=agricultural engines
     craft=basket_maker: RU:Tag:craft=basket maker
@@ -16177,6 +18105,7 @@ ru:
     emergency=fire_hose: RU:Tag:emergency=fire hose
     emergency=fire_hydrant: RU:Tag:emergency=fire hydrant
     emergency=fire_water_pond: RU:Tag:emergency=fire water pond
+    emergency=phone: RU:Tag:emergency=phone
     emergency=water_tank: RU:Tag:emergency=water tank
     entrance=staircase: RU:Tag:entrance=staircase
     fast_food=cafeteria: RU:Tag:fast food=cafeteria
@@ -16184,6 +18113,7 @@ ru:
     footway=crossing: RU:Tag:footway=crossing
     footway=sidewalk: RU:Tag:footway=sidewalk
     generator:method=anaerobic_digestion: RU:Tag:generator:method=anaerobic digestion
+    generator:source=hydro: RU:Tag:generator:source=hydro
     generator:type=boiler: RU:Tag:generator:type=boiler
     geological=palaeontological_site: RU:Tag:geological=palaeontological site
     healthcare=blood_donation: RU:Tag:healthcare=blood donation
@@ -16226,6 +18156,7 @@ ru:
     highway=street_lamp: RU:Tag:highway=street lamp
     highway=tertiary: RU:Tag:highway=tertiary
     highway=tertiary_link: RU:Tag:highway=tertiary link
+    highway=toll_gantry: RU:Tag:highway=toll gantry
     highway=track: RU:Tag:highway=track
     highway=traffic_signals: RU:Tag:highway=traffic signals
     highway=trunk: RU:Tag:highway=trunk
@@ -16233,21 +18164,35 @@ ru:
     highway=turning_circle: RU:Tag:highway=turning circle
     highway=unclassified: RU:Tag:highway=unclassified
     historic=aircraft: RU:Tag:historic=aircraft
+    historic=aqueduct: RU:Tag:historic=aqueduct
     historic=archaeological_site: RU:Tag:historic=archaeological site
     historic=battlefield: RU:Tag:historic=battlefield
     historic=boundary_stone: RU:Tag:historic=boundary stone
     historic=cannon: RU:Tag:historic=cannon
     historic=castle: RU:Tag:historic=castle
+    historic=castle_wall: RU:Tag:historic=castle wall
     historic=city_gate: RU:Tag:historic=city gate
     historic=citywalls: RU:Tag:historic=citywalls
+    historic=farm: RU:Tag:historic=farm
     historic=fort: RU:Tag:historic=fort
+    historic=gallows: RU:Tag:historic=gallows
+    historic=heritage: RU:Tag:historic=heritage
+    historic=highwater_mark: RU:Tag:historic=highwater mark
     historic=locomotive: RU:Tag:historic=locomotive
+    historic=manor: RU:Tag:historic=manor
     historic=memorial: RU:Tag:historic=memorial
     historic=milestone: RU:Tag:historic=milestone
+    historic=mine: RU:Tag:historic=mine
+    historic=monastery: RU:Tag:historic=monastery
     historic=monument: RU:Tag:historic=monument
+    historic=optical_telegraph: RU:Tag:historic=optical telegraph
+    historic=pa: RU:Tag:historic=pa
+    historic=pillory: RU:Tag:historic=pillory
     historic=ruins: RU:Tag:historic=ruins
     historic=rune_stone: RU:Tag:historic=rune stone
     historic=ship: RU:Tag:historic=ship
+    historic=stone: RU:Tag:historic=stone
+    historic=tank: RU:Tag:historic=tank
     historic=tree_shrine: RU:Tag:historic=tree shrine
     historic=wayside_cross: RU:Tag:historic=wayside cross
     historic=wayside_shrine: RU:Tag:historic=wayside shrine
@@ -16258,6 +18203,7 @@ ru:
     industrial=well_cluster: RU:Tag:industrial=well cluster
     information=board: RU:Tag:information=board
     information=guidepost: RU:Tag:information=guidepost
+    information=office: RU:Tag:information=office
     junction=roundabout: RU:Tag:junction=roundabout
     landuse=allotments: RU:Tag:landuse=allotments
     landuse=animal_keeping: RU:Tag:landuse=animal keeping
@@ -16291,6 +18237,7 @@ ru:
     landuse=residential: RU:Tag:landuse=residential
     landuse=retail: RU:Tag:landuse=retail
     landuse=salt_pond: RU:Tag:landuse=salt pond
+    landuse=turbary: RU:Tag:landuse=turbary
     landuse=village_green: RU:Tag:landuse=village green
     landuse=vineyard: RU:Tag:landuse=vineyard
     leaf_cycle=deciduous: RU:Tag:leaf cycle=deciduous
@@ -16307,6 +18254,7 @@ ru:
     leisure=firepit: RU:Tag:leisure=firepit
     leisure=fitness_centre: RU:Tag:leisure=fitness centre
     leisure=fitness_station: RU:Tag:leisure=fitness station
+    leisure=garden: RU:Tag:leisure=garden
     leisure=hackerspace: RU:Tag:leisure=hackerspace
     leisure=horse_riding: RU:Tag:leisure=horse riding
     leisure=ice_rink: RU:Tag:leisure=ice rink
@@ -16330,15 +18278,19 @@ ru:
     man_made=bunker_silo: RU:Tag:man made=bunker silo
     man_made=campanile: RU:Tag:man made=campanile
     man_made=carpet_hanger: RU:Tag:man made=carpet hanger
+    man_made=chiller: RU:Tag:man made=chiller
+    man_made=chimney: RU:Tag:man made=chimney
     man_made=clearcut: RU:Tag:man made=clearcut
     man_made=communications_tower: RU:Tag:man made=communications tower
     man_made=cooling_tower: RU:Tag:man made=cooling tower
     man_made=crane: RU:Tag:man made=crane
+    man_made=cross: RU:Tag:man made=cross
     man_made=cutline: RU:Tag:man made=cutline
     man_made=dovecote: RU:Tag:man made=dovecote
     man_made=dyke: RU:Tag:man made=dyke
     man_made=embankment: RU:Tag:man made=embankment
     man_made=flagpole: RU:Tag:man made=flagpole
+    man_made=flare: RU:Tag:man made=flare
     man_made=lighthouse: RU:Tag:man made=lighthouse
     man_made=mast: RU:Tag:man made=mast
     man_made=mineshaft: RU:Tag:man made=mineshaft
@@ -16350,7 +18302,9 @@ ru:
     man_made=pillar: RU:Tag:man made=pillar
     man_made=pipeline: RU:Tag:man made=pipeline
     man_made=reservoir_covered: RU:Tag:man made=reservoir covered
+    man_made=silo: RU:Tag:man made=silo
     man_made=storage_tank: RU:Tag:man made=storage tank
+    man_made=street_cabinet: RU:Tag:man made=street cabinet
     man_made=surveillance: RU:Tag:man made=surveillance
     man_made=survey_point: RU:Tag:man made=survey point
     man_made=telescope: RU:Tag:man made=telescope
@@ -16364,10 +18318,12 @@ ru:
     man_made=wildlife_crossing: RU:Tag:man made=wildlife crossing
     man_made=windmill: RU:Tag:man made=windmill
     man_made=works: RU:Tag:man made=works
+    memorial=stele: RU:Tag:memorial=stele
     military=airfield: RU:Tag:military=airfield
     military=bunker: RU:Tag:military=bunker
     military=checkpoint: RU:Tag:military=checkpoint
     military=naval_base: RU:Tag:military=naval base
+    military=training_area: RU:Tag:military=training area
     name=Продукты: RU:Tag:name=Продукты
     natural=arete: RU:Tag:natural=arete
     natural=bare_rock: RU:Tag:natural=bare rock
@@ -16442,6 +18398,9 @@ ru:
     place=suburb: RU:Tag:place=suburb
     place=town: RU:Tag:place=town
     place=village: RU:Tag:place=village
+    playground=slide: RU:Tag:playground=slide
+    playground=structure: RU:Tag:playground=structure
+    police=barracks: RU:Tag:police=barracks
     power=generator: RU:Tag:power=generator
     power=heliostat: RU:Tag:power=heliostat
     power=line: RU:Tag:power=line
@@ -16460,6 +18419,7 @@ ru:
     railway=abandoned: RU:Tag:railway=abandoned
     railway=crossing: RU:Tag:railway=crossing
     railway=level_crossing: RU:Tag:railway=level crossing
+    railway=light_rail: RU:Tag:railway=light rail
     railway=miniature: RU:Tag:railway=miniature
     railway=narrow_gauge: RU:Tag:railway=narrow gauge
     railway=preserved: RU:Tag:railway=preserved
@@ -16474,6 +18434,7 @@ ru:
     religion=pagan: RU:Tag:religion=pagan
     religion=zoroastrian: RU:Tag:religion=zoroastrian
     residential=rural: RU:Tag:residential=rural
+    residential=urban: RU:Tag:residential=urban
     route=bus: RU:Tag:route=bus
     route=ferry: RU:Tag:route=ferry
     route=railway: RU:Tag:route=railway
@@ -16533,6 +18494,7 @@ ru:
     shop=fabrics: RU:Tag:shop=fabrics
     shop=farm: RU:Tag:shop=farm
     shop=fashion: RU:Tag:shop=fashion
+    shop=fireplace: RU:Tag:shop=fireplace
     shop=fishing: RU:Tag:shop=fishing
     shop=fishmonger: RU:Tag:shop=fishmonger
     shop=flooring: RU:Tag:shop=flooring
@@ -16552,6 +18514,7 @@ ru:
     shop=hearing_aids: RU:Tag:shop=hearing aids
     shop=herbalist: RU:Tag:shop=herbalist
     shop=hifi: RU:Tag:shop=hifi
+    shop=household_linen: RU:Tag:shop=household linen
     shop=houseware: RU:Tag:shop=houseware
     shop=hunting: RU:Tag:shop=hunting
     shop=interior_decoration: RU:Tag:shop=interior decoration
@@ -16604,6 +18567,7 @@ ru:
     shop=wholesale: RU:Tag:shop=wholesale
     shop=window_blind: RU:Tag:shop=window blind
     sinkhole=bluehole: RU:Tag:sinkhole=bluehole
+    site_type=fortification: RU:Tag:site type=fortification
     social_facility=group_home: RU:Tag:social facility=group home
     sport=archery: RU:Tag:sport=archery
     sport=futsal: RU:Tag:sport=futsal
@@ -16615,9 +18579,11 @@ ru:
     summit:cross=yes: RU:Tag:summit:cross=yes
     tank_trap=czech_hedgehog: RU:Tag:tank trap=czech hedgehog
     tourism=apartment: RU:Tag:tourism=apartment
+    tourism=aquarium: RU:Tag:tourism=aquarium
     tourism=artwork: RU:Tag:tourism=artwork
     tourism=attraction: RU:Tag:tourism=attraction
     tourism=camp_site: RU:Tag:tourism=camp site
+    tourism=caravan_site: RU:Tag:tourism=caravan site
     tourism=chalet: RU:Tag:tourism=chalet
     tourism=gallery: RU:Tag:tourism=gallery
     tourism=guest_house: RU:Tag:tourism=guest house
@@ -16695,6 +18661,7 @@ tr:
     amenity=brothel: Tr:Tag:amenity=brothel
     amenity=place_of_worship: Tr:Tag:amenity=place of worship
     amenity=school: Tr:Tag:amenity=school
+    boundary=administrative: Tr:Tag:boundary=administrative
     building=mosque: Tr:Tag:building=mosque
 uk:
   key:
@@ -16785,10 +18752,12 @@ uk:
     place: Uk:Key:place
     playground: Uk:Key:playground
     power: Uk:Key:power
+    pump: Uk:Key:pump
     railway: Uk:Key:railway
     ref: Uk:Key:ref
     reference: Uk:Key:reference
     reg_name: Uk:Key:reg name
+    religion: Uk:Key:religion
     right: Uk:Key:right
     route: Uk:Key:route
     service: Uk:Key:service
@@ -16808,6 +18777,7 @@ uk:
     url: Uk:Key:url
     vehicle: Uk:Key:vehicle
     water: Uk:Key:water
+    water_source: Uk:Key:water source
     waterway: Uk:Key:waterway
     width: Uk:Key:width
     wikipedia: Uk:Key:wikipedia
@@ -16817,7 +18787,14 @@ uk:
     amenity=bench: Uk:Tag:amenity=bench
     amenity=bicycle_parking: Uk:Tag:amenity=bicycle parking
     amenity=bicycle_rental: Uk:Tag:amenity=bicycle rental
+    amenity=clinic: Uk:Tag:amenity=clinic
+    amenity=drinking_water: Uk:Tag:amenity=drinking water
     amenity=fuel: Uk:Tag:amenity=fuel
+    amenity=grave_yard: Uk:Tag:amenity=grave yard
+    amenity=hospital: Uk:Tag:amenity=hospital
+    amenity=kiosk: Uk:Tag:amenity=kiosk
+    amenity=park: Uk:Tag:amenity=park
+    amenity=parking: Uk:Tag:amenity=parking
     amenity=payment_terminal: Uk:Tag:amenity=payment terminal
     amenity=pharmacy: Uk:Tag:amenity=pharmacy
     amenity=place_of_worship: Uk:Tag:amenity=place of worship
@@ -16827,6 +18804,8 @@ uk:
     amenity=university: Uk:Tag:amenity=university
     barrier=retaining_wall: Uk:Tag:barrier=retaining wall
     building=commercial: Uk:Tag:building=commercial
+    building=hospital: Uk:Tag:building=hospital
+    craft=agricultural_engines: Uk:Tag:craft=agricultural engines
     craft=bookbinder: Uk:Tag:craft=bookbinder
     emergency=fire_hydrant: Uk:Tag:emergency=fire hydrant
     emergency=fire_water_pond: Uk:Tag:emergency=fire water pond
@@ -16859,14 +18838,19 @@ uk:
     historic=memorial: Uk:Tag:historic=memorial
     historic=monument: Uk:Tag:historic=monument
     historic=wayside_cross: Uk:Tag:historic=wayside cross
+    industrial=bakery: Uk:Tag:industrial=bakery
+    landuse=cemetery: Uk:Tag:landuse=cemetery
     landuse=flowerbed: Uk:Tag:landuse=flowerbed
     landuse=forest: Uk:Tag:landuse=forest
     landuse=hop_garden: Uk:Tag:landuse=hop garden
+    landuse=residential: Uk:Tag:landuse=residential
     landuse=village_green: Uk:Tag:landuse=village green
     leaf_cycle=evergreen: Uk:Tag:leaf cycle=evergreen
     leisure=common: Uk:Tag:leisure=common
+    man_made=cross: Uk:Tag:man made=cross
     man_made=embankment: Uk:Tag:man made=embankment
     man_made=pier: Uk:Tag:man made=pier
+    man_made=water_well: Uk:Tag:man made=water well
     natural=bare_rock: Uk:Tag:natural=bare rock
     natural=grassland: Uk:Tag:natural=grassland
     natural=scrub: Uk:Tag:natural=scrub
@@ -16889,10 +18873,12 @@ uk:
     office=research: Uk:Tag:office=research
     office=telecommunication: Uk:Tag:office=telecommunication
     office=travel_agent: Uk:Tag:office=travel agent
+    pump=powered: Uk:Tag:pump=powered
     railway=halt: Uk:Tag:railway=halt
     railway=rail: Uk:Tag:railway=rail
     railway=station: Uk:Tag:railway=station
     railway=tram: Uk:Tag:railway=tram
+    religion=christian: Uk:Tag:religion=christian
     route=train: Uk:Tag:route=train
     shop=antiques: Uk:Tag:shop=antiques
     shop=baby_goods: Uk:Tag:shop=baby goods
@@ -16982,6 +18968,7 @@ zh-hans:
     highway=footway: Zh-hans:Tag:highway=footway
     highway=residential: Zh-hans:Tag:highway=residential
     highway=tertiary: Zh-hans:Tag:highway=tertiary
+    place=hamlet: Zh-hans:Tag:place=hamlet
     railway=light_rail: Zh-hans:Tag:railway=light rail
     railway=subway: Zh-hans:Tag:railway=subway
     railway=subway_entrance: Zh-hans:Tag:railway=subway entrance
@@ -16991,13 +18978,21 @@ zh-hans:
     station=subway: Zh-hans:Tag:station=subway
 zh-hant:
   key:
+    access: Zh-hant:Key:access
     aeroway: Zh-hant:Key:aeroway
     amenity: Zh-hant:Key:amenity
     bridge: Zh-hant:Key:bridge
     conveying: Zh-hant:Key:conveying
+    covered: Zh-hant:Key:covered
+    cutting: Zh-hant:Key:cutting
     diet:*: Zh-hant:Key:diet:*
+    embankment: Zh-hant:Key:embankment
     fixme: Zh-hant:Key:fixme
+    ford: Zh-hant:Key:ford
     fuel: Zh-hant:Key:fuel
+    highway: Zh-hant:Key:highway
+    is_in: Zh-hant:Key:is in
+    layer: Zh-hant:Key:layer
     maxspeed: Zh-hant:Key:maxspeed
     name: Zh-hant:Key:name
     noexit: Zh-hant:Key:noexit
@@ -17011,30 +19006,51 @@ zh-hant:
     traffic_calming: Zh-hant:Key:traffic calming
     trail_visibility: Zh-hant:Key:trail visibility
   tag:
+    amenity=archive: Zh-hant:Tag:amenity=archive
     amenity=bench: Zh-hant:Tag:amenity=bench
+    amenity=car_rental: Zh-hant:Tag:amenity=car rental
     amenity=coworking_space: Zh-hant:Tag:amenity=coworking space
     amenity=crematorium: Zh-hant:Tag:amenity=crematorium
+    amenity=drinking_water: Zh-hant:Tag:amenity=drinking water
     amenity=fountain: Zh-hant:Tag:amenity=fountain
     amenity=fuel: Zh-hant:Tag:amenity=fuel
     amenity=place_of_worship: Zh-hant:Tag:amenity=place of worship
     amenity=post_box: Zh-hant:Tag:amenity=post box
+    amenity=research_institute: Zh-hant:Tag:amenity=research institute
+    amenity=ticket_validator: Zh-hant:Tag:amenity=ticket validator
     amenity=toilets: Zh-hant:Tag:amenity=toilets
     building=roof: Zh-hant:Tag:building=roof
     highway=bus_guideway: Zh-hant:Tag:highway=bus guideway
     highway=bus_stop: Zh-hant:Tag:highway=bus stop
     highway=footway: Zh-hant:Tag:highway=footway
+    highway=give_way: Zh-hant:Tag:highway=give way
     highway=milestone: Zh-hant:Tag:highway=milestone
+    highway=motorway: Zh-hant:Tag:highway=motorway
+    highway=passing_place: Zh-hant:Tag:highway=passing place
+    highway=path: Zh-hant:Tag:highway=path
+    highway=pedestrian: Zh-hant:Tag:highway=pedestrian
+    highway=primary: Zh-hant:Tag:highway=primary
+    highway=residential: Zh-hant:Tag:highway=residential
+    highway=secondary: Zh-hant:Tag:highway=secondary
+    highway=service: Zh-hant:Tag:highway=service
+    highway=services: Zh-hant:Tag:highway=services
+    highway=tertiary: Zh-hant:Tag:highway=tertiary
+    highway=track: Zh-hant:Tag:highway=track
+    highway=traffic_signals: Zh-hant:Tag:highway=traffic signals
+    highway=trunk: Zh-hant:Tag:highway=trunk
     highway=unclassified: Zh-hant:Tag:highway=unclassified
     historic=aircraft: Zh-hant:Tag:historic=aircraft
     landuse=cemetery: Zh-hant:Tag:landuse=cemetery
+    leisure=adult_gaming_centre: Zh-hant:Tag:leisure=adult gaming centre
+    leisure=firepit: Zh-hant:Tag:leisure=firepit
     leisure=pitch: Zh-hant:Tag:leisure=pitch
+    man_made=embankment: Zh-hant:Tag:man made=embankment
     natural=peak: Zh-hant:Tag:natural=peak
     railway=rail: Zh-hant:Tag:railway=rail
+    service=alley: Zh-hant:Tag:service=alley
     service=drive-through: Zh-hant:Tag:service=drive-through
     shop=funeral_directors: Zh-hant:Tag:shop=funeral directors
+    shop=games: Zh-hant:Tag:shop=games
     shop=gas: Zh-hant:Tag:shop=gas
     tourism=alpine_hut: Zh-hant:Tag:tourism=alpine hut
-·es:
-  key:
-    addr:inclusion: ·ES:Key:addr:inclusion