]> git.openstreetmap.org Git - rails.git/blobdiff - config/wiki_pages.yml
Merge remote-tracking branch 'upstream/pull/5702'
[rails.git] / config / wiki_pages.yml
index c7c32cda9755571b0528266212639531632f34d1..1995dcf380a6843c4e9efc93093cc70a4b84b78d 100644 (file)
@@ -2,6 +2,10 @@
 # PROGRAM DO NOT MANUALLY EDIT IT
 
 ---
+af:
+  tag:
+    genus=Tilia: Af:Tag:genus=Tilia
+    religion=muslim: Af:Tag:religion=muslim
 ar:
   key:
     highway: Ar:Key:highway
@@ -12,12 +16,24 @@ ar:
     amenity=restaurant: Ar:Tag:amenity=restaurant
     amenity=school: Ar:Tag:amenity=school
     amenity=toilets: Ar:Tag:amenity=toilets
+    genus=Acer: Ar:Tag:genus=Acer
+    genus=Platanus: Ar:Tag:genus=Platanus
+    genus=Quercus: Ar:Tag:genus=Quercus
+    healthcare=physiotherapist: Ar:Tag:healthcare=physiotherapist
+    leaf_cycle=evergreen: Ar:Tag:leaf cycle=evergreen
+    man_made=lighthouse: Ar:Tag:man made=lighthouse
+    religion=confucian: Ar:Tag:religion=confucian
+    religion=jewish: Ar:Tag:religion=jewish
+    religion=multifaith: Ar:Tag:religion=multifaith
+    religion=muslim: Ar:Tag:religion=muslim
+    religion=sikh: Ar:Tag:religion=sikh
     shop=bakery: Ar:Tag:shop=bakery
     shop=mall: Ar:Tag:shop=mall
 az:
   tag:
     craft=locksmith: Az:Tag:craft=locksmith
     highway=speed_camera: Az:Tag:highway=speed camera
+    religion=muslim: Az:Tag:religion=muslim
 bg:
   key:
     building: Bg:Key:building
@@ -27,14 +43,36 @@ bg:
   tag:
     barrier=guard_rail: Bg:Tag:barrier=guard rail
     building=chapel: Bg:Tag:building=chapel
+    genus=Tilia: Bg:Tag:genus=Tilia
     natural=heath: Bg:Tag:natural=heath
     railway=crossing: Bg:Tag:railway=crossing
     railway=level_crossing: Bg:Tag:railway=level crossing
+    religion=jewish: Bg:Tag:religion=jewish
     shop=sewing: Bg:Tag:shop=sewing
     traffic_calming=bump: Bg:Tag:traffic calming=bump
+    waste=ash: Bg:Tag:waste=ash
+    water=basin: Bg:Tag:water=basin
+bn:
+  tag:
+    genus=Acer: Bn:Tag:genus=Acer
+    genus=Platanus: Bn:Tag:genus=Platanus
+    genus=Quercus: Bn:Tag:genus=Quercus
+    healthcare=physiotherapist: Bn:Tag:healthcare=physiotherapist
+    leaf_cycle=evergreen: Bn:Tag:leaf cycle=evergreen
+    man_made=lighthouse: Bn:Tag:man made=lighthouse
+    religion=buddhist: Bn:Tag:religion=buddhist
+    religion=confucian: Bn:Tag:religion=confucian
+    religion=hindu: Bn:Tag:religion=hindu
+    religion=muslim: Bn:Tag:religion=muslim
 br:
   key:
     highway: Br:Key:highway
+bs:
+  tag:
+    genus=Platanus: Bs:Tag:genus=Platanus
+    genus=Tilia: Bs:Tag:genus=Tilia
+    leaf_cycle=evergreen: Bs:Tag:leaf cycle=evergreen
+    religion=muslim: Bs:Tag:religion=muslim
 ca:
   key:
     aerialway: Ca:Key:aerialway
@@ -45,6 +83,7 @@ ca:
     city_limit: Ca:Key:city limit
     contact:facebook: Ca:Key:contact:facebook
     created_by: Ca:Key:created by
+    cyclestreet: Ca:Key:cyclestreet
     facebook: Ca:Key:facebook
     foot: Ca:Key:foot
     lgbtq: Ca:Key:lgbtq
@@ -143,6 +182,7 @@ ca:
     building=hospital: Ca:Tag:building=hospital
     building=hut: Ca:Tag:building=hut
     building=residential: Ca:Tag:building=residential
+    building=retail: Ca:Tag:building=retail
     craft=blacksmith: Ca:Tag:craft=blacksmith
     craft=restoration: Ca:Tag:craft=restoration
     crossing=traffic_signals: Ca:Tag:crossing=traffic signals
@@ -160,6 +200,7 @@ ca:
     network=VE:T:PO: Ca:Tag:network=VE:T:PO
     office=notary: Ca:Tag:office=notary
     oneway=yes: Ca:Tag:oneway=yes
+    parking=lane: Ca:Tag:parking=lane
     parking=surface: Ca:Tag:parking=surface
     place=isolated_dwelling: Ca:Tag:place=isolated dwelling
     power=line: Ca:Tag:power=line
@@ -171,6 +212,9 @@ ca:
     tactile_paving=no: Ca:Tag:tactile paving=no
     traffic_sign=city_limit: Ca:Tag:traffic sign=city limit
     vending=books: Ca:Tag:vending=books
+cnr:
+  key:
+    name:cnr: Cnr:Key:name:cnr
 cs:
   key:
     3dr:type: Cs:Key:3dr:type
@@ -213,6 +257,7 @@ cs:
     addr:unit: Cs:Key:addr:unit
     admin_level: Cs:Key:admin level
     advertising: Cs:Key:advertising
+    aerial: Cs:Key:aerial
     aerialway: Cs:Key:aerialway
     aerialway:drag_lift: Cs:Key:aerialway:drag lift
     aerialway:duration: Cs:Key:aerialway:duration
@@ -434,7 +479,6 @@ cs:
     fishing: Cs:Key:fishing
     fixme: Cs:Key:fixme
     floating: Cs:Key:floating
-    flood_prone: Cs:Key:flood prone
     foot: Cs:Key:foot
     footway: Cs:Key:footway
     ford: Cs:Key:ford
@@ -504,7 +548,6 @@ cs:
     incline: Cs:Key:incline
     indoor: Cs:Key:indoor
     industrial: Cs:Key:industrial
-    informal: Cs:Key:informal
     information: Cs:Key:information
     inline_skates: Cs:Key:inline skates
     inscription: Cs:Key:inscription
@@ -626,7 +669,6 @@ cs:
     museum_type: Cs:Key:museum type
     name: Cs:Key:name
     name:cs: Cs:Key:name:cs
-    name:de: Cs:Key:name:de
     name:en: Cs:Key:name:en
     name_1: Cs:Key:name 1
     narrow: Cs:Key:narrow
@@ -994,7 +1036,6 @@ cs:
     amenity=clinic: Cs:Tag:amenity=clinic
     amenity=clock: Cs:Tag:amenity=clock
     amenity=college: Cs:Tag:amenity=college
-    amenity=community_center: Cs:Tag:amenity=community center
     amenity=community_centre: Cs:Tag:amenity=community centre
     amenity=compressed_air: Cs:Tag:amenity=compressed air
     amenity=courthouse: Cs:Tag:amenity=courthouse
@@ -1090,6 +1131,7 @@ cs:
     amenity=social_facility: Cs:Tag:amenity=social facility
     amenity=spa: Cs:Tag:amenity=spa
     amenity=stables: Cs:Tag:amenity=stables
+    amenity=stage: Cs:Tag:amenity=stage
     amenity=stripclub: Cs:Tag:amenity=stripclub
     amenity=studio: Cs:Tag:amenity=studio
     amenity=swimming_pool: Cs:Tag:amenity=swimming pool
@@ -1260,6 +1302,7 @@ cs:
     building=synagogue: Cs:Tag:building=synagogue
     building=temple: Cs:Tag:building=temple
     building=terrace: Cs:Tag:building=terrace
+    building=terraced_house: Cs:Tag:building=terraced house
     building=train_station: Cs:Tag:building=train station
     building=transformer_tower: Cs:Tag:building=transformer tower
     building=transportation: Cs:Tag:building=transportation
@@ -1286,6 +1329,8 @@ cs:
     clothes=sports: Cs:Tag:clothes=sports
     clothes=underwear: Cs:Tag:clothes=underwear
     craft=agricultural_engines: Cs:Tag:craft=agricultural engines
+    craft=atelier: Cs:Tag:craft=atelier
+    craft=bag_repair: Cs:Tag:craft=bag repair
     craft=bakery: Cs:Tag:craft=bakery
     craft=basket_maker: Cs:Tag:craft=basket maker
     craft=beekeeper: Cs:Tag:craft=beekeeper
@@ -1294,6 +1339,8 @@ cs:
     craft=bookbinder: Cs:Tag:craft=bookbinder
     craft=brewery: Cs:Tag:craft=brewery
     craft=builder: Cs:Tag:craft=builder
+    craft=cabinet_maker: Cs:Tag:craft=cabinet maker
+    craft=candlemaker: Cs:Tag:craft=candlemaker
     craft=carpenter: Cs:Tag:craft=carpenter
     craft=carpet_layer: Cs:Tag:craft=carpet layer
     craft=caterer: Cs:Tag:craft=caterer
@@ -1301,6 +1348,7 @@ cs:
     craft=clockmaker: Cs:Tag:craft=clockmaker
     craft=confectionery: Cs:Tag:craft=confectionery
     craft=distillery: Cs:Tag:craft=distillery
+    craft=door_construction: Cs:Tag:craft=door construction
     craft=dressmaker: Cs:Tag:craft=dressmaker
     craft=electrician: Cs:Tag:craft=electrician
     craft=floorer: Cs:Tag:craft=floorer
@@ -1311,6 +1359,7 @@ cs:
     craft=hvac: Cs:Tag:craft=hvac
     craft=insulation: Cs:Tag:craft=insulation
     craft=jeweller: Cs:Tag:craft=jeweller
+    craft=joiner: Cs:Tag:craft=joiner
     craft=key_cutter: Cs:Tag:craft=key cutter
     craft=locksmith: Cs:Tag:craft=locksmith
     craft=metal_construction: Cs:Tag:craft=metal construction
@@ -1389,6 +1438,7 @@ cs:
     emergency=suction_point: Cs:Tag:emergency=suction point
     emergency=water_tank: Cs:Tag:emergency=water tank
     fast_food=cafeteria: Cs:Tag:fast food=cafeteria
+    flood_prone=yes: Cs:Tag:flood prone=yes
     foot=designated: Cs:Tag:foot=designated
     foot=yes: Cs:Tag:foot=yes
     footway=crossing: Cs:Tag:footway=crossing
@@ -1445,6 +1495,9 @@ cs:
     generator:type=steam_generator: Cs:Tag:generator:type=steam generator
     generator:type=steam_turbine: Cs:Tag:generator:type=steam turbine
     generator:type=vertical_axis: Cs:Tag:generator:type=vertical axis
+    genus=Acer: Cs:Tag:genus=Acer
+    genus=Platanus: Cs:Tag:genus=Platanus
+    genus=Quercus: Cs:Tag:genus=Quercus
     geological=moraine: Cs:Tag:geological=moraine
     geological=outcrop: Cs:Tag:geological=outcrop
     geological=palaeontological_site: Cs:Tag:geological=palaeontological site
@@ -1561,6 +1614,7 @@ cs:
     industrial=steelmaking: Cs:Tag:industrial=steelmaking
     industrial=warehouse: Cs:Tag:industrial=warehouse
     industrial=well_cluster: Cs:Tag:industrial=well cluster
+    informal=yes: Cs:Tag:informal=yes
     information=audioguide: Cs:Tag:information=audioguide
     information=board: Cs:Tag:information=board
     information=guidepost: Cs:Tag:information=guidepost
@@ -2039,6 +2093,7 @@ cs:
     shop=discount: Cs:Tag:shop=discount
     shop=dive: Cs:Tag:shop=dive
     shop=doityourself: Cs:Tag:shop=doityourself
+    shop=doors: Cs:Tag:shop=doors
     shop=dry_cleaning: Cs:Tag:shop=dry cleaning
     shop=e-cigarette: Cs:Tag:shop=e-cigarette
     shop=electrical: Cs:Tag:shop=electrical
@@ -2078,6 +2133,7 @@ cs:
     shop=golf: Cs:Tag:shop=golf
     shop=greengrocer: Cs:Tag:shop=greengrocer
     shop=grocery: Cs:Tag:shop=grocery
+    shop=groundskeeping: Cs:Tag:shop=groundskeeping
     shop=haberdashery: Cs:Tag:shop=haberdashery
     shop=hairdresser: Cs:Tag:shop=hairdresser
     shop=hairdresser_supply: Cs:Tag:shop=hairdresser supply
@@ -2087,6 +2143,7 @@ cs:
     shop=hearing_aids: Cs:Tag:shop=hearing aids
     shop=herbalist: Cs:Tag:shop=herbalist
     shop=hifi: Cs:Tag:shop=hifi
+    shop=honey: Cs:Tag:shop=honey
     shop=houseware: Cs:Tag:shop=houseware
     shop=hunting: Cs:Tag:shop=hunting
     shop=ice_cream: Cs:Tag:shop=ice cream
@@ -2321,6 +2378,7 @@ cs:
     waterway=brook: Cs:Tag:waterway=brook
     waterway=canal: Cs:Tag:waterway=canal
     waterway=dam: Cs:Tag:waterway=dam
+    waterway=debris_screen: Cs:Tag:waterway=debris screen
     waterway=ditch: Cs:Tag:waterway=ditch
     waterway=dock: Cs:Tag:waterway=dock
     waterway=drain: Cs:Tag:waterway=drain
@@ -2361,41 +2419,92 @@ da:
   key:
     access: Da:Key:access
     amenity: Da:Key:amenity
+    backcountry: Da:Key:backcountry
+    camp_site: Da:Key:camp site
+    camping: Da:Key:camping
+    caravans: Da:Key:caravans
+    community_centre: Da:Key:community centre
     cycleway: Da:Key:cycleway
+    description: Da:Key:description
     diet:vegan: Da:Key:diet:vegan
     fee: Da:Key:fee
+    fireplace: Da:Key:fireplace
+    group_only: Da:Key:group only
     lane_markings: Da:Key:lane markings
     lit: Da:Key:lit
     man_made: Da:Key:man made
     maxheight: Da:Key:maxheight
     maxspeed: Da:Key:maxspeed
+    natural: Da:Key:natural
+    shower: Da:Key:shower
     surface: Da:Key:surface
+    tents: Da:Key:tents
+    toilets: Da:Key:toilets
   tag:
+    aerialway=cable_car: Da:Tag:aerialway=cable car
+    aerialway=chair_lift: Da:Tag:aerialway=chair lift
+    aerialway=drag_lift: Da:Tag:aerialway=drag lift
+    aerialway=gondola: Da:Tag:aerialway=gondola
+    aerialway=mixed_lift: Da:Tag:aerialway=mixed lift
+    aerialway=zip_line: Da:Tag:aerialway=zip line
+    aeroway=aerodrome: Da:Tag:aeroway=aerodrome
+    aeroway=aircraft_crossing: Da:Tag:aeroway=aircraft crossing
+    aeroway=apron: Da:Tag:aeroway=apron
+    aeroway=gate: Da:Tag:aeroway=gate
+    aeroway=hangar: Da:Tag:aeroway=hangar
+    aeroway=helipad: Da:Tag:aeroway=helipad
+    amenity=bench: Da:Tag:amenity=bench
     amenity=community_centre: Da:Tag:amenity=community centre
     amenity=grave_yard: Da:Tag:amenity=grave yard
     amenity=nightclub: Da:Tag:amenity=nightclub
     amenity=place_of_worship: Da:Tag:amenity=place of worship
+    amenity=shelter: Da:Tag:amenity=shelter
     amenity=veterinary: Da:Tag:amenity=veterinary
+    camp_site=basic: Da:Tag:camp site=basic
+    camp_site=deluxe: Da:Tag:camp site=deluxe
+    camp_site=serviced: Da:Tag:camp site=serviced
+    camp_site=standard: Da:Tag:camp site=standard
+    cycleway=lane: Da:Tag:cycleway=lane
+    genus=Acer: Da:Tag:genus=Acer
     highway=bridleway: Da:Tag:highway=bridleway
     highway=cycleway: Da:Tag:highway=cycleway
     highway=ford: Da:Tag:highway=ford
+    highway=path: Da:Tag:highway=path
     highway=road: Da:Tag:highway=road
     highway=tertiary: Da:Tag:highway=tertiary
     highway=track: Da:Tag:highway=track
     highway=unclassified: Da:Tag:highway=unclassified
     landuse=cemetery: Da:Tag:landuse=cemetery
+    landuse=farmland: Da:Tag:landuse=farmland
     landuse=forest: Da:Tag:landuse=forest
+    leaf_cycle=evergreen: Da:Tag:leaf cycle=evergreen
     leisure=dog_park: Da:Tag:leisure=dog park
+    man_made=surveillance: Da:Tag:man made=surveillance
     natural=grassland: Da:Tag:natural=grassland
     natural=heath: Da:Tag:natural=heath
     natural=wood: Da:Tag:natural=wood
     noexit=yes: Da:Tag:noexit=yes
     place=hamlet: Da:Tag:place=hamlet
+    place=plot: Da:Tag:place=plot
     place=town: Da:Tag:place=town
     place=village: Da:Tag:place=village
     route=ferry: Da:Tag:route=ferry
     service=driveway: Da:Tag:service=driveway
+    shelter_type=basic_hut: Da:Tag:shelter type=basic hut
+    shelter_type=field_shelter: Da:Tag:shelter type=field shelter
+    shelter_type=lean_to: Da:Tag:shelter type=lean to
+    shelter_type=picnic_shelter: Da:Tag:shelter type=picnic shelter
+    shelter_type=public_transport: Da:Tag:shelter type=public transport
     shop=charity: Da:Tag:shop=charity
+    shop=outdoor: Da:Tag:shop=outdoor
+    sport=krolf: Da:Tag:sport=krolf
+    surface=paved: Da:Tag:surface=paved
+    surface=unpaved: Da:Tag:surface=unpaved
+    tourism=alpine_hut: Da:Tag:tourism=alpine hut
+    tourism=camp_pitch: Da:Tag:tourism=camp pitch
+    tourism=camp_site: Da:Tag:tourism=camp site
+    tourism=caravan_site: Da:Tag:tourism=caravan site
+    tourism=wilderness_hut: Da:Tag:tourism=wilderness hut
 de:
   key:
     4wd_only: DE:Key:4wd only
@@ -2428,8 +2537,10 @@ de:
     addr:postcode: DE:Key:addr:postcode
     addr:street: DE:Key:addr:street
     addr:suburb: DE:Key:addr:suburb
+    admin_level: DE:Key:admin level
     advertising: DE:Key:advertising
     aerialway: DE:Key:aerialway
+    aerialway:bicycle: DE:Key:aerialway:bicycle
     aerialway:drag_lift: DE:Key:aerialway:drag lift
     aerodrome:type: DE:Key:aerodrome:type
     aeroway: DE:Key:aeroway
@@ -2449,12 +2560,14 @@ de:
     artwork_type: DE:Key:artwork type
     asb: DE:Key:asb
     ascent: DE:Key:ascent
+    association: DE:Key:association
     attraction: DE:Key:attraction
     atv:repair: DE:Key:atv:repair
     authentication: DE:Key:authentication
     authentication:*: DE:Key:authentication:*
     automated: DE:Key:automated
     automatic_door: DE:Key:automatic door
+    baby_feeding: DE:Key:baby feeding
     backcountry: DE:Key:backcountry
     backrest: DE:Key:backrest
     backup_generator: DE:Key:backup generator
@@ -2468,9 +2581,13 @@ de:
     beauty: DE:Key:beauty
     beds: DE:Key:beds
     bench: DE:Key:bench
+    bettundbike: DE:Key:bettundbike
     bicycle: DE:Key:bicycle
     bicycle:backward: DE:Key:bicycle:backward
     bicycle:conditional: DE:Key:bicycle:conditional
+    bicycle:lanes: DE:Key:bicycle:lanes
+    bicycle:type: DE:Key:bicycle:type
+    bicycle_bypass: DE:Key:bicycle bypass
     bicycle_parking: DE:Key:bicycle parking
     bike_ride: DE:Key:bike ride
     bin: DE:Key:bin
@@ -2480,8 +2597,11 @@ de:
     boat: DE:Key:boat
     boat:rental: DE:Key:boat:rental
     bollard: DE:Key:bollard
+    bond: DE:Key:bond
     books: DE:Key:books
+    boot_scraper: DE:Key:boot scraper
     both: DE:Key:both
+    bottle: DE:Key:bottle
     boundary: DE:Key:boundary
     branch: DE:Key:branch
     brand: DE:Key:brand
@@ -2496,6 +2616,7 @@ de:
     buiding: DE:Key:buiding
     building: DE:Key:building
     building:architecture: DE:Key:building:architecture
+    building:colour: DE:Key:building:colour
     building:condition: DE:Key:building:condition
     building:flats: DE:Key:building:flats
     building:levels: DE:Key:building:levels
@@ -2505,20 +2626,25 @@ de:
     building:use: DE:Key:building:use
     bulk_purchase: DE:Key:bulk purchase
     bunker_type: DE:Key:bunker type
+    buried:wikidata: DE:Key:buried:wikidata
     bus: DE:Key:bus
     bus_bay: DE:Key:bus bay
     busway: DE:Key:busway
     button_operated: DE:Key:button operated
+    cabins: DE:Key:cabins
     cables: DE:Key:cables
     camera:type: DE:Key:camera:type
     canoe: DE:Key:canoe
     capacity: DE:Key:capacity
+    capacity:*: DE:Key:capacity:*
     capacity:charging: DE:Key:capacity:charging
     capacity:disabled: DE:Key:capacity:disabled
     capital: DE:Key:capital
     car_wash: DE:Key:car wash
     caravans: DE:Key:caravans
     cargo: DE:Key:cargo
+    cargo_bike: DE:Key:cargo bike
+    carpool: DE:Key:carpool
     carriage: DE:Key:carriage
     cash_withdrawal: DE:Key:cash withdrawal
     castle_type: DE:Key:castle type
@@ -2526,6 +2652,7 @@ de:
     changing_table: DE:Key:changing table
     charge: DE:Key:charge
     check_date: DE:Key:check date
+    check_date:*: DE:Key:check date:*
     checkpoint: DE:Key:checkpoint
     circuits: DE:Key:circuits
     circumference: DE:Key:circumference
@@ -2533,13 +2660,15 @@ de:
     class:bicycle: DE:Key:class:bicycle
     clothes: DE:Key:clothes
     club: DE:Key:club
+    coach: DE:Key:coach
     cocktails: DE:Key:cocktails
-    coffee: DE:Key:coffee
     collection_times: DE:Key:collection times
     colour: DE:Key:colour
     comment: DE:Key:comment
     communication:*: DE:Key:communication:*
+    communication:amateur_radio: DE:Key:communication:amateur radio
     communication:amateur_radio:repeater: DE:Key:communication:amateur radio:repeater
+    communication:amateur_radio:repeater:shift: DE:Key:communication:amateur radio:repeater:shift
     communication:amateur_radio:sota: DE:Key:communication:amateur radio:sota
     communication:bos: DE:Key:communication:bos
     communication:microwave: DE:Key:communication:microwave
@@ -2549,9 +2678,11 @@ de:
     community_centre: DE:Key:community centre
     community_centre:for: DE:Key:community centre:for
     company: DE:Key:company
+    compressed_air: DE:Key:compressed air
     conditional: DE:Key:conditional
     construction: DE:Key:construction
     construction:*: DE:Key:construction:*
+    construction:railway:etcs: DE:Key:construction:railway:etcs
     contact: DE:Key:contact
     'contact:': 'DE:Key:contact:'
     contact:*: DE:Key:contact:*
@@ -2566,6 +2697,9 @@ de:
     content: DE:Key:content
     conveying: DE:Key:conveying
     country: DE:Key:country
+    couplings: DE:Key:couplings
+    couplings:diameters: DE:Key:couplings:diameters
+    couplings:type: DE:Key:couplings:type
     covered: DE:Key:covered
     craft: DE:Key:craft
     crane:type: DE:Key:crane:type
@@ -2583,6 +2717,7 @@ de:
     crossing_ref: DE:Key:crossing ref
     cuisine: DE:Key:cuisine
     currency: DE:Key:currency
+    currency:*: DE:Key:currency:*
     currency:BTC: DE:Key:currency:BTC
     currency:EUR: DE:Key:currency:EUR
     currency:USD: DE:Key:currency:USD
@@ -2592,11 +2727,17 @@ de:
     cycle_barrier:installation: DE:Key:cycle barrier:installation
     cycle_highway: DE:Key:cycle highway
     cycleway: DE:Key:cycleway
+    cycleway:both: DE:Key:cycleway:both
+    cycleway:buffer: DE:Key:cycleway:buffer
+    cycleway:lane: DE:Key:cycleway:lane
+    cycleway:lanes: DE:Key:cycleway:lanes
     cycleway:left: DE:Key:cycleway:left
     cycleway:left:oneway: DE:Key:cycleway:left:oneway
     cycleway:right: DE:Key:cycleway:right
     cycleway:right:oneway: DE:Key:cycleway:right:oneway
+    cycleway:separation: DE:Key:cycleway:separation
     cycleway:surface: DE:Key:cycleway:surface
+    cycleway:surface:colour: DE:Key:cycleway:surface:colour
     'damage:': 'DE:Key:damage:'
     damage:*: DE:Key:damage:*
     dance:style: DE:Key:dance:style
@@ -2621,6 +2762,7 @@ de:
     destination: DE:Key:destination
     destination:backward: DE:Key:destination:backward
     destination:forward: DE:Key:destination:forward
+    destination:lanes: DE:Key:destination:lanes
     destination:ref: DE:Key:destination:ref
     destination:ref:lanes: DE:Key:destination:ref:lanes
     destination:ref:to: DE:Key:destination:ref:to
@@ -2648,6 +2790,7 @@ de:
     door: DE:Key:door
     draft: DE:Key:draft
     drain: DE:Key:drain
+    drawbar_slot: DE:Key:drawbar slot
     drink: DE:Key:drink
     drink:*: DE:Key:drink:*
     drinking_water: DE:Key:drinking water
@@ -2656,9 +2799,13 @@ de:
     drive_through: DE:Key:drive through
     duration: DE:Key:duration
     ele: DE:Key:ele
+    ele:NHN: DE:Key:ele:NHN
+    electric_bicycle: DE:Key:electric bicycle
+    electricity: DE:Key:electricity
     electrified: DE:Key:electrified
     embankment: DE:Key:embankment
     embassy: DE:Key:embassy
+    embedded_rails: DE:Key:embedded rails
     emergency: DE:Key:emergency
     emergency:phone: DE:Key:emergency:phone
     emergency_telephone_code: DE:Key:emergency telephone code
@@ -2667,6 +2814,7 @@ de:
     engineer: DE:Key:engineer
     entrance: DE:Key:entrance
     est_width: DE:Key:est width
+    except: DE:Key:except
     exhibit: DE:Key:exhibit
     exit: DE:Key:exit
     facebook: DE:Key:facebook
@@ -2679,18 +2827,22 @@ de:
     ferry: DE:Key:ferry
     ferry:cable: DE:Key:ferry:cable
     fetish: DE:Key:fetish
+    fetish:*: DE:Key:fetish:*
     fire_boundary: DE:Key:fire boundary
     fire_hydrant: DE:Key:fire hydrant
+    fire_hydrant:*: DE:Key:fire hydrant:*
     fire_hydrant:diameter: DE:Key:fire hydrant:diameter
+    fire_station:type: DE:Key:fire station:type
     fireplace: DE:Key:fireplace
     fishing: DE:Key:fishing
     fix_guidepost: DE:Key:fix guidepost
     fixme: DE:Key:fixme
     flag:type: DE:Key:flag:type
     floating: DE:Key:floating
-    flood_prone: DE:Key:flood prone
+    flow_rate: DE:Key:flow rate
     foot: DE:Key:foot
     footway: DE:Key:footway
+    footway:surface: DE:Key:footway:surface
     ford: DE:Key:ford
     forestry: DE:Key:forestry
     format: DE:Key:format
@@ -2702,7 +2854,16 @@ de:
     from: DE:Key:from
     fruit: DE:Key:fruit
     fuel: DE:Key:fuel
+    fuel:*: DE:Key:fuel:*
+    fuel:GTL_diesel: DE:Key:fuel:GTL diesel
+    fuel:HGV_diesel: DE:Key:fuel:HGV diesel
     fuel:LH2: DE:Key:fuel:LH2
+    fuel:biodiesel: DE:Key:fuel:biodiesel
+    fuel:diesel: DE:Key:fuel:diesel
+    fuel:e10: DE:Key:fuel:e10
+    fuel:e5: DE:Key:fuel:e5
+    fuel:h70: DE:Key:fuel:h70
+    fuel:lpg: DE:Key:fuel:lpg
     garden:style: DE:Key:garden:style
     garden:type: DE:Key:garden:type
     gauge: DE:Key:gauge
@@ -2726,6 +2887,7 @@ de:
     genus: DE:Key:genus
     genus:de: DE:Key:genus:de
     geological: DE:Key:geological
+    glideslope: DE:Key:glideslope
     golf: DE:Key:golf
     golf:course: DE:Key:golf:course
     golf:par: DE:Key:golf:par
@@ -2735,6 +2897,8 @@ de:
     grassland: DE:Key:grassland
     group_only: DE:Key:group only
     guest_house: DE:Key:guest house
+    guide_type: DE:Key:guide type
+    guidepost: DE:Key:guidepost
     handicap: DE:Key:handicap
     handrail: DE:Key:handrail
     happy_hours: DE:Key:happy hours
@@ -2747,6 +2911,7 @@ de:
     healthcare:speciality: DE:Key:healthcare:speciality
     height: DE:Key:height
     height:hub: DE:Key:height:hub
+    height:monitoring: DE:Key:height:monitoring
     heritage: DE:Key:heritage
     hgv: DE:Key:hgv
     hgv_articulated: DE:Key:hgv articulated
@@ -2758,6 +2923,7 @@ de:
     historic:period: DE:Key:historic:period
     horse: DE:Key:horse
     horse_scale: DE:Key:horse scale
+    hot_water: DE:Key:hot water
     iata: DE:Key:iata
     icao: DE:Key:icao
     ice_cream: DE:Key:ice cream
@@ -2765,13 +2931,15 @@ de:
     image: DE:Key:image
     importance: DE:Key:importance
     incline: DE:Key:incline
+    incline:across: DE:Key:incline:across
     indoor: DE:Key:indoor
     indoor_seating: DE:Key:indoor seating
     industrial: DE:Key:industrial
-    informal: DE:Key:informal
     information: DE:Key:information
+    inline_skates: DE:Key:inline skates
     inscription: DE:Key:inscription
     int_name: DE:Key:int name
+    int_ref: DE:Key:int ref
     intermittent: DE:Key:intermittent
     internet_access: DE:Key:internet access
     internet_access:fee: DE:Key:internet access:fee
@@ -2801,6 +2969,7 @@ de:
     lanes:psv:backward: DE:Key:lanes:psv:backward
     lanes:psv:forward: DE:Key:lanes:psv:forward
     language: DE:Key:language
+    language:*: DE:Key:language:*
     lawyer: DE:Key:lawyer
     layer: DE:Key:layer
     lcn: DE:Key:lcn
@@ -2811,6 +2980,8 @@ de:
     leisure: DE:Key:leisure
     length: DE:Key:length
     level: DE:Key:level
+    light:colour: DE:Key:light:colour
+    light_rail: DE:Key:light rail
     line: DE:Key:line
     line_attachment: DE:Key:line attachment
     line_management: DE:Key:line management
@@ -2818,6 +2989,7 @@ de:
     living_street: DE:Key:living street
     loc_name: DE:Key:loc name
     local_ref: DE:Key:local ref
+    localizer: DE:Key:localizer
     location: DE:Key:location
     lock: DE:Key:lock
     lock_name: DE:Key:lock name
@@ -2838,8 +3010,10 @@ de:
     max_age: DE:Key:max age
     maxaxleload: DE:Key:maxaxleload
     maxheight: DE:Key:maxheight
+    maxheight:physical: DE:Key:maxheight:physical
     maxlength: DE:Key:maxlength
     maxspeed: DE:Key:maxspeed
+    maxspeed:advisory: DE:Key:maxspeed:advisory
     maxspeed:backward: DE:Key:maxspeed:backward
     maxspeed:conditional: DE:Key:maxspeed:conditional
     maxspeed:forward: DE:Key:maxspeed:forward
@@ -2866,6 +3040,7 @@ de:
     mofa: DE:Key:mofa
     monitoring:air_quality: DE:Key:monitoring:air quality
     monitoring:bicycle: DE:Key:monitoring:bicycle
+    monitoring:cosmic_ray: DE:Key:monitoring:cosmic ray
     monitoring:gps: DE:Key:monitoring:gps
     monitoring:groundwater: DE:Key:monitoring:groundwater
     monitoring:noise: DE:Key:monitoring:noise
@@ -2879,12 +3054,14 @@ de:
     mooring: DE:Key:mooring
     moped: DE:Key:moped
     motor_vehicle: DE:Key:motor vehicle
+    motor_vehicle:conditional: DE:Key:motor vehicle:conditional
     motorboat: DE:Key:motorboat
     motorcar: DE:Key:motorcar
     motorcycle: DE:Key:motorcycle
     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
@@ -2893,6 +3070,7 @@ de:
     motorcycle_friendly: DE:Key:motorcycle friendly
     motorhome: DE:Key:motorhome
     motorroad: DE:Key:motorroad
+    motorroad:tunnel: DE:Key:motorroad:tunnel
     mountain_pass: DE:Key:mountain pass
     mtb:scale: DE:Key:mtb:scale
     mtb:scale:imba: DE:Key:mtb:scale:imba
@@ -2907,15 +3085,18 @@ de:
     natural: DE:Key:natural
     navigationaid: DE:Key:navigationaid
     network: DE:Key:network
+    network:type: DE:Key:network:type
     network:wikidata: DE:Key:network:wikidata
     noaddress: DE:Key:noaddress
     noname: DE:Key:noname
     noref: DE:Key:noref
+    not:*: DE:Key:not:*
     note: DE:Key:note
     nudism: DE:Key:nudism
     number_of_apartments: DE:Key:number of apartments
     nursery: DE:Key:nursery
     object: DE:Key:object
+    object:*: DE:Key:object:*
     observatory:type: DE:Key:observatory:type
     office: DE:Key:office
     official_name: DE:Key:official name
@@ -2926,7 +3107,9 @@ de:
     oneway:bus: DE:Key:oneway:bus
     oneway:conditional: DE:Key:oneway:conditional
     oneway:moped: DE:Key:oneway:moped
+    oneway:psv: DE:Key:oneway:psv
     onkz: DE:Key:onkz
+    open: DE:Key:open
     openfire: DE:Key:openfire
     opening: DE:Key:opening
     opening_date: DE:Key:opening date
@@ -2938,6 +3121,7 @@ de:
     operator:type: DE:Key:operator:type
     operator:wikidata: DE:Key:operator:wikidata
     organic: DE:Key:organic
+    orientation: DE:Key:orientation
     origin: DE:Key:origin
     osak: DE:Key:osak
     osmc:status: DE:Key:osmc:status
@@ -2950,17 +3134,27 @@ de:
     parcel_pickup: DE:Key:parcel pickup
     park_ride: DE:Key:park ride
     parking: DE:Key:parking
+    parking:both: DE:Key:parking:both
+    parking:left: DE:Key:parking:left
+    parking:right: DE:Key:parking:right
     parking_space: DE:Key:parking space
+    passenger_car: DE:Key:passenger car
     passenger_information_display: DE:Key:passenger information display
     passenger_information_display:speech_output: DE:Key:passenger information display:speech
       output
+    passenger_lines: DE:Key:passenger lines
     passing_places: DE:Key:passing places
     payment: DE:Key:payment
     payment:*: DE:Key:payment:*
     permanent_camping: DE:Key:permanent camping
+    pet: DE:Key:pet
     phone: DE:Key:phone
     pilgrimage: DE:Key:pilgrimage
+    pipeline: DE:Key:pipeline
     piste:difficulty: DE:Key:piste:difficulty
+    piste:grooming: DE:Key:piste:grooming
+    piste:lit: DE:Key:piste:lit
+    piste:ref: DE:Key:piste:ref
     piste:type: DE:Key:piste:type
     place: DE:Key:place
     placement: DE:Key:placement
@@ -2989,13 +3183,16 @@ de:
     playground: DE:Key:playground
     'playground:': 'DE:Key:playground:'
     playground:*: DE:Key:playground:*
+    playground:theme: DE:Key:playground:theme
     police: DE:Key:police
     population: DE:Key:population
     post_box:type: DE:Key:post box:type
     post_office: DE:Key:post office
     postal_code: DE:Key:postal code
     power: DE:Key:power
+    power_supply: DE:Key:power supply
     preschool: DE:Key:preschool
+    pressure: DE:Key:pressure
     priority: DE:Key:priority
     priority_road: DE:Key:priority road
     produce: DE:Key:produce
@@ -3006,6 +3203,7 @@ de:
     protected: DE:Key:protected
     protection_title: DE:Key:protection title
     psv: DE:Key:psv
+    psv:lanes: DE:Key:psv:lanes
     public_bookcase:type: DE:Key:public bookcase:type
     public_transport: DE:Key:public transport
     public_transport:tied_with: DE:Key:public transport:tied with
@@ -3016,8 +3214,10 @@ de:
     railway:lzb: DE:Key:railway:lzb
     railway:position: DE:Key:railway:position
     railway:preserved: DE:Key:railway:preserved
+    railway:pzb: DE:Key:railway:pzb
     railway:ref: DE:Key:railway:ref
     railway:signal:distant: DE:Key:railway:signal:distant
+    railway:signal:main: DE:Key:railway:signal:main
     railway:signal:speed_limit: DE:Key:railway:signal:speed limit
     railway:signal:speed_limit_distant: DE:Key:railway:signal:speed limit distant
     railway:tilting: DE:Key:railway:tilting
@@ -3031,13 +3231,17 @@ de:
     'razed:': 'DE:Key:razed:'
     razed:*: DE:Key:razed:*
     rcn_ref: DE:Key:rcn ref
+    recording: DE:Key:recording
+    recording:remote: DE:Key:recording:remote
     recycling:fire_extinguishers: DE:Key:recycling:fire extinguishers
     recycling_type: DE:Key:recycling type
+    red_turn:right:bicycle: DE:Key:red turn:right:bicycle
     ref: DE:Key:ref
     ref:IFOPT: DE:Key:ref:IFOPT
     ref:WDPA: DE:Key:ref:WDPA
     ref:bufa: DE:Key:ref:bufa
     ref:fgkz: DE:Key:ref:fgkz
+    ref:id: DE:Key:ref:id
     ref:mobil-parken.de: DE:Key:ref:mobil-parken.de
     ref:sprockhoff: DE:Key:ref:sprockhoff
     ref_name: DE:Key:ref name
@@ -3051,11 +3255,13 @@ de:
     residential: DE:Key:residential
     resource: DE:Key:resource
     restaurant: DE:Key:restaurant
+    restriction: DE:Key:restriction
     reusable_packaging: DE:Key:reusable packaging
     reusable_packaging:accept: DE:Key:reusable packaging:accept
     reusable_packaging:offer: DE:Key:reusable packaging:offer
     review_requested: DE:Key:review requested
     right: DE:Key:right
+    roof:colour: DE:Key:roof:colour
     roof:direction: DE:Key:roof:direction
     roof:height: DE:Key:roof:height
     roof:material: DE:Key:roof:material
@@ -3066,27 +3272,45 @@ de:
     rotor:diameter: DE:Key:rotor:diameter
     roundtrip: DE:Key:roundtrip
     route: DE:Key:route
+    route_marker: DE:Key:route marker
     route_ref: DE:Key:route ref
     ruins: DE:Key:ruins
     sac_scale: DE:Key:sac scale
     salt: DE:Key:salt
     sauna: DE:Key:sauna
+    school: DE:Key:school
     seamark: DE:Key:seamark
     seamark:*: DE:Key:seamark:*
     seamark:fixme: DE:Key:seamark:fixme
     seamark:type: DE:Key:seamark:type
     seasonal: DE:Key:seasonal
     seats: DE:Key:seats
+    seats:separated: DE:Key:seats:separated
     second_hand: DE:Key:second hand
     segregated: DE:Key:segregated
+    self_checkout: DE:Key:self checkout
     self_harvesting: DE:Key:self harvesting
     self_service: DE:Key:self service
     service: DE:Key:service
+    service:bicycle:*: DE:Key:service:bicycle:*
+    service:bicycle:cleaning: DE:Key:service:bicycle:cleaning
+    service:bicycle:diy: DE:Key:service:bicycle:diy
+    service:bicycle:ebike: DE:Key:service:bicycle:ebike
+    service:bicycle:miscellaneous: DE:Key:service:bicycle:miscellaneous
+    service:bicycle:parking: DE:Key:service:bicycle:parking
+    service:bicycle:pump: DE:Key:service:bicycle:pump
     service:bicycle:rental: DE:Key:service:bicycle:rental
     service:bicycle:repair: DE:Key:service:bicycle:repair
+    service:bicycle:retail: DE:Key:service:bicycle:retail
+    service:press: DE:Key:service:press
     service:vehicle: DE:Key:service:vehicle
     'service:vehicle:': 'DE:Key:service:vehicle:'
     service:vehicle:*: DE:Key:service:vehicle:*
+    service:vehicle:body_repair: DE:Key:service:vehicle:body repair
+    service:vehicle:car_parts: DE:Key:service:vehicle:car parts
+    service:vehicle:car_repair: DE:Key:service:vehicle:car repair
+    service:vehicle:glass: DE:Key:service:vehicle:glass
+    service:vehicle:transmission: DE:Key:service:vehicle:transmission
     service_times: DE:Key:service times
     service_times:wheelchair: DE:Key:service times:wheelchair
     settlement_type: DE:Key:settlement type
@@ -3097,22 +3321,31 @@ de:
     short_protection_title: DE:Key:short protection title
     shoulder: DE:Key:shoulder
     shower: DE:Key:shower
+    side: DE:Key:side
     sidewalk: DE:Key:sidewalk
+    sidewalk:both: DE:Key:sidewalk:both
     sidewalk:both:bicycle: DE:Key:sidewalk:both:bicycle
+    sidewalk:both:surface: DE:Key:sidewalk:both:surface
+    sidewalk:left: DE:Key:sidewalk:left
+    sidewalk:right: DE:Key:sidewalk:right
     ski: DE:Key:ski
     smoking: DE:Key:smoking
+    smoking:cannabis: DE:Key:smoking:cannabis
     smoothness: DE:Key:smoothness
     social_facility: DE:Key:social facility
     social_facility:for: DE:Key:social facility:for
     socket: DE:Key:socket
     socket:*: DE:Key:socket:*
     source: DE:Key:source
+    source:*: DE:Key:source:*
     source:maxspeed: DE:Key:source:maxspeed
+    spacing: DE:Key:spacing
     species: DE:Key:species
     species:de: DE:Key:species:de
     speech_output: DE:Key:speech output
     speech_output:en: DE:Key:speech output:en
     speech_output:lg: DE:Key:speech output:lg
+    speed_pedelec: DE:Key:speed pedelec
     speisebezirk: DE:Key:speisebezirk
     sport: DE:Key:sport
     stamps: DE:Key:stamps
@@ -3124,6 +3357,7 @@ de:
     subject: DE:Key:subject
     substance: DE:Key:substance
     substation: DE:Key:substation
+    subway: DE:Key:subway
     summit:register: DE:Key:summit:register
     supervised: DE:Key:supervised
     support: DE:Key:support
@@ -3141,19 +3375,27 @@ de:
     tactile_writing: DE:Key:tactile writing
     takeaway: DE:Key:takeaway
     target: DE:Key:target
+    taxon: DE:Key:taxon
+    taxon:de: DE:Key:taxon:de
     telecom:medium: DE:Key:telecom:medium
     telescope:type: DE:Key:telescope:type
+    tenant: DE:Key:tenant
     tents: DE:Key:tents
     theatre:genre: DE:Key:theatre:genre
     theatre:type: DE:Key:theatre:type
+    tickets:public_transport: DE:Key:tickets:public transport
+    tickets:public_transport_subscription: DE:Key:tickets:public transport subscription
     tidal: DE:Key:tidal
     to: DE:Key:to
     todo: DE:Key:todo
     toilets: DE:Key:toilets
+    toilets:*: DE:Key:toilets:*
+    toilets:menstrual_products: DE:Key:toilets:menstrual products
     toilets:wheelchair: DE:Key:toilets:wheelchair
     toll: DE:Key:toll
     tomb: DE:Key:tomb
     tourism: DE:Key:tourism
+    tourist_bus: DE:Key:tourist bus
     tower:construction: DE:Key:tower:construction
     tower:type: DE:Key:tower:type
     townhall:type: DE:Key:townhall:type
@@ -3167,6 +3409,9 @@ de:
     traffic_signals:sound: DE:Key:traffic signals:sound
     traffic_signals:vibration: DE:Key:traffic signals:vibration
     trail_visibility: DE:Key:trail visibility
+    trailblazed: DE:Key:trailblazed
+    trailblazed:visibility: DE:Key:trailblazed:visibility
+    tram: DE:Key:tram
     transformer: DE:Key:transformer
     tree_lined: DE:Key:tree lined
     trees: DE:Key:trees
@@ -3186,13 +3431,16 @@ de:
     utility: DE:Key:utility
     vaccination: DE:Key:vaccination
     vacuum_cleaner: DE:Key:vacuum cleaner
+    valve: DE:Key:valve
     vehicle: DE:Key:vehicle
     vehicle:conditional: DE:Key:vehicle:conditional
     vending: DE:Key:vending
     verbindung: DE:Key:verbindung
+    via_ferrata_scale: DE:Key:via ferrata scale
     viewpoint: DE:Key:viewpoint
     visibility: DE:Key:visibility
     volcano:status: DE:Key:volcano:status
+    volcano:type: DE:Key:volcano:type
     voltage: DE:Key:voltage
     voltage:primary: DE:Key:voltage:primary
     voltage:secondary: DE:Key:voltage:secondary
@@ -3200,14 +3448,22 @@ de:
     waste: DE:Key:waste
     water: DE:Key:water
     water_characteristic: DE:Key:water characteristic
+    water_point: DE:Key:water point
+    water_source: DE:Key:water source
     water_well: DE:Key:water well
     waterway: DE:Key:waterway
+    weather:anemometer: DE:Key:weather:anemometer
+    weather:hygrometer: DE:Key:weather:hygrometer
+    weather:pyranometer: DE:Key:weather:pyranometer
+    weather:thermometer: DE:Key:weather:thermometer
+    weather:wind_vane: DE:Key:weather:wind vane
     website: DE:Key:website
     website:menu: DE:Key:website:menu
     website:regulation: DE:Key:website:regulation
     wetland: DE:Key:wetland
     wheelchair: DE:Key:wheelchair
     wheelchair:description: DE:Key:wheelchair:description
+    whitewater:rapid_grade: DE:Key:whitewater:rapid grade
     wholesale: DE:Key:wholesale
     width: DE:Key:width
     wiki:symbol: DE:Key:wiki:symbol
@@ -3222,6 +3478,7 @@ de:
     wood_provided: DE:Key:wood provided
     workrules: DE:Key:workrules
     xmas:feature: DE:Key:xmas:feature
+    year_of_construction: DE:Key:year of construction
     zero_waste: DE:Key:zero waste
     zone:maxspeed: DE:Key:zone:maxspeed
     zoo: DE:Key:zoo
@@ -3242,7 +3499,12 @@ de:
     access=permit: DE:Tag:access=permit
     access=private: DE:Tag:access=private
     access=unknown: DE:Tag:access=unknown
+    access=use_sidepath: DE:Tag:access=use sidepath
+    admin_level=10: DE:Tag:admin level=10
     admin_level=2: DE:Tag:admin level=2
+    admin_level=6: DE:Tag:admin level=6
+    admin_level=8: DE:Tag:admin level=8
+    admin_level=9: DE:Tag:admin level=9
     advertising=column: DE:Tag:advertising=column
     advertising=flag: DE:Tag:advertising=flag
     advertising=screen: DE:Tag:advertising=screen
@@ -3281,10 +3543,12 @@ de:
     aeroway=holding_position: DE:Tag:aeroway=holding position
     aeroway=jet_bridge: DE:Tag:aeroway=jet bridge
     aeroway=launch_complex: DE:Tag:aeroway=launch complex
+    aeroway=model_runway: DE:Tag:aeroway=model runway
     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=stopway: DE:Tag:aeroway=stopway
     aeroway=taxilane: DE:Tag:aeroway=taxilane
     aeroway=taxiway: DE:Tag:aeroway=taxiway
     aeroway=terminal: DE:Tag:aeroway=terminal
@@ -3307,9 +3571,11 @@ de:
     amenity=bar: DE:Tag:amenity=bar
     amenity=bbq: DE:Tag:amenity=bbq
     amenity=bench: DE:Tag:amenity=bench
+    amenity=bicycle_library: DE:Tag:amenity=bicycle library
     amenity=bicycle_parking: DE:Tag:amenity=bicycle parking
     amenity=bicycle_rental: DE:Tag:amenity=bicycle rental
     amenity=bicycle_repair_station: DE:Tag:amenity=bicycle repair station
+    amenity=bicycle_trailer_sharing: DE:Tag:amenity=bicycle trailer sharing
     amenity=bicycle_wash: DE:Tag:amenity=bicycle wash
     amenity=biergarten: DE:Tag:amenity=biergarten
     amenity=boat_rental: DE:Tag:amenity=boat rental
@@ -3328,6 +3594,7 @@ de:
     amenity=cinema: DE:Tag:amenity=cinema
     amenity=clinic: DE:Tag:amenity=clinic
     amenity=clock: DE:Tag:amenity=clock
+    amenity=clothes_dryer: DE:Tag:amenity=clothes dryer
     amenity=college: DE:Tag:amenity=college
     amenity=community_centre: DE:Tag:amenity=community centre
     amenity=compressed_air: DE:Tag:amenity=compressed air
@@ -3354,10 +3621,10 @@ de:
     amenity=fast_food: DE:Tag:amenity=fast food
     amenity=ferry_terminal: DE:Tag:amenity=ferry terminal
     amenity=festival_grounds: DE:Tag:amenity=festival grounds
-    amenity=fire_hydrant: DE:Tag:amenity=fire hydrant
     amenity=fire_station: DE:Tag:amenity=fire station
     amenity=fish_spa: DE:Tag:amenity=fish spa
     amenity=food_court: DE:Tag:amenity=food court
+    amenity=foot_shower: DE:Tag:amenity=foot shower
     amenity=fountain: DE:Tag:amenity=fountain
     amenity=fridge: DE:Tag:amenity=fridge
     amenity=fuel: DE:Tag:amenity=fuel
@@ -3381,8 +3648,10 @@ de:
     amenity=letter_box: DE:Tag:amenity=letter box
     amenity=library: DE:Tag:amenity=library
     amenity=loading_dock: DE:Tag:amenity=loading dock
+    amenity=locker: DE:Tag:amenity=locker
     amenity=lost_property_office: DE:Tag:amenity=lost property office
     amenity=lounger: DE:Tag:amenity=lounger
+    amenity=luggage_locker: DE:Tag:amenity=luggage locker
     amenity=marketplace: DE:Tag:amenity=marketplace
     amenity=medical_supply: DE:Tag:amenity=medical supply
     amenity=mobile_library: DE:Tag:amenity=mobile library
@@ -3426,6 +3695,7 @@ de:
     amenity=school: DE:Tag:amenity=school
     amenity=shelter: DE:Tag:amenity=shelter
     amenity=shower: DE:Tag:amenity=shower
+    amenity=ski_rental: DE:Tag:amenity=ski rental
     amenity=ski_school: DE:Tag:amenity=ski school
     amenity=smoking_area: DE:Tag:amenity=smoking area
     amenity=snow_removal_station: DE:Tag:amenity=snow removal station
@@ -3437,7 +3707,9 @@ de:
     amenity=theatre: DE:Tag:amenity=theatre
     amenity=ticket_validator: DE:Tag:amenity=ticket validator
     amenity=toilets: DE:Tag:amenity=toilets
+    amenity=tool_library: DE:Tag:amenity=tool library
     amenity=townhall: DE:Tag:amenity=townhall
+    amenity=trade_school: DE:Tag:amenity=trade school
     amenity=traffic_park: DE:Tag:amenity=traffic park
     amenity=trolley_bay: DE:Tag:amenity=trolley bay
     amenity=university: DE:Tag:amenity=university
@@ -3445,6 +3717,7 @@ de:
     amenity=vehicle_inspection: DE:Tag:amenity=vehicle inspection
     amenity=vending_machine: DE:Tag:amenity=vending machine
     amenity=veterinary: DE:Tag:amenity=veterinary
+    amenity=veterinary_pharmacy: DE:Tag:amenity=veterinary pharmacy
     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
@@ -3455,7 +3728,10 @@ de:
     animal=horse_walker: DE:Tag:animal=horse walker
     animal=school: DE:Tag:animal=school
     archaeological_site=baths: DE:Tag:archaeological site=baths
+    archaeological_site=cairn: DE:Tag:archaeological site=cairn
     archaeological_site=city: DE:Tag:archaeological site=city
+    archaeological_site=cliff_dwelling: DE:Tag:archaeological site=cliff dwelling
+    archaeological_site=earthwork: DE:Tag:archaeological site=earthwork
     archaeological_site=fortification: DE:Tag:archaeological site=fortification
     archaeological_site=hut_circle: DE:Tag:archaeological site=hut circle
     archaeological_site=megalith: DE:Tag:archaeological site=megalith
@@ -3464,13 +3740,26 @@ de:
     archaeological_site=roman_circus: DE:Tag:archaeological site=roman circus
     archaeological_site=roman_villa: DE:Tag:archaeological site=roman villa
     archaeological_site=settlement: DE:Tag:archaeological site=settlement
+    archaeological_site=tomb: DE:Tag:archaeological site=tomb
+    archaeological_site=trap_pit: DE:Tag:archaeological site=trap pit
     archaeological_site=tumulus: DE:Tag:archaeological site=tumulus
     artwork_type=architecture: DE:Tag:artwork type=architecture
     artwork_type=bust: DE:Tag:artwork type=bust
+    artwork_type=installation: DE:Tag:artwork type=installation
+    artwork_type=mosaic: DE:Tag:artwork type=mosaic
     artwork_type=mural: DE:Tag:artwork type=mural
     artwork_type=sculpture: DE:Tag:artwork type=sculpture
     artwork_type=statue: DE:Tag:artwork type=statue
+    artwork_type=stone: DE:Tag:artwork type=stone
+    association=sport: DE:Tag:association=sport
     association=student: DE:Tag:association=student
+    athletics=high_jump: DE:Tag:athletics=high jump
+    athletics=javelin_throw: DE:Tag:athletics=javelin throw
+    athletics=long_jump: DE:Tag:athletics=long jump
+    athletics=pole_vault: DE:Tag:athletics=pole vault
+    athletics=running: DE:Tag:athletics=running
+    athletics=shot_put: DE:Tag:athletics=shot put
+    athletics=sprint: DE:Tag:athletics=sprint
     atm=yes: DE:Tag:atm=yes
     attraction=alpine_coaster: DE:Tag:attraction=alpine coaster
     attraction=animal: DE:Tag:attraction=animal
@@ -3490,6 +3779,7 @@ de:
     barrier=cattle_grid: DE:Tag:barrier=cattle grid
     barrier=chain: DE:Tag:barrier=chain
     barrier=city_wall: DE:Tag:barrier=city wall
+    barrier=coupure: DE:Tag:barrier=coupure
     barrier=cycle_barrier: DE:Tag:barrier=cycle barrier
     barrier=debris: DE:Tag:barrier=debris
     barrier=ditch: DE:Tag:barrier=ditch
@@ -3526,15 +3816,27 @@ de:
     basin=infiltration: DE:Tag:basin=infiltration
     basin=retention: DE:Tag:basin=retention
     bath:type=hammam: DE:Tag:bath:type=hammam
+    bath:type=hot_spring: DE:Tag:bath:type=hot spring
     bath:type=thermal: DE:Tag:bath:type=thermal
     bay=fjord: DE:Tag:bay=fjord
+    beacon:type=DVOR: DE:Tag:beacon:type=DVOR
+    beacon:type=DVOR/DME: DE:Tag:beacon:type=DVOR/DME
+    beacon:type=ILS: DE:Tag:beacon:type=ILS
+    beacon:type=TACAN: DE:Tag:beacon:type=TACAN
+    beacon:type=VOR: DE:Tag:beacon:type=VOR
+    beacon:type=VORTAC: DE:Tag:beacon:type=VORTAC
     bicycle=designated: DE:Tag:bicycle=designated
     bicycle=dismount: DE:Tag:bicycle=dismount
     bicycle=optional_sidepath: DE:Tag:bicycle=optional sidepath
     bicycle=use_sidepath: DE:Tag:bicycle=use sidepath
+    bicycle_parking=safe_loops: DE:Tag:bicycle parking=safe loops
+    bicycle_parking=stands: DE:Tag:bicycle parking=stands
+    bicycle_parking=wall_loops: DE:Tag:bicycle parking=wall loops
+    bicycle_parking=wide_stands: DE:Tag:bicycle parking=wide stands
     bicycle_road=yes: DE:Tag:bicycle road=yes
     biosphärenwirt=yes: DE:Tag:biosphärenwirt=yes
     boundary=administrative: DE:Tag:boundary=administrative
+    boundary=forest_compartment: DE:Tag:boundary=forest compartment
     boundary=low_emission_zone: DE:Tag:boundary=low emission zone
     boundary=marker: DE:Tag:boundary=marker
     boundary=national_park: DE:Tag:boundary=national park
@@ -3551,6 +3853,7 @@ de:
     bridge:structure=arch: DE:Tag:bridge:structure=arch
     bridge:structure=beam: DE:Tag:bridge:structure=beam
     bridge:structure=cable-stayed: DE:Tag:bridge:structure=cable-stayed
+    bridge:structure=clapper: DE:Tag:bridge:structure=clapper
     bridge:structure=floating: DE:Tag:bridge:structure=floating
     bridge:structure=humpback: DE:Tag:bridge:structure=humpback
     bridge:structure=simple-suspension: DE:Tag:bridge:structure=simple-suspension
@@ -3595,6 +3898,7 @@ de:
     building=ger: DE:Tag:building=ger
     building=grandstand: DE:Tag:building=grandstand
     building=greenhouse: DE:Tag:building=greenhouse
+    building=guardhouse: DE:Tag:building=guardhouse
     building=hangar: DE:Tag:building=hangar
     building=hospital: DE:Tag:building=hospital
     building=hotel: DE:Tag:building=hotel
@@ -3609,6 +3913,7 @@ de:
     building=mosque: DE:Tag:building=mosque
     building=office: DE:Tag:building=office
     building=outbuilding: DE:Tag:building=outbuilding
+    building=palace: DE:Tag:building=palace
     building=parking: DE:Tag:building=parking
     building=pavilion: DE:Tag:building=pavilion
     building=presbytery: DE:Tag:building=presbytery
@@ -3630,12 +3935,14 @@ de:
     building=stadium: DE:Tag:building=stadium
     building=static_caravan: DE:Tag:building=static caravan
     building=stilt_house: DE:Tag:building=stilt house
+    building=storage_tank: DE:Tag:building=storage tank
     building=sty: DE:Tag:building=sty
     building=supermarket: DE:Tag:building=supermarket
     building=synagogue: DE:Tag:building=synagogue
     building=tech_cab: DE:Tag:building=tech cab
     building=temple: DE:Tag:building=temple
     building=terrace: DE:Tag:building=terrace
+    building=terraced_house: DE:Tag:building=terraced house
     building=toilets: DE:Tag:building=toilets
     building=train_station: DE:Tag:building=train station
     building=transformer_tower: DE:Tag:building=transformer tower
@@ -3643,12 +3950,15 @@ de:
     building=university: DE:Tag:building=university
     building=warehouse: DE:Tag:building=warehouse
     building=water_tower: DE:Tag:building=water tower
+    building=yes: DE:Tag:building=yes
     bunker_type=hardened_aircraft_shelter: DE:Tag:bunker type=hardened aircraft shelter
     bunker_type=munitions: DE:Tag:bunker type=munitions
     bunker_type=pillbox: DE:Tag:bunker type=pillbox
     by_night=only: DE:Tag:by night=only
     canoe=portage: DE:Tag:canoe=portage
+    canoe=put_in: DE:Tag:canoe=put in
     capacity:smoker_free=existing: DE:Tag:capacity:smoker free=existing
+    caravan_site=motorhome_stopover: DE:Tag:caravan site=motorhome stopover
     cargo=container: DE:Tag:cargo=container
     castle_type=castrum: DE:Tag:castle type=castrum
     castle_type=citadel: DE:Tag:castle type=citadel
@@ -3664,6 +3974,8 @@ de:
     cemetery=war_cemetery: DE:Tag:cemetery=war cemetery
     clothes=underwear: DE:Tag:clothes=underwear
     club=automobile: DE:Tag:club=automobile
+    club=bicycle: DE:Tag:club=bicycle
+    club=cannabis: DE:Tag:club=cannabis
     club=fan: DE:Tag:club=fan
     club=scout: DE:Tag:club=scout
     club=sport: DE:Tag:club=sport
@@ -3677,6 +3989,7 @@ de:
     community_centre=youth_centre: DE:Tag:community centre=youth centre
     company=construction: DE:Tag:company=construction
     company=industrial_climbing: DE:Tag:company=industrial climbing
+    company=it: DE:Tag:company=it
     company=logistics: DE:Tag:company=logistics
     company=transport: DE:Tag:company=transport
     construction=minor: DE:Tag:construction=minor
@@ -3684,6 +3997,8 @@ de:
     consulate=consulate_general: DE:Tag:consulate=consulate general
     consulate=honorary_consul: DE:Tag:consulate=honorary consul
     content=hot_water: DE:Tag:content=hot water
+    content=manure: DE:Tag:content=manure
+    content=slurry: DE:Tag:content=slurry
     craft=agricultural_engines: DE:Tag:craft=agricultural engines
     craft=atelier: DE:Tag:craft=atelier
     craft=bakery: DE:Tag:craft=bakery
@@ -3714,6 +4029,7 @@ de:
     craft=electronics_repair: DE:Tag:craft=electronics repair
     craft=embroiderer: DE:Tag:craft=embroiderer
     craft=engraver: DE:Tag:craft=engraver
+    craft=fence_maker: DE:Tag:craft=fence maker
     craft=floorer: DE:Tag:craft=floorer
     craft=gardener: DE:Tag:craft=gardener
     craft=glaziery: DE:Tag:craft=glaziery
@@ -3741,6 +4057,7 @@ de:
     craft=paver: DE:Tag:craft=paver
     craft=photographer: DE:Tag:craft=photographer
     craft=photographic_laboratory: DE:Tag:craft=photographic laboratory
+    craft=photovoltaic: DE:Tag:craft=photovoltaic
     craft=piano_tuner: DE:Tag:craft=piano tuner
     craft=plasterer: DE:Tag:craft=plasterer
     craft=plumber: DE:Tag:craft=plumber
@@ -3797,19 +4114,30 @@ de:
     cuisine=sushi: DE:Tag:cuisine=sushi
     cuisine=thai: DE:Tag:cuisine=thai
     cuisine=vietnamese: DE:Tag:cuisine=vietnamese
+    cycle_network=DE:BW:RadNETZ: DE:Tag:cycle network=DE:BW:RadNETZ
+    cycleway:both=lane: DE:Tag:cycleway:both=lane
+    cycleway:both=no: DE:Tag:cycleway:both=no
+    cycleway:lane=exclusive: DE:Tag:cycleway:lane=exclusive
     cycleway:left=lane: DE:Tag:cycleway:left=lane
+    cycleway:left=track: DE:Tag:cycleway:left=track
     cycleway:right=lane: DE:Tag:cycleway:right=lane
     cycleway:right=share_busway: DE:Tag:cycleway:right=share busway
     cycleway:right=track: DE:Tag:cycleway:right=track
     cycleway=asl: DE:Tag:cycleway=asl
+    cycleway=bike_box: DE:Tag:cycleway=bike box
+    cycleway=crossing: DE:Tag:cycleway=crossing
     cycleway=lane: DE:Tag:cycleway=lane
+    cycleway=link: DE:Tag:cycleway=link
+    cycleway=no: DE:Tag:cycleway=no
     cycleway=opposite: DE:Tag:cycleway=opposite
     cycleway=opposite_lane: DE:Tag:cycleway=opposite lane
     cycleway=opposite_track: DE:Tag:cycleway=opposite track
     cycleway=separate: DE:Tag:cycleway=separate
     cycleway=share_busway: DE:Tag:cycleway=share busway
     cycleway=shared_lane: DE:Tag:cycleway=shared lane
+    cycleway=sidewalk: DE:Tag:cycleway=sidewalk
     cycleway=track: DE:Tag:cycleway=track
+    cycling=pump_track: DE:Tag:cycling=pump track
     defensive=bergfried: DE:Tag:defensive=bergfried
     defensive=donjon: DE:Tag:defensive=donjon
     defensive=keep: DE:Tag:defensive=keep
@@ -3832,6 +4160,7 @@ de:
     disused=yes: DE:Tag:disused=yes
     dock=drydock: DE:Tag:dock=drydock
     dock=floating: DE:Tag:dock=floating
+    dual_carriageway=yes: DE:Tag:dual carriageway=yes
     electrified=contact_line: DE:Tag:electrified=contact line
     electrified=rail: DE:Tag:electrified=rail
     embassy=branch_embassy: DE:Tag:embassy=branch embassy
@@ -3840,6 +4169,8 @@ de:
     embassy=mission: DE:Tag:embassy=mission
     embassy=residence: DE:Tag:embassy=residence
     embassy=yes: DE:Tag:embassy=yes
+    embedded_rails=tram: DE:Tag:embedded rails=tram
+    emergency:plan=yes: DE:Tag:emergency:plan=yes
     emergency=access_point: DE:Tag:emergency=access point
     emergency=aed: DE:Tag:emergency=aed
     emergency=ambulance_station: DE:Tag:emergency=ambulance station
@@ -3847,6 +4178,7 @@ de:
     emergency=control_centre: DE:Tag:emergency=control centre
     emergency=defibrillator: DE:Tag:emergency=defibrillator
     emergency=designated: DE:Tag:emergency=designated
+    emergency=disaster_response: DE:Tag:emergency=disaster response
     emergency=drinking_water: DE:Tag:emergency=drinking water
     emergency=dry_riser_inlet: DE:Tag:emergency=dry riser inlet
     emergency=emergency_ward_entrance: DE:Tag:emergency=emergency ward entrance
@@ -3858,12 +4190,14 @@ de:
     emergency=fire_hydrant: DE:Tag:emergency=fire hydrant
     emergency=fire_point_stand: DE:Tag:emergency=fire point stand
     emergency=fire_sand_bin: DE:Tag:emergency=fire sand bin
+    emergency=fire_service_inlet: DE:Tag:emergency=fire service inlet
     emergency=fire_water_pond: DE:Tag:emergency=fire water pond
     emergency=first_aid: DE:Tag:emergency=first aid
     emergency=first_aid_kit: DE:Tag:emergency=first aid kit
     emergency=key_depot: DE:Tag:emergency=key depot
     emergency=ladder_site: DE:Tag:emergency=ladder site
     emergency=landing_site: DE:Tag:emergency=landing site
+    emergency=leader_site: DE:Tag:emergency=leader site
     emergency=life_ring: DE:Tag:emergency=life ring
     emergency=lifeguard: DE:Tag:emergency=lifeguard
     emergency=lifeguard_base: DE:Tag:emergency=lifeguard base
@@ -3885,10 +4219,18 @@ de:
     fast_food=cafeteria: DE:Tag:fast food=cafeteria
     fence_type=railing: DE:Tag:fence type=railing
     fire_class=*: DE:Tag:fire class=*
+    flood_prone=yes: DE:Tag:flood prone=yes
     foot=designated: DE:Tag:foot=designated
+    foot=use_sidepath: DE:Tag:foot=use sidepath
     foot=yes: DE:Tag:foot=yes
+    footway=access_aisle: DE:Tag:footway=access aisle
+    footway=alley: DE:Tag:footway=alley
     footway=crossing: DE:Tag:footway=crossing
+    footway=link: DE:Tag:footway=link
+    footway=path: DE:Tag:footway=path
+    footway=residential: DE:Tag:footway=residential
     footway=sidewalk: DE:Tag:footway=sidewalk
+    footway=traffic_island: DE:Tag:footway=traffic island
     ford=stepping_stones: DE:Tag:ford=stepping stones
     ford=yes: DE:Tag:ford=yes
     fortification_type=hill_fort: DE:Tag:fortification type=hill fort
@@ -3916,6 +4258,7 @@ de:
     generator:source=biomass: DE:Tag:generator:source=biomass
     generator:source=coal: DE:Tag:generator:source=coal
     generator:source=diesel: DE:Tag:generator:source=diesel
+    generator:source=electricity: DE:Tag:generator:source=electricity
     generator:source=gas: DE:Tag:generator:source=gas
     generator:source=geothermal: DE:Tag:generator:source=geothermal
     generator:source=hydro: DE:Tag:generator:source=hydro
@@ -3942,13 +4285,20 @@ de:
     generator:type=steam_generator: DE:Tag:generator:type=steam generator
     generator:type=steam_turbine: DE:Tag:generator:type=steam turbine
     generator:type=vertical_axis: DE:Tag:generator:type=vertical axis
+    genus=Acer: DE:Tag:genus=Acer
+    genus=Platanus: DE:Tag:genus=Platanus
+    genus=Quercus: DE:Tag:genus=Quercus
     geological=fault: DE:Tag:geological=fault
+    geological=giants_kettle: DE:Tag:geological=giants kettle
+    geological=glacial_erratic: DE:Tag:geological=glacial erratic
+    geological=meteor_crater: DE:Tag:geological=meteor crater
     geological=moraine: DE:Tag:geological=moraine
     geological=outcrop: DE:Tag:geological=outcrop
     geological=palaeontological_site: DE:Tag:geological=palaeontological site
     geological=rock_glacier: DE:Tag:geological=rock glacier
     geological=volcanic_caldera_rim: DE:Tag:geological=volcanic caldera rim
     geological=volcanic_lava_field: DE:Tag:geological=volcanic lava field
+    geological=volcanic_lava_tube: DE:Tag:geological=volcanic lava tube
     geological=volcanic_vent: DE:Tag:geological=volcanic vent
     golf=bunker: DE:Tag:golf=bunker
     golf=clubhouse: DE:Tag:golf=clubhouse
@@ -3986,6 +4336,7 @@ de:
     hazard=cyclists: DE:Tag:hazard=cyclists
     hazard=dangerous_junction: DE:Tag:hazard=dangerous junction
     hazard=falling_rocks: DE:Tag:hazard=falling rocks
+    hazard=falling_trees: DE:Tag:hazard=falling trees
     hazard=horse_riders: DE:Tag:hazard=horse riders
     hazard=leeches: DE:Tag:hazard=leeches
     hazard=minefield: DE:Tag:hazard=minefield
@@ -4000,6 +4351,7 @@ de:
     healthcare:speciality=general: DE:Tag:healthcare:speciality=general
     healthcare:speciality=gynaecology: DE:Tag:healthcare:speciality=gynaecology
     healthcare:speciality=mother_child: DE:Tag:healthcare:speciality=mother child
+    healthcare:speciality=occupational: DE:Tag:healthcare:speciality=occupational
     healthcare:speciality=ophthalmology: DE:Tag:healthcare:speciality=ophthalmology
     healthcare:speciality=orthodontics: DE:Tag:healthcare:speciality=orthodontics
     healthcare:speciality=otolaryngology: DE:Tag:healthcare:speciality=otolaryngology
@@ -4007,6 +4359,7 @@ de:
       surgery
     healthcare:speciality=paediatrics: DE:Tag:healthcare:speciality=paediatrics
     healthcare:speciality=psychiatry: DE:Tag:healthcare:speciality=psychiatry
+    healthcare:speciality=stomatology: DE:Tag:healthcare:speciality=stomatology
     healthcare:speciality=vaccination: DE:Tag:healthcare:speciality=vaccination
     healthcare=alternative: DE:Tag:healthcare=alternative
     healthcare=audiologist: DE:Tag:healthcare=audiologist
@@ -4030,6 +4383,7 @@ de:
     healthcare=sample_collection: DE:Tag:healthcare=sample collection
     healthcare=speech_therapist: DE:Tag:healthcare=speech therapist
     hedge=hedge_bank: DE:Tag:hedge=hedge bank
+    hgv=agricultural;forestry: DE:Tag:hgv=agricultural;forestry
     highway=abandoned: DE:Tag:highway=abandoned
     highway=access: DE:Tag:highway=access
     highway=bridleway: DE:Tag:highway=bridleway
@@ -4040,6 +4394,7 @@ de:
     highway=corridor: DE:Tag:highway=corridor
     highway=crossing: DE:Tag:highway=crossing
     highway=cycleway: DE:Tag:highway=cycleway
+    highway=cyclist_waiting_aid: DE:Tag:highway=cyclist waiting aid
     highway=disused: DE:Tag:highway=disused
     highway=door: DE:Tag:highway=door
     highway=elevator: DE:Tag:highway=elevator
@@ -4087,12 +4442,14 @@ de:
     highway=track: DE:Tag:highway=track
     highway=traffic_mirror: DE:Tag:highway=traffic mirror
     highway=traffic_signals: DE:Tag:highway=traffic signals
+    highway=trailhead: DE:Tag:highway=trailhead
     highway=trunk: DE:Tag:highway=trunk
     highway=trunk_link: DE:Tag:highway=trunk link
     highway=turning_circle: DE:Tag:highway=turning circle
     highway=turning_loop: DE:Tag:highway=turning loop
     highway=unclassified: DE:Tag:highway=unclassified
     highway=unknown: DE:Tag:highway=unknown
+    highway=via_ferrata: DE:Tag:highway=via ferrata
     highway=yes: DE:Tag:highway=yes
     historic=aircraft: DE:Tag:historic=aircraft
     historic=aqueduct: DE:Tag:historic=aqueduct
@@ -4115,8 +4472,10 @@ de:
     historic=manor: DE:Tag:historic=manor
     historic=memorial: DE:Tag:historic=memorial
     historic=milestone: DE:Tag:historic=milestone
+    historic=millstone: DE:Tag:historic=millstone
     historic=mine: DE:Tag:historic=mine
     historic=mine_shaft: DE:Tag:historic=mine shaft
+    historic=minecart: DE:Tag:historic=minecart
     historic=monastery: DE:Tag:historic=monastery
     historic=monument: DE:Tag:historic=monument
     historic=optical_telegraph: DE:Tag:historic=optical telegraph
@@ -4133,6 +4492,8 @@ de:
     holding_position:type=runway: DE:Tag:holding position:type=runway
     horse=designated: DE:Tag:horse=designated
     horse=dismount: DE:Tag:horse=dismount
+    house=terraced: DE:Tag:house=terraced
+    indoor=corridor: DE:Tag:indoor=corridor
     industrial=aluminium_smelting: DE:Tag:industrial=aluminium smelting
     industrial=asphalt_plant: DE:Tag:industrial=asphalt plant
     industrial=auto_wrecker: DE:Tag:industrial=auto wrecker
@@ -4158,6 +4519,7 @@ de:
     industrial=slaughterhouse: DE:Tag:industrial=slaughterhouse
     industrial=warehouse: DE:Tag:industrial=warehouse
     industrial=wellsite: DE:Tag:industrial=wellsite
+    informal=yes: DE:Tag:informal=yes
     information=audioguide: DE:Tag:information=audioguide
     information=board: DE:Tag:information=board
     information=guidepost: DE:Tag:information=guidepost
@@ -4168,6 +4530,7 @@ de:
     information=tactile_map: DE:Tag:information=tactile map
     information=tactile_model: DE:Tag:information=tactile model
     information=terminal: DE:Tag:information=terminal
+    information=trail_blaze: DE:Tag:information=trail blaze
     information=visitor_centre: DE:Tag:information=visitor centre
     internet_access=wlan: DE:Tag:internet access=wlan
     junction=circular: DE:Tag:junction=circular
@@ -4196,9 +4559,11 @@ de:
     landuse=greenhouse_horticulture: DE:Tag:landuse=greenhouse horticulture
     landuse=industrial: DE:Tag:landuse=industrial
     landuse=landfill: DE:Tag:landuse=landfill
+    landuse=logging: DE:Tag:landuse=logging
     landuse=meadow: DE:Tag:landuse=meadow
     landuse=military: DE:Tag:landuse=military
     landuse=orchard: DE:Tag:landuse=orchard
+    landuse=paddy: DE:Tag:landuse=paddy
     landuse=plant_nursery: DE:Tag:landuse=plant nursery
     landuse=pond: DE:Tag:landuse=pond
     landuse=quarry: DE:Tag:landuse=quarry
@@ -4302,6 +4667,7 @@ de:
     man_made=clearcut: DE:Tag:man made=clearcut
     man_made=column: DE:Tag:man made=column
     man_made=communications_tower: DE:Tag:man made=communications tower
+    man_made=composting_plant: DE:Tag:man made=composting plant
     man_made=cooling_tower: DE:Tag:man made=cooling tower
     man_made=courtyard: DE:Tag:man made=courtyard
     man_made=crane: DE:Tag:man made=crane
@@ -4314,6 +4680,7 @@ de:
     man_made=flagpole: DE:Tag:man made=flagpole
     man_made=flare: DE:Tag:man made=flare
     man_made=footwear_decontamination: DE:Tag:man made=footwear decontamination
+    man_made=frost_fan: DE:Tag:man made=frost fan
     man_made=fuel_pump: DE:Tag:man made=fuel pump
     man_made=gantry: DE:Tag:man made=gantry
     man_made=gasometer: DE:Tag:man made=gasometer
@@ -4342,6 +4709,7 @@ de:
     man_made=petroleum_well: DE:Tag:man made=petroleum well
     man_made=pier: DE:Tag:man made=pier
     man_made=pipeline: DE:Tag:man made=pipeline
+    man_made=planter: DE:Tag:man made=planter
     man_made=power_wind: DE:Tag:man made=power wind
     man_made=pumping_rig: DE:Tag:man made=pumping rig
     man_made=pumping_station: DE:Tag:man made=pumping station
@@ -4361,6 +4729,7 @@ de:
     man_made=tower: DE:Tag:man made=tower
     man_made=urine_deflector: DE:Tag:man made=urine deflector
     man_made=utility_pole: DE:Tag:man made=utility pole
+    man_made=ventilation_shaft: DE:Tag:man made=ventilation shaft
     man_made=wastewater_plant: DE:Tag:man made=wastewater plant
     man_made=water_tank: DE:Tag:man made=water tank
     man_made=water_tap: DE:Tag:man made=water tap
@@ -4374,13 +4743,19 @@ de:
     man_made=works: DE:Tag:man made=works
     manhole=drain: DE:Tag:manhole=drain
     marker=aerial: DE:Tag:marker=aerial
+    marker=ground: DE:Tag:marker=ground
+    marker=pedestal: DE:Tag:marker=pedestal
+    marker=plate: DE:Tag:marker=plate
     marker=post: DE:Tag:marker=post
+    marker=stone: DE:Tag:marker=stone
     maxheight=default: DE:Tag:maxheight=default
+    meadow=meadow_orchard: DE:Tag:meadow=meadow orchard
     meadow=pasture: DE:Tag:meadow=pasture
     megalith_type=alignment: DE:Tag:megalith type=alignment
     megalith_type=chamber: DE:Tag:megalith type=chamber
     megalith_type=cist: DE:Tag:megalith type=cist
     megalith_type=dolmen: DE:Tag:megalith type=dolmen
+    megalith_type=gallery_grave: DE:Tag:megalith type=gallery grave
     megalith_type=long_barrow: DE:Tag:megalith type=long barrow
     megalith_type=menhir: DE:Tag:megalith type=menhir
     megalith_type=nuraghe: DE:Tag:megalith type=nuraghe
@@ -4391,15 +4766,19 @@ de:
     megalith_type=tholos: DE:Tag:megalith type=tholos
     megalith_type=well: DE:Tag:megalith type=well
     memorial:type=stolperstein: DE:Tag:memorial:type=stolperstein
+    memorial=bench: DE:Tag:memorial=bench
     memorial=bust: DE:Tag:memorial=bust
+    memorial=cross: DE:Tag:memorial=cross
     memorial=ghost_bike: DE:Tag:memorial=ghost bike
     memorial=obelisk: DE:Tag:memorial=obelisk
     memorial=plaque: DE:Tag:memorial=plaque
     memorial=sculpture: DE:Tag:memorial=sculpture
     memorial=statue: DE:Tag:memorial=statue
     memorial=stele: DE:Tag:memorial=stele
+    memorial=stolperschwelle: DE:Tag:memorial=stolperschwelle
     memorial=stolperstein: DE:Tag:memorial=stolperstein
     memorial=stone: DE:Tag:memorial=stone
+    memorial=storm_surge_post: DE:Tag:memorial=storm surge post
     memorial=war_memorial: DE:Tag:memorial=war memorial
     microbrewery=yes: DE:Tag:microbrewery=yes
     military=airfield: DE:Tag:military=airfield
@@ -4416,6 +4795,9 @@ de:
     military=trench: DE:Tag:military=trench
     mooring=cruise: DE:Tag:mooring=cruise
     mooring=guest: DE:Tag:mooring=guest
+    motor_vehicle=agricultural: DE:Tag:motor vehicle=agricultural
+    motor_vehicle=agricultural;forestry: DE:Tag:motor vehicle=agricultural;forestry
+    motor_vehicle=forestry: DE:Tag:motor vehicle=forestry
     motorcycle:type=scooter: DE:Tag:motorcycle:type=scooter
     mountain_pass=yes: DE:Tag:mountain pass=yes
     museum=archaeological: DE:Tag:museum=archaeological
@@ -4431,6 +4813,7 @@ de:
     natural=bare_rock: DE:Tag:natural=bare rock
     natural=bay: DE:Tag:natural=bay
     natural=beach: DE:Tag:natural=beach
+    natural=blockfield: DE:Tag:natural=blockfield
     natural=blowhole: DE:Tag:natural=blowhole
     natural=cape: DE:Tag:natural=cape
     natural=cave_entrance: DE:Tag:natural=cave entrance
@@ -4439,6 +4822,7 @@ de:
     natural=col: DE:Tag:natural=col
     natural=earth_bank: DE:Tag:natural=earth bank
     natural=fell: DE:Tag:natural=fell
+    natural=fumarole: DE:Tag:natural=fumarole
     natural=geyser: DE:Tag:natural=geyser
     natural=glacier: DE:Tag:natural=glacier
     natural=gorge: DE:Tag:natural=gorge
@@ -4461,6 +4845,7 @@ de:
     natural=shingle: DE:Tag:natural=shingle
     natural=shoal: DE:Tag:natural=shoal
     natural=shrub: DE:Tag:natural=shrub
+    natural=shrubbery: DE:Tag:natural=shrubbery
     natural=sinkhole: DE:Tag:natural=sinkhole
     natural=spring: DE:Tag:natural=spring
     natural=stone: DE:Tag:natural=stone
@@ -4476,6 +4861,9 @@ de:
     natural=water: DE:Tag:natural=water
     natural=wetland: DE:Tag:natural=wetland
     natural=wood: DE:Tag:natural=wood
+    navigationaid=als: DE:Tag:navigationaid=als
+    navigationaid=papi: DE:Tag:navigationaid=papi
+    navigationaid=vasi: DE:Tag:navigationaid=vasi
     network:type=node_network: DE:Tag:network:type=node network
     network=Flinkster: DE:Tag:network=Flinkster
     network=call-a-bike: DE:Tag:network=call-a-bike
@@ -4546,6 +4934,10 @@ de:
     office=union: DE:Tag:office=union
     office=visa: DE:Tag:office=visa
     office=water_utility: DE:Tag:office=water utility
+    on_demand=yes: DE:Tag:on demand=yes
+    oneway:bicycle=yes: DE:Tag:oneway:bicycle=yes
+    oneway:moped=no: DE:Tag:oneway:moped=no
+    oneway:psv=no: DE:Tag:oneway:psv=no
     oneway=-1: DE:Tag:oneway=-1
     oneway=alternating: DE:Tag:oneway=alternating
     oneway=reversible: DE:Tag:oneway=reversible
@@ -4563,10 +4955,12 @@ de:
     park_ride=hov: DE:Tag:park ride=hov
     parking:lane:hgv=on_street: DE:Tag:parking:lane:hgv=on street
     parking=lane: DE:Tag:parking=lane
+    parking=layby: DE:Tag:parking=layby
     parking=multi-storey: DE:Tag:parking=multi-storey
     parking=street_side: DE:Tag:parking=street side
     parking=surface: DE:Tag:parking=surface
     parking=underground: DE:Tag:parking=underground
+    path=sidewalk: DE:Tag:path=sidewalk
     pipeline=marker: DE:Tag:pipeline=marker
     pipeline=substation: DE:Tag:pipeline=substation
     pipeline=surge_tank: DE:Tag:pipeline=surge tank
@@ -4615,6 +5009,7 @@ de:
     plant:type=combined_cycle: DE:Tag:plant:type=combined cycle
     plant:type=steam_turbine: DE:Tag:plant:type=steam turbine
     playground=hopscotch: DE:Tag:playground=hopscotch
+    playground=marble_run: DE:Tag:playground=marble run
     playground=structure: DE:Tag:playground=structure
     police=academy: DE:Tag:police=academy
     police=barracks: DE:Tag:police=barracks
@@ -4632,6 +5027,7 @@ de:
     power=cable_distribution_cabinet: DE:Tag:power=cable distribution cabinet
     power=catenary_mast: DE:Tag:power=catenary mast
     power=compensator: DE:Tag:power=compensator
+    power=connection: DE:Tag:power=connection
     power=converter: DE:Tag:power=converter
     power=generator: DE:Tag:power=generator
     power=heliostat: DE:Tag:power=heliostat
@@ -4645,16 +5041,23 @@ de:
     power=substation: DE:Tag:power=substation
     power=switch: DE:Tag:power=switch
     power=switchgear: DE:Tag:power=switchgear
+    power=terminal: DE:Tag:power=terminal
     power=tower: DE:Tag:power=tower
     power=transformer: DE:Tag:power=transformer
     prison_camp=concentration_camp: DE:Tag:prison camp=concentration camp
     public_transport=platform: DE:Tag:public transport=platform
+    public_transport=platform_section_sign: DE:Tag:public transport=platform section
+      sign
     public_transport=station: DE:Tag:public transport=station
     public_transport=stop_area: DE:Tag:public transport=stop area
     public_transport=stop_position: DE:Tag:public transport=stop position
     pump=manual: DE:Tag:pump=manual
     pump=no: DE:Tag:pump=no
     pump=powered: DE:Tag:pump=powered
+    railway:signal_box=electric: DE:Tag:railway:signal box=electric
+    railway:signal_box=electronic: DE:Tag:railway:signal box=electronic
+    railway:signal_box=mechanical: DE:Tag:railway:signal box=mechanical
+    railway:signal_box=track_diagram: DE:Tag:railway:signal box=track diagram
     railway=abandoned: DE:Tag:railway=abandoned
     railway=buffer_stop: DE:Tag:railway=buffer stop
     railway=crossing: DE:Tag:railway=crossing
@@ -4677,6 +5080,7 @@ de:
     railway=rail: DE:Tag:railway=rail
     railway=rail_brake: DE:Tag:railway=rail brake
     railway=railway_crossing: DE:Tag:railway=railway crossing
+    railway=razed: DE:Tag:railway=razed
     railway=roundhouse: DE:Tag:railway=roundhouse
     railway=service_station: DE:Tag:railway=service station
     railway=signal: DE:Tag:railway=signal
@@ -4701,17 +5105,22 @@ de:
     refrigerated=yes: DE:Tag:refrigerated=yes
     religion=buddhist: DE:Tag:religion=buddhist
     religion=christian: DE:Tag:religion=christian
+    religion=confucian: DE:Tag:religion=confucian
     religion=hindu: DE:Tag:religion=hindu
     religion=jewish: DE:Tag:religion=jewish
+    religion=multifaith: DE:Tag:religion=multifaith
     religion=muslim: DE:Tag:religion=muslim
     religion=shinto: DE:Tag:religion=shinto
     rental=ski: DE:Tag:rental=ski
+    rental=skip: DE:Tag:rental=skip
     rental=strandkorb: DE:Tag:rental=strandkorb
     repair=assisted_self_service: DE:Tag:repair=assisted self service
     request_stop=yes: DE:Tag:request stop=yes
     residential=rural: DE:Tag:residential=rural
     residential=urban: DE:Tag:residential=urban
     resource=aggregate: DE:Tag:resource=aggregate
+    restriction:bicycle=stop: DE:Tag:restriction:bicycle=stop
+    restriction=no_entry: DE:Tag:restriction=no entry
     road_marking=solid_stop_line: DE:Tag:road marking=solid stop line
     roller_coaster=station: DE:Tag:roller coaster=station
     roller_coaster=track: DE:Tag:roller coaster=track
@@ -4745,6 +5154,9 @@ de:
     route=train: DE:Tag:route=train
     route=tram: DE:Tag:route=tram
     route=trolleybus: DE:Tag:route=trolleybus
+    runway=displaced_threshold: DE:Tag:runway=displaced threshold
+    seamark:small_craft_facility:category=fuel_station: DE:Tag:seamark:small craft
+      facility:category=fuel station
     seamark:type=fairway: DE:Tag:seamark:type=fairway
     seamark:type=mooring: DE:Tag:seamark:type=mooring
     seamark:type=rock: DE:Tag:seamark:type=rock
@@ -4791,6 +5203,7 @@ de:
     shop=car: DE:Tag:shop=car
     shop=car_parts: DE:Tag:shop=car parts
     shop=car_repair: DE:Tag:shop=car repair
+    shop=caravan: DE:Tag:shop=caravan
     shop=carpet: DE:Tag:shop=carpet
     shop=ceramics: DE:Tag:shop=ceramics
     shop=charity: DE:Tag:shop=charity
@@ -4869,6 +5282,7 @@ de:
     shop=model: DE:Tag:shop=model
     shop=money_lender: DE:Tag:shop=money lender
     shop=motorcycle: DE:Tag:shop=motorcycle
+    shop=motorcycle_repair: DE:Tag:shop=motorcycle repair
     shop=music: DE:Tag:shop=music
     shop=musical_instrument: DE:Tag:shop=musical instrument
     shop=newsagent: DE:Tag:shop=newsagent
@@ -4891,6 +5305,7 @@ de:
     shop=power_tools: DE:Tag:shop=power tools
     shop=radiotechnics: DE:Tag:shop=radiotechnics
     shop=religion: DE:Tag:shop=religion
+    shop=rental: DE:Tag:shop=rental
     shop=repair: DE:Tag:shop=repair
     shop=robot: DE:Tag:shop=robot
     shop=scuba_diving: DE:Tag:shop=scuba diving
@@ -4914,6 +5329,7 @@ de:
     shop=tobacco: DE:Tag:shop=tobacco
     shop=tool_hire: DE:Tag:shop=tool hire
     shop=toys: DE:Tag:shop=toys
+    shop=tractor: DE:Tag:shop=tractor
     shop=trade: DE:Tag:shop=trade
     shop=travel_agency: DE:Tag:shop=travel agency
     shop=trophy: DE:Tag:shop=trophy
@@ -4921,6 +5337,7 @@ de:
     shop=vacant: DE:Tag:shop=vacant
     shop=vacuum_cleaner: DE:Tag:shop=vacuum cleaner
     shop=variety_store: DE:Tag:shop=variety store
+    shop=vending_machine: DE:Tag:shop=vending machine
     shop=video: DE:Tag:shop=video
     shop=video_games: DE:Tag:shop=video games
     shop=watches: DE:Tag:shop=watches
@@ -4998,6 +5415,7 @@ de:
     sport=judo: DE:Tag:sport=judo
     sport=karting: DE:Tag:sport=karting
     sport=korfball: DE:Tag:sport=korfball
+    sport=mind_body_interventions: DE:Tag:sport=mind body interventions
     sport=model_aerodrome: DE:Tag:sport=model aerodrome
     sport=motocross: DE:Tag:sport=motocross
     sport=motor: DE:Tag:sport=motor
@@ -5027,6 +5445,8 @@ de:
     sport=yoga: DE:Tag:sport=yoga
     station=light_rail: DE:Tag:station=light rail
     station=subway: DE:Tag:station=subway
+    statue=equestrian: DE:Tag:statue=equestrian
+    stone_type=conciliation_cross: DE:Tag:stone type=conciliation cross
     studio=audio: DE:Tag:studio=audio
     studio=radio: DE:Tag:studio=radio
     studio=video: DE:Tag:studio=video
@@ -5035,6 +5455,9 @@ de:
     substance=gas: DE:Tag:substance=gas
     substance=hot_water: DE:Tag:substance=hot water
     substance=oil: DE:Tag:substance=oil
+    substance=rainwater: DE:Tag:substance=rainwater
+    substance=sewage: DE:Tag:substance=sewage
+    substance=water: DE:Tag:substance=water
     substation=converter: DE:Tag:substation=converter
     substation=distribution: DE:Tag:substation=distribution
     substation=generation: DE:Tag:substation=generation
@@ -5042,6 +5465,7 @@ de:
     substation=traction: DE:Tag:substation=traction
     substation=transmission: DE:Tag:substation=transmission
     summit:cross=yes: DE:Tag:summit:cross=yes
+    surface=acrylic: DE:Tag:surface=acrylic
     surface=artificial_turf: DE:Tag:surface=artificial turf
     surface=asphalt: DE:Tag:surface=asphalt
     surface=chipseal: DE:Tag:surface=chipseal
@@ -5051,15 +5475,24 @@ de:
     surface=concrete: DE:Tag:surface=concrete
     surface=concrete:lanes: DE:Tag:surface=concrete:lanes
     surface=concrete:plates: DE:Tag:surface=concrete:plates
+    surface=dirt: DE:Tag:surface=dirt
+    surface=earth: DE:Tag:surface=earth
     surface=fine_gravel: DE:Tag:surface=fine gravel
+    surface=grass: DE:Tag:surface=grass
+    surface=grass_paver: DE:Tag:surface=grass paver
     surface=gravel: DE:Tag:surface=gravel
     surface=ground: DE:Tag:surface=ground
+    surface=metal: DE:Tag:surface=metal
     surface=paved: DE:Tag:surface=paved
     surface=paving_stones: DE:Tag:surface=paving stones
+    surface=paving_stones:lanes: DE:Tag:surface=paving stones:lanes
+    surface=pebblestone: DE:Tag:surface=pebblestone
+    surface=sand: DE:Tag:surface=sand
     surface=sett: DE:Tag:surface=sett
     surface=tartan: DE:Tag:surface=tartan
     surface=unhewn_cobblestone: DE:Tag:surface=unhewn cobblestone
     surface=unpaved: DE:Tag:surface=unpaved
+    surface=wood: DE:Tag:surface=wood
     swimming_pool=yes: DE:Tag:swimming pool=yes
     switch=circuit_breaker: DE:Tag:switch=circuit breaker
     switch=disconnector: DE:Tag:switch=disconnector
@@ -5128,6 +5561,9 @@ 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
+    townhall:type=village: DE:Tag:townhall:type=village
+    trade=metal: DE:Tag:trade=metal
+    trade=timber: DE:Tag:trade=timber
     traffic_calming=bump: DE:Tag:traffic calming=bump
     traffic_calming=chicane: DE:Tag:traffic calming=chicane
     traffic_calming=choked_island: DE:Tag:traffic calming=choked island
@@ -5143,8 +5579,12 @@ de:
     traffic_calming=rumble_strip: DE:Tag:traffic calming=rumble strip
     traffic_calming=table: DE:Tag:traffic calming=table
     traffic_calming=yes: DE:Tag:traffic calming=yes
+    traffic_sign=AT:WVO_F.1: DE:Tag:traffic sign=AT:WVO F.1
     'traffic_sign=DE:': 'DE:Tag:traffic sign=DE:'
+    traffic_sign=DE:1020-30: DE:Tag:traffic sign=DE:1020-30
     traffic_sign=DE:1022-10: DE:Tag:traffic sign=DE:1022-10
+    traffic_sign=DE:1022-12: DE:Tag:traffic sign=DE:1022-12
+    traffic_sign=DE:1026-38: DE:Tag:traffic sign=DE:1026-38
     traffic_sign=DE:103-10: DE:Tag:traffic sign=DE:103-10
     traffic_sign=DE:103-20: DE:Tag:traffic sign=DE:103-20
     traffic_sign=DE:124: DE:Tag:traffic sign=DE:124
@@ -5157,8 +5597,10 @@ de:
     traffic_sign=DE:208: DE:Tag:traffic sign=DE:208
     traffic_sign=DE:220-10: DE:Tag:traffic sign=DE:220-10
     traffic_sign=DE:220-20: DE:Tag:traffic sign=DE:220-20
+    traffic_sign=DE:222: DE:Tag:traffic sign=DE:222
     traffic_sign=DE:224: DE:Tag:traffic sign=DE:224
     traffic_sign=DE:237: DE:Tag:traffic sign=DE:237
+    traffic_sign=DE:238: DE:Tag:traffic sign=DE:238
     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
@@ -5169,10 +5611,13 @@ de:
     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:244.3: DE:Tag:traffic sign=DE:244.3
     traffic_sign=DE:245: DE:Tag:traffic sign=DE:245
     traffic_sign=DE:250: DE:Tag:traffic sign=DE:250
+    traffic_sign=DE:251: DE:Tag:traffic sign=DE:251
     traffic_sign=DE:253: DE:Tag:traffic sign=DE:253
     traffic_sign=DE:254: DE:Tag:traffic sign=DE:254
+    traffic_sign=DE:255: DE:Tag:traffic sign=DE:255
     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
@@ -5199,6 +5644,8 @@ de:
     traffic_sign=DE:276: DE:Tag:traffic sign=DE:276
     traffic_sign=DE:277: DE:Tag:traffic sign=DE:277
     traffic_sign=DE:282: DE:Tag:traffic sign=DE:282
+    traffic_sign=DE:283: DE:Tag:traffic sign=DE:283
+    traffic_sign=DE:286: DE:Tag:traffic sign=DE:286
     traffic_sign=DE:306: DE:Tag:traffic sign=DE:306
     traffic_sign=DE:308: DE:Tag:traffic sign=DE:308
     traffic_sign=DE:310: DE:Tag:traffic sign=DE:310
@@ -5223,6 +5670,8 @@ de:
     traffic_sign=DE:437: DE:Tag:traffic sign=DE:437
     traffic_sign=DE:438: DE:Tag:traffic sign=DE:438
     traffic_sign=DE:439: DE:Tag:traffic sign=DE:439
+    traffic_sign=DE:440: DE:Tag:traffic sign=DE:440
+    traffic_sign=DE:441: DE:Tag:traffic sign=DE:441
     traffic_sign=DE:448: DE:Tag:traffic sign=DE:448
     traffic_sign=DE:449: DE:Tag:traffic sign=DE:449
     traffic_sign=DE:453: DE:Tag:traffic sign=DE:453
@@ -5232,6 +5681,8 @@ de:
     traffic_sign=DE:600-33: DE:Tag:traffic sign=DE:600-33
     traffic_sign=DE:600-34: DE:Tag:traffic sign=DE:600-34
     traffic_sign=city_limit: DE:Tag:traffic sign=city limit
+    traffic_sign=variable_message: DE:Tag:traffic sign=variable message
+    training=bicycle: DE:Tag:training=bicycle
     transformer=distribution: DE:Tag:transformer=distribution
     tunnel=building_passage: DE:Tag:tunnel=building passage
     tunnel=culvert: DE:Tag:tunnel=culvert
@@ -5244,10 +5695,16 @@ de:
     usage=industrial: DE:Tag:usage=industrial
     usage=irrigation: DE:Tag:usage=irrigation
     usage=penstock: DE:Tag:usage=penstock
+    usage=spillway: DE:Tag:usage=spillway
     usage=tailrace: DE:Tag:usage=tailrace
     usage=tourism: DE:Tag:usage=tourism
     usage=transmission: DE:Tag:usage=transmission
+    usage=transportation: DE:Tag:usage=transportation
+    utility=gas: DE:Tag:utility=gas
     utility=power: DE:Tag:utility=power
+    vehicle=agricultural: DE:Tag:vehicle=agricultural
+    vehicle=destination: DE:Tag:vehicle=destination
+    vehicle=forestry: DE:Tag:vehicle=forestry
     vehicle=no: DE:Tag:vehicle=no
     vending=SIM_cards: DE:Tag:vending=SIM cards
     vending=admission_tickets: DE:Tag:vending=admission tickets
@@ -5280,6 +5737,7 @@ de:
     vending=food: DE:Tag:vending=food
     vending=french_fries: DE:Tag:vending=french fries
     vending=fuel: DE:Tag:vending=fuel
+    vending=gas: DE:Tag:vending=gas
     vending=gas_bottles: DE:Tag:vending=gas bottles
     vending=ice_cream: DE:Tag:vending=ice cream
     vending=ice_cubes: DE:Tag:vending=ice cubes
@@ -5305,7 +5763,16 @@ de:
     vending=toys: DE:Tag:vending=toys
     vending=umbrellas: DE:Tag:vending=umbrellas
     vending=water: DE:Tag:vending=water
+    vending=wood_pellet: DE:Tag:vending=wood pellet
     vending_machine=fuel: DE:Tag:vending machine=fuel
+    volcano:status=active: DE:Tag:volcano:status=active
+    volcano:status=dormant: DE:Tag:volcano:status=dormant
+    volcano:status=extinct: DE:Tag:volcano:status=extinct
+    volcano:type=lava_dome: DE:Tag:volcano:type=lava dome
+    volcano:type=maar: DE:Tag:volcano:type=maar
+    volcano:type=scoria: DE:Tag:volcano:type=scoria
+    volcano:type=shield: DE:Tag:volcano:type=shield
+    volcano:type=stratovolcano: DE:Tag:volcano:type=stratovolcano
     wall=castle_wall: DE:Tag:wall=castle wall
     wall=dry_stone: DE:Tag:wall=dry stone
     wall=no: DE:Tag:wall=no
@@ -5323,6 +5790,7 @@ de:
     water=basin: DE:Tag:water=basin
     water=canal: DE:Tag:water=canal
     water=ditch: DE:Tag:water=ditch
+    water=drain: DE:Tag:water=drain
     water=harbour: DE:Tag:water=harbour
     water=lagoon: DE:Tag:water=lagoon
     water=lake: DE:Tag:water=lake
@@ -5330,20 +5798,25 @@ de:
     water=moat: DE:Tag:water=moat
     water=oxbow: DE:Tag:water=oxbow
     water=pond: DE:Tag:water=pond
+    water=rapids: DE:Tag:water=rapids
     water=reservoir: DE:Tag:water=reservoir
     water=river: DE:Tag:water=river
     water=stream: DE:Tag:water=stream
     water=wastewater: DE:Tag:water=wastewater
+    water_source=main: DE:Tag:water source=main
     waterway=boat_lift: DE:Tag:waterway=boat lift
     waterway=boatyard: DE:Tag:waterway=boatyard
     waterway=canal: DE:Tag:waterway=canal
+    waterway=canoe_pass: DE:Tag:waterway=canoe pass
     waterway=dam: DE:Tag:waterway=dam
+    waterway=debris_screen: DE:Tag:waterway=debris screen
     waterway=derelict_canal: DE:Tag:waterway=derelict canal
     waterway=ditch: DE:Tag:waterway=ditch
     waterway=dock: DE:Tag:waterway=dock
     waterway=drain: DE:Tag:waterway=drain
     waterway=fairway: DE:Tag:waterway=fairway
     waterway=fish_pass: DE:Tag:waterway=fish pass
+    waterway=flowline: DE:Tag:waterway=flowline
     waterway=fuel: DE:Tag:waterway=fuel
     waterway=lock_gate: DE:Tag:waterway=lock gate
     waterway=milestone: DE:Tag:waterway=milestone
@@ -5379,14 +5852,23 @@ de:
     zoo=reptile: DE:Tag:zoo=reptile
     zoo=safari_park: DE:Tag:zoo=safari park
     zoo=wildlife_park: DE:Tag:zoo=wildlife park
+diq:
+  tag:
+    genus=Platanus: Diq:Tag:genus=Platanus
+    religion=muslim: Diq:Tag:religion=muslim
+draft:
+  tag:
+    waterway=link: Draft:Tag:waterway=link
 el:
   key:
     amenity: El:Key:amenity
     building:architecture: El:Key:building:architecture
     building:levels: El:Key:building:levels
     height: El:Key:height
+    name: El:Key:name
     shop: El:Key:shop
     surface: El:Key:surface
+    toll: El:Key:toll
   tag:
     amenity=bar: El:Tag:amenity=bar
     amenity=bbq: El:Tag:amenity=bbq
@@ -5412,17 +5894,23 @@ el:
     amenity=school: El:Tag:amenity=school
     amenity=taxi: El:Tag:amenity=taxi
     amenity=university: El:Tag:amenity=university
+    emergency=ladder_site: El:Tag:emergency=ladder site
+    genus=Tilia: El:Tag:genus=Tilia
     highway=motorway: El:Tag:highway=motorway
     highway=service: El:Tag:highway=service
     highway=tertiary: El:Tag:highway=tertiary
     highway=track: El:Tag:highway=track
+    religion=jewish: El:Tag:religion=jewish
 en:
   key:
     '*:backward': Key:*:backward
+    '*:both': Key:*:both
+    '*:conditional': Key:*:conditional
     '*:en': Key:*:en
     '*:forward': Key:*:forward
     '*:left': Key:*:left
     '*:physical': Key:*:physical
+    '*:restriction': Key:*:restriction
     '*:right': Key:*:right
     '*:wikidata': Key:*:wikidata
     3dmr: Key:3dmr
@@ -5440,6 +5928,7 @@ en:
     EE:EHIS:type: Key:EE:EHIS:type
     EHAK:code: Key:EHAK:code
     EH_ref: Key:EH ref
+    FID: Key:FID
     FIXME: Key:FIXME
     Finance_agent: Key:Finance agent
     GNS: Key:GNS
@@ -5450,6 +5939,7 @@ en:
     HE_ref: Key:HE ref
     HFCS: Key:HFCS
     HU:ed_direction: Key:HU:ed direction
+    HU:hu-go: Key:HU:hu-go
     HU:hu-go:length: Key:HU:hu-go:length
     HU:hu-go:milestone: Key:HU:hu-go:milestone
     HU:hu-go:road: Key:HU:hu-go:road
@@ -5470,19 +5960,31 @@ en:
     LINZ:layer: Key:LINZ:layer
     LINZ:source_version: Key:LINZ:source version
     Lock_ref: Key:Lock ref
+    MN_Mway_island: Key:MN Mway island
+    MN_city_tier: Key:MN city tier
+    MN_metro: Key:MN metro
+    MN_metro_edge: Key:MN metro edge
+    MN_metro_spoke: Key:MN metro spoke
+    MN_to_expressway: Key:MN to expressway
+    MN_to_trunk: Key:MN to trunk
     Mapper: Key:Mapper
     NHD:FCode: Key:NHD:FCode
     NHD:ReachCode: Key:NHD:ReachCode
     NHS: Key:NHS
+    NJDOT_SRI: Key:NJDOT SRI
     NSIW: Key:NSIW
     Oslostandarden: Key:Oslostandarden
+    Oslostandarden:cycleway:width: Key:Oslostandarden:cycleway:width
     PMSA_ref: Key:PMSA ref
     Place:CN: Key:Place:CN
     Power_supply:schedule: Key:Power supply:schedule
     RLIS:bicycle: Key:RLIS:bicycle
     RLIS:reviewed: Key:RLIS:reviewed
+    Ruter:id: Key:Ruter:id
+    SCI:Code: Key:SCI:Code
     Schalansky_ref: Key:Schalansky ref
     Shop: Key:Shop
+    Socket:type2_combo: Key:Socket:type2 combo
     TARC: Key:TARC
     TMC: Key:TMC
     TMC:Direction: Key:TMC:Direction
@@ -5504,12 +6006,19 @@ en:
     abbr_name: Key:abbr name
     abutters: Key:abutters
     access: Key:access
+    access:both_ways: Key:access:both ways
+    access:carriages: Key:access:carriages
     access:conditional: Key:access:conditional
     access:covid19: Key:access:covid19
     access:delivery: Key:access:delivery
     access:lanes: Key:access:lanes
     access:offroad: Key:access:offroad
+    access:roof: Key:access:roof
+    access_control: Key:access control
+    accommodation: Key:accommodation
+    accuracy: Key:accuracy
     accuracy:meters: Key:accuracy:meters
+    acres: Key:acres
     active_traffic_management: Key:active traffic management
     actuator: Key:actuator
     addr: Key:addr
@@ -5531,6 +6040,7 @@ en:
     addr:city:simc: Key:addr:city:simc
     addr:city:ur: Key:addr:city:ur
     addr:conscriptionnumber: Key:addr:conscriptionnumber
+    addr:contact: Key:addr:contact
     addr:country: Key:addr:country
     addr:county: Key:addr:county
     addr:description: Key:addr:description
@@ -5554,6 +6064,7 @@ en:
     addr:inclusion: Key:addr:inclusion
     addr:interpolation: Key:addr:interpolation
     addr:khasra: Key:addr:khasra
+    addr:locality: Key:addr:locality
     addr:milestone: Key:addr:milestone
     addr:neighborhood: Key:addr:neighborhood
     addr:neighbourhood: Key:addr:neighbourhood
@@ -5564,7 +6075,6 @@ en:
     addr:place:en: Key:addr:place:en
     addr:place:it: Key:addr:place:it
     addr:plot: Key:addr:plot
-    addr:postbox: Key:addr:postbox
     addr:postcode: Key:addr:postcode
     addr:postcode:source: Key:addr:postcode:source
     addr:province: Key:addr:province
@@ -5581,6 +6091,7 @@ en:
     addr:state: Key:addr:state
     addr:street: Key:addr:street
     addr:street:ar: Key:addr:street:ar
+    addr:street:corner: Key:addr:street:corner
     addr:street:de: Key:addr:street:de
     addr:street:en: Key:addr:street:en
     addr:street:fr: Key:addr:street:fr
@@ -5603,9 +6114,13 @@ en:
     address: Key:address
     admin_level: Key:admin level
     admin_title: Key:admin title
+    admin_type:PH: Key:admin type:PH
     adr_les: Key:adr les
     advertising: Key:advertising
+    aerial: Key:aerial
     aerialway: Key:aerialway
+    aerialway:*: Key:aerialway:*
+    aerialway:bicycle: Key:aerialway:bicycle
     aerialway:drag_lift: Key:aerialway:drag lift
     aerialway:duration: Key:aerialway:duration
     aerialway:occupancy: Key:aerialway:occupancy
@@ -5617,13 +6132,17 @@ en:
     age: Key:age
     agrarian: Key:agrarian
     agricultural: Key:agricultural
+    agroecology: Key:agroecology
     air_conditioning: Key:air conditioning
+    airside: Key:airside
     alcohol: Key:alcohol
+    alt_addr:housenumber: Key:alt addr:housenumber
     alt_name: Key:alt name
     alt_name:ar: Key:alt name:ar
     alt_name:arc: Key:alt name:arc
     alt_name:azb: Key:alt name:azb
     alt_name:be: Key:alt name:be
+    alt_name:ca: Key:alt name:ca
     alt_name:ckb: Key:alt name:ckb
     alt_name:de: Key:alt name:de
     alt_name:en: Key:alt name:en
@@ -5666,6 +6185,7 @@ en:
     archaeologist:wikidata: Key:archaeologist:wikidata
     architect: Key:architect
     architect:wikidata: Key:architect:wikidata
+    architect:wikimedia_commons: Key:architect:wikimedia commons
     architect:wikipedia: Key:architect:wikipedia
     area: Key:area
     area:aeroway: Key:area:aeroway
@@ -5673,6 +6193,7 @@ en:
     armrest: Key:armrest
     artist:note: Key:artist:note
     artist:wikidata: Key:artist:wikidata
+    artist:wikimedia_commons: Key:artist:wikimedia commons
     artist:wikipedia: Key:artist:wikipedia
     artist_name: Key:artist name
     artwork:subject:wikidata: Key:artwork:subject:wikidata
@@ -5681,6 +6202,7 @@ en:
     artwork_type: Key:artwork type
     asb: Key:asb
     ascent: Key:ascent
+    ashtray: Key:ashtray
     asphalt:type: Key:asphalt:type
     assembly_point:bombing: Key:assembly point:bombing
     assembly_point:earthquake: Key:assembly point:earthquake
@@ -5693,6 +6215,7 @@ en:
     assisted_trail: Key:assisted trail
     association: Key:association
     at_bev:addr_date: Key:at bev:addr date
+    atmotorroad: Key:atmotorroad
     atmotorway: Key:atmotorway
     attraction: Key:attraction
     attribution: Key:attribution
@@ -5708,6 +6231,7 @@ en:
     authentication:none: Key:authentication:none
     authentication:phone_call: Key:authentication:phone call
     authentication:short_message: Key:authentication:short message
+    authority: Key:authority
     auto_rickshaw: Key:auto rickshaw
     autoaws: Key:autoaws
     automated: Key:automated
@@ -5717,6 +6241,8 @@ en:
     avalanche_protection: Key:avalanche protection
     avalanche_transceiver: Key:avalanche transceiver
     avz: Key:avz
+    award:tiemann: Key:award:tiemann
+    axle_load: Key:axle load
     baby: Key:baby
     baby_feeding: Key:baby feeding
     backcountry: Key:backcountry
@@ -5755,6 +6281,7 @@ en:
     bicycle:description: Key:bicycle:description
     bicycle:designated:type: Key:bicycle:designated:type
     bicycle:forward: Key:bicycle:forward
+    bicycle:lanes: Key:bicycle:lanes
     bicycle:left: Key:bicycle:left
     bicycle:oneway: Key:bicycle:oneway
     bicycle:physical: Key:bicycle:physical
@@ -5762,19 +6289,24 @@ en:
     bicycle:type: Key:bicycle:type
     bicycle_bypass: Key:bicycle bypass
     bicycle_parking: Key:bicycle parking
+    bicycle_parking:security_chain: Key:bicycle parking:security chain
     bike_friend: Key:bike friend
     bike_ride: Key:bike ride
     bin: Key:bin
     biosphärenwirt: Key:biosphärenwirt
     biotic_reef: Key:biotic reef
     biotic_reef:type: Key:biotic reef:type
+    blind: Key:blind
+    board:*: Key:board:*
     board:title: Key:board:title
     board_type: Key:board type
     boat: Key:boat
     bollard: Key:bollard
+    bond: Key:bond
     booking: Key:booking
     books: Key:books
     boot_scraper: Key:boot scraper
+    boot_scraper:wikimedia_commons: Key:boot scraper:wikimedia commons
     booth: Key:booth
     border_type: Key:border type
     bot: Key:bot
@@ -5793,11 +6325,13 @@ en:
     brand:en: Key:brand:en
     brand:es: Key:brand:es
     brand:fr: Key:brand:fr
+    brand:ja: Key:brand:ja
     brand:main: Key:brand:main
     brand:remarketed: Key:brand:remarketed
     brand:ur: Key:brand:ur
     brand:website: Key:brand:website
     brand:wikidata: Key:brand:wikidata
+    brand:wikimedia_commons: Key:brand:wikimedia commons
     brand:wikipedia: Key:brand:wikipedia
     brand:wikipedia:ar: Key:brand:wikipedia:ar
     brand:wikipedia:de: Key:brand:wikipedia:de
@@ -5826,7 +6360,10 @@ en:
     brunch: Key:brunch
     bubbleid: Key:bubbleid
     buffer_stop: Key:buffer stop
+    builder: Key:builder
+    builder:wikidata: Key:builder:wikidata
     building: Key:building
+    building:*: Key:building:*
     building:architecture: Key:building:architecture
     building:cladding: Key:building:cladding
     building:color: Key:building:color
@@ -5838,6 +6375,7 @@ en:
     building:facade:colour: Key:building:facade:colour
     building:fireproof: Key:building:fireproof
     building:flats: Key:building:flats
+    building:floor_area: Key:building:floor area
     building:foundation_height: Key:building:foundation height
     building:level: Key:building:level
     building:level:1,2,3...: Key:building:level:1,2,3...
@@ -5862,9 +6400,11 @@ en:
     building:use:pl: Key:building:use:pl
     building:use:residential: Key:building:use:residential
     building:walls: Key:building:walls
+    building:wikidata: Key:building:wikidata
     bulk_purchase: Key:bulk purchase
     bunker_type: Key:bunker type
     buried:wikidata: Key:buried:wikidata
+    buried:wikimedia_commons: Key:buried:wikimedia commons
     buried:wikipedia: Key:buried:wikipedia
     bus: Key:bus
     bus:lanes: Key:bus:lanes
@@ -5873,11 +6413,11 @@ en:
     bus_bay: Key:bus bay
     bus_class:length: Key:bus class:length
     busbar: Key:busbar
+    buskerudbyen:cycleway: Key:buskerudbyen:cycleway
     busway: Key:busway
-    busway:left: Key:busway:left
-    busway:right: Key:busway:right
     butcher: Key:butcher
     button_operated: Key:button operated
+    by_night: Key:by night
     bygningsnr: Key:bygningsnr
     cabins: Key:cabins
     cable_number: Key:cable number
@@ -5885,7 +6425,10 @@ en:
     cadc:2020: Key:cadc:2020
     cadet: Key:cadet
     cafe: Key:cafe
+    cairn: Key:cairn
+    callable: Key:callable
     callsign: Key:callsign
+    camera:angle: Key:camera:angle
     camera:direction: Key:camera:direction
     camera:mount: Key:camera:mount
     camera:type: Key:camera:type
@@ -5895,9 +6438,13 @@ en:
     campwild: Key:campwild
     canal: Key:canal
     canoe: Key:canoe
+    canoe:description: Key:canoe:description
     capacity: Key:capacity
+    capacity:*: Key:capacity:*
+    capacity:baby: Key:capacity:baby
     capacity:beds: Key:capacity:beds
     capacity:cabins: Key:capacity:cabins
+    capacity:cargo_bike: Key:capacity:cargo bike
     capacity:charging: Key:capacity:charging
     capacity:disabled: Key:capacity:disabled
     capacity:long: Key:capacity:long
@@ -5905,6 +6452,7 @@ en:
     capacity:motorcycle: Key:capacity:motorcycle
     capacity:parent: Key:capacity:parent
     capacity:persons: Key:capacity:persons
+    capacity:pitches: Key:capacity:pitches
     capacity:rooms: Key:capacity:rooms
     capacity:seats: Key:capacity:seats
     capacity:standard: Key:capacity:standard
@@ -5913,6 +6461,7 @@ en:
     capacity:women: Key:capacity:women
     capital: Key:capital
     capital_city: Key:capital city
+    car:*: Key:car:*
     car_parts: Key:car parts
     car_repair: Key:car repair
     car_wash: Key:car wash
@@ -5939,32 +6488,44 @@ en:
     castle_type: Key:castle type
     castle_type:cs: Key:castle type:cs
     castle_type:de: Key:castle type:de
+    category: Key:category
     cave:name: Key:cave:name
     cave:ref: Key:cave:ref
+    cellar:use: Key:cellar:use
     cemetery: Key:cemetery
     cemt: Key:cemt
-    census:population: Key:census:population
     central_island:traversable: Key:central island:traversable
     centralkey: Key:centralkey
     change: Key:change
     change:lanes: Key:change:lanes
-    changesets_count: Key:changesets count
     changing_table: Key:changing table
+    changing_table:adult: Key:changing table:adult
     changing_table:count: Key:changing table:count
     changing_table:fee: Key:changing table:fee
+    changing_table:height:adjustable: Key:changing table:height:adjustable
+    changing_table:hoist: Key:changing table:hoist
     changing_table:location: Key:changing table:location
     charge: Key:charge
+    charge:conditional: Key:charge:conditional
     charity: Key:charity
     chchsid: Key:chchsid
     check_date: Key:check date
+    check_date:*: Key:check date:*
     check_date:crossing: Key:check date:crossing
     check_date:opening_hours: Key:check date:opening hours
     check_date:shelter: Key:check date:shelter
     check_date:surface: Key:check date:surface
+    check_in: Key:check in
+    check_out: Key:check out
     checkpoint: Key:checkpoint
     china_class: Key:china class
     china_population: Key:china population
     church:type: Key:church:type
+    cinema:3D: Key:cinema:3D
+    cinema:IMAX: Key:cinema:IMAX
+    cinema:LUXE: Key:cinema:LUXE
+    cinema:dolby_atmos: Key:cinema:dolby atmos
+    cinema:dolby_cinema: Key:cinema:dolby cinema
     circuits: Key:circuits
     circumference: Key:circumference
     city_limit: Key:city limit
@@ -5996,6 +6557,7 @@ en:
     colonnade: Key:colonnade
     color: Key:color
     colour: Key:colour
+    colour:*: Key:colour:*
     column:architecture: Key:column:architecture
     column:shape: Key:column:shape
     column:style: Key:column:style
@@ -6004,6 +6566,7 @@ en:
     communication:amateur_radio: Key:communication:amateur radio
     communication:amateur_radio:callsign: Key:communication:amateur radio:callsign
     communication:amateur_radio:link: Key:communication:amateur radio:link
+    communication:amateur_radio:pota: Key:communication:amateur radio:pota
     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
@@ -6015,19 +6578,25 @@ en:
     communication:amateur_radio:repeater:toneburst: Key:communication:amateur radio:repeater:toneburst
     communication:amateur_radio:sota: Key:communication:amateur radio:sota
     communication:amateur_radio:wca: Key:communication:amateur radio:wca
+    communication:amateur_radio:wwff: Key:communication:amateur radio:wwff
     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:radio:repeater: Key:communication:radio:repeater
+    communication:satellite: Key:communication:satellite
     communication:space: Key:communication:space
     communication:television: Key:communication:television
     community: Key:community
+    community_adopted: Key:community adopted
     community_centre: Key:community centre
     community_centre:for: Key:community centre:for
+    community_safety_zone: Key:community safety zone
     company: Key:company
     compensator: Key:compensator
     compressed_air: Key:compressed air
+    computer:*: Key:computer:*
     condition: Key:condition
     conditional: Key:conditional
     condo: Key:condo
@@ -6039,6 +6608,8 @@ en:
     construction:*: Key:construction:*
     construction:building: Key:construction:building
     construction:highway: Key:construction:highway
+    construction:power: Key:construction:power
+    construction:railway:etcs: Key:construction:railway:etcs
     construction:website: Key:construction:website
     construction_date: Key:construction date
     construction_start_expected: Key:construction start expected
@@ -6046,6 +6617,8 @@ en:
     consulting: Key:consulting
     contact: Key:contact
     contact:*: Key:contact:*
+    contact:bluesky: Key:contact:bluesky
+    contact:booking: Key:contact:booking
     contact:city: Key:contact:city
     contact:country: Key:contact:country
     contact:diaspora: Key:contact:diaspora
@@ -6058,6 +6631,7 @@ en:
     contact:google_plus: Key:contact:google plus
     contact:housenumber: Key:contact:housenumber
     contact:instagram: Key:contact:instagram
+    contact:line: Key:contact:line
     contact:linkedin: Key:contact:linkedin
     contact:mastodon: Key:contact:mastodon
     contact:mobile: Key:contact:mobile
@@ -6068,9 +6642,12 @@ en:
     contact:postcode: Key:contact:postcode
     contact:sip: Key:contact:sip
     contact:skype: Key:contact:skype
+    contact:sms: Key:contact:sms
     contact:street: Key:contact:street
     contact:telegram: Key:contact:telegram
     contact:tiktok: Key:contact:tiktok
+    contact:tripadvisor: Key:contact:tripadvisor
+    contact:tty: Key:contact:tty
     contact:twitter: Key:contact:twitter
     contact:vhf: Key:contact:vhf
     contact:viber: Key:contact:viber
@@ -6080,9 +6657,12 @@ en:
     contact:whatsapp: Key:contact:whatsapp
     contact:xing: Key:contact:xing
     contact:xmpp: Key:contact:xmpp
+    contact:yelp: Key:contact:yelp
     contact:youtube: Key:contact:youtube
+    contact_line: Key:contact line
     contamination: Key:contamination
     content: Key:content
+    continuous_sidewalk: Key:continuous sidewalk
     converted_by: Key:converted by
     conveying: Key:conveying
     cooker: Key:cooker
@@ -6095,6 +6675,8 @@ en:
     count: Key:count
     country: Key:country
     couplings: Key:couplings
+    couplings:diameters: Key:couplings:diameters
+    couplings:type: Key:couplings:type
     courts: Key:courts
     covered: Key:covered
     craft: Key:craft
@@ -6106,13 +6688,16 @@ en:
     crossing:aircraft: Key:crossing:aircraft
     crossing:barrier: Key:crossing:barrier
     crossing:bell: Key:crossing:bell
+    crossing:bollard: Key:crossing:bollard
     crossing:chicane: Key:crossing:chicane
+    crossing:continuous: Key:crossing:continuous
     crossing:island: Key:crossing:island
     crossing:light: Key:crossing:light
     crossing:markings: Key:crossing:markings
     crossing:on_demand: Key:crossing:on demand
     crossing:saltire: Key:crossing:saltire
     crossing:signals: Key:crossing:signals
+    crossing:supervision: Key:crossing:supervision
     crossing:whistle: Key:crossing:whistle
     crossing_ref: Key:crossing ref
     cruising: Key:cruising
@@ -6120,20 +6705,11 @@ en:
     cs_dir:forward: Key:cs dir:forward
     cuisine: Key:cuisine
     cultivation_method: Key:cultivation method
+    cultural_district: Key:cultural district
+    culvert: Key:culvert
     currency: Key:currency
     currency:*: Key:currency:*
-    currency:BTC: Key:currency:BTC
-    currency:CAD: Key:currency:CAD
-    currency:CHF: Key:currency:CHF
-    currency:EUR: Key:currency:EUR
-    currency:GBP: Key:currency:GBP
-    currency:PLN: Key:currency:PLN
-    currency:RUB: Key:currency:RUB
-    currency:USD: Key:currency:USD
-    currency:XBT: Key:currency:XBT
     currency:XLT: Key:currency:XLT
-    currency:XXX: Key:currency:XXX
-    currency:others: Key:currency:others
     curve: Key:curve
     curve:name: Key:curve:name
     curve:ref: Key:curve:ref
@@ -6151,16 +6727,22 @@ en:
     cyclestreets_id: Key:cyclestreets id
     cycleway: Key:cycleway
     cycleway:both: Key:cycleway:both
+    cycleway:both:buffer: Key:cycleway:both:buffer
     cycleway:both:lane: Key:cycleway:both:lane
     cycleway:both:oneway: Key:cycleway:both:oneway
+    cycleway:both:separation: Key:cycleway:both:separation
+    cycleway:both:surface:colour: Key:cycleway:both:surface:colour
     cycleway:buffer: Key:cycleway:buffer
+    cycleway:crossing:priority: Key:cycleway:crossing:priority
     cycleway:foot: Key:cycleway:foot
     cycleway:lane: Key:cycleway:lane
+    cycleway:lanes: Key:cycleway:lanes
     cycleway:left: Key:cycleway:left
     cycleway:left:buffer: Key:cycleway:left:buffer
     cycleway:left:lane: Key:cycleway:left:lane
     cycleway:left:oneway: Key:cycleway:left:oneway
     cycleway:left:separation: Key:cycleway:left:separation
+    cycleway:left:surface:colour: Key:cycleway:left:surface:colour
     cycleway:left=backward: Key:cycleway:left=backward
     cycleway:oneway: Key:cycleway:oneway
     cycleway:right: Key:cycleway:right
@@ -6169,10 +6751,12 @@ en:
     cycleway:right:oneway: Key:cycleway:right:oneway
     cycleway:right:separation: Key:cycleway:right:separation
     cycleway:right:surface: Key:cycleway:right:surface
+    cycleway:right:surface:colour: Key:cycleway:right:surface:colour
     cycleway:right=forward: Key:cycleway:right=forward
     cycleway:segregated: Key:cycleway:segregated
     cycleway:separation: Key:cycleway:separation
     cycleway:surface: Key:cycleway:surface
+    cycleway:surface:colour: Key:cycleway:surface:colour
     cycleway:width: Key:cycleway:width
     cycling_width: Key:cycling width
     damage: Key:damage
@@ -6190,8 +6774,10 @@ en:
     de:regionalschluessel: Key:de:regionalschluessel
     de:strassenschluessel: Key:de:strassenschluessel
     deanery: Key:deanery
+    deep_draft: Key:deep draft
     default_language: Key:default language
     defensive_works: Key:defensive works
+    defibrillator:location: Key:defibrillator:location
     deflection: Key:deflection
     delivery: Key:delivery
     delivery:*: Key:delivery:*
@@ -6205,7 +6791,9 @@ en:
     'demolished:': 'Key:demolished:'
     demolished:*: Key:demolished:*
     demolished:building: Key:demolished:building
+    demolished:power: Key:demolished:power
     'demolition:': 'Key:demolition:'
+    dennert_fir_tree: Key:dennert fir tree
     denomination: Key:denomination
     denotation: Key:denotation
     department: Key:department
@@ -6260,6 +6848,7 @@ en:
     destination:lang:grc:lanes: Key:destination:lang:grc:lanes
     destination:lang:sr: Key:destination:lang:sr
     destination:lang:ur: Key:destination:lang:ur
+    destination:ref: Key:destination:ref
     destination:street:ar: Key:destination:street:ar
     destination:street:lang:ar: Key:destination:street:lang:ar
     destination:street:lang:ar:backward: Key:destination:street:lang:ar:backward
@@ -6300,6 +6889,7 @@ en:
     dewnr:uid: Key:dewnr:uid
     dhm_id: Key:dhm id
     diameter: Key:diameter
+    diameter:range: Key:diameter:range
     dibavod:id: Key:dibavod:id
     diet: Key:diet
     'diet:': 'Key:diet:'
@@ -6309,9 +6899,11 @@ en:
     diet:halal: Key:diet:halal
     diet:kosher: Key:diet:kosher
     diet:lactose_free: Key:diet:lactose free
+    diet:local: Key:diet:local
     diet:sugar_free: Key:diet:sugar free
     diet:vegan: Key:diet:vegan
     diet:vegetarian: Key:diet:vegetarian
+    digital_access: Key:digital access
     dinner: Key:dinner
     diocese: Key:diocese
     diplomatic: Key:diplomatic
@@ -6352,16 +6944,19 @@ en:
     dist:white: Key:dist:white
     dist:yellow: Key:dist:yellow
     distance: Key:distance
+    distillery: Key:distillery
     disused: Key:disused
     'disused:': 'Key:disused:'
     disused:*: Key:disused:*
     disused:amenity: Key:disused:amenity
     disused:building: Key:disused:building
+    disused:craft: Key:disused:craft
     disused:highway: Key:disused:highway
     disused:landuse: Key:disused:landuse
     disused:leisure: Key:disused:leisure
     disused:office: Key:disused:office
     disused:place: Key:disused:place
+    disused:power: Key:disused:power
     disused:railway: Key:disused:railway
     disused:shop: Key:disused:shop
     disused:watermill: Key:disused:watermill
@@ -6370,7 +6965,9 @@ en:
     dock:height: Key:dock:height
     dock:width: Key:dock:width
     dog: Key:dog
+    dog:conditional: Key:dog:conditional
     dog_washing: Key:dog washing
+    dogs: Key:dogs
     dominant_taxon: Key:dominant taxon
     donald: Key:donald
     donation:compensation: Key:donation:compensation
@@ -6379,15 +6976,24 @@ en:
     door: Key:door
     door:height: Key:door:height
     door:width: Key:door:width
+    door:wings: Key:door:wings
+    doorstep: Key:doorstep
+    doorstep:etymology:wikidata: Key:doorstep:etymology:wikidata
+    doorstep:inscription: Key:doorstep:inscription
+    doorstep:material: Key:doorstep:material
+    doorstep:wikimedia_commons: Key:doorstep:wikimedia commons
     double_tracked_motor_vehicle: Key:double tracked motor vehicle
     draft: Key:draft
     draisine: Key:draisine
+    drawbar_slot: Key:drawbar slot
     dress_code: Key:dress code
+    drink: Key:drink
     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:coffee:togo: Key:drink:coffee:togo
     drink:espresso: Key:drink:espresso
     drink:kräusen: Key:drink:kräusen
     drink:milk: Key:drink:milk
@@ -6395,8 +7001,10 @@ en:
     drink:raw_milk: Key:drink:raw milk
     drink:sparkling_wine: Key:drink:sparkling wine
     drink:tea: Key:drink:tea
+    drink:viez: Key:drink:viez
     drink:wine: Key:drink:wine
     drinkable: Key:drinkable
+    drinking_straw: Key:drinking straw
     drinking_water: Key:drinking water
     drinking_water:legal: Key:drinking water:legal
     drinking_water:refill: Key:drinking water:refill
@@ -6406,6 +7014,7 @@ en:
     drive-thru: Key:drive-thru
     drive_in: Key:drive in
     drive_through: Key:drive through
+    drive_through:*: Key:drive through:*
     drive_thru: Key:drive thru
     driving_side: Key:driving side
     dryer: Key:dryer
@@ -6416,6 +7025,7 @@ en:
     earthquake: Key:earthquake
     earthquake:damage: Key:earthquake:damage
     easy_overtaking: Key:easy overtaking
+    edit_group: Key:edit group
     education: Key:education
     education_program: Key:education program
     educational: Key:educational
@@ -6432,7 +7042,10 @@ en:
     electricity: Key:electricity
     electrified: Key:electrified
     electronics: Key:electronics
+    elevation: Key:elevation
     elevator: Key:elevator
+    elevator:door:width: Key:elevator:door:width
+    elevator:width: Key:elevator:width
     email: Key:email
     embankment: Key:embankment
     embankment:side: Key:embankment:side
@@ -6447,18 +7060,26 @@ en:
     emergency:_prefix: 'Key:emergency: prefix'
     emergency:amenity: Key:emergency:amenity
     emergency:phone: Key:emergency:phone
+    emergency:plan: Key:emergency:plan
     emergency:social_facility: Key:emergency:social facility
     emergency_room: Key:emergency room
     emergency_telephone_code: Key:emergency telephone code
     employee: Key:employee
     end_date: Key:end date
     end_date:edtf: Key:end date:edtf
+    end_event: Key:end event
     enforcement: Key:enforcement
     engineer: Key:engineer
     entidad_te: Key:entidad te
     entrance: Key:entrance
+    entrance:automatic_door: Key:entrance:automatic door
+    entrance:door: Key:entrance:door
+    entrance:kerb:height: Key:entrance:kerb:height
     entrance:ramp: Key:entrance:ramp
+    entrance:step_count: Key:entrance:step count
+    entrance:width: Key:entrance:width
     ephemeral: Key:ephemeral
+    epigraph: Key:epigraph
     escooter: Key:escooter
     esr:user: Key:esr:user
     est_height: Key:est height
@@ -6471,14 +7092,19 @@ en:
     evacuation_route: Key:evacuation route
     events_venue: Key:events venue
     excavation: Key:excavation
+    except: Key:except
     exhibit: Key:exhibit
     exit: Key:exit
+    exit:carriages:backward: Key:exit:carriages:backward
+    exit:carriages:forward: Key:exit:carriages:forward
     exit_to: Key:exit to
     expected_rcn_route_relations: Key:expected rcn route relations
     expressway: Key:expressway
     extinguishing:medium: Key:extinguishing:medium
+    faa: Key:faa
     facebook: Key:facebook
     faces: Key:faces
+    factory: Key:factory
     fair_trade: Key:fair trade
     fallow: Key:fallow
     farming_system: Key:farming system
@@ -6490,6 +7116,8 @@ en:
     fcc:unique_system_identifier: Key:fcc:unique system identifier
     fcode: Key:fcode
     fdep:landuse_code: Key:fdep:landuse code
+    fdot:fihs: Key:fdot:fihs
+    fdot:sis: Key:fdot:sis
     fee: Key:fee
     fee:conditional: Key:fee:conditional
     fee:disabled: Key:fee:disabled
@@ -6502,6 +7130,7 @@ en:
     ferry: Key:ferry
     ferry:cable: Key:ferry:cable
     fetish: Key:fetish
+    fetish:*: Key:fetish:*
     fhrs:authority: Key:fhrs:authority
     fhrs:id: Key:fhrs:id
     fhrs:local_authority_id: Key:fhrs:local authority id
@@ -6513,8 +7142,10 @@ en:
     fire_boundary: Key:fire boundary
     fire_class: Key:fire class
     fire_hydrant: Key:fire hydrant
+    fire_hydrant:*: Key:fire hydrant:*
     fire_hydrant:diameter: Key:fire hydrant:diameter
     fire_hydrant:diameter:signed: Key:fire hydrant:diameter:signed
+    fire_hydrant:position: Key:fire hydrant:position
     fire_mains: Key:fire mains
     fire_object:type: Key:fire object:type
     fire_operator: Key:fire operator
@@ -6526,9 +7157,13 @@ en:
     firearms: Key:firearms
     fireplace: Key:fireplace
     fishing: Key:fishing
+    fishing_reserve: Key:fishing reserve
+    fishing_technique:fly-fishing: Key:fishing technique:fly-fishing
     fitness_station: Key:fitness station
+    fitting_room: Key:fitting room
     fix_guidepost: Key:fix guidepost
     fixme: Key:fixme
+    fixme:atp: Key:fixme:atp
     fixme:osmchina: Key:fixme:osmchina
     flag: Key:flag
     flag:name: Key:flag:name
@@ -6541,7 +7176,6 @@ en:
     floating: Key:floating
     flood_date: Key:flood date
     flood_mark: Key:flood mark
-    flood_prone: Key:flood prone
     floor:material: Key:floor:material
     flow_direction: Key:flow direction
     flow_rate: Key:flow rate
@@ -6549,6 +7183,7 @@ en:
     food:*: Key:food:*
     food:hot_dog: Key:food:hot dog
     food:pizza: Key:food:pizza
+    food:product: Key:food:product
     foot: Key:foot
     foot:backward: Key:foot:backward
     foot:forward: Key:foot:forward
@@ -6583,39 +7218,78 @@ en:
     from:syc: Key:from:syc
     from:ug: Key:from:ug
     from:ur: Key:from:ur
+    frontage_road: Key:frontage road
     fruit: Key:fruit
     fuel: Key:fuel
+    fuel:*: Key:fuel:*
+    fuel:100LL: Key:fuel:100LL
     fuel:1_25: Key:fuel:1 25
     fuel:1_50: Key:fuel:1 50
+    fuel:91UL: Key:fuel:91UL
     fuel:E10: Key:fuel:E10
     fuel:GTL_diesel: Key:fuel:GTL diesel
     fuel:HGV_diesel: Key:fuel:HGV diesel
+    fuel:JetA1: Key:fuel:JetA1
     fuel:LH2: Key:fuel:LH2
     fuel:adblue: Key:fuel:adblue
+    fuel:adblue:canister: Key:fuel:adblue:canister
     fuel:alcohol: Key:fuel:alcohol
+    fuel:autogas: Key:fuel:autogas
     fuel:biodiesel: Key:fuel:biodiesel
     fuel:biogas: Key:fuel:biogas
+    fuel:butane: Key:fuel:butane
     fuel:cng: Key:fuel:cng
     fuel:diesel: Key:fuel:diesel
+    fuel:diesel:class2: Key:fuel:diesel:class2
     fuel:diesel_G2: Key:fuel:diesel G2
+    fuel:diesel_b0: Key:fuel:diesel b0
+    fuel:diesel_b10: Key:fuel:diesel b10
+    fuel:diesel_b7: Key:fuel:diesel b7
+    fuel:diesel_s10: Key:fuel:diesel s10
+    fuel:diesel_s500: Key:fuel:diesel s500
     fuel:discount: Key:fuel:discount
+    fuel:e0: Key:fuel:e0
     fuel:e10: Key:fuel:e10
+    fuel:e12: Key:fuel:e12
+    fuel:e15: Key:fuel:e15
     fuel:e20: Key:fuel:e20
+    fuel:e5: Key:fuel:e5
     fuel:e85: Key:fuel:e85
-    fuel:electricity: Key:fuel:electricity
     fuel:ethanol: Key:fuel:ethanol
+    fuel:ethanol_free: Key:fuel:ethanol free
+    fuel:gasoline: Key:fuel:gasoline
+    fuel:h35: Key:fuel:h35
+    fuel:h50: Key:fuel:h50
+    fuel:h70: Key:fuel:h70
+    fuel:heating_oil: Key:fuel:heating oil
+    fuel:kerosene: Key:fuel:kerosene
     fuel:lng: Key:fuel:lng
     fuel:lpg: Key:fuel:lpg
     fuel:methanol: Key:fuel:methanol
+    fuel:midgrade: Key:fuel:midgrade
     fuel:octane_100: Key:fuel:octane 100
+    fuel:octane_102: Key:fuel:octane 102
     fuel:octane_80: Key:fuel:octane 80
+    fuel:octane_85: Key:fuel:octane 85
+    fuel:octane_86: Key:fuel:octane 86
     fuel:octane_87: Key:fuel:octane 87
+    fuel:octane_88: Key:fuel:octane 88
+    fuel:octane_89: Key:fuel:octane 89
+    fuel:octane_90: Key:fuel:octane 90
     fuel:octane_91: Key:fuel:octane 91
     fuel:octane_92: Key:fuel:octane 92
+    fuel:octane_93: Key:fuel:octane 93
+    fuel:octane_94: Key:fuel:octane 94
     fuel:octane_95: Key:fuel:octane 95
+    fuel:octane_97: Key:fuel:octane 97
     fuel:octane_98: Key:fuel:octane 98
+    fuel:premium: Key:fuel:premium
+    fuel:propane: Key:fuel:propane
+    fuel:regular: Key:fuel:regular
     fuel:svo: Key:fuel:svo
+    fuel:taxfree_diesel: Key:fuel:taxfree diesel
     full_name: Key:full name
+    funicular: Key:funicular
     furniture: Key:furniture
     fut_ref: Key:fut ref
     fvst:name: Key:fvst:name
@@ -6623,9 +7297,14 @@ en:
     gambling: Key:gambling
     garden:style: Key:garden:style
     garden:type: Key:garden:type
+    gas_storage: Key:gas storage
     gate:type: Key:gate:type
     gauge: Key:gauge
     gay: Key:gay
+    gbfs:name: Key:gbfs:name
+    gbfs:station_id: Key:gbfs:station id
+    gbfs:system_id: Key:gbfs:system id
+    gdot:grip: Key:gdot:grip
     gender: Key:gender
     gender_segregated: Key:gender segregated
     generator:method: Key:generator:method
@@ -6665,11 +7344,25 @@ en:
     glacier:part: Key:glacier:part
     glacier:type: Key:glacier:type
     glideslope: Key:glideslope
+    gnis:Class: Key:gnis:Class
+    gnis:County: Key:gnis:County
+    gnis:County_num: Key:gnis:County num
+    gnis:ST_alph: Key:gnis:ST alph
+    gnis:ST_alpha: Key:gnis:ST alpha
+    gnis:ST_num: Key:gnis:ST num
+    gnis:county: Key:gnis:county
+    gnis:county_id: Key:gnis:county id
+    gnis:county_name: Key:gnis:county name
+    gnis:created: Key:gnis:created
     gnis:fcode: Key:gnis:fcode
     gnis:feature_id: Key:gnis:feature id
+    gnis:feature_type: Key:gnis:feature type
     gnis:ftype: Key:gnis:ftype
     gnis:id: Key:gnis:id
     gnis:import_uuid: Key:gnis:import uuid
+    gnis:state: Key:gnis:state
+    gnis:state_alpha: Key:gnis:state alpha
+    gnis:state_id: Key:gnis:state id
     golf: Key:golf
     golf:course: Key:golf:course
     golf:par: Key:golf:par
@@ -6677,6 +7370,7 @@ en:
     goods: Key:goods
     government: Key:government
     grades: Key:grades
+    graffiti: Key:graffiti
     graham: Key:graham
     grape_variety: Key:grape variety
     grassland: Key:grassland
@@ -6685,11 +7379,18 @@ en:
     gritting: Key:gritting
     group_only: Key:group only
     gtfs:feed: Key:gtfs:feed
+    gtfs:location_type: Key:gtfs:location type
     gtfs:name: Key:gtfs:name
+    gtfs:platform_code: Key:gtfs:platform code
     gtfs:release_date: Key:gtfs:release date
     gtfs:route_id: Key:gtfs:route id
+    gtfs:route_id:SE-003-UL: Key:gtfs:route id:SE-003-UL
+    gtfs:route_long_name: Key:gtfs:route long name
+    gtfs:route_short_name: Key:gtfs:route short name
     gtfs:shape_id: Key:gtfs:shape id
+    gtfs:stop_code: Key:gtfs:stop code
     gtfs:stop_id: Key:gtfs:stop id
+    gtfs:stop_name: Key:gtfs:stop name
     gtfs:trip_id: Key:gtfs:trip id
     gtfs:trip_id:sample: Key:gtfs:trip id:sample
     guest_house: Key:guest house
@@ -6700,7 +7401,9 @@ en:
     guidepost_shape: Key:guidepost shape
     gun_emplacement_type: Key:gun emplacement type
     gun_turret: Key:gun turret
+    guyed: Key:guyed
     gvr:code: Key:gvr:code
+    hairdresser: Key:hairdresser
     hand_cart: Key:hand cart
     handicap: Key:handicap
     handle: Key:handle
@@ -6709,6 +7412,8 @@ en:
     handrail:left: Key:handrail:left
     handrail:right: Key:handrail:right
     happy_hours: Key:happy hours
+    harassement_prevention: Key:harassement prevention
+    harassment_prevention: Key:harassment prevention
     harbour: Key:harbour
     harbour:category: Key:harbour:category
     harvest_first_year: Key:harvest first year
@@ -6742,12 +7447,14 @@ en:
     height: Key:height
     height:hub: Key:height:hub
     height:range: Key:height:range
+    helipad: Key:helipad
     heritage: Key:heritage
     heritage:label:FR: Key:heritage:label:FR
     heritage:operator: Key:heritage:operator
     heritage:website: Key:heritage:website
     hgv: Key:hgv
     hgv:national_network: Key:hgv:national network
+    hgv:repair: Key:hgv:repair
     hgv_articulated: Key:hgv articulated
     high_water_mark: Key:high water mark
     highchair: Key:highchair
@@ -6758,6 +7465,9 @@ en:
     highway:category:pl: Key:highway:category:pl
     highway:class:pl: Key:highway:class:pl
     highway_authority_ref: Key:highway authority ref
+    highway_construction:*: Key:highway construction:*
+    highway_construction:project: Key:highway construction:project
+    highway_construction:work: Key:highway construction:work
     hiking: Key:hiking
     historic: Key:historic
     historic:civilization: Key:historic:civilization
@@ -6773,7 +7483,6 @@ en:
     horse_scale: Key:horse scale
     hospital:level:CN: Key:hospital:level:CN
     hospital:level:DE: Key:hospital:level:DE
-    host: Key:host
     hot_water: Key:hot water
     house: Key:house
     hov: Key:hov
@@ -6815,8 +7524,10 @@ en:
     inlet: Key:inlet
     inline_skates: Key:inline skates
     inscription: Key:inscription
+    inscription:1: Key:inscription:1
     inscription:ar: Key:inscription:ar
     inscription:url: Key:inscription:url
+    instagram: Key:instagram
     int_name: Key:int name
     int_name:ar: Key:int name:ar
     int_name:arc: Key:int name:arc
@@ -6838,8 +7549,10 @@ en:
     internet_access: Key:internet access
     internet_access:fee: Key:internet access:fee
     internet_access:operator: Key:internet access:operator
+    internet_access:password: Key:internet access:password
     internet_access:ssid: Key:internet access:ssid
     interval: Key:interval
+    ip: Key:ip
     irrigated: Key:irrigated
     irrigation: Key:irrigation
     is_hazard_prone: Key:is hazard prone
@@ -6862,6 +7575,7 @@ en:
     is_in:ward: Key:is in:ward
     isced:level: Key:isced:level
     it:fvg:ctrn:code: Key:it:fvg:ctrn:code
+    it:fvg:ctrn:revision: Key:it:fvg:ctrn:revision
     iucn_level: Key:iucn level
     jel: Key:jel
     jetski: Key:jetski
@@ -6871,6 +7585,8 @@ en:
     junction:ref: Key:junction:ref
     junction_number: Key:junction number
     karaoke: Key:karaoke
+    kartaview: Key:kartaview
+    kayak: Key:kayak
     kct_blue: Key:kct blue
     kct_green: Key:kct green
     kct_none: Key:kct none
@@ -6896,6 +7612,7 @@ en:
     kms:zip_name: Key:kms:zip name
     kms:zip_no: Key:kms:zip no
     kneipp_water_cure: Key:kneipp water cure
+    kons:decision_number: Key:kons:decision number
     kons:inscription_date: Key:kons:inscription date
     kudish: Key:kudish
     kurb: Key:kurb
@@ -6905,15 +7622,20 @@ en:
     lamp_flames: Key:lamp flames
     lamp_model: Key:lamp model
     lamp_mount: Key:lamp mount
+    lamp_operator: Key:lamp operator
+    lamp_ref: Key:lamp ref
     lamp_type: Key:lamp type
+    land_property: Key:land property
     landcover: Key:landcover
     landfill:waste: Key:landfill:waste
     landform: Key:landform
+    landing: Key:landing
     landmark: Key:landmark
     landslide: Key:landslide
     landuse: Key:landuse
     lane_markings: Key:lane markings
     lanes: Key:lanes
+    lanes:*: Key:lanes:*
     lanes:backward: Key:lanes:backward
     lanes:both_ways: Key:lanes:both ways
     lanes:bus: Key:lanes:bus
@@ -6956,6 +7678,7 @@ en:
     leaf_type: Key:leaf type
     left: Key:left
     left:country: Key:left:country
+    legal: Key:legal
     leisure: Key:leisure
     length: Key:length
     level: Key:level
@@ -6963,11 +7686,19 @@ en:
     levels: Key:levels
     lgbt: Key:lgbt
     lgbtq: Key:lgbtq
+    lgbtq:signed: Key:lgbtq:signed
     lhv: Key:lhv
     liaison: Key:liaison
     license: Key:license
     license_classes: Key:license classes
+    lifeboat: Key:lifeboat
     lifeguard: Key:lifeguard
+    lift_gate:type: Key:lift gate:type
+    light:colour: Key:light:colour
+    light:count: Key:light:count
+    light:flux: Key:light:flux
+    light:method: Key:light:method
+    light:power: Key:light:power
     light_rail: Key:light rail
     lighting:perceived: Key:lighting:perceived
     line: Key:line
@@ -6978,6 +7709,7 @@ en:
     listed_status: Key:listed status
     lit: Key:lit
     lit:perceived: Key:lit:perceived
+    lit_by_gaslight: Key:lit by gaslight
     lit_by_led: Key:lit by led
     livestock: Key:livestock
     living_street: Key:living street
@@ -7002,6 +7734,7 @@ en:
     location: Key:location
     lock: Key:lock
     lock:height: Key:lock:height
+    lock:leave_empty: Key:lock:leave empty
     lock_name: Key:lock name
     lock_ref: Key:lock ref
     lockable: Key:lockable
@@ -7048,16 +7781,21 @@ en:
     manual: Key:manual
     manufacturer: Key:manufacturer
     manufacturer:wikidata: Key:manufacturer:wikidata
+    manufacturer:wikipedia: Key:manufacturer:wikipedia
     map_size: Key:map size
     map_type: Key:map type
     mapillary: Key:mapillary
+    mapillary:image: Key:mapillary:image
+    mapillary:map_feature: Key:mapillary:map feature
     mapper: Key:mapper
     marilyn: Key:marilyn
     maritime: Key:maritime
     marker: Key:marker
+    mascot: Key:mascot
     mass_times: Key:mass times
     massage: Key:massage
     massgis:ARTICLE97: Key:massgis:ARTICLE97
+    massgis:POLY_ID: Key:massgis:POLY ID
     massgis:SITE_NAME: Key:massgis:SITE NAME
     mast:construction: Key:mast:construction
     mast:type: Key:mast:type
@@ -7069,12 +7807,14 @@ en:
     maxaxleload: Key:maxaxleload
     maxbogieweight: Key:maxbogieweight
     maxcharge: Key:maxcharge
+    maxdiameter:physical: Key:maxdiameter:physical
     maxdraft: Key:maxdraft
     maxdraught: Key:maxdraught
     maxheight: Key:maxheight
     maxheight:legal: Key:maxheight:legal
     maxheight:physical: Key:maxheight:physical
     maxheight:signed: Key:maxheight:signed
+    maximum_height_requirement: Key:maximum height requirement
     maxlength: Key:maxlength
     maxlength:physical: Key:maxlength:physical
     maxspeed: Key:maxspeed
@@ -7092,7 +7832,6 @@ en:
     maxspeed:night: Key:maxspeed:night
     maxspeed:practical: Key:maxspeed:practical
     maxspeed:psv:conditional: Key:maxspeed:psv:conditional
-    maxspeed:source: Key:maxspeed:source
     maxspeed:tilting: Key:maxspeed:tilting
     maxspeed:trailer: Key:maxspeed:trailer
     maxspeed:type: Key:maxspeed:type
@@ -7111,6 +7850,7 @@ en:
     maxwidth:physical: Key:maxwidth:physical
     mcrb:criteria: Key:mcrb:criteria
     mdb_id: Key:mdb id
+    mdt_base_route: Key:mdt base route
     meadow: Key:meadow
     measurement: Key:measurement
     mechanical: Key:mechanical
@@ -7129,6 +7869,7 @@ en:
     message: Key:message
     mhs:inscription_date: Key:mhs:inscription date
     microbrewery: Key:microbrewery
+    microcar: Key:microcar
     microwave: Key:microwave
     milestone_type: Key:milestone type
     military: Key:military
@@ -7141,6 +7882,7 @@ en:
     mindistance: Key:mindistance
     mineshaft_type: Key:mineshaft type
     minibus: Key:minibus
+    minimum_height_requirement: Key:minimum height requirement
     minspeed: Key:minspeed
     minspeed:lanes: Key:minspeed:lanes
     minweight: Key:minweight
@@ -7160,6 +7902,7 @@ en:
     monitoring:glonass: Key:monitoring:glonass
     monitoring:gps: Key:monitoring:gps
     monitoring:groundwater: Key:monitoring:groundwater
+    monitoring:groundwater_level: Key:monitoring:groundwater level
     monitoring:meteoric_activity: Key:monitoring:meteoric activity
     monitoring:noise: Key:monitoring:noise
     monitoring:pedestrian: Key:monitoring:pedestrian
@@ -7174,6 +7917,7 @@ en:
     monorail: Key:monorail
     monument:genesis: Key:monument:genesis
     mooring: Key:mooring
+    mooring:type: Key:mooring:type
     moped: Key:moped
     motor_vehicle: Key:motor vehicle
     motor_vehicle:conditional: Key:motor vehicle:conditional
@@ -7215,25 +7959,30 @@ en:
     munro_number: Key:munro number
     museum: Key:museum
     museum:subject:wikidata: Key:museum:subject:wikidata
+    museum:type: Key:museum:type
     museum_type: Key:museum type
     musical_instrument: Key:musical instrument
     musical_instrument:repair: Key:musical instrument:repair
     naics: Key:naics
     name: Key:name
+    name:TEC: Key:name:TEC
+    name:aaq: Key:name:aaq
     name:ab: Key:name:ab
+    name:abe: Key:name:abe
     name:ace: Key:name:ace
     name:ady: Key:name:ady
     name:af: Key:name:af
     name:ak: Key:name:ak
     name:aln: Key:name:aln
     name:alq: Key:name:alq
+    name:als: Key:name:als
     name:alt: Key:name:alt
     name:am: Key:name:am
     name:an: Key:name:an
     name:ang: Key:name:ang
     name:ar: Key:name:ar
-    name:ar1: Key:name:ar1
     name:arc: Key:name:arc
+    name:arz: Key:name:arz
     name:as: Key:name:as
     name:ast: Key:name:ast
     name:aus: Key:name:aus
@@ -7243,7 +7992,12 @@ en:
     name:az-Arab: Key:name:az-Arab
     name:azb: Key:name:azb
     name:ba: Key:name:ba
+    name:bal: Key:name:bal
+    name:ban: Key:name:ban
     name:bar: Key:name:bar
+    name:bat-smg: Key:name:bat-smg
+    name:bcl: Key:name:bcl
+    name:bdy: Key:name:bdy
     name:be: Key:name:be
     name:be-tarask: Key:name:be-tarask
     name:ber: Key:name:ber
@@ -7255,10 +8009,14 @@ en:
     name:bn: Key:name:bn
     name:bn-Arab: Key:name:bn-Arab
     name:bo: Key:name:bo
+    name:bpy: Key:name:bpy
     name:br: Key:name:br
+    name:brh: Key:name:brh
     name:bru: Key:name:bru
+    name:brx: Key:name:brx
     name:bs: Key:name:bs
     name:bug: Key:name:bug
+    name:bxr: Key:name:bxr
     name:ca: Key:name:ca
     name:car: Key:name:car
     name:carnaval: Key:name:carnaval
@@ -7267,13 +8025,17 @@ en:
     name:ceb: Key:name:ceb
     name:ch: Key:name:ch
     name:chm: Key:name:chm
+    name:cho: Key:name:cho
     name:chp: Key:name:chp
     name:chr: Key:name:chr
     name:chy: Key:name:chy
     name:ckb: Key:name:ckb
     name:clc: Key:name:clc
+    name:cnr: Key:name:cnr
+    name:cnr-Cyrl: Key:name:cnr-Cyrl
     name:co: Key:name:co
     name:cr: Key:name:cr
+    name:crh: Key:name:crh
     name:cs: Key:name:cs
     name:csb: Key:name:csb
     name:cu: Key:name:cu
@@ -7282,6 +8044,9 @@ en:
     name:da: Key:name:da
     name:dak: Key:name:dak
     name:de: Key:name:de
+    name:del: Key:name:del
+    name:diq: Key:name:diq
+    name:doi: Key:name:doi
     name:dsb: Key:name:dsb
     name:dv: Key:name:dv
     name:dyu: Key:name:dyu
@@ -7292,27 +8057,40 @@ en:
     name:en: Key:name:en
     name:eo: Key:name:eo
     name:es: Key:name:es
+    name:esu: Key:name:esu
     name:et: Key:name:et
     name:etymology: Key:name:etymology
     name:etymology:wikidata: Key:name:etymology:wikidata
+    name:etymology:wikimedia_commons: Key:name:etymology:wikimedia commons
     name:etymology:wikipedia: Key:name:etymology:wikipedia
     name:eu: Key:name:eu
+    name:eu-x-gaceria: Key:name:eu-x-gaceria
+    name:ext: Key:name:ext
     name:fa: Key:name:fa
     name:ff: Key:name:ff
     name:fi: Key:name:fi
+    name:fil: Key:name:fil
+    name:fit: Key:name:fit
+    name:fj: Key:name:fj
+    name:fkv: Key:name:fkv
     name:fo: Key:name:fo
     name:fr: Key:name:fr
+    name:frp: Key:name:frp
     name:frr: Key:name:frr
     name:fur: Key:name:fur
     name:fy: Key:name:fy
     name:ga: Key:name:ga
+    name:gaceria: Key:name:gaceria
     name:gag: Key:name:gag
+    name:gan: Key:name:gan
     name:gcf: Key:name:gcf
     name:gd: Key:name:gd
     name:gem: Key:name:gem
+    name:gil: Key:name:gil
     name:gl: Key:name:gl
     name:glk: Key:name:glk
     name:gn: Key:name:gn
+    name:gom: Key:name:gom
     name:gr: Key:name:gr
     name:grc: Key:name:grc
     name:gsw: Key:name:gsw
@@ -7324,6 +8102,7 @@ en:
     name:he: Key:name:he
     name:hi: Key:name:hi
     name:hif: Key:name:hif
+    name:hil: Key:name:hil
     name:hop: Key:name:hop
     name:hr: Key:name:hr
     name:hsb: Key:name:hsb
@@ -7334,6 +8113,8 @@ en:
     name:id: Key:name:id
     name:ie: Key:name:ie
     name:ig: Key:name:ig
+    name:ii: Key:name:ii
+    name:ik: Key:name:ik
     name:ilo: Key:name:ilo
     name:inh: Key:name:inh
     name:io: Key:name:io
@@ -7354,19 +8135,22 @@ en:
     name:kab-Arab: Key:name:kab-Arab
     name:kbd: Key:name:kbd
     name:kg: Key:name:kg
+    name:ki: Key:name:ki
+    name:kio: Key:name:kio
     name:kk: Key:name:kk
-    name:kk-Arab: Key:name:kk-Arab
     name:kl: Key:name:kl
     name:km: Key:name:km
     name:kmr: Key:name:kmr
     name:kn: Key:name:kn
     name:kn:iso15919: Key:name:kn:iso15919
     name:ko: Key:name:ko
+    name:ko-Hani: Key:name:ko-Hani
     name:ko-Latn: Key:name:ko-Latn
     name:ko_rm: Key:name:ko rm
     name:koi: Key:name:koi
     name:kr: Key:name:kr
     name:krc: Key:name:krc
+    name:krj: Key:name:krj
     name:krl: Key:name:krl
     name:ks: Key:name:ks
     name:ksh: Key:name:ksh
@@ -7393,17 +8177,27 @@ en:
     name:left:grc: Key:name:left:grc
     name:left:syc: Key:name:left:syc
     name:lez: Key:name:lez
+    name:lfn: Key:name:lfn
     name:lg: Key:name:lg
     name:li: Key:name:li
+    name:lij: Key:name:lij
+    name:lkt: Key:name:lkt
     name:lld: Key:name:lld
     name:lmo: Key:name:lmo
     name:ln: Key:name:ln
     name:lo: Key:name:lo
     name:lrc: Key:name:lrc
     name:lt: Key:name:lt
+    name:ltg: Key:name:ltg
+    name:lus: Key:name:lus
     name:lv: Key:name:lv
+    name:lzh: Key:name:lzh
+    name:mai: Key:name:mai
+    name:mak: Key:name:mak
     name:mdf: Key:name:mdf
+    name:mfe: Key:name:mfe
     name:mg: Key:name:mg
+    name:mh: Key:name:mh
     name:mhn: Key:name:mhn
     name:mhr: Key:name:mhr
     name:mi: Key:name:mi
@@ -7412,34 +8206,53 @@ en:
     name:mk: Key:name:mk
     name:ml: Key:name:ml
     name:mn: Key:name:mn
+    name:mnc: Key:name:mnc
+    name:mni: Key:name:mni
     name:moe: Key:name:moe
+    name:moh: Key:name:moh
     name:mos: Key:name:mos
     name:mr: Key:name:mr
+    name:mrj: Key:name:mrj
     name:ms: Key:name:ms
     name:ms-Arab: Key:name:ms-Arab
     name:mt: Key:name:mt
     name:mtp: Key:name:mtp
+    name:mus: Key:name:mus
     name:mwl: Key:name:mwl
     name:my: Key:name:my
     name:myv: Key:name:myv
     name:mzn: Key:name:mzn
     name:na: Key:name:na
+    name:nah: Key:name:nah
     name:nan: Key:name:nan
+    name:nan-Hant: Key:name:nan-Hant
+    name:nan-Latn-pehoeji: Key:name:nan-Latn-pehoeji
+    name:nan-Latn-tailo: Key:name:nan-Latn-tailo
     name:nap: Key:name:nap
     name:nb: Key:name:nb
     name:nds: Key:name:nds
     name:nds-nl: Key:name:nds-nl
     name:ne: Key:name:ne
+    name:network:*: Key:name:network:*
+    name:new: Key:name:new
     name:nl: Key:name:nl
     name:nn: Key:name:nn
     name:no: Key:name:no
     name:non: Key:name:non
     name:nov: Key:name:nov
+    name:nrf: Key:name:nrf
+    name:nrm: Key:name:nrm
     name:nso: Key:name:nso
+    name:nuk: Key:name:nuk
+    name:nv: Key:name:nv
+    name:ny: Key:name:ny
     name:oc: Key:name:oc
     name:oj: Key:name:oj
+    name:oka: Key:name:oka
     name:om: Key:name:om
     name:or: Key:name:or
+    name:os: Key:name:os
+    name:osa: Key:name:osa
     name:ota: Key:name:ota
     name:pa: Key:name:pa
     name:pa-Arab: Key:name:pa-Arab
@@ -7449,14 +8262,19 @@ en:
     name:pa-PK: Key:name:pa-PK
     name:pa-Shah: Key:name:pa-Shah
     name:pag: Key:name:pag
+    name:pam: Key:name:pam
     name:pap: Key:name:pap
+    name:pcd: Key:name:pcd
+    name:pdc: Key:name:pdc
     name:pfl: Key:name:pfl
+    name:pi: Key:name:pi
     name:pih: Key:name:pih
     name:pjt: Key:name:pjt
     name:pl: Key:name:pl
     name:pms: Key:name:pms
     name:pnb: Key:name:pnb
     name:pnt: Key:name:pnt
+    name:pot: Key:name:pot
     name:prefix: Key:name:prefix
     name:prefix:be: Key:name:prefix:be
     name:pronunciation: Key:name:pronunciation
@@ -7464,6 +8282,8 @@ en:
     name:pt: Key:name:pt
     name:pwn: Key:name:pwn
     name:qu: Key:name:qu
+    name:qua: Key:name:qua
+    name:rgn: Key:name:rgn
     name:right: Key:name:right
     name:right:ar: Key:name:right:ar
     name:right:arc: Key:name:right:arc
@@ -7473,30 +8293,39 @@ en:
     name:right:grc: Key:name:right:grc
     name:right:syc: Key:name:right:syc
     name:rm: Key:name:rm
+    name:rmy: Key:name:rmy
     name:rn: Key:name:rn
     name:ro: Key:name:ro
     name:rrm: Key:name:rrm
     name:ru: Key:name:ru
     name:ru:word_stress: Key:name:ru:word stress
     name:rue: Key:name:rue
+    name:rup: Key:name:rup
     name:rw: Key:name:rw
     name:sa: Key:name:sa
     name:sah: Key:name:sah
+    name:sat: Key:name:sat
     name:sc: Key:name:sc
     name:scn: Key:name:scn
     name:sco: Key:name:sco
     name:sd: Key:name:sd
     name:se: Key:name:se
     name:sg: Key:name:sg
+    name:sgs: Key:name:sgs
     name:sh: Key:name:sh
     name:shn: Key:name:shn
+    name:shs: Key:name:shs
     name:si: Key:name:si
-    name:signed: Key:name:signed
+    name:sjd: Key:name:sjd
+    name:sje: Key:name:sje
+    name:sju: Key:name:sju
     name:sk: Key:name:sk
     name:skr: Key:name:skr
     name:sl: Key:name:sl
     name:sm: Key:name:sm
     name:sma: Key:name:sma
+    name:smj: Key:name:smj
+    name:smn: Key:name:smn
     name:sms: Key:name:sms
     name:sn: Key:name:sn
     name:so: Key:name:so
@@ -7504,8 +8333,11 @@ en:
     name:squ: Key:name:squ
     name:sr: Key:name:sr
     name:sr-Latn: Key:name:sr-Latn
+    name:srn: Key:name:srn
     name:ss: Key:name:ss
     name:st: Key:name:st
+    name:stq: Key:name:stq
+    name:str: Key:name:str
     name:su: Key:name:su
     name:suffix: Key:name:suffix
     name:sv: Key:name:sv
@@ -7513,10 +8345,13 @@ en:
     name:syc: Key:name:syc
     name:szl: Key:name:szl
     name:ta: Key:name:ta
+    name:tcy: Key:name:tcy
     name:te: Key:name:te
+    name:tec: Key:name:tec
     name:tet: Key:name:tet
     name:tg: Key:name:tg
     name:th: Key:name:th
+    name:th-Latn: Key:name:th-Latn
     name:ti: Key:name:ti
     name:tk: Key:name:tk
     name:tl: Key:name:tl
@@ -7530,12 +8365,18 @@ en:
     name:tt: Key:name:tt
     name:tw: Key:name:tw
     name:ty: Key:name:ty
+    name:tyv: Key:name:tyv
     name:tzl: Key:name:tzl
     name:udm: Key:name:udm
     name:ug: Key:name:ug
     name:uk: Key:name:uk
+    name:uk-Latn: Key:name:uk-Latn
+    name:umu: Key:name:umu
+    name:unm: Key:name:unm
     name:ur: Key:name:ur
     name:uz: Key:name:uz
+    name:ve: Key:name:ve
+    name:vec: Key:name:vec
     name:vep: Key:name:vep
     name:vi: Key:name:vi
     name:vi-Hani: Key:name:vi-Hani
@@ -7547,17 +8388,38 @@ en:
     name:was: Key:name:was
     name:wikipedia: Key:name:wikipedia
     name:wo: Key:name:wo
+    name:wuu: Key:name:wuu
+    name:xal: Key:name:xal
+    name:xdk: Key:name:xdk
+    name:xh: Key:name:xh
     name:xmf: Key:name:xmf
-    name:xx: Key:name:xx
     name:yi: Key:name:yi
     name:yo: Key:name:yo
     name:yue: Key:name:yue
+    name:yuf: Key:name:yuf
     name:za: Key:name:za
+    name:zea: Key:name:zea
+    name:zgh: Key:name:zgh
     name:zh: Key:name:zh
+    name:zh-Bopo: Key:name:zh-Bopo
     name:zh-Hans: Key:name:zh-Hans
+    name:zh-Hans-CN: Key:name:zh-Hans-CN
+    name:zh-Hans-MY: Key:name:zh-Hans-MY
+    name:zh-Hans-SG: Key:name:zh-Hans-SG
     name:zh-Hant: Key:name:zh-Hant
+    name:zh-Hant-HK: Key:name:zh-Hant-HK
+    name:zh-Hant-MO: Key:name:zh-Hant-MO
+    name:zh-Hant-TW: Key:name:zh-Hant-TW
+    name:zh-Latn: Key:name:zh-Latn
+    name:zh-Latn-CN-pinyin: Key:name:zh-Latn-CN-pinyin
+    name:zh-Latn-TW-pinyin: Key:name:zh-Latn-TW-pinyin
+    name:zh-Latn-TW-tongyong: Key:name:zh-Latn-TW-tongyong
+    name:zh-Latn-pinyin: Key:name:zh-Latn-pinyin
+    name:zh-Latn-tongyong: Key:name:zh-Latn-tongyong
+    name:zh-Latn-wadegile: Key:name:zh-Latn-wadegile
     name:zh-sg: Key:name:zh-sg
     name:zu: Key:name:zu
+    name:zza: Key:name:zza
     name_1: Key:name 1
     name_2: Key:name 2
     naptan:AdministrativeAreaRef: Key:naptan:AdministrativeAreaRef
@@ -7621,7 +8483,7 @@ en:
     nhd:gnis_id: Key:nhd:gnis id
     nhd:reach_code: Key:nhd:reach code
     nickname: Key:nickname
-    no-barnehage:nsrid: Key:no-barnehage:nsrid
+    nid: Key:nid
     'no:': 'Key:no:'
     no:*: Key:no:*
     noaddress: Key:noaddress
@@ -7634,6 +8496,7 @@ en:
     'not:': 'Key:not:'
     not:*: Key:not:*
     not:brand:wikidata: Key:not:brand:wikidata
+    not:building: Key:not:building
     not:name: Key:not:name
     not:wikidata: Key:not:wikidata
     not_accepted_import:leisure: Key:not accepted import:leisure
@@ -7642,6 +8505,7 @@ en:
     note:*: Key:note:*
     note:addr_place: Key:note:addr place
     note:ar: Key:note:ar
+    note:collection_times: Key:note:collection times
     note:deplacer4mE: Key:note:deplacer4mE
     note:depth: Key:note:depth
     note:en: Key:note:en
@@ -7649,6 +8513,7 @@ en:
     note:name: Key:note:name
     note:pilotage: Key:note:pilotage
     note:project_page: Key:note:project page
+    nrhp:criteria: Key:nrhp:criteria
     nuclear_explosion:country: Key:nuclear explosion:country
     nuclear_explosion:crater_diameter: Key:nuclear explosion:crater diameter
     nuclear_explosion:hole: Key:nuclear explosion:hole
@@ -7660,6 +8525,7 @@ en:
     nvdb:id: Key:nvdb:id
     nycdoitt:bin: Key:nycdoitt:bin
     object: Key:object
+    object:*: Key:object:*
     object:city: Key:object:city
     object:country: Key:object:country
     object:housenumber: Key:object:housenumber
@@ -7696,6 +8562,7 @@ en:
     official_name:sd: Key:official name:sd
     official_name:syc: Key:official name:syc
     official_name:ug: Key:official name:ug
+    official_name:uk: Key:official name:uk
     official_name:ur: Key:official name:ur
     official_ref: Key:official ref
     offshore: Key:offshore
@@ -7717,6 +8584,7 @@ en:
     old_name:etymology:wikidata: Key:old name:etymology:wikidata
     old_name:fa: Key:old name:fa
     old_name:fr: Key:old name:fr
+    old_name:fur: Key:old name:fur
     old_name:gr: Key:old name:gr
     old_name:grc: Key:old name:grc
     old_name:it: Key:old name:it
@@ -7738,17 +8606,24 @@ en:
     old_ref:legislative: Key:old ref:legislative
     old_ref_legislative: Key:old ref legislative
     old_short_name: Key:old short name
+    old_start_date: Key:old start date
     oneclass: Key:oneclass
     oneway: Key:oneway
     oneway:bicycle: Key:oneway:bicycle
+    oneway:boat: Key:oneway:boat
     oneway:bus: Key:oneway:bus
+    oneway:canoe: Key:oneway:canoe
     oneway:conditional: Key:oneway:conditional
     oneway:foot: Key:oneway:foot
+    oneway:motorboat: Key:oneway:motorboat
     oneway:motorcycle: Key:oneway:motorcycle
     oneway:psv: Key:oneway:psv
+    oneway:sailboat: Key:oneway:sailboat
     oneway:taxi: Key:oneway:taxi
+    oneway:type: Key:oneway:type
     onkz: Key:onkz
     ons_code: Key:ons code
+    open: Key:open
     openGeoDB:loc_id: Key:openGeoDB:loc id
     openbenches:id: Key:openbenches:id
     openfire: Key:openfire
@@ -7758,14 +8633,17 @@ en:
     opening_hours/Tutorial: Key:opening hours/Tutorial
     opening_hours:*: Key:opening hours:*
     opening_hours:atm: Key:opening hours:atm
+    opening_hours:bar: Key:opening hours:bar
     opening_hours:car_repair: Key:opening hours:car repair
     opening_hours:covid19: Key:opening hours:covid19
+    opening_hours:description: Key:opening hours:description
     opening_hours:drive_through: Key:opening hours:drive through
     opening_hours:kitchen: Key:opening hours:kitchen
     opening_hours:lifeguard: Key:opening hours:lifeguard
     opening_hours:office: Key:opening hours:office
     opening_hours:pharmacy: Key:opening hours:pharmacy
     opening_hours:reception: Key:opening hours:reception
+    opening_hours:self_service: Key:opening hours:self service
     opening_hours:signed: Key:opening hours:signed
     opening_hours:store: Key:opening hours:store
     opening_hours:url: Key:opening hours:url
@@ -7785,6 +8663,7 @@ en:
     operator:es: Key:operator:es
     operator:fr: Key:operator:fr
     operator:guid: Key:operator:guid
+    operator:ja: Key:operator:ja
     operator:phone: Key:operator:phone
     operator:ru: Key:operator:ru
     operator:short: Key:operator:short
@@ -7792,12 +8671,13 @@ en:
     operator:ur: Key:operator:ur
     operator:website: Key:operator:website
     operator:wikidata: Key:operator:wikidata
+    operator:wikimedia_commons: Key:operator:wikimedia commons
     operator:wikipedia: Key:operator:wikipedia
     operator:wikipedia:ar: Key:operator:wikipedia:ar
     operator:wikipedia:de: Key:operator:wikipedia:de
     operator:wikipedia:es: Key:operator:wikipedia:es
+    operator:zh: Key:operator:zh
     orchard: Key:orchard
-    organ: Key:organ
     organic: Key:organic
     orientation: Key:orientation
     orienteering: Key:orienteering
@@ -7813,6 +8693,7 @@ en:
     osak:street_name: Key:osak:street name
     osak:street_no: Key:osak:street no
     osak:subdivision: Key:osak:subdivision
+    oslostandarden: Key:oslostandarden
     osmarender:nameDirection: Key:osmarender:nameDirection
     osmarender:render: Key:osmarender:render
     osmarender:renderName: Key:osmarender:renderName
@@ -7824,9 +8705,13 @@ en:
     outdoor_seating:comfort: Key:outdoor seating:comfort
     outlet: Key:outlet
     oven: Key:oven
+    overgrown: Key:overgrown
     overlap: Key:overlap
     overtaking: Key:overtaking
+    overtaking:backward: Key:overtaking:backward
+    overtaking:forward: Key:overtaking:forward
     overtaking:hgv: Key:overtaking:hgv
+    overtaking:motor_vehicle: Key:overtaking:motor vehicle
     owner: Key:owner
     owner:wikidata: Key:owner:wikidata
     ownership: Key:ownership
@@ -7839,8 +8724,13 @@ en:
     park:type: Key:park:type
     park_ride: Key:park ride
     parking: Key:parking
+    parking:*: Key:parking:*
     parking:both: Key:parking:both
     parking:both:capacity: Key:parking:both:capacity
+    parking:both:markings: Key:parking:both:markings
+    parking:both:orientation: Key:parking:both:orientation
+    parking:both:restriction: Key:parking:both:restriction
+    parking:both:restriction:cycle_rickshaw: Key:parking:both:restriction:cycle rickshaw
     parking:both:staggered: Key:parking:both:staggered
     parking:capacity:long: Key:parking:capacity:long
     parking:capacity:standard: Key:parking:capacity:standard
@@ -7848,17 +8738,29 @@ en:
     parking:fee: Key:parking:fee
     parking:left: Key:parking:left
     parking:left:capacity: Key:parking:left:capacity
+    parking:left:markings: Key:parking:left:markings
+    parking:left:orientation: Key:parking:left:orientation
+    parking:left:restriction: Key:parking:left:restriction
     parking:right: Key:parking:right
     parking:right:capacity: Key:parking:right:capacity
+    parking:right:markings: Key:parking:right:markings
+    parking:right:orientation: Key:parking:right:orientation
+    parking:right:restriction: Key:parking:right:restriction
+    parking:zone: Key:parking:zone
     parking_space: Key:parking space
+    parking_space:length: Key:parking space:length
+    parking_space:width: Key:parking space:width
+    parking_space_IO: Key:parking space IO
     parts: Key:parts
     passage_time: Key:passage time
     passenger: Key:passenger
+    passenger:real_name: Key:passenger:real name
     passenger_information_display: Key:passenger information display
     passenger_information_display:speech_output: Key:passenger information display:speech
       output
     passenger_lines: Key:passenger lines
     passing_places: Key:passing places
+    patrolled: Key:patrolled
     paved:date: Key:paved:date
     paving_stones:colour: Key:paving stones:colour
     payment: Key:payment
@@ -7869,6 +8771,7 @@ en:
     payment:app: Key:payment:app
     payment:apple_pay: Key:payment:apple pay
     payment:bancomat: Key:payment:bancomat
+    payment:bitcoin: Key:payment:bitcoin
     payment:bitcoincash: Key:payment:bitcoincash
     payment:blik: Key:payment:blik
     payment:cards: Key:payment:cards
@@ -7898,6 +8801,7 @@ en:
     payment:fastrak: Key:payment:fastrak
     payment:foo: Key:payment:foo
     payment:girocard: Key:payment:girocard
+    payment:goldback: Key:payment:goldback
     payment:good_to_go: Key:payment:good to go
     payment:google_pay: Key:payment:google pay
     payment:i-pass: Key:payment:i-pass
@@ -7920,8 +8824,11 @@ en:
     payment:peach_pass: Key:payment:peach pass
     payment:peachpass: Key:payment:peachpass
     payment:pikepass: Key:payment:pikepass
+    payment:pluxee: Key:payment:pluxee
     payment:prepaid_ticket: Key:payment:prepaid ticket
     payment:pro100: Key:payment:pro100
+    payment:shell: Key:payment:shell
+    payment:sodexo: Key:payment:sodexo
     payment:stored_value_card: Key:payment:stored value card
     payment:sunpass: Key:payment:sunpass
     payment:telephone_cards: Key:payment:telephone cards
@@ -7939,6 +8846,7 @@ en:
     pcode: Key:pcode
     pedagogy: Key:pedagogy
     period: Key:period
+    permanent: Key:permanent
     permanent_camping: Key:permanent camping
     person:date_of_birth: Key:person:date of birth
     person:date_of_death: Key:person:date of death
@@ -7950,6 +8858,7 @@ en:
     phone:mnemonic: Key:phone:mnemonic
     photograph: Key:photograph
     photography: Key:photography
+    physically_present: Key:physically present
     picnic_table: Key:picnic table
     picture: Key:picture
     piercing: Key:piercing
@@ -7957,8 +8866,10 @@ en:
     pilgrimage: Key:pilgrimage
     pilotage: Key:pilotage
     pipeline: Key:pipeline
+    piste:*: Key:piste:*
     piste:difficulty: Key:piste:difficulty
     piste:grooming: Key:piste:grooming
+    piste:lit: Key:piste:lit
     piste:ref: Key:piste:ref
     piste:type: Key:piste:type
     pitch:net: Key:pitch:net
@@ -7970,11 +8881,13 @@ en:
     place:ph: Key:place:ph
     place_name: Key:place name
     placement: Key:placement
+    placement:both_ways: Key:placement:both ways
     placement:end: Key:placement:end
     placement:forward: Key:placement:forward
     placement:start: Key:placement:start
     planned: Key:planned
     planned:*: Key:planned:*
+    planned:power: Key:planned:power
     plant: Key:plant
     plant:method: Key:plant:method
     plant:output: Key:plant:output
@@ -7994,6 +8907,7 @@ en:
     plant:storage: Key:plant:storage
     plant:type: Key:plant:type
     plant_community: Key:plant community
+    planted_date: Key:planted date
     platform:width: Key:platform:width
     platform_lift: Key:platform lift
     platform_lift:maxlength:physical: Key:platform lift:maxlength:physical
@@ -8013,13 +8927,16 @@ en:
     pole: Key:pole
     poles: Key:poles
     police: Key:police
+    police:FR: Key:police:FR
     political_division: Key:political division
     political_party: Key:political party
     polling_station: Key:polling station
     population: Key:population
     population:date: Key:population:date
+    population:source: Key:population:source
     population_rank: Key:population rank
     port: Key:port
+    portable: Key:portable
     position: Key:position
     position:heading: Key:position:heading
     post_box:design: Key:post box:design
@@ -8042,19 +8959,25 @@ en:
     previously: Key:previously
     priority: Key:priority
     priority_road: Key:priority road
+    prison: Key:prison
     private: Key:private
     produce: Key:produce
     product: Key:product
     project:eurosha_2012: Key:project:eurosha 2012
+    project:name: Key:project:name
     prominence: Key:prominence
+    propagation: Key:propagation
     proposed: Key:proposed
     proposed:*: Key:proposed:*
     proposed:highway: Key:proposed:highway
     proposed:name: Key:proposed:name
     protect_class: Key:protect class
     protected: Key:protected
+    protected_area: Key:protected area
     protection_title: Key:protection title
+    protection_title:wikidata: Key:protection title:wikidata
     provided_for: Key:provided for
+    provided_for:*: Key:provided for:*
     prow_ref: Key:prow ref
     psv: Key:psv
     psv:lanes: Key:psv:lanes
@@ -8067,6 +8990,7 @@ en:
     pump:status: Key:pump:status
     pump_mechanism: Key:pump mechanism
     pyörä_väistää_aina_autoa: Key:pyörä väistää aina autoa
+    quiet_hours: Key:quiet hours
     raba:id: Key:raba:id
     rack: Key:rack
     radar_transponder: Key:radar transponder
@@ -8083,23 +9007,50 @@ en:
     railway: Key:railway
     railway:asfa: Key:railway:asfa
     railway:atb: Key:railway:atb
+    railway:atc: Key:railway:atc
+    railway:ballastless: Key:railway:ballastless
+    railway:block_section: Key:railway:block section
+    railway:ctcs: Key:railway:ctcs
     railway:etcs: Key:railway:etcs
+    railway:gnt: Key:railway:gnt
     railway:kvb: Key:railway:kvb
+    railway:local_operated: Key:railway:local operated
     railway:lzb: Key:railway:lzb
+    railway:milestone:catenary_mast: Key:railway:milestone:catenary mast
     railway:position: Key:railway:position
     railway:position:exact: Key:railway:position:exact
     railway:preserved: Key:railway:preserved
+    railway:ptc: Key:railway:ptc
+    railway:pzb: Key:railway:pzb
     railway:ref: Key:railway:ref
     railway:scmt: Key:railway:scmt
+    railway:signal:*: Key:railway:signal:*
     railway:signal:combined: Key:railway:signal:combined
+    railway:signal:country: Key:railway:signal:country
     railway:signal:distant: Key:railway:signal:distant
+    railway:signal:distant:states: Key:railway:signal:distant:states
     railway:signal:main: Key:railway:signal:main
+    railway:signal:main:form: Key:railway:signal:main:form
+    railway:signal:main:function: Key:railway:signal:main:function
+    railway:signal:main:height: Key:railway:signal:main:height
+    railway:signal:main:shape: Key:railway:signal:main:shape
+    railway:signal:main:states: Key:railway:signal:main:states
+    railway:signal:minor: Key:railway:signal:minor
+    railway:signal:prefix: Key:railway:signal:prefix
     railway:signal:speed_limit: Key:railway:signal:speed limit
+    railway:signal:speed_limit:form: Key:railway:signal:speed limit:form
+    railway:signal:speed_limit:height: Key:railway:signal:speed limit:height
+    railway:signal:speed_limit:speed: Key:railway:signal:speed limit:speed
     railway:signal:speed_limit_distant: Key:railway:signal:speed limit distant
+    railway:signal_box: Key:railway:signal box
+    railway:ssc: Key:railway:ssc
     railway:tilting: Key:railway:tilting
+    railway:track_class: Key:railway:track class
     railway:track_ref: Key:railway:track ref
+    railway:track_type: Key:railway:track type
     railway:traffic_mode: Key:railway:traffic mode
     railway:tvm: Key:railway:tvm
+    railway:wikimedia_commons: Key:railway:wikimedia commons
     railway:zbs: Key:railway:zbs
     ramp: Key:ramp
     ramp:bicycle: Key:ramp:bicycle
@@ -8124,24 +9075,36 @@ en:
     real_fire: Key:real fire
     reception_desk: Key:reception desk
     recording: Key:recording
+    recording:remote: Key:recording:remote
     recreation_ground: Key:recreation ground
+    recycling:*: Key:recycling:*
     recycling:PET: Key:recycling:PET
+    recycling:aluminium: Key:recycling:aluminium
+    recycling:beverage_cartons: Key:recycling:beverage cartons
+    recycling:cartons: Key:recycling:cartons
+    recycling:electrical_appliances: Key:recycling:electrical appliances
     recycling:fire_extinguishers: Key:recycling:fire extinguishers
+    recycling:glass_bottles: Key:recycling:glass bottles
     recycling:green_waste: Key:recycling:green waste
+    recycling:magazines: Key:recycling:magazines
+    recycling:organic: Key:recycling:organic
     recycling:pet_drink_bottles: Key:recycling:pet drink bottles
     recycling:plastic_bottle_caps: Key:recycling:plastic bottle caps
     recycling:plastic_bottle_tops: Key:recycling:plastic bottle tops
     recycling:pmd: Key:recycling:pmd
+    recycling:wood: Key:recycling:wood
     recycling_type: Key:recycling type
     red_turn:left: Key:red turn:left
+    red_turn:left:bicycle: Key:red turn:left:bicycle
     red_turn:right: Key:red turn:right
     red_turn:right:bicycle: Key:red turn:right:bicycle
     red_turn:straight: Key:red turn:straight
     red_turn:straight:bicycle: Key:red turn:straight:bicycle
-    rednap:latitud: Key:rednap:latitud
     reef: Key:reef
     ref: Key:ref
     ref:AGESIC: Key:ref:AGESIC
+    ref:AQ:apa: Key:ref:AQ:apa
+    ref:AU-NSW:mooring: Key:ref:AU-NSW:mooring
     ref:BLfD: Key:ref:BLfD
     ref:BRN: Key:ref:BRN
     ref:CEF: Key:ref:CEF
@@ -8149,14 +9112,19 @@ en:
     ref:DK:cvr: Key:ref:DK:cvr
     ref:DK:cvr:pnummer: Key:ref:DK:cvr:pnummer
     ref:De_Lijn: Key:ref:De Lijn
+    ref:EGID: Key:ref:EGID
     ref:ERDF:gdo: Key:ref:ERDF:gdo
+    ref:ES:ipcclm: Key:ref:ES:ipcclm
     ref:EU:ENTSOE_EIC: Key:ref:EU:ENTSOE EIC
     ref:EU:EVSE: Key:ref:EU:EVSE
     ref:EU:bwid: Key:ref:EU:bwid
+    ref:EUS:getxo:id: Key:ref:EUS:getxo:id
     ref:FR:42C: Key:ref:FR:42C
     ref:FR:ANFR: Key:ref:FR:ANFR
     ref:FR:ARCEP: Key:ref:FR:ARCEP
     ref:FR:Allocine: Key:ref:FR:Allocine
+    ref:FR:CAIRN: Key:ref:FR:CAIRN
+    ref:FR:CCBG: Key:ref:FR:CCBG
     ref:FR:CEF: Key:ref:FR:CEF
     ref:FR:CRTA: Key:ref:FR:CRTA
     ref:FR:DREAL: Key:ref:FR:DREAL
@@ -8165,6 +9133,7 @@ en:
     ref:FR:FANTOIR:right: Key:ref:FR:FANTOIR:right
     ref:FR:FINESS: Key:ref:FR:FINESS
     ref:FR:FreeMobile: Key:ref:FR:FreeMobile
+    ref:FR:Grenoble:trees: Key:ref:FR:Grenoble:trees
     ref:FR:INSEE: Key:ref:FR:INSEE
     ref:FR:IRVE: Key:ref:FR:IRVE
     ref:FR:Joconde: Key:ref:FR:Joconde
@@ -8176,26 +9145,37 @@ en:
     ref:FR:Orange_mobile: Key:ref:FR:Orange mobile
     ref:FR:PTT: Key:ref:FR:PTT
     ref:FR:PTT:NRA: Key:ref:FR:PTT:NRA
+    ref:FR:RAF: Key:ref:FR:RAF
     ref:FR:RNA: Key:ref:FR:RNA
+    ref:FR:RPPS: Key:ref:FR:RPPS
     ref:FR:RTE: Key:ref:FR:RTE
     ref:FR:RTE_nom: Key:ref:FR:RTE nom
     ref:FR:SFR: Key:ref:FR:SFR
+    ref:FR:SINOE: Key:ref:FR:SINOE
     ref:FR:SIREN: Key:ref:FR:SIREN
     ref:FR:SIRET: Key:ref:FR:SIRET
     ref:FR:SITCOM: Key:ref:FR:SITCOM
+    ref:FR:TUC: Key:ref:FR:TUC
     ref:FR:fantoir: Key:ref:FR:fantoir
     ref:FR:gdo: Key:ref:FR:gdo
     ref:FR:museofile: Key:ref:FR:museofile
     ref:FR:prix-carburants: Key:ref:FR:prix-carburants
     ref:GB:imher: Key:ref:GB:imher
     ref:GB:mpan: Key:ref:GB:mpan
+    ref:GB:nged_source_site: Key:ref:GB:nged source site
     ref:GB:nhle: Key:ref:GB:nhle
     ref:GB:nhs_ods: Key:ref:GB:nhs ods
+    ref:GB:tfl_uid: Key:ref:GB:tfl uid
+    ref:GB:tflcid: Key:ref:GB:tflcid
+    ref:GB:the_circuit: Key:ref:GB:the circuit
     ref:GB:uprn: Key:ref:GB:uprn
     ref:GB:usrn: Key:ref:GB:usrn
     ref:GB:wpd_site: Key:ref:GB:wpd site
+    ref:GB:wpd_source_site: Key:ref:GB:wpd source site
     ref:HMDB: Key:ref:HMDB
+    ref:HR:e-matica: Key:ref:HR:e-matica
     ref:HU:edid: Key:ref:HU:edid
+    ref:HU:kir_site: Key:ref:HU:kir site
     ref:HU:om: Key:ref:HU:om
     ref:HU:vatin: Key:ref:HU:vatin
     ref:IE:census2015: Key:ref:IE:census2015
@@ -8207,12 +9187,13 @@ en:
     ref:INEP: Key:ref:INEP
     ref:INSEE: Key:ref:INSEE
     ref:ISTAT: Key:ref:ISTAT
-    ref:LILA: Key:ref:LILA
     ref:LOCODE: Key:ref:LOCODE
     ref:LV:addr: Key:ref:LV:addr
+    ref:MA:HCP: Key:ref:MA:HCP
     ref:NAG:UPRN:1: Key:ref:NAG:UPRN:1
     ref:NBd: Key:ref:NBd
     ref:NLPG:UPRN:1: Key:ref:NLPG:UPRN:1
+    ref:NO:buskerudbyen: Key:ref:NO:buskerudbyen
     ref:NPLG:UPRN:1: Key:ref:NPLG:UPRN:1
     ref:ProRail: Key:ref:ProRail
     ref:REI: Key:ref:REI
@@ -8220,6 +9201,7 @@ en:
     ref:RS:kucni_broj: Key:ref:RS:kucni broj
     ref:RS:naselje: Key:ref:RS:naselje
     ref:RS:nkd: Key:ref:RS:nkd
+    ref:RS:nkd:importance: Key:ref:RS:nkd:importance
     ref:RS:okrug: Key:ref:RS:okrug
     ref:RS:opstina: Key:ref:RS:opstina
     ref:RS:pokrajina: Key:ref:RS:pokrajina
@@ -8232,6 +9214,8 @@ en:
     ref:TECN: Key:ref:TECN
     ref:TECX: Key:ref:TECX
     ref:UAI: Key:ref:UAI
+    ref:US-MA:mhc: Key:ref:US-MA:mhc
+    ref:US-OR:hunter_fiber: Key:ref:US-OR:hunter fiber
     'ref:US-TX:': 'Key:ref:US-TX:'
     ref:US-TX:*: Key:ref:US-TX:*
     ref:US-TX:thc: Key:ref:US-TX:thc
@@ -8245,6 +9229,7 @@ en:
     ref:UrbIS: Key:ref:UrbIS
     ref:VE:UBIGEO: Key:ref:VE:UBIGEO
     ref:WDPA: Key:ref:WDPA
+    ref:afdc: Key:ref:afdc
     ref:alp: Key:ref:alp
     ref:ar: Key:ref:ar
     ref:arc: Key:ref:arc
@@ -8254,8 +9239,10 @@ en:
     ref:bag: Key:ref:bag
     ref:bag:old: Key:ref:bag:old
     ref:bam.brno.cz: Key:ref:bam.brno.cz
+    ref:barnehage: Key:ref:barnehage
     ref:bic: Key:ref:bic
     ref:bufa: Key:ref:bufa
+    ref:bukea: Key:ref:bukea
     ref:bygningsnr: Key:ref:bygningsnr
     ref:cadc:2020: Key:ref:cadc:2020
     ref:cadw: Key:ref:cadw
@@ -8264,6 +9251,7 @@ en:
     ref:capad:uid: Key:ref:capad:uid
     ref:caribischopenbaarlichaamcode: Key:ref:caribischopenbaarlichaamcode
     ref:circuits: Key:ref:circuits
+    ref:ckkp: Key:ref:ckkp
     ref:cobe: Key:ref:cobe
     ref:codcat: Key:ref:codcat
     ref:color: Key:ref:color
@@ -8273,19 +9261,24 @@ en:
     ref:csioz: Key:ref:csioz
     ref:ctb: Key:ref:ctb
     ref:de: Key:ref:de
+    ref:deldot: Key:ref:deldot
     ref:deniirn: Key:ref:deniirn
     ref:dew:park_id: Key:ref:dew:park id
     ref:dhis2: Key:ref:dhis2
     ref:doc: Key:ref:doc
+    ref:dove: Key:ref:dove
+    ref:e-matica: Key:ref:e-matica
     ref:edubase: Key:ref:edubase
     ref:edubase:group: Key:ref:edubase:group
     ref:ef: Key:ref:ef
+    ref:eilandcode: Key:ref:eilandcode
     ref:es: Key:ref:es
     ref:fgkz: Key:ref:fgkz
     ref:find_a_grave: Key:ref:find a grave
     ref:gbfs: Key:ref:gbfs
     ref:gemeentecode: Key:ref:gemeentecode
     ref:gnis: Key:ref:gnis
+    ref:goingelectric: Key:ref:goingelectric
     ref:gr: Key:ref:gr
     ref:grc: Key:ref:grc
     ref:gsi: Key:ref:gsi
@@ -8296,22 +9289,33 @@ en:
     ref:harbour: Key:ref:harbour
     ref:herbarium: Key:ref:herbarium
     ref:hmdb: Key:ref:hmdb
+    ref:hr:hps: Key:ref:hr:hps
+    ref:hr:maticni_broj: Key:ref:hr:maticni broj
+    ref:hr:uzkb: Key:ref:hr:uzkb
     ref:hsmaq: Key:ref:hsmaq
+    ref:iaph: Key:ref:iaph
     ref:ico: Key:ref:ico
+    ref:id: Key:ref:id
     ref:industrial: Key:ref:industrial
     ref:ine: Key:ref:ine
+    ref:ipac: Key:ref:ipac
+    ref:ipcclm: Key:ref:ipcclm
     ref:isil: Key:ref:isil
     ref:kmb: Key:ref:kmb
     ref:kons: Key:ref:kons
+    ref:kozterkep: Key:ref:kozterkep
     ref:landcode: Key:ref:landcode
     ref:landsdeelcode: Key:ref:landsdeelcode
+    ref:lau: Key:ref:lau
     ref:linz:address_id: Key:ref:linz:address id
     ref:linz:building_id: Key:ref:linz:building id
     ref:linz:hydrographic_id: Key:ref:linz:hydrographic id
+    ref:linz:napalis_id: Key:ref:linz:napalis id
     ref:linz:pastoral_lease_id: Key:ref:linz:pastoral lease id
     ref:linz:place_id: Key:ref:linz:place id
     ref:linz:topo50_id: Key:ref:linz:topo50 id
     ref:lor: Key:ref:lor
+    ref:masaf: Key:ref:masaf
     ref:mcrb: Key:ref:mcrb
     ref:mhs: Key:ref:mhs
     ref:miaaddr: Key:ref:miaaddr
@@ -8320,8 +9324,19 @@ en:
     ref:mise: Key:ref:mise
     ref:mobil-parken.de: Key:ref:mobil-parken.de
     ref:msal: Key:ref:msal
+    ref:ncdot: Key:ref:ncdot
+    ref:nces: Key:ref:nces
+    ref:neispuo: Key:ref:neispuo
     ref:nid: Key:ref:nid
     ref:nrhp: Key:ref:nrhp
+    ref:nsrq: Key:ref:nsrq
+    ref:nuts: Key:ref:nuts
+    ref:nuts:1: Key:ref:nuts:1
+    ref:nuts:2: Key:ref:nuts:2
+    ref:nuts:3: Key:ref:nuts:3
+    ref:ocm: Key:ref:ocm
+    ref:ocpi: Key:ref:ocpi
+    ref:old: Key:ref:old
     ref:ortsnetz: Key:ref:ortsnetz
     ref:oslo:tree: Key:ref:oslo:tree
     ref:penndot: Key:ref:penndot
@@ -8331,18 +9346,23 @@ en:
     ref:raa: Key:ref:raa
     ref:rce: Key:ref:rce
     ref:registered_building: Key:ref:registered building
+    ref:rspo: Key:ref:rspo
     ref:ruian: Key:ref:ruian
     ref:ruian:addr: Key:ref:ruian:addr
     ref:ruian:building: Key:ref:ruian:building
     ref:ruian:street: Key:ref:ruian:street
     ref:sandre: Key:ref:sandre
     ref:sboid: Key:ref:sboid
+    ref:sci: Key:ref:sci
     ref:se:pts:postort: Key:ref:se:pts:postort
     ref:se:scb: Key:ref:se:scb
     ref:seedcode: Key:ref:seedcode
+    ref:seq: Key:ref:seq
     ref:shop:num: Key:ref:shop:num
     ref:signed: Key:ref:signed
     ref:siri-sx: Key:ref:siri-sx
+    ref:sisa_codigo: Key:ref:sisa codigo
+    ref:sisa_tipologia: Key:ref:sisa tipologia
     ref:sitp: Key:ref:sitp
     ref:slnid: Key:ref:slnid
     ref:sloid: Key:ref:sloid
@@ -8355,16 +9375,19 @@ en:
     ref:temples.ru: Key:ref:temples.ru
     ref:thc: Key:ref:thc
     ref:udir_nsr: Key:ref:udir nsr
+    ref:urbanbrussels: Key:ref:urbanbrussels
     ref:us:nid: Key:ref:us:nid
     ref:us:ny:swis: Key:ref:us:ny:swis
     ref:vatin: Key:ref:vatin
     ref:vatin:hu: Key:ref:vatin:hu
     ref:veiligheidsregiocode: Key:ref:veiligheidsregiocode
+    ref:velopark: Key:ref:velopark
     ref:vorwahl: Key:ref:vorwahl
     ref:waterschapscode: Key:ref:waterschapscode
     ref:wawa: Key:ref:wawa
     ref:whc: Key:ref:whc
     ref:wigos: Key:ref:wigos
+    ref:wmata: Key:ref:wmata
     ref:wmo: Key:ref:wmo
     ref:woonplaatscode: Key:ref:woonplaatscode
     ref:wpi: Key:ref:wpi
@@ -8383,6 +9406,7 @@ en:
     region:type: Key:region:type
     related_law: Key:related law
     religion: Key:religion
+    religious_level: Key:religious level
     remotely_controllable: Key:remotely controllable
     removed: Key:removed
     'removed:': 'Key:removed:'
@@ -8403,6 +9427,7 @@ en:
     resort: Key:resort
     resource: Key:resource
     restaurant: Key:restaurant
+    restriction: Key:restriction
     restriction:conditional: Key:restriction:conditional
     retaining_wall: Key:retaining wall
     retreat: Key:retreat
@@ -8422,9 +9447,11 @@ en:
     rmn_ref: Key:rmn ref
     road_marking: Key:road marking
     roadtrain: Key:roadtrain
+    robot:*: Key:robot:*
     roller_coaster: Key:roller coaster
     roller_coaster:track: Key:roller coaster:track
     roller_coaster:type: Key:roller coaster:type
+    roof: Key:roof
     roof:colour: Key:roof:colour
     roof:direction: Key:roof:direction
     roof:height: Key:roof:height
@@ -8450,6 +9477,7 @@ en:
     route_ref:TECL: Key:route ref:TECL
     route_ref:TECN: Key:route ref:TECN
     route_ref:TECX: Key:route ref:TECX
+    routing:bicycle: Key:routing:bicycle
     routing:entrance: Key:routing:entrance
     royal_cypher: Key:royal cypher
     royal_cypher:wikidata: Key:royal cypher:wikidata
@@ -8475,6 +9503,7 @@ en:
     safety_rope_side: Key:safety rope side
     sagns_id: Key:sagns id
     sailboat: Key:sailboat
+    sailing:*: Key:sailing:*
     sales: Key:sales
     salt: Key:salt
     sample_collection: Key:sample collection
@@ -8498,11 +9527,14 @@ en:
     school:trust:type: Key:school:trust:type
     school:type: Key:school:type
     school_bus: Key:school bus
+    scooter: Key:scooter
     scout: Key:scout
     screen: Key:screen
     scuba_diving:courses: Key:scuba diving:courses
+    scuba_diving:education: Key:scuba diving:education
     scuba_diving:rental: Key:scuba diving:rental
     sculpture_type: Key:sculpture type
+    sea_kayak: Key:sea kayak
     seamark: Key:seamark
     'seamark:': 'Key:seamark:'
     seamark:*: Key:seamark:*
@@ -8692,23 +9724,30 @@ en:
     seasonal: Key:seasonal
     seasonal:snowfall:regaintime: Key:seasonal:snowfall:regaintime
     seats: Key:seats
+    seats:separated: Key:seats:separated
     second_hand: Key:second hand
     security_desk: Key:security desk
     segregated: Key:segregated
     self_checkout: Key:self checkout
+    self_harvesting: Key:self harvesting
     self_service: Key:self service
     sells: Key:sells
     sells:tobacco: Key:sells:tobacco
+    sensory: Key:sensory
     service: Key:service
+    service:*: Key:service:*
     service:bicycle: Key:service:bicycle
     'service:bicycle:': 'Key:service:bicycle:'
     service:bicycle:*: Key:service:bicycle:*
     service:bicycle:Bicycle_Sales_and_Service: Key:service:bicycle:Bicycle Sales and
       Service
+    service:bicycle:chain_tool: Key:service:bicycle:chain tool
+    service:bicycle:charging: Key:service:bicycle:charging
     service:bicycle:cleaning: Key:service:bicycle:cleaning
     service:bicycle:diy: Key:service:bicycle:diy
     service:bicycle:ebike: Key:service:bicycle:ebike
     service:bicycle:miscellaneous: Key:service:bicycle:miscellaneous
+    service:bicycle:parking: Key:service:bicycle:parking
     service:bicycle:pump: Key:service:bicycle:pump
     service:bicycle:rental: Key:service:bicycle:rental
     service:bicycle:repair: Key:service:bicycle:repair
@@ -8716,7 +9755,10 @@ en:
     service:bicycle:sales: Key:service:bicycle:sales
     service:bicycle:second_hand: Key:service:bicycle:second hand
     service:bicycle:spare_parts: Key:service:bicycle:spare parts
+    service:bicycle:stand: Key:service:bicycle:stand
+    service:bicycle:tools: Key:service:bicycle:tools
     service:electricity: Key:service:electricity
+    service:press: Key:service:press
     service:vehicle: Key:service:vehicle
     'service:vehicle:': 'Key:service:vehicle:'
     service:vehicle:*: Key:service:vehicle:*
@@ -8770,6 +9812,7 @@ en:
     service:vehicle:transmission: Key:service:vehicle:transmission
     service:vehicle:transmission_repair: Key:service:vehicle:transmission repair
     service:vehicle:truck_repair: Key:service:vehicle:truck repair
+    service:vehicle:truck_sales: Key:service:vehicle:truck sales
     service:vehicle:tyre_services: Key:service:vehicle:tyre services
     service:vehicle:tyres_repair: Key:service:vehicle:tyres repair
     service:vehicle:used_car_sales: Key:service:vehicle:used car sales
@@ -8778,13 +9821,17 @@ en:
     service:vehicle:windshields: Key:service:vehicle:windshields
     service_branch: Key:service branch
     service_times: Key:service times
+    service_times:ref:CO: Key:service times:ref:CO
     service_times:wheelchair: Key:service times:wheelchair
     settlement:origin: Key:settlement:origin
     settlement_type: Key:settlement type
     seveso: Key:seveso
+    sexual_antiharassment_policy: Key:sexual antiharassment policy
+    sexual_antiharassment_policy:name: Key:sexual antiharassment policy:name
     shade: Key:shade
     shape: Key:shape
     share_taxi: Key:share taxi
+    shef:location_id: Key:shef:location id
     shelter: Key:shelter
     shelter_type: Key:shelter type
     ship: Key:ship
@@ -8810,24 +9857,31 @@ en:
     short_name:ur: Key:short name:ur
     shoulder: Key:shoulder
     shower: Key:shower
+    shower:wheelchair: Key:shower:wheelchair
     shrine: Key:shrine
     shrubbery:density: Key:shrubbery:density
     shrubbery:shape: Key:shrubbery:shape
+    side: Key:side
     side_road: Key:side road
     sides: Key:sides
     sidewalk: Key:sidewalk
     sidewalk:both: Key:sidewalk:both
     sidewalk:both:bicycle: Key:sidewalk:both:bicycle
     sidewalk:both:surface: Key:sidewalk:both:surface
+    sidewalk:both:width: Key:sidewalk:both:width
     sidewalk:left: Key:sidewalk:left
     sidewalk:left:bicycle: Key:sidewalk:left:bicycle
     sidewalk:left:surface: Key:sidewalk:left:surface
+    sidewalk:left:width: Key:sidewalk:left:width
     sidewalk:right: Key:sidewalk:right
     sidewalk:right:bicycle: Key:sidewalk:right:bicycle
     sidewalk:right:surface: Key:sidewalk:right:surface
+    sidewalk:right:width: Key:sidewalk:right:width
     sidewalk:surface: Key:sidewalk:surface
+    sidewalk:width: Key:sidewalk:width
     sidewalk_orientation: Key:sidewalk orientation
     sign: Key:sign
+    signalisation: Key:signalisation
     signed_direction: Key:signed direction
     sinkhole: Key:sinkhole
     siren:purpose: Key:siren:purpose
@@ -8835,14 +9889,17 @@ en:
     site: Key:site
     size: Key:size
     ski: Key:ski
+    ski:nordic: Key:ski:nordic
     sl_realtime: Key:sl realtime
     sl_stop_id: Key:sl stop id
     sloped_curb: Key:sloped curb
     small_electric_vehicle: Key:small electric vehicle
     smokefree: Key:smokefree
     smoking: Key:smoking
+    smoking:cannabis: Key:smoking:cannabis
     smoking:outside: Key:smoking:outside
     smoothness: Key:smoothness
+    sms: Key:sms
     snowmobile: Key:snowmobile
     snowmobile:sales: Key:snowmobile:sales
     snowplowing: Key:snowplowing
@@ -8862,10 +9919,12 @@ en:
     socket:type1: Key:socket:type1
     socket:type2: Key:socket:type2
     socket:type2:output: Key:socket:type2:output
+    socket:type2_combo: Key:socket:type2 combo
     socket:type3: Key:socket:type3
     socket:type3c: Key:socket:type3c
     socket:typee: Key:socket:typee
     soliciting: Key:soliciting
+    solitary: Key:solitary
     sorting_name: Key:sorting name
     sorting_name:ar: Key:sorting name:ar
     sorting_name:arc: Key:sorting name:arc
@@ -8883,6 +9942,7 @@ en:
     sorting_name:syc: Key:sorting name:syc
     sorting_name:ur: Key:sorting name:ur
     source: Key:source
+    source:*: Key:source:*
     source:ProRail: Key:source:ProRail
     source:addr: Key:source:addr
     source:addr:date: Key:source:addr:date
@@ -8993,10 +10053,8 @@ en:
     species:wikidata: Key:species:wikidata
     species:wikipedia: Key:species:wikipedia
     speech_input: Key:speech input
-    speech_input:lg: Key:speech input:lg
     speech_output: Key:speech output
     speech_output:en: Key:speech output:en
-    speech_output:lg: Key:speech output:lg
     speech_output:pl: Key:speech output:pl
     speed_pedelec: Key:speed pedelec
     speisebezirk: Key:speisebezirk
@@ -9010,13 +10068,21 @@ en:
     stars: Key:stars
     start_date: Key:start date
     start_date:edtf: Key:start date:edtf
+    start_event: Key:start event
     state: Key:state
     station: Key:station
     statue: Key:statue
     status: Key:status
+    step:condition: Key:step:condition
     step:contrast: Key:step:contrast
     step_count: Key:step count
     steps: Key:steps
+    stećak: Key:stećak
+    stećak:format: Key:stećak:format
+    stećak:relocated: Key:stećak:relocated
+    stećak:replica: Key:stećak:replica
+    stećak:stećak_count: Key:stećak:stećak count
+    stećak:stećak_necropolis: Key:stećak:stećak necropolis
     stilts: Key:stilts
     stone_type: Key:stone type
     stop: Key:stop
@@ -9030,9 +10096,11 @@ en:
     street_lamp: Key:street lamp
     stroller: Key:stroller
     structure: Key:structure
+    structure_gauge: Key:structure gauge
     studio: Key:studio
     subject: Key:subject
     subject:wikidata: Key:subject:wikidata
+    subject:wikimedia_commons: Key:subject:wikimedia commons
     subject:wikipedia: Key:subject:wikipedia
     submarine: Key:submarine
     subsea: Key:subsea
@@ -9046,6 +10114,7 @@ en:
     surface: Key:surface
     surface:colour: Key:surface:colour
     surface:grade: Key:surface:grade
+    surface:lanes: Key:surface:lanes
     surface:middle: Key:surface:middle
     surface:note: Key:surface:note
     surface_survey: Key:surface survey
@@ -9060,16 +10129,17 @@ en:
     swimming: Key:swimming
     swimming_lanes: Key:swimming lanes
     swimming_pool: Key:swimming pool
+    swing_gate:type: Key:swing gate:type
     switch: Key:switch
     symbol: Key:symbol
     tactile_map: Key:tactile map
     tactile_paving: Key:tactile paving
+    tactile_paving:colour: Key:tactile paving:colour
     tactile_writing: Key:tactile writing
     tactile_writing:braille:ar: Key:tactile writing:braille:ar
     tactile_writing:braille:de: Key:tactile writing:braille:de
     tactile_writing:braille:es: Key:tactile writing:braille:es
     tactile_writing:braille:fr: Key:tactile writing:braille:fr
-    tactile_writing:braille:lg: Key:tactile writing:braille:lg
     tactile_writing:computer_braille:lg: Key:tactile writing:computer braille:lg
     tactile_writing:embossed_printed_letters: Key:tactile writing:embossed printed
       letters
@@ -9080,15 +10150,18 @@ en:
     tailor:alteration_service: Key:tailor:alteration service
     tailor:bespoke_tailoring: Key:tailor:bespoke tailoring
     takeaway: Key:takeaway
+    takeaway:*: Key:takeaway:*
     tank: Key:tank
     tank_cleaning_truck: Key:tank cleaning truck
     tank_trap: Key:tank trap
     target: Key:target
+    tattoo: Key:tattoo
     taxi: Key:taxi
     taxon: Key:taxon
     taxon:wikidata: Key:taxon:wikidata
     technical_type: Key:technical type
     technology: Key:technology
+    tee: Key:tee
     telecom: Key:telecom
     telecom:medium: Key:telecom:medium
     telescope:type: Key:telescope:type
@@ -9107,6 +10180,8 @@ en:
     theatre:genre: Key:theatre:genre
     theatre:type: Key:theatre:type
     theme: Key:theme
+    thw:lv: Key:thw:lv
+    thw:rb: Key:thw:rb
     tickets:public_transport: Key:tickets:public transport
     tickets:public_transport_subscription: Key:tickets:public transport subscription
     ticks: Key:ticks
@@ -9129,6 +10204,7 @@ en:
     tiger:tlid: Key:tiger:tlid
     tiger:upload_uuid: Key:tiger:upload uuid
     timezone: Key:timezone
+    tmc: Key:tmc
     to: Key:to
     to:ar: Key:to:ar
     to:arc: Key:to:arc
@@ -9146,14 +10222,23 @@ en:
     to:ur: Key:to:ur
     tobacco: Key:tobacco
     toilets: Key:toilets
+    toilets:*: Key:toilets:*
+    toilets:hands_drying: Key:toilets:hands drying
+    toilets:menstrual_products: Key:toilets:menstrual products
+    toilets:number: Key:toilets:number
     toilets:paper_supplied: Key:toilets:paper supplied
     toilets:unisex: Key:toilets:unisex
     toilets:wheelchair: Key:toilets:wheelchair
+    toilets:wheelchair:door_width: Key:toilets:wheelchair:door width
+    toilets:wheelchair:grab_rails: Key:toilets:wheelchair:grab rails
+    toilets:wheelchair:space_front: Key:toilets:wheelchair:space front
+    toilets:wheelchair:space_side: Key:toilets:wheelchair:space side
     toll: Key:toll
     toll:hgv: Key:toll:hgv
     toll:hov: Key:toll:hov
     toll:motorcycle: Key:toll:motorcycle
     tomb: Key:tomb
+    top_ele: Key:top ele
     topless: Key:topless
     topmark: Key:topmark
     topmark:colour: Key:topmark:colour
@@ -9161,6 +10246,7 @@ en:
     tourism: Key:tourism
     tourism:level:CN: Key:tourism:level:CN
     tourist_bus: Key:tourist bus
+    tours: Key:tours
     tower:construction: Key:tower:construction
     tower:type: Key:tower:type
     townhall:type: Key:townhall:type
@@ -9170,6 +10256,8 @@ en:
     traffic: Key:traffic
     traffic:hourly: Key:traffic:hourly
     traffic_calming: Key:traffic calming
+    traffic_intervention: Key:traffic intervention
+    traffic_island: Key:traffic island
     traffic_sign: Key:traffic sign
     traffic_sign:backward: Key:traffic sign:backward
     traffic_sign:direction: Key:traffic sign:direction
@@ -9180,7 +10268,9 @@ en:
     traffic_signals:countdown: Key:traffic signals:countdown
     traffic_signals:direction: Key:traffic signals:direction
     traffic_signals:floor_vibration: Key:traffic signals:floor vibration
+    traffic_signals:haptic: Key:traffic signals:haptic
     traffic_signals:minimap: Key:traffic signals:minimap
+    traffic_signals:operating_times: Key:traffic signals:operating times
     traffic_signals:override_indicator: Key:traffic signals:override indicator
     traffic_signals:sound: Key:traffic signals:sound
     traffic_signals:turn: Key:traffic signals:turn
@@ -9199,13 +10289,19 @@ en:
     transformer:devices: Key:transformer:devices
     tree:ref: Key:tree:ref
     tree_lined: Key:tree lined
+    tree_lined:both: Key:tree lined:both
+    tree_lined:left: Key:tree lined:left
+    tree_lined:right: Key:tree lined:right
     trees: Key:trees
     trench: Key:trench
+    trip_ref: Key:trip ref
+    triple_tower: Key:triple tower
     trolley:deposit: Key:trolley:deposit
     trolley_wire: Key:trolley wire
     trolleybus: Key:trolleybus
     trolleybus_class:length: Key:trolleybus class:length
     truck:parts: Key:truck:parts
+    truck:repair: Key:truck:repair
     truck:sales: Key:truck:sales
     truck_wash: Key:truck wash
     ts_calle: Key:ts calle
@@ -9240,6 +10336,9 @@ en:
     turning_radius: Key:turning radius
     twitter: Key:twitter
     type: Key:type
+    type:FR:FINESS: Key:type:FR:FINESS
+    typhoon:damage: Key:typhoon:damage
+    typhoon:reviewed: Key:typhoon:reviewed
     uic_name: Key:uic name
     uic_ref: Key:uic ref
     uir_adr:ADRESA_KOD: Key:uir adr:ADRESA KOD
@@ -9247,39 +10346,50 @@ en:
     unit: Key:unit
     unsigned: Key:unsigned
     unsigned_ref: Key:unsigned ref
+    ups: Key:ups
     urban: Key:urban
     url: Key:url
     url:bathing_water: Key:url:bathing water
+    url:goingelectric: Key:url:goingelectric
     url:imher: Key:url:imher
+    url:miserend: Key:url:miserend
     url:registered_building: Key:url:registered building
     url:restrictions: Key:url:restrictions
+    url:spaceapi: Key:url:spaceapi
     us:ny:swis: Key:us:ny:swis
     usage: Key:usage
     user_defined_other: Key:user defined other
     utahagrc:parcelid: Key:utahagrc:parcelid
     utility: Key:utility
+    utm: Key:utm
     vaccination: Key:vaccination
     vacuum_cleaner: Key:vacuum cleaner
     validate:ants:yellow: Key:validate:ants:yellow
     valley: Key:valley
     valve: Key:valve
+    vcgi:e911-addresses:esiteid: Key:vcgi:e911-addresses:esiteid
     vegan: Key:vegan
     vegetarian: Key:vegetarian
     vehicle: Key:vehicle
     vehicle:conditional: Key:vehicle:conditional
     vehicle:wikidata: Key:vehicle:wikidata
     vehicle:wikipedia: Key:vehicle:wikipedia
+    vehicle_plate_code: Key:vehicle plate code
     vending: Key:vending
     verge: Key:verge
     vessel: Key:vessel
     vhf: Key:vhf
     via: Key:via
     via_ferrata_scale: Key:via ferrata scale
+    video: Key:video
     view: Key:view
     viewpoint: Key:viewpoint
     vine_row_orientation: Key:vine row orientation
+    virtual: Key:virtual
+    virtual_tour: Key:virtual tour
     visibility: Key:visibility
     volcano:status: Key:volcano:status
+    volcano:type: Key:volcano:type
     voltage: Key:voltage
     voltage:primary: Key:voltage:primary
     voltage:secondary: Key:voltage:secondary
@@ -9293,6 +10403,7 @@ en:
     'was:': 'Key:was:'
     was:*: Key:was:*
     was:amenity: Key:was:amenity
+    was:name: Key:was:name
     washing_machine: Key:washing machine
     waste: Key:waste
     waste_basket: Key:waste basket
@@ -9302,8 +10413,13 @@ en:
     water_slide: Key:water slide
     water_source: Key:water source
     water_system: Key:water system
+    water_tank:volume: Key:water tank:volume
+    water_volume: Key:water volume
     water_well: Key:water well
     waterway: Key:waterway
+    waterway:sign: Key:waterway:sign
+    weather:hygrometer: Key:weather:hygrometer
+    weather_control: Key:weather control
     weather_protection: Key:weather protection
     website: Key:website
     'website:': 'Key:website:'
@@ -9313,35 +10429,48 @@ en:
     website:menu: Key:website:menu
     website:orders: Key:website:orders
     website:regulation: Key:website:regulation
+    website:reservation: Key:website:reservation
     website:stock: Key:website:stock
     wetland: Key:wetland
     wheelchair: Key:wheelchair
     wheelchair:description: Key:wheelchair:description
+    wheelchair:turning_circle: Key:wheelchair:turning circle
+    whitewater: Key:whitewater
+    whitewater:name: Key:whitewater:name
     whitewater:rapid_grade: Key:whitewater:rapid grade
+    whitewater:rapid_name: Key:whitewater:rapid name
+    whitewater:section_grade: Key:whitewater:section grade
+    whitewater:section_name: Key:whitewater:section name
     wholesale: Key:wholesale
     width: Key:width
     width:carriageway: Key:width:carriageway
     width:effective: Key:width:effective
+    width:lanes: Key:width:lanes
+    width:lanes:forward: Key:width:lanes:forward
     wifi: Key:wifi
     wiki:symbol: Key:wiki:symbol
     wikidata: Key:wikidata
     wikimedia_commons: Key:wikimedia commons
+    wikimedia_commons:path: Key:wikimedia commons:path
     wikipedia: Key:wikipedia
     wikipedia:ar: Key:wikipedia:ar
     wikipedia:arc: Key:wikipedia:arc
     wikipedia:azb: Key:wikipedia:azb
     wikipedia:be: Key:wikipedia:be
+    wikipedia:ca: Key:wikipedia:ca
     wikipedia:ckb: Key:wikipedia:ckb
     wikipedia:de: Key:wikipedia:de
     wikipedia:en: Key:wikipedia:en
     wikipedia:es: Key:wikipedia:es
     wikipedia:fa: Key:wikipedia:fa
     wikipedia:fr: Key:wikipedia:fr
+    wikipedia:gd: Key:wikipedia:gd
     wikipedia:glk: Key:wikipedia:glk
     wikipedia:grc: Key:wikipedia:grc
     wikipedia:ks: Key:wikipedia:ks
     wikipedia:lrc: Key:wikipedia:lrc
     wikipedia:mzn: Key:wikipedia:mzn
+    wikipedia:no: Key:wikipedia:no
     wikipedia:pl: Key:wikipedia:pl
     wikipedia:pnb: Key:wikipedia:pnb
     wikipedia:ps: Key:wikipedia:ps
@@ -9358,7 +10487,12 @@ en:
     windmill:vanes: Key:windmill:vanes
     window: Key:window
     windows: Key:windows
+    wine:grape: Key:wine:grape
     wine:region: Key:wine:region
+    wine:sales: Key:wine:sales
+    wine:type: Key:wine:type
+    wine:vineyard: Key:wine:vineyard
+    winery: Key:winery
     winter_road: Key:winter road
     winter_room: Key:winter room
     winter_service: Key:winter service
@@ -9381,6 +10515,7 @@ en:
     xmas:feature: Key:xmas:feature
     xmpp: Key:xmpp
     year_of_construction: Key:year of construction
+    yett_hole: Key:yett hole
     yh:LINE_NAME: Key:yh:LINE NAME
     yh:LINE_NUM: Key:yh:LINE NUM
     yh:STRUCTURE: Key:yh:STRUCTURE
@@ -9393,10 +10528,14 @@ en:
     zone:De_Lijn: Key:zone:De Lijn
     zone:TEC: Key:zone:TEC
     zone:maxspeed: Key:zone:maxspeed
+    zone:parking: Key:zone:parking
     zone:traffic: Key:zone:traffic
+    zoning_code: Key:zoning code
     zoo: Key:zoo
   tag:
+    '*:sales=retail': Tag:*:sales=retail
     FIXME=Position_estimated: Tag:FIXME=Position estimated
+    FR:leisure=children_club: Tag:FR:leisure=children club
     abandoned:amenity=prison: Tag:abandoned:amenity=prison
     abandoned:amenity=prison_camp: Tag:abandoned:amenity=prison camp
     abandoned:landuse=landfill: Tag:abandoned:landuse=landfill
@@ -9427,11 +10566,13 @@ en:
     access=students: Tag:access=students
     access=unknown: Tag:access=unknown
     access=use_sidepath: Tag:access=use sidepath
+    access=yes: Tag:access=yes
     actuator=electric_motor: Tag:actuator=electric motor
     actuator=hydraulic_cylinder: Tag:actuator=hydraulic cylinder
     actuator=manual: Tag:actuator=manual
     actuator=pneumatic_cylinder: Tag:actuator=pneumatic cylinder
     addr:TW:dataset=137998: Tag:addr:TW:dataset=137998
+    addr:country=US: Tag:addr:country=US
     addr:type=water: Tag:addr:type=water
     admin_level=1: Tag:admin level=1
     admin_level=10: Tag:admin level=10
@@ -9444,6 +10585,7 @@ en:
     admin_level=7: Tag:admin level=7
     admin_level=8: Tag:admin level=8
     admin_level=9: Tag:admin level=9
+    admin_type:PH=barangay: Tag:admin type:PH=barangay
     advertising=billboard: Tag:advertising=billboard
     advertising=board: Tag:advertising=board
     advertising=column: Tag:advertising=column
@@ -9493,6 +10635,8 @@ en:
     aeroway=airtanker_base: Tag:aeroway=airtanker base
     aeroway=apron: Tag:aeroway=apron
     aeroway=arresting_gear: Tag:aeroway=arresting gear
+    aeroway=control_center: Tag:aeroway=control center
+    aeroway=control_tower: Tag:aeroway=control tower
     aeroway=displaced_threshold: Tag:aeroway=displaced threshold
     aeroway=flame_trench: Tag:aeroway=flame trench
     aeroway=fuel: Tag:aeroway=fuel
@@ -9507,6 +10651,7 @@ en:
     aeroway=landingpad: Tag:aeroway=landingpad
     aeroway=launch_complex: Tag:aeroway=launch complex
     aeroway=launchpad: Tag:aeroway=launchpad
+    aeroway=model_runway: Tag:aeroway=model runway
     aeroway=navigationaid: Tag:aeroway=navigationaid
     aeroway=papi: Tag:aeroway=papi
     aeroway=parking_position: Tag:aeroway=parking position
@@ -9564,6 +10709,7 @@ en:
     amenity=brothel: Tag:amenity=brothel
     amenity=bts: Tag:amenity=bts
     amenity=buggy_parking: Tag:amenity=buggy parking
+    amenity=building_yard: Tag:amenity=building yard
     amenity=bureau_de_change: Tag:amenity=bureau de change
     amenity=bus_station: Tag:amenity=bus station
     amenity=bus_stop: Tag:amenity=bus stop
@@ -9578,6 +10724,7 @@ en:
     amenity=carwash: Tag:amenity=carwash
     amenity=casino: Tag:amenity=casino
     amenity=chair: Tag:amenity=chair
+    amenity=changing_places: Tag:amenity=changing places
     amenity=changing_room: Tag:amenity=changing room
     amenity=charging_station: Tag:amenity=charging station
     amenity=checkpoint: Tag:amenity=checkpoint
@@ -9618,6 +10765,7 @@ en:
     amenity=dog_bin: Tag:amenity=dog bin
     amenity=dog_parking: Tag:amenity=dog parking
     amenity=dog_toilet: Tag:amenity=dog toilet
+    amenity=dog_wash: Tag:amenity=dog wash
     amenity=dog_waste_bin: Tag:amenity=dog waste bin
     amenity=dojo: Tag:amenity=dojo
     amenity=dormitory: Tag:amenity=dormitory
@@ -9694,7 +10842,9 @@ en:
     amenity=lifeboat_station: Tag:amenity=lifeboat station
     amenity=loading_dock: Tag:amenity=loading dock
     amenity=locker: Tag:amenity=locker
+    amenity=lockers: Tag:amenity=lockers
     amenity=lost_property_office: Tag:amenity=lost property office
+    amenity=lounge: Tag:amenity=lounge
     amenity=lounger: Tag:amenity=lounger
     amenity=love_hotel: Tag:amenity=love hotel
     amenity=luggage_locker: Tag:amenity=luggage locker
@@ -9742,6 +10892,7 @@ en:
     amenity=post_box: Tag:amenity=post box
     amenity=post_depot: Tag:amenity=post depot
     amenity=post_office: Tag:amenity=post office
+    amenity=practice_bicycle_carrier: Tag:amenity=practice bicycle carrier
     amenity=prep_school: Tag:amenity=prep school
     amenity=preschool: Tag:amenity=preschool
     amenity=printer: Tag:amenity=printer
@@ -9749,6 +10900,7 @@ en:
     amenity=prison_camp: Tag:amenity=prison camp
     amenity=proposed: Tag:amenity=proposed
     amenity=pub: Tag:amenity=pub
+    amenity=public_art_gallery: Tag:amenity=public art gallery
     amenity=public_bath: Tag:amenity=public bath
     amenity=public_bookcase: Tag:amenity=public bookcase
     amenity=public_building: Tag:amenity=public building
@@ -9771,10 +10923,13 @@ en:
     amenity=sanitary_dump_station: Tag:amenity=sanitary dump station
     amenity=sauna: Tag:amenity=sauna
     amenity=school: Tag:amenity=school
+    amenity=scooter_parking: Tag:amenity=scooter parking
     amenity=scooter_rental: Tag:amenity=scooter rental
     amenity=seat: Tag:amenity=seat
     amenity=security_booth: Tag:amenity=security booth
+    amenity=security_control: Tag:amenity=security control
     amenity=shelter: Tag:amenity=shelter
+    amenity=shoe_shine: Tag:amenity=shoe shine
     amenity=shop: Tag:amenity=shop
     amenity=shower: Tag:amenity=shower
     amenity=ski_rental: Tag:amenity=ski rental
@@ -9803,11 +10958,13 @@ en:
     amenity=taxi: Tag:amenity=taxi
     amenity=telephone: Tag:amenity=telephone
     amenity=television: Tag:amenity=television
+    amenity=tent_ground: Tag:amenity=tent ground
     amenity=theatre: Tag:amenity=theatre
     amenity=ticket_booth: Tag:amenity=ticket booth
     amenity=ticket_validator: Tag:amenity=ticket validator
     amenity=toilet: Tag:amenity=toilet
     amenity=toilets: Tag:amenity=toilets
+    amenity=tool_library: Tag:amenity=tool library
     amenity=tourist_bus_parking: Tag:amenity=tourist bus parking
     amenity=townhall: Tag:amenity=townhall
     amenity=toy_library: Tag:amenity=toy library
@@ -9839,6 +10996,7 @@ en:
     amenity=winery: Tag:amenity=winery
     amenity=workshop: Tag:amenity=workshop
     amenity=yacht_club: Tag:amenity=yacht club
+    amenity=yes: Tag:amenity=yes
     amenity=youth_centre: Tag:amenity=youth centre
     animal=horse_walker: Tag:animal=horse walker
     animal=school: Tag:animal=school
@@ -9848,10 +11006,15 @@ en:
     animated=trivision_blades: Tag:animated=trivision blades
     animated=winding_posters: Tag:animated=winding posters
     anthropogenic=yes: Tag:anthropogenic=yes
+    app_operated=only: Tag:app operated=only
+    app_operated=yes: Tag:app operated=yes
     aquaculture=fish: Tag:aquaculture=fish
     aquaculture=seaweed: Tag:aquaculture=seaweed
     archaeological_site=amphitheatre: Tag:archaeological site=amphitheatre
     archaeological_site=baths: Tag:archaeological site=baths
+    archaeological_site=bigstone: Tag:archaeological site=bigstone
+    archaeological_site=cairn: Tag:archaeological site=cairn
+    archaeological_site=church: Tag:archaeological site=church
     archaeological_site=city: Tag:archaeological site=city
     archaeological_site=cliff_dwelling: Tag:archaeological site=cliff dwelling
     archaeological_site=crannog: Tag:archaeological site=crannog
@@ -9860,30 +11023,38 @@ en:
     archaeological_site=enclosure: Tag:archaeological site=enclosure
     archaeological_site=field_system: Tag:archaeological site=field system
     archaeological_site=fortification: Tag:archaeological site=fortification
+    archaeological_site=geoglyph: Tag:archaeological site=geoglyph
     archaeological_site=grave_field: Tag:archaeological site=grave field
     archaeological_site=hut_circle: Tag:archaeological site=hut circle
     archaeological_site=megalith: Tag:archaeological site=megalith
     archaeological_site=minilith: Tag:archaeological site=minilith
     archaeological_site=necropolis: Tag:archaeological site=necropolis
     archaeological_site=petroglyph: Tag:archaeological site=petroglyph
+    archaeological_site=rock_painting: Tag:archaeological site=rock painting
     archaeological_site=roman_circus: Tag:archaeological site=roman circus
     archaeological_site=roman_villa: Tag:archaeological site=roman villa
     archaeological_site=settlement: Tag:archaeological site=settlement
     archaeological_site=souterrain: Tag:archaeological site=souterrain
+    archaeological_site=tomb: Tag:archaeological site=tomb
+    archaeological_site=trap_pit: Tag:archaeological site=trap pit
     archaeological_site=tumulus: Tag:archaeological site=tumulus
     area:highway=cycleway: Tag:area:highway=cycleway
     area:highway=footway: Tag:area:highway=footway
     area:highway=path: Tag:area:highway=path
     area:highway=pedestrian: Tag:area:highway=pedestrian
     area:highway=steps: Tag:area:highway=steps
+    area:highway=traffic_island: Tag:area:highway=traffic island
     area:highway=trunk: Tag:area:highway=trunk
     area:highway=trunk_link: Tag:area:highway=trunk link
     area:highway=turning_circle: Tag:area:highway=turning circle
     artwork_subject=sheela-na-gig: Tag:artwork subject=sheela-na-gig
+    artwork_subject=street_art: Tag:artwork subject=street art
     artwork_type=architecture: Tag:artwork type=architecture
     artwork_type=bust: Tag:artwork type=bust
     artwork_type=graffiti: Tag:artwork type=graffiti
+    artwork_type=installation: Tag:artwork type=installation
     artwork_type=land_art: Tag:artwork type=land art
+    artwork_type=mosaic: Tag:artwork type=mosaic
     artwork_type=mural: Tag:artwork type=mural
     artwork_type=relief: Tag:artwork type=relief
     artwork_type=sculpture: Tag:artwork type=sculpture
@@ -9900,6 +11071,7 @@ en:
     assembly_point:landslide=yes: Tag:assembly point:landslide=yes
     assembly_point:tornado=yes: Tag:assembly point:tornado=yes
     assembly_point:tsunami=yes: Tag:assembly point:tsunami=yes
+    association=sport: Tag:association=sport
     association=student: Tag:association=student
     athletics=cross_country: Tag:athletics=cross country
     athletics=discus_throw: Tag:athletics=discus throw
@@ -9914,18 +11086,22 @@ en:
     athletics=steeplechase: Tag:athletics=steeplechase
     athletics=triple_jump: Tag:athletics=triple jump
     atm=no: Tag:atm=no
+    atm=separate: Tag:atm=separate
     atm=yes: Tag:atm=yes
     attraction=alpine_coaster: Tag:attraction=alpine coaster
     attraction=amusement_ride: Tag:attraction=amusement ride
     attraction=animal: Tag:attraction=animal
     attraction=big_wheel: Tag:attraction=big wheel
     attraction=boat_ride: Tag:attraction=boat ride
+    attraction=bumper_car: Tag:attraction=bumper car
     attraction=carousel: Tag:attraction=carousel
+    attraction=historic: Tag:attraction=historic
     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
+    audio_loop=yes: Tag:audio loop=yes
     autonomy=excluded: Tag:autonomy=excluded
     autonomy=exclusive: Tag:autonomy=exclusive
     autonomy=mixed: Tag:autonomy=mixed
@@ -9955,11 +11131,13 @@ en:
     barrier=cycle_barrier: Tag:barrier=cycle barrier
     barrier=czech_hedgehog: Tag:barrier=czech hedgehog
     barrier=debris: Tag:barrier=debris
+    barrier=delineators: Tag:barrier=delineators
     barrier=ditch: Tag:barrier=ditch
     barrier=dug-in_tyres: Tag:barrier=dug-in tyres
     barrier=embankment: Tag:barrier=embankment
     barrier=entrance: Tag:barrier=entrance
     barrier=fence: Tag:barrier=fence
+    barrier=fenced_wall: Tag:barrier=fenced wall
     barrier=foldable_pie_slice: Tag:barrier=foldable pie slice
     barrier=full-height_turnstile: Tag:barrier=full-height turnstile
     barrier=gate: Tag:barrier=gate
@@ -10011,6 +11189,7 @@ en:
     basin=evaporation: Tag:basin=evaporation
     basin=footbath: Tag:basin=footbath
     basin=infiltration: Tag:basin=infiltration
+    basin=irrigation_reservoir: Tag:basin=irrigation reservoir
     basin=retention: Tag:basin=retention
     basin=settling: Tag:basin=settling
     basin=stormwater: Tag:basin=stormwater
@@ -10023,17 +11202,24 @@ en:
     bath:type=pool: Tag:bath:type=pool
     bath:type=river: Tag:bath:type=river
     bath:type=sea: Tag:bath:type=sea
+    bath:type=sento: Tag:bath:type=sento
     bath:type=thermal: Tag:bath:type=thermal
     bay=fjord: Tag:bay=fjord
+    bbq=bring_your_own: Tag:bbq=bring your own
     bbq=yes: Tag:bbq=yes
     beacon:type=DME: Tag:beacon:type=DME
     beacon:type=DVOR: Tag:beacon:type=DVOR
+    beacon:type=DVOR/DME: Tag:beacon:type=DVOR/DME
     beacon:type=ILS: Tag:beacon:type=ILS
+    beacon:type=ILS;DME: Tag:beacon:type=ILS;DME
+    beacon:type=IM: Tag:beacon:type=IM
     beacon:type=MM: Tag:beacon:type=MM
     beacon:type=NDB: Tag:beacon:type=NDB
     beacon:type=OM: Tag:beacon:type=OM
     beacon:type=TACAN: Tag:beacon:type=TACAN
     beacon:type=VOR: Tag:beacon:type=VOR
+    beacon:type=VOR/DME: Tag:beacon:type=VOR/DME
+    beacon:type=VOR;DME: Tag:beacon:type=VOR;DME
     beacon:type=VORTAC: Tag:beacon:type=VORTAC
     beauty=spa: Tag:beauty=spa
     bench=wave_lounger: Tag:bench=wave lounger
@@ -10041,7 +11227,9 @@ en:
     bicycle:backward=use_sidepath: Tag:bicycle:backward=use sidepath
     bicycle:forward=optional_sidepath: Tag:bicycle:forward=optional sidepath
     bicycle:forward=use_sidepath: Tag:bicycle:forward=use sidepath
+    bicycle=customers: Tag:bicycle=customers
     bicycle=designated: Tag:bicycle=designated
+    bicycle=discouraged: Tag:bicycle=discouraged
     bicycle=dismount: Tag:bicycle=dismount
     bicycle=no: Tag:bicycle=no
     bicycle=official: Tag:bicycle=official
@@ -10050,6 +11238,7 @@ en:
     bicycle=private: Tag:bicycle=private
     bicycle=use_sidepath: Tag:bicycle=use sidepath
     bicycle=yes: Tag:bicycle=yes
+    bicycle_parking=safe_loops: Tag:bicycle parking=safe loops
     bicycle_parking=stands: Tag:bicycle parking=stands
     bicycle_parking=wall_loops: Tag:bicycle parking=wall loops
     bicycle_parking=wide_stands: Tag:bicycle parking=wide stands
@@ -10104,6 +11293,7 @@ en:
     boundary=postal_code: Tag:boundary=postal code
     boundary=protected_area: Tag:boundary=protected area
     boundary=regional_park: Tag:boundary=regional park
+    boundary=religious_administration: Tag:boundary=religious administration
     boundary=safety_region: Tag:boundary=safety region
     boundary=special_economic_zone: Tag:boundary=special economic zone
     boundary=statistical: Tag:boundary=statistical
@@ -10134,6 +11324,7 @@ en:
     bridge:structure=arch: Tag:bridge:structure=arch
     bridge:structure=beam: Tag:bridge:structure=beam
     bridge:structure=cable-stayed: Tag:bridge:structure=cable-stayed
+    bridge:structure=clapper: Tag:bridge:structure=clapper
     bridge:structure=floating: Tag:bridge:structure=floating
     bridge:structure=humpback: Tag:bridge:structure=humpback
     bridge:structure=simple-suspension: Tag:bridge:structure=simple-suspension
@@ -10155,14 +11346,17 @@ en:
     bridge=trestle: Tag:bridge=trestle
     bridge=viaduct: Tag:bridge=viaduct
     building:part=balcony: Tag:building:part=balcony
+    building:part=column: Tag:building:part=column
     building:part=corridor: Tag:building:part=corridor
     building:part=porch: Tag:building:part=porch
+    building:part=yes: Tag:building:part=yes
     building:use=stable: Tag:building:use=stable
     building:use=warehouse: Tag:building:use=warehouse
     building=*: Tag:building=*
     building=Y: Tag:building=Y
     building=abandoned: Tag:building=abandoned
     building=allotment_house: Tag:building=allotment house
+    building=annexe: Tag:building=annexe
     building=apartments: Tag:building=apartments
     building=bakehouse: Tag:building=bakehouse
     building=barn: Tag:building=barn
@@ -10214,6 +11408,7 @@ en:
     building=fixme: Tag:building=fixme
     building=font: Tag:building=font
     building=fort: Tag:building=fort
+    building=friary: Tag:building=friary
     building=funeral_hall: Tag:building=funeral hall
     building=garage: Tag:building=garage
     building=garages: Tag:building=garages
@@ -10244,9 +11439,11 @@ en:
     building=manufacture: Tag:building=manufacture
     building=marquee: Tag:building=marquee
     building=military: Tag:building=military
+    building=mobile_home: Tag:building=mobile home
     building=monastery: Tag:building=monastery
     building=mosque: Tag:building=mosque
     building=museum: Tag:building=museum
+    building=no: Tag:building=no
     building=office: Tag:building=office
     building=other: Tag:building=other
     building=outbuilding: Tag:building=outbuilding
@@ -10255,6 +11452,7 @@ en:
     building=parking: Tag:building=parking
     building=pavilion: Tag:building=pavilion
     building=planned: Tag:building=planned
+    building=police: Tag:building=police
     building=porch: Tag:building=porch
     building=presbytery: Tag:building=presbytery
     building=proposed: Tag:building=proposed
@@ -10291,11 +11489,13 @@ en:
     building=storage_tank: Tag:building=storage tank
     building=sty: Tag:building=sty
     building=supermarket: Tag:building=supermarket
+    building=swimming_pool: Tag:building=swimming pool
     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=terraced_house: Tag:building=terraced house
     building=toilets: Tag:building=toilets
     building=tower: Tag:building=tower
     building=townhall: Tag:building=townhall
@@ -10303,6 +11503,7 @@ en:
     building=transformer_tower: Tag:building=transformer tower
     building=transportation: Tag:building=transportation
     building=tree_house: Tag:building=tree house
+    building=triumphal_arch: Tag:building=triumphal arch
     building=true: Tag:building=true
     building=trullo: Tag:building=trullo
     building=unclassified: Tag:building=unclassified
@@ -10315,6 +11516,7 @@ en:
     building=water_tower: Tag:building=water tower
     building=wayside_shrine: Tag:building=wayside shrine
     building=windmill: Tag:building=windmill
+    building=wine_cellar: Tag:building=wine cellar
     building=yes: Tag:building=yes
     bunker_type=bomb_shelter: Tag:bunker type=bomb shelter
     bunker_type=gun_emplacement: Tag:bunker type=gun emplacement
@@ -10324,6 +11526,7 @@ en:
     bunker_type=personnel_shelter: Tag:bunker type=personnel shelter
     bunker_type=pillbox: Tag:bunker type=pillbox
     bunker_type=technical: Tag:bunker type=technical
+    bus=designated: Tag:bus=designated
     bus=minibus: Tag:bus=minibus
     bus=no: Tag:bus=no
     bus=school: Tag:bus=school
@@ -10333,6 +11536,7 @@ en:
     busway:left=lane: Tag:busway:left=lane
     busway:right=lane: Tag:busway:right=lane
     busway=lane: Tag:busway=lane
+    busway=opposite: Tag:busway=opposite
     busway=opposite_lane: Tag:busway=opposite lane
     by_night=only: Tag:by night=only
     cabin:rental=yes: Tag:cabin:rental=yes
@@ -10342,6 +11546,7 @@ en:
     cadet=lifeguard: Tag:cadet=lifeguard
     cadet=military: Tag:cadet=military
     cadet=police: Tag:cadet=police
+    cafe=board_game: Tag:cafe=board game
     cafe=time-cafe: Tag:cafe=time-cafe
     cafe=time_cafe: Tag:cafe=time cafe
     camp_site=basic: Tag:camp site=basic
@@ -10352,8 +11557,10 @@ en:
     camp_site=standard: Tag:camp site=standard
     camra=yes: Tag:camra=yes
     canal=qanat: Tag:canal=qanat
+    canoe=egress: Tag:canoe=egress
     canoe=portage: Tag:canoe=portage
     canoe=put_in: Tag:canoe=put in
+    canoe=put_in;egress: Tag:canoe=put in;egress
     capital=4: Tag:capital=4
     capital=5: Tag:capital=5
     capital=6: Tag:capital=6
@@ -10402,7 +11609,9 @@ en:
     club=automobile: Tag:club=automobile
     club=baduk: Tag:club=baduk
     club=bicycle: Tag:club=bicycle
+    club=board_games: Tag:club=board games
     club=cadet: Tag:club=cadet
+    club=cannabis: Tag:club=cannabis
     club=card_games: Tag:club=card games
     club=chess: Tag:club=chess
     club=computer: Tag:club=computer
@@ -10413,6 +11622,7 @@ en:
     club=hunting: Tag:club=hunting
     club=linux: Tag:club=linux
     club=military_cadets: Tag:club=military cadets
+    club=model_railway: Tag:club=model railway
     club=motorcycle: Tag:club=motorcycle
     club=music: Tag:club=music
     club=nudism: Tag:club=nudism
@@ -10430,6 +11640,8 @@ en:
     coastline:survey_quality=inadequate: Tag:coastline:survey quality=inadequate
     coastline=bogus: Tag:coastline=bogus
     collection_times:signed=no: Tag:collection times:signed=no
+    commercial=logistics: Tag:commercial=logistics
+    commons=lets: Tag:commons=lets
     communication:radio=fm: Tag:communication:radio=fm
     communication:television=dvb-t: Tag:communication:television=dvb-t
     communication:television=dvb-t2: Tag:communication:television=dvb-t2
@@ -10439,17 +11651,22 @@ en:
     community_centre=community_hall: Tag:community centre=community hall
     community_centre=cultural_centre: Tag:community centre=cultural centre
     community_centre=family_centre: Tag:community centre=family centre
+    community_centre=meeting_room: Tag:community centre=meeting room
     community_centre=parish_hall: Tag:community centre=parish hall
     community_centre=village_hall: Tag:community centre=village hall
     community_centre=youth_centre: Tag:community centre=youth centre
     company=aerospace: Tag:company=aerospace
+    company=agrarian: Tag:company=agrarian
     company=catalog: Tag:company=catalog
     company=construction: Tag:company=construction
+    company=distribution: Tag:company=distribution
     company=industrial_climbing: Tag:company=industrial climbing
+    company=information: Tag:company=information
     company=internet_shop: Tag:company=internet shop
     company=it: Tag:company=it
     company=logistics: Tag:company=logistics
     company=robot: Tag:company=robot
+    company=software: Tag:company=software
     company=software_development: Tag:company=software development
     company=transport: Tag:company=transport
     compensator=filter: Tag:compensator=filter
@@ -10461,9 +11678,12 @@ en:
     compensator=static_var: Tag:compensator=static var
     compensator=synchronous_condenser: Tag:compensator=synchronous condenser
     compensator=voltage_regulator: Tag:compensator=voltage regulator
+    construction:power=line: Tag:construction:power=line
+    construction:power=minor_line: Tag:construction:power=minor line
     construction:power=plant: Tag:construction:power=plant
     construction=apartments: Tag:construction=apartments
     construction=house: Tag:construction=house
+    construction=minor: Tag:construction=minor
     construction=office: Tag:construction=office
     construction=shed: Tag:construction=shed
     construction=steps: Tag:construction=steps
@@ -10487,6 +11707,7 @@ en:
     content=manure: Tag:content=manure
     content=natural_gas: Tag:content=natural gas
     content=oil: Tag:content=oil
+    content=rainwater: Tag:content=rainwater
     content=salt: Tag:content=salt
     content=sewage: Tag:content=sewage
     content=silage: Tag:content=silage
@@ -10498,6 +11719,7 @@ en:
     cooling:method=air_cooling: Tag:cooling:method=air cooling
     cooling:method=dry_cooling: Tag:cooling:method=dry cooling
     cooling:method=mechanical_draft: Tag:cooling:method=mechanical draft
+    cooling:method=natural_draft: Tag:cooling:method=natural draft
     cooperative=agricultural: Tag:cooperative=agricultural
     covered=no: Tag:covered=no
     covered=yes: Tag:covered=yes
@@ -10524,6 +11746,7 @@ en:
     craft=chimney_sweeper: Tag:craft=chimney sweeper
     craft=cleaning: Tag:craft=cleaning
     craft=clockmaker: Tag:craft=clockmaker
+    craft=clothes_mending: Tag:craft=clothes mending
     craft=confectionery: Tag:craft=confectionery
     craft=cooper: Tag:craft=cooper
     craft=dental_technician: Tag:craft=dental technician
@@ -10533,8 +11756,10 @@ en:
     craft=electrican: Tag:craft=electrican
     craft=electrician: Tag:craft=electrician
     craft=electronics_repair: Tag:craft=electronics repair
+    craft=elevator: Tag:craft=elevator
     craft=embroiderer: Tag:craft=embroiderer
     craft=engraver: Tag:craft=engraver
+    craft=fence_maker: Tag:craft=fence maker
     craft=floorer: Tag:craft=floorer
     craft=gardener: Tag:craft=gardener
     craft=glassblower: Tag:craft=glassblower
@@ -10569,10 +11794,12 @@ en:
     craft=pest_control: Tag:craft=pest control
     craft=photographer: Tag:craft=photographer
     craft=photographic_laboratory: Tag:craft=photographic laboratory
+    craft=photovoltaic: Tag:craft=photovoltaic
     craft=piano_tuner: Tag:craft=piano tuner
     craft=plasterer: Tag:craft=plasterer
     craft=plumber: Tag:craft=plumber
     craft=pottery: Tag:craft=pottery
+    craft=print_shop: Tag:craft=print shop
     craft=printer: Tag:craft=printer
     craft=printmaker: Tag:craft=printmaker
     craft=restoration: Tag:craft=restoration
@@ -10637,6 +11864,7 @@ en:
     crop=sunflower: Tag:crop=sunflower
     crop=tea: Tag:crop=tea
     crop=wheat: Tag:crop=wheat
+    crossing:markings=zebra: Tag:crossing:markings=zebra
     crossing:whistle=optional: Tag:crossing:whistle=optional
     crossing:whistle=wayside: Tag:crossing:whistle=wayside
     crossing:whistle=yes: Tag:crossing:whistle=yes
@@ -10649,8 +11877,10 @@ en:
     crossing=unmarked: Tag:crossing=unmarked
     crossing=zebra: Tag:crossing=zebra
     crossing_ref=delineated: Tag:crossing ref=delineated
+    crossing_ref=pelican: Tag:crossing ref=pelican
     crossing_ref=zebra: Tag:crossing ref=zebra
     cuisine=american: Tag:cuisine=american
+    cuisine=arab: Tag:cuisine=arab
     cuisine=arepa: Tag:cuisine=arepa
     cuisine=asian: Tag:cuisine=asian
     cuisine=açaí: Tag:cuisine=açaí
@@ -10674,11 +11904,13 @@ en:
     cuisine=dumpling: Tag:cuisine=dumpling
     cuisine=dumplings: Tag:cuisine=dumplings
     cuisine=empanada: Tag:cuisine=empanada
+    cuisine=ethiopian: Tag:cuisine=ethiopian
     cuisine=fish: Tag:cuisine=fish
     cuisine=fish_and_chips: Tag:cuisine=fish and chips
     cuisine=french: Tag:cuisine=french
     cuisine=friture: Tag:cuisine=friture
     cuisine=frozen_yogurt: Tag:cuisine=frozen yogurt
+    cuisine=georgian: Tag:cuisine=georgian
     cuisine=german: Tag:cuisine=german
     cuisine=greek: Tag:cuisine=greek
     cuisine=grill: Tag:cuisine=grill
@@ -10694,14 +11926,17 @@ en:
     cuisine=jause: Tag:cuisine=jause
     cuisine=kebab: Tag:cuisine=kebab
     cuisine=korean: Tag:cuisine=korean
+    cuisine=kurdish: Tag:cuisine=kurdish
     cuisine=mediterranean: Tag:cuisine=mediterranean
     cuisine=mexican: Tag:cuisine=mexican
+    cuisine=moroccan: Tag:cuisine=moroccan
     cuisine=noodle: Tag:cuisine=noodle
     cuisine=pakistani: Tag:cuisine=pakistani
     cuisine=pancake: Tag:cuisine=pancake
     cuisine=pasta: Tag:cuisine=pasta
     cuisine=pastry: Tag:cuisine=pastry
     cuisine=pie: Tag:cuisine=pie
+    cuisine=pie_and_mash: Tag:cuisine=pie and mash
     cuisine=pizza: Tag:cuisine=pizza
     cuisine=ramen: Tag:cuisine=ramen
     cuisine=regional: Tag:cuisine=regional
@@ -10747,23 +11982,30 @@ en:
     cycle_network=US:US: Tag:cycle network=US:US
     cycle_network=US:USA: Tag:cycle network=US:USA
     cycle_network=cycle_highway: Tag:cycle network=cycle highway
+    cycleway:both:lane=exclusive: Tag:cycleway:both:lane=exclusive
+    cycleway:both:lane=share_parking: Tag:cycleway:both:lane=share parking
     cycleway:both=lane: Tag:cycleway:both=lane
     cycleway:both=no: Tag:cycleway:both=no
     cycleway:both=separate: Tag:cycleway:both=separate
+    cycleway:both=share_busway: Tag:cycleway:both=share busway
     cycleway:both=shared_lane: Tag:cycleway:both=shared lane
     cycleway:foot=designated: Tag:cycleway:foot=designated
     cycleway:foot=no: Tag:cycleway:foot=no
+    cycleway:lane=exclusive: Tag:cycleway:lane=exclusive
+    cycleway:lane=share_parking: Tag:cycleway:lane=share parking
+    cycleway:left:lane=exclusive: Tag:cycleway:left:lane=exclusive
+    cycleway:left:lane=share_parking: Tag:cycleway:left:lane=share parking
     cycleway:left=lane: Tag:cycleway:left=lane
     cycleway:left=no: Tag:cycleway:left=no
-    cycleway:left=opposite_lane: Tag:cycleway:left=opposite lane
     cycleway:left=opposite_track: Tag:cycleway:left=opposite track
     cycleway:left=separate: Tag:cycleway:left=separate
     cycleway:left=share_busway: Tag:cycleway:left=share busway
     cycleway:left=shared_lane: Tag:cycleway:left=shared lane
     cycleway:left=track: Tag:cycleway:left=track
+    cycleway:right:lane=exclusive: Tag:cycleway:right:lane=exclusive
+    cycleway:right:lane=share_parking: Tag:cycleway:right:lane=share parking
     cycleway:right=lane: Tag:cycleway:right=lane
     cycleway:right=no: Tag:cycleway:right=no
-    cycleway:right=opposite_lane: Tag:cycleway:right=opposite lane
     cycleway:right=opposite_track: Tag:cycleway:right=opposite track
     cycleway:right=separate: Tag:cycleway:right=separate
     cycleway:right=share_busway: Tag:cycleway:right=share busway
@@ -10774,6 +12016,7 @@ en:
     cycleway=bike_box: Tag:cycleway=bike box
     cycleway=crossing: Tag:cycleway=crossing
     cycleway=lane: Tag:cycleway=lane
+    cycleway=link: Tag:cycleway=link
     cycleway=no: Tag:cycleway=no
     cycleway=opposite: Tag:cycleway=opposite
     cycleway=opposite_lane: Tag:cycleway=opposite lane
@@ -10788,6 +12031,8 @@ en:
     cycleway=sidepath: Tag:cycleway=sidepath
     cycleway=sidewalk: Tag:cycleway=sidewalk
     cycleway=track: Tag:cycleway=track
+    cycleway=traffic_island: Tag:cycleway=traffic island
+    cycling=pump_track: Tag:cycling=pump track
     damage:event=war: Tag:damage:event=war
     damage:type=explosion: Tag:damage:type=explosion
     damage:type=war: Tag:damage:type=war
@@ -10797,17 +12042,21 @@ en:
     defensive=keep: Tag:defensive=keep
     defensive_works=bastion: Tag:defensive works=bastion
     defensive_works=battery: Tag:defensive works=battery
+    defensive_works=ravelin: Tag:defensive works=ravelin
     delivery=shipment: Tag:delivery=shipment
     demolished=yes: Tag:demolished=yes
     dennert_fir_tree=yes: Tag:dennert fir tree=yes
+    denomination=bosnian_church: Tag:denomination=bosnian church
     denomination=catholic: Tag:denomination=catholic
     denomination=iglesia_filipina_independiente: Tag:denomination=iglesia filipina
       independiente
+    denomination=jehovahs_witness: Tag:denomination=jehovahs witness
     denomination=jodo_shinshu: Tag:denomination=jodo shinshu
     denomination=jodo_shu: Tag:denomination=jodo shu
     denomination=la_luz_del_mundo: Tag:denomination=la luz del mundo
     denomination=mormon: Tag:denomination=mormon
     denomination=nichiren: Tag:denomination=nichiren
+    denomination=polish_orthodox: Tag:denomination=polish orthodox
     denomination=reformed: Tag:denomination=reformed
     denomination=shingon_shu: Tag:denomination=shingon shu
     denomination=soto: Tag:denomination=soto
@@ -10817,9 +12066,11 @@ en:
     denotation=cluster: Tag:denotation=cluster
     denotation=landmark: Tag:denotation=landmark
     denotation=natural_monument: Tag:denotation=natural monument
+    denotation=park: Tag:denotation=park
     denotation=urban: Tag:denotation=urban
     denotation=windbreak: Tag:denotation=windbreak
     designation=barangay: Tag:designation=barangay
+    designation=bathing_water: Tag:designation=bathing water
     designation=byway_open_to_all_traffic: Tag:designation=byway open to all traffic
     designation=civil_parish: Tag:designation=civil parish
     designation=common: Tag:designation=common
@@ -10845,7 +12096,9 @@ en:
     disc_golf=basket: Tag:disc golf=basket
     disc_golf=hole: Tag:disc golf=hole
     disc_golf=tee: Tag:disc golf=tee
-    distillery=whisky: Tag:distillery=whisky
+    display=sundial: Tag:display=sundial
+    display_operated=yes: Tag:display operated=yes
+    disused:amenity=fountain: Tag:disused:amenity=fountain
     disused:landuse=landfill: Tag:disused:landuse=landfill
     disused:landuse=quarry: Tag:disused:landuse=quarry
     disused:railway=halt: Tag:disused:railway=halt
@@ -10862,6 +12115,11 @@ en:
     dog=outside: Tag:dog=outside
     dog=unleashed: Tag:dog=unleashed
     dog=yes: Tag:dog=yes
+    drink:viez=bottled: Tag:drink:viez=bottled
+    drink:viez=draught: Tag:drink:viez=draught
+    drink:viez=served: Tag:drink:viez=served
+    drink:viez=takeaway: Tag:drink:viez=takeaway
+    drink:viez=yes: Tag:drink:viez=yes
     drink=beer: Tag:drink=beer
     driveway=pipestem: Tag:driveway=pipestem
     dual_carriageway=no: Tag:dual carriageway=no
@@ -10882,6 +12140,7 @@ en:
     embassy=nunciature: Tag:embassy=nunciature
     embassy=residence: Tag:embassy=residence
     embassy=yes: Tag:embassy=yes
+    embedded_rails=tram: Tag:embedded rails=tram
     emergency:social_facility:for=displaced_people: Tag:emergency:social facility:for=displaced
       people
     emergency:social_facility=shelter: Tag:emergency:social facility=shelter
@@ -10921,6 +12180,7 @@ en:
     emergency=key_depot: Tag:emergency=key depot
     emergency=ladder_site: Tag:emergency=ladder site
     emergency=landing_site: Tag:emergency=landing site
+    emergency=leader_site: Tag:emergency=leader site
     emergency=life_ring: Tag:emergency=life ring
     emergency=lifeboat_station: Tag:emergency=lifeboat station
     emergency=lifeguard: Tag:emergency=lifeguard
@@ -10942,6 +12202,7 @@ en:
     emergency=sprinkler: Tag:emergency=sprinkler
     emergency=sprinkler_connection: Tag:emergency=sprinkler connection
     emergency=standpipe: Tag:emergency=standpipe
+    emergency=stretcher: Tag:emergency=stretcher
     emergency=suction_point: Tag:emergency=suction point
     emergency=throw_bag: Tag:emergency=throw bag
     emergency=water_rescue: Tag:emergency=water rescue
@@ -10950,6 +12211,7 @@ en:
     emergency=wet_riser: Tag:emergency=wet riser
     emergency=yes: Tag:emergency=yes
     emergency_service=technical: Tag:emergency service=technical
+    enforcement=average_speed: Tag:enforcement=average speed
     entrance=entrance: Tag:entrance=entrance
     entrance=exit: Tag:entrance=exit
     entrance=fire_exit: Tag:entrance=fire exit
@@ -10963,6 +12225,7 @@ en:
     entrance=yes: Tag:entrance=yes
     esperanto=yes: Tag:esperanto=yes
     exit=emergency: Tag:exit=emergency
+    factory_outlet=yes: Tag:factory outlet=yes
     faculty=aerospace: Tag:faculty=aerospace
     faculty=engineering: Tag:faculty=engineering
     farmland=arable: Tag:farmland=arable
@@ -10971,6 +12234,7 @@ en:
     fast_food=cafeteria: Tag:fast food=cafeteria
     fcode=45800: Tag:fcode=45800
     fence_type=railing: Tag:fence type=railing
+    fence_type=wood_bollard: Tag:fence type=wood bollard
     fire_hydrant:position=green: Tag:fire hydrant:position=green
     fire_hydrant:position=lane: Tag:fire hydrant:position=lane
     fire_hydrant:position=parking_lot: Tag:fire hydrant:position=parking lot
@@ -10989,6 +12253,9 @@ en:
     fire_sprinkler=pre-action: Tag:fire sprinkler=pre-action
     fire_sprinkler=wet: Tag:fire sprinkler=wet
     fire_sprinkler=yes: Tag:fire sprinkler=yes
+    fitness_station=horizontal_bar: Tag:fitness station=horizontal bar
+    fitness_station=sit-up: Tag:fitness station=sit-up
+    fitness_station=squat: Tag:fitness station=squat
     fixme=Position_estimated: Tag:fixme=Position estimated
     fixme=name: Tag:fixme=name
     fixme=position_estimated: Tag:fixme=position estimated
@@ -11005,6 +12272,7 @@ en:
     floating=yes: Tag:floating=yes
     flood_mark=painting: Tag:flood mark=painting
     flood_mark=plaque: Tag:flood mark=plaque
+    flood_prone=yes: Tag:flood prone=yes
     floor:material=wood: Tag:floor:material=wood
     flow_direction=both: Tag:flow direction=both
     foldable_pie_slice: Tag:foldable pie slice
@@ -11023,9 +12291,12 @@ en:
     footway=both: Tag:footway=both
     footway=crossing: Tag:footway=crossing
     footway=left: Tag:footway=left
+    footway=link: Tag:footway=link
     footway=none: Tag:footway=none
     footway=path: Tag:footway=path
+    footway=residential: Tag:footway=residential
     footway=right: Tag:footway=right
+    footway=service: Tag:footway=service
     footway=sidewalk: Tag:footway=sidewalk
     footway=traffic_island: Tag:footway=traffic island
     footway=yes: Tag:footway=yes
@@ -11040,6 +12311,7 @@ en:
     fortification_type=ringfort: Tag:fortification type=ringfort
     fortification_type=sconce: Tag:fortification type=sconce
     fountain=bubbler: Tag:fountain=bubbler
+    fountain=decorative: Tag:fountain=decorative
     fountain=drinking: Tag:fountain=drinking
     fountain=nasone: Tag:fountain=nasone
     fountain=roman_wolf: Tag:fountain=roman wolf
@@ -11051,6 +12323,7 @@ en:
     garden:type=arboretum: Tag:garden:type=arboretum
     garden:type=botanical: Tag:garden:type=botanical
     garden:type=monastery: Tag:garden:type=monastery
+    garden:type=residential: Tag:garden:type=residential
     generator:method=anaerobic_digestion: Tag:generator:method=anaerobic digestion
     generator:method=barrage: Tag:generator:method=barrage
     generator:method=combustion: Tag:generator:method=combustion
@@ -11083,6 +12356,7 @@ en:
     generator:source=biomass: Tag:generator:source=biomass
     generator:source=coal: Tag:generator:source=coal
     generator:source=diesel: Tag:generator:source=diesel
+    generator:source=electricity: Tag:generator:source=electricity
     generator:source=gas: Tag:generator:source=gas
     generator:source=gasoline: Tag:generator:source=gasoline
     generator:source=geothermal: Tag:generator:source=geothermal
@@ -11116,24 +12390,42 @@ en:
     generator:type=water_wheel: Tag:generator:type=water wheel
     generator:type=zuppinger_water_wheel: Tag:generator:type=zuppinger water wheel
     genus=Acer: Tag:genus=Acer
+    genus=Platanus: Tag:genus=Platanus
+    genus=Quercus: Tag:genus=Quercus
+    genus=Tilia: Tag:genus=Tilia
     geological=columnar_jointing: Tag:geological=columnar jointing
+    geological=cone: Tag:geological=cone
+    geological=dike: Tag:geological=dike
+    geological=dyke: Tag:geological=dyke
     geological=fault: Tag:geological=fault
+    geological=fold: Tag:geological=fold
     geological=giants_kettle: Tag:geological=giants kettle
     geological=glacial_erratic: Tag:geological=glacial erratic
     geological=hoodoo: Tag:geological=hoodoo
+    geological=inselberg: Tag:geological=inselberg
+    geological=limestone_pavement: Tag:geological=limestone pavement
     geological=meteor_crater: Tag:geological=meteor crater
+    geological=monocline: Tag:geological=monocline
     geological=moraine: Tag:geological=moraine
     geological=outcrop: Tag:geological=outcrop
     geological=palaeontological_site: Tag:geological=palaeontological site
+    geological=pingo: Tag:geological=pingo
     geological=rock_glacier: Tag:geological=rock glacier
+    geological=sinkhole: Tag:geological=sinkhole
+    geological=tor: Tag:geological=tor
+    geological=unconformity: Tag:geological=unconformity
     geological=volcanic_caldera: Tag:geological=volcanic caldera
     geological=volcanic_caldera_rim: Tag:geological=volcanic caldera rim
+    geological=volcanic_lava_channel: Tag:geological=volcanic lava channel
     geological=volcanic_lava_field: Tag:geological=volcanic lava field
     geological=volcanic_lava_flow: Tag:geological=volcanic lava flow
+    geological=volcanic_lava_tube: Tag:geological=volcanic lava tube
     geological=volcanic_vent: Tag:geological=volcanic vent
     glacier:type=mountain: Tag:glacier:type=mountain
     glacier:type=rock: Tag:glacier:type=rock
     glideslope=yes: Tag:glideslope=yes
+    golf:course=driving_range: Tag:golf:course=driving range
+    golf:course=pitch_and_putt: Tag:golf:course=pitch and putt
     golf=bunker: Tag:golf=bunker
     golf=cartpath: Tag:golf=cartpath
     golf=clubhouse: Tag:golf=clubhouse
@@ -11142,6 +12434,7 @@ en:
     golf=green: Tag:golf=green
     golf=hole: Tag:golf=hole
     golf=lateral_water_hazard: Tag:golf=lateral water hazard
+    golf=out_of_bounds: Tag:golf=out of bounds
     golf=path: Tag:golf=path
     golf=penalty_area: Tag:golf=penalty area
     golf=pin: Tag:golf=pin
@@ -11150,13 +12443,13 @@ en:
     golf=water_hazard: Tag:golf=water hazard
     government=administrative: Tag:government=administrative
     government=aerospace: Tag:government=aerospace
-    government=archive: Tag:government=archive
     government=audit: Tag:government=audit
     government=bailiff: Tag:government=bailiff
     government=border_control: Tag:government=border control
     government=building_control: Tag:government=building control
     government=building_inspection: Tag:government=building inspection
     government=cadaster: Tag:government=cadaster
+    government=chamber_of_commerce: Tag:government=chamber of commerce
     government=culture: Tag:government=culture
     government=customs: Tag:government=customs
     government=data_protection: Tag:government=data protection
@@ -11174,6 +12467,7 @@ en:
     government=statistics: Tag:government=statistics
     government=tax: Tag:government=tax
     government=transportation: Tag:government=transportation
+    government=watercourse_management: Tag:government=watercourse management
     government=youth_welfare_department: Tag:government=youth welfare department
     grass=amenity_grassland: Tag:grass=amenity grassland
     grit_bin: Tag:grit bin
@@ -11183,9 +12477,13 @@ en:
     guest_house=kontrakan: Tag:guest house=kontrakan
     guest_house=student_accomodation: Tag:guest house=student accomodation
     guidepost=simple: Tag:guidepost=simple
+    hairdresser=barber: Tag:hairdresser=barber
     handle=crank: Tag:handle=crank
     handle=lever: Tag:handle=lever
     handle=wheel: Tag:handle=wheel
+    handrail=yes: Tag:handrail=yes
+    harassement_prevention=ask_angela: Tag:harassement prevention=ask angela
+    harassment_prevention=ask_angela: Tag:harassment prevention=ask angela
     harbour:category=RoRo: Tag:harbour:category=RoRo
     harbour:category=bulk: Tag:harbour:category=bulk
     harbour:category=container: Tag:harbour:category=container
@@ -11209,16 +12507,20 @@ en:
     hazard=biohazard: Tag:hazard=biohazard
     hazard=bump: Tag:hazard=bump
     hazard=children: Tag:hazard=children
+    hazard=cliff: Tag:hazard=cliff
     hazard=contamination: Tag:hazard=contamination
+    hazard=contraflow: Tag:hazard=contraflow
     hazard=curve: Tag:hazard=curve
     hazard=curves: Tag:hazard=curves
     hazard=cyclists: Tag:hazard=cyclists
     hazard=damaged_road: Tag:hazard=damaged road
     hazard=dangerous_junction: Tag:hazard=dangerous junction
+    hazard=deer: Tag:hazard=deer
     hazard=dip: Tag:hazard=dip
     hazard=electricity: Tag:hazard=electricity
     hazard=emergency_vehicles: Tag:hazard=emergency vehicles
     hazard=falling_rocks: Tag:hazard=falling rocks
+    hazard=falling_trees: Tag:hazard=falling trees
     hazard=flood: Tag:hazard=flood
     hazard=flooding: Tag:hazard=flooding
     hazard=fog: Tag:hazard=fog
@@ -11235,6 +12537,7 @@ en:
     hazard=low_flying_aircraft: Tag:hazard=low flying aircraft
     hazard=minefield: Tag:hazard=minefield
     hazard=nuclear: Tag:hazard=nuclear
+    hazard=pedestrian_crossing: Tag:hazard=pedestrian crossing
     hazard=pedestrians: Tag:hazard=pedestrians
     hazard=queues_likely: Tag:hazard=queues likely
     hazard=quicksand: Tag:hazard=quicksand
@@ -11262,6 +12565,7 @@ en:
     healthcare:speciality=allergology: Tag:healthcare:speciality=allergology
     healthcare:speciality=anaesthetics: Tag:healthcare:speciality=anaesthetics
     healthcare:speciality=analytic: Tag:healthcare:speciality=analytic
+    healthcare:speciality=angiology: Tag:healthcare:speciality=angiology
     healthcare:speciality=animal-assisted: Tag:healthcare:speciality=animal-assisted
     healthcare:speciality=behavior: Tag:healthcare:speciality=behavior
     healthcare:speciality=biochemistry: Tag:healthcare:speciality=biochemistry
@@ -11287,7 +12591,8 @@ en:
       radiology
     healthcare:speciality=emergency: Tag:healthcare:speciality=emergency
     healthcare:speciality=endocrinology: Tag:healthcare:speciality=endocrinology
-    healthcare:speciality=expressive: Tag:healthcare:speciality=expressive
+    healthcare:speciality=equine-assisted: Tag:healthcare:speciality=equine-assisted
+    healthcare:speciality=family_planning: Tag:healthcare:speciality=family planning
     healthcare:speciality=fertility: Tag:healthcare:speciality=fertility
     healthcare:speciality=gastroenterological_surgery: Tag:healthcare:speciality=gastroenterological
       surgery
@@ -11299,6 +12604,7 @@ en:
     healthcare:speciality=hepatology: Tag:healthcare:speciality=hepatology
     healthcare:speciality=humanistic: Tag:healthcare:speciality=humanistic
     healthcare:speciality=immunology: Tag:healthcare:speciality=immunology
+    healthcare:speciality=implantology: Tag:healthcare:speciality=implantology
     healthcare:speciality=infectious_diseases: Tag:healthcare:speciality=infectious
       diseases
     healthcare:speciality=intensive: Tag:healthcare:speciality=intensive
@@ -11333,9 +12639,8 @@ en:
     healthcare:speciality=pulmonology: Tag:healthcare:speciality=pulmonology
     healthcare:speciality=radiology: Tag:healthcare:speciality=radiology
     healthcare:speciality=radiotherapy: Tag:healthcare:speciality=radiotherapy
+    healthcare:speciality=rehabilitation: Tag:healthcare:speciality=rehabilitation
     healthcare:speciality=rheumatology: Tag:healthcare:speciality=rheumatology
-    healthcare:speciality=schema: Tag:healthcare:speciality=schema
-    healthcare:speciality=socio: Tag:healthcare:speciality=socio
     healthcare:speciality=stomatology: Tag:healthcare:speciality=stomatology
     healthcare:speciality=surgery: Tag:healthcare:speciality=surgery
     healthcare:speciality=surgical_oncology: Tag:healthcare:speciality=surgical oncology
@@ -11374,6 +12679,7 @@ en:
     healthcare=pharmacy: Tag:healthcare=pharmacy
     healthcare=physiotherapist: Tag:healthcare=physiotherapist
     healthcare=podiatrist: Tag:healthcare=podiatrist
+    healthcare=postpartum_care: Tag:healthcare=postpartum care
     healthcare=psychotherapist: Tag:healthcare=psychotherapist
     healthcare=rehabilitation: Tag:healthcare=rehabilitation
     healthcare=sample_collection: Tag:healthcare=sample collection
@@ -11384,6 +12690,7 @@ en:
     heritage:operator=BLfD: Tag:heritage:operator=BLfD
     heritage:operator=kons: Tag:heritage:operator=kons
     heritage:operator=nrhp: Tag:heritage:operator=nrhp
+    heritage:operator=rce: Tag:heritage:operator=rce
     hgv=discouraged: Tag:hgv=discouraged
     hgv=no: Tag:hgv=no
     hgv=yes: Tag:hgv=yes
@@ -11395,11 +12702,13 @@ en:
     highway=bus_stop: Tag:highway=bus stop
     highway=busway: Tag:highway=busway
     highway=cattle_grid: Tag:highway=cattle grid
+    highway=chemin_de_ronde: Tag:highway=chemin de ronde
     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=cyclist_waiting_aid: Tag:highway=cyclist waiting aid
     highway=disused: Tag:highway=disused
     highway=elevator: Tag:highway=elevator
     highway=emergency_access_point: Tag:highway=emergency access point
@@ -11409,6 +12718,7 @@ en:
     highway=ford: Tag:highway=ford
     highway=gate: Tag:highway=gate
     highway=give_way: Tag:highway=give way
+    highway=ladder: Tag:highway=ladder
     highway=living_street: Tag:highway=living street
     highway=milestone: Tag:highway=milestone
     highway=mini_roundabout: Tag:highway=mini roundabout
@@ -11421,6 +12731,7 @@ en:
     highway=passing_place: Tag:highway=passing place
     highway=path: Tag:highway=path
     highway=pedestrian: Tag:highway=pedestrian
+    highway=piste: Tag:highway=piste
     highway=planned: Tag:highway=planned
     highway=platform: Tag:highway=platform
     highway=primary: Tag:highway=primary
@@ -11470,6 +12781,7 @@ en:
     historic=bomb_crater: Tag:historic=bomb crater
     historic=boundary_stone: Tag:historic=boundary stone
     historic=building: Tag:historic=building
+    historic=bullaun_stone: Tag:historic=bullaun stone
     historic=cannon: Tag:historic=cannon
     historic=castle: Tag:historic=castle
     historic=castle_wall: Tag:historic=castle wall
@@ -11481,6 +12793,7 @@ en:
     historic=citywalls: Tag:historic=citywalls
     historic=creamery: Tag:historic=creamery
     historic=district: Tag:historic=district
+    historic=epigraph: Tag:historic=epigraph
     historic=farm: Tag:historic=farm
     historic=flood_mark: Tag:historic=flood mark
     historic=folly: Tag:historic=folly
@@ -11491,7 +12804,10 @@ en:
     historic=highwater_mark: Tag:historic=highwater mark
     historic=hollow_way: Tag:historic=hollow way
     historic=house: Tag:historic=house
+    historic=lavoir: Tag:historic=lavoir
+    historic=lime_kiln: Tag:historic=lime kiln
     historic=locomotive: Tag:historic=locomotive
+    historic=machine: Tag:historic=machine
     historic=manor: Tag:historic=manor
     historic=market_cross: Tag:historic=market cross
     historic=martello_tower: Tag:historic=martello tower
@@ -11499,8 +12815,10 @@ en:
     historic=memorial: Tag:historic=memorial
     historic=meteor_crater: Tag:historic=meteor crater
     historic=milestone: Tag:historic=milestone
+    historic=millstone: Tag:historic=millstone
     historic=mine: Tag:historic=mine
     historic=mine_shaft: Tag:historic=mine shaft
+    historic=minecart: Tag:historic=minecart
     historic=missile: Tag:historic=missile
     historic=monastery: Tag:historic=monastery
     historic=monument: Tag:historic=monument
@@ -11510,9 +12828,12 @@ en:
     historic=pa: Tag:historic=pa
     historic=paleontological_site: Tag:historic=paleontological site
     historic=pillory: Tag:historic=pillory
+    historic=police_call_box: Tag:historic=police call box
+    historic=pound: Tag:historic=pound
     historic=railway_car: Tag:historic=railway car
     historic=rampart: Tag:historic=rampart
     historic=road: Tag:historic=road
+    historic=round_tower: Tag:historic=round tower
     historic=ruins: Tag:historic=ruins
     historic=rune_stone: Tag:historic=rune stone
     historic=shieling: Tag:historic=shieling
@@ -11554,6 +12875,7 @@ en:
     incline=up: Tag:incline=up
     incline=up/down: Tag:incline=up/down
     indoor=area: Tag:indoor=area
+    indoor=column: Tag:indoor=column
     indoor=corridor: Tag:indoor=corridor
     indoor=door: Tag:indoor=door
     indoor=room: Tag:indoor=room
@@ -11564,36 +12886,44 @@ en:
     industrial=aluminium_smelting: Tag:industrial=aluminium smelting
     industrial=asphalt_plant: Tag:industrial=asphalt plant
     industrial=auto_wrecker: Tag:industrial=auto wrecker
+    industrial=automotive_parts: Tag:industrial=automotive parts
     industrial=bakery: Tag:industrial=bakery
     industrial=brewery: Tag:industrial=brewery
-    industrial=brickworks: Tag:industrial=brickworks
     industrial=brickyard: Tag:industrial=brickyard
     industrial=communication: Tag:industrial=communication
     industrial=concrete_plant: Tag:industrial=concrete plant
     industrial=construction_company: Tag:industrial=construction company
+    industrial=container_stacking: Tag:industrial=container stacking
     industrial=data_centre: Tag:industrial=data centre
     industrial=depot: Tag:industrial=depot
     industrial=distributor: Tag:industrial=distributor
+    industrial=electrical: Tag:industrial=electrical
     industrial=factory: Tag:industrial=factory
     industrial=fish_farm: Tag:industrial=fish farm
     industrial=food_industry: Tag:industrial=food industry
     industrial=food_processing: Tag:industrial=food processing
     industrial=furniture: Tag:industrial=furniture
     industrial=gas: Tag:industrial=gas
+    industrial=gas_plant: Tag:industrial=gas plant
+    industrial=gas_storage: Tag:industrial=gas storage
     industrial=grinding_mill: Tag:industrial=grinding mill
     industrial=heating_station: Tag:industrial=heating station
     industrial=ice_factory: Tag:industrial=ice factory
     industrial=integrated_circuit: Tag:industrial=integrated circuit
+    industrial=logistics: Tag:industrial=logistics
     industrial=machine_shop: Tag:industrial=machine shop
     industrial=metal_processing: Tag:industrial=metal processing
     industrial=mine: Tag:industrial=mine
     industrial=mobile_equipment: Tag:industrial=mobile equipment
     industrial=oil: Tag:industrial=oil
     industrial=oil_mill: Tag:industrial=oil mill
+    industrial=petroleum_terminal: Tag:industrial=petroleum terminal
+    industrial=plastic_processing: Tag:industrial=plastic processing
     industrial=port: Tag:industrial=port
     industrial=quarry: Tag:industrial=quarry
     industrial=recycling: Tag:industrial=recycling
     industrial=refinery: Tag:industrial=refinery
+    industrial=refrigerated_warehouse: Tag:industrial=refrigerated warehouse
     industrial=rice_mill: Tag:industrial=rice mill
     industrial=rocket_engine_test: Tag:industrial=rocket engine test
     industrial=salt_pond: Tag:industrial=salt pond
@@ -11601,11 +12931,15 @@ en:
     industrial=scrap_yard: Tag:industrial=scrap yard
     industrial=shipyard: Tag:industrial=shipyard
     industrial=slaughterhouse: Tag:industrial=slaughterhouse
+    industrial=steel_mill: Tag:industrial=steel mill
     industrial=steelmaking: Tag:industrial=steelmaking
+    industrial=trucking: Tag:industrial=trucking
     industrial=warehouse: Tag:industrial=warehouse
     industrial=well_cluster: Tag:industrial=well cluster
     industrial=wellsite: Tag:industrial=wellsite
     industrial=winery: Tag:industrial=winery
+    informal=no: Tag:informal=no
+    informal=yes: Tag:informal=yes
     information=audioguide: Tag:information=audioguide
     information=board: Tag:information=board
     information=finger-post: Tag:information=finger-post
@@ -11614,12 +12948,14 @@ en:
     information=guidepost: Tag:information=guidepost
     information=map: Tag:information=map
     information=office: Tag:information=office
+    information=post: Tag:information=post
     information=route_marker: Tag:information=route marker
     information=sign: Tag:information=sign
     information=stele: Tag:information=stele
     information=tactile_map: Tag:information=tactile map
     information=tactile_model: Tag:information=tactile model
     information=terminal: Tag:information=terminal
+    information=trail_blaze: Tag:information=trail blaze
     information=visitor_centre: Tag:information=visitor centre
     inlet=bell_mouth: Tag:inlet=bell mouth
     inlet=direct: Tag:inlet=direct
@@ -11654,6 +12990,7 @@ en:
     landcover=gravel: Tag:landcover=gravel
     landcover=greenery: Tag:landcover=greenery
     landcover=hedge: Tag:landcover=hedge
+    landcover=mostly_rock: Tag:landcover=mostly rock
     landcover=sand: Tag:landcover=sand
     landcover=shrub: Tag:landcover=shrub
     landcover=shrubland: Tag:landcover=shrubland
@@ -11766,10 +13103,10 @@ en:
     landuse=winter_sport: Tag:landuse=winter sport
     landuse=winter_sports: Tag:landuse=winter sports
     landuse=wood: Tag:landuse=wood
-    landuse=wood_(Don't_use): Tag:landuse=wood (Don't use)
     landuse=yes: Tag:landuse=yes
     lane=buffered: Tag:lane=buffered
     lane_markings=no: Tag:lane markings=no
+    lane_markings=yes: Tag:lane markings=yes
     lawyer=bailiff: Tag:lawyer=bailiff
     lawyer=notary: Tag:lawyer=notary
     leaf_cycle=deciduous: Tag:leaf cycle=deciduous
@@ -11781,6 +13118,7 @@ en:
     leaf_type=leafless: Tag:leaf type=leafless
     leaf_type=mixed: Tag:leaf type=mixed
     leaf_type=needleleaved: Tag:leaf type=needleleaved
+    leaf_type=palm: Tag:leaf type=palm
     leisure=Red_Light_District: Tag:leisure=Red Light District
     leisure=adult_gaming_centre: Tag:leisure=adult gaming centre
     leisure=amusement_arcade: Tag:leisure=amusement arcade
@@ -11797,6 +13135,8 @@ en:
     leisure=bleachers: Tag:leisure=bleachers
     leisure=bowling_alley: Tag:leisure=bowling alley
     leisure=casino: Tag:leisure=casino
+    leisure=children_club: Tag:leisure=children club
+    leisure=climbing: Tag:leisure=climbing
     leisure=club: Tag:leisure=club
     leisure=club_house: Tag:leisure=club house
     leisure=common: Tag:leisure=common
@@ -11812,11 +13152,13 @@ en:
     leisure=fitness_centre: Tag:leisure=fitness centre
     leisure=fitness_station: Tag:leisure=fitness station
     leisure=foot_bath: Tag:leisure=foot bath
+    leisure=fox_covert: Tag:leisure=fox covert
     leisure=gambling: Tag:leisure=gambling
     leisure=garden: Tag:leisure=garden
     leisure=golf_course: Tag:leisure=golf course
     leisure=hackerspace: Tag:leisure=hackerspace
     leisure=hammock: Tag:leisure=hammock
+    leisure=high_ropes_course: Tag:leisure=high ropes course
     leisure=horse_riding: Tag:leisure=horse riding
     leisure=hot_spring: Tag:leisure=hot spring
     leisure=hot_tub: Tag:leisure=hot tub
@@ -11838,6 +13180,7 @@ en:
     leisure=pitch: Tag:leisure=pitch
     leisure=playground: Tag:leisure=playground
     leisure=practice_pitch: Tag:leisure=practice pitch
+    leisure=rage_room: Tag:leisure=rage room
     leisure=recreation_centre: Tag:leisure=recreation centre
     leisure=recreation_ground: Tag:leisure=recreation ground
     leisure=red_light_district: Tag:leisure=red light district
@@ -11900,7 +13243,6 @@ en:
     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=cave: Tag:location=cave
     location=indoor: Tag:location=indoor
@@ -11912,6 +13254,7 @@ en:
     location=surface: Tag:location=surface
     location=underground: Tag:location=underground
     location=underwater: Tag:location=underwater
+    logistics=aerospace: Tag:logistics=aerospace
     logistics=goods_distribution: Tag:logistics=goods distribution
     logistics=railway: Tag:logistics=railway
     logistics=spaceflight: Tag:logistics=spaceflight
@@ -11921,6 +13264,7 @@ en:
     man_made=adit: Tag:man made=adit
     man_made=advertising: Tag:man made=advertising
     man_made=aircraft: Tag:man made=aircraft
+    man_made=animal_ramp: Tag:man made=animal ramp
     man_made=animal_trap: Tag:man made=animal trap
     man_made=antenna: Tag:man made=antenna
     man_made=archimedes_screw: Tag:man made=archimedes screw
@@ -11934,6 +13278,7 @@ en:
     man_made=bioswale: Tag:man made=bioswale
     man_made=bird_feeder: Tag:man made=bird feeder
     man_made=bird_perch: Tag:man made=bird perch
+    man_made=birdhouse: Tag:man made=birdhouse
     man_made=borehole: Tag:man made=borehole
     man_made=breakwater: Tag:man made=breakwater
     man_made=bridge: Tag:man made=bridge
@@ -11952,6 +13297,7 @@ en:
     man_made=column: Tag:man made=column
     man_made=communications_tower: Tag:man made=communications tower
     man_made=compass_rose: Tag:man made=compass rose
+    man_made=composting_plant: Tag:man made=composting plant
     man_made=compressor: Tag:man made=compressor
     man_made=cooling: Tag:man made=cooling
     man_made=cooling_tower: Tag:man made=cooling tower
@@ -11968,11 +13314,14 @@ en:
     man_made=duck_decoy: Tag:man made=duck decoy
     man_made=dyke: Tag:man made=dyke
     man_made=embankment: Tag:man made=embankment
+    man_made=eruv_lechi: Tag:man made=eruv lechi
+    man_made=eruv_string: Tag:man made=eruv string
     man_made=excavation: Tag:man made=excavation
     man_made=ferry_cable: Tag:man made=ferry cable
     man_made=flagpole: Tag:man made=flagpole
     man_made=flare: Tag:man made=flare
     man_made=floating_storage: Tag:man made=floating storage
+    man_made=flowerbed: Tag:man made=flowerbed
     man_made=footwear_decontamination: Tag:man made=footwear decontamination
     man_made=foundation: Tag:man made=foundation
     man_made=frost_fan: Tag:man made=frost fan
@@ -11989,6 +13338,7 @@ en:
     man_made=groyne: Tag:man made=groyne
     man_made=guard_stone: Tag:man made=guard stone
     man_made=guy: Tag:man made=guy
+    man_made=guy_insulator: Tag:man made=guy insulator
     man_made=guy_wire: Tag:man made=guy wire
     man_made=heap: Tag:man made=heap
     man_made=hongsalmun: Tag:man made=hongsalmun
@@ -12096,8 +13446,11 @@ en:
     manhole=drain: Tag:manhole=drain
     manhole=telecom: Tag:manhole=telecom
     map_type=topo: Tag:map type=topo
+    map_type=toposcope: Tag:map type=toposcope
     maritime=yes: Tag:maritime=yes
     marker=aerial: Tag:marker=aerial
+    marker=borderpole: Tag:marker=borderpole
+    marker=borderstone: Tag:marker=borderstone
     marker=ground: Tag:marker=ground
     marker=paddle: Tag:marker=paddle
     marker=pedestal: Tag:marker=pedestal
@@ -12107,12 +13460,14 @@ en:
     material=concrete: Tag:material=concrete
     material=epoxy: Tag:material=epoxy
     material=paving_stones: Tag:material=paving stones
+    material=tufa: Tag:material=tufa
     maxheight=default: Tag:maxheight=default
     maxspeed:type=GB:motorway: Tag:maxspeed:type=GB:motorway
     maxspeed:type=GB:nsl_dual: Tag:maxspeed:type=GB:nsl dual
     maxspeed:type=GB:nsl_restricted: Tag:maxspeed:type=GB:nsl restricted
     maxspeed:type=GB:nsl_single: Tag:maxspeed:type=GB:nsl single
     maxspeed:type=GB:zone20: Tag:maxspeed:type=GB:zone20
+    maxspeed:type=GB:zone40: Tag:maxspeed:type=GB:zone40
     maxspeed:type=NL:living_street: Tag:maxspeed:type=NL:living street
     maxspeed:type=NL:motorroad: Tag:maxspeed:type=NL:motorroad
     maxspeed:type=NL:motorway: Tag:maxspeed:type=NL:motorway
@@ -12120,9 +13475,11 @@ en:
     maxspeed:type=NL:urban: Tag:maxspeed:type=NL:urban
     maxspeed:type=PL:rural: Tag:maxspeed:type=PL:rural
     maxspeed:type=PL:urban: Tag:maxspeed:type=PL:urban
+    maxspeed:type=construction: Tag:maxspeed:type=construction
     maxspeed:type=sign: Tag:maxspeed:type=sign
     maxspeed=implicit: Tag:maxspeed=implicit
     maxweight:signed=no: Tag:maxweight:signed=no
+    meadow=meadow_orchard: Tag:meadow=meadow orchard
     meadow=paddock: Tag:meadow=paddock
     meadow=pasture: Tag:meadow=pasture
     mechanical_coupling=nodding_donkey: Tag:mechanical coupling=nodding donkey
@@ -12145,6 +13502,8 @@ en:
     megalith_type=nuraghe: Tag:megalith type=nuraghe
     megalith_type=passage_grave: Tag:megalith type=passage grave
     megalith_type=ring_cairn: Tag:megalith type=ring cairn
+    megalith_type=round_barrow: Tag:megalith type=round barrow
+    megalith_type=stećak: Tag:megalith type=stećak
     megalith_type=stone_circle: Tag:megalith type=stone circle
     megalith_type=stone_ship: Tag:megalith type=stone ship
     megalith_type=tholos: Tag:megalith type=tholos
@@ -12166,9 +13525,11 @@ en:
     memorial=khachkar: Tag:memorial=khachkar
     memorial=obelisk: Tag:memorial=obelisk
     memorial=plaque: Tag:memorial=plaque
+    memorial=pulpulak: Tag:memorial=pulpulak
     memorial=sculpture: Tag:memorial=sculpture
     memorial=statue: Tag:memorial=statue
     memorial=stele: Tag:memorial=stele
+    memorial=stolperschwelle: Tag:memorial=stolperschwelle
     memorial=stolperstein: Tag:memorial=stolperstein
     memorial=stone: Tag:memorial=stone
     memorial=storm_surge_post: Tag:memorial=storm surge post
@@ -12203,6 +13564,7 @@ en:
     military_service=marines: Tag:military service=marines
     military_service=navy: Tag:military service=navy
     mofa=use_sidepath: Tag:mofa=use sidepath
+    monastery:type=friary: Tag:monastery:type=friary
     monument=statue: Tag:monument=statue
     mooring=commercial: Tag:mooring=commercial
     mooring=cruise: Tag:mooring=cruise
@@ -12216,6 +13578,7 @@ en:
     mooring=visitor: Tag:mooring=visitor
     moped=use_sidepath: Tag:moped=use sidepath
     motor_vehicle=agricultural: Tag:motor vehicle=agricultural
+    motor_vehicle=agricultural;forestry: Tag:motor vehicle=agricultural;forestry
     motor_vehicle=delivery: Tag:motor vehicle=delivery
     motor_vehicle=destination: Tag:motor vehicle=destination
     motor_vehicle=forestry: Tag:motor vehicle=forestry
@@ -12226,18 +13589,24 @@ en:
     motorcycle=yes: Tag:motorcycle=yes
     motorroad=no: Tag:motorroad=no
     mountain_pass=yes: Tag:mountain pass=yes
+    museum:type=open_air: Tag:museum:type=open air
     museum=aerospace: Tag:museum=aerospace
     museum=agriculture: Tag:museum=agriculture
     museum=archaeological: Tag:museum=archaeological
     museum=art: Tag:museum=art
+    museum=automobile: Tag:museum=automobile
     museum=aviation: Tag:museum=aviation
+    museum=car: Tag:museum=car
     museum=children: Tag:museum=children
     museum=history: Tag:museum=history
     museum=living_history: Tag:museum=living history
     museum=local: Tag:museum=local
     museum=military: Tag:museum=military
+    museum=motorcycle: Tag:museum=motorcycle
+    museum=natural_history: Tag:museum=natural history
     museum=nature: Tag:museum=nature
     museum=open_air: Tag:museum=open air
+    museum=person: Tag:museum=person
     museum=railway: Tag:museum=railway
     museum=technology: Tag:museum=technology
     museum=transport: Tag:museum=transport
@@ -12259,6 +13628,7 @@ en:
     name=NHS: Tag:name=NHS
     name=Starbucks: Tag:name=Starbucks
     name=Subway: Tag:name=Subway
+    name=Thai_Nexus_Point: Tag:name=Thai Nexus Point
     name=The_Church_of_Jesus_Christ_of_Latter-day_Saints: Tag:name=The Church of Jesus
       Christ of Latter-day Saints
     name=Tim_Hortons: Tag:name=Tim Hortons
@@ -12289,6 +13659,7 @@ en:
     natural=crater: Tag:natural=crater
     natural=crevasse: Tag:natural=crevasse
     natural=desert: Tag:natural=desert
+    natural=dry_lake: Tag:natural=dry lake
     natural=dune: Tag:natural=dune
     natural=earth_bank: Tag:natural=earth bank
     natural=esker: Tag:natural=esker
@@ -12315,6 +13686,7 @@ en:
     natural=landslide: Tag:natural=landslide
     natural=lava: Tag:natural=lava
     natural=marsh: Tag:natural=marsh
+    natural=massif: Tag:natural=massif
     natural=meadow: Tag:natural=meadow
     natural=meteor_crater: Tag:natural=meteor crater
     natural=moor: Tag:natural=moor
@@ -12366,11 +13738,14 @@ en:
     navigationaid=vasi: Tag:navigationaid=vasi
     nest_platform=yes: Tag:nest platform=yes
     network:type=node_network: Tag:network:type=node network
+    network=AuenBlicke: Tag:network=AuenBlicke
+    network=BO:fundamental: Tag:network=BO:fundamental
     network=BR: Tag:network=BR
     network=BR:ES: Tag:network=BR:ES
     network=BR:MG: Tag:network=BR:MG
     network=BR:PB: Tag:network=BR:PB
     network=Barrie_Transit: Tag:network=Barrie Transit
+    network=Bicikelj: Tag:network=Bicikelj
     network=CA:ON:York: Tag:network=CA:ON:York
     network=CA:ON:primary: Tag:network=CA:ON:primary
     network=CA:ON:secondary: Tag:network=CA:ON:secondary
@@ -12379,14 +13754,21 @@ en:
     network=CA:transcanada:namedRoute: Tag:network=CA:transcanada:namedRoute
     network=CN:AH: Tag:network=CN:AH
     network=CN:JS: Tag:network=CN:JS
+    network=CN:YN: Tag:network=CN:YN
     network=CN:expressway: Tag:network=CN:expressway
     network=CN:national: Tag:network=CN:national
     network=CR:national: Tag:network=CR:national
+    network=EC:national: Tag:network=EC:national
+    network=EC:provincial: Tag:network=EC:provincial
     network=ETS: Tag:network=ETS
     network=Flinkster: Tag:network=Flinkster
     network=JP:national: Tag:network=JP:national
     network=JP:prefectural: Tag:network=JP:prefectural
     network=JP:prefectural:nagano: Tag:network=JP:prefectural:nagano
+    network=MA:RN: Tag:network=MA:RN
+    network=MA:RP: Tag:network=MA:RP
+    network=MA:RR: Tag:network=MA:RR
+    network=MBTA: Tag:network=MBTA
     network=NL:A: Tag:network=NL:A
     network=NL:N: Tag:network=NL:N
     network=NL:R:IJmuiden: Tag:network=NL:R:IJmuiden
@@ -12406,6 +13788,7 @@ en:
     network=NL:ring: Tag:network=NL:ring
     network=NZ:SH: Tag:network=NZ:SH
     network=NZ:UR: Tag:network=NZ:UR
+    network=PE:national: Tag:network=PE:national
     network=SE:LS: Tag:network=SE:LS
     network=SE:LV: Tag:network=SE:LV
     network=SE:RV: Tag:network=SE:RV
@@ -12683,6 +14066,7 @@ en:
     office=administrative: Tag:office=administrative
     office=adoption_agency: Tag:office=adoption agency
     office=advertising_agency: Tag:office=advertising agency
+    office=airline: Tag:office=airline
     office=architect: Tag:office=architect
     office=archive: Tag:office=archive
     office=association: Tag:office=association
@@ -12704,6 +14088,7 @@ en:
     office=energy_supplier: Tag:office=energy supplier
     office=engineer: Tag:office=engineer
     office=estate_agent: Tag:office=estate agent
+    office=event_management: Tag:office=event management
     office=financial: Tag:office=financial
     office=financial_advisor: Tag:office=financial advisor
     office=forestry: Tag:office=forestry
@@ -12717,9 +14102,11 @@ en:
     office=highway: Tag:office=highway
     office=information: Tag:office=information
     office=insurance: Tag:office=insurance
+    office=insurance_adjuster: Tag:office=insurance adjuster
     office=interior_design: Tag:office=interior design
     office=international_organization: Tag:office=international organization
     office=it: Tag:office=it
+    office=landscape_architect: Tag:office=landscape architect
     office=lawyer: Tag:office=lawyer
     office=lifeguard: Tag:office=lifeguard
     office=logistics: Tag:office=logistics
@@ -12739,6 +14126,7 @@ en:
     office=property_management: Tag:office=property management
     office=publisher: Tag:office=publisher
     office=quango: Tag:office=quango
+    office=railway: Tag:office=railway
     office=real_estate_agent: Tag:office=real estate agent
     office=realtor: Tag:office=realtor
     office=reception: Tag:office=reception
@@ -12766,6 +14154,7 @@ en:
     office=wedding_planner: Tag:office=wedding planner
     office=yes: Tag:office=yes
     on_demand=yes: Tag:on demand=yes
+    oneway:bicycle=-1: Tag:oneway:bicycle=-1
     oneway:bicycle=yes: Tag:oneway:bicycle=yes
     oneway:bus=no: Tag:oneway:bus=no
     oneway:moped=no: Tag:oneway:moped=no
@@ -12777,8 +14166,12 @@ en:
     oneway=yes: Tag:oneway=yes
     opening_hours:signed=no: Tag:opening hours:signed=no
     opening_hours=24/7: Tag:opening hours=24/7
+    opening_hours=closed: Tag:opening hours=closed
     operational_status=closed: Tag:operational status=closed
     operational_status=out_of_order: Tag:operational status=out of order
+    operator=Agentschap_Wegen_en_Verkeer: Tag:operator=Agentschap Wegen en Verkeer
+    operator=Agentschap_voor_Natuur_en_Bos: Tag:operator=Agentschap voor Natuur en
+      Bos
     operator=Bundesrepublik_Deutschland: Tag:operator=Bundesrepublik Deutschland
     operator=Cambio: Tag:operator=Cambio
     operator=CiteeCar: Tag:operator=CiteeCar
@@ -12789,21 +14182,28 @@ en:
     operator=GRTgaz: Tag:operator=GRTgaz
     operator=Havenbedrijf_Rotterdam_N.V.: Tag:operator=Havenbedrijf Rotterdam N.V.
     operator=Koninkrijk_der_Nederlanden: Tag:operator=Koninkrijk der Nederlanden
+    operator=La_Banque_Postale: Tag:operator=La Banque Postale
+    operator=La_Poste: Tag:operator=La Poste
     operator=Land_Aruba: Tag:operator=Land Aruba
     operator=Land_Curaçao: Tag:operator=Land Curaçao
     operator=Land_Sint_Maarten: Tag:operator=Land Sint Maarten
+    operator=NaTran: Tag:operator=NaTran
     operator=Orange: Tag:operator=Orange
     operator=ProRail: Tag:operator=ProRail
     operator=RTE: Tag:operator=RTE
     operator=Rijkswaterstaat: Tag:operator=Rijkswaterstaat
     operator=Staat_der_Nederlanden: Tag:operator=Staat der Nederlanden
     operator=Stadtmobil: Tag:operator=Stadtmobil
+    operator=TEC: Tag:operator=TEC
+    operator=WOSM: Tag:operator=WOSM
     operator=book-n-drive: Tag:operator=book-n-drive
     operator=cambio: Tag:operator=cambio
     operator=independent: Tag:operator=independent
     operator=stadtmobil: Tag:operator=stadtmobil
     operator=teilAuto: Tag:operator=teilAuto
     orchard=meadow_orchard: Tag:orchard=meadow orchard
+    organ=yes: Tag:organ=yes
+    outdoor_seating=patio: Tag:outdoor seating=patio
     outdoor_seating=terrace: Tag:outdoor seating=terrace
     outlet=bell_mouth: Tag:outlet=bell mouth
     outlet=direct: Tag:outlet=direct
@@ -12811,23 +14211,33 @@ en:
     outlet=screen: Tag:outlet=screen
     outlet=sock: Tag:outlet=sock
     outlet=valve: Tag:outlet=valve
+    outlet_store=yes: Tag:outlet store=yes
+    owner=Staat_der_Nederlanden: Tag:owner=Staat der Nederlanden
+    ownership=community: Tag:ownership=community
     ownership=private: Tag:ownership=private
     park_ride=hov: Tag:park ride=hov
+    parking:both=lane: Tag:parking:both=lane
+    parking:both=no: Tag:parking:both=no
     parking:both=street_side: Tag:parking:both=street side
     parking:lane:hgv=on_street: Tag:parking:lane:hgv=on street
     parking:left=lane: Tag:parking:left=lane
     parking:left=street_side: Tag:parking:left=street side
     parking:orientation=perpendicular: Tag:parking:orientation=perpendicular
+    parking:right=lane: Tag:parking:right=lane
     parking:right=street_side: Tag:parking:right=street side
+    parking=half_on_kerb: Tag:parking=half on kerb
     parking=lane: Tag:parking=lane
     parking=layby: Tag:parking=layby
     parking=multi-storey: Tag:parking=multi-storey
     parking=on_kerb: Tag:parking=on kerb
+    parking=rooftop: Tag:parking=rooftop
     parking=street_side: Tag:parking=street side
     parking=surface: Tag:parking=surface
     parking=underground: Tag:parking=underground
     parking_space=charging: Tag:parking space=charging
     parking_space=disabled: Tag:parking space=disabled
+    parking_space=parent: Tag:parking space=parent
+    parking_space=veteran: Tag:parking space=veteran
     passenger=international: Tag:passenger=international
     passenger=local: Tag:passenger=local
     passenger=national: Tag:passenger=national
@@ -12838,21 +14248,28 @@ en:
     passenger=yes: Tag:passenger=yes
     path=crossing: Tag:path=crossing
     path=desire: Tag:path=desire
+    path=mtb: Tag:path=mtb
     path=sidewalk: Tag:path=sidewalk
-    physically_present=no: Tag:physically present=no
+    path=traffic_island: Tag:path=traffic island
+    path=trail: Tag:path=trail
+    permit=climbing_skills_certificate: Tag:permit=climbing skills certificate
+    pharmacy=yes: Tag:pharmacy=yes
     pilotage=boarding_point: Tag:pilotage=boarding point
     pilotage=office: Tag:pilotage=office
     pipeline=marker: Tag:pipeline=marker
     pipeline=substation: Tag:pipeline=substation
     pipeline=surge_tank: Tag:pipeline=surge tank
     pipeline=valve: Tag:pipeline=valve
+    piste:takeoff=yes: Tag:piste:takeoff=yes
     piste:type=connection: Tag:piste:type=connection
     piste:type=downhill: Tag:piste:type=downhill
+    piste:type=fatbike: Tag:piste:type=fatbike
     piste:type=hike: Tag:piste:type=hike
     piste:type=nordic: Tag:piste:type=nordic
     piste:type=ski_jump: Tag:piste:type=ski jump
     piste:type=ski_jump_landing: Tag:piste:type=ski jump landing
     piste:type=sled: Tag:piste:type=sled
+    piste:type=yes: Tag:piste:type=yes
     place=allotments: Tag:place=allotments
     place=archipelago: Tag:place=archipelago
     place=borough: Tag:place=borough
@@ -12881,6 +14298,7 @@ en:
     place=square: Tag:place=square
     place=state: Tag:place=state
     place=subcounty: Tag:place=subcounty
+    place=subdistrict: Tag:place=subdistrict
     place=suburb: Tag:place=suburb
     place=town: Tag:place=town
     place=village: Tag:place=village
@@ -12889,6 +14307,8 @@ en:
     place_of_worship=lourdes_grotto: Tag:place of worship=lourdes grotto
     place_of_worship=mass_rock: Tag:place of worship=mass rock
     place_of_worship=musalla: Tag:place of worship=musalla
+    place_of_worship=prayer_flags: Tag:place of worship=prayer flags
+    place_of_worship=sacred_tree: Tag:place of worship=sacred tree
     placement=right_of:1: Tag:placement=right of:1
     placement=transition: Tag:placement=transition
     plant:method=anaerobic_digestion: Tag:plant:method=anaerobic digestion
@@ -12899,6 +14319,7 @@ en:
     plant:method=lithium-ion: Tag:plant:method=lithium-ion
     plant:method=photovoltaic: Tag:plant:method=photovoltaic
     plant:method=run-of-the-river: Tag:plant:method=run-of-the-river
+    plant:method=stream: Tag:plant:method=stream
     plant:method=thermal: Tag:plant:method=thermal
     plant:method=water-pumped-storage: Tag:plant:method=water-pumped-storage
     plant:method=water-storage: Tag:plant:method=water-storage
@@ -12918,6 +14339,7 @@ en:
     plant:source=tidal: Tag:plant:source=tidal
     plant:source=waste: Tag:plant:source=waste
     plant:source=wind: Tag:plant:source=wind
+    plant:type=boiler: Tag:plant:type=boiler
     plant:type=combined_cycle: Tag:plant:type=combined cycle
     plant:type=gas_turbine: Tag:plant:type=gas turbine
     plant:type=lithium_ion: Tag:plant:type=lithium ion
@@ -12928,10 +14350,12 @@ en:
     playground=bridge: Tag:playground=bridge
     playground=climbingframe: Tag:playground=climbingframe
     playground=climbingwall: Tag:playground=climbingwall
+    playground=cushion: Tag:playground=cushion
     playground=funnel_ball: Tag:playground=funnel ball
     playground=hopscotch: Tag:playground=hopscotch
     playground=horizontal_bar: Tag:playground=horizontal bar
     playground=map: Tag:playground=map
+    playground=marble_run: Tag:playground=marble run
     playground=playhouse: Tag:playground=playhouse
     playground=sandpit: Tag:playground=sandpit
     playground=sledding: Tag:playground=sledding
@@ -12939,8 +14363,10 @@ en:
     playground=structure: Tag:playground=structure
     playground=teenshelter: Tag:playground=teenshelter
     playground=tetherball: Tag:playground=tetherball
+    playground=trampoline: Tag:playground=trampoline
     playground=tunnel_tube: Tag:playground=tunnel tube
     playground=youth_bench: Tag:playground=youth bench
+    playground=zipwire: Tag:playground=zipwire
     pole=transition: Tag:pole=transition
     police=academy: Tag:police=academy
     police=barracks: Tag:police=barracks
@@ -12948,6 +14374,7 @@ en:
     police=car_repair: Tag:police=car repair
     police=checkpoint: Tag:police=checkpoint
     police=detention: Tag:police=detention
+    police=helicopter_unit: Tag:police=helicopter unit
     police=naval_base: Tag:police=naval base
     police=offices: Tag:police=offices
     police=range: Tag:police=range
@@ -12966,6 +14393,7 @@ en:
     port=roro: Tag:port=roro
     post_office=post_partner: Tag:post office=post partner
     power=antenna_line: Tag:power=antenna line
+    power=branch: Tag:power=branch
     power=busbar: Tag:power=busbar
     power=cable: Tag:power=cable
     power=cable_distribution_cabinet: Tag:power=cable distribution cabinet
@@ -12977,6 +14405,7 @@ en:
     power=generator: Tag:power=generator
     power=heliostat: Tag:power=heliostat
     power=insulator: Tag:power=insulator
+    power=inverter: Tag:power=inverter
     power=line: Tag:power=line
     power=marker: Tag:power=marker
     power=minor_line: Tag:power=minor line
@@ -12998,9 +14427,13 @@ 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
     private=government: Tag:private=government
     private=members: Tag:private=members
+    private=residents: Tag:private=residents
     private=students: Tag:private=students
+    private=yes: Tag:private=yes
+    produce=vegetables: Tag:produce=vegetables
     product=beer: Tag:product=beer
     product=bricks: Tag:product=bricks
     product=concrete: Tag:product=concrete
@@ -13013,6 +14446,7 @@ en:
     product=rice: Tag:product=rice
     product=steel: Tag:product=steel
     product=sugar: Tag:product=sugar
+    product=viez: Tag:product=viez
     protect_class=11: Tag:protect class=11
     protect_class=13: Tag:protect class=13
     protect_class=19: Tag:protect class=19
@@ -13025,18 +14459,31 @@ en:
     protect_class=4: Tag:protect class=4
     protect_class=5: Tag:protect class=5
     protect_class=6: Tag:protect class=6
+    protected_area=conservation: Tag:protected area=conservation
     protected_area=nature_reserve: Tag:protected area=nature reserve
     protected_area=recreation: Tag:protected area=recreation
+    protected_area=wildlife: Tag:protected area=wildlife
+    protection_title=Bien_integrante_del_patrimonio_cultural_de_Castilla-La_Mancha: Tag:protection
+      title=Bien integrante del patrimonio cultural de Castilla-La Mancha
+    protection_title=Site_of_Special_Scientific_Interest: Tag:protection title=Site
+      of Special Scientific Interest
+    protection_title=bien_integrante_del_patrimonio_cultural_de_Castilla-La_Mancha: Tag:protection
+      title=bien integrante del patrimonio cultural de Castilla-La Mancha
     pseudo=yes: Tag:pseudo=yes
     psv=designated: Tag:psv=designated
     psv=no: Tag:psv=no
     psv=yes: Tag:psv=yes
+    public_transport=entrance: Tag:public transport=entrance
     public_transport=no: Tag:public transport=no
     public_transport=pay_scale_area: Tag:public transport=pay scale area
     public_transport=platform: Tag:public transport=platform
+    public_transport=platform_edge: Tag:public transport=platform edge
+    public_transport=platform_section_sign: Tag:public transport=platform section
+      sign
     public_transport=pole: Tag:public transport=pole
     public_transport=station: Tag:public transport=station
     public_transport=stop_area: Tag:public transport=stop area
+    public_transport=stop_area_group: Tag:public transport=stop area group
     public_transport=stop_position: Tag:public transport=stop position
     pump=manual: Tag:pump=manual
     pump=no: Tag:pump=no
@@ -13074,6 +14521,25 @@ en:
     radio_transponder:category=rotating_pattern: Tag:radio transponder:category=rotating
       pattern
     railway:radio=gsm-r: Tag:railway:radio=gsm-r
+    railway:signal:distant:plates=FR:A: Tag:railway:signal:distant:plates=FR:A
+    railway:signal:distant:plates=FR:D: Tag:railway:signal:distant:plates=FR:D
+    railway:signal:distant:shape=FR:R: Tag:railway:signal:distant:shape=FR:R
+    railway:signal:distant:states=FR:(A): Tag:railway:signal:distant:states=FR:(A)
+    railway:signal:distant:states=FR:(R): Tag:railway:signal:distant:states=FR:(R)
+    railway:signal:distant:states=FR:(R)+(A): Tag:railway:signal:distant:states=FR:(R)+(A)
+    railway:signal:distant:states=FR:(R)+A: Tag:railway:signal:distant:states=FR:(R)+A
+    railway:signal:distant:states=FR:A: Tag:railway:signal:distant:states=FR:A
+    railway:signal:distant:states=FR:D: Tag:railway:signal:distant:states=FR:D
+    railway:signal:distant:states=FR:R: Tag:railway:signal:distant:states=FR:R
+    railway:signal:distant:states=FR:R+(A): Tag:railway:signal:distant:states=FR:R+(A)
+    railway:signal:distant:states=FR:R+A: Tag:railway:signal:distant:states=FR:R+A
+    railway:signal:distant:states=FR:VL: Tag:railway:signal:distant:states=FR:VL
+    railway:signal:main:plates=FR:BM: Tag:railway:signal:main:plates=FR:BM
+    railway:signal:main:plates=FR:PR: Tag:railway:signal:main:plates=FR:PR
+    railway:signal_box=electric: Tag:railway:signal box=electric
+    railway:signal_box=electronic: Tag:railway:signal box=electronic
+    railway:signal_box=mechanical: Tag:railway:signal box=mechanical
+    railway:signal_box=track_diagram: Tag:railway:signal box=track diagram
     railway=Subway: Tag:railway=Subway
     railway=abandoned: Tag:railway=abandoned
     railway=border: Tag:railway=border
@@ -13085,6 +14551,7 @@ en:
     railway=derail: Tag:railway=derail
     railway=diamond: Tag:railway=diamond
     railway=disused: Tag:railway=disused
+    railway=facility: Tag:railway=facility
     railway=funicular: Tag:railway=funicular
     railway=halt: Tag:railway=halt
     railway=hirail_access: Tag:railway=hirail access
@@ -13121,6 +14588,7 @@ en:
     railway=tram_stop: Tag:railway=tram stop
     railway=traverser: Tag:railway=traverser
     railway=turntable: Tag:railway=turntable
+    railway=ventilation_shaft: Tag:railway=ventilation shaft
     railway=wash: Tag:railway=wash
     railway=water_crane: Tag:railway=water crane
     railway=water_tower: Tag:railway=water tower
@@ -13130,11 +14598,14 @@ en:
     recreation_ground=showground: Tag:recreation ground=showground
     recycling_type=centre: Tag:recycling type=centre
     recycling_type=container: Tag:recycling type=container
+    ref=SS676: Tag:ref=SS676
     refitted=yes: Tag:refitted=yes
     refrigerated=yes: Tag:refrigerated=yes
     refugee=yes: Tag:refugee=yes
+    religion=Self-Realization_Fellowship: Tag:religion=Self-Realization Fellowship
     religion=buddhist: Tag:religion=buddhist
     religion=christian: Tag:religion=christian
+    religion=confucian: Tag:religion=confucian
     religion=hindu: Tag:religion=hindu
     religion=jain: Tag:religion=jain
     religion=jewish: Tag:religion=jewish
@@ -13148,12 +14619,14 @@ en:
     religion=sikh: Tag:religion=sikh
     religion=taoist: Tag:religion=taoist
     religion=zoroastrian: Tag:religion=zoroastrian
+    removed:power=line: Tag:removed:power=line
     rental=appliance: Tag:rental=appliance
     rental=boat: Tag:rental=boat
     rental=clothes: Tag:rental=clothes
     rental=event: Tag:rental=event
     rental=quadracycle: Tag:rental=quadracycle
     rental=ski: Tag:rental=ski
+    rental=skip: Tag:rental=skip
     rental=strandkorb: Tag:rental=strandkorb
     rental=trailer: Tag:rental=trailer
     repair=assisted_self_service: Tag:repair=assisted self service
@@ -13163,6 +14636,7 @@ en:
     residential=apartments: Tag:residential=apartments
     residential=block: Tag:residential=block
     residential=condominium: Tag:residential=condominium
+    residential=detached: Tag:residential=detached
     residential=duplex: Tag:residential=duplex
     residential=halting_site: Tag:residential=halting site
     residential=irregular_settlement: Tag:residential=irregular settlement
@@ -13178,7 +14652,9 @@ en:
     resource=gravel: Tag:resource=gravel
     resource=sand: Tag:resource=sand
     restriction:bicycle=stop: Tag:restriction:bicycle=stop
+    restriction=no_entry: Tag:restriction=no entry
     restriction=no_right_turn_on_red: Tag:restriction=no right turn on red
+    restriction=no_u_turn: Tag:restriction=no u turn
     retaining_wall=flood_wall: Tag:retaining wall=flood wall
     road_marking=solid_stop_line: Tag:road marking=solid stop line
     roller_coaster=station: Tag:roller coaster=station
@@ -13188,6 +14664,8 @@ en:
     roof:shape=cone: Tag:roof:shape=cone
     roof:shape=crosspitched: Tag:roof:shape=crosspitched
     roof:shape=dome: Tag:roof:shape=dome
+    roof:shape=equal_hipped: Tag:roof:shape=equal hipped
+    roof:shape=equal_mansard: Tag:roof:shape=equal mansard
     roof:shape=flat: Tag:roof:shape=flat
     roof:shape=gabled: Tag:roof:shape=gabled
     roof:shape=gabled_height_moved: Tag:roof:shape=gabled height moved
@@ -13202,12 +14680,15 @@ en:
     roof:shape=many: Tag:roof:shape=many
     roof:shape=onion: Tag:roof:shape=onion
     roof:shape=parabolic: Tag:roof:shape=parabolic
+    roof:shape=pitched: Tag:roof:shape=pitched
     roof:shape=pyramidal: Tag:roof:shape=pyramidal
     roof:shape=round: Tag:roof:shape=round
+    roof:shape=round_gabled: Tag:roof:shape=round gabled
     roof:shape=sawtooth: Tag:roof:shape=sawtooth
     roof:shape=side_half-hipped: Tag:roof:shape=side half-hipped
     roof:shape=side_hipped: Tag:roof:shape=side hipped
     roof:shape=skillion: Tag:roof:shape=skillion
+    room=carrel: Tag:room=carrel
     roundabout=turbo: Tag:roundabout=turbo
     route=aqueduct: Tag:route=aqueduct
     route=atv: Tag:route=atv
@@ -13229,6 +14710,7 @@ en:
     route=inline_skates: Tag:route=inline skates
     route=light_rail: Tag:route=light rail
     route=minibus: Tag:route=minibus
+    route=mobility_scooter: Tag:route=mobility scooter
     route=monorail: Tag:route=monorail
     route=motorboat: Tag:route=motorboat
     route=mtb: Tag:route=mtb
@@ -13236,10 +14718,12 @@ en:
     route=nordic_walking: Tag:route=nordic walking
     route=pipeline: Tag:route=pipeline
     route=piste: Tag:route=piste
+    route=portage: Tag:route=portage
     route=railway: Tag:route=railway
     route=road: Tag:route=road
     route=running: Tag:route=running
     route=share_taxi: Tag:route=share taxi
+    route=shuttle_train: Tag:route=shuttle train
     route=ski: Tag:route=ski
     route=snowmobile: Tag:route=snowmobile
     route=subway: Tag:route=subway
@@ -13248,10 +14732,14 @@ en:
     route=tram: Tag:route=tram
     route=transhumance: Tag:route=transhumance
     route=trolleybus: Tag:route=trolleybus
+    route=via_ferrata: Tag:route=via ferrata
     route=waterway: Tag:route=waterway
+    route=wheelchair: Tag:route=wheelchair
     route=worship: Tag:route=worship
+    routing:bicycle=use_sidepath: Tag:routing:bicycle=use sidepath
     rugby=league: Tag:rugby=league
     rugby=union: Tag:rugby=union
+    rugby=walking: Tag:rugby=walking
     ruins=mosque: Tag:ruins=mosque
     ruins=temple: Tag:ruins=temple
     runway=displaced_threshold: Tag:runway=displaced threshold
@@ -13262,11 +14750,6 @@ en:
     school=entrance: Tag:school=entrance
     seamark:beacon_cardinal:colour_pattern=horizontal: Tag:seamark:beacon cardinal:colour
       pattern=horizontal
-    seamark:beacon_isolated_danger:colour=black;red;black: Tag:seamark:beacon isolated
-      danger:colour=black;red;black
-    seamark:beacon_isolated_danger:colour_pattern=horizontal: Tag:seamark:beacon isolated
-      danger:colour pattern=horizontal
-    seamark:beacon_isolated_danger:shape=tower: Tag:seamark:beacon isolated danger:shape=tower
     seamark:beacon_lateral:category=channel_left: Tag:seamark:beacon lateral:category=channel
       left
     seamark:beacon_lateral:category=channel_left_bank: Tag:seamark:beacon lateral:category=channel
@@ -13297,15 +14780,8 @@ en:
       left
     seamark:beacon_lateral:category=waterway_right: Tag:seamark:beacon lateral:category=waterway
       right
-    seamark:beacon_lateral:colour=green: Tag:seamark:beacon lateral:colour=green
     seamark:beacon_lateral:colour=green;red;green: Tag:seamark:beacon lateral:colour=green;red;green
-    seamark:beacon_lateral:colour=green;white;green;white: Tag:seamark:beacon lateral:colour=green;white;green;white
-    seamark:beacon_lateral:colour=red: Tag:seamark:beacon lateral:colour=red
     seamark:beacon_lateral:colour=red;green;red: Tag:seamark:beacon lateral:colour=red;green;red
-    seamark:beacon_lateral:colour=red;green;red;green: Tag:seamark:beacon lateral:colour=red;green;red;green
-    seamark:beacon_lateral:colour=red;white;red;white: Tag:seamark:beacon lateral:colour=red;white;red;white
-    seamark:beacon_lateral:colour_pattern=horizontal: Tag:seamark:beacon lateral:colour
-      pattern=horizontal
     seamark:beacon_lateral:shape=perch: Tag:seamark:beacon lateral:shape=perch
     seamark:beacon_lateral:shape=pole: Tag:seamark:beacon lateral:shape=pole
     seamark:beacon_lateral:shape=tower: Tag:seamark:beacon lateral:shape=tower
@@ -13328,17 +14804,11 @@ en:
     seamark:beacon_special_purpose:shape=cairn: Tag:seamark:beacon special purpose:shape=cairn
     seamark:beacon_special_purpose:shape=lattice: Tag:seamark:beacon special purpose:shape=lattice
     seamark:beacon_special_purpose:shape=pile: Tag:seamark:beacon special purpose:shape=pile
-    seamark:beacon_special_purpose:shape=pole: Tag:seamark:beacon special purpose:shape=pole
     seamark:beacon_special_purpose:shape=tower: Tag:seamark:beacon special purpose:shape=tower
     seamark:buoy_cardinal:category=east: Tag:seamark:buoy cardinal:category=east
     seamark:buoy_cardinal:category=north: Tag:seamark:buoy cardinal:category=north
     seamark:buoy_cardinal:category=south: Tag:seamark:buoy cardinal:category=south
     seamark:buoy_cardinal:category=west: Tag:seamark:buoy cardinal:category=west
-    seamark:buoy_cardinal:shape=can: Tag:seamark:buoy cardinal:shape=can
-    seamark:buoy_cardinal:shape=conical: Tag:seamark:buoy cardinal:shape=conical
-    seamark:buoy_cardinal:shape=pillar: Tag:seamark:buoy cardinal:shape=pillar
-    seamark:buoy_cardinal:shape=spar: Tag:seamark:buoy cardinal:shape=spar
-    seamark:buoy_cardinal:shape=spherical: Tag:seamark:buoy cardinal:shape=spherical
     seamark:buoy_isolated_danger:shape=can: Tag:seamark:buoy isolated danger:shape=can
     seamark:buoy_isolated_danger:shape=conical: Tag:seamark:buoy isolated danger:shape=conical
     seamark:buoy_isolated_danger:shape=pillar: Tag:seamark:buoy isolated danger:shape=pillar
@@ -13421,7 +14891,6 @@ en:
     seamark:buoy_special_purpose:shape=spherical: Tag:seamark:buoy special purpose:shape=spherical
     seamark:buoy_special_purpose:shape=super-buoy: Tag:seamark:buoy special purpose:shape=super-buoy
     seamark:cable_overhead:category=power: Tag:seamark:cable overhead:category=power
-    seamark:cable_overhead:category=telephone: Tag:seamark:cable overhead:category=telephone
     seamark:cable_overhead:category=transmission: Tag:seamark:cable overhead:category=transmission
     seamark:cable_submarine:category=power: Tag:seamark:cable submarine:category=power
     seamark:conspicuity=conspicious: Tag:seamark:conspicuity=conspicious
@@ -13725,6 +15194,7 @@ en:
     shelter_type=lean_to: Tag:shelter type=lean to
     shelter_type=nuclear: Tag:shelter type=nuclear
     shelter_type=pavilion: Tag:shelter type=pavilion
+    shelter_type=pergola: Tag:shelter type=pergola
     shelter_type=picnic_shelter: Tag:shelter type=picnic shelter
     shelter_type=public_transport: Tag:shelter type=public transport
     shelter_type=rock_shelter: Tag:shelter type=rock shelter
@@ -13735,7 +15205,6 @@ en:
     shelter_type=wildlife_hide: Tag:shelter type=wildlife hide
     shop=*: Tag:shop=*
     shop=3d_printing: Tag:shop=3d printing
-    shop=Alko: Tag:shop=Alko
     shop=accessories: Tag:shop=accessories
     shop=adult: Tag:shop=adult
     shop=agrarian: Tag:shop=agrarian
@@ -13752,10 +15221,12 @@ en:
     shop=baby_goods: Tag:shop=baby goods
     shop=bag: Tag:shop=bag
     shop=bakery: Tag:shop=bakery
+    shop=baking_supplies: Tag:shop=baking supplies
     shop=bathroom_furnishing: Tag:shop=bathroom furnishing
     shop=bbq: Tag:shop=bbq
     shop=beauty: Tag:shop=beauty
     shop=bed: Tag:shop=bed
+    shop=beekeeping: Tag:shop=beekeeping
     shop=betting: Tag:shop=betting
     shop=beverages: Tag:shop=beverages
     shop=bicycle: Tag:shop=bicycle
@@ -13771,7 +15242,9 @@ en:
     shop=business_machines: Tag:shop=business machines
     shop=butcher: Tag:shop=butcher
     shop=cafe: Tag:shop=cafe
+    shop=calendar: Tag:shop=calendar
     shop=camera: Tag:shop=camera
+    shop=camp: Tag:shop=camp
     shop=candles: Tag:shop=candles
     shop=cannabis: Tag:shop=cannabis
     shop=canoe_hire: Tag:shop=canoe hire
@@ -13790,11 +15263,13 @@ en:
     shop=chemist: Tag:shop=chemist
     shop=chocolate: Tag:shop=chocolate
     shop=christmas: Tag:shop=christmas
+    shop=cleaning_supplies: Tag:shop=cleaning supplies
     shop=clothes: Tag:shop=clothes
     shop=coffee: Tag:shop=coffee
     shop=collector: Tag:shop=collector
     shop=communication: Tag:shop=communication
     shop=computer: Tag:shop=computer
+    shop=condo: Tag:shop=condo
     shop=confectionery: Tag:shop=confectionery
     shop=convenience: Tag:shop=convenience
     shop=copyshop: Tag:shop=copyshop
@@ -13809,10 +15284,11 @@ en:
     shop=department_store: Tag:shop=department store
     shop=discount: Tag:shop=discount
     shop=dive: Tag:shop=dive
-    shop=diy: Tag:shop=diy
     shop=doityourself: Tag:shop=doityourself
+    shop=doormat: Tag:shop=doormat
     shop=doors: Tag:shop=doors
     shop=dry_cleaning: Tag:shop=dry cleaning
+    shop=duty_free: Tag:shop=duty free
     shop=e-cigarette: Tag:shop=e-cigarette
     shop=eggs: Tag:shop=eggs
     shop=electrical: Tag:shop=electrical
@@ -13836,8 +15312,6 @@ en:
     shop=fishmonger: Tag:shop=fishmonger
     shop=flooring: Tag:shop=flooring
     shop=florist: Tag:shop=florist
-    shop=flower: Tag:shop=flower
-    shop=flowers: Tag:shop=flowers
     shop=food: Tag:shop=food
     shop=frame: Tag:shop=frame
     shop=free_flying: Tag:shop=free flying
@@ -13849,13 +15323,13 @@ en:
     shop=gallery: Tag:shop=gallery
     shop=gambling: Tag:shop=gambling
     shop=games: Tag:shop=games
+    shop=gaming_machines: Tag:shop=gaming machines
     shop=garden_centre: Tag:shop=garden centre
     shop=garden_furniture: Tag:shop=garden furniture
     shop=garden_machinery: Tag:shop=garden machinery
     shop=gas: Tag:shop=gas
     shop=general: Tag:shop=general
     shop=general_store: Tag:shop=general store
-    shop=general_stores: Tag:shop=general stores
     shop=gift: Tag:shop=gift
     shop=glass: Tag:shop=glass
     shop=glaziery: Tag:shop=glaziery
@@ -13863,21 +15337,19 @@ en:
     shop=golf: Tag:shop=golf
     shop=golf_cart: Tag:shop=golf cart
     shop=greengrocer: Tag:shop=greengrocer
-    shop=grill: Tag:shop=grill
     shop=grocery: Tag:shop=grocery
     shop=groundskeeping: Tag:shop=groundskeeping
+    shop=growshop: Tag:shop=growshop
     shop=gun: Tag:shop=gun
-    shop=guns: Tag:shop=guns
     shop=haberdashery: Tag:shop=haberdashery
     shop=hairdresser: Tag:shop=hairdresser
     shop=hairdresser_supply: Tag:shop=hairdresser supply
     shop=hardware: Tag:shop=hardware
+    shop=headshop: Tag:shop=headshop
     shop=health: Tag:shop=health
     shop=health_food: Tag:shop=health food
-    shop=hearing_aid_dispenser: Tag:shop=hearing aid dispenser
     shop=hearing_aids: Tag:shop=hearing aids
     shop=herbalist: Tag:shop=herbalist
-    shop=hgv: Tag:shop=hgv
     shop=hifi: Tag:shop=hifi
     shop=hobby: Tag:shop=hobby
     shop=honey: Tag:shop=honey
@@ -13899,24 +15371,25 @@ en:
     shop=kitchenware: Tag:shop=kitchenware
     shop=knives: Tag:shop=knives
     shop=lamps: Tag:shop=lamps
-    shop=laundromat: Tag:shop=laundromat
     shop=laundry: Tag:shop=laundry
     shop=leather: Tag:shop=leather
     shop=leatherworking: Tag:shop=leatherworking
     shop=lighting: Tag:shop=lighting
     shop=locksmith: Tag:shop=locksmith
     shop=lottery: Tag:shop=lottery
+    shop=magic: Tag:shop=magic
     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: Tag:shop=mobile
     shop=mobile_equipment: Tag:shop=mobile equipment
     shop=mobile_home: Tag:shop=mobile home
     shop=mobile_phone: Tag:shop=mobile phone
+    shop=mobile_phone_accessories: Tag:shop=mobile phone accessories
     shop=mobility_scooter: Tag:shop=mobility scooter
     shop=model: Tag:shop=model
     shop=money_lender: Tag:shop=money lender
@@ -13939,7 +15412,6 @@ en:
     shop=organic: Tag:shop=organic
     shop=orthopedics: Tag:shop=orthopedics
     shop=outdoor: Tag:shop=outdoor
-    shop=outdoor_power_equipment: Tag:shop=outdoor power equipment
     shop=outpost: Tag:shop=outpost
     shop=paint: Tag:shop=paint
     shop=party: Tag:shop=party
@@ -13963,9 +15435,9 @@ en:
     shop=preserving_glassware: Tag:shop=preserving glassware
     shop=printer_ink: Tag:shop=printer ink
     shop=printing: Tag:shop=printing
+    shop=promotional_products: Tag:shop=promotional products
     shop=psychic: Tag:shop=psychic
     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
@@ -13973,6 +15445,7 @@ en:
     shop=repair: Tag:shop=repair
     shop=rice: Tag:shop=rice
     shop=robot: Tag:shop=robot
+    shop=rope: Tag:shop=rope
     shop=safety_equipment: Tag:shop=safety equipment
     shop=salon: Tag:shop=salon
     shop=sauna: Tag:shop=sauna
@@ -13981,6 +15454,7 @@ en:
     shop=seafood: Tag:shop=seafood
     shop=second_hand: Tag:shop=second hand
     shop=security: Tag:shop=security
+    shop=self_brew_location: Tag:shop=self brew location
     shop=sewing: Tag:shop=sewing
     shop=shed: Tag:shop=shed
     shop=ship_chandler: Tag:shop=ship chandler
@@ -14001,10 +15475,10 @@ en:
     shop=stationery: Tag:shop=stationery
     shop=storage_rental: Tag:shop=storage rental
     shop=street_vendor: Tag:shop=street vendor
+    shop=sunglasses: Tag:shop=sunglasses
     shop=supermarket: Tag:shop=supermarket
     shop=surf: Tag:shop=surf
     shop=swimming_pool: Tag:shop=swimming pool
-    shop=systembolaget: Tag:shop=systembolaget
     shop=tailor: Tag:shop=tailor
     shop=tattoo: Tag:shop=tattoo
     shop=tea: Tag:shop=tea
@@ -14015,7 +15489,7 @@ en:
     shop=tobacco: Tag:shop=tobacco
     shop=tool_hire: Tag:shop=tool hire
     shop=tools: Tag:shop=tools
-    shop=toy: Tag:shop=toy
+    shop=tortilla: Tag:shop=tortilla
     shop=toys: Tag:shop=toys
     shop=tractor: Tag:shop=tractor
     shop=trade: Tag:shop=trade
@@ -14030,13 +15504,18 @@ en:
     shop=vacuum_cleaner: Tag:shop=vacuum cleaner
     shop=variety_store: Tag:shop=variety store
     shop=vehicles: Tag:shop=vehicles
+    shop=vending_machine: Tag:shop=vending machine
     shop=video: Tag:shop=video
     shop=video_games: Tag:shop=video games
+    shop=video_restore: Tag:shop=video restore
     shop=watches: Tag:shop=watches
     shop=water: Tag:shop=water
+    shop=water_filter: Tag:shop=water filter
     shop=water_filters: Tag:shop=water filters
     shop=water_sports: Tag:shop=water sports
     shop=weapons: Tag:shop=weapons
+    shop=weaver: Tag:shop=weaver
+    shop=weighing_scales: Tag:shop=weighing scales
     shop=wellness: Tag:shop=wellness
     shop=wholesale: Tag:shop=wholesale
     shop=wigs: Tag:shop=wigs
@@ -14049,9 +15528,12 @@ en:
     shop=wool: Tag:shop=wool
     shop=yes: Tag:shop=yes
     sidewalk:both:surface=rock: Tag:sidewalk:both:surface=rock
+    sidewalk:both=separate: Tag:sidewalk:both=separate
     sidewalk:left=separate: Tag:sidewalk:left=separate
     sidewalk:right=separate: Tag:sidewalk:right=separate
+    sidewalk=both: Tag:sidewalk=both
     sidewalk=separate: Tag:sidewalk=separate
+    sidewalk=yes: Tag:sidewalk=yes
     signal_station=bridge: Tag:signal station=bridge
     signal_station=firing: Tag:signal station=firing
     signal_station=international_port_traffic: Tag:signal station=international port
@@ -14094,6 +15576,7 @@ en:
     social_facility=clothing_bank: Tag:social facility=clothing bank
     social_facility=dairy_kitchen: Tag:social facility=dairy kitchen
     social_facility=day_care: Tag:social facility=day care
+    social_facility=equine_assisted_centre: Tag:social facility=equine assisted centre
     social_facility=food_bank: Tag:social facility=food bank
     social_facility=group_home: Tag:social facility=group home
     social_facility=hospice: Tag:social facility=hospice
@@ -14119,11 +15602,18 @@ en:
     source:geometry=NSW_LPI_Base_Map: Tag:source:geometry=NSW LPI Base Map
     source:geometry=NSW_LPI_Imagery: Tag:source:geometry=NSW LPI Imagery
     source:geometry=PSMA_Admin_Boundaries: Tag:source:geometry=PSMA Admin Boundaries
+    source:height=estimated: Tag:source:height=estimated
+    source:height=estimation_levels: Tag:source:height=estimation levels
+    source:height=lidar: Tag:source:height=lidar
+    source:height=satellite_imagery: Tag:source:height=satellite imagery
+    source:height=shadow: Tag:source:height=shadow
+    source:height=survey: Tag:source:height=survey
     source:maxspeed=BE-BRU:urban: Tag:source:maxspeed=BE-BRU:urban
     source:maxspeed=BE-VLG:rural: Tag:source:maxspeed=BE-VLG:rural
     source:maxspeed=BE-VLG:urban: Tag:source:maxspeed=BE-VLG:urban
     source:maxspeed=BE-WAL:rural: Tag:source:maxspeed=BE-WAL:rural
     source:maxspeed=BE-WAL:urban: Tag:source:maxspeed=BE-WAL:urban
+    source:maxspeed=IT:urban: Tag:source:maxspeed=IT:urban
     source:maxspeed=RU:urban: Tag:source:maxspeed=RU:urban
     source:maxspeed=implicit: Tag:source:maxspeed=implicit
     source:maxspeed=sign: Tag:source:maxspeed=sign
@@ -14133,16 +15623,24 @@ en:
     source:population=IBGE_2010: Tag:source:population=IBGE 2010
     source:population=IBGE_2022: Tag:source:population=IBGE 2022
     source:position=NPWS_Estate: Tag:source:position=NPWS Estate
+    source:postal_code=Isle_of_Man_Government_Land_Registry_Land_Transactions: Tag:source:postal
+      code=Isle of Man Government Land Registry Land Transactions
     source=ACT2016: Tag:source=ACT2016
     source=ACT2017: Tag:source=ACT2017
     source=ACTMapiRoads: Tag:source=ACTMapiRoads
     source=ACTMapiTP: Tag:source=ACTMapiTP
+    source=Arild_Bjørk: Tag:source=Arild Bjørk
     source=Bymiljøetaten: Tag:source=Bymiljøetaten
     source=DNT_Oslo_og_Omegn: Tag:source=DNT Oslo og Omegn
+    source=DOP_LVA: Tag:source=DOP LVA
+    source=DOP_LVA_BY_01: Tag:source=DOP LVA BY 01
+    source=Den_Norske_Turistforening: Tag:source=Den Norske Turistforening
     source=GURS: Tag:source=GURS
     source=Gazetteer_of_Australia_2012: Tag:source=Gazetteer of Australia 2012
     source=Google: Tag:source=Google
     source=Google,_2010-01-21: Tag:source=Google, 2010-01-21
+    source=Hamar_og_Hedemarken_Turistforening,_hht.no: Tag:source=Hamar og Hedemarken
+      Turistforening, hht.no
     source=HiRes_aerial_imagery: Tag:source=HiRes aerial imagery
     source=IBGE: Tag:source=IBGE
     source=Isle_of_Man_Government_1:25000_map_(2007): Tag:source=Isle of Man Government
@@ -14159,6 +15657,7 @@ en:
     source=NSW_LPI_Imagery: Tag:source=NSW LPI Imagery
     source=Naturbase: Tag:source=Naturbase
     source=PGS: Tag:source=PGS
+    source=PRNG: Tag:source=PRNG
     source=PSMA_Admin_Boundaries: Tag:source=PSMA Admin Boundaries
     source=RABA-KGZ: Tag:source=RABA-KGZ
     source=SA_Conservation_Reserve_Boundaries: Tag:source=SA Conservation Reserve
@@ -14169,6 +15668,7 @@ en:
     source=VicMap_ParkRes: Tag:source=VicMap ParkRes
     source=YahooJapan/ALPSMAP: Tag:source=YahooJapan/ALPSMAP
     source=gurs: Tag:source=gurs
+    source=ruian: Tag:source=ruian
     source=www.geoportal.gov.pl: Tag:source=www.geoportal.gov.pl
     sport=10pin: Tag:sport=10pin
     sport=8pin: Tag:sport=8pin
@@ -14196,6 +15696,7 @@ en:
     sport=billiards: Tag:sport=billiards
     sport=bmx: Tag:sport=bmx
     sport=bobsleigh: Tag:sport=bobsleigh
+    sport=bodybuilding: Tag:sport=bodybuilding
     sport=boules: Tag:sport=boules
     sport=bowling: Tag:sport=bowling
     sport=bowls: Tag:sport=bowls
@@ -14220,6 +15721,7 @@ en:
     sport=cycle_ball: Tag:sport=cycle ball
     sport=cycle_polo: Tag:sport=cycle polo
     sport=cycling: Tag:sport=cycling
+    sport=dance: Tag:sport=dance
     sport=dancing: Tag:sport=dancing
     sport=darts: Tag:sport=darts
     sport=disc_golf: Tag:sport=disc golf
@@ -14238,6 +15740,7 @@ en:
     sport=footballgolf: Tag:sport=footballgolf
     sport=four_square: Tag:sport=four square
     sport=free_flying: Tag:sport=free flying
+    sport=freediving: Tag:sport=freediving
     sport=funnel_ball: Tag:sport=funnel ball
     sport=futsal: Tag:sport=futsal
     sport=gaelic_football: Tag:sport=gaelic football
@@ -14255,21 +15758,27 @@ en:
     sport=ice_hockey: Tag:sport=ice hockey
     sport=ice_skating: Tag:sport=ice skating
     sport=ice_stock: Tag:sport=ice stock
+    sport=in-line_hockey: Tag:sport=in-line hockey
+    sport=jetsprint: Tag:sport=jetsprint
     sport=judo: Tag:sport=judo
     sport=karate: Tag:sport=karate
     sport=karting: Tag:sport=karting
+    sport=kick_scooter: Tag:sport=kick scooter
     sport=kickboxing: Tag:sport=kickboxing
     sport=kitesurfing: Tag:sport=kitesurfing
     sport=korfball: Tag:sport=korfball
     sport=krachtbal: Tag:sport=krachtbal
+    sport=krolf: Tag:sport=krolf
     sport=lacrosse: Tag:sport=lacrosse
     sport=laser_tag: Tag:sport=laser tag
     sport=long_jump: Tag:sport=long jump
     sport=martial_arts: Tag:sport=martial arts
+    sport=mind_body_interventions: Tag:sport=mind body interventions
     sport=miniature_golf: Tag:sport=miniature golf
     sport=model_aerodrome: Tag:sport=model aerodrome
     sport=motocross: Tag:sport=motocross
     sport=motor: Tag:sport=motor
+    sport=mtb: Tag:sport=mtb
     sport=multi: Tag:sport=multi
     sport=netball: Tag:sport=netball
     sport=nine_mens_morris: Tag:sport=nine mens morris
@@ -14290,6 +15799,7 @@ en:
     sport=pilates: Tag:sport=pilates
     sport=pole_dance: Tag:sport=pole dance
     sport=polo: Tag:sport=polo
+    sport=powerlifting: Tag:sport=powerlifting
     sport=racquet: Tag:sport=racquet
     sport=rc_car: Tag:sport=rc car
     sport=roller_hockey: Tag:sport=roller hockey
@@ -14344,6 +15854,7 @@ en:
     sports=aikido: Tag:sports=aikido
     sports=athletics: Tag:sports=athletics
     spring:type=hot: Tag:spring:type=hot
+    state=alternate: Tag:state=alternate
     station=funicular: Tag:station=funicular
     station=light_rail: Tag:station=light rail
     station=monorail: Tag:station=monorail
@@ -14352,8 +15863,14 @@ en:
     statue=buddha: Tag:statue=buddha
     statue=equestrian: Tag:statue=equestrian
     statue=virgin: Tag:statue=virgin
+    stele=khachkar: Tag:stele=khachkar
+    stećak=necropolis: Tag:stećak=necropolis
+    stećak=stećak_necropolis: Tag:stećak=stećak necropolis
     stile=stepover: Tag:stile=stepover
+    stone_type=conciliation_cross: Tag:stone type=conciliation cross
+    stone_type=hunger_stone: Tag:stone type=hunger stone
     stone_type=khachkar: Tag:stone type=khachkar
+    stone_type=ruhstein: Tag:stone type=ruhstein
     stream=intermittent: Tag:stream=intermittent
     street_cabinet=cable_tv: Tag:street cabinet=cable tv
     street_cabinet=gas: Tag:street cabinet=gas
@@ -14370,6 +15887,7 @@ en:
     studio=television: Tag:studio=television
     studio=video: Tag:studio=video
     submarine=yes: Tag:submarine=yes
+    subsea=bank: Tag:subsea=bank
     substance=CNG: Tag:substance=CNG
     substance=LNG: Tag:substance=LNG
     substance=cng: Tag:substance=cng
@@ -14406,10 +15924,13 @@ en:
     surface=concrete: Tag:surface=concrete
     surface=concrete:lanes: Tag:surface=concrete:lanes
     surface=concrete:plates: Tag:surface=concrete:plates
+    surface=cork: Tag:surface=cork
     surface=decoturf: Tag:surface=decoturf
     surface=dirt: Tag:surface=dirt
     surface=earth: Tag:surface=earth
+    surface=fibre_reinforced_polymer_grate: Tag:surface=fibre reinforced polymer grate
     surface=fine_gravel: Tag:surface=fine gravel
+    surface=glass: Tag:surface=glass
     surface=granite: Tag:surface=granite
     surface=grass: Tag:surface=grass
     surface=grass_paver: Tag:surface=grass paver
@@ -14425,19 +15946,24 @@ en:
     surface=paved: Tag:surface=paved
     surface=paving_stones: Tag:surface=paving stones
     surface=paving_stones:30: Tag:surface=paving stones:30
+    surface=paving_stones:lanes: Tag:surface=paving stones:lanes
     surface=pebblestone: Tag:surface=pebblestone
     surface=rock: Tag:surface=rock
     surface=rocks: Tag:surface=rocks
+    surface=roman_paving: Tag:surface=roman paving
     surface=rubber: Tag:surface=rubber
     surface=sand: Tag:surface=sand
+    surface=sandstone: Tag:surface=sandstone
     surface=sett: Tag:surface=sett
     surface=shells: Tag:surface=shells
     surface=snow: Tag:surface=snow
     surface=soil: Tag:surface=soil
     surface=stepping_stones: Tag:surface=stepping stones
+    surface=stone: Tag:surface=stone
     surface=tarmac: Tag:surface=tarmac
     surface=tarmacadam: Tag:surface=tarmacadam
     surface=tartan: Tag:surface=tartan
+    surface=tiles: Tag:surface=tiles
     surface=trail: Tag:surface=trail
     surface=turf: Tag:surface=turf
     surface=unhewn_cobblestone: Tag:surface=unhewn cobblestone
@@ -14473,6 +15999,7 @@ en:
     tank_trap=czech_hedgehog: Tag:tank trap=czech hedgehog
     taxi_type=motorcycle: Tag:taxi type=motorcycle
     taxi_vehicle=motorcycle: Tag:taxi vehicle=motorcycle
+    taxon:family=Arecaceae: Tag:taxon:family=Arecaceae
     telecom:medium=coaxial: Tag:telecom:medium=coaxial
     telecom:medium=copper: Tag:telecom:medium=copper
     telecom:medium=fibre: Tag:telecom:medium=fibre
@@ -14485,6 +16012,7 @@ en:
     telecom=datacenter: Tag:telecom=datacenter
     telecom=distribution_point: Tag:telecom=distribution point
     telecom=exchange: Tag:telecom=exchange
+    telecom=line: Tag:telecom=line
     telecom=outdoor_dslam: Tag:telecom=outdoor dslam
     telecom=remote_digital_terminal: Tag:telecom=remote digital terminal
     telecom=remote_terminal: Tag:telecom=remote terminal
@@ -14506,6 +16034,7 @@ en:
     tomb=crypt: Tag:tomb=crypt
     tomb=dolmen: Tag:tomb=dolmen
     tomb=hypogeum: Tag:tomb=hypogeum
+    tomb=loculi: Tag:tomb=loculi
     tomb=mausoleum: Tag:tomb=mausoleum
     tomb=obelisk: Tag:tomb=obelisk
     tomb=pillar: Tag:tomb=pillar
@@ -14514,6 +16043,7 @@ en:
     tomb=sarcophagus: Tag:tomb=sarcophagus
     tomb=table: Tag:tomb=table
     tomb=tumulus: Tag:tomb=tumulus
+    tomb=turbe: Tag:tomb=turbe
     tomb=vault: Tag:tomb=vault
     tomb=war_grave: Tag:tomb=war grave
     tourism=accommodation: Tag:tourism=accommodation
@@ -14522,7 +16052,6 @@ en:
     tourism=aquarium: Tag:tourism=aquarium
     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
@@ -14540,11 +16069,13 @@ en:
     tourism=spa_resort: Tag:tourism=spa resort
     tourism=theme_park: Tag:tourism=theme park
     tourism=tourism-attraction: Tag:tourism=tourism-attraction
+    tourism=tours: Tag:tourism=tours
     tourism=trail_riding_rest: Tag:tourism=trail riding rest
     tourism=trail_riding_station: Tag:tourism=trail riding station
     tourism=viewpoint: Tag:tourism=viewpoint
     tourism=wilderness_hut: Tag:tourism=wilderness hut
     tourism=wine_cellar: Tag:tourism=wine cellar
+    tourism=winery: Tag:tourism=winery
     tourism=yes: Tag:tourism=yes
     tourism=zoo: Tag:tourism=zoo
     tower:construction=dish: Tag:tower:construction=dish
@@ -14553,7 +16084,6 @@ en:
     tower:construction=guyed_lattice: Tag:tower:construction=guyed lattice
     tower:construction=guyed_tube: Tag:tower:construction=guyed tube
     tower:construction=lattice: Tag:tower:construction=lattice
-    tower:type: Tag:tower:type
     tower:type=anchor: Tag:tower:type=anchor
     tower:type=bell_tower: Tag:tower:type=bell tower
     tower:type=bridge: Tag:tower:type=bridge
@@ -14574,6 +16104,7 @@ en:
     tower:type=monitoring: Tag:tower:type=monitoring
     tower:type=monument: Tag:tower:type=monument
     tower:type=observation: Tag:tower:type=observation
+    tower:type=pagoda: Tag:tower:type=pagoda
     tower:type=popinjay: Tag:tower:type=popinjay
     tower:type=radar: Tag:tower:type=radar
     tower:type=siren: Tag:tower:type=siren
@@ -14582,8 +16113,10 @@ en:
     tower:type=watchtower: Tag:tower:type=watchtower
     townhall:type=barangay: Tag:townhall:type=barangay
     townhall:type=town: Tag:townhall:type=town
+    townhall:type=village: Tag:townhall:type=village
     trade=agricultural_supplies: Tag:trade=agricultural supplies
     trade=building_supplies: Tag:trade=building supplies
+    trade=metal: Tag:trade=metal
     trade=timber: Tag:trade=timber
     trade=wood: Tag:trade=wood
     traffic=local: Tag:traffic=local
@@ -14591,6 +16124,7 @@ en:
     traffic=regional: Tag:traffic=regional
     traffic=suburban: Tag:traffic=suburban
     traffic=urban: Tag:traffic=urban
+    traffic_calming:forward=rumble_strip: Tag:traffic calming:forward=rumble strip
     traffic_calming=bump: Tag:traffic calming=bump
     traffic_calming=chicane: Tag:traffic calming=chicane
     traffic_calming=choked_island: Tag:traffic calming=choked island
@@ -14614,6 +16148,8 @@ en:
     traffic_sign:forward=DE:325.2: Tag:traffic sign:forward=DE:325.2
     traffic_sign=AT:52.1: Tag:traffic sign=AT:52.1
     traffic_sign=AT:52.17a-a: Tag:traffic sign=AT:52.17a-a
+    traffic_sign=AT:53.9c: Tag:traffic sign=AT:53.9c
+    traffic_sign=AT:FKV_1.9: Tag:traffic sign=AT:FKV 1.9
     traffic_sign=CH:2.59.3: Tag:traffic sign=CH:2.59.3
     traffic_sign=CH:2.59.5: Tag:traffic sign=CH:2.59.5
     traffic_sign=DE:1022-10: Tag:traffic sign=DE:1022-10
@@ -14628,6 +16164,7 @@ en:
     traffic_sign=DE:208: Tag:traffic sign=DE:208
     traffic_sign=DE:220-10: Tag:traffic sign=DE:220-10
     traffic_sign=DE:220-20: Tag:traffic sign=DE:220-20
+    traffic_sign=DE:222: Tag:traffic sign=DE:222
     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
@@ -14640,10 +16177,12 @@ en:
     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:244.3: Tag:traffic sign=DE:244.3
     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:255: Tag:traffic sign=DE:255
     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
@@ -14670,6 +16209,8 @@ en:
     traffic_sign=DE:276: Tag:traffic sign=DE:276
     traffic_sign=DE:277: Tag:traffic sign=DE:277
     traffic_sign=DE:282: Tag:traffic sign=DE:282
+    traffic_sign=DE:283: Tag:traffic sign=DE:283
+    traffic_sign=DE:286: Tag:traffic sign=DE:286
     traffic_sign=DE:306: Tag:traffic sign=DE:306
     traffic_sign=DE:308: Tag:traffic sign=DE:308
     traffic_sign=DE:310: Tag:traffic sign=DE:310
@@ -14693,6 +16234,8 @@ en:
     traffic_sign=DE:437: Tag:traffic sign=DE:437
     traffic_sign=DE:438: Tag:traffic sign=DE:438
     traffic_sign=DE:439: Tag:traffic sign=DE:439
+    traffic_sign=DE:440: Tag:traffic sign=DE:440
+    traffic_sign=DE:441: Tag:traffic sign=DE:441
     traffic_sign=DE:448: Tag:traffic sign=DE:448
     traffic_sign=DE:449: Tag:traffic sign=DE:449
     traffic_sign=DE:453: Tag:traffic sign=DE:453
@@ -14701,6 +16244,8 @@ en:
     traffic_sign=DE:600-37: Tag:traffic sign=DE:600-37
     traffic_sign=DE:600-38: Tag:traffic sign=DE:600-38
     traffic_sign=DE:600-39: Tag:traffic sign=DE:600-39
+    traffic_sign=FR:C115: Tag:traffic sign=FR:C115
+    traffic_sign=GB:610: Tag:traffic sign=GB:610
     traffic_sign=NL:A01-30-ZB: Tag:traffic sign=NL:A01-30-ZB
     traffic_sign=NL:C15: Tag:traffic sign=NL:C15
     traffic_sign=NL:G07: Tag:traffic sign=NL:G07
@@ -14713,7 +16258,30 @@ en:
     traffic_sign=PL:A-2: Tag:traffic sign=PL:A-2
     traffic_sign=PL:D-42: Tag:traffic sign=PL:D-42
     traffic_sign=PL:D-43: Tag:traffic sign=PL:D-43
+    traffic_sign=US:D3-1: Tag:traffic sign=US:D3-1
     traffic_sign=US:MD:M1-5: Tag:traffic sign=US:MD:M1-5
+    traffic_sign=US:R1-1: Tag:traffic sign=US:R1-1
+    traffic_sign=US:R1-1;US:R1-3P: Tag:traffic sign=US:R1-1;US:R1-3P
+    traffic_sign=US:R1-1;US:W4-4P: Tag:traffic sign=US:R1-1;US:W4-4P
+    traffic_sign=US:R1-2: Tag:traffic sign=US:R1-2
+    traffic_sign=US:R4-7: Tag:traffic sign=US:R4-7
+    traffic_sign=US:R5-1: Tag:traffic sign=US:R5-1
+    traffic_sign=US:R5-1a: Tag:traffic sign=US:R5-1a
+    traffic_sign=US:R6-2R: Tag:traffic sign=US:R6-2R
+    traffic_sign=US:S1-1: Tag:traffic sign=US:S1-1
+    traffic_sign=US:S1-1;US:W16-7PL: Tag:traffic sign=US:S1-1;US:W16-7PL
+    traffic_sign=US:W1-7: Tag:traffic sign=US:W1-7
+    traffic_sign=US:W10-1: Tag:traffic sign=US:W10-1
+    traffic_sign=US:W10-1,US:W10-9P: Tag:traffic sign=US:W10-1,US:W10-9P
+    traffic_sign=US:W10-5,US:W10-5P: Tag:traffic sign=US:W10-5,US:W10-5P
+    traffic_sign=US:W11-2: Tag:traffic sign=US:W11-2
+    traffic_sign=US:W11-3: Tag:traffic sign=US:W11-3
+    traffic_sign=US:W12-2: Tag:traffic sign=US:W12-2
+    traffic_sign=US:W12-2a: Tag:traffic sign=US:W12-2a
+    traffic_sign=US:W14-1: Tag:traffic sign=US:W14-1
+    traffic_sign=US:W14-2: Tag:traffic sign=US:W14-2
+    traffic_sign=US:W3-1: Tag:traffic sign=US:W3-1
+    traffic_sign=US:W3-3: Tag:traffic sign=US:W3-3
     traffic_sign=city_limit: Tag:traffic sign=city limit
     traffic_sign=give_way: Tag:traffic sign=give way
     traffic_sign=speedometer_test: Tag:traffic sign=speedometer test
@@ -14737,10 +16305,12 @@ en:
     transformer=auto: Tag:transformer=auto
     transformer=auxiliary: Tag:transformer=auxiliary
     transformer=converter: Tag:transformer=converter
+    transformer=current: Tag:transformer=current
     transformer=distribution: Tag:transformer=distribution
     transformer=generator: Tag:transformer=generator
     transformer=main: Tag:transformer=main
     transformer=phase_angle_regulator: Tag:transformer=phase angle regulator
+    transformer=potential: Tag:transformer=potential
     transformer=traction: Tag:transformer=traction
     transformer=yes: Tag:transformer=yes
     trees=almond_trees: Tag:trees=almond trees
@@ -14779,6 +16349,8 @@ en:
     type=health: Tag:type=health
     type=multipolygon: Tag:type=multipolygon
     type=observation_spot: Tag:type=observation spot
+    type=person: Tag:type=person
+    type=provides_feature: Tag:type=provides feature
     type=public_transport: Tag:type=public transport
     type=restriction: Tag:type=restriction
     type=route: Tag:type=route
@@ -14788,6 +16360,7 @@ en:
     type=turnlanes:turns: Tag:type=turnlanes:turns
     type=waterway: Tag:type=waterway
     usage=branch: Tag:usage=branch
+    usage=derivation: Tag:usage=derivation
     usage=distribution: Tag:usage=distribution
     usage=facility: Tag:usage=facility
     usage=flare_header: Tag:usage=flare header
@@ -14797,9 +16370,12 @@ en:
     usage=industrial: Tag:usage=industrial
     usage=injection: Tag:usage=injection
     usage=irrigation: Tag:usage=irrigation
+    usage=leisure: Tag:usage=leisure
+    usage=link: Tag:usage=link
     usage=main: Tag:usage=main
     usage=military: Tag:usage=military
     usage=penstock: Tag:usage=penstock
+    usage=science: Tag:usage=science
     usage=spillway: Tag:usage=spillway
     usage=tailrace: Tag:usage=tailrace
     usage=test: Tag:usage=test
@@ -14807,6 +16383,7 @@ en:
     usage=transmission: Tag:usage=transmission
     usage=transportation: Tag:usage=transportation
     utility=chemical: Tag:utility=chemical
+    utility=eruv: Tag:utility=eruv
     utility=gas: Tag:utility=gas
     utility=heating: Tag:utility=heating
     utility=hydrant: Tag:utility=hydrant
@@ -14847,7 +16424,6 @@ en:
     vending=books: Tag:vending=books
     vending=bottle_return: Tag:vending=bottle return
     vending=bread: Tag:vending=bread
-    vending=bycicle_tube: Tag:vending=bycicle tube
     vending=candles: Tag:vending=candles
     vending=chemist: Tag:vending=chemist
     vending=chewing_gums: Tag:vending=chewing gums
@@ -14871,6 +16447,7 @@ en:
     vending=flowers: Tag:vending=flowers
     vending=food: Tag:vending=food
     vending=fuel: Tag:vending=fuel
+    vending=gas: Tag:vending=gas
     vending=gas_bottles: Tag:vending=gas bottles
     vending=ice_cream: Tag:vending=ice cream
     vending=ice_cubes: Tag:vending=ice cubes
@@ -14878,6 +16455,7 @@ en:
     vending=laundry_detergent: Tag:vending=laundry detergent
     vending=lottery: Tag:vending=lottery
     vending=milk: Tag:vending=milk
+    vending=movies: Tag:vending=movies
     vending=news_papers: Tag:vending=news papers
     vending=newspapers: Tag:vending=newspapers
     vending=parcel_mail_in: Tag:vending=parcel mail in
@@ -14891,6 +16469,7 @@ en:
     vending=public_transport_plans: Tag:vending=public transport plans
     vending=public_transport_tickets: Tag:vending=public transport tickets
     vending=raw_milk: Tag:vending=raw milk
+    vending=rice_polishing: Tag:vending=rice polishing
     vending=sex_toys: Tag:vending=sex toys
     vending=stamps: Tag:vending=stamps
     vending=sweets: Tag:vending=sweets
@@ -14900,8 +16479,19 @@ en:
     vending=toys: Tag:vending=toys
     vending=umbrellas: Tag:vending=umbrellas
     vending=water: Tag:vending=water
+    vending=wood_pellet: Tag:vending=wood pellet
     vending_machine: Tag:vending machine
     vending_machine=fuel: Tag:vending machine=fuel
+    via_ferrata=start: Tag:via ferrata=start
+    volcano:status=active: Tag:volcano:status=active
+    volcano:status=dormant: Tag:volcano:status=dormant
+    volcano:status=extinct: Tag:volcano:status=extinct
+    volcano:type=caldera: Tag:volcano:type=caldera
+    volcano:type=lava_dome: Tag:volcano:type=lava dome
+    volcano:type=maar: Tag:volcano:type=maar
+    volcano:type=scoria: Tag:volcano:type=scoria
+    volcano:type=shield: Tag:volcano:type=shield
+    volcano:type=stratovolcano: Tag:volcano:type=stratovolcano
     wall=brick: Tag:wall=brick
     wall=castle_wall: Tag:wall=castle wall
     wall=concrete: Tag:wall=concrete
@@ -14909,22 +16499,27 @@ en:
     wall=dry_stone: Tag:wall=dry stone
     wall=flint: Tag:wall=flint
     wall=flood_wall: Tag:wall=flood wall
+    wall=gabion: Tag:wall=gabion
     wall=gabion:value: Tag:wall=gabion:value
     wall=no: Tag:wall=no
     wall=noise_barrier: Tag:wall=noise barrier
+    wall=pise: Tag:wall=pise
     wall=pise:value: Tag:wall=pise:value
     wall=seawall: Tag:wall=seawall
     wall=stone: Tag:wall=stone
     wall=stone_wall: Tag:wall=stone wall
     wall=tire_barrier: Tag:wall=tire barrier
     wall=training_wall: Tag:wall=training wall
+    war_memorial=yes: Tag:war memorial=yes
     waste=ash: Tag:waste=ash
     waste=cigarettes: Tag:waste=cigarettes
     waste=dog_excrement: Tag:waste=dog excrement
     waste=drugs: Tag:waste=drugs
+    waste=flags: Tag:waste=flags
     waste=oil: Tag:waste=oil
     waste=organic: Tag:waste=organic
     waste=pizza_box: Tag:waste=pizza box
+    waste=recycling: Tag:waste=recycling
     waste=rubble: Tag:waste=rubble
     waste=sharps: Tag:waste=sharps
     waste=trash: Tag:waste=trash
@@ -14934,7 +16529,6 @@ en:
     water=dock: Tag:water=dock
     water=drain: Tag:water=drain
     water=fish_pass: Tag:water=fish pass
-    water=fishpond: Tag:water=fishpond
     water=harbour: Tag:water=harbour
     water=intermittent: Tag:water=intermittent
     water=kolk: Tag:water=kolk
@@ -14956,26 +16550,39 @@ en:
     water=wastewater: Tag:water=wastewater
     water_source=groundwater: Tag:water source=groundwater
     water_source=main: Tag:water source=main
+    water_source=pond: Tag:water source=pond
     water_source=river: Tag:water source=river
+    water_source=stream: Tag:water source=stream
+    water_source=tube_well: Tag:water source=tube well
+    water_source=water_tank: Tag:water source=water tank
+    water_source=water_works: Tag:water source=water works
+    water_works=desalination: Tag:water works=desalination
+    waterway=access_point: Tag:waterway=access point
     waterway=artificial: Tag:waterway=artificial
     waterway=boat_lift: Tag:waterway=boat lift
     waterway=boatyard: Tag:waterway=boatyard
     waterway=brook: Tag:waterway=brook
     waterway=canal: Tag:waterway=canal
     waterway=canoe_pass: Tag:waterway=canoe pass
+    waterway=confluence: Tag:waterway=confluence
     waterway=dam: Tag:waterway=dam
+    waterway=debris_screen: Tag:waterway=debris screen
     waterway=deep_well: Tag:waterway=deep well
     waterway=derelict_canal: Tag:waterway=derelict canal
     waterway=ditch: Tag:waterway=ditch
     waterway=dock: Tag:waterway=dock
     waterway=drain: Tag:waterway=drain
+    waterway=drainage_channel: Tag:waterway=drainage channel
     waterway=dredged_area: Tag:waterway=dredged area
     waterway=drystream: Tag:waterway=drystream
     waterway=fairway: Tag:waterway=fairway
     waterway=fish_pass: Tag:waterway=fish pass
     waterway=floating_barrier: Tag:waterway=floating barrier
+    waterway=floodgate: Tag:waterway=floodgate
     waterway=flow_control: Tag:waterway=flow control
+    waterway=flowline: Tag:waterway=flowline
     waterway=fuel: Tag:waterway=fuel
+    waterway=link: Tag:waterway=link
     waterway=lock_gate: Tag:waterway=lock gate
     waterway=milestone: Tag:waterway=milestone
     waterway=mooring: Tag:waterway=mooring
@@ -15015,9 +16622,12 @@ en:
     wetland=tidalflat: Tag:wetland=tidalflat
     wetland=wet_meadow: Tag:wetland=wet meadow
     wood=coniferous: Tag:wood=coniferous
+    wood=deciduous: Tag:wood=deciduous
     wood=eucalypt: Tag:wood=eucalypt
     wood=evergreen: Tag:wood=evergreen
+    wood=mixed: Tag:wood=mixed
     wood=nipa_palm: Tag:wood=nipa palm
+    wood=palm: Tag:wood=palm
     worship=stations_of_the_cross: Tag:worship=stations of the cross
     zone:traffic=BE-BRU:urban: Tag:zone:traffic=BE-BRU:urban
     zone:traffic=BE-VLG:rural: Tag:zone:traffic=BE-VLG:rural
@@ -15046,23 +16656,55 @@ eo:
     diet:*: Eo:Key:diet:*
     diet:vegan: Eo:Key:diet:vegan
     diet:vegetarian: Eo:Key:diet:vegetarian
+    leaf_cycle: Eo:Key:leaf cycle
+    self_harvesting: Eo:Key:self harvesting
     website:menu: Eo:Key:website:menu
   tag:
     aeroway=windsock: Eo:Tag:aeroway=windsock
     amenity=bench: Eo:Tag:amenity=bench
     amenity=cafe: Eo:Tag:amenity=cafe
     amenity=fast_food: Eo:Tag:amenity=fast food
+    amenity=place_of_worship: Eo:Tag:amenity=place of worship
     amenity=restaurant: Eo:Tag:amenity=restaurant
+    boules=petanque: Eo:Tag:boules=petanque
+    building=terraced_house: Eo:Tag:building=terraced house
     craft=tinsmith: Eo:Tag:craft=tinsmith
     esperanto=yes: Eo:Tag:esperanto=yes
     generator:source=solar: Eo:Tag:generator:source=solar
+    genus=Acer: Eo:Tag:genus=Acer
+    genus=Platanus: Eo:Tag:genus=Platanus
+    genus=Quercus: Eo:Tag:genus=Quercus
+    genus=Tilia: Eo:Tag:genus=Tilia
+    healthcare=physiotherapist: Eo:Tag:healthcare=physiotherapist
+    highway=bridleway: Eo:Tag:highway=bridleway
     highway=cycleway: Eo:Tag:highway=cycleway
     highway=street_lamp: Eo:Tag:highway=street lamp
+    leaf_cycle=evergreen: Eo:Tag:leaf cycle=evergreen
     leisure=picnic_table: Eo:Tag:leisure=picnic table
+    man_made=lighthouse: Eo:Tag:man made=lighthouse
+    natural=reef: Eo:Tag:natural=reef
     place=country: Eo:Tag:place=country
     place=hamlet: Eo:Tag:place=hamlet
     place=village: Eo:Tag:place=village
+    railway=disused: Eo:Tag:railway=disused
+    railway=funicular: Eo:Tag:railway=funicular
+    railway=miniature: Eo:Tag:railway=miniature
+    railway=narrow_gauge: Eo:Tag:railway=narrow gauge
+    religion=buddhist: Eo:Tag:religion=buddhist
+    religion=christian: Eo:Tag:religion=christian
+    religion=confucian: Eo:Tag:religion=confucian
+    religion=hindu: Eo:Tag:religion=hindu
+    religion=jain: Eo:Tag:religion=jain
+    religion=jewish: Eo:Tag:religion=jewish
+    religion=multifaith: Eo:Tag:religion=multifaith
+    religion=muslim: Eo:Tag:religion=muslim
+    religion=pagan: Eo:Tag:religion=pagan
+    religion=shinto: Eo:Tag:religion=shinto
+    religion=sikh: Eo:Tag:religion=sikh
+    religion=taoist: Eo:Tag:religion=taoist
     shop=bakery: Eo:Tag:shop=bakery
+    shop=shoes: Eo:Tag:shop=shoes
+    surface=dirt: Eo:Tag:surface=dirt
     waterway=river: Eo:Tag:waterway=river
 es:
   key:
@@ -15104,6 +16746,7 @@ es:
     aeroway: ES:Key:aeroway
     after_school: ES:Key:after school
     agricultural: ES:Key:agricultural
+    agroecology: ES:Key:agroecology
     alt_name: ES:Key:alt name
     amenity: ES:Key:amenity
     architect: ES:Key:architect
@@ -15148,6 +16791,7 @@ es:
     building:part: ES:Key:building:part
     building:soft_storey: ES:Key:building:soft storey
     building:use: ES:Key:building:use
+    buried:wikidata: ES:Key:buried:wikidata
     bus: ES:Key:bus
     bus_bay: ES:Key:bus bay
     busway: ES:Key:busway
@@ -15224,6 +16868,7 @@ es:
     currency: ES:Key:currency
     cutting: ES:Key:cutting
     cycle_rickshaw: ES:Key:cycle rickshaw
+    cyclestreet: ES:Key:cyclestreet
     cyclestreets_id: ES:Key:cyclestreets id
     cycleway: ES:Key:cycleway
     cycleway:both: ES:Key:cycleway:both
@@ -15240,6 +16885,7 @@ es:
     description: ES:Key:description
     designation: ES:Key:designation
     destination: ES:Key:destination
+    destination:ref: ES:Key:destination:ref
     diet: ES:Key:diet
     diet:*: ES:Key:diet:*
     diet:kosher: ES:Key:diet:kosher
@@ -15288,7 +16934,6 @@ es:
     flag:type: ES:Key:flag:type
     flood_date: ES:Key:flood date
     flood_mark: ES:Key:flood mark
-    flood_prone: ES:Key:flood prone
     foot: ES:Key:foot
     foot:backward: ES:Key:foot:backward
     footway: ES:Key:footway
@@ -15335,7 +16980,6 @@ es:
     incline: ES:Key:incline
     indoor: ES:Key:indoor
     industrial: ES:Key:industrial
-    informal: ES:Key:informal
     information: ES:Key:information
     inline_skates: ES:Key:inline skates
     inscription: ES:Key:inscription
@@ -15434,11 +17078,12 @@ es:
     name:etymology: ES:Key:name:etymology
     name:etymology:wikidata: ES:Key:name:etymology:wikidata
     name:eu-x-gaceria: ES:Key:name:eu-x-gaceria
+    name:gaceria: ES:Key:name:gaceria
+    name:gc: ES:Key:name:gc
     name:hop: ES:Key:name:hop
     name:left: ES:Key:name:left
     name:mtp: ES:Key:name:mtp
     name:right: ES:Key:name:right
-    name:signed: ES:Key:name:signed
     narrow: ES:Key:narrow
     nat_name: ES:Key:nat name
     nat_ref: ES:Key:nat ref
@@ -15453,6 +17098,7 @@ es:
     note: ES:Key:note
     nudism: ES:Key:nudism
     object: ES:Key:object
+    object:*: ES:Key:object:*
     office: ES:Key:office
     official_name: ES:Key:official name
     old_name: ES:Key:old name
@@ -15485,9 +17131,11 @@ es:
     passenger_lines: ES:Key:passenger lines
     passing_places: ES:Key:passing places
     payment: ES:Key:payment
+    payment:*: ES:Key:payment:*
     phone: ES:Key:phone
     place: ES:Key:place
     placement: ES:Key:placement
+    playground: ES:Key:playground
     police: ES:Key:police
     political_division: ES:Key:political division
     population: ES:Key:population
@@ -15513,13 +17161,17 @@ es:
     ramp: ES:Key:ramp
     rcn_ref: ES:Key:rcn ref
     real_ale: ES:Key:real ale
+    recording:remote: ES:Key:recording:remote
     recycling_type: ES:Key:recycling type
     ref: ES:Key:ref
+    ref:ES:ipcclm: ES:Key:ref:ES:ipcclm
     ref:bic: ES:Key:ref:bic
     ref:codcat: ES:Key:ref:codcat
     ref:color: ES:Key:ref:color
     ref:colour: ES:Key:ref:colour
+    ref:iaph: ES:Key:ref:iaph
     ref:ine: ES:Key:ref:ine
+    ref:ipcclm: ES:Key:ref:ipcclm
     ref:isil: ES:Key:ref:isil
     reg_name: ES:Key:reg name
     reg_ref: ES:Key:reg ref
@@ -15531,6 +17183,7 @@ es:
     residential: ES:Key:residential
     resource: ES:Key:resource
     restaurant: ES:Key:restaurant
+    restriction: ES:Key:restriction
     retreat: ES:Key:retreat
     review_requested: ES:Key:review requested
     roadtrain: ES:Key:roadtrain
@@ -15581,6 +17234,8 @@ es:
     stars: ES:Key:stars
     start_date: ES:Key:start date
     stop: ES:Key:stop
+    subject: ES:Key:subject
+    subject:wikidata: ES:Key:subject:wikidata
     substance: ES:Key:substance
     supervised: ES:Key:supervised
     support: ES:Key:support
@@ -15868,6 +17523,7 @@ es:
     amenity=public_bookcase: ES:Tag:amenity=public bookcase
     amenity=public_building: ES:Tag:amenity=public building
     amenity=ranger_station: ES:Tag:amenity=ranger station
+    amenity=reception_desk: ES:Tag:amenity=reception desk
     amenity=recycling: ES:Tag:amenity=recycling
     amenity=refugee_housing: ES:Tag:amenity=refugee housing
     amenity=refugee_site: ES:Tag:amenity=refugee site
@@ -15938,6 +17594,7 @@ es:
     artwork_type=sculpture: ES:Tag:artwork type=sculpture
     artwork_type=statue: ES:Tag:artwork type=statue
     atm=yes: ES:Tag:atm=yes
+    attraction=maze: ES:Tag:attraction=maze
     attraction=roller_coaster: ES:Tag:attraction=roller coaster
     attraction=water_slide: ES:Tag:attraction=water slide
     avalanche_protection=snow_bridge: ES:Tag:avalanche protection=snow bridge
@@ -15990,10 +17647,15 @@ es:
     barrier=wall: ES:Tag:barrier=wall
     barrier=wicket_gate: ES:Tag:barrier=wicket gate
     barrier=yes: ES:Tag:barrier=yes
+    basin=aeration: ES:Tag:basin=aeration
+    basin=cooling: ES:Tag:basin=cooling
     basin=detention: ES:Tag:basin=detention
     basin=evaporation: ES:Tag:basin=evaporation
+    basin=footbath: ES:Tag:basin=footbath
     basin=infiltration: ES:Tag:basin=infiltration
     basin=retention: ES:Tag:basin=retention
+    basin=settling: ES:Tag:basin=settling
+    basin=water_regeneration: ES:Tag:basin=water regeneration
     bicycle=no: ES:Tag:bicycle=no
     bicycle=use_sidepath: ES:Tag:bicycle=use sidepath
     bicycle=yes: ES:Tag:bicycle=yes
@@ -16118,6 +17780,7 @@ es:
     building=temple: ES:Tag:building=temple
     building=tent: ES:Tag:building=tent
     building=terrace: ES:Tag:building=terrace
+    building=terraced_house: ES:Tag:building=terraced house
     building=toilets: ES:Tag:building=toilets
     building=train_station: ES:Tag:building=train station
     building=transformer_tower: ES:Tag:building=transformer tower
@@ -16166,6 +17829,7 @@ es:
     club=tourism: ES:Tag:club=tourism
     club=youth_movement: ES:Tag:club=youth movement
     company=logistics: ES:Tag:company=logistics
+    content=salt: ES:Tag:content=salt
     covered=yes: ES:Tag:covered=yes
     craft=agricultural_engines: ES:Tag:craft=agricultural engines
     craft=atelier: ES:Tag:craft=atelier
@@ -16355,6 +18019,7 @@ es:
     cycleway=share_busway: ES:Tag:cycleway=share busway
     cycleway=shared_lane: ES:Tag:cycleway=shared lane
     cycleway=track: ES:Tag:cycleway=track
+    cycling=pump_track: ES:Tag:cycling=pump track
     denomination=mormon: ES:Tag:denomination=mormon
     designation=byway_open_to_all_traffic: ES:Tag:designation=byway open to all traffic
     designation=civil_parish: ES:Tag:designation=civil parish
@@ -16381,6 +18046,7 @@ es:
     emergency=fire_water_pond: ES:Tag:emergency=fire water pond
     emergency=first_aid: ES:Tag:emergency=first aid
     emergency=first_aid_kit: ES:Tag:emergency=first aid kit
+    emergency=ladder_site: ES:Tag:emergency=ladder site
     emergency=landing_site: ES:Tag:emergency=landing site
     emergency=life_ring: ES:Tag:emergency=life ring
     emergency=lifeboat_station: ES:Tag:emergency=lifeboat station
@@ -16417,6 +18083,7 @@ es:
     fence_type=wood: ES:Tag:fence type=wood
     flood_mark=painting: ES:Tag:flood mark=painting
     flood_mark=plaque: ES:Tag:flood mark=plaque
+    flood_prone=yes: ES:Tag:flood prone=yes
     flow_direction=both: ES:Tag:flow direction=both
     foot=use_sidepath: ES:Tag:foot=use sidepath
     foot=yes: ES:Tag:foot=yes
@@ -16439,6 +18106,9 @@ es:
       panel
     generator:type=solar_thermal_collector: ES:Tag:generator:type=solar thermal collector
     generator:type=vertical_axis: ES:Tag:generator:type=vertical axis
+    genus=Acer: ES:Tag:genus=Acer
+    genus=Platanus: ES:Tag:genus=Platanus
+    genus=Quercus: ES:Tag:genus=Quercus
     geological=columnar_jointing: ES:Tag:geological=columnar jointing
     geological=fault: ES:Tag:geological=fault
     geological=moraine: ES:Tag:geological=moraine
@@ -16471,11 +18141,13 @@ es:
     government=statistics: ES:Tag:government=statistics
     government=tax: ES:Tag:government=tax
     government=youth_welfare_department: ES:Tag:government=youth welfare department
+    hairdresser=barber: ES:Tag:hairdresser=barber
     hazard=animal_crossing: ES:Tag:hazard=animal crossing
     hazard=bump: ES:Tag:hazard=bump
     hazard=contamination: ES:Tag:hazard=contamination
     hazard=cyclists: ES:Tag:hazard=cyclists
     hazard=dangerous_junction: ES:Tag:hazard=dangerous junction
+    hazard=hole: ES:Tag:hazard=hole
     hazard=horse_riders: ES:Tag:hazard=horse riders
     hazard=queues_likely: ES:Tag:hazard=queues likely
     hazard=slippery: ES:Tag:hazard=slippery
@@ -16619,6 +18291,7 @@ es:
     industrial=auto_wrecker: ES:Tag:industrial=auto wrecker
     industrial=bakery: ES:Tag:industrial=bakery
     industrial=brickyard: ES:Tag:industrial=brickyard
+    industrial=concrete_plant: ES:Tag:industrial=concrete plant
     industrial=depot: ES:Tag:industrial=depot
     industrial=distributor: ES:Tag:industrial=distributor
     industrial=factory: ES:Tag:industrial=factory
@@ -16632,9 +18305,11 @@ es:
     industrial=scrap_yard: ES:Tag:industrial=scrap yard
     industrial=shipyard: ES:Tag:industrial=shipyard
     industrial=slaughterhouse: ES:Tag:industrial=slaughterhouse
+    industrial=trucking: ES:Tag:industrial=trucking
     industrial=warehouse: ES:Tag:industrial=warehouse
     industrial=well_cluster: ES:Tag:industrial=well cluster
     industrial=wellsite: ES:Tag:industrial=wellsite
+    informal=yes: ES:Tag:informal=yes
     information=board: ES:Tag:information=board
     information=guidepost: ES:Tag:information=guidepost
     information=map: ES:Tag:information=map
@@ -16759,6 +18434,7 @@ es:
     line=bay: ES:Tag:line=bay
     line=busbar: ES:Tag:line=busbar
     location=outdoor: ES:Tag:location=outdoor
+    location=underground: ES:Tag:location=underground
     man_made=adit: ES:Tag:man made=adit
     man_made=archimedes_screw: ES:Tag:man made=archimedes screw
     man_made=beacon: ES:Tag:man made=beacon
@@ -16944,7 +18620,11 @@ es:
     natural=water: ES:Tag:natural=water
     natural=wetland: ES:Tag:natural=wetland
     natural=wood: ES:Tag:natural=wood
+    network=BO:fundamental: ES:Tag:network=BO:fundamental
     network=CR:national: ES:Tag:network=CR:national
+    network=EC:national: ES:Tag:network=EC:national
+    network=EC:provincial: ES:Tag:network=EC:provincial
+    network=PE:national: ES:Tag:network=PE:national
     network=VE:L:PO: ES:Tag:network=VE:L:PO
     network=VE:R:PO: ES:Tag:network=VE:R:PO
     network=VE:T:PO: ES:Tag:network=VE:T:PO
@@ -16982,6 +18662,7 @@ es:
     office=lawyer: ES:Tag:office=lawyer
     office=logistics: ES:Tag:office=logistics
     office=moving_company: ES:Tag:office=moving company
+    office=natural_gas_utility: ES:Tag:office=natural gas utility
     office=newspaper: ES:Tag:office=newspaper
     office=ngo: ES:Tag:office=ngo
     office=notary: ES:Tag:office=notary
@@ -17008,6 +18689,7 @@ es:
     office=yes: ES:Tag:office=yes
     oneway:bicycle=yes: ES:Tag:oneway:bicycle=yes
     oneway=-1: ES:Tag:oneway=-1
+    oneway=alternating: ES:Tag:oneway=alternating
     oneway=reversible: ES:Tag:oneway=reversible
     oneway=yes: ES:Tag:oneway=yes
     opening_hours=24/7: ES:Tag:opening hours=24/7
@@ -17138,6 +18820,8 @@ es:
     railway=yard: ES:Tag:railway=yard
     recycling_type=centre: ES:Tag:recycling type=centre
     religion=christian: ES:Tag:religion=christian
+    religion=confucian: ES:Tag:religion=confucian
+    religion=multifaith: ES:Tag:religion=multifaith
     residential=apartments: ES:Tag:residential=apartments
     residential=halting_site: ES:Tag:residential=halting site
     residential=rural: ES:Tag:residential=rural
@@ -17190,6 +18874,7 @@ es:
     shelter_type=gazebo: ES:Tag:shelter type=gazebo
     shelter_type=lean_to: ES:Tag:shelter type=lean to
     shelter_type=pavilion: ES:Tag:shelter type=pavilion
+    shelter_type=pergola: ES:Tag:shelter type=pergola
     shelter_type=public_transport: ES:Tag:shelter type=public transport
     shop=agrarian: ES:Tag:shop=agrarian
     shop=alcohol: ES:Tag:shop=alcohol
@@ -17383,6 +19068,7 @@ es:
     shop=tiles: ES:Tag:shop=tiles
     shop=tobacco: ES:Tag:shop=tobacco
     shop=tool_hire: ES:Tag:shop=tool hire
+    shop=tortilla: ES:Tag:shop=tortilla
     shop=toys: ES:Tag:shop=toys
     shop=tractor: ES:Tag:shop=tractor
     shop=trade: ES:Tag:shop=trade
@@ -17490,6 +19176,7 @@ es:
     sport=ice_hockey: ES:Tag:sport=ice hockey
     sport=ice_skating: ES:Tag:sport=ice skating
     sport=ice_stock: ES:Tag:sport=ice stock
+    sport=in-line_hockey: ES:Tag:sport=in-line hockey
     sport=judo: ES:Tag:sport=judo
     sport=karate: ES:Tag:sport=karate
     sport=karting: ES:Tag:sport=karting
@@ -17566,6 +19253,7 @@ es:
     sport=zurkhaneh_sport: ES:Tag:sport=zurkhaneh sport
     station=subway: ES:Tag:station=subway
     stile=stepover: ES:Tag:stile=stepover
+    stone_type=conciliation_cross: ES:Tag:stone type=conciliation cross
     street_vendor=yes: ES:Tag:street vendor=yes
     substation=distribution: ES:Tag:substation=distribution
     substation=minor_distribution: ES:Tag:substation=minor distribution
@@ -17675,7 +19363,6 @@ es:
     tunnel=building_passage: ES:Tag:tunnel=building passage
     tunnel=culvert: ES:Tag:tunnel=culvert
     tunnel=flooded: ES:Tag:tunnel=flooded
-    tunnel=yes: ES:Tag:tunnel=yes
     type=public_transport: ES:Tag:type=public transport
     type=waterway: ES:Tag:type=waterway
     usage=main: ES:Tag:usage=main
@@ -17732,9 +19419,11 @@ es:
     wall=dry_stone: ES:Tag:wall=dry stone
     wall=flint: ES:Tag:wall=flint
     wall=flood_wall: ES:Tag:wall=flood wall
+    wall=gabion: ES:Tag:wall=gabion
     wall=gabion:value: ES:Tag:wall=gabion:value
     wall=no: ES:Tag:wall=no
     wall=noise_barrier: ES:Tag:wall=noise barrier
+    wall=pise: ES:Tag:wall=pise
     wall=pise:value: ES:Tag:wall=pise:value
     wall=seawall: ES:Tag:wall=seawall
     wall=stone: ES:Tag:wall=stone
@@ -17807,6 +19496,8 @@ es:
     winter_road=yes: ES:Tag:winter road=yes
     worship=stations_of_the_cross: ES:Tag:worship=stations of the cross
     zoo=falconry: ES:Tag:zoo=falconry
+    zoo=safari_park: ES:Tag:zoo=safari park
+    zoo=wildlife_park: ES:Tag:zoo=wildlife park
 et:
   key:
     addr: Et:Key:addr
@@ -17821,6 +19512,9 @@ et:
     amenity=library: Et:Tag:amenity=library
     amenity=taxi: Et:Tag:amenity=taxi
     building=roof: Et:Tag:building=roof
+    genus=Acer: Et:Tag:genus=Acer
+    genus=Tilia: Et:Tag:genus=Tilia
+    leaf_cycle=evergreen: Et:Tag:leaf cycle=evergreen
 fa:
   key:
     addr: Fa:Key:addr
@@ -17849,6 +19543,10 @@ fa:
     barrier=block: Fa:Tag:barrier=block
     barrier=cable_barrier: Fa:Tag:barrier=cable barrier
     canal=qanat: Fa:Tag:canal=qanat
+    genus=Acer: Fa:Tag:genus=Acer
+    genus=Platanus: Fa:Tag:genus=Platanus
+    genus=Quercus: Fa:Tag:genus=Quercus
+    healthcare=physiotherapist: Fa:Tag:healthcare=physiotherapist
     highway=footway: Fa:Tag:highway=footway
     highway=path: Fa:Tag:highway=path
     highway=residential: Fa:Tag:highway=residential
@@ -17861,6 +19559,8 @@ fa:
     highway=unclassified: Fa:Tag:highway=unclassified
     junction=jughandle: Fa:Tag:junction=jughandle
     junction=yes: Fa:Tag:junction=yes
+    leaf_cycle=evergreen: Fa:Tag:leaf cycle=evergreen
+    man_made=lighthouse: Fa:Tag:man made=lighthouse
     man_made=qanat: Fa:Tag:man made=qanat
     man_made=water_tower: Fa:Tag:man made=water tower
     natural=peak: Fa:Tag:natural=peak
@@ -17869,6 +19569,10 @@ fa:
     office=quango: Fa:Tag:office=quango
     place=country: Fa:Tag:place=country
     railway=level_crossing: Fa:Tag:railway=level crossing
+    religion=buddhist: Fa:Tag:religion=buddhist
+    religion=confucian: Fa:Tag:religion=confucian
+    religion=hindu: Fa:Tag:religion=hindu
+    religion=muslim: Fa:Tag:religion=muslim
     service=alley: Fa:Tag:service=alley
     shop=bookmaker: Fa:Tag:shop=bookmaker
     shop=garden_centre: Fa:Tag:shop=garden centre
@@ -17963,6 +19667,7 @@ fi:
     building=church: Fi:Tag:building=church
     building=garage: Fi:Tag:building=garage
     building=garages: Fi:Tag:building=garages
+    genus=Platanus: Fi:Tag:genus=Platanus
     hazard=curve: Fi:Tag:hazard=curve
     hazard=curves: Fi:Tag:hazard=curves
     highway=crossing: Fi:Tag:highway=crossing
@@ -17975,6 +19680,7 @@ fi:
     highway=tertiary: Fi:Tag:highway=tertiary
     highway=track: Fi:Tag:highway=track
     highway=unclassified: Fi:Tag:highway=unclassified
+    leaf_cycle=evergreen: Fi:Tag:leaf cycle=evergreen
     leisure=dance: Fi:Tag:leisure=dance
     leisure=dog_park: Fi:Tag:leisure=dog park
     leisure=slipway: Fi:Tag:leisure=slipway
@@ -18022,6 +19728,7 @@ fr:
     addr:suburb: FR:Key:addr:suburb
     admin_level: FR:Key:admin level
     advertising: FR:Key:advertising
+    aerial: FR:Key:aerial
     aeroway: FR:Key:aeroway
     agrarian: FR:Key:agrarian
     agricultural: FR:Key:agricultural
@@ -18045,6 +19752,7 @@ fr:
     backrest: FR:Key:backrest
     backward: FR:Key:backward
     bakehouse: FR:Key:bakehouse
+    balcony: FR:Key:balcony
     barrier: FR:Key:barrier
     baseball: FR:Key:baseball
     basilica: FR:Key:basilica
@@ -18061,11 +19769,15 @@ fr:
     books: FR:Key:books
     branch: FR:Key:branch
     brand: FR:Key:brand
+    brand:website: FR:Key:brand:website
+    brand:wikidata: FR:Key:brand:wikidata
+    brand:wikipedia: FR:Key:brand:wikipedia
     brewery: FR:Key:brewery
     bridge: FR:Key:bridge
     bridge:movable: FR:Key:bridge:movable
     bridge:structure: FR:Key:bridge:structure
     building: FR:Key:building
+    building:architecture: FR:Key:building:architecture
     building:flats: FR:Key:building:flats
     building:levels: FR:Key:building:levels
     building:material: FR:Key:building:material
@@ -18076,6 +19788,8 @@ fr:
     building:use: FR:Key:building:use
     bulk_purchase: FR:Key:bulk purchase
     bus: FR:Key:bus
+    bus:lanes: FR:Key:bus:lanes
+    bus_bay: FR:Key:bus bay
     busway: FR:Key:busway
     cables: FR:Key:cables
     cafe: FR:Key:cafe
@@ -18092,6 +19806,7 @@ fr:
     changesets_count: FR:Key:changesets count
     charge: FR:Key:charge
     check_date: FR:Key:check date
+    checkpoint: FR:Key:checkpoint
     circuits: FR:Key:circuits
     class:bicycle:commute: FR:Key:class:bicycle:commute
     clothes: FR:Key:clothes
@@ -18126,15 +19841,19 @@ fr:
     crop: FR:Key:crop
     crossing: FR:Key:crossing
     crossing:activation: FR:Key:crossing:activation
+    crossing:continuous: FR:Key:crossing:continuous
     crossing:island: FR:Key:crossing:island
     crossing:marking: FR:Key:crossing:marking
     crossing:markings: FR:Key:crossing:markings
+    crossing_ref: FR:Key:crossing ref
     cuisine: FR:Key:cuisine
     currency: FR:Key:currency
     currency:XLT: FR:Key:currency:XLT
     cutting: FR:Key:cutting
     cycle_barrier: FR:Key:cycle barrier
     cycle_barrier:installation: FR:Key:cycle barrier:installation
+    cycle_network: FR:Key:cycle network
+    cycle_rickshaw: FR:Key:cycle rickshaw
     cyclestreet: FR:Key:cyclestreet
     cycleway: FR:Key:cycleway
     cycleway:lane: FR:Key:cycleway:lane
@@ -18181,6 +19900,7 @@ fr:
     dryer: FR:Key:dryer
     duration: FR:Key:duration
     ele: FR:Key:ele
+    electrified: FR:Key:electrified
     email: FR:Key:email
     embankment: FR:Key:embankment
     embassy: FR:Key:embassy
@@ -18193,13 +19913,14 @@ fr:
     fast_food: FR:Key:fast food
     fax: FR:Key:fax
     fee: FR:Key:fee
+    fee:conditional: FR:Key:fee:conditional
     female: FR:Key:female
     fence_type: FR:Key:fence type
+    ferry:cable: FR:Key:ferry:cable
     fire_path: FR:Key:fire path
     fishing: FR:Key:fishing
     fixme: FR:Key:fixme
     floating: FR:Key:floating
-    flood_prone: FR:Key:flood prone
     foot: FR:Key:foot
     footway: FR:Key:footway
     foraging: FR:Key:foraging
@@ -18223,13 +19944,17 @@ fr:
     generator:output:steam: FR:Key:generator:output:steam
     generator:output:vacuum: FR:Key:generator:output:vacuum
     generator:plant: FR:Key:generator:plant
+    generator:solar:tracking: FR:Key:generator:solar:tracking
     generator:source: FR:Key:generator:source
+    genus: FR:Key:genus
     geological: FR:Key:geological
     government: FR:Key:government
     grande_circulation: FR:Key:grande circulation
+    gtfs:shape_id: FR:Key:gtfs:shape id
     handle: FR:Key:handle
     handrail: FR:Key:handrail
     happy_hours: FR:Key:happy hours
+    harassment_prevention: FR:Key:harassment prevention
     hazard: FR:Key:hazard
     hazmat: FR:Key:hazmat
     health_facility:CD: FR:Key:health facility:CD
@@ -18243,13 +19968,14 @@ fr:
     historic: FR:Key:historic
     historic:civilization: FR:Key:historic:civilization
     horse: FR:Key:horse
+    hot_water: FR:Key:hot water
     hov: FR:Key:hov
     image: FR:Key:image
     imagery_used: FR:Key:imagery used
     incline: FR:Key:incline
     indoor: FR:Key:indoor
     indoor_seating: FR:Key:indoor seating
-    informal: FR:Key:informal
+    industrial: FR:Key:industrial
     information: FR:Key:information
     inlet: FR:Key:inlet
     inscription: FR:Key:inscription
@@ -18267,6 +19993,7 @@ fr:
     lane_markings: FR:Key:lane markings
     lanes: FR:Key:lanes
     layer: FR:Key:layer
+    leaf_cycle: FR:Key:leaf cycle
     leaf_type: FR:Key:leaf type
     left: FR:Key:left
     legal_type: FR:Key:legal type
@@ -18274,7 +20001,9 @@ fr:
     length: FR:Key:length
     level: FR:Key:level
     lgbtq: FR:Key:lgbtq
+    license_classes: FR:Key:license classes
     lifeguard: FR:Key:lifeguard
+    light:colour: FR:Key:light:colour
     line_arrangement: FR:Key:line arrangement
     line_attachment: FR:Key:line attachment
     line_management: FR:Key:line management
@@ -18314,12 +20043,14 @@ fr:
     military: FR:Key:military
     min_age: FR:Key:min age
     minage: FR:Key:minage
+    minspeed: FR:Key:minspeed
     model: FR:Key:model
     monitoring:bicycle: FR:Key:monitoring:bicycle
     monitoring:groundwater: FR:Key:monitoring:groundwater
     monitoring:meteoric_activity: FR:Key:monitoring:meteoric activity
     monitoring:noise: FR:Key:monitoring:noise
     monitoring:water_level: FR:Key:monitoring:water level
+    monitoring:wind: FR:Key:monitoring:wind
     mooring: FR:Key:mooring
     motorboat: FR:Key:motorboat
     motorcycle:parking: FR:Key:motorcycle:parking
@@ -18329,11 +20060,13 @@ fr:
     mtb:scale: FR:Key:mtb:scale
     name: FR:Key:name
     name:br: FR:Key:name:br
+    name:eo: FR:Key:name:eo
     name:eu: FR:Key:name:eu
     name:oc: FR:Key:name:oc
     narrow: FR:Key:narrow
     nat_name: FR:Key:nat name
     natural: FR:Key:natural
+    navigationaid: FR:Key:navigationaid
     network: FR:Key:network
     non_existent_levels: FR:Key:non existent levels
     noref: FR:Key:noref
@@ -18351,11 +20084,14 @@ fr:
     opening_date: FR:Key:opening date
     opening_hours: FR:Key:opening hours
     opening_hours:covid19: FR:Key:opening hours:covid19
+    opening_hours:kitchen: FR:Key:opening hours:kitchen
+    opening_hours:url: FR:Key:opening hours:url
     openplaques:id: FR:Key:openplaques:id
     operator: FR:Key:operator
     operator:type: FR:Key:operator:type
     operator:wikidata: FR:Key:operator:wikidata
     organic: FR:Key:organic
+    orientation: FR:Key:orientation
     origin: FR:Key:origin
     outdoor_seating: FR:Key:outdoor seating
     outlet: FR:Key:outlet
@@ -18363,10 +20099,19 @@ fr:
     overtaking: FR:Key:overtaking
     overtaking:hgv: FR:Key:overtaking:hgv
     owner: FR:Key:owner
+    panoramax: FR:Key:panoramax
     par: FR:Key:par
     parish: FR:Key:parish
     park_ride: FR:Key:park ride
     parking: FR:Key:parking
+    parking:both: FR:Key:parking:both
+    parking:both:orientation: FR:Key:parking:both:orientation
+    parking:both:restriction:cycle_rickshaw: FR:Key:parking:both:restriction:cycle
+      rickshaw
+    parking:left: FR:Key:parking:left
+    parking:left:orientation: FR:Key:parking:left:orientation
+    parking:right: FR:Key:parking:right
+    parking:right:orientation: FR:Key:parking:right:orientation
     parking_space: FR:Key:parking space
     paved:date: FR:Key:paved:date
     payment: FR:Key:payment
@@ -18407,6 +20152,10 @@ fr:
     railway:tvm: FR:Key:railway:tvm
     ramp: FR:Key:ramp
     ramp:luggage: FR:Key:ramp:luggage
+    recording:remote: FR:Key:recording:remote
+    red_turn:left:bicycle: FR:Key:red turn:left:bicycle
+    red_turn:right:bicycle: FR:Key:red turn:right:bicycle
+    red_turn:straight:bicycle: FR:Key:red turn:straight:bicycle
     ref: FR:Key:ref
     ref:CD:CNOP: FR:Key:ref:CD:CNOP
     ref:CEF: FR:Key:ref:CEF
@@ -18415,6 +20164,7 @@ fr:
     ref:FR:42C: FR:Key:ref:FR:42C
     ref:FR:ANFR: FR:Key:ref:FR:ANFR
     ref:FR:ARCEP: FR:Key:ref:FR:ARCEP
+    ref:FR:CAIRN: FR:Key:ref:FR:CAIRN
     ref:FR:CEF: FR:Key:ref:FR:CEF
     ref:FR:CNC: FR:Key:ref:FR:CNC
     ref:FR:CRTA: FR:Key:ref:FR:CRTA
@@ -18429,11 +20179,16 @@ fr:
     ref:FR:Orange_mobile: FR:Key:ref:FR:Orange mobile
     ref:FR:PTT: FR:Key:ref:FR:PTT
     ref:FR:RNA: FR:Key:ref:FR:RNA
+    ref:FR:RNB: FR:Key:ref:FR:RNB
+    ref:FR:ROE: FR:Key:ref:FR:ROE
+    ref:FR:RPPS: FR:Key:ref:FR:RPPS
     ref:FR:RTE: FR:Key:ref:FR:RTE
     ref:FR:RTE_nom: FR:Key:ref:FR:RTE nom
     ref:FR:SFR: FR:Key:ref:FR:SFR
+    ref:FR:SINOE: FR:Key:ref:FR:SINOE
     ref:FR:SIREN: FR:Key:ref:FR:SIREN
     ref:FR:SIRET: FR:Key:ref:FR:SIRET
+    ref:FR:SIS: FR:Key:ref:FR:SIS
     ref:FR:SITCOM: FR:Key:ref:FR:SITCOM
     ref:FR:SNCF: FR:Key:ref:FR:SNCF
     ref:FR:SNCF-Réseau: FR:Key:ref:FR:SNCF-Réseau
@@ -18443,6 +20198,7 @@ fr:
     ref:FR:gdo: FR:Key:ref:FR:gdo
     ref:FR:museofile: FR:Key:ref:FR:museofile
     ref:INSEE: FR:Key:ref:INSEE
+    ref:MA:HCP: FR:Key:ref:MA:HCP
     ref:RTE:codnat: FR:Key:ref:RTE:codnat
     ref:UAI: FR:Key:ref:UAI
     ref:mhs: FR:Key:ref:mhs
@@ -18451,6 +20207,7 @@ fr:
     ref:sandre: FR:Key:ref:sandre
     reg_name: FR:Key:reg name
     religion: FR:Key:religion
+    rental: FR:Key:rental
     repair: FR:Key:repair
     repeat_on: FR:Key:repeat on
     reservation: FR:Key:reservation
@@ -18469,13 +20226,27 @@ fr:
     sac_scale: FR:Key:sac scale
     salt: FR:Key:salt
     sanitary_dump_station: FR:Key:sanitary dump station
+    seamark:cable_overhead:category: FR:Key:seamark:cable overhead:category
+    seamark:crane:category: FR:Key:seamark:crane:category
     seamark:fixme: FR:Key:seamark:fixme
+    seamark:hulk:category: FR:Key:seamark:hulk:category
+    seamark:marine_farm:category: FR:Key:seamark:marine farm:category
+    seamark:obstruction:category: FR:Key:seamark:obstruction:category
+    seamark:pilot_boarding:category: FR:Key:seamark:pilot boarding:category
+    seamark:platform:category: FR:Key:seamark:platform:category
+    seamark:production_area:category: FR:Key:seamark:production area:category
+    seamark:restricted_area:category: FR:Key:seamark:restricted area:category
+    seamark:sea_area:category: FR:Key:seamark:sea area:category
+    seamark:shoreline_construction:category: FR:Key:seamark:shoreline construction:category
+    seamark:waterway_gauge:category: FR:Key:seamark:waterway gauge:category
     seasonal: FR:Key:seasonal
     second_hand: FR:Key:second hand
     segregated: FR:Key:segregated
     self_checkout: FR:Key:self checkout
+    self_harvesting: FR:Key:self harvesting
     self_service: FR:Key:self service
     service: FR:Key:service
+    service:bicycle:*: FR:Key:service:bicycle:*
     service:bicycle:diy: FR:Key:service:bicycle:diy
     service:bicycle:miscellaneous: FR:Key:service:bicycle:miscellaneous
     service:bicycle:rental: FR:Key:service:bicycle:rental
@@ -18490,12 +20261,14 @@ fr:
     shoulder: FR:Key:shoulder
     sides: FR:Key:sides
     sidewalk: FR:Key:sidewalk
+    sidewalk:both:bicycle: FR:Key:sidewalk:both:bicycle
     sinkhole: FR:Key:sinkhole
     size: FR:Key:size
     smoothness: FR:Key:smoothness
     snowmobile: FR:Key:snowmobile
     social_facility: FR:Key:social facility
     social_facility:for: FR:Key:social facility:for
+    socket:*: FR:Key:socket:*
     source: FR:Key:source
     source:date: FR:Key:source:date
     source:maxspeed: FR:Key:source:maxspeed
@@ -18513,12 +20286,14 @@ fr:
     step_count: FR:Key:step count
     stop: FR:Key:stop
     substation: FR:Key:substation
+    supervised: FR:Key:supervised
     support: FR:Key:support
     surface: FR:Key:surface
     surveillance: FR:Key:surveillance
     surveillance:type: FR:Key:surveillance:type
     surveillance:zone: FR:Key:surveillance:zone
     survey:date: FR:Key:survey:date
+    swimming_pool: FR:Key:swimming pool
     switch: FR:Key:switch
     symbol: FR:Key:symbol
     tactile_paving: FR:Key:tactile paving
@@ -18533,6 +20308,7 @@ fr:
     timezone: FR:Key:timezone
     tobacco: FR:Key:tobacco
     toilets: FR:Key:toilets
+    toilets:menstrual_products: FR:Key:toilets:menstrual products
     toilets:wheelchair: FR:Key:toilets:wheelchair
     toll: FR:Key:toll
     tourism: FR:Key:tourism
@@ -18546,6 +20322,7 @@ fr:
     traffic_signals:direction: FR:Key:traffic signals:direction
     traffic_signals:sound: FR:Key:traffic signals:sound
     trail_visibility: FR:Key:trail visibility
+    train: FR:Key:train
     transformer: FR:Key:transformer
     trees: FR:Key:trees
     tunnel: FR:Key:tunnel
@@ -18585,6 +20362,7 @@ fr:
     winter_service: FR:Key:winter service
     wires: FR:Key:wires
     xmas:feature: FR:Key:xmas:feature
+    year_of_construction: FR:Key:year of construction
     zero_waste: FR:Key:zero waste
     zone:maxspeed: FR:Key:zone:maxspeed
     zoo: FR:Key:zoo
@@ -18599,6 +20377,7 @@ fr:
     access=permissive: FR:Tag:access=permissive
     access=permit: FR:Tag:access=permit
     access=private: FR:Tag:access=private
+    access=students: FR:Tag:access=students
     actuator=electric_motor: FR:Tag:actuator=electric motor
     actuator=hydraulic_cylinder: FR:Tag:actuator=hydraulic cylinder
     actuator=manual: FR:Tag:actuator=manual
@@ -18616,12 +20395,14 @@ fr:
     advertising=wall_painting: FR:Tag:advertising=wall painting
     aerialway=cable_car: FR:Tag:aerialway=cable car
     aerialway=chair_lift: FR:Tag:aerialway=chair lift
+    aerialway=magic_carpet: FR:Tag:aerialway=magic carpet
     aeroway=airtanker_base: FR:Tag:aeroway=airtanker base
     aeroway=apron: FR:Tag:aeroway=apron
     aeroway=gate: FR:Tag:aeroway=gate
     aeroway=hangar: FR:Tag:aeroway=hangar
     aeroway=helipad: FR:Tag:aeroway=helipad
     aeroway=holding_position: FR:Tag:aeroway=holding position
+    aeroway=navigationaid: FR:Tag:aeroway=navigationaid
     aeroway=parking_position: FR:Tag:aeroway=parking position
     aeroway=runway: FR:Tag:aeroway=runway
     aeroway=taxiway: FR:Tag:aeroway=taxiway
@@ -18644,9 +20425,11 @@ fr:
     amenity=biergarten: FR:Tag:amenity=biergarten
     amenity=binoculars: FR:Tag:amenity=binoculars
     amenity=bird_bath: FR:Tag:amenity=bird bath
+    amenity=blood_bank: FR:Tag:amenity=blood bank
     amenity=boat_rental: FR:Tag:amenity=boat rental
     amenity=boat_sharing: FR:Tag:amenity=boat sharing
     amenity=brothel: FR:Tag:amenity=brothel
+    amenity=bureau_de_change: FR:Tag:amenity=bureau de change
     amenity=bus_station: FR:Tag:amenity=bus station
     amenity=cafe: FR:Tag:amenity=cafe
     amenity=car_pooling: FR:Tag:amenity=car pooling
@@ -18654,16 +20437,15 @@ fr:
     amenity=car_sharing: FR:Tag:amenity=car sharing
     amenity=car_wash: FR:Tag:amenity=car wash
     amenity=casino: FR:Tag:amenity=casino
+    amenity=chair: FR:Tag:amenity=chair
     amenity=charging_station: FR:Tag:amenity=charging station
     amenity=childcare: FR:Tag:amenity=childcare
     amenity=cinema: FR:Tag:amenity=cinema
     amenity=clinic: FR:Tag:amenity=clinic
     amenity=clock: FR:Tag:amenity=clock
     amenity=college: FR:Tag:amenity=college
-    amenity=community_center: FR:Tag:amenity=community center
     amenity=community_centre: FR:Tag:amenity=community centre
     amenity=compressed_air: FR:Tag:amenity=compressed air
-    amenity=courthouse: FR:Tag:amenity=courthouse
     amenity=coworking_space: FR:Tag:amenity=coworking space
     amenity=crematorium: FR:Tag:amenity=crematorium
     amenity=crypt: FR:Tag:amenity=crypt
@@ -18677,14 +20459,13 @@ fr:
     amenity=driver_training: FR:Tag:amenity=driver training
     amenity=driving_school: FR:Tag:amenity=driving school
     amenity=dryer: FR:Tag:amenity=dryer
-    amenity=embassy: FR:Tag:amenity=embassy
     amenity=events_venue: FR:Tag:amenity=events venue
     amenity=fast_food: FR:Tag:amenity=fast food
     amenity=feeding_place: FR:Tag:amenity=feeding place
     amenity=ferry_terminal: FR:Tag:amenity=ferry terminal
-    amenity=fire_hydrant: FR:Tag:amenity=fire hydrant
     amenity=fire_station: FR:Tag:amenity=fire station
     amenity=food_court: FR:Tag:amenity=food court
+    amenity=food_sharing: FR:Tag:amenity=food sharing
     amenity=fountain: FR:Tag:amenity=fountain
     amenity=fuel: FR:Tag:amenity=fuel
     amenity=funeral_hall: FR:Tag:amenity=funeral hall
@@ -18698,6 +20479,7 @@ fr:
     amenity=hunting_stand: FR:Tag:amenity=hunting stand
     amenity=ice_cream: FR:Tag:amenity=ice cream
     amenity=karaoke_box: FR:Tag:amenity=karaoke box
+    amenity=kick-scooter_parking: FR:Tag:amenity=kick-scooter parking
     amenity=kindergarten: FR:Tag:amenity=kindergarten
     amenity=language_school: FR:Tag:amenity=language school
     amenity=lavoir: FR:Tag:amenity=lavoir
@@ -18718,7 +20500,6 @@ fr:
     amenity=music_school: FR:Tag:amenity=music school
     amenity=nightclub: FR:Tag:amenity=nightclub
     amenity=nursing_home: FR:Tag:amenity=nursing home
-    amenity=nutritionist: FR:Tag:amenity=nutritionist
     amenity=parcel_locker: FR:Tag:amenity=parcel locker
     amenity=parking: FR:Tag:amenity=parking
     amenity=parking_entrance: FR:Tag:amenity=parking entrance
@@ -18735,10 +20516,10 @@ fr:
     amenity=post_depot: FR:Tag:amenity=post depot
     amenity=post_office: FR:Tag:amenity=post office
     amenity=printer: FR:Tag:amenity=printer
-    amenity=prison: FR:Tag:amenity=prison
     amenity=pub: FR:Tag:amenity=pub
     amenity=public_bath: FR:Tag:amenity=public bath
     amenity=public_bookcase: FR:Tag:amenity=public bookcase
+    amenity=ranger_station: FR:Tag:amenity=ranger station
     amenity=reception_desk: FR:Tag:amenity=reception desk
     amenity=recycling: FR:Tag:amenity=recycling
     amenity=restaurant: FR:Tag:amenity=restaurant
@@ -18746,6 +20527,7 @@ fr:
     amenity=sanitary_dump_station: FR:Tag:amenity=sanitary dump station
     amenity=school: FR:Tag:amenity=school
     amenity=shelter: FR:Tag:amenity=shelter
+    amenity=shower: FR:Tag:amenity=shower
     amenity=smoking_area: FR:Tag:amenity=smoking area
     amenity=social_centre: FR:Tag:amenity=social centre
     amenity=social_facility: FR:Tag:amenity=social facility
@@ -18778,6 +20560,7 @@ fr:
     artwork_type=sculpture: FR:Tag:artwork type=sculpture
     atm=yes: FR:Tag:atm=yes
     attraction=animal: FR:Tag:attraction=animal
+    attraction=carousel: FR:Tag:attraction=carousel
     attraction=water_slide: FR:Tag:attraction=water slide
     barrier=bar: FR:Tag:barrier=bar
     barrier=barrier_board: FR:Tag:barrier=barrier board
@@ -18792,6 +20575,7 @@ fr:
     barrier=city_wall: FR:Tag:barrier=city wall
     barrier=cycle_barrier: FR:Tag:barrier=cycle barrier
     barrier=debris: FR:Tag:barrier=debris
+    barrier=delineators: FR:Tag:barrier=delineators
     barrier=ditch: FR:Tag:barrier=ditch
     barrier=entrance: FR:Tag:barrier=entrance
     barrier=fence: FR:Tag:barrier=fence
@@ -18831,6 +20615,7 @@ fr:
     bicycle_road=yes: FR:Tag:bicycle road=yes
     boules=petanque: FR:Tag:boules=petanque
     boundary=administrative: FR:Tag:boundary=administrative
+    boundary=forest_compartment: FR:Tag:boundary=forest compartment
     boundary=religious_administration: FR:Tag:boundary=religious administration
     boundary=special_economic_zone: FR:Tag:boundary=special economic zone
     brand=Trilib': FR:Tag:brand=Trilib'
@@ -18840,16 +20625,20 @@ fr:
     bridge=movable: FR:Tag:bridge=movable
     bridge=trestle: FR:Tag:bridge=trestle
     bridge=viaduct: FR:Tag:bridge=viaduct
+    building:part=balcony: FR:Tag:building:part=balcony
     building:prefabricated=yes: FR:Tag:building:prefabricated=yes
+    building=annexe: FR:Tag:building=annexe
     building=apartments: FR:Tag:building=apartments
     building=bakehouse: FR:Tag:building=bakehouse
     building=barn: FR:Tag:building=barn
+    building=beach_hut: FR:Tag:building=beach hut
     building=bridge: FR:Tag:building=bridge
     building=cabin: FR:Tag:building=cabin
     building=chapel: FR:Tag:building=chapel
     building=church: FR:Tag:building=church
     building=commercial: FR:Tag:building=commercial
     building=construction: FR:Tag:building=construction
+    building=cowshed: FR:Tag:building=cowshed
     building=data_center: FR:Tag:building=data center
     building=detached: FR:Tag:building=detached
     building=digester: FR:Tag:building=digester
@@ -18889,7 +20678,11 @@ fr:
     building=sty: FR:Tag:building=sty
     building=tent: FR:Tag:building=tent
     building=terrace: FR:Tag:building=terrace
+    building=terraced_house: FR:Tag:building=terraced house
     building=warehouse: FR:Tag:building=warehouse
+    building=water_tower: FR:Tag:building=water tower
+    building=yes: FR:Tag:building=yes
+    cafe=board_game: FR:Tag:cafe=board game
     cafe=time-cafe: FR:Tag:cafe=time-cafe
     cemetery=war_cemetery: FR:Tag:cemetery=war cemetery
     club=cadet: FR:Tag:club=cadet
@@ -18920,6 +20713,7 @@ fr:
     craft=carpenter: FR:Tag:craft=carpenter
     craft=carpet_layer: FR:Tag:craft=carpet layer
     craft=caterer: FR:Tag:craft=caterer
+    craft=cheese: FR:Tag:craft=cheese
     craft=chimney_sweeper: FR:Tag:craft=chimney sweeper
     craft=clockmaker: FR:Tag:craft=clockmaker
     craft=confectionery: FR:Tag:craft=confectionery
@@ -18987,12 +20781,16 @@ fr:
     craft=window_construction: FR:Tag:craft=window construction
     craft=winery: FR:Tag:craft=winery
     crossing=marked: FR:Tag:crossing=marked
+    crossing=traffic_signals: FR:Tag:crossing=traffic signals
     crossing=unmarked: FR:Tag:crossing=unmarked
     crossing=zebra: FR:Tag:crossing=zebra
     crossing_ref=zebra: FR:Tag:crossing ref=zebra
+    cuisine=barbecue: FR:Tag:cuisine=barbecue
     cuisine=coffee_shop: FR:Tag:cuisine=coffee shop
+    cuisine=moroccan: FR:Tag:cuisine=moroccan
     cuisine=sushi: FR:Tag:cuisine=sushi
     cuisine=teahouse: FR:Tag:cuisine=teahouse
+    cycleway:lane=exclusive: FR:Tag:cycleway:lane=exclusive
     cycleway:right=lane: FR:Tag:cycleway:right=lane
     cycleway=asl: FR:Tag:cycleway=asl
     cycleway=bike_box: FR:Tag:cycleway=bike box
@@ -19000,6 +20798,7 @@ fr:
     cycleway=opposite: FR:Tag:cycleway=opposite
     cycleway=opposite_lane: FR:Tag:cycleway=opposite lane
     cycleway=proposed: FR:Tag:cycleway=proposed
+    cycleway=separate: FR:Tag:cycleway=separate
     cycleway=share_busway: FR:Tag:cycleway=share busway
     cycleway=shared_lane: FR:Tag:cycleway=shared lane
     diplomatic=consulate: FR:Tag:diplomatic=consulate
@@ -19012,6 +20811,7 @@ fr:
     emergency=assembly_point: FR:Tag:emergency=assembly point
     emergency=control_centre: FR:Tag:emergency=control centre
     emergency=defibrillator: FR:Tag:emergency=defibrillator
+    emergency=disaster_response: FR:Tag:emergency=disaster response
     emergency=dry_riser_inlet: FR:Tag:emergency=dry riser inlet
     emergency=emergency_ward_entrance: FR:Tag:emergency=emergency ward entrance
     emergency=fire_alarm_box: FR:Tag:emergency=fire alarm box
@@ -19028,14 +20828,17 @@ fr:
     emergency=lifeguard_tower: FR:Tag:emergency=lifeguard tower
     emergency=mountain_rescue: FR:Tag:emergency=mountain rescue
     emergency=phone: FR:Tag:emergency=phone
+    emergency=shower: FR:Tag:emergency=shower
     emergency=siren: FR:Tag:emergency=siren
     emergency=suction_point: FR:Tag:emergency=suction point
     emergency=water_rescue_station: FR:Tag:emergency=water rescue station
     emergency=water_tank: FR:Tag:emergency=water tank
     fast_food=cafeteria: FR:Tag:fast food=cafeteria
+    flood_prone=yes: FR:Tag:flood prone=yes
     foot=designated: FR:Tag:foot=designated
     footway=access_aisle: FR:Tag:footway=access aisle
     footway=crossing: FR:Tag:footway=crossing
+    footway=link: FR:Tag:footway=link
     footway=sidewalk: FR:Tag:footway=sidewalk
     footway=traffic_island: FR:Tag:footway=traffic island
     generator:method=combustion: FR:Tag:generator:method=combustion
@@ -19058,12 +20861,22 @@ fr:
     generator:source=tidal: FR:Tag:generator:source=tidal
     generator:source=waste: FR:Tag:generator:source=waste
     generator:source=wind: FR:Tag:generator:source=wind
+    genus=Acer: FR:Tag:genus=Acer
+    genus=Platanus: FR:Tag:genus=Platanus
+    genus=Quercus: FR:Tag:genus=Quercus
+    genus=Tilia: FR:Tag:genus=Tilia
     government=ministry: FR:Tag:government=ministry
     government=register_office: FR:Tag:government=register office
     government=tax: FR:Tag:government=tax
+    government=watercourse_management: FR:Tag:government=watercourse management
     handle=lever: FR:Tag:handle=lever
     handle=wheel: FR:Tag:handle=wheel
+    harassement_prevention=ask_angela: FR:Tag:harassement prevention=ask angela
+    harassment_prevention=ask_angela: FR:Tag:harassment prevention=ask angela
     hazard=dangerous_junction: FR:Tag:hazard=dangerous junction
+    healthcare:speciality=family_planning: FR:Tag:healthcare:speciality=family planning
+    healthcare=alternative: FR:Tag:healthcare=alternative
+    healthcare=blood_bank: FR:Tag:healthcare=blood bank
     healthcare=blood_donation: FR:Tag:healthcare=blood donation
     healthcare=clinic: FR:Tag:healthcare=clinic
     healthcare=doctor: FR:Tag:healthcare=doctor
@@ -19072,12 +20885,14 @@ fr:
     healthcare=physiotherapist: FR:Tag:healthcare=physiotherapist
     healthcare=sample_collection: FR:Tag:healthcare=sample collection
     healthcare=vaccination_centre: FR:Tag:healthcare=vaccination centre
+    hgv=yes: FR:Tag:hgv=yes
     highway=bridleway: FR:Tag:highway=bridleway
     highway=bus_guideway: FR:Tag:highway=bus guideway
     highway=bus_stop: FR:Tag:highway=bus stop
     highway=busway: FR:Tag:highway=busway
     highway=crossing: FR:Tag:highway=crossing
     highway=cycleway: FR:Tag:highway=cycleway
+    highway=cyclist_waiting_aid: FR:Tag:highway=cyclist waiting aid
     highway=elevator: FR:Tag:highway=elevator
     highway=emergency_access_point: FR:Tag:highway=emergency access point
     highway=emergency_bay: FR:Tag:highway=emergency bay
@@ -19090,6 +20905,7 @@ fr:
     highway=motorway: FR:Tag:highway=motorway
     highway=motorway_junction: FR:Tag:highway=motorway junction
     highway=motorway_link: FR:Tag:highway=motorway link
+    highway=passing_place: FR:Tag:highway=passing place
     highway=path: FR:Tag:highway=path
     highway=pedestrian: FR:Tag:highway=pedestrian
     highway=primary: FR:Tag:highway=primary
@@ -19127,6 +20943,7 @@ fr:
     historic=fort: FR:Tag:historic=fort
     historic=gallows: FR:Tag:historic=gallows
     historic=highwater_mark: FR:Tag:historic=highwater mark
+    historic=lavoir: FR:Tag:historic=lavoir
     historic=locomotive: FR:Tag:historic=locomotive
     historic=memorial: FR:Tag:historic=memorial
     historic=milestone: FR:Tag:historic=milestone
@@ -19148,12 +20965,21 @@ fr:
     indoor=room: FR:Tag:indoor=room
     indoor=wall: FR:Tag:indoor=wall
     industrial=brewery: FR:Tag:industrial=brewery
+    informal=yes: FR:Tag:informal=yes
     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
+    information=visitor_centre: FR:Tag:information=visitor centre
+    inlet=bell_mouth: FR:Tag:inlet=bell mouth
+    inlet=direct: FR:Tag:inlet=direct
+    inlet=grate: FR:Tag:inlet=grate
+    inlet=kerb_grate: FR:Tag:inlet=kerb grate
+    inlet=kerb_opening: FR:Tag:inlet=kerb opening
+    inlet=screen: FR:Tag:inlet=screen
+    inlet=valve: FR:Tag:inlet=valve
     junction=roundabout: FR:Tag:junction=roundabout
     junction=yes: FR:Tag:junction=yes
     landcover=grass: FR:Tag:landcover=grass
@@ -19192,11 +21018,13 @@ fr:
     landuse=village_green: FR:Tag:landuse=village green
     landuse=vineyard: FR:Tag:landuse=vineyard
     leaf_cycle=deciduous: FR:Tag:leaf cycle=deciduous
+    leaf_cycle=evergreen: FR:Tag:leaf cycle=evergreen
     leaf_type=needleleaved: FR:Tag:leaf type=needleleaved
     leisure=bandstand: FR:Tag:leisure=bandstand
     leisure=bird_hide: FR:Tag:leisure=bird hide
     leisure=bleachers: FR:Tag:leisure=bleachers
     leisure=bowling_alley: FR:Tag:leisure=bowling alley
+    leisure=children_club: FR:Tag:leisure=children club
     leisure=dance: FR:Tag:leisure=dance
     leisure=dog_park: FR:Tag:leisure=dog park
     leisure=escape_game: FR:Tag:leisure=escape game
@@ -19238,15 +21066,19 @@ fr:
     line_management=termination: FR:Tag:line management=termination
     line_management=transition: FR:Tag:line management=transition
     line_management=transpose: FR:Tag:line management=transpose
+    location:transition=yes: FR:Tag:location:transition=yes
     location=overground: FR:Tag:location=overground
     location=underground: FR:Tag:location=underground
     man_made=adit: FR:Tag:man made=adit
+    man_made=advertising: FR:Tag:man made=advertising
     man_made=architecture_line: FR:Tag:man made=architecture line
     man_made=beehive: FR:Tag:man made=beehive
+    man_made=bioswale: FR:Tag:man made=bioswale
     man_made=bridge: FR:Tag:man made=bridge
     man_made=bunker_silo: FR:Tag:man made=bunker silo
     man_made=carpet_hanger: FR:Tag:man made=carpet hanger
     man_made=cellar_entrance: FR:Tag:man made=cellar entrance
+    man_made=charge_point: FR:Tag:man made=charge point
     man_made=chimney: FR:Tag:man made=chimney
     man_made=cross: FR:Tag:man made=cross
     man_made=cutline: FR:Tag:man made=cutline
@@ -19254,6 +21086,7 @@ fr:
     man_made=embankment: FR:Tag:man made=embankment
     man_made=flagpole: FR:Tag:man made=flagpole
     man_made=flare: FR:Tag:man made=flare
+    man_made=frost_fan: FR:Tag:man made=frost fan
     man_made=gantry: FR:Tag:man made=gantry
     man_made=goods_conveyor: FR:Tag:man made=goods conveyor
     man_made=heap: FR:Tag:man made=heap
@@ -19297,21 +21130,25 @@ fr:
     marker=post: FR:Tag:marker=post
     marker=stone: FR:Tag:marker=stone
     material=concrete: FR:Tag:material=concrete
+    mechanical_coupling=nodding_donkey: FR:Tag:mechanical coupling=nodding donkey
     mechanical_driver=combustion_engine: FR:Tag:mechanical driver=combustion engine
     mechanical_driver=manual: FR:Tag:mechanical driver=manual
     mechanical_driver=reciprocating_solenoid: FR:Tag:mechanical driver=reciprocating
       solenoid
     medical=aed: FR:Tag:medical=aed
+    megalith_type=dolmen: FR:Tag:megalith type=dolmen
     megalith_type=menhir: FR:Tag:megalith type=menhir
     memorial=ghost_bike: FR:Tag:memorial=ghost bike
     memorial=plaque: FR:Tag:memorial=plaque
     memorial=war_memorial: FR:Tag:memorial=war memorial
     microbrewery=yes: FR:Tag:microbrewery=yes
     military=bunker: FR:Tag:military=bunker
+    motor_vehicle=no: FR:Tag:motor vehicle=no
     natural=anthill: FR:Tag:natural=anthill
     natural=bare_rock: FR:Tag:natural=bare rock
     natural=beach: FR:Tag:natural=beach
     natural=blockfield: FR:Tag:natural=blockfield
+    natural=cape: FR:Tag:natural=cape
     natural=cave_entrance: FR:Tag:natural=cave entrance
     natural=cliff: FR:Tag:natural=cliff
     natural=coastline: FR:Tag:natural=coastline
@@ -19321,6 +21158,7 @@ fr:
     natural=isthmus: FR:Tag:natural=isthmus
     natural=peak: FR:Tag:natural=peak
     natural=peninsula: FR:Tag:natural=peninsula
+    natural=reef: FR:Tag:natural=reef
     natural=rock: FR:Tag:natural=rock
     natural=saddle: FR:Tag:natural=saddle
     natural=scree: FR:Tag:natural=scree
@@ -19336,6 +21174,12 @@ fr:
     natural=water: FR:Tag:natural=water
     natural=wetland: FR:Tag:natural=wetland
     natural=wood: FR:Tag:natural=wood
+    navigationaid=als: FR:Tag:navigationaid=als
+    navigationaid=papi: FR:Tag:navigationaid=papi
+    navigationaid=rwe: FR:Tag:navigationaid=rwe
+    navigationaid=txc: FR:Tag:navigationaid=txc
+    navigationaid=txe: FR:Tag:navigationaid=txe
+    navigationaid=vasi: FR:Tag:navigationaid=vasi
     network:type=node_network: FR:Tag:network:type=node network
     network=lcn: FR:Tag:network=lcn
     noexit=yes: FR:Tag:noexit=yes
@@ -19382,8 +21226,13 @@ fr:
     outlet=screen: FR:Tag:outlet=screen
     outlet=sock: FR:Tag:outlet=sock
     outlet=valve: FR:Tag:outlet=valve
+    parking:both=lane: FR:Tag:parking:both=lane
+    parking:both=no: FR:Tag:parking:both=no
+    parking:left=lane: FR:Tag:parking:left=lane
+    parking:right=lane: FR:Tag:parking:right=lane
     parking=street_side: FR:Tag:parking=street side
     parking=surface: FR:Tag:parking=surface
+    parking_space=charging: FR:Tag:parking space=charging
     parking_space=disabled: FR:Tag:parking space=disabled
     pipeline=substation: FR:Tag:pipeline=substation
     pipeline=surge_tank: FR:Tag:pipeline=surge tank
@@ -19399,6 +21248,7 @@ fr:
     place=locality: FR:Tag:place=locality
     place=municipality: FR:Tag:place=municipality
     place=neighbourhood: FR:Tag:place=neighbourhood
+    place=plot: FR:Tag:place=plot
     place=province: FR:Tag:place=province
     place=region: FR:Tag:place=region
     place=square: FR:Tag:place=square
@@ -19467,24 +21317,28 @@ fr:
     railway=switch: FR:Tag:railway=switch
     railway=tram: FR:Tag:railway=tram
     railway=tram_stop: FR:Tag:railway=tram stop
+    railway=ventilation_shaft: FR:Tag:railway=ventilation shaft
     railway=wash: FR:Tag:railway=wash
     railway=water_crane: FR:Tag:railway=water crane
     recycling_type=centre: FR:Tag:recycling type=centre
     recycling_type=container: FR:Tag:recycling type=container
     religion=buddhist: FR:Tag:religion=buddhist
     religion=christian: FR:Tag:religion=christian
+    religion=confucian: FR:Tag:religion=confucian
     religion=hindu: FR:Tag:religion=hindu
     religion=jain: FR:Tag:religion=jain
     religion=jewish: FR:Tag:religion=jewish
+    religion=multifaith: FR:Tag:religion=multifaith
     religion=muslim: FR:Tag:religion=muslim
     religion=pagan: FR:Tag:religion=pagan
     religion=shinto: FR:Tag:religion=shinto
     religion=sikh: FR:Tag:religion=sikh
     religion=taoist: FR:Tag:religion=taoist
-    religion=zoroastrian: FR:Tag:religion=zoroastrian
+    rental=event: FR:Tag:rental=event
     repair=assisted_self_service: FR:Tag:repair=assisted self service
     request_stop=yes: FR:Tag:request stop=yes
     residential=halting_site: FR:Tag:residential=halting site
+    roof:shape=gabled: FR:Tag:roof:shape=gabled
     route=bicycle: FR:Tag:route=bicycle
     route=bus: FR:Tag:route=bus
     route=coach: FR:Tag:route=coach
@@ -19495,8 +21349,16 @@ fr:
     route=piste: FR:Tag:route=piste
     route=railway: FR:Tag:route=railway
     route=subway: FR:Tag:route=subway
+    route=train: FR:Tag:route=train
     route=tram: FR:Tag:route=tram
     route=transhumance: FR:Tag:route=transhumance
+    seamark:type=anchorage: FR:Tag:seamark:type=anchorage
+    seamark:type=beacon_cardinal: FR:Tag:seamark:type=beacon cardinal
+    seamark:type=buoy_safe_water: FR:Tag:seamark:type=buoy safe water
+    seamark:type=cable_area: FR:Tag:seamark:type=cable area
+    seamark:type=cable_overhead: FR:Tag:seamark:type=cable overhead
+    seamark:type=dumping_ground: FR:Tag:seamark:type=dumping ground
+    seamark:type=rescue_station: FR:Tag:seamark:type=rescue station
     segregated=no: FR:Tag:segregated=no
     segregated=yes: FR:Tag:segregated=yes
     service=alley: FR:Tag:service=alley
@@ -19511,7 +21373,9 @@ fr:
     shop=agrarian: FR:Tag:shop=agrarian
     shop=alcohol: FR:Tag:shop=alcohol
     shop=anime: FR:Tag:shop=anime
+    shop=antiques: FR:Tag:shop=antiques
     shop=baby_goods: FR:Tag:shop=baby goods
+    shop=bag: FR:Tag:shop=bag
     shop=bakery: FR:Tag:shop=bakery
     shop=bathroom_furnishing: FR:Tag:shop=bathroom furnishing
     shop=beauty: FR:Tag:shop=beauty
@@ -19535,6 +21399,8 @@ fr:
     shop=convenience: FR:Tag:shop=convenience
     shop=copyshop: FR:Tag:shop=copyshop
     shop=cosmetics: FR:Tag:shop=cosmetics
+    shop=craft: FR:Tag:shop=craft
+    shop=dairy: FR:Tag:shop=dairy
     shop=deli: FR:Tag:shop=deli
     shop=department_store: FR:Tag:shop=department store
     shop=dive: FR:Tag:shop=dive
@@ -19567,16 +21433,20 @@ fr:
     shop=kiosk: FR:Tag:shop=kiosk
     shop=kitchen: FR:Tag:shop=kitchen
     shop=laundry: FR:Tag:shop=laundry
+    shop=leather: FR:Tag:shop=leather
     shop=mall: FR:Tag:shop=mall
     shop=massage: FR:Tag:shop=massage
     shop=medical_supply: FR:Tag:shop=medical supply
     shop=military_surplus: FR:Tag:shop=military surplus
     shop=mobile_phone: FR:Tag:shop=mobile phone
+    shop=model: FR:Tag:shop=model
     shop=motorcycle: FR:Tag:shop=motorcycle
     shop=music: FR:Tag:shop=music
     shop=newsagent: FR:Tag:shop=newsagent
     shop=optician: FR:Tag:shop=optician
     shop=outdoor: FR:Tag:shop=outdoor
+    shop=outpost: FR:Tag:shop=outpost
+    shop=paint: FR:Tag:shop=paint
     shop=pastry: FR:Tag:shop=pastry
     shop=pest_control: FR:Tag:shop=pest control
     shop=pet: FR:Tag:shop=pet
@@ -19593,9 +21463,11 @@ fr:
     shop=supermarket: FR:Tag:shop=supermarket
     shop=tattoo: FR:Tag:shop=tattoo
     shop=ticket: FR:Tag:shop=ticket
+    shop=tiles: FR:Tag:shop=tiles
     shop=tobacco: FR:Tag:shop=tobacco
     shop=toys: FR:Tag:shop=toys
     shop=trade: FR:Tag:shop=trade
+    shop=travel_agency: FR:Tag:shop=travel agency
     shop=vacant: FR:Tag:shop=vacant
     shop=variety_store: FR:Tag:shop=variety store
     shop=video: FR:Tag:shop=video
@@ -19604,9 +21476,13 @@ fr:
     shop=window_blind: FR:Tag:shop=window blind
     sinkhole=estavelle: FR:Tag:sinkhole=estavelle
     social_facility=ambulatory_care: FR:Tag:social facility=ambulatory care
+    social_facility=assisted_living: FR:Tag:social facility=assisted living
+    social_facility=group_home: FR:Tag:social facility=group home
+    social_facility=nursing_home: FR:Tag:social facility=nursing home
     sport=10pin: FR:Tag:sport=10pin
     sport=8pin: FR:Tag:sport=8pin
     sport=archery: FR:Tag:sport=archery
+    sport=basketball: FR:Tag:sport=basketball
     sport=billiards: FR:Tag:sport=billiards
     sport=bmx: FR:Tag:sport=bmx
     sport=boules: FR:Tag:sport=boules
@@ -19637,6 +21513,8 @@ fr:
     substation=traction: FR:Tag:substation=traction
     substation=transition: FR:Tag:substation=transition
     substation=transmission: FR:Tag:substation=transmission
+    surface=dirt: FR:Tag:surface=dirt
+    surface=sett: FR:Tag:surface=sett
     switch=circuit_breaker: FR:Tag:switch=circuit breaker
     switch=disconnector: FR:Tag:switch=disconnector
     switch=earthing: FR:Tag:switch=earthing
@@ -19688,8 +21566,11 @@ fr:
     traffic_calming=dynamic_bump: FR:Tag:traffic calming=dynamic bump
     traffic_calming=hump: FR:Tag:traffic calming=hump
     traffic_calming=island: FR:Tag:traffic calming=island
+    traffic_calming=painted_island: FR:Tag:traffic calming=painted island
     traffic_calming=rumble_strip: FR:Tag:traffic calming=rumble strip
     traffic_calming=table: FR:Tag:traffic calming=table
+    traffic_calming=yes: FR:Tag:traffic calming=yes
+    traffic_sign=FR:C115: FR:Tag:traffic sign=FR:C115
     traffic_sign=city_limit: FR:Tag:traffic sign=city limit
     transformer=auxiliary: FR:Tag:transformer=auxiliary
     transformer=converter: FR:Tag:transformer=converter
@@ -19745,6 +21626,11 @@ fr:
     wall=noise_barrier: FR:Tag:wall=noise barrier
     waste=cigarettes: FR:Tag:waste=cigarettes
     waste=dog_excrement: FR:Tag:waste=dog excrement
+    waste=drugs: FR:Tag:waste=drugs
+    waste=oil: FR:Tag:waste=oil
+    waste=organic: FR:Tag:waste=organic
+    waste=recycling: FR:Tag:waste=recycling
+    waste=trash: FR:Tag:waste=trash
     water=pond: FR:Tag:water=pond
     water=reservoir: FR:Tag:water=reservoir
     water=river: FR:Tag:water=river
@@ -19806,6 +21692,7 @@ gcf:
     cuisine=pizza: Gcf:Tag:cuisine=pizza
     emergency=defibrillator: Gcf:Tag:emergency=defibrillator
     emergency=siren: Gcf:Tag:emergency=siren
+    genus=Platanus: Gcf:Tag:genus=Platanus
     highway=primary: Gcf:Tag:highway=primary
     highway=services: Gcf:Tag:highway=services
     highway=street_lamp: Gcf:Tag:highway=street lamp
@@ -19901,6 +21788,13 @@ gl:
 he:
   key:
     fax: He:Key:fax
+  tag:
+    religion=jewish: He:Tag:religion=jewish
+    religion=muslim: He:Tag:religion=muslim
+hi:
+  tag:
+    genus=Acer: Hi:Tag:genus=Acer
+    religion=hindu: Hi:Tag:religion=hindu
 hr:
   key:
     addr: Hr:Key:addr
@@ -19919,6 +21813,9 @@ hr:
     amenity=atm: Hr:Tag:amenity=atm
     amenity=bank: Hr:Tag:amenity=bank
     amenity=school: Hr:Tag:amenity=school
+    genus=Tilia: Hr:Tag:genus=Tilia
+    leaf_cycle=evergreen: Hr:Tag:leaf cycle=evergreen
+    religion=christian: Hr:Tag:religion=christian
 ht:
   key:
     intermittent: Ht:Key:intermittent
@@ -19926,6 +21823,7 @@ ht:
 hu:
   key:
     HU:ed_direction: Hu:Key:HU:ed direction
+    HU:hu-go: Hu:Key:HU:hu-go
     HU:hu-go:length: Hu:Key:HU:hu-go:length
     HU:hu-go:milestone: Hu:Key:HU:hu-go:milestone
     HU:hu-go:road: Hu:Key:HU:hu-go:road
@@ -19957,6 +21855,7 @@ hu:
     place: Hu:Key:place
     railway: Hu:Key:railway
     ref:HU:edid: Hu:Key:ref:HU:edid
+    ref:HU:kir_site: Hu:Key:ref:HU:kir site
     ref:HU:om: Hu:Key:ref:HU:om
     shop: Hu:Key:shop
     smoothness: Hu:Key:smoothness
@@ -19973,6 +21872,9 @@ hu:
   tag:
     barrier=bollard: Hu:Tag:barrier=bollard
     boundary=administrative: Hu:Tag:boundary=administrative
+    genus=Platanus: Hu:Tag:genus=Platanus
+    genus=Quercus: Hu:Tag:genus=Quercus
+    genus=Tilia: Hu:Tag:genus=Tilia
     highway=service: Hu:Tag:highway=service
     highway=street_lamp: Hu:Tag:highway=street lamp
     highway=track: Hu:Tag:highway=track
@@ -19987,17 +21889,32 @@ hu:
     natural=water: Hu:Tag:natural=water
     railway=level_crossing: Hu:Tag:railway=level crossing
     refitted=yes: Hu:Tag:refitted=yes
+    religion=buddhist: Hu:Tag:religion=buddhist
 id:
   key:
     boundary: Id:Key:boundary
     place: Id:Key:place
   tag:
+    building=terraced_house: Id:Tag:building=terraced house
+    genus=Acer: Id:Tag:genus=Acer
+    genus=Platanus: Id:Tag:genus=Platanus
     guest_house=student_accomodation: Id:Tag:guest house=student accomodation
     highway=track: Id:Tag:highway=track
+    leaf_cycle=evergreen: Id:Tag:leaf cycle=evergreen
     place=square: Id:Tag:place=square
+    religion=buddhist: Id:Tag:religion=buddhist
+    religion=christian: Id:Tag:religion=christian
+    religion=confucian: Id:Tag:religion=confucian
+    religion=hindu: Id:Tag:religion=hindu
+    religion=muslim: Id:Tag:religion=muslim
+    religion=shinto: Id:Tag:religion=shinto
+    religion=taoist: Id:Tag:religion=taoist
     shop=pawnbroker: Id:Tag:shop=pawnbroker
     tourism=guest_house: Id:Tag:tourism=guest house
     waterway=tidal_channel: Id:Tag:waterway=tidal channel
+is:
+  tag:
+    leaf_cycle=evergreen: Is:Tag:leaf cycle=evergreen
 it:
   key:
     abandoned: IT:Key:abandoned
@@ -20008,6 +21925,7 @@ it:
     addr:housenumber: IT:Key:addr:housenumber
     addr:postcode: IT:Key:addr:postcode
     addr:street: IT:Key:addr:street
+    advertising: IT:Key:advertising
     aerialway: IT:Key:aerialway
     aeroway: IT:Key:aeroway
     alt_name: IT:Key:alt name
@@ -20040,6 +21958,7 @@ it:
     contact: IT:Key:contact
     contact:*: IT:Key:contact:*
     contact:facebook: IT:Key:contact:facebook
+    contact:tripadvisor: IT:Key:contact:tripadvisor
     contact:twitter: IT:Key:contact:twitter
     covered: IT:Key:covered
     craft: IT:Key:craft
@@ -20063,6 +21982,7 @@ it:
     drink:*: IT:Key:drink:*
     ele: IT:Key:ele
     embankment: IT:Key:embankment
+    emergency: IT:Key:emergency
     enforcement: IT:Key:enforcement
     est_width: IT:Key:est width
     fee: IT:Key:fee
@@ -20072,6 +21992,7 @@ it:
     ford: IT:Key:ford
     fruit: IT:Key:fruit
     fuel: IT:Key:fuel
+    fuel:*: IT:Key:fuel:*
     garden:type: IT:Key:garden:type
     generator:output: IT:Key:generator:output
     geological: IT:Key:geological
@@ -20081,7 +22002,10 @@ it:
     highway: IT:Key:highway
     historic: IT:Key:historic
     incline: IT:Key:incline
+    informal: IT:Key:informal
+    inscription: IT:Key:inscription
     internet_access: IT:Key:internet access
+    it:fvg:ctrn:revision: IT:Key:it:fvg:ctrn:revision
     junction: IT:Key:junction
     kerb: IT:Key:kerb
     landuse: IT:Key:landuse
@@ -20092,6 +22016,7 @@ it:
     lit: IT:Key:lit
     lit_by_led: IT:Key:lit by led
     lock: IT:Key:lock
+    luminous: IT:Key:luminous
     man_made: IT:Key:man made
     manhole: IT:Key:manhole
     manufacturer: IT:Key:manufacturer
@@ -20103,6 +22028,7 @@ it:
     maxstay: IT:Key:maxstay
     maxweight: IT:Key:maxweight
     maxwidth: IT:Key:maxwidth
+    memorial: IT:Key:memorial
     military: IT:Key:military
     mofa: IT:Key:mofa
     mooring: IT:Key:mooring
@@ -20122,7 +22048,9 @@ it:
     name:left: IT:Key:name:left
     name:right: IT:Key:name:right
     natural: IT:Key:natural
+    noexit: IT:Key:noexit
     nohousenumber: IT:Key:nohousenumber
+    not:name: IT:Key:not:name
     note: IT:Key:note
     office: IT:Key:office
     oneway: IT:Key:oneway
@@ -20145,10 +22073,13 @@ it:
     ref: IT:Key:ref
     ref:REI: IT:Key:ref:REI
     ref:catasto: IT:Key:ref:catasto
+    ref:masaf: IT:Key:ref:masaf
     ref:mise: IT:Key:ref:mise
     ref:msal: IT:Key:ref:msal
     ref:vatin: IT:Key:ref:vatin
+    ref:whc: IT:Key:ref:whc
     religion: IT:Key:religion
+    reservation:website: IT:Key:reservation:website
     residential: IT:Key:residential
     roof:shape: IT:Key:roof:shape
     roundtrip: IT:Key:roundtrip
@@ -20162,13 +22093,16 @@ it:
     service:bicycle:repair: IT:Key:service:bicycle:repair
     service:bicycle:retail: IT:Key:service:bicycle:retail
     service:bicycle:second_hand: IT:Key:service:bicycle:second hand
+    shelter_type: IT:Key:shelter type
     shop: IT:Key:shop
     sidewalk: IT:Key:sidewalk
     smoothness: IT:Key:smoothness
     social_facility:for: IT:Key:social facility:for
+    speech_output: IT:Key:speech output
     sport: IT:Key:sport
     stamps: IT:Key:stamps
     stop: IT:Key:stop
+    subject:wikidata: IT:Key:subject:wikidata
     surface: IT:Key:surface
     surveillance: IT:Key:surveillance
     tank_trap: IT:Key:tank trap
@@ -20185,6 +22119,7 @@ it:
     usage: IT:Key:usage
     voltage: IT:Key:voltage
     waterway: IT:Key:waterway
+    website:menu: IT:Key:website:menu
     wheelchair: IT:Key:wheelchair
     width: IT:Key:width
     wikidata: IT:Key:wikidata
@@ -20192,6 +22127,16 @@ it:
     zone:maxspeed: IT:Key:zone:maxspeed
   tag:
     access=customers: IT:Tag:access=customers
+    access=private: IT:Tag:access=private
+    advertising=billboard: IT:Tag:advertising=billboard
+    advertising=column: IT:Tag:advertising=column
+    advertising=flag: IT:Tag:advertising=flag
+    advertising=poster_box: IT:Tag:advertising=poster box
+    advertising=screen: IT:Tag:advertising=screen
+    advertising=sculpture: IT:Tag:advertising=sculpture
+    advertising=sign: IT:Tag:advertising=sign
+    advertising=tarp: IT:Tag:advertising=tarp
+    advertising=wall_painting: IT:Tag:advertising=wall painting
     aerialway=magic_carpet: IT:Tag:aerialway=magic carpet
     aeroway=aerodrome: IT:Tag:aeroway=aerodrome
     aeroway=airstrip: IT:Tag:aeroway=airstrip
@@ -20237,6 +22182,7 @@ it:
     amenity=ice_cream: IT:Tag:amenity=ice cream
     amenity=kindergarten: IT:Tag:amenity=kindergarten
     amenity=lavoir: IT:Tag:amenity=lavoir
+    amenity=lounger: IT:Tag:amenity=lounger
     amenity=milk_dispenser: IT:Tag:amenity=milk dispenser
     amenity=nightclub: IT:Tag:amenity=nightclub
     amenity=parcel_locker: IT:Tag:amenity=parcel locker
@@ -20259,6 +22205,7 @@ it:
     amenity=waste_basket: IT:Tag:amenity=waste basket
     amenity=watering_place: IT:Tag:amenity=watering place
     amenity=weighbridge: IT:Tag:amenity=weighbridge
+    area:highway=traffic_island: IT:Tag:area:highway=traffic island
     barrier=block: IT:Tag:barrier=block
     barrier=bollard: IT:Tag:barrier=bollard
     barrier=border_control: IT:Tag:barrier=border control
@@ -20309,6 +22256,7 @@ it:
     building=retail: IT:Tag:building=retail
     building=roof: IT:Tag:building=roof
     building=ruins: IT:Tag:building=ruins
+    building=terraced_house: IT:Tag:building=terraced house
     building=train_station: IT:Tag:building=train station
     building=yes: IT:Tag:building=yes
     castle_type=fortress: IT:Tag:castle type=fortress
@@ -20386,13 +22334,18 @@ it:
     crossing=traffic_signals: IT:Tag:crossing=traffic signals
     emergency=assembly_point: IT:Tag:emergency=assembly point
     emergency=defibrillator: IT:Tag:emergency=defibrillator
+    emergency=disaster_response: IT:Tag:emergency=disaster response
     emergency=emergency_ward_entrance: IT:Tag:emergency=emergency ward entrance
     emergency=fire_hydrant: IT:Tag:emergency=fire hydrant
+    emergency=ladder_site: IT:Tag:emergency=ladder site
     emergency=landing_site: IT:Tag:emergency=landing site
     esperanto=yes: IT:Tag:esperanto=yes
     footway=crossing: IT:Tag:footway=crossing
     footway=sidewalk: IT:Tag:footway=sidewalk
     generator:source=nuclear: IT:Tag:generator:source=nuclear
+    genus=Acer: IT:Tag:genus=Acer
+    genus=Platanus: IT:Tag:genus=Platanus
+    genus=Quercus: IT:Tag:genus=Quercus
     geological=moraine: IT:Tag:geological=moraine
     geological=outcrop: IT:Tag:geological=outcrop
     geological=palaeontological_site: IT:Tag:geological=palaeontological site
@@ -20426,10 +22379,12 @@ it:
     historic=castle: IT:Tag:historic=castle
     historic=castle_wall: IT:Tag:historic=castle wall
     historic=locomotive: IT:Tag:historic=locomotive
+    historic=memorial: IT:Tag:historic=memorial
     historic=monument: IT:Tag:historic=monument
     historic=paleontological_site: IT:Tag:historic=paleontological site
     historic=wayside_shrine: IT:Tag:historic=wayside shrine
     industrial=auto_wrecker: IT:Tag:industrial=auto wrecker
+    informal=yes: IT:Tag:informal=yes
     internet_access=wlan: IT:Tag:internet access=wlan
     junction=roundabout: IT:Tag:junction=roundabout
     junction=yes: IT:Tag:junction=yes
@@ -20441,6 +22396,7 @@ it:
     landuse=residential: IT:Tag:landuse=residential
     landuse=retail: IT:Tag:landuse=retail
     landuse=salt_pond: IT:Tag:landuse=salt pond
+    leaf_cycle=evergreen: IT:Tag:leaf cycle=evergreen
     leisure=beach_resort: IT:Tag:leisure=beach resort
     leisure=dog_park: IT:Tag:leisure=dog park
     leisure=garden: IT:Tag:leisure=garden
@@ -20472,8 +22428,10 @@ it:
     office=foundation: IT:Tag:office=foundation
     office=graphic_design: IT:Tag:office=graphic design
     office=it: IT:Tag:office=it
+    office=surveyor: IT:Tag:office=surveyor
     oneway=alternating: IT:Tag:oneway=alternating
     parking=street_side: IT:Tag:parking=street side
+    path=desire: IT:Tag:path=desire
     place=allotments: IT:Tag:place=allotments
     place=archipelago: IT:Tag:place=archipelago
     place=borough: IT:Tag:place=borough
@@ -20520,6 +22478,8 @@ it:
     public_transport=stop_area: IT:Tag:public transport=stop area
     public_transport=stop_position: IT:Tag:public transport=stop position
     railway=level_crossing: IT:Tag:railway=level crossing
+    religion=christian: IT:Tag:religion=christian
+    residential=halting_site: IT:Tag:residential=halting site
     residential=rural: IT:Tag:residential=rural
     residential=urban: IT:Tag:residential=urban
     route=bus: IT:Tag:route=bus
@@ -20554,6 +22514,7 @@ it:
     shop=kiosk: IT:Tag:shop=kiosk
     shop=laundry: IT:Tag:shop=laundry
     shop=mall: IT:Tag:shop=mall
+    shop=military_surplus: IT:Tag:shop=military surplus
     shop=motorcycle: IT:Tag:shop=motorcycle
     shop=newsagent: IT:Tag:shop=newsagent
     shop=pastry: IT:Tag:shop=pastry
@@ -20576,6 +22537,7 @@ it:
     sport=ice_hockey: IT:Tag:sport=ice hockey
     sport=roller_hockey: IT:Tag:sport=roller hockey
     sport=surfing: IT:Tag:sport=surfing
+    statue=equestrian: IT:Tag:statue=equestrian
     summit:cross=yes: IT:Tag:summit:cross=yes
     telecom=data_center: IT:Tag:telecom=data center
     telecom=exchange: IT:Tag:telecom=exchange
@@ -20583,11 +22545,13 @@ it:
     tourism=artwork: IT:Tag:tourism=artwork
     tourism=museum: IT:Tag:tourism=museum
     tourism=picnic_site: IT:Tag:tourism=picnic site
+    tourism=wilderness_hut: IT:Tag:tourism=wilderness hut
     vending=parcel_pickup: IT:Tag:vending=parcel pickup
     vending=parking_tickets: IT:Tag:vending=parking tickets
     vending=toll: IT:Tag:vending=toll
     water=basin: IT:Tag:water=basin
     waterway=ditch: IT:Tag:waterway=ditch
+    waterway=rapids: IT:Tag:waterway=rapids
     waterway=river: IT:Tag:waterway=river
     waterway=stream: IT:Tag:waterway=stream
 ja:
@@ -20642,6 +22606,7 @@ ja:
     architect: JA:Key:architect
     area: JA:Key:area
     area:highway: JA:Key:area:highway
+    armrest: JA:Key:armrest
     artist_name: JA:Key:artist name
     artwork_subject: JA:Key:artwork subject
     artwork_type: JA:Key:artwork type
@@ -20662,6 +22627,7 @@ ja:
     bath:type: JA:Key:bath:type
     bbq: JA:Key:bbq
     bdouble: JA:Key:bdouble
+    beauty: JA:Key:beauty
     beds: JA:Key:beds
     bell_tower: JA:Key:bell tower
     bench: JA:Key:bench
@@ -20673,6 +22639,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
@@ -20738,7 +22705,11 @@ ja:
     collection_times: JA:Key:collection times
     colour: JA:Key:colour
     comment: JA:Key:comment
+    communication:*: JA:Key:communication:*
+    communication:microwave: JA:Key:communication:microwave
     communication:mobile_phone: JA:Key:communication:mobile phone
+    communication:radio: JA:Key:communication:radio
+    communication:television: JA:Key:communication:television
     community_centre: JA:Key:community centre
     community_centre:for: JA:Key:community centre:for
     condition: JA:Key:condition
@@ -20781,12 +22752,14 @@ ja:
     cycle_network: JA:Key:cycle network
     cycleway: JA:Key:cycleway
     cycleway:both: JA:Key:cycleway:both
+    cycleway:lane: JA:Key:cycleway:lane
     cycleway:left: JA:Key:cycleway:left
     cycleway:right: JA:Key:cycleway:right
     date: JA:Key:date
     delivery: JA:Key:delivery
     'demolished:': 'JA:Key:demolished:'
     demolished:*: JA:Key:demolished:*
+    demolished:building: JA:Key:demolished:building
     denomination: JA:Key:denomination
     denotation: JA:Key:denotation
     departures_board: JA:Key:departures board
@@ -20796,6 +22769,7 @@ ja:
     designation: JA:Key:designation
     destination: JA:Key:destination
     destination:lanes: JA:Key:destination:lanes
+    destroyed:*: JA:Key:destroyed:*
     detour: JA:Key:detour
     diameter: JA:Key:diameter
     diet: JA:Key:diet
@@ -20837,16 +22811,17 @@ ja:
     expressway: JA:Key:expressway
     facebook: JA:Key:facebook
     faces: JA:Key:faces
+    factory: JA:Key:factory
     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
+    fire_hydrant:*: JA:Key:fire hydrant:*
     fire_mains: JA:Key:fire mains
     fire_service_inlet: JA:Key:fire service inlet
     fire_sprinkler: JA:Key:fire sprinkler
@@ -20855,7 +22830,6 @@ ja:
     fixme: JA:Key:fixme
     floating: JA:Key:floating
     flood_mark: JA:Key:flood mark
-    flood_prone: JA:Key:flood prone
     food: JA:Key:food
     foot: JA:Key:foot
     foot:backward: JA:Key:foot:backward
@@ -20938,7 +22912,6 @@ ja:
     indoor_seating: JA:Key:indoor seating
     indoormark: JA:Key:indoormark
     industrial: JA:Key:industrial
-    informal: JA:Key:informal
     information: JA:Key:information
     inline_skates: JA:Key:inline skates
     inscription: JA:Key:inscription
@@ -21055,7 +23028,6 @@ ja:
     name:ja-Latn: JA:Key:name:ja-Latn
     name:ja_kana: JA:Key:name:ja kana
     name:ja_rm: JA:Key:name:ja rm
-    name:kn:iso15919: JA:Key:name:kn:iso15919
     name:left: JA:Key:name:left
     name:right: JA:Key:name:right
     narrow: JA:Key:narrow
@@ -21085,10 +23057,12 @@ ja:
     opening_hours: JA:Key:opening hours
     opening_hours/Tutorial: JA:Key:opening hours/Tutorial
     opening_hours:covid19: JA:Key:opening hours:covid19
+    opening_hours:drive_through: JA:Key:opening hours:drive through
     openplaques:id: JA:Key:openplaques:id
     operator: JA:Key:operator
     operator:ja: JA:Key:operator:ja
     operator:type: JA:Key:operator:type
+    operator:wikidata: JA:Key:operator:wikidata
     organic: JA:Key:organic
     origin: JA:Key:origin
     osmc:symbol: JA:Key:osmc:symbol
@@ -21113,6 +23087,7 @@ ja:
     plant: JA:Key:plant
     plant:output: JA:Key:plant:output
     playground: JA:Key:playground
+    playground:theme: JA:Key:playground:theme
     police: JA:Key:police
     population: JA:Key:population
     post_box:type: JA:Key:post box:type
@@ -21154,6 +23129,7 @@ ja:
     removed: JA:Key:removed
     'removed:': 'JA:Key:removed:'
     removed:*: JA:Key:removed:*
+    removed:building: JA:Key:removed:building
     rental: JA:Key:rental
     repair: JA:Key:repair
     reservation: JA:Key:reservation
@@ -21192,6 +23168,7 @@ ja:
     short_name: JA:Key:short name
     shoulder: JA:Key:shoulder
     shower: JA:Key:shower
+    shrubbery:density: JA:Key:shrubbery:density
     sides: JA:Key:sides
     sidewalk: JA:Key:sidewalk
     sidewalk_orientation: JA:Key:sidewalk orientation
@@ -21314,8 +23291,13 @@ ja:
     wikimedia_commons: JA:Key:wikimedia commons
     wikipedia: JA:Key:wikipedia
     winter_road: JA:Key:winter road
+    winter_service: JA:Key:winter service
+    winter_service:gritting: JA:Key:winter service:gritting
+    winter_service:heating: JA:Key:winter service:heating
+    winter_service:salting: JA:Key:winter service:salting
     wires: JA:Key:wires
     wood: JA:Key:wood
+    year_of_construction: JA:Key:year of construction
     yh:LINE_NAME: JA:Key:yh:LINE NAME
     yh:LINE_NUM: JA:Key:yh:LINE NUM
     yh:STRUCTURE: JA:Key:yh:STRUCTURE
@@ -21426,7 +23408,6 @@ ja:
     amenity=clinic: JA:Tag:amenity=clinic
     amenity=clock: JA:Tag:amenity=clock
     amenity=college: JA:Tag:amenity=college
-    amenity=community_center: JA:Tag:amenity=community center
     amenity=community_centre: JA:Tag:amenity=community centre
     amenity=compressed_air: JA:Tag:amenity=compressed air
     amenity=conference_centre: JA:Tag:amenity=conference centre
@@ -21518,6 +23499,7 @@ ja:
     amenity=recycling: JA:Tag:amenity=recycling
     amenity=refugee_site: JA:Tag:amenity=refugee site
     amenity=register_office: JA:Tag:amenity=register office
+    amenity=rescue_station: JA:Tag:amenity=rescue station
     amenity=research_institute: JA:Tag:amenity=research institute
     amenity=restaurant: JA:Tag:amenity=restaurant
     amenity=retirement_home: JA:Tag:amenity=retirement home
@@ -21536,6 +23518,7 @@ ja:
     amenity=stripclub: JA:Tag:amenity=stripclub
     amenity=studio: JA:Tag:amenity=studio
     amenity=swimming_pool: JA:Tag:amenity=swimming pool
+    amenity=swingerclub: JA:Tag:amenity=swingerclub
     amenity=table: JA:Tag:amenity=table
     amenity=taxi: JA:Tag:amenity=taxi
     amenity=telephone: JA:Tag:amenity=telephone
@@ -21574,6 +23557,7 @@ ja:
     barrier=cattle_grid: JA:Tag:barrier=cattle grid
     barrier=chain: JA:Tag:barrier=chain
     barrier=city_wall: JA:Tag:barrier=city wall
+    barrier=coupure: JA:Tag:barrier=coupure
     barrier=cycle_barrier: JA:Tag:barrier=cycle barrier
     barrier=ditch: JA:Tag:barrier=ditch
     barrier=entrance: JA:Tag:barrier=entrance
@@ -21597,6 +23581,7 @@ ja:
     bath:type=onsen: JA:Tag:bath:type=onsen
     bay=fjord: JA:Tag:bay=fjord
     bicycle=designated: JA:Tag:bicycle=designated
+    bicycle=no: JA:Tag:bicycle=no
     bicycle=use_sidepath: JA:Tag:bicycle=use sidepath
     bicycle_road=yes: JA:Tag:bicycle road=yes
     boundary=administrative: JA:Tag:boundary=administrative
@@ -21775,7 +23760,9 @@ ja:
     cuisine=coffee_shop: JA:Tag:cuisine=coffee shop
     cuisine=dessert: JA:Tag:cuisine=dessert
     cuisine=dumpling: JA:Tag:cuisine=dumpling
+    cuisine=dumplings: JA:Tag:cuisine=dumplings
     cuisine=japanese: JA:Tag:cuisine=japanese
+    cuisine=pancake: JA:Tag:cuisine=pancake
     cuisine=regional: JA:Tag:cuisine=regional
     cuisine=sushi: JA:Tag:cuisine=sushi
     cycle_network=JP:prefectural: JA:Tag:cycle network=JP:prefectural
@@ -21797,27 +23784,44 @@ ja:
     diplomatic=consulate: JA:Tag:diplomatic=consulate
     diplomatic=embassy: JA:Tag:diplomatic=embassy
     emergency:social_facility=shelter: JA:Tag:emergency:social facility=shelter
+    emergency=access_point: JA:Tag:emergency=access point
+    emergency=air_rescue_service: JA:Tag:emergency=air rescue service
     emergency=ambulance_station: JA:Tag:emergency=ambulance station
     emergency=assembly_point: JA:Tag:emergency=assembly point
     emergency=defibrillator: JA:Tag:emergency=defibrillator
+    emergency=designated: JA:Tag:emergency=designated
+    emergency=disaster_help_point: JA:Tag:emergency=disaster help point
+    emergency=disaster_response: JA:Tag:emergency=disaster response
+    emergency=drinking_water: JA:Tag:emergency=drinking water
     emergency=dry_riser_inlet: JA:Tag:emergency=dry riser inlet
     emergency=emergency_ward_entrance: JA:Tag:emergency=emergency ward entrance
     emergency=fire_alarm_box: JA:Tag:emergency=fire alarm box
     emergency=fire_extinguisher: JA:Tag:emergency=fire extinguisher
+    emergency=fire_flapper: JA:Tag:emergency=fire flapper
     emergency=fire_hose: JA:Tag:emergency=fire hose
     emergency=fire_hydrant: JA:Tag:emergency=fire hydrant
     emergency=fire_lookout: JA:Tag:emergency=fire lookout
+    emergency=fire_point_stand: JA:Tag:emergency=fire point stand
+    emergency=fire_sand_bin: JA:Tag:emergency=fire sand bin
     emergency=fire_service_inlet: JA:Tag:emergency=fire service inlet
     emergency=fire_water_pond: JA:Tag:emergency=fire water pond
+    emergency=first_aid: JA:Tag:emergency=first aid
+    emergency=first_aid_kit: JA:Tag:emergency=first aid kit
     emergency=landing_site: JA:Tag:emergency=landing site
+    emergency=life_ring: JA:Tag:emergency=life ring
+    emergency=lifeguard: JA:Tag:emergency=lifeguard
     emergency=lifeguard_tower: JA:Tag:emergency=lifeguard tower
+    emergency=mountain_rescue: JA:Tag:emergency=mountain rescue
     emergency=phone: JA:Tag:emergency=phone
+    emergency=rescue_box: JA:Tag:emergency=rescue box
     emergency=siren: JA:Tag:emergency=siren
     emergency=suction_point: JA:Tag:emergency=suction point
+    emergency=water_rescue: JA:Tag:emergency=water rescue
     emergency=water_tank: JA:Tag:emergency=water tank
     entrance=main: JA:Tag:entrance=main
     entrance=staircase: JA:Tag:entrance=staircase
     fast_food=cafeteria: JA:Tag:fast food=cafeteria
+    flood_prone=yes: JA:Tag:flood prone=yes
     foot=designated: JA:Tag:foot=designated
     foot=private: JA:Tag:foot=private
     footway=crossing: JA:Tag:footway=crossing
@@ -21868,6 +23872,9 @@ ja:
     generator:type=steam_generator: JA:Tag:generator:type=steam generator
     generator:type=steam_turbine: JA:Tag:generator:type=steam turbine
     generator:type=vertical_axis: JA:Tag:generator:type=vertical axis
+    genus=Acer: JA:Tag:genus=Acer
+    genus=Platanus: JA:Tag:genus=Platanus
+    genus=Quercus: JA:Tag:genus=Quercus
     geological=fault: JA:Tag:geological=fault
     geological=moraine: JA:Tag:geological=moraine
     geological=outcrop: JA:Tag:geological=outcrop
@@ -21883,9 +23890,11 @@ ja:
     government=tax: JA:Tag:government=tax
     government=transportation: JA:Tag:government=transportation
     guidepost=simple: JA:Tag:guidepost=simple
+    hairdresser=barber: JA:Tag:hairdresser=barber
     healthcare:speciality=gynaecology: JA:Tag:healthcare:speciality=gynaecology
     healthcare=blood_donation: JA:Tag:healthcare=blood donation
     healthcare=doctor: JA:Tag:healthcare=doctor
+    healthcare=physiotherapist: JA:Tag:healthcare=physiotherapist
     healthcare=vaccination_centre: JA:Tag:healthcare=vaccination centre
     hgv=designated: JA:Tag:hgv=designated
     hgv=destination: JA:Tag:hgv=destination
@@ -21994,8 +24003,10 @@ ja:
     industrial=shipyard: JA:Tag:industrial=shipyard
     industrial=slaughterhouse: JA:Tag:industrial=slaughterhouse
     industrial=steelmaking: JA:Tag:industrial=steelmaking
+    industrial=trucking: JA:Tag:industrial=trucking
     industrial=warehouse: JA:Tag:industrial=warehouse
     industrial=well_cluster: JA:Tag:industrial=well cluster
+    informal=yes: JA:Tag:informal=yes
     information=board: JA:Tag:information=board
     information=guidepost: JA:Tag:information=guidepost
     information=map: JA:Tag:information=map
@@ -22105,6 +24116,7 @@ ja:
     line=busbar: JA:Tag:line=busbar
     man_made=adit: JA:Tag:man made=adit
     man_made=animal_trap: JA:Tag:man made=animal trap
+    man_made=antenna: JA:Tag:man made=antenna
     man_made=avalanche_protection: JA:Tag:man made=avalanche protection
     man_made=beacon: JA:Tag:man made=beacon
     man_made=beehive: JA:Tag:man made=beehive
@@ -22129,6 +24141,7 @@ ja:
     man_made=embankment: JA:Tag:man made=embankment
     man_made=flagpole: JA:Tag:man made=flagpole
     man_made=flare: JA:Tag:man made=flare
+    man_made=footwear_decontamination: JA:Tag:man made=footwear decontamination
     man_made=gantry: JA:Tag:man made=gantry
     man_made=gasometer: JA:Tag:man made=gasometer
     man_made=geoglyph: JA:Tag:man made=geoglyph
@@ -22152,6 +24165,7 @@ ja:
     man_made=reservoir_covered: JA:Tag:man made=reservoir covered
     man_made=satellite_dish: JA:Tag:man made=satellite dish
     man_made=silo: JA:Tag:man made=silo
+    man_made=ski_jump: JA:Tag:man made=ski jump
     man_made=snow_fence: JA:Tag:man made=snow fence
     man_made=snow_net: JA:Tag:man made=snow net
     man_made=storage_tank: JA:Tag:man made=storage tank
@@ -22234,6 +24248,7 @@ ja:
     natural=shingle: JA:Tag:natural=shingle
     natural=shoal: JA:Tag:natural=shoal
     natural=shrub: JA:Tag:natural=shrub
+    natural=shrubbery: JA:Tag:natural=shrubbery
     natural=sinkhole: JA:Tag:natural=sinkhole
     natural=spring: JA:Tag:natural=spring
     natural=stone: JA:Tag:natural=stone
@@ -22268,6 +24283,7 @@ ja:
     office=construction_company: JA:Tag:office=construction company
     office=cooperative: JA:Tag:office=cooperative
     office=courier: JA:Tag:office=courier
+    office=coworking: JA:Tag:office=coworking
     office=diplomatic: JA:Tag:office=diplomatic
     office=educational_institution: JA:Tag:office=educational institution
     office=employment_agency: JA:Tag:office=employment agency
@@ -22294,6 +24310,7 @@ ja:
     office=tax_advisor: JA:Tag:office=tax advisor
     office=telecommunication: JA:Tag:office=telecommunication
     office=therapist: JA:Tag:office=therapist
+    office=translator: JA:Tag:office=translator
     office=tutoring: JA:Tag:office=tutoring
     oneway=alternating: JA:Tag:oneway=alternating
     oneway=reversible: JA:Tag:oneway=reversible
@@ -22301,6 +24318,8 @@ ja:
     parking=multi-storey: JA:Tag:parking=multi-storey
     parking=street_side: JA:Tag:parking=street side
     parking=surface: JA:Tag:parking=surface
+    piste:takeoff=yes: JA:Tag:piste:takeoff=yes
+    piste:type=ski_jump: JA:Tag:piste:type=ski jump
     place=archipelago: JA:Tag:place=archipelago
     place=city: JA:Tag:place=city
     place=city_block: JA:Tag:place=city block
@@ -22382,6 +24401,7 @@ ja:
     recycling_type=container: JA:Tag:recycling type=container
     religion=buddhist: JA:Tag:religion=buddhist
     religion=christian: JA:Tag:religion=christian
+    religion=confucian: JA:Tag:religion=confucian
     religion=muslim: JA:Tag:religion=muslim
     religion=shinto: JA:Tag:religion=shinto
     residential=apartments: JA:Tag:residential=apartments
@@ -22606,6 +24626,7 @@ ja:
     sport=baseball: JA:Tag:sport=baseball
     sport=basketball: JA:Tag:sport=basketball
     sport=billiards: JA:Tag:sport=billiards
+    sport=climbing_adventure: JA:Tag:sport=climbing adventure
     sport=equestrian: JA:Tag:sport=equestrian
     sport=golf: JA:Tag:sport=golf
     sport=handball: JA:Tag:sport=handball
@@ -22615,6 +24636,7 @@ ja:
     sport=multi: JA:Tag:sport=multi
     sport=sailing: JA:Tag:sport=sailing
     sport=shooting: JA:Tag:sport=shooting
+    sport=ski_jumping: JA:Tag:sport=ski jumping
     sport=soccer: JA:Tag:sport=soccer
     sport=sumo: JA:Tag:sport=sumo
     sport=swimming: JA:Tag:sport=swimming
@@ -22623,7 +24645,27 @@ ja:
     station=light_rail: JA:Tag:station=light rail
     station=subway: JA:Tag:station=subway
     street_vendor=yes: JA:Tag:street vendor=yes
+    surface=artificial_turf: JA:Tag:surface=artificial turf
     surface=asphalt: JA:Tag:surface=asphalt
+    surface=clay: JA:Tag:surface=clay
+    surface=cobblestone: JA:Tag:surface=cobblestone
+    surface=compacted: JA:Tag:surface=compacted
+    surface=concrete: JA:Tag:surface=concrete
+    surface=concrete:lanes: JA:Tag:surface=concrete:lanes
+    surface=concrete:plates: JA:Tag:surface=concrete:plates
+    surface=dirt: JA:Tag:surface=dirt
+    surface=fine_gravel: JA:Tag:surface=fine gravel
+    surface=grass: JA:Tag:surface=grass
+    surface=grass_paver: JA:Tag:surface=grass paver
+    surface=gravel: JA:Tag:surface=gravel
+    surface=ground: JA:Tag:surface=ground
+    surface=paved: JA:Tag:surface=paved
+    surface=paving_stones: JA:Tag:surface=paving stones
+    surface=pebblestone: JA:Tag:surface=pebblestone
+    surface=sand: JA:Tag:surface=sand
+    surface=tartan: JA:Tag:surface=tartan
+    surface=unpaved: JA:Tag:surface=unpaved
+    surface=wood: JA:Tag:surface=wood
     telescope:type=optical: JA:Tag:telescope:type=optical
     telescope:type=radio: JA:Tag:telescope:type=radio
     theatre:type=concert_hall: JA:Tag:theatre:type=concert hall
@@ -22715,6 +24757,7 @@ ja:
     waterway=milestone: JA:Tag:waterway=milestone
     waterway=offshore_field: JA:Tag:waterway=offshore field
     waterway=river: JA:Tag:waterway=river
+    waterway=riverbank: JA:Tag:waterway=riverbank
     waterway=seaway: JA:Tag:waterway=seaway
     waterway=sluice_gate: JA:Tag:waterway=sluice gate
     waterway=stream: JA:Tag:waterway=stream
@@ -22798,6 +24841,7 @@ ko:
     toll: Ko:Key:toll
     townhall:type: Ko:Key:townhall:type
     tracktype: Ko:Key:tracktype
+    traffic_calming: Ko:Key:traffic calming
     traffic_sign: Ko:Key:traffic sign
     traffic_signals: Ko:Key:traffic signals
     traffic_signals:floor_vibration: Ko:Key:traffic signals:floor vibration
@@ -22895,6 +24939,7 @@ ko:
     building=house: Ko:Tag:building=house
     building=parking: Ko:Tag:building=parking
     building=shrine: Ko:Tag:building=shrine
+    building=terraced_house: Ko:Tag:building=terraced house
     bunker_type=bomb_shelter: Ko:Tag:bunker type=bomb shelter
     cemetery=grave: Ko:Tag:cemetery=grave
     content=fuel: Ko:Tag:content=fuel
@@ -22902,14 +24947,19 @@ ko:
     crop=rice: Ko:Tag:crop=rice
     crossing=traffic_signals: Ko:Tag:crossing=traffic signals
     cuisine=korean: Ko:Tag:cuisine=korean
+    cuisine=ramen: Ko:Tag:cuisine=ramen
     fire_mains=dry: Ko:Tag:fire mains=dry
     fire_mains=wet: Ko:Tag:fire mains=wet
     ford=stepping_stones: Ko:Tag:ford=stepping stones
+    genus=Acer: Ko:Tag:genus=Acer
+    genus=Platanus: Ko:Tag:genus=Platanus
+    genus=Quercus: Ko:Tag:genus=Quercus
     geological=columnar_jointing: Ko:Tag:geological=columnar jointing
     hazard=school_zone: Ko:Tag:hazard=school zone
     hazard=silver_zone: Ko:Tag:hazard=silver zone
     healthcare=blood_donation: Ko:Tag:healthcare=blood donation
     healthcare=laboratory: Ko:Tag:healthcare=laboratory
+    healthcare=physiotherapist: Ko:Tag:healthcare=physiotherapist
     highway=bus_stop: Ko:Tag:highway=bus stop
     highway=busway: Ko:Tag:highway=busway
     highway=corridor: Ko:Tag:highway=corridor
@@ -22931,6 +24981,9 @@ ko:
     highway=unclassified: Ko:Tag:highway=unclassified
     historic=archaeological_site: Ko:Tag:historic=archaeological site
     historic=boundary_stone: Ko:Tag:historic=boundary stone
+    industrial=depot: Ko:Tag:industrial=depot
+    industrial=rice_mill: Ko:Tag:industrial=rice mill
+    industrial=scrap_yard: Ko:Tag:industrial=scrap yard
     junction=yes: Ko:Tag:junction=yes
     landuse=allotments: Ko:Tag:landuse=allotments
     landuse=cemetery: Ko:Tag:landuse=cemetery
@@ -22943,21 +24996,25 @@ ko:
     landuse=greenery: Ko:Tag:landuse=greenery
     landuse=greenhouse_horticulture: Ko:Tag:landuse=greenhouse horticulture
     landuse=industrial: Ko:Tag:landuse=industrial
+    landuse=landfill: Ko:Tag:landuse=landfill
     landuse=meadow: Ko:Tag:landuse=meadow
     landuse=paddy: Ko:Tag:landuse=paddy
     landuse=residential: Ko:Tag:landuse=residential
     landuse=retail: Ko:Tag:landuse=retail
     landuse=shrubs: Ko:Tag:landuse=shrubs
     landuse=traffic_island: Ko:Tag:landuse=traffic island
+    leaf_cycle=evergreen: Ko:Tag:leaf cycle=evergreen
     leisure=disc_golf_course: Ko:Tag:leisure=disc golf course
     leisure=garden: Ko:Tag:leisure=garden
     leisure=park: Ko:Tag:leisure=park
     man_made=hongsalmun: Ko:Tag:man made=hongsalmun
     man_made=iljumun: Ko:Tag:man made=iljumun
+    man_made=lighthouse: Ko:Tag:man made=lighthouse
     man_made=mast: Ko:Tag:man made=mast
     man_made=planter: Ko:Tag:man made=planter
     man_made=sign: Ko:Tag:man made=sign
     man_made=surveillance: Ko:Tag:man made=surveillance
+    man_made=torii: Ko:Tag:man made=torii
     megalith_type=dolmen: Ko:Tag:megalith type=dolmen
     military=range: Ko:Tag:military=range
     natural=blockfield: Ko:Tag:natural=blockfield
@@ -22976,7 +25033,11 @@ ko:
     public_transport=platform: Ko:Tag:public transport=platform
     public_transport=stop_area: Ko:Tag:public transport=stop area
     railway=rail: Ko:Tag:railway=rail
+    religion=buddhist: Ko:Tag:religion=buddhist
+    religion=confucian: Ko:Tag:religion=confucian
     religion=shamanic: Ko:Tag:religion=shamanic
+    religion=shinto: Ko:Tag:religion=shinto
+    religion=taoist: Ko:Tag:religion=taoist
     roof:shape=hip-and-gable: Ko:Tag:roof:shape=hip-and-gable
     roof:shape=hipped-and-gable: Ko:Tag:roof:shape=hipped-and-gable
     roof:shape=hipped-and-gabled: Ko:Tag:roof:shape=hipped-and-gabled
@@ -23021,15 +25082,40 @@ ko:
     toll=yes: Ko:Tag:toll=yes
     tourism=attraction: Ko:Tag:tourism=attraction
     traffic_calming=island: Ko:Tag:traffic calming=island
+    traffic_calming=table: Ko:Tag:traffic calming=table
+    traffic_calming=yes: Ko:Tag:traffic calming=yes
     waterway=ditch: Ko:Tag:waterway=ditch
     waterway=drain: Ko:Tag:waterway=drain
     waterway=tidal_channel: Ko:Tag:waterway=tidal channel
     wetland=bog: Ko:Tag:wetland=bog
+ku:
+  tag:
+    religion=muslim: Ku:Tag:religion=muslim
 lt:
   key:
     cycleway: Lt:Key:cycleway
+  tag:
+    genus=Tilia: Lt:Tag:genus=Tilia
+    leaf_cycle=evergreen: Lt:Tag:leaf cycle=evergreen
+lv:
+  tag:
+    footway=alley: Lv:Tag:footway=alley
+    genus=Acer: Lv:Tag:genus=Acer
+    genus=Platanus: Lv:Tag:genus=Platanus
+    leaf_cycle=evergreen: Lv:Tag:leaf cycle=evergreen
+    leisure=barefoot: Lv:Tag:leisure=barefoot
+    natural=tree: Lv:Tag:natural=tree
+mk:
+  tag:
+    genus=Tilia: Mk:Tag:genus=Tilia
+    religion=jewish: Mk:Tag:religion=jewish
+    religion=muslim: Mk:Tag:religion=muslim
+mr:
+  tag:
+    religion=hindu: Mr:Tag:religion=hindu
 ms:
   tag:
+    genus=Platanus: Ms:Tag:genus=Platanus
     highway=motorway: Ms:Tag:highway=motorway
     highway=primary: Ms:Tag:highway=primary
     highway=residential: Ms:Tag:highway=residential
@@ -23038,6 +25124,15 @@ ms:
     highway=tertiary: Ms:Tag:highway=tertiary
     highway=trunk: Ms:Tag:highway=trunk
     highway=unclassified: Ms:Tag:highway=unclassified
+    leaf_cycle=evergreen: Ms:Tag:leaf cycle=evergreen
+    religion=buddhist: Ms:Tag:religion=buddhist
+    religion=confucian: Ms:Tag:religion=confucian
+    religion=hindu: Ms:Tag:religion=hindu
+    religion=muslim: Ms:Tag:religion=muslim
+    religion=taoist: Ms:Tag:religion=taoist
+my:
+  tag:
+    religion=muslim: My:Tag:religion=muslim
 ne:
   key:
     tracktype: Ne:Key:tracktype
@@ -23045,6 +25140,8 @@ ne:
     barrier=kerb: Ne:Tag:barrier=kerb
     natural=scrub: Ne:Tag:natural=scrub
     place=hamlet: Ne:Tag:place=hamlet
+    religion=buddhist: Ne:Tag:religion=buddhist
+    religion=hindu: Ne:Tag:religion=hindu
 nl:
   key:
     AND_nosr_r: NL:Key:AND nosr r
@@ -23101,7 +25198,9 @@ nl:
     ref:bag:old: NL:Key:ref:bag:old
     route_master: NL:Key:route master
     scenic: NL:Key:scenic
+    self_harvesting: NL:Key:self harvesting
     shop: NL:Key:shop
+    source: NL:Key:source
     surface: NL:Key:surface
     to: NL:Key:to
     tourism: NL:Key:tourism
@@ -23109,6 +25208,7 @@ nl:
     turn: NL:Key:turn
     turn:lanes: NL:Key:turn:lanes
     type: NL:Key:type
+    virtual_tour: NL:Key:virtual tour
     waste: NL:Key:waste
     water: NL:Key:water
     waterway: NL:Key:waterway
@@ -23121,6 +25221,8 @@ nl:
     amenity=bicycle_parking: NL:Tag:amenity=bicycle parking
     amenity=cafe: NL:Tag:amenity=cafe
     amenity=drinking_water: NL:Tag:amenity=drinking water
+    amenity=freeshop: NL:Tag:amenity=freeshop
+    amenity=give_box: NL:Tag:amenity=give box
     amenity=grave_yard: NL:Tag:amenity=grave yard
     amenity=parking: NL:Tag:amenity=parking
     amenity=post_office: NL:Tag:amenity=post office
@@ -23136,10 +25238,18 @@ nl:
     bicycle_road=yes: NL:Tag:bicycle road=yes
     building=castle: NL:Tag:building=castle
     building=entrance: NL:Tag:building=entrance
+    building=hotel: NL:Tag:building=hotel
+    building=terraced_house: NL:Tag:building=terraced house
     emergency=access_point: NL:Tag:emergency=access point
+    emergency=first_aid: NL:Tag:emergency=first aid
     emergency=yes: NL:Tag:emergency=yes
     footway=sidewalk: NL:Tag:footway=sidewalk
+    genus=Acer: NL:Tag:genus=Acer
+    genus=Platanus: NL:Tag:genus=Platanus
+    genus=Quercus: NL:Tag:genus=Quercus
+    genus=Tilia: NL:Tag:genus=Tilia
     healthcare=blood_donation: NL:Tag:healthcare=blood donation
+    healthcare=physiotherapist: NL:Tag:healthcare=physiotherapist
     highway=emergency_bay: NL:Tag:highway=emergency bay
     highway=footway: NL:Tag:highway=footway
     highway=motorway: NL:Tag:highway=motorway
@@ -23155,6 +25265,7 @@ nl:
     leaf_cycle=deciduous: NL:Tag:leaf cycle=deciduous
     leisure=playground: NL:Tag:leisure=playground
     man_made=windmill: NL:Tag:man made=windmill
+    natural=shrubbery: NL:Tag:natural=shrubbery
     natural=tree: NL:Tag:natural=tree
     network=NL:A: NL:Tag:network=NL:A
     network=NL:N: NL:Tag:network=NL:N
@@ -23192,6 +25303,7 @@ nl:
     traffic_sign=NL:G13: NL:Tag:traffic sign=NL:G13
     vending=bottle_return: NL:Tag:vending=bottle return
     vending=parking_tickets: NL:Tag:vending=parking tickets
+    waterway=fish_pass: NL:Tag:waterway=fish pass
     zoo=petting_zoo: NL:Tag:zoo=petting zoo
 no:
   key:
@@ -23213,7 +25325,9 @@ no:
     amenity=place_of_worship: No:Tag:amenity=place of worship
     boundary=maritime: No:Tag:boundary=maritime
     building=construction: No:Tag:building=construction
+    genus=Acer: No:Tag:genus=Acer
     landuse=farmland: No:Tag:landuse=farmland
+    leaf_cycle=evergreen: No:Tag:leaf cycle=evergreen
     leisure=park: No:Tag:leisure=park
     natural=tree: No:Tag:natural=tree
 oc:
@@ -23261,10 +25375,14 @@ oc:
     craft=tailor: Oc:Tag:craft=tailor
     natural=cave_entrance: Oc:Tag:natural=cave entrance
     office=association: Oc:Tag:office=association
+    shop=herbalist: Oc:Tag:shop=herbalist
     shop=second_hand: Oc:Tag:shop=second hand
 pa:
   key:
     name:pnb: Pa:Key:name:pnb
+  tag:
+    religion=hindu: Pa:Tag:religion=hindu
+    religion=sikh: Pa:Tag:religion=sikh
 pl:
   key:
     3dr:type: Pl:Key:3dr:type
@@ -23308,6 +25426,8 @@ pl:
     agricultural: Pl:Key:agricultural
     alt_name: Pl:Key:alt name
     amenity: Pl:Key:amenity
+    animal_shelter: Pl:Key:animal shelter
+    animal_shelter:*: Pl:Key:animal shelter:*
     architect: Pl:Key:architect
     area: Pl:Key:area
     area:highway: Pl:Key:area:highway
@@ -23318,6 +25438,7 @@ pl:
     automated: Pl:Key:automated
     automatic_door: Pl:Key:automatic door
     backrest: Pl:Key:backrest
+    backward: Pl:Key:backward
     bar: Pl:Key:bar
     barrier: Pl:Key:barrier
     basin: Pl:Key:basin
@@ -23359,9 +25480,16 @@ pl:
     busway: Pl:Key:busway
     button_operated: Pl:Key:button operated
     cables: Pl:Key:cables
+    camera:*: Pl:Key:camera:*
+    camera:angle: Pl:Key:camera:angle
+    camera:direction: Pl:Key:camera:direction
+    camera:mount: Pl:Key:camera:mount
+    camera:type: Pl:Key:camera:type
     capacity: Pl:Key:capacity
+    capacity:truck: Pl:Key:capacity:truck
     capital: Pl:Key:capital
     cargo: Pl:Key:cargo
+    cash_in: Pl:Key:cash in
     castle_type: Pl:Key:castle type
     cemetery: Pl:Key:cemetery
     charge: Pl:Key:charge
@@ -23388,6 +25516,10 @@ pl:
     content: Pl:Key:content
     conveying: Pl:Key:conveying
     country: Pl:Key:country
+    couplings: Pl:Key:couplings
+    couplings:*: Pl:Key:couplings:*
+    couplings:diameters: Pl:Key:couplings:diameters
+    couplings:type: Pl:Key:couplings:type
     covered: Pl:Key:covered
     craft: Pl:Key:craft
     crane:type: Pl:Key:crane:type
@@ -23449,20 +25581,27 @@ pl:
     field: Pl:Key:field
     fire_boundary: Pl:Key:fire boundary
     fire_hydrant: Pl:Key:fire hydrant
+    fire_hydrant:*: Pl:Key:fire hydrant:*
+    fire_hydrant:count: Pl:Key:fire hydrant:count
+    fire_hydrant:diameter: Pl:Key:fire hydrant:diameter
+    fire_hydrant:position: Pl:Key:fire hydrant:position
+    fire_hydrant:pressure: Pl:Key:fire hydrant:pressure
+    fire_hydrant:type: Pl:Key:fire hydrant:type
     fire_path: Pl:Key:fire path
     fishing: Pl:Key:fishing
     fixme: Pl:Key:fixme
     flashing_lights: Pl:Key:flashing lights
     floating: Pl:Key:floating
     flood_mark: Pl:Key:flood mark
-    flood_prone: Pl:Key:flood prone
     foot: Pl:Key:foot
     footway: Pl:Key:footway
     ford: Pl:Key:ford
     fortification_type: Pl:Key:fortification type
+    forward: Pl:Key:forward
     fountain: Pl:Key:fountain
     fridge: Pl:Key:fridge
     fuel: Pl:Key:fuel
+    fuel:*: Pl:Key:fuel:*
     gambling: Pl:Key:gambling
     garden:style: Pl:Key:garden:style
     garden:type: Pl:Key:garden:type
@@ -23471,6 +25610,7 @@ pl:
     genus: Pl:Key:genus
     genus:pl: Pl:Key:genus:pl
     geological: Pl:Key:geological
+    goods: Pl:Key:goods
     government: Pl:Key:government
     grades: Pl:Key:grades
     handrail: Pl:Key:handrail
@@ -23519,8 +25659,10 @@ pl:
     isced:level: Pl:Key:isced:level
     junction: Pl:Key:junction
     kerb: Pl:Key:kerb
+    ladder: Pl:Key:ladder
     landfill:waste: Pl:Key:landfill:waste
     landuse: Pl:Key:landuse
+    lane_markings: Pl:Key:lane markings
     lanes: Pl:Key:lanes
     lanes:psv: Pl:Key:lanes:psv
     layer: Pl:Key:layer
@@ -23532,6 +25674,7 @@ pl:
     lit: Pl:Key:lit
     loc_name: Pl:Key:loc name
     loc_ref: Pl:Key:loc ref
+    local_ref: Pl:Key:local ref
     location: Pl:Key:location
     lock: Pl:Key:lock
     lock_name: Pl:Key:lock name
@@ -23573,17 +25716,22 @@ pl:
     motorroad: Pl:Key:motorroad
     mountain_pass: Pl:Key:mountain pass
     moved: Pl:Key:moved
+    museum: Pl:Key:museum
     name: Pl:Key:name
     name:etymology: Pl:Key:name:etymology
+    name:network:*: Pl:Key:name:network:*
+    name:pl: Pl:Key:name:pl
     name:rue: Pl:Key:name:rue
     nat_ref: Pl:Key:nat ref
     natural: Pl:Key:natural
     network: Pl:Key:network
+    nid: Pl:Key:nid
     non_existent_levels: Pl:Key:non existent levels
     note: Pl:Key:note
     nudism: Pl:Key:nudism
     nursery: Pl:Key:nursery
     office: Pl:Key:office
+    official_name: Pl:Key:official name
     old_addr:housenumber: Pl:Key:old addr:housenumber
     old_name: Pl:Key:old name
     old_ref: Pl:Key:old ref
@@ -23605,15 +25753,16 @@ pl:
     passenger_information_display: Pl:Key:passenger information display
     passing_places: Pl:Key:passing places
     payment: Pl:Key:payment
+    payment:*: Pl:Key:payment:*
     phone: Pl:Key:phone
     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
+    power_supply: Pl:Key:power supply
     preschool: Pl:Key:preschool
     pressure: Pl:Key:pressure
     priority: Pl:Key:priority
@@ -23631,11 +25780,13 @@ pl:
     razed: Pl:Key:razed
     'razed:': 'Pl:Key:razed:'
     razed:*: Pl:Key:razed:*
+    recycling:plastic_bottle_caps: Pl:Key:recycling:plastic bottle caps
     recycling:plastic_bottle_tops: Pl:Key:recycling:plastic bottle tops
     recycling_type: Pl:Key:recycling type
     reef: Pl:Key:reef
     ref: Pl:Key:ref
     ref:csioz: Pl:Key:ref:csioz
+    ref:nid: Pl:Key:ref:nid
     reference_point: Pl:Key:reference point
     reg_ref: Pl:Key:reg ref
     religion: Pl:Key:religion
@@ -23695,6 +25846,7 @@ pl:
     support: Pl:Key:support
     surface: Pl:Key:surface
     surveillance: Pl:Key:surveillance
+    surveillance:*: Pl:Key:surveillance:*
     surveillance:type: Pl:Key:surveillance:type
     surveillance:zone: Pl:Key:surveillance:zone
     symbol: Pl:Key:symbol
@@ -23734,12 +25886,17 @@ pl:
     turn: Pl:Key:turn
     turn:bicycle:lanes: Pl:Key:turn:bicycle:lanes
     turn:lanes: Pl:Key:turn:lanes
+    turn:lanes:backward: Pl:Key:turn:lanes:backward
+    turn:lanes:both_ways: Pl:Key:turn:lanes:both ways
+    turn:lanes:forward: Pl:Key:turn:lanes:forward
     type: Pl:Key:type
     unisex: Pl:Key:unisex
     url: Pl:Key:url
     usage: Pl:Key:usage
     vehicle: Pl:Key:vehicle
+    vending: Pl:Key:vending
     voltage: Pl:Key:voltage
+    wall: Pl:Key:wall
     washing_machine: Pl:Key:washing machine
     waste: Pl:Key:waste
     water: Pl:Key:water
@@ -23754,6 +25911,7 @@ pl:
     width: Pl:Key:width
     wikipedia: Pl:Key:wikipedia
     winter_road: Pl:Key:winter road
+    winter_service: Pl:Key:winter service
     wires: Pl:Key:wires
     wood: Pl:Key:wood
     xmas:feature: Pl:Key:xmas:feature
@@ -23769,6 +25927,7 @@ pl:
     access=no: Pl:Tag:access=no
     access=official: Pl:Tag:access=official
     access=permissive: Pl:Tag:access=permissive
+    access=permit: Pl:Tag:access=permit
     access=private: Pl:Tag:access=private
     actuator=hydraulic_cylinder: Pl:Tag:actuator=hydraulic cylinder
     advertising=billboard: Pl:Tag:advertising=billboard
@@ -23789,6 +25948,7 @@ pl:
     allotments=plot: Pl:Tag:allotments=plot
     amenity=administration: Pl:Tag:amenity=administration
     amenity=animal_boarding: Pl:Tag:amenity=animal boarding
+    amenity=animal_shelter: Pl:Tag:amenity=animal shelter
     amenity=archive: Pl:Tag:amenity=archive
     amenity=arts_centre: Pl:Tag:amenity=arts centre
     amenity=atm: Pl:Tag:amenity=atm
@@ -23802,6 +25962,7 @@ pl:
     amenity=bicycle_rental: Pl:Tag:amenity=bicycle rental
     amenity=bicycle_repair_station: Pl:Tag:amenity=bicycle repair station
     amenity=biergarten: Pl:Tag:amenity=biergarten
+    amenity=binoculars: Pl:Tag:amenity=binoculars
     amenity=boat_rental: Pl:Tag:amenity=boat rental
     amenity=boat_storage: Pl:Tag:amenity=boat storage
     amenity=brothel: Pl:Tag:amenity=brothel
@@ -23846,6 +26007,7 @@ pl:
     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_hydrant: Pl:Tag:amenity=fire hydrant
     amenity=fire_station: Pl:Tag:amenity=fire station
     amenity=food_court: Pl:Tag:amenity=food court
     amenity=fountain: Pl:Tag:amenity=fountain
@@ -23864,10 +26026,13 @@ pl:
     amenity=kindergarten: Pl:Tag:amenity=kindergarten
     amenity=language_school: Pl:Tag:amenity=language school
     amenity=lavoir: Pl:Tag:amenity=lavoir
+    amenity=left_luggage: Pl:Tag:amenity=left luggage
     amenity=letter_box: Pl:Tag:amenity=letter box
     amenity=library: Pl:Tag:amenity=library
+    amenity=library_dropoff: Pl:Tag:amenity=library dropoff
     amenity=loading_dock: Pl:Tag:amenity=loading dock
     amenity=lounger: Pl:Tag:amenity=lounger
+    amenity=luggage_locker: Pl:Tag:amenity=luggage locker
     amenity=marketplace: Pl:Tag:amenity=marketplace
     amenity=monastery: Pl:Tag:amenity=monastery
     amenity=money_transfer: Pl:Tag:amenity=money transfer
@@ -23885,6 +26050,7 @@ pl:
     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_mourning: Pl:Tag:amenity=place of mourning
     amenity=place_of_worship: Pl:Tag:amenity=place of worship
     amenity=planetarium: Pl:Tag:amenity=planetarium
     amenity=police: Pl:Tag:amenity=police
@@ -23937,6 +26103,7 @@ pl:
     amenity=waste_disposal: Pl:Tag:amenity=waste disposal
     amenity=waste_transfer_station: Pl:Tag:amenity=waste transfer station
     amenity=water_point: Pl:Tag:amenity=water point
+    amenity=weighbridge: Pl:Tag:amenity=weighbridge
     archaeological_site=city: Pl:Tag:archaeological site=city
     archaeological_site=fortification: Pl:Tag:archaeological site=fortification
     archaeological_site=hut_circle: Pl:Tag:archaeological site=hut circle
@@ -23950,6 +26117,7 @@ pl:
     area:highway=path: Pl:Tag:area:highway=path
     area:highway=pedestrian: Pl:Tag:area:highway=pedestrian
     artwork_type=dwarf: Pl:Tag:artwork type=dwarf
+    artwork_type=mural: Pl:Tag:artwork type=mural
     artwork_type=sculpture: Pl:Tag:artwork type=sculpture
     artwork_type=statue: Pl:Tag:artwork type=statue
     attraction=animal: Pl:Tag:attraction=animal
@@ -23957,6 +26125,7 @@ pl:
     attraction=train: Pl:Tag:attraction=train
     barrier=block: Pl:Tag:barrier=block
     barrier=bollard: Pl:Tag:barrier=bollard
+    barrier=border_control: Pl:Tag:barrier=border control
     barrier=bus_trap: Pl:Tag:barrier=bus trap
     barrier=cable_barrier: Pl:Tag:barrier=cable barrier
     barrier=cattle_grid: Pl:Tag:barrier=cattle grid
@@ -23990,6 +26159,7 @@ pl:
     boundary=historic: Pl:Tag:boundary=historic
     boundary=local_authority: Pl:Tag:boundary=local authority
     boundary=maritime: Pl:Tag:boundary=maritime
+    boundary=marker: Pl:Tag:boundary=marker
     boundary=military_district: Pl:Tag:boundary=military district
     boundary=national: Pl:Tag:boundary=national
     boundary=national_park: Pl:Tag:boundary=national park
@@ -24047,6 +26217,7 @@ pl:
     building=entrance: Pl:Tag:building=entrance
     building=farm: Pl:Tag:building=farm
     building=farm_auxiliary: Pl:Tag:building=farm auxiliary
+    building=fire_station: Pl:Tag:building=fire station
     building=garage: Pl:Tag:building=garage
     building=garages: Pl:Tag:building=garages
     building=grandstand: Pl:Tag:building=grandstand
@@ -24090,6 +26261,7 @@ pl:
     building=synagogue: Pl:Tag:building=synagogue
     building=temple: Pl:Tag:building=temple
     building=terrace: Pl:Tag:building=terrace
+    building=terraced_house: Pl:Tag:building=terraced house
     building=toilets: Pl:Tag:building=toilets
     building=train_station: Pl:Tag:building=train station
     building=transformer_tower: Pl:Tag:building=transformer tower
@@ -24159,6 +26331,7 @@ pl:
     craft=tailor: Pl:Tag:craft=tailor
     craft=tinsmith: Pl:Tag:craft=tinsmith
     craft=watchmaker: Pl:Tag:craft=watchmaker
+    craft=welder: Pl:Tag:craft=welder
     craft=window_construction: Pl:Tag:craft=window construction
     craft=winery: Pl:Tag:craft=winery
     crossing=no: Pl:Tag:crossing=no
@@ -24170,6 +26343,7 @@ pl:
     cycleway=opposite_track: Pl:Tag:cycleway=opposite track
     cycleway=share_busway: Pl:Tag:cycleway=share busway
     cycleway=track: Pl:Tag:cycleway=track
+    denomination=polish_orthodox: Pl:Tag:denomination=polish orthodox
     diplomatic=consulate: Pl:Tag:diplomatic=consulate
     emergency=ambulance_station: Pl:Tag:emergency=ambulance station
     emergency=defibrillator: Pl:Tag:emergency=defibrillator
@@ -24179,7 +26353,9 @@ pl:
     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_sand_bin: Pl:Tag:emergency=fire sand bin
     emergency=fire_water_pond: Pl:Tag:emergency=fire water pond
+    emergency=first_aid_kit: Pl:Tag:emergency=first aid kit
     emergency=landing_site: Pl:Tag:emergency=landing site
     emergency=lifeguard_base: Pl:Tag:emergency=lifeguard base
     emergency=lifeguard_place: Pl:Tag:emergency=lifeguard place
@@ -24189,13 +26365,20 @@ pl:
     emergency=suction_point: Pl:Tag:emergency=suction point
     emergency=water_rescue_station: Pl:Tag:emergency=water rescue station
     emergency=water_tank: Pl:Tag:emergency=water tank
+    enforcement=average_speed: Pl:Tag:enforcement=average speed
+    enforcement=maxspeed: Pl:Tag:enforcement=maxspeed
     entrance=garage: Pl:Tag:entrance=garage
     entrance=main: Pl:Tag:entrance=main
     fast_food=cafeteria: Pl:Tag:fast food=cafeteria
+    flood_prone=yes: Pl:Tag:flood prone=yes
     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
+    garden:type=residential: Pl:Tag:garden:type=residential
+    genus=Acer: Pl:Tag:genus=Acer
+    genus=Platanus: Pl:Tag:genus=Platanus
+    genus=Quercus: Pl:Tag:genus=Quercus
     geological=moraine: Pl:Tag:geological=moraine
     government=audit: Pl:Tag:government=audit
     government=building_control: Pl:Tag:government=building control
@@ -24270,6 +26453,7 @@ pl:
     historic=aircraft: Pl:Tag:historic=aircraft
     historic=archaeological_site: Pl:Tag:historic=archaeological site
     historic=battlefield: Pl:Tag:historic=battlefield
+    historic=boundary_stone: Pl:Tag:historic=boundary stone
     historic=castle: Pl:Tag:historic=castle
     historic=city_gate: Pl:Tag:historic=city gate
     historic=heritage: Pl:Tag:historic=heritage
@@ -24305,6 +26489,7 @@ pl:
     industrial=scrap_yard: Pl:Tag:industrial=scrap yard
     industrial=shipyard: Pl:Tag:industrial=shipyard
     industrial=slaughterhouse: Pl:Tag:industrial=slaughterhouse
+    industrial=steel_mill: Pl:Tag:industrial=steel mill
     industrial=steelmaking: Pl:Tag:industrial=steelmaking
     industrial=warehouse: Pl:Tag:industrial=warehouse
     industrial=well_cluster: Pl:Tag:industrial=well cluster
@@ -24361,6 +26546,7 @@ pl:
     landuse=village_green: Pl:Tag:landuse=village green
     landuse=vineyard: Pl:Tag:landuse=vineyard
     landuse=winter_sports: Pl:Tag:landuse=winter sports
+    leaf_cycle=evergreen: Pl:Tag:leaf cycle=evergreen
     leaf_type=broadleaved: Pl:Tag:leaf type=broadleaved
     leaf_type=leafless: Pl:Tag:leaf type=leafless
     leaf_type=mixed: Pl:Tag:leaf type=mixed
@@ -24448,7 +26634,10 @@ pl:
     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=foundation: Pl:Tag:man made=foundation
+    man_made=fuel_pump: Pl:Tag:man made=fuel pump
     man_made=funding_sign: Pl:Tag:man made=funding sign
+    man_made=gantry: Pl:Tag:man made=gantry
     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
@@ -24458,6 +26647,7 @@ pl:
     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=manhole: Pl:Tag:man made=manhole
     man_made=mast: Pl:Tag:man made=mast
     man_made=milk_churn_stand: Pl:Tag:man made=milk churn stand
     man_made=mineshaft: Pl:Tag:man made=mineshaft
@@ -24470,6 +26660,7 @@ pl:
     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=planter: Pl:Tag:man made=planter
     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
@@ -24486,6 +26677,7 @@ pl:
     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=tunnel: Pl:Tag:man made=tunnel
     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
@@ -24534,6 +26726,7 @@ pl:
     military=training_area: Pl:Tag:military=training area
     military=trench: Pl:Tag:military=trench
     mooring=ferry: Pl:Tag:mooring=ferry
+    name:signed=no: Pl:Tag:name:signed=no
     natural=anthill: Pl:Tag:natural=anthill
     natural=arete: Pl:Tag:natural=arete
     natural=avalanche_dam: Pl:Tag:natural=avalanche dam
@@ -24594,6 +26787,7 @@ pl:
     network=lhn: Pl:Tag:network=lhn
     network=rhn: Pl:Tag:network=rhn
     noexit=yes: Pl:Tag:noexit=yes
+    noname=yes: Pl:Tag:noname=yes
     office=accountant: Pl:Tag:office=accountant
     office=adoption_agency: Pl:Tag:office=adoption agency
     office=advertising_agency: Pl:Tag:office=advertising agency
@@ -24634,6 +26828,7 @@ pl:
     office=water_utility: Pl:Tag:office=water utility
     oneway=alternating: Pl:Tag:oneway=alternating
     oneway=reversible: Pl:Tag:oneway=reversible
+    organ=yes: Pl:Tag:organ=yes
     parking:lane:hgv=on_street: Pl:Tag:parking:lane:hgv=on street
     parking=layby: Pl:Tag:parking=layby
     parking=multi-storey: Pl:Tag:parking=multi-storey
@@ -24683,6 +26878,8 @@ pl:
     playground=structure: Pl:Tag:playground=structure
     playground=teenshelter: Pl:Tag:playground=teenshelter
     playground=youth_bench: Pl:Tag:playground=youth bench
+    playground=zipwire: Pl:Tag:playground=zipwire
+    police=checkpoint: Pl:Tag:police=checkpoint
     power=cable: Pl:Tag:power=cable
     power=cable_distribution_cabinet: Pl:Tag:power=cable distribution cabinet
     power=catenary_mast: Pl:Tag:power=catenary mast
@@ -24696,6 +26893,7 @@ pl:
     power=portal: Pl:Tag:power=portal
     power=sub_station: Pl:Tag:power=sub station
     power=substation: Pl:Tag:power=substation
+    power=terminal: Pl:Tag:power=terminal
     power=tower: Pl:Tag:power=tower
     power=transformer: Pl:Tag:power=transformer
     public_transport=platform: Pl:Tag:public transport=platform
@@ -24742,6 +26940,7 @@ pl:
     railway=yard: Pl:Tag:railway=yard
     refrigerated=yes: Pl:Tag:refrigerated=yes
     religion=christian: Pl:Tag:religion=christian
+    religion=confucian: Pl:Tag:religion=confucian
     religion=jewish: Pl:Tag:religion=jewish
     religion=muslim: Pl:Tag:religion=muslim
     religion=pagan: Pl:Tag:religion=pagan
@@ -24749,10 +26948,12 @@ pl:
     residential=rural: Pl:Tag:residential=rural
     residential=university: Pl:Tag:residential=university
     residential=urban: Pl:Tag:residential=urban
+    restriction=no_u_turn: Pl:Tag:restriction=no u turn
     route=bus: Pl:Tag:route=bus
     route=emergency_access: Pl:Tag:route=emergency access
     route=hiking: Pl:Tag:route=hiking
     route=horse: Pl:Tag:route=horse
+    route=railway: Pl:Tag:route=railway
     route=running: Pl:Tag:route=running
     route=tram: Pl:Tag:route=tram
     route=worship: Pl:Tag:route=worship
@@ -24786,6 +26987,7 @@ pl:
     shop=books: Pl:Tag:shop=books
     shop=boutique: Pl:Tag:shop=boutique
     shop=brewing_supplies: Pl:Tag:shop=brewing supplies
+    shop=building_materials: Pl:Tag:shop=building materials
     shop=butcher: Pl:Tag:shop=butcher
     shop=camera: Pl:Tag:shop=camera
     shop=candles: Pl:Tag:shop=candles
@@ -24822,6 +27024,7 @@ pl:
     shop=equestrian: Pl:Tag:shop=equestrian
     shop=erotic: Pl:Tag:shop=erotic
     shop=fabric: Pl:Tag:shop=fabric
+    shop=fan: Pl:Tag:shop=fan
     shop=farm: Pl:Tag:shop=farm
     shop=fashion_accessories: Pl:Tag:shop=fashion accessories
     shop=fireplace: Pl:Tag:shop=fireplace
@@ -24971,6 +27174,7 @@ pl:
     sport=table_soccer: Pl:Tag:sport=table soccer
     sport=teqball: Pl:Tag:sport=teqball
     sport=weightlifting: Pl:Tag:sport=weightlifting
+    statue=equestrian: Pl:Tag:statue=equestrian
     surface=asphalt: Pl:Tag:surface=asphalt
     surface=concrete:lanes: Pl:Tag:surface=concrete:lanes
     tomb=columbarium: Pl:Tag:tomb=columbarium
@@ -25009,11 +27213,14 @@ pl:
     tower:type=lighting: Pl:Tag:tower:type=lighting
     tower:type=minaret: Pl:Tag:tower:type=minaret
     tower:type=observation: Pl:Tag:tower:type=observation
+    trade=building_supplies: Pl:Tag:trade=building supplies
     traffic_calming=island: Pl:Tag:traffic calming=island
     traffic_calming=table: Pl:Tag:traffic calming=table
     traffic_sign=PL:D-42: Pl:Tag:traffic sign=PL:D-42
     traffic_sign=PL:D-43: Pl:Tag:traffic sign=PL:D-43
     traffic_sign=city_limit: Pl:Tag:traffic sign=city limit
+    traffic_sign=variable_message: Pl:Tag:traffic sign=variable message
+    tunnel=building_passage: Pl:Tag:tunnel=building passage
     tunnel=culvert: Pl:Tag:tunnel=culvert
     type=public_transport: Pl:Tag:type=public transport
     vending=admission_tickets: Pl:Tag:vending=admission tickets
@@ -25113,10 +27320,15 @@ proposal:
     gtfs:trip_id: Proposal:Key:gtfs:trip id
     gtfs:trip_id:sample: Proposal:Key:gtfs:trip id:sample
     logistics: Proposal:Key:logistics
+    medical_system:*: Proposal:Key:medical system:*
     operator:guid: Proposal:Key:operator:guid
   tag:
     boundary=economic: Proposal:Tag:boundary=economic
     landuse=breeding: Proposal:Tag:landuse=breeding
+    waterway=link: Proposal:Tag:waterway=link
+ps:
+  tag:
+    religion=muslim: Ps:Tag:religion=muslim
 pt:
   key:
     IBGE:CD_ADMINIS: Pt:Key:IBGE:CD ADMINIS
@@ -25127,8 +27339,14 @@ pt:
     access: Pt:Key:access
     addr: Pt:Key:addr
     addr:*: Pt:Key:addr:*
+    addr:country: Pt:Key:addr:country
+    addr:district: Pt:Key:addr:district
+    addr:housename: Pt:Key:addr:housename
     addr:housenumber: Pt:Key:addr:housenumber
+    addr:milestone: Pt:Key:addr:milestone
     addr:place: Pt:Key:addr:place
+    addr:street: Pt:Key:addr:street
+    addr:unit: Pt:Key:addr:unit
     admin_level: Pt:Key:admin level
     aerialway: Pt:Key:aerialway
     aeroway: Pt:Key:aeroway
@@ -25148,6 +27366,7 @@ pt:
     building:material: Pt:Key:building:material
     building:min_level: Pt:Key:building:min level
     building:part: Pt:Key:building:part
+    bus_bay: Pt:Key:bus bay
     button_operated: Pt:Key:button operated
     cables: Pt:Key:cables
     capacity: Pt:Key:capacity
@@ -25156,6 +27375,7 @@ pt:
     construction: Pt:Key:construction
     contact: Pt:Key:contact
     contact:*: Pt:Key:contact:*
+    contact:whatsapp: Pt:Key:contact:whatsapp
     country: Pt:Key:country
     craft: Pt:Key:craft
     created_by: Pt:Key:created by
@@ -25177,6 +27397,7 @@ pt:
     electrified: Pt:Key:electrified
     embankment: Pt:Key:embankment
     emergency: Pt:Key:emergency
+    entrance: Pt:Key:entrance
     fee: Pt:Key:fee
     fee:conditional: Pt:Key:fee:conditional
     fence_type: Pt:Key:fence type
@@ -25185,7 +27406,9 @@ pt:
     fishing: Pt:Key:fishing
     fixme: Pt:Key:fixme
     foot: Pt:Key:foot
+    ford: Pt:Key:ford
     frequency: Pt:Key:frequency
+    frontage_road: Pt:Key:frontage road
     garden:style: Pt:Key:garden:style
     garden:type: Pt:Key:garden:type
     generator:method: Pt:Key:generator:method
@@ -25247,6 +27470,8 @@ pt:
     nohousenumber: Pt:Key:nohousenumber
     note: Pt:Key:note
     office: Pt:Key:office
+    old_addr:housenumber: Pt:Key:old addr:housenumber
+    old_addr:place: Pt:Key:old addr:place
     oneway: Pt:Key:oneway
     opening_hours: Pt:Key:opening hours
     operator: Pt:Key:operator
@@ -25323,6 +27548,7 @@ pt:
     wikipedia: Pt:Key:wikipedia
     winter_road: Pt:Key:winter road
     wires: Pt:Key:wires
+    zone:maxspeed: Pt:Key:zone:maxspeed
   tag:
     aerialway=cable_car: Pt:Tag:aerialway=cable car
     aerialway=chair_lift: Pt:Tag:aerialway=chair lift
@@ -25438,6 +27664,7 @@ pt:
     amenity=police: Pt:Tag:amenity=police
     amenity=post_box: Pt:Tag:amenity=post box
     amenity=post_office: Pt:Tag:amenity=post office
+    amenity=prep_school: Pt:Tag:amenity=prep school
     amenity=prison: Pt:Tag:amenity=prison
     amenity=pub: Pt:Tag:amenity=pub
     amenity=public_bath: Pt:Tag:amenity=public bath
@@ -25471,6 +27698,7 @@ pt:
     amenity=vehicle_inspection: Pt:Tag:amenity=vehicle inspection
     amenity=vending_machine: Pt:Tag:amenity=vending machine
     amenity=veterinary: Pt:Tag:amenity=veterinary
+    amenity=veterinary_pharmacy: Pt:Tag:amenity=veterinary pharmacy
     amenity=waste_basket: Pt:Tag:amenity=waste basket
     amenity=waste_disposal: Pt:Tag:amenity=waste disposal
     amenity=water_point: Pt:Tag:amenity=water point
@@ -25514,9 +27742,12 @@ pt:
     building=school: Pt:Tag:building=school
     building=service: Pt:Tag:building=service
     building=shed: Pt:Tag:building=shed
+    building=terrace: Pt:Tag:building=terrace
+    building=terraced_house: Pt:Tag:building=terraced house
     building=university: Pt:Tag:building=university
     building=yes: Pt:Tag:building=yes
     castle_type=stately: Pt:Tag:castle type=stately
+    community_centre=cultural_centre: Pt:Tag:community centre=cultural centre
     craft=agricultural_engines: Pt:Tag:craft=agricultural engines
     craft=atelier: Pt:Tag:craft=atelier
     craft=basket_maker: Pt:Tag:craft=basket maker
@@ -25570,17 +27801,27 @@ pt:
     craft=watchmaker: Pt:Tag:craft=watchmaker
     craft=winery: Pt:Tag:craft=winery
     crossing=traffic_signals: Pt:Tag:crossing=traffic signals
+    cuisine=barbecue: Pt:Tag:cuisine=barbecue
+    cuisine=chicken: Pt:Tag:cuisine=chicken
+    cuisine=grill: Pt:Tag:cuisine=grill
+    cuisine=steak_house: Pt:Tag:cuisine=steak house
     emergency=ambulance_station: Pt:Tag:emergency=ambulance station
     emergency=defibrillator: Pt:Tag:emergency=defibrillator
     emergency=fire_hydrant: Pt:Tag:emergency=fire hydrant
+    emergency=ladder_site: Pt:Tag:emergency=ladder site
     emergency=phone: Pt:Tag:emergency=phone
     emergency=siren: Pt:Tag:emergency=siren
+    flood_prone=yes: Pt:Tag:flood prone=yes
     footway=crossing: Pt:Tag:footway=crossing
     generator:source=solar: Pt:Tag:generator:source=solar
+    genus=Acer: Pt:Tag:genus=Acer
+    genus=Platanus: Pt:Tag:genus=Platanus
+    genus=Quercus: Pt:Tag:genus=Quercus
     geological=palaeontological_site: Pt:Tag:geological=palaeontological site
     government=cadaster: Pt:Tag:government=cadaster
     healthcare=blood_donation: Pt:Tag:healthcare=blood donation
     healthcare=doctor: Pt:Tag:healthcare=doctor
+    healthcare=physiotherapist: Pt:Tag:healthcare=physiotherapist
     healthcare=psychotherapist: Pt:Tag:healthcare=psychotherapist
     healthcare=vaccination_centre: Pt:Tag:healthcare=vaccination centre
     highway=bridleway: Pt:Tag:highway=bridleway
@@ -25592,6 +27833,7 @@ pt:
     highway=cycleway: Pt:Tag:highway=cycleway
     highway=elevator: Pt:Tag:highway=elevator
     highway=emergency_access_point: Pt:Tag:highway=emergency access point
+    highway=emergency_bay: Pt:Tag:highway=emergency bay
     highway=escape: Pt:Tag:highway=escape
     highway=footway: Pt:Tag:highway=footway
     highway=ford: Pt:Tag:highway=ford
@@ -25643,6 +27885,7 @@ pt:
     historic=wayside_cross: Pt:Tag:historic=wayside cross
     historic=wayside_shrine: Pt:Tag:historic=wayside shrine
     historic=wreck: Pt:Tag:historic=wreck
+    industrial=distributor: Pt:Tag:industrial=distributor
     industrial=slaughterhouse: Pt:Tag:industrial=slaughterhouse
     junction=roundabout: Pt:Tag:junction=roundabout
     landuse=allotments: Pt:Tag:landuse=allotments
@@ -25652,12 +27895,14 @@ pt:
     landuse=commercial: Pt:Tag:landuse=commercial
     landuse=education: Pt:Tag:landuse=education
     landuse=farm: Pt:Tag:landuse=farm
+    landuse=farmland: Pt:Tag:landuse=farmland
     landuse=farmyard: Pt:Tag:landuse=farmyard
     landuse=forest: Pt:Tag:landuse=forest
     landuse=garages: Pt:Tag:landuse=garages
     landuse=grass: Pt:Tag:landuse=grass
     landuse=greenfield: Pt:Tag:landuse=greenfield
     landuse=greenhouse_horticulture: Pt:Tag:landuse=greenhouse horticulture
+    landuse=healthcare: Pt:Tag:landuse=healthcare
     landuse=industrial: Pt:Tag:landuse=industrial
     landuse=landfill: Pt:Tag:landuse=landfill
     landuse=meadow: Pt:Tag:landuse=meadow
@@ -25672,6 +27917,7 @@ pt:
     landuse=salt_pond: Pt:Tag:landuse=salt pond
     landuse=village_green: Pt:Tag:landuse=village green
     landuse=vineyard: Pt:Tag:landuse=vineyard
+    leaf_cycle=evergreen: Pt:Tag:leaf cycle=evergreen
     leisure=bandstand: Pt:Tag:leisure=bandstand
     leisure=common: Pt:Tag:leisure=common
     leisure=dance: Pt:Tag:leisure=dance
@@ -25684,6 +27930,7 @@ pt:
     leisure=marina: Pt:Tag:leisure=marina
     leisure=miniature_golf: Pt:Tag:leisure=miniature golf
     leisure=nature_reserve: Pt:Tag:leisure=nature reserve
+    leisure=outdoor_seating: Pt:Tag:leisure=outdoor seating
     leisure=park: Pt:Tag:leisure=park
     leisure=picnic_table: Pt:Tag:leisure=picnic table
     leisure=pitch: Pt:Tag:leisure=pitch
@@ -25840,6 +28087,9 @@ pt:
     railway=tram: Pt:Tag:railway=tram
     railway=tram_stop: Pt:Tag:railway=tram stop
     railway=turntable: Pt:Tag:railway=turntable
+    religion=christian: Pt:Tag:religion=christian
+    religion=confucian: Pt:Tag:religion=confucian
+    religion=multifaith: Pt:Tag:religion=multifaith
     residential=university: Pt:Tag:residential=university
     route=bus: Pt:Tag:route=bus
     route=detour: Pt:Tag:route=detour
@@ -25848,6 +28098,7 @@ pt:
     route=road: Pt:Tag:route=road
     route=train: Pt:Tag:route=train
     route=tram: Pt:Tag:route=tram
+    seamark:type=harbour: Pt:Tag:seamark:type=harbour
     service=alley: Pt:Tag:service=alley
     service=driveway: Pt:Tag:service=driveway
     service=parking_aisle: Pt:Tag:service=parking aisle
@@ -25875,6 +28126,7 @@ pt:
     shop=car: Pt:Tag:shop=car
     shop=car_parts: Pt:Tag:shop=car parts
     shop=car_repair: Pt:Tag:shop=car repair
+    shop=carpet: Pt:Tag:shop=carpet
     shop=charity: Pt:Tag:shop=charity
     shop=cheese: Pt:Tag:shop=cheese
     shop=chemist: Pt:Tag:shop=chemist
@@ -25946,6 +28198,7 @@ pt:
     shop=pet: Pt:Tag:shop=pet
     shop=pet_grooming: Pt:Tag:shop=pet grooming
     shop=photo: Pt:Tag:shop=photo
+    shop=pottery: Pt:Tag:shop=pottery
     shop=pyrotechnics: Pt:Tag:shop=pyrotechnics
     shop=radiotechnics: Pt:Tag:shop=radiotechnics
     shop=scuba_diving: Pt:Tag:shop=scuba diving
@@ -25973,9 +28226,12 @@ pt:
     shop=watches: Pt:Tag:shop=watches
     sport=10pin: Pt:Tag:sport=10pin
     sport=9pin: Pt:Tag:sport=9pin
+    sport=bmx: Pt:Tag:sport=bmx
     sport=golf: Pt:Tag:sport=golf
     sport=rc_car: Pt:Tag:sport=rc car
     sport=soccer: Pt:Tag:sport=soccer
+    surface=grass_paver: Pt:Tag:surface=grass paver
+    surface=ground: Pt:Tag:surface=ground
     surface=sett: Pt:Tag:surface=sett
     surface=unpaved: Pt:Tag:surface=unpaved
     taxi_vehicle=motorcycle: Pt:Tag:taxi vehicle=motorcycle
@@ -26724,7 +28980,13 @@ ro:
   tag:
     amenity=karaoke_box: Ro:Tag:amenity=karaoke box
     amenity=nightclub: Ro:Tag:amenity=nightclub
+    genus=Platanus: Ro:Tag:genus=Platanus
+    genus=Quercus: Ro:Tag:genus=Quercus
+    genus=Tilia: Ro:Tag:genus=Tilia
     junction=roundabout: Ro:Tag:junction=roundabout
+    leaf_cycle=evergreen: Ro:Tag:leaf cycle=evergreen
+    religion=buddhist: Ro:Tag:religion=buddhist
+    religion=christian: Ro:Tag:religion=christian
 ru:
   key:
     3dmr: RU:Key:3dmr
@@ -26744,6 +29006,7 @@ ru:
     abutters: RU:Key:abutters
     access: RU:Key:access
     access:lanes: RU:Key:access:lanes
+    accommodation: RU:Key:accommodation
     addr: RU:Key:addr
     'addr:': 'RU:Key:addr:'
     addr:*: RU:Key:addr:*
@@ -26776,6 +29039,7 @@ ru:
     admin_level: RU:Key:admin level
     advertising: RU:Key:advertising
     aerialway: RU:Key:aerialway
+    aerialway:bicycle: RU:Key:aerialway:bicycle
     aerialway:duration: RU:Key:aerialway:duration
     aerialway:occupancy: RU:Key:aerialway:occupancy
     aerialway:station: RU:Key:aerialway:station
@@ -26793,6 +29057,7 @@ ru:
     armrest: RU:Key:armrest
     artist_name: RU:Key:artist name
     artwork_type: RU:Key:artwork type
+    assembly_point:bombing: RU:Key:assembly point:bombing
     assisted_trail: RU:Key:assisted trail
     association: RU:Key:association
     attraction: RU:Key:attraction
@@ -26815,6 +29080,7 @@ ru:
     bicycle:backward: RU:Key:bicycle:backward
     bicycle:designated:type: RU:Key:bicycle:designated:type
     bicycle:forward: RU:Key:bicycle:forward
+    bicycle:lanes: RU:Key:bicycle:lanes
     bicycle:type: RU:Key:bicycle:type
     bicycle_bypass: RU:Key:bicycle bypass
     bicycle_parking: RU:Key:bicycle parking
@@ -26825,6 +29091,7 @@ ru:
     boat: RU:Key:boat
     booking: RU:Key:booking
     books: RU:Key:books
+    booth: RU:Key:booth
     border_type: RU:Key:border type
     both: RU:Key:both
     boundary: RU:Key:boundary
@@ -26872,7 +29139,6 @@ ru:
     bus: RU:Key:bus
     bus:lanes: RU:Key:bus:lanes
     bus_bay: RU:Key:bus bay
-    bus_class: RU:Key:bus class
     bus_class:length: RU:Key:bus class:length
     bus_class:passengers: RU:Key:bus class:passengers
     cabins: RU:Key:cabins
@@ -26885,6 +29151,7 @@ ru:
     capacity: RU:Key:capacity
     capacity:beds: RU:Key:capacity:beds
     capacity:cabins: RU:Key:capacity:cabins
+    capacity:cargo_bike: RU:Key:capacity:cargo bike
     capacity:charging: RU:Key:capacity:charging
     capacity:disabled: RU:Key:capacity:disabled
     capacity:persons: RU:Key:capacity:persons
@@ -26898,7 +29165,6 @@ ru:
     castle_type: RU:Key:castle type
     castle_type:de: RU:Key:castle type:de
     cemetery: RU:Key:cemetery
-    census:population: RU:Key:census:population
     changing_table: RU:Key:changing table
     changing_table:count: RU:Key:changing table:count
     changing_table:fee: RU:Key:changing table:fee
@@ -26906,16 +29172,20 @@ ru:
     charge: RU:Key:charge
     check_date: RU:Key:check date
     check_date:opening_hours: RU:Key:check date:opening hours
+    check_out: RU:Key:check out
     checkpoint: RU:Key:checkpoint
     church:type: RU:Key:church:type
+    cinema:IMAX: RU:Key:cinema:IMAX
     circumference: RU:Key:circumference
     city_limit: RU:Key:city limit
     class:bicycle: RU:Key:class:bicycle
     clli: RU:Key:clli
     clothes: RU:Key:clothes
     club: RU:Key:club
+    collection_times: RU:Key:collection times
     colour: RU:Key:colour
     comment: RU:Key:comment
+    communication:amateur_radio: RU:Key:communication:amateur radio
     communication:bos: RU:Key:communication:bos
     community_centre: RU:Key:community centre
     community_centre:for: RU:Key:community centre:for
@@ -26935,6 +29205,7 @@ ru:
     contact:phone: RU:Key:contact:phone
     contact:vk: RU:Key:contact:vk
     contact:website: RU:Key:contact:website
+    contamination: RU:Key:contamination
     conveying: RU:Key:conveying
     cooker: RU:Key:cooker
     covered: RU:Key:covered
@@ -26945,12 +29216,14 @@ ru:
     crossing:aircraft: RU:Key:crossing:aircraft
     crossing:island: RU:Key:crossing:island
     cuisine: RU:Key:cuisine
+    culvert: RU:Key:culvert
     currency: RU:Key:currency
     cutting: RU:Key:cutting
     cycle_barrier: RU:Key:cycle barrier
     cycle_barrier:installation: RU:Key:cycle barrier:installation
     cycle_highway: RU:Key:cycle highway
     cycle_network: RU:Key:cycle network
+    cycle_rickshaw: RU:Key:cycle rickshaw
     cyclestreet: RU:Key:cyclestreet
     cyclestreets_id: RU:Key:cyclestreets id
     cycleway: RU:Key:cycleway
@@ -26958,6 +29231,7 @@ ru:
     cycleway:buffer: RU:Key:cycleway:buffer
     cycleway:foot: RU:Key:cycleway:foot
     cycleway:lane: RU:Key:cycleway:lane
+    cycleway:lanes: RU:Key:cycleway:lanes
     cycleway:left: RU:Key:cycleway:left
     cycleway:left:buffer: RU:Key:cycleway:left:buffer
     cycleway:left:lane: RU:Key:cycleway:left:lane
@@ -26990,11 +29264,15 @@ ru:
     disused: RU:Key:disused
     'disused:': 'RU:Key:disused:'
     disused:*: RU:Key:disused:*
+    disused:amenity: RU:Key:disused:amenity
     disused:landuse: RU:Key:disused:landuse
     disused:leisure: RU:Key:disused:leisure
     disused:place: RU:Key:disused:place
     disused:shop: RU:Key:disused:shop
     dog: RU:Key:dog
+    dog:conditional: RU:Key:dog:conditional
+    dog_washing: RU:Key:dog washing
+    door: RU:Key:door
     double_tracked_motor_vehicle: RU:Key:double tracked motor vehicle
     draft: RU:Key:draft
     drain: RU:Key:drain
@@ -27006,6 +29284,7 @@ ru:
     driving_side: RU:Key:driving side
     dryer: RU:Key:dryer
     duration: RU:Key:duration
+    earth_bank: RU:Key:earth bank
     easy_overtaking: RU:Key:easy overtaking
     education: RU:Key:education
     ele: RU:Key:ele
@@ -27019,9 +29298,12 @@ ru:
     entrance: RU:Key:entrance
     esr:user: RU:Key:esr:user
     est_width: RU:Key:est width
+    evacuation_route: RU:Key:evacuation route
     exhibit: RU:Key:exhibit
     exit: RU:Key:exit
     expressway: RU:Key:expressway
+    faa: RU:Key:faa
+    factory: RU:Key:factory
     faculty: RU:Key:faculty
     fast_food: RU:Key:fast food
     fax: RU:Key:fax
@@ -27033,18 +29315,22 @@ ru:
     ferry: RU:Key:ferry
     ferry:cable: RU:Key:ferry:cable
     fire_boundary: RU:Key:fire boundary
+    fire_hydrant:diameter: RU:Key:fire hydrant:diameter
     fire_object:type: RU:Key:fire object:type
     fire_operator: RU:Key:fire operator
     fire_rank: RU:Key:fire rank
     fire_station:type: RU:Key:fire station:type
     fireplace: RU:Key:fireplace
     fishing: RU:Key:fishing
+    fitting_room: RU:Key:fitting room
     fixme: RU:Key:fixme
     flats: RU:Key:flats
     flood_date: RU:Key:flood date
+    flow_rate: RU:Key:flow rate
     foot: RU:Key:foot
     footway: RU:Key:footway
     ford: RU:Key:ford
+    format: RU:Key:format
     fortification_type: RU:Key:fortification type
     forward: RU:Key:forward
     fountain: RU:Key:fountain
@@ -27077,6 +29363,7 @@ ru:
     hazmat: RU:Key:hazmat
     health_facility:CD: RU:Key:health facility:CD
     healthcare: RU:Key:healthcare
+    hedge: RU:Key:hedge
     height: RU:Key:height
     heritage: RU:Key:heritage
     heritage:operator: RU:Key:heritage:operator
@@ -27099,6 +29386,7 @@ ru:
     infant_bed: RU:Key:infant bed
     informal: RU:Key:informal
     information: RU:Key:information
+    inlet: RU:Key:inlet
     inscription: RU:Key:inscription
     int_name: RU:Key:int name
     intermittent: RU:Key:intermittent
@@ -27116,6 +29404,7 @@ ru:
     kons:inscription_date: RU:Key:kons:inscription date
     ladder: RU:Key:ladder
     lamp_mount: RU:Key:lamp mount
+    lamp_type: RU:Key:lamp type
     landfill:waste: RU:Key:landfill:waste
     landmark: RU:Key:landmark
     landuse: RU:Key:landuse
@@ -27130,6 +29419,7 @@ ru:
     level: RU:Key:level
     level:ref: RU:Key:level:ref
     license_classes: RU:Key:license classes
+    lift_gate:type: RU:Key:lift gate:type
     listed_status: RU:Key:listed status
     lit: RU:Key:lit
     living_street: RU:Key:living street
@@ -27143,6 +29433,7 @@ ru:
     man_made: RU:Key:man made
     managed: RU:Key:managed
     manhole: RU:Key:manhole
+    manufacturer:wikipedia: RU:Key:manufacturer:wikipedia
     map_type: RU:Key:map type
     mapillary: RU:Key:mapillary
     material: RU:Key:material
@@ -27165,6 +29456,7 @@ ru:
     memorial:subject: RU:Key:memorial:subject
     memorial:type: RU:Key:memorial:type
     military: RU:Key:military
+    military_service: RU:Key:military service
     min_height: RU:Key:min height
     mindistance: RU:Key:mindistance
     minspeed: RU:Key:minspeed
@@ -27217,7 +29509,6 @@ ru:
     next_check_date: RU:Key:next check date
     no_overtaking: RU:Key:no overtaking
     noaddress: RU:Key:noaddress
-    nohousenumber: RU:Key:nohousenumber
     note: RU:Key:note
     nursery: RU:Key:nursery
     office: RU:Key:office
@@ -27240,13 +29531,16 @@ ru:
     operator:wikipedia: RU:Key:operator:wikipedia
     orientation: RU:Key:orientation
     origin: RU:Key:origin
+    osak:identifier: RU:Key:osak:identifier
     oven: RU:Key:oven
     overtaking: RU:Key:overtaking
+    overtaking:motor_vehicle: RU:Key:overtaking:motor vehicle
     owner: RU:Key:owner
     ownership: RU:Key:ownership
     park_ride: RU:Key:park ride
     parking: RU:Key:parking
     parking:condition:right: RU:Key:parking:condition:right
+    parking:right:orientation: RU:Key:parking:right:orientation
     parking_space: RU:Key:parking space
     passenger_information_display: RU:Key:passenger information display
     passing_places: RU:Key:passing places
@@ -27260,8 +29554,10 @@ ru:
     permanent_camping: RU:Key:permanent camping
     pets: RU:Key:pets
     phone: RU:Key:phone
+    photography: RU:Key:photography
     picnic_table: RU:Key:picnic table
     pipeline: RU:Key:pipeline
+    piste:difficulty: RU:Key:piste:difficulty
     piste:grooming: RU:Key:piste:grooming
     piste:type: RU:Key:piste:type
     place: RU:Key:place
@@ -27294,10 +29590,13 @@ ru:
     ramp:bicycle: RU:Key:ramp:bicycle
     recreation_ground: RU:Key:recreation ground
     recycling:*: RU:Key:recycling:*
+    recycling:PET: RU:Key:recycling:PET
     recycling:fire_extinguishers: RU:Key:recycling:fire extinguishers
+    recycling:organic: RU:Key:recycling:organic
     recycling:plastic_bottle_caps: RU:Key:recycling:plastic bottle caps
     recycling:plastic_bottle_tops: RU:Key:recycling:plastic bottle tops
     recycling:pmd: RU:Key:recycling:pmd
+    recycling:tetrapak: RU:Key:recycling:tetrapak
     recycling_type: RU:Key:recycling type
     ref: RU:Key:ref
     ref:BLfD: RU:Key:ref:BLfD
@@ -27306,12 +29605,14 @@ ru:
     ref:IE:niah: RU:Key:ref:IE:niah
     ref:RS:nkd: RU:Key:ref:RS:nkd
     ref:canmore: RU:Key:ref:canmore
+    ref:hr:uzkb: RU:Key:ref:hr:uzkb
     ref:kons: RU:Key:ref:kons
     ref:mobil-parken.de: RU:Key:ref:mobil-parken.de
     ref:nrhp: RU:Key:ref:nrhp
     ref:ruian:building: RU:Key:ref:ruian:building
     ref:sprockhoff: RU:Key:ref:sprockhoff
     ref:ssb_tettsted: RU:Key:ref:ssb tettsted
+    ref:urbanbrussels: RU:Key:ref:urbanbrussels
     ref:whc: RU:Key:ref:whc
     reference: RU:Key:reference
     refitted: RU:Key:refitted
@@ -27332,6 +29633,7 @@ ru:
     review_requested: RU:Key:review requested
     rhn_ref: RU:Key:rhn ref
     right: RU:Key:right
+    road_marking: RU:Key:road marking
     roller_coaster: RU:Key:roller coaster
     roller_coaster:track: RU:Key:roller coaster:track
     roller_coaster:type: RU:Key:roller coaster:type
@@ -27362,9 +29664,11 @@ ru:
     seasonal: RU:Key:seasonal
     seasonal:snowfall:regaintime: RU:Key:seasonal:snowfall:regaintime
     second_hand: RU:Key:second hand
+    sensory: RU:Key:sensory
     service: RU:Key:service
     service:bicycle: RU:Key:service:bicycle
     service:bicycle:*: RU:Key:service:bicycle:*
+    service:bicycle:charging: RU:Key:service:bicycle:charging
     service:bicycle:cleaning: RU:Key:service:bicycle:cleaning
     service:bicycle:diy: RU:Key:service:bicycle:diy
     service:bicycle:pump: RU:Key:service:bicycle:pump
@@ -27381,8 +29685,10 @@ ru:
     side_road: RU:Key:side road
     sidewalk: RU:Key:sidewalk
     sinkhole: RU:Key:sinkhole
+    small_electric_vehicle: RU:Key:small electric vehicle
     smoking: RU:Key:smoking
     smoothness: RU:Key:smoothness
+    sms: RU:Key:sms
     snowplowing: RU:Key:snowplowing
     social_facility: RU:Key:social facility
     social_facility:for: RU:Key:social facility:for
@@ -27403,6 +29709,7 @@ ru:
     studio: RU:Key:studio
     substance: RU:Key:substance
     supervised: RU:Key:supervised
+    support: RU:Key:support
     surface: RU:Key:surface
     surface:colour: RU:Key:surface:colour
     surveillance: RU:Key:surveillance
@@ -27412,8 +29719,10 @@ ru:
     sustrans_ref: RU:Key:sustrans ref
     swimming: RU:Key:swimming
     swimming_pool: RU:Key:swimming pool
+    swing_gate:type: RU:Key:swing gate:type
     symbol: RU:Key:symbol
     tactile_paving: RU:Key:tactile paving
+    tank_trap: RU:Key:tank trap
     taxon: RU:Key:taxon
     technology: RU:Key:technology
     television: RU:Key:television
@@ -27424,6 +29733,7 @@ ru:
     tidal: RU:Key:tidal
     todo: RU:Key:todo
     toilets: RU:Key:toilets
+    toilets:*: RU:Key:toilets:*
     toilets:wheelchair: RU:Key:toilets:wheelchair
     toll: RU:Key:toll
     tourism: RU:Key:tourism
@@ -27453,11 +29763,14 @@ ru:
     vehicle:wikidata: RU:Key:vehicle:wikidata
     vehicle:wikipedia: RU:Key:vehicle:wikipedia
     vending: RU:Key:vending
+    video: RU:Key:video
     view: RU:Key:view
     viewpoint: RU:Key:viewpoint
     visibility: RU:Key:visibility
     volcano:status: RU:Key:volcano:status
+    volcano:type: RU:Key:volcano:type
     voltage: RU:Key:voltage
+    wall: RU:Key:wall
     was:amenity: RU:Key:was:amenity
     washing_machine: RU:Key:washing machine
     waste: RU:Key:waste
@@ -27484,6 +29797,7 @@ ru:
     abandoned:landuse=landfill: RU:Tag:abandoned:landuse=landfill
     abandoned:landuse=quarry: RU:Tag:abandoned:landuse=quarry
     abandoned:place=yes: RU:Tag:abandoned:place=yes
+    abandoned:railway=rail: RU:Tag:abandoned:railway=rail
     abutters=commercial: RU:Tag:abutters=commercial
     abutters=industrial: RU:Tag:abutters=industrial
     abutters=mixed: RU:Tag:abutters=mixed
@@ -27499,11 +29813,15 @@ ru:
     access=permissive: RU:Tag:access=permissive
     access=private: RU:Tag:access=private
     access=unknown: RU:Tag:access=unknown
+    access=yes: RU:Tag:access=yes
     admin_level=2: RU:Tag:admin level=2
+    advertising=billboard: RU:Tag:advertising=billboard
     advertising=board: RU:Tag:advertising=board
+    advertising=column: RU:Tag:advertising=column
     advertising=flag: RU:Tag:advertising=flag
     advertising=screen: RU:Tag:advertising=screen
     advertising=sculpture: RU:Tag:advertising=sculpture
+    advertising=totem: RU:Tag:advertising=totem
     advertising=wall_painting: RU:Tag:advertising=wall painting
     aerialway:drag_lift=j-bar: RU:Tag:aerialway:drag lift=j-bar
     aerialway:drag_lift=platter: RU:Tag:aerialway:drag lift=platter
@@ -27541,6 +29859,8 @@ ru:
     aeroway=airtanker_base: RU:Tag:aeroway=airtanker base
     aeroway=apron: RU:Tag:aeroway=apron
     aeroway=arresting_gear: RU:Tag:aeroway=arresting gear
+    aeroway=control_center: RU:Tag:aeroway=control center
+    aeroway=control_tower: RU:Tag:aeroway=control tower
     aeroway=flame_trench: RU:Tag:aeroway=flame trench
     aeroway=fuel: RU:Tag:aeroway=fuel
     aeroway=gate: RU:Tag:aeroway=gate
@@ -27553,6 +29873,7 @@ ru:
     aeroway=landingpad: RU:Tag:aeroway=landingpad
     aeroway=launch_complex: RU:Tag:aeroway=launch complex
     aeroway=launchpad: RU:Tag:aeroway=launchpad
+    aeroway=model_runway: RU:Tag:aeroway=model runway
     aeroway=navigationaid: RU:Tag:aeroway=navigationaid
     aeroway=papi: RU:Tag:aeroway=papi
     aeroway=parking_position: RU:Tag:aeroway=parking position
@@ -27754,6 +30075,7 @@ ru:
     amenity=sauna: RU:Tag:amenity=sauna
     amenity=school: RU:Tag:amenity=school
     amenity=seat: RU:Tag:amenity=seat
+    amenity=security_control: RU:Tag:amenity=security control
     amenity=shelter: RU:Tag:amenity=shelter
     amenity=shop: RU:Tag:amenity=shop
     amenity=shower: RU:Tag:amenity=shower
@@ -27816,6 +30138,7 @@ ru:
     archaeological_site=grave_field: RU:Tag:archaeological site=grave field
     archaeological_site=petroglyph: RU:Tag:archaeological site=petroglyph
     area:highway=cycleway: RU:Tag:area:highway=cycleway
+    area:highway=traffic_island: RU:Tag:area:highway=traffic island
     artwork_type=architecture: RU:Tag:artwork type=architecture
     artwork_type=bust: RU:Tag:artwork type=bust
     artwork_type=land_art: RU:Tag:artwork type=land art
@@ -27824,13 +30147,16 @@ ru:
     artwork_type=sculpture: RU:Tag:artwork type=sculpture
     artwork_type=statue: RU:Tag:artwork type=statue
     artwork_type=stone: RU:Tag:artwork type=stone
+    association=sport: RU:Tag:association=sport
     association=student: RU:Tag:association=student
+    athletics=long_jump: RU:Tag:athletics=long jump
     atm=yes: RU:Tag:atm=yes
     attraction=alpine_coaster: RU:Tag:attraction=alpine coaster
     attraction=amusement_ride: RU:Tag:attraction=amusement ride
     attraction=animal: RU:Tag:attraction=animal
     attraction=big_wheel: RU:Tag:attraction=big wheel
     attraction=boat_ride: RU:Tag:attraction=boat ride
+    attraction=bumper_car: RU:Tag:attraction=bumper car
     attraction=carousel: RU:Tag:attraction=carousel
     attraction=maze: RU:Tag:attraction=maze
     attraction=roller_coaster: RU:Tag:attraction=roller coaster
@@ -27839,6 +30165,8 @@ ru:
     attraction=water_slide: RU:Tag:attraction=water slide
     baby_hatch=yes: RU:Tag:baby hatch=yes
     barrier=avalanche_protection: RU:Tag:barrier=avalanche protection
+    barrier=bar: RU:Tag:barrier=bar
+    barrier=barrier_board: RU:Tag:barrier=barrier board
     barrier=block: RU:Tag:barrier=block
     barrier=bollard: RU:Tag:barrier=bollard
     barrier=border_control: RU:Tag:barrier=border control
@@ -27849,9 +30177,11 @@ ru:
     barrier=chain: RU:Tag:barrier=chain
     barrier=chech_hedgehog: RU:Tag:barrier=chech hedgehog
     barrier=city_wall: RU:Tag:barrier=city wall
+    barrier=coupure: RU:Tag:barrier=coupure
     barrier=cycle_barrier: RU:Tag:barrier=cycle barrier
     barrier=czech_hedgehog: RU:Tag:barrier=czech hedgehog
     barrier=debris: RU:Tag:barrier=debris
+    barrier=delineators: RU:Tag:barrier=delineators
     barrier=ditch: RU:Tag:barrier=ditch
     barrier=dug-in_tyres: RU:Tag:barrier=dug-in tyres
     barrier=entrance: RU:Tag:barrier=entrance
@@ -27866,22 +30196,30 @@ ru:
     barrier=height_restrictor: RU:Tag:barrier=height restrictor
     barrier=horse_jump: RU:Tag:barrier=horse jump
     barrier=horse_stile: RU:Tag:barrier=horse stile
+    barrier=jersey_barrier: RU:Tag:barrier=jersey barrier
+    barrier=kent_carriage_gap: RU:Tag:barrier=kent carriage gap
     barrier=kerb: RU:Tag:barrier=kerb
+    barrier=kissing_gate: RU:Tag:barrier=kissing gate
     barrier=lift_gate: RU:Tag:barrier=lift gate
     barrier=log: RU:Tag:barrier=log
     barrier=motorcycle_barrier: RU:Tag:barrier=motorcycle barrier
+    barrier=planter: RU:Tag:barrier=planter
     barrier=retaining_wall: RU:Tag:barrier=retaining wall
+    barrier=rope: RU:Tag:barrier=rope
     barrier=sally_port: RU:Tag:barrier=sally port
     barrier=sliding_beam: RU:Tag:barrier=sliding beam
     barrier=sliding_gate: RU:Tag:barrier=sliding gate
+    barrier=spikes: RU:Tag:barrier=spikes
     barrier=steeplechase_jump: RU:Tag:barrier=steeplechase jump
     barrier=stile: RU:Tag:barrier=stile
+    barrier=sump_buster: RU:Tag:barrier=sump buster
     barrier=swing_gate: RU:Tag:barrier=swing gate
     barrier=tank_trap: RU:Tag:barrier=tank trap
     barrier=toll_booth: RU:Tag:barrier=toll booth
     barrier=turnstile: RU:Tag:barrier=turnstile
     barrier=tyres: RU:Tag:barrier=tyres
     barrier=wall: RU:Tag:barrier=wall
+    barrier=wedge: RU:Tag:barrier=wedge
     barrier=wicket_gate: RU:Tag:barrier=wicket gate
     barrier=yes: RU:Tag:barrier=yes
     basin=cooling: RU:Tag:basin=cooling
@@ -27900,25 +30238,31 @@ ru:
     bath:type=river: RU:Tag:bath:type=river
     bath:type=sea: RU:Tag:bath:type=sea
     bath:type=thermal: RU:Tag:bath:type=thermal
+    bbq=bring_your_own: RU:Tag:bbq=bring your own
     bbq=yes: RU:Tag:bbq=yes
     beacon:type=DME: RU:Tag:beacon:type=DME
     beacon:type=DVOR: RU:Tag:beacon:type=DVOR
+    beacon:type=DVOR/DME: RU:Tag:beacon:type=DVOR/DME
     beacon:type=ILS: RU:Tag:beacon:type=ILS
+    beacon:type=IM: RU:Tag:beacon:type=IM
     beacon:type=MM: RU:Tag:beacon:type=MM
     beacon:type=NDB: RU:Tag:beacon:type=NDB
     beacon:type=OM: RU:Tag:beacon:type=OM
     beacon:type=TACAN: RU:Tag:beacon:type=TACAN
     beacon:type=VOR: RU:Tag:beacon:type=VOR
+    beacon:type=VOR/DME: RU:Tag:beacon:type=VOR/DME
     beacon:type=VORTAC: RU:Tag:beacon:type=VORTAC
     bench=wave_lounger: RU:Tag:bench=wave lounger
     bicycle:backward=use_sidepath: RU:Tag:bicycle:backward=use sidepath
     bicycle:forward=use_sidepath: RU:Tag:bicycle:forward=use sidepath
+    bicycle=customers: RU:Tag:bicycle=customers
     bicycle=designated: RU:Tag:bicycle=designated
     bicycle=dismount: RU:Tag:bicycle=dismount
     bicycle=no: RU:Tag:bicycle=no
     bicycle=permissive: RU:Tag:bicycle=permissive
     bicycle=use_sidepath: RU:Tag:bicycle=use sidepath
     bicycle=yes: RU:Tag:bicycle=yes
+    bicycle_parking=safe_loops: RU:Tag:bicycle parking=safe loops
     bicycle_parking=stands: RU:Tag:bicycle parking=stands
     bicycle_parking=wall_loops: RU:Tag:bicycle parking=wall loops
     bicycle_parking=wide_stands: RU:Tag:bicycle parking=wide stands
@@ -27947,6 +30291,7 @@ ru:
     bridge:structure=arch: RU:Tag:bridge:structure=arch
     bridge:structure=beam: RU:Tag:bridge:structure=beam
     bridge:structure=cable-stayed: RU:Tag:bridge:structure=cable-stayed
+    bridge:structure=clapper: RU:Tag:bridge:structure=clapper
     bridge:structure=floating: RU:Tag:bridge:structure=floating
     bridge:structure=humpback: RU:Tag:bridge:structure=humpback
     bridge:structure=simple-suspension: RU:Tag:bridge:structure=simple-suspension
@@ -27974,10 +30319,12 @@ ru:
     building=Y: RU:Tag:building=Y
     building=abandoned: RU:Tag:building=abandoned
     building=allotment_house: RU:Tag:building=allotment house
+    building=annexe: RU:Tag:building=annexe
     building=apartments: RU:Tag:building=apartments
     building=bakehouse: RU:Tag:building=bakehouse
     building=barn: RU:Tag:building=barn
     building=barracks: RU:Tag:building=barracks
+    building=bath: RU:Tag:building=bath
     building=beach_hut: RU:Tag:building=beach hut
     building=boathouse: RU:Tag:building=boathouse
     building=brewery: RU:Tag:building=brewery
@@ -28039,12 +30386,14 @@ ru:
     building=hut: RU:Tag:building=hut
     building=industrial: RU:Tag:building=industrial
     building=kindergarten: RU:Tag:building=kindergarten
+    building=kingdom_hall: RU:Tag:building=kingdom hall
     building=kiosk: RU:Tag:building=kiosk
     building=lighthouse: RU:Tag:building=lighthouse
     building=livestock: RU:Tag:building=livestock
     building=manufacture: RU:Tag:building=manufacture
     building=marquee: RU:Tag:building=marquee
     building=military: RU:Tag:building=military
+    building=mobile_home: RU:Tag:building=mobile home
     building=monastery: RU:Tag:building=monastery
     building=mosque: RU:Tag:building=mosque
     building=museum: RU:Tag:building=museum
@@ -28065,6 +30414,7 @@ ru:
     building=roof: RU:Tag:building=roof
     building=roundhouse: RU:Tag:building=roundhouse
     building=ruins: RU:Tag:building=ruins
+    building=sauna: RU:Tag:building=sauna
     building=school: RU:Tag:building=school
     building=semi: RU:Tag:building=semi
     building=semidetached_house: RU:Tag:building=semidetached house
@@ -28093,6 +30443,7 @@ ru:
     building=transformer_tower: RU:Tag:building=transformer tower
     building=transportation: RU:Tag:building=transportation
     building=tree_house: RU:Tag:building=tree house
+    building=triumphal_arch: RU:Tag:building=triumphal arch
     building=true: RU:Tag:building=true
     building=trullo: RU:Tag:building=trullo
     building=unclassified: RU:Tag:building=unclassified
@@ -28155,17 +30506,22 @@ ru:
     community_centre=community_hall: RU:Tag:community centre=community hall
     community_centre=cultural_centre: RU:Tag:community centre=cultural centre
     community_centre=family_centre: RU:Tag:community centre=family centre
+    community_centre=meeting_room: RU:Tag:community centre=meeting room
     community_centre=parish_hall: RU:Tag:community centre=parish hall
     community_centre=village_hall: RU:Tag:community centre=village hall
     community_centre=youth_centre: RU:Tag:community centre=youth centre
     company=aerospace: RU:Tag:company=aerospace
+    company=agrarian: RU:Tag:company=agrarian
     company=catalog: RU:Tag:company=catalog
     company=construction: RU:Tag:company=construction
+    company=distribution: RU:Tag:company=distribution
     company=industrial_climbing: RU:Tag:company=industrial climbing
+    company=information: RU:Tag:company=information
     company=internet_shop: RU:Tag:company=internet shop
     company=it: RU:Tag:company=it
     company=logistics: RU:Tag:company=logistics
     company=robot: RU:Tag:company=robot
+    company=software: RU:Tag:company=software
     company=software_development: RU:Tag:company=software development
     company=transport: RU:Tag:company=transport
     construction=apartments: RU:Tag:construction=apartments
@@ -28210,6 +30566,8 @@ ru:
     culvert=box: RU:Tag:culvert=box
     culvert=inverted_siphon: RU:Tag:culvert=inverted siphon
     culvert=pipe: RU:Tag:culvert=pipe
+    curve=hairpin: RU:Tag:curve=hairpin
+    curve=loop: RU:Tag:curve=loop
     cycle_network=EuroVelo: RU:Tag:cycle network=EuroVelo
     cycle_network=JP:prefectural: RU:Tag:cycle network=JP:prefectural
     cycle_network=US: RU:Tag:cycle network=US
@@ -28219,15 +30577,15 @@ ru:
     cycleway:both=separate: RU:Tag:cycleway:both=separate
     cycleway:foot=designated: RU:Tag:cycleway:foot=designated
     cycleway:foot=no: RU:Tag:cycleway:foot=no
+    cycleway:lane=exclusive: RU:Tag:cycleway:lane=exclusive
     cycleway:left=lane: RU:Tag:cycleway:left=lane
     cycleway:left=no: RU:Tag:cycleway:left=no
-    cycleway:left=opposite_lane: RU:Tag:cycleway:left=opposite lane
     cycleway:left=separate: RU:Tag:cycleway:left=separate
     cycleway:left=share_busway: RU:Tag:cycleway:left=share busway
     cycleway:left=track: RU:Tag:cycleway:left=track
+    cycleway:right:lane=exclusive: RU:Tag:cycleway:right:lane=exclusive
     cycleway:right=lane: RU:Tag:cycleway:right=lane
     cycleway:right=no: RU:Tag:cycleway:right=no
-    cycleway:right=opposite_lane: RU:Tag:cycleway:right=opposite lane
     cycleway:right=separate: RU:Tag:cycleway:right=separate
     cycleway:right=share_busway: RU:Tag:cycleway:right=share busway
     cycleway:right=shared_lane: RU:Tag:cycleway:right=shared lane
@@ -28249,7 +30607,9 @@ ru:
     defensive=donjon: RU:Tag:defensive=donjon
     defensive=keep: RU:Tag:defensive=keep
     denomination=catholic: RU:Tag:denomination=catholic
+    denomination=jehovahs_witness: RU:Tag:denomination=jehovahs witness
     diplomatic=consulate_general: RU:Tag:diplomatic=consulate general
+    display=sundial: RU:Tag:display=sundial
     disused:landuse=landfill: RU:Tag:disused:landuse=landfill
     disused:landuse=quarry: RU:Tag:disused:landuse=quarry
     dog=designated: RU:Tag:dog=designated
@@ -28265,15 +30625,28 @@ ru:
     education=exercise_area: RU:Tag:education=exercise area
     education=school: RU:Tag:education=school
     emergency=ambulance_station: RU:Tag:emergency=ambulance station
+    emergency=assembly_point: RU:Tag:emergency=assembly point
+    emergency=defibrillator: RU:Tag:emergency=defibrillator
+    emergency=disaster_response: RU:Tag:emergency=disaster response
     emergency=emergency_ward_entrance: RU:Tag:emergency=emergency ward entrance
     emergency=fire_extinguisher: RU:Tag:emergency=fire extinguisher
+    emergency=fire_flapper: RU:Tag:emergency=fire flapper
     emergency=fire_hose: RU:Tag:emergency=fire hose
     emergency=fire_hydrant: RU:Tag:emergency=fire hydrant
+    emergency=fire_lookout: RU:Tag:emergency=fire lookout
+    emergency=fire_point_stand: RU:Tag:emergency=fire point stand
+    emergency=fire_service_inlet: RU:Tag:emergency=fire service inlet
     emergency=fire_water_pond: RU:Tag:emergency=fire water pond
+    emergency=ladder_site: RU:Tag:emergency=ladder site
     emergency=landing_site: RU:Tag:emergency=landing site
+    emergency=life_ring: RU:Tag:emergency=life ring
+    emergency=lifeguard: RU:Tag:emergency=lifeguard
+    emergency=mountain_rescue: RU:Tag:emergency=mountain rescue
     emergency=phone: RU:Tag:emergency=phone
     emergency=suction_point: RU:Tag:emergency=suction point
+    emergency=water_rescue: RU:Tag:emergency=water rescue
     emergency=water_tank: RU:Tag:emergency=water tank
+    emergency=yes: RU:Tag:emergency=yes
     entrance=garage: RU:Tag:entrance=garage
     entrance=staircase: RU:Tag:entrance=staircase
     entrance=yes: RU:Tag:entrance=yes
@@ -28281,7 +30654,10 @@ ru:
     faculty=engineering: RU:Tag:faculty=engineering
     fast_food=cafeteria: RU:Tag:fast food=cafeteria
     fence_type=railing: RU:Tag:fence type=railing
+    fitness_station=horizontal_bar: RU:Tag:fitness station=horizontal bar
     fitness_station=sit-up: RU:Tag:fitness station=sit-up
+    fixme=position_estimated: RU:Tag:fixme=position estimated
+    fixme=verify_name: RU:Tag:fixme=verify name
     foot=designated: RU:Tag:foot=designated
     foot=destination: RU:Tag:foot=destination
     foot=permissive: RU:Tag:foot=permissive
@@ -28302,6 +30678,7 @@ ru:
     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=meteor_crater: RU:Tag:geological=meteor crater
     geological=palaeontological_site: RU:Tag:geological=palaeontological site
     geological=volcanic_caldera: RU:Tag:geological=volcanic caldera
     geological=volcanic_caldera_rim: RU:Tag:geological=volcanic caldera rim
@@ -28312,6 +30689,7 @@ ru:
     golf=fairway: RU:Tag:golf=fairway
     golf=green: RU:Tag:golf=green
     golf=hole: RU:Tag:golf=hole
+    golf=out_of_bounds: RU:Tag:golf=out of bounds
     golf=rough: RU:Tag:golf=rough
     golf=tee: RU:Tag:golf=tee
     government=administrative: RU:Tag:government=administrative
@@ -28320,7 +30698,9 @@ ru:
     government=audit: RU:Tag:government=audit
     government=bailiff: RU:Tag:government=bailiff
     government=border_control: RU:Tag:government=border control
+    government=building_control: RU:Tag:government=building control
     government=cadaster: RU:Tag:government=cadaster
+    government=chamber_of_commerce: RU:Tag:government=chamber of commerce
     government=culture: RU:Tag:government=culture
     government=customs: RU:Tag:government=customs
     government=data_protection: RU:Tag:government=data protection
@@ -28339,6 +30719,7 @@ ru:
     government=statistics: RU:Tag:government=statistics
     government=tax: RU:Tag:government=tax
     government=transportation: RU:Tag:government=transportation
+    government=watercourse_management: RU:Tag:government=watercourse management
     government=youth_welfare_department: RU:Tag:government=youth welfare department
     grass=amenity_grassland: RU:Tag:grass=amenity grassland
     guest_house=agritourism: RU:Tag:guest house=agritourism
@@ -28347,12 +30728,17 @@ ru:
     guest_house=kontrakan: RU:Tag:guest house=kontrakan
     guest_house=student_accomodation: RU:Tag:guest house=student accomodation
     hazard=animal_crossing: RU:Tag:hazard=animal crossing
+    hazard=archery_range: RU:Tag:hazard=archery range
+    hazard=children: RU:Tag:hazard=children
+    hazard=curve: RU:Tag:hazard=curve
+    hazard=curves: RU:Tag:hazard=curves
     hazard=horse_riders: RU:Tag:hazard=horse riders
     hazard=landslide: RU:Tag:hazard=landslide
     hazard=leeches: RU:Tag:hazard=leeches
     hazard=turn: RU:Tag:hazard=turn
     health_facility:type=office: RU:Tag:health facility:type=office
     healthcare:speciality=abortion: RU:Tag:healthcare:speciality=abortion
+    healthcare:speciality=implantology: RU:Tag:healthcare:speciality=implantology
     healthcare=blood_bank: RU:Tag:healthcare=blood bank
     healthcare=blood_donation: RU:Tag:healthcare=blood donation
     healthcare=doctor: RU:Tag:healthcare=doctor
@@ -28361,6 +30747,7 @@ ru:
     healthcare=podiatrist: RU:Tag:healthcare=podiatrist
     healthcare=sample_collection: RU:Tag:healthcare=sample collection
     healthcare=vaccination_centre: RU:Tag:healthcare=vaccination centre
+    hedge=hedge_bank: RU:Tag:hedge=hedge bank
     heritage:operator=BLfD: RU:Tag:heritage:operator=BLfD
     heritage:operator=kons: RU:Tag:heritage:operator=kons
     heritage:operator=nrhp: RU:Tag:heritage:operator=nrhp
@@ -28407,6 +30794,7 @@ ru:
     highway=tertiary_link: RU:Tag:highway=tertiary link
     highway=toll_gantry: RU:Tag:highway=toll gantry
     highway=track: RU:Tag:highway=track
+    highway=traffic_mirror: RU:Tag:highway=traffic mirror
     highway=traffic_signals: RU:Tag:highway=traffic signals
     highway=trunk: RU:Tag:highway=trunk
     highway=trunk_link: RU:Tag:highway=trunk link
@@ -28415,12 +30803,14 @@ ru:
     historic:railway=station: RU:Tag:historic:railway=station
     historic=abandoned: RU:Tag:historic=abandoned
     historic=aircraft: RU:Tag:historic=aircraft
+    historic=anchor: RU:Tag:historic=anchor
     historic=aqueduct: RU:Tag:historic=aqueduct
     historic=archaeological_site: RU:Tag:historic=archaeological site
     historic=battlefield: RU:Tag:historic=battlefield
     historic=bomb_crater: RU:Tag:historic=bomb crater
     historic=boundary_stone: RU:Tag:historic=boundary stone
     historic=building: RU:Tag:historic=building
+    historic=bullaun_stone: RU:Tag:historic=bullaun stone
     historic=cannon: RU:Tag:historic=cannon
     historic=castle: RU:Tag:historic=castle
     historic=castle_wall: RU:Tag:historic=castle wall
@@ -28429,34 +30819,52 @@ ru:
     historic=church: RU:Tag:historic=church
     historic=city_gate: RU:Tag:historic=city gate
     historic=citywalls: RU:Tag:historic=citywalls
+    historic=creamery: RU:Tag:historic=creamery
     historic=district: RU:Tag:historic=district
     historic=farm: RU:Tag:historic=farm
     historic=flood_mark: RU:Tag:historic=flood mark
+    historic=folly: RU:Tag:historic=folly
     historic=fort: RU:Tag:historic=fort
     historic=gallows: RU:Tag:historic=gallows
     historic=heritage: RU:Tag:historic=heritage
+    historic=high_cross: RU:Tag:historic=high cross
     historic=highwater_mark: RU:Tag:historic=highwater mark
     historic=hollow_way: RU:Tag:historic=hollow way
     historic=house: RU:Tag:historic=house
+    historic=lavoir: RU:Tag:historic=lavoir
+    historic=lime_kiln: RU:Tag:historic=lime kiln
     historic=locomotive: RU:Tag:historic=locomotive
+    historic=machine: RU:Tag:historic=machine
     historic=manor: RU:Tag:historic=manor
     historic=memorial: RU:Tag:historic=memorial
     historic=meteor_crater: RU:Tag:historic=meteor crater
     historic=milestone: RU:Tag:historic=milestone
+    historic=millstone: RU:Tag:historic=millstone
     historic=mine: RU:Tag:historic=mine
+    historic=minecart: RU:Tag:historic=minecart
     historic=monastery: RU:Tag:historic=monastery
     historic=monument: RU:Tag:historic=monument
+    historic=mosque: RU:Tag:historic=mosque
+    historic=ogham_stone: RU:Tag:historic=ogham stone
     historic=optical_telegraph: RU:Tag:historic=optical telegraph
     historic=pa: RU:Tag:historic=pa
     historic=pillory: RU:Tag:historic=pillory
+    historic=pound: RU:Tag:historic=pound
+    historic=railway_car: RU:Tag:historic=railway car
     historic=road: RU:Tag:historic=road
+    historic=round_tower: RU:Tag:historic=round tower
     historic=ruins: RU:Tag:historic=ruins
     historic=rune_stone: RU:Tag:historic=rune stone
+    historic=shieling: RU:Tag:historic=shieling
     historic=ship: RU:Tag:historic=ship
+    historic=stećak: RU:Tag:historic=stećak
     historic=stone: RU:Tag:historic=stone
     historic=tank: RU:Tag:historic=tank
+    historic=temple: RU:Tag:historic=temple
     historic=tomb: RU:Tag:historic=tomb
+    historic=tower: RU:Tag:historic=tower
     historic=tree_shrine: RU:Tag:historic=tree shrine
+    historic=vehicle: RU:Tag:historic=vehicle
     historic=wayside_cross: RU:Tag:historic=wayside cross
     historic=wayside_shrine: RU:Tag:historic=wayside shrine
     historic=wreck: RU:Tag:historic=wreck
@@ -28473,6 +30881,7 @@ ru:
     industrial=communication: RU:Tag:industrial=communication
     industrial=depot: RU:Tag:industrial=depot
     industrial=distributor: RU:Tag:industrial=distributor
+    industrial=electrical: RU:Tag:industrial=electrical
     industrial=factory: RU:Tag:industrial=factory
     industrial=fish_farm: RU:Tag:industrial=fish farm
     industrial=food_industry: RU:Tag:industrial=food industry
@@ -28483,6 +30892,7 @@ ru:
     industrial=heating_station: RU:Tag:industrial=heating station
     industrial=ice_factory: RU:Tag:industrial=ice factory
     industrial=integrated_circuit: RU:Tag:industrial=integrated circuit
+    industrial=logistics: RU:Tag:industrial=logistics
     industrial=machine_shop: RU:Tag:industrial=machine shop
     industrial=metal_processing: RU:Tag:industrial=metal processing
     industrial=mine: RU:Tag:industrial=mine
@@ -28490,6 +30900,7 @@ ru:
     industrial=oil: RU:Tag:industrial=oil
     industrial=oil_mill: RU:Tag:industrial=oil mill
     industrial=port: RU:Tag:industrial=port
+    industrial=recycling: RU:Tag:industrial=recycling
     industrial=refinery: RU:Tag:industrial=refinery
     industrial=rice_mill: RU:Tag:industrial=rice mill
     industrial=rocket_engine_test: RU:Tag:industrial=rocket engine test
@@ -28498,11 +30909,15 @@ ru:
     industrial=scrap_yard: RU:Tag:industrial=scrap yard
     industrial=shipyard: RU:Tag:industrial=shipyard
     industrial=slaughterhouse: RU:Tag:industrial=slaughterhouse
+    industrial=steel_mill: RU:Tag:industrial=steel mill
     industrial=steelmaking: RU:Tag:industrial=steelmaking
+    industrial=trucking: RU:Tag:industrial=trucking
     industrial=warehouse: RU:Tag:industrial=warehouse
     industrial=well_cluster: RU:Tag:industrial=well cluster
     industrial=wellsite: RU:Tag:industrial=wellsite
     industrial=winery: RU:Tag:industrial=winery
+    informal=no: RU:Tag:informal=no
+    informal=yes: RU:Tag:informal=yes
     information=audioguide: RU:Tag:information=audioguide
     information=board: RU:Tag:information=board
     information=guidepost: RU:Tag:information=guidepost
@@ -28514,6 +30929,7 @@ ru:
     information=tactile_map: RU:Tag:information=tactile map
     information=tactile_model: RU:Tag:information=tactile model
     information=terminal: RU:Tag:information=terminal
+    information=trail_blaze: RU:Tag:information=trail blaze
     information=visitor_centre: RU:Tag:information=visitor centre
     irrigation=yes: RU:Tag:irrigation=yes
     junction=circular: RU:Tag:junction=circular
@@ -28693,6 +31109,7 @@ ru:
     man_made=architecture_line: RU:Tag:man made=architecture line
     man_made=beacon: RU:Tag:man made=beacon
     man_made=beehive: RU:Tag:man made=beehive
+    man_made=birdhouse: RU:Tag:man made=birdhouse
     man_made=breakwater: RU:Tag:man made=breakwater
     man_made=bridge: RU:Tag:man made=bridge
     man_made=bunker_silo: RU:Tag:man made=bunker silo
@@ -28702,10 +31119,12 @@ ru:
     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=compass_rose: RU:Tag:man made=compass rose
     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=desalination_plant: RU:Tag:man made=desalination plant
     man_made=dovecote: RU:Tag:man made=dovecote
     man_made=dyke: RU:Tag:man made=dyke
     man_made=embankment: RU:Tag:man made=embankment
@@ -28755,8 +31174,10 @@ ru:
     man_made=windmill: RU:Tag:man made=windmill
     man_made=works: RU:Tag:man made=works
     manhole=drain: RU:Tag:manhole=drain
+    map_type=toposcope: RU:Tag:map type=toposcope
     marker=post: RU:Tag:marker=post
     maxweight:signed=no: RU:Tag:maxweight:signed=no
+    meadow=meadow_orchard: RU:Tag:meadow=meadow orchard
     meadow=paddock: RU:Tag:meadow=paddock
     meadow=pasture: RU:Tag:meadow=pasture
     medical_system:western=yes: RU:Tag:medical system:western=yes
@@ -28764,7 +31185,9 @@ ru:
     memorial=flood_mark: RU:Tag:memorial=flood mark
     memorial=ghost_bike: RU:Tag:memorial=ghost bike
     memorial=obelisk: RU:Tag:memorial=obelisk
+    memorial=plaque: RU:Tag:memorial=plaque
     memorial=stele: RU:Tag:memorial=stele
+    memorial=war_memorial: RU:Tag:memorial=war memorial
     microbrewery=yes: RU:Tag:microbrewery=yes
     military=airfield: RU:Tag:military=airfield
     military=barracks: RU:Tag:military=barracks
@@ -28776,6 +31199,7 @@ ru:
     military=naval_base: RU:Tag:military=naval base
     military=training_area: RU:Tag:military=training area
     military=trench: RU:Tag:military=trench
+    monastery:type=friary: RU:Tag:monastery:type=friary
     monument=statue: RU:Tag:monument=statue
     motor_vehicle=agricultural: RU:Tag:motor vehicle=agricultural
     motor_vehicle=delivery: RU:Tag:motor vehicle=delivery
@@ -28784,6 +31208,7 @@ ru:
     motor_vehicle=private: RU:Tag:motor vehicle=private
     motorcycle=no: RU:Tag:motorcycle=no
     motorcycle=yes: RU:Tag:motorcycle=yes
+    mountain_pass=yes: RU:Tag:mountain pass=yes
     museum=aerospace: RU:Tag:museum=aerospace
     museum=agriculture: RU:Tag:museum=agriculture
     museum=archaeological: RU:Tag:museum=archaeological
@@ -28796,6 +31221,7 @@ ru:
     museum=military: RU:Tag:museum=military
     museum=nature: RU:Tag:museum=nature
     museum=open_air: RU:Tag:museum=open air
+    museum=person: RU:Tag:museum=person
     museum=railway: RU:Tag:museum=railway
     museum=technology: RU:Tag:museum=technology
     museum=transport: RU:Tag:museum=transport
@@ -28854,6 +31280,7 @@ ru:
     office=administrative: RU:Tag:office=administrative
     office=adoption_agency: RU:Tag:office=adoption agency
     office=advertising_agency: RU:Tag:office=advertising agency
+    office=airline: RU:Tag:office=airline
     office=architect: RU:Tag:office=architect
     office=archive: RU:Tag:office=archive
     office=association: RU:Tag:office=association
@@ -28871,6 +31298,7 @@ ru:
     office=energy_supplier: RU:Tag:office=energy supplier
     office=engineer: RU:Tag:office=engineer
     office=estate_agent: RU:Tag:office=estate agent
+    office=event_management: RU:Tag:office=event management
     office=financial: RU:Tag:office=financial
     office=financial_advisor: RU:Tag:office=financial advisor
     office=forestry: RU:Tag:office=forestry
@@ -28914,6 +31342,7 @@ ru:
     office=therapist: RU:Tag:office=therapist
     office=tourist_accommodation: RU:Tag:office=tourist accommodation
     office=translator: RU:Tag:office=translator
+    office=transport: RU:Tag:office=transport
     office=travel_agent: RU:Tag:office=travel agent
     office=tutoring: RU:Tag:office=tutoring
     office=union: RU:Tag:office=union
@@ -28935,15 +31364,18 @@ ru:
     overtaking=yes: RU:Tag:overtaking=yes
     park_ride=hov: RU:Tag:park ride=hov
     parking:orientation=perpendicular: RU:Tag:parking:orientation=perpendicular
+    parking=half_on_kerb: RU:Tag:parking=half on kerb
     parking=lane: RU:Tag:parking=lane
     parking=layby: RU:Tag:parking=layby
     parking=multi-storey: RU:Tag:parking=multi-storey
     parking=on_kerb: RU:Tag:parking=on kerb
+    parking=rooftop: RU:Tag:parking=rooftop
     parking=street_side: RU:Tag:parking=street side
     parking=surface: RU:Tag:parking=surface
     parking=underground: RU:Tag:parking=underground
     parking_space=charging: RU:Tag:parking space=charging
     parking_space=disabled: RU:Tag:parking space=disabled
+    parking_space=parent: RU:Tag:parking space=parent
     path=desire: RU:Tag:path=desire
     path=sidewalk: RU:Tag:path=sidewalk
     pipeline=marker: RU:Tag:pipeline=marker
@@ -28978,6 +31410,7 @@ ru:
     place=square: RU:Tag:place=square
     place=state: RU:Tag:place=state
     place=subcounty: RU:Tag:place=subcounty
+    place=subdistrict: RU:Tag:place=subdistrict
     place=suburb: RU:Tag:place=suburb
     place=town: RU:Tag:place=town
     place=village: RU:Tag:place=village
@@ -28986,18 +31419,22 @@ ru:
     playground=bridge: RU:Tag:playground=bridge
     playground=climbingframe: RU:Tag:playground=climbingframe
     playground=climbingwall: RU:Tag:playground=climbingwall
+    playground=cushion: RU:Tag:playground=cushion
     playground=funnel_ball: RU:Tag:playground=funnel ball
     playground=hopscotch: RU:Tag:playground=hopscotch
     playground=horizontal_bar: RU:Tag:playground=horizontal bar
     playground=map: RU:Tag:playground=map
+    playground=marble_run: RU:Tag:playground=marble run
     playground=playhouse: RU:Tag:playground=playhouse
     playground=sandpit: RU:Tag:playground=sandpit
     playground=sledding: RU:Tag:playground=sledding
     playground=slide: RU:Tag:playground=slide
     playground=structure: RU:Tag:playground=structure
     playground=teenshelter: RU:Tag:playground=teenshelter
+    playground=trampoline: RU:Tag:playground=trampoline
     playground=tunnel_tube: RU:Tag:playground=tunnel tube
     playground=youth_bench: RU:Tag:playground=youth bench
+    playground=zipwire: RU:Tag:playground=zipwire
     police=barracks: RU:Tag:police=barracks
     police=car_pound: RU:Tag:police=car pound
     post_office=post_partner: RU:Tag:post office=post partner
@@ -29042,6 +31479,7 @@ ru:
     railway=light_rail: RU:Tag:railway=light rail
     railway=miniature: RU:Tag:railway=miniature
     railway=narrow_gauge: RU:Tag:railway=narrow gauge
+    railway=platform: RU:Tag:railway=platform
     railway=preserved: RU:Tag:railway=preserved
     railway=rail: RU:Tag:railway=rail
     railway=railway_crossing: RU:Tag:railway=railway crossing
@@ -29065,11 +31503,13 @@ ru:
     rental=clothes: RU:Tag:rental=clothes
     rental=quadracycle: RU:Tag:rental=quadracycle
     rental=ski: RU:Tag:rental=ski
+    rental=skip: RU:Tag:rental=skip
     request_stop=yes: RU:Tag:request stop=yes
     research=aerospace: RU:Tag:research=aerospace
     residential=apartments: RU:Tag:residential=apartments
     residential=block: RU:Tag:residential=block
     residential=condominium: RU:Tag:residential=condominium
+    residential=detached: RU:Tag:residential=detached
     residential=duplex: RU:Tag:residential=duplex
     residential=halting_site: RU:Tag:residential=halting site
     residential=informal_settlement: RU:Tag:residential=informal settlement
@@ -29110,6 +31550,7 @@ ru:
     service=dealer: RU:Tag:service=dealer
     service=drive-through: RU:Tag:service=drive-through
     service=driveway: RU:Tag:service=driveway
+    service=emergency_access: RU:Tag:service=emergency access
     service=parking_aisle: RU:Tag:service=parking aisle
     service=parts: RU:Tag:service=parts
     service=repair: RU:Tag:service=repair
@@ -29142,6 +31583,7 @@ ru:
     shop=beverages: RU:Tag:shop=beverages
     shop=bicycle: RU:Tag:shop=bicycle
     shop=boat: RU:Tag:shop=boat
+    shop=bookmaker: RU:Tag:shop=bookmaker
     shop=books: RU:Tag:shop=books
     shop=boutique: RU:Tag:shop=boutique
     shop=brewing_supplies: RU:Tag:shop=brewing supplies
@@ -29242,6 +31684,7 @@ ru:
     shop=spices: RU:Tag:shop=spices
     shop=sports: RU:Tag:shop=sports
     shop=stationery: RU:Tag:shop=stationery
+    shop=storage_rental: RU:Tag:shop=storage rental
     shop=supermarket: RU:Tag:shop=supermarket
     shop=swimming_pool: RU:Tag:shop=swimming pool
     shop=tattoo: RU:Tag:shop=tattoo
@@ -29258,6 +31701,9 @@ ru:
     shop=video: RU:Tag:shop=video
     shop=video_games: RU:Tag:shop=video games
     shop=watches: RU:Tag:shop=watches
+    shop=water_filter: RU:Tag:shop=water filter
+    shop=water_filters: RU:Tag:shop=water filters
+    shop=weighing_scales: RU:Tag:shop=weighing scales
     shop=wholesale: RU:Tag:shop=wholesale
     shop=window_blind: RU:Tag:shop=window blind
     shop=wine: RU:Tag:shop=wine
@@ -29273,13 +31719,18 @@ ru:
     social_facility=group_home: RU:Tag:social facility=group home
     source:addr=ЕГРН: RU:Tag:source:addr=ЕГРН
     source:maxspeed=sign: RU:Tag:source:maxspeed=sign
+    source=Google: RU:Tag:source=Google
+    sport=aerobics: RU:Tag:sport=aerobics
     sport=archery: RU:Tag:sport=archery
     sport=cycling: RU:Tag:sport=cycling
+    sport=dance: RU:Tag:sport=dance
+    sport=dancing: RU:Tag:sport=dancing
     sport=dog_racing: RU:Tag:sport=dog racing
     sport=equestrian: RU:Tag:sport=equestrian
     sport=funnel_ball: RU:Tag:sport=funnel ball
     sport=futsal: RU:Tag:sport=futsal
     sport=golf: RU:Tag:sport=golf
+    sport=gymnastics: RU:Tag:sport=gymnastics
     sport=horse_racing: RU:Tag:sport=horse racing
     sport=karting: RU:Tag:sport=karting
     sport=model_aerodrome: RU:Tag:sport=model aerodrome
@@ -29294,6 +31745,7 @@ ru:
     statue=animal: RU:Tag:statue=animal
     statue=equestrian: RU:Tag:statue=equestrian
     statue=virgin: RU:Tag:statue=virgin
+    stone_type=conciliation_cross: RU:Tag:stone type=conciliation cross
     studio=audio: RU:Tag:studio=audio
     studio=radio: RU:Tag:studio=radio
     studio=television: RU:Tag:studio=television
@@ -29307,6 +31759,7 @@ ru:
     surface=chipseal: RU:Tag:surface=chipseal
     surface=compacted: RU:Tag:surface=compacted
     surface=concrete: RU:Tag:surface=concrete
+    surface=stone: RU:Tag:surface=stone
     surface=unpaved: RU:Tag:surface=unpaved
     survey_point:purpose=both: RU:Tag:survey point:purpose=both
     survey_point:purpose=horizontal: RU:Tag:survey point:purpose=horizontal
@@ -29322,6 +31775,7 @@ ru:
     survey_point:structure=plaque: RU:Tag:survey point:structure=plaque
     survey_point:structure=pole: RU:Tag:survey point:structure=pole
     swimming_pool=yes: RU:Tag:swimming pool=yes
+    tactile_paving=no: RU:Tag:tactile paving=no
     tank_trap=czech_hedgehog: RU:Tag:tank trap=czech hedgehog
     taxi_type=motorcycle: RU:Tag:taxi type=motorcycle
     taxi_vehicle=motorcycle: RU:Tag:taxi vehicle=motorcycle
@@ -29379,7 +31833,9 @@ ru:
     tower:type=lighting: RU:Tag:tower:type=lighting
     tower:type=lightning_protection: RU:Tag:tower:type=lightning protection
     townhall:type=barangay: RU:Tag:townhall:type=barangay
+    townhall:type=municipality: RU:Tag:townhall:type=municipality
     townhall:type=town: RU:Tag:townhall:type=town
+    townhall:type=village: RU:Tag:townhall:type=village
     trade=agricultural_supplies: RU:Tag:trade=agricultural supplies
     trade=building_supplies: RU:Tag:trade=building supplies
     trade=timber: RU:Tag:trade=timber
@@ -29399,6 +31855,7 @@ ru:
     training=language: RU:Tag:training=language
     training=music: RU:Tag:training=music
     training=sport: RU:Tag:training=sport
+    transformer=main: RU:Tag:transformer=main
     tunnel=building_passage: RU:Tag:tunnel=building passage
     tunnel=culvert: RU:Tag:tunnel=culvert
     type=health: RU:Tag:type=health
@@ -29445,6 +31902,7 @@ ru:
     vending=flowers: RU:Tag:vending=flowers
     vending=food: RU:Tag:vending=food
     vending=fuel: RU:Tag:vending=fuel
+    vending=gas: RU:Tag:vending=gas
     vending=gas_bottles: RU:Tag:vending=gas bottles
     vending=ice_cream: RU:Tag:vending=ice cream
     vending=ice_cubes: RU:Tag:vending=ice cubes
@@ -29464,6 +31922,7 @@ ru:
     vending=public_transport_plans: RU:Tag:vending=public transport plans
     vending=public_transport_tickets: RU:Tag:vending=public transport tickets
     vending=raw_milk: RU:Tag:vending=raw milk
+    vending=rice_polishing: RU:Tag:vending=rice polishing
     vending=sex_toys: RU:Tag:vending=sex toys
     vending=stamps: RU:Tag:vending=stamps
     vending=sweets: RU:Tag:vending=sweets
@@ -29473,8 +31932,30 @@ ru:
     vending=toys: RU:Tag:vending=toys
     vending=umbrellas: RU:Tag:vending=umbrellas
     vending=water: RU:Tag:vending=water
+    vending=wood_pellet: RU:Tag:vending=wood pellet
     vending_machine=fuel: RU:Tag:vending machine=fuel
+    volcano:status=active: RU:Tag:volcano:status=active
+    volcano:status=dormant: RU:Tag:volcano:status=dormant
+    volcano:status=extinct: RU:Tag:volcano:status=extinct
+    volcano:type=caldera: RU:Tag:volcano:type=caldera
+    volcano:type=lava_dome: RU:Tag:volcano:type=lava dome
+    volcano:type=maar: RU:Tag:volcano:type=maar
+    volcano:type=scoria: RU:Tag:volcano:type=scoria
+    volcano:type=shield: RU:Tag:volcano:type=shield
+    volcano:type=stratovolcano: RU:Tag:volcano:type=stratovolcano
+    wall=brick: RU:Tag:wall=brick
+    wall=castle_wall: RU:Tag:wall=castle wall
+    wall=concrete: RU:Tag:wall=concrete
+    wall=concrete_block: RU:Tag:wall=concrete block
+    wall=dry_stone: RU:Tag:wall=dry stone
+    wall=flint: RU:Tag:wall=flint
+    wall=flood_wall: RU:Tag:wall=flood wall
+    wall=gabion: RU:Tag:wall=gabion
     wall=noise_barrier: RU:Tag:wall=noise barrier
+    wall=pise: RU:Tag:wall=pise
+    wall=seawall: RU:Tag:wall=seawall
+    wall=stone: RU:Tag:wall=stone
+    war_memorial=yes: RU:Tag:war memorial=yes
     waste=cigarettes: RU:Tag:waste=cigarettes
     waste=dog_excrement: RU:Tag:waste=dog excrement
     waste=drugs: RU:Tag:waste=drugs
@@ -29506,7 +31987,13 @@ ru:
     water=wastewater: RU:Tag:water=wastewater
     water_source=groundwater: RU:Tag:water source=groundwater
     water_source=main: RU:Tag:water source=main
+    water_source=pond: RU:Tag:water source=pond
     water_source=river: RU:Tag:water source=river
+    water_source=stream: RU:Tag:water source=stream
+    water_source=tube_well: RU:Tag:water source=tube well
+    water_source=water_tank: RU:Tag:water source=water tank
+    water_source=water_works: RU:Tag:water source=water works
+    water_works=desalination: RU:Tag:water works=desalination
     waterway=boatyard: RU:Tag:waterway=boatyard
     waterway=brook: RU:Tag:waterway=brook
     waterway=canal: RU:Tag:waterway=canal
@@ -29543,6 +32030,9 @@ sh:
   key:
     addr: Sh:Key:addr
     tracktype: Sh:Key:tracktype
+si:
+  tag:
+    religion=muslim: Si:Tag:religion=muslim
 sk:
   key:
     addr:conscriptionnumber: Sk:Key:addr:conscriptionnumber
@@ -29551,13 +32041,27 @@ sk:
     ref:ico: Sk:Key:ref:ico
     ref:minvskaddress: Sk:Key:ref:minvskaddress
   tag:
+    genus=Acer: Sk:Tag:genus=Acer
+    genus=Tilia: Sk:Tag:genus=Tilia
+    leaf_cycle=evergreen: Sk:Tag:leaf cycle=evergreen
     refitted=yes: Sk:Tag:refitted=yes
 skr:
   key:
     name:skr: Skr:Key:name:skr
+sl:
+  tag:
+    genus=Quercus: Sl:Tag:genus=Quercus
+    genus=Tilia: Sl:Tag:genus=Tilia
+    leaf_cycle=evergreen: Sl:Tag:leaf cycle=evergreen
 sq:
   key:
     highway: Sq:Key:highway
+  tag:
+    genus=Platanus: Sq:Tag:genus=Platanus
+    genus=Quercus: Sq:Tag:genus=Quercus
+    genus=Tilia: Sq:Tag:genus=Tilia
+    leaf_cycle=evergreen: Sq:Tag:leaf cycle=evergreen
+    religion=muslim: Sq:Tag:religion=muslim
 sr:
   key:
     ref:RS:grad: Sr:Key:ref:RS:grad
     ref:RS:pokrajina: Sr:Key:ref:RS:pokrajina
     ref:RS:ulica: Sr:Key:ref:RS:ulica
     ref:sr:maticni_broj: Sr:Key:ref:sr:maticni broj
+  tag:
+    genus=Tilia: Sr:Tag:genus=Tilia
+    religion=muslim: Sr:Tag:religion=muslim
+sr-latn:
+  tag:
+    leaf_cycle=evergreen: Sr-latn:Tag:leaf cycle=evergreen
+    religion=jewish: Sr-latn:Tag:religion=jewish
 sv:
   key:
     access: Sv:Key:access
+    area: Sv:Key:area
+    bridge: Sv:Key:bridge
+    bus_bay: Sv:Key:bus bay
+    busway: Sv:Key:busway
+    ford: Sv:Key:ford
+    maxspeed: Sv:Key:maxspeed
     name: Sv:Key:name
+    operator: Sv:Key:operator
     ref:raa: Sv:Key:ref:raa
+    shop: Sv:Key:shop
+    website: Sv:Key:website
+    winter_service: Sv:Key:winter service
   tag:
     aerialway=cable_car: Sv:Tag:aerialway=cable car
+    aerialway=pylon: Sv:Tag:aerialway=pylon
+    amenity=bus_station: Sv:Tag:amenity=bus station
+    amenity=parking: Sv:Tag:amenity=parking
     amenity=place_of_worship: Sv:Tag:amenity=place of worship
     amenity=recycling: Sv:Tag:amenity=recycling
     amenity=townhall: Sv:Tag:amenity=townhall
     barrier=hampshire_gate: Sv:Tag:barrier=hampshire gate
+    building=garage: Sv:Tag:building=garage
+    building=garages: Sv:Tag:building=garages
+    building=yes: Sv:Tag:building=yes
+    craft=metal_construction: Sv:Tag:craft=metal construction
+    cycleway=track: Sv:Tag:cycleway=track
+    emergency=suction_point: Sv:Tag:emergency=suction point
+    ford=stepping_stones: Sv:Tag:ford=stepping stones
+    genus=Acer: Sv:Tag:genus=Acer
+    genus=Platanus: Sv:Tag:genus=Platanus
+    highway=emergency_bay: Sv:Tag:highway=emergency bay
     highway=path: Sv:Tag:highway=path
+    highway=pedestrian: Sv:Tag:highway=pedestrian
+    highway=residential: Sv:Tag:highway=residential
     highway=rest_area: Sv:Tag:highway=rest area
     highway=track: Sv:Tag:highway=track
     junction=roundabout: Sv:Tag:junction=roundabout
+    leaf_cycle=evergreen: Sv:Tag:leaf cycle=evergreen
     leisure=dog_park: Sv:Tag:leisure=dog park
     leisure=fitness_station: Sv:Tag:leisure=fitness station
+    leisure=pitch: Sv:Tag:leisure=pitch
+    place=locality: Sv:Tag:place=locality
+    place=square: Sv:Tag:place=square
     railway=rail: Sv:Tag:railway=rail
+    route=ferry: Sv:Tag:route=ferry
+    shelter_type=public_transport: Sv:Tag:shelter type=public transport
+    shop=pet_grooming: Sv:Tag:shop=pet grooming
+    shop=storage_rental: Sv:Tag:shop=storage rental
+    sport=athletics: Sv:Tag:sport=athletics
     sport=motocross: Sv:Tag:sport=motocross
+    sport=soccer: Sv:Tag:sport=soccer
+    surface=asphalt: Sv:Tag:surface=asphalt
+    surface=grass: Sv:Tag:surface=grass
+    surface=gravel: Sv:Tag:surface=gravel
+    surface=unpaved: Sv:Tag:surface=unpaved
+ta:
+  tag:
+    religion=hindu: Ta:Tag:religion=hindu
 talk:
   key:
     real_fire: Talk:Key:real fire
     trail_visibility: Talk:Key:trail visibility
+th:
+  key:
+    golf: Th:Key:golf
+    name: Th:Key:name
+  tag:
+    building=university: Th:Tag:building=university
+    golf=pin: Th:Tag:golf=pin
+    highway=residential: Th:Tag:highway=residential
+    highway=secondary: Th:Tag:highway=secondary
+    highway=tertiary: Th:Tag:highway=tertiary
+    landuse=farmland: Th:Tag:landuse=farmland
+    landuse=grass: Th:Tag:landuse=grass
+    landuse=orchard: Th:Tag:landuse=orchard
+    landuse=railway: Th:Tag:landuse=railway
+    landuse=recreation_ground: Th:Tag:landuse=recreation ground
+    landuse=salt_pond: Th:Tag:landuse=salt pond
+    leisure=park: Th:Tag:leisure=park
+    natural=wood: Th:Tag:natural=wood
+    religion=buddhist: Th:Tag:religion=buddhist
+    religion=shinto: Th:Tag:religion=shinto
+    shop=car_parts: Th:Tag:shop=car parts
+    shop=gold_buyer: Th:Tag:shop=gold buyer
+    shop=mall: Th:Tag:shop=mall
 tl:
   key:
     fixme: Tl:Key:fixme
   tag:
     amenity=clothes_dryer: Tl:Tag:amenity=clothes dryer
+    bridge:support=pylon: Tl:Tag:bridge:support=pylon
     fast_food=cafeteria: Tl:Tag:fast food=cafeteria
     man_made=bridge: Tl:Tag:man made=bridge
     natural=bay: Tl:Tag:natural=bay
+    natural=gulf: Tl:Tag:natural=gulf
     place=city: Tl:Tag:place=city
+    religion=christian: Tl:Tag:religion=christian
+    religion=confucian: Tl:Tag:religion=confucian
 tr:
   key:
     amenity: Tr:Key:amenity
@@ -29616,13 +32196,28 @@ tr:
     amenity=school: Tr:Tag:amenity=school
     boundary=administrative: Tr:Tag:boundary=administrative
     building=mosque: Tr:Tag:building=mosque
+    genus=Acer: Tr:Tag:genus=Acer
+    genus=Platanus: Tr:Tag:genus=Platanus
+    genus=Quercus: Tr:Tag:genus=Quercus
+    genus=Tilia: Tr:Tag:genus=Tilia
+    healthcare=physiotherapist: Tr:Tag:healthcare=physiotherapist
     highway=motorway: Tr:Tag:highway=motorway
     highway=trunk: Tr:Tag:highway=trunk
+    leaf_cycle=evergreen: Tr:Tag:leaf cycle=evergreen
+    man_made=lighthouse: Tr:Tag:man made=lighthouse
+    religion=buddhist: Tr:Tag:religion=buddhist
+    religion=confucian: Tr:Tag:religion=confucian
+    religion=muslim: Tr:Tag:religion=muslim
 uk:
   key:
+    abandoned:*: Uk:Key:abandoned:*
     abandoned:building: Uk:Key:abandoned:building
+    abandoned:landuse: Uk:Key:abandoned:landuse
+    abandoned:place: Uk:Key:abandoned:place
     abutters: Uk:Key:abutters
     access: Uk:Key:access
+    access:conditional: Uk:Key:access:conditional
+    access:delivery: Uk:Key:access:delivery
     addr: Uk:Key:addr
     addr:*: Uk:Key:addr:*
     addr:block: Uk:Key:addr:block
@@ -29650,6 +32245,7 @@ uk:
     addr:suburb: Uk:Key:addr:suburb
     addr:unit: Uk:Key:addr:unit
     admin_level: Uk:Key:admin level
+    advertising: Uk:Key:advertising
     aerialway: Uk:Key:aerialway
     aerodrome:type: Uk:Key:aerodrome:type
     aeroway: Uk:Key:aeroway
@@ -29660,7 +32256,10 @@ uk:
     area:highway: Uk:Key:area:highway
     artwork_type: Uk:Key:artwork type
     automated: Uk:Key:automated
+    automatic_door: Uk:Key:automatic door
+    backcountry: Uk:Key:backcountry
     backward: Uk:Key:backward
+    bar: Uk:Key:bar
     barrier: Uk:Key:barrier
     bench: Uk:Key:bench
     bicycle: Uk:Key:bicycle
@@ -29673,8 +32272,11 @@ uk:
     building: Uk:Key:building
     building:levels: Uk:Key:building:levels
     building:part: Uk:Key:building:part
+    bunker_type: Uk:Key:bunker type
+    cafe: Uk:Key:cafe
     capital: Uk:Key:capital
     cemetery: Uk:Key:cemetery
+    club: Uk:Key:club
     colonnade: Uk:Key:colonnade
     comment: Uk:Key:comment
     covered: Uk:Key:covered
@@ -29690,6 +32292,7 @@ uk:
     destination: Uk:Key:destination
     'destroyed:': 'Uk:Key:destroyed:'
     destroyed:*: Uk:Key:destroyed:*
+    educational: Uk:Key:educational
     email: Uk:Key:email
     embankment: Uk:Key:embankment
     embedded_rails: Uk:Key:embedded rails
@@ -29697,6 +32300,9 @@ uk:
     entrance: Uk:Key:entrance
     est_width: Uk:Key:est width
     exit_to: Uk:Key:exit to
+    firearms: Uk:Key:firearms
+    food: Uk:Key:food
+    foot: Uk:Key:foot
     footway: Uk:Key:footway
     ford: Uk:Key:ford
     forward: Uk:Key:forward
@@ -29707,15 +32313,16 @@ uk:
     heritage: Uk:Key:heritage
     highway: Uk:Key:highway
     historic: Uk:Key:historic
+    horse: Uk:Key:horse
     iata: Uk:Key:iata
     icao: Uk:Key:icao
     indoor: Uk:Key:indoor
-    informal: Uk:Key:informal
     inscription: Uk:Key:inscription
     inscription:url: Uk:Key:inscription:url
     int_name: Uk:Key:int name
     isced:level: Uk:Key:isced:level
     landuse: Uk:Key:landuse
+    lane_markings: Uk:Key:lane markings
     lanes: Uk:Key:lanes
     layer: Uk:Key:layer
     left: Uk:Key:left
@@ -29726,19 +32333,26 @@ uk:
     managed: Uk:Key:managed
     maxheight: Uk:Key:maxheight
     maxspeed: Uk:Key:maxspeed
+    maxspeed:conditional: Uk:Key:maxspeed:conditional
+    maxweight: Uk:Key:maxweight
+    military: Uk:Key:military
+    moped: Uk:Key:moped
+    motor_vehicle: Uk:Key:motor vehicle
+    motorcycle: Uk:Key:motorcycle
     motorroad: Uk:Key:motorroad
     name: Uk:Key:name
-    name:''lg'': Uk:Key:name:''lg''
-    name:de: Uk:Key:name:de
-    name:el: Uk:Key:name:el
     name:en: Uk:Key:name:en
     name:etymology: Uk:Key:name:etymology
-    name:fr: Uk:Key:name:fr
-    name:ja: Uk:Key:name:ja
-    name:lg: Uk:Key:name:lg
+    name:etymology:wikidata: Uk:Key:name:etymology:wikidata
+    name:etymology:wikipedia: Uk:Key:name:etymology:wikipedia
+    name:language: Uk:Key:name:language
+    name:left: Uk:Key:name:left
+    name:prefix: Uk:Key:name:prefix
     name:pronunciation: Uk:Key:name:pronunciation
-    name:ru: Uk:Key:name:ru
+    name:right: Uk:Key:name:right
     name:uk: Uk:Key:name:uk
+    name:uk-Latn: Uk:Key:name:uk-Latn
+    name:wikipedia: Uk:Key:name:wikipedia
     nat_name: Uk:Key:nat name
     natural: Uk:Key:natural
     nohousenumber: Uk:Key:nohousenumber
@@ -29746,9 +32360,11 @@ uk:
     office: Uk:Key:office
     official_name: Uk:Key:official name
     official_name:ru: Uk:Key:official name:ru
+    official_name:uk: Uk:Key:official name:uk
     old_name: Uk:Key:old name
     oneway: Uk:Key:oneway
     oneway:bicycle: Uk:Key:oneway:bicycle
+    oneway:conditional: Uk:Key:oneway:conditional
     oneway:moped: Uk:Key:oneway:moped
     opening_hours: Uk:Key:opening hours
     opening_hours/Tutorial: Uk:Key:opening hours/Tutorial
@@ -29759,9 +32375,15 @@ uk:
     placement: Uk:Key:placement
     playground: Uk:Key:playground
     police: Uk:Key:police
+    political_division: Uk:Key:political division
+    polling_station: Uk:Key:polling station
     population: Uk:Key:population
+    post_office: Uk:Key:post office
     postal_code: Uk:Key:postal code
     power: Uk:Key:power
+    priority: Uk:Key:priority
+    private: Uk:Key:private
+    proposed:name: Uk:Key:proposed:name
     pump: Uk:Key:pump
     railway: Uk:Key:railway
     ref: Uk:Key:ref
@@ -29769,9 +32391,14 @@ uk:
     reg_name: Uk:Key:reg name
     religion: Uk:Key:religion
     residential: Uk:Key:residential
+    restriction:conditional: Uk:Key:restriction:conditional
     right: Uk:Key:right
     route: Uk:Key:route
     ruins: Uk:Key:ruins
+    ruins:*: Uk:Key:ruins:*
+    ruins=yes: Uk:Key:ruins=yes
+    school: Uk:Key:school
+    school:language: Uk:Key:school:language
     service: Uk:Key:service
     service:bicycle:pump: Uk:Key:service:bicycle:pump
     shelter_type: Uk:Key:shelter type
@@ -29787,11 +32414,14 @@ uk:
     species:wikidata: Uk:Key:species:wikidata
     sport: Uk:Key:sport
     surface: Uk:Key:surface
+    tourism: Uk:Key:tourism
     tracktype: Uk:Key:tracktype
     traffic_sign: Uk:Key:traffic sign
     traffic_signals: Uk:Key:traffic signals
     tunnel: Uk:Key:tunnel
     turn: Uk:Key:turn
+    turn:lanes: Uk:Key:turn:lanes
+    turning_circle: Uk:Key:turning circle
     type: Uk:Key:type
     url: Uk:Key:url
     vehicle: Uk:Key:vehicle
@@ -29802,10 +32432,28 @@ uk:
     wikidata: Uk:Key:wikidata
     wikipedia: Uk:Key:wikipedia
     wood: Uk:Key:wood
+    zoo: Uk:Key:zoo
   tag:
+    abandoned:amenity=prison: Uk:Tag:abandoned:amenity=prison
+    access=agricultural: Uk:Tag:access=agricultural
+    access=customers: Uk:Tag:access=customers
+    access=delivery: Uk:Tag:access=delivery
+    access=designated: Uk:Tag:access=designated
+    access=destination: Uk:Tag:access=destination
+    access=no: Uk:Tag:access=no
+    access=permissive: Uk:Tag:access=permissive
+    access=permit: Uk:Tag:access=permit
+    access=private: Uk:Tag:access=private
+    access=unknown: Uk:Tag:access=unknown
     admin_level=2: Uk:Tag:admin level=2
     admin_level=4: Uk:Tag:admin level=4
     admin_level=6: Uk:Tag:admin level=6
+    advertising=column: Uk:Tag:advertising=column
+    advertising=flag: Uk:Tag:advertising=flag
+    advertising=screen: Uk:Tag:advertising=screen
+    advertising=sculpture: Uk:Tag:advertising=sculpture
+    advertising=sign: Uk:Tag:advertising=sign
+    advertising=wall_painting: Uk:Tag:advertising=wall painting
     aerialway=cable_car: Uk:Tag:aerialway=cable car
     aerialway=chair_lift: Uk:Tag:aerialway=chair lift
     aerialway=gondola: Uk:Tag:aerialway=gondola
@@ -29843,6 +32491,7 @@ uk:
     amenity=boat_sharing: Uk:Tag:amenity=boat sharing
     amenity=boat_storage: Uk:Tag:amenity=boat storage
     amenity=brothel: Uk:Tag:amenity=brothel
+    amenity=building_yard: Uk:Tag:amenity=building yard
     amenity=bureau_de_change: Uk:Tag:amenity=bureau de change
     amenity=bus_station: Uk:Tag:amenity=bus station
     amenity=cafe: Uk:Tag:amenity=cafe
@@ -29950,6 +32599,7 @@ uk:
     amenity=nightclub: Uk:Tag:amenity=nightclub
     amenity=nursing_home: Uk:Tag:amenity=nursing home
     amenity=osmica: Uk:Tag:amenity=osmica
+    amenity=outfitter: Uk:Tag:amenity=outfitter
     amenity=parcel_locker: Uk:Tag:amenity=parcel locker
     amenity=park: Uk:Tag:amenity=park
     amenity=parking: Uk:Tag:amenity=parking
@@ -30002,26 +32652,54 @@ uk:
     amenity=social_centre: Uk:Tag:amenity=social centre
     amenity=social_club: Uk:Tag:amenity=social club
     amenity=social_facility: Uk:Tag:amenity=social facility
+    amenity=stage: Uk:Tag:amenity=stage
+    amenity=stool: Uk:Tag:amenity=stool
     amenity=stripclub: Uk:Tag:amenity=stripclub
+    amenity=stroller_parking: Uk:Tag:amenity=stroller parking
+    amenity=student_accommodation: Uk:Tag:amenity=student accommodation
     amenity=studio: Uk:Tag:amenity=studio
+    amenity=surf_school: Uk:Tag:amenity=surf school
     amenity=swingerclub: Uk:Tag:amenity=swingerclub
+    amenity=table: Uk:Tag:amenity=table
     amenity=taxi: Uk:Tag:amenity=taxi
     amenity=telephone: Uk:Tag:amenity=telephone
+    amenity=television: Uk:Tag:amenity=television
     amenity=theatre: Uk:Tag:amenity=theatre
+    amenity=ticket_validator: Uk:Tag:amenity=ticket validator
     amenity=toilets: Uk:Tag:amenity=toilets
+    amenity=tourist_bus_parking: Uk:Tag:amenity=tourist bus parking
     amenity=townhall: Uk:Tag:amenity=townhall
     amenity=toy_library: Uk:Tag:amenity=toy library
     amenity=traffic_park: Uk:Tag:amenity=traffic park
     amenity=training: Uk:Tag:amenity=training
+    amenity=trolley_bay: Uk:Tag:amenity=trolley bay
+    amenity=tuition: Uk:Tag:amenity=tuition
     amenity=university: Uk:Tag:amenity=university
+    amenity=vacuum_cleaner: Uk:Tag:amenity=vacuum cleaner
     amenity=vehicle_inspection: Uk:Tag:amenity=vehicle inspection
+    amenity=vehicle_ramp: Uk:Tag:amenity=vehicle ramp
     amenity=vending_machine: Uk:Tag:amenity=vending machine
     amenity=veterinary: Uk:Tag:amenity=veterinary
+    amenity=veterinary_pharmacy: Uk:Tag:amenity=veterinary pharmacy
+    amenity=vivarium: Uk:Tag:amenity=vivarium
+    amenity=warehouse: Uk:Tag:amenity=warehouse
+    amenity=washing_machine: Uk:Tag:amenity=washing machine
     amenity=waste_basket: Uk:Tag:amenity=waste basket
     amenity=waste_disposal: Uk:Tag:amenity=waste disposal
+    amenity=waste_dump_site: Uk:Tag:amenity=waste dump site
     amenity=waste_transfer_station: Uk:Tag:amenity=waste transfer station
     amenity=water_point: Uk:Tag:amenity=water point
     amenity=watering_place: Uk:Tag:amenity=watering place
+    amenity=weighbridge: Uk:Tag:amenity=weighbridge
+    amenity=whirlpool: Uk:Tag:amenity=whirlpool
+    amenity=workshop: Uk:Tag:amenity=workshop
+    area:highway=footway: Uk:Tag:area:highway=footway
+    area:highway=path: Uk:Tag:area:highway=path
+    area:highway=pedestrian: Uk:Tag:area:highway=pedestrian
+    area:highway=steps: Uk:Tag:area:highway=steps
+    area:highway=trunk: Uk:Tag:area:highway=trunk
+    area:highway=trunk_link: Uk:Tag:area:highway=trunk link
+    artwork_type=mural: Uk:Tag:artwork type=mural
     barrier=debris: Uk:Tag:barrier=debris
     barrier=entrance: Uk:Tag:barrier=entrance
     barrier=gate: Uk:Tag:barrier=gate
@@ -30031,6 +32709,10 @@ uk:
     barrier=planter: Uk:Tag:barrier=planter
     barrier=retaining_wall: Uk:Tag:barrier=retaining wall
     barrier=wicket_gate: Uk:Tag:barrier=wicket gate
+    bicycle=designated: Uk:Tag:bicycle=designated
+    bicycle=dismount: Uk:Tag:bicycle=dismount
+    bicycle=no: Uk:Tag:bicycle=no
+    bicycle=yes: Uk:Tag:bicycle=yes
     boundary=administrative: Uk:Tag:boundary=administrative
     boundary=disputed: Uk:Tag:boundary=disputed
     boundary=forest_compartment: Uk:Tag:boundary=forest compartment
@@ -30087,6 +32769,7 @@ uk:
     building=mosque: Uk:Tag:building=mosque
     building=museum: Uk:Tag:building=museum
     building=office: Uk:Tag:building=office
+    building=outbuilding: Uk:Tag:building=outbuilding
     building=parking: Uk:Tag:building=parking
     building=pavilion: Uk:Tag:building=pavilion
     building=presbytery: Uk:Tag:building=presbytery
@@ -30105,6 +32788,7 @@ uk:
     building=shrine: Uk:Tag:building=shrine
     building=silo: Uk:Tag:building=silo
     building=slurry_tank: Uk:Tag:building=slurry tank
+    building=sports_centre: Uk:Tag:building=sports centre
     building=sports_hall: Uk:Tag:building=sports hall
     building=stable: Uk:Tag:building=stable
     building=stadium: Uk:Tag:building=stadium
@@ -30117,6 +32801,7 @@ uk:
     building=temple: Uk:Tag:building=temple
     building=tent: Uk:Tag:building=tent
     building=terrace: Uk:Tag:building=terrace
+    building=terraced_house: Uk:Tag:building=terraced house
     building=toilets: Uk:Tag:building=toilets
     building=tower: Uk:Tag:building=tower
     building=train_station: Uk:Tag:building=train station
@@ -30135,6 +32820,7 @@ uk:
     craft=blacksmith: Uk:Tag:craft=blacksmith
     craft=bookbinder: Uk:Tag:craft=bookbinder
     craft=builder: Uk:Tag:craft=builder
+    craft=carpenter: Uk:Tag:craft=carpenter
     craft=clockmaker: Uk:Tag:craft=clockmaker
     craft=handicraft: Uk:Tag:craft=handicraft
     craft=metal_construction: Uk:Tag:craft=metal construction
@@ -30156,18 +32842,32 @@ uk:
     entrance=secondary: Uk:Tag:entrance=secondary
     entrance=staircase: Uk:Tag:entrance=staircase
     entrance=yes: Uk:Tag:entrance=yes
+    foot=designated: Uk:Tag:foot=designated
+    foot=destination: Uk:Tag:foot=destination
+    foot=no: Uk:Tag:foot=no
+    foot=permissive: Uk:Tag:foot=permissive
+    foot=private: Uk:Tag:foot=private
+    foot=use_sidepath: Uk:Tag:foot=use sidepath
+    foot=yes: Uk:Tag:foot=yes
     footway=crossing: Uk:Tag:footway=crossing
     footway=sidewalk: Uk:Tag:footway=sidewalk
     generator:method=run-of-the-river: Uk:Tag:generator:method=run-of-the-river
     generator:method=water-pumped-storage: Uk:Tag:generator:method=water-pumped-storage
     generator:method=water-storage: Uk:Tag:generator:method=water-storage
     generator:source=hydro: Uk:Tag:generator:source=hydro
+    genus=Acer: Uk:Tag:genus=Acer
+    genus=Platanus: Uk:Tag:genus=Platanus
+    genus=Quercus: Uk:Tag:genus=Quercus
     government=legislative: Uk:Tag:government=legislative
     government=ministry: Uk:Tag:government=ministry
     government=prosecutor: Uk:Tag:government=prosecutor
     government=tax: Uk:Tag:government=tax
+    healthcare=clinic: Uk:Tag:healthcare=clinic
+    healthcare=doctor: Uk:Tag:healthcare=doctor
+    healthcare=physiotherapist: Uk:Tag:healthcare=physiotherapist
     highway=bridleway: Uk:Tag:highway=bridleway
     highway=bus_guideway: Uk:Tag:highway=bus guideway
+    highway=bus_stop: Uk:Tag:highway=bus stop
     highway=busway: Uk:Tag:highway=busway
     highway=construction: Uk:Tag:highway=construction
     highway=corridor: Uk:Tag:highway=corridor
@@ -30184,11 +32884,14 @@ uk:
     highway=pedestrian: Uk:Tag:highway=pedestrian
     highway=platform: Uk:Tag:highway=platform
     highway=primary: Uk:Tag:highway=primary
+    highway=proposed: Uk:Tag:highway=proposed
     highway=raceway: Uk:Tag:highway=raceway
     highway=residential: Uk:Tag:highway=residential
+    highway=rest_area: Uk:Tag:highway=rest area
     highway=road: Uk:Tag:highway=road
     highway=secondary: Uk:Tag:highway=secondary
     highway=service: Uk:Tag:highway=service
+    highway=speed_camera: Uk:Tag:highway=speed camera
     highway=steps: Uk:Tag:highway=steps
     highway=street_lamp: Uk:Tag:highway=street lamp
     highway=tertiary: Uk:Tag:highway=tertiary
@@ -30207,6 +32910,7 @@ uk:
     historic=vehicle: Uk:Tag:historic=vehicle
     historic=wayside_cross: Uk:Tag:historic=wayside cross
     industrial=bakery: Uk:Tag:industrial=bakery
+    informal=yes: Uk:Tag:informal=yes
     landuse=allotments: Uk:Tag:landuse=allotments
     landuse=brownfield: Uk:Tag:landuse=brownfield
     landuse=cemetery: Uk:Tag:landuse=cemetery
@@ -30219,6 +32923,7 @@ uk:
     landuse=hop_garden: Uk:Tag:landuse=hop garden
     landuse=industrial: Uk:Tag:landuse=industrial
     landuse=meadow: Uk:Tag:landuse=meadow
+    landuse=orchard: Uk:Tag:landuse=orchard
     landuse=residential: Uk:Tag:landuse=residential
     landuse=village_green: Uk:Tag:landuse=village green
     landuse=vineyard: Uk:Tag:landuse=vineyard
@@ -30228,6 +32933,7 @@ uk:
     leisure=common: Uk:Tag:leisure=common
     leisure=ice_rink: Uk:Tag:leisure=ice rink
     leisure=miniature_golf: Uk:Tag:leisure=miniature golf
+    leisure=picnic_table: Uk:Tag:leisure=picnic table
     leisure=playground: Uk:Tag:leisure=playground
     leisure=water_park: Uk:Tag:leisure=water park
     man_made=beehive: Uk:Tag:man made=beehive
@@ -30238,15 +32944,20 @@ uk:
     man_made=cross: Uk:Tag:man made=cross
     man_made=embankment: Uk:Tag:man made=embankment
     man_made=flare: Uk:Tag:man made=flare
+    man_made=fuel_pump: Uk:Tag:man made=fuel pump
     man_made=goods_conveyor: Uk:Tag:man made=goods conveyor
+    man_made=heap: Uk:Tag:man made=heap
+    man_made=lighthouse: Uk:Tag:man made=lighthouse
     man_made=manhole: Uk:Tag:man made=manhole
     man_made=observatory: Uk:Tag:man made=observatory
     man_made=pier: Uk:Tag:man made=pier
     man_made=reservoir_covered: Uk:Tag:man made=reservoir covered
     man_made=water_tower: Uk:Tag:man made=water tower
     man_made=water_well: Uk:Tag:man made=water well
+    man_made=watermill: Uk:Tag:man made=watermill
     man_made=works: Uk:Tag:man made=works
     museum=children: Uk:Tag:museum=children
+    name:signed=no: Uk:Tag:name:signed=no
     natural=bare_rock: Uk:Tag:natural=bare rock
     natural=birds_nest: Uk:Tag:natural=birds nest
     natural=cliff: Uk:Tag:natural=cliff
@@ -30330,12 +33041,16 @@ uk:
     railway=tram: Uk:Tag:railway=tram
     railway=water_crane: Uk:Tag:railway=water crane
     religion=christian: Uk:Tag:religion=christian
+    religion=confucian: Uk:Tag:religion=confucian
+    religion=multifaith: Uk:Tag:religion=multifaith
     request_stop=yes: Uk:Tag:request stop=yes
     residential=apartments: Uk:Tag:residential=apartments
     residential=rural: Uk:Tag:residential=rural
     residential=single_family: Uk:Tag:residential=single family
     residential=urban: Uk:Tag:residential=urban
+    route=road: Uk:Tag:route=road
     route=train: Uk:Tag:route=train
+    shop=anime: Uk:Tag:shop=anime
     shop=antiques: Uk:Tag:shop=antiques
     shop=baby_goods: Uk:Tag:shop=baby goods
     shop=bakery: Uk:Tag:shop=bakery
@@ -30344,6 +33059,7 @@ uk:
     shop=confectionery: Uk:Tag:shop=confectionery
     shop=games: Uk:Tag:shop=games
     shop=ice_cream: Uk:Tag:shop=ice cream
+    shop=musical_instrument: Uk:Tag:shop=musical instrument
     shop=optician: Uk:Tag:shop=optician
     shop=second_hand: Uk:Tag:shop=second hand
     shop=sewing: Uk:Tag:shop=sewing
@@ -30352,16 +33068,23 @@ uk:
     sport=multi: Uk:Tag:sport=multi
     sport=parachuting: Uk:Tag:sport=parachuting
     sport=paragliding: Uk:Tag:sport=paragliding
+    sport=rowing: Uk:Tag:sport=rowing
     sport=rugby: Uk:Tag:sport=rugby
     sport=shooting: Uk:Tag:sport=shooting
+    sport=skateboard: Uk:Tag:sport=skateboard
     sport=skiing: Uk:Tag:sport=skiing
     sport=swimming: Uk:Tag:sport=swimming
+    surface=unhewn_cobblestone: Uk:Tag:surface=unhewn cobblestone
+    tourism=apartment: Uk:Tag:tourism=apartment
+    tourism=aquarium: Uk:Tag:tourism=aquarium
+    tourism=artwork: Uk:Tag:tourism=artwork
     tourism=hostel: Uk:Tag:tourism=hostel
     tourism=motel: Uk:Tag:tourism=motel
     tunnel=avalanche_protector: Uk:Tag:tunnel=avalanche protector
     tunnel=building_passage: Uk:Tag:tunnel=building passage
     type=boundary: Uk:Tag:type=boundary
     vending=bicycle_tube: Uk:Tag:vending=bicycle tube
+    water=lake: Uk:Tag:water=lake
     water=river: Uk:Tag:water=river
     waterway=dam: Uk:Tag:waterway=dam
     waterway=ditch: Uk:Tag:waterway=ditch
@@ -30378,6 +33101,10 @@ vi:
     addr:*: Vi:Key:addr:*
     highway: Vi:Key:highway
   tag:
+    genus=Acer: Vi:Tag:genus=Acer
+    genus=Platanus: Vi:Tag:genus=Platanus
+    genus=Quercus: Vi:Tag:genus=Quercus
+    healthcare=physiotherapist: Vi:Tag:healthcare=physiotherapist
     highway=primary: Vi:Tag:highway=primary
     highway=residential: Vi:Tag:highway=residential
     highway=secondary: Vi:Tag:highway=secondary
@@ -30385,6 +33112,13 @@ vi:
     highway=tertiary: Vi:Tag:highway=tertiary
     highway=trunk: Vi:Tag:highway=trunk
     highway=unclassified: Vi:Tag:highway=unclassified
+    leaf_cycle=evergreen: Vi:Tag:leaf cycle=evergreen
+    man_made=lighthouse: Vi:Tag:man made=lighthouse
+    religion=buddhist: Vi:Tag:religion=buddhist
+    religion=confucian: Vi:Tag:religion=confucian
+    religion=muslim: Vi:Tag:religion=muslim
+    religion=shinto: Vi:Tag:religion=shinto
+    religion=taoist: Vi:Tag:religion=taoist
 yue:
   key:
     building: Yue:Key:building
@@ -30428,9 +33162,6 @@ yue:
     man_made=gasometer: Yue:Tag:man made=gasometer
     residential=university: Yue:Tag:residential=university
     tourism=attraction: Yue:Tag:tourism=attraction
-zh hans:
-  key:
-    name:etymology: Zh hans:Key:name:etymology
 zh-hans:
   key:
     abutters: Zh-hans:Key:abutters
@@ -30443,9 +33174,12 @@ zh-hans:
     cables: Zh-hans:Key:cables
     china_class: Zh-hans:Key:china class
     china_population: Zh-hans:Key:china population
+    cinema:IMAX: Zh-hans:Key:cinema:IMAX
+    cinema:dolby_cinema: Zh-hans:Key:cinema:dolby cinema
     circuits: Zh-hans:Key:circuits
     construction: Zh-hans:Key:construction
     cuisine: Zh-hans:Key:cuisine
+    cycle_barrier: Zh-hans:Key:cycle barrier
     cycleway: Zh-hans:Key:cycleway
     cycleway:both: Zh-hans:Key:cycleway:both
     ele: Zh-hans:Key:ele
@@ -30460,9 +33194,9 @@ zh-hans:
     height: Zh-hans:Key:height
     highspeed: Zh-hans:Key:highspeed
     highway: Zh-hans:Key:highway
-    informal: Zh-hans:Key:informal
     information: Zh-hans:Key:information
     landuse: Zh-hans:Key:landuse
+    lanes:psv: Zh-hans:Key:lanes:psv
     layer: Zh-hans:Key:layer
     leisure: Zh-hans:Key:leisure
     material: Zh-hans:Key:material
@@ -30470,8 +33204,10 @@ zh-hans:
     motorcycle: Zh-hans:Key:motorcycle
     name: Zh-hans:Key:name
     name:etymology: Zh-hans:Key:name:etymology
+    not:name: Zh-hans:Key:not:name
     oneway: Zh-hans:Key:oneway
     opening_hours:covid19: Zh-hans:Key:opening hours:covid19
+    operator: Zh-hans:Key:operator
     overtaking: Zh-hans:Key:overtaking
     parking: Zh-hans:Key:parking
     place: Zh-hans:Key:place
@@ -30479,6 +33215,7 @@ zh-hans:
     place:cn: Zh-hans:Key:place:cn
     plant:method: Zh-hans:Key:plant:method
     population: Zh-hans:Key:population
+    portable: Zh-hans:Key:portable
     power: Zh-hans:Key:power
     proposed: Zh-hans:Key:proposed
     railway: Zh-hans:Key:railway
@@ -30489,6 +33226,7 @@ zh-hans:
     residential: Zh-hans:Key:residential
     roof:direction: Zh-hans:Key:roof:direction
     roof:shape: Zh-hans:Key:roof:shape
+    source: Zh-hans:Key:source
     substation: Zh-hans:Key:substation
     surface: Zh-hans:Key:surface
     toll: Zh-hans:Key:toll
@@ -30504,6 +33242,7 @@ zh-hans:
     amenity=bicycle_rental: Zh-hans:Tag:amenity=bicycle rental
     amenity=bus_station: Zh-hans:Tag:amenity=bus station
     amenity=cafe: Zh-hans:Tag:amenity=cafe
+    amenity=cinema: Zh-hans:Tag:amenity=cinema
     amenity=crematorium: Zh-hans:Tag:amenity=crematorium
     amenity=driver_training: Zh-hans:Tag:amenity=driver training
     amenity=driving_school: Zh-hans:Tag:amenity=driving school
@@ -30513,6 +33252,7 @@ zh-hans:
     amenity=kindergarten: Zh-hans:Tag:amenity=kindergarten
     amenity=mortuary: Zh-hans:Tag:amenity=mortuary
     amenity=parcel_locker: Zh-hans:Tag:amenity=parcel locker
+    amenity=prison: Zh-hans:Tag:amenity=prison
     amenity=school: Zh-hans:Tag:amenity=school
     amenity=shelter: Zh-hans:Tag:amenity=shelter
     amenity=toilets: Zh-hans:Tag:amenity=toilets
@@ -30522,6 +33262,7 @@ zh-hans:
     books=textbook: Zh-hans:Tag:books=textbook
     boundary=administrative: Zh-hans:Tag:boundary=administrative
     boundary=exclave: Zh-hans:Tag:boundary=exclave
+    boundary=military_district: Zh-hans:Tag:boundary=military district
     bridge:structure=humpback: Zh-hans:Tag:bridge:structure=humpback
     building=apartments: Zh-hans:Tag:building=apartments
     building=detached: Zh-hans:Tag:building=detached
@@ -30529,13 +33270,20 @@ zh-hans:
     building=office: Zh-hans:Tag:building=office
     building=school: Zh-hans:Tag:building=school
     building=service: Zh-hans:Tag:building=service
+    building=terraced_house: Zh-hans:Tag:building=terraced house
     cemetery=grave: Zh-hans:Tag:cemetery=grave
+    craft=boatbuilder: Zh-hans:Tag:craft=boatbuilder
     crossing=traffic_signals: Zh-hans:Tag:crossing=traffic signals
     cuisine=asian: Zh-hans:Tag:cuisine=asian
     cuisine=chinese: Zh-hans:Tag:cuisine=chinese
     cuisine=hot_pot: Zh-hans:Tag:cuisine=hot pot
     emergency=emergency_ward_entrance: Zh-hans:Tag:emergency=emergency ward entrance
     generator:source=wind: Zh-hans:Tag:generator:source=wind
+    genus=Acer: Zh-hans:Tag:genus=Acer
+    genus=Platanus: Zh-hans:Tag:genus=Platanus
+    genus=Quercus: Zh-hans:Tag:genus=Quercus
+    genus=Tilia: Zh-hans:Tag:genus=Tilia
+    healthcare=physiotherapist: Zh-hans:Tag:healthcare=physiotherapist
     highway=bus_stop: Zh-hans:Tag:highway=bus stop
     highway=construction: Zh-hans:Tag:highway=construction
     highway=cycleway: Zh-hans:Tag:highway=cycleway
@@ -30565,6 +33313,7 @@ zh-hans:
     highway=unclassified: Zh-hans:Tag:highway=unclassified
     historic=stone: Zh-hans:Tag:historic=stone
     industrial=slaughterhouse: Zh-hans:Tag:industrial=slaughterhouse
+    informal=yes: Zh-hans:Tag:informal=yes
     information=office: Zh-hans:Tag:information=office
     landuse=allotments: Zh-hans:Tag:landuse=allotments
     landuse=brownfield: Zh-hans:Tag:landuse=brownfield
@@ -30578,24 +33327,33 @@ zh-hans:
     landuse=paddy: Zh-hans:Tag:landuse=paddy
     landuse=residential: Zh-hans:Tag:landuse=residential
     landuse=retail: Zh-hans:Tag:landuse=retail
+    leaf_cycle=evergreen: Zh-hans:Tag:leaf cycle=evergreen
     leisure=nature_reserve: Zh-hans:Tag:leisure=nature reserve
+    leisure=picnic_table: Zh-hans:Tag:leisure=picnic table
     line=bay: Zh-hans:Tag:line=bay
     line=busbar: Zh-hans:Tag:line=busbar
     man_made=antenna: Zh-hans:Tag:man made=antenna
     man_made=dyke: Zh-hans:Tag:man made=dyke
     man_made=flagpole: Zh-hans:Tag:man made=flagpole
+    man_made=gantry: Zh-hans:Tag:man made=gantry
+    man_made=lighthouse: Zh-hans:Tag:man made=lighthouse
     man_made=paifang: Zh-hans:Tag:man made=paifang
+    military=airfield: Zh-hans:Tag:military=airfield
+    military_service=army: Zh-hans:Tag:military service=army
     natural=sand: Zh-hans:Tag:natural=sand
     natural=shingle: Zh-hans:Tag:natural=shingle
     natural=shrubbery: Zh-hans:Tag:natural=shrubbery
     natural=wood: Zh-hans:Tag:natural=wood
     network=CN:AH: Zh-hans:Tag:network=CN:AH
+    network=CN:HN:expressway: Zh-hans:Tag:network=CN:HN:expressway
     network=CN:JS: Zh-hans:Tag:network=CN:JS
+    network=CN:YN: Zh-hans:Tag:network=CN:YN
     network=CN:expressway: Zh-hans:Tag:network=CN:expressway
     network=CN:national: Zh-hans:Tag:network=CN:national
     office=government: Zh-hans:Tag:office=government
     office=political_party: Zh-hans:Tag:office=political party
     place=hamlet: Zh-hans:Tag:place=hamlet
+    place=neighbourhood: Zh-hans:Tag:place=neighbourhood
     power=cable: Zh-hans:Tag:power=cable
     power=catenary_mast: Zh-hans:Tag:power=catenary mast
     power=compensator: Zh-hans:Tag:power=compensator
@@ -30618,11 +33376,18 @@ zh-hans:
     railway=subway_entrance: Zh-hans:Tag:railway=subway entrance
     railway=traverser: Zh-hans:Tag:railway=traverser
     railway=yard: Zh-hans:Tag:railway=yard
+    religion=buddhist: Zh-hans:Tag:religion=buddhist
+    religion=christian: Zh-hans:Tag:religion=christian
+    religion=confucian: Zh-hans:Tag:religion=confucian
+    religion=multifaith: Zh-hans:Tag:religion=multifaith
+    religion=shinto: Zh-hans:Tag:religion=shinto
+    religion=taoist: Zh-hans:Tag:religion=taoist
     route=light_rail: Zh-hans:Tag:route=light rail
     route=road: Zh-hans:Tag:route=road
     route=subway: Zh-hans:Tag:route=subway
     service=drive-through: Zh-hans:Tag:service=drive-through
     service=parking_aisle: Zh-hans:Tag:service=parking aisle
+    shop=confectionery: Zh-hans:Tag:shop=confectionery
     shop=storage_rental: Zh-hans:Tag:shop=storage rental
     station=light_rail: Zh-hans:Tag:station=light rail
     station=subway: Zh-hans:Tag:station=subway
@@ -30637,6 +33402,7 @@ zh-hans:
     waterway=ditch: Zh-hans:Tag:waterway=ditch
     waterway=river: Zh-hans:Tag:waterway=river
     waterway=weir: Zh-hans:Tag:waterway=weir
+    wetland=tidalflat: Zh-hans:Tag:wetland=tidalflat
 zh-hant:
   key:
     access: Zh-hant:Key:access
@@ -30644,6 +33410,7 @@ zh-hant:
     amenity: Zh-hant:Key:amenity
     bridge: Zh-hant:Key:bridge
     building: Zh-hant:Key:building
+    contact:line: Zh-hant:Key:contact:line
     conveying: Zh-hant:Key:conveying
     covered: Zh-hant:Key:covered
     cutting: Zh-hant:Key:cutting
@@ -30716,6 +33483,7 @@ zh-hant:
     leisure=pitch: Zh-hant:Tag:leisure=pitch
     man_made=embankment: Zh-hant:Tag:man made=embankment
     natural=peak: Zh-hant:Tag:natural=peak
+    natural=reef: Zh-hant:Tag:natural=reef
     natural=scree: Zh-hant:Tag:natural=scree
     noexit=yes: Zh-hant:Tag:noexit=yes
     power=plant: Zh-hant:Tag:power=plant