Update wiki page data
authorTom Hughes <tom@compton.nu>
Wed, 26 Sep 2018 22:28:40 +0000 (23:28 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 26 Sep 2018 22:28:40 +0000 (23:28 +0100)
config/wiki_pages.yml

index ccf8744..7555362 100644 (file)
@@ -21,6 +21,11 @@ bg:
     natural=heath: Bg:Tag:natural=heath
     railway=crossing: Bg:Tag:railway=crossing
     railway=level_crossing: Bg:Tag:railway=level crossing
+bn:
+  key:
+    highway: Bn:Key:highway
+  tag:
+    highway=residential: Bn:Tag:highway=residential
 ca:
   key:
     amenity: Ca:Key:amenity
@@ -28,8 +33,10 @@ ca:
     operator:type: Ca:Key:operator:type
     phone: Ca:Key:phone
   tag:
+    amenity=post_box: Ca:Tag:amenity=post box
     landuse=farmland: Ca:Tag:landuse=farmland
     leisure=swimming_pool: Ca:Tag:leisure=swimming pool
+    office=notary: Ca:Tag:office=notary
     place=isolated_dwelling: Ca:Tag:place=isolated dwelling
     shop=frozen_food: Ca:Tag:shop=frozen food
 cs:
@@ -45,6 +52,7 @@ cs:
     abandoned:amenity: Cs:Key:abandoned:amenity
     abutters: Cs:Key:abutters
     access: Cs:Key:access
+    access:conditional: Cs:Key:access:conditional
     access:lanes: Cs:Key:access:lanes
     addr: Cs:Key:addr
     addr:city: Cs:Key:addr:city
@@ -964,6 +972,7 @@ cs:
     amenity=townhall: Cs:Tag:amenity=townhall
     amenity=university: Cs:Tag:amenity=university
     amenity=vacuum_cleaner: Cs:Tag:amenity=vacuum cleaner
+    amenity=vehicle_inspection: Cs:Tag:amenity=vehicle inspection
     amenity=vending_machine: Cs:Tag:amenity=vending machine
     amenity=veterinary: Cs:Tag:amenity=veterinary
     amenity=waste_basket: Cs:Tag:amenity=waste basket
@@ -1740,6 +1749,7 @@ cs:
     place=suburb: Cs:Tag:place=suburb
     place=town: Cs:Tag:place=town
     place=village: Cs:Tag:place=village
+    power=catenary_mast: Cs:Tag:power=catenary mast
     power=generator: Cs:Tag:power=generator
     power=heliostat: Cs:Tag:power=heliostat
     power=terminal: Cs:Tag:power=terminal
@@ -1974,7 +1984,6 @@ cs:
     shop=pharmacy: Cs:Tag:shop=pharmacy
     shop=photo: Cs:Tag:shop=photo
     shop=photography: Cs:Tag:shop=photography
-    shop=piercing: Cs:Tag:shop=piercing
     shop=pottery: Cs:Tag:shop=pottery
     shop=printing: Cs:Tag:shop=printing
     shop=pyrotechnics: Cs:Tag:shop=pyrotechnics
@@ -2212,6 +2221,7 @@ da:
     amenity=place_of_worship: Da:Tag:amenity=place of worship
     amenity=veterinary: Da:Tag:amenity=veterinary
     highway=bridleway: Da:Tag:highway=bridleway
+    highway=cycleway: Da:Tag:highway=cycleway
     highway=ford: Da:Tag:highway=ford
     highway=road: Da:Tag:highway=road
     highway=tertiary: Da:Tag:highway=tertiary
@@ -2223,6 +2233,7 @@ da:
     place=village: Da:Tag:place=village
     route=ferry: Da:Tag:route=ferry
     service=driveway: Da:Tag:service=driveway
+    shop=charity: Da:Tag:shop=charity
 de:
   key:
     AlpinRes_ID: DE:Key:AlpinRes ID
@@ -2230,6 +2241,7 @@ de:
     Annotations: DE:Key:Annotations
     FIXME: DE:Key:FIXME
     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:*
@@ -2249,6 +2261,7 @@ de:
     advertising: DE:Key:advertising
     aerialway: DE:Key:aerialway
     aerialway:drag_lift: DE:Key:aerialway:drag lift
+    aerodrome:type: DE:Key:aerodrome:type
     aeroway: DE:Key:aeroway
     after_school: DE:Key:after school
     agricultural: DE:Key:agricultural
@@ -2262,8 +2275,10 @@ de:
     automated: DE:Key:automated
     backcountry: DE:Key:backcountry
     backrest: DE:Key:backrest
+    backward: DE:Key:backward
     barrier: DE:Key:barrier
     basin: DE:Key:basin
+    bath:type: DE:Key:bath:type
     bdouble: DE:Key:bdouble
     beacon:type: DE:Key:beacon:type
     beds: DE:Key:beds
@@ -2308,6 +2323,7 @@ de:
     carriage: DE:Key:carriage
     castle_type: DE:Key:castle type
     cemetery: DE:Key:cemetery
+    check_date: DE:Key:check date
     circuits: DE:Key:circuits
     circumference: DE:Key:circumference
     city_limit: DE:Key:city limit
@@ -2376,6 +2392,8 @@ de:
     diaper: DE:Key:diaper
     diet: DE:Key:diet
     diet:*: DE:Key:diet:*
+    diet:vegan: DE:Key:diet:vegan
+    diet:vegetarian: DE:Key:diet:vegetarian
     diplomatic: DE:Key:diplomatic
     direction: DE:Key:direction
     display: DE:Key:display
@@ -2402,17 +2420,21 @@ de:
     ferry:cable: DE:Key:ferry:cable
     fetish: DE:Key:fetish
     fire_hydrant: DE:Key:fire hydrant
-    fire_hydrant:type: DE:Key:fire hydrant:type
     fireplace: DE:Key:fireplace
     fixme: DE:Key:fixme
     floating: DE:Key:floating
     foot: DE:Key:foot
     footway: DE:Key:footway
     ford: DE:Key:ford
+    format: DE:Key:format
     fortification_type: DE:Key:fortification type
+    forward: DE:Key:forward
     frequency: DE:Key:frequency
     from: DE:Key:from
     fuel: DE:Key:fuel
+    fuel:LH2: DE:Key:fuel:LH2
+    garden:style: DE:Key:garden:style
+    garden:type: DE:Key:garden:type
     gauge: DE:Key:gauge
     generator:method: DE:Key:generator:method
     generator:output: DE:Key:generator:output
@@ -2428,6 +2450,7 @@ de:
     geological: DE:Key:geological
     golf:course: DE:Key:golf:course
     government: DE:Key:government
+    group_only: DE:Key:group only
     guest_house: DE:Key:guest house
     hazard: DE:Key:hazard
     hazmat: DE:Key:hazmat
@@ -2437,6 +2460,7 @@ de:
     hgv: DE:Key:hgv
     highspeed: DE:Key:highspeed
     highway: DE:Key:highway
+    hiking: DE:Key:hiking
     historic: DE:Key:historic
     historic:civilization: DE:Key:historic:civilization
     historic:period: DE:Key:historic:period
@@ -2460,6 +2484,7 @@ de:
     kids_area: DE:Key:kids area
     kms: DE:Key:kms
     kneipp_water_cure: DE:Key:kneipp water cure
+    landfill:waste: DE:Key:landfill:waste
     landuse: DE:Key:landuse
     lanes: DE:Key:lanes
     lanes:bus: DE:Key:lanes:bus
@@ -2482,24 +2507,29 @@ de:
     lock: DE:Key:lock
     lock_name: DE:Key:lock name
     lock_ref: DE:Key:lock ref
+    lockable: DE:Key:lockable
     lottery: DE:Key:lottery
     love_locks: DE:Key:love locks
     man_made: DE:Key:man made
     manhole: DE:Key:manhole
     manufacturer: DE:Key:manufacturer
     manufacturer:type: DE:Key:manufacturer:type
+    mapillary: DE:Key:mapillary
+    massage: DE:Key:massage
     material: DE:Key:material
     max_age: DE:Key:max age
     maxaxleload: DE:Key:maxaxleload
     maxheight: DE:Key:maxheight
     maxlength: DE:Key:maxlength
     maxspeed: DE:Key:maxspeed
+    maxspeed:type: DE:Key:maxspeed:type
     maxstay: DE:Key:maxstay
     maxweight: DE:Key:maxweight
     maxwidth: DE:Key:maxwidth
     megalith_type: DE:Key:megalith type
     memorial: DE:Key:memorial
     memorial:type: DE:Key:memorial:type
+    milestone_type: DE:Key:milestone type
     military: DE:Key:military
     min_age: DE:Key:min age
     mineshaft_type: DE:Key:mineshaft type
@@ -2526,6 +2556,7 @@ de:
     motorcycle: DE:Key:motorcycle
     motorcycle:clothes: DE:Key:motorcycle:clothes
     motorcycle:conditional: DE:Key:motorcycle:conditional
+    motorcycle:parking: DE:Key:motorcycle:parking
     motorcycle:parts: DE:Key:motorcycle:parts
     motorcycle:rental: DE:Key:motorcycle:rental
     motorcycle:repair: DE:Key:motorcycle:repair
@@ -2549,16 +2580,21 @@ de:
     note: DE:Key:note
     nudism: DE:Key:nudism
     nursery: DE:Key:nursery
+    observatory:type: DE:Key:observatory:type
     office: DE:Key:office
+    official_name: DE:Key:official name
     offshore: DE:Key:offshore
+    old_name: DE:Key:old name
     oneway: DE:Key:oneway
     oneway:bicycle: DE:Key:oneway:bicycle
     oneway:moped: DE:Key:oneway:moped
     onkz: DE:Key:onkz
     openfire: DE:Key:openfire
     opening_hours: DE:Key:opening hours
+    opening_hours:kitchen: DE:Key:opening hours:kitchen
     operator: DE:Key:operator
     operator:MNC: DE:Key:operator:MNC
+    operator:type: DE:Key:operator:type
     organic: DE:Key:organic
     osak: DE:Key:osak
     osmc:status: DE:Key:osmc:status
@@ -2579,6 +2615,9 @@ de:
     placement: DE:Key:placement
     plant: DE:Key:plant
     plant:output: DE:Key:plant:output
+    plant:output:electricity: DE:Key:plant:output:electricity
+    plant:output:hot_water: DE:Key:plant:output:hot water
+    plant:source: DE:Key:plant:source
     playground: DE:Key:playground
     'playground:': 'DE:Key:playground:'
     population: DE:Key:population
@@ -2625,6 +2664,7 @@ de:
     seamark: DE:Key:seamark
     seamark:fixme: DE:Key:seamark:fixme
     seamark:type: DE:Key:seamark:type
+    seasonal: DE:Key:seasonal
     seats: DE:Key:seats
     second_hand: DE:Key:second hand
     segregated: DE:Key:segregated
@@ -2636,6 +2676,7 @@ de:
     shelter_type: DE:Key:shelter type
     shooting: DE:Key:shooting
     shop: DE:Key:shop
+    short_protection_title: DE:Key:short protection title
     shower: DE:Key:shower
     sidewalk: DE:Key:sidewalk
     site_type: DE:Key:site type
@@ -2665,11 +2706,14 @@ de:
     surface: DE:Key:surface
     surveillance: DE:Key:surveillance
     surveillance:zone: DE:Key:surveillance:zone
+    survey:date: DE:Key:survey:date
+    swimming_pool: DE:Key:swimming pool
     symbol: DE:Key:symbol
     tactile_paving: DE:Key:tactile paving
     tactile_writing: DE:Key:tactile writing
     takeaway: DE:Key:takeaway
     target: DE:Key:target
+    telescope:type: DE:Key:telescope:type
     tidal: DE:Key:tidal
     to: DE:Key:to
     todo: DE:Key:todo
@@ -2678,6 +2722,7 @@ de:
     toll: DE:Key:toll
     tomb: DE:Key:tomb
     tourism: DE:Key:tourism
+    tower:construction: DE:Key:tower:construction
     tower:type: DE:Key:tower:type
     tracks: DE:Key:tracks
     tracktype: DE:Key:tracktype
@@ -2702,6 +2747,7 @@ de:
     voltage: DE:Key:voltage
     waste: DE:Key:waste
     water: DE:Key:water
+    water_characteristic: DE:Key:water characteristic
     waterway: DE:Key:waterway
     website: DE:Key:website
     wetland: DE:Key:wetland
@@ -2725,6 +2771,7 @@ de:
     abandoned:amenity=prison_camp: DE:Tag:abandoned:amenity=prison camp
     abandoned=yes: DE:Tag:abandoned=yes
     access=designated: DE:Tag:access=designated
+    access=destination: DE:Tag:access=destination
     access=private: DE:Tag:access=private
     admin_level=2: DE:Tag:admin level=2
     advertising=column: DE:Tag:advertising=column
@@ -2736,6 +2783,9 @@ de:
     aerialway=magic_carpet: DE:Tag:aerialway=magic carpet
     aerialway=pylon: DE:Tag:aerialway=pylon
     aerialway=station: DE:Tag:aerialway=station
+    aerodrome:type=gliding: DE:Tag:aerodrome:type=gliding
+    aerodrome:type=international: DE:Tag:aerodrome:type=international
+    aerodrome:type=regional: DE:Tag:aerodrome:type=regional
     aeroway=aerodrome: DE:Tag:aeroway=aerodrome
     aeroway=apron: DE:Tag:aeroway=apron
     aeroway=gate: DE:Tag:aeroway=gate
@@ -2743,6 +2793,7 @@ de:
     aeroway=helipad: DE:Tag:aeroway=helipad
     aeroway=heliport: DE:Tag:aeroway=heliport
     aeroway=navigationaid: DE:Tag:aeroway=navigationaid
+    aeroway=parking_position: DE:Tag:aeroway=parking position
     aeroway=runway: DE:Tag:aeroway=runway
     aeroway=spaceport: DE:Tag:aeroway=spaceport
     aeroway=taxiway: DE:Tag:aeroway=taxiway
@@ -2847,6 +2898,7 @@ de:
     amenity=school: DE:Tag:amenity=school
     amenity=shelter: DE:Tag:amenity=shelter
     amenity=shower: DE:Tag:amenity=shower
+    amenity=ski_school: DE:Tag:amenity=ski school
     amenity=smoking_area: DE:Tag:amenity=smoking area
     amenity=social_facility: DE:Tag:amenity=social facility
     amenity=stables: DE:Tag:amenity=stables
@@ -2874,28 +2926,35 @@ de:
     atm=yes: DE:Tag:atm=yes
     attraction=animal: DE:Tag:attraction=animal
     attraction=train: DE:Tag:attraction=train
+    attraction=water_slide: DE:Tag:attraction=water slide
     barrier=block: DE:Tag:barrier=block
     barrier=bollard: DE:Tag:barrier=bollard
     barrier=cattle_grid: DE:Tag:barrier=cattle grid
     barrier=city_wall: DE:Tag:barrier=city wall
     barrier=cycle_barrier: DE:Tag:barrier=cycle barrier
     barrier=ditch: DE:Tag:barrier=ditch
+    barrier=entrance: DE:Tag:barrier=entrance
     barrier=fence: DE:Tag:barrier=fence
     barrier=gate: DE:Tag:barrier=gate
     barrier=hedge: DE:Tag:barrier=hedge
     barrier=hedge_bank: DE:Tag:barrier=hedge bank
+    barrier=height_restrictor: DE:Tag:barrier=height restrictor
     barrier=kissing_gate: DE:Tag:barrier=kissing gate
     barrier=lift_gate: DE:Tag:barrier=lift gate
     barrier=retaining_wall: DE:Tag:barrier=retaining wall
     barrier=sally_port: DE:Tag:barrier=sally port
     barrier=toll_booth: DE:Tag:barrier=toll booth
     barrier=wall: DE:Tag:barrier=wall
+    bath:type=hammam: DE:Tag:bath:type=hammam
+    bath:type=thermal: DE:Tag:bath:type=thermal
+    bay=fjord: DE:Tag:bay=fjord
     bicycle=designated: DE:Tag:bicycle=designated
     bicycle=use_sidepath: DE:Tag:bicycle=use sidepath
     biosphärenwirt=yes: DE:Tag:biosphärenwirt=yes
     boundary=national_park: DE:Tag:boundary=national park
     boundary=postal_code: DE:Tag:boundary=postal code
     boundary=protected_area: DE:Tag:boundary=protected area
+    boundary=religious_administration: DE:Tag:boundary=religious administration
     boundary=water_protection_area: DE:Tag:boundary=water protection area
     bridge:movable=bascule: DE:Tag:bridge:movable=bascule
     bridge:movable=drawbridge: DE:Tag:bridge:movable=drawbridge
@@ -2919,12 +2978,14 @@ de:
     bridge=viaduct: DE:Tag:bridge=viaduct
     building=apartments: DE:Tag:building=apartments
     building=barn: DE:Tag:building=barn
+    building=boathouse: DE:Tag:building=boathouse
     building=bungalow: DE:Tag:building=bungalow
     building=cathedral: DE:Tag:building=cathedral
     building=chapel: DE:Tag:building=chapel
     building=church: DE:Tag:building=church
     building=civic: DE:Tag:building=civic
     building=commercial: DE:Tag:building=commercial
+    building=container: DE:Tag:building=container
     building=detached: DE:Tag:building=detached
     building=dormitory: DE:Tag:building=dormitory
     building=entrance: DE:Tag:building=entrance
@@ -2953,11 +3014,13 @@ de:
     building=shed: DE:Tag:building=shed
     building=shrine: DE:Tag:building=shrine
     building=slurry_tank: DE:Tag:building=slurry tank
+    building=sports_hall: DE:Tag:building=sports hall
     building=stable: DE:Tag:building=stable
     building=static_caravan: DE:Tag:building=static caravan
     building=sty: DE:Tag:building=sty
     building=synagogue: DE:Tag:building=synagogue
     building=tech_cab: DE:Tag:building=tech cab
+    building=temple: DE:Tag:building=temple
     building=terrace: DE:Tag:building=terrace
     building=train_station: DE:Tag:building=train station
     building=university: DE:Tag:building=university
@@ -2977,17 +3040,21 @@ de:
     club=fan: DE:Tag:club=fan
     club=scout: DE:Tag:club=scout
     club=sport: DE:Tag:club=sport
+    communication=line: DE:Tag:communication=line
     craft=agricultural_engines: DE:Tag:craft=agricultural engines
     craft=basket_maker: DE:Tag:craft=basket maker
     craft=beekeeper: DE:Tag:craft=beekeeper
     craft=blacksmith: DE:Tag:craft=blacksmith
     craft=boatbuilder: DE:Tag:craft=boatbuilder
     craft=bookbinder: DE:Tag:craft=bookbinder
+    craft=builder: DE:Tag:craft=builder
     craft=car_repair: DE:Tag:craft=car repair
     craft=carpenter: DE:Tag:craft=carpenter
     craft=carpet_layer: DE:Tag:craft=carpet layer
+    craft=caterer: DE:Tag:craft=caterer
     craft=chimney_sweeper: DE:Tag:craft=chimney sweeper
     craft=cooper: DE:Tag:craft=cooper
+    craft=dental_technician: DE:Tag:craft=dental technician
     craft=distillery: DE:Tag:craft=distillery
     craft=dressmaker: DE:Tag:craft=dressmaker
     craft=electrican: DE:Tag:craft=electrican
@@ -3014,6 +3081,8 @@ de:
     craft=scaffolder: DE:Tag:craft=scaffolder
     craft=shoemaker: DE:Tag:craft=shoemaker
     craft=stonemason: DE:Tag:craft=stonemason
+    craft=sun_protection: DE:Tag:craft=sun protection
+    craft=tailor: DE:Tag:craft=tailor
     craft=tiler: DE:Tag:craft=tiler
     craft=tinsmith: DE:Tag:craft=tinsmith
     craft=toolmaker: DE:Tag:craft=toolmaker
@@ -3053,8 +3122,13 @@ de:
     emergency=emergency_ward_entrance: DE:Tag:emergency=emergency ward entrance
     emergency=fire_hydrant: DE:Tag:emergency=fire hydrant
     emergency=fire_water_pond: DE:Tag:emergency=fire water pond
+    emergency=first_aid: DE:Tag:emergency=first aid
+    emergency=first_aid_kit: DE:Tag:emergency=first aid kit
     emergency=life_ring: DE:Tag:emergency=life ring
+    emergency=lifeguard_base: DE:Tag:emergency=lifeguard base
+    emergency=lifeguard_place: DE:Tag:emergency=lifeguard place
     emergency=lifeguard_tower: DE:Tag:emergency=lifeguard tower
+    emergency=mountain_rescue: DE:Tag:emergency=mountain rescue
     emergency=phone: DE:Tag:emergency=phone
     emergency=siren: DE:Tag:emergency=siren
     emergency=suction_point: DE:Tag:emergency=suction point
@@ -3062,9 +3136,11 @@ de:
     emergency_service=technical: DE:Tag:emergency service=technical
     entrance=main: DE:Tag:entrance=main
     entrance=yes: DE:Tag:entrance=yes
-    food=gourmet: DE:Tag:food=gourmet
     foot=designated: DE:Tag:foot=designated
+    footway=crossing: DE:Tag:footway=crossing
     footway=sidewalk: DE:Tag:footway=sidewalk
+    ford=stepping_stones: DE:Tag:ford=stepping stones
+    ford=yes: DE:Tag:ford=yes
     fortification_type=hill_fort: DE:Tag:fortification type=hill fort
     fortification_type=limes: DE:Tag:fortification type=limes
     fortification_type=ringfort: DE:Tag:fortification type=ringfort
@@ -3125,17 +3201,24 @@ de:
     golf=rough: DE:Tag:golf=rough
     golf=tee: DE:Tag:golf=tee
     golf=water_hazard: DE:Tag:golf=water hazard
+    government=cadaster: DE:Tag:government=cadaster
+    government=customs: DE:Tag:government=customs
+    government=healthcare: DE:Tag:government=healthcare
     government=ministry: DE:Tag:government=ministry
     government=prosecutor: DE:Tag:government=prosecutor
     government=register_office: DE:Tag:government=register office
+    government=statistics: DE:Tag:government=statistics
     government=tax: DE:Tag:government=tax
+    government=youth_welfare_department: DE:Tag:government=youth welfare department
     hazmat:water=permissive: DE:Tag:hazmat:water=permissive
     healthcare=blood_donation: DE:Tag:healthcare=blood donation
+    healthcare=laboratory: DE:Tag:healthcare=laboratory
     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=byway: DE:Tag:highway=byway
     highway=corridor: DE:Tag:highway=corridor
     highway=crossing: DE:Tag:highway=crossing
     highway=cycleway: DE:Tag:highway=cycleway
@@ -3149,6 +3232,7 @@ de:
     highway=give_way: DE:Tag:highway=give way
     highway=kerb: DE:Tag:highway=kerb
     highway=living_street: DE:Tag:highway=living street
+    highway=milestone: DE:Tag:highway=milestone
     highway=mini_roundabout: DE:Tag:highway=mini roundabout
     highway=motorway: DE:Tag:highway=motorway
     highway=motorway_junction: DE:Tag:highway=motorway junction
@@ -3217,6 +3301,7 @@ de:
     historic=wayside_shrine: DE:Tag:historic=wayside shrine
     historic=wreck: DE:Tag:historic=wreck
     horse=designated: DE:Tag:horse=designated
+    industrial=bakery: DE:Tag:industrial=bakery
     industrial=scrap_yard: DE:Tag:industrial=scrap yard
     information=audioguide: DE:Tag:information=audioguide
     information=board: DE:Tag:information=board
@@ -3308,6 +3393,7 @@ de:
     leisure=tanning_salon: DE:Tag:leisure=tanning salon
     leisure=track: DE:Tag:leisure=track
     leisure=water_park: DE:Tag:leisure=water park
+    leisure=wildlife_hide: DE:Tag:leisure=wildlife hide
     level_crossing=automatic_barrier: DE:Tag:level crossing=automatic barrier
     level_crossing=traffic_signals: DE:Tag:level crossing=traffic signals
     level_crossing=uncontrolled: DE:Tag:level crossing=uncontrolled
@@ -3397,6 +3483,9 @@ de:
     military=range: DE:Tag:military=range
     military=training_area: DE:Tag:military=training area
     motorcycle:type=scooter: DE:Tag:motorcycle:type=scooter
+    museum=history: DE:Tag:museum=history
+    museum=local: DE:Tag:museum=local
+    museum=railway: DE:Tag:museum=railway
     natural=anthill: DE:Tag:natural=anthill
     natural=arete: DE:Tag:natural=arete
     natural=bare_rock: DE:Tag:natural=bare rock
@@ -3410,6 +3499,7 @@ de:
     natural=geyser: DE:Tag:natural=geyser
     natural=glacier: DE:Tag:natural=glacier
     natural=grassland: DE:Tag:natural=grassland
+    natural=gully: DE:Tag:natural=gully
     natural=heath: DE:Tag:natural=heath
     natural=hot_spring: DE:Tag:natural=hot spring
     natural=moor: DE:Tag:natural=moor
@@ -3450,6 +3540,7 @@ de:
     network=rcn: DE:Tag:network=rcn
     network=rhn: DE:Tag:network=rhn
     network=rwn: DE:Tag:network=rwn
+    observatory:type=astronomical: DE:Tag:observatory:type=astronomical
     office=accountant: DE:Tag:office=accountant
     office=administrative: DE:Tag:office=administrative
     office=advertising_agency: DE:Tag:office=advertising agency
@@ -3460,16 +3551,19 @@ de:
     office=energy_supplier: DE:Tag:office=energy supplier
     office=estate_agent: DE:Tag:office=estate agent
     office=forestry: DE:Tag:office=forestry
+    office=geodesist: DE:Tag:office=geodesist
     office=government: DE:Tag:office=government
     office=guide: DE:Tag:office=guide
     office=insurance: DE:Tag:office=insurance
     office=lawyer: DE:Tag:office=lawyer
     office=moving_company: DE:Tag:office=moving company
     office=newspaper: DE:Tag:office=newspaper
+    office=ngo: DE:Tag:office=ngo
     office=parish: DE:Tag:office=parish
     office=political_party: DE:Tag:office=political party
     office=religion: DE:Tag:office=religion
     office=research: DE:Tag:office=research
+    office=surveyor: DE:Tag:office=surveyor
     office=tax_advisor: DE:Tag:office=tax advisor
     office=therapist: DE:Tag:office=therapist
     office=travel_agent: DE:Tag:office=travel agent
@@ -3482,6 +3576,7 @@ de:
     operator=cambio: DE:Tag:operator=cambio
     operator=stadtmobil: DE:Tag:operator=stadtmobil
     operator=teilAuto: DE:Tag:operator=teilAuto
+    park_ride: DE:Tag:park ride
     parking:lane:hgv=on_street: DE:Tag:parking:lane:hgv=on street
     pipeline=marker: DE:Tag:pipeline=marker
     pipeline=substation: DE:Tag:pipeline=substation
@@ -3537,6 +3632,7 @@ de:
     railway=halt: DE:Tag:railway=halt
     railway=level_crossing: DE:Tag:railway=level crossing
     railway=light_rail: DE:Tag:railway=light rail
+    railway=milestone: DE:Tag:railway=milestone
     railway=miniature: DE:Tag:railway=miniature
     railway=monorail: DE:Tag:railway=monorail
     railway=narrow_gauge: DE:Tag:railway=narrow gauge
@@ -3558,6 +3654,7 @@ de:
     railway=traverser: DE:Tag:railway=traverser
     railway=turntable: DE:Tag:railway=turntable
     railway=wash: DE:Tag:railway=wash
+    railway=water_tower: DE:Tag:railway=water tower
     railway=yard: DE:Tag:railway=yard
     religion=buddhist: DE:Tag:religion=buddhist
     religion=christian: DE:Tag:religion=christian
@@ -3595,6 +3692,7 @@ de:
     service=siding: DE:Tag:service=siding
     service=spur: DE:Tag:service=spur
     service=yard: DE:Tag:service=yard
+    shelter_type=basic_hut: DE:Tag:shelter type=basic hut
     shelter_type=lean_to: DE:Tag:shelter type=lean to
     shop=agrarian: DE:Tag:shop=agrarian
     shop=alcohol: DE:Tag:shop=alcohol
@@ -3614,10 +3712,12 @@ de:
     shop=boutique: DE:Tag:shop=boutique
     shop=butcher: DE:Tag:shop=butcher
     shop=camera: DE:Tag:shop=camera
+    shop=candles: DE:Tag:shop=candles
     shop=car: DE:Tag:shop=car
     shop=car_parts: DE:Tag:shop=car parts
     shop=car_repair: DE:Tag:shop=car repair
     shop=carpet: DE:Tag:shop=carpet
+    shop=ceramics: DE:Tag:shop=ceramics
     shop=charity: DE:Tag:shop=charity
     shop=cheese: DE:Tag:shop=cheese
     shop=chemist: DE:Tag:shop=chemist
@@ -3638,6 +3738,7 @@ de:
     shop=doityourself: DE:Tag:shop=doityourself
     shop=dry_cleaning: DE:Tag:shop=dry cleaning
     shop=electronics: DE:Tag:shop=electronics
+    shop=equestrian: DE:Tag:shop=equestrian
     shop=erotic: DE:Tag:shop=erotic
     shop=fabric: DE:Tag:shop=fabric
     shop=farm: DE:Tag:shop=farm
@@ -3647,6 +3748,7 @@ de:
     shop=flooring: DE:Tag:shop=flooring
     shop=florist: DE:Tag:shop=florist
     shop=frame: DE:Tag:shop=frame
+    shop=frozen_food: DE:Tag:shop=frozen food
     shop=funeral_directors: DE:Tag:shop=funeral directors
     shop=furniture: DE:Tag:shop=furniture
     shop=garden_centre: DE:Tag:shop=garden centre
@@ -3659,6 +3761,7 @@ de:
     shop=hairdresser: DE:Tag:shop=hairdresser
     shop=hairdresser_supply: DE:Tag:shop=hairdresser supply
     shop=hardware: DE:Tag:shop=hardware
+    shop=health_food: DE:Tag:shop=health food
     shop=hearing_aids: DE:Tag:shop=hearing aids
     shop=herbalist: DE:Tag:shop=herbalist
     shop=hifi: DE:Tag:shop=hifi
@@ -3691,9 +3794,12 @@ de:
     shop=perfumery: DE:Tag:shop=perfumery
     shop=pet: DE:Tag:shop=pet
     shop=photo: DE:Tag:shop=photo
+    shop=religion: DE:Tag:shop=religion
+    shop=robot: DE:Tag:shop=robot
     shop=scuba_diving: DE:Tag:shop=scuba diving
     shop=seafood: DE:Tag:shop=seafood
     shop=second_hand: DE:Tag:shop=second hand
+    shop=sewing: DE:Tag:shop=sewing
     shop=shoes: DE:Tag:shop=shoes
     shop=spare_parts: DE:Tag:shop=spare parts
     shop=spices: DE:Tag:shop=spices
@@ -3715,6 +3821,7 @@ de:
     shop=vacant: DE:Tag:shop=vacant
     shop=variety_store: DE:Tag:shop=variety store
     shop=video: DE:Tag:shop=video
+    shop=video_games: DE:Tag:shop=video games
     shop=watches: DE:Tag:shop=watches
     shop=weapons: DE:Tag:shop=weapons
     shop=wholesale: DE:Tag:shop=wholesale
@@ -3745,6 +3852,7 @@ de:
     sport=10pin: DE:Tag:sport=10pin
     sport=9pin: DE:Tag:sport=9pin
     sport=archery: DE:Tag:sport=archery
+    sport=athletics: DE:Tag:sport=athletics
     sport=baseball: DE:Tag:sport=baseball
     sport=basketball: DE:Tag:sport=basketball
     sport=bobsleigh: DE:Tag:sport=bobsleigh
@@ -3783,6 +3891,7 @@ de:
     substation=transmission: DE:Tag:substation=transmission
     summit:cross=yes: DE:Tag:summit:cross=yes
     surface=asphalt: DE:Tag:surface=asphalt
+    telescope:type=radio: DE:Tag:telescope:type=radio
     tourism=alpine_hut: DE:Tag:tourism=alpine hut
     tourism=apartment: DE:Tag:tourism=apartment
     tourism=aquarium: DE:Tag:tourism=aquarium
@@ -3805,6 +3914,12 @@ de:
     tourism=wilderness_hut: DE:Tag:tourism=wilderness hut
     tourism=wine_cellar: DE:Tag:tourism=wine cellar
     tourism=zoo: DE:Tag:tourism=zoo
+    tower:construction=dish: DE:Tag:tower:construction=dish
+    tower:construction=dome: DE:Tag:tower:construction=dome
+    tower:construction=freestanding: DE:Tag:tower:construction=freestanding
+    tower:construction=guyed_lattice: DE:Tag:tower:construction=guyed lattice
+    tower:construction=guyed_tube: DE:Tag:tower:construction=guyed tube
+    tower:construction=lattice: DE:Tag:tower:construction=lattice
     tower:type=bell_tower: DE:Tag:tower:type=bell tower
     tower:type=bridge: DE:Tag:tower:type=bridge
     tower:type=communication: DE:Tag:tower:type=communication
@@ -3822,6 +3937,7 @@ de:
     tower:type=watchtower: DE:Tag:tower:type=watchtower
     traffic_sign=city_limit: DE:Tag:traffic sign=city limit
     tunnel=culvert: DE:Tag:tunnel=culvert
+    vending: DE:Tag:vending
     vending=animal_feed: DE:Tag:vending=animal feed
     vending=bicycle_tube: DE:Tag:vending=bicycle tube
     vending=bottle_return: DE:Tag:vending=bottle return
@@ -3840,15 +3956,22 @@ de:
     vending=parcel_pickup: DE:Tag:vending=parcel pickup
     vending=parcel_pickup;parcel_mail_in: DE:Tag:vending=parcel pickup;parcel mail
       in
+    vending=parking_tickets: DE:Tag:vending=parking tickets
     vending=public_transport_tickets: DE:Tag:vending=public transport tickets
     vending=sex_toys: DE:Tag:vending=sex toys
     vending=stamps: DE:Tag:vending=stamps
     vending=toys: DE:Tag:vending=toys
     vending=water: DE:Tag:vending=water
     vending_machine=fuel: DE:Tag:vending machine=fuel
+    water=canal: DE:Tag:water=canal
+    water=lagoon: DE:Tag:water=lagoon
     water=lake: DE:Tag:water=lake
     water=lock: DE:Tag:water=lock
+    water=oxbow: DE:Tag:water=oxbow
+    water=pond: DE:Tag:water=pond
     water=reservoir: DE:Tag:water=reservoir
+    water=river: DE:Tag:water=river
+    water=wastewater: DE:Tag:water=wastewater
     waterway=boat_lift: DE:Tag:waterway=boat lift
     waterway=boatyard: DE:Tag:waterway=boatyard
     waterway=canal: DE:Tag:waterway=canal
@@ -3890,6 +4013,7 @@ el:
     building:architecture: El:Key:building:architecture
     building:levels: El:Key:building:levels
     height: El:Key:height
+    shop: El:Key:shop
   tag:
     amenity=bar: El:Tag:amenity=bar
     amenity=bbq: El:Tag:amenity=bbq
@@ -3917,12 +4041,14 @@ el:
     amenity=university: El:Tag:amenity=university
 en:
   key:
+    3dmr: Key:3dmr
     3dr:type: Key:3dr:type
     4wd_only: Key:4wd only
     :lanes: Key::lanes
     AND_nosr_r: Key:AND nosr r
     AlpinRes_ID: Key:AlpinRes ID
     CEMT: Key:CEMT
+    CLC:code: Key:CLC:code
     DGPS_correction: Key:DGPS correction
     EHAK:code: Key:EHAK:code
     EH_ref: Key:EH ref
@@ -3930,6 +4056,7 @@ en:
     Fetish: Key:Fetish
     Finance_agent: Key:Finance agent
     HE_ref: Key:HE ref
+    HU:ed_direction: Key:HU:ed direction
     HU:hu-go:length: Key:HU:hu-go:length
     HU:hu-go:milestone: Key:HU:hu-go:milestone
     HU:hu-go:road: Key:HU:hu-go:road
@@ -3979,6 +4106,7 @@ en:
     addr:city:de: Key:addr:city:de
     addr:city:en: Key:addr:city:en
     addr:city:it: Key:addr:city:it
+    addr:city:simc: Key:addr:city:simc
     addr:conscriptionnumber: Key:addr:conscriptionnumber
     addr:country: Key:addr:country
     addr:district: Key:addr:district
@@ -4019,15 +4147,20 @@ en:
     aerialway:drag_lift: Key:aerialway:drag lift
     aerialway:duration: Key:aerialway:duration
     aerodrome: Key:aerodrome
+    aerodrome:type: Key:aerodrome:type
     aeroway: Key:aeroway
     after_school: Key:after school
     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:be: Key:alt name:be
     alt_name:en: Key:alt name:en
     alt_name:ko: Key:alt name:ko
     alt_name:mg: Key:alt name:mg
+    alt_name:pl: Key:alt name:pl
+    alt_name:ru: Key:alt name:ru
     alt_name:th: Key:alt name:th
     alt_name_1: Key:alt name 1
     amenity: Key:amenity
@@ -4036,6 +4169,7 @@ en:
     animal: Key:animal
     animated: Key:animated
     architect: Key:architect
+    architect:wikipedia: Key:architect:wikipedia
     area: Key:area
     area:highway: Key:area:highway
     artist_name: Key:artist name
@@ -4059,12 +4193,14 @@ en:
     barrier:personnel: Key:barrier:personnel
     baseball: Key:baseball
     basin: Key:basin
+    bath:type: Key:bath:type
     bdouble: Key:bdouble
     beacon: Key:beacon
     beacon:colour: Key:beacon:colour
     beacon:function: Key:beacon:function
     beacon:type: Key:beacon:type
     beds: Key:beds
+    bell_tower: Key:bell tower
     bench: Key:bench
     bicycle: Key:bicycle
     bicycle:class:mtb: Key:bicycle:class:mtb
@@ -4082,12 +4218,12 @@ en:
     board_type: Key:board type
     boat: Key:boat
     bollard: Key:bollard
+    booking: Key:booking
     books: Key:books
     border_type: Key:border type
     both: Key:both
     bottom:material: Key:bottom:material
     boundary: Key:boundary
-    boundary_type: Key:boundary type
     branch: Key:branch
     brand: Key:brand
     brand:wikidata: Key:brand:wikidata
@@ -4101,6 +4237,7 @@ en:
     bridge:name: Key:bridge:name
     bridge:official_name: Key:bridge:official name
     bridge:old_name: Key:bridge:old name
+    bridge:ref: Key:bridge:ref
     bridge:short_name: Key:bridge:short name
     bridge:structure: Key:bridge:structure
     bridge:support: Key:bridge:support
@@ -4121,6 +4258,7 @@ en:
     building:obm: Key:building:obm
     building:part: Key:building:part
     building:place: Key:building:place
+    building:roof: Key:building:roof
     building:roof:colour: Key:building:roof:colour
     building:ruian:type: Key:building:ruian:type
     building:type: Key:building:type
@@ -4144,6 +4282,8 @@ en:
     canoe: Key:canoe
     capacity: Key:capacity
     capacity:disabled: Key:capacity:disabled
+    capacity:parent: Key:capacity:parent
+    capacity:women: Key:capacity:women
     capital: Key:capital
     capital_city: Key:capital city
     car_wash: Key:car wash
@@ -4163,7 +4303,6 @@ en:
     center_turn_lane: Key:center turn lane
     centralkey: Key:centralkey
     centre_turn_lane: Key:centre turn lane
-    cep: Key:cep
     change: Key:change
     changesets_count: Key:changesets count
     charge: Key:charge
@@ -4173,6 +4312,7 @@ en:
     circuits: Key:circuits
     circumference: Key:circumference
     city_limit: Key:city limit
+    clacks_overhead: Key:clacks overhead
     class: Key:class
     class:bicycle: Key:class:bicycle
     class:bicycle:commute: Key:class:bicycle:commute
@@ -4182,10 +4322,14 @@ en:
     class:bicycle:roadcycling: Key:class:bicycle:roadcycling
     class:bicycle:touring: Key:class:bicycle:touring
     class:bicycle:trailer: Key:class:bicycle:trailer
+    climbing: Key:climbing
+    climbing:*: Key:climbing:*
+    climbing:rock: Key:climbing:rock
     clli: Key:clli
     clothes: Key:clothes
     club: Key:club
     club-mate: Key:club-mate
+    coach: Key:coach
     coastline:survey_quality: Key:coastline:survey quality
     cocktails: Key:cocktails
     coffee: Key:coffee
@@ -4197,6 +4341,7 @@ en:
     communication:amateur_radio: Key:communication:amateur radio
     communication:amateur_radio:repeater: Key:communication:amateur radio:repeater
     communication:bos: Key:communication:bos
+    communication:gsm-r: Key:communication:gsm-r
     communication:microwave: Key:communication:microwave
     communication:mobile_phone: Key:communication:mobile phone
     communication:radio: Key:communication:radio
@@ -4205,15 +4350,18 @@ en:
     community_centre:for: Key:community centre:for
     condition: Key:condition
     conditional: Key:conditional
+    condo: Key:condo
     construction: Key:construction
     construction:website: Key:construction:website
     construction_end_expected: Key:construction end expected
+    construction_start_expected: Key:construction start expected
     contact: Key:contact
     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:instagram: Key:contact:instagram
@@ -4221,12 +4369,16 @@ en:
     contact:mastodon: Key:contact:mastodon
     contact:phone: Key:contact:phone
     contact:skype: Key:contact:skype
+    contact:telegram: Key:contact:telegram
     contact:twitter: Key:contact:twitter
     contact:vhf: Key:contact:vhf
+    contact:viber: Key:contact:viber
     contact:vk: Key:contact:vk
     contact:webcam: Key:contact:webcam
     contact:website: Key:contact:website
+    contact:whatsapp: Key:contact:whatsapp
     contact:xing: Key:contact:xing
+    contact:xmpp: Key:contact:xmpp
     contact:youtube: Key:contact:youtube
     content: Key:content
     conveying: Key:conveying
@@ -4250,6 +4402,7 @@ en:
     currency:EUR: Key:currency:EUR
     currency:GBP: Key:currency:GBP
     currency:PLN: Key:currency:PLN
+    currency:RUB: Key:currency:RUB
     currency:USD: Key:currency:USD
     currency:XXX: Key:currency:XXX
     currency:others: Key:currency:others
@@ -4257,10 +4410,12 @@ en:
     cyclability: Key:cyclability
     cycle: Key:cycle
     cycle_network: Key:cycle network
+    cyclestreet: Key:cyclestreet
     cyclestreets_id: Key:cyclestreets id
     cycleway: Key:cycleway
     cycleway:both: Key:cycleway:both
     cycleway:buffer: Key:cycleway:buffer
+    cycleway:lane: Key:cycleway:lane
     cycleway:left: Key:cycleway:left
     cycleway:left=backward: Key:cycleway:left=backward
     cycleway:right: Key:cycleway:right
@@ -4274,12 +4429,17 @@ en:
     de:regionalschluessel: Key:de:regionalschluessel
     de:strassenschluessel: Key:de:strassenschluessel
     deanery: Key:deanery
+    default_language: Key:default language
     dehoga: Key:dehoga
     delivery: Key:delivery
+    delivery_point: Key:delivery point
+    delivery_point:access: Key:delivery point:access
+    delivery_point:type: Key:delivery point:type
     demolished: Key:demolished
     'demolished:': 'Key:demolished:'
     denomination: Key:denomination
     denotation: Key:denotation
+    departures_board: Key:departures board
     depth: Key:depth
     depth:clearance: Key:depth:clearance
     depth:dangerous: Key:depth:dangerous
@@ -4293,6 +4453,7 @@ en:
     description: Key:description
     description:restrictions: Key:description:restrictions
     descriptions:restrictions: Key:descriptions:restrictions
+    design: Key:design
     design:ref: Key:design:ref
     designation: Key:designation
     destination: Key:destination
@@ -4302,14 +4463,18 @@ en:
     destination:lanes:backward: Key:destination:lanes:backward
     destination:lanes:forward: Key:destination:lanes:forward
     detour: Key:detour
+    devices: Key:devices
     dhm_id: Key:dhm id
     diameter: Key:diameter
     diaper: Key:diaper
     dibavod:id: Key:dibavod:id
     diet: Key:diet
+    'diet:': 'Key:diet:'
     diet:*: Key:diet:*
     diet:dairy_free: Key:diet:dairy free
     diet:gluten_free: Key:diet:gluten free
+    diet:halal: Key:diet:halal
+    diet:kosher: Key:diet:kosher
     diet:lactose_free: Key:diet:lactose free
     diet:vegan: Key:diet:vegan
     diet:vegetarian: Key:diet:vegetarian
@@ -4324,6 +4489,7 @@ en:
     dispensing: Key:dispensing
     display: Key:display
     distance: Key:distance
+    distillery: Key:distillery
     disused: Key:disused
     'disused:': 'Key:disused:'
     disused:amenity: Key:disused:amenity
@@ -4353,6 +4519,7 @@ en:
     drive_through: Key:drive through
     drive_thru: Key:drive thru
     driving_side: Key:driving side
+    dryer: Key:dryer
     duration: Key:duration
     earthquake: Key:earthquake
     earthquake:damage: Key:earthquake:damage
@@ -4360,6 +4527,7 @@ en:
     ele: Key:ele
     ele:NHN: Key:ele:NHN
     ele:local: Key:ele:local
+    electricity: Key:electricity
     electrified: Key:electrified
     email: Key:email
     embankment: Key:embankment
@@ -4402,7 +4570,6 @@ en:
     finance_agent: Key:finance agent
     fire_boundary: Key:fire boundary
     fire_hydrant: Key:fire hydrant
-    fire_hydrant:type: Key:fire hydrant:type
     fire_object:type: Key:fire object:type
     fire_operator: Key:fire operator
     fire_rank: Key:fire rank
@@ -4414,13 +4581,17 @@ en:
     flood_mark: Key:flood mark
     flood_prone: Key:flood prone
     floor:material: Key:floor:material
+    flow_rate: Key:flow rate
     foot: Key:foot
     footway: Key:footway
     ford: Key:ford
     forestry: Key:forestry
     format: Key:format
+    format:top: Key:format:top
     fortification_type: Key:fortification type
     forward: Key:forward
+    fountain: Key:fountain
+    free_refill: Key:free refill
     frequency: Key:frequency
     fridge: Key:fridge
     from: Key:from
@@ -4431,6 +4602,7 @@ en:
     fuel:E10: Key:fuel:E10
     fuel:GTL_diesel: Key:fuel:GTL diesel
     fuel:HGV_diesel: Key:fuel:HGV diesel
+    fuel:LH2: Key:fuel:LH2
     fuel:adblue: Key:fuel:adblue
     fuel:alcohol: Key:fuel:alcohol
     fuel:biodiesel: Key:fuel:biodiesel
@@ -4463,6 +4635,7 @@ en:
     garden:style: Key:garden:style
     garden:type: Key:garden:type
     gauge: Key:gauge
+    gender_segregated: Key:gender segregated
     generator:method: Key:generator:method
     generator:output: Key:generator:output
     generator:output:biogas: Key:generator:output:biogas
@@ -4481,6 +4654,7 @@ en:
     generator:type: Key:generator:type
     genus: Key:genus
     genus:de: Key:genus:de
+    genus:ru: Key:genus:ru
     geocodigo: Key:geocodigo
     geological: Key:geological
     geothermal: Key:geothermal
@@ -4505,7 +4679,11 @@ en:
     gun_emplacement_type: Key:gun emplacement type
     gun_turret: Key:gun turret
     gvr:code: Key:gvr:code
+    handicap: Key:handicap
     handrail: Key:handrail
+    handrail:center: Key:handrail:center
+    handrail:left: Key:handrail:left
+    handrail:right: Key:handrail:right
     happy_hours: Key:happy hours
     harbour: Key:harbour
     harbour:category: Key:harbour:category
@@ -4521,9 +4699,12 @@ en:
     healthcare: Key:healthcare
     healthcare:speciality: Key:healthcare:speciality
     height: Key:height
+    height:hub: Key:height:hub
     heritage: Key:heritage
     hgv: Key:hgv
+    hgv_articulated: Key:hgv articulated
     high_water_mark: Key:high water mark
+    highchair: Key:highchair
     highspeed: Key:highspeed
     highway: Key:highway
     highway:category: Key:highway:category
@@ -4562,6 +4743,7 @@ en:
     indoormark: Key:indoormark
     industrial: Key:industrial
     industry:isic_code: Key:industry:isic code
+    infant_bed: Key:infant bed
     informal: Key:informal
     information: Key:information
     inline_skates: Key:inline skates
@@ -4590,7 +4772,9 @@ en:
     is_in:region: Key:is in:region
     is_in:sea: Key:is in:sea
     is_in:state: Key:is in:state
+    is_in:state_code: Key:is in:state code
     is_in:ward: Key:is in:ward
+    isced:level: Key:isced:level
     it:fvg:ctrn:code: Key:it:fvg:ctrn:code
     jel: Key:jel
     jetski:sales: Key:jetski:sales
@@ -4623,13 +4807,12 @@ en:
     label: Key:label
     lacounty:ain: Key:lacounty:ain
     lacounty:bld_id: Key:lacounty:bld id
-    lactose_free: Key:lactose free
     ladder: Key:ladder
     lamp_mount: Key:lamp mount
     lamp_type: Key:lamp type
+    landfill:waste: Key:landfill:waste
     landmark: Key:landmark
     landuse: Key:landuse
-    lane_hint: Key:lane hint
     lanes: Key:lanes
     lanes:backward: Key:lanes:backward
     lanes:both_ways: Key:lanes:both ways
@@ -4638,6 +4821,7 @@ en:
     lanes:psv: Key:lanes:psv
     lanes:psv:backward: Key:lanes:psv:backward
     lanes:psv:forward: Key:lanes:psv:forward
+    language:LL: Key:language:LL
     lawyer: Key:lawyer
     layer: Key:layer
     lcn_ref: Key:lcn ref
@@ -4671,6 +4855,7 @@ en:
     long_name:ar: Key:long name:ar
     lottery: Key:lottery
     love_locks: Key:love locks
+    luminous: Key:luminous
     lunch: Key:lunch
     lunch:specials: Key:lunch:specials
     maintained: Key:maintained
@@ -4695,7 +4880,10 @@ en:
     maxlength: Key:maxlength
     maxspeed: Key:maxspeed
     maxspeed:advisory: Key:maxspeed:advisory
+    maxspeed:backward: Key:maxspeed:backward
     maxspeed:conditional: Key:maxspeed:conditional
+    maxspeed:forward: Key:maxspeed:forward
+    maxspeed:hgv: Key:maxspeed:hgv
     maxspeed:practical: Key:maxspeed:practical
     maxspeed:source: Key:maxspeed:source
     maxspeed:type: Key:maxspeed:type
@@ -4703,14 +4891,18 @@ en:
     maxweight: Key:maxweight
     maxwidth: Key:maxwidth
     maxwidth:physical: Key:maxwidth:physical
+    mcrb:criteria: Key:mcrb:criteria
     mdb_id: Key:mdb id
     measurement: Key:measurement
     medical_supply: Key:medical supply
     megalith_type: Key:megalith type
+    membership: Key:membership
     memorial: Key:memorial
     memorial:type: Key:memorial:type
     message: Key:message
+    mhs:inscription_date: Key:mhs:inscription date
     microbrewery: Key:microbrewery
+    milestone_type: Key:milestone type
     military: Key:military
     min_age: Key:min age
     min_height: Key:min height
@@ -4745,10 +4937,13 @@ en:
     motorcycle: Key:motorcycle
     motorcycle:clothes: Key:motorcycle:clothes
     motorcycle:conditional: Key:motorcycle:conditional
+    motorcycle:lanes: Key:motorcycle:lanes
+    motorcycle:parking: Key:motorcycle:parking
     motorcycle:parts: Key:motorcycle:parts
     motorcycle:rental: Key:motorcycle:rental
     motorcycle:repair: Key:motorcycle:repair
     motorcycle:sales: Key:motorcycle:sales
+    motorcycle:scale: Key:motorcycle:scale
     motorcycle:type: Key:motorcycle:type
     motorcycle:tyres: Key:motorcycle:tyres
     motorhome: Key:motorhome
@@ -4770,20 +4965,24 @@ en:
     name:be: Key:name:be
     name:be-tarask: Key:name:be-tarask
     name:ber: Key:name:ber
+    name:bn: Key:name:bn
     name:botanical: Key:name:botanical
     name:br: Key:name:br
     name:ca: Key:name:ca
     name:cs: Key:name:cs
     name:cy: Key:name:cy
+    name:da: Key:name:da
     name:de: Key:name:de
     name:dv: Key:name:dv
     name:el: Key:name:el
     name:en: Key:name:en
     name:eo: Key:name:eo
     name:es: Key:name:es
+    name:et: Key:name:et
     name:etymology: Key:name:etymology
     name:etymology:wikipedia: Key:name:etymology:wikipedia
     name:eu: Key:name:eu
+    name:fa: Key:name:fa
     name:fi: Key:name:fi
     name:fr: Key:name:fr
     name:fy: Key:name:fy
@@ -4791,22 +4990,28 @@ en:
     name:gd: Key:name:gd
     name:he: Key:name:he
     name:hi: Key:name:hi
+    name:hr: Key:name:hr
     name:hu: Key:name:hu
+    name:hy: Key:name:hy
     name:io: Key:name:io
     name:it: Key:name:it
     name:ja: Key:name:ja
     name:ja-Hira: Key:name:ja-Hira
     name:jbo: Key:name:jbo
+    name:ka: Key:name:ka
     name:kab: Key:name:kab
     name:kn: Key:name:kn
     name:kn:iso15919: Key:name:kn:iso15919
     name:ko: Key:name:ko
+    name:ko-Latn: Key:name:ko-Latn
     name:ko_rm: Key:name:ko rm
     name:ku: Key:name:ku
     name:left: Key:name:left
     name:left:ar: Key:name:left:ar
     name:left:fr: Key:name:left:fr
     name:lg: Key:name:lg
+    name:lt: Key:name:lt
+    name:lv: Key:name:lv
     name:mg: Key:name:mg
     name:mk: Key:name:mk
     name:ml: Key:name:ml
@@ -4818,15 +5023,19 @@ en:
     name:nov: Key:name:nov
     name:pl: Key:name:pl
     name:prefix: Key:name:prefix
+    name:prefix:be: Key:name:prefix:be
     name:pronunciation: Key:name:pronunciation
     name:pt: Key:name:pt
     name:right: Key:name:right
     name:right:ar: Key:name:right:ar
+    name:ro: Key:name:ro
     name:ru: Key:name:ru
     name:ru:word_stress: Key:name:ru:word stress
     name:sc: Key:name:sc
     name:sk: Key:name:sk
     name:sl: Key:name:sl
+    name:sr: Key:name:sr
+    name:sr-Latn: Key:name:sr-Latn
     name:suffix: Key:name:suffix
     name:sv: Key:name:sv
     name:ta: Key:name:ta
@@ -4836,8 +5045,12 @@ en:
     name:tr: Key:name:tr
     name:tzl: Key:name:tzl
     name:uk: Key:name:uk
+    name:ur: Key:name:ur
     name:vo: Key:name:vo
+    name:wikipedia: Key:name:wikipedia
+    name:yue: Key:name:yue
     name:zh: Key:name:zh
+    name:zh-sg: Key:name:zh-sg
     name_1: Key:name 1
     narrow: Key:narrow
     nat_name: Key:nat name
@@ -4860,6 +5073,7 @@ en:
     ncn_milepost: Key:ncn milepost
     ncn_ref: Key:ncn ref
     network: Key:network
+    network:wikidata: Key:network:wikidata
     no-barnehage:nsrid: Key:no-barnehage:nsrid
     noaddress: Key:noaddress
     noexit: Key:noexit
@@ -4879,19 +5093,26 @@ en:
     nursery: Key:nursery
     nvdb:date: Key:nvdb:date
     nvdb:id: Key:nvdb:id
+    observatory:type: Key:observatory:type
     obstacle: Key:obstacle
     occurrence: Key:occurrence
     office: Key:office
     official_name: Key:official name
     official_name:ar: Key:official name:ar
+    official_name:be: Key:official name:be
     official_ref: Key:official ref
     offshore: Key:offshore
     ois:fixme: Key:ois:fixme
     old_name: Key:old name
     old_name:ar: Key:old name:ar
+    old_name:be: Key:old name:be
     old_name:etymology:wikidata: Key:old name:etymology:wikidata
+    old_name:pl: Key:old name:pl
+    old_name:ru: Key:old name:ru
+    old_name:uk: Key:old name:uk
     old_railway_operator: Key:old railway operator
     old_ref: Key:old ref
+    old_ref:legislative: Key:old ref:legislative
     old_ref_legislative: Key:old ref legislative
     oneclass: Key:oneclass
     oneway: Key:oneway
@@ -4902,18 +5123,23 @@ en:
     openfire: Key:openfire
     opening_date: Key:opening date
     opening_hours: Key:opening hours
+    opening_hours:atm: Key:opening hours:atm
     opening_hours:kitchen: Key:opening hours:kitchen
     openplaques:id: Key:openplaques:id
     openplaques_plaque: Key:openplaques plaque
     opensource: Key:opensource
     operator: Key:operator
     operator:MNC: Key:operator:MNC
+    operator:be: Key:operator:be
+    operator:en: Key:operator:en
+    operator:ru: Key:operator:ru
     operator:type: Key:operator:type
     operator:wikipedia: Key:operator:wikipedia
     organic: Key:organic
     orientation: Key:orientation
     orienteering: Key:orienteering
     origin: Key:origin
+    orv: Key:orv
     osak: Key:osak
     osak:identifier: Key:osak:identifier
     osak:municipality_no: Key:osak:municipality no
@@ -4935,6 +5161,7 @@ en:
     ownership: Key:ownership
     par: Key:par
     parish: Key:parish
+    park:type: Key:park:type
     parking: Key:parking
     parking:condition: Key:parking:condition
     parking:condition:both: Key:parking:condition:both
@@ -4956,11 +5183,16 @@ en:
     paved:date: Key:paved:date
     payment: Key:payment
     payment:account_cards: Key:payment:account cards
+    payment:american_express: Key:payment:american express
     payment:cash: Key:payment:cash
     payment:coins: Key:payment:coins
+    payment:contactless: Key:payment:contactless
     payment:credit_cards: Key:payment:credit cards
+    payment:debit_cards: Key:payment:debit cards
     payment:electronic_purses: Key:payment:electronic purses
     payment:foo: Key:payment:foo
+    payment:girocard: Key:payment:girocard
+    payment:maestro: Key:payment:maestro
     payment:mastercard: Key:payment:mastercard
     payment:mir: Key:payment:mir
     payment:none: Key:payment:none
@@ -5005,8 +5237,10 @@ en:
     'playground:': 'Key:playground:'
     playground:theme: Key:playground:theme
     point: Key:point
+    pole:type: Key:pole:type
     police: Key:police
     population: Key:population
+    population:date: Key:population:date
     population_rank: Key:population rank
     post_box:type: Key:post box:type
     post_office:type: Key:post office:type
@@ -5019,6 +5253,7 @@ en:
     power_supply: Key:power supply
     power_supply:schedule: Key:power supply:schedule
     preschool: Key:preschool
+    pressure: Key:pressure
     previous: Key:previous
     previous:access: Key:previous:access
     previous:vehicle: Key:previous:vehicle
@@ -5032,6 +5267,7 @@ en:
     protected: Key:protected
     protection_title: Key:protection title
     prow_ref: Key:prow ref
+    pruning: Key:pruning
     psv: Key:psv
     public_bookcase:type: Key:public bookcase:type
     public_transport: Key:public transport
@@ -5065,6 +5301,8 @@ en:
     ramp:stroller: Key:ramp:stroller
     ramp:wheelchair: Key:ramp:wheelchair
     ramsar: Key:ramsar
+    razed: Key:razed
+    'razed:': 'Key:razed:'
     rcn_ref: Key:rcn ref
     real_ale: Key:real ale
     real_cider: Key:real cider
@@ -5099,6 +5337,7 @@ en:
     ref:IFOPT: Key:ref:IFOPT
     ref:INSEE: Key:ref:INSEE
     ref:ISTAT: Key:ref:ISTAT
+    ref:NLPG:UPRN:1: Key:ref:NLPG:UPRN:1
     ref:NPLG:UPRN:1: Key:ref:NPLG:UPRN:1
     ref:TECB: Key:ref:TECB
     ref:TECC: Key:ref:TECC
@@ -5123,12 +5362,15 @@ en:
     ref:isil: Key:ref:isil
     ref:kmb: Key:ref:kmb
     ref:lor: Key:ref:lor
+    ref:mcrb: Key:ref:mcrb
     ref:mhs: Key:ref:mhs
     ref:miaaddr: Key:ref:miaaddr
     ref:miabldg: Key:ref:miabldg
+    ref:mise: Key:ref:mise
     ref:mobil-parken.de: Key:ref:mobil-parken.de
     ref:ortsnetz: Key:ref:ortsnetz
     ref:penndot: Key:ref:penndot
+    ref:raa: Key:ref:raa
     ref:ruian: Key:ref:ruian
     ref:ruian:addr: Key:ref:ruian:addr
     ref:ruian:building: Key:ref:ruian:building
@@ -5140,6 +5382,7 @@ en:
     ref:sitp: Key:ref:sitp
     ref:taskey: Key:ref:taskey
     ref:vatin: Key:ref:vatin
+    ref:vatin:hu: Key:ref:vatin:hu
     ref:vorwahl: Key:ref:vorwahl
     ref:wawa: Key:ref:wawa
     ref:whc: Key:ref:whc
@@ -5160,6 +5403,7 @@ en:
     reservation: Key:reservation
     residential: Key:residential
     resource: Key:resource
+    restaurant: Key:restaurant
     restriction:conditional: Key:restriction:conditional
     retreat: Key:retreat
     retroreflecting: Key:retroreflecting
@@ -5173,11 +5417,13 @@ en:
     roof:colour: Key:roof:colour
     roof:direction: Key:roof:direction
     roof:material: Key:roof:material
+    roof:shape: Key:roof:shape
     room: Key:room
     rooms: Key:rooms
     rotor:diameter: Key:rotor:diameter
     roundtrip: Key:roundtrip
     route: Key:route
+    route_availability: Key:route availability
     route_master: Key:route master
     route_ref: Key:route ref
     route_ref:De_Lijn: Key:route ref:De Lijn
@@ -5204,6 +5450,11 @@ en:
     sagns_id: Key:sagns id
     salt: Key:salt
     sanitary_dump_station: Key:sanitary dump station
+    sauna: Key:sauna
+    sauna:fuel: Key:sauna:fuel
+    sauna:heating: Key:sauna:heating
+    sauna:temperature: Key:sauna:temperature
+    sauna:water:description: Key:sauna:water:description
     scenic: Key:scenic
     school: Key:school
     seamark: Key:seamark
@@ -5306,6 +5557,7 @@ en:
     sidewalk: Key:sidewalk
     sidewalk_orientation: Key:sidewalk orientation
     sign: Key:sign
+    sinkhole: Key:sinkhole
     site_type: Key:site type
     size: Key:size
     ski: Key:ski
@@ -5327,6 +5579,8 @@ en:
     socket: Key:socket
     sorting_name: Key:sorting name
     sorting_name:ar: Key:sorting name:ar
+    sorting_name:be: Key:sorting name:be
+    sorting_name:ru: Key:sorting name:ru
     source: Key:source
     source:ProRail: Key:source:ProRail
     source:addr: Key:source:addr
@@ -5338,7 +5592,10 @@ en:
     source:ja: Key:source:ja
     source:loc: Key:source:loc
     source:maxspeed: Key:source:maxspeed
+    source:maxspeed:backward: Key:source:maxspeed:backward
+    source:maxspeed:forward: Key:source:maxspeed:forward
     source:name: Key:source:name
+    source:population: Key:source:population
     source:position: Key:source:position
     source:postcode: Key:source:postcode
     source:ref: Key:source:ref
@@ -5348,6 +5605,8 @@ en:
     species:cs: Key:species:cs
     species:de: Key:species:de
     species:en: Key:species:en
+    species:ru: Key:species:ru
+    species:wikidata: Key:species:wikidata
     speech_input: Key:speech input
     speech_input:lg: Key:speech input:lg
     speech_output: Key:speech output
@@ -5371,10 +5630,13 @@ en:
     stop: Key:stop
     storage_area: Key:storage area
     stranded: Key:stranded
+    strapline: Key:strapline
     stream: Key:stream
     stroller: Key:stroller
+    structure: Key:structure
     sub_sea: Key:sub sea
     subject: Key:subject
+    subject:wikipedia: Key:subject:wikipedia
     subsea: Key:subsea
     substance: Key:substance
     substation: Key:substation
@@ -5412,6 +5674,7 @@ en:
     technical_type: Key:technical type
     technology: Key:technology
     telecom: Key:telecom
+    telescope:type: Key:telescope:type
     temporary: Key:temporary
     tenant: Key:tenant
     tents: Key:tents
@@ -5438,12 +5701,16 @@ en:
     toilets:type: Key:toilets:type
     toilets:wheelchair: Key:toilets:wheelchair
     toll: Key:toll
+    toll:hgv: Key:toll:hgv
+    toll:motorcycle: Key:toll:motorcycle
     topmark: Key:topmark
     topmark:colour: Key:topmark:colour
     touring: Key:touring
     tourism: Key:tourism
     tourist_bus: Key:tourist bus
+    tower:construction: Key:tower:construction
     tower:type: Key:tower:type
+    townhall:type: Key:townhall:type
     tracks: Key:tracks
     tracktype: Key:tracktype
     traffic: Key:traffic
@@ -5461,10 +5728,13 @@ en:
     traffic_signals:turn:forward: Key:traffic signals:turn:forward
     traffic_signals:vibration: Key:traffic signals:vibration
     trail_visibility: Key:trail visibility
+    trailblazed: Key:trailblazed
     trailer: Key:trailer
     train: Key:train
     tram: Key:tram
+    transformer:devices: Key:transformer:devices
     trees: Key:trees
+    trench: Key:trench
     trolley_wire: Key:trolley wire
     trolleybus: Key:trolleybus
     tsunami: Key:tsunami
@@ -5494,8 +5764,11 @@ en:
     usage: Key:usage
     user_defined_other: Key:user defined other
     utahagrc:parcelid: Key:utahagrc:parcelid
+    validate:ants:yellow: Key:validate:ants:yellow
     validate:no_name: Key:validate:no name
     validate:no_ref: Key:validate:no ref
+    vegan: Key:vegan
+    vegetarian: Key:vegetarian
     vehicle: Key:vehicle
     vehicle:conditional: Key:vehicle:conditional
     verge: Key:verge
@@ -5504,10 +5777,13 @@ en:
     visibility: Key:visibility
     voltage: Key:voltage
     wall:material: Key:wall:material
+    washing_machine: Key:washing machine
     waste: Key:waste
     waste_basket: Key:waste basket
     water: Key:water
+    water_characteristic: Key:water characteristic
     water_point: Key:water point
+    water_system: Key:water system
     waterway: Key:waterway
     way_area: Key:way area
     website: Key:website
@@ -5522,8 +5798,26 @@ en:
     wikimedia_commons: Key:wikimedia commons
     wikipedia: Key:wikipedia
     wikipedia:ar: Key:wikipedia:ar
+    wikipedia:be: Key:wikipedia:be
+    wikipedia:de: Key:wikipedia:de
     wikipedia:en: Key:wikipedia:en
+    wikipedia:fr: Key:wikipedia:fr
+    wikipedia:pl: Key:wikipedia:pl
+    windings: Key:windings
+    windings:configuration: Key:windings:configuration
+    windings:primary: Key:windings:primary
+    windings:secondary: Key:windings:secondary
+    windings:tertiary: Key:windings:tertiary
+    wine:grape: Key:wine:grape
+    wine:region: Key:wine:region
+    wine:type: Key:wine:type
+    wine:vineyard: Key:wine:vineyard
+    winery: Key:winery
     winter_road: Key:winter road
+    winter_service: Key:winter service
+    winter_service:gritting: Key:winter service:gritting
+    winter_service:priority: Key:winter service:priority
+    winter_service:salting: Key:winter service:salting
     wires: Key:wires
     woeid: Key:woeid
     wood: Key:wood
@@ -5531,6 +5825,7 @@ en:
     workrules: Key:workrules
     www.prezzibenzina.it: Key:www.prezzibenzina.it
     xmas:feature: Key:xmas:feature
+    xmpp: Key:xmpp
     year_of_construction: Key:year of construction
     yh:LINE_NAME: Key:yh:LINE NAME
     yh:LINE_NUM: Key:yh:LINE NUM
@@ -5597,6 +5892,11 @@ en:
     aerialway=station: Tag:aerialway=station
     aerialway=t-bar: Tag:aerialway=t-bar
     aerialway=zip_line: Tag:aerialway=zip line
+    aerodrome:type=airfield: Tag:aerodrome:type=airfield
+    aerodrome:type=gliding: Tag:aerodrome:type=gliding
+    aerodrome:type=international: Tag:aerodrome:type=international
+    aerodrome:type=private: Tag:aerodrome:type=private
+    aerodrome:type=regional: Tag:aerodrome:type=regional
     aeroway=aerodrome: Tag:aeroway=aerodrome
     aeroway=airport: Tag:aeroway=airport
     aeroway=airstrip: Tag:aeroway=airstrip
@@ -5606,6 +5906,7 @@ en:
     aeroway=hangar: Tag:aeroway=hangar
     aeroway=helipad: Tag:aeroway=helipad
     aeroway=heliport: Tag:aeroway=heliport
+    aeroway=highway_strip: Tag:aeroway=highway strip
     aeroway=holding_position: Tag:aeroway=holding position
     aeroway=landingpad: Tag:aeroway=landingpad
     aeroway=launchpad: Tag:aeroway=launchpad
@@ -5645,7 +5946,6 @@ en:
     amenity=bicycle_repair_station: Tag:amenity=bicycle repair station
     amenity=bicycle_trailer_sharing: Tag:amenity=bicycle trailer sharing
     amenity=biergarten: Tag:amenity=biergarten
-    amenity=bikeshed: Tag:amenity=bikeshed
     amenity=boat_rental: Tag:amenity=boat rental
     amenity=boat_sharing: Tag:amenity=boat sharing
     amenity=boat_storage: Tag:amenity=boat storage
@@ -5655,7 +5955,6 @@ en:
     amenity=bus_station: Tag:amenity=bus station
     amenity=bus_stop: Tag:amenity=bus stop
     amenity=cafe: Tag:amenity=cafe
-    amenity=canoe_hire: Tag:amenity=canoe hire
     amenity=car_pooling: Tag:amenity=car pooling
     amenity=car_rental: Tag:amenity=car rental
     amenity=car_repair: Tag:amenity=car repair
@@ -5668,6 +5967,7 @@ en:
     amenity=cinema: Tag:amenity=cinema
     amenity=citymap_post: Tag:amenity=citymap post
     amenity=clinic: Tag:amenity=clinic
+    amenity=cloakroom: Tag:amenity=cloakroom
     amenity=clock: Tag:amenity=clock
     amenity=club: Tag:amenity=club
     amenity=coast_guard: Tag:amenity=coast guard
@@ -5677,6 +5977,7 @@ en:
     amenity=community_centre: Tag:amenity=community centre
     amenity=compressed_air: Tag:amenity=compressed air
     amenity=concert_hall: Tag:amenity=concert hall
+    amenity=concession_stand: Tag:amenity=concession stand
     amenity=conference_centre: Tag:amenity=conference centre
     amenity=courthouse: Tag:amenity=courthouse
     amenity=coworking_space: Tag:amenity=coworking space
@@ -5688,6 +5989,7 @@ en:
     amenity=dancing_school: Tag:amenity=dancing school
     amenity=dead_pub: Tag:amenity=dead pub
     amenity=dentist: Tag:amenity=dentist
+    amenity=device_charging_station: Tag:amenity=device charging station
     amenity=disused: Tag:amenity=disused
     amenity=dive_centre: Tag:amenity=dive centre
     amenity=doctor: Tag:amenity=doctor
@@ -5695,13 +5997,13 @@ en:
     amenity=dog_bin: Tag:amenity=dog bin
     amenity=dog_waste_bin: Tag:amenity=dog waste bin
     amenity=dojo: Tag:amenity=dojo
+    amenity=dressing_room: Tag:amenity=dressing room
     amenity=drinking_water: Tag:amenity=drinking water
     amenity=driving_school: Tag:amenity=driving school
     amenity=dryer: Tag:amenity=dryer
     amenity=education: Tag:amenity=education
     amenity=embassy: Tag:amenity=embassy
     amenity=emergency_phone: Tag:amenity=emergency phone
-    amenity=emergency_service: Tag:amenity=emergency service
     amenity=ev_charging: Tag:amenity=ev charging
     amenity=events_venue: Tag:amenity=events venue
     amenity=exercise_point: Tag:amenity=exercise point
@@ -5737,6 +6039,7 @@ en:
     amenity=ice_cream: Tag:amenity=ice cream
     amenity=internet_cafe: Tag:amenity=internet cafe
     amenity=jobcentre: Tag:amenity=jobcentre
+    amenity=juice_bar: Tag:amenity=juice bar
     amenity=kindergarten: Tag:amenity=kindergarten
     amenity=kiosk: Tag:amenity=kiosk
     amenity=kitchen: Tag:amenity=kitchen
@@ -5748,6 +6051,7 @@ en:
     amenity=life_ring: Tag:amenity=life ring
     amenity=lifeboat_station: Tag:amenity=lifeboat station
     amenity=loading_dock: Tag:amenity=loading dock
+    amenity=lounger: Tag:amenity=lounger
     amenity=love_hotel: Tag:amenity=love hotel
     amenity=marae: Tag:amenity=marae
     amenity=marketplace: Tag:amenity=marketplace
@@ -5770,6 +6074,7 @@ en:
     amenity=parking_space: Tag:amenity=parking space
     amenity=parkink: Tag:amenity=parkink
     amenity=payment_centre: Tag:amenity=payment centre
+    amenity=payment_terminal: Tag:amenity=payment terminal
     amenity=pharmacy: Tag:amenity=pharmacy
     amenity=photo_booth: Tag:amenity=photo booth
     amenity=place_of_worship: Tag:amenity=place of worship
@@ -5787,7 +6092,6 @@ en:
     amenity=public_bath: Tag:amenity=public bath
     amenity=public_bookcase: Tag:amenity=public bookcase
     amenity=public_building: Tag:amenity=public building
-    amenity=public_hall: Tag:amenity=public hall
     amenity=ranger_station: Tag:amenity=ranger station
     amenity=reception_desk: Tag:amenity=reception desk
     amenity=recycling: Tag:amenity=recycling
@@ -5811,6 +6115,7 @@ en:
     amenity=ski_rental: Tag:amenity=ski rental
     amenity=ski_school: Tag:amenity=ski school
     amenity=smoking_area: Tag:amenity=smoking area
+    amenity=snow_removal_station: Tag:amenity=snow removal station
     amenity=social_centre: Tag:amenity=social centre
     amenity=social_facility: Tag:amenity=social facility
     amenity=spa: Tag:amenity=spa
@@ -5824,7 +6129,6 @@ en:
     amenity=swingerclub: Tag:amenity=swingerclub
     amenity=table: Tag:amenity=table
     amenity=taxi: Tag:amenity=taxi
-    amenity=taxi_point: Tag:amenity=taxi point
     amenity=telephone: Tag:amenity=telephone
     amenity=television: Tag:amenity=television
     amenity=theatre: Tag:amenity=theatre
@@ -5834,6 +6138,7 @@ en:
     amenity=toilets: Tag:amenity=toilets
     amenity=townhall: Tag:amenity=townhall
     amenity=trolley_bay: Tag:amenity=trolley bay
+    amenity=tuition: Tag:amenity=tuition
     amenity=university: Tag:amenity=university
     amenity=vacuum_cleaner: Tag:amenity=vacuum cleaner
     amenity=vehicle_inspection: Tag:amenity=vehicle inspection
@@ -5854,9 +6159,14 @@ en:
     amenity=yacht_club: Tag:amenity=yacht club
     amenity=youth_centre: Tag:amenity=youth centre
     aminety=sceptic_tank: Tag:aminety=sceptic tank
+    animal=horse_walker: Tag:animal=horse walker
     animal=school: Tag:animal=school
     animated=trivision_blades: Tag:animated=trivision blades
     animated=winding_posters: Tag:animated=winding posters
+    area:highway=cycleway: Tag:area:highway=cycleway
+    area:highway=footway: Tag:area:highway=footway
+    area:highway=path: Tag:area:highway=path
+    area:highway=pedestrian: Tag:area:highway=pedestrian
     artwork_type=sculpture: Tag:artwork type=sculpture
     artwork_type=statue: Tag:artwork type=statue
     atm=no: Tag:atm=no
@@ -5864,6 +6174,7 @@ en:
     attraction=animal: Tag:attraction=animal
     attraction=maze: Tag:attraction=maze
     attraction=train: Tag:attraction=train
+    attraction=water_slide: Tag:attraction=water slide
     baby_hatch=yes: Tag:baby hatch=yes
     bakehouse: Tag:bakehouse
     baking_oven: Tag:baking oven
@@ -5917,6 +6228,10 @@ en:
     barrier=turnstile: Tag:barrier=turnstile
     barrier=wall: Tag:barrier=wall
     baseball=softball: Tag:baseball=softball
+    bath:type=hammam: Tag:bath:type=hammam
+    bath:type=hot_spring: Tag:bath:type=hot spring
+    bath:type=onsen: Tag:bath:type=onsen
+    bath:type=thermal: Tag:bath:type=thermal
     bay=fjord: Tag:bay=fjord
     bicycle=designated: Tag:bicycle=designated
     bicycle=official: Tag:bicycle=official
@@ -5941,15 +6256,20 @@ en:
     boundary=protected_area: Tag:boundary=protected area
     boundary=regional_park: Tag:boundary=regional park
     boundary=timezone: Tag:boundary=timezone
+    boundary=urban: Tag:boundary=urban
     boundary=vice_county: Tag:boundary=vice county
     boundary=water_protection_area: Tag:boundary=water protection area
+    brand=Harley-Davidson: Tag:brand=Harley-Davidson
     brand=KTM: Tag:brand=KTM
+    brand=Moto_Guzzi: Tag:brand=Moto Guzzi
     brand=Zero: Tag:brand=Zero
     bridge:movable=bascule: Tag:bridge:movable=bascule
     bridge:movable=drawbridge: Tag:bridge:movable=drawbridge
     bridge:movable=lift: Tag:bridge:movable=lift
+    bridge:movable=retractable: Tag:bridge:movable=retractable
     bridge:movable=submersible: Tag:bridge:movable=submersible
     bridge:movable=swing: Tag:bridge:movable=swing
+    bridge:movable=tilt: Tag:bridge:movable=tilt
     bridge:movable=transporter: Tag:bridge:movable=transporter
     bridge:structure=arch: Tag:bridge:structure=arch
     bridge:structure=beam: Tag:bridge:structure=beam
@@ -6001,6 +6321,7 @@ en:
     building=font: Tag:building=font
     building=garage: Tag:building=garage
     building=garages: Tag:building=garages
+    building=government: Tag:building=government
     building=grandstand: Tag:building=grandstand
     building=greenhouse: Tag:building=greenhouse
     building=ground_station: Tag:building=ground station
@@ -6028,10 +6349,13 @@ en:
     building=ruins: Tag:building=ruins
     building=school: Tag:building=school
     building=semi: Tag:building=semi
+    building=semidetached_house: Tag:building=semidetached house
     building=service: Tag:building=service
     building=shed: Tag:building=shed
     building=shrine: Tag:building=shrine
     building=slurry_tank: Tag:building=slurry tank
+    building=sports_centre: Tag:building=sports centre
+    building=sports_hall: Tag:building=sports hall
     building=stable: Tag:building=stable
     building=stadium: Tag:building=stadium
     building=static_caravan: Tag:building=static caravan
@@ -6042,6 +6366,7 @@ en:
     building=tech_cab: Tag:building=tech cab
     building=temple: Tag:building=temple
     building=terrace: Tag:building=terrace
+    building=toilets: Tag:building=toilets
     building=train_station: Tag:building=train station
     building=transformer_tower: Tag:building=transformer tower
     building=transportation: Tag:building=transportation
@@ -6049,9 +6374,11 @@ en:
     building=warehouse: Tag:building=warehouse
     building=water_tower: Tag:building=water tower
     building=yes: Tag:building=yes
+    bunker_type=gun_emplacement: Tag:bunker type=gun emplacement
     bunker_type=hardened_aircraft_shelter: Tag:bunker type=hardened aircraft shelter
     bunker_type=munitions: Tag:bunker type=munitions
     bunker_type=pillbox: Tag:bunker type=pillbox
+    bunker_type=technical: Tag:bunker type=technical
     busway:left=lane: Tag:busway:left=lane
     busway:right=lane: Tag:busway:right=lane
     busway=lane: Tag:busway=lane
@@ -6069,6 +6396,7 @@ en:
     clothes=motorcycle: Tag:clothes=motorcycle
     clothes=sports: Tag:clothes=sports
     clothes=underwear: Tag:clothes=underwear
+    club=amateur_radio: Tag:club=amateur radio
     club=automobile: Tag:club=automobile
     club=fan: Tag:club=fan
     club=scout: Tag:club=scout
@@ -6095,11 +6423,13 @@ en:
     craft=clockmaker: Tag:craft=clockmaker
     craft=confectionery: Tag:craft=confectionery
     craft=cooper: Tag:craft=cooper
+    craft=dental_technician: Tag:craft=dental technician
     craft=distillery: Tag:craft=distillery
     craft=dressmaker: Tag:craft=dressmaker
     craft=electrican: Tag:craft=electrican
     craft=electrician: Tag:craft=electrician
     craft=electronics_repair: Tag:craft=electronics repair
+    craft=embroiderer: Tag:craft=embroiderer
     craft=engraver: Tag:craft=engraver
     craft=floorer: Tag:craft=floorer
     craft=gardener: Tag:craft=gardener
@@ -6114,6 +6444,7 @@ en:
     craft=key_cutter: Tag:craft=key cutter
     craft=locksmith: Tag:craft=locksmith
     craft=metal_construction: Tag:craft=metal construction
+    craft=mint: Tag:craft=mint
     craft=musical_instrument: Tag:craft=musical instrument
     craft=oil_mill: Tag:craft=oil mill
     craft=optician: Tag:craft=optician
@@ -6127,6 +6458,7 @@ en:
     craft=plasterer: Tag:craft=plasterer
     craft=plumber: Tag:craft=plumber
     craft=pottery: Tag:craft=pottery
+    craft=printmaker: Tag:craft=printmaker
     craft=rigger: Tag:craft=rigger
     craft=roofer: Tag:craft=roofer
     craft=saddler: Tag:craft=saddler
@@ -6178,6 +6510,7 @@ en:
     cuisine=tea_shop: Tag:cuisine=tea shop
     cycle_network=US:CA:SF: Tag:cycle network=US:CA:SF
     cycle_network=US:GA: Tag:cycle network=US:GA
+    cycle_network=US:LA:NO: Tag:cycle network=US:LA:NO
     cycle_network=US:NC: Tag:cycle network=US:NC
     cycle_network=US:NM: Tag:cycle network=US:NM
     cycle_network=US:NY: Tag:cycle network=US:NY
@@ -6206,10 +6539,12 @@ en:
     defensive=bergfried: Tag:defensive=bergfried
     defensive=donjon: Tag:defensive=donjon
     defensive=keep: Tag:defensive=keep
+    demolished=yes: Tag:demolished=yes
     dennert_fir_tree=yes: Tag:dennert fir tree=yes
     denomination=mormon: Tag:denomination=mormon
     denomination=reformed: Tag:denomination=reformed
     denotation=cluster: Tag:denotation=cluster
+    destroyed=yes: Tag:destroyed=yes
     diplomatic=ambassadors_residence: Tag:diplomatic=ambassadors residence
     diplomatic=consulate: Tag:diplomatic=consulate
     diplomatic=consulate_general: Tag:diplomatic=consulate general
@@ -6221,6 +6556,8 @@ en:
     dock=drydock: Tag:dock=drydock
     dock=floating: Tag:dock=floating
     dock=tidal: Tag:dock=tidal
+    electrified=contact_line: Tag:electrified=contact line
+    electrified=rail: Tag:electrified=rail
     emergency=access_point: Tag:emergency=access point
     emergency=aed: Tag:emergency=aed
     emergency=ambulance_station: Tag:emergency=ambulance station
@@ -6228,23 +6565,33 @@ en:
     emergency=coast_guard: Tag:emergency=coast guard
     emergency=defibrilator: Tag:emergency=defibrilator
     emergency=defibrillator: Tag:emergency=defibrillator
+    emergency=disaster_response: Tag:emergency=disaster response
     emergency=dry_riser: Tag:emergency=dry riser
     emergency=dry_riser_inlet: Tag:emergency=dry riser inlet
     emergency=emergency_ward_entrance: Tag:emergency=emergency ward entrance
+    emergency=fire_alarm: Tag:emergency=fire alarm
+    emergency=fire_alarm_box: Tag:emergency=fire alarm box
     emergency=fire_extinguisher: Tag:emergency=fire extinguisher
     emergency=fire_flapper: Tag:emergency=fire flapper
     emergency=fire_hose: Tag:emergency=fire hose
     emergency=fire_hydrant: Tag:emergency=fire hydrant
+    emergency=fire_point_stand: Tag:emergency=fire point stand
+    emergency=fire_sand_bin: Tag:emergency=fire sand bin
     emergency=fire_water_pond: Tag:emergency=fire water pond
+    emergency=first_aid: Tag:emergency=first aid
+    emergency=first_aid_kit: Tag:emergency=first aid kit
     emergency=landing_site: Tag:emergency=landing site
     emergency=life_ring: Tag:emergency=life ring
     emergency=lifeboat_station: Tag:emergency=lifeboat station
+    emergency=lifeguard: Tag:emergency=lifeguard
     emergency=lifeguard_base: Tag:emergency=lifeguard base
     emergency=lifeguard_place: Tag:emergency=lifeguard place
     emergency=lifeguard_platform: Tag:emergency=lifeguard platform
     emergency=lifeguard_tower: Tag:emergency=lifeguard tower
     emergency=marine_refuge: Tag:emergency=marine refuge
+    emergency=mountain_rescue: Tag:emergency=mountain rescue
     emergency=phone: Tag:emergency=phone
+    emergency=rescue_box: Tag:emergency=rescue box
     emergency=ses_station: Tag:emergency=ses station
     emergency=siamese: Tag:emergency=siamese
     emergency=siren: Tag:emergency=siren
@@ -6263,11 +6610,15 @@ en:
     esperanto=esperanto: Tag:esperanto=esperanto
     estuary=yes: Tag:estuary=yes
     fast_food=cafeteria: Tag:fast food=cafeteria
-    food=gourmet: Tag:food=gourmet
+    flood_mark=painting: Tag:flood mark=painting
+    flood_mark=plaque: Tag:flood mark=plaque
     foot=designated: Tag:foot=designated
     foot=official: Tag:foot=official
     footway=crossing: Tag:footway=crossing
     footway=sidewalk: Tag:footway=sidewalk
+    ford=boat: Tag:ford=boat
+    ford=stepping_stones: Tag:ford=stepping stones
+    ford=yes: Tag:ford=yes
     fortification_type=hill_fort: Tag:fortification type=hill fort
     fortification_type=limes: Tag:fortification type=limes
     fortification_type=ring_ditch: Tag:fortification type=ring ditch
@@ -6336,11 +6687,15 @@ en:
     golf=tee: Tag:golf=tee
     golf=water_hazard: Tag:golf=water hazard
     government=audit: Tag:government=audit
+    government=cadaster: Tag:government=cadaster
+    government=customs: Tag:government=customs
+    government=healthcare: Tag:government=healthcare
     government=ministry: Tag:government=ministry
     government=prosecutor: Tag:government=prosecutor
     government=register_office: Tag:government=register office
     government=statistics: Tag:government=statistics
     government=tax: Tag:government=tax
+    government=youth_welfare_department: Tag:government=youth welfare department
     grit_bin: Tag:grit bin
     guidepost=simple: Tag:guidepost=simple
     harbour:category=RoRo: Tag:harbour:category=RoRo
@@ -6444,12 +6799,15 @@ en:
     historic=boundary_stone: Tag:historic=boundary stone
     historic=cannon: Tag:historic=cannon
     historic=castle: Tag:historic=castle
+    historic=castle_wall: Tag:historic=castle wall
     historic=charcoal_pile: Tag:historic=charcoal pile
+    historic=church: Tag:historic=church
     historic=city_gate: Tag:historic=city gate
     historic=city_wall: Tag:historic=city wall
     historic=citywalls: Tag:historic=citywalls
     historic=event: Tag:historic=event
     historic=farm: Tag:historic=farm
+    historic=flood_mark: Tag:historic=flood mark
     historic=fort: Tag:historic=fort
     historic=gallows: Tag:historic=gallows
     historic=heritage: Tag:historic=heritage
@@ -6459,6 +6817,7 @@ en:
     historic=memorial: Tag:historic=memorial
     historic=milestone: Tag:historic=milestone
     historic=mine: Tag:historic=mine
+    historic=mine_shaft: Tag:historic=mine shaft
     historic=monastery: Tag:historic=monastery
     historic=monument: Tag:historic=monument
     historic=optical_telegraph: Tag:historic=optical telegraph
@@ -6478,6 +6837,10 @@ en:
     historic=wreck: Tag:historic=wreck
     horse=designated: Tag:horse=designated
     hunting=raised_hide: Tag:hunting=raised hide
+    indoor=area: Tag:indoor=area
+    indoor=corridor: Tag:indoor=corridor
+    indoor=room: Tag:indoor=room
+    indoor=wall: Tag:indoor=wall
     indoormark=beacon: Tag:indoormark=beacon
     industrial=aluminium_smelting: Tag:industrial=aluminium smelting
     industrial=auto_wrecker: Tag:industrial=auto wrecker
@@ -6497,6 +6860,7 @@ en:
     industrial=oil: Tag:industrial=oil
     industrial=oil_mill: Tag:industrial=oil mill
     industrial=port: Tag:industrial=port
+    industrial=rice_mill: Tag:industrial=rice mill
     industrial=salt_pond: Tag:industrial=salt pond
     industrial=sawmill: Tag:industrial=sawmill
     industrial=scrap_yard: Tag:industrial=scrap yard
@@ -6514,6 +6878,7 @@ en:
     information=tactile_model: Tag:information=tactile model
     information=terminal: Tag:information=terminal
     internet_access=wlan: Tag:internet access=wlan
+    irrigation=pivot: Tag:irrigation=pivot
     junction=circular: Tag:junction=circular
     junction=crossing: Tag:junction=crossing
     junction=filter: Tag:junction=filter
@@ -6536,7 +6901,6 @@ en:
     landmark=large_rock: Tag:landmark=large rock
     landmark=mast: Tag:landmark=mast
     landmark=memorial_plaque: Tag:landmark=memorial plaque
-    landmark=monument: Tag:landmark=monument
     landmark=obelisk: Tag:landmark=obelisk
     landmark=pillar: Tag:landmark=pillar
     landmark=radar_scanner: Tag:landmark=radar scanner
@@ -6549,6 +6913,7 @@ en:
     landmark=windsock: Tag:landmark=windsock
     landuse=agriculture: Tag:landuse=agriculture
     landuse=allotments: Tag:landuse=allotments
+    landuse=animal_keeping: Tag:landuse=animal keeping
     landuse=apiary: Tag:landuse=apiary
     landuse=aquaculture: Tag:landuse=aquaculture
     landuse=basin: Tag:landuse=basin
@@ -6558,6 +6923,7 @@ en:
     landuse=cemetery: Tag:landuse=cemetery
     landuse=churchyard: Tag:landuse=churchyard
     landuse=commercial: Tag:landuse=commercial
+    landuse=conservation: Tag:landuse=conservation
     landuse=construction: Tag:landuse=construction
     landuse=depot: Tag:landuse=depot
     landuse=farm: Tag:landuse=farm
@@ -6572,6 +6938,7 @@ en:
     landuse=grave_yard: Tag:landuse=grave yard
     landuse=greenfield: Tag:landuse=greenfield
     landuse=greenhouse_horticulture: Tag:landuse=greenhouse horticulture
+    landuse=harbour: Tag:landuse=harbour
     landuse=highway: Tag:landuse=highway
     landuse=hop_garden: Tag:landuse=hop garden
     landuse=industrial: Tag:landuse=industrial
@@ -6600,7 +6967,6 @@ en:
     landuse=traffic_island: Tag:landuse=traffic island
     landuse=trees: Tag:landuse=trees
     landuse=turbary: Tag:landuse=turbary
-    landuse=utility: Tag:landuse=utility
     landuse=village_green: Tag:landuse=village green
     landuse=vineyard: Tag:landuse=vineyard
     landuse=well: Tag:landuse=well
@@ -6691,6 +7057,7 @@ en:
     level_crossing=uncontrolled: Tag:level crossing=uncontrolled
     line=bay: Tag:line=bay
     line=busbar: Tag:line=busbar
+    line=substation: Tag:line=substation
     lines=phone: Tag:lines=phone
     locality=subtownland: Tag:locality=subtownland
     locality=townland: Tag:locality=townland
@@ -6698,6 +7065,7 @@ en:
     maintenance=gritting: Tag:maintenance=gritting
     man_made=MDF: Tag:man made=MDF
     man_made=adit: Tag:man made=adit
+    man_made=animal_trap: Tag:man made=animal trap
     man_made=antenna: Tag:man made=antenna
     man_made=archimedes_screw: Tag:man made=archimedes screw
     man_made=beacon: Tag:man made=beacon
@@ -6707,6 +7075,7 @@ en:
     man_made=bunker_silo: Tag:man made=bunker silo
     man_made=cairn: Tag:man made=cairn
     man_made=campanile: Tag:man made=campanile
+    man_made=carpet_hanger: Tag:man made=carpet hanger
     man_made=chimney: Tag:man made=chimney
     man_made=clearcut: Tag:man made=clearcut
     man_made=communications_tower: Tag:man made=communications tower
@@ -6725,6 +7094,7 @@ en:
     man_made=flagpole: Tag:man made=flagpole
     man_made=flare: Tag:man made=flare
     man_made=floating_storage: Tag:man made=floating storage
+    man_made=footwear_decontamination: Tag:man made=footwear decontamination
     man_made=frost_fan: Tag:man made=frost fan
     man_made=gasometer: Tag:man made=gasometer
     man_made=geoglyph: Tag:man made=geoglyph
@@ -6819,6 +7189,7 @@ en:
     memorial=stele: Tag:memorial=stele
     memorial=stolperstein: Tag:memorial=stolperstein
     memorial=stone: Tag:memorial=stone
+    memorial=storm_surge_post: Tag:memorial=storm surge post
     memorial=war_memorial: Tag:memorial=war memorial
     microbrewery=yes: Tag:microbrewery=yes
     military=airfield: Tag:military=airfield
@@ -6845,9 +7216,21 @@ en:
     mooring=sbm: Tag:mooring=sbm
     mooring=spm: Tag:mooring=spm
     mooring=visitor: Tag:mooring=visitor
+    motorcycle:theme=yes: Tag:motorcycle:theme=yes
     motorcycle:type=electric: Tag:motorcycle:type=electric
     motorcycle:type=sportbike: Tag:motorcycle:type=sportbike
-    motorcycle_friendly: Tag:motorcycle friendly
+    motorcycle_friendly=customary: Tag:motorcycle friendly=customary
+    museum=archaeological: Tag:museum=archaeological
+    museum=art: Tag:museum=art
+    museum=history: Tag:museum=history
+    museum=living_history: Tag:museum=living history
+    museum=local: Tag:museum=local
+    museum=military: Tag:museum=military
+    museum=nature: Tag:museum=nature
+    museum=open_air: Tag:museum=open air
+    museum=railway: Tag:museum=railway
+    museum=technology: Tag:museum=technology
+    museum=transport: Tag:museum=transport
     name=7-Eleven: Tag:name=7-Eleven
     name=BMO: Tag:name=BMO
     name=BMO_Bank_of_Montreal: Tag:name=BMO Bank of Montreal
@@ -6871,6 +7254,7 @@ en:
     natural=bay: Tag:natural=bay
     natural=beach: Tag:natural=beach
     natural=bedrock: Tag:natural=bedrock
+    natural=birds_nest: Tag:natural=birds nest
     natural=blowhole: Tag:natural=blowhole
     natural=breaker: Tag:natural=breaker
     natural=cape: Tag:natural=cape
@@ -6895,7 +7279,7 @@ en:
     natural=grassland: Tag:natural=grassland
     natural=gully: Tag:natural=gully
     natural=heath: Tag:natural=heath
-    natural=herb: Tag:natural=herb
+    natural=hill: Tag:natural=hill
     natural=hot_spring: Tag:natural=hot spring
     natural=lake: Tag:natural=lake
     natural=land: Tag:natural=land
@@ -6931,6 +7315,7 @@ en:
     natural=termite_mound: Tag:natural=termite mound
     natural=tree: Tag:natural=tree
     natural=tree_row: Tag:natural=tree row
+    natural=tree_stump: Tag:natural=tree stump
     natural=tundra: Tag:natural=tundra
     natural=valley: Tag:natural=valley
     natural=volcano: Tag:natural=volcano
@@ -7096,6 +7481,7 @@ en:
     network=US:TX:NASA: Tag:network=US:TX:NASA
     network=US:TX:RM: Tag:network=US:TX:RM
     network=US:TX:Spur: Tag:network=US:TX:Spur
+    network=US:TX:Wood: Tag:network=US:TX:Wood
     network=US:US: Tag:network=US:US
     network=US:UT: Tag:network=US:UT
     network=US:VA: Tag:network=US:VA
@@ -7114,14 +7500,19 @@ en:
     network=jp:prefectural:nagano: Tag:network=jp:prefectural:nagano
     network=lcn: Tag:network=lcn
     network=lhn: Tag:network=lhn
+    network=lpn: Tag:network=lpn
     network=lwn: Tag:network=lwn
     network=ncn: Tag:network=ncn
     network=nextbike: Tag:network=nextbike
     network=nwn: Tag:network=nwn
     network=rcn: Tag:network=rcn
     network=rhn: Tag:network=rhn
+    network=rin: Tag:network=rin
+    network=rmn: Tag:network=rmn
+    network=rpn: Tag:network=rpn
     network=rwn: Tag:network=rwn
     noexit=no: Tag:noexit=no
+    observatory:type=astronomical: Tag:observatory:type=astronomical
     odbl=clean: Tag:odbl=clean
     office:realtor: Tag:office:realtor
     office=accountant: Tag:office=accountant
@@ -7136,10 +7527,12 @@ en:
     office=educational_institution: Tag:office=educational institution
     office=employment_agency: Tag:office=employment agency
     office=energy_supplier: Tag:office=energy supplier
+    office=engineer: Tag:office=engineer
     office=estate_agent: Tag:office=estate agent
     office=financial: Tag:office=financial
     office=forestry: Tag:office=forestry
     office=foundation: Tag:office=foundation
+    office=geodesist: Tag:office=geodesist
     office=government: Tag:office=government
     office=guide: Tag:office=guide
     office=insurance: Tag:office=insurance
@@ -7155,6 +7548,7 @@ en:
     office=parish: Tag:office=parish
     office=political_party: Tag:office=political party
     office=private_investigator: Tag:office=private investigator
+    office=property_management: Tag:office=property management
     office=quango: Tag:office=quango
     office=real_estate_agent: Tag:office=real estate agent
     office=realtor: Tag:office=realtor
@@ -7166,6 +7560,7 @@ en:
     office=tax_advisor: Tag:office=tax advisor
     office=telecommunication: Tag:office=telecommunication
     office=therapist: Tag:office=therapist
+    office=tourist_accommodation: Tag:office=tourist accommodation
     office=travel_agent: Tag:office=travel agent
     office=water_utility: Tag:office=water utility
     office=yes: Tag:office=yes
@@ -7197,6 +7592,7 @@ en:
     pilotage=office: Tag:pilotage=office
     pipeline=marker: Tag:pipeline=marker
     pipeline=substation: Tag:pipeline=substation
+    pipeline=surge_tank: Tag:pipeline=surge tank
     pipeline=valve: Tag:pipeline=valve
     piste:type=connection: Tag:piste:type=connection
     piste:type=downhill: Tag:piste:type=downhill
@@ -7221,6 +7617,7 @@ en:
     place=quarter: Tag:place=quarter
     place=region: Tag:place=region
     place=sea: Tag:place=sea
+    place=shieling: Tag:place=shieling
     place=square: Tag:place=square
     place=state: Tag:place=state
     place=suburb: Tag:place=suburb
@@ -7229,6 +7626,7 @@ en:
     placement=right_of:1: Tag:placement=right of:1
     placement=transition: Tag:placement=transition
     pole=transition: Tag:pole=transition
+    power=busbar: Tag:power=busbar
     power=cable: Tag:power=cable
     power=cable_distribution_cabinet: Tag:power=cable distribution cabinet
     power=catenary_mast: Tag:power=catenary mast
@@ -7238,6 +7636,7 @@ en:
     power=heliostat: Tag:power=heliostat
     power=insulator: Tag:power=insulator
     power=line: Tag:power=line
+    power=marker: Tag:power=marker
     power=minor_line: Tag:power=minor line
     power=outlet: Tag:power=outlet
     power=plant: Tag:power=plant
@@ -7256,6 +7655,7 @@ en:
     priority=national: Tag:priority=national
     priority=regional: Tag:priority=regional
     prison_camp=concentration_camp: Tag:prison camp=concentration camp
+    prison_camp=extermination_camp: Tag:prison camp=extermination camp
     psv=designated: Tag:psv=designated
     public_transport=pay_scale_area: Tag:public transport=pay scale area
     public_transport=platform: Tag:public transport=platform
@@ -7290,6 +7690,7 @@ en:
     railway=abandoned: Tag:railway=abandoned
     railway=buffer_stop: Tag:railway=buffer stop
     railway=crossing: Tag:railway=crossing
+    railway=crossing_controller: Tag:railway=crossing controller
     railway=derail: Tag:railway=derail
     railway=diamond: Tag:railway=diamond
     railway=disused: Tag:railway=disused
@@ -7322,6 +7723,8 @@ en:
     railway=traverser: Tag:railway=traverser
     railway=turntable: Tag:railway=turntable
     railway=wash: Tag:railway=wash
+    railway=water_crane: Tag:railway=water crane
+    railway=water_tower: Tag:railway=water tower
     railway=yard: Tag:railway=yard
     recycling_type=container: Tag:recycling type=container
     religion=buddhist: Tag:religion=buddhist
@@ -7332,6 +7735,7 @@ en:
     religion=multifaith: Tag:religion=multifaith
     religion=muslim: Tag:religion=muslim
     religion=pagan: Tag:religion=pagan
+    religion=self-realization_fellowship: Tag:religion=self-realization fellowship
     religion=shinto: Tag:religion=shinto
     religion=sikh: Tag:religion=sikh
     religion=taoist: Tag:religion=taoist
@@ -7348,8 +7752,11 @@ en:
     route=bicycle: Tag:route=bicycle
     route=bus: Tag:route=bus
     route=canal: Tag:route=canal
+    route=canoe: Tag:route=canoe
     route=coach: Tag:route=coach
     route=detour: Tag:route=detour
+    route=evacuation: Tag:route=evacuation
+    route=ferrata: Tag:route=ferrata
     route=ferry: Tag:route=ferry
     route=fitness_trail: Tag:route=fitness trail
     route=foot: Tag:route=foot
@@ -7359,6 +7766,7 @@ en:
     route=light_rail: Tag:route=light rail
     route=minibus: Tag:route=minibus
     route=monorail: Tag:route=monorail
+    route=motorboat: Tag:route=motorboat
     route=ncn: Tag:route=ncn
     route=nordic_walking: Tag:route=nordic walking
     route=pipeline: Tag:route=pipeline
@@ -7372,6 +7780,7 @@ en:
     route=tracks: Tag:route=tracks
     route=train: Tag:route=train
     route=tram: Tag:route=tram
+    route=transhumance: Tag:route=transhumance
     route=trolleybus: Tag:route=trolleybus
     seamark:beacon_cardinal:colour_pattern=horizontal: Tag:seamark:beacon cardinal:colour
       pattern=horizontal
@@ -7701,6 +8110,7 @@ en:
     service=spur: Tag:service=spur
     service=yard: Tag:service=yard
     shelter_type=basic_hut: Tag:shelter type=basic hut
+    shelter_type=field_shelter: Tag:shelter type=field shelter
     shelter_type=lean_to: Tag:shelter type=lean to
     shelter_type=public_transport: Tag:shelter type=public transport
     shop=*: Tag:shop=*
@@ -7711,6 +8121,7 @@ en:
     shop=anime: Tag:shop=anime
     shop=antique: Tag:shop=antique
     shop=antiques: Tag:shop=antiques
+    shop=appliance: Tag:shop=appliance
     shop=art: Tag:shop=art
     shop=atv: Tag:shop=atv
     shop=audiologist: Tag:shop=audiologist
@@ -7725,6 +8136,7 @@ en:
     shop=betting: Tag:shop=betting
     shop=beverages: Tag:shop=beverages
     shop=bicycle: Tag:shop=bicycle
+    shop=board: Tag:shop=board
     shop=boat: Tag:shop=boat
     shop=bookmaker: Tag:shop=bookmaker
     shop=books: Tag:shop=books
@@ -7734,14 +8146,14 @@ en:
     shop=butcher: Tag:shop=butcher
     shop=camera: Tag:shop=camera
     shop=candles: Tag:shop=candles
-    shop=canoe_hire: Tag:shop=canoe hire
+    shop=cannabis: Tag:shop=cannabis
     shop=car: Tag:shop=car
-    shop=car_bodyshop: Tag:shop=car bodyshop
     shop=car_parts: Tag:shop=car parts
     shop=car_repair: Tag:shop=car repair
     shop=car_service: Tag:shop=car service
     shop=carpet: Tag:shop=carpet
     shop=cell_phones: Tag:shop=cell phones
+    shop=ceramics: Tag:shop=ceramics
     shop=chandler: Tag:shop=chandler
     shop=charity: Tag:shop=charity
     shop=cheese: Tag:shop=cheese
@@ -7774,6 +8186,7 @@ en:
     shop=electrical: Tag:shop=electrical
     shop=electronics: Tag:shop=electronics
     shop=energy: Tag:shop=energy
+    shop=equestrian: Tag:shop=equestrian
     shop=erotic: Tag:shop=erotic
     shop=estate_agent: Tag:shop=estate agent
     shop=fabric: Tag:shop=fabric
@@ -7826,7 +8239,7 @@ en:
     shop=herbalist: Tag:shop=herbalist
     shop=hifi: Tag:shop=hifi
     shop=hobby: Tag:shop=hobby
-    shop=household: Tag:shop=household
+    shop=hookah: Tag:shop=hookah
     shop=houseware: Tag:shop=houseware
     shop=hunting: Tag:shop=hunting
     shop=ice_cream: Tag:shop=ice cream
@@ -7880,7 +8293,6 @@ en:
     shop=photo: Tag:shop=photo
     shop=photo_studio: Tag:shop=photo studio
     shop=photography: Tag:shop=photography
-    shop=piercing: Tag:shop=piercing
     shop=pottery: Tag:shop=pottery
     shop=printer_ink: Tag:shop=printer ink
     shop=printing: Tag:shop=printing
@@ -7917,6 +8329,7 @@ en:
     shop=tickets: Tag:shop=tickets
     shop=tiles: Tag:shop=tiles
     shop=tobacco: Tag:shop=tobacco
+    shop=tool_hire: Tag:shop=tool hire
     shop=toy: Tag:shop=toy
     shop=toys: Tag:shop=toys
     shop=trade: Tag:shop=trade
@@ -7941,8 +8354,6 @@ en:
     shop=winery: Tag:shop=winery
     shop=wool: Tag:shop=wool
     shop=yes: Tag:shop=yes
-    sign=no: Tag:sign=no
-    sign=yes: Tag:sign=yes
     signal_station=bridge: Tag:signal station=bridge
     signal_station=control: Tag:signal station=control
     signal_station=distress: Tag:signal station=distress
@@ -7983,17 +8394,22 @@ en:
     social_facility=shelter: Tag:social facility=shelter
     social_facility=soup_kitchen: Tag:social facility=soup kitchen
     social_facility=workshop: Tag:social facility=workshop
+    source:addr=GURS: Tag:source:addr=GURS
     source:ele=barometric: Tag:source:ele=barometric
     source:geometry=ACT2016: Tag:source:geometry=ACT2016
     source:geometry=ACTMapiRoads: Tag:source:geometry=ACTMapiRoads
     source:geometry=ACTMapiTP: Tag:source:geometry=ACTMapiTP
     source:geometry=Bing: Tag:source:geometry=Bing
+    source:geometry=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:maxspeed=implicit: Tag:source:maxspeed=implicit
     source:name=LPI_NSW_Base_Map: Tag:source:name=LPI NSW Base Map
+    source:name=NPWS_Estate: Tag:source:name=NPWS Estate
     source:name=NSW_LPI_Base_Map: Tag:source:name=NSW LPI Base Map
+    source:position=NPWS_Estate: Tag:source:position=NPWS Estate
     source=ACT2016: Tag:source=ACT2016
+    source=ACT2017: Tag:source=ACT2017
     source=ACTMapiRoads: Tag:source=ACTMapiRoads
     source=ACTMapiTP: Tag:source=ACTMapiTP
     source=Bymiljøetaten: Tag:source=Bymiljøetaten
@@ -8007,11 +8423,13 @@ en:
     source=LPI_NSW_Base_Map: Tag:source=LPI NSW Base Map
     source=LPI_NSW_Imagery: Tag:source=LPI NSW Imagery
     source=NAIP: Tag:source=NAIP
+    source=NPWS_Estate: Tag:source=NPWS Estate
     source=NSW_LPI_Base_Map: Tag:source=NSW LPI Base Map
     source=NSW_LPI_Imagery: Tag:source=NSW LPI Imagery
     source=Naturbase: Tag:source=Naturbase
     source=PGS: Tag:source=PGS
     source=RABA-KGZ: Tag:source=RABA-KGZ
+    source=Schadow1_Expeditions: Tag:source=Schadow1 Expeditions
     source=YahooJapan/ALPSMAP: Tag:source=YahooJapan/ALPSMAP
     source=gurs: Tag:source=gurs
     sport=10pin: Tag:sport=10pin
@@ -8030,6 +8448,7 @@ en:
     sport=base: Tag:sport=base
     sport=baseball: Tag:sport=baseball
     sport=basketball: Tag:sport=basketball
+    sport=batting_cage: Tag:sport=batting cage
     sport=beachvolleyball: Tag:sport=beachvolleyball
     sport=billards: Tag:sport=billards
     sport=billiards: Tag:sport=billiards
@@ -8075,9 +8494,11 @@ en:
     sport=ice_skating: Tag:sport=ice skating
     sport=ice_stock: Tag:sport=ice stock
     sport=judo: Tag:sport=judo
+    sport=karate: Tag:sport=karate
     sport=karting: Tag:sport=karting
     sport=kitesurfing: Tag:sport=kitesurfing
     sport=korfball: Tag:sport=korfball
+    sport=lacrosse: Tag:sport=lacrosse
     sport=laser_tag: Tag:sport=laser tag
     sport=model_aerodrome: Tag:sport=model aerodrome
     sport=motocross: Tag:sport=motocross
@@ -8087,6 +8508,7 @@ en:
     sport=obstacle_course: Tag:sport=obstacle course
     sport=orienteering: Tag:sport=orienteering
     sport=paddle_tennis: Tag:sport=paddle tennis
+    sport=padel: Tag:sport=padel
     sport=paintball: Tag:sport=paintball
     sport=parachuting: Tag:sport=parachuting
     sport=paragliding: Tag:sport=paragliding
@@ -8126,6 +8548,7 @@ en:
     sport=yoga: Tag:sport=yoga
     sports=aikido: Tag:sports=aikido
     sports=athletics: Tag:sports=athletics
+    spring:type=hot: Tag:spring:type=hot
     station=light_rail: Tag:station=light rail
     station=subway: Tag:station=subway
     substation=compensation: Tag:substation=compensation
@@ -8148,6 +8571,9 @@ en:
     telecom=datacenter: Tag:telecom=datacenter
     telecom=remote_digital_terminal: Tag:telecom=remote digital terminal
     telecom=remote_terminal: Tag:telecom=remote terminal
+    telescope:type=optical: Tag:telescope:type=optical
+    telescope:type=radio: Tag:telescope:type=radio
+    tourism=accommodation: Tag:tourism=accommodation
     tourism=alpine_hut: Tag:tourism=alpine hut
     tourism=apartment: Tag:tourism=apartment
     tourism=aquarium: Tag:tourism=aquarium
@@ -8177,6 +8603,8 @@ en:
     tower:construction=dish: Tag:tower:construction=dish
     tower:construction=dome: Tag:tower:construction=dome
     tower:construction=freestanding: Tag:tower:construction=freestanding
+    tower:construction=guyed_lattice: Tag:tower:construction=guyed lattice
+    tower:construction=guyed_tube: Tag:tower:construction=guyed tube
     tower:construction=lattice: Tag:tower:construction=lattice
     tower:type: Tag:tower:type
     tower:type=bell_tower: Tag:tower:type=bell tower
@@ -8189,6 +8617,7 @@ en:
     tower:type=intake: Tag:tower:type=intake
     tower:type=lattice: Tag:tower:type=lattice
     tower:type=lighting: Tag:tower:type=lighting
+    tower:type=minaret: Tag:tower:type=minaret
     tower:type=monitoring: Tag:tower:type=monitoring
     tower:type=monument: Tag:tower:type=monument
     tower:type=observation: Tag:tower:type=observation
@@ -8211,6 +8640,7 @@ en:
     transformer=traction: Tag:transformer=traction
     transformer=yes: Tag:transformer=yes
     tunnel=culvert: Tag:tunnel=culvert
+    tunnel=flooded: Tag:tunnel=flooded
     two_sided=yes: Tag:two sided=yes
     type=AutoPASS: Tag:type=AutoPASS
     type=autopass: Tag:type=autopass
@@ -8220,10 +8650,24 @@ en:
     type=observation_spot: Tag:type=observation spot
     type=public_transport: Tag:type=public transport
     type=triangulation: Tag:type=triangulation
+    usage=distribution: Tag:usage=distribution
+    usage=facility: Tag:usage=facility
+    usage=flare_header: Tag:usage=flare header
+    usage=flowline: Tag:usage=flowline
+    usage=gathering: Tag:usage=gathering
+    usage=headrace: Tag:usage=headrace
+    usage=injection: Tag:usage=injection
+    usage=irrigation: Tag:usage=irrigation
+    usage=penstock: Tag:usage=penstock
+    usage=spillway: Tag:usage=spillway
+    usage=tailrace: Tag:usage=tailrace
+    usage=transmission: Tag:usage=transmission
+    vending: Tag:vending
     vending=SIM-cards: Tag:vending=SIM-cards
     vending=SIM_cards: Tag:vending=SIM cards
     vending=admission_tickets: Tag:vending=admission tickets
     vending=animal_feed: Tag:vending=animal feed
+    vending=art: Tag:vending=art
     vending=bicycle_tube: Tag:vending=bicycle tube
     vending=books: Tag:vending=books
     vending=bottle_return: Tag:vending=bottle return
@@ -8279,11 +8723,17 @@ en:
     wall=seawall: Tag:wall=seawall
     wall=training_wall: Tag:wall=training wall
     waste=dog_excrement: Tag:waste=dog excrement
+    water=canal: Tag:water=canal
     water=intermittent: Tag:water=intermittent
+    water=lagoon: Tag:water=lagoon
     water=lake: Tag:water=lake
     water=lock: Tag:water=lock
+    water=oxbow: Tag:water=oxbow
+    water=pond: Tag:water=pond
     water=reservoir: Tag:water=reservoir
+    water=river: Tag:water=river
     water=tidal: Tag:water=tidal
+    water=wastewater: Tag:water=wastewater
     waterway=boat_lift: Tag:waterway=boat lift
     waterway=boatyard: Tag:waterway=boatyard
     waterway=brook: Tag:waterway=brook
@@ -8304,11 +8754,13 @@ en:
     waterway=milestone: Tag:waterway=milestone
     waterway=mooring: Tag:waterway=mooring
     waterway=offshore_field: Tag:waterway=offshore field
+    waterway=pressurised: Tag:waterway=pressurised
     waterway=rapids: Tag:waterway=rapids
     waterway=river: Tag:waterway=river
     waterway=riverbank: Tag:waterway=riverbank
     waterway=sanitary_dump_station: Tag:waterway=sanitary dump station
     waterway=seaway: Tag:waterway=seaway
+    waterway=spillway: Tag:waterway=spillway
     waterway=stream: Tag:waterway=stream
     waterway=stream_end: Tag:waterway=stream end
     waterway=swept_area: Tag:waterway=swept area
@@ -8343,7 +8795,8 @@ en:
 eo:
   key:
     esperanto: Eo:Key:esperanto
-    esperanto=yes: Eo:Key:esperanto=yes
+  tag:
+    esperanto=yes: Eo:Tag:esperanto=yes
 es:
   key:
     abandoned: ES:Key:abandoned
@@ -8369,27 +8822,36 @@ es:
     addr:subdistrict: ES:Key:addr:subdistrict
     addr:suburb: ES:Key:addr:suburb
     aerialway: ES:Key:aerialway
+    aeroway: ES:Key:aeroway
     amenity: ES:Key:amenity
+    area:highway: ES:Key:area:highway
     artist_name: ES:Key:artist name
     artwork_subject: ES:Key:artwork subject
     barrier: ES:Key:barrier
     bicycle_parking: ES:Key:bicycle parking
     bicycle_road: ES:Key:bicycle road
+    branch: ES:Key:branch
     brand: ES:Key:brand
     brewery: ES:Key:brewery
     bridge:structure: ES:Key:bridge:structure
     building: ES:Key:building
     building:levels: ES:Key:building:levels
+    building:material: ES:Key:building:material
+    building:part: ES:Key:building:part
     bus_bay: ES:Key:bus bay
     busway: ES:Key:busway
     cemetery: ES:Key:cemetery
+    check_date: ES:Key:check date
     circumference: ES:Key:circumference
     clothes: ES:Key:clothes
+    club: ES:Key:club
     comment: ES:Key:comment
     construction: ES:Key:construction
     contact: ES:Key:contact
+    content: ES:Key:content
     conveying: ES:Key:conveying
     craft: ES:Key:craft
+    crossing: ES:Key:crossing
     cuisine: ES:Key:cuisine
     cutting: ES:Key:cutting
     cycleway: ES:Key:cycleway
@@ -8415,6 +8877,8 @@ es:
     footway: ES:Key:footway
     ford: ES:Key:ford
     fuel:diesel_G2: ES:Key:fuel:diesel G2
+    garden:style: ES:Key:garden:style
+    garden:type: ES:Key:garden:type
     generator:output: ES:Key:generator:output
     generator:source: ES:Key:generator:source
     geological: ES:Key:geological
@@ -8427,9 +8891,13 @@ es:
     historic: ES:Key:historic
     historic:civilization: ES:Key:historic:civilization
     image: ES:Key:image
+    imagery_used: ES:Key:imagery used
+    incline: ES:Key:incline
     indoor: ES:Key:indoor
+    industrial: ES:Key:industrial
     intermittent: ES:Key:intermittent
     is_in: ES:Key:is in
+    kerb: ES:Key:kerb
     ladder: ES:Key:ladder
     landuse: ES:Key:landuse
     lanes: ES:Key:lanes
@@ -8439,12 +8907,15 @@ es:
     leisure: ES:Key:leisure
     local_ref: ES:Key:local ref
     locale: ES:Key:locale
+    location: ES:Key:location
     man_made: ES:Key:man made
     manufacturer: ES:Key:manufacturer
     mapillary: ES:Key:mapillary
     material: ES:Key:material
     maxheight: ES:Key:maxheight
     maxspeed: ES:Key:maxspeed
+    maxspeed:advisory: ES:Key:maxspeed:advisory
+    maxspeed:practical: ES:Key:maxspeed:practical
     memorial: ES:Key:memorial
     monitoring:galileo: ES:Key:monitoring:galileo
     monitoring:glonass: ES:Key:monitoring:glonass
@@ -8485,16 +8956,22 @@ es:
     public_transport:version: ES:Key:public transport:version
     pump: ES:Key:pump
     railway: ES:Key:railway
+    railway:preserved: ES:Key:railway:preserved
+    ramp: ES:Key:ramp
     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
     religion: ES:Key:religion
+    'removed:': 'ES:Key:removed:'
     resource: ES:Key:resource
     roof:direction: ES:Key:roof:direction
+    roof:material: ES:Key:roof:material
+    roundtrip: ES:Key:roundtrip
     route: ES:Key:route
     route_master: ES:Key:route master
+    route_ref: ES:Key:route ref
     ruins: ES:Key:ruins
     'ruins:': 'ES:Key:ruins:'
     rungs: ES:Key:rungs
@@ -8516,6 +8993,7 @@ es:
     todo: ES:Key:todo
     tourism: ES:Key:tourism
     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
@@ -8525,6 +9003,7 @@ es:
     tunnel: ES:Key:tunnel
     turn: ES:Key:turn
     type: ES:Key:type
+    unnamed: ES:Key:unnamed
     url: ES:Key:url
     water: ES:Key:water
     waterway: ES:Key:waterway
@@ -8540,9 +9019,11 @@ es:
     aerialway=cable_car: ES:Tag:aerialway=cable car
     aerialway=gondola: ES:Tag:aerialway=gondola
     aerialway=station: ES:Tag:aerialway=station
+    aerodrome:type=regional: ES:Tag:aerodrome:type=regional
     aeroway=apron: ES:Tag:aeroway=apron
     aeroway=helipad: ES:Tag:aeroway=helipad
     aeroway=heliport: ES:Tag:aeroway=heliport
+    aeroway=navigationaid: ES:Tag:aeroway=navigationaid
     aeroway=terminal: ES:Tag:aeroway=terminal
     aeroway=windsock: ES:Tag:aeroway=windsock
     airmark=beacon: ES:Tag:airmark=beacon
@@ -8552,19 +9033,24 @@ es:
     amenity=atm: ES:Tag:amenity=atm
     amenity=bank: ES:Tag:amenity=bank
     amenity=bar: ES:Tag:amenity=bar
+    amenity=bbq: ES:Tag:amenity=bbq
     amenity=bench: ES:Tag:amenity=bench
     amenity=bicycle_parking: ES:Tag:amenity=bicycle parking
     amenity=bicycle_rental: ES:Tag:amenity=bicycle rental
     amenity=biergarten: ES:Tag:amenity=biergarten
+    amenity=boat_storage: ES:Tag:amenity=boat storage
     amenity=brothel: ES:Tag:amenity=brothel
     amenity=bus_station: ES:Tag:amenity=bus station
     amenity=cafe: ES:Tag:amenity=cafe
     amenity=car_rental: ES:Tag:amenity=car rental
     amenity=car_wash: ES:Tag:amenity=car wash
     amenity=clinic: ES:Tag:amenity=clinic
+    amenity=clock: ES:Tag:amenity=clock
     amenity=college: ES:Tag:amenity=college
     amenity=community_centre: ES:Tag:amenity=community centre
+    amenity=compressed_air: ES:Tag:amenity=compressed air
     amenity=courthouse: ES:Tag:amenity=courthouse
+    amenity=coworking_space: ES:Tag:amenity=coworking space
     amenity=crematorium: ES:Tag:amenity=crematorium
     amenity=crypt: ES:Tag:amenity=crypt
     amenity=dentist: ES:Tag:amenity=dentist
@@ -8577,6 +9063,7 @@ es:
     amenity=exhibition_centre: ES:Tag:amenity=exhibition centre
     amenity=fast_food: ES:Tag:amenity=fast food
     amenity=ferry_terminal: ES:Tag:amenity=ferry terminal
+    amenity=food_court: ES:Tag:amenity=food court
     amenity=fountain: ES:Tag:amenity=fountain
     amenity=fuel: ES:Tag:amenity=fuel
     amenity=grave_yard: ES:Tag:amenity=grave yard
@@ -8589,15 +9076,18 @@ es:
     amenity=love_hotel: ES:Tag:amenity=love hotel
     amenity=marketplace: ES:Tag:amenity=marketplace
     amenity=mobile_library: ES:Tag:amenity=mobile library
+    amenity=mortuary: ES:Tag:amenity=mortuary
     amenity=music_school: ES:Tag:amenity=music school
     amenity=nightclub: ES:Tag:amenity=nightclub
     amenity=parking: ES:Tag:amenity=parking
+    amenity=parking_entrance: ES:Tag:amenity=parking entrance
     amenity=parking_space: ES:Tag:amenity=parking space
     amenity=payment_centre: ES:Tag:amenity=payment centre
     amenity=payment_terminal: ES:Tag:amenity=payment terminal
     amenity=pharmacy: ES:Tag:amenity=pharmacy
     amenity=photo_booth: ES:Tag:amenity=photo booth
     amenity=place_of_worship: ES:Tag:amenity=place of worship
+    amenity=planetarium: ES:Tag:amenity=planetarium
     amenity=police: ES:Tag:amenity=police
     amenity=prison_camp: ES:Tag:amenity=prison camp
     amenity=pub: ES:Tag:amenity=pub
@@ -8605,10 +9095,12 @@ es:
     amenity=public_building: ES:Tag:amenity=public building
     amenity=recycling: ES:Tag:amenity=recycling
     amenity=refugee_housing: ES:Tag:amenity=refugee housing
+    amenity=research_institute: ES:Tag:amenity=research institute
     amenity=restaurant: ES:Tag:amenity=restaurant
     amenity=school: ES:Tag:amenity=school
     amenity=shelter: ES:Tag:amenity=shelter
     amenity=shower: ES:Tag:amenity=shower
+    amenity=social_facility: ES:Tag:amenity=social facility
     amenity=stripclub: ES:Tag:amenity=stripclub
     amenity=taxi: ES:Tag:amenity=taxi
     amenity=theatre: ES:Tag:amenity=theatre
@@ -8622,21 +9114,30 @@ es:
     amenity=water_point: ES:Tag:amenity=water point
     amenity=watering_place: ES:Tag:amenity=watering place
     amenity=youth_centre: ES:Tag:amenity=youth centre
+    animal=school: ES:Tag:animal=school
+    area:highway=cycleway: ES:Tag:area:highway=cycleway
+    area:highway=footway: ES:Tag:area:highway=footway
+    area:highway=path: ES:Tag:area:highway=path
+    area:highway=pedestrian: ES:Tag:area:highway=pedestrian
     barrier=block: ES:Tag:barrier=block
     barrier=bollard: ES:Tag:barrier=bollard
     barrier=cable_barrier: ES:Tag:barrier=cable barrier
     barrier=chain: ES:Tag:barrier=chain
+    barrier=city_wall: ES:Tag:barrier=city wall
+    barrier=debris: ES:Tag:barrier=debris
     barrier=entrance: ES:Tag:barrier=entrance
     barrier=fence: ES:Tag:barrier=fence
     barrier=gate: ES:Tag:barrier=gate
     barrier=guard_rail: ES:Tag:barrier=guard rail
     barrier=hedge: ES:Tag:barrier=hedge
+    barrier=height_restrictor: ES:Tag:barrier=height restrictor
     barrier=jersey_barrier: ES:Tag:barrier=jersey barrier
     barrier=kerb: ES:Tag:barrier=kerb
     barrier=lift_gate: ES:Tag:barrier=lift gate
     barrier=retaining_wall: ES:Tag:barrier=retaining wall
     barrier=rope: ES:Tag:barrier=rope
     barrier=swing_gate: ES:Tag:barrier=swing gate
+    barrier=toll_booth: ES:Tag:barrier=toll booth
     barrier=wall: ES:Tag:barrier=wall
     bicycle=use_sidepath: ES:Tag:bicycle=use sidepath
     boundary=national_park: ES:Tag:boundary=national park
@@ -8646,14 +9147,19 @@ es:
     bridge=aqueduct: ES:Tag:bridge=aqueduct
     building=apartments: ES:Tag:building=apartments
     building=barn: ES:Tag:building=barn
+    building=boathouse: ES:Tag:building=boathouse
     building=brewery: ES:Tag:building=brewery
     building=bungalow: ES:Tag:building=bungalow
+    building=carport: ES:Tag:building=carport
     building=cathedral: ES:Tag:building=cathedral
     building=chapel: ES:Tag:building=chapel
     building=church: ES:Tag:building=church
     building=civic: ES:Tag:building=civic
     building=commercial: ES:Tag:building=commercial
     building=construction: ES:Tag:building=construction
+    building=container: ES:Tag:building=container
+    building=detached: ES:Tag:building=detached
+    building=dormitory: ES:Tag:building=dormitory
     building=farm: ES:Tag:building=farm
     building=garage: ES:Tag:building=garage
     building=garages: ES:Tag:building=garages
@@ -8661,7 +9167,9 @@ es:
     building=greenhouse: ES:Tag:building=greenhouse
     building=hospital: ES:Tag:building=hospital
     building=house: ES:Tag:building=house
+    building=houseboat: ES:Tag:building=houseboat
     building=hut: ES:Tag:building=hut
+    building=industrial: ES:Tag:building=industrial
     building=kiosk: ES:Tag:building=kiosk
     building=office: ES:Tag:building=office
     building=public: ES:Tag:building=public
@@ -8670,24 +9178,45 @@ es:
     building=roof: ES:Tag:building=roof
     building=ruins: ES:Tag:building=ruins
     building=school: ES:Tag:building=school
+    building=service: ES:Tag:building=service
     building=shed: ES:Tag:building=shed
+    building=sports_hall: ES:Tag:building=sports hall
     building=sty: ES:Tag:building=sty
+    building=terrace: ES:Tag:building=terrace
     building=university: ES:Tag:building=university
     building=warehouse: ES:Tag:building=warehouse
     cemetery=grave: ES:Tag:cemetery=grave
     club=scout: ES:Tag:club=scout
+    club=sport: ES:Tag:club=sport
     craft=agricultural_engines: ES:Tag:craft=agricultural engines
     craft=bakery: ES:Tag:craft=bakery
+    craft=basket_maker: ES:Tag:craft=basket maker
     craft=beekeeper: ES:Tag:craft=beekeeper
+    craft=blacksmith: ES:Tag:craft=blacksmith
+    craft=boatbuilder: ES:Tag:craft=boatbuilder
+    craft=bookbinder: ES:Tag:craft=bookbinder
     craft=brewery: ES:Tag:craft=brewery
+    craft=builder: ES:Tag:craft=builder
+    craft=carpet_layer: ES:Tag:craft=carpet layer
+    craft=caterer: ES:Tag:craft=caterer
+    craft=chimney_sweeper: ES:Tag:craft=chimney sweeper
     craft=clockmaker: ES:Tag:craft=clockmaker
+    craft=confectionery: ES:Tag:craft=confectionery
+    craft=dental_technician: ES:Tag:craft=dental technician
+    craft=distillery: ES:Tag:craft=distillery
     craft=electrician: ES:Tag:craft=electrician
+    craft=electronics_repair: ES:Tag:craft=electronics repair
+    craft=engraver: ES:Tag:craft=engraver
+    craft=gardener: ES:Tag:craft=gardener
     craft=handicraft: ES:Tag:craft=handicraft
+    craft=hvac: ES:Tag:craft=hvac
     craft=jeweller: ES:Tag:craft=jeweller
     craft=oil_mill: ES:Tag:craft=oil mill
     craft=optician: ES:Tag:craft=optician
     craft=photographer: ES:Tag:craft=photographer
     craft=plumber: ES:Tag:craft=plumber
+    craft=pottery: ES:Tag:craft=pottery
+    craft=tailor: ES:Tag:craft=tailor
     craft=tiler: ES:Tag:craft=tiler
     craft=watchmaker: ES:Tag:craft=watchmaker
     cycleway=lane: ES:Tag:cycleway=lane
@@ -8695,6 +9224,7 @@ es:
     cycleway=track: ES:Tag:cycleway=track
     emergency=ambulance_station: ES:Tag:emergency=ambulance station
     emergency=defibrillator: ES:Tag:emergency=defibrillator
+    emergency=dry_riser: ES:Tag:emergency=dry riser
     emergency=fire_extinguisher: ES:Tag:emergency=fire extinguisher
     emergency=fire_hydrant: ES:Tag:emergency=fire hydrant
     emergency=landing_site: ES:Tag:emergency=landing site
@@ -8735,6 +9265,7 @@ es:
     highway=platform: ES:Tag:highway=platform
     highway=primary: ES:Tag:highway=primary
     highway=raceway: ES:Tag:highway=raceway
+    highway=razed: ES:Tag:highway=razed
     highway=residential: ES:Tag:highway=residential
     highway=road: ES:Tag:highway=road
     highway=secondary: ES:Tag:highway=secondary
@@ -8750,6 +9281,8 @@ es:
     highway=turning_circle: ES:Tag:highway=turning circle
     highway=turning_loop: ES:Tag:highway=turning loop
     highway=unclassified: ES:Tag:highway=unclassified
+    historic=archaeological_site: ES:Tag:historic=archaeological site
+    historic=boundary_stone: ES:Tag:historic=boundary stone
     historic=farm: ES:Tag:historic=farm
     historic=heritage: ES:Tag:historic=heritage
     historic=memorial: ES:Tag:historic=memorial
@@ -8758,11 +9291,14 @@ es:
     historic=ruins: ES:Tag:historic=ruins
     historic=tomb: ES:Tag:historic=tomb
     historic=wayside_shrine: ES:Tag:historic=wayside shrine
+    historic=wreck: ES:Tag:historic=wreck
+    industrial=factory: ES:Tag:industrial=factory
     information=board: ES:Tag:information=board
     information=guidepost: ES:Tag:information=guidepost
     information=map: ES:Tag:information=map
     information=tactile_map: ES:Tag:information=tactile map
     internet_access=wlan: ES:Tag:internet access=wlan
+    junction=circular: ES:Tag:junction=circular
     junction=roundabout: ES:Tag:junction=roundabout
     landcover=grass: ES:Tag:landcover=grass
     landcover=trees: ES:Tag:landcover=trees
@@ -8788,6 +9324,7 @@ es:
     landuse=recreation_ground: ES:Tag:landuse=recreation ground
     landuse=reservoir: ES:Tag:landuse=reservoir
     landuse=residential: ES:Tag:landuse=residential
+    landuse=retail: ES:Tag:landuse=retail
     landuse=salt_pond: ES:Tag:landuse=salt pond
     landuse=traffic_island: ES:Tag:landuse=traffic island
     landuse=village_green: ES:Tag:landuse=village green
@@ -8799,6 +9336,7 @@ es:
     leisure=bandstand: ES:Tag:leisure=bandstand
     leisure=bird_hide: ES:Tag:leisure=bird hide
     leisure=bleachers: ES:Tag:leisure=bleachers
+    leisure=bowling_alley: ES:Tag:leisure=bowling alley
     leisure=common: ES:Tag:leisure=common
     leisure=dog_park: ES:Tag:leisure=dog park
     leisure=firepit: ES:Tag:leisure=firepit
@@ -8815,6 +9353,8 @@ es:
     leisure=pitch: ES:Tag:leisure=pitch
     leisure=playground: ES:Tag:leisure=playground
     leisure=sports_centre: ES:Tag:leisure=sports centre
+    leisure=swimming_pool: ES:Tag:leisure=swimming pool
+    leisure=track: ES:Tag:leisure=track
     leisure=water_park: ES:Tag:leisure=water park
     man_made=adit: ES:Tag:man made=adit
     man_made=archimedes_screw: ES:Tag:man made=archimedes screw
@@ -8827,6 +9367,7 @@ es:
     man_made=mast: ES:Tag:man made=mast
     man_made=monitoring_station: ES:Tag:man made=monitoring station
     man_made=nesting_site: ES:Tag:man made=nesting site
+    man_made=observatory: ES:Tag:man made=observatory
     man_made=pier: ES:Tag:man made=pier
     man_made=power_wind: ES:Tag:man made=power wind
     man_made=pumping_rig: ES:Tag:man made=pumping rig
@@ -8834,6 +9375,7 @@ es:
     man_made=reservoir_covered: ES:Tag:man made=reservoir covered
     man_made=storage_tank: ES:Tag:man made=storage tank
     man_made=survey_point: ES:Tag:man made=survey point
+    man_made=telescope: ES:Tag:man made=telescope
     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
@@ -8861,6 +9403,7 @@ es:
     natural=cave_entrance: ES:Tag:natural=cave entrance
     natural=cliff: ES:Tag:natural=cliff
     natural=coastline: ES:Tag:natural=coastline
+    natural=esker: ES:Tag:natural=esker
     natural=fell: ES:Tag:natural=fell
     natural=geyser: ES:Tag:natural=geyser
     natural=glacier: ES:Tag:natural=glacier
@@ -8870,6 +9413,7 @@ es:
     natural=mud: ES:Tag:natural=mud
     natural=peak: ES:Tag:natural=peak
     natural=ridge: ES:Tag:natural=ridge
+    natural=riverbed: ES:Tag:natural=riverbed
     natural=rock: ES:Tag:natural=rock
     natural=saddle: ES:Tag:natural=saddle
     natural=sand: ES:Tag:natural=sand
@@ -8886,12 +9430,16 @@ es:
     natural=water: ES:Tag:natural=water
     natural=wetland: ES:Tag:natural=wetland
     natural=wood: ES:Tag:natural=wood
+    office=administrative: ES:Tag:office=administrative
     office=advertising_agency: ES:Tag:office=advertising agency
     office=association: ES:Tag:office=association
     office=company: ES:Tag:office=company
+    office=engineer: ES:Tag:office=engineer
+    office=estate_agent: ES:Tag:office=estate agent
     office=foundation: ES:Tag:office=foundation
     office=government: ES:Tag:office=government
     office=insurance: ES:Tag:office=insurance
+    office=it: ES:Tag:office=it
     office=lawyer: ES:Tag:office=lawyer
     office=logistics: ES:Tag:office=logistics
     office=moving_company: ES:Tag:office=moving company
@@ -8899,12 +9447,16 @@ es:
     office=ngo: ES:Tag:office=ngo
     office=notary: ES:Tag:office=notary
     office=occupational_safety: ES:Tag:office=occupational safety
+    office=parish: ES:Tag:office=parish
+    office=political_party: ES:Tag:office=political party
     office=private_investigator: ES:Tag:office=private investigator
     office=quango: ES:Tag:office=quango
     office=religion: ES:Tag:office=religion
     office=research: ES:Tag:office=research
+    office=surveyor: ES:Tag:office=surveyor
     office=tax: ES:Tag:office=tax
     office=therapist: ES:Tag:office=therapist
+    office=water_utility: ES:Tag:office=water utility
     passenger=yes: ES:Tag:passenger=yes
     place=borough: ES:Tag:place=borough
     place=city: ES:Tag:place=city
@@ -8938,8 +9490,12 @@ es:
     railway=subway_entrance: ES:Tag:railway=subway entrance
     railway=yard: ES:Tag:railway=yard
     route=bus: ES:Tag:route=bus
+    route=transhumance: ES:Tag:route=transhumance
     service=crossover: ES:Tag:service=crossover
+    service=driveway: ES:Tag:service=driveway
     service=parking_aisle: ES:Tag:service=parking aisle
+    service=siding: ES:Tag:service=siding
+    shelter_type=lean_to: ES:Tag:shelter type=lean to
     shop=alcohol: ES:Tag:shop=alcohol
     shop=baby_goods: ES:Tag:shop=baby goods
     shop=bakery: ES:Tag:shop=bakery
@@ -8949,6 +9505,7 @@ es:
     shop=bookmaker: ES:Tag:shop=bookmaker
     shop=books: ES:Tag:shop=books
     shop=butcher: ES:Tag:shop=butcher
+    shop=car: ES:Tag:shop=car
     shop=car_parts: ES:Tag:shop=car parts
     shop=car_repair: ES:Tag:shop=car repair
     shop=chocolate: ES:Tag:shop=chocolate
@@ -8961,10 +9518,12 @@ es:
     shop=craft: ES:Tag:shop=craft
     shop=doityourself: ES:Tag:shop=doityourself
     shop=electrical: ES:Tag:shop=electrical
+    shop=electronics: ES:Tag:shop=electronics
     shop=florist: ES:Tag:shop=florist
     shop=funeral_directors: ES:Tag:shop=funeral directors
     shop=games: ES:Tag:shop=games
     shop=garden_centre: ES:Tag:shop=garden centre
+    shop=gas: ES:Tag:shop=gas
     shop=gift: ES:Tag:shop=gift
     shop=greengrocer: ES:Tag:shop=greengrocer
     shop=hairdresser: ES:Tag:shop=hairdresser
@@ -8974,11 +9533,14 @@ es:
     shop=ice_cream: ES:Tag:shop=ice cream
     shop=jewelry: ES:Tag:shop=jewelry
     shop=kiosk: ES:Tag:shop=kiosk
+    shop=kitchen: ES:Tag:shop=kitchen
     shop=laundry: ES:Tag:shop=laundry
     shop=locksmith: ES:Tag:shop=locksmith
     shop=lottery: ES:Tag:shop=lottery
+    shop=mobile_phone: ES:Tag:shop=mobile phone
     shop=model: ES:Tag:shop=model
     shop=motorcycle: ES:Tag:shop=motorcycle
+    shop=nuts: ES:Tag:shop=nuts
     shop=optician: ES:Tag:shop=optician
     shop=outdoor: ES:Tag:shop=outdoor
     shop=paint: ES:Tag:shop=paint
@@ -8986,10 +9548,14 @@ es:
     shop=pastry: ES:Tag:shop=pastry
     shop=pawnbroker: ES:Tag:shop=pawnbroker
     shop=pet: ES:Tag:shop=pet
+    shop=pottery: ES:Tag:shop=pottery
     shop=seafood: ES:Tag:shop=seafood
+    shop=sewing: ES:Tag:shop=sewing
     shop=shoes: ES:Tag:shop=shoes
     shop=sports: ES:Tag:shop=sports
     shop=stationery: ES:Tag:shop=stationery
+    shop=storage_rental: ES:Tag:shop=storage rental
+    shop=supermarket: ES:Tag:shop=supermarket
     shop=tattoo: ES:Tag:shop=tattoo
     shop=tea: ES:Tag:shop=tea
     shop=ticket: ES:Tag:shop=ticket
@@ -9003,13 +9569,20 @@ es:
     shop=water: ES:Tag:shop=water
     shop=window_blind: ES:Tag:shop=window blind
     social_facility=clothing_bank: ES:Tag:social facility=clothing bank
+    social_facility=food_bank: ES:Tag:social facility=food bank
+    social_facility=nursing_home: ES:Tag:social facility=nursing home
     source:geometry=Bing: ES:Tag:source:geometry=Bing
     sport=boules: ES:Tag:sport=boules
+    sport=chess: ES:Tag:sport=chess
     sport=cycling: ES:Tag:sport=cycling
     sport=equestrian: ES:Tag:sport=equestrian
     sport=futsal: ES:Tag:sport=futsal
     sport=model_aerodrome: ES:Tag:sport=model aerodrome
     sport=motocross: ES:Tag:sport=motocross
+    sport=motor: ES:Tag:sport=motor
+    sport=paddle_tennis: ES:Tag:sport=paddle tennis
+    sport=padel: ES:Tag:sport=padel
+    sport=paintball: ES:Tag:sport=paintball
     sport=shooting: ES:Tag:sport=shooting
     sport=soccer: ES:Tag:sport=soccer
     tourism=alpine_hut: ES:Tag:tourism=alpine hut
@@ -9017,8 +9590,12 @@ es:
     tourism=artwork: ES:Tag:tourism=artwork
     tourism=attraction: ES:Tag:tourism=attraction
     tourism=camp_site: ES:Tag:tourism=camp site
+    tourism=chalet: ES:Tag:tourism=chalet
+    tourism=guest_house: ES:Tag:tourism=guest house
+    tourism=hostel: ES:Tag:tourism=hostel
     tourism=hotel: ES:Tag:tourism=hotel
     tourism=motel: ES:Tag:tourism=motel
+    tourism=museum: ES:Tag:tourism=museum
     tourism=picnic_site: ES:Tag:tourism=picnic site
     tourism=trail_riding_station: ES:Tag:tourism=trail riding station
     tourism=viewpoint: ES:Tag:tourism=viewpoint
@@ -9057,11 +9634,21 @@ et:
     building=roof: Et:Tag:building=roof
 fa:
   key:
+    area: Fa:Key:area
+    bridge: Fa:Key:bridge
+    enforcement: Fa:Key:enforcement
     highway: Fa:Key:highway
     level: Fa:Key:level
-    name: FA:Key:name
+    name: Fa:Key:name
+    noexit: Fa:Key:noexit
+    source: Fa:Key:source
+    traffic_calming: Fa:Key:traffic calming
   tag:
     amenity=fountain: Fa:Tag:amenity=fountain
+    highway=footway: Fa:Tag:highway=footway
+    highway=service: Fa:Tag:highway=service
+    shop=garden_centre: Fa:Tag:shop=garden centre
+    waterway=drain: Fa:Tag:waterway=drain
 fi:
   key:
     addr: Fi:Key:addr
@@ -9165,6 +9752,7 @@ fi:
 fr:
   key:
     CEMT: FR:Key:CEMT
+    FIXME: FR:Key:FIXME
     abutters: FR:Key:abutters
     access: FR:Key:access
     addr: FR:Key:addr
@@ -9173,16 +9761,20 @@ fr:
     addr:place: FR:Key:addr:place
     addr:street: FR:Key:addr:street
     addr:suburb: FR:Key:addr:suburb
+    admin_level: FR:Key:admin level
     advertising: FR:Key:advertising
     aeroway: FR:Key:aeroway
     alt_name: FR:Key:alt name
     amenity: FR:Key:amenity
+    animal: FR:Key:animal
     animated: FR:Key:animated
     area: FR:Key:area
+    artist_name: FR:Key:artist name
     artwork_type: FR:Key:artwork type
     backrest: FR:Key:backrest
     backward: FR:Key:backward
     barrier: FR:Key:barrier
+    baseball: FR:Key:baseball
     basin: FR:Key:basin
     bench: FR:Key:bench
     bicycle: FR:Key:bicycle
@@ -9190,19 +9782,21 @@ fr:
     boat: FR:Key:boat
     bollard: FR:Key:bollard
     books: FR:Key:books
-    boundary: FR:Key:boundary
     brand: FR:Key:brand
     brewery: FR:Key:brewery
     bridge: FR:Key:bridge
     bridge:movable: FR:Key:bridge:movable
     building: FR:Key:building
+    building:flats: FR:Key:building:flats
     building:levels: FR:Key:building:levels
     building:material: FR:Key:building:material
     building:part: FR:Key:building:part
+    building:use: FR:Key:building:use
     bulk_purchase: FR:Key:bulk purchase
     bus: FR:Key:bus
     capacity: FR:Key:capacity
     capacity:disabled: FR:Key:capacity:disabled
+    check_date: FR:Key:check date
     class:bicycle:commute: FR:Key:class:bicycle:commute
     clothes: FR:Key:clothes
     club: FR:Key:club
@@ -9218,6 +9812,7 @@ fr:
     contact:vhf: FR:Key:contact:vhf
     contact:webcam: FR:Key:contact:webcam
     contact:website: FR:Key:contact:website
+    content: FR:Key:content
     covered: FR:Key:covered
     craft: FR:Key:craft
     crop: FR:Key:crop
@@ -9226,6 +9821,7 @@ fr:
     currency: FR:Key:currency
     cutting: FR:Key:cutting
     cycleway: FR:Key:cycleway
+    cycleway:lane: FR:Key:cycleway:lane
     delivery: FR:Key:delivery
     denomination: FR:Key:denomination
     description: FR:Key:description
@@ -9246,8 +9842,10 @@ fr:
     enforcement: FR:Key:enforcement
     entrance: FR:Key:entrance
     est_width: FR:Key:est width
+    fair_trade: FR:Key:fair trade
     fax: FR:Key:fax
     fee: FR:Key:fee
+    female: FR:Key:female
     fishing: FR:Key:fishing
     fixme: FR:Key:fixme
     flood_prone: FR:Key:flood prone
@@ -9256,6 +9854,7 @@ fr:
     ford: FR:Key:ford
     format: FR:Key:format
     forward: FR:Key:forward
+    fuel: FR:Key:fuel
     garden:style: FR:Key:garden:style
     garden:type: FR:Key:garden:type
     generator:method: FR:Key:generator:method
@@ -9273,6 +9872,7 @@ fr:
     generator:plant: FR:Key:generator:plant
     generator:source: FR:Key:generator:source
     geological: FR:Key:geological
+    grande_circulation: FR:Key:grande circulation
     healthcare: FR:Key:healthcare
     height: FR:Key:height
     heritage: FR:Key:heritage
@@ -9280,6 +9880,7 @@ fr:
     highway: FR:Key:highway
     historic: FR:Key:historic
     historic:civilization: FR:Key:historic:civilization
+    horse: FR:Key:horse
     hov: FR:Key:hov
     incline: FR:Key:incline
     information: FR:Key:information
@@ -9288,6 +9889,7 @@ fr:
     intermittent: FR:Key:intermittent
     junction: FR:Key:junction
     kindergarten:FR: FR:Key:kindergarten:FR
+    ladder: FR:Key:ladder
     landuse: FR:Key:landuse
     lanes: FR:Key:lanes
     layer: FR:Key:layer
@@ -9302,6 +9904,7 @@ fr:
     lock: FR:Key:lock
     lock_name: FR:Key:lock name
     lock_ref: FR:Key:lock ref
+    male: FR:Key:male
     man_made: FR:Key:man made
     manhole: FR:Key:manhole
     manufacturer: FR:Key:manufacturer
@@ -9317,15 +9920,18 @@ fr:
     maxwidth: FR:Key:maxwidth
     memorial: FR:Key:memorial
     message: FR:Key:message
+    microbrewery: FR:Key:microbrewery
     military: FR:Key:military
     min_age: FR:Key:min age
     minage: FR:Key:minage
     monitoring:meteoric_activity: FR:Key:monitoring:meteoric activity
     mooring: FR:Key:mooring
     motorboat: FR:Key:motorboat
+    motorcycle:parking: FR:Key:motorcycle:parking
     mountain_pass: FR:Key:mountain pass
     mtb:scale: FR:Key:mtb:scale
     name: FR:Key:name
+    name:oc: FR:Key:name:oc
     nat_name: FR:Key:nat name
     natural: FR:Key:natural
     network: FR:Key:network
@@ -9337,9 +9943,12 @@ fr:
     old_name: FR:Key:old name
     oneway: FR:Key:oneway
     oneway:bicycle: FR:Key:oneway:bicycle
+    openfire: FR:Key:openfire
+    opening_date: FR:Key:opening date
     opening_hours: FR:Key:opening hours
     operator: FR:Key:operator
     operator:type: FR:Key:operator:type
+    organic: FR:Key:organic
     outdoor_seating: FR:Key:outdoor seating
     overtaking: FR:Key:overtaking
     parking: FR:Key:parking
@@ -9410,6 +10019,7 @@ fr:
     smoothness: FR:Key:smoothness
     social_facility: FR:Key:social facility
     source: FR:Key:source
+    source:date: FR:Key:source:date
     source:maxspeed: FR:Key:source:maxspeed
     source:maxwidth: FR:Key:source:maxwidth
     species: FR:Key:species
@@ -9418,9 +10028,12 @@ fr:
     step:condition: FR:Key:step:condition
     step:contrast: FR:Key:step:contrast
     step_count: FR:Key:step count
+    support: FR:Key:support
     surface: FR:Key:surface
     surveillance: FR:Key:surveillance
+    survey:date: FR:Key:survey:date
     switch: FR:Key:switch
+    symbol: FR:Key:symbol
     tactile_paving: FR:Key:tactile paving
     takeaway: FR:Key:takeaway
     tidal: FR:Key:tidal
@@ -9432,6 +10045,7 @@ fr:
     traffic_calming: FR:Key:traffic calming
     traffic_sign: FR:Key:traffic sign
     traffic_signals:direction: FR:Key:traffic signals:direction
+    traffic_signals:sound: FR:Key:traffic signals:sound
     trail_visibility: FR:Key:trail visibility
     trees: FR:Key:trees
     tunnel: FR:Key:tunnel
@@ -9440,6 +10054,7 @@ fr:
     turning_radius: FR:Key:turning radius
     type: FR:Key:type
     type:FR:FINESS: FR:Key:type:FR:FINESS
+    unisex: FR:Key:unisex
     url: FR:Key:url
     usage: FR:Key:usage
     visibility: FR:Key:visibility
@@ -9454,11 +10069,14 @@ fr:
     wikidata: FR:Key:wikidata
     wikimedia_commons: FR:Key:wikimedia commons
     wikipedia: FR:Key:wikipedia
+    windings: FR:Key:windings
     xmas:feature: FR:Key:xmas:feature
   tag:
     Bascule_publique: FR:Tag:Bascule publique
     FIXME=Position_estimated: FR:Tag:FIXME=Position estimated
     abandoned=yes: FR:Tag:abandoned=yes
+    access=designated: FR:Tag:access=designated
+    access=no: FR:Tag:access=no
     access=private: FR:Tag:access=private
     advertising=billboard: FR:Tag:advertising=billboard
     advertising=board: FR:Tag:advertising=board
@@ -9477,10 +10095,15 @@ fr:
     amenity=arts_centre: FR:Tag:amenity=arts centre
     amenity=atm: FR:Tag:amenity=atm
     amenity=bank: FR:Tag:amenity=bank
+    amenity=bar: FR:Tag:amenity=bar
+    amenity=bbq: FR:Tag:amenity=bbq
     amenity=bench: FR:Tag:amenity=bench
     amenity=bicycle_parking: FR:Tag:amenity=bicycle parking
     amenity=bicycle_rental: FR:Tag:amenity=bicycle rental
+    amenity=bicycle_repair_station: FR:Tag:amenity=bicycle repair station
     amenity=biergarten: FR:Tag:amenity=biergarten
+    amenity=brothel: FR:Tag:amenity=brothel
+    amenity=bus_station: FR:Tag:amenity=bus station
     amenity=cafe: FR:Tag:amenity=cafe
     amenity=car_rental: FR:Tag:amenity=car rental
     amenity=car_sharing: FR:Tag:amenity=car sharing
@@ -9501,20 +10124,25 @@ fr:
     amenity=driving_school: FR:Tag:amenity=driving school
     amenity=embassy: FR:Tag:amenity=embassy
     amenity=fast_food: FR:Tag:amenity=fast food
+    amenity=feeding_place: FR:Tag:amenity=feeding place
     amenity=fire_station: FR:Tag:amenity=fire station
     amenity=food_court: FR:Tag:amenity=food court
     amenity=fountain: FR:Tag:amenity=fountain
     amenity=fuel: FR:Tag:amenity=fuel
     amenity=grave_yard: FR:Tag:amenity=grave yard
+    amenity=hookah_lounge: FR:Tag:amenity=hookah lounge
     amenity=hospital: FR:Tag:amenity=hospital
     amenity=hunting_stand: FR:Tag:amenity=hunting stand
     amenity=kindergarten: FR:Tag:amenity=kindergarten
+    amenity=lavoir: FR:Tag:amenity=lavoir
     amenity=letter_box: FR:Tag:amenity=letter box
     amenity=library: FR:Tag:amenity=library
+    amenity=love_hotel: FR:Tag:amenity=love hotel
     amenity=marketplace: FR:Tag:amenity=marketplace
     amenity=motorcycle_parking: FR:Tag:amenity=motorcycle parking
     amenity=nightclub: FR:Tag:amenity=nightclub
     amenity=parking: FR:Tag:amenity=parking
+    amenity=parking_entrance: FR:Tag:amenity=parking entrance
     amenity=parking_space: FR:Tag:amenity=parking space
     amenity=pharmacy: FR:Tag:amenity=pharmacy
     amenity=photo_booth: FR:Tag:amenity=photo booth
@@ -9533,6 +10161,8 @@ fr:
     amenity=shelter: FR:Tag:amenity=shelter
     amenity=social_centre: FR:Tag:amenity=social centre
     amenity=social_facility: FR:Tag:amenity=social facility
+    amenity=stripclub: FR:Tag:amenity=stripclub
+    amenity=swingerclub: FR:Tag:amenity=swingerclub
     amenity=taxi: FR:Tag:amenity=taxi
     amenity=telephone: FR:Tag:amenity=telephone
     amenity=theatre: FR:Tag:amenity=theatre
@@ -9540,26 +10170,42 @@ fr:
     amenity=townhall: FR:Tag:amenity=townhall
     amenity=university: FR:Tag:amenity=university
     amenity=vacuum_cleaner: FR:Tag:amenity=vacuum cleaner
+    amenity=vehicle_inspection: FR:Tag:amenity=vehicle inspection
     amenity=vending_machine: FR:Tag:amenity=vending machine
     amenity=veterinary: FR:Tag:amenity=veterinary
     amenity=waste_basket: FR:Tag:amenity=waste basket
     amenity=waste_disposal: FR:Tag:amenity=waste disposal
+    amenity=water_point: FR:Tag:amenity=water point
+    amenity=watering_place: FR:Tag:amenity=watering place
     amenity=weighbridge: FR:Tag:amenity=weighbridge
+    animal=horse_walker: FR:Tag:animal=horse walker
+    atm=yes: FR:Tag:atm=yes
     barrier=block: FR:Tag:barrier=block
     barrier=bollard: FR:Tag:barrier=bollard
     barrier=city_wall: FR:Tag:barrier=city wall
     barrier=cycle_barrier: FR:Tag:barrier=cycle barrier
+    barrier=entrance: FR:Tag:barrier=entrance
+    barrier=fence: FR:Tag:barrier=fence
     barrier=gate: FR:Tag:barrier=gate
+    barrier=guard_rail: FR:Tag:barrier=guard rail
     barrier=hedge: FR:Tag:barrier=hedge
+    barrier=hedge_bank: FR:Tag:barrier=hedge bank
+    barrier=horse_stile: FR:Tag:barrier=horse stile
     barrier=lift_gate: FR:Tag:barrier=lift gate
     barrier=retaining_wall: FR:Tag:barrier=retaining wall
+    barrier=rope: FR:Tag:barrier=rope
     barrier=select_acces: FR:Tag:barrier=select acces
     barrier=wall: FR:Tag:barrier=wall
+    bicycle=use_sidepath: FR:Tag:bicycle=use sidepath
+    boundary=administrative: FR:Tag:boundary=administrative
     brand=Trilib': FR:Tag:brand=Trilib'
     building=apartments: FR:Tag:building=apartments
     building=barn: FR:Tag:building=barn
     building=cabin: FR:Tag:building=cabin
+    building=chapel: FR:Tag:building=chapel
+    building=church: FR:Tag:building=church
     building=commercial: FR:Tag:building=commercial
+    building=construction: FR:Tag:building=construction
     building=farm: FR:Tag:building=farm
     building=garage: FR:Tag:building=garage
     building=garages: FR:Tag:building=garages
@@ -9571,6 +10217,7 @@ fr:
     building=kiosk: FR:Tag:building=kiosk
     building=public: FR:Tag:building=public
     building=residential: FR:Tag:building=residential
+    building=riding_hall: FR:Tag:building=riding hall
     building=roof: FR:Tag:building=roof
     building=ruins: FR:Tag:building=ruins
     building=shed: FR:Tag:building=shed
@@ -9581,12 +10228,31 @@ fr:
     building=warehouse: FR:Tag:building=warehouse
     club=sport: FR:Tag:club=sport
     construction=yes: FR:Tag:construction=yes
+    craft=agricultural_engines: FR:Tag:craft=agricultural engines
+    craft=bakery: FR:Tag:craft=bakery
+    craft=basket_maker: FR:Tag:craft=basket maker
     craft=beekeeper: FR:Tag:craft=beekeeper
     craft=brewery: FR:Tag:craft=brewery
     craft=builder: FR:Tag:craft=builder
     craft=cabinet_maker: FR:Tag:craft=cabinet maker
     craft=car_repair: FR:Tag:craft=car repair
+    craft=carpenter: FR:Tag:craft=carpenter
+    craft=carpet_layer: FR:Tag:craft=carpet layer
+    craft=caterer: FR:Tag:craft=caterer
+    craft=chimney_sweeper: FR:Tag:craft=chimney sweeper
+    craft=distillery: FR:Tag:craft=distillery
+    craft=electrician: FR:Tag:craft=electrician
+    craft=floorer: FR:Tag:craft=floorer
+    craft=gardener: FR:Tag:craft=gardener
+    craft=handicraft: FR:Tag:craft=handicraft
+    craft=hvac: FR:Tag:craft=hvac
+    craft=insulation: FR:Tag:craft=insulation
+    craft=jeweller: FR:Tag:craft=jeweller
     craft=joiner: FR:Tag:craft=joiner
+    craft=key_cutter: FR:Tag:craft=key cutter
+    craft=locksmith: FR:Tag:craft=locksmith
+    craft=metal_construction: FR:Tag:craft=metal construction
+    craft=photographer: FR:Tag:craft=photographer
     cuisine=coffee_shop: FR:Tag:cuisine=coffee shop
     cycleway=asl: FR:Tag:cycleway=asl
     cycleway=bike_box: FR:Tag:cycleway=bike box
@@ -9617,6 +10283,7 @@ fr:
     generator:source=solar: FR:Tag:generator:source=solar
     generator:source=tidal: FR:Tag:generator:source=tidal
     generator:source=wind: FR:Tag:generator:source=wind
+    healthcare=laboratory: FR:Tag:healthcare=laboratory
     highway=bridleway: FR:Tag:highway=bridleway
     highway=bus_guideway: FR:Tag:highway=bus guideway
     highway=bus_stop: FR:Tag:highway=bus stop
@@ -9648,6 +10315,7 @@ fr:
     highway=stop: FR:Tag:highway=stop
     highway=tertiary: FR:Tag:highway=tertiary
     highway=track: FR:Tag:highway=track
+    highway=traffic_mirror: FR:Tag:highway=traffic mirror
     highway=traffic_signals: FR:Tag:highway=traffic signals
     highway=trunk: FR:Tag:highway=trunk
     highway=turning_circle: FR:Tag:highway=turning circle
@@ -9681,8 +10349,12 @@ fr:
     historic=wayside_shrine: FR:Tag:historic=wayside shrine
     historic=wreck: FR:Tag:historic=wreck
     industrial=brewery: FR:Tag:industrial=brewery
+    information=guidepost: FR:Tag:information=guidepost
+    information=map: FR:Tag:information=map
     junction=roundabout: FR:Tag:junction=roundabout
+    landcover=grass: FR:Tag:landcover=grass
     landuse=allotments: FR:Tag:landuse=allotments
+    landuse=animal_keeping: FR:Tag:landuse=animal keeping
     landuse=basin: FR:Tag:landuse=basin
     landuse=cemetery: FR:Tag:landuse=cemetery
     landuse=commercial: FR:Tag:landuse=commercial
@@ -9695,6 +10367,7 @@ fr:
     landuse=garages: FR:Tag:landuse=garages
     landuse=grass: FR:Tag:landuse=grass
     landuse=greenhouse_horticulture: FR:Tag:landuse=greenhouse horticulture
+    landuse=industrial: FR:Tag:landuse=industrial
     landuse=meadow: FR:Tag:landuse=meadow
     landuse=orchard: FR:Tag:landuse=orchard
     landuse=plant_nursery: FR:Tag:landuse=plant nursery
@@ -9705,7 +10378,10 @@ fr:
     landuse=salt_pond: FR:Tag:landuse=salt pond
     landuse=village_green: FR:Tag:landuse=village green
     leaf_cycle=deciduous: FR:Tag:leaf cycle=deciduous
+    leisure=bandstand: FR:Tag:leisure=bandstand
     leisure=dog_park: FR:Tag:leisure=dog park
+    leisure=escape_game: FR:Tag:leisure=escape game
+    leisure=firepit: FR:Tag:leisure=firepit
     leisure=fishing: FR:Tag:leisure=fishing
     leisure=fitness_centre: FR:Tag:leisure=fitness centre
     leisure=garden: FR:Tag:leisure=garden
@@ -9726,14 +10402,18 @@ fr:
     leisure=track: FR:Tag:leisure=track
     leisure=water_park: FR:Tag:leisure=water park
     man_made=adit: FR:Tag:man made=adit
+    man_made=carpet_hanger: FR:Tag:man made=carpet hanger
     man_made=cutline: FR:Tag:man made=cutline
     man_made=dovecote: FR:Tag:man made=dovecote
     man_made=flagpole: FR:Tag:man made=flagpole
+    man_made=insect_hotel: FR:Tag:man made=insect hotel
     man_made=kiln: FR:Tag:man made=kiln
     man_made=lighthouse: FR:Tag:man made=lighthouse
+    man_made=mast: FR:Tag:man made=mast
     man_made=mineshaft: FR:Tag:man made=mineshaft
     man_made=monitoring_station: FR:Tag:man made=monitoring station
     man_made=pier: FR:Tag:man made=pier
+    man_made=reservoir_covered: FR:Tag:man made=reservoir covered
     man_made=street_cabinet: FR:Tag:man made=street cabinet
     man_made=surveillance: FR:Tag:man made=surveillance
     man_made=survey_point: FR:Tag:man made=survey point
@@ -9746,9 +10426,11 @@ fr:
     man_made=windmill: FR:Tag:man made=windmill
     man_made=windpump: FR:Tag:man made=windpump
     medical=aed: FR:Tag:medical=aed
+    memorial=plaque: FR:Tag:memorial=plaque
     microbrewery=yes: FR:Tag:microbrewery=yes
     military=bunker: FR:Tag:military=bunker
     natural=bare_rock: FR:Tag:natural=bare rock
+    natural=beach: FR:Tag:natural=beach
     natural=cave_entrance: FR:Tag:natural=cave entrance
     natural=cliff: FR:Tag:natural=cliff
     natural=coastline: FR:Tag:natural=coastline
@@ -9767,8 +10449,13 @@ fr:
     natural=volcano: FR:Tag:natural=volcano
     natural=water: FR:Tag:natural=water
     natural=wetland: FR:Tag:natural=wetland
+    office=association: FR:Tag:office=association
+    office=company: FR:Tag:office=company
     office=employment_agency: FR:Tag:office=employment agency
     office=estate_agent: FR:Tag:office=estate agent
+    office=foundation: FR:Tag:office=foundation
+    office=government: FR:Tag:office=government
+    office=insurance: FR:Tag:office=insurance
     office=lawyer: FR:Tag:office=lawyer
     office=ngo: FR:Tag:office=ngo
     place=city: FR:Tag:place=city
@@ -9801,6 +10488,8 @@ fr:
     power=transformer: FR:Tag:power=transformer
     public_transport=platform: FR:Tag:public transport=platform
     public_transport=station: FR:Tag:public transport=station
+    public_transport=stop_area: FR:Tag:public transport=stop area
+    public_transport=stop_position: FR:Tag:public transport=stop position
     pump=powered: FR:Tag:pump=powered
     railway=crossing: FR:Tag:railway=crossing
     railway=disused: FR:Tag:railway=disused
@@ -9827,12 +10516,18 @@ fr:
     religion=sikh: FR:Tag:religion=sikh
     religion=taoist: FR:Tag:religion=taoist
     religion=zoroastrian: FR:Tag:religion=zoroastrian
+    route=bicycle: FR:Tag:route=bicycle
     route=coach: FR:Tag:route=coach
+    route=fitness_trail: FR:Tag:route=fitness trail
     route=piste: FR:Tag:route=piste
+    route=railway: FR:Tag:route=railway
+    route=transhumance: FR:Tag:route=transhumance
     service=alley: FR:Tag:service=alley
     service=driveway: FR:Tag:service=driveway
     service=parking_aisle: FR:Tag:service=parking aisle
     shelter_type=basic_hut: FR:Tag:shelter type=basic hut
+    shelter_type=lean_to: FR:Tag:shelter type=lean to
+    shop=agrarian: FR:Tag:shop=agrarian
     shop=alcohol: FR:Tag:shop=alcohol
     shop=anime: FR:Tag:shop=anime
     shop=baby_goods: FR:Tag:shop=baby goods
@@ -9860,8 +10555,11 @@ fr:
     shop=department_store: FR:Tag:shop=department store
     shop=dive: FR:Tag:shop=dive
     shop=doityourself: FR:Tag:shop=doityourself
+    shop=dry_cleaning: FR:Tag:shop=dry cleaning
     shop=electronics: FR:Tag:shop=electronics
+    shop=erotic: FR:Tag:shop=erotic
     shop=farm: FR:Tag:shop=farm
+    shop=fashion: FR:Tag:shop=fashion
     shop=florist: FR:Tag:shop=florist
     shop=frame: FR:Tag:shop=frame
     shop=frozen_food: FR:Tag:shop=frozen food
@@ -9874,6 +10572,7 @@ fr:
     shop=hairdresser: FR:Tag:shop=hairdresser
     shop=hardware: FR:Tag:shop=hardware
     shop=hunting: FR:Tag:shop=hunting
+    shop=interior_decoration: FR:Tag:shop=interior decoration
     shop=jewelry: FR:Tag:shop=jewelry
     shop=kiosk: FR:Tag:shop=kiosk
     shop=kitchen: FR:Tag:shop=kitchen
@@ -9883,21 +10582,28 @@ fr:
     shop=motorcycle: FR:Tag:shop=motorcycle
     shop=newsagent: FR:Tag:shop=newsagent
     shop=optician: FR:Tag:shop=optician
+    shop=outdoor: FR:Tag:shop=outdoor
     shop=pastry: FR:Tag:shop=pastry
     shop=pet: FR:Tag:shop=pet
     shop=pharmacy: FR:Tag:shop=pharmacy
     shop=photo: FR:Tag:shop=photo
     shop=second_hand: FR:Tag:shop=second hand
+    shop=sewing: FR:Tag:shop=sewing
     shop=shoes: FR:Tag:shop=shoes
     shop=supermarket: FR:Tag:shop=supermarket
     shop=ticket: FR:Tag:shop=ticket
     shop=toys: FR:Tag:shop=toys
     shop=trade: FR:Tag:shop=trade
+    shop=vacant: FR:Tag:shop=vacant
     shop=video: FR:Tag:shop=video
+    shop=video_games: FR:Tag:shop=video games
     sport=8pin: FR:Tag:sport=8pin
+    sport=archery: FR:Tag:sport=archery
     sport=boules: FR:Tag:sport=boules
     sport=climbing: FR:Tag:sport=climbing
+    sport=equestrian: FR:Tag:sport=equestrian
     sport=free_flying: FR:Tag:sport=free flying
+    sport=horse_racing: FR:Tag:sport=horse racing
     sport=shooting: FR:Tag:sport=shooting
     sport=soccer: FR:Tag:sport=soccer
     switch=circuit_breaker: FR:Tag:switch=circuit breaker
@@ -9922,16 +10628,37 @@ fr:
     tourism=museum: FR:Tag:tourism=museum
     tourism=picnic_site: FR:Tag:tourism=picnic site
     tourism=theme_park: FR:Tag:tourism=theme park
+    tourism=trail_riding_station: FR:Tag:tourism=trail riding station
     tourism=viewpoint: FR:Tag:tourism=viewpoint
     tourism=wilderness_hut: FR:Tag:tourism=wilderness hut
     tourism=zoo: FR:Tag:tourism=zoo
+    tower:type=communication: FR:Tag:tower:type=communication
     traffic_sign=city_limit: FR:Tag:traffic sign=city limit
     tunnel=culvert: FR:Tag:tunnel=culvert
+    tunnel=flooded: FR:Tag:tunnel=flooded
+    usage=headrace: FR:Tag:usage=headrace
+    usage=irrigation: FR:Tag:usage=irrigation
+    usage=penstock: FR:Tag:usage=penstock
+    usage=spillway: FR:Tag:usage=spillway
+    usage=tailrace: FR:Tag:usage=tailrace
+    vending=bread: FR:Tag:vending=bread
     vending=chemist: FR:Tag:vending=chemist
+    vending=coffee: FR:Tag:vending=coffee
     vending=condoms: FR:Tag:vending=condoms
+    vending=drinks: FR:Tag:vending=drinks
+    vending=electronics: FR:Tag:vending=electronics
     vending=excrement_bags: FR:Tag:vending=excrement bags
+    vending=fishing_bait: FR:Tag:vending=fishing bait
+    vending=flowers: FR:Tag:vending=flowers
+    vending=food: FR:Tag:vending=food
+    vending=ice_cream: FR:Tag:vending=ice cream
+    vending=milk: FR:Tag:vending=milk
     vending=parcel_pickup: FR:Tag:vending=parcel pickup
+    vending=parking_tickets: FR:Tag:vending=parking tickets
+    vending=sweets: FR:Tag:vending=sweets
+    vending=water: FR:Tag:vending=water
     wall=no: FR:Tag:wall=no
+    water=reservoir: FR:Tag:water=reservoir
     waterway=boatyard: FR:Tag:waterway=boatyard
     waterway=canal: FR:Tag:waterway=canal
     waterway=dam: FR:Tag:waterway=dam
@@ -9940,6 +10667,7 @@ fr:
     waterway=drain: FR:Tag:waterway=drain
     waterway=fish_pass: FR:Tag:waterway=fish pass
     waterway=lock_gate: FR:Tag:waterway=lock gate
+    waterway=pressurised: FR:Tag:waterway=pressurised
     waterway=river: FR:Tag:waterway=river
     waterway=riverbank: FR:Tag:waterway=riverbank
     waterway=stream: FR:Tag:waterway=stream
@@ -9949,9 +10677,20 @@ fr:
     wetland=swamp: FR:Tag:wetland=swamp
 gl:
   key:
+    imagery_used: Gl:Key:imagery used
+    locale: Gl:Key:locale
+    name: Gl:Key:name
+    route: Gl:Key:route
+    sport: Gl:Key:sport
+    tourism: Gl:Key:tourism
+    tunnel: Gl:Key:tunnel
     wheelchair: Gl:Key:wheelchair
   tag:
     amenity=recycling: Gl:Tag:amenity=recycling
+    railway=tram: Gl:Tag:railway=tram
+    social_facility=nursing_home: Gl:Tag:social facility=nursing home
+    sport=padel: Gl:Tag:sport=padel
+    waterway=dock: Gl:Tag:waterway=dock
 hr:
   key:
     amenity: Hr:Key:amenity
@@ -9973,6 +10712,7 @@ ht:
     pump: Ht:Key:pump
 hu:
   key:
+    HU:ed_direction: Hu:Key:HU:ed direction
     HU:hu-go:length: Hu:Key:HU:hu-go:length
     HU:hu-go:milestone: Hu:Key:HU:hu-go:milestone
     HU:hu-go:road: Hu:Key:HU:hu-go:road
@@ -10010,18 +10750,24 @@ hu:
     wood: Hu:Key:wood
   tag:
     boundary=administrative: Hu:Tag:boundary=administrative
+    highway=street_lamp: Hu:Tag:highway=street lamp
     natural=wallow: Hu:Tag:natural=wallow
     railway=level_crossing: Hu:Tag:railway=level crossing
 id:
   tag:
     highway=track: Id:Tag:highway=track
+    shop=pawnbroker: Id:Tag:shop=pawnbroker
 it:
   key:
     abutters: IT:Key:abutters
     access: IT:Key:access
     addr: IT:Key:addr
+    addr:housenumber: IT:Key:addr:housenumber
+    addr:postcode: IT:Key:addr:postcode
+    addr:street: IT:Key:addr:street
     aerialway: IT:Key:aerialway
     aeroway: IT:Key:aeroway
+    alt_name: IT:Key:alt name
     amenity: IT:Key:amenity
     artwork_type: IT:Key:artwork type
     backrest: IT:Key:backrest
@@ -10030,6 +10776,7 @@ it:
     bicycle_parking: IT:Key:bicycle parking
     boundary: IT:Key:boundary
     bridge: IT:Key:bridge
+    bridge:structure: IT:Key:bridge:structure
     building: IT:Key:building
     building:levels: IT:Key:building:levels
     cables: IT:Key:cables
@@ -10075,6 +10822,13 @@ it:
     maxwidth: IT:Key:maxwidth
     military: IT:Key:military
     mooring: IT:Key:mooring
+    motorcycle:clothes: IT:Key:motorcycle:clothes
+    motorcycle:parts: IT:Key:motorcycle:parts
+    motorcycle:rental: IT:Key:motorcycle:rental
+    motorcycle:repair: IT:Key:motorcycle:repair
+    motorcycle:sales: IT:Key:motorcycle:sales
+    motorcycle:type: IT:Key:motorcycle:type
+    motorcycle:tyres: IT:Key:motorcycle:tyres
     mountain_pass: IT:Key:mountain pass
     mtb:scale: IT:Key:mtb:scale
     mtb:scale:imba: IT:Key:mtb:scale:imba
@@ -10083,6 +10837,7 @@ it:
     noexit: IT:Key:noexit
     note: IT:Key:note
     office: IT:Key:office
+    oneway: IT:Key:oneway
     opening_hours: IT:Key:opening hours
     operator: IT:Key:operator
     organic: IT:Key:organic
@@ -10096,18 +10851,27 @@ it:
     proposed: IT:Key:proposed
     railway: IT:Key:railway
     ref: IT:Key:ref
+    ref:mise: IT:Key:ref:mise
     ref:vatin: IT:Key:ref:vatin
     religion: IT:Key:religion
     residential: IT:Key:residential
     route: IT:Key:route
     sac_scale: IT:Key:sac scale
+    second_hand: IT:Key:second hand
     service: IT:Key:service
+    service:bicycle:diy: IT:Key:service:bicycle:diy
+    service:bicycle:rental: IT:Key:service:bicycle:rental
+    service:bicycle:repair: IT:Key:service:bicycle:repair
+    service:bicycle:retail: IT:Key:service:bicycle:retail
+    service:bicycle:second_hand: IT:Key:service:bicycle:second hand
     shop: IT:Key:shop
+    sidewalk: IT:Key:sidewalk
     smoothness: IT:Key:smoothness
     sport: IT:Key:sport
     stop: IT:Key:stop
     surface: IT:Key:surface
     surveillance: IT:Key:surveillance
+    tank_trap: IT:Key:tank trap
     tourism: IT:Key:tourism
     tracktype: IT:Key:tracktype
     traffic_calming: IT:Key:traffic calming
@@ -10122,10 +10886,28 @@ it:
     wires: IT:Key:wires
     zone:maxspeed: IT:Key:zone:maxspeed
   tag:
+    aeroway=aerodrome: IT:Tag:aeroway=aerodrome
+    aeroway=airstrip: IT:Tag:aeroway=airstrip
+    aeroway=apron: IT:Tag:aeroway=apron
+    aeroway=gate: IT:Tag:aeroway=gate
+    aeroway=hangar: IT:Tag:aeroway=hangar
+    aeroway=helipad: IT:Tag:aeroway=helipad
+    aeroway=heliport: IT:Tag:aeroway=heliport
+    aeroway=holding_position: IT:Tag:aeroway=holding position
+    aeroway=navigationaid: IT:Tag:aeroway=navigationaid
+    aeroway=parking_position: IT:Tag:aeroway=parking position
+    aeroway=runway: IT:Tag:aeroway=runway
+    aeroway=spaceport: IT:Tag:aeroway=spaceport
+    aeroway=taxilane: IT:Tag:aeroway=taxilane
+    aeroway=taxiway: IT:Tag:aeroway=taxiway
+    aeroway=terminal: IT:Tag:aeroway=terminal
+    aeroway=windsock: IT:Tag:aeroway=windsock
     amenity=animal_boarding: IT:Tag:amenity=animal boarding
     amenity=animal_breeding: IT:Tag:amenity=animal breeding
     amenity=animal_shelter: IT:Tag:amenity=animal shelter
+    amenity=bank: IT:Tag:amenity=bank
     amenity=bar: IT:Tag:amenity=bar
+    amenity=bbq: IT:Tag:amenity=bbq
     amenity=bench: IT:Tag:amenity=bench
     amenity=bicycle_rental: IT:Tag:amenity=bicycle rental
     amenity=cafe: IT:Tag:amenity=cafe
     amenity=spa: IT:Tag:amenity=spa
     amenity=university: IT:Tag:amenity=university
     amenity=waste_basket: IT:Tag:amenity=waste basket
+    barrier=block: IT:Tag:barrier=block
+    barrier=bollard: IT:Tag:barrier=bollard
+    barrier=border_control: IT:Tag:barrier=border control
+    barrier=bump_gate: IT:Tag:barrier=bump gate
+    barrier=cable_barrier: IT:Tag:barrier=cable barrier
+    barrier=city_wall: IT:Tag:barrier=city wall
     barrier=ditch: IT:Tag:barrier=ditch
     barrier=fence: IT:Tag:barrier=fence
+    barrier=guard_rail: IT:Tag:barrier=guard rail
+    barrier=handrail: IT:Tag:barrier=handrail
+    barrier=hedge: IT:Tag:barrier=hedge
     barrier=jersey_barrier: IT:Tag:barrier=jersey barrier
+    barrier=kerb: IT:Tag:barrier=kerb
     barrier=retaining_wall: IT:Tag:barrier=retaining wall
+    barrier=tank_trap: IT:Tag:barrier=tank trap
     barrier=toll_booth: IT:Tag:barrier=toll booth
+    barrier=wall: IT:Tag:barrier=wall
     building=residential: IT:Tag:building=residential
     building=train_station: IT:Tag:building=train station
+    craft=agricultural_engines: IT:Tag:craft=agricultural engines
+    craft=bakery: IT:Tag:craft=bakery
+    craft=basket_maker: IT:Tag:craft=basket maker
+    craft=beekeeper: IT:Tag:craft=beekeeper
+    craft=blacksmith: IT:Tag:craft=blacksmith
+    craft=boatbuilder: IT:Tag:craft=boatbuilder
+    craft=bookbinder: IT:Tag:craft=bookbinder
+    craft=brewery: IT:Tag:craft=brewery
+    craft=builder: IT:Tag:craft=builder
+    craft=cabinet_maker: IT:Tag:craft=cabinet maker
+    craft=car_repair: IT:Tag:craft=car repair
+    craft=carpenter: IT:Tag:craft=carpenter
+    craft=carpet_layer: IT:Tag:craft=carpet layer
+    craft=caterer: IT:Tag:craft=caterer
+    craft=chimney_sweeper: IT:Tag:craft=chimney sweeper
+    craft=clockmaker: IT:Tag:craft=clockmaker
+    craft=confectionery: IT:Tag:craft=confectionery
+    craft=cooper: IT:Tag:craft=cooper
+    craft=dental_technician: IT:Tag:craft=dental technician
+    craft=distillery: IT:Tag:craft=distillery
+    craft=dressmaker: IT:Tag:craft=dressmaker
+    craft=electrician: IT:Tag:craft=electrician
+    craft=electronics_repair: IT:Tag:craft=electronics repair
+    craft=embroiderer: IT:Tag:craft=embroiderer
+    craft=engraver: IT:Tag:craft=engraver
+    craft=floorer: IT:Tag:craft=floorer
+    craft=gardener: IT:Tag:craft=gardener
+    craft=glaziery: IT:Tag:craft=glaziery
+    craft=grinding_mill: IT:Tag:craft=grinding mill
+    craft=handicraft: IT:Tag:craft=handicraft
+    craft=hvac: IT:Tag:craft=hvac
+    craft=insulation: IT:Tag:craft=insulation
+    craft=jeweller: IT:Tag:craft=jeweller
+    craft=joiner: IT:Tag:craft=joiner
+    craft=key_cutter: IT:Tag:craft=key cutter
+    craft=locksmith: IT:Tag:craft=locksmith
+    craft=metal_construction: IT:Tag:craft=metal construction
+    craft=mint: IT:Tag:craft=mint
+    craft=musical_instrument: IT:Tag:craft=musical instrument
+    craft=oil_mill: IT:Tag:craft=oil mill
+    craft=optician: IT:Tag:craft=optician
+    craft=organ_builder: IT:Tag:craft=organ builder
+    craft=painter: IT:Tag:craft=painter
+    craft=parquet_layer: IT:Tag:craft=parquet layer
+    craft=photographer: IT:Tag:craft=photographer
+    craft=photographic_laboratory: IT:Tag:craft=photographic laboratory
+    craft=piano_tuner: IT:Tag:craft=piano tuner
+    craft=plasterer: IT:Tag:craft=plasterer
+    craft=plumber: IT:Tag:craft=plumber
+    craft=pottery: IT:Tag:craft=pottery
+    craft=printmaker: IT:Tag:craft=printmaker
+    craft=rigger: IT:Tag:craft=rigger
+    craft=roofer: IT:Tag:craft=roofer
+    craft=saddler: IT:Tag:craft=saddler
+    craft=sailmaker: IT:Tag:craft=sailmaker
+    craft=sawmill: IT:Tag:craft=sawmill
+    craft=scaffolder: IT:Tag:craft=scaffolder
+    craft=sculptor: IT:Tag:craft=sculptor
+    craft=shoemaker: IT:Tag:craft=shoemaker
+    craft=stand_builder: IT:Tag:craft=stand builder
+    craft=stonemason: IT:Tag:craft=stonemason
+    craft=sun_protection: IT:Tag:craft=sun protection
+    craft=tailor: IT:Tag:craft=tailor
+    craft=tiler: IT:Tag:craft=tiler
+    craft=tinsmith: IT:Tag:craft=tinsmith
+    craft=toolmaker: IT:Tag:craft=toolmaker
+    craft=turner: IT:Tag:craft=turner
+    craft=upholsterer: IT:Tag:craft=upholsterer
+    craft=watchmaker: IT:Tag:craft=watchmaker
+    craft=window_construction: IT:Tag:craft=window construction
+    craft=winery: IT:Tag:craft=winery
     emergency=fire_hydrant: IT:Tag:emergency=fire hydrant
     footway=crossing: IT:Tag:footway=crossing
     footway=sidewalk: IT:Tag:footway=sidewalk
+    geological=moraine: IT:Tag:geological=moraine
+    geological=outcrop: IT:Tag:geological=outcrop
     geological=palaeontological_site: IT:Tag:geological=palaeontological site
+    highway=bus_stop: IT:Tag:highway=bus stop
     highway=crossing: IT:Tag:highway=crossing
     highway=cycleway: IT:Tag:highway=cycleway
     highway=footway: IT:Tag:highway=footway
@@ -10170,6 +11038,7 @@ it:
     highway=living_street: IT:Tag:highway=living street
     highway=mini_roundabout: IT:Tag:highway=mini roundabout
     highway=motorway: IT:Tag:highway=motorway
+    highway=motorway_junction: IT:Tag:highway=motorway junction
     highway=motorway_link: IT:Tag:highway=motorway link
     highway=path: IT:Tag:highway=path
     highway=pedestrian: IT:Tag:highway=pedestrian
@@ -10195,11 +11064,15 @@ it:
     landuse=cemetery: IT:Tag:landuse=cemetery
     landuse=construction: IT:Tag:landuse=construction
     landuse=greenhouse_horticulture: IT:Tag:landuse=greenhouse horticulture
+    landuse=salt_pond: IT:Tag:landuse=salt pond
     leisure=beach_resort: IT:Tag:leisure=beach resort
     leisure=dog_park: IT:Tag:leisure=dog park
+    leisure=garden: IT:Tag:leisure=garden
     leisure=marina: IT:Tag:leisure=marina
+    leisure=nature_reserve: IT:Tag:leisure=nature reserve
     leisure=playground: IT:Tag:leisure=playground
     leisure=swimming_pool: IT:Tag:leisure=swimming pool
+    leisure=track: IT:Tag:leisure=track
     man_made=mast: IT:Tag:man made=mast
     man_made=works: IT:Tag:man made=works
     natural=bare_rock: IT:Tag:natural=bare rock
@@ -10210,6 +11083,8 @@ it:
     natural=spring: IT:Tag:natural=spring
     natural=tree_row: IT:Tag:natural=tree row
     natural=wetland: IT:Tag:natural=wetland
+    office=foundation: IT:Tag:office=foundation
+    office=it: IT:Tag:office=it
     oneway=alternating: IT:Tag:oneway=alternating
     place=village: IT:Tag:place=village
     power=cable: IT:Tag:power=cable
@@ -10223,6 +11098,10 @@ it:
     power=substation: IT:Tag:power=substation
     power=tower: IT:Tag:power=tower
     power=transformer: IT:Tag:power=transformer
+    public_transport=platform: IT:Tag:public transport=platform
+    public_transport=station: IT:Tag:public transport=station
+    public_transport=stop_area: IT:Tag:public transport=stop area
+    public_transport=stop_position: IT:Tag:public transport=stop position
     railway=level_crossing: IT:Tag:railway=level crossing
     residential=rural: IT:Tag:residential=rural
     residential=urban: IT:Tag:residential=urban
@@ -10235,15 +11114,20 @@ it:
     shop=bicycle: IT:Tag:shop=bicycle
     shop=butcher: IT:Tag:shop=butcher
     shop=car: IT:Tag:shop=car
+    shop=car_parts: IT:Tag:shop=car parts
+    shop=car_repair: IT:Tag:shop=car repair
     shop=chemist: IT:Tag:shop=chemist
     shop=clothes: IT:Tag:shop=clothes
     shop=coffee: IT:Tag:shop=coffee
     shop=confectionery: IT:Tag:shop=confectionery
     shop=convenience: IT:Tag:shop=convenience
     shop=deli: IT:Tag:shop=deli
+    shop=electrical: IT:Tag:shop=electrical
+    shop=electronics: IT:Tag:shop=electronics
     shop=farm: IT:Tag:shop=farm
     shop=florist: IT:Tag:shop=florist
     shop=greengrocer: IT:Tag:shop=greengrocer
+    shop=hardware: IT:Tag:shop=hardware
     shop=hifi: IT:Tag:shop=hifi
     shop=kiosk: IT:Tag:shop=kiosk
     shop=mall: IT:Tag:shop=mall
@@ -10255,13 +11139,17 @@ it:
     shop=supermarket: IT:Tag:shop=supermarket
     shop=tea: IT:Tag:shop=tea
     shop=tobacco: IT:Tag:shop=tobacco
+    shop=tyres: IT:Tag:shop=tyres
     shop=wine: IT:Tag:shop=wine
+    sport=balle_pelote: IT:Tag:sport=balle pelote
     sport=climbing: IT:Tag:sport=climbing
     sport=surfing: IT:Tag:sport=surfing
     summit:cross=yes: IT:Tag:summit:cross=yes
+    tourism=aquarium: IT:Tag:tourism=aquarium
     tourism=artwork: IT:Tag:tourism=artwork
     tourism=museum: IT:Tag:tourism=museum
     waterway=ditch: IT:Tag:waterway=ditch
+    waterway=river: IT:Tag:waterway=river
     waterway=stream: IT:Tag:waterway=stream
 ja:
   key:
@@ -10336,7 +11224,10 @@ ja:
     border_type: JA:Key:border type
     both: JA:Key:both
     boundary: JA:Key:boundary
+    branch: JA:Key:branch
     brand: JA:Key:brand
+    brand:wikidata: JA:Key:brand:wikidata
+    breakfast: JA:Key:breakfast
     brewery: JA:Key:brewery
     bridge: JA:Key:bridge
     bridge:alt_name: JA:Key:bridge:alt name
@@ -10375,6 +11266,7 @@ ja:
     cemetery: JA:Key:cemetery
     change: JA:Key:change
     check_date: JA:Key:check date
+    checkpoint: JA:Key:checkpoint
     circumference: JA:Key:circumference
     clothes: JA:Key:clothes
     club: JA:Key:club
@@ -10665,6 +11557,7 @@ ja:
     parking: JA:Key:parking
     parking:condition: JA:Key:parking:condition
     parking:lane: JA:Key:parking:lane
+    passenger_information_display: JA:Key:passenger information display
     passing_places: JA:Key:passing places
     payment: JA:Key:payment
     payment:coins: JA:Key:payment:coins
@@ -11268,6 +12161,7 @@ ja:
     geological=outcrop: JA:Tag:geological=outcrop
     geological=palaeontological_site: JA:Tag:geological=palaeontological site
     golf=bunker: JA:Tag:golf=bunker
+    golf=driving_range: JA:Tag:golf=driving range
     golf=fairway: JA:Tag:golf=fairway
     government=ministry: JA:Tag:government=ministry
     government=prosecutor: JA:Tag:government=prosecutor
@@ -11437,6 +12331,7 @@ ja:
     leisure=common: JA:Tag:leisure=common
     leisure=dance: JA:Tag:leisure=dance
     leisure=dog_park: JA:Tag:leisure=dog park
+    leisure=escape_game: JA:Tag:leisure=escape game
     leisure=firepit: JA:Tag:leisure=firepit
     leisure=fishing: JA:Tag:leisure=fishing
     leisure=fitness_centre: JA:Tag:leisure=fitness centre
@@ -11474,6 +12369,7 @@ ja:
     man_made=cross: JA:Tag:man made=cross
     man_made=cutline: JA:Tag:man made=cutline
     man_made=dike: JA:Tag:man made=dike
+    man_made=dovecote: JA:Tag:man made=dovecote
     man_made=dyke: JA:Tag:man made=dyke
     man_made=embankment: JA:Tag:man made=embankment
     man_made=flagpole: JA:Tag:man made=flagpole
@@ -11555,6 +12451,7 @@ ja:
     natural=stone: JA:Tag:natural=stone
     natural=tree: JA:Tag:natural=tree
     natural=tree_row: JA:Tag:natural=tree row
+    natural=tree_stump: JA:Tag:natural=tree stump
     natural=valley: JA:Tag:natural=valley
     natural=volcano: JA:Tag:natural=volcano
     natural=water: JA:Tag:natural=water
@@ -11801,6 +12698,7 @@ ja:
     shop=pawnbroker: JA:Tag:shop=pawnbroker
     shop=perfumery: JA:Tag:shop=perfumery
     shop=pet: JA:Tag:shop=pet
+    shop=pet_grooming: JA:Tag:shop=pet grooming
     shop=pharmacy: JA:Tag:shop=pharmacy
     shop=photo: JA:Tag:shop=photo
     shop=printing: JA:Tag:shop=printing
@@ -11817,6 +12715,7 @@ ja:
     shop=spices: JA:Tag:shop=spices
     shop=sports: JA:Tag:shop=sports
     shop=stationery: JA:Tag:shop=stationery
+    shop=storage_rental: JA:Tag:shop=storage rental
     shop=supermarket: JA:Tag:shop=supermarket
     shop=swimming_pool: JA:Tag:shop=swimming pool
     shop=tailor: JA:Tag:shop=tailor
@@ -11904,6 +12803,9 @@ ja:
     vending=excrement_bags: JA:Tag:vending=excrement bags
     vending=fuel: JA:Tag:vending=fuel
     vending=milk: JA:Tag:vending=milk
+    vending=parcel_pickup: JA:Tag:vending=parcel pickup
+    vending=parcel_pickup;parcel_mail_in: JA:Tag:vending=parcel pickup;parcel mail
+      in
     vending=parking_tickets: JA:Tag:vending=parking tickets
     vending=photo: JA:Tag:vending=photo
     wall=no: JA:Tag:wall=no
@@ -11948,16 +12850,40 @@ ko:
   key:
     aerialway: Ko:Key:aerialway
     amenity: Ko:Key:amenity
+    crossing: Ko:Key:crossing
     ele: Ko:Key:ele
+    emergency: Ko:Key:emergency
     highway: Ko:Key:highway
+    intermittent: Ko:Key:intermittent
+    leisure: Ko:Key:leisure
+    local_ref: Ko:Key:local ref
     name: Ko:Key:name
+    operator:type: Ko:Key:operator:type
+    tracktype: Ko:Key:tracktype
+    wheelchair: Ko:Key:wheelchair
     wikipedia: Ko:Key:wikipedia
   tag:
     aerialway=cable_car: Ko:Tag:aerialway=cable car
+    amenity=fuel: Ko:Tag:amenity=fuel
+    barrier=kerb: Ko:Tag:barrier=kerb
     craft=tailor: Ko:Tag:craft=tailor
+    ford=stepping_stones: Ko:Tag:ford=stepping stones
+    highway=bus_stop: Ko:Tag:highway=bus stop
+    highway=elevator: Ko:Tag:highway=elevator
     highway=motorway: Ko:Tag:highway=motorway
+    highway=motorway_link: Ko:Tag:highway=motorway link
+    highway=service: Ko:Tag:highway=service
+    highway=services: Ko:Tag:highway=services
+    highway=stop: Ko:Tag:highway=stop
     highway=track: Ko:Tag:highway=track
     highway=trunk: Ko:Tag:highway=trunk
+    landuse=farmland: Ko:Tag:landuse=farmland
+    landuse=retail: Ko:Tag:landuse=retail
+    landuse=traffic_island: Ko:Tag:landuse=traffic island
+    leisure=disc_golf_course: Ko:Tag:leisure=disc golf course
+    man_made=mast: Ko:Tag:man made=mast
+    place=hamlet: Ko:Tag:place=hamlet
+    shop=convenience: Ko:Tag:shop=convenience
     shop=garden_centre: Ko:Tag:shop=garden centre
     shop=gift: Ko:Tag:shop=gift
 lt:
@@ -11976,6 +12902,9 @@ ms:
     highway=tertiary: Ms:Tag:highway=tertiary
     highway=trunk: Ms:Tag:highway=trunk
     highway=unclassified: Ms:Tag:highway=unclassified
+my:
+  tag:
+    craft=agricultural_engines: My:Tag:craft=agricultural engines
 ne:
   tag:
     landuse=meadow: Ne:Tag:landuse=meadow
@@ -12016,8 +12945,10 @@ nl:
     natural: NL:Key:natural
     office: NL:Key:office
     place: NL:Key:place
+    population: NL:Key:population
     power_supply:schedule: NL:Key:power supply:schedule
     public_transport: NL:Key:public transport
+    ref:bag: NL:Key:ref:bag
     religion: NL:Key:religion
     route_master: NL:Key:route master
     scenic: NL:Key:scenic
@@ -12039,6 +12970,7 @@ nl:
     amenity=parking: NL:Tag:amenity=parking
     amenity=post_office: NL:Tag:amenity=post office
     amenity=toilets: NL:Tag:amenity=toilets
+    amenity=vending_machine: NL:Tag:amenity=vending machine
     amenity=waste_basket: NL:Tag:amenity=waste basket
     barrier=bollard: NL:Tag:barrier=bollard
     barrier=fence: NL:Tag:barrier=fence
@@ -12057,6 +12989,7 @@ nl:
     landuse=garages: NL:Tag:landuse=garages
     landuse=grass: NL:Tag:landuse=grass
     landuse=industrial: NL:Tag:landuse=industrial
+    leaf_cycle=deciduous: NL:Tag:leaf cycle=deciduous
     man_made=windmill: NL:Tag:man made=windmill
     natural=tree: NL:Tag:natural=tree
     public_transport=platform: NL:Tag:public transport=platform
@@ -12067,6 +13000,7 @@ nl:
     shop=department_store: NL:Tag:shop=department store
     shop=greengrocer: NL:Tag:shop=greengrocer
     tourism=chalet: NL:Tag:tourism=chalet
+    vending=parking_tickets: NL:Tag:vending=parking tickets
     zoo=petting_zoo: NL:Tag:zoo=petting zoo
 no:
   key:
@@ -12074,6 +13008,7 @@ no:
     boundary: No:Key:boundary
     building: No:Key:building
     fenced: No:Key:fenced
+    highway: No:Key:highway
     maxheight:legal: No:Key:maxheight:legal
     maxheight:marine: No:Key:maxheight:marine
     maxheight:physical: No:Key:maxheight:physical
@@ -12087,39 +13022,40 @@ no:
     amenity=pharmacy: No:Tag:amenity=pharmacy
     amenity=place_of_worship: No:Tag:amenity=place of worship
     boundary=maritime: No:Tag:boundary=maritime
+    building=construction: No:Tag:building=construction
+    landuse=farmland: No:Tag:landuse=farmland
     leisure=park: No:Tag:leisure=park
     natural=tree: No:Tag:natural=tree
+oc:
+  key:
+    name:oc: Oc:Key:name:oc
 pl:
   key:
     4wd_only: Pl:Key:4wd only
     CEMT: Pl:Key:CEMT
+    FIXME: Pl:Key:FIXME
+    'abandoned:': 'Pl:Key:abandoned:'
     abutters: Pl:Key:abutters
     access: Pl:Key:access
     addr: Pl:Key:addr
     addr:city: Pl:Key:addr:city
-    addr:country: Pl:Key:addr:country
     addr:county: Pl:Key:addr:county
-    addr:district: Pl:Key:addr:district
     addr:flats: Pl:Key:addr:flats
-    addr:hamlet: Pl:Key:addr:hamlet
-    addr:housenumber: Pl:Key:addr:housenumber
     addr:municipality: Pl:Key:addr:municipality
     addr:place: Pl:Key:addr:place
-    addr:postcode: Pl:Key:addr:postcode
-    addr:province: Pl:Key:addr:province
-    addr:state: Pl:Key:addr:state
-    addr:street: Pl:Key:addr:street
-    addr:subdistrict: Pl:Key:addr:subdistrict
     addr:suburb: Pl:Key:addr:suburb
     addr:village: Pl:Key:addr:village
+    adr_les: Pl:Key:adr les
     advertising: Pl:Key:advertising
     aerialway: Pl:Key:aerialway
     aeroway: Pl:Key:aeroway
+    agricultural: Pl:Key:agricultural
     alt_name: Pl:Key:alt name
     amenity: Pl:Key:amenity
     area: Pl:Key:area
     area:highway: Pl:Key:area:highway
     artwork_type: Pl:Key:artwork type
+    automated: Pl:Key:automated
     automatic_door: Pl:Key:automatic door
     backrest: Pl:Key:backrest
     bar: Pl:Key:bar
@@ -12138,14 +13074,18 @@ pl:
     bridge:movable: Pl:Key:bridge:movable
     bridge:structure: Pl:Key:bridge:structure
     bridge:support: Pl:Key:bridge:support
+    budynek: Pl:Key:budynek
     building: Pl:Key:building
     building:architecture: Pl:Key:building:architecture
+    building:condition: Pl:Key:building:condition
     building:cullis:height: Pl:Key:building:cullis:height
     building:flats: Pl:Key:building:flats
     building:levels: Pl:Key:building:levels
     building:material: Pl:Key:building:material
     building:min_level: Pl:Key:building:min level
     building:part: Pl:Key:building:part
+    building:usage:pl: Pl:Key:building:usage:pl
+    building:use: Pl:Key:building:use
     bunker_type: Pl:Key:bunker type
     bus: Pl:Key:bus
     busway: Pl:Key:busway
@@ -12159,12 +13099,17 @@ pl:
     comment: Pl:Key:comment
     communication:mobile_phone: Pl:Key:communication:mobile phone
     construction: Pl:Key:construction
+    construction_end_expected: Pl:Key:construction end expected
+    construction_start_expected: Pl:Key:construction start expected
     contact: Pl:Key:contact
+    country: Pl:Key:country
     covered: Pl:Key:covered
     craft: Pl:Key:craft
     crop: Pl:Key:crop
     crossing: Pl:Key:crossing
+    currency: Pl:Key:currency
     cutting: Pl:Key:cutting
+    cycleway: Pl:Key:cycleway
     deanery: Pl:Key:deanery
     denomination: Pl:Key:denomination
     denotation: Pl:Key:denotation
@@ -12172,10 +13117,19 @@ pl:
     description: Pl:Key:description
     designation: Pl:Key:designation
     destination: Pl:Key:destination
+    diet: Pl:Key:diet
+    'diet:': 'Pl:Key:diet:'
+    diet:halal: Pl:Key:diet:halal
+    diet:kosher: Pl:Key:diet:kosher
     diocese: Pl:Key:diocese
+    diplomatic: Pl:Key:diplomatic
     direction: Pl:Key:direction
     dispensing: Pl:Key:dispensing
     distance: Pl:Key:distance
+    drink: Pl:Key:drink
+    drinking_water: Pl:Key:drinking water
+    driving_side: Pl:Key:driving side
+    dryer: Pl:Key:dryer
     duration: Pl:Key:duration
     ele: Pl:Key:ele
     electrified: Pl:Key:electrified
@@ -12188,6 +13142,7 @@ pl:
     fee: Pl:Key:fee
     fence_type: Pl:Key:fence type
     fire_boundary: Pl:Key:fire boundary
+    fishing: Pl:Key:fishing
     fixme: Pl:Key:fixme
     flood_mark: Pl:Key:flood mark
     flood_prone: Pl:Key:flood prone
@@ -12197,10 +13152,17 @@ pl:
     fuel: Pl:Key:fuel
     gauge: Pl:Key:gauge
     generator:output: Pl:Key:generator:output
+    genus: Pl:Key:genus
     handrail: Pl:Key:handrail
+    healthcare: Pl:Key:healthcare
     height: Pl:Key:height
+    hgv: Pl:Key:hgv
     highway: Pl:Key:highway
+    highway_(propozycja_zmian): Pl:Key:highway (propozycja zmian)
     historic: Pl:Key:historic
+    horse: Pl:Key:horse
+    ice_road: Pl:Key:ice road
+    incline: Pl:Key:incline
     industrial: Pl:Key:industrial
     information: Pl:Key:information
     inscription: Pl:Key:inscription
@@ -12240,7 +13202,6 @@ pl:
     man_made: Pl:Key:man made
     manhole: Pl:Key:manhole
     max_age: Pl:Key:max age
-    maxage: Pl:Key:maxage
     maxaxleload: Pl:Key:maxaxleload
     maxheight: Pl:Key:maxheight
     maxheight:legal: Pl:Key:maxheight:legal
@@ -12254,9 +13215,9 @@ pl:
     maxwidth: Pl:Key:maxwidth
     maxwidth:physical: Pl:Key:maxwidth:physical
     memorial:type: Pl:Key:memorial:type
+    military: Pl:Key:military
     min_age: Pl:Key:min age
     min_height: Pl:Key:min height
-    minage: Pl:Key:minage
     minspeed: Pl:Key:minspeed
     mofa: Pl:Key:mofa
     monitoring:air_quality: Pl:Key:monitoring:air quality
@@ -12264,8 +13225,11 @@ pl:
     moped: Pl:Key:moped
     motorboat: Pl:Key:motorboat
     motorcycle: Pl:Key:motorcycle
+    motorroad: Pl:Key:motorroad
+    mountain_pass: Pl:Key:mountain pass
     name: Pl:Key:name
     natural: Pl:Key:natural
+    network: Pl:Key:network
     noexit: Pl:Key:noexit
     note: Pl:Key:note
     office: Pl:Key:office
@@ -12276,8 +13240,10 @@ pl:
     overtaking: Pl:Key:overtaking
     owner: Pl:Key:owner
     ownership: Pl:Key:ownership
+    parish: Pl:Key:parish
     parking: Pl:Key:parking
     parking:lane: Pl:Key:parking:lane
+    passing_places: Pl:Key:passing places
     place: Pl:Key:place
     place_name: Pl:Key:place name
     playground: Pl:Key:playground
@@ -12286,6 +13252,7 @@ pl:
     priority: Pl:Key:priority
     produce: Pl:Key:produce
     product: Pl:Key:product
+    proposed: Pl:Key:proposed
     protect_class: Pl:Key:protect class
     psv: Pl:Key:psv
     public_transport: Pl:Key:public transport
@@ -12293,14 +13260,19 @@ pl:
     railway: Pl:Key:railway
     railway:area: Pl:Key:railway:area
     ramp: Pl:Key:ramp
+    razed: Pl:Key:razed
+    'razed:': 'Pl:Key:razed:'
     recycling_type: Pl:Key:recycling type
     religion: Pl:Key:religion
+    'removed:': 'Pl:Key:removed:'
     repair: Pl:Key:repair
     resource: Pl:Key:resource
     roof:material: Pl:Key:roof:material
     route: Pl:Key:route
     route_master: Pl:Key:route master
+    'ruined:': 'Pl:Key:ruined:'
     ruins: Pl:Key:ruins
+    'ruins:': 'Pl:Key:ruins:'
     sac_scale: Pl:Key:sac scale
     seamark:fixme: Pl:Key:seamark:fixme
     second_hand: Pl:Key:second hand
@@ -12315,13 +13287,21 @@ pl:
     social_facility:for: Pl:Key:social facility:for
     source:date: Pl:Key:source:date
     source:maxspeed: Pl:Key:source:maxspeed
+    species: Pl:Key:species
     sport: Pl:Key:sport
     start_date: Pl:Key:start date
     step_count: Pl:Key:step count
+    strapline: Pl:Key:strapline
     surface: Pl:Key:surface
     surveillance: Pl:Key:surveillance
     surveillance:type: Pl:Key:surveillance:type
     surveillance:zone: Pl:Key:surveillance:zone
+    symbol: Pl:Key:symbol
+    tactile_paving: Pl:Key:tactile paving
+    target: Pl:Key:target
+    taxon: Pl:Key:taxon
+    toilets: Pl:Key:toilets
+    toilets:wheelchair: Pl:Key:toilets:wheelchair
     toll: Pl:Key:toll
     tomb: Pl:Key:tomb
     tourism: Pl:Key:tourism
@@ -12334,6 +13314,8 @@ pl:
     traffic_signals:minimap: Pl:Key:traffic signals:minimap
     traffic_signals:sound: Pl:Key:traffic signals:sound
     traffic_signals:vibration: Pl:Key:traffic signals:vibration
+    trail_visibility: Pl:Key:trail visibility
+    trailer: Pl:Key:trailer
     train: Pl:Key:train
     tram: Pl:Key:tram
     trolleybus: Pl:Key:trolleybus
@@ -12345,12 +13327,16 @@ pl:
     usage: Pl:Key:usage
     vehicle: Pl:Key:vehicle
     voltage: Pl:Key:voltage
+    washing_machine: Pl:Key:washing machine
+    water: Pl:Key:water
     waterway: Pl:Key:waterway
     website: Pl:Key:website
     wetland: Pl:Key:wetland
     wheelchair: Pl:Key:wheelchair
+    wholesale: Pl:Key:wholesale
     width: Pl:Key:width
     wikipedia: Pl:Key:wikipedia
+    winter_road: Pl:Key:winter road
     wood: Pl:Key:wood
     zone:traffic: Pl:Key:zone:traffic
     zoo: Pl:Key:zoo
@@ -12374,53 +13360,98 @@ pl:
     advertising=totem: Pl:Tag:advertising=totem
     advertising=wall_painting: Pl:Tag:advertising=wall painting
     aeroway=hangar: Pl:Tag:aeroway=hangar
+    aeroway=helipad: Pl:Tag:aeroway=helipad
     allotments=plot: Pl:Tag:allotments=plot
     amenity=administration: Pl:Tag:amenity=administration
+    amenity=animal_boarding: Pl:Tag:amenity=animal boarding
+    amenity=archive: Pl:Tag:amenity=archive
     amenity=atm: Pl:Tag:amenity=atm
+    amenity=audiologist: Pl:Tag:amenity=audiologist
     amenity=baby_hatch: Pl:Tag:amenity=baby hatch
     amenity=bank: Pl:Tag:amenity=bank
+    amenity=bar: Pl:Tag:amenity=bar
     amenity=bbq: Pl:Tag:amenity=bbq
     amenity=bench: Pl:Tag:amenity=bench
     amenity=bicycle_parking: Pl:Tag:amenity=bicycle parking
     amenity=bicycle_rental: Pl:Tag:amenity=bicycle rental
+    amenity=bicycle_repair_station: Pl:Tag:amenity=bicycle repair station
+    amenity=biergarten: Pl:Tag:amenity=biergarten
+    amenity=boat_rental: Pl:Tag:amenity=boat rental
+    amenity=boat_storage: Pl:Tag:amenity=boat storage
     amenity=brothel: Pl:Tag:amenity=brothel
+    amenity=bureau_de_change: Pl:Tag:amenity=bureau de change
+    amenity=bus_station: Pl:Tag:amenity=bus station
+    amenity=cafe: Pl:Tag:amenity=cafe
+    amenity=car_pooling: Pl:Tag:amenity=car pooling
     amenity=car_wash: Pl:Tag:amenity=car wash
     amenity=casino: Pl:Tag:amenity=casino
+    amenity=clinic: Pl:Tag:amenity=clinic
+    amenity=college: Pl:Tag:amenity=college
     amenity=compressed_air: Pl:Tag:amenity=compressed air
+    amenity=conference_centre: Pl:Tag:amenity=conference centre
+    amenity=coworking_space: Pl:Tag:amenity=coworking space
+    amenity=crematorium: Pl:Tag:amenity=crematorium
     amenity=crypt: Pl:Tag:amenity=crypt
+    amenity=dentist: Pl:Tag:amenity=dentist
     amenity=doctors: Pl:Tag:amenity=doctors
     amenity=drinking_water: Pl:Tag:amenity=drinking water
     amenity=driving_school: Pl:Tag:amenity=driving school
+    amenity=dryer: Pl:Tag:amenity=dryer
+    amenity=embassy: Pl:Tag:amenity=embassy
     amenity=events_venue: Pl:Tag:amenity=events venue
+    amenity=exhibition_centre: Pl:Tag:amenity=exhibition centre
     amenity=fast_food: Pl:Tag:amenity=fast food
+    amenity=feeding_place: Pl:Tag:amenity=feeding place
     amenity=ferry_terminal: Pl:Tag:amenity=ferry terminal
     amenity=fire_station: Pl:Tag:amenity=fire station
     amenity=food_court: Pl:Tag:amenity=food court
     amenity=fuel: Pl:Tag:amenity=fuel
     amenity=game_feeding: Pl:Tag:amenity=game feeding
     amenity=grave_yard: Pl:Tag:amenity=grave yard
+    amenity=hookah_lounge: Pl:Tag:amenity=hookah lounge
+    amenity=hospital: Pl:Tag:amenity=hospital
     amenity=hunting_stand: Pl:Tag:amenity=hunting stand
     amenity=ice_cream: Pl:Tag:amenity=ice cream
+    amenity=kindergarten: Pl:Tag:amenity=kindergarten
+    amenity=lavoir: Pl:Tag:amenity=lavoir
+    amenity=library: Pl:Tag:amenity=library
+    amenity=lounger: Pl:Tag:amenity=lounger
     amenity=marketplace: Pl:Tag:amenity=marketplace
     amenity=mortuary: Pl:Tag:amenity=mortuary
     amenity=music_venue: Pl:Tag:amenity=music venue
+    amenity=nightclub: Pl:Tag:amenity=nightclub
     amenity=parking: Pl:Tag:amenity=parking
     amenity=parking_entrance: Pl:Tag:amenity=parking entrance
     amenity=parking_space: Pl:Tag:amenity=parking space
+    amenity=payment_centre: Pl:Tag:amenity=payment centre
     amenity=pharmacy: Pl:Tag:amenity=pharmacy
     amenity=place_of_worship: Pl:Tag:amenity=place of worship
     amenity=post_box: Pl:Tag:amenity=post box
     amenity=post_office: Pl:Tag:amenity=post office
+    amenity=prison: Pl:Tag:amenity=prison
+    amenity=pub: Pl:Tag:amenity=pub
+    amenity=public_bookcase: Pl:Tag:amenity=public bookcase
     amenity=recycling: Pl:Tag:amenity=recycling
     amenity=restaurant: Pl:Tag:amenity=restaurant
     amenity=school: Pl:Tag:amenity=school
     amenity=shelter: Pl:Tag:amenity=shelter
+    amenity=shower: Pl:Tag:amenity=shower
+    amenity=snow_removal_station: Pl:Tag:amenity=snow removal station
     amenity=social_facility: Pl:Tag:amenity=social facility
     amenity=taxi: Pl:Tag:amenity=taxi
+    amenity=toilets: Pl:Tag:amenity=toilets
+    amenity=university: Pl:Tag:amenity=university
+    amenity=vehicle_inspection: Pl:Tag:amenity=vehicle inspection
     amenity=vehicle_ramp: Pl:Tag:amenity=vehicle ramp
     amenity=vending_machine: Pl:Tag:amenity=vending machine
+    amenity=veterinary: Pl:Tag:amenity=veterinary
+    amenity=washing_machine: Pl:Tag:amenity=washing machine
     amenity=waste_disposal: Pl:Tag:amenity=waste disposal
     amenity=water_point: Pl:Tag:amenity=water point
+    area:highway=cycleway: Pl:Tag:area:highway=cycleway
+    area:highway=footway: Pl:Tag:area:highway=footway
+    area:highway=path: Pl:Tag:area:highway=path
+    area:highway=pedestrian: Pl:Tag:area:highway=pedestrian
     atm=no: Pl:Tag:atm=no
     atm=yes: Pl:Tag:atm=yes
     attraction=animal: Pl:Tag:attraction=animal
@@ -12439,9 +13470,11 @@ pl:
     barrier=guard_rail: Pl:Tag:barrier=guard rail
     barrier=handrail: Pl:Tag:barrier=handrail
     barrier=hedge: Pl:Tag:barrier=hedge
+    barrier=height_restrictor: Pl:Tag:barrier=height restrictor
     barrier=kerb: Pl:Tag:barrier=kerb
     barrier=lift_gate: Pl:Tag:barrier=lift gate
     barrier=retaining_wall: Pl:Tag:barrier=retaining wall
+    barrier=spikes: Pl:Tag:barrier=spikes
     barrier=toll_booth: Pl:Tag:barrier=toll booth
     barrier=turnstile: Pl:Tag:barrier=turnstile
     barrier=wall: Pl:Tag:barrier=wall
@@ -12488,18 +13521,22 @@ pl:
     building=bridge: Pl:Tag:building=bridge
     building=bunker: Pl:Tag:building=bunker
     building=cabin: Pl:Tag:building=cabin
+    building=carport: Pl:Tag:building=carport
     building=cathedral: Pl:Tag:building=cathedral
     building=chapel: Pl:Tag:building=chapel
     building=church: Pl:Tag:building=church
     building=civic: Pl:Tag:building=civic
     building=commercial: Pl:Tag:building=commercial
     building=construction: Pl:Tag:building=construction
+    building=cowshed: Pl:Tag:building=cowshed
     building=detached: Pl:Tag:building=detached
     building=dormitory: Pl:Tag:building=dormitory
     building=entrance: Pl:Tag:building=entrance
+    building=farm: Pl:Tag:building=farm
     building=farm_auxiliary: Pl:Tag:building=farm auxiliary
     building=garage: Pl:Tag:building=garage
     building=garages: Pl:Tag:building=garages
+    building=grandstand: Pl:Tag:building=grandstand
     building=greenhouse: Pl:Tag:building=greenhouse
     building=hangar: Pl:Tag:building=hangar
     building=hospital: Pl:Tag:building=hospital
@@ -12513,19 +13550,25 @@ pl:
     building=public: Pl:Tag:building=public
     building=residential: Pl:Tag:building=residential
     building=retail: Pl:Tag:building=retail
+    building=riding_hall: Pl:Tag:building=riding hall
     building=roof: Pl:Tag:building=roof
     building=ruins: Pl:Tag:building=ruins
     building=school: Pl:Tag:building=school
+    building=service: Pl:Tag:building=service
     building=shed: Pl:Tag:building=shed
     building=stable: Pl:Tag:building=stable
     building=sty: Pl:Tag:building=sty
     building=supermarket: Pl:Tag:building=supermarket
     building=synagogue: Pl:Tag:building=synagogue
     building=terrace: Pl:Tag:building=terrace
+    building=toilets: Pl:Tag:building=toilets
     building=train_station: Pl:Tag:building=train station
     building=transportation: Pl:Tag:building=transportation
     building=university: Pl:Tag:building=university
     building=warehouse: Pl:Tag:building=warehouse
+    bunker_type=gun_emplacement: Pl:Tag:bunker type=gun emplacement
+    bunker_type=technical: Pl:Tag:bunker type=technical
+    busway=lane: Pl:Tag:busway=lane
     castle_type=castrum: Pl:Tag:castle type=castrum
     castle_type=defensive: Pl:Tag:castle type=defensive
     castle_type=fortress: Pl:Tag:castle type=fortress
@@ -12546,13 +13589,24 @@ pl:
     craft=brewery: Pl:Tag:craft=brewery
     craft=builder: Pl:Tag:craft=builder
     craft=cabinet_maker: Pl:Tag:craft=cabinet maker
+    craft=caterer: Pl:Tag:craft=caterer
+    craft=embroiderer: Pl:Tag:craft=embroiderer
     craft=engraver: Pl:Tag:craft=engraver
     craft=grinding_mill: Pl:Tag:craft=grinding mill
+    craft=hvac: Pl:Tag:craft=hvac
     craft=oil_mill: Pl:Tag:craft=oil mill
+    craft=painter: Pl:Tag:craft=painter
+    craft=roofer: Pl:Tag:craft=roofer
     craft=sawmill: Pl:Tag:craft=sawmill
+    craft=shoemaker: Pl:Tag:craft=shoemaker
     craft=stonemason: Pl:Tag:craft=stonemason
     craft=winery: Pl:Tag:craft=winery
-    crossing=island: Pl:Tag:crossing=island
+    cycleway=lane: Pl:Tag:cycleway=lane
+    cycleway=opposite: Pl:Tag:cycleway=opposite
+    cycleway=opposite_lane: Pl:Tag:cycleway=opposite lane
+    cycleway=opposite_track: Pl:Tag:cycleway=opposite track
+    cycleway=share_busway: Pl:Tag:cycleway=share busway
+    cycleway=track: Pl:Tag:cycleway=track
     emergency=aed: Pl:Tag:emergency=aed
     emergency=defibrillator: Pl:Tag:emergency=defibrillator
     emergency=fire_extinguisher: Pl:Tag:emergency=fire extinguisher
@@ -12564,28 +13618,44 @@ pl:
     emergency=lifeguard_place: Pl:Tag:emergency=lifeguard place
     emergency=lifeguard_platform: Pl:Tag:emergency=lifeguard platform
     emergency=lifeguard_tower: Pl:Tag:emergency=lifeguard tower
+    emergency=phone: Pl:Tag:emergency=phone
     emergency=suction_point: Pl:Tag:emergency=suction point
     emergency=water_tank: Pl:Tag:emergency=water tank
     footway=crossing: Pl:Tag:footway=crossing
     footway=sidewalk: Pl:Tag:footway=sidewalk
+    ford=stepping_stones: Pl:Tag:ford=stepping stones
     government=ministry: Pl:Tag:government=ministry
     government=prosecutor: Pl:Tag:government=prosecutor
     healthcare=laboratory: Pl:Tag:healthcare=laboratory
+    highway=abandoned: Pl:Tag:highway=abandoned
     highway=bridleway: Pl:Tag:highway=bridleway
+    highway=bus_guideway: Pl:Tag:highway=bus guideway
     highway=bus_stop: Pl:Tag:highway=bus stop
+    highway=corridor: Pl:Tag:highway=corridor
     highway=crossing: Pl:Tag:highway=crossing
     highway=cycleway: Pl:Tag:highway=cycleway
+    highway=elevator: Pl:Tag:highway=elevator
+    highway=emergency_access_point: Pl:Tag:highway=emergency access point
+    highway=emergency_bay: Pl:Tag:highway=emergency bay
+    highway=escape: Pl:Tag:highway=escape
     highway=footway: Pl:Tag:highway=footway
+    highway=ford: Pl:Tag:highway=ford
     highway=give_way: Pl:Tag:highway=give way
     highway=living_street: Pl:Tag:highway=living street
     highway=milestone: Pl:Tag:highway=milestone
     highway=mini_roundabout: Pl:Tag:highway=mini roundabout
     highway=motorway: Pl:Tag:highway=motorway
+    highway=motorway_(propozycja_zmian): Pl:Tag:highway=motorway (propozycja zmian)
+    highway=motorway_junction: Pl:Tag:highway=motorway junction
+    highway=motorway_link: Pl:Tag:highway=motorway link
+    highway=passing_place: Pl:Tag:highway=passing place
     highway=path: Pl:Tag:highway=path
     highway=pedestrian: Pl:Tag:highway=pedestrian
+    highway=platform: Pl:Tag:highway=platform
     highway=primary: Pl:Tag:highway=primary
     highway=proposed: Pl:Tag:highway=proposed
     highway=raceway: Pl:Tag:highway=raceway
+    highway=razed: Pl:Tag:highway=razed
     highway=residential: Pl:Tag:highway=residential
     highway=rest_area: Pl:Tag:highway=rest area
     highway=road: Pl:Tag:highway=road
@@ -12593,14 +13663,18 @@ pl:
     highway=service: Pl:Tag:highway=service
     highway=services: Pl:Tag:highway=services
     highway=speed_camera: Pl:Tag:highway=speed camera
+    highway=speed_display: Pl:Tag:highway=speed display
     highway=steps: Pl:Tag:highway=steps
     highway=stop: Pl:Tag:highway=stop
     highway=street_lamp: Pl:Tag:highway=street lamp
     highway=tertiary: Pl:Tag:highway=tertiary
     highway=track: Pl:Tag:highway=track
+    highway=traffic_mirror: Pl:Tag:highway=traffic mirror
     highway=traffic_signals: Pl:Tag:highway=traffic signals
     highway=trunk: Pl:Tag:highway=trunk
+    highway=trunk_link: Pl:Tag:highway=trunk link
     highway=turning_circle: Pl:Tag:highway=turning circle
+    highway=turning_loop: Pl:Tag:highway=turning loop
     highway=unclassified: Pl:Tag:highway=unclassified
     historic=battlefield: Pl:Tag:historic=battlefield
     historic=city_gate: Pl:Tag:historic=city gate
@@ -12622,9 +13696,14 @@ pl:
     industrial=salt_pond: Pl:Tag:industrial=salt pond
     industrial=sawmill: Pl:Tag:industrial=sawmill
     industrial=shipyard: Pl:Tag:industrial=shipyard
+    information=board: Pl:Tag:information=board
     information=guidepost: Pl:Tag:information=guidepost
+    information=map: Pl:Tag:information=map
+    information=office: Pl:Tag:information=office
+    information=terminal: Pl:Tag:information=terminal
     junction=roundabout: Pl:Tag:junction=roundabout
     landuse=allotments: Pl:Tag:landuse=allotments
+    landuse=animal_keeping: Pl:Tag:landuse=animal keeping
     landuse=apiary: Pl:Tag:landuse=apiary
     landuse=brownfield: Pl:Tag:landuse=brownfield
     landuse=cemetery: Pl:Tag:landuse=cemetery
@@ -12642,6 +13721,7 @@ pl:
     landuse=industrial: Pl:Tag:landuse=industrial
     landuse=landfill: Pl:Tag:landuse=landfill
     landuse=meadow: Pl:Tag:landuse=meadow
+    landuse=military: Pl:Tag:landuse=military
     landuse=plant_nursery: Pl:Tag:landuse=plant nursery
     landuse=quarry: Pl:Tag:landuse=quarry
     landuse=railway: Pl:Tag:landuse=railway
@@ -12654,21 +13734,18 @@ pl:
     landuse=village_green: Pl:Tag:landuse=village green
     leisure=adult_gaming_centre: Pl:Tag:leisure=adult gaming centre
     leisure=amusement_arcade: Pl:Tag:leisure=amusement arcade
-    leisure=arena: Pl:Tag:leisure=arena
     leisure=bandstand: Pl:Tag:leisure=bandstand
     leisure=bathing_place: Pl:Tag:leisure=bathing place
     leisure=bbq: Pl:Tag:leisure=bbq
-    leisure=beach: Pl:Tag:leisure=beach
     leisure=beach_resort: Pl:Tag:leisure=beach resort
     leisure=bird_hide: Pl:Tag:leisure=bird hide
     leisure=bleachers: Pl:Tag:leisure=bleachers
     leisure=bowling_alley: Pl:Tag:leisure=bowling alley
-    leisure=casino: Pl:Tag:leisure=casino
-    leisure=club: Pl:Tag:leisure=club
     leisure=common: Pl:Tag:leisure=common
     leisure=dance: Pl:Tag:leisure=dance
     leisure=disc_golf_course: Pl:Tag:leisure=disc golf course
     leisure=dog_park: Pl:Tag:leisure=dog park
+    leisure=escape_game: Pl:Tag:leisure=escape game
     leisure=firepit: Pl:Tag:leisure=firepit
     leisure=fishing: Pl:Tag:leisure=fishing
     leisure=fitness_centre: Pl:Tag:leisure=fitness centre
@@ -12713,8 +13790,11 @@ pl:
     man_made=adit: Pl:Tag:man made=adit
     man_made=beacon: Pl:Tag:man made=beacon
     man_made=beehive: Pl:Tag:man made=beehive
+    man_made=bridge: Pl:Tag:man made=bridge
     man_made=bunker_silo: Pl:Tag:man made=bunker silo
+    man_made=campanile: Pl:Tag:man made=campanile
     man_made=chimney: Pl:Tag:man made=chimney
+    man_made=clearcut: Pl:Tag:man made=clearcut
     man_made=cross: Pl:Tag:man made=cross
     man_made=cutline: Pl:Tag:man made=cutline
     man_made=dyke: Pl:Tag:man made=dyke
@@ -12739,9 +13819,10 @@ pl:
     man_made=windmill: Pl:Tag:man made=windmill
     man_made=windpump: Pl:Tag:man made=windpump
     man_made=works: Pl:Tag:man made=works
-    maxspeed=none: Pl:Tag:maxspeed=none
-    maxspeed=signals: Pl:Tag:maxspeed=signals
     military=bunker: Pl:Tag:military=bunker
+    military=danger_area: Pl:Tag:military=danger area
+    military=nuclear_explosion_site: Pl:Tag:military=nuclear explosion site
+    military=range: Pl:Tag:military=range
     military=trench: Pl:Tag:military=trench
     mooring=ferry: Pl:Tag:mooring=ferry
     natural=arete: Pl:Tag:natural=arete
@@ -12786,9 +13867,44 @@ pl:
     natural=water: Pl:Tag:natural=water
     natural=wetland: Pl:Tag:natural=wetland
     natural=wood: Pl:Tag:natural=wood
+    network=lhn: Pl:Tag:network=lhn
+    network=rhn: Pl:Tag:network=rhn
+    office=accountant: Pl:Tag:office=accountant
+    office=adoption_agency: Pl:Tag:office=adoption agency
+    office=advertising_agency: Pl:Tag:office=advertising agency
+    office=architect: Pl:Tag:office=architect
+    office=association: Pl:Tag:office=association
+    office=charity: Pl:Tag:office=charity
+    office=company: Pl:Tag:office=company
+    office=educational_institution: Pl:Tag:office=educational institution
+    office=employment_agency: Pl:Tag:office=employment agency
+    office=energy_supplier: Pl:Tag:office=energy supplier
+    office=estate_agent: Pl:Tag:office=estate agent
+    office=forestry: Pl:Tag:office=forestry
+    office=foundation: Pl:Tag:office=foundation
+    office=geodesist: Pl:Tag:office=geodesist
     office=government: Pl:Tag:office=government
+    office=guide: Pl:Tag:office=guide
+    office=insurance: Pl:Tag:office=insurance
+    office=it: Pl:Tag:office=it
+    office=lawyer: Pl:Tag:office=lawyer
     office=logistics: Pl:Tag:office=logistics
+    office=moving_company: Pl:Tag:office=moving company
+    office=newspaper: Pl:Tag:office=newspaper
+    office=ngo: Pl:Tag:office=ngo
+    office=notary: Pl:Tag:office=notary
+    office=political_party: Pl:Tag:office=political party
+    office=private_investigator: Pl:Tag:office=private investigator
+    office=property_management: Pl:Tag:office=property management
+    office=quango: Pl:Tag:office=quango
     office=religion: Pl:Tag:office=religion
+    office=research: Pl:Tag:office=research
+    office=tax_advisor: Pl:Tag:office=tax advisor
+    office=telecommunication: Pl:Tag:office=telecommunication
+    office=therapist: Pl:Tag:office=therapist
+    office=tourist_accommodation: Pl:Tag:office=tourist accommodation
+    office=water_utility: Pl:Tag:office=water utility
+    parking:lane:hgv=on_street: Pl:Tag:parking:lane:hgv=on street
     place=allotments: Pl:Tag:place=allotments
     place=city: Pl:Tag:place=city
     place=farm: Pl:Tag:place=farm
@@ -12809,12 +13925,14 @@ pl:
     power=tower: Pl:Tag:power=tower
     power=transformer: Pl:Tag:power=transformer
     public_transport=platform: Pl:Tag:public transport=platform
+    public_transport=station: Pl:Tag:public transport=station
     public_transport=stop_area: Pl:Tag:public transport=stop area
     public_transport=stop_position: Pl:Tag:public transport=stop position
     railway=abandoned: Pl:Tag:railway=abandoned
     railway=buffer_stop: Pl:Tag:railway=buffer stop
     railway=crossing: Pl:Tag:railway=crossing
     railway=crossing_controller: Pl:Tag:railway=crossing controller
+    railway=disused: Pl:Tag:railway=disused
     railway=level_crossing: Pl:Tag:railway=level crossing
     railway=rail: Pl:Tag:railway=rail
     railway=tram_stop: Pl:Tag:railway=tram stop
@@ -12822,6 +13940,8 @@ pl:
     religion=jewish: Pl:Tag:religion=jewish
     religion=muslim: Pl:Tag:religion=muslim
     religion=pagan: Pl:Tag:religion=pagan
+    route=hiking: Pl:Tag:route=hiking
+    route=horse: Pl:Tag:route=horse
     service=alley: Pl:Tag:service=alley
     service=drive-through: Pl:Tag:service=drive-through
     service=driveway: Pl:Tag:service=driveway
@@ -12832,22 +13952,40 @@ pl:
     service=spur: Pl:Tag:service=spur
     service=yard: Pl:Tag:service=yard
     shop=agrarian: Pl:Tag:shop=agrarian
+    shop=alcohol: Pl:Tag:shop=alcohol
+    shop=appliance: Pl:Tag:shop=appliance
     shop=baby_goods: Pl:Tag:shop=baby goods
+    shop=bag: Pl:Tag:shop=bag
     shop=bakery: Pl:Tag:shop=bakery
     shop=bathroom_furnishing: Pl:Tag:shop=bathroom furnishing
     shop=beauty: Pl:Tag:shop=beauty
     shop=bed: Pl:Tag:shop=bed
+    shop=beverages: Pl:Tag:shop=beverages
     shop=bicycle: Pl:Tag:shop=bicycle
     shop=boutique: Pl:Tag:shop=boutique
+    shop=brewing_supplies: Pl:Tag:shop=brewing supplies
     shop=butcher: Pl:Tag:shop=butcher
+    shop=camera: Pl:Tag:shop=camera
     shop=car: Pl:Tag:shop=car
     shop=car_repair: Pl:Tag:shop=car repair
+    shop=cheese: Pl:Tag:shop=cheese
+    shop=chocolate: Pl:Tag:shop=chocolate
     shop=clothes: Pl:Tag:shop=clothes
+    shop=coffee: Pl:Tag:shop=coffee
+    shop=collector: Pl:Tag:shop=collector
     shop=confectionery: Pl:Tag:shop=confectionery
     shop=convenience: Pl:Tag:shop=convenience
+    shop=copyshop: Pl:Tag:shop=copyshop
+    shop=curtain: Pl:Tag:shop=curtain
+    shop=dairy: Pl:Tag:shop=dairy
+    shop=deli: Pl:Tag:shop=deli
     shop=department_store: Pl:Tag:shop=department store
     shop=doityourself: Pl:Tag:shop=doityourself
+    shop=dry_cleaning: Pl:Tag:shop=dry cleaning
+    shop=equestrian: Pl:Tag:shop=equestrian
     shop=erotic: Pl:Tag:shop=erotic
+    shop=fabric: Pl:Tag:shop=fabric
+    shop=farm: Pl:Tag:shop=farm
     shop=fishing: Pl:Tag:shop=fishing
     shop=fishmonger: Pl:Tag:shop=fishmonger
     shop=florist: Pl:Tag:shop=florist
@@ -12856,27 +13994,55 @@ pl:
     shop=garden_centre: Pl:Tag:shop=garden centre
     shop=gas: Pl:Tag:shop=gas
     shop=general: Pl:Tag:shop=general
+    shop=greengrocer: Pl:Tag:shop=greengrocer
     shop=haberdashery: Pl:Tag:shop=haberdashery
     shop=hairdresser: Pl:Tag:shop=hairdresser
+    shop=health_food: Pl:Tag:shop=health food
     shop=herbalist: Pl:Tag:shop=herbalist
     shop=houseware: Pl:Tag:shop=houseware
+    shop=hunting: Pl:Tag:shop=hunting
     shop=ice_cream: Pl:Tag:shop=ice cream
     shop=kiosk: Pl:Tag:shop=kiosk
     shop=kitchen: Pl:Tag:shop=kitchen
+    shop=laundry: Pl:Tag:shop=laundry
+    shop=leather: Pl:Tag:shop=leather
+    shop=lighting: Pl:Tag:shop=lighting
     shop=mall: Pl:Tag:shop=mall
+    shop=medical_supply: Pl:Tag:shop=medical supply
+    shop=optician: Pl:Tag:shop=optician
     shop=pastry: Pl:Tag:shop=pastry
+    shop=pet: Pl:Tag:shop=pet
+    shop=pet_grooming: Pl:Tag:shop=pet grooming
+    shop=pyrotechnics: Pl:Tag:shop=pyrotechnics
+    shop=religion: Pl:Tag:shop=religion
+    shop=rental: Pl:Tag:shop=rental
+    shop=seafood: Pl:Tag:shop=seafood
     shop=second_hand: Pl:Tag:shop=second hand
+    shop=sewing: Pl:Tag:shop=sewing
+    shop=shoes: Pl:Tag:shop=shoes
+    shop=spices: Pl:Tag:shop=spices
+    shop=stationery: Pl:Tag:shop=stationery
     shop=supermarket: Pl:Tag:shop=supermarket
+    shop=tattoo: Pl:Tag:shop=tattoo
     shop=tea: Pl:Tag:shop=tea
     shop=ticket: Pl:Tag:shop=ticket
     shop=travel_agency: Pl:Tag:shop=travel agency
     shop=tyres: Pl:Tag:shop=tyres
     shop=vacant: Pl:Tag:shop=vacant
     shop=variety_store: Pl:Tag:shop=variety store
+    shop=water: Pl:Tag:shop=water
+    shop=wholesale: Pl:Tag:shop=wholesale
+    shop=wine: Pl:Tag:shop=wine
     shop=yes: Pl:Tag:shop=yes
     social_facility=outreach: Pl:Tag:social facility=outreach
+    sport=10pin: Pl:Tag:sport=10pin
+    sport=9pin: Pl:Tag:sport=9pin
     sport=aikido: Pl:Tag:sport=aikido
+    sport=american_football: Pl:Tag:sport=american football
     sport=climbing: Pl:Tag:sport=climbing
+    sport=equestrian: Pl:Tag:sport=equestrian
+    sport=ice_hockey: Pl:Tag:sport=ice hockey
+    sport=soccer: Pl:Tag:sport=soccer
     tourism=alpine_hut: Pl:Tag:tourism=alpine hut
     tourism=apartment: Pl:Tag:tourism=apartment
     tourism=aquarium: Pl:Tag:tourism=aquarium
@@ -12900,9 +14066,14 @@ pl:
     tourism=viewpoint: Pl:Tag:tourism=viewpoint
     tourism=wilderness_hut: Pl:Tag:tourism=wilderness hut
     tourism=wine_cellar: Pl:Tag:tourism=wine cellar
-    tourism=yes: Pl:Tag:tourism=yes
     tourism=zoo: Pl:Tag:tourism=zoo
     tower:type=bell_tower: Pl:Tag:tower:type=bell tower
+    tower:type=communication: Pl:Tag:tower:type=communication
+    tower:type=cooling: Pl:Tag:tower:type=cooling
+    tower:type=defensive: Pl:Tag:tower:type=defensive
+    tower:type=lighting: Pl:Tag:tower:type=lighting
+    tower:type=minaret: Pl:Tag:tower:type=minaret
+    tower:type=observation: Pl:Tag:tower:type=observation
     traffic_calming=island: Pl:Tag:traffic calming=island
     traffic_calming=table: Pl:Tag:traffic calming=table
     traffic_sign=city_limit: Pl:Tag:traffic sign=city limit
@@ -12910,9 +14081,13 @@ pl:
     type=public_transport: Pl:Tag:type=public transport
     vending=bottle_return: Pl:Tag:vending=bottle return
     vending=candles: Pl:Tag:vending=candles
+    vending=food: Pl:Tag:vending=food
+    vending=fuel: Pl:Tag:vending=fuel
+    vending=milk: Pl:Tag:vending=milk
     wall=noise_barrier: Pl:Tag:wall=noise barrier
     water=lake: Pl:Tag:water=lake
     water=lock: Pl:Tag:water=lock
+    water=reservoir: Pl:Tag:water=reservoir
     waterway=boat_lift: Pl:Tag:waterway=boat lift
     waterway=boatyard: Pl:Tag:waterway=boatyard
     waterway=brook: Pl:Tag:waterway=brook
@@ -12985,7 +14160,7 @@ pt:
     building:part: Pt:Key:building:part
     button_operated: Pt:Key:button operated
     cables: Pt:Key:cables
-    cep: Pt:Key:cep
+    capacity: Pt:Key:capacity
     construction: Pt:Key:construction
     contact: Pt:Key:contact
     country: Pt:Key:country
@@ -13004,12 +14179,14 @@ pt:
     electrified: Pt:Key:electrified
     embankment: Pt:Key:embankment
     emergency: Pt:Key:emergency
+    fence_type: Pt:Key:fence type
     fenced: Pt:Key:fenced
     fishing: Pt:Key:fishing
     foot: Pt:Key:foot
     frequency: Pt:Key:frequency
     generator:method: Pt:Key:generator:method
     geological: Pt:Key:geological
+    group_only: Pt:Key:group only
     happy_hours: Pt:Key:happy hours
     height: Pt:Key:height
     heritage: Pt:Key:heritage
@@ -13040,6 +14217,7 @@ pt:
     maxheight:marine: Pt:Key:maxheight:marine
     maxheight:physical: Pt:Key:maxheight:physical
     maxspeed: Pt:Key:maxspeed
+    maxspeed:advisory: Pt:Key:maxspeed:advisory
     maxweight: Pt:Key:maxweight
     military: Pt:Key:military
     min_height: Pt:Key:min height
@@ -13065,6 +14243,7 @@ pt:
     population: Pt:Key:population
     postal_code: Pt:Key:postal code
     power: Pt:Key:power
+    product: Pt:Key:product
     psv: Pt:Key:psv
     public_transport: Pt:Key:public transport
     public_transport:version: Pt:Key:public transport:version
@@ -13087,6 +14266,7 @@ pt:
     sidewalk: Pt:Key:sidewalk
     ski: Pt:Key:ski
     smoothness: Pt:Key:smoothness
+    social_facility: Pt:Key:social facility
     source: Pt:Key:source
     sport: Pt:Key:sport
     substance: Pt:Key:substance
@@ -13112,15 +14292,29 @@ pt:
     wires: Pt:Key:wires
   tag:
     aerialway=cable_car: Pt:Tag:aerialway=cable car
+    aerialway=chair_lift: Pt:Tag:aerialway=chair lift
+    aerialway=drag_lift: Pt:Tag:aerialway=drag lift
+    aerialway=gondola: Pt:Tag:aerialway=gondola
+    aerialway=j-bar: Pt:Tag:aerialway=j-bar
+    aerialway=magic_carpet: Pt:Tag:aerialway=magic carpet
+    aerialway=mixed_lift: Pt:Tag:aerialway=mixed lift
+    aerialway=platter: Pt:Tag:aerialway=platter
+    aerialway=pylon: Pt:Tag:aerialway=pylon
+    aerialway=rope_tow: Pt:Tag:aerialway=rope tow
     aerialway=station: Pt:Tag:aerialway=station
+    aerialway=t-bar: Pt:Tag:aerialway=t-bar
+    aerialway=zip_line: Pt:Tag:aerialway=zip line
     aeroway=aerodrome: Pt:Tag:aeroway=aerodrome
     aeroway=apron: Pt:Tag:aeroway=apron
     aeroway=gate: Pt:Tag:aeroway=gate
     aeroway=hangar: Pt:Tag:aeroway=hangar
     aeroway=helipad: Pt:Tag:aeroway=helipad
+    aeroway=heliport: Pt:Tag:aeroway=heliport
     aeroway=holding_position: Pt:Tag:aeroway=holding position
+    aeroway=navigationaid: Pt:Tag:aeroway=navigationaid
     aeroway=parking_position: Pt:Tag:aeroway=parking position
     aeroway=runway: Pt:Tag:aeroway=runway
+    aeroway=taxilane: Pt:Tag:aeroway=taxilane
     aeroway=taxiway: Pt:Tag:aeroway=taxiway
     aeroway=terminal: Pt:Tag:aeroway=terminal
     aeroway=windsock: Pt:Tag:aeroway=windsock
@@ -13251,6 +14445,8 @@ pt:
     building=residential: Pt:Tag:building=residential
     building=roof: Pt:Tag:building=roof
     building=school: Pt:Tag:building=school
+    building=shed: Pt:Tag:building=shed
+    building=university: Pt:Tag:building=university
     building=yes: Pt:Tag:building=yes
     craft=agricultural_engines: Pt:Tag:craft=agricultural engines
     craft=basket_maker: Pt:Tag:craft=basket maker
@@ -14422,11 +15618,16 @@ ru:
     addr:suburb: RU:Key:addr:suburb
     aerialway: RU:Key:aerialway
     aeroway: RU:Key:aeroway
+    agricultural: RU:Key:agricultural
     alt_name: RU:Key:alt name
     amenity: RU:Key:amenity
+    anthropogenic: RU:Key:anthropogenic
+    architect: RU:Key:architect
     area: RU:Key:area
     area:highway: RU:Key:area:highway
+    artist_name: RU:Key:artist name
     artwork_type: RU:Key:artwork type
+    backcountry: RU:Key:backcountry
     barrier: RU:Key:barrier
     bench: RU:Key:bench
     bicycle: RU:Key:bicycle
@@ -14437,11 +15638,14 @@ ru:
     border_type: RU:Key:border type
     boundary: RU:Key:boundary
     brand: RU:Key:brand
+    brand:wikidata: RU:Key:brand:wikidata
     bridge: RU:Key:bridge
+    bridge:support: RU:Key:bridge:support
     building: RU:Key:building
     building:architecture: RU:Key:building:architecture
     building:height: RU:Key:building:height
     building:levels: RU:Key:building:levels
+    building:levels:underground: RU:Key:building:levels:underground
     building:material: RU:Key:building:material
     building:min_level: RU:Key:building:min level
     building:part: RU:Key:building:part
@@ -14451,12 +15655,14 @@ ru:
     bus: RU:Key:bus
     cafe: RU:Key:cafe
     capacity: RU:Key:capacity
+    cemetery: RU:Key:cemetery
     check_date: RU:Key:check date
     checkpoint: RU:Key:checkpoint
     clothes: RU:Key:clothes
     club: RU:Key:club
     colour: RU:Key:colour
     comment: RU:Key:comment
+    community_centre: RU:Key:community centre
     construction: RU:Key:construction
     contact: RU:Key:contact
     contact:facebook: RU:Key:contact:facebook
@@ -14472,6 +15678,7 @@ ru:
     crossing: RU:Key:crossing
     cuisine: RU:Key:cuisine
     cutting: RU:Key:cutting
+    cycleway: RU:Key:cycleway
     delivery: RU:Key:delivery
     denomination: RU:Key:denomination
     description: RU:Key:description
@@ -14526,6 +15733,7 @@ ru:
     grassland: RU:Key:grassland
     gvr:code: RU:Key:gvr:code
     handrail: RU:Key:handrail
+    healthcare: RU:Key:healthcare
     height: RU:Key:height
     hgv: RU:Key:hgv
     highway: RU:Key:highway
@@ -14543,6 +15751,7 @@ ru:
     internet_access: RU:Key:internet access
     junction: RU:Key:junction
     kerb: RU:Key:kerb
+    lamp_mount: RU:Key:lamp mount
     landmark: RU:Key:landmark
     landuse: RU:Key:landuse
     lanes: RU:Key:lanes
@@ -14557,6 +15766,7 @@ ru:
     living_street: RU:Key:living street
     loc_name: RU:Key:loc name
     loc_ref: RU:Key:loc ref
+    location: RU:Key:location
     lock: RU:Key:lock
     man_made: RU:Key:man made
     managed: RU:Key:managed
@@ -14597,7 +15807,9 @@ ru:
     oneway: RU:Key:oneway
     opening_date: RU:Key:opening date
     opening_hours: RU:Key:opening hours
+    opening_hours:kitchen: RU:Key:opening hours:kitchen
     operator: RU:Key:operator
+    operator:ref:inn: RU:Key:operator:ref:inn
     operator:type: RU:Key:operator:type
     origin: RU:Key:origin
     overtaking: RU:Key:overtaking
@@ -14627,6 +15839,7 @@ ru:
     previous:access: RU:Key:previous:access
     previous:vehicle: RU:Key:previous:vehicle
     priority_road: RU:Key:priority road
+    product: RU:Key:product
     psv: RU:Key:psv
     public_bookcase:type: RU:Key:public bookcase:type
     pump: RU:Key:pump
@@ -14635,17 +15848,21 @@ ru:
     recycling_type: RU:Key:recycling type
     ref: RU:Key:ref
     reference: RU:Key:reference
+    refitted: RU:Key:refitted
     reg_name: RU:Key:reg name
     reg_ref: RU:Key:reg ref
     religion: RU:Key:religion
     resource: RU:Key:resource
+    roof:direction: RU:Key:roof:direction
     roof:material: RU:Key:roof:material
+    room: RU:Key:room
     rooms: RU:Key:rooms
     route: RU:Key:route
     rtsa_scale: RU:Key:rtsa scale
     ruined: RU:Key:ruined
     'ruined:': 'RU:Key:ruined:'
     ruins: RU:Key:ruins
+    sac_scale: RU:Key:sac scale
     salt: RU:Key:salt
     sanitary_dump_station: RU:Key:sanitary dump station
     seasonal: RU:Key:seasonal
@@ -14659,6 +15876,7 @@ ru:
     shop: RU:Key:shop
     side_road: RU:Key:side road
     sidewalk: RU:Key:sidewalk
+    sinkhole: RU:Key:sinkhole
     smoking: RU:Key:smoking
     smoothness: RU:Key:smoothness
     snowplowing: RU:Key:snowplowing
@@ -14677,6 +15895,7 @@ ru:
     survey:date: RU:Key:survey:date
     tactile_paving: RU:Key:tactile paving
     todo: RU:Key:todo
+    toilets: RU:Key:toilets
     toilets:wheelchair: RU:Key:toilets:wheelchair
     toll: RU:Key:toll
     tourism: RU:Key:tourism
@@ -14690,6 +15909,7 @@ ru:
     turn: RU:Key:turn
     turn:lanes: RU:Key:turn:lanes
     type: RU:Key:type
+    usage: RU:Key:usage
     vehicle: RU:Key:vehicle
     voltage: RU:Key:voltage
     waste: RU:Key:waste
@@ -14755,6 +15975,7 @@ ru:
     amenity=cinema: RU:Tag:amenity=cinema
     amenity=clinic: RU:Tag:amenity=clinic
     amenity=clock: RU:Tag:amenity=clock
+    amenity=clothes_dryer: RU:Tag:amenity=clothes dryer
     amenity=college: RU:Tag:amenity=college
     amenity=community_centre: RU:Tag:amenity=community centre
     amenity=compressed_air: RU:Tag:amenity=compressed air
@@ -14799,6 +16020,7 @@ ru:
     amenity=place_of_worship: RU:Tag:amenity=place of worship
     amenity=planetarium: RU:Tag:amenity=planetarium
     amenity=police: RU:Tag:amenity=police
+    amenity=polling_station: RU:Tag:amenity=polling station
     amenity=post_box: RU:Tag:amenity=post box
     amenity=post_office: RU:Tag:amenity=post office
     amenity=prison: RU:Tag:amenity=prison
@@ -14808,6 +16030,7 @@ ru:
     amenity=recycling: RU:Tag:amenity=recycling
     amenity=register_office: RU:Tag:amenity=register office
     amenity=rescue_station: RU:Tag:amenity=rescue station
+    amenity=research_institute: RU:Tag:amenity=research institute
     amenity=restaurant: RU:Tag:amenity=restaurant
     amenity=sanatorium: RU:Tag:amenity=sanatorium
     amenity=sanitary_dump_station: RU:Tag:amenity=sanitary dump station
@@ -14845,6 +16068,7 @@ ru:
     barrier=ditch: RU:Tag:barrier=ditch
     barrier=entrance: RU:Tag:barrier=entrance
     barrier=fence: RU:Tag:barrier=fence
+    barrier=full-height_turnstile: RU:Tag:barrier=full-height turnstile
     barrier=gate: RU:Tag:barrier=gate
     barrier=handrail: RU:Tag:barrier=handrail
     barrier=hedge: RU:Tag:barrier=hedge
@@ -14877,6 +16101,7 @@ ru:
     bridge=covered: RU:Tag:bridge=covered
     building=apartments: RU:Tag:building=apartments
     building=barn: RU:Tag:building=barn
+    building=boathouse: RU:Tag:building=boathouse
     building=bridge: RU:Tag:building=bridge
     building=bungalow: RU:Tag:building=bungalow
     building=bunker: RU:Tag:building=bunker
@@ -14903,6 +16128,7 @@ ru:
     building=kindergarten: RU:Tag:building=kindergarten
     building=kiosk: RU:Tag:building=kiosk
     building=mosque: RU:Tag:building=mosque
+    building=office: RU:Tag:building=office
     building=public: RU:Tag:building=public
     building=residential: RU:Tag:building=residential
     building=retail: RU:Tag:building=retail
@@ -14917,8 +16143,10 @@ ru:
     building=transportation: RU:Tag:building=transportation
     building=university: RU:Tag:building=university
     building=warehouse: RU:Tag:building=warehouse
+    building=water_tower: RU:Tag:building=water tower
     bunker_type=pillbox: RU:Tag:bunker type=pillbox
     cafe=time-cafe: RU:Tag:cafe=time-cafe
+    cemetery=grave: RU:Tag:cemetery=grave
     craft=agricultural_engines: RU:Tag:craft=agricultural engines
     craft=basket_maker: RU:Tag:craft=basket maker
     craft=beekeeper: RU:Tag:craft=beekeeper
@@ -14936,12 +16164,14 @@ ru:
     craft=handicraft: RU:Tag:craft=handicraft
     craft=key_cutter: RU:Tag:craft=key cutter
     craft=photographer: RU:Tag:craft=photographer
+    craft=roofer: RU:Tag:craft=roofer
     craft=shoemaker: RU:Tag:craft=shoemaker
     craft=stonemason: RU:Tag:craft=stonemason
     craft=tailor: RU:Tag:craft=tailor
     craft=window_construction: RU:Tag:craft=window construction
     crop=grape: RU:Tag:crop=grape
     crop=hop: RU:Tag:crop=hop
+    cycleway=opposite_lane: RU:Tag:cycleway=opposite lane
     emergency=ambulance_station: RU:Tag:emergency=ambulance station
     emergency=fire_extinguisher: RU:Tag:emergency=fire extinguisher
     emergency=fire_hose: RU:Tag:emergency=fire hose
@@ -14957,6 +16187,7 @@ ru:
     generator:type=boiler: RU:Tag:generator:type=boiler
     geological=palaeontological_site: RU:Tag:geological=palaeontological site
     healthcare=blood_donation: RU:Tag:healthcare=blood donation
+    healthcare=laboratory: RU:Tag:healthcare=laboratory
     highway=bridleway: RU:Tag:highway=bridleway
     highway=bus_guideway: RU:Tag:highway=bus guideway
     highway=bus_stop: RU:Tag:highway=bus stop
@@ -14980,6 +16211,7 @@ ru:
     highway=platform: RU:Tag:highway=platform
     highway=primary: RU:Tag:highway=primary
     highway=primary_link: RU:Tag:highway=primary link
+    highway=proposed: RU:Tag:highway=proposed
     highway=raceway: RU:Tag:highway=raceway
     highway=residential: RU:Tag:highway=residential
     highway=rest_area: RU:Tag:highway=rest area
@@ -14991,6 +16223,7 @@ ru:
     highway=speed_camera: RU:Tag:highway=speed camera
     highway=steps: RU:Tag:highway=steps
     highway=stop: RU:Tag:highway=stop
+    highway=street_lamp: RU:Tag:highway=street lamp
     highway=tertiary: RU:Tag:highway=tertiary
     highway=tertiary_link: RU:Tag:highway=tertiary link
     highway=track: RU:Tag:highway=track
@@ -15020,11 +16253,14 @@ ru:
     historic=wayside_shrine: RU:Tag:historic=wayside shrine
     historic=wreck: RU:Tag:historic=wreck
     horse=designated: RU:Tag:horse=designated
+    industrial=factory: RU:Tag:industrial=factory
+    industrial=warehouse: RU:Tag:industrial=warehouse
     industrial=well_cluster: RU:Tag:industrial=well cluster
     information=board: RU:Tag:information=board
     information=guidepost: RU:Tag:information=guidepost
     junction=roundabout: RU:Tag:junction=roundabout
     landuse=allotments: RU:Tag:landuse=allotments
+    landuse=animal_keeping: RU:Tag:landuse=animal keeping
     landuse=basin: RU:Tag:landuse=basin
     landuse=brownfield: RU:Tag:landuse=brownfield
     landuse=cemetery: RU:Tag:landuse=cemetery
@@ -15038,6 +16274,7 @@ ru:
     landuse=grass: RU:Tag:landuse=grass
     landuse=greenhouse_horticulture: RU:Tag:landuse=greenhouse horticulture
     landuse=industrial: RU:Tag:landuse=industrial
+    landuse=institutional: RU:Tag:landuse=institutional
     landuse=landfill: RU:Tag:landuse=landfill
     landuse=logging: RU:Tag:landuse=logging
     landuse=meadow: RU:Tag:landuse=meadow
@@ -15069,7 +16306,9 @@ ru:
     leisure=escape_game: RU:Tag:leisure=escape game
     leisure=firepit: RU:Tag:leisure=firepit
     leisure=fitness_centre: RU:Tag:leisure=fitness centre
+    leisure=fitness_station: RU:Tag:leisure=fitness station
     leisure=hackerspace: RU:Tag:leisure=hackerspace
+    leisure=horse_riding: RU:Tag:leisure=horse riding
     leisure=ice_rink: RU:Tag:leisure=ice rink
     leisure=marina: RU:Tag:leisure=marina
     leisure=miniature_golf: RU:Tag:leisure=miniature golf
@@ -15077,6 +16316,7 @@ ru:
     leisure=pitch: RU:Tag:leisure=pitch
     leisure=playground: RU:Tag:leisure=playground
     leisure=resort: RU:Tag:leisure=resort
+    leisure=slipway: RU:Tag:leisure=slipway
     leisure=sports_centre: RU:Tag:leisure=sports centre
     leisure=stadium: RU:Tag:leisure=stadium
     leisure=summer_camp: RU:Tag:leisure=summer camp
@@ -15089,13 +16329,16 @@ ru:
     man_made=bridge: RU:Tag:man made=bridge
     man_made=bunker_silo: RU:Tag:man made=bunker silo
     man_made=campanile: RU:Tag:man made=campanile
+    man_made=carpet_hanger: RU:Tag:man made=carpet hanger
     man_made=clearcut: RU:Tag:man made=clearcut
     man_made=communications_tower: RU:Tag:man made=communications tower
+    man_made=cooling_tower: RU:Tag:man made=cooling tower
     man_made=crane: RU:Tag:man made=crane
     man_made=cutline: RU:Tag:man made=cutline
     man_made=dovecote: RU:Tag:man made=dovecote
     man_made=dyke: RU:Tag:man made=dyke
     man_made=embankment: RU:Tag:man made=embankment
+    man_made=flagpole: RU:Tag:man made=flagpole
     man_made=lighthouse: RU:Tag:man made=lighthouse
     man_made=mast: RU:Tag:man made=mast
     man_made=mineshaft: RU:Tag:man made=mineshaft
@@ -15113,6 +16356,7 @@ ru:
     man_made=telescope: RU:Tag:man made=telescope
     man_made=tower: RU:Tag:man made=tower
     man_made=wastewater_plant: RU:Tag:man made=wastewater plant
+    man_made=water_tap: RU:Tag:man made=water tap
     man_made=water_tower: RU:Tag:man made=water tower
     man_made=water_well: RU:Tag:man made=water well
     man_made=water_works: RU:Tag:man made=water works
@@ -15122,6 +16366,7 @@ ru:
     man_made=works: RU:Tag:man made=works
     military=airfield: RU:Tag:military=airfield
     military=bunker: RU:Tag:military=bunker
+    military=checkpoint: RU:Tag:military=checkpoint
     military=naval_base: RU:Tag:military=naval base
     name=Продукты: RU:Tag:name=Продукты
     natural=arete: RU:Tag:natural=arete
@@ -15133,10 +16378,12 @@ ru:
     natural=desert: RU:Tag:natural=desert
     natural=earth_bank: RU:Tag:natural=earth bank
     natural=fell: RU:Tag:natural=fell
+    natural=geyser: RU:Tag:natural=geyser
     natural=glacier: RU:Tag:natural=glacier
     natural=grassland: RU:Tag:natural=grassland
     natural=gully: RU:Tag:natural=gully
     natural=heath: RU:Tag:natural=heath
+    natural=hot_spring: RU:Tag:natural=hot spring
     natural=mud: RU:Tag:natural=mud
     natural=peak: RU:Tag:natural=peak
     natural=ridge: RU:Tag:natural=ridge
@@ -15147,6 +16394,7 @@ ru:
     natural=shingle: RU:Tag:natural=shingle
     natural=sinkhole: RU:Tag:natural=sinkhole
     natural=spring: RU:Tag:natural=spring
+    natural=stone: RU:Tag:natural=stone
     natural=tree: RU:Tag:natural=tree
     natural=tree_row: RU:Tag:natural=tree row
     natural=valley: RU:Tag:natural=valley
@@ -15225,6 +16473,7 @@ ru:
     railway=turntable: RU:Tag:railway=turntable
     religion=pagan: RU:Tag:religion=pagan
     religion=zoroastrian: RU:Tag:religion=zoroastrian
+    residential=rural: RU:Tag:residential=rural
     route=bus: RU:Tag:route=bus
     route=ferry: RU:Tag:route=ferry
     route=railway: RU:Tag:route=railway
@@ -15286,6 +16535,7 @@ ru:
     shop=fashion: RU:Tag:shop=fashion
     shop=fishing: RU:Tag:shop=fishing
     shop=fishmonger: RU:Tag:shop=fishmonger
+    shop=flooring: RU:Tag:shop=flooring
     shop=florist: RU:Tag:shop=florist
     shop=frame: RU:Tag:shop=frame
     shop=funeral_directors: RU:Tag:shop=funeral directors
@@ -15322,9 +16572,11 @@ ru:
     shop=optician: RU:Tag:shop=optician
     shop=organic: RU:Tag:shop=organic
     shop=outdoor: RU:Tag:shop=outdoor
+    shop=outpost: RU:Tag:shop=outpost
     shop=paint: RU:Tag:shop=paint
     shop=pawnbroker: RU:Tag:shop=pawnbroker
     shop=pet: RU:Tag:shop=pet
+    shop=pet_grooming: RU:Tag:shop=pet grooming
     shop=power_tools: RU:Tag:shop=power tools
     shop=radiotechnics: RU:Tag:shop=radiotechnics
     shop=religion: RU:Tag:shop=religion
@@ -15332,6 +16584,7 @@ ru:
     shop=second_hand: RU:Tag:shop=second hand
     shop=ship_chandler: RU:Tag:shop=ship chandler
     shop=shoes: RU:Tag:shop=shoes
+    shop=spices: RU:Tag:shop=spices
     shop=sports: RU:Tag:shop=sports
     shop=stationery: RU:Tag:shop=stationery
     shop=supermarket: RU:Tag:shop=supermarket
@@ -15350,12 +16603,16 @@ ru:
     shop=watches: RU:Tag:shop=watches
     shop=wholesale: RU:Tag:shop=wholesale
     shop=window_blind: RU:Tag:shop=window blind
+    sinkhole=bluehole: RU:Tag:sinkhole=bluehole
     social_facility=group_home: RU:Tag:social facility=group home
     sport=archery: RU:Tag:sport=archery
+    sport=futsal: RU:Tag:sport=futsal
+    sport=horse_racing: RU:Tag:sport=horse racing
     sport=motocross: RU:Tag:sport=motocross
     sport=motor: RU:Tag:sport=motor
     sport=scuba_diving: RU:Tag:sport=scuba diving
     sport=shooting: RU:Tag:sport=shooting
+    summit:cross=yes: RU:Tag:summit:cross=yes
     tank_trap=czech_hedgehog: RU:Tag:tank trap=czech hedgehog
     tourism=apartment: RU:Tag:tourism=apartment
     tourism=artwork: RU:Tag:tourism=artwork
@@ -15373,6 +16630,8 @@ ru:
     tourism=theme_park: RU:Tag:tourism=theme park
     tourism=viewpoint: RU:Tag:tourism=viewpoint
     tower:type=bell_tower: RU:Tag:tower:type=bell tower
+    tower:type=cooling: RU:Tag:tower:type=cooling
+    traffic_calming=table: RU:Tag:traffic calming=table
     tunnel=culvert: RU:Tag:tunnel=culvert
     type=site: RU:Tag:type=site
     waterway=boatyard: RU:Tag:waterway=boatyard
@@ -15408,6 +16667,7 @@ sv:
   key:
     access: Sv:Key:access
     name: Sv:Key:name
+    ref:raa: Sv:Key:ref:raa
   tag:
     aerialway=cable_car: Sv:Tag:aerialway=cable car
     amenity=place_of_worship: Sv:Tag:amenity=place of worship
@@ -15420,6 +16680,7 @@ sv:
     leisure=dog_park: Sv:Tag:leisure=dog park
     leisure=fitness_station: Sv:Tag:leisure=fitness station
     railway=rail: Sv:Tag:railway=rail
+    sport=motocross: Sv:Tag:sport=motocross
 tr:
   key:
     amenity: Tr:Key:amenity
@@ -15698,9 +16959,6 @@ yue:
     man_made=gasometer: Yue:Tag:man made=gasometer
     residential=university: Yue:Tag:residential=university
     tourism=attraction: Yue:Tag:tourism=attraction
-zh:
-  key:
-    name: ZH:Key:name
 zh-hans:
   key:
     amenity: Zh-hans:Key:amenity
@@ -15711,6 +16969,7 @@ zh-hans:
     highway: Zh-hans:Key:highway
     landuse: Zh-hans:Key:landuse
     name: Zh-hans:Key:name
+    parking:lane: Zh-hans:Key:parking:lane
     place: Zh-hans:Key:place
     railway: Zh-hans:Key:railway
     toll: Zh-hans:Key:toll
@@ -15720,6 +16979,7 @@ zh-hans:
     amenity=cafe: Zh-hans:Tag:amenity=cafe
     barrier=toll_booth: Zh-hans:Tag:barrier=toll booth
     barrier=wall: Zh-hans:Tag:barrier=wall
+    highway=footway: Zh-hans:Tag:highway=footway
     highway=residential: Zh-hans:Tag:highway=residential
     highway=tertiary: Zh-hans:Tag:highway=tertiary
     railway=light_rail: Zh-hans:Tag:railway=light rail
@@ -15734,9 +16994,11 @@ zh-hant:
     aeroway: Zh-hant:Key:aeroway
     amenity: Zh-hant:Key:amenity
     bridge: Zh-hant:Key:bridge
+    conveying: Zh-hant:Key:conveying
     diet:*: Zh-hant:Key:diet:*
     fixme: Zh-hant:Key:fixme
     fuel: Zh-hant:Key:fuel
+    maxspeed: Zh-hant:Key:maxspeed
     name: Zh-hant:Key:name
     noexit: Zh-hant:Key:noexit
     office: Zh-hant:Key:office
@@ -15755,14 +17017,19 @@ zh-hant:
     amenity=fountain: Zh-hant:Tag:amenity=fountain
     amenity=fuel: Zh-hant:Tag:amenity=fuel
     amenity=place_of_worship: Zh-hant:Tag:amenity=place of worship
+    amenity=post_box: Zh-hant:Tag:amenity=post box
     amenity=toilets: Zh-hant:Tag:amenity=toilets
     building=roof: Zh-hant:Tag:building=roof
+    highway=bus_guideway: Zh-hant:Tag:highway=bus guideway
     highway=bus_stop: Zh-hant:Tag:highway=bus stop
+    highway=footway: Zh-hant:Tag:highway=footway
     highway=milestone: Zh-hant:Tag:highway=milestone
+    highway=unclassified: Zh-hant:Tag:highway=unclassified
     historic=aircraft: Zh-hant:Tag:historic=aircraft
     landuse=cemetery: Zh-hant:Tag:landuse=cemetery
     leisure=pitch: Zh-hant:Tag:leisure=pitch
     natural=peak: Zh-hant:Tag:natural=peak
+    railway=rail: Zh-hant:Tag:railway=rail
     service=drive-through: Zh-hant:Tag:service=drive-through
     shop=funeral_directors: Zh-hant:Tag:shop=funeral directors
     shop=gas: Zh-hant:Tag:shop=gas