]> git.openstreetmap.org Git - rails.git/blobdiff - config/wiki_pages.yml
Improve testing of emails
[rails.git] / config / wiki_pages.yml
index 3e0f48acd6e7a91371dd3d1723f500c852db96fe..edd47cb07da99e49362179eace63a4e69654a3e6 100644 (file)
@@ -2,6 +2,12 @@
 # PROGRAM DO NOT MANUALLY EDIT IT
 
 ---
+ar:
+  key:
+    name: Ar:Key:name
+  tag:
+    amenity=school: Ar:Tag:amenity=school
+    shop=bakery: Ar:Tag:shop=bakery
 az:
   tag:
     craft=locksmith: Az:Tag:craft=locksmith
@@ -13,22 +19,146 @@ bg:
     railway=crossing: Bg:Tag:railway=crossing
     railway=level_crossing: Bg:Tag:railway=level crossing
 ca:
+  key:
+    name: Ca:Key:name
   tag:
+    landuse=farmland: Ca:Tag:landuse=farmland
     leisure=swimming_pool: Ca:Tag:leisure=swimming pool
+cs:
+  key:
+    addr: Cs:Key:addr
+    addr:city: Cs:Key:addr:city
+    addr:conscriptionnumber: Cs:Key:addr:conscriptionnumber
+    addr:country: Cs:Key:addr:country
+    addr:district: Cs:Key:addr:district
+    addr:door: Cs:Key:addr:door
+    addr:flats: Cs:Key:addr:flats
+    addr:floor: Cs:Key:addr:floor
+    addr:full: Cs:Key:addr:full
+    addr:hamlet: Cs:Key:addr:hamlet
+    addr:housename: Cs:Key:addr:housename
+    addr:housenumber: Cs:Key:addr:housenumber
+    addr:inclusion: Cs:Key:addr:inclusion
+    addr:interpolation: Cs:Key:addr:interpolation
+    addr:place: Cs:Key:addr:place
+    addr:postcode: Cs:Key:addr:postcode
+    addr:province: Cs:Key:addr:province
+    addr:provisionalnumber: Cs:Key:addr:provisionalnumber
+    addr:state: Cs:Key:addr:state
+    addr:street: Cs:Key:addr:street
+    addr:streetnumber: Cs:Key:addr:streetnumber
+    addr:subdistrict: Cs:Key:addr:subdistrict
+    addr:suburb: Cs:Key:addr:suburb
+    addr:unit: Cs:Key:addr:unit
+    aerialway: Cs:Key:aerialway
+    aeroway: Cs:Key:aeroway
+    alt_name: Cs:Key:alt name
+    amenity: Cs:Key:amenity
+    barrier: Cs:Key:barrier
+    building: Cs:Key:building
+    building:flats: Cs:Key:building:flats
+    building:levels: Cs:Key:building:levels
+    castle_type: Cs:Key:castle type
+    contact: Cs:Key:contact
+    craft: Cs:Key:craft
+    emergency: Cs:Key:emergency
+    geological: Cs:Key:geological
+    highway: Cs:Key:highway
+    historic: Cs:Key:historic
+    image: Cs:Key:image
+    int_name: Cs:Key:int name
+    intermittent: Cs:Key:intermittent
+    landuse: Cs:Key:landuse
+    leaf_type: Cs:Key:leaf type
+    leisure: Cs:Key:leisure
+    loc_name: Cs:Key:loc name
+    man_made: Cs:Key:man made
+    mtb:scale: Cs:Key:mtb:scale
+    mtb:scale:uphill: Cs:Key:mtb:scale:uphill
+    name: Cs:Key:name
+    nat_name: Cs:Key:nat name
+    natural: Cs:Key:natural
+    office: Cs:Key:office
+    official_name: Cs:Key:official name
+    old_name: Cs:Key:old name
+    place: Cs:Key:place
+    population: Cs:Key:population
+    power: Cs:Key:power
+    railway: Cs:Key:railway
+    ref:ruian: Cs:Key:ref:ruian
+    ref:ruian:addr: Cs:Key:ref:ruian:addr
+    ref:ruian:building: Cs:Key:ref:ruian:building
+    reg_name: Cs:Key:reg name
+    route: Cs:Key:route
+    salt: Cs:Key:salt
+    shop: Cs:Key:shop
+    short_name: Cs:Key:short name
+    sorting_name: Cs:Key:sorting name
+    sport: Cs:Key:sport
+    tourism: Cs:Key:tourism
+    tracktype: Cs:Key:tracktype
+    water: Cs:Key:water
+    waterway: Cs:Key:waterway
+  tag:
+    amenity=baby_hatch: Cs:Tag:amenity=baby hatch
+    baby_hatch=yes: Cs:Tag:baby hatch=yes
+    building=farm: Cs:Tag:building=farm
+    building=school: Cs:Tag:building=school
+    building=university: Cs:Tag:building=university
+    historic=cannon: Cs:Tag:historic=cannon
+    historic=castle: Cs:Tag:historic=castle
+    historic=tomb: Cs:Tag:historic=tomb
+    landuse=allotments: Cs:Tag:landuse=allotments
+    landuse=basin: Cs:Tag:landuse=basin
+    landuse=brownfield: Cs:Tag:landuse=brownfield
+    landuse=greenfield: Cs:Tag:landuse=greenfield
+    leaf_type=broadleaved: Cs:Tag:leaf type=broadleaved
+    leaf_type=leafless: Cs:Tag:leaf type=leafless
+    leaf_type=mixed: Cs:Tag:leaf type=mixed
+    leaf_type=needleleaved: Cs:Tag:leaf type=needleleaved
+    natural=water: Cs:Tag:natural=water
+    route=trolleybus: Cs:Tag:route=trolleybus
+cz:
+  key:
+    historic: Cz:Key:historic
+    railway: Cz:Key:railway
+    tracktype: Cz:Key:tracktype
+  tag:
+    amenity=baby_hatch: Cz:Tag:amenity=baby hatch
+    route=trolleybus: Cz:Tag:route=trolleybus
 da:
   key:
+    access: Da:Key:access
     fee: Da:Key:fee
     lit: Da:Key:lit
     maxheight: Da:Key:maxheight
     maxspeed: Da:Key:maxspeed
   tag:
+    amenity=community_centre: Da:Tag:amenity=community centre
+    amenity=nightclub: Da:Tag:amenity=nightclub
     amenity=place_of_worship: Da:Tag:amenity=place of worship
+    amenity=veterinary: Da:Tag:amenity=veterinary
+    highway=bridleway: Da:Tag:highway=bridleway
+    highway=ford: Da:Tag:highway=ford
+    highway=tertiary: Da:Tag:highway=tertiary
+    highway=track: Da:Tag:highway=track
+    leisure=dog_park: Da:Tag:leisure=dog park
+    place=hamlet: Da:Tag:place=hamlet
+    place=town: Da:Tag:place=town
+    place=village: Da:Tag:place=village
+    route=ferry: Da:Tag:route=ferry
+    service=driveway: Da:Tag:service=driveway
 de:
   key:
     AlpinRes_ID: DE:Key:AlpinRes ID
+    TODO: DE:Key:TODO
     abutters: DE:Key:abutters
     access: DE:Key:access
     addr: DE:Key:addr
+    addr:city: DE:Key:addr:city
+    addr:housenumber: DE:Key:addr:housenumber
+    addr:postcode: DE:Key:addr:postcode
+    addr:street: DE:Key:addr:street
     aerialway: DE:Key:aerialway
     aeroway: DE:Key:aeroway
     amenity: DE:Key:amenity
@@ -43,30 +173,46 @@ de:
     biosphärenwirt: DE:Key:biosphärenwirt
     bollard: DE:Key:bollard
     brewery: DE:Key:brewery
+    bridge: DE:Key:bridge
+    building: DE:Key:building
     building:condition: DE:Key:building:condition
     building:material: DE:Key:building:material
     capacity: DE:Key:capacity
+    castle_type: DE:Key:castle type
     clothes: DE:Key:clothes
+    club: DE:Key:club
     comment: DE:Key:comment
     construction: DE:Key:construction
     contact: DE:Key:contact
+    contact:fax: DE:Key:contact:fax
+    contact:phone: DE:Key:contact:phone
+    contact:website: DE:Key:contact:website
     content: DE:Key:content
     country: DE:Key:country
     covered: DE:Key:covered
+    craft: DE:Key:craft
     created_by: DE:Key:created by
     crossing: DE:Key:crossing
     cuisine: DE:Key:cuisine
     currency: DE:Key:currency
+    currency:BTC: DE:Key:currency:BTC
+    currency:EUR: DE:Key:currency:EUR
+    currency:USD: DE:Key:currency:USD
+    currency:XXX: DE:Key:currency:XXX
+    currency:others: DE:Key:currency:others
     cutting: DE:Key:cutting
     cycleway: DE:Key:cycleway
     de:amtlicher_gemeindeschluessel: DE:Key:de:amtlicher gemeindeschluessel
     de:regionalschluessel: DE:Key:de:regionalschluessel
+    de:strassenschluessel: DE:Key:de:strassenschluessel
     denomination: DE:Key:denomination
     denotation: DE:Key:denotation
     description: DE:Key:description
     designation: DE:Key:designation
     destination: DE:Key:destination
     diaper: DE:Key:diaper
+    diet: DE:Key:diet
+    diet:*: DE:Key:diet:*
     direction: DE:Key:direction
     drink: DE:Key:drink
     drive_through: DE:Key:drive through
@@ -76,6 +222,7 @@ de:
     emergency: DE:Key:emergency
     entrance: DE:Key:entrance
     fee: DE:Key:fee
+    fence_type: DE:Key:fence type
     fetish: DE:Key:fetish
     fixme: DE:Key:fixme
     foot: DE:Key:foot
@@ -83,8 +230,15 @@ de:
     ford: DE:Key:ford
     generator:method: DE:Key:generator:method
     generator:output: DE:Key:generator:output
+    generator:output:electricity: DE:Key:generator:output:electricity
+    generator:output:heat: DE:Key:generator:output:heat
+    generator:output:hot_water: DE:Key:generator:output:hot water
     generator:source: DE:Key:generator:source
+    generator:type: DE:Key:generator:type
     geological: DE:Key:geological
+    geological=moraine: DE:Key:geological=moraine
+    geological=outcrop: DE:Key:geological=outcrop
+    geological=palaeontological_site: DE:Key:geological=palaeontological site
     hazard: DE:Key:hazard
     hazmat: DE:Key:hazmat
     height: DE:Key:height
@@ -98,6 +252,7 @@ de:
     information: DE:Key:information
     intermittent: DE:Key:intermittent
     internet_access: DE:Key:internet access
+    is_in: DE:Key:is in
     junction: DE:Key:junction
     landuse: DE:Key:landuse
     lanes: DE:Key:lanes
@@ -106,6 +261,7 @@ de:
     level: DE:Key:level
     lit: DE:Key:lit
     lock: DE:Key:lock
+    lock_name: DE:Key:lock name
     man_made: DE:Key:man made
     manhole: DE:Key:manhole
     maxheight: DE:Key:maxheight
@@ -116,13 +272,21 @@ de:
     military: DE:Key:military
     minspeed: DE:Key:minspeed
     motorroad: DE:Key:motorroad
+    mountain_pass: DE:Key:mountain pass
     mtb:scale: DE:Key:mtb:scale
     name: DE:Key:name
+    name:de: DE:Key:name:de
+    name:en: DE:Key:name:en
+    name:fr: DE:Key:name:fr
+    name:it: DE:Key:name:it
     natural: DE:Key:natural
     network: DE:Key:network
     noexit: DE:Key:noexit
     note: DE:Key:note
     office: DE:Key:office
+    oneway: DE:Key:oneway
+    oneway:bicycle: DE:Key:oneway:bicycle
+    oneway:moped: DE:Key:oneway:moped
     onkz: DE:Key:onkz
     opening_hours: DE:Key:opening hours
     operator: DE:Key:operator
@@ -134,6 +298,7 @@ de:
     piste:difficulty: DE:Key:piste:difficulty
     piste:type: DE:Key:piste:type
     place: DE:Key:place
+    plant:output: DE:Key:plant:output
     playground: DE:Key:playground
     population: DE:Key:population
     power: DE:Key:power
@@ -166,6 +331,8 @@ de:
     social_facility: DE:Key:social facility
     source: DE:Key:source
     source:maxspeed: DE:Key:source:maxspeed
+    speech_output:en: DE:Key:speech output:en
+    speech_output:lg: DE:Key:speech output:lg
     speisebezirk: DE:Key:speisebezirk
     sport: DE:Key:sport
     start_date: DE:Key:start date
@@ -173,18 +340,24 @@ de:
     surface: DE:Key:surface
     symbol: DE:Key:symbol
     tactile_paving: DE:Key:tactile paving
+    todo: DE:Key:todo
     toll: DE:Key:toll
     tourism: DE:Key:tourism
     tracktype: DE:Key:tracktype
     traffic_calming: DE:Key:traffic calming
     traffic_sign: DE:Key:traffic sign
     trail_visibility: DE:Key:trail visibility
+    tunnel: DE:Key:tunnel
     turn: DE:Key:turn
+    turn:lanes: DE:Key:turn:lanes
     type: DE:Key:type
     usage: DE:Key:usage
     verbindung: DE:Key:verbindung
     voltage: DE:Key:voltage
+    waste: DE:Key:waste
+    water: DE:Key:water
     waterway: DE:Key:waterway
+    wetland: DE:Key:wetland
     wheelchair: DE:Key:wheelchair
     width: DE:Key:width
     wiki:symbol: DE:Key:wiki:symbol
@@ -251,7 +424,9 @@ de:
     amenity=parking_entrance: DE:Tag:amenity=parking entrance
     amenity=parking_space: DE:Tag:amenity=parking space
     amenity=pharmacy: DE:Tag:amenity=pharmacy
+    amenity=photo_booth: DE:Tag:amenity=photo booth
     amenity=place_of_worship: DE:Tag:amenity=place of worship
+    amenity=planetarium: DE:Tag:amenity=planetarium
     amenity=police: DE:Tag:amenity=police
     amenity=post_box: DE:Tag:amenity=post box
     amenity=post_office: DE:Tag:amenity=post office
@@ -273,6 +448,7 @@ de:
     amenity=vending_machine: DE:Tag:amenity=vending machine
     amenity=veterinary: DE:Tag:amenity=veterinary
     amenity=waste_basket: DE:Tag:amenity=waste basket
+    amenity=watering_place: DE:Tag:amenity=watering place
     atm=yes: DE:Tag:atm=yes
     barrier=bollard: DE:Tag:barrier=bollard
     barrier=cattle_grid: DE:Tag:barrier=cattle grid
@@ -287,6 +463,7 @@ de:
     barrier=sally_port: DE:Tag:barrier=sally port
     barrier=toll_booth: DE:Tag:barrier=toll booth
     barrier=wall: DE:Tag:barrier=wall
+    bicycle=designated: DE:Tag:bicycle=designated
     biosphärenwirt=yes: DE:Tag:biosphärenwirt=yes
     boundary=national_park: DE:Tag:boundary=national park
     boundary=protected_area: DE:Tag:boundary=protected area
@@ -299,27 +476,67 @@ de:
     building=roof: DE:Tag:building=roof
     building=school: DE:Tag:building=school
     building=stable: DE:Tag:building=stable
+    craft=agricultural_engines: DE:Tag:craft=agricultural engines
     craft=car_repair: DE:Tag:craft=car repair
     craft=hvac: DE:Tag:craft=hvac
     craft=information_electronics: DE:Tag:craft=information electronics
+    craft=metal_construction: DE:Tag:craft=metal construction
+    craft=on_street: DE:Tag:craft=on street
     craft=optician: DE:Tag:craft=optician
     craft=painter: DE:Tag:craft=painter
     craft=paperhanger: DE:Tag:craft=paperhanger
     craft=plumber: DE:Tag:craft=plumber
+    craft=sawmill: DE:Tag:craft=sawmill
     craft=scaffolder: DE:Tag:craft=scaffolder
     craft=stonemason: DE:Tag:craft=stonemason
+    cuisine=coffee_shop: DE:Tag:cuisine=coffee shop
+    disused=yes: DE:Tag:disused=yes
+    emergency=aed: DE:Tag:emergency=aed
     emergency=ambulance_station: DE:Tag:emergency=ambulance station
+    emergency=assembly_point: DE:Tag:emergency=assembly point
     emergency=defibrillator: DE:Tag:emergency=defibrillator
+    emergency=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=life_ring: DE:Tag:emergency=life ring
+    emergency=lifeguard_tower: DE:Tag:emergency=lifeguard tower
     emergency=phone: DE:Tag:emergency=phone
     emergency=siren: DE:Tag:emergency=siren
     emergency=suction_point: DE:Tag:emergency=suction point
+    emergency=water_rescue_station: DE:Tag:emergency=water rescue station
+    foot=designated: DE:Tag:foot=designated
     footway=sidewalk: DE:Tag:footway=sidewalk
+    generator:method=barrage: DE:Tag:generator:method=barrage
+    generator:method=photovoltaic: DE:Tag:generator:method=photovoltaic
+    generator:method=run-of-the-river: DE:Tag:generator:method=run-of-the-river
+    generator:method=thermal: DE:Tag:generator:method=thermal
+    generator:method=water-pumped-storage: DE:Tag:generator:method=water-pumped-storage
+    generator:method=water-storage: DE:Tag:generator:method=water-storage
+    generator:source=gas: DE:Tag:generator:source=gas
+    generator:source=geothermal: DE:Tag:generator:source=geothermal
+    generator:source=hydro: DE:Tag:generator:source=hydro
+    generator:source=nuclear: DE:Tag:generator:source=nuclear
     generator:source=solar: DE:Tag:generator:source=solar
+    generator:source=tidal: DE:Tag:generator:source=tidal
+    generator:source=wave: DE:Tag:generator:source=wave
     generator:source=wind: DE:Tag:generator:source=wind
+    generator:type=francis_turbine: DE:Tag:generator:type=francis turbine
+    generator:type=gas_turbine: DE:Tag:generator:type=gas turbine
+    generator:type=horizontal_axis: DE:Tag:generator:type=horizontal axis
+    generator:type=hydrodynamic_screw: DE:Tag:generator:type=hydrodynamic screw
+    generator:type=kaplan_turbine: DE:Tag:generator:type=kaplan turbine
+    generator:type=pelton_turbine: DE:Tag:generator:type=pelton turbine
+    generator:type=reciprocating_engine: DE:Tag:generator:type=reciprocating engine
+    generator:type=solar_photovoltaic_panel: DE:Tag:generator:type=solar photovoltaic
+      panel
+    generator:type=solar_thermal_collector: DE:Tag:generator:type=solar thermal collector
+    generator:type=steam_turbine: DE:Tag:generator:type=steam turbine
+    generator:type=vertical_axis: DE:Tag:generator:type=vertical axis
+    geological=moraine: DE:Tag:geological=moraine
+    geological=outcrop: DE:Tag:geological=outcrop
+    geological=palaeontological_site: DE:Tag:geological=palaeontological site
     highway=bridleway: DE:Tag:highway=bridleway
+    highway=bus_guideway: DE:Tag:highway=bus guideway
     highway=bus_stop: DE:Tag:highway=bus stop
     highway=crossing: DE:Tag:highway=crossing
     highway=cycleway: DE:Tag:highway=cycleway
@@ -336,6 +553,7 @@ de:
     highway=pedestrian: DE:Tag:highway=pedestrian
     highway=platform: DE:Tag:highway=platform
     highway=primary: DE:Tag:highway=primary
+    highway=primary_link: DE:Tag:highway=primary link
     highway=raceway: DE:Tag:highway=raceway
     highway=residential: DE:Tag:highway=residential
     highway=rest_area: DE:Tag:highway=rest area
@@ -368,11 +586,14 @@ de:
     historic=monastery: DE:Tag:historic=monastery
     historic=monument: DE:Tag:historic=monument
     historic=pillory: DE:Tag:historic=pillory
+    historic=rune_stone: DE:Tag:historic=rune stone
     historic=ship: DE:Tag:historic=ship
     historic=stone: DE:Tag:historic=stone
+    historic=tomb: DE:Tag:historic=tomb
     historic=wayside_cross: DE:Tag:historic=wayside cross
     historic=wayside_shrine: DE:Tag:historic=wayside shrine
     historic=wreck: DE:Tag:historic=wreck
+    horse=designated: DE:Tag:horse=designated
     junction=roundabout: DE:Tag:junction=roundabout
     landuse=allotments: DE:Tag:landuse=allotments
     landuse=basin: DE:Tag:landuse=basin
@@ -382,6 +603,7 @@ de:
     landuse=farm: DE:Tag:landuse=farm
     landuse=farmland: DE:Tag:landuse=farmland
     landuse=farmyard: DE:Tag:landuse=farmyard
+    landuse=farmyards: DE:Tag:landuse=farmyards
     landuse=forest: DE:Tag:landuse=forest
     landuse=garages: DE:Tag:landuse=garages
     landuse=grass: DE:Tag:landuse=grass
@@ -398,10 +620,12 @@ de:
     landuse=reservoir: DE:Tag:landuse=reservoir
     landuse=residential: DE:Tag:landuse=residential
     landuse=retail: DE:Tag:landuse=retail
+    landuse=salt_pond: DE:Tag:landuse=salt pond
     landuse=village_green: DE:Tag:landuse=village green
     landuse=vineyard: DE:Tag:landuse=vineyard
     leisure=beach_resort: DE:Tag:leisure=beach resort
     leisure=dog_park: DE:Tag:leisure=dog park
+    leisure=foot_bath: DE:Tag:leisure=foot bath
     leisure=garden: DE:Tag:leisure=garden
     leisure=golf_course: DE:Tag:leisure=golf course
     leisure=ice_rink: DE:Tag:leisure=ice rink
@@ -419,6 +643,7 @@ de:
     leisure=water_park: DE:Tag:leisure=water park
     level_crossing=uncontrolled: DE:Tag:level crossing=uncontrolled
     man_made=adit: DE:Tag:man made=adit
+    man_made=breakwater: DE:Tag:man made=breakwater
     man_made=bunker_silo: DE:Tag:man made=bunker silo
     man_made=communications_tower: DE:Tag:man made=communications tower
     man_made=crane: DE:Tag:man made=crane
@@ -430,28 +655,43 @@ de:
     man_made=lighthouse: DE:Tag:man made=lighthouse
     man_made=mast: DE:Tag:man made=mast
     man_made=mineshaft: DE:Tag:man made=mineshaft
+    man_made=offshore_platform: DE:Tag:man made=offshore platform
+    man_made=petroleum_well: DE:Tag:man made=petroleum well
     man_made=pier: DE:Tag:man made=pier
     man_made=pipeline: DE:Tag:man made=pipeline
+    man_made=power_wind: DE:Tag:man made=power wind
     man_made=reservoir_covered: DE:Tag:man made=reservoir covered
+    man_made=silo: DE:Tag:man made=silo
+    man_made=storage_tank: DE:Tag:man made=storage tank
     man_made=surveillance: DE:Tag:man made=surveillance
     man_made=survey_point: DE:Tag:man made=survey point
     man_made=tower: DE:Tag:man made=tower
     man_made=wastewater_plant: DE:Tag:man made=wastewater plant
     man_made=water_tower: DE:Tag:man made=water tower
+    man_made=water_well: DE:Tag:man made=water well
     man_made=water_works: DE:Tag:man made=water works
     man_made=watermill: DE:Tag:man made=watermill
     man_made=windmill: DE:Tag:man made=windmill
+    man_made=works: DE:Tag:man made=works
     microbrewery=yes: DE:Tag:microbrewery=yes
     military=bunker: DE:Tag:military=bunker
     natural=arete: DE:Tag:natural=arete
     natural=bare_rock: DE:Tag:natural=bare rock
     natural=bay: DE:Tag:natural=bay
     natural=beach: DE:Tag:natural=beach
+    natural=cave_entrance: DE:Tag:natural=cave entrance
     natural=cliff: DE:Tag:natural=cliff
+    natural=coastline: DE:Tag:natural=coastline
+    natural=fell: DE:Tag:natural=fell
     natural=glacier: DE:Tag:natural=glacier
     natural=grassland: DE:Tag:natural=grassland
     natural=heath: DE:Tag:natural=heath
+    natural=moor: DE:Tag:natural=moor
+    natural=mud: DE:Tag:natural=mud
+    natural=peak: DE:Tag:natural=peak
+    natural=reef: DE:Tag:natural=reef
     natural=ridge: DE:Tag:natural=ridge
+    natural=saddle: DE:Tag:natural=saddle
     natural=scree: DE:Tag:natural=scree
     natural=scrub: DE:Tag:natural=scrub
     natural=sinkhole: DE:Tag:natural=sinkhole
@@ -465,7 +705,9 @@ de:
     natural=wood: DE:Tag:natural=wood
     office=lawyer: DE:Tag:office=lawyer
     office=political_party: DE:Tag:office=political party
+    parking:lane:hgv=on_street: DE:Tag:parking:lane:hgv=on street
     pipeline=marker: DE:Tag:pipeline=marker
+    pipeline=valve: DE:Tag:pipeline=valve
     place=archipelago: DE:Tag:place=archipelago
     place=city: DE:Tag:place=city
     place=hamlet: DE:Tag:place=hamlet
@@ -481,16 +723,19 @@ de:
     power=generator: DE:Tag:power=generator
     power=line: DE:Tag:power=line
     power=minor_line: DE:Tag:power=minor line
+    power=plant: DE:Tag:power=plant
     power=pole: DE:Tag:power=pole
     power=station: DE:Tag:power=station
     power=sub_station: DE:Tag:power=sub station
     power=substation: DE:Tag:power=substation
     power=tower: DE:Tag:power=tower
+    power=transformer: DE:Tag:power=transformer
     public_transport=platform: DE:Tag:public transport=platform
     public_transport=stop_area: DE:Tag:public transport=stop area
     public_transport=stop_position: DE:Tag:public transport=stop position
     railway=abandoned: DE:Tag:railway=abandoned
     railway=crossing: DE:Tag:railway=crossing
+    railway=derail: DE:Tag:railway=derail
     railway=disused: DE:Tag:railway=disused
     railway=halt: DE:Tag:railway=halt
     railway=level_crossing: DE:Tag:railway=level crossing
@@ -586,85 +831,145 @@ de:
     waterway=riverbank: DE:Tag:waterway=riverbank
     waterway=stream: DE:Tag:waterway=stream
     waterway=weir: DE:Tag:waterway=weir
+el:
+  key:
+    building:levels: El:Key:building:levels
+    height: El:Key:height
 en:
   key:
     3dr:type: Key:3dr:type
     AND_nosr_r: Key:AND nosr r
     CEMT: Key:CEMT
     DGPS_correction: Key:DGPS correction
+    FIXME: Key:FIXME
+    Fetish: Key:Fetish
+    IBGE:GEOCODIGO: Key:IBGE:GEOCODIGO
     IBGE:tipo: Key:IBGE:tipo
+    Lock_ref: Key:Lock ref
     NHS: Key:NHS
+    PMSA_ref: Key:PMSA ref
     RLIS:bicycle: Key:RLIS:bicycle
     RLIS:reviewed: Key:RLIS:reviewed
+    Shop: Key:Shop
+    TMC: Key:TMC
     TMC:Direction: Key:TMC:Direction
     TMC:LocationCode: Key:TMC:LocationCode
     TMC:NextLocationCode: Key:TMC:NextLocationCode
     TMC:PrevLocationCode: Key:TMC:PrevLocationCode
+    TODO: Key:TODO
+    Touring: Key:Touring
+    URL: Key:URL
+    WLAN: Key:WLAN
+    Wikipedia: Key:Wikipedia
     abandoned: Key:abandoned
     abutters: Key:abutters
     access: Key:access
+    access:lanes: Key:access:lanes
     access:lhv: Key:access:lhv
     access:roadtrain: Key:access:roadtrain
     access:roadtrain:trailers: Key:access:roadtrain:trailers
     addr: Key:addr
+    addr:alternatenumber: Key:addr:alternatenumber
+    addr:borough: Key:addr:borough
+    addr:city: Key:addr:city
     addr:conscriptionnumber: Key:addr:conscriptionnumber
+    addr:country: Key:addr:country
+    addr:district: Key:addr:district
+    addr:door: Key:addr:door
     addr:flats: Key:addr:flats
+    addr:floor: Key:addr:floor
+    addr:full: Key:addr:full
+    addr:hamlet: Key:addr:hamlet
+    addr:housename: Key:addr:housename
+    addr:housenumber: Key:addr:housenumber
+    addr:interpolation: Key:addr:interpolation
     addr:place: Key:addr:place
+    addr:postcode: Key:addr:postcode
+    addr:province: Key:addr:province
     addr:provisionalnumber: Key:addr:provisionalnumber
+    addr:state: Key:addr:state
+    addr:street: Key:addr:street
     addr:streetnumber: Key:addr:streetnumber
+    addr:subdistrict: Key:addr:subdistrict
     addr:suburb: Key:addr:suburb
+    addr:unit: Key:addr:unit
+    admin_level: Key:admin level
     adr_les: Key:adr les
+    advertising: Key:advertising
     aerialway: Key:aerialway
     aeroway: Key:aeroway
+    agricultural: Key:agricultural
     airmark: Key:airmark
+    alt_name: Key:alt name
     amenity: Key:amenity
     architect: Key:architect
     area: Key:area
     artwork_type: Key:artwork type
     ascent: Key:ascent
     asset_ref: Key:asset ref
+    attribution: Key:attribution
     atv: Key:atv
     automatic_door: Key:automatic door
     backrest: Key:backrest
+    backward: Key:backward
     bar: Key:bar
     barrier: Key:barrier
     barrier:personnel: Key:barrier:personnel
     basin: Key:basin
+    bdouble: Key:bdouble
     beacon: Key:beacon
+    beacon:colour: Key:beacon:colour
+    beacon:function: Key:beacon:function
     beds: Key:beds
     bench: Key:bench
     bicycle: Key:bicycle
     bicycle_parking: Key:bicycle parking
     bicycle_road: Key:bicycle road
     bin: Key:bin
+    biosphärenwirt: Key:biosphärenwirt
     board_type: Key:board type
     boat: Key:boat
     bollard: Key:bollard
     books: Key:books
     border_type: Key:border type
+    bottom:material: Key:bottom:material
     boundary: Key:boundary
+    boundary_type: Key:boundary type
     brand: Key:brand
     brewery: Key:brewery
     bridge: Key:bridge
+    bridge:movable: Key:bridge:movable
+    bridge:structure: Key:bridge:structure
+    bridge:support: Key:bridge:support
     building: Key:building
     building:condition: Key:building:condition
     building:cullis:height: Key:building:cullis:height
     building:fireproof: Key:building:fireproof
+    building:flats: Key:building:flats
+    building:height: Key:building:height
     building:levels: Key:building:levels
     building:levels:underground: Key:building:levels:underground
     building:material: Key:building:material
     building:min_level: Key:building:min level
     building:obm: Key:building:obm
     building:part: Key:building:part
+    building:parts: Key:building:parts
+    building:type: Key:building:type
     bunker_type: Key:bunker type
-    buoy: Key:buoy
+    bus: Key:bus
     busway: Key:busway
     button_operated: Key:button operated
     cables: Key:cables
     capacity: Key:capacity
+    capacity:disabled: Key:capacity:disabled
+    capital: Key:capital
+    carriage: Key:carriage
     carriageway_ref: Key:carriageway ref
     castle_type: Key:castle type
+    castle_type:cs: Key:castle type:cs
     castle_type:de: Key:castle type:de
+    cemt: Key:cemt
+    center_turn_lane: Key:center turn lane
     centralkey: Key:centralkey
     centre_turn_lane: Key:centre turn lane
     cep: Key:cep
@@ -672,16 +977,28 @@ en:
     checkpoint: Key:checkpoint
     circuits: Key:circuits
     circumference: Key:circumference
+    clli: Key:clli
     clothes: Key:clothes
     club: Key:club
+    club-mate: Key:club-mate
     coastline:survey_quality: Key:coastline:survey quality
     collection_times: Key:collection times
+    color: Key:color
     colour: Key:colour
     comment: Key:comment
     common_good_land: Key:common good land
+    conditional: Key:conditional
     construction: Key:construction
     construction_end_expected: Key:construction end expected
     contact: Key:contact
+    contact:email: Key:contact:email
+    contact:facebook: Key:contact:facebook
+    contact:fax: Key:contact:fax
+    contact:phone: Key:contact:phone
+    contact:twitter: Key:contact:twitter
+    contact:vhf: Key:contact:vhf
+    contact:webcam: Key:contact:webcam
+    contact:website: Key:contact:website
     content: Key:content
     conveying: Key:conveying
     country: Key:country
@@ -693,11 +1010,24 @@ en:
     cuisine: Key:cuisine
     cultivation_method: Key:cultivation method
     currency: Key:currency
+    currency:BTC: Key:currency:BTC
+    currency:CAD: Key:currency:CAD
+    currency:EUR: Key:currency:EUR
+    currency:GBP: Key:currency:GBP
+    currency:PLN: Key:currency:PLN
+    currency:USD: Key:currency:USD
+    currency:XXX: Key:currency:XXX
+    currency:others: Key:currency:others
     cutting: Key:cutting
     cyclability: Key:cyclability
+    cycle: Key:cycle
+    cycle_network: Key:cycle network
     cyclestreets_id: Key:cyclestreets id
     cycleway: Key:cycleway
+    cycleway:both: Key:cycleway:both
     cycleway:buffer: Key:cycleway:buffer
+    cycleway:left: Key:cycleway:left
+    cycleway:right: Key:cycleway:right
     de:amtlicher_gemeindeschluessel: Key:de:amtlicher gemeindeschluessel
     de:regionalschluessel: Key:de:regionalschluessel
     deanery: Key:deanery
@@ -705,25 +1035,56 @@ en:
     denomination: Key:denomination
     denotation: Key:denotation
     depth: Key:depth
+    depth:clearance: Key:depth:clearance
+    depth:dangerous: Key:depth:dangerous
+    depth:dredged: Key:depth:dredged
+    depth:dredged:year: Key:depth:dredged:year
+    depth:source_quality: Key:depth:source quality
+    depth:source_quality:reportyear: Key:depth:source quality:reportyear
+    depth:swept: Key:depth:swept
+    depth:verified: Key:depth:verified
     descent: Key:descent
     description: Key:description
     description:restrictions: Key:description:restrictions
+    descriptions:restrictions: Key:descriptions:restrictions
     designation: Key:designation
     destination: Key:destination
+    destination:backward: Key:destination:backward
+    destination:forward: Key:destination:forward
+    destination:lanes: Key:destination:lanes
+    destination:lanes:backward: Key:destination:lanes:backward
+    destination:lanes:forward: Key:destination:lanes:forward
     diaper: Key:diaper
     diet: Key:diet
+    diet:*: Key:diet:*
+    diet:gluten_free: Key:diet:gluten free
+    diet:lactose_free: Key:diet:lactose free
+    diet:vegan: Key:diet:vegan
+    diet:vegetarian: Key:diet:vegetarian
     diocese: Key:diocese
     direction: Key:direction
     dirtbike:scale: Key:dirtbike:scale
     disabled: Key:disabled
+    disabled_spaces: Key:disabled spaces
     dispensing: Key:dispensing
     distance: Key:distance
     disused: Key:disused
-    door: Key:door
+    disused:amenity: Key:disused:amenity
+    disused:shop: Key:disused:shop
     drink: Key:drink
+    drink:afri-cola: Key:drink:afri-cola
+    drink:club-mate: Key:drink:club-mate
+    drink:kräusen: Key:drink:kräusen
+    drink:raw_milk: Key:drink:raw milk
+    drinkable: Key:drinkable
     drinking_water: Key:drinking water
+    drinking_water:legal: Key:drinking water:legal
+    drive-in: Key:drive-in
+    drive-through: Key:drive-through
+    drive-thru: Key:drive-thru
     drive_in: Key:drive in
     drive_through: Key:drive through
+    drive_thru: Key:drive thru
     driving_side: Key:driving side
     duration: Key:duration
     easy_overtaking: Key:easy overtaking
@@ -737,11 +1098,14 @@ en:
     entrance: Key:entrance
     escalator: Key:escalator
     esperanto: Key:esperanto
+    est_width: Key:est width
     european_cultural_path: Key:european cultural path
     exit: Key:exit
     exit_to: Key:exit to
     expressway: Key:expressway
+    facebook: Key:facebook
     fair_trade: Key:fair trade
+    fax: Key:fax
     fee: Key:fee
     female: Key:female
     fence_type: Key:fence type
@@ -752,17 +1116,46 @@ en:
     fixme: Key:fixme
     flood_prone: Key:flood prone
     floor:material: Key:floor:material
-    fog_signal: Key:fog signal
     foot: Key:foot
     footway: Key:footway
     ford: Key:ford
+    forestry: Key:forestry
     fork: Key:fork
     format: Key:format
+    forward: Key:forward
     frequency: Key:frequency
     fruit: Key:fruit
     fuel: Key:fuel
+    fuel:1_25: Key:fuel:1 25
+    fuel:1_50: Key:fuel:1 50
+    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
+    fuel:biogas: Key:fuel:biogas
+    fuel:cng: Key:fuel:cng
+    fuel:diesel: Key:fuel:diesel
     fuel:discount: Key:fuel:discount
+    fuel:e10: Key:fuel:e10
+    fuel:e85: Key:fuel:e85
+    fuel:electricity: Key:fuel:electricity
+    fuel:ethanol: Key:fuel:ethanol
+    fuel:lpg: Key:fuel:lpg
+    fuel:methanol: Key:fuel:methanol
+    fuel:octane_100: Key:fuel:octane 100
+    fuel:octane_80: Key:fuel:octane 80
+    fuel:octane_91: Key:fuel:octane 91
+    fuel:octane_92: Key:fuel:octane 92
+    fuel:octane_95: Key:fuel:octane 95
+    fuel:octane_98: Key:fuel:octane 98
+    fuel:svo: Key:fuel:svo
     furniture: Key:furniture
+    further: Key:further
+    further:access: Key:further:access
+    further:vehicle: Key:further:vehicle
     gambling: Key:gambling
     gauge: Key:gauge
     generator:method: Key:generator:method
@@ -777,10 +1170,15 @@ en:
     genus: Key:genus
     geocodigo: Key:geocodigo
     geological: Key:geological
+    gluten_free: Key:gluten free
     gnis:feature_id: Key:gnis:feature id
+    gnis:id: Key:gnis:id
     golf: Key:golf
+    goods: Key:goods
+    grassland: Key:grassland
     group_only: Key:group only
     guidepost: Key:guidepost
+    gvr:code: Key:gvr:code
     habitat: Key:habitat
     handrail: Key:handrail
     harbour: Key:harbour
@@ -789,21 +1187,30 @@ en:
     harbour:category: Key:harbour:category
     harbour:main: Key:harbour:main
     hazard_intensity: Key:hazard intensity
+    hazard_occurence: Key:hazard occurence
     hazard_occurrence: Key:hazard occurrence
     hazard_prone: Key:hazard prone
     hazard_return_period: Key:hazard return period
     hazard_type: Key:hazard type
     hazmat: Key:hazmat
+    hazmat:water: Key:hazmat:water
     healthcare: Key:healthcare
     height: Key:height
+    hgv: Key:hgv
     highway: Key:highway
     hiking: Key:hiking
     historic: Key:historic
     historic:civilization: Key:historic:civilization
+    historic:era: Key:historic:era
+    historic:period: Key:historic:period
+    historic_Garrigues: Key:historic Garrigues
     history: Key:history
     horse: Key:horse
+    hour_off: Key:hour off
+    hour_on: Key:hour on
     hov: Key:hov
     iata: Key:iata
+    icao: Key:icao
     ice_road: Key:ice road
     image: Key:image
     importance: Key:importance
@@ -812,9 +1219,25 @@ en:
     information: Key:information
     inline_skates: Key:inline skates
     inscription: Key:inscription
+    int_name: Key:int name
     intermittent: Key:intermittent
+    internet: Key:internet
     internet_access: Key:internet access
+    is_hazard_prone: Key:is hazard prone
     is_in: Key:is in
+    is_in:archipelago: Key:is in:archipelago
+    is_in:city: Key:is in:city
+    is_in:community_committee: Key:is in:community committee
+    is_in:continent: Key:is in:continent
+    is_in:country: Key:is in:country
+    is_in:country_code: Key:is in:country code
+    is_in:island: Key:is in:island
+    is_in:municipality: Key:is in:municipality
+    is_in:ocean: Key:is in:ocean
+    is_in:province: Key:is in:province
+    is_in:sea: Key:is in:sea
+    is_in:state: Key:is in:state
+    is_in:ward: Key:is in:ward
     jel: Key:jel
     junction: Key:junction
     junction_number: Key:junction number
@@ -830,23 +1253,33 @@ en:
     kms:street_no: Key:kms:street no
     kms:zip_code: Key:kms:zip code
     kms:zip_name: Key:kms:zip name
+    kms:zip_no: Key:kms:zip no
     kp: Key:kp
     label: Key:label
+    lactose_free: Key:lactose free
     landmark: Key:landmark
     landuse: Key:landuse
     lane_hint: Key:lane hint
     lanes: Key:lanes
+    lanes:bus: Key:lanes:bus
     lanes:psv: Key:lanes:psv
+    lanes:psv:backward: Key:lanes:psv:backward
+    lanes:psv:forward: Key:lanes:psv:forward
     layer: Key:layer
     lcn_ref: Key:lcn ref
+    leaf_cycle: Key:leaf cycle
+    leaf_type: Key:leaf type
+    left: Key:left
     leisure: Key:leisure
     length: Key:length
     level: Key:level
-    light: Key:light
+    lighting:perceived: Key:lighting:perceived
     lines: Key:lines
     listed_status: Key:listed status
     lit: Key:lit
     lit:perceived: Key:lit:perceived
+    loc_name: Key:loc name
+    loc_ref: Key:loc ref
     local_ref: Key:local ref
     location: Key:location
     lock: Key:lock
@@ -861,15 +1294,14 @@ en:
     material: Key:material
     max_age: Key:max age
     maxage: Key:maxage
-    maxairdraft: Key:maxairdraft
     maxaxleload: Key:maxaxleload
-    maxdraught: Key:maxdraught
     maxheight: Key:maxheight
     maxheight:legal: Key:maxheight:legal
-    maxheight:marine: Key:maxheight:marine
     maxheight:physical: Key:maxheight:physical
     maxlength: Key:maxlength
     maxspeed: Key:maxspeed
+    maxspeed:conditional: Key:maxspeed:conditional
+    maxspeed:source: Key:maxspeed:source
     maxspeed:type: Key:maxspeed:type
     maxstay: Key:maxstay
     maxweight: Key:maxweight
@@ -879,28 +1311,59 @@ en:
     min_height: Key:min height
     minage: Key:minage
     minspeed: Key:minspeed
+    minspeed:lanes: Key:minspeed:lanes
     mofa: Key:mofa
     monitoring:air_quality: Key:monitoring:air quality
     monitoring:galileo: Key:monitoring:galileo
     monitoring:glonass: Key:monitoring:glonass
     monitoring:gps: Key:monitoring:gps
     monitoring:noise: Key:monitoring:noise
+    monitoring:river_level: Key:monitoring:river level
+    monitoring:river_levels: Key:monitoring:river levels
     monitoring:seismic_activity: Key:monitoring:seismic activity
     monitoring:tide_gauge: Key:monitoring:tide gauge
     monitoring:water_level: Key:monitoring:water level
     monitoring:weather: Key:monitoring:weather
     mooring: Key:mooring
+    moped: Key:moped
+    motor_vehicle: Key:motor vehicle
     motorboat: Key:motorboat
     motorcar: Key:motorcar
     motorcycle: Key:motorcycle
     motorroad: Key:motorroad
     motorway: Key:motorway
     mountain_pass: Key:mountain pass
+    mtb: Key:mtb
     mtb:description: Key:mtb:description
     mtb:scale: Key:mtb:scale
+    mtb:scale:imba: Key:mtb:scale:imba
+    mtb:scale:uphill: Key:mtb:scale:uphill
+    mtb_scale: Key:mtb scale
     name: Key:name
+    name:cs: Key:name:cs
     name:cy: Key:name:cy
+    name:de: Key:name:de
+    name:en: Key:name:en
+    name:es: Key:name:es
+    name:fi: Key:name:fi
+    name:fr: Key:name:fr
+    name:ga: Key:name:ga
+    name:gd: Key:name:gd
+    name:it: Key:name:it
+    name:ja: Key:name:ja
+    name:ko: Key:name:ko
+    name:ko_rm: Key:name:ko rm
+    name:nl: Key:name:nl
+    name:nn: Key:name:nn
+    name:no: Key:name:no
+    name:pl: Key:name:pl
+    name:pt: Key:name:pt
+    name:ru: Key:name:ru
+    name:sv: Key:name:sv
+    name:uk: Key:name:uk
     narrow: Key:narrow
+    nat_name: Key:nat name
+    nat_ref: Key:nat ref
     natural: Key:natural
     navibot:categorize: Key:navibot:categorize
     navibot:connect: Key:navibot:connect
@@ -913,12 +1376,21 @@ en:
     not_served_by: Key:not served by
     note: Key:note
     note:deplacer4mE: Key:note:deplacer4mE
+    note:depth: Key:note:depth
+    note:en: Key:note:en
+    note:ja: Key:note:ja
+    note:pilotage: Key:note:pilotage
     notes: Key:notes
     office: Key:office
+    official_name: Key:official name
     offshore: Key:offshore
     ois:fixme: Key:ois:fixme
+    old_name: Key:old name
+    old_ref: Key:old ref
     old_ref_legislative: Key:old ref legislative
     oneway: Key:oneway
+    oneway:bicycle: Key:oneway:bicycle
+    oneway:moped: Key:oneway:moped
     opening_date: Key:opening date
     opening_hours: Key:opening hours
     openplaques:id: Key:openplaques:id
@@ -940,20 +1412,46 @@ en:
     osmarender:renderRef: Key:osmarender:renderRef
     osmc:symbol: Key:osmc:symbol
     overtaking: Key:overtaking
+    overtaking:hgv: Key:overtaking:hgv
     owner: Key:owner
     ownership: Key:ownership
     parking: Key:parking
+    parking:condition: Key:parking:condition
+    parking:condition:both: Key:parking:condition:both
+    parking:condition:left: Key:parking:condition:left
+    parking:condition:right: Key:parking:condition:right
+    parking:condition:right:time_interval: Key:parking:condition:right:time interval
+    parking:condition:side: Key:parking:condition:side
     parking:lane: Key:parking:lane
+    parking:lane:both: Key:parking:lane:both
+    parking:lane:left: Key:parking:lane:left
+    parking:lane:right: Key:parking:lane:right
+    parking:lane:side: Key:parking:lane:side
+    passenger: Key:passenger
     passing_places: Key:passing places
+    paved: Key:paved
     paved:date: Key:paved:date
     payment: Key:payment
+    payment:account_cards: Key:payment:account cards
+    payment:cash: Key:payment:cash
+    payment:coins: Key:payment:coins
+    payment:credit_cards: Key:payment:credit cards
+    payment:electronic_purses: Key:payment:electronic purses
+    payment:foo: Key:payment:foo
+    payment:none: Key:payment:none
+    payment:notes: Key:payment:notes
+    payment:u-key: Key:payment:u-key
     phoenixbikeguide: Key:phoenixbikeguide
     phone: Key:phone
+    photo: Key:photo
+    photograph: Key:photograph
+    picture: Key:picture
     pilotage: Key:pilotage
     pipeline: Key:pipeline
     piste:difficulty: Key:piste:difficulty
     piste:grooming: Key:piste:grooming
     piste:type: Key:piste:type
+    pitlatrine: Key:pitlatrine
     pk: Key:pk
     place: Key:place
     place:fr: Key:place:fr
@@ -961,6 +1459,14 @@ en:
     placement: Key:placement
     planned: Key:planned
     plant:output: Key:plant:output
+    plant:output:cold_air: Key:plant:output:cold air
+    plant:output:cold_water: Key:plant:output:cold water
+    plant:output:compressed_air: Key:plant:output:compressed air
+    plant:output:electricity: Key:plant:output:electricity
+    plant:output:hot_air: Key:plant:output:hot air
+    plant:output:hot_water: Key:plant:output:hot water
+    plant:output:steam: Key:plant:output:steam
+    plant:output:vacuum: Key:plant:output:vacuum
     plant_community: Key:plant community
     platforms: Key:platforms
     playground: Key:playground
@@ -968,9 +1474,15 @@ en:
     population: Key:population
     post_office:type: Key:post office:type
     postal_code: Key:postal code
+    postcode: Key:postcode
     power: Key:power
     power_output: Key:power output
+    power_rating: Key:power rating
+    power_source: Key:power source
     power_supply: Key:power supply
+    previous: Key:previous
+    previous:access: Key:previous:access
+    previous:vehicle: Key:previous:vehicle
     priority: Key:priority
     priority_road: Key:priority road
     produce: Key:produce
@@ -985,15 +1497,22 @@ en:
     pump: Key:pump
     pyörä_väistää_aina_autoa: Key:pyörä väistää aina autoa
     rack: Key:rack
-    radar_conspicious: Key:radar conspicious
-    radar_reflector: Key:radar reflector
     radar_transponder: Key:radar transponder
-    radar_transponder:signal_group: Key:radar transponder:signal group
+    radar_transponder:sector: Key:radar transponder:sector
+    radar_transponder:signal_period: Key:radar transponder:signal period
     radio_transponder: Key:radio transponder
-    radio_transponder:AIS: Key:radio transponder:AIS
+    radio_transponder:call_sign: Key:radio transponder:call sign
+    radio_transponder:category: Key:radio transponder:category
+    radio_transponder:channel: Key:radio transponder:channel
+    radio_transponder:orientation: Key:radio transponder:orientation
+    radio_transponder:range: Key:radio transponder:range
     radio_transponder:signal_frequency: Key:radio transponder:signal frequency
     railway: Key:railway
     ramp: Key:ramp
+    ramp:bicycle: Key:ramp:bicycle
+    ramp:luggage: Key:ramp:luggage
+    ramp:stroller: Key:ramp:stroller
+    ramp:wheelchair: Key:ramp:wheelchair
     ramsar: Key:ramsar
     rcn_ref: Key:rcn ref
     real_ale: Key:real ale
@@ -1001,6 +1520,7 @@ en:
     recycling_type: Key:recycling type
     reef: Key:reef
     ref: Key:ref
+    ref:CEF: Key:ref:CEF
     ref:ERDF:gdo: Key:ref:ERDF:gdo
     ref:FR:42C: Key:ref:FR:42C
     ref:FR:CEF: Key:ref:FR:CEF
@@ -1011,19 +1531,27 @@ en:
     ref:UAI: Key:ref:UAI
     ref:at:gkz: Key:ref:at:gkz
     ref:at:okz: Key:ref:at:okz
+    ref:bag: Key:ref:bag
     ref:bam.brno.cz: Key:ref:bam.brno.cz
     ref:bufa: Key:ref:bufa
+    ref:color: Key:ref:color
     ref:colour: Key:ref:colour
     ref:isil: Key:ref:isil
     ref:mhs: Key:ref:mhs
     ref:mobil-parken.de: Key:ref:mobil-parken.de
     ref:ortsnetz: Key:ref:ortsnetz
+    ref:ruian: Key:ref:ruian
+    ref:ruian:addr: Key:ref:ruian:addr
+    ref:ruian:building: Key:ref:ruian:building
     ref:sandre: Key:ref:sandre
     ref:taskey: Key:ref:taskey
     ref:vatin: Key:ref:vatin
     ref:vorwahl: Key:ref:vorwahl
     ref:wawa: Key:ref:wawa
+    reference: Key:reference
     reference_point: Key:reference point
+    reg_name: Key:reg name
+    reg_ref: Key:reg ref
     religion: Key:religion
     removed: Key:removed
     repair: Key:repair
@@ -1031,6 +1559,11 @@ en:
     resource: Key:resource
     retreat: Key:retreat
     retroreflecting: Key:retroreflecting
+    right: Key:right
+    river:waterway_distance: Key:river:waterway distance
+    road_marking: Key:road marking
+    roadtrain: Key:roadtrain
+    roof:levels: Key:roof:levels
     roof:material: Key:roof:material
     room: Key:room
     rooms: Key:rooms
@@ -1045,9 +1578,9 @@ en:
     rwn_ref: Key:rwn ref
     sac_scale: Key:sac scale
     sagns_id: Key:sagns id
+    salt: Key:salt
     scenic: Key:scenic
     school: Key:school
-    seabed_surface: Key:seabed surface
     seamark: Key:seamark
     seamark:beacon_isolated_danger:shape: Key:seamark:beacon isolated danger:shape
     seamark:beacon_safe_water:colour: Key:seamark:beacon safe water:colour
@@ -1068,6 +1601,7 @@ en:
     seamark:conspicuity: Key:seamark:conspicuity
     seamark:distance_mark:category: Key:seamark:distance mark:category
     seamark:distance_mark:distance: Key:seamark:distance mark:distance
+    seamark:distance_mark:height_units: Key:seamark:distance mark:height units
     seamark:distance_mark:units: Key:seamark:distance mark:units
     seamark:fixme: Key:seamark:fixme
     seamark:fog_signal: Key:seamark:fog signal
@@ -1120,27 +1654,43 @@ en:
     shade: Key:shade
     shelter: Key:shelter
     shelter_type: Key:shelter type
+    ship: Key:ship
     shop: Key:shop
+    short_name: Key:short name
     side_road: Key:side road
     sidewalk: Key:sidewalk
     sign: Key:sign
-    signal_station: Key:signal station
     site_type: Key:site type
     ski: Key:ski
     ski_tour_difficulty: Key:ski tour difficulty
+    sl_stop_id: Key:sl stop id
+    smokefree: Key:smokefree
+    smoking: Key:smoking
+    smoking:outside: Key:smoking:outside
+    smoking_hours: Key:smoking hours
     smoothness: Key:smoothness
     snowmobile: Key:snowmobile
     snowplowing: Key:snowplowing
     snowplowing:category: Key:snowplowing:category
     social_facility: Key:social facility
+    social_facility:for: Key:social facility:for
     sorting_name: Key:sorting name
     source: Key:source
     source:addr: Key:source:addr
+    source:building: Key:source:building
     source:date: Key:source:date
+    source:en: Key:source:en
+    source:geometry: Key:source:geometry
     source:loc: Key:source:loc
     source:maxspeed: Key:source:maxspeed
+    source:name: Key:source:name
+    source:ref: Key:source:ref
+    source_ref: Key:source ref
     species: Key:species
     speech_output: Key:speech output
+    speech_output:en: Key:speech output:en
+    speech_output:lg: Key:speech output:lg
+    speech_output:pl: Key:speech output:pl
     speisebezirk: Key:speisebezirk
     sport: Key:sport
     stars: Key:stars
@@ -1153,22 +1703,37 @@ en:
     stranded: Key:stranded
     stream: Key:stream
     sub_sea: Key:sub sea
+    subway: Key:subway
+    supervised: Key:supervised
+    support:notinsel: Key:support:notinsel
     surface: Key:surface
     surveillance: Key:surveillance
     surveillance:type: Key:surveillance:type
     surveillance:zone: Key:surveillance:zone
     sustrans_ref: Key:sustrans ref
     symbol: Key:symbol
+    tactile_map: Key:tactile map
     tactile_paving: Key:tactile paving
     takeaway: Key:takeaway
+    tank: Key:tank
+    taxi: Key:taxi
     taxon: Key:taxon
     technology: Key:technology
+    telecom: Key:telecom
     tidal: Key:tidal
     tiger: Key:tiger
+    tiger:cfcc: Key:tiger:cfcc
+    tiger:county: Key:tiger:county
+    tiger:separated: Key:tiger:separated
+    tiger:tlid: Key:tiger:tlid
+    tiger:upload_uuid: Key:tiger:upload uuid
     timezone: Key:timezone
+    todo: Key:todo
+    toilets:type: Key:toilets:type
     toilets:wheelchair: Key:toilets:wheelchair
     toll: Key:toll
     topmark: Key:topmark
+    topmark:colour: Key:topmark:colour
     touring: Key:touring
     tourism: Key:tourism
     tourist_bus: Key:tourist bus
@@ -1185,10 +1750,16 @@ en:
     traffic_signals:sound: Key:traffic signals:sound
     traffic_signals:vibration: Key:traffic signals:vibration
     trail_visibility: Key:trail visibility
+    train: Key:train
+    tram: Key:tram
     trees: Key:trees
     trolley_wire: Key:trolley wire
+    trolleybus: Key:trolleybus
     tunnel: Key:tunnel
     turn: Key:turn
+    turn:lanes: Key:turn:lanes
+    turn:lanes:backward: Key:turn:lanes:backward
+    turn:lanes:forward: Key:turn:lanes:forward
     turning_radius: Key:turning radius
     twitter: Key:twitter
     type: Key:type
@@ -1200,21 +1771,32 @@ en:
     usage: Key:usage
     validate:no_name: Key:validate:no name
     validate:no_ref: Key:validate:no ref
+    vehicle: Key:vehicle
     voltage: Key:voltage
     waste: Key:waste
     water: Key:water
     waterway: Key:waterway
     website: Key:website
+    wetland: Key:wetland
     wheelchair: Key:wheelchair
     wholesale: Key:wholesale
     width: Key:width
     wiki:symbol: Key:wiki:symbol
+    wikidata: Key:wikidata
     wikipedia: Key:wikipedia
+    wikipedia:en: Key:wikipedia:en
     winter_road: Key:winter road
     wires: Key:wires
     woeid: Key:woeid
     wood: Key:wood
+    www.prezzibenzina.it: Key:www.prezzibenzina.it
     xmas:feature: Key:xmas:feature
+    yh:LINE_NAME: Key:yh:LINE NAME
+    yh:LINE_NUM: Key:yh:LINE NUM
+    yh:STRUCTURE: Key:yh:STRUCTURE
+    yh:TOTYUMONO: Key:yh:TOTYUMONO
+    yh:TYPE: Key:yh:TYPE
+    yh:WIDTH_RANK: Key:yh:WIDTH RANK
     zone:maxspeed: Key:zone:maxspeed
     zone:traffic: Key:zone:traffic
     zoo: Key:zoo
@@ -1226,6 +1808,17 @@ en:
     access=license: Tag:access=license
     access=official: Tag:access=official
     access=private: Tag:access=private
+    admin_level=1: Tag:admin level=1
+    admin_level=10: Tag:admin level=10
+    admin_level=11: Tag:admin level=11
+    admin_level=2: Tag:admin level=2
+    admin_level=3: Tag:admin level=3
+    admin_level=4: Tag:admin level=4
+    admin_level=5: Tag:admin level=5
+    admin_level=6: Tag:admin level=6
+    admin_level=7: Tag:admin level=7
+    admin_level=8: Tag:admin level=8
+    admin_level=9: Tag:admin level=9
     admin_level=aboriginal_land: Tag:admin level=aboriginal land
     aerialway=cable_car: Tag:aerialway=cable car
     aerialway=canopy: Tag:aerialway=canopy
@@ -1247,6 +1840,7 @@ en:
     aeroway=gate: Tag:aeroway=gate
     aeroway=hangar: Tag:aeroway=hangar
     aeroway=helipad: Tag:aeroway=helipad
+    aeroway=holding_position: Tag:aeroway=holding position
     aeroway=navigationaid: Tag:aeroway=navigationaid
     aeroway=parking_position: Tag:aeroway=parking position
     aeroway=runway: Tag:aeroway=runway
@@ -1257,6 +1851,7 @@ en:
     ale_supply=limited: Tag:ale supply=limited
     allotments=plot: Tag:allotments=plot
     amenity=Kneippbecken: Tag:amenity=Kneippbecken
+    amenity=administration: Tag:amenity=administration
     amenity=animal_boarding: Tag:amenity=animal boarding
     amenity=animal_breeding: Tag:amenity=animal breeding
     amenity=animal_shelter: Tag:amenity=animal shelter
@@ -1274,6 +1869,7 @@ en:
     amenity=bicycle_trailer_sharing: Tag:amenity=bicycle trailer sharing
     amenity=biergarten: Tag:amenity=biergarten
     amenity=bikeshed: Tag:amenity=bikeshed
+    amenity=boat_sharing: Tag:amenity=boat sharing
     amenity=boat_storage: Tag:amenity=boat storage
     amenity=brothel: Tag:amenity=brothel
     amenity=bureau_de_change: Tag:amenity=bureau de change
@@ -1282,6 +1878,7 @@ en:
     amenity=car_rental: Tag:amenity=car rental
     amenity=car_sharing: Tag:amenity=car sharing
     amenity=car_wash: Tag:amenity=car wash
+    amenity=carwash: Tag:amenity=carwash
     amenity=casino: Tag:amenity=casino
     amenity=charging_station: Tag:amenity=charging station
     amenity=cinema: Tag:amenity=cinema
@@ -1290,27 +1887,34 @@ en:
     amenity=coast_guard: Tag:amenity=coast guard
     amenity=coast_radar_station: Tag:amenity=coast radar station
     amenity=college: Tag:amenity=college
+    amenity=community_center: Tag:amenity=community center
     amenity=community_centre: Tag:amenity=community centre
     amenity=compressed_air: Tag:amenity=compressed air
     amenity=courthouse: Tag:amenity=courthouse
     amenity=coworking_space: Tag:amenity=coworking space
     amenity=crematorium: Tag:amenity=crematorium
+    amenity=crematory: Tag:amenity=crematory
     amenity=crucifix: Tag:amenity=crucifix
     amenity=crypt: Tag:amenity=crypt
     amenity=customs: Tag:amenity=customs
     amenity=dead_pub: Tag:amenity=dead pub
     amenity=dentist: Tag:amenity=dentist
+    amenity=doctor: Tag:amenity=doctor
     amenity=doctors: Tag:amenity=doctors
     amenity=dojo: Tag:amenity=dojo
     amenity=drinking_water: Tag:amenity=drinking water
     amenity=driving_school: Tag:amenity=driving school
     amenity=embassy: Tag:amenity=embassy
+    amenity=emergency_phone: Tag:amenity=emergency phone
     amenity=ev_charging: Tag:amenity=ev charging
     amenity=fast_food: Tag:amenity=fast food
+    amenity=feeding_place: Tag:amenity=feeding place
     amenity=ferry_terminal: Tag:amenity=ferry terminal
     amenity=festival_grounds: Tag:amenity=festival grounds
     amenity=fire_hydrant: Tag:amenity=fire hydrant
     amenity=fire_station: Tag:amenity=fire station
+    amenity=firstaid: Tag:amenity=firstaid
+    amenity=fitness_station: Tag:amenity=fitness station
     amenity=food_court: Tag:amenity=food court
     amenity=fountain: Tag:amenity=fountain
     amenity=fuel: Tag:amenity=fuel
@@ -1318,12 +1922,16 @@ en:
     amenity=game_feeding: Tag:amenity=game feeding
     amenity=grave_yard: Tag:amenity=grave yard
     amenity=grit_bin: Tag:amenity=grit bin
+    amenity=gym: Tag:amenity=gym
+    amenity=gym_(Don't_use): Tag:amenity=gym (Don't use)
     amenity=harbourmaster: Tag:amenity=harbourmaster
     amenity=hospital: Tag:amenity=hospital
     amenity=hunting_stand: Tag:amenity=hunting stand
     amenity=ice_cream: Tag:amenity=ice cream
+    amenity=jail: Tag:amenity=jail
     amenity=jobcentre: Tag:amenity=jobcentre
     amenity=kindergarten: Tag:amenity=kindergarten
+    amenity=kiosk: Tag:amenity=kiosk
     amenity=kneipp_water_cure: Tag:amenity=kneipp water cure
     amenity=library: Tag:amenity=library
     amenity=life_ring: Tag:amenity=life ring
@@ -1339,6 +1947,7 @@ en:
     amenity=parking: Tag:amenity=parking
     amenity=parking_entrance: Tag:amenity=parking entrance
     amenity=parking_space: Tag:amenity=parking space
+    amenity=parkink: Tag:amenity=parkink
     amenity=pharmacy: Tag:amenity=pharmacy
     amenity=photo_booth: Tag:amenity=photo booth
     amenity=place_of_worship: Tag:amenity=place of worship
@@ -1357,10 +1966,13 @@ en:
     amenity=restaurant: Tag:amenity=restaurant
     amenity=retirement_home: Tag:amenity=retirement home
     amenity=sauna: Tag:amenity=sauna
+    amenity=sceptic_tank: Tag:amenity=sceptic tank
     amenity=school: Tag:amenity=school
     amenity=security_booth: Tag:amenity=security booth
+    amenity=septic_tank: Tag:amenity=septic tank
     amenity=shelter: Tag:amenity=shelter
     amenity=shower: Tag:amenity=shower
+    amenity=smoking_area: Tag:amenity=smoking area
     amenity=social_centre: Tag:amenity=social centre
     amenity=social_facility: Tag:amenity=social facility
     amenity=spa: Tag:amenity=spa
@@ -1369,6 +1981,7 @@ en:
     amenity=swimming_pool: Tag:amenity=swimming pool
     amenity=swingerclub: Tag:amenity=swingerclub
     amenity=taxi: Tag:amenity=taxi
+    amenity=taxi_point: Tag:amenity=taxi point
     amenity=telephone: Tag:amenity=telephone
     amenity=theatre: Tag:amenity=theatre
     amenity=toilets: Tag:amenity=toilets
@@ -1382,13 +1995,18 @@ en:
     amenity=water_point: Tag:amenity=water point
     amenity=watering_place: Tag:amenity=watering place
     amenity=weighbridge: Tag:amenity=weighbridge
+    aminety=sceptic_tank: Tag:aminety=sceptic tank
+    atm=no: Tag:atm=no
     atm=yes: Tag:atm=yes
+    attraction=maze: Tag:attraction=maze
+    baby_hatch=yes: Tag:baby hatch=yes
     barrier=block: Tag:barrier=block
     barrier=bollard: Tag:barrier=bollard
     barrier=border_control: Tag:barrier=border control
     barrier=bus_trap: Tag:barrier=bus trap
     barrier=cattle_grid: Tag:barrier=cattle grid
     barrier=chain: Tag:barrier=chain
+    barrier=chicane: Tag:barrier=chicane
     barrier=city_wall: Tag:barrier=city wall
     barrier=cycle_barrier: Tag:barrier=cycle barrier
     barrier=ditch: Tag:barrier=ditch
@@ -1405,6 +2023,7 @@ en:
     barrier=lift_gate: Tag:barrier=lift gate
     barrier=motorcycle_barrier: Tag:barrier=motorcycle barrier
     barrier=ohm:military:wireObstacle: Tag:barrier=ohm:military:wireObstacle
+    barrier=ohm:ww1:wireObstacle: Tag:barrier=ohm:ww1:wireObstacle
     barrier=retaining_wall: Tag:barrier=retaining wall
     barrier=sally_port: Tag:barrier=sally port
     barrier=stile: Tag:barrier=stile
@@ -1413,6 +2032,10 @@ en:
     barrier=toll_booth: Tag:barrier=toll booth
     barrier=turnstile: Tag:barrier=turnstile
     barrier=wall: Tag:barrier=wall
+    bicycle=designated: Tag:bicycle=designated
+    bicycle=official: Tag:bicycle=official
+    bicycle=use_sidepath: Tag:bicycle=use sidepath
+    border_type=IALA: Tag:border type=IALA
     border_type=fishery: Tag:border type=fishery
     border_type=harbour_limits: Tag:border type=harbour limits
     boundary=aboriginal_lands: Tag:boundary=aboriginal lands
@@ -1437,12 +2060,14 @@ en:
     bridge=suspension: Tag:bridge=suspension
     bridge=transporter: Tag:bridge=transporter
     bridge=viaduct: Tag:bridge=viaduct
+    building:use=stable: Tag:building:use=stable
     building=apartments: Tag:building=apartments
     building=barn: Tag:building=barn
     building=bridge: Tag:building=bridge
     building=bunker: Tag:building=bunker
     building=cabin: Tag:building=cabin
     building=cathedral: Tag:building=cathedral
+    building=central_office: Tag:building=central office
     building=chapel: Tag:building=chapel
     building=church: Tag:building=church
     building=civic: Tag:building=civic
@@ -1452,6 +2077,7 @@ en:
     building=detached: Tag:building=detached
     building=dormitory: Tag:building=dormitory
     building=entrance: Tag:building=entrance
+    building=exit: Tag:building=exit
     building=farm: Tag:building=farm
     building=farm_auxiliary: Tag:building=farm auxiliary
     building=garage: Tag:building=garage
@@ -1469,6 +2095,7 @@ en:
     building=mosque: Tag:building=mosque
     building=office: Tag:building=office
     building=public: Tag:building=public
+    building=remote_digital_terminal: Tag:building=remote digital terminal
     building=residential: Tag:building=residential
     building=retail: Tag:building=retail
     building=roof: Tag:building=roof
@@ -1520,6 +2147,7 @@ en:
     craft=metal_construction: Tag:craft=metal construction
     craft=optician: Tag:craft=optician
     craft=painter: Tag:craft=painter
+    craft=paperhanger: Tag:craft=paperhanger
     craft=parquet_layer: Tag:craft=parquet layer
     craft=photographer: Tag:craft=photographer
     craft=photographic_laboratory: Tag:craft=photographic laboratory
@@ -1545,6 +2173,7 @@ en:
     craft=watchmaker: Tag:craft=watchmaker
     craft=window_construction: Tag:craft=window construction
     crop=asparagus: Tag:crop=asparagus
+    crop=aspargus: Tag:crop=aspargus
     crop=bananas: Tag:crop=bananas
     crop=barley: Tag:crop=barley
     crop=coffee: Tag:crop=coffee
@@ -1553,6 +2182,7 @@ en:
     crop=grape: Tag:crop=grape
     crop=grass: Tag:crop=grass
     crop=hay: Tag:crop=hay
+    crop=hop: Tag:crop=hop
     crop=maize: Tag:crop=maize
     crop=oats: Tag:crop=oats
     crop=rape: Tag:crop=rape
@@ -1563,16 +2193,33 @@ en:
     crop=tea: Tag:crop=tea
     crop=wheat: Tag:crop=wheat
     cuisine=brazilian: Tag:cuisine=brazilian
+    cuisine=brunch: Tag:cuisine=brunch
     cuisine=coffee_shop: Tag:cuisine=coffee shop
+    cycle_network=US:CA:SF: Tag:cycle network=US:CA:SF
+    cycle_network=US:NM: Tag:cycle network=US:NM
+    cycle_network=US:OH: Tag:cycle network=US:OH
+    cycle_network=US:PA: Tag:cycle network=US:PA
+    cycle_network=US:US: Tag:cycle network=US:US
     cycleway=asl: Tag:cycleway=asl
     cycleway=bike_box: Tag:cycleway=bike box
+    cycleway=crossing: Tag:cycleway=crossing
+    cycleway=opposite_share_busway: Tag:cycleway=opposite share busway
+    cycleway=opposite_shared_busway: Tag:cycleway=opposite shared busway
     cycleway=share_busway: Tag:cycleway=share busway
+    cycleway=shared_busway: Tag:cycleway=shared busway
     denomination=mormon: Tag:denomination=mormon
     denomination=reformed: Tag:denomination=reformed
     denotation=landmark: Tag:denotation=landmark
+    dock=drydock: Tag:dock=drydock
+    dock=floating: Tag:dock=floating
+    dock=tidal: Tag:dock=tidal
+    emergency=access_point: Tag:emergency=access point
+    emergency=aed: Tag:emergency=aed
     emergency=ambulance_station: Tag:emergency=ambulance station
+    emergency=assembly_point: Tag:emergency=assembly point
     emergency=coast_guard: Tag:emergency=coast guard
     emergency=defibrillator: Tag:emergency=defibrillator
+    emergency=emergency_ward_entrance: Tag:emergency=emergency ward entrance
     emergency=fire_detection_system: Tag:emergency=fire detection system
     emergency=fire_extinguisher: Tag:emergency=fire extinguisher
     emergency=fire_flapper: Tag:emergency=fire flapper
@@ -1581,10 +2228,12 @@ en:
     emergency=fire_water_pond: Tag:emergency=fire water pond
     emergency=life_ring: Tag:emergency=life ring
     emergency=lifeboat_station: Tag:emergency=lifeboat station
+    emergency=lifeguard_tower: Tag:emergency=lifeguard tower
     emergency=marine_refuge: Tag:emergency=marine refuge
     emergency=phone: Tag:emergency=phone
     emergency=ses_station: Tag:emergency=ses station
     emergency=siren: Tag:emergency=siren
+    emergency=slipway: Tag:emergency=slipway
     emergency=suction_point: Tag:emergency=suction point
     emergency=water_rescue_station: Tag:emergency=water rescue station
     emergency=water_tank: Tag:emergency=water tank
@@ -1592,18 +2241,41 @@ en:
     esperanto=esperanto: Tag:esperanto=esperanto
     estuary=yes: Tag:estuary=yes
     fast_food=cafeteria: Tag:fast food=cafeteria
+    foot=designated: Tag:foot=designated
+    foot=official: Tag:foot=official
     footway=crossing: Tag:footway=crossing
     footway=sidewalk: Tag:footway=sidewalk
+    generator:method=barrage: Tag:generator:method=barrage
     generator:method=fission: Tag:generator:method=fission
     generator:method=fusion: Tag:generator:method=fusion
+    generator:method=run-of-the-river: Tag:generator:method=run-of-the-river
+    generator:method=thermal: Tag:generator:method=thermal
+    generator:method=water-pumped-storage: Tag:generator:method=water-pumped-storage
+    generator:method=water-storage: Tag:generator:method=water-storage
     generator:plant=intermediate: Tag:generator:plant=intermediate
     generator:plant=output: Tag:generator:plant=output
+    generator:source=gas: Tag:generator:source=gas
+    generator:source=geothermal: Tag:generator:source=geothermal
     generator:source=hydro: Tag:generator:source=hydro
     generator:source=nuclear: Tag:generator:source=nuclear
     generator:source=solar: Tag:generator:source=solar
+    generator:source=tidal: Tag:generator:source=tidal
+    generator:source=wave: Tag:generator:source=wave
     generator:source=wind: Tag:generator:source=wind
+    generator:type=francis_turbine: Tag:generator:type=francis turbine
+    generator:type=gas_turbine: Tag:generator:type=gas turbine
+    generator:type=horizontal_axis: Tag:generator:type=horizontal axis
+    generator:type=hydrodynamic_screw: Tag:generator:type=hydrodynamic screw
+    generator:type=kaplan_turbine: Tag:generator:type=kaplan turbine
+    generator:type=pelton_turbine: Tag:generator:type=pelton turbine
+    generator:type=reciprocating_engine: Tag:generator:type=reciprocating engine
+    generator:type=solar_thermal_collector: Tag:generator:type=solar thermal collector
+    generator:type=steam_turbine: Tag:generator:type=steam turbine
+    generator:type=vertical_axis: Tag:generator:type=vertical axis
+    geological=moraine: Tag:geological=moraine
     geological=outcrop: Tag:geological=outcrop
     geological=palaeontological_site: Tag:geological=palaeontological site
+    grit_bin: Tag:grit bin
     harbour:category=RoRo: Tag:harbour:category=RoRo
     harbour:category=bulk: Tag:harbour:category=bulk
     harbour:category=container: Tag:harbour:category=container
@@ -1624,16 +2296,22 @@ en:
     harbour=drinking_water: Tag:harbour=drinking water
     harbour=harbour_master: Tag:harbour=harbour master
     harbour=jetty: Tag:harbour=jetty
+    harbour=marina: Tag:harbour=marina
     harbour=slipway: Tag:harbour=slipway
     harbour=yes: Tag:harbour=yes
     hazard_prone=yes: Tag:hazard prone=yes
     hazard_type=avalanche: Tag:hazard type=avalanche
     hazard_type=flood: Tag:hazard type=flood
     hazard_type=landslide: Tag:hazard type=landslide
+    hazmat:water=permissive: Tag:hazmat:water=permissive
+    highway=Bus_guideway: Tag:highway=Bus guideway
+    highway=bazaar: Tag:highway=bazaar
     highway=bridleway: Tag:highway=bridleway
     highway=bus_guideway: Tag:highway=bus guideway
     highway=bus_stop: Tag:highway=bus stop
     highway=byway: Tag:highway=byway
+    highway=cattle_grid: Tag:highway=cattle grid
+    highway=corridor: Tag:highway=corridor
     highway=crossing: Tag:highway=crossing
     highway=cycleway: Tag:highway=cycleway
     highway=elevator: Tag:highway=elevator
@@ -1641,6 +2319,7 @@ en:
     highway=escape: Tag:highway=escape
     highway=footway: Tag:highway=footway
     highway=ford: Tag:highway=ford
+    highway=gate: Tag:highway=gate
     highway=give_way: Tag:highway=give way
     highway=incline: Tag:highway=incline
     highway=lane: Tag:highway=lane
@@ -1651,6 +2330,7 @@ en:
     highway=motorway_junction: Tag:highway=motorway junction
     highway=motorway_link: Tag:highway=motorway link
     highway=ohm:military:Trench: Tag:highway=ohm:military:Trench
+    highway=ohm:ww1:militaryTrench: Tag:highway=ohm:ww1:militaryTrench
     highway=passing_place: Tag:highway=passing place
     highway=path: Tag:highway=path
     highway=pedestrian: Tag:highway=pedestrian
@@ -1666,9 +2346,11 @@ en:
     highway=services: Tag:highway=services
     highway=speed_camera: Tag:highway=speed camera
     highway=steps: Tag:highway=steps
+    highway=stile: Tag:highway=stile
     highway=stop: Tag:highway=stop
     highway=street_lamp: Tag:highway=street lamp
     highway=tertiary: Tag:highway=tertiary
+    highway=toll_booth: Tag:highway=toll booth
     highway=track: Tag:highway=track
     highway=traffic_mirror: Tag:highway=traffic mirror
     highway=traffic_signals: Tag:highway=traffic signals
@@ -1679,14 +2361,18 @@ en:
     highway=unclassified: Tag:highway=unclassified
     highway=unsurfaced: Tag:highway=unsurfaced
     highway=via_ferrata: Tag:highway=via ferrata
+    highway=yield: Tag:highway=yield
     historic=aircraft: Tag:historic=aircraft
     historic=archaeological_site: Tag:historic=archaeological site
+    historic=archaeological_site_Garrigues: Tag:historic=archaeological site Garrigues
     historic=battlefield: Tag:historic=battlefield
     historic=boundary_stone: Tag:historic=boundary stone
     historic=cannon: Tag:historic=cannon
     historic=castle: Tag:historic=castle
     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=fort: Tag:historic=fort
     historic=gallows: Tag:historic=gallows
@@ -1703,10 +2389,12 @@ en:
     historic=rune_stone: Tag:historic=rune stone
     historic=ship: Tag:historic=ship
     historic=stone: Tag:historic=stone
+    historic=tomb: Tag:historic=tomb
     historic=tree_shrine: Tag:historic=tree shrine
     historic=wayside_cross: Tag:historic=wayside cross
     historic=wayside_shrine: Tag:historic=wayside shrine
     historic=wreck: Tag:historic=wreck
+    horse=designated: Tag:horse=designated
     hunting=raised_hide: Tag:hunting=raised hide
     industrial=auto_wrecker: Tag:industrial=auto wrecker
     industrial=well_cluster: Tag:industrial=well cluster
@@ -1714,6 +2402,7 @@ en:
     information=tactile_model: Tag:information=tactile model
     junction=crossing: Tag:junction=crossing
     junction=filter: Tag:junction=filter
+    junction=jughandle: Tag:junction=jughandle
     junction=roundabout: Tag:junction=roundabout
     landform=esker: Tag:landform=esker
     landform=raised_beach: Tag:landform=raised beach
@@ -1723,6 +2412,7 @@ en:
     landmark=chimney: Tag:landmark=chimney
     landmark=cross: Tag:landmark=cross
     landmark=dish_aerial: Tag:landmark=dish aerial
+    landmark=flagpole: Tag:landmark=flagpole
     landmark=flare_stack: Tag:landmark=flare stack
     landmark=large_rock: Tag:landmark=large rock
     landmark=mast: Tag:landmark=mast
@@ -1733,6 +2423,7 @@ en:
     landmark=radar_scanner: Tag:landmark=radar scanner
     landmark=rock_pinnacle: Tag:landmark=rock pinnacle
     landmark=spire: Tag:landmark=spire
+    landmark=statue: Tag:landmark=statue
     landmark=tower: Tag:landmark=tower
     landmark=windmill: Tag:landmark=windmill
     landmark=windmotor: Tag:landmark=windmotor
@@ -1741,21 +2432,27 @@ en:
     landuse=allotments: Tag:landuse=allotments
     landuse=aquaculture: Tag:landuse=aquaculture
     landuse=basin: Tag:landuse=basin
+    landuse=breeding: Tag:landuse=breeding
     landuse=brownfield: Tag:landuse=brownfield
+    landuse=building_site: Tag:landuse=building site
     landuse=cemetery: Tag:landuse=cemetery
     landuse=churchyard: Tag:landuse=churchyard
     landuse=commercial: Tag:landuse=commercial
     landuse=construction: Tag:landuse=construction
     landuse=depot: Tag:landuse=depot
     landuse=farm: Tag:landuse=farm
+    landuse=farmland: Tag:landuse=farmland
     landuse=farmyard: Tag:landuse=farmyard
     landuse=field: Tag:landuse=field
     landuse=fishfarm: Tag:landuse=fishfarm
     landuse=forest: Tag:landuse=forest
     landuse=garages: Tag:landuse=garages
     landuse=grass: Tag:landuse=grass
+    landuse=grave_yard: Tag:landuse=grave yard
     landuse=greenfield: Tag:landuse=greenfield
     landuse=greenhouse_horticulture: Tag:landuse=greenhouse horticulture
+    landuse=highway: Tag:landuse=highway
+    landuse=hop_garden: Tag:landuse=hop garden
     landuse=industrial: Tag:landuse=industrial
     landuse=landfill: Tag:landuse=landfill
     landuse=meadow: Tag:landuse=meadow
@@ -1765,23 +2462,36 @@ en:
     landuse=peat_cutting: Tag:landuse=peat cutting
     landuse=plant_nursery: Tag:landuse=plant nursery
     landuse=plantation: Tag:landuse=plantation
-    landuse=pond: Tag:landuse=pond
     landuse=prison: Tag:landuse=prison
     landuse=quarry: Tag:landuse=quarry
     landuse=railway: Tag:landuse=railway
     landuse=recreation_ground: Tag:landuse=recreation ground
+    landuse=religious: Tag:landuse=religious
     landuse=reservoir: Tag:landuse=reservoir
     landuse=residential: Tag:landuse=residential
     landuse=retail: Tag:landuse=retail
     landuse=salt_pond: Tag:landuse=salt pond
     landuse=street: Tag:landuse=street
     landuse=traffic_island: Tag:landuse=traffic island
+    landuse=trees: Tag:landuse=trees
     landuse=utility: Tag:landuse=utility
     landuse=village_green: Tag:landuse=village green
     landuse=vineyard: Tag:landuse=vineyard
     landuse=well: Tag:landuse=well
     landuse=wellsite: Tag:landuse=wellsite
+    landuse=wood: Tag:landuse=wood
+    landuse=wood_(Don't_use): Tag:landuse=wood (Don't use)
     lane=buffered: Tag:lane=buffered
+    leaf_cycle=deciduous: Tag:leaf cycle=deciduous
+    leaf_cycle=evergreen: Tag:leaf cycle=evergreen
+    leaf_cycle=mixed: Tag:leaf cycle=mixed
+    leaf_cycle=semi_deciduous: Tag:leaf cycle=semi deciduous
+    leaf_cycle=semi_evergreen: Tag:leaf cycle=semi evergreen
+    leaf_type=broadleaved: Tag:leaf type=broadleaved
+    leaf_type=leafless: Tag:leaf type=leafless
+    leaf_type=mixed: Tag:leaf type=mixed
+    leaf_type=needleleaved: Tag:leaf type=needleleaved
+    leisure=Red_Light_District: Tag:leisure=Red Light District
     leisure=adult_gaming_centre: Tag:leisure=adult gaming centre
     leisure=amusement_arcade: Tag:leisure=amusement arcade
     leisure=bathing_place: Tag:leisure=bathing place
@@ -1794,12 +2504,14 @@ en:
     leisure=firepit: Tag:leisure=firepit
     leisure=fishing: Tag:leisure=fishing
     leisure=fitness_station: Tag:leisure=fitness station
+    leisure=foot_bath: Tag:leisure=foot bath
     leisure=garden: Tag:leisure=garden
     leisure=golf_course: Tag:leisure=golf course
     leisure=hackerspace: Tag:leisure=hackerspace
     leisure=ice_rink: Tag:leisure=ice rink
     leisure=landscape_reserve: Tag:leisure=landscape reserve
     leisure=marina: Tag:leisure=marina
+    leisure=maze: Tag:leisure=maze
     leisure=miniature_golf: Tag:leisure=miniature golf
     leisure=nature_reserve: Tag:leisure=nature reserve
     leisure=paddling_pool: Tag:leisure=paddling pool
@@ -1813,6 +2525,7 @@ en:
     leisure=sailing_club: Tag:leisure=sailing club
     leisure=ski_playground: Tag:leisure=ski playground
     leisure=slipway: Tag:leisure=slipway
+    leisure=sport_centre: Tag:leisure=sport centre
     leisure=sports_centre: Tag:leisure=sports centre
     leisure=stadium: Tag:leisure=stadium
     leisure=swimming_pool: Tag:leisure=swimming pool
@@ -1821,7 +2534,10 @@ en:
     leisure=water_park: Tag:leisure=water park
     leisure=wildlife_hide: Tag:leisure=wildlife hide
     level_crossing=uncontrolled: Tag:level crossing=uncontrolled
+    line=bay: Tag:line=bay
+    line=busbar: Tag:line=busbar
     lines=phone: Tag:lines=phone
+    man_made=MDF: Tag:man made=MDF
     man_made=adit: Tag:man made=adit
     man_made=antenna: Tag:man made=antenna
     man_made=archimedes_screw: Tag:man made=archimedes screw
@@ -1830,12 +2546,15 @@ en:
     man_made=bridge: Tag:man made=bridge
     man_made=bunker_silo: Tag:man made=bunker silo
     man_made=cairn: Tag:man made=cairn
+    man_made=campanile: Tag:man made=campanile
     man_made=chimney: Tag:man made=chimney
     man_made=communications_tower: Tag:man made=communications tower
     man_made=compass_rose: Tag:man made=compass rose
     man_made=crane: Tag:man made=crane
     man_made=cross: Tag:man made=cross
     man_made=cutline: Tag:man made=cutline
+    man_made=dike: Tag:man made=dike
+    man_made=dovecote: Tag:man made=dovecote
     man_made=dyke: Tag:man made=dyke
     man_made=embankment: Tag:man made=embankment
     man_made=flagpole: Tag:man made=flagpole
@@ -1847,6 +2566,7 @@ en:
     man_made=groyne: Tag:man made=groyne
     man_made=jetty: Tag:man made=jetty
     man_made=kiln: Tag:man made=kiln
+    man_made=levee: Tag:man made=levee
     man_made=lighthouse: Tag:man made=lighthouse
     man_made=mast: Tag:man made=mast
     man_made=mineshaft: Tag:man made=mineshaft
@@ -1860,12 +2580,14 @@ en:
     man_made=pumping_rig: Tag:man made=pumping rig
     man_made=reservoir_covered: Tag:man made=reservoir covered
     man_made=school_sentry: Tag:man made=school sentry
+    man_made=septic_tank: Tag:man made=septic tank
     man_made=silo: Tag:man made=silo
     man_made=snow_fence: Tag:man made=snow fence
     man_made=storage_tank: Tag:man made=storage tank
     man_made=submarine_cable: Tag:man made=submarine cable
     man_made=surveillance: Tag:man made=surveillance
     man_made=survey_point: Tag:man made=survey point
+    man_made=telescope: Tag:man made=telescope
     man_made=tower: Tag:man made=tower
     man_made=utility_pole: Tag:man made=utility pole
     man_made=wastewater_plant: Tag:man made=wastewater plant
@@ -1879,6 +2601,8 @@ en:
     man_made=windmill: Tag:man made=windmill
     man_made=windpump: Tag:man made=windpump
     man_made=works: Tag:man made=works
+    maritime=yes: Tag:maritime=yes
+    medical=aed: Tag:medical=aed
     medical=witchdoctor: Tag:medical=witchdoctor
     microbrewery=yes: Tag:microbrewery=yes
     military=airfield: Tag:military=airfield
@@ -1912,6 +2636,7 @@ en:
     natural=cape: Tag:natural=cape
     natural=cave_entrance: Tag:natural=cave entrance
     natural=cliff: Tag:natural=cliff
+    natural=cloud: Tag:natural=cloud
     natural=coastline: Tag:natural=coastline
     natural=continental_shelf: Tag:natural=continental shelf
     natural=desert: Tag:natural=desert
@@ -1925,13 +2650,17 @@ en:
     natural=land: Tag:natural=land
     natural=landform: Tag:natural=landform
     natural=lava: Tag:natural=lava
+    natural=marsh: Tag:natural=marsh
+    natural=meadow: Tag:natural=meadow
     natural=moor: Tag:natural=moor
     natural=moraine: Tag:natural=moraine
     natural=mud: Tag:natural=mud
+    natural=palaeontological_site: Tag:natural=palaeontological site
     natural=peak: Tag:natural=peak
     natural=reef: Tag:natural=reef
     natural=ridge: Tag:natural=ridge
     natural=rock: Tag:natural=rock
+    natural=rocks: Tag:natural=rocks
     natural=saddle: Tag:natural=saddle
     natural=sand: Tag:natural=sand
     natural=scree: Tag:natural=scree
@@ -1940,7 +2669,7 @@ en:
     natural=sinkhole: Tag:natural=sinkhole
     natural=spring: Tag:natural=spring
     natural=stone: Tag:natural=stone
-    natural=tidal: Tag:natural=tidal
+    natural=strait: Tag:natural=strait
     natural=tree: Tag:natural=tree
     natural=tree_row: Tag:natural=tree row
     natural=tundra: Tag:natural=tundra
@@ -1948,7 +2677,66 @@ en:
     natural=water: Tag:natural=water
     natural=wetland: Tag:natural=wetland
     natural=wood: Tag:natural=wood
+    network=BR: Tag:network=BR
+    network=BR:ES: Tag:network=BR:ES
+    network=BR:MG: Tag:network=BR:MG
+    network=US:AR: Tag:network=US:AR
+    network=US:CA: Tag:network=US:CA
+    network=US:FL: Tag:network=US:FL
+    network=US:FL:Toll: Tag:network=US:FL:Toll
+    network=US:GA: Tag:network=US:GA
+    network=US:I: Tag:network=US:I
+    network=US:IN: Tag:network=US:IN
+    network=US:KY: Tag:network=US:KY
+    network=US:MD: Tag:network=US:MD
+    network=US:NJ:Cumberland: Tag:network=US:NJ:Cumberland
+    network=US:NM: Tag:network=US:NM
+    network=US:NY: Tag:network=US:NY
+    network=US:NY:Herkimer: Tag:network=US:NY:Herkimer
+    network=US:NY:Montgomery: Tag:network=US:NY:Montgomery
+    network=US:NY:Onondaga: Tag:network=US:NY:Onondaga
+    network=US:OH: Tag:network=US:OH
+    network=US:OH:ASD: Tag:network=US:OH:ASD
+    network=US:OH:CAR: Tag:network=US:OH:CAR
+    network=US:OH:FUL: Tag:network=US:OH:FUL
+    network=US:OH:GUE: Tag:network=US:OH:GUE
+    network=US:OH:HAS: Tag:network=US:OH:HAS
+    network=US:OH:HOL: Tag:network=US:OH:HOL
+    network=US:OH:JEF: Tag:network=US:OH:JEF
+    network=US:OH:LOG: Tag:network=US:OH:LOG
+    network=US:OH:LOG:Jefferson: Tag:network=US:OH:LOG:Jefferson
+    network=US:OH:LOG:Liberty: Tag:network=US:OH:LOG:Liberty
+    network=US:OH:LOG:Monroe: Tag:network=US:OH:LOG:Monroe
+    network=US:OH:LOG:Pleasant: Tag:network=US:OH:LOG:Pleasant
+    network=US:OH:LUC: Tag:network=US:OH:LUC
+    network=US:OH:MED: Tag:network=US:OH:MED
+    network=US:OH:MED:Harrisville: Tag:network=US:OH:MED:Harrisville
+    network=US:OH:MED:Litchfield: Tag:network=US:OH:MED:Litchfield
+    network=US:OH:OTT: Tag:network=US:OH:OTT
+    network=US:OH:PAU: Tag:network=US:OH:PAU
+    network=US:OH:SAN:Fremont: Tag:network=US:OH:SAN:Fremont
+    network=US:OH:STA: Tag:network=US:OH:STA
+    network=US:OH:SUM: Tag:network=US:OH:SUM
+    network=US:OH:TUS: Tag:network=US:OH:TUS
+    network=US:OH:UNI: Tag:network=US:OH:UNI
+    network=US:OH:WAY: Tag:network=US:OH:WAY
+    network=US:OH:WIL: Tag:network=US:OH:WIL
+    network=US:OH:WOO: Tag:network=US:OH:WOO
+    network=US:PA: Tag:network=US:PA
+    network=US:TN: Tag:network=US:TN
+    network=US:TX: Tag:network=US:TX
+    network=US:TX:Beltway: Tag:network=US:TX:Beltway
+    network=US:TX:FM: Tag:network=US:TX:FM
+    network=US:TX:Loop: Tag:network=US:TX:Loop
+    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:US: Tag:network=US:US
+    network=US:VA: Tag:network=US:VA
+    network=US:WV:Berkeley: Tag:network=US:WV:Berkeley
+    noexit=no: Tag:noexit=no
     odbl=clean: Tag:odbl=clean
+    office:realtor: Tag:office:realtor
     office=accountant: Tag:office=accountant
     office=administrative: Tag:office=administrative
     office=architect: Tag:office=architect
@@ -1964,12 +2752,24 @@ en:
     office=lawyer: Tag:office=lawyer
     office=newspaper: Tag:office=newspaper
     office=ngo: Tag:office=ngo
+    office=non-governmental_organization: Tag:office=non-governmental organization
     office=political_party: Tag:office=political party
     office=quango: Tag:office=quango
+    office=realtor: Tag:office=realtor
     office=research: Tag:office=research
     office=surveyor: Tag:office=surveyor
     office=telecommunication: Tag:office=telecommunication
     office=travel_agent: Tag:office=travel agent
+    office=water_utility: Tag:office=water utility
+    parking:lane:hgv=on_street: Tag:parking:lane:hgv=on street
+    passenger=international: Tag:passenger=international
+    passenger=local: Tag:passenger=local
+    passenger=national: Tag:passenger=national
+    passenger=no: Tag:passenger=no
+    passenger=regional: Tag:passenger=regional
+    passenger=suburban: Tag:passenger=suburban
+    passenger=urban: Tag:passenger=urban
+    passenger=yes: Tag:passenger=yes
     pilotage=boarding_point: Tag:pilotage=boarding point
     pilotage=office: Tag:pilotage=office
     pipeline=marker: Tag:pipeline=marker
@@ -1998,6 +2798,8 @@ en:
     placement=transition: Tag:placement=transition
     power=cable: Tag:power=cable
     power=cable_distribution_cabinet: Tag:power=cable distribution cabinet
+    power=compensator: Tag:power=compensator
+    power=converter: Tag:power=converter
     power=generator: Tag:power=generator
     power=heliostat: Tag:power=heliostat
     power=line: Tag:power=line
@@ -2007,9 +2809,15 @@ en:
     power=station: Tag:power=station
     power=sub_station: Tag:power=sub station
     power=substation: Tag:power=substation
+    power=switch: Tag:power=switch
+    power=switchgear: Tag:power=switchgear
     power=tower: Tag:power=tower
     power=transformer: Tag:power=transformer
     power=underground_cable: Tag:power=underground cable
+    priority=local: Tag:priority=local
+    priority=national: Tag:priority=national
+    priority=regional: Tag:priority=regional
+    psv=designated: Tag:psv=designated
     public_transport=pay_scale_area: Tag:public transport=pay scale area
     public_transport=platform: Tag:public transport=platform
     public_transport=station: Tag:public transport=station
@@ -2018,7 +2826,6 @@ en:
     pump=manual: Tag:pump=manual
     pump=no: Tag:pump=no
     pump=powered: Tag:pump=powered
-    radar_transponder=ramark: Tag:radar transponder=ramark
     radio_transponder:category=aeronautical: Tag:radio transponder:category=aeronautical
     radio_transponder:category=circular: Tag:radio transponder:category=circular
     radio_transponder:category=coast_radio: Tag:radio transponder:category=coast radio
@@ -2029,10 +2836,12 @@ en:
     radio_transponder:category=rotating_pattern: Tag:radio transponder:category=rotating
       pattern
     railway=PRT: Tag:railway=PRT
+    railway=Subway: Tag:railway=Subway
     railway=abandoned: Tag:railway=abandoned
     railway=buffer_stop: Tag:railway=buffer stop
     railway=crossing: Tag:railway=crossing
     railway=derail: Tag:railway=derail
+    railway=diamond: Tag:railway=diamond
     railway=disused: Tag:railway=disused
     railway=funicular: Tag:railway=funicular
     railway=halt: Tag:railway=halt
@@ -2054,10 +2863,12 @@ en:
     railway=tram: Tag:railway=tram
     railway=tram_stop: Tag:railway=tram stop
     railway=turntable: Tag:railway=turntable
+    recycling_type=container: Tag:recycling type=container
     religion=pagan: Tag:religion=pagan
     resource=aggregate: Tag:resource=aggregate
     resource=gravel: Tag:resource=gravel
     resource=sand: Tag:resource=sand
+    route=bicycle: Tag:route=bicycle
     route=bus: Tag:route=bus
     route=canal: Tag:route=canal
     route=detour: Tag:route=detour
@@ -2065,6 +2876,7 @@ en:
     route=fitness_trail: Tag:route=fitness trail
     route=monorail: Tag:route=monorail
     route=pipeline: Tag:route=pipeline
+    route=piste: Tag:route=piste
     route=railway: Tag:route=railway
     route=road: Tag:route=road
     route=share_taxi: Tag:route=share taxi
@@ -2174,6 +2986,7 @@ en:
     seamark:buoy_special_purpose:shape=super-buoy: Tag:seamark:buoy special purpose:shape=super-buoy
     seamark:cable_overhead:category=power: Tag:seamark:cable overhead:category=power
     seamark:cable_overhead:category=telephone: Tag:seamark:cable overhead:category=telephone
+    seamark:conspicuity=conspicious: Tag:seamark:conspicuity=conspicious
     seamark:conspicuity=conspicuous: Tag:seamark:conspicuity=conspicuous
     seamark:distance_mark:category=board: Tag:seamark:distance mark:category=board
     seamark:distance_mark:category=not_installed: Tag:seamark:distance mark:category=not
@@ -2221,6 +3034,7 @@ en:
     seamark:landmark:function=pagoda: Tag:seamark:landmark:function=pagoda
     seamark:landmark:function=shinto_shrine: Tag:seamark:landmark:function=shinto
       shrine
+    seamark:landmark:function=tempel: Tag:seamark:landmark:function=tempel
     seamark:landmark:function=temple: Tag:seamark:landmark:function=temple
     seamark:light:category=aero: Tag:seamark:light:category=aero
     seamark:light:category=air_obstruction: Tag:seamark:light:category=air obstruction
@@ -2231,6 +3045,7 @@ en:
     seamark:light:category=lower: Tag:seamark:light:category=lower
     seamark:light:category=moire: Tag:seamark:light:category=moire
     seamark:light:category=rear: Tag:seamark:light:category=rear
+    seamark:light:category=strip_light: Tag:seamark:light:category=strip light
     seamark:light:category=striplight: Tag:seamark:light:category=striplight
     seamark:light:category=subsidiary: Tag:seamark:light:category=subsidiary
     seamark:light:category=upper: Tag:seamark:light:category=upper
@@ -2272,6 +3087,8 @@ en:
       area:restriction=berthing restricted
     seamark:restricted_area:restriction=entry_prohibited: Tag:seamark:restricted area:restriction=entry
       prohibited
+    seamark:restricted_area:restriction=no_anchorage: Tag:seamark:restricted area:restriction=no
+      anchorage
     seamark:restricted_area:restriction=no_anchoring: Tag:seamark:restricted area:restriction=no
       anchoring
     seamark:restricted_area:restriction=no_boating: Tag:seamark:restricted area:restriction=no
@@ -2336,15 +3153,14 @@ en:
     seamark:topmark:shape=sphere: Tag:seamark:topmark:shape=sphere
     seamark:topmark:shape=square: Tag:seamark:topmark:shape=square
     seamark:topmark:shape=upright-cross: Tag:seamark:topmark:shape=upright-cross
+    seamark:topmark:shape=upright_cross: Tag:seamark:topmark:shape=upright cross
     seamark:topmark:shape=x-shape: Tag:seamark:topmark:shape=x-shape
     seamark=anchorage: Tag:seamark=anchorage
-    seamark=beacon: Tag:seamark=beacon
-    seamark=buoy: Tag:seamark=buoy
-    seamark=lighthouse: Tag:seamark=lighthouse
     segregated=no: Tag:segregated=no
     segregated=yes: Tag:segregated=yes
     service=alley: Tag:service=alley
     service=drive-through: Tag:service=drive-through
+    service=drive_through: Tag:service=drive through
     service=driveway: Tag:service=driveway
     service=emergency_access: Tag:service=emergency access
     service=parking_aisle: Tag:service=parking aisle
@@ -2354,13 +3170,16 @@ en:
     service=yard: Tag:service=yard
     shelter_type=basic_hut: Tag:shelter type=basic hut
     shelter_type=lean_to: Tag:shelter type=lean to
-    shop=SpotColor: Tag:shop=SpotColor
+    shop=Alko: Tag:shop=Alko
     shop=alcohol: Tag:shop=alcohol
     shop=anime: Tag:shop=anime
     shop=antiques: Tag:shop=antiques
+    shop=appliance: Tag:shop=appliance
     shop=art: Tag:shop=art
+    shop=audiologist: Tag:shop=audiologist
     shop=auto_parts: Tag:shop=auto parts
     shop=baby_goods: Tag:shop=baby goods
+    shop=bag: Tag:shop=bag
     shop=bakery: Tag:shop=bakery
     shop=bathroom_furnishing: Tag:shop=bathroom furnishing
     shop=beauty: Tag:shop=beauty
@@ -2372,17 +3191,20 @@ en:
     shop=books: Tag:shop=books
     shop=boutique: Tag:shop=boutique
     shop=butcher: Tag:shop=butcher
+    shop=camera: Tag:shop=camera
     shop=canoe_hire: Tag:shop=canoe hire
     shop=car: Tag:shop=car
     shop=car_bodyshop: Tag:shop=car bodyshop
     shop=car_parts: Tag:shop=car parts
     shop=car_repair: Tag:shop=car repair
     shop=carpet: Tag:shop=carpet
+    shop=cell_phones: Tag:shop=cell phones
     shop=chandler: Tag:shop=chandler
     shop=charity: Tag:shop=charity
     shop=cheese: Tag:shop=cheese
     shop=chemist: Tag:shop=chemist
     shop=clothes: Tag:shop=clothes
+    shop=communication: Tag:shop=communication
     shop=computer: Tag:shop=computer
     shop=confectionery: Tag:shop=confectionery
     shop=convenience: Tag:shop=convenience
@@ -2390,19 +3212,24 @@ en:
     shop=curtain: Tag:shop=curtain
     shop=dairy: Tag:shop=dairy
     shop=deli: Tag:shop=deli
+    shop=delicatessen: Tag:shop=delicatessen
     shop=department_store: Tag:shop=department store
     shop=dive: Tag:shop=dive
+    shop=diy: Tag:shop=diy
     shop=doityourself: Tag:shop=doityourself
     shop=dry_cleaning: Tag:shop=dry cleaning
     shop=electronics: Tag:shop=electronics
     shop=erotic: Tag:shop=erotic
     shop=estate_agent: Tag:shop=estate agent
     shop=fabric: Tag:shop=fabric
+    shop=fabrics: Tag:shop=fabrics
     shop=farm: Tag:shop=farm
     shop=fashion: Tag:shop=fashion
     shop=fish: Tag:shop=fish
+    shop=fishing: Tag:shop=fishing
     shop=fishmonger: Tag:shop=fishmonger
     shop=florist: Tag:shop=florist
+    shop=flower: Tag:shop=flower
     shop=food: Tag:shop=food
     shop=frame: Tag:shop=frame
     shop=funeral_directors: Tag:shop=funeral directors
@@ -2412,12 +3239,16 @@ en:
     shop=garden_centre: Tag:shop=garden centre
     shop=gas: Tag:shop=gas
     shop=general: Tag:shop=general
+    shop=general_store: Tag:shop=general store
+    shop=general_stores: Tag:shop=general stores
     shop=gift: Tag:shop=gift
     shop=glaziery: Tag:shop=glaziery
     shop=greengrocer: Tag:shop=greengrocer
+    shop=grocery: Tag:shop=grocery
     shop=hairdresser: Tag:shop=hairdresser
     shop=hairdresser_supply: Tag:shop=hairdresser supply
     shop=hardware: Tag:shop=hardware
+    shop=hearing_aid_dispenser: Tag:shop=hearing aid dispenser
     shop=hearing_aids: Tag:shop=hearing aids
     shop=herbalist: Tag:shop=herbalist
     shop=hifi: Tag:shop=hifi
@@ -2429,6 +3260,7 @@ en:
     shop=jewelry: Tag:shop=jewelry
     shop=kiosk: Tag:shop=kiosk
     shop=kitchen: Tag:shop=kitchen
+    shop=laundromat: Tag:shop=laundromat
     shop=laundry: Tag:shop=laundry
     shop=leather: Tag:shop=leather
     shop=locksmith: Tag:shop=locksmith
@@ -2443,6 +3275,7 @@ en:
     shop=motorcycle_repair: Tag:shop=motorcycle repair
     shop=music: Tag:shop=music
     shop=musical_instrument: Tag:shop=musical instrument
+    shop=musical_instruments: Tag:shop=musical instruments
     shop=newsagent: Tag:shop=newsagent
     shop=office_supplies: Tag:shop=office supplies
     shop=optician: Tag:shop=optician
@@ -2454,6 +3287,7 @@ en:
     shop=perfumery: Tag:shop=perfumery
     shop=pet: Tag:shop=pet
     shop=photo: Tag:shop=photo
+    shop=photo_studio: Tag:shop=photo studio
     shop=printing: Tag:shop=printing
     shop=radiotechnics: Tag:shop=radiotechnics
     shop=salon: Tag:shop=salon
@@ -2463,6 +3297,7 @@ en:
     shop=ship_chandler: Tag:shop=ship chandler
     shop=shoes: Tag:shop=shoes
     shop=shopping_centre: Tag:shop=shopping centre
+    shop=spare_parts: Tag:shop=spare parts
     shop=sports: Tag:shop=sports
     shop=stationery: Tag:shop=stationery
     shop=supermarket: Tag:shop=supermarket
@@ -2471,6 +3306,7 @@ en:
     shop=tea: Tag:shop=tea
     shop=ticket: Tag:shop=ticket
     shop=tobacco: Tag:shop=tobacco
+    shop=toy: Tag:shop=toy
     shop=toys: Tag:shop=toys
     shop=trade: Tag:shop=trade
     shop=travel_agency: Tag:shop=travel agency
@@ -2520,19 +3356,24 @@ en:
     source=Isle_of_Man_Government_aerial_imagery_(2001): Tag:source=Isle of Man Government
       aerial imagery (2001)
     source=NAIP: Tag:source=NAIP
+    source=gurs: Tag:source=gurs
     sport=10pin: Tag:sport=10pin
     sport=9pin: Tag:sport=9pin
+    sport=BASE: Tag:sport=BASE
     sport=aikido: Tag:sport=aikido
     sport=american_football: Tag:sport=american football
     sport=archery: Tag:sport=archery
+    sport=association_football: Tag:sport=association football
     sport=athletics: Tag:sport=athletics
     sport=australian_football: Tag:sport=australian football
     sport=badminton: Tag:sport=badminton
+    sport=balle_pelote: Tag:sport=balle pelote
     sport=base: Tag:sport=base
     sport=baseball: Tag:sport=baseball
     sport=basketball: Tag:sport=basketball
     sport=beachvolleyball: Tag:sport=beachvolleyball
     sport=billards: Tag:sport=billards
+    sport=billiards: Tag:sport=billiards
     sport=bmx: Tag:sport=bmx
     sport=boules: Tag:sport=boules
     sport=bowls: Tag:sport=bowls
@@ -2546,6 +3387,7 @@ en:
     sport=cricket: Tag:sport=cricket
     sport=cricket_nets: Tag:sport=cricket nets
     sport=croquet: Tag:sport=croquet
+    sport=curling: Tag:sport=curling
     sport=cycling: Tag:sport=cycling
     sport=darts: Tag:sport=darts
     sport=diving: Tag:sport=diving
@@ -2556,6 +3398,7 @@ en:
     sport=gaelic_games: Tag:sport=gaelic games
     sport=golf: Tag:sport=golf
     sport=gymnastics: Tag:sport=gymnastics
+    sport=hapkido: Tag:sport=hapkido
     sport=hockey: Tag:sport=hockey
     sport=horse_racing: Tag:sport=horse racing
     sport=horseshoes: Tag:sport=horseshoes
@@ -2577,6 +3420,7 @@ en:
     sport=rugby_union: Tag:sport=rugby union
     sport=scuba_diving: Tag:sport=scuba diving
     sport=shooting: Tag:sport=shooting
+    sport=shooting_range: Tag:sport=shooting range
     sport=skateboard: Tag:sport=skateboard
     sport=skating: Tag:sport=skating
     sport=skiing: Tag:sport=skiing
@@ -2590,17 +3434,29 @@ en:
     sport=toboggan: Tag:sport=toboggan
     sport=volleyball: Tag:sport=volleyball
     sport=water_ski: Tag:sport=water ski
+    sports=aikido: Tag:sports=aikido
+    sports=athletics: Tag:sports=athletics
     sub_sea=reef: Tag:sub sea=reef
+    substation=compensation: Tag:substation=compensation
+    substation=converter: Tag:substation=converter
+    substation=distribution: Tag:substation=distribution
+    substation=industrial: Tag:substation=industrial
+    substation=minor_distribution: Tag:substation=minor distribution
+    substation=traction: Tag:substation=traction
+    substation=transition: Tag:substation=transition
+    substation=transmission: Tag:substation=transmission
     summit:cross=yes: Tag:summit:cross=yes
     surface=pebbles: Tag:surface=pebbles
-    tidal=mud: Tag:tidal=mud
-    tidal=pebbles: Tag:tidal=pebbles
-    tidal=rocks: Tag:tidal=rocks
-    tidal=sand: Tag:tidal=sand
+    telcom=remote_digital_terminal: Tag:telcom=remote digital terminal
+    telecom=cross-connect: Tag:telecom=cross-connect
+    telecom=remote_digital_terminal: Tag:telecom=remote digital terminal
+    telecom=remote_terminal: Tag:telecom=remote terminal
     tourism=alpine_hut: Tag:tourism=alpine hut
+    tourism=apartment: Tag:tourism=apartment
     tourism=aquarium: Tag:tourism=aquarium
     tourism=artwork: Tag:tourism=artwork
     tourism=attraction: Tag:tourism=attraction
+    tourism=bed_and_breakfast: Tag:tourism=bed and breakfast
     tourism=camp_site: Tag:tourism=camp site
     tourism=caravan_site: Tag:tourism=caravan site
     tourism=chalet: Tag:tourism=chalet
@@ -2613,13 +3469,17 @@ en:
     tourism=museum: Tag:tourism=museum
     tourism=picnic_site: Tag:tourism=picnic site
     tourism=theme_park: Tag:tourism=theme park
+    tourism=tourism-attraction: Tag:tourism=tourism-attraction
     tourism=viewpoint: Tag:tourism=viewpoint
     tourism=wilderness_hut: Tag:tourism=wilderness hut
+    tourism=yes: Tag:tourism=yes
     tourism=zoo: Tag:tourism=zoo
     tower:construction=dish: Tag:tower:construction=dish
     tower:construction=dome: Tag:tower:construction=dome
     tower:construction=freestanding: Tag:tower:construction=freestanding
     tower:construction=lattice: Tag:tower:construction=lattice
+    tower:type: Tag:tower:type
+    tower:type=communication: Tag:tower:type=communication
     tower:type=lattice: Tag:tower:type=lattice
     traffic=local: Tag:traffic=local
     traffic=national: Tag:traffic=national
@@ -2627,22 +3487,31 @@ en:
     traffic=suburban: Tag:traffic=suburban
     traffic=urban: Tag:traffic=urban
     traffic_calming=island: Tag:traffic calming=island
+    transformer=auto: Tag:transformer=auto
+    transformer=converter: Tag:transformer=converter
+    transformer=distribution: Tag:transformer=distribution
+    transformer=generator: Tag:transformer=generator
+    transformer=phase_angle_regulator: Tag:transformer=phase angle regulator
+    transformer=traction: Tag:transformer=traction
+    transformer=yes: Tag:transformer=yes
     tunnel=culvert: Tag:tunnel=culvert
+    two_sided=yes: Tag:two sided=yes
     type=autopass: Tag:type=autopass
     type=benchmark: Tag:type=benchmark
     type=fixed_point: Tag:type=fixed point
-    type=leading_light: Tag:type=leading light
-    type=leading_line: Tag:type=leading line
     type=observation_spot: Tag:type=observation spot
     type=public_transport: Tag:type=public transport
     type=street: Tag:type=street
     type=triangulation: Tag:type=triangulation
     vending=bicycle_tube: Tag:vending=bicycle tube
+    vending=bycicle_tube: Tag:vending=bycicle tube
+    vending_machine: Tag:vending machine
     wall=dry_stone: Tag:wall=dry stone
     wall=no: Tag:wall=no
     wall=seawall: Tag:wall=seawall
     wall=training_wall: Tag:wall=training wall
     water=intermittent: Tag:water=intermittent
+    water=river: Tag:water=river
     water=tidal: Tag:water=tidal
     waterway=boat_lift: Tag:waterway=boat lift
     waterway=boatyard: Tag:waterway=boatyard
@@ -2655,6 +3524,7 @@ en:
     waterway=dock: Tag:waterway=dock
     waterway=drain: Tag:waterway=drain
     waterway=dredged_area: Tag:waterway=dredged area
+    waterway=estuary: Tag:waterway=estuary
     waterway=fish_pass: Tag:waterway=fish pass
     waterway=lock_gate: Tag:waterway=lock gate
     waterway=milestone: Tag:waterway=milestone
@@ -2670,6 +3540,8 @@ en:
     waterway=water_point: Tag:waterway=water point
     waterway=waterfall: Tag:waterway=waterfall
     waterway=weir: Tag:waterway=weir
+    wetland=saltern: Tag:wetland=saltern
+    wood=broad_leaved: Tag:wood=broad leaved
     wood=casuarina: Tag:wood=casuarina
     wood=coniferous: Tag:wood=coniferous
     wood=deciduous: Tag:wood=deciduous
@@ -2682,33 +3554,64 @@ en:
     zoo=petting_zoo: Tag:zoo=petting zoo
 es:
   key:
+    addr: ES:Key:addr
     amenity: ES:Key:amenity
+    brand: ES:Key:brand
+    cycleway: ES:Key:cycleway
+    end_date: ES:Key:end date
     highway: ES:Key:highway
+    is_in: ES:Key:is in
+    maxspeed: ES:Key:maxspeed
+    name: ES:Key:name
+    noexit: ES:Key:noexit
+    opening_hours: ES:Key:opening hours
+    operator: ES:Key:operator
+    organic: ES:Key:organic
+    origin: ES:Key:origin
+    payment: ES:Key:payment
+    phone: ES:Key:phone
     proposed: ES:Key:proposed
+    shop: ES:Key:shop
     stars: ES:Key:stars
     traffic_calming: ES:Key:traffic calming
+    website: ES:Key:website
+    wheelchair: ES:Key:wheelchair
+    wholesale: ES:Key:wholesale
   tag:
     aerialway=cable_car: ES:Tag:aerialway=cable car
+    aeroway=terminal: ES:Tag:aeroway=terminal
     amenity=atm: ES:Tag:amenity=atm
     amenity=bar: ES:Tag:amenity=bar
     amenity=bicycle_parking: ES:Tag:amenity=bicycle parking
     amenity=bicycle_rental: ES:Tag:amenity=bicycle rental
+    amenity=brothel: ES:Tag:amenity=brothel
     amenity=fuel: ES:Tag:amenity=fuel
+    amenity=ice_cream: ES:Tag:amenity=ice cream
+    amenity=love_hotel: ES:Tag:amenity=love hotel
+    amenity=nightclub: ES:Tag:amenity=nightclub
+    amenity=payment_terminal: ES:Tag:amenity=payment terminal
     amenity=recycling: ES:Tag:amenity=recycling
+    amenity=restaurant: ES:Tag:amenity=restaurant
+    amenity=stripclub: ES:Tag:amenity=stripclub
     amenity=university: ES:Tag:amenity=university
+    amenity=veterinary: ES:Tag:amenity=veterinary
     emergency=fire_extinguisher: ES:Tag:emergency=fire extinguisher
     highway=bus_stop: ES:Tag:highway=bus stop
+    highway=byway: ES:Tag:highway=byway
     highway=escape: ES:Tag:highway=escape
     highway=living_street: ES:Tag:highway=living street
+    highway=motorway: ES:Tag:highway=motorway
     highway=motorway_junction: ES:Tag:highway=motorway junction
     highway=motorway_link: ES:Tag:highway=motorway link
     highway=pedestrian: ES:Tag:highway=pedestrian
     highway=residential: ES:Tag:highway=residential
     highway=stop: ES:Tag:highway=stop
+    junction=roundabout: ES:Tag:junction=roundabout
     landuse=allotments: ES:Tag:landuse=allotments
     landuse=industrial: ES:Tag:landuse=industrial
     leisure=playground: ES:Tag:leisure=playground
     leisure=water_park: ES:Tag:leisure=water park
+    man_made=pier: ES:Tag:man made=pier
     natural=beach: ES:Tag:natural=beach
     natural=glacier: ES:Tag:natural=glacier
     natural=saddle: ES:Tag:natural=saddle
@@ -2716,13 +3619,30 @@ es:
     natural=water: ES:Tag:natural=water
     power=pole: ES:Tag:power=pole
     power=tower: ES:Tag:power=tower
+    public_transport=platform: ES:Tag:public transport=platform
+    public_transport=stop_area: ES:Tag:public transport=stop area
+    public_transport=stop_position: ES:Tag:public transport=stop position
     railway=level_crossing: ES:Tag:railway=level crossing
     shop=alcohol: ES:Tag:shop=alcohol
+    shop=bakery: ES:Tag:shop=bakery
+    shop=bed: ES:Tag:shop=bed
+    shop=butcher: ES:Tag:shop=butcher
     shop=computer: ES:Tag:shop=computer
+    shop=confectionery: ES:Tag:shop=confectionery
+    shop=hardware: ES:Tag:shop=hardware
+    shop=locksmith: ES:Tag:shop=locksmith
     shop=lottery: ES:Tag:shop=lottery
+    shop=paint: ES:Tag:shop=paint
+    shop=pet: ES:Tag:shop=pet
+    shop=seafood: ES:Tag:shop=seafood
+    shop=stationery: ES:Tag:shop=stationery
+    shop=tattoo: ES:Tag:shop=tattoo
+    shop=trade: ES:Tag:shop=trade
     tourism=alpine_hut: ES:Tag:tourism=alpine hut
     tourism=artwork: ES:Tag:tourism=artwork
     tourism=camp_site: ES:Tag:tourism=camp site
+    tourism=motel: ES:Tag:tourism=motel
+    waterway=riverbank: ES:Tag:waterway=riverbank
 et:
   key:
     addr: Et:Key:addr
@@ -2758,6 +3678,7 @@ fi:
     note: Fi:Key:note
     operator: Fi:Key:operator
     parking:lane: Fi:Key:parking:lane
+    parking:lane:both: Fi:Key:parking:lane:both
     priority_road: Fi:Key:priority road
     pyörä_väistää_aina_autoa: Fi:Key:pyörä väistää aina autoa
     shop: Fi:Key:shop
@@ -2837,10 +3758,14 @@ fr:
     abutters: FR:Key:abutters
     access: FR:Key:access
     addr: FR:Key:addr
+    addr:floor: FR:Key:addr:floor
+    addr:place: FR:Key:addr:place
     advertising: FR:Key:advertising
     aeroway: FR:Key:aeroway
+    alt_name: FR:Key:alt name
     amenity: FR:Key:amenity
     area: FR:Key:area
+    backward: FR:Key:backward
     barrier: FR:Key:barrier
     basin: FR:Key:basin
     bench: FR:Key:bench
@@ -2852,13 +3777,23 @@ fr:
     boundary: FR:Key:boundary
     bridge: FR:Key:bridge
     building: FR:Key:building
+    building:levels: FR:Key:building:levels
+    building:part: FR:Key:building:part
     capacity: FR:Key:capacity
+    capacity:disabled: FR:Key:capacity:disabled
     clothes: FR:Key:clothes
     collection_times: FR:Key:collection times
+    color: FR:Key:color
     colour: FR:Key:colour
     comment: FR:Key:comment
     construction: FR:Key:construction
     contact: FR:Key:contact
+    contact:email: FR:Key:contact:email
+    contact:fax: FR:Key:contact:fax
+    contact:phone: FR:Key:contact:phone
+    contact:vhf: FR:Key:contact:vhf
+    contact:webcam: FR:Key:contact:webcam
+    contact:website: FR:Key:contact:website
     covered: FR:Key:covered
     craft: FR:Key:craft
     crop: FR:Key:crop
@@ -2876,13 +3811,18 @@ fr:
     ele: FR:Key:ele
     email: FR:Key:email
     embankment: FR:Key:embankment
+    emergency: FR:Key:emergency
     enforcement: FR:Key:enforcement
     entrance: FR:Key:entrance
+    est_width: FR:Key:est width
+    fax: FR:Key:fax
     fee: FR:Key:fee
     fixme: FR:Key:fixme
     flood_prone: FR:Key:flood prone
     foot: FR:Key:foot
     footway: FR:Key:footway
+    ford: FR:Key:ford
+    forward: FR:Key:forward
     generator:method: FR:Key:generator:method
     generator:output: FR:Key:generator:output
     generator:output:electricity: FR:Key:generator:output:electricity
@@ -2895,18 +3835,24 @@ fr:
     historic: FR:Key:historic
     incline: FR:Key:incline
     information: FR:Key:information
+    int_name: FR:Key:int name
     intermittent: FR:Key:intermittent
     junction: FR:Key:junction
     landuse: FR:Key:landuse
     lanes: FR:Key:lanes
+    left: FR:Key:left
     leisure: FR:Key:leisure
     length: FR:Key:length
     level: FR:Key:level
     lit: FR:Key:lit
+    loc_name: FR:Key:loc name
     lock: FR:Key:lock
+    lock_name: FR:Key:lock name
+    lock_ref: FR:Key:lock ref
     man_made: FR:Key:man made
     manufacturer: FR:Key:manufacturer
     maxage: FR:Key:maxage
+    maxaxleload: FR:Key:maxaxleload
     maxheight: FR:Key:maxheight
     maxheight:physical: FR:Key:maxheight:physical
     maxlength: FR:Key:maxlength
@@ -2916,52 +3862,68 @@ fr:
     maxwidth: FR:Key:maxwidth
     military: FR:Key:military
     minage: FR:Key:minage
+    motorboat: FR:Key:motorboat
     mountain_pass: FR:Key:mountain pass
     mtb:scale: FR:Key:mtb:scale
     name: FR:Key:name
+    nat_name: FR:Key:nat name
     natural: FR:Key:natural
     network: FR:Key:network
     noname: FR:Key:noname
     note: FR:Key:note
     office: FR:Key:office
+    official_name: FR:Key:official name
+    old_name: FR:Key:old name
     oneway: FR:Key:oneway
+    oneway:bicycle: FR:Key:oneway:bicycle
     opening_hours: FR:Key:opening hours
     operator: FR:Key:operator
+    overtaking: FR:Key:overtaking
     parking: FR:Key:parking
+    parking:condition: FR:Key:parking:condition
     parking:lane: FR:Key:parking:lane
     paved:date: FR:Key:paved:date
     phone: FR:Key:phone
     place: FR:Key:place
     place:fr: FR:Key:place:fr
+    playground: FR:Key:playground
     post_office:type: FR:Key:post office:type
     power: FR:Key:power
     power_supply: FR:Key:power supply
     priority: FR:Key:priority
+    priority_road: FR:Key:priority road
     proposed: FR:Key:proposed
     psv: FR:Key:psv
     public_transport: FR:Key:public transport
+    pump: FR:Key:pump
     railway: FR:Key:railway
     ref: FR:Key:ref
     ref:CEF: FR:Key:ref:CEF
     ref:ERDF:gdo: FR:Key:ref:ERDF:gdo
     ref:FR:42C: FR:Key:ref:FR:42C
+    ref:FR:FANTOIR: FR:Key:ref:FR:FANTOIR
     ref:FR:FINESS: FR:Key:ref:FR:FINESS
+    ref:FR:SIRET: FR:Key:ref:FR:SIRET
     ref:INSEE: FR:Key:ref:INSEE
     ref:UAI: FR:Key:ref:UAI
     ref:mhs: FR:Key:ref:mhs
     ref:sandre: FR:Key:ref:sandre
+    reg_name: FR:Key:reg name
     religion: FR:Key:religion
     resource: FR:Key:resource
+    right: FR:Key:right
     sac_scale: FR:Key:sac scale
     second_hand: FR:Key:second hand
     segregated: FR:Key:segregated
     service: FR:Key:service
     shelter_type: FR:Key:shelter type
     shop: FR:Key:shop
+    short_name: FR:Key:short name
     smoothness: FR:Key:smoothness
     social_facility: FR:Key:social facility
     source: FR:Key:source
     source:maxspeed: FR:Key:source:maxspeed
+    source:maxwidth: FR:Key:source:maxwidth
     sport: FR:Key:sport
     surface: FR:Key:surface
     surveillance: FR:Key:surveillance
@@ -2976,6 +3938,7 @@ fr:
     trail_visibility: FR:Key:trail visibility
     tunnel: FR:Key:tunnel
     turn: FR:Key:turn
+    turn:lanes: FR:Key:turn:lanes
     turning_radius: FR:Key:turning radius
     type: FR:Key:type
     url: FR:Key:url
@@ -3005,6 +3968,8 @@ fr:
     amenity=cafe: FR:Tag:amenity=cafe
     amenity=car_rental: FR:Tag:amenity=car rental
     amenity=car_sharing: FR:Tag:amenity=car sharing
+    amenity=college: FR:Tag:amenity=college
+    amenity=community_center: FR:Tag:amenity=community center
     amenity=community_centre: FR:Tag:amenity=community centre
     amenity=compressed_air: FR:Tag:amenity=compressed air
     amenity=coworking_space: FR:Tag:amenity=coworking space
@@ -3019,6 +3984,7 @@ fr:
     amenity=kindergarten: FR:Tag:amenity=kindergarten
     amenity=library: FR:Tag:amenity=library
     amenity=marketplace: FR:Tag:amenity=marketplace
+    amenity=motorcycle_parking: FR:Tag:amenity=motorcycle parking
     amenity=parking: FR:Tag:amenity=parking
     amenity=parking_space: FR:Tag:amenity=parking space
     amenity=pharmacy: FR:Tag:amenity=pharmacy
@@ -3038,6 +4004,7 @@ fr:
     amenity=university: FR:Tag:amenity=university
     amenity=veterinary: FR:Tag:amenity=veterinary
     amenity=waste_basket: FR:Tag:amenity=waste basket
+    amenity=waste_disposal: FR:Tag:amenity=waste disposal
     barrier=bollard: FR:Tag:barrier=bollard
     barrier=cycle_barrier: FR:Tag:barrier=cycle barrier
     barrier=gate: FR:Tag:barrier=gate
@@ -3051,6 +4018,7 @@ fr:
     cycleway=asl: FR:Tag:cycleway=asl
     cycleway=bike_box: FR:Tag:cycleway=bike box
     disused=yes: FR:Tag:disused=yes
+    emergency=aed: FR:Tag:emergency=aed
     emergency=defibrillator: FR:Tag:emergency=defibrillator
     emergency=fire_hydrant: FR:Tag:emergency=fire hydrant
     emergency=phone: FR:Tag:emergency=phone
@@ -3120,6 +4088,7 @@ fr:
     landuse=village_green: FR:Tag:landuse=village green
     leisure=dog_park: FR:Tag:leisure=dog park
     leisure=golf_course: FR:Tag:leisure=golf course
+    leisure=paddling_pool: FR:Tag:leisure=paddling pool
     leisure=park: FR:Tag:leisure=park
     leisure=pitch: FR:Tag:leisure=pitch
     leisure=playground: FR:Tag:leisure=playground
@@ -3133,17 +4102,21 @@ fr:
     man_made=survey_point: FR:Tag:man made=survey point
     man_made=tower: FR:Tag:man made=tower
     man_made=wastewater_plant: FR:Tag:man made=wastewater plant
+    man_made=water_well: FR:Tag:man made=water well
     man_made=water_works: FR:Tag:man made=water works
     man_made=watermill: FR:Tag:man made=watermill
     man_made=windmill: FR:Tag:man made=windmill
     man_made=windpump: FR:Tag:man made=windpump
+    medical=aed: FR:Tag:medical=aed
     natural=cliff: FR:Tag:natural=cliff
+    natural=coastline: FR:Tag:natural=coastline
     natural=spring: FR:Tag:natural=spring
     natural=stone: FR:Tag:natural=stone
     natural=tree: FR:Tag:natural=tree
     natural=tree_row: FR:Tag:natural=tree row
     natural=water: FR:Tag:natural=water
     natural=wetland: FR:Tag:natural=wetland
+    office=employment_agency: FR:Tag:office=employment agency
     office=estate_agent: FR:Tag:office=estate agent
     office=ngo: FR:Tag:office=ngo
     place=city: FR:Tag:place=city
@@ -3164,6 +4137,7 @@ fr:
     power=transformer: FR:Tag:power=transformer
     public_transport=platform: FR:Tag:public transport=platform
     public_transport=station: FR:Tag:public transport=station
+    pump=powered: FR:Tag:pump=powered
     railway=level_crossing: FR:Tag:railway=level crossing
     railway=rail: FR:Tag:railway=rail
     railway=station: FR:Tag:railway=station
@@ -3226,10 +4200,12 @@ fr:
     wall=no: FR:Tag:wall=no
     waterway=boatyard: FR:Tag:waterway=boatyard
     waterway=canal: FR:Tag:waterway=canal
+    waterway=dam: FR:Tag:waterway=dam
     waterway=lock_gate: FR:Tag:waterway=lock gate
     waterway=river: FR:Tag:waterway=river
     waterway=riverbank: FR:Tag:waterway=riverbank
     waterway=stream: FR:Tag:waterway=stream
+    waterway=weir: FR:Tag:waterway=weir
 hr:
   key:
     amenity: Hr:Key:amenity
@@ -3249,15 +4225,29 @@ ht:
   key:
     intermittent: Ht:Key:intermittent
     pump: Ht:Key:pump
-  tag:
-    landuse=residential: Ht:Tag:landuse=residential
 hu:
   key:
+    aerialway: Hu:Key:aerialway
+    aeroway: Hu:Key:aeroway
     amenity: Hu:Key:amenity
+    barrier: Hu:Key:barrier
     building: Hu:Key:building
+    denomination: Hu:Key:denomination
+    highway: Hu:Key:highway
     jel: Hu:Key:jel
+    landuse: Hu:Key:landuse
+    leisure: Hu:Key:leisure
+    natural: Hu:Key:natural
     office: Hu:Key:office
+    place: Hu:Key:place
+    railway: Hu:Key:railway
+    shop: Hu:Key:shop
+    surface: Hu:Key:surface
     symbol: Hu:Key:symbol
+    tourism: Hu:Key:tourism
+    tracktype: Hu:Key:tracktype
+    waterway: Hu:Key:waterway
+    wheelchair: Hu:Key:wheelchair
     wood: Hu:Key:wood
   tag:
     boundary=administrative: Hu:Tag:boundary=administrative
@@ -3282,6 +4272,9 @@ it:
     cutting: IT:Key:cutting
     cycleway: IT:Key:cycleway
     denomination: IT:Key:denomination
+    description: IT:Key:description
+    diet: IT:Key:diet
+    diet:*: IT:Key:diet:*
     ele: IT:Key:ele
     embankment: IT:Key:embankment
     enforcement: IT:Key:enforcement
@@ -3307,6 +4300,7 @@ it:
     mooring: IT:Key:mooring
     mountain_pass: IT:Key:mountain pass
     mtb:scale: IT:Key:mtb:scale
+    mtb:scale:imba: IT:Key:mtb:scale:imba
     name: IT:Key:name
     natural: IT:Key:natural
     noexit: IT:Key:noexit
@@ -3326,6 +4320,7 @@ it:
     route: IT:Key:route
     sac_scale: IT:Key:sac scale
     service: IT:Key:service
+    shop: IT:Key:shop
     smoothness: IT:Key:smoothness
     sport: IT:Key:sport
     stop: IT:Key:stop
@@ -3347,6 +4342,7 @@ it:
     amenity=animal_breeding: IT:Tag:amenity=animal breeding
     amenity=animal_shelter: IT:Tag:amenity=animal shelter
     amenity=bar: IT:Tag:amenity=bar
+    amenity=bench: IT:Tag:amenity=bench
     amenity=bicycle_rental: IT:Tag:amenity=bicycle rental
     amenity=cinema: IT:Tag:amenity=cinema
     amenity=college: IT:Tag:amenity=college
@@ -3358,6 +4354,7 @@ it:
     amenity=kindergarten: IT:Tag:amenity=kindergarten
     amenity=milk_dispenser: IT:Tag:amenity=milk dispenser
     amenity=parking: IT:Tag:amenity=parking
+    amenity=photo_booth: IT:Tag:amenity=photo booth
     amenity=place_of_worship: IT:Tag:amenity=place of worship
     amenity=police: IT:Tag:amenity=police
     amenity=post_office: IT:Tag:amenity=post office
@@ -3368,6 +4365,7 @@ it:
     amenity=waste_basket: IT:Tag:amenity=waste basket
     barrier=ditch: IT:Tag:barrier=ditch
     barrier=fence: IT:Tag:barrier=fence
+    barrier=retaining_wall: IT:Tag:barrier=retaining wall
     barrier=toll_booth: IT:Tag:barrier=toll booth
     footway=crossing: IT:Tag:footway=crossing
     footway=sidewalk: IT:Tag:footway=sidewalk
@@ -3392,7 +4390,9 @@ it:
     highway=trunk_link: IT:Tag:highway=trunk link
     historic=paleontological_site: IT:Tag:historic=paleontological site
     historic=wayside_shrine: IT:Tag:historic=wayside shrine
+    industrial=auto_wrecker: IT:Tag:industrial=auto wrecker
     junction=roundabout: IT:Tag:junction=roundabout
+    landuse=cemetery: IT:Tag:landuse=cemetery
     landuse=construction: IT:Tag:landuse=construction
     leisure=beach_resort: IT:Tag:leisure=beach resort
     leisure=dog_park: IT:Tag:leisure=dog park
@@ -3401,8 +4401,10 @@ it:
     leisure=swimming_pool: IT:Tag:leisure=swimming pool
     man_made=mast: IT:Tag:man made=mast
     natural=grassland: IT:Tag:natural=grassland
+    natural=palaeontological_site: IT:Tag:natural=palaeontological site
     natural=scree: IT:Tag:natural=scree
     natural=spring: IT:Tag:natural=spring
+    natural=tree_row: IT:Tag:natural=tree row
     natural=wetland: IT:Tag:natural=wetland
     place=village: IT:Tag:place=village
     power=cable: IT:Tag:power=cable
@@ -3432,11 +4434,32 @@ it:
     waterway=stream: IT:Tag:waterway=stream
 ja:
   key:
+    abutters: JA:Key:abutters
     access: JA:Key:access
+    access:lanes: JA:Key:access:lanes
     addr: JA:Key:addr
+    addr:city: JA:Key:addr:city
+    addr:country: JA:Key:addr:country
+    addr:district: JA:Key:addr:district
+    addr:full: JA:Key:addr:full
+    addr:hamlet: JA:Key:addr:hamlet
+    addr:housename: JA:Key:addr:housename
+    addr:housenumber: JA:Key:addr:housenumber
+    addr:inclusion: JA:Key:addr:inclusion
+    addr:interpolation: JA:Key:addr:interpolation
+    addr:postcode: JA:Key:addr:postcode
+    addr:province: JA:Key:addr:province
+    addr:state: JA:Key:addr:state
+    addr:street: JA:Key:addr:street
+    addr:subdistrict: JA:Key:addr:subdistrict
     aerialway: JA:Key:aerialway
+    aeroway: JA:Key:aeroway
+    amenity: JA:Key:amenity
     area: JA:Key:area
+    backward: JA:Key:backward
+    barrier: JA:Key:barrier
     books: JA:Key:books
+    boundary: JA:Key:boundary
     brand: JA:Key:brand
     bridge: JA:Key:bridge
     building: JA:Key:building
@@ -3445,59 +4468,104 @@ ja:
     building:parts: JA:Key:building:parts
     capacity: JA:Key:capacity
     clothes: JA:Key:clothes
+    comment: JA:Key:comment
+    conditional: JA:Key:conditional
     contact: JA:Key:contact
+    covered: JA:Key:covered
     crossing: JA:Key:crossing
     cuisine: JA:Key:cuisine
+    cutting: JA:Key:cutting
     cycleway: JA:Key:cycleway
     denomination: JA:Key:denomination
     description: JA:Key:description
+    destination: JA:Key:destination
+    destination:lanes: JA:Key:destination:lanes
     diet:*: JA:Key:diet:*
     disused: JA:Key:disused
     drive_in: JA:Key:drive in
     drive_through: JA:Key:drive through
     easy_overtaking: JA:Key:easy overtaking
     electrified: JA:Key:electrified
+    embankment: JA:Key:embankment
     emergency: JA:Key:emergency
     end_date: JA:Key:end date
+    fax: JA:Key:fax
     fee: JA:Key:fee
     fixme: JA:Key:fixme
     foot: JA:Key:foot
     footway: JA:Key:footway
+    forward: JA:Key:forward
     furniture: JA:Key:furniture
+    generator:source: JA:Key:generator:source
+    genus: JA:Key:genus
     geological: JA:Key:geological
     hazard_type: JA:Key:hazard type
     height: JA:Key:height
+    highway: JA:Key:highway
+    historic: JA:Key:historic
     incline: JA:Key:incline
+    information: JA:Key:information
+    internet_access: JA:Key:internet access
+    is_in: JA:Key:is in
+    junction: JA:Key:junction
+    landuse: JA:Key:landuse
     lanes: JA:Key:lanes
+    layer: JA:Key:layer
+    leaf_cycle: JA:Key:leaf cycle
+    leaf_type: JA:Key:leaf type
+    left: JA:Key:left
+    leisure: JA:Key:leisure
     level: JA:Key:level
+    level_crossing: JA:Key:level crossing
     lit: JA:Key:lit
+    man_made: JA:Key:man made
+    maxspeed: JA:Key:maxspeed
+    military: JA:Key:military
     mountain_pass: JA:Key:mountain pass
     name: JA:Key:name
+    natural: JA:Key:natural
     note: JA:Key:note
+    official_name: JA:Key:official name
     oneway: JA:Key:oneway
     opening_hours: JA:Key:opening hours
     operator: JA:Key:operator
     overtaking: JA:Key:overtaking
     phone: JA:Key:phone
+    place: JA:Key:place
     power: JA:Key:power
     power_source: JA:Key:power source
+    power_supply: JA:Key:power supply
     public_transport: JA:Key:public transport
+    railway: JA:Key:railway
     ref: JA:Key:ref
+    reference: JA:Key:reference
     religion: JA:Key:religion
+    right: JA:Key:right
     roof:material: JA:Key:roof:material
     room: JA:Key:room
+    route: JA:Key:route
     seamark:fixme: JA:Key:seamark:fixme
     segregated: JA:Key:segregated
+    service: JA:Key:service
+    shop: JA:Key:shop
+    sidewalk: JA:Key:sidewalk
+    smoothness: JA:Key:smoothness
     social_facility: JA:Key:social facility
+    source: JA:Key:source
+    source_ref: JA:Key:source ref
+    species: JA:Key:species
     sport: JA:Key:sport
     start_date: JA:Key:start date
     step_count: JA:Key:step count
     surface: JA:Key:surface
     tactile_paving: JA:Key:tactile paving
     takeaway: JA:Key:takeaway
+    tourism: JA:Key:tourism
     tracktype: JA:Key:tracktype
+    tunnel: JA:Key:tunnel
     type: JA:Key:type
     url: JA:Key:url
+    waterway: JA:Key:waterway
     website: JA:Key:website
     wheelchair: JA:Key:wheelchair
     width: JA:Key:width
@@ -3511,8 +4579,12 @@ ja:
     aeroway=helipad: JA:Tag:aeroway=helipad
     aeroway=runway: JA:Tag:aeroway=runway
     aeroway=taxiway: JA:Tag:aeroway=taxiway
+    aeroway=terminal: JA:Tag:aeroway=terminal
+    amenity=arts_centre: JA:Tag:amenity=arts centre
+    amenity=atm: JA:Tag:amenity=atm
     amenity=baby_hatch: JA:Tag:amenity=baby hatch
     amenity=bank: JA:Tag:amenity=bank
+    amenity=bar: JA:Tag:amenity=bar
     amenity=bbq: JA:Tag:amenity=bbq
     amenity=bench: JA:Tag:amenity=bench
     amenity=bicycle_parking: JA:Tag:amenity=bicycle parking
@@ -3522,63 +4594,104 @@ ja:
     amenity=brothel: JA:Tag:amenity=brothel
     amenity=bureau_de_change: JA:Tag:amenity=bureau de change
     amenity=bus_station: JA:Tag:amenity=bus station
+    amenity=cafe: JA:Tag:amenity=cafe
     amenity=car_rental: JA:Tag:amenity=car rental
+    amenity=car_sharing: JA:Tag:amenity=car sharing
     amenity=car_wash: JA:Tag:amenity=car wash
+    amenity=charging_station: JA:Tag:amenity=charging station
+    amenity=cinema: JA:Tag:amenity=cinema
     amenity=clock: JA:Tag:amenity=clock
     amenity=college: JA:Tag:amenity=college
+    amenity=community_centre: JA:Tag:amenity=community centre
     amenity=courthouse: JA:Tag:amenity=courthouse
+    amenity=crematorium: JA:Tag:amenity=crematorium
     amenity=dentist: JA:Tag:amenity=dentist
+    amenity=doctors: JA:Tag:amenity=doctors
+    amenity=drinking_water: JA:Tag:amenity=drinking water
     amenity=embassy: JA:Tag:amenity=embassy
+    amenity=fast_food: JA:Tag:amenity=fast food
     amenity=ferry_terminal: JA:Tag:amenity=ferry terminal
     amenity=fire_station: JA:Tag:amenity=fire station
     amenity=food_court: JA:Tag:amenity=food court
     amenity=fountain: JA:Tag:amenity=fountain
+    amenity=fuel: JA:Tag:amenity=fuel
     amenity=grave_yard: JA:Tag:amenity=grave yard
+    amenity=grit_bin: JA:Tag:amenity=grit bin
+    amenity=hospital: JA:Tag:amenity=hospital
     amenity=hunting_stand: JA:Tag:amenity=hunting stand
+    amenity=ice_cream: JA:Tag:amenity=ice cream
     amenity=kindergarten: JA:Tag:amenity=kindergarten
     amenity=library: JA:Tag:amenity=library
+    amenity=marketplace: JA:Tag:amenity=marketplace
     amenity=nightclub: JA:Tag:amenity=nightclub
     amenity=nursing_home: JA:Tag:amenity=nursing home
     amenity=parking: JA:Tag:amenity=parking
     amenity=parking_entrance: JA:Tag:amenity=parking entrance
     amenity=parking_space: JA:Tag:amenity=parking space
     amenity=pharmacy: JA:Tag:amenity=pharmacy
+    amenity=place_of_worship: JA:Tag:amenity=place of worship
     amenity=police: JA:Tag:amenity=police
     amenity=post_box: JA:Tag:amenity=post box
     amenity=post_office: JA:Tag:amenity=post office
+    amenity=prison: JA:Tag:amenity=prison
+    amenity=pub: JA:Tag:amenity=pub
+    amenity=public_building: JA:Tag:amenity=public building
     amenity=recycling: JA:Tag:amenity=recycling
     amenity=restaurant: JA:Tag:amenity=restaurant
     amenity=sauna: JA:Tag:amenity=sauna
+    amenity=school: JA:Tag:amenity=school
     amenity=shelter: JA:Tag:amenity=shelter
     amenity=social_centre: JA:Tag:amenity=social centre
+    amenity=social_facility: JA:Tag:amenity=social facility
     amenity=stripclub: JA:Tag:amenity=stripclub
     amenity=studio: JA:Tag:amenity=studio
     amenity=taxi: JA:Tag:amenity=taxi
+    amenity=telephone: JA:Tag:amenity=telephone
+    amenity=theatre: JA:Tag:amenity=theatre
+    amenity=toilets: JA:Tag:amenity=toilets
+    amenity=townhall: JA:Tag:amenity=townhall
     amenity=university: JA:Tag:amenity=university
+    amenity=vending_machine: JA:Tag:amenity=vending machine
+    amenity=veterinary: JA:Tag:amenity=veterinary
     amenity=waste_basket: JA:Tag:amenity=waste basket
     amenity=waste_disposal: JA:Tag:amenity=waste disposal
+    amenity=waste_transfer_station: JA:Tag:amenity=waste transfer station
     amenity=watering_place: JA:Tag:amenity=watering place
     atm=yes: JA:Tag:atm=yes
     barrier=bollard: JA:Tag:barrier=bollard
     barrier=fence: JA:Tag:barrier=fence
+    barrier=gate: JA:Tag:barrier=gate
+    barrier=hedge: JA:Tag:barrier=hedge
     barrier=lift_gate: JA:Tag:barrier=lift gate
+    barrier=retaining_wall: JA:Tag:barrier=retaining wall
     barrier=toll_booth: JA:Tag:barrier=toll booth
+    barrier=wall: JA:Tag:barrier=wall
     boundary=administrative: JA:Tag:boundary=administrative
     boundary=national_park: JA:Tag:boundary=national park
     boundary=protected_area: JA:Tag:boundary=protected area
     bridge=viaduct: JA:Tag:bridge=viaduct
+    building=train_station: JA:Tag:building=train station
     craft=brewery: JA:Tag:craft=brewery
+    emergency=defibrillator: JA:Tag:emergency=defibrillator
     emergency=fire_extinguisher: JA:Tag:emergency=fire extinguisher
     emergency=fire_hydrant: JA:Tag:emergency=fire hydrant
+    foot=designated: JA:Tag:foot=designated
+    highway=bus_stop: JA:Tag:highway=bus stop
     highway=crossing: JA:Tag:highway=crossing
     highway=cycleway: JA:Tag:highway=cycleway
+    highway=footway: JA:Tag:highway=footway
+    highway=motorway: JA:Tag:highway=motorway
+    highway=motorway_junction: JA:Tag:highway=motorway junction
     highway=motorway_link: JA:Tag:highway=motorway link
     highway=path: JA:Tag:highway=path
+    highway=pedestrian: JA:Tag:highway=pedestrian
     highway=residential: JA:Tag:highway=residential
     highway=rest_area: JA:Tag:highway=rest area
     highway=road: JA:Tag:highway=road
     highway=secondary: JA:Tag:highway=secondary
+    highway=service: JA:Tag:highway=service
     highway=services: JA:Tag:highway=services
+    highway=steps: JA:Tag:highway=steps
     highway=tertiary: JA:Tag:highway=tertiary
     highway=track: JA:Tag:highway=track
     highway=traffic_signals: JA:Tag:highway=traffic signals
@@ -3595,11 +4708,13 @@ ja:
     landuse=cemetery: JA:Tag:landuse=cemetery
     landuse=commercial: JA:Tag:landuse=commercial
     landuse=construction: JA:Tag:landuse=construction
+    landuse=farm: JA:Tag:landuse=farm
     landuse=farmyard: JA:Tag:landuse=farmyard
     landuse=forest: JA:Tag:landuse=forest
     landuse=garages: JA:Tag:landuse=garages
     landuse=grass: JA:Tag:landuse=grass
     landuse=greenfield: JA:Tag:landuse=greenfield
+    landuse=greenhouse_horticulture: JA:Tag:landuse=greenhouse horticulture
     landuse=industrial: JA:Tag:landuse=industrial
     landuse=landfill: JA:Tag:landuse=landfill
     landuse=meadow: JA:Tag:landuse=meadow
@@ -3621,14 +4736,19 @@ ja:
     leisure=dog_park: JA:Tag:leisure=dog park
     leisure=garden: JA:Tag:leisure=garden
     leisure=golf_course: JA:Tag:leisure=golf course
+    leisure=ice_rink: JA:Tag:leisure=ice rink
     leisure=marina: JA:Tag:leisure=marina
     leisure=miniature_golf: JA:Tag:leisure=miniature golf
     leisure=nature_reserve: JA:Tag:leisure=nature reserve
+    leisure=park: JA:Tag:leisure=park
+    leisure=pitch: JA:Tag:leisure=pitch
     leisure=playground: JA:Tag:leisure=playground
     leisure=slipway: JA:Tag:leisure=slipway
     leisure=sports_centre: JA:Tag:leisure=sports centre
+    leisure=stadium: JA:Tag:leisure=stadium
     leisure=swimming_pool: JA:Tag:leisure=swimming pool
     leisure=track: JA:Tag:leisure=track
+    leisure=water_park: JA:Tag:leisure=water park
     man_made=adit: JA:Tag:man made=adit
     man_made=breakwater: JA:Tag:man made=breakwater
     man_made=crane: JA:Tag:man made=crane
@@ -3640,11 +4760,21 @@ ja:
     man_made=mineshaft: JA:Tag:man made=mineshaft
     man_made=pier: JA:Tag:man made=pier
     man_made=tower: JA:Tag:man made=tower
+    man_made=wastewater_plant: JA:Tag:man made=wastewater plant
     man_made=water_well: JA:Tag:man made=water well
     man_made=works: JA:Tag:man made=works
+    natural=bay: JA:Tag:natural=bay
+    natural=beach: JA:Tag:natural=beach
+    natural=cliff: JA:Tag:natural=cliff
+    natural=coastline: JA:Tag:natural=coastline
+    natural=fell: JA:Tag:natural=fell
+    natural=grassland: JA:Tag:natural=grassland
     natural=heath: JA:Tag:natural=heath
     natural=scree: JA:Tag:natural=scree
+    natural=tree: JA:Tag:natural=tree
     natural=tree_row: JA:Tag:natural=tree row
+    natural=volcano: JA:Tag:natural=volcano
+    natural=wetland: JA:Tag:natural=wetland
     natural=wood: JA:Tag:natural=wood
     place=island: JA:Tag:place=island
     place=islet: JA:Tag:place=islet
@@ -3654,11 +4784,17 @@ ja:
     public_transport=platform: JA:Tag:public transport=platform
     railway=crossing: JA:Tag:railway=crossing
     railway=level_crossing: JA:Tag:railway=level crossing
+    railway=monorail: JA:Tag:railway=monorail
     railway=rail: JA:Tag:railway=rail
+    railway=station: JA:Tag:railway=station
+    railway=subway: JA:Tag:railway=subway
     railway=tram: JA:Tag:railway=tram
     route=road: JA:Tag:route=road
     service=parking_aisle: JA:Tag:service=parking aisle
+    service=siding: JA:Tag:service=siding
+    service=spur: JA:Tag:service=spur
     shop=alcohol: JA:Tag:shop=alcohol
+    shop=anime: JA:Tag:shop=anime
     shop=art: JA:Tag:shop=art
     shop=bakery: JA:Tag:shop=bakery
     shop=beauty: JA:Tag:shop=beauty
@@ -3674,19 +4810,35 @@ ja:
     shop=department_store: JA:Tag:shop=department store
     shop=doityourself: JA:Tag:shop=doityourself
     shop=florist: JA:Tag:shop=florist
+    shop=furniture: JA:Tag:shop=furniture
+    shop=garden_centre: JA:Tag:shop=garden centre
     shop=general: JA:Tag:shop=general
+    shop=gift: JA:Tag:shop=gift
     shop=hairdresser: JA:Tag:shop=hairdresser
+    shop=kiosk: JA:Tag:shop=kiosk
+    shop=massage: JA:Tag:shop=massage
     shop=motorcycle: JA:Tag:shop=motorcycle
+    shop=outdoor: JA:Tag:shop=outdoor
     shop=pet: JA:Tag:shop=pet
     shop=second_hand: JA:Tag:shop=second hand
     shop=supermarket: JA:Tag:shop=supermarket
     shop=tobacco: JA:Tag:shop=tobacco
+    shop=variety_store: JA:Tag:shop=variety store
+    tourism=camp_site: JA:Tag:tourism=camp site
+    tourism=hostel: JA:Tag:tourism=hostel
     tourism=hotel: JA:Tag:tourism=hotel
+    tourism=information: JA:Tag:tourism=information
     tourism=museum: JA:Tag:tourism=museum
     tourism=picnic_site: JA:Tag:tourism=picnic site
+    tourism=viewpoint: JA:Tag:tourism=viewpoint
+    tunnel=culvert: JA:Tag:tunnel=culvert
+    waterway=canal: JA:Tag:waterway=canal
     waterway=dam: JA:Tag:waterway=dam
     waterway=ditch: JA:Tag:waterway=ditch
     waterway=drain: JA:Tag:waterway=drain
+    waterway=lock_gate: JA:Tag:waterway=lock gate
+    waterway=riverbank: JA:Tag:waterway=riverbank
+    waterway=stream: JA:Tag:waterway=stream
     waterway=water_point: JA:Tag:waterway=water point
     waterway=weir: JA:Tag:waterway=weir
 ko:
@@ -3697,17 +4849,81 @@ ko:
     craft=tailor: Ko:Tag:craft=tailor
     shop=garden_centre: Ko:Tag:shop=garden centre
     shop=gift: Ko:Tag:shop=gift
+lt:
+  key:
+    cycleway: Lt:Key:cycleway
 nl:
   key:
     AND_nosr_r: NL:Key:AND nosr r
+    addr: NL:Key:addr
+    addr:city: NL:Key:addr:city
+    addr:country: NL:Key:addr:country
+    addr:housename: NL:Key:addr:housename
+    addr:housenumber: NL:Key:addr:housenumber
+    addr:postcode: NL:Key:addr:postcode
+    addr:street: NL:Key:addr:street
+    amenity: NL:Key:amenity
+    backrest: NL:Key:backrest
+    barrier: NL:Key:barrier
+    bench: NL:Key:bench
+    building: NL:Key:building
+    color: NL:Key:color
+    colour: NL:Key:colour
+    craft: NL:Key:craft
     crossing: NL:Key:crossing
+    cycleway: NL:Key:cycleway
+    demolished: NL:Key:demolished
+    emergency: NL:Key:emergency
+    fence_type: NL:Key:fence type
+    fenced: NL:Key:fenced
+    landuse: NL:Key:landuse
+    leisure: NL:Key:leisure
+    man_made: NL:Key:man made
+    military: NL:Key:military
+    name: NL:Key:name
+    natural: NL:Key:natural
+    office: NL:Key:office
+    public_transport: NL:Key:public transport
+    route_master: NL:Key:route master
     scenic: NL:Key:scenic
+    shop: NL:Key:shop
+    tourism: NL:Key:tourism
+    type: NL:Key:type
+    waste: NL:Key:waste
     wheelchair: NL:Key:wheelchair
   tag:
+    amenity=bank: NL:Tag:amenity=bank
+    amenity=bench: NL:Tag:amenity=bench
+    amenity=cafe: NL:Tag:amenity=cafe
+    amenity=drinking_water: NL:Tag:amenity=drinking water
+    amenity=grave_yard: NL:Tag:amenity=grave yard
+    amenity=parking: NL:Tag:amenity=parking
     amenity=post_office: NL:Tag:amenity=post office
+    amenity=toilets: NL:Tag:amenity=toilets
+    amenity=waste_basket: NL:Tag:amenity=waste basket
+    barrier=bollard: NL:Tag:barrier=bollard
+    barrier=fence: NL:Tag:barrier=fence
+    barrier=hedge: NL:Tag:barrier=hedge
+    barrier=sump_buster: NL:Tag:barrier=sump buster
+    building=entrance: NL:Tag:building=entrance
     highway=footway: NL:Tag:highway=footway
+    highway=motorway: NL:Tag:highway=motorway
     highway=path: NL:Tag:highway=path
+    information=tactile_map: NL:Tag:information=tactile map
+    landuse=cemetery: NL:Tag:landuse=cemetery
+    landuse=garages: NL:Tag:landuse=garages
+    landuse=grass: NL:Tag:landuse=grass
+    landuse=industrial: NL:Tag:landuse=industrial
     man_made=windmill: NL:Tag:man made=windmill
+    public_transport=platform: NL:Tag:public transport=platform
+    public_transport=station: NL:Tag:public transport=station
+    public_transport=stop_area: NL:Tag:public transport=stop area
+    public_transport=stop_position: NL:Tag:public transport=stop position
+    shop=car: NL:Tag:shop=car
+    shop=department_store: NL:Tag:shop=department store
+    shop=greengrocer: NL:Tag:shop=greengrocer
+    tourism=chalet: NL:Tag:tourism=chalet
+    zoo=petting_zoo: NL:Tag:zoo=petting zoo
 no:
   key:
     amenity: No:Key:amenity
@@ -3729,11 +4945,26 @@ pl:
     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
+    advertising: Pl:Key:advertising
     aerialway: Pl:Key:aerialway
     aeroway: Pl:Key:aeroway
+    alt_name: Pl:Key:alt name
     amenity: Pl:Key:amenity
     area: Pl:Key:area
     automatic_door: Pl:Key:automatic door
@@ -3756,6 +4987,7 @@ pl:
     building:min_level: Pl:Key:building:min level
     building:part: Pl:Key:building:part
     bunker_type: Pl:Key:bunker type
+    bus: Pl:Key:bus
     busway: Pl:Key:busway
     capacity: Pl:Key:capacity
     circumference: Pl:Key:circumference
@@ -3774,13 +5006,19 @@ pl:
     destination: Pl:Key:destination
     diocese: Pl:Key:diocese
     ele: Pl:Key:ele
+    electrified: Pl:Key:electrified
     embankment: Pl:Key:embankment
     emergency: Pl:Key:emergency
+    end_date: Pl:Key:end date
     entrance: Pl:Key:entrance
     fee: Pl:Key:fee
     fixme: Pl:Key:fixme
+    flood_prone: Pl:Key:flood prone
     foot: Pl:Key:foot
     footway: Pl:Key:footway
+    ford: Pl:Key:ford
+    fuel: Pl:Key:fuel
+    gauge: Pl:Key:gauge
     generator:output: Pl:Key:generator:output
     height: Pl:Key:height
     highway: Pl:Key:highway
@@ -3789,6 +5027,23 @@ pl:
     inscription: Pl:Key:inscription
     intermittent: Pl:Key:intermittent
     is_in: Pl:Key:is in
+    is_in:archipelago: Pl:Key:is in:archipelago
+    is_in:city: Pl:Key:is in:city
+    is_in:continent: Pl:Key:is in:continent
+    is_in:country: Pl:Key:is in:country
+    is_in:county: Pl:Key:is in:county
+    is_in:district: Pl:Key:is in:district
+    is_in:hamlet: Pl:Key:is in:hamlet
+    is_in:island: Pl:Key:is in:island
+    is_in:locality: Pl:Key:is in:locality
+    is_in:municipality: Pl:Key:is in:municipality
+    is_in:ocean: Pl:Key:is in:ocean
+    is_in:province: Pl:Key:is in:province
+    is_in:sea: Pl:Key:is in:sea
+    is_in:state: Pl:Key:is in:state
+    is_in:suburb: Pl:Key:is in:suburb
+    is_in:town: Pl:Key:is in:town
+    is_in:village: Pl:Key:is in:village
     junction: Pl:Key:junction
     kerb: Pl:Key:kerb
     landuse: Pl:Key:landuse
@@ -3804,6 +5059,7 @@ pl:
     maxheight: Pl:Key:maxheight
     maxspeed: Pl:Key:maxspeed
     maxstay: Pl:Key:maxstay
+    min_height: Pl:Key:min height
     mooring: Pl:Key:mooring
     name: Pl:Key:name
     natural: Pl:Key:natural
@@ -3820,6 +5076,7 @@ pl:
     parking:lane: Pl:Key:parking:lane
     place: Pl:Key:place
     place_name: Pl:Key:place name
+    population: Pl:Key:population
     power: Pl:Key:power
     psv: Pl:Key:psv
     public_transport: Pl:Key:public transport
@@ -3828,31 +5085,44 @@ pl:
     ramp: Pl:Key:ramp
     recycling_type: Pl:Key:recycling type
     religion: Pl:Key:religion
+    resource: Pl:Key:resource
     roof:material: Pl:Key:roof:material
     route: Pl:Key:route
     route_master: Pl:Key:route master
     sac_scale: Pl:Key:sac scale
     seamark:fixme: Pl:Key:seamark:fixme
+    second_hand: Pl:Key:second hand
     service: Pl:Key:service
     service_times: Pl:Key:service times
     shop: Pl:Key:shop
     sidewalk: Pl:Key:sidewalk
+    smoothness: Pl:Key:smoothness
+    source:date: Pl:Key:source:date
+    source:maxspeed: PL:Key:source:maxspeed
+    start_date: Pl:Key:start date
     step_count: Pl:Key:step count
     surface: Pl:Key:surface
     surveillance: Pl:Key:surveillance
     surveillance:type: Pl:Key:surveillance:type
     surveillance:zone: Pl:Key:surveillance:zone
+    toll: Pl:Key:toll
     tomb: Pl:Key:tomb
     tourism: Pl:Key:tourism
     tracktype: Pl:Key:tracktype
     traffic_calming: Pl:Key:traffic calming
+    train: Pl:Key:train
+    tram: Pl:Key:tram
+    trolleybus: Pl:Key:trolleybus
     turn: Pl:Key:turn
+    turn:lanes: Pl:Key:turn:lanes
     type: Pl:Key:type
     url: Pl:Key:url
     usage: Pl:Key:usage
+    vehicle: Pl:Key:vehicle
     voltage: Pl:Key:voltage
     waterway: Pl:Key:waterway
     website: Pl:Key:website
+    wetland: Pl:Key:wetland
     wheelchair: Pl:Key:wheelchair
     wikipedia: Pl:Key:wikipedia
     wood: Pl:Key:wood
@@ -3869,6 +5139,7 @@ pl:
     amenity=bicycle_parking: Pl:Tag:amenity=bicycle parking
     amenity=bicycle_rental: Pl:Tag:amenity=bicycle rental
     amenity=brothel: Pl:Tag:amenity=brothel
+    amenity=car_wash: Pl:Tag:amenity=car wash
     amenity=compressed_air: Pl:Tag:amenity=compressed air
     amenity=crypt: Pl:Tag:amenity=crypt
     amenity=doctors: Pl:Tag:amenity=doctors
@@ -3889,6 +5160,7 @@ pl:
     amenity=taxi: Pl:Tag:amenity=taxi
     amenity=vending_machine: Pl:Tag:amenity=vending machine
     amenity=waste_disposal: Pl:Tag:amenity=waste disposal
+    atm=no: Pl:Tag:atm=no
     atm=yes: Pl:Tag:atm=yes
     barrier=block: Pl:Tag:barrier=block
     barrier=bollard: Pl:Tag:barrier=bollard
@@ -3916,6 +5188,7 @@ pl:
     building=bridge: Pl:Tag:building=bridge
     building=bunker: Pl:Tag:building=bunker
     building=cabin: Pl:Tag:building=cabin
+    building=cathedral: Pl:Tag:building=cathedral
     building=chapel: Pl:Tag:building=chapel
     building=church: Pl:Tag:building=church
     building=civic: Pl:Tag:building=civic
@@ -3923,6 +5196,7 @@ pl:
     building=construction: Pl:Tag:building=construction
     building=detached: Pl:Tag:building=detached
     building=dormitory: Pl:Tag:building=dormitory
+    building=entrance: Pl:Tag:building=entrance
     building=farm_auxiliary: Pl:Tag:building=farm auxiliary
     building=garage: Pl:Tag:building=garage
     building=garages: Pl:Tag:building=garages
@@ -3941,12 +5215,15 @@ pl:
     building=roof: Pl:Tag:building=roof
     building=school: Pl:Tag:building=school
     building=shed: Pl:Tag:building=shed
+    building=stable: Pl:Tag:building=stable
     building=supermarket: Pl:Tag:building=supermarket
     building=terrace: Pl:Tag:building=terrace
     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
+    craft=basket_maker: Pl:Tag:craft=basket maker
+    emergency=aed: Pl:Tag:emergency=aed
     emergency=defibrillator: Pl:Tag:emergency=defibrillator
     emergency=fire_extinguisher: Pl:Tag:emergency=fire extinguisher
     emergency=fire_flapper: Pl:Tag:emergency=fire flapper
@@ -3993,7 +5270,9 @@ pl:
     landuse=allotments: Pl:Tag:landuse=allotments
     landuse=brownfield: Pl:Tag:landuse=brownfield
     landuse=cemetery: Pl:Tag:landuse=cemetery
+    landuse=commercial: Pl:Tag:landuse=commercial
     landuse=farm: Pl:Tag:landuse=farm
+    landuse=farmland: Pl:Tag:landuse=farmland
     landuse=farmyard: Pl:Tag:landuse=farmyard
     landuse=forest: Pl:Tag:landuse=forest
     landuse=greenhouse_horticulture: Pl:Tag:landuse=greenhouse horticulture
@@ -4003,21 +5282,29 @@ pl:
     landuse=quarry: Pl:Tag:landuse=quarry
     landuse=railway: Pl:Tag:landuse=railway
     landuse=religious: Pl:Tag:landuse=religious
+    landuse=residential: Pl:Tag:landuse=residential
+    landuse=retail: Pl:Tag:landuse=retail
     leisure=firepit: Pl:Tag:leisure=firepit
     leisure=fishing: Pl:Tag:leisure=fishing
+    man_made=adit: Pl:Tag:man made=adit
     man_made=cross: Pl:Tag:man made=cross
     man_made=cutline: Pl:Tag:man made=cutline
     man_made=dyke: Pl:Tag:man made=dyke
     man_made=embankment: Pl:Tag:man made=embankment
     man_made=surveillance: Pl:Tag:man made=surveillance
     man_made=tower: Pl:Tag:man made=tower
+    man_made=water_well: Pl:Tag:man made=water well
     man_made=watermill: Pl:Tag:man made=watermill
     man_made=windmill: Pl:Tag:man made=windmill
+    man_made=windpump: Pl:Tag:man made=windpump
+    military=bunker: Pl:Tag:military=bunker
     mooring=ferry: Pl:Tag:mooring=ferry
+    natural=bare_rock: Pl:Tag:natural=bare rock
     natural=bay: Pl:Tag:natural=bay
     natural=cave_entrance: Pl:Tag:natural=cave entrance
     natural=grassland: Pl:Tag:natural=grassland
     natural=heath: Pl:Tag:natural=heath
+    natural=scree: Pl:Tag:natural=scree
     natural=scrub: Pl:Tag:natural=scrub
     natural=sinkhole: Pl:Tag:natural=sinkhole
     natural=tree: Pl:Tag:natural=tree
@@ -4047,6 +5334,7 @@ pl:
     railway=crossing: Pl:Tag:railway=crossing
     railway=crossing_controller: Pl:Tag:railway=crossing controller
     railway=level_crossing: Pl:Tag:railway=level crossing
+    railway=rail: Pl:Tag:railway=rail
     service=alley: Pl:Tag:service=alley
     service=drive-through: Pl:Tag:service=drive-through
     service=driveway: Pl:Tag:service=driveway
@@ -4057,9 +5345,23 @@ pl:
     service=spur: Pl:Tag:service=spur
     service=yard: Pl:Tag:service=yard
     shop=baby_goods: Pl:Tag:shop=baby goods
+    shop=bathroom_furnishing: Pl:Tag:shop=bathroom furnishing
     shop=bicycle: Pl:Tag:shop=bicycle
+    shop=confectionery: Pl:Tag:shop=confectionery
+    shop=convenience: Pl:Tag:shop=convenience
+    shop=department_store: Pl:Tag:shop=department store
     shop=funeral_directors: Pl:Tag:shop=funeral directors
+    shop=furniture: Pl:Tag:shop=furniture
+    shop=general: Pl:Tag:shop=general
+    shop=houseware: Pl:Tag:shop=houseware
+    shop=kitchen: Pl:Tag:shop=kitchen
+    shop=pastry: Pl:Tag:shop=pastry
+    shop=second_hand: Pl:Tag:shop=second hand
+    shop=supermarket: Pl:Tag:shop=supermarket
+    shop=travel_agency: Pl:Tag:shop=travel agency
+    shop=variety_store: Pl:Tag:shop=variety store
     sport=aikido: Pl:Tag:sport=aikido
+    sport=climbing: Pl:Tag:sport=climbing
     tourism=artwork: Pl:Tag:tourism=artwork
     tourism=camp_site: Pl:Tag:tourism=camp site
     tourism=caravan_site: Pl:Tag:tourism=caravan site
@@ -4088,20 +5390,43 @@ pl:
     waterway=riverbank: Pl:Tag:waterway=riverbank
     waterway=stream: Pl:Tag:waterway=stream
     waterway=weir: Pl:Tag:waterway=weir
+    wetland=bog: Pl:Tag:wetland=bog
+    wetland=mangrove: Pl:Tag:wetland=mangrove
+    wetland=marsh: Pl:Tag:wetland=marsh
+    wetland=reedbed: Pl:Tag:wetland=reedbed
+    wetland=saltern: Pl:Tag:wetland=saltern
+    wetland=saltmarsh: Pl:Tag:wetland=saltmarsh
+    wetland=swamp: Pl:Tag:wetland=swamp
+    wetland=tidalflat: Pl:Tag:wetland=tidalflat
+    wetland=wet_meadow: Pl:Tag:wetland=wet meadow
     wood=coniferous: Pl:Tag:wood=coniferous
     wood=deciduous: Pl:Tag:wood=deciduous
     wood=evergreen: Pl:Tag:wood=evergreen
     wood=mixed: Pl:Tag:wood=mixed
 pt:
   key:
+    country: Pt:Key:country
+    highway: Pt:Key:highway
     postal_code: Pt:Key:postal code
+    ref:bag: Pt:Key:ref:bag
+    source: Pt:Key:source
     sport: Pt:Key:sport
+    tiger: Pt:Key:tiger
+    tracktype: Pt:Key:tracktype
+    wikidata: Pt:Key:wikidata
   tag:
+    aeroway=hangar: Pt:Tag:aeroway=hangar
+    aeroway=holding_position: Pt:Tag:aeroway=holding position
+    aeroway=parking_position: Pt:Tag:aeroway=parking position
+    amenity=bicycle_parking: Pt:Tag:amenity=bicycle parking
     amenity=hospital: Pt:Tag:amenity=hospital
+    amenity=marketplace: Pt:Tag:amenity=marketplace
+    amenity=parking: Pt:Tag:amenity=parking
     highway=primary: Pt:Tag:highway=primary
     leisure=fishing: Pt:Tag:leisure=fishing
     leisure=garden: Pt:Tag:leisure=garden
     leisure=golf_course: Pt:Tag:leisure=golf course
+    leisure=hospital: Pt:Tag:leisure=hospital
     leisure=marina: Pt:Tag:leisure=marina
     leisure=nature_reserve: Pt:Tag:leisure=nature reserve
     leisure=park: Pt:Tag:leisure=park
@@ -4112,40 +5437,84 @@ pt:
     leisure=stadium: Pt:Tag:leisure=stadium
     leisure=track: Pt:Tag:leisure=track
     leisure=water_park: Pt:Tag:leisure=water park
+    natural=coastline: Pt:Tag:natural=coastline
+    natural=wetland: PT:Tag:natural=wetland
+    noexit=no: Pt:Tag:noexit=no
     sport=golf: Pt:Tag:sport=golf
+pt br:
+  key:
+    highway: Pt br:Key:highway
+  tag:
+    amenity=marketplace: Pt br:Tag:amenity=marketplace
+    natural=wetland: PT br:Tag:natural=wetland
 pt-br:
   key:
+    IBGE:GEOCODIGO: Pt-br:Key:IBGE:GEOCODIGO
     IBGE:tipo: Pt-br:Key:IBGE:tipo
     TMC: Pt-br:Key:TMC
+    TMC:Direction: Pt-br:Key:TMC:Direction
+    TMC:LocationCode: Pt-br:Key:TMC:LocationCode
+    TMC:NextLocationCode: Pt-br:Key:TMC:NextLocationCode
+    TMC:PrevLocationCode: Pt-br:Key:TMC:PrevLocationCode
     abutters: Pt-br:Key:abutters
     access: Pt-br:Key:access
     addr: Pt-br:Key:addr
+    addr:city: Pt-br:Key:addr:city
+    addr:country: Pt-br:Key:addr:country
+    addr:district: Pt-br:Key:addr:district
+    addr:door: Pt-br:Key:addr:door
+    addr:floor: Pt-br:Key:addr:floor
+    addr:full: Pt-br:Key:addr:full
+    addr:hamlet: Pt-br:Key:addr:hamlet
+    addr:housename: Pt-br:Key:addr:housename
+    addr:housenumber: Pt-br:Key:addr:housenumber
+    addr:inclusion: Pt-br:Key:addr:inclusion
+    addr:interpolation: Pt-br:Key:addr:interpolation
+    addr:postcode: Pt-br:Key:addr:postcode
+    addr:province: Pt-br:Key:addr:province
+    addr:state: Pt-br:Key:addr:state
+    addr:street: Pt-br:Key:addr:street
+    addr:subdistrict: Pt-br:Key:addr:subdistrict
+    addr:unit: Pt-br:Key:addr:unit
+    admin_level: Pt-br:Key:admin level
     aerialway: Pt-br:Key:aerialway
     aeroway: Pt-br:Key:aeroway
+    alt_name: Pt-br:Key:alt name
     amenity: Pt-br:Key:amenity
     area: Pt-br:Key:area
     barrier: Pt-br:Key:barrier
     bicycle: Pt-br:Key:bicycle
+    bicycle_parking: Pt-br:Key:bicycle parking
     boat: Pt-br:Key:boat
     border_type: Pt-br:Key:border type
     boundary: Pt-br:Key:boundary
     bridge: Pt-br:Key:bridge
     building: Pt-br:Key:building
+    building:levels: Pt-br:Key:building:levels
+    bus: Pt-br:Key:bus
     cables: Pt-br:Key:cables
     cep: Pt-br:Key:cep
     construction: Pt-br:Key:construction
     contact: Pt-br:Key:contact
+    contact:email: Pt-br:Key:contact:email
+    contact:fax: Pt-br:Key:contact:fax
+    contact:phone: Pt-br:Key:contact:phone
+    contact:webcam: Pt-br:Key:contact:webcam
+    contact:website: Pt-br:Key:contact:website
     craft: Pt-br:Key:craft
     created_by: Pt-br:Key:created by
     crossing: Pt-br:Key:crossing
     cuisine: Pt-br:Key:cuisine
     cutting: Pt-br:Key:cutting
     cycleway: Pt-br:Key:cycleway
+    diet:*: Pt-br:Key:diet:*
+    driving_side: Pt-br:Key:driving side
     ele: Pt-br:Key:ele
     electrified: Pt-br:Key:electrified
     embankment: Pt-br:Key:embankment
     emergency: Pt-br:Key:emergency
     fenced: Pt-br:Key:fenced
+    fishing: Pt-br:Key:fishing
     foot: Pt-br:Key:foot
     frequency: Pt-br:Key:frequency
     geological: Pt-br:Key:geological
@@ -4157,15 +5526,21 @@ pt-br:
     icao: Pt-br:Key:icao
     ice_road: Pt-br:Key:ice road
     incline: Pt-br:Key:incline
+    int_name: Pt-br:Key:int name
+    int_ref: Pt-br:Key:int ref
     intermittent: Pt-br:Key:intermittent
     internet_access: Pt-br:Key:internet access
     is_in: Pt-br:Key:is in
+    is_in:city: Pt-br:Key:is in:city
+    is_in:country: Pt-br:Key:is in:country
+    is_in:country_code: Pt-br:Key:is in:country code
     junction: Pt-br:Key:junction
     landuse: Pt-br:Key:landuse
     lanes: Pt-br:Key:lanes
     leisure: Pt-br:Key:leisure
     listed_status: Pt-br:Key:listed status
     lit: Pt-br:Key:lit
+    loc_name: Pt-br:Key:loc name
     lock: Pt-br:Key:lock
     man_made: Pt-br:Key:man made
     maxdraught: Pt-br:Key:maxdraught
@@ -4177,15 +5552,25 @@ pt-br:
     maxweight: Pt-br:Key:maxweight
     military: Pt-br:Key:military
     mooring: Pt-br:Key:mooring
+    motor_vehicle: Pt-br:Key:motor vehicle
     motorcar: Pt-br:Key:motorcar
     motorcycle: Pt-br:Key:motorcycle
     motorroad: Pt-br:Key:motorroad
     mountain_pass: Pt-br:Key:mountain pass
     mtb: Pt-br:Key:mtb
+    mtb:description: Pt-br:Key:mtb:description
+    mtb:scale: Pt-br:Key:mtb:scale
+    mtb:scale:imba: Pt-br:Key:mtb:scale:imba
+    mtb:scale:uphill: Pt-br:Key:mtb:scale:uphill
     name: Pt-br:Key:name
+    nat_name: Pt-br:Key:nat name
+    nat_ref: Pt-br:Key:nat ref
     natural: Pt-br:Key:natural
+    ncn_ref: Pt-br:Key:ncn ref
     noname: Pt-br:Key:noname
     office: Pt-br:Key:office
+    official_name: Pt-br:Key:official name
+    old_name: Pt-br:Key:old name
     oneway: Pt-br:Key:oneway
     operator: Pt-br:Key:operator
     overtaking: Pt-br:Key:overtaking
@@ -4198,18 +5583,38 @@ pt-br:
     public_transport: Pt-br:Key:public transport
     railway: Pt-br:Key:railway
     ref: Pt-br:Key:ref
+    ref:*: Pt-br:Key:ref:*
+    ref:INSEE: Pt-br:Key:ref:INSEE
+    ref:bag: Pt-br:Key:ref:bag
+    ref:bufa: Pt-br:Key:ref:bufa
+    ref:isil: Pt-br:Key:ref:isil
+    ref:lmi: Pt-br:Key:ref:lmi
+    ref:mhs: Pt-br:Key:ref:mhs
+    ref:nid: Pt-br:Key:ref:nid
+    ref:rce: Pt-br:Key:ref:rce
+    ref:sandre: Pt-br:Key:ref:sandre
+    ref:svhl: Pt-br:Key:ref:svhl
+    ref:whc: Pt-br:Key:ref:whc
+    reg_name: Pt-br:Key:reg name
+    reg_ref: Pt-br:Key:reg ref
     religion: Pt-br:Key:religion
     route: Pt-br:Key:route
     sac_scale: Pt-br:Key:sac scale
     seamark: Pt-br:Key:seamark
     seasonal: Pt-br:Key:seasonal
+    second_hand: Pt-br:Key:second hand
+    segregated: Pt-br:Key:segregated
     service: Pt-br:Key:service
     shop: Pt-br:Key:shop
+    sidewalk: Pt-br:Key:sidewalk
     ski: Pt-br:Key:ski
     smoothness: Pt-br:Key:smoothness
     source: Pt-br:Key:source
+    source_ref: Pt-br:Key:source ref
     sport: Pt-br:Key:sport
     surface: Pt-br:Key:surface
+    taxi: Pt-br:Key:taxi
+    tiger: Pt-br:Key:tiger
     tourism: Pt-br:Key:tourism
     tracktype: Pt-br:Key:tracktype
     traffic_calming: Pt-br:Key:traffic calming
@@ -4217,8 +5622,11 @@ pt-br:
     tunnel: Pt-br:Key:tunnel
     type: Pt-br:Key:type
     usage: Pt-br:Key:usage
+    vehicle: Pt-br:Key:vehicle
     voltage: Pt-br:Key:voltage
     waterway: Pt-br:Key:waterway
+    wheelchair: Pt-br:Key:wheelchair
+    wikipedia: Pt-br:Key:wikipedia
     winter_road: Pt-br:Key:winter road
     wires: Pt-br:Key:wires
   tag:
@@ -4260,6 +5668,7 @@ pt-br:
     amenity=doctors: Pt-br:Tag:amenity=doctors
     amenity=drinking_water: Pt-br:Tag:amenity=drinking water
     amenity=embassy: Pt-br:Tag:amenity=embassy
+    amenity=emergency_phone: Pt-br:Tag:amenity=emergency phone
     amenity=ev_charging: Pt-br:Tag:amenity=ev charging
     amenity=fast_food: Pt-br:Tag:amenity=fast food
     amenity=ferry_terminal: Pt-br:Tag:amenity=ferry terminal
@@ -4317,12 +5726,14 @@ pt-br:
     barrier=retaining_wall: Pt-br:Tag:barrier=retaining wall
     barrier=toll_booth: Pt-br:Tag:barrier=toll booth
     barrier=wall: Pt-br:Tag:barrier=wall
+    border_type=IALA: Pt-br:Tag:border type=IALA
     boundary=administrative: Pt-br:Tag:boundary=administrative
     boundary=civil: Pt-br:Tag:boundary=civil
     boundary=maritime: Pt-br:Tag:boundary=maritime
     boundary=national_park: Pt-br:Tag:boundary=national park
     boundary=political: Pt-br:Tag:boundary=political
     boundary=protected_area: Pt-br:Tag:boundary=protected area
+    bridge=viaduct: Pt-br:Tag:bridge=viaduct
     building=house: Pt-br:Tag:building=house
     craft=agricultural_engines: Pt-br:Tag:craft=agricultural engines
     craft=basket_maker: Pt-br:Tag:craft=basket maker
@@ -4381,6 +5792,7 @@ pt-br:
     highway=bus_guideway: Pt-br:Tag:highway=bus guideway
     highway=bus_stop: Pt-br:Tag:highway=bus stop
     highway=byway: Pt-br:Tag:highway=byway
+    highway=corridor: Pt-br:Tag:highway=corridor
     highway=crossing: Pt-br:Tag:highway=crossing
     highway=cycleway: Pt-br:Tag:highway=cycleway
     highway=emergency_access_point: Pt-br:Tag:highway=emergency access point
@@ -4397,11 +5809,13 @@ pt-br:
     highway=pedestrian: Pt-br:Tag:highway=pedestrian
     highway=platform: Pt-br:Tag:highway=platform
     highway=primary: Pt-br:Tag:highway=primary
+    highway=primary_link: Pt-br:Tag:highway=primary link
     highway=raceway: Pt-br:Tag:highway=raceway
     highway=residential: Pt-br:Tag:highway=residential
     highway=rest_area: Pt-br:Tag:highway=rest area
     highway=road: Pt-br:Tag:highway=road
     highway=secondary: Pt-br:Tag:highway=secondary
+    highway=secondary_link: Pt-br:Tag:highway=secondary link
     highway=service: Pt-br:Tag:highway=service
     highway=services: Pt-br:Tag:highway=services
     highway=speed_camera: Pt-br:Tag:highway=speed camera
@@ -4412,6 +5826,7 @@ pt-br:
     highway=track: Pt-br:Tag:highway=track
     highway=traffic_signals: Pt-br:Tag:highway=traffic signals
     highway=trunk: Pt-br:Tag:highway=trunk
+    highway=trunk_link: Pt-br:Tag:highway=trunk link
     highway=turning_circle: Pt-br:Tag:highway=turning circle
     highway=unclassified: Pt-br:Tag:highway=unclassified
     historic=archaeological_site: Pt-br:Tag:historic=archaeological site
@@ -4432,6 +5847,7 @@ pt-br:
     landuse=cemetery: Pt-br:Tag:landuse=cemetery
     landuse=commercial: Pt-br:Tag:landuse=commercial
     landuse=farm: Pt-br:Tag:landuse=farm
+    landuse=farmland: Pt-br:Tag:landuse=farmland
     landuse=farmyard: Pt-br:Tag:landuse=farmyard
     landuse=forest: Pt-br:Tag:landuse=forest
     landuse=garages: Pt-br:Tag:landuse=garages
@@ -4455,6 +5871,7 @@ pt-br:
     leisure=common: Pt-br:Tag:leisure=common
     leisure=dance: Pt-br:Tag:leisure=dance
     leisure=dog_park: Pt-br:Tag:leisure=dog park
+    leisure=fishing: Pt-br:Tag:leisure=fishing
     leisure=garden: Pt-br:Tag:leisure=garden
     leisure=golf_course: Pt-br:Tag:leisure=golf course
     leisure=ice_rink: Pt-br:Tag:leisure=ice rink
@@ -4625,6 +6042,7 @@ pt-br:
     shop=erotic: Pt-br:Tag:shop=erotic
     shop=fabric: Pt-br:Tag:shop=fabric
     shop=farm: Pt-br:Tag:shop=farm
+    shop=fishing: Pt-br:Tag:shop=fishing
     shop=florist: Pt-br:Tag:shop=florist
     shop=frame: Pt-br:Tag:shop=frame
     shop=funeral_directors: Pt-br:Tag:shop=funeral directors
@@ -4641,6 +6059,7 @@ pt-br:
     shop=hearing_aids: Pt-br:Tag:shop=hearing aids
     shop=hifi: Pt-br:Tag:shop=hifi
     shop=hunting: Pt-br:Tag:shop=hunting
+    shop=ice_cream: Pt-br:Tag:shop=ice cream
     shop=insurance: Pt-br:Tag:shop=insurance
     shop=interior_decoration: Pt-br:Tag:shop=interior decoration
     shop=jewelry: Pt-br:Tag:shop=jewelry
@@ -4671,15 +6090,17 @@ pt-br:
     shop=tobacco: Pt-br:Tag:shop=tobacco
     shop=toys: Pt-br:Tag:shop=toys
     shop=trade: Pt-br:Tag:shop=trade
+    shop=tyres: Pt-br:Tag:shop=tyres
     shop=vacant: Pt-br:Tag:shop=vacant
     shop=vacuum_cleaner: Pt-br:Tag:shop=vacuum cleaner
     shop=variety_store: Pt-br:Tag:shop=variety store
     shop=video: Pt-br:Tag:shop=video
-    source=IBGE: Pt-br:Tag:source=IBGE
+    sport=golf: Pt-br:Tag:sport=golf
     sport=soccer: Pt-br:Tag:sport=soccer
     tourism=alpine_hut: Pt-br:Tag:tourism=alpine hut
     tourism=artwork: Pt-br:Tag:tourism=artwork
     tourism=attraction: Pt-br:Tag:tourism=attraction
+    tourism=bed_and_breakfast: Pt-br:Tag:tourism=bed and breakfast
     tourism=camp_site: Pt-br:Tag:tourism=camp site
     tourism=caravan_site: Pt-br:Tag:tourism=caravan site
     tourism=chalet: Pt-br:Tag:tourism=chalet
@@ -4705,8 +6126,16 @@ pt-br:
     waterway=stream: Pt-br:Tag:waterway=stream
     waterway=turning_point: Pt-br:Tag:waterway=turning point
     waterway=weir: Pt-br:Tag:waterway=weir
+    wetland=bog: Pt-br:Tag:wetland=bog
+    wetland=mangrove: Pt-br:Tag:wetland=mangrove
+    wetland=marsh: Pt-br:Tag:wetland=marsh
+    wetland=reedbed: Pt-br:Tag:wetland=reedbed
+    wetland=saltmarsh: Pt-br:Tag:wetland=saltmarsh
+    wetland=swamp: Pt-br:Tag:wetland=swamp
+    wetland=tidalflat: Pt-br:Tag:wetland=tidalflat
 ro:
   key:
+    amenity: Ro:Key:amenity
     leisure: Ro:Key:leisure
     tracktype: Ro:Key:tracktype
   tag:
@@ -4714,14 +6143,25 @@ ro:
     junction=roundabout: Ro:Tag:junction=roundabout
 ru:
   key:
+    abandoned: RU:Key:abandoned
     abutters: RU:Key:abutters
     access: RU:Key:access
     addr: RU:Key:addr
+    addr:city: RU:Key:addr:city
+    addr:country: RU:Key:addr:country
     addr:flats: RU:Key:addr:flats
+    addr:housename: RU:Key:addr:housename
+    addr:housenumber: RU:Key:addr:housenumber
+    addr:interpolation: RU:Key:addr:interpolation
+    addr:letter: RU:Key:addr:letter
     addr:place: RU:Key:addr:place
+    addr:postcode: RU:Key:addr:postcode
+    addr:street: RU:Key:addr:street
     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
     area: RU:Key:area
     area:highway: RU:Key:area:highway
@@ -4736,12 +6176,14 @@ ru:
     brand: RU:Key:brand
     bridge: RU:Key:bridge
     building: RU:Key:building
+    building:height: RU:Key:building:height
     building:levels: RU:Key:building:levels
     building:material: RU:Key:building:material
     building:min_level: RU:Key:building:min level
     building:part: RU:Key:building:part
     building:parts: RU:Key:building:parts
     bunker_type: RU:Key:bunker type
+    bus: RU:Key:bus
     cafe: RU:Key:cafe
     capacity: RU:Key:capacity
     check_date: RU:Key:check date
@@ -4751,6 +6193,9 @@ ru:
     comment: RU:Key:comment
     construction: RU:Key:construction
     contact: RU:Key:contact
+    contact:fax: RU:Key:contact:fax
+    contact:phone: RU:Key:contact:phone
+    contact:website: RU:Key:contact:website
     covered: RU:Key:covered
     craft: RU:Key:craft
     created_by: RU:Key:created by
@@ -4760,18 +6205,22 @@ ru:
     cutting: RU:Key:cutting
     denomination: RU:Key:denomination
     description: RU:Key:description
+    description:ru: RU:Key:description:ru
     designation: RU:Key:designation
     direction: RU:Key:direction
     dispensing: RU:Key:dispensing
     disused: RU:Key:disused
+    disused:shop: RU:Key:disused:shop
     drive_in: RU:Key:drive in
     ele: RU:Key:ele
     electrified: RU:Key:electrified
     embankment: RU:Key:embankment
     emergency: RU:Key:emergency
     entrance: RU:Key:entrance
+    est_width: RU:Key:est width
     exit: RU:Key:exit
     fast_food: RU:Key:fast food
+    fax: RU:Key:fax
     fee: RU:Key:fee
     fence_type: RU:Key:fence type
     ferry: RU:Key:ferry
@@ -4780,12 +6229,18 @@ ru:
     footway: RU:Key:footway
     ford: RU:Key:ford
     fuel: RU:Key:fuel
+    fuel:cng: RU:Key:fuel:cng
+    fuel:lpg: RU:Key:fuel:lpg
+    further: RU:Key:further
+    further:access: RU:Key:further:access
+    further:vehicle: RU:Key:further:vehicle
     gauge: RU:Key:gauge
     generator:output: RU:Key:generator:output
     generator:source: RU:Key:generator:source
     gvr:code: RU:Key:gvr:code
     handrail: RU:Key:handrail
     height: RU:Key:height
+    hgv: RU:Key:hgv
     highway: RU:Key:highway
     historic: RU:Key:historic
     horse: RU:Key:horse
@@ -4793,6 +6248,7 @@ ru:
     incline: RU:Key:incline
     information: RU:Key:information
     inscription: RU:Key:inscription
+    int_name: RU:Key:int name
     intermittent: RU:Key:intermittent
     internet_access: RU:Key:internet access
     junction: RU:Key:junction
@@ -4801,9 +6257,12 @@ ru:
     landuse: RU:Key:landuse
     lanes: RU:Key:lanes
     layer: RU:Key:layer
+    leaf_type: RU:Key:leaf type
     leisure: RU:Key:leisure
     length: RU:Key:length
     level: RU:Key:level
+    loc_name: RU:Key:loc name
+    loc_ref: RU:Key:loc ref
     man_made: RU:Key:man made
     manhole: RU:Key:manhole
     maxaxleload: RU:Key:maxaxleload
@@ -4817,12 +6276,21 @@ ru:
     military: RU:Key:military
     min_height: RU:Key:min height
     minspeed: RU:Key:minspeed
+    moped: RU:Key:moped
+    motor_vehicle: RU:Key:motor vehicle
+    motorcycle: RU:Key:motorcycle
     motorroad: RU:Key:motorroad
     name: RU:Key:name
+    name:ru: RU:Key:name:ru
+    nat_name: RU:Key:nat name
+    nat_ref: RU:Key:nat ref
     natural: RU:Key:natural
     noexit: RU:Key:noexit
     note: RU:Key:note
     office: RU:Key:office
+    official_name: RU:Key:official name
+    old_name: RU:Key:old name
+    old_ref: RU:Key:old ref
     oneway: RU:Key:oneway
     opening_date: RU:Key:opening date
     opening_hours: RU:Key:opening hours
@@ -4837,13 +6305,21 @@ ru:
     piste:type: RU:Key:piste:type
     place: RU:Key:place
     playground: RU:Key:playground
+    police: RU:Key:police
     population: RU:Key:population
     power: RU:Key:power
+    power_source: RU:Key:power source
+    previous: RU:Key:previous
+    previous:access: RU:Key:previous:access
+    previous:vehicle: RU:Key:previous:vehicle
     priority_road: RU:Key:priority road
     psv: RU:Key:psv
     railway: RU:Key:railway
     ramp: RU:Key:ramp
     ref: RU:Key:ref
+    reference: RU:Key:reference
+    reg_name: RU:Key:reg name
+    reg_ref: RU:Key:reg ref
     religion: RU:Key:religion
     resource: RU:Key:resource
     roof:material: RU:Key:roof:material
@@ -4851,6 +6327,7 @@ ru:
     ruins: RU:Key:ruins
     seasonal:snowfall:regaintime: RU:Key:seasonal:snowfall:regaintime
     service: RU:Key:service
+    service_times: RU:Key:service times
     shelter: RU:Key:shelter
     shelter_type: RU:Key:shelter type
     shop: RU:Key:shop
@@ -4863,6 +6340,7 @@ ru:
     sorting_name: RU:Key:sorting name
     source: RU:Key:source
     source:maxspeed: RU:Key:source:maxspeed
+    source_ref: RU:Key:source ref
     species: RU:Key:species
     sport: RU:Key:sport
     surface: RU:Key:surface
@@ -4873,9 +6351,13 @@ ru:
     tracktype: RU:Key:tracktype
     traffic_calming: RU:Key:traffic calming
     traffic_sign: RU:Key:traffic sign
+    tram: RU:Key:tram
+    trolleybus: RU:Key:trolleybus
     tunnel: RU:Key:tunnel
     turn: RU:Key:turn
+    turn:lanes: RU:Key:turn:lanes
     type: RU:Key:type
+    vehicle: RU:Key:vehicle
     voltage: RU:Key:voltage
     water: RU:Key:water
     waterway: RU:Key:waterway
@@ -4883,11 +6365,21 @@ ru:
     wheelchair: RU:Key:wheelchair
     width: RU:Key:width
     wikipedia: RU:Key:wikipedia
+    wikipedia:ru: RU:Key:wikipedia:ru
     winter_road: RU:Key:winter road
     wood: RU:Key:wood
   tag:
-    abandoned=yes: RU:Tag:abandoned=yes
+    access=agricultural: RU:Tag:access=agricultural
+    access=delivery: RU:Tag:access=delivery
     access=designated: RU:Tag:access=designated
+    access=destination: RU:Tag:access=destination
+    access=forestry: RU:Tag:access=forestry
+    access=no: RU:Tag:access=no
+    access=official: RU:Tag:access=official
+    access=permissive: RU:Tag:access=permissive
+    access=private: RU:Tag:access=private
+    access=unknown: RU:Tag:access=unknown
+    access=yes: RU:Tag:access=yes
     aeroway=aerodrome: RU:Tag:aeroway=aerodrome
     aeroway=apron: RU:Tag:aeroway=apron
     aeroway=gate: RU:Tag:aeroway=gate
@@ -4917,6 +6409,7 @@ ru:
     amenity=car_sharing: RU:Tag:amenity=car sharing
     amenity=car_wash: RU:Tag:amenity=car wash
     amenity=casino: RU:Tag:amenity=casino
+    amenity=charging_station: RU:Tag:amenity=charging station
     amenity=cinema: RU:Tag:amenity=cinema
     amenity=clinic: RU:Tag:amenity=clinic
     amenity=clock: RU:Tag:amenity=clock
@@ -4965,6 +6458,7 @@ ru:
     amenity=school: RU:Tag:amenity=school
     amenity=shelter: RU:Tag:amenity=shelter
     amenity=shower: RU:Tag:amenity=shower
+    amenity=smoking_area: RU:Tag:amenity=smoking area
     amenity=social_facility: RU:Tag:amenity=social facility
     amenity=stripclub: RU:Tag:amenity=stripclub
     amenity=taxi: RU:Tag:amenity=taxi
@@ -4992,9 +6486,15 @@ ru:
     barrier=toll_booth: RU:Tag:barrier=toll booth
     barrier=turnstile: RU:Tag:barrier=turnstile
     barrier=wall: RU:Tag:barrier=wall
+    bicycle=designated: RU:Tag:bicycle=designated
+    building=cathedral: RU:Tag:building=cathedral
+    building=chapel: RU:Tag:building=chapel
+    building=church: RU:Tag:building=church
     building=detached: RU:Tag:building=detached
     building=dormitory: RU:Tag:building=dormitory
     building=entrance: RU:Tag:building=entrance
+    building=garage: RU:Tag:building=garage
+    building=garages: RU:Tag:building=garages
     building=roof: RU:Tag:building=roof
     building=shed: RU:Tag:building=shed
     building=stable: RU:Tag:building=stable
@@ -5022,6 +6522,7 @@ ru:
     emergency=fire_hydrant: RU:Tag:emergency=fire hydrant
     emergency=fire_water_pond: RU:Tag:emergency=fire water pond
     fast_food=cafeteria: RU:Tag:fast food=cafeteria
+    foot=designated: RU:Tag:foot=designated
     footway=crossing: RU:Tag:footway=crossing
     footway=sidewalk: RU:Tag:footway=sidewalk
     geological=palaeontological_site: RU:Tag:geological=palaeontological site
@@ -5079,6 +6580,7 @@ ru:
     historic=wayside_cross: RU:Tag:historic=wayside cross
     historic=wayside_shrine: RU:Tag:historic=wayside shrine
     historic=wreck: RU:Tag:historic=wreck
+    horse=designated: RU:Tag:horse=designated
     information=guidepost: RU:Tag:information=guidepost
     junction=roundabout: RU:Tag:junction=roundabout
     landuse=allotments: RU:Tag:landuse=allotments
@@ -5108,6 +6610,7 @@ ru:
     landuse=village_green: RU:Tag:landuse=village green
     landuse=vineyard: RU:Tag:landuse=vineyard
     leisure=beach_resort: RU:Tag:leisure=beach resort
+    leisure=common: RU:Tag:leisure=common
     leisure=dance: RU:Tag:leisure=dance
     leisure=firepit: RU:Tag:leisure=firepit
     leisure=ice_rink: RU:Tag:leisure=ice rink
@@ -5120,6 +6623,8 @@ ru:
     leisure=swimming_pool: RU:Tag:leisure=swimming pool
     leisure=track: RU:Tag:leisure=track
     leisure=water_park: RU:Tag:leisure=water park
+    living_street: RU:Tag:living street
+    living_street=yes: RU:Tag:living street=yes
     man_made=adit: RU:Tag:man made=adit
     man_made=beacon: RU:Tag:man made=beacon
     man_made=breakwater: RU:Tag:man made=breakwater
@@ -5174,6 +6679,11 @@ ru:
     office=telecommunication: RU:Tag:office=telecommunication
     office=travel_agent: RU:Tag:office=travel agent
     opening_hours=24/7: RU:Tag:opening hours=24/7
+    overtaking=backward: RU:Tag:overtaking=backward
+    overtaking=both: RU:Tag:overtaking=both
+    overtaking=forward: RU:Tag:overtaking=forward
+    overtaking=no: RU:Tag:overtaking=no
+    overtaking=yes: RU:Tag:overtaking=yes
     pipeline=marker: RU:Tag:pipeline=marker
     place=allotments: RU:Tag:place=allotments
     place=city: RU:Tag:place=city
@@ -5194,6 +6704,7 @@ ru:
     power=sub_station: RU:Tag:power=sub station
     power=substation: RU:Tag:power=substation
     power=tower: RU:Tag:power=tower
+    power=transformer: RU:Tag:power=transformer
     public_transport=platform: RU:Tag:public transport=platform
     public_transport=station: RU:Tag:public transport=station
     public_transport=stop_position: RU:Tag:public transport=stop position
@@ -5207,14 +6718,19 @@ ru:
     railway=subway: RU:Tag:railway=subway
     railway=subway_entrance: RU:Tag:railway=subway entrance
     railway=tram: RU:Tag:railway=tram
+    religion=pagan: RU:Tag:religion=pagan
     route=bus: RU:Tag:route=bus
     route=ferry: RU:Tag:route=ferry
     route=railway: RU:Tag:route=railway
     route=train: RU:Tag:route=train
     route=tram: RU:Tag:route=tram
     service=alley: RU:Tag:service=alley
+    service=dealer: RU:Tag:service=dealer
     service=driveway: RU:Tag:service=driveway
     service=parking_aisle: RU:Tag:service=parking aisle
+    service=parts: RU:Tag:service=parts
+    service=repair: RU:Tag:service=repair
+    service=tyres: RU:Tag:service=tyres
     shop=alcohol: RU:Tag:shop=alcohol
     shop=anime: RU:Tag:shop=anime
     shop=antiques: RU:Tag:shop=antiques
@@ -5304,6 +6820,7 @@ ru:
     shop=toys: RU:Tag:shop=toys
     shop=trade: RU:Tag:shop=trade
     shop=travel_agency: RU:Tag:shop=travel agency
+    shop=vacant: RU:Tag:shop=vacant
     shop=vacuum_cleaner: RU:Tag:shop=vacuum cleaner
     shop=variety_store: RU:Tag:shop=variety store
     shop=video: RU:Tag:shop=video
@@ -5315,9 +6832,11 @@ ru:
     tourism=attraction: RU:Tag:tourism=attraction
     tourism=camp_site: RU:Tag:tourism=camp site
     tourism=chalet: RU:Tag:tourism=chalet
+    tourism=guest_house: RU:Tag:tourism=guest house
     tourism=hostel: RU:Tag:tourism=hostel
     tourism=hotel: RU:Tag:tourism=hotel
     tourism=information: RU:Tag:tourism=information
+    tourism=motel: RU:Tag:tourism=motel
     tourism=museum: RU:Tag:tourism=museum
     tourism=picnic_site: RU:Tag:tourism=picnic site
     tourism=theme_park: RU:Tag:tourism=theme park
@@ -5335,16 +6854,23 @@ ru:
     waterway=stream: RU:Tag:waterway=stream
     waterway=weir: RU:Tag:waterway=weir
     wood=mixed: RU:Tag:wood=mixed
+sh:
+  key:
+    tracktype: Sh:Key:tracktype
 sq:
   key:
     highway: Sq:Key:highway
 sv:
   key:
     access: Sv:Key:access
+    name: Sv:Key:name
   tag:
     aerialway=cable_car: Sv:Tag:aerialway=cable car
     amenity=place_of_worship: Sv:Tag:amenity=place of worship
+    amenity=recycling: Sv:Tag:amenity=recycling
+    highway=path: Sv:Tag:highway=path
     highway=rest_area: Sv:Tag:highway=rest area
+    highway=track: Sv:Tag:highway=track
     junction=roundabout: Sv:Tag:junction=roundabout
     leisure=dog_park: Sv:Tag:leisure=dog park
     railway=rail: Sv:Tag:railway=rail
@@ -5359,27 +6885,141 @@ tr:
     sport: Tr:Key:sport
 uk:
   key:
+    abutters: Uk:Key:abutters
+    access: Uk:Key:access
+    alt_name: Uk:Key:alt name
+    amenity: Uk:Key:amenity
+    area: Uk:Key:area
+    bench: Uk:Key:bench
+    bicycle: Uk:Key:bicycle
     bicycle_parking: Uk:Key:bicycle parking
+    bridge: Uk:Key:bridge
+    building: Uk:Key:building
+    building:use: Uk:Key:building:use
+    cutting: Uk:Key:cutting
+    embankment: Uk:Key:embankment
+    emergency: Uk:Key:emergency
+    entrance: Uk:Key:entrance
+    est_width: Uk:Key:est width
+    ford: Uk:Key:ford
+    highway: Uk:Key:highway
+    int_name: Uk:Key:int name
+    lanes: Uk:Key:lanes
+    layer: Uk:Key:layer
+    loc_name: Uk:Key:loc name
+    maxheight: Uk:Key:maxheight
+    maxspeed: Uk:Key:maxspeed
+    motorroad: Uk:Key:motorroad
+    name: Uk:Key:name
+    name:el: Uk:Key:name:el
+    name:en: Uk:Key:name:en
+    name:ja: Uk:Key:name:ja
+    name:ru: Uk:Key:name:ru
+    nat_name: Uk:Key:nat name
+    office: Uk:Key:office
+    official_name: Uk:Key:official name
+    old_name: Uk:Key:old name
+    oneway: Uk:Key:oneway
+    oneway:bicycle: Uk:Key:oneway:bicycle
+    oneway:moped: Uk:Key:oneway:moped
+    place: Uk:Key:place
+    playground: Uk:Key:playground
+    railway: Uk:Key:railway
+    ref: Uk:Key:ref
+    reference: Uk:Key:reference
+    reg_name: Uk:Key:reg name
+    service: Uk:Key:service
+    shelter_type: Uk:Key:shelter type
+    surface: Uk:Key:surface
+    tracktype: Uk:Key:tracktype
+    traffic_sign: Uk:Key:traffic sign
+    tunnel: Uk:Key:tunnel
+    url: Uk:Key:url
+    vehicle: Uk:Key:vehicle
+    waterway: Uk:Key:waterway
+    width: Uk:Key:width
+    wood: Uk:Key:wood
   tag:
+    amenity=atm: Uk:Tag:amenity=atm
+    amenity=bench: Uk:Tag:amenity=bench
     amenity=bicycle_parking: Uk:Tag:amenity=bicycle parking
     amenity=bicycle_rental: Uk:Tag:amenity=bicycle rental
+    amenity=school: Uk:Tag:amenity=school
+    amenity=shelter: Uk:Tag:amenity=shelter
+    amenity=university: Uk:Tag:amenity=university
+    emergency=fire_hydrant: Uk:Tag:emergency=fire hydrant
+    highway=bridleway: Uk:Tag:highway=bridleway
+    highway=ford: Uk:Tag:highway=ford
+    highway=living_street: Uk:Tag:highway=living street
+    highway=motorway: Uk:Tag:highway=motorway
+    highway=motorway_link: Uk:Tag:highway=motorway link
+    highway=pedestrian: Uk:Tag:highway=pedestrian
+    highway=primary: Uk:Tag:highway=primary
+    highway=residential: Uk:Tag:highway=residential
+    highway=road: Uk:Tag:highway=road
+    highway=secondary: Uk:Tag:highway=secondary
+    highway=service: Uk:Tag:highway=service
+    highway=tertiary: Uk:Tag:highway=tertiary
+    highway=track: Uk:Tag:highway=track
+    highway=trunk: Uk:Tag:highway=trunk
+    highway=unclassified: Uk:Tag:highway=unclassified
+    historic=memorial: Uk:Tag:historic=memorial
+    historic=monument: Uk:Tag:historic=monument
+    natural=grassland: Uk:Tag:natural=grassland
+    natural=scrub: Uk:Tag:natural=scrub
+    office=accountant: Uk:Tag:office=accountant
+    office=architect: Uk:Tag:office=architect
+    office=company: Uk:Tag:office=company
+    office=employment_agency: Uk:Tag:office=employment agency
+    office=estate_agent: Uk:Tag:office=estate agent
+    office=government: Uk:Tag:office=government
+    office=insurance: Uk:Tag:office=insurance
+    office=it: Uk:Tag:office=it
+    office=lawyer: Uk:Tag:office=lawyer
+    office=newspaper: Uk:Tag:office=newspaper
+    office=ngo: Uk:Tag:office=ngo
+    office=quango: Uk:Tag:office=quango
+    office=research: Uk:Tag:office=research
+    office=telecommunication: Uk:Tag:office=telecommunication
+    office=travel_agent: Uk:Tag:office=travel agent
+    railway=halt: Uk:Tag:railway=halt
+    railway=rail: Uk:Tag:railway=rail
+    railway=station: Uk:Tag:railway=station
+    railway=tram: Uk:Tag:railway=tram
     shop=antiques: Uk:Tag:shop=antiques
     shop=bicycle: Uk:Tag:shop=bicycle
     shop=second_hand: Uk:Tag:shop=second hand
     vending=bicycle_tube: Uk:Tag:vending=bicycle tube
+    waterway=riverbank: Uk:Tag:waterway=riverbank
+vi:
+  key:
+    addr: Vi:Key:addr
+    highway: Vi:Key:highway
 zh-hans:
   key:
+    building:part: Zh-hans:Key:building:part
     cuisine: Zh-hans:Key:cuisine
+    ele: Zh-hans:Key:ele
+    height: Zh-hans:Key:height
+    highway: Zh-hans:Key:highway
+    landuse: Zh-hans:Key:landuse
     name: Zh-hans:Key:name
+    place: Zh-hans:Key:place
+    railway: Zh-hans:Key:railway
+    toll: Zh-hans:Key:toll
   tag:
     amenity=cafe: Zh-hans:Tag:amenity=cafe
+    barrier=toll_booth: Zh-hans:Tag:barrier=toll booth
+    barrier=wall: Zh-hans:Tag:barrier=wall
 zh-hant:
   key:
     amenity: Zh-hant:Key:amenity
+    diet:*: Zh-hant:Key:diet:*
     fixme: Zh-hant:Key:fixme
     fuel: Zh-hant:Key:fuel
     noexit: Zh-hant:Key:noexit
     opening_hours: Zh-hant:Key:opening hours
+    service: Zh-hant:Key:service
     tracktype: Zh-hant:Key:tracktype
     trail_visibility: Zh-hant:Key:trail visibility
   tag: