]> git.openstreetmap.org Git - rails.git/commitdiff
rerun script/misc/update-wiki-pages
authorMateusz Konieczny <matkoniecz@gmail.com>
Thu, 28 Jul 2022 23:18:24 +0000 (01:18 +0200)
committerMateusz Konieczny <matkoniecz@gmail.com>
Thu, 28 Jul 2022 23:18:24 +0000 (01:18 +0200)
config/wiki_pages.yml

index 5b6194aba74c673a96288ccda38bfed0ab32c1cf..3b61d61455f987f0b5e68c8cf4963eb50a2d53eb 100644 (file)
@@ -19,18 +19,22 @@ bg:
   key:
     building: Bg:Key:building
     lanes: Bg:Key:lanes
+    name:bg: Bg:Key:name:bg
   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
+    shop=sewing: Bg:Tag:shop=sewing
 br:
   key:
     highway: Br:Key:highway
 ca:
   key:
+    aerialway: Ca:Key:aerialway
     amenity: Ca:Key:amenity
+    bicycle: Ca:Key:bicycle
     board:title: Ca:Key:board:title
     building: Ca:Key:building
     contact:facebook: Ca:Key:contact:facebook
@@ -41,6 +45,7 @@ ca:
     openplaques:id: Ca:Key:openplaques:id
     operator:type: Ca:Key:operator:type
     phone: Ca:Key:phone
+    polling_station: Ca:Key:polling station
     roller_coaster: Ca:Key:roller coaster
     roundtrip: Ca:Key:roundtrip
     wikidata: Ca:Key:wikidata
@@ -66,34 +71,61 @@ ca:
     aerialway=zip_line: Ca:Tag:aerialway=zip line
     aeroway=apron: Ca:Tag:aeroway=apron
     aeroway=gate: Ca:Tag:aeroway=gate
+    aeroway=hangar: Ca:Tag:aeroway=hangar
     aeroway=helipad: Ca:Tag:aeroway=helipad
     aeroway=heliport: Ca:Tag:aeroway=heliport
+    aeroway=highway_strip: Ca:Tag:aeroway=highway strip
     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=atm: Ca:Tag:amenity=atm
+    amenity=baby_hatch: Ca:Tag:amenity=baby hatch
+    amenity=bank: Ca:Tag:amenity=bank
     amenity=bar: Ca:Tag:amenity=bar
     amenity=bicycle_parking: Ca:Tag:amenity=bicycle parking
+    amenity=bicycle_rental: Ca:Tag:amenity=bicycle rental
+    amenity=bicycle_repair_station: Ca:Tag:amenity=bicycle repair station
     amenity=biergarten: Ca:Tag:amenity=biergarten
+    amenity=bureau_de_change: Ca:Tag:amenity=bureau de change
+    amenity=bus_station: Ca:Tag:amenity=bus station
     amenity=cafe: Ca:Tag:amenity=cafe
+    amenity=car_rental: Ca:Tag:amenity=car rental
+    amenity=car_wash: Ca:Tag:amenity=car wash
+    amenity=clinic: Ca:Tag:amenity=clinic
     amenity=college: Ca:Tag:amenity=college
+    amenity=dentist: Ca:Tag:amenity=dentist
+    amenity=doctors: Ca:Tag:amenity=doctors
     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=ferry_terminal: Ca:Tag:amenity=ferry terminal
     amenity=food_court: Ca:Tag:amenity=food court
+    amenity=fuel: Ca:Tag:amenity=fuel
+    amenity=grit_bin: Ca:Tag:amenity=grit bin
     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=motorcycle_parking: Ca:Tag:amenity=motorcycle parking
     amenity=music_school: Ca:Tag:amenity=music school
     amenity=nightclub: Ca:Tag:amenity=nightclub
+    amenity=nursing_home: Ca:Tag:amenity=nursing home
     amenity=outfitter: Ca:Tag:amenity=outfitter
+    amenity=parcel_locker: Ca:Tag:amenity=parcel locker
+    amenity=parking: Ca:Tag:amenity=parking
+    amenity=parking_entrance: Ca:Tag:amenity=parking entrance
+    amenity=parking_space: Ca:Tag:amenity=parking space
+    amenity=pharmacy: Ca:Tag:amenity=pharmacy
     amenity=post_box: Ca:Tag:amenity=post box
     amenity=pub: Ca:Tag:amenity=pub
     amenity=restaurant: Ca:Tag:amenity=restaurant
+    amenity=school: Ca:Tag:amenity=school
+    amenity=taxi: Ca:Tag:amenity=taxi
     amenity=toy_library: Ca:Tag:amenity=toy library
     amenity=university: Ca:Tag:amenity=university
+    amenity=vehicle_inspection: Ca:Tag:amenity=vehicle inspection
     barrier=cable_barrier: Ca:Tag:barrier=cable barrier
     barrier=kerb: Ca:Tag:barrier=kerb
     building=boathouse: Ca:Tag:building=boathouse
@@ -111,12 +143,16 @@ ca:
     leisure=swimming_pool: Ca:Tag:leisure=swimming pool
     leisure=tanning_salon: Ca:Tag:leisure=tanning salon
     man_made=gantry: Ca:Tag:man made=gantry
+    man_made=wastewater_plant: Ca:Tag:man made=wastewater plant
     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
+    parking=surface: Ca:Tag:parking=surface
     place=isolated_dwelling: Ca:Tag:place=isolated dwelling
     power=line: Ca:Tag:power=line
+    service=aircraft_control: Ca:Tag:service=aircraft control
+    shop=alcohol: Ca:Tag:shop=alcohol
     shop=frozen_food: Ca:Tag:shop=frozen food
     tactile_paving=no: Ca:Tag:tactile paving=no
     vending=books: Ca:Tag:vending=books
@@ -438,7 +474,6 @@ cs:
     historic:period: Cs:Key:historic:period
     horse: Cs:Key:horse
     hour_off: Cs:Key:hour off
-    hour_on: Cs:Key:hour on
     hov: Cs:Key:hov
     iata: Cs:Key:iata
     icao: Cs:Key:icao
@@ -646,7 +681,6 @@ cs:
     post_box:type: Cs:Key:post box:type
     postal_code: Cs:Key:postal code
     power: Cs:Key:power
-    power_source: Cs:Key:power source
     power_supply: Cs:Key:power supply
     power_supply:schedule: Cs:Key:power supply:schedule
     preschool: Cs:Key:preschool
@@ -1202,6 +1236,7 @@ cs:
     building=transportation: Cs:Tag:building=transportation
     building=university: Cs:Tag:building=university
     building=warehouse: Cs:Tag:building=warehouse
+    building=wayside_shrine: Cs:Tag:building=wayside shrine
     building=yes: Cs:Tag:building=yes
     bunker_type=hardened_aircraft_shelter: Cs:Tag:bunker type=hardened aircraft shelter
     bunker_type=munitions: Cs:Tag:bunker type=munitions
@@ -1873,6 +1908,7 @@ cs:
     railway=traverser: Cs:Tag:railway=traverser
     railway=turntable: Cs:Tag:railway=turntable
     railway=wash: Cs:Tag:railway=wash
+    railway=water_crane: Cs:Tag:railway=water crane
     recycling_type=container: Cs:Tag:recycling type=container
     religion=buddhist: Cs:Tag:religion=buddhist
     religion=christian: Cs:Tag:religion=christian
@@ -2330,13 +2366,13 @@ de:
     Animal: DE:Key:Animal
     Annotations: DE:Key:Annotations
     FIXME: DE:Key:FIXME
-    Key:restaurant: DE:Key:Key:restaurant
     TODO: DE:Key:TODO
     VRS:ref: DE:Key:VRS:ref
     WDPA_ID:ref: DE:Key:WDPA ID:ref
     'abandoned:': 'DE:Key:abandoned:'
     abandoned:*: DE:Key:abandoned:*
     abandoned:amenity: DE:Key:abandoned:amenity
+    abandoned:highway: DE:Key:abandoned:highway
     abandoned:place: DE:Key:abandoned:place
     abandoned:railway: DE:Key:abandoned:railway
     abutters: DE:Key:abutters
@@ -2360,10 +2396,12 @@ de:
     aeroway: DE:Key:aeroway
     after_school: DE:Key:after school
     agricultural: DE:Key:agricultural
+    air_conditioning: DE:Key:air conditioning
     alt_name: DE:Key:alt name
     amenity: DE:Key:amenity
     architect: DE:Key:architect
     area: DE:Key:area
+    area:highway: DE:Key:area:highway
     artist_name: DE:Key:artist name
     artwork_type: DE:Key:artwork type
     asb: DE:Key:asb
@@ -2372,6 +2410,7 @@ de:
     atv:repair: DE:Key:atv:repair
     authentication: DE:Key:authentication
     automated: DE:Key:automated
+    automatic_door: DE:Key:automatic door
     backcountry: DE:Key:backcountry
     backrest: DE:Key:backrest
     backward: DE:Key:backward
@@ -2400,17 +2439,20 @@ de:
     books: DE:Key:books
     both: DE:Key:both
     boundary: DE:Key:boundary
+    branch: DE:Key:branch
     brand: DE:Key:brand
     breakfast: DE:Key:breakfast
     brewery: DE:Key:brewery
     bridge: DE:Key:bridge
     bridge:movable: DE:Key:bridge:movable
+    bridge:name: DE:Key:bridge:name
     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
     building:condition: DE:Key:building:condition
+    building:flats: DE:Key:building:flats
     building:levels: DE:Key:building:levels
     building:levels:underground: DE:Key:building:levels:underground
     building:material: DE:Key:building:material
@@ -2423,6 +2465,7 @@ de:
     busway: DE:Key:busway
     button_operated: DE:Key:button operated
     cables: DE:Key:cables
+    camera:type: DE:Key:camera:type
     canoe: DE:Key:canoe
     capacity: DE:Key:capacity
     capacity:charging: DE:Key:capacity:charging
@@ -2492,19 +2535,27 @@ de:
     currency:USD: DE:Key:currency:USD
     currency:others: DE:Key:currency:others
     cutting: DE:Key:cutting
+    cycle_barrier: DE:Key:cycle barrier
+    cycle_barrier:installation: DE:Key:cycle barrier:installation
+    cycle_highway: DE:Key:cycle highway
     cycleway: DE:Key:cycleway
     cycleway:left: DE:Key:cycleway:left
+    cycleway:left:oneway: DE:Key:cycleway:left:oneway
     cycleway:right: DE:Key:cycleway:right
     cycleway:right:oneway: DE:Key:cycleway:right:oneway
     cycleway:surface: DE:Key:cycleway:surface
+    'damage:': 'DE:Key:damage:'
     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
+    defensive_works: DE:Key:defensive works
     delivery: DE:Key:delivery
+    delivery:partner: DE:Key:delivery:partner
     'demolished:': 'DE:Key:demolished:'
+    demolished:building: DE:Key:demolished:building
     denomination: DE:Key:denomination
     denotation: DE:Key:denotation
     departures_board: DE:Key:departures board
@@ -2522,7 +2573,6 @@ de:
     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
@@ -2540,8 +2590,10 @@ de:
     dog: DE:Key:dog
     door: DE:Key:door
     draft: DE:Key:draft
+    drain: DE:Key:drain
     drink: DE:Key:drink
     drinking_water: DE:Key:drinking water
+    drinking_water:refill: DE:Key:drinking water:refill
     drive_in: DE:Key:drive in
     drive_through: DE:Key:drive through
     duration: DE:Key:duration
@@ -2549,12 +2601,15 @@ de:
     electrified: DE:Key:electrified
     embankment: DE:Key:embankment
     emergency: DE:Key:emergency
+    emergency:phone: DE:Key:emergency:phone
     end_date: DE:Key:end date
     engineer: DE:Key:engineer
     entrance: DE:Key:entrance
+    exit: DE:Key:exit
     facebook: DE:Key:facebook
     fair_trade: DE:Key:fair trade
     farmyard: DE:Key:farmyard
+    fax: DE:Key:fax
     fee: DE:Key:fee
     fence_type: DE:Key:fence type
     ferry:cable: DE:Key:ferry:cable
@@ -2562,6 +2617,7 @@ de:
     fire_boundary: DE:Key:fire boundary
     fire_hydrant: DE:Key:fire hydrant
     fireplace: DE:Key:fireplace
+    fix_guidepost: DE:Key:fix guidepost
     fixme: DE:Key:fixme
     flag:type: DE:Key:flag:type
     floating: DE:Key:floating
@@ -2589,6 +2645,7 @@ de:
     generator:output:hot_water: DE:Key:generator:output:hot water
     generator:output:steam: DE:Key:generator:output:steam
     generator:place: DE:Key:generator:place
+    generator:plant: DE:Key:generator:plant
     generator:source: DE:Key:generator:source
     generator:type: DE:Key:generator:type
     genus: DE:Key:genus
@@ -2654,6 +2711,7 @@ de:
     lamp_type: DE:Key:lamp type
     landfill:waste: DE:Key:landfill:waste
     landuse: DE:Key:landuse
+    lane_markings: DE:Key:lane markings
     lanes: DE:Key:lanes
     lanes:backward: DE:Key:lanes:backward
     lanes:both_ways: DE:Key:lanes:both ways
@@ -2674,6 +2732,8 @@ de:
     length: DE:Key:length
     level: DE:Key:level
     line: DE:Key:line
+    line_attachment: DE:Key:line attachment
+    line_management: DE:Key:line management
     lit: DE:Key:lit
     living_street: DE:Key:living street
     loc_name: DE:Key:loc name
@@ -2707,6 +2767,8 @@ de:
     maxspeed:variable: DE:Key:maxspeed:variable
     maxstay: DE:Key:maxstay
     maxweight: DE:Key:maxweight
+    maxweightrating: DE:Key:maxweightrating
+    maxweightrating:hgv: DE:Key:maxweightrating:hgv
     maxwidth: DE:Key:maxwidth
     maxwidth:physical: DE:Key:maxwidth:physical
     meadow: DE:Key:meadow
@@ -2768,6 +2830,7 @@ de:
     noref: DE:Key:noref
     note: DE:Key:note
     nudism: DE:Key:nudism
+    number_of_apartments: DE:Key:number of apartments
     nursery: DE:Key:nursery
     object: DE:Key:object
     observatory:type: DE:Key:observatory:type
@@ -2782,6 +2845,7 @@ de:
     oneway:moped: DE:Key:oneway:moped
     onkz: DE:Key:onkz
     openfire: DE:Key:openfire
+    opening: DE:Key:opening
     opening_date: DE:Key:opening date
     opening_hours: DE:Key:opening hours
     opening_hours:covid19: DE:Key:opening hours:covid19
@@ -2795,13 +2859,18 @@ de:
     osmc:status: DE:Key:osmc:status
     osmc:symbol: DE:Key:osmc:symbol
     outdoor_seating: DE:Key:outdoor seating
+    overlap: DE:Key:overlap
     overtaking: DE:Key:overtaking
     par: DE:Key:par
+    parcel_mail_in: DE:Key:parcel mail in
+    parcel_pickup: DE:Key:parcel pickup
     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
+    parking:orientation: DE:Key:parking:orientation
+    parking_space: DE:Key:parking space
     passenger_information_display: DE:Key:passenger information display
     passing_places: DE:Key:passing places
     payment: DE:Key:payment
@@ -2826,7 +2895,6 @@ de:
     post_office: DE:Key:post office
     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
@@ -2847,9 +2915,11 @@ de:
     railway:lzb: DE:Key:railway:lzb
     railway:position: DE:Key:railway:position
     railway:preserved: DE:Key:railway:preserved
+    railway:ref: DE:Key:railway:ref
     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:tilting: DE:Key:railway:tilting
     railway:track_ref: DE:Key:railway:track ref
     ramp: DE:Key:ramp
     'razed:': 'DE:Key:razed:'
@@ -2859,20 +2929,26 @@ de:
     ref: DE:Key:ref
     ref:IFOPT: DE:Key:ref:IFOPT
     ref:bufa: DE:Key:ref:bufa
+    ref:fgkz: DE:Key:ref:fgkz
     ref:mobil-parken.de: DE:Key:ref:mobil-parken.de
+    ref:sprockhoff: DE:Key:ref:sprockhoff
     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
+    residential: DE:Key:residential
     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:height: DE:Key:roof:height
     roof:material: DE:Key:roof:material
+    roof:orientation: DE:Key:roof:orientation
+    roof:shape: DE:Key:roof:shape
     room: DE:Key:room
     rooms: DE:Key:rooms
     rotor:diameter: DE:Key:rotor:diameter
@@ -2901,6 +2977,7 @@ de:
     shooting: DE:Key:shooting
     shop: DE:Key:shop
     short_protection_title: DE:Key:short protection title
+    shoulder: DE:Key:shoulder
     shower: DE:Key:shower
     sidewalk: DE:Key:sidewalk
     sidewalk:both:bicycle: DE:Key:sidewalk:both:bicycle
@@ -2926,6 +3003,7 @@ de:
     step_count: DE:Key:step count
     stone_type: DE:Key:stone type
     stroller: DE:Key:stroller
+    subject: DE:Key:subject
     substance: DE:Key:substance
     substation: DE:Key:substation
     summit:register: DE:Key:summit:register
@@ -2933,6 +3011,7 @@ de:
     support: DE:Key:support
     surface: DE:Key:surface
     surveillance: DE:Key:surveillance
+    surveillance:type: DE:Key:surveillance:type
     surveillance:zone: DE:Key:surveillance:zone
     survey:date: DE:Key:survey:date
     swimming: DE:Key:swimming
@@ -2997,14 +3076,17 @@ de:
     voltage: DE:Key:voltage
     voltage:primary: DE:Key:voltage:primary
     voltage:secondary: DE:Key:voltage:secondary
+    wall: DE:Key:wall
     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
+    website:menu: DE:Key:website:menu
     wetland: DE:Key:wetland
     wheelchair: DE:Key:wheelchair
+    wheelchair:description: DE:Key:wheelchair:description
     wholesale: DE:Key:wholesale
     width: DE:Key:width
     wiki:symbol: DE:Key:wiki:symbol
@@ -3033,7 +3115,10 @@ de:
     access=destination: DE:Tag:access=destination
     access=forestry: DE:Tag:access=forestry
     access=no: DE:Tag:access=no
+    access=permissive: DE:Tag:access=permissive
+    access=permit: DE:Tag:access=permit
     access=private: DE:Tag:access=private
+    access=unknown: DE:Tag:access=unknown
     admin_level=2: DE:Tag:admin level=2
     advertising=column: DE:Tag:advertising=column
     advertising=flag: DE:Tag:advertising=flag
@@ -3125,11 +3210,14 @@ de:
     amenity=customs: DE:Tag:amenity=customs
     amenity=dancing_school: DE:Tag:amenity=dancing school
     amenity=dentist: DE:Tag:amenity=dentist
+    amenity=device_charging_station: DE:Tag:amenity=device charging station
     amenity=dive_centre: DE:Tag:amenity=dive centre
     amenity=doctors: DE:Tag:amenity=doctors
+    amenity=dog_parking: DE:Tag:amenity=dog parking
     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=driver_training: DE:Tag:amenity=driver training
     amenity=driving_school: DE:Tag:amenity=driving school
     amenity=embassy: DE:Tag:amenity=embassy
     amenity=emergency_phone: DE:Tag:amenity=emergency phone
@@ -3141,6 +3229,7 @@ de:
     amenity=fire_hydrant: DE:Tag:amenity=fire hydrant
     amenity=fire_station: DE:Tag:amenity=fire station
     amenity=fish_spa: DE:Tag:amenity=fish spa
+    amenity=food_court: DE:Tag:amenity=food court
     amenity=fountain: DE:Tag:amenity=fountain
     amenity=fridge: DE:Tag:amenity=fridge
     amenity=fuel: DE:Tag:amenity=fuel
@@ -3163,9 +3252,12 @@ de:
     amenity=lavoir: DE:Tag:amenity=lavoir
     amenity=letter_box: DE:Tag:amenity=letter box
     amenity=library: DE:Tag:amenity=library
+    amenity=loading_dock: DE:Tag:amenity=loading dock
+    amenity=lost_property_office: DE:Tag:amenity=lost property office
     amenity=lounger: DE:Tag:amenity=lounger
     amenity=marketplace: DE:Tag:amenity=marketplace
     amenity=medical_supply: DE:Tag:amenity=medical supply
+    amenity=mobile_library: DE:Tag:amenity=mobile library
     amenity=monastery: DE:Tag:amenity=monastery
     amenity=money_transfer: DE:Tag:amenity=money transfer
     amenity=mortuary: DE:Tag:amenity=mortuary
@@ -3174,6 +3266,7 @@ de:
     amenity=music_venue: DE:Tag:amenity=music venue
     amenity=nightclub: DE:Tag:amenity=nightclub
     amenity=nursing_home: DE:Tag:amenity=nursing home
+    amenity=parcel_locker: DE:Tag:amenity=parcel locker
     amenity=parking: DE:Tag:amenity=parking
     amenity=parking_entrance: DE:Tag:amenity=parking entrance
     amenity=parking_space: DE:Tag:amenity=parking space
@@ -3205,6 +3298,7 @@ de:
     amenity=shower: DE:Tag:amenity=shower
     amenity=ski_school: DE:Tag:amenity=ski school
     amenity=smoking_area: DE:Tag:amenity=smoking area
+    amenity=snow_removal_station: DE:Tag:amenity=snow removal station
     amenity=social_facility: DE:Tag:amenity=social facility
     amenity=stables: DE:Tag:amenity=stables
     amenity=studio: DE:Tag:amenity=studio
@@ -3214,6 +3308,7 @@ de:
     amenity=ticket_validator: DE:Tag:amenity=ticket validator
     amenity=toilets: DE:Tag:amenity=toilets
     amenity=townhall: DE:Tag:amenity=townhall
+    amenity=traffic_park: DE:Tag:amenity=traffic park
     amenity=trolley_bay: DE:Tag:amenity=trolley bay
     amenity=university: DE:Tag:amenity=university
     amenity=vehicle_inspection: DE:Tag:amenity=vehicle inspection
@@ -3238,8 +3333,12 @@ de:
     attraction=summer_toboggan: DE:Tag:attraction=summer toboggan
     attraction=train: DE:Tag:attraction=train
     attraction=water_slide: DE:Tag:attraction=water slide
+    barrier=barrier_board: DE:Tag:barrier=barrier board
+    barrier=berm: DE:Tag:barrier=berm
     barrier=block: DE:Tag:barrier=block
     barrier=bollard: DE:Tag:barrier=bollard
+    barrier=border_control: DE:Tag:barrier=border control
+    barrier=bump_gate: DE:Tag:barrier=bump gate
     barrier=bus_trap: DE:Tag:barrier=bus trap
     barrier=cable_barrier: DE:Tag:barrier=cable barrier
     barrier=cattle_grid: DE:Tag:barrier=cattle grid
@@ -3269,6 +3368,7 @@ de:
     barrier=sally_port: DE:Tag:barrier=sally port
     barrier=sliding_gate: DE:Tag:barrier=sliding gate
     barrier=spikes: DE:Tag:barrier=spikes
+    barrier=step: DE:Tag:barrier=step
     barrier=stile: DE:Tag:barrier=stile
     barrier=swing_gate: DE:Tag:barrier=swing gate
     barrier=tank_trap: DE:Tag:barrier=tank trap
@@ -3284,8 +3384,10 @@ de:
     bay=fjord: DE:Tag:bay=fjord
     bicycle=designated: DE:Tag:bicycle=designated
     bicycle=dismount: DE:Tag:bicycle=dismount
+    bicycle=optional_sidepath: DE:Tag:bicycle=optional sidepath
     bicycle=use_sidepath: DE:Tag:bicycle=use sidepath
     biosphärenwirt=yes: DE:Tag:biosphärenwirt=yes
+    boundary=administrative: DE:Tag:boundary=administrative
     boundary=marker: DE:Tag:boundary=marker
     boundary=national_park: DE:Tag:boundary=national park
     boundary=postal_code: DE:Tag:boundary=postal code
@@ -3317,13 +3419,16 @@ de:
     building=bakehouse: DE:Tag:building=bakehouse
     building=barn: DE:Tag:building=barn
     building=boathouse: DE:Tag:building=boathouse
+    building=bridge: DE:Tag:building=bridge
     building=bungalow: DE:Tag:building=bungalow
     building=bunker: DE:Tag:building=bunker
     building=cabin: DE:Tag:building=cabin
+    building=carport: DE:Tag:building=carport
     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=college: DE:Tag:building=college
     building=commercial: DE:Tag:building=commercial
     building=construction: DE:Tag:building=construction
     building=container: DE:Tag:building=container
@@ -3338,6 +3443,7 @@ de:
     building=garage: DE:Tag:building=garage
     building=garages: DE:Tag:building=garages
     building=gatehouse: DE:Tag:building=gatehouse
+    building=ger: DE:Tag:building=ger
     building=grandstand: DE:Tag:building=grandstand
     building=greenhouse: DE:Tag:building=greenhouse
     building=hangar: DE:Tag:building=hangar
@@ -3352,6 +3458,7 @@ de:
     building=marquee: DE:Tag:building=marquee
     building=mosque: DE:Tag:building=mosque
     building=office: DE:Tag:building=office
+    building=outbuilding: DE:Tag:building=outbuilding
     building=parking: DE:Tag:building=parking
     building=pavilion: DE:Tag:building=pavilion
     building=presbytery: DE:Tag:building=presbytery
@@ -3371,6 +3478,7 @@ de:
     building=stable: DE:Tag:building=stable
     building=stadium: DE:Tag:building=stadium
     building=static_caravan: DE:Tag:building=static caravan
+    building=stilt_house: DE:Tag:building=stilt house
     building=sty: DE:Tag:building=sty
     building=supermarket: DE:Tag:building=supermarket
     building=synagogue: DE:Tag:building=synagogue
@@ -3379,6 +3487,8 @@ de:
     building=terrace: DE:Tag:building=terrace
     building=toilets: DE:Tag:building=toilets
     building=train_station: DE:Tag:building=train station
+    building=transformer_tower: DE:Tag:building=transformer tower
+    building=tree_house: DE:Tag:building=tree house
     building=university: DE:Tag:building=university
     building=warehouse: DE:Tag:building=warehouse
     building=water_tower: DE:Tag:building=water tower
@@ -3387,6 +3497,7 @@ de:
     bunker_type=pillbox: DE:Tag:bunker type=pillbox
     by_night=only: DE:Tag:by night=only
     canoe=portage: DE:Tag:canoe=portage
+    cargo=container: DE:Tag:cargo=container
     castle_type=castrum: DE:Tag:castle type=castrum
     castle_type=defensive: DE:Tag:castle type=defensive
     castle_type=fortress: DE:Tag:castle type=fortress
@@ -3394,6 +3505,7 @@ de:
     castle_type=palace: DE:Tag:castle type=palace
     castle_type=stately: DE:Tag:castle type=stately
     cemetery=grave: DE:Tag:cemetery=grave
+    cemetery=sector: DE:Tag:cemetery=sector
     cemetery=war_cemetery: DE:Tag:cemetery=war cemetery
     club=automobile: DE:Tag:club=automobile
     club=fan: DE:Tag:club=fan
@@ -3402,6 +3514,7 @@ de:
     communication=line: DE:Tag:communication=line
     company=logistics: DE:Tag:company=logistics
     construction=yes: DE:Tag:construction=yes
+    consulate=consulate_general: DE:Tag:consulate=consulate general
     content=hot_water: DE:Tag:content=hot water
     craft=agricultural_engines: DE:Tag:craft=agricultural engines
     craft=atelier: DE:Tag:craft=atelier
@@ -3426,6 +3539,7 @@ de:
     craft=cooper: DE:Tag:craft=cooper
     craft=dental_technician: DE:Tag:craft=dental technician
     craft=distillery: DE:Tag:craft=distillery
+    craft=door_construction: DE:Tag:craft=door construction
     craft=dressmaker: DE:Tag:craft=dressmaker
     craft=electrican: DE:Tag:craft=electrican
     craft=electrician: DE:Tag:craft=electrician
@@ -3442,9 +3556,12 @@ de:
     craft=information_electronics: DE:Tag:craft=information electronics
     craft=insulation: DE:Tag:craft=insulation
     craft=interior_work: DE:Tag:craft=interior work
+    craft=jeweller: DE:Tag:craft=jeweller
     craft=joiner: DE:Tag:craft=joiner
     craft=key_cutter: DE:Tag:craft=key cutter
+    craft=locksmith: DE:Tag:craft=locksmith
     craft=metal_construction: DE:Tag:craft=metal construction
+    craft=mint: DE:Tag:craft=mint
     craft=musical_instrument: DE:Tag:craft=musical instrument
     craft=oil_mill: DE:Tag:craft=oil mill
     craft=optician: DE:Tag:craft=optician
@@ -3460,6 +3577,7 @@ de:
     craft=pottery: DE:Tag:craft=pottery
     craft=roofer: DE:Tag:craft=roofer
     craft=saddler: DE:Tag:craft=saddler
+    craft=sailmaker: DE:Tag:craft=sailmaker
     craft=sawmill: DE:Tag:craft=sawmill
     craft=scaffolder: DE:Tag:craft=scaffolder
     craft=sculptor: DE:Tag:craft=sculptor
@@ -3467,6 +3585,7 @@ de:
     craft=signmaker: DE:Tag:craft=signmaker
     craft=stand_builder: DE:Tag:craft=stand builder
     craft=stonemason: DE:Tag:craft=stonemason
+    craft=stove_fitter: DE:Tag:craft=stove fitter
     craft=sun_protection: DE:Tag:craft=sun protection
     craft=tailor: DE:Tag:craft=tailor
     craft=tiler: DE:Tag:craft=tiler
@@ -3484,13 +3603,27 @@ de:
     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=no: DE:Tag:crossing=no
     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=asian: DE:Tag:cuisine=asian
     cuisine=brazilian: DE:Tag:cuisine=brazilian
+    cuisine=chinese: DE:Tag:cuisine=chinese
     cuisine=coffee_shop: DE:Tag:cuisine=coffee shop
     cuisine=dessert: DE:Tag:cuisine=dessert
+    cuisine=greek: DE:Tag:cuisine=greek
+    cuisine=indian: DE:Tag:cuisine=indian
+    cuisine=italian: DE:Tag:cuisine=italian
+    cuisine=japanese: DE:Tag:cuisine=japanese
+    cuisine=korean: DE:Tag:cuisine=korean
+    cuisine=pizza: DE:Tag:cuisine=pizza
+    cuisine=regional: DE:Tag:cuisine=regional
+    cuisine=seafood: DE:Tag:cuisine=seafood
+    cuisine=sushi: DE:Tag:cuisine=sushi
+    cuisine=thai: DE:Tag:cuisine=thai
+    cuisine=vietnamese: DE:Tag:cuisine=vietnamese
     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
@@ -3502,10 +3635,13 @@ de:
     cycleway=opposite_track: DE:Tag:cycleway=opposite track
     cycleway=separate: DE:Tag:cycleway=separate
     cycleway=share_busway: DE:Tag:cycleway=share busway
+    cycleway=shared_lane: DE:Tag:cycleway=shared lane
     cycleway=track: DE:Tag:cycleway=track
     defensive=bergfried: DE:Tag:defensive=bergfried
     defensive=donjon: DE:Tag:defensive=donjon
     defensive=keep: DE:Tag:defensive=keep
+    defensive_works=bastion: DE:Tag:defensive works=bastion
+    defensive_works=battery: DE:Tag:defensive works=battery
     diplomatic=ambassadors_residence: DE:Tag:diplomatic=ambassadors residence
     diplomatic=consulate: DE:Tag:diplomatic=consulate
     diplomatic=consulate_general: DE:Tag:diplomatic=consulate general
@@ -3525,6 +3661,7 @@ de:
     emergency=assembly_point: DE:Tag:emergency=assembly point
     emergency=defibrillator: DE:Tag:emergency=defibrillator
     emergency=designated: DE:Tag:emergency=designated
+    emergency=disaster_help_point: DE:Tag:emergency=disaster help point
     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
@@ -3546,16 +3683,19 @@ de:
     emergency=lifeguard_tower: DE:Tag:emergency=lifeguard tower
     emergency=mountain_rescue: DE:Tag:emergency=mountain rescue
     emergency=phone: DE:Tag:emergency=phone
+    emergency=rescue_box: DE:Tag:emergency=rescue box
     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=yes: DE:Tag:emergency=yes
     emergency_service=technical: DE:Tag:emergency service=technical
     entrance=main: DE:Tag:entrance=main
     entrance=staircase: DE:Tag:entrance=staircase
     entrance=yes: DE:Tag:entrance=yes
     fast_food=cafeteria: DE:Tag:fast food=cafeteria
     foot=designated: DE:Tag:foot=designated
+    foot=yes: DE:Tag:foot=yes
     footway=crossing: DE:Tag:footway=crossing
     footway=sidewalk: DE:Tag:footway=sidewalk
     ford=stepping_stones: DE:Tag:ford=stepping stones
@@ -3645,20 +3785,29 @@ de:
     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=curve: DE:Tag:hazard=curve
     hazard=cyclists: DE:Tag:hazard=cyclists
     hazard=dangerous_junction: DE:Tag:hazard=dangerous junction
     hazard=falling_rocks: DE:Tag:hazard=falling rocks
+    hazard=horse_riders: DE:Tag:hazard=horse riders
     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=allergology: DE:Tag:healthcare:speciality=allergology
+    healthcare:speciality=general: DE:Tag:healthcare:speciality=general
     healthcare:speciality=orthodontics: DE:Tag:healthcare:speciality=orthodontics
     healthcare:speciality=otolaryngology: DE:Tag:healthcare:speciality=otolaryngology
+    healthcare:speciality=paediatric_surgery: DE:Tag:healthcare:speciality=paediatric
+      surgery
+    healthcare:speciality=paediatrics: DE:Tag:healthcare:speciality=paediatrics
+    healthcare:speciality=vaccination: DE:Tag:healthcare:speciality=vaccination
     healthcare=alternative: DE:Tag:healthcare=alternative
     healthcare=audiologist: DE:Tag:healthcare=audiologist
     healthcare=birthing_center: DE:Tag:healthcare=birthing center
+    healthcare=birthing_centre: DE:Tag:healthcare=birthing centre
     healthcare=blood_bank: DE:Tag:healthcare=blood bank
     healthcare=blood_donation: DE:Tag:healthcare=blood donation
     healthcare=clinic: DE:Tag:healthcare=clinic
@@ -3672,14 +3821,15 @@ de:
     healthcare=midwife: DE:Tag:healthcare=midwife
     healthcare=occupational_therapist: DE:Tag:healthcare=occupational therapist
     healthcare=physiotherapist: DE:Tag:healthcare=physiotherapist
+    healthcare=sample_collection: DE:Tag:healthcare=sample collection
     healthcare=speech_therapist: DE:Tag:healthcare=speech therapist
+    hedge=hedge_bank: DE:Tag:hedge=hedge bank
     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
@@ -3719,6 +3869,7 @@ de:
     highway=service: DE:Tag:highway=service
     highway=services: DE:Tag:highway=services
     highway=speed_camera: DE:Tag:highway=speed camera
+    highway=speed_display: DE:Tag:highway=speed display
     highway=steps: DE:Tag:highway=steps
     highway=stop: DE:Tag:highway=stop
     highway=street_lamp: DE:Tag:highway=street lamp
@@ -3737,6 +3888,7 @@ de:
     highway=unknown: DE:Tag:highway=unknown
     highway=yes: DE:Tag:highway=yes
     historic=aircraft: DE:Tag:historic=aircraft
+    historic=aqueduct: DE:Tag:historic=aqueduct
     historic=archaeological_site: DE:Tag:historic=archaeological site
     historic=battlefield: DE:Tag:historic=battlefield
     historic=bomb_crater: DE:Tag:historic=bomb crater
@@ -3773,6 +3925,7 @@ de:
     horse=dismount: DE:Tag:horse=dismount
     industrial=bakery: DE:Tag:industrial=bakery
     industrial=communication: DE:Tag:industrial=communication
+    industrial=port: DE:Tag:industrial=port
     industrial=scrap_yard: DE:Tag:industrial=scrap yard
     industrial=slaughterhouse: DE:Tag:industrial=slaughterhouse
     information=audioguide: DE:Tag:information=audioguide
@@ -3788,6 +3941,7 @@ de:
     junction=circular: DE:Tag:junction=circular
     junction=roundabout: DE:Tag:junction=roundabout
     landuse=allotments: DE:Tag:landuse=allotments
+    landuse=animal_keeping: DE:Tag:landuse=animal keeping
     landuse=aquaculture: DE:Tag:landuse=aquaculture
     landuse=basin: DE:Tag:landuse=basin
     landuse=brownfield: DE:Tag:landuse=brownfield
@@ -3804,6 +3958,7 @@ de:
     landuse=forest: DE:Tag:landuse=forest
     landuse=garages: DE:Tag:landuse=garages
     landuse=grass: DE:Tag:landuse=grass
+    landuse=greenery: DE:Tag:landuse=greenery
     landuse=greenfield: DE:Tag:landuse=greenfield
     landuse=greenhouse_horticulture: DE:Tag:landuse=greenhouse horticulture
     landuse=industrial: DE:Tag:landuse=industrial
@@ -3870,6 +4025,7 @@ de:
     leisure=sauna: DE:Tag:leisure=sauna
     leisure=schoolyard: DE:Tag:leisure=schoolyard
     leisure=slipway: DE:Tag:leisure=slipway
+    leisure=soccer_golf: DE:Tag:leisure=soccer golf
     leisure=sports_centre: DE:Tag:leisure=sports centre
     leisure=sports_hall: DE:Tag:leisure=sports hall
     leisure=stadium: DE:Tag:leisure=stadium
@@ -3900,17 +4056,23 @@ de:
     man_made=breakwater: DE:Tag:man made=breakwater
     man_made=bridge: DE:Tag:man made=bridge
     man_made=bunker_silo: DE:Tag:man made=bunker silo
+    man_made=cairn: DE:Tag:man made=cairn
     man_made=carpet_hanger: DE:Tag:man made=carpet hanger
+    man_made=cellar_entrance: DE:Tag:man made=cellar entrance
     man_made=chimney: DE:Tag:man made=chimney
+    man_made=clearcut: DE:Tag:man made=clearcut
+    man_made=column: DE:Tag:man made=column
     man_made=communications_tower: DE:Tag:man made=communications tower
     man_made=cooling_tower: DE:Tag:man made=cooling tower
     man_made=crane: DE:Tag:man made=crane
     man_made=cross: DE:Tag:man made=cross
     man_made=cutline: DE:Tag:man made=cutline
+    man_made=dolphin: DE:Tag:man made=dolphin
     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=gantry: DE:Tag:man made=gantry
     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
@@ -3921,6 +4083,7 @@ de:
     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=manhole: DE:Tag:man made=manhole
     man_made=mast: DE:Tag:man made=mast
     man_made=maypole: DE:Tag:man made=maypole
     man_made=mineshaft: DE:Tag:man made=mineshaft
@@ -3964,6 +4127,7 @@ de:
     manhole=drain: DE:Tag:manhole=drain
     marker=aerial: DE:Tag:marker=aerial
     marker=post: DE:Tag:marker=post
+    maxheight=default: DE:Tag:maxheight=default
     megalith_type=alignment: DE:Tag:megalith type=alignment
     megalith_type=chamber: DE:Tag:megalith type=chamber
     megalith_type=cist: DE:Tag:megalith type=cist
@@ -3987,15 +4151,20 @@ de:
     microbrewery=yes: DE:Tag:microbrewery=yes
     military=airfield: DE:Tag:military=airfield
     military=barracks: DE:Tag:military=barracks
+    military=base: DE:Tag:military=base
     military=bunker: DE:Tag:military=bunker
+    military=checkpoint: DE:Tag:military=checkpoint
     military=danger_area: DE:Tag:military=danger area
     military=naval_base: DE:Tag:military=naval base
     military=nuclear_explosion_site: DE:Tag:military=nuclear explosion site
+    military=obstacle_course: DE:Tag:military=obstacle course
     military=range: DE:Tag:military=range
     military=training_area: DE:Tag:military=training area
+    military=trench: DE:Tag:military=trench
     mooring=cruise: DE:Tag:mooring=cruise
     mooring=guest: DE:Tag:mooring=guest
     motorcycle:type=scooter: DE:Tag:motorcycle:type=scooter
+    mountain_pass=yes: DE:Tag:mountain pass=yes
     museum=archaeological: DE:Tag:museum=archaeological
     museum=children: DE:Tag:museum=children
     museum=history: DE:Tag:museum=history
@@ -4046,6 +4215,7 @@ de:
     natural=tree: DE:Tag:natural=tree
     natural=tree_group: DE:Tag:natural=tree group
     natural=tree_row: DE:Tag:natural=tree row
+    natural=tree_stump: DE:Tag:natural=tree stump
     natural=valley: DE:Tag:natural=valley
     natural=volcano: DE:Tag:natural=volcano
     natural=water: DE:Tag:natural=water
@@ -4079,6 +4249,7 @@ de:
     office=chamber: DE:Tag:office=chamber
     office=charity: DE:Tag:office=charity
     office=company: DE:Tag:office=company
+    office=consulting: DE:Tag:office=consulting
     office=diplomatic: DE:Tag:office=diplomatic
     office=educational_institution: DE:Tag:office=educational institution
     office=employment_agency: DE:Tag:office=employment agency
@@ -4099,6 +4270,7 @@ de:
     office=newspaper: DE:Tag:office=newspaper
     office=ngo: DE:Tag:office=ngo
     office=parish: DE:Tag:office=parish
+    office=physician: DE:Tag:office=physician
     office=political_party: DE:Tag:office=political party
     office=property_management: DE:Tag:office=property management
     office=religion: DE:Tag:office=religion
@@ -4110,6 +4282,7 @@ de:
     office=therapist: DE:Tag:office=therapist
     office=travel_agent: DE:Tag:office=travel agent
     office=union: DE:Tag:office=union
+    office=visa: DE:Tag:office=visa
     office=water_utility: DE:Tag:office=water utility
     oneway=-1: DE:Tag:oneway=-1
     oneway=alternating: DE:Tag:oneway=alternating
@@ -4167,6 +4340,7 @@ de:
     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=hopscotch: DE:Tag:playground=hopscotch
     playground=structure: DE:Tag:playground=structure
     police=academy: DE:Tag:police=academy
     police=barracks: DE:Tag:police=barracks
@@ -4179,9 +4353,10 @@ de:
     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
+    port=fishing: DE:Tag:port=fishing
     power=cable: DE:Tag:power=cable
     power=cable_distribution_cabinet: DE:Tag:power=cable distribution cabinet
+    power=catenary_mast: DE:Tag:power=catenary mast
     power=compensator: DE:Tag:power=compensator
     power=converter: DE:Tag:power=converter
     power=generator: DE:Tag:power=generator
@@ -4209,6 +4384,7 @@ de:
     railway=abandoned: DE:Tag:railway=abandoned
     railway=buffer_stop: DE:Tag:railway=buffer stop
     railway=crossing: DE:Tag:railway=crossing
+    railway=crossing_box: DE:Tag:railway=crossing box
     railway=derail: DE:Tag:railway=derail
     railway=disused: DE:Tag:railway=disused
     railway=funicular: DE:Tag:railway=funicular
@@ -4220,6 +4396,7 @@ de:
     railway=miniature: DE:Tag:railway=miniature
     railway=monorail: DE:Tag:railway=monorail
     railway=narrow_gauge: DE:Tag:railway=narrow gauge
+    railway=owner_change: DE:Tag:railway=owner change
     railway=platform: DE:Tag:railway=platform
     railway=platform_edge: DE:Tag:railway=platform edge
     railway=preserved: DE:Tag:railway=preserved
@@ -4227,6 +4404,7 @@ de:
     railway=rail_brake: DE:Tag:railway=rail brake
     railway=railway_crossing: DE:Tag:railway=railway crossing
     railway=roundhouse: DE:Tag:railway=roundhouse
+    railway=service_station: DE:Tag:railway=service station
     railway=signal: DE:Tag:railway=signal
     railway=signal_box: DE:Tag:railway=signal box
     railway=station: DE:Tag:railway=station
@@ -4234,6 +4412,7 @@ de:
     railway=subway: DE:Tag:railway=subway
     railway=subway_entrance: DE:Tag:railway=subway entrance
     railway=switch: DE:Tag:railway=switch
+    railway=train_station_entrance: DE:Tag:railway=train station entrance
     railway=tram: DE:Tag:railway=tram
     railway=tram_crossing: DE:Tag:railway=tram crossing
     railway=tram_level_crossing: DE:Tag:railway=tram level crossing
@@ -4245,6 +4424,7 @@ de:
     railway=yard: DE:Tag:railway=yard
     recycling_type=centre: DE:Tag:recycling type=centre
     recycling_type=container: DE:Tag:recycling type=container
+    refrigerated=yes: DE:Tag:refrigerated=yes
     religion=buddhist: DE:Tag:religion=buddhist
     religion=christian: DE:Tag:religion=christian
     religion=hindu: DE:Tag:religion=hindu
@@ -4254,9 +4434,16 @@ de:
     rental=ski: DE:Tag:rental=ski
     rental=strandkorb: DE:Tag:rental=strandkorb
     repair=assisted_self_service: DE:Tag:repair=assisted self service
+    request_stop=yes: DE:Tag:request stop=yes
+    residential=rural: DE:Tag:residential=rural
     residential=urban: DE:Tag:residential=urban
     resource=aggregate: DE:Tag:resource=aggregate
+    road_marking=solid_stop_line: DE:Tag:road marking=solid stop line
     roller_coaster=track: DE:Tag:roller coaster=track
+    roof:shape=flat: DE:Tag:roof:shape=flat
+    roof:shape=gabled: DE:Tag:roof:shape=gabled
+    roof:shape=many: DE:Tag:roof:shape=many
+    roof:shape=skillion: DE:Tag:roof:shape=skillion
     route=bicycle: DE:Tag:route=bicycle
     route=bus: DE:Tag:route=bus
     route=detour: DE:Tag:route=detour
@@ -4264,6 +4451,7 @@ de:
     route=fitness_trail: DE:Tag:route=fitness trail
     route=foot: DE:Tag:route=foot
     route=hiking: DE:Tag:route=hiking
+    route=historic: DE:Tag:route=historic
     route=horse: DE:Tag:route=horse
     route=inline_skates: DE:Tag:route=inline skates
     route=light_rail: DE:Tag:route=light rail
@@ -4282,6 +4470,7 @@ de:
     route=train: DE:Tag:route=train
     route=tram: DE:Tag:route=tram
     route=trolleybus: DE:Tag:route=trolleybus
+    seamark:type=fairway: DE:Tag:seamark:type=fairway
     seamark:type=mooring: DE:Tag:seamark:type=mooring
     seamark:type=rock: DE:Tag:seamark:type=rock
     segregated=no: DE:Tag:segregated=no
@@ -4320,6 +4509,7 @@ de:
     shop=bookmaker: DE:Tag:shop=bookmaker
     shop=books: DE:Tag:shop=books
     shop=boutique: DE:Tag:shop=boutique
+    shop=brewing_supplies: DE:Tag:shop=brewing supplies
     shop=butcher: DE:Tag:shop=butcher
     shop=camera: DE:Tag:shop=camera
     shop=candles: DE:Tag:shop=candles
@@ -4348,6 +4538,7 @@ de:
     shop=doityourself: DE:Tag:shop=doityourself
     shop=doors: DE:Tag:shop=doors
     shop=dry_cleaning: DE:Tag:shop=dry cleaning
+    shop=electrical: DE:Tag:shop=electrical
     shop=electronics: DE:Tag:shop=electronics
     shop=equestrian: DE:Tag:shop=equestrian
     shop=erotic: DE:Tag:shop=erotic
@@ -4367,6 +4558,7 @@ de:
     shop=gas: DE:Tag:shop=gas
     shop=general: DE:Tag:shop=general
     shop=gift: DE:Tag:shop=gift
+    shop=glaziery: DE:Tag:shop=glaziery
     shop=golf: DE:Tag:shop=golf
     shop=greengrocer: DE:Tag:shop=greengrocer
     shop=grocery: DE:Tag:shop=grocery
@@ -4409,15 +4601,18 @@ de:
     shop=outpost: DE:Tag:shop=outpost
     shop=paint: DE:Tag:shop=paint
     shop=party: DE:Tag:shop=party
+    shop=pasta: DE:Tag:shop=pasta
     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=plant_hire: DE:Tag:shop=plant hire
     shop=pottery: DE:Tag:shop=pottery
     shop=radiotechnics: DE:Tag:shop=radiotechnics
     shop=religion: DE:Tag:shop=religion
+    shop=repair: DE:Tag:shop=repair
     shop=robot: DE:Tag:shop=robot
     shop=scuba_diving: DE:Tag:shop=scuba diving
     shop=seafood: DE:Tag:shop=seafood
@@ -4468,11 +4663,13 @@ de:
     site_type=tumulus: DE:Tag:site type=tumulus
     social_facility=ambulatory_care: DE:Tag:social facility=ambulatory care
     social_facility=assisted_living: DE:Tag:social facility=assisted living
+    social_facility=clothing_bank: DE:Tag:social facility=clothing bank
     social_facility=day_care: DE:Tag:social facility=day care
     social_facility=food_bank: DE:Tag:social facility=food bank
     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=outreach: DE:Tag:social facility=outreach
     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
@@ -4528,6 +4725,7 @@ de:
     sport=sailing: DE:Tag:sport=sailing
     sport=scuba_diving: DE:Tag:sport=scuba diving
     sport=shooting: DE:Tag:sport=shooting
+    sport=shot-put: DE:Tag:sport=shot-put
     sport=skateboard: DE:Tag:sport=skateboard
     sport=soccer: DE:Tag:sport=soccer
     sport=swimming: DE:Tag:sport=swimming
@@ -4537,6 +4735,8 @@ de:
     sport=toboggan: DE:Tag:sport=toboggan
     sport=trampoline: DE:Tag:sport=trampoline
     sport=volleyball: DE:Tag:sport=volleyball
+    sport=water_ski: DE:Tag:sport=water ski
+    sport=yoga: DE:Tag:sport=yoga
     station=light_rail: DE:Tag:station=light rail
     station=subway: DE:Tag:station=subway
     studio=audio: DE:Tag:studio=audio
@@ -4551,6 +4751,7 @@ de:
     summit:cross=yes: DE:Tag:summit:cross=yes
     surface=artificial_turf: DE:Tag:surface=artificial turf
     surface=asphalt: DE:Tag:surface=asphalt
+    surface=chipseal: DE:Tag:surface=chipseal
     surface=clay: DE:Tag:surface=clay
     surface=cobblestone: DE:Tag:surface=cobblestone
     surface=compacted: DE:Tag:surface=compacted
@@ -4566,6 +4767,7 @@ de:
     surface=tartan: DE:Tag:surface=tartan
     surface=unhewn_cobblestone: DE:Tag:surface=unhewn cobblestone
     surface=unpaved: DE:Tag:surface=unpaved
+    swimming_pool=yes: DE:Tag:swimming pool=yes
     switch=circuit_breaker: DE:Tag:switch=circuit breaker
     switch=disconnector: DE:Tag:switch=disconnector
     switch=mechanical: DE:Tag:switch=mechanical
@@ -4630,11 +4832,22 @@ 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=bump: DE:Tag:traffic calming=bump
+    traffic_calming=chicane: DE:Tag:traffic calming=chicane
+    traffic_calming=choker: DE:Tag:traffic calming=choker
+    traffic_calming=cushion: DE:Tag:traffic calming=cushion
+    traffic_calming=dip: DE:Tag:traffic calming=dip
+    traffic_calming=double_dip: DE:Tag:traffic calming=double dip
     traffic_calming=dynamic_bump: DE:Tag:traffic calming=dynamic bump
+    traffic_calming=hump: DE:Tag:traffic calming=hump
     traffic_calming=island: DE:Tag:traffic calming=island
+    traffic_calming=mini_bumps: DE:Tag:traffic calming=mini bumps
+    traffic_calming=rumble_strip: DE:Tag:traffic calming=rumble strip
     traffic_calming=table: DE:Tag:traffic calming=table
     'traffic_sign=DE:': 'DE:Tag:traffic sign=DE:'
     traffic_sign=DE:1022-10: DE:Tag:traffic sign=DE:1022-10
+    traffic_sign=DE:103-10: DE:Tag:traffic sign=DE:103-10
+    traffic_sign=DE:103-20: DE:Tag:traffic sign=DE:103-20
     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
@@ -4683,6 +4896,8 @@ de:
     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:276: DE:Tag:traffic sign=DE:276
+    traffic_sign=DE:277: DE:Tag:traffic sign=DE:277
     traffic_sign=DE:282: DE:Tag:traffic sign=DE:282
     traffic_sign=DE:306: DE:Tag:traffic sign=DE:306
     traffic_sign=DE:310: DE:Tag:traffic sign=DE:310
@@ -4700,6 +4915,8 @@ de:
     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: DE:Tag:traffic sign=DE:386
+    traffic_sign=DE:386.1: DE:Tag:traffic sign=DE:386.1
     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
@@ -4708,10 +4925,16 @@ de:
     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=DE:600-30: DE:Tag:traffic sign=DE:600-30
+    traffic_sign=DE:600-31: DE:Tag:traffic sign=DE:600-31
+    traffic_sign=DE:600-32: DE:Tag:traffic sign=DE:600-32
+    traffic_sign=DE:600-33: DE:Tag:traffic sign=DE:600-33
+    traffic_sign=DE:600-34: DE:Tag:traffic sign=DE:600-34
     traffic_sign=city_limit: DE:Tag:traffic sign=city limit
     transformer=distribution: DE:Tag:transformer=distribution
     tunnel=building_passage: DE:Tag:tunnel=building passage
     tunnel=culvert: DE:Tag:tunnel=culvert
+    type=enforcement: DE:Tag:type=enforcement
     type=waterway: DE:Tag:type=waterway
     usage=headrace: DE:Tag:usage=headrace
     usage=industrial: DE:Tag:usage=industrial
@@ -4719,6 +4942,7 @@ de:
     usage=penstock: DE:Tag:usage=penstock
     usage=tailrace: DE:Tag:usage=tailrace
     usage=transmission: DE:Tag:usage=transmission
+    vehicle=no: DE:Tag:vehicle=no
     vending: DE:Tag:vending
     vending=animal_feed: DE:Tag:vending=animal feed
     vending=bicycle_tube: DE:Tag:vending=bicycle tube
@@ -4727,10 +4951,13 @@ de:
     vending=candles: DE:Tag:vending=candles
     vending=chewing_gums: DE:Tag:vending=chewing gums
     vending=coffee: DE:Tag:vending=coffee
+    vending=coin_change_machine: DE:Tag:vending=coin change machine
     vending=elongated_coin: DE:Tag:vending=elongated coin
     vending=excrement_bags: DE:Tag:vending=excrement bags
+    vending=flower_seeds: DE:Tag:vending=flower seeds
     vending=flowers: DE:Tag:vending=flowers
     vending=food: DE:Tag:vending=food
+    vending=fuel: DE:Tag:vending=fuel
     vending=ice_cream: DE:Tag:vending=ice cream
     vending=milk: DE:Tag:vending=milk
     vending=newspapers: DE:Tag:vending=newspapers
@@ -4743,6 +4970,7 @@ de:
     vending=sex_toys: DE:Tag:vending=sex toys
     vending=stamps: DE:Tag:vending=stamps
     vending=sweets: DE:Tag:vending=sweets
+    vending=syringes: DE:Tag:vending=syringes
     vending=toys: DE:Tag:vending=toys
     vending=water: DE:Tag:vending=water
     vending_machine=fuel: DE:Tag:vending machine=fuel
@@ -4750,12 +4978,23 @@ de:
     wall=dry_stone: DE:Tag:wall=dry stone
     wall=no: DE:Tag:wall=no
     wall=noise_barrier: DE:Tag:wall=noise barrier
+    wall=stone: DE:Tag:wall=stone
+    wall=stone_wall: DE:Tag:wall=stone wall
+    waste=cigarettes: DE:Tag:waste=cigarettes
     waste=dog_excrement: DE:Tag:waste=dog excrement
+    waste=drugs: DE:Tag:waste=drugs
+    waste=oil: DE:Tag:waste=oil
+    waste=organic: DE:Tag:waste=organic
+    waste=pizza_box: DE:Tag:waste=pizza box
+    waste=rubble: DE:Tag:waste=rubble
+    waste=trash: DE:Tag:waste=trash
     water=basin: DE:Tag:water=basin
     water=canal: DE:Tag:water=canal
+    water=harbour: DE:Tag:water=harbour
     water=lagoon: DE:Tag:water=lagoon
     water=lake: DE:Tag:water=lake
     water=lock: DE:Tag:water=lock
+    water=moat: DE:Tag:water=moat
     water=oxbow: DE:Tag:water=oxbow
     water=pond: DE:Tag:water=pond
     water=reservoir: DE:Tag:water=reservoir
@@ -4779,6 +5018,7 @@ de:
     waterway=rapids: DE:Tag:waterway=rapids
     waterway=river: DE:Tag:waterway=river
     waterway=riverbank: DE:Tag:waterway=riverbank
+    waterway=security_lock: DE:Tag:waterway=security lock
     waterway=stream: DE:Tag:waterway=stream
     waterway=tidal_channel: DE:Tag:waterway=tidal channel
     waterway=waterfall: DE:Tag:waterway=waterfall
@@ -4843,8 +5083,14 @@ el:
     highway=track: El:Tag:highway=track
 en:
   key:
+    '*:backward': Key:*:backward
     '*:conditional': Key:*:conditional
+    '*:en': Key:*:en
+    '*:forward': Key:*:forward
     '*:lanes': Key:*:lanes
+    '*:left': Key:*:left
+    '*:right': Key:*:right
+    '*:wikidata': Key:*:wikidata
     3dmr: Key:3dmr
     3dr:type: Key:3dr:type
     4wd_only: Key:4wd only
@@ -4854,6 +5100,7 @@ en:
     AlpinRes_ID: Key:AlpinRes ID
     CEMT: Key:CEMT
     CLC:code: Key:CLC:code
+    Community: Key:Community
     DGPS_correction: Key:DGPS correction
     EHAK:code: Key:EHAK:code
     EH_ref: Key:EH ref
@@ -4864,6 +5111,7 @@ en:
     GNS:dsg_code: Key:GNS:dsg code
     GNS:id: Key:GNS:id
     HE_ref: Key:HE ref
+    HFCS: Key:HFCS
     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
@@ -4879,20 +5127,25 @@ en:
     LINZ2OSM:dataset: Key:LINZ2OSM:dataset
     LINZ2OSM:layer: Key:LINZ2OSM:layer
     LINZ2OSM:source_version: Key:LINZ2OSM:source version
+    LINZ:dataset: Key:LINZ:dataset
     LINZ:layer: Key:LINZ:layer
     LINZ:source_version: Key:LINZ:source version
     Lock_ref: Key:Lock ref
     Mapper: Key:Mapper
+    NHD:FCode: Key:NHD:FCode
     NHD:ReachCode: Key:NHD:ReachCode
     NHS: Key:NHS
     NSIW: Key:NSIW
+    Oslostandarden: Key:Oslostandarden
     PMSA_ref: Key:PMSA ref
+    Place:CN: Key:Place:CN
     Power_supply:schedule: Key:Power supply:schedule
     RLIS:bicycle: Key:RLIS:bicycle
     RLIS:reviewed: Key:RLIS:reviewed
     Schalansky_ref: Key:Schalansky ref
     Shop: Key:Shop
     Source: Key:Source
+    TARC: Key:TARC
     TMC: Key:TMC
     TMC:Direction: Key:TMC:Direction
     TMC:LocationCode: Key:TMC:LocationCode
@@ -4912,96 +5165,80 @@ en:
     abandoned:railway: Key:abandoned:railway
     abutters: Key:abutters
     access: Key:access
-    access:bdouble: Key:access:bdouble
     access:conditional: Key:access:conditional
+    access:covid19: Key:access:covid19
     access:lanes: Key:access:lanes
-    access:lhv: Key:access:lhv
-    access:roadtrain: Key:access:roadtrain
     access:roadtrain:trailers: Key:access:roadtrain:trailers
+    accuracy:meters: Key:accuracy:meters
     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:TW:dataset: Key:addr:TW:dataset
+    addr:block_number: Key:addr:block number
     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:scl: Key:addr:city:scl
     addr:city:simc: Key:addr:city:simc
+    addr:city:ur: Key:addr:city:ur
     addr:conscriptionnumber: Key:addr:conscriptionnumber
     addr:country: Key:addr:country
-    addr:description: Key:addr:description
-    addr:description:ar: Key:addr:description:ar
+    addr:county: Key:addr:county
     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:district:ur: Key:addr:district:ur
     addr:flats: Key:addr:flats
     addr:floor: Key:addr:floor
-    addr:full: Key:addr:full
     addr:hamlet: Key:addr:hamlet
-    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:milestone: Key:addr:milestone
     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:plot: Key:addr:plot
     addr:postcode: Key:addr:postcode
+    addr:postcode:source: Key:addr:postcode:source
     addr:province: Key:addr:province
-    addr:province:ar: Key:addr:province:ar
-    addr:province:en: Key:addr:province:en
+    addr:province:ur: Key:addr:province:ur
     addr:provisionalnumber: Key:addr:provisionalnumber
-    addr:region: Key:addr:region
+    addr:sector: Key:addr:sector
+    addr:source: Key:addr:source
     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:street:ur: Key:addr:street:ur
     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:town: Key:addr:town
     addr:type: Key:addr:type
     addr:unit: Key:addr:unit
     admin_level: Key:admin level
+    admin_title: Key:admin title
     adr_les: Key:adr les
     advertising: Key:advertising
     aerialway: Key:aerialway
     aerialway:drag_lift: Key:aerialway:drag lift
     aerialway:duration: Key:aerialway:duration
+    aerialway:occupancy: Key:aerialway:occupancy
+    aerialway:station: Key:aerialway:station
     aerodrome:type: Key:aerodrome:type
     aeroway: Key:aeroway
     after_school: Key:after school
+    age: Key:age
     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:de: Key:alt name:de
     alt_name:en: Key:alt name:en
+    alt_name:es: Key:alt name:es
     alt_name:fa: Key:alt name:fa
     alt_name:fr: Key:alt name:fr
     alt_name:glk: Key:alt name:glk
@@ -5023,6 +5260,7 @@ en:
     alt_name:th: Key:alt name:th
     alt_name:ug: Key:alt name:ug
     alt_name:ur: Key:alt name:ur
+    alt_name:zh: Key:alt name:zh
     alt_name_1: Key:alt name 1
     amenity: Key:amenity
     amenity:eftpos: Key:amenity:eftpos
@@ -5036,8 +5274,12 @@ en:
     area: Key:area
     area:aeroway: Key:area:aeroway
     area:highway: Key:area:highway
+    artist:note: Key:artist:note
     artist:wikidata: Key:artist:wikidata
+    artist:wikipedia: Key:artist:wikipedia
     artist_name: Key:artist name
+    artwork:subject:wikidata: Key:artwork:subject:wikidata
+    artwork:subject:wikipedia: Key:artwork:subject:wikipedia
     artwork_subject: Key:artwork subject
     artwork_type: Key:artwork type
     asb: Key:asb
@@ -5065,10 +5307,15 @@ en:
     authentication:none: Key:authentication:none
     authentication:phone_call: Key:authentication:phone call
     authentication:short_message: Key:authentication:short message
+    auto_rickshaw: Key:auto rickshaw
     autoaws: Key:autoaws
     automated: Key:automated
     automatic_door: Key:automatic door
     autonomy: Key:autonomy
+    avalanche_protection: Key:avalanche protection
+    avalanche_transceiver: Key:avalanche transceiver
+    avz: Key:avz
+    baby: Key:baby
     baby_feeding: Key:baby feeding
     backcountry: Key:backcountry
     backrest: Key:backrest
@@ -5093,13 +5340,17 @@ en:
     bench:type: Key:bench:type
     bicycle: Key:bicycle
     bicycle:backward: Key:bicycle:backward
+    bicycle:both: Key:bicycle:both
     bicycle:class:mtb: Key:bicycle:class:mtb
     bicycle:class:mtb:technical: Key:bicycle:class:mtb:technical
     bicycle:conditional: Key:bicycle:conditional
     bicycle:designated:type: Key:bicycle:designated:type
     bicycle:forward: Key:bicycle:forward
+    bicycle:left: Key:bicycle:left
     bicycle:oneway: Key:bicycle:oneway
+    bicycle:right: Key:bicycle:right
     bicycle:type: Key:bicycle:type
+    bicycle_bypass: Key:bicycle bypass
     bicycle_parking: Key:bicycle parking
     bicycle_road: Key:bicycle road
     bike_ride: Key:bike ride
@@ -5124,12 +5375,19 @@ en:
     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:de: Key:brand:de
+    brand:en: Key:brand:en
+    brand:es: Key:brand:es
+    brand:main: Key:brand:main
+    brand:remarketed: Key:brand:remarketed
+    brand:website: Key:brand:website
     brand:wikidata: Key:brand:wikidata
     brand:wikipedia: Key:brand:wikipedia
     brand:wikipedia:ar: Key:brand:wikipedia:ar
+    brand:wikipedia:de: Key:brand:wikipedia:de
+    brand:wikipedia:es: Key:brand:wikipedia:es
     breakfast: Key:breakfast
     brewery: Key:brewery
     bridge: Key:bridge
@@ -5144,17 +5402,21 @@ en:
     bridge:short_name: Key:bridge:short name
     bridge:structure: Key:bridge:structure
     bridge:support: Key:bridge:support
+    bubbleid: Key:bubbleid
+    buffer_stop: Key:buffer stop
     building: Key:building
     building:age: Key:building:age
     building:architecture: Key:building:architecture
     building:cladding: Key:building:cladding
+    building:color: Key:building:color
     building:colour: Key:building:colour
     building:condition: Key:building:condition
     building:cullis:height: Key:building:cullis:height
+    building:design: Key:building:design
     building:facade:colour: Key:building:facade:colour
     building:fireproof: Key:building:fireproof
     building:flats: Key:building:flats
-    building:height: Key:building:height
+    building:foundation_height: Key:building:foundation height
     building:level: Key:building:level
     building:level:1,2,3...: Key:building:level:1,2,3...
     building:levels: Key:building:levels
@@ -5165,7 +5427,6 @@ en:
     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:soft_storey: Key:building:soft storey
@@ -5184,6 +5445,7 @@ en:
     bus:lanes:backward: Key:bus:lanes:backward
     bus:lanes:forward: Key:bus:lanes:forward
     bus_bay: Key:bus bay
+    bus_class:length: Key:bus class:length
     busbar: Key:busbar
     busway: Key:busway
     busway:left: Key:busway:left
@@ -5196,8 +5458,11 @@ en:
     cables: Key:cables
     cadc:2019: Key:cadc:2019
     cadc:2020: Key:cadc:2020
+    cadet: Key:cadet
     cafe: Key:cafe
     callsign: Key:callsign
+    camera:direction: Key:camera:direction
+    camera:type: Key:camera:type
     camp_site: Key:camp site
     camp_type: Key:camp type
     campers: Key:campers
@@ -5223,6 +5488,8 @@ en:
     carpool: Key:carpool
     carriage: Key:carriage
     carriageway_ref: Key:carriageway ref
+    carriageway_ref:left: Key:carriageway ref:left
+    carriageway_ref:right: Key:carriageway ref:right
     casemate: Key:casemate
     cash_withdrawal: Key:cash withdrawal
     cash_withdrawal:currency: Key:cash withdrawal:currency
@@ -5243,6 +5510,7 @@ en:
     census:population: Key:census:population
     centralkey: Key:centralkey
     change: Key:change
+    change:lanes: Key:change:lanes
     changesets_count: Key:changesets count
     changing_table: Key:changing table
     changing_table:count: Key:changing table:count
@@ -5252,6 +5520,10 @@ en:
     charity: Key:charity
     chchsid: Key:chchsid
     check_date: Key:check date
+    check_date:crossing: Key:check date:crossing
+    check_date:opening_hours: Key:check date:opening hours
+    check_date:shelter: Key:check date:shelter
+    check_date:surface: Key:check date:surface
     checkpoint: Key:checkpoint
     china_class: Key:china class
     china_population: Key:china population
@@ -5260,6 +5532,7 @@ en:
     circumference: Key:circumference
     city_limit: Key:city limit
     clacks_overhead: Key:clacks overhead
+    claimed_by: Key:claimed by
     class: Key:class
     class:bicycle: Key:class:bicycle
     class:bicycle:commute: Key:class:bicycle:commute
@@ -5277,7 +5550,6 @@ en:
     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
@@ -5296,6 +5568,7 @@ en:
     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:power: Key:communication:amateur radio:repeater:power
     communication:amateur_radio:repeater:shift: Key:communication:amateur radio:repeater:shift
     communication:amateur_radio:repeater:toneburst: Key:communication:amateur radio:repeater:toneburst
     communication:bos: Key:communication:bos
@@ -5308,55 +5581,42 @@ en:
     community_centre: Key:community centre
     community_centre:for: Key:community centre:for
     company: Key:company
+    compensator: Key:compensator
     compressed_air: Key:compressed air
     condition: Key:condition
     conditional: Key:conditional
     condo: Key:condo
+    confession_times: Key:confession times
     connection_point: Key:connection point
+    consecrated: Key:consecrated
     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:sip: Key:contact:sip
     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
+    contamination: Key:contamination
     content: Key:content
     converted_by: Key:converted by
     conveying: Key:conveying
     cooker: Key:cooker
     cooling:method: Key:cooling:method
+    corners: Key:corners
+    cosmha: Key:cosmha
+    counselling: Key:counselling
+    counselling_type:*: Key:counselling type:*
     country: Key:country
+    couplings: Key:couplings
     courts: Key:courts
     covered: Key:covered
     craft: Key:craft
@@ -5367,11 +5627,17 @@ en:
     crossing:activation: Key:crossing:activation
     crossing:barrier: Key:crossing:barrier
     crossing:bell: Key:crossing:bell
+    crossing:chicane: Key:crossing:chicane
     crossing:island: Key:crossing:island
     crossing:light: Key:crossing:light
+    crossing:marking: Key:crossing:marking
     crossing:on_demand: Key:crossing:on demand
     crossing:saltire: Key:crossing:saltire
+    crossing:signals: Key:crossing:signals
     crossing_ref: Key:crossing ref
+    cruising: Key:cruising
+    cs_dir:backward: Key:cs dir:backward
+    cs_dir:forward: Key:cs dir:forward
     cuisine: Key:cuisine
     cultivation_method: Key:cultivation method
     currency: Key:currency
@@ -5382,20 +5648,28 @@ en:
     currency:PLN: Key:currency:PLN
     currency:RUB: Key:currency:RUB
     currency:USD: Key:currency:USD
+    currency:XBT: Key:currency:XBT
     currency:XXX: Key:currency:XXX
     currency:others: Key:currency:others
     curve: Key:curve
+    curve:name: Key:curve:name
+    curve:ref: Key:curve:ref
     curves: Key:curves
     cutting: Key:cutting
     cyclability: Key:cyclability
     cycle: Key:cycle
+    cycle_barrier: Key:cycle barrier
+    cycle_barrier:installation: Key:cycle barrier:installation
     cycle_highway: Key:cycle highway
     cycle_network: Key:cycle network
+    cycle_rickshaw: Key:cycle rickshaw
     cyclestreet: Key:cyclestreet
     cyclestreets_id: Key:cyclestreets id
     cycleway: Key:cycleway
     cycleway:both: Key:cycleway:both
+    cycleway:both:lane: Key:cycleway:both:lane
     cycleway:buffer: Key:cycleway:buffer
+    cycleway:foot: Key:cycleway:foot
     cycleway:lane: Key:cycleway:lane
     cycleway:left: Key:cycleway:left
     cycleway:left:lane: Key:cycleway:left:lane
@@ -5406,24 +5680,28 @@ en:
     cycleway:right:oneway: Key:cycleway:right:oneway
     cycleway:right:surface: Key:cycleway:right:surface
     cycleway:right=forward: Key:cycleway:right=forward
+    cycleway:segregated: Key:cycleway:segregated
     cycleway:surface: Key:cycleway:surface
     cycleway:width: Key:cycleway:width
     cycling_width: Key:cycling width
+    damage: Key:damage
+    'damage:': 'Key:damage:'
+    damage:date: Key:damage:date
+    damage:event: Key:damage:event
+    damage:type: Key:damage:type
     dance:style: Key:dance:style
     dance:teaching: Key:dance:teaching
     date: Key:date
-    date_off: Key:date off
-    date_on: Key:date on
-    day_off: Key:day off
-    day_on: Key:day on
     de:amtlicher_gemeindeschluessel: Key:de:amtlicher gemeindeschluessel
     de:regionalschluessel: Key:de:regionalschluessel
     de:strassenschluessel: Key:de:strassenschluessel
     deanery: Key:deanery
     default_language: Key:default language
-    defensive_structure: Key:defensive structure
+    defensive_works: Key:defensive works
+    deflection: Key:deflection
     dehoga: Key:dehoga
     delivery: Key:delivery
+    delivery:partner: Key:delivery:partner
     delivery_point: Key:delivery point
     delivery_point:access: Key:delivery point:access
     delivery_point:type: Key:delivery point:type
@@ -5474,6 +5752,7 @@ en:
     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
+    destination:wikidata: Key:destination:wikidata
     destroyed: Key:destroyed
     'destroyed:': 'Key:destroyed:'
     detour: Key:detour
@@ -5482,7 +5761,6 @@ en:
     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:'
@@ -5517,9 +5795,11 @@ en:
     disabled: Key:disabled
     disabled_spaces: Key:disabled spaces
     disc_golf: Key:disc golf
+    disease:*: Key:disease:*
     dishwasher: Key:dishwasher
     dispensing: Key:dispensing
     display: Key:display
+    disputed_by: Key:disputed by
     distance: Key:distance
     distillery: Key:distillery
     'disused:': 'Key:disused:'
@@ -5541,15 +5821,11 @@ en:
     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
@@ -5579,14 +5855,20 @@ en:
     ele: Key:ele
     ele:NHN: Key:ele:NHN
     ele:local: Key:ele:local
+    ele:max: Key:ele:max
+    ele:min: Key:ele:min
+    ele:natural: Key:ele:natural
     ele:wgs84: Key:ele:wgs84
     electric_bicycle: Key:electric bicycle
+    electric_scooter: Key:electric scooter
     electricity: Key:electricity
     electrified: Key:electrified
     elevator: Key:elevator
     email: Key:email
     embankment: Key:embankment
+    embankment:side: Key:embankment:side
     embassy: Key:embassy
+    embedded: Key:embedded
     embedded_rails: Key:embedded rails
     embedded_rails:lanes: Key:embedded rails:lanes
     emergency: Key:emergency
@@ -5598,12 +5880,18 @@ en:
     enforcement: Key:enforcement
     engineer: Key:engineer
     entrance: Key:entrance
+    ephemeral: Key:ephemeral
+    escooter: Key:escooter
+    esr:user: Key:esr:user
     est_height: Key:est height
     est_length: Key:est length
     est_width: Key:est width
+    estuary: Key:estuary
     etymology: Key:etymology
+    euro_const: Key:euro const
     european_cultural_path: Key:european cultural path
     evacuation_route: Key:evacuation route
+    events_venue: Key:events venue
     excavation: Key:excavation
     exhibit: Key:exhibit
     exit: Key:exit
@@ -5612,6 +5900,7 @@ en:
     expressway: Key:expressway
     facebook: Key:facebook
     faces: Key:faces
+    factory: Key:factory
     fair_trade: Key:fair trade
     fallow: Key:fallow
     farming_system: Key:farming system
@@ -5621,6 +5910,7 @@ en:
     fax: Key:fax
     fcc:registration_number: Key:fcc:registration number
     fcc:unique_system_identifier: Key:fcc:unique system identifier
+    fdep:landuse_code: Key:fdep:landuse code
     fee: Key:fee
     fee:conditional: Key:fee:conditional
     fee:disabled: Key:fee:disabled
@@ -5636,12 +5926,15 @@ en:
     fhrs:authority: Key:fhrs:authority
     fhrs:id: Key:fhrs:id
     fhrs:local_authority_id: Key:fhrs:local authority id
+    fid: Key:fid
     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:diameter: Key:fire hydrant:diameter
+    fire_hydrant:diameter:signed: Key:fire hydrant:diameter:signed
     fire_object:type: Key:fire object:type
     fire_operator: Key:fire operator
     fire_path: Key:fire path
@@ -5653,14 +5946,17 @@ en:
     fitness_station: Key:fitness station
     fix_guidepost: Key:fix guidepost
     fixme: Key:fixme
+    fixme:osmchina: Key:fixme:osmchina
     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
+    flats: Key:flats
     flickr: Key:flickr
     floating: Key:floating
+    flood_date: Key:flood date
     flood_mark: Key:flood mark
     flood_prone: Key:flood prone
     floor:material: Key:floor:material
@@ -5671,8 +5967,10 @@ en:
     foot:forward: Key:foot:forward
     footway: Key:footway
     footway:surface: Key:footway:surface
+    foraging: Key:foraging
     ford: Key:ford
     forestry: Key:forestry
+    forklift: Key:forklift
     format: Key:format
     format:top: Key:format:top
     fortification_type: Key:fortification type
@@ -5750,6 +6048,7 @@ en:
     genus:it: Key:genus:it
     genus:ru: Key:genus:ru
     genus:wikidata: Key:genus:wikidata
+    geobase:acquisitionTechnique: Key:geobase:acquisitionTechnique
     geocodigo: Key:geocodigo
     geological: Key:geological
     geothermal: Key:geothermal
@@ -5761,6 +6060,7 @@ en:
     gnis:feature_id: Key:gnis:feature id
     gnis:ftype: Key:gnis:ftype
     gnis:id: Key:gnis:id
+    gnis:import_uuid: Key:gnis:import uuid
     golf: Key:golf
     golf:course: Key:golf:course
     golf_cart: Key:golf cart
@@ -5781,6 +6081,7 @@ en:
     gtfs:trip_id:sample: Key:gtfs:trip id:sample
     guest_house: Key:guest house
     guide: Key:guide
+    guide_type: Key:guide type
     guidepost: Key:guidepost
     guidepost:hiking: Key:guidepost:hiking
     gun_emplacement_type: Key:gun emplacement type
@@ -5806,9 +6107,15 @@ en:
     hazard_return_period: Key:hazard return period
     hazard_type: Key:hazard type
     hazmat: Key:hazmat
+    hazmat:explosive: Key:hazmat:explosive
     hazmat:water: Key:hazmat:water
     headframe: Key:headframe
+    headlight: Key:headlight
+    health_amenity:*: Key:health amenity:*
+    health_amenity:type: Key:health amenity:type
     health_facility:type: Key:health facility:type
+    health_service:*: Key:health service:*
+    health_service:counselling: Key:health service:counselling
     healthcare: Key:healthcare
     healthcare:counselling: Key:healthcare:counselling
     healthcare:speciality: Key:healthcare:speciality
@@ -5829,22 +6136,26 @@ en:
     highway:category: Key:highway:category
     highway:category:pl: Key:highway:category:pl
     highway:class:pl: Key:highway:class:pl
+    highway_authority_ref: Key:highway authority ref
     hiking: Key:hiking
     historic: Key:historic
     historic:civilization: Key:historic:civilization
     historic:era: Key:historic:era
     historic:period: Key:historic:period
     history: Key:history
+    hiv: Key:hiv
+    hiv:test: Key:hiv:test
     hoops: Key:hoops
     horse: Key:horse
     horse-drawn_carriage: Key:horse-drawn carriage
     horse_scale: Key:horse scale
+    hospital:level:CN: Key:hospital:level:CN
+    host: Key:host
     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
+    hov:minimum: Key:hov:minimum
     hunting: Key:hunting
     hunting_stand: Key:hunting stand
     iata: Key:iata
@@ -5872,18 +6183,31 @@ en:
     industrial: Key:industrial
     industry:isic_code: Key:industry:isic code
     infant_bed: Key:infant bed
+    infection:hiv: Key:infection:hiv
     informal: Key:informal
     information: Key:information
+    inlet: Key:inlet
     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_name:arc: Key:int name:arc
+    int_name:de: Key:int name:de
+    int_name:es: Key:int name:es
+    int_name:gr: Key:int name:gr
+    int_name:grc: Key:int name:grc
+    int_name:syc: Key:int name:syc
     int_ref: Key:int ref
     int_ref:ar: Key:int ref:ar
+    int_ref:arc: Key:int ref:arc
+    int_ref:de: Key:int ref:de
+    int_ref:es: Key:int ref:es
+    int_ref:gr: Key:int ref:gr
+    int_ref:grc: Key:int ref:grc
+    int_ref:syc: Key:int ref:syc
     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
@@ -5944,7 +6268,7 @@ en:
     kms:zip_name: Key:kms:zip name
     kms:zip_no: Key:kms:zip no
     kneipp_water_cure: Key:kneipp water cure
-    kp: Key:kp
+    kons:inscription_date: Key:kons:inscription date
     kudish: Key:kudish
     kurb: Key:kurb
     lacounty:ain: Key:lacounty:ain
@@ -5974,6 +6298,7 @@ en:
     language:ckb: Key:language:ckb
     language:de: Key:language:de
     language:el: Key:language:el
+    language:es: Key:language:es
     language:fa: Key:language:fa
     language:glk: Key:language:glk
     language:gr: Key:language:gr
@@ -6014,10 +6339,13 @@ en:
     listed_status: Key:listed status
     lit: Key:lit
     lit:perceived: Key:lit:perceived
+    lit_by_led: Key:lit by led
     living_street: Key:living street
     loading_gauge: Key:loading gauge
     loc_name: Key:loc name
     loc_name:ar: Key:loc name:ar
+    loc_name:de: Key:loc name:de
+    loc_name:es: Key:loc name:es
     loc_name:fa: Key:loc name:fa
     loc_name:gr: Key:loc name:gr
     loc_name:grc: Key:loc name:grc
@@ -6036,9 +6364,15 @@ en:
     locked:conditional: Key:locked:conditional
     long_name: Key:long name
     long_name:ar: Key:long name:ar
+    long_name:arc: Key:long name:arc
     long_name:azb: Key:long name:azb
+    long_name:de: Key:long name:de
+    long_name:es: Key:long name:es
     long_name:fa: Key:long name:fa
+    long_name:gr: Key:long name:gr
+    long_name:grc: Key:long name:grc
     long_name:pnb: Key:long name:pnb
+    long_name:syc: Key:long name:syc
     long_name:ur: Key:long name:ur
     lottery: Key:lottery
     love_locks: Key:love locks
@@ -6061,6 +6395,7 @@ en:
     mapper: Key:mapper
     maritime: Key:maritime
     marker: Key:marker
+    mass_times: Key:mass times
     massage: Key:massage
     massgis:ARTICLE97: Key:massgis:ARTICLE97
     massgis:SITE_NAME: Key:massgis:SITE NAME
@@ -6070,11 +6405,13 @@ en:
     maxage: Key:maxage
     maxaxleload: Key:maxaxleload
     maxbogieweight: Key:maxbogieweight
+    maxcharge: Key:maxcharge
     maxdraft: Key:maxdraft
     maxdraught: Key:maxdraught
     maxheight: Key:maxheight
     maxheight:legal: Key:maxheight:legal
     maxheight:physical: Key:maxheight:physical
+    maxheight:signed: Key:maxheight:signed
     maxlength: Key:maxlength
     maxspeed: Key:maxspeed
     maxspeed:advisory: Key:maxspeed:advisory
@@ -6088,6 +6425,7 @@ en:
     maxspeed:hgv:forward: Key:maxspeed:hgv:forward
     maxspeed:lanes: Key:maxspeed:lanes
     maxspeed:practical: Key:maxspeed:practical
+    maxspeed:psv:conditional: Key:maxspeed:psv:conditional
     maxspeed:seasonal:winter: Key:maxspeed:seasonal:winter
     maxspeed:source: Key:maxspeed:source
     maxspeed:trailer: Key:maxspeed:trailer
@@ -6097,6 +6435,7 @@ en:
     maxstay:conditional: Key:maxstay:conditional
     maxtents: Key:maxtents
     maxweight: Key:maxweight
+    maxweight:conditional: Key:maxweight:conditional
     maxweight:signed: Key:maxweight:signed
     maxweightrating: Key:maxweightrating
     maxweightrating:bus: Key:maxweightrating:bus
@@ -6113,16 +6452,21 @@ en:
     megalith_type: Key:megalith type
     membership: Key:membership
     memorial: Key:memorial
+    memorial:conflict: Key:memorial:conflict
     memorial:subject: Key:memorial:subject
+    memorial:subject:wikidata: Key:memorial:subject:wikidata
+    memorial:subject:wikipedia: Key:memorial:subject:wikipedia
     memorial:type: Key:memorial:type
     message: Key:message
     mhs:inscription_date: Key:mhs:inscription date
     microbrewery: Key:microbrewery
+    microwave: Key:microwave
     milestone_type: Key:milestone type
     military: Key:military
     military_service: Key:military service
     mimics: Key:mimics
     min_age: Key:min age
+    min_distance: Key:min distance
     min_height: Key:min height
     minage: Key:minage
     mindistance: Key:mindistance
@@ -6144,6 +6488,7 @@ en:
     monitoring:groundwater: Key:monitoring:groundwater
     monitoring:meteoric_activity: Key:monitoring:meteoric activity
     monitoring:noise: Key:monitoring:noise
+    monitoring:pedestrian: Key:monitoring:pedestrian
     monitoring:radiation: Key:monitoring:radiation
     monitoring:river_level: Key:monitoring:river level
     monitoring:river_levels: Key:monitoring:river levels
@@ -6191,24 +6536,31 @@ en:
     mtb:scale:uphill: Key:mtb:scale:uphill
     mtb_scale: Key:mtb scale
     museum: Key:museum
+    museum:subject:wikidata: Key:museum:subject:wikidata
     museum_type: Key:museum type
     musical_instrument: Key:musical instrument
     musical_instrument:repair: Key:musical instrument:repair
+    naics: Key:naics
     name: Key:name
+    name:af: Key:name:af
     name:ar: Key:name:ar
     name:ar1: Key:name:ar1
     name:arc: Key:name:arc
     name:ast: Key:name:ast
+    name:aus: Key:name:aus
+    name:az: Key:name:az
     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:bg: Key:name:bg
     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:carnaval: Key:name:carnaval
+    name:cdo: Key:name:cdo
     name:ckb: Key:name:ckb
     name:cs: Key:name:cs
     name:cy: Key:name:cy
@@ -6240,6 +6592,7 @@ en:
     name:gsw: Key:name:gsw
     name:he: Key:name:he
     name:hi: Key:name:hi
+    name:hop: Key:name:hop
     name:hr: Key:name:hr
     name:hsb: Key:name:hsb
     name:hu: Key:name:hu
@@ -6252,6 +6605,7 @@ en:
     name:ja_rm: Key:name:ja rm
     name:jbo: Key:name:jbo
     name:ka: Key:name:ka
+    name:ka-Latn: Key:name:ka-Latn
     name:kab: Key:name:kab
     name:kab-Arab: Key:name:kab-Arab
     name:kk: Key:name:kk
@@ -6266,30 +6620,48 @@ en:
     name:ku: Key:name:ku
     name:ku-Arab: Key:name:ku-Arab
     name:ky-Arab: Key:name:ky-Arab
+    name:lah: Key:name:lah
     name:language: Key:name:language
     name:left: Key:name:left
     name:left:ar: Key:name:left:ar
+    name:left:arc: Key:name:left:arc
+    name:left:de: Key:name:left:de
+    name:left:es: Key:name:left:es
     name:left:fr: Key:name:left:fr
+    name:left:gr: Key:name:left:gr
+    name:left:grc: Key:name:left:grc
+    name:left:syc: Key:name:left:syc
     name:lg: Key:name:lg
+    name:li: Key:name:li
     name:lrc: Key:name:lrc
     name:lt: Key:name:lt
     name:lv: Key:name:lv
     name:mg: Key:name:mg
+    name:mi: Key:name:mi
     name:mk: Key:name:mk
     name:ml: Key:name:ml
     name:mr: Key:name:mr
+    name:ms: Key:name:ms
     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:ne: Key:name:ne
     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: Key:name:pa
     name:pa-Arab: Key:name:pa-Arab
+    name:pa-Aran: Key:name:pa-Aran
+    name:pa-Guru: Key:name:pa-Guru
+    name:pa-IN: Key:name:pa-IN
+    name:pa-PK: Key:name:pa-PK
+    name:pa-Shah: Key:name:pa-Shah
+    name:pjt: Key:name:pjt
     name:pl: Key:name:pl
     name:pnb: Key:name:pnb
     name:prefix: Key:name:prefix
@@ -6299,15 +6671,23 @@ en:
     name:pt: Key:name:pt
     name:right: Key:name:right
     name:right:ar: Key:name:right:ar
+    name:right:arc: Key:name:right:arc
+    name:right:de: Key:name:right:de
+    name:right:es: Key:name:right:es
+    name:right:gr: Key:name:right:gr
+    name:right:grc: Key:name:right:grc
+    name:right:syc: Key:name:right:syc
     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:se: Key:name:se
     name:sh: Key:name:sh
     name:signed: Key:name:signed
     name:sk: Key:name:sk
     name:sl: Key:name:sl
+    name:sq: Key:name:sq
     name:sr: Key:name:sr
     name:sr-Latn: Key:name:sr-Latn
     name:suffix: Key:name:suffix
@@ -6326,11 +6706,15 @@ en:
     name:ur: Key:name:ur
     name:vi: Key:name:vi
     name:vi-Hani: Key:name:vi-Hani
+    name:vls: Key:name:vls
     name:vo: Key:name:vo
+    name:wa: Key:name:wa
     name:wikipedia: Key:name:wikipedia
     name:xx: Key:name:xx
     name:yue: Key:name:yue
     name:zh: Key:name:zh
+    name:zh-Hans: Key:name:zh-Hans
+    name:zh-Hant: Key:name:zh-Hant
     name:zh-sg: Key:name:zh-sg
     name_1: Key:name 1
     name_2: Key:name 2
@@ -6386,6 +6770,8 @@ en:
     network:guid: Key:network:guid
     network:type: Key:network:type
     network:wikidata: Key:network:wikidata
+    network:wikipedia: Key:network:wikipedia
+    nev: Key:nev
     next_check_date: Key:next check date
     nhd:com_id: Key:nhd:com id
     nhd:fcode: Key:nhd:fcode
@@ -6411,7 +6797,9 @@ en:
     note:depth: Key:note:depth
     note:en: Key:note:en
     note:ja: Key:note:ja
+    note:name: Key:note:name
     note:pilotage: Key:note:pilotage
+    note:project_page: Key:note:project page
     notes: Key:notes
     nuclear_explosion:country: Key:nuclear explosion:country
     nudism: Key:nudism
@@ -6438,7 +6826,9 @@ en:
     official_name:azb: Key:official name:azb
     official_name:be: Key:official name:be
     official_name:ckb: Key:official name:ckb
+    official_name:de: Key:official name:de
     official_name:en: Key:official name:en
+    official_name:es: Key:official name:es
     official_name:fa: Key:official name:fa
     official_name:fr: Key:official name:fr
     official_name:glk: Key:official name:glk
@@ -6459,6 +6849,7 @@ en:
     official_name:ur: Key:official name:ur
     official_ref: Key:official ref
     offshore: Key:offshore
+    ohm:name: Key:ohm:name
     ohv: Key:ohv
     ois:fixme: Key:ois:fixme
     old_addr:housenumber: Key:old addr:housenumber
@@ -6470,10 +6861,12 @@ en:
     old_name:ckb: Key:old name:ckb
     old_name:de: Key:old name:de
     old_name:en: Key:old name:en
+    old_name:es: Key:old name:es
     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:ko: Key:old name:ko
     old_name:ks: Key:old name:ks
     old_name:ku-Arab: Key:old name:ku-Arab
     old_name:lrc: Key:old name:lrc
@@ -6504,6 +6897,7 @@ en:
     open_air: Key:open air
     openbenches:id: Key:openbenches:id
     openfire: Key:openfire
+    opening: Key:opening
     opening_date: Key:opening date
     opening_hours: Key:opening hours
     opening_hours/Tutorial: Key:opening hours/Tutorial
@@ -6511,9 +6905,12 @@ en:
     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:lifeguard: Key:opening hours:lifeguard
     opening_hours:office: Key:opening hours:office
+    opening_hours:pharmacy: Key:opening hours:pharmacy
     opening_hours:reception: Key:opening hours:reception
     opening_hours:signed: Key:opening hours:signed
+    opening_hours:store: Key:opening hours:store
     opening_hours:url: Key:opening hours:url
     opening_hours:workshop: Key:opening hours:workshop
     openplaques:id: Key:openplaques:id
@@ -6521,15 +6918,25 @@ en:
     operational_status: Key:operational status
     operator: Key:operator
     operator:MNC: Key:operator:MNC
+    operator:abbr: Key:operator:abbr
+    operator:addr: Key:operator:addr
     operator:ar: Key:operator:ar
     operator:be: Key:operator:be
+    operator:de: Key:operator:de
     operator:en: Key:operator:en
+    operator:es: Key:operator:es
     operator:guid: Key:operator:guid
+    operator:phone: Key:operator:phone
     operator:ru: Key:operator:ru
+    operator:short: Key:operator:short
     operator:type: Key:operator:type
+    operator:ur: Key:operator:ur
+    operator:website: Key:operator:website
     operator:wikidata: Key:operator:wikidata
     operator:wikipedia: Key:operator:wikipedia
     operator:wikipedia:ar: Key:operator:wikipedia:ar
+    operator:wikipedia:de: Key:operator:wikipedia:de
+    operator:wikipedia:es: Key:operator:wikipedia:es
     orchard: Key:orchard
     organ: Key:organ
     organic: Key:organic
@@ -6556,22 +6963,31 @@ en:
     outdoor: Key:outdoor
     outdoor_seating: Key:outdoor seating
     outdoor_seating:comfort: Key:outdoor seating:comfort
+    outlet: Key:outlet
     oven: Key:oven
+    overlap: Key:overlap
     overtaking: Key:overtaking
     overtaking:hgv: Key:overtaking:hgv
     owner: Key:owner
+    owner:wikidata: Key:owner:wikidata
     ownership: Key:ownership
     par: Key:par
+    parcel_mail_in: Key:parcel mail in
+    parcel_pickup: Key:parcel pickup
     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
+    parking:condition:both:maxstay: Key:parking:condition:both:maxstay
     parking:condition:left: Key:parking:condition:left
+    parking:condition:left:maxstay: Key:parking:condition:left:maxstay
     parking:condition:right: Key:parking:condition:right
+    parking:condition:right:maxstay: Key:parking:condition:right:maxstay
     parking:condition:right:time_interval: Key:parking:condition:right:time interval
     parking:condition:side: Key:parking:condition:side
+    parking:fee: Key:parking:fee
     parking:lane: Key:parking:lane
     parking:lane:both: Key:parking:lane:both
     parking:lane:hgv: Key:parking:lane:hgv
@@ -6663,9 +7079,10 @@ en:
     payment:wechat: Key:payment:wechat
     payment:wire_transfer: Key:payment:wire transfer
     permanent_camping: Key:permanent camping
+    pets: Key:pets
     phoenixbikeguide: Key:phoenixbikeguide
     phone: Key:phone
-    photo: Key:photo
+    phone:mnemonic: Key:phone:mnemonic
     photograph: Key:photograph
     photography: Key:photography
     picnic_table: Key:picnic table
@@ -6678,14 +7095,17 @@ en:
     piste:grooming: Key:piste:grooming
     piste:ref: Key:piste:ref
     piste:type: Key:piste:type
-    pk: Key:pk
+    pitch:net: Key:pitch:net
     place: Key:place
+    place:CN: Key:place:CN
     place:PH: Key:place:PH
+    place:cn: Key:place:cn
     place:fr: Key:place:fr
     place:ph: Key:place:ph
     place_name: Key:place name
     placement: Key:placement
     placement:end: Key:placement:end
+    placement:forward: Key:placement:forward
     placement:start: Key:placement:start
     planned: Key:planned
     plant: Key:plant
@@ -6706,6 +7126,7 @@ en:
     plant:type: Key:plant:type
     plant_community: Key:plant community
     platforms: Key:platforms
+    playability: Key:playability
     playground: Key:playground
     'playground:': 'Key:playground:'
     playground:theme: Key:playground:theme
@@ -6714,22 +7135,23 @@ en:
     pole: Key:pole
     pole:type: Key:pole:type
     police: Key:police
+    political_division: Key:political division
     polling_station: Key:polling station
     population: Key:population
     population:date: Key:population:date
     population_rank: Key:population rank
+    port: Key:port
     position: Key:position
     post_box:design: Key:post box:design
     post_box:type: Key:post box:type
     post_office: Key:post office
+    post_office:brand: Key:post office:brand
     post_office:parcel_pickup: Key:post office:parcel pickup
     postal_code: Key:postal code
-    postcode: Key:postcode
+    postal_code:source: Key:postal code:source
     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
@@ -6738,6 +7160,7 @@ en:
     previous: Key:previous
     previous:access: Key:previous:access
     previous:vehicle: Key:previous:vehicle
+    previously: Key:previously
     priority: Key:priority
     priority_road: Key:priority road
     produce: Key:produce
@@ -6747,9 +7170,10 @@ en:
     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
+    provided_for: Key:provided for
+    provided_for:*: Key:provided for:*
     prow_ref: Key:prow ref
     pruning: Key:pruning
     psv: Key:psv
@@ -6781,11 +7205,13 @@ en:
     railway:lzb: Key:railway:lzb
     railway:position: Key:railway:position
     railway:preserved: Key:railway:preserved
+    railway:ref: Key:railway:ref
     railway:signal:combined: Key:railway:signal:combined
     railway:signal:distant: Key:railway:signal:distant
     railway:signal:main: Key:railway:signal:main
     railway:signal:speed_limit: Key:railway:signal:speed limit
     railway:signal:speed_limit_distant: Key:railway:signal:speed limit distant
+    railway:tilting: Key:railway:tilting
     railway:track_ref: Key:railway:track ref
     railway:traffic_mode: Key:railway:traffic mode
     railway:zbs: Key:railway:zbs
@@ -6808,7 +7234,9 @@ en:
     recycling:PET: Key:recycling:PET
     recycling:fire_extinguishers: Key:recycling:fire extinguishers
     recycling:pet_drink_bottles: Key:recycling:pet drink bottles
+    recycling:plastic_bottle_caps: Key:recycling:plastic bottle caps
     recycling:plastic_bottle_tops: Key:recycling:plastic bottle tops
+    recycling:pmd: Key:recycling:pmd
     recycling_type: Key:recycling type
     red_turn:left: Key:red turn:left
     red_turn:right: Key:red turn:right
@@ -6822,11 +7250,13 @@ en:
     ref: Key:ref
     ref:AGESIC: Key:ref:AGESIC
     ref:CEF: Key:ref:CEF
+    ref:CNES: Key:ref:CNES
     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:EU:bwid: Key:ref:EU:bwid
     ref:FR:42C: Key:ref:FR:42C
     ref:FR:ANFR: Key:ref:FR:ANFR
     ref:FR:ARCEP: Key:ref:FR:ARCEP
@@ -6839,6 +7269,7 @@ en:
     ref:FR:FINESS: Key:ref:FR:FINESS
     ref:FR:INSEE: Key:ref:FR:INSEE
     ref:FR:IRVE: Key:ref:FR:IRVE
+    ref:FR:Joconde: Key:ref:FR:Joconde
     ref:FR:LaPoste: Key:ref:FR:LaPoste
     ref:FR:MemorialGenWeb: Key:ref:FR:MemorialGenWeb
     ref:FR:NAF: Key:ref:FR:NAF
@@ -6860,18 +7291,31 @@ en:
     ref:GB:mpan: Key:ref:GB:mpan
     ref:GB:nhs_ods: Key:ref:GB:nhs ods
     ref:GB:uprn: Key:ref:GB:uprn
+    ref:GB:wpd_site: Key:ref:GB:wpd site
+    ref:HMDB: Key:ref:HMDB
     ref:HU:edid: Key:ref:HU:edid
+    ref:IE:lenehan: Key:ref:IE:lenehan
+    ref:IE:niah: Key:ref:IE:niah
+    ref:IE:smr: Key:ref:IE:smr
     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:LV:addr: Key:ref:LV:addr
     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:ProRail: Key:ref:ProRail
     ref:REI: Key:ref:REI
+    ref:RS:grad: Key:ref:RS:grad
+    ref:RS:naselje: Key:ref:RS:naselje
+    ref:RS:okrug: Key:ref:RS:okrug
+    ref:RS:opstina: Key:ref:RS:opstina
+    ref:RS:pokrajina: Key:ref:RS:pokrajina
+    ref:STIB_MIVB: Key:ref:STIB MIVB
     ref:TECB: Key:ref:TECB
     ref:TECC: Key:ref:TECC
     ref:TECH: Key:ref:TECH
@@ -6879,10 +7323,15 @@ en:
     ref:TECN: Key:ref:TECN
     ref:TECX: Key:ref:TECX
     ref:UAI: Key:ref:UAI
+    'ref:US-TX:': 'Key:ref:US-TX:'
+    ref:US-TX:thc: Key:ref:US-TX:thc
+    ref:US:EIA: Key:ref:US:EIA
     ref:US:EPA: Key:ref:US:EPA
+    ref:US:MA:SARIS: Key:ref:US:MA:SARIS
     ref:UrbIS: Key:ref:UrbIS
     ref:WDPA: Key:ref:WDPA
     ref:ar: Key:ref:ar
+    ref:arc: Key:ref:arc
     ref:at:bda: Key:ref:at:bda
     ref:at:gkz: Key:ref:at:gkz
     ref:at:okz: Key:ref:at:okz
@@ -6902,25 +7351,41 @@ en:
     ref:colour: Key:ref:colour
     ref:coop: Key:ref:coop
     ref:crs: Key:ref:crs
+    ref:csioz: Key:ref:csioz
     ref:ctb: Key:ref:ctb
+    ref:de: Key:ref:de
     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:edubase:group: Key:ref:edubase:group
     ref:ef: Key:ref:ef
+    ref:es: Key:ref:es
+    ref:fgkz: Key:ref:fgkz
+    ref:gbfs: Key:ref:gbfs
     ref:gnis: Key:ref:gnis
+    ref:gr: Key:ref:gr
+    ref:grc: Key:ref:grc
     ref:gsi: Key:ref:gsi
     ref:gss: Key:ref:gss
     ref:gurs:hs_mid: Key:ref:gurs:hs mid
+    ref:gurs:sta_sid: Key:ref:gurs:sta sid
+    ref:gwlnr: Key:ref:gwlnr
     ref:harbour: Key:ref:harbour
     ref:herbarium: Key:ref:herbarium
+    ref:hmdb: Key:ref:hmdb
     ref:hsmaq: Key:ref:hsmaq
     ref:industrial: Key:ref:industrial
+    ref:ine: Key:ref:ine
     ref:isil: Key:ref:isil
     ref:kmb: Key:ref:kmb
+    ref:kons: Key:ref:kons
     ref:linz:address_id: Key:ref:linz:address id
     ref:linz:building_id: Key:ref:linz:building id
+    ref:linz:hydrographic_id: Key:ref:linz:hydrographic id
+    ref:linz:pastoral_lease_id: Key:ref:linz:pastoral lease id
+    ref:linz:topo50_id: Key:ref:linz:topo50 id
     ref:lor: Key:ref:lor
     ref:mcrb: Key:ref:mcrb
     ref:mhs: Key:ref:mhs
@@ -6929,6 +7394,7 @@ en:
     ref:minvskaddress: Key:ref:minvskaddress
     ref:mise: Key:ref:mise
     ref:mobil-parken.de: Key:ref:mobil-parken.de
+    ref:msal: Key:ref:msal
     ref:nid: Key:ref:nid
     ref:nrhp: Key:ref:nrhp
     ref:ortsnetz: Key:ref:ortsnetz
@@ -6947,12 +7413,18 @@ en:
     ref:se:scb: Key:ref:se:scb
     ref:seedcode: Key:ref:seedcode
     ref:shop:num: Key:ref:shop:num
+    ref:signed: Key:ref:signed
     ref:sitp: Key:ref:sitp
+    ref:sprockhoff: Key:ref:sprockhoff
     ref:sr:maticni_broj: Key:ref:sr:maticni broj
     ref:ssb_tettsted: Key:ref:ssb tettsted
     ref:statistical: Key:ref:statistical
+    ref:syc: Key:ref:syc
     ref:taskey: Key:ref:taskey
+    ref:temples.ru: Key:ref:temples.ru
+    ref:thc: Key:ref:thc
     ref:udir_nsr: Key:ref:udir nsr
+    ref:us:ny:swis: Key:ref:us:ny:swis
     ref:vatin: Key:ref:vatin
     ref:vatin:hu: Key:ref:vatin:hu
     ref:vorwahl: Key:ref:vorwahl
@@ -6967,6 +7439,8 @@ en:
     reference_point: Key:reference point
     reg_name: Key:reg name
     reg_name:ar: Key:reg name:ar
+    reg_name:de: Key:reg name:de
+    reg_name:es: Key:reg name:es
     reg_name:gr: Key:reg name:gr
     reg_name:grc: Key:reg name:grc
     reg_ref: Key:reg ref
@@ -7011,7 +7485,10 @@ en:
     roller_coaster: Key:roller coaster
     roof:colour: Key:roof:colour
     roof:direction: Key:roof:direction
+    roof:height: Key:roof:height
+    roof:levels: Key:roof:levels
     roof:material: Key:roof:material
+    roof:orientation: Key:roof:orientation
     roof:ridge: Key:roof:ridge
     roof:shape: Key:roof:shape
     room: Key:room
@@ -7049,7 +7526,9 @@ en:
     safety_rope: Key:safety rope
     safety_rope_side: Key:safety rope side
     sagns_id: Key:sagns id
+    sailboat: Key:sailboat
     salt: Key:salt
+    sample_collection: Key:sample collection
     sanitary_dump_station: Key:sanitary dump station
     sauna: Key:sauna
     sauna:fuel: Key:sauna:fuel
@@ -7058,30 +7537,81 @@ en:
     sauna:water:description: Key:sauna:water:description
     scenic: Key:scenic
     school: Key:school
+    'school:': 'Key:school:'
+    school:boarding: Key:school:boarding
+    school:federation:name: Key:school:federation:name
     school:gender: Key:school:gender
+    school:language: Key:school:language
+    school:selective: Key:school:selective
+    school:trust: Key:school:trust
+    school:trust:name: Key:school:trust:name
+    school:trust:type: Key:school:trust:type
+    school:type: Key:school:type
+    screen: Key:screen
     scuba_diving:courses: Key:scuba diving:courses
     scuba_diving:rental: Key:scuba diving:rental
     sculpture_type: Key:sculpture type
     seamark: Key:seamark
+    seamark:beacon_cardinal:category: Key:seamark:beacon cardinal:category
+    seamark:beacon_cardinal:colour: Key:seamark:beacon cardinal:colour
+    seamark:beacon_cardinal:colour_pattern: Key:seamark:beacon cardinal:colour pattern
+    seamark:beacon_cardinal:shape: Key:seamark:beacon cardinal:shape
+    seamark:beacon_isolated_danger:colour: Key:seamark:beacon isolated danger:colour
+    seamark:beacon_isolated_danger:colour_pattern: Key:seamark:beacon isolated danger:colour
+      pattern
     seamark:beacon_isolated_danger:shape: Key:seamark:beacon isolated danger:shape
+    seamark:beacon_lateral:category: Key:seamark:beacon lateral:category
+    seamark:beacon_lateral:colour: Key:seamark:beacon lateral:colour
+    seamark:beacon_lateral:colour_pattern: Key:seamark:beacon lateral:colour pattern
+    seamark:beacon_lateral:reflectivity: Key:seamark:beacon lateral:reflectivity
+    seamark:beacon_lateral:shape: Key:seamark:beacon lateral:shape
+    seamark:beacon_lateral:system: Key:seamark:beacon lateral:system
     seamark:beacon_safe_water:colour: Key:seamark:beacon safe water:colour
     seamark:beacon_safe_water:colour_pattern: Key:seamark:beacon safe water:colour
       pattern
     seamark:beacon_safe_water:shape: Key:seamark:beacon safe water:shape
+    seamark:beacon_special_purpose:category: Key:seamark:beacon special purpose:category
+    seamark:beacon_special_purpose:colour_pattern: Key:seamark:beacon special purpose:colour
+      pattern
+    seamark:beacon_special_purpose:height: Key:seamark:beacon special purpose:height
+    seamark:beacon_special_purpose:shape: Key:seamark:beacon special purpose:shape
+    seamark:berth:category: Key:seamark:berth:category
+    seamark:berth:class: Key:seamark:berth:class
     seamark:bridge:category: Key:seamark:bridge:category
     seamark:bridge:clearance_height: Key:seamark:bridge:clearance height
     seamark:bridge:clearance_height_closed: Key:seamark:bridge:clearance height closed
     seamark:bridge:clearance_height_open: Key:seamark:bridge:clearance height open
     seamark:bridge:clearance_width: Key:seamark:bridge:clearance width
+    seamark:buoy_cardinal:category: Key:seamark:buoy cardinal:category
+    seamark:buoy_cardinal:colour: Key:seamark:buoy cardinal:colour
+    seamark:buoy_cardinal:colour_pattern: Key:seamark:buoy cardinal:colour pattern
+    seamark:buoy_cardinal:shape: Key:seamark:buoy cardinal:shape
+    seamark:buoy_installation:category: Key:seamark:buoy installation:category
+    seamark:buoy_isolated_danger:colour: Key:seamark:buoy isolated danger:colour
+    seamark:buoy_isolated_danger:colour_pattern: Key:seamark:buoy isolated danger:colour
+      pattern
+    seamark:buoy_isolated_danger:shape: Key:seamark:buoy isolated danger:shape
+    seamark:buoy_lateral:category: Key:seamark:buoy lateral:category
+    seamark:buoy_lateral:colour: Key:seamark:buoy lateral:colour
     seamark:buoy_lateral:reflectivity: Key:seamark:buoy lateral:reflectivity
+    seamark:buoy_lateral:shape: Key:seamark:buoy lateral:shape
+    seamark:buoy_lateral:system: Key:seamark:buoy lateral:system
+    seamark:buoy_safe_water:colour: Key:seamark:buoy safe water:colour
+    seamark:buoy_safe_water:colour_pattern: Key:seamark:buoy safe water:colour pattern
+    seamark:buoy_safe_water:shape: Key:seamark:buoy safe water:shape
+    seamark:buoy_special_purpose:category: Key:seamark:buoy special purpose:category
+    seamark:buoy_special_purpose:colour: Key:seamark:buoy special purpose:colour
     seamark:buoy_special_purpose:reflectivity: Key:seamark:buoy special purpose:reflectivity
+    seamark:buoy_special_purpose:shape: Key:seamark:buoy special purpose:shape
     seamark:cable_overhead:category: Key:seamark:cable overhead:category
+    seamark:cable_overhead:clearance_height_safe: Key:seamark:cable overhead:clearance
+      height safe
     seamark:cable_overhead:vertical_clearance_safe: Key:seamark:cable overhead:vertical
       clearance safe
     seamark:cable_submarine:category: Key:seamark:cable submarine:category
     seamark:conspicuity: Key:seamark:conspicuity
+    seamark:crane:category: Key:seamark:crane:category
     seamark:distance_mark:category: Key:seamark:distance mark:category
-    seamark:distance_mark:distance: Key:seamark:distance mark:distance
     seamark:distance_mark:height_units: Key:seamark:distance mark:height units
     seamark:distance_mark:units: Key:seamark:distance mark:units
     seamark:fixme: Key:seamark:fixme
@@ -7095,23 +7625,88 @@ en:
     seamark:gate:category: Key:seamark:gate:category
     seamark:gate:clearance_height: Key:seamark:gate:clearance height
     seamark:gate:clearance_width: Key:seamark:gate:clearance width
+    seamark:harbour:category: Key:seamark:harbour:category
+    seamark:hulk:category: Key:seamark:hulk:category
     seamark:landmark:category: Key:seamark:landmark:category
     seamark:landmark:conspicuity: Key:seamark:landmark:conspicuity
     seamark:landmark:function: Key:seamark:landmark:function
+    seamark:light:1:category: Key:seamark:light:1:category
+    seamark:light:1:character: Key:seamark:light:1:character
+    seamark:light:1:colour: Key:seamark:light:1:colour
+    seamark:light:1:exhibition: Key:seamark:light:1:exhibition
+    seamark:light:1:group: Key:seamark:light:1:group
+    seamark:light:1:height: Key:seamark:light:1:height
+    seamark:light:1:orientation: Key:seamark:light:1:orientation
+    seamark:light:1:period: Key:seamark:light:1:period
+    seamark:light:1:range: Key:seamark:light:1:range
+    seamark:light:1:sector_end: Key:seamark:light:1:sector end
+    seamark:light:1:sector_start: Key:seamark:light:1:sector start
+    seamark:light:1:sequence: Key:seamark:light:1:sequence
+    seamark:light:1:visibility: Key:seamark:light:1:visibility
+    seamark:light:2:character: Key:seamark:light:2:character
+    seamark:light:2:colour: Key:seamark:light:2:colour
+    seamark:light:2:exhibition: Key:seamark:light:2:exhibition
+    seamark:light:2:group: Key:seamark:light:2:group
+    seamark:light:2:height: Key:seamark:light:2:height
+    seamark:light:2:orientation: Key:seamark:light:2:orientation
+    seamark:light:2:period: Key:seamark:light:2:period
+    seamark:light:2:range: Key:seamark:light:2:range
+    seamark:light:2:sector_end: Key:seamark:light:2:sector end
+    seamark:light:2:sector_start: Key:seamark:light:2:sector start
+    seamark:light:2:sequence: Key:seamark:light:2:sequence
+    seamark:light:2:visibility: Key:seamark:light:2:visibility
+    seamark:light:3:character: Key:seamark:light:3:character
+    seamark:light:3:colour: Key:seamark:light:3:colour
+    seamark:light:3:exhibition: Key:seamark:light:3:exhibition
+    seamark:light:3:group: Key:seamark:light:3:group
+    seamark:light:3:height: Key:seamark:light:3:height
+    seamark:light:3:orientation: Key:seamark:light:3:orientation
+    seamark:light:3:period: Key:seamark:light:3:period
+    seamark:light:3:range: Key:seamark:light:3:range
+    seamark:light:3:sector_end: Key:seamark:light:3:sector end
+    seamark:light:3:sector_start: Key:seamark:light:3:sector start
+    seamark:light:3:sequence: Key:seamark:light:3:sequence
+    seamark:light:3:visibility: Key:seamark:light:3:visibility
+    seamark:light:category: Key:seamark:light:category
+    seamark:light:character: Key:seamark:light:character
+    seamark:light:colour: Key:seamark:light:colour
     seamark:light:exhibition: Key:seamark:light:exhibition
     seamark:light:range: Key:seamark:light:range
+    seamark:light:sector_end: Key:seamark:light:sector end
+    seamark:light:sector_start: Key:seamark:light:sector start
     seamark:light:status: Key:seamark:light:status
     seamark:light:visibility: Key:seamark:light:visibility
+    seamark:light_float:colour: Key:seamark:light float:colour
+    seamark:light_float:colour_pattern: Key:seamark:light float:colour pattern
     seamark:light_vessel:colour: Key:seamark:light vessel:colour
+    seamark:marine_farm:category: Key:seamark:marine farm:category
+    seamark:mooring:shape: Key:seamark:mooring:shape
     seamark:name: Key:seamark:name
+    seamark:notice:1:category: Key:seamark:notice:1:category
+    seamark:notice:1:function: Key:seamark:notice:1:function
+    seamark:notice:2:category: Key:seamark:notice:2:category
+    seamark:notice:2:function: Key:seamark:notice:2:function
+    seamark:notice:3:category: Key:seamark:notice:3:category
+    seamark:notice:addition: Key:seamark:notice:addition
+    seamark:notice:category: Key:seamark:notice:category
+    seamark:notice:direction: Key:seamark:notice:direction
+    seamark:notice:function: Key:seamark:notice:function
+    seamark:notice:impact: Key:seamark:notice:impact
+    seamark:notice:orientation: Key:seamark:notice:orientation
+    seamark:notice:system: Key:seamark:notice:system
     seamark:obstruction:category: Key:seamark:obstruction:category
+    seamark:obstruction:depth: Key:seamark:obstruction:depth
+    seamark:obstruction:water_level: Key:seamark:obstruction:water level
+    seamark:pile:category: Key:seamark:pile:category
     seamark:pilot_boarding:category: Key:seamark:pilot boarding:category
+    seamark:pilot_boarding:channel: Key:seamark:pilot boarding:channel
     seamark:pipeline_submarine:category: Key:seamark:pipeline submarine:category
     seamark:pipeline_submarine:name: Key:seamark:pipeline submarine:name
     seamark:pipeline_submarine:product: Key:seamark:pipeline submarine:product
     seamark:platform:category: Key:seamark:platform:category
+    seamark:platform:construction: Key:seamark:platform:construction
+    seamark:production_area:category: Key:seamark:production area:category
     seamark:radar_reflector: Key:seamark:radar reflector
-    seamark:radar_station:category: Key:seamark:radar station:category
     seamark:radar_station:channel: Key:seamark:radar station:channel
     seamark:radar_transponder:category: Key:seamark:radar transponder:category
     seamark:radar_transponder:group: Key:seamark:radar transponder:group
@@ -7121,6 +7716,7 @@ en:
     seamark:radar_transponder:sector_start: Key:seamark:radar transponder:sector start
     seamark:radar_transponder:sequence: Key:seamark:radar transponder:sequence
     seamark:radar_transponder:wavelength: Key:seamark:radar transponder:wavelength
+    seamark:radio_station:category: Key:seamark:radio station:category
     seamark:radio_station:group: Key:seamark:radio station:group
     seamark:reflectivity: Key:seamark:reflectivity
     seamark:restricted_area:category: Key:seamark:restricted area:category
@@ -7130,8 +7726,15 @@ en:
     seamark:sea_area:category: Key:seamark:sea area:category
     seamark:seabed_area:surface: Key:seamark:seabed area:surface
     seamark:shoreline_construction:category: Key:seamark:shoreline construction:category
+    seamark:shoreline_construction:construction: Key:seamark:shoreline construction:construction
+    seamark:signal_station_traffic:category: Key:seamark:signal station traffic:category
     seamark:small_craft_facility:category: Key:seamark:small craft facility:category
+    seamark:topmark:colour: Key:seamark:topmark:colour
+    seamark:topmark:colour_pattern: Key:seamark:topmark:colour pattern
+    seamark:topmark:shape: Key:seamark:topmark:shape
     seamark:type: Key:seamark:type
+    seamark:waterway_gauge:category: Key:seamark:waterway gauge:category
+    seamark:wreck:category: Key:seamark:wreck:category
     seasonal: Key:seasonal
     seasonal:snowfall:regaintime: Key:seasonal:snowfall:regaintime
     seats: Key:seats
@@ -7141,6 +7744,7 @@ en:
     self_service: Key:self service
     sells:tobacco: Key:sells:tobacco
     service: Key:service
+    service:bicycle: Key:service:bicycle
     service:bicycle:cleaning: Key:service:bicycle:cleaning
     service:bicycle:diy: Key:service:bicycle:diy
     service:bicycle:ebike: Key:service:bicycle:ebike
@@ -7152,6 +7756,7 @@ en:
     service:vehicle: Key:service:vehicle
     service:vehicle:lpg: Key:service:vehicle:lpg
     service_times: Key:service times
+    seveso: Key:seveso
     shade: Key:shade
     share_taxi: Key:share taxi
     shelter: Key:shelter
@@ -7162,14 +7767,22 @@ en:
     shop: Key:shop
     short_name: Key:short name
     short_name:ar: Key:short name:ar
+    short_name:arc: Key:short name:arc
     short_name:azb: Key:short name:azb
     short_name:ckb: Key:short name:ckb
+    short_name:de: Key:short name:de
+    short_name:es: Key:short name:es
     short_name:fa: Key:short name:fa
+    short_name:gr: Key:short name:gr
+    short_name:grc: Key:short name:grc
+    short_name:pl: Key:short name:pl
+    short_name:syc: Key:short name:syc
     short_name:ug: Key:short name:ug
     short_name:ur: Key:short name:ur
     shoulder: Key:shoulder
     shower: Key:shower
     shrine: Key:shrine
+    shrubbery:density: Key:shrubbery:density
     side_road: Key:side road
     sides: Key:sides
     sidewalk: Key:sidewalk
@@ -7192,7 +7805,6 @@ en:
     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
@@ -7206,6 +7818,7 @@ en:
     snowplowing: Key:snowplowing
     snowplowing:category: Key:snowplowing:category
     snowplowing:operator: Key:snowplowing:operator
+    snowshoe: Key:snowshoe
     social_facility: Key:social facility
     social_facility:for: Key:social facility:for
     socket: Key:socket
@@ -7213,6 +7826,7 @@ en:
     socket:schuko: Key:socket:schuko
     socket:type1: Key:socket:type1
     socket:type2: Key:socket:type2
+    socket:type2:output: Key:socket:type2:output
     socket:type3: Key:socket:type3
     socket:type3c: Key:socket:type3c
     socket:typee: Key:socket:typee
@@ -7222,6 +7836,8 @@ en:
     sorting_name:arc: Key:sorting name:arc
     sorting_name:azb: Key:sorting name:azb
     sorting_name:be: Key:sorting name:be
+    sorting_name:de: Key:sorting name:de
+    sorting_name:es: Key:sorting name:es
     sorting_name:fa: Key:sorting name:fa
     sorting_name:gr: Key:sorting name:gr
     sorting_name:grc: Key:sorting name:grc
@@ -7233,22 +7849,52 @@ en:
     source: Key:source
     source:ProRail: Key:source:ProRail
     source:addr: Key:source:addr
+    source:addr:date: Key:source:addr:date
+    source:addr:housenumber: Key:source:addr:housenumber
+    source:addr:housenumber:ref: Key:source:addr:housenumber:ref
     source:addr:postcode: Key:source:addr:postcode
+    source:addr:version: Key:source:addr:version
+    source:address: Key:source:address
+    source:alt_name: Key:source:alt name
     source:ar: Key:source:ar
     source:area: Key:source:area
+    source:bicycle: Key:source:bicycle
+    source:bridge: Key:source:bridge
     source:building: Key:source:building
     source:conscriptionnumber: Key:source:conscriptionnumber
+    source:damage: Key:source:damage
+    source:data: Key:source:data
     source:date: Key:source:date
+    source:description: Key:source:description
+    source:designation: Key:source:designation
     source:destination: Key:source:destination
+    source:ele: Key:source:ele
     source:en: Key:source:en
+    source:file: Key:source:file
     source:footprint: Key:source:footprint
     source:geometry: Key:source:geometry
     source:geometry:date: Key:source:geometry:date
+    source:geometry:oidn: Key:source:geometry:oidn
     source:geometry:ref: Key:source:geometry:ref
+    source:geometry:version: Key:source:geometry:version
+    source:height: Key:source:height
+    source:heritage: Key:source:heritage
+    source:hgv: Key:source:hgv
+    source:hgv:national_network: Key:source:hgv:national network
+    source:hgv:state_network: Key:source:hgv:state network
+    source:highway: Key:source:highway
+    source:highway_authority_ref: Key:source:highway authority ref
+    source:highway_classification: Key:source:highway classification
+    source:housenumber: Key:source:housenumber
+    source:id: Key:source:id
     source:imagery: Key:source:imagery
     source:ja: Key:source:ja
+    source:lake: Key:source:lake
     source:lanes: Key:source:lanes
+    source:lit: Key:source:lit
     source:loc: Key:source:loc
+    source:location: Key:source:location
+    source:maxaxleload: Key:source:maxaxleload
     source:maxspeed: Key:source:maxspeed
     source:maxspeed:backward: Key:source:maxspeed:backward
     source:maxspeed:forward: Key:source:maxspeed:forward
@@ -7256,17 +7902,39 @@ en:
     source:name:ar: Key:source:name:ar
     source:name:br: Key:source:name:br
     source:name:date: Key:source:name:date
+    source:name:oc: Key:source:name:oc
+    source:old_name: Key:source:old name
+    source:old_ref:fap: Key:source:old ref:fap
     source:oneway: Key:source:oneway
     source:outline: Key:source:outline
+    source:pkey: Key:source:pkey
     source:population: Key:source:population
     source:position: Key:source:position
+    source:postal_code: Key:source:postal code
     source:postcode: Key:source:postcode
+    source:power: Key:source:power
+    source:prow_ref: Key:source:prow ref
     source:ref: Key:source:ref
+    source:ro: Key:source:ro
     source:shape: Key:source:shape
+    source:street: Key:source:street
+    source:streetnumber: Key:source:streetnumber
+    source:surface: Key:source:surface
     source:taxon: Key:source:taxon
     source:tracer: Key:source:tracer
+    source:url: Key:source:url
+    source:user: Key:source:user
+    source:version: Key:source:version
+    source:wfs: Key:source:wfs
+    source:wheelchair: Key:source:wheelchair
+    source:width: Key:source:width
     source:zoomlevel: Key:source:zoomlevel
+    source_date: Key:source date
     source_ref: Key:source ref
+    source_ref:name: Key:source ref:name
+    source_ref:url: Key:source ref:url
+    source_type_imagery: Key:source type imagery
+    spacing: Key:spacing
     species: Key:species
     species:FR: Key:species:FR
     species:ar: Key:species:ar
@@ -7288,19 +7956,25 @@ en:
     speisebezirk: Key:speisebezirk
     sport: Key:sport
     sqkm: Key:sqkm
+    ssvz: Key:ssvz
+    stage_door: Key:stage door
     stairs: Key:stairs
     stamps: Key:stamps
+    standing: Key:standing
     stars: Key:stars
     start_date: Key:start date
     state: Key:state
     station: Key:station
+    statue: Key:statue
     status: Key:status
     step:contrast: Key:step:contrast
     step_count: Key:step count
     steps: Key:steps
     stile: Key:stile
+    stilts: Key:stilts
     stone_type: Key:stone type
     stop: Key:stop
+    stop:direction: Key:stop:direction
     stop_id: Key:stop id
     storage_area: Key:storage area
     stove: Key:stove
@@ -7324,6 +7998,7 @@ en:
     support:notinsel: Key:support:notinsel
     surface: Key:surface
     surface:grade: Key:surface:grade
+    surface:note: Key:surface:note
     surveillance: Key:surveillance
     surveillance:type: Key:surveillance:type
     surveillance:zone: Key:surveillance:zone
@@ -7333,6 +8008,7 @@ en:
     survey_point:structure: Key:survey point:structure
     sustrans_ref: Key:sustrans ref
     swimming: Key:swimming
+    swimming_lanes: Key:swimming lanes
     swimming_pool: Key:swimming pool
     switch: Key:switch
     symbol: Key:symbol
@@ -7353,10 +8029,12 @@ en:
     tailor:bespoke_tailoring: Key:tailor:bespoke tailoring
     takeaway: Key:takeaway
     tank: Key:tank
+    tank_cleaning_truck: Key:tank cleaning truck
     tank_trap: Key:tank trap
     target: Key:target
     taxi: Key:taxi
     taxon: Key:taxon
+    taxon:wikidata: Key:taxon:wikidata
     technical_type: Key:technical type
     technology: Key:technology
     telecom: Key:telecom
@@ -7373,6 +8051,7 @@ en:
     teryt:simc: Key:teryt:simc
     teryt:stan_na: Key:teryt:stan na
     teryt:terc: Key:teryt:terc
+    thatcher_name: Key:thatcher name
     theatre:genre: Key:theatre:genre
     theatre:type: Key:theatre:type
     theme: Key:theme
@@ -7387,6 +8066,7 @@ en:
     tiger:FUNCSTAT: Key:tiger:FUNCSTAT
     tiger:LSAD: Key:tiger:LSAD
     tiger:MTFCC: Key:tiger:MTFCC
+    tiger:NAME: Key:tiger:NAME
     tiger:PLACENS: Key:tiger:PLACENS
     tiger:cfcc: Key:tiger:cfcc
     tiger:county: Key:tiger:county
@@ -7406,6 +8086,7 @@ en:
     toilets:wheelchair: Key:toilets:wheelchair
     toll: Key:toll
     toll:hgv: Key:toll:hgv
+    toll:hov: Key:toll:hov
     toll:motorcycle: Key:toll:motorcycle
     tomb: Key:tomb
     topless: Key:topless
@@ -7423,11 +8104,15 @@ en:
     traffic:hourly: Key:traffic:hourly
     traffic_calming: Key:traffic calming
     traffic_sign: Key:traffic sign
+    traffic_sign:2: Key:traffic sign:2
+    traffic_sign:3: Key:traffic sign:3
+    traffic_sign:4: Key:traffic sign:4
     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:bicycle_early_release: Key:traffic signals:bicycle early release
     traffic_signals:countdown: Key:traffic signals:countdown
     traffic_signals:direction: Key:traffic signals:direction
     traffic_signals:floor_vibration: Key:traffic signals:floor vibration
@@ -7444,9 +8129,11 @@ en:
     trailer: Key:trailer
     trailer:rental: Key:trailer:rental
     train: Key:train
+    training: Key:training
     tram: Key:tram
     transformer: Key:transformer
     transformer:devices: Key:transformer:devices
+    tree:ref: Key:tree:ref
     tree_lined: Key:tree lined
     trees: Key:trees
     trench: Key:trench
@@ -7485,11 +8172,11 @@ en:
     uir_adr:ADRESA_KOD: Key:uir adr:ADRESA KOD
     unisex: Key:unisex
     unit: Key:unit
-    unnamed: Key:unnamed
     unsigned: Key:unsigned
     unsigned_ref: Key:unsigned ref
     url: Key:url
     url:restrictions: Key:url:restrictions
+    us:ny:swis: Key:us:ny:swis
     usage: Key:usage
     user_defined_other: Key:user defined other
     utahagrc:parcelid: Key:utahagrc:parcelid
@@ -7498,12 +8185,13 @@ en:
     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
+    vehicle:wikidata: Key:vehicle:wikidata
+    vehicle:wikipedia: Key:vehicle:wikipedia
     vending: Key:vending
     verge: Key:verge
     vhf: Key:vhf
@@ -7517,6 +8205,7 @@ en:
     voltage: Key:voltage
     voltage:primary: Key:voltage:primary
     voltage:secondary: Key:voltage:secondary
+    voltage:tertiary: Key:voltage:tertiary
     walk-in: Key:walk-in
     wall: Key:wall
     wall:material: Key:wall:material
@@ -7530,6 +8219,7 @@ en:
     water_system: Key:water system
     water_well: Key:water well
     waterway: Key:waterway
+    waterway:type: Key:waterway:type
     weather_protection: Key:weather protection
     website: Key:website
     website:booking: Key:website:booking
@@ -7550,14 +8240,17 @@ en:
     wikimedia_commons: Key:wikimedia commons
     wikipedia: Key:wikipedia
     wikipedia:ar: Key:wikipedia:ar
+    wikipedia:arc: Key:wikipedia:arc
     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:es: Key:wikipedia:es
     wikipedia:fa: Key:wikipedia:fa
     wikipedia:fr: Key:wikipedia:fr
     wikipedia:glk: Key:wikipedia:glk
+    wikipedia:grc: Key:wikipedia:grc
     wikipedia:ks: Key:wikipedia:ks
     wikipedia:lrc: Key:wikipedia:lrc
     wikipedia:mzn: Key:wikipedia:mzn
@@ -7568,12 +8261,14 @@ en:
     wikipedia:ug: Key:wikipedia:ug
     wikipedia:ur: Key:wikipedia:ur
     windings: Key:windings
+    windings:auto: Key:windings:auto
     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
+    window: Key:window
     wine:grape: Key:wine:grape
     wine:region: Key:wine:region
     wine:type: Key:wine:type
@@ -7583,6 +8278,7 @@ en:
     winter_room: Key:winter room
     winter_service: Key:winter service
     winter_service:gritting: Key:winter service:gritting
+    winter_service:heating: Key:winter service:heating
     winter_service:priority: Key:winter service:priority
     winter_service:salting: Key:winter service:salting
     wires: Key:wires
@@ -7591,6 +8287,7 @@ en:
     wood_available: Key:wood available
     wood_provided: Key:wood provided
     woody_species_100m: Key:woody species 100m
+    working: Key:working
     workrules: Key:workrules
     works: Key:works
     workshop: Key:workshop
@@ -7619,7 +8316,9 @@ en:
     abandoned:amenity=prison: Tag:abandoned:amenity=prison
     abandoned:amenity=prison_camp: Tag:abandoned:amenity=prison camp
     abandoned=yes: Tag:abandoned=yes
+    abutters=retail: Tag:abutters=retail
     access=agricultural: Tag:access=agricultural
+    access=bdouble: Tag:access=bdouble
     access=customers: Tag:access=customers
     access=delivery: Tag:access=delivery
     access=designated: Tag:access=designated
@@ -7641,6 +8340,7 @@ en:
     actuator=hydraulic_cylinder: Tag:actuator=hydraulic cylinder
     actuator=manual: Tag:actuator=manual
     actuator=pneumatic_cylinder: Tag:actuator=pneumatic cylinder
+    addr:TW:dataset=137998: Tag:addr:TW:dataset=137998
     addr:type=water: Tag:addr:type=water
     admin_level=1: Tag:admin level=1
     admin_level=10: Tag:admin level=10
@@ -7679,6 +8379,7 @@ en:
     aerialway=platter: Tag:aerialway=platter
     aerialway=pylon: Tag:aerialway=pylon
     aerialway=rope_tow: Tag:aerialway=rope tow
+    aerialway=ropetow: Tag:aerialway=ropetow
     aerialway=station: Tag:aerialway=station
     aerialway=t-bar: Tag:aerialway=t-bar
     aerialway=zip_line: Tag:aerialway=zip line
@@ -7689,6 +8390,7 @@ en:
     aerodrome:type=private: Tag:aerodrome:type=private
     aerodrome:type=regional: Tag:aerodrome:type=regional
     aeroway=aerodrome: Tag:aeroway=aerodrome
+    aeroway=aircraft_crossing: Tag:aeroway=aircraft crossing
     aeroway=airport: Tag:aeroway=airport
     aeroway=airstrip: Tag:aeroway=airstrip
     aeroway=airtanker_base: Tag:aeroway=airtanker base
@@ -7708,14 +8410,15 @@ en:
     aeroway=parking_position: Tag:aeroway=parking position
     aeroway=runway: Tag:aeroway=runway
     aeroway=spaceport: Tag:aeroway=spaceport
+    aeroway=stopway: Tag:aeroway=stopway
     aeroway=taxilane: Tag:aeroway=taxilane
     aeroway=taxiway: Tag:aeroway=taxiway
     aeroway=terminal: Tag:aeroway=terminal
+    aeroway=tower: Tag:aeroway=tower
     aeroway=windsock: Tag:aeroway=windsock
     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
@@ -7723,9 +8426,9 @@ en:
     amenity=ambulance_station: Tag:amenity=ambulance station
     amenity=animal_boarding: Tag:amenity=animal boarding
     amenity=animal_breeding: Tag:amenity=animal breeding
+    amenity=animal_effluent_disposal: Tag:amenity=animal effluent disposal
     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
     amenity=artwork: Tag:amenity=artwork
@@ -7745,7 +8448,6 @@ en:
     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
@@ -7782,7 +8484,6 @@ en:
     amenity=coast_guard: Tag:amenity=coast guard
     amenity=coast_radar_station: Tag:amenity=coast radar station
     amenity=college: Tag:amenity=college
-    amenity=community_center: Tag:amenity=community center
     amenity=community_centre: Tag:amenity=community centre
     amenity=compressed_air: Tag:amenity=compressed air
     amenity=concert_hall: Tag:amenity=concert hall
@@ -7810,6 +8511,7 @@ en:
     amenity=dog_toilet: Tag:amenity=dog toilet
     amenity=dog_waste_bin: Tag:amenity=dog waste bin
     amenity=dojo: Tag:amenity=dojo
+    amenity=dormitory: Tag:amenity=dormitory
     amenity=dressing_room: Tag:amenity=dressing room
     amenity=drinking_water: Tag:amenity=drinking water
     amenity=driver_training: Tag:amenity=driver training
@@ -7836,6 +8538,7 @@ en:
     amenity=food_court: Tag:amenity=food court
     amenity=food_sharing: Tag:amenity=food sharing
     amenity=fountain: Tag:amenity=fountain
+    amenity=freeshop: Tag:amenity=freeshop
     amenity=fridge: Tag:amenity=fridge
     amenity=fuel: Tag:amenity=fuel
     amenity=funeral_hall: Tag:amenity=funeral hall
@@ -7897,6 +8600,7 @@ en:
     amenity=office: Tag:amenity=office
     amenity=osmica: Tag:amenity=osmica
     amenity=outfitter: Tag:amenity=outfitter
+    amenity=parcel_locker: Tag:amenity=parcel locker
     amenity=park: Tag:amenity=park
     amenity=parking: Tag:amenity=parking
     amenity=parking_entrance: Tag:amenity=parking entrance
@@ -7931,6 +8635,7 @@ en:
     amenity=refugee_housing: Tag:amenity=refugee housing
     amenity=refugee_site: Tag:amenity=refugee site
     amenity=register_office: Tag:amenity=register office
+    amenity=relay_box: Tag:amenity=relay box
     amenity=rescue_box: Tag:amenity=rescue box
     amenity=rescue_station: Tag:amenity=rescue station
     amenity=research_institute: Tag:amenity=research institute
@@ -7942,6 +8647,7 @@ en:
     amenity=sanitary_dump_station: Tag:amenity=sanitary dump station
     amenity=sauna: Tag:amenity=sauna
     amenity=school: Tag:amenity=school
+    amenity=scooter_rental: Tag:amenity=scooter rental
     amenity=seat: Tag:amenity=seat
     amenity=shelter: Tag:amenity=shelter
     amenity=shop: Tag:amenity=shop
@@ -8020,6 +8726,7 @@ en:
     area:highway=trunk: Tag:area:highway=trunk
     area:highway=trunk_link: Tag:area:highway=trunk link
     area:highway=turning_circle: Tag:area:highway=turning circle
+    artwork_subject=sheela-na-gig: Tag:artwork subject=sheela-na-gig
     artwork_type=architecture: Tag:artwork type=architecture
     artwork_type=bust: Tag:artwork type=bust
     artwork_type=mural: Tag:artwork type=mural
@@ -8034,6 +8741,17 @@ en:
     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
+    athletics=discus_throw: Tag:athletics=discus throw
+    athletics=hammer_throw: Tag:athletics=hammer throw
+    athletics=high_jump: Tag:athletics=high jump
+    athletics=javelin_throw: Tag:athletics=javelin throw
+    athletics=long_jump: Tag:athletics=long jump
+    athletics=pole_vault: Tag:athletics=pole vault
+    athletics=running: Tag:athletics=running
+    athletics=shot_put: Tag:athletics=shot put
+    athletics=sprint: Tag:athletics=sprint
+    athletics=steeplechase: Tag:athletics=steeplechase
+    athletics=triple_jump: Tag:athletics=triple jump
     atm=no: Tag:atm=no
     atm=yes: Tag:atm=yes
     attraction=alpine_coaster: Tag:attraction=alpine coaster
@@ -8044,11 +8762,14 @@ en:
     attraction=summer_toboggan: Tag:attraction=summer toboggan
     attraction=train: Tag:attraction=train
     attraction=water_slide: Tag:attraction=water slide
+    avalanche_protection=snow_bridge: Tag:avalanche protection=snow bridge
     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=barricade: Tag:barrier=barricade
+    barrier=barrier_board: Tag:barrier=barrier board
     barrier=berm: Tag:barrier=berm
     barrier=block: Tag:barrier=block
     barrier=bollard: Tag:barrier=bollard
@@ -8062,6 +8783,7 @@ en:
     barrier=chech_hedgehog: Tag:barrier=chech hedgehog
     barrier=chicane: Tag:barrier=chicane
     barrier=city_wall: Tag:barrier=city wall
+    barrier=coupure: Tag:barrier=coupure
     barrier=cycle_barrier: Tag:barrier=cycle barrier
     barrier=czech_hedgehog: Tag:barrier=czech hedgehog
     barrier=debris: Tag:barrier=debris
@@ -8069,6 +8791,7 @@ en:
     barrier=embankment: Tag:barrier=embankment
     barrier=entrance: Tag:barrier=entrance
     barrier=fence: Tag:barrier=fence
+    barrier=foldable_pie_slice: Tag:barrier=foldable pie slice
     barrier=full-height_turnstile: Tag:barrier=full-height turnstile
     barrier=gate: Tag:barrier=gate
     barrier=guard_rail: Tag:barrier=guard rail
@@ -8094,8 +8817,10 @@ en:
     barrier=rope: Tag:barrier=rope
     barrier=sally_port: Tag:barrier=sally port
     barrier=select_acces: Tag:barrier=select acces
+    barrier=sliding_beam: Tag:barrier=sliding beam
     barrier=sliding_gate: Tag:barrier=sliding gate
     barrier=spikes: Tag:barrier=spikes
+    barrier=steeplechase_jump: Tag:barrier=steeplechase jump
     barrier=step: Tag:barrier=step
     barrier=stile: Tag:barrier=stile
     barrier=sump_buster: Tag:barrier=sump buster
@@ -8132,6 +8857,8 @@ en:
     bicycle=dismount: Tag:bicycle=dismount
     bicycle=no: Tag:bicycle=no
     bicycle=official: Tag:bicycle=official
+    bicycle=optional_sidepath: Tag:bicycle=optional sidepath
+    bicycle=permissive: Tag:bicycle=permissive
     bicycle=private: Tag:bicycle=private
     bicycle=use_sidepath: Tag:bicycle=use sidepath
     bicycle=yes: Tag:bicycle=yes
@@ -8146,7 +8873,11 @@ en:
     boat:type=pedalo: Tag:boat:type=pedalo
     boat:type=rowing: Tag:boat:type=rowing
     boat:type=sailing: Tag:boat:type=sailing
+    books=comic: Tag:books=comic
+    books=textbook: Tag:books=textbook
     border_type=harbour_limits: Tag:border type=harbour limits
+    border_type=nation: Tag:border type=nation
+    border_zone=5km_zone: Tag:border zone=5km zone
     boules=bocce: Tag:boules=bocce
     boules=boule_de_fort: Tag:boules=boule de fort
     boules=breton: Tag:boules=breton
@@ -8154,9 +8885,15 @@ en:
     boules=petanque: Tag:boules=petanque
     boundary=aboriginal_lands: Tag:boundary=aboriginal lands
     boundary=administrative: Tag:boundary=administrative
+    boundary=administrative_cooperation: Tag:boundary=administrative cooperation
+    boundary=border_zone: Tag:boundary=border zone
     boundary=census: Tag:boundary=census
     boundary=civil: Tag:boundary=civil
+    boundary=disputed: Tag:boundary=disputed
     boundary=economic: Tag:boundary=economic
+    boundary=enclave: Tag:boundary=enclave
+    boundary=exclave: Tag:boundary=exclave
+    boundary=forest: Tag:boundary=forest
     boundary=forest_compartment: Tag:boundary=forest compartment
     boundary=forestry_compartment: Tag:boundary=forestry compartment
     boundary=hazard: Tag:boundary=hazard
@@ -8180,11 +8917,14 @@ en:
     boundary=vice_county: Tag:boundary=vice county
     boundary=waste_collection: Tag:boundary=waste collection
     boundary=water_protection_area: Tag:boundary=water protection area
+    brand=Deutsche_Post: Tag:brand=Deutsche Post
+    brand=Eroski: Tag:brand=Eroski
     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=Spar: Tag:brand=Spar
     brand=Triumph: Tag:brand=Triumph
     brand=Zero: Tag:brand=Zero
     bridge:movable=bascule: Tag:bridge:movable=bascule
@@ -8217,6 +8957,7 @@ en:
     bridge=simple_brunnel: Tag:bridge=simple brunnel
     bridge=trestle: Tag:bridge=trestle
     bridge=viaduct: Tag:bridge=viaduct
+    building:part=porch: Tag:building:part=porch
     building:use=stable: Tag:building:use=stable
     building=*: Tag:building=*
     building=Y: Tag:building=Y
@@ -8226,6 +8967,7 @@ en:
     building=bakehouse: Tag:building=bakehouse
     building=barn: Tag:building=barn
     building=barracks: Tag:building=barracks
+    building=beach_hut: Tag:building=beach hut
     building=boathouse: Tag:building=boathouse
     building=brewery: Tag:building=brewery
     building=bridge: Tag:building=bridge
@@ -8249,6 +8991,7 @@ en:
     building=container: Tag:building=container
     building=convent: Tag:building=convent
     building=cowshed: Tag:building=cowshed
+    building=data_center: Tag:building=data center
     building=demountable: Tag:building=demountable
     building=detached: Tag:building=detached
     building=digester: Tag:building=digester
@@ -8273,6 +9016,8 @@ en:
     building=grandstand: Tag:building=grandstand
     building=greenhouse: Tag:building=greenhouse
     building=ground_station: Tag:building=ground station
+    building=guard_post: Tag:building=guard post
+    building=gurdwara: Tag:building=gurdwara
     building=hangar: Tag:building=hangar
     building=hospital: Tag:building=hospital
     building=hotel: Tag:building=hotel
@@ -8281,7 +9026,9 @@ en:
     building=hut: Tag:building=hut
     building=industrial: Tag:building=industrial
     building=kindergarten: Tag:building=kindergarten
+    building=kingdom_hall: Tag:building=kingdom hall
     building=kiosk: Tag:building=kiosk
+    building=lighthouse: Tag:building=lighthouse
     building=manufacture: Tag:building=manufacture
     building=marquee: Tag:building=marquee
     building=military: Tag:building=military
@@ -8289,14 +9036,18 @@ en:
     building=mosque: Tag:building=mosque
     building=museum: Tag:building=museum
     building=office: Tag:building=office
+    building=outbuilding: Tag:building=outbuilding
+    building=pagoda: Tag:building=pagoda
     building=palace: Tag:building=palace
     building=parking: Tag:building=parking
     building=pavilion: Tag:building=pavilion
     building=planned: Tag:building=planned
+    building=porch: Tag:building=porch
     building=presbytery: Tag:building=presbytery
     building=proposed: Tag:building=proposed
     building=public: Tag:building=public
     building=quonset_hut: Tag:building=quonset hut
+    building=railway: Tag:building=railway
     building=religious: Tag:building=religious
     building=remote_digital_terminal: Tag:building=remote digital terminal
     building=residential: Tag:building=residential
@@ -8304,6 +9055,7 @@ en:
     building=riding_hall: Tag:building=riding hall
     building=roof: Tag:building=roof
     building=roundhouse: Tag:building=roundhouse
+    building=row_houses: Tag:building=row houses
     building=ruins: Tag:building=ruins
     building=school: Tag:building=school
     building=semi: Tag:building=semi
@@ -8344,6 +9096,7 @@ en:
     building=warehouse: Tag:building=warehouse
     building=water_tower: Tag:building=water tower
     building=wayside_shrine: Tag:building=wayside shrine
+    building=windmill: Tag:building=windmill
     building=yes: Tag:building=yes
     bunker_type=gun_emplacement: Tag:bunker type=gun emplacement
     bunker_type=hardened_aircraft_shelter: Tag:bunker type=hardened aircraft shelter
@@ -8363,6 +9116,12 @@ en:
     busway=opposite_lane: Tag:busway=opposite lane
     by_night=only: Tag:by night=only
     cabin:rental=yes: Tag:cabin:rental=yes
+    cadet=ambulance: Tag:cadet=ambulance
+    cadet=emergency_services: Tag:cadet=emergency services
+    cadet=fire: Tag:cadet=fire
+    cadet=lifeguard: Tag:cadet=lifeguard
+    cadet=military: Tag:cadet=military
+    cadet=police: Tag:cadet=police
     cafe=time-cafe: Tag:cafe=time-cafe
     cafe=time_cafe: Tag:cafe=time cafe
     camp_site=basic: Tag:camp site=basic
@@ -8380,6 +9139,8 @@ en:
     car:type=hgv: Tag:car:type=hgv
     car=no: Tag:car=no
     car=yes: Tag:car=yes
+    cargo=container: Tag:cargo=container
+    cargo=liquid_bulk: Tag:cargo=liquid bulk
     carpenter=joiner: Tag:carpenter=joiner
     castle_type=castrum: Tag:castle type=castrum
     castle_type=defensive: Tag:castle type=defensive
@@ -8389,6 +9150,7 @@ en:
     castle_type=palace: Tag:castle type=palace
     castle_type=shiro: Tag:castle type=shiro
     castle_type=stately: Tag:castle type=stately
+    cemetery=cillín: Tag:cemetery=cillín
     cemetery=grave: Tag:cemetery=grave
     cemetery=sector: Tag:cemetery=sector
     cemetery=war_cemetery: Tag:cemetery=war cemetery
@@ -8407,6 +9169,7 @@ en:
     club=amateur_radio: Tag:club=amateur radio
     club=automobile: Tag:club=automobile
     club=bicycle: Tag:club=bicycle
+    club=cadet: Tag:club=cadet
     club=card_games: Tag:club=card games
     club=chess: Tag:club=chess
     club=fan: Tag:club=fan
@@ -8414,6 +9177,7 @@ en:
     club=freemasonry: Tag:club=freemasonry
     club=golf: Tag:club=golf
     club=linux: Tag:club=linux
+    club=military_cadets: Tag:club=military cadets
     club=motorcycle: Tag:club=motorcycle
     club=music: Tag:club=music
     club=nudism: Tag:club=nudism
@@ -8427,14 +9191,26 @@ en:
     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:television=dvb-t: Tag:communication:television=dvb-t
+    communication:television=dvb-t2: Tag:communication:television=dvb-t2
     communication=line: Tag:communication=line
     communication=mobile_phone: Tag:communication=mobile phone
     community_centre=club_home: Tag:community centre=club home
     community_centre=youth_centre: Tag:community centre=youth centre
     company=aerospace: Tag:company=aerospace
+    company=internet_shop: Tag:company=internet shop
     company=it: Tag:company=it
     company=logistics: Tag:company=logistics
     company=software_development: Tag:company=software development
+    compensator=filter: Tag:compensator=filter
+    compensator=series_capacitor: Tag:compensator=series capacitor
+    compensator=series_reactor: Tag:compensator=series reactor
+    compensator=shunt_capacitor: Tag:compensator=shunt capacitor
+    compensator=shunt_reactor: Tag:compensator=shunt reactor
+    compensator=statcom: Tag:compensator=statcom
+    compensator=static_var: Tag:compensator=static var
+    compensator=synchronous_condenser: Tag:compensator=synchronous condenser
+    compensator=voltage_regulator: Tag:compensator=voltage regulator
     construction:power=plant: Tag:construction:power=plant
     construction=shed: Tag:construction=shed
     construction=yes: Tag:construction=yes
@@ -8442,10 +9218,15 @@ en:
     consulate=consular_office: Tag:consulate=consular office
     consulate=consulate_general: Tag:consulate=consulate general
     consulate=honorary_consul: Tag:consulate=honorary consul
+    consulate=residence: Tag:consulate=residence
     consulate=yes: Tag:consulate=yes
     content=hot_water: Tag:content=hot water
+    content=slurry: Tag:content=slurry
+    cooling:method=air_cooling: Tag:cooling:method=air cooling
     cooling:method=dry_cooling: Tag:cooling:method=dry cooling
     cooling:method=mechanical_draft: Tag:cooling:method=mechanical draft
+    covered=no: Tag:covered=no
+    covered=yes: Tag:covered=yes
     craft=agricultural_engines: Tag:craft=agricultural engines
     craft=atelier: Tag:craft=atelier
     craft=bag_repair: Tag:craft=bag repair
@@ -8540,6 +9321,7 @@ en:
     craft=upholsterer: Tag:craft=upholsterer
     craft=watchmaker: Tag:craft=watchmaker
     craft=water_well_drilling: Tag:craft=water well drilling
+    craft=weaver: Tag:craft=weaver
     craft=welder: Tag:craft=welder
     craft=window_construction: Tag:craft=window construction
     craft=winery: Tag:craft=winery
@@ -8582,40 +9364,70 @@ en:
     crossing=unknown: Tag:crossing=unknown
     crossing=unmarked: Tag:crossing=unmarked
     crossing=zebra: Tag:crossing=zebra
+    crossing_ref=delineated: Tag:crossing ref=delineated
     crossing_ref=zebra: Tag:crossing ref=zebra
+    cuisine=american: Tag:cuisine=american
+    cuisine=asian: Tag:cuisine=asian
     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=catalan: Tag:cuisine=catalan
     cuisine=chicken: Tag:cuisine=chicken
+    cuisine=chinese: Tag:cuisine=chinese
     cuisine=coffee_shop: Tag:cuisine=coffee shop
+    cuisine=couscous: Tag:cuisine=couscous
+    cuisine=crepe: Tag:cuisine=crepe
+    cuisine=curry: Tag:cuisine=curry
     cuisine=dessert: Tag:cuisine=dessert
     cuisine=donut: Tag:cuisine=donut
     cuisine=dumplings: Tag:cuisine=dumplings
     cuisine=empanada: Tag:cuisine=empanada
+    cuisine=fish: Tag:cuisine=fish
     cuisine=fish_and_chips: Tag:cuisine=fish and chips
+    cuisine=french: Tag:cuisine=french
     cuisine=friture: Tag:cuisine=friture
+    cuisine=german: Tag:cuisine=german
+    cuisine=greek: Tag:cuisine=greek
     cuisine=hot_dog: Tag:cuisine=hot dog
+    cuisine=hot_pot: Tag:cuisine=hot pot
     cuisine=ice_cream: Tag:cuisine=ice cream
+    cuisine=indian: Tag:cuisine=indian
+    cuisine=italian: Tag:cuisine=italian
+    cuisine=japanese: Tag:cuisine=japanese
     cuisine=kebab: Tag:cuisine=kebab
+    cuisine=korean: Tag:cuisine=korean
+    cuisine=mediterranean: Tag:cuisine=mediterranean
+    cuisine=mexican: Tag:cuisine=mexican
+    cuisine=noodle: Tag:cuisine=noodle
+    cuisine=pakistani: Tag:cuisine=pakistani
+    cuisine=pancake: Tag:cuisine=pancake
     cuisine=pasta: Tag:cuisine=pasta
     cuisine=pizza: Tag:cuisine=pizza
+    cuisine=regional: Tag:cuisine=regional
     cuisine=sandwich: Tag:cuisine=sandwich
     cuisine=seafood: Tag:cuisine=seafood
     cuisine=soup: Tag:cuisine=soup
+    cuisine=spanish: Tag:cuisine=spanish
     cuisine=steak_house: Tag:cuisine=steak house
     cuisine=strudel: Tag:cuisine=strudel
     cuisine=sushi: Tag:cuisine=sushi
+    cuisine=tapas: Tag:cuisine=tapas
     cuisine=tea_house: Tag:cuisine=tea house
     cuisine=tea_shop: Tag:cuisine=tea shop
     cuisine=teahouse: Tag:cuisine=teahouse
+    cuisine=thai: Tag:cuisine=thai
+    cuisine=turkish: Tag:cuisine=turkish
+    cuisine=vietnamese: Tag:cuisine=vietnamese
     cuisine=waffle: Tag:cuisine=waffle
     cuisine=wings: Tag:cuisine=wings
+    culvert=inverted_siphon: Tag:culvert=inverted siphon
     curve=hairpin: Tag:curve=hairpin
     curve=loop: Tag:curve=loop
     curves=extended: Tag:curves=extended
     curves=serpentine: Tag:curves=serpentine
+    cycle_network=BE-VLG:cycle_highway: Tag:cycle network=BE-VLG:cycle highway
     cycle_network=EuroVelo: Tag:cycle network=EuroVelo
     cycle_network=US:CA:SF: Tag:cycle network=US:CA:SF
     cycle_network=US:GA: Tag:cycle network=US:GA
@@ -8630,6 +9442,8 @@ en:
     cycleway:both=lane: Tag:cycleway:both=lane
     cycleway:both=no: Tag:cycleway:both=no
     cycleway:both=shared_lane: Tag:cycleway:both=shared lane
+    cycleway:foot=designated: Tag:cycleway:foot=designated
+    cycleway:foot=no: Tag:cycleway:foot=no
     cycleway:left=lane: Tag:cycleway:left=lane
     cycleway:left=no: Tag:cycleway:left=no
     cycleway:left=opposite_lane: Tag:cycleway:left=opposite lane
@@ -8660,24 +9474,38 @@ en:
     cycleway=share_busway: Tag:cycleway=share busway
     cycleway=shared_busway: Tag:cycleway=shared busway
     cycleway=shared_lane: Tag:cycleway=shared lane
+    cycleway=shared_line: Tag:cycleway=shared line
     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
+    defensive_works=bastion: Tag:defensive works=bastion
+    defensive_works=battery: Tag:defensive works=battery
     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=agricultural: Tag:denotation=agricultural
+    denotation=avenue: Tag:denotation=avenue
     denotation=cluster: Tag:denotation=cluster
+    denotation=landmark: Tag:denotation=landmark
+    denotation=natural_monument: Tag:denotation=natural monument
+    denotation=urban: Tag:denotation=urban
     designation=byway_open_to_all_traffic: Tag:designation=byway open to all traffic
+    designation=civil_parish: Tag:designation=civil parish
     designation=common: Tag:designation=common
+    designation=core_path: Tag:designation=core path
+    designation=public_bridleway: Tag:designation=public bridleway
+    designation=public_footpath: Tag:designation=public footpath
+    designation=restricted_byway: Tag:designation=restricted byway
     destroyed=yes: Tag:destroyed=yes
     diet:kosher=only: Tag:diet:kosher=only
     diet:kosher=yes: Tag:diet:kosher=yes
+    diet:meat=yes: Tag:diet:meat=yes
     diplomatic=ambassadors_residence: Tag:diplomatic=ambassadors residence
     diplomatic=consulate: Tag:diplomatic=consulate
     diplomatic=consulate_general: Tag:diplomatic=consulate general
@@ -8694,6 +9522,7 @@ en:
     dock=drydock: Tag:dock=drydock
     dock=floating: Tag:dock=floating
     dock=tidal: Tag:dock=tidal
+    dog=designated: Tag:dog=designated
     dog=leashed: Tag:dog=leashed
     dog=no: Tag:dog=no
     dog=unleashed: Tag:dog=unleashed
@@ -8707,6 +9536,8 @@ en:
     electrified=4th_rail: Tag:electrified=4th rail
     electrified=contact_line: Tag:electrified=contact line
     electrified=rail: Tag:electrified=rail
+    electronics_repair=phone: Tag:electronics repair=phone
+    embankment=dyke: Tag:embankment=dyke
     embassy=branch_embassy: Tag:embassy=branch embassy
     embassy=delegation: Tag:embassy=delegation
     embassy=high_commission: Tag:embassy=high commission
@@ -8771,21 +9602,28 @@ en:
     emergency=wet_riser: Tag:emergency=wet riser
     emergency=yes: Tag:emergency=yes
     emergency_service=technical: Tag:emergency service=technical
+    entrance=exit: Tag:entrance=exit
+    entrance=fire_exit: Tag:entrance=fire exit
     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=shop: Tag:entrance=shop
     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
+    faculty=engineering: Tag:faculty=engineering
     farmland=arable: Tag:farmland=arable
     farmland=pasture: Tag:farmland=pasture
     farmyard=stockyard: Tag:farmyard=stockyard
     fast_food=cafeteria: Tag:fast food=cafeteria
+    fire_hydrant:position=green: Tag:fire hydrant:position=green
+    fire_hydrant:position=lane: Tag:fire hydrant:position=lane
+    fire_hydrant:position=parking_lot: Tag:fire hydrant:position=parking lot
+    fire_hydrant:position=sidewalk: Tag:fire hydrant:position=sidewalk
     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
@@ -8806,9 +9644,12 @@ en:
     flood_mark=plaque: Tag:flood mark=plaque
     floor:material=wood: Tag:floor:material=wood
     flow_direction=both: Tag:flow direction=both
+    foldable_pie_slice: Tag:foldable pie slice
     foot=designated: Tag:foot=designated
+    foot=destination: Tag:foot=destination
     foot=no: Tag:foot=no
     foot=official: Tag:foot=official
+    foot=permissive: Tag:foot=permissive
     foot=private: Tag:foot=private
     foot=use_sidepath: Tag:foot=use sidepath
     foot=yes: Tag:foot=yes
@@ -8818,6 +9659,7 @@ en:
     footway=crossing: Tag:footway=crossing
     footway=left: Tag:footway=left
     footway=none: Tag:footway=none
+    footway=path: Tag:footway=path
     footway=right: Tag:footway=right
     footway=sidewalk: Tag:footway=sidewalk
     footway=traffic_island: Tag:footway=traffic island
@@ -8836,7 +9678,9 @@ en:
     fountain=roman_wolf: Tag:fountain=roman wolf
     fountain=stone_block: Tag:fountain=stone block
     fountain=toret: Tag:fountain=toret
+    fountain=wallace: Tag:fountain=wallace
     garden:type=botanical: Tag:garden:type=botanical
+    garden:type=monastery: Tag:garden:type=monastery
     generator:method=anaerobic_digestion: Tag:generator:method=anaerobic digestion
     generator:method=barrage: Tag:generator:method=barrage
     generator:method=combustion: Tag:generator:method=combustion
@@ -8963,7 +9807,11 @@ en:
     hazard=dangerous_junction: Tag:hazard=dangerous junction
     hazard=dip: Tag:hazard=dip
     hazard=falling_rocks: Tag:hazard=falling rocks
+    hazard=fog: Tag:hazard=fog
+    hazard=frail_pedestrians: Tag:hazard=frail pedestrians
     hazard=frost_heave: Tag:hazard=frost heave
+    hazard=ground_clearance: Tag:hazard=ground clearance
+    hazard=hole: Tag:hazard=hole
     hazard=horse_riders: Tag:hazard=horse riders
     hazard=ice: Tag:hazard=ice
     hazard=landslide: Tag:hazard=landslide
@@ -8975,6 +9823,8 @@ en:
     hazard=pedestrians: Tag:hazard=pedestrians
     hazard=queues_likely: Tag:hazard=queues likely
     hazard=quicksand: Tag:hazard=quicksand
+    hazard=road_narrows: Tag:hazard=road narrows
+    hazard=roadworks: Tag:hazard=roadworks
     hazard=school_zone: Tag:hazard=school zone
     hazard=shooting_range: Tag:hazard=shooting range
     hazard=side_winds: Tag:hazard=side winds
@@ -8982,21 +9832,102 @@ en:
     hazard=turn: Tag:hazard=turn
     hazard=turns: Tag:hazard=turns
     hazard=unexploded_ordnance: Tag:hazard=unexploded ordnance
+    hazard=washout: Tag:hazard=washout
     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
+    headlight=required: Tag:headlight=required
+    health_facility:type=office: Tag:health facility:type=office
     healthcare:speciality=abortion: Tag:healthcare:speciality=abortion
+    healthcare:speciality=allergology: Tag:healthcare:speciality=allergology
+    healthcare:speciality=anaesthetics: Tag:healthcare:speciality=anaesthetics
+    healthcare:speciality=behavior: Tag:healthcare:speciality=behavior
+    healthcare:speciality=biochemistry: Tag:healthcare:speciality=biochemistry
+    healthcare:speciality=biological_haematology: Tag:healthcare:speciality=biological
+      haematology
+    healthcare:speciality=biology: Tag:healthcare:speciality=biology
+    healthcare:speciality=blood_check: Tag:healthcare:speciality=blood check
+    healthcare:speciality=body: Tag:healthcare:speciality=body
+    healthcare:speciality=cardiac_surgery: Tag:healthcare:speciality=cardiac surgery
+    healthcare:speciality=cardiology: Tag:healthcare:speciality=cardiology
+    healthcare:speciality=cardiothoracic_surgery: Tag:healthcare:speciality=cardiothoracic
+      surgery
+    healthcare:speciality=child_psychiatry: Tag:healthcare:speciality=child psychiatry
+    healthcare:speciality=clinical_pathology: Tag:healthcare:speciality=clinical pathology
+    healthcare:speciality=community: Tag:healthcare:speciality=community
+    healthcare:speciality=dental_oral_maxillo_facial_surgery: Tag:healthcare:speciality=dental
+      oral maxillo facial surgery
+    healthcare:speciality=depth: Tag:healthcare:speciality=depth
+    healthcare:speciality=dermatology: Tag:healthcare:speciality=dermatology
+    healthcare:speciality=dermatovenereology: Tag:healthcare:speciality=dermatovenereology
+    healthcare:speciality=diagnostic_radiology: Tag:healthcare:speciality=diagnostic
+      radiology
+    healthcare:speciality=emergency: Tag:healthcare:speciality=emergency
+    healthcare:speciality=endocrinology: Tag:healthcare:speciality=endocrinology
+    healthcare:speciality=fertility: Tag:healthcare:speciality=fertility
+    healthcare:speciality=gastroenterological_surgery: Tag:healthcare:speciality=gastroenterological
+      surgery
+    healthcare:speciality=gastroenterology: Tag:healthcare:speciality=gastroenterology
+    healthcare:speciality=general: Tag:healthcare:speciality=general
+    healthcare:speciality=geriatrics: Tag:healthcare:speciality=geriatrics
+    healthcare:speciality=gynaecology: Tag:healthcare:speciality=gynaecology
+    healthcare:speciality=haematology: Tag:healthcare:speciality=haematology
+    healthcare:speciality=hepatology: Tag:healthcare:speciality=hepatology
+    healthcare:speciality=humanistic: Tag:healthcare:speciality=humanistic
+    healthcare:speciality=immunology: Tag:healthcare:speciality=immunology
+    healthcare:speciality=infectious_diseases: Tag:healthcare:speciality=infectious
+      diseases
+    healthcare:speciality=intensive: Tag:healthcare:speciality=intensive
+    healthcare:speciality=internal: Tag:healthcare:speciality=internal
     healthcare:speciality=maxillofacial_surgery: Tag:healthcare:speciality=maxillofacial
       surgery
+    healthcare:speciality=microbiology: Tag:healthcare:speciality=microbiology
+    healthcare:speciality=neonatology: Tag:healthcare:speciality=neonatology
+    healthcare:speciality=nephrology: Tag:healthcare:speciality=nephrology
+    healthcare:speciality=neurology: Tag:healthcare:speciality=neurology
+    healthcare:speciality=neurophysiology: Tag:healthcare:speciality=neurophysiology
+    healthcare:speciality=neuropsychiatry: Tag:healthcare:speciality=neuropsychiatry
+    healthcare:speciality=neurosurgery: Tag:healthcare:speciality=neurosurgery
+    healthcare:speciality=nuclear: Tag:healthcare:speciality=nuclear
+    healthcare:speciality=occupational: Tag:healthcare:speciality=occupational
+    healthcare:speciality=oncology: Tag:healthcare:speciality=oncology
+    healthcare:speciality=ophthalmology: Tag:healthcare:speciality=ophthalmology
     healthcare:speciality=orthodontics: Tag:healthcare:speciality=orthodontics
+    healthcare:speciality=orthopaedics: Tag:healthcare:speciality=orthopaedics
     healthcare:speciality=otolaryngology: Tag:healthcare:speciality=otolaryngology
+    healthcare:speciality=paediatric_surgery: Tag:healthcare:speciality=paediatric
+      surgery
+    healthcare:speciality=paediatrics: Tag:healthcare:speciality=paediatrics
+    healthcare:speciality=palliative: Tag:healthcare:speciality=palliative
+    healthcare:speciality=pathology: Tag:healthcare:speciality=pathology
+    healthcare:speciality=pharmacology: Tag:healthcare:speciality=pharmacology
+    healthcare:speciality=physiatry: Tag:healthcare:speciality=physiatry
+    healthcare:speciality=plastic_surgery: Tag:healthcare:speciality=plastic surgery
+    healthcare:speciality=podiatry: Tag:healthcare:speciality=podiatry
+    healthcare:speciality=proctology: Tag:healthcare:speciality=proctology
     healthcare:speciality=psychiatry: Tag:healthcare:speciality=psychiatry
+    healthcare:speciality=pulmonology: Tag:healthcare:speciality=pulmonology
+    healthcare:speciality=radiology: Tag:healthcare:speciality=radiology
+    healthcare:speciality=radiotherapy: Tag:healthcare:speciality=radiotherapy
+    healthcare:speciality=rheumatology: Tag:healthcare:speciality=rheumatology
+    healthcare:speciality=stomatology: Tag:healthcare:speciality=stomatology
+    healthcare:speciality=surgery: Tag:healthcare:speciality=surgery
+    healthcare:speciality=surgical_oncology: Tag:healthcare:speciality=surgical oncology
+    healthcare:speciality=systemic: Tag:healthcare:speciality=systemic
+    healthcare:speciality=thoracic_surgery: Tag:healthcare:speciality=thoracic surgery
+    healthcare:speciality=transplant: Tag:healthcare:speciality=transplant
+    healthcare:speciality=trauma: Tag:healthcare:speciality=trauma
+    healthcare:speciality=tropical: Tag:healthcare:speciality=tropical
+    healthcare:speciality=urology: Tag:healthcare:speciality=urology
     healthcare:speciality=vaccination: Tag:healthcare:speciality=vaccination
+    healthcare:speciality=vascular_surgery: Tag:healthcare:speciality=vascular surgery
+    healthcare:speciality=venereology: Tag:healthcare:speciality=venereology
     healthcare=alternative: Tag:healthcare=alternative
     healthcare=audiologist: Tag:healthcare=audiologist
     healthcare=birthing_center: Tag:healthcare=birthing center
+    healthcare=birthing_centre: Tag:healthcare=birthing centre
     healthcare=blood_bank: Tag:healthcare=blood bank
     healthcare=blood_donation: Tag:healthcare=blood donation
     healthcare=centre: Tag:healthcare=centre
@@ -9024,6 +9955,7 @@ en:
     healthcare=speech_therapist: Tag:healthcare=speech therapist
     healthcare=vaccination_centre: Tag:healthcare=vaccination centre
     healthcare=yes: Tag:healthcare=yes
+    hedge=hedge_bank: Tag:hedge=hedge bank
     hgv=discouraged: Tag:hgv=discouraged
     hgv=yes: Tag:hgv=yes
     highway=Bus_guideway: Tag:highway=Bus guideway
@@ -9034,7 +9966,6 @@ en:
     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
@@ -9051,8 +9982,6 @@ en:
     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
     highway=milestone: Tag:highway=milestone
     highway=mini_roundabout: Tag:highway=mini roundabout
@@ -9083,7 +10012,6 @@ en:
     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
@@ -9123,6 +10051,7 @@ en:
     historic=city_gate: Tag:historic=city gate
     historic=city_wall: Tag:historic=city wall
     historic=citywalls: Tag:historic=citywalls
+    historic=creamery: Tag:historic=creamery
     historic=district: Tag:historic=district
     historic=event: Tag:historic=event
     historic=farm: Tag:historic=farm
@@ -9161,6 +10090,7 @@ en:
     historic=wayside_cross: Tag:historic=wayside cross
     historic=wayside_shrine: Tag:historic=wayside shrine
     historic=wreck: Tag:historic=wreck
+    historic=yes: Tag:historic=yes
     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
@@ -9171,11 +10101,14 @@ en:
     horse=dismount: Tag:horse=dismount
     house=bungalow: Tag:house=bungalow
     house=detached: Tag:house=detached
+    house=link-detached: Tag:house=link-detached
+    house=maisonette: Tag:house=maisonette
     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
+    ice_skates=kluning: Tag:ice skates=kluning
     indoor=area: Tag:indoor=area
     indoor=corridor: Tag:indoor=corridor
     indoor=door: Tag:indoor=door
@@ -9216,6 +10149,7 @@ en:
     industrial=warehouse: Tag:industrial=warehouse
     industrial=well_cluster: Tag:industrial=well cluster
     industrial=wellsite: Tag:industrial=wellsite
+    industrial=winery: Tag:industrial=winery
     information=audioguide: Tag:information=audioguide
     information=board: Tag:information=board
     information=finger-post: Tag:information=finger-post
@@ -9224,10 +10158,19 @@ en:
     information=guidepost: Tag:information=guidepost
     information=map: Tag:information=map
     information=office: Tag:information=office
+    information=route_marker: Tag:information=route marker
+    information=sign: Tag:information=sign
+    information=stele: Tag:information=stele
     information=tactile_map: Tag:information=tactile map
     information=tactile_model: Tag:information=tactile model
     information=terminal: Tag:information=terminal
     information=visitor_centre: Tag:information=visitor centre
+    inlet=bell_mouth: Tag:inlet=bell mouth
+    inlet=direct: Tag:inlet=direct
+    inlet=grate: Tag:inlet=grate
+    inlet=kerb_opening: Tag:inlet=kerb opening
+    inlet=screen: Tag:inlet=screen
+    inlet=valve: Tag:inlet=valve
     insurance=health: Tag:insurance=health
     internet_access=no: Tag:internet access=no
     internet_access=terminal: Tag:internet access=terminal
@@ -9279,6 +10222,7 @@ en:
     landmark=windmill: Tag:landmark=windmill
     landmark=windmotor: Tag:landmark=windmotor
     landmark=windsock: Tag:landmark=windsock
+    landuse:secondary: Tag:landuse:secondary
     landuse=agriculture: Tag:landuse=agriculture
     landuse=allotments: Tag:landuse=allotments
     landuse=animal_keeping: Tag:landuse=animal keeping
@@ -9300,6 +10244,7 @@ en:
     landuse=farmland: Tag:landuse=farmland
     landuse=farmyard: Tag:landuse=farmyard
     landuse=field: Tag:landuse=field
+    landuse=fish_pond: Tag:landuse=fish pond
     landuse=fishfarm: Tag:landuse=fishfarm
     landuse=flowerbed: Tag:landuse=flowerbed
     landuse=forest: Tag:landuse=forest
@@ -9329,7 +10274,9 @@ en:
     landuse=pond: Tag:landuse=pond
     landuse=port: Tag:landuse=port
     landuse=prison: Tag:landuse=prison
+    landuse=public_works: Tag:landuse=public works
     landuse=quarry: Tag:landuse=quarry
+    landuse=radio: Tag:landuse=radio
     landuse=railway: Tag:landuse=railway
     landuse=recreation_ground: Tag:landuse=recreation ground
     landuse=religious: Tag:landuse=religious
@@ -9370,6 +10317,7 @@ en:
     leisure=adult_gaming_centre: Tag:leisure=adult gaming centre
     leisure=amusement_arcade: Tag:leisure=amusement arcade
     leisure=arena: Tag:leisure=arena
+    leisure=axe_throwing: Tag:leisure=axe throwing
     leisure=bandstand: Tag:leisure=bandstand
     leisure=barefoot: Tag:leisure=barefoot
     leisure=bathing_place: Tag:leisure=bathing place
@@ -9409,6 +10357,7 @@ en:
     leisure=outdoor_seating: Tag:leisure=outdoor seating
     leisure=paddling_pool: Tag:leisure=paddling pool
     leisure=park: Tag:leisure=park
+    leisure=parklet: Tag:leisure=parklet
     leisure=picnic: Tag:leisure=picnic
     leisure=picnic_site: Tag:leisure=picnic site
     leisure=picnic_table: Tag:leisure=picnic table
@@ -9487,6 +10436,7 @@ en:
     man_made=beacon: Tag:man made=beacon
     man_made=beehive: Tag:man made=beehive
     man_made=bioreactor: Tag:man made=bioreactor
+    man_made=bird_feeder: Tag:man made=bird feeder
     man_made=breakwater: Tag:man made=breakwater
     man_made=bridge: Tag:man made=bridge
     man_made=bunker_silo: Tag:man made=bunker silo
@@ -9497,6 +10447,7 @@ en:
     man_made=chiller: Tag:man made=chiller
     man_made=chimney: Tag:man made=chimney
     man_made=clearcut: Tag:man made=clearcut
+    man_made=column: Tag:man made=column
     man_made=communications_tower: Tag:man made=communications tower
     man_made=compass_rose: Tag:man made=compass rose
     man_made=cooling: Tag:man made=cooling
@@ -9514,11 +10465,13 @@ en:
     man_made=drinking_fountain: Tag:man made=drinking fountain
     man_made=dyke: Tag:man made=dyke
     man_made=embankment: Tag:man made=embankment
+    man_made=ferry_cable: Tag:man made=ferry cable
     man_made=flagpole: Tag:man made=flagpole
     man_made=flare: Tag:man made=flare
     man_made=floating_storage: Tag:man made=floating storage
     man_made=footwear_decontamination: Tag:man made=footwear decontamination
     man_made=frost_fan: Tag:man made=frost fan
+    man_made=fuel_column: Tag:man made=fuel column
     man_made=gantry: Tag:man made=gantry
     man_made=gas_well: Tag:man made=gas well
     man_made=gasometer: Tag:man made=gasometer
@@ -9530,6 +10483,7 @@ en:
     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=hongsalmun: Tag:man made=hongsalmun
     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
@@ -9543,6 +10497,7 @@ en:
     man_made=mast: Tag:man made=mast
     man_made=maypole: Tag:man made=maypole
     man_made=measurement_station: Tag:man made=measurement station
+    man_made=meridian_marker: Tag:man made=meridian marker
     man_made=mineshaft: Tag:man made=mineshaft
     man_made=monitoring_station: Tag:man made=monitoring station
     man_made=mounting_block: Tag:man made=mounting block
@@ -9552,6 +10507,7 @@ en:
     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=paifang: Tag:man made=paifang
     man_made=petroleum_well: Tag:man made=petroleum well
     man_made=pier: Tag:man made=pier
     man_made=pillar: Tag:man made=pillar
@@ -9585,13 +10541,17 @@ en:
     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=telephone_box: Tag:man made=telephone box
+    man_made=telephone_exchange: Tag:man made=telephone exchange
     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=torii: Tag:man made=torii
     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=video_wall: Tag:man made=video wall
     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
@@ -9612,19 +10572,26 @@ en:
     maritime=yes: Tag:maritime=yes
     marker=aerial: Tag:marker=aerial
     marker=ground: Tag:marker=ground
+    marker=paddle: Tag:marker=paddle
     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
+    material=epoxy: Tag:material=epoxy
     maxheight=default: Tag:maxheight=default
+    maxspeed:type=GB:nsl_restricted: Tag:maxspeed:type=GB:nsl restricted
+    maxspeed:type=PL:rural: Tag:maxspeed:type=PL:rural
+    maxspeed:type=PL:urban: Tag:maxspeed:type=PL:urban
     maxweight:signed=no: Tag:maxweight:signed=no
+    mechanical_coupling=nodding_donkey: Tag:mechanical coupling=nodding donkey
     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_system:western=yes: Tag:medical system:western=yes
     megalith_type=alignment: Tag:megalith type=alignment
     megalith_type=chamber: Tag:megalith type=chamber
     megalith_type=cist: Tag:megalith type=cist
@@ -9643,11 +10610,14 @@ en:
     memorial:type=statue: Tag:memorial:type=statue
     memorial:type=stele: Tag:memorial:type=stele
     memorial:type=stolperstein: Tag:memorial:type=stolperstein
+    memorial=bench: Tag:memorial=bench
     memorial=blue_plaque: Tag:memorial=blue plaque
     memorial=bust: Tag:memorial=bust
     memorial=cenotaph: Tag:memorial=cenotaph
     memorial=cross: Tag:memorial=cross
+    memorial=flood_mark: Tag:memorial=flood mark
     memorial=ghost_bike: Tag:memorial=ghost bike
+    memorial=khachkar: Tag:memorial=khachkar
     memorial=obelisk: Tag:memorial=obelisk
     memorial=plaque: Tag:memorial=plaque
     memorial=sculpture: Tag:memorial=sculpture
@@ -9659,6 +10629,7 @@ en:
     memorial=vehicle: Tag:memorial=vehicle
     memorial=war_memorial: Tag:memorial=war memorial
     microbrewery=yes: Tag:microbrewery=yes
+    military=academy: Tag:military=academy
     military=airfield: Tag:military=airfield
     military=ammunition: Tag:military=ammunition
     military=barracks: Tag:military=barracks
@@ -9666,6 +10637,7 @@ en:
     military=bunker: Tag:military=bunker
     military=checkpoint: Tag:military=checkpoint
     military=danger_area: Tag:military=danger area
+    military=depot: Tag:military=depot
     military=exclusion_zone: Tag:military=exclusion zone
     military=launchpad: Tag:military=launchpad
     military=naval_base: Tag:military=naval base
@@ -9673,10 +10645,12 @@ en:
     military=obstacle_course: Tag:military=obstacle course
     military=office: Tag:military=office
     military=range: Tag:military=range
+    military=school: Tag:military=school
     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=coast_guard: Tag:military service=coast guard
     military_service=marines: Tag:military service=marines
     military_service=navy: Tag:military service=navy
     mofa=use_sidepath: Tag:mofa=use sidepath
@@ -9691,6 +10665,8 @@ en:
     mooring=spm: Tag:mooring=spm
     mooring=visitor: Tag:mooring=visitor
     moped=use_sidepath: Tag:moped=use sidepath
+    motor_vehicle=destination: Tag:motor vehicle=destination
+    motor_vehicle=yes: Tag:motor vehicle=yes
     motorcycle:type=electric: Tag:motorcycle:type=electric
     motorcycle:type=sportbike: Tag:motorcycle:type=sportbike
     motorcycle=no: Tag:motorcycle=no
@@ -9698,8 +10674,10 @@ en:
     motorroad=no: Tag:motorroad=no
     mountain_pass=yes: Tag:mountain pass=yes
     museum=aerospace: Tag:museum=aerospace
+    museum=agriculture: Tag:museum=agriculture
     museum=archaeological: Tag:museum=archaeological
     museum=art: Tag:museum=art
+    museum=aviation: Tag:museum=aviation
     museum=children: Tag:museum=children
     museum=history: Tag:museum=history
     museum=living_history: Tag:museum=living history
@@ -9720,11 +10698,13 @@ en:
     name=Costco: Tag:name=Costco
     name=Dollarama: Tag:name=Dollarama
     name=Domino's_Pizza: Tag:name=Domino's Pizza
+    name=Fossil: Tag:name=Fossil
     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=Starbucks: Tag:name=Starbucks
     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
@@ -9759,6 +10739,7 @@ en:
     natural=esker: Tag:natural=esker
     natural=fell: Tag:natural=fell
     natural=fjord: Tag:natural=fjord
+    natural=fumarole: Tag:natural=fumarole
     natural=geothermal: Tag:natural=geothermal
     natural=geothermal_area: Tag:natural=geothermal area
     natural=geothermal_field: Tag:natural=geothermal field
@@ -9829,6 +10810,11 @@ en:
     network=BR:PB: Tag:network=BR:PB
     network=Barrie_Transit: Tag:network=Barrie Transit
     network=CA:ON:York: Tag:network=CA:ON:York
+    network=CA:ON:primary: Tag:network=CA:ON:primary
+    network=CA:ON:secondary: Tag:network=CA:ON:secondary
+    network=CA:ON:tertiary: Tag:network=CA:ON:tertiary
+    network=CA:transcanada: Tag:network=CA:transcanada
+    network=CA:transcanada:namedRoute: Tag:network=CA:transcanada:namedRoute
     network=CN:AH: Tag:network=CN:AH
     network=CN:JS: Tag:network=CN:JS
     network=CN:expressway: Tag:network=CN:expressway
@@ -9837,12 +10823,35 @@ en:
     network=Flinkster: Tag:network=Flinkster
     network=JP:national: Tag:network=JP:national
     network=JP:prefectural:nagano: Tag:network=JP:prefectural:nagano
+    network=NL:A: Tag:network=NL:A
+    network=NL:N: Tag:network=NL:N
+    network=NL:R:IJmuiden: Tag:network=NL:R:IJmuiden
+    network=NL:R:Ommen: Tag:network=NL:R:Ommen
+    network=NL:R:Schouwen: Tag:network=NL:R:Schouwen
+    network=NL:R:Sluis: Tag:network=NL:R:Sluis
+    network=NL:R:Spaarnwoude: Tag:network=NL:R:Spaarnwoude
+    network=NL:R:Voorthuizen: Tag:network=NL:R:Voorthuizen
+    network=NL:S:Amsterdam: Tag:network=NL:S:Amsterdam
+    network=NL:S:Den_Haag: Tag:network=NL:S:Den Haag
+    network=NL:S:Heerlen: Tag:network=NL:S:Heerlen
+    network=NL:S:Nijmegen: Tag:network=NL:S:Nijmegen
+    network=NL:S:Parkstad: Tag:network=NL:S:Parkstad
+    network=NL:S:Rotterdam: Tag:network=NL:S:Rotterdam
+    network=NL:S:Zaanstad: Tag:network=NL:S:Zaanstad
+    network=NL:binnenstedelijke_ring: Tag:network=NL:binnenstedelijke ring
+    network=NL:ring: Tag:network=NL:ring
+    network=SE:LS: Tag:network=SE:LS
+    network=SE:LV: Tag:network=SE:LV
+    network=SE:RV: Tag:network=SE:RV
     network=US:ADHS: Tag:network=US:ADHS
     network=US:AK: Tag:network=US:AK
     network=US:AL: Tag:network=US:AL
     network=US:AR: Tag:network=US:AR
+    network=US:AS: Tag:network=US:AS
     network=US:AZ: Tag:network=US:AZ
+    network=US:BIA: Tag:network=US:BIA
     network=US:CA: Tag:network=US:CA
+    network=US:CA:CR: Tag:network=US:CA:CR
     network=US:CO: Tag:network=US:CO
     network=US:CT: Tag:network=US:CT
     network=US:DC: Tag:network=US:DC
@@ -9850,14 +10859,20 @@ en:
     network=US:FL: Tag:network=US:FL
     network=US:FL:Toll: Tag:network=US:FL:Toll
     network=US:GA: Tag:network=US:GA
+    network=US:GU: Tag:network=US:GU
     network=US:HI: Tag:network=US:HI
     network=US:I: Tag:network=US:I
+    network=US:I:Alternate: Tag:network=US:I:Alternate
+    network=US:I:Business:Loop: Tag:network=US:I:Business:Loop
+    network=US:I:Business:Spur: Tag:network=US:I:Business:Spur
+    network=US:I:Future: Tag:network=US:I:Future
     network=US:IA: Tag:network=US:IA
     network=US:ID: Tag:network=US:ID
     network=US:IL: Tag:network=US:IL
     network=US:IN: Tag:network=US:IN
     network=US:KS: Tag:network=US:KS
     network=US:KY: Tag:network=US:KY
+    network=US:KY:Parkway: Tag:network=US:KY:Parkway
     network=US:LA: Tag:network=US:LA
     network=US:MA: Tag:network=US:MA
     network=US:MD: Tag:network=US:MD
@@ -9866,6 +10881,7 @@ en:
     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:MP: Tag:network=US:MP
     network=US:MS: Tag:network=US:MS
     network=US:MT: Tag:network=US:MT
     network=US:MT:secondary: Tag:network=US:MT:secondary
@@ -9948,6 +10964,7 @@ en:
     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:LAK: Tag:network=US:OH:LAK
     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
@@ -9994,6 +11011,8 @@ en:
     network=US:SC: Tag:network=US:SC
     network=US:SD: Tag:network=US:SD
     network=US:TN: Tag:network=US:TN
+    network=US:TN:primary: Tag:network=US:TN:primary
+    network=US:TN:secondary: Tag:network=US:TN:secondary
     network=US:TX: Tag:network=US:TX
     network=US:TX:Beltway: Tag:network=US:TX:Beltway
     network=US:TX:FM: Tag:network=US:TX:FM
@@ -10007,17 +11026,26 @@ en:
     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:US:Alternate: Tag:network=US:US:Alternate
+    network=US:US:Business: Tag:network=US:US:Business
+    network=US:US:Bypass: Tag:network=US:US:Bypass
+    network=US:US:Historic: Tag:network=US:US:Historic
+    network=US:US:Spur: Tag:network=US:US:Spur
+    network=US:US:Truck: Tag:network=US:US:Truck
     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:VI: Tag:network=US:VI
     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:County: Tag:network=US:WV:County
     network=US:WV:Gilmer: Tag:network=US:WV:Gilmer
     network=US:WV:HARP: Tag:network=US:WV:HARP
+    network=US:WV:Mason: Tag:network=US:WV:Mason
     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
@@ -10030,6 +11058,7 @@ en:
     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-road: Tag:network=e-road
     network=e-waterway: Tag:network=e-waterway
     network=icn: Tag:network=icn
     network=iwn: Tag:network=iwn
@@ -10048,6 +11077,7 @@ en:
     network=rmn: Tag:network=rmn
     network=rpn: Tag:network=rpn
     network=rwn: Tag:network=rwn
+    network=sk:national: Tag:network=sk:national
     nhd:fcode=46003: Tag:nhd:fcode=46003
     nhd:ftype=StreamRiver: Tag:nhd:ftype=StreamRiver
     noexit=no: Tag:noexit=no
@@ -10066,6 +11096,7 @@ en:
     office=archive: Tag:office=archive
     office=association: Tag:office=association
     office=bail_bond_agent: Tag:office=bail bond agent
+    office=chamber: Tag:office=chamber
     office=charity: Tag:office=charity
     office=company: Tag:office=company
     office=consulting: Tag:office=consulting
@@ -10100,7 +11131,9 @@ en:
     office=notary: Tag:office=notary
     office=occupational_safety: Tag:office=occupational safety
     office=parish: Tag:office=parish
+    office=physician: Tag:office=physician
     office=political_party: Tag:office=political party
+    office=politician: Tag:office=politician
     office=private_investigator: Tag:office=private investigator
     office=property_management: Tag:office=property management
     office=publisher: Tag:office=publisher
@@ -10124,6 +11157,7 @@ en:
     office=university: Tag:office=university
     office=visa: Tag:office=visa
     office=water_utility: Tag:office=water utility
+    office=wedding_planner: Tag:office=wedding planner
     office=yes: Tag:office=yes
     on_demand=yes: Tag:on demand=yes
     oneway:bicycle=yes: Tag:oneway:bicycle=yes
@@ -10143,7 +11177,9 @@ en:
     operator=Enedis: Tag:operator=Enedis
     operator=Flinkster: Tag:operator=Flinkster
     operator=GRDF: Tag:operator=GRDF
+    operator=GRTgaz: Tag:operator=GRTgaz
     operator=Orange: Tag:operator=Orange
+    operator=ProRail: Tag:operator=ProRail
     operator=RTE: Tag:operator=RTE
     operator=Stadtmobil: Tag:operator=Stadtmobil
     operator=book-n-drive: Tag:operator=book-n-drive
@@ -10152,6 +11188,13 @@ en:
     operator=stadtmobil: Tag:operator=stadtmobil
     operator=teilAuto: Tag:operator=teilAuto
     orchard=meadow_orchard: Tag:orchard=meadow orchard
+    outdoor_seating=terrace: Tag:outdoor seating=terrace
+    outlet=bell_mouth: Tag:outlet=bell mouth
+    outlet=direct: Tag:outlet=direct
+    outlet=noise_barrier: Tag:outlet=noise barrier
+    outlet=screen: Tag:outlet=screen
+    outlet=sock: Tag:outlet=sock
+    outlet=valve: Tag:outlet=valve
     ownership=private: Tag:ownership=private
     parking:lane:hgv=on_street: Tag:parking:lane:hgv=on street
     parking:orientation=perpendicular: Tag:parking:orientation=perpendicular
@@ -10171,6 +11214,7 @@ en:
     passenger=yes: Tag:passenger=yes
     path=crossing: Tag:path=crossing
     path=desire: Tag:path=desire
+    path=sidewalk: Tag:path=sidewalk
     physically_present=no: Tag:physically present=no
     pilotage=boarding_point: Tag:pilotage=boarding point
     pilotage=office: Tag:pilotage=office
@@ -10180,6 +11224,7 @@ en:
     pipeline=valve: Tag:pipeline=valve
     piste:type=connection: Tag:piste:type=connection
     piste:type=downhill: Tag:piste:type=downhill
+    piste:type=hike: Tag:piste:type=hike
     piste:type=nordic: Tag:piste:type=nordic
     piste:type=ski_jump: Tag:piste:type=ski jump
     piste:type=ski_jump_landing: Tag:piste:type=ski jump landing
@@ -10209,6 +11254,7 @@ en:
     place=shieling: Tag:place=shieling
     place=square: Tag:place=square
     place=state: Tag:place=state
+    place=subcounty: Tag:place=subcounty
     place=suburb: Tag:place=suburb
     place=town: Tag:place=town
     place=village: Tag:place=village
@@ -10239,9 +11285,22 @@ en:
     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=balancebeam: Tag:playground=balancebeam
+    playground=bridge: Tag:playground=bridge
+    playground=climbingframe: Tag:playground=climbingframe
+    playground=climbingwall: Tag:playground=climbingwall
+    playground=funnel_ball: Tag:playground=funnel ball
+    playground=hopscotch: Tag:playground=hopscotch
+    playground=horizontal_bar: Tag:playground=horizontal bar
     playground=map: Tag:playground=map
+    playground=playhouse: Tag:playground=playhouse
+    playground=sandpit: Tag:playground=sandpit
+    playground=sledding: Tag:playground=sledding
     playground=slide: Tag:playground=slide
     playground=structure: Tag:playground=structure
+    playground=teenshelter: Tag:playground=teenshelter
+    playground=tetherball: Tag:playground=tetherball
+    playground=youth_bench: Tag:playground=youth bench
     pole=transition: Tag:pole=transition
     police=academy: Tag:police=academy
     police=barracks: Tag:police=barracks
@@ -10255,7 +11314,15 @@ en:
     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
+    political_division=NL:kamerkieskring: Tag:political division=NL:kamerkieskring
+    political_division=NL:statenkieskring: Tag:political division=NL:statenkieskring
+    political_division=congressional_district: Tag:political division=congressional
+      district
+    political_division=euro_const: Tag:political division=euro const
+    political_division=linguistic_community: Tag:political division=linguistic community
+    port=cargo: Tag:port=cargo
+    port=fishing: Tag:port=fishing
+    port=roro: Tag:port=roro
     power=antenna_line: Tag:power=antenna line
     power=busbar: Tag:power=busbar
     power=cable: Tag:power=cable
@@ -10304,6 +11371,7 @@ en:
     product=steel: Tag:product=steel
     product=sugar: Tag:product=sugar
     protect_class=11: Tag:protect class=11
+    protect_class=13: Tag:protect class=13
     protect_class=19: Tag:protect class=19
     protect_class=1a: Tag:protect class=1a
     protect_class=1b: Tag:protect class=1b
@@ -10314,6 +11382,7 @@ en:
     protect_class=5: Tag:protect class=5
     protect_class=6: Tag:protect class=6
     protected_area=nature_reserve: Tag:protected area=nature reserve
+    protected_area=recreation: Tag:protected area=recreation
     pseudo=yes: Tag:pseudo=yes
     psv=designated: Tag:psv=designated
     psv=no: Tag:psv=no
@@ -10363,8 +11432,10 @@ en:
     railway=PRT: Tag:railway=PRT
     railway=Subway: Tag:railway=Subway
     railway=abandoned: Tag:railway=abandoned
+    railway=border: Tag:railway=border
     railway=buffer_stop: Tag:railway=buffer stop
     railway=crossing: Tag:railway=crossing
+    railway=crossing_box: Tag:railway=crossing box
     railway=crossing_controller: Tag:railway=crossing controller
     railway=derail: Tag:railway=derail
     railway=diamond: Tag:railway=diamond
@@ -10378,6 +11449,7 @@ en:
     railway=miniature: Tag:railway=miniature
     railway=monorail: Tag:railway=monorail
     railway=narrow_gauge: Tag:railway=narrow gauge
+    railway=owner_change: Tag:railway=owner change
     railway=platform: Tag:railway=platform
     railway=platform_edge: Tag:railway=platform edge
     railway=preserved: Tag:railway=preserved
@@ -10385,6 +11457,7 @@ en:
     railway=rail_brake: Tag:railway=rail brake
     railway=railway_crossing: Tag:railway=railway crossing
     railway=roundhouse: Tag:railway=roundhouse
+    railway=service_station: Tag:railway=service station
     railway=signal: Tag:railway=signal
     railway=signal_box: Tag:railway=signal box
     railway=spur_junction: Tag:railway=spur junction
@@ -10409,6 +11482,7 @@ en:
     recreation_ground=showground: Tag:recreation ground=showground
     recycling_type=centre: Tag:recycling type=centre
     refitted=yes: Tag:refitted=yes
+    refrigerated=yes: Tag:refrigerated=yes
     refugee=yes: Tag:refugee=yes
     religion=buddhist: Tag:religion=buddhist
     religion=christian: Tag:religion=christian
@@ -10417,6 +11491,7 @@ en:
     religion=jewish: Tag:religion=jewish
     religion=multifaith: Tag:religion=multifaith
     religion=muslim: Tag:religion=muslim
+    religion=none: Tag:religion=none
     religion=pagan: Tag:religion=pagan
     religion=self-realization_fellowship: Tag:religion=self-realization fellowship
     religion=shinto: Tag:religion=shinto
@@ -10424,6 +11499,7 @@ en:
     religion=taoist: Tag:religion=taoist
     religion=zoroastrian: Tag:religion=zoroastrian
     rental=appliance: Tag:rental=appliance
+    rental=event: Tag:rental=event
     rental=quadracycle: Tag:rental=quadracycle
     rental=ski: Tag:rental=ski
     rental=strandkorb: Tag:rental=strandkorb
@@ -10432,6 +11508,7 @@ en:
     request_stop=yes: Tag:request stop=yes
     research=aerospace: Tag:research=aerospace
     residential=apartments: Tag:residential=apartments
+    residential=condominium: Tag:residential=condominium
     residential=halting_site: Tag:residential=halting site
     residential=rural: Tag:residential=rural
     residential=trailer_park: Tag:residential=trailer park
@@ -10440,9 +11517,20 @@ en:
     resource=aggregate: Tag:resource=aggregate
     resource=gravel: Tag:resource=gravel
     resource=sand: Tag:resource=sand
+    restriction=no_right_turn_on_red: Tag:restriction=no right turn on red
+    retaining_wall=flood_wall: Tag:retaining wall=flood wall
     road_marking=solid_stop_line: Tag:road marking=solid stop line
     roller_coaster=track: Tag:roller coaster=track
+    roof:shape=flat: Tag:roof:shape=flat
+    roof:shape=gabled: Tag:roof:shape=gabled
+    roof:shape=half-hipped: Tag:roof:shape=half-hipped
+    roof:shape=half_hipped: Tag:roof:shape=half hipped
+    roof:shape=hipped: Tag:roof:shape=hipped
+    roof:shape=many: Tag:roof:shape=many
+    roof:shape=pyramidal: Tag:roof:shape=pyramidal
+    roof:shape=skillion: Tag:roof:shape=skillion
     route=aqueduct: Tag:route=aqueduct
+    route=atv: Tag:route=atv
     route=bicycle: Tag:route=bicycle
     route=boat: Tag:route=boat
     route=bus: Tag:route=bus
@@ -10455,7 +11543,9 @@ en:
     route=ferry: Tag:route=ferry
     route=fitness_trail: Tag:route=fitness trail
     route=foot: Tag:route=foot
+    route=funicular: Tag:route=funicular
     route=hiking: Tag:route=hiking
+    route=historic: Tag:route=historic
     route=horse: Tag:route=horse
     route=inline_skates: Tag:route=inline skates
     route=light_rail: Tag:route=light rail
@@ -10485,14 +11575,44 @@ en:
     school:gender=female: Tag:school:gender=female
     school:gender=male: Tag:school:gender=male
     school:gender=mixed: Tag:school:gender=mixed
+    school=entrance: Tag:school=entrance
     seamark:beacon_cardinal:colour_pattern=horizontal: Tag:seamark:beacon cardinal:colour
       pattern=horizontal
-    seamark:beacon_cardinal:shape=tower: Tag:seamark:beacon cardinal:shape=tower
     seamark:beacon_isolated_danger:colour=black;red;black: Tag:seamark:beacon isolated
       danger:colour=black;red;black
     seamark:beacon_isolated_danger:colour_pattern=horizontal: Tag:seamark:beacon isolated
       danger:colour pattern=horizontal
     seamark:beacon_isolated_danger:shape=tower: Tag:seamark:beacon isolated danger:shape=tower
+    seamark:beacon_lateral:category=channel_left: Tag:seamark:beacon lateral:category=channel
+      left
+    seamark:beacon_lateral:category=channel_left_bank: Tag:seamark:beacon lateral:category=channel
+      left bank
+    seamark:beacon_lateral:category=channel_right: Tag:seamark:beacon lateral:category=channel
+      right
+    seamark:beacon_lateral:category=channel_right_bank: Tag:seamark:beacon lateral:category=channel
+      right bank
+    seamark:beacon_lateral:category=crossover_left: Tag:seamark:beacon lateral:category=crossover
+      left
+    seamark:beacon_lateral:category=crossover_right: Tag:seamark:beacon lateral:category=crossover
+      right
+    seamark:beacon_lateral:category=danger_left: Tag:seamark:beacon lateral:category=danger
+      left
+    seamark:beacon_lateral:category=danger_right: Tag:seamark:beacon lateral:category=danger
+      right
+    seamark:beacon_lateral:category=harbour_left: Tag:seamark:beacon lateral:category=harbour
+      left
+    seamark:beacon_lateral:category=harbour_right: Tag:seamark:beacon lateral:category=harbour
+      right
+    seamark:beacon_lateral:category=port: Tag:seamark:beacon lateral:category=port
+    seamark:beacon_lateral:category=preferred_channel_port: Tag:seamark:beacon lateral:category=preferred
+      channel port
+    seamark:beacon_lateral:category=preferred_channel_starboard: Tag:seamark:beacon
+      lateral:category=preferred channel starboard
+    seamark:beacon_lateral:category=starboard: Tag:seamark:beacon lateral:category=starboard
+    seamark:beacon_lateral:category=waterway_left: Tag:seamark:beacon lateral:category=waterway
+      left
+    seamark:beacon_lateral:category=waterway_right: Tag:seamark:beacon lateral:category=waterway
+      right
     seamark:beacon_lateral:colour=green: Tag:seamark:beacon lateral:colour=green
     seamark:beacon_lateral:colour=green;red;green: Tag:seamark:beacon lateral:colour=green;red;green
     seamark:beacon_lateral:colour=green;white;green;white: Tag:seamark:beacon lateral:colour=green;white;green;white
@@ -10507,10 +11627,9 @@ en:
     seamark:beacon_lateral:shape=tower: Tag:seamark:beacon lateral:shape=tower
     seamark:beacon_lateral:shape=withy: Tag:seamark:beacon lateral:shape=withy
     seamark:beacon_safe_water:colour=red;white: Tag:seamark:beacon safe water:colour=red;white
-    seamark:beacon_safe_water:colour_pattern=vertical: Tag:seamark:beacon safe water:colour
-      pattern=vertical
     seamark:beacon_safe_water:shape=tower: Tag:seamark:beacon safe water:shape=tower
     seamark:beacon_special_purpose:category=cable: Tag:seamark:beacon special purpose:category=cable
+    seamark:beacon_special_purpose:category=leading: Tag:seamark:beacon special purpose:category=leading
     seamark:beacon_special_purpose:category=notice: Tag:seamark:beacon special purpose:category=notice
     seamark:beacon_special_purpose:category=racing: Tag:seamark:beacon special purpose:category=racing
     seamark:beacon_special_purpose:category=warning: Tag:seamark:beacon special purpose:category=warning
@@ -10523,24 +11642,52 @@ en:
     seamark:beacon_special_purpose:colour=white: Tag:seamark:beacon special purpose:colour=white
     seamark:beacon_special_purpose:colour=yellow: Tag:seamark:beacon special purpose:colour=yellow
     seamark:beacon_special_purpose:shape=cairn: Tag:seamark:beacon special purpose:shape=cairn
+    seamark:beacon_special_purpose:shape=lattice: Tag:seamark:beacon special purpose:shape=lattice
+    seamark:beacon_special_purpose:shape=pile: Tag:seamark:beacon special purpose:shape=pile
     seamark:beacon_special_purpose:shape=pole: Tag:seamark:beacon special purpose:shape=pole
     seamark:beacon_special_purpose:shape=tower: Tag:seamark:beacon special purpose:shape=tower
-    seamark:buoy_cardinal:colour_pattern=horizontal: Tag:seamark:buoy cardinal:colour
-      pattern=horizontal
+    seamark:buoy_cardinal:category=east: Tag:seamark:buoy cardinal:category=east
+    seamark:buoy_cardinal:category=north: Tag:seamark:buoy cardinal:category=north
+    seamark:buoy_cardinal:category=south: Tag:seamark:buoy cardinal:category=south
+    seamark:buoy_cardinal:category=west: Tag:seamark:buoy cardinal:category=west
     seamark:buoy_cardinal:shape=can: Tag:seamark:buoy cardinal:shape=can
     seamark:buoy_cardinal:shape=conical: Tag:seamark:buoy cardinal:shape=conical
     seamark:buoy_cardinal:shape=pillar: Tag:seamark:buoy cardinal:shape=pillar
     seamark:buoy_cardinal:shape=spar: Tag:seamark:buoy cardinal:shape=spar
     seamark:buoy_cardinal:shape=spherical: Tag:seamark:buoy cardinal:shape=spherical
-    seamark:buoy_isolated_danger:colour=black;red;black: Tag:seamark:buoy isolated
-      danger:colour=black;red;black
-    seamark:buoy_isolated_danger:colour_pattern=horizontal: Tag:seamark:buoy isolated
-      danger:colour pattern=horizontal
     seamark:buoy_isolated_danger:shape=can: Tag:seamark:buoy isolated danger:shape=can
     seamark:buoy_isolated_danger:shape=conical: Tag:seamark:buoy isolated danger:shape=conical
     seamark:buoy_isolated_danger:shape=pillar: Tag:seamark:buoy isolated danger:shape=pillar
     seamark:buoy_isolated_danger:shape=spar: Tag:seamark:buoy isolated danger:shape=spar
     seamark:buoy_isolated_danger:shape=spherical: Tag:seamark:buoy isolated danger:shape=spherical
+    seamark:buoy_lateral:category=bridge_pier: Tag:seamark:buoy lateral:category=bridge
+      pier
+    seamark:buoy_lateral:category=channel_left: Tag:seamark:buoy lateral:category=channel
+      left
+    seamark:buoy_lateral:category=channel_right: Tag:seamark:buoy lateral:category=channel
+      right
+    seamark:buoy_lateral:category=channel_separation: Tag:seamark:buoy lateral:category=channel
+      separation
+    seamark:buoy_lateral:category=danger_left: Tag:seamark:buoy lateral:category=danger
+      left
+    seamark:buoy_lateral:category=danger_right: Tag:seamark:buoy lateral:category=danger
+      right
+    seamark:buoy_lateral:category=port: Tag:seamark:buoy lateral:category=port
+    seamark:buoy_lateral:category=preferred_channel_port: Tag:seamark:buoy lateral:category=preferred
+      channel port
+    seamark:buoy_lateral:category=preferred_channel_starboard: Tag:seamark:buoy lateral:category=preferred
+      channel starboard
+    seamark:buoy_lateral:category=starboard: Tag:seamark:buoy lateral:category=starboard
+    seamark:buoy_lateral:category=turnoff_left: Tag:seamark:buoy lateral:category=turnoff
+      left
+    seamark:buoy_lateral:category=turnoff_right: Tag:seamark:buoy lateral:category=turnoff
+      right
+    seamark:buoy_lateral:category=waterway_left: Tag:seamark:buoy lateral:category=waterway
+      left
+    seamark:buoy_lateral:category=waterway_right: Tag:seamark:buoy lateral:category=waterway
+      right
+    seamark:buoy_lateral:category=waterway_separation: Tag:seamark:buoy lateral:category=waterway
+      separation
     seamark:buoy_lateral:colour=green: Tag:seamark:buoy lateral:colour=green
     seamark:buoy_lateral:colour=green;red;green: Tag:seamark:buoy lateral:colour=green;red;green
     seamark:buoy_lateral:colour=green;white;green;white: Tag:seamark:buoy lateral:colour=green;white;green;white
@@ -10553,8 +11700,6 @@ en:
     seamark:buoy_lateral:shape=can: Tag:seamark:buoy lateral:shape=can
     seamark:buoy_lateral:shape=conical: Tag:seamark:buoy lateral:shape=conical
     seamark:buoy_lateral:shape=pillar: Tag:seamark:buoy lateral:shape=pillar
-    seamark:buoy_lateral:shape=spar: Tag:seamark:buoy lateral:shape=spar
-    seamark:buoy_lateral:shape=spherical: Tag:seamark:buoy lateral:shape=spherical
     seamark:buoy_safe_water:colour=red;white: Tag:seamark:buoy safe water:colour=red;white
     seamark:buoy_safe_water:colour_pattern=vertical: Tag:seamark:buoy safe water:colour
       pattern=vertical
@@ -10563,8 +11708,14 @@ en:
     seamark:buoy_safe_water:shape=pillar: Tag:seamark:buoy safe water:shape=pillar
     seamark:buoy_safe_water:shape=spar: Tag:seamark:buoy safe water:shape=spar
     seamark:buoy_safe_water:shape=spherical: Tag:seamark:buoy safe water:shape=spherical
+    seamark:buoy_special_purpose:category=mooring: Tag:seamark:buoy special purpose:category=mooring
+    seamark:buoy_special_purpose:category=no_entry: Tag:seamark:buoy special purpose:category=no
+      entry
     seamark:buoy_special_purpose:category=odas: Tag:seamark:buoy special purpose:category=odas
     seamark:buoy_special_purpose:category=racing: Tag:seamark:buoy special purpose:category=racing
+    seamark:buoy_special_purpose:category=recreation_zone: Tag:seamark:buoy special
+      purpose:category=recreation zone
+    seamark:buoy_special_purpose:category=warning: Tag:seamark:buoy special purpose:category=warning
     seamark:buoy_special_purpose:colour=black: Tag:seamark:buoy special purpose:colour=black
     seamark:buoy_special_purpose:colour=blue: Tag:seamark:buoy special purpose:colour=blue
     seamark:buoy_special_purpose:colour=green: Tag:seamark:buoy special purpose:colour=green
@@ -10587,6 +11738,8 @@ en:
     seamark:buoy_special_purpose:shape=super-buoy: Tag:seamark:buoy special purpose:shape=super-buoy
     seamark:cable_overhead:category=power: Tag:seamark:cable overhead:category=power
     seamark:cable_overhead:category=telephone: Tag:seamark:cable overhead:category=telephone
+    seamark:cable_overhead:category=transmission: Tag:seamark:cable overhead:category=transmission
+    seamark:cable_submarine:category=power: Tag:seamark:cable submarine:category=power
     seamark:conspicuity=conspicious: Tag:seamark:conspicuity=conspicious
     seamark:conspicuity=conspicuous: Tag:seamark:conspicuity=conspicuous
     seamark:distance_mark:category=board: Tag:seamark:distance mark:category=board
@@ -10603,6 +11756,7 @@ en:
     seamark:fog_signal:category=siren: Tag:seamark:fog signal:category=siren
     seamark:fog_signal:category=whistle: Tag:seamark:fog signal:category=whistle
     seamark:fog_signal=yes: Tag:seamark:fog signal=yes
+    seamark:harbour:category=fishing: Tag:seamark:harbour:category=fishing
     seamark:harbour:category=marina: Tag:seamark:harbour:category=marina
     seamark:landmark:category=cairn: Tag:seamark:landmark:category=cairn
     seamark:landmark:category=cemetery: Tag:seamark:landmark:category=cemetery
@@ -10637,6 +11791,9 @@ en:
       shrine
     seamark:landmark:function=tempel: Tag:seamark:landmark:function=tempel
     seamark:landmark:function=temple: Tag:seamark:landmark:function=temple
+    seamark:light:1:category=directional: Tag:seamark:light:1:category=directional
+    seamark:light:1:category=lower: Tag:seamark:light:1:category=lower
+    seamark:light:1:category=upper: Tag:seamark:light:1:category=upper
     seamark:light:category=aero: Tag:seamark:light:category=aero
     seamark:light:category=air_obstruction: Tag:seamark:light:category=air obstruction
     seamark:light:category=directional: Tag:seamark:light:category=directional
@@ -10660,10 +11817,27 @@ en:
     seamark:light:visibility=intensified: Tag:seamark:light:visibility=intensified
     seamark:light:visibility=part_obscured: Tag:seamark:light:visibility=part obscured
     seamark:light:visibility=unintensified: Tag:seamark:light:visibility=unintensified
+    seamark:mooring:category=dolphin: Tag:seamark:mooring:category=dolphin
+    seamark:mooring:category=pile: Tag:seamark:mooring:category=pile
     seamark:mooring:category=wall: Tag:seamark:mooring:category=wall
+    seamark:notice:category=ferry_independent: Tag:seamark:notice:category=ferry independent
+    seamark:notice:category=ferry_non_independent: Tag:seamark:notice:category=ferry
+      non independent
+    seamark:notice:category=limited_headroom: Tag:seamark:notice:category=limited
+      headroom
+    seamark:notice:category=no_anchoring: Tag:seamark:notice:category=no anchoring
+    seamark:notice:category=no_berthing: Tag:seamark:notice:category=no berthing
+    seamark:notice:category=no_entry: Tag:seamark:notice:category=no entry
+    seamark:notice:category=speed_limit: Tag:seamark:notice:category=speed limit
+    seamark:notice:function=information: Tag:seamark:notice:function=information
+    seamark:notice:function=prohibition: Tag:seamark:notice:function=prohibition
+    seamark:notice:function=recommendation: Tag:seamark:notice:function=recommendation
+    seamark:notice:function=regulation: Tag:seamark:notice:function=regulation
+    seamark:notice:function=restriction: Tag:seamark:notice:function=restriction
     seamark:obstruction:category=boom: Tag:seamark:obstruction:category=boom
     seamark:radar_transponder:category=racon: Tag:seamark:radar transponder:category=racon
     seamark:radar_transponder:category=ramark: Tag:seamark:radar transponder:category=ramark
+    seamark:radio_station:category=ais: Tag:seamark:radio station:category=ais
     seamark:radio_station:category=chiaka: Tag:seamark:radio station:category=chiaka
     seamark:radio_station:category=commercial_broadcast: Tag:seamark:radio station:category=commercial
       broadcast
@@ -10671,6 +11845,9 @@ en:
       communication
     seamark:radio_station:category=time_signal: Tag:seamark:radio station:category=time
       signal
+    seamark:rescue_station:category=lifeboat: Tag:seamark:rescue station:category=lifeboat
+    seamark:rescue_station:category=lifeboat_on_mooring: Tag:seamark:rescue station:category=lifeboat
+      on mooring
     seamark:restricted_area:category=ecological_reserve: Tag:seamark:restricted area:category=ecological
       reserve
     seamark:restricted_area:category=foul_ground: Tag:seamark:restricted area:category=foul
@@ -10712,6 +11889,14 @@ en:
       speed
     seamark:restricted_area:restriction=turning_prohibited: Tag:seamark:restricted
       area:restriction=turning prohibited
+    seamark:sea_area:category=narrows: Tag:seamark:sea area:category=narrows
+    seamark:sea_area:category=shoal: Tag:seamark:sea area:category=shoal
+    seamark:shoreline_construction:category=breakwater: Tag:seamark:shoreline construction:category=breakwater
+    seamark:shoreline_construction:category=fender: Tag:seamark:shoreline construction:category=fender
+    seamark:shoreline_construction:category=groyne: Tag:seamark:shoreline construction:category=groyne
+    seamark:shoreline_construction:category=training_wall: Tag:seamark:shoreline construction:category=training
+      wall
+    seamark:signal_station_traffic:category=lock: Tag:seamark:signal station traffic:category=lock
     seamark:small_craft_facility:category=boat_hoist: Tag:seamark:small craft facility:category=boat
       hoist
     seamark:small_craft_facility:category=boatyard: Tag:seamark:small craft facility:category=boatyard
@@ -10719,7 +11904,10 @@ en:
     seamark:small_craft_facility:category=electricity: Tag:seamark:small craft facility:category=electricity
     seamark:small_craft_facility:category=fuel_station: Tag:seamark:small craft facility:category=fuel
       station
+    seamark:small_craft_facility:category=launderette: Tag:seamark:small craft facility:category=launderette
     seamark:small_craft_facility:category=laundrette: Tag:seamark:small craft facility:category=laundrette
+    seamark:small_craft_facility:category=nautical_club: Tag:seamark:small craft facility:category=nautical
+      club
     seamark:small_craft_facility:category=pump-out: Tag:seamark:small craft facility:category=pump-out
     seamark:small_craft_facility:category=showers: Tag:seamark:small craft facility:category=showers
     seamark:small_craft_facility:category=slipway: Tag:seamark:small craft facility:category=slipway
@@ -10730,17 +11918,12 @@ en:
     seamark:small_craft_facility:category=water_tap: Tag:seamark:small craft facility:category=water
       tap
     seamark:topmark:colour=black: Tag:seamark:topmark:colour=black
-    seamark:topmark:colour=green: Tag:seamark:topmark:colour=green
     seamark:topmark:colour=grey: Tag:seamark:topmark:colour=grey
     seamark:topmark:colour=orange: Tag:seamark:topmark:colour=orange
-    seamark:topmark:colour=red: Tag:seamark:topmark:colour=red
     seamark:topmark:colour=white: Tag:seamark:topmark:colour=white
-    seamark:topmark:colour=yellow: Tag:seamark:topmark:colour=yellow
     seamark:topmark:shape=2_cones_base_together: Tag:seamark:topmark:shape=2 cones
       base together
     seamark:topmark:shape=2_cones_down: Tag:seamark:topmark:shape=2 cones down
-    seamark:topmark:shape=2_cones_point_together: Tag:seamark:topmark:shape=2 cones
-      point together
     seamark:topmark:shape=2_cones_up: Tag:seamark:topmark:shape=2 cones up
     seamark:topmark:shape=2_spheres: Tag:seamark:topmark:shape=2 spheres
     seamark:topmark:shape=board: Tag:seamark:topmark:shape=board
@@ -10752,58 +11935,88 @@ en:
     seamark:topmark:shape=diamond: Tag:seamark:topmark:shape=diamond
     seamark:topmark:shape=flag: Tag:seamark:topmark:shape=flag
     seamark:topmark:shape=rectangle: Tag:seamark:topmark:shape=rectangle
-    seamark:topmark:shape=rhombus: Tag:seamark:topmark:shape=rhombus
     seamark:topmark:shape=sphere: Tag:seamark:topmark:shape=sphere
     seamark:topmark:shape=square: Tag:seamark:topmark:shape=square
     seamark:topmark:shape=upright-cross: Tag:seamark:topmark:shape=upright-cross
     seamark:topmark:shape=upright_cross: Tag:seamark:topmark:shape=upright cross
-    seamark:topmark:shape=x-shape: Tag:seamark:topmark:shape=x-shape
     seamark:type=anchorage: Tag:seamark:type=anchorage
     seamark:type=beacon_cardinal: Tag:seamark:type=beacon cardinal
     seamark:type=beacon_isolated_danger: Tag:seamark:type=beacon isolated danger
     seamark:type=beacon_lateral: Tag:seamark:type=beacon lateral
+    seamark:type=beacon_safe_water: Tag:seamark:type=beacon safe water
     seamark:type=beacon_special_purpose: Tag:seamark:type=beacon special purpose
     seamark:type=berth: Tag:seamark:type=berth
     seamark:type=bridge: Tag:seamark:type=bridge
+    seamark:type=bunker_station: Tag:seamark:type=bunker station
     seamark:type=buoy_cardinal: Tag:seamark:type=buoy cardinal
+    seamark:type=buoy_installation: Tag:seamark:type=buoy installation
+    seamark:type=buoy_isolated_danger: Tag:seamark:type=buoy isolated danger
     seamark:type=buoy_lateral: Tag:seamark:type=buoy lateral
     seamark:type=buoy_safe_water: Tag:seamark:type=buoy safe water
     seamark:type=buoy_special_purpose: Tag:seamark:type=buoy special purpose
+    seamark:type=cable_area: Tag:seamark:type=cable area
     seamark:type=cable_overhead: Tag:seamark:type=cable overhead
     seamark:type=cable_submarine: Tag:seamark:type=cable submarine
+    seamark:type=calling-in_point: Tag:seamark:type=calling-in point
     seamark:type=causeway: Tag:seamark:type=causeway
     seamark:type=checkpoint: Tag:seamark:type=checkpoint
+    seamark:type=coastguard_station: Tag:seamark:type=coastguard station
     seamark:type=communication_area: Tag:seamark:type=communication area
+    seamark:type=crane: Tag:seamark:type=crane
     seamark:type=distance_mark: Tag:seamark:type=distance mark
+    seamark:type=dredged_area: Tag:seamark:type=dredged area
     seamark:type=dry_dock: Tag:seamark:type=dry dock
+    seamark:type=dumping_ground: Tag:seamark:type=dumping ground
     seamark:type=exceptional_structure: Tag:seamark:type=exceptional structure
+    seamark:type=fairway: Tag:seamark:type=fairway
     seamark:type=gate: Tag:seamark:type=gate
     seamark:type=harbour: Tag:seamark:type=harbour
+    seamark:type=hulk: Tag:seamark:type=hulk
     seamark:type=landmark: Tag:seamark:type=landmark
     seamark:type=light: Tag:seamark:type=light
+    seamark:type=light_float: Tag:seamark:type=light float
     seamark:type=light_major: Tag:seamark:type=light major
     seamark:type=light_minor: Tag:seamark:type=light minor
+    seamark:type=light_vessel: Tag:seamark:type=light vessel
     seamark:type=lock_basin: Tag:seamark:type=lock basin
+    seamark:type=marine_farm: Tag:seamark:type=marine farm
     seamark:type=mooring: Tag:seamark:type=mooring
     seamark:type=navigation_line: Tag:seamark:type=navigation line
     seamark:type=notice: Tag:seamark:type=notice
+    seamark:type=obstruction: Tag:seamark:type=obstruction
     seamark:type=pile: Tag:seamark:type=pile
+    seamark:type=pilot_boarding: Tag:seamark:type=pilot boarding
     seamark:type=pipeline_submarine: Tag:seamark:type=pipeline submarine
     seamark:type=platform: Tag:seamark:type=platform
-    seamark:type=radar_transponder: Tag:seamark:type=radar transponder
+    seamark:type=production_area: Tag:seamark:type=production area
+    seamark:type=radar_station: Tag:seamark:type=radar station
+    seamark:type=radio_station: Tag:seamark:type=radio station
     seamark:type=recommended_track: Tag:seamark:type=recommended track
+    seamark:type=rescue_station: Tag:seamark:type=rescue station
     seamark:type=restricted_area: Tag:seamark:type=restricted area
     seamark:type=rock: Tag:seamark:type=rock
+    seamark:type=sea_area: Tag:seamark:type=sea area
+    seamark:type=seaplane_landing_area: Tag:seamark:type=seaplane landing area
+    seamark:type=separation_boundary: Tag:seamark:type=separation boundary
+    seamark:type=separation_lane: Tag:seamark:type=separation lane
+    seamark:type=separation_line: Tag:seamark:type=separation line
+    seamark:type=separation_zone: Tag:seamark:type=separation zone
+    seamark:type=shoreline_construction: Tag:seamark:type=shoreline construction
     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=waterway_gauge: Tag:seamark:type=waterway gauge
     seamark:type=wreck: Tag:seamark:type=wreck
+    seamark:wreck:category=dangerous: Tag:seamark:wreck:category=dangerous
+    seamark:wreck:category=hull_showing: Tag:seamark:wreck:category=hull showing
+    seamark:wreck:category=non-dangerous: Tag:seamark:wreck:category=non-dangerous
     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:vehicle:tyres=yes: Tag:service:vehicle:tyres=yes
     service=aircraft_control: Tag:service=aircraft control
     service=alley: Tag:service=alley
     service=bus: Tag:service=bus
@@ -10818,6 +12031,7 @@ en:
     service=irrigation: Tag:service=irrigation
     service=parking_aisle: Tag:service=parking aisle
     service=parts: Tag:service=parts
+    service=pipestem: Tag:service=pipestem
     service=repair: Tag:service=repair
     service=siding: Tag:service=siding
     service=slipway: Tag:service=slipway
@@ -10825,12 +12039,15 @@ en:
     service=tyres: Tag:service=tyres
     service=yard: Tag:service=yard
     sett:style=portuguese: Tag:sett:style=portuguese
+    seveso=seuil_bas: Tag:seveso=seuil bas
+    seveso=seuil_haut: Tag:seveso=seuil haut
     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=nuclear: Tag:shelter type=nuclear
     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
@@ -10919,11 +12136,13 @@ en:
     shop=energy: Tag:shop=energy
     shop=equestrian: Tag:shop=equestrian
     shop=erotic: Tag:shop=erotic
+    shop=esoteric: Tag:shop=esoteric
     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_accesories: Tag:shop=fashion accesories
     shop=fashion_accessories: Tag:shop=fashion accessories
     shop=fast_food: Tag:shop=fast food
     shop=firearms: Tag:shop=firearms
@@ -10990,6 +12209,7 @@ en:
     shop=junk_yard: Tag:shop=junk yard
     shop=kiosk: Tag:shop=kiosk
     shop=kitchen: Tag:shop=kitchen
+    shop=kitchenware: Tag:shop=kitchenware
     shop=lamps: Tag:shop=lamps
     shop=laundromat: Tag:shop=laundromat
     shop=laundry: Tag:shop=laundry
@@ -11019,6 +12239,7 @@ en:
     shop=music: Tag:shop=music
     shop=musical_instrument: Tag:shop=musical instrument
     shop=musical_instruments: Tag:shop=musical instruments
+    shop=new_age: Tag:shop=new age
     shop=newsagent: Tag:shop=newsagent
     shop=no: Tag:shop=no
     shop=nutrition_supplements: Tag:shop=nutrition supplements
@@ -11027,6 +12248,7 @@ en:
     shop=optician: Tag:shop=optician
     shop=organic: Tag:shop=organic
     shop=outdoor: Tag:shop=outdoor
+    shop=outdoor_power_equipment: Tag:shop=outdoor power equipment
     shop=outpost: Tag:shop=outpost
     shop=paint: Tag:shop=paint
     shop=party: Tag:shop=party
@@ -11042,6 +12264,7 @@ en:
     shop=photo: Tag:shop=photo
     shop=photo_studio: Tag:shop=photo studio
     shop=photography: Tag:shop=photography
+    shop=plant_hire: Tag:shop=plant hire
     shop=pottery: Tag:shop=pottery
     shop=printer_ink: Tag:shop=printer ink
     shop=printing: Tag:shop=printing
@@ -11074,6 +12297,7 @@ en:
     shop=spare_parts: Tag:shop=spare parts
     shop=spices: Tag:shop=spices
     shop=sports: Tag:shop=sports
+    shop=stairs: Tag:shop=stairs
     shop=stationery: Tag:shop=stationery
     shop=storage_rental: Tag:shop=storage rental
     shop=street_vendor: Tag:shop=street vendor
@@ -11084,6 +12308,7 @@ en:
     shop=tailor: Tag:shop=tailor
     shop=tattoo: Tag:shop=tattoo
     shop=tea: Tag:shop=tea
+    shop=telecommunication: Tag:shop=telecommunication
     shop=ticket: Tag:shop=ticket
     shop=tickets: Tag:shop=tickets
     shop=tiles: Tag:shop=tiles
@@ -11137,6 +12362,7 @@ en:
     sinkhole=ponor: Tag:sinkhole=ponor
     site=parking: Tag:site=parking
     site=piste: Tag:site=piste
+    site=venue: Tag:site=venue
     site_type=bigstone: Tag:site type=bigstone
     site_type=city: Tag:site type=city
     site_type=fortification: Tag:site type=fortification
@@ -11168,11 +12394,17 @@ en:
     source:geometry=ACTMapiRoads: Tag:source:geometry=ACTMapiRoads
     source:geometry=ACTMapiTP: Tag:source:geometry=ACTMapiTP
     source:geometry=Bing: Tag:source:geometry=Bing
+    source:geometry=GURS: Tag:source:geometry=GURS
     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=BE-BRU:urban: Tag:source:maxspeed=BE-BRU:urban
+    source:maxspeed=BE-VLG:rural: Tag:source:maxspeed=BE-VLG:rural
+    source:maxspeed=BE-VLG:urban: Tag:source:maxspeed=BE-VLG:urban
+    source:maxspeed=BE-WAL:rural: Tag:source:maxspeed=BE-WAL:rural
+    source:maxspeed=BE-WAL:urban: Tag:source:maxspeed=BE-WAL:urban
     source:maxspeed=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
@@ -11213,6 +12445,7 @@ en:
     source=VicMap_ParkRes: Tag:source=VicMap ParkRes
     source=YahooJapan/ALPSMAP: Tag:source=YahooJapan/ALPSMAP
     source=gurs: Tag:source=gurs
+    source=www.geoportal.gov.pl: Tag:source=www.geoportal.gov.pl
     sport=10pin: Tag:sport=10pin
     sport=8pin: Tag:sport=8pin
     sport=9pin: Tag:sport=9pin
@@ -11275,9 +12508,11 @@ en:
     sport=footballgolf: Tag:sport=footballgolf
     sport=four_square: Tag:sport=four square
     sport=free_flying: Tag:sport=free flying
+    sport=funnel_ball: Tag:sport=funnel ball
     sport=futsal: Tag:sport=futsal
     sport=gaelic_football: Tag:sport=gaelic football
     sport=gaelic_games: Tag:sport=gaelic games
+    sport=gaga: Tag:sport=gaga
     sport=golf: Tag:sport=golf
     sport=gymnastics: Tag:sport=gymnastics
     sport=handball: Tag:sport=handball
@@ -11356,8 +12591,10 @@ en:
     sport=taekwondo: Tag:sport=taekwondo
     sport=team_handball: Tag:sport=team handball
     sport=tennis: Tag:sport=tennis
+    sport=tetherball: Tag:sport=tetherball
     sport=toboggan: Tag:sport=toboggan
     sport=trampoline: Tag:sport=trampoline
+    sport=trugo: Tag:sport=trugo
     sport=ultimate: Tag:sport=ultimate
     sport=volleyball: Tag:sport=volleyball
     sport=wakeboarding: Tag:sport=wakeboarding
@@ -11373,7 +12610,13 @@ en:
     spring:type=hot: Tag:spring:type=hot
     station=funicular: Tag:station=funicular
     station=light_rail: Tag:station=light rail
+    station=monorail: Tag:station=monorail
     station=subway: Tag:station=subway
+    statue=animal: Tag:statue=animal
+    statue=equestrian: Tag:statue=equestrian
+    statue=virgin: Tag:statue=virgin
+    stile=stepover: Tag:stile=stepover
+    stone_type=khachkar: Tag:stone type=khachkar
     stream=intermittent: Tag:stream=intermittent
     street_vendor=yes: Tag:street vendor=yes
     studio=audio: Tag:studio=audio
@@ -11381,6 +12624,7 @@ en:
     studio=television: Tag:studio=television
     studio=video: Tag:studio=video
     submarine=yes: Tag:submarine=yes
+    substance=water: Tag:substance=water
     substation=compensation: Tag:substation=compensation
     substation=converter: Tag:substation=converter
     substation=distribution: Tag:substation=distribution
@@ -11395,6 +12639,9 @@ en:
     surface=acrylic: Tag:surface=acrylic
     surface=artificial_turf: Tag:surface=artificial turf
     surface=asphalt: Tag:surface=asphalt
+    surface=brick: Tag:surface=brick
+    surface=bricks: Tag:surface=bricks
+    surface=carpet: Tag:surface=carpet
     surface=chipseal: Tag:surface=chipseal
     surface=clay: Tag:surface=clay
     surface=cobblestone: Tag:surface=cobblestone
@@ -11410,6 +12657,7 @@ en:
     surface=gravel: Tag:surface=gravel
     surface=ground: Tag:surface=ground
     surface=metal: Tag:surface=metal
+    surface=metal_grid: Tag:surface=metal grid
     surface=mud: Tag:surface=mud
     surface=paved: Tag:surface=paved
     surface=paving_stones: Tag:surface=paving stones
@@ -11418,6 +12666,8 @@ en:
     surface=rocks: Tag:surface=rocks
     surface=sand: Tag:surface=sand
     surface=sett: Tag:surface=sett
+    surface=snow: Tag:surface=snow
+    surface=stepping_stones: Tag:surface=stepping stones
     surface=tartan: Tag:surface=tartan
     surface=unhewn_cobblestone: Tag:surface=unhewn cobblestone
     surface=unpaved: Tag:surface=unpaved
@@ -11453,6 +12703,7 @@ en:
     telecom:medium=copper: Tag:telecom:medium=copper
     telecom:medium=fibre: Tag:telecom:medium=fibre
     telecom=antenna: Tag:telecom=antenna
+    telecom=central_office: Tag:telecom=central office
     telecom=connection_point: Tag:telecom=connection point
     telecom=cross-connect: Tag:telecom=cross-connect
     telecom=data_center: Tag:telecom=data center
@@ -11460,9 +12711,11 @@ en:
     telecom=datacenter: Tag:telecom=datacenter
     telecom=distribution_point: Tag:telecom=distribution point
     telecom=exchange: Tag:telecom=exchange
+    telecom=outdoor_dslam: Tag:telecom=outdoor dslam
     telecom=remote_digital_terminal: Tag:telecom=remote digital terminal
     telecom=remote_terminal: Tag:telecom=remote terminal
     telecom=service_device: Tag:telecom=service device
+    telecom=street_cabinet: Tag:telecom=street cabinet
     telescope:type=optical: Tag:telescope:type=optical
     telescope:type=radio: Tag:telescope:type=radio
     theatre:type=amphi: Tag:theatre:type=amphi
@@ -11471,6 +12724,7 @@ en:
     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:designated=yes: Tag:toll:designated=yes
     toll=yes: Tag:toll=yes
     tomb=cenotaph: Tag:tomb=cenotaph
     tomb=columbarium: Tag:tomb=columbarium
@@ -11523,6 +12777,7 @@ en:
     tower:construction=guyed_tube: Tag:tower:construction=guyed tube
     tower:construction=lattice: Tag:tower:construction=lattice
     tower:type: Tag:tower:type
+    tower:type=anchor: Tag:tower:type=anchor
     tower:type=bell_tower: Tag:tower:type=bell tower
     tower:type=bridge: Tag:tower:type=bridge
     tower:type=communication: Tag:tower:type=communication
@@ -11542,6 +12797,7 @@ en:
     tower:type=radar: Tag:tower:type=radar
     tower:type=siren: Tag:tower:type=siren
     tower:type=suspension: Tag:tower:type=suspension
+    tower:type=transposing: Tag:tower:type=transposing
     tower:type=watchtower: Tag:tower:type=watchtower
     trade=wood: Tag:trade=wood
     traffic=local: Tag:traffic=local
@@ -11562,15 +12818,20 @@ en:
     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=painted_table: Tag:traffic calming=painted table
     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=AT:52.1: Tag:traffic sign=AT:52.1
+    traffic_sign=AT:52.17a-a: Tag:traffic sign=AT:52.17a-a
     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:103-10: Tag:traffic sign=DE:103-10
+    traffic_sign=DE:103-20: Tag:traffic sign=DE:103-20
     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
@@ -11618,6 +12879,8 @@ en:
     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:276: Tag:traffic sign=DE:276
+    traffic_sign=DE:277: Tag:traffic sign=DE:277
     traffic_sign=DE:282: Tag:traffic sign=DE:282
     traffic_sign=DE:306: Tag:traffic sign=DE:306
     traffic_sign=DE:310: Tag:traffic sign=DE:310
@@ -11635,6 +12898,7 @@ en:
     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.1: Tag:traffic sign=DE:386.1
     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
@@ -11643,15 +12907,27 @@ en:
     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=DE:600-35: Tag:traffic sign=DE:600-35
+    traffic_sign=DE:600-36: Tag:traffic sign=DE:600-36
+    traffic_sign=DE:600-37: Tag:traffic sign=DE:600-37
+    traffic_sign=DE:600-38: Tag:traffic sign=DE:600-38
+    traffic_sign=DE:600-39: Tag:traffic sign=DE:600-39
     traffic_sign=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=NL:L51: Tag:traffic sign=NL:L51
+    traffic_sign=PL:A-1: Tag:traffic sign=PL:A-1
+    traffic_sign=PL:A-2: Tag:traffic sign=PL:A-2
+    traffic_sign=PL:D-42: Tag:traffic sign=PL:D-42
+    traffic_sign=PL:D-43: Tag:traffic sign=PL:D-43
+    traffic_sign=US:MD:M1-5: Tag:traffic sign=US:MD:M1-5
     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=continuous_green: Tag:traffic signals=continuous green
     traffic_signals=tram_priority: Tag:traffic signals=tram priority
     trailer:type=motorcycle: Tag:trailer:type=motorcycle
     trailhead: Tag:trailhead
@@ -11663,6 +12939,7 @@ en:
     transformer=converter: Tag:transformer=converter
     transformer=distribution: Tag:transformer=distribution
     transformer=generator: Tag:transformer=generator
+    transformer=main: Tag:transformer=main
     transformer=phase_angle_regulator: Tag:transformer=phase angle regulator
     transformer=traction: Tag:transformer=traction
     transformer=yes: Tag:transformer=yes
@@ -11694,6 +12971,7 @@ en:
     type=destination_sign: Tag:type=destination sign
     type=enforcement: Tag:type=enforcement
     type=fixed_point: Tag:type=fixed point
+    type=health: Tag:type=health
     type=multipolygon: Tag:type=multipolygon
     type=observation_spot: Tag:type=observation spot
     type=public_transport: Tag:type=public transport
@@ -11702,6 +12980,7 @@ en:
     type=site: Tag:type=site
     type=superroute: Tag:type=superroute
     type=triangulation: Tag:type=triangulation
+    type=turnlanes:turns: Tag:type=turnlanes:turns
     type=waterway: Tag:type=waterway
     usage=branch: Tag:usage=branch
     usage=distribution: Tag:usage=distribution
@@ -11738,12 +13017,17 @@ en:
     valley=balka: Tag:valley=balka
     valve=ball: Tag:valve=ball
     valve=butterfly: Tag:valve=butterfly
+    valve=check: Tag:valve=check
     valve=gate: Tag:valve=gate
     valve=globe: Tag:valve=globe
+    valve=hollow_jet: Tag:valve=hollow jet
     valve=needle: Tag:valve=needle
     valve=plug: Tag:valve=plug
     valve=spool: Tag:valve=spool
     vehicle=customers: Tag:vehicle=customers
+    vehicle=destination: Tag:vehicle=destination
+    vehicle=no: Tag:vehicle=no
+    vehicle=yes: Tag:vehicle=yes
     vending: Tag:vending
     vending=SIM-cards: Tag:vending=SIM-cards
     vending=SIM_cards: Tag:vending=SIM cards
@@ -11760,6 +13044,8 @@ en:
     vending=chewing_gums: Tag:vending=chewing gums
     vending=cigarettes: Tag:vending=cigarettes
     vending=coffee: Tag:vending=coffee
+    vending=coin_change_machine: Tag:vending=coin change machine
+    vending=coin_rolls: Tag:vending=coin rolls
     vending=condoms: Tag:vending=condoms
     vending=contact_lenses: Tag:vending=contact lenses
     vending=drinks: Tag:vending=drinks
@@ -11771,6 +13057,7 @@ en:
     vending=first_aid: Tag:vending=first aid
     vending=fishing_bait: Tag:vending=fishing bait
     vending=fishing_tackle: Tag:vending=fishing tackle
+    vending=flower_seeds: Tag:vending=flower seeds
     vending=flowers: Tag:vending=flowers
     vending=food: Tag:vending=food
     vending=fuel: Tag:vending=fuel
@@ -11804,9 +13091,15 @@ en:
     vending_machine=fuel: Tag:vending machine=fuel
     wall=brick: Tag:wall=brick
     wall=castle_wall: Tag:wall=castle wall
+    wall=concrete: Tag:wall=concrete
+    wall=concrete_block: Tag:wall=concrete block
     wall=dry_stone: Tag:wall=dry stone
+    wall=flint: Tag:wall=flint
+    wall=flood_wall: Tag:wall=flood wall
+    wall=gabion:value: Tag:wall=gabion:value
     wall=no: Tag:wall=no
     wall=noise_barrier: Tag:wall=noise barrier
+    wall=pise:value: Tag:wall=pise:value
     wall=seawall: Tag:wall=seawall
     wall=stone: Tag:wall=stone
     wall=stone_wall: Tag:wall=stone wall
@@ -11817,14 +13110,17 @@ en:
     waste=drugs: Tag:waste=drugs
     waste=oil: Tag:waste=oil
     waste=organic: Tag:waste=organic
+    waste=pizza_box: Tag:waste=pizza box
     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=dock: Tag:water=dock
     water=drain: Tag:water=drain
     water=fish_pass: Tag:water=fish pass
+    water=harbour: Tag:water=harbour
     water=intermittent: Tag:water=intermittent
     water=lagoon: Tag:water=lagoon
     water=lake: Tag:water=lake
@@ -11856,7 +13152,6 @@ en:
     waterway=drain: Tag:waterway=drain
     waterway=dredged_area: Tag:waterway=dredged area
     waterway=drystream: Tag:waterway=drystream
-    waterway=estuary: Tag:waterway=estuary
     waterway=fairway: Tag:waterway=fairway
     waterway=fish_pass: Tag:waterway=fish pass
     waterway=floating_barrier: Tag:waterway=floating barrier
@@ -11873,6 +13168,7 @@ en:
     waterway=riverbed: Tag:waterway=riverbed
     waterway=sanitary_dump_station: Tag:waterway=sanitary dump station
     waterway=seaway: Tag:waterway=seaway
+    waterway=security_lock: Tag:waterway=security lock
     waterway=sluice_gate: Tag:waterway=sluice gate
     waterway=soakhole: Tag:waterway=soakhole
     waterway=spillway: Tag:waterway=spillway
@@ -11910,6 +13206,8 @@ en:
     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
+    zone:traffic=NL:rural: Tag:zone:traffic=NL:rural
+    zone:traffic=NL:urban: Tag:zone:traffic=NL:urban
     zoo=aviary: Tag:zoo=aviary
     zoo=birds: Tag:zoo=birds
     zoo=butterfly: Tag:zoo=butterfly
@@ -11920,13 +13218,33 @@ en:
     zoo=safari_park: Tag:zoo=safari park
     zoo=wildlife_park: Tag:zoo=wildlife park
 eo:
+  key:
+    bench: Eo:Key:bench
+    diet: Eo:Key:diet
+    diet:vegan: Eo:Key:diet:vegan
+    diet:vegetarian: Eo:Key:diet:vegetarian
+    website:menu: Eo:Key:website:menu
   tag:
+    aeroway=windsock: Eo:Tag:aeroway=windsock
+    amenity=bench: Eo:Tag:amenity=bench
+    amenity=cafe: Eo:Tag:amenity=cafe
+    amenity=fast_food: Eo:Tag:amenity=fast food
+    amenity=restaurant: Eo:Tag:amenity=restaurant
     craft=tinsmith: Eo:Tag:craft=tinsmith
     esperanto=esperanto: Eo:Tag:esperanto=esperanto
     esperanto=yes: Eo:Tag:esperanto=yes
+    generator:source=solar: Eo:Tag:generator:source=solar
+    highway=cycleway: Eo:Tag:highway=cycleway
+    highway=street_lamp: Eo:Tag:highway=street lamp
+    leisure=picnic_table: Eo:Tag:leisure=picnic table
+    place=country: Eo:Tag:place=country
+    place=hamlet: Eo:Tag:place=hamlet
+    place=village: Eo:Tag:place=village
     shop=bakery: Eo:Tag:shop=bakery
+    waterway=river: Eo:Tag:waterway=river
 es:
   key:
+    4wd_only: ES:Key:4wd only
     AlpinRes_ID: ES:Key:AlpinRes ID
     abandoned: ES:Key:abandoned
     'abandoned:': 'ES:Key:abandoned:'
@@ -11940,7 +13258,9 @@ es:
     access:roadtrain:trailers: ES:Key:access:roadtrain:trailers
     addr: ES:Key:addr
     addr:city: ES:Key:addr:city
+    addr:conscriptionnumber: ES:Key:addr:conscriptionnumber
     addr:country: ES:Key:addr:country
+    addr:county: ES:Key:addr:county
     addr:district: ES:Key:addr:district
     addr:flats: ES:Key:addr:flats
     addr:floor: ES:Key:addr:floor
@@ -11951,6 +13271,7 @@ es:
     addr:inclusion: ES:Key:addr:inclusion
     addr:interpolation: ES:Key:addr:interpolation
     addr:place: ES:Key:addr:place
+    addr:postbox: ES:Key:addr:postbox
     addr:postcode: ES:Key:addr:postcode
     addr:province: ES:Key:addr:province
     addr:state: ES:Key:addr:state
@@ -11958,6 +13279,7 @@ es:
     addr:subdistrict: ES:Key:addr:subdistrict
     addr:suburb: ES:Key:addr:suburb
     admin_level: ES:Key:admin level
+    advertising: ES:Key:advertising
     aerialway: ES:Key:aerialway
     aeroway: ES:Key:aeroway
     after_school: ES:Key:after school
@@ -11970,27 +13292,38 @@ es:
     artist_name: ES:Key:artist name
     artwork_subject: ES:Key:artwork subject
     artwork_type: ES:Key:artwork type
+    attribution: ES:Key:attribution
+    atv: ES:Key:atv
+    avalanche_protection: ES:Key:avalanche protection
     backrest: ES:Key:backrest
     barrier: ES:Key:barrier
+    basin: ES:Key:basin
     bdouble: ES:Key:bdouble
     beauty: ES:Key:beauty
     beds: ES:Key:beds
+    bench: ES:Key:bench
+    bicycle: ES:Key:bicycle
     bicycle_parking: ES:Key:bicycle parking
     bicycle_road: ES:Key:bicycle road
     board:title: ES:Key:board:title
+    boat: ES:Key:boat
+    bollard: ES:Key:bollard
     books: ES:Key:books
     border_type: ES:Key:border type
+    boundary: ES:Key:boundary
     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:colour: ES:Key:building:colour
     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:max_level: ES:Key:building:max level
     building:min_level: ES:Key:building:min level
     building:part: ES:Key:building:part
     building:soft_storey: ES:Key:building:soft storey
@@ -11999,10 +13332,16 @@ es:
     bus_bay: ES:Key:bus bay
     busway: ES:Key:busway
     capital: ES:Key:capital
+    car_wash: ES:Key:car wash
+    cash_withdrawal: ES:Key:cash withdrawal
+    castle_type: ES:Key:castle type
     cemetery: ES:Key:cemetery
+    change: ES:Key:change
     changesets_count: ES:Key:changesets count
+    charge: ES:Key:charge
     check_date: ES:Key:check date
     circumference: ES:Key:circumference
+    closed:note: ES:Key:closed:note
     clothes: ES:Key:clothes
     club: ES:Key:club
     collection_times: ES:Key:collection times
@@ -12016,8 +13355,37 @@ es:
     construction: ES:Key:construction
     consulting: ES:Key:consulting
     contact: ES:Key:contact
+    contact:city: ES:Key:contact:city
+    contact:diaspora: ES:Key:contact:diaspora
+    contact:email: ES:Key:contact:email
     contact:facebook: ES:Key:contact:facebook
+    contact:fax: ES:Key:contact:fax
+    contact:flickr: ES:Key:contact:flickr
+    contact:foursquare: ES:Key:contact:foursquare
+    contact:gnusocial: ES:Key:contact:gnusocial
+    contact:housenumber: ES:Key:contact:housenumber
+    contact:instagram: ES:Key:contact:instagram
+    contact:linkedin: ES:Key:contact:linkedin
+    contact:mastodon: ES:Key:contact:mastodon
+    contact:mobile: ES:Key:contact:mobile
+    contact:ok: ES:Key:contact:ok
+    contact:phone: ES:Key:contact:phone
+    contact:pinterest: ES:Key:contact:pinterest
+    contact:pobox: ES:Key:contact:pobox
+    contact:postcode: ES:Key:contact:postcode
+    contact:sip: ES:Key:contact:sip
+    contact:skype: ES:Key:contact:skype
+    contact:street: ES:Key:contact:street
+    contact:telegram: ES:Key:contact:telegram
     contact:twitter: ES:Key:contact:twitter
+    contact:vhf: ES:Key:contact:vhf
+    contact:viber: ES:Key:contact:viber
+    contact:vk: ES:Key:contact:vk
+    contact:webcam: ES:Key:contact:webcam
+    contact:website: ES:Key:contact:website
+    contact:whatsapp: ES:Key:contact:whatsapp
+    contact:xing: ES:Key:contact:xing
+    contact:youtube: ES:Key:contact:youtube
     content: ES:Key:content
     conveying: ES:Key:conveying
     country: ES:Key:country
@@ -12042,8 +13410,8 @@ es:
     'demolished:': 'ES:Key:demolished:'
     denotation: ES:Key:denotation
     description: ES:Key:description
+    designation: ES:Key:designation
     destination: ES:Key:destination
-    diaper: ES:Key:diaper
     diet: ES:Key:diet
     diet:*: ES:Key:diet:*
     diet:kosher: ES:Key:diet:kosher
@@ -12055,31 +13423,45 @@ es:
     disused: ES:Key:disused
     'disused:': 'ES:Key:disused:'
     disused:railway: ES:Key:disused:railway
+    drain: ES:Key:drain
+    drinking_water: ES:Key:drinking water
     drive_in: ES:Key:drive in
     drive_through: ES:Key:drive through
     ele: ES:Key:ele
+    electric_bicycle: ES:Key:electric bicycle
+    electrified: ES:Key:electrified
     email: ES:Key:email
     embankment: ES:Key:embankment
+    embedded_rails: ES:Key:embedded rails
     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
+    est_width: ES:Key:est width
     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
+    fire_boundary: ES:Key:fire boundary
+    fire_object:type: ES:Key:fire object:type
+    fire_operator: ES:Key:fire operator
+    fire_rank: ES:Key:fire rank
     fishing: ES:Key:fishing
     fixme: ES:Key:fixme
     flag:type: ES:Key:flag:type
+    flood_date: ES:Key:flood date
+    flood_mark: ES:Key:flood mark
     flood_prone: ES:Key:flood prone
     foot: ES:Key:foot
     foot:backward: ES:Key:foot:backward
     footway: ES:Key:footway
     ford: ES:Key:ford
+    forestry: ES:Key:forestry
+    frequency: ES:Key:frequency
     from: ES:Key:from
     fuel:diesel_G2: ES:Key:fuel:diesel G2
     garden:style: ES:Key:garden:style
@@ -12091,19 +13473,28 @@ es:
     generator:type: ES:Key:generator:type
     genus: ES:Key:genus
     geological: ES:Key:geological
+    golf_cart: ES:Key:golf cart
     goods: ES:Key:goods
     government: ES:Key:government
     grassland: ES:Key:grassland
     handrail: ES:Key:handrail
+    hazard: ES:Key:hazard
     hazard_prone: ES:Key:hazard prone
+    hazmat: ES:Key:hazmat
     healthcare: ES:Key:healthcare
     healthcare:counselling: ES:Key:healthcare:counselling
+    healthcare:speciality: ES:Key:healthcare:speciality
     height: ES:Key:height
     heritage: ES:Key:heritage
+    hgv: ES:Key:hgv
     highway: ES:Key:highway
     historic: ES:Key:historic
     historic:civilization: ES:Key:historic:civilization
+    horse: ES:Key:horse
     house: ES:Key:house
+    iata: ES:Key:iata
+    icao: ES:Key:icao
+    ice_road: ES:Key:ice road
     image: ES:Key:image
     imagery_used: ES:Key:imagery used
     incline: ES:Key:incline
@@ -12111,7 +13502,10 @@ es:
     industrial: ES:Key:industrial
     informal: ES:Key:informal
     information: ES:Key:information
+    inline_skates: ES:Key:inline skates
     inscription: ES:Key:inscription
+    int_name: ES:Key:int name
+    int_ref: ES:Key:int ref
     intermittent: ES:Key:intermittent
     internet_access: ES:Key:internet access
     internet_access:fee: ES:Key:internet access:fee
@@ -12121,7 +13515,9 @@ es:
     is_in:continent: ES:Key:is in:continent
     is_in:country: ES:Key:is in:country
     isced:level: ES:Key:isced:level
+    junction: ES:Key:junction
     kerb: ES:Key:kerb
+    kitchen: ES:Key:kitchen
     ladder: ES:Key:ladder
     landuse: ES:Key:landuse
     lane_markings: ES:Key:lane markings
@@ -12129,6 +13525,7 @@ es:
     lanes:psv: ES:Key:lanes:psv
     lawyer: ES:Key:lawyer
     layer: ES:Key:layer
+    lcn_ref: ES:Key:lcn ref
     leaf_cycle: ES:Key:leaf cycle
     leaf_type: ES:Key:leaf type
     leisure: ES:Key:leisure
@@ -12136,10 +13533,16 @@ es:
     level: ES:Key:level
     lgbtq: ES:Key:lgbtq
     lhv: ES:Key:lhv
+    lifeguard: ES:Key:lifeguard
+    line: ES:Key:line
+    lit: ES:Key:lit
     lit:perceived: ES:Key:lit:perceived
+    loc_name: ES:Key:loc name
+    loc_ref: ES:Key:loc ref
     local_ref: ES:Key:local ref
     locale: ES:Key:locale
     location: ES:Key:location
+    lock: ES:Key:lock
     man_made: ES:Key:man made
     manhole: ES:Key:manhole
     manufacturer: ES:Key:manufacturer
@@ -12149,6 +13552,7 @@ es:
     maxaxleload: ES:Key:maxaxleload
     maxbogieweight: ES:Key:maxbogieweight
     maxheight: ES:Key:maxheight
+    maxlength: ES:Key:maxlength
     maxspeed: ES:Key:maxspeed
     maxspeed:advisory: ES:Key:maxspeed:advisory
     maxspeed:practical: ES:Key:maxspeed:practical
@@ -12156,13 +13560,18 @@ es:
     maxweight: ES:Key:maxweight
     maxwidth: ES:Key:maxwidth
     memorial: ES:Key:memorial
+    military: ES:Key:military
     min_age: ES:Key:min age
     min_height: ES:Key:min height
+    minspeed: ES:Key:minspeed
+    mofa: ES:Key:mofa
     monitoring:galileo: ES:Key:monitoring:galileo
     monitoring:glonass: ES:Key:monitoring:glonass
     monitoring:gps: ES:Key:monitoring:gps
+    mooring: ES:Key:mooring
     moped: ES:Key:moped
     motor_vehicle: ES:Key:motor vehicle
+    motorboat: ES:Key:motorboat
     motorcar: ES:Key:motorcar
     motorcycle: ES:Key:motorcycle
     motorcycle:clothes: ES:Key:motorcycle:clothes
@@ -12175,12 +13584,24 @@ es:
     motorhome: ES:Key:motorhome
     motorroad: ES:Key:motorroad
     mountain_pass: ES:Key:mountain pass
+    mtb:description: ES:Key:mtb:description
+    mtb:scale: ES:Key:mtb:scale
+    mtb:scale:imba: ES:Key:mtb:scale:imba
+    mtb:scale:uphill: ES:Key:mtb:scale:uphill
     museum: ES:Key:museum
     museum_type: ES:Key:museum type
     musical_instrument: ES:Key:musical instrument
     name: ES:Key:name
+    name:es: ES:Key:name:es
+    name:etymology: ES:Key:name:etymology
+    name:etymology:wikidata: ES:Key:name:etymology:wikidata
+    name:left: ES:Key:name:left
+    name:right: ES:Key:name:right
     narrow: ES:Key:narrow
+    nat_name: ES:Key:nat name
+    nat_ref: ES:Key:nat ref
     natural: ES:Key:natural
+    ncn_ref: ES:Key:ncn ref
     network:type: ES:Key:network:type
     noaddress: ES:Key:noaddress
     noexit: ES:Key:noexit
@@ -12191,7 +13612,9 @@ es:
     nudism: ES:Key:nudism
     object: ES:Key:object
     office: ES:Key:office
+    official_name: ES:Key:official name
     old_name: ES:Key:old name
+    old_ref: ES:Key:old ref
     oneway: ES:Key:oneway
     oneway:bicycle: ES:Key:oneway:bicycle
     oneway:psv: ES:Key:oneway:psv
@@ -12205,6 +13628,7 @@ es:
     orienteering: ES:Key:orienteering
     origin: ES:Key:origin
     osmc:symbol: ES:Key:osmc:symbol
+    oven: ES:Key:oven
     overtaking: ES:Key:overtaking
     owner: ES:Key:owner
     ownership: ES:Key:ownership
@@ -12213,11 +13637,13 @@ es:
     parking:lane: ES:Key:parking:lane
     parking:orientation: ES:Key:parking:orientation
     passenger: ES:Key:passenger
+    passing_places: ES:Key:passing places
     payment: ES:Key:payment
     phone: ES:Key:phone
     place: ES:Key:place
     placement: ES:Key:placement
     police: ES:Key:police
+    political_division: ES:Key:political division
     population: ES:Key:population
     power: ES:Key:power
     prepayment: ES:Key:prepayment
@@ -12236,20 +13662,28 @@ es:
     pump: ES:Key:pump
     railway: ES:Key:railway
     railway:preserved: ES:Key:railway:preserved
+    railway:track_ref: ES:Key:railway:track ref
     ramp: ES:Key:ramp
+    rcn_ref: ES:Key:rcn ref
+    real_ale: ES:Key:real ale
     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
+    reg_name: ES:Key:reg name
+    reg_ref: ES:Key:reg ref
     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
+    restaurant: ES:Key:restaurant
+    restriction: ES:Key:restriction
     review_requested: ES:Key:review requested
+    roadtrain: ES:Key:roadtrain
     roller_coaster: ES:Key:roller coaster
     roof:colour: ES:Key:roof:colour
     roof:direction: ES:Key:roof:direction
@@ -12269,19 +13703,30 @@ es:
     second_hand: ES:Key:second hand
     segregated: ES:Key:segregated
     self_service: ES:Key:self service
+    service: ES:Key:service
     service:bicycle:diy: ES:Key:service:bicycle:diy
+    service_times: ES:Key:service times
     shelter: ES:Key:shelter
     shelter_type: ES:Key:shelter type
     shooting: ES:Key:shooting
     shop: ES:Key:shop
+    short_name: ES:Key:short name
     shoulder: ES:Key:shoulder
     sidewalk: ES:Key:sidewalk
     site_type: ES:Key:site type
+    ski: ES:Key:ski
+    smoothness: ES:Key:smoothness
     social_facility: ES:Key:social facility
     social_facility:for: ES:Key:social facility:for
+    sorting_name: ES:Key:sorting name
     source: ES:Key:source
+    source:geometry: ES:Key:source:geometry
+    source:name: ES:Key:source:name
+    source:ref: ES:Key:source:ref
+    source_ref: ES:Key:source ref
     species: ES:Key:species
     species:de: ES:Key:species:de
+    speed_pedelec: ES:Key:speed pedelec
     sport: ES:Key:sport
     stars: ES:Key:stars
     start_date: ES:Key:start date
@@ -12296,22 +13741,30 @@ es:
     symbol: ES:Key:symbol
     tactile_paving: ES:Key:tactile paving
     takeaway: ES:Key:takeaway
+    tank: ES:Key:tank
     taxi: ES:Key:taxi
+    telecom: ES:Key:telecom
     tents: ES:Key:tents
     theatre:type: ES:Key:theatre:type
+    tidal: ES:Key:tidal
     to: ES:Key:to
     todo: ES:Key:todo
     toilets: ES:Key:toilets
     toilets:wheelchair: ES:Key:toilets:wheelchair
+    toll: ES:Key:toll
     tourism: ES:Key:tourism
     tourist_bus: ES:Key:tourist bus
     tower:construction: ES:Key:tower:construction
+    tracks: ES:Key:tracks
     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
+    trail_visibility: ES:Key:trail visibility
+    trailblazed: ES:Key:trailblazed
+    trailblazed:visibility: ES:Key:trailblazed:visibility
     train: ES:Key:train
     transformer: ES:Key:transformer
     tree_lined: ES:Key:tree lined
@@ -12321,12 +13774,17 @@ es:
     turn: ES:Key:turn
     twitter: ES:Key:twitter
     type: ES:Key:type
+    unisex: ES:Key:unisex
     unnamed: ES:Key:unnamed
     url: ES:Key:url
+    usage: ES:Key:usage
     vaccination: ES:Key:vaccination
     vehicle: ES:Key:vehicle
     vending: ES:Key:vending
     via: ES:Key:via
+    voltage: ES:Key:voltage
+    wall: ES:Key:wall
+    waste: ES:Key:waste
     water: ES:Key:water
     water_source: ES:Key:water source
     waterway: ES:Key:waterway
@@ -12339,18 +13797,41 @@ es:
     wikidata: ES:Key:wikidata
     wikimedia_commons: ES:Key:wikimedia commons
     wikipedia: ES:Key:wikipedia
+    winter_road: ES:Key:winter road
   tag:
     abandoned:amenity=prison: ES:Tag:abandoned:amenity=prison
     abandoned:amenity=prison_camp: ES:Tag:abandoned:amenity=prison camp
+    abutters=commercial: ES:Tag:abutters=commercial
+    abutters=industrial: ES:Tag:abutters=industrial
+    abutters=mixed: ES:Tag:abutters=mixed
+    abutters=residential: ES:Tag:abutters=residential
+    abutters=retail: ES:Tag:abutters=retail
     access=agricultural: ES:Tag:access=agricultural
     access=customers: ES:Tag:access=customers
     access=delivery: ES:Tag:access=delivery
+    access=designated: ES:Tag:access=designated
     access=forestry: ES:Tag:access=forestry
+    access=no: ES:Tag:access=no
+    access=permit: ES:Tag:access=permit
     access=private: ES:Tag:access=private
+    admin_level=10: ES:Tag:admin level=10
+    admin_level=11: ES:Tag:admin level=11
     admin_level=2: ES:Tag:admin level=2
+    admin_level=3: ES:Tag:admin level=3
+    admin_level=4: ES:Tag:admin level=4
+    admin_level=5: ES:Tag:admin level=5
+    admin_level=6: ES:Tag:admin level=6
+    admin_level=7: ES:Tag:admin level=7
+    admin_level=8: ES:Tag:admin level=8
+    admin_level=9: ES:Tag:admin level=9
+    advertising=billboard: ES:Tag:advertising=billboard
     advertising=board: ES:Tag:advertising=board
     advertising=column: ES:Tag:advertising=column
+    advertising=flag: ES:Tag:advertising=flag
+    advertising=poster_box: ES:Tag:advertising=poster box
     advertising=screen: ES:Tag:advertising=screen
+    advertising=sculpture: ES:Tag:advertising=sculpture
+    advertising=sign: ES:Tag:advertising=sign
     advertising=tarp: ES:Tag:advertising=tarp
     advertising=totem: ES:Tag:advertising=totem
     advertising=wall_painting: ES:Tag:advertising=wall painting
@@ -12366,24 +13847,30 @@ es:
     aerialway=platter: ES:Tag:aerialway=platter
     aerialway=pylon: ES:Tag:aerialway=pylon
     aerialway=rope_tow: ES:Tag:aerialway=rope tow
+    aerialway=ropetow: ES:Tag:aerialway=ropetow
     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=aircraft_crossing: ES:Tag:aeroway=aircraft crossing
     aeroway=apron: ES:Tag:aeroway=apron
+    aeroway=fuel: ES:Tag:aeroway=fuel
     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=parking_position: ES:Tag:aeroway=parking position
     aeroway=runway: ES:Tag:aeroway=runway
+    aeroway=spaceport: ES:Tag:aeroway=spaceport
     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_boarding: ES:Tag:amenity=animal boarding
     amenity=animal_breeding: ES:Tag:amenity=animal breeding
     amenity=animal_shelter: ES:Tag:amenity=animal shelter
     amenity=archive: ES:Tag:amenity=archive
@@ -12395,27 +13882,38 @@ es:
     amenity=bank: ES:Tag:amenity=bank
     amenity=bar: ES:Tag:amenity=bar
     amenity=bbq: ES:Tag:amenity=bbq
+    amenity=bear_box: ES:Tag:amenity=bear box
     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=binoculars: ES:Tag:amenity=binoculars
+    amenity=blood_bank: ES:Tag:amenity=blood bank
+    amenity=boat_rental: ES:Tag:amenity=boat rental
+    amenity=boat_sharing: ES:Tag:amenity=boat sharing
     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=canteen: ES:Tag:amenity=canteen
     amenity=car_rental: ES:Tag:amenity=car rental
+    amenity=car_sharing: ES:Tag:amenity=car sharing
     amenity=car_wash: ES:Tag:amenity=car wash
     amenity=casino: ES:Tag:amenity=casino
+    amenity=chair: ES:Tag:amenity=chair
+    amenity=charging_station: ES:Tag:amenity=charging station
     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=clothes_dryer: ES:Tag:amenity=clothes dryer
     amenity=college: ES:Tag:amenity=college
     amenity=community_centre: ES:Tag:amenity=community centre
     amenity=compressed_air: ES:Tag:amenity=compressed air
+    amenity=concert_hall: ES:Tag:amenity=concert hall
     amenity=conference_centre: ES:Tag:amenity=conference centre
     amenity=courthouse: ES:Tag:amenity=courthouse
     amenity=coworking_space: ES:Tag:amenity=coworking space
@@ -12424,50 +13922,69 @@ es:
     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=dive_centre: ES:Tag:amenity=dive centre
     amenity=doctors: ES:Tag:amenity=doctors
+    amenity=dog_toilet: ES:Tag:amenity=dog toilet
+    amenity=dojo: ES:Tag:amenity=dojo
+    amenity=dressing_room: ES:Tag:amenity=dressing room
     amenity=drinking_water: ES:Tag:amenity=drinking water
+    amenity=driver_training: ES:Tag:amenity=driver training
     amenity=driving_school: ES:Tag:amenity=driving school
     amenity=dryer: ES:Tag:amenity=dryer
     amenity=embassy: ES:Tag:amenity=embassy
+    amenity=events_centre: ES:Tag:amenity=events centre
     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=feeding_place: ES:Tag:amenity=feeding place
     amenity=ferry_terminal: ES:Tag:amenity=ferry terminal
+    amenity=financial_advice: ES:Tag:amenity=financial advice
     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=game_feeding: ES:Tag:amenity=game feeding
     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=hookah_lounge: ES:Tag:amenity=hookah lounge
     amenity=hospital: ES:Tag:amenity=hospital
+    amenity=hunting_stand: ES:Tag:amenity=hunting stand
     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=kick-scooter_rental: ES:Tag:amenity=kick-scooter rental
     amenity=kindergarten: ES:Tag:amenity=kindergarten
+    amenity=kitchen: ES:Tag:amenity=kitchen
+    amenity=kneipp_water_cure: ES:Tag:amenity=kneipp water cure
     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=loading_dock: ES:Tag:amenity=loading dock
     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=marae: ES:Tag:amenity=marae
     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=monastery: ES:Tag:amenity=monastery
     amenity=money_transfer: ES:Tag:amenity=money transfer
     amenity=mortuary: ES:Tag:amenity=mortuary
     amenity=motorcycle_parking: ES:Tag:amenity=motorcycle parking
+    amenity=motorcycle_rental: ES:Tag:amenity=motorcycle rental
     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=parcel_locker: ES:Tag:amenity=parcel locker
     amenity=parking: ES:Tag:amenity=parking
     amenity=parking_entrance: ES:Tag:amenity=parking entrance
     amenity=parking_space: ES:Tag:amenity=parking space
@@ -12480,6 +13997,7 @@ es:
     amenity=place_of_worship: ES:Tag:amenity=place of worship
     amenity=planetarium: ES:Tag:amenity=planetarium
     amenity=police: ES:Tag:amenity=police
+    amenity=polling_station: ES:Tag:amenity=polling station
     amenity=post_box: ES:Tag:amenity=post box
     amenity=post_depot: ES:Tag:amenity=post depot
     amenity=post_office: ES:Tag:amenity=post office
@@ -12494,36 +14012,53 @@ es:
     amenity=ranger_station: ES:Tag:amenity=ranger station
     amenity=recycling: ES:Tag:amenity=recycling
     amenity=refugee_housing: ES:Tag:amenity=refugee housing
+    amenity=refugee_site: ES:Tag:amenity=refugee site
+    amenity=relay_box: ES:Tag:amenity=relay box
     amenity=research_institute: ES:Tag:amenity=research institute
     amenity=restaurant: ES:Tag:amenity=restaurant
     amenity=retirement_home: ES:Tag:amenity=retirement home
+    amenity=sanatorium: ES:Tag:amenity=sanatorium
+    amenity=sanitary_dump_station: ES:Tag:amenity=sanitary dump station
     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_rental: ES:Tag:amenity=ski rental
     amenity=ski_school: ES:Tag:amenity=ski school
+    amenity=smoking_area: ES:Tag:amenity=smoking area
     amenity=social_centre: ES:Tag:amenity=social centre
+    amenity=social_club: ES:Tag:amenity=social club
     amenity=social_facility: ES:Tag:amenity=social facility
     amenity=sport_school: ES:Tag:amenity=sport school
+    amenity=stage: ES:Tag:amenity=stage
     amenity=stool: ES:Tag:amenity=stool
     amenity=stripclub: ES:Tag:amenity=stripclub
     amenity=studio: ES:Tag:amenity=studio
+    amenity=swingerclub: ES:Tag:amenity=swingerclub
+    amenity=table: ES:Tag:amenity=table
     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=ticket_validator: ES:Tag:amenity=ticket validator
     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=traffic_park: ES:Tag:amenity=traffic park
+    amenity=training: ES:Tag:amenity=training
     amenity=trolley_bay: ES:Tag:amenity=trolley bay
     amenity=university: ES:Tag:amenity=university
+    amenity=vacuum_cleaner: ES:Tag:amenity=vacuum cleaner
     amenity=vehicle_inspection: ES:Tag:amenity=vehicle inspection
+    amenity=vehicle_ramp: ES:Tag:amenity=vehicle ramp
     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=waste_dump_site: ES:Tag:amenity=waste dump site
+    amenity=waste_transfer_station: ES:Tag:amenity=waste transfer station
     amenity=water_point: ES:Tag:amenity=water point
     amenity=watering_place: ES:Tag:amenity=watering place
     amenity=weighbridge: ES:Tag:amenity=weighbridge
     area:highway=footway: ES:Tag:area:highway=footway
     area:highway=path: ES:Tag:area:highway=path
     area:highway=pedestrian: ES:Tag:area:highway=pedestrian
+    area=yes: ES:Tag:area=yes
     artwork_type=sculpture: ES:Tag:artwork type=sculpture
+    atm=yes: ES:Tag:atm=yes
     attraction=roller_coaster: ES:Tag:attraction=roller coaster
     attraction=water_slide: ES:Tag:attraction=water slide
+    avalanche_protection=snow_bridge: ES:Tag:avalanche protection=snow bridge
     barrier=block: ES:Tag:barrier=block
     barrier=bollard: ES:Tag:barrier=bollard
     barrier=border_control: ES:Tag:barrier=border control
+    barrier=bump_gate: ES:Tag:barrier=bump gate
+    barrier=bus_trap: ES:Tag:barrier=bus trap
     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=coupure: ES:Tag:barrier=coupure
+    barrier=cycle_barrier: ES:Tag:barrier=cycle barrier
     barrier=debris: ES:Tag:barrier=debris
+    barrier=ditch: ES:Tag:barrier=ditch
     barrier=entrance: ES:Tag:barrier=entrance
     barrier=fence: ES:Tag:barrier=fence
+    barrier=full-height_turnstile: ES:Tag:barrier=full-height turnstile
     barrier=gate: ES:Tag:barrier=gate
     barrier=guard_rail: ES:Tag:barrier=guard rail
+    barrier=haha: ES:Tag:barrier=haha
+    barrier=hampshire_gate: ES:Tag:barrier=hampshire gate
     barrier=handrail: ES:Tag:barrier=handrail
     barrier=hedge: ES:Tag:barrier=hedge
     barrier=height_restrictor: ES:Tag:barrier=height restrictor
+    barrier=horse_jump: ES:Tag:barrier=horse jump
+    barrier=horse_stile: ES:Tag:barrier=horse stile
     barrier=jersey_barrier: ES:Tag:barrier=jersey barrier
+    barrier=kent_carriage_gap: ES:Tag:barrier=kent carriage gap
     barrier=kerb: ES:Tag:barrier=kerb
+    barrier=kissing_gate: ES:Tag:barrier=kissing gate
     barrier=lift_gate: ES:Tag:barrier=lift gate
+    barrier=log: ES:Tag:barrier=log
+    barrier=motorcycle_barrier: ES:Tag:barrier=motorcycle barrier
+    barrier=planter: ES:Tag:barrier=planter
     barrier=retaining_wall: ES:Tag:barrier=retaining wall
     barrier=rope: ES:Tag:barrier=rope
     barrier=sally_port: ES:Tag:barrier=sally port
+    barrier=sliding_gate: ES:Tag:barrier=sliding gate
     barrier=spikes: ES:Tag:barrier=spikes
+    barrier=step: ES:Tag:barrier=step
+    barrier=stile: ES:Tag:barrier=stile
+    barrier=sump_buster: ES:Tag:barrier=sump buster
     barrier=swing_gate: ES:Tag:barrier=swing gate
+    barrier=tank_trap: ES:Tag:barrier=tank trap
     barrier=toll_booth: ES:Tag:barrier=toll booth
+    barrier=turnstile: ES:Tag:barrier=turnstile
     barrier=tyres: ES:Tag:barrier=tyres
     barrier=wall: ES:Tag:barrier=wall
+    barrier=wicket_gate: ES:Tag:barrier=wicket gate
+    barrier=yes: ES:Tag:barrier=yes
+    basin=detention: ES:Tag:basin=detention
+    basin=evaporation: ES:Tag:basin=evaporation
+    basin=infiltration: ES:Tag:basin=infiltration
+    basin=retention: ES:Tag:basin=retention
     bicycle=no: ES:Tag:bicycle=no
     bicycle=use_sidepath: ES:Tag:bicycle=use sidepath
     bicycle=yes: ES:Tag:bicycle=yes
+    bicycle_road=yes: ES:Tag:bicycle road=yes
+    border_type=baseline: ES:Tag:border type=baseline
+    border_type=contiguous: ES:Tag:border type=contiguous
+    border_type=eez: ES:Tag:border type=eez
+    border_type=nation: ES:Tag:border type=nation
+    border_type=territorial: ES:Tag:border type=territorial
+    boundary=aboriginal_lands: ES:Tag:boundary=aboriginal lands
     boundary=administrative: ES:Tag:boundary=administrative
+    boundary=administrative_cooperation: ES:Tag:boundary=administrative cooperation
+    boundary=border_zone: ES:Tag:boundary=border zone
+    boundary=census: ES:Tag:boundary=census
+    boundary=civil: ES:Tag:boundary=civil
+    boundary=disputed: ES:Tag:boundary=disputed
+    boundary=exclave: ES:Tag:boundary=exclave
+    boundary=forest: ES:Tag:boundary=forest
+    boundary=forest_compartment: ES:Tag:boundary=forest compartment
+    boundary=hazard: ES:Tag:boundary=hazard
+    boundary=historic: ES:Tag:boundary=historic
+    boundary=local_authority: ES:Tag:boundary=local authority
+    boundary=low_emission_zone: ES:Tag:boundary=low emission zone
+    boundary=maritime: ES:Tag:boundary=maritime
+    boundary=marker: ES:Tag:boundary=marker
+    boundary=military_district: ES:Tag:boundary=military district
     boundary=national_park: ES:Tag:boundary=national park
+    boundary=place: ES:Tag:boundary=place
     boundary=political: ES:Tag:boundary=political
+    boundary=postal_code: ES:Tag:boundary=postal code
     boundary=protected_area: ES:Tag:boundary=protected area
     boundary=regional_park: ES:Tag:boundary=regional park
+    boundary=religious_administration: ES:Tag:boundary=religious administration
+    boundary=safety_region: ES:Tag:boundary=safety region
+    boundary=special_economic_zone: ES:Tag:boundary=special economic zone
+    boundary=urban: ES:Tag:boundary=urban
+    boundary=water_protection_area: ES:Tag:boundary=water protection area
     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
+    bridge=yes: ES:Tag:bridge=yes
     building=apartments: ES:Tag:building=apartments
     building=bakehouse: ES:Tag:building=bakehouse
     building=barn: ES:Tag:building=barn
+    building=barracks: ES:Tag:building=barracks
+    building=beach_hut: ES:Tag:building=beach hut
     building=boathouse: ES:Tag:building=boathouse
     building=brewery: ES:Tag:building=brewery
     building=bridge: ES:Tag:building=bridge
@@ -12585,6 +14182,7 @@ es:
     building=bunker: ES:Tag:building=bunker
     building=cabin: ES:Tag:building=cabin
     building=carport: ES:Tag:building=carport
+    building=castle: ES:Tag:building=castle
     building=cathedral: ES:Tag:building=cathedral
     building=chapel: ES:Tag:building=chapel
     building=church: ES:Tag:building=church
@@ -12616,12 +14214,15 @@ es:
     building=hut: ES:Tag:building=hut
     building=industrial: ES:Tag:building=industrial
     building=kindergarten: ES:Tag:building=kindergarten
+    building=kingdom_hall: ES:Tag:building=kingdom hall
     building=kiosk: ES:Tag:building=kiosk
+    building=military: ES:Tag:building=military
     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=presbytery: ES:Tag:building=presbytery
     building=public: ES:Tag:building=public
     building=religious: ES:Tag:building=religious
     building=residential: ES:Tag:building=residential
@@ -12636,10 +14237,12 @@ es:
     building=shed: ES:Tag:building=shed
     building=shrine: ES:Tag:building=shrine
     building=slurry_tank: ES:Tag:building=slurry tank
+    building=sports_centre: ES:Tag:building=sports centre
     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=stilt_house: ES:Tag:building=stilt house
     building=storage_tank: ES:Tag:building=storage tank
     building=sty: ES:Tag:building=sty
     building=supermarket: ES:Tag:building=supermarket
@@ -12658,13 +14261,47 @@ es:
     building=yes: ES:Tag:building=yes
     busway=lane: ES:Tag:busway=lane
     castle_type=manor: ES:Tag:castle type=manor
+    cemetery=cillín: ES:Tag:cemetery=cillín
     cemetery=grave: ES:Tag:cemetery=grave
     cemetery=sector: ES:Tag:cemetery=sector
+    cemetery=war_cemetery: ES:Tag:cemetery=war cemetery
     clothes=fashion: ES:Tag:clothes=fashion
+    clothes=luxury: ES:Tag:clothes=luxury
+    clothes=motorcycle: ES:Tag:clothes=motorcycle
+    clothes=sports: ES:Tag:clothes=sports
+    clothes=swimwear: ES:Tag:clothes=swimwear
+    clothes=underwear: ES:Tag:clothes=underwear
+    clothes=unisex: ES:Tag:clothes=unisex
+    clothes=wedding: ES:Tag:clothes=wedding
+    clothes=women: ES:Tag:clothes=women
+    clothes=women;men: ES:Tag:clothes=women;men
+    clothes=women;men;children: ES:Tag:clothes=women;men;children
+    club=amateur_radio: ES:Tag:club=amateur radio
+    club=automobile: ES:Tag:club=automobile
+    club=bicycle: ES:Tag:club=bicycle
+    club=cadet: ES:Tag:club=cadet
+    club=card_games: ES:Tag:club=card games
+    club=chess: ES:Tag:club=chess
+    club=fan: ES:Tag:club=fan
+    club=fishing: ES:Tag:club=fishing
+    club=freemasonry: ES:Tag:club=freemasonry
+    club=golf: ES:Tag:club=golf
+    club=linux: ES:Tag:club=linux
+    club=motorcycle: ES:Tag:club=motorcycle
+    club=music: ES:Tag:club=music
+    club=nudism: ES:Tag:club=nudism
+    club=sailing: ES:Tag:club=sailing
     club=scout: ES:Tag:club=scout
+    club=scuba_diving: ES:Tag:club=scuba diving
+    club=social: ES:Tag:club=social
     club=sport: ES:Tag:club=sport
+    club=tourism: ES:Tag:club=tourism
+    club=youth_movement: ES:Tag:club=youth movement
     company=logistics: ES:Tag:company=logistics
+    covered=yes: ES:Tag:covered=yes
     craft=agricultural_engines: ES:Tag:craft=agricultural engines
+    craft=atelier: ES:Tag:craft=atelier
+    craft=bag_repair: ES:Tag:craft=bag repair
     craft=bakery: ES:Tag:craft=bakery
     craft=basket_maker: ES:Tag:craft=basket maker
     craft=beekeeper: ES:Tag:craft=beekeeper
     craft=bookbinder: ES:Tag:craft=bookbinder
     craft=brewery: ES:Tag:craft=brewery
     craft=builder: ES:Tag:craft=builder
+    craft=cabinet_maker: ES:Tag:craft=cabinet maker
+    craft=car_painter: ES:Tag:craft=car painter
+    craft=carpenter: ES:Tag:craft=carpenter
+    craft=carpet_cleaner: ES:Tag:craft=carpet cleaner
     craft=carpet_layer: ES:Tag:craft=carpet layer
     craft=caterer: ES:Tag:craft=caterer
+    craft=cheese: ES:Tag:craft=cheese
     craft=chimney_sweeper: ES:Tag:craft=chimney sweeper
+    craft=cleaning: ES:Tag:craft=cleaning
     craft=clockmaker: ES:Tag:craft=clockmaker
     craft=confectionery: ES:Tag:craft=confectionery
+    craft=cooper: ES:Tag:craft=cooper
     craft=dental_technician: ES:Tag:craft=dental technician
     craft=distillery: ES:Tag:craft=distillery
+    craft=door_construction: ES:Tag:craft=door construction
     craft=dressmaker: ES:Tag:craft=dressmaker
     craft=electrician: ES:Tag:craft=electrician
     craft=electronics_repair: ES:Tag:craft=electronics repair
+    craft=embroiderer: ES:Tag:craft=embroiderer
     craft=engraver: ES:Tag:craft=engraver
+    craft=floorer: ES:Tag:craft=floorer
     craft=gardener: ES:Tag:craft=gardener
+    craft=glassblower: ES:Tag:craft=glassblower
     craft=glaziery: ES:Tag:craft=glaziery
+    craft=goldsmith: ES:Tag:craft=goldsmith
+    craft=grinding_mill: ES:Tag:craft=grinding mill
     craft=handicraft: ES:Tag:craft=handicraft
     craft=hvac: ES:Tag:craft=hvac
     craft=information_electronics: ES:Tag:craft=information electronics
+    craft=insulation: ES:Tag:craft=insulation
+    craft=interior_work: ES:Tag:craft=interior work
     craft=jeweller: ES:Tag:craft=jeweller
+    craft=joiner: ES:Tag:craft=joiner
+    craft=key_cutter: ES:Tag:craft=key cutter
+    craft=lapidary: ES:Tag:craft=lapidary
+    craft=leather: ES:Tag:craft=leather
+    craft=locksmith: ES:Tag:craft=locksmith
     craft=luthier: ES:Tag:craft=luthier
     craft=metal_construction: ES:Tag:craft=metal construction
+    craft=mint: ES:Tag:craft=mint
     craft=musical_instrument: ES:Tag:craft=musical instrument
     craft=oil_mill: ES:Tag:craft=oil mill
     craft=optician: ES:Tag:craft=optician
+    craft=organ_builder: ES:Tag:craft=organ builder
+    craft=painter: ES:Tag:craft=painter
+    craft=parquet_layer: ES:Tag:craft=parquet layer
+    craft=paver: ES:Tag:craft=paver
     craft=photographer: ES:Tag:craft=photographer
     craft=photographic_laboratory: ES:Tag:craft=photographic laboratory
+    craft=piano_tuner: ES:Tag:craft=piano tuner
+    craft=plasterer: ES:Tag:craft=plasterer
     craft=plumber: ES:Tag:craft=plumber
     craft=pottery: ES:Tag:craft=pottery
     craft=printer: ES:Tag:craft=printer
+    craft=printmaker: ES:Tag:craft=printmaker
     craft=restoration: ES:Tag:craft=restoration
+    craft=rigger: ES:Tag:craft=rigger
+    craft=roofer: ES:Tag:craft=roofer
+    craft=saddler: ES:Tag:craft=saddler
+    craft=sailmaker: ES:Tag:craft=sailmaker
+    craft=sawmill: ES:Tag:craft=sawmill
+    craft=scaffolder: ES:Tag:craft=scaffolder
+    craft=sculptor: ES:Tag:craft=sculptor
+    craft=sewing: ES:Tag:craft=sewing
     craft=shoemaker: ES:Tag:craft=shoemaker
+    craft=signmaker: ES:Tag:craft=signmaker
     craft=stand_builder: ES:Tag:craft=stand builder
+    craft=stonemason: ES:Tag:craft=stonemason
+    craft=stove_fitter: ES:Tag:craft=stove fitter
+    craft=sun_protection: ES:Tag:craft=sun protection
     craft=tailor: ES:Tag:craft=tailor
     craft=tiler: ES:Tag:craft=tiler
+    craft=tinsmith: ES:Tag:craft=tinsmith
+    craft=toolmaker: ES:Tag:craft=toolmaker
+    craft=turner: ES:Tag:craft=turner
     craft=upholsterer: ES:Tag:craft=upholsterer
     craft=watchmaker: ES:Tag:craft=watchmaker
+    craft=water_well_drilling: ES:Tag:craft=water well drilling
+    craft=weaver: ES:Tag:craft=weaver
     craft=welder: ES:Tag:craft=welder
+    craft=window_construction: ES:Tag:craft=window construction
     craft=winery: ES:Tag:craft=winery
+    crop=soy: ES:Tag:crop=soy
+    crop=sugarcane: ES:Tag:crop=sugarcane
     crossing=marked: ES:Tag:crossing=marked
+    crossing=no: ES:Tag:crossing=no
     crossing=traffic_signals: ES:Tag:crossing=traffic signals
     crossing=uncontrolled: ES:Tag:crossing=uncontrolled
+    crossing=unmarked: ES:Tag:crossing=unmarked
     crossing=zebra: ES:Tag:crossing=zebra
+    cuisine=american: ES:Tag:cuisine=american
+    cuisine=asian: ES:Tag:cuisine=asian
+    cuisine=bagel: ES:Tag:cuisine=bagel
+    cuisine=barbecue: ES:Tag:cuisine=barbecue
+    cuisine=brazilian: ES:Tag:cuisine=brazilian
+    cuisine=brunch: ES:Tag:cuisine=brunch
+    cuisine=bubble_tea: ES:Tag:cuisine=bubble tea
+    cuisine=burger: ES:Tag:cuisine=burger
+    cuisine=cake: ES:Tag:cuisine=cake
+    cuisine=catalan: ES:Tag:cuisine=catalan
+    cuisine=chicken: ES:Tag:cuisine=chicken
+    cuisine=chinese: ES:Tag:cuisine=chinese
+    cuisine=coffee_shop: ES:Tag:cuisine=coffee shop
+    cuisine=couscous: ES:Tag:cuisine=couscous
+    cuisine=crepe: ES:Tag:cuisine=crepe
+    cuisine=curry: ES:Tag:cuisine=curry
+    cuisine=dessert: ES:Tag:cuisine=dessert
+    cuisine=donut: ES:Tag:cuisine=donut
+    cuisine=doughnut: ES:Tag:cuisine=doughnut
+    cuisine=dumplings: ES:Tag:cuisine=dumplings
+    cuisine=empanada: ES:Tag:cuisine=empanada
+    cuisine=fish: ES:Tag:cuisine=fish
     cuisine=fish_and_chips: ES:Tag:cuisine=fish and chips
+    cuisine=french: ES:Tag:cuisine=french
+    cuisine=fried_food: ES:Tag:cuisine=fried food
+    cuisine=friture: ES:Tag:cuisine=friture
+    cuisine=german: ES:Tag:cuisine=german
+    cuisine=greek: ES:Tag:cuisine=greek
+    cuisine=grill: ES:Tag:cuisine=grill
+    cuisine=gyro: ES:Tag:cuisine=gyro
+    cuisine=hot_dog: ES:Tag:cuisine=hot dog
+    cuisine=hot_pot: ES:Tag:cuisine=hot pot
+    cuisine=ice_cream: ES:Tag:cuisine=ice cream
+    cuisine=indian: ES:Tag:cuisine=indian
+    cuisine=italian: ES:Tag:cuisine=italian
+    cuisine=japanese: ES:Tag:cuisine=japanese
+    cuisine=kebab: ES:Tag:cuisine=kebab
+    cuisine=korean: ES:Tag:cuisine=korean
+    cuisine=mediterranean: ES:Tag:cuisine=mediterranean
+    cuisine=mexican: ES:Tag:cuisine=mexican
+    cuisine=noodle: ES:Tag:cuisine=noodle
+    cuisine=pakistani: ES:Tag:cuisine=pakistani
+    cuisine=pancake: ES:Tag:cuisine=pancake
+    cuisine=pasta: ES:Tag:cuisine=pasta
+    cuisine=pie: ES:Tag:cuisine=pie
+    cuisine=pizza: ES:Tag:cuisine=pizza
+    cuisine=regional: ES:Tag:cuisine=regional
+    cuisine=sandwich: ES:Tag:cuisine=sandwich
+    cuisine=seafood: ES:Tag:cuisine=seafood
+    cuisine=soup: ES:Tag:cuisine=soup
+    cuisine=spanish: ES:Tag:cuisine=spanish
+    cuisine=steak_house: ES:Tag:cuisine=steak house
+    cuisine=strudel: ES:Tag:cuisine=strudel
+    cuisine=sushi: ES:Tag:cuisine=sushi
+    cuisine=tapas: ES:Tag:cuisine=tapas
+    cuisine=tea_shop: ES:Tag:cuisine=tea shop
+    cuisine=teahouse: ES:Tag:cuisine=teahouse
+    cuisine=thai: ES:Tag:cuisine=thai
+    cuisine=turkish: ES:Tag:cuisine=turkish
+    cuisine=vietnamese: ES:Tag:cuisine=vietnamese
+    cuisine=waffle: ES:Tag:cuisine=waffle
+    cuisine=wings: ES:Tag:cuisine=wings
+    cutting=yes: ES:Tag:cutting=yes
     cycleway:both=lane: ES:Tag:cycleway:both=lane
     cycleway:both=no: ES:Tag:cycleway:both=no
+    cycleway:left=lane: ES:Tag:cycleway:left=lane
+    cycleway:left=share_busway: ES:Tag:cycleway:left=share busway
+    cycleway:left=shared_busway: ES:Tag:cycleway:left=shared busway
+    cycleway:left=shared_lane: ES:Tag:cycleway:left=shared lane
     cycleway:left=track: ES:Tag:cycleway:left=track
     cycleway:right=lane: ES:Tag:cycleway:right=lane
+    cycleway:right=share_busway: ES:Tag:cycleway:right=share busway
+    cycleway:right=shared_lane: ES:Tag:cycleway:right=shared lane
     cycleway:right=track: ES:Tag:cycleway:right=track
+    cycleway=asl: ES:Tag:cycleway=asl
     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_share_busway: ES:Tag:cycleway=opposite share busway
     cycleway=opposite_track: ES:Tag:cycleway=opposite track
     cycleway=separate: ES:Tag:cycleway=separate
     cycleway=share_busway: ES:Tag:cycleway=share busway
+    cycleway=shared: ES:Tag:cycleway=shared
+    cycleway=shared_lane: ES:Tag:cycleway=shared lane
+    cycleway=shared_line: ES:Tag:cycleway=shared line
     cycleway=track: ES:Tag:cycleway=track
     denomination=mormon: ES:Tag:denomination=mormon
+    designation=byway_open_to_all_traffic: ES:Tag:designation=byway open to all traffic
+    designation=civil_parish: ES:Tag:designation=civil parish
+    designation=common: ES:Tag:designation=common
+    designation=core_path: ES:Tag:designation=core path
+    designation=public_bridleway: ES:Tag:designation=public bridleway
+    designation=public_footpath: ES:Tag:designation=public footpath
+    designation=restricted_byway: ES:Tag:designation=restricted byway
     disused=yes: ES:Tag:disused=yes
+    embankment=yes: ES:Tag:embankment=yes
+    emergency=access_point: ES:Tag:emergency=access point
     emergency=ambulance_station: ES:Tag:emergency=ambulance station
+    emergency=assembly_point: ES:Tag:emergency=assembly point
     emergency=defibrillator: ES:Tag:emergency=defibrillator
+    emergency=drinking_water: ES:Tag:emergency=drinking water
     emergency=dry_riser: ES:Tag:emergency=dry riser
+    emergency=dry_riser_inlet: ES:Tag:emergency=dry riser inlet
     emergency=emergency_ward_entrance: ES:Tag:emergency=emergency ward entrance
+    emergency=fire_alarm_box: ES:Tag:emergency=fire alarm box
     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=fire_lookout: ES:Tag:emergency=fire lookout
+    emergency=fire_water_pond: ES:Tag:emergency=fire water pond
+    emergency=first_aid: ES:Tag:emergency=first aid
+    emergency=first_aid_kit: ES:Tag:emergency=first aid kit
     emergency=landing_site: ES:Tag:emergency=landing site
+    emergency=life_ring: ES:Tag:emergency=life ring
+    emergency=lifeboat_station: ES:Tag:emergency=lifeboat station
     emergency=lifeguard: ES:Tag:emergency=lifeguard
+    emergency=lifeguard_place: ES:Tag:emergency=lifeguard place
     emergency=lifeguard_tower: ES:Tag:emergency=lifeguard tower
+    emergency=marine_refuge: ES:Tag:emergency=marine refuge
+    emergency=marine_rescue: ES:Tag:emergency=marine rescue
+    emergency=mountain_rescue: ES:Tag:emergency=mountain rescue
     emergency=phone: ES:Tag:emergency=phone
     emergency=ses_station: ES:Tag:emergency=ses station
+    emergency=shower: ES:Tag:emergency=shower
+    emergency=siamese: ES:Tag:emergency=siamese
+    emergency=siren: ES:Tag:emergency=siren
+    emergency=slipway: ES:Tag:emergency=slipway
+    emergency=sprinkler_connection: ES:Tag:emergency=sprinkler connection
+    emergency=standpipe: ES:Tag:emergency=standpipe
+    emergency=suction_point: ES:Tag:emergency=suction point
+    emergency=water_tank: ES:Tag:emergency=water tank
     emergency=yes: ES:Tag:emergency=yes
+    fence_type=barbed_wire: ES:Tag:fence type=barbed wire
+    fence_type=bars: ES:Tag:fence type=bars
+    fence_type=chain_link: ES:Tag:fence type=chain link
+    fence_type=concrete: ES:Tag:fence type=concrete
+    fence_type=corrugated_metal: ES:Tag:fence type=corrugated metal
+    fence_type=electric: ES:Tag:fence type=electric
+    fence_type=metal: ES:Tag:fence type=metal
+    fence_type=pole: ES:Tag:fence type=pole
+    fence_type=railing: ES:Tag:fence type=railing
+    fence_type=roundpole: ES:Tag:fence type=roundpole
+    fence_type=split_rail: ES:Tag:fence type=split rail
+    fence_type=wire: ES:Tag:fence type=wire
+    fence_type=wood: ES:Tag:fence type=wood
+    flood_mark=painting: ES:Tag:flood mark=painting
+    flood_mark=plaque: ES:Tag:flood mark=plaque
     flow_direction=both: ES:Tag:flow direction=both
     foot=use_sidepath: ES:Tag:foot=use sidepath
+    foot=yes: ES:Tag:foot=yes
     footway=access_aisle: ES:Tag:footway=access aisle
     footway=crossing: ES:Tag:footway=crossing
     footway=sidewalk: ES:Tag:footway=sidewalk
@@ -12763,9 +14570,14 @@ es:
       panel
     generator:type=solar_thermal_collector: ES:Tag:generator:type=solar thermal collector
     generator:type=vertical_axis: ES:Tag:generator:type=vertical axis
+    geological=columnar_jointing: ES:Tag:geological=columnar jointing
+    geological=fault: ES:Tag:geological=fault
     geological=moraine: ES:Tag:geological=moraine
     geological=outcrop: ES:Tag:geological=outcrop
     geological=palaeontological_site: ES:Tag:geological=palaeontological site
+    geological=volcanic_caldera_rim: ES:Tag:geological=volcanic caldera rim
+    geological=volcanic_lava_field: ES:Tag:geological=volcanic lava field
+    geological=volcanic_vent: ES:Tag:geological=volcanic vent
     golf=bunker: ES:Tag:golf=bunker
     golf=clubhouse: ES:Tag:golf=clubhouse
     golf=driving_range: ES:Tag:golf=driving range
@@ -12791,6 +14603,7 @@ es:
     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=bump: ES:Tag:hazard=bump
     hazard=contamination: ES:Tag:hazard=contamination
     hazard=cyclists: ES:Tag:hazard=cyclists
     hazard=dangerous_junction: ES:Tag:hazard=dangerous junction
@@ -12798,20 +14611,43 @@ es:
     hazard=queues_likely: ES:Tag:hazard=queues likely
     hazard=slippery: ES:Tag:hazard=slippery
     healthcare:speciality=vaccination: ES:Tag:healthcare:speciality=vaccination
+    healthcare=alternative: ES:Tag:healthcare=alternative
+    healthcare=audiologist: ES:Tag:healthcare=audiologist
     healthcare=birthing_center: ES:Tag:healthcare=birthing center
+    healthcare=birthing_centre: ES:Tag:healthcare=birthing centre
+    healthcare=blood_bank: ES:Tag:healthcare=blood bank
+    healthcare=blood_donation: ES:Tag:healthcare=blood donation
+    healthcare=centre: ES:Tag:healthcare=centre
     healthcare=clinic: ES:Tag:healthcare=clinic
+    healthcare=community_health_worker: ES:Tag:healthcare=community health worker
+    healthcare=counselling: ES:Tag:healthcare=counselling
     healthcare=dentist: ES:Tag:healthcare=dentist
+    healthcare=dialysis: ES:Tag:healthcare=dialysis
     healthcare=doctor: ES:Tag:healthcare=doctor
+    healthcare=hospice: ES:Tag:healthcare=hospice
     healthcare=hospital: ES:Tag:healthcare=hospital
     healthcare=laboratory: ES:Tag:healthcare=laboratory
     healthcare=midwife: ES:Tag:healthcare=midwife
+    healthcare=nurse: ES:Tag:healthcare=nurse
+    healthcare=nutrition_counselling: ES:Tag:healthcare=nutrition counselling
+    healthcare=occupational_therapist: ES:Tag:healthcare=occupational therapist
+    healthcare=optometrist: ES:Tag:healthcare=optometrist
+    healthcare=pharmacy: ES:Tag:healthcare=pharmacy
+    healthcare=physiotherapist: ES:Tag:healthcare=physiotherapist
     healthcare=podiatrist: ES:Tag:healthcare=podiatrist
+    healthcare=postpartum_care: ES:Tag:healthcare=postpartum care
+    healthcare=psychotherapist: ES:Tag:healthcare=psychotherapist
+    healthcare=rehabilitation: ES:Tag:healthcare=rehabilitation
+    healthcare=sample_collection: ES:Tag:healthcare=sample collection
+    healthcare=speech_therapist: ES:Tag:healthcare=speech therapist
     healthcare=vaccination_centre: ES:Tag:healthcare=vaccination centre
+    healthcare=yes: ES:Tag:healthcare=yes
+    hedge=hedge_bank: ES:Tag:hedge=hedge bank
     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=construction: ES:Tag:highway=construction
     highway=corridor: ES:Tag:highway=corridor
     highway=crossing: ES:Tag:highway=crossing
     highway=cycleway: ES:Tag:highway=cycleway
@@ -12820,6 +14656,7 @@ es:
     highway=emergency_bay: ES:Tag:highway=emergency bay
     highway=escape: ES:Tag:highway=escape
     highway=footway: ES:Tag:highway=footway
+    highway=give_way: ES:Tag:highway=give way
     highway=living_street: ES:Tag:highway=living street
     highway=milestone: ES:Tag:highway=milestone
     highway=mini_roundabout: ES:Tag:highway=mini roundabout
@@ -12841,6 +14678,7 @@ es:
     highway=secondary: ES:Tag:highway=secondary
     highway=secondary_link: ES:Tag:highway=secondary link
     highway=service: ES:Tag:highway=service
+    highway=services: ES:Tag:highway=services
     highway=speed_camera: ES:Tag:highway=speed camera
     highway=speed_display: ES:Tag:highway=speed display
     highway=steps: ES:Tag:highway=steps
@@ -12848,7 +14686,9 @@ es:
     highway=street_lamp: ES:Tag:highway=street lamp
     highway=tertiary: ES:Tag:highway=tertiary
     highway=tertiary_link: ES:Tag:highway=tertiary link
+    highway=toll_gantry: ES:Tag:highway=toll gantry
     highway=track: ES:Tag:highway=track
+    highway=traffic_mirror: ES:Tag:highway=traffic mirror
     highway=traffic_signals: ES:Tag:highway=traffic signals
     highway=trailhead: ES:Tag:highway=trailhead
     highway=trunk: ES:Tag:highway=trunk
@@ -12856,33 +14696,74 @@ es:
     highway=turning_circle: ES:Tag:highway=turning circle
     highway=turning_loop: ES:Tag:highway=turning loop
     highway=unclassified: ES:Tag:highway=unclassified
+    historic=aircraft: ES:Tag:historic=aircraft
     historic=aqueduct: ES:Tag:historic=aqueduct
     historic=archaeological_site: ES:Tag:historic=archaeological site
+    historic=battlefield: ES:Tag:historic=battlefield
+    historic=bomb_crater: ES:Tag:historic=bomb crater
     historic=boundary_stone: ES:Tag:historic=boundary stone
+    historic=building: ES:Tag:historic=building
+    historic=cannon: ES:Tag:historic=cannon
     historic=castle: ES:Tag:historic=castle
+    historic=castle_wall: ES:Tag:historic=castle wall
     historic=cemetery: ES:Tag:historic=cemetery
+    historic=charcoal_pile: ES:Tag:historic=charcoal pile
+    historic=church: ES:Tag:historic=church
+    historic=city_gate: ES:Tag:historic=city gate
+    historic=citywalls: ES:Tag:historic=citywalls
+    historic=creamery: ES:Tag:historic=creamery
     historic=district: ES:Tag:historic=district
     historic=farm: ES:Tag:historic=farm
+    historic=flood_mark: ES:Tag:historic=flood mark
     historic=fort: ES:Tag:historic=fort
+    historic=gallows: ES:Tag:historic=gallows
     historic=heritage: ES:Tag:historic=heritage
+    historic=highwater_mark: ES:Tag:historic=highwater mark
+    historic=locomotive: ES:Tag:historic=locomotive
     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=mine_shaft: ES:Tag:historic=mine shaft
     historic=monastery: ES:Tag:historic=monastery
     historic=monument: ES:Tag:historic=monument
+    historic=optical_telegraph: ES:Tag:historic=optical telegraph
+    historic=pa: ES:Tag:historic=pa
     historic=pillory: ES:Tag:historic=pillory
+    historic=railway_car: ES:Tag:historic=railway car
     historic=ruins: ES:Tag:historic=ruins
+    historic=rune_stone: ES:Tag:historic=rune stone
+    historic=ship: ES:Tag:historic=ship
+    historic=stone: ES:Tag:historic=stone
+    historic=tank: ES:Tag:historic=tank
     historic=tomb: ES:Tag:historic=tomb
+    historic=tower: ES:Tag:historic=tower
+    historic=vehicle: ES:Tag:historic=vehicle
     historic=wayside_cross: ES:Tag:historic=wayside cross
     historic=wayside_shrine: ES:Tag:historic=wayside shrine
     historic=wreck: ES:Tag:historic=wreck
+    historic=yes: ES:Tag:historic=yes
+    ice_road=yes: ES:Tag:ice road=yes
+    indoor=yes: ES:Tag:indoor=yes
     industrial=auto_wrecker: ES:Tag:industrial=auto wrecker
+    industrial=bakery: ES:Tag:industrial=bakery
+    industrial=brickyard: ES:Tag:industrial=brickyard
     industrial=depot: ES:Tag:industrial=depot
+    industrial=distributor: ES:Tag:industrial=distributor
     industrial=factory: ES:Tag:industrial=factory
+    industrial=grinding_mill: ES:Tag:industrial=grinding mill
+    industrial=heating_station: ES:Tag:industrial=heating station
     industrial=mine: ES:Tag:industrial=mine
+    industrial=oil: ES:Tag:industrial=oil
+    industrial=port: ES:Tag:industrial=port
+    industrial=salt_pond: ES:Tag:industrial=salt pond
+    industrial=sawmill: ES:Tag:industrial=sawmill
     industrial=scrap_yard: ES:Tag:industrial=scrap yard
+    industrial=shipyard: ES:Tag:industrial=shipyard
+    industrial=slaughterhouse: ES:Tag:industrial=slaughterhouse
     industrial=warehouse: ES:Tag:industrial=warehouse
+    industrial=well_cluster: ES:Tag:industrial=well cluster
+    industrial=wellsite: ES:Tag:industrial=wellsite
     information=board: ES:Tag:information=board
     information=guidepost: ES:Tag:information=guidepost
     information=map: ES:Tag:information=map
@@ -12898,12 +14779,14 @@ es:
     landcover=grass: ES:Tag:landcover=grass
     landcover=trees: ES:Tag:landcover=trees
     landuse=allotments: ES:Tag:landuse=allotments
+    landuse=animal_keeping: ES:Tag:landuse=animal keeping
     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=conservation: ES:Tag:landuse=conservation
     landuse=construction: ES:Tag:landuse=construction
     landuse=depot: ES:Tag:landuse=depot
     landuse=education: ES:Tag:landuse=education
@@ -12911,26 +14794,37 @@ es:
     landuse=farmyard: ES:Tag:landuse=farmyard
     landuse=flowerbed: ES:Tag:landuse=flowerbed
     landuse=forest: ES:Tag:landuse=forest
+    landuse=forestry: ES:Tag:landuse=forestry
     landuse=garages: ES:Tag:landuse=garages
     landuse=grass: ES:Tag:landuse=grass
+    landuse=greenery: ES:Tag:landuse=greenery
     landuse=greenfield: ES:Tag:landuse=greenfield
     landuse=greenhouse_horticulture: ES:Tag:landuse=greenhouse horticulture
+    landuse=harbour: ES:Tag:landuse=harbour
+    landuse=highway: ES:Tag:landuse=highway
     landuse=industrial: ES:Tag:landuse=industrial
     landuse=landfill: ES:Tag:landuse=landfill
+    landuse=logging: ES:Tag:landuse=logging
     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=peat_cutting: ES:Tag:landuse=peat cutting
     landuse=plant_nursery: ES:Tag:landuse=plant nursery
+    landuse=port: ES:Tag:landuse=port
     landuse=quarry: ES:Tag:landuse=quarry
+    landuse=railway: ES:Tag:landuse=railway
     landuse=recreation_ground: ES:Tag:landuse=recreation ground
+    landuse=religious: ES:Tag:landuse=religious
     landuse=reservoir: ES:Tag:landuse=reservoir
+    landuse=reservoir_watershed: ES:Tag:landuse=reservoir watershed
     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
+    landuse=winter_sports: ES:Tag:landuse=winter sports
     leaf_cycle=deciduous: ES:Tag:leaf cycle=deciduous
     leaf_cycle=evergreen: ES:Tag:leaf cycle=evergreen
     leaf_cycle=mixed: ES:Tag:leaf cycle=mixed
@@ -12944,6 +14838,7 @@ es:
     leisure=amusement_arcade: ES:Tag:leisure=amusement arcade
     leisure=bandstand: ES:Tag:leisure=bandstand
     leisure=barefoot: ES:Tag:leisure=barefoot
+    leisure=beach_resort: ES:Tag:leisure=beach resort
     leisure=bird_hide: ES:Tag:leisure=bird hide
     leisure=bleachers: ES:Tag:leisure=bleachers
     leisure=bowling_alley: ES:Tag:leisure=bowling alley
@@ -12976,43 +14871,71 @@ es:
     leisure=sports_centre: ES:Tag:leisure=sports centre
     leisure=sports_hall: ES:Tag:leisure=sports hall
     leisure=stadium: ES:Tag:leisure=stadium
+    leisure=summer_camp: ES:Tag:leisure=summer camp
     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=trampoline_park: ES:Tag:leisure=trampoline park
     leisure=water_park: ES:Tag:leisure=water park
     leisure=wildlife_hide: ES:Tag:leisure=wildlife hide
     lifeguard=tower: ES:Tag:lifeguard=tower
+    line=bay: ES:Tag:line=bay
+    line=busbar: ES:Tag:line=busbar
+    location=outdoor: ES:Tag:location=outdoor
+    lock=yes: ES:Tag:lock=yes
     man_made=adit: ES:Tag:man made=adit
     man_made=archimedes_screw: ES:Tag:man made=archimedes screw
+    man_made=beacon: ES:Tag:man made=beacon
     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=bunker_silo: ES:Tag:man made=bunker silo
+    man_made=carpet_hanger: ES:Tag:man made=carpet hanger
     man_made=chimney: ES:Tag:man made=chimney
     man_made=clearcut: ES:Tag:man made=clearcut
+    man_made=column: ES:Tag:man made=column
+    man_made=communications_tower: ES:Tag:man made=communications tower
     man_made=compass_rose: ES:Tag:man made=compass rose
+    man_made=crane: ES:Tag:man made=crane
     man_made=cross: ES:Tag:man made=cross
     man_made=cutline: ES:Tag:man made=cutline
+    man_made=dovecote: ES:Tag:man made=dovecote
     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=gasometer: ES:Tag:man made=gasometer
     man_made=geoglyph: ES:Tag:man made=geoglyph
+    man_made=goods_conveyor: ES:Tag:man made=goods conveyor
+    man_made=groyne: ES:Tag:man made=groyne
+    man_made=guard_stone: ES:Tag:man made=guard stone
+    man_made=kiln: ES:Tag:man made=kiln
+    man_made=lighthouse: ES:Tag:man made=lighthouse
     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=obelisk: ES:Tag:man made=obelisk
     man_made=observatory: ES:Tag:man made=observatory
+    man_made=offshore_platform: ES:Tag:man made=offshore platform
+    man_made=petroleum_well: ES:Tag:man made=petroleum well
     man_made=pier: ES:Tag:man made=pier
+    man_made=pipeline: ES:Tag:man made=pipeline
     man_made=planter: ES:Tag:man made=planter
     man_made=power_wind: ES:Tag:man made=power wind
+    man_made=pump: ES:Tag:man made=pump
     man_made=pumping_rig: ES:Tag:man made=pumping rig
     man_made=pumping_station: ES:Tag:man made=pumping station
     man_made=reservoir_covered: ES:Tag:man made=reservoir covered
+    man_made=silo: ES:Tag:man made=silo
+    man_made=snow_fence: ES:Tag:man made=snow fence
+    man_made=snow_net: ES:Tag:man made=snow net
     man_made=storage_tank: ES:Tag:man made=storage tank
     man_made=street_cabinet: ES:Tag:man made=street cabinet
+    man_made=stupa: ES:Tag:man made=stupa
     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
@@ -13020,6 +14943,7 @@ es:
     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=video_wall: ES:Tag:man made=video wall
     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
@@ -13028,52 +14952,91 @@ es:
     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=windmill: ES:Tag:man made=windmill
     man_made=windpump: ES:Tag:man made=windpump
     man_made=works: ES:Tag:man made=works
+    man_made=yes: ES:Tag:man made=yes
     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=cenotaph: ES:Tag:memorial=cenotaph
     memorial=cross: ES:Tag:memorial=cross
+    memorial=flood_mark: ES:Tag:memorial=flood mark
     memorial=ghost_bike: ES:Tag:memorial=ghost bike
     memorial=obelisk: ES:Tag:memorial=obelisk
     memorial=plaque: ES:Tag:memorial=plaque
+    memorial=sculpture: ES:Tag:memorial=sculpture
     memorial=statue: ES:Tag:memorial=statue
     memorial=stele: ES:Tag:memorial=stele
     memorial=stolperstein: ES:Tag:memorial=stolperstein
     memorial=stone: ES:Tag:memorial=stone
     memorial=war_memorial: ES:Tag:memorial=war memorial
+    military=airfield: ES:Tag:military=airfield
     military=barracks: ES:Tag:military=barracks
     military=base: ES:Tag:military=base
+    military=bunker: ES:Tag:military=bunker
+    military=checkpoint: ES:Tag:military=checkpoint
+    military=danger_area: ES:Tag:military=danger area
     military=naval_base: ES:Tag:military=naval base
+    military=nuclear_explosion_site: ES:Tag:military=nuclear explosion site
+    military=obstacle_course: ES:Tag:military=obstacle course
+    military=office: ES:Tag:military=office
+    military=range: ES:Tag:military=range
     military=training_area: ES:Tag:military=training area
+    military=trench: ES:Tag:military=trench
+    mooring=guest: ES:Tag:mooring=guest
+    mountain_pass=yes: ES:Tag:mountain pass=yes
     name=Dollarama: ES:Tag:name=Dollarama
     name=Herfy: ES:Tag:name=Herfy
+    narrow=yes: ES:Tag:narrow=yes
+    natural=anthill: ES:Tag:natural=anthill
+    natural=arch: ES:Tag:natural=arch
     natural=arete: ES:Tag:natural=arete
+    natural=atoll: ES:Tag:natural=atoll
     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=birds_nest: ES:Tag:natural=birds nest
     natural=blowhole: ES:Tag:natural=blowhole
+    natural=cape: ES:Tag:natural=cape
     natural=cave_entrance: ES:Tag:natural=cave entrance
     natural=cliff: ES:Tag:natural=cliff
     natural=coastline: ES:Tag:natural=coastline
+    natural=col: ES:Tag:natural=col
+    natural=couloir: ES:Tag:natural=couloir
+    natural=crevasse: ES:Tag:natural=crevasse
     natural=desert: ES:Tag:natural=desert
+    natural=dune: ES:Tag:natural=dune
     natural=earth_bank: ES:Tag:natural=earth bank
     natural=esker: ES:Tag:natural=esker
     natural=fell: ES:Tag:natural=fell
+    natural=fumarole: ES:Tag:natural=fumarole
+    natural=geothermal: ES:Tag:natural=geothermal
+    natural=geothermal_area: ES:Tag:natural=geothermal area
+    natural=geothermal_field: ES:Tag:natural=geothermal field
     natural=geyser: ES:Tag:natural=geyser
     natural=glacier: ES:Tag:natural=glacier
     natural=gorge: ES:Tag:natural=gorge
+    natural=grass: ES:Tag:natural=grass
     natural=grassland: ES:Tag:natural=grassland
+    natural=gully: ES:Tag:natural=gully
     natural=heath: ES:Tag:natural=heath
     natural=hill: ES:Tag:natural=hill
+    natural=hot_spring: ES:Tag:natural=hot spring
+    natural=isthmus: ES:Tag:natural=isthmus
+    natural=landform: ES:Tag:natural=landform
+    natural=landslide: ES:Tag:natural=landslide
     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=peninsula: ES:Tag:natural=peninsula
+    natural=plant: ES:Tag:natural=plant
+    natural=reef: ES:Tag:natural=reef
     natural=ridge: ES:Tag:natural=ridge
     natural=riverbed: ES:Tag:natural=riverbed
     natural=rock: ES:Tag:natural=rock
@@ -13084,14 +15047,19 @@ es:
     natural=shingle: ES:Tag:natural=shingle
     natural=shoal: ES:Tag:natural=shoal
     natural=shrub: ES:Tag:natural=shrub
+    natural=shrubbery: ES:Tag:natural=shrubbery
     natural=sinkhole: ES:Tag:natural=sinkhole
     natural=spring: ES:Tag:natural=spring
     natural=stone: ES:Tag:natural=stone
+    natural=strait: ES:Tag:natural=strait
+    natural=termite_mound: ES:Tag:natural=termite mound
     natural=tree: ES:Tag:natural=tree
     natural=tree_row: ES:Tag:natural=tree row
     natural=tree_stump: ES:Tag:natural=tree stump
+    natural=tundra: ES:Tag:natural=tundra
     natural=valley: ES:Tag:natural=valley
     natural=volcano: ES:Tag:natural=volcano
+    natural=wallow: ES:Tag:natural=wallow
     natural=water: ES:Tag:natural=water
     natural=wetland: ES:Tag:natural=wetland
     natural=wood: ES:Tag:natural=wood
@@ -13106,19 +15074,26 @@ es:
     office=advertising_agency: ES:Tag:office=advertising agency
     office=architect: ES:Tag:office=architect
     office=association: ES:Tag:office=association
+    office=chamber: ES:Tag:office=chamber
     office=charity: ES:Tag:office=charity
     office=company: ES:Tag:office=company
+    office=construction_company: ES:Tag:office=construction company
     office=consulting: ES:Tag:office=consulting
+    office=courier: ES:Tag:office=courier
     office=coworking: ES:Tag:office=coworking
+    office=diplomatic: ES:Tag:office=diplomatic
     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=financial_advisor: ES:Tag:office=financial advisor
     office=forestry: ES:Tag:office=forestry
     office=foundation: ES:Tag:office=foundation
+    office=geodesist: ES:Tag:office=geodesist
     office=government: ES:Tag:office=government
+    office=graphic_design: ES:Tag:office=graphic design
     office=guide: ES:Tag:office=guide
     office=insurance: ES:Tag:office=insurance
     office=it: ES:Tag:office=it
@@ -13131,11 +15106,14 @@ es:
     office=occupational_safety: ES:Tag:office=occupational safety
     office=parish: ES:Tag:office=parish
     office=political_party: ES:Tag:office=political party
+    office=politician: ES:Tag:office=politician
     office=private_investigator: ES:Tag:office=private investigator
     office=property_management: ES:Tag:office=property management
+    office=publisher: ES:Tag:office=publisher
     office=quango: ES:Tag:office=quango
     office=religion: ES:Tag:office=religion
     office=research: ES:Tag:office=research
+    office=security: ES:Tag:office=security
     office=surveyor: ES:Tag:office=surveyor
     office=tax: ES:Tag:office=tax
     office=tax_advisor: ES:Tag:office=tax advisor
@@ -13147,13 +15125,17 @@ es:
     office=water_utility: ES:Tag:office=water utility
     office=yes: ES:Tag:office=yes
     oneway:bicycle=yes: ES:Tag:oneway:bicycle=yes
+    oneway=-1: ES:Tag:oneway=-1
     oneway=reversible: ES:Tag:oneway=reversible
+    opening_hours=24/7: ES:Tag:opening hours=24/7
     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=surface: ES:Tag:parking=surface
     parking=underground: ES:Tag:parking=underground
     passenger=yes: ES:Tag:passenger=yes
+    passing_places=yes: ES:Tag:passing places=yes
     place=allotments: ES:Tag:place=allotments
     place=archipelago: ES:Tag:place=archipelago
     place=borough: ES:Tag:place=borough
@@ -13196,14 +15178,36 @@ es:
     police=storage: ES:Tag:police=storage
     police=training_area: ES:Tag:police=training area
     police=yes: ES:Tag:police=yes
+    power=cable: ES:Tag:power=cable
+    power=catenary_mast: ES:Tag:power=catenary mast
+    power=compensator: ES:Tag:power=compensator
+    power=connection: ES:Tag:power=connection
+    power=converter: ES:Tag:power=converter
     power=generator: ES:Tag:power=generator
     power=heliostat: ES:Tag:power=heliostat
+    power=insulator: ES:Tag:power=insulator
     power=line: ES:Tag:power=line
+    power=minor_line: ES:Tag:power=minor line
     power=plant: ES:Tag:power=plant
     power=pole: ES:Tag:power=pole
+    power=portal: ES:Tag:power=portal
     power=substation: ES:Tag:power=substation
+    power=switch: ES:Tag:power=switch
+    power=switchgear: ES:Tag:power=switchgear
+    power=terminal: ES:Tag:power=terminal
     power=tower: ES:Tag:power=tower
     power=transformer: ES:Tag:power=transformer
+    protect_class=11: ES:Tag:protect class=11
+    protect_class=13: ES:Tag:protect class=13
+    protect_class=19: ES:Tag:protect class=19
+    protect_class=1a: ES:Tag:protect class=1a
+    protect_class=1b: ES:Tag:protect class=1b
+    protect_class=2: ES:Tag:protect class=2
+    protect_class=21: ES:Tag:protect class=21
+    protect_class=3: ES:Tag:protect class=3
+    protect_class=4: ES:Tag:protect class=4
+    protect_class=5: ES:Tag:protect class=5
+    protect_class=6: ES:Tag:protect class=6
     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
@@ -13211,33 +15215,70 @@ es:
     pump=manual: ES:Tag:pump=manual
     pump=no: ES:Tag:pump=no
     pump=powered: ES:Tag:pump=powered
+    railway=abandoned: ES:Tag:railway=abandoned
+    railway=buffer_stop: ES:Tag:railway=buffer stop
+    railway=construction: ES:Tag:railway=construction
     railway=crossing: ES:Tag:railway=crossing
+    railway=crossing_box: ES:Tag:railway=crossing box
+    railway=derail: ES:Tag:railway=derail
     railway=disused: ES:Tag:railway=disused
+    railway=funicular: ES:Tag:railway=funicular
+    railway=halt: ES:Tag:railway=halt
     railway=level_crossing: ES:Tag:railway=level crossing
     railway=light_rail: ES:Tag:railway=light rail
     railway=milestone: ES:Tag:railway=milestone
+    railway=miniature: ES:Tag:railway=miniature
     railway=monorail: ES:Tag:railway=monorail
     railway=narrow_gauge: ES:Tag:railway=narrow gauge
     railway=platform: ES:Tag:railway=platform
+    railway=preserved: ES:Tag:railway=preserved
     railway=rail: ES:Tag:railway=rail
+    railway=railway_crossing: ES:Tag:railway=railway crossing
+    railway=roundhouse: ES:Tag:railway=roundhouse
+    railway=signal: ES:Tag:railway=signal
+    railway=signal_box: ES:Tag:railway=signal box
     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=switch: ES:Tag:railway=switch
     railway=tram: ES:Tag:railway=tram
+    railway=tram_level_crossing: ES:Tag:railway=tram level crossing
     railway=tram_stop: ES:Tag:railway=tram stop
+    railway=traverser: ES:Tag:railway=traverser
+    railway=turntable: ES:Tag:railway=turntable
+    railway=wash: ES:Tag:railway=wash
+    railway=water_crane: ES:Tag:railway=water crane
     railway=yard: ES:Tag:railway=yard
     recycling_type=centre: ES:Tag:recycling type=centre
     religion=christian: ES:Tag:religion=christian
+    residential=apartments: ES:Tag:residential=apartments
+    residential=halting_site: ES:Tag:residential=halting site
+    residential=rural: ES:Tag:residential=rural
+    residential=trailer_park: ES:Tag:residential=trailer park
     residential=university: ES:Tag:residential=university
+    residential=urban: ES:Tag:residential=urban
+    resource=aggregate: ES:Tag:resource=aggregate
+    resource=gravel: ES:Tag:resource=gravel
+    resource=sand: ES:Tag:resource=sand
     roller_coaster=track: ES:Tag:roller coaster=track
+    route=bicycle: ES:Tag:route=bicycle
     route=bus: ES:Tag:route=bus
+    route=canoe: ES:Tag:route=canoe
+    route=detour: ES:Tag:route=detour
     route=ferry: ES:Tag:route=ferry
+    route=foot: ES:Tag:route=foot
     route=hiking: ES:Tag:route=hiking
+    route=horse: ES:Tag:route=horse
+    route=inline_skates: ES:Tag:route=inline skates
     route=light_rail: ES:Tag:route=light rail
     route=monorail: ES:Tag:route=monorail
+    route=mtb: ES:Tag:route=mtb
+    route=piste: ES:Tag:route=piste
     route=railway: ES:Tag:route=railway
     route=road: ES:Tag:route=road
+    route=running: ES:Tag:route=running
+    route=ski: ES:Tag:route=ski
     route=subway: ES:Tag:route=subway
     route=train: ES:Tag:route=train
     route=tram: ES:Tag:route=tram
     service=emergency_access: ES:Tag:service=emergency access
     service=parking_aisle: ES:Tag:service=parking aisle
     service=siding: ES:Tag:service=siding
+    service=spur: ES:Tag:service=spur
+    service=yard: ES:Tag:service=yard
+    shelter_type=Wetterpilz: ES:Tag:shelter type=Wetterpilz
     shelter_type=basic_hut: ES:Tag:shelter type=basic hut
+    shelter_type=changing_rooms: ES:Tag:shelter type=changing rooms
+    shelter_type=field_shelter: ES:Tag:shelter type=field shelter
+    shelter_type=gazebo: ES:Tag:shelter type=gazebo
     shelter_type=lean_to: ES:Tag:shelter type=lean to
+    shelter_type=pavilion: ES:Tag:shelter type=pavilion
     shelter_type=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=antiques: ES:Tag:shop=antiques
     shop=appliance: ES:Tag:shop=appliance
     shop=art: ES:Tag:shop=art
+    shop=atv: ES:Tag:shop=atv
     shop=baby_goods: ES:Tag:shop=baby goods
+    shop=bag: ES:Tag:shop=bag
     shop=bakery: ES:Tag:shop=bakery
     shop=bathroom_furnishing: ES:Tag:shop=bathroom furnishing
+    shop=bbq: ES:Tag:shop=bbq
     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=boat: ES:Tag:shop=boat
+    shop=boat_parts: ES:Tag:shop=boat parts
+    shop=boat_repair: ES:Tag:shop=boat repair
     shop=bookmaker: ES:Tag:shop=bookmaker
     shop=books: ES:Tag:shop=books
+    shop=boutique: ES:Tag:shop=boutique
+    shop=brewing_supplies: ES:Tag:shop=brewing supplies
     shop=butcher: ES:Tag:shop=butcher
+    shop=camera: ES:Tag:shop=camera
+    shop=candles: ES:Tag:shop=candles
     shop=cannabis: ES:Tag:shop=cannabis
+    shop=canoe_hire: ES:Tag:shop=canoe hire
     shop=car: ES:Tag:shop=car
     shop=car_parts: ES:Tag:shop=car parts
     shop=car_repair: ES:Tag:shop=car repair
+    shop=caravan: ES:Tag:shop=caravan
     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=coffee: ES:Tag:shop=coffee
     shop=collector: ES:Tag:shop=collector
     shop=computer: ES:Tag:shop=computer
     shop=confectionery: ES:Tag:shop=confectionery
     shop=convenience: ES:Tag:shop=convenience
     shop=copyshop: ES:Tag:shop=copyshop
+    shop=cosmetics: ES:Tag:shop=cosmetics
+    shop=country_store: ES:Tag:shop=country store
     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=dentures: ES:Tag:shop=dentures
     shop=department_store: ES:Tag:shop=department store
     shop=doityourself: ES:Tag:shop=doityourself
+    shop=doors: ES:Tag:shop=doors
     shop=dry_cleaning: ES:Tag:shop=dry cleaning
+    shop=e-cigarette: ES:Tag:shop=e-cigarette
     shop=electrical: ES:Tag:shop=electrical
     shop=electronics: ES:Tag:shop=electronics
     shop=energy: ES:Tag:shop=energy
+    shop=equestrian: ES:Tag:shop=equestrian
     shop=erotic: ES:Tag:shop=erotic
+    shop=esoteric: ES:Tag:shop=esoteric
     shop=estate_agent: ES:Tag:shop=estate agent
     shop=fabric: ES:Tag:shop=fabric
     shop=farm: ES:Tag:shop=farm
+    shop=fashion: ES:Tag:shop=fashion
+    shop=fashion_accesories: ES:Tag:shop=fashion accesories
     shop=fashion_accessories: ES:Tag:shop=fashion accessories
     shop=fireplace: ES:Tag:shop=fireplace
+    shop=fireworks: ES:Tag:shop=fireworks
     shop=fishing: ES:Tag:shop=fishing
+    shop=flooring: ES:Tag:shop=flooring
     shop=florist: ES:Tag:shop=florist
     shop=food: ES:Tag:shop=food
+    shop=frame: ES:Tag:shop=frame
+    shop=free_flying: ES:Tag:shop=free flying
+    shop=frozen_food: ES:Tag:shop=frozen food
+    shop=fuel: ES:Tag:shop=fuel
     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=garden_furniture: ES:Tag:shop=garden furniture
     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=golf: ES:Tag:shop=golf
     shop=greengrocer: ES:Tag:shop=greengrocer
     shop=grocery: ES:Tag:shop=grocery
+    shop=groundskeeping: ES:Tag:shop=groundskeeping
+    shop=haberdashery: ES:Tag:shop=haberdashery
     shop=hairdresser: ES:Tag:shop=hairdresser
+    shop=hairdresser_supply: ES:Tag:shop=hairdresser supply
     shop=hardware: ES:Tag:shop=hardware
     shop=health_food: ES:Tag:shop=health food
     shop=hearing_aids: ES:Tag:shop=hearing aids
+    shop=hifi: ES:Tag:shop=hifi
+    shop=honey: ES:Tag:shop=honey
+    shop=hookah: ES:Tag:shop=hookah
+    shop=household_linen: ES:Tag:shop=household linen
     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=interior_decoration: ES:Tag:shop=interior decoration
     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=lamps: ES:Tag:shop=lamps
     shop=laundry: ES:Tag:shop=laundry
+    shop=leather: ES:Tag:shop=leather
+    shop=lighting: ES:Tag:shop=lighting
     shop=locksmith: ES:Tag:shop=locksmith
     shop=lottery: ES:Tag:shop=lottery
     shop=mall: ES:Tag:shop=mall
+    shop=maps: ES:Tag:shop=maps
     shop=massage: ES:Tag:shop=massage
     shop=medical: ES:Tag:shop=medical
     shop=medical_supply: ES:Tag:shop=medical supply
+    shop=military_surplus: ES:Tag:shop=military surplus
+    shop=mobile_home: ES:Tag:shop=mobile home
     shop=mobile_phone: ES:Tag:shop=mobile phone
+    shop=mobility_scooter: ES:Tag:shop=mobility scooter
     shop=model: ES:Tag:shop=model
     shop=money_lender: ES:Tag:shop=money lender
     shop=motorcycle: ES:Tag:shop=motorcycle
+    shop=motorcycle_parts: ES:Tag:shop=motorcycle parts
     shop=motorcycle_repair: ES:Tag:shop=motorcycle repair
+    shop=motorsports: ES:Tag:shop=motorsports
     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=organic: ES:Tag:shop=organic
     shop=outdoor: ES:Tag:shop=outdoor
+    shop=outpost: ES:Tag:shop=outpost
     shop=paint: ES:Tag:shop=paint
     shop=party: ES:Tag:shop=party
+    shop=pasta: ES:Tag:shop=pasta
     shop=pastry: ES:Tag:shop=pastry
     shop=pawnbroker: ES:Tag:shop=pawnbroker
     shop=perfumery: ES:Tag:shop=perfumery
+    shop=pest_control: ES:Tag:shop=pest control
     shop=pet: ES:Tag:shop=pet
     shop=pet_grooming: ES:Tag:shop=pet grooming
     shop=photo: ES:Tag:shop=photo
+    shop=plant_hire: ES:Tag:shop=plant hire
     shop=pottery: ES:Tag:shop=pottery
+    shop=power_tools: ES:Tag:shop=power tools
+    shop=printer_ink: ES:Tag:shop=printer ink
+    shop=printing: ES:Tag:shop=printing
+    shop=psychic: ES:Tag:shop=psychic
     shop=pyrotechnics: ES:Tag:shop=pyrotechnics
     shop=radiotechnics: ES:Tag:shop=radiotechnics
+    shop=religion: ES:Tag:shop=religion
     shop=rental: ES:Tag:shop=rental
+    shop=repair: ES:Tag:shop=repair
     shop=rice: ES:Tag:shop=rice
+    shop=robot: ES:Tag:shop=robot
+    shop=scooter: ES:Tag:shop=scooter
+    shop=scuba_diving: ES:Tag:shop=scuba diving
     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=shopping_centre: ES:Tag:shop=shopping centre
+    shop=skate: ES:Tag:shop=skate
+    shop=ski: ES:Tag:shop=ski
+    shop=snowmobile: ES:Tag:shop=snowmobile
+    shop=souvenir: ES:Tag:shop=souvenir
+    shop=spices: ES:Tag:shop=spices
     shop=sports: ES:Tag:shop=sports
+    shop=stairs: ES:Tag:shop=stairs
     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=swimming_pool: ES:Tag:shop=swimming pool
     shop=tailor: ES:Tag:shop=tailor
     shop=tattoo: ES:Tag:shop=tattoo
     shop=tea: ES:Tag:shop=tea
+    shop=telecommunication: ES:Tag:shop=telecommunication
     shop=ticket: ES:Tag:shop=ticket
     shop=tiles: ES:Tag:shop=tiles
+    shop=tobacco: ES:Tag:shop=tobacco
+    shop=tool_hire: ES:Tag:shop=tool hire
     shop=toys: ES:Tag:shop=toys
+    shop=tractor: ES:Tag:shop=tractor
     shop=trade: ES:Tag:shop=trade
+    shop=trailer: ES:Tag:shop=trailer
     shop=travel_agency: ES:Tag:shop=travel agency
+    shop=trophy: ES:Tag:shop=trophy
+    shop=truck: ES:Tag:shop=truck
+    shop=truck_repair: ES:Tag:shop=truck repair
     shop=tyres: ES:Tag:shop=tyres
     shop=vacant: ES:Tag:shop=vacant
+    shop=vacuum_cleaner: ES:Tag:shop=vacuum cleaner
     shop=variety_store: ES:Tag:shop=variety store
+    shop=video: ES:Tag:shop=video
     shop=video_games: ES:Tag:shop=video games
     shop=watches: ES:Tag:shop=watches
     shop=water: ES:Tag:shop=water
+    shop=water_sports: ES:Tag:shop=water sports
     shop=weapons: ES:Tag:shop=weapons
     shop=wholesale: ES:Tag:shop=wholesale
+    shop=wigs: ES:Tag:shop=wigs
     shop=window_blind: ES:Tag:shop=window blind
+    shop=windows: ES:Tag:shop=windows
     shop=wine: ES:Tag:shop=wine
+    shop=wool: ES:Tag:shop=wool
     shop=yes: ES:Tag:shop=yes
     sinkhole=estavelle: ES:Tag:sinkhole=estavelle
+    site_type=megalith: ES:Tag:site type=megalith
     site_type=petroglyph: ES:Tag:site type=petroglyph
     site_type=settlement: ES:Tag:site type=settlement
+    site_type=tumulus: ES:Tag:site type=tumulus
     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=outreach: ES:Tag:social facility=outreach
     social_facility=soup_kitchen: ES:Tag:social facility=soup kitchen
     source:geometry=Bing: ES:Tag:source:geometry=Bing
+    source=extrapolation: ES:Tag:source=extrapolation
+    source=historical: ES:Tag:source=historical
+    source=image: ES:Tag:source=image
+    source=knowledge: ES:Tag:source=knowledge
+    source=survey: ES:Tag:source=survey
+    source=voice: ES:Tag:source=voice
+    sport=10pin: ES:Tag:sport=10pin
+    sport=8pin: ES:Tag:sport=8pin
+    sport=9pin: ES:Tag:sport=9pin
+    sport=aikido: ES:Tag:sport=aikido
+    sport=american_football: ES:Tag:sport=american football
+    sport=american_handball: ES:Tag:sport=american handball
+    sport=archery: ES:Tag:sport=archery
+    sport=athletics: ES:Tag:sport=athletics
+    sport=australian_football: ES:Tag:sport=australian football
+    sport=badminton: ES:Tag:sport=badminton
+    sport=balle_pelote: ES:Tag:sport=balle pelote
+    sport=bandy: ES:Tag:sport=bandy
+    sport=baseball: ES:Tag:sport=baseball
     sport=basketball: ES:Tag:sport=basketball
+    sport=batting_cage: ES:Tag:sport=batting cage
+    sport=beachvolleyball: ES:Tag:sport=beachvolleyball
+    sport=biathlon: ES:Tag:sport=biathlon
+    sport=billiards: ES:Tag:sport=billiards
+    sport=bmx: ES:Tag:sport=bmx
+    sport=bobsleigh: ES:Tag:sport=bobsleigh
     sport=boules: ES:Tag:sport=boules
+    sport=bowls: ES:Tag:sport=bowls
+    sport=boxing: ES:Tag:sport=boxing
     sport=bullfighting: ES:Tag:sport=bullfighting
+    sport=canadian_football: ES:Tag:sport=canadian football
+    sport=canoe: ES:Tag:sport=canoe
+    sport=canoe_polo: ES:Tag:sport=canoe polo
     sport=chess: ES:Tag:sport=chess
+    sport=cliff_diving: ES:Tag:sport=cliff diving
     sport=climbing: ES:Tag:sport=climbing
+    sport=climbing_adventure: ES:Tag:sport=climbing adventure
     sport=cockfighting: ES:Tag:sport=cockfighting
+    sport=cricket: ES:Tag:sport=cricket
     sport=cricket_nets: ES:Tag:sport=cricket nets
+    sport=croquet: ES:Tag:sport=croquet
+    sport=crossfit: ES:Tag:sport=crossfit
+    sport=curling: ES:Tag:sport=curling
+    sport=cycle_polo: ES:Tag:sport=cycle polo
     sport=cycling: ES:Tag:sport=cycling
+    sport=darts: ES:Tag:sport=darts
+    sport=disc_golf: ES:Tag:sport=disc golf
+    sport=dog_agility: ES:Tag:sport=dog agility
     sport=dog_racing: ES:Tag:sport=dog racing
     sport=equestrian: ES:Tag:sport=equestrian
+    sport=fencing: ES:Tag:sport=fencing
+    sport=field_hockey: ES:Tag:sport=field hockey
+    sport=fitness: ES:Tag:sport=fitness
+    sport=five-a-side: ES:Tag:sport=five-a-side
+    sport=floorball: ES:Tag:sport=floorball
+    sport=four_square: ES:Tag:sport=four square
+    sport=free_flying: ES:Tag:sport=free flying
     sport=futsal: ES:Tag:sport=futsal
+    sport=gaelic_games: ES:Tag:sport=gaelic games
+    sport=gaga: ES:Tag:sport=gaga
     sport=golf: ES:Tag:sport=golf
+    sport=gymnastics: ES:Tag:sport=gymnastics
     sport=handball: ES:Tag:sport=handball
+    sport=hapkido: ES:Tag:sport=hapkido
     sport=horse_racing: ES:Tag:sport=horse racing
+    sport=horseshoes: ES:Tag:sport=horseshoes
+    sport=ice_hockey: ES:Tag:sport=ice hockey
+    sport=ice_skating: ES:Tag:sport=ice skating
+    sport=ice_stock: ES:Tag:sport=ice stock
+    sport=judo: ES:Tag:sport=judo
+    sport=karate: ES:Tag:sport=karate
+    sport=karting: ES:Tag:sport=karting
+    sport=kickboxing: ES:Tag:sport=kickboxing
+    sport=kitesurfing: ES:Tag:sport=kitesurfing
+    sport=korfball: ES:Tag:sport=korfball
+    sport=krachtbal: ES:Tag:sport=krachtbal
+    sport=lacrosse: ES:Tag:sport=lacrosse
+    sport=laser_tag: ES:Tag:sport=laser tag
+    sport=long_jump: ES:Tag:sport=long jump
+    sport=martial_arts: ES:Tag:sport=martial arts
+    sport=miniature_golf: ES:Tag:sport=miniature golf
     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=netball: ES:Tag:sport=netball
+    sport=nine_mens_morris: ES:Tag:sport=nine mens morris
+    sport=obstacle_course: ES:Tag:sport=obstacle course
     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=parachuting: ES:Tag:sport=parachuting
+    sport=parkour: ES:Tag:sport=parkour
     sport=pelota: ES:Tag:sport=pelota
+    sport=pesäpallo: ES:Tag:sport=pesäpallo
+    sport=pickleball: ES:Tag:sport=pickleball
+    sport=pilates: ES:Tag:sport=pilates
+    sport=pole_dance: ES:Tag:sport=pole dance
+    sport=polo: ES:Tag:sport=polo
+    sport=racquet: ES:Tag:sport=racquet
+    sport=rc_car: ES:Tag:sport=rc car
+    sport=roller_hockey: ES:Tag:sport=roller hockey
+    sport=roller_skating: ES:Tag:sport=roller skating
+    sport=rowing: ES:Tag:sport=rowing
+    sport=rugby: ES:Tag:sport=rugby
+    sport=rugby_league: ES:Tag:sport=rugby league
+    sport=rugby_union: ES:Tag:sport=rugby union
+    sport=running: ES:Tag:sport=running
+    sport=sailing: ES:Tag:sport=sailing
+    sport=scuba_diving: ES:Tag:sport=scuba diving
     sport=shooting: ES:Tag:sport=shooting
+    sport=shot-put: ES:Tag:sport=shot-put
+    sport=shuffleboard: ES:Tag:sport=shuffleboard
+    sport=skateboard: ES:Tag:sport=skateboard
+    sport=ski_jumping: ES:Tag:sport=ski jumping
+    sport=skiing: ES:Tag:sport=skiing
+    sport=snooker: ES:Tag:sport=snooker
     sport=soccer: ES:Tag:sport=soccer
+    sport=softball: ES:Tag:sport=softball
+    sport=speedway: ES:Tag:sport=speedway
+    sport=squash: ES:Tag:sport=squash
+    sport=sumo: ES:Tag:sport=sumo
     sport=surfing: ES:Tag:sport=surfing
     sport=swimming: ES:Tag:sport=swimming
+    sport=table_soccer: ES:Tag:sport=table soccer
     sport=table_tennis: ES:Tag:sport=table tennis
+    sport=taekwondo: ES:Tag:sport=taekwondo
     sport=tennis: ES:Tag:sport=tennis
+    sport=tetherball: ES:Tag:sport=tetherball
+    sport=toboggan: ES:Tag:sport=toboggan
+    sport=trampoline: ES:Tag:sport=trampoline
+    sport=trugo: ES:Tag:sport=trugo
+    sport=ultimate: ES:Tag:sport=ultimate
     sport=volleyball: ES:Tag:sport=volleyball
+    sport=wakeboarding: ES:Tag:sport=wakeboarding
     sport=water_polo: ES:Tag:sport=water polo
+    sport=water_ski: ES:Tag:sport=water ski
+    sport=weightlifting: ES:Tag:sport=weightlifting
+    sport=wrestling: ES:Tag:sport=wrestling
     sport=yoga: ES:Tag:sport=yoga
+    sport=zurkhaneh_sport: ES:Tag:sport=zurkhaneh sport
     station=subway: ES:Tag:station=subway
+    stile=stepover: ES:Tag:stile=stepover
     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=acrylic: ES:Tag:surface=acrylic
+    surface=artificial_turf: ES:Tag:surface=artificial turf
     surface=asphalt: ES:Tag:surface=asphalt
+    surface=carpet: ES:Tag:surface=carpet
+    surface=chipseal: ES:Tag:surface=chipseal
+    surface=clay: ES:Tag:surface=clay
+    surface=cobblestone: ES:Tag:surface=cobblestone
     surface=compacted: ES:Tag:surface=compacted
     surface=concrete: ES:Tag:surface=concrete
+    surface=concrete:lanes: ES:Tag:surface=concrete:lanes
+    surface=concrete:plates: ES:Tag:surface=concrete:plates
+    surface=dirt: ES:Tag:surface=dirt
+    surface=earth: ES:Tag:surface=earth
+    surface=fine_gravel: ES:Tag:surface=fine gravel
+    surface=grass: ES:Tag:surface=grass
+    surface=grass_paver: ES:Tag:surface=grass paver
+    surface=gravel: ES:Tag:surface=gravel
+    surface=ground: ES:Tag:surface=ground
+    surface=ice: ES:Tag:surface=ice
+    surface=metal: ES:Tag:surface=metal
+    surface=metal_grid: ES:Tag:surface=metal grid
+    surface=mud: ES:Tag:surface=mud
     surface=paved: ES:Tag:surface=paved
+    surface=paving_stones: ES:Tag:surface=paving stones
+    surface=pebblestone: ES:Tag:surface=pebblestone
+    surface=rock: ES:Tag:surface=rock
+    surface=salt: ES:Tag:surface=salt
+    surface=sand: ES:Tag:surface=sand
+    surface=sett: ES:Tag:surface=sett
+    surface=snow: ES:Tag:surface=snow
+    surface=stepping_stones: ES:Tag:surface=stepping stones
     surface=tartan: ES:Tag:surface=tartan
+    surface=unhewn_cobblestone: ES:Tag:surface=unhewn cobblestone
     surface=unpaved: ES:Tag:surface=unpaved
+    surface=wood: ES:Tag:surface=wood
+    surface=woodchips: ES:Tag:surface=woodchips
     switch=disconnector: ES:Tag:switch=disconnector
     tactile_paving=no: ES:Tag:tactile paving=no
+    tactile_paving=yes: ES:Tag:tactile paving=yes
     telecom=connection_point: ES:Tag:telecom=connection point
+    telecom=data_center: ES:Tag:telecom=data center
+    telecom=distribution_point: ES:Tag:telecom=distribution point
+    telecom=exchange: ES:Tag:telecom=exchange
     telecom=service_device: ES:Tag:telecom=service device
     theatre:type=open_air: ES:Tag:theatre:type=open air
+    tidal=yes: ES:Tag:tidal=yes
     toll=yes: ES:Tag:toll=yes
     tomb=cenotaph: ES:Tag:tomb=cenotaph
     tomb=columbarium: ES:Tag:tomb=columbarium
@@ -13461,7 +15741,9 @@ es:
     tourism=aquarium: ES:Tag:tourism=aquarium
     tourism=artwork: ES:Tag:tourism=artwork
     tourism=attraction: ES:Tag:tourism=attraction
+    tourism=camp_pitch: ES:Tag:tourism=camp pitch
     tourism=camp_site: ES:Tag:tourism=camp site
+    tourism=caravan_site: ES:Tag:tourism=caravan site
     tourism=chalet: ES:Tag:tourism=chalet
     tourism=gallery: ES:Tag:tourism=gallery
     tourism=guest_house: ES:Tag:tourism=guest house
@@ -13476,6 +15758,8 @@ es:
     tourism=viewpoint: ES:Tag:tourism=viewpoint
     tourism=wilderness_hut: ES:Tag:tourism=wilderness hut
     tourism=wine_cellar: ES:Tag:tourism=wine cellar
+    tourism=yes: ES:Tag:tourism=yes
+    tourism=zoo: ES:Tag:tourism=zoo
     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
@@ -13483,6 +15767,11 @@ es:
     tower:type=minaret: ES:Tag:tower:type=minaret
     tower:type=observation: ES:Tag:tower:type=observation
     tower:type=watchtower: ES:Tag:tower:type=watchtower
+    tracktype=grade1: ES:Tag:tracktype=grade1
+    tracktype=grade2: ES:Tag:tracktype=grade2
+    tracktype=grade3: ES:Tag:tracktype=grade3
+    tracktype=grade4: ES:Tag:tracktype=grade4
+    tracktype=grade5: ES:Tag:tracktype=grade5
     traffic_calming=bump: ES:Tag:traffic calming=bump
     traffic_calming=cushion: ES:Tag:traffic calming=cushion
     traffic_calming=dip: ES:Tag:traffic calming=dip
     trees=olive_trees: ES:Tag:trees=olive trees
     tunnel=building_passage: ES:Tag:tunnel=building passage
     tunnel=culvert: ES:Tag:tunnel=culvert
+    tunnel=flooded: ES:Tag:tunnel=flooded
+    tunnel=yes: ES:Tag:tunnel=yes
     type=public_transport: ES:Tag:type=public transport
     type=waterway: ES:Tag:type=waterway
+    vending=SIM_cards: ES:Tag:vending=SIM cards
+    vending=admission_tickets: ES:Tag:vending=admission tickets
+    vending=animal_feed: ES:Tag:vending=animal feed
+    vending=art: ES:Tag:vending=art
+    vending=bicycle_tube: ES:Tag:vending=bicycle tube
     vending=books: ES:Tag:vending=books
+    vending=bottle_return: ES:Tag:vending=bottle return
     vending=bread: ES:Tag:vending=bread
+    vending=candles: ES:Tag:vending=candles
     vending=chemist: ES:Tag:vending=chemist
+    vending=chewing_gums: ES:Tag:vending=chewing gums
+    vending=cigarettes: ES:Tag:vending=cigarettes
+    vending=coffee: ES:Tag:vending=coffee
     vending=condoms: ES:Tag:vending=condoms
+    vending=contact_lenses: ES:Tag:vending=contact lenses
+    vending=drinks: ES:Tag:vending=drinks
+    vending=e-cigarettes: ES:Tag:vending=e-cigarettes
+    vending=electronics: ES:Tag:vending=electronics
+    vending=elongated_coin: ES:Tag:vending=elongated coin
     vending=excrement_bags: ES:Tag:vending=excrement bags
+    vending=feminine_hygiene: ES:Tag:vending=feminine hygiene
+    vending=first_aid: ES:Tag:vending=first aid
     vending=fishing_bait: ES:Tag:vending=fishing bait
     vending=fishing_tackle: ES:Tag:vending=fishing tackle
+    vending=flower_seeds: ES:Tag:vending=flower seeds
     vending=flowers: ES:Tag:vending=flowers
+    vending=food: ES:Tag:vending=food
+    vending=fuel: ES:Tag:vending=fuel
     vending=ice_cream: ES:Tag:vending=ice cream
+    vending=ice_cubes: ES:Tag:vending=ice cubes
     vending=milk: ES:Tag:vending=milk
+    vending=newspapers: ES:Tag:vending=newspapers
     vending=parcel_mail_in: ES:Tag:vending=parcel mail in
     vending=parcel_pickup: ES:Tag:vending=parcel pickup
+    vending=parcel_pickup;parcel_mail_in: ES:Tag:vending=parcel pickup;parcel mail
+      in
     vending=parking_tickets: ES:Tag:vending=parking tickets
+    vending=pizza: ES:Tag:vending=pizza
     vending=public_transport_tickets: ES:Tag:vending=public transport tickets
+    vending=stamps: ES:Tag:vending=stamps
+    vending=sweets: ES:Tag:vending=sweets
+    vending=syringes: ES:Tag:vending=syringes
+    vending=telephone_vouchers: ES:Tag:vending=telephone vouchers
+    vending=toll: ES:Tag:vending=toll
+    vending=toys: ES:Tag:vending=toys
+    vending=water: ES:Tag:vending=water
+    wall=brick: ES:Tag:wall=brick
+    wall=castle_wall: ES:Tag:wall=castle wall
+    wall=concrete: ES:Tag:wall=concrete
+    wall=concrete_block: ES:Tag:wall=concrete block
     wall=dry_stone: ES:Tag:wall=dry stone
+    wall=flint: ES:Tag:wall=flint
+    wall=flood_wall: ES:Tag:wall=flood wall
+    wall=gabion:value: ES:Tag:wall=gabion:value
+    wall=no: ES:Tag:wall=no
     wall=noise_barrier: ES:Tag:wall=noise barrier
+    wall=pise:value: ES:Tag:wall=pise:value
+    wall=seawall: ES:Tag:wall=seawall
+    wall=stone: ES:Tag:wall=stone
+    wall=stone_wall: ES:Tag:wall=stone wall
     wall=tire_barrier: ES:Tag:wall=tire barrier
+    waste=cigarettes: ES:Tag:waste=cigarettes
+    waste=dog_excrement: ES:Tag:waste=dog excrement
+    waste=drugs: ES:Tag:waste=drugs
+    waste=oil: ES:Tag:waste=oil
+    waste=organic: ES:Tag:waste=organic
+    waste=pizza_box: ES:Tag:waste=pizza box
+    waste=rubble: ES:Tag:waste=rubble
+    waste=sharps: ES:Tag:waste=sharps
+    waste=trash: ES:Tag:waste=trash
+    water=basin: ES:Tag:water=basin
     water=canal: ES:Tag:water=canal
+    water=ditch: ES:Tag:water=ditch
+    water=dock: ES:Tag:water=dock
+    water=drain: ES:Tag:water=drain
     water=fish_pass: ES:Tag:water=fish pass
+    water=harbour: ES:Tag:water=harbour
     water=lagoon: ES:Tag:water=lagoon
     water=lake: ES:Tag:water=lake
+    water=lock: ES:Tag:water=lock
+    water=moat: ES:Tag:water=moat
+    water=oxbow: ES:Tag:water=oxbow
     water=pond: ES:Tag:water=pond
+    water=rapids: ES:Tag:water=rapids
+    water=reflecting_pool: ES:Tag:water=reflecting pool
     water=reservoir: ES:Tag:water=reservoir
     water=river: ES:Tag:water=river
+    water=stream: ES:Tag:water=stream
+    water=stream_pool: ES:Tag:water=stream pool
     water=wastewater: ES:Tag:water=wastewater
+    waterway=boat_lift: ES:Tag:waterway=boat lift
+    waterway=boatyard: ES:Tag:waterway=boatyard
     waterway=canal: ES:Tag:waterway=canal
     waterway=dam: ES:Tag:waterway=dam
+    waterway=derelict_canal: ES:Tag:waterway=derelict canal
     waterway=ditch: ES:Tag:waterway=ditch
     waterway=dock: ES:Tag:waterway=dock
     waterway=drain: ES:Tag:waterway=drain
+    waterway=dredged_area: ES:Tag:waterway=dredged area
+    waterway=drystream: ES:Tag:waterway=drystream
+    waterway=fairway: ES:Tag:waterway=fairway
+    waterway=fish_pass: ES:Tag:waterway=fish pass
+    waterway=floating_barrier: ES:Tag:waterway=floating barrier
+    waterway=fuel: ES:Tag:waterway=fuel
+    waterway=lock_gate: ES:Tag:waterway=lock gate
     waterway=milestone: ES:Tag:waterway=milestone
+    waterway=portage: ES:Tag:waterway=portage
+    waterway=pressurised: ES:Tag:waterway=pressurised
     waterway=rapids: ES:Tag:waterway=rapids
     waterway=river: ES:Tag:waterway=river
     waterway=riverbank: ES:Tag:waterway=riverbank
+    waterway=security_lock: ES:Tag:waterway=security lock
+    waterway=sluice_gate: ES:Tag:waterway=sluice gate
+    waterway=soakhole: ES:Tag:waterway=soakhole
     waterway=stream: ES:Tag:waterway=stream
+    waterway=tidal_channel: ES:Tag:waterway=tidal channel
+    waterway=turning_point: ES:Tag:waterway=turning point
     waterway=water_point: ES:Tag:waterway=water point
+    waterway=waterfall: ES:Tag:waterway=waterfall
     waterway=weir: ES:Tag:waterway=weir
     wetland=bog: ES:Tag:wetland=bog
     wetland=mangrove: ES:Tag:wetland=mangrove
@@ -13559,6 +15933,7 @@ et:
 fa:
   key:
     addr: Fa:Key:addr
+    alt_name: Fa:Key:alt name
     area: Fa:Key:area
     barrier: Fa:Key:barrier
     bridge: Fa:Key:bridge
@@ -13592,6 +15967,7 @@ fa:
     highway=tertiary: Fa:Tag:highway=tertiary
     highway=track: Fa:Tag:highway=track
     highway=unclassified: Fa:Tag:highway=unclassified
+    junction=jughandle: Fa:Tag:junction=jughandle
     junction=yes: Fa:Tag:junction=yes
     man_made=qanat: Fa:Tag:man made=qanat
     man_made=water_tower: Fa:Tag:man made=water tower
@@ -13647,6 +16023,7 @@ fi:
     waterway: Fi:Key:waterway
     wheelchair: Fi:Key:wheelchair
     width: Fi:Key:width
+    winter_service: Fi:Key:winter service
   tag:
     amenity=atm: Fi:Tag:amenity=atm
     amenity=baby_hatch: Fi:Tag:amenity=baby hatch
@@ -13735,12 +16112,16 @@ fr:
     animated: FR:Key:animated
     architect: FR:Key:architect
     area: FR:Key:area
+    area:highway: FR:Key:area:highway
     artist_name: FR:Key:artist name
     artwork_type: FR:Key:artwork type
     attraction: FR:Key:attraction
+    authentication: FR:Key:authentication
+    avalanche_transceiver: FR:Key:avalanche transceiver
     backcountry: FR:Key:backcountry
     backrest: FR:Key:backrest
     backward: FR:Key:backward
+    bakehouse: FR:Key:bakehouse
     barrier: FR:Key:barrier
     baseball: FR:Key:baseball
     basin: FR:Key:basin
@@ -13764,6 +16145,7 @@ fr:
     building:flats: FR:Key:building:flats
     building:levels: FR:Key:building:levels
     building:material: FR:Key:building:material
+    building:min_level: FR:Key:building:min level
     building:part: FR:Key:building:part
     building:prefabricated: FR:Key:building:prefabricated
     building:use: FR:Key:building:use
@@ -13771,16 +16153,19 @@ fr:
     bus: FR:Key:bus
     busway: FR:Key:busway
     cafe: FR:Key:cafe
+    camera:direction: FR:Key:camera:direction
     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
+    carriage: FR:Key:carriage
     cash_withdrawal: FR:Key:cash withdrawal
     changesets_count: FR:Key:changesets count
     charge: FR:Key:charge
     check_date: FR:Key:check date
+    circuits: FR:Key:circuits
     class:bicycle:commute: FR:Key:class:bicycle:commute
     clothes: FR:Key:clothes
     club: FR:Key:club
@@ -13789,10 +16174,13 @@ fr:
     colour: FR:Key:colour
     comment: FR:Key:comment
     communication:bos: FR:Key:communication:bos
+    community: FR:Key:community
     community_centre: FR:Key:community centre
     community_centre:for: FR:Key:community centre:for
+    compensator: FR:Key:compensator
     connection_point: FR:Key:connection point
     construction: FR:Key:construction
+    consulate: FR:Key:consulate
     contact: FR:Key:contact
     contact:email: FR:Key:contact:email
     contact:facebook: FR:Key:contact:facebook
@@ -13811,13 +16199,18 @@ fr:
     cuisine: FR:Key:cuisine
     currency: FR:Key:currency
     cutting: FR:Key:cutting
+    cycle_barrier: FR:Key:cycle barrier
+    cycle_barrier:installation: FR:Key:cycle barrier:installation
     cyclestreet: FR:Key:cyclestreet
     cycleway: FR:Key:cycleway
     cycleway:lane: FR:Key:cycleway:lane
     cycleway:left: FR:Key:cycleway:left
+    defensive_works: FR:Key:defensive works
+    deflection: FR:Key:deflection
     delivery: FR:Key:delivery
     denomination: FR:Key:denomination
     denotation: FR:Key:denotation
+    departures_board: FR:Key:departures board
     description: FR:Key:description
     design: FR:Key:design
     designation: FR:Key:designation
@@ -13838,6 +16231,7 @@ fr:
     divider: FR:Key:divider
     dog: FR:Key:dog
     door: FR:Key:door
+    drain: FR:Key:drain
     drink: FR:Key:drink
     drinking_water: FR:Key:drinking water
     drinking_water:refill: FR:Key:drinking water:refill
@@ -13894,6 +16288,7 @@ fr:
     handrail: FR:Key:handrail
     happy_hours: FR:Key:happy hours
     hazard: FR:Key:hazard
+    health_facility:CD: FR:Key:health facility:CD
     healthcare: FR:Key:healthcare
     height: FR:Key:height
     heritage: FR:Key:heritage
@@ -13909,9 +16304,11 @@ fr:
     incline: FR:Key:incline
     indoor: FR:Key:indoor
     information: FR:Key:information
+    inlet: FR:Key:inlet
     inscription: FR:Key:inscription
     int_name: FR:Key:int name
     intermittent: FR:Key:intermittent
+    internet_access:ssid: FR:Key:internet access:ssid
     interval: FR:Key:interval
     junction: FR:Key:junction
     kerb: FR:Key:kerb
@@ -13968,7 +16365,9 @@ fr:
     min_age: FR:Key:min age
     minage: FR:Key:minage
     monitoring:bicycle: FR:Key:monitoring:bicycle
+    monitoring:groundwater: FR:Key:monitoring:groundwater
     monitoring:meteoric_activity: FR:Key:monitoring:meteoric activity
+    monitoring:noise: FR:Key:monitoring:noise
     monitoring:water_level: FR:Key:monitoring:water level
     mooring: FR:Key:mooring
     motorboat: FR:Key:motorboat
@@ -13997,6 +16396,7 @@ fr:
     open_air: FR:Key:open air
     openbenches:id: FR:Key:openbenches:id
     openfire: FR:Key:openfire
+    opening: FR:Key:opening
     opening_date: FR:Key:opening date
     opening_hours: FR:Key:opening hours
     opening_hours:covid19: FR:Key:opening hours:covid19
@@ -14005,12 +16405,16 @@ fr:
     operator:type: FR:Key:operator:type
     organic: FR:Key:organic
     outdoor_seating: FR:Key:outdoor seating
+    outlet: FR:Key:outlet
+    overlap: FR:Key:overlap
     overtaking: FR:Key:overtaking
+    overtaking:hgv: FR:Key:overtaking:hgv
     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:orientation: FR:Key:parking:orientation
     parking_space: FR:Key:parking space
     paved:date: FR:Key:paved:date
     payment: FR:Key:payment
@@ -14049,6 +16453,7 @@ fr:
     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:ANFR: FR:Key:ref:FR:ANFR
     ref:FR:ARCEP: FR:Key:ref:FR:ARCEP
     ref:FR:CEF: FR:Key:ref:FR:CEF
     ref:FR:CNC: FR:Key:ref:FR:CNC
@@ -14056,6 +16461,7 @@ fr:
     ref:FR:DREAL: FR:Key:ref:FR:DREAL
     ref:FR:FANTOIR: FR:Key:ref:FR:FANTOIR
     ref:FR:FINESS: FR:Key:ref:FR:FINESS
+    ref:FR:Joconde: FR:Key:ref:FR:Joconde
     ref:FR:MemorialGenWeb: FR:Key:ref:FR:MemorialGenWeb
     ref:FR:NAF: FR:Key:ref:FR:NAF
     ref:FR:Orange: FR:Key:ref:FR:Orange
@@ -14067,6 +16473,10 @@ fr:
     ref:FR:SFR: FR:Key:ref:FR:SFR
     ref:FR:SIREN: FR:Key:ref:FR:SIREN
     ref:FR:SIRET: FR:Key:ref:FR:SIRET
+    ref:FR:SNCF: FR:Key:ref:FR:SNCF
+    ref:FR:SNCF-Réseau: FR:Key:ref:FR:SNCF-Réseau
+    ref:FR:SNCF_Reseau: FR:Key:ref:FR:SNCF Reseau
+    ref:FR:SNCF_Réseau: FR:Key:ref:FR:SNCF Réseau
     ref:FR:commune: FR:Key:ref:FR:commune
     ref:FR:gdo: FR:Key:ref:FR:gdo
     ref:FR:museofile: FR:Key:ref:FR:museofile
@@ -14081,8 +16491,12 @@ fr:
     reservation: FR:Key:reservation
     residential: FR:Key:residential
     resource: FR:Key:resource
+    reusable_packaging: FR:Key:reusable packaging
+    reusable_packaging:accept: FR:Key:reusable packaging:accept
+    reusable_packaging:offer: FR:Key:reusable packaging:offer
     right: FR:Key:right
     roof:direction: FR:Key:roof:direction
+    roof:levels: FR:Key:roof:levels
     roof:material: FR:Key:roof:material
     roof:shape: FR:Key:roof:shape
     room: FR:Key:room
@@ -14097,6 +16511,7 @@ fr:
     self_checkout: FR:Key:self checkout
     self_service: FR:Key:self service
     service: FR:Key:service
+    service:bicycle:rental: FR:Key:service:bicycle:rental
     service_times: FR:Key:service times
     shelter: FR:Key:shelter
     shelter_type: FR:Key:shelter type
@@ -14108,6 +16523,7 @@ fr:
     sinkhole: FR:Key:sinkhole
     size: FR:Key:size
     smoothness: FR:Key:smoothness
+    snowmobile: FR:Key:snowmobile
     social_facility: FR:Key:social facility
     social_facility:for: FR:Key:social facility:for
     source: FR:Key:source
@@ -14115,6 +16531,7 @@ fr:
     source:maxspeed: FR:Key:source:maxspeed
     source:maxwidth: FR:Key:source:maxwidth
     source:name:br: FR:Key:source:name:br
+    spacing: FR:Key:spacing
     species: FR:Key:species
     species:fr: FR:Key:species:fr
     species:wikidata: FR:Key:species:wikidata
@@ -14125,6 +16542,7 @@ fr:
     step:contrast: FR:Key:step:contrast
     step_count: FR:Key:step count
     stop: FR:Key:stop
+    substation: FR:Key:substation
     support: FR:Key:support
     surface: FR:Key:surface
     surveillance: FR:Key:surveillance
@@ -14173,11 +16591,13 @@ fr:
     voltage: FR:Key:voltage
     voltage:primary: FR:Key:voltage:primary
     voltage:secondary: FR:Key:voltage:secondary
+    voltage:tertiary: FR:Key:voltage:tertiary
     waste: FR:Key:waste
     water: FR:Key:water
     water_source: FR:Key:water source
     waterway: FR:Key:waterway
     website: FR:Key:website
+    website:booking: FR:Key:website:booking
     wetland: FR:Key:wetland
     wheelchair: FR:Key:wheelchair
     wheelchair:description: FR:Key:wheelchair:description
@@ -14187,9 +16607,12 @@ fr:
     wikimedia_commons: FR:Key:wikimedia commons
     wikipedia: FR:Key:wikipedia
     windings: FR:Key:windings
+    windings:auto: FR:Key:windings:auto
+    winter_service: FR:Key:winter service
     xmas:feature: FR:Key:xmas:feature
     year_of_construction: FR:Key:year of construction
     zero_waste: FR:Key:zero waste
+    zone:maxspeed: FR:Key:zone:maxspeed
     zoo: FR:Key:zoo
   tag:
     Bascule_publique: FR:Tag:Bascule publique
@@ -14218,7 +16641,6 @@ fr:
     advertising=wall_painting: FR:Tag:advertising=wall painting
     aerialway=cable_car: FR:Tag:aerialway=cable car
     aerialway=chair_lift: FR:Tag:aerialway=chair lift
-    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
@@ -14234,6 +16656,7 @@ fr:
     amenity=animal_shelter: FR:Tag:amenity=animal shelter
     amenity=arts_centre: FR:Tag:amenity=arts centre
     amenity=atm: FR:Tag:amenity=atm
+    amenity=baking_oven: FR:Tag:amenity=baking oven
     amenity=bank: FR:Tag:amenity=bank
     amenity=bar: FR:Tag:amenity=bar
     amenity=bbq: FR:Tag:amenity=bbq
@@ -14269,6 +16692,7 @@ fr:
     amenity=dentist: FR:Tag:amenity=dentist
     amenity=device_charging_station: FR:Tag:amenity=device charging station
     amenity=doctors: FR:Tag:amenity=doctors
+    amenity=dog_parking: FR:Tag:amenity=dog parking
     amenity=dog_toilet: FR:Tag:amenity=dog toilet
     amenity=drinking_water: FR:Tag:amenity=drinking water
     amenity=driver_training: FR:Tag:amenity=driver training
@@ -14278,6 +16702,7 @@ fr:
     amenity=events_venue: FR:Tag:amenity=events venue
     amenity=fast_food: FR:Tag:amenity=fast food
     amenity=feeding_place: FR:Tag:amenity=feeding place
+    amenity=fire_hydrant: FR:Tag:amenity=fire hydrant
     amenity=fire_station: FR:Tag:amenity=fire station
     amenity=food_court: FR:Tag:amenity=food court
     amenity=fountain: FR:Tag:amenity=fountain
@@ -14307,9 +16732,12 @@ fr:
     amenity=music_school: FR:Tag:amenity=music school
     amenity=nightclub: FR:Tag:amenity=nightclub
     amenity=nursing_home: FR:Tag:amenity=nursing home
+    amenity=nutritionist: FR:Tag:amenity=nutritionist
+    amenity=parcel_locker: FR:Tag:amenity=parcel locker
     amenity=parking: FR:Tag:amenity=parking
     amenity=parking_entrance: FR:Tag:amenity=parking entrance
     amenity=parking_space: FR:Tag:amenity=parking space
+    amenity=payment_centre: FR:Tag:amenity=payment centre
     amenity=pharmacy: FR:Tag:amenity=pharmacy
     amenity=photo_booth: FR:Tag:amenity=photo booth
     amenity=place_of_mourning: FR:Tag:amenity=place of mourning
@@ -14339,9 +16767,11 @@ fr:
     amenity=taxi: FR:Tag:amenity=taxi
     amenity=telephone: FR:Tag:amenity=telephone
     amenity=theatre: FR:Tag:amenity=theatre
+    amenity=ticket_validator: FR:Tag:amenity=ticket validator
     amenity=toilets: FR:Tag:amenity=toilets
     amenity=townhall: FR:Tag:amenity=townhall
     amenity=toy_library: FR:Tag:amenity=toy library
+    amenity=traffic_park: FR:Tag:amenity=traffic park
     amenity=trolley_bay: FR:Tag:amenity=trolley bay
     amenity=university: FR:Tag:amenity=university
     amenity=vacuum_cleaner: FR:Tag:amenity=vacuum cleaner
@@ -14415,7 +16845,9 @@ fr:
     bridge=movable: FR:Tag:bridge=movable
     bridge=trestle: FR:Tag:bridge=trestle
     bridge=viaduct: FR:Tag:bridge=viaduct
+    building:prefabricated=yes: FR:Tag:building:prefabricated=yes
     building=apartments: FR:Tag:building=apartments
+    building=bakehouse: FR:Tag:building=bakehouse
     building=barn: FR:Tag:building=barn
     building=bridge: FR:Tag:building=bridge
     building=cabin: FR:Tag:building=cabin
@@ -14453,14 +16885,27 @@ fr:
     building=sports_hall: FR:Tag:building=sports hall
     building=stable: FR:Tag:building=stable
     building=stadium: FR:Tag:building=stadium
+    building=stilt_house: FR:Tag:building=stilt house
     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=cadet: FR:Tag:club=cadet
     club=sport: FR:Tag:club=sport
+    compensator=filter: FR:Tag:compensator=filter
+    compensator=series_capacitor: FR:Tag:compensator=series capacitor
+    compensator=series_reactor: FR:Tag:compensator=series reactor
+    compensator=shunt_capacitor: FR:Tag:compensator=shunt capacitor
+    compensator=shunt_reactor: FR:Tag:compensator=shunt reactor
+    compensator=statcom: FR:Tag:compensator=statcom
+    compensator=static_var: FR:Tag:compensator=static var
+    compensator=synchronous_condenser: FR:Tag:compensator=synchronous condenser
+    compensator=voltage_regulator: FR:Tag:compensator=voltage regulator
     construction=yes: FR:Tag:construction=yes
+    consulate=consulate_general: FR:Tag:consulate=consulate general
+    consulate=residence: FR:Tag:consulate=residence
     craft=agricultural_engines: FR:Tag:craft=agricultural engines
     craft=bakery: FR:Tag:craft=bakery
     craft=basket_maker: FR:Tag:craft=basket maker
@@ -14541,6 +16986,7 @@ fr:
     craft=welder: FR:Tag:craft=welder
     craft=window_construction: FR:Tag:craft=window construction
     craft=winery: FR:Tag:craft=winery
+    crossing=unmarked: FR:Tag:crossing=unmarked
     crossing=zebra: FR:Tag:crossing=zebra
     crossing_ref=zebra: FR:Tag:crossing ref=zebra
     cuisine=coffee_shop: FR:Tag:cuisine=coffee shop
@@ -14550,6 +16996,10 @@ fr:
     cycleway=opposite: FR:Tag:cycleway=opposite
     cycleway=opposite_lane: FR:Tag:cycleway=opposite lane
     cycleway=share_busway: FR:Tag:cycleway=share busway
+    cycleway=shared_lane: FR:Tag:cycleway=shared lane
+    diplomatic=consulate: FR:Tag:diplomatic=consulate
+    diplomatic=embassy: FR:Tag:diplomatic=embassy
+    diplomatic=liaison: FR:Tag:diplomatic=liaison
     disused=yes: FR:Tag:disused=yes
     emergency=access_point: FR:Tag:emergency=access point
     emergency=ambulance_station: FR:Tag:emergency=ambulance station
@@ -14579,6 +17029,7 @@ fr:
     footway=access_aisle: FR:Tag:footway=access aisle
     footway=crossing: FR:Tag:footway=crossing
     footway=sidewalk: FR:Tag:footway=sidewalk
+    footway=traffic_island: FR:Tag:footway=traffic island
     generator:method=combustion: FR:Tag:generator:method=combustion
     generator:method=fission: FR:Tag:generator:method=fission
     generator:method=fusion: FR:Tag:generator:method=fusion
@@ -14609,10 +17060,12 @@ fr:
     healthcare=doctor: FR:Tag:healthcare=doctor
     healthcare=laboratory: FR:Tag:healthcare=laboratory
     healthcare=physiotherapist: FR:Tag:healthcare=physiotherapist
+    healthcare=sample_collection: FR:Tag:healthcare=sample collection
     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
+    highway=busway: FR:Tag:highway=busway
     highway=crossing: FR:Tag:highway=crossing
     highway=cycleway: FR:Tag:highway=cycleway
     highway=elevator: FR:Tag:highway=elevator
@@ -14643,6 +17096,7 @@ fr:
     highway=stop: FR:Tag:highway=stop
     highway=street_lamp: FR:Tag:highway=street lamp
     highway=tertiary: FR:Tag:highway=tertiary
+    highway=toll_gantry: FR:Tag:highway=toll gantry
     highway=track: FR:Tag:highway=track
     highway=traffic_mirror: FR:Tag:highway=traffic mirror
     highway=traffic_signals: FR:Tag:highway=traffic signals
@@ -14719,6 +17173,7 @@ fr:
     landuse=plant_nursery: FR:Tag:landuse=plant nursery
     landuse=pond: FR:Tag:landuse=pond
     landuse=quarry: FR:Tag:landuse=quarry
+    landuse=recreation_ground: FR:Tag:landuse=recreation ground
     landuse=religious: FR:Tag:landuse=religious
     landuse=residential: FR:Tag:landuse=residential
     landuse=retail: FR:Tag:landuse=retail
@@ -14742,7 +17197,6 @@ fr:
     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
@@ -14767,17 +17221,20 @@ fr:
     line_attachment=suspension: FR:Tag:line attachment=suspension
     line_management=branch: FR:Tag:line management=branch
     line_management=split: FR:Tag:line management=split
+    location=underground: FR:Tag:location=underground
     man_made=adit: FR:Tag:man made=adit
     man_made=architecture_line: FR:Tag:man made=architecture line
     man_made=beehive: FR:Tag:man made=beehive
     man_made=bridge: FR:Tag:man made=bridge
     man_made=carpet_hanger: FR:Tag:man made=carpet hanger
     man_made=cellar_entrance: FR:Tag:man made=cellar entrance
+    man_made=cross: FR:Tag:man made=cross
     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=gantry: FR:Tag:man made=gantry
     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
@@ -14794,6 +17251,7 @@ fr:
     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=torii: FR:Tag:man made=torii
     man_made=tower: FR:Tag:man made=tower
     man_made=utility_pole: FR:Tag:man made=utility pole
     man_made=wastewater_plant: FR:Tag:man made=wastewater plant
@@ -14812,6 +17270,7 @@ fr:
     marker=plate: FR:Tag:marker=plate
     marker=post: FR:Tag:marker=post
     marker=stone: FR:Tag:marker=stone
+    material=concrete: FR:Tag:material=concrete
     medical=aed: FR:Tag:medical=aed
     memorial=ghost_bike: FR:Tag:memorial=ghost bike
     memorial=plaque: FR:Tag:memorial=plaque
@@ -14828,6 +17287,7 @@ fr:
     natural=isthmus: FR:Tag:natural=isthmus
     natural=peak: FR:Tag:natural=peak
     natural=peninsula: FR:Tag:natural=peninsula
+    natural=rock: FR:Tag:natural=rock
     natural=saddle: FR:Tag:natural=saddle
     natural=scree: FR:Tag:natural=scree
     natural=scrub: FR:Tag:natural=scrub
@@ -14859,13 +17319,30 @@ fr:
     office=ngo: FR:Tag:office=ngo
     office=parish: FR:Tag:office=parish
     office=political_party: FR:Tag:office=political party
+    office=publisher: FR:Tag:office=publisher
     office=religion: FR:Tag:office=religion
     office=supervised_injection_site: FR:Tag:office=supervised injection site
+    office=travel_agent: FR:Tag:office=travel agent
+    opening_hours:signed=no: FR:Tag:opening hours:signed=no
+    operator=EDF: FR:Tag:operator=EDF
     operator=ERDF: FR:Tag:operator=ERDF
     operator=Enedis: FR:Tag:operator=Enedis
     operator=GRDF: FR:Tag:operator=GRDF
+    operator=GRTgaz: FR:Tag:operator=GRTgaz
+    operator=Orange: FR:Tag:operator=Orange
     operator=RTE: FR:Tag:operator=RTE
+    operator=Régie_Gaz_Électricité_de_Sallanches: FR:Tag:operator=Régie Gaz Électricité
+      de Sallanches
+    operator=SNCF_Réseau: FR:Tag:operator=SNCF Réseau
+    outdoor_seating=terrace: FR:Tag:outdoor seating=terrace
+    outlet=bell_mouth: FR:Tag:outlet=bell mouth
+    outlet=direct: FR:Tag:outlet=direct
+    outlet=noise_barrier: FR:Tag:outlet=noise barrier
+    outlet=screen: FR:Tag:outlet=screen
+    outlet=sock: FR:Tag:outlet=sock
+    outlet=valve: FR:Tag:outlet=valve
     parking=street_side: FR:Tag:parking=street side
+    parking=surface: FR:Tag:parking=surface
     pipeline=substation: FR:Tag:pipeline=substation
     pipeline=valve: FR:Tag:pipeline=valve
     piste:type=nordic: FR:Tag:piste:type=nordic
@@ -14897,6 +17374,7 @@ fr:
     power=sub_station: FR:Tag:power=sub station
     power=substation: FR:Tag:power=substation
     power=switch: FR:Tag:power=switch
+    power=switchgear: FR:Tag:power=switchgear
     power=terminal: FR:Tag:power=terminal
     power=tower: FR:Tag:power=tower
     power=transformer: FR:Tag:power=transformer
@@ -14905,6 +17383,8 @@ fr:
     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=abandoned: FR:Tag:railway=abandoned
+    railway=crossing: FR:Tag:railway=crossing
     railway=disused: FR:Tag:railway=disused
     railway=funicular: FR:Tag:railway=funicular
     railway=halt: FR:Tag:railway=halt
@@ -14919,6 +17399,7 @@ fr:
     railway=switch: FR:Tag:railway=switch
     railway=tram: FR:Tag:railway=tram
     railway=tram_stop: FR:Tag:railway=tram stop
+    railway=wash: FR:Tag:railway=wash
     railway=water_crane: FR:Tag:railway=water crane
     recycling_type=centre: FR:Tag:recycling type=centre
     religion=buddhist: FR:Tag:religion=buddhist
@@ -14956,6 +17437,7 @@ fr:
     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
+    shelter_type=public_transport: FR:Tag:shelter type=public transport
     shop=agrarian: FR:Tag:shop=agrarian
     shop=alcohol: FR:Tag:shop=alcohol
     shop=anime: FR:Tag:shop=anime
@@ -14988,7 +17470,6 @@ fr:
     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
@@ -14999,6 +17480,7 @@ fr:
     shop=funeral_directors: FR:Tag:shop=funeral directors
     shop=furnace: FR:Tag:shop=furnace
     shop=furniture: FR:Tag:shop=furniture
+    shop=games: FR:Tag:shop=games
     shop=garden_centre: FR:Tag:shop=garden centre
     shop=general: FR:Tag:shop=general
     shop=gift: FR:Tag:shop=gift
@@ -15015,6 +17497,7 @@ fr:
     shop=kitchen: FR:Tag:shop=kitchen
     shop=laundry: FR:Tag:shop=laundry
     shop=mall: FR:Tag:shop=mall
+    shop=massage: FR:Tag:shop=massage
     shop=medical_supply: FR:Tag:shop=medical supply
     shop=military_surplus: FR:Tag:shop=military surplus
     shop=mobile_phone: FR:Tag:shop=mobile phone
@@ -15033,6 +17516,7 @@ fr:
     shop=shoes: FR:Tag:shop=shoes
     shop=stationery: FR:Tag:shop=stationery
     shop=supermarket: FR:Tag:shop=supermarket
+    shop=tattoo: FR:Tag:shop=tattoo
     shop=ticket: FR:Tag:shop=ticket
     shop=toys: FR:Tag:shop=toys
     shop=trade: FR:Tag:shop=trade
@@ -15040,9 +17524,11 @@ fr:
     shop=variety_store: FR:Tag:shop=variety store
     shop=video: FR:Tag:shop=video
     shop=video_games: FR:Tag:shop=video games
+    shop=weapons: FR:Tag:shop=weapons
     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=10pin: FR:Tag:sport=10pin
     sport=8pin: FR:Tag:sport=8pin
     sport=archery: FR:Tag:sport=archery
     sport=billiards: FR:Tag:sport=billiards
@@ -15066,7 +17552,13 @@ fr:
     sport=swimming: FR:Tag:sport=swimming
     sport=table_soccer: FR:Tag:sport=table soccer
     sport=table_tennis: FR:Tag:sport=table tennis
+    substation=converter: FR:Tag:substation=converter
+    substation=distribution: FR:Tag:substation=distribution
+    substation=industrial: FR:Tag:substation=industrial
+    substation=minor_distribution: FR:Tag:substation=minor distribution
     substation=traction: FR:Tag:substation=traction
+    substation=transition: FR:Tag:substation=transition
+    substation=transmission: FR:Tag:substation=transmission
     switch=circuit_breaker: FR:Tag:switch=circuit breaker
     switch=disconnector: FR:Tag:switch=disconnector
     switch=earthing: FR:Tag:switch=earthing
@@ -15103,6 +17595,7 @@ fr:
     tourism=viewpoint: FR:Tag:tourism=viewpoint
     tourism=wilderness_hut: FR:Tag:tourism=wilderness hut
     tourism=zoo: FR:Tag:tourism=zoo
+    tower:construction=lattice: FR:Tag:tower:construction=lattice
     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
@@ -15124,8 +17617,10 @@ fr:
     transformer=converter: FR:Tag:transformer=converter
     transformer=distribution: FR:Tag:transformer=distribution
     transformer=generator: FR:Tag:transformer=generator
+    transformer=main: FR:Tag:transformer=main
     transformer=phase_angle_regulator: FR:Tag:transformer=phase angle regulator
     transformer=traction: FR:Tag:transformer=traction
+    tunnel=building_passage: FR:Tag:tunnel=building passage
     tunnel=culvert: FR:Tag:tunnel=culvert
     tunnel=flooded: FR:Tag:tunnel=flooded
     type=waterway: FR:Tag:type=waterway
@@ -15134,6 +17629,8 @@ fr:
     usage=penstock: FR:Tag:usage=penstock
     usage=spillway: FR:Tag:usage=spillway
     usage=tailrace: FR:Tag:usage=tailrace
+    usage=transmission: FR:Tag:usage=transmission
+    utility=heating: FR:Tag:utility=heating
     utility=power: FR:Tag:utility=power
     utility=street_lighting: FR:Tag:utility=street lighting
     utility=telecom: FR:Tag:utility=telecom
@@ -15141,6 +17638,7 @@ fr:
     valve=butterfly: FR:Tag:valve=butterfly
     valve=gate: FR:Tag:valve=gate
     valve=globe: FR:Tag:valve=globe
+    valve=hollow_jet: FR:Tag:valve=hollow jet
     valve=needle: FR:Tag:valve=needle
     valve=plug: FR:Tag:valve=plug
     vending=bread: FR:Tag:vending=bread
@@ -15161,9 +17659,11 @@ fr:
     vending=sweets: FR:Tag:vending=sweets
     vending=water: FR:Tag:vending=water
     wall=no: FR:Tag:wall=no
+    waste=cigarettes: FR:Tag:waste=cigarettes
     waste=dog_excrement: FR:Tag:waste=dog excrement
     water=pond: FR:Tag:water=pond
     water=reservoir: FR:Tag:water=reservoir
+    water=river: FR:Tag:water=river
     waterway=boatyard: FR:Tag:waterway=boatyard
     waterway=canal: FR:Tag:waterway=canal
     waterway=dam: FR:Tag:waterway=dam
@@ -15176,10 +17676,13 @@ fr:
     waterway=river: FR:Tag:waterway=river
     waterway=riverbank: FR:Tag:waterway=riverbank
     waterway=stream: FR:Tag:waterway=stream
+    waterway=tidal_channel: FR:Tag:waterway=tidal channel
     waterway=waterfall: FR:Tag:waterway=waterfall
     waterway=weir: FR:Tag:waterway=weir
+    wetland=mangrove: FR:Tag:wetland=mangrove
     wetland=marsh: FR:Tag:wetland=marsh
     wetland=reedbed: FR:Tag:wetland=reedbed
+    wetland=saltern: FR:Tag:wetland=saltern
     wetland=swamp: FR:Tag:wetland=swamp
     zoo=aviary: FR:Tag:zoo=aviary
     zoo=birds: FR:Tag:zoo=birds
@@ -15245,6 +17748,7 @@ hr:
   tag:
     amenity=atm: Hr:Tag:amenity=atm
     amenity=bank: Hr:Tag:amenity=bank
+    amenity=school: Hr:Tag:amenity=school
 ht:
   key:
     intermittent: Ht:Key:intermittent
@@ -15309,6 +17813,7 @@ id:
     waterway=tidal_channel: Id:Tag:waterway=tidal channel
 it:
   key:
+    abandoned: IT:Key:abandoned
     abutters: IT:Key:abutters
     access: IT:Key:access
     addr: IT:Key:addr
@@ -15337,6 +17842,7 @@ it:
     cables: IT:Key:cables
     capacity: IT:Key:capacity
     circuits: IT:Key:circuits
+    cocktails: IT:Key:cocktails
     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
@@ -15344,6 +17850,8 @@ it:
     construction: IT:Key:construction
     contact: IT:Key:contact
     contact:facebook: IT:Key:contact:facebook
+    contact:twitter: IT:Key:contact:twitter
+    covered: IT:Key:covered
     craft: IT:Key:craft
     crossing: IT:Key:crossing
     cutting: IT:Key:cutting
@@ -15366,6 +17874,8 @@ it:
     est_width: IT:Key:est width
     fee: IT:Key:fee
     fence_type: IT:Key:fence type
+    fireplace: IT:Key:fireplace
+    floating: IT:Key:floating
     ford: IT:Key:ford
     fruit: IT:Key:fruit
     fuel: IT:Key:fuel
@@ -15384,6 +17894,7 @@ it:
     lanes:psv: IT:Key:lanes:psv
     leisure: IT:Key:leisure
     length: IT:Key:length
+    lit_by_led: IT:Key:lit by led
     lock: IT:Key:lock
     man_made: IT:Key:man made
     manhole: IT:Key:manhole
@@ -15457,11 +17968,13 @@ it:
     sidewalk: IT:Key:sidewalk
     smoothness: IT:Key:smoothness
     sport: IT:Key:sport
+    stamps: IT:Key:stamps
     stop: IT:Key:stop
     surface: IT:Key:surface
     surveillance: IT:Key:surveillance
     tank_trap: IT:Key:tank trap
     taxi: IT:Key:taxi
+    telecom: IT:Key:telecom
     tourism: IT:Key:tourism
     tracktype: IT:Key:tracktype
     traffic_calming: IT:Key:traffic calming
@@ -15478,6 +17991,7 @@ it:
     zone:maxspeed: IT:Key:zone:maxspeed
   tag:
     access=customers: IT:Tag:access=customers
+    aerialway=magic_carpet: IT:Tag:aerialway=magic carpet
     aeroway=aerodrome: IT:Tag:aeroway=aerodrome
     aeroway=airstrip: IT:Tag:aeroway=airstrip
     aeroway=apron: IT:Tag:aeroway=apron
@@ -15507,8 +18021,10 @@ it:
     amenity=cafe: IT:Tag:amenity=cafe
     amenity=cinema: IT:Tag:amenity=cinema
     amenity=college: IT:Tag:amenity=college
+    amenity=dancing_school: IT:Tag:amenity=dancing school
     amenity=dentist: IT:Tag:amenity=dentist
     amenity=dive_centre: IT:Tag:amenity=dive centre
+    amenity=dog_parking: IT:Tag:amenity=dog parking
     amenity=driving_school: IT:Tag:amenity=driving school
     amenity=fast_food: IT:Tag:amenity=fast food
     amenity=fire_station: IT:Tag:amenity=fire station
@@ -15518,8 +18034,11 @@ it:
     amenity=hunting_stand: IT:Tag:amenity=hunting stand
     amenity=ice_cream: IT:Tag:amenity=ice cream
     amenity=kindergarten: IT:Tag:amenity=kindergarten
+    amenity=lavoir: IT:Tag:amenity=lavoir
     amenity=milk_dispenser: IT:Tag:amenity=milk dispenser
+    amenity=parcel_locker: IT:Tag:amenity=parcel locker
     amenity=parking: IT:Tag:amenity=parking
+    amenity=payment_terminal: IT:Tag:amenity=payment terminal
     amenity=pharmacy: IT:Tag:amenity=pharmacy
     amenity=photo_booth: IT:Tag:amenity=photo booth
     amenity=place_of_worship: IT:Tag:amenity=place of worship
@@ -15530,10 +18049,13 @@ it:
     amenity=recycling: IT:Tag:amenity=recycling
     amenity=restaurant: IT:Tag:amenity=restaurant
     amenity=school: IT:Tag:amenity=school
+    amenity=ski_school: IT:Tag:amenity=ski 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
+    amenity=watering_place: IT:Tag:amenity=watering place
+    amenity=weighbridge: IT:Tag:amenity=weighbridge
     barrier=block: IT:Tag:barrier=block
     barrier=bollard: IT:Tag:barrier=bollard
     barrier=border_control: IT:Tag:barrier=border control
@@ -15567,6 +18089,7 @@ it:
     barrier=rope: IT:Tag:barrier=rope
     barrier=sally_port: IT:Tag:barrier=sally port
     barrier=spikes: IT:Tag:barrier=spikes
+    barrier=step: IT:Tag:barrier=step
     barrier=stile: IT:Tag:barrier=stile
     barrier=sump_buster: IT:Tag:barrier=sump buster
     barrier=swing_gate: IT:Tag:barrier=swing gate
@@ -15575,6 +18098,7 @@ it:
     barrier=turnstile: IT:Tag:barrier=turnstile
     barrier=wall: IT:Tag:barrier=wall
     bridge=boardwalk: IT:Tag:bridge=boardwalk
+    building=bridge: IT:Tag:building=bridge
     building=hospital: IT:Tag:building=hospital
     building=residential: IT:Tag:building=residential
     building=retail: IT:Tag:building=retail
@@ -15660,6 +18184,7 @@ it:
     esperanto=yes: IT:Tag:esperanto=yes
     footway=crossing: IT:Tag:footway=crossing
     footway=sidewalk: IT:Tag:footway=sidewalk
+    generator:source=nuclear: IT:Tag:generator:source=nuclear
     geological=moraine: IT:Tag:geological=moraine
     geological=outcrop: IT:Tag:geological=outcrop
     geological=palaeontological_site: IT:Tag:geological=palaeontological site
@@ -15691,6 +18216,7 @@ it:
     highway=trunk_link: IT:Tag:highway=trunk link
     historic=archaeological_site: IT:Tag:historic=archaeological site
     historic=locomotive: IT:Tag:historic=locomotive
+    historic=monument: IT:Tag:historic=monument
     historic=paleontological_site: IT:Tag:historic=paleontological site
     historic=wayside_shrine: IT:Tag:historic=wayside shrine
     industrial=auto_wrecker: IT:Tag:industrial=auto wrecker
@@ -15709,10 +18235,14 @@ it:
     leisure=garden: IT:Tag:leisure=garden
     leisure=marina: IT:Tag:leisure=marina
     leisure=nature_reserve: IT:Tag:leisure=nature reserve
+    leisure=park: IT:Tag:leisure=park
     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=compass_rose: IT:Tag:man made=compass rose
+    man_made=courtyard: IT:Tag:man made=courtyard
+    man_made=flare: IT:Tag:man made=flare
     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
@@ -15727,6 +18257,7 @@ it:
     natural=tree_row: IT:Tag:natural=tree row
     natural=wetland: IT:Tag:natural=wetland
     office=foundation: IT:Tag:office=foundation
+    office=graphic_design: IT:Tag:office=graphic design
     office=it: IT:Tag:office=it
     oneway=alternating: IT:Tag:oneway=alternating
     parking=street_side: IT:Tag:parking=street side
@@ -15812,6 +18343,7 @@ it:
     shop=newsagent: IT:Tag:shop=newsagent
     shop=pastry: IT:Tag:shop=pastry
     shop=pet_grooming: IT:Tag:shop=pet grooming
+    shop=pottery: IT:Tag:shop=pottery
     shop=radiotechnics: IT:Tag:shop=radiotechnics
     shop=robot: IT:Tag:shop=robot
     shop=seafood: IT:Tag:shop=seafood
@@ -15830,9 +18362,13 @@ it:
     sport=roller_hockey: IT:Tag:sport=roller hockey
     sport=surfing: IT:Tag:sport=surfing
     summit:cross=yes: IT:Tag:summit:cross=yes
+    telecom=data_center: IT:Tag:telecom=data center
+    telecom=exchange: IT:Tag:telecom=exchange
     tourism=aquarium: IT:Tag:tourism=aquarium
     tourism=artwork: IT:Tag:tourism=artwork
     tourism=museum: IT:Tag:tourism=museum
+    tourism=picnic_site: IT:Tag:tourism=picnic site
+    vending=parcel_pickup: IT:Tag:vending=parcel pickup
     vending=parking_tickets: IT:Tag:vending=parking tickets
     vending=toll: IT:Tag:vending=toll
     waterway=ditch: IT:Tag:waterway=ditch
@@ -16038,7 +18574,6 @@ 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
@@ -16068,6 +18603,7 @@ ja:
     entrance: JA:Key:entrance
     est_width: JA:Key:est width
     evacuation_route: JA:Key:evacuation route
+    exhibit: JA:Key:exhibit
     exit: JA:Key:exit
     exit_to: JA:Key:exit to
     expressway: JA:Key:expressway
@@ -16248,6 +18784,7 @@ ja:
     microbrewery: JA:Key:microbrewery
     milestone_type: JA:Key:milestone type
     military: JA:Key:military
+    military_service: JA:Key:military service
     min_age: JA:Key:min age
     min_height: JA:Key:min height
     minspeed: JA:Key:minspeed
@@ -16342,7 +18879,6 @@ ja:
     post_box:type: JA:Key:post box:type
     postal_code: JA:Key:postal code
     power: JA:Key:power
-    power_source: JA:Key:power source
     power_supply: JA:Key:power supply
     priority: JA:Key:priority
     priority_road: JA:Key:priority road
@@ -16649,6 +19185,7 @@ ja:
     amenity=doctors: JA:Tag:amenity=doctors
     amenity=dojo: JA:Tag:amenity=dojo
     amenity=drinking_water: JA:Tag:amenity=drinking water
+    amenity=driver_training: JA:Tag:amenity=driver training
     amenity=driving_school: JA:Tag:amenity=driving school
     amenity=embassy: JA:Tag:amenity=embassy
     amenity=emergency_phone: JA:Tag:amenity=emergency phone
@@ -16727,6 +19264,7 @@ ja:
     amenity=taxi: JA:Tag:amenity=taxi
     amenity=telephone: JA:Tag:amenity=telephone
     amenity=theatre: JA:Tag:amenity=theatre
+    amenity=ticket_validator: JA:Tag:amenity=ticket validator
     amenity=toilets: JA:Tag:amenity=toilets
     amenity=townhall: JA:Tag:amenity=townhall
     amenity=university: JA:Tag:amenity=university
@@ -16740,6 +19278,10 @@ ja:
     amenity=water_point: JA:Tag:amenity=water point
     amenity=watering_place: JA:Tag:amenity=watering place
     amenity=winery: JA:Tag:amenity=winery
+    artwork_type=bust: JA:Tag:artwork type=bust
+    artwork_type=mural: JA:Tag:artwork type=mural
+    artwork_type=sculpture: JA:Tag:artwork type=sculpture
+    artwork_type=statue: JA:Tag:artwork type=statue
     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
@@ -16874,6 +19416,7 @@ ja:
     bus=no: JA:Tag:bus=no
     busway=opposite_lane: JA:Tag:busway=opposite lane
     castle_type=fortress: JA:Tag:castle type=fortress
+    castle_type=shiro: JA:Tag:castle type=shiro
     cemetery=grave: JA:Tag:cemetery=grave
     club=fan: JA:Tag:club=fan
     craft=agricultural_engines: JA:Tag:craft=agricultural engines
@@ -17027,6 +19570,7 @@ ja:
     golf=driving_range: JA:Tag:golf=driving range
     golf=fairway: JA:Tag:golf=fairway
     goods=destination: JA:Tag:goods=destination
+    government=audit: JA:Tag:government=audit
     government=ministry: JA:Tag:government=ministry
     government=prosecutor: JA:Tag:government=prosecutor
     government=register_office: JA:Tag:government=register office
@@ -17146,6 +19690,7 @@ ja:
     junction=circular: JA:Tag:junction=circular
     junction=roundabout: JA:Tag:junction=roundabout
     junction=yes: JA:Tag:junction=yes
+    landcover=trees: JA:Tag:landcover=trees
     landuse=allotments: JA:Tag:landuse=allotments
     landuse=aquaculture: JA:Tag:landuse=aquaculture
     landuse=basin: JA:Tag:landuse=basin
@@ -17155,6 +19700,7 @@ ja:
     landuse=commercial: JA:Tag:landuse=commercial
     landuse=construction: JA:Tag:landuse=construction
     landuse=depot: JA:Tag:landuse=depot
+    landuse=education: JA:Tag:landuse=education
     landuse=farm: JA:Tag:landuse=farm
     landuse=farmland: JA:Tag:landuse=farmland
     landuse=farmyard: JA:Tag:landuse=farmyard
@@ -17237,6 +19783,7 @@ ja:
     man_made=breakwater: JA:Tag:man made=breakwater
     man_made=bridge: JA:Tag:man made=bridge
     man_made=bunker_silo: JA:Tag:man made=bunker silo
+    man_made=cairn: JA:Tag:man made=cairn
     man_made=campanile: JA:Tag:man made=campanile
     man_made=chimney: JA:Tag:man made=chimney
     man_made=clearcut: JA:Tag:man made=clearcut
@@ -17292,6 +19839,7 @@ ja:
     microbrewery=yes: JA:Tag:microbrewery=yes
     military=airfield: JA:Tag:military=airfield
     military=ammunition: JA:Tag:military=ammunition
+    military=base: JA:Tag:military=base
     military=bunker: JA:Tag:military=bunker
     military=checkpoint: JA:Tag:military=checkpoint
     military=danger_area: JA:Tag:military=danger area
@@ -17311,6 +19859,7 @@ ja:
     natural=bay: JA:Tag:natural=bay
     natural=beach: JA:Tag:natural=beach
     natural=blowhole: JA:Tag:natural=blowhole
+    natural=cape: JA:Tag:natural=cape
     natural=cave_entrance: JA:Tag:natural=cave entrance
     natural=cliff: JA:Tag:natural=cliff
     natural=coastline: JA:Tag:natural=coastline
@@ -17322,10 +19871,12 @@ ja:
     natural=grassland: JA:Tag:natural=grassland
     natural=heath: JA:Tag:natural=heath
     natural=hot_spring: JA:Tag:natural=hot spring
+    natural=isthmus: JA:Tag:natural=isthmus
     natural=land: JA:Tag:natural=land
     natural=moor: JA:Tag:natural=moor
     natural=mud: JA:Tag:natural=mud
     natural=peak: JA:Tag:natural=peak
+    natural=peninsula: JA:Tag:natural=peninsula
     natural=ridge: JA:Tag:natural=ridge
     natural=riverbed: JA:Tag:natural=riverbed
     natural=rock: JA:Tag:natural=rock
@@ -17338,6 +19889,7 @@ ja:
     natural=sinkhole: JA:Tag:natural=sinkhole
     natural=spring: JA:Tag:natural=spring
     natural=stone: JA:Tag:n