]> git.openstreetmap.org Git - rails.git/blobdiff - config/wiki_pages.yml
Switch to using FrozenRecord for loading communities
[rails.git] / config / wiki_pages.yml
index bc8719bcf6bfddc554d7df7b7bd7ba1f4dfd1289..5b6194aba74c673a96288ccda38bfed0ab32c1cf 100644 (file)
@@ -4,7 +4,10 @@
 ---
 ar:
   key:
+    highway: Ar:Key:highway
     name: Ar:Key:name
+    natural: Ar:Key:natural
+    waterway: Ar:Key:waterway
   tag:
     amenity=school: Ar:Tag:amenity=school
     shop=bakery: Ar:Tag:shop=bakery
@@ -17,21 +20,106 @@ bg:
     building: Bg:Key:building
     lanes: Bg:Key:lanes
   tag:
+    barrier=guard_rail: Bg:Tag:barrier=guard rail
     building=chapel: Bg:Tag:building=chapel
     natural=heath: Bg:Tag:natural=heath
     railway=crossing: Bg:Tag:railway=crossing
     railway=level_crossing: Bg:Tag:railway=level crossing
+br:
+  key:
+    highway: Br:Key:highway
 ca:
   key:
     amenity: Ca:Key:amenity
+    board:title: Ca:Key:board:title
+    building: Ca:Key:building
+    contact:facebook: Ca:Key:contact:facebook
+    created_by: Ca:Key:created by
+    facebook: Ca:Key:facebook
+    lgbtq: Ca:Key:lgbtq
     name: Ca:Key:name
+    openplaques:id: Ca:Key:openplaques:id
     operator:type: Ca:Key:operator:type
     phone: Ca:Key:phone
+    roller_coaster: Ca:Key:roller coaster
+    roundtrip: Ca:Key:roundtrip
+    wikidata: Ca:Key:wikidata
   tag:
+    abandoned:amenity=prison: Ca:Tag:abandoned:amenity=prison
+    admin_level=2: Ca:Tag:admin level=2
+    advertising=screen: Ca:Tag:advertising=screen
+    advertising=tarp: Ca:Tag:advertising=tarp
+    advertising=wall_painting: Ca:Tag:advertising=wall painting
+    aerialway=cable_car: Ca:Tag:aerialway=cable car
+    aerialway=canopy: Ca:Tag:aerialway=canopy
+    aerialway=chair_lift: Ca:Tag:aerialway=chair lift
+    aerialway=drag_lift: Ca:Tag:aerialway=drag lift
+    aerialway=gondola: Ca:Tag:aerialway=gondola
+    aerialway=goods: Ca:Tag:aerialway=goods
+    aerialway=j-bar: Ca:Tag:aerialway=j-bar
+    aerialway=magic_carpet: Ca:Tag:aerialway=magic carpet
+    aerialway=mixed_lift: Ca:Tag:aerialway=mixed lift
+    aerialway=platter: Ca:Tag:aerialway=platter
+    aerialway=rope_tow: Ca:Tag:aerialway=rope tow
+    aerialway=station: Ca:Tag:aerialway=station
+    aerialway=t-bar: Ca:Tag:aerialway=t-bar
+    aerialway=zip_line: Ca:Tag:aerialway=zip line
+    aeroway=apron: Ca:Tag:aeroway=apron
+    aeroway=gate: Ca:Tag:aeroway=gate
+    aeroway=helipad: Ca:Tag:aeroway=helipad
+    aeroway=heliport: Ca:Tag:aeroway=heliport
+    aeroway=holding_position: Ca:Tag:aeroway=holding position
+    aeroway=navigationaid: Ca:Tag:aeroway=navigationaid
+    aeroway=terminal: Ca:Tag:aeroway=terminal
+    aeroway=windsock: Ca:Tag:aeroway=windsock
+    airmark=beacon: Ca:Tag:airmark=beacon
+    amenity=bar: Ca:Tag:amenity=bar
+    amenity=bicycle_parking: Ca:Tag:amenity=bicycle parking
+    amenity=biergarten: Ca:Tag:amenity=biergarten
+    amenity=cafe: Ca:Tag:amenity=cafe
+    amenity=college: Ca:Tag:amenity=college
+    amenity=driving_school: Ca:Tag:amenity=driving school
+    amenity=exhibition_centre: Ca:Tag:amenity=exhibition centre
+    amenity=fast_food: Ca:Tag:amenity=fast food
+    amenity=food_court: Ca:Tag:amenity=food court
+    amenity=ice_cream: Ca:Tag:amenity=ice cream
+    amenity=kindergarten: Ca:Tag:amenity=kindergarten
+    amenity=language_school: Ca:Tag:amenity=language school
+    amenity=library: Ca:Tag:amenity=library
+    amenity=music_school: Ca:Tag:amenity=music school
+    amenity=nightclub: Ca:Tag:amenity=nightclub
+    amenity=outfitter: Ca:Tag:amenity=outfitter
+    amenity=post_box: Ca:Tag:amenity=post box
+    amenity=pub: Ca:Tag:amenity=pub
+    amenity=restaurant: Ca:Tag:amenity=restaurant
+    amenity=toy_library: Ca:Tag:amenity=toy library
+    amenity=university: Ca:Tag:amenity=university
+    barrier=cable_barrier: Ca:Tag:barrier=cable barrier
+    barrier=kerb: Ca:Tag:barrier=kerb
+    building=boathouse: Ca:Tag:building=boathouse
+    building=cathedral: Ca:Tag:building=cathedral
+    building=hospital: Ca:Tag:building=hospital
+    building=hut: Ca:Tag:building=hut
+    craft=blacksmith: Ca:Tag:craft=blacksmith
+    craft=restoration: Ca:Tag:craft=restoration
+    crossing=traffic_signals: Ca:Tag:crossing=traffic signals
+    cycleway=opposite: Ca:Tag:cycleway=opposite
+    highway=motorway: Ca:Tag:highway=motorway
+    highway=residential: Ca:Tag:highway=residential
     landuse=farmland: Ca:Tag:landuse=farmland
+    landuse=traffic_island: Ca:Tag:landuse=traffic island
     leisure=swimming_pool: Ca:Tag:leisure=swimming pool
+    leisure=tanning_salon: Ca:Tag:leisure=tanning salon
+    man_made=gantry: Ca:Tag:man made=gantry
+    name=Herfy: Ca:Tag:name=Herfy
+    natural=cliff: Ca:Tag:natural=cliff
+    network=VE:T:PO: Ca:Tag:network=VE:T:PO
+    office=notary: Ca:Tag:office=notary
     place=isolated_dwelling: Ca:Tag:place=isolated dwelling
+    power=line: Ca:Tag:power=line
     shop=frozen_food: Ca:Tag:shop=frozen food
+    tactile_paving=no: Ca:Tag:tactile paving=no
+    vending=books: Ca:Tag:vending=books
 cs:
   key:
     3dr:type: Cs:Key:3dr:type
@@ -45,6 +133,7 @@ cs:
     abandoned:amenity: Cs:Key:abandoned:amenity
     abutters: Cs:Key:abutters
     access: Cs:Key:access
+    access:conditional: Cs:Key:access:conditional
     access:lanes: Cs:Key:access:lanes
     addr: Cs:Key:addr
     addr:city: Cs:Key:addr:city
@@ -138,7 +227,6 @@ cs:
     building:part: Cs:Key:building:part
     building:place: Cs:Key:building:place
     building:ruian:type: Cs:Key:building:ruian:type
-    building:type: Cs:Key:building:type
     building:use: Cs:Key:building:use
     bulk_purchase: Cs:Key:bulk purchase
     bunker_type: Cs:Key:bunker type
@@ -472,6 +560,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
@@ -495,7 +584,6 @@ cs:
     navigationaid: Cs:Key:navigationaid
     network: Cs:Key:network
     noexit: Cs:Key:noexit
-    noname: Cs:Key:noname
     noref: Cs:Key:noref
     note: Cs:Key:note
     nudism: Cs:Key:nudism
@@ -962,8 +1050,10 @@ cs:
     amenity=ticket_booth: Cs:Tag:amenity=ticket booth
     amenity=toilets: Cs:Tag:amenity=toilets
     amenity=townhall: Cs:Tag:amenity=townhall
+    amenity=trolley_bay: Cs:Tag:amenity=trolley bay
     amenity=university: Cs:Tag:amenity=university
     amenity=vacuum_cleaner: Cs:Tag:amenity=vacuum cleaner
+    amenity=vehicle_inspection: Cs:Tag:amenity=vehicle inspection
     amenity=vending_machine: Cs:Tag:amenity=vending machine
     amenity=veterinary: Cs:Tag:amenity=veterinary
     amenity=waste_basket: Cs:Tag:amenity=waste basket
@@ -1507,6 +1597,7 @@ cs:
     leisure=water_park: Cs:Tag:leisure=water park
     leisure=wildlife_hide: Cs:Tag:leisure=wildlife hide
     level_crossing=traffic_signals: Cs:Tag:level crossing=traffic signals
+    lifeguard=tower: Cs:Tag:lifeguard=tower
     man_made=adit: Cs:Tag:man made=adit
     man_made=beacon: Cs:Tag:man made=beacon
     man_made=beehive: Cs:Tag:man made=beehive
@@ -1544,7 +1635,6 @@ cs:
     man_made=petroleum_well: Cs:Tag:man made=petroleum well
     man_made=pier: Cs:Tag:man made=pier
     man_made=pipeline: Cs:Tag:man made=pipeline
-    man_made=power_fossil: Cs:Tag:man made=power fossil
     man_made=power_hydro: Cs:Tag:man made=power hydro
     man_made=power_nuclear: Cs:Tag:man made=power nuclear
     man_made=power_wind: Cs:Tag:man made=power wind
@@ -1660,6 +1750,7 @@ cs:
     network=lwn: Cs:Tag:network=lwn
     network=nwn: Cs:Tag:network=nwn
     network=rwn: Cs:Tag:network=rwn
+    noname=yes: Cs:Tag:noname=yes
     office=accountant: Cs:Tag:office=accountant
     office=administrative: Cs:Tag:office=administrative
     office=adoption_agency: Cs:Tag:office=adoption agency
@@ -1686,6 +1777,7 @@ cs:
     office=newspaper: Cs:Tag:office=newspaper
     office=ngo: Cs:Tag:office=ngo
     office=notary: Cs:Tag:office=notary
+    office=parish: Cs:Tag:office=parish
     office=political_party: Cs:Tag:office=political party
     office=private_investigator: Cs:Tag:office=private investigator
     office=quango: Cs:Tag:office=quango
@@ -1740,6 +1832,7 @@ cs:
     place=suburb: Cs:Tag:place=suburb
     place=town: Cs:Tag:place=town
     place=village: Cs:Tag:place=village
+    power=catenary_mast: Cs:Tag:power=catenary mast
     power=generator: Cs:Tag:power=generator
     power=heliostat: Cs:Tag:power=heliostat
     power=terminal: Cs:Tag:power=terminal
@@ -1815,6 +1908,7 @@ cs:
     route=running: Cs:Tag:route=running
     route=ski: Cs:Tag:route=ski
     route=subway: Cs:Tag:route=subway
+    route=tracks: Cs:Tag:route=tracks
     route=train: Cs:Tag:route=train
     route=tram: Cs:Tag:route=tram
     route=trolleybus: Cs:Tag:route=trolleybus
@@ -1974,7 +2068,6 @@ cs:
     shop=pharmacy: Cs:Tag:shop=pharmacy
     shop=photo: Cs:Tag:shop=photo
     shop=photography: Cs:Tag:shop=photography
-    shop=piercing: Cs:Tag:shop=piercing
     shop=pottery: Cs:Tag:shop=pottery
     shop=printing: Cs:Tag:shop=printing
     shop=pyrotechnics: Cs:Tag:shop=pyrotechnics
@@ -2067,6 +2160,8 @@ cs:
     sport=bowls: Cs:Tag:sport=bowls
     sport=boxing: Cs:Tag:sport=boxing
     sport=canadian_football: Cs:Tag:sport=canadian football
+    sport=motocross: Cs:Tag:sport=motocross
+    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
@@ -2106,6 +2201,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
@@ -2205,78 +2301,101 @@ da:
     man_made: Da:Key:man made
     maxheight: Da:Key:maxheight
     maxspeed: Da:Key:maxspeed
+    noexit: Da:Key:noexit
     surface: Da:Key:surface
   tag:
     amenity=community_centre: Da:Tag:amenity=community centre
+    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
     highway=bridleway: Da:Tag:highway=bridleway
+    highway=cycleway: Da:Tag:highway=cycleway
     highway=ford: Da:Tag:highway=ford
     highway=road: Da:Tag:highway=road
     highway=tertiary: Da:Tag:highway=tertiary
     highway=track: Da:Tag:highway=track
     highway=unclassified: Da:Tag:highway=unclassified
+    landuse=cemetery: Da:Tag:landuse=cemetery
     leisure=dog_park: Da:Tag:leisure=dog park
     place=hamlet: Da:Tag:place=hamlet
     place=town: Da:Tag:place=town
     place=village: Da:Tag:place=village
     route=ferry: Da:Tag:route=ferry
     service=driveway: Da:Tag:service=driveway
+    shop=charity: Da:Tag:shop=charity
 de:
   key:
     AlpinRes_ID: DE:Key:AlpinRes ID
     Animal: DE:Key:Animal
     Annotations: DE:Key:Annotations
     FIXME: DE:Key:FIXME
+    Key:restaurant: DE:Key:Key:restaurant
     TODO: DE:Key:TODO
+    VRS:ref: DE:Key:VRS:ref
     WDPA_ID:ref: DE:Key:WDPA ID:ref
     'abandoned:': 'DE:Key:abandoned:'
     abandoned:*: DE:Key:abandoned:*
     abandoned:amenity: DE:Key:abandoned:amenity
+    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
     addr:housenumber: DE:Key:addr:housenumber
     addr:inclusion: DE:Key:addr:inclusion
     addr:interpolation: DE:Key:addr:interpolation
+    addr:place: DE:Key:addr:place
     addr:postcode: DE:Key:addr:postcode
     addr:street: DE:Key:addr:street
     addr:suburb: DE:Key:addr:suburb
     advertising: DE:Key:advertising
     aerialway: DE:Key:aerialway
     aerialway:drag_lift: DE:Key:aerialway:drag lift
+    aerodrome:type: DE:Key:aerodrome:type
     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
     bdouble: DE:Key:bdouble
     beacon:type: DE:Key:beacon:type
+    beauty: DE:Key:beauty
     beds: DE:Key:beds
     bench: DE:Key:bench
     bicycle: DE:Key:bicycle
     bicycle:backward: DE:Key:bicycle:backward
+    bicycle:conditional: DE:Key:bicycle:conditional
     bicycle_parking: DE:Key:bicycle parking
     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
@@ -2287,6 +2406,7 @@ de:
     bridge: DE:Key:bridge
     bridge:movable: DE:Key:bridge:movable
     bridge:structure: DE:Key:bridge:structure
+    bridge:support: DE:Key:bridge:support
     buiding: DE:Key:buiding
     building: DE:Key:building
     building:architecture: DE:Key:building:architecture
@@ -2295,19 +2415,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
@@ -2317,6 +2448,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
@@ -2326,12 +2458,14 @@ 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
     contact:facebook: DE:Key:contact:facebook
     contact:fax: DE:Key:contact:fax
     contact:google_plus: DE:Key:contact:google plus
+    contact:mobile: DE:Key:contact:mobile
     contact:phone: DE:Key:contact:phone
     contact:website: DE:Key:contact:website
     content: DE:Key:content
@@ -2339,14 +2473,18 @@ de:
     country: DE:Key:country
     covered: DE:Key:covered
     craft: DE:Key:craft
+    crane:type: DE:Key:crane:type
     created_by: DE:Key:created by
+    crop: DE:Key:crop
     crossing: DE:Key:crossing
     crossing:activation: DE:Key:crossing:activation
     crossing:barrier: DE:Key:crossing:barrier
     crossing:bell: DE:Key:crossing:bell
+    crossing:island: DE:Key:crossing:island
     crossing:light: DE:Key:crossing:light
     crossing: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
@@ -2357,62 +2495,91 @@ de:
     cycleway: DE:Key:cycleway
     cycleway:left: DE:Key:cycleway:left
     cycleway:right: DE:Key:cycleway:right
+    cycleway:right:oneway: DE:Key:cycleway:right:oneway
+    cycleway:surface: DE:Key:cycleway:surface
+    dance:style: DE:Key:dance:style
+    dance:teaching: DE:Key:dance:teaching
     date: DE:Key:date
     de:amtlicher_gemeindeschluessel: DE:Key:de:amtlicher gemeindeschluessel
     de:regionalschluessel: DE:Key:de:regionalschluessel
     de:strassenschluessel: DE:Key:de:strassenschluessel
     delivery: DE:Key:delivery
+    'demolished:': 'DE:Key:demolished:'
     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
     destination:symbol: DE:Key:destination:symbol
     destination:to: DE:Key:destination:to
+    destroyed: DE:Key:destroyed
+    'destroyed:': 'DE:Key:destroyed:'
     diameter: DE:Key:diameter
     diaper: DE:Key:diaper
     diet: DE:Key:diet
     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
     'disused:': 'DE:Key:disused:'
     disused:amenity: DE:Key:disused:amenity
     disused:railway: DE:Key:disused:railway
+    dog: DE:Key:dog
     door: DE:Key:door
     draft: DE:Key:draft
     drink: DE:Key:drink
     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
     fetish: DE:Key:fetish
+    fire_boundary: DE:Key:fire boundary
     fire_hydrant: DE:Key:fire hydrant
-    fire_hydrant:type: DE:Key:fire hydrant:type
     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
     ford: DE:Key:ford
+    forestry: DE:Key:forestry
+    format: DE:Key:format
     fortification_type: DE:Key:fortification type
+    forward: DE:Key:forward
     frequency: DE:Key:frequency
+    fridge: DE:Key:fridge
     from: DE:Key:from
+    fruit: DE:Key:fruit
     fuel: DE:Key:fuel
+    fuel:LH2: DE:Key:fuel:LH2
+    garden:style: DE:Key:garden:style
+    garden:type: DE:Key:garden:type
     gauge: DE:Key:gauge
     generator:method: DE:Key:generator:method
     generator:output: DE:Key:generator:output
@@ -2426,26 +2593,44 @@ 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
+    healthcare:counselling: DE:Key:healthcare:counselling
+    healthcare:speciality: DE:Key:healthcare:speciality
     height: DE:Key:height
     heritage: DE:Key:heritage
     hgv: DE:Key:hgv
+    hgv_articulated: DE:Key:hgv articulated
     highspeed: DE:Key:highspeed
     highway: DE:Key:highway
+    hiking: DE:Key:hiking
     historic: DE:Key:historic
     historic:civilization: DE:Key:historic:civilization
     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
     importance: DE:Key:importance
     incline: DE:Key:incline
+    indoor: DE:Key:indoor
     indoor_seating: DE:Key:indoor seating
     industrial: DE:Key:industrial
     informal: DE:Key:informal
@@ -2454,20 +2639,33 @@ de:
     int_name: DE:Key:int name
     intermittent: DE:Key:intermittent
     internet_access: DE:Key:internet access
+    internet_access:fee: DE:Key:internet access:fee
+    interval: DE:Key:interval
     is_in: DE:Key:is in
     is_in:continent: DE:Key:is in:continent
+    is_in:country: DE:Key:is in:country
+    is_in:county: DE:Key:is in:county
+    isced:level: DE:Key:isced:level
     junction: DE:Key:junction
+    kerb: DE:Key:kerb
     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
@@ -2477,31 +2675,48 @@ de:
     level: DE:Key:level
     line: DE:Key:line
     lit: DE:Key:lit
+    living_street: DE:Key:living street
     loc_name: DE:Key:loc name
+    local_ref: DE:Key:local ref
     location: DE:Key:location
     lock: DE:Key:lock
     lock_name: DE:Key:lock name
     lock_ref: DE:Key:lock ref
-    lottery: DE:Key:lottery
+    lockable: DE:Key:lockable
+    locked: DE:Key:locked
     love_locks: DE:Key:love locks
+    lunch: DE:Key:lunch
     man_made: DE:Key:man made
+    managed: DE:Key:managed
     manhole: DE:Key:manhole
     manufacturer: DE:Key:manufacturer
     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
     maxaxleload: DE:Key:maxaxleload
     maxheight: DE:Key:maxheight
     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
+    meadow: DE:Key:meadow
     megalith_type: DE:Key:megalith type
     memorial: DE:Key:memorial
     memorial:type: DE:Key:memorial:type
+    milestone_type: DE:Key:milestone type
     military: DE:Key:military
     min_age: DE:Key:min age
+    mindistance: DE:Key:mindistance
     mineshaft_type: DE:Key:mineshaft type
     minspeed: DE:Key:minspeed
     minspeed:lanes: DE:Key:minspeed:lanes
@@ -2526,12 +2741,14 @@ de:
     motorcycle: DE:Key:motorcycle
     motorcycle:clothes: DE:Key:motorcycle:clothes
     motorcycle:conditional: DE:Key:motorcycle:conditional
-    motorcycle:parts: DE:Key:motorcycle:parts
+    motorcycle:parking: DE:Key:motorcycle:parking
     motorcycle:rental: DE:Key:motorcycle:rental
     motorcycle:repair: DE:Key:motorcycle:repair
     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
@@ -2545,32 +2762,50 @@ 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
+    noref: DE:Key:noref
     note: DE:Key:note
     nudism: DE:Key:nudism
     nursery: DE:Key:nursery
+    object: DE:Key:object
+    observatory:type: DE:Key:observatory:type
     office: DE:Key:office
+    official_name: DE:Key:official name
     offshore: DE:Key:offshore
+    old_name: DE:Key:old name
     oneway: DE:Key:oneway
     oneway:bicycle: DE:Key:oneway:bicycle
+    oneway:bus: DE:Key:oneway:bus
+    oneway:conditional: DE:Key:oneway:conditional
     oneway:moped: DE:Key:oneway:moped
     onkz: DE:Key:onkz
     openfire: DE:Key:openfire
+    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
+    operator:type: DE:Key:operator:type
     organic: DE:Key:organic
+    origin: DE:Key:origin
     osak: DE:Key:osak
     osmc:status: DE:Key:osmc:status
     osmc:symbol: DE:Key:osmc:symbol
     outdoor_seating: DE:Key:outdoor seating
     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
+    passing_places: DE:Key:passing places
     payment: DE:Key:payment
+    permanent_camping: DE:Key:permanent camping
     phone: DE:Key:phone
     pilgrimage: DE:Key:pilgrimage
     piste:difficulty: DE:Key:piste:difficulty
@@ -2578,18 +2813,25 @@ de:
     place: DE:Key:place
     placement: DE:Key:placement
     plant: DE:Key:plant
+    plant:method: DE:Key:plant:method
     plant:output: DE:Key:plant:output
+    plant:output:electricity: DE:Key:plant:output:electricity
+    plant:output:hot_water: DE:Key:plant:output:hot water
+    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
-    post_office:type: DE:Key:post office:type
     postal_code: DE:Key:postal code
     power: DE:Key:power
     power_rating: DE:Key:power rating
     preschool: DE:Key:preschool
     priority: DE:Key:priority
     priority_road: DE:Key:priority road
+    produce: DE:Key:produce
+    product: DE:Key:product
     proposed: DE:Key:proposed
     protect_class: DE:Key:protect class
     protected: DE:Key:protected
@@ -2597,47 +2839,73 @@ de:
     psv: DE:Key:psv
     public_bookcase:type: DE:Key:public bookcase:type
     public_transport: DE:Key:public transport
+    public_transport:tied_with: DE:Key:public transport:tied with
     pump: DE:Key:pump
     rack: DE:Key:rack
     railway: DE:Key:railway
+    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:signal:distant: DE:Key:railway:signal:distant
+    railway:signal:speed_limit: DE:Key:railway:signal:speed limit
+    railway:signal:speed_limit_distant: DE:Key:railway:signal:speed limit distant
     railway: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
+    reusable_packaging: DE:Key:reusable packaging
+    reusable_packaging:accept: DE:Key:reusable packaging:accept
+    reusable_packaging:offer: DE:Key:reusable packaging:offer
     right: DE:Key:right
     roof:material: DE:Key:roof:material
     room: DE:Key:room
     rooms: DE:Key:rooms
     rotor:diameter: DE:Key:rotor:diameter
+    roundtrip: DE:Key:roundtrip
     route: DE:Key:route
+    route_ref: DE:Key:route ref
     ruins: DE:Key:ruins
     sac_scale: DE:Key:sac scale
     salt: DE:Key:salt
+    sauna: DE:Key:sauna
     seamark: DE:Key:seamark
     seamark:fixme: DE:Key:seamark:fixme
     seamark:type: DE:Key:seamark:type
+    seasonal: DE:Key:seasonal
     seats: DE:Key:seats
     second_hand: DE:Key:second hand
     segregated: DE:Key:segregated
     self_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
     shooting: DE:Key:shooting
     shop: DE:Key:shop
+    short_protection_title: DE:Key:short protection title
     shower: DE:Key:shower
     sidewalk: DE:Key:sidewalk
+    sidewalk:both:bicycle: DE:Key:sidewalk:both:bicycle
     site_type: DE:Key:site type
+    ski: DE:Key:ski
     smoking: DE:Key:smoking
     smoothness: DE:Key:smoothness
     social_facility: DE:Key:social facility
@@ -2646,6 +2914,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
@@ -2660,15 +2929,25 @@ de:
     substance: DE:Key:substance
     substation: DE:Key:substation
     summit:register: DE:Key:summit:register
+    supervised: DE:Key:supervised
     support: DE:Key:support
     surface: DE:Key:surface
     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
+    switch: DE:Key:switch
     symbol: DE:Key:symbol
     tactile_paving: DE:Key:tactile paving
     tactile_writing: DE:Key:tactile writing
     takeaway: DE:Key:takeaway
     target: DE:Key:target
+    telecom:medium: DE:Key:telecom:medium
+    telescope:type: DE:Key:telescope:type
+    tents: DE:Key:tents
+    theatre:genre: DE:Key:theatre:genre
+    theatre:type: DE:Key:theatre:type
     tidal: DE:Key:tidal
     to: DE:Key:to
     todo: DE:Key:todo
@@ -2677,30 +2956,51 @@ de:
     toll: DE:Key:toll
     tomb: DE:Key:tomb
     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_name: DE:Key:uic name
+    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
+    volcano:status: DE:Key:volcano:status
     voltage: DE:Key:voltage
+    voltage:primary: DE:Key:voltage:primary
+    voltage:secondary: DE:Key:voltage:secondary
     waste: DE:Key:waste
     water: DE:Key:water
+    water_characteristic: DE:Key:water characteristic
+    water_well: DE:Key:water well
     waterway: DE:Key:waterway
     website: DE:Key:website
     wetland: DE:Key:wetland
@@ -2711,46 +3011,81 @@ 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
     wood: DE:Key:wood
     workrules: DE:Key:workrules
     xmas:feature: DE:Key:xmas:feature
     year_of_construction: DE:Key:year of construction
+    zero_waste: DE:Key:zero waste
     zone:maxspeed: DE:Key:zone:maxspeed
     zoo: DE:Key:zoo
   tag:
     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
     aeroway=helipad: DE:Tag:aeroway=helipad
     aeroway=heliport: DE:Tag:aeroway=heliport
+    aeroway=holding_position: DE:Tag:aeroway=holding position
     aeroway=navigationaid: DE:Tag:aeroway=navigationaid
+    aeroway=parking_position: DE:Tag:aeroway=parking position
     aeroway=runway: DE:Tag:aeroway=runway
     aeroway=spaceport: DE:Tag:aeroway=spaceport
+    aeroway=taxilane: DE:Tag:aeroway=taxilane
     aeroway=taxiway: DE:Tag:aeroway=taxiway
     aeroway=terminal: DE:Tag:aeroway=terminal
+    aeroway=windsock: DE:Tag:aeroway=windsock
     airmark=beacon: DE:Tag:airmark=beacon
+    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
@@ -2765,15 +3100,18 @@ de:
     amenity=bicycle_repair_station: DE:Tag:amenity=bicycle repair station
     amenity=biergarten: DE:Tag:amenity=biergarten
     amenity=boat_rental: DE:Tag:amenity=boat rental
+    amenity=boat_storage: DE:Tag:amenity=boat storage
     amenity=brothel: DE:Tag:amenity=brothel
     amenity=bureau_de_change: DE:Tag:amenity=bureau de change
     amenity=bus_station: DE:Tag:amenity=bus station
     amenity=cafe: DE:Tag:amenity=cafe
+    amenity=car_pooling: DE:Tag:amenity=car pooling
     amenity=car_rental: DE:Tag:amenity=car rental
     amenity=car_sharing: DE:Tag:amenity=car sharing
     amenity=car_wash: DE:Tag:amenity=car wash
     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
@@ -2789,6 +3127,8 @@ de:
     amenity=dentist: DE:Tag:amenity=dentist
     amenity=dive_centre: DE:Tag:amenity=dive centre
     amenity=doctors: DE:Tag:amenity=doctors
+    amenity=dog_toilet: DE:Tag:amenity=dog toilet
+    amenity=dressing_room: DE:Tag:amenity=dressing room
     amenity=drinking_water: DE:Tag:amenity=drinking water
     amenity=driving_school: DE:Tag:amenity=driving school
     amenity=embassy: DE:Tag:amenity=embassy
@@ -2802,38 +3142,55 @@ de:
     amenity=fire_station: DE:Tag:amenity=fire station
     amenity=fish_spa: DE:Tag:amenity=fish spa
     amenity=fountain: DE:Tag:amenity=fountain
+    amenity=fridge: DE:Tag:amenity=fridge
     amenity=fuel: DE:Tag:amenity=fuel
+    amenity=funeral_hall: DE:Tag:amenity=funeral hall
+    amenity=give_box: DE:Tag:amenity=give box
     amenity=grave_yard: DE:Tag:amenity=grave yard
     amenity=grit_bin: DE:Tag:amenity=grit bin
+    amenity=hitching_post: DE:Tag:amenity=hitching post
     amenity=hookah_lounge: DE:Tag:amenity=hookah lounge
+    amenity=hospice: DE:Tag:amenity=hospice
     amenity=hospital: DE:Tag:amenity=hospital
     amenity=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
     amenity=nightclub: DE:Tag:amenity=nightclub
     amenity=nursing_home: DE:Tag:amenity=nursing home
     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
     amenity=planetarium: DE:Tag:amenity=planetarium
     amenity=police: DE:Tag:amenity=police
     amenity=post_box: DE:Tag:amenity=post box
+    amenity=post_depot: DE:Tag:amenity=post depot
     amenity=post_office: DE:Tag:amenity=post office
+    amenity=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
+    amenity=public_bath: DE:Tag:amenity=public bath
     amenity=public_bookcase: DE:Tag:amenity=public bookcase
     amenity=ranger_station: DE:Tag:amenity=ranger station
     amenity=recycling: DE:Tag:amenity=recycling
@@ -2841,10 +3198,12 @@ de:
     amenity=research_institute: DE:Tag:amenity=research institute
     amenity=restaurant: DE:Tag:amenity=restaurant
     amenity=retirement_home: DE:Tag:amenity=retirement home
+    amenity=sailing_school: DE:Tag:amenity=sailing school
     amenity=sanitary_dump_station: DE:Tag:amenity=sanitary dump station
     amenity=school: DE:Tag:amenity=school
     amenity=shelter: DE:Tag:amenity=shelter
     amenity=shower: DE:Tag:amenity=shower
+    amenity=ski_school: DE:Tag:amenity=ski school
     amenity=smoking_area: DE:Tag:amenity=smoking area
     amenity=social_facility: DE:Tag:amenity=social facility
     amenity=stables: DE:Tag:amenity=stables
@@ -2861,39 +3220,77 @@ de:
     amenity=vending_machine: DE:Tag:amenity=vending machine
     amenity=veterinary: DE:Tag:amenity=veterinary
     amenity=waste_basket: DE:Tag:amenity=waste basket
+    amenity=waste_disposal: DE:Tag:amenity=waste disposal
     amenity=waste_transfer_station: DE:Tag:amenity=waste transfer station
     amenity=water_point: DE:Tag:amenity=water point
     amenity=watering_place: DE:Tag:amenity=watering place
     amenity=weighbridge: DE:Tag:amenity=weighbridge
     amenity=youth_centre: DE:Tag:amenity=youth centre
+    animal=horse_walker: DE:Tag:animal=horse walker
     animal=school: DE:Tag:animal=school
+    artwork_type=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
     attraction=animal: DE:Tag:attraction=animal
+    attraction=roller_coaster: DE:Tag:attraction=roller coaster
+    attraction=summer_toboggan: DE:Tag:attraction=summer toboggan
     attraction=train: DE:Tag:attraction=train
+    attraction=water_slide: DE:Tag:attraction=water slide
     barrier=block: DE:Tag:barrier=block
     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=horse_jump: DE:Tag:barrier=horse jump
+    barrier=jersey_barrier: DE:Tag:barrier=jersey barrier
+    barrier=kerb: DE:Tag:barrier=kerb
     barrier=kissing_gate: DE:Tag:barrier=kissing gate
     barrier=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
+    boundary=religious_administration: DE:Tag:boundary=religious administration
     boundary=water_protection_area: DE:Tag:boundary=water protection area
     bridge:movable=bascule: DE:Tag:bridge:movable=bascule
     bridge:movable=drawbridge: DE:Tag:bridge:movable=drawbridge
@@ -2915,32 +3312,49 @@ 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=presbytery: DE:Tag:building=presbytery
     building=public: DE:Tag:building=public
     building=residential: DE:Tag:building=residential
     building=retail: DE:Tag:building=retail
@@ -2948,15 +3362,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
@@ -2964,6 +3385,8 @@ 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
+    canoe=portage: DE:Tag:canoe=portage
     castle_type=castrum: DE:Tag:castle type=castrum
     castle_type=defensive: DE:Tag:castle type=defensive
     castle_type=fortress: DE:Tag:castle type=fortress
@@ -2971,63 +3394,113 @@ 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
+    company=logistics: DE:Tag:company=logistics
+    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=cleaning: DE:Tag:craft=cleaning
+    craft=clockmaker: DE:Tag:craft=clockmaker
+    craft=confectionery: DE:Tag:craft=confectionery
     craft=cooper: DE:Tag:craft=cooper
+    craft=dental_technician: DE:Tag:craft=dental technician
     craft=distillery: DE:Tag:craft=distillery
     craft=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=interior_work: DE:Tag:craft=interior work
     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
     craft=tiler: DE:Tag:craft=tiler
     craft=tinsmith: DE:Tag:craft=tinsmith
     craft=toolmaker: DE:Tag:craft=toolmaker
     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=share_busway: DE:Tag:cycleway:right=share busway
     cycleway:right=track: DE:Tag:cycleway:right=track
+    cycleway=asl: DE:Tag:cycleway=asl
     cycleway=lane: DE:Tag:cycleway=lane
     cycleway=opposite: DE:Tag:cycleway=opposite
     cycleway=opposite_lane: DE:Tag:cycleway=opposite lane
     cycleway=opposite_track: DE:Tag:cycleway=opposite track
+    cycleway=separate: DE:Tag:cycleway=separate
     cycleway=share_busway: DE:Tag:cycleway=share busway
     cycleway=track: DE:Tag:cycleway=track
     defensive=bergfried: DE:Tag:defensive=bergfried
@@ -3041,28 +3514,52 @@ 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=designated: DE:Tag:emergency=designated
+    emergency=drinking_water: DE:Tag:emergency=drinking water
+    emergency=dry_riser_inlet: DE:Tag:emergency=dry riser inlet
     emergency=emergency_ward_entrance: DE:Tag:emergency=emergency ward entrance
+    emergency=fire_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: DE:Tag:emergency=lifeguard
+    emergency=lifeguard_base: DE:Tag:emergency=lifeguard base
+    emergency=lifeguard_place: DE:Tag:emergency=lifeguard place
+    emergency=lifeguard_platform: DE:Tag:emergency=lifeguard platform
     emergency=lifeguard_tower: DE:Tag:emergency=lifeguard tower
+    emergency=mountain_rescue: DE:Tag:emergency=mountain rescue
     emergency=phone: DE:Tag:emergency=phone
     emergency=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
-    food=gourmet: DE:Tag:food=gourmet
+    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
+    ford=stepping_stones: DE:Tag:ford=stepping stones
+    ford=yes: DE:Tag:ford=yes
     fortification_type=hill_fort: DE:Tag:fortification type=hill fort
     fortification_type=limes: DE:Tag:fortification type=limes
     fortification_type=ringfort: DE:Tag:fortification type=ringfort
@@ -3085,10 +3582,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
@@ -3110,30 +3609,78 @@ de:
     generator:type=steam_generator: DE:Tag:generator:type=steam generator
     generator:type=steam_turbine: DE:Tag:generator:type=steam turbine
     generator:type=vertical_axis: DE:Tag:generator:type=vertical axis
+    geological=fault: DE:Tag:geological=fault
     geological=moraine: DE:Tag:geological=moraine
     geological=outcrop: DE:Tag:geological=outcrop
     geological=palaeontological_site: DE:Tag:geological=palaeontological site
+    geological=volcanic_caldera_rim: DE:Tag:geological=volcanic caldera rim
+    geological=volcanic_lava_field: DE:Tag:geological=volcanic lava field
+    geological=volcanic_vent: DE:Tag:geological=volcanic vent
     golf=bunker: DE:Tag:golf=bunker
     golf=driving_range: DE:Tag:golf=driving range
     golf=fairway: DE:Tag:golf=fairway
     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=social_security: DE:Tag:government=social security
+    government=statistics: DE:Tag:government=statistics
     government=tax: DE:Tag:government=tax
+    government=youth_welfare_department: DE:Tag:government=youth welfare department
+    hazard=animal_crossing: DE:Tag:hazard=animal crossing
+    hazard=children: DE:Tag:hazard=children
+    hazard=cyclists: DE:Tag:hazard=cyclists
+    hazard=dangerous_junction: DE:Tag:hazard=dangerous junction
+    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:speciality=orthodontics: DE:Tag:healthcare:speciality=orthodontics
+    healthcare:speciality=otolaryngology: DE:Tag:healthcare:speciality=otolaryngology
+    healthcare=alternative: DE:Tag:healthcare=alternative
+    healthcare=audiologist: DE:Tag:healthcare=audiologist
+    healthcare=birthing_center: DE:Tag:healthcare=birthing center
+    healthcare=blood_bank: DE:Tag:healthcare=blood bank
     healthcare=blood_donation: DE:Tag:healthcare=blood donation
+    healthcare=clinic: DE:Tag:healthcare=clinic
+    healthcare=counselling: DE:Tag:healthcare=counselling
+    healthcare=dentist: DE:Tag:healthcare=dentist
+    healthcare=dialysis: DE:Tag:healthcare=dialysis
+    healthcare=doctor: DE:Tag:healthcare=doctor
+    healthcare=hospice: DE:Tag:healthcare=hospice
+    healthcare=hospital: DE:Tag:healthcare=hospital
+    healthcare=laboratory: DE:Tag:healthcare=laboratory
+    healthcare=midwife: DE:Tag:healthcare=midwife
+    healthcare=occupational_therapist: DE:Tag:healthcare=occupational therapist
+    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
     highway=bus_guideway: DE:Tag:highway=bus guideway
     highway=bus_stop: DE:Tag:highway=bus stop
+    highway=busway: DE:Tag:highway=busway
+    highway=byway: DE:Tag:highway=byway
+    highway=construction: DE:Tag:highway=construction
     highway=corridor: DE:Tag:highway=corridor
     highway=crossing: DE:Tag:highway=crossing
     highway=cycleway: DE:Tag:highway=cycleway
@@ -3147,6 +3694,7 @@ de:
     highway=give_way: DE:Tag:highway=give way
     highway=kerb: DE:Tag:highway=kerb
     highway=living_street: DE:Tag:highway=living street
+    highway=milestone: DE:Tag:highway=milestone
     highway=mini_roundabout: DE:Tag:highway=mini roundabout
     highway=motorway: DE:Tag:highway=motorway
     highway=motorway_junction: DE:Tag:highway=motorway junction
@@ -3177,8 +3725,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_sign: DE:Tag:highway=traffic sign
+    highway=traffic_mirror: DE:Tag:highway=traffic mirror
     highway=traffic_signals: DE:Tag:highway=traffic signals
     highway=trunk: DE:Tag:highway=trunk
     highway=trunk_link: DE:Tag:highway=trunk link
@@ -3192,30 +3741,40 @@ 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
     historic=city_gate: DE:Tag:historic=city gate
     historic=citywalls: DE:Tag:historic=citywalls
     historic=fort: DE:Tag:historic=fort
     historic=gallows: DE:Tag:historic=gallows
+    historic=highwater_mark: DE:Tag:historic=highwater mark
     historic=locomotive: DE:Tag:historic=locomotive
     historic=manor: DE:Tag:historic=manor
     historic=memorial: DE:Tag:historic=memorial
     historic=milestone: DE:Tag:historic=milestone
     historic=mine: DE:Tag:historic=mine
+    historic=mine_shaft: DE:Tag:historic=mine shaft
     historic=monastery: DE:Tag:historic=monastery
     historic=monument: DE:Tag:historic=monument
     historic=optical_telegraph: DE:Tag:historic=optical telegraph
     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
     historic=wreck: DE:Tag:historic=wreck
     horse=designated: DE:Tag:horse=designated
+    horse=dismount: DE:Tag:horse=dismount
+    industrial=bakery: DE:Tag:industrial=bakery
+    industrial=communication: DE:Tag:industrial=communication
     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
@@ -3224,7 +3783,9 @@ 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=circular: DE:Tag:junction=circular
     junction=roundabout: DE:Tag:junction=roundabout
     landuse=allotments: DE:Tag:landuse=allotments
     landuse=aquaculture: DE:Tag:landuse=aquaculture
@@ -3234,6 +3795,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
@@ -3261,16 +3823,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
@@ -3284,6 +3853,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
@@ -3291,51 +3861,68 @@ 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
     leisure=playground: DE:Tag:leisure=playground
     leisure=resort: DE:Tag:leisure=resort
     leisure=sauna: DE:Tag:leisure=sauna
+    leisure=schoolyard: DE:Tag:leisure=schoolyard
     leisure=slipway: DE:Tag:leisure=slipway
     leisure=sports_centre: DE:Tag:leisure=sports centre
+    leisure=sports_hall: DE:Tag:leisure=sports hall
     leisure=stadium: DE:Tag:leisure=stadium
     leisure=swimming_area: DE:Tag:leisure=swimming area
     leisure=swimming_pool: DE:Tag:leisure=swimming pool
     leisure=table_tennis_table: DE:Tag:leisure=table tennis table
     leisure=tanning_salon: DE:Tag:leisure=tanning salon
     leisure=track: DE:Tag:leisure=track
+    leisure=trampoline_park: DE:Tag:leisure=trampoline park
     leisure=water_park: DE:Tag:leisure=water park
+    leisure=wildlife_hide: DE:Tag:leisure=wildlife hide
     level_crossing=automatic_barrier: DE:Tag:level crossing=automatic barrier
     level_crossing=traffic_signals: DE:Tag:level crossing=traffic signals
     level_crossing=uncontrolled: DE:Tag:level crossing=uncontrolled
+    lifeguard=base: DE:Tag:lifeguard=base
+    lifeguard=tower: DE:Tag:lifeguard=tower
     line=bay: DE:Tag:line=bay
     line=busbar: DE:Tag:line=busbar
+    location:transition=yes: DE:Tag:location:transition=yes
+    location=underground: DE:Tag:location=underground
+    lottery=yes: DE:Tag:lottery=yes
     man_made=MDF: DE:Tag:man made=MDF
     man_made=adit: DE:Tag:man made=adit
     man_made=antenna: DE:Tag:man made=antenna
+    man_made=architecture_line: DE:Tag:man made=architecture line
     man_made=beacon: DE:Tag:man made=beacon
     man_made=beehive: DE:Tag:man made=beehive
     man_made=breakwater: DE:Tag:man made=breakwater
     man_made=bridge: DE:Tag:man made=bridge
     man_made=bunker_silo: DE:Tag:man made=bunker silo
+    man_made=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
     man_made=crane: DE:Tag:man made=crane
     man_made=cross: DE:Tag:man made=cross
     man_made=cutline: DE:Tag:man made=cutline
+    man_made=dovecote: DE:Tag:man made=dovecote
     man_made=dyke: DE:Tag:man made=dyke
     man_made=embankment: DE:Tag:man made=embankment
     man_made=flagpole: DE:Tag:man made=flagpole
     man_made=gasometer: DE:Tag:man made=gasometer
     man_made=goods_conveyor: DE:Tag:man made=goods conveyor
+    man_made=graduation_tower: DE:Tag:man made=graduation tower
     man_made=groyne: DE:Tag:man made=groyne
+    man_made=guard_stone: DE:Tag:man made=guard stone
+    man_made=guy_wire: DE:Tag:man made=guy wire
     man_made=hot_water_tank: DE:Tag:man made=hot water tank
     man_made=insect_hotel: DE:Tag:man made=insect hotel
     man_made=kiln: DE:Tag:man made=kiln
     man_made=lighthouse: DE:Tag:man made=lighthouse
     man_made=mast: DE:Tag:man made=mast
+    man_made=maypole: DE:Tag:man made=maypole
     man_made=mineshaft: DE:Tag:man made=mineshaft
     man_made=monitoring_station: DE:Tag:man made=monitoring station
     man_made=nesting_site: DE:Tag:man made=nesting site
@@ -3346,16 +3933,23 @@ 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
     man_made=tower: DE:Tag:man made=tower
+    man_made=utility_pole: DE:Tag:man made=utility pole
     man_made=wastewater_plant: DE:Tag:man made=wastewater plant
     man_made=water_tank: DE:Tag:man made=water tank
     man_made=water_tap: DE:Tag:man made=water tap
@@ -3365,7 +3959,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
@@ -3379,6 +3977,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
@@ -3394,25 +3993,41 @@ de:
     military=nuclear_explosion_site: DE:Tag:military=nuclear explosion site
     military=range: DE:Tag:military=range
     military=training_area: DE:Tag:military=training area
+    mooring=cruise: DE:Tag:mooring=cruise
+    mooring=guest: DE:Tag:mooring=guest
     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
+    museum=nature: DE:Tag:museum=nature
+    museum=open_air: DE:Tag:museum=open air
+    museum=railway: DE:Tag:museum=railway
     natural=anthill: DE:Tag:natural=anthill
+    natural=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
     natural=beach: DE:Tag:natural=beach
+    natural=cape: DE:Tag:natural=cape
     natural=cave_entrance: DE:Tag:natural=cave entrance
     natural=cliff: DE:Tag:natural=cliff
     natural=coastline: DE:Tag:natural=coastline
+    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
     natural=glacier: DE:Tag:natural=glacier
+    natural=gorge: DE:Tag:natural=gorge
     natural=grassland: DE:Tag:natural=grassland
+    natural=gully: DE:Tag:natural=gully
     natural=heath: DE:Tag:natural=heath
     natural=hot_spring: DE:Tag:natural=hot spring
+    natural=isthmus: DE:Tag:natural=isthmus
     natural=moor: DE:Tag:natural=moor
     natural=mud: DE:Tag:natural=mud
     natural=peak: DE:Tag:natural=peak
+    natural=peninsula: DE:Tag:natural=peninsula
     natural=reef: DE:Tag:natural=reef
     natural=ridge: DE:Tag:natural=ridge
     natural=rock: DE:Tag:natural=rock
@@ -3422,17 +4037,21 @@ de:
     natural=scrub: DE:Tag:natural=scrub
     natural=shingle: DE:Tag:natural=shingle
     natural=shoal: DE:Tag:natural=shoal
+    natural=shrub: DE:Tag:natural=shrub
     natural=sinkhole: DE:Tag:natural=sinkhole
     natural=spring: DE:Tag:natural=spring
     natural=stone: DE:Tag:natural=stone
+    natural=strait: DE:Tag:natural=strait
     natural=termite_mound: DE:Tag:natural=termite mound
     natural=tree: DE:Tag:natural=tree
     natural=tree_group: DE:Tag:natural=tree group
     natural=tree_row: DE:Tag:natural=tree row
+    natural=valley: DE:Tag:natural=valley
     natural=volcano: DE:Tag:natural=volcano
     natural=water: DE:Tag:natural=water
     natural=wetland: DE:Tag:natural=wetland
     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
@@ -3448,29 +4067,53 @@ 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=financial: DE:Tag:office=financial
+    office=financial_advisor: DE:Tag:office=financial advisor
     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
+    office=logistics: DE:Tag:office=logistics
     office=moving_company: DE:Tag:office=moving company
     office=newspaper: DE:Tag:office=newspaper
+    office=ngo: DE:Tag:office=ngo
     office=parish: DE:Tag:office=parish
     office=political_party: DE:Tag:office=political party
+    office=property_management: DE:Tag:office=property management
     office=religion: DE:Tag:office=religion
     office=research: DE:Tag:office=research
+    office=security: DE:Tag:office=security
+    office=surveyor: DE:Tag:office=surveyor
     office=tax_advisor: DE:Tag:office=tax advisor
+    office=telecommunication: DE:Tag:office=telecommunication
     office=therapist: DE:Tag:office=therapist
     office=travel_agent: DE:Tag:office=travel agent
+    office=union: DE:Tag:office=union
+    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
@@ -3480,30 +4123,66 @@ de:
     operator=cambio: DE:Tag:operator=cambio
     operator=stadtmobil: DE:Tag:operator=stadtmobil
     operator=teilAuto: DE:Tag:operator=teilAuto
+    park_ride: DE:Tag:park ride
     parking:lane:hgv=on_street: DE:Tag:parking:lane:hgv=on street
+    parking=multi-storey: DE:Tag:parking=multi-storey
+    parking=street_side: DE:Tag:parking=street side
+    parking=surface: DE:Tag:parking=surface
+    parking=underground: DE:Tag:parking=underground
     pipeline=marker: DE:Tag:pipeline=marker
     pipeline=substation: DE:Tag:pipeline=substation
     pipeline=valve: DE:Tag:pipeline=valve
     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
     place=isolated_dwelling: DE:Tag:place=isolated dwelling
     place=locality: DE:Tag:place=locality
+    place=municipality: DE:Tag:place=municipality
     place=neighbourhood: DE:Tag:place=neighbourhood
+    place=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
+    plant:source=geothermal: DE:Tag:plant:source=geothermal
+    plant:source=hydro: DE:Tag:plant:source=hydro
+    plant:source=nuclear: DE:Tag:plant:source=nuclear
+    plant:source=solar: DE:Tag:plant:source=solar
+    plant:source=waste: DE:Tag:plant:source=waste
+    plant:source=wind: DE:Tag:plant:source=wind
+    plant:type=combined_cycle: DE:Tag:plant:type=combined cycle
+    plant:type=steam_turbine: DE:Tag:plant:type=steam turbine
+    playground=structure: DE:Tag:playground=structure
+    police=academy: DE:Tag:police=academy
+    police=barracks: DE:Tag:police=barracks
+    police=car_pound: DE:Tag:police=car pound
+    police=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
+    post_office=post_partner: DE:Tag:post office=post partner
     power=cable: DE:Tag:power=cable
     power=cable_distribution_cabinet: DE:Tag:power=cable distribution cabinet
+    power=compensator: DE:Tag:power=compensator
     power=converter: DE:Tag:power=converter
     power=generator: DE:Tag:power=generator
     power=heliostat: DE:Tag:power=heliostat
@@ -3525,6 +4204,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
@@ -3533,12 +4213,15 @@ 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
     railway=miniature: DE:Tag:railway=miniature
     railway=monorail: DE:Tag:railway=monorail
     railway=narrow_gauge: DE:Tag:railway=narrow gauge
     railway=platform: DE:Tag:railway=platform
+    railway=platform_edge: DE:Tag:railway=platform edge
     railway=preserved: DE:Tag:railway=preserved
     railway=rail: DE:Tag:railway=rail
     railway=rail_brake: DE:Tag:railway=rail brake
@@ -3552,20 +4235,31 @@ de:
     railway=subway_entrance: DE:Tag:railway=subway entrance
     railway=switch: DE:Tag:railway=switch
     railway=tram: DE:Tag:railway=tram
+    railway=tram_crossing: DE:Tag:railway=tram crossing
+    railway=tram_level_crossing: DE:Tag:railway=tram level crossing
     railway=tram_stop: DE:Tag:railway=tram stop
     railway=traverser: DE:Tag:railway=traverser
     railway=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
+    resource=aggregate: DE:Tag:resource=aggregate
+    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
@@ -3573,6 +4267,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
@@ -3580,23 +4275,38 @@ de:
     route=railway: DE:Tag:route=railway
     route=road: DE:Tag:route=road
     route=running: DE:Tag:route=running
+    route=share_taxi: DE:Tag:route=share taxi
     route=ski: DE:Tag:route=ski
     route=subway: DE:Tag:route=subway
     route=tracks: DE:Tag:route=tracks
     route=train: DE:Tag:route=train
     route=tram: DE:Tag:route=tram
     route=trolleybus: DE:Tag:route=trolleybus
+    seamark:type=mooring: DE:Tag:seamark:type=mooring
+    seamark:type=rock: DE:Tag:seamark:type=rock
+    segregated=no: DE:Tag:segregated=no
+    segregated=yes: DE:Tag:segregated=yes
+    service=aircraft_control: DE:Tag:service=aircraft control
     service=alley: DE:Tag:service=alley
     service=crossover: DE:Tag:service=crossover
     service=driveway: DE:Tag:service=driveway
+    service=emergency_access: DE:Tag:service=emergency access
     service=parking_aisle: DE:Tag:service=parking aisle
     service=siding: DE:Tag:service=siding
     service=spur: DE:Tag:service=spur
     service=yard: DE:Tag:service=yard
+    shelter_type=Wetterpilz: DE:Tag:shelter type=Wetterpilz
+    shelter_type=basic_hut: DE:Tag:shelter type=basic hut
+    shelter_type=gazebo: DE:Tag:shelter type=gazebo
     shelter_type=lean_to: DE:Tag:shelter type=lean to
+    shelter_type=pavilion: DE:Tag:shelter type=pavilion
+    shelter_type=picnic_shelter: DE:Tag:shelter type=picnic shelter
+    shelter_type=public_transport: DE:Tag:shelter type=public transport
+    shelter_type=weather_shelter: DE:Tag:shelter type=weather shelter
     shop=agrarian: DE:Tag:shop=agrarian
     shop=alcohol: DE:Tag:shop=alcohol
     shop=antiques: DE:Tag:shop=antiques
+    shop=appliance: DE:Tag:shop=appliance
     shop=art: DE:Tag:shop=art
     shop=atv: DE:Tag:shop=atv
     shop=baby_goods: DE:Tag:shop=baby goods
@@ -3612,10 +4322,12 @@ de:
     shop=boutique: DE:Tag:shop=boutique
     shop=butcher: DE:Tag:shop=butcher
     shop=camera: DE:Tag:shop=camera
+    shop=candles: DE:Tag:shop=candles
     shop=car: DE:Tag:shop=car
     shop=car_parts: DE:Tag:shop=car parts
     shop=car_repair: DE:Tag:shop=car repair
     shop=carpet: DE:Tag:shop=carpet
+    shop=ceramics: DE:Tag:shop=ceramics
     shop=charity: DE:Tag:shop=charity
     shop=cheese: DE:Tag:shop=cheese
     shop=chemist: DE:Tag:shop=chemist
@@ -3634,17 +4346,21 @@ 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
     shop=erotic: DE:Tag:shop=erotic
     shop=fabric: DE:Tag:shop=fabric
     shop=farm: DE:Tag:shop=farm
     shop=fashion: DE:Tag:shop=fashion
+    shop=fashion_accessories: DE:Tag:shop=fashion accessories
     shop=fireplace: DE:Tag:shop=fireplace
     shop=fishing: DE:Tag:shop=fishing
     shop=flooring: DE:Tag:shop=flooring
     shop=florist: DE:Tag:shop=florist
     shop=frame: DE:Tag:shop=frame
+    shop=frozen_food: DE:Tag:shop=frozen food
     shop=funeral_directors: DE:Tag:shop=funeral directors
     shop=furniture: DE:Tag:shop=furniture
     shop=garden_centre: DE:Tag:shop=garden centre
@@ -3653,15 +4369,19 @@ 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
     shop=hardware: DE:Tag:shop=hardware
+    shop=health_food: DE:Tag:shop=health food
     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
@@ -3670,28 +4390,40 @@ 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
     shop=pawnbroker: DE:Tag:shop=pawnbroker
     shop=perfumery: DE:Tag:shop=perfumery
     shop=pet: DE:Tag:shop=pet
+    shop=pet_grooming: DE:Tag:shop=pet grooming
     shop=photo: DE:Tag:shop=photo
+    shop=pottery: DE:Tag:shop=pottery
+    shop=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
     shop=spices: DE:Tag:shop=spices
@@ -3700,19 +4432,23 @@ de:
     shop=storage_rental: DE:Tag:shop=storage rental
     shop=supermarket: DE:Tag:shop=supermarket
     shop=swimming_pool: DE:Tag:shop=swimming pool
+    shop=tailor: DE:Tag:shop=tailor
     shop=tattoo: DE:Tag:shop=tattoo
     shop=tea: DE:Tag:shop=tea
     shop=ticket: DE:Tag:shop=ticket
     shop=tiles: DE:Tag:shop=tiles
     shop=tobacco: DE:Tag:shop=tobacco
+    shop=tool_hire: DE:Tag:shop=tool hire
     shop=toys: DE:Tag:shop=toys
     shop=trade: DE:Tag:shop=trade
     shop=travel_agency: DE:Tag:shop=travel agency
     shop=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
     shop=watches: DE:Tag:shop=watches
     shop=weapons: DE:Tag:shop=weapons
     shop=wholesale: DE:Tag:shop=wholesale
@@ -3737,29 +4473,58 @@ de:
     social_facility=group_home: DE:Tag:social facility=group home
     social_facility=hospice: DE:Tag:social facility=hospice
     social_facility=nursing_home: DE:Tag:social facility=nursing home
+    social_facility=shelter: DE:Tag:social facility=shelter
     social_facility=soup_kitchen: DE:Tag:social facility=soup kitchen
     social_facility=workshop: DE:Tag:social facility=workshop
     source=HiRes_aerial_imagery: DE:Tag:source=HiRes aerial imagery
     sport=10pin: DE:Tag:sport=10pin
     sport=9pin: DE:Tag:sport=9pin
+    sport=american_football: DE:Tag:sport=american football
     sport=archery: DE:Tag:sport=archery
+    sport=athletics: DE:Tag:sport=athletics
+    sport=badminton: DE:Tag:sport=badminton
     sport=baseball: DE:Tag:sport=baseball
     sport=basketball: DE:Tag:sport=basketball
+    sport=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
     sport=shooting: DE:Tag:sport=shooting
@@ -3774,13 +4539,52 @@ de:
     sport=volleyball: DE:Tag:sport=volleyball
     station=light_rail: DE:Tag:station=light rail
     station=subway: DE:Tag:station=subway
+    studio=audio: DE:Tag:studio=audio
+    studio=radio: DE:Tag:studio=radio
+    studio=video: DE:Tag:studio=video
     substation=converter: DE:Tag:substation=converter
     substation=distribution: DE:Tag:substation=distribution
+    substation=generation: DE:Tag:substation=generation
     substation=minor_distribution: DE:Tag:substation=minor distribution
     substation=traction: DE:Tag:substation=traction
     substation=transmission: DE:Tag:substation=transmission
     summit:cross=yes: DE:Tag:summit:cross=yes
+    surface=artificial_turf: DE:Tag:surface=artificial turf
     surface=asphalt: DE:Tag:surface=asphalt
+    surface=clay: DE:Tag:surface=clay
+    surface=cobblestone: DE:Tag:surface=cobblestone
+    surface=compacted: DE:Tag:surface=compacted
+    surface=concrete: DE:Tag:surface=concrete
+    surface=concrete:lanes: DE:Tag:surface=concrete:lanes
+    surface=concrete:plates: DE:Tag:surface=concrete:plates
+    surface=fine_gravel: DE:Tag:surface=fine gravel
+    surface=gravel: DE:Tag:surface=gravel
+    surface=ground: DE:Tag:surface=ground
+    surface=paved: DE:Tag:surface=paved
+    surface=paving_stones: DE:Tag:surface=paving stones
+    surface=sett: DE:Tag:surface=sett
+    surface=tartan: DE:Tag:surface=tartan
+    surface=unhewn_cobblestone: DE:Tag:surface=unhewn cobblestone
+    surface=unpaved: DE:Tag:surface=unpaved
+    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=columbarium: DE:Tag:tomb=columbarium
+    tomb=crypt: DE:Tag:tomb=crypt
+    tomb=hypogeum: DE:Tag:tomb=hypogeum
+    tomb=mausoleum: DE:Tag:tomb=mausoleum
+    tomb=pyramid: DE:Tag:tomb=pyramid
+    tomb=rock-cut: DE:Tag:tomb=rock-cut
+    tomb=sarcophagus: DE:Tag:tomb=sarcophagus
+    tomb=tumulus: DE:Tag:tomb=tumulus
+    tomb=vault: DE:Tag:tomb=vault
+    tomb=war_grave: DE:Tag:tomb=war grave
     tourism=alpine_hut: DE:Tag:tourism=alpine hut
     tourism=apartment: DE:Tag:tourism=apartment
     tourism=aquarium: DE:Tag:tourism=aquarium
@@ -3798,16 +4602,24 @@ de:
     tourism=museum: DE:Tag:tourism=museum
     tourism=picnic_site: DE:Tag:tourism=picnic site
     tourism=theme_park: DE:Tag:tourism=theme park
+    tourism=trail_riding_rest: DE:Tag:tourism=trail riding rest
     tourism=trail_riding_station: DE:Tag:tourism=trail riding station
     tourism=viewpoint: DE:Tag:tourism=viewpoint
     tourism=wilderness_hut: DE:Tag:tourism=wilderness hut
     tourism=wine_cellar: DE:Tag:tourism=wine cellar
     tourism=zoo: DE:Tag:tourism=zoo
+    tower:construction=dish: DE:Tag:tower:construction=dish
+    tower:construction=dome: DE:Tag:tower:construction=dome
+    tower:construction=freestanding: DE:Tag:tower:construction=freestanding
+    tower:construction=guyed_lattice: DE:Tag:tower:construction=guyed lattice
+    tower:construction=guyed_tube: DE:Tag:tower:construction=guyed tube
+    tower:construction=lattice: DE:Tag:tower:construction=lattice
     tower:type=bell_tower: DE:Tag:tower:type=bell tower
     tower:type=bridge: DE:Tag:tower:type=bridge
     tower:type=communication: DE:Tag:tower:type=communication
     tower:type=cooling: DE:Tag:tower:type=cooling
     tower:type=defensive: DE:Tag:tower:type=defensive
+    tower:type=diving: DE:Tag:tower:type=diving
     tower:type=donjon: DE:Tag:tower:type=donjon
     tower:type=hose: DE:Tag:tower:type=hose
     tower:type=intake: DE:Tag:tower:type=intake
@@ -3818,10 +4630,99 @@ 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:133-10: DE:Tag:traffic sign=DE:133-10
+    traffic_sign=DE:136-10: DE:Tag:traffic sign=DE:136-10
+    traffic_sign=DE:142-10: DE:Tag:traffic sign=DE:142-10
+    traffic_sign=DE:142.10: DE:Tag:traffic sign=DE:142.10
+    traffic_sign=DE:205: DE:Tag:traffic sign=DE:205
+    traffic_sign=DE:206: DE:Tag:traffic sign=DE:206
+    traffic_sign=DE:220-10: DE:Tag:traffic sign=DE:220-10
+    traffic_sign=DE:220-20: DE:Tag:traffic sign=DE:220-20
+    traffic_sign=DE:224: DE:Tag:traffic sign=DE:224
+    traffic_sign=DE:237: DE:Tag:traffic sign=DE:237
+    traffic_sign=DE:239: DE:Tag:traffic sign=DE:239
+    traffic_sign=DE:240: DE:Tag:traffic sign=DE:240
+    traffic_sign=DE:241: DE:Tag:traffic sign=DE:241
+    traffic_sign=DE:241-30: DE:Tag:traffic sign=DE:241-30
+    traffic_sign=DE:241-31: DE:Tag:traffic sign=DE:241-31
+    traffic_sign=DE:242: DE:Tag:traffic sign=DE:242
+    traffic_sign=DE:242.1: DE:Tag:traffic sign=DE:242.1
+    traffic_sign=DE:242.2: DE:Tag:traffic sign=DE:242.2
+    traffic_sign=DE:244: DE:Tag:traffic sign=DE:244
+    traffic_sign=DE:244.1: DE:Tag:traffic sign=DE:244.1
+    traffic_sign=DE:245: DE:Tag:traffic sign=DE:245
+    traffic_sign=DE:250: DE:Tag:traffic sign=DE:250
+    traffic_sign=DE:253: DE:Tag:traffic sign=DE:253
+    traffic_sign=DE:254: DE:Tag:traffic sign=DE:254
+    traffic_sign=DE:257-51: DE:Tag:traffic sign=DE:257-51
+    traffic_sign=DE:258: DE:Tag:traffic sign=DE:258
+    traffic_sign=DE:259: DE:Tag:traffic sign=DE:259
+    traffic_sign=DE:260: DE:Tag:traffic sign=DE:260
+    traffic_sign=DE:261: DE:Tag:traffic sign=DE:261
+    traffic_sign=DE:267: DE:Tag:traffic sign=DE:267
+    traffic_sign=DE:269: DE:Tag:traffic sign=DE:269
+    traffic_sign=DE:272: DE:Tag:traffic sign=DE:272
+    traffic_sign=DE:274-10: DE:Tag:traffic sign=DE:274-10
+    traffic_sign=DE:274-100: DE:Tag:traffic sign=DE:274-100
+    traffic_sign=DE:274-120: DE:Tag:traffic sign=DE:274-120
+    traffic_sign=DE:274-130: DE:Tag:traffic sign=DE:274-130
+    traffic_sign=DE:274-20: DE:Tag:traffic sign=DE:274-20
+    traffic_sign=DE:274-30: DE:Tag:traffic sign=DE:274-30
+    traffic_sign=DE:274-40: DE:Tag:traffic sign=DE:274-40
+    traffic_sign=DE:274-50: DE:Tag:traffic sign=DE:274-50
+    traffic_sign=DE:274-60: DE:Tag:traffic sign=DE:274-60
+    traffic_sign=DE:274-70: DE:Tag:traffic sign=DE:274-70
+    traffic_sign=DE:274-80: DE:Tag:traffic sign=DE:274-80
+    traffic_sign=DE:274.1: DE:Tag:traffic sign=DE:274.1
+    traffic_sign=DE:274.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
+    usage=transmission: DE:Tag:usage=transmission
+    vending: DE:Tag:vending
     vending=animal_feed: DE:Tag:vending=animal feed
     vending=bicycle_tube: DE:Tag:vending=bicycle tube
+    vending=bottle_return: DE:Tag:vending=bottle return
     vending=bread: DE:Tag:vending=bread
     vending=candles: DE:Tag:vending=candles
     vending=chewing_gums: DE:Tag:vending=chewing gums
@@ -3837,15 +4738,29 @@ de:
     vending=parcel_pickup: DE:Tag:vending=parcel pickup
     vending=parcel_pickup;parcel_mail_in: DE:Tag:vending=parcel pickup;parcel mail
       in
+    vending=parking_tickets: DE:Tag:vending=parking tickets
     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=no: DE:Tag:wall=no
+    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
     water=lock: DE:Tag:water=lock
+    water=oxbow: DE:Tag:water=oxbow
+    water=pond: DE:Tag:water=pond
     water=reservoir: DE:Tag:water=reservoir
+    water=river: DE:Tag:water=river
+    water=wastewater: DE:Tag:water=wastewater
     waterway=boat_lift: DE:Tag:waterway=boat lift
     waterway=boatyard: DE:Tag:waterway=boatyard
     waterway=canal: DE:Tag:waterway=canal
@@ -3854,27 +4769,35 @@ 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
     waterway=milestone: DE:Tag:waterway=milestone
+    waterway=portage: DE:Tag:waterway=portage
+    waterway=pressurised: DE:Tag:waterway=pressurised
+    waterway=rapids: DE:Tag:waterway=rapids
     waterway=river: DE:Tag:waterway=river
     waterway=riverbank: DE:Tag:waterway=riverbank
     waterway=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
     wetland=fen: DE:Tag:wetland=fen
     wetland=mangrove: DE:Tag:wetland=mangrove
     wetland=marsh: DE:Tag:wetland=marsh
+    wetland=mud: DE:Tag:wetland=mud
     wetland=reedbed: DE:Tag:wetland=reedbed
     wetland=saltern: DE:Tag:wetland=saltern
     wetland=saltmarsh: DE:Tag:wetland=saltmarsh
+    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
     zoo=aviary: DE:Tag:zoo=aviary
     zoo=birds: DE:Tag:zoo=birds
+    zoo=butterfly: DE:Tag:zoo=butterfly
     zoo=enclosure: DE:Tag:zoo=enclosure
     zoo=falconry: DE:Tag:zoo=falconry
     zoo=petting_zoo: DE:Tag:zoo=petting zoo
@@ -3887,6 +4810,8 @@ el:
     building:architecture: El:Key:building:architecture
     building:levels: El:Key:building:levels
     height: El:Key:height
+    shop: El:Key:shop
+    surface: El:Key:surface
   tag:
     amenity=bar: El:Tag:amenity=bar
     amenity=bbq: El:Tag:amenity=bbq
@@ -3912,21 +4837,34 @@ el:
     amenity=school: El:Tag:amenity=school
     amenity=taxi: El:Tag:amenity=taxi
     amenity=university: El:Tag:amenity=university
+    highway=motorway: El:Tag:highway=motorway
+    highway=service: El:Tag:highway=service
+    highway=tertiary: El:Tag:highway=tertiary
+    highway=track: El:Tag:highway=track
 en:
   key:
+    '*:conditional': Key:*:conditional
+    '*:lanes': Key:*:lanes
+    3dmr: Key:3dmr
     3dr:type: Key:3dr:type
     4wd_only: Key:4wd only
+    :conditional: Key::conditional
     :lanes: Key::lanes
     AND_nosr_r: Key:AND nosr r
     AlpinRes_ID: Key:AlpinRes ID
     CEMT: Key:CEMT
+    CLC:code: Key:CLC:code
     DGPS_correction: Key:DGPS correction
     EHAK:code: Key:EHAK:code
     EH_ref: Key:EH ref
     FIXME: Key:FIXME
-    Fetish: Key:Fetish
     Finance_agent: Key:Finance agent
+    GNS: Key:GNS
+    'GNS:': 'Key:GNS:'
+    GNS:dsg_code: Key:GNS:dsg code
+    GNS:id: Key:GNS:id
     HE_ref: Key:HE ref
+    HU:ed_direction: Key:HU:ed direction
     HU:hu-go:length: Key:HU:hu-go:length
     HU:hu-go:milestone: Key:HU:hu-go:milestone
     HU:hu-go:road: Key:HU:hu-go:road
@@ -3936,29 +4874,41 @@ 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
+    NHD:ReachCode: Key:NHD:ReachCode
     NHS: Key:NHS
+    NSIW: Key:NSIW
     PMSA_ref: Key:PMSA ref
     Power_supply:schedule: Key:Power supply:schedule
     RLIS:bicycle: Key:RLIS:bicycle
     RLIS:reviewed: Key:RLIS:reviewed
     Schalansky_ref: Key:Schalansky ref
     Shop: Key:Shop
+    Source: Key:Source
     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:highway: Key:abandoned:highway
+    abandoned:place: Key:abandoned:place
     abandoned:railway: Key:abandoned:railway
     abutters: Key:abutters
     access: Key:access
@@ -3968,17 +4918,27 @@ en:
     access:lhv: Key:access:lhv
     access:roadtrain: Key:access:roadtrain
     access:roadtrain:trailers: Key:access:roadtrain:trailers
+    active_traffic_management: Key:active traffic management
+    actuator: Key:actuator
     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
@@ -3987,27 +4947,40 @@ 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:neighbourhood: Key:addr:neighbourhood
     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:type: Key:addr:type
     addr:unit: Key:addr:unit
     admin_level: Key:admin level
     adr_les: Key:adr les
@@ -4015,58 +4988,118 @@ en:
     aerialway: Key:aerialway
     aerialway:drag_lift: Key:aerialway:drag lift
     aerialway:duration: Key:aerialway:duration
-    aerodrome: Key:aerodrome
+    aerodrome:type: Key:aerodrome:type
     aeroway: Key:aeroway
     after_school: Key:after school
+    agrarian: Key:agrarian
     agricultural: Key:agricultural
     air_conditioning: Key:air conditioning
+    airconditioned: Key:airconditioned
     alt_name: Key:alt name
     alt_name:ar: Key:alt name:ar
+    alt_name:arc: Key:alt name:arc
+    alt_name:azb: Key:alt name:azb
+    alt_name:be: Key:alt name:be
+    alt_name:ckb: Key:alt name:ckb
     alt_name:en: Key:alt name:en
+    alt_name:fa: Key:alt name:fa
+    alt_name:fr: Key:alt name:fr
+    alt_name:glk: Key:alt name:glk
+    alt_name:gr: Key:alt name:gr
+    alt_name:grc: Key:alt name:grc
+    alt_name:kab-Arab: Key:alt name:kab-Arab
     alt_name:ko: Key:alt name:ko
+    alt_name:ks: Key:alt name:ks
+    alt_name:lrc: Key:alt name:lrc
     alt_name:mg: Key:alt name:mg
+    alt_name:ms-Arab: Key:alt name:ms-Arab
+    alt_name:mzn: Key:alt name:mzn
+    alt_name:pl: Key:alt name:pl
+    alt_name:pnb: Key:alt name:pnb
+    alt_name:ps: Key:alt name:ps
+    alt_name:ru: Key:alt name:ru
+    alt_name:sd: Key:alt name:sd
+    alt_name:syc: Key:alt name:syc
     alt_name:th: Key:alt name:th
+    alt_name:ug: Key:alt name:ug
+    alt_name:ur: Key:alt name:ur
     alt_name_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:wikidata: Key:artist:wikidata
     artist_name: Key:artist name
     artwork_subject: Key:artwork subject
     artwork_type: Key:artwork type
     asb: Key:asb
     ascent: Key:ascent
+    assembly_point:earthquake: Key:assembly point:earthquake
+    assembly_point:fire: Key:assembly point:fire
+    assembly_point:flood: Key:assembly point:flood
+    assembly_point:landslide: Key:assembly point:landslide
+    assembly_point:tornado: Key:assembly point:tornado
+    assembly_point:tsunami: Key:assembly point:tsunami
     asset_ref: Key:asset ref
     assisted_trail: Key:assisted trail
+    association: Key:association
+    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
     barrier:personnel: Key:barrier:personnel
     baseball: Key:baseball
     basin: Key:basin
+    bath:type: Key:bath:type
     bdouble: Key:bdouble
     beacon: Key:beacon
     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
@@ -4076,19 +5109,27 @@ 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
+    booth: Key:booth
     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
@@ -4096,14 +5137,17 @@ 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
     bridge:short_name: Key:bridge:short name
     bridge:structure: Key:bridge:structure
     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
@@ -4111,6 +5155,8 @@ en:
     building:fireproof: Key:building:fireproof
     building:flats: Key:building:flats
     building:height: Key:building:height
+    building:level: Key:building:level
+    building:level:1,2,3...: Key:building:level:1,2,3...
     building:levels: Key:building:levels
     building:levels:underground: Key:building:levels:underground
     building:material: Key:building:material
@@ -4118,38 +5164,75 @@ 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:ruian:type: Key:building:ruian:type
-    building:type: Key:building: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
+    buried:wikidata: Key:buried:wikidata
     bus: Key:bus
+    bus:lanes: Key:bus:lanes
+    bus:lanes:backward: Key:bus:lanes:backward
+    bus:lanes:forward: Key:bus:lanes:forward
     bus_bay: Key:bus bay
+    busbar: Key:busbar
     busway: Key:busway
     busway:left: Key:busway:left
     busway:right: Key:busway:right
     button_operated: Key:button operated
+    bygningsnr: Key:bygningsnr
+    cabin:rental: Key:cabin:rental
+    cabins: Key:cabins
     cable_number: Key:cable number
     cables: Key:cables
+    cadc:2019: Key:cadc:2019
+    cadc:2020: Key:cadc:2020
     cafe: Key:cafe
+    callsign: Key:callsign
     camp_site: Key:camp site
     camp_type: Key:camp type
     campers: Key:campers
+    camping: Key:camping
+    campwild: Key:campwild
+    canal: Key:canal
     canoe: Key:canoe
     capacity: Key:capacity
+    capacity: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_wash: Key:car wash
     caravan: Key:caravan
     caravans: Key:caravans
     cargo: Key:cargo
+    cargo_bike: Key:cargo bike
+    carpenter: Key:carpenter
+    carpool: Key:carpool
     carriage: Key:carriage
     carriageway_ref: Key:carriageway ref
     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
@@ -4157,18 +5240,26 @@ en:
     cave:ref: Key:cave:ref
     cemetery: Key:cemetery
     cemt: Key:cemt
-    center_turn_lane: Key:center turn lane
+    census:population: Key:census:population
     centralkey: Key:centralkey
-    centre_turn_lane: Key:centre turn lane
-    cep: Key:cep
     change: Key:change
+    changesets_count: Key:changesets count
+    changing_table: Key:changing table
+    changing_table:count: Key:changing table:count
+    changing_table:fee: Key:changing table:fee
+    changing_table:location: Key:changing table:location
     charge: Key:charge
     charity: Key:charity
+    chchsid: Key:chchsid
     check_date: Key:check date
     checkpoint: Key:checkpoint
+    china_class: Key:china class
+    china_population: Key:china population
+    church:type: Key:church:type
     circuits: Key:circuits
     circumference: Key:circumference
     city_limit: Key:city limit
+    clacks_overhead: Key:clacks overhead
     class: Key:class
     class:bicycle: Key:class:bicycle
     class:bicycle:commute: Key:class:bicycle:commute
@@ -4178,10 +5269,16 @@ en:
     class:bicycle:roadcycling: Key:class:bicycle:roadcycling
     class:bicycle:touring: Key:class:bicycle:touring
     class:bicycle:trailer: Key:class:bicycle:trailer
+    climbing: Key:climbing
+    climbing:*: Key:climbing:*
+    climbing:rock: Key:climbing:rock
     clli: Key:clli
+    closed:note: Key:closed:note
     clothes: Key:clothes
+    clothes:for: Key:clothes:for
     club: Key:club
     club-mate: Key:club-mate
+    coach: Key:coach
     coastline:survey_quality: Key:coastline:survey quality
     cocktails: Key:cocktails
     coffee: Key:coffee
@@ -4191,53 +5288,90 @@ 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
+    communication:amateur_radio:repeater:frequency_out: Key:communication:amateur
+      radio:repeater:frequency out
+    communication:amateur_radio:repeater:modulation: Key:communication:amateur radio:repeater:modulation
+    communication:amateur_radio:repeater:shift: Key:communication:amateur radio:repeater:shift
+    communication:amateur_radio:repeater:toneburst: Key:communication:amateur radio:repeater:toneburst
     communication:bos: Key:communication:bos
+    communication:gsm-r: Key:communication:gsm-r
     communication:microwave: Key:communication:microwave
     communication:mobile_phone: Key:communication:mobile phone
     communication:radio: Key:communication:radio
     communication:television: Key:communication:television
+    community: Key:community
     community_centre: Key:community centre
     community_centre:for: Key:community centre:for
+    company: Key:company
+    compressed_air: Key:compressed air
     condition: Key:condition
     conditional: Key:conditional
+    condo: Key:condo
+    connection_point: Key:connection point
     construction: Key:construction
     construction:website: Key:construction:website
     construction_end_expected: Key:construction end expected
+    construction_start_expected: Key:construction start expected
+    consulate: Key:consulate
+    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
     contact:fax: Key:contact:fax
     contact:flickr: Key:contact:flickr
+    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
+    contact:viber: Key:contact:viber
     contact:vk: Key:contact:vk
     contact:webcam: Key:contact:webcam
     contact:website: Key:contact:website
+    contact:whatsapp: Key:contact:whatsapp
     contact:xing: Key:contact:xing
+    contact:xmpp: Key:contact:xmpp
     contact:youtube: Key:contact:youtube
     content: Key:content
+    converted_by: Key:converted by
     conveying: Key:conveying
+    cooker: Key:cooker
+    cooling:method: Key:cooling:method
     country: Key:country
+    courts: Key:courts
     covered: Key:covered
     craft: Key:craft
+    crane:type: Key:crane:type
     created_by: Key:created by
     crop: Key:crop
     crossing: Key:crossing
     crossing:activation: Key:crossing:activation
     crossing:barrier: Key:crossing:barrier
     crossing:bell: Key:crossing:bell
+    crossing:island: Key:crossing:island
     crossing:light: Key:crossing:light
     crossing:on_demand: Key:crossing:on demand
     crossing:saltire: Key:crossing:saltire
+    crossing_ref: Key:crossing ref
     cuisine: Key:cuisine
     cultivation_method: Key:cultivation method
     currency: Key:currency
@@ -4246,21 +5380,37 @@ en:
     currency:EUR: Key:currency:EUR
     currency:GBP: Key:currency:GBP
     currency:PLN: Key:currency:PLN
+    currency:RUB: Key:currency:RUB
     currency:USD: Key:currency:USD
     currency:XXX: Key:currency:XXX
     currency:others: Key:currency:others
+    curve: Key:curve
+    curves: Key:curves
     cutting: Key:cutting
     cyclability: Key:cyclability
     cycle: Key:cycle
+    cycle_highway: Key:cycle highway
     cycle_network: Key:cycle network
+    cyclestreet: Key:cyclestreet
     cyclestreets_id: Key:cyclestreets id
     cycleway: Key:cycleway
     cycleway:both: Key:cycleway:both
     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
+    dance:style: Key:dance:style
+    dance:teaching: Key:dance:teaching
     date: Key:date
     date_off: Key:date off
     date_on: Key:date on
@@ -4270,12 +5420,20 @@ en:
     de:regionalschluessel: Key:de:regionalschluessel
     de:strassenschluessel: Key:de:strassenschluessel
     deanery: Key:deanery
+    default_language: Key:default language
+    defensive_structure: Key:defensive structure
     dehoga: Key:dehoga
     delivery: Key:delivery
+    delivery_point: Key:delivery point
+    delivery_point:access: Key:delivery point:access
+    delivery_point:type: Key:delivery point:type
     demolished: Key:demolished
     'demolished:': 'Key:demolished:'
+    demolished:building: Key:demolished:building
+    'demolition:': 'Key:demolition:'
     denomination: Key:denomination
     denotation: Key:denotation
+    departures_board: Key:departures board
     depth: Key:depth
     depth:clearance: Key:depth:clearance
     depth:dangerous: Key:depth:dangerous
@@ -4287,61 +5445,119 @@ 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
+    destroyed: Key:destroyed
+    'destroyed:': 'Key:destroyed:'
     detour: Key:detour
+    devices: Key:devices
+    dewnr:park_id: Key:dewnr:park id
+    dewnr:uid: Key:dewnr:uid
     dhm_id: Key:dhm id
     diameter: Key:diameter
     diaper: Key:diaper
     dibavod:id: Key:dibavod:id
     diet: Key:diet
+    'diet:': 'Key:diet:'
     diet:*: Key:diet:*
     diet:dairy_free: Key:diet:dairy free
     diet:gluten_free: Key:diet:gluten free
+    diet:halal: Key:diet:halal
+    diet:kosher: Key:diet:kosher
     diet:lactose_free: Key:diet:lactose free
     diet:vegan: Key:diet:vegan
     diet:vegetarian: Key:diet:vegetarian
+    dinner: Key:dinner
     diocese: Key:diocese
     diplomatic: Key:diplomatic
     diplomatic:receiving_country: Key:diplomatic:receiving country
     diplomatic:sending_country: Key:diplomatic:sending country
+    diplomatic:services: Key:diplomatic:services
+    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
-    disused: Key:disused
+    distillery: Key:distillery
     'disused:': 'Key:disused:'
     disused:amenity: Key:disused:amenity
+    disused:building: Key:disused:building
+    disused:highway: Key:disused:highway
+    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
+    draisine: Key:draisine
     drink: Key:drink
     drink:afri-cola: Key:drink:afri-cola
+    drink:beer: Key:drink:beer
     drink:club-mate: Key:drink:club-mate
+    drink:coffee: Key:drink:coffee
+    drink:espresso: Key:drink:espresso
     drink:kräusen: Key:drink:kräusen
     drink:milk: Key:drink:milk
     drink:milk-raw: Key:drink:milk-raw
     drink:raw_milk: Key:drink:raw milk
+    drink: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
@@ -4349,43 +5565,69 @@ en:
     drive_through: Key:drive through
     drive_thru: Key:drive thru
     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
+    education: Key:education
+    educational: Key:educational
+    ekatte: Key:ekatte
     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:': 'Key:emergency:'
+    emergency:_prefix: 'Key:emergency: prefix'
+    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
     evacuation_route: Key:evacuation route
+    excavation: Key:excavation
     exhibit: Key:exhibit
     exit: Key:exit
     exit_to: Key:exit to
+    expected_rcn_route_relations: Key:expected rcn route relations
     expressway: Key:expressway
     facebook: Key:facebook
     faces: Key:faces
     fair_trade: Key:fair trade
+    fallow: Key:fallow
     farming_system: Key:farming system
+    farmland: Key:farmland
     farmyard: Key:farmyard
     fast_food: Key:fast food
     fax: Key:fax
     fcc:registration_number: Key:fcc:registration number
     fcc:unique_system_identifier: Key:fcc:unique system identifier
     fee: Key:fee
+    fee:conditional: Key:fee:conditional
     fee:disabled: Key:fee:disabled
     fee:disabled_assistant: Key:fee:disabled assistant
+    feeding:type: Key:feeding:type
     female: Key:female
+    female:conditional: Key:female:conditional
     fence_type: Key:fence type
     fenced: Key:fenced
     ferry: Key:ferry
@@ -4393,33 +5635,54 @@ en:
     fetish: Key:fetish
     fhrs:authority: Key:fhrs:authority
     fhrs:id: Key:fhrs:id
-    fhrs:rating: Key:fhrs:rating
+    fhrs:local_authority_id: Key:fhrs:local authority id
     field: Key:field
     finance_agent: Key:finance agent
+    fine: Key:fine
+    fire: Key:fire
     fire_boundary: Key:fire boundary
     fire_hydrant: Key:fire hydrant
-    fire_hydrant:type: Key:fire hydrant:type
     fire_object:type: Key:fire object:type
     fire_operator: Key:fire operator
+    fire_path: Key:fire path
     fire_rank: Key:fire rank
+    fire_station:type: Key:fire station:type
+    firearms: Key:firearms
     fireplace: Key:fireplace
     fishing: Key:fishing
+    fitness_station: Key:fitness station
+    fix_guidepost: Key:fix guidepost
     fixme: Key:fixme
+    flag: Key:flag
+    flag:name: Key:flag:name
+    flag:type: Key:flag:type
+    flag:wikidata: Key:flag:wikidata
+    flashing_lights: Key:flashing lights
+    flat_steps: Key:flat steps
     flickr: Key:flickr
     floating: Key:floating
     flood_mark: Key:flood mark
     flood_prone: Key:flood prone
     floor:material: Key:floor:material
+    flow_rate: Key:flow rate
+    food: Key:food
     foot: Key:foot
+    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
+    format:top: Key:format:top
     fortification_type: Key:fortification type
     forward: Key:forward
+    fountain: Key:fountain
+    free_refill: Key:free refill
     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
@@ -4427,6 +5690,7 @@ en:
     fuel:E10: Key:fuel:E10
     fuel:GTL_diesel: Key:fuel:GTL diesel
     fuel:HGV_diesel: Key:fuel:HGV diesel
+    fuel:LH2: Key:fuel:LH2
     fuel:adblue: Key:fuel:adblue
     fuel:alcohol: Key:fuel:alcohol
     fuel:biodiesel: Key:fuel:biodiesel
@@ -4440,6 +5704,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
@@ -4451,14 +5716,15 @@ en:
     fuel:octane_98: Key:fuel:octane 98
     fuel:svo: Key:fuel:svo
     furniture: Key:furniture
-    further: Key:further
-    further:access: Key:further:access
-    further:vehicle: Key:further:vehicle
+    fut_ref: Key:fut ref
     fvst:navnelbnr: Key:fvst:navnelbnr
     gambling: Key:gambling
     garden:style: Key:garden:style
     garden:type: Key:garden:type
     gauge: Key:gauge
+    gay: Key:gay
+    gender: Key:gender
+    gender_segregated: Key:gender segregated
     generator:method: Key:generator:method
     generator:output: Key:generator:output
     generator:output:biogas: Key:generator:output:biogas
@@ -4469,17 +5735,27 @@ en:
     generator:output:heat: Key:generator:output:heat
     generator:output:hot_air: Key:generator:output:hot air
     generator:output:hot_water: Key:generator:output:hot water
+    generator:output:hydrogen: Key:generator:output:hydrogen
     generator:output:steam: Key:generator:output:steam
     generator:output:vacuum: Key:generator:output:vacuum
     generator:place: Key:generator:place
     generator:plant: Key:generator:plant
+    generator:solar:modules: Key:generator:solar:modules
     generator: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:it: Key:genus:it
+    genus:ru: Key:genus:ru
+    genus:wikidata: Key:genus:wikidata
     geocodigo: Key:geocodigo
     geological: Key:geological
     geothermal: Key:geothermal
+    geyser:type: Key:geyser:type
+    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
@@ -4495,17 +5771,34 @@ 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
     gun_turret: Key:gun turret
     gvr:code: Key:gvr:code
+    hand_cart: Key:hand cart
+    handicap: Key:handicap
+    handle: Key:handle
     handrail: Key:handrail
+    handrail:center: Key:handrail:center
+    handrail:left: Key:handrail:left
+    handrail:right: Key:handrail:right
     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
@@ -4514,40 +5807,60 @@ en:
     hazard_type: Key:hazard type
     hazmat: Key:hazmat
     hazmat:water: Key:hazmat:water
+    headframe: Key:headframe
+    health_facility:type: Key:health facility:type
     healthcare: Key:healthcare
+    healthcare:counselling: Key:healthcare:counselling
     healthcare:speciality: Key:healthcare:speciality
+    heater: Key:heater
+    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
     historic:era: Key:historic:era
     historic:period: Key:historic:period
-    historic_name: Key:historic name
     history: Key:history
+    hoops: Key:hoops
     horse: Key:horse
     horse-drawn_carriage: Key:horse-drawn carriage
     horse_scale: Key:horse scale
+    hot_water: Key:hot water
     hour_off: Key:hour off
     hour_on: Key:hour on
+    house: Key:house
     hov: Key:hov
     hov:lanes: Key:hov:lanes
+    hunting: Key:hunting
+    hunting_stand: Key:hunting stand
     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
@@ -4558,18 +5871,26 @@ en:
     indoormark: Key:indoormark
     industrial: Key:industrial
     industry:isic_code: Key:industry:isic code
+    infant_bed: Key:infant bed
     informal: Key:informal
     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
     int_ref: Key:int ref
     int_ref:ar: Key:int ref:ar
     intermittent: Key:intermittent
     internet: Key:internet
     internet_access: Key:internet access
     internet_access:fee: Key:internet access:fee
+    internet_access:operator: Key:internet access:operator
+    internet_access: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
     is_in:archipelago: Key:is in:archipelago
@@ -4578,6 +5899,7 @@ en:
     is_in:continent: Key:is in:continent
     is_in:country: Key:is in:country
     is_in:country_code: Key:is in:country code
+    is_in:county: Key:is in:county
     is_in:island: Key:is in:island
     is_in:municipality: Key:is in:municipality
     is_in:ocean: Key:is in:ocean
@@ -4585,13 +5907,19 @@ en:
     is_in:region: Key:is in:region
     is_in:sea: Key:is in:sea
     is_in:state: Key:is in:state
+    is_in:state_code: Key:is in:state code
     is_in:ward: Key:is in:ward
+    isced:level: Key:isced:level
     it:fvg:ctrn:code: Key:it:fvg:ctrn:code
+    iucn_level: Key:iucn level
     jel: Key:jel
+    jetski: Key:jetski
+    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
@@ -4599,7 +5927,10 @@ en:
     kct_white: Key:kct white
     kct_yellow: Key:kct yellow
     kerb: Key:kerb
+    kerb:height: Key:kerb:height
+    kick_scooter: Key:kick scooter
     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
@@ -4615,16 +5946,18 @@ en:
     kneipp_water_cure: Key:kneipp water cure
     kp: Key:kp
     kudish: Key:kudish
-    label: Key:label
+    kurb: Key:kurb
     lacounty:ain: Key:lacounty:ain
     lacounty:bld_id: Key:lacounty:bld id
-    lactose_free: Key:lactose free
     ladder: Key:ladder
+    lamp_model: Key:lamp model
     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_hint: Key:lane hint
+    lane_markings: Key:lane markings
     lanes: Key:lanes
     lanes:backward: Key:lanes:backward
     lanes:both_ways: Key:lanes:both ways
@@ -4633,86 +5966,176 @@ en:
     lanes:psv: Key:lanes:psv
     lanes:psv:backward: Key:lanes:psv:backward
     lanes:psv:forward: Key:lanes:psv:forward
+    language: Key:language
+    language:LL: Key:language:LL
+    language:ar: Key:language:ar
+    language:arc: Key:language:arc
+    language:azb: Key:language:azb
+    language:ckb: Key:language:ckb
+    language:de: Key:language:de
+    language:el: Key:language:el
+    language:fa: Key:language:fa
+    language:glk: Key:language:glk
+    language:gr: Key:language:gr
+    language:grc: Key:language:grc
+    language:ks: Key:language:ks
+    language:lrc: Key:language:lrc
+    language:mzn: Key:language:mzn
+    language:pa: Key:language:pa
+    language:ps: Key:language:ps
+    language:sd: Key:language:sd
+    language:syc: Key:language:syc
+    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
     length: Key:length
     level: Key:level
+    level:ref: Key:level:ref
+    lgbt: Key:lgbt
+    lgbtq: Key:lgbtq
     lhv: Key:lhv
+    liaison: Key:liaison
+    license_classes: Key:license classes
+    lifeguard: Key:lifeguard
+    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
     living_street: Key:living street
     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:gr: Key:loc name:gr
+    loc_name:grc: Key:loc name:grc
+    loc_name:ur: Key:loc name:ur
     loc_ref: Key:loc ref
+    local_authority:FR: Key:local authority:FR
     local_ref: Key:local ref
+    locale: Key:locale
+    localwiki: Key:localwiki
     location: Key:location
     lock: Key:lock
     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
     man_made: Key:man made
     managed: Key:managed
     manhole: Key:manhole
+    manmade: Key:manmade
     manufacturer: Key:manufacturer
     manufacturer:type: Key:manufacturer:type
+    manufacturer:wikidata: Key:manufacturer:wikidata
     mapillary: Key:mapillary
+    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
+    maxdraught: Key:maxdraught
     maxheight: Key:maxheight
     maxheight:legal: Key:maxheight:legal
     maxheight:physical: Key:maxheight:physical
     maxlength: Key:maxlength
     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
+    maxstay:conditional: Key:maxstay:conditional
+    maxtents: Key:maxtents
     maxweight: Key:maxweight
+    maxweight:signed: Key:maxweight:signed
+    maxweightrating: Key:maxweightrating
+    maxweightrating:bus: Key:maxweightrating:bus
+    maxweightrating:hgv: Key:maxweightrating:hgv
     maxwidth: Key:maxwidth
     maxwidth:physical: Key:maxwidth:physical
+    mcrb:criteria: Key:mcrb:criteria
     mdb_id: Key:mdb id
+    meadow: Key:meadow
     measurement: Key:measurement
+    mechanical_coupling: Key:mechanical coupling
+    mechanical_driver: Key:mechanical driver
     medical_supply: Key:medical supply
     megalith_type: Key:megalith type
+    membership: Key:membership
     memorial: Key:memorial
+    memorial:subject: Key:memorial:subject
     memorial:type: Key:memorial:type
     message: Key:message
+    mhs:inscription_date: Key:mhs:inscription date
     microbrewery: Key:microbrewery
+    milestone_type: Key:milestone type
     military: Key:military
+    military_service: Key:military service
+    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
@@ -4729,21 +6152,33 @@ 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
     motor_vehicle: Key:motor vehicle
+    motor_vehicle:conditional: Key:motor vehicle:conditional
     motorboat: Key:motorboat
     motorcar: Key:motorcar
+    motorcar:conditional: Key:motorcar:conditional
     motorcycle: Key:motorcycle
     motorcycle:clothes: Key:motorcycle:clothes
     motorcycle:conditional: Key:motorcycle:conditional
+    motorcycle:lanes: Key:motorcycle:lanes
+    motorcycle:parking: Key:motorcycle:parking
     motorcycle:parts: Key:motorcycle:parts
     motorcycle:rental: Key:motorcycle:rental
     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
+    motorcycles: Key:motorcycles
     motorhome: Key:motorhome
     motorroad: Key:motorroad
     motorway: Key:motorway
@@ -4757,81 +6192,178 @@ en:
     mtb_scale: Key:mtb scale
     museum: Key:museum
     museum_type: Key:museum type
+    musical_instrument: Key:musical instrument
+    musical_instrument:repair: Key:musical instrument:repair
     name: Key:name
     name:ar: Key:name:ar
+    name:ar1: Key:name:ar1
+    name:arc: Key:name:arc
+    name:ast: Key:name:ast
+    name:az-Arab: Key:name:az-Arab
+    name:azb: Key:name:azb
     name:be: Key:name:be
     name:be-tarask: Key:name:be-tarask
     name:ber: Key:name:ber
+    name:bn: Key:name:bn
+    name:bn-Arab: Key:name:bn-Arab
     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
     name:de: Key:name:de
     name:dv: Key:name:dv
     name:el: Key:name:el
     name:en: Key:name:en
+    name:en1: Key:name:en1
+    name:en2: Key:name:en2
     name:eo: Key:name:eo
     name:es: Key:name:es
+    name:et: Key:name:et
     name:etymology: Key:name:etymology
+    name:etymology:wikidata: Key:name:etymology:wikidata
     name:etymology:wikipedia: Key:name:etymology:wikipedia
     name:eu: Key:name:eu
+    name:fa: Key:name:fa
     name:fi: Key:name:fi
     name:fr: Key:name:fr
     name:fy: Key:name:fy
     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:gr: Key:name:gr
+    name:grc: Key:name:grc
+    name:gsw: Key:name:gsw
     name:he: Key:name:he
     name:hi: Key:name:hi
+    name:hr: Key:name:hr
+    name:hsb: Key:name:hsb
     name:hu: Key:name:hu
+    name:hy: Key:name:hy
     name:io: Key:name:io
     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:kmr: Key:name:kmr
     name:kn: Key:name:kn
     name:kn:iso15919: Key:name:kn:iso15919
     name:ko: Key:name:ko
+    name:ko-Latn: Key:name:ko-Latn
     name:ko_rm: Key:name:ko rm
+    name:ks: Key:name:ks
     name:ku: Key:name:ku
+    name:ku-Arab: Key:name:ku-Arab
+    name:ky-Arab: Key:name:ky-Arab
+    name:language: Key:name:language
     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
     name:mk: Key:name:mk
     name:ml: Key:name:ml
     name:mr: Key:name:mr
+    name:ms-Arab: Key:name:ms-Arab
+    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:oc: Key:name:oc
+    name:ota: Key:name:ota
+    name:pa-Arab: Key:name:pa-Arab
     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
+    name:ro: Key:name:ro
     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:signed: Key:name:signed
     name:sk: Key:name:sk
     name:sl: Key:name:sl
+    name:sr: Key:name:sr
+    name:sr-Latn: Key:name:sr-Latn
     name:suffix: Key:name:suffix
     name:sv: Key:name:sv
+    name:syc: Key:name:syc
     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:vi-Hani: Key:name:vi-Hani
     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:AdministrativeAreaRef: Key:naptan:AdministrativeAreaRef
+    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:Error: Key:naptan:Error
+    naptan:Indicator: Key:naptan:Indicator
+    naptan:Landmark: Key:naptan:Landmark
+    naptan:NaptanCode: Key:naptan:NaptanCode
+    naptan:Notes: Key:naptan:Notes
+    naptan:PlusbusZoneRef: Key:naptan:PlusbusZoneRef
+    naptan:RevisionNumber: Key:naptan:RevisionNumber
+    naptan:ShortCommonName: Key:naptan:ShortCommonName
+    naptan:Status: Key:naptan:Status
+    naptan:StopAreaCode: Key:naptan:StopAreaCode
+    naptan:StopAreaType: Key:naptan:StopAreaType
+    naptan:Street: Key:naptan:Street
+    naptan: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
@@ -4846,66 +6378,172 @@ en:
     navibot:connect: Key:navibot:connect
     navigationaid: Key:navigationaid
     ncat: Key:ncat
+    ncn: Key:ncn
     ncn_milepost: Key:ncn milepost
     ncn_ref: Key:ncn ref
     network: Key:network
+    network:ar: Key:network:ar
+    network:guid: Key:network:guid
+    network:type: Key:network:type
+    network:wikidata: Key:network:wikidata
+    next_check_date: Key:next check date
+    nhd:com_id: Key:nhd:com id
+    nhd:fcode: Key:nhd:fcode
+    nhd:ftype: Key:nhd:ftype
+    nhd:reach_code: Key:nhd:reach code
     no-barnehage:nsrid: Key:no-barnehage:nsrid
     noaddress: Key:noaddress
     noexit: Key:noexit
+    nohousenumber: Key:nohousenumber
     non_existent_levels: Key:non existent levels
-    noname: Key:noname
+    nonsquare: Key:nonsquare
     noref: Key:noref
+    not: Key:not
+    'not:': 'Key:not:'
+    not:name: Key:not:name
     not:nccod: Key:not:nccod
+    not_accepted_import:leisure: Key:not accepted import:leisure
     not_served_by: Key:not served by
     note: Key:note
+    note:addr_place: Key:note:addr place
+    note:ar: Key:note:ar
     note:deplacer4mE: Key:note:deplacer4mE
     note:depth: Key:note:depth
     note:en: Key:note:en
     note:ja: Key:note:ja
     note:pilotage: Key:note:pilotage
     notes: Key:notes
+    nuclear_explosion:country: Key:nuclear explosion:country
     nudism: Key:nudism
+    nudism:conditional: Key:nudism:conditional
+    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:arc: Key:official name:arc
+    official_name:az-Arab: Key:official name:az-Arab
+    official_name:azb: Key:official name:azb
+    official_name:be: Key:official name:be
+    official_name:ckb: Key:official name:ckb
+    official_name:en: Key:official name:en
+    official_name:fa: Key:official name:fa
+    official_name:fr: Key:official name:fr
+    official_name:glk: Key:official name:glk
+    official_name:gr: Key:official name:gr
+    official_name:grc: Key:official name:grc
+    official_name:kk-Arab: Key:official name:kk-Arab
+    official_name:kmr: Key:official name:kmr
+    official_name:ks: Key:official name:ks
+    official_name:lrc: Key:official name:lrc
+    official_name:mzn: Key:official name:mzn
+    official_name:pl: Key:official name:pl
+    official_name:pnb: Key:official name:pnb
+    official_name:ps: Key:official name:ps
+    official_name:ru: Key:official name:ru
+    official_name:sd: Key:official name:sd
+    official_name:syc: Key:official name:syc
+    official_name:ug: Key:official name:ug
+    official_name:ur: Key:official name:ur
     official_ref: Key:official ref
     offshore: Key:offshore
+    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:gr: Key:old name:gr
+    old_name:grc: Key:old name:grc
+    old_name:ks: Key:old name:ks
+    old_name:ku-Arab: Key:old name:ku-Arab
+    old_name:lrc: Key:old name:lrc
+    old_name:pl: Key:old name:pl
+    old_name:pnb: Key:old name:pnb
+    old_name: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:moped: Key:oneway:moped
+    oneway:bus: Key:oneway:bus
+    oneway:conditional: Key:oneway:conditional
+    oneway:foot: Key:oneway:foot
+    oneway:motorcycle: Key:oneway:motorcycle
+    oneway:psv: Key:oneway:psv
+    oneway:taxi: Key:oneway:taxi
     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
     orienteering: Key:orienteering
     origin: Key:origin
+    orv: Key:orv
     osak: Key:osak
+    osak:house_no: Key:osak:house no
     osak:identifier: Key:osak:identifier
+    osak:municipality_name: Key:osak:municipality name
     osak:municipality_no: Key:osak:municipality no
     osak:revision: Key:osak:revision
+    osak:street: Key:osak:street
     osak:street_name: Key:osak:street name
     osak:street_no: Key:osak:street no
     osak:subdivision: Key:osak:subdivision
@@ -4915,7 +6553,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
@@ -4923,6 +6563,8 @@ en:
     ownership: Key:ownership
     par: Key:par
     parish: Key:parish
+    park:type: Key:park:type
+    park_ride: Key:park ride
     parking: Key:parking
     parking:condition: Key:parking:condition
     parking:condition:both: Key:parking:condition:both
@@ -4934,8 +6576,16 @@ en:
     parking:lane:both: Key:parking:lane:both
     parking:lane:hgv: Key:parking:lane:hgv
     parking:lane:left: Key:parking:lane:left
+    parking:lane:left:parallel: Key:parking:lane:left:parallel
     parking:lane:right: Key:parking:lane:right
+    parking:lane:right:parallel: Key:parking:lane:right:parallel
     parking:lane:side: Key:parking:lane:side
+    parking:lane:side:parallel: Key:parking:lane:side:parallel
+    parking:orientation: Key:parking:orientation
+    parking:street_side: Key:parking:street side
+    parking_space: Key:parking space
+    parts: Key:parts
+    passage_time: Key:passage time
     passenger: Key:passenger
     passenger_information_display: Key:passenger information display
     passenger_lines: Key:passenger lines
@@ -4944,23 +6594,83 @@ en:
     paved:date: Key:paved:date
     payment: Key:payment
     payment:account_cards: Key:payment:account cards
+    payment:alipay: Key:payment:alipay
+    payment:american_express: Key:payment:american express
+    payment:app: Key:payment:app
+    payment:apple_pay: Key:payment:apple pay
+    payment:bancomat: Key:payment:bancomat
+    payment:bitcoin: Key:payment:bitcoin
+    payment:bitcoincash: Key:payment:bitcoincash
+    payment:blik: Key:payment:blik
+    payment:cards: Key:payment:cards
     payment:cash: Key:payment:cash
+    payment:cb: Key:payment:cb
+    payment:cheque: Key:payment:cheque
+    payment:clipper: Key:payment:clipper
     payment:coins: Key:payment:coins
+    payment:contactless: Key:payment:contactless
     payment:credit_cards: Key:payment:credit cards
+    payment:cryptocurrencies: Key:payment:cryptocurrencies
+    payment:debit_cards: Key:payment:debit cards
+    payment:description: Key:payment:description
+    payment:diners_club: Key:payment:diners club
+    payment:discover_card: Key:payment:discover card
+    payment:dkv: Key:payment:dkv
+    payment:e_zpass: Key:payment:e zpass
+    payment:easycard: Key:payment:easycard
     payment:electronic_purses: Key:payment:electronic purses
+    payment:ep_easycard: Key:payment:ep easycard
+    payment:ep_geldkarte: Key:payment:ep geldkarte
+    payment:ep_ipass: Key:payment:ep ipass
+    payment:fastrak: Key:payment:fastrak
     payment:foo: Key:payment:foo
+    payment:girocard: Key:payment:girocard
+    payment:good_to_go: Key:payment:good to go
+    payment:google_pay: Key:payment:google pay
+    payment:i-pass: Key:payment:i-pass
+    payment:icsf: Key:payment:icsf
+    payment:ipass: Key:payment:ipass
+    payment:jcb: Key:payment:jcb
+    payment:k-tag: Key:payment:k-tag
+    payment:maestro: Key:payment:maestro
     payment:mastercard: Key:payment:mastercard
+    payment:mastercard_contactless: Key:payment:mastercard contactless
+    payment:mastercard_debit: Key:payment:mastercard debit
     payment:mir: Key:payment:mir
+    payment:mobile_phone: Key:payment:mobile phone
+    payment:nc_quick_pass: Key:payment:nc quick pass
     payment:none: Key:payment:none
     payment:notes: Key:payment:notes
+    payment:others: Key:payment:others
+    payment:paypal: Key:payment:paypal
+    payment:peach_pass: Key:payment:peach pass
+    payment:peachpass: Key:payment:peachpass
+    payment:pikepass: Key:payment:pikepass
+    payment:prepaid_ticket: Key:payment:prepaid ticket
     payment:pro100: Key:payment:pro100
+    payment:stored_value_card: Key:payment:stored value card
+    payment:sunpass: Key:payment:sunpass
+    payment:telephone_cards: Key:payment:telephone cards
+    payment:touchngo: Key:payment:touchngo
+    payment:twint: Key:payment:twint
     payment:u-key: Key:payment:u-key
+    payment:unionpay: Key:payment:unionpay
+    payment:uta: Key:payment:uta
+    payment:v_pay: Key:payment:v pay
     payment:visa: Key:payment:visa
+    payment:visa_debit: Key:payment:visa debit
+    payment:visa_electron: Key:payment:visa electron
+    payment:wechat: Key:payment:wechat
+    payment:wire_transfer: Key:payment:wire transfer
+    permanent_camping: Key:permanent camping
     phoenixbikeguide: Key:phoenixbikeguide
     phone: Key:phone
     photo: Key:photo
     photograph: Key:photograph
+    photography: Key:photography
+    picnic_table: Key:picnic table
     picture: Key:picture
+    pihatie: Key:pihatie
     pilgrimage: Key:pilgrimage
     pilotage: Key:pilotage
     pipeline: Key:pipeline
@@ -4975,38 +6685,56 @@ 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
     plant:output: Key:plant:output
+    plant:output:biogas: Key:plant:output:biogas
     plant:output:cold_air: Key:plant:output:cold air
     plant:output:cold_water: Key:plant:output:cold water
     plant:output:compressed_air: Key:plant:output:compressed air
     plant:output:electricity: Key:plant:output:electricity
+    plant:output:heat: Key:plant:output:heat
     plant:output:hot_air: Key:plant:output:hot air
     plant:output:hot_water: Key:plant:output:hot water
     plant:output:steam: Key:plant:output:steam
     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
     'playground:': 'Key:playground:'
     playground:theme: Key:playground:theme
+    pmfsefin:idedif: Key:pmfsefin:idedif
     point: Key:point
+    pole: Key:pole
+    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
+    post_office: Key:post office
+    post_office:parcel_pickup: Key:post office:parcel pickup
     postal_code: Key:postal code
     postcode: Key:postcode
+    potholes: Key:potholes
     power: Key:power
     power_output: Key:power output
     power_rating: Key:power rating
     power_source: Key:power source
     power_supply: Key:power supply
     power_supply:schedule: Key:power supply:schedule
+    practicability: Key:practicability
     preschool: Key:preschool
+    pressure: Key:pressure
     previous: Key:previous
     previous:access: Key:previous:access
     previous:vehicle: Key:previous:vehicle
@@ -5014,17 +6742,26 @@ 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
     protected: Key:protected
     protection_title: Key:protection title
     prow_ref: Key:prow ref
+    pruning: Key:pruning
     psv: Key:psv
+    psv:lanes: Key:psv:lanes
+    psv:lanes:backward: Key:psv:lanes:backward
+    psv:lanes:forward: Key:psv:lanes:forward
     public_bookcase:type: Key:public bookcase:type
     public_transport: Key:public transport
     public_transport:version: Key:public transport:version
     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
@@ -5039,6 +6776,9 @@ 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
     railway:signal:combined: Key:railway:signal:combined
@@ -5047,47 +6787,91 @@ 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
     ramp:stroller: Key:ramp:stroller
     ramp:wheelchair: Key:ramp:wheelchair
     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
+    recreation_ground: Key:recreation ground
+    recycling:PET: Key:recycling:PET
+    recycling:fire_extinguishers: Key:recycling:fire extinguishers
+    recycling:pet_drink_bottles: Key:recycling:pet drink bottles
+    recycling:plastic_bottle_tops: Key:recycling:plastic bottle tops
     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:DK:cvr: Key:ref:DK:cvr
     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:NRO: Key:ref:FR:Orange:NRO
+    ref:FR:Orange_mobile: Key:ref:FR:Orange mobile
     ref:FR:PTT: Key:ref:FR:PTT
+    ref:FR:PTT:NRA: Key:ref:FR:PTT:NRA
+    ref:FR:RNA: Key:ref:FR:RNA
     ref:FR:RTE: Key:ref:FR:RTE
     ref:FR:RTE_nom: Key:ref:FR:RTE nom
+    ref:FR:SFR: Key:ref:FR:SFR
     ref:FR:SIREN: Key:ref:FR:SIREN
     ref:FR:SIRET: Key:ref:FR:SIRET
     ref:FR: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:mpan: Key:ref:GB:mpan
+    ref:GB:nhs_ods: Key:ref:GB:nhs ods
+    ref:GB:uprn: Key:ref:GB:uprn
     ref:HU:edid: Key:ref:HU:edid
     ref:IFOPT: Key:ref:IFOPT
+    ref:INEP: Key:ref:INEP
     ref:INSEE: Key:ref:INSEE
     ref:ISTAT: Key:ref:ISTAT
+    ref:LILA: Key:ref:LILA
+    ref:LOCODE: Key:ref:LOCODE
+    ref: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:REI: Key:ref:REI
     ref:TECB: Key:ref:TECB
     ref:TECC: Key:ref:TECC
     ref:TECH: Key:ref:TECH
@@ -5095,28 +6879,65 @@ en:
     ref:TECN: Key:ref:TECN
     ref:TECX: Key:ref:TECX
     ref:UAI: Key:ref:UAI
+    ref:US:EPA: Key:ref:US:EPA
     ref:UrbIS: Key:ref:UrbIS
+    ref:WDPA: Key:ref:WDPA
     ref:ar: Key:ref:ar
+    ref:at:bda: Key:ref:at:bda
     ref:at:gkz: Key:ref:at:gkz
     ref:at:okz: Key:ref:at:okz
     ref:bag: Key:ref:bag
+    ref:bag:old: Key:ref:bag:old
     ref:bam.brno.cz: Key:ref:bam.brno.cz
     ref:bic: Key:ref:bic
     ref:bufa: Key:ref:bufa
+    ref:bygningsnr: Key:ref:bygningsnr
+    ref:cadc:2020: Key:ref:cadc:2020
+    ref:cadw: Key:ref:cadw
+    ref:capad:pa_id: Key:ref:capad:pa id
+    ref:capad:uid: Key:ref:capad:uid
+    ref:circuits: Key:ref:circuits
     ref:cobe: Key:ref:cobe
     ref:color: Key:ref:color
     ref:colour: Key:ref:colour
+    ref:coop: Key:ref:coop
+    ref:crs: Key:ref:crs
     ref:ctb: Key:ref:ctb
+    ref:deniirn: Key:ref:deniirn
+    ref:dew:park_id: Key:ref:dew:park id
+    ref:dhis2: Key:ref:dhis2
+    ref:doc: Key:ref:doc
     ref:edubase: Key:ref:edubase
+    ref:ef: Key:ref:ef
+    ref:gnis: Key:ref:gnis
+    ref:gsi: Key:ref:gsi
+    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:linz:address_id: Key:ref:linz:address id
+    ref:linz:building_id: Key:ref:linz:building id
     ref:lor: Key:ref:lor
+    ref:mcrb: Key:ref:mcrb
     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:nid: Key:ref:nid
+    ref:nrhp: Key:ref:nrhp
     ref:ortsnetz: Key:ref:ortsnetz
+    ref:oslo:tree: Key:ref:oslo:tree
     ref:penndot: Key:ref:penndot
+    ref: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
@@ -5124,47 +6945,82 @@ 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:ssb_tettsted: Key:ref:ssb tettsted
+    ref:statistical: Key:ref:statistical
     ref:taskey: Key:ref:taskey
+    ref:udir_nsr: Key:ref:udir nsr
     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
     reference_point: Key:reference point
     reg_name: Key:reg name
+    reg_name:ar: Key:reg name:ar
+    reg_name:gr: Key:reg name:gr
+    reg_name:grc: Key:reg name:grc
     reg_ref: Key:reg ref
     regelbau: Key:regelbau
+    region:type: Key:region:type
+    related_law: Key:related law
     religion: Key:religion
+    remotely_controllable: Key:remotely controllable
     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
     retreat: Key:retreat
-    retroreflecting: Key:retroreflecting
+    reusable_packaging: Key:reusable packaging
+    reusable_packaging:accept: Key:reusable packaging:accept
+    reusable_packaging:offer: Key:reusable packaging:offer
+    review_requested: Key:review requested
     rfr: Key:rfr
+    rhn_ref: Key:rhn ref
     right: Key:right
     right/left/both: Key:right/left/both
     right:country: Key:right:country
+    rin_ref: Key:rin ref
     river:waterway_distance: Key:river:waterway distance
+    rmn_ref: Key:rmn ref
     road_marking: Key:road marking
     roadtrain: Key:roadtrain
+    roller_coaster: Key:roller coaster
     roof:colour: Key:roof:colour
     roof:direction: Key:roof:direction
     roof:material: Key:roof:material
+    roof:ridge: Key:roof:ridge
+    roof:shape: Key:roof:shape
     room: Key:room
     rooms: Key:rooms
     rotor:diameter: Key:rotor:diameter
+    rotor:swept_area: Key:rotor:swept area
     roundtrip: Key:roundtrip
     route: Key:route
+    route_availability: Key:route availability
     route_master: Key:route master
     route_ref: Key:route ref
     route_ref:De_Lijn: Key:route ref:De Lijn
@@ -5176,6 +7032,7 @@ en:
     route_ref:TECX: Key:route ref:TECX
     royal_cypher: Key:royal cypher
     royal_cypher:wikidata: Key:royal cypher:wikidata
+    rpn_ref: Key:rpn ref
     rtc_rate: Key:rtc rate
     rtsa_scale: Key:rtsa scale
     ruined: Key:ruined
@@ -5186,13 +7043,25 @@ 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
     salt: Key:salt
     sanitary_dump_station: Key:sanitary dump station
+    sauna: Key:sauna
+    sauna:fuel: Key:sauna:fuel
+    sauna:heating: Key:sauna:heating
+    sauna:temperature: Key:sauna:temperature
+    sauna:water:description: Key:sauna:water:description
     scenic: Key:scenic
     school: Key:school
+    school:gender: Key:school:gender
+    scuba_diving:courses: Key:scuba diving:courses
+    scuba_diving:rental: Key:scuba diving:rental
+    sculpture_type: Key:sculpture type
     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
@@ -5268,41 +7137,69 @@ en:
     seats: Key:seats
     second_hand: Key:second hand
     segregated: Key:segregated
+    self_checkout: Key:self checkout
     self_service: Key:self service
     sells:tobacco: Key:sells:tobacco
     service: Key:service
+    service:bicycle:cleaning: Key:service:bicycle:cleaning
     service:bicycle:diy: Key:service:bicycle:diy
+    service:bicycle:ebike: Key:service:bicycle:ebike
+    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
+    shrine: Key:shrine
     side_road: Key:side road
     sides: Key:sides
     sidewalk: Key:sidewalk
+    sidewalk:both: Key:sidewalk:both
+    sidewalk:both:bicycle: Key:sidewalk:both:bicycle
+    sidewalk:both:surface: Key:sidewalk:both:surface
+    sidewalk:left: Key:sidewalk:left
+    sidewalk:left:bicycle: Key:sidewalk:left:bicycle
+    sidewalk:left:surface: Key:sidewalk:left:surface
+    sidewalk:right: Key:sidewalk:right
+    sidewalk:right:bicycle: Key:sidewalk:right:bicycle
+    sidewalk:right:surface: Key:sidewalk:right:surface
+    sidewalk:surface: Key:sidewalk:surface
     sidewalk_orientation: Key:sidewalk orientation
     sign: Key:sign
+    signed_direction: Key:signed direction
+    sinkhole: Key:sinkhole
+    siren:purpose: Key:siren:purpose
+    siren:type: Key:siren:type
     site_type: Key:site type
     size: Key:size
     ski: Key:ski
     ski_tour_difficulty: Key:ski tour difficulty
     sl_realtime: Key:sl realtime
     sl_stop_id: Key:sl stop id
+    sloped_curb: Key:sloped curb
+    small_electric_vehicle: Key:small electric vehicle
     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
@@ -5312,34 +7209,82 @@ en:
     social_facility: Key:social facility
     social_facility:for: Key:social facility:for
     socket: Key:socket
+    socket:chademo: Key:socket:chademo
+    socket:schuko: Key:socket:schuko
+    socket:type1: Key:socket:type1
+    socket:type2: Key:socket:type2
+    socket:type3: Key:socket:type3
+    socket:type3c: Key:socket:type3c
+    socket:typee: Key:socket:typee
+    soliciting: Key:soliciting
     sorting_name: Key:sorting name
+    sorting_name:ar: Key:sorting name:ar
+    sorting_name:arc: Key:sorting name:arc
+    sorting_name:azb: Key:sorting name:azb
+    sorting_name:be: Key:sorting name:be
+    sorting_name:fa: Key:sorting name:fa
+    sorting_name:gr: Key:sorting name:gr
+    sorting_name:grc: Key:sorting name:grc
+    sorting_name:ks: Key:sorting name:ks
+    sorting_name:ota: Key:sorting name:ota
+    sorting_name:ru: Key:sorting name:ru
+    sorting_name:syc: Key:sorting name:syc
+    sorting_name:ur: Key:sorting name:ur
     source: Key:source
     source:ProRail: Key:source:ProRail
     source:addr: Key:source:addr
+    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
+    species:wikipedia: Key:species:wikipedia
     speech_input: Key:speech input
     speech_input:lg: Key:speech input:lg
     speech_output: Key:speech output
     speech_output:en: Key:speech output:en
     speech_output:lg: Key:speech output:lg
     speech_output:pl: Key:speech output:pl
+    speed_pedelec: Key:speed pedelec
     speisebezirk: Key:speisebezirk
     sport: Key:sport
     sqkm: Key:sqkm
@@ -5347,6 +7292,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
@@ -5355,31 +7301,45 @@ 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
+    strapline: Key:strapline
     stream: Key:stream
     stroller: Key:stroller
-    sub_sea: Key:sub sea
+    structure: Key:structure
+    studio: Key:studio
     subject: Key:subject
+    subject:wikidata: Key:subject:wikidata
+    subject:wikipedia: Key:subject:wikipedia
+    submarine: Key:submarine
     subsea: Key:subsea
     substance: Key:substance
     substation: Key:substation
+    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
+    survey_point:datum_aligned: Key:survey point:datum aligned
+    survey_point:purpose: Key:survey point:purpose
+    survey_point:structure: Key:survey point:structure
     sustrans_ref: Key:sustrans ref
+    swimming: Key:swimming
     swimming_pool: Key:swimming pool
     switch: Key:switch
     symbol: Key:symbol
     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
@@ -5389,6 +7349,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
@@ -5398,72 +7360,123 @@ en:
     technical_type: Key:technical type
     technology: Key:technology
     telecom: Key:telecom
+    telecom:medium: Key:telecom:medium
+    telescope:type: Key:telescope:type
+    television: Key:television
+    temperature: Key:temperature
     temporary: Key:temporary
     tenant: Key:tenant
     tents: Key:tents
+    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
     theme: Key:theme
     tickets:public_transport: Key:tickets:public transport
     tickets:public_transport_subscription: Key:tickets:public transport subscription
     ticks: Key:ticks
     tidal: Key:tidal
     tiger: Key:tiger
+    'tiger:': 'Key:tiger:'
+    tiger:CLASSFP: Key:tiger:CLASSFP
+    tiger:CPI: Key:tiger:CPI
+    tiger:FUNCSTAT: Key:tiger:FUNCSTAT
+    tiger:LSAD: Key:tiger:LSAD
+    tiger:MTFCC: Key:tiger:MTFCC
     tiger:PLACENS: Key:tiger:PLACENS
     tiger:cfcc: Key:tiger:cfcc
     tiger:county: Key:tiger:county
+    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:type: Key:toilets:type
+    toilets:paper_supplied: Key:toilets:paper supplied
+    toilets:unisex: Key:toilets:unisex
     toilets:wheelchair: Key:toilets:wheelchair
     toll: Key:toll
+    toll:hgv: Key:toll:hgv
+    toll:motorcycle: Key:toll:motorcycle
+    tomb: Key:tomb
+    topless: Key:topless
     topmark: Key:topmark
     topmark:colour: Key:topmark:colour
     touring: Key:touring
     tourism: Key:tourism
     tourist_bus: Key:tourist bus
+    tower:construction: Key:tower:construction
     tower:type: Key:tower:type
+    townhall:type: Key:townhall:type
     tracks: Key:tracks
     tracktype: Key:tracktype
     traffic: Key:traffic
     traffic:hourly: Key:traffic:hourly
     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
+    traffic_signals:override_indicator: Key:traffic signals:override indicator
     traffic_signals:sound: Key:traffic signals:sound
     traffic_signals:turn: Key:traffic signals:turn
     traffic_signals:turn:backward: Key:traffic signals:turn:backward
     traffic_signals:turn:forward: Key:traffic signals:turn:forward
     traffic_signals:vibration: Key:traffic signals:vibration
     trail_visibility: Key:trail visibility
+    trailblazed: Key:trailblazed
+    trailblazed:visibility: Key:trailblazed:visibility
     trailer: Key:trailer
+    trailer:rental: Key:trailer:rental
     train: Key:train
     tram: Key:tram
+    transformer: Key:transformer
+    transformer:devices: Key:transformer:devices
+    tree_lined: Key:tree lined
     trees: Key:trees
+    trench: Key:trench
+    trolley:deposit: Key:trolley:deposit
     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
     type: Key:type
@@ -5478,51 +7491,123 @@ en:
     url: Key:url
     url:restrictions: Key:url:restrictions
     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
+    valve: Key:valve
+    vegan: Key:vegan
+    vegetarian: Key:vegetarian
     vehicle: Key:vehicle
     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: Key:wall
     wall:material: Key:wall:material
+    washing_machine: Key:washing machine
     waste: Key:waste
     waste_basket: Key:waste basket
     water: Key:water
+    water_characteristic: Key:water characteristic
     water_point: Key:water point
+    water_source: Key:water source
+    water_system: Key:water system
+    water_well: Key:water well
     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
+    wheelchair:description: Key:wheelchair:description
     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
+    winter_service:salting: Key:winter service:salting
     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
+    wreck:type: Key:wreck:type
     www.prezzibenzina.it: Key:www.prezzibenzina.it
     xmas:feature: Key:xmas:feature
+    xmpp: Key:xmpp
     year_of_construction: Key:year of construction
     yh:LINE_NAME: Key:yh:LINE NAME
     yh:LINE_NUM: Key:yh:LINE NUM
     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
     zone:De_Lijn: Key:zone:De Lijn
     zone:TEC: Key:zone:TEC
@@ -5534,14 +7619,29 @@ 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=destination: Tag:access=destination
     access=exclusion_zone: Tag:access=exclusion zone
+    access=forestry: Tag:access=forestry
+    access=licence: Tag:access=licence
     access=license: Tag:access=license
     access=no: Tag:access=no
     access=official: Tag:access=official
+    access=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=unknown: Tag:access=unknown
     access=use_sidepath: Tag:access=use sidepath
+    actuator=electric_motor: Tag:actuator=electric motor
+    actuator=hydraulic_cylinder: Tag:actuator=hydraulic cylinder
+    actuator=manual: Tag:actuator=manual
+    actuator=pneumatic_cylinder: Tag:actuator=pneumatic cylinder
+    addr:type=water: Tag:addr:type=water
     admin_level=1: Tag:admin level=1
     admin_level=10: Tag:admin level=10
     admin_level=11: Tag:admin level=11
@@ -5582,19 +7682,29 @@ en:
     aerialway=station: Tag:aerialway=station
     aerialway=t-bar: Tag:aerialway=t-bar
     aerialway=zip_line: Tag:aerialway=zip line
+    aerodrome:type=airfield: Tag:aerodrome:type=airfield
+    aerodrome:type=gliding: Tag:aerodrome:type=gliding
+    aerodrome:type=international: Tag:aerodrome:type=international
+    aerodrome:type=military: Tag:aerodrome:type=military
+    aerodrome:type=private: Tag:aerodrome:type=private
+    aerodrome:type=regional: Tag:aerodrome:type=regional
     aeroway=aerodrome: Tag:aeroway=aerodrome
     aeroway=airport: Tag:aeroway=airport
     aeroway=airstrip: Tag:aeroway=airstrip
+    aeroway=airtanker_base: Tag:aeroway=airtanker base
     aeroway=apron: Tag:aeroway=apron
+    aeroway=arresting_gear: Tag:aeroway=arresting gear
     aeroway=fuel: Tag:aeroway=fuel
     aeroway=gate: Tag:aeroway=gate
     aeroway=hangar: Tag:aeroway=hangar
     aeroway=helipad: Tag:aeroway=helipad
     aeroway=heliport: Tag:aeroway=heliport
+    aeroway=highway_strip: Tag:aeroway=highway strip
     aeroway=holding_position: Tag:aeroway=holding position
     aeroway=landingpad: Tag:aeroway=landingpad
     aeroway=launchpad: Tag:aeroway=launchpad
     aeroway=navigationaid: Tag:aeroway=navigationaid
+    aeroway=papi: Tag:aeroway=papi
     aeroway=parking_position: Tag:aeroway=parking position
     aeroway=runway: Tag:aeroway=runway
     aeroway=spaceport: Tag:aeroway=spaceport
@@ -5605,6 +7715,7 @@ en:
     airmark=beacon: Tag:airmark=beacon
     ale_supply=limited: Tag:ale supply=limited
     allotments=plot: Tag:allotments=plot
+    amenity=High_school: Tag:amenity=High school
     amenity=Kneippbecken: Tag:amenity=Kneippbecken
     amenity=administration: Tag:amenity=administration
     amenity=advertising: Tag:amenity=advertising
@@ -5613,6 +7724,7 @@ en:
     amenity=animal_boarding: Tag:amenity=animal boarding
     amenity=animal_breeding: Tag:amenity=animal breeding
     amenity=animal_shelter: Tag:amenity=animal shelter
+    amenity=animal_training: Tag:amenity=animal training
     amenity=architect_office: Tag:amenity=architect office
     amenity=archive: Tag:amenity=archive
     amenity=arts_centre: Tag:amenity=arts centre
@@ -5624,13 +7736,19 @@ en:
     amenity=bank: Tag:amenity=bank
     amenity=bar: Tag:amenity=bar
     amenity=bbq: Tag:amenity=bbq
+    amenity=bear_box: Tag:amenity=bear box
     amenity=bench: Tag:amenity=bench
+    amenity=bicycle_library: Tag:amenity=bicycle library
     amenity=bicycle_parking: Tag:amenity=bicycle parking
     amenity=bicycle_rental: Tag:amenity=bicycle rental
     amenity=bicycle_repair_station: Tag:amenity=bicycle repair station
     amenity=bicycle_trailer_sharing: Tag:amenity=bicycle trailer sharing
     amenity=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
@@ -5640,21 +7758,27 @@ en:
     amenity=bus_station: Tag:amenity=bus station
     amenity=bus_stop: Tag:amenity=bus stop
     amenity=cafe: Tag:amenity=cafe
-    amenity=canoe_hire: Tag:amenity=canoe hire
+    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=chair: Tag:amenity=chair
+    amenity=changing_room: Tag:amenity=changing room
     amenity=charging_station: Tag:amenity=charging station
     amenity=childcare: Tag:amenity=childcare
     amenity=cinema: Tag:amenity=cinema
     amenity=citymap_post: Tag:amenity=citymap post
     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=clubhouse: Tag:amenity=clubhouse
     amenity=coast_guard: Tag:amenity=coast guard
     amenity=coast_radar_station: Tag:amenity=coast radar station
     amenity=college: Tag:amenity=college
@@ -5662,7 +7786,10 @@ en:
     amenity=community_centre: Tag:amenity=community centre
     amenity=compressed_air: Tag:amenity=compressed air
     amenity=concert_hall: Tag:amenity=concert hall
+    amenity=concession_stand: Tag:amenity=concession stand
     amenity=conference_centre: Tag:amenity=conference centre
+    amenity=consulate: Tag:amenity=consulate
+    amenity=convention_centre: Tag:amenity=convention centre
     amenity=courthouse: Tag:amenity=courthouse
     amenity=coworking_space: Tag:amenity=coworking space
     amenity=crematorium: Tag:amenity=crematorium
@@ -5673,21 +7800,27 @@ en:
     amenity=dancing_school: Tag:amenity=dancing school
     amenity=dead_pub: Tag:amenity=dead pub
     amenity=dentist: Tag:amenity=dentist
+    amenity=device_charging_station: Tag:amenity=device charging station
     amenity=disused: Tag:amenity=disused
     amenity=dive_centre: Tag:amenity=dive centre
     amenity=doctor: Tag:amenity=doctor
     amenity=doctors: Tag:amenity=doctors
     amenity=dog_bin: Tag:amenity=dog bin
+    amenity=dog_parking: Tag:amenity=dog parking
+    amenity=dog_toilet: Tag:amenity=dog toilet
     amenity=dog_waste_bin: Tag:amenity=dog waste bin
     amenity=dojo: Tag:amenity=dojo
+    amenity=dressing_room: Tag:amenity=dressing room
     amenity=drinking_water: Tag:amenity=drinking water
+    amenity=driver_training: Tag:amenity=driver training
+    amenity=driver_training_area: Tag:amenity=driver training area
     amenity=driving_school: Tag:amenity=driving school
     amenity=dryer: Tag:amenity=dryer
     amenity=education: Tag:amenity=education
     amenity=embassy: Tag:amenity=embassy
     amenity=emergency_phone: Tag:amenity=emergency phone
-    amenity=emergency_service: Tag:amenity=emergency service
     amenity=ev_charging: Tag:amenity=ev charging
+    amenity=events_centre: Tag:amenity=events centre
     amenity=events_venue: Tag:amenity=events venue
     amenity=exercise_point: Tag:amenity=exercise point
     amenity=exhibition_centre: Tag:amenity=exhibition centre
@@ -5698,30 +7831,37 @@ en:
     amenity=financial_advice: Tag:amenity=financial advice
     amenity=fire_hydrant: Tag:amenity=fire hydrant
     amenity=fire_station: Tag:amenity=fire station
-    amenity=first_aid: Tag:amenity=first aid
-    amenity=firstaid: Tag:amenity=firstaid
     amenity=fish_spa: Tag:amenity=fish spa
     amenity=fitness_station: Tag:amenity=fitness station
     amenity=food_court: Tag:amenity=food court
+    amenity=food_sharing: Tag:amenity=food sharing
     amenity=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
+    amenity=juice_bar: Tag:amenity=juice bar
+    amenity=karaoke_box: Tag:amenity=karaoke box
+    amenity=kick-scooter_rental: Tag:amenity=kick-scooter rental
     amenity=kindergarten: Tag:amenity=kindergarten
     amenity=kiosk: Tag:amenity=kiosk
     amenity=kitchen: Tag:amenity=kitchen
@@ -5733,36 +7873,49 @@ 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=osmica: Tag:amenity=osmica
+    amenity=outfitter: Tag:amenity=outfitter
     amenity=park: Tag:amenity=park
     amenity=parking: Tag:amenity=parking
     amenity=parking_entrance: Tag:amenity=parking entrance
     amenity=parking_space: Tag:amenity=parking space
     amenity=parkink: Tag:amenity=parkink
     amenity=payment_centre: Tag:amenity=payment centre
+    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_mourning: Tag:amenity=place of mourning
     amenity=place_of_worship: Tag:amenity=place of worship
     amenity=planetarium: Tag:amenity=planetarium
     amenity=police: Tag:amenity=police
     amenity=polling_station: Tag:amenity=polling station
     amenity=post_box: Tag:amenity=post box
+    amenity=post_depot: Tag:amenity=post depot
     amenity=post_office: Tag:amenity=post office
+    amenity=prep_school: Tag:amenity=prep school
     amenity=preschool: Tag:amenity=preschool
     amenity=printer: Tag:amenity=printer
     amenity=prison: Tag:amenity=prison
@@ -5772,51 +7925,65 @@ en:
     amenity=public_bath: Tag:amenity=public bath
     amenity=public_bookcase: Tag:amenity=public bookcase
     amenity=public_building: Tag:amenity=public building
-    amenity=public_hall: Tag:amenity=public hall
     amenity=ranger_station: Tag:amenity=ranger station
     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
     amenity=sauna: Tag:amenity=sauna
-    amenity=sceptic_tank: Tag:amenity=sceptic tank
     amenity=school: Tag:amenity=school
     amenity=seat: Tag:amenity=seat
-    amenity=septic_tank: Tag:amenity=septic tank
     amenity=shelter: Tag:amenity=shelter
     amenity=shop: Tag:amenity=shop
     amenity=shower: Tag:amenity=shower
+    amenity=ski_rental: Tag:amenity=ski rental
     amenity=ski_school: Tag:amenity=ski school
     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
     amenity=stripclub: Tag:amenity=stripclub
+    amenity=stroller_parking: Tag:amenity=stroller parking
+    amenity=student_accommodation: Tag:amenity=student accommodation
     amenity=studio: Tag:amenity=studio
+    amenity=surf_school: Tag:amenity=surf school
     amenity=swimming_pool: Tag:amenity=swimming pool
     amenity=swingerclub: Tag:amenity=swingerclub
     amenity=table: Tag:amenity=table
     amenity=taxi: Tag:amenity=taxi
-    amenity=taxi_point: Tag:amenity=taxi point
     amenity=telephone: Tag:amenity=telephone
     amenity=television: Tag:amenity=television
     amenity=theatre: Tag:amenity=theatre
     amenity=ticket_booth: Tag:amenity=ticket booth
     amenity=ticket_validator: Tag:amenity=ticket validator
+    amenity=toilet: Tag:amenity=toilet
     amenity=toilets: Tag:amenity=toilets
+    amenity=tourist_bus_parking: Tag:amenity=tourist bus parking
     amenity=townhall: Tag:amenity=townhall
+    amenity=toy_library: Tag:amenity=toy library
+    amenity=traffic_park: Tag:amenity=traffic park
+    amenity=trailer_park: Tag:amenity=trailer park
+    amenity=training: Tag:amenity=training
     amenity=trolley_bay: Tag:amenity=trolley bay
+    amenity=tuition: Tag:amenity=tuition
     amenity=university: Tag:amenity=university
     amenity=vacuum_cleaner: Tag:amenity=vacuum cleaner
     amenity=vehicle_inspection: Tag:amenity=vehicle inspection
@@ -5828,30 +7995,64 @@ en:
     amenity=washing_machine: Tag:amenity=washing machine
     amenity=waste_basket: Tag:amenity=waste basket
     amenity=waste_disposal: Tag:amenity=waste disposal
+    amenity=waste_dump_site: Tag:amenity=waste dump site
     amenity=waste_transfer_station: Tag:amenity=waste transfer station
     amenity=water: Tag:amenity=water
     amenity=water_point: Tag:amenity=water point
     amenity=watering_place: Tag:amenity=watering place
     amenity=weighbridge: Tag:amenity=weighbridge
     amenity=winery: Tag:amenity=winery
+    amenity=workshop: Tag:amenity=workshop
     amenity=yacht_club: Tag:amenity=yacht club
     amenity=youth_centre: Tag:amenity=youth centre
-    aminety=sceptic_tank: Tag:aminety=sceptic tank
+    animal=horse_walker: Tag:animal=horse walker
     animal=school: Tag:animal=school
+    animal_breeding=gamecock: Tag:animal breeding=gamecock
+    animal_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
+    area:highway=cycleway: Tag:area:highway=cycleway
+    area:highway=footway: Tag:area:highway=footway
+    area:highway=path: Tag:area:highway=path
+    area:highway=pedestrian: Tag:area:highway=pedestrian
+    area:highway=steps: Tag:area:highway=steps
+    area:highway=trunk: Tag:area:highway=trunk
+    area:highway=trunk_link: Tag:area:highway=trunk link
+    area:highway=turning_circle: Tag:area:highway=turning circle
+    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
+    assembly_point:landslide=yes: Tag:assembly point:landslide=yes
+    assembly_point:tornado=yes: Tag:assembly point:tornado=yes
+    assembly_point:tsunami=yes: Tag:assembly point:tsunami=yes
+    athletics=cross_country: Tag:athletics=cross country
     atm=no: Tag:atm=no
     atm=yes: Tag:atm=yes
+    attraction=alpine_coaster: Tag:attraction=alpine coaster
     attraction=animal: Tag:attraction=animal
+    attraction=boat_ride: Tag:attraction=boat ride
     attraction=maze: Tag:attraction=maze
+    attraction=roller_coaster: Tag:attraction=roller coaster
+    attraction=summer_toboggan: Tag:attraction=summer toboggan
     attraction=train: Tag:attraction=train
+    attraction=water_slide: Tag:attraction=water slide
     baby_hatch=yes: Tag:baby hatch=yes
     bakehouse: Tag:bakehouse
     baking_oven: Tag:baking oven
+    barrier=avalanche_protection: Tag:barrier=avalanche protection
+    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
@@ -5865,11 +8066,14 @@ en:
     barrier=czech_hedgehog: Tag:barrier=czech hedgehog
     barrier=debris: Tag:barrier=debris
     barrier=ditch: Tag:barrier=ditch
+    barrier=embankment: Tag:barrier=embankment
     barrier=entrance: Tag:barrier=entrance
     barrier=fence: Tag:barrier=fence
     barrier=full-height_turnstile: Tag:barrier=full-height turnstile
     barrier=gate: Tag:barrier=gate
     barrier=guard_rail: Tag:barrier=guard rail
+    barrier=ha-ha: Tag:barrier=ha-ha
+    barrier=haha: Tag:barrier=haha
     barrier=hampshire_gate: Tag:barrier=hampshire gate
     barrier=handrail: Tag:barrier=handrail
     barrier=hedge: Tag:barrier=hedge
@@ -5879,60 +8083,117 @@ en:
     barrier=horse_stile: Tag:barrier=horse stile
     barrier=jersey_barrier: Tag:barrier=jersey barrier
     barrier=kent_carriage_gap: Tag:barrier=kent carriage gap
-    barrier=kent_carriage_gate: Tag:barrier=kent carriage gate
     barrier=kerb: Tag:barrier=kerb
     barrier=kissing_gate: Tag:barrier=kissing gate
     barrier=lift_gate: Tag:barrier=lift gate
     barrier=log: Tag:barrier=log
+    barrier=lych_gate: Tag:barrier=lych gate
     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=planter: Tag:barrier=planter
     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
     barrier=tank_trap: Tag:barrier=tank trap
     barrier=toll_booth: Tag:barrier=toll booth
+    barrier=tree: Tag:barrier=tree
     barrier=turnstile: Tag:barrier=turnstile
+    barrier=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=evaporation: Tag:basin=evaporation
+    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:type=logistics: Tag:bicycle:type=logistics
     bicycle=designated: Tag:bicycle=designated
+    bicycle=dismount: Tag:bicycle=dismount
+    bicycle=no: Tag:bicycle=no
     bicycle=official: Tag:bicycle=official
+    bicycle=private: Tag:bicycle=private
     bicycle=use_sidepath: Tag:bicycle=use sidepath
+    bicycle=yes: Tag:bicycle=yes
     biosphärenwirt=yes: Tag:biosphärenwirt=yes
-    border_type=IALA: Tag:border type=IALA
-    border_type=fishery: Tag:border type=fishery
+    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
+    boat:type=kayak: Tag:boat:type=kayak
+    boat:type=motorboat: Tag:boat:type=motorboat
+    boat:type=pedalo: Tag:boat:type=pedalo
+    boat:type=rowing: Tag:boat:type=rowing
+    boat:type=sailing: Tag:boat:type=sailing
     border_type=harbour_limits: Tag:border type=harbour limits
+    boules=bocce: Tag:boules=bocce
+    boules=boule_de_fort: Tag:boules=boule de fort
+    boules=breton: Tag:boules=breton
+    boules=lyonnaise: Tag:boules=lyonnaise
+    boules=petanque: Tag:boules=petanque
+    boundary=aboriginal_lands: Tag:boundary=aboriginal lands
     boundary=administrative: Tag:boundary=administrative
+    boundary=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
     boundary=maritime: Tag:boundary=maritime
     boundary=marker: Tag:boundary=marker
     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
     bridge:movable=drawbridge: Tag:bridge:movable=drawbridge
     bridge:movable=lift: Tag:bridge:movable=lift
+    bridge:movable=retractable: Tag:bridge:movable=retractable
     bridge:movable=submersible: Tag:bridge:movable=submersible
     bridge:movable=swing: Tag:bridge:movable=swing
+    bridge:movable=tilt: Tag:bridge:movable=tilt
     bridge:movable=transporter: Tag:bridge:movable=transporter
     bridge:structure=arch: Tag:bridge:structure=arch
     bridge:structure=beam: Tag:bridge:structure=beam
@@ -5942,6 +8203,11 @@ en:
     bridge:structure=simple-suspension: Tag:bridge:structure=simple-suspension
     bridge:structure=suspension: Tag:bridge:structure=suspension
     bridge:structure=truss: Tag:bridge:structure=truss
+    bridge:support=abutment: Tag:bridge:support=abutment
+    bridge:support=lift_pier: Tag:bridge:support=lift pier
+    bridge:support=pier: Tag:bridge:support=pier
+    bridge:support=pivot_pier: Tag:bridge:support=pivot pier
+    bridge:support=pylon: Tag:bridge:support=pylon
     bridge=aqueduct: Tag:bridge=aqueduct
     bridge=boardwalk: Tag:bridge=boardwalk
     bridge=cantilever: Tag:bridge=cantilever
@@ -5952,10 +8218,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
@@ -5963,27 +8233,43 @@ 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=demountable: Tag:building=demountable
     building=detached: Tag:building=detached
+    building=digester: Tag:building=digester
+    building=disused: Tag:building=disused
     building=dormitory: Tag:building=dormitory
     building=entrance: Tag:building=entrance
     building=exit: Tag:building=exit
+    building=factory: Tag:building=factory
     building=farm: Tag:building=farm
     building=farm_auxiliary: Tag:building=farm auxiliary
+    building=fire_lookout: Tag:building=fire lookout
+    building=fire_station: Tag:building=fire station
     building=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
     building=ground_station: Tag:building=ground station
@@ -5998,48 +8284,103 @@ 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=planned: Tag:building=planned
+    building=presbytery: Tag:building=presbytery
+    building=proposed: Tag:building=proposed
     building=public: Tag:building=public
+    building=quonset_hut: Tag:building=quonset hut
+    building=religious: Tag:building=religious
     building=remote_digital_terminal: Tag:building=remote digital terminal
     building=residential: Tag:building=residential
     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=shepherd_shelter: Tag:building=shepherd shelter
+    building=ship: Tag:building=ship
     building=shrine: Tag:building=shrine
     building=slurry_tank: Tag:building=slurry tank
+    building=sports_centre: Tag:building=sports centre
+    building=sports_hall: Tag:building=sports hall
     building=stable: Tag:building=stable
     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
     building=tech_cab: Tag:building=tech cab
     building=temple: Tag:building=temple
+    building=tent: Tag:building=tent
     building=terrace: Tag:building=terrace
+    building=toilets: Tag:building=toilets
+    building=townhall: Tag:building=townhall
     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=wayside_shrine: Tag:building=wayside shrine
     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=school: Tag:bus=school
+    bus=yes: Tag:bus=yes
+    busbar=flexible: Tag:busbar=flexible
+    busbar=rigid: Tag:busbar=rigid
     busway:left=lane: Tag:busway:left=lane
     busway:right=lane: Tag:busway:right=lane
     busway=lane: Tag:busway=lane
     busway=opposite_lane: Tag:busway=opposite lane
+    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
+    camp_site=serviced: Tag:camp site=serviced
+    camp_site=standard: Tag:camp site=standard
+    camra=yes: Tag:camra=yes
+    canal=qanat: Tag:canal=qanat
+    canoe=portage: Tag:canoe=portage
+    capital=4: Tag:capital=4
+    capital=5: Tag:capital=5
+    capital=6: Tag:capital=6
+    capital=yes: Tag:capital=yes
+    car:type=hgv: Tag:car:type=hgv
+    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
@@ -6049,18 +8390,65 @@ 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
+    center_turn_lane=yes: Tag:center turn lane=yes
+    clothes=fashion: Tag:clothes=fashion
+    clothes=luxury: Tag:clothes=luxury
     clothes=motorcycle: Tag:clothes=motorcycle
     clothes=sports: Tag:clothes=sports
+    clothes=swimwear: Tag:clothes=swimwear
     clothes=underwear: Tag:clothes=underwear
+    clothes=unisex: Tag:clothes=unisex
+    clothes=wedding: Tag:clothes=wedding
+    clothes=women: Tag:clothes=women
+    clothes=women;men: Tag:clothes=women;men
+    clothes=women;men;children: Tag:clothes=women;men;children
+    club=amateur_radio: Tag:club=amateur radio
     club=automobile: Tag:club=automobile
+    club=bicycle: Tag:club=bicycle
+    club=card_games: Tag:club=card games
+    club=chess: Tag:club=chess
     club=fan: Tag:club=fan
+    club=fishing: Tag:club=fishing
+    club=freemasonry: Tag:club=freemasonry
+    club=golf: Tag:club=golf
+    club=linux: Tag:club=linux
+    club=motorcycle: Tag:club=motorcycle
+    club=music: Tag:club=music
+    club=nudism: Tag:club=nudism
+    club=sailing: Tag:club=sailing
     club=scout: Tag:club=scout
+    club=scuba_diving: Tag:club=scuba diving
+    club=social: Tag:club=social
     club=sport: Tag:club=sport
+    club=tourism: Tag:club=tourism
+    club=youth_movement: Tag:club=youth movement
     coastline:survey_quality=complete: Tag:coastline:survey quality=complete
     coastline:survey_quality=inadequate: Tag:coastline:survey quality=inadequate
+    collection_times:signed=no: Tag:collection times:signed=no
     communication=line: Tag:communication=line
+    communication=mobile_phone: Tag:communication=mobile phone
+    community_centre=club_home: Tag:community centre=club home
+    community_centre=youth_centre: Tag:community centre=youth centre
+    company=aerospace: Tag:company=aerospace
+    company=it: Tag:company=it
+    company=logistics: Tag:company=logistics
+    company=software_development: Tag:company=software development
+    construction:power=plant: Tag:construction:power=plant
+    construction=shed: Tag:construction=shed
     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
+    cooling:method=dry_cooling: Tag:cooling:method=dry cooling
+    cooling:method=mechanical_draft: Tag:cooling:method=mechanical draft
     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
     craft=beekeeper: Tag:craft=beekeeper
@@ -6070,45 +8458,65 @@ 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=cleaning: Tag:craft=cleaning
     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
     craft=electronics_repair: Tag:craft=electronics repair
+    craft=embroiderer: Tag:craft=embroiderer
     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
     craft=handicraft: Tag:craft=handicraft
     craft=hvac: Tag:craft=hvac
     craft=information_electronics: Tag:craft=information electronics
     craft=insulation: Tag:craft=insulation
+    craft=interior_work: Tag:craft=interior work
     craft=jeweller: Tag:craft=jeweller
     craft=joiner: Tag:craft=joiner
     craft=key_cutter: Tag:craft=key cutter
+    craft=lacquerer: Tag:craft=lacquerer
+    craft=lapidary: Tag:craft=lapidary
+    craft=leather: Tag:craft=leather
     craft=locksmith: Tag:craft=locksmith
+    craft=luthier: Tag:craft=luthier
     craft=metal_construction: Tag:craft=metal construction
+    craft=mint: Tag:craft=mint
+    craft=musical_instrument: Tag:craft=musical instrument
     craft=oil_mill: Tag:craft=oil mill
     craft=optician: Tag:craft=optician
     craft=organ_builder: Tag:craft=organ builder
     craft=painter: Tag:craft=painter
     craft=paperhanger: Tag:craft=paperhanger
     craft=parquet_layer: Tag:craft=parquet layer
+    craft=paver: Tag:craft=paver
     craft=photographer: Tag:craft=photographer
     craft=photographic_laboratory: Tag:craft=photographic laboratory
     craft=piano_tuner: Tag:craft=piano tuner
     craft=plasterer: Tag:craft=plasterer
     craft=plumber: Tag:craft=plumber
     craft=pottery: Tag:craft=pottery
+    craft=printer: Tag:craft=printer
+    craft=printmaker: Tag:craft=printmaker
+    craft=restoration: Tag:craft=restoration
     craft=rigger: Tag:craft=rigger
     craft=roofer: Tag:craft=roofer
     craft=saddler: Tag:craft=saddler
@@ -6118,8 +8526,10 @@ en:
     craft=sculptor: Tag:craft=sculptor
     craft=sewing: Tag:craft=sewing
     craft=shoemaker: Tag:craft=shoemaker
+    craft=signmaker: Tag:craft=signmaker
     craft=stand_builder: Tag:craft=stand builder
     craft=stonemason: Tag:craft=stonemason
+    craft=stove_fitter: Tag:craft=stove fitter
     craft=sun_protection: Tag:craft=sun protection
     craft=sweep: Tag:craft=sweep
     craft=tailor: Tag:craft=tailor
@@ -6129,15 +8539,24 @@ 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
+    crane:type=floor-mounted_crane: Tag:crane:type=floor-mounted crane
+    crane:type=gantry_crane: Tag:crane:type=gantry crane
+    crane:type=portal_crane: Tag:crane:type=portal crane
+    crane:type=tower_crane: Tag:crane:type=tower crane
+    crane:type=travel_lift: Tag:crane:type=travel lift
     crop=asparagus: Tag:crop=asparagus
     crop=aspargus: Tag:crop=aspargus
     crop=bananas: Tag:crop=bananas
     crop=barley: Tag:crop=barley
     crop=cassava: Tag:crop=cassava
+    crop=cereal: Tag:crop=cereal
     crop=coffee: Tag:crop=coffee
     crop=corn: Tag:crop=corn
+    crop=fast_growing_wood: Tag:crop=fast growing wood
     crop=flowers: Tag:crop=flowers
     crop=grape: Tag:crop=grape
     crop=grass: Tag:crop=grass
@@ -6148,50 +8567,117 @@ 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
+    crossing_ref=zebra: Tag:crossing ref=zebra
+    cuisine=barbecue: Tag:cuisine=barbecue
     cuisine=brazilian: Tag:cuisine=brazilian
     cuisine=brunch: Tag:cuisine=brunch
+    cuisine=bubble_tea: Tag:cuisine=bubble tea
+    cuisine=burger: Tag:cuisine=burger
+    cuisine=chicken: Tag:cuisine=chicken
     cuisine=coffee_shop: Tag:cuisine=coffee shop
     cuisine=dessert: Tag:cuisine=dessert
+    cuisine=donut: Tag:cuisine=donut
+    cuisine=dumplings: Tag:cuisine=dumplings
+    cuisine=empanada: Tag:cuisine=empanada
+    cuisine=fish_and_chips: Tag:cuisine=fish and chips
+    cuisine=friture: Tag:cuisine=friture
+    cuisine=hot_dog: Tag:cuisine=hot dog
+    cuisine=ice_cream: Tag:cuisine=ice cream
+    cuisine=kebab: Tag:cuisine=kebab
+    cuisine=pasta: Tag:cuisine=pasta
+    cuisine=pizza: Tag:cuisine=pizza
+    cuisine=sandwich: Tag:cuisine=sandwich
+    cuisine=seafood: Tag:cuisine=seafood
+    cuisine=soup: Tag:cuisine=soup
+    cuisine=steak_house: Tag:cuisine=steak house
+    cuisine=strudel: Tag:cuisine=strudel
+    cuisine=sushi: Tag:cuisine=sushi
+    cuisine=tea_house: Tag:cuisine=tea house
     cuisine=tea_shop: Tag:cuisine=tea shop
+    cuisine=teahouse: Tag:cuisine=teahouse
+    cuisine=waffle: Tag:cuisine=waffle
+    cuisine=wings: Tag:cuisine=wings
+    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
     cycle_network=US:NC: Tag:cycle network=US:NC
     cycle_network=US:NM: Tag:cycle network=US:NM
     cycle_network=US:NY: Tag:cycle network=US:NY
     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:both=no: Tag:cycleway:both=no
+    cycleway:both=shared_lane: Tag:cycleway:both=shared lane
     cycleway:left=lane: Tag:cycleway:left=lane
+    cycleway:left=no: Tag:cycleway:left=no
+    cycleway:left=opposite_lane: Tag:cycleway:left=opposite lane
     cycleway:left=opposite_track: Tag:cycleway:left=opposite track
+    cycleway:left=separate: Tag:cycleway:left=separate
+    cycleway:left=share_busway: Tag:cycleway:left=share busway
+    cycleway:left=shared_lane: Tag:cycleway:left=shared lane
     cycleway:left=track: Tag:cycleway:left=track
     cycleway:right=lane: Tag:cycleway:right=lane
+    cycleway:right=no: Tag:cycleway:right=no
+    cycleway:right=opposite_lane: Tag:cycleway:right=opposite lane
     cycleway:right=opposite_track: Tag:cycleway:right=opposite track
+    cycleway:right=separate: Tag:cycleway:right=separate
+    cycleway:right=share_busway: Tag:cycleway:right=share busway
+    cycleway:right=shared_lane: Tag:cycleway:right=shared lane
     cycleway:right=track: Tag:cycleway:right=track
     cycleway=asl: Tag:cycleway=asl
     cycleway=bike_box: Tag:cycleway=bike box
     cycleway=crossing: Tag:cycleway=crossing
     cycleway=lane: Tag:cycleway=lane
+    cycleway=no: Tag:cycleway=no
     cycleway=opposite: Tag:cycleway=opposite
     cycleway=opposite_lane: Tag:cycleway=opposite lane
     cycleway=opposite_share_busway: Tag:cycleway=opposite share busway
     cycleway=opposite_shared_busway: Tag:cycleway=opposite shared busway
     cycleway=opposite_track: Tag:cycleway=opposite track
+    cycleway=separate: Tag:cycleway=separate
     cycleway=share_busway: Tag:cycleway=share busway
     cycleway=shared_busway: Tag:cycleway=shared busway
+    cycleway=shared_lane: Tag:cycleway=shared lane
     cycleway=sidepath: Tag:cycleway=sidepath
     cycleway=track: Tag:cycleway=track
+    dataset=buildings: Tag:dataset=buildings
     defensive=bergfried: Tag:defensive=bergfried
     defensive=donjon: Tag:defensive=donjon
     defensive=keep: Tag:defensive=keep
+    delivery=shipment: Tag:delivery=shipment
+    demolished=yes: Tag:demolished=yes
     dennert_fir_tree=yes: Tag:dennert fir tree=yes
+    denomination=la_luz_del_mundo: Tag:denomination=la luz del mundo
     denomination=mormon: Tag:denomination=mormon
     denomination=reformed: Tag:denomination=reformed
     denotation=cluster: Tag:denotation=cluster
+    designation=byway_open_to_all_traffic: Tag:designation=byway open to all traffic
+    designation=common: Tag:designation=common
+    destroyed=yes: Tag:destroyed=yes
+    diet:kosher=only: Tag:diet:kosher=only
+    diet:kosher=yes: Tag:diet:kosher=yes
     diplomatic=ambassadors_residence: Tag:diplomatic=ambassadors residence
     diplomatic=consulate: Tag:diplomatic=consulate
     diplomatic=consulate_general: Tag:diplomatic=consulate general
@@ -6199,10 +8685,39 @@ en:
     diplomatic=embassy: Tag:diplomatic=embassy
     diplomatic=high_commission: Tag:diplomatic=high commission
     diplomatic=honorary_consulate: Tag:diplomatic=honorary consulate
+    diplomatic=liaison: Tag:diplomatic=liaison
     diplomatic=permanent_mission: Tag:diplomatic=permanent mission
+    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
+    dog=leashed: Tag:dog=leashed
+    dog=no: Tag:dog=no
+    dog=unleashed: Tag:dog=unleashed
+    dog=yes: Tag:dog=yes
+    driveway=pipestem: Tag:driveway=pipestem
+    dual_carriageway=no: Tag:dual carriageway=no
+    dual_carriageway=yes: Tag:dual carriageway=yes
+    education=centre: Tag:education=centre
+    education=exercise_area: Tag:education=exercise area
+    education=school: Tag:education=school
+    electrified=4th_rail: Tag:electrified=4th rail
+    electrified=contact_line: Tag:electrified=contact line
+    electrified=rail: Tag:electrified=rail
+    embassy=branch_embassy: Tag:embassy=branch embassy
+    embassy=delegation: Tag:embassy=delegation
+    embassy=high_commission: Tag:embassy=high commission
+    embassy=interests_section: Tag:embassy=interests section
+    embassy=mission: Tag:embassy=mission
+    embassy=nunciature: Tag:embassy=nunciature
+    embassy=residence: Tag:embassy=residence
+    embassy=yes: Tag:embassy=yes
+    emergency: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
@@ -6210,24 +8725,40 @@ en:
     emergency=coast_guard: Tag:emergency=coast guard
     emergency=defibrilator: Tag:emergency=defibrilator
     emergency=defibrillator: Tag:emergency=defibrillator
+    emergency=designated: Tag:emergency=designated
+    emergency=disaster_response: Tag:emergency=disaster response
+    emergency=drinking_water: Tag:emergency=drinking water
     emergency=dry_riser: Tag:emergency=dry riser
     emergency=dry_riser_inlet: Tag:emergency=dry riser inlet
     emergency=emergency_ward_entrance: Tag:emergency=emergency ward entrance
+    emergency=fire_alarm_box: Tag:emergency=fire alarm box
+    emergency=fire_equipment: Tag:emergency=fire equipment
     emergency=fire_extinguisher: Tag:emergency=fire extinguisher
     emergency=fire_flapper: Tag:emergency=fire flapper
     emergency=fire_hose: Tag:emergency=fire hose
     emergency=fire_hydrant: Tag:emergency=fire hydrant
+    emergency=fire_lookout: Tag:emergency=fire lookout
+    emergency=fire_point_stand: Tag:emergency=fire point stand
+    emergency=fire_sand_bin: Tag:emergency=fire sand bin
+    emergency=fire_station: Tag:emergency=fire station
     emergency=fire_water_pond: Tag:emergency=fire water pond
+    emergency=first_aid: Tag:emergency=first aid
+    emergency=first_aid_kit: Tag:emergency=first aid kit
     emergency=landing_site: Tag:emergency=landing site
     emergency=life_ring: Tag:emergency=life ring
     emergency=lifeboat_station: Tag:emergency=lifeboat station
+    emergency=lifeguard: Tag:emergency=lifeguard
     emergency=lifeguard_base: Tag:emergency=lifeguard base
     emergency=lifeguard_place: Tag:emergency=lifeguard place
     emergency=lifeguard_platform: Tag:emergency=lifeguard platform
     emergency=lifeguard_tower: Tag:emergency=lifeguard tower
     emergency=marine_refuge: Tag:emergency=marine refuge
+    emergency=marine_rescue: Tag:emergency=marine rescue
+    emergency=mountain_rescue: Tag:emergency=mountain rescue
     emergency=phone: Tag:emergency=phone
+    emergency=rescue_box: Tag:emergency=rescue box
     emergency=ses_station: Tag:emergency=ses station
+    emergency=shower: Tag:emergency=shower
     emergency=siamese: Tag:emergency=siamese
     emergency=siren: Tag:emergency=siren
     emergency=slipway: Tag:emergency=slipway
@@ -6238,23 +8769,73 @@ en:
     emergency=water_rescue_station: Tag:emergency=water rescue station
     emergency=water_tank: Tag:emergency=water tank
     emergency=wet_riser: Tag:emergency=wet riser
+    emergency=yes: Tag:emergency=yes
     emergency_service=technical: Tag:emergency service=technical
+    entrance=garage: Tag:entrance=garage
+    entrance=gate: Tag:entrance=gate
     entrance=main: Tag:entrance=main
+    entrance=main_entrance: Tag:entrance=main entrance
+    entrance=secondary: Tag:entrance=secondary
     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
+    farmland=arable: Tag:farmland=arable
+    farmland=pasture: Tag:farmland=pasture
+    farmyard=stockyard: Tag:farmyard=stockyard
     fast_food=cafeteria: Tag:fast food=cafeteria
-    food=gourmet: Tag:food=gourmet
+    fire_hydrant:type=pillar: Tag:fire hydrant:type=pillar
+    fire_hydrant:type=pipe: Tag:fire hydrant:type=pipe
+    fire_hydrant:type=underground: Tag:fire hydrant:type=underground
+    fire_hydrant:type=wall: Tag:fire hydrant:type=wall
+    fixme=Position_estimated: Tag:fixme=Position estimated
+    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
+    floating=yes: Tag:floating=yes
+    flood_mark=painting: Tag:flood mark=painting
+    flood_mark=plaque: Tag:flood mark=plaque
+    floor:material=wood: Tag:floor:material=wood
+    flow_direction=both: Tag:flow direction=both
     foot=designated: Tag:foot=designated
+    foot=no: Tag:foot=no
     foot=official: Tag:foot=official
+    foot=private: Tag:foot=private
+    foot=use_sidepath: Tag:foot=use sidepath
+    foot=yes: Tag:foot=yes
+    footway=access_aisle: Tag:footway=access aisle
+    footway=alley: Tag:footway=alley
+    footway=both: Tag:footway=both
     footway=crossing: Tag:footway=crossing
+    footway=left: Tag:footway=left
+    footway=none: Tag:footway=none
+    footway=right: Tag:footway=right
     footway=sidewalk: Tag:footway=sidewalk
+    footway=traffic_island: Tag:footway=traffic island
+    footway=yes: Tag:footway=yes
+    ford=boat: Tag:ford=boat
+    ford=stepping_stones: Tag:ford=stepping stones
+    ford=yes: Tag:ford=yes
     fortification_type=hill_fort: Tag:fortification type=hill fort
     fortification_type=limes: Tag:fortification type=limes
     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
+    fountain=stone_block: Tag:fountain=stone block
+    fountain=toret: Tag:fountain=toret
     garden:type=botanical: Tag:garden:type=botanical
     generator:method=anaerobic_digestion: Tag:generator:method=anaerobic digestion
     generator:method=barrage: Tag:generator:method=barrage
@@ -6271,10 +8852,12 @@ 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
     generator:source=coal: Tag:generator:source=coal
+    generator:source=diesel: Tag:generator:source=diesel
     generator:source=gas: Tag:generator:source=gas
     generator:source=gasoline: Tag:generator:source=gasoline
     generator:source=geothermal: Tag:generator:source=geothermal
@@ -6304,27 +8887,54 @@ en:
     generator:type=steam_turbine: Tag:generator:type=steam turbine
     generator:type=vertical_axis: Tag:generator:type=vertical axis
     generator:type=zuppinger_water_wheel: Tag:generator:type=zuppinger water wheel
+    geological=fault: Tag:geological=fault
     geological=moraine: Tag:geological=moraine
     geological=outcrop: Tag:geological=outcrop
     geological=palaeontological_site: Tag:geological=palaeontological site
+    geological=volcanic_caldera_rim: Tag:geological=volcanic caldera rim
+    geological=volcanic_lava_field: Tag:geological=volcanic lava field
+    geological=volcanic_vent: Tag:geological=volcanic vent
+    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=bailiff: Tag:government=bailiff
+    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=it: Tag:government=it
+    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
     government=tax: Tag:government=tax
+    government=youth_welfare_department: Tag:government=youth welfare department
+    grass=amenity_grassland: Tag:grass=amenity grassland
     grit_bin: Tag:grit bin
     guidepost=simple: Tag:guidepost=simple
+    handle=crank: Tag:handle=crank
+    handle=lever: Tag:handle=lever
+    handle=wheel: Tag:handle=wheel
     harbour:category=RoRo: Tag:harbour:category=RoRo
     harbour:category=bulk: Tag:harbour:category=bulk
     harbour:category=container: Tag:harbour:category=container
@@ -6342,13 +8952,80 @@ 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=archery_range: Tag:hazard=archery range
+    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=leeches: Tag:hazard=leeches
+    hazard=loose_gravel: Tag:hazard=loose gravel
+    hazard=low_flying_aircraft: Tag:hazard=low flying aircraft
+    hazard=minefield: Tag:hazard=minefield
+    hazard=nuclear: Tag:hazard=nuclear
+    hazard=pedestrians: Tag:hazard=pedestrians
+    hazard=queues_likely: Tag:hazard=queues likely
+    hazard=quicksand: Tag:hazard=quicksand
+    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=maxillofacial_surgery: Tag:healthcare:speciality=maxillofacial
+      surgery
+    healthcare:speciality=orthodontics: Tag:healthcare:speciality=orthodontics
+    healthcare:speciality=otolaryngology: Tag:healthcare:speciality=otolaryngology
+    healthcare:speciality=psychiatry: Tag:healthcare:speciality=psychiatry
+    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=sample_collection: Tag:healthcare=sample collection
+    healthcare=speech_therapist: Tag:healthcare=speech therapist
+    healthcare=vaccination_centre: Tag:healthcare=vaccination centre
+    healthcare=yes: Tag:healthcare=yes
+    hgv=discouraged: Tag:hgv=discouraged
+    hgv=yes: Tag:hgv=yes
     highway=Bus_guideway: Tag:highway=Bus guideway
     highway=abandoned: Tag:highway=abandoned
     highway=access: Tag:highway=access
@@ -6356,11 +9033,14 @@ en:
     highway=bridleway: Tag:highway=bridleway
     highway=bus_guideway: Tag:highway=bus guideway
     highway=bus_stop: Tag:highway=bus stop
+    highway=busway: Tag:highway=busway
     highway=byway: Tag:highway=byway
     highway=cattle_grid: Tag:highway=cattle grid
+    highway=construction: Tag:highway=construction
     highway=corridor: Tag:highway=corridor
     highway=crossing: Tag:highway=crossing
     highway=cycleway: Tag:highway=cycleway
+    highway=cycleway_link: Tag:highway=cycleway link
     highway=disused: Tag:highway=disused
     highway=elevator: Tag:highway=elevator
     highway=emergency_access_point: Tag:highway=emergency access point
@@ -6370,6 +9050,7 @@ en:
     highway=ford: Tag:highway=ford
     highway=gate: Tag:highway=gate
     highway=give_way: Tag:highway=give way
+    highway=green_lane: Tag:highway=green lane
     highway=incline: Tag:highway=incline
     highway=incline_steep: Tag:highway=incline steep
     highway=living_street: Tag:highway=living street
@@ -6387,6 +9068,7 @@ en:
     highway=planned: Tag:highway=planned
     highway=platform: Tag:highway=platform
     highway=primary: Tag:highway=primary
+    highway=primary_link: Tag:highway=primary link
     highway=proposed: Tag:highway=proposed
     highway=raceway: Tag:highway=raceway
     highway=razed: Tag:highway=razed
@@ -6394,20 +9076,27 @@ en:
     highway=rest_area: Tag:highway=rest area
     highway=road: Tag:highway=road
     highway=secondary: Tag:highway=secondary
+    highway=secondary_link: Tag:highway=secondary link
     highway=service: Tag:highway=service
     highway=services: Tag:highway=services
+    highway=skyway: Tag:highway=skyway
     highway=speed_camera: Tag:highway=speed camera
     highway=speed_display: Tag:highway=speed display
     highway=steps: Tag:highway=steps
     highway=stile: Tag:highway=stile
     highway=stop: Tag:highway=stop
+    highway=street: Tag:highway=street
     highway=street_lamp: Tag:highway=street lamp
     highway=tertiary: Tag:highway=tertiary
+    highway=tertiary_link: Tag:highway=tertiary link
     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
     highway=trail: Tag:highway=trail
+    highway=trailhead: Tag:highway=trailhead
     highway=trunk: Tag:highway=trunk
     highway=trunk_link: Tag:highway=trunk link
     highway=turning_circle: Tag:highway=turning circle
@@ -6424,61 +9113,100 @@ 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
+    historic=cemetery: Tag:historic=cemetery
     historic=charcoal_pile: Tag:historic=charcoal pile
+    historic=church: Tag:historic=church
     historic=city_gate: Tag:historic=city gate
     historic=city_wall: Tag:historic=city wall
     historic=citywalls: Tag:historic=citywalls
+    historic=district: Tag:historic=district
     historic=event: Tag:historic=event
     historic=farm: Tag:historic=farm
+    historic=flood_mark: Tag:historic=flood mark
     historic=fort: Tag:historic=fort
     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
     historic=milestone: Tag:historic=milestone
     historic=mine: Tag:historic=mine
+    historic=mine_shaft: Tag:historic=mine shaft
     historic=monastery: Tag:historic=monastery
     historic=monument: Tag:historic=monument
+    historic=ogham_stone: Tag:historic=ogham stone
     historic=optical_telegraph: Tag:historic=optical telegraph
     historic=pa: Tag:historic=pa
     historic=paleontological_site: Tag:historic=paleontological site
     historic=pillory: Tag:historic=pillory
     historic=railway_car: Tag:historic=railway car
+    historic=rampart: Tag:historic=rampart
     historic=ruins: Tag:historic=ruins
     historic=rune_stone: Tag:historic=rune stone
     historic=shieling: Tag:historic=shieling
     historic=ship: Tag:historic=ship
     historic=stone: Tag:historic=stone
+    historic=tank: Tag:historic=tank
     historic=tomb: Tag:historic=tomb
+    historic=tower: Tag:historic=tower
     historic=tree_shrine: Tag:historic=tree shrine
+    historic=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
+    horse=dismount: Tag:horse=dismount
+    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
+    hov=yes: Tag:hov=yes
     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
+    indoor=yes: Tag:indoor=yes
     indoormark=beacon: Tag:indoormark=beacon
     industrial=aluminium_smelting: Tag:industrial=aluminium smelting
     industrial=auto_wrecker: Tag:industrial=auto wrecker
     industrial=bakery: Tag:industrial=bakery
     industrial=brewery: Tag:industrial=brewery
     industrial=brickyard: Tag:industrial=brickyard
+    industrial=communication: Tag:industrial=communication
     industrial=depot: Tag:industrial=depot
     industrial=distributor: Tag:industrial=distributor
     industrial=factory: Tag:industrial=factory
+    industrial=fish_farm: Tag:industrial=fish farm
+    industrial=food_industry: Tag:industrial=food industry
+    industrial=food_processing: Tag:industrial=food processing
     industrial=furniture: Tag:industrial=furniture
     industrial=grinding_mill: Tag:industrial=grinding mill
     industrial=heating_station: Tag:industrial=heating station
     industrial=ice_factory: Tag:industrial=ice factory
+    industrial=integrated_circuit: Tag:industrial=integrated circuit
     industrial=machine_shop: Tag:industrial=machine shop
     industrial=mine: Tag:industrial=mine
     industrial=mobile_equipment: Tag:industrial=mobile equipment
     industrial=oil: Tag:industrial=oil
     industrial=oil_mill: Tag:industrial=oil mill
     industrial=port: Tag:industrial=port
+    industrial=rice_mill: Tag:industrial=rice mill
     industrial=salt_pond: Tag:industrial=salt pond
     industrial=sawmill: Tag:industrial=sawmill
     industrial=scrap_yard: Tag:industrial=scrap yard
@@ -6487,26 +9215,49 @@ 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
+    internet_access=wired: Tag:internet access=wired
     internet_access=wlan: Tag:internet access=wlan
+    internet_access=yes: Tag:internet access=yes
+    irrigation=pivot: Tag:irrigation=pivot
+    irrigation=yes: Tag:irrigation=yes
+    jetski:rental=yes: Tag:jetski:rental=yes
     junction=circular: Tag:junction=circular
     junction=crossing: Tag:junction=crossing
     junction=filter: Tag:junction=filter
     junction=jughandle: Tag:junction=jughandle
     junction=roundabout: Tag:junction=roundabout
+    junction=spui: Tag:junction=spui
     junction=yes: Tag:junction=yes
+    karst=yes: Tag:karst=yes
+    landcover=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
@@ -6518,7 +9269,6 @@ en:
     landmark=large_rock: Tag:landmark=large rock
     landmark=mast: Tag:landmark=mast
     landmark=memorial_plaque: Tag:landmark=memorial plaque
-    landmark=monument: Tag:landmark=monument
     landmark=obelisk: Tag:landmark=obelisk
     landmark=pillar: Tag:landmark=pillar
     landmark=radar_scanner: Tag:landmark=radar scanner
@@ -6531,6 +9281,7 @@ en:
     landmark=windsock: Tag:landmark=windsock
     landuse=agriculture: Tag:landuse=agriculture
     landuse=allotments: Tag:landuse=allotments
+    landuse=animal_keeping: Tag:landuse=animal keeping
     landuse=apiary: Tag:landuse=apiary
     landuse=aquaculture: Tag:landuse=aquaculture
     landuse=basin: Tag:landuse=basin
@@ -6539,9 +9290,12 @@ en:
     landuse=building_site: Tag:landuse=building site
     landuse=cemetery: Tag:landuse=cemetery
     landuse=churchyard: Tag:landuse=churchyard
+    landuse=civic_admin: Tag:landuse=civic admin
     landuse=commercial: Tag:landuse=commercial
+    landuse=conservation: Tag:landuse=conservation
     landuse=construction: Tag:landuse=construction
     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
@@ -6549,18 +9303,23 @@ en:
     landuse=fishfarm: Tag:landuse=fishfarm
     landuse=flowerbed: Tag:landuse=flowerbed
     landuse=forest: Tag:landuse=forest
+    landuse=forestry: Tag:landuse=forestry
     landuse=garages: Tag:landuse=garages
     landuse=grass: Tag:landuse=grass
     landuse=grave_yard: Tag:landuse=grave yard
+    landuse=greenery: Tag:landuse=greenery
     landuse=greenfield: Tag:landuse=greenfield
     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=house: Tag:landuse=house
     landuse=industrial: Tag:landuse=industrial
     landuse=institutional: Tag:landuse=institutional
     landuse=landfill: Tag:landuse=landfill
+    landuse=livestock: Tag:landuse=livestock
     landuse=logging: Tag:landuse=logging
     landuse=meadow: Tag:landuse=meadow
+    landuse=meadow_orchard: Tag:landuse=meadow orchard
     landuse=military: Tag:landuse=military
     landuse=observatory: Tag:landuse=observatory
     landuse=orchard: Tag:landuse=orchard
@@ -6574,24 +9333,30 @@ 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
+    landuse=school: Tag:landuse=school
+    landuse=shrubs: Tag:landuse=shrubs
     landuse=street: Tag:landuse=street
     landuse=traffic_island: Tag:landuse=traffic island
     landuse=trees: Tag:landuse=trees
     landuse=turbary: Tag:landuse=turbary
-    landuse=utility: Tag:landuse=utility
     landuse=village_green: Tag:landuse=village green
     landuse=vineyard: Tag:landuse=vineyard
     landuse=well: Tag:landuse=well
     landuse=wellsite: Tag:landuse=wellsite
+    landuse=wholesale: Tag:landuse=wholesale
     landuse=winter_sport: Tag:landuse=winter sport
     landuse=winter_sports: Tag:landuse=winter sports
     landuse=wood: Tag:landuse=wood
     landuse=wood_(Don't_use): Tag:landuse=wood (Don't use)
+    landuse=yes: Tag:landuse=yes
     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
@@ -6606,10 +9371,12 @@ 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
     leisure=beach_resort: Tag:leisure=beach resort
+    leisure=bingo_hall: Tag:leisure=bingo hall
     leisure=bird_hide: Tag:leisure=bird hide
     leisure=bleachers: Tag:leisure=bleachers
     leisure=bowling_alley: Tag:leisure=bowling alley
@@ -6632,7 +9399,9 @@ en:
     leisure=hackerspace: Tag:leisure=hackerspace
     leisure=horse_riding: Tag:leisure=horse riding
     leisure=hot_spring: Tag:leisure=hot spring
+    leisure=hot_tub: Tag:leisure=hot tub
     leisure=ice_rink: Tag:leisure=ice rink
+    leisure=indoor_play: Tag:leisure=indoor play
     leisure=landscape_reserve: Tag:leisure=landscape reserve
     leisure=marina: Tag:leisure=marina
     leisure=miniature_golf: Tag:leisure=miniature golf
@@ -6645,19 +9414,23 @@ en:
     leisure=picnic_table: Tag:leisure=picnic table
     leisure=pitch: Tag:leisure=pitch
     leisure=playground: Tag:leisure=playground
+    leisure=practice_pitch: Tag:leisure=practice pitch
     leisure=recreation_ground: Tag:leisure=recreation ground
     leisure=red_light_district: Tag:leisure=red light district
     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
     leisure=soccer_golf: Tag:leisure=soccer golf
     leisure=social_club: Tag:leisure=social club
     leisure=sports_centre: Tag:leisure=sports centre
+    leisure=sports_hall: Tag:leisure=sports hall
     leisure=stadium: Tag:leisure=stadium
     leisure=summer_camp: Tag:leisure=summer camp
+    leisure=sunbathing: Tag:leisure=sunbathing
     leisure=swimming_area: Tag:leisure=swimming area
     leisure=swimming_pool: Tag:leisure=swimming pool
     leisure=table_tennis_table: Tag:leisure=table tennis table
@@ -6666,38 +9439,75 @@ 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
     level_crossing=traffic_signals: Tag:level crossing=traffic signals
     level_crossing=uncontrolled: Tag:level crossing=uncontrolled
+    liaison=liaison_office: Tag:liaison=liaison office
+    liaison=representative_office: Tag:liaison=representative office
+    liaison=subnational: Tag:liaison=subnational
+    lifeguard=base: Tag:lifeguard=base
+    lifeguard=tower: Tag:lifeguard=tower
     line=bay: Tag:line=bay
     line=busbar: Tag:line=busbar
+    line=substation: Tag:line=substation
+    line_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
+    localizer=yes: Tag:localizer=yes
     location:transition=yes: Tag:location:transition=yes
+    location=indoor: Tag:location=indoor
+    location=outdoor: Tag:location=outdoor
+    location=overground: Tag:location=overground
+    location=overhead: Tag:location=overhead
+    location=underground: Tag:location=underground
+    location=underwater: Tag:location=underwater
+    lottery=yes: Tag:lottery=yes
     maintenance=gritting: Tag:maintenance=gritting
     man_made=MDF: Tag:man made=MDF
     man_made=adit: Tag:man made=adit
+    man_made=animal_trap: Tag:man made=animal trap
     man_made=antenna: Tag:man made=antenna
     man_made=archimedes_screw: Tag:man made=archimedes screw
+    man_made=architecture_line: Tag:man made=architecture line
+    man_made=avalanche_protection: Tag:man made=avalanche protection
     man_made=beacon: Tag:man made=beacon
     man_made=beehive: Tag:man made=beehive
+    man_made=bioreactor: Tag:man made=bioreactor
     man_made=breakwater: Tag:man made=breakwater
     man_made=bridge: Tag:man made=bridge
     man_made=bunker_silo: Tag:man made=bunker silo
     man_made=cairn: Tag:man made=cairn
     man_made=campanile: Tag:man made=campanile
+    man_made=carpet_hanger: Tag:man made=carpet hanger
+    man_made=cellar_entrance: Tag:man made=cellar entrance
+    man_made=chiller: Tag:man made=chiller
     man_made=chimney: Tag:man made=chimney
     man_made=clearcut: Tag:man made=clearcut
     man_made=communications_tower: Tag:man made=communications tower
     man_made=compass_rose: Tag:man made=compass rose
+    man_made=cooling: Tag:man made=cooling
     man_made=cooling_tower: Tag:man made=cooling tower
+    man_made=courtyard: Tag:man made=courtyard
     man_made=crane: Tag:man made=crane
+    man_made=cricket_nets: Tag:man made=cricket nets
     man_made=cross: Tag:man made=cross
     man_made=cut_line: Tag:man made=cut line
     man_made=cutline: Tag:man made=cutline
+    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
@@ -6707,56 +9517,82 @@ en:
     man_made=flagpole: Tag:man made=flagpole
     man_made=flare: Tag:man made=flare
     man_made=floating_storage: Tag:man made=floating storage
+    man_made=footwear_decontamination: Tag:man made=footwear decontamination
     man_made=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=ground_station: Tag:man made=ground station
+    man_made=graduation_tower: Tag:man made=graduation tower
     man_made=groyne: Tag:man made=groyne
+    man_made=guard_stone: Tag:man made=guard stone
     man_made=guy: Tag:man made=guy
+    man_made=guy_wire: Tag:man made=guy wire
+    man_made=heap: Tag:man made=heap
     man_made=hot_water_tank: Tag:man made=hot water tank
+    man_made=hunting_stand: Tag:man made=hunting stand
+    man_made=ice_house: Tag:man made=ice house
     man_made=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
     man_made=mast: Tag:man made=mast
+    man_made=maypole: Tag:man made=maypole
     man_made=measurement_station: Tag:man made=measurement station
     man_made=mineshaft: Tag:man made=mineshaft
     man_made=monitoring_station: Tag:man made=monitoring station
+    man_made=mounting_block: Tag:man made=mounting block
     man_made=nesting_site: Tag:man made=nesting site
     man_made=obelisk: Tag:man made=obelisk
     man_made=observatory: Tag:man made=observatory
     man_made=offshore_platform: Tag:man made=offshore platform
     man_made=oil_well: Tag:man made=oil well
+    man_made=outfall: Tag:man made=outfall
     man_made=petroleum_well: Tag:man made=petroleum well
     man_made=pier: Tag:man made=pier
     man_made=pillar: Tag:man made=pillar
     man_made=pipeline: Tag:man made=pipeline
-    man_made=power_fossil: Tag:man made=power fossil
+    man_made=planter: Tag:man made=planter
     man_made=power_hydro: Tag:man made=power hydro
     man_made=power_nuclear: Tag:man made=power nuclear
     man_made=power_wind: Tag:man made=power wind
+    man_made=pump: Tag:man made=pump
     man_made=pumping_rig: Tag:man made=pumping rig
     man_made=pumping_station: Tag:man made=pumping station
+    man_made=qanat: Tag:man made=qanat
     man_made=quay: Tag:man made=quay
     man_made=reservoir_covered: Tag:man made=reservoir covered
+    man_made=satellite_dish: Tag:man made=satellite dish
     man_made=school_sentry: Tag:man made=school sentry
     man_made=septic_tank: Tag:man made=septic tank
+    man_made=sewage: Tag:man made=sewage
     man_made=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=stupa: Tag:man made=stupa
     man_made=submarine_cable: Tag:man made=submarine cable
+    man_made=summit_cross: Tag:man made=summit cross
     man_made=surveillance: Tag:man made=surveillance
     man_made=survey_point: Tag:man made=survey point
+    man_made=tailings_pond: Tag:man made=tailings pond
     man_made=telescope: Tag:man made=telescope
     man_made=tell: Tag:man made=tell
+    man_made=threshing_floor: Tag:man made=threshing floor
+    man_made=tomb: Tag:man made=tomb
     man_made=tower: Tag:man made=tower
+    man_made=tunnel: Tag:man made=tunnel
     man_made=utility_pole: Tag:man made=utility pole
+    man_made=wastewater_basin: Tag:man made=wastewater basin
     man_made=wastewater_plant: Tag:man made=wastewater plant
     man_made=water_tank: Tag:man made=water tank
     man_made=water_tap: Tag:man made=water tap
@@ -6772,9 +9608,23 @@ 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
+    mechanical_driver=combustion_engine: Tag:mechanical driver=combustion engine
+    mechanical_driver=electric_motor: Tag:mechanical driver=electric motor
+    mechanical_driver=manual: Tag:mechanical driver=manual
+    mechanical_driver=reciprocating_solenoid: Tag:mechanical driver=reciprocating
+      solenoid
     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
@@ -6795,21 +9645,29 @@ en:
     memorial:type=stolperstein: Tag:memorial:type=stolperstein
     memorial=blue_plaque: Tag:memorial=blue plaque
     memorial=bust: Tag:memorial=bust
+    memorial=cenotaph: Tag:memorial=cenotaph
+    memorial=cross: Tag:memorial=cross
+    memorial=ghost_bike: Tag:memorial=ghost bike
     memorial=obelisk: Tag:memorial=obelisk
     memorial=plaque: Tag:memorial=plaque
+    memorial=sculpture: Tag:memorial=sculpture
     memorial=statue: Tag:memorial=statue
     memorial=stele: Tag:memorial=stele
     memorial=stolperstein: Tag:memorial=stolperstein
     memorial=stone: Tag:memorial=stone
+    memorial=storm_surge_post: Tag:memorial=storm surge post
+    memorial=vehicle: Tag:memorial=vehicle
     memorial=war_memorial: Tag:memorial=war memorial
     microbrewery=yes: Tag:microbrewery=yes
     military=airfield: Tag:military=airfield
     military=ammunition: Tag:military=ammunition
     military=barracks: Tag:military=barracks
+    military=base: Tag:military=base
     military=bunker: Tag:military=bunker
     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
@@ -6817,6 +9675,11 @@ en:
     military=range: Tag:military=range
     military=training_area: Tag:military=training area
     military=trench: Tag:military=trench
+    military_service=air_force: Tag:military service=air force
+    military_service=army: Tag:military service=army
+    military_service=marines: Tag:military service=marines
+    military_service=navy: Tag:military service=navy
+    mofa=use_sidepath: Tag:mofa=use sidepath
     mooring=commercial: Tag:mooring=commercial
     mooring=cruise: Tag:mooring=cruise
     mooring=declaration: Tag:mooring=declaration
@@ -6827,9 +9690,27 @@ 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
-    motorcycle_friendly: Tag:motorcycle friendly
+    motorcycle=no: Tag:motorcycle=no
+    motorcycle=yes: Tag:motorcycle=yes
+    motorroad=no: Tag:motorroad=no
+    mountain_pass=yes: Tag:mountain pass=yes
+    museum=aerospace: Tag:museum=aerospace
+    museum=archaeological: Tag:museum=archaeological
+    museum=art: Tag:museum=art
+    museum=children: Tag:museum=children
+    museum=history: Tag:museum=history
+    museum=living_history: Tag:museum=living history
+    museum=local: Tag:museum=local
+    museum=military: Tag:museum=military
+    museum=nature: Tag:museum=nature
+    museum=open_air: Tag:museum=open air
+    museum=railway: Tag:museum=railway
+    museum=technology: Tag:museum=technology
+    museum=transport: Tag:museum=transport
+    name:signed=no: Tag:name:signed=no
     name=7-Eleven: Tag:name=7-Eleven
     name=BMO: Tag:name=BMO
     name=BMO_Bank_of_Montreal: Tag:name=BMO Bank of Montreal
@@ -6839,27 +9720,37 @@ en:
     name=Costco: Tag:name=Costco
     name=Dollarama: Tag:name=Dollarama
     name=Domino's_Pizza: Tag:name=Domino's Pizza
+    name=Herfy: Tag:name=Herfy
+    name=Jollibee: Tag:name=Jollibee
     name=KFC: Tag:name=KFC
     name=McDonald's: Tag:name=McDonald's
+    name=NHS: Tag:name=NHS
     name=Subway: Tag:name=Subway
     name=The_Church_of_Jesus_Christ_of_Latter-day_Saints: Tag:name=The Church of Jesus
       Christ of Latter-day Saints
+    name=Tim_Hortons: Tag:name=Tim Hortons
     name=Walmart: Tag:name=Walmart
+    name=Wendy's: Tag:name=Wendy's
+    name=Продукты: Tag:name=Продукты
+    naptan:verified=no: Tag:naptan:verified=no
     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
     natural=bare_rock: Tag:natural=bare rock
     natural=bay: Tag:natural=bay
     natural=beach: Tag:natural=beach
     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=continental_shelf: Tag:natural=continental shelf
+    natural=col: Tag:natural=col
+    natural=couloir: Tag:natural=couloir
     natural=crater: Tag:natural=crater
     natural=crevasse: Tag:natural=crevasse
     natural=desert: Tag:natural=desert
@@ -6873,11 +9764,14 @@ en:
     natural=geothermal_field: Tag:natural=geothermal field
     natural=geyser: Tag:natural=geyser
     natural=glacier: Tag:natural=glacier
+    natural=gorge: Tag:natural=gorge
+    natural=grass: Tag:natural=grass
     natural=grassland: Tag:natural=grassland
     natural=gully: Tag:natural=gully
     natural=heath: Tag:natural=heath
-    natural=herb: Tag:natural=herb
+    natural=hill: Tag:natural=hill
     natural=hot_spring: Tag:natural=hot spring
+    natural=isthmus: Tag:natural=isthmus
     natural=lake: Tag:natural=lake
     natural=land: Tag:natural=land
     natural=landform: Tag:natural=landform
@@ -6887,14 +9781,17 @@ en:
     natural=meadow: Tag:natural=meadow
     natural=moor: Tag:natural=moor
     natural=moraine: Tag:natural=moraine
-    natural=moss: Tag:natural=moss
+    natural=mountain_range: Tag:natural=mountain range
     natural=mud: Tag:natural=mud
     natural=naled: Tag:natural=naled
     natural=palaeontological_site: Tag:natural=palaeontological site
     natural=peak: Tag:natural=peak
+    natural=peninsula: Tag:natural=peninsula
     natural=plant: Tag:natural=plant
+    natural=plateau: Tag:natural=plateau
     natural=reef: Tag:natural=reef
     natural=ridge: Tag:natural=ridge
+    natural=riverbank: Tag:natural=riverbank
     natural=riverbed: Tag:natural=riverbed
     natural=rock: Tag:natural=rock
     natural=rocks: Tag:natural=rocks
@@ -6905,6 +9802,7 @@ en:
     natural=shingle: Tag:natural=shingle
     natural=shoal: Tag:natural=shoal
     natural=shrub: Tag:natural=shrub
+    natural=shrubbery: Tag:natural=shrubbery
     natural=sinkhole: Tag:natural=sinkhole
     natural=spring: Tag:natural=spring
     natural=stone: Tag:natural=stone
@@ -6912,6 +9810,7 @@ en:
     natural=termite_mound: Tag:natural=termite mound
     natural=tree: Tag:natural=tree
     natural=tree_row: Tag:natural=tree row
+    natural=tree_stump: Tag:natural=tree stump
     natural=tundra: Tag:natural=tundra
     natural=valley: Tag:natural=valley
     natural=volcano: Tag:natural=volcano
@@ -6919,10 +9818,22 @@ 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:type=node_network: Tag:network:type=node network
     network=BR: Tag:network=BR
     network=BR:ES: Tag:network=BR:ES
     network=BR:MG: Tag:network=BR:MG
     network=BR:PB: Tag:network=BR:PB
+    network=Barrie_Transit: Tag:network=Barrie Transit
+    network=CA:ON:York: Tag:network=CA:ON:York
+    network=CN:AH: Tag:network=CN:AH
+    network=CN:JS: Tag:network=CN:JS
+    network=CN:expressway: Tag:network=CN:expressway
+    network=CN:national: Tag:network=CN:national
+    network=CR:national: Tag:network=CR:national
     network=Flinkster: Tag:network=Flinkster
     network=JP:national: Tag:network=JP:national
     network=JP:prefectural:nagano: Tag:network=JP:prefectural:nagano
@@ -6934,6 +9845,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
@@ -6953,6 +9865,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
@@ -6968,6 +9881,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
@@ -7016,19 +9930,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
@@ -7036,6 +9956,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
@@ -7043,12 +9964,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
@@ -7066,6 +9989,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
@@ -7075,34 +9999,63 @@ 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:PA: Tag:network=US:TX:PA
+    network=US:TX:Park: Tag:network=US:TX:Park
     network=US:TX:RM: Tag:network=US:TX:RM
+    network=US:TX:Recreational: Tag:network=US:TX:Recreational
     network=US:TX:Spur: Tag:network=US:TX:Spur
+    network=US:TX:Van_Zandt: Tag:network=US:TX:Van Zandt
+    network=US:TX:Wood: Tag:network=US:TX:Wood
     network=US:US: Tag:network=US:US
     network=US: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
     network=US:WV: Tag:network=US:WV
     network=US:WV:Berkeley: Tag:network=US:WV:Berkeley
+    network=US:WV:Gilmer: Tag:network=US:WV:Gilmer
+    network=US:WV:HARP: Tag:network=US:WV:HARP
+    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=VIVA: Tag:network=VIVA
+    network=York_Region_Transit: Tag:network=York Region Transit
     network=call-a-bike: Tag:network=call-a-bike
     network=cambio/stadtmobil: Tag:network=cambio/stadtmobil
     network=cambio_stadtmobil: Tag:network=cambio stadtmobil
+    network=e-waterway: Tag:network=e-waterway
     network=icn: Tag:network=icn
     network=iwn: Tag:network=iwn
     network=jp:national: Tag:network=jp:national
     network=jp:prefectural:nagano: Tag:network=jp:prefectural:nagano
     network=lcn: Tag:network=lcn
     network=lhn: Tag:network=lhn
+    network=lpn: Tag:network=lpn
     network=lwn: Tag:network=lwn
     network=ncn: Tag:network=ncn
     network=nextbike: Tag:network=nextbike
     network=nwn: Tag:network=nwn
     network=rcn: Tag:network=rcn
     network=rhn: Tag:network=rhn
+    network=rin: Tag:network=rin
+    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
+    noname=yes: Tag:noname=yes
+    nonsquare=yes: Tag:nonsquare=yes
+    observatory:type=astronomical: Tag:observatory:type=astronomical
+    observatory:type=gravitational: Tag:observatory:type=gravitational
+    observatory:type=meteorological: Tag:observatory:type=meteorological
     odbl=clean: Tag:odbl=clean
     office:realtor: Tag:office:realtor
     office=accountant: Tag:office=accountant
@@ -7110,23 +10063,36 @@ en:
     office=adoption_agency: Tag:office=adoption agency
     office=advertising_agency: Tag:office=advertising agency
     office=architect: Tag:office=architect
+    office=archive: Tag:office=archive
     office=association: Tag:office=association
+    office=bail_bond_agent: Tag:office=bail bond agent
     office=charity: Tag:office=charity
     office=company: Tag:office=company
+    office=consulting: Tag:office=consulting
+    office=courier: Tag:office=courier
     office=coworking: Tag:office=coworking
+    office=diplomatic: Tag:office=diplomatic
     office=educational_institution: Tag:office=educational institution
     office=employment_agency: Tag:office=employment agency
     office=energy_supplier: Tag:office=energy supplier
+    office=engineer: Tag:office=engineer
     office=estate_agent: Tag:office=estate agent
     office=financial: Tag:office=financial
+    office=financial_advisor: Tag:office=financial advisor
     office=forestry: Tag:office=forestry
     office=foundation: Tag:office=foundation
+    office=geodesist: Tag:office=geodesist
     office=government: Tag:office=government
+    office=graphic_design: Tag:office=graphic design
     office=guide: Tag:office=guide
+    office=harbour_master: Tag:office=harbour master
+    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
@@ -7136,34 +10102,65 @@ en:
     office=parish: Tag:office=parish
     office=political_party: Tag:office=political party
     office=private_investigator: Tag:office=private investigator
+    office=property_management: Tag:office=property management
+    office=publisher: Tag:office=publisher
     office=quango: Tag:office=quango
     office=real_estate_agent: Tag:office=real estate agent
     office=realtor: Tag:office=realtor
     office=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
     office=telecommunication: Tag:office=telecommunication
     office=therapist: Tag:office=therapist
+    office=tourist_accommodation: Tag:office=tourist accommodation
     office=travel_agent: Tag:office=travel agent
+    office=tutoring: Tag:office=tutoring
+    office=union: Tag:office=union
+    office=university: Tag:office=university
+    office=visa: Tag:office=visa
     office=water_utility: Tag:office=water utility
     office=yes: Tag:office=yes
+    on_demand=yes: Tag:on demand=yes
+    oneway:bicycle=yes: Tag:oneway:bicycle=yes
+    oneway:bus=no: Tag:oneway:bus=no
+    oneway:moped=no: Tag:oneway:moped=no
+    oneway:motorcycle=no: Tag:oneway:motorcycle=no
+    oneway:psv=no: Tag:oneway:psv=no
+    oneway=-1: Tag:oneway=-1
     oneway=alternating: Tag:oneway=alternating
     oneway=reversible: Tag:oneway=reversible
+    opening_hours:signed=no: Tag:opening hours:signed=no
+    opening_hours=24/7: Tag:opening hours=24/7
+    operational_status=closed: Tag:operational status=closed
     operator=Cambio: Tag:operator=Cambio
     operator=CiteeCar: Tag:operator=CiteeCar
     operator=Drive_Carsharing: Tag:operator=Drive Carsharing
+    operator=Enedis: Tag:operator=Enedis
     operator=Flinkster: Tag:operator=Flinkster
+    operator=GRDF: Tag:operator=GRDF
+    operator=Orange: Tag:operator=Orange
+    operator=RTE: Tag:operator=RTE
     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
+    ownership=private: Tag:ownership=private
     parking:lane:hgv=on_street: Tag:parking:lane:hgv=on street
+    parking:orientation=perpendicular: Tag:parking:orientation=perpendicular
+    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
     passenger=local: Tag:passenger=local
     passenger=national: Tag:passenger=national
@@ -7172,14 +10169,20 @@ 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
     pipeline=substation: Tag:pipeline=substation
+    pipeline=surge_tank: Tag:pipeline=surge tank
     pipeline=valve: Tag:pipeline=valve
+    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
@@ -7188,35 +10191,86 @@ en:
     place=continent: Tag:place=continent
     place=country: Tag:place=country
     place=county: Tag:place=county
+    place=district: Tag:place=district
     place=farm: Tag:place=farm
     place=hamlet: Tag:place=hamlet
     place=island: Tag:place=island
     place=islet: Tag:place=islet
     place=isolated_dwelling: Tag:place=isolated dwelling
     place=locality: Tag:place=locality
+    place=municipality: Tag:place=municipality
     place=neighbourhood: Tag:place=neighbourhood
     place=ocean: Tag:place=ocean
     place=plot: Tag:place=plot
+    place=province: Tag:place=province
     place=quarter: Tag:place=quarter
     place=region: Tag:place=region
     place=sea: Tag:place=sea
+    place=shieling: Tag:place=shieling
     place=square: Tag:place=square
     place=state: Tag:place=state
     place=suburb: Tag:place=suburb
     place=town: Tag:place=town
     place=village: Tag:place=village
+    place_of_mourning=yes: Tag:place of mourning=yes
+    place_of_worship=holy_well: Tag:place of worship=holy well
+    place_of_worship=mass_rock: Tag:place of worship=mass rock
     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
+    plant:source=geothermal: Tag:plant:source=geothermal
+    plant:source=hydro: Tag:plant:source=hydro
+    plant:source=nuclear: Tag:plant:source=nuclear
+    plant:source=oil: Tag:plant:source=oil
+    plant:source=solar: Tag:plant:source=solar
+    plant:source=waste: Tag:plant:source=waste
+    plant:source=wind: Tag:plant:source=wind
+    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=map: Tag:playground=map
+    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
+    police=checkpoint: Tag:police=checkpoint
+    police=detention: Tag:police=detention
+    police=naval_base: Tag:police=naval base
+    police=offices: Tag:police=offices
+    police=range: Tag:police=range
+    police=storage: Tag:police=storage
+    police=training_area: Tag:police=training area
+    police=yes: Tag:police=yes
+    post_office=post_partner: Tag:post office=post partner
+    power=antenna_line: Tag:power=antenna line
+    power=busbar: Tag:power=busbar
     power=cable: Tag:power=cable
     power=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
     power=heliostat: Tag:power=heliostat
     power=insulator: Tag:power=insulator
     power=line: Tag:power=line
+    power=marker: Tag:power=marker
     power=minor_line: Tag:power=minor line
     power=outlet: Tag:power=outlet
     power=plant: Tag:power=plant
@@ -7235,7 +10289,35 @@ en:
     priority=national: Tag:priority=national
     priority=regional: Tag:priority=regional
     prison_camp=concentration_camp: Tag:prison camp=concentration camp
+    prison_camp=extermination_camp: Tag:prison camp=extermination camp
+    private=employees: Tag:private=employees
+    product=beer: Tag:product=beer
+    product=bricks: Tag:product=bricks
+    product=concrete: Tag:product=concrete
+    product=electronics: Tag:product=electronics
+    product=food: Tag:product=food
+    product=furniture: Tag:product=furniture
+    product=machinery: Tag:product=machinery
+    product=oil: Tag:product=oil
+    product=packaging: Tag:product=packaging
+    product=rice: Tag:product=rice
+    product=steel: Tag:product=steel
+    product=sugar: Tag:product=sugar
+    protect_class=11: Tag:protect class=11
+    protect_class=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
+    psv=no: Tag:psv=no
+    psv=yes: Tag:psv=yes
     public_transport=pay_scale_area: Tag:public transport=pay scale area
     public_transport=platform: Tag:public transport=platform
     public_transport=pole: Tag:public transport=pole
@@ -7245,6 +10327,19 @@ en:
     pump=manual: Tag:pump=manual
     pump=no: Tag:pump=no
     pump=powered: Tag:pump=powered
+    pump_mechanism=axial_flow: Tag:pump mechanism=axial flow
+    pump_mechanism=centrifugal: Tag:pump mechanism=centrifugal
+    pump_mechanism=diaphragm: Tag:pump mechanism=diaphragm
+    pump_mechanism=eductor_jet: Tag:pump mechanism=eductor jet
+    pump_mechanism=gear: Tag:pump mechanism=gear
+    pump_mechanism=peristaltic: Tag:pump mechanism=peristaltic
+    pump_mechanism=piston: Tag:pump mechanism=piston
+    pump_mechanism=progressive_cavity: Tag:pump mechanism=progressive cavity
+    pump_mechanism=pulser: Tag:pump mechanism=pulser
+    pump_mechanism=ram: Tag:pump mechanism=ram
+    pump_mechanism=rope: Tag:pump mechanism=rope
+    pump_mechanism=rotary_vane: Tag:pump mechanism=rotary vane
+    pump_mechanism=screw: Tag:pump mechanism=screw
     raba:id=1100: Tag:raba:id=1100
     raba:id=1160: Tag:raba:id=1160
     raba:id=1180: Tag:raba:id=1180
@@ -7264,11 +10359,13 @@ 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
     railway=buffer_stop: Tag:railway=buffer stop
     railway=crossing: Tag:railway=crossing
+    railway=crossing_controller: Tag:railway=crossing controller
     railway=derail: Tag:railway=derail
     railway=diamond: Tag:railway=diamond
     railway=disused: Tag:railway=disused
@@ -7296,13 +10393,23 @@ 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
     railway=wash: Tag:railway=wash
+    railway=water_crane: Tag:railway=water crane
+    railway=water_tower: Tag:railway=water tower
+    railway=workshop: Tag:railway=workshop
     railway=yard: Tag:railway=yard
-    recycling_type=container: Tag:recycling type=container
+    reclaimed=yes: Tag:reclaimed=yes
+    recreation_ground=showground: Tag:recreation ground=showground
+    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
@@ -7311,24 +10418,40 @@ en:
     religion=multifaith: Tag:religion=multifaith
     religion=muslim: Tag:religion=muslim
     religion=pagan: Tag:religion=pagan
+    religion=self-realization_fellowship: Tag:religion=self-realization fellowship
     religion=shinto: Tag:religion=shinto
     religion=sikh: Tag:religion=sikh
     religion=taoist: Tag:religion=taoist
     religion=zoroastrian: Tag:religion=zoroastrian
+    rental=appliance: Tag:rental=appliance
+    rental=quadracycle: Tag:rental=quadracycle
     rental=ski: Tag:rental=ski
     rental=strandkorb: Tag:rental=strandkorb
+    rental=trailer: Tag:rental=trailer
+    repair=assisted_self_service: Tag:repair=assisted self service
+    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=trailer_park: Tag:residential=trailer park
     residential=university: Tag:residential=university
     residential=urban: Tag:residential=urban
     resource=aggregate: Tag:resource=aggregate
     resource=gravel: Tag:resource=gravel
     resource=sand: Tag:resource=sand
+    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
     route=coach: Tag:route=coach
     route=detour: Tag:route=detour
+    route=evacuation: Tag:route=evacuation
+    route=ferrata: Tag:route=ferrata
     route=ferry: Tag:route=ferry
     route=fitness_trail: Tag:route=fitness trail
     route=foot: Tag:route=foot
@@ -7338,6 +10461,8 @@ en:
     route=light_rail: Tag:route=light rail
     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
@@ -7347,11 +10472,19 @@ 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
+    school:gender=female: Tag:school:gender=female
+    school:gender=male: Tag:school:gender=male
+    school:gender=mixed: Tag:school:gender=mixed
     seamark:beacon_cardinal:colour_pattern=horizontal: Tag:seamark:beacon cardinal:colour
       pattern=horizontal
     seamark:beacon_cardinal:shape=tower: Tag:seamark:beacon cardinal:shape=tower
@@ -7459,6 +10592,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
@@ -7487,7 +10622,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
@@ -7663,33 +10797,56 @@ en:
     seamark:type=signal_station_traffic: Tag:seamark:type=signal station traffic
     seamark:type=signal_station_warning: Tag:seamark:type=signal station warning
     seamark:type=small_craft_facility: Tag:seamark:type=small craft facility
+    seamark:type=virtual_aton: Tag:seamark:type=virtual aton
     seamark:type=wreck: Tag:seamark:type=wreck
     seamark=landmark: Tag:seamark=landmark
+    second_hand=only: Tag:second hand=only
+    second_hand=yes: Tag:second hand=yes
     segregated=no: Tag:segregated=no
     segregated=yes: Tag:segregated=yes
+    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=slipway: Tag:service=slipway
     service=spur: Tag:service=spur
+    service=tyres: Tag:service=tyres
     service=yard: Tag:service=yard
+    sett:style=portuguese: Tag:sett:style=portuguese
+    shelter_type=Wetterpilz: Tag:shelter type=Wetterpilz
     shelter_type=basic_hut: Tag:shelter type=basic hut
+    shelter_type=changing_rooms: Tag:shelter type=changing rooms
+    shelter_type=field_shelter: Tag:shelter type=field shelter
+    shelter_type=gazebo: Tag:shelter type=gazebo
     shelter_type=lean_to: Tag:shelter type=lean to
+    shelter_type=pavilion: Tag:shelter type=pavilion
+    shelter_type=picnic_shelter: Tag:shelter type=picnic shelter
     shelter_type=public_transport: Tag:shelter type=public transport
+    shelter_type=weather_shelter: Tag:shelter type=weather shelter
+    shelter_type=wildlife_hide: Tag:shelter type=wildlife hide
     shop=*: Tag:shop=*
+    shop=3d_printing: Tag:shop=3d printing
     shop=Alko: Tag:shop=Alko
     shop=_business_machines: Tag:shop= business machines
+    shop=adult: Tag:shop=adult
     shop=agrarian: Tag:shop=agrarian
     shop=alcohol: Tag:shop=alcohol
     shop=anime: Tag:shop=anime
     shop=antique: Tag:shop=antique
     shop=antiques: Tag:shop=antiques
+    shop=appliance: Tag:shop=appliance
     shop=art: Tag:shop=art
     shop=atv: Tag:shop=atv
     shop=audiologist: Tag:shop=audiologist
@@ -7699,12 +10856,16 @@ en:
     shop=bag: Tag:shop=bag
     shop=bakery: Tag:shop=bakery
     shop=bathroom_furnishing: Tag:shop=bathroom furnishing
+    shop=bbq: Tag:shop=bbq
     shop=beauty: Tag:shop=beauty
     shop=bed: Tag:shop=bed
     shop=betting: Tag:shop=betting
     shop=beverages: Tag:shop=beverages
     shop=bicycle: Tag:shop=bicycle
+    shop=board: Tag:shop=board
     shop=boat: Tag:shop=boat
+    shop=boat_parts: Tag:shop=boat parts
+    shop=boat_repair: Tag:shop=boat repair
     shop=bookmaker: Tag:shop=bookmaker
     shop=books: Tag:shop=books
     shop=boutique: Tag:shop=boutique
@@ -7713,14 +10874,16 @@ en:
     shop=butcher: Tag:shop=butcher
     shop=camera: Tag:shop=camera
     shop=candles: Tag:shop=candles
+    shop=cannabis: Tag:shop=cannabis
     shop=canoe_hire: Tag:shop=canoe hire
     shop=car: Tag:shop=car
-    shop=car_bodyshop: Tag:shop=car bodyshop
     shop=car_parts: Tag:shop=car parts
     shop=car_repair: Tag:shop=car repair
     shop=car_service: Tag:shop=car service
+    shop=caravan: Tag:shop=caravan
     shop=carpet: Tag:shop=carpet
     shop=cell_phones: Tag:shop=cell phones
+    shop=ceramics: Tag:shop=ceramics
     shop=chandler: Tag:shop=chandler
     shop=charity: Tag:shop=charity
     shop=cheese: Tag:shop=cheese
@@ -7741,6 +10904,7 @@ en:
     shop=dairy: Tag:shop=dairy
     shop=deli: Tag:shop=deli
     shop=delicatessen: Tag:shop=delicatessen
+    shop=dentures: Tag:shop=dentures
     shop=department_store: Tag:shop=department store
     shop=discount: Tag:shop=discount
     shop=dive: Tag:shop=dive
@@ -7753,12 +10917,15 @@ en:
     shop=electrical: Tag:shop=electrical
     shop=electronics: Tag:shop=electronics
     shop=energy: Tag:shop=energy
+    shop=equestrian: Tag:shop=equestrian
     shop=erotic: Tag:shop=erotic
     shop=estate_agent: Tag:shop=estate agent
     shop=fabric: Tag:shop=fabric
     shop=fabrics: Tag:shop=fabrics
     shop=farm: Tag:shop=farm
     shop=fashion: Tag:shop=fashion
+    shop=fashion_accessories: Tag:shop=fashion accessories
+    shop=fast_food: Tag:shop=fast food
     shop=firearms: Tag:shop=firearms
     shop=fireplace: Tag:shop=fireplace
     shop=fireworks: Tag:shop=fireworks
@@ -7792,6 +10959,7 @@ en:
     shop=golf: Tag:shop=golf
     shop=greengrocer: Tag:shop=greengrocer
     shop=grocery: Tag:shop=grocery
+    shop=groundskeeping: Tag:shop=groundskeeping
     shop=gun: Tag:shop=gun
     shop=guns: Tag:shop=guns
     shop=haberdashery: Tag:shop=haberdashery
@@ -7803,11 +10971,16 @@ 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=household: Tag:shop=household
+    shop=honey: Tag:shop=honey
+    shop=hookah: Tag:shop=hookah
+    shop=household_linen: Tag:shop=household linen
     shop=houseware: Tag:shop=houseware
     shop=hunting: Tag:shop=hunting
+    shop=hvac: Tag:shop=hvac
+    shop=hydroponics: Tag:shop=hydroponics
     shop=ice_cream: Tag:shop=ice cream
     shop=insurance: Tag:shop=insurance
     shop=interior_decoration: Tag:shop=interior decoration
@@ -7825,27 +10998,36 @@ en:
     shop=locksmith: Tag:shop=locksmith
     shop=lottery: Tag:shop=lottery
     shop=mall: Tag:shop=mall
+    shop=manufactured_home: Tag:shop=manufactured home
+    shop=maps: Tag:shop=maps
     shop=marine: Tag:shop=marine
     shop=massage: Tag:shop=massage
     shop=medical: Tag:shop=medical
     shop=medical_supply: Tag:shop=medical supply
     shop=military_surplus: Tag:shop=military surplus
+    shop=mobile_home: Tag:shop=mobile home
     shop=mobile_phone: Tag:shop=mobile phone
+    shop=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=motorsports: Tag:shop=motorsports
     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
     shop=optician: Tag:shop=optician
     shop=organic: Tag:shop=organic
     shop=outdoor: Tag:shop=outdoor
+    shop=outpost: Tag:shop=outpost
     shop=paint: Tag:shop=paint
     shop=party: Tag:shop=party
     shop=pasta: Tag:shop=pasta
@@ -7853,30 +11035,39 @@ en:
     shop=pawnbroker: Tag:shop=pawnbroker
     shop=perfume: Tag:shop=perfume
     shop=perfumery: Tag:shop=perfumery
+    shop=pest_control: Tag:shop=pest control
     shop=pet: Tag:shop=pet
     shop=pet_grooming: Tag:shop=pet grooming
     shop=pharmacy: Tag:shop=pharmacy
     shop=photo: Tag:shop=photo
     shop=photo_studio: Tag:shop=photo studio
     shop=photography: Tag:shop=photography
-    shop=piercing: Tag:shop=piercing
     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=repair: Tag:shop=repair
+    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
+    shop=security: Tag:shop=security
     shop=sewing: Tag:shop=sewing
     shop=ship_chandler: Tag:shop=ship chandler
     shop=shoe_repair: Tag:shop=shoe repair
     shop=shoes: Tag:shop=shoes
     shop=shopping_centre: Tag:shop=shopping centre
+    shop=skate: Tag:shop=skate
     shop=ski: Tag:shop=ski
+    shop=snack: Tag:shop=snack
     shop=snowmobile: Tag:shop=snowmobile
     shop=solarium: Tag:shop=solarium
     shop=souvenir: Tag:shop=souvenir
@@ -7885,7 +11076,9 @@ en:
     shop=sports: Tag:shop=sports
     shop=stationery: Tag:shop=stationery
     shop=storage_rental: Tag:shop=storage rental
+    shop=street_vendor: Tag:shop=street vendor
     shop=supermarket: Tag:shop=supermarket
+    shop=surf: Tag:shop=surf
     shop=swimming_pool: Tag:shop=swimming pool
     shop=systembolaget: Tag:shop=systembolaget
     shop=tailor: Tag:shop=tailor
@@ -7895,12 +11088,19 @@ en:
     shop=tickets: Tag:shop=tickets
     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
     shop=vacuum_cleaner: Tag:shop=vacuum cleaner
     shop=variety_store: Tag:shop=variety store
@@ -7909,6 +11109,7 @@ en:
     shop=video_games: Tag:shop=video games
     shop=watches: Tag:shop=watches
     shop=water: Tag:shop=water
+    shop=water_sports: Tag:shop=water sports
     shop=weapons: Tag:shop=weapons
     shop=wholesale: Tag:shop=wholesale
     shop=wigs: Tag:shop=wigs
@@ -7919,36 +11120,36 @@ en:
     shop=winery: Tag:shop=winery
     shop=wool: Tag:shop=wool
     shop=yes: Tag:shop=yes
-    sign=no: Tag:sign=no
-    sign=yes: Tag:sign=yes
     signal_station=bridge: Tag:signal station=bridge
-    signal_station=control: Tag:signal station=control
-    signal_station=distress: Tag:signal station=distress
     signal_station=firing: Tag:signal station=firing
-    signal_station=ice: Tag:signal station=ice
     signal_station=international_port_traffic: Tag:signal station=international port
       traffic
     signal_station=lock: Tag:signal station=lock
-    signal_station=storm: Tag:signal station=storm
-    signal_station=stream: Tag:signal station=stream
-    signal_station=tide: Tag:signal station=tide
     signal_station=tide_gauge: Tag:signal station=tide gauge
     signal_station=tide_scale: Tag:signal station=tide scale
-    signal_station=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
     site_type=fortification: Tag:site type=fortification
     site_type=hut_circle: Tag:site type=hut circle
     site_type=megalith: Tag:site type=megalith
+    site_type=minilith: Tag:site type=minilith
     site_type=necropolis: Tag:site type=necropolis
     site_type=petroglyph: Tag:site type=petroglyph
     site_type=roman_circus: Tag:site type=roman circus
     site_type=roman_villa: Tag:site type=roman villa
     site_type=settlement: Tag:site type=settlement
     site_type=tumulus: Tag:site type=tumulus
+    social_facility:for=homeless: Tag:social facility:for=homeless
     social_facility=ambulatory_care: Tag:social facility=ambulatory care
     social_facility=assisted_living: Tag:social facility=assisted living
     social_facility=clothing_bank: Tag:social facility=clothing bank
@@ -7961,33 +11162,55 @@ en:
     social_facility=shelter: Tag:social facility=shelter
     social_facility=soup_kitchen: Tag:social facility=soup kitchen
     social_facility=workshop: Tag:social facility=workshop
+    source:addr=GURS: Tag:source:addr=GURS
     source:ele=barometric: Tag:source:ele=barometric
     source:geometry=ACT2016: Tag:source:geometry=ACT2016
     source:geometry=ACTMapiRoads: Tag:source:geometry=ACTMapiRoads
     source:geometry=ACTMapiTP: Tag:source:geometry=ACTMapiTP
     source:geometry=Bing: Tag:source:geometry=Bing
+    source:geometry=LPI_NSW_Imagery: Tag:source:geometry=LPI NSW Imagery
+    source:geometry=NPWS_Estate: Tag:source:geometry=NPWS Estate
     source:geometry=NSW_LPI_Base_Map: Tag:source:geometry=NSW LPI Base Map
     source:geometry=NSW_LPI_Imagery: Tag:source:geometry=NSW LPI Imagery
+    source:geometry=PSMA_Admin_Boundaries: Tag:source:geometry=PSMA Admin Boundaries
     source:maxspeed=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
     source:name=NSW_LPI_Base_Map: Tag:source:name=NSW LPI Base Map
+    source:position=NPWS_Estate: Tag:source:position=NPWS Estate
     source=ACT2016: Tag:source=ACT2016
+    source=ACT2017: Tag:source=ACT2017
     source=ACTMapiRoads: Tag:source=ACTMapiRoads
     source=ACTMapiTP: Tag:source=ACTMapiTP
     source=Bymiljøetaten: Tag:source=Bymiljøetaten
     source=DNT_Oslo_og_Omegn: Tag:source=DNT Oslo og Omegn
     source=GURS: Tag:source=GURS
+    source=Gazetteer_of_Australia_2012: Tag:source=Gazetteer of Australia 2012
+    source=Google: Tag:source=Google
+    source=Google,_2010-01-21: Tag:source=Google, 2010-01-21
     source=HiRes_aerial_imagery: Tag:source=HiRes aerial imagery
     source=Isle_of_Man_Government_1:25000_map_(2007): Tag:source=Isle of Man Government
       1:25000 map (2007)
     source=Isle_of_Man_Government_aerial_imagery_(2001): Tag:source=Isle of Man Government
       aerial imagery (2001)
+    source=Kartverket: Tag:source=Kartverket
+    source=LPI_NSW_Base_Map: Tag:source=LPI NSW Base Map
     source=LPI_NSW_Imagery: Tag:source=LPI NSW Imagery
     source=NAIP: Tag:source=NAIP
+    source=NPWS_Estate: Tag:source=NPWS Estate
+    source=NSW_LPI_BaseMap: Tag:source=NSW LPI BaseMap
     source=NSW_LPI_Base_Map: Tag:source=NSW LPI Base Map
     source=NSW_LPI_Imagery: Tag:source=NSW LPI Imagery
     source=Naturbase: Tag:source=Naturbase
     source=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
     sport=10pin: Tag:sport=10pin
@@ -7996,6 +11219,7 @@ en:
     sport=BASE: Tag:sport=BASE
     sport=aikido: Tag:sport=aikido
     sport=american_football: Tag:sport=american football
+    sport=american_handball: Tag:sport=american handball
     sport=archery: Tag:sport=archery
     sport=association_football: Tag:sport=association football
     sport=athletics: Tag:sport=athletics
@@ -8006,7 +11230,9 @@ en:
     sport=base: Tag:sport=base
     sport=baseball: Tag:sport=baseball
     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
@@ -8014,10 +11240,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
@@ -8025,17 +11253,27 @@ 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=cycle_ball: Tag:sport=cycle ball
+    sport=cycle_polo: Tag:sport=cycle polo
     sport=cycling: Tag:sport=cycling
+    sport=dancing: Tag:sport=dancing
     sport=darts: Tag:sport=darts
     sport=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=five-a-side: Tag:sport=five-a-side
     sport=fives: Tag:sport=fives
+    sport=floorball: Tag:sport=floorball
+    sport=football: Tag:sport=football
     sport=footballgolf: Tag:sport=footballgolf
+    sport=four_square: Tag:sport=four square
     sport=free_flying: Tag:sport=free flying
     sport=futsal: Tag:sport=futsal
     sport=gaelic_football: Tag:sport=gaelic football
@@ -8051,38 +11289,65 @@ en:
     sport=ice_skating: Tag:sport=ice skating
     sport=ice_stock: Tag:sport=ice stock
     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
+    sport=padel: Tag:sport=padel
     sport=paintball: Tag:sport=paintball
     sport=parachuting: Tag:sport=parachuting
     sport=paragliding: Tag:sport=paragliding
+    sport=parkour: Tag:sport=parkour
+    sport=pedal_car_racing: Tag:sport=pedal car racing
     sport=pelota: Tag:sport=pelota
+    sport=pesäpallo: Tag:sport=pesäpallo
+    sport=petanque: Tag:sport=petanque
+    sport=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
     sport=rugby_league: Tag:sport=rugby league
     sport=rugby_union: Tag:sport=rugby union
     sport=running: Tag:sport=running
+    sport=safety_training: Tag:sport=safety training
     sport=sailing: Tag:sport=sailing
     sport=scuba_diving: Tag:sport=scuba diving
     sport=shooting: Tag:sport=shooting
     sport=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
@@ -8093,42 +11358,143 @@ 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
+    sport=windsurfing: Tag:sport=windsurfing
     sport=wrestling: Tag:sport=wrestling
     sport=yoga: Tag:sport=yoga
+    sport=zurkhaneh_sport: Tag:sport=zurkhaneh sport
     sports=aikido: Tag:sports=aikido
     sports=athletics: Tag:sports=athletics
+    spring:type=hot: Tag:spring:type=hot
+    station=funicular: Tag:station=funicular
     station=light_rail: Tag:station=light rail
     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
     substation=distribution: Tag:substation=distribution
+    substation=generation: Tag:substation=generation
     substation=industrial: Tag:substation=industrial
+    substation=measurement: Tag:substation=measurement
     substation=minor_distribution: Tag:substation=minor distribution
     substation=traction: Tag:substation=traction
     substation=transition: Tag:substation=transition
     substation=transmission: Tag:substation=transmission
     summit:cross=yes: Tag:summit:cross=yes
+    surface=acrylic: Tag:surface=acrylic
+    surface=artificial_turf: Tag:surface=artificial turf
+    surface=asphalt: Tag:surface=asphalt
+    surface=chipseal: Tag:surface=chipseal
+    surface=clay: Tag:surface=clay
+    surface=cobblestone: Tag:surface=cobblestone
+    surface=compacted: Tag:surface=compacted
+    surface=concrete: Tag:surface=concrete
+    surface=concrete:lanes: Tag:surface=concrete:lanes
+    surface=concrete:plates: Tag:surface=concrete:plates
+    surface=dirt: Tag:surface=dirt
+    surface=earth: Tag:surface=earth
+    surface=fine_gravel: Tag:surface=fine gravel
+    surface=grass: Tag:surface=grass
+    surface=grass_paver: Tag:surface=grass paver
+    surface=gravel: Tag:surface=gravel
+    surface=ground: Tag:surface=ground
+    surface=metal: Tag:surface=metal
+    surface=mud: Tag:surface=mud
+    surface=paved: Tag:surface=paved
+    surface=paving_stones: Tag:surface=paving stones
+    surface=pebblestone: Tag:surface=pebblestone
+    surface=rock: Tag:surface=rock
+    surface=rocks: Tag:surface=rocks
+    surface=sand: Tag:surface=sand
+    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
+    surface=woodchips: Tag:surface=woodchips
+    survey_point:datum_aligned=no: Tag:survey point:datum aligned=no
+    survey_point:datum_aligned=yes: Tag:survey point:datum aligned=yes
+    survey_point:purpose=both: Tag:survey point:purpose=both
+    survey_point:purpose=horizontal: Tag:survey point:purpose=horizontal
+    survey_point:purpose=vertical: Tag:survey point:purpose=vertical
+    survey_point:structure=beacon: Tag:survey point:structure=beacon
+    survey_point:structure=block: Tag:survey point:structure=block
+    survey_point:structure=bracket: Tag:survey point:structure=bracket
+    survey_point:structure=cut: Tag:survey point:structure=cut
+    survey_point:structure=indented_pin: Tag:survey point:structure=indented pin
+    survey_point:structure=magnet: Tag:survey point:structure=magnet
+    survey_point:structure=medallion: Tag:survey point:structure=medallion
+    survey_point:structure=pillar: Tag:survey point:structure=pillar
+    survey_point:structure=pin: Tag:survey point:structure=pin
+    survey_point:structure=plaque: Tag:survey point:structure=plaque
+    survey_point:structure=pole: Tag:survey point:structure=pole
+    swimming_pool=yes: Tag:swimming pool=yes
     switch=circuit_breaker: Tag:switch=circuit breaker
     switch=disconnector: Tag:switch=disconnector
     switch=earthing: Tag:switch=earthing
     switch=mechanical: Tag:switch=mechanical
+    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
+    telecom=service_device: Tag:telecom=service device
+    telescope:type=optical: Tag:telescope:type=optical
+    telescope:type=radio: Tag:telescope:type=radio
+    theatre:type=amphi: Tag:theatre:type=amphi
+    theatre:type=concert_hall: Tag:theatre:type=concert hall
+    theatre:type=open_air: Tag:theatre:type=open air
+    theatre:type=opera_house: Tag:theatre:type=opera house
+    tickets:public_transport_subscription=yes: Tag:tickets:public transport subscription=yes
+    toilets:access=customers: Tag:toilets:access=customers
+    toll=yes: Tag:toll=yes
+    tomb=cenotaph: Tag:tomb=cenotaph
+    tomb=columbarium: Tag:tomb=columbarium
+    tomb=crypt: Tag:tomb=crypt
+    tomb=dolmen: Tag:tomb=dolmen
+    tomb=hypogeum: Tag:tomb=hypogeum
+    tomb=mausoleum: Tag:tomb=mausoleum
+    tomb=obelisk: Tag:tomb=obelisk
+    tomb=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
+    tourism=accommodation: Tag:tourism=accommodation
     tourism=alpine_hut: Tag:tourism=alpine hut
     tourism=apartment: Tag:tourism=apartment
     tourism=aquarium: Tag:tourism=aquarium
     tourism=artwork: Tag:tourism=artwork
     tourism=attraction: Tag:tourism=attraction
     tourism=bed_and_breakfast: Tag:tourism=bed and breakfast
+    tourism=camp_pitch: Tag:tourism=camp pitch
     tourism=camp_site: Tag:tourism=camp site
     tourism=caravan_site: Tag:tourism=caravan site
     tourism=chalet: Tag:tourism=chalet
@@ -8143,6 +11509,7 @@ en:
     tourism=resort: Tag:tourism=resort
     tourism=theme_park: Tag:tourism=theme park
     tourism=tourism-attraction: Tag:tourism=tourism-attraction
+    tourism=trail_riding_rest: Tag:tourism=trail riding rest
     tourism=trail_riding_station: Tag:tourism=trail riding station
     tourism=viewpoint: Tag:tourism=viewpoint
     tourism=wilderness_hut: Tag:tourism=wilderness hut
@@ -8152,6 +11519,8 @@ en:
     tower:construction=dish: Tag:tower:construction=dish
     tower:construction=dome: Tag:tower:construction=dome
     tower:construction=freestanding: Tag:tower:construction=freestanding
+    tower:construction=guyed_lattice: Tag:tower:construction=guyed lattice
+    tower:construction=guyed_tube: Tag:tower:construction=guyed tube
     tower:construction=lattice: Tag:tower:construction=lattice
     tower:type: Tag:tower:type
     tower:type=bell_tower: Tag:tower:type=bell tower
@@ -8159,46 +11528,228 @@ en:
     tower:type=communication: Tag:tower:type=communication
     tower:type=cooling: Tag:tower:type=cooling
     tower:type=defensive: Tag:tower:type=defensive
+    tower:type=diving: Tag:tower:type=diving
     tower:type=donjon: Tag:tower:type=donjon
     tower:type=hose: Tag:tower:type=hose
     tower:type=intake: Tag:tower:type=intake
     tower:type=lattice: Tag:tower:type=lattice
     tower:type=lighting: Tag:tower:type=lighting
+    tower:type=minaret: Tag:tower:type=minaret
     tower:type=monitoring: Tag:tower:type=monitoring
     tower:type=monument: Tag:tower:type=monument
     tower:type=observation: Tag:tower:type=observation
+    tower:type=popinjay: Tag:tower:type=popinjay
     tower:type=radar: Tag:tower:type=radar
     tower:type=siren: Tag:tower:type=siren
+    tower:type=suspension: Tag:tower:type=suspension
     tower:type=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=bump: Tag:traffic calming=bump
+    traffic_calming=chicane: Tag:traffic calming=chicane
+    traffic_calming=choked_island: Tag:traffic calming=choked island
+    traffic_calming=choked_table: Tag:traffic calming=choked table
+    traffic_calming=choker: Tag:traffic calming=choker
+    traffic_calming=cushion: Tag:traffic calming=cushion
+    traffic_calming=dip: Tag:traffic calming=dip
+    traffic_calming=double_dip: Tag:traffic calming=double dip
+    traffic_calming=dynamic_bump: Tag:traffic calming=dynamic bump
+    traffic_calming=hump: Tag:traffic calming=hump
     traffic_calming=island: Tag:traffic calming=island
+    traffic_calming=mini_bumps: Tag:traffic calming=mini bumps
+    traffic_calming=painted_island: Tag:traffic calming=painted island
+    traffic_calming=rumble_strip: Tag:traffic calming=rumble strip
     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:133-10: Tag:traffic sign=DE:133-10
+    traffic_sign=DE:136-10: Tag:traffic sign=DE:136-10
+    traffic_sign=DE:142-10: Tag:traffic sign=DE:142-10
+    traffic_sign=DE:205: Tag:traffic sign=DE:205
+    traffic_sign=DE:206: Tag:traffic sign=DE:206
+    traffic_sign=DE:220-10: Tag:traffic sign=DE:220-10
+    traffic_sign=DE:220-20: Tag:traffic sign=DE:220-20
+    traffic_sign=DE:224: Tag:traffic sign=DE:224
+    traffic_sign=DE:237: Tag:traffic sign=DE:237
+    traffic_sign=DE:239: Tag:traffic sign=DE:239
+    traffic_sign=DE:240: Tag:traffic sign=DE:240
+    traffic_sign=DE:241: Tag:traffic sign=DE:241
+    traffic_sign=DE:241-30: Tag:traffic sign=DE:241-30
+    traffic_sign=DE:241-31: Tag:traffic sign=DE:241-31
+    traffic_sign=DE:242: Tag:traffic sign=DE:242
+    traffic_sign=DE:242.1: Tag:traffic sign=DE:242.1
+    traffic_sign=DE:242.2: Tag:traffic sign=DE:242.2
+    traffic_sign=DE:244: Tag:traffic sign=DE:244
+    traffic_sign=DE:244.1: Tag:traffic sign=DE:244.1
+    traffic_sign=DE:245: Tag:traffic sign=DE:245
+    traffic_sign=DE:250: Tag:traffic sign=DE:250
+    traffic_sign=DE:253: Tag:traffic sign=DE:253
+    traffic_sign=DE:254: Tag:traffic sign=DE:254
+    traffic_sign=DE:257-51: Tag:traffic sign=DE:257-51
+    traffic_sign=DE:258: Tag:traffic sign=DE:258
+    traffic_sign=DE:259: Tag:traffic sign=DE:259
+    traffic_sign=DE:260: Tag:traffic sign=DE:260
+    traffic_sign=DE:261: Tag:traffic sign=DE:261
+    traffic_sign=DE:267: Tag:traffic sign=DE:267
+    traffic_sign=DE:269: Tag:traffic sign=DE:269
+    traffic_sign=DE:272: Tag:traffic sign=DE:272
+    traffic_sign=DE:274-10: Tag:traffic sign=DE:274-10
+    traffic_sign=DE:274-100: Tag:traffic sign=DE:274-100
+    traffic_sign=DE:274-120: Tag:traffic sign=DE:274-120
+    traffic_sign=DE:274-130: Tag:traffic sign=DE:274-130
+    traffic_sign=DE:274-20: Tag:traffic sign=DE:274-20
+    traffic_sign=DE:274-30: Tag:traffic sign=DE:274-30
+    traffic_sign=DE:274-40: Tag:traffic sign=DE:274-40
+    traffic_sign=DE:274-50: Tag:traffic sign=DE:274-50
+    traffic_sign=DE:274-60: Tag:traffic sign=DE:274-60
+    traffic_sign=DE:274-70: Tag:traffic sign=DE:274-70
+    traffic_sign=DE:274-80: Tag:traffic sign=DE:274-80
+    traffic_sign=DE:274.1: Tag:traffic sign=DE:274.1
+    traffic_sign=DE:274.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=give_way: Tag:traffic sign=give way
+    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
     transformer=distribution: Tag:transformer=distribution
     transformer=generator: Tag:transformer=generator
     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
+    turn:lanes=slide_left: Tag:turn:lanes=slide left
+    turn:lanes=slide_right: Tag:turn:lanes=slide right
     two_sided=yes: Tag:two sided=yes
-    type=AutoPASS: Tag:type=AutoPASS
-    type=autopass: Tag:type=autopass
+    type=associatedStreet: Tag:type=associatedStreet
     type=benchmark: Tag:type=benchmark
-    type=defaults: Tag:type=defaults
+    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
     type=observation_spot: Tag:type=observation spot
     type=public_transport: Tag:type=public transport
+    type=restriction: Tag:type=restriction
+    type=route: Tag:type=route
+    type=site: Tag:type=site
+    type=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=loudspeaker: Tag:utility=loudspeaker
+    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
+    valve=globe: Tag:valve=globe
+    valve=needle: Tag:valve=needle
+    valve=plug: Tag:valve=plug
+    valve=spool: Tag:valve=spool
+    vehicle=customers: Tag:vehicle=customers
+    vending: Tag:vending
     vending=SIM-cards: Tag:vending=SIM-cards
     vending=SIM_cards: Tag:vending=SIM cards
     vending=admission_tickets: Tag:vending=admission tickets
     vending=animal_feed: Tag:vending=animal feed
+    vending=art: Tag:vending=art
     vending=bicycle_tube: Tag:vending=bicycle tube
     vending=books: Tag:vending=books
     vending=bottle_return: Tag:vending=bottle return
@@ -8210,7 +11761,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
@@ -8234,6 +11787,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
@@ -8248,17 +11802,48 @@ en:
     vending=water: Tag:vending=water
     vending_machine: Tag:vending machine
     vending_machine=fuel: Tag:vending machine=fuel
+    wall=brick: Tag:wall=brick
+    wall=castle_wall: Tag:wall=castle wall
     wall=dry_stone: Tag:wall=dry stone
     wall=no: Tag:wall=no
     wall=noise_barrier: Tag:wall=noise barrier
     wall=seawall: Tag:wall=seawall
+    wall=stone: Tag:wall=stone
+    wall=stone_wall: Tag:wall=stone wall
+    wall=tire_barrier: Tag:wall=tire barrier
     wall=training_wall: Tag:wall=training wall
+    waste=cigarettes: Tag:waste=cigarettes
     waste=dog_excrement: Tag:waste=dog excrement
+    waste=drugs: Tag:waste=drugs
+    waste=oil: Tag:waste=oil
+    waste=organic: Tag:waste=organic
+    waste=rubble: Tag:waste=rubble
+    waste=sharps: Tag:waste=sharps
+    waste=trash: Tag:waste=trash
+    water=basin: Tag:water=basin
+    water=canal: Tag:water=canal
+    water=ditch: Tag:water=ditch
+    water=drain: Tag:water=drain
+    water=fish_pass: Tag:water=fish pass
     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=rapids: Tag:water=rapids
+    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
@@ -8274,19 +11859,27 @@ 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
     waterway=mooring: Tag:waterway=mooring
     waterway=offshore_field: Tag:waterway=offshore field
+    waterway=portage: Tag:waterway=portage
+    waterway=pressurised: Tag:waterway=pressurised
     waterway=rapids: Tag:waterway=rapids
     waterway=river: Tag:waterway=river
     waterway=riverbank: Tag:waterway=riverbank
+    waterway=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=soakhole: Tag:waterway=soakhole
+    waterway=spillway: Tag:waterway=spillway
     waterway=stream: Tag:waterway=stream
     waterway=stream_end: Tag:waterway=stream end
     waterway=swept_area: Tag:waterway=swept area
+    waterway=tidal_channel: Tag:waterway=tidal channel
     waterway=turning_point: Tag:waterway=turning point
     waterway=wadi: Tag:waterway=wadi
     waterway=water_point: Tag:waterway=water point
@@ -8304,11 +11897,22 @@ en:
     wetland=swamp: Tag:wetland=swamp
     wetland=tidalflat: Tag:wetland=tidalflat
     wetland=wet_meadow: Tag:wetland=wet meadow
+    wood=coniferous: Tag:wood=coniferous
     wood=eucalypt: Tag:wood=eucalypt
     wood=evergreen: Tag:wood=evergreen
     wood=nipa_palm: Tag:wood=nipa palm
+    worship=stations_of_the_cross: Tag:worship=stations of the cross
+    zone:traffic=BE-BRU:urban: Tag:zone:traffic=BE-BRU:urban
+    zone:traffic=BE-VLG:rural: Tag:zone:traffic=BE-VLG:rural
+    zone:traffic=BE-VLG:urban: Tag:zone:traffic=BE-VLG:urban
+    zone:traffic=BE-WAL:rural: Tag:zone:traffic=BE-WAL:rural
+    zone:traffic=BE-WAL:urban: Tag:zone:traffic=BE-WAL:urban
+    zone:traffic=DE:motorway: Tag:zone:traffic=DE:motorway
+    zone:traffic=DE:rural: Tag:zone:traffic=DE:rural
+    zone:traffic=DE:urban: Tag:zone:traffic=DE:urban
     zoo=aviary: Tag:zoo=aviary
     zoo=birds: Tag:zoo=birds
+    zoo=butterfly: Tag:zoo=butterfly
     zoo=enclosure: Tag:zoo=enclosure
     zoo=falconry: Tag:zoo=falconry
     zoo=petting_zoo: Tag:zoo=petting zoo
@@ -8316,20 +11920,30 @@ en:
     zoo=safari_park: Tag:zoo=safari park
     zoo=wildlife_park: Tag:zoo=wildlife park
 eo:
-  key:
-    esperanto: Eo:Key:esperanto
-    esperanto=yes: Eo:Key:esperanto=yes
+  tag:
+    craft=tinsmith: Eo:Tag:craft=tinsmith
+    esperanto=esperanto: Eo:Tag:esperanto=esperanto
+    esperanto=yes: Eo:Tag:esperanto=yes
+    shop=bakery: Eo:Tag:shop=bakery
 es:
   key:
+    AlpinRes_ID: ES:Key:AlpinRes ID
     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
+    access:bdouble: ES:Key:access:bdouble
+    access:lhv: ES:Key:access:lhv
+    access:roadtrain: ES:Key:access:roadtrain
+    access:roadtrain:trailers: ES:Key:access:roadtrain:trailers
     addr: ES:Key:addr
     addr: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
     addr:street: ES:Key:addr:street
     addr:subdistrict: ES:Key:addr:subdistrict
     addr:suburb: ES:Key:addr:suburb
+    admin_level: ES:Key:admin level
     aerialway: ES:Key:aerialway
+    aeroway: ES:Key:aeroway
+    after_school: ES:Key:after school
+    agricultural: ES:Key:agricultural
+    alt_name: ES:Key:alt name
     amenity: ES:Key:amenity
+    architect: ES:Key:architect
+    area: ES:Key:area
+    area:highway: ES:Key:area:highway
     artist_name: ES:Key:artist name
     artwork_subject: ES:Key:artwork subject
+    artwork_type: ES:Key:artwork type
+    backrest: ES:Key:backrest
     barrier: ES:Key:barrier
+    bdouble: ES:Key:bdouble
+    beauty: ES:Key:beauty
+    beds: ES:Key:beds
     bicycle_parking: ES:Key:bicycle parking
     bicycle_road: ES:Key:bicycle road
+    board:title: ES:Key:board:title
+    books: ES:Key:books
+    border_type: ES:Key:border type
+    branch: ES:Key:branch
     brand: ES:Key:brand
     brewery: ES:Key:brewery
+    bridge: ES:Key:bridge
     bridge:structure: ES:Key:bridge:structure
     building: ES:Key:building
+    building: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: ES:Key:bus
     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
+    colour: ES:Key:colour
     comment: ES:Key:comment
+    communication:amateur_radio: ES:Key:communication:amateur radio
+    communication:radio: ES:Key:communication:radio
+    communication:television: ES:Key:communication:television
+    community_centre: ES:Key:community centre
+    community_centre:for: ES:Key:community centre:for
     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
+    country: ES:Key:country
+    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
+    cyclestreets_id: ES:Key:cyclestreets id
     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
+    cycleway:right:oneway: ES:Key:cycleway:right:oneway
+    cycleway:surface: ES:Key:cycleway:surface
+    delivery: ES:Key:delivery
+    'demolished:': 'ES:Key:demolished:'
     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
+    diet:vegan: ES:Key:diet:vegan
+    diet:vegetarian: ES:Key:diet:vegetarian
+    direction: ES:Key:direction
+    dispensing: ES:Key:dispensing
+    distance: ES:Key:distance
     disused: ES:Key:disused
     'disused:': 'ES:Key:disused:'
     disused:railway: ES:Key:disused:railway
+    drive_in: ES:Key:drive in
+    drive_through: ES:Key:drive through
+    ele: ES:Key:ele
+    email: ES:Key:email
     embankment: ES:Key:embankment
     emergency: ES:Key:emergency
+    emergency:phone: ES:Key:emergency:phone
     end_date: ES:Key:end date
+    enforcement: ES:Key:enforcement
+    engineer: ES:Key:engineer
     entrance: ES:Key:entrance
     evacuation_route: ES:Key:evacuation route
+    facebook: ES:Key:facebook
     fair_trade: ES:Key:fair trade
+    fax: ES:Key:fax
     fee: ES:Key:fee
     fence_type: ES:Key:fence type
+    fishing: ES:Key:fishing
     fixme: ES:Key:fixme
+    flag:type: ES:Key:flag:type
+    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:method: ES:Key:generator:method
     generator:output: ES:Key:generator:output
     generator:source: ES:Key:generator:source
+    generator:type: ES:Key:generator:type
+    genus: ES:Key:genus
     geological: ES:Key:geological
+    goods: ES:Key:goods
     government: ES:Key:government
     grassland: ES:Key:grassland
+    handrail: ES:Key:handrail
     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
     historic: ES:Key:historic
     historic:civilization: ES:Key:historic:civilization
+    house: ES:Key:house
     image: ES:Key:image
+    imagery_used: ES:Key:imagery used
+    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
+    internet_access: ES:Key:internet access
+    internet_access:fee: ES:Key:internet access:fee
+    interval: ES:Key:interval
+    irrigated: ES:Key:irrigated
     is_in: ES:Key:is in
+    is_in:continent: ES:Key:is in:continent
+    is_in:country: ES:Key:is in:country
+    isced:level: ES:Key:isced:level
+    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
+    layer: ES:Key:layer
     leaf_cycle: ES:Key:leaf cycle
     leaf_type: ES:Key:leaf type
     leisure: ES:Key:leisure
+    length: ES:Key:length
+    level: ES:Key:level
+    lgbtq: ES:Key:lgbtq
+    lhv: ES:Key:lhv
+    lit:perceived: ES:Key:lit:perceived
     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
+    max_age: ES:Key:max age
+    maxaxleload: ES:Key:maxaxleload
+    maxbogieweight: ES:Key:maxbogieweight
     maxheight: ES:Key:maxheight
     maxspeed: ES:Key:maxspeed
+    maxspeed:advisory: ES:Key:maxspeed:advisory
+    maxspeed:practical: ES:Key:maxspeed:practical
+    maxstay: ES:Key:maxstay
+    maxweight: ES:Key:maxweight
+    maxwidth: ES:Key:maxwidth
     memorial: ES:Key:memorial
+    min_age: ES:Key:min age
+    min_height: ES:Key:min height
     monitoring:galileo: ES:Key:monitoring:galileo
     monitoring:glonass: ES:Key:monitoring:glonass
     monitoring:gps: ES:Key:monitoring:gps
+    moped: ES:Key:moped
+    motor_vehicle: ES:Key:motor vehicle
+    motorcar: ES:Key:motorcar
+    motorcycle: ES:Key:motorcycle
+    motorcycle:clothes: ES:Key:motorcycle:clothes
+    motorcycle:parts: ES:Key:motorcycle:parts
+    motorcycle:rental: ES:Key:motorcycle:rental
+    motorcycle: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
+    '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:bicycle: ES:Key:oneway:bicycle
+    oneway:psv: ES:Key:oneway:psv
+    opening_date: ES:Key:opening date
     opening_hours: ES:Key:opening hours
+    opening_hours:covid19: ES:Key:opening hours:covid19
+    openplaques:id: ES:Key:openplaques:id
     operator: ES:Key:operator
     operator:type: ES:Key:operator:type
     organic: ES:Key:organic
+    orienteering: ES:Key:orienteering
     origin: ES:Key:origin
+    osmc:symbol: ES:Key:osmc:symbol
     overtaking: ES:Key:overtaking
     owner: ES:Key:owner
+    ownership: ES:Key:ownership
     parking: ES:Key:parking
+    parking:condition: ES:Key:parking:condition
     parking:lane: ES:Key:parking:lane
+    parking:orientation: ES:Key:parking:orientation
     passenger: ES:Key:passenger
     payment: ES:Key:payment
     phone: ES:Key:phone
     place: ES:Key:place
     placement: ES:Key:placement
+    police: ES:Key:police
     population: ES:Key:population
     power: ES:Key:power
     prepayment: ES:Key:prepayment
     prepayment:*: ES:Key:prepayment:*
     priority: ES:Key:priority
+    priority_road: ES:Key:priority road
+    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
     public_transport:version: ES:Key:public transport:version
     pump: ES:Key:pump
     railway: ES:Key:railway
+    railway:preserved: ES:Key:railway:preserved
+    ramp: ES:Key:ramp
+    recycling_type: ES:Key:recycling type
     ref: ES:Key:ref
     ref:bic: ES:Key:ref:bic
     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
+    route_ref: ES:Key:route ref
     ruins: ES:Key:ruins
     'ruins:': 'ES:Key:ruins:'
     rungs: ES:Key:rungs
     sac_scale: ES:Key:sac scale
     safety_rope: ES:Key:safety rope
     seasonal: ES:Key:seasonal
+    seats: ES:Key:seats
+    second_hand: ES:Key:second hand
+    segregated: ES:Key:segregated
+    self_service: ES:Key:self service
+    service:bicycle:diy: ES:Key:service:bicycle:diy
+    shelter: ES:Key:shelter
+    shelter_type: ES:Key:shelter type
+    shooting: ES:Key:shooting
     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
+    species:de: ES:Key:species:de
     sport: ES:Key:sport
     stars: ES:Key:stars
+    start_date: ES:Key:start date
+    stop: ES:Key:stop
+    substance: ES:Key:substance
+    supervised: ES:Key:supervised
     support: ES:Key:support
     surface: ES:Key:surface
+    surveillance: ES:Key:surveillance
+    surveillance:type: ES:Key:surveillance:type
+    surveillance:zone: ES:Key:surveillance:zone
     symbol: ES:Key:symbol
+    tactile_paving: ES:Key:tactile paving
     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
+    train: ES:Key:train
+    transformer: ES:Key:transformer
+    tree_lined: ES:Key:tree lined
     trolley_wire: ES:Key:trolley wire
     trolleybus: ES:Key:trolleybus
     tunnel: ES:Key:tunnel
     turn: ES:Key:turn
+    twitter: ES:Key:twitter
     type: ES:Key:type
+    unnamed: ES:Key:unnamed
     url: ES:Key:url
+    vaccination: ES:Key:vaccination
+    vehicle: ES:Key:vehicle
+    vending: ES:Key:vending
+    via: ES:Key:via
     water: ES:Key:water
+    water_source: ES:Key:water source
     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
+    width: ES:Key:width
     wikidata: ES:Key:wikidata
     wikimedia_commons: ES:Key:wikimedia commons
     wikipedia: ES:Key:wikipedia
   tag:
+    abandoned:amenity=prison: ES:Tag:abandoned:amenity=prison
     abandoned:amenity=prison_camp: ES:Tag:abandoned:amenity=prison camp
+    access=agricultural: ES:Tag:access=agricultural
     access=customers: ES:Tag:access=customers
+    access=delivery: ES:Tag:access=delivery
+    access=forestry: ES:Tag:access=forestry
+    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=screen: ES:Tag:advertising=screen
+    advertising=tarp: ES:Tag:advertising=tarp
+    advertising=totem: ES:Tag:advertising=totem
+    advertising=wall_painting: ES:Tag:advertising=wall painting
     aerialway=cable_car: ES:Tag:aerialway=cable car
+    aerialway=canopy: ES:Tag:aerialway=canopy
+    aerialway=chair_lift: ES:Tag:aerialway=chair lift
+    aerialway=drag_lift: ES:Tag:aerialway=drag lift
     aerialway=gondola: ES:Tag:aerialway=gondola
+    aerialway=goods: ES:Tag:aerialway=goods
+    aerialway=j-bar: ES:Tag:aerialway=j-bar
+    aerialway=magic_carpet: ES:Tag:aerialway=magic carpet
+    aerialway=mixed_lift: ES:Tag:aerialway=mixed lift
+    aerialway=platter: ES:Tag:aerialway=platter
+    aerialway=pylon: ES:Tag:aerialway=pylon
+    aerialway=rope_tow: ES:Tag:aerialway=rope tow
     aerialway=station: ES:Tag:aerialway=station
+    aerialway=t-bar: ES:Tag:aerialway=t-bar
+    aerialway=zip_line: ES:Tag:aerialway=zip line
+    aerodrome:type=regional: ES:Tag:aerodrome:type=regional
+    aeroway=aerodrome: ES:Tag:aeroway=aerodrome
     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
+    allotments=plot: ES:Tag:allotments=plot
+    amenity=animal_breeding: ES:Tag:amenity=animal breeding
     amenity=animal_shelter: ES:Tag:amenity=animal shelter
     amenity=archive: ES:Tag:amenity=archive
     amenity=arts_centre: ES:Tag:amenity=arts centre
     amenity=atm: ES:Tag:amenity=atm
+    amenity=audiologist: ES:Tag:amenity=audiologist
+    amenity=baby_hatch: ES:Tag:amenity=baby hatch
+    amenity=baking_oven: ES:Tag:amenity=baking oven
     amenity=bank: ES:Tag:amenity=bank
     amenity=bar: ES:Tag:amenity=bar
+    amenity=bbq: ES:Tag:amenity=bbq
     amenity=bench: ES:Tag:amenity=bench
+    amenity=bicycle_library: ES:Tag:amenity=bicycle library
     amenity=bicycle_parking: ES:Tag:amenity=bicycle parking
     amenity=bicycle_rental: ES:Tag:amenity=bicycle rental
+    amenity=bicycle_repair_station: ES:Tag:amenity=bicycle repair station
     amenity=biergarten: ES:Tag:amenity=biergarten
+    amenity=boat_storage: ES:Tag:amenity=boat storage
     amenity=brothel: ES:Tag:amenity=brothel
+    amenity=bureau_de_change: ES:Tag:amenity=bureau de change
     amenity=bus_station: ES:Tag:amenity=bus station
     amenity=cafe: ES:Tag:amenity=cafe
     amenity=car_rental: ES:Tag:amenity=car rental
     amenity=car_wash: ES:Tag:amenity=car wash
+    amenity=casino: ES:Tag:amenity=casino
+    amenity=childcare: ES:Tag:amenity=childcare
+    amenity=cinema: ES:Tag:amenity=cinema
     amenity=clinic: ES:Tag:amenity=clinic
+    amenity=clock: ES:Tag:amenity=clock
     amenity=college: ES:Tag:amenity=college
     amenity=community_centre: ES:Tag:amenity=community centre
+    amenity=compressed_air: ES:Tag:amenity=compressed air
+    amenity=conference_centre: ES:Tag:amenity=conference centre
     amenity=courthouse: ES:Tag:amenity=courthouse
+    amenity=coworking_space: ES:Tag:amenity=coworking space
     amenity=crematorium: ES:Tag:amenity=crematorium
     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
     amenity=drinking_water: ES:Tag:amenity=drinking water
     amenity=driving_school: ES:Tag:amenity=driving school
+    amenity=dryer: ES:Tag:amenity=dryer
     amenity=embassy: ES:Tag:amenity=embassy
     amenity=events_venue: ES:Tag:amenity=events venue
     amenity=exhibition_centre: ES:Tag:amenity=exhibition centre
     amenity=fast_food: ES:Tag:amenity=fast food
     amenity=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=grit_bin: ES:Tag:amenity=grit bin
+    amenity=harbourmaster: ES:Tag:amenity=harbourmaster
+    amenity=hitching_post: ES:Tag:amenity=hitching post
     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=life_ring: ES:Tag:amenity=life ring
+    amenity=lost_property_office: ES:Tag:amenity=lost property office
+    amenity=lounger: ES:Tag:amenity=lounger
     amenity=love_hotel: ES:Tag:amenity=love hotel
     amenity=marketplace: ES:Tag:amenity=marketplace
     amenity=mobile_library: ES:Tag:amenity=mobile library
+    amenity=mobile_money_agent: ES:Tag:amenity=mobile money agent
+    amenity=money_transfer: ES:Tag:amenity=money transfer
+    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=outfitter: ES:Tag:amenity=outfitter
     amenity=parking: ES:Tag:amenity=parking
+    amenity=parking_entrance: ES:Tag:amenity=parking entrance
     amenity=parking_space: ES:Tag:amenity=parking space
     amenity=payment_centre: ES:Tag:amenity=payment centre
     amenity=payment_terminal: ES:Tag:amenity=payment terminal
     amenity=pharmacy: ES:Tag:amenity=pharmacy
     amenity=photo_booth: ES:Tag:amenity=photo booth
+    amenity=piano: ES:Tag:amenity=piano
+    amenity=place_of_mourning: ES:Tag:amenity=place of mourning
     amenity=place_of_worship: ES:Tag:amenity=place of worship
+    amenity=planetarium: ES:Tag:amenity=planetarium
     amenity=police: ES:Tag:amenity=police
+    amenity=post_box: ES:Tag:amenity=post box
+    amenity=post_depot: ES:Tag:amenity=post depot
+    amenity=post_office: ES:Tag:amenity=post office
+    amenity=prep_school: ES:Tag:amenity=prep school
+    amenity=printer: ES:Tag:amenity=printer
+    amenity=prison: ES:Tag:amenity=prison
     amenity=prison_camp: ES:Tag:amenity=prison camp
     amenity=pub: ES:Tag:amenity=pub
+    amenity=public_bath: ES:Tag:amenity=public bath
     amenity=public_bookcase: ES:Tag:amenity=public bookcase
     amenity=public_building: ES:Tag:amenity=public building
+    amenity=ranger_station: ES:Tag:amenity=ranger station
     amenity=recycling: ES:Tag:amenity=recycling
     amenity=refugee_housing: ES:Tag:amenity=refugee housing
+    amenity=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=telephone: ES:Tag:amenity=telephone
+    amenity=television: ES:Tag:amenity=television
     amenity=theatre: ES:Tag:amenity=theatre
+    amenity=toilets: ES:Tag:amenity=toilets
+    amenity=tourist_bus_parking: ES:Tag:amenity=tourist bus parking
     amenity=townhall: ES:Tag:amenity=townhall
+    amenity=toy_library: ES:Tag:amenity=toy library
+    amenity=trolley_bay: ES:Tag:amenity=trolley bay
     amenity=university: ES:Tag:amenity=university
     amenity=vehicle_inspection: ES:Tag:amenity=vehicle inspection
     amenity=vending_machine: ES:Tag:amenity=vending machine
     amenity=veterinary: ES:Tag:amenity=veterinary
+    amenity=washing_machine: ES:Tag:amenity=washing machine
     amenity=waste_basket: ES:Tag:amenity=waste basket
     amenity=waste_disposal: ES:Tag:amenity=waste disposal
     amenity=water_point: ES:Tag:amenity=water point
     amenity=watering_place: ES:Tag:amenity=watering place
+    amenity=weighbridge: ES:Tag:amenity=weighbridge
     amenity=youth_centre: ES:Tag:amenity=youth centre
+    animal=school: ES:Tag:animal=school
+    anthropogenic=yes: ES:Tag:anthropogenic=yes
+    area:highway=cycleway: ES:Tag:area:highway=cycleway
+    area:highway=footway: ES:Tag:area:highway=footway
+    area:highway=path: ES:Tag:area:highway=path
+    area:highway=pedestrian: ES:Tag:area:highway=pedestrian
+    artwork_type=sculpture: ES:Tag:artwork type=sculpture
+    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=cattle_grid: ES:Tag:barrier=cattle grid
     barrier=chain: ES:Tag:barrier=chain
+    barrier=city_wall: ES:Tag:barrier=city wall
+    barrier=debris: ES:Tag:barrier=debris
     barrier=entrance: ES:Tag:barrier=entrance
     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
     barrier=kerb: ES:Tag:barrier=kerb
     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=no: ES:Tag:bicycle=no
     bicycle=use_sidepath: ES:Tag:bicycle=use sidepath
+    bicycle=yes: ES:Tag:bicycle=yes
+    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
     boundary=regional_park: ES:Tag:boundary=regional park
+    bridge:structure=beam: ES:Tag:bridge:structure=beam
     bridge=aqueduct: ES:Tag:bridge=aqueduct
+    bridge=boardwalk: ES:Tag:bridge=boardwalk
+    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=storage_tank: ES:Tag:building=storage tank
     building=sty: ES:Tag:building=sty
+    building=supermarket: ES:Tag:building=supermarket
+    building=synagogue: ES:Tag:building=synagogue
+    building=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
+    building=yes: ES:Tag:building=yes
+    busway=lane: ES:Tag:busway=lane
+    castle_type=manor: ES:Tag:castle type=manor
     cemetery=grave: ES:Tag:cemetery=grave
+    cemetery=sector: ES:Tag:cemetery=sector
+    clothes=fashion: ES:Tag:clothes=fashion
     club=scout: ES:Tag:club=scout
+    club=sport: ES:Tag:club=sport
+    company=logistics: ES:Tag:company=logistics
     craft=agricultural_engines: ES:Tag:craft=agricultural engines
     craft=bakery: ES:Tag:craft=bakery
+    craft=basket_maker: ES:Tag:craft=basket maker
     craft=beekeeper: ES:Tag:craft=beekeeper
+    craft=blacksmith: ES:Tag:craft=blacksmith
+    craft=boatbuilder: ES:Tag:craft=boatbuilder
+    craft=bookbinder: ES:Tag:craft=bookbinder
     craft=brewery: ES:Tag:craft=brewery
+    craft=builder: ES:Tag:craft=builder
+    craft=carpet_layer: ES:Tag:craft=carpet layer
+    craft=caterer: ES:Tag:craft=caterer
+    craft=chimney_sweeper: ES:Tag:craft=chimney sweeper
     craft=clockmaker: ES:Tag:craft=clockmaker
+    craft=confectionery: ES:Tag:craft=confectionery
+    craft=dental_technician: ES:Tag:craft=dental technician
+    craft=distillery: ES:Tag:craft=distillery
+    craft=dressmaker: ES:Tag:craft=dressmaker
     craft=electrician: ES:Tag:craft=electrician
+    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=photographic_laboratory: ES:Tag:craft=photographic laboratory
     craft=plumber: ES:Tag:craft=plumber
+    craft=pottery: ES:Tag:craft=pottery
+    craft=printer: ES:Tag:craft=printer
+    craft=restoration: ES:Tag:craft=restoration
+    craft=shoemaker: ES:Tag:craft=shoemaker
+    craft=stand_builder: ES:Tag:craft=stand builder
+    craft=tailor: ES:Tag:craft=tailor
     craft=tiler: ES:Tag:craft=tiler
+    craft=upholsterer: ES:Tag:craft=upholsterer
     craft=watchmaker: ES:Tag:craft=watchmaker
+    craft=welder: ES:Tag:craft=welder
+    craft=winery: ES:Tag:craft=winery
+    crossing=marked: ES:Tag:crossing=marked
+    crossing=traffic_signals: ES:Tag:crossing=traffic signals
+    crossing=uncontrolled: ES:Tag:crossing=uncontrolled
+    crossing=zebra: ES:Tag:crossing=zebra
+    cuisine=fish_and_chips: ES:Tag:cuisine=fish and chips
+    cycleway:both=lane: ES:Tag:cycleway:both=lane
+    cycleway:both=no: ES:Tag:cycleway:both=no
+    cycleway:left=track: ES:Tag:cycleway:left=track
+    cycleway:right=lane: ES:Tag:cycleway:right=lane
+    cycleway:right=track: ES:Tag:cycleway:right=track
+    cycleway=crossing: ES:Tag:cycleway=crossing
     cycleway=lane: ES:Tag:cycleway=lane
+    cycleway=no: ES:Tag:cycleway=no
+    cycleway=opposite: ES:Tag:cycleway=opposite
+    cycleway=opposite_lane: ES:Tag:cycleway=opposite lane
+    cycleway=opposite_track: ES:Tag:cycleway=opposite track
+    cycleway=separate: ES:Tag:cycleway=separate
     cycleway=share_busway: ES:Tag:cycleway=share busway
     cycleway=track: ES:Tag:cycleway=track
+    denomination=mormon: ES:Tag:denomination=mormon
+    disused=yes: ES:Tag:disused=yes
     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=lifeguard: ES:Tag:emergency=lifeguard
+    emergency=lifeguard_tower: ES:Tag:emergency=lifeguard tower
     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
+    foot=use_sidepath: ES:Tag:foot=use sidepath
+    footway=access_aisle: ES:Tag:footway=access aisle
     footway=crossing: ES:Tag:footway=crossing
     footway=sidewalk: ES:Tag:footway=sidewalk
+    ford=stepping_stones: ES:Tag:ford=stepping stones
+    ford=yes: ES:Tag:ford=yes
+    garden:type=botanical: ES:Tag:garden:type=botanical
+    generator:method=combustion: ES:Tag:generator:method=combustion
     generator:method=photovoltaic: ES:Tag:generator:method=photovoltaic
     generator:method=thermal: ES:Tag:generator:method=thermal
     generator:method=wind_turbine: ES:Tag:generator:method=wind turbine
@@ -8686,66 +12764,152 @@ es:
     generator:type=solar_thermal_collector: ES:Tag:generator:type=solar thermal collector
     generator:type=vertical_axis: ES:Tag:generator:type=vertical axis
     geological=moraine: ES:Tag:geological=moraine
+    geological=outcrop: ES:Tag:geological=outcrop
+    geological=palaeontological_site: ES:Tag:geological=palaeontological site
+    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
+    hazard=animal_crossing: ES:Tag:hazard=animal crossing
+    hazard=contamination: ES:Tag:hazard=contamination
+    hazard=cyclists: ES:Tag:hazard=cyclists
+    hazard=dangerous_junction: ES:Tag:hazard=dangerous junction
+    hazard=horse_riders: ES:Tag:hazard=horse riders
+    hazard=queues_likely: ES:Tag:hazard=queues likely
+    hazard=slippery: ES:Tag:hazard=slippery
+    healthcare:speciality=vaccination: ES:Tag:healthcare:speciality=vaccination
+    healthcare=birthing_center: ES:Tag:healthcare=birthing center
+    healthcare=clinic: ES:Tag:healthcare=clinic
+    healthcare=dentist: ES:Tag:healthcare=dentist
+    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
+    healthcare=vaccination_centre: ES:Tag:healthcare=vaccination centre
     highway=bridleway: ES:Tag:highway=bridleway
     highway=bus_guideway: ES:Tag:highway=bus guideway
     highway=bus_stop: ES:Tag:highway=bus stop
+    highway=busway: ES:Tag:highway=busway
     highway=byway: ES:Tag:highway=byway
     highway=corridor: ES:Tag:highway=corridor
     highway=crossing: ES:Tag:highway=crossing
     highway=cycleway: ES:Tag:highway=cycleway
     highway=elevator: ES:Tag:highway=elevator
+    highway=emergency_access_point: ES:Tag:highway=emergency access point
+    highway=emergency_bay: ES:Tag:highway=emergency bay
     highway=escape: ES:Tag:highway=escape
     highway=footway: ES:Tag:highway=footway
     highway=living_street: ES:Tag:highway=living street
     highway=milestone: ES:Tag:highway=milestone
+    highway=mini_roundabout: ES:Tag:highway=mini roundabout
     highway=motorway: ES:Tag:highway=motorway
     highway=motorway_junction: ES:Tag:highway=motorway junction
     highway=motorway_link: ES:Tag:highway=motorway link
+    highway=passing_place: ES:Tag:highway=passing place
     highway=path: ES:Tag:highway=path
     highway=pedestrian: ES:Tag:highway=pedestrian
     highway=platform: ES:Tag:highway=platform
     highway=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
     highway=street_lamp: ES:Tag:highway=street lamp
     highway=tertiary: ES:Tag:highway=tertiary
+    highway=tertiary_link: ES:Tag:highway=tertiary link
     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=trunk_link: ES:Tag:highway=trunk link
     highway=turning_circle: ES:Tag:highway=turning circle
     highway=turning_loop: ES:Tag:highway=turning loop
     highway=unclassified: ES:Tag:highway=unclassified
+    historic=aqueduct: ES:Tag:historic=aqueduct
+    historic=archaeological_site: ES:Tag:historic=archaeological site
+    historic=boundary_stone: ES:Tag:historic=boundary stone
+    historic=castle: ES:Tag:historic=castle
+    historic=cemetery: ES:Tag:historic=cemetery
+    historic=district: ES:Tag:historic=district
     historic=farm: ES:Tag:historic=farm
+    historic=fort: ES:Tag:historic=fort
     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=monastery: ES:Tag:historic=monastery
+    historic=monument: ES:Tag:historic=monument
     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=mine: ES:Tag:industrial=mine
+    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=no: ES:Tag:internet access=no
     internet_access=wlan: ES:Tag:internet access=wlan
+    internet_access=yes: ES:Tag:internet access=yes
+    junction=circular: ES:Tag:junction=circular
     junction=roundabout: ES:Tag:junction=roundabout
+    karst=yes: ES:Tag:karst=yes
     landcover=grass: ES:Tag:landcover=grass
     landcover=trees: ES:Tag:landcover=trees
     landuse=allotments: ES:Tag:landuse=allotments
     landuse=apiary: ES:Tag:landuse=apiary
+    landuse=aquaculture: ES:Tag:landuse=aquaculture
     landuse=basin: ES:Tag:landuse=basin
     landuse=brownfield: ES:Tag:landuse=brownfield
     landuse=cemetery: ES:Tag:landuse=cemetery
+    landuse=commercial: ES:Tag:landuse=commercial
     landuse=construction: ES:Tag:landuse=construction
     landuse=depot: ES:Tag:landuse=depot
+    landuse=education: ES:Tag:landuse=education
     landuse=farmland: ES:Tag:landuse=farmland
+    landuse=farmyard: ES:Tag:landuse=farmyard
+    landuse=flowerbed: ES:Tag:landuse=flowerbed
     landuse=forest: ES:Tag:landuse=forest
     landuse=garages: ES:Tag:landuse=garages
     landuse=grass: ES:Tag:landuse=grass
@@ -8754,67 +12918,124 @@ 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=military: ES:Tag:landuse=military
     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
     landuse=residential: ES:Tag:landuse=residential
+    landuse=retail: ES:Tag:landuse=retail
     landuse=salt_pond: ES:Tag:landuse=salt pond
     landuse=traffic_island: ES:Tag:landuse=traffic island
     landuse=village_green: ES:Tag:landuse=village green
+    landuse=vineyard: ES:Tag:landuse=vineyard
+    leaf_cycle=deciduous: ES:Tag:leaf cycle=deciduous
     leaf_cycle=evergreen: ES:Tag:leaf cycle=evergreen
+    leaf_cycle=mixed: ES:Tag:leaf cycle=mixed
+    leaf_cycle=semi_deciduous: ES:Tag:leaf cycle=semi deciduous
+    leaf_cycle=semi_evergreen: ES:Tag:leaf cycle=semi evergreen
     leaf_type=broadleaved: ES:Tag:leaf type=broadleaved
     leaf_type=leafless: ES:Tag:leaf type=leafless
     leaf_type=mixed: ES:Tag:leaf type=mixed
     leaf_type=needleleaved: ES:Tag:leaf type=needleleaved
+    leisure=adult_gaming_centre: ES:Tag:leisure=adult gaming centre
+    leisure=amusement_arcade: ES:Tag:leisure=amusement arcade
     leisure=bandstand: ES:Tag:leisure=bandstand
+    leisure=barefoot: ES:Tag:leisure=barefoot
     leisure=bird_hide: ES:Tag:leisure=bird hide
     leisure=bleachers: ES:Tag:leisure=bleachers
+    leisure=bowling_alley: ES:Tag:leisure=bowling alley
     leisure=common: ES:Tag:leisure=common
+    leisure=dance: ES:Tag:leisure=dance
+    leisure=disc_golf_course: ES:Tag:leisure=disc golf course
     leisure=dog_park: ES:Tag:leisure=dog park
+    leisure=escape_game: ES:Tag:leisure=escape game
     leisure=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=ice_rink: ES:Tag:leisure=ice rink
     leisure=marina: ES:Tag:leisure=marina
     leisure=miniature_golf: ES:Tag:leisure=miniature golf
     leisure=nature_reserve: ES:Tag:leisure=nature reserve
+    leisure=outdoor_seating: ES:Tag:leisure=outdoor seating
     leisure=park: ES:Tag:leisure=park
     leisure=picnic_table: ES:Tag:leisure=picnic table
     leisure=pitch: ES:Tag:leisure=pitch
     leisure=playground: ES:Tag:leisure=playground
+    leisure=resort: ES:Tag:leisure=resort
+    leisure=sauna: ES:Tag:leisure=sauna
+    leisure=schoolyard: ES:Tag:leisure=schoolyard
+    leisure=slipway: ES:Tag:leisure=slipway
     leisure=sports_centre: ES:Tag:leisure=sports centre
+    leisure=sports_hall: ES:Tag:leisure=sports hall
+    leisure=stadium: ES:Tag:leisure=stadium
+    leisure=swimming_area: ES:Tag:leisure=swimming area
+    leisure=swimming_pool: ES:Tag:leisure=swimming pool
+    leisure=tanning_salon: ES:Tag:leisure=tanning salon
+    leisure=track: ES:Tag:leisure=track
     leisure=water_park: ES:Tag:leisure=water park
+    leisure=wildlife_hide: ES:Tag:leisure=wildlife hide
+    lifeguard=tower: ES:Tag:lifeguard=tower
     man_made=adit: ES:Tag:man made=adit
     man_made=archimedes_screw: ES:Tag:man made=archimedes screw
     man_made=beehive: ES:Tag:man made=beehive
+    man_made=breakwater: ES:Tag:man made=breakwater
     man_made=bridge: ES:Tag:man made=bridge
+    man_made=chimney: ES:Tag:man made=chimney
+    man_made=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=manhole: ES:Tag:man made=manhole
     man_made=mast: ES:Tag:man made=mast
+    man_made=mineshaft: ES:Tag:man made=mineshaft
     man_made=monitoring_station: ES:Tag:man made=monitoring station
     man_made=nesting_site: ES:Tag:man made=nesting site
+    man_made=observatory: ES:Tag:man made=observatory
     man_made=pier: ES:Tag:man made=pier
+    man_made=planter: ES:Tag:man made=planter
     man_made=power_wind: ES:Tag:man made=power wind
     man_made=pumping_rig: ES:Tag:man made=pumping rig
     man_made=pumping_station: ES:Tag:man made=pumping station
     man_made=reservoir_covered: ES:Tag:man made=reservoir covered
     man_made=storage_tank: ES:Tag:man made=storage tank
+    man_made=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=tailings_pond: ES:Tag:man made=tailings pond
+    man_made=telescope: ES:Tag:man made=telescope
+    man_made=tell: ES:Tag:man made=tell
+    man_made=threshing_floor: ES:Tag:man made=threshing floor
+    man_made=tower: ES:Tag:man made=tower
     man_made=wastewater_plant: ES:Tag:man made=wastewater plant
     man_made=water_tap: ES:Tag:man made=water tap
     man_made=water_tower: ES:Tag:man made=water tower
     man_made=water_well: ES:Tag:man made=water well
     man_made=water_works: ES:Tag:man made=water works
     man_made=watermill: ES:Tag:man made=watermill
+    man_made=wildlife_crossing: ES:Tag:man made=wildlife crossing
     man_made=wildlife_opening: ES:Tag:man made=wildlife opening
     man_made=windpump: ES:Tag:man made=windpump
+    man_made=works: ES:Tag:man made=works
+    manhole=drain: ES:Tag:manhole=drain
+    memorial:type=stolperstein: ES:Tag:memorial:type=stolperstein
     memorial=blue_plaque: ES:Tag:memorial=blue plaque
     memorial=bust: ES:Tag:memorial=bust
+    memorial=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
     memorial=statue: ES:Tag:memorial=statue
@@ -8822,47 +13043,85 @@ es:
     memorial=stolperstein: ES:Tag:memorial=stolperstein
     memorial=stone: ES:Tag:memorial=stone
     memorial=war_memorial: ES:Tag:memorial=war memorial
+    military=barracks: ES:Tag:military=barracks
+    military=base: ES:Tag:military=base
     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
     natural=bay: ES:Tag:natural=bay
     natural=beach: ES:Tag:natural=beach
+    natural=blowhole: ES:Tag:natural=blowhole
     natural=cave_entrance: ES:Tag:natural=cave entrance
     natural=cliff: ES:Tag:natural=cliff
     natural=coastline: ES:Tag:natural=coastline
+    natural=desert: ES:Tag:natural=desert
+    natural=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
     natural=glacier: ES:Tag:natural=glacier
+    natural=gorge: ES:Tag:natural=gorge
     natural=grassland: ES:Tag:natural=grassland
     natural=heath: ES:Tag:natural=heath
+    natural=hill: ES:Tag:natural=hill
+    natural=meadow: ES:Tag:natural=meadow
     natural=moor: ES:Tag:natural=moor
+    natural=mountain_range: ES:Tag:natural=mountain range
     natural=mud: ES:Tag:natural=mud
+    natural=naled: ES:Tag:natural=naled
     natural=peak: ES:Tag:natural=peak
     natural=ridge: ES:Tag:natural=ridge
+    natural=riverbed: ES:Tag:natural=riverbed
     natural=rock: ES:Tag:natural=rock
     natural=saddle: ES:Tag:natural=saddle
     natural=sand: ES:Tag:natural=sand
     natural=scree: ES:Tag:natural=scree
     natural=scrub: ES:Tag:natural=scrub
     natural=shingle: ES:Tag:natural=shingle
+    natural=shoal: ES:Tag:natural=shoal
+    natural=shrub: ES:Tag:natural=shrub
     natural=sinkhole: ES:Tag:natural=sinkhole
     natural=spring: ES:Tag:natural=spring
     natural=stone: ES:Tag:natural=stone
     natural=tree: ES:Tag:natural=tree
     natural=tree_row: ES:Tag:natural=tree row
+    natural=tree_stump: ES:Tag:natural=tree stump
     natural=valley: ES:Tag:natural=valley
     natural=volcano: ES:Tag:natural=volcano
     natural=water: ES:Tag:natural=water
     natural=wetland: ES:Tag:natural=wetland
     natural=wood: ES:Tag:natural=wood
+    network=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
+    noname=yes: ES:Tag:noname=yes
+    office=accountant: ES:Tag:office=accountant
+    office=administrative: ES:Tag:office=administrative
     office=advertising_agency: ES:Tag:office=advertising agency
+    office=architect: ES:Tag:office=architect
     office=association: ES:Tag:office=association
+    office=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
     office=logistics: ES:Tag:office=logistics
     office=moving_company: ES:Tag:office=moving company
@@ -8870,28 +13129,81 @@ es:
     office=ngo: ES:Tag:office=ngo
     office=notary: ES:Tag:office=notary
     office=occupational_safety: ES:Tag:office=occupational safety
+    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=union: ES:Tag:office=union
+    office=visa: ES:Tag:office=visa
+    office=water_utility: ES:Tag:office=water utility
+    office=yes: ES:Tag:office=yes
+    oneway:bicycle=yes: ES:Tag:oneway:bicycle=yes
+    oneway=reversible: ES:Tag:oneway=reversible
+    operator=GRDF: ES:Tag:operator=GRDF
+    parking=lane: ES:Tag:parking=lane
+    parking=multi-storey: ES:Tag:parking=multi-storey
+    parking=street_side: ES:Tag:parking=street side
+    parking=underground: ES:Tag:parking=underground
     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
+    plant:method=photovoltaic: ES:Tag:plant:method=photovoltaic
+    plant:method=thermal: ES:Tag:plant:method=thermal
+    plant:source=solar: ES:Tag:plant:source=solar
+    playground=structure: ES:Tag:playground=structure
+    police=barracks: ES:Tag:police=barracks
+    police=car_pound: ES:Tag:police=car pound
+    police=checkpoint: ES:Tag:police=checkpoint
+    police=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=plant: ES:Tag:power=plant
     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
@@ -8902,25 +13214,71 @@ 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=stop: ES:Tag:railway=stop
     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
+    recycling_type=centre: ES:Tag:recycling type=centre
+    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=hiking: ES:Tag:route=hiking
+    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=busway: ES:Tag:service=busway
     service=crossover: ES:Tag:service=crossover
+    service=drive-through: ES:Tag:service=drive-through
+    service=driveway: ES:Tag:service=driveway
+    service=emergency_access: ES:Tag:service=emergency access
     service=parking_aisle: ES:Tag:service=parking aisle
+    service=siding: ES:Tag:service=siding
+    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=anime: ES:Tag:shop=anime
+    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=beauty: ES:Tag:shop=beauty
     shop=bed: ES:Tag:shop=bed
     shop=beverages: ES:Tag:shop=beverages
     shop=bicycle: ES:Tag:shop=bicycle
     shop=bookmaker: ES:Tag:shop=bookmaker
     shop=books: ES:Tag:shop=books
     shop=butcher: ES:Tag:shop=butcher
+    shop=cannabis: ES:Tag:shop=cannabis
+    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=cheese: ES:Tag:shop=cheese
+    shop=chemist: ES:Tag:shop=chemist
     shop=chocolate: ES:Tag:shop=chocolate
     shop=clothes: ES:Tag:shop=clothes
     shop=collector: ES:Tag:shop=collector
@@ -8929,89 +13287,262 @@ es:
     shop=convenience: ES:Tag:shop=convenience
     shop=copyshop: ES:Tag:shop=copyshop
     shop=craft: ES:Tag:shop=craft
+    shop=curtain: ES:Tag:shop=curtain
+    shop=dairy: ES:Tag:shop=dairy
+    shop=deli: ES:Tag:shop=deli
+    shop=department_store: ES:Tag:shop=department store
     shop=doityourself: ES:Tag:shop=doityourself
+    shop=dry_cleaning: ES:Tag:shop=dry cleaning
     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=estate_agent: ES:Tag:shop=estate agent
+    shop=fabric: ES:Tag:shop=fabric
+    shop=farm: ES:Tag:shop=farm
+    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=general: ES:Tag:shop=general
     shop=gift: ES:Tag:shop=gift
+    shop=glaziery: ES:Tag:shop=glaziery
     shop=greengrocer: ES:Tag:shop=greengrocer
+    shop=grocery: ES:Tag:shop=grocery
     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=massage: ES:Tag:shop=massage
+    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=money_lender: ES:Tag:shop=money lender
     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=newsagent: ES:Tag:shop=newsagent
+    shop=nutrition_supplements: ES:Tag:shop=nutrition supplements
+    shop=nuts: ES:Tag:shop=nuts
     shop=optician: ES:Tag:shop=optician
     shop=outdoor: ES:Tag:shop=outdoor
     shop=paint: ES:Tag:shop=paint
     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=pyrotechnics: ES:Tag:shop=pyrotechnics
+    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
+    shop=storage_rental: ES:Tag:shop=storage rental
+    shop=supermarket: ES:Tag:shop=supermarket
+    shop=surf: ES:Tag:shop=surf
+    shop=tailor: ES:Tag:shop=tailor
     shop=tattoo: ES:Tag:shop=tattoo
     shop=tea: ES:Tag:shop=tea
     shop=ticket: ES:Tag:shop=ticket
     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=wine: ES:Tag:shop=wine
+    shop=yes: ES:Tag:shop=yes
+    sinkhole=estavelle: ES:Tag:sinkhole=estavelle
+    site_type=petroglyph: ES:Tag:site type=petroglyph
+    site_type=settlement: ES:Tag:site type=settlement
+    social_facility=assisted_living: ES:Tag:social facility=assisted living
     social_facility=clothing_bank: ES:Tag:social facility=clothing bank
+    social_facility=food_bank: ES:Tag:social facility=food bank
+    social_facility=group_home: ES:Tag:social facility=group home
+    social_facility=nursing_home: ES:Tag:social facility=nursing home
+    social_facility=outreach: ES:Tag:social facility=outreach
+    social_facility=soup_kitchen: ES:Tag:social facility=soup kitchen
     source:geometry=Bing: ES:Tag:source:geometry=Bing
+    sport=basketball: ES:Tag:sport=basketball
     sport=boules: ES:Tag:sport=boules
+    sport=bullfighting: ES:Tag:sport=bullfighting
+    sport=chess: ES:Tag:sport=chess
+    sport=climbing: ES:Tag:sport=climbing
+    sport=cockfighting: ES:Tag:sport=cockfighting
+    sport=cricket_nets: ES:Tag:sport=cricket nets
     sport=cycling: ES:Tag:sport=cycling
+    sport=dog_racing: ES:Tag:sport=dog racing
     sport=equestrian: ES:Tag:sport=equestrian
     sport=futsal: ES:Tag:sport=futsal
+    sport=golf: ES:Tag:sport=golf
+    sport=handball: ES:Tag:sport=handball
+    sport=horse_racing: ES:Tag:sport=horse racing
     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
+    sport=paintball: ES:Tag:sport=paintball
+    sport=pelota: ES:Tag:sport=pelota
     sport=shooting: ES:Tag:sport=shooting
     sport=soccer: ES:Tag:sport=soccer
+    sport=surfing: ES:Tag:sport=surfing
+    sport=swimming: ES:Tag:sport=swimming
+    sport=table_tennis: ES:Tag:sport=table tennis
+    sport=tennis: ES:Tag:sport=tennis
+    sport=volleyball: ES:Tag:sport=volleyball
+    sport=water_polo: ES:Tag:sport=water polo
+    sport=yoga: ES:Tag:sport=yoga
+    station=subway: ES:Tag:station=subway
+    street_vendor=yes: ES:Tag:street vendor=yes
+    substation=distribution: ES:Tag:substation=distribution
+    substation=minor_distribution: ES:Tag:substation=minor distribution
+    substation=transmission: ES:Tag:substation=transmission
+    surface=asphalt: ES:Tag:surface=asphalt
+    surface=compacted: ES:Tag:surface=compacted
+    surface=concrete: ES:Tag:surface=concrete
+    surface=paved: ES:Tag:surface=paved
+    surface=tartan: ES:Tag:surface=tartan
+    surface=unpaved: ES:Tag:surface=unpaved
+    switch=disconnector: ES:Tag:switch=disconnector
+    tactile_paving=no: ES:Tag:tactile paving=no
+    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
+    toll=yes: ES:Tag:toll=yes
+    tomb=cenotaph: ES:Tag:tomb=cenotaph
+    tomb=columbarium: ES:Tag:tomb=columbarium
+    tomb=mausoleum: ES:Tag:tomb=mausoleum
+    tomb=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
+    tourism=chalet: ES:Tag:tourism=chalet
+    tourism=gallery: ES:Tag:tourism=gallery
+    tourism=guest_house: ES:Tag:tourism=guest house
+    tourism=hostel: ES:Tag:tourism=hostel
     tourism=hotel: ES:Tag:tourism=hotel
+    tourism=information: ES:Tag:tourism=information
     tourism=motel: ES:Tag:tourism=motel
+    tourism=museum: ES:Tag:tourism=museum
     tourism=picnic_site: ES:Tag:tourism=picnic site
+    tourism=theme_park: ES:Tag:tourism=theme park
     tourism=trail_riding_station: ES:Tag:tourism=trail riding station
     tourism=viewpoint: ES:Tag:tourism=viewpoint
+    tourism=wilderness_hut: ES:Tag:tourism=wilderness hut
+    tourism=wine_cellar: ES:Tag:tourism=wine cellar
+    tower:type=bell_tower: ES:Tag:tower:type=bell tower
+    tower:type=communication: ES:Tag:tower:type=communication
+    tower:type=cooling: ES:Tag:tower:type=cooling
+    tower:type=defensive: ES:Tag:tower:type=defensive
+    tower:type=minaret: ES:Tag:tower:type=minaret
+    tower:type=observation: ES:Tag:tower:type=observation
+    tower:type=watchtower: ES:Tag:tower:type=watchtower
+    traffic_calming=bump: ES:Tag:traffic calming=bump
+    traffic_calming=cushion: ES:Tag:traffic calming=cushion
+    traffic_calming=dip: ES:Tag:traffic calming=dip
+    traffic_calming=hump: ES:Tag:traffic calming=hump
     traffic_calming=island: ES:Tag:traffic calming=island
+    traffic_calming=rumble_strip: ES:Tag:traffic calming=rumble strip
+    traffic_calming=table: ES:Tag:traffic calming=table
+    traffic_sign=city_limit: ES:Tag:traffic sign=city limit
+    transformer=distribution: ES:Tag:transformer=distribution
+    trees=apple_trees: ES:Tag:trees=apple trees
+    trees=oil_palms: ES:Tag:trees=oil palms
+    trees=olive_trees: ES:Tag:trees=olive trees
+    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
+    vending=public_transport_tickets: ES:Tag:vending=public transport tickets
     wall=dry_stone: ES:Tag:wall=dry stone
+    wall=noise_barrier: ES:Tag:wall=noise barrier
+    wall=tire_barrier: ES:Tag:wall=tire barrier
+    water=canal: ES:Tag:water=canal
+    water=fish_pass: ES:Tag:water=fish pass
+    water=lagoon: ES:Tag:water=lagoon
+    water=lake: ES:Tag:water=lake
+    water=pond: ES:Tag:water=pond
     water=reservoir: ES:Tag:water=reservoir
+    water=river: ES:Tag:water=river
+    water=wastewater: ES:Tag:water=wastewater
+    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=rapids: ES:Tag:waterway=rapids
     waterway=river: ES:Tag:waterway=river
     waterway=riverbank: ES:Tag:waterway=riverbank
     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=mangrove: ES:Tag:wetland=mangrove
+    wetland=reedbed: ES:Tag:wetland=reedbed
     wetland=tidalflat: ES:Tag:wetland=tidalflat
+    wetland=wet_meadow: ES:Tag:wetland=wet meadow
+    worship=stations_of_the_cross: ES:Tag:worship=stations of the cross
+    zoo=falconry: ES:Tag:zoo=falconry
 et:
   key:
     addr: Et:Key:addr
@@ -9027,10 +13558,53 @@ et:
     building=roof: Et:Tag:building=roof
 fa:
   key:
+    addr: Fa:Key:addr
+    area: Fa:Key:area
+    barrier: Fa:Key:barrier
+    bridge: Fa:Key:bridge
+    comment: Fa:Key:comment
+    enforcement: Fa:Key:enforcement
     highway: Fa:Key:highway
-    name: FA:Key:name
+    intermittent: Fa:Key:intermittent
+    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
+    amenity=vehicle_inspection: Fa:Tag:amenity=vehicle inspection
+    barrier=block: Fa:Tag:barrier=block
+    barrier=cable_barrier: Fa:Tag:barrier=cable barrier
+    canal=qanat: Fa:Tag:canal=qanat
+    highway=footway: Fa:Tag:highway=footway
+    highway=path: Fa:Tag:highway=path
+    highway=residential: Fa:Tag:highway=residential
+    highway=road: Fa:Tag:highway=road
+    highway=secondary: Fa:Tag:highway=secondary
+    highway=secondary_link: Fa:Tag:highway=secondary link
+    highway=service: Fa:Tag:highway=service
+    highway=tertiary: Fa:Tag:highway=tertiary
+    highway=track: Fa:Tag:highway=track
+    highway=unclassified: Fa:Tag:highway=unclassified
+    junction=yes: Fa:Tag:junction=yes
+    man_made=qanat: Fa:Tag:man made=qanat
+    man_made=water_tower: Fa:Tag:man made=water tower
+    natural=peak: Fa:Tag:natural=peak
+    natural=ridge: Fa:Tag:natural=ridge
+    office=quango: Fa:Tag:office=quango
+    place=country: Fa:Tag:place=country
+    railway=level_crossing: Fa:Tag:railway=level crossing
+    service=alley: Fa:Tag:service=alley
+    shop=bookmaker: Fa:Tag:shop=bookmaker
+    shop=garden_centre: Fa:Tag:shop=garden centre
+    tower:type=cooling: Fa:Tag:tower:type=cooling
+    waterway=drain: Fa:Tag:waterway=drain
 fi:
   key:
     addr: Fi:Key:addr
@@ -9058,6 +13632,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
@@ -9093,6 +13669,7 @@ fi:
     amenity=police: Fi:Tag:amenity=police
     amenity=prison: Fi:Tag:amenity=prison
     amenity=recycling: Fi:Tag:amenity=recycling
+    amenity=school: Fi:Tag:amenity=school
     amenity=telephone: Fi:Tag:amenity=telephone
     amenity=theatre: Fi:Tag:amenity=theatre
     amenity=townhall: Fi:Tag:amenity=townhall
@@ -9114,6 +13691,7 @@ fi:
     man_made=watermill: Fi:Tag:man made=watermill
     natural=tree: Fi:Tag:natural=tree
     natural=wetland: Fi:Tag:natural=wetland
+    place=village: Fi:Tag:place=village
     power=line: Fi:Tag:power=line
     power=minor_line: Fi:Tag:power=minor line
     power=pole: Fi:Tag:power=pole
@@ -9134,98 +13712,167 @@ fi:
 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
+    actuator: FR:Key:actuator
     addr: FR:Key:addr
     addr:floor: FR:Key:addr:floor
     addr:housenumber: FR:Key:addr:housenumber
     addr:place: FR:Key:addr:place
     addr:street: FR:Key:addr:street
     addr:suburb: FR:Key:addr:suburb
+    admin_level: FR:Key:admin level
     advertising: FR:Key:advertising
     aeroway: FR:Key:aeroway
+    agrarian: FR:Key:agrarian
+    agricultural: FR:Key:agricultural
     alt_name: FR:Key:alt name
     amenity: FR:Key:amenity
+    animal: FR:Key:animal
     animated: FR:Key:animated
+    architect: FR:Key:architect
     area: FR:Key:area
+    artist_name: FR:Key:artist name
     artwork_type: FR:Key:artwork type
+    attraction: FR:Key:attraction
+    backcountry: FR:Key:backcountry
     backrest: FR:Key:backrest
     backward: FR:Key:backward
     barrier: FR:Key:barrier
+    baseball: FR:Key:baseball
     basin: FR:Key:basin
     bench: FR:Key:bench
+    bench:type: FR:Key:bench:type
     bicycle: FR:Key:bicycle
     bicycle_parking: FR:Key:bicycle parking
+    bicycle_road: FR:Key:bicycle road
+    bin: FR:Key:bin
+    board_type: FR:Key:board type
     boat: FR:Key:boat
     bollard: FR:Key:bollard
     books: FR:Key:books
-    boundary: FR:Key:boundary
+    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
+    busway: FR:Key:busway
+    cafe: FR:Key:cafe
+    camp_site: FR:Key:camp site
     capacity: FR:Key:capacity
     capacity:disabled: FR:Key:capacity:disabled
+    cargo: FR:Key:cargo
+    cargo_bike: FR:Key:cargo bike
+    carpool: FR:Key:carpool
+    cash_withdrawal: FR:Key:cash withdrawal
+    changesets_count: FR:Key:changesets count
+    charge: FR:Key:charge
+    check_date: FR:Key:check date
     class:bicycle:commute: FR:Key:class:bicycle:commute
     clothes: FR:Key:clothes
+    club: FR:Key:club
     collection_times: FR:Key:collection times
     color: FR:Key:color
     colour: FR:Key:colour
     comment: FR:Key:comment
+    communication:bos: FR:Key:communication:bos
+    community_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
     contact:email: FR:Key:contact:email
+    contact:facebook: FR:Key:contact:facebook
     contact:fax: FR:Key:contact:fax
     contact:phone: FR:Key:contact:phone
     contact:vhf: FR:Key:contact:vhf
     contact:webcam: FR:Key:contact:webcam
     contact:website: FR:Key:contact:website
+    content: FR:Key:content
     covered: FR:Key:covered
     craft: FR:Key:craft
     crop: FR:Key:crop
     crossing: FR:Key:crossing
+    crossing:activation: FR:Key:crossing:activation
+    crossing:island: FR:Key:crossing:island
     cuisine: FR:Key:cuisine
     currency: FR:Key:currency
     cutting: FR:Key:cutting
+    cyclestreet: FR:Key:cyclestreet
     cycleway: FR:Key:cycleway
+    cycleway:lane: FR:Key:cycleway:lane
+    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
+    diocese: FR:Key:diocese
     diplomatic: FR:Key:diplomatic
     direction: FR:Key:direction
+    disabled: FR:Key:disabled
+    disc_golf: FR:Key:disc golf
     dispensing: FR:Key:dispensing
+    display: FR:Key:display
     distance: FR:Key:distance
-    'disused:': 'FR:Key:disused:'
+    divider: FR:Key:divider
+    dog: FR:Key:dog
     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
     est_width: FR:Key:est width
+    exit: FR:Key:exit
+    fair_trade: FR:Key:fair trade
+    fast_food: FR:Key:fast food
     fax: FR:Key:fax
     fee: FR:Key:fee
+    female: FR:Key:female
+    fence_type: FR:Key:fence type
+    fire_path: FR:Key:fire path
     fishing: FR:Key:fishing
     fixme: FR:Key:fixme
+    floating: FR:Key:floating
     flood_prone: FR:Key:flood prone
     foot: FR:Key:foot
     footway: FR:Key:footway
     ford: FR:Key:ford
     format: FR:Key:format
     forward: FR:Key:forward
+    fuel: FR:Key:fuel
     garden:style: FR:Key:garden:style
     garden:type: FR:Key:garden:type
+    gay: FR:Key:gay
     generator:method: FR:Key:generator:method
     generator:output: FR:Key:generator:output
     generator:output:battery_charging: FR:Key:generator:output:battery charging
@@ -9241,22 +13888,38 @@ fr:
     generator:plant: FR:Key:generator:plant
     generator:source: FR:Key:generator:source
     geological: FR:Key:geological
+    government: FR:Key:government
+    grande_circulation: FR:Key:grande circulation
+    handle: FR:Key:handle
+    handrail: FR:Key:handrail
+    happy_hours: FR:Key:happy hours
+    hazard: FR:Key:hazard
     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
+    imagery_used: FR:Key:imagery used
     incline: FR:Key:incline
+    indoor: FR:Key:indoor
     information: FR:Key:information
     inscription: FR:Key:inscription
     int_name: FR:Key:int name
     intermittent: FR:Key:intermittent
+    interval: FR:Key:interval
     junction: FR:Key:junction
+    kerb: FR:Key:kerb
     kindergarten:FR: FR:Key:kindergarten:FR
+    ladder: FR:Key:ladder
+    landfill:waste: FR:Key:landfill:waste
     landuse: FR:Key:landuse
+    lane_markings: FR:Key:lane markings
     lanes: FR:Key:lanes
     layer: FR:Key:layer
     leaf_type: FR:Key:leaf type
@@ -9265,14 +13928,26 @@ fr:
     leisure: FR:Key:leisure
     length: FR:Key:length
     level: FR:Key:level
+    lgbtq: FR:Key:lgbtq
+    lifeguard: FR:Key:lifeguard
+    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
     maxaxleload: FR:Key:maxaxleload
@@ -9283,44 +13958,76 @@ fr:
     maxstay: FR:Key:maxstay
     maxweight: FR:Key:maxweight
     maxwidth: FR:Key:maxwidth
+    mechanical_coupling: FR:Key:mechanical coupling
+    mechanical_driver: FR:Key:mechanical driver
+    medical_supply: FR:Key:medical supply
     memorial: FR:Key:memorial
     message: FR:Key:message
+    microbrewery: FR:Key:microbrewery
     military: FR:Key:military
     min_age: FR:Key:min age
     minage: FR:Key:minage
+    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
+    motorroad: FR:Key:motorroad
     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
-    noname: FR:Key:noname
+    non_existent_levels: FR:Key:non existent levels
+    noref: FR:Key:noref
     note: FR:Key:note
+    nudism: FR:Key:nudism
     office: FR:Key:office
     official_name: FR:Key:official name
     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
     outdoor_seating: FR:Key:outdoor seating
     overtaking: FR:Key:overtaking
+    owner: FR:Key:owner
+    par: FR:Key:par
     parking: FR:Key:parking
     parking:condition: FR:Key:parking:condition
     parking:lane: FR:Key:parking:lane
+    parking_space: FR:Key:parking space
     paved:date: FR:Key:paved:date
+    payment: FR:Key:payment
+    payment:MoyenDePaiement: FR:Key:payment:MoyenDePaiement
+    payment:credit_cards: FR:Key:payment:credit cards
+    payment:foo: FR:Key:payment:foo
     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
     place:fr: FR:Key:place:fr
     plant:output: FR:Key:plant:output
     playground: FR:Key:playground
     post_box:type: FR:Key:post box:type
+    post_office: FR:Key:post office
     post_office:type: FR:Key:post office:type
     power: FR:Key:power
     power_supply: FR:Key:power supply
@@ -9331,25 +14038,38 @@ fr:
     public_bookcase:type: FR:Key:public bookcase:type
     public_transport: FR:Key:public transport
     pump: FR:Key:pump
+    pump_mechanism: FR:Key:pump mechanism
     railway: FR:Key:railway
+    railway:preserved: FR:Key:railway:preserved
     railway:track_ref: FR:Key:railway:track ref
+    ramp: FR:Key:ramp
     ref: FR:Key:ref
+    ref:CD:CNOP: FR:Key:ref:CD:CNOP
     ref:CEF: FR:Key:ref:CEF
     ref:ERDF:gdo: FR:Key:ref:ERDF:gdo
+    ref:EU:EVSE: FR:Key:ref:EU:EVSE
     ref:FR:42C: FR:Key:ref:FR:42C
     ref: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
     reg_name: FR:Key:reg name
     religion: FR:Key:religion
     repeat_on: FR:Key:repeat on
+    reservation: FR:Key:reservation
+    residential: FR:Key:residential
     resource: FR:Key:resource
     right: FR:Key:right
+    roof:direction: FR:Key:roof:direction
     roof:material: FR:Key:roof:material
+    roof:shape: FR:Key:roof:shape
+    room: FR:Key:room
     ruins: FR:Key:ruins
     sac_scale: FR:Key:sac scale
     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_checkout: FR:Key:self checkout
+    self_service: FR:Key:self service
     service: FR:Key:service
+    service_times: FR:Key:service times
+    shelter: FR:Key:shelter
     shelter_type: FR:Key:shelter type
     shop: FR:Key:shop
     short_name: FR:Key:short name
+    shoulder: FR:Key:shoulder
     sides: FR:Key:sides
+    sidewalk: FR:Key:sidewalk
     sinkhole: FR:Key:sinkhole
     size: FR:Key:size
     smoothness: FR:Key:smoothness
     social_facility: FR:Key:social facility
+    social_facility:for: FR:Key:social facility:for
     source: FR:Key:source
+    source:date: FR:Key:source:date
     source:maxspeed: FR:Key:source:maxspeed
     source:maxwidth: FR:Key:source:maxwidth
+    source:name:br: FR:Key:source:name:br
     species: FR:Key:species
     species:fr: FR:Key:species:fr
+    species:wikidata: FR:Key:species:wikidata
     sport: FR:Key:sport
+    stairs: FR:Key:stairs
+    start_date: FR:Key:start date
     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
+    surveillance:type: FR:Key:surveillance:type
+    surveillance:zone: FR:Key:surveillance:zone
+    survey:date: FR:Key:survey:date
     switch: FR:Key:switch
+    symbol: FR:Key:symbol
     tactile_paving: FR:Key:tactile paving
+    tactile_writing: FR:Key:tactile writing
     takeaway: FR:Key:takeaway
+    taxi: FR:Key:taxi
+    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
     toilets:wheelchair: FR:Key:toilets:wheelchair
     toll: FR:Key:toll
     tourism: FR:Key:tourism
+    tower:type: FR:Key:tower:type
     tracktype: FR:Key:tracktype
     traffic_calming: FR:Key:traffic calming
     traffic_sign: FR:Key:traffic sign
+    traffic_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
+    transformer: FR:Key:transformer
     trees: FR:Key:trees
     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
+    voltage:primary: FR:Key:voltage:primary
+    voltage:secondary: FR:Key:voltage:secondary
     waste: FR:Key:waste
     water: FR:Key:water
+    water_source: FR:Key:water source
     waterway: FR:Key:waterway
     website: FR:Key:website
     wetland: FR:Key:wetland
     wheelchair: FR:Key:wheelchair
+    wheelchair:description: FR:Key:wheelchair:description
     width: FR:Key:width
+    width:carriageway: FR:Key:width:carriageway
     wikidata: FR:Key:wikidata
     wikimedia_commons: FR:Key:wikimedia commons
     wikipedia: FR:Key:wikipedia
+    windings: FR:Key:windings
     xmas:feature: FR:Key:xmas:feature
+    year_of_construction: FR:Key:year of construction
+    zero_waste: FR:Key:zero waste
+    zoo: FR:Key:zoo
   tag:
     Bascule_publique: FR:Tag:Bascule publique
     FIXME=Position_estimated: FR:Tag:FIXME=Position estimated
+    abandoned:amenity=prison_camp: FR:Tag:abandoned:amenity=prison camp
     abandoned=yes: FR:Tag:abandoned=yes
+    access=customers: FR:Tag:access=customers
+    access=designated: FR:Tag:access=designated
+    access=no: FR:Tag:access=no
+    access=permit: FR:Tag:access=permit
     access=private: FR:Tag:access=private
+    actuator=electric_motor: FR:Tag:actuator=electric motor
+    actuator=hydraulic_cylinder: FR:Tag:actuator=hydraulic cylinder
+    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
+    aeroway=airtanker_base: FR:Tag:aeroway=airtanker base
+    aeroway=apron: FR:Tag:aeroway=apron
+    aeroway=gate: FR:Tag:aeroway=gate
+    aeroway=hangar: FR:Tag:aeroway=hangar
     aeroway=helipad: FR:Tag:aeroway=helipad
+    aeroway=holding_position: FR:Tag:aeroway=holding position
+    aeroway=parking_position: FR:Tag:aeroway=parking position
     aeroway=runway: FR:Tag:aeroway=runway
+    aeroway=taxiway: FR:Tag:aeroway=taxiway
+    aeroway=windsock: FR:Tag:aeroway=windsock
     amenity=animal_boarding: FR:Tag:amenity=animal boarding
     amenity=animal_breeding: FR:Tag:amenity=animal breeding
     amenity=animal_shelter: FR:Tag:amenity=animal shelter
     amenity=arts_centre: FR:Tag:amenity=arts centre
     amenity=atm: FR:Tag:amenity=atm
     amenity=bank: FR:Tag:amenity=bank
+    amenity=bar: FR:Tag:amenity=bar
+    amenity=bbq: FR:Tag:amenity=bbq
     amenity=bench: FR:Tag:amenity=bench
+    amenity=bicycle_library: FR:Tag:amenity=bicycle library
     amenity=bicycle_parking: FR:Tag:amenity=bicycle parking
     amenity=bicycle_rental: FR:Tag:amenity=bicycle rental
+    amenity=bicycle_repair_station: FR:Tag:amenity=bicycle repair station
     amenity=biergarten: FR:Tag:amenity=biergarten
+    amenity=binoculars: FR:Tag:amenity=binoculars
+    amenity=bird_bath: FR:Tag:amenity=bird bath
+    amenity=boat_rental: FR:Tag:amenity=boat rental
+    amenity=boat_sharing: FR:Tag:amenity=boat sharing
+    amenity=brothel: FR:Tag:amenity=brothel
+    amenity=bus_station: FR:Tag:amenity=bus station
     amenity=cafe: FR:Tag:amenity=cafe
+    amenity=car_pooling: FR:Tag:amenity=car pooling
     amenity=car_rental: FR:Tag:amenity=car rental
     amenity=car_sharing: FR:Tag:amenity=car sharing
+    amenity=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
     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=driver_training: FR:Tag:amenity=driver training
+    amenity=driving_school: FR:Tag:amenity=driving school
+    amenity=dryer: FR:Tag:amenity=dryer
     amenity=embassy: FR:Tag:amenity=embassy
+    amenity=events_venue: FR:Tag:amenity=events venue
     amenity=fast_food: FR:Tag:amenity=fast food
+    amenity=feeding_place: FR:Tag:amenity=feeding place
     amenity=fire_station: FR:Tag:amenity=fire station
     amenity=food_court: FR:Tag:amenity=food court
     amenity=fountain: FR:Tag:amenity=fountain
     amenity=fuel: FR:Tag:amenity=fuel
+    amenity=funeral_hall: FR:Tag:amenity=funeral hall
+    amenity=game_feeding: FR:Tag:amenity=game feeding
+    amenity=give_box: FR:Tag:amenity=give box
     amenity=grave_yard: FR:Tag:amenity=grave yard
+    amenity=grit_bin: FR:Tag:amenity=grit bin
+    amenity=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
+    amenity=ice_cream: FR:Tag:amenity=ice cream
     amenity=kindergarten: FR:Tag:amenity=kindergarten
+    amenity=lavoir: FR:Tag:amenity=lavoir
     amenity=letter_box: FR:Tag:amenity=letter box
     amenity=library: FR:Tag:amenity=library
+    amenity=loading_dock: FR:Tag:amenity=loading dock
+    amenity=lounger: FR:Tag:amenity=lounger
+    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
     amenity=pharmacy: FR:Tag:amenity=pharmacy
     amenity=photo_booth: FR:Tag:amenity=photo booth
+    amenity=place_of_mourning: FR:Tag:amenity=place of mourning
     amenity=place_of_worship: FR:Tag:amenity=place of worship
     amenity=planetarium: FR:Tag:amenity=planetarium
     amenity=police: FR:Tag:amenity=police
+    amenity=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
     amenity=public_bookcase: FR:Tag:amenity=public bookcase
+    amenity=reception_desk: FR:Tag:amenity=reception desk
     amenity=recycling: FR:Tag:amenity=recycling
     amenity=restaurant: FR:Tag:amenity=restaurant
+    amenity=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
+    amenity=smoking_area: FR:Tag:amenity=smoking area
     amenity=social_centre: FR:Tag:amenity=social centre
     amenity=social_facility: FR:Tag:amenity=social facility
+    amenity=stripclub: FR:Tag:amenity=stripclub
+    amenity=swingerclub: FR:Tag:amenity=swingerclub
+    amenity=table: FR:Tag:amenity=table
     amenity=taxi: FR:Tag:amenity=taxi
     amenity=telephone: FR:Tag:amenity=telephone
     amenity=theatre: FR:Tag:amenity=theatre
     amenity=toilets: FR:Tag:amenity=toilets
     amenity=townhall: FR:Tag:amenity=townhall
+    amenity=toy_library: FR:Tag:amenity=toy library
+    amenity=trolley_bay: FR:Tag:amenity=trolley bay
     amenity=university: FR:Tag:amenity=university
     amenity=vacuum_cleaner: FR:Tag:amenity=vacuum cleaner
+    amenity=vehicle_inspection: FR:Tag:amenity=vehicle inspection
     amenity=vending_machine: FR:Tag:amenity=vending machine
     amenity=veterinary: FR:Tag:amenity=veterinary
+    amenity=washing_machine: FR:Tag:amenity=washing machine
     amenity=waste_basket: FR:Tag:amenity=waste basket
     amenity=waste_disposal: FR:Tag:amenity=waste disposal
+    amenity=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
     building=commercial: FR:Tag:building=commercial
+    building=construction: FR:Tag:building=construction
+    building=detached: FR:Tag:building=detached
+    building=digester: FR:Tag:building=digester
     building=farm: FR:Tag:building=farm
+    building=fire_lookout: FR:Tag:building=fire lookout
+    building=fire_station: FR:Tag:building=fire station
     building=garage: FR:Tag:building=garage
     building=garages: FR:Tag:building=garages
+    building=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
     building=hotel: FR:Tag:building=hotel
     building=house: FR:Tag:building=house
     building=hut: FR:Tag:building=hut
     building=kiosk: FR:Tag:building=kiosk
+    building=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=slurry_tank: FR:Tag:building=slurry tank
+    building=sports_hall: FR:Tag:building=sports hall
     building=stable: FR:Tag:building=stable
     building=stadium: FR:Tag:building=stadium
     building=sty: FR:Tag:building=sty
+    building=tent: FR:Tag:building=tent
     building=terrace: FR:Tag:building=terrace
     building=warehouse: FR:Tag:building=warehouse
+    cafe=time-cafe: FR:Tag:cafe=time-cafe
+    cemetery=war_cemetery: FR:Tag:cemetery=war cemetery
+    club=sport: FR:Tag:club=sport
     construction=yes: FR:Tag:construction=yes
+    craft=agricultural_engines: FR:Tag:craft=agricultural engines
+    craft=bakery: FR:Tag:craft=bakery
+    craft=basket_maker: FR:Tag:craft=basket maker
     craft=beekeeper: FR:Tag:craft=beekeeper
+    craft=blacksmith: FR:Tag:craft=blacksmith
+    craft=boatbuilder: FR:Tag:craft=boatbuilder
+    craft=bookbinder: FR:Tag:craft=bookbinder
     craft=brewery: FR:Tag:craft=brewery
     craft=builder: FR:Tag:craft=builder
     craft=cabinet_maker: FR:Tag:craft=cabinet maker
     craft=car_repair: FR:Tag:craft=car repair
+    craft=carpenter: FR:Tag:craft=carpenter
+    craft=carpet_layer: FR:Tag:craft=carpet layer
+    craft=caterer: FR:Tag:craft=caterer
+    craft=chimney_sweeper: FR:Tag:craft=chimney sweeper
+    craft=clockmaker: FR:Tag:craft=clockmaker
+    craft=confectionery: FR:Tag:craft=confectionery
+    craft=cooper: FR:Tag:craft=cooper
+    craft=dental_technician: FR:Tag:craft=dental technician
+    craft=distillery: FR:Tag:craft=distillery
+    craft=dressmaker: FR:Tag:craft=dressmaker
+    craft=electrician: FR:Tag:craft=electrician
+    craft=electronics_repair: FR:Tag:craft=electronics repair
+    craft=embroiderer: FR:Tag:craft=embroiderer
+    craft=engraver: FR:Tag:craft=engraver
+    craft=floorer: FR:Tag:craft=floorer
+    craft=gardener: FR:Tag:craft=gardener
+    craft=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
+    craft=handicraft: FR:Tag:craft=handicraft
+    craft=hvac: FR:Tag:craft=hvac
+    craft=insulation: FR:Tag:craft=insulation
+    craft=jeweller: FR:Tag:craft=jeweller
     craft=joiner: FR:Tag:craft=joiner
+    craft=key_cutter: FR:Tag:craft=key cutter
+    craft=leather: FR:Tag:craft=leather
+    craft=locksmith: FR:Tag:craft=locksmith
+    craft=luthier: FR:Tag:craft=luthier
+    craft=metal_construction: FR:Tag:craft=metal construction
+    craft=mint: FR:Tag:craft=mint
+    craft=musical_instrument: FR:Tag:craft=musical instrument
+    craft=oil_mill: FR:Tag:craft=oil mill
+    craft=optician: FR:Tag:craft=optician
+    craft=organ_builder: FR:Tag:craft=organ builder
+    craft=painter: FR:Tag:craft=painter
+    craft=parquet_layer: FR:Tag:craft=parquet layer
+    craft=paver: FR:Tag:craft=paver
+    craft=photographer: FR:Tag:craft=photographer
+    craft=photographic_laboratory: FR:Tag:craft=photographic laboratory
+    craft=piano_tuner: FR:Tag:craft=piano tuner
+    craft=plasterer: FR:Tag:craft=plasterer
+    craft=plumber: FR:Tag:craft=plumber
+    craft=pottery: FR:Tag:craft=pottery
+    craft=printer: FR:Tag:craft=printer
+    craft=printmaker: FR:Tag:craft=printmaker
+    craft=restoration: FR:Tag:craft=restoration
+    craft=rigger: FR:Tag:craft=rigger
+    craft=roofer: FR:Tag:craft=roofer
+    craft=saddler: FR:Tag:craft=saddler
+    craft=sailmaker: FR:Tag:craft=sailmaker
+    craft=sawmill: FR:Tag:craft=sawmill
+    craft=scaffolder: FR:Tag:craft=scaffolder
+    craft=sculptor: FR:Tag:craft=sculptor
+    craft=shoemaker: FR:Tag:craft=shoemaker
+    craft=signmaker: FR:Tag:craft=signmaker
+    craft=stand_builder: FR:Tag:craft=stand builder
+    craft=stonemason: FR:Tag:craft=stonemason
+    craft=sun_protection: FR:Tag:craft=sun protection
+    craft=tailor: FR:Tag:craft=tailor
+    craft=tiler: FR:Tag:craft=tiler
+    craft=tinsmith: FR:Tag:craft=tinsmith
+    craft=toolmaker: FR:Tag:craft=toolmaker
+    craft=turner: FR:Tag:craft=turner
+    craft=upholsterer: FR:Tag:craft=upholsterer
+    craft=watchmaker: FR:Tag:craft=watchmaker
+    craft=welder: FR:Tag:craft=welder
+    craft=window_construction: FR:Tag:craft=window construction
+    craft=winery: FR:Tag:craft=winery
+    crossing=zebra: FR:Tag:crossing=zebra
+    crossing_ref=zebra: FR:Tag:crossing ref=zebra
     cuisine=coffee_shop: FR:Tag:cuisine=coffee shop
+    cycleway:right=lane: FR:Tag:cycleway:right=lane
     cycleway=asl: FR:Tag:cycleway=asl
     cycleway=bike_box: FR:Tag:cycleway=bike box
     cycleway=opposite: FR:Tag:cycleway=opposite
     cycleway=opposite_lane: FR:Tag:cycleway=opposite lane
+    cycleway=share_busway: FR:Tag:cycleway=share busway
     disused=yes: FR:Tag:disused=yes
-    emergency=aed: FR:Tag:emergency=aed
+    emergency=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_lookout: FR:Tag:emergency=fire lookout
+    emergency=fire_sand_bin: FR:Tag:emergency=fire sand bin
+    emergency=fire_water_pond: FR:Tag:emergency=fire water pond
+    emergency=landing_site: FR:Tag:emergency=landing site
+    emergency=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=access_aisle: FR:Tag:footway=access aisle
+    footway=crossing: FR:Tag:footway=crossing
     footway=sidewalk: FR:Tag:footway=sidewalk
     generator:method=combustion: FR:Tag:generator:method=combustion
     generator:method=fission: FR:Tag:generator:method=fission
@@ -9576,13 +14589,27 @@ fr:
     generator:source=biogas: FR:Tag:generator:source=biogas
     generator:source=biomass: FR:Tag:generator:source=biomass
     generator:source=coal: FR:Tag:generator:source=coal
+    generator:source=diesel: FR:Tag:generator:source=diesel
     generator:source=gas: FR:Tag:generator:source=gas
     generator:source=hydro: FR:Tag:generator:source=hydro
     generator:source=nuclear: FR:Tag:generator:source=nuclear
     generator:source=oil: FR:Tag:generator:source=oil
     generator:source=solar: FR:Tag:generator:source=solar
     generator:source=tidal: FR:Tag:generator:source=tidal
+    generator:source=waste: FR:Tag:generator:source=waste
     generator:source=wind: FR:Tag:generator:source=wind
+    government=ministry: FR:Tag:government=ministry
+    government=register_office: FR:Tag:government=register office
+    government=tax: FR:Tag:government=tax
+    handle=lever: FR:Tag:handle=lever
+    handle=wheel: FR:Tag:handle=wheel
+    hazard=dangerous_junction: FR:Tag:hazard=dangerous junction
+    healthcare=blood_donation: FR:Tag:healthcare=blood donation
+    healthcare=clinic: FR:Tag:healthcare=clinic
+    healthcare=doctor: FR:Tag:healthcare=doctor
+    healthcare=laboratory: FR:Tag:healthcare=laboratory
+    healthcare=physiotherapist: FR:Tag:healthcare=physiotherapist
+    healthcare=vaccination_centre: FR:Tag:healthcare=vaccination centre
     highway=bridleway: FR:Tag:highway=bridleway
     highway=bus_guideway: FR:Tag:highway=bus guideway
     highway=bus_stop: FR:Tag:highway=bus stop
@@ -9598,6 +14625,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
@@ -9610,11 +14638,15 @@ fr:
     highway=service: FR:Tag:highway=service
     highway=services: FR:Tag:highway=services
     highway=speed_camera: FR:Tag:highway=speed camera
+    highway=speed_display: FR:Tag:highway=speed display
     highway=steps: FR:Tag:highway=steps
     highway=stop: FR:Tag:highway=stop
+    highway=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
     highway=traffic_signals: FR:Tag:highway=traffic signals
+    highway=trailhead: FR:Tag:highway=trailhead
     highway=trunk: FR:Tag:highway=trunk
     highway=turning_circle: FR:Tag:highway=turning circle
     highway=unclassified: FR:Tag:highway=unclassified
@@ -9624,6 +14656,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
@@ -9646,84 +14679,159 @@ fr:
     historic=wayside_cross: FR:Tag:historic=wayside cross
     historic=wayside_shrine: FR:Tag:historic=wayside shrine
     historic=wreck: FR:Tag:historic=wreck
+    indoor=area: FR:Tag:indoor=area
+    indoor=corridor: FR:Tag:indoor=corridor
+    indoor=room: FR:Tag:indoor=room
+    indoor=wall: FR:Tag:indoor=wall
     industrial=brewery: FR:Tag:industrial=brewery
+    information=audioguide: FR:Tag:information=audioguide
+    information=board: FR:Tag:information=board
+    information=guidepost: FR:Tag:information=guidepost
+    information=map: FR:Tag:information=map
+    information=office: FR:Tag:information=office
+    information=terminal: FR:Tag:information=terminal
     junction=roundabout: FR:Tag:junction=roundabout
+    junction=yes: FR:Tag:junction=yes
+    landcover=grass: FR:Tag:landcover=grass
     landuse=allotments: FR:Tag:landuse=allotments
+    landuse=animal_keeping: FR:Tag:landuse=animal keeping
+    landuse=apiary: FR:Tag:landuse=apiary
     landuse=basin: FR:Tag:landuse=basin
+    landuse=brownfield: FR:Tag:landuse=brownfield
     landuse=cemetery: FR:Tag:landuse=cemetery
     landuse=commercial: FR:Tag:landuse=commercial
     landuse=construction: FR:Tag:landuse=construction
+    landuse=education: FR:Tag:landuse=education
     landuse=farm: FR:Tag:landuse=farm
     landuse=farmland: FR:Tag:landuse=farmland
     landuse=farmyard: FR:Tag:landuse=farmyard
     landuse=flowerbed: FR:Tag:landuse=flowerbed
     landuse=forest: FR:Tag:landuse=forest
+    landuse=forestry: FR:Tag:landuse=forestry
     landuse=garages: FR:Tag:landuse=garages
     landuse=grass: FR:Tag:landuse=grass
     landuse=greenhouse_horticulture: FR:Tag:landuse=greenhouse horticulture
+    landuse=industrial: FR:Tag:landuse=industrial
+    landuse=landfill: FR:Tag:landuse=landfill
     landuse=meadow: FR:Tag:landuse=meadow
+    landuse=military: FR:Tag:landuse=military
     landuse=orchard: FR:Tag:landuse=orchard
     landuse=plant_nursery: FR:Tag:landuse=plant nursery
     landuse=pond: FR:Tag:landuse=pond
     landuse=quarry: FR:Tag:landuse=quarry
+    landuse=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
+    leaf_type=needleleaved: FR:Tag:leaf type=needleleaved
+    leisure=bandstand: FR:Tag:leisure=bandstand
+    leisure=bird_hide: FR:Tag:leisure=bird hide
+    leisure=bleachers: FR:Tag:leisure=bleachers
+    leisure=bowling_alley: FR:Tag:leisure=bowling alley
+    leisure=dance: FR:Tag:leisure=dance
     leisure=dog_park: FR:Tag:leisure=dog park
+    leisure=escape_game: FR:Tag:leisure=escape game
+    leisure=firepit: FR:Tag:leisure=firepit
     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
     leisure=horse_riding: FR:Tag:leisure=horse riding
+    leisure=ice_rink: FR:Tag:leisure=ice rink
     leisure=miniature_golf: FR:Tag:leisure=miniature golf
+    leisure=outdoor_seating: FR:Tag:leisure=outdoor seating
     leisure=paddling_pool: FR:Tag:leisure=paddling pool
     leisure=park: FR:Tag:leisure=park
     leisure=picnic_table: FR:Tag:leisure=picnic table
     leisure=pitch: FR:Tag:leisure=pitch
     leisure=playground: FR:Tag:leisure=playground
+    leisure=sauna: FR:Tag:leisure=sauna
+    leisure=schoolyard: FR:Tag:leisure=schoolyard
     leisure=slipway: FR:Tag:leisure=slipway
     leisure=sports_centre: FR:Tag:leisure=sports centre
     leisure=stadium: FR:Tag:leisure=stadium
     leisure=swimming_area: FR:Tag:leisure=swimming area
     leisure=swimming_pool: FR:Tag:leisure=swimming pool
+    leisure=tanning_salon: FR:Tag:leisure=tanning salon
     leisure=track: FR:Tag:leisure=track
     leisure=water_park: FR:Tag:leisure=water park
+    lifeguard=base: FR:Tag:lifeguard=base
+    lifeguard=tower: FR:Tag:lifeguard=tower
+    line_attachment=anchor: FR:Tag:line attachment=anchor
+    line_attachment=pin: FR:Tag:line attachment=pin
+    line_attachment=pulley: FR:Tag:line attachment=pulley
+    line_attachment=suspension: FR:Tag:line attachment=suspension
+    line_management=branch: FR:Tag:line management=branch
+    line_management=split: FR:Tag:line management=split
     man_made=adit: FR:Tag:man made=adit
+    man_made=architecture_line: FR:Tag:man made=architecture line
+    man_made=beehive: FR:Tag:man made=beehive
+    man_made=bridge: FR:Tag:man made=bridge
+    man_made=carpet_hanger: FR:Tag:man made=carpet hanger
+    man_made=cellar_entrance: FR:Tag:man made=cellar entrance
     man_made=cutline: FR:Tag:man made=cutline
     man_made=dovecote: FR:Tag:man made=dovecote
+    man_made=embankment: FR:Tag:man made=embankment
     man_made=flagpole: FR:Tag:man made=flagpole
+    man_made=flare: FR:Tag:man made=flare
+    man_made=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
+    man_made=mast: FR:Tag:man made=mast
     man_made=mineshaft: FR:Tag:man made=mineshaft
     man_made=monitoring_station: FR:Tag:man made=monitoring station
+    man_made=petroleum_well: FR:Tag:man made=petroleum well
     man_made=pier: FR:Tag:man made=pier
+    man_made=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=utility_pole: FR:Tag:man made=utility pole
     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
     natural=bare_rock: FR:Tag:natural=bare rock
+    natural=beach: FR:Tag:natural=beach
     natural=cave_entrance: FR:Tag:natural=cave entrance
     natural=cliff: FR:Tag:natural=cliff
     natural=coastline: FR:Tag:natural=coastline
     natural=glacier: FR:Tag:natural=glacier
     natural=grassland: FR:Tag:natural=grassland
     natural=heath: FR:Tag:natural=heath
+    natural=isthmus: FR:Tag:natural=isthmus
     natural=peak: FR:Tag:natural=peak
+    natural=peninsula: FR:Tag:natural=peninsula
     natural=saddle: FR:Tag:natural=saddle
     natural=scree: FR:Tag:natural=scree
     natural=scrub: FR:Tag:natural=scrub
+    natural=shrub: FR:Tag:natural=shrub
     natural=sinkhole: FR:Tag:natural=sinkhole
     natural=spring: FR:Tag:natural=spring
     natural=stone: FR:Tag:natural=stone
@@ -9732,21 +14840,49 @@ 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
+    noname=no: FR:Tag:noname=no
+    noname=yes: FR:Tag:noname=yes
+    office=advertising_agency: FR:Tag:office=advertising agency
+    office=association: FR:Tag:office=association
+    office=company: FR:Tag:office=company
+    office=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
+    office=foundation: FR:Tag:office=foundation
+    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=parish: FR:Tag:office=parish
+    office=political_party: FR:Tag:office=political party
+    office=religion: FR:Tag:office=religion
+    office=supervised_injection_site: FR:Tag:office=supervised injection site
+    operator=ERDF: FR:Tag:operator=ERDF
+    operator=Enedis: FR:Tag:operator=Enedis
+    operator=GRDF: FR:Tag:operator=GRDF
+    operator=RTE: FR:Tag:operator=RTE
+    parking=street_side: FR:Tag:parking=street side
+    pipeline=substation: FR:Tag:pipeline=substation
+    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
@@ -9766,8 +14902,9 @@ fr:
     power=transformer: FR:Tag:power=transformer
     public_transport=platform: FR:Tag:public transport=platform
     public_transport=station: FR:Tag:public transport=station
+    public_transport=stop_area: FR:Tag:public transport=stop area
+    public_transport=stop_position: FR:Tag:public transport=stop position
     pump=powered: FR:Tag:pump=powered
-    railway=crossing: FR:Tag:railway=crossing
     railway=disused: FR:Tag:railway=disused
     railway=funicular: FR:Tag:railway=funicular
     railway=halt: FR:Tag:railway=halt
@@ -9779,8 +14916,11 @@ fr:
     railway=station: FR:Tag:railway=station
     railway=subway: FR:Tag:railway=subway
     railway=subway_entrance: FR:Tag:railway=subway entrance
+    railway=switch: FR:Tag:railway=switch
     railway=tram: FR:Tag:railway=tram
     railway=tram_stop: FR:Tag:railway=tram stop
+    railway=water_crane: FR:Tag:railway=water crane
+    recycling_type=centre: FR:Tag:recycling type=centre
     religion=buddhist: FR:Tag:religion=buddhist
     religion=christian: FR:Tag:religion=christian
     religion=hindu: FR:Tag:religion=hindu
@@ -9792,12 +14932,31 @@ fr:
     religion=sikh: FR:Tag:religion=sikh
     religion=taoist: FR:Tag:religion=taoist
     religion=zoroastrian: FR:Tag:religion=zoroastrian
+    repair=assisted_self_service: FR:Tag:repair=assisted self service
+    request_stop=yes: FR:Tag:request stop=yes
+    residential=halting_site: FR:Tag:residential=halting site
+    route=bicycle: FR:Tag:route=bicycle
+    route=bus: FR:Tag:route=bus
     route=coach: FR:Tag:route=coach
+    route=ferry: FR:Tag:route=ferry
+    route=fitness_trail: FR:Tag:route=fitness trail
+    route=foot: FR:Tag:route=foot
+    route=hiking: FR:Tag:route=hiking
     route=piste: FR:Tag:route=piste
+    route=railway: FR:Tag:route=railway
+    route=subway: FR:Tag:route=subway
+    route=tram: FR:Tag:route=tram
+    route=transhumance: FR:Tag:route=transhumance
+    segregated=no: FR:Tag:segregated=no
+    segregated=yes: FR:Tag:segregated=yes
     service=alley: FR:Tag:service=alley
+    service=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
+    shelter_type=changing_rooms: FR:Tag:shelter type=changing rooms
+    shelter_type=lean_to: FR:Tag:shelter type=lean to
+    shop=agrarian: FR:Tag:shop=agrarian
     shop=alcohol: FR:Tag:shop=alcohol
     shop=anime: FR:Tag:shop=anime
     shop=baby_goods: FR:Tag:shop=baby goods
@@ -9807,10 +14966,13 @@ fr:
     shop=bed: FR:Tag:shop=bed
     shop=beverages: FR:Tag:shop=beverages
     shop=bicycle: FR:Tag:shop=bicycle
+    shop=boat: FR:Tag:shop=boat
     shop=books: FR:Tag:shop=books
     shop=boutique: FR:Tag:shop=boutique
     shop=butcher: FR:Tag:shop=butcher
+    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
     shop=carpet: FR:Tag:shop=carpet
     shop=charity: FR:Tag:shop=charity
@@ -9824,8 +14986,13 @@ fr:
     shop=department_store: FR:Tag:shop=department store
     shop=dive: FR:Tag:shop=dive
     shop=doityourself: FR:Tag:shop=doityourself
+    shop=dry_cleaning: FR:Tag:shop=dry cleaning
+    shop=e-cigarette: FR:Tag:shop=e-cigarette
     shop=electronics: FR:Tag:shop=electronics
+    shop=erotic: FR:Tag:shop=erotic
     shop=farm: FR:Tag:shop=farm
+    shop=fashion: FR:Tag:shop=fashion
+    shop=fashion_accessories: FR:Tag:shop=fashion accessories
     shop=florist: FR:Tag:shop=florist
     shop=frame: FR:Tag:shop=frame
     shop=frozen_food: FR:Tag:shop=frozen food
@@ -9833,47 +15000,93 @@ fr:
     shop=furnace: FR:Tag:shop=furnace
     shop=furniture: FR:Tag:shop=furniture
     shop=garden_centre: FR:Tag:shop=garden centre
+    shop=general: FR:Tag:shop=general
     shop=gift: FR:Tag:shop=gift
+    shop=greengrocer: FR:Tag:shop=greengrocer
     shop=haberdashery: FR:Tag:shop=haberdashery
     shop=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
     shop=kiosk: FR:Tag:shop=kiosk
     shop=kitchen: FR:Tag:shop=kitchen
+    shop=laundry: FR:Tag:shop=laundry
+    shop=mall: FR:Tag:shop=mall
     shop=medical_supply: FR:Tag:shop=medical supply
     shop=military_surplus: FR:Tag:shop=military surplus
     shop=mobile_phone: FR:Tag:shop=mobile phone
     shop=motorcycle: FR:Tag:shop=motorcycle
     shop=newsagent: FR:Tag:shop=newsagent
     shop=optician: FR:Tag:shop=optician
+    shop=outdoor: FR:Tag:shop=outdoor
     shop=pastry: FR:Tag:shop=pastry
+    shop=pest_control: FR:Tag:shop=pest control
     shop=pet: FR:Tag:shop=pet
+    shop=pet_grooming: FR:Tag:shop=pet grooming
     shop=pharmacy: FR:Tag:shop=pharmacy
     shop=photo: FR:Tag:shop=photo
     shop=second_hand: FR:Tag:shop=second hand
+    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
+    shop=window_blind: FR:Tag:shop=window blind
+    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=motocross: FR:Tag:sport=motocross
+    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
     sport=soccer: FR:Tag:sport=soccer
+    sport=swimming: FR:Tag:sport=swimming
+    sport=table_soccer: FR:Tag:sport=table soccer
+    sport=table_tennis: FR:Tag:sport=table tennis
+    substation=traction: FR:Tag:substation=traction
     switch=circuit_breaker: FR:Tag:switch=circuit breaker
     switch=disconnector: FR:Tag:switch=disconnector
     switch=earthing: FR:Tag:switch=earthing
     switch=mechanical: FR:Tag:switch=mechanical
+    telecom: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
     tourism=aquarium: FR:Tag:tourism=aquarium
     tourism=artwork: FR:Tag:tourism=artwork
     tourism=attraction: FR:Tag:tourism=attraction
+    tourism=camp_pitch: FR:Tag:tourism=camp pitch
     tourism=camp_site: FR:Tag:tourism=camp site
     tourism=caravan_site: FR:Tag:tourism=caravan site
     tourism=chalet: FR:Tag:tourism=chalet
@@ -9886,16 +15099,71 @@ fr:
     tourism=museum: FR:Tag:tourism=museum
     tourism=picnic_site: FR:Tag:tourism=picnic site
     tourism=theme_park: FR:Tag:tourism=theme park
+    tourism=trail_riding_station: FR:Tag:tourism=trail riding station
     tourism=viewpoint: FR:Tag:tourism=viewpoint
     tourism=wilderness_hut: FR:Tag:tourism=wilderness hut
     tourism=zoo: FR:Tag:tourism=zoo
+    tower:type=bell_tower: FR:Tag:tower:type=bell tower
+    tower:type=communication: FR:Tag:tower:type=communication
+    tower:type=hose: FR:Tag:tower:type=hose
+    traffic_calming=bump: FR:Tag:traffic calming=bump
+    traffic_calming=chicane: FR:Tag:traffic calming=chicane
+    traffic_calming=choked_island: FR:Tag:traffic calming=choked island
+    traffic_calming=choked_table: FR:Tag:traffic calming=choked table
+    traffic_calming=choker: FR:Tag:traffic calming=choker
+    traffic_calming=cushion: FR:Tag:traffic calming=cushion
+    traffic_calming=dip: FR:Tag:traffic calming=dip
+    traffic_calming=double_dip: FR:Tag:traffic calming=double dip
+    traffic_calming=dynamic_bump: FR:Tag:traffic calming=dynamic bump
+    traffic_calming=hump: FR:Tag:traffic calming=hump
+    traffic_calming=island: FR:Tag:traffic calming=island
+    traffic_calming=rumble_strip: FR:Tag:traffic calming=rumble strip
+    traffic_calming=table: FR:Tag:traffic calming=table
     traffic_sign=city_limit: FR:Tag:traffic sign=city limit
+    transformer=auxiliary: FR:Tag:transformer=auxiliary
+    transformer=converter: FR:Tag:transformer=converter
+    transformer=distribution: FR:Tag:transformer=distribution
+    transformer=generator: FR:Tag:transformer=generator
+    transformer=phase_angle_regulator: FR:Tag:transformer=phase angle regulator
+    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
+    vending=flowers: FR:Tag:vending=flowers
+    vending=food: FR:Tag:vending=food
+    vending=ice_cream: FR:Tag:vending=ice cream
+    vending=milk: FR:Tag:vending=milk
     vending=parcel_pickup: FR:Tag:vending=parcel pickup
+    vending=parking_tickets: FR:Tag:vending=parking tickets
+    vending=sweets: FR:Tag:vending=sweets
+    vending=water: FR:Tag:vending=water
     wall=no: FR:Tag:wall=no
+    waste=dog_excrement: FR:Tag:waste=dog excrement
+    water=pond: FR:Tag:water=pond
+    water=reservoir: FR:Tag:water=reservoir
     waterway=boatyard: FR:Tag:waterway=boatyard
     waterway=canal: FR:Tag:waterway=canal
     waterway=dam: FR:Tag:waterway=dam
@@ -9904,20 +15172,66 @@ fr:
     waterway=drain: FR:Tag:waterway=drain
     waterway=fish_pass: FR:Tag:waterway=fish pass
     waterway=lock_gate: FR:Tag:waterway=lock gate
+    waterway=pressurised: FR:Tag:waterway=pressurised
     waterway=river: FR:Tag:waterway=river
     waterway=riverbank: FR:Tag:waterway=riverbank
     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
+    zoo=aviary: FR:Tag:zoo=aviary
+    zoo=birds: FR:Tag:zoo=birds
+    zoo=butterfly: FR:Tag:zoo=butterfly
+    zoo=enclosure: FR:Tag:zoo=enclosure
+    zoo=falconry: FR:Tag:zoo=falconry
+    zoo=petting_zoo: FR:Tag:zoo=petting zoo
+    zoo=reptile: FR:Tag:zoo=reptile
+    zoo=safari_park: FR:Tag:zoo=safari park
+    zoo=wildlife_park: FR:Tag:zoo=wildlife park
 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
+    tunnel: Gl:Key:tunnel
+    twitter: Gl:Key:twitter
     wheelchair: Gl:Key:wheelchair
   tag:
     amenity=recycling: Gl:Tag:amenity=recycling
+    barrier=fence: Gl:Tag:barrier=fence
+    barrier=hedge: Gl:Tag:barrier=hedge
+    barrier=kerb: Gl:Tag:barrier=kerb
+    emergency=emergency_ward_entrance: Gl:Tag:emergency=emergency ward entrance
+    emergency=yes: Gl:Tag:emergency=yes
+    leisure=outdoor_seating: Gl:Tag:leisure=outdoor seating
+    natural=bare_rock: Gl:Tag:natural=bare rock
+    natural=stone: Gl:Tag:natural=stone
+    natural=tree_row: Gl:Tag:natural=tree row
+    railway=tram: Gl:Tag:railway=tram
+    shop=vacant: Gl:Tag:shop=vacant
+    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:
+  key:
+    fax: He:Key:fax
 hr:
   key:
+    addr: Hr:Key:addr
     amenity: Hr:Key:amenity
     historic: Hr:Key:historic
     leisure: Hr:Key:leisure
@@ -9937,6 +15251,7 @@ ht:
     pump: Ht:Key:pump
 hu:
   key:
+    HU:ed_direction: Hu:Key:HU:ed direction
     HU:hu-go:length: Hu:Key:HU:hu-go:length
     HU:hu-go:milestone: Hu:Key:HU:hu-go:milestone
     HU:hu-go:road: Hu:Key:HU:hu-go:road
@@ -9949,11 +15264,13 @@ hu:
     crossing:barrier: Hu:Key:crossing:barrier
     denomination: Hu:Key:denomination
     destination: Hu:Key:destination
+    height: Hu:Key:height
     highway: Hu:Key:highway
-    incline: HU:Key:incline
+    incline: Hu:Key:incline
     jel: Hu:Key:jel
     landuse: Hu:Key:landuse
     leisure: Hu:Key:leisure
+    length: Hu:Key:length
     man_made: Hu:Key:man made
     maxspeed: Hu:Key:maxspeed
     minspeed: Hu:Key:minspeed
@@ -9964,6 +15281,7 @@ hu:
     railway: Hu:Key:railway
     ref:HU:edid: Hu:Key:ref:HU:edid
     shop: Hu:Key:shop
+    smoothness: Hu:Key:smoothness
     surface: Hu:Key:surface
     symbol: Hu:Key:symbol
     tourism: Hu:Key:tourism
@@ -9971,56 +15289,91 @@ hu:
     turn: Hu:Key:turn
     waterway: Hu:Key:waterway
     wheelchair: Hu:Key:wheelchair
+    width: Hu:Key:width
     wood: Hu:Key:wood
   tag:
+    barrier=bollard: Hu:Tag:barrier=bollard
     boundary=administrative: Hu:Tag:boundary=administrative
+    highway=street_lamp: Hu:Tag:highway=street lamp
+    highway=traffic_signals: Hu:Tag:highway=traffic signals
+    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
     access: IT:Key:access
     addr: IT:Key:addr
+    addr:housenumber: IT:Key:addr:housenumber
+    addr:postcode: IT:Key:addr:postcode
+    addr:street: IT:Key:addr:street
     aerialway: IT:Key:aerialway
     aeroway: IT:Key:aeroway
+    alt_name: IT:Key:alt name
     amenity: IT:Key:amenity
     artwork_type: IT:Key:artwork type
     backrest: IT:Key:backrest
     barrier: IT:Key:barrier
     basin: IT:Key:basin
+    beauty: IT:Key:beauty
+    bicycle: IT:Key:bicycle
     bicycle_parking: IT:Key:bicycle parking
+    bicycle_road: IT:Key:bicycle road
+    books: IT:Key:books
     boundary: IT:Key:boundary
+    brewery: IT:Key:brewery
     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: IT:Key:contact
     contact:facebook: IT:Key:contact:facebook
     craft: IT:Key:craft
     crossing: IT:Key:crossing
     cutting: IT:Key:cutting
+    cyclestreet: IT:Key:cyclestreet
     cycleway: IT:Key:cycleway
+    delivery: IT:Key:delivery
     denomination: IT:Key:denomination
     description: IT:Key:description
     destination: IT:Key:destination
     diet: IT:Key:diet
     diet:*: IT:Key:diet:*
+    diet:vegan: IT:Key:diet:vegan
+    diet:vegetarian: IT:Key:diet:vegetarian
+    direction: IT:Key:direction
     'disused:': 'IT:Key:disused:'
     drink: IT:Key:drink
     ele: IT:Key:ele
     embankment: IT:Key:embankment
     enforcement: IT:Key:enforcement
+    est_width: IT:Key:est width
     fee: IT:Key:fee
     fence_type: IT:Key:fence type
     ford: IT:Key:ford
+    fruit: IT:Key:fruit
+    fuel: IT:Key:fuel
     garden:type: IT:Key:garden:type
     generator:output: IT:Key:generator:output
     geological: IT:Key:geological
+    guest_house: IT:Key:guest house
+    height: IT:Key:height
     highway: IT:Key:highway
     historic: IT:Key:historic
     incline: IT:Key:incline
@@ -10030,27 +15383,47 @@ it:
     landuse: IT:Key:landuse
     lanes:psv: IT:Key:lanes:psv
     leisure: IT:Key:leisure
+    length: IT:Key:length
     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
+    maxspeed: IT:Key:maxspeed
     maxweight: IT:Key:maxweight
     maxwidth: IT:Key:maxwidth
     military: IT:Key:military
+    mofa: IT:Key:mofa
     mooring: IT:Key:mooring
+    motorcycle: IT:Key:motorcycle
+    motorcycle:clothes: IT:Key:motorcycle:clothes
+    motorcycle:parts: IT:Key:motorcycle:parts
+    motorcycle:rental: IT:Key:motorcycle:rental
+    motorcycle:repair: IT:Key:motorcycle:repair
+    motorcycle:sales: IT:Key:motorcycle:sales
+    motorcycle:type: IT:Key:motorcycle:type
+    motorcycle:tyres: IT:Key:motorcycle:tyres
+    motorroad: IT:Key:motorroad
     mountain_pass: IT:Key:mountain pass
     mtb:scale: IT:Key:mtb:scale
     mtb:scale:imba: IT:Key:mtb:scale:imba
     name: IT:Key:name
+    name:left: IT:Key:name:left
+    name:right: IT:Key:name:right
     natural: IT:Key:natural
     noexit: IT:Key:noexit
+    nohousenumber: IT:Key:nohousenumber
     note: IT:Key:note
     office: IT:Key:office
+    oneway: IT:Key:oneway
     opening_hours: IT:Key:opening hours
     operator: IT:Key:operator
     organic: IT:Key:organic
     osmc:symbol: IT:Key:osmc:symbol
+    oven: IT:Key:oven
+    parking: IT:Key:parking
     parking:lane:both: IT:Key:parking:lane:both
     passing_places: IT:Key:passing places
     place: IT:Key:place
@@ -10058,26 +15431,44 @@ it:
     power: IT:Key:power
     priority: IT:Key:priority
     proposed: IT:Key:proposed
+    pump: IT:Key:pump
     railway: IT:Key:railway
+    recycling_type: IT:Key:recycling type
     ref: IT:Key:ref
+    ref:REI: IT:Key:ref:REI
+    ref:catasto: IT:Key:ref:catasto
+    ref:mise: IT:Key:ref:mise
+    ref:msal: IT:Key:ref:msal
     ref: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
     service: IT:Key:service
+    service:bicycle:diy: IT:Key:service:bicycle:diy
+    service:bicycle:rental: IT:Key:service:bicycle:rental
+    service:bicycle:repair: IT:Key:service:bicycle:repair
+    service:bicycle:retail: IT:Key:service:bicycle:retail
+    service:bicycle:second_hand: IT:Key:service:bicycle:second hand
     shop: IT:Key:shop
+    sidewalk: IT:Key:sidewalk
     smoothness: IT:Key:smoothness
     sport: IT:Key:sport
     stop: IT:Key:stop
     surface: IT:Key:surface
     surveillance: IT:Key:surveillance
+    tank_trap: IT:Key:tank trap
+    taxi: IT:Key:taxi
     tourism: IT:Key:tourism
     tracktype: IT:Key:tracktype
     traffic_calming: IT:Key:traffic calming
     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
@@ -10086,17 +15477,41 @@ 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
+    aeroway=gate: IT:Tag:aeroway=gate
+    aeroway=hangar: IT:Tag:aeroway=hangar
+    aeroway=helipad: IT:Tag:aeroway=helipad
+    aeroway=heliport: IT:Tag:aeroway=heliport
+    aeroway=holding_position: IT:Tag:aeroway=holding position
+    aeroway=navigationaid: IT:Tag:aeroway=navigationaid
+    aeroway=parking_position: IT:Tag:aeroway=parking position
+    aeroway=runway: IT:Tag:aeroway=runway
+    aeroway=spaceport: IT:Tag:aeroway=spaceport
+    aeroway=taxilane: IT:Tag:aeroway=taxilane
+    aeroway=taxiway: IT:Tag:aeroway=taxiway
+    aeroway=terminal: IT:Tag:aeroway=terminal
+    aeroway=windsock: IT:Tag:aeroway=windsock
     amenity=animal_boarding: IT:Tag:amenity=animal boarding
     amenity=animal_breeding: IT:Tag:amenity=animal breeding
     amenity=animal_shelter: IT:Tag:amenity=animal shelter
+    amenity=atm: IT:Tag:amenity=atm
+    amenity=bank: IT:Tag:amenity=bank
     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=dive_centre: IT:Tag:amenity=dive centre
     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
     amenity=kindergarten: IT:Tag:amenity=kindergarten
     amenity=milk_dispenser: IT:Tag:amenity=milk dispenser
     amenity=parking: IT:Tag:amenity=parking
+    amenity=pharmacy: IT:Tag:amenity=pharmacy
     amenity=photo_booth: IT:Tag:amenity=photo booth
     amenity=place_of_worship: IT:Tag:amenity=place of worship
     amenity=police: IT:Tag:amenity=police
     amenity=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
+    barrier=bollard: IT:Tag:barrier=bollard
+    barrier=border_control: IT:Tag:barrier=border control
+    barrier=bump_gate: IT:Tag:barrier=bump gate
+    barrier=bus_trap: IT:Tag:barrier=bus trap
+    barrier=cable_barrier: IT:Tag:barrier=cable barrier
+    barrier=cattle_grid: IT:Tag:barrier=cattle grid
+    barrier=chain: IT:Tag:barrier=chain
+    barrier=city_wall: IT:Tag:barrier=city wall
+    barrier=cycle_barrier: IT:Tag:barrier=cycle barrier
+    barrier=debris: IT:Tag:barrier=debris
     barrier=ditch: IT:Tag:barrier=ditch
+    barrier=entrance: IT:Tag:barrier=entrance
     barrier=fence: IT:Tag:barrier=fence
+    barrier=full-height_turnstile: IT:Tag:barrier=full-height turnstile
+    barrier=gate: IT:Tag:barrier=gate
+    barrier=guard_rail: IT:Tag:barrier=guard rail
+    barrier=hampshire_gate: IT:Tag:barrier=hampshire gate
+    barrier=handrail: IT:Tag:barrier=handrail
+    barrier=hedge: IT:Tag:barrier=hedge
+    barrier=height_restrictor: IT:Tag:barrier=height restrictor
+    barrier=horse_stile: IT:Tag:barrier=horse stile
     barrier=jersey_barrier: IT:Tag:barrier=jersey barrier
+    barrier=kent_carriage_gap: IT:Tag:barrier=kent carriage gap
+    barrier=kerb: IT:Tag:barrier=kerb
+    barrier=kissing_gate: IT:Tag:barrier=kissing gate
+    barrier=lift_gate: IT:Tag:barrier=lift gate
+    barrier=log: IT:Tag:barrier=log
+    barrier=motorcycle_barrier: IT:Tag:barrier=motorcycle barrier
     barrier=retaining_wall: IT:Tag:barrier=retaining wall
+    barrier=rope: IT:Tag:barrier=rope
+    barrier=sally_port: IT:Tag:barrier=sally port
+    barrier=spikes: IT:Tag:barrier=spikes
+    barrier=stile: IT:Tag:barrier=stile
+    barrier=sump_buster: IT:Tag:barrier=sump buster
+    barrier=swing_gate: IT:Tag:barrier=swing gate
+    barrier=tank_trap: IT:Tag:barrier=tank trap
     barrier=toll_booth: IT:Tag:barrier=toll booth
+    barrier=turnstile: IT:Tag:barrier=turnstile
+    barrier=wall: IT:Tag:barrier=wall
+    bridge=boardwalk: IT:Tag:bridge=boardwalk
+    building=hospital: IT:Tag:building=hospital
     building=residential: IT:Tag:building=residential
+    building=retail: IT:Tag:building=retail
+    building=roof: IT:Tag:building=roof
     building=train_station: IT:Tag:building=train station
+    craft=agricultural_engines: IT:Tag:craft=agricultural engines
+    craft=bakery: IT:Tag:craft=bakery
+    craft=basket_maker: IT:Tag:craft=basket maker
+    craft=beekeeper: IT:Tag:craft=beekeeper
+    craft=blacksmith: IT:Tag:craft=blacksmith
+    craft=boatbuilder: IT:Tag:craft=boatbuilder
+    craft=bookbinder: IT:Tag:craft=bookbinder
+    craft=brewery: IT:Tag:craft=brewery
+    craft=builder: IT:Tag:craft=builder
+    craft=cabinet_maker: IT:Tag:craft=cabinet maker
+    craft=car_repair: IT:Tag:craft=car repair
+    craft=carpenter: IT:Tag:craft=carpenter
+    craft=carpet_layer: IT:Tag:craft=carpet layer
+    craft=caterer: IT:Tag:craft=caterer
+    craft=chimney_sweeper: IT:Tag:craft=chimney sweeper
+    craft=clockmaker: IT:Tag:craft=clockmaker
+    craft=confectionery: IT:Tag:craft=confectionery
+    craft=cooper: IT:Tag:craft=cooper
+    craft=dental_technician: IT:Tag:craft=dental technician
+    craft=distillery: IT:Tag:craft=distillery
+    craft=dressmaker: IT:Tag:craft=dressmaker
+    craft=electrician: IT:Tag:craft=electrician
+    craft=electronics_repair: IT:Tag:craft=electronics repair
+    craft=embroiderer: IT:Tag:craft=embroiderer
+    craft=engraver: IT:Tag:craft=engraver
+    craft=floorer: IT:Tag:craft=floorer
+    craft=gardener: IT:Tag:craft=gardener
+    craft=glaziery: IT:Tag:craft=glaziery
+    craft=grinding_mill: IT:Tag:craft=grinding mill
+    craft=handicraft: IT:Tag:craft=handicraft
+    craft=hvac: IT:Tag:craft=hvac
+    craft=insulation: IT:Tag:craft=insulation
+    craft=jeweller: IT:Tag:craft=jeweller
+    craft=joiner: IT:Tag:craft=joiner
+    craft=key_cutter: IT:Tag:craft=key cutter
+    craft=locksmith: IT:Tag:craft=locksmith
+    craft=metal_construction: IT:Tag:craft=metal construction
+    craft=mint: IT:Tag:craft=mint
+    craft=musical_instrument: IT:Tag:craft=musical instrument
+    craft=oil_mill: IT:Tag:craft=oil mill
+    craft=optician: IT:Tag:craft=optician
+    craft=organ_builder: IT:Tag:craft=organ builder
+    craft=painter: IT:Tag:craft=painter
+    craft=parquet_layer: IT:Tag:craft=parquet layer
+    craft=photographer: IT:Tag:craft=photographer
+    craft=photographic_laboratory: IT:Tag:craft=photographic laboratory
+    craft=piano_tuner: IT:Tag:craft=piano tuner
+    craft=plasterer: IT:Tag:craft=plasterer
+    craft=plumber: IT:Tag:craft=plumber
+    craft=pottery: IT:Tag:craft=pottery
+    craft=printmaker: IT:Tag:craft=printmaker
+    craft=rigger: IT:Tag:craft=rigger
+    craft=roofer: IT:Tag:craft=roofer
+    craft=saddler: IT:Tag:craft=saddler
+    craft=sailmaker: IT:Tag:craft=sailmaker
+    craft=sawmill: IT:Tag:craft=sawmill
+    craft=scaffolder: IT:Tag:craft=scaffolder
+    craft=sculptor: IT:Tag:craft=sculptor
+    craft=shoemaker: IT:Tag:craft=shoemaker
+    craft=stand_builder: IT:Tag:craft=stand builder
+    craft=stonemason: IT:Tag:craft=stonemason
+    craft=sun_protection: IT:Tag:craft=sun protection
+    craft=tailor: IT:Tag:craft=tailor
+    craft=tiler: IT:Tag:craft=tiler
+    craft=tinsmith: IT:Tag:craft=tinsmith
+    craft=toolmaker: IT:Tag:craft=toolmaker
+    craft=turner: IT:Tag:craft=turner
+    craft=upholsterer: IT:Tag:craft=upholsterer
+    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
+    geological=outcrop: IT:Tag:geological=outcrop
     geological=palaeontological_site: IT:Tag:geological=palaeontological site
+    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
     highway=motorway_link: IT:Tag:highway=motorway link
     highway=path: IT:Tag:highway=path
     highway=pedestrian: IT:Tag:highway=pedestrian
@@ -10156,25 +15696,67 @@ it:
     industrial=auto_wrecker: IT:Tag:industrial=auto wrecker
     internet_access=wlan: IT:Tag:internet access=wlan
     junction=roundabout: IT:Tag:junction=roundabout
+    junction=yes: IT:Tag:junction=yes
     landuse=cemetery: IT:Tag:landuse=cemetery
+    landuse=civic_admin: IT:Tag:landuse=civic admin
     landuse=construction: IT:Tag:landuse=construction
+    landuse=flowerbed: IT:Tag:landuse=flowerbed
     landuse=greenhouse_horticulture: IT:Tag:landuse=greenhouse horticulture
+    landuse=retail: IT:Tag:landuse=retail
+    landuse=salt_pond: IT:Tag:landuse=salt pond
     leisure=beach_resort: IT:Tag:leisure=beach resort
     leisure=dog_park: IT:Tag:leisure=dog park
+    leisure=garden: IT:Tag:leisure=garden
     leisure=marina: IT:Tag:leisure=marina
+    leisure=nature_reserve: IT:Tag:leisure=nature reserve
     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
     natural=palaeontological_site: IT:Tag:natural=palaeontological site
     natural=scree: IT:Tag:natural=scree
+    natural=shrub: IT:Tag:natural=shrub
     natural=spring: IT:Tag:natural=spring
     natural=tree_row: IT:Tag:natural=tree row
     natural=wetland: IT:Tag:natural=wetland
+    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
+    place=city: IT:Tag:place=city
+    place=city_block: IT:Tag:place=city block
+    place=continent: IT:Tag:place=continent
+    place=country: IT:Tag:place=country
+    place=county: IT:Tag:place=county
+    place=district: IT:Tag:place=district
+    place=farm: IT:Tag:place=farm
+    place=hamlet: IT:Tag:place=hamlet
+    place=island: IT:Tag:place=island
+    place=islet: IT:Tag:place=islet
+    place=isolated_dwelling: IT:Tag:place=isolated dwelling
+    place=locality: IT:Tag:place=locality
+    place=municipality: IT:Tag:place=municipality
+    place=neighbourhood: IT:Tag:place=neighbourhood
+    place=ocean: IT:Tag:place=ocean
+    place=plot: IT:Tag:place=plot
+    place=province: IT:Tag:place=province
+    place=quarter: IT:Tag:place=quarter
+    place=region: IT:Tag:place=region
+    place=sea: IT:Tag:place=sea
+    place=square: IT:Tag:place=square
+    place=state: IT:Tag:place=state
+    place=suburb: IT:Tag:place=suburb
+    place=town: IT:Tag:place=town
     place=village: IT:Tag:place=village
     power=cable: IT:Tag:power=cable
     power=cable_distribution_cabinet: IT:Tag:power=cable distribution cabinet
@@ -10187,11 +15769,17 @@ it:
     power=substation: IT:Tag:power=substation
     power=tower: IT:Tag:power=tower
     power=transformer: IT:Tag:power=transformer
+    public_transport=platform: IT:Tag:public transport=platform
+    public_transport=station: IT:Tag:public transport=station
+    public_transport=stop_area: IT:Tag:public transport=stop area
+    public_transport=stop_position: IT:Tag:public transport=stop position
     railway=level_crossing: IT:Tag:railway=level crossing
     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
@@ -10199,33 +15787,56 @@ it:
     shop=bicycle: IT:Tag:shop=bicycle
     shop=butcher: IT:Tag:shop=butcher
     shop=car: IT:Tag:shop=car
+    shop=car_parts: IT:Tag:shop=car parts
+    shop=car_repair: IT:Tag:shop=car repair
     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
+    shop=dry_cleaning: IT:Tag:shop=dry cleaning
+    shop=electrical: IT:Tag:shop=electrical
+    shop=electronics: IT:Tag:shop=electronics
     shop=farm: IT:Tag:shop=farm
     shop=florist: IT:Tag:shop=florist
     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=shoes: IT:Tag:shop=shoes
     shop=souvenir: IT:Tag:shop=souvenir
     shop=supermarket: IT:Tag:shop=supermarket
     shop=tea: IT:Tag:shop=tea
     shop=tobacco: IT:Tag:shop=tobacco
+    shop=tyres: IT:Tag:shop=tyres
     shop=wine: IT:Tag:shop=wine
+    shop=yes: IT:Tag:shop=yes
+    sport=balle_pelote: IT:Tag:sport=balle pelote
     sport=climbing: IT:Tag:sport=climbing
+    sport=hockey: IT:Tag:sport=hockey
+    sport=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
 ja:
   key:
@@ -10270,29 +15881,41 @@ ja:
     aerialway:drag_lift: JA:Key:aerialway:drag lift
     aeroway: JA:Key:aeroway
     agricultural: JA:Key:agricultural
+    air_conditioning: JA:Key:air conditioning
     alt_name: JA:Key:alt name
     amenity: JA:Key:amenity
+    animated: JA:Key:animated
     architect: JA:Key:architect
     area: JA:Key:area
     area:highway: JA:Key:area:highway
+    artist_name: JA:Key:artist name
+    artwork_subject: JA:Key:artwork subject
     artwork_type: JA:Key:artwork type
     ascent: JA:Key:ascent
+    assembly_point:earthquake: JA:Key:assembly point:earthquake
+    assembly_point:tsunami: JA:Key:assembly point:tsunami
+    attraction: JA:Key:attraction
     attribution: JA:Key:attribution
     atv: JA:Key:atv
     automated: JA:Key:automated
+    automatic_door: JA:Key:automatic door
     backrest: JA:Key:backrest
     backward: JA:Key:backward
     bar: JA:Key:bar
     barrier: JA:Key:barrier
     baseball: JA:Key:baseball
     basin: JA:Key:basin
+    bath:type: JA:Key:bath:type
+    bbq: JA:Key:bbq
     bdouble: JA:Key:bdouble
     beds: JA:Key:beds
+    bell_tower: JA:Key:bell tower
     bench: JA:Key:bench
     bicycle: JA:Key:bicycle
     bicycle_parking: JA:Key:bicycle parking
     bicycle_road: JA:Key:bicycle road
     bin: JA:Key:bin
+    biotic_reef:type: JA:Key:biotic reef:type
     board_type: JA:Key:board type
     boat: JA:Key:boat
     bollard: JA:Key:bollard
@@ -10300,7 +15923,11 @@ ja:
     border_type: JA:Key:border type
     both: JA:Key:both
     boundary: JA:Key:boundary
+    branch: JA:Key:branch
     brand: JA:Key:brand
+    brand:wikidata: JA:Key:brand:wikidata
+    brand:wikipedia: JA:Key:brand:wikipedia
+    breakfast: JA:Key:breakfast
     brewery: JA:Key:brewery
     bridge: JA:Key:bridge
     bridge:alt_name: JA:Key:bridge:alt name
@@ -10312,39 +15939,48 @@ ja:
     bridge:short_name: JA:Key:bridge:short name
     bridge:structure: JA:Key:bridge:structure
     bridge:support: JA:Key:bridge:support
-    bridge_name: JA:Key:bridge name
     building: JA:Key:building
     building:architecture: JA:Key:building:architecture
     building:colour: JA:Key:building:colour
     building:fireproof: JA:Key:building:fireproof
     building:flats: JA:Key:building:flats
     building:levels: JA:Key:building:levels
+    building:levels:underground: JA:Key:building:levels:underground
     building:material: JA:Key:building:material
     building:min_level: JA:Key:building:min level
     building:part: JA:Key:building:part
     building:parts: JA:Key:building:parts
     building:units: JA:Key:building:units
     building:use: JA:Key:building:use
+    bulk_purchase: JA:Key:bulk purchase
     bunker_type: JA:Key:bunker type
     bus: JA:Key:bus
     busway: JA:Key:busway
+    button_operated: JA:Key:button operated
     cable_number: JA:Key:cable number
+    cafe: JA:Key:cafe
+    camp_site: JA:Key:camp site
     camp_type: JA:Key:camp type
     capacity: JA:Key:capacity
     capacity:disabled: JA:Key:capacity:disabled
     capital: JA:Key:capital
+    car_wash: JA:Key:car wash
     carriage: JA:Key:carriage
     castle_type: JA:Key:castle type
     cave:name: JA:Key:cave:name
     cemetery: JA:Key:cemetery
     change: JA:Key:change
+    charge: JA:Key:charge
     check_date: JA:Key:check date
+    checkpoint: JA:Key:checkpoint
     circumference: JA:Key:circumference
     clothes: JA:Key:clothes
     club: JA:Key:club
     collection_times: JA:Key:collection times
     colour: JA:Key:colour
     comment: JA:Key:comment
+    communication:mobile_phone: JA:Key:communication:mobile phone
+    community_centre: JA:Key:community centre
     condition: JA:Key:condition
     conditional: JA:Key:conditional
     construction: JA:Key:construction
@@ -10370,24 +16006,30 @@ ja:
     crossing:activation: JA:Key:crossing:activation
     crossing:barrier: JA:Key:crossing:barrier
     crossing:bell: JA:Key:crossing:bell
+    crossing:island: JA:Key:crossing:island
     crossing:light: JA:Key:crossing:light
     crossing:on_demand: JA:Key:crossing:on demand
     crossing:saltire: JA:Key:crossing:saltire
     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
+    cycleway:both: JA:Key:cycleway:both
     cycleway:left: JA:Key:cycleway:left
     cycleway:right: JA:Key:cycleway:right
     cycleway=lane: JA:Key:cycleway=lane
     cycleway=opposite_track: JA:Key:cycleway=opposite track
     cycleway=track: JA:Key:cycleway=track
+    date: JA:Key:date
     delivery: JA:Key:delivery
     'demolished:': 'JA:Key:demolished:'
     denomination: JA:Key:denomination
     denotation: JA:Key:denotation
+    departures_board: JA:Key:departures board
     depth: JA:Key:depth
     descent: JA:Key:descent
     description: JA:Key:description
@@ -10396,6 +16038,7 @@ ja:
     destination:lanes: JA:Key:destination:lanes
     detour: JA:Key:detour
     diameter: JA:Key:diameter
+    diaper: JA:Key:diaper
     diet: JA:Key:diet
     diet:*: JA:Key:diet:*
     direction: JA:Key:direction
@@ -10404,12 +16047,15 @@ ja:
     distance: JA:Key:distance
     disused: JA:Key:disused
     'disused:': 'JA:Key:disused:'
+    dog: JA:Key:dog
     donation:compensation: JA:Key:donation:compensation
+    door: JA:Key:door
     drink: JA:Key:drink
     drinking_water: JA:Key:drinking water
     drive_in: JA:Key:drive in
     drive_through: JA:Key:drive through
     driving_side: JA:Key:driving side
+    dryer: JA:Key:dryer
     duration: JA:Key:duration
     easy_overtaking: JA:Key:easy overtaking
     ele: JA:Key:ele
@@ -10421,27 +16067,40 @@ ja:
     enforcement: JA:Key:enforcement
     entrance: JA:Key:entrance
     est_width: JA:Key:est width
+    evacuation_route: JA:Key:evacuation route
     exit: JA:Key:exit
     exit_to: JA:Key:exit to
     expressway: JA:Key:expressway
     facebook: JA:Key:facebook
+    faces: JA:Key:faces
+    fair_trade: JA:Key:fair trade
+    fast_food: JA:Key:fast food
     fax: JA:Key:fax
     fee: JA:Key:fee
+    female: JA:Key:female
     fence_type: JA:Key:fence type
     fenced: JA:Key:fenced
     ferry: JA:Key:ferry
     fire_boundary: JA:Key:fire boundary
+    fire_hydrant: JA:Key:fire hydrant
     fireplace: JA:Key:fireplace
     fishing: JA:Key:fishing
     fixme: JA:Key:fixme
+    floating: JA:Key:floating
+    flood_mark: JA:Key:flood mark
     flood_prone: JA:Key:flood prone
+    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
     format: JA:Key:format
     forward: JA:Key:forward
+    free_refill: JA:Key:free refill
     frequency: JA:Key:frequency
+    from: JA:Key:from
+    fruit: JA:Key:fruit
     fuel: JA:Key:fuel
     fuel:diesel: JA:Key:fuel:diesel
     fuel:lpg: JA:Key:fuel:lpg
@@ -10471,12 +16130,16 @@ ja:
     golf: JA:Key:golf
     goods: JA:Key:goods
     government: JA:Key:government
+    grape_variety: JA:Key:grape variety
     grassland: JA:Key:grassland
+    group_only: JA:Key:group only
     guest_house: JA:Key:guest house
     guidepost: JA:Key:guidepost
     handrail: JA:Key:handrail
     happy_hours: JA:Key:happy hours
     harbour: JA:Key:harbour
+    harbour:category: JA:Key:harbour:category
+    hazard_prone: JA:Key:hazard prone
     hazard_type: JA:Key:hazard type
     hazmat: JA:Key:hazmat
     healthcare: JA:Key:healthcare
@@ -10496,10 +16159,13 @@ ja:
     hov: JA:Key:hov
     iata: JA:Key:iata
     icao: JA:Key:icao
+    ice_cream: JA:Key:ice cream
     ice_road: JA:Key:ice road
     ignore_for_routing: JA:Key:ignore for routing
     image: JA:Key:image
+    imagery_used: JA:Key:imagery used
     incline: JA:Key:incline
+    incline:across: JA:Key:incline:across
     indoor: JA:Key:indoor
     indoor_seating: JA:Key:indoor seating
     indoormark: JA:Key:indoormark
@@ -10513,6 +16179,7 @@ ja:
     intermittent: JA:Key:intermittent
     internet_access: JA:Key:internet access
     internet_access:fee: JA:Key:internet access:fee
+    interval: JA:Key:interval
     is_in: JA:Key:is in
     is_in:city: JA:Key:is in:city
     is_in:continent: JA:Key:is in:continent
@@ -10523,6 +16190,9 @@ ja:
     is_in:state: JA:Key:is in:state
     junction: JA:Key:junction
     kerb: JA:Key:kerb
+    kids_area: JA:Key:kids area
+    ladder: JA:Key:ladder
+    lamp_mount: JA:Key:lamp mount
     landmark: JA:Key:landmark
     landuse: JA:Key:landuse
     lanes: JA:Key:lanes
@@ -10530,6 +16200,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
@@ -10538,6 +16209,7 @@ ja:
     leisure: JA:Key:leisure
     length: JA:Key:length
     level: JA:Key:level
+    lgbtq: JA:Key:lgbtq
     lit: JA:Key:lit
     living_street: JA:Key:living street
     loc_name: JA:Key:loc name
@@ -10546,10 +16218,17 @@ ja:
     location: JA:Key:location
     lock: JA:Key:lock
     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
     manhole: JA:Key:manhole
+    manufacturer: JA:Key:manufacturer
     manufacturer:type: JA:Key:manufacturer:type
+    mapillary: JA:Key:mapillary
+    massage: JA:Key:massage
     material: JA:Key:material
     max_age: JA:Key:max age
     maxaxleload: JA:Key:maxaxleload
@@ -10558,13 +16237,19 @@ ja:
     maxlength: JA:Key:maxlength
     maxspeed: JA:Key:maxspeed
     maxspeed:advisory: JA:Key:maxspeed:advisory
+    maxspeed:variable: JA:Key:maxspeed:variable
     maxstay: JA:Key:maxstay
     maxweight: JA:Key:maxweight
     maxwidth: JA:Key:maxwidth
     maxwidth:physical: JA:Key:maxwidth:physical
+    membership: JA:Key:membership
+    memorial: JA:Key:memorial
+    message: JA:Key:message
     microbrewery: JA:Key:microbrewery
+    milestone_type: JA:Key:milestone type
     military: JA:Key:military
     min_age: JA:Key:min age
+    min_height: JA:Key:min height
     minspeed: JA:Key:minspeed
     monitoring:air_quality: JA:Key:monitoring:air quality
     monitoring:gps: JA:Key:monitoring:gps
@@ -10580,20 +16265,24 @@ ja:
     motorhome: JA:Key:motorhome
     motorroad: JA:Key:motorroad
     mountain_pass: JA:Key:mountain pass
+    moved: JA:Key:moved
     mtb: JA:Key:mtb
     mtb:scale: JA:Key:mtb:scale
     mtb:scale:uphill: JA:Key:mtb:scale:uphill
     museum: JA:Key:museum
+    museum_type: JA:Key:museum type
     name: JA:Key:name
     name:cs: JA:Key:name:cs
     name:de: JA:Key:name:de
     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
@@ -10601,10 +16290,13 @@ 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
     note: JA:Key:note
     note:ja: JA:Key:note:ja
+    nudism: JA:Key:nudism
+    obstacle: JA:Key:obstacle
     office: JA:Key:office
     official_name: JA:Key:official name
     official_ref: JA:Key:official ref
@@ -10612,8 +16304,14 @@ 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
     operator:type: JA:Key:operator:type
@@ -10623,19 +16321,25 @@ ja:
     outdoor_seating: JA:Key:outdoor seating
     overtaking: JA:Key:overtaking
     owner: JA:Key:owner
+    park_ride: JA:Key:park ride
     parking: JA:Key:parking
     parking:condition: JA:Key:parking:condition
     parking:lane: JA:Key:parking:lane
+    passenger_information_display: JA:Key:passenger information display
     passing_places: JA:Key:passing places
     payment: JA:Key:payment
     payment:coins: JA:Key:payment:coins
     phone: JA:Key:phone
+    pilgrimage: JA:Key:pilgrimage
     piste:difficulty: JA:Key:piste:difficulty
     piste:type: JA:Key:piste:type
     place: JA:Key:place
+    plant: JA:Key:plant
     plant:output: JA:Key:plant:output
     playground: JA:Key:playground
+    police: JA:Key:police
     population: JA:Key:population
+    post_box:type: JA:Key:post box:type
     postal_code: JA:Key:postal code
     power: JA:Key:power
     power_source: JA:Key:power source
@@ -10646,6 +16350,7 @@ ja:
     product: JA:Key:product
     proposed: JA:Key:proposed
     protect_class: JA:Key:protect class
+    protected: JA:Key:protected
     psv: JA:Key:psv
     public_bookcase:type: JA:Key:public bookcase:type
     public_transport: JA:Key:public transport
@@ -10657,9 +16362,12 @@ ja:
     railway:track_ref: JA:Key:railway:track ref
     ramp: JA:Key:ramp
     rcn_ref: JA:Key:rcn ref
+    real_fire: JA:Key:real fire
     recording: JA:Key:recording
     recycling_type: JA:Key:recycling type
+    reef: JA:Key:reef
     ref: JA:Key:ref
+    ref:cobe: JA:Key:ref:cobe
     ref:isil: JA:Key:ref:isil
     ref:shop:num: JA:Key:ref:shop:num
     ref:vatin: JA:Key:ref:vatin
@@ -10669,6 +16377,8 @@ ja:
     religion: JA:Key:religion
     removed: JA:Key:removed
     'removed:': 'JA:Key:removed:'
+    rental: JA:Key:rental
+    repair: JA:Key:repair
     reservation: JA:Key:reservation
     residential: JA:Key:residential
     resource: JA:Key:resource
@@ -10685,19 +16395,27 @@ ja:
     ruins: JA:Key:ruins
     sac_scale: JA:Key:sac scale
     salt: JA:Key:salt
+    sauna: JA:Key:sauna
     seamark:fixme: JA:Key:seamark:fixme
     seamark:type: JA:Key:seamark:type
+    seasonal: JA:Key:seasonal
+    seats: JA:Key:seats
     second_hand: JA:Key:second hand
     segregated: JA:Key:segregated
+    self_checkout: JA:Key:self checkout
+    self_service: JA:Key:self service
     service: JA:Key:service
     service_times: JA:Key:service times
     shelter: JA:Key:shelter
     shelter_type: JA:Key:shelter type
+    shooting: JA:Key:shooting
     shop: JA:Key:shop
     short_name: JA:Key:short name
+    shoulder: JA:Key:shoulder
     shower: JA:Key:shower
     sides: JA:Key:sides
     sidewalk: JA:Key:sidewalk
+    sidewalk_orientation: JA:Key:sidewalk orientation
     size: JA:Key:size
     smokefree: JA:Key:smokefree
     smoking: JA:Key:smoking
@@ -10719,19 +16437,28 @@ 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
     stars: JA:Key:stars
     start_date: JA:Key:start date
     station: JA:Key:station
+    step:contrast: JA:Key:step:contrast
     step_count: JA:Key:step count
     stile: JA:Key:stile
+    stone_type: JA:Key:stone type
     stream: JA:Key:stream
+    stroller: JA:Key:stroller
+    sub_sea: JA:Key:sub sea
     substance: JA:Key:substance
     subway: JA:Key:subway
+    supervised: JA:Key:supervised
     support: JA:Key:support
     surface: JA:Key:surface
     surveillance: JA:Key:surveillance
     survey:date: JA:Key:survey:date
+    swimming_pool: JA:Key:swimming pool
     tactile_paving: JA:Key:tactile paving
     tactile_writing: JA:Key:tactile writing
     takeaway: JA:Key:takeaway
@@ -10740,20 +16467,31 @@ ja:
     taxon: JA:Key:taxon
     tenant: JA:Key:tenant
     tents: JA:Key:tents
+    theatre:type: JA:Key:theatre:type
     tickets:public_transport: JA:Key:tickets:public transport
     tickets:public_transport_subscription: JA:Key:tickets:public transport subscription
     tidal: JA:Key:tidal
+    to: JA:Key:to
+    tobacco: JA:Key:tobacco
     todo: JA:Key:todo
+    toilets: JA:Key:toilets
     toilets:wheelchair: JA:Key:toilets:wheelchair
     toll: JA:Key:toll
+    tomb: JA:Key:tomb
     tourism: JA:Key:tourism
+    tourist_bus: JA:Key:tourist bus
     tower:type: JA:Key:tower:type
+    townhall:type: JA:Key:townhall:type
     tracks: JA:Key:tracks
     tracktype: JA:Key:tracktype
+    traffic: JA:Key:traffic
     traffic_calming: JA:Key:traffic calming
     traffic_sign: JA:Key:traffic sign
     traffic_signals: JA:Key:traffic signals
+    traffic_signals:floor_vibration: JA:Key:traffic signals:floor vibration
+    traffic_signals:minimap: JA:Key:traffic signals:minimap
     traffic_signals:sound: JA:Key:traffic signals:sound
+    traffic_signals:vibration: JA:Key:traffic signals:vibration
     trail_visibility: JA:Key:trail visibility
     train: JA:Key:train
     tram: JA:Key:tram
@@ -10765,15 +16503,20 @@ ja:
     turn:lanes: JA:Key:turn:lanes
     twitter: JA:Key:twitter
     type: JA:Key:type
+    unisex: JA:Key:unisex
     unsigned_ref: JA:Key:unsigned ref
     url: JA:Key:url
     usage: JA:Key:usage
     vehicle: JA:Key:vehicle
+    viewpoint: JA:Key:viewpoint
     visibility: JA:Key:visibility
     voltage: JA:Key:voltage
+    washing_machine: JA:Key:washing machine
     waste: JA:Key:waste
     water: JA:Key:water
+    water_characteristic: JA:Key:water characteristic
     water_point: JA:Key:water point
+    water_source: JA:Key:water source
     waterway: JA:Key:waterway
     website: JA:Key:website
     wetland: JA:Key:wetland
@@ -10787,6 +16530,7 @@ ja:
     winter_road: JA:Key:winter road
     wires: JA:Key:wires
     wood: JA:Key:wood
+    year_of_construction: JA:Key:year of construction
     yh:LINE_NAME: JA:Key:yh:LINE NAME
     yh:LINE_NUM: JA:Key:yh:LINE NUM
     yh:STRUCTURE: JA:Key:yh:STRUCTURE
@@ -10795,15 +16539,19 @@ ja:
     yh:WIDTH: JA:Key:yh:WIDTH
     yh:WIDTH_RANK: JA:Key:yh:WIDTH RANK
     zone:traffic: JA:Key:zone:traffic
+    zoo: JA:Key:zoo
   tag:
+    abandoned:amenity=prison: JA:Tag:abandoned:amenity=prison
     access=agricultural: JA:Tag:access=agricultural
     access=customers: JA:Tag:access=customers
     access=delivery: JA:Tag:access=delivery
     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
     access=official: JA:Tag:access=official
+    access=permissive: JA:Tag:access=permissive
     access=private: JA:Tag:access=private
     access=unknown: JA:Tag:access=unknown
     admin_level=10: JA:Tag:admin level=10
@@ -10847,6 +16595,7 @@ ja:
     aeroway=hangar: JA:Tag:aeroway=hangar
     aeroway=helipad: JA:Tag:aeroway=helipad
     aeroway=heliport: JA:Tag:aeroway=heliport
+    aeroway=holding_position: JA:Tag:aeroway=holding position
     aeroway=parking_position: JA:Tag:aeroway=parking position
     aeroway=runway: JA:Tag:aeroway=runway
     aeroway=taxiway: JA:Tag:aeroway=taxiway
@@ -10857,6 +16606,7 @@ ja:
     amenity=animal_boarding: JA:Tag:amenity=animal boarding
     amenity=animal_breeding: JA:Tag:amenity=animal breeding
     amenity=animal_shelter: JA:Tag:amenity=animal shelter
+    amenity=archive: JA:Tag:amenity=archive
     amenity=arts_centre: JA:Tag:amenity=arts centre
     amenity=atm: JA:Tag:amenity=atm
     amenity=baby_hatch: JA:Tag:amenity=baby hatch
@@ -10875,6 +16625,7 @@ ja:
     amenity=bus_station: JA:Tag:amenity=bus station
     amenity=cafe: JA:Tag:amenity=cafe
     amenity=car_rental: JA:Tag:amenity=car rental
+    amenity=car_repair: JA:Tag:amenity=car repair
     amenity=car_sharing: JA:Tag:amenity=car sharing
     amenity=car_wash: JA:Tag:amenity=car wash
     amenity=casino: JA:Tag:amenity=casino
@@ -10884,12 +16635,15 @@ ja:
     amenity=clinic: JA:Tag:amenity=clinic
     amenity=clock: JA:Tag:amenity=clock
     amenity=college: JA:Tag:amenity=college
+    amenity=community_center: JA:Tag:amenity=community center
     amenity=community_centre: JA:Tag:amenity=community centre
     amenity=compressed_air: JA:Tag:amenity=compressed air
+    amenity=consulate: JA:Tag:amenity=consulate
     amenity=courthouse: JA:Tag:amenity=courthouse
     amenity=coworking_space: JA:Tag:amenity=coworking space
     amenity=crematorium: JA:Tag:amenity=crematorium
     amenity=crypt: JA:Tag:amenity=crypt
+    amenity=customs: JA:Tag:amenity=customs
     amenity=dentist: JA:Tag:amenity=dentist
     amenity=doctor: JA:Tag:amenity=doctor
     amenity=doctors: JA:Tag:amenity=doctors
@@ -10906,6 +16660,7 @@ ja:
     amenity=food_court: JA:Tag:amenity=food court
     amenity=fountain: JA:Tag:amenity=fountain
     amenity=fuel: JA:Tag:amenity=fuel
+    amenity=funeral_hall: JA:Tag:amenity=funeral hall
     amenity=gambling: JA:Tag:amenity=gambling
     amenity=game_feeding: JA:Tag:amenity=game feeding
     amenity=grave_yard: JA:Tag:amenity=grave yard
@@ -10914,12 +16669,19 @@ 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=kiosk: JA:Tag:amenity=kiosk
     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
@@ -10927,20 +16689,26 @@ ja:
     amenity=parking: JA:Tag:amenity=parking
     amenity=parking_entrance: JA:Tag:amenity=parking entrance
     amenity=parking_space: JA:Tag:amenity=parking space
+    amenity=payment_terminal: JA:Tag:amenity=payment terminal
     amenity=pharmacy: JA:Tag:amenity=pharmacy
     amenity=photo_booth: JA:Tag:amenity=photo booth
     amenity=place_of_worship: JA:Tag:amenity=place of worship
     amenity=planetarium: JA:Tag:amenity=planetarium
     amenity=police: JA:Tag:amenity=police
+    amenity=polling_station: JA:Tag:amenity=polling station
     amenity=post_box: JA:Tag:amenity=post box
     amenity=post_office: JA:Tag:amenity=post office
+    amenity=prep_school: JA:Tag:amenity=prep school
+    amenity=printer: JA:Tag:amenity=printer
     amenity=prison: JA:Tag:amenity=prison
     amenity=pub: JA:Tag:amenity=pub
     amenity=public_bath: JA:Tag:amenity=public bath
     amenity=public_bookcase: JA:Tag:amenity=public bookcase
     amenity=public_building: JA:Tag:amenity=public building
     amenity=recycling: JA:Tag:amenity=recycling
+    amenity=refugee_site: JA:Tag:amenity=refugee site
     amenity=register_office: JA:Tag:amenity=register office
+    amenity=research_institute: JA:Tag:amenity=research institute
     amenity=restaurant: JA:Tag:amenity=restaurant
     amenity=retirement_home: JA:Tag:amenity=retirement home
     amenity=sanitary_dump_station: JA:Tag:amenity=sanitary dump station
@@ -10948,18 +16716,21 @@ 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
     amenity=stripclub: JA:Tag:amenity=stripclub
     amenity=studio: JA:Tag:amenity=studio
     amenity=swimming_pool: JA:Tag:amenity=swimming pool
+    amenity=table: JA:Tag:amenity=table
     amenity=taxi: JA:Tag:amenity=taxi
     amenity=telephone: JA:Tag:amenity=telephone
     amenity=theatre: JA:Tag:amenity=theatre
     amenity=toilets: JA:Tag:amenity=toilets
     amenity=townhall: JA:Tag:amenity=townhall
     amenity=university: JA:Tag:amenity=university
+    amenity=vehicle_inspection: JA:Tag:amenity=vehicle inspection
     amenity=vending_machine: JA:Tag:amenity=vending machine
     amenity=veterinary: JA:Tag:amenity=veterinary
     amenity=waste_basket: JA:Tag:amenity=waste basket
@@ -10968,6 +16739,9 @@ ja:
     amenity=water: JA:Tag:amenity=water
     amenity=water_point: JA:Tag:amenity=water point
     amenity=watering_place: JA:Tag:amenity=watering place
+    amenity=winery: JA:Tag:amenity=winery
+    assembly_point:earthquake=yes: JA:Tag:assembly point:earthquake=yes
+    assembly_point:tsunami=yes: JA:Tag:assembly point:tsunami=yes
     atm=yes: JA:Tag:atm=yes
     attraction=animal: JA:Tag:attraction=animal
     attraction=train: JA:Tag:attraction=train
@@ -10996,6 +16770,8 @@ ja:
     barrier=toll_booth: JA:Tag:barrier=toll booth
     barrier=turnstile: JA:Tag:barrier=turnstile
     barrier=wall: JA:Tag:barrier=wall
+    bath:type=onsen: JA:Tag:bath:type=onsen
+    bay=fjord: JA:Tag:bay=fjord
     bicycle=designated: JA:Tag:bicycle=designated
     bicycle=use_sidepath: JA:Tag:bicycle=use sidepath
     boundary=administrative: JA:Tag:boundary=administrative
@@ -11040,11 +16816,14 @@ ja:
     building=bungalow: JA:Tag:building=bungalow
     building=bunker: JA:Tag:building=bunker
     building=cabin: JA:Tag:building=cabin
+    building=carport: JA:Tag:building=carport
     building=cathedral: JA:Tag:building=cathedral
     building=chapel: JA:Tag:building=chapel
     building=church: JA:Tag:building=church
     building=civic: JA:Tag:building=civic
+    building=college: JA:Tag:building=college
     building=commercial: JA:Tag:building=commercial
+    building=conservatory: JA:Tag:building=conservatory
     building=construction: JA:Tag:building=construction
     building=cowshed: JA:Tag:building=cowshed
     building=detached: JA:Tag:building=detached
@@ -11070,12 +16849,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
@@ -11089,6 +16871,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
@@ -11118,6 +16901,7 @@ ja:
     craft=hvac: JA:Tag:craft=hvac
     craft=insulation: JA:Tag:craft=insulation
     craft=jeweller: JA:Tag:craft=jeweller
+    craft=joiner: JA:Tag:craft=joiner
     craft=key_cutter: JA:Tag:craft=key cutter
     craft=locksmith: JA:Tag:craft=locksmith
     craft=metal_construction: JA:Tag:craft=metal construction
@@ -11130,6 +16914,7 @@ ja:
     craft=plasterer: JA:Tag:craft=plasterer
     craft=plumber: JA:Tag:craft=plumber
     craft=pottery: JA:Tag:craft=pottery
+    craft=printer: JA:Tag:craft=printer
     craft=rigger: JA:Tag:craft=rigger
     craft=roofer: JA:Tag:craft=roofer
     craft=saddler: JA:Tag:craft=saddler
@@ -11138,6 +16923,7 @@ ja:
     craft=scaffolder: JA:Tag:craft=scaffolder
     craft=sculptor: JA:Tag:craft=sculptor
     craft=shoemaker: JA:Tag:craft=shoemaker
+    craft=signmaker: JA:Tag:craft=signmaker
     craft=stand_builder: JA:Tag:craft=stand builder
     craft=stonemason: JA:Tag:craft=stonemason
     craft=sun_protection: JA:Tag:craft=sun protection
@@ -11153,9 +16939,14 @@ ja:
     cuisine=brazilian: JA:Tag:cuisine=brazilian
     cuisine=coffee_shop: JA:Tag:cuisine=coffee shop
     cuisine=dessert: JA:Tag:cuisine=dessert
+    cycleway:both=no: JA:Tag:cycleway:both=no
+    cycleway:left=no: JA:Tag:cycleway:left=no
+    cycleway:right=no: JA:Tag:cycleway:right=no
     cycleway=lane: JA:Tag:cycleway=lane
+    cycleway=no: JA:Tag:cycleway=no
     cycleway=opposite_track: JA:Tag:cycleway=opposite track
     cycleway=share_busway: JA:Tag:cycleway=share busway
+    cycleway=shared_lane: JA:Tag:cycleway=shared lane
     cycleway=track: JA:Tag:cycleway=track
     denomination=jodo_shinshu: JA:Tag:denomination=jodo shinshu
     denomination=jodo_shu: JA:Tag:denomination=jodo shu
@@ -11164,7 +16955,11 @@ ja:
     denomination=soto: JA:Tag:denomination=soto
     denomination=tiantai: JA:Tag:denomination=tiantai
     emergency=ambulance_station: JA:Tag:emergency=ambulance station
+    emergency=assembly_point: JA:Tag:emergency=assembly point
     emergency=defibrillator: JA:Tag:emergency=defibrillator
+    emergency=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
@@ -11173,11 +16968,13 @@ 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
     footway=crossing: JA:Tag:footway=crossing
     footway=sidewalk: JA:Tag:footway=sidewalk
+    ford=stepping_stones: JA:Tag:ford=stepping stones
     generator:method=anaerobic_digestion: JA:Tag:generator:method=anaerobic digestion
     generator:method=barrage: JA:Tag:generator:method=barrage
     generator:method=combustion: JA:Tag:generator:method=combustion
@@ -11227,14 +17024,18 @@ ja:
     geological=outcrop: JA:Tag:geological=outcrop
     geological=palaeontological_site: JA:Tag:geological=palaeontological site
     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
     government=tax: JA:Tag:government=tax
     guidepost=simple: JA:Tag:guidepost=simple
     healthcare=blood_donation: JA:Tag:healthcare=blood donation
+    healthcare=doctor: JA:Tag:healthcare=doctor
     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
@@ -11253,6 +17054,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
@@ -11271,6 +17073,7 @@ ja:
     highway=stop: JA:Tag:highway=stop
     highway=street_lamp: JA:Tag:highway=street lamp
     highway=tertiary: JA:Tag:highway=tertiary
+    highway=toll_gantry: JA:Tag:highway=toll gantry
     highway=track: JA:Tag:highway=track
     highway=traffic_mirror: JA:Tag:highway=traffic mirror
     highway=traffic_signals: JA:Tag:highway=traffic signals
@@ -11284,6 +17087,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
@@ -11301,6 +17105,7 @@ ja:
     historic=ruins: JA:Tag:historic=ruins
     historic=rune_stone: JA:Tag:historic=rune stone
     historic=ship: JA:Tag:historic=ship
+    historic=stone: JA:Tag:historic=stone
     historic=tomb: JA:Tag:historic=tomb
     historic=tree_shrine: JA:Tag:historic=tree shrine
     historic=wayside_cross: JA:Tag:historic=wayside cross
@@ -11349,6 +17154,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
@@ -11377,6 +17183,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
@@ -11396,6 +17203,7 @@ ja:
     leisure=common: JA:Tag:leisure=common
     leisure=dance: JA:Tag:leisure=dance
     leisure=dog_park: JA:Tag:leisure=dog park
+    leisure=escape_game: JA:Tag:leisure=escape game
     leisure=firepit: JA:Tag:leisure=firepit
     leisure=fishing: JA:Tag:leisure=fishing
     leisure=fitness_centre: JA:Tag:leisure=fitness centre
@@ -11414,12 +17222,16 @@ 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
+    lifeguard=tower: JA:Tag:lifeguard=tower
+    line=bay: JA:Tag:line=bay
+    line=busbar: JA:Tag:line=busbar
     man_made=adit: JA:Tag:man made=adit
     man_made=beacon: JA:Tag:man made=beacon
     man_made=breakwater: JA:Tag:man made=breakwater
@@ -11433,11 +17245,14 @@ ja:
     man_made=cross: JA:Tag:man made=cross
     man_made=cutline: JA:Tag:man made=cutline
     man_made=dike: JA:Tag:man made=dike
+    man_made=dovecote: JA:Tag:man made=dovecote
     man_made=dyke: JA:Tag:man made=dyke
     man_made=embankment: JA:Tag:man made=embankment
     man_made=flagpole: JA:Tag:man made=flagpole
     man_made=flare: JA:Tag:man made=flare
+    man_made=gantry: JA:Tag:man made=gantry
     man_made=gasometer: JA:Tag:man made=gasometer
+    man_made=geoglyph: JA:Tag:man made=geoglyph
     man_made=groyne: JA:Tag:man made=groyne
     man_made=hot_water_tank: JA:Tag:man made=hot water tank
     man_made=insect_hotel: JA:Tag:man made=insect hotel
@@ -11472,6 +17287,8 @@ ja:
     man_made=windmill: JA:Tag:man made=windmill
     man_made=windpump: JA:Tag:man made=windpump
     man_made=works: JA:Tag:man made=works
+    manhole=telecom: JA:Tag:manhole=telecom
+    memorial=stele: JA:Tag:memorial=stele
     microbrewery=yes: JA:Tag:microbrewery=yes
     military=airfield: JA:Tag:military=airfield
     military=ammunition: JA:Tag:military=ammunition
@@ -11481,11 +17298,19 @@ 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
     natural=bay: JA:Tag:natural=bay
     natural=beach: JA:Tag:natural=beach
+    natural=blowhole: JA:Tag:natural=blowhole
     natural=cave_entrance: JA:Tag:natural=cave entrance
     natural=cliff: JA:Tag:natural=cliff
     natural=coastline: JA:Tag:natural=coastline
@@ -11493,6 +17318,7 @@ ja:
     natural=fell: JA:Tag:natural=fell
     natural=geyser: JA:Tag:natural=geyser
     natural=glacier: JA:Tag:natural=glacier
+    natural=gorge: JA:Tag:natural=gorge
     natural=grassland: JA:Tag:natural=grassland
     natural=heath: JA:Tag:natural=heath
     natural=hot_spring: JA:Tag:natural=hot spring
@@ -11514,6 +17340,7 @@ ja:
     natural=stone: JA:Tag:natural=stone
     natural=tree: JA:Tag:natural=tree
     natural=tree_row: JA:Tag:natural=tree row
+    natural=tree_stump: JA:Tag:natural=tree stump
     natural=valley: JA:Tag:natural=valley
     natural=volcano: JA:Tag:natural=volcano
     natural=water: JA:Tag:natural=water
@@ -11529,6 +17356,7 @@ ja:
     network=jp:prefectural:nagano: JA:Tag:network=jp:prefectural:nagano
     network=ncn: JA:Tag:network=ncn
     network=nwn: JA:Tag:network=nwn
+    noname=yes: JA:Tag:noname=yes
     office=accountant: JA:Tag:office=accountant
     office=administrative: JA:Tag:office=administrative
     office=architect: JA:Tag:office=architect
@@ -11539,6 +17367,7 @@ ja:
     office=insurance: JA:Tag:office=insurance
     office=it: JA:Tag:office=it
     office=lawyer: JA:Tag:office=lawyer
+    office=logistics: JA:Tag:office=logistics
     office=newspaper: JA:Tag:office=newspaper
     office=ngo: JA:Tag:office=ngo
     office=political_party: JA:Tag:office=political party
@@ -11548,6 +17377,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
@@ -11568,6 +17401,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
@@ -11579,8 +17413,10 @@ 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
+    protect_class=2: JA:Tag:protect class=2
     public_transport=platform: JA:Tag:public transport=platform
     public_transport=station: JA:Tag:public transport=station
     public_transport=stop_area: JA:Tag:public transport=stop area
@@ -11617,12 +17453,16 @@ 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
     religion=muslim: JA:Tag:religion=muslim
     religion=shinto: JA:Tag:religion=shinto
+    residential=apartments: JA:Tag:residential=apartments
     residential=rural: JA:Tag:residential=rural
+    resource=sand: JA:Tag:resource=sand
+    roller_coaster=track: JA:Tag:roller coaster=track
     route=bicycle: JA:Tag:route=bicycle
     route=bus: JA:Tag:route=bus
     route=ferry: JA:Tag:route=ferry
@@ -11699,12 +17539,14 @@ ja:
     shop=fabric: JA:Tag:shop=fabric
     shop=farm: JA:Tag:shop=farm
     shop=fashion: JA:Tag:shop=fashion
+    shop=fashion_accessories: JA:Tag:shop=fashion accessories
     shop=fireplace: JA:Tag:shop=fireplace
     shop=fishing: JA:Tag:shop=fishing
     shop=fishmonger: JA:Tag:shop=fishmonger
     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
@@ -11715,6 +17557,7 @@ ja:
     shop=gift: JA:Tag:shop=gift
     shop=glass: JA:Tag:shop=glass
     shop=glaziery: JA:Tag:shop=glaziery
+    shop=golf: JA:Tag:shop=golf
     shop=greengrocer: JA:Tag:shop=greengrocer
     shop=hairdresser: JA:Tag:shop=hairdresser
     shop=hardware: JA:Tag:shop=hardware
@@ -11760,12 +17603,14 @@ ja:
     shop=pawnbroker: JA:Tag:shop=pawnbroker
     shop=perfumery: JA:Tag:shop=perfumery
     shop=pet: JA:Tag:shop=pet
+    shop=pet_grooming: JA:Tag:shop=pet grooming
     shop=pharmacy: JA:Tag:shop=pharmacy
     shop=photo: JA:Tag:shop=photo
     shop=printing: JA:Tag:shop=printing
     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
@@ -11776,6 +17621,7 @@ ja:
     shop=spices: JA:Tag:shop=spices
     shop=sports: JA:Tag:shop=sports
     shop=stationery: JA:Tag:shop=stationery
+    shop=storage_rental: JA:Tag:shop=storage rental
     shop=supermarket: JA:Tag:shop=supermarket
     shop=swimming_pool: JA:Tag:shop=swimming pool
     shop=tailor: JA:Tag:shop=tailor
@@ -11798,7 +17644,9 @@ ja:
     shop=wholesale: JA:Tag:shop=wholesale
     shop=window_blind: JA:Tag:shop=window blind
     shop=wine: JA:Tag:shop=wine
+    shop=wool: JA:Tag:shop=wool
     shop=yes: JA:Tag:shop=yes
+    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
@@ -11854,20 +17702,28 @@ ja:
     tourism=wilderness_hut: JA:Tag:tourism=wilderness hut
     tourism=wine_cellar: JA:Tag:tourism=wine cellar
     tourism=zoo: JA:Tag:tourism=zoo
+    tower:construction=dish: JA:Tag:tower:construction=dish
     traffic_calming=island: JA:Tag:traffic calming=island
     traffic_calming=table: JA:Tag:traffic calming=table
     traffic_sign=city_limit: JA:Tag:traffic sign=city limit
     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
     vending=milk: JA:Tag:vending=milk
+    vending=parcel_pickup: JA:Tag:vending=parcel pickup
+    vending=parcel_pickup;parcel_mail_in: JA:Tag:vending=parcel pickup;parcel mail
+      in
     vending=parking_tickets: JA:Tag:vending=parking tickets
     vending=photo: JA:Tag:vending=photo
     wall=no: JA:Tag:wall=no
+    wall=noise_barrier: JA:Tag:wall=noise barrier
     water=intermittent: JA:Tag:water=intermittent
     water=lock: JA:Tag:water=lock
+    water=wastewater: JA:Tag:water=wastewater
     waterway=boat_lift: JA:Tag:waterway=boat lift
     waterway=boatyard: JA:Tag:waterway=boatyard
     waterway=brook: JA:Tag:waterway=brook
@@ -11886,7 +17742,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
@@ -11905,20 +17760,75 @@ 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
     highway: Ko:Key:highway
+    intermittent: Ko:Key:intermittent
+    leisure: Ko:Key:leisure
+    level: Ko:Key:level
+    line: Ko:Key:line
+    local_ref: Ko:Key:local ref
     name: Ko:Key:name
+    operator:type: Ko:Key:operator:type
+    reservation: Ko:Key:reservation
+    self_service: Ko:Key:self service
+    smoothness: Ko:Key:smoothness
+    tenant: Ko:Key:tenant
+    townhall:type: Ko:Key:townhall:type
+    tracktype: Ko:Key:tracktype
+    tunnel: Ko:Key:tunnel
+    turn: Ko:Key:turn
+    wheelchair: Ko:Key:wheelchair
     wikipedia: Ko:Key:wikipedia
   tag:
+    access=designated: Ko:Tag:access=designated
     aerialway=cable_car: Ko:Tag:aerialway=cable car
+    amenity=fuel: Ko:Tag:amenity=fuel
+    amenity=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
+    building=abandoned: Ko:Tag:building=abandoned
     craft=tailor: Ko:Tag:craft=tailor
+    ford=stepping_stones: Ko:Tag:ford=stepping stones
+    highway=bus_stop: Ko:Tag:highway=bus stop
+    highway=elevator: Ko:Tag:highway=elevator
     highway=motorway: Ko:Tag:highway=motorway
+    highway=motorway_link: Ko:Tag:highway=motorway link
+    highway=path: Ko:Tag:highway=path
+    highway=primary: Ko:Tag:highway=primary
+    highway=secondary: Ko:Tag:highway=secondary
+    highway=service: Ko:Tag:highway=service
+    highway=services: Ko:Tag:highway=services
+    highway=stop: Ko:Tag:highway=stop
+    highway=tertiary: Ko:Tag:highway=tertiary
     highway=track: Ko:Tag:highway=track
     highway=trunk: Ko:Tag:highway=trunk
+    landuse=farmland: Ko:Tag:landuse=farmland
+    landuse=retail: Ko:Tag:landuse=retail
+    landuse=traffic_island: Ko:Tag:landuse=traffic island
+    leisure=disc_golf_course: Ko:Tag:leisure=disc golf course
+    leisure=garden: Ko:Tag:leisure=garden
+    man_made=mast: Ko:Tag:man made=mast
+    man_made=surveillance: Ko:Tag:man made=surveillance
+    natural=grassland: Ko:Tag:natural=grassland
+    natural=spring: Ko:Tag:natural=spring
+    natural=tree: Ko:Tag:natural=tree
+    place=hamlet: Ko:Tag:place=hamlet
+    place=town: Ko:Tag:place=town
+    shop=convenience: Ko:Tag:shop=convenience
+    shop=cosmetics: Ko:Tag:shop=cosmetics
     shop=garden_centre: Ko:Tag:shop=garden centre
     shop=gift: Ko:Tag:shop=gift
+    tourism=attraction: Ko:Tag:tourism=attraction
+    traffic_calming=island: Ko:Tag:traffic calming=island
+    waterway=ditch: Ko:Tag:waterway=ditch
 lt:
   key:
     cycleway: Lt:Key:cycleway
@@ -11928,7 +17838,7 @@ lv:
 ms:
   tag:
     highway=motorway: Ms:Tag:highway=motorway
-    highway=primary: MS:Tag:highway=primary
+    highway=primary: Ms:Tag:highway=primary
     highway=residential: Ms:Tag:highway=residential
     highway=secondary: Ms:Tag:highway=secondary
     highway=service: Ms:Tag:highway=service
@@ -11936,8 +17846,9 @@ ms:
     highway=trunk: Ms:Tag:highway=trunk
     highway=unclassified: Ms:Tag:highway=unclassified
 ne:
+  key:
+    tracktype: Ne:Key:tracktype
   tag:
-    landuse=meadow: Ne:Tag:landuse=meadow
     natural=scrub: Ne:Tag:natural=scrub
 nl:
   key:
@@ -11953,6 +17864,7 @@ nl:
     backrest: NL:Key:backrest
     barrier: NL:Key:barrier
     bench: NL:Key:bench
+    bicycle: NL:Key:bicycle
     bicycle_road: NL:Key:bicycle road
     building: NL:Key:building
     circumference: NL:Key:circumference
@@ -11960,11 +17872,15 @@ 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
+    historic: NL:Key:historic
     internet_access: NL:Key:internet access
     landuse: NL:Key:landuse
     leaf_cycle: NL:Key:leaf cycle
@@ -11973,22 +17889,31 @@ 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
+    playground: NL:Key:playground
+    population: NL:Key:population
     power_supply:schedule: NL:Key:power supply:schedule
     public_transport: NL:Key:public transport
-    religion: NL:Key:religion
+    ref:bag: NL:Key:ref:bag
+    ref:bag:old: NL:Key:ref:bag:old
     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
     turn:lanes: NL:Key:turn:lanes
     type: NL:Key:type
     waste: NL:Key:waste
+    water: NL:Key:water
+    waterway: NL:Key:waterway
     wheelchair: NL:Key:wheelchair
+    xmas:feature: NL:Key:xmas:feature
   tag:
     amenity=bank: NL:Tag:amenity=bank
     amenity=bench: NL:Tag:amenity=bench
@@ -11998,6 +17923,7 @@ nl:
     amenity=parking: NL:Tag:amenity=parking
     amenity=post_office: NL:Tag:amenity=post office
     amenity=toilets: NL:Tag:amenity=toilets
+    amenity=vending_machine: NL:Tag:amenity=vending machine
     amenity=waste_basket: NL:Tag:amenity=waste basket
     barrier=bollard: NL:Tag:barrier=bollard
     barrier=fence: NL:Tag:barrier=fence
@@ -12010,14 +17936,19 @@ 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
     landuse=garages: NL:Tag:landuse=garages
     landuse=grass: NL:Tag:landuse=grass
     landuse=industrial: NL:Tag:landuse=industrial
+    leaf_cycle=deciduous: NL:Tag:leaf cycle=deciduous
+    leisure=playground: NL:Tag:leisure=playground
     man_made=windmill: NL:Tag:man made=windmill
     natural=tree: NL:Tag:natural=tree
+    office=architect: NL:Tag:office=architect
+    office=yes: NL:Tag:office=yes
     public_transport=platform: NL:Tag:public transport=platform
     public_transport=station: NL:Tag:public transport=station
     public_transport=stop_area: NL:Tag:public transport=stop area
@@ -12025,7 +17956,20 @@ nl:
     shop=car: NL:Tag:shop=car
     shop=department_store: NL:Tag:shop=department store
     shop=greengrocer: NL:Tag:shop=greengrocer
+    shop=motorcycle: NL:Tag:shop=motorcycle
+    sport=floorball: NL:Tag:sport=floorball
+    sport=miniature_golf: NL:Tag:sport=miniature golf
+    sport=scuba_diving: NL:Tag:sport=scuba diving
+    sport=squash: NL:Tag:sport=squash
     tourism=chalet: NL:Tag:tourism=chalet
+    traffic_sign=NL:A01-30-ZB: NL:Tag:traffic sign=NL:A01-30-ZB
+    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:
   key:
@@ -12033,10 +17977,10 @@ no:
     boundary: No:Key:boundary
     building: No:Key:building
     fenced: No:Key:fenced
+    highway: No:Key:highway
     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
@@ -12046,20 +17990,32 @@ no:
     amenity=pharmacy: No:Tag:amenity=pharmacy
     amenity=place_of_worship: No:Tag:amenity=place of worship
     boundary=maritime: No:Tag:boundary=maritime
+    building=construction: No:Tag:building=construction
+    landuse=farmland: No:Tag:landuse=farmland
     leisure=park: No:Tag:leisure=park
     natural=tree: No:Tag:natural=tree
+oc:
+  key:
+    name:oc: Oc:Key:name:oc
 pl:
   key:
+    3dr:type: Pl:Key:3dr:type
     4wd_only: Pl:Key:4wd only
     CEMT: Pl:Key:CEMT
+    FIXME: Pl:Key:FIXME
+    abandoned: Pl:Key:abandoned
+    'abandoned:': 'Pl:Key:abandoned:'
+    abandoned:railway: Pl:Key:abandoned:railway
     abutters: Pl:Key:abutters
     access: Pl:Key:access
+    actuator: Pl:Key:actuator
     addr: Pl:Key:addr
     addr:city: Pl:Key:addr:city
     addr:country: Pl:Key:addr:country
     addr:county: Pl:Key:addr:county
     addr:district: Pl:Key:addr:district
     addr:flats: Pl:Key:addr:flats
+    addr:floor: Pl:Key:addr:floor
     addr:hamlet: Pl:Key:addr:hamlet
     addr:housenumber: Pl:Key:addr:housenumber
     addr:municipality: Pl:Key:addr:municipality
@@ -12071,23 +18027,38 @@ pl:
     addr:subdistrict: Pl:Key:addr:subdistrict
     addr:suburb: Pl:Key:addr:suburb
     addr:village: Pl:Key:addr:village
+    admin_level: Pl:Key:admin level
+    adr_les: Pl:Key:adr les
     advertising: Pl:Key:advertising
     aerialway: Pl:Key:aerialway
+    aerialway:drag_lift: Pl:Key:aerialway:drag lift
     aeroway: Pl:Key:aeroway
+    agrarian: Pl:Key:agrarian
+    agricultural: Pl:Key:agricultural
     alt_name: Pl:Key:alt name
     amenity: Pl:Key:amenity
+    architect: Pl:Key:architect
     area: Pl:Key:area
     area:highway: Pl:Key:area:highway
+    artist_name: Pl:Key:artist name
+    artwork_subject: Pl:Key:artwork subject
     artwork_type: Pl:Key:artwork type
+    automated: Pl:Key:automated
     automatic_door: Pl:Key:automatic door
     backrest: Pl:Key:backrest
     bar: Pl:Key:bar
     barrier: Pl:Key:barrier
+    basin: Pl:Key:basin
+    bath:type: Pl:Key:bath:type
+    beauty: Pl:Key:beauty
     beds: Pl:Key:beds
+    bell_tower: Pl:Key:bell tower
     bench: Pl:Key:bench
     bicycle: Pl:Key:bicycle
     bicycle_parking: Pl:Key:bicycle parking
     bicycle_road: Pl:Key:bicycle road
+    bin: Pl:Key:bin
+    biotic_reef:type: Pl:Key:biotic reef:type
     board_type: Pl:Key:board type
     bollard: Pl:Key:bollard
     border_type: Pl:Key:border type
     bridge:movable: Pl:Key:bridge:movable
     bridge:structure: Pl:Key:bridge:structure
     bridge:support: Pl:Key:bridge:support
+    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
     building:levels: Pl:Key:building:levels
     building:material: Pl:Key:building:material
     building:min_level: Pl:Key:building:min level
     building:part: Pl:Key:building:part
+    building:usage:pl: Pl:Key:building:usage:pl
+    building:use: Pl:Key:building:use
     bunker_type: Pl:Key:bunker type
     bus: Pl:Key:bus
+    busbar: Pl:Key:busbar
     busway: Pl:Key:busway
     button_operated: Pl:Key:button operated
+    cables: Pl:Key:cables
     capacity: Pl:Key:capacity
+    capital: Pl:Key:capital
+    cargo: Pl:Key:cargo
     castle_type: Pl:Key:castle type
     cemetery: Pl:Key:cemetery
+    check_date: Pl:Key:check date
+    church:type: Pl:Key:church:type
+    circuits: Pl:Key:circuits
     circumference: Pl:Key:circumference
+    clothes: Pl:Key:clothes
     club: Pl:Key:club
     colour: Pl:Key:colour
     comment: Pl:Key:comment
+    communication:microwave: Pl:Key:communication:microwave
     communication:mobile_phone: Pl:Key:communication:mobile phone
+    communication:radio: Pl:Key:communication:radio
+    communication:television: Pl:Key:communication:television
+    community_centre: Pl:Key:community centre
+    community_centre:for: Pl:Key:community centre:for
     construction: Pl:Key:construction
+    construction_end_expected: Pl:Key:construction end expected
+    construction_start_expected: Pl:Key:construction start expected
     contact: Pl:Key:contact
+    content: Pl:Key:content
+    conveying: Pl:Key:conveying
+    country: Pl:Key:country
     covered: Pl:Key:covered
     craft: Pl:Key:craft
+    crane:type: Pl:Key:crane:type
     crop: Pl:Key:crop
     crossing: Pl:Key:crossing
+    crossing:island: Pl:Key:crossing:island
+    cuisine: Pl:Key:cuisine
+    currency: Pl:Key:currency
     cutting: Pl:Key:cutting
+    cycleway: Pl:Key:cycleway
+    cycleway:surface: Pl:Key:cycleway:surface
     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
     destination: Pl:Key:destination
+    diameter: Pl:Key:diameter
+    diet: Pl:Key:diet
+    'diet:': 'Pl:Key:diet:'
+    diet:halal: Pl:Key:diet:halal
+    diet:kosher: Pl:Key:diet:kosher
+    diet:vegan: Pl:Key:diet:vegan
+    diet:vegetarian: Pl:Key:diet:vegetarian
     diocese: Pl:Key:diocese
+    diplomatic: Pl:Key:diplomatic
     direction: Pl:Key:direction
     dispensing: Pl:Key:dispensing
     distance: Pl:Key:distance
+    door: Pl:Key:door
+    drink: Pl:Key:drink
+    drinking_water: Pl:Key:drinking water
+    driving_side: Pl:Key:driving side
+    dryer: Pl:Key:dryer
     duration: Pl:Key:duration
     ele: Pl:Key:ele
     electrified: Pl:Key:electrified
+    email: Pl:Key:email
     embankment: Pl:Key:embankment
     emergency: Pl:Key:emergency
     end_date: Pl:Key:end date
     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
     flood_mark: Pl:Key:flood mark
     flood_prone: Pl:Key:flood prone
     foot: Pl:Key:foot
     footway: Pl:Key:footway
     ford: Pl:Key:ford
+    fortification_type: Pl:Key:fortification type
+    fountain: Pl:Key:fountain
+    fridge: Pl:Key:fridge
     fuel: Pl:Key:fuel
+    gambling: Pl:Key:gambling
+    garden:style: Pl:Key:garden:style
+    garden:type: Pl:Key:garden:type
     gauge: Pl:Key:gauge
     generator:output: Pl:Key:generator:output
+    genus: Pl:Key:genus
+    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
     height: Pl:Key:height
+    heritage: Pl:Key:heritage
+    hgv: Pl:Key:hgv
     highway: Pl:Key:highway
+    highway:category:pl: Pl:Key:highway:category:pl
+    highway:class:pl: Pl:Key:highway:class:pl
     historic: Pl:Key:historic
+    historic:civilization: Pl:Key:historic:civilization
+    historic:era: Pl:Key:historic:era
+    historic:period: Pl:Key:historic:period
+    horse: Pl:Key:horse
+    ice_road: Pl:Key:ice road
+    incline: Pl:Key:incline
+    indoor: Pl:Key:indoor
     industrial: Pl:Key:industrial
     information: Pl:Key:information
     inscription: Pl:Key:inscription
+    int_name: Pl:Key:int name
     intermittent: Pl:Key:intermittent
     internet_access: Pl:Key:internet access
     is_in: Pl:Key:is in
@@ -12183,21 +18231,30 @@ pl:
     is_in:suburb: Pl:Key:is in:suburb
     is_in:town: Pl:Key:is in:town
     is_in:village: Pl:Key:is in:village
+    isced:level: Pl:Key:isced:level
     junction: Pl:Key:junction
     kerb: Pl:Key:kerb
+    landfill:waste: Pl:Key:landfill:waste
+    landmark: Pl:Key:landmark
     landuse: Pl:Key:landuse
     lanes: Pl:Key:lanes
     lanes:psv: Pl:Key:lanes:psv
     layer: Pl:Key:layer
+    leaf_cycle: Pl:Key:leaf cycle
     leaf_type: Pl:Key:leaf type
     leisure: Pl:Key:leisure
     length: Pl:Key:length
+    level: Pl:Key:level
     lit: Pl:Key:lit
+    loc_name: Pl:Key:loc name
+    loc_ref: Pl:Key:loc ref
     location: Pl:Key:location
     lock: Pl:Key:lock
     lock_name: Pl:Key:lock name
+    male: Pl:Key:male
     man_made: Pl:Key:man made
     manhole: Pl:Key:manhole
+    material: Pl:Key:material
     max_age: Pl:Key:max age
     maxage: Pl:Key:maxage
     maxaxleload: Pl:Key:maxaxleload
@@ -12212,7 +18269,10 @@ pl:
     maxweight: Pl:Key:maxweight
     maxwidth: Pl:Key:maxwidth
     maxwidth:physical: Pl:Key:maxwidth:physical
+    megalith_type: Pl:Key:megalith type
+    memorial: Pl:Key:memorial
     memorial:type: Pl:Key:memorial:type
+    military: Pl:Key:military
     min_age: Pl:Key:min age
     min_height: Pl:Key:min height
     minage: Pl:Key:minage
@@ -12223,28 +18283,52 @@ pl:
     moped: Pl:Key:moped
     motorboat: Pl:Key:motorboat
     motorcycle: Pl:Key:motorcycle
+    motorroad: Pl:Key:motorroad
+    mountain_pass: Pl:Key:mountain pass
+    moved: Pl:Key:moved
     name: Pl:Key:name
+    name:etymology: Pl:Key:name:etymology
+    nat_ref: Pl:Key:nat ref
     natural: Pl:Key:natural
+    network: Pl:Key:network
     noexit: Pl:Key:noexit
+    non_existent_levels: Pl:Key:non existent levels
     note: Pl:Key:note
+    nudism: Pl:Key:nudism
     office: Pl:Key:office
+    old_name: Pl:Key:old name
+    old_ref: Pl:Key:old ref
     oneway: Pl:Key:oneway
+    opening_date: Pl:Key:opening date
     opening_hours: Pl:Key:opening hours
     operator: Pl:Key:operator
+    operator:type: Pl:Key:operator:type
     organic: Pl:Key:organic
+    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
+    phone: Pl:Key:phone
+    pipeline: Pl:Key:pipeline
     place: Pl:Key:place
     place_name: Pl:Key:place name
+    placement: Pl:Key:placement
     playground: Pl:Key:playground
     population: Pl:Key:population
+    post_box:type: Pl:Key:post box:type
     power: Pl:Key:power
+    pressure: Pl:Key:pressure
     priority: Pl:Key:priority
     produce: Pl:Key:produce
     product: Pl:Key:product
+    proposed: Pl:Key:proposed
     protect_class: Pl:Key:protect class
     psv: Pl:Key:psv
     public_transport: Pl:Key:public transport
@@ -12252,38 +18336,83 @@ pl:
     railway: Pl:Key:railway
     railway:area: Pl:Key:railway:area
     ramp: Pl:Key:ramp
+    razed: Pl:Key:razed
+    'razed:': 'Pl:Key:razed:'
+    recycling:plastic_bottle_tops: Pl:Key:recycling:plastic bottle tops
     recycling_type: Pl:Key:recycling type
+    reef: Pl:Key:reef
+    ref: Pl:Key:ref
+    reference_point: Pl:Key:reference point
+    reg_ref: Pl:Key:reg ref
     religion: Pl:Key:religion
+    'removed:': 'Pl:Key:removed:'
     repair: Pl:Key:repair
+    repeat_on: Pl:Key:repeat on
+    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
+    'ruined:': 'Pl:Key:ruined:'
     ruins: Pl:Key:ruins
+    'ruins:': 'Pl:Key:ruins:'
     sac_scale: Pl:Key:sac scale
     seamark:fixme: Pl:Key:seamark:fixme
+    seasonal: Pl:Key:seasonal
     second_hand: Pl:Key:second hand
+    segregated: Pl:Key:segregated
     service: Pl:Key:service
     service_times: Pl:Key:service times
     shelter: Pl:Key:shelter
     shelter_type: Pl:Key:shelter type
     shop: Pl:Key:shop
+    shower: Pl:Key:shower
+    shrine: Pl:Key:shrine
     sidewalk: Pl:Key:sidewalk
+    site_type: Pl:Key:site type
+    size: Pl:Key:size
+    smokefree: Pl:Key:smokefree
+    smoking: Pl:Key:smoking
     smoothness: Pl:Key:smoothness
     social_facility: Pl:Key:social facility
     social_facility:for: Pl:Key:social facility:for
     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
     step_count: Pl:Key:step count
+    stone_type: Pl:Key:stone type
+    strapline: Pl:Key:strapline
+    subsea: Pl:Key:subsea
+    substance: Pl:Key:substance
+    supervised: Pl:Key:supervised
+    support: Pl:Key:support
     surface: Pl:Key:surface
     surveillance: Pl:Key:surveillance
     surveillance:type: Pl:Key:surveillance:type
     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
+    tidal: Pl:Key:tidal
+    toilets: Pl:Key:toilets
+    toilets:wheelchair: Pl:Key:toilets:wheelchair
     toll: Pl:Key:toll
     tomb: Pl:Key:tomb
     tourism: Pl:Key:tourism
+    tower:construction: Pl:Key:tower:construction
+    tower:type: Pl:Key:tower:type
+    tracks: Pl:Key:tracks
     tracktype: Pl:Key:tracktype
     traffic_calming: Pl:Key:traffic calming
     traffic_signals: Pl:Key:traffic signals
@@ -12293,27 +18422,44 @@ pl:
     traffic_signals:minimap: Pl:Key:traffic signals:minimap
     traffic_signals:sound: Pl:Key:traffic signals:sound
     traffic_signals:vibration: Pl:Key:traffic signals:vibration
+    trail_visibility: Pl:Key:trail visibility
+    trailer: Pl:Key:trailer
     train: Pl:Key:train
     tram: Pl:Key:tram
+    trees: Pl:Key:trees
+    trolley_wire: Pl:Key:trolley wire
     trolleybus: Pl:Key:trolleybus
     tunnel: Pl:Key:tunnel
     turn: Pl:Key:turn
     turn:lanes: Pl:Key:turn:lanes
     type: Pl:Key:type
+    unisex: Pl:Key:unisex
     url: Pl:Key:url
     usage: Pl:Key:usage
     vehicle: Pl:Key:vehicle
     voltage: Pl:Key:voltage
+    washing_machine: Pl:Key:washing machine
+    waste: Pl:Key:waste
+    water: Pl:Key:water
+    water_characteristic: Pl:Key:water characteristic
+    water_point: Pl:Key:water point
     waterway: Pl:Key:waterway
     website: Pl:Key:website
     wetland: Pl:Key:wetland
     wheelchair: Pl:Key:wheelchair
+    wheelchair:description: Pl:Key:wheelchair:description
+    wholesale: Pl:Key:wholesale
     width: Pl:Key:width
     wikipedia: Pl:Key:wikipedia
+    winter_road: Pl:Key:winter road
+    wires: Pl:Key:wires
     wood: Pl:Key:wood
+    xmas:feature: Pl:Key:xmas:feature
     zone:traffic: Pl:Key:zone:traffic
     zoo: Pl:Key:zoo
   tag:
+    abandoned:amenity=prison: Pl:Tag:abandoned:amenity=prison
+    abandoned:amenity=prison_camp: Pl:Tag:abandoned:amenity=prison camp
     access=customers: Pl:Tag:access=customers
     access=designated: Pl:Tag:access=designated
     access=exclusion_zone: Pl:Tag:access=exclusion zone
@@ -12321,6 +18467,7 @@ pl:
     access=no: Pl:Tag:access=no
     access=official: Pl:Tag:access=official
     access=private: Pl:Tag:access=private
+    actuator=hydraulic_cylinder: Pl:Tag:actuator=hydraulic cylinder
     advertising=billboard: Pl:Tag:advertising=billboard
     advertising=board: Pl:Tag:advertising=board
     advertising=column: Pl:Tag:advertising=column
     advertising=totem: Pl:Tag:advertising=totem
     advertising=wall_painting: Pl:Tag:advertising=wall painting
     aeroway=hangar: Pl:Tag:aeroway=hangar
+    aeroway=helipad: Pl:Tag:aeroway=helipad
     allotments=plot: Pl:Tag:allotments=plot
     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
     amenity=bank: Pl:Tag:amenity=bank
+    amenity=bar: Pl:Tag:amenity=bar
     amenity=bbq: Pl:Tag:amenity=bbq
     amenity=bench: Pl:Tag:amenity=bench
     amenity=bicycle_parking: Pl:Tag:amenity=bicycle parking
     amenity=bicycle_rental: Pl:Tag:amenity=bicycle rental
+    amenity=bicycle_repair_station: Pl:Tag:amenity=bicycle repair station
+    amenity=biergarten: Pl:Tag:amenity=biergarten
+    amenity=boat_rental: Pl:Tag:amenity=boat rental
+    amenity=boat_storage: Pl:Tag:amenity=boat storage
     amenity=brothel: Pl:Tag:amenity=brothel
+    amenity=bureau_de_change: Pl:Tag:amenity=bureau de change
+    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
+    amenity=childcare: Pl:Tag:amenity=childcare
+    amenity=cinema: Pl:Tag:amenity=cinema
+    amenity=clinic: Pl:Tag:amenity=clinic
+    amenity=cloakroom: Pl:Tag:amenity=cloakroom
+    amenity=clock: Pl:Tag:amenity=clock
+    amenity=coast_guard: Pl:Tag:amenity=coast guard
+    amenity=college: Pl:Tag:amenity=college
+    amenity=community_centre: Pl:Tag:amenity=community centre
     amenity=compressed_air: Pl:Tag:amenity=compressed air
+    amenity=concert_hall: Pl:Tag:amenity=concert hall
+    amenity=concession_stand: Pl:Tag:amenity=concession stand
+    amenity=conference_centre: Pl:Tag:amenity=conference centre
+    amenity=courthouse: Pl:Tag:amenity=courthouse
+    amenity=coworking_space: Pl:Tag:amenity=coworking space
+    amenity=crematorium: Pl:Tag:amenity=crematorium
     amenity=crypt: Pl:Tag:amenity=crypt
+    amenity=customs: Pl:Tag:amenity=customs
+    amenity=dentist: Pl:Tag:amenity=dentist
+    amenity=device_charging_station: Pl:Tag:amenity=device charging station
+    amenity=dive_centre: Pl:Tag:amenity=dive centre
     amenity=doctors: Pl:Tag:amenity=doctors
     amenity=drinking_water: Pl:Tag:amenity=drinking water
     amenity=driving_school: Pl:Tag:amenity=driving school
+    amenity=dryer: Pl:Tag:amenity=dryer
+    amenity=embassy: Pl:Tag:amenity=embassy
     amenity=events_venue: Pl:Tag:amenity=events venue
+    amenity=exhibition_centre: Pl:Tag:amenity=exhibition centre
+    amenity=fast_food: Pl:Tag:amenity=fast food
+    amenity=feeding_place: Pl:Tag:amenity=feeding place
     amenity=ferry_terminal: Pl:Tag:amenity=ferry terminal
+    amenity=festival_grounds: Pl:Tag:amenity=festival grounds
+    amenity=financial_advice: Pl:Tag:amenity=financial advice
     amenity=fire_station: Pl:Tag:amenity=fire station
     amenity=food_court: Pl:Tag:amenity=food court
+    amenity=fountain: Pl:Tag:amenity=fountain
+    amenity=fridge: Pl:Tag:amenity=fridge
     amenity=fuel: Pl:Tag:amenity=fuel
+    amenity=gambling: Pl:Tag:amenity=gambling
     amenity=game_feeding: Pl:Tag:amenity=game feeding
     amenity=grave_yard: Pl:Tag:amenity=grave yard
+    amenity=grit_bin: Pl:Tag:amenity=grit bin
+    amenity=hookah_lounge: Pl:Tag:amenity=hookah lounge
+    amenity=hospice: Pl:Tag:amenity=hospice
+    amenity=hospital: Pl:Tag:amenity=hospital
     amenity=hunting_stand: Pl:Tag:amenity=hunting stand
     amenity=ice_cream: Pl:Tag:amenity=ice cream
+    amenity=internet_cafe: Pl:Tag:amenity=internet cafe
+    amenity=kindergarten: Pl:Tag:amenity=kindergarten
+    amenity=language_school: Pl:Tag:amenity=language school
+    amenity=lavoir: Pl:Tag:amenity=lavoir
+    amenity=letter_box: Pl:Tag:amenity=letter box
+    amenity=library: Pl:Tag:amenity=library
+    amenity=loading_dock: Pl:Tag:amenity=loading dock
+    amenity=lounger: Pl:Tag:amenity=lounger
     amenity=marketplace: Pl:Tag:amenity=marketplace
+    amenity=monastery: Pl:Tag:amenity=monastery
+    amenity=money_transfer: Pl:Tag:amenity=money transfer
     amenity=mortuary: Pl:Tag:amenity=mortuary
+    amenity=motorcycle_parking: Pl:Tag:amenity=motorcycle parking
+    amenity=motorcycle_rental: Pl:Tag:amenity=motorcycle rental
+    amenity=music_school: Pl:Tag:amenity=music school
     amenity=music_venue: Pl:Tag:amenity=music venue
+    amenity=nightclub: Pl:Tag:amenity=nightclub
+    amenity=nursing_home: Pl:Tag:amenity=nursing home
     amenity=parking: Pl:Tag:amenity=parking
     amenity=parking_entrance: Pl:Tag:amenity=parking entrance
     amenity=parking_space: Pl:Tag:amenity=parking space
+    amenity=payment_centre: Pl:Tag:amenity=payment centre
     amenity=pharmacy: Pl:Tag:amenity=pharmacy
+    amenity=photo_booth: Pl:Tag:amenity=photo booth
     amenity=place_of_worship: Pl:Tag:amenity=place of worship
+    amenity=planetarium: Pl:Tag:amenity=planetarium
+    amenity=police: Pl:Tag:amenity=police
+    amenity=polling_station: Pl:Tag:amenity=polling station
     amenity=post_box: Pl:Tag:amenity=post box
     amenity=post_office: Pl:Tag:amenity=post office
+    amenity=prison: Pl:Tag:amenity=prison
+    amenity=prison_camp: Pl:Tag:amenity=prison camp
+    amenity=pub: Pl:Tag:amenity=pub
+    amenity=public_bath: Pl:Tag:amenity=public bath
+    amenity=public_bookcase: Pl:Tag:amenity=public bookcase
+    amenity=public_building: Pl:Tag:amenity=public building
+    amenity=ranger_station: Pl:Tag:amenity=ranger station
     amenity=recycling: Pl:Tag:amenity=recycling
+    amenity=refugee_housing: Pl:Tag:amenity=refugee housing
+    amenity=research_institute: Pl:Tag:amenity=research institute
     amenity=restaurant: Pl:Tag:amenity=restaurant
+    amenity=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
     amenity=shelter: Pl:Tag:amenity=shelter
+    amenity=shop: Pl:Tag:amenity=shop
+    amenity=shower: Pl:Tag:amenity=shower
+    amenity=smoking_area: Pl:Tag:amenity=smoking area
+    amenity=snow_removal_station: Pl:Tag:amenity=snow removal station
+    amenity=social_centre: Pl:Tag:amenity=social centre
     amenity=social_facility: Pl:Tag:amenity=social facility
+    amenity=stripclub: Pl:Tag:amenity=stripclub
+    amenity=studio: Pl:Tag:amenity=studio
+    amenity=table: Pl:Tag:amenity=table
     amenity=taxi: Pl:Tag:amenity=taxi
+    amenity=theatre: Pl:Tag:amenity=theatre
+    amenity=ticket_validator: Pl:Tag:amenity=ticket validator
+    amenity=toilets: Pl:Tag:amenity=toilets
+    amenity=tourist_bus_parking: Pl:Tag:amenity=tourist bus parking
+    amenity=townhall: Pl:Tag:amenity=townhall
+    amenity=traffic_park: Pl:Tag:amenity=traffic park
+    amenity=training: Pl:Tag:amenity=training
+    amenity=trolley_bay: Pl:Tag:amenity=trolley bay
+    amenity=university: Pl:Tag:amenity=university
+    amenity=vacuum_cleaner: Pl:Tag:amenity=vacuum cleaner
+    amenity=vehicle_inspection: Pl:Tag:amenity=vehicle inspection
     amenity=vehicle_ramp: Pl:Tag:amenity=vehicle ramp
     amenity=vending_machine: Pl:Tag:amenity=vending machine
+    amenity=veterinary: Pl:Tag:amenity=veterinary
+    amenity=washing_machine: Pl:Tag:amenity=washing machine
+    amenity=waste_basket: Pl:Tag:amenity=waste basket
     amenity=waste_disposal: Pl:Tag:amenity=waste disposal
+    amenity=waste_transfer_station: Pl:Tag:amenity=waste transfer station
     amenity=water_point: Pl:Tag:amenity=water point
+    area:highway=cycleway: Pl:Tag:area:highway=cycleway
+    area:highway=footway: Pl:Tag:area:highway=footway
+    area:highway=path: Pl:Tag:area:highway=path
+    area:highway=pedestrian: Pl:Tag:area:highway=pedestrian
+    artwork_type=dwarf: Pl:Tag:artwork type=dwarf
+    artwork_type=sculpture: Pl:Tag:artwork type=sculpture
+    artwork_type=statue: Pl:Tag:artwork type=statue
     atm=no: Pl:Tag:atm=no
     atm=yes: Pl:Tag:atm=yes
     attraction=animal: Pl:Tag:attraction=animal
+    attraction=summer_toboggan: Pl:Tag:attraction=summer toboggan
     attraction=train: Pl:Tag:attraction=train
     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
@@ -12397,9 +18657,14 @@ pl:
     barrier=guard_rail: Pl:Tag:barrier=guard rail
     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
+    barrier=sally_port: Pl:Tag:barrier=sally port
+    barrier=spikes: Pl:Tag:barrier=spikes
+    barrier=stile: Pl:Tag:barrier=stile
     barrier=toll_booth: Pl:Tag:barrier=toll booth
     barrier=turnstile: Pl:Tag:barrier=turnstile
     barrier=wall: Pl:Tag:barrier=wall
@@ -12441,49 +18706,85 @@ pl:
     bridge=simple_brunnel: Pl:Tag:bridge=simple brunnel
     bridge=trestle: Pl:Tag:bridge=trestle
     bridge=viaduct: Pl:Tag:bridge=viaduct
+    building=allotment_house: Pl:Tag:building=allotment house
     building=apartments: Pl:Tag:building=apartments
     building=barn: Pl:Tag:building=barn
+    building=boathouse: Pl:Tag:building=boathouse
+    building=brewery: Pl:Tag:building=brewery
     building=bridge: Pl:Tag:building=bridge
+    building=bungalow: Pl:Tag:building=bungalow
     building=bunker: Pl:Tag:building=bunker
     building=cabin: Pl:Tag:building=cabin
+    building=carport: Pl:Tag:building=carport
     building=cathedral: Pl:Tag:building=cathedral
     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
     building=construction: Pl:Tag:building=construction
+    building=container: Pl:Tag:building=container
+    building=cowshed: Pl:Tag:building=cowshed
     building=detached: Pl:Tag:building=detached
     building=dormitory: Pl:Tag:building=dormitory
     building=entrance: Pl:Tag:building=entrance
+    building=farm: Pl:Tag:building=farm
     building=farm_auxiliary: Pl:Tag:building=farm auxiliary
     building=garage: Pl:Tag:building=garage
     building=garages: Pl:Tag:building=garages
+    building=grandstand: Pl:Tag:building=grandstand
     building=greenhouse: Pl:Tag:building=greenhouse
     building=hangar: Pl:Tag:building=hangar
     building=hospital: Pl:Tag:building=hospital
     building=hotel: Pl:Tag:building=hotel
     building=house: Pl:Tag:building=house
+    building=houseboat: Pl:Tag:building=houseboat
     building=hut: Pl:Tag:building=hut
     building=industrial: Pl:Tag:building=industrial
+    building=kindergarten: Pl:Tag:building=kindergarten
+    building=kiosk: Pl:Tag:building=kiosk
     building=manufacture: Pl:Tag:building=manufacture
     building=mosque: Pl:Tag:building=mosque
     building=office: Pl:Tag:building=office
+    building=parking: Pl:Tag:building=parking
+    building=pavilion: Pl:Tag:building=pavilion
+    building=presbytery: Pl:Tag:building=presbytery
     building=public: Pl:Tag:building=public
     building=residential: Pl:Tag:building=residential
     building=retail: Pl:Tag:building=retail
+    building=riding_hall: Pl:Tag:building=riding hall
     building=roof: Pl:Tag:building=roof
     building=ruins: Pl:Tag:building=ruins
     building=school: Pl:Tag:building=school
+    building=semidetached_house: Pl:Tag:building=semidetached house
+    building=service: Pl:Tag:building=service
     building=shed: Pl:Tag:building=shed
+    building=shrine: Pl:Tag:building=shrine
+    building=slurry_tank: Pl:Tag:building=slurry tank
+    building=sports_centre: Pl:Tag:building=sports centre
+    building=sports_hall: Pl:Tag:building=sports hall
     building=stable: Pl:Tag:building=stable
+    building=stadium: Pl:Tag:building=stadium
+    building=static_caravan: Pl:Tag:building=static caravan
+    building=stilt_house: Pl:Tag:building=stilt house
     building=sty: Pl:Tag:building=sty
     building=supermarket: Pl:Tag:building=supermarket
     building=synagogue: Pl:Tag:building=synagogue
+    building=temple: Pl:Tag:building=temple
     building=terrace: Pl:Tag:building=terrace
+    building=toilets: Pl:Tag:building=toilets
     building=train_station: Pl:Tag:building=train station
+    building=transformer_tower: Pl:Tag:building=transformer tower
     building=transportation: Pl:Tag:building=transportation
     building=university: Pl:Tag:building=university
     building=warehouse: Pl:Tag:building=warehouse
+    building=water_tower: Pl:Tag:building=water tower
+    building=wayside_shrine: Pl:Tag:building=wayside shrine
+    bunker_type=gun_emplacement: Pl:Tag:bunker type=gun emplacement
+    bunker_type=technical: Pl:Tag:bunker type=technical
+    busway=lane: Pl:Tag:busway=lane
     castle_type=castrum: Pl:Tag:castle type=castrum
     castle_type=defensive: Pl:Tag:castle type=defensive
     castle_type=fortress: Pl:Tag:castle type=fortress
@@ -12494,6 +18795,7 @@ pl:
     club=fan: Pl:Tag:club=fan
     club=scout: Pl:Tag:club=scout
     club=sport: Pl:Tag:club=sport
+    construction=footpath: Pl:Tag:construction=footpath
     craft=agricultural_engines: Pl:Tag:craft=agricultural engines
     craft=bakery: Pl:Tag:craft=bakery
     craft=basket_maker: Pl:Tag:craft=basket maker
     craft=brewery: Pl:Tag:craft=brewery
     craft=builder: Pl:Tag:craft=builder
     craft=cabinet_maker: Pl:Tag:craft=cabinet maker
+    craft=car_repair: Pl:Tag:craft=car repair
+    craft=carpenter: Pl:Tag:craft=carpenter
+    craft=caterer: Pl:Tag:craft=caterer
+    craft=chimney_sweeper: Pl:Tag:craft=chimney sweeper
+    craft=clockmaker: Pl:Tag:craft=clockmaker
+    craft=dental_technician: Pl:Tag:craft=dental technician
+    craft=distillery: Pl:Tag:craft=distillery
+    craft=dressmaker: Pl:Tag:craft=dressmaker
+    craft=electrician: Pl:Tag:craft=electrician
+    craft=electronics_repair: Pl:Tag:craft=electronics repair
+    craft=embroiderer: Pl:Tag:craft=embroiderer
     craft=engraver: Pl:Tag:craft=engraver
+    craft=gardener: Pl:Tag:craft=gardener
+    craft=glaziery: Pl:Tag:craft=glaziery
     craft=grinding_mill: Pl:Tag:craft=grinding mill
+    craft=handicraft: Pl:Tag:craft=handicraft
+    craft=hvac: Pl:Tag:craft=hvac
+    craft=information_electronics: Pl:Tag:craft=information electronics
+    craft=jeweller: Pl:Tag:craft=jeweller
+    craft=joiner: Pl:Tag:craft=joiner
+    craft=key_cutter: Pl:Tag:craft=key cutter
     craft=oil_mill: Pl:Tag:craft=oil mill
+    craft=painter: Pl:Tag:craft=painter
+    craft=pottery: Pl:Tag:craft=pottery
+    craft=roofer: Pl:Tag:craft=roofer
     craft=sawmill: Pl:Tag:craft=sawmill
+    craft=shoemaker: Pl:Tag:craft=shoemaker
     craft=stonemason: Pl:Tag:craft=stonemason
+    craft=sun_protection: Pl:Tag:craft=sun protection
+    craft=tailor: Pl:Tag:craft=tailor
+    craft=watchmaker: Pl:Tag:craft=watchmaker
+    craft=window_construction: Pl:Tag:craft=window construction
     craft=winery: Pl:Tag:craft=winery
-    crossing=island: Pl:Tag:crossing=island
-    emergency=aed: Pl:Tag:emergency=aed
+    cuisine=coffee_shop: Pl:Tag:cuisine=coffee shop
+    cycleway=asl: Pl:Tag:cycleway=asl
+    cycleway=lane: Pl:Tag:cycleway=lane
+    cycleway=opposite: Pl:Tag:cycleway=opposite
+    cycleway=opposite_lane: Pl:Tag:cycleway=opposite lane
+    cycleway=opposite_track: Pl:Tag:cycleway=opposite track
+    cycleway=share_busway: Pl:Tag:cycleway=share busway
+    cycleway=track: Pl:Tag:cycleway=track
+    emergency=ambulance_station: Pl:Tag:emergency=ambulance station
     emergency=defibrillator: Pl:Tag:emergency=defibrillator
+    emergency=emergency_ward_entrance: Pl:Tag:emergency=emergency ward entrance
+    emergency=fire_alarm_box: Pl:Tag:emergency=fire alarm box
     emergency=fire_extinguisher: Pl:Tag:emergency=fire extinguisher
     emergency=fire_flapper: Pl:Tag:emergency=fire flapper
     emergency=fire_hose: Pl:Tag:emergency=fire hose
     emergency=fire_hydrant: Pl:Tag:emergency=fire hydrant
     emergency=fire_water_pond: Pl:Tag:emergency=fire water pond
+    emergency=landing_site: Pl:Tag:emergency=landing site
     emergency=lifeguard_base: Pl:Tag:emergency=lifeguard base
     emergency=lifeguard_place: Pl:Tag:emergency=lifeguard place
     emergency=lifeguard_platform: Pl:Tag:emergency=lifeguard platform
     emergency=lifeguard_tower: Pl:Tag:emergency=lifeguard tower
+    emergency=phone: Pl:Tag:emergency=phone
     emergency=suction_point: Pl:Tag:emergency=suction point
+    emergency=water_rescue_station: Pl:Tag:emergency=water rescue station
     emergency=water_tank: Pl:Tag:emergency=water tank
+    entrance=main: Pl:Tag:entrance=main
+    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=doctor: Pl:Tag:healthcare=doctor
+    healthcare=hospice: Pl:Tag:healthcare=hospice
     healthcare=laboratory: Pl:Tag:healthcare=laboratory
+    healthcare=nutrition_counselling: Pl:Tag:healthcare=nutrition counselling
+    healthcare=physiotherapist: Pl:Tag:healthcare=physiotherapist
+    healthcare=sample_collection: Pl:Tag:healthcare=sample collection
+    highway=abandoned: Pl:Tag:highway=abandoned
     highway=bridleway: Pl:Tag:highway=bridleway
+    highway=bus_guideway: Pl:Tag:highway=bus guideway
     highway=bus_stop: Pl:Tag:highway=bus stop
+    highway=corridor: Pl:Tag:highway=corridor
     highway=crossing: Pl:Tag:highway=crossing
     highway=cycleway: Pl:Tag:highway=cycleway
+    highway=elevator: Pl:Tag:highway=elevator
+    highway=emergency_access_point: Pl:Tag:highway=emergency access point
+    highway=emergency_bay: Pl:Tag:highway=emergency bay
+    highway=escape: Pl:Tag:highway=escape
     highway=footway: Pl:Tag:highway=footway
+    highway=ford: Pl:Tag:highway=ford
     highway=give_way: Pl:Tag:highway=give way
     highway=living_street: Pl:Tag:highway=living street
     highway=milestone: Pl:Tag:highway=milestone
     highway=mini_roundabout: Pl:Tag:highway=mini roundabout
     highway=motorway: Pl:Tag:highway=motorway
+    highway=motorway_junction: Pl:Tag:highway=motorway junction
+    highway=motorway_link: Pl:Tag:highway=motorway link
+    highway=passing_place: Pl:Tag:highway=passing place
     highway=path: Pl:Tag:highway=path
     highway=pedestrian: Pl:Tag:highway=pedestrian
+    highway=platform: Pl:Tag:highway=platform
     highway=primary: Pl:Tag:highway=primary
     highway=proposed: Pl:Tag:highway=proposed
     highway=raceway: Pl:Tag:highway=raceway
+    highway=razed: Pl:Tag:highway=razed
     highway=residential: Pl:Tag:highway=residential
     highway=rest_area: Pl:Tag:highway=rest area
     highway=road: Pl:Tag:highway=road
@@ -12551,41 +18918,78 @@ pl:
     highway=service: Pl:Tag:highway=service
     highway=services: Pl:Tag:highway=services
     highway=speed_camera: Pl:Tag:highway=speed camera
+    highway=speed_display: Pl:Tag:highway=speed display
     highway=steps: Pl:Tag:highway=steps
     highway=stop: Pl:Tag:highway=stop
     highway=street_lamp: Pl:Tag:highway=street lamp
     highway=tertiary: Pl:Tag:highway=tertiary
     highway=track: Pl:Tag:highway=track
+    highway=traffic_mirror: Pl:Tag:highway=traffic mirror
     highway=traffic_signals: Pl:Tag:highway=traffic signals
+    highway=trailhead: Pl:Tag:highway=trailhead
     highway=trunk: Pl:Tag:highway=trunk
+    highway=trunk_link: Pl:Tag:highway=trunk link
     highway=turning_circle: Pl:Tag:highway=turning circle
+    highway=turning_loop: Pl:Tag:highway=turning loop
     highway=unclassified: Pl:Tag:highway=unclassified
+    historic=aircraft: Pl:Tag:historic=aircraft
+    historic=archaeological_site: Pl:Tag:historic=archaeological site
     historic=battlefield: Pl:Tag:historic=battlefield
     historic=city_gate: Pl:Tag:historic=city gate
+    historic=heritage: Pl:Tag:historic=heritage
     historic=memorial: Pl:Tag:historic=memorial
     historic=monument: Pl:Tag:historic=monument
     historic=ruins: Pl:Tag:historic=ruins
+    historic=stone: Pl:Tag:historic=stone
     historic=tomb: Pl:Tag:historic=tomb
     historic=tree_shrine: Pl:Tag:historic=tree shrine
     historic=wayside_cross: Pl:Tag:historic=wayside cross
     historic=wayside_shrine: Pl:Tag:historic=wayside shrine
     industrial=aluminium_smelting: Pl:Tag:industrial=aluminium smelting
+    industrial=auto_wrecker: Pl:Tag:industrial=auto wrecker
     industrial=bakery: Pl:Tag:industrial=bakery
     industrial=brewery: Pl:Tag:industrial=brewery
+    industrial=brickyard: Pl:Tag:industrial=brickyard
+    industrial=depot: Pl:Tag:industrial=depot
+    industrial=distributor: Pl:Tag:industrial=distributor
+    industrial=factory: Pl:Tag:industrial=factory
     industrial=furniture: Pl:Tag:industrial=furniture
     industrial=grinding_mill: Pl:Tag:industrial=grinding mill
+    industrial=heating_station: Pl:Tag:industrial=heating station
+    industrial=ice_factory: Pl:Tag:industrial=ice factory
     industrial=machine_shop: Pl:Tag:industrial=machine shop
+    industrial=mine: Pl:Tag:industrial=mine
     industrial=mobile_equipment: Pl:Tag:industrial=mobile equipment
+    industrial=oil: Pl:Tag:industrial=oil
     industrial=oil_mill: Pl:Tag:industrial=oil mill
+    industrial=port: Pl:Tag:industrial=port
     industrial=salt_pond: Pl:Tag:industrial=salt pond
     industrial=sawmill: Pl:Tag:industrial=sawmill
+    industrial=scrap_yard: Pl:Tag:industrial=scrap yard
     industrial=shipyard: Pl:Tag:industrial=shipyard
+    industrial=slaughterhouse: Pl:Tag:industrial=slaughterhouse
+    industrial=steelmaking: Pl:Tag:industrial=steelmaking
+    industrial=warehouse: Pl:Tag:industrial=warehouse
+    industrial=well_cluster: Pl:Tag:industrial=well cluster
+    information=board: Pl:Tag:information=board
     information=guidepost: Pl:Tag:information=guidepost
+    information=map: Pl:Tag:information=map
+    information=office: Pl:Tag:information=office
+    information=terminal: Pl:Tag:information=terminal
+    internet_access=wlan: Pl:Tag:internet access=wlan
     junction=roundabout: Pl:Tag:junction=roundabout
+    landcover=grass: Pl:Tag:landcover=grass
+    landcover=trees: Pl:Tag:landcover=trees
+    landuse=agriculture: Pl:Tag:landuse=agriculture
     landuse=allotments: Pl:Tag:landuse=allotments
+    landuse=animal_keeping: Pl:Tag:landuse=animal keeping
     landuse=apiary: Pl:Tag:landuse=apiary
+    landuse=aquaculture: Pl:Tag:landuse=aquaculture
+    landuse=basin: Pl:Tag:landuse=basin
     landuse=brownfield: Pl:Tag:landuse=brownfield
     landuse=cemetery: Pl:Tag:landuse=cemetery
+    landuse=churchyard: Pl:Tag:landuse=churchyard
+    landuse=civic_admin: Pl:Tag:landuse=civic admin
     landuse=commercial: Pl:Tag:landuse=commercial
     landuse=construction: Pl:Tag:landuse=construction
     landuse=depot: Pl:Tag:landuse=depot
@@ -12594,39 +18998,49 @@ pl:
     landuse=farmyard: Pl:Tag:landuse=farmyard
     landuse=flowerbed: Pl:Tag:landuse=flowerbed
     landuse=forest: Pl:Tag:landuse=forest
+    landuse=garages: Pl:Tag:landuse=garages
     landuse=grass: Pl:Tag:landuse=grass
     landuse=greenfield: Pl:Tag:landuse=greenfield
     landuse=greenhouse_horticulture: Pl:Tag:landuse=greenhouse horticulture
     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
+    landuse=orchard: Pl:Tag:landuse=orchard
+    landuse=peat_cutting: Pl:Tag:landuse=peat cutting
     landuse=plant_nursery: Pl:Tag:landuse=plant nursery
     landuse=quarry: Pl:Tag:landuse=quarry
     landuse=railway: Pl:Tag:landuse=railway
     landuse=recreation_ground: Pl:Tag:landuse=recreation ground
     landuse=religious: Pl:Tag:landuse=religious
+    landuse=reservoir: Pl:Tag:landuse=reservoir
     landuse=residential: Pl:Tag:landuse=residential
     landuse=retail: Pl:Tag:landuse=retail
     landuse=salt_pond: Pl:Tag:landuse=salt pond
+    landuse=street: Pl:Tag:landuse=street
     landuse=traffic_island: Pl:Tag:landuse=traffic island
     landuse=village_green: Pl:Tag:landuse=village green
+    landuse=vineyard: Pl:Tag:landuse=vineyard
+    landuse=winter_sports: Pl:Tag:landuse=winter sports
+    leaf_type=broadleaved: Pl:Tag:leaf type=broadleaved
+    leaf_type=leafless: Pl:Tag:leaf type=leafless
+    leaf_type=mixed: Pl:Tag:leaf type=mixed
+    leaf_type=needleleaved: Pl:Tag:leaf type=needleleaved
     leisure=adult_gaming_centre: Pl:Tag:leisure=adult gaming centre
     leisure=amusement_arcade: Pl:Tag:leisure=amusement arcade
-    leisure=arena: Pl:Tag:leisure=arena
     leisure=bandstand: Pl:Tag:leisure=bandstand
     leisure=bathing_place: Pl:Tag:leisure=bathing place
     leisure=bbq: Pl:Tag:leisure=bbq
-    leisure=beach: Pl:Tag:leisure=beach
     leisure=beach_resort: Pl:Tag:leisure=beach resort
     leisure=bird_hide: Pl:Tag:leisure=bird hide
     leisure=bleachers: Pl:Tag:leisure=bleachers
     leisure=bowling_alley: Pl:Tag:leisure=bowling alley
-    leisure=casino: Pl:Tag:leisure=casino
-    leisure=club: Pl:Tag:leisure=club
     leisure=common: Pl:Tag:leisure=common
     leisure=dance: Pl:Tag:leisure=dance
     leisure=disc_golf_course: Pl:Tag:leisure=disc golf course
     leisure=dog_park: Pl:Tag:leisure=dog park
+    leisure=escape_game: Pl:Tag:leisure=escape game
     leisure=firepit: Pl:Tag:leisure=firepit
     leisure=fishing: Pl:Tag:leisure=fishing
     leisure=fitness_centre: Pl:Tag:leisure=fitness centre
     leisure=video_arcade: Pl:Tag:leisure=video arcade
     leisure=water_park: Pl:Tag:leisure=water park
     leisure=wildlife_hide: Pl:Tag:leisure=wildlife hide
+    lifeguard=tower: Pl:Tag:lifeguard=tower
+    location:transition=yes: Pl:Tag:location:transition=yes
+    lottery=yes: Pl:Tag:lottery=yes
     man_made=adit: Pl:Tag:man made=adit
+    man_made=antenna: Pl:Tag:man made=antenna
     man_made=beacon: Pl:Tag:man made=beacon
     man_made=beehive: Pl:Tag:man made=beehive
+    man_made=breakwater: Pl:Tag:man made=breakwater
+    man_made=bridge: Pl:Tag:man made=bridge
     man_made=bunker_silo: Pl:Tag:man made=bunker silo
+    man_made=cairn: Pl:Tag:man made=cairn
+    man_made=campanile: Pl:Tag:man made=campanile
+    man_made=carpet_hanger: Pl:Tag:man made=carpet hanger
     man_made=chimney: Pl:Tag:man made=chimney
+    man_made=clearcut: Pl:Tag:man made=clearcut
+    man_made=communications_tower: Pl:Tag:man made=communications tower
+    man_made=cooling_tower: Pl:Tag:man made=cooling tower
+    man_made=crane: Pl:Tag:man made=crane
     man_made=cross: Pl:Tag:man made=cross
     man_made=cutline: Pl:Tag:man made=cutline
+    man_made=dovecote: Pl:Tag:man made=dovecote
     man_made=dyke: Pl:Tag:man made=dyke
     man_made=embankment: Pl:Tag:man made=embankment
+    man_made=flagpole: Pl:Tag:man made=flagpole
+    man_made=flare: Pl:Tag:man made=flare
+    man_made=floating_storage: Pl:Tag:man made=floating storage
     man_made=gasometer: Pl:Tag:man made=gasometer
+    man_made=geoglyph: Pl:Tag:man made=geoglyph
+    man_made=goods_conveyor: Pl:Tag:man made=goods conveyor
+    man_made=graduation_tower: Pl:Tag:man made=graduation tower
+    man_made=groyne: Pl:Tag:man made=groyne
     man_made=insect_hotel: Pl:Tag:man made=insect hotel
     man_made=kiln: Pl:Tag:man made=kiln
+    man_made=lighthouse: Pl:Tag:man made=lighthouse
+    man_made=mast: Pl:Tag:man made=mast
     man_made=mineshaft: Pl:Tag:man made=mineshaft
     man_made=monitoring_station: Pl:Tag:man made=monitoring station
+    man_made=nesting_site: Pl:Tag:man made=nesting site
+    man_made=obelisk: Pl:Tag:man made=obelisk
+    man_made=observatory: Pl:Tag:man made=observatory
+    man_made=offshore_platform: Pl:Tag:man made=offshore platform
+    man_made=oil_well: Pl:Tag:man made=oil well
     man_made=petroleum_well: Pl:Tag:man made=petroleum well
+    man_made=pier: Pl:Tag:man made=pier
+    man_made=pipeline: Pl:Tag:man made=pipeline
+    man_made=pumping_rig: Pl:Tag:man made=pumping rig
     man_made=pumping_station: Pl:Tag:man made=pumping station
+    man_made=quay: Pl:Tag:man made=quay
     man_made=reservoir_covered: Pl:Tag:man made=reservoir covered
     man_made=silo: Pl:Tag:man made=silo
+    man_made=snow_cannon: Pl:Tag:man made=snow cannon
+    man_made=snow_fence: Pl:Tag:man made=snow fence
+    man_made=snow_net: Pl:Tag:man made=snow net
+    man_made=spoil_heap: Pl:Tag:man made=spoil heap
     man_made=storage_tank: Pl:Tag:man made=storage tank
+    man_made=street_cabinet: Pl:Tag:man made=street cabinet
+    man_made=submarine_cable: Pl:Tag:man made=submarine cable
     man_made=surveillance: Pl:Tag:man made=surveillance
     man_made=survey_point: Pl:Tag:man made=survey point
+    man_made=telescope: Pl:Tag:man made=telescope
     man_made=tower: Pl:Tag:man made=tower
+    man_made=wastewater_plant: Pl:Tag:man made=wastewater plant
     man_made=water_tap: Pl:Tag:man made=water tap
     man_made=water_tower: Pl:Tag:man made=water tower
     man_made=water_well: Pl:Tag:man made=water well
+    man_made=water_works: Pl:Tag:man made=water works
     man_made=watermill: Pl:Tag:man made=watermill
+    man_made=wildlife_crossing: Pl:Tag:man made=wildlife crossing
+    man_made=wildlife_opening: Pl:Tag:man made=wildlife opening
     man_made=windmill: Pl:Tag:man made=windmill
     man_made=windpump: Pl:Tag:man made=windpump
     man_made=works: Pl:Tag:man made=works
-    maxspeed=none: Pl:Tag:maxspeed=none
-    maxspeed=signals: Pl:Tag:maxspeed=signals
+    megalith_type=alignment: Pl:Tag:megalith type=alignment
+    megalith_type=chamber: Pl:Tag:megalith type=chamber
+    megalith_type=cist: Pl:Tag:megalith type=cist
+    megalith_type=dolmen: Pl:Tag:megalith type=dolmen
+    megalith_type=long_barrow: Pl:Tag:megalith type=long barrow
+    megalith_type=menhir: Pl:Tag:megalith type=menhir
+    megalith_type=nuraghe: Pl:Tag:megalith type=nuraghe
+    megalith_type=passage_grave: Pl:Tag:megalith type=passage grave
+    megalith_type=stone_circle: Pl:Tag:megalith type=stone circle
+    megalith_type=stone_ship: Pl:Tag:megalith type=stone ship
+    megalith_type=tholos: Pl:Tag:megalith type=tholos
+    megalith_type=well: Pl:Tag:megalith type=well
+    memorial=blue_plaque: Pl:Tag:memorial=blue plaque
+    memorial=bust: Pl:Tag:memorial=bust
+    memorial=obelisk: Pl:Tag:memorial=obelisk
+    memorial=plaque: Pl:Tag:memorial=plaque
+    memorial=sculpture: Pl:Tag:memorial=sculpture
+    memorial=statue: Pl:Tag:memorial=statue
+    memorial=stele: Pl:Tag:memorial=stele
+    memorial=stolperstein: Pl:Tag:memorial=stolperstein
+    memorial=stone: Pl:Tag:memorial=stone
+    memorial=war_memorial: Pl:Tag:memorial=war memorial
+    military=ammunition: Pl:Tag:military=ammunition
+    military=barracks: Pl:Tag:military=barracks
     military=bunker: Pl:Tag:military=bunker
+    military=checkpoint: Pl:Tag:military=checkpoint
+    military=danger_area: Pl:Tag:military=danger area
+    military=naval_base: Pl:Tag:military=naval base
+    military=nuclear_explosion_site: Pl:Tag:military=nuclear explosion site
+    military=obstacle_course: Pl:Tag:military=obstacle course
+    military=office: Pl:Tag:military=office
+    military=range: Pl:Tag:military=range
+    military=training_area: Pl:Tag:military=training area
     military=trench: Pl:Tag:military=trench
     mooring=ferry: Pl:Tag:mooring=ferry
+    natural=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
     natural=bay: Pl:Tag:natural=bay
     natural=beach: Pl:Tag:natural=beach
     natural=bedrock: Pl:Tag:natural=bedrock
+    natural=birds_nest: Pl:Tag:natural=birds nest
+    natural=blowhole: Pl:Tag:natural=blowhole
     natural=cape: Pl:Tag:natural=cape
     natural=cave_entrance: Pl:Tag:natural=cave entrance
     natural=cliff: Pl:Tag:natural=cliff
+    natural=coastline: Pl:Tag:natural=coastline
     natural=desert: Pl:Tag:natural=desert
     natural=earth_bank: Pl:Tag:natural=earth bank
     natural=esker: Pl:Tag:natural=esker
     natural=fell: Pl:Tag:natural=fell
+    natural=geothermal: Pl:Tag:natural=geothermal
+    natural=geyser: Pl:Tag:natural=geyser
+    natural=glacier: Pl:Tag:natural=glacier
+    natural=gorge: Pl:Tag:natural=gorge
     natural=grassland: Pl:Tag:natural=grassland
     natural=gully: Pl:Tag:natural=gully
     natural=heath: Pl:Tag:natural=heath
+    natural=hill: Pl:Tag:natural=hill
     natural=hot_spring: Pl:Tag:natural=hot spring
     natural=lake: Pl:Tag:natural=lake
     natural=landslide: Pl:Tag:natural=landslide
+    natural=lava: Pl:Tag:natural=lava
     natural=moor: Pl:Tag:natural=moor
     natural=moraine: Pl:Tag:natural=moraine
+    natural=moss: Pl:Tag:natural=moss
     natural=mud: Pl:Tag:natural=mud
     natural=peak: Pl:Tag:natural=peak
+    natural=peninsula: Pl:Tag:natural=peninsula
+    natural=plant: Pl:Tag:natural=plant
     natural=reef: Pl:Tag:natural=reef
     natural=ridge: Pl:Tag:natural=ridge
     natural=riverbed: Pl:Tag:natural=riverbed
@@ -12735,6 +19235,7 @@ pl:
     natural=scrub: Pl:Tag:natural=scrub
     natural=shingle: Pl:Tag:natural=shingle
     natural=shoal: Pl:Tag:natural=shoal
+    natural=shrub: Pl:Tag:natural=shrub
     natural=sinkhole: Pl:Tag:natural=sinkhole
     natural=spring: Pl:Tag:natural=spring
     natural=stone: Pl:Tag:natural=stone
     natural=water: Pl:Tag:natural=water
     natural=wetland: Pl:Tag:natural=wetland
     natural=wood: Pl:Tag:natural=wood
+    network=lhn: Pl:Tag:network=lhn
+    network=rhn: Pl:Tag:network=rhn
+    office=accountant: Pl:Tag:office=accountant
+    office=adoption_agency: Pl:Tag:office=adoption agency
+    office=advertising_agency: Pl:Tag:office=advertising agency
+    office=architect: Pl:Tag:office=architect
+    office=association: Pl:Tag:office=association
+    office=charity: Pl:Tag:office=charity
+    office=company: Pl:Tag:office=company
+    office=educational_institution: Pl:Tag:office=educational institution
+    office=employment_agency: Pl:Tag:office=employment agency
+    office=energy_supplier: Pl:Tag:office=energy supplier
+    office=estate_agent: Pl:Tag:office=estate agent
+    office=forestry: Pl:Tag:office=forestry
+    office=foundation: Pl:Tag:office=foundation
+    office=geodesist: Pl:Tag:office=geodesist
     office=government: Pl:Tag:office=government
+    office=guide: Pl:Tag:office=guide
+    office=insurance: Pl:Tag:office=insurance
+    office=it: Pl:Tag:office=it
+    office=lawyer: Pl:Tag:office=lawyer
     office=logistics: Pl:Tag:office=logistics
+    office=moving_company: Pl:Tag:office=moving company
+    office=newspaper: Pl:Tag:office=newspaper
+    office=ngo: Pl:Tag:office=ngo
+    office=notary: Pl:Tag:office=notary
+    office=political_party: Pl:Tag:office=political party
+    office=private_investigator: Pl:Tag:office=private investigator
+    office=property_management: Pl:Tag:office=property management
+    office=quango: Pl:Tag:office=quango
     office=religion: Pl:Tag:office=religion
+    office=research: Pl:Tag:office=research
+    office=tax: Pl:Tag:office=tax
+    office=tax_advisor: Pl:Tag:office=tax advisor
+    office=telecommunication: Pl:Tag:office=telecommunication
+    office=therapist: Pl:Tag:office=therapist
+    office=tourist_accommodation: Pl:Tag:office=tourist accommodation
+    office=water_utility: Pl:Tag:office=water utility
+    oneway=alternating: Pl:Tag:oneway=alternating
+    oneway=reversible: Pl:Tag:oneway=reversible
+    parking:lane:hgv=on_street: Pl:Tag:parking:lane:hgv=on street
+    parking=multi-storey: Pl:Tag:parking=multi-storey
+    parking=underground: Pl:Tag:parking=underground
     place=allotments: Pl:Tag:place=allotments
+    place=archipelago: Pl:Tag:place=archipelago
+    place=borough: Pl:Tag:place=borough
     place=city: Pl:Tag:place=city
+    place=city_block: Pl:Tag:place=city block
+    place=continent: Pl:Tag:place=continent
+    place=country: Pl:Tag:place=country
+    place=county: Pl:Tag:place=county
+    place=district: Pl:Tag:place=district
     place=farm: Pl:Tag:place=farm
     place=hamlet: Pl:Tag:place=hamlet
+    place=island: Pl:Tag:place=island
+    place=islet: Pl:Tag:place=islet
     place=isolated_dwelling: Pl:Tag:place=isolated dwelling
     place=locality: Pl:Tag:place=locality
+    place=municipality: Pl:Tag:place=municipality
     place=neighbourhood: Pl:Tag:place=neighbourhood
+    place=ocean: Pl:Tag:place=ocean
+    place=plot: Pl:Tag:place=plot
+    place=powiat: Pl:Tag:place=powiat
+    place=province: Pl:Tag:place=province
+    place=quarter: Pl:Tag:place=quarter
+    place=region: Pl:Tag:place=region
+    place=sea: Pl:Tag:place=sea
     place=square: Pl:Tag:place=square
+    place=state: Pl:Tag:place=state
     place=suburb: Pl:Tag:place=suburb
     place=town: Pl:Tag:place=town
     place=village: Pl:Tag:place=village
+    power=cable: Pl:Tag:power=cable
+    power=cable_distribution_cabinet: Pl:Tag:power=cable distribution cabinet
+    power=catenary_mast: Pl:Tag:power=catenary mast
+    power=converter: Pl:Tag:power=converter
     power=generator: Pl:Tag:power=generator
+    power=heliostat: Pl:Tag:power=heliostat
     power=line: Pl:Tag:power=line
     power=minor_line: Pl:Tag:power=minor line
+    power=plant: Pl:Tag:power=plant
     power=pole: Pl:Tag:power=pole
+    power=portal: Pl:Tag:power=portal
     power=sub_station: Pl:Tag:power=sub station
     power=substation: Pl:Tag:power=substation
     power=tower: Pl:Tag:power=tower
     power=transformer: Pl:Tag:power=transformer
     public_transport=platform: Pl:Tag:public transport=platform
+    public_transport=station: Pl:Tag:public transport=station
     public_transport=stop_area: Pl:Tag:public transport=stop area
     public_transport=stop_position: Pl:Tag:public transport=stop position
     railway=abandoned: Pl:Tag:railway=abandoned
     railway=buffer_stop: Pl:Tag:railway=buffer stop
     railway=crossing: Pl:Tag:railway=crossing
     railway=crossing_controller: Pl:Tag:railway=crossing controller
+    railway=derail: Pl:Tag:railway=derail
+    railway=disused: Pl:Tag:railway=disused
+    railway=funicular: Pl:Tag:railway=funicular
+    railway=halt: Pl:Tag:railway=halt
+    railway=junction: Pl:Tag:railway=junction
     railway=level_crossing: Pl:Tag:railway=level crossing
+    railway=light_rail: Pl:Tag:railway=light rail
+    railway=milestone: Pl:Tag:railway=milestone
+    railway=miniature: Pl:Tag:railway=miniature
+    railway=monorail: Pl:Tag:railway=monorail
+    railway=narrow_gauge: Pl:Tag:railway=narrow gauge
+    railway=platform: Pl:Tag:railway=platform
+    railway=platform_edge: Pl:Tag:railway=platform edge
+    railway=preserved: Pl:Tag:railway=preserved
     railway=rail: Pl:Tag:railway=rail
+    railway=rail_brake: Pl:Tag:railway=rail brake
+    railway=railway_crossing: Pl:Tag:railway=railway crossing
+    railway=roundhouse: Pl:Tag:railway=roundhouse
+    railway=signal: Pl:Tag:railway=signal
+    railway=signal_box: Pl:Tag:railway=signal box
+    railway=spur_junction: Pl:Tag:railway=spur junction
+    railway=station: Pl:Tag:railway=station
+    railway=stop: Pl:Tag:railway=stop
+    railway=subway: Pl:Tag:railway=subway
+    railway=subway_entrance: Pl:Tag:railway=subway entrance
+    railway=switch: Pl:Tag:railway=switch
+    railway=tram: Pl:Tag:railway=tram
     railway=tram_stop: Pl:Tag:railway=tram stop
+    railway=traverser: Pl:Tag:railway=traverser
+    railway=turntable: Pl:Tag:railway=turntable
+    railway=wash: Pl:Tag:railway=wash
+    railway=water_crane: Pl:Tag:railway=water crane
+    railway=water_tower: Pl:Tag:railway=water tower
+    railway=yard: Pl:Tag:railway=yard
     religion=christian: Pl:Tag:religion=christian
     religion=jewish: Pl:Tag:religion=jewish
     religion=muslim: Pl:Tag:religion=muslim
     religion=pagan: Pl:Tag:religion=pagan
+    religion=shinto: Pl:Tag:religion=shinto
+    residential=rural: Pl:Tag:residential=rural
+    residential=university: Pl:Tag:residential=university
+    residential=urban: Pl:Tag:residential=urban
+    route=bus: Pl:Tag:route=bus
+    route=emergency_access: Pl:Tag:route=emergency access
+    route=hiking: Pl:Tag:route=hiking
+    route=horse: Pl:Tag:route=horse
+    route=running: Pl:Tag:route=running
+    route=tram: Pl:Tag:route=tram
     service=alley: Pl:Tag:service=alley
     service=drive-through: Pl:Tag:service=drive-through
     service=driveway: Pl:Tag:service=driveway
     service=spur: Pl:Tag:service=spur
     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=bathroom_furnishing: Pl:Tag:shop=bathroom furnishing
     shop=beauty: Pl:Tag:shop=beauty
     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=nuts: Pl:Tag:shop=nuts
+    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=security: Pl:Tag:shop=security
+    shop=sewing: Pl:Tag:shop=sewing
+    shop=shoe_repair: Pl:Tag:shop=shoe repair
+    shop=shoes: Pl:Tag:shop=shoes
+    shop=ski: Pl:Tag:shop=ski
+    shop=spices: Pl:Tag:shop=spices
+    shop=sports: Pl:Tag:shop=sports
+    shop=stationery: Pl:Tag:shop=stationery
+    shop=storage_rental: Pl:Tag:shop=storage rental
     shop=supermarket: Pl:Tag:shop=supermarket
+    shop=surf: Pl:Tag:shop=surf
+    shop=swimming_pool: Pl:Tag:shop=swimming pool
+    shop=tailor: Pl:Tag:shop=tailor
+    shop=tattoo: Pl:Tag:shop=tattoo
     shop=tea: Pl:Tag:shop=tea
     shop=ticket: Pl:Tag:shop=ticket
+    shop=tiles: Pl:Tag:shop=tiles
+    shop=tobacco: Pl:Tag:shop=tobacco
+    shop=tool_hire: Pl:Tag:shop=tool hire
+    shop=toys: Pl:Tag:shop=toys
+    shop=trade: Pl:Tag:shop=trade
     shop=travel_agency: Pl:Tag:shop=travel agency
+    shop=trophy: Pl:Tag:shop=trophy
     shop=tyres: Pl:Tag:shop=tyres
     shop=vacant: Pl:Tag:shop=vacant
+    shop=vacuum_cleaner: Pl:Tag:shop=vacuum cleaner
     shop=variety_store: Pl:Tag:shop=variety store
+    shop=video: Pl:Tag:shop=video
+    shop=video_games: Pl:Tag:shop=video games
+    shop=watches: Pl:Tag:shop=watches
+    shop=water: Pl:Tag:shop=water
+    shop=weapons: Pl:Tag:shop=weapons
+    shop=wholesale: Pl:Tag:shop=wholesale
+    shop=wigs: Pl:Tag:shop=wigs
+    shop=window_blind: Pl:Tag:shop=window blind
+    shop=wine: Pl:Tag:shop=wine
+    shop=wool: Pl:Tag:shop=wool
     shop=yes: Pl:Tag:shop=yes
+    site_type=bigstone: Pl:Tag:site type=bigstone
+    site_type=city: Pl:Tag:site type=city
+    site_type=fortification: Pl:Tag:site type=fortification
+    site_type=hut_circle: Pl:Tag:site type=hut circle
+    site_type=megalith: Pl:Tag:site type=megalith
+    site_type=necropolis: Pl:Tag:site type=necropolis
+    site_type=petroglyph: Pl:Tag:site type=petroglyph
+    site_type=settlement: Pl:Tag:site type=settlement
+    site_type=tumulus: Pl:Tag:site type=tumulus
     social_facility=outreach: Pl:Tag:social facility=outreach
+    sport=10pin: Pl:Tag:sport=10pin
+    sport=9pin: Pl:Tag:sport=9pin
     sport=aikido: Pl:Tag:sport=aikido
+    sport=american_football: Pl:Tag:sport=american football
     sport=climbing: Pl:Tag:sport=climbing
+    sport=equestrian: Pl:Tag:sport=equestrian
+    sport=ice_hockey: Pl:Tag:sport=ice hockey
+    sport=soccer: Pl:Tag:sport=soccer
+    surface=asphalt: Pl:Tag:surface=asphalt
+    surface=concrete:lanes: Pl:Tag:surface=concrete:lanes
     tourism=alpine_hut: Pl:Tag:tourism=alpine hut
     tourism=apartment: Pl:Tag:tourism=apartment
     tourism=aquarium: Pl:Tag:tourism=aquarium
@@ -12858,18 +19610,50 @@ pl:
     tourism=viewpoint: Pl:Tag:tourism=viewpoint
     tourism=wilderness_hut: Pl:Tag:tourism=wilderness hut
     tourism=wine_cellar: Pl:Tag:tourism=wine cellar
-    tourism=yes: Pl:Tag:tourism=yes
     tourism=zoo: Pl:Tag:tourism=zoo
     tower:type=bell_tower: Pl:Tag:tower:type=bell tower
+    tower:type=bridge: Pl:Tag:tower:type=bridge
+    tower:type=communication: Pl:Tag:tower:type=communication
+    tower:type=cooling: Pl:Tag:tower:type=cooling
+    tower:type=defensive: Pl:Tag:tower:type=defensive
+    tower:type=hose: Pl:Tag:tower:type=hose
+    tower:type=lighting: Pl:Tag:tower:type=lighting
+    tower:type=minaret: Pl:Tag:tower:type=minaret
+    tower:type=observation: Pl:Tag:tower:type=observation
     traffic_calming=island: Pl:Tag:traffic calming=island
     traffic_calming=table: Pl:Tag:traffic calming=table
     traffic_sign=city_limit: Pl:Tag:traffic sign=city limit
     tunnel=culvert: Pl:Tag:tunnel=culvert
     type=public_transport: Pl:Tag:type=public transport
+    vending: Pl:Tag:vending
+    vending=admission_tickets: Pl:Tag:vending=admission tickets
+    vending=bottle_return: Pl:Tag:vending=bottle return
     vending=candles: Pl:Tag:vending=candles
+    vending=cigarettes: Pl:Tag:vending=cigarettes
+    vending=drinks: Pl:Tag:vending=drinks
+    vending=feminine_hygiene: Pl:Tag:vending=feminine hygiene
+    vending=food: Pl:Tag:vending=food
+    vending=fuel: Pl:Tag:vending=fuel
+    vending=milk: Pl:Tag:vending=milk
+    vending=newspapers: Pl:Tag:vending=newspapers
+    vending=parcel_pickup;parcel_mail_in: Pl:Tag:vending=parcel pickup;parcel mail
+      in
+    vending=parking_tickets: Pl:Tag:vending=parking tickets
+    vending=public_transport_tickets: Pl:Tag:vending=public transport tickets
+    vending=sweets: Pl:Tag:vending=sweets
+    wall=dry_stone: Pl:Tag:wall=dry stone
+    wall=no: Pl:Tag:wall=no
     wall=noise_barrier: Pl:Tag:wall=noise barrier
+    waste=dog_excrement: Pl:Tag:waste=dog excrement
+    water=canal: Pl:Tag:water=canal
+    water=lagoon: Pl:Tag:water=lagoon
     water=lake: Pl:Tag:water=lake
     water=lock: Pl:Tag:water=lock
+    water=oxbow: Pl:Tag:water=oxbow
+    water=pond: Pl:Tag:water=pond
+    water=reservoir: Pl:Tag:water=reservoir
+    water=river: Pl:Tag:water=river
+    water=wastewater: Pl:Tag:water=wastewater
     waterway=boat_lift: Pl:Tag:waterway=boat lift
     waterway=boatyard: Pl:Tag:waterway=boatyard
     waterway=brook: Pl:Tag:waterway=brook
@@ -12913,6 +19697,16 @@ pl:
     wood=deciduous: Pl:Tag:wood=deciduous
     wood=evergreen: Pl:Tag:wood=evergreen
     wood=mixed: Pl:Tag:wood=mixed
+    zoo=aviary: Pl:Tag:zoo=aviary
+    zoo=birds: Pl:Tag:zoo=birds
+    zoo=butterfly: Pl:Tag:zoo=butterfly
+    zoo=enclosure: Pl:Tag:zoo=enclosure
+    zoo=falconry: Pl:Tag:zoo=falconry
+    zoo=petting_zoo: Pl:Tag:zoo=petting zoo
+    zoo=reptile: Pl:Tag:zoo=reptile
+proposed features/eo:
+  tag:
+    esperanto=esperanto: Proposed features/Eo:Tag:esperanto=esperanto
 pt:
   key:
     IBGE:CD_ADMINIS: Pt:Key:IBGE:CD ADMINIS
@@ -12923,26 +19717,31 @@ pt:
     access: Pt:Key:access
     addr: Pt:Key:addr
     addr:housenumber: Pt:Key:addr:housenumber
+    addr:place: Pt:Key:addr:place
     admin_level: Pt:Key:admin level
     aerialway: Pt:Key:aerialway
     aeroway: Pt:Key:aeroway
     amenity: Pt:Key:amenity
     area: Pt:Key:area
     barrier: Pt:Key:barrier
+    beds: Pt:Key:beds
     bicycle: Pt:Key:bicycle
     bicycle_parking: Pt:Key:bicycle parking
+    bicycle_road: Pt:Key:bicycle road
     boat: Pt:Key:boat
     border_type: Pt:Key:border type
     boundary: Pt:Key:boundary
     bridge: Pt:Key:bridge
     building: Pt:Key:building
+    building:flats: Pt:Key:building:flats
     building:levels: Pt:Key:building:levels
     building:material: Pt:Key:building:material
     building:min_level: Pt:Key:building:min level
     building:part: Pt:Key:building:part
     button_operated: Pt:Key:button operated
     cables: Pt:Key:cables
-    cep: Pt:Key:cep
+    capacity: Pt:Key:capacity
+    charge: Pt:Key:charge
     construction: Pt:Key:construction
     contact: Pt:Key:contact
     country: Pt:Key:country
@@ -12953,20 +19752,31 @@ pt:
     cutting: Pt:Key:cutting
     cycleway: Pt:Key:cycleway
     denomination: Pt:Key:denomination
+    description: Pt:Key:description
     diet:*: Pt:Key:diet:*
+    diet:vegan: Pt:Key:diet:vegan
     dispensing: Pt:Key:dispensing
     display: Pt:Key:display
+    drinking_water: Pt:Key:drinking water
+    drive_through: Pt:Key:drive through
     driving_side: Pt:Key:driving side
     ele: Pt:Key:ele
     electrified: Pt:Key:electrified
     embankment: Pt:Key:embankment
     emergency: Pt:Key:emergency
+    fence_type: Pt:Key:fence type
     fenced: Pt:Key:fenced
+    ferry: Pt:Key:ferry
     fishing: Pt:Key:fishing
+    fixme: Pt:Key:fixme
     foot: Pt:Key:foot
     frequency: Pt:Key:frequency
+    garden:style: Pt:Key:garden:style
+    garden:type: Pt:Key:garden:type
     generator:method: Pt:Key:generator:method
     geological: Pt:Key:geological
+    grades: Pt:Key:grades
+    group_only: Pt:Key:group only
     happy_hours: Pt:Key:happy hours
     height: Pt:Key:height
     heritage: Pt:Key:heritage
@@ -12979,27 +19789,36 @@ pt:
     ice_road: Pt:Key:ice road
     incline: Pt:Key:incline
     industrial: Pt:Key:industrial
+    inscription: Pt:Key:inscription
     intermittent: Pt:Key:intermittent
     internet_access: Pt:Key:internet access
+    internet_access:ssid: Pt:Key:internet access:ssid
     is_in: Pt:Key:is in
+    isced:level: Pt:Key:isced:level
     jetski:sales: Pt:Key:jetski:sales
     junction: Pt:Key:junction
     landuse: Pt:Key:landuse
+    lane_markings: Pt:Key:lane markings
     lanes: Pt:Key:lanes
     leisure: Pt:Key:leisure
+    length: Pt:Key:length
     listed_status: Pt:Key:listed status
     lit: Pt:Key:lit
     lock: Pt:Key:lock
     man_made: Pt:Key:man made
+    manhole: Pt:Key:manhole
+    material: Pt:Key:material
     maxdraught: Pt:Key:maxdraught
     maxheight: Pt:Key:maxheight
     maxheight:legal: Pt:Key:maxheight:legal
     maxheight:marine: Pt:Key:maxheight:marine
     maxheight:physical: Pt:Key:maxheight:physical
     maxspeed: Pt:Key:maxspeed
+    maxspeed:advisory: Pt:Key:maxspeed:advisory
     maxweight: Pt:Key:maxweight
     military: Pt:Key:military
     min_height: Pt:Key:min height
+    minspeed: Pt:Key:minspeed
     monitoring:bicycle: Pt:Key:monitoring:bicycle
     monitoring:traffic: Pt:Key:monitoring:traffic
     mooring: Pt:Key:mooring
@@ -13011,27 +19830,36 @@ pt:
     name: Pt:Key:name
     natural: Pt:Key:natural
     noexit: Pt:Key:noexit
-    noname: Pt:Key:noname
+    nohousenumber: Pt:Key:nohousenumber
+    note: Pt:Key:note
     office: Pt:Key:office
     oneway: Pt:Key:oneway
     opening_hours: Pt:Key:opening hours
     operator: Pt:Key:operator
     overtaking: Pt:Key:overtaking
+    park_ride: Pt:Key:park ride
+    parking: Pt:Key:parking
     passing_places: Pt:Key:passing places
     place: Pt:Key:place
+    placement: Pt:Key:placement
+    pmfsefin:idedif: Pt:Key:pmfsefin:idedif
+    police: Pt:Key:police
     population: Pt:Key:population
     postal_code: Pt:Key:postal code
     power: Pt:Key:power
+    product: Pt:Key:product
     psv: Pt:Key:psv
     public_transport: Pt:Key:public transport
     public_transport:version: Pt:Key:public transport:version
     railway: Pt:Key:railway
     recording: Pt:Key:recording
     ref: Pt:Key:ref
+    ref:INEP: Pt:Key:ref:INEP
     ref:bag: Pt:Key:ref:bag
     ref:vatin: Pt:Key:ref:vatin
     religion: Pt:Key:religion
     roof:material: Pt:Key:roof:material
+    rooms: Pt:Key:rooms
     route: Pt:Key:route
     sac_scale: Pt:Key:sac scale
     seamark: Pt:Key:seamark
@@ -13040,15 +19868,22 @@ pt:
     segregated: Pt:Key:segregated
     service: Pt:Key:service
     service_times: Pt:Key:service times
+    sett:style=portuguese: Pt:Key:sett:style=portuguese
     shop: Pt:Key:shop
     sidewalk: Pt:Key:sidewalk
     ski: Pt:Key:ski
     smoothness: Pt:Key:smoothness
+    social_facility: Pt:Key:social facility
     source: Pt:Key:source
+    source:date: Pt:Key:source:date
+    source:name: Pt:Key:source:name
     sport: Pt:Key:sport
     substance: Pt:Key:substance
+    supervised: Pt:Key:supervised
     surface: Pt:Key:surface
     survey:date: Pt:Key:survey:date
+    tactile_paving: Pt:Key:tactile paving
+    takeaway: Pt:Key:takeaway
     tiger: Pt:Key:tiger
     tourism: Pt:Key:tourism
     tracktype: Pt:Key:tracktype
@@ -13061,30 +19896,50 @@ pt:
     voltage: Pt:Key:voltage
     water: Pt:Key:water
     waterway: Pt:Key:waterway
+    wetland: Pt:Key:wetland
     wheelchair: Pt:Key:wheelchair
+    wiki:symbol: Pt:Key:wiki:symbol
     wikidata: Pt:Key:wikidata
     wikipedia: Pt:Key:wikipedia
     winter_road: Pt:Key:winter road
     wires: Pt:Key:wires
   tag:
     aerialway=cable_car: Pt:Tag:aerialway=cable car
+    aerialway=chair_lift: Pt:Tag:aerialway=chair lift
+    aerialway=drag_lift: Pt:Tag:aerialway=drag lift
+    aerialway=gondola: Pt:Tag:aerialway=gondola
+    aerialway=j-bar: Pt:Tag:aerialway=j-bar
+    aerialway=magic_carpet: Pt:Tag:aerialway=magic carpet
+    aerialway=mixed_lift: Pt:Tag:aerialway=mixed lift
+    aerialway=platter: Pt:Tag:aerialway=platter
+    aerialway=pylon: Pt:Tag:aerialway=pylon
+    aerialway=rope_tow: Pt:Tag:aerialway=rope tow
     aerialway=station: Pt:Tag:aerialway=station
+    aerialway=t-bar: Pt:Tag:aerialway=t-bar
+    aerialway=zip_line: Pt:Tag:aerialway=zip line
     aeroway=aerodrome: Pt:Tag:aeroway=aerodrome
     aeroway=apron: Pt:Tag:aeroway=apron
     aeroway=gate: Pt:Tag:aeroway=gate
     aeroway=hangar: Pt:Tag:aeroway=hangar
     aeroway=helipad: Pt:Tag:aeroway=helipad
+    aeroway=heliport: Pt:Tag:aeroway=heliport
     aeroway=holding_position: Pt:Tag:aeroway=holding position
+    aeroway=navigationaid: Pt:Tag:aeroway=navigationaid
     aeroway=parking_position: Pt:Tag:aeroway=parking position
     aeroway=runway: Pt:Tag:aeroway=runway
+    aeroway=spaceport: Pt:Tag:aeroway=spaceport
+    aeroway=taxilane: Pt:Tag:aeroway=taxilane
     aeroway=taxiway: Pt:Tag:aeroway=taxiway
     aeroway=terminal: Pt:Tag:aeroway=terminal
     aeroway=windsock: Pt:Tag:aeroway=windsock
     amenity=animal_boarding: Pt:Tag:amenity=animal boarding
+    amenity=animal_shelter: Pt:Tag:amenity=animal shelter
     amenity=architect_office: Pt:Tag:amenity=architect office
+    amenity=archive: Pt:Tag:amenity=archive
     amenity=arts_centre: Pt:Tag:amenity=arts centre
     amenity=atm: Pt:Tag:amenity=atm
     amenity=baby_hatch: Pt:Tag:amenity=baby hatch
+    amenity=baking_oven: Pt:Tag:amenity=baking oven
     amenity=bank: Pt:Tag:amenity=bank
     amenity=bar: Pt:Tag:amenity=bar
     amenity=bbq: Pt:Tag:amenity=bbq
@@ -13093,7 +19948,10 @@ pt:
     amenity=bicycle_rental: Pt:Tag:amenity=bicycle rental
     amenity=bicycle_repair_station: Pt:Tag:amenity=bicycle repair station
     amenity=biergarten: Pt:Tag:amenity=biergarten
+    amenity=binoculars: Pt:Tag:amenity=binoculars
     amenity=blood_donation: Pt:Tag:amenity=blood donation
+    amenity=boat_rental: Pt:Tag:amenity=boat rental
+    amenity=boat_sharing: Pt:Tag:amenity=boat sharing
     amenity=brothel: Pt:Tag:amenity=brothel
     amenity=bureau_de_change: Pt:Tag:amenity=bureau de change
     amenity=bus_station: Pt:Tag:amenity=bus station
@@ -13109,8 +19967,11 @@ pt:
     amenity=college: Pt:Tag:amenity=college
     amenity=community_centre: Pt:Tag:amenity=community centre
     amenity=courthouse: Pt:Tag:amenity=courthouse
+    amenity=coworking_space: Pt:Tag:amenity=coworking space
     amenity=crematorium: Pt:Tag:amenity=crematorium
+    amenity=crypt: Pt:Tag:amenity=crypt
     amenity=dentist: Pt:Tag:amenity=dentist
+    amenity=dive_centre: Pt:Tag:amenity=dive centre
     amenity=doctors: Pt:Tag:amenity=doctors
     amenity=dojo: Pt:Tag:amenity=dojo
     amenity=drinking_water: Pt:Tag:amenity=drinking water
@@ -13125,7 +19986,9 @@ pt:
     amenity=food_court: Pt:Tag:amenity=food court
     amenity=fountain: Pt:Tag:amenity=fountain
     amenity=fuel: Pt:Tag:amenity=fuel
+    amenity=funeral_hall: Pt:Tag:amenity=funeral hall
     amenity=gambling: Pt:Tag:amenity=gambling
+    amenity=game_feeding: Pt:Tag:amenity=game feeding
     amenity=grave_yard: Pt:Tag:amenity=grave yard
     amenity=grit_bin: Pt:Tag:amenity=grit bin
     amenity=hospital: Pt:Tag:amenity=hospital
@@ -13133,11 +19996,15 @@ pt:
     amenity=ice_cream: Pt:Tag:amenity=ice cream
     amenity=internet_cafe: Pt:Tag:amenity=internet cafe
     amenity=kindergarten: Pt:Tag:amenity=kindergarten
+    amenity=kitchen: Pt:Tag:amenity=kitchen
+    amenity=kneipp_water_cure: Pt:Tag:amenity=kneipp water cure
     amenity=language_school: Pt:Tag:amenity=language school
+    amenity=lavoir: Pt:Tag:amenity=lavoir
     amenity=letter_box: Pt:Tag:amenity=letter box
     amenity=library: Pt:Tag:amenity=library
     amenity=love_hotel: Pt:Tag:amenity=love hotel
     amenity=marketplace: Pt:Tag:amenity=marketplace
+    amenity=mortuary: Pt:Tag:amenity=mortuary
     amenity=motorcycle_parking: Pt:Tag:amenity=motorcycle parking
     amenity=music_school: Pt:Tag:amenity=music school
     amenity=nightclub: Pt:Tag:amenity=nightclub
@@ -13146,6 +20013,7 @@ pt:
     amenity=parking_entrance: Pt:Tag:amenity=parking entrance
     amenity=parking_space: Pt:Tag:amenity=parking space
     amenity=pharmacy: Pt:Tag:amenity=pharmacy
+    amenity=photo_booth: Pt:Tag:amenity=photo booth
     amenity=place_of_worship: Pt:Tag:amenity=place of worship
     amenity=planetarium: Pt:Tag:amenity=planetarium
     amenity=police: Pt:Tag:amenity=police
@@ -13153,24 +20021,35 @@ pt:
     amenity=post_office: Pt:Tag:amenity=post office
     amenity=prison: Pt:Tag:amenity=prison
     amenity=pub: Pt:Tag:amenity=pub
+    amenity=public_bath: Pt:Tag:amenity=public bath
+    amenity=public_bookcase: Pt:Tag:amenity=public bookcase
     amenity=public_building: Pt:Tag:amenity=public building
+    amenity=ranger_station: Pt:Tag:amenity=ranger station
     amenity=recycling: Pt:Tag:amenity=recycling
     amenity=register_office: Pt:Tag:amenity=register office
+    amenity=rescue_station: Pt:Tag:amenity=rescue station
+    amenity=research_institute: Pt:Tag:amenity=research institute
     amenity=restaurant: Pt:Tag:amenity=restaurant
+    amenity=sanitary_dump_station: Pt:Tag:amenity=sanitary dump station
     amenity=sauna: Pt:Tag:amenity=sauna
     amenity=school: Pt:Tag:amenity=school
     amenity=shelter: Pt:Tag:amenity=shelter
+    amenity=shower: Pt:Tag:amenity=shower
     amenity=social_centre: Pt:Tag:amenity=social centre
     amenity=social_facility: Pt:Tag:amenity=social facility
     amenity=stripclub: Pt:Tag:amenity=stripclub
     amenity=studio: Pt:Tag:amenity=studio
+    amenity=surf_school: Pt:Tag:amenity=surf school
     amenity=swingerclub: Pt:Tag:amenity=swingerclub
+    amenity=table: Pt:Tag:amenity=table
     amenity=taxi: Pt:Tag:amenity=taxi
     amenity=telephone: Pt:Tag:amenity=telephone
     amenity=theatre: Pt:Tag:amenity=theatre
+    amenity=ticket_validator: Pt:Tag:amenity=ticket validator
     amenity=toilets: Pt:Tag:amenity=toilets
     amenity=townhall: Pt:Tag:amenity=townhall
     amenity=university: Pt:Tag:amenity=university
+    amenity=vehicle_inspection: Pt:Tag:amenity=vehicle inspection
     amenity=vending_machine: Pt:Tag:amenity=vending machine
     amenity=veterinary: Pt:Tag:amenity=veterinary
     amenity=waste_basket: Pt:Tag:amenity=waste basket
@@ -13200,15 +20079,23 @@ pt:
     boundary=national_park: Pt:Tag:boundary=national park
     boundary=political: Pt:Tag:boundary=political
     boundary=protected_area: Pt:Tag:boundary=protected area
+    bridge=boardwalk: Pt:Tag:bridge=boardwalk
     bridge=viaduct: Pt:Tag:bridge=viaduct
+    building=apartments: Pt:Tag:building=apartments
+    building=chapel: Pt:Tag:building=chapel
     building=church: Pt:Tag:building=church
     building=commercial: Pt:Tag:building=commercial
+    building=conservatory: Pt:Tag:building=conservatory
     building=house: Pt:Tag:building=house
     building=residential: Pt:Tag:building=residential
     building=roof: Pt:Tag:building=roof
     building=school: Pt:Tag:building=school
+    building=service: Pt:Tag:building=service
+    building=shed: Pt:Tag:building=shed
+    building=university: Pt:Tag:building=university
     building=yes: Pt:Tag:building=yes
     craft=agricultural_engines: Pt:Tag:craft=agricultural engines
+    craft=atelier: Pt:Tag:craft=atelier
     craft=basket_maker: Pt:Tag:craft=basket maker
     craft=beekeeper: Pt:Tag:craft=beekeeper
     craft=blacksmith: Pt:Tag:craft=blacksmith
@@ -13259,23 +20146,34 @@ pt:
     craft=upholsterer: Pt:Tag:craft=upholsterer
     craft=watchmaker: Pt:Tag:craft=watchmaker
     craft=winery: Pt:Tag:craft=winery
+    crossing=traffic_signals: Pt:Tag:crossing=traffic signals
     emergency=ambulance_station: Pt:Tag:emergency=ambulance station
+    emergency=defibrillator: Pt:Tag:emergency=defibrillator
     emergency=fire_hydrant: Pt:Tag:emergency=fire hydrant
     emergency=phone: Pt:Tag:emergency=phone
     emergency=siren: Pt:Tag:emergency=siren
+    footway=crossing: Pt:Tag:footway=crossing
+    generator:source=solar: Pt:Tag:generator:source=solar
     geological=palaeontological_site: Pt:Tag:geological=palaeontological site
+    government=cadaster: Pt:Tag:government=cadaster
     healthcare=blood_donation: Pt:Tag:healthcare=blood donation
+    healthcare=doctor: Pt:Tag:healthcare=doctor
+    healthcare=vaccination_centre: Pt:Tag:healthcare=vaccination centre
     highway=bridleway: Pt:Tag:highway=bridleway
     highway=bus_guideway: Pt:Tag:highway=bus guideway
     highway=bus_stop: Pt:Tag:highway=bus stop
+    highway=busway: Pt:Tag:highway=busway
     highway=corridor: Pt:Tag:highway=corridor
     highway=crossing: Pt:Tag:highway=crossing
     highway=cycleway: Pt:Tag:highway=cycleway
+    highway=elevator: Pt:Tag:highway=elevator
     highway=emergency_access_point: Pt:Tag:highway=emergency access point
+    highway=escape: Pt:Tag:highway=escape
     highway=footway: Pt:Tag:highway=footway
     highway=ford: Pt:Tag:highway=ford
     highway=give_way: Pt:Tag:highway=give way
     highway=living_street: Pt:Tag:highway=living street
+    highway=milestone: Pt:Tag:highway=milestone
     highway=mini_roundabout: Pt:Tag:highway=mini roundabout
     highway=motorway: Pt:Tag:highway=motorway
     highway=motorway_junction: Pt:Tag:highway=motorway junction
@@ -13297,7 +20195,9 @@ pt:
     highway=stop: Pt:Tag:highway=stop
     highway=street_lamp: Pt:Tag:highway=street lamp
     highway=tertiary: Pt:Tag:highway=tertiary
+    highway=toll_gantry: Pt:Tag:highway=toll gantry
     highway=track: Pt:Tag:highway=track
+    highway=traffic_mirror: Pt:Tag:highway=traffic mirror
     highway=traffic_signals: Pt:Tag:highway=traffic signals
     highway=trunk: Pt:Tag:highway=trunk
     highway=turning_circle: Pt:Tag:highway=turning circle
@@ -13319,12 +20219,14 @@ pt:
     historic=wayside_cross: Pt:Tag:historic=wayside cross
     historic=wayside_shrine: Pt:Tag:historic=wayside shrine
     historic=wreck: Pt:Tag:historic=wreck
+    industrial=slaughterhouse: Pt:Tag:industrial=slaughterhouse
     junction=roundabout: Pt:Tag:junction=roundabout
     landuse=allotments: Pt:Tag:landuse=allotments
     landuse=basin: Pt:Tag:landuse=basin
     landuse=brownfield: Pt:Tag:landuse=brownfield
     landuse=cemetery: Pt:Tag:landuse=cemetery
     landuse=commercial: Pt:Tag:landuse=commercial
+    landuse=education: Pt:Tag:landuse=education
     landuse=farm: Pt:Tag:landuse=farm
     landuse=farmyard: Pt:Tag:landuse=farmyard
     landuse=forest: Pt:Tag:landuse=forest
@@ -13359,11 +20261,13 @@ pt:
     leisure=miniature_golf: Pt:Tag:leisure=miniature golf
     leisure=nature_reserve: Pt:Tag:leisure=nature reserve
     leisure=park: Pt:Tag:leisure=park
+    leisure=picnic_table: Pt:Tag:leisure=picnic table
     leisure=pitch: Pt:Tag:leisure=pitch
     leisure=playground: Pt:Tag:leisure=playground
     leisure=slipway: Pt:Tag:leisure=slipway
     leisure=sports_centre: Pt:Tag:leisure=sports centre
     leisure=stadium: Pt:Tag:leisure=stadium
+    leisure=swimming_area: Pt:Tag:leisure=swimming area
     leisure=swimming_pool: Pt:Tag:leisure=swimming pool
     leisure=track: Pt:Tag:leisure=track
     leisure=water_park: Pt:Tag:leisure=water park
@@ -13373,8 +20277,11 @@ pt:
     man_made=breakwater: Pt:Tag:man made=breakwater
     man_made=cairn: Pt:Tag:man made=cairn
     man_made=crane: Pt:Tag:man made=crane
+    man_made=cross: Pt:Tag:man made=cross
     man_made=cutline: Pt:Tag:man made=cutline
+    man_made=dovecote: Pt:Tag:man made=dovecote
     man_made=dyke: Pt:Tag:man made=dyke
+    man_made=embankment: Pt:Tag:man made=embankment
     man_made=flagpole: Pt:Tag:man made=flagpole
     man_made=groyne: Pt:Tag:man made=groyne
     man_made=jetty: Pt:Tag:man made=jetty
@@ -13388,6 +20295,7 @@ pt:
     man_made=reservoir_covered: Pt:Tag:man made=reservoir covered
     man_made=surveillance: Pt:Tag:man made=surveillance
     man_made=survey_point: Pt:Tag:man made=survey point
+    man_made=threshing_floor: Pt:Tag:man made=threshing floor
     man_made=tower: Pt:Tag:man made=tower
     man_made=wastewater_plant: Pt:Tag:man made=wastewater plant
     man_made=water_tower: Pt:Tag:man made=water tower
@@ -13396,6 +20304,8 @@ pt:
     man_made=watermill: Pt:Tag:man made=watermill
     man_made=windmill: Pt:Tag:man made=windmill
     man_made=works: Pt:Tag:man made=works
+    manhole=drain: Pt:Tag:manhole=drain
+    memorial=bust: Pt:Tag:memorial=bust
     military=airfield: Pt:Tag:military=airfield
     military=barracks: Pt:Tag:military=barracks
     military=bunker: Pt:Tag:military=bunker
@@ -13418,17 +20328,22 @@ pt:
     natural=scree: Pt:Tag:natural=scree
     natural=scrub: Pt:Tag:natural=scrub
     natural=shoal: Pt:Tag:natural=shoal
+    natural=shrub: Pt:Tag:natural=shrub
     natural=spring: Pt:Tag:natural=spring
     natural=stone: Pt:Tag:natural=stone
     natural=tree: Pt:Tag:natural=tree
+    natural=tree_row: Pt:Tag:natural=tree row
+    natural=valley: Pt:Tag:natural=valley
     natural=volcano: Pt:Tag:natural=volcano
     natural=water: Pt:Tag:natural=water
     natural=wetland: Pt:Tag:natural=wetland
     natural=wood: Pt:Tag:natural=wood
     noexit=no: Pt:Tag:noexit=no
+    noname=yes: Pt:Tag:noname=yes
     office=accountant: Pt:Tag:office=accountant
     office=administrative: Pt:Tag:office=administrative
     office=architect: Pt:Tag:office=architect
+    office=association: Pt:Tag:office=association
     office=company: Pt:Tag:office=company
     office=educational_institution: Pt:Tag:office=educational institution
     office=employment_agency: Pt:Tag:office=employment agency
@@ -13444,22 +20359,35 @@ pt:
     office=surveyor: Pt:Tag:office=surveyor
     office=telecommunication: Pt:Tag:office=telecommunication
     office=travel_agent: Pt:Tag:office=travel agent
+    place=allotments: Pt:Tag:place=allotments
+    place=archipelago: Pt:Tag:place=archipelago
+    place=borough: Pt:Tag:place=borough
     place=city: Pt:Tag:place=city
+    place=city_block: Pt:Tag:place=city block
     place=continent: Pt:Tag:place=continent
     place=country: Pt:Tag:place=country
     place=county: Pt:Tag:place=county
+    place=district: Pt:Tag:place=district
     place=farm: Pt:Tag:place=farm
     place=hamlet: Pt:Tag:place=hamlet
     place=island: Pt:Tag:place=island
     place=islet: Pt:Tag:place=islet
     place=isolated_dwelling: Pt:Tag:place=isolated dwelling
     place=locality: Pt:Tag:place=locality
+    place=municipality: Pt:Tag:place=municipality
+    place=neighbourhood: Pt:Tag:place=neighbourhood
+    place=ocean: Pt:Tag:place=ocean
     place=plot: Pt:Tag:place=plot
+    place=province: Pt:Tag:place=province
+    place=quarter: Pt:Tag:place=quarter
     place=region: Pt:Tag:place=region
+    place=sea: Pt:Tag:place=sea
+    place=square: Pt:Tag:place=square
     place=state: Pt:Tag:place=state
     place=suburb: Pt:Tag:place=suburb
     place=town: Pt:Tag:place=town
     place=village: Pt:Tag:place=village
+    police=car_pound: Pt:Tag:police=car pound
     power=cable_distribution_cabinet: Pt:Tag:power=cable distribution cabinet
     power=generator: Pt:Tag:power=generator
     power=line: Pt:Tag:power=line
@@ -13593,6 +20521,7 @@ pt:
     shop=scuba_diving: Pt:Tag:shop=scuba diving
     shop=seafood: Pt:Tag:shop=seafood
     shop=second_hand: Pt:Tag:shop=second hand
+    shop=sewing: Pt:Tag:shop=sewing
     shop=shoes: Pt:Tag:shop=shoes
     shop=spices: Pt:Tag:shop=spices
     shop=sports: Pt:Tag:shop=sports
@@ -13615,6 +20544,7 @@ pt:
     sport=9pin: Pt:Tag:sport=9pin
     sport=golf: Pt:Tag:sport=golf
     sport=soccer: Pt:Tag:sport=soccer
+    surface=sett: Pt:Tag:surface=sett
     tourism=alpine_hut: Pt:Tag:tourism=alpine hut
     tourism=artwork: Pt:Tag:tourism=artwork
     tourism=attraction: Pt:Tag:tourism=attraction
@@ -13634,6 +20564,8 @@ pt:
     tourism=zoo: Pt:Tag:tourism=zoo
     traffic_calming=island: Pt:Tag:traffic calming=island
     traffic_calming=table: Pt:Tag:traffic calming=table
+    traffic_sign=city_limit: Pt:Tag:traffic sign=city limit
+    tunnel=culvert: Pt:Tag:tunnel=culvert
     vending=bicycle_tube: Pt:Tag:vending=bicycle tube
     waterway=boatyard: Pt:Tag:waterway=boatyard
     waterway=canal: Pt:Tag:waterway=canal
@@ -13769,7 +20701,6 @@ pt-br:
     nat_ref: Pt-br:Key:nat ref
     natural: Pt-br:Key:natural
     ncn_ref: Pt-br:Key:ncn ref
-    noname: Pt-br:Key:noname
     office: Pt-br:Key:office
     official_name: Pt-br:Key:official name
     old_name: Pt-br:Key:old name
@@ -14153,6 +21084,7 @@ pt-br:
     natural=water: Pt-br:Tag:natural=water
     natural=wetland: Pt-BR:Tag:natural=wetland
     natural=wood: Pt-br:Tag:natural=wood
+    noname=yes: Pt-br:Tag:noname=yes
     office=accountant: Pt-br:Tag:office=accountant
     office=administrative: Pt-br:Tag:office=administrative
     office=architect: Pt-br:Tag:office=architect
     leisure: Ro:Key:leisure
     tracktype: Ro:Key:tracktype
   tag:
+    amenity=karaoke_box: Ro:Tag:amenity=karaoke box
     amenity=nightclub: Ro:Tag:amenity=nightclub
     junction=roundabout: Ro:Tag:junction=roundabout
 ru:
   key:
+    3dmr: RU:Key:3dmr
+    AlpinRes_ID: RU:Key:AlpinRes ID
     abandoned: RU:Key:abandoned
+    'abandoned:': 'RU:Key:abandoned:'
+    abandoned:place: RU:Key:abandoned:place
+    abandoned:place=yes: RU:Key:abandoned:place=yes
+    abandoned:railway: RU:Key:abandoned:railway
     abutters: RU:Key:abutters
     access: RU:Key:access
+    access:bdouble: RU:Key:access:bdouble
+    access:lanes: RU:Key:access:lanes
+    access:lhv: RU:Key:access:lhv
+    access:roadtrain: RU:Key:access:roadtrain
+    access:roadtrain:trailers: RU:Key:access:roadtrain:trailers
     addr: RU:Key:addr
+    addr:block: RU:Key:addr:block
     addr:city: RU:Key:addr:city
+    addr:conscriptionnumber: RU:Key:addr:conscriptionnumber
     addr:country: RU:Key:addr:country
+    addr:district: RU:Key:addr:district
+    addr:door: RU:Key:addr:door
     addr:flats: RU:Key:addr:flats
+    addr:floor: RU:Key:addr:floor
+    addr:full: RU:Key:addr:full
+    addr:hamlet: RU:Key:addr:hamlet
     addr:housename: RU:Key:addr:housename
     addr:housenumber: RU:Key:addr:housenumber
+    addr:inclusion: RU:Key:addr:inclusion
     addr:interpolation: RU:Key:addr:interpolation
     addr:letter: RU:Key:addr:letter
     addr:place: RU:Key:addr:place
     addr:postcode: RU:Key:addr:postcode
+    addr:province: RU:Key:addr:province
+    addr:region: RU:Key:addr:region
+    addr:state: RU:Key:addr:state
     addr:street: RU:Key:addr:street
+    addr:streetnumber: RU:Key:addr:streetnumber
+    addr:subdistrict: RU:Key:addr:subdistrict
     addr:suburb: RU:Key:addr:suburb
+    addr:unit: RU:Key:addr:unit
+    advertising: RU:Key:advertising
     aerialway: RU:Key:aerialway
     aeroway: RU:Key:aeroway
+    agricultural: RU:Key:agricultural
     alt_name: RU:Key:alt name
     amenity: RU:Key:amenity
+    animal: RU:Key:animal
+    architect: RU:Key:architect
     area: RU:Key:area
     area:highway: RU:Key:area:highway
+    artist_name: RU:Key:artist name
     artwork_type: RU:Key:artwork type
+    association: RU:Key:association
+    attraction: RU:Key:attraction
+    attribution: RU:Key:attribution
+    atv:sales: RU:Key:atv:sales
+    baby_feeding: RU:Key:baby feeding
+    backcountry: RU:Key:backcountry
+    backward: RU:Key:backward
+    balcony: RU:Key:balcony
     barrier: RU:Key:barrier
+    beds: RU:Key:beds
     bench: RU:Key:bench
     bicycle: RU:Key:bicycle
     bicycle_parking: RU:Key:bicycle parking
+    bike_ride: RU:Key:bike ride
     bin: RU:Key:bin
+    board:title: RU:Key:board:title
     board_type: RU:Key:board type
     boat: RU:Key:boat
+    booking: RU:Key:booking
+    books: RU:Key:books
     border_type: RU:Key:border type
+    both: RU:Key:both
     boundary: RU:Key:boundary
     brand: RU:Key:brand
+    brand:wikidata: RU:Key:brand:wikidata
+    brewery: RU:Key:brewery
     bridge: RU:Key:bridge
+    bridge:movable: RU:Key:bridge:movable
+    bridge:name: RU:Key:bridge:name
+    bridge:structure: RU:Key:bridge:structure
+    bridge:support: RU:Key:bridge:support
+    bridge_name: RU:Key:bridge name
     building: RU:Key:building
     building:architecture: RU:Key:building:architecture
+    building:condition: RU:Key:building:condition
+    building:flats: RU:Key:building:flats
     building:height: RU:Key:building:height
     building:levels: RU:Key:building:levels
+    building:levels:underground: RU:Key:building:levels:underground
     building:material: RU:Key:building:material
     building:min_level: RU:Key:building:min level
     building:part: RU:Key:building:part
     building:parts: RU:Key:building:parts
+    building:prefabricated: RU:Key:building:prefabricated
+    building:soft_storey: RU:Key:building:soft storey
+    building:structure: RU:Key:building:structure
+    building:units: RU:Key:building:units
+    building:usage:pl: RU:Key:building:usage:pl
     building:use: RU:Key:building:use
+    building:use:pl: RU:Key:building:use:pl
     bunker_type: RU:Key:bunker type
     bus: RU:Key:bus
+    cabin:rental: RU:Key:cabin:rental
+    cabins: RU:Key:cabins
     cafe: RU:Key:cafe
+    camp_site: RU:Key:camp site
+    camp_type: RU:Key:camp type
     capacity: RU:Key:capacity
+    capacity:charging: RU:Key:capacity:charging
+    capacity:disabled: RU:Key:capacity:disabled
+    capital: RU:Key:capital
+    caravan: RU:Key:caravan
+    castle_type: RU:Key:castle type
+    cemetery: RU:Key:cemetery
     check_date: RU:Key:check date
     checkpoint: RU:Key:checkpoint
+    church:type: RU:Key:church:type
+    city_limit: RU:Key:city limit
+    class:bicycle: RU:Key:class:bicycle
+    clli: RU:Key:clli
     clothes: RU:Key:clothes
     club: RU:Key:club
     colour: RU:Key:colour
     comment: RU:Key:comment
+    communication:bos: RU:Key:communication:bos
+    community_centre: RU:Key:community centre
+    company: RU:Key:company
+    compressed_air: RU:Key:compressed air
+    condo: RU:Key:condo
     construction: RU:Key:construction
+    consulting: RU:Key:consulting
     contact: RU:Key:contact
     contact:facebook: RU:Key:contact:facebook
     contact:fax: RU:Key:contact:fax
@@ -14426,35 +21439,51 @@ ru:
     created_by: RU:Key:created by
     crop: RU:Key:crop
     crossing: RU:Key:crossing
+    crossing:island: RU:Key:crossing:island
     cuisine: RU:Key:cuisine
+    currency: RU:Key:currency
     cutting: RU:Key:cutting
+    cyclestreets_id: RU:Key:cyclestreets id
+    cycleway:left:oneway: RU:Key:cycleway:left:oneway
+    cycleway:right:oneway: RU:Key:cycleway:right:oneway
     delivery: RU:Key:delivery
     denomination: RU:Key:denomination
+    departures_board: RU:Key:departures board
     description: RU:Key:description
     description:ru: RU:Key:description:ru
     design:code:SPb: RU:Key:design:code:SPb
     design:ref: RU:Key:design:ref
     designation: RU:Key:designation
     diaper: RU:Key:diaper
+    diplomatic: RU:Key:diplomatic
     direction: RU:Key:direction
     dispensing: RU:Key:dispensing
     disused: RU:Key:disused
     'disused:': 'RU:Key:disused:'
     disused:shop: RU:Key:disused:shop
+    dog: RU:Key:dog
+    drink:beer: RU:Key:drink:beer
     drinking_water: RU:Key:drinking water
+    drinking_water:legal: RU:Key:drinking water:legal
     drive_in: RU:Key:drive in
+    drive_through: RU:Key:drive through
     driving_side: RU:Key:driving side
+    dryer: RU:Key:dryer
     ele: RU:Key:ele
+    electric_bicycle: RU:Key:electric bicycle
     electrified: RU:Key:electrified
     email: RU:Key:email
     embankment: RU:Key:embankment
     emergency: RU:Key:emergency
+    engineer: RU:Key:engineer
     entrance: RU:Key:entrance
     est_width: RU:Key:est width
+    exhibit: RU:Key:exhibit
     exit: RU:Key:exit
     fast_food: RU:Key:fast food
     fax: RU:Key:fax
     fee: RU:Key:fee
+    feeding:type: RU:Key:feeding:type
     fence_type: RU:Key:fence type
     ferry: RU:Key:ferry
     fire_boundary: RU:Key:fire boundary
@@ -14466,39 +21495,54 @@ ru:
     foot: RU:Key:foot
     footway: RU:Key:footway
     ford: RU:Key:ford
+    forward: RU:Key:forward
     fuel: RU:Key:fuel
     fuel:cng: RU:Key:fuel:cng
     fuel:lpg: RU:Key:fuel:lpg
     furniture: RU:Key:furniture
-    further: RU:Key:further
-    further:access: RU:Key:further:access
-    further:vehicle: RU:Key:further:vehicle
     garden:style: RU:Key:garden:style
+    garden:type: RU:Key:garden:type
     gas: RU:Key:gas
     gauge: RU:Key:gauge
     generator:output: RU:Key:generator:output
     generator:source: RU:Key:generator:source
     genus: RU:Key:genus
+    government: RU:Key:government
     grassland: RU:Key:grassland
+    group_only: RU:Key:group only
+    guidepost:hiking: RU:Key:guidepost:hiking
     gvr:code: RU:Key:gvr:code
     handrail: RU:Key:handrail
+    hazard: RU:Key:hazard
+    hazmat: RU:Key:hazmat
+    healthcare: RU:Key:healthcare
     height: RU:Key:height
+    heritage: RU:Key:heritage
     hgv: RU:Key:hgv
     highway: RU:Key:highway
+    hiking: RU:Key:hiking
     historic: RU:Key:historic
     horse: RU:Key:horse
+    horse_scale: RU:Key:horse scale
     iata: RU:Key:iata
     ice_road: RU:Key:ice road
     image: RU:Key:image
     incline: RU:Key:incline
+    indoor: RU:Key:indoor
     industrial: RU:Key:industrial
+    infant_bed: RU:Key:infant bed
     information: RU:Key:information
     inscription: RU:Key:inscription
     int_name: RU:Key:int name
     intermittent: RU:Key:intermittent
     internet_access: RU:Key:internet access
+    is_in: RU:Key:is in
+    jetski:rental: RU:Key:jetski:rental
     junction: RU:Key:junction
+    karaoke: RU:Key:karaoke
     kerb: RU:Key:kerb
+    ladder: RU:Key:ladder
+    lamp_mount: RU:Key:lamp mount
     landmark: RU:Key:landmark
     landuse: RU:Key:landuse
     lanes: RU:Key:lanes
@@ -14506,18 +21550,24 @@ ru:
     layer: RU:Key:layer
     leaf_cycle: RU:Key:leaf cycle
     leaf_type: RU:Key:leaf type
+    left: RU:Key:left
     leisure: RU:Key:leisure
     length: RU:Key:length
     level: RU:Key:level
+    level:ref: RU:Key:level:ref
+    license_classes: RU:Key:license classes
     lit: RU:Key:lit
     living_street: RU:Key:living street
     loc_name: RU:Key:loc name
     loc_ref: RU:Key:loc ref
+    location: RU:Key:location
     lock: RU:Key:lock
     man_made: RU:Key:man made
     managed: RU:Key:managed
     manhole: RU:Key:manhole
+    mapillary: RU:Key:mapillary
     material: RU:Key:material
+    max_age: RU:Key:max age
     maxaxleload: RU:Key:maxaxleload
     maxbogieweight: RU:Key:maxbogieweight
     maxheight: RU:Key:maxheight
@@ -14525,14 +21575,23 @@ ru:
     maxspeed: RU:Key:maxspeed
     maxspeed:practical: RU:Key:maxspeed:practical
     maxstay: RU:Key:maxstay
+    maxtents: RU:Key:maxtents
     maxweight: RU:Key:maxweight
+    maxweight:signed: RU:Key:maxweight:signed
     maxwidth: RU:Key:maxwidth
+    mcrb:criteria: RU:Key:mcrb:criteria
+    memorial: RU:Key:memorial
+    memorial:subject: RU:Key:memorial:subject
+    memorial:type: RU:Key:memorial:type
     military: RU:Key:military
     min_height: RU:Key:min height
     minspeed: RU:Key:minspeed
     moped: RU:Key:moped
     motor_vehicle: RU:Key:motor vehicle
     motorcycle: RU:Key:motorcycle
+    motorcycle:parking: RU:Key:motorcycle:parking
+    motorcycle:rental: RU:Key:motorcycle:rental
+    motorcycle:storage: RU:Key:motorcycle:storage
     motorroad: RU:Key:motorroad
     mountain_pass: RU:Key:mountain pass
     mtb:scale: RU:Key:mtb:scale
@@ -14542,37 +21601,56 @@ ru:
     nat_name: RU:Key:nat name
     nat_ref: RU:Key:nat ref
     natural: RU:Key:natural
+    ncn_milepost: RU:Key:ncn milepost
+    network: RU:Key:network
+    next_check_date: RU:Key:next check date
     noaddress: RU:Key:noaddress
     noexit: RU:Key:noexit
+    nohousenumber: RU:Key:nohousenumber
     note: RU:Key:note
     office: RU:Key:office
+    office/Обзор_офисов: RU:Key:office/Обзор офисов
     official_name: RU:Key:official name
     official_short_type: RU:Key:official short type
     old_name: RU:Key:old name
     old_ref: RU:Key:old ref
     oneway: RU:Key:oneway
+    oneway:bicycle: RU:Key:oneway:bicycle
     opening_date: RU:Key:opening date
     opening_hours: RU:Key:opening hours
+    opening_hours:kitchen: RU:Key:opening hours:kitchen
     operator: RU:Key:operator
+    operator:ref:inn: RU:Key:operator:ref:inn
     operator:type: RU:Key:operator:type
+    orientation: RU:Key:orientation
     origin: RU:Key:origin
     overtaking: RU:Key:overtaking
     owner: RU:Key:owner
     ownership: RU:Key:ownership
+    park_ride: RU:Key:park ride
     parking: RU:Key:parking
+    parking:condition: RU:Key:parking:condition
     parking:lane: RU:Key:parking:lane
     parking:lane:both: RU:Key:parking:lane:both
     parking:lane:left: RU:Key:parking:lane:left
+    parking:lane:left:parallel: RU:Key:parking:lane:left:parallel
     parking:lane:right: RU:Key:parking:lane:right
+    parking:lane:right:parallel: RU:Key:parking:lane:right:parallel
+    parking:orientation: RU:Key:parking:orientation
+    parking_space: RU:Key:parking space
+    passenger_information_display: RU:Key:passenger information display
     passing_places: RU:Key:passing places
     paved:date: RU:Key:paved:date
     payment: RU:Key:payment
+    payment:coins: RU:Key:payment:coins
     payment:credit_cards: RU:Key:payment:credit cards
     payment:notes: RU:Key:payment:notes
     phone: RU:Key:phone
+    picnic_table: RU:Key:picnic table
     pipeline: RU:Key:pipeline
     piste:type: RU:Key:piste:type
     place: RU:Key:place
+    placement: RU:Key:placement
     playground: RU:Key:playground
     police: RU:Key:police
     population: RU:Key:population
@@ -14583,25 +21661,43 @@ ru:
     previous:access: RU:Key:previous:access
     previous:vehicle: RU:Key:previous:vehicle
     priority_road: RU:Key:priority road
+    product: RU:Key:product
+    proposed: RU:Key:proposed
     psv: RU:Key:psv
     public_bookcase:type: RU:Key:public bookcase:type
     pump: RU:Key:pump
     railway: RU:Key:railway
     ramp: RU:Key:ramp
+    ramp:bicycle: RU:Key:ramp:bicycle
+    recycling:fire_extinguishers: RU:Key:recycling:fire extinguishers
     recycling_type: RU:Key:recycling type
     ref: RU:Key:ref
+    ref:RS:nkd: RU:Key:ref:RS:nkd
+    ref:mobil-parken.de: RU:Key:ref:mobil-parken.de
+    ref:ruian:building: RU:Key:ref:ruian:building
     reference: RU:Key:reference
+    refitted: RU:Key:refitted
     reg_name: RU:Key:reg name
     reg_ref: RU:Key:reg ref
     religion: RU:Key:religion
+    rental: RU:Key:rental
+    research: RU:Key:research
+    reservoir_type: RU:Key:reservoir type
+    residential: RU:Key:residential
+    resort: RU:Key:resort
     resource: RU:Key:resource
+    rhn_ref: RU:Key:rhn ref
+    right: RU:Key:right
+    roof:direction: RU:Key:roof:direction
     roof:material: RU:Key:roof:material
+    room: RU:Key:room
     rooms: RU:Key:rooms
     route: RU:Key:route
     rtsa_scale: RU:Key:rtsa scale
     ruined: RU:Key:ruined
     'ruined:': 'RU:Key:ruined:'
     ruins: RU:Key:ruins
+    sac_scale: RU:Key:sac scale
     salt: RU:Key:salt
     sanitary_dump_station: RU:Key:sanitary dump station
     seasonal: RU:Key:seasonal
@@ -14615,6 +21711,7 @@ ru:
     shop: RU:Key:shop
     side_road: RU:Key:side road
     sidewalk: RU:Key:sidewalk
+    sinkhole: RU:Key:sinkhole
     smoking: RU:Key:smoking
     smoothness: RU:Key:smoothness
     snowplowing: RU:Key:snowplowing
@@ -14623,33 +21720,53 @@ ru:
     source: RU:Key:source
     source:addr: RU:Key:source:addr
     source:maxspeed: RU:Key:source:maxspeed
+    source:taxon: RU:Key:source:taxon
     species: RU:Key:species
+    speed_pedelec: RU:Key:speed pedelec
     sport: RU:Key:sport
     start_date: RU:Key:start date
     step_count: RU:Key:step count
     substance: RU:Key:substance
+    supervised: RU:Key:supervised
     surface: RU:Key:surface
     surveillance: RU:Key:surveillance
     survey:date: RU:Key:survey:date
+    sustrans_ref: RU:Key:sustrans ref
+    swimming: RU:Key:swimming
+    symbol: RU:Key:symbol
     tactile_paving: RU:Key:tactile paving
+    taxon: RU:Key:taxon
+    technology: RU:Key:technology
     todo: RU:Key:todo
+    toilets: RU:Key:toilets
     toilets:wheelchair: RU:Key:toilets:wheelchair
     toll: RU:Key:toll
     tourism: RU:Key:tourism
+    tower:type: RU:Key:tower:type
     tracktype: RU:Key:tracktype
     traffic_calming: RU:Key:traffic calming
     traffic_sign: RU:Key:traffic sign
+    traffic_signals: RU:Key:traffic signals
     trail_visibility: RU:Key:trail visibility
+    trailer:rental: RU:Key:trailer:rental
     tram: RU:Key:tram
+    trolley_wire: RU:Key:trolley wire
     trolleybus: RU:Key:trolleybus
     tunnel: RU:Key:tunnel
     turn: RU:Key:turn
     turn:lanes: RU:Key:turn:lanes
     type: RU:Key:type
+    url: RU:Key:url
+    usage: RU:Key:usage
     vehicle: RU:Key:vehicle
+    vending: RU:Key:vending
+    visibility: RU:Key:visibility
     voltage: RU:Key:voltage
+    washing_machine: RU:Key:washing machine
     waste: RU:Key:waste
     water: RU:Key:water
+    water_source: RU:Key:water source
+    water_system: RU:Key:water system
     waterway: RU:Key:waterway
     website: RU:Key:website
     wheelchair: RU:Key:wheelchair
@@ -14660,8 +21777,9 @@ ru:
     wikipedia:ru: RU:Key:wikipedia:ru
     winter_road: RU:Key:winter road
     wood: RU:Key:wood
+    xmas:feature: RU:Key:xmas:feature
+    zone:traffic: RU:Key:zone:traffic
   tag:
-    access=agricultural: RU:Tag:access=agricultural
     access=customers: RU:Tag:access=customers
     access=delivery: RU:Tag:access=delivery
     access=designated: RU:Tag:access=designated
@@ -14673,6 +21791,12 @@ ru:
     access=private: RU:Tag:access=private
     access=unknown: RU:Tag:access=unknown
     access=yes: RU:Tag:access=yes
+    advertising=board: RU:Tag:advertising=board
+    advertising=flag: RU:Tag:advertising=flag
+    advertising=screen: RU:Tag:advertising=screen
+    advertising=sculpture: RU:Tag:advertising=sculpture
+    advertising=wall_painting: RU:Tag:advertising=wall painting
+    aerodrome:type=airfield: RU:Tag:aerodrome:type=airfield
     aeroway=aerodrome: RU:Tag:aeroway=aerodrome
     aeroway=apron: RU:Tag:aeroway=apron
     aeroway=gate: RU:Tag:aeroway=gate
@@ -14685,7 +21809,9 @@ ru:
     aeroway=terminal: RU:Tag:aeroway=terminal
     aeroway=windsock: RU:Tag:aeroway=windsock
     amenity=animal_boarding: RU:Tag:amenity=animal boarding
+    amenity=animal_breeding: RU:Tag:amenity=animal breeding
     amenity=animal_shelter: RU:Tag:amenity=animal shelter
+    amenity=animal_training: RU:Tag:amenity=animal training
     amenity=arts_centre: RU:Tag:amenity=arts centre
     amenity=atm: RU:Tag:amenity=atm
     amenity=baby_hatch: RU:Tag:amenity=baby hatch
@@ -14693,11 +21819,16 @@ ru:
     amenity=bar: RU:Tag:amenity=bar
     amenity=bbq: RU:Tag:amenity=bbq
     amenity=bench: RU:Tag:amenity=bench
+    amenity=bicycle_library: RU:Tag:amenity=bicycle library
     amenity=bicycle_parking: RU:Tag:amenity=bicycle parking
     amenity=bicycle_rental: RU:Tag:amenity=bicycle rental
     amenity=bicycle_repair_station: RU:Tag:amenity=bicycle repair station
+    amenity=bicycle_trailer_sharing: RU:Tag:amenity=bicycle trailer sharing
     amenity=biergarten: RU:Tag:amenity=biergarten
+    amenity=binoculars: RU:Tag:amenity=binoculars
+    amenity=bird_bath: RU:Tag:amenity=bird bath
     amenity=boat_storage: RU:Tag:amenity=boat storage
+    amenity=border_control: RU:Tag:amenity=border control
     amenity=brothel: RU:Tag:amenity=brothel
     amenity=bureau_de_change: RU:Tag:amenity=bureau de change
     amenity=bus_station: RU:Tag:amenity=bus station
@@ -14706,45 +21837,70 @@ ru:
     amenity=car_sharing: RU:Tag:amenity=car sharing
     amenity=car_wash: RU:Tag:amenity=car wash
     amenity=casino: RU:Tag:amenity=casino
+    amenity=changing_room: RU:Tag:amenity=changing room
     amenity=charging_station: RU:Tag:amenity=charging station
+    amenity=checkpoint: RU:Tag:amenity=checkpoint
     amenity=childcare: RU:Tag:amenity=childcare
     amenity=cinema: RU:Tag:amenity=cinema
     amenity=clinic: RU:Tag:amenity=clinic
+    amenity=cloakroom: RU:Tag:amenity=cloakroom
     amenity=clock: RU:Tag:amenity=clock
+    amenity=clothes_dryer: RU:Tag:amenity=clothes dryer
     amenity=college: RU:Tag:amenity=college
     amenity=community_centre: RU:Tag:amenity=community centre
     amenity=compressed_air: RU:Tag:amenity=compressed air
     amenity=courthouse: RU:Tag:amenity=courthouse
     amenity=coworking_space: RU:Tag:amenity=coworking space
     amenity=crematorium: RU:Tag:amenity=crematorium
+    amenity=customs: RU:Tag:amenity=customs
     amenity=dentist: RU:Tag:amenity=dentist
+    amenity=device_charging_station: RU:Tag:amenity=device charging station
     amenity=doctors: RU:Tag:amenity=doctors
+    amenity=dog_bin: RU:Tag:amenity=dog bin
+    amenity=dog_toilet: RU:Tag:amenity=dog toilet
     amenity=dojo: RU:Tag:amenity=dojo
+    amenity=dressing_room: RU:Tag:amenity=dressing room
     amenity=drinking_water: RU:Tag:amenity=drinking water
+    amenity=driver_training: RU:Tag:amenity=driver training
     amenity=driving_school: RU:Tag:amenity=driving school
     amenity=embassy: RU:Tag:amenity=embassy
     amenity=fast_food: RU:Tag:amenity=fast food
+    amenity=feeding_place: RU:Tag:amenity=feeding place
     amenity=ferry_terminal: RU:Tag:amenity=ferry terminal
+    amenity=financial_advice: RU:Tag:amenity=financial advice
     amenity=fire_station: RU:Tag:amenity=fire station
     amenity=fish_spa: RU:Tag:amenity=fish spa
     amenity=food_court: RU:Tag:amenity=food court
     amenity=fountain: RU:Tag:amenity=fountain
+    amenity=fridge: RU:Tag:amenity=fridge
     amenity=fuel: RU:Tag:amenity=fuel
+    amenity=funeral_hall: RU:Tag:amenity=funeral hall
+    amenity=game_feeding: RU:Tag:amenity=game feeding
     amenity=grave_yard: RU:Tag:amenity=grave yard
     amenity=grit_bin: RU:Tag:amenity=grit bin
+    amenity=harbourmaster: RU:Tag:amenity=harbourmaster
+    amenity=hitching_post: RU:Tag:amenity=hitching post
     amenity=hookah_lounge: RU:Tag:amenity=hookah lounge
+    amenity=hospice: RU:Tag:amenity=hospice
     amenity=hospital: RU:Tag:amenity=hospital
+    amenity=hunting_stand: RU:Tag:amenity=hunting stand
     amenity=ice_cream: RU:Tag:amenity=ice cream
+    amenity=kick-scooter_rental: RU:Tag:amenity=kick-scooter rental
     amenity=kindergarten: RU:Tag:amenity=kindergarten
+    amenity=kitchen: RU:Tag:amenity=kitchen
     amenity=kneipp_water_cure: RU:Tag:amenity=kneipp water cure
+    amenity=language_school: RU:Tag:amenity=language school
     amenity=letter_box: RU:Tag:amenity=letter box
     amenity=library: RU:Tag:amenity=library
     amenity=loading_dock: RU:Tag:amenity=loading dock
     amenity=love_hotel: RU:Tag:amenity=love hotel
+    amenity=marae: RU:Tag:amenity=marae
     amenity=marketplace: RU:Tag:amenity=marketplace
+    amenity=mobile_library: RU:Tag:amenity=mobile library
     amenity=monastery: RU:Tag:amenity=monastery
     amenity=mortuary: RU:Tag:amenity=mortuary
     amenity=motorcycle_parking: RU:Tag:amenity=motorcycle parking
+    amenity=music_school: RU:Tag:amenity=music school
     amenity=nightclub: RU:Tag:amenity=nightclub
     amenity=nursing_home: RU:Tag:amenity=nursing home
     amenity=parking: RU:Tag:amenity=parking
     amenity=place_of_worship: RU:Tag:amenity=place of worship
     amenity=planetarium: RU:Tag:amenity=planetarium
     amenity=police: RU:Tag:amenity=police
+    amenity=polling_station: RU:Tag:amenity=polling station
     amenity=post_box: RU:Tag:amenity=post box
     amenity=post_office: RU:Tag:amenity=post office
     amenity=prison: RU:Tag:amenity=prison
+    amenity=prison_camp: RU:Tag:amenity=prison camp
     amenity=pub: RU:Tag:amenity=pub
     amenity=public_bookcase: RU:Tag:amenity=public bookcase
     amenity=public_building: RU:Tag:amenity=public building
+    amenity=ranger_station: RU:Tag:amenity=ranger station
     amenity=recycling: RU:Tag:amenity=recycling
     amenity=register_office: RU:Tag:amenity=register office
     amenity=rescue_station: RU:Tag:amenity=rescue station
+    amenity=research_institute: RU:Tag:amenity=research institute
     amenity=restaurant: RU:Tag:amenity=restaurant
     amenity=sanatorium: RU:Tag:amenity=sanatorium
     amenity=sanitary_dump_station: RU:Tag:amenity=sanitary dump station
     amenity=sauna: RU:Tag:amenity=sauna
     amenity=school: RU:Tag:amenity=school
+    amenity=seat: RU:Tag:amenity=seat
     amenity=shelter: RU:Tag:amenity=shelter
     amenity=shop: RU:Tag:amenity=shop
     amenity=shower: RU:Tag:amenity=shower
     amenity=smoking_area: RU:Tag:amenity=smoking area
     amenity=social_facility: RU:Tag:amenity=social facility
+    amenity=stables: RU:Tag:amenity=stables
+    amenity=stool: RU:Tag:amenity=stool
     amenity=stripclub: RU:Tag:amenity=stripclub
     amenity=studio: RU:Tag:amenity=studio
+    amenity=swingerclub: RU:Tag:amenity=swingerclub
+    amenity=table: RU:Tag:amenity=table
     amenity=taxi: RU:Tag:amenity=taxi
     amenity=telephone: RU:Tag:amenity=telephone
+    amenity=television: RU:Tag:amenity=television
     amenity=theatre: RU:Tag:amenity=theatre
     amenity=toilets: RU:Tag:amenity=toilets
+    amenity=tourist_bus_parking: RU:Tag:amenity=tourist bus parking
     amenity=townhall: RU:Tag:amenity=townhall
+    amenity=training: RU:Tag:amenity=training
+    amenity=trolley_bay: RU:Tag:amenity=trolley bay
     amenity=university: RU:Tag:amenity=university
+    amenity=vacuum_cleaner: RU:Tag:amenity=vacuum cleaner
+    amenity=vehicle_inspection: RU:Tag:amenity=vehicle inspection
     amenity=vehicle_ramp: RU:Tag:amenity=vehicle ramp
     amenity=vending_machine: RU:Tag:amenity=vending machine
     amenity=veterinary: RU:Tag:amenity=veterinary
+    amenity=veterinary_pharmacy: RU:Tag:amenity=veterinary pharmacy
+    amenity=vivarium: RU:Tag:amenity=vivarium
+    amenity=washing_machine: RU:Tag:amenity=washing machine
     amenity=waste_basket: RU:Tag:amenity=waste basket
     amenity=waste_disposal: RU:Tag:amenity=waste disposal
     amenity=water_point: RU:Tag:amenity=water point
     amenity=watering_place: RU:Tag:amenity=watering place
     amenity=weighbridge: RU:Tag:amenity=weighbridge
+    animal=horse_walker: RU:Tag:animal=horse walker
+    animal=school: RU:Tag:animal=school
+    animated=trivision_blades: RU:Tag:animated=trivision blades
+    animated=winding_posters: RU:Tag:animated=winding posters
+    anthropogenic=yes: RU:Tag:anthropogenic=yes
+    artwork_type=architecture: RU:Tag:artwork type=architecture
+    artwork_type=bust: RU:Tag:artwork type=bust
+    artwork_type=mural: RU:Tag:artwork type=mural
+    artwork_type=relief: RU:Tag:artwork type=relief
+    artwork_type=sculpture: RU:Tag:artwork type=sculpture
+    artwork_type=statue: RU:Tag:artwork type=statue
+    artwork_type=stone: RU:Tag:artwork type=stone
     atm=yes: RU:Tag:atm=yes
+    attraction=alpine_coaster: RU:Tag:attraction=alpine coaster
+    attraction=animal: RU:Tag:attraction=animal
+    attraction=maze: RU:Tag:attraction=maze
+    attraction=roller_coaster: RU:Tag:attraction=roller coaster
+    attraction=summer_toboggan: RU:Tag:attraction=summer toboggan
+    attraction=train: RU:Tag:attraction=train
+    attraction=water_slide: RU:Tag:attraction=water slide
     barrier=block: RU:Tag:barrier=block
     barrier=bollard: RU:Tag:barrier=bollard
     barrier=border_control: RU:Tag:barrier=border control
+    barrier=bump_gate: RU:Tag:barrier=bump gate
+    barrier=bus_trap: RU:Tag:barrier=bus trap
+    barrier=cable_barrier: RU:Tag:barrier=cable barrier
     barrier=cattle_grid: RU:Tag:barrier=cattle grid
+    barrier=chain: RU:Tag:barrier=chain
     barrier=chech_hedgehog: RU:Tag:barrier=chech hedgehog
     barrier=city_wall: RU:Tag:barrier=city wall
+    barrier=cycle_barrier: RU:Tag:barrier=cycle barrier
     barrier=czech_hedgehog: RU:Tag:barrier=czech hedgehog
+    barrier=debris: RU:Tag:barrier=debris
     barrier=ditch: RU:Tag:barrier=ditch
     barrier=entrance: RU:Tag:barrier=entrance
     barrier=fence: RU:Tag:barrier=fence
+    barrier=full-height_turnstile: RU:Tag:barrier=full-height turnstile
     barrier=gate: RU:Tag:barrier=gate
+    barrier=guard_rail: RU:Tag:barrier=guard rail
+    barrier=hampshire_gate: RU:Tag:barrier=hampshire gate
     barrier=handrail: RU:Tag:barrier=handrail
     barrier=hedge: RU:Tag:barrier=hedge
+    barrier=hedge_bank: RU:Tag:barrier=hedge bank
+    barrier=height_restrictor: RU:Tag:barrier=height restrictor
+    barrier=horse_jump: RU:Tag:barrier=horse jump
+    barrier=horse_stile: RU:Tag:barrier=horse stile
     barrier=kerb: RU:Tag:barrier=kerb
     barrier=lift_gate: RU:Tag:barrier=lift gate
+    barrier=log: RU:Tag:barrier=log
     barrier=retaining_wall: RU:Tag:barrier=retaining wall
     barrier=sally_port: RU:Tag:barrier=sally port
+    barrier=sliding_gate: RU:Tag:barrier=sliding gate
+    barrier=stile: RU:Tag:barrier=stile
+    barrier=swing_gate: RU:Tag:barrier=swing gate
+    barrier=tank_trap: RU:Tag:barrier=tank trap
     barrier=toll_booth: RU:Tag:barrier=toll booth
     barrier=turnstile: RU:Tag:barrier=turnstile
     barrier=wall: RU:Tag:barrier=wall
+    barrier=wicket_gate: RU:Tag:barrier=wicket gate
+    barrier=yes: RU:Tag:barrier=yes
     bicycle=designated: RU:Tag:bicycle=designated
+    bicycle=yes: RU:Tag:bicycle=yes
+    board_type=board: RU:Tag:board type=board
+    boat:rental=yes: RU:Tag:boat:rental=yes
     boundary=administrative: RU:Tag:boundary=administrative
     boundary=forest_compartment: RU:Tag:boundary=forest compartment
     boundary=forestry_compartment: RU:Tag:boundary=forestry compartment
+    boundary=place: RU:Tag:boundary=place
     boundary=postal_code: RU:Tag:boundary=postal code
     boundary=protected_area: RU:Tag:boundary=protected area
     bridge:movable=bascule: RU:Tag:bridge:movable=bascule
@@ -14831,24 +22048,59 @@ ru:
     bridge=aqueduct: RU:Tag:bridge=aqueduct
     bridge=cantilever: RU:Tag:bridge=cantilever
     bridge=covered: RU:Tag:bridge=covered
+    building=*: RU:Tag:building=*
+    building=Y: RU:Tag:building=Y
+    building=abandoned: RU:Tag:building=abandoned
+    building=allotment_house: RU:Tag:building=allotment house
     building=apartments: RU:Tag:building=apartments
+    building=bakehouse: RU:Tag:building=bakehouse
     building=barn: RU:Tag:building=barn
+    building=barracks: RU:Tag:building=barracks
+    building=boathouse: RU:Tag:building=boathouse
+    building=brewery: RU:Tag:building=brewery
     building=bridge: RU:Tag:building=bridge
     building=bungalow: RU:Tag:building=bungalow
     building=bunker: RU:Tag:building=bunker
     building=cabin: RU:Tag:building=cabin
+    building=carport: RU:Tag:building=carport
+    building=castle: RU:Tag:building=castle
     building=cathedral: RU:Tag:building=cathedral
+    building=central_office: RU:Tag:building=central office
     building=chapel: RU:Tag:building=chapel
     building=church: RU:Tag:building=church
+    building=civic: RU:Tag:building=civic
+    building=collapsed: RU:Tag:building=collapsed
+    building=college: RU:Tag:building=college
     building=commercial: RU:Tag:building=commercial
+    building=condominium: RU:Tag:building=condominium
+    building=conservatory: RU:Tag:building=conservatory
+    building=constructie: RU:Tag:building=constructie
     building=construction: RU:Tag:building=construction
+    building=container: RU:Tag:building=container
+    building=convent: RU:Tag:building=convent
+    building=cowshed: RU:Tag:building=cowshed
+    building=demountable: RU:Tag:building=demountable
     building=detached: RU:Tag:building=detached
+    building=digester: RU:Tag:building=digester
+    building=disused: RU:Tag:building=disused
     building=dormitory: RU:Tag:building=dormitory
     building=entrance: RU:Tag:building=entrance
+    building=factory: RU:Tag:building=factory
+    building=farm: RU:Tag:building=farm
+    building=farm_auxiliary: RU:Tag:building=farm auxiliary
+    building=fire_station: RU:Tag:building=fire station
     building=font: RU:Tag:building=font
+    building=fort: RU:Tag:building=fort
+    building=funeral_hall: RU:Tag:building=funeral hall
     building=garage: RU:Tag:building=garage
     building=garages: RU:Tag:building=garages
+    building=gatehouse: RU:Tag:building=gatehouse
+    building=ger: RU:Tag:building=ger
+    building=glasshouse: RU:Tag:building=glasshouse
+    building=government: RU:Tag:building=government
+    building=grandstand: RU:Tag:building=grandstand
     building=greenhouse: RU:Tag:building=greenhouse
+    building=ground_station: RU:Tag:building=ground station
     building=hangar: RU:Tag:building=hangar
     building=hospital: RU:Tag:building=hospital
     building=hotel: RU:Tag:building=hotel
@@ -14858,24 +22110,86 @@ ru:
     building=industrial: RU:Tag:building=industrial
     building=kindergarten: RU:Tag:building=kindergarten
     building=kiosk: RU:Tag:building=kiosk
+    building=manufacture: RU:Tag:building=manufacture
+    building=marquee: RU:Tag:building=marquee
+    building=military: RU:Tag:building=military
+    building=monastery: RU:Tag:building=monastery
     building=mosque: RU:Tag:building=mosque
+    building=museum: RU:Tag:building=museum
+    building=office: RU:Tag:building=office
+    building=palace: RU:Tag:building=palace
+    building=parking: RU:Tag:building=parking
+    building=pavilion: RU:Tag:building=pavilion
+    building=presbytery: RU:Tag:building=presbytery
+    building=proposed: RU:Tag:building=proposed
     building=public: RU:Tag:building=public
+    building=religious: RU:Tag:building=religious
     building=residential: RU:Tag:building=residential
     building=retail: RU:Tag:building=retail
+    building=riding_hall: RU:Tag:building=riding hall
     building=roof: RU:Tag:building=roof
     building=ruins: RU:Tag:building=ruins
     building=school: RU:Tag:building=school
+    building=semi: RU:Tag:building=semi
+    building=semidetached_house: RU:Tag:building=semidetached house
     building=service: RU:Tag:building=service
     building=shed: RU:Tag:building=shed
+    building=ship: RU:Tag:building=ship
+    building=shrine: RU:Tag:building=shrine
+    building=slurry_tank: RU:Tag:building=slurry tank
+    building=sports_centre: RU:Tag:building=sports centre
+    building=sports_hall: RU:Tag:building=sports hall
     building=stable: RU:Tag:building=stable
+    building=stadium: RU:Tag:building=stadium
+    building=static_caravan: RU:Tag:building=static caravan
+    building=stilt_house: RU:Tag:building=stilt house
+    building=storage_tank: RU:Tag:building=storage tank
+    building=sty: RU:Tag:building=sty
+    building=supermarket: RU:Tag:building=supermarket
     building=synagogue: RU:Tag:building=synagogue
+    building=tech_cab: RU:Tag:building=tech cab
+    building=temple: RU:Tag:building=temple
+    building=tent: RU:Tag:building=tent
+    building=terrace: RU:Tag:building=terrace
+    building=toilets: RU:Tag:building=toilets
     building=train_station: RU:Tag:building=train station
+    building=transformer_tower: RU:Tag:building=transformer tower
     building=transportation: RU:Tag:building=transportation
+    building=tree_house: RU:Tag:building=tree house
+    building=true: RU:Tag:building=true
+    building=trullo: RU:Tag:building=trullo
+    building=unclassified: RU:Tag:building=unclassified
+    building=undefined: RU:Tag:building=undefined
+    building=unidentified: RU:Tag:building=unidentified
     building=university: RU:Tag:building=university
+    building=unknown: RU:Tag:building=unknown
     building=warehouse: RU:Tag:building=warehouse
+    building=water_tower: RU:Tag:building=water tower
+    building=wayside_shrine: RU:Tag:building=wayside shrine
+    building=yes: RU:Tag:building=yes
     bunker_type=pillbox: RU:Tag:bunker type=pillbox
     cafe=time-cafe: RU:Tag:cafe=time-cafe
+    cafe=time_cafe: RU:Tag:cafe=time cafe
+    camp_site=basic: RU:Tag:camp site=basic
+    camp_site=deluxe: RU:Tag:camp site=deluxe
+    camp_site=serviced: RU:Tag:camp site=serviced
+    camp_site=standard: RU:Tag:camp site=standard
+    castle_type=defensive: RU:Tag:castle type=defensive
+    castle_type=fortress: RU:Tag:castle type=fortress
+    castle_type=kremlin: RU:Tag:castle type=kremlin
+    castle_type=manor: RU:Tag:castle type=manor
+    castle_type=palace: RU:Tag:castle type=palace
+    castle_type=shiro: RU:Tag:castle type=shiro
+    castle_type=stately: RU:Tag:castle type=stately
+    cemetery=grave: RU:Tag:cemetery=grave
+    cemetery=sector: RU:Tag:cemetery=sector
+    club=social: RU:Tag:club=social
+    company=aerospace: RU:Tag:company=aerospace
+    company=it: RU:Tag:company=it
+    company=logistics: RU:Tag:company=logistics
+    company=software_development: RU:Tag:company=software development
     craft=agricultural_engines: RU:Tag:craft=agricultural engines
+    craft=bakery: RU:Tag:craft=bakery
     craft=basket_maker: RU:Tag:craft=basket maker
     craft=beekeeper: RU:Tag:craft=beekeeper
     craft=blacksmith: RU:Tag:craft=blacksmith
@@ -14886,33 +22200,77 @@ ru:
     craft=carpet_layer: RU:Tag:craft=carpet layer
     craft=caterer: RU:Tag:craft=caterer
     craft=clockmaker: RU:Tag:craft=clockmaker
+    craft=distillery: RU:Tag:craft=distillery
     craft=dressmaker: RU:Tag:craft=dressmaker
     craft=electrician: RU:Tag:craft=electrician
     craft=glaziery: RU:Tag:craft=glaziery
     craft=handicraft: RU:Tag:craft=handicraft
+    craft=hvac: RU:Tag:craft=hvac
     craft=key_cutter: RU:Tag:craft=key cutter
     craft=photographer: RU:Tag:craft=photographer
+    craft=roofer: RU:Tag:craft=roofer
     craft=shoemaker: RU:Tag:craft=shoemaker
     craft=stonemason: RU:Tag:craft=stonemason
     craft=tailor: RU:Tag:craft=tailor
     craft=window_construction: RU:Tag:craft=window construction
+    craft=winery: RU:Tag:craft=winery
     crop=grape: RU:Tag:crop=grape
     crop=hop: RU:Tag:crop=hop
+    cycleway:left=lane: RU:Tag:cycleway:left=lane
+    cycleway:left=share_busway: RU:Tag:cycleway:left=share busway
+    cycleway:right=lane: RU:Tag:cycleway:right=lane
+    cycleway:right=share_busway: RU:Tag:cycleway:right=share busway
+    cycleway=opposite_lane: RU:Tag:cycleway=opposite lane
+    cycleway=share_busway: RU:Tag:cycleway=share busway
+    dog=leashed: RU:Tag:dog=leashed
+    dog=no: RU:Tag:dog=no
+    dog=unleashed: RU:Tag:dog=unleashed
+    dog=yes: RU:Tag:dog=yes
     emergency=ambulance_station: RU:Tag:emergency=ambulance station
     emergency=fire_extinguisher: RU:Tag:emergency=fire extinguisher
     emergency=fire_hose: RU:Tag:emergency=fire hose
     emergency=fire_hydrant: RU:Tag:emergency=fire hydrant
     emergency=fire_water_pond: RU:Tag:emergency=fire water pond
+    emergency=phone: RU:Tag:emergency=phone
+    emergency=suction_point: RU:Tag:emergency=suction point
     emergency=water_tank: RU:Tag:emergency=water tank
+    entrance=garage: RU:Tag:entrance=garage
     entrance=staircase: RU:Tag:entrance=staircase
     fast_food=cafeteria: RU:Tag:fast food=cafeteria
     foot=designated: RU:Tag:foot=designated
+    foot=yes: RU:Tag:foot=yes
+    footway=access_aisle: RU:Tag:footway=access aisle
     footway=crossing: RU:Tag:footway=crossing
     footway=sidewalk: RU:Tag:footway=sidewalk
+    footway=traffic_island: RU:Tag:footway=traffic island
+    ford=yes: RU:Tag:ford=yes
     generator:method=anaerobic_digestion: RU:Tag:generator:method=anaerobic digestion
+    generator:source=hydro: RU:Tag:generator:source=hydro
     generator:type=boiler: RU:Tag:generator:type=boiler
     geological=palaeontological_site: RU:Tag:geological=palaeontological site
+    government=administrative: RU:Tag:government=administrative
+    government=aerospace: RU:Tag:government=aerospace
+    government=audit: RU:Tag:government=audit
+    government=bailiff: RU:Tag:government=bailiff
+    government=border_control: RU:Tag:government=border control
+    government=cadaster: RU:Tag:government=cadaster
+    government=customs: RU:Tag:government=customs
+    government=education: RU:Tag:government=education
+    government=healthcare: RU:Tag:government=healthcare
+    government=it: RU:Tag:government=it
+    government=legislative: RU:Tag:government=legislative
+    government=ministry: RU:Tag:government=ministry
+    government=parliament: RU:Tag:government=parliament
+    government=prosecutor: RU:Tag:government=prosecutor
+    government=register_office: RU:Tag:government=register office
+    government=social_security: RU:Tag:government=social security
+    government=statistics: RU:Tag:government=statistics
+    government=tax: RU:Tag:government=tax
+    government=youth_welfare_department: RU:Tag:government=youth welfare department
     healthcare=blood_donation: RU:Tag:healthcare=blood donation
+    healthcare=doctor: RU:Tag:healthcare=doctor
+    healthcare=laboratory: RU:Tag:healthcare=laboratory
+    healthcare=sample_collection: RU:Tag:healthcare=sample collection
     highway=bridleway: RU:Tag:highway=bridleway
     highway=bus_guideway: RU:Tag:highway=bus guideway
     highway=bus_stop: RU:Tag:highway=bus stop
@@ -14921,6 +22279,8 @@ ru:
     highway=cycleway: RU:Tag:highway=cycleway
     highway=elevator: RU:Tag:highway=elevator
     highway=emergency_access_point: RU:Tag:highway=emergency access point
+    highway=emergency_bay: RU:Tag:highway=emergency bay
+    highway=escape: RU:Tag:highway=escape
     highway=footway: RU:Tag:highway=footway
     highway=ford: RU:Tag:highway=ford
     highway=give_way: RU:Tag:highway=give way
@@ -14936,6 +22296,7 @@ ru:
     highway=platform: RU:Tag:highway=platform
     highway=primary: RU:Tag:highway=primary
     highway=primary_link: RU:Tag:highway=primary link
+    highway=proposed: RU:Tag:highway=proposed
     highway=raceway: RU:Tag:highway=raceway
     highway=residential: RU:Tag:highway=residential
     highway=rest_area: RU:Tag:highway=rest area
@@ -14947,8 +22308,10 @@ ru:
     highway=speed_camera: RU:Tag:highway=speed camera
     highway=steps: RU:Tag:highway=steps
     highway=stop: RU:Tag:highway=stop
+    highway=street_lamp: RU:Tag:highway=street lamp
     highway=tertiary: RU:Tag:highway=tertiary
     highway=tertiary_link: RU:Tag:highway=tertiary link
+    highway=toll_gantry: RU:Tag:highway=toll gantry
     highway=track: RU:Tag:highway=track
     highway=traffic_signals: RU:Tag:highway=traffic signals
     highway=trunk: RU:Tag:highway=trunk
@@ -14956,31 +22319,58 @@ ru:
     highway=turning_circle: RU:Tag:highway=turning circle
     highway=unclassified: RU:Tag:highway=unclassified
     historic=aircraft: RU:Tag:historic=aircraft
+    historic=aqueduct: RU:Tag:historic=aqueduct
     historic=archaeological_site: RU:Tag:historic=archaeological site
     historic=battlefield: RU:Tag:historic=battlefield
     historic=boundary_stone: RU:Tag:historic=boundary stone
     historic=cannon: RU:Tag:historic=cannon
     historic=castle: RU:Tag:historic=castle
+    historic=castle_wall: RU:Tag:historic=castle wall
     historic=city_gate: RU:Tag:historic=city gate
     historic=citywalls: RU:Tag:historic=citywalls
+    historic=farm: RU:Tag:historic=farm
     historic=fort: RU:Tag:historic=fort
+    historic=gallows: RU:Tag:historic=gallows
+    historic=heritage: RU:Tag:historic=heritage
+    historic=highwater_mark: RU:Tag:historic=highwater mark
+    historic=house: RU:Tag:historic=house
     historic=locomotive: RU:Tag:historic=locomotive
+    historic=manor: RU:Tag:historic=manor
     historic=memorial: RU:Tag:historic=memorial
     historic=milestone: RU:Tag:historic=milestone
+    historic=mine: RU:Tag:historic=mine
+    historic=monastery: RU:Tag:historic=monastery
     historic=monument: RU:Tag:historic=monument
+    historic=optical_telegraph: RU:Tag:historic=optical telegraph
+    historic=pa: RU:Tag:historic=pa
+    historic=pillory: RU:Tag:historic=pillory
     historic=ruins: RU:Tag:historic=ruins
     historic=rune_stone: RU:Tag:historic=rune stone
     historic=ship: RU:Tag:historic=ship
+    historic=stone: RU:Tag:historic=stone
+    historic=tank: RU:Tag:historic=tank
+    historic=tomb: RU:Tag:historic=tomb
     historic=tree_shrine: RU:Tag:historic=tree shrine
     historic=wayside_cross: RU:Tag:historic=wayside cross
     historic=wayside_shrine: RU:Tag:historic=wayside shrine
     historic=wreck: RU:Tag:historic=wreck
     horse=designated: RU:Tag:horse=designated
+    horse=dismount: RU:Tag:horse=dismount
+    industrial=factory: RU:Tag:industrial=factory
+    industrial=warehouse: RU:Tag:industrial=warehouse
     industrial=well_cluster: RU:Tag:industrial=well cluster
+    information=audioguide: RU:Tag:information=audioguide
     information=board: RU:Tag:information=board
     information=guidepost: RU:Tag:information=guidepost
+    information=map: RU:Tag:information=map
+    information=office: RU:Tag:information=office
+    information=tactile_map: RU:Tag:information=tactile map
+    information=tactile_model: RU:Tag:information=tactile model
+    information=terminal: RU:Tag:information=terminal
+    information=visitor_centre: RU:Tag:information=visitor centre
     junction=roundabout: RU:Tag:junction=roundabout
     landuse=allotments: RU:Tag:landuse=allotments
+    landuse=animal_keeping: RU:Tag:landuse=animal keeping
     landuse=basin: RU:Tag:landuse=basin
     landuse=brownfield: RU:Tag:landuse=brownfield
     landuse=cemetery: RU:Tag:landuse=cemetery
@@ -14988,12 +22378,14 @@ ru:
     landuse=construction: RU:Tag:landuse=construction
     landuse=depot: RU:Tag:landuse=depot
     landuse=farm: RU:Tag:landuse=farm
+    landuse=farmland: RU:Tag:landuse=farmland
     landuse=flowerbed: RU:Tag:landuse=flowerbed
     landuse=forest: RU:Tag:landuse=forest
     landuse=garages: RU:Tag:landuse=garages
     landuse=grass: RU:Tag:landuse=grass
     landuse=greenhouse_horticulture: RU:Tag:landuse=greenhouse horticulture
     landuse=industrial: RU:Tag:landuse=industrial
+    landuse=institutional: RU:Tag:landuse=institutional
     landuse=landfill: RU:Tag:landuse=landfill
     landuse=logging: RU:Tag:landuse=logging
     landuse=meadow: RU:Tag:landuse=meadow
@@ -15010,6 +22402,7 @@ ru:
     landuse=residential: RU:Tag:landuse=residential
     landuse=retail: RU:Tag:landuse=retail
     landuse=salt_pond: RU:Tag:landuse=salt pond
+    landuse=turbary: RU:Tag:landuse=turbary
     landuse=village_green: RU:Tag:landuse=village green
     landuse=vineyard: RU:Tag:landuse=vineyard
     leaf_cycle=deciduous: RU:Tag:leaf cycle=deciduous
@@ -15019,13 +22412,20 @@ ru:
     leaf_type=leafless: RU:Tag:leaf type=leafless
     leaf_type=mixed: RU:Tag:leaf type=mixed
     leaf_type=needleleaved: RU:Tag:leaf type=needleleaved
+    leisure=bandstand: RU:Tag:leisure=bandstand
     leisure=beach_resort: RU:Tag:leisure=beach resort
+    leisure=bird_hide: RU:Tag:leisure=bird hide
     leisure=common: RU:Tag:leisure=common
     leisure=dance: RU:Tag:leisure=dance
+    leisure=dog_park: RU:Tag:leisure=dog park
     leisure=escape_game: RU:Tag:leisure=escape game
     leisure=firepit: RU:Tag:leisure=firepit
+    leisure=fishing: RU:Tag:leisure=fishing
     leisure=fitness_centre: RU:Tag:leisure=fitness centre
+    leisure=fitness_station: RU:Tag:leisure=fitness station
+    leisure=garden: RU:Tag:leisure=garden
     leisure=hackerspace: RU:Tag:leisure=hackerspace
+    leisure=horse_riding: RU:Tag:leisure=horse riding
     leisure=ice_rink: RU:Tag:leisure=ice rink
     leisure=marina: RU:Tag:leisure=marina
     leisure=miniature_golf: RU:Tag:leisure=miniature golf
@@ -15033,52 +22433,88 @@ ru:
     leisure=pitch: RU:Tag:leisure=pitch
     leisure=playground: RU:Tag:leisure=playground
     leisure=resort: RU:Tag:leisure=resort
+    leisure=slipway: RU:Tag:leisure=slipway
     leisure=sports_centre: RU:Tag:leisure=sports centre
+    leisure=sports_hall: RU:Tag:leisure=sports hall
     leisure=stadium: RU:Tag:leisure=stadium
     leisure=summer_camp: RU:Tag:leisure=summer camp
     leisure=swimming_pool: RU:Tag:leisure=swimming pool
     leisure=track: RU:Tag:leisure=track
     leisure=water_park: RU:Tag:leisure=water park
+    leisure=wildlife_hide: RU:Tag:leisure=wildlife hide
+    location=overground: RU:Tag:location=overground
+    location=overhead: RU:Tag:location=overhead
+    location=underground: RU:Tag:location=underground
+    location=underwater: RU:Tag:location=underwater
     man_made=adit: RU:Tag:man made=adit
+    man_made=animal_trap: RU:Tag:man made=animal trap
+    man_made=architecture_line: RU:Tag:man made=architecture line
     man_made=beacon: RU:Tag:man made=beacon
+    man_made=beehive: RU:Tag:man made=beehive
     man_made=breakwater: RU:Tag:man made=breakwater
     man_made=bridge: RU:Tag:man made=bridge
     man_made=bunker_silo: RU:Tag:man made=bunker silo
     man_made=campanile: RU:Tag:man made=campanile
+    man_made=carpet_hanger: RU:Tag:man made=carpet hanger
+    man_made=chiller: RU:Tag:man made=chiller
+    man_made=chimney: RU:Tag:man made=chimney
     man_made=clearcut: RU:Tag:man made=clearcut
     man_made=communications_tower: RU:Tag:man made=communications tower
+    man_made=cooling_tower: RU:Tag:man made=cooling tower
     man_made=crane: RU:Tag:man made=crane
+    man_made=cross: RU:Tag:man made=cross
     man_made=cutline: RU:Tag:man made=cutline
     man_made=dovecote: RU:Tag:man made=dovecote
     man_made=dyke: RU:Tag:man made=dyke
     man_made=embankment: RU:Tag:man made=embankment
+    man_made=flagpole: RU:Tag:man made=flagpole
+    man_made=flare: RU:Tag:man made=flare
+    man_made=geoglyph: RU:Tag:man made=geoglyph
+    man_made=guard_stone: RU:Tag:man made=guard stone
     man_made=lighthouse: RU:Tag:man made=lighthouse
     man_made=mast: RU:Tag:man made=mast
     man_made=mineshaft: RU:Tag:man made=mineshaft
     man_made=monitoring_station: RU:Tag:man made=monitoring station
+    man_made=mounting_block: RU:Tag:man made=mounting block
+    man_made=nesting_site: RU:Tag:man made=nesting site
     man_made=obelisk: RU:Tag:man made=obelisk
     man_made=observatory: RU:Tag:man made=observatory
     man_made=petroleum_well: RU:Tag:man made=petroleum well
     man_made=pier: RU:Tag:man made=pier
     man_made=pillar: RU:Tag:man made=pillar
     man_made=pipeline: RU:Tag:man made=pipeline
+    man_made=pumping_station: RU:Tag:man made=pumping station
     man_made=reservoir_covered: RU:Tag:man made=reservoir covered
+    man_made=silo: RU:Tag:man made=silo
+    man_made=spoil_heap: RU:Tag:man made=spoil heap
     man_made=storage_tank: RU:Tag:man made=storage tank
+    man_made=street_cabinet: RU:Tag:man made=street cabinet
     man_made=surveillance: RU:Tag:man made=surveillance
     man_made=survey_point: RU:Tag:man made=survey point
     man_made=telescope: RU:Tag:man made=telescope
     man_made=tower: RU:Tag:man made=tower
     man_made=wastewater_plant: RU:Tag:man made=wastewater plant
+    man_made=water_tap: RU:Tag:man made=water tap
     man_made=water_tower: RU:Tag:man made=water tower
     man_made=water_well: RU:Tag:man made=water well
     man_made=water_works: RU:Tag:man made=water works
     man_made=watermill: RU:Tag:man made=watermill
     man_made=wildlife_crossing: RU:Tag:man made=wildlife crossing
+    man_made=wildlife_opening: RU:Tag:man made=wildlife opening
     man_made=windmill: RU:Tag:man made=windmill
     man_made=works: RU:Tag:man made=works
+    manhole=drain: RU:Tag:manhole=drain
+    maxweight:signed=no: RU:Tag:maxweight:signed=no
+    memorial=ghost_bike: RU:Tag:memorial=ghost bike
+    memorial=stele: RU:Tag:memorial=stele
+    microbrewery=yes: RU:Tag:microbrewery=yes
     military=airfield: RU:Tag:military=airfield
+    military=barracks: RU:Tag:military=barracks
     military=bunker: RU:Tag:military=bunker
+    military=checkpoint: RU:Tag:military=checkpoint
     military=naval_base: RU:Tag:military=naval base
+    military=training_area: RU:Tag:military=training area
+    name=Продукты: RU:Tag:name=Продукты
     natural=arete: RU:Tag:natural=arete
     natural=bare_rock: RU:Tag:natural=bare rock
     natural=beach: RU:Tag:natural=beach
@@ -15088,10 +22524,12 @@ ru:
     natural=desert: RU:Tag:natural=desert
     natural=earth_bank: RU:Tag:natural=earth bank
     natural=fell: RU:Tag:natural=fell
+    natural=geyser: RU:Tag:natural=geyser
     natural=glacier: RU:Tag:natural=glacier
     natural=grassland: RU:Tag:natural=grassland
     natural=gully: RU:Tag:natural=gully
     natural=heath: RU:Tag:natural=heath
+    natural=hot_spring: RU:Tag:natural=hot spring
     natural=mud: RU:Tag:natural=mud
     natural=peak: RU:Tag:natural=peak
     natural=ridge: RU:Tag:natural=ridge
@@ -15102,6 +22540,7 @@ ru:
     natural=shingle: RU:Tag:natural=shingle
     natural=sinkhole: RU:Tag:natural=sinkhole
     natural=spring: RU:Tag:natural=spring
+    natural=stone: RU:Tag:natural=stone
     natural=tree: RU:Tag:natural=tree
     natural=tree_row: RU:Tag:natural=tree row
     natural=valley: RU:Tag:natural=valley
@@ -15109,30 +22548,89 @@ ru:
     natural=water: RU:Tag:natural=water
     natural=wetland: RU:Tag:natural=wetland
     natural=wood: RU:Tag:natural=wood
+    network=lhn: RU:Tag:network=lhn
+    network=rhn: RU:Tag:network=rhn
+    noname=yes: RU:Tag:noname=yes
     office=accountant: RU:Tag:office=accountant
     office=administrative: RU:Tag:office=administrative
+    office=adoption_agency: RU:Tag:office=adoption agency
+    office=advertising_agency: RU:Tag:office=advertising agency
     office=architect: RU:Tag:office=architect
+    office=archive: RU:Tag:office=archive
+    office=association: RU:Tag:office=association
+    office=bail_bond_agent: RU:Tag:office=bail bond agent
+    office=chamber: RU:Tag:office=chamber
+    office=charity: RU:Tag:office=charity
     office=company: RU:Tag:office=company
+    office=consulting: RU:Tag:office=consulting
+    office=courier: RU:Tag:office=courier
+    office=coworking: RU:Tag:office=coworking
+    office=diplomatic: RU:Tag:office=diplomatic
     office=educational_institution: RU:Tag:office=educational institution
     office=employment_agency: RU:Tag:office=employment agency
+    office=energy_supplier: RU:Tag:office=energy supplier
+    office=engineer: RU:Tag:office=engineer
     office=estate_agent: RU:Tag:office=estate agent
+    office=financial: RU:Tag:office=financial
+    office=financial_advisor: RU:Tag:office=financial advisor
+    office=forestry: RU:Tag:office=forestry
+    office=foundation: RU:Tag:office=foundation
+    office=geodesist: RU:Tag:office=geodesist
     office=government: RU:Tag:office=government
+    office=graphic_design: RU:Tag:office=graphic design
+    office=guide: RU:Tag:office=guide
+    office=harbour_master: RU:Tag:office=harbour master
+    office=healthcare: RU:Tag:office=healthcare
     office=insurance: RU:Tag:office=insurance
+    office=international_organization: RU:Tag:office=international organization
     office=it: RU:Tag:office=it
     office=lawyer: RU:Tag:office=lawyer
     office=logistics: RU:Tag:office=logistics
+    office=medical: RU:Tag:office=medical
+    office=moving_company: RU:Tag:office=moving company
     office=newspaper: RU:Tag:office=newspaper
     office=ngo: RU:Tag:office=ngo
+    office=notary: RU:Tag:office=notary
+    office=occupational_safety: RU:Tag:office=occupational safety
+    office=parish: RU:Tag:office=parish
     office=political_party: RU:Tag:office=political party
+    office=private_investigator: RU:Tag:office=private investigator
+    office=property_management: RU:Tag:office=property management
+    office=publisher: RU:Tag:office=publisher
+    office=quango: RU:Tag:office=quango
+    office=real_estate_agent: RU:Tag:office=real estate agent
+    office=register: RU:Tag:office=register
+    office=religion: RU:Tag:office=religion
     office=research: RU:Tag:office=research
+    office=security: RU:Tag:office=security
+    office=supervised_injection_site: RU:Tag:office=supervised injection site
+    office=surveyor: RU:Tag:office=surveyor
+    office=tax: RU:Tag:office=tax
+    office=tax_advisor: RU:Tag:office=tax advisor
     office=telecommunication: RU:Tag:office=telecommunication
+    office=therapist: RU:Tag:office=therapist
+    office=tourist_accommodation: RU:Tag:office=tourist accommodation
     office=travel_agent: RU:Tag:office=travel agent
+    office=tutoring: RU:Tag:office=tutoring
+    office=union: RU:Tag:office=union
+    office=university: RU:Tag:office=university
+    office=visa: RU:Tag:office=visa
+    office=water_utility: RU:Tag:office=water utility
+    office=yes: RU:Tag:office=yes
+    oneway:moped=no: RU:Tag:oneway:moped=no
     opening_hours=24/7: RU:Tag:opening hours=24/7
     overtaking=backward: RU:Tag:overtaking=backward
     overtaking=both: RU:Tag:overtaking=both
     overtaking=forward: RU:Tag:overtaking=forward
     overtaking=no: RU:Tag:overtaking=no
     overtaking=yes: RU:Tag:overtaking=yes
+    parking:orientation=perpendicular: RU:Tag:parking:orientation=perpendicular
+    parking=lane: RU:Tag:parking=lane
+    parking=layby: RU:Tag:parking=layby
+    parking=multi-storey: RU:Tag:parking=multi-storey
+    parking=street_side: RU:Tag:parking=street side
+    parking=surface: RU:Tag:parking=surface
+    parking=underground: RU:Tag:parking=underground
     pipeline=marker: RU:Tag:pipeline=marker
     pipeline=substation: RU:Tag:pipeline=substation
     place=allotments: RU:Tag:place=allotments
@@ -15149,6 +22647,10 @@ ru:
     place=suburb: RU:Tag:place=suburb
     place=town: RU:Tag:place=town
     place=village: RU:Tag:place=village
+    playground=slide: RU:Tag:playground=slide
+    playground=structure: RU:Tag:playground=structure
+    police=barracks: RU:Tag:police=barracks
+    power=compensator: RU:Tag:power=compensator
     power=generator: RU:Tag:power=generator
     power=heliostat: RU:Tag:power=heliostat
     power=line: RU:Tag:power=line
@@ -15166,7 +22668,9 @@ ru:
     pump=powered: RU:Tag:pump=powered
     railway=abandoned: RU:Tag:railway=abandoned
     railway=crossing: RU:Tag:railway=crossing
+    railway=disused: RU:Tag:railway=disused
     railway=level_crossing: RU:Tag:railway=level crossing
+    railway=light_rail: RU:Tag:railway=light rail
     railway=miniature: RU:Tag:railway=miniature
     railway=narrow_gauge: RU:Tag:railway=narrow gauge
     railway=preserved: RU:Tag:railway=preserved
@@ -15180,11 +22684,18 @@ ru:
     railway=turntable: RU:Tag:railway=turntable
     religion=pagan: RU:Tag:religion=pagan
     religion=zoroastrian: RU:Tag:religion=zoroastrian
+    request_stop=yes: RU:Tag:request stop=yes
+    residential=apartments: RU:Tag:residential=apartments
+    residential=rural: RU:Tag:residential=rural
+    residential=urban: RU:Tag:residential=urban
     route=bus: RU:Tag:route=bus
     route=ferry: RU:Tag:route=ferry
+    route=horse: RU:Tag:route=horse
     route=railway: RU:Tag:route=railway
+    route=share_taxi: RU:Tag:route=share taxi
     route=train: RU:Tag:route=train
     route=tram: RU:Tag:route=tram
+    route=transhumance: RU:Tag:route=transhumance
     service=alley: RU:Tag:service=alley
     service=crossover: RU:Tag:service=crossover
     service=dealer: RU:Tag:service=dealer
@@ -15194,7 +22705,11 @@ ru:
     service=parts: RU:Tag:service=parts
     service=repair: RU:Tag:service=repair
     service=tyres: RU:Tag:service=tyres
+    shelter_type=basic_hut: RU:Tag:shelter type=basic hut
+    shelter_type=field_shelter: RU:Tag:shelter type=field shelter
+    shelter_type=lean_to: RU:Tag:shelter type=lean to
     shelter_type=public_transport: RU:Tag:shelter type=public transport
+    shop=3d_printing: RU:Tag:shop=3d printing
     shop=agrarian: RU:Tag:shop=agrarian
     shop=alcohol: RU:Tag:shop=alcohol
     shop=anime: RU:Tag:shop=anime
@@ -15208,8 +22723,10 @@ ru:
     shop=bed: RU:Tag:shop=bed
     shop=beverages: RU:Tag:shop=beverages
     shop=bicycle: RU:Tag:shop=bicycle
+    shop=boat: RU:Tag:shop=boat
     shop=books: RU:Tag:shop=books
     shop=boutique: RU:Tag:shop=boutique
+    shop=brewing_supplies: RU:Tag:shop=brewing supplies
     shop=butcher: RU:Tag:shop=butcher
     shop=car: RU:Tag:shop=car
     shop=car_parts: RU:Tag:shop=car parts
@@ -15239,8 +22756,10 @@ ru:
     shop=fabrics: RU:Tag:shop=fabrics
     shop=farm: RU:Tag:shop=farm
     shop=fashion: RU:Tag:shop=fashion
+    shop=fireplace: RU:Tag:shop=fireplace
     shop=fishing: RU:Tag:shop=fishing
     shop=fishmonger: RU:Tag:shop=fishmonger
+    shop=flooring: RU:Tag:shop=flooring
     shop=florist: RU:Tag:shop=florist
     shop=frame: RU:Tag:shop=frame
     shop=funeral_directors: RU:Tag:shop=funeral directors
@@ -15257,9 +22776,12 @@ ru:
     shop=hearing_aids: RU:Tag:shop=hearing aids
     shop=herbalist: RU:Tag:shop=herbalist
     shop=hifi: RU:Tag:shop=hifi
+    shop=household_linen: RU:Tag:shop=household linen
     shop=houseware: RU:Tag:shop=houseware
     shop=hunting: RU:Tag:shop=hunting
+    shop=hvac: RU:Tag:shop=hvac
     shop=interior_decoration: RU:Tag:shop=interior decoration
+    shop=jetski: RU:Tag:shop=jetski
     shop=jewelry: RU:Tag:shop=jewelry
     shop=kiosk: RU:Tag:shop=kiosk
     shop=kitchen: RU:Tag:shop=kitchen
@@ -15277,16 +22799,24 @@ ru:
     shop=optician: RU:Tag:shop=optician
     shop=organic: RU:Tag:shop=organic
     shop=outdoor: RU:Tag:shop=outdoor
+    shop=outpost: RU:Tag:shop=outpost
     shop=paint: RU:Tag:shop=paint
+    shop=pastry: RU:Tag:shop=pastry
     shop=pawnbroker: RU:Tag:shop=pawnbroker
     shop=pet: RU:Tag:shop=pet
+    shop=pet_grooming: RU:Tag:shop=pet grooming
+    shop=photo: RU:Tag:shop=photo
     shop=power_tools: RU:Tag:shop=power tools
+    shop=pyrotechnics: RU:Tag:shop=pyrotechnics
     shop=radiotechnics: RU:Tag:shop=radiotechnics
     shop=religion: RU:Tag:shop=religion
+    shop=rental: RU:Tag:shop=rental
     shop=seafood: RU:Tag:shop=seafood
     shop=second_hand: RU:Tag:shop=second hand
+    shop=security: RU:Tag:shop=security
     shop=ship_chandler: RU:Tag:shop=ship chandler
     shop=shoes: RU:Tag:shop=shoes
+    shop=spices: RU:Tag:shop=spices
     shop=sports: RU:Tag:shop=sports
     shop=stationery: RU:Tag:shop=stationery
     shop=supermarket: RU:Tag:shop=supermarket
@@ -15302,20 +22832,36 @@ ru:
     shop=vacuum_cleaner: RU:Tag:shop=vacuum cleaner
     shop=variety_store: RU:Tag:shop=variety store
     shop=video: RU:Tag:shop=video
+    shop=video_games: RU:Tag:shop=video games
     shop=watches: RU:Tag:shop=watches
     shop=wholesale: RU:Tag:shop=wholesale
     shop=window_blind: RU:Tag:shop=window blind
+    shop=wine: RU:Tag:shop=wine
+    shop=winery: RU:Tag:shop=winery
+    signpost=forestry_compartment: RU:Tag:signpost=forestry compartment
+    sinkhole=bluehole: RU:Tag:sinkhole=bluehole
+    site_type=fortification: RU:Tag:site type=fortification
     social_facility=group_home: RU:Tag:social facility=group home
     sport=archery: RU:Tag:sport=archery
+    sport=dog_racing: RU:Tag:sport=dog racing
+    sport=equestrian: RU:Tag:sport=equestrian
+    sport=futsal: RU:Tag:sport=futsal
+    sport=horse_racing: RU:Tag:sport=horse racing
     sport=motocross: RU:Tag:sport=motocross
     sport=motor: RU:Tag:sport=motor
     sport=scuba_diving: RU:Tag:sport=scuba diving
     sport=shooting: RU:Tag:sport=shooting
+    summit:cross=yes: RU:Tag:summit:cross=yes
     tank_trap=czech_hedgehog: RU:Tag:tank trap=czech hedgehog
+    tomb=cenotaph: RU:Tag:tomb=cenotaph
+    tomb=war_grave: RU:Tag:tomb=war grave
     tourism=apartment: RU:Tag:tourism=apartment
+    tourism=aquarium: RU:Tag:tourism=aquarium
     tourism=artwork: RU:Tag:tourism=artwork
     tourism=attraction: RU:Tag:tourism=attraction
+    tourism=camp_pitch: RU:Tag:tourism=camp pitch
     tourism=camp_site: RU:Tag:tourism=camp site
+    tourism=caravan_site: RU:Tag:tourism=caravan site
     tourism=chalet: RU:Tag:tourism=chalet
     tourism=gallery: RU:Tag:tourism=gallery
     tourism=guest_house: RU:Tag:tourism=guest house
@@ -15326,10 +22872,48 @@ ru:
     tourism=museum: RU:Tag:tourism=museum
     tourism=picnic_site: RU:Tag:tourism=picnic site
     tourism=theme_park: RU:Tag:tourism=theme park
+    tourism=trail_riding_rest: RU:Tag:tourism=trail riding rest
+    tourism=trail_riding_station: RU:Tag:tourism=trail riding station
     tourism=viewpoint: RU:Tag:tourism=viewpoint
+    tourism=wilderness_hut: RU:Tag:tourism=wilderness hut
+    tourism=yes: RU:Tag:tourism=yes
+    tourism=zoo: RU:Tag:tourism=zoo
     tower:type=bell_tower: RU:Tag:tower:type=bell tower
+    tower:type=cooling: RU:Tag:tower:type=cooling
+    tower:type=lighting: RU:Tag:tower:type=lighting
+    trade=wood: RU:Tag:trade=wood
+    traffic_calming=hump: RU:Tag:traffic calming=hump
+    traffic_calming=table: RU:Tag:traffic calming=table
+    traffic_sign=city_limit: RU:Tag:traffic sign=city limit
+    tunnel=building_passage: RU:Tag:tunnel=building passage
     tunnel=culvert: RU:Tag:tunnel=culvert
     type=site: RU:Tag:type=site
+    type=waterway: RU:Tag:type=waterway
+    vending=excrement_bags: RU:Tag:vending=excrement bags
+    vending=parcel_pickup: RU:Tag:vending=parcel pickup
+    vending=parking_tickets: RU:Tag:vending=parking tickets
+    water=basin: RU:Tag:water=basin
+    water=canal: RU:Tag:water=canal
+    water=ditch: RU:Tag:water=ditch
+    water=drain: RU:Tag:water=drain
+    water=fish_pass: RU:Tag:water=fish pass
+    water=intermittent: RU:Tag:water=intermittent
+    water=lagoon: RU:Tag:water=lagoon
+    water=lake: RU:Tag:water=lake
+    water=lock: RU:Tag:water=lock
+    water=moat: RU:Tag:water=moat
+    water=oxbow: RU:Tag:water=oxbow
+    water=pond: RU:Tag:water=pond
+    water=rapids: RU:Tag:water=rapids
+    water=reflecting_pool: RU:Tag:water=reflecting pool
+    water=reservoir: RU:Tag:water=reservoir
+    water=river: RU:Tag:water=river
+    water=stream: RU:Tag:water=stream
+    water=stream_pool: RU:Tag:water=stream pool
+    water=tidal: RU:Tag:water=tidal
+    water=wastewater: RU:Tag:water=wastewater
+    water_source=main: RU:Tag:water source=main
+    water_source=river: RU:Tag:water source=river
     waterway=boatyard: RU:Tag:waterway=boatyard
     waterway=brook: RU:Tag:waterway=brook
     waterway=canal: RU:Tag:waterway=canal
@@ -15338,24 +22922,34 @@ ru:
     waterway=dock: RU:Tag:waterway=dock
     waterway=drain: RU:Tag:waterway=drain
     waterway=drystream: RU:Tag:waterway=drystream
+    waterway=fish_pass: RU:Tag:waterway=fish pass
     waterway=lock_gate: RU:Tag:waterway=lock gate
     waterway=rapids: RU:Tag:waterway=rapids
     waterway=river: RU:Tag:waterway=river
     waterway=riverbank: RU:Tag:waterway=riverbank
     waterway=stream: RU:Tag:waterway=stream
     waterway=turning_point: RU:Tag:waterway=turning point
+    waterway=waterfall: RU:Tag:waterway=waterfall
     waterway=weir: RU:Tag:waterway=weir
     wood=coniferous: RU:Tag:wood=coniferous
     wood=mixed: RU:Tag:wood=mixed
+    zoo=enclosure: RU:Tag:zoo=enclosure
     zoo=petting_zoo: RU:Tag:zoo=petting zoo
+    zoo=reptile: RU:Tag:zoo=reptile
+    zoo=safari_park: RU:Tag:zoo=safari park
+    zoo=wildlife_park: RU:Tag:zoo=wildlife park
 sh:
   key:
+    addr: Sh:Key:addr
     tracktype: Sh:Key:tracktype
 sk:
   key:
     addr:conscriptionnumber: Sk:Key:addr:conscriptionnumber
     addr:streetnumber: Sk:Key:addr:streetnumber
     note: Sk:Key:note
+    ref:minvskaddress: Sk:Key:ref:minvskaddress
+  tag:
+    refitted=yes: Sk:Tag:refitted=yes
 sq:
   key:
     highway: Sq:Key:highway
@@ -15363,6 +22957,7 @@ sv:
   key:
     access: Sv:Key:access
     name: Sv:Key:name
+    ref:raa: Sv:Key:ref:raa
   tag:
     aerialway=cable_car: Sv:Tag:aerialway=cable car
     amenity=place_of_worship: Sv:Tag:amenity=place of worship
@@ -15375,6 +22970,10 @@ sv:
     leisure=dog_park: Sv:Tag:leisure=dog park
     leisure=fitness_station: Sv:Tag:leisure=fitness station
     railway=rail: Sv:Tag:railway=rail
+    sport=motocross: Sv:Tag:sport=motocross
+talk:
+  key:
+    real_fire: Talk:Key:real fire
 tr:
   key:
     amenity: Tr:Key:amenity
@@ -15382,14 +22981,16 @@ tr:
     highway: Tr:Key:highway
     historic: Tr:Key:historic
     leisure: Tr:Key:leisure
-    religion: Tr:Key:religion
     shop: Tr:Key:shop
     sport: Tr:Key:sport
   tag:
     amenity=brothel: Tr:Tag:amenity=brothel
     amenity=place_of_worship: Tr:Tag:amenity=place of worship
     amenity=school: Tr:Tag:amenity=school
+    boundary=administrative: Tr:Tag:boundary=administrative
     building=mosque: Tr:Tag:building=mosque
+    highway=motorway: Tr:Tag:highway=motorway
+    highway=trunk: Tr:Tag:highway=trunk
 uk:
   key:
     abutters: Uk:Key:abutters
@@ -15413,23 +23014,38 @@ uk:
     addr:state: Uk:Key:addr:state
     addr:street: Uk:Key:addr:street
     addr:unit: Uk:Key:addr:unit
+    admin_level: Uk:Key:admin level
+    aerialway: Uk:Key:aerialway
+    aerodrome:type: Uk:Key:aerodrome:type
+    aeroway: Uk:Key:aeroway
     alt_name: Uk:Key:alt name
     amenity: Uk:Key:amenity
     arcade: Uk:Key:arcade
     area: Uk:Key:area
     area:highway: Uk:Key:area:highway
+    artwork_type: Uk:Key:artwork type
+    automated: Uk:Key:automated
     backward: Uk:Key:backward
     barrier: Uk:Key:barrier
     bench: Uk:Key:bench
     bicycle: Uk:Key:bicycle
     bicycle_parking: Uk:Key:bicycle parking
+    border_type: Uk:Key:border type
     boundary: Uk:Key:boundary
     bridge: Uk:Key:bridge
     building: Uk:Key:building
+    building:levels: Uk:Key:building:levels
+    capital: Uk:Key:capital
     colonnade: Uk:Key:colonnade
+    comment: Uk:Key:comment
     covered: Uk:Key:covered
+    craft: Uk:Key:craft
+    crane:type: Uk:Key:crane:type
     crossing: Uk:Key:crossing
     cutting: Uk:Key:cutting
+    date: Uk:Key:date
+    denotation: Uk:Key:denotation
+    description: Uk:Key:description
     destination: Uk:Key:destination
     embankment: Uk:Key:embankment
     emergency: Uk:Key:emergency
@@ -15439,12 +23055,18 @@ uk:
     footway: Uk:Key:footway
     ford: Uk:Key:ford
     forward: Uk:Key:forward
+    government: Uk:Key:government
     height: Uk:Key:height
+    heritage: Uk:Key:heritage
     highway: Uk:Key:highway
     historic: Uk:Key:historic
+    iata: Uk:Key:iata
+    icao: Uk:Key:icao
+    informal: Uk:Key:informal
     inscription: Uk:Key:inscription
     inscription:url: Uk:Key:inscription:url
     int_name: Uk:Key:int name
+    isced:level: Uk:Key:isced:level
     landuse: Uk:Key:landuse
     lanes: Uk:Key:lanes
     layer: Uk:Key:layer
@@ -15465,10 +23087,12 @@ uk:
     name:fr: Uk:Key:name:fr
     name:ja: Uk:Key:name:ja
     name:lg: Uk:Key:name:lg
+    name:pronunciation: Uk:Key:name:pronunciation
     name:ru: Uk:Key:name:ru
     name:uk: Uk:Key:name:uk
     nat_name: Uk:Key:nat name
     natural: Uk:Key:natural
+    note: Uk:Key:note
     office: Uk:Key:office
     official_name: Uk:Key:official name
     official_name:ru: Uk:Key:official name:ru
@@ -15476,23 +23100,38 @@ uk:
     oneway: Uk:Key:oneway
     oneway:bicycle: Uk:Key:oneway:bicycle
     oneway:moped: Uk:Key:oneway:moped
+    opening_hours: Uk:Key:opening hours
+    opening_hours/Tutorial: Uk:Key:opening hours/Tutorial
+    operator: Uk:Key:operator
+    park_ride: Uk:Key:park ride
     place: Uk:Key:place
     playground: Uk:Key:playground
+    police: Uk:Key:police
+    population: Uk:Key:population
+    postal_code: Uk:Key:postal code
     power: Uk:Key:power
+    pump: Uk:Key:pump
     railway: Uk:Key:railway
     ref: Uk:Key:ref
     reference: Uk:Key:reference
     reg_name: Uk:Key:reg name
+    religion: Uk:Key:religion
+    residential: Uk:Key:residential
     right: Uk:Key:right
     route: Uk:Key:route
+    ruins: Uk:Key:ruins
     service: Uk:Key:service
+    service:bicycle:pump: Uk:Key:service:bicycle:pump
     shelter_type: Uk:Key:shelter type
+    shop: Uk:Key:shop
     short_name: Uk:Key:short name
     short_name:ru: Uk:Key:short name:ru
     sidewalk: Uk:Key:sidewalk
+    smoothness: Uk:Key:smoothness
     sorting_name: Uk:Key:sorting name
     source: Uk:Key:source
     source:addr: Uk:Key:source:addr
+    species:wikidata: Uk:Key:species:wikidata
     sport: Uk:Key:sport
     surface: Uk:Key:surface
     tracktype: Uk:Key:tracktype
@@ -15502,16 +23141,40 @@ uk:
     url: Uk:Key:url
     vehicle: Uk:Key:vehicle
     water: Uk:Key:water
+    water_source: Uk:Key:water source
     waterway: Uk:Key:waterway
     width: Uk:Key:width
+    wikidata: Uk:Key:wikidata
     wikipedia: Uk:Key:wikipedia
     wood: Uk:Key:wood
   tag:
+    admin_level=2: Uk:Tag:admin level=2
+    admin_level=4: Uk:Tag:admin level=4
+    admin_level=6: Uk:Tag:admin level=6
+    aerialway=cable_car: Uk:Tag:aerialway=cable car
+    aerialway=chair_lift: Uk:Tag:aerialway=chair lift
+    aerialway=gondola: Uk:Tag:aerialway=gondola
+    aeroway=aerodrome: Uk:Tag:aeroway=aerodrome
+    aeroway=gate: Uk:Tag:aeroway=gate
+    aeroway=helipad: Uk:Tag:aeroway=helipad
+    aeroway=heliport: Uk:Tag:aeroway=heliport
+    aeroway=runway: Uk:Tag:aeroway=runway
+    aeroway=terminal: Uk:Tag:aeroway=terminal
     amenity=atm: Uk:Tag:amenity=atm
+    amenity=bank: Uk:Tag:amenity=bank
     amenity=bench: Uk:Tag:amenity=bench
     amenity=bicycle_parking: Uk:Tag:amenity=bicycle parking
     amenity=bicycle_rental: Uk:Tag:amenity=bicycle rental
+    amenity=clinic: Uk:Tag:amenity=clinic
+    amenity=drinking_water: Uk:Tag:amenity=drinking water
+    amenity=fountain: Uk:Tag:amenity=fountain
     amenity=fuel: Uk:Tag:amenity=fuel
+    amenity=grave_yard: Uk:Tag:amenity=grave yard
+    amenity=hospital: Uk:Tag:amenity=hospital
+    amenity=kindergarten: Uk:Tag:amenity=kindergarten
+    amenity=kiosk: Uk:Tag:amenity=kiosk
+    amenity=park: Uk:Tag:amenity=park
+    amenity=parking: Uk:Tag:amenity=parking
     amenity=payment_terminal: Uk:Tag:amenity=payment terminal
     amenity=pharmacy: Uk:Tag:amenity=pharmacy
     amenity=place_of_worship: Uk:Tag:amenity=place of worship
@@ -15519,18 +23182,43 @@ uk:
     amenity=school: Uk:Tag:amenity=school
     amenity=shelter: Uk:Tag:amenity=shelter
     amenity=university: Uk:Tag:amenity=university
+    barrier=gate: Uk:Tag:barrier=gate
     barrier=retaining_wall: Uk:Tag:barrier=retaining wall
+    barrier=wicket_gate: Uk:Tag:barrier=wicket gate
+    boundary=administrative: Uk:Tag:boundary=administrative
+    boundary=historic: Uk:Tag:boundary=historic
+    boundary=postal_code: Uk:Tag:boundary=postal code
+    building=cabin: Uk:Tag:building=cabin
+    building=church: Uk:Tag:building=church
     building=commercial: Uk:Tag:building=commercial
+    building=hospital: Uk:Tag:building=hospital
+    craft=agricultural_engines: Uk:Tag:craft=agricultural engines
     craft=bookbinder: Uk:Tag:craft=bookbinder
     emergency=fire_hydrant: Uk:Tag:emergency=fire hydrant
     emergency=fire_water_pond: Uk:Tag:emergency=fire water pond
     emergency=suction_point: Uk:Tag:emergency=suction point
     emergency=water_tank: Uk:Tag:emergency=water tank
+    entrance=garage: Uk:Tag:entrance=garage
+    entrance=main: Uk:Tag:entrance=main
+    entrance=secondary: Uk:Tag:entrance=secondary
     entrance=staircase: Uk:Tag:entrance=staircase
+    entrance=yes: Uk:Tag:entrance=yes
     footway=crossing: Uk:Tag:footway=crossing
     footway=sidewalk: Uk:Tag:footway=sidewalk
+    generator:method=run-of-the-river: Uk:Tag:generator:method=run-of-the-river
+    generator:method=water-pumped-storage: Uk:Tag:generator:method=water-pumped-storage
+    generator:method=water-storage: Uk:Tag:generator:method=water-storage
+    generator:source=hydro: Uk:Tag:generator:source=hydro
+    government=legislative: Uk:Tag:government=legislative
+    government=ministry: Uk:Tag:government=ministry
+    government=prosecutor: Uk:Tag:government=prosecutor
+    government=tax: Uk:Tag:government=tax
     highway=bridleway: Uk:Tag:highway=bridleway
+    highway=bus_guideway: Uk:Tag:highway=bus guideway
+    highway=busway: Uk:Tag:highway=busway
+    highway=construction: Uk:Tag:highway=construction
     highway=cycleway: Uk:Tag:highway=cycleway
+    highway=escape: Uk:Tag:highway=escape
     highway=footway: Uk:Tag:highway=footway
     highway=ford: Uk:Tag:highway=ford
     highway=living_street: Uk:Tag:highway=living street
@@ -15540,6 +23228,7 @@ uk:
     highway=path: Uk:Tag:highway=path
     highway=pedestrian: Uk:Tag:highway=pedestrian
     highway=primary: Uk:Tag:highway=primary
+    highway=raceway: Uk:Tag:highway=raceway
     highway=residential: Uk:Tag:highway=residential
     highway=road: Uk:Tag:highway=road
     highway=secondary: Uk:Tag:highway=secondary
@@ -15550,24 +23239,45 @@ uk:
     highway=traffic_mirror: Uk:Tag:highway=traffic mirror
     highway=trunk: Uk:Tag:highway=trunk
     highway=unclassified: Uk:Tag:highway=unclassified
+    historic=aircraft: Uk:Tag:historic=aircraft
+    historic=cannon: Uk:Tag:historic=cannon
     historic=memorial: Uk:Tag:historic=memorial
     historic=monument: Uk:Tag:historic=monument
+    historic=ship: Uk:Tag:historic=ship
+    historic=tank: Uk:Tag:historic=tank
+    historic=vehicle: Uk:Tag:historic=vehicle
     historic=wayside_cross: Uk:Tag:historic=wayside cross
+    industrial=bakery: Uk:Tag:industrial=bakery
+    landuse=allotments: Uk:Tag:landuse=allotments
+    landuse=cemetery: Uk:Tag:landuse=cemetery
+    landuse=education: Uk:Tag:landuse=education
     landuse=flowerbed: Uk:Tag:landuse=flowerbed
     landuse=forest: Uk:Tag:landuse=forest
     landuse=hop_garden: Uk:Tag:landuse=hop garden
+    landuse=meadow: Uk:Tag:landuse=meadow
+    landuse=residential: Uk:Tag:landuse=residential
     landuse=village_green: Uk:Tag:landuse=village green
     leaf_cycle=evergreen: Uk:Tag:leaf cycle=evergreen
     leisure=common: Uk:Tag:leisure=common
+    man_made=cross: Uk:Tag:man made=cross
     man_made=embankment: Uk:Tag:man made=embankment
     man_made=pier: Uk:Tag:man made=pier
+    man_made=water_well: Uk:Tag:man made=water well
     natural=bare_rock: Uk:Tag:natural=bare rock
+    natural=birds_nest: Uk:Tag:natural=birds nest
+    natural=cliff: Uk:Tag:natural=cliff
+    natural=earth_bank: Uk:Tag:natural=earth bank
     natural=grassland: Uk:Tag:natural=grassland
+    natural=gully: Uk:Tag:natural=gully
+    natural=heath: Uk:Tag:natural=heath
+    natural=scree: Uk:Tag:natural=scree
     natural=scrub: Uk:Tag:natural=scrub
     natural=tree: Uk:Tag:natural=tree
     natural=tree_row: Uk:Tag:natural=tree row
+    natural=valley: Uk:Tag:natural=valley
     natural=water: Uk:Tag:natural=water
     natural=wood: Uk:Tag:natural=wood
+    noname=yes: Uk:Tag:noname=yes
     office=accountant: Uk:Tag:office=accountant
     office=architect: Uk:Tag:office=architect
     office=company: Uk:Tag:office=company
@@ -15580,13 +23290,47 @@ uk:
     office=newspaper: Uk:Tag:office=newspaper
     office=ngo: Uk:Tag:office=ngo
     office=quango: Uk:Tag:office=quango
+    office=real_estate_agent: Uk:Tag:office=real estate agent
     office=research: Uk:Tag:office=research
     office=telecommunication: Uk:Tag:office=telecommunication
     office=travel_agent: Uk:Tag:office=travel agent
+    place=archipelago: Uk:Tag:place=archipelago
+    place=borough: Uk:Tag:place=borough
+    place=city: Uk:Tag:place=city
+    place=city_block: Uk:Tag:place=city block
+    place=continent: Uk:Tag:place=continent
+    place=country: Uk:Tag:place=country
+    place=county: Uk:Tag:place=county
+    place=district: Uk:Tag:place=district
+    place=farm: Uk:Tag:place=farm
+    place=hamlet: Uk:Tag:place=hamlet
+    place=island: Uk:Tag:place=island
+    place=islet: Uk:Tag:place=islet
+    place=isolated_dwelling: Uk:Tag:place=isolated dwelling
+    place=locality: Uk:Tag:place=locality
+    place=municipality: Uk:Tag:place=municipality
+    place=neighbourhood: Uk:Tag:place=neighbourhood
+    place=ocean: Uk:Tag:place=ocean
+    place=plot: Uk:Tag:place=plot
+    place=province: Uk:Tag:place=province
+    place=quarter: Uk:Tag:place=quarter
+    place=region: Uk:Tag:place=region
+    place=sea: Uk:Tag:place=sea
+    place=square: Uk:Tag:place=square
+    place=state: Uk:Tag:place=state
+    place=suburb: Uk:Tag:place=suburb
+    place=town: Uk:Tag:place=town
+    place=village: Uk:Tag:place=village
+    police=offices: Uk:Tag:police=offices
+    pump=powered: Uk:Tag:pump=powered
+    railway=abandoned: Uk:Tag:railway=abandoned
     railway=halt: Uk:Tag:railway=halt
     railway=rail: Uk:Tag:railway=rail
     railway=station: Uk:Tag:railway=station
     railway=tram: Uk:Tag:railway=tram
+    religion=christian: Uk:Tag:religion=christian
+    residential=rural: Uk:Tag:residential=rural
+    residential=urban: Uk:Tag:residential=urban
     route=train: Uk:Tag:route=train
     shop=antiques: Uk:Tag:shop=antiques
     shop=baby_goods: Uk:Tag:shop=baby goods
@@ -15594,10 +23338,16 @@ uk:
     shop=optician: Uk:Tag:shop=optician
     shop=second_hand: Uk:Tag:shop=second hand
     sport=Swimming: Uk:Tag:sport=Swimming
+    sport=paragliding: Uk:Tag:sport=paragliding
     sport=shooting: Uk:Tag:sport=shooting
+    sport=skiing: Uk:Tag:sport=skiing
     sport=swimming: Uk:Tag:sport=swimming
+    type=boundary: Uk:Tag:type=boundary
     vending=bicycle_tube: Uk:Tag:vending=bicycle tube
+    water=river: Uk:Tag:water=river
+    waterway=dam: Uk:Tag:waterway=dam
     waterway=riverbank: Uk:Tag:waterway=riverbank
+    waterway=weir: Uk:Tag:waterway=weir
 vi:
   key:
     addr: Vi:Key:addr
@@ -15653,76 +23403,180 @@ yue:
     man_made=gasometer: Yue:Tag:man made=gasometer
     residential=university: Yue:Tag:residential=university
     tourism=attraction: Yue:Tag:tourism=attraction
-zh:
-  key:
-    name: ZH:Key:name
 zh-hans:
   key:
+    access: Zh-hans:Key:access
     amenity: Zh-hans:Key:amenity
+    building: Zh-hans:Key:building
     building:part: Zh-hans:Key:building:part
+    china_class: Zh-hans:Key:china class
+    china_population: Zh-hans:Key:china population
     cuisine: Zh-hans:Key:cuisine
     ele: Zh-hans:Key:ele
+    entrance: Zh-hans:Key:entrance
+    foot: Zh-hans:Key:foot
     height: Zh-hans:Key:height
     highway: Zh-hans:Key:highway
     landuse: Zh-hans:Key:landuse
+    leisure: Zh-hans:Key:leisure
+    motorcycle: Zh-hans:Key:motorcycle
     name: Zh-hans:Key:name
+    oneway: Zh-hans:Key:oneway
+    overtaking: Zh-hans:Key:overtaking
+    parking:lane: Zh-hans:Key:parking:lane
     place: Zh-hans:Key:place
+    plant:method: Zh-hans:Key:plant:method
+    population: Zh-hans:Key:population
     railway: Zh-hans:Key:railway
+    railway:etcs: Zh-hans:Key:railway:etcs
+    railway:lzb: Zh-hans:Key:railway:lzb
+    ref: Zh-hans:Key:ref
+    residential: Zh-hans:Key:residential
+    roof:direction: Zh-hans:Key:roof:direction
+    roof:shape: Zh-hans:Key:roof:shape
+    substation: Zh-hans:Key:substation
+    surface: Zh-hans:Key:surface
     toll: Zh-hans:Key:toll
+    turn: Zh-hans:Key:turn
+    waterway: Zh-hans:Key:waterway
     wheelchair: Zh-hans:Key:wheelchair
   tag:
     amenity=bar: Zh-hans:Tag:amenity=bar
     amenity=cafe: Zh-hans:Tag:amenity=cafe
+    amenity=toilets: Zh-hans:Tag:amenity=toilets
     barrier=toll_booth: Zh-hans:Tag:barrier=toll booth
     barrier=wall: Zh-hans:Tag:barrier=wall
+    boundary=administrative: Zh-hans:Tag:boundary=administrative
+    bridge:structure=humpback: Zh-hans:Tag:bridge:structure=humpback
+    building=detached: Zh-hans:Tag:building=detached
+    emergency=emergency_ward_entrance: Zh-hans:Tag:emergency=emergency ward entrance
+    generator:source=wind: Zh-hans:Tag:generator:source=wind
+    highway=bus_stop: Zh-hans:Tag:highway=bus stop
+    highway=footway: Zh-hans:Tag:highway=footway
     highway=residential: Zh-hans:Tag:highway=residential
     highway=tertiary: Zh-hans:Tag:highway=tertiary
+    highway=toll_gantry: Zh-hans:Tag:highway=toll gantry
+    highway=traffic_signals: Zh-hans:Tag:highway=traffic signals
+    historic=stone: Zh-hans:Tag:historic=stone
+    industrial=slaughterhouse: Zh-hans:Tag:industrial=slaughterhouse
+    landuse=commercial: Zh-hans:Tag:landuse=commercial
+    landuse=forest: Zh-hans:Tag:landuse=forest
+    man_made=antenna: Zh-hans:Tag:man made=antenna
+    man_made=dyke: Zh-hans:Tag:man made=dyke
+    man_made=flagpole: Zh-hans:Tag:man made=flagpole
+    natural=sand: Zh-hans:Tag:natural=sand
+    natural=wood: Zh-hans:Tag:natural=wood
+    network=CN:AH: Zh-hans:Tag:network=CN:AH
+    network=CN:JS: Zh-hans:Tag:network=CN:JS
+    network=CN:expressway: Zh-hans:Tag:network=CN:expressway
+    network=CN:national: Zh-hans:Tag:network=CN:national
+    office=government: Zh-hans:Tag:office=government
+    place=hamlet: Zh-hans:Tag:place=hamlet
+    power=line: Zh-hans:Tag:power=line
+    power=tower: Zh-hans:Tag:power=tower
     railway=light_rail: Zh-hans:Tag:railway=light rail
     railway=subway: Zh-hans:Tag:railway=subway
     railway=subway_entrance: Zh-hans:Tag:railway=subway entrance
+    railway=traverser: Zh-hans:Tag:railway=traverser
     route=light_rail: Zh-hans:Tag:route=light rail
     route=subway: Zh-hans:Tag:route=subway
+    service=parking_aisle: Zh-hans:Tag:service=parking aisle
     station=light_rail: Zh-hans:Tag:station=light rail
     station=subway: Zh-hans:Tag:station=subway
+    substation=transmission: Zh-hans:Tag:substation=transmission
+    surface=acrylic: Zh-hans:Tag:surface=acrylic
+    surface=artificial_turf: Zh-hans:Tag:surface=artificial turf
+    surface=tartan: Zh-hans:Tag:surface=tartan
+    vending=ice_cream: Zh-hans:Tag:vending=ice cream
+    waterway=river: Zh-hans:Tag:waterway=river
+    waterway=weir: Zh-hans:Tag:waterway=weir
 zh-hant:
   key:
+    access: Zh-hant:Key:access
     aeroway: Zh-hant:Key:aeroway
     amenity: Zh-hant:Key:amenity
     bridge: Zh-hant:Key:bridge
+    building: Zh-hant:Key:building
+    conveying: Zh-hant:Key:conveying
+    covered: Zh-hant:Key:covered
+    cutting: Zh-hant:Key:cutting
     diet:*: Zh-hant:Key:diet:*
+    embankment: Zh-hant:Key:embankment
     fixme: Zh-hant:Key:fixme
+    ford: Zh-hant:Key:ford
     fuel: Zh-hant:Key:fuel
+    highway: Zh-hant:Key:highway
+    is_in: Zh-hant:Key:is in
+    layer: Zh-hant:Key:layer
+    maxspeed: Zh-hant:Key:maxspeed
     name: Zh-hant:Key:name
     noexit: Zh-hant:Key:noexit
     office: Zh-hant:Key:office
+    oneway: Zh-hant:Key:oneway
     opening_hours: Zh-hant:Key:opening hours
     playground: Zh-hant:Key:playground
+    religion: Zh-hant:Key:religion
     service: Zh-hant:Key:service
+    shelter_type: Zh-hant:Key:shelter type
     shop: Zh-hant:Key:shop
     takeaway: Zh-hant:Key:takeaway
+    toll: Zh-hant:Key:toll
     tracktype: Zh-hant:Key:tracktype
     traffic_calming: Zh-hant:Key:traffic calming
     trail_visibility: Zh-hant:Key:trail visibility
   tag:
+    amenity=archive: Zh-hant:Tag:amenity=archive
     amenity=bench: Zh-hant:Tag:amenity=bench
+    amenity=car_rental: Zh-hant:Tag:amenity=car rental
     amenity=coworking_space: Zh-hant:Tag:amenity=coworking space
     amenity=crematorium: Zh-hant:Tag:amenity=crematorium
+    amenity=drinking_water: Zh-hant:Tag:amenity=drinking water
     amenity=fountain: Zh-hant:Tag:amenity=fountain
     amenity=fuel: Zh-hant:Tag:amenity=fuel
+    amenity=parking: Zh-hant:Tag:amenity=parking
     amenity=place_of_worship: Zh-hant:Tag:amenity=place of worship
+    amenity=post_box: Zh-hant:Tag:amenity=post box
+    amenity=research_institute: Zh-hant:Tag:amenity=research institute
+    amenity=ticket_validator: Zh-hant:Tag:amenity=ticket validator
     amenity=toilets: Zh-hant:Tag:amenity=toilets
+    barrier=toll_booth: Zh-hant:Tag:barrier=toll booth
     building=roof: Zh-hant:Tag:building=roof
+    highway=bus_guideway: Zh-hant:Tag:highway=bus guideway
     highway=bus_stop: Zh-hant:Tag:highway=bus stop
+    highway=footway: Zh-hant:Tag:highway=footway
+    highway=give_way: Zh-hant:Tag:highway=give way
     highway=milestone: Zh-hant:Tag:highway=milestone
+    highway=motorway: Zh-hant:Tag:highway=motorway
+    highway=passing_place: Zh-hant:Tag:highway=passing place
+    highway=path: Zh-hant:Tag:highway=path
+    highway=pedestrian: Zh-hant:Tag:highway=pedestrian
+    highway=primary: Zh-hant:Tag:highway=primary
+    highway=residential: Zh-hant:Tag:highway=residential
+    highway=secondary: Zh-hant:Tag:highway=secondary
+    highway=service: Zh-hant:Tag:highway=service
+    highway=services: Zh-hant:Tag:highway=services
+    highway=tertiary: Zh-hant:Tag:highway=tertiary
+    highway=track: Zh-hant:Tag:highway=track
+    highway=traffic_signals: Zh-hant:Tag:highway=traffic signals
+    highway=trunk: Zh-hant:Tag:highway=trunk
+    highway=unclassified: Zh-hant:Tag:highway=unclassified
     historic=aircraft: Zh-hant:Tag:historic=aircraft
     landuse=cemetery: Zh-hant:Tag:landuse=cemetery
+    leisure=adult_gaming_centre: Zh-hant:Tag:leisure=adult gaming centre
+    leisure=firepit: Zh-hant:Tag:leisure=firepit
+    leisure=fitness_centre: Zh-hant:Tag:leisure=fitness centre
     leisure=pitch: Zh-hant:Tag:leisure=pitch
+    man_made=embankment: Zh-hant:Tag:man made=embankment
     natural=peak: Zh-hant:Tag:natural=peak
+    natural=scree: Zh-hant:Tag:natural=scree
+    power=plant: Zh-hant:Tag:power=plant
+    railway=rail: Zh-hant:Tag:railway=rail
+    service=alley: Zh-hant:Tag:service=alley
     service=drive-through: Zh-hant:Tag:service=drive-through
     shop=funeral_directors: Zh-hant:Tag:shop=funeral directors
+    shop=games: Zh-hant:Tag:shop=games
     shop=gas: Zh-hant:Tag:shop=gas
     tourism=alpine_hut: Zh-hant:Tag:tourism=alpine hut
-·es:
-  key:
-    addr:inclusion: ·ES:Key:addr:inclusion
+    waterway=river: Zh-hant:Tag:waterway=river
+    waterway=riverbank: Zh-hant:Tag:waterway=riverbank