rerun script/misc/update-wiki-pages
authorMateusz Konieczny <matkoniecz@gmail.com>
Tue, 12 Jan 2021 21:56:37 +0000 (22:56 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 12 Jan 2021 23:02:05 +0000 (23:02 +0000)
config/wiki_pages.yml

index 2579814246af53cece5c97e506e5393be934a8d0..588fc630ea4a2a198968e550ad218bfde1911892 100644 (file)
@@ -4,6 +4,7 @@
 ---
 ar:
   key:
+    highway: Ar:Key:highway
     name: Ar:Key:name
   tag:
     amenity=school: Ar:Tag:amenity=school
@@ -26,20 +27,42 @@ bn:
     highway: Bn:Key:highway
   tag:
     highway=residential: Bn:Tag:highway=residential
+br:
+  key:
+    highway: Br:Key:highway
 ca:
   key:
     amenity: Ca:Key:amenity
+    building: Ca:Key:building
     lgbtq: Ca:Key:lgbtq
     name: Ca:Key:name
     operator:type: Ca:Key:operator:type
     phone: Ca:Key:phone
+    roundtrip: Ca:Key:roundtrip
+    wikidata: Ca:Key:wikidata
   tag:
+    admin_level=2: Ca:Tag:admin level=2
+    advertising=wall_painting: Ca:Tag:advertising=wall painting
     amenity=post_box: Ca:Tag:amenity=post box
+    barrier=cable_barrier: Ca:Tag:barrier=cable barrier
+    barrier=kerb: Ca:Tag:barrier=kerb
+    building=boathouse: Ca:Tag:building=boathouse
+    building=hospital: Ca:Tag:building=hospital
+    building=hut: Ca:Tag:building=hut
+    craft=blacksmith: Ca:Tag:craft=blacksmith
+    crossing=traffic_signals: Ca:Tag:crossing=traffic signals
+    highway=residential: Ca:Tag:highway=residential
     landuse=farmland: Ca:Tag:landuse=farmland
     leisure=swimming_pool: Ca:Tag:leisure=swimming pool
+    leisure=tanning_salon: Ca:Tag:leisure=tanning salon
+    man_made=gantry: Ca:Tag:man made=gantry
+    name=Herfy: Ca:Tag:name=Herfy
+    natural=cliff: Ca:Tag:natural=cliff
     office=notary: Ca:Tag:office=notary
     place=isolated_dwelling: Ca:Tag:place=isolated dwelling
+    power=line: Ca:Tag:power=line
     shop=frozen_food: Ca:Tag:shop=frozen food
+    vending=books: Ca:Tag:vending=books
 cs:
   key:
     3dr:type: Cs:Key:3dr:type
@@ -480,6 +503,7 @@ cs:
     motorcar: Cs:Key:motorcar
     motorcycle: Cs:Key:motorcycle
     motorcycle:conditional: Cs:Key:motorcycle:conditional
+    motorcycle:tours: Cs:Key:motorcycle:tours
     motorhome: Cs:Key:motorhome
     motorroad: Cs:Key:motorroad
     mountain_pass: Cs:Key:mountain pass
@@ -2078,6 +2102,7 @@ cs:
     sport=boxing: Cs:Tag:sport=boxing
     sport=canadian_football: Cs:Tag:sport=canadian football
     sport=motocross: Cs:Tag:sport=motocross
+    sport=orienteering: Cs:Tag:sport=orienteering
     station=light_rail: Cs:Tag:station=light rail
     station=subway: Cs:Tag:station=subway
     summit:cross=yes: Cs:Tag:summit:cross=yes
@@ -2117,6 +2142,7 @@ cs:
     tower:type=watchtower: Cs:Tag:tower:type=watchtower
     tunnel=culvert: Cs:Tag:tunnel=culvert
     type=public_transport: Cs:Tag:type=public transport
+    type=waterway: Cs:Tag:type=waterway
     vending=SIM_cards: Cs:Tag:vending=SIM cards
     vending=admission_tickets: Cs:Tag:vending=admission tickets
     vending=animal_feed: Cs:Tag:vending=animal feed
@@ -2220,6 +2246,7 @@ da:
     surface: Da:Key:surface
   tag:
     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=veterinary: Da:Tag:amenity=veterinary
@@ -2230,6 +2257,7 @@ da:
     highway=tertiary: Da:Tag:highway=tertiary
     highway=track: Da:Tag:highway=track
     highway=unclassified: Da:Tag:highway=unclassified
+    landuse=cemetery: Da:Tag:landuse=cemetery
     leisure=dog_park: Da:Tag:leisure=dog park
     place=hamlet: Da:Tag:place=hamlet
     place=town: Da:Tag:place=town
@@ -2243,15 +2271,19 @@ de:
     Animal: DE:Key:Animal
     Annotations: DE:Key:Annotations
     FIXME: DE:Key:FIXME
+    Key:restaurant: DE:Key:Key:restaurant
     TODO: DE:Key:TODO
     VRS:ref: DE:Key:VRS:ref
     WDPA_ID:ref: DE:Key:WDPA ID:ref
     'abandoned:': 'DE:Key:abandoned:'
     abandoned:*: DE:Key:abandoned:*
     abandoned:amenity: DE:Key:abandoned:amenity
+    abandoned:place: DE:Key:abandoned:place
     abandoned:railway: DE:Key:abandoned:railway
     abutters: DE:Key:abutters
     access: DE:Key:access
+    access:lanes: DE:Key:access:lanes
+    access:offroad: DE:Key:access:offroad
     addr: DE:Key:addr
     addr:city: DE:Key:addr:city
     addr:country: DE:Key:addr:country
@@ -2269,18 +2301,22 @@ de:
     aeroway: DE:Key:aeroway
     after_school: DE:Key:after school
     agricultural: DE:Key:agricultural
+    alt_name: DE:Key:alt name
     amenity: DE:Key:amenity
+    architect: DE:Key:architect
     area: DE:Key:area
     artist_name: DE:Key:artist name
     artwork_type: DE:Key:artwork type
     asb: DE:Key:asb
     ascent: DE:Key:ascent
     attraction: DE:Key:attraction
+    atv:repair: DE:Key:atv:repair
     authentication: DE:Key:authentication
     automated: DE:Key:automated
     backcountry: DE:Key:backcountry
     backrest: DE:Key:backrest
     backward: DE:Key:backward
+    bakehouse: DE:Key:bakehouse
     barrier: DE:Key:barrier
     basin: DE:Key:basin
     bath:type: DE:Key:bath:type
@@ -2290,13 +2326,16 @@ de:
     bench: DE:Key:bench
     bicycle: DE:Key:bicycle
     bicycle:backward: DE:Key:bicycle:backward
+    bicycle:conditional: DE:Key:bicycle:conditional
     bicycle_parking: DE:Key:bicycle parking
     bicycle_road: DE:Key:bicycle road
     bike_ride: DE:Key:bike ride
     bin: DE:Key:bin
     biosphärenwirt: DE:Key:biosphärenwirt
+    board:title: DE:Key:board:title
     board_type: DE:Key:board type
     boat: DE:Key:boat
+    boat:rental: DE:Key:boat:rental
     bollard: DE:Key:bollard
     books: DE:Key:books
     both: DE:Key:both
@@ -2315,22 +2354,30 @@ de:
     building:levels:underground: DE:Key:building:levels:underground
     building:material: DE:Key:building:material
     building:part: DE:Key:building:part
+    building:use: DE:Key:building:use
     bulk_purchase: DE:Key:bulk purchase
     bunker_type: DE:Key:bunker type
     bus: DE:Key:bus
     bus_bay: DE:Key:bus bay
     busway: DE:Key:busway
+    button_operated: DE:Key:button operated
     cables: DE:Key:cables
     canoe: DE:Key:canoe
     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
     carriage: DE:Key:carriage
+    cash_withdrawal: DE:Key:cash withdrawal
     castle_type: DE:Key:castle type
     cemetery: DE:Key:cemetery
+    changing_table: DE:Key:changing table
+    charge: DE:Key:charge
     check_date: DE:Key:check date
+    checkpoint: DE:Key:checkpoint
     circuits: DE:Key:circuits
     circumference: DE:Key:circumference
     city_limit: DE:Key:city limit
@@ -2340,6 +2387,7 @@ de:
     cocktails: DE:Key:cocktails
     coffee: DE:Key:coffee
     collection_times: DE:Key:collection times
+    colour: DE:Key:colour
     comment: DE:Key:comment
     communication:amateur_radio:repeater: DE:Key:communication:amateur radio:repeater
     communication:bos: DE:Key:communication:bos
@@ -2349,6 +2397,7 @@ de:
     communication:television: DE:Key:communication:television
     community_centre: DE:Key:community centre
     community_centre:for: DE:Key:community centre:for
+    conditional: DE:Key:conditional
     construction: DE:Key:construction
     contact: DE:Key:contact
     contact:email: DE:Key:contact:email
@@ -2373,6 +2422,7 @@ de:
     crossing:light: DE:Key:crossing:light
     crossing:on_demand: DE:Key:crossing:on demand
     crossing:saltire: DE:Key:crossing:saltire
+    crossing_ref: DE:Key:crossing ref
     cuisine: DE:Key:cuisine
     currency: DE:Key:currency
     currency:BTC: DE:Key:currency:BTC
@@ -2391,9 +2441,13 @@ de:
     delivery: DE:Key:delivery
     denomination: DE:Key:denomination
     denotation: DE:Key:denotation
+    departures_board: DE:Key:departures board
+    descent: DE:Key:descent
     description: DE:Key:description
     designation: DE:Key:designation
     destination: DE:Key:destination
+    destination:backward: DE:Key:destination:backward
+    destination:forward: DE:Key:destination:forward
     destination:ref: DE:Key:destination:ref
     destination:ref:lanes: DE:Key:destination:ref:lanes
     destination:ref:to: DE:Key:destination:ref:to
@@ -2405,8 +2459,10 @@ de:
     diet:*: DE:Key:diet:*
     diet:vegan: DE:Key:diet:vegan
     diet:vegetarian: DE:Key:diet:vegetarian
+    dinner: DE:Key:dinner
     diplomatic: DE:Key:diplomatic
     direction: DE:Key:direction
+    dispensing: DE:Key:dispensing
     display: DE:Key:display
     distance: DE:Key:distance
     disused: DE:Key:disused
@@ -2419,13 +2475,17 @@ de:
     drinking_water: DE:Key:drinking water
     drive_in: DE:Key:drive in
     drive_through: DE:Key:drive through
+    duration: DE:Key:duration
     ele: DE:Key:ele
     electrified: DE:Key:electrified
     embankment: DE:Key:embankment
     emergency: DE:Key:emergency
+    end_date: DE:Key:end date
+    engineer: DE:Key:engineer
     entrance: DE:Key:entrance
     facebook: DE:Key:facebook
     fair_trade: DE:Key:fair trade
+    farmyard: DE:Key:farmyard
     fee: DE:Key:fee
     fence_type: DE:Key:fence type
     ferry:cable: DE:Key:ferry:cable
@@ -2433,6 +2493,7 @@ de:
     fire_hydrant: DE:Key:fire hydrant
     fireplace: DE:Key:fireplace
     fixme: DE:Key:fixme
+    flag:type: DE:Key:flag:type
     floating: DE:Key:floating
     foot: DE:Key:foot
     footway: DE:Key:footway
@@ -2460,11 +2521,19 @@ de:
     generator:type: DE:Key:generator:type
     genus: DE:Key:genus
     geological: DE:Key:geological
+    golf: DE:Key:golf
     golf:course: DE:Key:golf:course
+    goods: DE:Key:goods
     government: DE:Key:government
+    grades: DE:Key:grades
+    grassland: DE:Key:grassland
     group_only: DE:Key:group only
     guest_house: DE:Key:guest house
+    handicap: DE:Key:handicap
+    handrail: DE:Key:handrail
+    happy_hours: DE:Key:happy hours
     harbour: DE:Key:harbour
+    hazard: DE:Key:hazard
     hazmat: DE:Key:hazmat
     hazmat:water: DE:Key:hazmat:water
     healthcare: DE:Key:healthcare
@@ -2481,6 +2550,8 @@ de:
     historic:period: DE:Key:historic:period
     horse: DE:Key:horse
     horse_scale: DE:Key:horse scale
+    iata: DE:Key:iata
+    icao: DE:Key:icao
     ice_cream: DE:Key:ice cream
     ice_road: DE:Key:ice road
     image: DE:Key:image
@@ -2499,21 +2570,26 @@ de:
     is_in:continent: DE:Key:is in:continent
     is_in:country: DE:Key:is in:country
     is_in:county: DE:Key:is in:county
+    isced:level: DE:Key:isced:level
     junction: DE:Key:junction
     kids_area: DE:Key:kids area
     kms: DE:Key:kms
     kneipp_water_cure: DE:Key:kneipp water cure
+    lamp_type: DE:Key:lamp type
     landfill:waste: DE:Key:landfill:waste
     landuse: DE:Key:landuse
     lanes: DE:Key:lanes
     lanes:backward: DE:Key:lanes:backward
+    lanes:both_ways: DE:Key:lanes:both ways
     lanes:bus: DE:Key:lanes:bus
     lanes:forward: DE:Key:lanes:forward
     lanes:psv: DE:Key:lanes:psv
     lanes:psv:backward: DE:Key:lanes:psv:backward
     lanes:psv:forward: DE:Key:lanes:psv:forward
+    language: DE:Key:language
     lawyer: DE:Key:lawyer
     layer: DE:Key:layer
+    lcn: DE:Key:lcn
     lcn_ref: DE:Key:lcn ref
     leaf_cycle: DE:Key:leaf cycle
     leaf_type: DE:Key:leaf type
@@ -2525,6 +2601,7 @@ de:
     lit: DE:Key:lit
     living_street: DE:Key:living street
     loc_name: DE:Key:loc name
+    local_ref: DE:Key:local ref
     location: DE:Key:location
     lock: DE:Key:lock
     lock_name: DE:Key:lock name
@@ -2532,11 +2609,13 @@ de:
     lockable: DE:Key:lockable
     lottery: DE:Key:lottery
     love_locks: DE:Key:love locks
+    lunch: DE:Key:lunch
     man_made: DE:Key:man made
     manhole: DE:Key:manhole
     manufacturer: DE:Key:manufacturer
     manufacturer:type: DE:Key:manufacturer:type
     mapillary: DE:Key:mapillary
+    marker: DE:Key:marker
     massage: DE:Key:massage
     material: DE:Key:material
     max_age: DE:Key:max age
@@ -2545,11 +2624,14 @@ de:
     maxlength: DE:Key:maxlength
     maxspeed: DE:Key:maxspeed
     maxspeed:backward: DE:Key:maxspeed:backward
+    maxspeed:conditional: DE:Key:maxspeed:conditional
     maxspeed:forward: DE:Key:maxspeed:forward
     maxspeed:type: DE:Key:maxspeed:type
+    maxspeed:variable: DE:Key:maxspeed:variable
     maxstay: DE:Key:maxstay
     maxweight: DE:Key:maxweight
     maxwidth: DE:Key:maxwidth
+    maxwidth:physical: DE:Key:maxwidth:physical
     megalith_type: DE:Key:megalith type
     memorial: DE:Key:memorial
     memorial:type: DE:Key:memorial:type
@@ -2587,6 +2669,8 @@ de:
     motorcycle:sales: DE:Key:motorcycle:sales
     motorcycle:type: DE:Key:motorcycle:type
     motorcycle:tyres: DE:Key:motorcycle:tyres
+    motorcycle_friendly: DE:Key:motorcycle friendly
+    motorhome: DE:Key:motorhome
     motorroad: DE:Key:motorroad
     mountain_pass: DE:Key:mountain pass
     mtb:scale: DE:Key:mtb:scale
@@ -2600,7 +2684,9 @@ de:
     natural: DE:Key:natural
     navigationaid: DE:Key:navigationaid
     network: DE:Key:network
+    noaddress: DE:Key:noaddress
     noexit: DE:Key:noexit
+    noname: DE:Key:noname
     note: DE:Key:note
     nudism: DE:Key:nudism
     nursery: DE:Key:nursery
@@ -2612,10 +2698,13 @@ de:
     old_name: DE:Key:old name
     oneway: DE:Key:oneway
     oneway:bicycle: DE:Key:oneway:bicycle
+    oneway:conditional: DE:Key:oneway:conditional
     oneway:moped: DE:Key:oneway:moped
     onkz: DE:Key:onkz
     openfire: DE:Key:openfire
+    opening_date: DE:Key:opening date
     opening_hours: DE:Key:opening hours
+    opening_hours:covid19: DE:Key:opening hours:covid19
     opening_hours:kitchen: DE:Key:opening hours:kitchen
     operator: DE:Key:operator
     operator:MNC: DE:Key:operator:MNC
@@ -2627,12 +2716,14 @@ de:
     outdoor_seating: DE:Key:outdoor seating
     overtaking: DE:Key:overtaking
     par: DE:Key:par
+    park_ride: DE:Key:park ride
     parking: DE:Key:parking
     parking:condition: DE:Key:parking:condition
     parking:lane: DE:Key:parking:lane
     parking:lane:hgv: DE:Key:parking:lane:hgv
     passenger_information_display: DE:Key:passenger information display
     payment: DE:Key:payment
+    permanent_camping: DE:Key:permanent camping
     phone: DE:Key:phone
     pilgrimage: DE:Key:pilgrimage
     piste:difficulty: DE:Key:piste:difficulty
@@ -2647,6 +2738,7 @@ de:
     plant:source: DE:Key:plant:source
     playground: DE:Key:playground
     'playground:': 'DE:Key:playground:'
+    police: DE:Key:police
     population: DE:Key:population
     post_box:type: DE:Key:post box:type
     post_office: DE:Key:post office
@@ -2657,6 +2749,8 @@ de:
     preschool: DE:Key:preschool
     priority: DE:Key:priority
     priority_road: DE:Key:priority road
+    produce: DE:Key:produce
+    product: DE:Key:product
     proposed: DE:Key:proposed
     protect_class: DE:Key:protect class
     protected: DE:Key:protected
@@ -2668,19 +2762,28 @@ de:
     pump: DE:Key:pump
     rack: DE:Key:rack
     railway: DE:Key:railway
+    railway:etcs: DE:Key:railway:etcs
+    railway:lzb: DE:Key:railway:lzb
+    railway:position: DE:Key:railway:position
     railway:preserved: DE:Key:railway:preserved
     railway:track_ref: DE:Key:railway:track ref
     ramp: DE:Key:ramp
+    'razed:': 'DE:Key:razed:'
     rcn_ref: DE:Key:rcn ref
+    recycling:fire_extinguishers: DE:Key:recycling:fire extinguishers
     recycling_type: DE:Key:recycling type
     ref: DE:Key:ref
     ref:IFOPT: DE:Key:ref:IFOPT
     ref:bufa: DE:Key:ref:bufa
     ref:mobil-parken.de: DE:Key:ref:mobil-parken.de
+    ref_name: DE:Key:ref name
     reg_name: DE:Key:reg name
     religion: DE:Key:religion
+    'removed:': 'DE:Key:removed:'
     reservation: DE:Key:reservation
+    reservoir_type: DE:Key:reservoir type
     resource: DE:Key:resource
+    restaurant: DE:Key:restaurant
     right: DE:Key:right
     roof:material: DE:Key:roof:material
     room: DE:Key:room
@@ -2691,6 +2794,7 @@ de:
     ruins: DE:Key:ruins
     sac_scale: DE:Key:sac scale
     salt: DE:Key:salt
+    sauna: DE:Key:sauna
     seamark: DE:Key:seamark
     seamark:fixme: DE:Key:seamark:fixme
     seamark:type: DE:Key:seamark:type
@@ -2700,7 +2804,9 @@ de:
     segregated: DE:Key:segregated
     self_service: DE:Key:self service
     service: DE:Key:service
+    service:bicycle:rental: DE:Key:service:bicycle:rental
     service:bicycle:repair: DE:Key:service:bicycle:repair
+    service:vehicle: DE:Key:service:vehicle
     service_times: DE:Key:service times
     shelter: DE:Key:shelter
     shelter_type: DE:Key:shelter type
@@ -2710,6 +2816,7 @@ de:
     shower: DE:Key:shower
     sidewalk: DE:Key:sidewalk
     site_type: DE:Key:site type
+    ski: DE:Key:ski
     smoking: DE:Key:smoking
     smoothness: DE:Key:smoothness
     social_facility: DE:Key:social facility
@@ -2718,6 +2825,7 @@ de:
     source: DE:Key:source
     source:maxspeed: DE:Key:source:maxspeed
     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
@@ -2737,6 +2845,7 @@ de:
     surveillance: DE:Key:surveillance
     surveillance:zone: DE:Key:surveillance:zone
     survey:date: DE:Key:survey:date
+    swimming: DE:Key:swimming
     swimming_pool: DE:Key:swimming pool
     symbol: DE:Key:symbol
     tactile_paving: DE:Key:tactile paving
@@ -2758,25 +2867,37 @@ de:
     tourism: DE:Key:tourism
     tower:construction: DE:Key:tower:construction
     tower:type: DE:Key:tower:type
+    townhall:type: DE:Key:townhall:type
     tracks: DE:Key:tracks
     tracktype: DE:Key:tracktype
     traffic_calming: DE:Key:traffic calming
     traffic_sign: DE:Key:traffic sign
+    traffic_signals: DE:Key:traffic signals
     traffic_signals:arrow: DE:Key:traffic signals:arrow
     traffic_signals:direction: DE:Key:traffic signals:direction
     traffic_signals:sound: DE:Key:traffic signals:sound
+    traffic_signals:vibration: DE:Key:traffic signals:vibration
     trail_visibility: DE:Key:trail visibility
+    transformer: DE:Key:transformer
+    tree_lined: DE:Key:tree lined
     trees: DE:Key:trees
     trolley_wire: DE:Key:trolley wire
     trolleybus: DE:Key:trolleybus
     tunnel: DE:Key:tunnel
     turn: DE:Key:turn
+    turn:backward: DE:Key:turn:backward
+    turn:forward: DE:Key:turn:forward
     turn:lanes: DE:Key:turn:lanes
     turn:lanes:backward: DE:Key:turn:lanes:backward
     turn:lanes:forward: DE:Key:turn:lanes:forward
     type: DE:Key:type
+    uic_ref: DE:Key:uic ref
     usage: DE:Key:usage
+    utility: DE:Key:utility
+    vaccination: DE:Key:vaccination
+    vacuum_cleaner: DE:Key:vacuum cleaner
     vehicle: DE:Key:vehicle
+    vehicle:conditional: DE:Key:vehicle:conditional
     verbindung: DE:Key:verbindung
     viewpoint: DE:Key:viewpoint
     visibility: DE:Key:visibility
@@ -2796,6 +2917,7 @@ de:
     wikidata: DE:Key:wikidata
     wikimedia_commons: DE:Key:wikimedia commons
     wikipedia: DE:Key:wikipedia
+    windmill:type: DE:Key:windmill:type
     winter_road: DE:Key:winter road
     winter_service: DE:Key:winter service
     wires: DE:Key:wires
@@ -2810,23 +2932,45 @@ de:
     abandoned:amenity=prison: DE:Tag:abandoned:amenity=prison
     abandoned:amenity=prison_camp: DE:Tag:abandoned:amenity=prison camp
     abandoned=yes: DE:Tag:abandoned=yes
+    access=agricultural: DE:Tag:access=agricultural
+    access=customers: DE:Tag:access=customers
+    access=delivery: DE:Tag:access=delivery
     access=designated: DE:Tag:access=designated
     access=destination: DE:Tag:access=destination
+    access=forestry: DE:Tag:access=forestry
+    access=no: DE:Tag:access=no
     access=private: DE:Tag:access=private
     admin_level=2: DE:Tag:admin level=2
     advertising=column: DE:Tag:advertising=column
+    advertising=flag: DE:Tag:advertising=flag
+    advertising=screen: DE:Tag:advertising=screen
+    advertising=sculpture: DE:Tag:advertising=sculpture
+    advertising=sign: DE:Tag:advertising=sign
+    advertising=tarp: DE:Tag:advertising=tarp
+    advertising=wall_painting: DE:Tag:advertising=wall painting
+    aerialway:drag_lift=j-bar: DE:Tag:aerialway:drag lift=j-bar
+    aerialway:drag_lift=platter: DE:Tag:aerialway:drag lift=platter
+    aerialway:drag_lift=t-bar: DE:Tag:aerialway:drag lift=t-bar
     aerialway=cable_car: DE:Tag:aerialway=cable car
+    aerialway=canopy: DE:Tag:aerialway=canopy
     aerialway=chair_lift: DE:Tag:aerialway=chair lift
     aerialway=drag_lift: DE:Tag:aerialway=drag lift
     aerialway=gondola: DE:Tag:aerialway=gondola
     aerialway=goods: DE:Tag:aerialway=goods
+    aerialway=j-bar: DE:Tag:aerialway=j-bar
     aerialway=magic_carpet: DE:Tag:aerialway=magic carpet
+    aerialway=mixed_lift: DE:Tag:aerialway=mixed lift
+    aerialway=platter: DE:Tag:aerialway=platter
     aerialway=pylon: DE:Tag:aerialway=pylon
+    aerialway=rope_tow: DE:Tag:aerialway=rope tow
     aerialway=station: DE:Tag:aerialway=station
+    aerialway=t-bar: DE:Tag:aerialway=t-bar
+    aerialway=zip_line: DE:Tag:aerialway=zip line
     aerodrome:type=gliding: DE:Tag:aerodrome:type=gliding
     aerodrome:type=international: DE:Tag:aerodrome:type=international
     aerodrome:type=regional: DE:Tag:aerodrome:type=regional
     aeroway=aerodrome: DE:Tag:aeroway=aerodrome
+    aeroway=airstrip: DE:Tag:aeroway=airstrip
     aeroway=apron: DE:Tag:aeroway=apron
     aeroway=gate: DE:Tag:aeroway=gate
     aeroway=hangar: DE:Tag:aeroway=hangar
@@ -2842,10 +2986,12 @@ de:
     aeroway=terminal: DE:Tag:aeroway=terminal
     aeroway=windsock: DE:Tag:aeroway=windsock
     airmark=beacon: DE:Tag:airmark=beacon
+    allotments=plot: DE:Tag:allotments=plot
     amenity=administration: DE:Tag:amenity=administration
     amenity=animal_boarding: DE:Tag:amenity=animal boarding
     amenity=animal_breeding: DE:Tag:amenity=animal breeding
     amenity=animal_shelter: DE:Tag:amenity=animal shelter
+    amenity=animal_training: DE:Tag:amenity=animal training
     amenity=archive: DE:Tag:amenity=archive
     amenity=arts_centre: DE:Tag:amenity=arts centre
     amenity=atm: DE:Tag:amenity=atm
@@ -2871,6 +3017,7 @@ de:
     amenity=car_wash: DE:Tag:amenity=car wash
     amenity=casino: DE:Tag:amenity=casino
     amenity=charging_station: DE:Tag:amenity=charging station
+    amenity=childcare: DE:Tag:amenity=childcare
     amenity=cinema: DE:Tag:amenity=cinema
     amenity=clinic: DE:Tag:amenity=clinic
     amenity=clock: DE:Tag:amenity=clock
@@ -2901,6 +3048,7 @@ de:
     amenity=fountain: DE:Tag:amenity=fountain
     amenity=fridge: DE:Tag:amenity=fridge
     amenity=fuel: DE:Tag:amenity=fuel
+    amenity=give_box: DE:Tag:amenity=give box
     amenity=grave_yard: DE:Tag:amenity=grave yard
     amenity=grit_bin: DE:Tag:amenity=grit bin
     amenity=hookah_lounge: DE:Tag:amenity=hookah lounge
@@ -2909,15 +3057,20 @@ de:
     amenity=hunting_stand: DE:Tag:amenity=hunting stand
     amenity=ice_cream: DE:Tag:amenity=ice cream
     amenity=internet_cafe: DE:Tag:amenity=internet cafe
+    amenity=karaoke_box: DE:Tag:amenity=karaoke box
     amenity=kindergarten: DE:Tag:amenity=kindergarten
     amenity=kitchen: DE:Tag:amenity=kitchen
     amenity=kneipp_water_cure: DE:Tag:amenity=kneipp water cure
     amenity=language_school: DE:Tag:amenity=language school
+    amenity=lavoir: DE:Tag:amenity=lavoir
+    amenity=letter_box: DE:Tag:amenity=letter box
     amenity=library: DE:Tag:amenity=library
+    amenity=lounger: DE:Tag:amenity=lounger
     amenity=marketplace: DE:Tag:amenity=marketplace
     amenity=medical_supply: DE:Tag:amenity=medical supply
     amenity=monastery: DE:Tag:amenity=monastery
     amenity=money_transfer: DE:Tag:amenity=money transfer
+    amenity=mortuary: DE:Tag:amenity=mortuary
     amenity=motorcycle_parking: DE:Tag:amenity=motorcycle parking
     amenity=music_school: DE:Tag:amenity=music school
     amenity=music_venue: DE:Tag:amenity=music venue
@@ -2926,6 +3079,7 @@ de:
     amenity=parking: DE:Tag:amenity=parking
     amenity=parking_entrance: DE:Tag:amenity=parking entrance
     amenity=parking_space: DE:Tag:amenity=parking space
+    amenity=payment_terminal: DE:Tag:amenity=payment terminal
     amenity=pharmacy: DE:Tag:amenity=pharmacy
     amenity=photo_booth: DE:Tag:amenity=photo booth
     amenity=place_of_worship: DE:Tag:amenity=place of worship
@@ -2934,6 +3088,7 @@ de:
     amenity=post_box: DE:Tag:amenity=post box
     amenity=post_depot: DE:Tag:amenity=post depot
     amenity=post_office: DE:Tag:amenity=post office
+    amenity=prep_school: DE:Tag:amenity=prep school
     amenity=prison: DE:Tag:amenity=prison
     amenity=prison_camp: DE:Tag:amenity=prison camp
     amenity=pub: DE:Tag:amenity=pub
@@ -2974,6 +3129,8 @@ de:
     amenity=youth_centre: DE:Tag:amenity=youth centre
     animal=horse_walker: DE:Tag:animal=horse walker
     animal=school: DE:Tag:animal=school
+    artwork_type=bust: DE:Tag:artwork type=bust
+    artwork_type=mural: DE:Tag:artwork type=mural
     artwork_type=sculpture: DE:Tag:artwork type=sculpture
     artwork_type=statue: DE:Tag:artwork type=statue
     atm=yes: DE:Tag:atm=yes
@@ -2984,33 +3141,52 @@ de:
     attraction=water_slide: DE:Tag:attraction=water slide
     barrier=block: DE:Tag:barrier=block
     barrier=bollard: DE:Tag:barrier=bollard
+    barrier=bus_trap: DE:Tag:barrier=bus trap
+    barrier=cable_barrier: DE:Tag:barrier=cable barrier
     barrier=cattle_grid: DE:Tag:barrier=cattle grid
+    barrier=chain: DE:Tag:barrier=chain
     barrier=city_wall: DE:Tag:barrier=city wall
     barrier=cycle_barrier: DE:Tag:barrier=cycle barrier
+    barrier=debris: DE:Tag:barrier=debris
     barrier=ditch: DE:Tag:barrier=ditch
     barrier=entrance: DE:Tag:barrier=entrance
     barrier=fence: DE:Tag:barrier=fence
     barrier=full-height_turnstile: DE:Tag:barrier=full-height turnstile
     barrier=gate: DE:Tag:barrier=gate
     barrier=guard_rail: DE:Tag:barrier=guard rail
+    barrier=handrail: DE:Tag:barrier=handrail
     barrier=hedge: DE:Tag:barrier=hedge
     barrier=hedge_bank: DE:Tag:barrier=hedge bank
     barrier=height_restrictor: DE:Tag:barrier=height restrictor
+    barrier=jersey_barrier: DE:Tag:barrier=jersey barrier
     barrier=kerb: DE:Tag:barrier=kerb
     barrier=kissing_gate: DE:Tag:barrier=kissing gate
     barrier=lift_gate: DE:Tag:barrier=lift gate
+    barrier=log: DE:Tag:barrier=log
+    barrier=motorcycle_barrier: DE:Tag:barrier=motorcycle barrier
     barrier=retaining_wall: DE:Tag:barrier=retaining wall
+    barrier=rope: DE:Tag:barrier=rope
     barrier=sally_port: DE:Tag:barrier=sally port
+    barrier=sliding_gate: DE:Tag:barrier=sliding gate
+    barrier=spikes: DE:Tag:barrier=spikes
     barrier=stile: DE:Tag:barrier=stile
+    barrier=swing_gate: DE:Tag:barrier=swing gate
+    barrier=tank_trap: DE:Tag:barrier=tank trap
     barrier=toll_booth: DE:Tag:barrier=toll booth
     barrier=turnstile: DE:Tag:barrier=turnstile
     barrier=wall: DE:Tag:barrier=wall
+    barrier=wicket_gate: DE:Tag:barrier=wicket gate
+    basin=detention: DE:Tag:basin=detention
+    basin=infiltration: DE:Tag:basin=infiltration
+    basin=retention: DE:Tag:basin=retention
     bath:type=hammam: DE:Tag:bath:type=hammam
     bath:type=thermal: DE:Tag:bath:type=thermal
     bay=fjord: DE:Tag:bay=fjord
     bicycle=designated: DE:Tag:bicycle=designated
+    bicycle=dismount: DE:Tag:bicycle=dismount
     bicycle=use_sidepath: DE:Tag:bicycle=use sidepath
     biosphärenwirt=yes: DE:Tag:biosphärenwirt=yes
+    boundary=marker: DE:Tag:boundary=marker
     boundary=national_park: DE:Tag:boundary=national park
     boundary=postal_code: DE:Tag:boundary=postal code
     boundary=protected_area: DE:Tag:boundary=protected area
@@ -3036,34 +3212,46 @@ de:
     bridge=covered: DE:Tag:bridge=covered
     bridge=trestle: DE:Tag:bridge=trestle
     bridge=viaduct: DE:Tag:bridge=viaduct
+    building=allotment_house: DE:Tag:building=allotment house
     building=apartments: DE:Tag:building=apartments
+    building=bakehouse: DE:Tag:building=bakehouse
     building=barn: DE:Tag:building=barn
     building=boathouse: DE:Tag:building=boathouse
     building=bungalow: DE:Tag:building=bungalow
+    building=bunker: DE:Tag:building=bunker
+    building=cabin: DE:Tag:building=cabin
     building=cathedral: DE:Tag:building=cathedral
     building=chapel: DE:Tag:building=chapel
     building=church: DE:Tag:building=church
     building=civic: DE:Tag:building=civic
     building=commercial: DE:Tag:building=commercial
+    building=construction: DE:Tag:building=construction
     building=container: DE:Tag:building=container
     building=cowshed: DE:Tag:building=cowshed
     building=detached: DE:Tag:building=detached
+    building=digester: DE:Tag:building=digester
     building=dormitory: DE:Tag:building=dormitory
     building=entrance: DE:Tag:building=entrance
     building=farm: DE:Tag:building=farm
+    building=farm_auxiliary: DE:Tag:building=farm auxiliary
+    building=fire_station: DE:Tag:building=fire station
     building=garage: DE:Tag:building=garage
     building=garages: DE:Tag:building=garages
+    building=gatehouse: DE:Tag:building=gatehouse
     building=grandstand: DE:Tag:building=grandstand
     building=greenhouse: DE:Tag:building=greenhouse
+    building=hangar: DE:Tag:building=hangar
     building=hospital: DE:Tag:building=hospital
     building=hotel: DE:Tag:building=hotel
     building=house: DE:Tag:building=house
     building=houseboat: DE:Tag:building=houseboat
     building=hut: DE:Tag:building=hut
     building=industrial: DE:Tag:building=industrial
+    building=kindergarten: DE:Tag:building=kindergarten
     building=kiosk: DE:Tag:building=kiosk
     building=marquee: DE:Tag:building=marquee
     building=mosque: DE:Tag:building=mosque
+    building=office: DE:Tag:building=office
     building=parking: DE:Tag:building=parking
     building=pavilion: DE:Tag:building=pavilion
     building=public: DE:Tag:building=public
@@ -3073,17 +3261,22 @@ de:
     building=roof: DE:Tag:building=roof
     building=ruins: DE:Tag:building=ruins
     building=school: DE:Tag:building=school
+    building=semidetached_house: DE:Tag:building=semidetached house
+    building=service: DE:Tag:building=service
     building=shed: DE:Tag:building=shed
     building=shrine: DE:Tag:building=shrine
     building=slurry_tank: DE:Tag:building=slurry tank
     building=sports_hall: DE:Tag:building=sports hall
     building=stable: DE:Tag:building=stable
+    building=stadium: DE:Tag:building=stadium
     building=static_caravan: DE:Tag:building=static caravan
     building=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=toilets: DE:Tag:building=toilets
     building=train_station: DE:Tag:building=train station
     building=university: DE:Tag:building=university
     building=warehouse: DE:Tag:building=warehouse
@@ -3091,6 +3284,7 @@ de:
     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
     castle_type=castrum: DE:Tag:castle type=castrum
     castle_type=defensive: DE:Tag:castle type=defensive
     castle_type=fortress: DE:Tag:castle type=fortress
@@ -3098,24 +3292,32 @@ de:
     castle_type=palace: DE:Tag:castle type=palace
     castle_type=stately: DE:Tag:castle type=stately
     cemetery=grave: DE:Tag:cemetery=grave
+    cemetery=war_cemetery: DE:Tag:cemetery=war cemetery
     club=automobile: DE:Tag:club=automobile
     club=fan: DE:Tag:club=fan
     club=scout: DE:Tag:club=scout
     club=sport: DE:Tag:club=sport
     communication=line: DE:Tag:communication=line
     construction=yes: DE:Tag:construction=yes
+    content=hot_water: DE:Tag:content=hot water
     craft=agricultural_engines: DE:Tag:craft=agricultural engines
+    craft=atelier: DE:Tag:craft=atelier
+    craft=bakery: DE:Tag:craft=bakery
     craft=basket_maker: DE:Tag:craft=basket maker
     craft=beekeeper: DE:Tag:craft=beekeeper
     craft=blacksmith: DE:Tag:craft=blacksmith
     craft=boatbuilder: DE:Tag:craft=boatbuilder
     craft=bookbinder: DE:Tag:craft=bookbinder
+    craft=brewery: DE:Tag:craft=brewery
     craft=builder: DE:Tag:craft=builder
+    craft=cabinet_maker: DE:Tag:craft=cabinet maker
+    craft=car_painter: DE:Tag:craft=car painter
     craft=car_repair: DE:Tag:craft=car repair
     craft=carpenter: DE:Tag:craft=carpenter
     craft=carpet_layer: DE:Tag:craft=carpet layer
     craft=caterer: DE:Tag:craft=caterer
     craft=chimney_sweeper: DE:Tag:craft=chimney sweeper
+    craft=clockmaker: DE:Tag:craft=clockmaker
     craft=confectionery: DE:Tag:craft=confectionery
     craft=cooper: DE:Tag:craft=cooper
     craft=dental_technician: DE:Tag:craft=dental technician
@@ -3123,27 +3325,42 @@ de:
     craft=dressmaker: DE:Tag:craft=dressmaker
     craft=electrican: DE:Tag:craft=electrican
     craft=electrician: DE:Tag:craft=electrician
+    craft=electronics_repair: DE:Tag:craft=electronics repair
+    craft=embroiderer: DE:Tag:craft=embroiderer
+    craft=engraver: DE:Tag:craft=engraver
     craft=floorer: DE:Tag:craft=floorer
     craft=gardener: DE:Tag:craft=gardener
     craft=glaziery: DE:Tag:craft=glaziery
+    craft=goldsmith: DE:Tag:craft=goldsmith
+    craft=grinding_mill: DE:Tag:craft=grinding mill
     craft=handicraft: DE:Tag:craft=handicraft
     craft=hvac: DE:Tag:craft=hvac
     craft=information_electronics: DE:Tag:craft=information electronics
+    craft=insulation: DE:Tag:craft=insulation
     craft=joiner: DE:Tag:craft=joiner
+    craft=key_cutter: DE:Tag:craft=key cutter
     craft=metal_construction: DE:Tag:craft=metal construction
+    craft=musical_instrument: DE:Tag:craft=musical instrument
+    craft=oil_mill: DE:Tag:craft=oil mill
     craft=optician: DE:Tag:craft=optician
     craft=organ_builder: DE:Tag:craft=organ builder
     craft=painter: DE:Tag:craft=painter
     craft=paperhanger: DE:Tag:craft=paperhanger
     craft=parquet_layer: DE:Tag:craft=parquet layer
+    craft=paver: DE:Tag:craft=paver
     craft=photographer: DE:Tag:craft=photographer
+    craft=photographic_laboratory: DE:Tag:craft=photographic laboratory
+    craft=plasterer: DE:Tag:craft=plasterer
     craft=plumber: DE:Tag:craft=plumber
     craft=pottery: DE:Tag:craft=pottery
     craft=roofer: DE:Tag:craft=roofer
     craft=saddler: DE:Tag:craft=saddler
     craft=sawmill: DE:Tag:craft=sawmill
     craft=scaffolder: DE:Tag:craft=scaffolder
+    craft=sculptor: DE:Tag:craft=sculptor
     craft=shoemaker: DE:Tag:craft=shoemaker
+    craft=signmaker: DE:Tag:craft=signmaker
+    craft=stand_builder: DE:Tag:craft=stand builder
     craft=stonemason: DE:Tag:craft=stonemason
     craft=sun_protection: DE:Tag:craft=sun protection
     craft=tailor: DE:Tag:craft=tailor
@@ -3153,13 +3370,22 @@ de:
     craft=turner: DE:Tag:craft=turner
     craft=upholsterer: DE:Tag:craft=upholsterer
     craft=watchmaker: DE:Tag:craft=watchmaker
+    craft=water_well_drilling: DE:Tag:craft=water well drilling
+    craft=welder: DE:Tag:craft=welder
     craft=window_construction: DE:Tag:craft=window construction
     craft=winery: DE:Tag:craft=winery
     crane:type=floor-mounted_crane: DE:Tag:crane:type=floor-mounted crane
     crane:type=gantry_crane: DE:Tag:crane:type=gantry crane
     crane:type=portal_crane: DE:Tag:crane:type=portal crane
     crane:type=travel_lift: DE:Tag:crane:type=travel lift
+    crossing=marked: DE:Tag:crossing=marked
+    crossing=traffic_signals: DE:Tag:crossing=traffic signals
+    crossing=uncontrolled: DE:Tag:crossing=uncontrolled
+    crossing=unmarked: DE:Tag:crossing=unmarked
+    crossing=zebra: DE:Tag:crossing=zebra
+    cuisine=brazilian: DE:Tag:cuisine=brazilian
     cuisine=coffee_shop: DE:Tag:cuisine=coffee shop
+    cuisine=dessert: DE:Tag:cuisine=dessert
     cycleway:left=lane: DE:Tag:cycleway:left=lane
     cycleway:right=lane: DE:Tag:cycleway:right=lane
     cycleway:right=track: DE:Tag:cycleway:right=track
@@ -3180,31 +3406,45 @@ de:
     diplomatic=high_commission: DE:Tag:diplomatic=high commission
     diplomatic=honorary_consulate: DE:Tag:diplomatic=honorary consulate
     diplomatic=permanent_mission: DE:Tag:diplomatic=permanent mission
+    disc_golf=basket: DE:Tag:disc golf=basket
+    disc_golf=hole: DE:Tag:disc golf=hole
     dock=drydock: DE:Tag:dock=drydock
     dock=floating: DE:Tag:dock=floating
+    electrified=contact_line: DE:Tag:electrified=contact line
     emergency=access_point: DE:Tag:emergency=access point
     emergency=aed: DE:Tag:emergency=aed
     emergency=ambulance_station: DE:Tag:emergency=ambulance station
     emergency=assembly_point: DE:Tag:emergency=assembly point
     emergency=defibrillator: DE:Tag:emergency=defibrillator
+    emergency=drinking_water: DE:Tag:emergency=drinking water
+    emergency=dry_riser_inlet: DE:Tag:emergency=dry riser inlet
     emergency=emergency_ward_entrance: DE:Tag:emergency=emergency ward entrance
+    emergency=fire_extinguisher: DE:Tag:emergency=fire extinguisher
+    emergency=fire_flapper: DE:Tag:emergency=fire flapper
+    emergency=fire_hose: DE:Tag:emergency=fire hose
     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_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=landing_site: DE:Tag:emergency=landing site
     emergency=life_ring: DE:Tag:emergency=life ring
     emergency=lifeguard_base: DE:Tag:emergency=lifeguard base
     emergency=lifeguard_place: DE:Tag:emergency=lifeguard place
+    emergency=lifeguard_platform: DE:Tag:emergency=lifeguard platform
     emergency=lifeguard_tower: DE:Tag:emergency=lifeguard tower
     emergency=mountain_rescue: DE:Tag:emergency=mountain rescue
     emergency=phone: DE:Tag:emergency=phone
     emergency=siren: DE:Tag:emergency=siren
     emergency=suction_point: DE:Tag:emergency=suction point
     emergency=water_rescue_station: DE:Tag:emergency=water rescue station
+    emergency=water_tank: DE:Tag:emergency=water tank
     emergency_service=technical: DE:Tag:emergency service=technical
     entrance=main: DE:Tag:entrance=main
     entrance=staircase: DE:Tag:entrance=staircase
     entrance=yes: DE:Tag:entrance=yes
+    fast_food=cafeteria: DE:Tag:fast food=cafeteria
     foot=designated: DE:Tag:foot=designated
     footway=crossing: DE:Tag:footway=crossing
     footway=sidewalk: DE:Tag:footway=sidewalk
@@ -3232,10 +3472,12 @@ de:
     generator:source=biogas: DE:Tag:generator:source=biogas
     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=gas: DE:Tag:generator:source=gas
     generator:source=geothermal: DE:Tag:generator:source=geothermal
     generator:source=hydro: DE:Tag:generator:source=hydro
     generator:source=nuclear: DE:Tag:generator:source=nuclear
+    generator:source=oil: DE:Tag:generator:source=oil
     generator:source=osmotic: DE:Tag:generator:source=osmotic
     generator:source=solar: DE:Tag:generator:source=solar
     generator:source=tidal: DE:Tag:generator:source=tidal
@@ -3266,25 +3508,47 @@ de:
     golf=green: DE:Tag:golf=green
     golf=hole: DE:Tag:golf=hole
     golf=lateral_water_hazard: DE:Tag:golf=lateral water hazard
+    golf=penalty_area: DE:Tag:golf=penalty area
     golf=pin: DE:Tag:golf=pin
     golf=rough: DE:Tag:golf=rough
     golf=tee: DE:Tag:golf=tee
     golf=water_hazard: DE:Tag:golf=water hazard
+    government=administrative: DE:Tag:government=administrative
     government=archive: DE:Tag:government=archive
+    government=audit: DE:Tag:government=audit
+    government=border_control: DE:Tag:government=border control
     government=cadaster: DE:Tag:government=cadaster
     government=customs: DE:Tag:government=customs
+    government=education: DE:Tag:government=education
     government=healthcare: DE:Tag:government=healthcare
+    government=legislative: DE:Tag:government=legislative
     government=ministry: DE:Tag:government=ministry
     government=prosecutor: DE:Tag:government=prosecutor
     government=register_office: DE:Tag:government=register office
     government=statistics: DE:Tag:government=statistics
     government=tax: DE:Tag:government=tax
     government=youth_welfare_department: DE:Tag:government=youth welfare department
+    hazard=animal_crossing: DE:Tag:hazard=animal crossing
+    hazard=children: DE:Tag:hazard=children
+    hazard=cyclists: DE:Tag:hazard=cyclists
+    hazard=falling_rocks: DE:Tag:hazard=falling rocks
+    hazard=minefield: DE:Tag:hazard=minefield
+    hazard=queues_likely: DE:Tag:hazard=queues likely
+    hazard=school_zone: DE:Tag:hazard=school zone
+    hazard=side_winds: DE:Tag:hazard=side winds
+    hazard=slippery: DE:Tag:hazard=slippery
     hazmat:water=permissive: DE:Tag:hazmat:water=permissive
+    healthcare=birthing_center: DE:Tag:healthcare=birthing center
     healthcare=blood_donation: DE:Tag:healthcare=blood donation
+    healthcare=clinic: DE:Tag:healthcare=clinic
     healthcare=dentist: DE:Tag:healthcare=dentist
+    healthcare=dialysis: DE:Tag:healthcare=dialysis
+    healthcare=doctor: DE:Tag:healthcare=doctor
+    healthcare=hospice: DE:Tag:healthcare=hospice
+    healthcare=hospital: DE:Tag:healthcare=hospital
     healthcare=laboratory: DE:Tag:healthcare=laboratory
     healthcare=physiotherapist: DE:Tag:healthcare=physiotherapist
+    healthcare=speech_therapist: DE:Tag:healthcare=speech therapist
     highway=abandoned: DE:Tag:highway=abandoned
     highway=access: DE:Tag:highway=access
     highway=bridleway: DE:Tag:highway=bridleway
@@ -3335,9 +3599,9 @@ de:
     highway=street_light: DE:Tag:highway=street light
     highway=tertiary: DE:Tag:highway=tertiary
     highway=tertiary_link: DE:Tag:highway=tertiary link
+    highway=toll_gantry: DE:Tag:highway=toll gantry
     highway=track: DE:Tag:highway=track
     highway=traffic_mirror: DE:Tag:highway=traffic mirror
-    highway=traffic_sign: DE:Tag:highway=traffic sign
     highway=traffic_signals: DE:Tag:highway=traffic signals
     highway=trunk: DE:Tag:highway=trunk
     highway=trunk_link: DE:Tag:highway=trunk link
@@ -3351,6 +3615,7 @@ de:
     historic=battlefield: DE:Tag:historic=battlefield
     historic=bomb_crater: DE:Tag:historic=bomb crater
     historic=boundary_stone: DE:Tag:historic=boundary stone
+    historic=building: DE:Tag:historic=building
     historic=cannon: DE:Tag:historic=cannon
     historic=castle: DE:Tag:historic=castle
     historic=charcoal_pile: DE:Tag:historic=charcoal pile
@@ -3368,9 +3633,11 @@ de:
     historic=monument: DE:Tag:historic=monument
     historic=optical_telegraph: DE:Tag:historic=optical telegraph
     historic=pillory: DE:Tag:historic=pillory
+    historic=ruins: DE:Tag:historic=ruins
     historic=rune_stone: DE:Tag:historic=rune stone
     historic=ship: DE:Tag:historic=ship
     historic=stone: DE:Tag:historic=stone
+    historic=tank: DE:Tag:historic=tank
     historic=tomb: DE:Tag:historic=tomb
     historic=wayside_cross: DE:Tag:historic=wayside cross
     historic=wayside_shrine: DE:Tag:historic=wayside shrine
@@ -3378,6 +3645,7 @@ de:
     horse=designated: DE:Tag:horse=designated
     industrial=bakery: DE:Tag:industrial=bakery
     industrial=scrap_yard: DE:Tag:industrial=scrap yard
+    industrial=slaughterhouse: DE:Tag:industrial=slaughterhouse
     information=audioguide: DE:Tag:information=audioguide
     information=board: DE:Tag:information=board
     information=guidepost: DE:Tag:information=guidepost
@@ -3386,6 +3654,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=visitor_centre: DE:Tag:information=visitor centre
     internet_access=wlan: DE:Tag:internet access=wlan
     junction=roundabout: DE:Tag:junction=roundabout
     landuse=allotments: DE:Tag:landuse=allotments
@@ -3396,6 +3665,7 @@ de:
     landuse=commercial: DE:Tag:landuse=commercial
     landuse=construction: DE:Tag:landuse=construction
     landuse=depot: DE:Tag:landuse=depot
+    landuse=education: DE:Tag:landuse=education
     landuse=farm: DE:Tag:landuse=farm
     landuse=farmland: DE:Tag:landuse=farmland
     landuse=farmyard: DE:Tag:landuse=farmyard
@@ -3423,16 +3693,23 @@ de:
     landuse=salt_pond: DE:Tag:landuse=salt pond
     landuse=village_green: DE:Tag:landuse=village green
     landuse=vineyard: DE:Tag:landuse=vineyard
+    lcn=yes: DE:Tag:lcn=yes
     leaf_cycle=deciduous: DE:Tag:leaf cycle=deciduous
     leaf_cycle=evergreen: DE:Tag:leaf cycle=evergreen
+    leaf_cycle=mixed: DE:Tag:leaf cycle=mixed
+    leaf_cycle=semi_deciduous: DE:Tag:leaf cycle=semi deciduous
+    leaf_cycle=semi_evergreen: DE:Tag:leaf cycle=semi evergreen
     leaf_type=broadleaved: DE:Tag:leaf type=broadleaved
     leaf_type=leafless: DE:Tag:leaf type=leafless
     leaf_type=mixed: DE:Tag:leaf type=mixed
     leaf_type=needleleaved: DE:Tag:leaf type=needleleaved
     leisure=adult_gaming_centre: DE:Tag:leisure=adult gaming centre
+    leisure=amusement_arcade: DE:Tag:leisure=amusement arcade
     leisure=bandstand: DE:Tag:leisure=bandstand
+    leisure=barefoot: DE:Tag:leisure=barefoot
     leisure=beach_resort: DE:Tag:leisure=beach resort
     leisure=bird_hide: DE:Tag:leisure=bird hide
+    leisure=bleachers: DE:Tag:leisure=bleachers
     leisure=bowling_alley: DE:Tag:leisure=bowling alley
     leisure=common: DE:Tag:leisure=common
     leisure=dance: DE:Tag:leisure=dance
@@ -3446,6 +3723,7 @@ de:
     leisure=foot_bath: DE:Tag:leisure=foot bath
     leisure=garden: DE:Tag:leisure=garden
     leisure=golf_course: DE:Tag:leisure=golf course
+    leisure=hackerspace: DE:Tag:leisure=hackerspace
     leisure=horse_riding: DE:Tag:leisure=horse riding
     leisure=hot_spring: DE:Tag:leisure=hot spring
     leisure=ice_rink: DE:Tag:leisure=ice rink
@@ -3453,6 +3731,7 @@ de:
     leisure=miniature_golf: DE:Tag:leisure=miniature golf
     leisure=nature_reserve: DE:Tag:leisure=nature reserve
     leisure=outdoor_seating: DE:Tag:leisure=outdoor seating
+    leisure=paddling_pool: DE:Tag:leisure=paddling pool
     leisure=park: DE:Tag:leisure=park
     leisure=picnic_table: DE:Tag:leisure=picnic table
     leisure=pitch: DE:Tag:leisure=pitch
@@ -3476,6 +3755,8 @@ de:
     level_crossing=uncontrolled: DE:Tag:level crossing=uncontrolled
     line=bay: DE:Tag:line=bay
     line=busbar: DE:Tag:line=busbar
+    location:transition=yes: DE:Tag:location:transition=yes
+    location=underground: DE:Tag:location=underground
     man_made=MDF: DE:Tag:man made=MDF
     man_made=adit: DE:Tag:man made=adit
     man_made=antenna: DE:Tag:man made=antenna
@@ -3484,6 +3765,7 @@ de:
     man_made=breakwater: DE:Tag:man made=breakwater
     man_made=bridge: DE:Tag:man made=bridge
     man_made=bunker_silo: DE:Tag:man made=bunker silo
+    man_made=carpet_hanger: DE:Tag:man made=carpet hanger
     man_made=chimney: DE:Tag:man made=chimney
     man_made=communications_tower: DE:Tag:man made=communications tower
     man_made=cooling_tower: DE:Tag:man made=cooling tower
@@ -3514,13 +3796,18 @@ de:
     man_made=pier: DE:Tag:man made=pier
     man_made=pipeline: DE:Tag:man made=pipeline
     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
+    man_made=quay: DE:Tag:man made=quay
     man_made=reservoir_covered: DE:Tag:man made=reservoir covered
     man_made=satellite_dish: DE:Tag:man made=satellite dish
     man_made=silo: DE:Tag:man made=silo
     man_made=snow_cannon: DE:Tag:man made=snow cannon
+    man_made=snow_fence: DE:Tag:man made=snow fence
     man_made=spoil_heap: DE:Tag:man made=spoil heap
+    man_made=spring_box: DE:Tag:man made=spring box
     man_made=storage_tank: DE:Tag:man made=storage tank
+    man_made=street_cabinet: DE:Tag:man made=street cabinet
     man_made=surveillance: DE:Tag:man made=surveillance
     man_made=survey_point: DE:Tag:man made=survey point
     man_made=telescope: DE:Tag:man made=telescope
@@ -3534,7 +3821,11 @@ de:
     man_made=watermill: DE:Tag:man made=watermill
     man_made=wildlife_crossing: DE:Tag:man made=wildlife crossing
     man_made=windmill: DE:Tag:man made=windmill
+    man_made=windpump: DE:Tag:man made=windpump
     man_made=works: DE:Tag:man made=works
+    manhole=drain: DE:Tag:manhole=drain
+    marker=aerial: DE:Tag:marker=aerial
+    marker=post: DE:Tag:marker=post
     megalith_type=alignment: DE:Tag:megalith type=alignment
     megalith_type=chamber: DE:Tag:megalith type=chamber
     megalith_type=cist: DE:Tag:megalith type=cist
@@ -3548,6 +3839,7 @@ de:
     megalith_type=tholos: DE:Tag:megalith type=tholos
     memorial:type=stolperstein: DE:Tag:memorial:type=stolperstein
     memorial=bust: DE:Tag:memorial=bust
+    memorial=ghost_bike: DE:Tag:memorial=ghost bike
     memorial=obelisk: DE:Tag:memorial=obelisk
     memorial=plaque: DE:Tag:memorial=plaque
     memorial=statue: DE:Tag:memorial=statue
@@ -3564,6 +3856,7 @@ de:
     military=range: DE:Tag:military=range
     military=training_area: DE:Tag:military=training area
     motorcycle:type=scooter: DE:Tag:motorcycle:type=scooter
+    museum=archaeological: DE:Tag:museum=archaeological
     museum=children: DE:Tag:museum=children
     museum=history: DE:Tag:museum=history
     museum=local: DE:Tag:museum=local
@@ -3571,6 +3864,7 @@ de:
     museum=open_air: DE:Tag:museum=open air
     museum=railway: DE:Tag:museum=railway
     natural=anthill: DE:Tag:natural=anthill
+    natural=arch: DE:Tag:natural=arch
     natural=arete: DE:Tag:natural=arete
     natural=bare_rock: DE:Tag:natural=bare rock
     natural=bay: DE:Tag:natural=bay
@@ -3579,6 +3873,7 @@ de:
     natural=cave_entrance: DE:Tag:natural=cave entrance
     natural=cliff: DE:Tag:natural=cliff
     natural=coastline: DE:Tag:natural=coastline
+    natural=col: DE:Tag:natural=col
     natural=earth_bank: DE:Tag:natural=earth bank
     natural=fell: DE:Tag:natural=fell
     natural=geyser: DE:Tag:natural=geyser
@@ -3616,6 +3911,7 @@ de:
     natural=water: DE:Tag:natural=water
     natural=wetland: DE:Tag:natural=wetland
     natural=wood: DE:Tag:natural=wood
+    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
     network=cambio/stadtmobil: DE:Tag:network=cambio/stadtmobil
@@ -3631,21 +3927,28 @@ de:
     network=rcn: DE:Tag:network=rcn
     network=rhn: DE:Tag:network=rhn
     network=rwn: DE:Tag:network=rwn
+    network=stadtradhamburg: DE:Tag:network=stadtradhamburg
     observatory:type=astronomical: DE:Tag:observatory:type=astronomical
+    observatory:type=gravitational: DE:Tag:observatory:type=gravitational
     office=accountant: DE:Tag:office=accountant
     office=administrative: DE:Tag:office=administrative
     office=adoption_agency: DE:Tag:office=adoption agency
     office=advertising_agency: DE:Tag:office=advertising agency
     office=architect: DE:Tag:office=architect
     office=association: DE:Tag:office=association
+    office=chamber: DE:Tag:office=chamber
     office=charity: DE:Tag:office=charity
+    office=company: DE:Tag:office=company
     office=diplomatic: DE:Tag:office=diplomatic
+    office=educational_institution: DE:Tag:office=educational institution
     office=employment_agency: DE:Tag:office=employment agency
     office=energy_supplier: DE:Tag:office=energy supplier
+    office=engineer: DE:Tag:office=engineer
     office=estate_agent: DE:Tag:office=estate agent
     office=forestry: DE:Tag:office=forestry
     office=geodesist: DE:Tag:office=geodesist
     office=government: DE:Tag:office=government
+    office=graphic_design: DE:Tag:office=graphic design
     office=guide: DE:Tag:office=guide
     office=insurance: DE:Tag:office=insurance
     office=lawyer: DE:Tag:office=lawyer
@@ -3658,8 +3961,13 @@ de:
     office=research: DE:Tag:office=research
     office=surveyor: DE:Tag:office=surveyor
     office=tax_advisor: DE:Tag:office=tax advisor
+    office=telecommunication: DE:Tag:office=telecommunication
     office=therapist: DE:Tag:office=therapist
     office=travel_agent: DE:Tag:office=travel agent
+    office=water_utility: DE:Tag:office=water utility
+    oneway=-1: DE:Tag:oneway=-1
+    oneway=alternating: DE:Tag:oneway=alternating
+    oneway=reversible: DE:Tag:oneway=reversible
     operator=Cambio: DE:Tag:operator=Cambio
     operator=CiteeCar: DE:Tag:operator=CiteeCar
     operator=Drive_Carsharing: DE:Tag:operator=Drive Carsharing
@@ -3672,6 +3980,7 @@ de:
     park_ride: DE:Tag:park ride
     parking:lane:hgv=on_street: DE:Tag:parking:lane:hgv=on street
     parking=multi-storey: DE:Tag:parking=multi-storey
+    parking=street_side: DE:Tag:parking=street side
     parking=underground: DE:Tag:parking=underground
     pipeline=marker: DE:Tag:pipeline=marker
     pipeline=substation: DE:Tag:pipeline=substation
@@ -3679,9 +3988,11 @@ de:
     piste:type=nordic: DE:Tag:piste:type=nordic
     place=archipelago: DE:Tag:place=archipelago
     place=city: DE:Tag:place=city
+    place=city_block: DE:Tag:place=city block
     place=continent: DE:Tag:place=continent
     place=country: DE:Tag:place=country
     place=county: DE:Tag:place=county
+    place=farm: DE:Tag:place=farm
     place=hamlet: DE:Tag:place=hamlet
     place=island: DE:Tag:place=island
     place=islet: DE:Tag:place=islet
@@ -3689,12 +4000,15 @@ de:
     place=locality: DE:Tag:place=locality
     place=municipality: DE:Tag:place=municipality
     place=neighbourhood: DE:Tag:place=neighbourhood
+    place=quarter: DE:Tag:place=quarter
+    place=region: DE:Tag:place=region
     place=square: DE:Tag:place=square
     place=state: DE:Tag:place=state
     place=suburb: DE:Tag:place=suburb
     place=town: DE:Tag:place=town
     place=village: DE:Tag:place=village
     placement=transition: DE:Tag:placement=transition
+    plant:method=water-storage: DE:Tag:plant:method=water-storage
     plant:source=biomass: DE:Tag:plant:source=biomass
     plant:source=coal: DE:Tag:plant:source=coal
     plant:source=gas: DE:Tag:plant:source=gas
@@ -3704,6 +4018,19 @@ de:
     plant:source=solar: DE:Tag:plant:source=solar
     plant:source=waste: DE:Tag:plant:source=waste
     plant:source=wind: DE:Tag:plant:source=wind
+    plant:type=combined_cycle: DE:Tag:plant:type=combined cycle
+    plant:type=steam_turbine: DE:Tag:plant:type=steam turbine
+    police=academy: DE:Tag:police=academy
+    police=barracks: DE:Tag:police=barracks
+    police=car_pound: DE:Tag:police=car pound
+    police=checkpoint: DE:Tag:police=checkpoint
+    police=detention: DE:Tag:police=detention
+    police=naval_base: DE:Tag:police=naval base
+    police=offices: DE:Tag:police=offices
+    police=range: DE:Tag:police=range
+    police=storage: DE:Tag:police=storage
+    police=training_area: DE:Tag:police=training area
+    police=yes: DE:Tag:police=yes
     power=cable: DE:Tag:power=cable
     power=cable_distribution_cabinet: DE:Tag:power=cable distribution cabinet
     power=converter: DE:Tag:power=converter
@@ -3727,6 +4054,7 @@ de:
     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=abandoned: DE:Tag:railway=abandoned
     railway=buffer_stop: DE:Tag:railway=buffer stop
@@ -3735,6 +4063,7 @@ de:
     railway=disused: DE:Tag:railway=disused
     railway=funicular: DE:Tag:railway=funicular
     railway=halt: DE:Tag:railway=halt
+    railway=junction: DE:Tag:railway=junction
     railway=level_crossing: DE:Tag:railway=level crossing
     railway=light_rail: DE:Tag:railway=light rail
     railway=milestone: DE:Tag:railway=milestone
@@ -3755,22 +4084,29 @@ de:
     railway=subway_entrance: DE:Tag:railway=subway entrance
     railway=switch: DE:Tag:railway=switch
     railway=tram: DE:Tag:railway=tram
+    railway=tram_level_crossing: DE:Tag:railway=tram level crossing
     railway=tram_stop: DE:Tag:railway=tram stop
     railway=traverser: DE:Tag:railway=traverser
     railway=turntable: DE:Tag:railway=turntable
     railway=wash: DE:Tag:railway=wash
     railway=water_tower: DE:Tag:railway=water tower
     railway=yard: DE:Tag:railway=yard
+    recycling_type=centre: DE:Tag:recycling type=centre
+    recycling_type=container: DE:Tag:recycling type=container
     religion=buddhist: DE:Tag:religion=buddhist
     religion=christian: DE:Tag:religion=christian
     religion=hindu: DE:Tag:religion=hindu
     religion=jewish: DE:Tag:religion=jewish
     religion=muslim: DE:Tag:religion=muslim
     religion=shinto: DE:Tag:religion=shinto
+    rental=ski: DE:Tag:rental=ski
     rental=strandkorb: DE:Tag:rental=strandkorb
+    repair=assisted_self_service: DE:Tag:repair=assisted self service
+    residential=urban: DE:Tag:residential=urban
     roller_coaster=track: DE:Tag:roller coaster=track
     route=bicycle: DE:Tag:route=bicycle
     route=bus: DE:Tag:route=bus
+    route=detour: DE:Tag:route=detour
     route=ferry: DE:Tag:route=ferry
     route=fitness_trail: DE:Tag:route=fitness trail
     route=foot: DE:Tag:route=foot
@@ -3778,6 +4114,7 @@ de:
     route=horse: DE:Tag:route=horse
     route=inline_skates: DE:Tag:route=inline skates
     route=light_rail: DE:Tag:route=light rail
+    route=monorail: DE:Tag:route=monorail
     route=mtb: DE:Tag:route=mtb
     route=nordic_walking: DE:Tag:route=nordic walking
     route=pipeline: DE:Tag:route=pipeline
@@ -3791,6 +4128,7 @@ de:
     route=train: DE:Tag:route=train
     route=tram: DE:Tag:route=tram
     route=trolleybus: DE:Tag:route=trolleybus
+    seamark:type=mooring: DE:Tag:seamark:type=mooring
     seamark:type=rock: DE:Tag:seamark:type=rock
     service=aircraft_control: DE:Tag:service=aircraft control
     service=alley: DE:Tag:service=alley
@@ -3803,6 +4141,7 @@ de:
     service=yard: DE:Tag:service=yard
     shelter_type=basic_hut: DE:Tag:shelter type=basic hut
     shelter_type=lean_to: DE:Tag:shelter type=lean to
+    shelter_type=public_transport: DE:Tag:shelter type=public transport
     shop=agrarian: DE:Tag:shop=agrarian
     shop=alcohol: DE:Tag:shop=alcohol
     shop=antiques: DE:Tag:shop=antiques
@@ -3846,6 +4185,7 @@ de:
     shop=deli: DE:Tag:shop=deli
     shop=department_store: DE:Tag:shop=department store
     shop=doityourself: DE:Tag:shop=doityourself
+    shop=doors: DE:Tag:shop=doors
     shop=dry_cleaning: DE:Tag:shop=dry cleaning
     shop=electronics: DE:Tag:shop=electronics
     shop=equestrian: DE:Tag:shop=equestrian
@@ -3868,6 +4208,7 @@ de:
     shop=gift: DE:Tag:shop=gift
     shop=golf: DE:Tag:shop=golf
     shop=greengrocer: DE:Tag:shop=greengrocer
+    shop=grocery: DE:Tag:shop=grocery
     shop=haberdashery: DE:Tag:shop=haberdashery
     shop=hairdresser: DE:Tag:shop=hairdresser
     shop=hairdresser_supply: DE:Tag:shop=hairdresser supply
@@ -3876,8 +4217,10 @@ de:
     shop=hearing_aids: DE:Tag:shop=hearing aids
     shop=herbalist: DE:Tag:shop=herbalist
     shop=hifi: DE:Tag:shop=hifi
+    shop=hobby: DE:Tag:shop=hobby
     shop=houseware: DE:Tag:shop=houseware
     shop=hunting: DE:Tag:shop=hunting
+    shop=hvac: DE:Tag:shop=hvac
     shop=ice_cream: DE:Tag:shop=ice cream
     shop=interior_decoration: DE:Tag:shop=interior decoration
     shop=jewelry: DE:Tag:shop=jewelry
@@ -3886,18 +4229,23 @@ de:
     shop=lamps: DE:Tag:shop=lamps
     shop=laundry: DE:Tag:shop=laundry
     shop=leather: DE:Tag:shop=leather
+    shop=lighting: DE:Tag:shop=lighting
     shop=locksmith: DE:Tag:shop=locksmith
+    shop=lottery: DE:Tag:shop=lottery
     shop=mall: DE:Tag:shop=mall
     shop=massage: DE:Tag:shop=massage
     shop=medical_supply: DE:Tag:shop=medical supply
     shop=mobile_phone: DE:Tag:shop=mobile phone
     shop=model: DE:Tag:shop=model
+    shop=money_lender: DE:Tag:shop=money lender
     shop=motorcycle: DE:Tag:shop=motorcycle
     shop=music: DE:Tag:shop=music
     shop=musical_instrument: DE:Tag:shop=musical instrument
     shop=newsagent: DE:Tag:shop=newsagent
+    shop=nutrition_supplements: DE:Tag:shop=nutrition supplements
     shop=optician: DE:Tag:shop=optician
     shop=outdoor: DE:Tag:shop=outdoor
+    shop=outpost: DE:Tag:shop=outpost
     shop=paint: DE:Tag:shop=paint
     shop=party: DE:Tag:shop=party
     shop=pastry: DE:Tag:shop=pastry
@@ -3907,11 +4255,13 @@ de:
     shop=pet_grooming: DE:Tag:shop=pet grooming
     shop=photo: DE:Tag:shop=photo
     shop=pottery: DE:Tag:shop=pottery
+    shop=radiotechnics: DE:Tag:shop=radiotechnics
     shop=religion: DE:Tag:shop=religion
     shop=robot: DE:Tag:shop=robot
     shop=scuba_diving: DE:Tag:shop=scuba diving
     shop=seafood: DE:Tag:shop=seafood
     shop=second_hand: DE:Tag:shop=second hand
+    shop=security: DE:Tag:shop=security
     shop=sewing: DE:Tag:shop=sewing
     shop=shoes: DE:Tag:shop=shoes
     shop=spare_parts: DE:Tag:shop=spare parts
@@ -3933,6 +4283,7 @@ de:
     shop=trophy: DE:Tag:shop=trophy
     shop=tyres: DE:Tag:shop=tyres
     shop=vacant: DE:Tag:shop=vacant
+    shop=vacuum_cleaner: DE:Tag:shop=vacuum cleaner
     shop=variety_store: DE:Tag:shop=variety store
     shop=video: DE:Tag:shop=video
     shop=video_games: DE:Tag:shop=video games
@@ -3971,24 +4322,45 @@ de:
     sport=badminton: DE:Tag:sport=badminton
     sport=baseball: DE:Tag:sport=baseball
     sport=basketball: DE:Tag:sport=basketball
+    sport=beachvolleyball: DE:Tag:sport=beachvolleyball
+    sport=billiards: DE:Tag:sport=billiards
     sport=bmx: DE:Tag:sport=bmx
     sport=bobsleigh: DE:Tag:sport=bobsleigh
+    sport=boules: DE:Tag:sport=boules
+    sport=bowls: DE:Tag:sport=bowls
+    sport=canoe: DE:Tag:sport=canoe
     sport=chess: DE:Tag:sport=chess
+    sport=cliff_diving: DE:Tag:sport=cliff diving
     sport=climbing: DE:Tag:sport=climbing
     sport=climbing_adventure: DE:Tag:sport=climbing adventure
+    sport=cricket: DE:Tag:sport=cricket
+    sport=croquet: DE:Tag:sport=croquet
+    sport=curling: DE:Tag:sport=curling
+    sport=cycling: DE:Tag:sport=cycling
+    sport=darts: DE:Tag:sport=darts
+    sport=dog_racing: DE:Tag:sport=dog racing
     sport=equestrian: DE:Tag:sport=equestrian
     sport=fencing: DE:Tag:sport=fencing
     sport=free_flying: DE:Tag:sport=free flying
+    sport=futsal: DE:Tag:sport=futsal
     sport=golf: DE:Tag:sport=golf
     sport=handball: DE:Tag:sport=handball
     sport=horse_racing: DE:Tag:sport=horse racing
+    sport=ice_hockey: DE:Tag:sport=ice hockey
     sport=ice_skating: DE:Tag:sport=ice skating
+    sport=ice_stock: DE:Tag:sport=ice stock
     sport=judo: DE:Tag:sport=judo
     sport=karting: DE:Tag:sport=karting
+    sport=korfball: DE:Tag:sport=korfball
+    sport=model_aerodrome: DE:Tag:sport=model aerodrome
     sport=motocross: DE:Tag:sport=motocross
     sport=motor: DE:Tag:sport=motor
     sport=multi: DE:Tag:sport=multi
+    sport=nine_mens_morris: DE:Tag:sport=nine mens morris
+    sport=orienteering: DE:Tag:sport=orienteering
+    sport=pelota: DE:Tag:sport=pelota
     sport=rc_car: DE:Tag:sport=rc car
+    sport=rugby: DE:Tag:sport=rugby
     sport=running: DE:Tag:sport=running
     sport=sailing: DE:Tag:sport=sailing
     sport=scuba_diving: DE:Tag:sport=scuba diving
@@ -4010,12 +4382,28 @@ de:
     substation=traction: DE:Tag:substation=traction
     substation=transmission: DE:Tag:substation=transmission
     summit:cross=yes: DE:Tag:summit:cross=yes
+    surface=artificial_turf: DE:Tag:surface=artificial turf
     surface=asphalt: DE:Tag:surface=asphalt
+    surface=clay: DE:Tag:surface=clay
+    surface=cobblestone: DE:Tag:surface=cobblestone
+    surface=concrete: DE:Tag:surface=concrete
+    surface=concrete:lanes: DE:Tag:surface=concrete:lanes
+    surface=paving_stones: DE:Tag:surface=paving stones
+    surface=sett: DE:Tag:surface=sett
+    surface=tartan: DE:Tag:surface=tartan
+    surface=unhewn_cobblestone: DE:Tag:surface=unhewn cobblestone
+    surface=unpaved: DE:Tag:surface=unpaved
+    switch=circuit_breaker: DE:Tag:switch=circuit breaker
+    switch=disconnector: DE:Tag:switch=disconnector
+    switch=mechanical: DE:Tag:switch=mechanical
     telecom=exchange: DE:Tag:telecom=exchange
     telescope:type=optical: DE:Tag:telescope:type=optical
     telescope:type=radio: DE:Tag:telescope:type=radio
     theatre:type=amphi: DE:Tag:theatre:type=amphi
     theatre:type=open_air: DE:Tag:theatre:type=open air
+    tomb=cenotaph: DE:Tag:tomb=cenotaph
+    tomb=mausoleum: DE:Tag:tomb=mausoleum
+    tomb=tumulus: DE:Tag:tomb=tumulus
     tomb=war_grave: DE:Tag:tomb=war grave
     tourism=alpine_hut: DE:Tag:tourism=alpine hut
     tourism=apartment: DE:Tag:tourism=apartment
@@ -4060,6 +4448,15 @@ de:
     tower:type=radar: DE:Tag:tower:type=radar
     tower:type=siren: DE:Tag:tower:type=siren
     tower:type=watchtower: DE:Tag:tower:type=watchtower
+    traffic_calming=dynamic_bump: DE:Tag:traffic calming=dynamic bump
+    traffic_calming=island: DE:Tag:traffic calming=island
+    traffic_calming=table: DE:Tag:traffic calming=table
+    'traffic_sign=DE:': 'DE:Tag:traffic sign=DE:'
+    traffic_sign=DE:1022-10: DE:Tag:traffic sign=DE:1022-10
+    traffic_sign=DE:124: DE:Tag:traffic sign=DE:124
+    traffic_sign=DE:136-10: DE:Tag:traffic sign=DE:136-10
+    traffic_sign=DE:142-10: DE:Tag:traffic sign=DE:142-10
+    traffic_sign=DE:142.10: DE:Tag:traffic sign=DE:142.10
     traffic_sign=DE:205: DE:Tag:traffic sign=DE:205
     traffic_sign=DE:206: DE:Tag:traffic sign=DE:206
     traffic_sign=DE:220-10: DE:Tag:traffic sign=DE:220-10
@@ -4099,19 +4496,41 @@ de:
     traffic_sign=DE:274-70: DE:Tag:traffic sign=DE:274-70
     traffic_sign=DE:274-80: DE:Tag:traffic sign=DE:274-80
     traffic_sign=DE:274.1: DE:Tag:traffic sign=DE:274.1
+    traffic_sign=DE:274.1-20: DE:Tag:traffic sign=DE:274.1-20
     traffic_sign=DE:274.2: DE:Tag:traffic sign=DE:274.2
+    traffic_sign=DE:274.2-20: DE:Tag:traffic sign=DE:274.2-20
     traffic_sign=DE:282: DE:Tag:traffic sign=DE:282
     traffic_sign=DE:306: DE:Tag:traffic sign=DE:306
+    traffic_sign=DE:310: DE:Tag:traffic sign=DE:310
     traffic_sign=DE:325: DE:Tag:traffic sign=DE:325
     traffic_sign=DE:325.1: DE:Tag:traffic sign=DE:325.1
     traffic_sign=DE:325.2: DE:Tag:traffic sign=DE:325.2
+    traffic_sign=DE:330.1: DE:Tag:traffic sign=DE:330.1
+    traffic_sign=DE:330.2: DE:Tag:traffic sign=DE:330.2
+    traffic_sign=DE:331.1: DE:Tag:traffic sign=DE:331.1
+    traffic_sign=DE:331.2: DE:Tag:traffic sign=DE:331.2
+    traffic_sign=DE:350: DE:Tag:traffic sign=DE:350
+    traffic_sign=DE:350-10: DE:Tag:traffic sign=DE:350-10
+    traffic_sign=DE:350-20: DE:Tag:traffic sign=DE:350-20
+    traffic_sign=DE:350-40: DE:Tag:traffic sign=DE:350-40
+    traffic_sign=DE:354: DE:Tag:traffic sign=DE:354
     traffic_sign=DE:357: DE:Tag:traffic sign=DE:357
+    traffic_sign=DE:385: DE:Tag:traffic sign=DE:385
     traffic_sign=DE:386.3: DE:Tag:traffic sign=DE:386.3
+    traffic_sign=DE:394-50: DE:Tag:traffic sign=DE:394-50
+    traffic_sign=DE:437: DE:Tag:traffic sign=DE:437
+    traffic_sign=DE:438: DE:Tag:traffic sign=DE:438
+    traffic_sign=DE:439: DE:Tag:traffic sign=DE:439
     traffic_sign=DE:448: DE:Tag:traffic sign=DE:448
     traffic_sign=DE:449: DE:Tag:traffic sign=DE:449
+    traffic_sign=DE:453: DE:Tag:traffic sign=DE:453
     traffic_sign=city_limit: DE:Tag:traffic sign=city limit
+    transformer=distribution: DE:Tag:transformer=distribution
+    tunnel=building_passage: DE:Tag:tunnel=building passage
     tunnel=culvert: DE:Tag:tunnel=culvert
+    type=waterway: DE:Tag:type=waterway
     usage=headrace: DE:Tag:usage=headrace
+    usage=industrial: DE:Tag:usage=industrial
     usage=irrigation: DE:Tag:usage=irrigation
     usage=penstock: DE:Tag:usage=penstock
     usage=tailrace: DE:Tag:usage=tailrace
@@ -4139,12 +4558,15 @@ de:
     vending=public_transport_tickets: DE:Tag:vending=public transport tickets
     vending=sex_toys: DE:Tag:vending=sex toys
     vending=stamps: DE:Tag:vending=stamps
+    vending=sweets: DE:Tag:vending=sweets
     vending=toys: DE:Tag:vending=toys
     vending=water: DE:Tag:vending=water
     vending_machine=fuel: DE:Tag:vending machine=fuel
     wall=castle_wall: DE:Tag:wall=castle wall
     wall=dry_stone: DE:Tag:wall=dry stone
     wall=noise_barrier: DE:Tag:wall=noise barrier
+    waste=dog_excrement: DE:Tag:waste=dog excrement
+    water=basin: DE:Tag:water=basin
     water=canal: DE:Tag:water=canal
     water=lagoon: DE:Tag:water=lagoon
     water=lake: DE:Tag:water=lake
@@ -4162,6 +4584,7 @@ de:
     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=fuel: DE:Tag:waterway=fuel
     waterway=lock_gate: DE:Tag:waterway=lock gate
@@ -4170,6 +4593,7 @@ de:
     waterway=river: DE:Tag:waterway=river
     waterway=riverbank: DE:Tag:waterway=riverbank
     waterway=stream: DE:Tag:waterway=stream
+    waterway=tidal_channel: DE:Tag:waterway=tidal channel
     waterway=waterfall: DE:Tag:waterway=waterfall
     waterway=weir: DE:Tag:waterway=weir
     wetland=bog: DE:Tag:wetland=bog
@@ -4180,6 +4604,7 @@ de:
     wetland=reedbed: DE:Tag:wetland=reedbed
     wetland=saltern: DE:Tag:wetland=saltern
     wetland=saltmarsh: DE:Tag:wetland=saltmarsh
+    wetland=string_bog: DE:Tag:wetland=string bog
     wetland=swamp: DE:Tag:wetland=swamp
     wetland=tidalflat: DE:Tag:wetland=tidalflat
     wetland=wet_meadow: DE:Tag:wetland=wet meadow
@@ -4243,7 +4668,6 @@ en:
     EHAK:code: Key:EHAK:code
     EH_ref: Key:EH ref
     FIXME: Key:FIXME
-    Fetish: Key:Fetish
     Finance_agent: Key:Finance agent
     HE_ref: Key:HE ref
     HU:ed_direction: Key:HU:ed direction
@@ -4256,7 +4680,15 @@ en:
     INEGI: Key:INEGI
     INEGI:CVE_MUN: Key:INEGI:CVE MUN
     INEGI:MUNID: Key:INEGI:MUNID
+    ISO3166-2: Key:ISO3166-2
+    KKR:code: Key:KKR:code
+    LINZ2OSM:dataset: Key:LINZ2OSM:dataset
+    LINZ2OSM:layer: Key:LINZ2OSM:layer
+    LINZ2OSM:source_version: Key:LINZ2OSM:source version
+    LINZ:layer: Key:LINZ:layer
+    LINZ:source_version: Key:LINZ:source version
     Lock_ref: Key:Lock ref
+    Mapper: Key:Mapper
     NHS: Key:NHS
     PMSA_ref: Key:PMSA ref
     Power_supply:schedule: Key:Power supply:schedule
@@ -4264,21 +4696,21 @@ en:
     RLIS:reviewed: Key:RLIS:reviewed
     Schalansky_ref: Key:Schalansky ref
     Shop: Key:Shop
+    Source: Key:Source
     TMC: Key:TMC
     TMC:Direction: Key:TMC:Direction
     TMC:LocationCode: Key:TMC:LocationCode
     TMC:NextLocationCode: Key:TMC:NextLocationCode
     TMC:PrevLocationCode: Key:TMC:PrevLocationCode
     TODO: Key:TODO
-    Touring: Key:Touring
     URL: Key:URL
     WDPA_ID:ref: Key:WDPA ID:ref
     WLAN: Key:WLAN
-    Wikipedia: Key:Wikipedia
     abandoned: Key:abandoned
     'abandoned:': 'Key:abandoned:'
     abandoned:*: Key:abandoned:*
     abandoned:amenity: Key:abandoned:amenity
+    abandoned:building: Key:abandoned:building
     abandoned:place: Key:abandoned:place
     abandoned:railway: Key:abandoned:railway
     abutters: Key:abutters
@@ -4293,15 +4725,22 @@ en:
     addr: Key:addr
     addr:alternatenumber: Key:addr:alternatenumber
     addr:block: Key:addr:block
+    addr:block:ar: Key:addr:block:ar
+    addr:block:en: Key:addr:block:en
     addr:borough: Key:addr:borough
     addr:city: Key:addr:city
+    addr:city:ar: Key:addr:city:ar
     addr:city:de: Key:addr:city:de
     addr:city:en: Key:addr:city:en
     addr:city:it: Key:addr:city:it
     addr:city:simc: Key:addr:city:simc
     addr:conscriptionnumber: Key:addr:conscriptionnumber
     addr:country: Key:addr:country
+    addr:description: Key:addr:description
+    addr:description:ar: Key:addr:description:ar
     addr:district: Key:addr:district
+    addr:district:ar: Key:addr:district:ar
+    addr:district:en: Key:addr:district:en
     addr:door: Key:addr:door
     addr:flats: Key:addr:flats
     addr:floor: Key:addr:floor
@@ -4310,28 +4749,37 @@ en:
     addr:hamlet:de: Key:addr:hamlet:de
     addr:hamlet:it: Key:addr:hamlet:it
     addr:housename: Key:addr:housename
+    addr:housename:ar: Key:addr:housename:ar
     addr:housenumber: Key:addr:housenumber
+    addr:housenumber:ar: Key:addr:housenumber:ar
     addr:inclusion: Key:addr:inclusion
     addr:interpolation: Key:addr:interpolation
-    addr:municipality: Key:addr:municipality
     addr:place: Key:addr:place
+    addr:place:ar: Key:addr:place:ar
     addr:place:de: Key:addr:place:de
+    addr:place:en: Key:addr:place:en
     addr:place:it: Key:addr:place:it
     addr:postcode: Key:addr:postcode
     addr:province: Key:addr:province
+    addr:province:ar: Key:addr:province:ar
+    addr:province:en: Key:addr:province:en
     addr:provisionalnumber: Key:addr:provisionalnumber
     addr:region: Key:addr:region
     addr:staircase: Key:addr:staircase
     addr:state: Key:addr:state
     addr:street: Key:addr:street
+    addr:street:ar: Key:addr:street:ar
     addr:street:de: Key:addr:street:de
     addr:street:en: Key:addr:street:en
     addr:street:it: Key:addr:street:it
     addr:street:name: Key:addr:street:name
     addr:street:prefix: Key:addr:street:prefix
+    addr:street:sym_ul: Key:addr:street:sym ul
     addr:street:type: Key:addr:street:type
     addr:streetnumber: Key:addr:streetnumber
     addr:subdistrict: Key:addr:subdistrict
+    addr:subdistrict:ar: Key:addr:subdistrict:ar
+    addr:subdistrict:en: Key:addr:subdistrict:en
     addr:suburb: Key:addr:suburb
     addr:unit: Key:addr:unit
     admin_level: Key:admin level
@@ -4349,24 +4797,39 @@ en:
     airconditioned: Key:airconditioned
     alt_name: Key:alt name
     alt_name:ar: Key:alt name:ar
+    alt_name:azb: Key:alt name:azb
     alt_name:be: Key:alt name:be
+    alt_name:ckb: Key:alt name:ckb
     alt_name:en: Key:alt name:en
+    alt_name:fa: Key:alt name:fa
+    alt_name:glk: Key:alt name:glk
     alt_name:ko: Key:alt name:ko
+    alt_name:ks: Key:alt name:ks
+    alt_name:lrc: Key:alt name:lrc
     alt_name:mg: Key:alt name:mg
+    alt_name:mzn: Key:alt name:mzn
     alt_name:pl: Key:alt name:pl
+    alt_name:pnb: Key:alt name:pnb
+    alt_name:ps: Key:alt name:ps
     alt_name:ru: Key:alt name:ru
+    alt_name:sd: Key:alt name:sd
     alt_name:th: Key:alt name:th
+    alt_name:ug: Key:alt name:ug
+    alt_name:ur: Key:alt name:ur
     alt_name_1: Key:alt name 1
     amenity: Key:amenity
     amenity:eftpos: Key:amenity:eftpos
     amenity:restaurant: Key:amenity:restaurant
     animal: Key:animal
     animated: Key:animated
+    aquaculture: Key:aquaculture
     architect: Key:architect
     architect:wikidata: Key:architect:wikidata
     architect:wikipedia: Key:architect:wikipedia
     area: Key:area
+    area:aeroway: Key:area:aeroway
     area:highway: Key:area:highway
+    artist: Key:artist
     artist:wikidata: Key:artist:wikidata
     artist_name: Key:artist name
     artwork_subject: Key:artwork subject
@@ -4382,17 +4845,28 @@ en:
     asset_ref: Key:asset ref
     assisted_trail: Key:assisted trail
     at_bev:addr_date: Key:at bev:addr date
+    atmotorway: Key:atmotorway
     attraction: Key:attraction
     attribution: Key:attribution
     atv: Key:atv
+    atv:repair: Key:atv:repair
     atv:sales: Key:atv:sales
     authentication: Key:authentication
+    authentication:app: Key:authentication:app
+    authentication:membership_card: Key:authentication:membership card
+    authentication:nfc: Key:authentication:nfc
+    authentication:none: Key:authentication:none
+    authentication:phone_call: Key:authentication:phone call
+    authentication:short_message: Key:authentication:short message
     autoaws: Key:autoaws
     automated: Key:automated
     automatic_door: Key:automatic door
+    autonomy: Key:autonomy
+    baby_feeding: Key:baby feeding
     backcountry: Key:backcountry
     backrest: Key:backrest
     backward: Key:backward
+    bakehouse: Key:bakehouse
     balcony: Key:balcony
     bar: Key:bar
     barrier: Key:barrier
@@ -4405,13 +4879,20 @@ en:
     beacon:colour: Key:beacon:colour
     beacon:function: Key:beacon:function
     beacon:type: Key:beacon:type
+    beauty: Key:beauty
     beds: Key:beds
     bell_tower: Key:bell tower
     bench: Key:bench
+    bench:type: Key:bench:type
     bicycle: Key:bicycle
+    bicycle:backward: Key:bicycle:backward
     bicycle:class:mtb: Key:bicycle:class:mtb
     bicycle:class:mtb:technical: Key:bicycle:class:mtb:technical
     bicycle:conditional: Key:bicycle:conditional
+    bicycle:designated:type: Key:bicycle:designated:type
+    bicycle:forward: Key:bicycle:forward
+    bicycle:oneway: Key:bicycle:oneway
+    bicycle:type: Key:bicycle:type
     bicycle_parking: Key:bicycle parking
     bicycle_road: Key:bicycle road
     bike_ride: Key:bike ride
@@ -4421,21 +4902,26 @@ en:
     biotic_reef:type: Key:biotic reef:type
     blind:website: Key:blind:website
     blind:website:lg: Key:blind:website:lg
+    board:title: Key:board:title
     board_type: Key:board type
     boat: Key:boat
     bollard: Key:bollard
     booking: Key:booking
     books: Key:books
     border_type: Key:border type
+    bot: Key:bot
     both: Key:both
     bottle: Key:bottle
     bottom:material: Key:bottom:material
     boundary: Key:boundary
     boundary_type: Key:boundary type
     branch: Key:branch
+    branch:type: Key:branch:type
     brand: Key:brand
+    brand:ar: Key:brand:ar
     brand:wikidata: Key:brand:wikidata
     brand:wikipedia: Key:brand:wikipedia
+    brand:wikipedia:ar: Key:brand:wikipedia:ar
     breakfast: Key:breakfast
     brewery: Key:brewery
     bridge: Key:bridge
@@ -4443,6 +4929,7 @@ en:
     bridge:loc_name: Key:bridge:loc name
     bridge:movable: Key:bridge:movable
     bridge:name: Key:bridge:name
+    bridge:name:ar: Key:bridge:name:ar
     bridge:official_name: Key:bridge:official name
     bridge:old_name: Key:bridge:old name
     bridge:ref: Key:bridge:ref
@@ -4451,7 +4938,9 @@ en:
     bridge:support: Key:bridge:support
     bridge_name: Key:bridge name
     building: Key:building
+    building:age: Key:building:age
     building:architecture: Key:building:architecture
+    building:cladding: Key:building:cladding
     building:colour: Key:building:colour
     building:condition: Key:building:condition
     building:cullis:height: Key:building:cullis:height
@@ -4459,6 +4948,7 @@ en:
     building:fireproof: Key:building:fireproof
     building:flats: Key:building:flats
     building:height: Key:building:height
+    building:level:1,2,3...: Key:building:level:1,2,3...
     building:levels: Key:building:levels
     building:levels:underground: Key:building:levels:underground
     building:material: Key:building:material
@@ -4466,16 +4956,23 @@ en:
     building:obm: Key:building:obm
     building:part: Key:building:part
     building:place: Key:building:place
+    building:prefabricated: Key:building:prefabricated
     building:roof: Key:building:roof
     building:roof:colour: Key:building:roof:colour
+    building:roof:shape: Key:building:roof:shape
     building:ruian:type: Key:building:ruian:type
     building:soft_storey: Key:building:soft storey
+    building:structure: Key:building:structure
     building:units: Key:building:units
     building:usage:pl: Key:building:usage:pl
     building:use: Key:building:use
+    building:use:pl: Key:building:use:pl
+    building:use:residential: Key:building:use:residential
+    building:walls: Key:building:walls
     bulk_purchase: Key:bulk purchase
     bunker_type: Key:bunker type
     bus: Key:bus
+    bus:lanes: Key:bus:lanes
     bus_bay: Key:bus bay
     busbar: Key:busbar
     busway: Key:busway
@@ -4487,27 +4984,43 @@ en:
     cable_number: Key:cable number
     cables: Key:cables
     cafe: Key:cafe
+    callsign: Key:callsign
     camp_site: Key:camp site
     camp_type: Key:camp type
     campers: Key:campers
+    camping: Key:camping
+    camra: Key:camra
     canal: Key:canal
     canoe: Key:canoe
     capacity: Key:capacity
     capacity:charging: Key:capacity:charging
     capacity:disabled: Key:capacity:disabled
+    capacity:men: Key:capacity:men
     capacity:parent: Key:capacity:parent
+    capacity:seats: Key:capacity:seats
     capacity:women: Key:capacity:women
     capital: Key:capital
     capital_city: Key:capital city
-    car: Key:car
+    car:sales: Key:car:sales
+    car:tyres: Key:car:tyres
     car_wash: Key:car wash
     caravan: Key:caravan
     caravans: Key:caravans
     cargo: Key:cargo
-    cargo:container: Key:cargo:container
+    cargo_bike: Key:cargo bike
+    carpenter: Key:carpenter
     carriage: Key:carriage
     carriageway_ref: Key:carriageway ref
     casemate: Key:casemate
+    cash_withdrawal: Key:cash withdrawal
+    cash_withdrawal:currency: Key:cash withdrawal:currency
+    cash_withdrawal:fee: Key:cash withdrawal:fee
+    cash_withdrawal:foreign_cards: Key:cash withdrawal:foreign cards
+    cash_withdrawal:limit: Key:cash withdrawal:limit
+    cash_withdrawal:operator: Key:cash withdrawal:operator
+    cash_withdrawal:purchase_minimum: Key:cash withdrawal:purchase minimum
+    cash_withdrawal:purchase_required: Key:cash withdrawal:purchase required
+    cash_withdrawal:type: Key:cash withdrawal:type
     castle_type: Key:castle type
     castle_type:cs: Key:castle type:cs
     castle_type:de: Key:castle type:de
@@ -4515,6 +5028,7 @@ en:
     cave:ref: Key:cave:ref
     cemetery: Key:cemetery
     cemt: Key:cemt
+    census:population: Key:census:population
     center_turn_lane: Key:center turn lane
     centralkey: Key:centralkey
     centre_turn_lane: Key:centre turn lane
@@ -4545,6 +5059,7 @@ en:
     climbing:*: Key:climbing:*
     climbing:rock: Key:climbing:rock
     clli: Key:clli
+    closed:note: Key:closed:note
     clothes: Key:clothes
     club: Key:club
     club-mate: Key:club-mate
@@ -4558,6 +5073,8 @@ en:
     colour: Key:colour
     comment: Key:comment
     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: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
@@ -4575,6 +5092,8 @@ en:
     community: Key:community
     community_centre: Key:community centre
     community_centre:for: Key:community centre:for
+    company: Key:company
+    compressed_air: Key:compressed air
     condition: Key:condition
     conditional: Key:conditional
     condo: Key:condo
@@ -4584,7 +5103,9 @@ en:
     construction_end_expected: Key:construction end expected
     construction_start_expected: Key:construction start expected
     consulate: Key:consulate
+    consulting: Key:consulting
     contact: Key:contact
+    contact:city: Key:contact:city
     contact:diaspora: Key:contact:diaspora
     contact:email: Key:contact:email
     contact:facebook: Key:contact:facebook
@@ -4593,13 +5114,17 @@ en:
     contact:foursquare: Key:contact:foursquare
     contact:gnusocial: Key:contact:gnusocial
     contact:google_plus: Key:contact:google plus
+    contact:housenumber: Key:contact:housenumber
     contact:instagram: Key:contact:instagram
     contact:linkedin: Key:contact:linkedin
     contact:mastodon: Key:contact:mastodon
     contact:mobile: Key:contact:mobile
+    contact:ok: Key:contact:ok
     contact:phone: Key:contact:phone
     contact:pinterest: Key:contact:pinterest
+    contact:postcode: Key:contact:postcode
     contact:skype: Key:contact:skype
+    contact:street: Key:contact:street
     contact:telegram: Key:contact:telegram
     contact:twitter: Key:contact:twitter
     contact:vhf: Key:contact:vhf
@@ -4613,6 +5138,7 @@ en:
     contact:youtube: Key:contact:youtube
     content: Key:content
     conveying: Key:conveying
+    cooker: Key:cooker
     country: Key:country
     covered: Key:covered
     craft: Key:craft
@@ -4640,6 +5166,8 @@ en:
     currency:USD: Key:currency:USD
     currency:XXX: Key:currency:XXX
     currency:others: Key:currency:others
+    curve: Key:curve
+    curves: Key:curves
     cutting: Key:cutting
     cyclability: Key:cyclability
     cycle: Key:cycle
@@ -4651,12 +5179,17 @@ en:
     cycleway:buffer: Key:cycleway:buffer
     cycleway:lane: Key:cycleway:lane
     cycleway:left: Key:cycleway:left
+    cycleway:left:lane: Key:cycleway:left:lane
     cycleway:left:oneway: Key:cycleway:left:oneway
     cycleway:left=backward: Key:cycleway:left=backward
     cycleway:right: Key:cycleway:right
+    cycleway:right:lane: Key:cycleway:right:lane
     cycleway:right:oneway: Key:cycleway:right:oneway
+    cycleway:right:surface: Key:cycleway:right:surface
     cycleway:right=forward: Key:cycleway:right=forward
     cycleway:surface: Key:cycleway:surface
+    cycleway:width: Key:cycleway:width
+    cycling_width: Key:cycling width
     date: Key:date
     date_off: Key:date off
     date_on: Key:date on
@@ -4674,6 +5207,7 @@ en:
     delivery_point:type: Key:delivery point:type
     demolished: Key:demolished
     'demolished:': 'Key:demolished:'
+    demolished:building: Key:demolished:building
     denomination: Key:denomination
     denotation: Key:denotation
     departures_board: Key:departures board
@@ -4688,17 +5222,35 @@ en:
     depth:verified: Key:depth:verified
     descent: Key:descent
     description: Key:description
+    description:ar: Key:description:ar
     description:restrictions: Key:description:restrictions
     descriptions:restrictions: Key:descriptions:restrictions
     design: Key:design
     design:ref: Key:design:ref
     designation: Key:designation
     destination: Key:destination
+    destination:ar: Key:destination:ar
+    destination:arrow: Key:destination:arrow
+    destination:arrow:lanes: Key:destination:arrow:lanes
     destination:backward: Key:destination:backward
+    destination:colour: Key:destination:colour
+    destination:colour:backward: Key:destination:colour:backward
+    destination:colour:forward: Key:destination:colour:forward
+    destination:colour:lanes: Key:destination:colour:lanes
+    destination:colour:lanes:backward: Key:destination:colour:lanes:backward
+    destination:colour:lanes:forward: Key:destination:colour:lanes:forward
     destination:forward: Key:destination:forward
     destination:lanes: Key:destination:lanes
     destination:lanes:backward: Key:destination:lanes:backward
     destination:lanes:forward: Key:destination:lanes:forward
+    destination:lang:ar: Key:destination:lang:ar
+    destination:lang:ar:lanes: Key:destination:lang:ar:lanes
+    destination:street:ar: Key:destination:street:ar
+    destination:street:lang:ar: Key:destination:street:lang:ar
+    destination:street:lang:ar:backward: Key:destination:street:lang:ar:backward
+    destination:street:lang:ar:forward: Key:destination:street:lang:ar:forward
+    destination:symbol: Key:destination:symbol
+    destination:to:lang:ar: Key:destination:to:lang:ar
     detour: Key:detour
     devices: Key:devices
     dewnr:park_id: Key:dewnr:park id
@@ -4723,27 +5275,44 @@ en:
     diplomatic:receiving_country: Key:diplomatic:receiving country
     diplomatic:sending_country: Key:diplomatic:sending country
     diplomatic:services: Key:diplomatic:services
+    diplomatic:services:citizen_services: Key:diplomatic:services:citizen services
+    diplomatic:services:immigrant_visas: Key:diplomatic:services:immigrant visas
+    diplomatic:services:non-immigrant_visas: Key:diplomatic:services:non-immigrant
+      visas
     direction: Key:direction
+    direction_east: Key:direction east
+    direction_north: Key:direction north
+    direction_northeast: Key:direction northeast
+    direction_northwest: Key:direction northwest
+    direction_south: Key:direction south
+    direction_southeast: Key:direction southeast
+    direction_southwest: Key:direction southwest
+    direction_west: Key:direction west
     dirtbike:scale: Key:dirtbike:scale
     disabled: Key:disabled
     disabled_spaces: Key:disabled spaces
+    disc_golf: Key:disc golf
+    dishwasher: Key:dishwasher
     dispensing: Key:dispensing
     display: Key:display
     distance: Key:distance
     distillery: Key:distillery
-    disused: Key:disused
     'disused:': 'Key:disused:'
     disused:amenity: Key:disused:amenity
+    disused:building: Key:disused:building
+    disused:office: Key:disused:office
     disused:place: Key:disused:place
     disused:railway: Key:disused:railway
     disused:shop: Key:disused:shop
     disused:watermill: Key:disused:watermill
+    divider: Key:divider
     dog: Key:dog
     dominant_taxon: Key:dominant taxon
     donation:compensation: Key:donation:compensation
     donation:compensation:payment: Key:donation:compensation:payment
     donation:compensation:vouchers: Key:donation:compensation:vouchers
     door: Key:door
+    double_tracked_motor_vehicle: Key:double tracked motor vehicle
     draft: Key:draft
     drink: Key:drink
     drink:afri-cola: Key:drink:afri-cola
@@ -4755,9 +5324,12 @@ en:
     drink:milk-raw: Key:drink:milk-raw
     drink:raw_milk: Key:drink:raw milk
     drink:tea: Key:drink:tea
+    drink:wine: Key:drink:wine
     drinkable: Key:drinkable
     drinking_water: Key:drinking water
     drinking_water:legal: Key:drinking water:legal
+    drinking_water:refill: Key:drinking water:refill
+    drinking_water:refill:network: Key:drinking water:refill:network
     drive-in: Key:drive-in
     drive-through: Key:drive-through
     drive-thru: Key:drive-thru
@@ -4767,27 +5339,36 @@ en:
     driving_side: Key:driving side
     dryer: Key:dryer
     drying:room: Key:drying:room
+    dual_carriageway: Key:dual carriageway
     duration: Key:duration
+    duty_free: Key:duty free
     earthquake: Key:earthquake
     earthquake:damage: Key:earthquake:damage
     easy_overtaking: Key:easy overtaking
+    educational: Key:educational
     ele: Key:ele
     ele:NHN: Key:ele:NHN
     ele:local: Key:ele:local
+    ele:wgs84: Key:ele:wgs84
+    electric_bicycle: Key:electric bicycle
     electricity: Key:electricity
     electrified: Key:electrified
+    elevator: Key:elevator
     email: Key:email
     embankment: Key:embankment
     embassy: Key:embassy
     embedded_rails: Key:embedded rails
     embedded_rails:lanes: Key:embedded rails:lanes
     emergency: Key:emergency
+    emergency:phone: Key:emergency:phone
     employee: Key:employee
     end_date: Key:end date
     enforcement: Key:enforcement
+    engineer: Key:engineer
     entrance: Key:entrance
     escalator: Key:escalator
-    esperanto: Key:esperanto
+    est_height: Key:est height
+    est_length: Key:est length
     est_width: Key:est width
     etymology: Key:etymology
     european_cultural_path: Key:european cultural path
@@ -4799,6 +5380,7 @@ en:
     expressway: Key:expressway
     facebook: Key:facebook
     faces: Key:faces
+    factory: Key:factory
     fair_trade: Key:fair trade
     farming_system: Key:farming system
     farmyard: Key:farmyard
@@ -4807,6 +5389,7 @@ en:
     fcc:registration_number: Key:fcc:registration number
     fcc:unique_system_identifier: Key:fcc:unique system identifier
     fee: Key:fee
+    fee:conditional: Key:fee:conditional
     fee:disabled: Key:fee:disabled
     fee:disabled_assistant: Key:fee:disabled assistant
     female: Key:female
@@ -4820,14 +5403,19 @@ en:
     fhrs:local_authority_id: Key:fhrs:local authority id
     field: Key:field
     finance_agent: Key:finance agent
+    fire: Key:fire
     fire_boundary: Key:fire boundary
     fire_hydrant: Key:fire hydrant
     fire_object:type: Key:fire object:type
     fire_operator: Key:fire operator
     fire_rank: Key:fire rank
+    firearms: Key:firearms
     fireplace: Key:fireplace
     fishing: Key:fishing
+    fitness_station: Key:fitness station
     fixme: Key:fixme
+    flag:name: Key:flag:name
+    flag:type: Key:flag:type
     flag:wikidata: Key:flag:wikidata
     flat_steps: Key:flat steps
     flickr: Key:flickr
@@ -4838,7 +5426,10 @@ en:
     flow_rate: Key:flow rate
     food: Key:food
     foot: Key:foot
+    foot:backward: Key:foot:backward
+    foot:forward: Key:foot:forward
     footway: Key:footway
+    footway:surface: Key:footway:surface
     ford: Key:ford
     forestry: Key:forestry
     format: Key:format
@@ -4850,6 +5441,7 @@ en:
     frequency: Key:frequency
     fridge: Key:fridge
     from: Key:from
+    from:ar: Key:from:ar
     fruit: Key:fruit
     fuel: Key:fuel
     fuel:1_25: Key:fuel:1 25
@@ -4871,6 +5463,7 @@ en:
     fuel:e85: Key:fuel:e85
     fuel:electricity: Key:fuel:electricity
     fuel:ethanol: Key:fuel:ethanol
+    fuel:lng: Key:fuel:lng
     fuel:lpg: Key:fuel:lpg
     fuel:methanol: Key:fuel:methanol
     fuel:octane_100: Key:fuel:octane 100
@@ -4903,14 +5496,19 @@ en:
     generator:output:vacuum: Key:generator:output:vacuum
     generator:place: Key:generator:place
     generator:plant: Key:generator:plant
+    generator:solar:modules: Key:generator:solar:modules
     generator:source: Key:generator:source
     generator:type: Key:generator:type
     genus: Key:genus
+    genus:ar: Key:genus:ar
     genus:de: Key:genus:de
+    genus:en: Key:genus:en
     genus:ru: Key:genus:ru
     geocodigo: Key:geocodigo
     geological: Key:geological
     geothermal: Key:geothermal
+    glacier:part: Key:glacier:part
+    glacier:type: Key:glacier:type
     gluten_free: Key:gluten free
     gnis:fcode: Key:gnis:fcode
     gnis:feature_id: Key:gnis:feature id
@@ -4926,7 +5524,16 @@ en:
     grassland: Key:grassland
     gritting: Key:gritting
     group_only: Key:group only
+    gtfs:feed: Key:gtfs:feed
+    gtfs:name: Key:gtfs:name
+    gtfs:release_date: Key:gtfs:release date
+    gtfs:route_id: Key:gtfs:route id
+    gtfs:shape_id: Key:gtfs:shape id
+    gtfs:stop_id: Key:gtfs:stop id
+    gtfs:trip_id: Key:gtfs:trip id
+    gtfs:trip_id:sample: Key:gtfs:trip id:sample
     guest_house: Key:guest house
+    guide: Key:guide
     guidepost: Key:guidepost
     guidepost:hiking: Key:guidepost:hiking
     gun_emplacement_type: Key:gun emplacement type
@@ -4941,6 +5548,9 @@ en:
     happy_hours: Key:happy hours
     harbour: Key:harbour
     harbour:category: Key:harbour:category
+    harvest_first_year: Key:harvest first year
+    hazard: Key:hazard
+    hazard:animal: Key:hazard:animal
     hazard_intensity: Key:hazard intensity
     hazard_occurence: Key:hazard occurence
     hazard_occurrence: Key:hazard occurrence
@@ -4953,17 +5563,22 @@ en:
     healthcare: Key:healthcare
     healthcare:counselling: Key:healthcare:counselling
     healthcare:speciality: Key:healthcare:speciality
+    heating: Key:heating
     height: Key:height
     height:hub: Key:height:hub
     heritage: Key:heritage
     heritage:label:FR: Key:heritage:label:FR
+    heritage:operator: Key:heritage:operator
     hgv: Key:hgv
+    hgv:national_network: Key:hgv:national network
     hgv_articulated: Key:hgv articulated
     high_water_mark: Key:high water mark
     highchair: Key:highchair
     highspeed: Key:highspeed
     highway: Key:highway
     highway:category: Key:highway:category
+    highway:category:pl: Key:highway:category:pl
+    highway:class:pl: Key:highway:class:pl
     hiking: Key:hiking
     historic: Key:historic
     historic:civilization: Key:historic:civilization
@@ -4977,19 +5592,24 @@ en:
     horse_scale: Key:horse scale
     hour_off: Key:hour off
     hour_on: Key:hour on
+    house: Key:house
     hov: Key:hov
     hov:lanes: Key:hov:lanes
+    hunting: Key:hunting
     iata: Key:iata
     icao: Key:icao
     ice_cream: Key:ice cream
     ice_cream=yes: Key:ice cream=yes
     ice_road: Key:ice road
     ice_skates: Key:ice skates
+    icn: Key:icn
+    icn_ref: Key:icn ref
     ifr: Key:ifr
     ignore_for_routing: Key:ignore for routing
     image: Key:image
     imagery_offset: Key:imagery offset
     imagery_used: Key:imagery used
+    import: Key:import
     import_uuid: Key:import uuid
     importance: Key:importance
     impromptu: Key:impromptu
@@ -5005,6 +5625,7 @@ en:
     information: Key:information
     inline_skates: Key:inline skates
     inscription: Key:inscription
+    inscription:ar: Key:inscription:ar
     inscription:url: Key:inscription:url
     int_name: Key:int name
     int_name:ar: Key:int name:ar
@@ -5017,6 +5638,7 @@ en:
     internet_access:operator: Key:internet access:operator
     internet_access:ssid: Key:internet access:ssid
     interval: Key:interval
+    irrigated: Key:irrigated
     irrigation: Key:irrigation
     is_hazard_prone: Key:is hazard prone
     is_in: Key:is in
@@ -5040,10 +5662,12 @@ en:
     it:fvg:ctrn:code: Key:it:fvg:ctrn:code
     iucn_level: Key:iucn level
     jel: Key:jel
+    jetski:rental: Key:jetski:rental
     jetski:sales: Key:jetski:sales
     junction: Key:junction
     junction:ref: Key:junction:ref
     junction_number: Key:junction number
+    karaoke: Key:karaoke
     kct_blue: Key:kct blue
     kct_green: Key:kct green
     kct_none: Key:kct none
@@ -5052,6 +5676,7 @@ en:
     kct_yellow: Key:kct yellow
     kerb: Key:kerb
     kids_area: Key:kids area
+    kinky: Key:kinky
     kms: Key:kms
     kms:county_name: Key:kms:county name
     kms:county_no: Key:kms:county no
@@ -5074,8 +5699,10 @@ en:
     lamp_mount: Key:lamp mount
     lamp_type: Key:lamp type
     landfill:waste: Key:landfill:waste
+    landform: Key:landform
     landmark: Key:landmark
     landuse: Key:landuse
+    lane_markings: Key:lane markings
     lanes: Key:lanes
     lanes:backward: Key:lanes:backward
     lanes:both_ways: Key:lanes:both ways
@@ -5086,13 +5713,24 @@ en:
     lanes:psv:forward: Key:lanes:psv:forward
     language: Key:language
     language:LL: Key:language:LL
+    language:ar: Key:language:ar
+    language:azb: Key:language:azb
+    language:ckb: Key:language:ckb
+    language:fa: Key:language:fa
+    language:glk: Key:language:glk
+    language:ks: Key:language:ks
+    language:lrc: Key:language:lrc
+    language:mzn: Key:language:mzn
+    language:ps: Key:language:ps
+    language:sd: Key:language:sd
+    language:ug: Key:language:ug
+    language:ur: Key:language:ur
     lawyer: Key:lawyer
     layer: Key:layer
     lcn: Key:lcn
     lcn_ref: Key:lcn ref
     leaf_cycle: Key:leaf cycle
     leaf_type: Key:leaf type
-    learner_driver: Key:learner driver
     left: Key:left
     left:country: Key:left:country
     leisure: Key:leisure
@@ -5104,9 +5742,12 @@ en:
     lhv: Key:lhv
     liaison: Key:liaison
     license_classes: Key:license classes
+    light_rail: Key:light rail
     lighting:perceived: Key:lighting:perceived
     line: Key:line
-    lines: Key:lines
+    line_attachement: Key:line attachement
+    line_attachment: Key:line attachment
+    line_management: Key:line management
     listed_status: Key:listed status
     lit: Key:lit
     lit:perceived: Key:lit:perceived
@@ -5114,7 +5755,10 @@ en:
     loading_gauge: Key:loading gauge
     loc_name: Key:loc name
     loc_name:ar: Key:loc name:ar
+    loc_name:fa: Key:loc name:fa
+    loc_name:ur: Key:loc name:ur
     loc_ref: Key:loc ref
+    local_authority:FR: Key:local authority:FR
     local_ref: Key:local ref
     locale: Key:locale
     localwiki: Key:localwiki
@@ -5123,13 +5767,21 @@ en:
     lock_name: Key:lock name
     lock_ref: Key:lock ref
     lockable: Key:lockable
+    locked: Key:locked
+    locked:conditional: Key:locked:conditional
+    long_name: Key:long name
     long_name:ar: Key:long name:ar
+    long_name:azb: Key:long name:azb
+    long_name:fa: Key:long name:fa
+    long_name:pnb: Key:long name:pnb
+    long_name:ur: Key:long name:ur
     lottery: Key:lottery
     love_locks: Key:love locks
     lpn_ref: Key:lpn ref
     luminous: Key:luminous
     lunch: Key:lunch
     lunch:specials: Key:lunch:specials
+    maaamet:ETAK: Key:maaamet:ETAK
     maintained: Key:maintained
     maintenance: Key:maintenance
     male: Key:male
@@ -5141,14 +5793,19 @@ en:
     manufacturer:type: Key:manufacturer:type
     manufacturer:wikidata: Key:manufacturer:wikidata
     mapillary: Key:mapillary
+    mapper: Key:mapper
     maritime: Key:maritime
+    marker: Key:marker
     massage: Key:massage
+    massgis:ARTICLE97: Key:massgis:ARTICLE97
+    massgis:SITE_NAME: Key:massgis:SITE NAME
     material: Key:material
     mattress: Key:mattress
     max_age: Key:max age
     maxage: Key:maxage
     maxaxleload: Key:maxaxleload
     maxbogieweight: Key:maxbogieweight
+    maxdraft: Key:maxdraft
     maxheight: Key:maxheight
     maxheight:legal: Key:maxheight:legal
     maxheight:physical: Key:maxheight:physical
@@ -5156,17 +5813,24 @@ en:
     maxspeed: Key:maxspeed
     maxspeed:advisory: Key:maxspeed:advisory
     maxspeed:backward: Key:maxspeed:backward
+    maxspeed:bus: Key:maxspeed:bus
     maxspeed:conditional: Key:maxspeed:conditional
     maxspeed:forward: Key:maxspeed:forward
     maxspeed:hgv: Key:maxspeed:hgv
+    maxspeed:hgv:backward: Key:maxspeed:hgv:backward
+    maxspeed:hgv:conditional: Key:maxspeed:hgv:conditional
+    maxspeed:hgv:forward: Key:maxspeed:hgv:forward
     maxspeed:lanes: Key:maxspeed:lanes
     maxspeed:practical: Key:maxspeed:practical
     maxspeed:seasonal:winter: Key:maxspeed:seasonal:winter
     maxspeed:source: Key:maxspeed:source
+    maxspeed:trailer: Key:maxspeed:trailer
     maxspeed:type: Key:maxspeed:type
     maxspeed:variable: Key:maxspeed:variable
     maxstay: Key:maxstay
+    maxtents: Key:maxtents
     maxweight: Key:maxweight
+    maxweight:signed: Key:maxweight:signed
     maxweightrating: Key:maxweightrating
     maxweightrating:bus: Key:maxweightrating:bus
     maxweightrating:hgv: Key:maxweightrating:hgv
@@ -5174,6 +5838,7 @@ en:
     maxwidth:physical: Key:maxwidth:physical
     mcrb:criteria: Key:mcrb:criteria
     mdb_id: Key:mdb id
+    meadow: Key:meadow
     measurement: Key:measurement
     medical_supply: Key:medical supply
     megalith_type: Key:megalith type
@@ -5185,15 +5850,21 @@ en:
     microbrewery: Key:microbrewery
     milestone_type: Key:milestone type
     military: Key:military
+    mimics: Key:mimics
     min_age: Key:min age
     min_height: Key:min height
     minage: Key:minage
+    mindistance: Key:mindistance
     mineshaft_type: Key:mineshaft type
     minibus: Key:minibus
     minspeed: Key:minspeed
     minspeed:lanes: Key:minspeed:lanes
+    mml:class: Key:mml:class
+    model: Key:model
+    modifier: Key:modifier
     mofa: Key:mofa
     monastery:type: Key:monastery:type
+    money_transfer: Key:money transfer
     monitoring:air_quality: Key:monitoring:air quality
     monitoring:bicycle: Key:monitoring:bicycle
     monitoring:galileo: Key:monitoring:galileo
@@ -5210,6 +5881,7 @@ en:
     monitoring:traffic: Key:monitoring:traffic
     monitoring:water_level: Key:monitoring:water level
     monitoring:weather: Key:monitoring:weather
+    monorail: Key:monorail
     monument:genesis: Key:monument:genesis
     mooring: Key:mooring
     moped: Key:moped
@@ -5226,7 +5898,11 @@ en:
     motorcycle:repair: Key:motorcycle:repair
     motorcycle:sales: Key:motorcycle:sales
     motorcycle:scale: Key:motorcycle:scale
+    motorcycle:storage: Key:motorcycle:storage
     motorcycle:theme: Key:motorcycle:theme
+    motorcycle:tours: Key:motorcycle:tours
+    motorcycle:training: Key:motorcycle:training
+    motorcycle:transport: Key:motorcycle:transport
     motorcycle:type: Key:motorcycle:type
     motorcycle:tyres: Key:motorcycle:tyres
     motorhome: Key:motorhome
@@ -5246,6 +5922,8 @@ en:
     name: Key:name
     name:ar: Key:name:ar
     name:ar1: Key:name:ar1
+    name:ast: Key:name:ast
+    name:azb: Key:name:azb
     name:be: Key:name:be
     name:be-tarask: Key:name:be-tarask
     name:ber: Key:name:ber
@@ -5253,6 +5931,7 @@ en:
     name:botanical: Key:name:botanical
     name:br: Key:name:br
     name:ca: Key:name:ca
+    name:ckb: Key:name:ckb
     name:cs: Key:name:cs
     name:cy: Key:name:cy
     name:da: Key:name:da
@@ -5276,6 +5955,9 @@ en:
     name:ga: Key:name:ga
     name:gd: Key:name:gd
     name:gem: Key:name:gem
+    name:gl: Key:name:gl
+    name:glk: Key:name:glk
+    name:gsw: Key:name:gsw
     name:he: Key:name:he
     name:hi: Key:name:hi
     name:hr: Key:name:hr
@@ -5286,20 +5968,27 @@ en:
     name:it: Key:name:it
     name:ja: Key:name:ja
     name:ja-Hira: Key:name:ja-Hira
+    name:ja_kana: Key:name:ja kana
+    name:ja_rm: Key:name:ja rm
     name:jbo: Key:name:jbo
     name:ka: Key:name:ka
     name:kab: Key:name:kab
+    name:kab-Arab: Key:name:kab-Arab
     name:kk: Key:name:kk
+    name:kk-Arab: Key:name:kk-Arab
     name:kn: Key:name:kn
     name:kn:iso15919: Key:name:kn:iso15919
     name:ko: Key:name:ko
     name:ko-Latn: Key:name:ko-Latn
     name:ko_rm: Key:name:ko rm
+    name:ks: Key:name:ks
     name:ku: Key:name:ku
+    name:ku-Arab: Key:name:ku-Arab
     name:left: Key:name:left
     name:left:ar: Key:name:left:ar
     name:left:fr: Key:name:left:fr
     name:lg: Key:name:lg
+    name:lrc: Key:name:lrc
     name:lt: Key:name:lt
     name:lv: Key:name:lv
     name:mg: Key:name:mg
@@ -5307,16 +5996,20 @@ en:
     name:ml: Key:name:ml
     name:mr: Key:name:mr
     name:my: Key:name:my
+    name:mzn: Key:name:mzn
     name:nds: Key:name:nds
     name:nds-nl: Key:name:nds-nl
     name:nl: Key:name:nl
     name:nn: Key:name:nn
     name:no: Key:name:no
     name:nov: Key:name:nov
+    name:ota: Key:name:ota
     name:pl: Key:name:pl
+    name:pnb: Key:name:pnb
     name:prefix: Key:name:prefix
     name:prefix:be: Key:name:prefix:be
     name:pronunciation: Key:name:pronunciation
+    name:ps: Key:name:ps
     name:pt: Key:name:pt
     name:right: Key:name:right
     name:right:ar: Key:name:right:ar
@@ -5324,6 +6017,8 @@ en:
     name:ru: Key:name:ru
     name:ru:word_stress: Key:name:ru:word stress
     name:sc: Key:name:sc
+    name:sd: Key:name:sd
+    name:sh: Key:name:sh
     name:sk: Key:name:sk
     name:sl: Key:name:sl
     name:sr: Key:name:sr
@@ -5333,28 +6028,49 @@ en:
     name:ta: Key:name:ta
     name:te: Key:name:te
     name:th: Key:name:th
+    name:tlh: Key:name:tlh
     name:tok: Key:name:tok
     name:tr: Key:name:tr
     name:tt: Key:name:tt
     name:tzl: Key:name:tzl
+    name:ug: Key:name:ug
     name:uk: Key:name:uk
     name:ur: Key:name:ur
     name:vi: Key:name:vi
     name:vo: Key:name:vo
     name:wikipedia: Key:name:wikipedia
+    name:xx: Key:name:xx
     name:yue: Key:name:yue
     name:zh: Key:name:zh
     name:zh-sg: Key:name:zh-sg
     name_1: Key:name 1
     name_2: Key:name 2
+    naptan:AltCommonName: Key:naptan:AltCommonName
+    naptan:AltCrossing: Key:naptan:AltCrossing
+    naptan:AltIndicator: Key:naptan:AltIndicator
+    naptan:AltLandmark: Key:naptan:AltLandmark
+    naptan:AltShortCommonName: Key:naptan:AltShortCommonName
+    naptan:AltStreet: Key:naptan:AltStreet
     naptan:AtcoCode: Key:naptan:AtcoCode
+    naptan:Bearing: Key:naptan:Bearing
+    naptan:BusStopType: Key:naptan:BusStopType
+    naptan:CommonName: Key:naptan:CommonName
+    naptan:Crossing: Key:naptan:Crossing
     naptan:Indicator: Key:naptan:Indicator
+    naptan:Landmark: Key:naptan:Landmark
     naptan:NaptanCode: Key:naptan:NaptanCode
+    naptan:Notes: Key:naptan:Notes
+    naptan:PlusbusZoneRef: Key:naptan:PlusbusZoneRef
+    naptan:ShortCommonName: Key:naptan:ShortCommonName
+    naptan:StopAreaCode: Key:naptan:StopAreaCode
+    naptan:StopAreaType: Key:naptan:StopAreaType
     naptan:Street: Key:naptan:Street
+    naptan:verified: Key:naptan:verified
     narrow: Key:narrow
     nat_name: Key:nat name
     nat_name:ar: Key:nat name:ar
     nat_ref: Key:nat ref
+    nat_ref:ar: Key:nat ref:ar
     natural: Key:natural
     naturbase: Key:naturbase
     naturbase:FORVALTNI: Key:naturbase:FORVALTNI
@@ -5373,7 +6089,14 @@ en:
     ncn_milepost: Key:ncn milepost
     ncn_ref: Key:ncn ref
     network: Key:network
+    network:ar: Key:network:ar
+    network:guid: Key:network:guid
+    network:type: Key:network:type
     network:wikidata: Key:network:wikidata
+    nhd:com_id: Key:nhd:com id
+    nhd:fcode: Key:nhd:fcode
+    nhd:ftype: Key:nhd:ftype
+    nhd:reach_code: Key:nhd:reach code
     no-barnehage:nsrid: Key:no-barnehage:nsrid
     noaddress: Key:noaddress
     noexit: Key:noexit
@@ -5386,8 +6109,10 @@ en:
     'not:': 'Key:not:'
     not:name: Key:not:name
     not:nccod: Key:not:nccod
+    not_accepted_import:leisure: Key:not accepted import:leisure
     not_served_by: Key:not served by
     note: Key:note
+    note:ar: Key:note:ar
     note:deplacer4mE: Key:note:deplacer4mE
     note:depth: Key:note:depth
     note:en: Key:note:en
@@ -5396,57 +6121,105 @@ en:
     notes: Key:notes
     nuclear_explosion:country: Key:nuclear explosion:country
     nudism: Key:nudism
+    number_of_apartments: Key:number of apartments
     nursery: Key:nursery
     nvdb:date: Key:nvdb:date
     nvdb:id: Key:nvdb:id
+    nycdoitt:bin: Key:nycdoitt:bin
+    object: Key:object
+    object:city: Key:object:city
+    object:country: Key:object:country
+    object:housenumber: Key:object:housenumber
+    object:postcode: Key:object:postcode
+    object:street: Key:object:street
     observatory:type: Key:observatory:type
     obstacle: Key:obstacle
     occurrence: Key:occurrence
     office: Key:office
     official_name: Key:official name
     official_name:ar: Key:official name:ar
+    official_name:azb: Key:official name:azb
     official_name:be: Key:official name:be
+    official_name:ckb: Key:official name:ckb
+    official_name:fa: Key:official name:fa
+    official_name:glk: Key:official name:glk
+    official_name:ks: Key:official name:ks
+    official_name:lrc: Key:official name:lrc
+    official_name:mzn: Key:official name:mzn
+    official_name:pnb: Key:official name:pnb
+    official_name:ps: Key:official name:ps
+    official_name:sd: Key:official name:sd
+    official_name:ug: Key:official name:ug
+    official_name:ur: Key:official name:ur
     official_ref: Key:official ref
     offshore: Key:offshore
     ohv: Key:ohv
     ois:fixme: Key:ois:fixme
+    old_addr:housenumber: Key:old addr:housenumber
+    old_addr:place: Key:old addr:place
     old_name: Key:old name
     old_name:ar: Key:old name:ar
+    old_name:azb: Key:old name:azb
     old_name:be: Key:old name:be
+    old_name:ckb: Key:old name:ckb
     old_name:de: Key:old name:de
     old_name:en: Key:old name:en
     old_name:etymology:wikidata: Key:old name:etymology:wikidata
+    old_name:fa: Key:old name:fa
+    old_name:ks: Key:old name:ks
+    old_name:lrc: Key:old name:lrc
     old_name:pl: Key:old name:pl
+    old_name:pnb: Key:old name:pnb
+    old_name:ps: Key:old name:ps
     old_name:ru: Key:old name:ru
+    old_name:ug: Key:old name:ug
     old_name:uk: Key:old name:uk
+    old_name:ur: Key:old name:ur
     old_railway_operator: Key:old railway operator
     old_ref: Key:old ref
+    old_ref:ar: Key:old ref:ar
     old_ref:legislative: Key:old ref:legislative
     old_ref_legislative: Key:old ref legislative
     old_short_name: Key:old short name
     oneclass: Key:oneclass
     oneway: Key:oneway
     oneway:bicycle: Key:oneway:bicycle
+    oneway:conditional: Key:oneway:conditional
+    oneway:foot: Key:oneway:foot
     oneway:moped: Key:oneway:moped
     oneway:psv: Key:oneway:psv
     onkz: Key:onkz
+    ons_code: Key:ons code
+    open_air: Key:open air
     openbenches:id: Key:openbenches:id
     openfire: Key:openfire
     opening_date: Key:opening date
     opening_hours: Key:opening hours
+    opening_hours/Tutorial: Key:opening hours/Tutorial
     opening_hours:atm: Key:opening hours:atm
+    opening_hours:covid19: Key:opening hours:covid19
+    opening_hours:drive_through: Key:opening hours:drive through
     opening_hours:kitchen: Key:opening hours:kitchen
+    opening_hours:office: Key:opening hours:office
+    opening_hours:reception: Key:opening hours:reception
+    opening_hours:signed: Key:opening hours:signed
+    opening_hours:url: Key:opening hours:url
+    opening_hours:workshop: Key:opening hours:workshop
     openplaques:id: Key:openplaques:id
-    openplaques_plaque: Key:openplaques plaque
     opensource: Key:opensource
+    operational_status: Key:operational status
     operator: Key:operator
     operator:MNC: Key:operator:MNC
+    operator:ar: Key:operator:ar
     operator:be: Key:operator:be
     operator:en: Key:operator:en
+    operator:guid: Key:operator:guid
     operator:ru: Key:operator:ru
     operator:type: Key:operator:type
     operator:wikidata: Key:operator:wikidata
     operator:wikipedia: Key:operator:wikipedia
+    operator:wikipedia:ar: Key:operator:wikipedia:ar
+    orchard: Key:orchard
     organ: Key:organ
     organic: Key:organic
     orientation: Key:orientation
@@ -5469,7 +6242,9 @@ en:
     osmarender:renderRef: Key:osmarender:renderRef
     osmc:status: Key:osmc:status
     osmc:symbol: Key:osmc:symbol
+    outdoor: Key:outdoor
     outdoor_seating: Key:outdoor seating
+    outdoor_seating:comfort: Key:outdoor seating:comfort
     oven: Key:oven
     overtaking: Key:overtaking
     overtaking:hgv: Key:overtaking:hgv
@@ -5492,6 +6267,10 @@ en:
     parking:lane:left: Key:parking:lane:left
     parking:lane:right: Key:parking:lane:right
     parking:lane:side: Key:parking:lane:side
+    parking:orientation: Key:parking:orientation
+    parking:street_side: Key:parking:street side
+    parts: Key:parts
+    passage_time: Key:passage time
     passenger: Key:passenger
     passenger_information_display: Key:passenger information display
     passenger_lines: Key:passenger lines
@@ -5501,22 +6280,40 @@ en:
     payment: Key:payment
     payment:account_cards: Key:payment:account cards
     payment:american_express: Key:payment:american express
+    payment:cards: Key:payment:cards
     payment:cash: Key:payment:cash
+    payment:clipper: Key:payment:clipper
     payment:coins: Key:payment:coins
     payment:contactless: Key:payment:contactless
     payment:credit_cards: Key:payment:credit cards
     payment:debit_cards: Key:payment:debit cards
+    payment:discover_card: Key:payment:discover card
+    payment:e_zpass: Key:payment:e zpass
     payment:electronic_purses: Key:payment:electronic purses
+    payment:fastrak: Key:payment:fastrak
     payment:foo: Key:payment:foo
     payment:girocard: Key:payment:girocard
+    payment:good_to_go: Key:payment:good to go
+    payment:i-pass: Key:payment:i-pass
+    payment:ipass: Key:payment:ipass
+    payment:k-tag: Key:payment:k-tag
     payment:maestro: Key:payment:maestro
     payment:mastercard: Key:payment:mastercard
     payment:mir: Key:payment:mir
+    payment:nc_quick_pass: Key:payment:nc quick pass
     payment:none: Key:payment:none
     payment:notes: Key:payment:notes
+    payment:peach_pass: Key:payment:peach pass
+    payment:peachpass: Key:payment:peachpass
+    payment:pikepass: Key:payment:pikepass
     payment:pro100: Key:payment:pro100
+    payment:sunpass: Key:payment:sunpass
     payment:u-key: Key:payment:u-key
     payment:visa: Key:payment:visa
+    payment:visa_debit: Key:payment:visa debit
+    permanent_camping: Key:permanent camping
+    pet_allowed: Key:pet allowed
+    pets_allowed: Key:pets allowed
     phoenixbikeguide: Key:phoenixbikeguide
     phone: Key:phone
     photo: Key:photo
@@ -5524,6 +6321,7 @@ en:
     photography: Key:photography
     picnic_table: Key:picnic table
     picture: Key:picture
+    pihatie: Key:pihatie
     pilgrimage: Key:pilgrimage
     pilotage: Key:pilotage
     pipeline: Key:pipeline
@@ -5538,6 +6336,8 @@ en:
     place:ph: Key:place:ph
     place_name: Key:place name
     placement: Key:placement
+    placement:end: Key:placement:end
+    placement:start: Key:placement:start
     planned: Key:planned
     plant: Key:plant
     plant:method: Key:plant:method
@@ -5553,6 +6353,8 @@ en:
     plant:output:steam: Key:plant:output:steam
     plant:output:vacuum: Key:plant:output:vacuum
     plant:source: Key:plant:source
+    plant:storage: Key:plant:storage
+    plant:type: Key:plant:type
     plant_community: Key:plant community
     platforms: Key:platforms
     playground: Key:playground
@@ -5561,9 +6363,12 @@ en:
     point: Key:point
     pole:type: Key:pole:type
     police: Key:police
+    polling_station: Key:polling station
     population: Key:population
     population:date: Key:population:date
     population_rank: Key:population rank
+    position: Key:position
+    post_box:design: Key:post box:design
     post_box:type: Key:post box:type
     post_office:type: Key:post office:type
     postal_code: Key:postal code
@@ -5584,7 +6389,9 @@ en:
     priority_road: Key:priority road
     produce: Key:produce
     product: Key:product
+    project:eurosha_2012: Key:project:eurosha 2012
     proposed: Key:proposed
+    proposed:highway: Key:proposed:highway
     proposed:name: Key:proposed:name
     protect_class: Key:protect class
     protect_id: Key:protect id
@@ -5593,10 +6400,13 @@ en:
     prow_ref: Key:prow ref
     pruning: Key:pruning
     psv: Key:psv
+    psv:lanes: Key:psv:lanes
     public_bookcase:type: Key:public bookcase:type
     public_transport: Key:public transport
     public_transport:version: Key:public transport:version
     pump: Key:pump
+    pump:status: Key:pump:status
+    pump_mechanism: Key:pump mechanism
     pyörä_väistää_aina_autoa: Key:pyörä väistää aina autoa
     raba:id: Key:raba:id
     rack: Key:rack
@@ -5611,6 +6421,8 @@ en:
     radio_transponder:range: Key:radio transponder:range
     radio_transponder:signal_frequency: Key:radio transponder:signal frequency
     railway: Key:railway
+    railway:atb: Key:railway:atb
+    railway:etcs: Key:railway:etcs
     railway:lzb: Key:railway:lzb
     railway:position: Key:railway:position
     railway:preserved: Key:railway:preserved
@@ -5620,6 +6432,8 @@ en:
     railway:signal:speed_limit: Key:railway:signal:speed limit
     railway:signal:speed_limit_distant: Key:railway:signal:speed limit distant
     railway:track_ref: Key:railway:track ref
+    railway:traffic_mode: Key:railway:traffic mode
+    railway:zbs: Key:railway:zbs
     ramp: Key:ramp
     ramp:bicycle: Key:ramp:bicycle
     ramp:luggage: Key:ramp:luggage
@@ -5628,42 +6442,68 @@ en:
     ramsar: Key:ramsar
     razed: Key:razed
     'razed:': 'Key:razed:'
+    razed:building: Key:razed:building
     rcn: Key:rcn
     rcn_ref: Key:rcn ref
     real_ale: Key:real ale
     real_cider: Key:real cider
     real_fire: Key:real fire
     recording: Key:recording
+    recycling:fire_extinguishers: Key:recycling:fire extinguishers
     recycling_type: Key:recycling type
+    red_turn:left: Key:red turn:left
+    red_turn:right: Key:red turn:right
+    red_turn:right:bicycle: Key:red turn:right:bicycle
+    red_turn:straight: Key:red turn:straight
+    red_turn:straight:bicycle: Key:red turn:straight:bicycle
+    red_turn:straight:left: Key:red turn:straight:left
+    red_turn:straight:right: Key:red turn:straight:right
+    rednap:latitud: Key:rednap:latitud
     reef: Key:reef
     ref: Key:ref
+    ref:AGESIC: Key:ref:AGESIC
     ref:CEF: Key:ref:CEF
     ref:De_Lijn: Key:ref:De Lijn
     ref:ERDF:gdo: Key:ref:ERDF:gdo
     ref:EU:ENTSOE_EIC: Key:ref:EU:ENTSOE EIC
+    ref:EU:EVSE: Key:ref:EU:EVSE
     ref: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:CEF: Key:ref:FR:CEF
+    ref:FR:CRTA: Key:ref:FR:CRTA
+    ref:FR:DREAL: Key:ref:FR:DREAL
     ref:FR:FANTOIR:left: Key:ref:FR:FANTOIR:left
     ref:FR:FANTOIR:right: Key:ref:FR:FANTOIR:right
     ref:FR:FINESS: Key:ref:FR:FINESS
     ref:FR:INSEE: Key:ref:FR:INSEE
+    ref:FR:IRVE: Key:ref:FR:IRVE
     ref:FR:LaPoste: Key:ref:FR:LaPoste
     ref:FR:MemorialGenWeb: Key:ref:FR:MemorialGenWeb
     ref:FR:NAF: Key:ref:FR:NAF
     ref:FR:Orange: Key:ref:FR:Orange
+    ref:FR:Orange_mobile: Key:ref:FR:Orange mobile
     ref:FR:PTT: Key:ref:FR:PTT
+    ref:FR:RNA: Key:ref:FR:RNA
     ref:FR:RTE: Key:ref:FR:RTE
     ref:FR:RTE_nom: Key:ref:FR:RTE nom
+    ref:FR:SFR: Key:ref:FR:SFR
     ref:FR:SIREN: Key:ref:FR:SIREN
     ref:FR:SIRET: Key:ref:FR:SIRET
     ref:FR: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:uprn: Key:ref:GB:uprn
     ref:HU:edid: Key:ref:HU:edid
     ref:IFOPT: Key:ref:IFOPT
     ref:INSEE: Key:ref:INSEE
     ref:ISTAT: Key:ref:ISTAT
+    ref:LILA: Key:ref:LILA
+    ref:LOCODE: Key:ref:LOCODE
     ref:NAG:UPRN:1: Key:ref:NAG:UPRN:1
+    ref:NBd: Key:ref:NBd
     ref:NLPG:UPRN:1: Key:ref:NLPG:UPRN:1
     ref:NPLG:UPRN:1: Key:ref:NPLG:UPRN:1
     ref:TECB: Key:ref:TECB
@@ -5677,6 +6517,7 @@ en:
     ref:UrbIS: Key:ref:UrbIS
     ref:WDPA: Key:ref:WDPA
     ref:ar: Key:ref:ar
+    ref:at:bda: Key:ref:at:bda
     ref:at:gkz: Key:ref:at:gkz
     ref:at:okz: Key:ref:at:okz
     ref:bag: Key:ref:bag
@@ -5690,10 +6531,19 @@ en:
     ref:color: Key:ref:color
     ref:colour: Key:ref:colour
     ref:coop: Key:ref:coop
+    ref:crs: Key:ref:crs
     ref:ctb: Key:ref:ctb
+    ref:deniirn: Key:ref:deniirn
+    ref:dhis2: Key:ref:dhis2
     ref:edubase: Key:ref:edubase
+    ref:ef: Key:ref:ef
+    ref:gnis: Key:ref:gnis
+    ref:gss: Key:ref:gss
     ref:gurs:hs_mid: Key:ref:gurs:hs mid
+    ref:harbour: Key:ref:harbour
     ref:herbarium: Key:ref:herbarium
+    ref:hsmaq: Key:ref:hsmaq
+    ref:industrial: Key:ref:industrial
     ref:isil: Key:ref:isil
     ref:kmb: Key:ref:kmb
     ref:lor: Key:ref:lor
@@ -5701,11 +6551,17 @@ en:
     ref:mhs: Key:ref:mhs
     ref:miaaddr: Key:ref:miaaddr
     ref:miabldg: Key:ref:miabldg
+    ref:minvskaddress: Key:ref:minvskaddress
     ref:mise: Key:ref:mise
     ref:mobil-parken.de: Key:ref:mobil-parken.de
+    ref:nrhp: Key:ref:nrhp
     ref:ortsnetz: Key:ref:ortsnetz
+    ref:oslo:tree: Key:ref:oslo:tree
     ref:penndot: Key:ref:penndot
+    ref:psma:lga_pid: Key:ref:psma:lga pid
+    ref:psma:loc_pid: Key:ref:psma:loc pid
     ref:raa: Key:ref:raa
+    ref:rce: Key:ref:rce
     ref:ruian: Key:ref:ruian
     ref:ruian:addr: Key:ref:ruian:addr
     ref:ruian:building: Key:ref:ruian:building
@@ -5713,14 +6569,20 @@ en:
     ref:sandre: Key:ref:sandre
     ref:se:pts:postort: Key:ref:se:pts:postort
     ref:se:scb: Key:ref:se:scb
+    ref:seedcode: Key:ref:seedcode
     ref:shop:num: Key:ref:shop:num
     ref:sitp: Key:ref:sitp
+    ref:sr:maticni_broj: Key:ref:sr:maticni broj
+    ref:statistical: Key:ref:statistical
     ref:taskey: Key:ref:taskey
     ref:vatin: Key:ref:vatin
     ref:vatin:hu: Key:ref:vatin:hu
     ref:vorwahl: Key:ref:vorwahl
     ref:wawa: Key:ref:wawa
     ref:whc: Key:ref:whc
+    ref:wigos: Key:ref:wigos
+    ref:wmo: Key:ref:wmo
+    ref:wpi: Key:ref:wpi
     ref:zsj: Key:ref:zsj
     ref_name: Key:ref name
     reference: Key:reference
@@ -5729,15 +6591,24 @@ en:
     reg_name:ar: Key:reg name:ar
     reg_ref: Key:reg ref
     regelbau: Key:regelbau
+    region:type: Key:region:type
+    related_law: Key:related law
     religion: Key:religion
     removed: Key:removed
     'removed:': 'Key:removed:'
+    removed:amenity: Key:removed:amenity
+    removed:building: Key:removed:building
     rental: Key:rental
     repair: Key:repair
     repd:id: Key:repd:id
     repeat_on: Key:repeat on
+    reporting_mark: Key:reporting mark
+    reporting_marks: Key:reporting marks
+    research: Key:research
     reservation: Key:reservation
+    reservoir_type: Key:reservoir type
     residential: Key:residential
+    resort: Key:resort
     resource: Key:resource
     restaurant: Key:restaurant
     restriction:conditional: Key:restriction:conditional
@@ -5758,6 +6629,7 @@ en:
     roof:colour: Key:roof:colour
     roof:direction: Key:roof:direction
     roof:material: Key:roof:material
+    roof:ridge: Key:roof:ridge
     roof:shape: Key:roof:shape
     room: Key:room
     rooms: Key:rooms
@@ -5787,6 +6659,9 @@ en:
     rv: Key:rv
     rwn_ref: Key:rwn ref
     sac_scale: Key:sac scale
+    safety:hand_sanitizer:covid19: Key:safety:hand sanitizer:covid19
+    safety:mask:covid19: Key:safety:mask:covid19
+    safety_inspection: Key:safety inspection
     safety_rope: Key:safety rope
     safety_rope_side: Key:safety rope side
     sagns_id: Key:sagns id
@@ -5799,6 +6674,8 @@ en:
     sauna:water:description: Key:sauna:water:description
     scenic: Key:scenic
     school: Key:school
+    scuba_diving:courses: Key:scuba diving:courses
+    scuba_diving:rental: Key:scuba diving:rental
     seamark: Key:seamark
     seamark:beacon_isolated_danger:shape: Key:seamark:beacon isolated danger:shape
     seamark:beacon_safe_water:colour: Key:seamark:beacon safe water:colour
@@ -5878,29 +6755,43 @@ en:
     self_service: Key:self service
     sells:tobacco: Key:sells:tobacco
     service: Key:service
+    service:bicycle:cleaning: Key:service:bicycle:cleaning
     service:bicycle:diy: Key:service:bicycle:diy
+    service:bicycle:pump: Key:service:bicycle:pump
     service:bicycle:rental: Key:service:bicycle:rental
     service:bicycle:repair: Key:service:bicycle:repair
     service:bicycle:retail: Key:service:bicycle:retail
     service:bicycle:second_hand: Key:service:bicycle:second hand
     service:vehicle: Key:service:vehicle
+    service:vehicle:lpg: Key:service:vehicle:lpg
     service_times: Key:service times
     shade: Key:shade
     share_taxi: Key:share taxi
     shelter: Key:shelter
     shelter_type: Key:shelter type
     ship: Key:ship
+    shoes: Key:shoes
     shooting: Key:shooting
     shop: Key:shop
     short_name: Key:short name
     short_name:ar: Key:short name:ar
+    short_name:azb: Key:short name:azb
+    short_name:ckb: Key:short name:ckb
+    short_name:fa: Key:short name:fa
+    short_name:ug: Key:short name:ug
+    short_name:ur: Key:short name:ur
     shoulder: Key:shoulder
     shower: Key:shower
     side_road: Key:side road
     sides: Key:sides
     sidewalk: Key:sidewalk
+    sidewalk:both:surface: Key:sidewalk:both:surface
+    sidewalk:left:surface: Key:sidewalk:left:surface
+    sidewalk:right:surface: Key:sidewalk:right:surface
+    sidewalk:surface: Key:sidewalk:surface
     sidewalk_orientation: Key:sidewalk orientation
     sign: Key:sign
+    signed_direction: Key:signed direction
     sinkhole: Key:sinkhole
     siren:purpose: Key:siren:purpose
     siren:type: Key:siren:type
@@ -5913,7 +6804,6 @@ en:
     smokefree: Key:smokefree
     smoking: Key:smoking
     smoking:outside: Key:smoking:outside
-    smoking_hours: Key:smoking hours
     smoothness: Key:smoothness
     snowmobile: Key:snowmobile
     snowmobile:sales: Key:snowmobile:sales
@@ -5923,34 +6813,63 @@ en:
     social_facility: Key:social facility
     social_facility:for: Key:social facility:for
     socket: Key:socket
+    socket:schuko: Key:socket:schuko
+    socket:type1: Key:socket:type1
+    socket:type2: Key:socket:type2
+    socket:type3c: Key:socket:type3c
+    socket:typee: Key:socket:typee
     sorting_name: Key:sorting name
     sorting_name:ar: Key:sorting name:ar
+    sorting_name:azb: Key:sorting name:azb
     sorting_name:be: Key:sorting name:be
+    sorting_name:fa: Key:sorting name:fa
     sorting_name:ru: Key:sorting name:ru
+    sorting_name:ur: Key:sorting name:ur
     source: Key:source
     source:ProRail: Key:source:ProRail
     source:addr: Key:source:addr
+    source:addr:postcode: Key:source:addr:postcode
+    source:ar: Key:source:ar
+    source:area: Key:source:area
     source:building: Key:source:building
+    source:conscriptionnumber: Key:source:conscriptionnumber
     source:date: Key:source:date
+    source:destination: Key:source:destination
     source:en: Key:source:en
+    source:footprint: Key:source:footprint
     source:geometry: Key:source:geometry
     source:geometry:date: Key:source:geometry:date
+    source:geometry:ref: Key:source:geometry:ref
+    source:imagery: Key:source:imagery
     source:ja: Key:source:ja
+    source:lanes: Key:source:lanes
     source:loc: Key:source:loc
     source:maxspeed: Key:source:maxspeed
     source:maxspeed:backward: Key:source:maxspeed:backward
     source:maxspeed:forward: Key:source:maxspeed:forward
     source:name: Key:source:name
+    source:name:ar: Key:source:name:ar
+    source:name:br: Key:source:name:br
+    source:name:date: Key:source:name:date
+    source:oneway: Key:source:oneway
+    source:outline: Key:source:outline
     source:population: Key:source:population
     source:position: Key:source:position
     source:postcode: Key:source:postcode
     source:ref: Key:source:ref
+    source:shape: Key:source:shape
+    source:taxon: Key:source:taxon
+    source:tracer: Key:source:tracer
+    source:zoomlevel: Key:source:zoomlevel
     source_ref: Key:source ref
     species: Key:species
     species:FR: Key:species:FR
+    species:ar: Key:species:ar
     species:cs: Key:species:cs
     species:de: Key:species:de
     species:en: Key:species:en
+    species:it: Key:species:it
+    species:no: Key:species:no
     species:ru: Key:species:ru
     species:wikidata: Key:species:wikidata
     speech_input: Key:speech input
@@ -5959,6 +6878,7 @@ en:
     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
     sport: Key:sport
     sqkm: Key:sqkm
@@ -5966,6 +6886,7 @@ en:
     stamps: Key:stamps
     stars: Key:stars
     start_date: Key:start date
+    state: Key:state
     station: Key:station
     status: Key:status
     step:contrast: Key:step:contrast
@@ -5974,6 +6895,7 @@ en:
     stile: Key:stile
     stone_type: Key:stone type
     stop: Key:stop
+    stop_id: Key:stop id
     storage_area: Key:storage area
     stove: Key:stove
     stranded: Key:stranded
@@ -5981,6 +6903,7 @@ en:
     stream: Key:stream
     stroller: Key:stroller
     structure: Key:structure
+    studio: Key:studio
     sub_sea: Key:sub sea
     subject: Key:subject
     subject:wikidata: Key:subject:wikidata
@@ -5989,23 +6912,26 @@ en:
     subsea: Key:subsea
     substance: Key:substance
     substation: Key:substation
+    subway: Key:subway
     summit:register: Key:summit:register
     supervised: Key:supervised
     support: Key:support
     support:notinsel: Key:support:notinsel
     surface: Key:surface
+    surface:grade: Key:surface:grade
     surveillance: Key:surveillance
     surveillance:type: Key:surveillance:type
     surveillance:zone: Key:surveillance:zone
     survey:date: Key:survey:date
     sustrans_ref: Key:sustrans ref
+    swimming: Key:swimming
     swimming_pool: Key:swimming pool
     switch: Key:switch
     symbol: Key:symbol
-    table_d_hote: Key:table d hote
     tactile_map: Key:tactile map
     tactile_paving: Key:tactile paving
     tactile_writing: Key:tactile writing
+    tactile_writing:braille:ar: Key:tactile writing:braille:ar
     tactile_writing:braille:de: Key:tactile writing:braille:de
     tactile_writing:braille:lg: Key:tactile writing:braille:lg
     tactile_writing:computer_braille:lg: Key:tactile writing:computer braille:lg
@@ -6015,6 +6941,8 @@ en:
       letters:de
     tactile_writing:fakoo: Key:tactile writing:fakoo
     tactile_writing:moon: Key:tactile writing:moon
+    tailor:alteration_service: Key:tailor:alteration service
+    tailor:bespoke_tailoring: Key:tailor:bespoke tailoring
     takeaway: Key:takeaway
     tank: Key:tank
     tank_trap: Key:tank trap
@@ -6026,12 +6954,15 @@ en:
     telecom: Key:telecom
     telecom:medium: Key:telecom:medium
     telescope:type: Key:telescope:type
+    television: Key:television
     temporary: Key:temporary
     tenant: Key:tenant
     tents: Key:tents
     terrace: Key:terrace
     teryt: Key:teryt
+    teryt:rm: Key:teryt:rm
     teryt:simc: Key:teryt:simc
+    teryt:stan_na: Key:teryt:stan na
     teryt:terc: Key:teryt:terc
     theatre:genre: Key:theatre:genre
     theatre:type: Key:theatre:type
@@ -6049,14 +6980,18 @@ en:
     tiger:PLACENS: Key:tiger:PLACENS
     tiger:cfcc: Key:tiger:cfcc
     tiger:county: Key:tiger:county
+    tiger:name_direction_prefix: Key:tiger:name direction prefix
+    tiger:reviewed: Key:tiger:reviewed
     tiger:separated: Key:tiger:separated
     tiger:tlid: Key:tiger:tlid
     tiger:upload_uuid: Key:tiger:upload uuid
     timezone: Key:timezone
     to: Key:to
+    to:ar: Key:to:ar
     tobacco: Key:tobacco
     todo: Key:todo
     toilets: Key:toilets
+    toilets:paper_supplied: Key:toilets:paper supplied
     toilets:wheelchair: Key:toilets:wheelchair
     toll: Key:toll
     toll:hgv: Key:toll:hgv
@@ -6077,9 +7012,11 @@ en:
     traffic_calming: Key:traffic calming
     traffic_sign: Key:traffic sign
     traffic_sign:backward: Key:traffic sign:backward
+    traffic_sign:direction: Key:traffic sign:direction
     traffic_sign:forward: Key:traffic sign:forward
     traffic_signals: Key:traffic signals
     traffic_signals:arrow: Key:traffic signals:arrow
+    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:minimap: Key:traffic signals:minimap
@@ -6092,27 +7029,39 @@ en:
     trail_visibility: Key:trail visibility
     trailblazed: Key:trailblazed
     trailer: Key:trailer
+    trailer:rental: Key:trailer:rental
     train: Key:train
     tram: Key:tram
     transformer: Key:transformer
     transformer:devices: Key:transformer:devices
+    tree_lined: Key:tree lined
     trees: Key:trees
     trench: Key:trench
     trolley_wire: Key:trolley wire
     trolleybus: Key:trolleybus
     truck_wash: Key:truck wash
+    ts_calle: Key:ts calle
+    ts_codigo: Key:ts codigo
+    ts_desde: Key:ts desde
+    ts_hacia: Key:ts hacia
+    ts_orientacion: Key:ts orientacion
     tsunami: Key:tsunami
     tsunami:damage: Key:tsunami:damage
     tunnel: Key:tunnel
     tunnel:name: Key:tunnel:name
+    tunnel:name:ar: Key:tunnel:name:ar
     turn: Key:turn
     turn:backward: Key:turn:backward
+    turn:bicycle:lanes: Key:turn:bicycle:lanes
     turn:both_ways: Key:turn:both ways
+    turn:bus:lanes: Key:turn:bus:lanes
     turn:forward: Key:turn:forward
     turn:lanes: Key:turn:lanes
     turn:lanes:backward: Key:turn:lanes:backward
     turn:lanes:both_ways: Key:turn:lanes:both ways
     turn:lanes:forward: Key:turn:lanes:forward
+    turn:psv:lanes: Key:turn:psv:lanes
+    turn:taxi:lanes: Key:turn:taxi:lanes
     turn_to_close: Key:turn to close
     turning_radius: Key:turning radius
     twitter: Key:twitter
@@ -6130,6 +7079,9 @@ en:
     usage: Key:usage
     user_defined_other: Key:user defined other
     utahagrc:parcelid: Key:utahagrc:parcelid
+    utility: Key:utility
+    vaccination: Key:vaccination
+    vacuum_cleaner: Key:vacuum cleaner
     validate:ants:yellow: Key:validate:ants:yellow
     validate:no_name: Key:validate:no name
     validate:no_ref: Key:validate:no ref
@@ -6140,14 +7092,18 @@ en:
     vehicle:conditional: Key:vehicle:conditional
     vending: Key:vending
     verge: Key:verge
+    vhf: Key:vhf
+    via: Key:via
     via_ferrata_scale: Key:via ferrata scale
     view: Key:view
     viewpoint: Key:viewpoint
     vine_row_orientation: Key:vine row orientation
     visibility: Key:visibility
+    volcano:status: Key:volcano:status
     voltage: Key:voltage
     voltage:primary: Key:voltage:primary
     voltage:secondary: Key:voltage:secondary
+    walk-in: Key:walk-in
     wall:material: Key:wall:material
     washing_machine: Key:washing machine
     waste: Key:waste
@@ -6158,8 +7114,12 @@ en:
     water_source: Key:water source
     water_system: Key:water system
     waterway: Key:waterway
-    way_area: Key:way area
+    weather_protection: Key:weather protection
     website: Key:website
+    website:booking: Key:website:booking
+    website:map: Key:website:map
+    website:menu: Key:website:menu
+    website:orders: Key:website:orders
     website:stock: Key:website:stock
     wetland: Key:wetland
     wheelchair: Key:wheelchair
@@ -6167,28 +7127,44 @@ en:
     whitewater:rapid_grade: Key:whitewater:rapid grade
     wholesale: Key:wholesale
     width: Key:width
+    width:carriageway: Key:width:carriageway
     wifi: Key:wifi
     wiki:symbol: Key:wiki:symbol
     wikidata: Key:wikidata
     wikimedia_commons: Key:wikimedia commons
     wikipedia: Key:wikipedia
     wikipedia:ar: Key:wikipedia:ar
+    wikipedia:azb: Key:wikipedia:azb
     wikipedia:be: Key:wikipedia:be
+    wikipedia:ckb: Key:wikipedia:ckb
     wikipedia:de: Key:wikipedia:de
     wikipedia:en: Key:wikipedia:en
+    wikipedia:fa: Key:wikipedia:fa
     wikipedia:fr: Key:wikipedia:fr
+    wikipedia:glk: Key:wikipedia:glk
+    wikipedia:ks: Key:wikipedia:ks
+    wikipedia:lrc: Key:wikipedia:lrc
+    wikipedia:mzn: Key:wikipedia:mzn
     wikipedia:pl: Key:wikipedia:pl
+    wikipedia:pnb: Key:wikipedia:pnb
+    wikipedia:ps: Key:wikipedia:ps
+    wikipedia:sd: Key:wikipedia:sd
+    wikipedia:ug: Key:wikipedia:ug
+    wikipedia:ur: Key:wikipedia:ur
     windings: Key:windings
     windings:configuration: Key:windings:configuration
     windings:primary: Key:windings:primary
     windings:secondary: Key:windings:secondary
     windings:tertiary: Key:windings:tertiary
+    windmill:type: Key:windmill:type
+    windmill:vanes: Key:windmill:vanes
     wine:grape: Key:wine:grape
     wine:region: Key:wine:region
     wine:type: Key:wine:type
     wine:vineyard: Key:wine:vineyard
     winery: Key:winery
     winter_road: Key:winter road
+    winter_room: Key:winter room
     winter_service: Key:winter service
     winter_service:gritting: Key:winter service:gritting
     winter_service:priority: Key:winter service:priority
@@ -6196,8 +7172,13 @@ en:
     wires: Key:wires
     woeid: Key:woeid
     wood: Key:wood
+    wood_available: Key:wood available
+    wood_provided: Key:wood provided
     woody_species_100m: Key:woody species 100m
     workrules: Key:workrules
+    works: Key:works
+    workshop: Key:workshop
+    worship: Key:worship
     www.prezzibenzina.it: Key:www.prezzibenzina.it
     xmas:feature: Key:xmas:feature
     xmpp: Key:xmpp
@@ -6207,6 +7188,7 @@ en:
     yh:STRUCTURE: Key:yh:STRUCTURE
     yh:TOTYUMONO: Key:yh:TOTYUMONO
     yh:TYPE: Key:yh:TYPE
+    yh:WIDTH: Key:yh:WIDTH
     yh:WIDTH_RANK: Key:yh:WIDTH RANK
     zero_waste: Key:zero waste
     zone: Key:zone
@@ -6220,17 +7202,25 @@ en:
     abandoned:amenity=prison: Tag:abandoned:amenity=prison
     abandoned:amenity=prison_camp: Tag:abandoned:amenity=prison camp
     abandoned=yes: Tag:abandoned=yes
+    access=agricultural: Tag:access=agricultural
     access=customers: Tag:access=customers
+    access=delivery: Tag:access=delivery
     access=designated: Tag:access=designated
     access=exclusion_zone: Tag:access=exclusion zone
+    access=forestry: Tag:access=forestry
     access=license: Tag:access=license
     access=no: Tag:access=no
     access=official: Tag:access=official
+    access=permissive: Tag:access=permissive
+    access=permit: Tag:access=permit
     access=private: Tag:access=private
+    access=public: Tag:access=public
     access=restricted: Tag:access=restricted
     access=use_sidepath: Tag:access=use sidepath
     actuator=electric_motor: Tag:actuator=electric motor
     actuator=hydraulic_cylinder: Tag:actuator=hydraulic cylinder
+    actuator=manual: Tag:actuator=manual
+    actuator=pneumatic_cylinder: Tag:actuator=pneumatic cylinder
     admin_level=1: Tag:admin level=1
     admin_level=10: Tag:admin level=10
     admin_level=11: Tag:admin level=11
@@ -6281,6 +7271,7 @@ en:
     aeroway=airport: Tag:aeroway=airport
     aeroway=airstrip: Tag:aeroway=airstrip
     aeroway=apron: Tag:aeroway=apron
+    aeroway=arresting_gear: Tag:aeroway=arresting gear
     aeroway=fuel: Tag:aeroway=fuel
     aeroway=gate: Tag:aeroway=gate
     aeroway=hangar: Tag:aeroway=hangar
@@ -6322,6 +7313,7 @@ en:
     amenity=bar: Tag:amenity=bar
     amenity=bbq: Tag:amenity=bbq
     amenity=bench: Tag:amenity=bench
+    amenity=bicycle_library: Tag:amenity=bicycle library
     amenity=bicycle_parking: Tag:amenity=bicycle parking
     amenity=bicycle_rental: Tag:amenity=bicycle rental
     amenity=bicycle_repair_station: Tag:amenity=bicycle repair station
@@ -6329,7 +7321,9 @@ en:
     amenity=biergarten: Tag:amenity=biergarten
     amenity=bike_parking: Tag:amenity=bike parking
     amenity=bikeshed: Tag:amenity=bikeshed
+    amenity=binoculars: Tag:amenity=binoculars
     amenity=bird_bath: Tag:amenity=bird bath
+    amenity=blood_bank: Tag:amenity=blood bank
     amenity=boat_rental: Tag:amenity=boat rental
     amenity=boat_sharing: Tag:amenity=boat sharing
     amenity=boat_storage: Tag:amenity=boat storage
@@ -6339,11 +7333,13 @@ en:
     amenity=bus_station: Tag:amenity=bus station
     amenity=bus_stop: Tag:amenity=bus stop
     amenity=cafe: Tag:amenity=cafe
+    amenity=canteen: Tag:amenity=canteen
     amenity=car_pooling: Tag:amenity=car pooling
     amenity=car_rental: Tag:amenity=car rental
     amenity=car_repair: Tag:amenity=car repair
     amenity=car_sharing: Tag:amenity=car sharing
     amenity=car_wash: Tag:amenity=car wash
+    amenity=carpet_washing: Tag:amenity=carpet washing
     amenity=carwash: Tag:amenity=carwash
     amenity=casino: Tag:amenity=casino
     amenity=charging_station: Tag:amenity=charging station
@@ -6353,6 +7349,7 @@ en:
     amenity=clinic: Tag:amenity=clinic
     amenity=cloakroom: Tag:amenity=cloakroom
     amenity=clock: Tag:amenity=clock
+    amenity=clothes_dryer: Tag:amenity=clothes dryer
     amenity=club: Tag:amenity=club
     amenity=coast_guard: Tag:amenity=coast guard
     amenity=coast_radar_station: Tag:amenity=coast radar station
@@ -6363,6 +7360,7 @@ en:
     amenity=concert_hall: Tag:amenity=concert hall
     amenity=concession_stand: Tag:amenity=concession stand
     amenity=conference_centre: Tag:amenity=conference centre
+    amenity=consulate: Tag:amenity=consulate
     amenity=courthouse: Tag:amenity=courthouse
     amenity=coworking_space: Tag:amenity=coworking space
     amenity=crematorium: Tag:amenity=crematorium
@@ -6410,19 +7408,24 @@ en:
     amenity=fountain: Tag:amenity=fountain
     amenity=fridge: Tag:amenity=fridge
     amenity=fuel: Tag:amenity=fuel
+    amenity=funeral_hall: Tag:amenity=funeral hall
     amenity=gambling: Tag:amenity=gambling
     amenity=game_feeding: Tag:amenity=game feeding
     amenity=garages: Tag:amenity=garages
+    amenity=give_box: Tag:amenity=give box
     amenity=grave_yard: Tag:amenity=grave yard
     amenity=grit_bin: Tag:amenity=grit bin
     amenity=gym: Tag:amenity=gym
     amenity=gym_(Don't_use): Tag:amenity=gym (Don't use)
     amenity=harbourmaster: Tag:amenity=harbourmaster
+    amenity=health_post: Tag:amenity=health post
+    amenity=hitching_post: Tag:amenity=hitching post
     amenity=hookah_lounge: Tag:amenity=hookah lounge
     amenity=hospice: Tag:amenity=hospice
     amenity=hospital: Tag:amenity=hospital
     amenity=hotel: Tag:amenity=hotel
     amenity=hunting_stand: Tag:amenity=hunting stand
+    amenity=hydrant: Tag:amenity=hydrant
     amenity=ice_cream: Tag:amenity=ice cream
     amenity=internet_cafe: Tag:amenity=internet cafe
     amenity=jobcentre: Tag:amenity=jobcentre
@@ -6439,23 +7442,29 @@ en:
     amenity=life_ring: Tag:amenity=life ring
     amenity=lifeboat_station: Tag:amenity=lifeboat station
     amenity=loading_dock: Tag:amenity=loading dock
+    amenity=lost_property_office: Tag:amenity=lost property office
     amenity=lounger: Tag:amenity=lounger
     amenity=love_hotel: Tag:amenity=love hotel
     amenity=marae: Tag:amenity=marae
     amenity=marketplace: Tag:amenity=marketplace
     amenity=microwave: Tag:amenity=microwave
     amenity=milk_dispenser: Tag:amenity=milk dispenser
+    amenity=mist_spraying_cooler: Tag:amenity=mist spraying cooler
     amenity=mobile_library: Tag:amenity=mobile library
+    amenity=mobile_money_agent: Tag:amenity=mobile money agent
     amenity=monastery: Tag:amenity=monastery
     amenity=money_transfer: Tag:amenity=money transfer
     amenity=mortuary: Tag:amenity=mortuary
     amenity=motorcycle_parking: Tag:amenity=motorcycle parking
     amenity=motorcycle_rental: Tag:amenity=motorcycle rental
+    amenity=motorcycle_taxi: Tag:amenity=motorcycle taxi
     amenity=music_school: Tag:amenity=music school
     amenity=music_venue: Tag:amenity=music venue
     amenity=nightclub: Tag:amenity=nightclub
     amenity=nursery: Tag:amenity=nursery
     amenity=nursing_home: Tag:amenity=nursing home
+    amenity=office: Tag:amenity=office
+    amenity=outfitter: Tag:amenity=outfitter
     amenity=park: Tag:amenity=park
     amenity=parking: Tag:amenity=parking
     amenity=parking_entrance: Tag:amenity=parking entrance
@@ -6465,6 +7474,7 @@ en:
     amenity=payment_terminal: Tag:amenity=payment terminal
     amenity=pharmacy: Tag:amenity=pharmacy
     amenity=photo_booth: Tag:amenity=photo booth
+    amenity=piano: Tag:amenity=piano
     amenity=place_of_worship: Tag:amenity=place of worship
     amenity=planetarium: Tag:amenity=planetarium
     amenity=police: Tag:amenity=police
@@ -6486,12 +7496,14 @@ en:
     amenity=reception_desk: Tag:amenity=reception desk
     amenity=recycling: Tag:amenity=recycling
     amenity=refugee_housing: Tag:amenity=refugee housing
+    amenity=refugee_site: Tag:amenity=refugee site
     amenity=register_office: Tag:amenity=register office
     amenity=rescue_box: Tag:amenity=rescue box
     amenity=rescue_station: Tag:amenity=rescue station
     amenity=research_institute: Tag:amenity=research institute
     amenity=restaurant: Tag:amenity=restaurant
     amenity=retirement_home: Tag:amenity=retirement home
+    amenity=rv_storage: Tag:amenity=rv storage
     amenity=sailing_school: Tag:amenity=sailing school
     amenity=sanatorium: Tag:amenity=sanatorium
     amenity=sanitary_dump_station: Tag:amenity=sanitary dump station
@@ -6508,9 +7520,12 @@ en:
     amenity=smoking_area: Tag:amenity=smoking area
     amenity=snow_removal_station: Tag:amenity=snow removal station
     amenity=social_centre: Tag:amenity=social centre
+    amenity=social_club: Tag:amenity=social club
     amenity=social_facility: Tag:amenity=social facility
     amenity=spa: Tag:amenity=spa
+    amenity=sport_school: Tag:amenity=sport school
     amenity=stables: Tag:amenity=stables
+    amenity=stage: Tag:amenity=stage
     amenity=stool: Tag:amenity=stool
     amenity=street_lamp: Tag:amenity=street lamp
     amenity=street_light: Tag:amenity=street light
@@ -6530,6 +7545,8 @@ en:
     amenity=toilets: Tag:amenity=toilets
     amenity=tourist_bus_parking: Tag:amenity=tourist bus parking
     amenity=townhall: Tag:amenity=townhall
+    amenity=toy_library: Tag:amenity=toy library
+    amenity=trailer_park: Tag:amenity=trailer park
     amenity=trolley_bay: Tag:amenity=trolley bay
     amenity=tuition: Tag:amenity=tuition
     amenity=university: Tag:amenity=university
@@ -6555,6 +7572,7 @@ en:
     animal=horse_walker: Tag:animal=horse walker
     animal=school: Tag:animal=school
     animal_breeding=gamecock: Tag:animal breeding=gamecock
+    animal_shelter:sanctuary=yes: Tag:animal shelter:sanctuary=yes
     animated=trivision_blades: Tag:animated=trivision blades
     animated=winding_posters: Tag:animated=winding posters
     anthropogenic=yes: Tag:anthropogenic=yes
@@ -6562,8 +7580,14 @@ en:
     area:highway=footway: Tag:area:highway=footway
     area:highway=path: Tag:area:highway=path
     area:highway=pedestrian: Tag:area:highway=pedestrian
+    area:highway=turning_circle: Tag:area:highway=turning circle
+    artwork_type=architecture: Tag:artwork type=architecture
+    artwork_type=bust: Tag:artwork type=bust
+    artwork_type=mural: Tag:artwork type=mural
+    artwork_type=relief: Tag:artwork type=relief
     artwork_type=sculpture: Tag:artwork type=sculpture
     artwork_type=statue: Tag:artwork type=statue
+    artwork_type=stone: Tag:artwork type=stone
     assembly_point:earthquake=yes: Tag:assembly point:earthquake=yes
     assembly_point:fire=yes: Tag:assembly point:fire=yes
     assembly_point:flood=yes: Tag:assembly point:flood=yes
@@ -6572,6 +7596,7 @@ en:
     assembly_point:tsunami=yes: Tag:assembly point:tsunami=yes
     atm=no: Tag:atm=no
     atm=yes: Tag:atm=yes
+    attraction=alpine_coaster: Tag:attraction=alpine coaster
     attraction=animal: Tag:attraction=animal
     attraction=maze: Tag:attraction=maze
     attraction=roller_coaster: Tag:attraction=roller coaster
@@ -6581,8 +7606,11 @@ en:
     baby_hatch=yes: Tag:baby hatch=yes
     bakehouse: Tag:bakehouse
     baking_oven: Tag:baking oven
+    barrier=bar: Tag:barrier=bar
+    barrier=berm: Tag:barrier=berm
     barrier=block: Tag:barrier=block
     barrier=bollard: Tag:barrier=bollard
+    barrier=boom: Tag:barrier=boom
     barrier=border_control: Tag:barrier=border control
     barrier=bump_gate: Tag:barrier=bump gate
     barrier=bus_trap: Tag:barrier=bus trap
@@ -6602,6 +7630,7 @@ en:
     barrier=full-height_turnstile: Tag:barrier=full-height turnstile
     barrier=gate: Tag:barrier=gate
     barrier=guard_rail: Tag:barrier=guard rail
+    barrier=haha: Tag:barrier=haha
     barrier=hampshire_gate: Tag:barrier=hampshire gate
     barrier=handrail: Tag:barrier=handrail
     barrier=hedge: Tag:barrier=hedge
@@ -6617,13 +7646,13 @@ en:
     barrier=lift_gate: Tag:barrier=lift gate
     barrier=log: Tag:barrier=log
     barrier=motorcycle_barrier: Tag:barrier=motorcycle barrier
-    barrier=ohm:military:wireObstacle: Tag:barrier=ohm:military:wireObstacle
-    barrier=ohm:ww1:wireObstacle: Tag:barrier=ohm:ww1:wireObstacle
     barrier=retaining_wall: Tag:barrier=retaining wall
     barrier=rope: Tag:barrier=rope
     barrier=sally_port: Tag:barrier=sally port
     barrier=select_acces: Tag:barrier=select acces
+    barrier=sliding_gate: Tag:barrier=sliding gate
     barrier=spikes: Tag:barrier=spikes
+    barrier=step: Tag:barrier=step
     barrier=stile: Tag:barrier=stile
     barrier=sump_buster: Tag:barrier=sump buster
     barrier=swing_gate: Tag:barrier=swing gate
@@ -6631,19 +7660,37 @@ en:
     barrier=toll_booth: Tag:barrier=toll booth
     barrier=tree: Tag:barrier=tree
     barrier=turnstile: Tag:barrier=turnstile
+    barrier=tyres: Tag:barrier=tyres
     barrier=wall: Tag:barrier=wall
+    barrier=wicket_gate: Tag:barrier=wicket gate
+    barrier=yes: Tag:barrier=yes
     baseball=softball: Tag:baseball=softball
+    basin=cooling: Tag:basin=cooling
+    basin=detention: Tag:basin=detention
+    basin=infiltration: Tag:basin=infiltration
+    basin=retention: Tag:basin=retention
     bath:type=hammam: Tag:bath:type=hammam
     bath:type=hot_spring: Tag:bath:type=hot spring
     bath:type=onsen: Tag:bath:type=onsen
     bath:type=thermal: Tag:bath:type=thermal
     bay=fjord: Tag:bay=fjord
     bbq=yes: Tag:bbq=yes
+    beacon:type=DVOR: Tag:beacon:type=DVOR
+    beacon:type=ILS: Tag:beacon:type=ILS
+    beacon:type=NDB: Tag:beacon:type=NDB
+    beacon:type=TACAN: Tag:beacon:type=TACAN
+    beacon:type=VOR: Tag:beacon:type=VOR
+    bicycle:backward=use_sidepath: Tag:bicycle:backward=use sidepath
+    bicycle:forward=use_sidepath: Tag:bicycle:forward=use sidepath
     bicycle=designated: Tag:bicycle=designated
+    bicycle=dismount: Tag:bicycle=dismount
+    bicycle=no: Tag:bicycle=no
     bicycle=official: Tag:bicycle=official
     bicycle=use_sidepath: Tag:bicycle=use sidepath
+    bicycle=yes: Tag:bicycle=yes
     biosphärenwirt=yes: Tag:biosphärenwirt=yes
     birds_nest=stork: Tag:birds nest=stork
+    board_type=board: Tag:board type=board
     boat:rental=yes: Tag:boat:rental=yes
     boat:type=canoe: Tag:boat:type=canoe
     boat:type=dinghy: Tag:boat:type=dinghy
@@ -6652,14 +7699,16 @@ en:
     boat:type=pedalo: Tag:boat:type=pedalo
     boat:type=rowing: Tag:boat:type=rowing
     boat:type=sailing: Tag:boat:type=sailing
-    border_type=IALA: Tag:border type=IALA
     border_type=fishery: Tag:border type=fishery
     border_type=harbour_limits: Tag:border type=harbour limits
     boundary=aboriginal_lands: Tag:boundary=aboriginal lands
     boundary=administrative: Tag:boundary=administrative
+    boundary=census: Tag:boundary=census
     boundary=civil: Tag:boundary=civil
     boundary=economic: Tag:boundary=economic
     boundary=forest_compartment: Tag:boundary=forest compartment
+    boundary=forestry_compartment: Tag:boundary=forestry compartment
+    boundary=hazard: Tag:boundary=hazard
     boundary=historic: Tag:boundary=historic
     boundary=local_authority: Tag:boundary=local authority
     boundary=low_emission_zone: Tag:boundary=low emission zone
@@ -6668,17 +7717,23 @@ en:
     boundary=military_district: Tag:boundary=military district
     boundary=national: Tag:boundary=national
     boundary=national_park: Tag:boundary=national park
+    boundary=place: Tag:boundary=place
     boundary=political: Tag:boundary=political
     boundary=postal_code: Tag:boundary=postal code
     boundary=protected_area: Tag:boundary=protected area
     boundary=regional_park: Tag:boundary=regional park
+    boundary=safety_region: Tag:boundary=safety region
+    boundary=special_economic_zone: Tag:boundary=special economic zone
     boundary=timezone: Tag:boundary=timezone
     boundary=urban: Tag:boundary=urban
     boundary=vice_county: Tag:boundary=vice county
+    boundary=waste_collection: Tag:boundary=waste collection
     boundary=water_protection_area: Tag:boundary=water protection area
     brand=Harley-Davidson: Tag:brand=Harley-Davidson
     brand=KTM: Tag:brand=KTM
+    brand=Louis_Motorrad: Tag:brand=Louis Motorrad
     brand=Moto_Guzzi: Tag:brand=Moto Guzzi
+    brand=Polo_Motorrad: Tag:brand=Polo Motorrad
     brand=Triumph: Tag:brand=Triumph
     brand=Zero: Tag:brand=Zero
     bridge:movable=bascule: Tag:bridge:movable=bascule
@@ -6707,10 +7762,14 @@ en:
     bridge=trestle: Tag:bridge=trestle
     bridge=viaduct: Tag:bridge=viaduct
     building:use=stable: Tag:building:use=stable
+    building=*: Tag:building=*
+    building=Y: Tag:building=Y
+    building=abandoned: Tag:building=abandoned
     building=allotment_house: Tag:building=allotment house
     building=apartments: Tag:building=apartments
     building=bakehouse: Tag:building=bakehouse
     building=barn: Tag:building=barn
+    building=barracks: Tag:building=barracks
     building=boathouse: Tag:building=boathouse
     building=brewery: Tag:building=brewery
     building=bridge: Tag:building=bridge
@@ -6718,28 +7777,40 @@ en:
     building=bunker: Tag:building=bunker
     building=cabin: Tag:building=cabin
     building=carport: Tag:building=carport
+    building=castle: Tag:building=castle
     building=cathedral: Tag:building=cathedral
     building=central_office: Tag:building=central office
     building=chapel: Tag:building=chapel
     building=church: Tag:building=church
     building=civic: Tag:building=civic
+    building=collapsed: Tag:building=collapsed
     building=college: Tag:building=college
     building=commercial: Tag:building=commercial
     building=condominium: Tag:building=condominium
     building=conservatory: Tag:building=conservatory
+    building=constructie: Tag:building=constructie
     building=construction: Tag:building=construction
     building=container: Tag:building=container
+    building=convent: Tag:building=convent
     building=cowshed: Tag:building=cowshed
     building=detached: Tag:building=detached
+    building=digester: Tag:building=digester
+    building=disused: Tag:building=disused
     building=dormitory: Tag:building=dormitory
     building=entrance: Tag:building=entrance
     building=exit: Tag:building=exit
+    building=factory: Tag:building=factory
     building=farm: Tag:building=farm
     building=farm_auxiliary: Tag:building=farm auxiliary
+    building=fire_station: Tag:building=fire station
     building=font: Tag:building=font
+    building=fort: Tag:building=fort
+    building=funeral_hall: Tag:building=funeral hall
     building=garage: Tag:building=garage
     building=garages: Tag:building=garages
+    building=gatehouse: Tag:building=gatehouse
     building=ger: Tag:building=ger
+    building=glasshouse: Tag:building=glasshouse
     building=government: Tag:building=government
     building=grandstand: Tag:building=grandstand
     building=greenhouse: Tag:building=greenhouse
@@ -6755,10 +7826,15 @@ en:
     building=kiosk: Tag:building=kiosk
     building=manufacture: Tag:building=manufacture
     building=marquee: Tag:building=marquee
+    building=military: Tag:building=military
+    building=monastery: Tag:building=monastery
     building=mosque: Tag:building=mosque
+    building=museum: Tag:building=museum
     building=office: Tag:building=office
+    building=palace: Tag:building=palace
     building=parking: Tag:building=parking
     building=pavilion: Tag:building=pavilion
+    building=proposed: Tag:building=proposed
     building=public: Tag:building=public
     building=religious: Tag:building=religious
     building=remote_digital_terminal: Tag:building=remote digital terminal
@@ -6766,12 +7842,14 @@ en:
     building=retail: Tag:building=retail
     building=riding_hall: Tag:building=riding hall
     building=roof: Tag:building=roof
+    building=roundhouse: Tag:building=roundhouse
     building=ruins: Tag:building=ruins
     building=school: Tag:building=school
     building=semi: Tag:building=semi
     building=semidetached_house: Tag:building=semidetached house
     building=service: Tag:building=service
     building=shed: Tag:building=shed
+    building=ship: Tag:building=ship
     building=shrine: Tag:building=shrine
     building=slurry_tank: Tag:building=slurry tank
     building=sports_centre: Tag:building=sports centre
@@ -6780,6 +7858,7 @@ en:
     building=stadium: Tag:building=stadium
     building=static_caravan: Tag:building=static caravan
     building=stilt_house: Tag:building=stilt house
+    building=storage_tank: Tag:building=storage tank
     building=sty: Tag:building=sty
     building=supermarket: Tag:building=supermarket
     building=synagogue: Tag:building=synagogue
@@ -6791,16 +7870,25 @@ en:
     building=train_station: Tag:building=train station
     building=transformer_tower: Tag:building=transformer tower
     building=transportation: Tag:building=transportation
+    building=tree_house: Tag:building=tree house
+    building=true: Tag:building=true
     building=trullo: Tag:building=trullo
+    building=unclassified: Tag:building=unclassified
+    building=undefined: Tag:building=undefined
+    building=unidentified: Tag:building=unidentified
     building=university: Tag:building=university
+    building=unknown: Tag:building=unknown
     building=warehouse: Tag:building=warehouse
     building=water_tower: Tag:building=water tower
     building=yes: Tag:building=yes
     bunker_type=gun_emplacement: Tag:bunker type=gun emplacement
     bunker_type=hardened_aircraft_shelter: Tag:bunker type=hardened aircraft shelter
     bunker_type=munitions: Tag:bunker type=munitions
+    bunker_type=personnel_shelter: Tag:bunker type=personnel shelter
     bunker_type=pillbox: Tag:bunker type=pillbox
     bunker_type=technical: Tag:bunker type=technical
+    bus=minibus: Tag:bus=minibus
+    bus=no: Tag:bus=no
     bus=yes: Tag:bus=yes
     busbar=flexible: Tag:busbar=flexible
     busbar=rigid: Tag:busbar=rigid
@@ -6808,7 +7896,10 @@ en:
     busway:right=lane: Tag:busway:right=lane
     busway=lane: Tag:busway=lane
     busway=opposite_lane: Tag:busway=opposite lane
+    by_night=only: Tag:by night=only
+    cabin:rental=yes: Tag:cabin:rental=yes
     cafe=time-cafe: Tag:cafe=time-cafe
+    cafe=time_cafe: Tag:cafe=time cafe
     camp_site=basic: Tag:camp site=basic
     camp_site=camp_pitch: Tag:camp site=camp pitch
     camp_site=deluxe: Tag:camp site=deluxe
@@ -6820,7 +7911,9 @@ en:
     capital=6: Tag:capital=6
     capital=yes: Tag:capital=yes
     car:type=hgv: Tag:car:type=hgv
-    cargo=container: Tag:cargo=container
+    car=no: Tag:car=no
+    car=yes: Tag:car=yes
+    carpenter=joiner: Tag:carpenter=joiner
     castle_type=castrum: Tag:castle type=castrum
     castle_type=defensive: Tag:castle type=defensive
     castle_type=fortress: Tag:castle type=fortress
@@ -6830,6 +7923,7 @@ en:
     castle_type=shiro: Tag:castle type=shiro
     castle_type=stately: Tag:castle type=stately
     cemetery=grave: Tag:cemetery=grave
+    cemetery=sector: Tag:cemetery=sector
     cemetery=war_cemetery: Tag:cemetery=war cemetery
     clothes=fashion: Tag:clothes=fashion
     clothes=motorcycle: Tag:clothes=motorcycle
@@ -6843,18 +7937,23 @@ en:
     club=fan: Tag:club=fan
     club=motorcycle: Tag:club=motorcycle
     club=scout: Tag:club=scout
+    club=scuba_diving: Tag:club=scuba diving
     club=sport: Tag:club=sport
     coastline:survey_quality=complete: Tag:coastline:survey quality=complete
     coastline:survey_quality=inadequate: Tag:coastline:survey quality=inadequate
     collection_times:signed=no: Tag:collection times:signed=no
     communication=line: Tag:communication=line
+    communication=mobile_phone: Tag:communication=mobile phone
+    company=aerospace: Tag:company=aerospace
     construction=yes: Tag:construction=yes
     consulate=consular_agency: Tag:consulate=consular agency
     consulate=consular_office: Tag:consulate=consular office
     consulate=consulate_general: Tag:consulate=consulate general
     consulate=honorary_consul: Tag:consulate=honorary consul
     consulate=yes: Tag:consulate=yes
+    content=hot_water: Tag:content=hot water
     craft=agricultural_engines: Tag:craft=agricultural engines
+    craft=atelier: Tag:craft=atelier
     craft=bag_repair: Tag:craft=bag repair
     craft=bakery: Tag:craft=bakery
     craft=basket_maker: Tag:craft=basket maker
@@ -6865,16 +7964,20 @@ en:
     craft=brewery: Tag:craft=brewery
     craft=builder: Tag:craft=builder
     craft=cabinet_maker: Tag:craft=cabinet maker
+    craft=car_painter: Tag:craft=car painter
     craft=car_repair: Tag:craft=car repair
     craft=carpenter: Tag:craft=carpenter
+    craft=carpet_cleaner: Tag:craft=carpet cleaner
     craft=carpet_layer: Tag:craft=carpet layer
     craft=caterer: Tag:craft=caterer
+    craft=cheese: Tag:craft=cheese
     craft=chimney_sweeper: Tag:craft=chimney sweeper
     craft=clockmaker: Tag:craft=clockmaker
     craft=confectionery: Tag:craft=confectionery
     craft=cooper: Tag:craft=cooper
     craft=dental_technician: Tag:craft=dental technician
     craft=distillery: Tag:craft=distillery
+    craft=door_construction: Tag:craft=door construction
     craft=dressmaker: Tag:craft=dressmaker
     craft=electrican: Tag:craft=electrican
     craft=electrician: Tag:craft=electrician
@@ -6883,6 +7986,7 @@ en:
     craft=engraver: Tag:craft=engraver
     craft=floorer: Tag:craft=floorer
     craft=gardener: Tag:craft=gardener
+    craft=glassblower: Tag:craft=glassblower
     craft=glaziery: Tag:craft=glaziery
     craft=goldsmith: Tag:craft=goldsmith
     craft=grinding_mill: Tag:craft=grinding mill
@@ -6937,6 +8041,7 @@ en:
     craft=turner: Tag:craft=turner
     craft=upholsterer: Tag:craft=upholsterer
     craft=watchmaker: Tag:craft=watchmaker
+    craft=water_well_drilling: Tag:craft=water well drilling
     craft=welder: Tag:craft=welder
     craft=window_construction: Tag:craft=window construction
     craft=winery: Tag:craft=winery
@@ -6952,6 +8057,7 @@ en:
     crop=cereal: Tag:crop=cereal
     crop=coffee: Tag:crop=coffee
     crop=corn: Tag:crop=corn
+    crop=fast_growing_wood: Tag:crop=fast growing wood
     crop=flowers: Tag:crop=flowers
     crop=grape: Tag:crop=grape
     crop=grass: Tag:crop=grass
@@ -6962,20 +8068,36 @@ en:
     crop=rape: Tag:crop=rape
     crop=rice: Tag:crop=rice
     crop=rye: Tag:crop=rye
+    crop=short_rotation_forestry: Tag:crop=short rotation forestry
     crop=soy: Tag:crop=soy
     crop=strawberry: Tag:crop=strawberry
     crop=sugar: Tag:crop=sugar
+    crop=sugarcane: Tag:crop=sugarcane
     crop=sunflower: Tag:crop=sunflower
     crop=tea: Tag:crop=tea
     crop=wheat: Tag:crop=wheat
+    crossing=marked: Tag:crossing=marked
+    crossing=no: Tag:crossing=no
+    crossing=traffic_signals: Tag:crossing=traffic signals
+    crossing=uncontrolled: Tag:crossing=uncontrolled
     crossing=unknown: Tag:crossing=unknown
+    crossing=unmarked: Tag:crossing=unmarked
     crossing=zebra: Tag:crossing=zebra
+    cuisine=barbecue: Tag:cuisine=barbecue
     cuisine=brazilian: Tag:cuisine=brazilian
     cuisine=brunch: Tag:cuisine=brunch
     cuisine=bubble_tea: Tag:cuisine=bubble tea
     cuisine=coffee_shop: Tag:cuisine=coffee shop
     cuisine=dessert: Tag:cuisine=dessert
+    cuisine=empanada: Tag:cuisine=empanada
+    cuisine=fish_and_chips: Tag:cuisine=fish and chips
+    cuisine=friture: Tag:cuisine=friture
     cuisine=tea_shop: Tag:cuisine=tea shop
+    curve=hairpin: Tag:curve=hairpin
+    curve=loop: Tag:curve=loop
+    curves=extended: Tag:curves=extended
+    curves=serpentine: Tag:curves=serpentine
+    cycle_network=EuroVelo: Tag:cycle network=EuroVelo
     cycle_network=US:CA:SF: Tag:cycle network=US:CA:SF
     cycle_network=US:GA: Tag:cycle network=US:GA
     cycle_network=US:LA:NO: Tag:cycle network=US:LA:NO
@@ -6985,6 +8107,8 @@ en:
     cycle_network=US:OH: Tag:cycle network=US:OH
     cycle_network=US:PA: Tag:cycle network=US:PA
     cycle_network=US:US: Tag:cycle network=US:US
+    cycle_network=cycle_highway: Tag:cycle network=cycle highway
+    cycleway:both=lane: Tag:cycleway:both=lane
     cycleway:left=lane: Tag:cycleway:left=lane
     cycleway:left=opposite_lane: Tag:cycleway:left=opposite lane
     cycleway:left=opposite_track: Tag:cycleway:left=opposite track
@@ -7006,6 +8130,7 @@ en:
     cycleway=shared_busway: Tag:cycleway=shared busway
     cycleway=sidepath: Tag:cycleway=sidepath
     cycleway=track: Tag:cycleway=track
+    dataset=buildings: Tag:dataset=buildings
     defensive=bergfried: Tag:defensive=bergfried
     defensive=donjon: Tag:defensive=donjon
     defensive=keep: Tag:defensive=keep
@@ -7026,9 +8151,17 @@ en:
     diplomatic=honorary_consulate: Tag:diplomatic=honorary consulate
     diplomatic=liaison: Tag:diplomatic=liaison
     diplomatic=permanent_mission: Tag:diplomatic=permanent mission
+    disc_golf=basket: Tag:disc golf=basket
+    disc_golf=hole: Tag:disc golf=hole
+    disc_golf=tee: Tag:disc golf=tee
+    disused=yes: Tag:disused=yes
     dock=drydock: Tag:dock=drydock
     dock=floating: Tag:dock=floating
     dock=tidal: Tag:dock=tidal
+    driveway=pipestem: Tag:driveway=pipestem
+    dual_carriageway=no: Tag:dual carriageway=no
+    dual_carriageway=yes: Tag:dual carriageway=yes
+    electrified=4th_rail: Tag:electrified=4th rail
     electrified=contact_line: Tag:electrified=contact line
     electrified=rail: Tag:electrified=rail
     embassy=branch_embassy: Tag:embassy=branch embassy
@@ -7039,6 +8172,9 @@ en:
     embassy=nunciature: Tag:embassy=nunciature
     embassy=residence: Tag:embassy=residence
     embassy=yes: Tag:embassy=yes
+    emergency:social_facility:for=displaced_people: Tag:emergency:social facility:for=displaced
+      people
+    emergency:social_facility=shelter: Tag:emergency:social facility=shelter
     emergency=access_point: Tag:emergency=access point
     emergency=aed: Tag:emergency=aed
     emergency=ambulance_station: Tag:emergency=ambulance station
@@ -7047,6 +8183,7 @@ en:
     emergency=defibrilator: Tag:emergency=defibrilator
     emergency=defibrillator: Tag:emergency=defibrillator
     emergency=disaster_response: Tag:emergency=disaster response
+    emergency=drinking_water: Tag:emergency=drinking water
     emergency=dry_riser: Tag:emergency=dry riser
     emergency=dry_riser_inlet: Tag:emergency=dry riser inlet
     emergency=emergency_ward_entrance: Tag:emergency=emergency ward entrance
@@ -7085,17 +8222,33 @@ en:
     emergency=wet_riser: Tag:emergency=wet riser
     emergency=yes: Tag:emergency=yes
     emergency_service=technical: Tag:emergency service=technical
+    entrance=garage: Tag:entrance=garage
     entrance=main: Tag:entrance=main
+    entrance=main_entrance: Tag:entrance=main entrance
     entrance=staircase: Tag:entrance=staircase
     entrance=yes: Tag:entrance=yes
     esperanto=esperanto: Tag:esperanto=esperanto
+    esperanto=yes: Tag:esperanto=yes
     estuary=yes: Tag:estuary=yes
+    faculty=aerospace: Tag:faculty=aerospace
     fast_food=cafeteria: Tag:fast food=cafeteria
+    fixme=Position_estimated: Tag:fixme=Position estimated
+    flag:type=advertising: Tag:flag:type=advertising
+    flag:type=athletic: Tag:flag:type=athletic
+    flag:type=governmental: Tag:flag:type=governmental
+    flag:type=military: Tag:flag:type=military
+    flag:type=municipal: Tag:flag:type=municipal
+    flag:type=national: Tag:flag:type=national
+    flag:type=organisation: Tag:flag:type=organisation
+    flag:type=regional: Tag:flag:type=regional
+    flag:type=religious: Tag:flag:type=religious
     flood_mark=painting: Tag:flood mark=painting
     flood_mark=plaque: Tag:flood mark=plaque
     flow_direction=both: Tag:flow direction=both
     foot=designated: Tag:foot=designated
     foot=official: Tag:foot=official
+    foot=use_sidepath: Tag:foot=use sidepath
+    footway=access_aisle: Tag:footway=access aisle
     footway=crossing: Tag:footway=crossing
     footway=sidewalk: Tag:footway=sidewalk
     ford=boat: Tag:ford=boat
@@ -7106,6 +8259,10 @@ en:
     fortification_type=ring_ditch: Tag:fortification type=ring ditch
     fortification_type=ringfort: Tag:fortification type=ringfort
     fortification_type=sconce: Tag:fortification type=sconce
+    fountain=bubbler: Tag:fountain=bubbler
+    fountain=drinking: Tag:fountain=drinking
+    fountain=nasone: Tag:fountain=nasone
+    fountain=roman_wolf: Tag:fountain=roman wolf
     garden:type=botanical: Tag:garden:type=botanical
     generator:method=anaerobic_digestion: Tag:generator:method=anaerobic digestion
     generator:method=barrage: Tag:generator:method=barrage
@@ -7122,6 +8279,7 @@ en:
     generator:method=wind_turbine: Tag:generator:method=wind turbine
     generator:plant=intermediate: Tag:generator:plant=intermediate
     generator:plant=output: Tag:generator:plant=output
+    generator:source=battery: Tag:generator:source=battery
     generator:source=biofuel: Tag:generator:source=biofuel
     generator:source=biogas: Tag:generator:source=biogas
     generator:source=biomass: Tag:generator:source=biomass
@@ -7159,25 +8317,34 @@ en:
     geological=moraine: Tag:geological=moraine
     geological=outcrop: Tag:geological=outcrop
     geological=palaeontological_site: Tag:geological=palaeontological site
+    glacier:type=mountain: Tag:glacier:type=mountain
     glideslope=yes: Tag:glideslope=yes
     golf=bunker: Tag:golf=bunker
     golf=cartpath: Tag:golf=cartpath
+    golf=clubhouse: Tag:golf=clubhouse
     golf=driving_range: Tag:golf=driving range
     golf=fairway: Tag:golf=fairway
     golf=green: Tag:golf=green
     golf=hole: Tag:golf=hole
     golf=lateral_water_hazard: Tag:golf=lateral water hazard
     golf=path: Tag:golf=path
+    golf=penalty_area: Tag:golf=penalty area
     golf=pin: Tag:golf=pin
     golf=rough: Tag:golf=rough
     golf=tee: Tag:golf=tee
     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=border_control: Tag:government=border control
     government=cadaster: Tag:government=cadaster
     government=customs: Tag:government=customs
+    government=data_protection: Tag:government=data protection
     government=healthcare: Tag:government=healthcare
+    government=legislative: Tag:government=legislative
     government=ministry: Tag:government=ministry
+    government=parliament: Tag:government=parliament
     government=prosecutor: Tag:government=prosecutor
     government=register_office: Tag:government=register office
     government=statistics: Tag:government=statistics
@@ -7205,17 +8372,69 @@ en:
     harbour:category=tourism: Tag:harbour:category=tourism
     harbour:category=yacht: Tag:harbour:category=yacht
     harbour=marina: Tag:harbour=marina
+    hazard=animal_crossing: Tag:hazard=animal crossing
+    hazard=bump: Tag:hazard=bump
+    hazard=children: Tag:hazard=children
+    hazard=contamination: Tag:hazard=contamination
+    hazard=curve: Tag:hazard=curve
+    hazard=curves: Tag:hazard=curves
+    hazard=cyclists: Tag:hazard=cyclists
+    hazard=dangerous_junction: Tag:hazard=dangerous junction
+    hazard=dip: Tag:hazard=dip
+    hazard=falling_rocks: Tag:hazard=falling rocks
+    hazard=frost_heave: Tag:hazard=frost heave
+    hazard=horse_riders: Tag:hazard=horse riders
+    hazard=ice: Tag:hazard=ice
+    hazard=landslide: Tag:hazard=landslide
+    hazard=loose_gravel: Tag:hazard=loose gravel
+    hazard=low_flying_aircraft: Tag:hazard=low flying aircraft
+    hazard=minefield: Tag:hazard=minefield
+    hazard=nuclear: Tag:hazard=nuclear
+    hazard=pedestrians: Tag:hazard=pedestrians
+    hazard=queues_likely: Tag:hazard=queues likely
+    hazard=school_zone: Tag:hazard=school zone
+    hazard=shooting_range: Tag:hazard=shooting range
+    hazard=side_winds: Tag:hazard=side winds
+    hazard=slippery: Tag:hazard=slippery
+    hazard=turn: Tag:hazard=turn
+    hazard=turns: Tag:hazard=turns
+    hazard=unexploded_ordnance: Tag:hazard=unexploded ordnance
     hazard_prone=yes: Tag:hazard prone=yes
     hazard_type=avalanche: Tag:hazard type=avalanche
     hazard_type=flood: Tag:hazard type=flood
     hazard_type=landslide: Tag:hazard type=landslide
     hazmat:water=permissive: Tag:hazmat:water=permissive
+    healthcare:speciality=abortion: Tag:healthcare:speciality=abortion
+    healthcare:speciality=vaccination: Tag:healthcare:speciality=vaccination
+    healthcare=alternative: Tag:healthcare=alternative
+    healthcare=audiologist: Tag:healthcare=audiologist
+    healthcare=birthing_center: Tag:healthcare=birthing center
+    healthcare=blood_bank: Tag:healthcare=blood bank
     healthcare=blood_donation: Tag:healthcare=blood donation
+    healthcare=centre: Tag:healthcare=centre
+    healthcare=clinic: Tag:healthcare=clinic
+    healthcare=community_health_worker: Tag:healthcare=community health worker
+    healthcare=counselling: Tag:healthcare=counselling
     healthcare=dentist: Tag:healthcare=dentist
+    healthcare=dialysis: Tag:healthcare=dialysis
+    healthcare=doctor: Tag:healthcare=doctor
+    healthcare=hospice: Tag:healthcare=hospice
+    healthcare=hospital: Tag:healthcare=hospital
     healthcare=laboratory: Tag:healthcare=laboratory
+    healthcare=midwife: Tag:healthcare=midwife
+    healthcare=nurse: Tag:healthcare=nurse
     healthcare=nutrition_counseling: Tag:healthcare=nutrition counseling
     healthcare=nutrition_counselling: Tag:healthcare=nutrition counselling
+    healthcare=occupational_therapist: Tag:healthcare=occupational therapist
+    healthcare=optometrist: Tag:healthcare=optometrist
+    healthcare=pharmacy: Tag:healthcare=pharmacy
     healthcare=physiotherapist: Tag:healthcare=physiotherapist
+    healthcare=podiatrist: Tag:healthcare=podiatrist
+    healthcare=psychotherapist: Tag:healthcare=psychotherapist
+    healthcare=rehabilitation: Tag:healthcare=rehabilitation
+    healthcare=speech_therapist: Tag:healthcare=speech therapist
+    healthcare=vaccination_centre: Tag:healthcare=vaccination centre
+    hgv=discouraged: Tag:hgv=discouraged
     highway=Bus_guideway: Tag:highway=Bus guideway
     highway=abandoned: Tag:highway=abandoned
     highway=access: Tag:highway=access
@@ -7279,6 +8498,7 @@ en:
     highway=tertiary_link: Tag:highway=tertiary link
     highway=toll_booth: Tag:highway=toll booth
     highway=toll_gantry: Tag:highway=toll gantry
+    highway=tourist_bus_stop: Tag:highway=tourist bus stop
     highway=track: Tag:highway=track
     highway=traffic_mirror: Tag:highway=traffic mirror
     highway=traffic_signals: Tag:highway=traffic signals
@@ -7300,6 +8520,7 @@ en:
     historic=battlefield: Tag:historic=battlefield
     historic=bomb_crater: Tag:historic=bomb crater
     historic=boundary_stone: Tag:historic=boundary stone
+    historic=building: Tag:historic=building
     historic=cannon: Tag:historic=cannon
     historic=castle: Tag:historic=castle
     historic=castle_wall: Tag:historic=castle wall
@@ -7308,6 +8529,7 @@ en:
     historic=city_gate: Tag:historic=city gate
     historic=city_wall: Tag:historic=city wall
     historic=citywalls: Tag:historic=citywalls
+    historic=district: Tag:historic=district
     historic=event: Tag:historic=event
     historic=farm: Tag:historic=farm
     historic=flood_mark: Tag:historic=flood mark
@@ -7315,6 +8537,7 @@ en:
     historic=gallows: Tag:historic=gallows
     historic=heritage: Tag:historic=heritage
     historic=highwater_mark: Tag:historic=highwater mark
+    historic=house: Tag:historic=house
     historic=locomotive: Tag:historic=locomotive
     historic=manor: Tag:historic=manor
     historic=memorial: Tag:historic=memorial
@@ -7338,16 +8561,27 @@ en:
     historic=tomb: Tag:historic=tomb
     historic=tower: Tag:historic=tower
     historic=tree_shrine: Tag:historic=tree shrine
+    historic=vehicle: Tag:historic=vehicle
+    historic=wayside_chapel: Tag:historic=wayside chapel
     historic=wayside_cross: Tag:historic=wayside cross
     historic=wayside_shrine: Tag:historic=wayside shrine
     historic=wreck: Tag:historic=wreck
+    holding_position:type=ILS: Tag:holding position:type=ILS
+    holding_position:type=intermediate: Tag:holding position:type=intermediate
+    holding_position:type=runway: Tag:holding position:type=runway
     holding_position=ILS: Tag:holding position=ILS
     holding_position=intermediate: Tag:holding position=intermediate
     holding_position=runway: Tag:holding position=runway
     horse=designated: Tag:horse=designated
+    house=bungalow: Tag:house=bungalow
+    house=detached: Tag:house=detached
+    house=semi-detached: Tag:house=semi-detached
+    house=terrace: Tag:house=terrace
+    house=terraced: Tag:house=terraced
     hunting=raised_hide: Tag:hunting=raised hide
     indoor=area: Tag:indoor=area
     indoor=corridor: Tag:indoor=corridor
+    indoor=door: Tag:indoor=door
     indoor=room: Tag:indoor=room
     indoor=wall: Tag:indoor=wall
     indoormark=beacon: Tag:indoormark=beacon
@@ -7359,6 +8593,8 @@ en:
     industrial=depot: Tag:industrial=depot
     industrial=distributor: Tag:industrial=distributor
     industrial=factory: Tag:industrial=factory
+    industrial=fish_farm: Tag:industrial=fish farm
+    industrial=food_industry: Tag:industrial=food industry
     industrial=furniture: Tag:industrial=furniture
     industrial=grinding_mill: Tag:industrial=grinding mill
     industrial=heating_station: Tag:industrial=heating station
@@ -7378,14 +8614,19 @@ en:
     industrial=steelmaking: Tag:industrial=steelmaking
     industrial=warehouse: Tag:industrial=warehouse
     industrial=well_cluster: Tag:industrial=well cluster
+    industrial=wellsite: Tag:industrial=wellsite
     information=audioguide: Tag:information=audioguide
     information=board: Tag:information=board
+    information=finger-post: Tag:information=finger-post
+    information=finger_post: Tag:information=finger post
+    information=fingerpost: Tag:information=fingerpost
     information=guidepost: Tag:information=guidepost
     information=map: Tag:information=map
     information=office: Tag:information=office
     information=tactile_map: Tag:information=tactile map
     information=tactile_model: Tag:information=tactile model
     information=terminal: Tag:information=terminal
+    information=visitor_centre: Tag:information=visitor centre
     insurance=health: Tag:insurance=health
     internet_access=no: Tag:internet access=no
     internet_access=terminal: Tag:internet access=terminal
@@ -7403,11 +8644,19 @@ en:
     junction=spui: Tag:junction=spui
     junction=yes: Tag:junction=yes
     karst=yes: Tag:karst=yes
+    landcover=dunes: Tag:landcover=dunes
     landcover=grass: Tag:landcover=grass
     landcover=gravel: Tag:landcover=gravel
+    landcover=greenery: Tag:landcover=greenery
+    landcover=hedge: Tag:landcover=hedge
+    landcover=sand: Tag:landcover=sand
+    landcover=shrub: Tag:landcover=shrub
+    landcover=shrubland: Tag:landcover=shrubland
+    landcover=shrubs: Tag:landcover=shrubs
     landcover=trees: Tag:landcover=trees
-    landform=esker: Tag:landform=esker
-    landform=raised_beach: Tag:landform=raised beach
+    landcover=water: Tag:landcover=water
+    landform=dune: Tag:landform=dune
+    landform=dune_system: Tag:landform=dune system
     landmark=beacon: Tag:landmark=beacon
     landmark=cairn: Tag:landmark=cairn
     landmark=cemetery: Tag:landmark=cemetery
@@ -7445,6 +8694,7 @@ en:
     landuse=conservation: Tag:landuse=conservation
     landuse=construction: Tag:landuse=construction
     landuse=depot: Tag:landuse=depot
+    landuse=education: Tag:landuse=education
     landuse=farm: Tag:landuse=farm
     landuse=farmland: Tag:landuse=farmland
     landuse=farmyard: Tag:landuse=farmyard
@@ -7459,8 +8709,8 @@ en:
     landuse=greenhouse_horticulture: Tag:landuse=greenhouse horticulture
     landuse=harbour: Tag:landuse=harbour
     landuse=highway: Tag:landuse=highway
-    landuse=hop_garden: Tag:landuse=hop garden
     landuse=industrial: Tag:landuse=industrial
+    landuse=institutional: Tag:landuse=institutional
     landuse=landfill: Tag:landuse=landfill
     landuse=logging: Tag:landuse=logging
     landuse=meadow: Tag:landuse=meadow
@@ -7478,7 +8728,9 @@ en:
     landuse=railway: Tag:landuse=railway
     landuse=recreation_ground: Tag:landuse=recreation ground
     landuse=religious: Tag:landuse=religious
+    landuse=research: Tag:landuse=research
     landuse=reservoir: Tag:landuse=reservoir
+    landuse=reservoir_watershed: Tag:landuse=reservoir watershed
     landuse=residential: Tag:landuse=residential
     landuse=retail: Tag:landuse=retail
     landuse=salt_pond: Tag:landuse=salt pond
@@ -7496,6 +8748,7 @@ en:
     landuse=wood: Tag:landuse=wood
     landuse=wood_(Don't_use): Tag:landuse=wood (Don't use)
     lane=buffered: Tag:lane=buffered
+    lawyer=notary: Tag:lawyer=notary
     leaf_cycle=deciduous: Tag:leaf cycle=deciduous
     leaf_cycle=evergreen: Tag:leaf cycle=evergreen
     leaf_cycle=mixed: Tag:leaf cycle=mixed
@@ -7510,6 +8763,7 @@ en:
     leisure=amusement_arcade: Tag:leisure=amusement arcade
     leisure=arena: Tag:leisure=arena
     leisure=bandstand: Tag:leisure=bandstand
+    leisure=barefoot: Tag:leisure=barefoot
     leisure=bathing_place: Tag:leisure=bathing place
     leisure=bbq: Tag:leisure=bbq
     leisure=beach: Tag:leisure=beach
@@ -7537,6 +8791,7 @@ en:
     leisure=horse_riding: Tag:leisure=horse riding
     leisure=hot_spring: Tag:leisure=hot spring
     leisure=ice_rink: Tag:leisure=ice rink
+    leisure=indoor_play: Tag:leisure=indoor play
     leisure=landscape_reserve: Tag:leisure=landscape reserve
     leisure=marina: Tag:leisure=marina
     leisure=miniature_golf: Tag:leisure=miniature golf
@@ -7554,6 +8809,7 @@ en:
     leisure=resort: Tag:leisure=resort
     leisure=sailing_club: Tag:leisure=sailing club
     leisure=sauna: Tag:leisure=sauna
+    leisure=schoolyard: Tag:leisure=schoolyard
     leisure=shooting_ground: Tag:leisure=shooting ground
     leisure=ski_playground: Tag:leisure=ski playground
     leisure=slipway: Tag:leisure=slipway
@@ -7571,6 +8827,7 @@ en:
     leisure=trampoline_park: Tag:leisure=trampoline park
     leisure=turkish_bath: Tag:leisure=turkish bath
     leisure=video_arcade: Tag:leisure=video arcade
+    leisure=village_swing: Tag:leisure=village swing
     leisure=water_park: Tag:leisure=water park
     leisure=wildlife_hide: Tag:leisure=wildlife hide
     level_crossing=automatic_barrier: Tag:level crossing=automatic barrier
@@ -7582,6 +8839,17 @@ en:
     line=bay: Tag:line=bay
     line=busbar: Tag:line=busbar
     line=substation: Tag:line=substation
+    line_attachment=anchor: Tag:line attachment=anchor
+    line_attachment=pin: Tag:line attachment=pin
+    line_attachment=pulley: Tag:line attachment=pulley
+    line_attachment=suspension: Tag:line attachment=suspension
+    line_management=branch: Tag:line management=branch
+    line_management=cross: Tag:line management=cross
+    line_management=split: Tag:line management=split
+    line_management=straight: Tag:line management=straight
+    line_management=termination: Tag:line management=termination
+    line_management=transition: Tag:line management=transition
+    line_management=transpose: Tag:line management=transpose
     lines=phone: Tag:lines=phone
     locality=subtownland: Tag:locality=subtownland
     locality=townland: Tag:locality=townland
@@ -7615,6 +8883,7 @@ en:
     man_made=cross: Tag:man made=cross
     man_made=cut_line: Tag:man made=cut line
     man_made=cutline: Tag:man made=cutline
+    man_made=desalination_plant: Tag:man made=desalination plant
     man_made=dike: Tag:man made=dike
     man_made=dolphin: Tag:man made=dolphin
     man_made=dovecote: Tag:man made=dovecote
@@ -7626,18 +8895,20 @@ en:
     man_made=floating_storage: Tag:man made=floating storage
     man_made=footwear_decontamination: Tag:man made=footwear decontamination
     man_made=frost_fan: Tag:man made=frost fan
+    man_made=gantry: Tag:man made=gantry
     man_made=gas_well: Tag:man made=gas well
     man_made=gasometer: Tag:man made=gasometer
     man_made=geoglyph: Tag:man made=geoglyph
     man_made=goods_conveyor: Tag:man made=goods conveyor
     man_made=graduation_tower: Tag:man made=graduation tower
-    man_made=ground_station: Tag:man made=ground station
     man_made=groyne: Tag:man made=groyne
     man_made=guy: Tag:man made=guy
     man_made=hot_water_tank: Tag:man made=hot water tank
+    man_made=ice_house: Tag:man made=ice house
     man_made=insect_hotel: Tag:man made=insect hotel
     man_made=jetty: Tag:man made=jetty
     man_made=kiln: Tag:man made=kiln
+    man_made=launch_pad: Tag:man made=launch pad
     man_made=levee: Tag:man made=levee
     man_made=lighthouse: Tag:man made=lighthouse
     man_made=manhole: Tag:man made=manhole
@@ -7659,6 +8930,7 @@ en:
     man_made=power_hydro: Tag:man made=power hydro
     man_made=power_nuclear: Tag:man made=power nuclear
     man_made=power_wind: Tag:man made=power wind
+    man_made=pump: Tag:man made=pump
     man_made=pumping_rig: Tag:man made=pumping rig
     man_made=pumping_station: Tag:man made=pumping station
     man_made=qanat: Tag:man made=qanat
@@ -7668,18 +8940,23 @@ en:
     man_made=school_sentry: Tag:man made=school sentry
     man_made=septic_tank: Tag:man made=septic tank
     man_made=silo: Tag:man made=silo
+    man_made=ski_jump: Tag:man made=ski jump
     man_made=snow_cannon: Tag:man made=snow cannon
     man_made=snow_fence: Tag:man made=snow fence
     man_made=snow_net: Tag:man made=snow net
     man_made=spoil_heap: Tag:man made=spoil heap
+    man_made=spring_box: Tag:man made=spring box
     man_made=storage_tank: Tag:man made=storage tank
     man_made=street_cabinet: Tag:man made=street cabinet
     man_made=submarine_cable: Tag:man made=submarine cable
+    man_made=summit_cross: Tag:man made=summit cross
     man_made=surveillance: Tag:man made=surveillance
     man_made=survey_point: Tag:man made=survey point
     man_made=telescope: Tag:man made=telescope
     man_made=tell: Tag:man made=tell
+    man_made=threshing_floor: Tag:man made=threshing floor
     man_made=tower: Tag:man made=tower
+    man_made=tunnel: Tag:man made=tunnel
     man_made=utility_pole: Tag:man made=utility pole
     man_made=wastewater_plant: Tag:man made=wastewater plant
     man_made=water_tank: Tag:man made=water tank
@@ -7696,10 +8973,18 @@ en:
     man_made=works: Tag:man made=works
     manhole=drain: Tag:manhole=drain
     manhole=telecom: Tag:manhole=telecom
+    map_type=topo: Tag:map type=topo
     maritime=yes: Tag:maritime=yes
+    marker=aerial: Tag:marker=aerial
+    marker=ground: Tag:marker=ground
+    marker=pedestal: Tag:marker=pedestal
+    marker=plate: Tag:marker=plate
+    marker=post: Tag:marker=post
+    marker=stone: Tag:marker=stone
+    material=concrete: Tag:material=concrete
     maxheight=default: Tag:maxheight=default
+    maxweight:signed=no: Tag:maxweight:signed=no
     medical=aed: Tag:medical=aed
-    medical=witchdoctor: Tag:medical=witchdoctor
     megalith_type=alignment: Tag:megalith type=alignment
     megalith_type=chamber: Tag:megalith type=chamber
     megalith_type=cist: Tag:megalith type=cist
@@ -7720,6 +9005,7 @@ en:
     memorial:type=stolperstein: Tag:memorial:type=stolperstein
     memorial=blue_plaque: Tag:memorial=blue plaque
     memorial=bust: Tag:memorial=bust
+    memorial=cross: Tag:memorial=cross
     memorial=ghost_bike: Tag:memorial=ghost bike
     memorial=obelisk: Tag:memorial=obelisk
     memorial=plaque: Tag:memorial=plaque
@@ -7737,6 +9023,7 @@ en:
     military=checkpoint: Tag:military=checkpoint
     military=danger_area: Tag:military=danger area
     military=exclusion_zone: Tag:military=exclusion zone
+    military=launchpad: Tag:military=launchpad
     military=naval_base: Tag:military=naval base
     military=nuclear_explosion_site: Tag:military=nuclear explosion site
     military=obstacle_course: Tag:military=obstacle course
@@ -7744,6 +9031,7 @@ en:
     military=range: Tag:military=range
     military=training_area: Tag:military=training area
     military=trench: Tag:military=trench
+    mofa=use_sidepath: Tag:mofa=use sidepath
     mooring=commercial: Tag:mooring=commercial
     mooring=cruise: Tag:mooring=cruise
     mooring=declaration: Tag:mooring=declaration
@@ -7754,9 +9042,11 @@ en:
     mooring=sbm: Tag:mooring=sbm
     mooring=spm: Tag:mooring=spm
     mooring=visitor: Tag:mooring=visitor
+    moped=use_sidepath: Tag:moped=use sidepath
     motorcycle:type=electric: Tag:motorcycle:type=electric
     motorcycle:type=sportbike: Tag:motorcycle:type=sportbike
     mountain_pass=yes: Tag:mountain pass=yes
+    museum=aerospace: Tag:museum=aerospace
     museum=archaeological: Tag:museum=archaeological
     museum=art: Tag:museum=art
     museum=children: Tag:museum=children
@@ -7779,14 +9069,17 @@ en:
     name=Dollarama: Tag:name=Dollarama
     name=Domino's_Pizza: Tag:name=Domino's Pizza
     name=Herfy: Tag:name=Herfy
+    name=Jollibee: Tag:name=Jollibee
     name=KFC: Tag:name=KFC
     name=McDonald's: Tag:name=McDonald's
     name=Subway: Tag:name=Subway
     name=The_Church_of_Jesus_Christ_of_Latter-day_Saints: Tag:name=The Church of Jesus
       Christ of Latter-day Saints
     name=Walmart: Tag:name=Walmart
+    name=Wendy's: Tag:name=Wendy's
     name=Продукты: Tag:name=Продукты
     natural=anthill: Tag:natural=anthill
+    natural=arch: Tag:natural=arch
     natural=arete: Tag:natural=arete
     natural=atoll: Tag:natural=atoll
     natural=avalanche_dam: Tag:natural=avalanche dam
@@ -7796,12 +9089,12 @@ en:
     natural=bedrock: Tag:natural=bedrock
     natural=birds_nest: Tag:natural=birds nest
     natural=blowhole: Tag:natural=blowhole
-    natural=breaker: Tag:natural=breaker
     natural=cape: Tag:natural=cape
     natural=cave_entrance: Tag:natural=cave entrance
     natural=cliff: Tag:natural=cliff
     natural=cloud: Tag:natural=cloud
     natural=coastline: Tag:natural=coastline
+    natural=col: Tag:natural=col
     natural=crater: Tag:natural=crater
     natural=crevasse: Tag:natural=crevasse
     natural=desert: Tag:natural=desert
@@ -7867,11 +9160,18 @@ en:
     natural=water: Tag:natural=water
     natural=wetland: Tag:natural=wetland
     natural=wood: Tag:natural=wood
+    navigationaid=als: Tag:navigationaid=als
+    navigationaid=papi: Tag:navigationaid=papi
+    navigationaid=vasi: Tag:navigationaid=vasi
     nest_platform=yes: Tag:nest platform=yes
     network=BR: Tag:network=BR
     network=BR:ES: Tag:network=BR:ES
     network=BR:MG: Tag:network=BR:MG
     network=BR:PB: Tag:network=BR:PB
+    network=CN:AH: Tag:network=CN:AH
+    network=CN:JS: Tag:network=CN:JS
+    network=CN:national: Tag:network=CN:national
+    network=CR:national: Tag:network=CR:national
     network=Flinkster: Tag:network=Flinkster
     network=JP:national: Tag:network=JP:national
     network=JP:prefectural:nagano: Tag:network=JP:prefectural:nagano
@@ -7883,6 +9183,7 @@ en:
     network=US:CA: Tag:network=US:CA
     network=US:CO: Tag:network=US:CO
     network=US:CT: Tag:network=US:CT
+    network=US:DC: Tag:network=US:DC
     network=US:DE: Tag:network=US:DE
     network=US:FL: Tag:network=US:FL
     network=US:FL:Toll: Tag:network=US:FL:Toll
@@ -7902,6 +9203,7 @@ en:
     network=US:MI: Tag:network=US:MI
     network=US:MN: Tag:network=US:MN
     network=US:MO: Tag:network=US:MO
+    network=US:MO:Supplemental: Tag:network=US:MO:Supplemental
     network=US:MS: Tag:network=US:MS
     network=US:MT: Tag:network=US:MT
     network=US:MT:secondary: Tag:network=US:MT:secondary
@@ -7917,6 +9219,7 @@ en:
     network=US:NJ:Passaic: Tag:network=US:NJ:Passaic
     network=US:NM: Tag:network=US:NM
     network=US:NV: Tag:network=US:NV
+    network=US:NV:Clark: Tag:network=US:NV:Clark
     network=US:NY: Tag:network=US:NY
     network=US:NY:Albany: Tag:network=US:NY:Albany
     network=US:NY:Allegany: Tag:network=US:NY:Allegany
@@ -7965,19 +9268,25 @@ en:
     network=US:OH: Tag:network=US:OH
     network=US:OH:ASD: Tag:network=US:OH:ASD
     network=US:OH:ATH: Tag:network=US:OH:ATH
+    network=US:OH:AUG: Tag:network=US:OH:AUG
     network=US:OH:BEL: Tag:network=US:OH:BEL
     network=US:OH:CAR: Tag:network=US:OH:CAR
     network=US:OH:COL: Tag:network=US:OH:COL
     network=US:OH:COS: Tag:network=US:OH:COS
+    network=US:OH:FAI: Tag:network=US:OH:FAI
     network=US:OH:FAY: Tag:network=US:OH:FAY
     network=US:OH:FUL: Tag:network=US:OH:FUL
+    network=US:OH:GAL: Tag:network=US:OH:GAL
     network=US:OH:GUE: Tag:network=US:OH:GUE
+    network=US:OH:HAM: Tag:network=US:OH:HAM
     network=US:OH:HAR: Tag:network=US:OH:HAR
     network=US:OH:HAS: Tag:network=US:OH:HAS
     network=US:OH:HEN: Tag:network=US:OH:HEN
     network=US:OH:HOC: Tag:network=US:OH:HOC
     network=US:OH:HOL: Tag:network=US:OH:HOL
     network=US:OH:JEF: Tag:network=US:OH:JEF
+    network=US:OH:KNO: Tag:network=US:OH:KNO
+    network=US:OH:LAW: Tag:network=US:OH:LAW
     network=US:OH:LIC: Tag:network=US:OH:LIC
     network=US:OH:LOG: Tag:network=US:OH:LOG
     network=US:OH:LOG:Jefferson: Tag:network=US:OH:LOG:Jefferson
@@ -7985,6 +9294,7 @@ en:
     network=US:OH:LOG:Monroe: Tag:network=US:OH:LOG:Monroe
     network=US:OH:LOG:Pleasant: Tag:network=US:OH:LOG:Pleasant
     network=US:OH:LUC: Tag:network=US:OH:LUC
+    network=US:OH:MAD: Tag:network=US:OH:MAD
     network=US:OH:MAH: Tag:network=US:OH:MAH
     network=US:OH:MED: Tag:network=US:OH:MED
     network=US:OH:MED:Harrisville: Tag:network=US:OH:MED:Harrisville
@@ -7992,12 +9302,14 @@ en:
     network=US:OH:MED:Sharon: Tag:network=US:OH:MED:Sharon
     network=US:OH:MED:Wadsworth: Tag:network=US:OH:MED:Wadsworth
     network=US:OH:MOE: Tag:network=US:OH:MOE
+    network=US:OH:MRG: Tag:network=US:OH:MRG
     network=US:OH:MRW: Tag:network=US:OH:MRW
     network=US:OH:OTT: Tag:network=US:OH:OTT
     network=US:OH:PAU: Tag:network=US:OH:PAU
     network=US:OH:PER: Tag:network=US:OH:PER
     network=US:OH:POR: Tag:network=US:OH:POR
     network=US:OH:SAN:Fremont: Tag:network=US:OH:SAN:Fremont
+    network=US:OH:SCI: Tag:network=US:OH:SCI
     network=US:OH:SEN: Tag:network=US:OH:SEN
     network=US:OH:STA: Tag:network=US:OH:STA
     network=US:OH:SUM: Tag:network=US:OH:SUM
@@ -8015,6 +9327,7 @@ en:
     network=US:OK: Tag:network=US:OK
     network=US:OR: Tag:network=US:OR
     network=US:PA: Tag:network=US:PA
+    network=US:PA:Turnpike: Tag:network=US:PA:Turnpike
     network=US:RI: Tag:network=US:RI
     network=US:SC: Tag:network=US:SC
     network=US:SD: Tag:network=US:SD
@@ -8024,12 +9337,16 @@ en:
     network=US:TX:FM: Tag:network=US:TX:FM
     network=US:TX:Loop: Tag:network=US:TX:Loop
     network=US:TX:NASA: Tag:network=US:TX:NASA
+    network=US:TX:Park: Tag:network=US:TX:Park
     network=US:TX:RM: Tag:network=US:TX:RM
+    network=US:TX:Recreational: Tag:network=US:TX:Recreational
     network=US:TX:Spur: Tag:network=US:TX:Spur
     network=US:TX:Wood: Tag:network=US:TX:Wood
     network=US:US: Tag:network=US:US
     network=US:UT: Tag:network=US:UT
     network=US:VA: Tag:network=US:VA
+    network=US:VA:Secondary: Tag:network=US:VA:Secondary
+    network=US:VA:secondary: Tag:network=US:VA:secondary
     network=US:VT: Tag:network=US:VT
     network=US:WA: Tag:network=US:WA
     network=US:WI: Tag:network=US:WI
@@ -8038,11 +9355,14 @@ en:
     network=US:WV:McDowell: Tag:network=US:WV:McDowell
     network=US:WV:Mercer: Tag:network=US:WV:Mercer
     network=US:WY: Tag:network=US:WY
+    network=VE:L:PO: Tag:network=VE:L:PO
     network=VE:R:PO: Tag:network=VE:R:PO
+    network=VE:T:PO: Tag:network=VE:T:PO
     network=VE:ramal:portuguesa: Tag:network=VE:ramal:portuguesa
     network=call-a-bike: Tag:network=call-a-bike
     network=cambio/stadtmobil: Tag:network=cambio/stadtmobil
     network=cambio_stadtmobil: Tag:network=cambio stadtmobil
+    network=e-waterway: Tag:network=e-waterway
     network=icn: Tag:network=icn
     network=iwn: Tag:network=iwn
     network=jp:national: Tag:network=jp:national
@@ -8060,8 +9380,11 @@ en:
     network=rmn: Tag:network=rmn
     network=rpn: Tag:network=rpn
     network=rwn: Tag:network=rwn
+    nhd:fcode=46003: Tag:nhd:fcode=46003
+    nhd:ftype=StreamRiver: Tag:nhd:ftype=StreamRiver
     noexit=no: Tag:noexit=no
     observatory:type=astronomical: Tag:observatory:type=astronomical
+    observatory:type=gravitational: Tag:observatory:type=gravitational
     observatory:type=meteorological: Tag:observatory:type=meteorological
     odbl=clean: Tag:odbl=clean
     office:realtor: Tag:office:realtor
@@ -8074,6 +9397,7 @@ en:
     office=bail_bond_agent: Tag:office=bail bond agent
     office=charity: Tag:office=charity
     office=company: Tag:office=company
+    office=consulting: Tag:office=consulting
     office=coworking: Tag:office=coworking
     office=diplomatic: Tag:office=diplomatic
     office=educational_institution: Tag:office=educational institution
@@ -8086,11 +9410,15 @@ en:
     office=foundation: Tag:office=foundation
     office=geodesist: Tag:office=geodesist
     office=government: Tag:office=government
+    office=graphic_design: Tag:office=graphic design
     office=guide: Tag:office=guide
+    office=healthcare: Tag:office=healthcare
     office=insurance: Tag:office=insurance
+    office=international_organization: Tag:office=international organization
     office=it: Tag:office=it
     office=lawyer: Tag:office=lawyer
     office=logistics: Tag:office=logistics
+    office=medical: Tag:office=medical
     office=moving_company: Tag:office=moving company
     office=newspaper: Tag:office=newspaper
     office=ngo: Tag:office=ngo
@@ -8107,6 +9435,8 @@ en:
     office=register: Tag:office=register
     office=religion: Tag:office=religion
     office=research: Tag:office=research
+    office=security: Tag:office=security
+    office=supervised_injection_site: Tag:office=supervised injection site
     office=surveyor: Tag:office=surveyor
     office=tax: Tag:office=tax
     office=tax_advisor: Tag:office=tax advisor
@@ -8114,24 +9444,34 @@ en:
     office=therapist: Tag:office=therapist
     office=tourist_accommodation: Tag:office=tourist accommodation
     office=travel_agent: Tag:office=travel agent
+    office=union: Tag:office=union
+    office=university: Tag:office=university
     office=visa: Tag:office=visa
     office=water_utility: Tag:office=water utility
     office=yes: Tag:office=yes
+    oneway:bicycle=yes: Tag:oneway:bicycle=yes
+    oneway=-1: Tag:oneway=-1
     oneway=alternating: Tag:oneway=alternating
     oneway=reversible: Tag:oneway=reversible
     opening_hours:signed=no: Tag:opening hours:signed=no
+    operational_status=closed: Tag:operational status=closed
     operator=Cambio: Tag:operator=Cambio
     operator=CiteeCar: Tag:operator=CiteeCar
     operator=Drive_Carsharing: Tag:operator=Drive Carsharing
     operator=Flinkster: Tag:operator=Flinkster
+    operator=GRDF: Tag:operator=GRDF
     operator=Stadtmobil: Tag:operator=Stadtmobil
     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
     parking:lane:hgv=on_street: Tag:parking:lane:hgv=on street
+    parking=lane: Tag:parking=lane
+    parking=layby: Tag:parking=layby
     parking=multi-storey: Tag:parking=multi-storey
+    parking=street_side: Tag:parking=street side
     parking=surface: Tag:parking=surface
     parking=underground: Tag:parking=underground
     passenger=international: Tag:passenger=international
@@ -8142,7 +9482,9 @@ en:
     passenger=suburban: Tag:passenger=suburban
     passenger=urban: Tag:passenger=urban
     passenger=yes: Tag:passenger=yes
+    path=crossing: Tag:path=crossing
     path=desire: Tag:path=desire
+    physically_present=no: Tag:physically present=no
     pilotage=boarding_point: Tag:pilotage=boarding point
     pilotage=office: Tag:pilotage=office
     pipeline=marker: Tag:pipeline=marker
@@ -8152,6 +9494,8 @@ en:
     piste:type=connection: Tag:piste:type=connection
     piste:type=downhill: Tag:piste:type=downhill
     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
     place=allotments: Tag:place=allotments
     place=archipelago: Tag:place=archipelago
     place=borough: Tag:place=borough
@@ -8183,8 +9527,14 @@ en:
     place=village: Tag:place=village
     placement=right_of:1: Tag:placement=right of:1
     placement=transition: Tag:placement=transition
+    plant:method=combustion: Tag:plant:method=combustion
+    plant:method=gasification: Tag:plant:method=gasification
     plant:method=photovoltaic: Tag:plant:method=photovoltaic
+    plant:method=run-of-the-river: Tag:plant:method=run-of-the-river
     plant:method=thermal: Tag:plant:method=thermal
+    plant:method=water-pumped-storage: Tag:plant:method=water-pumped-storage
+    plant:method=water-storage: Tag:plant:method=water-storage
+    plant:source=battery: Tag:plant:source=battery
     plant:source=biomass: Tag:plant:source=biomass
     plant:source=coal: Tag:plant:source=coal
     plant:source=gas: Tag:plant:source=gas
@@ -8195,9 +9545,14 @@ en:
     plant:source=solar: Tag:plant:source=solar
     plant:source=waste: Tag:plant:source=waste
     plant:source=wind: Tag:plant:source=wind
+    plant:type=combined_cycle: Tag:plant:type=combined cycle
+    plant:type=gas_turbine: Tag:plant:type=gas turbine
+    plant:type=solar_photovoltaic_panel: Tag:plant:type=solar photovoltaic panel
+    plant:type=steam_turbine: Tag:plant:type=steam turbine
     playground=slide: Tag:playground=slide
     playground=structure: Tag:playground=structure
     pole=transition: Tag:pole=transition
+    police=academy: Tag:police=academy
     police=barracks: Tag:police=barracks
     police=car_pound: Tag:police=car pound
     police=car_repair: Tag:police=car repair
@@ -8214,7 +9569,9 @@ en:
     power=cable: Tag:power=cable
     power=cable_distribution_cabinet: Tag:power=cable distribution cabinet
     power=catenary_mast: Tag:power=catenary mast
+    power=circuit: Tag:power=circuit
     power=compensator: Tag:power=compensator
+    power=connection: Tag:power=connection
     power=converter: Tag:power=converter
     power=generator: Tag:power=generator
     power=grounding: Tag:power=grounding
@@ -8242,6 +9599,16 @@ en:
     prison_camp=concentration_camp: Tag:prison camp=concentration camp
     prison_camp=extermination_camp: Tag:prison camp=extermination camp
     private=employees: Tag:private=employees
+    protect_class=19: Tag:protect class=19
+    protect_class=1a: Tag:protect class=1a
+    protect_class=1b: Tag:protect class=1b
+    protect_class=2: Tag:protect class=2
+    protect_class=21: Tag:protect class=21
+    protect_class=3: Tag:protect class=3
+    protect_class=4: Tag:protect class=4
+    protect_class=5: Tag:protect class=5
+    protect_class=6: Tag:protect class=6
+    protected_area=nature_reserve: Tag:protected area=nature reserve
     pseudo=yes: Tag:pseudo=yes
     psv=designated: Tag:psv=designated
     public_transport=pay_scale_area: Tag:public transport=pay scale area
@@ -8272,6 +9639,7 @@ en:
     radio_transponder:category=directional: Tag:radio transponder:category=directional
     radio_transponder:category=rotating_pattern: Tag:radio transponder:category=rotating
       pattern
+    railway:radio=gsm-r: Tag:railway:radio=gsm-r
     railway=PRT: Tag:railway=PRT
     railway=Subway: Tag:railway=Subway
     railway=abandoned: Tag:railway=abandoned
@@ -8305,7 +9673,10 @@ en:
     railway=subway: Tag:railway=subway
     railway=subway_entrance: Tag:railway=subway entrance
     railway=switch: Tag:railway=switch
+    railway=train_station_entrance: Tag:railway=train station entrance
     railway=tram: Tag:railway=tram
+    railway=tram_crossing: Tag:railway=tram crossing
+    railway=tram_level_crossing: Tag:railway=tram level crossing
     railway=tram_stop: Tag:railway=tram stop
     railway=traverser: Tag:railway=traverser
     railway=turntable: Tag:railway=turntable
@@ -8313,7 +9684,10 @@ en:
     railway=water_crane: Tag:railway=water crane
     railway=water_tower: Tag:railway=water tower
     railway=yard: Tag:railway=yard
+    reclaimed=yes: Tag:reclaimed=yes
+    recycling_type=centre: Tag:recycling type=centre
     refitted=yes: Tag:refitted=yes
+    refugee=yes: Tag:refugee=yes
     religion=buddhist: Tag:religion=buddhist
     religion=christian: Tag:religion=christian
     religion=hindu: Tag:religion=hindu
@@ -8327,10 +9701,15 @@ en:
     religion=sikh: Tag:religion=sikh
     religion=taoist: Tag:religion=taoist
     religion=zoroastrian: Tag:religion=zoroastrian
+    rental=appliance: Tag:rental=appliance
     rental=ski: Tag:rental=ski
     rental=strandkorb: Tag:rental=strandkorb
     rental=trailer: Tag:rental=trailer
     repair=assisted_self_service: Tag:repair=assisted self service
+    request_stop=yes: Tag:request stop=yes
+    research=aerospace: Tag:research=aerospace
+    residential=apartments: Tag:residential=apartments
+    residential=halting_site: Tag:residential=halting site
     residential=rural: Tag:residential=rural
     residential=university: Tag:residential=university
     residential=urban: Tag:residential=urban
@@ -8338,9 +9717,11 @@ en:
     resource=gravel: Tag:resource=gravel
     resource=sand: Tag:resource=sand
     rfr=yes: Tag:rfr=yes
+    road_marking=solid_stop_line: Tag:road marking=solid stop line
     roller_coaster=track: Tag:roller coaster=track
     route=aqueduct: Tag:route=aqueduct
     route=bicycle: Tag:route=bicycle
+    route=boat: Tag:route=boat
     route=bus: Tag:route=bus
     route=canal: Tag:route=canal
     route=canoe: Tag:route=canoe
@@ -8358,6 +9739,7 @@ en:
     route=minibus: Tag:route=minibus
     route=monorail: Tag:route=monorail
     route=motorboat: Tag:route=motorboat
+    route=mtb: Tag:route=mtb
     route=ncn: Tag:route=ncn
     route=nordic_walking: Tag:route=nordic walking
     route=pipeline: Tag:route=pipeline
@@ -8367,12 +9749,14 @@ en:
     route=running: Tag:route=running
     route=share_taxi: Tag:route=share taxi
     route=ski: Tag:route=ski
+    route=snowmobile: Tag:route=snowmobile
     route=subway: Tag:route=subway
     route=tracks: Tag:route=tracks
     route=train: Tag:route=train
     route=tram: Tag:route=tram
     route=transhumance: Tag:route=transhumance
     route=trolleybus: Tag:route=trolleybus
+    route=waterway: Tag:route=waterway
     route=worship: Tag:route=worship
     sailing:tours=yes: Tag:sailing:tours=yes
     seamark:beacon_cardinal:colour_pattern=horizontal: Tag:seamark:beacon cardinal:colour
@@ -8482,6 +9866,8 @@ en:
     seamark:distance_mark:category=board: Tag:seamark:distance mark:category=board
     seamark:distance_mark:category=not_installed: Tag:seamark:distance mark:category=not
       installed
+    seamark:distance_mark:units=hectometres: Tag:seamark:distance mark:units=hectometres
+    seamark:distance_mark:units=kilometres: Tag:seamark:distance mark:units=kilometres
     seamark:fog_signal:category=bell: Tag:seamark:fog signal:category=bell
     seamark:fog_signal:category=diaphone: Tag:seamark:fog signal:category=diaphone
     seamark:fog_signal:category=explosive: Tag:seamark:fog signal:category=explosive
@@ -8510,7 +9896,6 @@ en:
     seamark:landmark:category=spire: Tag:seamark:landmark:category=spire
     seamark:landmark:category=statue: Tag:seamark:landmark:category=statue
     seamark:landmark:category=tower: Tag:seamark:landmark:category=tower
-    seamark:landmark:category=water_tower: Tag:seamark:landmark:category=water tower
     seamark:landmark:category=windmill: Tag:seamark:landmark:category=windmill
     seamark:landmark:category=windmotor: Tag:seamark:landmark:category=windmotor
     seamark:landmark:category=windsock: Tag:seamark:landmark:category=windsock
@@ -8693,23 +10078,30 @@ en:
     service=aircraft_control: Tag:service=aircraft control
     service=alley: Tag:service=alley
     service=bus: Tag:service=bus
+    service=busway: Tag:service=busway
     service=crossover: Tag:service=crossover
+    service=dealer: Tag:service=dealer
     service=drive-through: Tag:service=drive-through
     service=drive_through: Tag:service=drive through
     service=driveway: Tag:service=driveway
+    service=driveway2: Tag:service=driveway2
     service=emergency_access: Tag:service=emergency access
     service=irrigation: Tag:service=irrigation
     service=parking_aisle: Tag:service=parking aisle
     service=parts: Tag:service=parts
+    service=repair: Tag:service=repair
     service=siding: Tag:service=siding
     service=spur: Tag:service=spur
+    service=tyres: Tag:service=tyres
     service=yard: Tag:service=yard
     shelter_type=basic_hut: Tag:shelter type=basic hut
     shelter_type=field_shelter: Tag:shelter type=field shelter
     shelter_type=lean_to: Tag:shelter type=lean to
     shelter_type=picnic_shelter: Tag:shelter type=picnic shelter
     shelter_type=public_transport: Tag:shelter type=public transport
+    shelter_type=weather_shelter: Tag:shelter type=weather shelter
     shop=*: Tag:shop=*
+    shop=3d_printing: Tag:shop=3d printing
     shop=Alko: Tag:shop=Alko
     shop=_business_machines: Tag:shop= business machines
     shop=adult: Tag:shop=adult
@@ -8838,8 +10230,10 @@ en:
     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
     shop=hookah: Tag:shop=hookah
     shop=household_linen: Tag:shop=household linen
     shop=houseware: Tag:shop=houseware
@@ -8871,16 +10265,19 @@ en:
     shop=military_surplus: Tag:shop=military surplus
     shop=mobile_home: Tag:shop=mobile home
     shop=mobile_phone: Tag:shop=mobile phone
+    shop=mobility_scooter: Tag:shop=mobility scooter
     shop=model: Tag:shop=model
     shop=money_lender: Tag:shop=money lender
     shop=moneylender: Tag:shop=moneylender
     shop=motorcycle: Tag:shop=motorcycle
+    shop=motorcycle_parts: Tag:shop=motorcycle parts
     shop=motorcycle_repair: Tag:shop=motorcycle repair
     shop=motorhome: Tag:shop=motorhome
     shop=music: Tag:shop=music
     shop=musical_instrument: Tag:shop=musical instrument
     shop=musical_instruments: Tag:shop=musical instruments
     shop=newsagent: Tag:shop=newsagent
+    shop=no: Tag:shop=no
     shop=nutrition_supplements: Tag:shop=nutrition supplements
     shop=nuts: Tag:shop=nuts
     shop=office_supplies: Tag:shop=office supplies
@@ -8905,13 +10302,16 @@ en:
     shop=pottery: Tag:shop=pottery
     shop=printer_ink: Tag:shop=printer ink
     shop=printing: Tag:shop=printing
+    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
     shop=rental: Tag:shop=rental
+    shop=rice: Tag:shop=rice
     shop=robot: Tag:shop=robot
+    shop=scooter: Tag:shop=scooter
     shop=scuba_diving: Tag:shop=scuba diving
     shop=seafood: Tag:shop=seafood
     shop=second_hand: Tag:shop=second hand
@@ -8921,6 +10321,7 @@ en:
     shop=shoe_repair: Tag:shop=shoe repair
     shop=shoes: Tag:shop=shoes
     shop=shopping_centre: Tag:shop=shopping centre
+    shop=skate: Tag:shop=skate
     shop=ski: Tag:shop=ski
     shop=snowmobile: Tag:shop=snowmobile
     shop=solarium: Tag:shop=solarium
@@ -8932,6 +10333,7 @@ en:
     shop=storage_rental: Tag:shop=storage rental
     shop=street_vendor: Tag:shop=street vendor
     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
@@ -8942,12 +10344,16 @@ en:
     shop=tiles: Tag:shop=tiles
     shop=tobacco: Tag:shop=tobacco
     shop=tool_hire: Tag:shop=tool hire
+    shop=tools: Tag:shop=tools
     shop=toy: Tag:shop=toy
     shop=toys: Tag:shop=toys
+    shop=tractor: Tag:shop=tractor
     shop=trade: Tag:shop=trade
     shop=trailer: Tag:shop=trailer
     shop=travel_agency: Tag:shop=travel agency
     shop=trophy: Tag:shop=trophy
+    shop=truck: Tag:shop=truck
+    shop=truck_repair: Tag:shop=truck repair
     shop=tyres: Tag:shop=tyres
     shop=underwear: Tag:shop=underwear
     shop=vacant: Tag:shop=vacant
@@ -8984,11 +10390,13 @@ en:
     signal_station=time: Tag:signal station=time
     signal_station=traffic: Tag:signal station=traffic
     signal_station=weather: Tag:signal station=weather
+    signpost=forestry_compartment: Tag:signpost=forestry compartment
     sinkhole=bluehole: Tag:sinkhole=bluehole
     sinkhole=doline: Tag:sinkhole=doline
     sinkhole=estavelle: Tag:sinkhole=estavelle
     sinkhole=pit: Tag:sinkhole=pit
     sinkhole=ponor: Tag:sinkhole=ponor
+    site=parking: Tag:site=parking
     site=piste: Tag:site=piste
     site_type=bigstone: Tag:site type=bigstone
     site_type=city: Tag:site type=city
@@ -9024,6 +10432,7 @@ en:
     source:geometry=NPWS_Estate: Tag:source:geometry=NPWS Estate
     source:geometry=NSW_LPI_Base_Map: Tag:source:geometry=NSW LPI Base Map
     source:geometry=NSW_LPI_Imagery: Tag:source:geometry=NSW LPI Imagery
+    source:geometry=PSMA_Admin_Boundaries: Tag:source:geometry=PSMA Admin Boundaries
     source:maxspeed=implicit: Tag:source:maxspeed=implicit
     source:name=LPI_NSW_Base_Map: Tag:source:name=LPI NSW Base Map
     source:name=NPWS_Estate: Tag:source:name=NPWS Estate
@@ -9050,10 +10459,13 @@ en:
     source=NSW_LPI_Imagery: Tag:source=NSW LPI Imagery
     source=Naturbase: Tag:source=Naturbase
     source=PGS: Tag:source=PGS
+    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
       Boundaries
     source=Schadow1_Expeditions: Tag:source=Schadow1 Expeditions
+    source=Swedish_Environmental_Agency_Trails: Tag:source=Swedish Environmental Agency
+      Trails
     source=VicMap_ParkRes: Tag:source=VicMap ParkRes
     source=YahooJapan/ALPSMAP: Tag:source=YahooJapan/ALPSMAP
     source=gurs: Tag:source=gurs
@@ -9075,6 +10487,7 @@ en:
     sport=basketball: Tag:sport=basketball
     sport=batting_cage: Tag:sport=batting cage
     sport=beachvolleyball: Tag:sport=beachvolleyball
+    sport=biathlon: Tag:sport=biathlon
     sport=billards: Tag:sport=billards
     sport=billiards: Tag:sport=billiards
     sport=bmx: Tag:sport=bmx
@@ -9082,10 +10495,12 @@ en:
     sport=boules: Tag:sport=boules
     sport=bowls: Tag:sport=bowls
     sport=boxing: Tag:sport=boxing
+    sport=bullfighting: Tag:sport=bullfighting
     sport=canadian_football: Tag:sport=canadian football
     sport=canoe: Tag:sport=canoe
     sport=canoe_polo: Tag:sport=canoe polo
     sport=chess: Tag:sport=chess
+    sport=chinlone: Tag:sport=chinlone
     sport=cliff_diving: Tag:sport=cliff diving
     sport=climbing: Tag:sport=climbing
     sport=climbing_adventure: Tag:sport=climbing adventure
@@ -9093,18 +10508,21 @@ en:
     sport=cricket: Tag:sport=cricket
     sport=cricket_nets: Tag:sport=cricket nets
     sport=croquet: Tag:sport=croquet
+    sport=crossfit: Tag:sport=crossfit
     sport=curling: Tag:sport=curling
     sport=cycling: Tag:sport=cycling
     sport=dancing: Tag:sport=dancing
     sport=darts: Tag:sport=darts
     sport=disc_golf: Tag:sport=disc golf
     sport=diving: Tag:sport=diving
+    sport=dog_agility: Tag:sport=dog agility
     sport=dog_racing: Tag:sport=dog racing
     sport=equestrian: Tag:sport=equestrian
     sport=fencing: Tag:sport=fencing
     sport=field_hockey: Tag:sport=field hockey
     sport=fitness: Tag:sport=fitness
     sport=fives: Tag:sport=fives
+    sport=floorball: Tag:sport=floorball
     sport=footballgolf: Tag:sport=footballgolf
     sport=free_flying: Tag:sport=free flying
     sport=futsal: Tag:sport=futsal
@@ -9123,15 +10541,21 @@ en:
     sport=judo: Tag:sport=judo
     sport=karate: Tag:sport=karate
     sport=karting: Tag:sport=karting
+    sport=kickboxing: Tag:sport=kickboxing
     sport=kitesurfing: Tag:sport=kitesurfing
     sport=korfball: Tag:sport=korfball
+    sport=krachtbal: Tag:sport=krachtbal
     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=miniature_golf: Tag:sport=miniature golf
     sport=model_aerodrome: Tag:sport=model aerodrome
     sport=motocross: Tag:sport=motocross
     sport=motor: Tag:sport=motor
     sport=multi: Tag:sport=multi
     sport=netball: Tag:sport=netball
+    sport=nine_mens_morris: Tag:sport=nine mens morris
     sport=obstacle_course: Tag:sport=obstacle course
     sport=orienteering: Tag:sport=orienteering
     sport=paddle_tennis: Tag:sport=paddle tennis
@@ -9139,10 +10563,18 @@ en:
     sport=paintball: Tag:sport=paintball
     sport=parachuting: Tag:sport=parachuting
     sport=paragliding: Tag:sport=paragliding
+    sport=parkour: Tag:sport=parkour
     sport=pelota: Tag:sport=pelota
+    sport=pesäpallo: Tag:sport=pesäpallo
+    sport=petanque: Tag:sport=petanque
+    sport=pickeball: Tag:sport=pickeball
+    sport=pickleball: Tag:sport=pickleball
+    sport=pilates: Tag:sport=pilates
     sport=pole_dance: Tag:sport=pole dance
+    sport=polo: Tag:sport=polo
     sport=racquet: Tag:sport=racquet
     sport=rc_car: Tag:sport=rc car
+    sport=roller_hockey: Tag:sport=roller hockey
     sport=roller_skating: Tag:sport=roller skating
     sport=rowing: Tag:sport=rowing
     sport=rugby: Tag:sport=rugby
@@ -9154,10 +10586,16 @@ en:
     sport=shooting: Tag:sport=shooting
     sport=shooting_range: Tag:sport=shooting range
     sport=shot-put: Tag:sport=shot-put
+    sport=shuffleboard: Tag:sport=shuffleboard
     sport=skateboard: Tag:sport=skateboard
     sport=skating: Tag:sport=skating
+    sport=ski_jumping: Tag:sport=ski jumping
     sport=skiing: Tag:sport=skiing
+    sport=snooker: Tag:sport=snooker
     sport=soccer: Tag:sport=soccer
+    sport=softball: Tag:sport=softball
+    sport=speedway: Tag:sport=speedway
+    sport=squash: Tag:sport=squash
     sport=sumo: Tag:sport=sumo
     sport=surfing: Tag:sport=surfing
     sport=swimming: Tag:sport=swimming
@@ -9168,7 +10606,9 @@ en:
     sport=tennis: Tag:sport=tennis
     sport=toboggan: Tag:sport=toboggan
     sport=trampoline: Tag:sport=trampoline
+    sport=ultimate: Tag:sport=ultimate
     sport=volleyball: Tag:sport=volleyball
+    sport=wakeboarding: Tag:sport=wakeboarding
     sport=water_polo: Tag:sport=water polo
     sport=water_ski: Tag:sport=water ski
     sport=weightlifting: Tag:sport=weightlifting
@@ -9181,6 +10621,12 @@ en:
     station=funicular: Tag:station=funicular
     station=light_rail: Tag:station=light rail
     station=subway: Tag:station=subway
+    stream=intermittent: Tag:stream=intermittent
+    street_vendor=yes: Tag:street vendor=yes
+    studio=audio: Tag:studio=audio
+    studio=radio: Tag:studio=radio
+    studio=television: Tag:studio=television
+    studio=video: Tag:studio=video
     submarine=yes: Tag:submarine=yes
     substation=compensation: Tag:substation=compensation
     substation=converter: Tag:substation=converter
@@ -9193,7 +10639,10 @@ en:
     substation=transition: Tag:substation=transition
     substation=transmission: Tag:substation=transmission
     summit:cross=yes: Tag:summit:cross=yes
+    surface=acrylic: Tag:surface=acrylic
+    surface=artificial_turf: Tag:surface=artificial turf
     surface=asphalt: Tag:surface=asphalt
+    surface=clay: Tag:surface=clay
     surface=cobblestone: Tag:surface=cobblestone
     surface=compacted: Tag:surface=compacted
     surface=concrete: Tag:surface=concrete
@@ -9202,7 +10651,9 @@ en:
     surface=metal: Tag:surface=metal
     surface=paved: Tag:surface=paved
     surface=paving_stones: Tag:surface=paving stones
+    surface=rock: Tag:surface=rock
     surface=sett: Tag:surface=sett
+    surface=tartan: Tag:surface=tartan
     surface=unhewn_cobblestone: Tag:surface=unhewn cobblestone
     surface=unpaved: Tag:surface=unpaved
     surface=wood: Tag:surface=wood
@@ -9211,15 +10662,21 @@ en:
     switch=disconnector: Tag:switch=disconnector
     switch=earthing: Tag:switch=earthing
     switch=mechanical: Tag:switch=mechanical
+    tactile_paving=incorrect: Tag:tactile paving=incorrect
+    tactile_paving=no: Tag:tactile paving=no
+    tactile_paving=partial: Tag:tactile paving=partial
+    tactile_paving=yes: Tag:tactile paving=yes
     tank_trap=czech_hedgehog: Tag:tank trap=czech hedgehog
     telecom:medium=coaxial: Tag:telecom:medium=coaxial
     telecom:medium=copper: Tag:telecom:medium=copper
     telecom:medium=fibre: Tag:telecom:medium=fibre
+    telecom=antenna: Tag:telecom=antenna
     telecom=connection_point: Tag:telecom=connection point
     telecom=cross-connect: Tag:telecom=cross-connect
     telecom=data_center: Tag:telecom=data center
     telecom=data_centre: Tag:telecom=data centre
     telecom=datacenter: Tag:telecom=datacenter
+    telecom=distribution_point: Tag:telecom=distribution point
     telecom=exchange: Tag:telecom=exchange
     telecom=remote_digital_terminal: Tag:telecom=remote digital terminal
     telecom=remote_terminal: Tag:telecom=remote terminal
@@ -9227,15 +10684,22 @@ en:
     telescope:type=optical: Tag:telescope:type=optical
     telescope:type=radio: Tag:telescope:type=radio
     theatre:type=amphi: Tag:theatre:type=amphi
+    theatre:type=concert_hall: Tag:theatre:type=concert hall
     theatre:type=open_air: Tag:theatre:type=open air
+    theatre:type=opera_house: Tag:theatre:type=opera house
     tickets:public_transport_subscription=yes: Tag:tickets:public transport subscription=yes
+    toll=yes: Tag:toll=yes
+    tomb=cenotaph: Tag:tomb=cenotaph
     tomb=columbarium: Tag:tomb=columbarium
     tomb=crypt: Tag:tomb=crypt
     tomb=hypogeum: Tag:tomb=hypogeum
     tomb=mausoleum: Tag:tomb=mausoleum
+    tomb=obelisk: Tag:tomb=obelisk
+    tomb=pillar: Tag:tomb=pillar
     tomb=pyramid: Tag:tomb=pyramid
     tomb=rock-cut: Tag:tomb=rock-cut
     tomb=sarcophagus: Tag:tomb=sarcophagus
+    tomb=table: Tag:tomb=table
     tomb=tumulus: Tag:tomb=tumulus
     tomb=vault: Tag:tomb=vault
     tomb=war_grave: Tag:tomb=war grave
@@ -9290,14 +10754,28 @@ en:
     tower:type=observation: Tag:tower:type=observation
     tower:type=radar: Tag:tower:type=radar
     tower:type=siren: Tag:tower:type=siren
+    tower:type=suspension: Tag:tower:type=suspension
     tower:type=watchtower: Tag:tower:type=watchtower
+    trade=wood: Tag:trade=wood
     traffic=local: Tag:traffic=local
     traffic=national: Tag:traffic=national
     traffic=regional: Tag:traffic=regional
     traffic=suburban: Tag:traffic=suburban
     traffic=urban: Tag:traffic=urban
+    traffic_calming=double_dip: Tag:traffic calming=double dip
+    traffic_calming=dynamic_bump: Tag:traffic calming=dynamic bump
     traffic_calming=island: Tag:traffic calming=island
     traffic_calming=table: Tag:traffic calming=table
+    traffic_sign:backward=DE:325.1: Tag:traffic sign:backward=DE:325.1
+    traffic_sign:backward=DE:325.2: Tag:traffic sign:backward=DE:325.2
+    traffic_sign:forward=DE:325.1: Tag:traffic sign:forward=DE:325.1
+    traffic_sign:forward=DE:325.2: Tag:traffic sign:forward=DE:325.2
+    traffic_sign=CH:2.59.3: Tag:traffic sign=CH:2.59.3
+    traffic_sign=CH:2.59.5: Tag:traffic sign=CH:2.59.5
+    traffic_sign=DE:1022-10: Tag:traffic sign=DE:1022-10
+    traffic_sign=DE:124: Tag:traffic sign=DE:124
+    traffic_sign=DE:136-10: Tag:traffic sign=DE:136-10
+    traffic_sign=DE:142-10: Tag:traffic sign=DE:142-10
     traffic_sign=DE:205: Tag:traffic sign=DE:205
     traffic_sign=DE:206: Tag:traffic sign=DE:206
     traffic_sign=DE:220-10: Tag:traffic sign=DE:220-10
@@ -9337,20 +10815,48 @@ en:
     traffic_sign=DE:274-70: Tag:traffic sign=DE:274-70
     traffic_sign=DE:274-80: Tag:traffic sign=DE:274-80
     traffic_sign=DE:274.1: Tag:traffic sign=DE:274.1
+    traffic_sign=DE:274.1-20: Tag:traffic sign=DE:274.1-20
     traffic_sign=DE:274.2: Tag:traffic sign=DE:274.2
+    traffic_sign=DE:274.2-20: Tag:traffic sign=DE:274.2-20
     traffic_sign=DE:282: Tag:traffic sign=DE:282
     traffic_sign=DE:306: Tag:traffic sign=DE:306
+    traffic_sign=DE:310: Tag:traffic sign=DE:310
     traffic_sign=DE:325: Tag:traffic sign=DE:325
     traffic_sign=DE:325.1: Tag:traffic sign=DE:325.1
     traffic_sign=DE:325.2: Tag:traffic sign=DE:325.2
+    traffic_sign=DE:330.1: Tag:traffic sign=DE:330.1
+    traffic_sign=DE:330.2: Tag:traffic sign=DE:330.2
+    traffic_sign=DE:331.1: Tag:traffic sign=DE:331.1
+    traffic_sign=DE:331.2: Tag:traffic sign=DE:331.2
+    traffic_sign=DE:350: Tag:traffic sign=DE:350
+    traffic_sign=DE:350-10: Tag:traffic sign=DE:350-10
+    traffic_sign=DE:350-20: Tag:traffic sign=DE:350-20
+    traffic_sign=DE:350-40: Tag:traffic sign=DE:350-40
+    traffic_sign=DE:354: Tag:traffic sign=DE:354
     traffic_sign=DE:357: Tag:traffic sign=DE:357
+    traffic_sign=DE:385: Tag:traffic sign=DE:385
     traffic_sign=DE:386.3: Tag:traffic sign=DE:386.3
+    traffic_sign=DE:394-50: Tag:traffic sign=DE:394-50
+    traffic_sign=DE:437: Tag:traffic sign=DE:437
+    traffic_sign=DE:438: Tag:traffic sign=DE:438
+    traffic_sign=DE:439: Tag:traffic sign=DE:439
     traffic_sign=DE:448: Tag:traffic sign=DE:448
     traffic_sign=DE:449: Tag:traffic sign=DE:449
+    traffic_sign=DE:453: Tag:traffic sign=DE:453
+    traffic_sign=NL:A01-30-ZB: Tag:traffic sign=NL:A01-30-ZB
+    traffic_sign=NL:C15: Tag:traffic sign=NL:C15
+    traffic_sign=NL:G07: Tag:traffic sign=NL:G07
+    traffic_sign=NL:G11: Tag:traffic sign=NL:G11
+    traffic_sign=NL:G12a: Tag:traffic sign=NL:G12a
+    traffic_sign=NL:G13: Tag:traffic sign=NL:G13
     traffic_sign=city_limit: Tag:traffic sign=city limit
     traffic_sign=stop: Tag:traffic sign=stop
+    traffic_signals=tram_priority: Tag:traffic signals=tram priority
     trailer:type=motorcycle: Tag:trailer:type=motorcycle
     trailhead: Tag:trailhead
+    train=no: Tag:train=no
+    train=yes: Tag:train=yes
+    tram=yes: Tag:tram=yes
     transformer=auto: Tag:transformer=auto
     transformer=auxiliary: Tag:transformer=auxiliary
     transformer=converter: Tag:transformer=converter
@@ -9359,13 +10865,29 @@ en:
     transformer=phase_angle_regulator: Tag:transformer=phase angle regulator
     transformer=traction: Tag:transformer=traction
     transformer=yes: Tag:transformer=yes
+    trees=almond_trees: Tag:trees=almond trees
+    trees=apple_trees: Tag:trees=apple trees
+    trees=banana_plants: Tag:trees=banana plants
+    trees=blueberry_plants: Tag:trees=blueberry plants
+    trees=cacao_trees: Tag:trees=cacao trees
+    trees=coconut_palms: Tag:trees=coconut palms
+    trees=coffea_plants: Tag:trees=coffea plants
+    trees=date_palms: Tag:trees=date palms
+    trees=hop_plants: Tag:trees=hop plants
+    trees=oil_palms: Tag:trees=oil palms
+    trees=olive_trees: Tag:trees=olive trees
+    trees=orange_trees: Tag:trees=orange trees
+    trees=papaya_trees: Tag:trees=papaya trees
+    trees=pineapple_plants: Tag:trees=pineapple plants
+    trees=tea_plants: Tag:trees=tea plants
+    tunnel=avalanche_protector: Tag:tunnel=avalanche protector
+    tunnel=building_passage: Tag:tunnel=building passage
     tunnel=culvert: Tag:tunnel=culvert
     tunnel=flooded: Tag:tunnel=flooded
     two_sided=yes: Tag:two sided=yes
-    type=AutoPASS: Tag:type=AutoPASS
-    type=autopass: Tag:type=autopass
     type=benchmark: Tag:type=benchmark
     type=boundary: Tag:type=boundary
+    type=destination_sign: Tag:type=destination sign
     type=enforcement: Tag:type=enforcement
     type=fixed_point: Tag:type=fixed point
     type=multipolygon: Tag:type=multipolygon
@@ -9374,20 +10896,41 @@ en:
     type=restriction: Tag:type=restriction
     type=route: Tag:type=route
     type=site: Tag:type=site
+    type=superroute: Tag:type=superroute
     type=triangulation: Tag:type=triangulation
     type=waterway: Tag:type=waterway
+    usage=branch: Tag:usage=branch
     usage=distribution: Tag:usage=distribution
     usage=facility: Tag:usage=facility
     usage=flare_header: Tag:usage=flare header
     usage=flowline: Tag:usage=flowline
     usage=gathering: Tag:usage=gathering
     usage=headrace: Tag:usage=headrace
+    usage=industrial: Tag:usage=industrial
     usage=injection: Tag:usage=injection
     usage=irrigation: Tag:usage=irrigation
+    usage=main: Tag:usage=main
+    usage=military: Tag:usage=military
     usage=penstock: Tag:usage=penstock
     usage=spillway: Tag:usage=spillway
     usage=tailrace: Tag:usage=tailrace
+    usage=test: Tag:usage=test
+    usage=tourism: Tag:usage=tourism
     usage=transmission: Tag:usage=transmission
+    usage=transportation: Tag:usage=transportation
+    utility=chemical: Tag:utility=chemical
+    utility=gas: Tag:utility=gas
+    utility=heating: Tag:utility=heating
+    utility=hydrant: Tag:utility=hydrant
+    utility=oil: Tag:utility=oil
+    utility=power: Tag:utility=power
+    utility=sewerage: Tag:utility=sewerage
+    utility=street_lighting: Tag:utility=street lighting
+    utility=telecom: Tag:utility=telecom
+    utility=television: Tag:utility=television
+    utility=waste: Tag:utility=waste
+    utility=water: Tag:utility=water
+    valley=balka: Tag:valley=balka
     valve=ball: Tag:valve=ball
     valve=butterfly: Tag:valve=butterfly
     valve=gate: Tag:valve=gate
@@ -9412,7 +10955,9 @@ en:
     vending=cigarettes: Tag:vending=cigarettes
     vending=coffee: Tag:vending=coffee
     vending=condoms: Tag:vending=condoms
+    vending=contact_lenses: Tag:vending=contact lenses
     vending=drinks: Tag:vending=drinks
+    vending=e-cigarettes: Tag:vending=e-cigarettes
     vending=electronics: Tag:vending=electronics
     vending=elongated_coin: Tag:vending=elongated coin
     vending=excrement_bags: Tag:vending=excrement bags
@@ -9436,6 +10981,7 @@ en:
     vending=parking_tickets: Tag:vending=parking tickets
     vending=pet_food: Tag:vending=pet food
     vending=photo: Tag:vending=photo
+    vending=pizza: Tag:vending=pizza
     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
@@ -9455,21 +11001,31 @@ en:
     wall=no: Tag:wall=no
     wall=noise_barrier: Tag:wall=noise barrier
     wall=seawall: Tag:wall=seawall
+    wall=tire_barrier: Tag:wall=tire barrier
     wall=training_wall: Tag:wall=training wall
     waste=dog_excrement: Tag:waste=dog excrement
+    water=basin: Tag:water=basin
     water=canal: Tag:water=canal
+    water=ditch: Tag:water=ditch
+    water=drain: Tag:water=drain
     water=intermittent: Tag:water=intermittent
     water=lagoon: Tag:water=lagoon
     water=lake: Tag:water=lake
     water=lock: Tag:water=lock
+    water=moat: Tag:water=moat
     water=oxbow: Tag:water=oxbow
     water=pond: Tag:water=pond
+    water=reflecting_pool: Tag:water=reflecting pool
     water=reservoir: Tag:water=reservoir
     water=river: Tag:water=river
+    water=stream: Tag:water=stream
+    water=stream_pool: Tag:water=stream pool
+    water=swale: Tag:water=swale
     water=tidal: Tag:water=tidal
     water=wastewater: Tag:water=wastewater
     water_source=main: Tag:water source=main
     water_source=river: Tag:water source=river
+    waterway=artificial: Tag:waterway=artificial
     waterway=boat_lift: Tag:waterway=boat lift
     waterway=boatyard: Tag:waterway=boatyard
     waterway=brook: Tag:waterway=brook
@@ -9485,6 +11041,7 @@ en:
     waterway=estuary: Tag:waterway=estuary
     waterway=fairway: Tag:waterway=fairway
     waterway=fish_pass: Tag:waterway=fish pass
+    waterway=floating_barrier: Tag:waterway=floating barrier
     waterway=fuel: Tag:waterway=fuel
     waterway=lock_gate: Tag:waterway=lock gate
     waterway=milestone: Tag:waterway=milestone
@@ -9492,10 +11049,13 @@ en:
     waterway=offshore_field: Tag:waterway=offshore field
     waterway=portage: Tag:waterway=portage
     waterway=pressurised: Tag:waterway=pressurised
+    waterway=rapids: Tag:waterway=rapids
     waterway=river: Tag:waterway=river
     waterway=riverbank: Tag:waterway=riverbank
+    waterway=riverbed: Tag:waterway=riverbed
     waterway=sanitary_dump_station: Tag:waterway=sanitary dump station
     waterway=seaway: Tag:waterway=seaway
+    waterway=sluice_gate: Tag:waterway=sluice gate
     waterway=spillway: Tag:waterway=spillway
     waterway=stream: Tag:waterway=stream
     waterway=stream_end: Tag:waterway=stream end
@@ -9521,6 +11081,7 @@ en:
     wood=eucalypt: Tag:wood=eucalypt
     wood=evergreen: Tag:wood=evergreen
     wood=nipa_palm: Tag:wood=nipa palm
+    worship=stations_of_the_cross: Tag:worship=stations of the cross
     zoo=aviary: Tag:zoo=aviary
     zoo=birds: Tag:zoo=birds
     zoo=butterfly: Tag:zoo=butterfly
@@ -9531,8 +11092,6 @@ en:
     zoo=safari_park: Tag:zoo=safari park
     zoo=wildlife_park: Tag:zoo=wildlife park
 eo:
-  key:
-    esperanto: Eo:Key:esperanto
   tag:
     craft=tinsmith: Eo:Tag:craft=tinsmith
     esperanto=esperanto: Eo:Tag:esperanto=esperanto
@@ -9541,13 +11100,16 @@ es:
   key:
     abandoned: ES:Key:abandoned
     'abandoned:': 'ES:Key:abandoned:'
+    abandoned:place: ES:Key:abandoned:place
     abandoned:railway: ES:Key:abandoned:railway
     abutters: ES:Key:abutters
+    access: ES:Key:access
     addr: ES:Key:addr
     addr:city: ES:Key:addr:city
     addr:country: ES:Key:addr:country
     addr:district: ES:Key:addr:district
     addr:flats: ES:Key:addr:flats
+    addr:floor: ES:Key:addr:floor
     addr:full: ES:Key:addr:full
     addr:hamlet: ES:Key:addr:hamlet
     addr:housename: ES:Key:addr:housename
@@ -9564,13 +11126,16 @@ es:
     admin_level: ES:Key:admin level
     aerialway: ES:Key:aerialway
     aeroway: ES:Key:aeroway
+    after_school: ES:Key:after school
     amenity: ES:Key:amenity
+    architect: ES:Key:architect
     area: ES:Key:area
     area:highway: ES:Key:area:highway
     artist_name: ES:Key:artist name
     artwork_subject: ES:Key:artwork subject
     artwork_type: ES:Key:artwork type
     barrier: ES:Key:barrier
+    beds: ES:Key:beds
     bicycle_parking: ES:Key:bicycle parking
     bicycle_road: ES:Key:bicycle road
     books: ES:Key:books
@@ -9580,58 +11145,88 @@ es:
     bridge: ES:Key:bridge
     bridge:structure: ES:Key:bridge:structure
     building: ES:Key:building
+    building:fireproof: ES:Key:building:fireproof
+    building:flats: ES:Key:building:flats
     building:levels: ES:Key:building:levels
+    building:levels:underground: ES:Key:building:levels:underground
     building:material: ES:Key:building:material
+    building:min_level: ES:Key:building:min level
     building:part: ES:Key:building:part
+    building:soft_storey: ES:Key:building:soft storey
+    building:use: ES:Key:building:use
     bus_bay: ES:Key:bus bay
     busway: ES:Key:busway
     capital: ES:Key:capital
     cemetery: ES:Key:cemetery
+    changesets_count: ES:Key:changesets count
     check_date: ES:Key:check date
     circumference: ES:Key:circumference
     clothes: ES:Key:clothes
     club: ES:Key:club
     collection_times: ES:Key:collection times
     comment: ES:Key:comment
+    communication:amateur_radio: ES:Key:communication:amateur radio
+    communication:radio: ES:Key:communication:radio
+    communication:television: ES:Key:communication:television
+    community_centre: ES:Key:community centre
+    community_centre:for: ES:Key:community centre:for
     construction: ES:Key:construction
+    consulting: ES:Key:consulting
     contact: ES:Key:contact
     contact:facebook: ES:Key:contact:facebook
     contact:twitter: ES:Key:contact:twitter
     content: ES:Key:content
     conveying: ES:Key:conveying
+    covered: ES:Key:covered
     craft: ES:Key:craft
     created_by: ES:Key:created by
+    crop: ES:Key:crop
     crossing: ES:Key:crossing
     crossing:island: ES:Key:crossing:island
     cuisine: ES:Key:cuisine
+    currency: ES:Key:currency
     cutting: ES:Key:cutting
     cycleway: ES:Key:cycleway
+    cycleway:both: ES:Key:cycleway:both
+    cycleway:lane: ES:Key:cycleway:lane
     cycleway:left: ES:Key:cycleway:left
     cycleway:right: ES:Key:cycleway:right
+    delivery: ES:Key:delivery
     denotation: ES:Key:denotation
     description: ES:Key:description
     destination: ES:Key:destination
     diaper: ES:Key:diaper
     diet: ES:Key:diet
     diet:*: ES:Key:diet:*
+    diet:kosher: ES:Key:diet:kosher
+    dispensing: ES:Key:dispensing
+    distance: ES:Key:distance
     disused: ES:Key:disused
     'disused:': 'ES:Key:disused:'
     disused:railway: ES:Key:disused:railway
+    email: ES:Key:email
     embankment: ES:Key:embankment
     emergency: ES:Key:emergency
     end_date: ES:Key:end date
+    engineer: ES:Key:engineer
     entrance: ES:Key:entrance
     evacuation_route: ES:Key:evacuation route
     facebook: ES:Key:facebook
     fair_trade: ES:Key:fair trade
     fee: ES:Key:fee
     fence_type: ES:Key:fence type
+    fishing: ES:Key:fishing
     fixme: ES:Key:fixme
+    flood_prone: ES:Key:flood prone
+    foot: ES:Key:foot
+    foot:backward: ES:Key:foot:backward
     footway: ES:Key:footway
     ford: ES:Key:ford
+    from: ES:Key:from
     fuel:diesel_G2: ES:Key:fuel:diesel G2
     garden:style: ES:Key:garden:style
     garden:type: ES:Key:garden:type
+    gauge: ES:Key:gauge
     generator:output: ES:Key:generator:output
     generator:source: ES:Key:generator:source
     genus: ES:Key:genus
@@ -9639,6 +11234,8 @@ es:
     government: ES:Key:government
     grassland: ES:Key:grassland
     hazard_prone: ES:Key:hazard prone
+    healthcare: ES:Key:healthcare
+    healthcare:counselling: ES:Key:healthcare:counselling
     height: ES:Key:height
     heritage: ES:Key:heritage
     highway: ES:Key:highway
@@ -9649,26 +11246,34 @@ es:
     incline: ES:Key:incline
     indoor: ES:Key:indoor
     industrial: ES:Key:industrial
+    informal: ES:Key:informal
     information: ES:Key:information
     inscription: ES:Key:inscription
     intermittent: ES:Key:intermittent
     interval: ES:Key:interval
+    irrigated: ES:Key:irrigated
     is_in: ES:Key:is in
+    is_in:continent: ES:Key:is in:continent
     is_in:country: ES:Key:is in:country
+    isced:level: ES:Key:isced:level
     kerb: ES:Key:kerb
     ladder: ES:Key:ladder
     landuse: ES:Key:landuse
+    lane_markings: ES:Key:lane markings
     lanes: ES:Key:lanes
     lanes:psv: ES:Key:lanes:psv
+    lawyer: ES:Key:lawyer
     leaf_cycle: ES:Key:leaf cycle
     leaf_type: ES:Key:leaf type
     leisure: ES:Key:leisure
+    length: ES:Key:length
     level: ES:Key:level
     lgbtq: ES:Key:lgbtq
     local_ref: ES:Key:local ref
     locale: ES:Key:locale
     location: ES:Key:location
     man_made: ES:Key:man made
+    manhole: ES:Key:manhole
     manufacturer: ES:Key:manufacturer
     mapillary: ES:Key:mapillary
     material: ES:Key:material
@@ -9677,21 +11282,42 @@ es:
     maxspeed:advisory: ES:Key:maxspeed:advisory
     maxspeed:practical: ES:Key:maxspeed:practical
     memorial: ES:Key:memorial
+    min_height: ES:Key:min height
     monitoring:galileo: ES:Key:monitoring:galileo
     monitoring:glonass: ES:Key:monitoring:glonass
     monitoring:gps: ES:Key:monitoring:gps
+    motorcycle:clothes: ES:Key:motorcycle:clothes
+    motorcycle:parts: ES:Key:motorcycle:parts
+    motorcycle:rental: ES:Key:motorcycle:rental
+    motorcycle:repair: ES:Key:motorcycle:repair
+    motorcycle:sales: ES:Key:motorcycle:sales
+    motorcycle:type: ES:Key:motorcycle:type
+    motorcycle:tyres: ES:Key:motorcycle:tyres
     motorhome: ES:Key:motorhome
     motorroad: ES:Key:motorroad
     mountain_pass: ES:Key:mountain pass
+    museum: ES:Key:museum
+    museum_type: ES:Key:museum type
+    musical_instrument: ES:Key:musical instrument
     name: ES:Key:name
+    narrow: ES:Key:narrow
     natural: ES:Key:natural
+    network:type: ES:Key:network:type
+    noaddress: ES:Key:noaddress
     noexit: ES:Key:noexit
+    nohousenumber: ES:Key:nohousenumber
+    non_existent_levels: ES:Key:non existent levels
     noname: ES:Key:noname
+    'not:': 'ES:Key:not:'
     note: ES:Key:note
+    nudism: ES:Key:nudism
+    object: ES:Key:object
     office: ES:Key:office
+    old_name: ES:Key:old name
     oneway: ES:Key:oneway
     oneway:psv: ES:Key:oneway:psv
     opening_hours: ES:Key:opening hours
+    opening_hours:covid19: ES:Key:opening hours:covid19
     operator: ES:Key:operator
     operator:type: ES:Key:operator:type
     organic: ES:Key:organic
@@ -9700,6 +11326,7 @@ es:
     osmc:symbol: ES:Key:osmc:symbol
     overtaking: ES:Key:overtaking
     owner: ES:Key:owner
+    ownership: ES:Key:ownership
     parking: ES:Key:parking
     parking:lane: ES:Key:parking:lane
     passenger: ES:Key:passenger
@@ -9714,8 +11341,11 @@ es:
     prepayment:*: ES:Key:prepayment:*
     priority: ES:Key:priority
     priority_road: ES:Key:priority road
+    produce: ES:Key:produce
     product: ES:Key:product
     proposed: ES:Key:proposed
+    protect_class: ES:Key:protect class
+    protection_title: ES:Key:protection title
     psv: ES:Key:psv
     public_bookcase:type: ES:Key:public bookcase:type
     public_transport: ES:Key:public transport
@@ -9729,11 +11359,18 @@ es:
     ref:color: ES:Key:ref:color
     ref:colour: ES:Key:ref:colour
     ref:isil: ES:Key:ref:isil
+    related_law: ES:Key:related law
     religion: ES:Key:religion
     'removed:': 'ES:Key:removed:'
+    reservation: ES:Key:reservation
+    residential: ES:Key:residential
     resource: ES:Key:resource
+    review_requested: ES:Key:review requested
+    roller_coaster: ES:Key:roller coaster
+    roof:colour: ES:Key:roof:colour
     roof:direction: ES:Key:roof:direction
     roof:material: ES:Key:roof:material
+    roof:shape: ES:Key:roof:shape
     roundtrip: ES:Key:roundtrip
     route: ES:Key:route
     route_master: ES:Key:route master
@@ -9744,14 +11381,20 @@ es:
     sac_scale: ES:Key:sac scale
     safety_rope: ES:Key:safety rope
     seasonal: ES:Key:seasonal
+    seats: ES:Key:seats
+    service:bicycle:diy: ES:Key:service:bicycle:diy
+    shelter: ES:Key:shelter
     shop: ES:Key:shop
+    shoulder: ES:Key:shoulder
     sidewalk: ES:Key:sidewalk
     site_type: ES:Key:site type
     social_facility: ES:Key:social facility
+    social_facility:for: ES:Key:social facility:for
     source: ES:Key:source
     species: ES:Key:species
     sport: ES:Key:sport
     stars: ES:Key:stars
+    start_date: ES:Key:start date
     stop: ES:Key:stop
     supervised: ES:Key:supervised
     support: ES:Key:support
@@ -9762,14 +11405,22 @@ es:
     symbol: ES:Key:symbol
     takeaway: ES:Key:takeaway
     taxi: ES:Key:taxi
+    tents: ES:Key:tents
+    theatre:type: ES:Key:theatre:type
+    to: ES:Key:to
     todo: ES:Key:todo
+    toilets: ES:Key:toilets
+    toilets:wheelchair: ES:Key:toilets:wheelchair
     tourism: ES:Key:tourism
+    tourist_bus: ES:Key:tourist bus
+    tower:construction: ES:Key:tower:construction
     tracktype: ES:Key:tracktype
     traffic: ES:Key:traffic
     traffic_calming: ES:Key:traffic calming
     traffic_sign: ES:Key:traffic sign
     traffic_signals: ES:Key:traffic signals
     traffic_signals:direction: ES:Key:traffic signals:direction
+    tree_lined: ES:Key:tree lined
     trolley_wire: ES:Key:trolley wire
     trolleybus: ES:Key:trolleybus
     tunnel: ES:Key:tunnel
@@ -9778,10 +11429,15 @@ es:
     type: ES:Key:type
     unnamed: ES:Key:unnamed
     url: ES:Key:url
+    vaccination: ES:Key:vaccination
+    vehicle: ES:Key:vehicle
+    via: ES:Key:via
     water: ES:Key:water
     waterway: ES:Key:waterway
     website: ES:Key:website
+    wetland: ES:Key:wetland
     wheelchair: ES:Key:wheelchair
+    wheelchair:description: ES:Key:wheelchair:description
     wholesale: ES:Key:wholesale
     wikidata: ES:Key:wikidata
     wikimedia_commons: ES:Key:wikimedia commons
@@ -9789,17 +11445,27 @@ es:
   tag:
     abandoned:amenity=prison_camp: ES:Tag:abandoned:amenity=prison camp
     access=customers: ES:Tag:access=customers
+    access=private: ES:Tag:access=private
+    admin_level=2: ES:Tag:admin level=2
     advertising=board: ES:Tag:advertising=board
     advertising=column: ES:Tag:advertising=column
     advertising=totem: ES:Tag:advertising=totem
+    advertising=wall_painting: ES:Tag:advertising=wall painting
     aerialway=cable_car: ES:Tag:aerialway=cable car
     aerialway=gondola: ES:Tag:aerialway=gondola
+    aerialway=pylon: ES:Tag:aerialway=pylon
     aerialway=station: ES:Tag:aerialway=station
     aerodrome:type=regional: ES:Tag:aerodrome:type=regional
+    aeroway=aerodrome: ES:Tag:aeroway=aerodrome
     aeroway=apron: ES:Tag:aeroway=apron
+    aeroway=gate: ES:Tag:aeroway=gate
+    aeroway=hangar: ES:Tag:aeroway=hangar
     aeroway=helipad: ES:Tag:aeroway=helipad
     aeroway=heliport: ES:Tag:aeroway=heliport
+    aeroway=holding_position: ES:Tag:aeroway=holding position
     aeroway=navigationaid: ES:Tag:aeroway=navigationaid
+    aeroway=runway: ES:Tag:aeroway=runway
+    aeroway=taxiway: ES:Tag:aeroway=taxiway
     aeroway=terminal: ES:Tag:aeroway=terminal
     aeroway=windsock: ES:Tag:aeroway=windsock
     airmark=beacon: ES:Tag:airmark=beacon
@@ -9807,10 +11473,12 @@ es:
     amenity=archive: ES:Tag:amenity=archive
     amenity=arts_centre: ES:Tag:amenity=arts centre
     amenity=atm: ES:Tag:amenity=atm
+    amenity=baking_oven: ES:Tag:amenity=baking oven
     amenity=bank: ES:Tag:amenity=bank
     amenity=bar: ES:Tag:amenity=bar
     amenity=bbq: ES:Tag:amenity=bbq
     amenity=bench: ES:Tag:amenity=bench
+    amenity=bicycle_library: ES:Tag:amenity=bicycle library
     amenity=bicycle_parking: ES:Tag:amenity=bicycle parking
     amenity=bicycle_rental: ES:Tag:amenity=bicycle rental
     amenity=biergarten: ES:Tag:amenity=biergarten
@@ -9820,6 +11488,7 @@ es:
     amenity=cafe: ES:Tag:amenity=cafe
     amenity=car_rental: ES:Tag:amenity=car rental
     amenity=car_wash: ES:Tag:amenity=car wash
+    amenity=childcare: ES:Tag:amenity=childcare
     amenity=clinic: ES:Tag:amenity=clinic
     amenity=clock: ES:Tag:amenity=clock
     amenity=college: ES:Tag:amenity=college
@@ -9830,6 +11499,7 @@ es:
     amenity=coworking_space: ES:Tag:amenity=coworking space
     amenity=crematorium: ES:Tag:amenity=crematorium
     amenity=crypt: ES:Tag:amenity=crypt
+    amenity=dancing_school: ES:Tag:amenity=dancing school
     amenity=dentist: ES:Tag:amenity=dentist
     amenity=device_charging_station: ES:Tag:amenity=device charging station
     amenity=doctors: ES:Tag:amenity=doctors
@@ -9840,23 +11510,34 @@ es:
     amenity=exhibition_centre: ES:Tag:amenity=exhibition centre
     amenity=fast_food: ES:Tag:amenity=fast food
     amenity=ferry_terminal: ES:Tag:amenity=ferry terminal
+    amenity=fire_station: ES:Tag:amenity=fire station
     amenity=food_court: ES:Tag:amenity=food court
     amenity=fountain: ES:Tag:amenity=fountain
     amenity=fuel: ES:Tag:amenity=fuel
+    amenity=funeral_hall: ES:Tag:amenity=funeral hall
+    amenity=gambling: ES:Tag:amenity=gambling
+    amenity=give_box: ES:Tag:amenity=give box
     amenity=grave_yard: ES:Tag:amenity=grave yard
+    amenity=harbourmaster: ES:Tag:amenity=harbourmaster
     amenity=hospital: ES:Tag:amenity=hospital
     amenity=ice_cream: ES:Tag:amenity=ice cream
     amenity=internet_cafe: ES:Tag:amenity=internet cafe
+    amenity=jobcentre: ES:Tag:amenity=jobcentre
+    amenity=karaoke_box: ES:Tag:amenity=karaoke box
     amenity=kindergarten: ES:Tag:amenity=kindergarten
     amenity=language_school: ES:Tag:amenity=language school
     amenity=lavoir: ES:Tag:amenity=lavoir
+    amenity=letter_box: ES:Tag:amenity=letter box
     amenity=library: ES:Tag:amenity=library
+    amenity=lounger: ES:Tag:amenity=lounger
     amenity=love_hotel: ES:Tag:amenity=love hotel
     amenity=marketplace: ES:Tag:amenity=marketplace
     amenity=mobile_library: ES:Tag:amenity=mobile library
     amenity=mortuary: ES:Tag:amenity=mortuary
+    amenity=motorcycle_parking: ES:Tag:amenity=motorcycle parking
     amenity=music_school: ES:Tag:amenity=music school
     amenity=nightclub: ES:Tag:amenity=nightclub
+    amenity=nursing_home: ES:Tag:amenity=nursing home
     amenity=parking: ES:Tag:amenity=parking
     amenity=parking_entrance: ES:Tag:amenity=parking entrance
     amenity=parking_space: ES:Tag:amenity=parking space
@@ -9867,6 +11548,10 @@ es:
     amenity=place_of_worship: ES:Tag:amenity=place of worship
     amenity=planetarium: ES:Tag:amenity=planetarium
     amenity=police: ES:Tag:amenity=police
+    amenity=post_box: ES:Tag:amenity=post box
+    amenity=post_depot: ES:Tag:amenity=post depot
+    amenity=post_office: ES:Tag:amenity=post office
+    amenity=prep_school: ES:Tag:amenity=prep school
     amenity=prison_camp: ES:Tag:amenity=prison camp
     amenity=pub: ES:Tag:amenity=pub
     amenity=public_bookcase: ES:Tag:amenity=public bookcase
@@ -9875,14 +11560,24 @@ es:
     amenity=refugee_housing: ES:Tag:amenity=refugee housing
     amenity=research_institute: ES:Tag:amenity=research institute
     amenity=restaurant: ES:Tag:amenity=restaurant
+    amenity=retirement_home: ES:Tag:amenity=retirement home
     amenity=school: ES:Tag:amenity=school
+    amenity=seat: ES:Tag:amenity=seat
     amenity=shelter: ES:Tag:amenity=shelter
     amenity=shower: ES:Tag:amenity=shower
+    amenity=ski_school: ES:Tag:amenity=ski school
+    amenity=social_centre: ES:Tag:amenity=social centre
     amenity=social_facility: ES:Tag:amenity=social facility
+    amenity=sport_school: ES:Tag:amenity=sport school
+    amenity=stool: ES:Tag:amenity=stool
     amenity=stripclub: ES:Tag:amenity=stripclub
+    amenity=studio: ES:Tag:amenity=studio
     amenity=taxi: ES:Tag:amenity=taxi
+    amenity=television: ES:Tag:amenity=television
     amenity=theatre: ES:Tag:amenity=theatre
+    amenity=tourist_bus_parking: ES:Tag:amenity=tourist bus parking
     amenity=townhall: ES:Tag:amenity=townhall
+    amenity=toy_library: ES:Tag:amenity=toy library
     amenity=university: ES:Tag:amenity=university
     amenity=vehicle_inspection: ES:Tag:amenity=vehicle inspection
     amenity=vending_machine: ES:Tag:amenity=vending machine
@@ -9899,9 +11594,11 @@ es:
     area:highway=footway: ES:Tag:area:highway=footway
     area:highway=path: ES:Tag:area:highway=path
     area:highway=pedestrian: ES:Tag:area:highway=pedestrian
+    attraction=roller_coaster: ES:Tag:attraction=roller coaster
     attraction=water_slide: ES:Tag:attraction=water slide
     barrier=block: ES:Tag:barrier=block
     barrier=bollard: ES:Tag:barrier=bollard
+    barrier=border_control: ES:Tag:barrier=border control
     barrier=cable_barrier: ES:Tag:barrier=cable barrier
     barrier=chain: ES:Tag:barrier=chain
     barrier=city_wall: ES:Tag:barrier=city wall
@@ -9910,6 +11607,7 @@ es:
     barrier=fence: ES:Tag:barrier=fence
     barrier=gate: ES:Tag:barrier=gate
     barrier=guard_rail: ES:Tag:barrier=guard rail
+    barrier=handrail: ES:Tag:barrier=handrail
     barrier=hedge: ES:Tag:barrier=hedge
     barrier=height_restrictor: ES:Tag:barrier=height restrictor
     barrier=jersey_barrier: ES:Tag:barrier=jersey barrier
@@ -9917,11 +11615,14 @@ es:
     barrier=lift_gate: ES:Tag:barrier=lift gate
     barrier=retaining_wall: ES:Tag:barrier=retaining wall
     barrier=rope: ES:Tag:barrier=rope
+    barrier=sally_port: ES:Tag:barrier=sally port
     barrier=spikes: ES:Tag:barrier=spikes
     barrier=swing_gate: ES:Tag:barrier=swing gate
     barrier=toll_booth: ES:Tag:barrier=toll booth
+    barrier=tyres: ES:Tag:barrier=tyres
     barrier=wall: ES:Tag:barrier=wall
     bicycle=use_sidepath: ES:Tag:bicycle=use sidepath
+    boundary=administrative: ES:Tag:boundary=administrative
     boundary=national_park: ES:Tag:boundary=national park
     boundary=political: ES:Tag:boundary=political
     boundary=protected_area: ES:Tag:boundary=protected area
@@ -9929,47 +11630,87 @@ es:
     bridge=aqueduct: ES:Tag:bridge=aqueduct
     bridge=viaduct: ES:Tag:bridge=viaduct
     building=apartments: ES:Tag:building=apartments
+    building=bakehouse: ES:Tag:building=bakehouse
     building=barn: ES:Tag:building=barn
     building=boathouse: ES:Tag:building=boathouse
     building=brewery: ES:Tag:building=brewery
+    building=bridge: ES:Tag:building=bridge
     building=bungalow: ES:Tag:building=bungalow
+    building=bunker: ES:Tag:building=bunker
+    building=cabin: ES:Tag:building=cabin
     building=carport: ES:Tag:building=carport
     building=cathedral: ES:Tag:building=cathedral
     building=chapel: ES:Tag:building=chapel
     building=church: ES:Tag:building=church
     building=civic: ES:Tag:building=civic
+    building=college: ES:Tag:building=college
     building=commercial: ES:Tag:building=commercial
     building=conservatory: ES:Tag:building=conservatory
     building=construction: ES:Tag:building=construction
     building=container: ES:Tag:building=container
+    building=cowshed: ES:Tag:building=cowshed
     building=detached: ES:Tag:building=detached
+    building=digester: ES:Tag:building=digester
     building=dormitory: ES:Tag:building=dormitory
     building=farm: ES:Tag:building=farm
+    building=farm_auxiliary: ES:Tag:building=farm auxiliary
+    building=fire_station: ES:Tag:building=fire station
     building=garage: ES:Tag:building=garage
     building=garages: ES:Tag:building=garages
+    building=gatehouse: ES:Tag:building=gatehouse
+    building=ger: ES:Tag:building=ger
+    building=government: ES:Tag:building=government
     building=grandstand: ES:Tag:building=grandstand
     building=greenhouse: ES:Tag:building=greenhouse
+    building=hangar: ES:Tag:building=hangar
     building=hospital: ES:Tag:building=hospital
+    building=hotel: ES:Tag:building=hotel
     building=house: ES:Tag:building=house
     building=houseboat: ES:Tag:building=houseboat
     building=hut: ES:Tag:building=hut
     building=industrial: ES:Tag:building=industrial
+    building=kindergarten: ES:Tag:building=kindergarten
     building=kiosk: ES:Tag:building=kiosk
+    building=monastery: ES:Tag:building=monastery
+    building=mosque: ES:Tag:building=mosque
     building=office: ES:Tag:building=office
+    building=parking: ES:Tag:building=parking
+    building=pavilion: ES:Tag:building=pavilion
     building=public: ES:Tag:building=public
+    building=religious: ES:Tag:building=religious
     building=residential: ES:Tag:building=residential
     building=retail: ES:Tag:building=retail
+    building=riding_hall: ES:Tag:building=riding hall
     building=roof: ES:Tag:building=roof
     building=ruins: ES:Tag:building=ruins
     building=school: ES:Tag:building=school
+    building=semi: ES:Tag:building=semi
+    building=semidetached_house: ES:Tag:building=semidetached house
     building=service: ES:Tag:building=service
     building=shed: ES:Tag:building=shed
+    building=shrine: ES:Tag:building=shrine
+    building=slurry_tank: ES:Tag:building=slurry tank
     building=sports_hall: ES:Tag:building=sports hall
+    building=stable: ES:Tag:building=stable
+    building=stadium: ES:Tag:building=stadium
+    building=static_caravan: ES:Tag:building=static caravan
     building=sty: ES:Tag:building=sty
+    building=supermarket: ES:Tag:building=supermarket
+    building=synagogue: ES:Tag:building=synagogue
+    building=temple: ES:Tag:building=temple
+    building=tent: ES:Tag:building=tent
     building=terrace: ES:Tag:building=terrace
+    building=toilets: ES:Tag:building=toilets
+    building=train_station: ES:Tag:building=train station
+    building=transformer_tower: ES:Tag:building=transformer tower
+    building=transportation: ES:Tag:building=transportation
+    building=tree_house: ES:Tag:building=tree house
     building=university: ES:Tag:building=university
     building=warehouse: ES:Tag:building=warehouse
+    building=water_tower: ES:Tag:building=water tower
+    castle_type=manor: ES:Tag:castle type=manor
     cemetery=grave: ES:Tag:cemetery=grave
+    clothes=fashion: ES:Tag:clothes=fashion
     club=scout: ES:Tag:club=scout
     club=sport: ES:Tag:club=sport
     craft=agricultural_engines: ES:Tag:craft=agricultural engines
@@ -9992,33 +11733,50 @@ es:
     craft=electronics_repair: ES:Tag:craft=electronics repair
     craft=engraver: ES:Tag:craft=engraver
     craft=gardener: ES:Tag:craft=gardener
+    craft=glaziery: ES:Tag:craft=glaziery
     craft=handicraft: ES:Tag:craft=handicraft
     craft=hvac: ES:Tag:craft=hvac
+    craft=information_electronics: ES:Tag:craft=information electronics
     craft=jeweller: ES:Tag:craft=jeweller
+    craft=luthier: ES:Tag:craft=luthier
+    craft=metal_construction: ES:Tag:craft=metal construction
+    craft=musical_instrument: ES:Tag:craft=musical instrument
     craft=oil_mill: ES:Tag:craft=oil mill
     craft=optician: ES:Tag:craft=optician
     craft=photographer: ES:Tag:craft=photographer
     craft=plumber: ES:Tag:craft=plumber
     craft=pottery: ES:Tag:craft=pottery
+    craft=printer: ES:Tag:craft=printer
+    craft=shoemaker: ES:Tag:craft=shoemaker
     craft=tailor: ES:Tag:craft=tailor
     craft=tiler: ES:Tag:craft=tiler
     craft=upholsterer: ES:Tag:craft=upholsterer
     craft=watchmaker: ES:Tag:craft=watchmaker
+    crossing=marked: ES:Tag:crossing=marked
+    crossing=traffic_signals: ES:Tag:crossing=traffic signals
     crossing=zebra: ES:Tag:crossing=zebra
+    cycleway:right=lane: ES:Tag:cycleway:right=lane
+    cycleway:right=track: ES:Tag:cycleway:right=track
     cycleway=lane: ES:Tag:cycleway=lane
+    cycleway=opposite_lane: ES:Tag:cycleway=opposite lane
+    cycleway=opposite_track: ES:Tag:cycleway=opposite track
     cycleway=share_busway: ES:Tag:cycleway=share busway
     cycleway=track: ES:Tag:cycleway=track
     emergency=ambulance_station: ES:Tag:emergency=ambulance station
     emergency=defibrillator: ES:Tag:emergency=defibrillator
     emergency=dry_riser: ES:Tag:emergency=dry riser
+    emergency=emergency_ward_entrance: ES:Tag:emergency=emergency ward entrance
     emergency=fire_extinguisher: ES:Tag:emergency=fire extinguisher
+    emergency=fire_hose: ES:Tag:emergency=fire hose
     emergency=fire_hydrant: ES:Tag:emergency=fire hydrant
     emergency=landing_site: ES:Tag:emergency=landing site
     emergency=phone: ES:Tag:emergency=phone
     emergency=ses_station: ES:Tag:emergency=ses station
+    emergency=yes: ES:Tag:emergency=yes
     flow_direction=both: ES:Tag:flow direction=both
     footway=crossing: ES:Tag:footway=crossing
     footway=sidewalk: ES:Tag:footway=sidewalk
+    ford=stepping_stones: ES:Tag:ford=stepping stones
     ford=yes: ES:Tag:ford=yes
     garden:type=botanical: ES:Tag:garden:type=botanical
     generator:method=photovoltaic: ES:Tag:generator:method=photovoltaic
@@ -10035,7 +11793,37 @@ es:
     geological=moraine: ES:Tag:geological=moraine
     geological=outcrop: ES:Tag:geological=outcrop
     geological=palaeontological_site: ES:Tag:geological=palaeontological site
+    golf=bunker: ES:Tag:golf=bunker
+    golf=clubhouse: ES:Tag:golf=clubhouse
+    golf=driving_range: ES:Tag:golf=driving range
+    golf=fairway: ES:Tag:golf=fairway
+    golf=green: ES:Tag:golf=green
+    golf=hole: ES:Tag:golf=hole
+    golf=rough: ES:Tag:golf=rough
+    golf=tee: ES:Tag:golf=tee
+    golf=water_hazard: ES:Tag:golf=water hazard
+    government=administrative: ES:Tag:government=administrative
+    government=audit: ES:Tag:government=audit
+    government=border_control: ES:Tag:government=border control
+    government=cadaster: ES:Tag:government=cadaster
+    government=customs: ES:Tag:government=customs
+    government=data_protection: ES:Tag:government=data protection
+    government=healthcare: ES:Tag:government=healthcare
+    government=legislative: ES:Tag:government=legislative
+    government=ministry: ES:Tag:government=ministry
+    government=parliament: ES:Tag:government=parliament
+    government=prosecutor: ES:Tag:government=prosecutor
     government=register_office: ES:Tag:government=register office
+    government=statistics: ES:Tag:government=statistics
+    government=tax: ES:Tag:government=tax
+    government=youth_welfare_department: ES:Tag:government=youth welfare department
+    healthcare:speciality=vaccination: ES:Tag:healthcare:speciality=vaccination
+    healthcare=birthing_center: ES:Tag:healthcare=birthing center
+    healthcare=doctor: ES:Tag:healthcare=doctor
+    healthcare=hospital: ES:Tag:healthcare=hospital
+    healthcare=laboratory: ES:Tag:healthcare=laboratory
+    healthcare=midwife: ES:Tag:healthcare=midwife
+    healthcare=podiatrist: ES:Tag:healthcare=podiatrist
     highway=bridleway: ES:Tag:highway=bridleway
     highway=bus_guideway: ES:Tag:highway=bus guideway
     highway=bus_stop: ES:Tag:highway=bus stop
@@ -10044,6 +11832,7 @@ es:
     highway=crossing: ES:Tag:highway=crossing
     highway=cycleway: ES:Tag:highway=cycleway
     highway=elevator: ES:Tag:highway=elevator
+    highway=emergency_access_point: ES:Tag:highway=emergency access point
     highway=escape: ES:Tag:highway=escape
     highway=footway: ES:Tag:highway=footway
     highway=living_street: ES:Tag:highway=living street
@@ -10055,12 +11844,17 @@ es:
     highway=pedestrian: ES:Tag:highway=pedestrian
     highway=platform: ES:Tag:highway=platform
     highway=primary: ES:Tag:highway=primary
+    highway=primary_link: ES:Tag:highway=primary link
+    highway=proposed: ES:Tag:highway=proposed
     highway=raceway: ES:Tag:highway=raceway
     highway=razed: ES:Tag:highway=razed
     highway=residential: ES:Tag:highway=residential
+    highway=rest_area: ES:Tag:highway=rest area
     highway=road: ES:Tag:highway=road
     highway=secondary: ES:Tag:highway=secondary
+    highway=secondary_link: ES:Tag:highway=secondary link
     highway=service: ES:Tag:highway=service
+    highway=speed_camera: ES:Tag:highway=speed camera
     highway=speed_display: ES:Tag:highway=speed display
     highway=steps: ES:Tag:highway=steps
     highway=stop: ES:Tag:highway=stop
@@ -10068,6 +11862,7 @@ es:
     highway=tertiary: ES:Tag:highway=tertiary
     highway=track: ES:Tag:highway=track
     highway=traffic_signals: ES:Tag:highway=traffic signals
+    highway=trailhead: ES:Tag:highway=trailhead
     highway=trunk: ES:Tag:highway=trunk
     highway=turning_circle: ES:Tag:highway=turning circle
     highway=turning_loop: ES:Tag:highway=turning loop
@@ -10075,22 +11870,30 @@ es:
     historic=aqueduct: ES:Tag:historic=aqueduct
     historic=archaeological_site: ES:Tag:historic=archaeological site
     historic=boundary_stone: ES:Tag:historic=boundary stone
+    historic=district: ES:Tag:historic=district
     historic=farm: ES:Tag:historic=farm
     historic=heritage: ES:Tag:historic=heritage
+    historic=manor: ES:Tag:historic=manor
     historic=memorial: ES:Tag:historic=memorial
     historic=milestone: ES:Tag:historic=milestone
+    historic=mine: ES:Tag:historic=mine
     historic=pillory: ES:Tag:historic=pillory
     historic=ruins: ES:Tag:historic=ruins
     historic=tomb: ES:Tag:historic=tomb
+    historic=wayside_cross: ES:Tag:historic=wayside cross
     historic=wayside_shrine: ES:Tag:historic=wayside shrine
     historic=wreck: ES:Tag:historic=wreck
     industrial=auto_wrecker: ES:Tag:industrial=auto wrecker
+    industrial=depot: ES:Tag:industrial=depot
     industrial=factory: ES:Tag:industrial=factory
     industrial=scrap_yard: ES:Tag:industrial=scrap yard
+    industrial=warehouse: ES:Tag:industrial=warehouse
     information=board: ES:Tag:information=board
     information=guidepost: ES:Tag:information=guidepost
     information=map: ES:Tag:information=map
+    information=office: ES:Tag:information=office
     information=tactile_map: ES:Tag:information=tactile map
+    information=visitor_centre: ES:Tag:information=visitor centre
     internet_access=wlan: ES:Tag:internet access=wlan
     junction=circular: ES:Tag:junction=circular
     junction=roundabout: ES:Tag:junction=roundabout
@@ -10103,6 +11906,7 @@ es:
     landuse=basin: ES:Tag:landuse=basin
     landuse=brownfield: ES:Tag:landuse=brownfield
     landuse=cemetery: ES:Tag:landuse=cemetery
+    landuse=commercial: ES:Tag:landuse=commercial
     landuse=construction: ES:Tag:landuse=construction
     landuse=depot: ES:Tag:landuse=depot
     landuse=farmland: ES:Tag:landuse=farmland
@@ -10115,7 +11919,9 @@ es:
     landuse=industrial: ES:Tag:landuse=industrial
     landuse=landfill: ES:Tag:landuse=landfill
     landuse=meadow: ES:Tag:landuse=meadow
+    landuse=meadow_orchard: ES:Tag:landuse=meadow orchard
     landuse=orchard: ES:Tag:landuse=orchard
+    landuse=plant_nursery: ES:Tag:landuse=plant nursery
     landuse=quarry: ES:Tag:landuse=quarry
     landuse=recreation_ground: ES:Tag:landuse=recreation ground
     landuse=reservoir: ES:Tag:landuse=reservoir
@@ -10138,22 +11944,31 @@ es:
     leisure=bleachers: ES:Tag:leisure=bleachers
     leisure=bowling_alley: ES:Tag:leisure=bowling alley
     leisure=common: ES:Tag:leisure=common
+    leisure=disc_golf_course: ES:Tag:leisure=disc golf course
     leisure=dog_park: ES:Tag:leisure=dog park
+    leisure=escape_game: ES:Tag:leisure=escape game
     leisure=firepit: ES:Tag:leisure=firepit
+    leisure=fishing: ES:Tag:leisure=fishing
     leisure=fitness_centre: ES:Tag:leisure=fitness centre
     leisure=fitness_station: ES:Tag:leisure=fitness station
     leisure=garden: ES:Tag:leisure=garden
     leisure=golf_course: ES:Tag:leisure=golf course
+    leisure=hackerspace: ES:Tag:leisure=hackerspace
     leisure=horse_riding: ES:Tag:leisure=horse riding
     leisure=marina: ES:Tag:leisure=marina
     leisure=miniature_golf: ES:Tag:leisure=miniature golf
     leisure=nature_reserve: ES:Tag:leisure=nature reserve
+    leisure=outdoor_seating: ES:Tag:leisure=outdoor seating
     leisure=park: ES:Tag:leisure=park
     leisure=picnic_table: ES:Tag:leisure=picnic table
     leisure=pitch: ES:Tag:leisure=pitch
     leisure=playground: ES:Tag:leisure=playground
+    leisure=sauna: ES:Tag:leisure=sauna
+    leisure=schoolyard: ES:Tag:leisure=schoolyard
+    leisure=slipway: ES:Tag:leisure=slipway
     leisure=sports_centre: ES:Tag:leisure=sports centre
     leisure=sports_hall: ES:Tag:leisure=sports hall
+    leisure=stadium: ES:Tag:leisure=stadium
     leisure=swimming_pool: ES:Tag:leisure=swimming pool
     leisure=tanning_salon: ES:Tag:leisure=tanning salon
     leisure=track: ES:Tag:leisure=track
@@ -10164,12 +11979,16 @@ es:
     man_made=breakwater: ES:Tag:man made=breakwater
     man_made=bridge: ES:Tag:man made=bridge
     man_made=chimney: ES:Tag:man made=chimney
+    man_made=clearcut: ES:Tag:man made=clearcut
+    man_made=compass_rose: ES:Tag:man made=compass rose
     man_made=cross: ES:Tag:man made=cross
     man_made=cutline: ES:Tag:man made=cutline
     man_made=drinking_fountain: ES:Tag:man made=drinking fountain
     man_made=dyke: ES:Tag:man made=dyke
     man_made=embankment: ES:Tag:man made=embankment
     man_made=flagpole: ES:Tag:man made=flagpole
+    man_made=gantry: ES:Tag:man made=gantry
+    man_made=geoglyph: ES:Tag:man made=geoglyph
     man_made=mast: ES:Tag:man made=mast
     man_made=monitoring_station: ES:Tag:man made=monitoring station
     man_made=nesting_site: ES:Tag:man made=nesting site
@@ -10181,6 +12000,7 @@ es:
     man_made=pumping_station: ES:Tag:man made=pumping station
     man_made=reservoir_covered: ES:Tag:man made=reservoir covered
     man_made=storage_tank: ES:Tag:man made=storage tank
+    man_made=street_cabinet: ES:Tag:man made=street cabinet
     man_made=surveillance: ES:Tag:man made=surveillance
     man_made=survey_point: ES:Tag:man made=survey point
     man_made=telescope: ES:Tag:man made=telescope
@@ -10194,9 +12014,11 @@ es:
     man_made=watermill: ES:Tag:man made=watermill
     man_made=wildlife_opening: ES:Tag:man made=wildlife opening
     man_made=windpump: ES:Tag:man made=windpump
+    man_made=works: ES:Tag:man made=works
     manhole=drain: ES:Tag:manhole=drain
     memorial=blue_plaque: ES:Tag:memorial=blue plaque
     memorial=bust: ES:Tag:memorial=bust
+    memorial=cross: ES:Tag:memorial=cross
     memorial=ghost_bike: ES:Tag:memorial=ghost bike
     memorial=obelisk: ES:Tag:memorial=obelisk
     memorial=plaque: ES:Tag:memorial=plaque
@@ -10208,6 +12030,7 @@ es:
     military=naval_base: ES:Tag:military=naval base
     military=training_area: ES:Tag:military=training area
     name=Dollarama: ES:Tag:name=Dollarama
+    name=Herfy: ES:Tag:name=Herfy
     natural=arete: ES:Tag:natural=arete
     natural=avalanche_dam: ES:Tag:natural=avalanche dam
     natural=bare_rock: ES:Tag:natural=bare rock
@@ -10218,6 +12041,7 @@ es:
     natural=cliff: ES:Tag:natural=cliff
     natural=coastline: ES:Tag:natural=coastline
     natural=desert: ES:Tag:natural=desert
+    natural=earth_bank: ES:Tag:natural=earth bank
     natural=esker: ES:Tag:natural=esker
     natural=fell: ES:Tag:natural=fell
     natural=geyser: ES:Tag:natural=geyser
@@ -10225,6 +12049,7 @@ es:
     natural=gorge: ES:Tag:natural=gorge
     natural=grassland: ES:Tag:natural=grassland
     natural=heath: ES:Tag:natural=heath
+    natural=hill: ES:Tag:natural=hill
     natural=meadow: ES:Tag:natural=meadow
     natural=moor: ES:Tag:natural=moor
     natural=mud: ES:Tag:natural=mud
@@ -10249,17 +12074,30 @@ es:
     natural=water: ES:Tag:natural=water
     natural=wetland: ES:Tag:natural=wetland
     natural=wood: ES:Tag:natural=wood
+    network=CR:national: ES:Tag:network=CR: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
     network=VE:ramal:portuguesa: ES:Tag:network=VE:ramal:portuguesa
+    office=accountant: ES:Tag:office=accountant
     office=administrative: ES:Tag:office=administrative
     office=advertising_agency: ES:Tag:office=advertising agency
+    office=architect: ES:Tag:office=architect
     office=association: ES:Tag:office=association
+    office=charity: ES:Tag:office=charity
     office=company: ES:Tag:office=company
+    office=consulting: ES:Tag:office=consulting
+    office=coworking: ES:Tag:office=coworking
+    office=educational_institution: ES:Tag:office=educational institution
+    office=employment_agency: ES:Tag:office=employment agency
     office=energy_supplier: ES:Tag:office=energy supplier
     office=engineer: ES:Tag:office=engineer
     office=estate_agent: ES:Tag:office=estate agent
+    office=financial: ES:Tag:office=financial
+    office=forestry: ES:Tag:office=forestry
     office=foundation: ES:Tag:office=foundation
     office=government: ES:Tag:office=government
+    office=guide: ES:Tag:office=guide
     office=insurance: ES:Tag:office=insurance
     office=it: ES:Tag:office=it
     office=lawyer: ES:Tag:office=lawyer
@@ -10272,39 +12110,68 @@ es:
     office=parish: ES:Tag:office=parish
     office=political_party: ES:Tag:office=political party
     office=private_investigator: ES:Tag:office=private investigator
+    office=property_management: ES:Tag:office=property management
     office=quango: ES:Tag:office=quango
     office=religion: ES:Tag:office=religion
     office=research: ES:Tag:office=research
     office=surveyor: ES:Tag:office=surveyor
     office=tax: ES:Tag:office=tax
+    office=tax_advisor: ES:Tag:office=tax advisor
+    office=telecommunication: ES:Tag:office=telecommunication
     office=therapist: ES:Tag:office=therapist
+    office=travel_agent: ES:Tag:office=travel agent
+    office=visa: ES:Tag:office=visa
     office=water_utility: ES:Tag:office=water utility
+    office=yes: ES:Tag:office=yes
     oneway=reversible: ES:Tag:oneway=reversible
+    operator=GRDF: ES:Tag:operator=GRDF
+    parking=street_side: ES:Tag:parking=street side
     passenger=yes: ES:Tag:passenger=yes
+    place=allotments: ES:Tag:place=allotments
+    place=archipelago: ES:Tag:place=archipelago
     place=borough: ES:Tag:place=borough
     place=city: ES:Tag:place=city
     place=city_block: ES:Tag:place=city block
+    place=continent: ES:Tag:place=continent
     place=country: ES:Tag:place=country
     place=county: ES:Tag:place=county
     place=district: ES:Tag:place=district
+    place=farm: ES:Tag:place=farm
     place=hamlet: ES:Tag:place=hamlet
     place=island: ES:Tag:place=island
     place=islet: ES:Tag:place=islet
     place=isolated_dwelling: ES:Tag:place=isolated dwelling
+    place=locality: ES:Tag:place=locality
     place=municipality: ES:Tag:place=municipality
     place=neighbourhood: ES:Tag:place=neighbourhood
+    place=ocean: ES:Tag:place=ocean
     place=plot: ES:Tag:place=plot
     place=province: ES:Tag:place=province
+    place=quarter: ES:Tag:place=quarter
     place=region: ES:Tag:place=region
+    place=sea: ES:Tag:place=sea
     place=square: ES:Tag:place=square
     place=state: ES:Tag:place=state
     place=suburb: ES:Tag:place=suburb
     place=town: ES:Tag:place=town
     place=village: ES:Tag:place=village
+    police=barracks: ES:Tag:police=barracks
+    police=car_pound: ES:Tag:police=car pound
+    police=checkpoint: ES:Tag:police=checkpoint
+    police=detention: ES:Tag:police=detention
+    police=naval_base: ES:Tag:police=naval base
+    police=offices: ES:Tag:police=offices
+    police=range: ES:Tag:police=range
+    police=storage: ES:Tag:police=storage
+    police=training_area: ES:Tag:police=training area
+    police=yes: ES:Tag:police=yes
     power=generator: ES:Tag:power=generator
     power=heliostat: ES:Tag:power=heliostat
+    power=line: ES:Tag:power=line
     power=pole: ES:Tag:power=pole
+    power=substation: ES:Tag:power=substation
     power=tower: ES:Tag:power=tower
+    power=transformer: ES:Tag:power=transformer
     public_transport=platform: ES:Tag:public transport=platform
     public_transport=station: ES:Tag:public transport=station
     public_transport=stop_area: ES:Tag:public transport=stop area
@@ -10315,26 +12182,51 @@ es:
     railway=crossing: ES:Tag:railway=crossing
     railway=disused: ES:Tag:railway=disused
     railway=level_crossing: ES:Tag:railway=level crossing
+    railway=light_rail: ES:Tag:railway=light rail
     railway=milestone: ES:Tag:railway=milestone
+    railway=monorail: ES:Tag:railway=monorail
     railway=narrow_gauge: ES:Tag:railway=narrow gauge
+    railway=platform: ES:Tag:railway=platform
+    railway=rail: ES:Tag:railway=rail
+    railway=station: ES:Tag:railway=station
     railway=subway: ES:Tag:railway=subway
     railway=subway_entrance: ES:Tag:railway=subway entrance
+    railway=tram: ES:Tag:railway=tram
+    railway=tram_stop: ES:Tag:railway=tram stop
     railway=yard: ES:Tag:railway=yard
+    religion=christian: ES:Tag:religion=christian
+    residential=university: ES:Tag:residential=university
+    roller_coaster=track: ES:Tag:roller coaster=track
     route=bus: ES:Tag:route=bus
+    route=ferry: ES:Tag:route=ferry
+    route=light_rail: ES:Tag:route=light rail
+    route=monorail: ES:Tag:route=monorail
+    route=railway: ES:Tag:route=railway
+    route=road: ES:Tag:route=road
+    route=subway: ES:Tag:route=subway
+    route=train: ES:Tag:route=train
+    route=tram: ES:Tag:route=tram
     route=transhumance: ES:Tag:route=transhumance
+    route=trolleybus: ES:Tag:route=trolleybus
+    route=worship: ES:Tag:route=worship
     service=aircraft_control: ES:Tag:service=aircraft control
     service=alley: ES:Tag:service=alley
     service=crossover: ES:Tag:service=crossover
+    service=drive-through: ES:Tag:service=drive-through
     service=driveway: ES:Tag:service=driveway
+    service=emergency_access: ES:Tag:service=emergency access
     service=parking_aisle: ES:Tag:service=parking aisle
     service=siding: ES:Tag:service=siding
     shelter_type=basic_hut: ES:Tag:shelter type=basic hut
     shelter_type=lean_to: ES:Tag:shelter type=lean to
+    shelter_type=public_transport: ES:Tag:shelter type=public transport
     shop=agrarian: ES:Tag:shop=agrarian
     shop=alcohol: ES:Tag:shop=alcohol
+    shop=appliance: ES:Tag:shop=appliance
     shop=art: ES:Tag:shop=art
     shop=baby_goods: ES:Tag:shop=baby goods
     shop=bakery: ES:Tag:shop=bakery
+    shop=bathroom_furnishing: ES:Tag:shop=bathroom furnishing
     shop=bed: ES:Tag:shop=bed
     shop=beverages: ES:Tag:shop=beverages
     shop=bicycle: ES:Tag:shop=bicycle
@@ -10344,6 +12236,9 @@ es:
     shop=car: ES:Tag:shop=car
     shop=car_parts: ES:Tag:shop=car parts
     shop=car_repair: ES:Tag:shop=car repair
+    shop=carpet: ES:Tag:shop=carpet
+    shop=charity: ES:Tag:shop=charity
+    shop=chemist: ES:Tag:shop=chemist
     shop=chocolate: ES:Tag:shop=chocolate
     shop=clothes: ES:Tag:shop=clothes
     shop=collector: ES:Tag:shop=collector
@@ -10352,33 +12247,53 @@ es:
     shop=convenience: ES:Tag:shop=convenience
     shop=copyshop: ES:Tag:shop=copyshop
     shop=craft: ES:Tag:shop=craft
+    shop=dairy: ES:Tag:shop=dairy
+    shop=deli: ES:Tag:shop=deli
+    shop=department_store: ES:Tag:shop=department store
     shop=doityourself: ES:Tag:shop=doityourself
     shop=electrical: ES:Tag:shop=electrical
     shop=electronics: ES:Tag:shop=electronics
     shop=energy: ES:Tag:shop=energy
+    shop=erotic: ES:Tag:shop=erotic
     shop=fabric: ES:Tag:shop=fabric
     shop=fashion_accessories: ES:Tag:shop=fashion accessories
+    shop=fireplace: ES:Tag:shop=fireplace
+    shop=fishing: ES:Tag:shop=fishing
     shop=florist: ES:Tag:shop=florist
+    shop=food: ES:Tag:shop=food
     shop=funeral_directors: ES:Tag:shop=funeral directors
+    shop=furniture: ES:Tag:shop=furniture
     shop=games: ES:Tag:shop=games
     shop=garden_centre: ES:Tag:shop=garden centre
     shop=gas: ES:Tag:shop=gas
     shop=gift: ES:Tag:shop=gift
+    shop=glaziery: ES:Tag:shop=glaziery
     shop=greengrocer: ES:Tag:shop=greengrocer
     shop=hairdresser: ES:Tag:shop=hairdresser
     shop=hardware: ES:Tag:shop=hardware
+    shop=health_food: ES:Tag:shop=health food
     shop=hearing_aids: ES:Tag:shop=hearing aids
     shop=houseware: ES:Tag:shop=houseware
+    shop=hunting: ES:Tag:shop=hunting
+    shop=hvac: ES:Tag:shop=hvac
     shop=ice_cream: ES:Tag:shop=ice cream
+    shop=insurance: ES:Tag:shop=insurance
+    shop=jetski: ES:Tag:shop=jetski
     shop=jewelry: ES:Tag:shop=jewelry
     shop=kiosk: ES:Tag:shop=kiosk
     shop=kitchen: ES:Tag:shop=kitchen
     shop=laundry: ES:Tag:shop=laundry
     shop=locksmith: ES:Tag:shop=locksmith
     shop=lottery: ES:Tag:shop=lottery
+    shop=mall: ES:Tag:shop=mall
+    shop=medical: ES:Tag:shop=medical
+    shop=medical_supply: ES:Tag:shop=medical supply
     shop=mobile_phone: ES:Tag:shop=mobile phone
     shop=model: ES:Tag:shop=model
     shop=motorcycle: ES:Tag:shop=motorcycle
+    shop=motorcycle_repair: ES:Tag:shop=motorcycle repair
+    shop=music: ES:Tag:shop=music
+    shop=musical_instrument: ES:Tag:shop=musical instrument
     shop=nuts: ES:Tag:shop=nuts
     shop=optician: ES:Tag:shop=optician
     shop=outdoor: ES:Tag:shop=outdoor
@@ -10386,10 +12301,19 @@ es:
     shop=party: ES:Tag:shop=party
     shop=pastry: ES:Tag:shop=pastry
     shop=pawnbroker: ES:Tag:shop=pawnbroker
+    shop=perfumery: ES:Tag:shop=perfumery
     shop=pet: ES:Tag:shop=pet
+    shop=pet_grooming: ES:Tag:shop=pet grooming
+    shop=photo: ES:Tag:shop=photo
     shop=pottery: ES:Tag:shop=pottery
+    shop=radiotechnics: ES:Tag:shop=radiotechnics
+    shop=rental: ES:Tag:shop=rental
+    shop=rice: ES:Tag:shop=rice
     shop=seafood: ES:Tag:shop=seafood
+    shop=second_hand: ES:Tag:shop=second hand
+    shop=security: ES:Tag:shop=security
     shop=sewing: ES:Tag:shop=sewing
+    shop=shoe_repair: ES:Tag:shop=shoe repair
     shop=shoes: ES:Tag:shop=shoes
     shop=sports: ES:Tag:shop=sports
     shop=stationery: ES:Tag:shop=stationery
@@ -10401,11 +12325,14 @@ es:
     shop=tiles: ES:Tag:shop=tiles
     shop=toys: ES:Tag:shop=toys
     shop=trade: ES:Tag:shop=trade
+    shop=travel_agency: ES:Tag:shop=travel agency
     shop=tyres: ES:Tag:shop=tyres
+    shop=vacant: ES:Tag:shop=vacant
     shop=variety_store: ES:Tag:shop=variety store
     shop=video_games: ES:Tag:shop=video games
     shop=watches: ES:Tag:shop=watches
     shop=water: ES:Tag:shop=water
+    shop=weapons: ES:Tag:shop=weapons
     shop=wholesale: ES:Tag:shop=wholesale
     shop=window_blind: ES:Tag:shop=window blind
     shop=yes: ES:Tag:shop=yes
@@ -10413,15 +12340,19 @@ es:
     social_facility=clothing_bank: ES:Tag:social facility=clothing bank
     social_facility=food_bank: ES:Tag:social facility=food bank
     social_facility=nursing_home: ES:Tag:social facility=nursing home
+    social_facility=soup_kitchen: ES:Tag:social facility=soup kitchen
     source:geometry=Bing: ES:Tag:source:geometry=Bing
     sport=boules: ES:Tag:sport=boules
+    sport=bullfighting: ES:Tag:sport=bullfighting
     sport=chess: ES:Tag:sport=chess
     sport=cycling: ES:Tag:sport=cycling
     sport=equestrian: ES:Tag:sport=equestrian
     sport=futsal: ES:Tag:sport=futsal
+    sport=handball: ES:Tag:sport=handball
     sport=model_aerodrome: ES:Tag:sport=model aerodrome
     sport=motocross: ES:Tag:sport=motocross
     sport=motor: ES:Tag:sport=motor
+    sport=multi: ES:Tag:sport=multi
     sport=orienteering: ES:Tag:sport=orienteering
     sport=paddle_tennis: ES:Tag:sport=paddle tennis
     sport=padel: ES:Tag:sport=padel
@@ -10429,12 +12360,28 @@ es:
     sport=pelota: ES:Tag:sport=pelota
     sport=shooting: ES:Tag:sport=shooting
     sport=soccer: ES:Tag:sport=soccer
+    sport=table_tennis: ES:Tag:sport=table tennis
+    sport=water_polo: ES:Tag:sport=water polo
+    station=subway: ES:Tag:station=subway
+    street_vendor=yes: ES:Tag:street vendor=yes
     surface=asphalt: ES:Tag:surface=asphalt
+    surface=compacted: ES:Tag:surface=compacted
+    surface=concrete: ES:Tag:surface=concrete
+    surface=tartan: ES:Tag:surface=tartan
+    surface=unpaved: ES:Tag:surface=unpaved
     switch=disconnector: ES:Tag:switch=disconnector
     telecom=connection_point: ES:Tag:telecom=connection point
     telecom=service_device: ES:Tag:telecom=service device
+    theatre:type=open_air: ES:Tag:theatre:type=open air
+    tomb=cenotaph: ES:Tag:tomb=cenotaph
+    tomb=columbarium: ES:Tag:tomb=columbarium
+    tomb=mausoleum: ES:Tag:tomb=mausoleum
+    tomb=obelisk: ES:Tag:tomb=obelisk
+    tomb=pillar: ES:Tag:tomb=pillar
+    tomb=table: ES:Tag:tomb=table
     tourism=alpine_hut: ES:Tag:tourism=alpine hut
     tourism=apartment: ES:Tag:tourism=apartment
+    tourism=aquarium: ES:Tag:tourism=aquarium
     tourism=artwork: ES:Tag:tourism=artwork
     tourism=attraction: ES:Tag:tourism=attraction
     tourism=camp_site: ES:Tag:tourism=camp site
@@ -10450,6 +12397,7 @@ es:
     tourism=trail_riding_station: ES:Tag:tourism=trail riding station
     tourism=viewpoint: ES:Tag:tourism=viewpoint
     tourism=wilderness_hut: ES:Tag:tourism=wilderness hut
+    tourism=wine_cellar: ES:Tag:tourism=wine cellar
     tower:type=bell_tower: ES:Tag:tower:type=bell tower
     tower:type=communication: ES:Tag:tower:type=communication
     tower:type=cooling: ES:Tag:tower:type=cooling
@@ -10458,21 +12406,34 @@ es:
     tower:type=observation: ES:Tag:tower:type=observation
     tower:type=watchtower: ES:Tag:tower:type=watchtower
     traffic_calming=island: ES:Tag:traffic calming=island
+    trees=oil_palms: ES:Tag:trees=oil palms
+    tunnel=building_passage: ES:Tag:tunnel=building passage
     tunnel=culvert: ES:Tag:tunnel=culvert
     type=public_transport: ES:Tag:type=public transport
+    type=waterway: ES:Tag:type=waterway
+    vending=books: ES:Tag:vending=books
     vending=bread: ES:Tag:vending=bread
+    vending=chemist: ES:Tag:vending=chemist
+    vending=condoms: ES:Tag:vending=condoms
     vending=excrement_bags: ES:Tag:vending=excrement bags
+    vending=fishing_bait: ES:Tag:vending=fishing bait
+    vending=fishing_tackle: ES:Tag:vending=fishing tackle
     vending=flowers: ES:Tag:vending=flowers
     vending=ice_cream: ES:Tag:vending=ice cream
     vending=milk: ES:Tag:vending=milk
+    vending=parcel_mail_in: ES:Tag:vending=parcel mail in
+    vending=parcel_pickup: ES:Tag:vending=parcel pickup
     vending=parking_tickets: ES:Tag:vending=parking tickets
     wall=dry_stone: ES:Tag:wall=dry stone
+    wall=tire_barrier: ES:Tag:wall=tire barrier
     water=lagoon: ES:Tag:water=lagoon
     water=lake: ES:Tag:water=lake
+    water=pond: ES:Tag:water=pond
     water=reservoir: ES:Tag:water=reservoir
     waterway=canal: ES:Tag:waterway=canal
     waterway=dam: ES:Tag:waterway=dam
     waterway=ditch: ES:Tag:waterway=ditch
+    waterway=dock: ES:Tag:waterway=dock
     waterway=drain: ES:Tag:waterway=drain
     waterway=milestone: ES:Tag:waterway=milestone
     waterway=river: ES:Tag:waterway=river
@@ -10480,8 +12441,10 @@ es:
     waterway=stream: ES:Tag:waterway=stream
     waterway=water_point: ES:Tag:waterway=water point
     waterway=weir: ES:Tag:waterway=weir
+    wetland=bog: ES:Tag:wetland=bog
     wetland=tidalflat: ES:Tag:wetland=tidalflat
     wetland=wet_meadow: ES:Tag:wetland=wet meadow
+    worship=stations_of_the_cross: ES:Tag:worship=stations of the cross
 et:
   key:
     addr: Et:Key:addr
@@ -10508,12 +12471,16 @@ fa:
     level: Fa:Key:level
     loc_name: Fa:Key:loc name
     name: Fa:Key:name
+    name:etymology: Fa:Key:name:etymology
     noexit: Fa:Key:noexit
+    roof:shape: Fa:Key:roof:shape
     source: Fa:Key:source
     traffic_calming: Fa:Key:traffic calming
+    wikipedia: Fa:Key:wikipedia
   tag:
     amenity=fountain: Fa:Tag:amenity=fountain
     amenity=fuel: Fa:Tag:amenity=fuel
+    barrier=block: Fa:Tag:barrier=block
     barrier=cable_barrier: Fa:Tag:barrier=cable barrier
     highway=footway: Fa:Tag:highway=footway
     highway=path: Fa:Tag:highway=path
@@ -10527,8 +12494,12 @@ fa:
     highway=unclassified: Fa:Tag:highway=unclassified
     junction=yes: Fa:Tag:junction=yes
     man_made=qanat: Fa:Tag:man made=qanat
+    natural=peak: Fa:Tag:natural=peak
+    natural=ridge: Fa:Tag:natural=ridge
+    office=quango: Fa:Tag:office=quango
     place=country: Fa:Tag:place=country
     service=alley: Fa:Tag:service=alley
+    shop=bookmaker: Fa:Tag:shop=bookmaker
     shop=garden_centre: Fa:Tag:shop=garden centre
     tower:type=cooling: Fa:Tag:tower:type=cooling
     waterway=drain: Fa:Tag:waterway=drain
@@ -10559,6 +12530,8 @@ fi:
     operator: Fi:Key:operator
     parking:lane: Fi:Key:parking:lane
     parking:lane:both: Fi:Key:parking:lane:both
+    pihatie: Fi:Key:pihatie
+    place: Fi:Key:place
     priority_road: Fi:Key:priority road
     pyörä_väistää_aina_autoa: Fi:Key:pyörä väistää aina autoa
     shop: Fi:Key:shop
@@ -10637,6 +12610,7 @@ fr:
   key:
     CEMT: FR:Key:CEMT
     FIXME: FR:Key:FIXME
+    abandoned: FR:Key:abandoned
     'abandoned:': 'FR:Key:abandoned:'
     abutters: FR:Key:abutters
     access: FR:Key:access
@@ -10657,6 +12631,7 @@ fr:
     area: FR:Key:area
     artist_name: FR:Key:artist name
     artwork_type: FR:Key:artwork type
+    attraction: FR:Key:attraction
     backrest: FR:Key:backrest
     backward: FR:Key:backward
     barrier: FR:Key:barrier
@@ -10665,19 +12640,23 @@ fr:
     bench: FR:Key:bench
     bicycle: FR:Key:bicycle
     bicycle_parking: FR:Key:bicycle parking
+    bicycle_road: FR:Key:bicycle road
     board_type: FR:Key:board type
     boat: FR:Key:boat
     bollard: FR:Key:bollard
     books: FR:Key:books
+    branch: FR:Key:branch
     brand: FR:Key:brand
     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:flats: FR:Key:building:flats
     building:levels: FR:Key:building:levels
     building:material: FR:Key:building:material
     building:part: FR:Key:building:part
+    building:prefabricated: FR:Key:building:prefabricated
     building:use: FR:Key:building:use
     bulk_purchase: FR:Key:bulk purchase
     bus: FR:Key:bus
@@ -10686,6 +12665,10 @@ fr:
     camp_site: FR:Key:camp site
     capacity: FR:Key:capacity
     capacity:disabled: FR:Key:capacity:disabled
+    cargo: FR:Key:cargo
+    carpool: FR:Key:carpool
+    cash_withdrawal: FR:Key:cash withdrawal
+    charge: FR:Key:charge
     check_date: FR:Key:check date
     class:bicycle:commute: FR:Key:class:bicycle:commute
     clothes: FR:Key:clothes
@@ -10696,6 +12679,7 @@ fr:
     comment: FR:Key:comment
     communication:bos: FR:Key:communication:bos
     community_centre: FR:Key:community centre
+    community_centre:for: FR:Key:community centre:for
     connection_point: FR:Key:connection point
     construction: FR:Key:construction
     contact: FR:Key:contact
@@ -10710,6 +12694,7 @@ fr:
     craft: FR:Key:craft
     crop: FR:Key:crop
     crossing: FR:Key:crossing
+    crossing:activation: FR:Key:crossing:activation
     crossing:island: FR:Key:crossing:island
     cuisine: FR:Key:cuisine
     currency: FR:Key:currency
@@ -10717,26 +12702,34 @@ fr:
     cyclestreet: FR:Key:cyclestreet
     cycleway: FR:Key:cycleway
     cycleway:lane: FR:Key:cycleway:lane
+    cycleway:left: FR:Key:cycleway:left
     delivery: FR:Key:delivery
     denomination: FR:Key:denomination
     denotation: FR:Key:denotation
     description: FR:Key:description
+    design: FR:Key:design
     designation: FR:Key:designation
     destination: FR:Key:destination
     diet: FR:Key:diet
     diet:*: FR:Key:diet:*
+    diet:kosher: FR:Key:diet:kosher
+    diet:vegan: FR:Key:diet:vegan
     diet:vegetarian: FR:Key:diet:vegetarian
     diplomatic: FR:Key:diplomatic
     direction: FR:Key:direction
     dispensing: FR:Key:dispensing
     distance: FR:Key:distance
-    'disused:': 'FR:Key:disused:'
     door: FR:Key:door
     drink: FR:Key:drink
+    drinking_water: FR:Key:drinking water
+    drinking_water:refill: FR:Key:drinking water:refill
+    drive_in: FR:Key:drive in
+    drive_through: FR:Key:drive through
     dryer: FR:Key:dryer
     ele: FR:Key:ele
     email: FR:Key:email
     embankment: FR:Key:embankment
+    embassy: FR:Key:embassy
     emergency: FR:Key:emergency
     enforcement: FR:Key:enforcement
     entrance: FR:Key:entrance
@@ -10747,8 +12740,10 @@ fr:
     fax: FR:Key:fax
     fee: FR:Key:fee
     female: FR:Key:female
+    fence_type: FR:Key:fence type
     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
@@ -10775,16 +12770,19 @@ fr:
     geological: FR:Key:geological
     government: FR:Key:government
     grande_circulation: FR:Key:grande circulation
+    handle: FR:Key:handle
     happy_hours: FR:Key:happy hours
     healthcare: FR:Key:healthcare
     height: FR:Key:height
     heritage: FR:Key:heritage
     high_water_mark: FR:Key:high water mark
     highway: FR:Key:highway
+    hiking: FR:Key:hiking
     historic: FR:Key:historic
     historic:civilization: FR:Key:historic:civilization
     horse: FR:Key:horse
     hov: FR:Key:hov
+    image: FR:Key:image
     incline: FR:Key:incline
     indoor: FR:Key:indoor
     information: FR:Key:information
@@ -10793,8 +12791,10 @@ fr:
     intermittent: FR:Key:intermittent
     interval: FR:Key:interval
     junction: FR:Key:junction
+    kerb: FR:Key:kerb
     kindergarten:FR: FR:Key:kindergarten:FR
     ladder: FR:Key:ladder
+    landfill:waste: FR:Key:landfill:waste
     landuse: FR:Key:landuse
     lanes: FR:Key:lanes
     layer: FR:Key:layer
@@ -10804,17 +12804,24 @@ fr:
     leisure: FR:Key:leisure
     length: FR:Key:length
     level: FR:Key:level
+    lgbtq: FR:Key:lgbtq
+    line_attachment: FR:Key:line attachment
+    line_management: FR:Key:line management
     lit: FR:Key:lit
     loc_name: FR:Key:loc name
+    local_authority:FR: FR:Key:local authority:FR
     location: FR:Key:location
     lock: FR:Key:lock
     lock_name: FR:Key:lock name
     lock_ref: FR:Key:lock ref
+    locked: FR:Key:locked
+    lottery: FR:Key:lottery
     male: FR:Key:male
     man_made: FR:Key:man made
     manhole: FR:Key:manhole
     manufacturer: FR:Key:manufacturer
     mapillary: FR:Key:mapillary
+    marker: FR:Key:marker
     material: FR:Key:material
     max_age: FR:Key:max age
     maxage: FR:Key:maxage
@@ -10832,20 +12839,26 @@ fr:
     military: FR:Key:military
     min_age: FR:Key:min age
     minage: FR:Key:minage
+    monitoring:bicycle: FR:Key:monitoring:bicycle
     monitoring:meteoric_activity: FR:Key:monitoring:meteoric activity
+    monitoring:water_level: FR:Key:monitoring:water level
     mooring: FR:Key:mooring
     motorboat: FR:Key:motorboat
     motorcycle:parking: FR:Key:motorcycle:parking
     mountain_pass: FR:Key:mountain pass
     mtb:scale: FR:Key:mtb:scale
     name: FR:Key:name
+    name:br: FR:Key:name:br
+    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
     network: FR:Key:network
     noexit: FR:Key:noexit
     non_existent_levels: FR:Key:non existent levels
     noname: FR:Key:noname
+    noref: FR:Key:noref
     note: FR:Key:note
     nudism: FR:Key:nudism
     office: FR:Key:office
@@ -10853,9 +12866,13 @@ fr:
     old_name: FR:Key:old name
     oneway: FR:Key:oneway
     oneway:bicycle: FR:Key:oneway:bicycle
+    open_air: FR:Key:open air
+    openbenches:id: FR:Key:openbenches:id
     openfire: FR:Key:openfire
     opening_date: FR:Key:opening date
     opening_hours: FR:Key:opening hours
+    opening_hours:covid19: FR:Key:opening hours:covid19
+    openplaques:id: FR:Key:openplaques:id
     operator: FR:Key:operator
     operator:type: FR:Key:operator:type
     organic: FR:Key:organic
@@ -10872,6 +12889,7 @@ fr:
     payment:foo: FR:Key:payment:foo
     permanent: FR:Key:permanent
     phone: FR:Key:phone
+    pilgrimage: FR:Key:pilgrimage
     piste:difficulty: FR:Key:piste:difficulty
     piste:grooming: FR:Key:piste:grooming
     place: FR:Key:place
@@ -10891,23 +12909,33 @@ fr:
     pump: FR:Key:pump
     railway: FR:Key:railway
     railway:track_ref: FR:Key:railway:track ref
+    ramp: FR:Key:ramp
     ref: FR:Key:ref
     ref:CEF: FR:Key:ref:CEF
     ref:ERDF:gdo: FR:Key:ref:ERDF:gdo
+    ref:EU:EVSE: FR:Key:ref:EU:EVSE
     ref:FR:42C: FR:Key:ref:FR:42C
     ref:FR:ARCEP: FR:Key:ref:FR:ARCEP
     ref:FR:CEF: FR:Key:ref:FR:CEF
+    ref:FR:CNC: FR:Key:ref:FR:CNC
+    ref:FR:CRTA: FR:Key:ref:FR:CRTA
+    ref:FR:DREAL: FR:Key:ref:FR:DREAL
     ref:FR:FANTOIR: FR:Key:ref:FR:FANTOIR
     ref:FR:FINESS: FR:Key:ref:FR:FINESS
     ref:FR:MemorialGenWeb: FR:Key:ref:FR:MemorialGenWeb
     ref:FR:NAF: FR:Key:ref:FR:NAF
     ref:FR:Orange: FR:Key:ref:FR:Orange
+    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: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:SIREN: FR:Key:ref:FR:SIREN
     ref:FR:SIRET: FR:Key:ref:FR:SIRET
     ref:FR:commune: FR:Key:ref:FR:commune
+    ref:FR:gdo: FR:Key:ref:FR:gdo
+    ref:FR:museofile: FR:Key:ref:FR:museofile
     ref:INSEE: FR:Key:ref:INSEE
     ref:RTE:codnat: FR:Key:ref:RTE:codnat
     ref:UAI: FR:Key:ref:UAI
@@ -10920,6 +12948,7 @@ fr:
     residential: FR:Key:residential
     resource: FR:Key:resource
     right: FR:Key:right
+    roof:direction: FR:Key:roof:direction
     roof:material: FR:Key:roof:material
     room: FR:Key:room
     ruins: FR:Key:ruins
@@ -10927,6 +12956,7 @@ fr:
     salt: FR:Key:salt
     sanitary_dump_station: FR:Key:sanitary dump station
     seamark:fixme: FR:Key:seamark:fixme
+    seasonal: FR:Key:seasonal
     second_hand: FR:Key:second hand
     segregated: FR:Key:segregated
     self_service: FR:Key:self service
@@ -10936,6 +12966,7 @@ fr:
     shelter_type: FR:Key:shelter type
     shop: FR:Key:shop
     short_name: FR:Key:short name
+    shoulder: FR:Key:shoulder
     sides: FR:Key:sides
     sidewalk: FR:Key:sidewalk
     sinkhole: FR:Key:sinkhole
@@ -10947,6 +12978,7 @@ fr:
     source:date: FR:Key:source:date
     source:maxspeed: FR:Key:source:maxspeed
     source:maxwidth: FR:Key:source:maxwidth
+    source:name:br: FR:Key:source:name:br
     species: FR:Key:species
     species:fr: FR:Key:species:fr
     sport: FR:Key:sport
@@ -10955,6 +12987,7 @@ fr:
     step:condition: FR:Key:step:condition
     step:contrast: FR:Key:step:contrast
     step_count: FR:Key:step count
+    stop: FR:Key:stop
     support: FR:Key:support
     surface: FR:Key:surface
     surveillance: FR:Key:surveillance
@@ -10964,6 +12997,7 @@ fr:
     tactile_paving: FR:Key:tactile paving
     takeaway: FR:Key:takeaway
     telecom: FR:Key:telecom
+    telecom:medium: FR:Key:telecom:medium
     tickets:public_transport_subscription: FR:Key:tickets:public transport subscription
     tidal: FR:Key:tidal
     timezone: FR:Key:timezone
@@ -10974,6 +13008,8 @@ fr:
     tracktype: FR:Key:tracktype
     traffic_calming: FR:Key:traffic calming
     traffic_sign: FR:Key:traffic sign
+    traffic_sign:direction: FR:Key:traffic sign:direction
+    traffic_signals: FR:Key:traffic signals
     traffic_signals:direction: FR:Key:traffic signals:direction
     traffic_signals:sound: FR:Key:traffic signals:sound
     trail_visibility: FR:Key:trail visibility
@@ -10982,13 +13018,16 @@ fr:
     tunnel: FR:Key:tunnel
     turn: FR:Key:turn
     turn:lanes: FR:Key:turn:lanes
+    turn_to_close: FR:Key:turn to close
     turning_radius: FR:Key:turning radius
     type: FR:Key:type
     type:FR:FINESS: FR:Key:type:FR:FINESS
     unisex: FR:Key:unisex
     url: FR:Key:url
     usage: FR:Key:usage
+    utility: FR:Key:utility
     valve: FR:Key:valve
+    vine_row_orientation: FR:Key:vine row orientation
     visibility: FR:Key:visibility
     voltage: FR:Key:voltage
     waste: FR:Key:waste
@@ -11004,6 +13043,7 @@ fr:
     wikipedia: FR:Key:wikipedia
     windings: FR:Key:windings
     xmas:feature: FR:Key:xmas:feature
+    year_of_construction: FR:Key:year of construction
   tag:
     Bascule_publique: FR:Tag:Bascule publique
     FIXME=Position_estimated: FR:Tag:FIXME=Position estimated
@@ -11012,12 +13052,21 @@ fr:
     access=designated: FR:Tag:access=designated
     access=no: FR:Tag:access=no
     access=private: FR:Tag:access=private
+    actuator=electric_motor: FR:Tag:actuator=electric motor
+    actuator=hydraulic_cylinder: FR:Tag:actuator=hydraulic cylinder
+    actuator=manual: FR:Tag:actuator=manual
+    actuator=pneumatic_cylinder: FR:Tag:actuator=pneumatic cylinder
     advertising=billboard: FR:Tag:advertising=billboard
     advertising=board: FR:Tag:advertising=board
     advertising=column: FR:Tag:advertising=column
     advertising=flag: FR:Tag:advertising=flag
     advertising=poster_box: FR:Tag:advertising=poster box
+    advertising=screen: FR:Tag:advertising=screen
+    advertising=sculpture: FR:Tag:advertising=sculpture
+    advertising=sign: FR:Tag:advertising=sign
+    advertising=tarp: FR:Tag:advertising=tarp
     advertising=totem: FR:Tag:advertising=totem
+    advertising=wall_painting: FR:Tag:advertising=wall painting
     aerialway=cable_car: FR:Tag:aerialway=cable car
     aerialway=chair_lift: FR:Tag:aerialway=chair lift
     aeroway=aerodrome: FR:Tag:aeroway=aerodrome
@@ -11025,6 +13074,7 @@ fr:
     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=parking_position: FR:Tag:aeroway=parking position
     aeroway=runway: FR:Tag:aeroway=runway
     aeroway=taxiway: FR:Tag:aeroway=taxiway
@@ -11041,6 +13091,8 @@ fr:
     amenity=bicycle_rental: FR:Tag:amenity=bicycle rental
     amenity=bicycle_repair_station: FR:Tag:amenity=bicycle repair station
     amenity=biergarten: FR:Tag:amenity=biergarten
+    amenity=binoculars: FR:Tag:amenity=binoculars
+    amenity=boat_rental: FR:Tag:amenity=boat rental
     amenity=boat_sharing: FR:Tag:amenity=boat sharing
     amenity=brothel: FR:Tag:amenity=brothel
     amenity=bus_station: FR:Tag:amenity=bus station
@@ -11048,7 +13100,9 @@ fr:
     amenity=car_pooling: FR:Tag:amenity=car pooling
     amenity=car_rental: FR:Tag:amenity=car rental
     amenity=car_sharing: FR:Tag:amenity=car sharing
+    amenity=casino: FR:Tag:amenity=casino
     amenity=charging_station: FR:Tag:amenity=charging station
+    amenity=childcare: FR:Tag:amenity=childcare
     amenity=cinema: FR:Tag:amenity=cinema
     amenity=clinic: FR:Tag:amenity=clinic
     amenity=college: FR:Tag:amenity=college
@@ -11060,7 +13114,9 @@ fr:
     amenity=crematorium: FR:Tag:amenity=crematorium
     amenity=crypt: FR:Tag:amenity=crypt
     amenity=dentist: FR:Tag:amenity=dentist
+    amenity=device_charging_station: FR:Tag:amenity=device charging station
     amenity=doctors: FR:Tag:amenity=doctors
+    amenity=dog_toilet: FR:Tag:amenity=dog toilet
     amenity=drinking_water: FR:Tag:amenity=drinking water
     amenity=driving_school: FR:Tag:amenity=driving school
     amenity=dryer: FR:Tag:amenity=dryer
@@ -11072,8 +13128,11 @@ fr:
     amenity=food_court: FR:Tag:amenity=food court
     amenity=fountain: FR:Tag:amenity=fountain
     amenity=fuel: FR:Tag:amenity=fuel
+    amenity=funeral_hall: FR:Tag:amenity=funeral hall
+    amenity=give_box: FR:Tag:amenity=give box
     amenity=grave_yard: FR:Tag:amenity=grave yard
     amenity=grit_bin: FR:Tag:amenity=grit bin
+    amenity=health_post: FR:Tag:amenity=health post
     amenity=hookah_lounge: FR:Tag:amenity=hookah lounge
     amenity=hospital: FR:Tag:amenity=hospital
     amenity=hunting_stand: FR:Tag:amenity=hunting stand
@@ -11082,12 +13141,16 @@ fr:
     amenity=lavoir: FR:Tag:amenity=lavoir
     amenity=letter_box: FR:Tag:amenity=letter box
     amenity=library: FR:Tag:amenity=library
+    amenity=loading_dock: FR:Tag:amenity=loading dock
     amenity=love_hotel: FR:Tag:amenity=love hotel
     amenity=marae: FR:Tag:amenity=marae
     amenity=marketplace: FR:Tag:amenity=marketplace
+    amenity=monastery: FR:Tag:amenity=monastery
     amenity=mortuary: FR:Tag:amenity=mortuary
     amenity=motorcycle_parking: FR:Tag:amenity=motorcycle parking
+    amenity=music_school: FR:Tag:amenity=music school
     amenity=nightclub: FR:Tag:amenity=nightclub
+    amenity=nursing_home: FR:Tag:amenity=nursing home
     amenity=parking: FR:Tag:amenity=parking
     amenity=parking_entrance: FR:Tag:amenity=parking entrance
     amenity=parking_space: FR:Tag:amenity=parking space
@@ -11096,7 +13159,9 @@ fr:
     amenity=place_of_worship: FR:Tag:amenity=place of worship
     amenity=planetarium: FR:Tag:amenity=planetarium
     amenity=police: FR:Tag:amenity=police
+    amenity=polling_station: FR:Tag:amenity=polling station
     amenity=post_box: FR:Tag:amenity=post box
+    amenity=post_depot: FR:Tag:amenity=post depot
     amenity=post_office: FR:Tag:amenity=post office
     amenity=prison: FR:Tag:amenity=prison
     amenity=pub: FR:Tag:amenity=pub
@@ -11104,6 +13169,7 @@ fr:
     amenity=reception_desk: FR:Tag:amenity=reception desk
     amenity=recycling: FR:Tag:amenity=recycling
     amenity=restaurant: FR:Tag:amenity=restaurant
+    amenity=retirement_home: FR:Tag:amenity=retirement home
     amenity=sanitary_dump_station: FR:Tag:amenity=sanitary dump station
     amenity=school: FR:Tag:amenity=school
     amenity=shelter: FR:Tag:amenity=shelter
@@ -11118,6 +13184,7 @@ fr:
     amenity=theatre: FR:Tag:amenity=theatre
     amenity=toilets: FR:Tag:amenity=toilets
     amenity=townhall: FR:Tag:amenity=townhall
+    amenity=toy_library: FR:Tag:amenity=toy library
     amenity=university: FR:Tag:amenity=university
     amenity=vacuum_cleaner: FR:Tag:amenity=vacuum cleaner
     amenity=vehicle_inspection: FR:Tag:amenity=vehicle inspection
@@ -11126,36 +13193,73 @@ fr:
     amenity=washing_machine: FR:Tag:amenity=washing machine
     amenity=waste_basket: FR:Tag:amenity=waste basket
     amenity=waste_disposal: FR:Tag:amenity=waste disposal
+    amenity=waste_transfer_station: FR:Tag:amenity=waste transfer station
     amenity=water_point: FR:Tag:amenity=water point
     amenity=watering_place: FR:Tag:amenity=watering place
     amenity=weighbridge: FR:Tag:amenity=weighbridge
     animal=horse_walker: FR:Tag:animal=horse walker
     anthropogenic=yes: FR:Tag:anthropogenic=yes
+    artwork_type=sculpture: FR:Tag:artwork type=sculpture
     atm=yes: FR:Tag:atm=yes
+    attraction=animal: FR:Tag:attraction=animal
     barrier=block: FR:Tag:barrier=block
     barrier=bollard: FR:Tag:barrier=bollard
+    barrier=border_control: FR:Tag:barrier=border control
+    barrier=bump_gate: FR:Tag:barrier=bump gate
+    barrier=bus_trap: FR:Tag:barrier=bus trap
+    barrier=cable_barrier: FR:Tag:barrier=cable barrier
+    barrier=cattle_grid: FR:Tag:barrier=cattle grid
+    barrier=chain: FR:Tag:barrier=chain
     barrier=city_wall: FR:Tag:barrier=city wall
     barrier=cycle_barrier: FR:Tag:barrier=cycle barrier
+    barrier=debris: FR:Tag:barrier=debris
+    barrier=ditch: FR:Tag:barrier=ditch
     barrier=entrance: FR:Tag:barrier=entrance
     barrier=fence: FR:Tag:barrier=fence
+    barrier=full-height_turnstile: FR:Tag:barrier=full-height turnstile
     barrier=gate: FR:Tag:barrier=gate
     barrier=guard_rail: FR:Tag:barrier=guard rail
     barrier=hampshire_gate: FR:Tag:barrier=hampshire gate
+    barrier=handrail: FR:Tag:barrier=handrail
     barrier=hedge: FR:Tag:barrier=hedge
     barrier=hedge_bank: FR:Tag:barrier=hedge bank
+    barrier=height_restrictor: FR:Tag:barrier=height restrictor
     barrier=horse_stile: FR:Tag:barrier=horse stile
+    barrier=jersey_barrier: FR:Tag:barrier=jersey barrier
+    barrier=kent_carriage_gap: FR:Tag:barrier=kent carriage gap
+    barrier=kerb: FR:Tag:barrier=kerb
+    barrier=kissing_gate: FR:Tag:barrier=kissing gate
     barrier=lift_gate: FR:Tag:barrier=lift gate
+    barrier=log: FR:Tag:barrier=log
+    barrier=motorcycle_barrier: FR:Tag:barrier=motorcycle barrier
     barrier=retaining_wall: FR:Tag:barrier=retaining wall
     barrier=rope: FR:Tag:barrier=rope
+    barrier=sally_port: FR:Tag:barrier=sally port
     barrier=select_acces: FR:Tag:barrier=select acces
+    barrier=spikes: FR:Tag:barrier=spikes
+    barrier=stile: FR:Tag:barrier=stile
+    barrier=sump_buster: FR:Tag:barrier=sump buster
+    barrier=swing_gate: FR:Tag:barrier=swing gate
+    barrier=tank_trap: FR:Tag:barrier=tank trap
+    barrier=toll_booth: FR:Tag:barrier=toll booth
     barrier=turnstile: FR:Tag:barrier=turnstile
     barrier=wall: FR:Tag:barrier=wall
+    basin=detention: FR:Tag:basin=detention
+    basin=infiltration: FR:Tag:basin=infiltration
+    basin=retention: FR:Tag:basin=retention
     bicycle=use_sidepath: FR:Tag:bicycle=use sidepath
     boundary=administrative: FR:Tag:boundary=administrative
+    boundary=special_economic_zone: FR:Tag:boundary=special economic zone
     brand=Trilib': FR:Tag:brand=Trilib'
+    bridge=aqueduct: FR:Tag:bridge=aqueduct
     bridge=boardwalk: FR:Tag:bridge=boardwalk
+    bridge=cantilever: FR:Tag:bridge=cantilever
+    bridge=movable: FR:Tag:bridge=movable
+    bridge=trestle: FR:Tag:bridge=trestle
+    bridge=viaduct: FR:Tag:bridge=viaduct
     building=apartments: FR:Tag:building=apartments
     building=barn: FR:Tag:building=barn
+    building=bridge: FR:Tag:building=bridge
     building=cabin: FR:Tag:building=cabin
     building=chapel: FR:Tag:building=chapel
     building=church: FR:Tag:building=church
@@ -11163,8 +13267,11 @@ fr:
     building=construction: FR:Tag:building=construction
     building=detached: FR:Tag:building=detached
     building=farm: FR:Tag:building=farm
+    building=fire_station: FR:Tag:building=fire station
     building=garage: FR:Tag:building=garage
     building=garages: FR:Tag:building=garages
+    building=gatehouse: FR:Tag:building=gatehouse
+    building=ger: FR:Tag:building=ger
     building=grandstand: FR:Tag:building=grandstand
     building=greenhouse: FR:Tag:building=greenhouse
     building=hangar: FR:Tag:building=hangar
@@ -11172,12 +13279,15 @@ fr:
     building=house: FR:Tag:building=house
     building=hut: FR:Tag:building=hut
     building=kiosk: FR:Tag:building=kiosk
+    building=office: FR:Tag:building=office
     building=pavilion: FR:Tag:building=pavilion
     building=public: FR:Tag:building=public
     building=residential: FR:Tag:building=residential
+    building=retail: FR:Tag:building=retail
     building=riding_hall: FR:Tag:building=riding hall
     building=roof: FR:Tag:building=roof
     building=ruins: FR:Tag:building=ruins
+    building=semidetached_house: FR:Tag:building=semidetached house
     building=shed: FR:Tag:building=shed
     building=sports_hall: FR:Tag:building=sports hall
     building=stable: FR:Tag:building=stable
@@ -11215,6 +13325,7 @@ fr:
     craft=engraver: FR:Tag:craft=engraver
     craft=floorer: FR:Tag:craft=floorer
     craft=gardener: FR:Tag:craft=gardener
+    craft=glassblower: FR:Tag:craft=glassblower
     craft=glaziery: FR:Tag:craft=glaziery
     craft=goldsmith: FR:Tag:craft=goldsmith
     craft=grinding_mill: FR:Tag:craft=grinding mill
@@ -11276,16 +13387,29 @@ fr:
     cycleway=opposite_lane: FR:Tag:cycleway=opposite lane
     cycleway=share_busway: FR:Tag:cycleway=share busway
     disused=yes: FR:Tag:disused=yes
-    emergency=aed: FR:Tag:emergency=aed
+    emergency=access_point: FR:Tag:emergency=access point
+    emergency=ambulance_station: FR:Tag:emergency=ambulance station
+    emergency=assembly_point: FR:Tag:emergency=assembly point
     emergency=defibrillator: FR:Tag:emergency=defibrillator
+    emergency=dry_riser_inlet: FR:Tag:emergency=dry riser inlet
     emergency=emergency_ward_entrance: FR:Tag:emergency=emergency ward entrance
+    emergency=fire_alarm_box: FR:Tag:emergency=fire alarm box
     emergency=fire_extinguisher: FR:Tag:emergency=fire extinguisher
+    emergency=fire_flapper: FR:Tag:emergency=fire flapper
     emergency=fire_hose: FR:Tag:emergency=fire hose
     emergency=fire_hydrant: FR:Tag:emergency=fire hydrant
+    emergency=fire_sand_bin: FR:Tag:emergency=fire sand bin
+    emergency=fire_water_pond: FR:Tag:emergency=fire water pond
+    emergency=landing_site: FR:Tag:emergency=landing site
+    emergency=life_ring: FR:Tag:emergency=life ring
+    emergency=lifeguard: FR:Tag:emergency=lifeguard
+    emergency=lifeguard_tower: FR:Tag:emergency=lifeguard tower
+    emergency=mountain_rescue: FR:Tag:emergency=mountain rescue
     emergency=phone: FR:Tag:emergency=phone
     emergency=siren: FR:Tag:emergency=siren
     emergency=suction_point: FR:Tag:emergency=suction point
     emergency=water_rescue_station: FR:Tag:emergency=water rescue station
+    emergency=water_tank: FR:Tag:emergency=water tank
     fast_food=cafeteria: FR:Tag:fast food=cafeteria
     footway=crossing: FR:Tag:footway=crossing
     footway=sidewalk: FR:Tag:footway=sidewalk
@@ -11306,8 +13430,13 @@ fr:
     generator:source=solar: FR:Tag:generator:source=solar
     generator:source=tidal: FR:Tag:generator:source=tidal
     generator:source=wind: FR:Tag:generator:source=wind
+    government=ministry: FR:Tag:government=ministry
+    government=register_office: FR:Tag:government=register office
+    government=tax: FR:Tag:government=tax
     handle=wheel: FR:Tag:handle=wheel
+    healthcare=blood_donation: FR:Tag:healthcare=blood donation
     healthcare=laboratory: FR:Tag:healthcare=laboratory
+    healthcare=physiotherapist: FR:Tag:healthcare=physiotherapist
     highway=bridleway: FR:Tag:highway=bridleway
     highway=bus_guideway: FR:Tag:highway=bus guideway
     highway=bus_stop: FR:Tag:highway=bus stop
@@ -11323,6 +13452,7 @@ fr:
     highway=milestone: FR:Tag:highway=milestone
     highway=mini_roundabout: FR:Tag:highway=mini roundabout
     highway=motorway: FR:Tag:highway=motorway
+    highway=motorway_junction: FR:Tag:highway=motorway junction
     highway=motorway_link: FR:Tag:highway=motorway link
     highway=path: FR:Tag:highway=path
     highway=pedestrian: FR:Tag:highway=pedestrian
@@ -11338,6 +13468,7 @@ fr:
     highway=speed_display: FR:Tag:highway=speed display
     highway=steps: FR:Tag:highway=steps
     highway=stop: FR:Tag:highway=stop
+    highway=street_lamp: FR:Tag:highway=street lamp
     highway=tertiary: FR:Tag:highway=tertiary
     highway=track: FR:Tag:highway=track
     highway=traffic_mirror: FR:Tag:highway=traffic mirror
@@ -11351,6 +13482,7 @@ fr:
     historic=boundary_stone: FR:Tag:historic=boundary stone
     historic=cannon: FR:Tag:historic=cannon
     historic=castle: FR:Tag:historic=castle
+    historic=charcoal_pile: FR:Tag:historic=charcoal pile
     historic=city_gate: FR:Tag:historic=city gate
     historic=citywalls: FR:Tag:historic=citywalls
     historic=farm: FR:Tag:historic=farm
@@ -11403,17 +13535,20 @@ fr:
     landuse=grass: FR:Tag:landuse=grass
     landuse=greenhouse_horticulture: FR:Tag:landuse=greenhouse horticulture
     landuse=industrial: FR:Tag:landuse=industrial
+    landuse=landfill: FR:Tag:landuse=landfill
     landuse=meadow: FR:Tag:landuse=meadow
     landuse=orchard: FR:Tag:landuse=orchard
     landuse=plant_nursery: FR:Tag:landuse=plant nursery
     landuse=pond: FR:Tag:landuse=pond
     landuse=quarry: FR:Tag:landuse=quarry
+    landuse=religious: FR:Tag:landuse=religious
     landuse=residential: FR:Tag:landuse=residential
     landuse=retail: FR:Tag:landuse=retail
     landuse=salt_pond: FR:Tag:landuse=salt pond
     landuse=village_green: FR:Tag:landuse=village green
     leaf_cycle=deciduous: FR:Tag:leaf cycle=deciduous
     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=dance: FR:Tag:leisure=dance
@@ -11422,6 +13557,7 @@ fr:
     leisure=firepit: FR:Tag:leisure=firepit
     leisure=fishing: FR:Tag:leisure=fishing
     leisure=fitness_centre: FR:Tag:leisure=fitness centre
+    leisure=fitness_station: FR:Tag:leisure=fitness station
     leisure=garden: FR:Tag:leisure=garden
     leisure=golf_course: FR:Tag:leisure=golf course
     leisure=hackerspace: FR:Tag:leisure=hackerspace
@@ -11441,12 +13577,21 @@ fr:
     leisure=tanning_salon: FR:Tag:leisure=tanning salon
     leisure=track: FR:Tag:leisure=track
     leisure=water_park: FR:Tag:leisure=water park
+    line_attachment=anchor: FR:Tag:line attachment=anchor
+    line_attachment=pin: FR:Tag:line attachment=pin
+    line_attachment=pulley: FR:Tag:line attachment=pulley
+    line_attachment=suspension: FR:Tag:line attachment=suspension
+    line_management=branch: FR:Tag:line management=branch
+    line_management=split: FR:Tag:line management=split
     man_made=adit: FR:Tag:man made=adit
     man_made=beehive: FR:Tag:man made=beehive
+    man_made=bridge: FR:Tag:man made=bridge
     man_made=carpet_hanger: FR:Tag:man made=carpet hanger
     man_made=cutline: FR:Tag:man made=cutline
     man_made=dovecote: FR:Tag:man made=dovecote
     man_made=flagpole: FR:Tag:man made=flagpole
+    man_made=flare: FR:Tag:man made=flare
+    man_made=ice_house: FR:Tag:man made=ice house
     man_made=insect_hotel: FR:Tag:man made=insect hotel
     man_made=kiln: FR:Tag:man made=kiln
     man_made=lighthouse: FR:Tag:man made=lighthouse
@@ -11455,20 +13600,32 @@ fr:
     man_made=monitoring_station: FR:Tag:man made=monitoring station
     man_made=petroleum_well: FR:Tag:man made=petroleum well
     man_made=pier: FR:Tag:man made=pier
+    man_made=planter: FR:Tag:man made=planter
     man_made=pumping_rig: FR:Tag:man made=pumping rig
     man_made=reservoir_covered: FR:Tag:man made=reservoir covered
+    man_made=snow_cannon: FR:Tag:man made=snow cannon
     man_made=street_cabinet: FR:Tag:man made=street cabinet
     man_made=surveillance: FR:Tag:man made=surveillance
     man_made=survey_point: FR:Tag:man made=survey point
     man_made=tower: FR:Tag:man made=tower
     man_made=wastewater_plant: FR:Tag:man made=wastewater plant
+    man_made=water_tap: FR:Tag:man made=water tap
     man_made=water_tower: FR:Tag:man made=water tower
     man_made=water_well: FR:Tag:man made=water well
     man_made=water_works: FR:Tag:man made=water works
     man_made=watermill: FR:Tag:man made=watermill
+    man_made=wildlife_crossing: FR:Tag:man made=wildlife crossing
     man_made=windmill: FR:Tag:man made=windmill
     man_made=windpump: FR:Tag:man made=windpump
+    man_made_chimney: FR:Tag:man made chimney
+    marker=aerial: FR:Tag:marker=aerial
+    marker=ground: FR:Tag:marker=ground
+    marker=pedestal: FR:Tag:marker=pedestal
+    marker=plate: FR:Tag:marker=plate
+    marker=post: FR:Tag:marker=post
+    marker=stone: FR:Tag:marker=stone
     medical=aed: FR:Tag:medical=aed
+    memorial=ghost_bike: FR:Tag:memorial=ghost bike
     memorial=plaque: FR:Tag:memorial=plaque
     microbrewery=yes: FR:Tag:microbrewery=yes
     military=bunker: FR:Tag:military=bunker
@@ -11486,6 +13643,7 @@ fr:
     natural=saddle: FR:Tag:natural=saddle
     natural=scree: FR:Tag:natural=scree
     natural=scrub: FR:Tag:natural=scrub
+    natural=shrub: FR:Tag:natural=shrub
     natural=sinkhole: FR:Tag:natural=sinkhole
     natural=spring: FR:Tag:natural=spring
     natural=stone: FR:Tag:natural=stone
@@ -11494,8 +13652,11 @@ fr:
     natural=volcano: FR:Tag:natural=volcano
     natural=water: FR:Tag:natural=water
     natural=wetland: FR:Tag:natural=wetland
+    natural=wood: FR:Tag:natural=wood
+    office=advertising_agency: FR:Tag:office=advertising agency
     office=association: FR:Tag:office=association
     office=company: FR:Tag:office=company
+    office=diplomatic: FR:Tag:office=diplomatic
     office=educational_institution: FR:Tag:office=educational institution
     office=employment_agency: FR:Tag:office=employment agency
     office=estate_agent: FR:Tag:office=estate agent
@@ -11503,19 +13664,31 @@ fr:
     office=government: FR:Tag:office=government
     office=insurance: FR:Tag:office=insurance
     office=lawyer: FR:Tag:office=lawyer
+    office=logistics: FR:Tag:office=logistics
+    office=newspaper: FR:Tag:office=newspaper
     office=ngo: FR:Tag:office=ngo
+    office=political_party: FR:Tag:office=political party
+    office=religion: FR:Tag:office=religion
+    operator=ERDF: FR:Tag:operator=ERDF
+    operator=Enedis: FR:Tag:operator=Enedis
+    operator=GRDF: FR:Tag:operator=GRDF
+    parking=street_side: FR:Tag:parking=street side
+    pipeline=valve: FR:Tag:pipeline=valve
     piste:type=nordic: FR:Tag:piste:type=nordic
     place=city: FR:Tag:place=city
     place=hamlet: FR:Tag:place=hamlet
     place=island: FR:Tag:place=island
     place=isolated_dwelling: FR:Tag:place=isolated dwelling
     place=locality: FR:Tag:place=locality
+    place=municipality: FR:Tag:place=municipality
     place=neighbourhood: FR:Tag:place=neighbourhood
     place=square: FR:Tag:place=square
     place=suburb: FR:Tag:place=suburb
     place=town: FR:Tag:place=town
     place=village: FR:Tag:place=village
+    plant:source=nuclear: FR:Tag:plant:source=nuclear
     power=cable: FR:Tag:power=cable
+    power=circuit: FR:Tag:power=circuit
     power=compensator: FR:Tag:power=compensator
     power=converter: FR:Tag:power=converter
     power=generator: FR:Tag:power=generator
@@ -11579,6 +13752,7 @@ fr:
     segregated=no: FR:Tag:segregated=no
     segregated=yes: FR:Tag:segregated=yes
     service=alley: FR:Tag:service=alley
+    service=drive-through: FR:Tag:service=drive-through
     service=driveway: FR:Tag:service=driveway
     service=parking_aisle: FR:Tag:service=parking aisle
     shelter_type=basic_hut: FR:Tag:shelter type=basic hut
@@ -11597,6 +13771,7 @@ fr:
     shop=books: FR:Tag:shop=books
     shop=boutique: FR:Tag:shop=boutique
     shop=butcher: FR:Tag:shop=butcher
+    shop=cannabis: FR:Tag:shop=cannabis
     shop=car: FR:Tag:shop=car
     shop=car_parts: FR:Tag:shop=car parts
     shop=car_repair: FR:Tag:shop=car repair
@@ -11613,6 +13788,7 @@ fr:
     shop=dive: FR:Tag:shop=dive
     shop=doityourself: FR:Tag:shop=doityourself
     shop=dry_cleaning: FR:Tag:shop=dry cleaning
+    shop=e-cigarette: FR:Tag:shop=e-cigarette
     shop=electronics: FR:Tag:shop=electronics
     shop=erotic: FR:Tag:shop=erotic
     shop=farm: FR:Tag:shop=farm
@@ -11626,10 +13802,12 @@ fr:
     shop=furniture: FR:Tag:shop=furniture
     shop=garden_centre: FR:Tag:shop=garden centre
     shop=gift: FR:Tag:shop=gift
+    shop=greengrocer: FR:Tag:shop=greengrocer
     shop=haberdashery: FR:Tag:shop=haberdashery
     shop=hairdresser: FR:Tag:shop=hairdresser
     shop=hardware: FR:Tag:shop=hardware
     shop=household_linen: FR:Tag:shop=household linen
+    shop=houseware: FR:Tag:shop=houseware
     shop=hunting: FR:Tag:shop=hunting
     shop=interior_decoration: FR:Tag:shop=interior decoration
     shop=jewelry: FR:Tag:shop=jewelry
@@ -11652,25 +13830,32 @@ fr:
     shop=second_hand: FR:Tag:shop=second hand
     shop=sewing: FR:Tag:shop=sewing
     shop=shoes: FR:Tag:shop=shoes
+    shop=stationery: FR:Tag:shop=stationery
     shop=supermarket: FR:Tag:shop=supermarket
     shop=ticket: FR:Tag:shop=ticket
     shop=toys: FR:Tag:shop=toys
     shop=trade: FR:Tag:shop=trade
     shop=vacant: FR:Tag:shop=vacant
+    shop=variety_store: FR:Tag:shop=variety store
     shop=video: FR:Tag:shop=video
     shop=video_games: FR:Tag:shop=video games
     sinkhole=estavelle: FR:Tag:sinkhole=estavelle
+    social_facility=ambulatory_care: FR:Tag:social facility=ambulatory care
     sport=8pin: FR:Tag:sport=8pin
     sport=archery: FR:Tag:sport=archery
     sport=billiards: FR:Tag:sport=billiards
     sport=bmx: FR:Tag:sport=bmx
     sport=boules: FR:Tag:sport=boules
+    sport=chinlone: FR:Tag:sport=chinlone
     sport=climbing: FR:Tag:sport=climbing
     sport=darts: FR:Tag:sport=darts
     sport=equestrian: FR:Tag:sport=equestrian
     sport=fencing: FR:Tag:sport=fencing
     sport=free_flying: FR:Tag:sport=free flying
+    sport=hockey: FR:Tag:sport=hockey
     sport=horse_racing: FR:Tag:sport=horse racing
+    sport=rugby_league: FR:Tag:sport=rugby league
+    sport=rugby_union: FR:Tag:sport=rugby union
     sport=sailing: FR:Tag:sport=sailing
     sport=shooting: FR:Tag:sport=shooting
     sport=skateboard: FR:Tag:sport=skateboard
@@ -11683,10 +13868,15 @@ fr:
     switch=disconnector: FR:Tag:switch=disconnector
     switch=earthing: FR:Tag:switch=earthing
     switch=mechanical: FR:Tag:switch=mechanical
+    telecom:medium=coaxial: FR:Tag:telecom:medium=coaxial
+    telecom:medium=copper: FR:Tag:telecom:medium=copper
+    telecom:medium=fibre: FR:Tag:telecom:medium=fibre
     telecom=connection_point: FR:Tag:telecom=connection point
     telecom=data_center: FR:Tag:telecom=data center
+    telecom=distribution_point: FR:Tag:telecom=distribution point
     telecom=exchange: FR:Tag:telecom=exchange
     telecom=service_device: FR:Tag:telecom=service device
+    theatre:type=open_air: FR:Tag:theatre:type=open air
     tickets:public_transport=yes: FR:Tag:tickets:public transport=yes
     tourism=alpine_hut: FR:Tag:tourism=alpine hut
     tourism=apartment: FR:Tag:tourism=apartment
@@ -11713,6 +13903,7 @@ fr:
     tower:type=bell_tower: FR:Tag:tower:type=bell tower
     tower:type=communication: FR:Tag:tower:type=communication
     tower:type=hose: FR:Tag:tower:type=hose
+    traffic_calming=table: FR:Tag:traffic calming=table
     traffic_sign=city_limit: FR:Tag:traffic sign=city limit
     transformer=auxiliary: FR:Tag:transformer=auxiliary
     transformer=distribution: FR:Tag:transformer=distribution
@@ -11720,16 +13911,27 @@ fr:
     transformer=traction: FR:Tag:transformer=traction
     tunnel=culvert: FR:Tag:tunnel=culvert
     tunnel=flooded: FR:Tag:tunnel=flooded
+    type=waterway: FR:Tag:type=waterway
     usage=headrace: FR:Tag:usage=headrace
     usage=irrigation: FR:Tag:usage=irrigation
     usage=penstock: FR:Tag:usage=penstock
     usage=spillway: FR:Tag:usage=spillway
     usage=tailrace: FR:Tag:usage=tailrace
+    utility=power: FR:Tag:utility=power
+    utility=street_lighting: FR:Tag:utility=street lighting
+    utility=telecom: FR:Tag:utility=telecom
+    valve=ball: FR:Tag:valve=ball
+    valve=butterfly: FR:Tag:valve=butterfly
+    valve=gate: FR:Tag:valve=gate
+    valve=globe: FR:Tag:valve=globe
+    valve=needle: FR:Tag:valve=needle
+    valve=plug: FR:Tag:valve=plug
     vending=bread: FR:Tag:vending=bread
     vending=chemist: FR:Tag:vending=chemist
     vending=coffee: FR:Tag:vending=coffee
     vending=condoms: FR:Tag:vending=condoms
     vending=drinks: FR:Tag:vending=drinks
+    vending=e-cigarettes: FR:Tag:vending=e-cigarettes
     vending=electronics: FR:Tag:vending=electronics
     vending=excrement_bags: FR:Tag:vending=excrement bags
     vending=fishing_bait: FR:Tag:vending=fishing bait
@@ -11743,6 +13945,7 @@ fr:
     vending=water: FR:Tag:vending=water
     wall=no: FR:Tag:wall=no
     waste=dog_excrement: FR:Tag:waste=dog excrement
+    water=pond: FR:Tag:water=pond
     water=reservoir: FR:Tag:water=reservoir
     waterway=boatyard: FR:Tag:waterway=boatyard
     waterway=canal: FR:Tag:waterway=canal
@@ -11758,13 +13961,21 @@ fr:
     waterway=stream: FR:Tag:waterway=stream
     waterway=waterfall: FR:Tag:waterway=waterfall
     waterway=weir: FR:Tag:waterway=weir
+    wetland=marsh: FR:Tag:wetland=marsh
     wetland=reedbed: FR:Tag:wetland=reedbed
     wetland=swamp: FR:Tag:wetland=swamp
 gl:
   key:
+    contact:facebook: Gl:Key:contact:facebook
+    contact:twitter: Gl:Key:contact:twitter
+    facebook: Gl:Key:facebook
     imagery_used: Gl:Key:imagery used
     locale: Gl:Key:locale
     name: Gl:Key:name
+    name:gl: Gl:Key:name:gl
+    noaddress: Gl:Key:noaddress
+    nohousenumber: Gl:Key:nohousenumber
+    noname: Gl:Key:noname
     route: Gl:Key:route
     sport: Gl:Key:sport
     tourism: Gl:Key:tourism
@@ -11776,11 +13987,15 @@ gl:
     barrier=fence: Gl:Tag:barrier=fence
     barrier=hedge: Gl:Tag:barrier=hedge
     barrier=kerb: Gl:Tag:barrier=kerb
+    emergency=emergency_ward_entrance: Gl:Tag:emergency=emergency ward entrance
+    emergency=yes: Gl:Tag:emergency=yes
     leisure=outdoor_seating: Gl:Tag:leisure=outdoor seating
     natural=tree_row: Gl:Tag:natural=tree row
     railway=tram: Gl:Tag:railway=tram
+    shop=vacant: Gl:Tag:shop=vacant
     social_facility=nursing_home: Gl:Tag:social facility=nursing home
     sport=padel: Gl:Tag:sport=padel
+    vending=books: Gl:Tag:vending=books
     waterway=dock: Gl:Tag:waterway=dock
     waterway=weir: Gl:Tag:waterway=weir
 he:
@@ -11850,12 +14065,17 @@ hu:
     barrier=bollard: Hu:Tag:barrier=bollard
     boundary=administrative: Hu:Tag:boundary=administrative
     highway=street_lamp: Hu:Tag:highway=street lamp
+    leaf_cycle=deciduous: Hu:Tag:leaf cycle=deciduous
+    leaf_cycle=evergreen: Hu:Tag:leaf cycle=evergreen
+    leaf_type=needleleaved: Hu:Tag:leaf type=needleleaved
     natural=wallow: Hu:Tag:natural=wallow
     railway=level_crossing: Hu:Tag:railway=level crossing
 id:
   tag:
     highway=track: Id:Tag:highway=track
+    place=square: Id:Tag:place=square
     shop=pawnbroker: Id:Tag:shop=pawnbroker
+    waterway=tidal_channel: Id:Tag:waterway=tidal channel
 it:
   key:
     abutters: IT:Key:abutters
@@ -11874,14 +14094,20 @@ it:
     basin: IT:Key:basin
     bicycle: IT:Key:bicycle
     bicycle_parking: IT:Key:bicycle parking
+    books: IT:Key:books
     boundary: IT:Key:boundary
+    brewery: IT:Key:brewery
     bridge: IT:Key:bridge
     bridge:structure: IT:Key:bridge:structure
     building: IT:Key:building
     building:levels: IT:Key:building:levels
     cables: IT:Key:cables
+    capacity: IT:Key:capacity
     circuits: IT:Key:circuits
+    communication:amateur_radio:callsign: IT:Key:communication:amateur radio:callsign
     communication:amateur_radio:repeater: IT:Key:communication:amateur radio:repeater
+    communication:bos: IT:Key:communication:bos
+    communication:mobile_phone: IT:Key:communication:mobile phone
     construction: IT:Key:construction
     contact:facebook: IT:Key:contact:facebook
     craft: IT:Key:craft
@@ -11893,6 +14119,8 @@ it:
     destination: IT:Key:destination
     diet: IT:Key:diet
     diet:*: IT:Key:diet:*
+    diet:vegan: IT:Key:diet:vegan
+    diet:vegetarian: IT:Key:diet:vegetarian
     'disused:': 'IT:Key:disused:'
     drink: IT:Key:drink
     ele: IT:Key:ele
@@ -11905,6 +14133,8 @@ it:
     garden:type: IT:Key:garden:type
     generator:output: IT:Key:generator:output
     geological: IT:Key:geological
+    guest_house: IT:Key:guest house
+    height: IT:Key:height
     highway: IT:Key:highway
     historic: IT:Key:historic
     incline: IT:Key:incline
@@ -11916,6 +14146,8 @@ it:
     leisure: IT:Key:leisure
     lock: IT:Key:lock
     man_made: IT:Key:man made
+    manhole: IT:Key:manhole
+    material: IT:Key:material
     maxaxleload: IT:Key:maxaxleload
     maxheight: IT:Key:maxheight
     maxlength: IT:Key:maxlength
@@ -11953,12 +14185,17 @@ it:
     power: IT:Key:power
     priority: IT:Key:priority
     proposed: IT:Key:proposed
+    pump: IT:Key:pump
     railway: IT:Key:railway
     ref: IT:Key:ref
+    ref:catasto: IT:Key:ref:catasto
     ref:mise: IT:Key:ref:mise
+    ref:msal: IT:Key:ref:msal
     ref:vatin: IT:Key:ref:vatin
     religion: IT:Key:religion
     residential: IT:Key:residential
+    roof:shape: IT:Key:roof:shape
+    roundtrip: IT:Key:roundtrip
     route: IT:Key:route
     sac_scale: IT:Key:sac scale
     second_hand: IT:Key:second hand
@@ -11982,6 +14219,7 @@ it:
     trail_visibility: IT:Key:trail visibility
     tunnel: IT:Key:tunnel
     type: IT:Key:type
+    usage: IT:Key:usage
     voltage: IT:Key:voltage
     waterway: IT:Key:waterway
     wheelchair: IT:Key:wheelchair
@@ -11990,6 +14228,7 @@ it:
     wires: IT:Key:wires
     zone:maxspeed: IT:Key:zone:maxspeed
   tag:
+    access=customers: IT:Tag:access=customers
     aeroway=aerodrome: IT:Tag:aeroway=aerodrome
     aeroway=airstrip: IT:Tag:aeroway=airstrip
     aeroway=apron: IT:Tag:aeroway=apron
@@ -12013,12 +14252,15 @@ it:
     amenity=bar: IT:Tag:amenity=bar
     amenity=bbq: IT:Tag:amenity=bbq
     amenity=bench: IT:Tag:amenity=bench
+    amenity=bicycle_parking: IT:Tag:amenity=bicycle parking
     amenity=bicycle_rental: IT:Tag:amenity=bicycle rental
     amenity=cafe: IT:Tag:amenity=cafe
     amenity=cinema: IT:Tag:amenity=cinema
     amenity=college: IT:Tag:amenity=college
+    amenity=dentist: IT:Tag:amenity=dentist
     amenity=driving_school: IT:Tag:amenity=driving school
     amenity=fast_food: IT:Tag:amenity=fast food
+    amenity=fire_station: IT:Tag:amenity=fire station
     amenity=fountain: IT:Tag:amenity=fountain
     amenity=fuel: IT:Tag:amenity=fuel
     amenity=hospital: IT:Tag:amenity=hospital
@@ -12031,11 +14273,13 @@ it:
     amenity=place_of_worship: IT:Tag:amenity=place of worship
     amenity=police: IT:Tag:amenity=police
     amenity=post_office: IT:Tag:amenity=post office
+    amenity=prison: IT:Tag:amenity=prison
     amenity=pub: IT:Tag:amenity=pub
     amenity=recycling: IT:Tag:amenity=recycling
     amenity=restaurant: IT:Tag:amenity=restaurant
     amenity=school: IT:Tag:amenity=school
     amenity=spa: IT:Tag:amenity=spa
+    amenity=taxi: IT:Tag:amenity=taxi
     amenity=university: IT:Tag:amenity=university
     amenity=waste_basket: IT:Tag:amenity=waste basket
     barrier=block: IT:Tag:barrier=block
@@ -12078,6 +14322,7 @@ it:
     barrier=toll_booth: IT:Tag:barrier=toll booth
     barrier=turnstile: IT:Tag:barrier=turnstile
     barrier=wall: IT:Tag:barrier=wall
+    bridge=boardwalk: IT:Tag:bridge=boardwalk
     building=residential: IT:Tag:building=residential
     building=retail: IT:Tag:building=retail
     building=train_station: IT:Tag:building=train station
@@ -12152,9 +14397,13 @@ it:
     craft=watchmaker: IT:Tag:craft=watchmaker
     craft=window_construction: IT:Tag:craft=window construction
     craft=winery: IT:Tag:craft=winery
+    crossing=traffic_signals: IT:Tag:crossing=traffic signals
     emergency=assembly_point: IT:Tag:emergency=assembly point
+    emergency=defibrillator: IT:Tag:emergency=defibrillator
     emergency=emergency_ward_entrance: IT:Tag:emergency=emergency ward entrance
     emergency=fire_hydrant: IT:Tag:emergency=fire hydrant
+    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
     geological=moraine: IT:Tag:geological=moraine
@@ -12163,9 +14412,11 @@ it:
     highway=bus_stop: IT:Tag:highway=bus stop
     highway=crossing: IT:Tag:highway=crossing
     highway=cycleway: IT:Tag:highway=cycleway
+    highway=emergency_bay: IT:Tag:highway=emergency bay
     highway=footway: IT:Tag:highway=footway
     highway=ford: IT:Tag:highway=ford
     highway=living_street: IT:Tag:highway=living street
+    highway=milestone: IT:Tag:highway=milestone
     highway=mini_roundabout: IT:Tag:highway=mini roundabout
     highway=motorway: IT:Tag:highway=motorway
     highway=motorway_junction: IT:Tag:highway=motorway junction
@@ -12194,6 +14445,7 @@ it:
     junction=yes: IT:Tag:junction=yes
     landuse=cemetery: IT:Tag:landuse=cemetery
     landuse=construction: IT:Tag:landuse=construction
+    landuse=flowerbed: IT:Tag:landuse=flowerbed
     landuse=greenhouse_horticulture: IT:Tag:landuse=greenhouse horticulture
     landuse=retail: IT:Tag:landuse=retail
     landuse=salt_pond: IT:Tag:landuse=salt pond
@@ -12205,8 +14457,11 @@ it:
     leisure=playground: IT:Tag:leisure=playground
     leisure=swimming_pool: IT:Tag:leisure=swimming pool
     leisure=track: IT:Tag:leisure=track
+    man_made=cairn: IT:Tag:man made=cairn
+    man_made=goods_conveyor: IT:Tag:man made=goods conveyor
     man_made=mast: IT:Tag:man made=mast
     man_made=works: IT:Tag:man made=works
+    memorial=stolperstein: IT:Tag:memorial=stolperstein
     natural=bare_rock: IT:Tag:natural=bare rock
     natural=cape: IT:Tag:natural=cape
     natural=grassland: IT:Tag:natural=grassland
@@ -12218,6 +14473,7 @@ it:
     office=foundation: IT:Tag:office=foundation
     office=it: IT:Tag:office=it
     oneway=alternating: IT:Tag:oneway=alternating
+    parking=street_side: IT:Tag:parking=street side
     place=allotments: IT:Tag:place=allotments
     place=archipelago: IT:Tag:place=archipelago
     place=borough: IT:Tag:place=borough
@@ -12265,7 +14521,9 @@ it:
     residential=rural: IT:Tag:residential=rural
     residential=urban: IT:Tag:residential=urban
     route=bus: IT:Tag:route=bus
+    route=ferry: IT:Tag:route=ferry
     route=railway: IT:Tag:route=railway
+    shelter_type=public_transport: IT:Tag:shelter type=public transport
     shop=alcohol: IT:Tag:shop=alcohol
     shop=bakery: IT:Tag:shop=bakery
     shop=beauty: IT:Tag:shop=beauty
@@ -12278,6 +14536,7 @@ it:
     shop=chemist: IT:Tag:shop=chemist
     shop=clothes: IT:Tag:shop=clothes
     shop=coffee: IT:Tag:shop=coffee
+    shop=computer: IT:Tag:shop=computer
     shop=confectionery: IT:Tag:shop=confectionery
     shop=convenience: IT:Tag:shop=convenience
     shop=deli: IT:Tag:shop=deli
@@ -12288,12 +14547,16 @@ it:
     shop=greengrocer: IT:Tag:shop=greengrocer
     shop=hardware: IT:Tag:shop=hardware
     shop=hifi: IT:Tag:shop=hifi
+    shop=ice_cream: IT:Tag:shop=ice cream
     shop=kiosk: IT:Tag:shop=kiosk
+    shop=laundry: IT:Tag:shop=laundry
     shop=mall: IT:Tag:shop=mall
     shop=motorcycle: IT:Tag:shop=motorcycle
     shop=newsagent: IT:Tag:shop=newsagent
     shop=pastry: IT:Tag:shop=pastry
+    shop=pet_grooming: IT:Tag:shop=pet grooming
     shop=radiotechnics: IT:Tag:shop=radiotechnics
+    shop=robot: IT:Tag:shop=robot
     shop=seafood: IT:Tag:shop=seafood
     shop=souvenir: IT:Tag:shop=souvenir
     shop=supermarket: IT:Tag:shop=supermarket
@@ -12303,11 +14566,16 @@ it:
     shop=wine: IT:Tag:shop=wine
     sport=balle_pelote: IT:Tag:sport=balle pelote
     sport=climbing: IT:Tag:sport=climbing
+    sport=hockey: IT:Tag:sport=hockey
+    sport=ice_hockey: IT:Tag:sport=ice hockey
+    sport=roller_hockey: IT:Tag:sport=roller hockey
     sport=surfing: IT:Tag:sport=surfing
     summit:cross=yes: IT:Tag:summit:cross=yes
     tourism=aquarium: IT:Tag:tourism=aquarium
     tourism=artwork: IT:Tag:tourism=artwork
     tourism=museum: IT:Tag:tourism=museum
+    vending=parking_tickets: IT:Tag:vending=parking tickets
+    vending=toll: IT:Tag:vending=toll
     waterway=ditch: IT:Tag:waterway=ditch
     waterway=river: IT:Tag:waterway=river
     waterway=stream: IT:Tag:waterway=stream
@@ -12391,7 +14659,6 @@ 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
@@ -12438,7 +14705,6 @@ ja:
     capacity: JA:Key:capacity
     capacity:disabled: JA:Key:capacity:disabled
     capital: JA:Key:capital
-    car: JA:Key:car
     car_wash: JA:Key:car wash
     carriage: JA:Key:carriage
     castle_type: JA:Key:castle type
@@ -12488,6 +14754,8 @@ ja:
     crossing_ref: JA:Key:crossing ref
     cuisine: JA:Key:cuisine
     currency: JA:Key:currency
+    currency:EUR: JA:Key:currency:EUR
+    currency:others: JA:Key:currency:others
     cutting: JA:Key:cutting
     cycle_network: JA:Key:cycle network
     cycleway: JA:Key:cycleway
@@ -12561,7 +14829,9 @@ ja:
     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
     footway: JA:Key:footway
     ford: JA:Key:ford
     forestry: JA:Key:forestry
@@ -12668,6 +14938,7 @@ ja:
     lanes:psv: JA:Key:lanes:psv
     lanes:psv:backward: JA:Key:lanes:psv:backward
     lanes:psv:forward: JA:Key:lanes:psv:forward
+    language: JA:Key:language
     layer: JA:Key:layer
     lcn_ref: JA:Key:lcn ref
     leaf_cycle: JA:Key:leaf cycle
@@ -12687,6 +14958,7 @@ ja:
     lock_name: JA:Key:lock name
     lockable: JA:Key:lockable
     lottery: JA:Key:lottery
+    lunch: JA:Key:lunch
     male: JA:Key:male
     man_made: JA:Key:man made
     managed: JA:Key:managed
@@ -12741,12 +15013,14 @@ ja:
     name:cs: JA:Key:name:cs
     name:de: JA:Key:name:de
     name:en: JA:Key:name:en
+    name:etymology: JA:Key:name:etymology
     name:it: JA:Key:name:it
     name:ja: JA:Key:name:ja
     name:ja-Hira: JA:Key:name:ja-Hira
     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
@@ -12754,6 +15028,7 @@ ja:
     natural: JA:Key:natural
     ncn_ref: JA:Key:ncn ref
     network: JA:Key:network
+    network:wikidata: JA:Key:network:wikidata
     noexit: JA:Key:noexit
     noname: JA:Key:noname
     noref: JA:Key:noref
@@ -12768,10 +15043,13 @@ ja:
     old_ref: JA:Key:old ref
     oneway: JA:Key:oneway
     oneway:bicycle: JA:Key:oneway:bicycle
+    oneway:foot: JA:Key:oneway:foot
     openbenches:id: JA:Key:openbenches:id
     openfire: JA:Key:openfire
     opening_date: JA:Key:opening date
     opening_hours: JA:Key:opening hours
+    opening_hours/Tutorial: JA:Key:opening hours/Tutorial
+    opening_hours:covid19: JA:Key:opening hours:covid19
     openplaques:id: JA:Key:openplaques:id
     operator: JA:Key:operator
     operator:ja: JA:Key:operator:ja
@@ -12863,6 +15141,7 @@ ja:
     seats: JA:Key:seats
     second_hand: JA:Key:second hand
     segregated: JA:Key:segregated
+    self_checkout: JA:Key:self checkout
     self_service: JA:Key:self service
     service: JA:Key:service
     service_times: JA:Key:service times
@@ -12897,6 +15176,7 @@ ja:
     source:ref: JA:Key:source:ref
     source_ref: JA:Key:source ref
     species: JA:Key:species
+    species:wikidata: JA:Key:species:wikidata
     speech_output: JA:Key:speech output
     sport: JA:Key:sport
     stamps: JA:Key:stamps
@@ -13003,6 +15283,7 @@ ja:
     access=customers: JA:Tag:access=customers
     access=delivery: JA:Tag:access=delivery
     access=designated: JA:Tag:access=designated
+    access=destination: JA:Tag:access=destination
     access=forestry: JA:Tag:access=forestry
     access=license: JA:Tag:access=license
     access=no: JA:Tag:access=no
@@ -13119,13 +15400,18 @@ ja:
     amenity=hunting_stand: JA:Tag:amenity=hunting stand
     amenity=ice_cream: JA:Tag:amenity=ice cream
     amenity=internet_cafe: JA:Tag:amenity=internet cafe
+    amenity=karaoke_box: JA:Tag:amenity=karaoke box
     amenity=kindergarten: JA:Tag:amenity=kindergarten
     amenity=language_school: JA:Tag:amenity=language school
+    amenity=letter_box: JA:Tag:amenity=letter box
     amenity=library: JA:Tag:amenity=library
+    amenity=loading_dock: JA:Tag:amenity=loading dock
+    amenity=lounger: JA:Tag:amenity=lounger
     amenity=love_hotel: JA:Tag:amenity=love hotel
     amenity=marketplace: JA:Tag:amenity=marketplace
     amenity=microwave: JA:Tag:amenity=microwave
     amenity=monastery: JA:Tag:amenity=monastery
+    amenity=money_transfer: JA:Tag:amenity=money transfer
     amenity=motorcycle_parking: JA:Tag:amenity=motorcycle parking
     amenity=music_school: JA:Tag:amenity=music school
     amenity=nightclub: JA:Tag:amenity=nightclub
@@ -13151,6 +15437,7 @@ ja:
     amenity=public_building: JA:Tag:amenity=public building
     amenity=recycling: JA:Tag:amenity=recycling
     amenity=register_office: JA:Tag:amenity=register office
+    amenity=research_institute: JA:Tag:amenity=research institute
     amenity=restaurant: JA:Tag:amenity=restaurant
     amenity=retirement_home: JA:Tag:amenity=retirement home
     amenity=sanitary_dump_station: JA:Tag:amenity=sanitary dump station
@@ -13158,6 +15445,7 @@ ja:
     amenity=school: JA:Tag:amenity=school
     amenity=shelter: JA:Tag:amenity=shelter
     amenity=shower: JA:Tag:amenity=shower
+    amenity=ski_school: JA:Tag:amenity=ski school
     amenity=smoking_area: JA:Tag:amenity=smoking area
     amenity=social_centre: JA:Tag:amenity=social centre
     amenity=social_facility: JA:Tag:amenity=social facility
@@ -13264,6 +15552,7 @@ ja:
     building=civic: JA:Tag:building=civic
     building=college: JA:Tag:building=college
     building=commercial: JA:Tag:building=commercial
+    building=conservatory: JA:Tag:building=conservatory
     building=construction: JA:Tag:building=construction
     building=cowshed: JA:Tag:building=cowshed
     building=detached: JA:Tag:building=detached
@@ -13289,12 +15578,15 @@ ja:
     building=public: JA:Tag:building=public
     building=residential: JA:Tag:building=residential
     building=retail: JA:Tag:building=retail
+    building=riding_hall: JA:Tag:building=riding hall
     building=roof: JA:Tag:building=roof
     building=ruins: JA:Tag:building=ruins
     building=school: JA:Tag:building=school
     building=service: JA:Tag:building=service
     building=shed: JA:Tag:building=shed
     building=shrine: JA:Tag:building=shrine
+    building=sports_centre: JA:Tag:building=sports centre
+    building=sports_hall: JA:Tag:building=sports hall
     building=stable: JA:Tag:building=stable
     building=stadium: JA:Tag:building=stadium
     building=static_caravan: JA:Tag:building=static caravan
@@ -13308,6 +15600,7 @@ ja:
     building=transportation: JA:Tag:building=transportation
     building=university: JA:Tag:building=university
     building=warehouse: JA:Tag:building=warehouse
+    bus=no: JA:Tag:bus=no
     busway=opposite_lane: JA:Tag:busway=opposite lane
     castle_type=fortress: JA:Tag:castle type=fortress
     cemetery=grave: JA:Tag:cemetery=grave
@@ -13388,6 +15681,9 @@ ja:
     emergency=ambulance_station: JA:Tag:emergency=ambulance station
     emergency=assembly_point: JA:Tag:emergency=assembly point
     emergency=defibrillator: JA:Tag:emergency=defibrillator
+    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_hose: JA:Tag:emergency=fire hose
     emergency=fire_hydrant: JA:Tag:emergency=fire hydrant
@@ -13396,6 +15692,7 @@ ja:
     emergency=phone: JA:Tag:emergency=phone
     emergency=siren: JA:Tag:emergency=siren
     emergency=water_tank: JA:Tag:emergency=water tank
+    entrance=main: JA:Tag:entrance=main
     entrance=staircase: JA:Tag:entrance=staircase
     foot=designated: JA:Tag:foot=designated
     foot=private: JA:Tag:foot=private
@@ -13453,6 +15750,7 @@ ja:
     golf=bunker: JA:Tag:golf=bunker
     golf=driving_range: JA:Tag:golf=driving range
     golf=fairway: JA:Tag:golf=fairway
+    goods=destination: JA:Tag:goods=destination
     government=ministry: JA:Tag:government=ministry
     government=prosecutor: JA:Tag:government=prosecutor
     government=register_office: JA:Tag:government=register office
@@ -13460,6 +15758,7 @@ ja:
     guidepost=simple: JA:Tag:guidepost=simple
     healthcare=blood_donation: JA:Tag:healthcare=blood donation
     hgv=designated: JA:Tag:hgv=designated
+    hgv=destination: JA:Tag:hgv=destination
     highway=bridleway: JA:Tag:highway=bridleway
     highway=bus_guideway: JA:Tag:highway=bus guideway
     highway=bus_stop: JA:Tag:highway=bus stop
@@ -13478,6 +15777,7 @@ ja:
     highway=motorway: JA:Tag:highway=motorway
     highway=motorway_junction: JA:Tag:highway=motorway junction
     highway=motorway_link: JA:Tag:highway=motorway link
+    highway=no: JA:Tag:highway=no
     highway=passing_place: JA:Tag:highway=passing place
     highway=path: JA:Tag:highway=path
     highway=pedestrian: JA:Tag:highway=pedestrian
@@ -13509,6 +15809,7 @@ ja:
     historic=boundary_stone: JA:Tag:historic=boundary stone
     historic=cannon: JA:Tag:historic=cannon
     historic=castle: JA:Tag:historic=castle
+    historic=charcoal_pile: JA:Tag:historic=charcoal pile
     historic=city_gate: JA:Tag:historic=city gate
     historic=citywalls: JA:Tag:historic=citywalls
     historic=farm: JA:Tag:historic=farm
@@ -13575,6 +15876,7 @@ ja:
     landuse=churchyard: JA:Tag:landuse=churchyard
     landuse=commercial: JA:Tag:landuse=commercial
     landuse=construction: JA:Tag:landuse=construction
+    landuse=depot: JA:Tag:landuse=depot
     landuse=farm: JA:Tag:landuse=farm
     landuse=farmland: JA:Tag:landuse=farmland
     landuse=farmyard: JA:Tag:landuse=farmyard
@@ -13603,6 +15905,7 @@ ja:
     landuse=traffic_island: JA:Tag:landuse=traffic island
     landuse=village_green: JA:Tag:landuse=village green
     landuse=vineyard: JA:Tag:landuse=vineyard
+    landuse=winter_sports: JA:Tag:landuse=winter sports
     landuse=wood: JA:Tag:landuse=wood
     leaf_cycle=deciduous: JA:Tag:leaf cycle=deciduous
     leaf_cycle=evergreen: JA:Tag:leaf cycle=evergreen
@@ -13641,12 +15944,15 @@ ja:
     leisure=sauna: JA:Tag:leisure=sauna
     leisure=slipway: JA:Tag:leisure=slipway
     leisure=sports_centre: JA:Tag:leisure=sports centre
+    leisure=sports_hall: JA:Tag:leisure=sports hall
     leisure=stadium: JA:Tag:leisure=stadium
     leisure=summer_camp: JA:Tag:leisure=summer camp
     leisure=swimming_area: JA:Tag:leisure=swimming area
     leisure=swimming_pool: JA:Tag:leisure=swimming pool
     leisure=track: JA:Tag:leisure=track
     leisure=water_park: JA:Tag:leisure=water park
+    line=bay: JA:Tag:line=bay
+    line=busbar: JA:Tag:line=busbar
     man_made=adit: JA:Tag:man made=adit
     man_made=beacon: JA:Tag:man made=beacon
     man_made=breakwater: JA:Tag:man made=breakwater
@@ -13702,6 +16008,7 @@ ja:
     man_made=windpump: JA:Tag:man made=windpump
     man_made=works: JA:Tag:man made=works
     manhole=telecom: JA:Tag:manhole=telecom
+    memorial=stele: JA:Tag:memorial=stele
     microbrewery=yes: JA:Tag:microbrewery=yes
     military=airfield: JA:Tag:military=airfield
     military=ammunition: JA:Tag:military=ammunition
@@ -13711,7 +16018,13 @@ ja:
     military=naval_base: JA:Tag:military=naval base
     military=office: JA:Tag:military=office
     military=range: JA:Tag:military=range
+    military=training_area: JA:Tag:military=training area
     military=trench: JA:Tag:military=trench
+    mofa=destination: JA:Tag:mofa=destination
+    moped=destination: JA:Tag:moped=destination
+    motor_vehicle=destination: JA:Tag:motor vehicle=destination
+    motorcar=destination: JA:Tag:motorcar=destination
+    motorcycle=destination: JA:Tag:motorcycle=destination
     natural=anthill: JA:Tag:natural=anthill
     natural=arete: JA:Tag:natural=arete
     natural=bare_rock: JA:Tag:natural=bare rock
@@ -13783,6 +16096,10 @@ ja:
     office=research: JA:Tag:office=research
     office=tax_advisor: JA:Tag:office=tax advisor
     office=telecommunication: JA:Tag:office=telecommunication
+    oneway=alternating: JA:Tag:oneway=alternating
+    oneway=reversible: JA:Tag:oneway=reversible
+    parking=layby: JA:Tag:parking=layby
+    parking=street_side: JA:Tag:parking=street side
     parking=surface: JA:Tag:parking=surface
     place=archipelago: JA:Tag:place=archipelago
     place=city: JA:Tag:place=city
@@ -13803,6 +16120,7 @@ ja:
     place=suburb: JA:Tag:place=suburb
     place=town: JA:Tag:place=town
     place=village: JA:Tag:place=village
+    plant:method=photovoltaic: JA:Tag:plant:method=photovoltaic
     power=catenary_mast: JA:Tag:power=catenary mast
     power=compensator: JA:Tag:power=compensator
     power=generator: JA:Tag:power=generator
@@ -13814,6 +16132,7 @@ ja:
     power=station: JA:Tag:power=station
     power=sub_station: JA:Tag:power=sub station
     power=substation: JA:Tag:power=substation
+    power=switchgear: JA:Tag:power=switchgear
     power=tower: JA:Tag:power=tower
     power=transformer: JA:Tag:power=transformer
     public_transport=platform: JA:Tag:public transport=platform
@@ -13852,6 +16171,7 @@ ja:
     railway=traverser: JA:Tag:railway=traverser
     railway=turntable: JA:Tag:railway=turntable
     railway=yard: JA:Tag:railway=yard
+    reclaimed=yes: JA:Tag:reclaimed=yes
     recycling_type=container: JA:Tag:recycling type=container
     religion=buddhist: JA:Tag:religion=buddhist
     religion=christian: JA:Tag:religion=christian
@@ -13943,6 +16263,7 @@ ja:
     shop=florist: JA:Tag:shop=florist
     shop=frame: JA:Tag:shop=frame
     shop=frozen_food: JA:Tag:shop=frozen food
+    shop=fuel: JA:Tag:shop=fuel
     shop=funeral_directors: JA:Tag:shop=funeral directors
     shop=furniture: JA:Tag:shop=furniture
     shop=gambling: JA:Tag:shop=gambling
@@ -14006,6 +16327,7 @@ ja:
     shop=pyrotechnics: JA:Tag:shop=pyrotechnics
     shop=radiotechnics: JA:Tag:shop=radiotechnics
     shop=religion: JA:Tag:shop=religion
+    shop=rice: JA:Tag:shop=rice
     shop=scuba_diving: JA:Tag:shop=scuba diving
     shop=seafood: JA:Tag:shop=seafood
     shop=second_hand: JA:Tag:shop=second hand
@@ -14041,6 +16363,7 @@ ja:
     shop=wine: JA:Tag:shop=wine
     shop=wool: JA:Tag:shop=wool
     shop=yes: JA:Tag:shop=yes
+    shop=園芸店: JA:Tag:shop=園芸店
     ski=designated: JA:Tag:ski=designated
     snowmobile=designated: JA:Tag:snowmobile=designated
     social_facility=ambulatory_care: JA:Tag:social facility=ambulatory care
@@ -14102,6 +16425,8 @@ ja:
     traffic_sign=city_limit: JA:Tag:traffic sign=city limit
     tunnel=culvert: JA:Tag:tunnel=culvert
     type=public_transport: JA:Tag:type=public transport
+    type=waterway: JA:Tag:type=waterway
+    vehicle=destination: JA:Tag:vehicle=destination
     vending=bread: JA:Tag:vending=bread
     vending=excrement_bags: JA:Tag:vending=excrement bags
     vending=fuel: JA:Tag:vending=fuel
@@ -14134,7 +16459,6 @@ 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=stream: JA:Tag:waterway=stream
     waterway=turning_point: JA:Tag:waterway=turning point
@@ -14153,9 +16477,11 @@ ja:
     wetland=wet_meadow: JA:Tag:wetland=wet meadow
 ko:
   key:
+    addr: Ko:Key:addr
     aerialway: Ko:Key:aerialway
     amenity: Ko:Key:amenity
     crossing: Ko:Key:crossing
+    denotation: Ko:Key:denotation
     drink: Ko:Key:drink
     ele: Ko:Key:ele
     emergency: Ko:Key:emergency
@@ -14181,6 +16507,7 @@ ko:
     access=designated: Ko:Tag:access=designated
     aerialway=cable_car: Ko:Tag:aerialway=cable car
     amenity=fuel: Ko:Tag:amenity=fuel
+    amenity=prep_school: Ko:Tag:amenity=prep school
     amenity=taxi: Ko:Tag:amenity=taxi
     amenity=townhall: Ko:Tag:amenity=townhall
     barrier=kerb: Ko:Tag:barrier=kerb
@@ -14208,6 +16535,7 @@ ko:
     man_made=surveillance: Ko:Tag:man made=surveillance
     natural=grassland: Ko:Tag:natural=grassland
     natural=spring: Ko:Tag:natural=spring
+    natural=tree: Ko:Tag:natural=tree
     place=hamlet: Ko:Tag:place=hamlet
     place=town: Ko:Tag:place=town
     shop=convenience: Ko:Tag:shop=convenience
@@ -14215,6 +16543,7 @@ ko:
     shop=garden_centre: Ko:Tag:shop=garden centre
     shop=gift: Ko:Tag:shop=gift
     tourism=attraction: Ko:Tag:tourism=attraction
+    waterway=ditch: Ko:Tag:waterway=ditch
 lt:
   key:
     cycleway: Lt:Key:cycleway
@@ -14235,6 +16564,8 @@ my:
   tag:
     craft=agricultural_engines: My:Tag:craft=agricultural engines
 ne:
+  key:
+    tracktype: Ne:Key:tracktype
   tag:
     landuse=meadow: Ne:Tag:landuse=meadow
     natural=scrub: Ne:Tag:natural=scrub
@@ -14260,11 +16591,14 @@ nl:
     colour: NL:Key:colour
     craft: NL:Key:craft
     crossing: NL:Key:crossing
+    cyclestreet: NL:Key:cyclestreet
     cycleway: NL:Key:cycleway
     demolished: NL:Key:demolished
+    dog: NL:Key:dog
     emergency: NL:Key:emergency
     fence_type: NL:Key:fence type
     fenced: NL:Key:fenced
+    from: NL:Key:from
     internet_access: NL:Key:internet access
     landuse: NL:Key:landuse
     leaf_cycle: NL:Key:leaf cycle
@@ -14273,6 +16607,8 @@ nl:
     military: NL:Key:military
     name: NL:Key:name
     natural: NL:Key:natural
+    network: NL:Key:network
+    network:type: NL:Key:network:type
     office: NL:Key:office
     place: NL:Key:place
     population: NL:Key:population
@@ -14280,11 +16616,11 @@ nl:
     public_transport: NL:Key:public transport
     ref:bag: NL:Key:ref:bag
     ref:bag:old: NL:Key:ref:bag:old
-    religion: NL:Key:religion
     route_master: NL:Key:route master
     scenic: NL:Key:scenic
     shop: NL:Key:shop
     surface: NL:Key:surface
+    to: NL:Key:to
     tourism: NL:Key:tourism
     tracktype: NL:Key:tracktype
     turn: NL:Key:turn
@@ -14292,6 +16628,7 @@ nl:
     type: NL:Key:type
     waste: NL:Key:waste
     wheelchair: NL:Key:wheelchair
+    xmas:feature: NL:Key:xmas:feature
   tag:
     amenity=bank: NL:Tag:amenity=bank
     amenity=bench: NL:Tag:amenity=bench
@@ -14314,6 +16651,7 @@ nl:
     highway=footway: NL:Tag:highway=footway
     highway=motorway: NL:Tag:highway=motorway
     highway=path: NL:Tag:highway=path
+    highway=trailhead: NL:Tag:highway=trailhead
     historic=monument: NL:Tag:historic=monument
     information=tactile_map: NL:Tag:information=tactile map
     landuse=cemetery: NL:Tag:landuse=cemetery
@@ -14333,7 +16671,17 @@ nl:
     shop=department_store: NL:Tag:shop=department store
     shop=greengrocer: NL:Tag:shop=greengrocer
     shop=motorcycle: NL:Tag:shop=motorcycle
+    sport=floorball: NL:Tag:sport=floorball
+    sport=miniature_golf: NL:Tag:sport=miniature golf
+    sport=squash: NL:Tag:sport=squash
     tourism=chalet: NL:Tag:tourism=chalet
+    traffic_sign=NL:A01-30-ZB: NL:Tag:traffic sign=NL:A01-30-ZB
+    traffic_sign=NL:C15: NL:Tag:traffic sign=NL:C15
+    traffic_sign=NL:G07: NL:Tag:traffic sign=NL:G07
+    traffic_sign=NL:G11: NL:Tag:traffic sign=NL:G11
+    traffic_sign=NL:G12a: NL:Tag:traffic sign=NL:G12a
+    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
     zoo=petting_zoo: NL:Tag:zoo=petting zoo
 no:
@@ -14346,7 +16694,6 @@ no:
     maxheight:legal: No:Key:maxheight:legal
     maxheight:marine: No:Key:maxheight:marine
     maxheight:physical: No:Key:maxheight:physical
-    religion: No:Key:religion
     room: No:Key:room
   tag:
     amenity=bank: No:Tag:amenity=bank
@@ -14416,6 +16763,7 @@ pl:
     barrier: Pl:Key:barrier
     basin: Pl:Key:basin
     bath:type: Pl:Key:bath:type
+    beauty: Pl:Key:beauty
     beds: Pl:Key:beds
     bell_tower: Pl:Key:bell tower
     bench: Pl:Key:bench
@@ -14436,6 +16784,7 @@ pl:
     budynek: Pl:Key:budynek
     building: Pl:Key:building
     building:architecture: Pl:Key:building:architecture
+    building:colour: Pl:Key:building:colour
     building:condition: Pl:Key:building:condition
     building:cullis:height: Pl:Key:building:cullis:height
     building:flats: Pl:Key:building:flats
@@ -14459,6 +16808,7 @@ pl:
     check_date: Pl:Key:check date
     circuits: Pl:Key:circuits
     circumference: Pl:Key:circumference
+    clothes: Pl:Key:clothes
     club: Pl:Key:club
     colour: Pl:Key:colour
     comment: Pl:Key:comment
@@ -14486,8 +16836,10 @@ pl:
     cutting: Pl:Key:cutting
     cycleway: Pl:Key:cycleway
     deanery: Pl:Key:deanery
+    delivery: Pl:Key:delivery
     denomination: Pl:Key:denomination
     denotation: Pl:Key:denotation
+    departures_board: Pl:Key:departures board
     depth: Pl:Key:depth
     description: Pl:Key:description
     designation: Pl:Key:designation
@@ -14519,12 +16871,14 @@ pl:
     entrance: Pl:Key:entrance
     est_width: Pl:Key:est width
     fair_trade: Pl:Key:fair trade
+    farmyard: Pl:Key:farmyard
     fee: Pl:Key:fee
     female: Pl:Key:female
     fence_type: Pl:Key:fence type
     field: Pl:Key:field
     fire_boundary: Pl:Key:fire boundary
     fire_hydrant: Pl:Key:fire hydrant
+    fire_path: Pl:Key:fire path
     fishing: Pl:Key:fishing
     fixme: Pl:Key:fixme
     floating: Pl:Key:floating
@@ -14543,8 +16897,10 @@ pl:
     gauge: Pl:Key:gauge
     generator:output: Pl:Key:generator:output
     genus: Pl:Key:genus
+    genus:pl: Pl:Key:genus:pl
     geological: Pl:Key:geological
     government: Pl:Key:government
+    grades: Pl:Key:grades
     handrail: Pl:Key:handrail
     healthcare: Pl:Key:healthcare
     healthcare:speciality: Pl:Key:healthcare:speciality
@@ -14554,7 +16910,6 @@ pl:
     highway: Pl:Key:highway
     highway:category:pl: Pl:Key:highway:category:pl
     highway:class:pl: Pl:Key:highway:class:pl
-    highway_(propozycja_zmian): Pl:Key:highway (propozycja zmian)
     historic: Pl:Key:historic
     historic:civilization: Pl:Key:historic:civilization
     historic:era: Pl:Key:historic:era
@@ -14607,6 +16962,7 @@ pl:
     location: Pl:Key:location
     lock: Pl:Key:lock
     lock_name: Pl:Key:lock name
+    lottery: Pl:Key:lottery
     male: Pl:Key:male
     man_made: Pl:Key:man made
     manhole: Pl:Key:manhole
@@ -14660,13 +17016,17 @@ pl:
     operator: Pl:Key:operator
     operator:type: Pl:Key:operator:type
     organic: Pl:Key:organic
+    origin: Pl:Key:origin
+    outdoor_seating: Pl:Key:outdoor seating
     overtaking: Pl:Key:overtaking
     owner: Pl:Key:owner
     ownership: Pl:Key:ownership
     parish: Pl:Key:parish
     parking: Pl:Key:parking
     parking:lane: Pl:Key:parking:lane
+    passenger_information_display: Pl:Key:passenger information display
     passing_places: Pl:Key:passing places
+    payment: Pl:Key:payment
     pipeline: Pl:Key:pipeline
     place: Pl:Key:place
     place_name: Pl:Key:place name
@@ -14698,9 +17058,12 @@ pl:
     'removed:': 'Pl:Key:removed:'
     repair: Pl:Key:repair
     repeat_on: Pl:Key:repeat on
+    reservation: Pl:Key:reservation
     residential: Pl:Key:residential
     resource: Pl:Key:resource
+    roof:colour: Pl:Key:roof:colour
     roof:material: Pl:Key:roof:material
+    roof:shape: Pl:Key:roof:shape
     room: Pl:Key:room
     route: Pl:Key:route
     route_master: Pl:Key:route master
@@ -14729,6 +17092,7 @@ pl:
     source:date: Pl:Key:source:date
     source:maxspeed: Pl:Key:source:maxspeed
     species: Pl:Key:species
+    species:pl: Pl:Key:species:pl
     sport: Pl:Key:sport
     stairs: Pl:Key:stairs
     start_date: Pl:Key:start date
@@ -14745,6 +17109,7 @@ pl:
     surveillance:zone: Pl:Key:surveillance:zone
     symbol: Pl:Key:symbol
     tactile_paving: Pl:Key:tactile paving
+    takeaway: Pl:Key:takeaway
     target: Pl:Key:target
     taxon: Pl:Key:taxon
     tents: Pl:Key:tents
@@ -14829,6 +17194,7 @@ pl:
     amenity=administration: Pl:Tag:amenity=administration
     amenity=animal_boarding: Pl:Tag:amenity=animal boarding
     amenity=archive: Pl:Tag:amenity=archive
+    amenity=arts_centre: Pl:Tag:amenity=arts centre
     amenity=atm: Pl:Tag:amenity=atm
     amenity=audiologist: Pl:Tag:amenity=audiologist
     amenity=baby_hatch: Pl:Tag:amenity=baby hatch
@@ -14847,6 +17213,7 @@ pl:
     amenity=bus_station: Pl:Tag:amenity=bus station
     amenity=cafe: Pl:Tag:amenity=cafe
     amenity=car_pooling: Pl:Tag:amenity=car pooling
+    amenity=car_rental: Pl:Tag:amenity=car rental
     amenity=car_wash: Pl:Tag:amenity=car wash
     amenity=casino: Pl:Tag:amenity=casino
     amenity=charging_station: Pl:Tag:amenity=charging station
@@ -14937,6 +17304,8 @@ pl:
     amenity=refugee_housing: Pl:Tag:amenity=refugee housing
     amenity=research_institute: Pl:Tag:amenity=research institute
     amenity=restaurant: Pl:Tag:amenity=restaurant
+    amenity=retirement_home: Pl:Tag:amenity=retirement home
+    amenity=sanatorium: Pl:Tag:amenity=sanatorium
     amenity=sanitary_dump_station: Pl:Tag:amenity=sanitary dump station
     amenity=sauna: Pl:Tag:amenity=sauna
     amenity=school: Pl:Tag:amenity=school
@@ -14956,6 +17325,7 @@ pl:
     amenity=toilets: Pl:Tag:amenity=toilets
     amenity=tourist_bus_parking: Pl:Tag:amenity=tourist bus parking
     amenity=townhall: Pl:Tag:amenity=townhall
+    amenity=trolley_bay: Pl:Tag:amenity=trolley bay
     amenity=university: Pl:Tag:amenity=university
     amenity=vacuum_cleaner: Pl:Tag:amenity=vacuum cleaner
     amenity=vehicle_inspection: Pl:Tag:amenity=vehicle inspection
@@ -14971,6 +17341,7 @@ pl:
     area:highway=footway: Pl:Tag:area:highway=footway
     area:highway=path: Pl:Tag:area:highway=path
     area:highway=pedestrian: Pl:Tag:area:highway=pedestrian
+    artwork_type=dwarf: Pl:Tag:artwork type=dwarf
     artwork_type=sculpture: Pl:Tag:artwork type=sculpture
     artwork_type=statue: Pl:Tag:artwork type=statue
     atm=no: Pl:Tag:atm=no
@@ -14981,6 +17352,7 @@ pl:
     barrier=block: Pl:Tag:barrier=block
     barrier=bollard: Pl:Tag:barrier=bollard
     barrier=bus_trap: Pl:Tag:barrier=bus trap
+    barrier=cable_barrier: Pl:Tag:barrier=cable barrier
     barrier=cattle_grid: Pl:Tag:barrier=cattle grid
     barrier=chain: Pl:Tag:barrier=chain
     barrier=city_wall: Pl:Tag:barrier=city wall
@@ -14993,6 +17365,7 @@ pl:
     barrier=handrail: Pl:Tag:barrier=handrail
     barrier=hedge: Pl:Tag:barrier=hedge
     barrier=height_restrictor: Pl:Tag:barrier=height restrictor
+    barrier=jersey_barrier: Pl:Tag:barrier=jersey barrier
     barrier=kerb: Pl:Tag:barrier=kerb
     barrier=lift_gate: Pl:Tag:barrier=lift gate
     barrier=retaining_wall: Pl:Tag:barrier=retaining wall
@@ -15053,6 +17426,7 @@ pl:
     building=chapel: Pl:Tag:building=chapel
     building=church: Pl:Tag:building=church
     building=civic: Pl:Tag:building=civic
+    building=collapsed: Pl:Tag:building=collapsed
     building=college: Pl:Tag:building=college
     building=commercial: Pl:Tag:building=commercial
     building=conservatory: Pl:Tag:building=conservatory
@@ -15174,7 +17548,6 @@ pl:
     cycleway=opposite_track: Pl:Tag:cycleway=opposite track
     cycleway=share_busway: Pl:Tag:cycleway=share busway
     cycleway=track: Pl:Tag:cycleway=track
-    emergency=aed: Pl:Tag:emergency=aed
     emergency=ambulance_station: Pl:Tag:emergency=ambulance station
     emergency=defibrillator: Pl:Tag:emergency=defibrillator
     emergency=emergency_ward_entrance: Pl:Tag:emergency=emergency ward entrance
@@ -15194,14 +17567,20 @@ pl:
     emergency=water_rescue_station: Pl:Tag:emergency=water rescue station
     emergency=water_tank: Pl:Tag:emergency=water tank
     entrance=main: Pl:Tag:entrance=main
+    fast_food=cafeteria: Pl:Tag:fast food=cafeteria
     footway=crossing: Pl:Tag:footway=crossing
     footway=sidewalk: Pl:Tag:footway=sidewalk
     ford=stepping_stones: Pl:Tag:ford=stepping stones
     garden:type=botanical: Pl:Tag:garden:type=botanical
     geological=moraine: Pl:Tag:geological=moraine
+    government=customs: Pl:Tag:government=customs
     government=ministry: Pl:Tag:government=ministry
     government=prosecutor: Pl:Tag:government=prosecutor
+    healthcare=dentist: Pl:Tag:healthcare=dentist
+    healthcare=dialysis: Pl:Tag:healthcare=dialysis
     healthcare=laboratory: Pl:Tag:healthcare=laboratory
+    healthcare=nutrition_counselling: Pl:Tag:healthcare=nutrition counselling
+    healthcare=physiotherapist: Pl:Tag:healthcare=physiotherapist
     highway=abandoned: Pl:Tag:highway=abandoned
     highway=bridleway: Pl:Tag:highway=bridleway
     highway=bus_guideway: Pl:Tag:highway=bus guideway
@@ -15322,6 +17701,7 @@ pl:
     landuse=greenfield: Pl:Tag:landuse=greenfield
     landuse=greenhouse_horticulture: Pl:Tag:landuse=greenhouse horticulture
     landuse=industrial: Pl:Tag:landuse=industrial
+    landuse=institutional: Pl:Tag:landuse=institutional
     landuse=landfill: Pl:Tag:landuse=landfill
     landuse=meadow: Pl:Tag:landuse=meadow
     landuse=military: Pl:Tag:landuse=military
@@ -15504,6 +17884,7 @@ pl:
     military=training_area: Pl:Tag:military=training area
     military=trench: Pl:Tag:military=trench
     mooring=ferry: Pl:Tag:mooring=ferry
+    natural=anthill: Pl:Tag:natural=anthill
     natural=arete: Pl:Tag:natural=arete
     natural=avalanche_dam: Pl:Tag:natural=avalanche dam
     natural=bare_rock: Pl:Tag:natural=bare rock
@@ -15696,6 +18077,7 @@ pl:
     residential=rural: Pl:Tag:residential=rural
     residential=university: Pl:Tag:residential=university
     residential=urban: Pl:Tag:residential=urban
+    route=emergency_access: Pl:Tag:route=emergency access
     route=hiking: Pl:Tag:route=hiking
     route=horse: Pl:Tag:route=horse
     route=running: Pl:Tag:route=running
@@ -15710,7 +18092,10 @@ pl:
     service=yard: Pl:Tag:service=yard
     shop=agrarian: Pl:Tag:shop=agrarian
     shop=alcohol: Pl:Tag:shop=alcohol
+    shop=anime: Pl:Tag:shop=anime
+    shop=antiques: Pl:Tag:shop=antiques
     shop=appliance: Pl:Tag:shop=appliance
+    shop=art: Pl:Tag:shop=art
     shop=baby_goods: Pl:Tag:shop=baby goods
     shop=bag: Pl:Tag:shop=bag
     shop=bakery: Pl:Tag:shop=bakery
     shop=bed: Pl:Tag:shop=bed
     shop=beverages: Pl:Tag:shop=beverages
     shop=bicycle: Pl:Tag:shop=bicycle
+    shop=boat: Pl:Tag:shop=boat
+    shop=bookmaker: Pl:Tag:shop=bookmaker
+    shop=books: Pl:Tag:shop=books
     shop=boutique: Pl:Tag:shop=boutique
     shop=brewing_supplies: Pl:Tag:shop=brewing supplies
     shop=butcher: Pl:Tag:shop=butcher
     shop=camera: Pl:Tag:shop=camera
+    shop=candles: Pl:Tag:shop=candles
+    shop=cannabis: Pl:Tag:shop=cannabis
     shop=car: Pl:Tag:shop=car
+    shop=car_parts: Pl:Tag:shop=car parts
     shop=car_repair: Pl:Tag:shop=car repair
+    shop=caravan: Pl:Tag:shop=caravan
+    shop=carpet: Pl:Tag:shop=carpet
+    shop=charity: Pl:Tag:shop=charity
     shop=cheese: Pl:Tag:shop=cheese
+    shop=chemist: Pl:Tag:shop=chemist
     shop=chocolate: Pl:Tag:shop=chocolate
     shop=clothes: Pl:Tag:shop=clothes
     shop=coffee: Pl:Tag:shop=coffee
     shop=collector: Pl:Tag:shop=collector
+    shop=computer: Pl:Tag:shop=computer
     shop=confectionery: Pl:Tag:shop=confectionery
     shop=convenience: Pl:Tag:shop=convenience
     shop=copyshop: Pl:Tag:shop=copyshop
+    shop=cosmetics: Pl:Tag:shop=cosmetics
+    shop=country_store: Pl:Tag:shop=country store
+    shop=craft: Pl:Tag:shop=craft
     shop=curtain: Pl:Tag:shop=curtain
     shop=dairy: Pl:Tag:shop=dairy
     shop=deli: Pl:Tag:shop=deli
     shop=department_store: Pl:Tag:shop=department store
     shop=doityourself: Pl:Tag:shop=doityourself
+    shop=doors: Pl:Tag:shop=doors
     shop=dry_cleaning: Pl:Tag:shop=dry cleaning
+    shop=e-cigarette: Pl:Tag:shop=e-cigarette
+    shop=electrical: Pl:Tag:shop=electrical
+    shop=electronics: Pl:Tag:shop=electronics
     shop=equestrian: Pl:Tag:shop=equestrian
     shop=erotic: Pl:Tag:shop=erotic
     shop=fabric: Pl:Tag:shop=fabric
     shop=farm: Pl:Tag:shop=farm
+    shop=fashion_accessories: Pl:Tag:shop=fashion accessories
+    shop=fireplace: Pl:Tag:shop=fireplace
     shop=fishing: Pl:Tag:shop=fishing
     shop=fishmonger: Pl:Tag:shop=fishmonger
+    shop=flooring: Pl:Tag:shop=flooring
     shop=florist: Pl:Tag:shop=florist
+    shop=frame: Pl:Tag:shop=frame
+    shop=frozen_food: Pl:Tag:shop=frozen food
+    shop=fuel: Pl:Tag:shop=fuel
     shop=funeral_directors: Pl:Tag:shop=funeral directors
     shop=furniture: Pl:Tag:shop=furniture
+    shop=games: Pl:Tag:shop=games
     shop=garden_centre: Pl:Tag:shop=garden centre
     shop=gas: Pl:Tag:shop=gas
     shop=general: Pl:Tag:shop=general
+    shop=gift: Pl:Tag:shop=gift
+    shop=golf: Pl:Tag:shop=golf
     shop=greengrocer: Pl:Tag:shop=greengrocer
     shop=haberdashery: Pl:Tag:shop=haberdashery
     shop=hairdresser: Pl:Tag:shop=hairdresser
+    shop=hairdresser_supply: Pl:Tag:shop=hairdresser supply
+    shop=hardware: Pl:Tag:shop=hardware
     shop=health_food: Pl:Tag:shop=health food
+    shop=hearing_aids: Pl:Tag:shop=hearing aids
     shop=herbalist: Pl:Tag:shop=herbalist
+    shop=hifi: Pl:Tag:shop=hifi
+    shop=honey: Pl:Tag:shop=honey
+    shop=household_linen: Pl:Tag:shop=household linen
     shop=houseware: Pl:Tag:shop=houseware
     shop=hunting: Pl:Tag:shop=hunting
+    shop=hvac: Pl:Tag:shop=hvac
     shop=ice_cream: Pl:Tag:shop=ice cream
+    shop=interior_decoration: Pl:Tag:shop=interior decoration
+    shop=jewelry: Pl:Tag:shop=jewelry
     shop=junk_yard: Pl:Tag:shop=junk yard
     shop=kiosk: Pl:Tag:shop=kiosk
     shop=kitchen: Pl:Tag:shop=kitchen
     shop=laundry: Pl:Tag:shop=laundry
     shop=leather: Pl:Tag:shop=leather
     shop=lighting: Pl:Tag:shop=lighting
+    shop=locksmith: Pl:Tag:shop=locksmith
+    shop=lottery: Pl:Tag:shop=lottery
     shop=mall: Pl:Tag:shop=mall
+    shop=massage: Pl:Tag:shop=massage
     shop=medical_supply: Pl:Tag:shop=medical supply
+    shop=military_surplus: Pl:Tag:shop=military surplus
+    shop=mobile_phone: Pl:Tag:shop=mobile phone
+    shop=model: Pl:Tag:shop=model
+    shop=money_lender: Pl:Tag:shop=money lender
+    shop=motorcycle: Pl:Tag:shop=motorcycle
+    shop=motorcycle_repair: Pl:Tag:shop=motorcycle repair
+    shop=music: Pl:Tag:shop=music
     shop=musical_instrument: Pl:Tag:shop=musical instrument
+    shop=newsagent: Pl:Tag:shop=newsagent
     shop=nutrition_supplements: Pl:Tag:shop=nutrition supplements
     shop=optician: Pl:Tag:shop=optician
+    shop=outdoor: Pl:Tag:shop=outdoor
+    shop=outpost: Pl:Tag:shop=outpost
+    shop=paint: Pl:Tag:shop=paint
+    shop=party: Pl:Tag:shop=party
     shop=pastry: Pl:Tag:shop=pastry
+    shop=pawnbroker: Pl:Tag:shop=pawnbroker
+    shop=perfumery: Pl:Tag:shop=perfumery
     shop=pet: Pl:Tag:shop=pet
     shop=pet_grooming: Pl:Tag:shop=pet grooming
+    shop=photo: Pl:Tag:shop=photo
     shop=pottery: Pl:Tag:shop=pottery
+    shop=printer_ink: Pl:Tag:shop=printer ink
     shop=pyrotechnics: Pl:Tag:shop=pyrotechnics
+    shop=radiotechnics: Pl:Tag:shop=radiotechnics
     shop=religion: Pl:Tag:shop=religion
     shop=rental: Pl:Tag:shop=rental
+    shop=scuba_diving: Pl:Tag:shop=scuba diving
     shop=seafood: Pl:Tag:shop=seafood
     shop=second_hand: Pl:Tag:shop=second hand
     shop=sewing: Pl:Tag:shop=sewing
+    shop=shoe_repair: Pl:Tag:shop=shoe repair
     shop=shoes: Pl:Tag:shop=shoes
+    shop=ski: Pl:Tag:shop=ski
     shop=spices: Pl:Tag:shop=spices
+  &nbs