Merge remote-tracking branch 'openstreetmap/pull/891'

[rails.git] / config / wiki_pages.yml
diff --git a/config/wiki_pages.yml b/config/wiki_pages.yml

index d236e776dac9e1c02098ad542dc771a2a68dcfba..f38b7fe8dd513f6cc0e1ae5fb132a68a30f1e978 100644 (file)
--- a/config/wiki_pages.yml
+++ b/config/wiki_pages.yml
@@ -16,42 +16,85 @@ bg:
    key:
      lanes: Bg:Key:lanes
    tag:
    key:
      lanes: Bg:Key:lanes
    tag:
+    natural=heath: Bg:Tag:natural=heath
      railway=crossing: Bg:Tag:railway=crossing
      railway=level_crossing: Bg:Tag:railway=level crossing
  ca:
    key:
      name: Ca:Key:name
      railway=crossing: Bg:Tag:railway=crossing
      railway=level_crossing: Bg:Tag:railway=level crossing
  ca:
    key:
      name: Ca:Key:name
+    operator:type: Ca:Key:operator:type
    tag:
    tag:
+    landuse=farmland: Ca:Tag:landuse=farmland
      leisure=swimming_pool: Ca:Tag:leisure=swimming pool
      leisure=swimming_pool: Ca:Tag:leisure=swimming pool
+    shop=frozen_food: Ca:Tag:shop=frozen food
  cs:
    key:
      addr: Cs:Key:addr
  cs:
    key:
      addr: Cs:Key:addr
+    addr:city: Cs:Key:addr:city
      addr:conscriptionnumber: Cs:Key:addr:conscriptionnumber
      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: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:provisionalnumber: Cs:Key:addr:provisionalnumber
+    addr:state: Cs:Key:addr:state
+    addr:street: Cs:Key:addr:street
      addr:streetnumber: Cs:Key:addr:streetnumber
      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
      aerialway: Cs:Key:aerialway
      aeroway: Cs:Key:aeroway
+    alt_name: Cs:Key:alt name
      amenity: Cs:Key:amenity
      amenity: Cs:Key:amenity
+    area: Cs:Key:area
+    artwork_type: Cs:Key:artwork type
      barrier: Cs:Key:barrier
      building: Cs:Key:building
      building:flats: Cs:Key:building:flats
      building:levels: Cs:Key:building:levels
      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
      contact: Cs:Key:contact
      craft: Cs:Key:craft
+    cutting: Cs:Key:cutting
+    distance: Cs:Key:distance
      emergency: Cs:Key:emergency
      geological: Cs:Key:geological
      emergency: Cs:Key:emergency
      geological: Cs:Key:geological
+    height: Cs:Key:height
      highway: Cs:Key:highway
      historic: Cs:Key:historic
      image: Cs:Key:image
      highway: Cs:Key:highway
      historic: Cs:Key:historic
      image: Cs:Key:image
+    information: Cs:Key:information
+    int_name: Cs:Key:int name
      intermittent: Cs:Key:intermittent
      landuse: Cs:Key:landuse
      intermittent: Cs:Key:intermittent
      landuse: Cs:Key:landuse
+    leaf_cycle: Cs:Key:leaf cycle
+    leaf_type: Cs:Key:leaf type
      leisure: Cs:Key:leisure
      leisure: Cs:Key:leisure
+    length: Cs:Key:length
+    loc_name: Cs:Key:loc name
      man_made: Cs:Key:man made
      man_made: Cs:Key:man made
+    maxlength: Cs:Key:maxlength
+    mountain_pass: Cs:Key:mountain pass
      mtb:scale: Cs:Key:mtb:scale
      mtb:scale: Cs:Key:mtb:scale
+    mtb:scale:uphill: Cs:Key:mtb:scale:uphill
      name: Cs:Key:name
      name: Cs:Key:name
+    nat_name: Cs:Key:nat name
      natural: Cs:Key:natural
      office: Cs:Key:office
      natural: Cs:Key:natural
      office: Cs:Key:office
+    official_name: Cs:Key:official name
+    old_name: Cs:Key:old name
+    parking: Cs:Key:parking
      place: Cs:Key:place
      population: Cs:Key:population
      power: Cs:Key:power
      place: Cs:Key:place
      population: Cs:Key:population
      power: Cs:Key:power
@@ -59,34 +102,74 @@ cs:
      ref:ruian: Cs:Key:ref:ruian
      ref:ruian:addr: Cs:Key:ref:ruian:addr
      ref:ruian:building: Cs:Key:ref:ruian:building
      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
      route: Cs:Key:route
      salt: Cs:Key:salt
      shop: Cs:Key:shop
+    short_name: Cs:Key:short name
+    smoothness: Cs:Key:smoothness
+    sorting_name: Cs:Key:sorting name
      sport: Cs:Key:sport
      sport: Cs:Key:sport
+    surface: Cs:Key:surface
      tourism: Cs:Key:tourism
      tracktype: Cs:Key:tracktype
      water: Cs:Key:water
      waterway: Cs:Key:waterway
      tourism: Cs:Key:tourism
      tracktype: Cs:Key:tracktype
      water: Cs:Key:water
      waterway: Cs:Key:waterway
+    width: Cs:Key:width
    tag:
      amenity=baby_hatch: Cs:Tag:amenity=baby hatch
    tag:
      amenity=baby_hatch: Cs:Tag:amenity=baby hatch
+    baby_hatch=yes: Cs:Tag:baby hatch=yes
      building=farm: Cs:Tag:building=farm
      building=farm: Cs:Tag:building=farm
+    building=roof: Cs:Tag:building=roof
      building=school: Cs:Tag:building=school
      building=university: Cs:Tag:building=university
      historic=cannon: Cs:Tag:historic=cannon
      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
      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_cycle=deciduous: Cs:Tag:leaf cycle=deciduous
+    leaf_cycle=evergreen: Cs:Tag:leaf cycle=evergreen
+    leaf_cycle=mixed: Cs:Tag:leaf cycle=mixed
+    leaf_cycle=semi_deciduous: Cs:Tag:leaf cycle=semi deciduous
+    leaf_cycle=semi_evergreen: Cs:Tag:leaf cycle=semi evergreen
+    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
+    man_made=adit: Cs:Tag:man made=adit
+    man_made=mineshaft: Cs:Tag:man made=mineshaft
+    natural=arete: Cs:Tag:natural=arete
+    natural=cave_entrance: Cs:Tag:natural=cave entrance
+    natural=peak: Cs:Tag:natural=peak
+    natural=ridge: Cs:Tag:natural=ridge
+    natural=rock: Cs:Tag:natural=rock
+    natural=sinkhole: Cs:Tag:natural=sinkhole
+    natural=stone: Cs:Tag:natural=stone
+    natural=tree_row: Cs:Tag:natural=tree row
      natural=water: Cs:Tag:natural=water
      route=trolleybus: Cs:Tag:route=trolleybus
      natural=water: Cs:Tag:natural=water
      route=trolleybus: Cs:Tag:route=trolleybus
+    tourism=artwork: Cs:Tag:tourism=artwork
+    tourism=information: Cs:Tag:tourism=information
+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
  da:
    key:
      access: Da:Key:access
      fee: Da:Key:fee
      lit: Da:Key:lit
+    man_made: Da:Key:man made
      maxheight: Da:Key:maxheight
      maxspeed: Da:Key:maxspeed
      maxheight: Da:Key:maxheight
      maxspeed: Da:Key:maxspeed
+    surface: Da:Key:surface
    tag:
      amenity=community_centre: Da:Tag:amenity=community centre
      amenity=nightclub: Da:Tag:amenity=nightclub
    tag:
      amenity=community_centre: Da:Tag:amenity=community centre
      amenity=nightclub: Da:Tag:amenity=nightclub
@@ -105,11 +188,19 @@ da:
  de:
    key:
      AlpinRes_ID: DE:Key:AlpinRes ID
  de:
    key:
      AlpinRes_ID: DE:Key:AlpinRes ID
+    TODO: DE:Key:TODO
+    abandoned:*: DE:Key:abandoned:*
      abutters: DE:Key:abutters
      access: DE:Key:access
      addr: DE:Key:addr
      abutters: DE:Key:abutters
      access: DE:Key:access
      addr: DE:Key:addr
+    addr:city: DE:Key:addr:city
+    addr:country: DE:Key:addr:country
+    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
      aerialway: DE:Key:aerialway
      aeroway: DE:Key:aeroway
+    agricultural: DE:Key:agricultural
      amenity: DE:Key:amenity
      area: DE:Key:area
      asb: DE:Key:asb
      amenity: DE:Key:amenity
      area: DE:Key:area
      asb: DE:Key:asb
@@ -117,29 +208,67 @@ de:
      basin: DE:Key:basin
      beds: DE:Key:beds
      bicycle: DE:Key:bicycle
      basin: DE:Key:basin
      beds: DE:Key:beds
      bicycle: DE:Key:bicycle
+    bicycle:backward: DE:Key:bicycle:backward
      bicycle_parking: DE:Key:bicycle parking
      bicycle_road: DE:Key:bicycle road
      bicycle_parking: DE:Key:bicycle parking
      bicycle_road: DE:Key:bicycle road
+    bin: DE:Key:bin
      biosphärenwirt: DE:Key:biosphärenwirt
      biosphärenwirt: DE:Key:biosphärenwirt
+    board_type: DE:Key:board type
+    boat: DE:Key:boat
      bollard: DE:Key:bollard
      bollard: DE:Key:bollard
+    boundary: DE:Key:boundary
      brewery: DE:Key:brewery
      bridge: DE:Key:bridge
      brewery: DE:Key:brewery
      bridge: DE:Key:bridge
+    bridge:movable: DE:Key:bridge:movable
+    bridge:structure: DE:Key:bridge:structure
+    buiding: DE:Key:buiding
      building: DE:Key:building
      building: DE:Key:building
+    building:architecture: DE:Key:building:architecture
      building:condition: DE:Key:building:condition
      building:condition: DE:Key:building:condition
+    building:levels: DE:Key:building:levels
      building:material: DE:Key:building:material
      building:material: DE:Key:building:material
+    bunker_type: DE:Key:bunker type
+    busway: DE:Key:busway
      capacity: DE:Key:capacity
      capacity: DE:Key:capacity
+    castle_type: DE:Key:castle type
+    cemetery: DE:Key:cemetery
+    city_limit: DE:Key:city limit
+    class:bicycle: DE:Key:class:bicycle
      clothes: DE:Key:clothes
      club: DE:Key:club
      clothes: DE:Key:clothes
      club: DE:Key:club
+    collection_times: DE:Key:collection times
      comment: DE:Key:comment
      comment: DE:Key:comment
+    communication:bos: DE:Key:communication:bos
+    communication:microwave: DE:Key:communication:microwave
+    communication:mobile_phone: DE:Key:communication:mobile phone
+    communication:radio: DE:Key:communication:radio
+    communication:television: DE:Key:communication:television
      construction: DE:Key:construction
      contact: DE:Key:contact
      construction: DE:Key:construction
      contact: DE:Key:contact
+    contact:facebook: DE:Key:contact:facebook
+    contact:fax: DE:Key:contact:fax
+    contact:google_plus: DE:Key:contact:google plus
+    contact:phone: DE:Key:contact:phone
+    contact:website: DE:Key:contact:website
      content: DE:Key:content
      content: DE:Key:content
+    conveying: DE:Key:conveying
      country: DE:Key:country
      covered: DE:Key:covered
      craft: DE:Key:craft
      created_by: DE:Key:created by
      crossing: DE:Key:crossing
      country: DE:Key:country
      covered: DE:Key:covered
      craft: DE:Key:craft
      created_by: DE:Key:created by
      crossing: DE:Key:crossing
+    crossing:activation: DE:Key:crossing:activation
+    crossing:barrier: DE:Key:crossing:barrier
+    crossing:bell: DE:Key:crossing:bell
+    crossing:light: DE:Key:crossing:light
+    crossing:on_demand: DE:Key:crossing:on demand
+    crossing:saltire: DE:Key:crossing:saltire
      cuisine: DE:Key:cuisine
      currency: DE:Key:currency
      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:others: DE:Key:currency:others
      cutting: DE:Key:cutting
      cycleway: DE:Key:cycleway
      de:amtlicher_gemeindeschluessel: DE:Key:de:amtlicher gemeindeschluessel
      cutting: DE:Key:cutting
      cycleway: DE:Key:cycleway
      de:amtlicher_gemeindeschluessel: DE:Key:de:amtlicher gemeindeschluessel
@@ -151,8 +280,12 @@ de:
      designation: DE:Key:designation
      destination: DE:Key:destination
      diaper: DE:Key:diaper
      designation: DE:Key:designation
      destination: DE:Key:destination
      diaper: DE:Key:diaper
+    diet: DE:Key:diet
      diet:*: DE:Key:diet:*
      direction: DE:Key:direction
      diet:*: DE:Key:diet:*
      direction: DE:Key:direction
+    distance: DE:Key:distance
+    disused: DE:Key:disused
+    'disused:': 'DE:Key:disused:'
      drink: DE:Key:drink
      drive_through: DE:Key:drive through
      ele: DE:Key:ele
      drink: DE:Key:drink
      drive_through: DE:Key:drive through
      ele: DE:Key:ele
@@ -160,20 +293,36 @@ de:
      embankment: DE:Key:embankment
      emergency: DE:Key:emergency
      entrance: DE:Key:entrance
      embankment: DE:Key:embankment
      emergency: DE:Key:emergency
      entrance: DE:Key:entrance
+    fair_trade: DE:Key:fair trade
      fee: DE:Key:fee
      fence_type: DE:Key:fence type
      fetish: DE:Key:fetish
      fee: DE:Key:fee
      fence_type: DE:Key:fence type
      fetish: DE:Key:fetish
+    fireplace: DE:Key:fireplace
      fixme: DE:Key:fixme
      foot: DE:Key:foot
      footway: DE:Key:footway
      ford: DE:Key:ford
      fixme: DE:Key:fixme
      foot: DE:Key:foot
      footway: DE:Key:footway
      ford: DE:Key:ford
+    frequency: DE:Key:frequency
+    fuel: DE:Key:fuel
+    gauge: DE:Key:gauge
      generator:method: DE:Key:generator:method
      generator:output: DE:Key:generator:output
      generator:method: DE:Key:generator:method
      generator:output: DE:Key:generator:output
+    generator:output:biogas: DE:Key:generator:output:biogas
+    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:output:steam: DE:Key:generator:output:steam
      generator:source: DE:Key:generator:source
      generator:source: DE:Key:generator:source
+    generator:type: DE:Key:generator:type
      geological: DE:Key:geological
      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
      hazard: DE:Key:hazard
      hazmat: DE:Key:hazmat
      height: DE:Key:height
+    hgv: DE:Key:hgv
+    highspeed: DE:Key:highspeed
      highway: DE:Key:highway
      historic: DE:Key:historic
      horse: DE:Key:horse
      highway: DE:Key:highway
      historic: DE:Key:historic
      horse: DE:Key:horse
@@ -182,43 +331,92 @@ de:
      incline: DE:Key:incline
      informal: DE:Key:informal
      information: DE:Key:information
      incline: DE:Key:incline
      informal: DE:Key:informal
      information: DE:Key:information
+    inscription: DE:Key:inscription
+    int_name: DE:Key:int name
      intermittent: DE:Key:intermittent
      internet_access: DE:Key:internet access
      is_in: DE:Key:is in
      intermittent: DE:Key:intermittent
      internet_access: DE:Key:internet access
      is_in: DE:Key:is in
+    is_in:continent: DE:Key:is in:continent
      junction: DE:Key:junction
      junction: DE:Key:junction
+    kms: DE:Key:kms
      landuse: DE:Key:landuse
      lanes: DE:Key:lanes
      landuse: DE:Key:landuse
      lanes: DE:Key:lanes
+    lanes:bus: DE:Key:lanes:bus
+    lanes:psv: DE:Key:lanes:psv
+    lanes:psv:backward: DE:Key:lanes:psv:backward
+    lanes:psv:forward: DE:Key:lanes:psv:forward
      layer: DE:Key:layer
      layer: DE:Key:layer
+    leaf_cycle: DE:Key:leaf cycle
+    leaf_type: DE:Key:leaf type
+    left: DE:Key:left
      leisure: DE:Key:leisure
      leisure: DE:Key:leisure
+    length: DE:Key:length
      level: DE:Key:level
      lit: DE:Key:lit
      level: DE:Key:level
      lit: DE:Key:lit
+    loc_name: DE:Key:loc name
+    location: DE:Key:location
      lock: DE:Key:lock
      lock: DE:Key:lock
+    lock_name: DE:Key:lock name
      man_made: DE:Key:man made
      manhole: DE:Key:manhole
      man_made: DE:Key:man made
      manhole: DE:Key:manhole
+    max_age: DE:Key:max age
+    maxaxleload: DE:Key:maxaxleload
      maxheight: DE:Key:maxheight
      maxspeed: DE:Key:maxspeed
      maxstay: DE:Key:maxstay
      maxweight: DE:Key:maxweight
      maxwidth: DE:Key:maxwidth
      maxheight: DE:Key:maxheight
      maxspeed: DE:Key:maxspeed
      maxstay: DE:Key:maxstay
      maxweight: DE:Key:maxweight
      maxwidth: DE:Key:maxwidth
+    megalith_type: DE:Key:megalith type
+    memorial:type: DE:Key:memorial:type
      military: DE:Key:military
      military: DE:Key:military
+    min_age: DE:Key:min age
      minspeed: DE:Key:minspeed
      minspeed: DE:Key:minspeed
+    mofa: DE:Key:mofa
+    monitoring:air_quality: DE:Key:monitoring:air quality
+    monitoring:gps: DE:Key:monitoring:gps
+    monitoring:groundwater: DE:Key:monitoring:groundwater
+    monitoring:noise: DE:Key:monitoring:noise
+    monitoring:radiation: DE:Key:monitoring:radiation
+    monitoring:seismic_activity: DE:Key:monitoring:seismic activity
+    monitoring:tide_gauge: DE:Key:monitoring:tide gauge
+    monitoring:traffic: DE:Key:monitoring:traffic
+    monitoring:water_level: DE:Key:monitoring:water level
+    monitoring:weather: DE:Key:monitoring:weather
+    monument:genesis: DE:Key:monument:genesis
+    moped: DE:Key:moped
+    motor_vehicle: DE:Key:motor vehicle
+    motorboat: DE:Key:motorboat
+    motorcar: DE:Key:motorcar
+    motorcycle: DE:Key:motorcycle
      motorroad: DE:Key:motorroad
      mountain_pass: DE:Key:mountain pass
      mtb:scale: DE:Key:mtb:scale
      name: DE:Key:name
      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
+    narrow: DE:Key:narrow
      natural: DE:Key:natural
      network: DE:Key:network
      noexit: DE:Key:noexit
      note: DE:Key:note
      office: DE:Key:office
      natural: DE:Key:natural
      network: DE:Key:network
      noexit: DE:Key:noexit
      note: DE:Key:note
      office: DE:Key:office
+    old_name: DE:Key:old name
      oneway: DE:Key:oneway
      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
      onkz: DE:Key:onkz
      opening_hours: DE:Key:opening hours
      operator: DE:Key:operator
+    operator:MNC: DE:Key:operator:MNC
+    organic: DE:Key:organic
+    osak: DE:Key:osak
      osmc:status: DE:Key:osmc:status
      osmc:symbol: DE:Key:osmc:symbol
      overtaking: DE:Key:overtaking
      parking:lane: DE:Key:parking:lane
      osmc:status: DE:Key:osmc:status
      osmc:symbol: DE:Key:osmc:symbol
      overtaking: DE:Key:overtaking
      parking:lane: DE:Key:parking:lane
+    parking:lane:hgv: DE:Key:parking:lane:hgv
      phone: DE:Key:phone
      piste:difficulty: DE:Key:piste:difficulty
      piste:type: DE:Key:piste:type
      phone: DE:Key:phone
      piste:difficulty: DE:Key:piste:difficulty
      piste:type: DE:Key:piste:type
@@ -226,18 +424,25 @@ de:
      plant:output: DE:Key:plant:output
      playground: DE:Key:playground
      population: DE:Key:population
      plant:output: DE:Key:plant:output
      playground: DE:Key:playground
      population: DE:Key:population
+    postal_code: DE:Key:postal code
      power: DE:Key:power
      priority: DE:Key:priority
      priority_road: DE:Key:priority road
      proposed: DE:Key:proposed
      power: DE:Key:power
      priority: DE:Key:priority
      priority_road: DE:Key:priority road
      proposed: DE:Key:proposed
+    public_bookcase:type: DE:Key:public bookcase:type
      public_transport: DE:Key:public transport
      public_transport: DE:Key:public transport
+    pump: DE:Key:pump
      railway: DE:Key:railway
      railway: DE:Key:railway
+    railway:preserved: DE:Key:railway:preserved
+    ramp: DE:Key:ramp
      recycling_type: DE:Key:recycling type
      ref: DE:Key:ref
      ref:bufa: DE:Key:ref:bufa
      ref:mobil-parken.de: DE:Key:ref:mobil-parken.de
      recycling_type: DE:Key:recycling type
      ref: DE:Key:ref
      ref:bufa: DE:Key:ref:bufa
      ref:mobil-parken.de: DE:Key:ref:mobil-parken.de
+    reg_name: DE:Key:reg name
      religion: DE:Key:religion
      resource: DE:Key:resource
      religion: DE:Key:religion
      resource: DE:Key:resource
+    right: DE:Key:right
      roof:material: DE:Key:roof:material
      rooms: DE:Key:rooms
      route: DE:Key:route
      roof:material: DE:Key:roof:material
      rooms: DE:Key:rooms
      route: DE:Key:route
@@ -248,32 +453,45 @@ de:
      seamark:type: DE:Key:seamark:type
      segregated: DE:Key:segregated
      service: DE:Key:service
      seamark:type: DE:Key:seamark:type
      segregated: DE:Key:segregated
      service: DE:Key:service
+    service_times: DE:Key:service times
      shelter_type: DE:Key:shelter type
      shop: DE:Key:shop
      sidewalk: DE:Key:sidewalk
      shelter_type: DE:Key:shelter type
      shop: DE:Key:shop
      sidewalk: DE:Key:sidewalk
+    site_type: DE:Key:site type
      smoking: DE:Key:smoking
      smoothness: DE:Key:smoothness
      social_facility: DE:Key:social facility
      source: DE:Key:source
      source:maxspeed: DE:Key:source:maxspeed
      smoking: DE:Key:smoking
      smoothness: DE:Key:smoothness
      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
      speisebezirk: DE:Key:speisebezirk
      sport: DE:Key:sport
      start_date: DE:Key:start date
+    station: DE:Key:station
      step_count: DE:Key:step count
      surface: DE:Key:surface
      symbol: DE:Key:symbol
      tactile_paving: DE:Key:tactile paving
      step_count: DE:Key:step count
      surface: DE:Key:surface
      symbol: DE:Key:symbol
      tactile_paving: DE:Key:tactile paving
+    tidal: DE:Key:tidal
      todo: DE:Key:todo
      todo: DE:Key:todo
+    toilets:wheelchair: DE:Key:toilets:wheelchair
      toll: DE:Key:toll
      tourism: DE:Key:tourism
      toll: DE:Key:toll
      tourism: DE:Key:tourism
+    tower:type: DE:Key:tower:type
+    tracks: DE:Key:tracks
      tracktype: DE:Key:tracktype
      traffic_calming: DE:Key:traffic calming
      traffic_sign: DE:Key:traffic sign
      tracktype: DE:Key:tracktype
      traffic_calming: DE:Key:traffic calming
      traffic_sign: DE:Key:traffic sign
+    traffic_signals:direction: DE:Key:traffic signals:direction
      trail_visibility: DE:Key:trail visibility
      trail_visibility: DE:Key:trail visibility
+    trees: DE:Key:trees
      tunnel: DE:Key:tunnel
      turn: DE:Key:turn
      tunnel: DE:Key:tunnel
      turn: DE:Key:turn
+    turn:lanes: DE:Key:turn:lanes
      type: DE:Key:type
      usage: DE:Key:usage
      type: DE:Key:type
      usage: DE:Key:usage
+    vehicle: DE:Key:vehicle
      verbindung: DE:Key:verbindung
      voltage: DE:Key:voltage
      waste: DE:Key:waste
      verbindung: DE:Key:verbindung
      voltage: DE:Key:voltage
      waste: DE:Key:waste
@@ -283,17 +501,31 @@ de:
      wheelchair: DE:Key:wheelchair
      width: DE:Key:width
      wiki:symbol: DE:Key:wiki:symbol
      wheelchair: DE:Key:wheelchair
      width: DE:Key:width
      wiki:symbol: DE:Key:wiki:symbol
+    wikidata: DE:Key:wikidata
+    wikimedia_commons: DE:Key:wikimedia commons
      wikipedia: DE:Key:wikipedia
      wikipedia: DE:Key:wikipedia
+    winter_road: DE:Key:winter road
      wires: DE:Key:wires
      wood: DE:Key:wood
      wires: DE:Key:wires
      wood: DE:Key:wood
+    workrules: DE:Key:workrules
      zone:maxspeed: DE:Key:zone:maxspeed
    tag:
      zone:maxspeed: DE:Key:zone:maxspeed
    tag:
+    abandoned:amenity=prison: DE:Tag:abandoned:amenity=prison
      abandoned=village: DE:Tag:abandoned=village
      abandoned=yes: DE:Tag:abandoned=yes
      access=designated: DE:Tag:access=designated
      access=private: DE:Tag:access=private
      abandoned=village: DE:Tag:abandoned=village
      abandoned=yes: DE:Tag:abandoned=yes
      access=designated: DE:Tag:access=designated
      access=private: DE:Tag:access=private
+    admin_level=2: DE:Tag:admin level=2
      aerialway=cable_car: DE:Tag:aerialway=cable car
      aerialway=cable_car: DE:Tag:aerialway=cable car
+    aeroway=aerodrome: DE:Tag:aeroway=aerodrome
+    aeroway=apron: DE:Tag:aeroway=apron
+    aeroway=gate: DE:Tag:aeroway=gate
+    aeroway=hangar: DE:Tag:aeroway=hangar
      aeroway=helipad: DE:Tag:aeroway=helipad
      aeroway=helipad: DE:Tag:aeroway=helipad
+    aeroway=runway: DE:Tag:aeroway=runway
+    aeroway=taxiway: DE:Tag:aeroway=taxiway
+    aeroway=terminal: DE:Tag:aeroway=terminal
+    airmark=beacon: DE:Tag:airmark=beacon
      amenity=administration: DE:Tag:amenity=administration
      amenity=animal_boarding: DE:Tag:amenity=animal boarding
      amenity=animal_shelter: DE:Tag:amenity=animal shelter
      amenity=administration: DE:Tag:amenity=administration
      amenity=animal_boarding: DE:Tag:amenity=animal boarding
      amenity=animal_shelter: DE:Tag:amenity=animal shelter
@@ -306,6 +538,7 @@ de:
      amenity=bench: DE:Tag:amenity=bench
      amenity=bicycle_parking: DE:Tag:amenity=bicycle parking
      amenity=bicycle_rental: DE:Tag:amenity=bicycle rental
      amenity=bench: DE:Tag:amenity=bench
      amenity=bicycle_parking: DE:Tag:amenity=bicycle parking
      amenity=bicycle_rental: DE:Tag:amenity=bicycle rental
+    amenity=bicycle_repair_station: DE:Tag:amenity=bicycle repair station
      amenity=biergarten: DE:Tag:amenity=biergarten
      amenity=brothel: DE:Tag:amenity=brothel
      amenity=bureau_de_change: DE:Tag:amenity=bureau de change
      amenity=biergarten: DE:Tag:amenity=biergarten
      amenity=brothel: DE:Tag:amenity=brothel
      amenity=bureau_de_change: DE:Tag:amenity=bureau de change
@@ -314,20 +547,30 @@ de:
      amenity=car_rental: DE:Tag:amenity=car rental
      amenity=car_sharing: DE:Tag:amenity=car sharing
      amenity=car_wash: DE:Tag:amenity=car wash
      amenity=car_rental: DE:Tag:amenity=car rental
      amenity=car_sharing: DE:Tag:amenity=car sharing
      amenity=car_wash: DE:Tag:amenity=car wash
+    amenity=casino: DE:Tag:amenity=casino
      amenity=charging_station: DE:Tag:amenity=charging station
      amenity=cinema: DE:Tag:amenity=cinema
      amenity=clock: DE:Tag:amenity=clock
      amenity=charging_station: DE:Tag:amenity=charging station
      amenity=cinema: DE:Tag:amenity=cinema
      amenity=clock: DE:Tag:amenity=clock
+    amenity=community_centre: DE:Tag:amenity=community centre
      amenity=compressed_air: DE:Tag:amenity=compressed air
      amenity=compressed_air: DE:Tag:amenity=compressed air
+    amenity=conference_centre: DE:Tag:amenity=conference centre
      amenity=courthouse: DE:Tag:amenity=courthouse
      amenity=crematorium: DE:Tag:amenity=crematorium
      amenity=customs: DE:Tag:amenity=customs
      amenity=courthouse: DE:Tag:amenity=courthouse
      amenity=crematorium: DE:Tag:amenity=crematorium
      amenity=customs: DE:Tag:amenity=customs
+    amenity=dancing_school: DE:Tag:amenity=dancing school
+    amenity=dentist: DE:Tag:amenity=dentist
+    amenity=dive_centre: DE:Tag:amenity=dive centre
+    amenity=doctors: DE:Tag:amenity=doctors
      amenity=drinking_water: DE:Tag:amenity=drinking water
      amenity=driving_school: DE:Tag:amenity=driving school
      amenity=embassy: DE:Tag:amenity=embassy
      amenity=emergency_phone: DE:Tag:amenity=emergency phone
      amenity=drinking_water: DE:Tag:amenity=drinking water
      amenity=driving_school: DE:Tag:amenity=driving school
      amenity=embassy: DE:Tag:amenity=embassy
      amenity=emergency_phone: DE:Tag:amenity=emergency phone
+    amenity=exhibition_centre: DE:Tag:amenity=exhibition centre
      amenity=fast_food: DE:Tag:amenity=fast food
      amenity=ferry_terminal: DE:Tag:amenity=ferry terminal
      amenity=fast_food: DE:Tag:amenity=fast food
      amenity=ferry_terminal: DE:Tag:amenity=ferry terminal
+    amenity=fire_hydrant: DE:Tag:amenity=fire hydrant
      amenity=fire_station: DE:Tag:amenity=fire station
      amenity=fire_station: DE:Tag:amenity=fire station
+    amenity=fish_spa: DE:Tag:amenity=fish spa
      amenity=fountain: DE:Tag:amenity=fountain
      amenity=fuel: DE:Tag:amenity=fuel
      amenity=grave_yard: DE:Tag:amenity=grave yard
      amenity=fountain: DE:Tag:amenity=fountain
      amenity=fuel: DE:Tag:amenity=fuel
      amenity=grave_yard: DE:Tag:amenity=grave yard
@@ -339,6 +582,8 @@ de:
      amenity=kneipp_water_cure: DE:Tag:amenity=kneipp water cure
      amenity=library: DE:Tag:amenity=library
      amenity=marketplace: DE:Tag:amenity=marketplace
      amenity=kneipp_water_cure: DE:Tag:amenity=kneipp water cure
      amenity=library: DE:Tag:amenity=library
      amenity=marketplace: DE:Tag:amenity=marketplace
+    amenity=medical_supply: DE:Tag:amenity=medical supply
+    amenity=monastery: DE:Tag:amenity=monastery
      amenity=motorcycle_parking: DE:Tag:amenity=motorcycle parking
      amenity=nightclub: DE:Tag:amenity=nightclub
      amenity=nursing_home: DE:Tag:amenity=nursing home
      amenity=motorcycle_parking: DE:Tag:amenity=motorcycle parking
      amenity=nightclub: DE:Tag:amenity=nightclub
      amenity=nursing_home: DE:Tag:amenity=nursing home
@@ -353,12 +598,16 @@ de:
      amenity=post_box: DE:Tag:amenity=post box
      amenity=post_office: DE:Tag:amenity=post office
      amenity=prison: DE:Tag:amenity=prison
      amenity=post_box: DE:Tag:amenity=post box
      amenity=post_office: DE:Tag:amenity=post office
      amenity=prison: DE:Tag:amenity=prison
+    amenity=prison_camp: DE:Tag:amenity=prison camp
      amenity=pub: DE:Tag:amenity=pub
      amenity=pub: DE:Tag:amenity=pub
+    amenity=public_bookcase: DE:Tag:amenity=public bookcase
      amenity=recycling: DE:Tag:amenity=recycling
      amenity=register_office: DE:Tag:amenity=register office
      amenity=recycling: DE:Tag:amenity=recycling
      amenity=register_office: DE:Tag:amenity=register office
+    amenity=research_institute: DE:Tag:amenity=research institute
      amenity=restaurant: DE:Tag:amenity=restaurant
      amenity=school: DE:Tag:amenity=school
      amenity=shelter: DE:Tag:amenity=shelter
      amenity=restaurant: DE:Tag:amenity=restaurant
      amenity=school: DE:Tag:amenity=school
      amenity=shelter: DE:Tag:amenity=shelter
+    amenity=shower: DE:Tag:amenity=shower
      amenity=social_facility: DE:Tag:amenity=social facility
      amenity=studio: DE:Tag:amenity=studio
      amenity=taxi: DE:Tag:amenity=taxi
      amenity=social_facility: DE:Tag:amenity=social facility
      amenity=studio: DE:Tag:amenity=studio
      amenity=taxi: DE:Tag:amenity=taxi
@@ -366,14 +615,19 @@ de:
      amenity=theatre: DE:Tag:amenity=theatre
      amenity=toilets: DE:Tag:amenity=toilets
      amenity=townhall: DE:Tag:amenity=townhall
      amenity=theatre: DE:Tag:amenity=theatre
      amenity=toilets: DE:Tag:amenity=toilets
      amenity=townhall: DE:Tag:amenity=townhall
+    amenity=trolley_bay: DE:Tag:amenity=trolley bay
      amenity=university: DE:Tag:amenity=university
      amenity=university: DE:Tag:amenity=university
+    amenity=vehicle_inspection: DE:Tag:amenity=vehicle inspection
      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
      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
+    amenity=weighbridge: DE:Tag:amenity=weighbridge
+    amenity=youth_centre: DE:Tag:amenity=youth centre
      atm=yes: DE:Tag:atm=yes
      barrier=bollard: DE:Tag:barrier=bollard
      barrier=cattle_grid: DE:Tag:barrier=cattle grid
      atm=yes: DE:Tag:atm=yes
      barrier=bollard: DE:Tag:barrier=bollard
      barrier=cattle_grid: DE:Tag:barrier=cattle grid
+    barrier=city_wall: DE:Tag:barrier=city wall
      barrier=cycle_barrier: DE:Tag:barrier=cycle barrier
      barrier=fence: DE:Tag:barrier=fence
      barrier=gate: DE:Tag:barrier=gate
      barrier=cycle_barrier: DE:Tag:barrier=cycle barrier
      barrier=fence: DE:Tag:barrier=fence
      barrier=gate: DE:Tag:barrier=gate
@@ -385,77 +639,233 @@ de:
      barrier=sally_port: DE:Tag:barrier=sally port
      barrier=toll_booth: DE:Tag:barrier=toll booth
      barrier=wall: DE:Tag:barrier=wall
      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
+    bicycle=use_sidepath: DE:Tag:bicycle=use sidepath
      biosphärenwirt=yes: DE:Tag:biosphärenwirt=yes
      boundary=national_park: DE:Tag:boundary=national park
      biosphärenwirt=yes: DE:Tag:biosphärenwirt=yes
      boundary=national_park: DE:Tag:boundary=national park
+    boundary=postal_code: DE:Tag:boundary=postal code
      boundary=protected_area: DE:Tag:boundary=protected area
      boundary=water_protection_area: DE:Tag:boundary=water protection area
      boundary=protected_area: DE:Tag:boundary=protected area
      boundary=water_protection_area: DE:Tag:boundary=water protection area
+    bridge:movable=bascule: DE:Tag:bridge:movable=bascule
+    bridge:movable=drawbridge: DE:Tag:bridge:movable=drawbridge
+    bridge:movable=lift: DE:Tag:bridge:movable=lift
+    bridge:movable=submersible: DE:Tag:bridge:movable=submersible
+    bridge:movable=swing: DE:Tag:bridge:movable=swing
+    bridge:movable=transporter: DE:Tag:bridge:movable=transporter
+    bridge:structure=arch: DE:Tag:bridge:structure=arch
+    bridge:structure=beam: DE:Tag:bridge:structure=beam
+    bridge:structure=cable-stayed: DE:Tag:bridge:structure=cable-stayed
+    bridge:structure=floating: DE:Tag:bridge:structure=floating
+    bridge:structure=humpback: DE:Tag:bridge:structure=humpback
+    bridge:structure=suspension: DE:Tag:bridge:structure=suspension
+    bridge:structure=truss: DE:Tag:bridge:structure=truss
+    bridge=aqueduct: DE:Tag:bridge=aqueduct
+    bridge=boardwalk: DE:Tag:bridge=boardwalk
+    bridge=cantilever: DE:Tag:bridge=cantilever
+    bridge=covered: DE:Tag:bridge=covered
+    bridge=trestle: DE:Tag:bridge=trestle
+    bridge=viaduct: DE:Tag:bridge=viaduct
+    building=apartments: DE:Tag:building=apartments
      building=barn: DE:Tag:building=barn
      building=barn: DE:Tag:building=barn
+    building=cathedral: DE:Tag:building=cathedral
+    building=chapel: DE:Tag:building=chapel
+    building=church: DE:Tag:building=church
+    building=commercial: DE:Tag:building=commercial
+    building=detached: DE:Tag:building=detached
+    building=dormitory: DE:Tag:building=dormitory
      building=entrance: DE:Tag:building=entrance
      building=garage: DE:Tag:building=garage
      building=garages: DE:Tag:building=garages
      building=entrance: DE:Tag:building=entrance
      building=garage: DE:Tag:building=garage
      building=garages: DE:Tag:building=garages
+    building=greenhouse: DE:Tag:building=greenhouse
+    building=hospital: DE:Tag:building=hospital
+    building=hotel: DE:Tag:building=hotel
+    building=house: DE:Tag:building=house
+    building=houseboat: DE:Tag:building=houseboat
      building=industrial: DE:Tag:building=industrial
      building=industrial: DE:Tag:building=industrial
+    building=public: DE:Tag:building=public
+    building=residential: DE:Tag:building=residential
+    building=retail: DE:Tag:building=retail
      building=roof: DE:Tag:building=roof
      building=school: DE:Tag:building=school
      building=stable: DE:Tag:building=stable
      building=roof: DE:Tag:building=roof
      building=school: DE:Tag:building=school
      building=stable: DE:Tag:building=stable
+    building=sty: DE:Tag:building=sty
+    building=tech_cab: DE:Tag:building=tech cab
+    building=terrace: DE:Tag:building=terrace
+    bunker_type=hardened_aircraft_shelter: DE:Tag:bunker type=hardened aircraft shelter
+    bunker_type=pillbox: DE:Tag:bunker type=pillbox
+    castle_type=castrum: DE:Tag:castle type=castrum
+    castle_type=defensive: DE:Tag:castle type=defensive
+    castle_type=fortress: DE:Tag:castle type=fortress
+    castle_type=manor: DE:Tag:castle type=manor
+    castle_type=palace: DE:Tag:castle type=palace
+    castle_type=stately: DE:Tag:castle type=stately
+    cemetery=grave: DE:Tag:cemetery=grave
+    club=automobile: DE:Tag:club=automobile
+    club=fan: DE:Tag:club=fan
+    club=scout: DE:Tag:club=scout
+    club=sport: DE:Tag:club=sport
+    craft=agricultural_engines: DE:Tag:craft=agricultural engines
+    craft=basket_maker: DE:Tag:craft=basket maker
+    craft=beekeeper: DE:Tag:craft=beekeeper
+    craft=boatbuilder: DE:Tag:craft=boatbuilder
+    craft=bookbinder: DE:Tag:craft=bookbinder
      craft=car_repair: DE:Tag:craft=car repair
      craft=car_repair: DE:Tag:craft=car repair
+    craft=carpenter: DE:Tag:craft=carpenter
+    craft=carpet_layer: DE:Tag:craft=carpet layer
+    craft=distillery: DE:Tag:craft=distillery
+    craft=dressmaker: DE:Tag:craft=dressmaker
+    craft=electrican: DE:Tag:craft=electrican
+    craft=electrician: DE:Tag:craft=electrician
+    craft=floorer: DE:Tag:craft=floorer
+    craft=gardener: DE:Tag:craft=gardener
+    craft=handicraft: DE:Tag:craft=handicraft
      craft=hvac: DE:Tag:craft=hvac
      craft=information_electronics: DE:Tag:craft=information electronics
      craft=hvac: DE:Tag:craft=hvac
      craft=information_electronics: DE:Tag:craft=information electronics
+    craft=joiner: DE:Tag:craft=joiner
+    craft=metal_construction: DE:Tag:craft=metal construction
+    craft=on_street: DE:Tag:craft=on street
      craft=optician: DE:Tag:craft=optician
      craft=optician: DE:Tag:craft=optician
+    craft=organ_builder: DE:Tag:craft=organ builder
      craft=painter: DE:Tag:craft=painter
      craft=paperhanger: DE:Tag:craft=paperhanger
      craft=painter: DE:Tag:craft=painter
      craft=paperhanger: DE:Tag:craft=paperhanger
+    craft=parquet_layer: DE:Tag:craft=parquet layer
+    craft=photographer: DE:Tag:craft=photographer
      craft=plumber: DE:Tag:craft=plumber
      craft=plumber: DE:Tag:craft=plumber
+    craft=roofer: DE:Tag:craft=roofer
+    craft=saddler: DE:Tag:craft=saddler
+    craft=sawmill: DE:Tag:craft=sawmill
      craft=scaffolder: DE:Tag:craft=scaffolder
      craft=scaffolder: DE:Tag:craft=scaffolder
+    craft=shoemaker: DE:Tag:craft=shoemaker
      craft=stonemason: DE:Tag:craft=stonemason
      craft=stonemason: DE:Tag:craft=stonemason
+    craft=tiler: DE:Tag:craft=tiler
+    craft=tinsmith: DE:Tag:craft=tinsmith
+    craft=upholsterer: DE:Tag:craft=upholsterer
+    craft=watchmaker: DE:Tag:craft=watchmaker
+    craft=winery: DE:Tag:craft=winery
      cuisine=coffee_shop: DE:Tag:cuisine=coffee shop
      cuisine=coffee_shop: DE:Tag:cuisine=coffee shop
+    cycleway=lane: DE:Tag:cycleway=lane
+    cycleway=share_busway: DE:Tag:cycleway=share busway
+    cycleway=track: DE:Tag:cycleway=track
+    defensive=bergfried: DE:Tag:defensive=bergfried
+    defensive=donjon: DE:Tag:defensive=donjon
+    defensive=keep: DE:Tag:defensive=keep
+    emergency=access_point: DE:Tag:emergency=access point
+    emergency=aed: DE:Tag:emergency=aed
      emergency=ambulance_station: DE:Tag:emergency=ambulance station
      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=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=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
      footway=sidewalk: DE:Tag:footway=sidewalk
+    generator:method=anaerobic_digestion: DE:Tag:generator:method=anaerobic digestion
+    generator:method=barrage: DE:Tag:generator:method=barrage
+    generator:method=combustion: DE:Tag:generator:method=combustion
+    generator:method=fission: DE:Tag:generator:method=fission
+    generator:method=fusion: DE:Tag:generator:method=fusion
+    generator:method=gasification: DE:Tag:generator:method=gasification
+    generator:method=photovoltaic: DE:Tag:generator:method=photovoltaic
+    generator:method=run-of-the-river: DE:Tag:generator:method=run-of-the-river
+    generator:method=stream: DE:Tag:generator:method=stream
+    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:method=wind_turbine: DE:Tag:generator:method=wind turbine
+    generator:source=biofuel: DE:Tag:generator:source=biofuel
+    generator:source=biogas: DE:Tag:generator:source=biogas
+    generator:source=biomass: DE:Tag:generator:source=biomass
+    generator:source=coal: DE:Tag:generator:source=coal
+    generator:source=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=solar: DE:Tag:generator:source=solar
+    generator:source=tidal: DE:Tag:generator:source=tidal
+    generator:source=waste: DE:Tag:generator:source=waste
+    generator:source=wave: DE:Tag:generator:source=wave
      generator:source=wind: DE:Tag:generator:source=wind
      generator:source=wind: DE:Tag:generator:source=wind
+    generator:type=combined_cycle: DE:Tag:generator:type=combined cycle
+    generator:type=francis_turbine: DE:Tag:generator:type=francis turbine
+    generator:type=gas_turbine: DE:Tag:generator:type=gas turbine
+    generator:type=heat_pump: DE:Tag:generator:type=heat pump
+    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_generator: DE:Tag:generator:type=steam generator
+    generator:type=steam_turbine: DE:Tag:generator:type=steam turbine
+    generator:type=vertical_axis: DE:Tag:generator:type=vertical axis
+    geological=moraine: DE:Tag:geological=moraine
+    geological=outcrop: DE:Tag:geological=outcrop
+    geological=palaeontological_site: DE:Tag:geological=palaeontological site
+    highway=abandoned: DE:Tag:highway=abandoned
+    highway=access: DE:Tag:highway=access
      highway=bridleway: DE:Tag:highway=bridleway
      highway=bus_guideway: DE:Tag:highway=bus guideway
      highway=bus_stop: DE:Tag:highway=bus stop
      highway=bridleway: DE:Tag:highway=bridleway
      highway=bus_guideway: DE:Tag:highway=bus guideway
      highway=bus_stop: DE:Tag:highway=bus stop
+    highway=byway: DE:Tag:highway=byway
+    highway=centre_line: DE:Tag:highway=centre line
      highway=crossing: DE:Tag:highway=crossing
      highway=cycleway: DE:Tag:highway=cycleway
      highway=crossing: DE:Tag:highway=crossing
      highway=cycleway: DE:Tag:highway=cycleway
+    highway=disused: DE:Tag:highway=disused
+    highway=door: DE:Tag:highway=door
      highway=elevator: DE:Tag:highway=elevator
      highway=emergency_access_point: DE:Tag:highway=emergency access point
      highway=elevator: DE:Tag:highway=elevator
      highway=emergency_access_point: DE:Tag:highway=emergency access point
+    highway=emergency_bay: DE:Tag:highway=emergency bay
+    highway=escape: DE:Tag:highway=escape
      highway=footway: DE:Tag:highway=footway
      highway=give_way: DE:Tag:highway=give way
      highway=footway: DE:Tag:highway=footway
      highway=give_way: DE:Tag:highway=give way
+    highway=kerb: DE:Tag:highway=kerb
      highway=living_street: DE:Tag:highway=living street
      highway=mini_roundabout: DE:Tag:highway=mini roundabout
      highway=motorway: DE:Tag:highway=motorway
      highway=motorway_junction: DE:Tag:highway=motorway junction
      highway=motorway_link: DE:Tag:highway=motorway link
      highway=living_street: DE:Tag:highway=living street
      highway=mini_roundabout: DE:Tag:highway=mini roundabout
      highway=motorway: DE:Tag:highway=motorway
      highway=motorway_junction: DE:Tag:highway=motorway junction
      highway=motorway_link: DE:Tag:highway=motorway link
+    highway=no: DE:Tag:highway=no
      highway=path: DE:Tag:highway=path
      highway=pedestrian: DE:Tag:highway=pedestrian
      highway=path: DE:Tag:highway=path
      highway=pedestrian: DE:Tag:highway=pedestrian
+    highway=planned: DE:Tag:highway=planned
      highway=platform: DE:Tag:highway=platform
      highway=primary: DE:Tag:highway=primary
      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=raceway: DE:Tag:highway=raceway
+    highway=razed: DE:Tag:highway=razed
      highway=residential: DE:Tag:highway=residential
      highway=rest_area: DE:Tag:highway=rest area
      highway=road: DE:Tag:highway=road
      highway=residential: DE:Tag:highway=residential
      highway=rest_area: DE:Tag:highway=rest area
      highway=road: DE:Tag:highway=road
+    highway=rural: DE:Tag:highway=rural
      highway=secondary: DE:Tag:highway=secondary
      highway=service: DE:Tag:highway=service
      highway=services: DE:Tag:highway=services
      highway=speed_camera: DE:Tag:highway=speed camera
      highway=steps: DE:Tag:highway=steps
      highway=street_lamp: DE:Tag:highway=street lamp
      highway=secondary: DE:Tag:highway=secondary
      highway=service: DE:Tag:highway=service
      highway=services: DE:Tag:highway=services
      highway=speed_camera: DE:Tag:highway=speed camera
      highway=steps: DE:Tag:highway=steps
      highway=street_lamp: DE:Tag:highway=street lamp
+    highway=street_light: DE:Tag:highway=street light
      highway=tertiary: DE:Tag:highway=tertiary
      highway=track: DE:Tag:highway=track
      highway=tertiary: DE:Tag:highway=tertiary
      highway=track: DE:Tag:highway=track
+    highway=traffic_sign: DE:Tag:highway=traffic sign
      highway=traffic_signals: DE:Tag:highway=traffic signals
      highway=trunk: DE:Tag:highway=trunk
      highway=trunk_link: DE:Tag:highway=trunk link
      highway=turning_circle: DE:Tag:highway=turning circle
      highway=traffic_signals: DE:Tag:highway=traffic signals
      highway=trunk: DE:Tag:highway=trunk
      highway=trunk_link: DE:Tag:highway=trunk link
      highway=turning_circle: DE:Tag:highway=turning circle
+    highway=turning_loop: DE:Tag:highway=turning loop
      highway=unclassified: DE:Tag:highway=unclassified
      highway=unclassified: DE:Tag:highway=unclassified
+    highway=unknown: DE:Tag:highway=unknown
+    highway=yes: DE:Tag:highway=yes
      historic=aircraft: DE:Tag:historic=aircraft
      historic=archaeological_site: DE:Tag:historic=archaeological site
      historic=aircraft: DE:Tag:historic=aircraft
      historic=archaeological_site: DE:Tag:historic=archaeological site
+    historic=battlefield: DE:Tag:historic=battlefield
      historic=boundary_stone: DE:Tag:historic=boundary stone
      historic=castle: DE:Tag:historic=castle
      historic=city_gate: DE:Tag:historic=city gate
      historic=boundary_stone: DE:Tag:historic=boundary stone
      historic=castle: DE:Tag:historic=castle
      historic=city_gate: DE:Tag:historic=city gate
@@ -468,6 +878,7 @@ de:
      historic=mine: DE:Tag:historic=mine
      historic=monastery: DE:Tag:historic=monastery
      historic=monument: DE:Tag:historic=monument
      historic=mine: DE:Tag:historic=mine
      historic=monastery: DE:Tag:historic=monastery
      historic=monument: DE:Tag:historic=monument
+    historic=optical_telegraph: DE:Tag:historic=optical telegraph
      historic=pillory: DE:Tag:historic=pillory
      historic=rune_stone: DE:Tag:historic=rune stone
      historic=ship: DE:Tag:historic=ship
      historic=pillory: DE:Tag:historic=pillory
      historic=rune_stone: DE:Tag:historic=rune stone
      historic=ship: DE:Tag:historic=ship
@@ -476,8 +887,12 @@ de:
      historic=wayside_cross: DE:Tag:historic=wayside cross
      historic=wayside_shrine: DE:Tag:historic=wayside shrine
      historic=wreck: DE:Tag:historic=wreck
      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
+    information=guidepost: DE:Tag:information=guidepost
+    information=map: DE:Tag:information=map
      junction=roundabout: DE:Tag:junction=roundabout
      landuse=allotments: DE:Tag:landuse=allotments
      junction=roundabout: DE:Tag:junction=roundabout
      landuse=allotments: DE:Tag:landuse=allotments
+    landuse=aquaculture: DE:Tag:landuse=aquaculture
      landuse=basin: DE:Tag:landuse=basin
      landuse=brownfield: DE:Tag:landuse=brownfield
      landuse=cemetery: DE:Tag:landuse=cemetery
      landuse=basin: DE:Tag:landuse=basin
      landuse=brownfield: DE:Tag:landuse=brownfield
      landuse=cemetery: DE:Tag:landuse=cemetery
@@ -485,10 +900,12 @@ de:
      landuse=farm: DE:Tag:landuse=farm
      landuse=farmland: DE:Tag:landuse=farmland
      landuse=farmyard: DE:Tag:landuse=farmyard
      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
      landuse=greenfield: DE:Tag:landuse=greenfield
      landuse=forest: DE:Tag:landuse=forest
      landuse=garages: DE:Tag:landuse=garages
      landuse=grass: DE:Tag:landuse=grass
      landuse=greenfield: DE:Tag:landuse=greenfield
+    landuse=greenhouse_horticulture: DE:Tag:landuse=greenhouse horticulture
      landuse=industrial: DE:Tag:landuse=industrial
      landuse=landfill: DE:Tag:landuse=landfill
      landuse=meadow: DE:Tag:landuse=meadow
      landuse=industrial: DE:Tag:landuse=industrial
      landuse=landfill: DE:Tag:landuse=landfill
      landuse=meadow: DE:Tag:landuse=meadow
@@ -498,14 +915,25 @@ de:
      landuse=quarry: DE:Tag:landuse=quarry
      landuse=railway: DE:Tag:landuse=railway
      landuse=recreation_ground: DE:Tag:landuse=recreation ground
      landuse=quarry: DE:Tag:landuse=quarry
      landuse=railway: DE:Tag:landuse=railway
      landuse=recreation_ground: DE:Tag:landuse=recreation ground
+    landuse=religious: DE:Tag:landuse=religious
      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
      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
+    leaf_type=broadleaved: DE:Tag:leaf type=broadleaved
+    leaf_type=leafless: DE:Tag:leaf type=leafless
+    leaf_type=mixed: DE:Tag:leaf type=mixed
+    leaf_type=needleleaved: DE:Tag:leaf type=needleleaved
+    leisure=adult_gaming_centre: DE:Tag:leisure=adult gaming centre
      leisure=beach_resort: DE:Tag:leisure=beach resort
      leisure=beach_resort: DE:Tag:leisure=beach resort
+    leisure=bowling_alley: DE:Tag:leisure=bowling alley
      leisure=dog_park: DE:Tag:leisure=dog park
      leisure=dog_park: DE:Tag:leisure=dog park
+    leisure=firepit: DE:Tag:leisure=firepit
+    leisure=fish_spa: DE:Tag:leisure=fish spa
+    leisure=fitness_centre: DE:Tag:leisure=fitness centre
+    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
      leisure=garden: DE:Tag:leisure=garden
      leisure=golf_course: DE:Tag:leisure=golf course
      leisure=ice_rink: DE:Tag:leisure=ice rink
@@ -513,30 +941,48 @@ de:
      leisure=miniature_golf: DE:Tag:leisure=miniature golf
      leisure=nature_reserve: DE:Tag:leisure=nature reserve
      leisure=park: DE:Tag:leisure=park
      leisure=miniature_golf: DE:Tag:leisure=miniature golf
      leisure=nature_reserve: DE:Tag:leisure=nature reserve
      leisure=park: DE:Tag:leisure=park
+    leisure=picnic_table: DE:Tag:leisure=picnic table
      leisure=pitch: DE:Tag:leisure=pitch
      leisure=playground: DE:Tag:leisure=playground
      leisure=pitch: DE:Tag:leisure=pitch
      leisure=playground: DE:Tag:leisure=playground
+    leisure=sauna: DE:Tag:leisure=sauna
      leisure=slipway: DE:Tag:leisure=slipway
      leisure=sports_centre: DE:Tag:leisure=sports centre
      leisure=stadium: DE:Tag:leisure=stadium
      leisure=swimming_pool: DE:Tag:leisure=swimming pool
      leisure=slipway: DE:Tag:leisure=slipway
      leisure=sports_centre: DE:Tag:leisure=sports centre
      leisure=stadium: DE:Tag:leisure=stadium
      leisure=swimming_pool: DE:Tag:leisure=swimming pool
+    leisure=table_tennis_table: DE:Tag:leisure=table tennis table
+    leisure=tanning_salon: DE:Tag:leisure=tanning salon
      leisure=track: DE:Tag:leisure=track
      leisure=water_park: DE:Tag:leisure=water park
      leisure=track: DE:Tag:leisure=track
      leisure=water_park: DE:Tag:leisure=water park
+    level_crossing=automatic_barrier: DE:Tag:level crossing=automatic barrier
+    level_crossing=traffic_signals: DE:Tag:level crossing=traffic signals
      level_crossing=uncontrolled: DE:Tag:level crossing=uncontrolled
      level_crossing=uncontrolled: DE:Tag:level crossing=uncontrolled
+    man_made=MDF: DE:Tag:man made=MDF
      man_made=adit: DE:Tag:man made=adit
      man_made=adit: DE:Tag:man made=adit
+    man_made=antenna: DE:Tag:man made=antenna
+    man_made=breakwater: DE:Tag:man made=breakwater
      man_made=bunker_silo: DE:Tag:man made=bunker silo
      man_made=bunker_silo: DE:Tag:man made=bunker silo
+    man_made=cellar_entrance: DE:Tag:man made=cellar entrance
+    man_made=chimney: DE:Tag:man made=chimney
      man_made=communications_tower: DE:Tag:man made=communications tower
      man_made=crane: DE:Tag:man made=crane
      man_made=cutline: DE:Tag:man made=cutline
      man_made=dyke: DE:Tag:man made=dyke
      man_made=embankment: DE:Tag:man made=embankment
      man_made=communications_tower: DE:Tag:man made=communications tower
      man_made=crane: DE:Tag:man made=crane
      man_made=cutline: DE:Tag:man made=cutline
      man_made=dyke: DE:Tag:man made=dyke
      man_made=embankment: DE:Tag:man made=embankment
+    man_made=flagpole: DE:Tag:man made=flagpole
      man_made=gasometer: DE:Tag:man made=gasometer
      man_made=groyne: DE:Tag:man made=groyne
      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=gasometer: DE:Tag:man made=gasometer
      man_made=groyne: DE:Tag:man made=groyne
      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=monitoring_station: DE:Tag:man made=monitoring station
+    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=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=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=surveillance: DE:Tag:man made=surveillance
      man_made=survey_point: DE:Tag:man made=survey point
      man_made=tower: DE:Tag:man made=tower
@@ -546,12 +992,21 @@ de:
      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=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
      microbrewery=yes: DE:Tag:microbrewery=yes
+    military=airfield: DE:Tag:military=airfield
+    military=barracks: DE:Tag:military=barracks
      military=bunker: DE:Tag:military=bunker
      military=bunker: DE:Tag:military=bunker
+    military=danger_area: DE:Tag:military=danger area
+    military=naval_base: DE:Tag:military=naval base
+    military=nuclear_explosion_site: DE:Tag:military=nuclear explosion site
+    military=range: DE:Tag:military=range
+    military=training_area: DE:Tag:military=training area
      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=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=cliff: DE:Tag:natural=cliff
      natural=coastline: DE:Tag:natural=coastline
      natural=fell: DE:Tag:natural=fell
@@ -566,32 +1021,55 @@ de:
      natural=saddle: DE:Tag:natural=saddle
      natural=scree: DE:Tag:natural=scree
      natural=scrub: DE:Tag:natural=scrub
      natural=saddle: DE:Tag:natural=saddle
      natural=scree: DE:Tag:natural=scree
      natural=scrub: DE:Tag:natural=scrub
+    natural=shingle: DE:Tag:natural=shingle
      natural=sinkhole: DE:Tag:natural=sinkhole
      natural=spring: DE:Tag:natural=spring
      natural=stone: DE:Tag:natural=stone
      natural=tree: DE:Tag:natural=tree
      natural=sinkhole: DE:Tag:natural=sinkhole
      natural=spring: DE:Tag:natural=spring
      natural=stone: DE:Tag:natural=stone
      natural=tree: DE:Tag:natural=tree
+    natural=tree_group: DE:Tag:natural=tree group
      natural=tree_row: DE:Tag:natural=tree row
      natural=volcano: DE:Tag:natural=volcano
      natural=water: DE:Tag:natural=water
      natural=wetland: DE:Tag:natural=wetland
      natural=wood: DE:Tag:natural=wood
      natural=tree_row: DE:Tag:natural=tree row
      natural=volcano: DE:Tag:natural=volcano
      natural=water: DE:Tag:natural=water
      natural=wetland: DE:Tag:natural=wetland
      natural=wood: DE:Tag:natural=wood
+    network=icn: DE:Tag:network=icn
+    network=iwn: DE:Tag:network=iwn
+    network=lcn: DE:Tag:network=lcn
+    network=lhn: DE:Tag:network=lhn
+    network=lwn: DE:Tag:network=lwn
+    network=ncn: DE:Tag:network=ncn
+    network=nwn: DE:Tag:network=nwn
+    network=rcn: DE:Tag:network=rcn
+    network=rhn: DE:Tag:network=rhn
+    network=rwn: DE:Tag:network=rwn
+    office=employment_agency: DE:Tag:office=employment agency
+    office=estate_agent: DE:Tag:office=estate agent
+    office=insurance: DE:Tag:office=insurance
      office=lawyer: DE:Tag:office=lawyer
      office=political_party: DE:Tag:office=political party
      office=lawyer: DE:Tag:office=lawyer
      office=political_party: DE:Tag:office=political party
+    office=travel_agent: DE:Tag:office=travel agent
+    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
      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=continent: DE:Tag:place=continent
+    place=country: DE:Tag:place=country
+    place=county: DE:Tag:place=county
      place=hamlet: DE:Tag:place=hamlet
      place=island: DE:Tag:place=island
      place=hamlet: DE:Tag:place=hamlet
      place=island: DE:Tag:place=island
+    place=islet: DE:Tag:place=islet
      place=isolated_dwelling: DE:Tag:place=isolated dwelling
      place=locality: DE:Tag:place=locality
      place=neighbourhood: DE:Tag:place=neighbourhood
      place=isolated_dwelling: DE:Tag:place=isolated dwelling
      place=locality: DE:Tag:place=locality
      place=neighbourhood: DE:Tag:place=neighbourhood
+    place=state: DE:Tag:place=state
      place=suburb: DE:Tag:place=suburb
      place=town: DE:Tag:place=town
      place=village: DE:Tag:place=village
      power=cable: DE:Tag:power=cable
      power=cable_distribution_cabinet: DE:Tag:power=cable distribution cabinet
      power=generator: DE:Tag:power=generator
      place=suburb: DE:Tag:place=suburb
      place=town: DE:Tag:place=town
      place=village: DE:Tag:place=village
      power=cable: DE:Tag:power=cable
      power=cable_distribution_cabinet: DE:Tag:power=cable distribution cabinet
      power=generator: DE:Tag:power=generator
+    power=heliostat: DE:Tag:power=heliostat
      power=line: DE:Tag:power=line
      power=minor_line: DE:Tag:power=minor line
      power=plant: DE:Tag:power=plant
      power=line: DE:Tag:power=line
      power=minor_line: DE:Tag:power=minor line
      power=plant: DE:Tag:power=plant
@@ -602,78 +1080,145 @@ de:
      power=tower: DE:Tag:power=tower
      power=transformer: DE:Tag:power=transformer
      public_transport=platform: DE:Tag:public transport=platform
      power=tower: DE:Tag:power=tower
      power=transformer: DE:Tag:power=transformer
      public_transport=platform: DE:Tag:public transport=platform
+    public_transport=station: DE:Tag:public transport=station
      public_transport=stop_area: DE:Tag:public transport=stop area
      public_transport=stop_position: DE:Tag:public transport=stop position
      public_transport=stop_area: DE:Tag:public transport=stop area
      public_transport=stop_position: DE:Tag:public transport=stop position
+    pump=manual: DE:Tag:pump=manual
+    pump=powered: DE:Tag:pump=powered
      railway=abandoned: DE:Tag:railway=abandoned
      railway=abandoned: DE:Tag:railway=abandoned
+    railway=buffer_stop: DE:Tag:railway=buffer stop
      railway=crossing: DE:Tag:railway=crossing
      railway=derail: DE:Tag:railway=derail
      railway=disused: DE:Tag:railway=disused
      railway=crossing: DE:Tag:railway=crossing
      railway=derail: DE:Tag:railway=derail
      railway=disused: DE:Tag:railway=disused
+    railway=funicular: DE:Tag:railway=funicular
      railway=halt: DE:Tag:railway=halt
      railway=level_crossing: DE:Tag:railway=level crossing
      railway=halt: DE:Tag:railway=halt
      railway=level_crossing: DE:Tag:railway=level crossing
+    railway=light_rail: DE:Tag:railway=light rail
      railway=monorail: DE:Tag:railway=monorail
      railway=monorail: DE:Tag:railway=monorail
+    railway=narrow_gauge: DE:Tag:railway=narrow gauge
      railway=platform: DE:Tag:railway=platform
      railway=platform: DE:Tag:railway=platform
+    railway=preserved: DE:Tag:railway=preserved
      railway=rail: DE:Tag:railway=rail
      railway=rail: DE:Tag:railway=rail
+    railway=railway_crossing: DE:Tag:railway=railway crossing
+    railway=roundhouse: DE:Tag:railway=roundhouse
+    railway=signal: DE:Tag:railway=signal
      railway=station: DE:Tag:railway=station
      railway=station: DE:Tag:railway=station
+    railway=stop: DE:Tag:railway=stop
+    railway=subway: DE:Tag:railway=subway
+    railway=subway_entrance: DE:Tag:railway=subway entrance
+    railway=switch: DE:Tag:railway=switch
      railway=tram: DE:Tag:railway=tram
      railway=tram_stop: DE:Tag:railway=tram stop
      railway=turntable: DE:Tag:railway=turntable
      railway=tram: DE:Tag:railway=tram
      railway=tram_stop: DE:Tag:railway=tram stop
      railway=turntable: DE:Tag:railway=turntable
+    route=bicycle: DE:Tag:route=bicycle
+    route=bus: DE:Tag:route=bus
      route=ferry: DE:Tag:route=ferry
      route=ferry: DE:Tag:route=ferry
+    route=foot: DE:Tag:route=foot
+    route=hiking: DE:Tag:route=hiking
+    route=horse: DE:Tag:route=horse
+    route=inline_skates: DE:Tag:route=inline skates
+    route=light_rail: DE:Tag:route=light rail
+    route=mtb: DE:Tag:route=mtb
+    route=nordic_walking: DE:Tag:route=nordic walking
+    route=piste: DE:Tag:route=piste
+    route=railway: DE:Tag:route=railway
+    route=road: DE:Tag:route=road
+    route=running: DE:Tag:route=running
      route=ski: DE:Tag:route=ski
      route=ski: DE:Tag:route=ski
+    route=subway: DE:Tag:route=subway
+    route=tracks: DE:Tag:route=tracks
+    route=train: DE:Tag:route=train
+    route=tram: DE:Tag:route=tram
+    service=alley: DE:Tag:service=alley
+    service=crossover: DE:Tag:service=crossover
      service=driveway: DE:Tag:service=driveway
      service=parking_aisle: DE:Tag:service=parking aisle
      service=driveway: DE:Tag:service=driveway
      service=parking_aisle: DE:Tag:service=parking aisle
+    service=siding: DE:Tag:service=siding
+    service=spur: DE:Tag:service=spur
+    service=yard: DE:Tag:service=yard
      shelter_type=lean_to: DE:Tag:shelter type=lean to
      shop=baby_goods: DE:Tag:shop=baby goods
      shop=bag: DE:Tag:shop=bag
      shop=bakery: DE:Tag:shop=bakery
      shop=beverages: DE:Tag:shop=beverages
      shop=bicycle: DE:Tag:shop=bicycle
      shelter_type=lean_to: DE:Tag:shelter type=lean to
      shop=baby_goods: DE:Tag:shop=baby goods
      shop=bag: DE:Tag:shop=bag
      shop=bakery: DE:Tag:shop=bakery
      shop=beverages: DE:Tag:shop=beverages
      shop=bicycle: DE:Tag:shop=bicycle
+    shop=bookmaker: DE:Tag:shop=bookmaker
      shop=books: DE:Tag:shop=books
      shop=butcher: DE:Tag:shop=butcher
      shop=car: DE:Tag:shop=car
      shop=car_parts: DE:Tag:shop=car parts
      shop=car_repair: DE:Tag:shop=car repair
      shop=charity: DE:Tag:shop=charity
      shop=books: DE:Tag:shop=books
      shop=butcher: DE:Tag:shop=butcher
      shop=car: DE:Tag:shop=car
      shop=car_parts: DE:Tag:shop=car parts
      shop=car_repair: DE:Tag:shop=car repair
      shop=charity: DE:Tag:shop=charity
+    shop=cheese: DE:Tag:shop=cheese
      shop=chemist: DE:Tag:shop=chemist
      shop=clothes: DE:Tag:shop=clothes
      shop=chemist: DE:Tag:shop=chemist
      shop=clothes: DE:Tag:shop=clothes
+    shop=coffee: DE:Tag:shop=coffee
      shop=computer: DE:Tag:shop=computer
      shop=computer: DE:Tag:shop=computer
+    shop=confectionery: DE:Tag:shop=confectionery
      shop=convenience: DE:Tag:shop=convenience
      shop=copyshop: DE:Tag:shop=copyshop
      shop=deli: DE:Tag:shop=deli
      shop=convenience: DE:Tag:shop=convenience
      shop=copyshop: DE:Tag:shop=copyshop
      shop=deli: DE:Tag:shop=deli
+    shop=department_store: DE:Tag:shop=department store
      shop=doityourself: DE:Tag:shop=doityourself
      shop=dry_cleaning: DE:Tag:shop=dry cleaning
      shop=electronics: DE:Tag:shop=electronics
      shop=fabric: DE:Tag:shop=fabric
      shop=doityourself: DE:Tag:shop=doityourself
      shop=dry_cleaning: DE:Tag:shop=dry cleaning
      shop=electronics: DE:Tag:shop=electronics
      shop=fabric: DE:Tag:shop=fabric
+    shop=farm: DE:Tag:shop=farm
+    shop=fishing: DE:Tag:shop=fishing
      shop=florist: DE:Tag:shop=florist
      shop=funeral_directors: DE:Tag:shop=funeral directors
      shop=florist: DE:Tag:shop=florist
      shop=funeral_directors: DE:Tag:shop=funeral directors
+    shop=furniture: DE:Tag:shop=furniture
      shop=garden_centre: DE:Tag:shop=garden centre
      shop=general: DE:Tag:shop=general
      shop=garden_centre: DE:Tag:shop=garden centre
      shop=general: DE:Tag:shop=general
+    shop=gift: DE:Tag:shop=gift
+    shop=greengrocer: DE:Tag:shop=greengrocer
      shop=hairdresser: DE:Tag:shop=hairdresser
      shop=hardware: DE:Tag:shop=hardware
      shop=houseware: DE:Tag:shop=houseware
      shop=hairdresser: DE:Tag:shop=hairdresser
      shop=hardware: DE:Tag:shop=hardware
      shop=houseware: DE:Tag:shop=houseware
+    shop=jewelry: DE:Tag:shop=jewelry
      shop=kiosk: DE:Tag:shop=kiosk
      shop=kitchen: DE:Tag:shop=kitchen
      shop=laundry: DE:Tag:shop=laundry
      shop=kiosk: DE:Tag:shop=kiosk
      shop=kitchen: DE:Tag:shop=kitchen
      shop=laundry: DE:Tag:shop=laundry
+    shop=locksmith: DE:Tag:shop=locksmith
      shop=mall: DE:Tag:shop=mall
      shop=medical_supply: DE:Tag:shop=medical supply
      shop=newsagent: DE:Tag:shop=newsagent
      shop=mall: DE:Tag:shop=mall
      shop=medical_supply: DE:Tag:shop=medical supply
      shop=newsagent: DE:Tag:shop=newsagent
+    shop=optician: DE:Tag:shop=optician
      shop=outdoor: DE:Tag:shop=outdoor
      shop=outdoor: DE:Tag:shop=outdoor
+    shop=pastry: DE:Tag:shop=pastry
+    shop=pet: DE:Tag:shop=pet
      shop=photo: DE:Tag:shop=photo
      shop=photo: DE:Tag:shop=photo
+    shop=seafood: DE:Tag:shop=seafood
      shop=shoes: DE:Tag:shop=shoes
      shop=spare_parts: DE:Tag:shop=spare parts
      shop=stationery: DE:Tag:shop=stationery
      shop=supermarket: DE:Tag:shop=supermarket
      shop=shoes: DE:Tag:shop=shoes
      shop=spare_parts: DE:Tag:shop=spare parts
      shop=stationery: DE:Tag:shop=stationery
      shop=supermarket: DE:Tag:shop=supermarket
+    shop=tea: DE:Tag:shop=tea
+    shop=tobacco: DE:Tag:shop=tobacco
      shop=toys: DE:Tag:shop=toys
      shop=toys: DE:Tag:shop=toys
+    shop=trade: DE:Tag:shop=trade
+    shop=tyres: DE:Tag:shop=tyres
      shop=vacant: DE:Tag:shop=vacant
      shop=variety_store: DE:Tag:shop=variety store
      shop=vacant: DE:Tag:shop=vacant
      shop=variety_store: DE:Tag:shop=variety store
+    shop=watches: DE:Tag:shop=watches
      shop=window_blind: DE:Tag:shop=window blind
      shop=window_blind: DE:Tag:shop=window blind
+    shop=wine: DE:Tag:shop=wine
      source=HiRes_aerial_imagery: DE:Tag:source=HiRes aerial imagery
      sport=9pin: DE:Tag:sport=9pin
      source=HiRes_aerial_imagery: DE:Tag:source=HiRes aerial imagery
      sport=9pin: DE:Tag:sport=9pin
+    sport=bobsleigh: DE:Tag:sport=bobsleigh
      sport=climbing: DE:Tag:sport=climbing
      sport=climbing: DE:Tag:sport=climbing
+    sport=climbing_adventure: DE:Tag:sport=climbing adventure
      sport=free_flying: DE:Tag:sport=free flying
      sport=golf: DE:Tag:sport=golf
      sport=free_flying: DE:Tag:sport=free flying
      sport=golf: DE:Tag:sport=golf
+    sport=multi: DE:Tag:sport=multi
+    sport=sailing: DE:Tag:sport=sailing
      sport=scuba_diving: DE:Tag:sport=scuba diving
      sport=scuba_diving: DE:Tag:sport=scuba diving
+    sport=shooting: DE:Tag:sport=shooting
      sport=soccer: DE:Tag:sport=soccer
      sport=soccer: DE:Tag:sport=soccer
+    station=light_rail: DE:Tag:station=light rail
+    station=subway: DE:Tag:station=subway
      summit:cross=yes: DE:Tag:summit:cross=yes
      summit:cross=yes: DE:Tag:summit:cross=yes
+    surface=asphalt: DE:Tag:surface=asphalt
      tourism=alpine_hut: DE:Tag:tourism=alpine hut
      tourism=aquarium: DE:Tag:tourism=aquarium
      tourism=artwork: DE:Tag:tourism=artwork
      tourism=alpine_hut: DE:Tag:tourism=alpine hut
      tourism=aquarium: DE:Tag:tourism=aquarium
      tourism=artwork: DE:Tag:tourism=artwork
@@ -690,7 +1235,31 @@ de:
      tourism=picnic_site: DE:Tag:tourism=picnic site
      tourism=viewpoint: DE:Tag:tourism=viewpoint
      tourism=zoo: DE:Tag:tourism=zoo
      tourism=picnic_site: DE:Tag:tourism=picnic site
      tourism=viewpoint: DE:Tag:tourism=viewpoint
      tourism=zoo: DE:Tag:tourism=zoo
+    tower:type=bell_tower: DE:Tag:tower:type=bell tower
+    tower:type=bridge: DE:Tag:tower:type=bridge
+    tower:type=communication: DE:Tag:tower:type=communication
+    tower:type=cooling: DE:Tag:tower:type=cooling
+    tower:type=defensive: DE:Tag:tower:type=defensive
+    tower:type=donjon: DE:Tag:tower:type=donjon
+    tower:type=hose: DE:Tag:tower:type=hose
+    tower:type=intake: DE:Tag:tower:type=intake
+    tower:type=lighting: DE:Tag:tower:type=lighting
+    tower:type=monitoring: DE:Tag:tower:type=monitoring
+    tower:type=monument: DE:Tag:tower:type=monument
+    tower:type=observation: DE:Tag:tower:type=observation
+    tower:type=radar: DE:Tag:tower:type=radar
+    tower:type=siren: DE:Tag:tower:type=siren
+    tower:type=watchtower: DE:Tag:tower:type=watchtower
+    vending=animal_feed: DE:Tag:vending=animal feed
      vending=bicycle_tube: DE:Tag:vending=bicycle tube
      vending=bicycle_tube: DE:Tag:vending=bicycle tube
+    vending=candles: DE:Tag:vending=candles
+    vending=excrement_bags: DE:Tag:vending=excrement bags
+    vending=newspapers: DE:Tag:vending=newspapers
+    vending=parcel_pickup;parcel_mail_in: DE:Tag:vending=parcel pickup;parcel mail
+      in
+    vending=public_transport_tickets: DE:Tag:vending=public transport tickets
+    vending=stamps: DE:Tag:vending=stamps
+    waterway=boatyard: DE:Tag:waterway=boatyard
      waterway=canal: DE:Tag:waterway=canal
      waterway=dam: DE:Tag:waterway=dam
      waterway=ditch: DE:Tag:waterway=ditch
      waterway=canal: DE:Tag:waterway=canal
      waterway=dam: DE:Tag:waterway=dam
      waterway=ditch: DE:Tag:waterway=ditch
@@ -701,6 +1270,7 @@ de:
      waterway=river: DE:Tag:waterway=river
      waterway=riverbank: DE:Tag:waterway=riverbank
      waterway=stream: DE:Tag:waterway=stream
      waterway=river: DE:Tag:waterway=river
      waterway=riverbank: DE:Tag:waterway=riverbank
      waterway=stream: DE:Tag:waterway=stream
+    waterway=waterfall: DE:Tag:waterway=waterfall
      waterway=weir: DE:Tag:waterway=weir
  el:
    key:
      waterway=weir: DE:Tag:waterway=weir
  el:
    key:
@@ -709,9 +1279,14 @@ el:
  en:
    key:
      3dr:type: Key:3dr:type
  en:
    key:
      3dr:type: Key:3dr:type
+    :lanes: Key::lanes
      AND_nosr_r: Key:AND nosr r
      CEMT: Key:CEMT
      DGPS_correction: Key:DGPS correction
      AND_nosr_r: Key:AND nosr r
      CEMT: Key:CEMT
      DGPS_correction: Key:DGPS correction
+    EH_ref: Key:EH ref
+    FIXME: Key:FIXME
+    Fetish: Key:Fetish
+    IBGE:CD_ADMINIS: Key:IBGE:CD ADMINIS
      IBGE:GEOCODIGO: Key:IBGE:GEOCODIGO
      IBGE:tipo: Key:IBGE:tipo
      Lock_ref: Key:Lock ref
      IBGE:GEOCODIGO: Key:IBGE:GEOCODIGO
      IBGE:tipo: Key:IBGE:tipo
      Lock_ref: Key:Lock ref
@@ -719,110 +1294,209 @@ en:
      PMSA_ref: Key:PMSA ref
      RLIS:bicycle: Key:RLIS:bicycle
      RLIS:reviewed: Key:RLIS:reviewed
      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
      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
      abandoned: Key:abandoned
+    abandoned:*: Key:abandoned:*
      abutters: Key:abutters
      access: Key:access
      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
      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:city:de: Key:addr:city:de
+    addr:city:it: Key:addr:city:it
      addr:conscriptionnumber: Key:addr:conscriptionnumber
      addr:country: Key:addr:country
      addr:district: Key:addr:district
      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:flats: Key:addr:flats
+    addr:floor: Key:addr:floor
+    addr:full: Key:addr:full
      addr:hamlet: Key:addr:hamlet
      addr:hamlet: Key:addr:hamlet
+    addr:hamlet:de: Key:addr:hamlet:de
+    addr:hamlet:it: Key:addr:hamlet:it
+    addr:housename: Key:addr:housename
      addr:housenumber: Key:addr:housenumber
      addr:housenumber: Key:addr:housenumber
+    addr:interpolation: Key:addr:interpolation
      addr:place: Key:addr:place
      addr:place: Key:addr:place
+    addr:place:de: Key:addr:place:de
+    addr:place:it: Key:addr:place:it
      addr:postcode: Key:addr:postcode
      addr:province: Key:addr:province
      addr:provisionalnumber: Key:addr:provisionalnumber
      addr:postcode: Key:addr:postcode
      addr:province: Key:addr:province
      addr:provisionalnumber: Key:addr:provisionalnumber
+    addr:region: Key:addr:region
      addr:state: Key:addr:state
      addr:street: Key:addr:street
      addr:state: Key:addr:state
      addr:street: Key:addr:street
+    addr:street:de: Key:addr:street:de
+    addr:street:it: Key:addr:street:it
+    addr:street:name: Key:addr:street:name
+    addr:street:prefix: Key:addr:street:prefix
+    addr:street:type: Key:addr:street:type
      addr:streetnumber: Key:addr:streetnumber
      addr:subdistrict: Key:addr:subdistrict
      addr:suburb: Key:addr:suburb
      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
      admin_level: Key:admin level
      adr_les: Key:adr les
+    advertising: Key:advertising
      aerialway: Key:aerialway
      aerialway: Key:aerialway
+    aerodrome: Key:aerodrome
      aeroway: Key:aeroway
      agricultural: Key:agricultural
      airmark: Key:airmark
      alt_name: Key:alt name
      aeroway: Key:aeroway
      agricultural: Key:agricultural
      airmark: Key:airmark
      alt_name: Key:alt name
+    alt_name:en: Key:alt name:en
      amenity: Key:amenity
      architect: Key:architect
      area: Key:area
      artwork_type: Key:artwork type
      ascent: Key:ascent
      asset_ref: Key:asset ref
      amenity: Key:amenity
      architect: Key:architect
      area: Key:area
      artwork_type: Key:artwork type
      ascent: Key:ascent
      asset_ref: Key:asset ref
+    assisted_trail: Key:assisted trail
      attribution: Key:attribution
      atv: Key:atv
      automatic_door: Key:automatic door
      backrest: Key:backrest
      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
      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
      beds: Key:beds
      bench: Key:bench
      bicycle: Key:bicycle
+    bicycle:class:mtb: Key:bicycle:class:mtb
+    bicycle:class:mtb:technical: Key:bicycle:class:mtb:technical
+    bicycle:conditional: Key:bicycle:conditional
      bicycle_parking: Key:bicycle parking
      bicycle_road: Key:bicycle road
      bin: Key:bin
      bicycle_parking: Key:bicycle parking
      bicycle_road: Key:bicycle road
      bin: Key:bin
+    biosphärenwirt: Key:biosphärenwirt
+    biotic_reef: Key:biotic reef
+    biotic_reef:type: Key:biotic reef:type
      board_type: Key:board type
      boat: Key:boat
      bollard: Key:bollard
      books: Key:books
      border_type: Key:border type
      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: Key:boundary
+    boundary_type: Key:boundary type
      brand: Key:brand
      brewery: Key:brewery
      bridge: Key:bridge
      brand: Key:brand
      brewery: Key:brewery
      bridge: Key:bridge
+    bridge:alt_name: Key:bridge:alt name
+    bridge:loc_name: Key:bridge:loc name
      bridge:movable: Key:bridge:movable
      bridge:movable: Key:bridge:movable
+    bridge:name: Key:bridge:name
+    bridge:official_name: Key:bridge:official name
+    bridge:old_name: Key:bridge:old name
+    bridge:short_name: Key:bridge:short name
      bridge:structure: Key:bridge:structure
      bridge:support: Key:bridge:support
      building: Key:building
      bridge:structure: Key:bridge:structure
      bridge:support: Key:bridge:support
      building: Key:building
+    building:architecture: Key:building:architecture
+    building:colour: Key:building:colour
      building:condition: Key:building:condition
      building:cullis:height: Key:building:cullis:height
      building:condition: Key:building:condition
      building:cullis:height: Key:building:cullis:height
+    building:facade:colour: Key:building:facade:colour
      building:fireproof: Key:building:fireproof
      building:flats: Key:building:flats
      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: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:roof:colour: Key:building:roof:colour
+    building:type: Key:building:type
+    building:usage:pl: Key:building:usage:pl
      bunker_type: Key:bunker type
      bunker_type: Key:bunker type
+    bus: Key:bus
      busway: Key:busway
      busway: Key:busway
+    busway:left: Key:busway:left
+    busway:right: Key:busway:right
      button_operated: Key:button operated
      button_operated: Key:button operated
+    cable_number: Key:cable number
      cables: Key:cables
      cables: Key:cables
+    cafe: Key:cafe
      capacity: Key:capacity
      capacity: Key:capacity
+    capacity:disabled: Key:capacity:disabled
      capital: Key:capital
      capital: Key:capital
+    carriage: Key:carriage
      carriageway_ref: Key:carriageway ref
      castle_type: Key:castle type
      carriageway_ref: Key:carriageway ref
      castle_type: Key:castle type
+    castle_type:cs: Key:castle type:cs
      castle_type:de: Key:castle type:de
      castle_type:de: Key:castle type:de
+    cemetery: Key:cemetery
+    cemt: Key:cemt
+    center_turn_lane: Key:center turn lane
      centralkey: Key:centralkey
      centre_turn_lane: Key:centre turn lane
      cep: Key:cep
      centralkey: Key:centralkey
      centre_turn_lane: Key:centre turn lane
      cep: Key:cep
+    change: Key:change
      check_date: Key:check date
      checkpoint: Key:checkpoint
      circuits: Key:circuits
      circumference: Key:circumference
      check_date: Key:check date
      checkpoint: Key:checkpoint
      circuits: Key:circuits
      circumference: Key:circumference
+    class:bicycle: Key:class:bicycle
+    class:bicycle:commute: Key:class:bicycle:commute
+    class:bicycle:mtb: Key:class:bicycle:mtb
+    class:bicycle:mtb:technical: Key:class:bicycle:mtb:technical
+    class:bicycle:non_experienced: Key:class:bicycle:non experienced
+    class:bicycle:roadcycling: Key:class:bicycle:roadcycling
+    class:bicycle:touring: Key:class:bicycle:touring
+    class:bicycle:trailer: Key:class:bicycle:trailer
      clli: Key:clli
      clothes: Key:clothes
      club: Key:club
      clli: Key:clli
      clothes: Key:clothes
      club: Key:club
+    club-mate: Key:club-mate
      coastline:survey_quality: Key:coastline:survey quality
      coastline:survey_quality: Key:coastline:survey quality
+    cocktails: Key:cocktails
      collection_times: Key:collection times
      collection_times: Key:collection times
+    colonnade: Key:colonnade
+    color: Key:color
      colour: Key:colour
      comment: Key:comment
      common_good_land: Key:common good land
      colour: Key:colour
      comment: Key:comment
      common_good_land: Key:common good land
+    communication:mobile_phone: Key:communication:mobile phone
+    communication:radio: Key:communication:radio
+    communication:television: Key:communication:television
+    conditional: Key:conditional
      construction: Key:construction
      construction_end_expected: Key:construction end expected
      contact: Key:contact
      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:google_plus: Key:contact:google plus
+    contact:linkedin: Key:contact:linkedin
+    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
+    contact:xing: Key:contact:xing
      content: Key:content
      conveying: Key:conveying
      country: Key:country
      content: Key:content
      conveying: Key:conveying
      country: Key:country
@@ -834,38 +1508,86 @@ en:
      cuisine: Key:cuisine
      cultivation_method: Key:cultivation method
      currency: Key:currency
      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
      cutting: Key:cutting
      cyclability: Key:cyclability
+    cycle: Key:cycle
+    cycle_network: Key:cycle network
      cyclestreets_id: Key:cyclestreets id
      cycleway: Key:cycleway
      cyclestreets_id: Key:cyclestreets id
      cycleway: Key:cycleway
+    cycleway:both: Key:cycleway:both
      cycleway:buffer: Key:cycleway:buffer
      cycleway:buffer: Key:cycleway:buffer
+    cycleway:left: Key:cycleway:left
+    cycleway:left=backward: Key:cycleway:left=backward
+    cycleway:right: Key:cycleway:right
+    cycleway:right=forward: Key:cycleway:right=forward
      de:amtlicher_gemeindeschluessel: Key:de:amtlicher gemeindeschluessel
      de:amtlicher_gemeindeschluessel: Key:de:amtlicher gemeindeschluessel
-    de:regionalschluessel: Key:de:regionalschluessel
+    de:strassenschluessel: Key:de:strassenschluessel
      deanery: Key:deanery
      deanery: Key:deanery
+    dehoga: Key:dehoga
      delivery: Key:delivery
      denomination: Key:denomination
      denotation: Key:denotation
      depth: Key:depth
      delivery: Key:delivery
      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
      descent: Key:descent
      description: Key:description
      description:restrictions: Key:description:restrictions
+    descriptions:restrictions: Key:descriptions:restrictions
      designation: Key:designation
      destination: Key:destination
      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
      diaper: Key:diaper
      diet: Key:diet
+    diet:*: Key:diet:*
+    diet:dairy_free: Key:diet:dairy free
      diet:gluten_free: Key:diet:gluten free
      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
      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
      dispensing: Key:dispensing
      distance: Key:distance
      disused: Key:disused
+    'disused:': 'Key:disused:'
+    dominant_taxon: Key:dominant taxon
      door: Key:door
      drink: Key:drink
      door: Key:door
      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: 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_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
      driving_side: Key:driving side
      duration: Key:duration
      easy_overtaking: Key:easy overtaking
@@ -879,17 +1601,28 @@ en:
      entrance: Key:entrance
      escalator: Key:escalator
      esperanto: Key:esperanto
      entrance: Key:entrance
      escalator: Key:escalator
      esperanto: Key:esperanto
+    est_width: Key:est width
+    etymology: Key:etymology
      european_cultural_path: Key:european cultural path
      exit: Key:exit
      exit_to: Key:exit to
      expressway: Key:expressway
      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
      fair_trade: Key:fair trade
+    fast_food: Key:fast food
+    fax: Key:fax
      fee: Key:fee
      female: Key:female
      fence_type: Key:fence type
      fenced: Key:fenced
      ferry: Key:ferry
      fetish: Key:fetish
      fee: Key:fee
      female: Key:female
      fence_type: Key:fence type
      fenced: Key:fenced
      ferry: Key:ferry
      fetish: Key:fetish
+    fhrs:id: Key:fhrs:id
+    fire_boundary: Key:fire boundary
+    fire_object:type: Key:fire object:type
+    fire_operator: Key:fire operator
+    fire_rank: Key:fire rank
+    fireplace: Key:fireplace
      fishing: Key:fishing
      fixme: Key:fixme
      flood_prone: Key:flood prone
      fishing: Key:fishing
      fixme: Key:fixme
      flood_prone: Key:flood prone
@@ -898,18 +1631,49 @@ en:
      footway: Key:footway
      ford: Key:ford
      forestry: Key:forestry
      footway: Key:footway
      ford: Key:ford
      forestry: Key:forestry
-    fork: Key:fork
      format: Key:format
      format: Key:format
+    forward: Key:forward
      frequency: Key:frequency
      fruit: Key:fruit
      fuel: Key:fuel
      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:discount: Key:fuel:discount
+    fuel:e10: Key:fuel:e10
+    fuel:e20: Key:fuel:e20
+    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
      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
      generator:output: Key:generator:output
      gambling: Key:gambling
      gauge: Key:gauge
      generator:method: Key:generator:method
      generator:output: Key:generator:output
+    generator:output:biogas: Key:generator:output:biogas
      generator:output:electricity: Key:generator:output:electricity
      generator:output:electricity: Key:generator:output:electricity
+    generator:output:heat: Key:generator:output:heat
      generator:output:hot_air: Key:generator:output:hot air
      generator:output:hot_water: Key:generator:output:hot water
      generator:output:steam: Key:generator:output:steam
      generator:output:hot_air: Key:generator:output:hot air
      generator:output:hot_water: Key:generator:output:hot water
      generator:output:steam: Key:generator:output:steam
@@ -917,48 +1681,83 @@ en:
      generator:source: Key:generator:source
      generator:type: Key:generator:type
      genus: Key:genus
      generator:source: Key:generator:source
      generator:type: Key:generator:type
      genus: Key:genus
+    genus:de: Key:genus:de
+    geocodigo: Key:geocodigo
      geological: Key:geological
      geological: Key:geological
+    gluten_free: Key:gluten free
      gnis:feature_id: Key:gnis:feature id
      gnis:feature_id: Key:gnis:feature id
+    gnis:id: Key:gnis:id
      golf: Key:golf
      golf: Key:golf
+    goods: Key:goods
      grassland: Key:grassland
      group_only: Key:group only
      guidepost: Key:guidepost
      grassland: Key:grassland
      group_only: Key:group only
      guidepost: Key:guidepost
+    gvr:code: Key:gvr:code
      habitat: Key:habitat
      handrail: Key:handrail
      habitat: Key:habitat
      handrail: Key:handrail
+    happy_hours: Key:happy hours
      harbour: Key:harbour
      harbour: Key:harbour
-    harbour:access:swell: Key:harbour:access:swell
-    harbour:access:tide: Key:harbour:access:tide
      harbour:category: Key:harbour:category
      harbour:category: Key:harbour:category
-    harbour:main: Key:harbour:main
      hazard_intensity: Key:hazard intensity
      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
      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
      healthcare: Key:healthcare
+    healthcare:speciality: Key:healthcare:speciality
      height: Key:height
      hgv: Key:hgv
      highway: Key:highway
      hiking: Key:hiking
      historic: Key:historic
      historic:civilization: Key:historic:civilization
      height: Key:height
      hgv: Key:hgv
      highway: Key:highway
      hiking: Key:hiking
      historic: Key:historic
      historic:civilization: Key:historic:civilization
-    historic_Garrigues: Key:historic Garrigues
+    historic:era: Key:historic:era
+    historic:period: Key:historic:period
+    historic_name: Key:historic name
      history: Key:history
      horse: Key:horse
      history: Key:history
      horse: Key:horse
+    hour_off: Key:hour off
+    hour_on: Key:hour on
      hov: Key:hov
      hov: Key:hov
+    hov:lanes: Key:hov:lanes
      iata: Key:iata
      iata: Key:iata
+    icao: Key:icao
      ice_road: Key:ice road
      image: Key:image
      ice_road: Key:ice road
      image: Key:image
+    imagery_offset: Key:imagery offset
+    imagery_used: Key:imagery used
      importance: Key:importance
      importance: Key:importance
+    impromptu: Key:impromptu
      incline: Key:incline
      incline: Key:incline
+    indoor: Key:indoor
      informal: Key:informal
      information: Key:information
      inline_skates: Key:inline skates
      inscription: Key:inscription
      informal: Key:informal
      information: Key:information
      inline_skates: Key:inline skates
      inscription: Key:inscription
+    int_name: Key:int name
+    int_ref: Key:int ref
      intermittent: Key:intermittent
      intermittent: Key:intermittent
+    internet: Key:internet
      internet_access: Key:internet access
      internet_access: Key:internet access
+    internet_access:fee: Key:internet access:fee
+    is_hazard_prone: Key:is hazard prone
      is_in: Key:is in
      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
      jel: Key:jel
      junction: Key:junction
      junction_number: Key:junction number
@@ -977,29 +1776,46 @@ en:
      kms:zip_no: Key:kms:zip no
      kp: Key:kp
      label: Key:label
      kms:zip_no: Key:kms:zip no
      kp: Key:kp
      label: Key:label
+    lactose_free: Key:lactose free
+    ladder: Key:ladder
+    landmark: Key:landmark
      landuse: Key:landuse
      lane_hint: Key:lane hint
      lanes: Key:lanes
      landuse: Key:landuse
      lane_hint: Key:lane hint
      lanes: Key:lanes
+    lanes:bus: Key:lanes:bus
      lanes:psv: Key:lanes:psv
      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
      layer: Key:layer
      lcn_ref: Key:lcn ref
+    leaf_cycle: Key:leaf cycle
+    leaf_type: Key:leaf type
+    left: Key:left
      leisure: Key:leisure
      leisure: Key:leisure
+    leisure=beach: Key:leisure=beach
      length: Key:length
      level: Key:level
      length: Key:length
      level: Key:level
+    lighting:perceived: Key:lighting:perceived
      lines: Key:lines
      listed_status: Key:listed status
      lit: Key:lit
      lit:perceived: Key:lit:perceived
      lines: Key:lines
      listed_status: Key:listed status
      lit: Key:lit
      lit:perceived: Key:lit:perceived
+    living_street: Key:living street
+    loc_name: Key:loc name
+    loc_ref: Key:loc ref
      local_ref: Key:local ref
      location: Key:location
      lock: Key:lock
      lock_name: Key:lock name
      local_ref: Key:local ref
      location: Key:location
      lock: Key:lock
      lock_name: Key:lock name
+    lock_ref: Key:lock ref
      maintained: Key:maintained
      maintenance: Key:maintenance
      male: Key:male
      man_made: Key:man made
      managed: Key:managed
      manhole: Key:manhole
      maintained: Key:maintained
      maintenance: Key:maintenance
      male: Key:male
      man_made: Key:man made
      managed: Key:managed
      manhole: Key:manhole
+    mapillary: Key:mapillary
+    maritime: Key:maritime
      massage: Key:massage
      material: Key:material
      max_age: Key:max age
      massage: Key:massage
      material: Key:material
      max_age: Key:max age
@@ -1010,21 +1826,31 @@ en:
      maxheight:physical: Key:maxheight:physical
      maxlength: Key:maxlength
      maxspeed: Key:maxspeed
      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
      maxwidth: Key:maxwidth
      maxspeed:type: Key:maxspeed:type
      maxstay: Key:maxstay
      maxweight: Key:maxweight
      maxwidth: Key:maxwidth
+    maxwidth:physical: Key:maxwidth:physical
+    measurement: Key:measurement
+    megalith_type: Key:megalith type
+    memorial: Key:memorial
      military: Key:military
      min_age: Key:min age
      min_height: Key:min height
      minage: Key:minage
      minspeed: Key:minspeed
      military: Key:military
      min_age: Key:min age
      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
      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:groundwater: Key:monitoring:groundwater
      monitoring:noise: Key:monitoring:noise
      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:seismic_activity: Key:monitoring:seismic activity
      monitoring:tide_gauge: Key:monitoring:tide gauge
      monitoring:water_level: Key:monitoring:water level
@@ -1038,11 +1864,46 @@ en:
      motorroad: Key:motorroad
      motorway: Key:motorway
      mountain_pass: Key:mountain pass
      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: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: Key:name
+    name:ar: Key:name:ar
+    name:be: Key:name:be
+    name:botanical: Key:name:botanical
+    name:ca: Key:name:ca
+    name:cs: Key:name:cs
      name:cy: Key:name:cy
      name:cy: Key:name:cy
+    name:de: Key:name:de
+    name:en: Key:name:en
+    name:es: Key:name:es
+    name:etymology: Key:name:etymology
+    name:etymology:wikipedia: Key:name:etymology:wikipedia
+    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:kn: Key:name:kn
+    name:kn:iso15919: Key:name:kn:iso15919
+    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:sl: Key:name:sl
+    name:sv: Key:name:sv
+    name:uk: Key:name:uk
      narrow: Key:narrow
      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
      natural: Key:natural
      navibot:categorize: Key:navibot:categorize
      navibot:connect: Key:navibot:connect
@@ -1050,23 +1911,36 @@ en:
      ncn_milepost: Key:ncn milepost
      ncn_ref: Key:ncn ref
      network: Key:network
      ncn_milepost: Key:ncn milepost
      ncn_ref: Key:ncn ref
      network: Key:network
+    noaddress: Key:noaddress
      noexit: Key:noexit
      noname: Key:noname
      not_served_by: Key:not served by
      note: Key:note
      note:deplacer4mE: Key:note:deplacer4mE
      noexit: Key:noexit
      noname: Key:noname
      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
      notes: Key:notes
+    nudism: Key:nudism
+    obstacle: Key:obstacle
      office: Key:office
      office: Key:office
+    official_name: Key:official name
      offshore: Key:offshore
      ois:fixme: Key:ois:fixme
      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
      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
      openplaques_plaque: Key:openplaques plaque
      opensource: Key:opensource
      operator: Key:operator
      opening_date: Key:opening date
      opening_hours: Key:opening hours
      openplaques:id: Key:openplaques:id
      openplaques_plaque: Key:openplaques plaque
      opensource: Key:opensource
      operator: Key:operator
+    operator:MNC: Key:operator:MNC
      operator:type: Key:operator:type
      organic: Key:organic
      origin: Key:origin
      operator:type: Key:operator:type
      organic: Key:organic
      origin: Key:origin
@@ -1081,23 +1955,50 @@ en:
      osmarender:renderName: Key:osmarender:renderName
      osmarender:renderRef: Key:osmarender:renderRef
      osmc:symbol: Key:osmc:symbol
      osmarender:renderName: Key:osmarender:renderName
      osmarender:renderRef: Key:osmarender:renderRef
      osmc:symbol: Key:osmc:symbol
+    outdoor_seating: Key:outdoor seating
      overtaking: Key:overtaking
      overtaking: Key:overtaking
+    overtaking:hgv: Key:overtaking:hgv
      owner: Key:owner
      ownership: Key:ownership
      parking: Key:parking
      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: 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: Key:parking:lane
+    parking:lane:both: Key:parking:lane:both
+    parking:lane:hgv: Key:parking:lane:hgv
+    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
      passenger: Key:passenger
      passing_places: Key:passing places
+    paved: Key:paved
      paved:date: Key:paved:date
      payment: Key:payment
      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
      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
      pilotage: Key:pilotage
      pipeline: Key:pipeline
      piste:difficulty: Key:piste:difficulty
      piste:grooming: Key:piste:grooming
+    piste:ref: Key:piste:ref
      piste:type: Key:piste:type
      piste:type: Key:piste:type
+    pitlatrine: Key:pitlatrine
      pk: Key:pk
      place: Key:place
      place:fr: Key:place:fr
      pk: Key:pk
      place: Key:place
      place:fr: Key:place:fr
@@ -1105,16 +2006,32 @@ en:
      placement: Key:placement
      planned: Key:planned
      plant:output: Key:plant:output
      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
      police: Key:police
      population: Key:population
      plant_community: Key:plant community
      platforms: Key:platforms
      playground: Key:playground
      police: Key:police
      population: Key:population
+    post_box:type: Key:post box:type
      post_office:type: Key:post office:type
      postal_code: Key:postal code
      post_office:type: Key:post office:type
      postal_code: Key:postal code
+    postcode: Key:postcode
      power: Key:power
      power: Key:power
-    power_output: Key:power output
+    power_output: EN:Key:power output
+    power_rating: Key:power rating
+    power_source: Key:power source
      power_supply: Key:power supply
      power_supply: Key:power supply
+    power_supply:schedule: Key:power supply:schedule
+    previous: Key:previous
+    previous:access: Key:previous:access
+    previous:vehicle: Key:previous:vehicle
      priority: Key:priority
      priority_road: Key:priority road
      produce: Key:produce
      priority: Key:priority
      priority_road: Key:priority road
      produce: Key:produce
@@ -1125,15 +2042,30 @@ en:
      protection_title: Key:protection title
      prow_ref: Key:prow ref
      psv: Key:psv
      protection_title: Key:protection title
      prow_ref: Key:prow ref
      psv: Key:psv
+    public_bookcase:type: Key:public bookcase:type
      public_transport: Key:public transport
      public_transport: Key:public transport
+    public_transport:version: Key:public transport:version
      pump: Key:pump
      pyörä_väistää_aina_autoa: Key:pyörä väistää aina autoa
      pump: Key:pump
      pyörä_väistää_aina_autoa: Key:pyörä väistää aina autoa
+    raba:id: Key:raba:id
      rack: Key:rack
      radar_transponder: Key:radar transponder
      rack: Key:rack
      radar_transponder: Key:radar transponder
+    radar_transponder:sector: Key:radar transponder:sector
+    radar_transponder:signal_period: Key:radar transponder:signal period
      radio_transponder: Key:radio transponder
      radio_transponder: Key:radio transponder
+    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
      radio_transponder:signal_frequency: Key:radio transponder:signal frequency
      railway: Key:railway
+    railway:preserved: Key:railway:preserved
      ramp: Key:ramp
      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
      ramsar: Key:ramsar
      rcn_ref: Key:rcn ref
      real_ale: Key:real ale
@@ -1141,19 +2073,32 @@ en:
      recycling_type: Key:recycling type
      reef: Key:reef
      ref: Key:ref
      recycling_type: Key:recycling type
      reef: Key:reef
      ref: Key:ref
+    ref:CEF: Key:ref:CEF
+    ref:De_Lijn: Key:ref:De Lijn
      ref:ERDF:gdo: Key:ref:ERDF:gdo
      ref:FR:42C: Key:ref:FR:42C
      ref:FR:CEF: Key:ref:FR:CEF
      ref:FR:FINESS: Key:ref:FR:FINESS
      ref:ERDF:gdo: Key:ref:ERDF:gdo
      ref:FR:42C: Key:ref:FR:42C
      ref:FR:CEF: Key:ref:FR:CEF
      ref:FR:FINESS: Key:ref:FR:FINESS
+    ref:FR:MemorialGenWeb: Key:ref:FR:MemorialGenWeb
+    ref:FR:NAF: Key:ref:FR:NAF
+    ref:FR:SIREN: Key:ref:FR:SIREN
      ref:FR:SIRET: Key:ref:FR:SIRET
      ref:FR:SIRET: Key:ref:FR:SIRET
+    ref:IFOPT: Key:ref:IFOPT
      ref:INSEE: Key:ref:INSEE
      ref:ISTAT: Key:ref:ISTAT
      ref:INSEE: Key:ref:INSEE
      ref:ISTAT: Key:ref:ISTAT
+    ref:TECB: Key:ref:TECB
+    ref:TECC: Key:ref:TECC
+    ref:TECH: Key:ref:TECH
+    ref:TECL: Key:ref:TECL
+    ref:TECN: Key:ref:TECN
+    ref:TECX: Key:ref:TECX
      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: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:colour: Key:ref:colour
      ref:isil: Key:ref:isil
      ref:mhs: Key:ref:mhs
@@ -1163,21 +2108,32 @@ en:
      ref:ruian:addr: Key:ref:ruian:addr
      ref:ruian:building: Key:ref:ruian:building
      ref:sandre: Key:ref:sandre
      ref:ruian:addr: Key:ref:ruian:addr
      ref:ruian:building: Key:ref:ruian:building
      ref:sandre: Key:ref:sandre
+    ref:se:scb: Key:ref:se:scb
+    ref:shop:num: Key:ref:shop:num
      ref:taskey: Key:ref:taskey
      ref:vatin: Key:ref:vatin
      ref:vorwahl: Key:ref:vorwahl
      ref:wawa: Key:ref:wawa
      ref:taskey: Key:ref:taskey
      ref:vatin: Key:ref:vatin
      ref:vorwahl: Key:ref:vorwahl
      ref:wawa: Key:ref:wawa
+    ref_name: Key:ref name
+    reference: Key:reference
      reference_point: Key:reference point
      reference_point: Key:reference point
+    reg_name: Key:reg name
+    reg_ref: Key:reg ref
      religion: Key:religion
      religion: Key:religion
-    removed: Key:removed
      repair: Key:repair
      repair: Key:repair
+    repeat_on: Key:repeat on
      reservation: Key:reservation
      reservation: Key:reservation
+    residential: Key:residential
      resource: Key:resource
      retreat: Key:retreat
      retroreflecting: Key:retroreflecting
      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
      river:waterway_distance: Key:river:waterway distance
      road_marking: Key:road marking
      roadtrain: Key:roadtrain
+    role: Key:role
+    roof:colour: Key:roof:colour
+    roof:levels: Key:roof:levels
      roof:material: Key:roof:material
      room: Key:room
      rooms: Key:rooms
      roof:material: Key:roof:material
      room: Key:room
      rooms: Key:rooms
@@ -1185,14 +2141,28 @@ en:
      route: Key:route
      route_master: Key:route master
      route_ref: Key:route ref
      route: Key:route
      route_master: Key:route master
      route_ref: Key:route ref
+    route_ref:De_Lijn: Key:route ref:De Lijn
+    route_ref:TECB: Key:route ref:TECB
+    route_ref:TECC: Key:route ref:TECC
+    route_ref:TECH: Key:route ref:TECH
+    route_ref:TECL: Key:route ref:TECL
+    route_ref:TECN: Key:route ref:TECN
+    route_ref:TECX: Key:route ref:TECX
      royal_cypher: Key:royal cypher
      rtc_rate: Key:rtc rate
      royal_cypher: Key:royal cypher
      rtc_rate: Key:rtc rate
-    rugby: Key:rugby
+    ruined: Key:ruined
      ruins: Key:ruins
      ruins: Key:ruins
+    rungs: Key:rungs
      rwn_ref: Key:rwn ref
      sac_scale: Key:sac scale
      rwn_ref: Key:rwn ref
      sac_scale: Key:sac scale
+    safety_rope: Key:safety rope
+    safety_rope_side: Key:safety rope side
      sagns_id: Key:sagns id
      salt: Key:salt
      sagns_id: Key:sagns id
      salt: Key:salt
+    sanitary_dump_station: Key:sanitary dump station
+    sanitary_dump_station:fee: Key:sanitary dump station:fee
+    sanitary_dump_station:gravity: Key:sanitary dump station:gravity
+    sanitary_dump_station:suction: Key:sanitary dump station:suction
      scenic: Key:scenic
      school: Key:school
      seamark: Key:seamark
      scenic: Key:scenic
      school: Key:school
      seamark: Key:seamark
@@ -1215,6 +2185,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: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
      seamark:distance_mark:units: Key:seamark:distance mark:units
      seamark:fixme: Key:seamark:fixme
      seamark:fog_signal: Key:seamark:fog signal
@@ -1231,6 +2202,7 @@ en:
      seamark:light:status: Key:seamark:light:status
      seamark:light:visibility: Key:seamark:light:visibility
      seamark:light_vessel:colour: Key:seamark:light vessel:colour
      seamark:light:status: Key:seamark:light:status
      seamark:light:visibility: Key:seamark:light:visibility
      seamark:light_vessel:colour: Key:seamark:light vessel:colour
+    seamark:name: Key:seamark:name
      seamark:obstruction:category: Key:seamark:obstruction:category
      seamark:pilot_boarding:category: Key:seamark:pilot boarding:category
      seamark:pipeline_submarine:category: Key:seamark:pipeline submarine:category
      seamark:obstruction:category: Key:seamark:obstruction:category
      seamark:pilot_boarding:category: Key:seamark:pilot boarding:category
      seamark:pipeline_submarine:category: Key:seamark:pipeline submarine:category
@@ -1253,21 +2225,26 @@ en:
      seamark:restricted_area:category: Key:seamark:restricted area:category
      seamark:restricted_area:name: Key:seamark:restricted area:name
      seamark:restricted_area:restriction: Key:seamark:restricted area:restriction
      seamark:restricted_area:category: Key:seamark:restricted area:category
      seamark:restricted_area:name: Key:seamark:restricted area:name
      seamark:restricted_area:restriction: Key:seamark:restricted area:restriction
+    seamark:rock:water_level: Key:seamark:rock:water level
      seamark:sea_area:category: Key:seamark:sea area:category
      seamark:seabed_area:surface: Key:seamark:seabed area:surface
      seamark:shoreline_construction:category: Key:seamark:shoreline construction:category
      seamark:small_craft_facility:category: Key:seamark:small craft facility:category
      seamark:small_craft_facility:name: Key:seamark:small craft facility:name
      seamark:sea_area:category: Key:seamark:sea area:category
      seamark:seabed_area:surface: Key:seamark:seabed area:surface
      seamark:shoreline_construction:category: Key:seamark:shoreline construction:category
      seamark:small_craft_facility:category: Key:seamark:small craft facility:category
      seamark:small_craft_facility:name: Key:seamark:small craft facility:name
+    seamark:type: Key:seamark:type
      seasonal: Key:seasonal
      seasonal:snowfall:regaintime: Key:seasonal:snowfall:regaintime
      second_hand: Key:second hand
      segregated: Key:segregated
      seasonal: Key:seasonal
      seasonal:snowfall:regaintime: Key:seasonal:snowfall:regaintime
      second_hand: Key:second hand
      segregated: Key:segregated
+    self_service: Key:self service
      service: Key:service
      service_times: Key:service times
      shade: Key:shade
      shelter: Key:shelter
      shelter_type: Key:shelter type
      service: Key:service
      service_times: Key:service times
      shade: Key:shade
      shelter: Key:shelter
      shelter_type: Key:shelter type
+    ship: Key:ship
      shop: Key:shop
      shop: Key:shop
+    short_name: Key:short name
      side_road: Key:side road
      sidewalk: Key:sidewalk
      sign: Key:sign
      side_road: Key:side road
      sidewalk: Key:sidewalk
      sign: Key:sign
@@ -1275,19 +2252,36 @@ en:
      ski: Key:ski
      ski_tour_difficulty: Key:ski tour difficulty
      sl_stop_id: Key:sl stop id
      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
      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
      sorting_name: Key:sorting name
      source: Key:source
      source:addr: Key:source:addr
+    source:building: Key:source:building
      source:date: Key:source:date
      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:loc: Key:source:loc
      source:maxspeed: Key:source:maxspeed
+    source:name: Key:source:name
+    source:position: Key:source:position
+    source:postcode: Key:source:postcode
+    source:ref: Key:source:ref
      species: Key:species
      species: Key:species
+    speech_input: Key:speech input
+    speech_input:lg: Key:speech input:lg
      speech_output: Key:speech output
      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
      speisebezirk: Key:speisebezirk
      sport: Key:sport
      stars: Key:stars
@@ -1300,28 +2294,44 @@ en:
      stranded: Key:stranded
      stream: Key:stream
      sub_sea: Key:sub sea
      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
      surface: Key:surface
      surveillance: Key:surveillance
      surveillance:type: Key:surveillance:type
      surveillance:zone: Key:surveillance:zone
+    survey:date: Key:survey:date
      sustrans_ref: Key:sustrans ref
      symbol: Key:symbol
      sustrans_ref: Key:sustrans ref
      symbol: Key:symbol
+    tactile_map: Key:tactile map
      tactile_paving: Key:tactile paving
      takeaway: Key:takeaway
      tank: Key:tank
      tactile_paving: Key:tactile paving
      takeaway: Key:takeaway
      tank: Key:tank
+    taxi: Key:taxi
      taxon: Key:taxon
      technology: Key:technology
      telecom: Key:telecom
      taxon: Key:taxon
      technology: Key:technology
      telecom: Key:telecom
+    tenant: Key:tenant
+    tents: Key:tents
      tidal: Key:tidal
      tiger: Key:tiger
      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
      timezone: Key:timezone
      todo: Key:todo
+    toilets:type: Key:toilets:type
      toilets:wheelchair: Key:toilets:wheelchair
      toll: Key:toll
      topmark: Key:topmark
      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
      touring: Key:touring
      tourism: Key:tourism
      tourist_bus: Key:tourist bus
+    tower:type: Key:tower:type
      tracks: Key:tracks
      tracktype: Key:tracktype
      traffic:hourly: Key:traffic:hourly
      tracks: Key:tracks
      tracktype: Key:tracktype
      traffic:hourly: Key:traffic:hourly
@@ -1335,16 +2345,25 @@ en:
      traffic_signals:sound: Key:traffic signals:sound
      traffic_signals:vibration: Key:traffic signals:vibration
      trail_visibility: Key:trail visibility
      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
      trees: Key:trees
      trolley_wire: Key:trolley wire
+    trolleybus: Key:trolleybus
      tunnel: Key:tunnel
      turn: Key:turn
      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
      uic_name: Key:uic name
      uic_ref: Key:uic ref
      unisex: Key:unisex
      turning_radius: Key:turning radius
      twitter: Key:twitter
      type: Key:type
      uic_name: Key:uic name
      uic_ref: Key:uic ref
      unisex: Key:unisex
+    unnamed: Key:unnamed
+    unsigned: Key:unsigned
+    unsigned_ref: Key:unsigned ref
      url: Key:url
      url:restrictions: Key:url:restrictions
      usage: Key:usage
      url: Key:url
      url:restrictions: Key:url:restrictions
      usage: Key:usage
@@ -1353,6 +2372,7 @@ en:
      vehicle: Key:vehicle
      voltage: Key:voltage
      waste: Key:waste
      vehicle: Key:vehicle
      voltage: Key:voltage
      waste: Key:waste
+    waste_basket: Key:waste basket
      water: Key:water
      waterway: Key:waterway
      website: Key:website
      water: Key:water
      waterway: Key:waterway
      website: Key:website
@@ -1360,16 +2380,26 @@ en:
      wheelchair: Key:wheelchair
      wholesale: Key:wholesale
      width: Key:width
      wheelchair: Key:wheelchair
      wholesale: Key:wholesale
      width: Key:width
+    wifi: Key:wifi
      wiki:symbol: Key:wiki:symbol
      wikidata: Key:wikidata
      wiki:symbol: Key:wiki:symbol
      wikidata: Key:wikidata
+    wikimedia_commons: Key:wikimedia commons
      wikipedia: Key:wikipedia
      wikipedia: Key:wikipedia
+    wikipedia:en: Key:wikipedia:en
      winter_road: Key:winter road
      wires: Key:wires
      woeid: Key:woeid
      wood: Key:wood
      winter_road: Key:winter road
      wires: Key:wires
      woeid: Key:woeid
      wood: Key:wood
+    workrules: Key:workrules
      www.prezzibenzina.it: Key:www.prezzibenzina.it
      xmas:feature: Key:xmas:feature
      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:STRUCTURE: Key:yh:STRUCTURE
+    yh:TOTYUMONO: Key:yh:TOTYUMONO
+    yh:TYPE: Key:yh:TYPE
+    yh:WIDTH_RANK: Key:yh:WIDTH RANK
+    zone: Key:zone
      zone:maxspeed: Key:zone:maxspeed
      zone:traffic: Key:zone:traffic
      zoo: Key:zoo
      zone:maxspeed: Key:zone:maxspeed
      zone:traffic: Key:zone:traffic
      zoo: Key:zoo
@@ -1379,9 +2409,23 @@ en:
      access=designated: Tag:access=designated
      access=exclusion_zone: Tag:access=exclusion zone
      access=license: Tag:access=license
      access=designated: Tag:access=designated
      access=exclusion_zone: Tag:access=exclusion zone
      access=license: Tag:access=license
+    access=no: Tag:access=no
      access=official: Tag:access=official
      access=private: Tag:access=private
      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
      admin_level=aboriginal_land: Tag:admin level=aboriginal land
+    advertising=billboard: Tag:advertising=billboard
+    advertising=column: Tag:advertising=column
      aerialway=cable_car: Tag:aerialway=cable car
      aerialway=canopy: Tag:aerialway=canopy
      aerialway=chair_lift: Tag:aerialway=chair lift
      aerialway=cable_car: Tag:aerialway=cable car
      aerialway=canopy: Tag:aerialway=canopy
      aerialway=chair_lift: Tag:aerialway=chair lift
@@ -1396,6 +2440,7 @@ en:
      aerialway=rope_tow: Tag:aerialway=rope tow
      aerialway=station: Tag:aerialway=station
      aerialway=t-bar: Tag:aerialway=t-bar
      aerialway=rope_tow: Tag:aerialway=rope tow
      aerialway=station: Tag:aerialway=station
      aerialway=t-bar: Tag:aerialway=t-bar
+    aerialway=zip_line: Tag:aerialway=zip line
      aeroway=aerodrome: Tag:aeroway=aerodrome
      aeroway=airport: Tag:aeroway=airport
      aeroway=apron: Tag:aeroway=apron
      aeroway=aerodrome: Tag:aeroway=aerodrome
      aeroway=airport: Tag:aeroway=airport
      aeroway=apron: Tag:aeroway=apron
@@ -1414,6 +2459,9 @@ en:
      allotments=plot: Tag:allotments=plot
      amenity=Kneippbecken: Tag:amenity=Kneippbecken
      amenity=administration: Tag:amenity=administration
      allotments=plot: Tag:allotments=plot
      amenity=Kneippbecken: Tag:amenity=Kneippbecken
      amenity=administration: Tag:amenity=administration
+    amenity=advertising: Tag:amenity=advertising
+    amenity=alm: Tag:amenity=alm
+    amenity=ambulance_station: Tag:amenity=ambulance station
      amenity=animal_boarding: Tag:amenity=animal boarding
      amenity=animal_breeding: Tag:amenity=animal breeding
      amenity=animal_shelter: Tag:amenity=animal shelter
      amenity=animal_boarding: Tag:amenity=animal boarding
      amenity=animal_breeding: Tag:amenity=animal breeding
      amenity=animal_shelter: Tag:amenity=animal shelter
@@ -1428,48 +2476,72 @@ en:
      amenity=bench: Tag:amenity=bench
      amenity=bicycle_parking: Tag:amenity=bicycle parking
      amenity=bicycle_rental: Tag:amenity=bicycle rental
      amenity=bench: Tag:amenity=bench
      amenity=bicycle_parking: Tag:amenity=bicycle parking
      amenity=bicycle_rental: Tag:amenity=bicycle rental
+    amenity=bicycle_repair_station: Tag:amenity=bicycle repair station
      amenity=bicycle_trailer_sharing: Tag:amenity=bicycle trailer sharing
      amenity=biergarten: Tag:amenity=biergarten
      amenity=bikeshed: Tag:amenity=bikeshed
      amenity=boat_sharing: Tag:amenity=boat sharing
      amenity=boat_storage: Tag:amenity=boat storage
      amenity=brothel: Tag:amenity=brothel
      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=bts: Tag:amenity=bts
      amenity=bureau_de_change: Tag:amenity=bureau de change
      amenity=bus_station: Tag:amenity=bus station
      amenity=bureau_de_change: Tag:amenity=bureau de change
      amenity=bus_station: Tag:amenity=bus station
+    amenity=bus_stop: Tag:amenity=bus stop
      amenity=cafe: Tag:amenity=cafe
      amenity=cafe: Tag:amenity=cafe
+    amenity=canoe_hire: Tag:amenity=canoe hire
      amenity=car_rental: Tag:amenity=car rental
      amenity=car_sharing: Tag:amenity=car sharing
      amenity=car_wash: Tag:amenity=car wash
      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=casino: Tag:amenity=casino
      amenity=charging_station: Tag:amenity=charging station
+    amenity=childcare: Tag:amenity=childcare
      amenity=cinema: Tag:amenity=cinema
      amenity=clinic: Tag:amenity=clinic
      amenity=clock: Tag:amenity=clock
      amenity=cinema: Tag:amenity=cinema
      amenity=clinic: Tag:amenity=clinic
      amenity=clock: Tag:amenity=clock
+    amenity=club: Tag:amenity=club
      amenity=coast_guard: Tag:amenity=coast guard
      amenity=coast_radar_station: Tag:amenity=coast radar station
      amenity=college: Tag:amenity=college
      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=community_centre: Tag:amenity=community centre
      amenity=compressed_air: Tag:amenity=compressed air
+    amenity=conference_centre: Tag:amenity=conference centre
      amenity=courthouse: Tag:amenity=courthouse
      amenity=coworking_space: Tag:amenity=coworking space
      amenity=crematorium: Tag:amenity=crematorium
      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=crucifix: Tag:amenity=crucifix
      amenity=crypt: Tag:amenity=crypt
      amenity=customs: Tag:amenity=customs
+    amenity=dancing_school: Tag:amenity=dancing school
      amenity=dead_pub: Tag:amenity=dead pub
      amenity=dentist: Tag:amenity=dentist
      amenity=dead_pub: Tag:amenity=dead pub
      amenity=dentist: Tag:amenity=dentist
+    amenity=dive_centre: Tag:amenity=dive centre
+    amenity=doctor: Tag:amenity=doctor
      amenity=doctors: Tag:amenity=doctors
      amenity=doctors: Tag:amenity=doctors
+    amenity=dog_bin: Tag:amenity=dog bin
+    amenity=dog_waste_bin: Tag:amenity=dog waste bin
      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=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=emergency_service: Tag:amenity=emergency service
      amenity=ev_charging: Tag:amenity=ev charging
      amenity=ev_charging: Tag:amenity=ev charging
+    amenity=events_venue: Tag:amenity=events venue
+    amenity=exhibition_centre: Tag:amenity=exhibition centre
      amenity=fast_food: Tag:amenity=fast food
      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=ferry_terminal: Tag:amenity=ferry terminal
      amenity=festival_grounds: Tag:amenity=festival grounds
+    amenity=financial_advice: Tag:amenity=financial advice
      amenity=fire_hydrant: Tag:amenity=fire hydrant
      amenity=fire_station: Tag:amenity=fire station
      amenity=fire_hydrant: Tag:amenity=fire hydrant
      amenity=fire_station: Tag:amenity=fire station
+    amenity=first_aid: Tag:amenity=first aid
      amenity=firstaid: Tag:amenity=firstaid
      amenity=firstaid: Tag:amenity=firstaid
+    amenity=fish_spa: Tag:amenity=fish spa
+    amenity=fitness_station: Tag:amenity=fitness station
      amenity=food_court: Tag:amenity=food court
      amenity=fountain: Tag:amenity=fountain
      amenity=fuel: Tag:amenity=fuel
      amenity=food_court: Tag:amenity=food court
      amenity=fountain: Tag:amenity=fountain
      amenity=fuel: Tag:amenity=fuel
@@ -1477,28 +2549,41 @@ en:
      amenity=game_feeding: Tag:amenity=game feeding
      amenity=grave_yard: Tag:amenity=grave yard
      amenity=grit_bin: Tag:amenity=grit bin
      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=gym_(Don't_use): Tag:amenity=gym (Don't use)
      amenity=harbourmaster: Tag:amenity=harbourmaster
+    amenity=hospice: Tag:amenity=hospice
      amenity=hospital: Tag:amenity=hospital
      amenity=hunting_stand: Tag:amenity=hunting stand
      amenity=ice_cream: Tag:amenity=ice cream
      amenity=hospital: Tag:amenity=hospital
      amenity=hunting_stand: Tag:amenity=hunting stand
      amenity=ice_cream: Tag:amenity=ice cream
+    amenity=internet_cafe: Tag:amenity=internet cafe
+    amenity=jail: Tag:amenity=jail
      amenity=jobcentre: Tag:amenity=jobcentre
      amenity=kindergarten: Tag:amenity=kindergarten
      amenity=jobcentre: Tag:amenity=jobcentre
      amenity=kindergarten: Tag:amenity=kindergarten
+    amenity=kiosk: Tag:amenity=kiosk
+    amenity=kitchen: Tag:amenity=kitchen
      amenity=kneipp_water_cure: Tag:amenity=kneipp water cure
      amenity=kneipp_water_cure: Tag:amenity=kneipp water cure
+    amenity=lavoir: Tag:amenity=lavoir
      amenity=library: Tag:amenity=library
      amenity=life_ring: Tag:amenity=life ring
      amenity=lifeboat_station: Tag:amenity=lifeboat station
      amenity=library: Tag:amenity=library
      amenity=life_ring: Tag:amenity=life ring
      amenity=lifeboat_station: Tag:amenity=lifeboat station
+    amenity=loading_dock: Tag:amenity=loading dock
      amenity=love_hotel: Tag:amenity=love hotel
      amenity=marketplace: Tag:amenity=marketplace
      amenity=milk_dispenser: Tag:amenity=milk dispenser
      amenity=mobile_library: Tag:amenity=mobile library
      amenity=love_hotel: Tag:amenity=love hotel
      amenity=marketplace: Tag:amenity=marketplace
      amenity=milk_dispenser: Tag:amenity=milk dispenser
      amenity=mobile_library: Tag:amenity=mobile library
+    amenity=monastery: Tag:amenity=monastery
      amenity=motorcycle_parking: Tag:amenity=motorcycle parking
      amenity=music_venue: Tag:amenity=music venue
      amenity=motorcycle_parking: Tag:amenity=motorcycle parking
      amenity=music_venue: Tag:amenity=music venue
+    amenity=nameplate: Tag:amenity=nameplate
      amenity=nightclub: Tag:amenity=nightclub
      amenity=nightclub: Tag:amenity=nightclub
+    amenity=nursery: Tag:amenity=nursery
      amenity=nursing_home: Tag:amenity=nursing home
      amenity=nursing_home: Tag:amenity=nursing home
+    amenity=office: Tag:amenity=office
      amenity=parking: Tag:amenity=parking
      amenity=parking_entrance: Tag:amenity=parking entrance
      amenity=parking_space: Tag:amenity=parking space
      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
      amenity=pharmacy: Tag:amenity=pharmacy
      amenity=photo_booth: Tag:amenity=photo booth
      amenity=place_of_worship: Tag:amenity=place of worship
@@ -1506,21 +2591,34 @@ en:
      amenity=police: Tag:amenity=police
      amenity=post_box: Tag:amenity=post box
      amenity=post_office: Tag:amenity=post office
      amenity=police: Tag:amenity=police
      amenity=post_box: Tag:amenity=post box
      amenity=post_office: Tag:amenity=post office
+    amenity=printer: Tag:amenity=printer
      amenity=prison: Tag:amenity=prison
      amenity=pub: Tag:amenity=pub
      amenity=public_bath: Tag:amenity=public bath
      amenity=prison: Tag:amenity=prison
      amenity=pub: Tag:amenity=pub
      amenity=public_bath: Tag:amenity=public bath
+    amenity=public_bookcase: Tag:amenity=public bookcase
      amenity=public_building: Tag:amenity=public building
      amenity=public_building: Tag:amenity=public building
+    amenity=public_hall: Tag:amenity=public hall
      amenity=ranger_station: Tag:amenity=ranger station
      amenity=ranger_station: Tag:amenity=ranger station
+    amenity=reception_desk: Tag:amenity=reception desk
      amenity=recycling: Tag:amenity=recycling
      amenity=recycling: Tag:amenity=recycling
+    amenity=refugee_housing: Tag:amenity=refugee housing
      amenity=register_office: Tag:amenity=register office
      amenity=rescue_box: Tag:amenity=rescue box
      amenity=register_office: Tag:amenity=register office
      amenity=rescue_box: Tag:amenity=rescue box
+    amenity=rescue_station: Tag:amenity=rescue station
+    amenity=research_institute: Tag:amenity=research institute
      amenity=restaurant: Tag:amenity=restaurant
      amenity=retirement_home: Tag:amenity=retirement home
      amenity=restaurant: Tag:amenity=restaurant
      amenity=retirement_home: Tag:amenity=retirement home
+    amenity=sanatorium: Tag:amenity=sanatorium
+    amenity=sanitary_dump_station: Tag:amenity=sanitary dump station
      amenity=sauna: Tag:amenity=sauna
      amenity=sauna: Tag:amenity=sauna
+    amenity=sceptic_tank: Tag:amenity=sceptic tank
      amenity=school: Tag:amenity=school
      amenity=school: Tag:amenity=school
+    amenity=scout_hut: Tag:amenity=scout hut
      amenity=security_booth: Tag:amenity=security booth
      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=shelter: Tag:amenity=shelter
      amenity=shower: Tag:amenity=shower
+    amenity=ski_school: Tag:amenity=ski school
      amenity=smoking_area: Tag:amenity=smoking area
      amenity=social_centre: Tag:amenity=social centre
      amenity=social_facility: Tag:amenity=social facility
      amenity=smoking_area: Tag:amenity=smoking area
      amenity=social_centre: Tag:amenity=social centre
      amenity=social_facility: Tag:amenity=social facility
@@ -1530,26 +2628,44 @@ en:
      amenity=swimming_pool: Tag:amenity=swimming pool
      amenity=swingerclub: Tag:amenity=swingerclub
      amenity=taxi: Tag:amenity=taxi
      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=telephone: Tag:amenity=telephone
      amenity=theatre: Tag:amenity=theatre
+    amenity=ticket_booth: Tag:amenity=ticket booth
+    amenity=ticket_validator: Tag:amenity=ticket validator
      amenity=toilets: Tag:amenity=toilets
      amenity=townhall: Tag:amenity=townhall
      amenity=toilets: Tag:amenity=toilets
      amenity=townhall: Tag:amenity=townhall
+    amenity=trolley_bay: Tag:amenity=trolley bay
      amenity=university: Tag:amenity=university
      amenity=university: Tag:amenity=university
+    amenity=vacuum_cleaner: Tag:amenity=vacuum cleaner
+    amenity=vehicle_inspection: Tag:amenity=vehicle inspection
      amenity=vending_machine: Tag:amenity=vending machine
      amenity=veterinary: Tag:amenity=veterinary
      amenity=vending_machine: Tag:amenity=vending machine
      amenity=veterinary: Tag:amenity=veterinary
+    amenity=vivarium: Tag:amenity=vivarium
+    amenity=wash_center: Tag:amenity=wash center
      amenity=waste_basket: Tag:amenity=waste basket
      amenity=waste_disposal: Tag:amenity=waste disposal
      amenity=waste_transfer_station: Tag:amenity=waste transfer station
      amenity=waste_basket: Tag:amenity=waste basket
      amenity=waste_disposal: Tag:amenity=waste disposal
      amenity=waste_transfer_station: Tag:amenity=waste transfer station
+    amenity=water: Tag:amenity=water
      amenity=water_point: Tag:amenity=water point
      amenity=watering_place: Tag:amenity=watering place
      amenity=weighbridge: Tag:amenity=weighbridge
      amenity=water_point: Tag:amenity=water point
      amenity=watering_place: Tag:amenity=watering place
      amenity=weighbridge: Tag:amenity=weighbridge
+    amenity=winery: Tag:amenity=winery
+    amenity=yacht_club: Tag:amenity=yacht club
+    amenity=youth_centre: Tag:amenity=youth centre
+    aminety=sceptic_tank: Tag:aminety=sceptic tank
+    atm=no: Tag:atm=no
      atm=yes: Tag:atm=yes
      atm=yes: Tag:atm=yes
+    attraction=animal: Tag:attraction=animal
+    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=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
      barrier=city_wall: Tag:barrier=city wall
      barrier=cycle_barrier: Tag:barrier=cycle barrier
      barrier=ditch: Tag:barrier=ditch
@@ -1557,6 +2673,7 @@ en:
      barrier=fence: Tag:barrier=fence
      barrier=gate: Tag:barrier=gate
      barrier=guard_rail: Tag:barrier=guard rail
      barrier=fence: Tag:barrier=fence
      barrier=gate: Tag:barrier=gate
      barrier=guard_rail: Tag:barrier=guard rail
+    barrier=handrail: Tag:barrier=handrail
      barrier=hedge: Tag:barrier=hedge
      barrier=horse_stile: Tag:barrier=horse stile
      barrier=kent_carriage_gap: Tag:barrier=kent carriage gap
      barrier=hedge: Tag:barrier=hedge
      barrier=horse_stile: Tag:barrier=horse stile
      barrier=kent_carriage_gap: Tag:barrier=kent carriage gap
@@ -1566,6 +2683,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=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
      barrier=retaining_wall: Tag:barrier=retaining wall
      barrier=sally_port: Tag:barrier=sally port
      barrier=stile: Tag:barrier=stile
@@ -1574,6 +2692,10 @@ en:
      barrier=toll_booth: Tag:barrier=toll booth
      barrier=turnstile: Tag:barrier=turnstile
      barrier=wall: Tag:barrier=wall
      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
      border_type=fishery: Tag:border type=fishery
      border_type=harbour_limits: Tag:border type=harbour limits
      boundary=aboriginal_lands: Tag:boundary=aboriginal lands
@@ -1589,17 +2711,36 @@ en:
      boundary=protected_area: Tag:boundary=protected area
      boundary=regional_park: Tag:boundary=regional park
      boundary=vice_county: Tag:boundary=vice county
      boundary=protected_area: Tag:boundary=protected area
      boundary=regional_park: Tag:boundary=regional park
      boundary=vice_county: Tag:boundary=vice county
-    bridge=bascule: Tag:bridge=bascule
+    bridge:movable=bascule: Tag:bridge:movable=bascule
+    bridge:movable=drawbridge: Tag:bridge:movable=drawbridge
+    bridge:movable=lift: Tag:bridge:movable=lift
+    bridge:movable=submersible: Tag:bridge:movable=submersible
+    bridge:movable=swing: Tag:bridge:movable=swing
+    bridge:movable=transporter: Tag:bridge:movable=transporter
+    bridge:structure=arch: Tag:bridge:structure=arch
+    bridge:structure=beam: Tag:bridge:structure=beam
+    bridge:structure=cable-stayed: Tag:bridge:structure=cable-stayed
+    bridge:structure=floating: Tag:bridge:structure=floating
+    bridge:structure=humpback: Tag:bridge:structure=humpback
+    bridge:structure=simple-suspension: Tag:bridge:structure=simple-suspension
+    bridge:structure=suspension: Tag:bridge:structure=suspension
+    bridge:structure=truss: Tag:bridge:structure=truss
+    bridge=aqueduct: Tag:bridge=aqueduct
      bridge=beam: Tag:bridge=beam
      bridge=beam: Tag:bridge=beam
+    bridge=boardwalk: Tag:bridge=boardwalk
+    bridge=cantilever: Tag:bridge=cantilever
+    bridge=covered: Tag:bridge=covered
      bridge=drawbridge: Tag:bridge=drawbridge
      bridge=drawbridge: Tag:bridge=drawbridge
-    bridge=lift: Tag:bridge=lift
-    bridge=opening: Tag:bridge=opening
+    bridge=movable: Tag:bridge=movable
      bridge=pontoon: Tag:bridge=pontoon
      bridge=pontoon: Tag:bridge=pontoon
-    bridge=suspension: Tag:bridge=suspension
-    bridge=transporter: Tag:bridge=transporter
+    bridge=simple_brunnel: Tag:bridge=simple brunnel
+    bridge=swing: Tag:bridge=swing
+    bridge=trestle: Tag:bridge=trestle
      bridge=viaduct: Tag:bridge=viaduct
      bridge=viaduct: Tag:bridge=viaduct
+    building:use=stable: Tag:building:use=stable
      building=apartments: Tag:building=apartments
      building=barn: Tag:building=barn
      building=apartments: Tag:building=apartments
      building=barn: Tag:building=barn
+    building=brewery: Tag:building=brewery
      building=bridge: Tag:building=bridge
      building=bunker: Tag:building=bunker
      building=cabin: Tag:building=cabin
      building=bridge: Tag:building=bridge
      building=bunker: Tag:building=bunker
      building=cabin: Tag:building=cabin
@@ -1610,10 +2751,12 @@ en:
      building=civic: Tag:building=civic
      building=commercial: Tag:building=commercial
      building=construction: Tag:building=construction
      building=civic: Tag:building=civic
      building=commercial: Tag:building=commercial
      building=construction: Tag:building=construction
+    building=container: Tag:building=container
      building=cowshed: Tag:building=cowshed
      building=detached: Tag:building=detached
      building=dormitory: Tag:building=dormitory
      building=entrance: Tag:building=entrance
      building=cowshed: Tag:building=cowshed
      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
      building=farm: Tag:building=farm
      building=farm_auxiliary: Tag:building=farm auxiliary
      building=garage: Tag:building=garage
@@ -1627,31 +2770,46 @@ en:
      building=houseboat: Tag:building=houseboat
      building=hut: Tag:building=hut
      building=industrial: Tag:building=industrial
      building=houseboat: Tag:building=houseboat
      building=hut: Tag:building=hut
      building=industrial: Tag:building=industrial
+    building=kindergarten: Tag:building=kindergarten
      building=manufacture: Tag:building=manufacture
      building=mosque: Tag:building=mosque
      building=office: Tag:building=office
      building=public: Tag:building=public
      building=manufacture: Tag:building=manufacture
      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
      building=residential: Tag:building=residential
      building=retail: Tag:building=retail
      building=roof: Tag:building=roof
+    building=ruins: Tag:building=ruins
      building=school: Tag:building=school
      building=shed: Tag:building=shed
      building=school: Tag:building=school
      building=shed: Tag:building=shed
+    building=shrine: Tag:building=shrine
      building=stable: Tag:building=stable
      building=static_caravan: Tag:building=static caravan
      building=sty: Tag:building=sty
      building=supermarket: Tag:building=supermarket
      building=stable: Tag:building=stable
      building=static_caravan: Tag:building=static caravan
      building=sty: Tag:building=sty
      building=supermarket: Tag:building=supermarket
+    building=synagogue: Tag:building=synagogue
+    building=temple: Tag:building=temple
      building=terrace: Tag:building=terrace
      building=train_station: Tag:building=train station
      building=transformer_tower: Tag:building=transformer tower
      building=transportation: Tag:building=transportation
      building=university: Tag:building=university
      building=warehouse: Tag:building=warehouse
      building=terrace: Tag:building=terrace
      building=train_station: Tag:building=train station
      building=transformer_tower: Tag:building=transformer tower
      building=transportation: Tag:building=transportation
      building=university: Tag:building=university
      building=warehouse: Tag:building=warehouse
+    bunker_type=hardened_aircraft_shelter: Tag:bunker type=hardened aircraft shelter
      bunker_type=munitions: Tag:bunker type=munitions
      bunker_type=pillbox: Tag:bunker type=pillbox
      bunker_type=munitions: Tag:bunker type=munitions
      bunker_type=pillbox: Tag:bunker type=pillbox
+    busway:left=lane: Tag:busway:left=lane
+    busway:right=lane: Tag:busway:right=lane
      busway=lane: Tag:busway=lane
      busway=opposite_lane: Tag:busway=opposite lane
      cafe=time-cafe: Tag:cafe=time-cafe
      busway=lane: Tag:busway=lane
      busway=opposite_lane: Tag:busway=opposite lane
      cafe=time-cafe: Tag:cafe=time-cafe
+    cemetery=grave: Tag:cemetery=grave
      clothes=sports: Tag:clothes=sports
      clothes=sports: Tag:clothes=sports
+    clothes=underwear: Tag:clothes=underwear
+    club=automobile: Tag:club=automobile
+    club=fan: Tag:club=fan
+    club=scout: Tag:club=scout
+    club=sport: Tag:club=sport
      coastline:survey_quality=complete: Tag:coastline:survey quality=complete
      coastline:survey_quality=inadequate: Tag:coastline:survey quality=inadequate
      craft=agricultural_engines: Tag:craft=agricultural engines
      coastline:survey_quality=complete: Tag:coastline:survey quality=complete
      coastline:survey_quality=inadequate: Tag:coastline:survey quality=inadequate
      craft=agricultural_engines: Tag:craft=agricultural engines
@@ -1661,15 +2819,19 @@ en:
      craft=boatbuilder: Tag:craft=boatbuilder
      craft=bookbinder: Tag:craft=bookbinder
      craft=brewery: Tag:craft=brewery
      craft=boatbuilder: Tag:craft=boatbuilder
      craft=bookbinder: Tag:craft=bookbinder
      craft=brewery: Tag:craft=brewery
+    craft=cabinet_maker: Tag:craft=cabinet maker
      craft=car_repair: Tag:craft=car repair
      craft=carpenter: Tag:craft=carpenter
      craft=carpet_layer: Tag:craft=carpet layer
      craft=caterer: Tag:craft=caterer
      craft=car_repair: Tag:craft=car repair
      craft=carpenter: Tag:craft=carpenter
      craft=carpet_layer: Tag:craft=carpet layer
      craft=caterer: Tag:craft=caterer
+    craft=chimney_sweeper: Tag:craft=chimney sweeper
      craft=clockmaker: Tag:craft=clockmaker
      craft=confectionery: Tag:craft=confectionery
      craft=clockmaker: Tag:craft=clockmaker
      craft=confectionery: Tag:craft=confectionery
+    craft=distillery: Tag:craft=distillery
      craft=dressmaker: Tag:craft=dressmaker
      craft=dressmaker: Tag:craft=dressmaker
+    craft=electrican: Tag:craft=electrican
      craft=electrician: Tag:craft=electrician
      craft=electrician: Tag:craft=electrician
-    craft=falles: Tag:craft=falles
+    craft=floorer: Tag:craft=floorer
      craft=gardener: Tag:craft=gardener
      craft=glaziery: Tag:craft=glaziery
      craft=handicraft: Tag:craft=handicraft
      craft=gardener: Tag:craft=gardener
      craft=glaziery: Tag:craft=glaziery
      craft=handicraft: Tag:craft=handicraft
@@ -1677,10 +2839,12 @@ en:
      craft=information_electronics: Tag:craft=information electronics
      craft=insulation: Tag:craft=insulation
      craft=jeweller: Tag:craft=jeweller
      craft=information_electronics: Tag:craft=information electronics
      craft=insulation: Tag:craft=insulation
      craft=jeweller: Tag:craft=jeweller
+    craft=joiner: Tag:craft=joiner
      craft=key_cutter: Tag:craft=key cutter
      craft=locksmith: Tag:craft=locksmith
      craft=metal_construction: Tag:craft=metal construction
      craft=optician: Tag:craft=optician
      craft=key_cutter: Tag:craft=key cutter
      craft=locksmith: Tag:craft=locksmith
      craft=metal_construction: Tag:craft=metal construction
      craft=optician: Tag:craft=optician
+    craft=organ_builder: Tag:craft=organ builder
      craft=painter: Tag:craft=painter
      craft=paperhanger: Tag:craft=paperhanger
      craft=parquet_layer: Tag:craft=parquet layer
      craft=painter: Tag:craft=painter
      craft=paperhanger: Tag:craft=paperhanger
      craft=parquet_layer: Tag:craft=parquet layer
@@ -1707,9 +2871,12 @@ en:
      craft=upholsterer: Tag:craft=upholsterer
      craft=watchmaker: Tag:craft=watchmaker
      craft=window_construction: Tag:craft=window construction
      craft=upholsterer: Tag:craft=upholsterer
      craft=watchmaker: Tag:craft=watchmaker
      craft=window_construction: Tag:craft=window construction
+    craft=winery: Tag:craft=winery
      crop=asparagus: Tag:crop=asparagus
      crop=asparagus: Tag:crop=asparagus
+    crop=aspargus: Tag:crop=aspargus
      crop=bananas: Tag:crop=bananas
      crop=barley: Tag:crop=barley
      crop=bananas: Tag:crop=bananas
      crop=barley: Tag:crop=barley
+    crop=cassava: Tag:crop=cassava
      crop=coffee: Tag:crop=coffee
      crop=corn: Tag:crop=corn
      crop=flowers: Tag:crop=flowers
      crop=coffee: Tag:crop=coffee
      crop=corn: Tag:crop=corn
      crop=flowers: Tag:crop=flowers
@@ -1727,14 +2894,35 @@ en:
      crop=tea: Tag:crop=tea
      crop=wheat: Tag:crop=wheat
      cuisine=brazilian: Tag:cuisine=brazilian
      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
      cuisine=coffee_shop: Tag:cuisine=coffee shop
+    cuisine=dessert: Tag:cuisine=dessert
+    cycle_network=US:CA:SF: Tag:cycle network=US:CA:SF
+    cycle_network=US:GA: Tag:cycle network=US:GA
+    cycle_network=US:NC: Tag:cycle network=US:NC
+    cycle_network=US:NM: Tag:cycle network=US:NM
+    cycle_network=US:NY: Tag:cycle network=US:NY
+    cycle_network=US:OH: Tag:cycle network=US:OH
+    cycle_network=US:PA: Tag:cycle network=US:PA
+    cycle_network=US:US: Tag:cycle network=US:US
      cycleway=asl: Tag:cycleway=asl
      cycleway=bike_box: Tag:cycleway=bike box
      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=share_busway: Tag:cycleway=share busway
+    cycleway=shared_busway: Tag:cycleway=shared busway
+    dennert_fir_tree=yes: Tag:dennert fir tree=yes
      denomination=mormon: Tag:denomination=mormon
      denomination=reformed: Tag:denomination=reformed
      denomination=mormon: Tag:denomination=mormon
      denomination=reformed: Tag:denomination=reformed
-    denotation=landmark: Tag:denotation=landmark
+    denotation=cluster: Tag:denotation=cluster
+    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=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=coast_guard: Tag:emergency=coast guard
      emergency=defibrillator: Tag:emergency=defibrillator
      emergency=emergency_ward_entrance: Tag:emergency=emergency ward entrance
@@ -1746,30 +2934,71 @@ 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=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=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
      emergency_service=technical: Tag:emergency service=technical
      emergency=suction_point: Tag:emergency=suction point
      emergency=water_rescue_station: Tag:emergency=water rescue station
      emergency=water_tank: Tag:emergency=water tank
      emergency_service=technical: Tag:emergency service=technical
+    entrance=staircase: Tag:entrance=staircase
      esperanto=esperanto: Tag:esperanto=esperanto
      estuary=yes: Tag:estuary=yes
      fast_food=cafeteria: Tag:fast food=cafeteria
      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
      footway=crossing: Tag:footway=crossing
      footway=sidewalk: Tag:footway=sidewalk
+    generator:method=anaerobic_digestion: Tag:generator:method=anaerobic digestion
+    generator:method=barrage: Tag:generator:method=barrage
+    generator:method=combustion: Tag:generator:method=combustion
      generator:method=fission: Tag:generator:method=fission
      generator:method=fusion: Tag:generator:method=fusion
      generator:method=fission: Tag:generator:method=fission
      generator:method=fusion: Tag:generator:method=fusion
+    generator:method=gasification: Tag:generator:method=gasification
+    generator:method=photovoltaic: Tag:generator:method=photovoltaic
+    generator:method=run-of-the-river: Tag:generator:method=run-of-the-river
+    generator:method=stream: Tag:generator:method=stream
+    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:method=wind_turbine: Tag:generator:method=wind turbine
      generator:plant=intermediate: Tag:generator:plant=intermediate
      generator:plant=output: Tag:generator:plant=output
      generator:plant=intermediate: Tag:generator:plant=intermediate
      generator:plant=output: Tag:generator:plant=output
+    generator:source=biofuel: Tag:generator:source=biofuel
+    generator:source=biomass: Tag:generator:source=biomass
+    generator:source=coal: Tag:generator:source=coal
+    generator:source=gas: Tag:generator:source=gas
+    generator:source=gasoline: Tag:generator:source=gasoline
+    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=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=waste: Tag:generator:source=waste
+    generator:source=wave: Tag:generator:source=wave
      generator:source=wind: Tag:generator:source=wind
      generator:source=wind: Tag:generator:source=wind
+    generator:type=combined_cycle: Tag:generator:type=combined cycle
+    generator:type=francis_turbine: Tag:generator:type=francis turbine
+    generator:type=gas_turbine: Tag:generator:type=gas turbine
+    generator:type=heat_pump: Tag:generator:type=heat pump
+    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_photovoltaic_panel: Tag:generator:type=solar photovoltaic
+      panel
+    generator:type=solar_thermal_collector: Tag:generator:type=solar thermal collector
+    generator:type=steam_generator: Tag:generator:type=steam generator
+    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
      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
      harbour:category=RoRo: Tag:harbour:category=RoRo
      harbour:category=bulk: Tag:harbour:category=bulk
      harbour:category=container: Tag:harbour:category=container
@@ -1786,28 +3015,33 @@ en:
      harbour:category=tanker: Tag:harbour:category=tanker
      harbour:category=tourism: Tag:harbour:category=tourism
      harbour:category=yacht: Tag:harbour:category=yacht
      harbour:category=tanker: Tag:harbour:category=tanker
      harbour:category=tourism: Tag:harbour:category=tourism
      harbour:category=yacht: Tag:harbour:category=yacht
-    harbour=dolphin: Tag:harbour=dolphin
      harbour=drinking_water: Tag:harbour=drinking water
      harbour=drinking_water: Tag:harbour=drinking water
-    harbour=harbour_master: Tag:harbour=harbour master
-    harbour=jetty: Tag:harbour=jetty
-    harbour=slipway: Tag:harbour=slipway
+    harbour=marina: Tag:harbour=marina
      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
      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=access: Tag:highway=access
+    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=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=centre_line: Tag:highway=centre line
      highway=corridor: Tag:highway=corridor
      highway=crossing: Tag:highway=crossing
      highway=cycleway: Tag:highway=cycleway
      highway=corridor: Tag:highway=corridor
      highway=crossing: Tag:highway=crossing
      highway=cycleway: Tag:highway=cycleway
+    highway=disused: Tag:highway=disused
      highway=elevator: Tag:highway=elevator
      highway=emergency_access_point: Tag:highway=emergency access point
      highway=escape: Tag:highway=escape
      highway=footway: Tag:highway=footway
      highway=ford: Tag:highway=ford
      highway=elevator: Tag:highway=elevator
      highway=emergency_access_point: Tag:highway=emergency access point
      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
      highway=give_way: Tag:highway=give way
      highway=incline: Tag:highway=incline
      highway=lane: Tag:highway=lane
@@ -1818,9 +3052,11 @@ 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=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
      highway=passing_place: Tag:highway=passing place
      highway=path: Tag:highway=path
      highway=pedestrian: Tag:highway=pedestrian
+    highway=planned: Tag:highway=planned
      highway=platform: Tag:highway=platform
      highway=primary: Tag:highway=primary
      highway=proposed: Tag:highway=proposed
      highway=platform: Tag:highway=platform
      highway=primary: Tag:highway=primary
      highway=proposed: Tag:highway=proposed
@@ -1833,9 +3069,11 @@ en:
      highway=services: Tag:highway=services
      highway=speed_camera: Tag:highway=speed camera
      highway=steps: Tag:highway=steps
      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=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
      highway=track: Tag:highway=track
      highway=traffic_mirror: Tag:highway=traffic mirror
      highway=traffic_signals: Tag:highway=traffic signals
@@ -1846,24 +3084,29 @@ en:
      highway=unclassified: Tag:highway=unclassified
      highway=unsurfaced: Tag:highway=unsurfaced
      highway=via_ferrata: Tag:highway=via ferrata
      highway=unclassified: Tag:highway=unclassified
      highway=unsurfaced: Tag:highway=unsurfaced
      highway=via_ferrata: Tag:highway=via ferrata
+    highway=yes: Tag:highway=yes
+    highway=yield: Tag:highway=yield
      historic=aircraft: Tag:historic=aircraft
      historic=archaeological_site: Tag:historic=archaeological site
      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=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=citywalls: Tag:historic=citywalls
+    historic=event: Tag:historic=event
      historic=farm: Tag:historic=farm
      historic=fort: Tag:historic=fort
      historic=gallows: Tag:historic=gallows
      historic=farm: Tag:historic=farm
      historic=fort: Tag:historic=fort
      historic=gallows: Tag:historic=gallows
+    historic=locomotive: Tag:historic=locomotive
      historic=manor: Tag:historic=manor
      historic=memorial: Tag:historic=memorial
      historic=milestone: Tag:historic=milestone
      historic=mine: Tag:historic=mine
      historic=monastery: Tag:historic=monastery
      historic=monument: Tag:historic=monument
      historic=manor: Tag:historic=manor
      historic=memorial: Tag:historic=memorial
      historic=milestone: Tag:historic=milestone
      historic=mine: Tag:historic=mine
      historic=monastery: Tag:historic=monastery
      historic=monument: Tag:historic=monument
+    historic=optical_telegraph: Tag:historic=optical telegraph
      historic=pa: Tag:historic=pa
      historic=paleontological_site: Tag:historic=paleontological site
      historic=pillory: Tag:historic=pillory
      historic=pa: Tag:historic=pa
      historic=paleontological_site: Tag:historic=paleontological site
      historic=pillory: Tag:historic=pillory
@@ -1876,20 +3119,29 @@ en:
      historic=wayside_cross: Tag:historic=wayside cross
      historic=wayside_shrine: Tag:historic=wayside shrine
      historic=wreck: Tag:historic=wreck
      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
      hunting=raised_hide: Tag:hunting=raised hide
      industrial=auto_wrecker: Tag:industrial=auto wrecker
      industrial=well_cluster: Tag:industrial=well cluster
+    information=board: Tag:information=board
      information=guidepost: Tag:information=guidepost
      information=guidepost: Tag:information=guidepost
+    information=map: Tag:information=map
      information=tactile_model: Tag:information=tactile model
      information=tactile_model: Tag:information=tactile model
+    internet_access=wlan: Tag:internet access=wlan
      junction=crossing: Tag:junction=crossing
      junction=filter: Tag:junction=filter
      junction=crossing: Tag:junction=crossing
      junction=filter: Tag:junction=filter
+    junction=jughandle: Tag:junction=jughandle
      junction=roundabout: Tag:junction=roundabout
      junction=roundabout: Tag:junction=roundabout
+    junction=yes: Tag:junction=yes
      landform=esker: Tag:landform=esker
      landform=raised_beach: Tag:landform=raised beach
      landform=esker: Tag:landform=esker
      landform=raised_beach: Tag:landform=raised beach
+    landmark=beacon: Tag:landmark=beacon
      landmark=cairn: Tag:landmark=cairn
      landmark=cairn: Tag:landmark=cairn
+    landmark=cemetery: Tag:landmark=cemetery
      landmark=chimney: Tag:landmark=chimney
      landmark=cross: Tag:landmark=cross
      landmark=dish_aerial: Tag:landmark=dish aerial
      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
      landmark=flare_stack: Tag:landmark=flare stack
      landmark=large_rock: Tag:landmark=large rock
      landmark=mast: Tag:landmark=mast
@@ -1900,6 +3152,7 @@ en:
      landmark=radar_scanner: Tag:landmark=radar scanner
      landmark=rock_pinnacle: Tag:landmark=rock pinnacle
      landmark=spire: Tag:landmark=spire
      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
      landmark=tower: Tag:landmark=tower
      landmark=windmill: Tag:landmark=windmill
      landmark=windmotor: Tag:landmark=windmotor
@@ -1908,23 +3161,29 @@ en:
      landuse=allotments: Tag:landuse=allotments
      landuse=aquaculture: Tag:landuse=aquaculture
      landuse=basin: Tag:landuse=basin
      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=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=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=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=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=hop_garden: Tag:landuse=hop garden
      landuse=industrial: Tag:landuse=industrial
+    landuse=institutional: Tag:landuse=institutional
      landuse=landfill: Tag:landuse=landfill
      landuse=meadow: Tag:landuse=meadow
      landuse=military: Tag:landuse=military
      landuse=landfill: Tag:landuse=landfill
      landuse=meadow: Tag:landuse=meadow
      landuse=military: Tag:landuse=military
@@ -1933,6 +3192,7 @@ en:
      landuse=peat_cutting: Tag:landuse=peat cutting
      landuse=plant_nursery: Tag:landuse=plant nursery
      landuse=plantation: Tag:landuse=plantation
      landuse=peat_cutting: Tag:landuse=peat cutting
      landuse=plant_nursery: Tag:landuse=plant nursery
      landuse=plantation: Tag:landuse=plantation
+    landuse=port: Tag:landuse=port
      landuse=prison: Tag:landuse=prison
      landuse=quarry: Tag:landuse=quarry
      landuse=railway: Tag:landuse=railway
      landuse=prison: Tag:landuse=prison
      landuse=quarry: Tag:landuse=quarry
      landuse=railway: Tag:landuse=railway
@@ -1944,25 +3204,46 @@ en:
      landuse=salt_pond: Tag:landuse=salt pond
      landuse=street: Tag:landuse=street
      landuse=traffic_island: Tag:landuse=traffic island
      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=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=winter_sport: Tag:landuse=winter sport
+    landuse=winter_sports: Tag:landuse=winter sports
+    landuse=wood: Tag:landuse=wood
      landuse=wood_(Don't_use): Tag:landuse=wood (Don't use)
      lane=buffered: Tag:lane=buffered
      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=adult_gaming_centre: Tag:leisure=adult gaming centre
      leisure=amusement_arcade: Tag:leisure=amusement arcade
+    leisure=arena: Tag:leisure=arena
+    leisure=bandstand: Tag:leisure=bandstand
      leisure=bathing_place: Tag:leisure=bathing place
      leisure=bbq: Tag:leisure=bbq
      leisure=beach_resort: Tag:leisure=beach resort
      leisure=bird_hide: Tag:leisure=bird hide
      leisure=bathing_place: Tag:leisure=bathing place
      leisure=bbq: Tag:leisure=bbq
      leisure=beach_resort: Tag:leisure=beach resort
      leisure=bird_hide: Tag:leisure=bird hide
+    leisure=bleachers: Tag:leisure=bleachers
+    leisure=bowling_alley: Tag:leisure=bowling alley
+    leisure=casino: Tag:leisure=casino
      leisure=common: Tag:leisure=common
      leisure=dance: Tag:leisure=dance
      leisure=common: Tag:leisure=common
      leisure=dance: Tag:leisure=dance
+    leisure=disc_golf_course: Tag:leisure=disc golf course
      leisure=dog_park: Tag:leisure=dog park
      leisure=firepit: Tag:leisure=firepit
      leisure=fishing: Tag:leisure=fishing
      leisure=fitness_station: Tag:leisure=fitness station
      leisure=dog_park: Tag:leisure=dog park
      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=garden: Tag:leisure=garden
      leisure=golf_course: Tag:leisure=golf course
      leisure=hackerspace: Tag:leisure=hackerspace
@@ -1978,19 +3259,35 @@ en:
      leisure=picnic_table: Tag:leisure=picnic table
      leisure=pitch: Tag:leisure=pitch
      leisure=playground: Tag:leisure=playground
      leisure=picnic_table: Tag:leisure=picnic table
      leisure=pitch: Tag:leisure=pitch
      leisure=playground: Tag:leisure=playground
+    leisure=recreation_ground: Tag:leisure=recreation ground
      leisure=red_light_district: Tag:leisure=red light district
      leisure=sailing_club: Tag:leisure=sailing club
      leisure=red_light_district: Tag:leisure=red light district
      leisure=sailing_club: Tag:leisure=sailing club
+    leisure=sauna: Tag:leisure=sauna
      leisure=ski_playground: Tag:leisure=ski playground
      leisure=slipway: Tag:leisure=slipway
      leisure=ski_playground: Tag:leisure=ski playground
      leisure=slipway: Tag:leisure=slipway
+    leisure=social_club: Tag:leisure=social club
+    leisure=sport_centre: Tag:leisure=sport centre
      leisure=sports_centre: Tag:leisure=sports centre
      leisure=stadium: Tag:leisure=stadium
      leisure=sports_centre: Tag:leisure=sports centre
      leisure=stadium: Tag:leisure=stadium
+    leisure=summer_camp: Tag:leisure=summer camp
      leisure=swimming_pool: Tag:leisure=swimming pool
      leisure=swimming_pool: Tag:leisure=swimming pool
+    leisure=table_tennis_table: Tag:leisure=table tennis table
+    leisure=tanning_salon: Tag:leisure=tanning salon
      leisure=track: Tag:leisure=track
      leisure=track: Tag:leisure=track
+    leisure=trampoline_park: Tag:leisure=trampoline park
+    leisure=turkish_bath: Tag:leisure=turkish bath
      leisure=video_arcade: Tag:leisure=video arcade
      leisure=water_park: Tag:leisure=water park
      leisure=wildlife_hide: Tag:leisure=wildlife hide
      leisure=video_arcade: Tag:leisure=video arcade
      leisure=water_park: Tag:leisure=water park
      leisure=wildlife_hide: Tag:leisure=wildlife hide
+    level_crossing=automatic_barrier: Tag:level crossing=automatic barrier
      level_crossing=uncontrolled: Tag:level crossing=uncontrolled
      level_crossing=uncontrolled: Tag:level crossing=uncontrolled
+    line=bay: Tag:line=bay
+    line=busbar: Tag:line=busbar
      lines=phone: Tag:lines=phone
      lines=phone: Tag:lines=phone
+    locality=subtownland: Tag:locality=subtownland
+    locality=townland: Tag:locality=townland
+    maintenance=gritting: Tag:maintenance=gritting
+    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
      man_made=adit: Tag:man made=adit
      man_made=antenna: Tag:man made=antenna
      man_made=archimedes_screw: Tag:man made=archimedes screw
@@ -2000,12 +3297,15 @@ en:
      man_made=bunker_silo: Tag:man made=bunker silo
      man_made=cairn: Tag:man made=cairn
      man_made=campanile: Tag:man made=campanile
      man_made=bunker_silo: Tag:man made=bunker silo
      man_made=cairn: Tag:man made=cairn
      man_made=campanile: Tag:man made=campanile
+    man_made=cellar_entrance: Tag:man made=cellar entrance
      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=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=dolphin: Tag:man made=dolphin
      man_made=dovecote: Tag:man made=dovecote
      man_made=dyke: Tag:man made=dyke
      man_made=embankment: Tag:man made=embankment
      man_made=dovecote: Tag:man made=dovecote
      man_made=dyke: Tag:man made=dyke
      man_made=embankment: Tag:man made=embankment
@@ -2013,15 +3313,19 @@ en:
      man_made=flare: Tag:man made=flare
      man_made=floating_storage: Tag:man made=floating storage
      man_made=gasometer: Tag:man made=gasometer
      man_made=flare: Tag:man made=flare
      man_made=floating_storage: Tag:man made=floating storage
      man_made=gasometer: Tag:man made=gasometer
+    man_made=geoglyph: Tag:man made=geoglyph
      man_made=goods_conveyor: Tag:man made=goods conveyor
      man_made=ground_station: Tag:man made=ground station
      man_made=groyne: Tag:man made=groyne
      man_made=goods_conveyor: Tag:man made=goods conveyor
      man_made=ground_station: Tag:man made=ground station
      man_made=groyne: Tag:man made=groyne
+    man_made=insect_hotel: Tag:man made=insect hotel
      man_made=jetty: Tag:man made=jetty
      man_made=kiln: Tag:man made=kiln
      man_made=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
      man_made=monitoring_station: Tag:man made=monitoring station
      man_made=lighthouse: Tag:man made=lighthouse
      man_made=mast: Tag:man made=mast
      man_made=mineshaft: Tag:man made=mineshaft
      man_made=monitoring_station: Tag:man made=monitoring station
+    man_made=obelisk: Tag:man made=obelisk
      man_made=offshore_platform: Tag:man made=offshore platform
      man_made=oil_well: Tag:man made=oil well
      man_made=petroleum_well: Tag:man made=petroleum well
      man_made=offshore_platform: Tag:man made=offshore platform
      man_made=oil_well: Tag:man made=oil well
      man_made=petroleum_well: Tag:man made=petroleum well
@@ -2031,15 +3335,19 @@ 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=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=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=street_cabinet: Tag:man made=street cabinet
      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=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
      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
+    man_made=water_tap: Tag:man made=water tap
      man_made=water_tower: Tag:man made=water tower
      man_made=water_well: Tag:man made=water well
      man_made=water_works: Tag:man made=water works
      man_made=water_tower: Tag:man made=water tower
      man_made=water_well: Tag:man made=water well
      man_made=water_works: Tag:man made=water works
@@ -2050,7 +3358,14 @@ en:
      man_made=windmill: Tag:man made=windmill
      man_made=windpump: Tag:man made=windpump
      man_made=works: Tag:man made=works
      man_made=windmill: Tag:man made=windmill
      man_made=windpump: Tag:man made=windpump
      man_made=works: Tag:man made=works
+    medical=aed: Tag:medical=aed
      medical=witchdoctor: Tag:medical=witchdoctor
      medical=witchdoctor: Tag:medical=witchdoctor
+    memorial:type=obelisk: Tag:memorial:type=obelisk
+    memorial:type=plaque: Tag:memorial:type=plaque
+    memorial:type=plate: Tag:memorial:type=plate
+    memorial:type=statue: Tag:memorial:type=statue
+    memorial:type=stele: Tag:memorial:type=stele
+    memorial:type=stolperstein: Tag:memorial:type=stolperstein
      microbrewery=yes: Tag:microbrewery=yes
      military=airfield: Tag:military=airfield
      military=barracks: Tag:military=barracks
      microbrewery=yes: Tag:microbrewery=yes
      military=airfield: Tag:military=airfield
      military=barracks: Tag:military=barracks
@@ -2059,6 +3374,7 @@ en:
      military=danger_area: Tag:military=danger area
      military=exclusion_zone: Tag:military=exclusion zone
      military=naval_base: Tag:military=naval base
      military=danger_area: Tag:military=danger area
      military=exclusion_zone: Tag:military=exclusion zone
      military=naval_base: Tag:military=naval base
+    military=nuclear_explosion_site: Tag:military=nuclear explosion site
      military=obstacle_course: Tag:military=obstacle course
      military=range: Tag:military=range
      military=training_area: Tag:military=training area
      military=obstacle_course: Tag:military=obstacle course
      military=range: Tag:military=range
      military=training_area: Tag:military=training area
@@ -2073,6 +3389,8 @@ en:
      mooring=spm: Tag:mooring=spm
      mooring=visitor: Tag:mooring=visitor
      mooring=yes: Tag:mooring=yes
      mooring=spm: Tag:mooring=spm
      mooring=visitor: Tag:mooring=visitor
      mooring=yes: Tag:mooring=yes
+    name=The_Church_of_Jesus_Christ_of_Latter-day_Saints: Tag:name=The Church of Jesus
+      Christ of Latter-day Saints
      natural=arete: Tag:natural=arete
      natural=avalanche_dam: Tag:natural=avalanche dam
      natural=bare_rock: Tag:natural=bare rock
      natural=arete: Tag:natural=arete
      natural=avalanche_dam: Tag:natural=avalanche dam
      natural=bare_rock: Tag:natural=bare rock
@@ -2083,30 +3401,38 @@ en:
      natural=cape: Tag:natural=cape
      natural=cave_entrance: Tag:natural=cave entrance
      natural=cliff: Tag:natural=cliff
      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=coastline: Tag:natural=coastline
      natural=continental_shelf: Tag:natural=continental shelf
+    natural=crevasse: Tag:natural=crevasse
      natural=desert: Tag:natural=desert
      natural=dune: Tag:natural=dune
      natural=esker: Tag:natural=esker
      natural=fell: Tag:natural=fell
      natural=glacier: Tag:natural=glacier
      natural=grassland: Tag:natural=grassland
      natural=desert: Tag:natural=desert
      natural=dune: Tag:natural=dune
      natural=esker: Tag:natural=esker
      natural=fell: Tag:natural=fell
      natural=glacier: Tag:natural=glacier
      natural=grassland: Tag:natural=grassland
+    natural=gully: Tag:natural=gully
      natural=heath: Tag:natural=heath
      natural=lake: Tag:natural=lake
      natural=land: Tag:natural=land
      natural=landform: Tag:natural=landform
      natural=lava: Tag:natural=lava
      natural=heath: Tag:natural=heath
      natural=lake: Tag:natural=lake
      natural=land: Tag:natural=land
      natural=landform: Tag:natural=landform
      natural=lava: Tag:natural=lava
+    natural=meadow: Tag:natural=meadow
      natural=moor: Tag:natural=moor
      natural=moraine: Tag:natural=moraine
      natural=mud: Tag:natural=mud
      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=peak: Tag:natural=peak
      natural=reef: Tag:natural=reef
      natural=ridge: Tag:natural=ridge
+    natural=riverbed: Tag:natural=riverbed
      natural=rock: Tag:natural=rock
      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
      natural=scrub: Tag:natural=scrub
      natural=saddle: Tag:natural=saddle
      natural=sand: Tag:natural=sand
      natural=scree: Tag:natural=scree
      natural=scrub: Tag:natural=scrub
+    natural=shingle: Tag:natural=shingle
      natural=shoal: Tag:natural=shoal
      natural=sinkhole: Tag:natural=sinkhole
      natural=spring: Tag:natural=spring
      natural=shoal: Tag:natural=shoal
      natural=sinkhole: Tag:natural=sinkhole
      natural=spring: Tag:natural=spring
@@ -2115,23 +3441,92 @@ en:
      natural=tree: Tag:natural=tree
      natural=tree_row: Tag:natural=tree row
      natural=tundra: Tag:natural=tundra
      natural=tree: Tag:natural=tree
      natural=tree_row: Tag:natural=tree row
      natural=tundra: Tag:natural=tundra
+    natural=valley: Tag:natural=valley
      natural=volcano: Tag:natural=volcano
      natural=water: Tag:natural=water
      natural=wetland: Tag:natural=wetland
      natural=wood: Tag:natural=wood
      natural=volcano: Tag:natural=volcano
      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=BR:PB: Tag:network=BR:PB
+    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: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:MT: Tag:network=US:MT
+    network=US:MT:secondary: Tag:network=US:MT:secondary
+    network=US:NJ:Atlantic: Tag:network=US:NJ:Atlantic
+    network=US:NJ:Bergen: Tag:network=US:NJ:Bergen
+    network=US:NJ:CR: Tag:network=US:NJ:CR
+    network=US:NJ:Cumberland: Tag:network=US:NJ:Cumberland
+    network=US:NJ:Passaic: Tag:network=US:NJ:Passaic
+    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: 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: 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: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: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:US: Tag:network=US:US
+    network=US:VA: Tag:network=US:VA
+    network=US:WV:Berkeley: Tag:network=US:WV:Berkeley
+    network=icn: Tag:network=icn
+    network=iwn: Tag:network=iwn
+    network=lcn: Tag:network=lcn
+    network=lhn: Tag:network=lhn
+    network=lwn: Tag:network=lwn
+    network=ncn: Tag:network=ncn
+    network=nwn: Tag:network=nwn
+    network=rcn: Tag:network=rcn
+    network=rhn: Tag:network=rhn
+    network=rwn: Tag:network=rwn
+    noexit=no: Tag:noexit=no
      odbl=clean: Tag:odbl=clean
      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
      office=accountant: Tag:office=accountant
      office=administrative: Tag:office=administrative
      office=architect: Tag:office=architect
-    office=camping: Tag:office=camping
+    office=association: Tag:office=association
      office=company: Tag:office=company
      office=educational_institution: Tag:office=educational institution
      office=employment_agency: Tag:office=employment agency
      office=company: Tag:office=company
      office=educational_institution: Tag:office=educational institution
      office=employment_agency: Tag:office=employment agency
@@ -2143,12 +3538,18 @@ en:
      office=lawyer: Tag:office=lawyer
      office=newspaper: Tag:office=newspaper
      office=ngo: Tag:office=ngo
      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=political_party: Tag:office=political party
      office=quango: Tag:office=quango
+    office=realtor: Tag:office=realtor
+    office=religion: Tag:office=religion
      office=research: Tag:office=research
      office=surveyor: Tag:office=surveyor
      office=telecommunication: Tag:office=telecommunication
      office=travel_agent: Tag:office=travel agent
      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
+    operator=independent: Tag:operator=independent
+    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=international: Tag:passenger=international
      passenger=local: Tag:passenger=local
      passenger=national: Tag:passenger=national
@@ -2157,13 +3558,16 @@ en:
      passenger=suburban: Tag:passenger=suburban
      passenger=urban: Tag:passenger=urban
      passenger=yes: Tag:passenger=yes
      passenger=suburban: Tag:passenger=suburban
      passenger=urban: Tag:passenger=urban
      passenger=yes: Tag:passenger=yes
+    path=desire: Tag:path=desire
      pilotage=boarding_point: Tag:pilotage=boarding point
      pilotage=office: Tag:pilotage=office
      pipeline=marker: Tag:pipeline=marker
      pilotage=boarding_point: Tag:pilotage=boarding point
      pilotage=office: Tag:pilotage=office
      pipeline=marker: Tag:pipeline=marker
+    pipeline=substation: Tag:pipeline=substation
      pipeline=valve: Tag:pipeline=valve
      place=allotments: Tag:place=allotments
      place=archipelago: Tag:place=archipelago
      place=city: Tag:place=city
      pipeline=valve: Tag:pipeline=valve
      place=allotments: Tag:place=allotments
      place=archipelago: Tag:place=archipelago
      place=city: Tag:place=city
+    place=city_block: Tag:place=city block
      place=continent: Tag:place=continent
      place=country: Tag:place=country
      place=county: Tag:place=county
      place=continent: Tag:place=continent
      place=country: Tag:place=country
      place=county: Tag:place=county
@@ -2175,6 +3579,7 @@ en:
      place=locality: Tag:place=locality
      place=neighbourhood: Tag:place=neighbourhood
      place=ocean: Tag:place=ocean
      place=locality: Tag:place=locality
      place=neighbourhood: Tag:place=neighbourhood
      place=ocean: Tag:place=ocean
+    place=quarter: Tag:place=quarter
      place=region: Tag:place=region
      place=sea: Tag:place=sea
      place=state: Tag:place=state
      place=region: Tag:place=region
      place=sea: Tag:place=sea
      place=state: Tag:place=state
@@ -2185,6 +3590,8 @@ en:
      placement=transition: Tag:placement=transition
      power=cable: Tag:power=cable
      power=cable_distribution_cabinet: Tag:power=cable distribution cabinet
      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
      power=generator: Tag:power=generator
      power=heliostat: Tag:power=heliostat
      power=line: Tag:power=line
@@ -2194,9 +3601,15 @@ en:
      power=station: Tag:power=station
      power=sub_station: Tag:power=sub station
      power=substation: Tag:power=substation
      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
      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
      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
@@ -2205,6 +3618,7 @@ en:
      pump=manual: Tag:pump=manual
      pump=no: Tag:pump=no
      pump=powered: Tag:pump=powered
      pump=manual: Tag:pump=manual
      pump=no: Tag:pump=no
      pump=powered: Tag:pump=powered
+    raba:id=2000: Tag:raba:id=2000
      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
      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
@@ -2215,6 +3629,7 @@ en:
      radio_transponder:category=rotating_pattern: Tag:radio transponder:category=rotating
        pattern
      railway=PRT: Tag:railway=PRT
      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=abandoned: Tag:railway=abandoned
      railway=buffer_stop: Tag:railway=buffer stop
      railway=crossing: Tag:railway=crossing
@@ -2232,7 +3647,9 @@ en:
      railway=platform: Tag:railway=platform
      railway=preserved: Tag:railway=preserved
      railway=rail: Tag:railway=rail
      railway=platform: Tag:railway=platform
      railway=preserved: Tag:railway=preserved
      railway=rail: Tag:railway=rail
+    railway=railway_crossing: Tag:railway=railway crossing
      railway=roundhouse: Tag:railway=roundhouse
      railway=roundhouse: Tag:railway=roundhouse
+    railway=signal: Tag:railway=signal
      railway=station: Tag:railway=station
      railway=stop: Tag:railway=stop
      railway=subway: Tag:railway=subway
      railway=station: Tag:railway=station
      railway=stop: Tag:railway=stop
      railway=subway: Tag:railway=subway
@@ -2241,20 +3658,27 @@ en:
      railway=tram: Tag:railway=tram
      railway=tram_stop: Tag:railway=tram stop
      railway=turntable: Tag:railway=turntable
      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
      religion=pagan: Tag:religion=pagan
+    residential=university: Tag:residential=university
      resource=aggregate: Tag:resource=aggregate
      resource=gravel: Tag:resource=gravel
      resource=sand: Tag:resource=sand
      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=bus: Tag:route=bus
      route=canal: Tag:route=canal
+    route=coach: Tag:route=coach
      route=detour: Tag:route=detour
      route=ferry: Tag:route=ferry
      route=fitness_trail: Tag:route=fitness trail
      route=detour: Tag:route=detour
      route=ferry: Tag:route=ferry
      route=fitness_trail: Tag:route=fitness trail
+    route=inline_skates: Tag:route=inline skates
      route=monorail: Tag:route=monorail
      route=monorail: Tag:route=monorail
+    route=nordic_walking: Tag:route=nordic walking
      route=pipeline: Tag:route=pipeline
      route=piste: Tag:route=piste
      route=railway: Tag:route=railway
      route=road: Tag:route=road
      route=pipeline: Tag:route=pipeline
      route=piste: Tag:route=piste
      route=railway: Tag:route=railway
      route=road: Tag:route=road
+    route=running: Tag:route=running
      route=share_taxi: Tag:route=share taxi
      route=ski: Tag:route=ski
      route=subway: Tag:route=subway
      route=share_taxi: Tag:route=share taxi
      route=ski: Tag:route=ski
      route=subway: Tag:route=subway
@@ -2275,6 +3699,7 @@ en:
      seamark:beacon_lateral:colour=green;white;green;white: Tag:seamark:beacon lateral:colour=green;white;green;white
      seamark:beacon_lateral:colour=red: Tag:seamark:beacon lateral:colour=red
      seamark:beacon_lateral:colour=red;green;red: Tag:seamark:beacon lateral:colour=red;green;red
      seamark:beacon_lateral:colour=green;white;green;white: Tag:seamark:beacon lateral:colour=green;white;green;white
      seamark:beacon_lateral:colour=red: Tag:seamark:beacon lateral:colour=red
      seamark:beacon_lateral:colour=red;green;red: Tag:seamark:beacon lateral:colour=red;green;red
+    seamark:beacon_lateral:colour=red;green;red;green: Tag:seamark:beacon lateral:colour=red;green;red;green
      seamark:beacon_lateral:colour=red;white;red;white: Tag:seamark:beacon lateral:colour=red;white;red;white
      seamark:beacon_lateral:colour_pattern=horizontal: Tag:seamark:beacon lateral:colour
        pattern=horizontal
      seamark:beacon_lateral:colour=red;white;red;white: Tag:seamark:beacon lateral:colour=red;white;red;white
      seamark:beacon_lateral:colour_pattern=horizontal: Tag:seamark:beacon lateral:colour
        pattern=horizontal
@@ -2322,6 +3747,7 @@ en:
      seamark:buoy_lateral:colour=green;white;green;white: Tag:seamark:buoy lateral:colour=green;white;green;white
      seamark:buoy_lateral:colour=red: Tag:seamark:buoy lateral:colour=red
      seamark:buoy_lateral:colour=red;green;red: Tag:seamark:buoy lateral:colour=red;green;red
      seamark:buoy_lateral:colour=green;white;green;white: Tag:seamark:buoy lateral:colour=green;white;green;white
      seamark:buoy_lateral:colour=red: Tag:seamark:buoy lateral:colour=red
      seamark:buoy_lateral:colour=red;green;red: Tag:seamark:buoy lateral:colour=red;green;red
+    seamark:buoy_lateral:colour=red;green;red;green: Tag:seamark:buoy lateral:colour=red;green;red;green
      seamark:buoy_lateral:colour=red;white;red;white: Tag:seamark:buoy lateral:colour=red;white;red;white
      seamark:buoy_lateral:colour_pattern=horizontal: Tag:seamark:buoy lateral:colour
        pattern=horizontal
      seamark:buoy_lateral:colour=red;white;red;white: Tag:seamark:buoy lateral:colour=red;white;red;white
      seamark:buoy_lateral:colour_pattern=horizontal: Tag:seamark:buoy lateral:colour
        pattern=horizontal
@@ -2362,6 +3788,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: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
      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
@@ -2377,6 +3804,7 @@ en:
      seamark:fog_signal:category=whistle: Tag:seamark:fog signal:category=whistle
      seamark:fog_signal:status=wave_activated: Tag:seamark:fog signal:status=wave activated
      seamark:fog_signal=yes: Tag:seamark:fog signal=yes
      seamark:fog_signal:category=whistle: Tag:seamark:fog signal:category=whistle
      seamark:fog_signal:status=wave_activated: Tag:seamark:fog signal:status=wave activated
      seamark:fog_signal=yes: Tag:seamark:fog signal=yes
+    seamark:harbour:category=marina: Tag:seamark:harbour:category=marina
      seamark:landmark:category=cairn: Tag:seamark:landmark:category=cairn
      seamark:landmark:category=cemetery: Tag:seamark:landmark:category=cemetery
      seamark:landmark:category=chimney: Tag:seamark:landmark:category=chimney
      seamark:landmark:category=cairn: Tag:seamark:landmark:category=cairn
      seamark:landmark:category=cemetery: Tag:seamark:landmark:category=cemetery
      seamark:landmark:category=chimney: Tag:seamark:landmark:category=chimney
@@ -2409,6 +3837,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=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
      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
@@ -2461,6 +3890,8 @@ en:
        area:restriction=berthing restricted
      seamark:restricted_area:restriction=entry_prohibited: Tag:seamark:restricted area:restriction=entry
        prohibited
        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
      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
@@ -2525,12 +3956,48 @@ 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=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:topmark:shape=x-shape: Tag:seamark:topmark:shape=x-shape
+    seamark:type=anchorage: Tag:seamark:type=anchorage
+    seamark:type=beacon_cardinal: Tag:seamark:type=beacon cardinal
+    seamark:type=beacon_isolated_danger: Tag:seamark:type=beacon isolated danger
+    seamark:type=beacon_lateral: Tag:seamark:type=beacon lateral
+    seamark:type=beacon_special_purpose: Tag:seamark:type=beacon special purpose
+    seamark:type=berth: Tag:seamark:type=berth
+    seamark:type=bridge: Tag:seamark:type=bridge
+    seamark:type=buoy_cardinal: Tag:seamark:type=buoy cardinal
+    seamark:type=buoy_lateral: Tag:seamark:type=buoy lateral
+    seamark:type=buoy_safe_water: Tag:seamark:type=buoy safe water
+    seamark:type=buoy_special_purpose: Tag:seamark:type=buoy special purpose
+    seamark:type=cable_overhead: Tag:seamark:type=cable overhead
+    seamark:type=cable_submarine: Tag:seamark:type=cable submarine
+    seamark:type=distance_mark: Tag:seamark:type=distance mark
+    seamark:type=gate: Tag:seamark:type=gate
+    seamark:type=harbour: Tag:seamark:type=harbour
+    seamark:type=landmark: Tag:seamark:type=landmark
+    seamark:type=light_major: Tag:seamark:type=light major
+    seamark:type=light_minor: Tag:seamark:type=light minor
+    seamark:type=lock_basin: Tag:seamark:type=lock basin
+    seamark:type=mooring: Tag:seamark:type=mooring
+    seamark:type=navigation_line: Tag:seamark:type=navigation line
+    seamark:type=notice: Tag:seamark:type=notice
+    seamark:type=pile: Tag:seamark:type=pile
+    seamark:type=pipeline_submarine: Tag:seamark:type=pipeline submarine
+    seamark:type=platform: Tag:seamark:type=platform
+    seamark:type=recommended_track: Tag:seamark:type=recommended track
+    seamark:type=restricted_area: Tag:seamark:type=restricted area
+    seamark:type=rock: Tag:seamark:type=rock
+    seamark:type=signal_station_traffic: Tag:seamark:type=signal station traffic
+    seamark:type=signal_station_warning: Tag:seamark:type=signal station warning
+    seamark:type=small_craft_facility: Tag:seamark:type=small craft facility
+    seamark:type=wreck: Tag:seamark:type=wreck
      seamark=anchorage: Tag:seamark=anchorage
      seamark=anchorage: Tag:seamark=anchorage
+    seamark=landmark: Tag:seamark=landmark
      segregated=no: Tag:segregated=no
      segregated=yes: Tag:segregated=yes
      service=alley: Tag:service=alley
      service=drive-through: Tag:service=drive-through
      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
      service=driveway: Tag:service=driveway
      service=emergency_access: Tag:service=emergency access
      service=parking_aisle: Tag:service=parking aisle
@@ -2540,12 +4007,19 @@ en:
      service=yard: Tag:service=yard
      shelter_type=basic_hut: Tag:shelter type=basic hut
      shelter_type=lean_to: Tag:shelter type=lean to
      service=yard: Tag:service=yard
      shelter_type=basic_hut: Tag:shelter type=basic hut
      shelter_type=lean_to: Tag:shelter type=lean to
+    shop=Alko: Tag:shop=Alko
+    shop=_business_machines: Tag:shop= business machines
+    shop=accessories: Tag:shop=accessories
      shop=alcohol: Tag:shop=alcohol
      shop=anime: Tag:shop=anime
      shop=antiques: Tag:shop=antiques
      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=art: Tag:shop=art
+    shop=audiologist: Tag:shop=audiologist
      shop=auto_parts: Tag:shop=auto parts
      shop=auto_parts: Tag:shop=auto parts
+    shop=baby_care: Tag:shop=baby care
      shop=baby_goods: Tag:shop=baby goods
      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
      shop=bakery: Tag:shop=bakery
      shop=bathroom_furnishing: Tag:shop=bathroom furnishing
      shop=beauty: Tag:shop=beauty
@@ -2553,44 +4027,65 @@ en:
      shop=betting: Tag:shop=betting
      shop=beverages: Tag:shop=beverages
      shop=bicycle: Tag:shop=bicycle
      shop=betting: Tag:shop=betting
      shop=beverages: Tag:shop=beverages
      shop=bicycle: Tag:shop=bicycle
+    shop=boat: Tag:shop=boat
      shop=bookmaker: Tag:shop=bookmaker
      shop=books: Tag:shop=books
      shop=boutique: Tag:shop=boutique
      shop=bookmaker: Tag:shop=bookmaker
      shop=books: Tag:shop=books
      shop=boutique: Tag:shop=boutique
+    shop=business_machines: Tag:shop=business machines
      shop=butcher: Tag:shop=butcher
      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=canoe_hire: Tag:shop=canoe hire
      shop=car: Tag:shop=car
      shop=car_bodyshop: Tag:shop=car bodyshop
      shop=car_parts: Tag:shop=car parts
      shop=car_repair: Tag:shop=car repair
+    shop=car_service: Tag:shop=car service
      shop=carpet: Tag:shop=carpet
      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=chandler: Tag:shop=chandler
      shop=charity: Tag:shop=charity
      shop=cheese: Tag:shop=cheese
      shop=chemist: Tag:shop=chemist
+    shop=chocolate: Tag:shop=chocolate
      shop=clothes: Tag:shop=clothes
      shop=clothes: Tag:shop=clothes
+    shop=coffee: Tag:shop=coffee
+    shop=communication: Tag:shop=communication
      shop=computer: Tag:shop=computer
      shop=confectionery: Tag:shop=confectionery
      shop=convenience: Tag:shop=convenience
      shop=copyshop: Tag:shop=copyshop
      shop=computer: Tag:shop=computer
      shop=confectionery: Tag:shop=confectionery
      shop=convenience: Tag:shop=convenience
      shop=copyshop: Tag:shop=copyshop
+    shop=cosmetics: Tag:shop=cosmetics
      shop=curtain: Tag:shop=curtain
      shop=dairy: Tag:shop=dairy
      shop=deli: Tag:shop=deli
      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=department_store: Tag:shop=department store
+    shop=discount: Tag:shop=discount
      shop=dive: Tag:shop=dive
      shop=dive: Tag:shop=dive
+    shop=diy: Tag:shop=diy
      shop=doityourself: Tag:shop=doityourself
      shop=dry_cleaning: Tag:shop=dry cleaning
      shop=doityourself: Tag:shop=doityourself
      shop=dry_cleaning: Tag:shop=dry cleaning
+    shop=e-cigarette: Tag:shop=e-cigarette
+    shop=electrical: Tag:shop=electrical
+    shop=electronic_cigarette: Tag:shop=electronic cigarette
      shop=electronics: Tag:shop=electronics
      shop=electronics: Tag:shop=electronics
+    shop=energy: Tag:shop=energy
      shop=erotic: Tag:shop=erotic
      shop=estate_agent: Tag:shop=estate agent
      shop=fabric: Tag:shop=fabric
      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=farm: Tag:shop=farm
      shop=fashion: Tag:shop=fashion
+    shop=fireworks: Tag:shop=fireworks
      shop=fish: Tag:shop=fish
      shop=fishing: Tag:shop=fishing
      shop=fishmonger: Tag:shop=fishmonger
      shop=fish: Tag:shop=fish
      shop=fishing: Tag:shop=fishing
      shop=fishmonger: Tag:shop=fishmonger
+    shop=flooring: Tag:shop=flooring
      shop=florist: Tag:shop=florist
      shop=florist: Tag:shop=florist
+    shop=flower: Tag:shop=flower
      shop=food: Tag:shop=food
      shop=frame: Tag:shop=frame
      shop=food: Tag:shop=food
      shop=frame: Tag:shop=frame
+    shop=frozen_food: Tag:shop=frozen food
      shop=funeral_directors: Tag:shop=funeral directors
      shop=furnace: Tag:shop=furnace
      shop=furniture: Tag:shop=furniture
      shop=funeral_directors: Tag:shop=funeral directors
      shop=furnace: Tag:shop=furnace
      shop=furniture: Tag:shop=furniture
@@ -2598,15 +4093,24 @@ en:
      shop=garden_centre: Tag:shop=garden centre
      shop=gas: Tag:shop=gas
      shop=general: Tag:shop=general
      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=gift: Tag:shop=gift
      shop=glaziery: Tag:shop=glaziery
+    shop=golf: Tag:shop=golf
      shop=greengrocer: Tag:shop=greengrocer
      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=hairdresser: Tag:shop=hairdresser
      shop=hairdresser_supply: Tag:shop=hairdresser supply
      shop=hardware: Tag:shop=hardware
+    shop=health: Tag:shop=health
+    shop=health_food: Tag:shop=health food
+    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
      shop=hearing_aids: Tag:shop=hearing aids
      shop=herbalist: Tag:shop=herbalist
      shop=hifi: Tag:shop=hifi
+    shop=hobby: Tag:shop=hobby
+    shop=household: Tag:shop=household
      shop=houseware: Tag:shop=houseware
      shop=hunting: Tag:shop=hunting
      shop=ice_cream: Tag:shop=ice cream
      shop=houseware: Tag:shop=houseware
      shop=hunting: Tag:shop=hunting
      shop=ice_cream: Tag:shop=ice cream
@@ -2615,49 +4119,72 @@ en:
      shop=jewelry: Tag:shop=jewelry
      shop=kiosk: Tag:shop=kiosk
      shop=kitchen: Tag:shop=kitchen
      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=laundry: Tag:shop=laundry
      shop=leather: Tag:shop=leather
+    shop=lighting: Tag:shop=lighting
      shop=locksmith: Tag:shop=locksmith
      shop=lottery: Tag:shop=lottery
      shop=mall: Tag:shop=mall
      shop=massage: Tag:shop=massage
      shop=locksmith: Tag:shop=locksmith
      shop=lottery: Tag:shop=lottery
      shop=mall: Tag:shop=mall
      shop=massage: Tag:shop=massage
+    shop=medical: Tag:shop=medical
      shop=medical_supply: Tag:shop=medical supply
      shop=military_surplus: Tag:shop=military surplus
      shop=mobile_phone: Tag:shop=mobile phone
      shop=money_lender: Tag:shop=money lender
      shop=medical_supply: Tag:shop=medical supply
      shop=military_surplus: Tag:shop=military surplus
      shop=mobile_phone: Tag:shop=mobile phone
      shop=money_lender: Tag:shop=money lender
+    shop=moneylender: Tag:shop=moneylender
      shop=motorcycle: Tag:shop=motorcycle
      shop=motorcycle_repair: Tag:shop=motorcycle repair
      shop=music: Tag:shop=music
      shop=musical_instrument: Tag:shop=musical instrument
      shop=motorcycle: Tag:shop=motorcycle
      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
      shop=organic: Tag:shop=organic
      shop=outdoor: Tag:shop=outdoor
      shop=paint: Tag:shop=paint
      shop=newsagent: Tag:shop=newsagent
      shop=office_supplies: Tag:shop=office supplies
      shop=optician: Tag:shop=optician
      shop=organic: Tag:shop=organic
      shop=outdoor: Tag:shop=outdoor
      shop=paint: Tag:shop=paint
+    shop=party: Tag:shop=party
      shop=pastry: Tag:shop=pastry
      shop=pawnbroker: Tag:shop=pawnbroker
      shop=pastry: Tag:shop=pastry
      shop=pawnbroker: Tag:shop=pawnbroker
+    shop=perfume: Tag:shop=perfume
      shop=perfumery: Tag:shop=perfumery
      shop=pet: Tag:shop=pet
      shop=perfumery: Tag:shop=perfumery
      shop=pet: Tag:shop=pet
+    shop=pharmacy: Tag:shop=pharmacy
      shop=photo: Tag:shop=photo
      shop=photo: Tag:shop=photo
+    shop=photo_studio: Tag:shop=photo studio
+    shop=photography: Tag:shop=photography
+    shop=pottery: Tag:shop=pottery
      shop=printing: Tag:shop=printing
      shop=printing: Tag:shop=printing
+    shop=pyrotechnics: Tag:shop=pyrotechnics
      shop=radiotechnics: Tag:shop=radiotechnics
      shop=radiotechnics: Tag:shop=radiotechnics
-    shop=salon: Tag:shop=salon
+    shop=religion: Tag:shop=religion
+    shop=rental: Tag:shop=rental
      shop=scuba_diving: Tag:shop=scuba diving
      shop=seafood: Tag:shop=seafood
      shop=second_hand: Tag:shop=second hand
      shop=scuba_diving: Tag:shop=scuba diving
      shop=seafood: Tag:shop=seafood
      shop=second_hand: Tag:shop=second hand
+    shop=sewing: Tag:shop=sewing
      shop=ship_chandler: Tag:shop=ship chandler
      shop=ship_chandler: Tag:shop=ship chandler
+    shop=shoe_repair: Tag:shop=shoe repair
      shop=shoes: Tag:shop=shoes
      shop=shopping_centre: Tag:shop=shopping centre
      shop=shoes: Tag:shop=shoes
      shop=shopping_centre: Tag:shop=shopping centre
+    shop=solarium: Tag:shop=solarium
+    shop=souvenir: Tag:shop=souvenir
      shop=spare_parts: Tag:shop=spare parts
      shop=sports: Tag:shop=sports
      shop=stationery: Tag:shop=stationery
      shop=spare_parts: Tag:shop=spare parts
      shop=sports: Tag:shop=sports
      shop=stationery: Tag:shop=stationery
+    shop=storage: Tag:shop=storage
+    shop=storage_rental: Tag:shop=storage rental
      shop=supermarket: Tag:shop=supermarket
      shop=systembolaget: Tag:shop=systembolaget
      shop=supermarket: Tag:shop=supermarket
      shop=systembolaget: Tag:shop=systembolaget
+    shop=tailor: Tag:shop=tailor
      shop=tattoo: Tag:shop=tattoo
      shop=tea: Tag:shop=tea
      shop=ticket: Tag:shop=ticket
      shop=tattoo: Tag:shop=tattoo
      shop=tea: Tag:shop=tea
      shop=ticket: Tag:shop=ticket
+    shop=tickets: Tag:shop=tickets
+    shop=tiles: Tag:shop=tiles
      shop=tobacco: Tag:shop=tobacco
      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
      shop=toys: Tag:shop=toys
      shop=trade: Tag:shop=trade
      shop=travel_agency: Tag:shop=travel agency
@@ -2667,10 +4194,14 @@ en:
      shop=variety_store: Tag:shop=variety store
      shop=video: Tag:shop=video
      shop=video_games: Tag:shop=video games
      shop=variety_store: Tag:shop=variety store
      shop=video: Tag:shop=video
      shop=video_games: Tag:shop=video games
+    shop=watches: Tag:shop=watches
+    shop=water: Tag:shop=water
+    shop=weapons: Tag:shop=weapons
      shop=window_blind: Tag:shop=window blind
      shop=windows: Tag:shop=windows
      shop=wine: Tag:shop=wine
      shop=winery: Tag:shop=winery
      shop=window_blind: Tag:shop=window blind
      shop=windows: Tag:shop=windows
      shop=wine: Tag:shop=wine
      shop=winery: Tag:shop=winery
+    shop=yes: Tag:shop=yes
      sign=no: Tag:sign=no
      sign=yes: Tag:sign=yes
      signal_station=bridge: Tag:signal station=bridge
      sign=no: Tag:sign=no
      sign=yes: Tag:sign=yes
      signal_station=bridge: Tag:signal station=bridge
@@ -2684,7 +4215,6 @@ en:
      signal_station=lock: Tag:signal station=lock
      signal_station=storm: Tag:signal station=storm
      signal_station=stream: Tag:signal station=stream
      signal_station=lock: Tag:signal station=lock
      signal_station=storm: Tag:signal station=storm
      signal_station=stream: Tag:signal station=stream
-    signal_station=telegraph: Tag:signal station=telegraph
      signal_station=tide: Tag:signal station=tide
      signal_station=tide_gauge: Tag:signal station=tide gauge
      signal_station=tide_scale: Tag:signal station=tide scale
      signal_station=tide: Tag:signal station=tide
      signal_station=tide_gauge: Tag:signal station=tide gauge
      signal_station=tide_scale: Tag:signal station=tide scale
@@ -2697,6 +4227,7 @@ en:
      social_facility=outreach: Tag:social facility=outreach
      social_facility=shelter: Tag:social facility=shelter
      source:ele=barometric: Tag:source:ele=barometric
      social_facility=outreach: Tag:social facility=outreach
      social_facility=shelter: Tag:social facility=shelter
      source:ele=barometric: Tag:source:ele=barometric
+    source:geometry=Bing: Tag:source:geometry=Bing
      source:maxspeed=implicit: Tag:source:maxspeed=implicit
      source=Bymiljøetaten: Tag:source=Bymiljøetaten
      source=DNT_Oslo_og_Omegn: Tag:source=DNT Oslo og Omegn
      source:maxspeed=implicit: Tag:source:maxspeed=implicit
      source=Bymiljøetaten: Tag:source=Bymiljøetaten
      source=DNT_Oslo_og_Omegn: Tag:source=DNT Oslo og Omegn
@@ -2707,23 +4238,31 @@ en:
      source=Isle_of_Man_Government_aerial_imagery_(2001): Tag:source=Isle of Man Government
        aerial imagery (2001)
      source=NAIP: Tag:source=NAIP
      source=Isle_of_Man_Government_aerial_imagery_(2001): Tag:source=Isle of Man Government
        aerial imagery (2001)
      source=NAIP: Tag:source=NAIP
+    source=RABA-KGZ: Tag:source=RABA-KGZ
+    source=gurs: Tag:source=gurs
      sport=10pin: Tag:sport=10pin
      sport=9pin: Tag:sport=9pin
      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=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=athletics: Tag:sport=athletics
      sport=australian_football: Tag:sport=australian football
      sport=badminton: Tag:sport=badminton
      sport=balle_pelote: Tag:sport=balle pelote
+    sport=bandy: Tag:sport=bandy
      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=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=bmx: Tag:sport=bmx
+    sport=bobsleigh: Tag:sport=bobsleigh
      sport=boules: Tag:sport=boules
      sport=bowls: Tag:sport=bowls
      sport=boules: Tag:sport=boules
      sport=bowls: Tag:sport=bowls
+    sport=boxing: Tag:sport=boxing
      sport=canadian_football: Tag:sport=canadian football
      sport=canoe: Tag:sport=canoe
      sport=chess: Tag:sport=chess
      sport=canadian_football: Tag:sport=canadian football
      sport=canoe: Tag:sport=canoe
      sport=chess: Tag:sport=chess
@@ -2734,21 +4273,32 @@ en:
      sport=cricket: Tag:sport=cricket
      sport=cricket_nets: Tag:sport=cricket nets
      sport=croquet: Tag:sport=croquet
      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
      sport=dog_racing: Tag:sport=dog racing
      sport=equestrian: Tag:sport=equestrian
      sport=cycling: Tag:sport=cycling
      sport=darts: Tag:sport=darts
      sport=diving: Tag:sport=diving
      sport=dog_racing: Tag:sport=dog racing
      sport=equestrian: Tag:sport=equestrian
+    sport=fencing: Tag:sport=fencing
+    sport=field_hockey: Tag:sport=field hockey
+    sport=fives: Tag:sport=fives
+    sport=football: Tag:sport=football
      sport=free_flying: Tag:sport=free flying
      sport=free_flying: Tag:sport=free flying
+    sport=futsal: Tag:sport=futsal
      sport=gaelic_football: Tag:sport=gaelic football
      sport=gaelic_games: Tag:sport=gaelic games
      sport=golf: Tag:sport=golf
      sport=gymnastics: Tag:sport=gymnastics
      sport=gaelic_football: Tag:sport=gaelic football
      sport=gaelic_games: Tag:sport=gaelic games
      sport=golf: Tag:sport=golf
      sport=gymnastics: Tag:sport=gymnastics
+    sport=handball: Tag:sport=handball
      sport=hapkido: Tag:sport=hapkido
      sport=hockey: Tag:sport=hockey
      sport=horse_racing: Tag:sport=horse racing
      sport=horseshoes: Tag:sport=horseshoes
      sport=hapkido: Tag:sport=hapkido
      sport=hockey: Tag:sport=hockey
      sport=horse_racing: Tag:sport=horse racing
      sport=horseshoes: Tag:sport=horseshoes
+    sport=ice_hockey: Tag:sport=ice hockey
+    sport=ice_skating: Tag:sport=ice skating
      sport=ice_stock: Tag:sport=ice stock
      sport=ice_stock: Tag:sport=ice stock
+    sport=judo: Tag:sport=judo
+    sport=karting: Tag:sport=karting
      sport=kitesurfing: Tag:sport=kitesurfing
      sport=korfball: Tag:sport=korfball
      sport=model_aerodrome: Tag:sport=model aerodrome
      sport=kitesurfing: Tag:sport=kitesurfing
      sport=korfball: Tag:sport=korfball
      sport=model_aerodrome: Tag:sport=model aerodrome
@@ -2757,15 +4307,20 @@ en:
      sport=obstacle_course: Tag:sport=obstacle course
      sport=orienteering: Tag:sport=orienteering
      sport=paddle_tennis: Tag:sport=paddle tennis
      sport=obstacle_course: Tag:sport=obstacle course
      sport=orienteering: Tag:sport=orienteering
      sport=paddle_tennis: Tag:sport=paddle tennis
+    sport=parachuting: Tag:sport=parachuting
      sport=paragliding: Tag:sport=paragliding
      sport=pelota: Tag:sport=pelota
      sport=racquet: Tag:sport=racquet
      sport=paragliding: Tag:sport=paragliding
      sport=pelota: Tag:sport=pelota
      sport=racquet: Tag:sport=racquet
+    sport=roller_skating: Tag:sport=roller skating
      sport=rowing: Tag:sport=rowing
      sport=rugby: Tag:sport=rugby
      sport=rugby_league: Tag:sport=rugby league
      sport=rugby_union: Tag:sport=rugby union
      sport=rowing: Tag:sport=rowing
      sport=rugby: Tag:sport=rugby
      sport=rugby_league: Tag:sport=rugby league
      sport=rugby_union: Tag:sport=rugby union
+    sport=running: Tag:sport=running
+    sport=sailing: Tag:sport=sailing
      sport=scuba_diving: Tag:sport=scuba diving
      sport=shooting: Tag:sport=shooting
      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
      sport=skateboard: Tag:sport=skateboard
      sport=skating: Tag:sport=skating
      sport=skiing: Tag:sport=skiing
@@ -2779,10 +4334,22 @@ en:
      sport=toboggan: Tag:sport=toboggan
      sport=volleyball: Tag:sport=volleyball
      sport=water_ski: Tag:sport=water ski
      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
+    station=subway: Tag:station=subway
      sub_sea=reef: Tag:sub sea=reef
      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
      telecom=cross-connect: Tag:telecom=cross-connect
      summit:cross=yes: Tag:summit:cross=yes
      surface=pebbles: Tag:surface=pebbles
      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
      telecom=remote_terminal: Tag:telecom=remote terminal
      tourism=alpine_hut: Tag:tourism=alpine hut
      tourism=apartment: Tag:tourism=apartment
@@ -2801,18 +4368,40 @@ en:
      tourism=motel: Tag:tourism=motel
      tourism=museum: Tag:tourism=museum
      tourism=picnic_site: Tag:tourism=picnic site
      tourism=motel: Tag:tourism=motel
      tourism=museum: Tag:tourism=museum
      tourism=picnic_site: Tag:tourism=picnic site
+    tourism=resort: Tag:tourism=resort
      tourism=theme_park: Tag:tourism=theme park
      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=viewpoint: Tag:tourism=viewpoint
      tourism=wilderness_hut: Tag:tourism=wilderness hut
+    tourism=wine_cellar: Tag:tourism=wine cellar
      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
      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=cooling: Tag:tower:type=cooling
+    tower:type=donjon: Tag:tower:type=donjon
      tower:type=lattice: Tag:tower:type=lattice
      tower:type=lattice: Tag:tower:type=lattice
+    tower:type=lighting: Tag:tower:type=lighting
+    traffic=local: Tag:traffic=local
+    traffic=national: Tag:traffic=national
+    traffic=regional: Tag:traffic=regional
+    traffic=suburban: Tag:traffic=suburban
+    traffic=urban: Tag:traffic=urban
      traffic_calming=island: Tag:traffic calming=island
      traffic_calming=island: Tag:traffic calming=island
+    traffic_calming=table: Tag:traffic calming=table
+    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
      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=autopass: Tag:type=autopass
      type=benchmark: Tag:type=benchmark
      type=fixed_point: Tag:type=fixed point
@@ -2820,12 +4409,53 @@ en:
      type=public_transport: Tag:type=public transport
      type=street: Tag:type=street
      type=triangulation: Tag:type=triangulation
      type=public_transport: Tag:type=public transport
      type=street: Tag:type=street
      type=triangulation: Tag:type=triangulation
+    vending=SIM-cards: Tag:vending=SIM-cards
+    vending=SIM_cards: Tag:vending=SIM cards
+    vending=admission_tickets: Tag:vending=admission tickets
+    vending=animal_feed: Tag:vending=animal feed
      vending=bicycle_tube: Tag:vending=bicycle tube
      vending=bicycle_tube: Tag:vending=bicycle tube
+    vending=books: Tag:vending=books
+    vending=bycicle_tube: Tag:vending=bycicle tube
+    vending=candles: Tag:vending=candles
+    vending=chemist: Tag:vending=chemist
+    vending=cigarettes: Tag:vending=cigarettes
+    vending=condoms: Tag:vending=condoms
+    vending=drinks: Tag:vending=drinks
+    vending=electronics: Tag:vending=electronics
+    vending=elongated_coin: Tag:vending=elongated coin
+    vending=excrement_bags: Tag:vending=excrement bags
+    vending=feminine_hygiene: Tag:vending=feminine hygiene
+    vending=first_aid: Tag:vending=first aid
+    vending=fishing_bait: Tag:vending=fishing bait
+    vending=fishing_tackle: Tag:vending=fishing tackle
+    vending=flowers: Tag:vending=flowers
+    vending=food: Tag:vending=food
+    vending=ice_cream: Tag:vending=ice cream
+    vending=ice_cubes: Tag:vending=ice cubes
+    vending=ink_cartridges: Tag:vending=ink cartridges
+    vending=laundry_detergent: Tag:vending=laundry detergent
+    vending=news_papers: Tag:vending=news papers
+    vending=newspapers: Tag:vending=newspapers
+    vending=parcel_mail_in: Tag:vending=parcel mail in
+    vending=parcel_pickup: Tag:vending=parcel pickup
+    vending=parcel_pickup;parcel_mail_in: Tag:vending=parcel pickup;parcel mail in
+    vending=parking_tickets: Tag:vending=parking tickets
+    vending=pet_food: Tag:vending=pet food
+    vending=public_transport_tickets: Tag:vending=public transport tickets
+    vending=sex_toys: Tag:vending=sex toys
+    vending=stamps: Tag:vending=stamps
+    vending=sweets: Tag:vending=sweets
+    vending=syringes: Tag:vending=syringes
+    vending=toll: Tag:vending=toll
+    vending=toys: Tag:vending=toys
+    vending=umbrellas: Tag:vending=umbrellas
+    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
      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
      water=tidal: Tag:water=tidal
      waterway=boat_lift: Tag:waterway=boat lift
      waterway=boatyard: Tag:waterway=boatyard
@@ -2838,6 +4468,8 @@ en:
      waterway=dock: Tag:waterway=dock
      waterway=drain: Tag:waterway=drain
      waterway=dredged_area: Tag:waterway=dredged area
      waterway=dock: Tag:waterway=dock
      waterway=drain: Tag:waterway=drain
      waterway=dredged_area: Tag:waterway=dredged area
+    waterway=drystream: Tag:waterway=drystream
+    waterway=estuary: Tag:waterway=estuary
      waterway=fish_pass: Tag:waterway=fish pass
      waterway=lock_gate: Tag:waterway=lock gate
      waterway=milestone: Tag:waterway=milestone
      waterway=fish_pass: Tag:waterway=fish pass
      waterway=lock_gate: Tag:waterway=lock gate
      waterway=milestone: Tag:waterway=milestone
@@ -2853,6 +4485,7 @@ en:
      waterway=water_point: Tag:waterway=water point
      waterway=waterfall: Tag:waterway=waterfall
      waterway=weir: Tag:waterway=weir
      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=broad_leaved: Tag:wood=broad leaved
      wood=casuarina: Tag:wood=casuarina
      wood=coniferous: Tag:wood=coniferous
@@ -2869,23 +4502,32 @@ es:
      addr: ES:Key:addr
      amenity: ES:Key:amenity
      brand: ES:Key:brand
      addr: ES:Key:addr
      amenity: ES:Key:amenity
      brand: ES:Key:brand
+    building: ES:Key:building
+    camino: ES:Key:camino
      cycleway: ES:Key:cycleway
      end_date: ES:Key:end date
      cycleway: ES:Key:cycleway
      end_date: ES:Key:end date
+    geological: ES:Key:geological
      highway: ES:Key:highway
      is_in: ES:Key:is in
      maxspeed: ES:Key:maxspeed
      highway: ES:Key:highway
      is_in: ES:Key:is in
      maxspeed: ES:Key:maxspeed
+    motorroad: ES:Key:motorroad
      name: ES:Key:name
      name: ES:Key:name
+    natural: ES:Key:natural
      noexit: ES:Key:noexit
      opening_hours: ES:Key:opening hours
      operator: ES:Key:operator
      organic: ES:Key:organic
      origin: ES:Key:origin
      noexit: ES:Key:noexit
      opening_hours: ES:Key:opening hours
      operator: ES:Key:operator
      organic: ES:Key:organic
      origin: ES:Key:origin
+    parking:lane: ES:Key:parking:lane
      payment: ES:Key:payment
      phone: ES:Key:phone
      payment: ES:Key:payment
      phone: ES:Key:phone
+    place: ES:Key:place
      proposed: ES:Key:proposed
      shop: ES:Key:shop
      proposed: ES:Key:proposed
      shop: ES:Key:shop
+    source: ES:Key:source
      stars: ES:Key:stars
      traffic_calming: ES:Key:traffic calming
      stars: ES:Key:stars
      traffic_calming: ES:Key:traffic calming
+    turn: ES:Key:turn
      website: ES:Key:website
      wheelchair: ES:Key:wheelchair
      wholesale: ES:Key:wholesale
      website: ES:Key:website
      wheelchair: ES:Key:wheelchair
      wholesale: ES:Key:wholesale
@@ -2901,12 +4543,17 @@ es:
      amenity=ice_cream: ES:Tag:amenity=ice cream
      amenity=love_hotel: ES:Tag:amenity=love hotel
      amenity=nightclub: ES:Tag:amenity=nightclub
      amenity=ice_cream: ES:Tag:amenity=ice cream
      amenity=love_hotel: ES:Tag:amenity=love hotel
      amenity=nightclub: ES:Tag:amenity=nightclub
+    amenity=parking: ES:Tag:amenity=parking
      amenity=payment_terminal: ES:Tag:amenity=payment terminal
      amenity=payment_terminal: ES:Tag:amenity=payment terminal
+    amenity=public_building: ES:Tag:amenity=public building
      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
      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
+    amenity=waste_disposal: ES:Tag:amenity=waste disposal
+    building=public: ES:Tag:building=public
+    emergency=defibrillator: ES:Tag:emergency=defibrillator
      emergency=fire_extinguisher: ES:Tag:emergency=fire extinguisher
      highway=bus_stop: ES:Tag:highway=bus stop
      highway=byway: ES:Tag:highway=byway
      emergency=fire_extinguisher: ES:Tag:emergency=fire extinguisher
      highway=bus_stop: ES:Tag:highway=bus stop
      highway=byway: ES:Tag:highway=byway
@@ -2921,14 +4568,23 @@ es:
      junction=roundabout: ES:Tag:junction=roundabout
      landuse=allotments: ES:Tag:landuse=allotments
      landuse=industrial: ES:Tag:landuse=industrial
      junction=roundabout: ES:Tag:junction=roundabout
      landuse=allotments: ES:Tag:landuse=allotments
      landuse=industrial: ES:Tag:landuse=industrial
+    leisure=nature_reserve: ES:Tag:leisure=nature reserve
      leisure=playground: ES:Tag:leisure=playground
      leisure=water_park: ES:Tag:leisure=water park
      man_made=pier: ES:Tag:man made=pier
      leisure=playground: ES:Tag:leisure=playground
      leisure=water_park: ES:Tag:leisure=water park
      man_made=pier: ES:Tag:man made=pier
+    natural=arete: ES:Tag:natural=arete
      natural=beach: ES:Tag:natural=beach
      natural=beach: ES:Tag:natural=beach
+    natural=cave_entrance: ES:Tag:natural=cave entrance
      natural=glacier: ES:Tag:natural=glacier
      natural=glacier: ES:Tag:natural=glacier
+    natural=moor: ES:Tag:natural=moor
+    natural=mud: ES:Tag:natural=mud
+    natural=rock: ES:Tag:natural=rock
      natural=saddle: ES:Tag:natural=saddle
      natural=saddle: ES:Tag:natural=saddle
+    natural=sand: ES:Tag:natural=sand
+    natural=sinkhole: ES:Tag:natural=sinkhole
      natural=tree: ES:Tag:natural=tree
      natural=water: ES:Tag:natural=water
      natural=tree: ES:Tag:natural=tree
      natural=water: ES:Tag:natural=water
+    place=village: ES:Tag:place=village
      power=pole: ES:Tag:power=pole
      power=tower: ES:Tag:power=tower
      public_transport=platform: ES:Tag:public transport=platform
      power=pole: ES:Tag:power=pole
      power=tower: ES:Tag:power=tower
      public_transport=platform: ES:Tag:public transport=platform
@@ -2958,8 +4614,10 @@ es:
  et:
    key:
      addr: Et:Key:addr
  et:
    key:
      addr: Et:Key:addr
+    amenity: Et:Key:amenity
      backrest: Et:Key:backrest
      highway: Et:Key:highway
      backrest: Et:Key:backrest
      highway: Et:Key:highway
+    man_made: Et:Key:man made
    tag:
      amenity=bench: Et:Tag:amenity=bench
      amenity=cafe: Et:Tag:amenity=cafe
    tag:
      amenity=bench: Et:Tag:amenity=bench
      amenity=cafe: Et:Tag:amenity=cafe
@@ -2990,6 +4648,7 @@ fi:
      note: Fi:Key:note
      operator: Fi:Key:operator
      parking:lane: Fi:Key:parking:lane
      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
      priority_road: Fi:Key:priority road
      pyörä_väistää_aina_autoa: Fi:Key:pyörä väistää aina autoa
      shop: Fi:Key:shop
@@ -3069,11 +4728,16 @@ fr:
      abutters: FR:Key:abutters
      access: FR:Key:access
      addr: FR:Key:addr
      abutters: FR:Key:abutters
      access: FR:Key:access
      addr: FR:Key:addr
+    addr:floor: FR:Key:addr:floor
+    addr:housenumber: FR:Key:addr:housenumber
      addr:place: FR:Key:addr:place
      addr:place: FR:Key:addr:place
+    addr:street: FR:Key:addr:street
      advertising: FR:Key:advertising
      aeroway: FR:Key:aeroway
      advertising: FR:Key:advertising
      aeroway: FR:Key:aeroway
+    alt_name: FR:Key:alt name
      amenity: FR:Key:amenity
      area: FR:Key:area
      amenity: FR:Key:amenity
      area: FR:Key:area
+    backward: FR:Key:backward
      barrier: FR:Key:barrier
      basin: FR:Key:basin
      bench: FR:Key:bench
      barrier: FR:Key:barrier
      basin: FR:Key:basin
      bench: FR:Key:bench
@@ -3084,22 +4748,33 @@ fr:
      books: FR:Key:books
      boundary: FR:Key:boundary
      bridge: FR:Key:bridge
      books: FR:Key:books
      boundary: FR:Key:boundary
      bridge: FR:Key:bridge
+    bridge:movable: FR:Key:bridge:movable
      building: FR:Key:building
      building:levels: FR:Key:building:levels
      building:part: FR:Key:building:part
      building: FR:Key:building
      building:levels: FR:Key:building:levels
      building:part: FR:Key:building:part
+    bus: FR:Key:bus
      capacity: FR:Key:capacity
      capacity: FR:Key:capacity
+    capacity:disabled: FR:Key:capacity:disabled
      clothes: FR:Key:clothes
      collection_times: FR:Key:collection times
      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
      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
      crossing: FR:Key:crossing
      cutting: FR:Key:cutting
      cycleway: FR:Key:cycleway
      covered: FR:Key:covered
      craft: FR:Key:craft
      crop: FR:Key:crop
      crossing: FR:Key:crossing
      cutting: FR:Key:cutting
      cycleway: FR:Key:cycleway
+    delivery: FR:Key:delivery
      denomination: FR:Key:denomination
      description: FR:Key:description
      designation: FR:Key:designation
      denomination: FR:Key:denomination
      description: FR:Key:description
      designation: FR:Key:designation
@@ -3107,6 +4782,7 @@ fr:
      diet:*: FR:Key:diet:*
      dispensing: FR:Key:dispensing
      distance: FR:Key:distance
      diet:*: FR:Key:diet:*
      dispensing: FR:Key:dispensing
      distance: FR:Key:distance
+    door: FR:Key:door
      drink: FR:Key:drink
      ele: FR:Key:ele
      email: FR:Key:email
      drink: FR:Key:drink
      ele: FR:Key:ele
      email: FR:Key:email
@@ -3114,12 +4790,16 @@ fr:
      emergency: FR:Key:emergency
      enforcement: FR:Key:enforcement
      entrance: FR:Key:entrance
      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
      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
+    format: FR:Key:format
+    forward: FR:Key:forward
      generator:method: FR:Key:generator:method
      generator:output: FR:Key:generator:output
      generator:output:electricity: FR:Key:generator:output:electricity
      generator:method: FR:Key:generator:method
      generator:output: FR:Key:generator:output
      generator:output:electricity: FR:Key:generator:output:electricity
@@ -3127,24 +4807,33 @@ fr:
      generator:output:hot_water: FR:Key:generator:output:hot water
      generator:output:steam: FR:Key:generator:output:steam
      generator:source: FR:Key:generator:source
      generator:output:hot_water: FR:Key:generator:output:hot water
      generator:output:steam: FR:Key:generator:output:steam
      generator:source: FR:Key:generator:source
+    geological: FR:Key:geological
      height: FR:Key:height
      highway: FR:Key:highway
      historic: FR:Key:historic
      height: FR:Key:height
      highway: FR:Key:highway
      historic: FR:Key:historic
+    hov: FR:Key:hov
      incline: FR:Key:incline
      information: FR:Key:information
      incline: FR:Key:incline
      information: FR:Key:information
+    inscription: FR:Key:inscription
+    int_name: FR:Key:int name
      intermittent: FR:Key:intermittent
      junction: FR:Key:junction
      landuse: FR:Key:landuse
      lanes: FR:Key:lanes
      intermittent: FR:Key:intermittent
      junction: FR:Key:junction
      landuse: FR:Key:landuse
      lanes: FR:Key:lanes
+    layer: FR:Key:layer
+    leaf_type: FR:Key:leaf type
+    left: FR:Key:left
      leisure: FR:Key:leisure
      length: FR:Key:length
      level: FR:Key:level
      lit: FR:Key:lit
      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
      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
+    max_age: FR:Key:max age
      maxage: FR:Key:maxage
      maxaxleload: FR:Key:maxaxleload
      maxheight: FR:Key:maxheight
      maxage: FR:Key:maxage
      maxaxleload: FR:Key:maxaxleload
      maxheight: FR:Key:maxheight
@@ -3154,22 +4843,30 @@ fr:
      maxstay: FR:Key:maxstay
      maxweight: FR:Key:maxweight
      maxwidth: FR:Key:maxwidth
      maxstay: FR:Key:maxstay
      maxweight: FR:Key:maxweight
      maxwidth: FR:Key:maxwidth
+    memorial: FR:Key:memorial
      military: FR:Key:military
      military: FR:Key:military
+    min_age: FR:Key:min age
      minage: FR:Key:minage
      minage: FR:Key:minage
+    mooring: FR:Key:mooring
      motorboat: FR:Key:motorboat
      mountain_pass: FR:Key:mountain pass
      mtb:scale: FR:Key:mtb:scale
      name: FR:Key:name
      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
      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: 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
      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
      parking:lane: FR:Key:parking:lane
      paved:date: FR:Key:paved:date
      phone: FR:Key:phone
@@ -3183,6 +4880,7 @@ fr:
      priority_road: FR:Key:priority road
      proposed: FR:Key:proposed
      psv: FR:Key:psv
      priority_road: FR:Key:priority road
      proposed: FR:Key:proposed
      psv: FR:Key:psv
+    public_bookcase:type: FR:Key:public bookcase:type
      public_transport: FR:Key:public transport
      pump: FR:Key:pump
      railway: FR:Key:railway
      public_transport: FR:Key:public transport
      pump: FR:Key:pump
      railway: FR:Key:railway
@@ -3192,23 +4890,33 @@ fr:
      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:42C: FR:Key:ref:FR:42C
      ref:FR:FANTOIR: FR:Key:ref:FR:FANTOIR
      ref:FR:FINESS: FR:Key:ref:FR:FINESS
+    ref:FR:MemorialGenWeb: FR:Key:ref:FR:MemorialGenWeb
+    ref:FR:NAF: FR:Key:ref:FR:NAF
+    ref:FR:SIREN: FR:Key:ref:FR:SIREN
      ref:FR:SIRET: FR:Key:ref:FR:SIRET
      ref:FR:SIRET: FR:Key:ref:FR:SIRET
+    ref:FR:commune: FR:Key:ref:FR:commune
      ref:INSEE: FR:Key:ref:INSEE
      ref:UAI: FR:Key:ref:UAI
      ref:mhs: FR:Key:ref:mhs
      ref:sandre: FR:Key:ref:sandre
      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
      religion: FR:Key:religion
+    repeat_on: FR:Key:repeat on
      resource: FR:Key:resource
      resource: FR:Key:resource
+    right: FR:Key:right
      sac_scale: FR:Key:sac scale
      sac_scale: FR:Key:sac scale
+    seamark:fixme: FR:Key:seamark:fixme
      second_hand: FR:Key:second hand
      segregated: FR:Key:segregated
      service: FR:Key:service
      shelter_type: FR:Key:shelter type
      shop: FR:Key:shop
      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
      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
      sport: FR:Key:sport
      surface: FR:Key:surface
      surveillance: FR:Key:surveillance
@@ -3221,10 +4929,13 @@ fr:
      traffic_calming: FR:Key:traffic calming
      traffic_sign: FR:Key:traffic sign
      trail_visibility: FR:Key:trail visibility
      traffic_calming: FR:Key:traffic calming
      traffic_sign: FR:Key:traffic sign
      trail_visibility: FR:Key:trail visibility
+    trees: FR:Key:trees
      tunnel: FR:Key:tunnel
      turn: FR:Key:turn
      tunnel: FR:Key:tunnel
      turn: FR:Key:turn
+    turn:lanes: FR:Key:turn:lanes
      turning_radius: FR:Key:turning radius
      type: FR:Key:type
      turning_radius: FR:Key:turning radius
      type: FR:Key:type
+    type:FR:FINESS: FR:Key:type:FR:FINESS
      url: FR:Key:url
      voltage: FR:Key:voltage
      waste: FR:Key:waste
      url: FR:Key:url
      voltage: FR:Key:voltage
      waste: FR:Key:waste
@@ -3233,6 +4944,7 @@ fr:
      website: FR:Key:website
      wheelchair: FR:Key:wheelchair
      width: FR:Key:width
      website: FR:Key:website
      wheelchair: FR:Key:wheelchair
      width: FR:Key:width
+    wikidata: FR:Key:wikidata
      wikipedia: FR:Key:wikipedia
    tag:
      FIXME=Position_estimated: FR:Tag:FIXME=Position estimated
      wikipedia: FR:Key:wikipedia
    tag:
      FIXME=Position_estimated: FR:Tag:FIXME=Position estimated
@@ -3253,12 +4965,14 @@ fr:
      amenity=car_rental: FR:Tag:amenity=car rental
      amenity=car_sharing: FR:Tag:amenity=car sharing
      amenity=college: FR:Tag:amenity=college
      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
      amenity=crematorium: FR:Tag:amenity=crematorium
      amenity=crypt: FR:Tag:amenity=crypt
      amenity=drinking_water: FR:Tag:amenity=drinking water
      amenity=community_centre: FR:Tag:amenity=community centre
      amenity=compressed_air: FR:Tag:amenity=compressed air
      amenity=coworking_space: FR:Tag:amenity=coworking space
      amenity=crematorium: FR:Tag:amenity=crematorium
      amenity=crypt: FR:Tag:amenity=crypt
      amenity=drinking_water: FR:Tag:amenity=drinking water
+    amenity=embassy: FR:Tag:amenity=embassy
      amenity=fire_station: FR:Tag:amenity=fire station
      amenity=fountain: FR:Tag:amenity=fountain
      amenity=fuel: FR:Tag:amenity=fuel
      amenity=fire_station: FR:Tag:amenity=fire station
      amenity=fountain: FR:Tag:amenity=fountain
      amenity=fuel: FR:Tag:amenity=fuel
@@ -3273,7 +4987,10 @@ fr:
      amenity=pharmacy: FR:Tag:amenity=pharmacy
      amenity=photo_booth: FR:Tag:amenity=photo booth
      amenity=place_of_worship: FR:Tag:amenity=place of worship
      amenity=pharmacy: FR:Tag:amenity=pharmacy
      amenity=photo_booth: FR:Tag:amenity=photo booth
      amenity=place_of_worship: FR:Tag:amenity=place of worship
+    amenity=planetarium: FR:Tag:amenity=planetarium
      amenity=police: FR:Tag:amenity=police
      amenity=police: FR:Tag:amenity=police
+    amenity=post_office: FR:Tag:amenity=post office
+    amenity=public_bookcase: FR:Tag:amenity=public bookcase
      amenity=recycling: FR:Tag:amenity=recycling
      amenity=restaurant: FR:Tag:amenity=restaurant
      amenity=school: FR:Tag:amenity=school
      amenity=recycling: FR:Tag:amenity=recycling
      amenity=restaurant: FR:Tag:amenity=restaurant
      amenity=school: FR:Tag:amenity=school
@@ -3289,18 +5006,26 @@ fr:
      amenity=waste_basket: FR:Tag:amenity=waste basket
      amenity=waste_disposal: FR:Tag:amenity=waste disposal
      barrier=bollard: FR:Tag:barrier=bollard
      amenity=waste_basket: FR:Tag:amenity=waste basket
      amenity=waste_disposal: FR:Tag:amenity=waste disposal
      barrier=bollard: FR:Tag:barrier=bollard
+    barrier=city_wall: FR:Tag:barrier=city wall
      barrier=cycle_barrier: FR:Tag:barrier=cycle barrier
      barrier=gate: FR:Tag:barrier=gate
      barrier=hedge: FR:Tag:barrier=hedge
      barrier=retaining_wall: FR:Tag:barrier=retaining wall
      barrier=wall: FR:Tag:barrier=wall
      barrier=cycle_barrier: FR:Tag:barrier=cycle barrier
      barrier=gate: FR:Tag:barrier=gate
      barrier=hedge: FR:Tag:barrier=hedge
      barrier=retaining_wall: FR:Tag:barrier=retaining wall
      barrier=wall: FR:Tag:barrier=wall
+    building=garage: FR:Tag:building=garage
+    building=garages: FR:Tag:building=garages
+    building=hangar: FR:Tag:building=hangar
      building=house: FR:Tag:building=house
      building=house: FR:Tag:building=house
+    building=public: FR:Tag:building=public
      building=roof: FR:Tag:building=roof
      building=roof: FR:Tag:building=roof
+    building=ruins: FR:Tag:building=ruins
+    building=sty: FR:Tag:building=sty
      craft=beekeeper: FR:Tag:craft=beekeeper
      craft=car_repair: FR:Tag:craft=car repair
      cycleway=asl: FR:Tag:cycleway=asl
      cycleway=bike_box: FR:Tag:cycleway=bike box
      disused=yes: FR:Tag:disused=yes
      craft=beekeeper: FR:Tag:craft=beekeeper
      craft=car_repair: FR:Tag:craft=car repair
      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
      emergency=defibrillator: FR:Tag:emergency=defibrillator
      emergency=fire_hydrant: FR:Tag:emergency=fire hydrant
      emergency=phone: FR:Tag:emergency=phone
@@ -3328,9 +5053,11 @@ fr:
      highway=cycleway: FR:Tag:highway=cycleway
      highway=elevator: FR:Tag:highway=elevator
      highway=emergency_access_point: FR:Tag:highway=emergency access point
      highway=cycleway: FR:Tag:highway=cycleway
      highway=elevator: FR:Tag:highway=elevator
      highway=emergency_access_point: FR:Tag:highway=emergency access point
+    highway=escape: FR:Tag:highway=escape
      highway=footway: FR:Tag:highway=footway
      highway=give_way: FR:Tag:highway=give way
      highway=living_street: FR:Tag:highway=living street
      highway=footway: FR:Tag:highway=footway
      highway=give_way: FR:Tag:highway=give way
      highway=living_street: FR:Tag:highway=living street
+    highway=milestone: FR:Tag:highway=milestone
      highway=mini_roundabout: FR:Tag:highway=mini roundabout
      highway=motorway: FR:Tag:highway=motorway
      highway=motorway_link: FR:Tag:highway=motorway link
      highway=mini_roundabout: FR:Tag:highway=mini roundabout
      highway=motorway: FR:Tag:highway=motorway
      highway=motorway_link: FR:Tag:highway=motorway link
@@ -3348,11 +5075,34 @@ fr:
      highway=stop: FR:Tag:highway=stop
      highway=tertiary: FR:Tag:highway=tertiary
      highway=track: FR:Tag:highway=track
      highway=stop: FR:Tag:highway=stop
      highway=tertiary: FR:Tag:highway=tertiary
      highway=track: FR:Tag:highway=track
+    highway=traffic_signals: FR:Tag:highway=traffic signals
      highway=trunk: FR:Tag:highway=trunk
      highway=turning_circle: FR:Tag:highway=turning circle
      highway=unclassified: FR:Tag:highway=unclassified
      highway=trunk: FR:Tag:highway=trunk
      highway=turning_circle: FR:Tag:highway=turning circle
      highway=unclassified: FR:Tag:highway=unclassified
+    historic=aircraft: FR:Tag:historic=aircraft
      historic=battlefield: FR:Tag:historic=battlefield
      historic=battlefield: FR:Tag:historic=battlefield
+    historic=boundary_stone: FR:Tag:historic=boundary stone
+    historic=cannon: FR:Tag:historic=cannon
+    historic=castle: FR:Tag:historic=castle
+    historic=city_gate: FR:Tag:historic=city gate
+    historic=citywalls: FR:Tag:historic=citywalls
+    historic=farm: FR:Tag:historic=farm
+    historic=fort: FR:Tag:historic=fort
+    historic=gallows: FR:Tag:historic=gallows
      historic=memorial: FR:Tag:historic=memorial
      historic=memorial: FR:Tag:historic=memorial
+    historic=milestone: FR:Tag:historic=milestone
+    historic=monument: FR:Tag:historic=monument
+    historic=optical_telegraph: FR:Tag:historic=optical telegraph
+    historic=pa: FR:Tag:historic=pa
+    historic=pillory: FR:Tag:historic=pillory
+    historic=ruins: FR:Tag:historic=ruins
+    historic=rune_stone: FR:Tag:historic=rune stone
+    historic=ship: FR:Tag:historic=ship
+    historic=tomb: FR:Tag:historic=tomb
+    historic=tree_shrine: FR:Tag:historic=tree shrine
+    historic=wayside_cross: FR:Tag:historic=wayside cross
+    historic=wayside_shrine: FR:Tag:historic=wayside shrine
+    historic=wreck: FR:Tag:historic=wreck
      junction=roundabout: FR:Tag:junction=roundabout
      landuse=allotments: FR:Tag:landuse=allotments
      landuse=basin: FR:Tag:landuse=basin
      junction=roundabout: FR:Tag:junction=roundabout
      landuse=allotments: FR:Tag:landuse=allotments
      landuse=basin: FR:Tag:landuse=basin
@@ -3384,11 +5134,19 @@ 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=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_tower: FR:Tag:man made=water tower
+    man_made=water_well: FR:Tag:man made=water well
      man_made=water_works: FR:Tag:man made=water works
      man_made=watermill: FR:Tag:man made=watermill
      man_made=windmill: FR:Tag:man made=windmill
      man_made=windpump: FR:Tag:man made=windpump
      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
+    military=bunker: FR:Tag:military=bunker
+    natural=bare_rock: FR:Tag:natural=bare rock
      natural=cliff: FR:Tag:natural=cliff
      natural=cliff: FR:Tag:natural=cliff
+    natural=coastline: FR:Tag:natural=coastline
+    natural=glacier: FR:Tag:natural=glacier
+    natural=scree: FR:Tag:natural=scree
      natural=spring: FR:Tag:natural=spring
      natural=stone: FR:Tag:natural=stone
      natural=tree: FR:Tag:natural=tree
      natural=spring: FR:Tag:natural=spring
      natural=stone: FR:Tag:natural=stone
      natural=tree: FR:Tag:natural=tree
@@ -3397,12 +5155,14 @@ fr:
      natural=wetland: FR:Tag:natural=wetland
      office=employment_agency: FR:Tag:office=employment agency
      office=estate_agent: FR:Tag:office=estate agent
      natural=wetland: FR:Tag:natural=wetland
      office=employment_agency: FR:Tag:office=employment agency
      office=estate_agent: FR:Tag:office=estate agent
+    office=lawyer: FR:Tag:office=lawyer
      office=ngo: FR:Tag:office=ngo
      place=city: FR:Tag:place=city
      place=hamlet: FR:Tag:place=hamlet
      place=isolated_dwelling: FR:Tag:place=isolated dwelling
      place=locality: FR:Tag:place=locality
      place=neighbourhood: FR:Tag:place=neighbourhood
      office=ngo: FR:Tag:office=ngo
      place=city: FR:Tag:place=city
      place=hamlet: FR:Tag:place=hamlet
      place=isolated_dwelling: FR:Tag:place=isolated dwelling
      place=locality: FR:Tag:place=locality
      place=neighbourhood: FR:Tag:place=neighbourhood
+    place=suburb: FR:Tag:place=suburb
      place=town: FR:Tag:place=town
      place=village: FR:Tag:place=village
      power=generator: FR:Tag:power=generator
      place=town: FR:Tag:place=town
      place=village: FR:Tag:place=village
      power=generator: FR:Tag:power=generator
@@ -3418,9 +5178,12 @@ fr:
      public_transport=station: FR:Tag:public transport=station
      pump=powered: FR:Tag:pump=powered
      railway=level_crossing: FR:Tag:railway=level crossing
      public_transport=station: FR:Tag:public transport=station
      pump=powered: FR:Tag:pump=powered
      railway=level_crossing: FR:Tag:railway=level crossing
+    railway=preserved: FR:Tag:railway=preserved
      railway=rail: FR:Tag:railway=rail
      railway=station: FR:Tag:railway=station
      railway=rail: FR:Tag:railway=rail
      railway=station: FR:Tag:railway=station
+    railway=subway: FR:Tag:railway=subway
      railway=subway_entrance: FR:Tag:railway=subway entrance
      railway=subway_entrance: FR:Tag:railway=subway entrance
+    railway=tram: FR:Tag:railway=tram
      route=piste: FR:Tag:route=piste
      service=alley: FR:Tag:service=alley
      service=parking_aisle: FR:Tag:service=parking aisle
      route=piste: FR:Tag:route=piste
      service=alley: FR:Tag:service=alley
      service=parking_aisle: FR:Tag:service=parking aisle
@@ -3441,6 +5204,7 @@ fr:
      shop=car_repair: FR:Tag:shop=car repair
      shop=carpet: FR:Tag:shop=carpet
      shop=charity: FR:Tag:shop=charity
      shop=car_repair: FR:Tag:shop=car repair
      shop=carpet: FR:Tag:shop=carpet
      shop=charity: FR:Tag:shop=charity
+    shop=cheese: FR:Tag:shop=cheese
      shop=clothes: FR:Tag:shop=clothes
      shop=confectionery: FR:Tag:shop=confectionery
      shop=convenience: FR:Tag:shop=convenience
      shop=clothes: FR:Tag:shop=clothes
      shop=confectionery: FR:Tag:shop=confectionery
      shop=convenience: FR:Tag:shop=convenience
@@ -3450,15 +5214,18 @@ fr:
      shop=doityourself: FR:Tag:shop=doityourself
      shop=farm: FR:Tag:shop=farm
      shop=frame: FR:Tag:shop=frame
      shop=doityourself: FR:Tag:shop=doityourself
      shop=farm: FR:Tag:shop=farm
      shop=frame: FR:Tag:shop=frame
+    shop=frozen_food: FR:Tag:shop=frozen food
      shop=funeral_directors: FR:Tag:shop=funeral directors
      shop=furnace: FR:Tag:shop=furnace
      shop=garden_centre: FR:Tag:shop=garden centre
      shop=gift: FR:Tag:shop=gift
      shop=hairdresser: FR:Tag:shop=hairdresser
      shop=hunting: FR:Tag:shop=hunting
      shop=funeral_directors: FR:Tag:shop=funeral directors
      shop=furnace: FR:Tag:shop=furnace
      shop=garden_centre: FR:Tag:shop=garden centre
      shop=gift: FR:Tag:shop=gift
      shop=hairdresser: FR:Tag:shop=hairdresser
      shop=hunting: FR:Tag:shop=hunting
+    shop=kiosk: FR:Tag:shop=kiosk
      shop=kitchen: FR:Tag:shop=kitchen
      shop=military_surplus: FR:Tag:shop=military surplus
      shop=newsagent: FR:Tag:shop=newsagent
      shop=kitchen: FR:Tag:shop=kitchen
      shop=military_surplus: FR:Tag:shop=military surplus
      shop=newsagent: FR:Tag:shop=newsagent
+    shop=pastry: FR:Tag:shop=pastry
      shop=photo: FR:Tag:shop=photo
      shop=second_hand: FR:Tag:shop=second hand
      shop=supermarket: FR:Tag:shop=supermarket
      shop=photo: FR:Tag:shop=photo
      shop=second_hand: FR:Tag:shop=second hand
      shop=supermarket: FR:Tag:shop=supermarket
@@ -3469,17 +5236,24 @@ fr:
      sport=shooting: FR:Tag:sport=shooting
      tourism=alpine_hut: FR:Tag:tourism=alpine hut
      tourism=artwork: FR:Tag:tourism=artwork
      sport=shooting: FR:Tag:sport=shooting
      tourism=alpine_hut: FR:Tag:tourism=alpine hut
      tourism=artwork: FR:Tag:tourism=artwork
+    tourism=attraction: FR:Tag:tourism=attraction
      tourism=camp_site: FR:Tag:tourism=camp site
      tourism=camp_site: FR:Tag:tourism=camp site
+    tourism=chalet: FR:Tag:tourism=chalet
+    tourism=gallery: FR:Tag:tourism=gallery
+    tourism=guest_house: FR:Tag:tourism=guest house
      tourism=hostel: FR:Tag:tourism=hostel
      tourism=hotel: FR:Tag:tourism=hotel
      tourism=information: FR:Tag:tourism=information
      tourism=hostel: FR:Tag:tourism=hostel
      tourism=hotel: FR:Tag:tourism=hotel
      tourism=information: FR:Tag:tourism=information
+    tourism=motel: FR:Tag:tourism=motel
+    tourism=museum: FR:Tag:tourism=museum
+    tourism=theme_park: FR:Tag:tourism=theme park
      tourism=viewpoint: FR:Tag:tourism=viewpoint
      tunnel=culvert: FR:Tag:tunnel=culvert
      tourism=viewpoint: FR:Tag:tourism=viewpoint
      tunnel=culvert: FR:Tag:tunnel=culvert
-    type=associatedStreet: FR:Tag:type=associatedStreet
      wall=no: FR:Tag:wall=no
      waterway=boatyard: FR:Tag:waterway=boatyard
      waterway=canal: FR:Tag:waterway=canal
      waterway=dam: FR:Tag:waterway=dam
      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=dock: FR:Tag:waterway=dock
      waterway=lock_gate: FR:Tag:waterway=lock gate
      waterway=river: FR:Tag:waterway=river
      waterway=riverbank: FR:Tag:waterway=riverbank
      waterway=lock_gate: FR:Tag:waterway=lock gate
      waterway=river: FR:Tag:waterway=river
      waterway=riverbank: FR:Tag:waterway=riverbank
@@ -3512,22 +5286,33 @@ hu:
      barrier: Hu:Key:barrier
      building: Hu:Key:building
      denomination: Hu:Key:denomination
      barrier: Hu:Key:barrier
      building: Hu:Key:building
      denomination: Hu:Key:denomination
+    destination: Hu:Key:destination
      highway: Hu:Key:highway
      jel: Hu:Key:jel
      landuse: Hu:Key:landuse
      leisure: Hu:Key:leisure
      highway: Hu:Key:highway
      jel: Hu:Key:jel
      landuse: Hu:Key:landuse
      leisure: Hu:Key:leisure
+    man_made: Hu:Key:man made
+    maxspeed: Hu:Key:maxspeed
+    minspeed: Hu:Key:minspeed
      natural: Hu:Key:natural
      natural: Hu:Key:natural
+    obstacle: Hu:Key:obstacle
      office: Hu:Key:office
      place: Hu:Key:place
      railway: Hu:Key:railway
      shop: Hu:Key:shop
      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
      symbol: Hu:Key:symbol
      tourism: Hu:Key:tourism
      tracktype: Hu:Key:tracktype
+    turn: Hu:Key:turn
      waterway: Hu:Key:waterway
      waterway: Hu:Key:waterway
+    wheelchair: Hu:Key:wheelchair
      wood: Hu:Key:wood
    tag:
      boundary=administrative: Hu:Tag:boundary=administrative
      wood: Hu:Key:wood
    tag:
      boundary=administrative: Hu:Tag:boundary=administrative
+id:
+  tag:
+    highway=track: Id:Tag:highway=track
  it:
    key:
      abutters: IT:Key:abutters
  it:
    key:
      abutters: IT:Key:abutters
@@ -3551,6 +5336,8 @@ it:
      denomination: IT:Key:denomination
      description: IT:Key:description
      diet: IT:Key:diet
      denomination: IT:Key:denomination
      description: IT:Key:description
      diet: IT:Key:diet
+    diet:*: IT:Key:diet:*
+    drink: IT:Key:drink
      ele: IT:Key:ele
      embankment: IT:Key:embankment
      enforcement: IT:Key:enforcement
      ele: IT:Key:ele
      embankment: IT:Key:embankment
      enforcement: IT:Key:enforcement
@@ -3576,10 +5363,12 @@ it:
      mooring: IT:Key:mooring
      mountain_pass: IT:Key:mountain pass
      mtb:scale: IT:Key:mtb:scale
      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
      note: IT:Key:note
      name: IT:Key:name
      natural: IT:Key:natural
      noexit: IT:Key:noexit
      note: IT:Key:note
+    office: IT:Key:office
      operator: IT:Key:operator
      osmc:symbol: IT:Key:osmc:symbol
      parking:lane:both: IT:Key:parking:lane:both
      operator: IT:Key:operator
      osmc:symbol: IT:Key:osmc:symbol
      parking:lane:both: IT:Key:parking:lane:both
@@ -3619,8 +5408,10 @@ it:
      amenity=bar: IT:Tag:amenity=bar
      amenity=bench: IT:Tag:amenity=bench
      amenity=bicycle_rental: IT:Tag:amenity=bicycle rental
      amenity=bar: IT:Tag:amenity=bar
      amenity=bench: IT:Tag:amenity=bench
      amenity=bicycle_rental: IT:Tag:amenity=bicycle rental
+    amenity=cafe: IT:Tag:amenity=cafe
      amenity=cinema: IT:Tag:amenity=cinema
      amenity=college: IT:Tag:amenity=college
      amenity=cinema: IT:Tag:amenity=cinema
      amenity=college: IT:Tag:amenity=college
+    amenity=fast_food: IT:Tag:amenity=fast food
      amenity=fountain: IT:Tag:amenity=fountain
      amenity=fuel: IT:Tag:amenity=fuel
      amenity=hospital: IT:Tag:amenity=hospital
      amenity=fountain: IT:Tag:amenity=fountain
      amenity=fuel: IT:Tag:amenity=fuel
      amenity=hospital: IT:Tag:amenity=hospital
@@ -3633,7 +5424,9 @@ it:
      amenity=place_of_worship: IT:Tag:amenity=place of worship
      amenity=police: IT:Tag:amenity=police
      amenity=post_office: IT:Tag:amenity=post office
      amenity=place_of_worship: IT:Tag:amenity=place of worship
      amenity=police: IT:Tag:amenity=police
      amenity=post_office: IT:Tag:amenity=post office
+    amenity=pub: IT:Tag:amenity=pub
      amenity=recycling: IT:Tag:amenity=recycling
      amenity=recycling: IT:Tag:amenity=recycling
+    amenity=restaurant: IT:Tag:amenity=restaurant
      amenity=school: IT:Tag:amenity=school
      amenity=spa: IT:Tag:amenity=spa
      amenity=university: IT:Tag:amenity=university
      amenity=school: IT:Tag:amenity=school
      amenity=spa: IT:Tag:amenity=spa
      amenity=university: IT:Tag:amenity=university
@@ -3659,10 +5452,12 @@ it:
      highway=rest_area: IT:Tag:highway=rest area
      highway=secondary: IT:Tag:highway=secondary
      highway=services: IT:Tag:highway=services
      highway=rest_area: IT:Tag:highway=rest area
      highway=secondary: IT:Tag:highway=secondary
      highway=services: IT:Tag:highway=services
+    highway=steps: IT:Tag:highway=steps
      highway=tertiary: IT:Tag:highway=tertiary
      highway=track: IT:Tag:highway=track
      highway=trunk: IT:Tag:highway=trunk
      highway=trunk_link: IT:Tag:highway=trunk link
      highway=tertiary: IT:Tag:highway=tertiary
      highway=track: IT:Tag:highway=track
      highway=trunk: IT:Tag:highway=trunk
      highway=trunk_link: IT:Tag:highway=trunk link
+    historic=archaeological_site: IT:Tag:historic=archaeological site
      historic=paleontological_site: IT:Tag:historic=paleontological site
      historic=wayside_shrine: IT:Tag:historic=wayside shrine
      industrial=auto_wrecker: IT:Tag:industrial=auto wrecker
      historic=paleontological_site: IT:Tag:historic=paleontological site
      historic=wayside_shrine: IT:Tag:historic=wayside shrine
      industrial=auto_wrecker: IT:Tag:industrial=auto wrecker
@@ -3676,6 +5471,7 @@ it:
      leisure=swimming_pool: IT:Tag:leisure=swimming pool
      man_made=mast: IT:Tag:man made=mast
      natural=grassland: IT:Tag:natural=grassland
      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=scree: IT:Tag:natural=scree
      natural=spring: IT:Tag:natural=spring
      natural=tree_row: IT:Tag:natural=tree row
@@ -3692,30 +5488,74 @@ it:
      power=transformer: IT:Tag:power=transformer
      railway=level_crossing: IT:Tag:railway=level crossing
      route=bus: IT:Tag:route=bus
      power=transformer: IT:Tag:power=transformer
      railway=level_crossing: IT:Tag:railway=level crossing
      route=bus: IT:Tag:route=bus
+    shop=alcohol: IT:Tag:shop=alcohol
+    shop=bakery: IT:Tag:shop=bakery
+    shop=beverages: IT:Tag:shop=beverages
      shop=butcher: IT:Tag:shop=butcher
      shop=car: IT:Tag:shop=car
      shop=butcher: IT:Tag:shop=butcher
      shop=car: IT:Tag:shop=car
+    shop=chemist: IT:Tag:shop=chemist
      shop=clothes: IT:Tag:shop=clothes
      shop=clothes: IT:Tag:shop=clothes
+    shop=coffee: IT:Tag:shop=coffee
      shop=confectionery: IT:Tag:shop=confectionery
      shop=confectionery: IT:Tag:shop=confectionery
+    shop=convenience: IT:Tag:shop=convenience
+    shop=deli: IT:Tag:shop=deli
+    shop=farm: IT:Tag:shop=farm
      shop=florist: IT:Tag:shop=florist
      shop=greengrocer: IT:Tag:shop=greengrocer
      shop=hifi: IT:Tag:shop=hifi
      shop=kiosk: IT:Tag:shop=kiosk
      shop=mall: IT:Tag:shop=mall
      shop=newsagent: IT:Tag:shop=newsagent
      shop=florist: IT:Tag:shop=florist
      shop=greengrocer: IT:Tag:shop=greengrocer
      shop=hifi: IT:Tag:shop=hifi
      shop=kiosk: IT:Tag:shop=kiosk
      shop=mall: IT:Tag:shop=mall
      shop=newsagent: IT:Tag:shop=newsagent
+    shop=pastry: IT:Tag:shop=pastry
+    shop=seafood: IT:Tag:shop=seafood
+    shop=supermarket: IT:Tag:shop=supermarket
+    shop=tea: IT:Tag:shop=tea
      shop=tobacco: IT:Tag:shop=tobacco
      shop=tobacco: IT:Tag:shop=tobacco
+    shop=wine: IT:Tag:shop=wine
      sport=surfing: IT:Tag:sport=surfing
      tourism=artwork: IT:Tag:tourism=artwork
      waterway=stream: IT:Tag:waterway=stream
  ja:
    key:
      sport=surfing: IT:Tag:sport=surfing
      tourism=artwork: IT:Tag:tourism=artwork
      waterway=stream: IT:Tag:waterway=stream
  ja:
    key:
+    CEMT: JA:Key:CEMT
+    abandoned: JA:Key:abandoned
      abutters: JA:Key:abutters
      access: JA:Key:access
      abutters: JA:Key:abutters
      access: JA:Key:access
+    access:lanes: JA:Key:access:lanes
      addr: JA:Key:addr
      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:place: JA:Key:addr:place
+    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
      aerialway: JA:Key:aerialway
      aeroway: JA:Key:aeroway
+    agricultural: JA:Key:agricultural
+    alt_name: JA:Key:alt name
+    amenity: JA:Key:amenity
      area: JA:Key:area
      area: JA:Key:area
+    artwork_type: JA:Key:artwork type
+    attribution: JA:Key:attribution
+    atv: JA:Key:atv
+    backward: JA:Key:backward
      barrier: JA:Key:barrier
      barrier: JA:Key:barrier
+    bdouble: JA:Key:bdouble
+    bicycle: JA:Key:bicycle
+    bicycle_parking: JA:Key:bicycle parking
+    boat: JA:Key:boat
+    bollard: JA:Key:bollard
      books: JA:Key:books
      books: JA:Key:books
+    border_type: JA:Key:border type
      boundary: JA:Key:boundary
      brand: JA:Key:brand
      bridge: JA:Key:bridge
      boundary: JA:Key:boundary
      brand: JA:Key:brand
      bridge: JA:Key:bridge
@@ -3723,91 +5563,210 @@ ja:
      building:material: JA:Key:building:material
      building:part: JA:Key:building:part
      building:parts: JA:Key:building:parts
      building:material: JA:Key:building:material
      building:part: JA:Key:building:part
      building:parts: JA:Key:building:parts
+    bus: JA:Key:bus
      capacity: JA:Key:capacity
      clothes: JA:Key:clothes
      capacity: JA:Key:capacity
      clothes: JA:Key:clothes
+    club: JA:Key:club
+    collection_times: JA:Key:collection times
+    colour: JA:Key:colour
      comment: JA:Key:comment
      comment: JA:Key:comment
+    conditional: JA:Key:conditional
+    construction: JA:Key:construction
      contact: JA:Key:contact
      contact: JA:Key:contact
+    contact:email: JA:Key:contact:email
+    contact:facebook: JA:Key:contact:facebook
+    contact:fax: JA:Key:contact:fax
+    contact:google_plus: JA:Key:contact:google plus
+    contact:linkedin: JA:Key:contact:linkedin
+    contact:phone: JA:Key:contact:phone
+    contact:twitter: JA:Key:contact:twitter
+    contact:webcam: JA:Key:contact:webcam
+    contact:website: JA:Key:contact:website
      covered: JA:Key:covered
      covered: JA:Key:covered
+    craft: JA:Key:craft
      crossing: JA:Key:crossing
      cuisine: JA:Key:cuisine
      cutting: JA:Key:cutting
      cycleway: JA:Key:cycleway
      denomination: JA:Key:denomination
      description: JA:Key:description
      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
      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
      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
+    ele: JA:Key:ele
      electrified: JA:Key:electrified
      electrified: JA:Key:electrified
+    email: JA:Key:email
      embankment: JA:Key:embankment
      emergency: JA:Key:emergency
      end_date: JA:Key:end date
      embankment: JA:Key:embankment
      emergency: JA:Key:emergency
      end_date: JA:Key:end date
+    entrance: JA:Key:entrance
+    est_width: JA:Key:est width
+    exit_to: JA:Key:exit to
+    facebook: JA:Key:facebook
+    fax: JA:Key:fax
      fee: JA:Key:fee
      fixme: JA:Key:fixme
      foot: JA:Key:foot
      footway: JA:Key:footway
      fee: JA:Key:fee
      fixme: JA:Key:fixme
      foot: JA:Key:foot
      footway: JA:Key:footway
+    forestry: JA:Key:forestry
+    forward: JA:Key:forward
      furniture: JA:Key:furniture
      furniture: JA:Key:furniture
+    generator:method: JA:Key:generator:method
+    generator:plant: JA:Key:generator:plant
      generator:source: JA:Key:generator:source
      genus: JA:Key:genus
      geological: JA:Key:geological
      generator:source: JA:Key:generator:source
      genus: JA:Key:genus
      geological: JA:Key:geological
+    happy_hours: JA:Key:happy hours
      hazard_type: JA:Key:hazard type
      hazard_type: JA:Key:hazard type
+    hazmat: JA:Key:hazmat
+    healthcare: JA:Key:healthcare
      height: JA:Key:height
      height: JA:Key:height
+    hgv: JA:Key:hgv
      highway: JA:Key:highway
      historic: JA:Key:historic
      highway: JA:Key:highway
      historic: JA:Key:historic
+    horse: JA:Key:horse
+    iata: JA:Key:iata
+    icao: JA:Key:icao
+    image: JA:Key:image
      incline: JA:Key:incline
      information: JA:Key:information
      incline: JA:Key:incline
      information: JA:Key:information
+    inline_skates: JA:Key:inline skates
+    inscription: JA:Key:inscription
+    int_name: JA:Key:int name
+    intermittent: JA:Key:intermittent
      internet_access: JA:Key:internet access
      is_in: JA:Key:is in
      internet_access: JA:Key:internet access
      is_in: JA:Key:is in
+    is_in:continent: JA:Key:is in:continent
+    junction: JA:Key:junction
+    landmark: JA:Key:landmark
      landuse: JA:Key:landuse
      lanes: JA:Key:lanes
      layer: JA:Key:layer
      landuse: JA:Key:landuse
      lanes: JA:Key:lanes
      layer: JA:Key:layer
+    lcn_ref: JA:Key:lcn ref
+    leaf_cycle: JA:Key:leaf cycle
+    leaf_type: JA:Key:leaf type
+    left: JA:Key:left
      leisure: JA:Key:leisure
      leisure: JA:Key:leisure
+    length: JA:Key:length
      level: JA:Key:level
      level_crossing: JA:Key:level crossing
      lit: JA:Key:lit
      level: JA:Key:level
      level_crossing: JA:Key:level crossing
      lit: JA:Key:lit
+    loc_name: JA:Key:loc name
+    loc_ref: JA:Key:loc ref
      man_made: JA:Key:man made
      man_made: JA:Key:man made
+    maxaxleload: JA:Key:maxaxleload
+    maxheight: JA:Key:maxheight
+    maxheight:physical: JA:Key:maxheight:physical
+    maxlength: JA:Key:maxlength
+    maxspeed: JA:Key:maxspeed
+    maxweight: JA:Key:maxweight
+    maxwidth: JA:Key:maxwidth
+    maxwidth:physical: JA:Key:maxwidth:physical
      military: JA:Key:military
      military: JA:Key:military
+    minspeed: JA:Key:minspeed
+    moped: JA:Key:moped
+    motor_vehicle: JA:Key:motor vehicle
+    motorboat: JA:Key:motorboat
+    motorcar: JA:Key:motorcar
+    motorcycle: JA:Key:motorcycle
      mountain_pass: JA:Key:mountain pass
      name: JA:Key:name
      mountain_pass: JA:Key:mountain pass
      name: JA:Key:name
+    name:cs: JA:Key:name:cs
+    name:de: JA:Key:name:de
+    name:en: JA:Key:name:en
+    narrow: JA:Key:narrow
+    nat_ref: JA:Key:nat ref
      natural: JA:Key:natural
      natural: JA:Key:natural
+    ncn_ref: JA:Key:ncn ref
+    network: JA:Key:network
+    noexit: JA:Key:noexit
      note: JA:Key:note
      note: JA:Key:note
+    office: JA:Key:office
+    official_name: JA:Key:official name
+    old_name: JA:Key:old name
+    old_ref: JA:Key:old ref
      oneway: JA:Key:oneway
      oneway: JA:Key:oneway
+    oneway:bicycle: JA:Key:oneway:bicycle
      opening_hours: JA:Key:opening hours
      operator: JA:Key:operator
      opening_hours: JA:Key:opening hours
      operator: JA:Key:operator
+    organic: JA:Key:organic
+    outdoor_seating: JA:Key:outdoor seating
      overtaking: JA:Key:overtaking
      overtaking: JA:Key:overtaking
+    parking:condition: JA:Key:parking:condition
+    parking:lane: JA:Key:parking:lane
      phone: JA:Key:phone
      place: JA:Key:place
      phone: JA:Key:phone
      place: JA:Key:place
+    population: JA:Key:population
      power: JA:Key:power
      power_source: JA:Key:power source
      power_supply: JA:Key:power supply
      power: JA:Key:power
      power_source: JA:Key:power source
      power_supply: JA:Key:power supply
+    psv: JA:Key:psv
      public_transport: JA:Key:public transport
      public_transport: JA:Key:public transport
+    public_transport:version: JA:Key:public transport:version
+    rack: JA:Key:rack
      railway: JA:Key:railway
      railway: JA:Key:railway
+    railway:preserved: JA:Key:railway:preserved
+    rcn_ref: JA:Key:rcn ref
      ref: JA:Key:ref
      ref: JA:Key:ref
+    ref:shop:num: JA:Key:ref:shop:num
+    reference: JA:Key:reference
+    reg_ref: JA:Key:reg ref
      religion: JA:Key:religion
      religion: JA:Key:religion
+    right: JA:Key:right
+    roadtrain: JA:Key:roadtrain
      roof:material: JA:Key:roof:material
      room: JA:Key:room
      route: JA:Key:route
      roof:material: JA:Key:roof:material
      room: JA:Key:room
      route: JA:Key:route
+    sac_scale: JA:Key:sac scale
+    salt: JA:Key:salt
      seamark:fixme: JA:Key:seamark:fixme
      segregated: JA:Key:segregated
      service: JA:Key:service
      seamark:fixme: JA:Key:seamark:fixme
      segregated: JA:Key:segregated
      service: JA:Key:service
+    service_times: JA:Key:service times
      shop: JA:Key:shop
      shop: JA:Key:shop
+    short_name: JA:Key:short name
      sidewalk: JA:Key:sidewalk
      smoothness: JA:Key:smoothness
      social_facility: JA:Key:social facility
      source: JA:Key:source
      sidewalk: JA:Key:sidewalk
      smoothness: JA:Key:smoothness
      social_facility: JA:Key:social facility
      source: JA:Key:source
+    source:date: JA:Key:source:date
+    source:maxspeed: JA:Key:source:maxspeed
+    source:name: JA:Key:source:name
+    source:ref: JA:Key:source:ref
+    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
      species: JA:Key:species
      sport: JA:Key:sport
      start_date: JA:Key:start date
      step_count: JA:Key:step count
      surface: JA:Key:surface
+    surveillance: JA:Key:surveillance
+    survey:date: JA:Key:survey:date
      tactile_paving: JA:Key:tactile paving
      takeaway: JA:Key:takeaway
      tactile_paving: JA:Key:tactile paving
      takeaway: JA:Key:takeaway
+    tank: JA:Key:tank
+    taxi: JA:Key:taxi
+    tenant: JA:Key:tenant
+    tidal: JA:Key:tidal
+    toilets:wheelchair: JA:Key:toilets:wheelchair
+    toll: JA:Key:toll
      tourism: JA:Key:tourism
      tourism: JA:Key:tourism
+    tower:type: JA:Key:tower:type
      tracktype: JA:Key:tracktype
      tracktype: JA:Key:tracktype
+    traffic_calming: JA:Key:traffic calming
+    trail_visibility: JA:Key:trail visibility
      tunnel: JA:Key:tunnel
      tunnel: JA:Key:tunnel
+    turn: JA:Key:turn
+    twitter: JA:Key:twitter
      type: JA:Key:type
      url: JA:Key:url
      type: JA:Key:type
      url: JA:Key:url
+    usage: JA:Key:usage
+    vehicle: JA:Key:vehicle
+    water: JA:Key:water
      waterway: JA:Key:waterway
      website: JA:Key:website
      wheelchair: JA:Key:wheelchair
      waterway: JA:Key:waterway
      website: JA:Key:website
      wheelchair: JA:Key:wheelchair
@@ -3816,13 +5775,19 @@ ja:
      winter_road: JA:Key:winter road
      wood: JA:Key:wood
    tag:
      winter_road: JA:Key:winter road
      wood: JA:Key:wood
    tag:
-    abandoned=yes: JA:Tag:abandoned=yes
      access=designated: JA:Tag:access=designated
      access=designated: JA:Tag:access=designated
+    access=no: JA:Tag:access=no
+    access=private: JA:Tag:access=private
+    aerialway=cable_car: JA:Tag:aerialway=cable car
+    aerialway=t-bar: JA:Tag:aerialway=t-bar
+    aerialway=zip_line: JA:Tag:aerialway=zip line
+    aeroway=aerodrome: JA:Tag:aeroway=aerodrome
      aeroway=apron: JA:Tag:aeroway=apron
      aeroway=helipad: JA:Tag:aeroway=helipad
      aeroway=runway: JA:Tag:aeroway=runway
      aeroway=taxiway: JA:Tag:aeroway=taxiway
      aeroway=terminal: JA:Tag:aeroway=terminal
      aeroway=apron: JA:Tag:aeroway=apron
      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=animal_shelter: JA:Tag:amenity=animal shelter
      amenity=arts_centre: JA:Tag:amenity=arts centre
      amenity=atm: JA:Tag:amenity=atm
      amenity=baby_hatch: JA:Tag:amenity=baby hatch
      amenity=arts_centre: JA:Tag:amenity=arts centre
      amenity=atm: JA:Tag:amenity=atm
      amenity=baby_hatch: JA:Tag:amenity=baby hatch
@@ -3832,6 +5797,7 @@ ja:
      amenity=bench: JA:Tag:amenity=bench
      amenity=bicycle_parking: JA:Tag:amenity=bicycle parking
      amenity=bicycle_rental: JA:Tag:amenity=bicycle rental
      amenity=bench: JA:Tag:amenity=bench
      amenity=bicycle_parking: JA:Tag:amenity=bicycle parking
      amenity=bicycle_rental: JA:Tag:amenity=bicycle rental
+    amenity=bicycle_repair_station: JA:Tag:amenity=bicycle repair station
      amenity=biergarten: JA:Tag:amenity=biergarten
      amenity=boat_storage: JA:Tag:amenity=boat storage
      amenity=brothel: JA:Tag:amenity=brothel
      amenity=biergarten: JA:Tag:amenity=biergarten
      amenity=boat_storage: JA:Tag:amenity=boat storage
      amenity=brothel: JA:Tag:amenity=brothel
@@ -3841,19 +5807,24 @@ ja:
      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=car_rental: JA:Tag:amenity=car rental
      amenity=car_sharing: JA:Tag:amenity=car sharing
      amenity=car_wash: JA:Tag:amenity=car wash
+    amenity=casino: JA:Tag:amenity=casino
      amenity=charging_station: JA:Tag:amenity=charging station
      amenity=charging_station: JA:Tag:amenity=charging station
+    amenity=childcare: JA:Tag:amenity=childcare
      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=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=compressed_air: JA:Tag:amenity=compressed air
      amenity=courthouse: JA:Tag:amenity=courthouse
      amenity=crematorium: JA:Tag:amenity=crematorium
      amenity=dentist: JA:Tag:amenity=dentist
      amenity=courthouse: JA:Tag:amenity=courthouse
      amenity=crematorium: JA:Tag:amenity=crematorium
      amenity=dentist: JA:Tag:amenity=dentist
+    amenity=doctor: JA:Tag:amenity=doctor
      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=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=financial_advice: JA:Tag:amenity=financial advice
      amenity=fire_station: JA:Tag:amenity=fire station
      amenity=food_court: JA:Tag:amenity=food court
      amenity=fountain: JA:Tag:amenity=fountain
      amenity=fire_station: JA:Tag:amenity=fire station
      amenity=food_court: JA:Tag:amenity=food court
      amenity=fountain: JA:Tag:amenity=fountain
@@ -3872,12 +5843,15 @@ ja:
      amenity=parking_entrance: JA:Tag:amenity=parking entrance
      amenity=parking_space: JA:Tag:amenity=parking space
      amenity=pharmacy: JA:Tag:amenity=pharmacy
      amenity=parking_entrance: JA:Tag:amenity=parking entrance
      amenity=parking_space: JA:Tag:amenity=parking space
      amenity=pharmacy: JA:Tag:amenity=pharmacy
+    amenity=photo_booth: JA:Tag:amenity=photo booth
      amenity=place_of_worship: JA:Tag:amenity=place of worship
      amenity=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=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_bath: JA:Tag:amenity=public bath
+    amenity=public_bookcase: JA:Tag:amenity=public bookcase
      amenity=public_building: JA:Tag:amenity=public building
      amenity=recycling: JA:Tag:amenity=recycling
      amenity=restaurant: JA:Tag:amenity=restaurant
      amenity=public_building: JA:Tag:amenity=public building
      amenity=recycling: JA:Tag:amenity=recycling
      amenity=restaurant: JA:Tag:amenity=restaurant
@@ -3902,6 +5876,7 @@ ja:
      amenity=watering_place: JA:Tag:amenity=watering place
      atm=yes: JA:Tag:atm=yes
      barrier=bollard: JA:Tag:barrier=bollard
      amenity=watering_place: JA:Tag:amenity=watering place
      atm=yes: JA:Tag:atm=yes
      barrier=bollard: JA:Tag:barrier=bollard
+    barrier=ditch: JA:Tag:barrier=ditch
      barrier=fence: JA:Tag:barrier=fence
      barrier=gate: JA:Tag:barrier=gate
      barrier=hedge: JA:Tag:barrier=hedge
      barrier=fence: JA:Tag:barrier=fence
      barrier=gate: JA:Tag:barrier=gate
      barrier=hedge: JA:Tag:barrier=hedge
@@ -3909,46 +5884,82 @@ ja:
      barrier=retaining_wall: JA:Tag:barrier=retaining wall
      barrier=toll_booth: JA:Tag:barrier=toll booth
      barrier=wall: JA:Tag:barrier=wall
      barrier=retaining_wall: JA:Tag:barrier=retaining wall
      barrier=toll_booth: JA:Tag:barrier=toll booth
      barrier=wall: JA:Tag:barrier=wall
+    bicycle=designated: JA:Tag:bicycle=designated
      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
      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=bridge: JA:Tag:building=bridge
+    building=commercial: JA:Tag:building=commercial
+    building=hospital: JA:Tag:building=hospital
+    building=house: JA:Tag:building=house
+    building=industrial: JA:Tag:building=industrial
+    building=public: JA:Tag:building=public
+    building=roof: JA:Tag:building=roof
+    building=ruins: JA:Tag:building=ruins
+    building=shrine: JA:Tag:building=shrine
+    building=temple: JA:Tag:building=temple
      building=train_station: JA:Tag:building=train station
      craft=brewery: JA:Tag:craft=brewery
      building=train_station: JA:Tag:building=train station
      craft=brewery: JA:Tag:craft=brewery
+    craft=chimney_sweeper: JA:Tag:craft=chimney sweeper
+    craft=floorer: JA:Tag:craft=floorer
+    craft=tailor: JA:Tag:craft=tailor
+    craft=winery: JA:Tag:craft=winery
      emergency=defibrillator: JA:Tag:emergency=defibrillator
      emergency=fire_extinguisher: JA:Tag:emergency=fire extinguisher
      emergency=fire_hydrant: JA:Tag:emergency=fire hydrant
      emergency=defibrillator: JA:Tag:emergency=defibrillator
      emergency=fire_extinguisher: JA:Tag:emergency=fire extinguisher
      emergency=fire_hydrant: JA:Tag:emergency=fire hydrant
+    emergency=phone: JA:Tag:emergency=phone
+    foot=designated: JA:Tag:foot=designated
+    foot=private: JA:Tag:foot=private
+    footway=crossing: JA:Tag:footway=crossing
+    footway=sidewalk: JA:Tag:footway=sidewalk
+    generator:source=solar: JA:Tag:generator:source=solar
+    hgv=designated: JA:Tag:hgv=designated
      highway=bus_stop: JA:Tag:highway=bus stop
      highway=crossing: JA:Tag:highway=crossing
      highway=cycleway: JA:Tag:highway=cycleway
      highway=bus_stop: JA:Tag:highway=bus stop
      highway=crossing: JA:Tag:highway=crossing
      highway=cycleway: JA:Tag:highway=cycleway
+    highway=elevator: JA:Tag:highway=elevator
      highway=footway: JA:Tag:highway=footway
      highway=footway: JA:Tag:highway=footway
-    highway=motorway_link: JA:Tag:highway=motorway link
+    highway=motorway: JA:Tag:highway=motorway
+    highway=motorway_junction: JA:Tag:highway=motorway junction
+    highway=passing_place: JA:Tag:highway=passing place
      highway=path: JA:Tag:highway=path
      highway=pedestrian: JA:Tag:highway=pedestrian
      highway=path: JA:Tag:highway=path
      highway=pedestrian: JA:Tag:highway=pedestrian
+    highway=primary: JA:Tag:highway=primary
+    highway=raceway: JA:Tag:highway=raceway
      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=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=speed_camera: JA:Tag:highway=speed camera
      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
      highway=trunk: JA:Tag:highway=trunk
      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
      highway=trunk: JA:Tag:highway=trunk
+    highway=turning_circle: JA:Tag:highway=turning circle
      highway=unclassified: JA:Tag:highway=unclassified
      historic=archaeological_site: JA:Tag:historic=archaeological site
      historic=battlefield: JA:Tag:historic=battlefield
      historic=boundary_stone: JA:Tag:historic=boundary stone
      historic=monument: JA:Tag:historic=monument
      highway=unclassified: JA:Tag:highway=unclassified
      historic=archaeological_site: JA:Tag:historic=archaeological site
      historic=battlefield: JA:Tag:historic=battlefield
      historic=boundary_stone: JA:Tag:historic=boundary stone
      historic=monument: JA:Tag:historic=monument
+    historic=tomb: JA:Tag:historic=tomb
+    historic=wayside_shrine: JA:Tag:historic=wayside shrine
+    horse=designated: JA:Tag:horse=designated
      information=guidepost: JA:Tag:information=guidepost
      information=guidepost: JA:Tag:information=guidepost
+    junction=roundabout: JA:Tag:junction=roundabout
+    junction=yes: JA:Tag:junction=yes
      landuse=allotments: JA:Tag:landuse=allotments
      landuse=basin: JA:Tag:landuse=basin
      landuse=brownfield: JA:Tag:landuse=brownfield
      landuse=cemetery: JA:Tag:landuse=cemetery
      landuse=allotments: JA:Tag:landuse=allotments
      landuse=basin: JA:Tag:landuse=basin
      landuse=brownfield: JA:Tag:landuse=brownfield
      landuse=cemetery: JA:Tag:landuse=cemetery
+    landuse=churchyard: JA:Tag:landuse=churchyard
      landuse=commercial: JA:Tag:landuse=commercial
      landuse=construction: JA:Tag:landuse=construction
      landuse=farm: JA:Tag:landuse=farm
      landuse=commercial: JA:Tag:landuse=commercial
      landuse=construction: JA:Tag:landuse=construction
      landuse=farm: JA:Tag:landuse=farm
+    landuse=farmland: JA:Tag:landuse=farmland
      landuse=farmyard: JA:Tag:landuse=farmyard
      landuse=forest: JA:Tag:landuse=forest
      landuse=garages: JA:Tag:landuse=garages
      landuse=farmyard: JA:Tag:landuse=farmyard
      landuse=forest: JA:Tag:landuse=forest
      landuse=garages: JA:Tag:landuse=garages
@@ -3960,18 +5971,27 @@ ja:
      landuse=meadow: JA:Tag:landuse=meadow
      landuse=military: JA:Tag:landuse=military
      landuse=orchard: JA:Tag:landuse=orchard
      landuse=meadow: JA:Tag:landuse=meadow
      landuse=military: JA:Tag:landuse=military
      landuse=orchard: JA:Tag:landuse=orchard
+    landuse=peat_cutting: JA:Tag:landuse=peat cutting
      landuse=plant_nursery: JA:Tag:landuse=plant nursery
      landuse=plant_nursery: JA:Tag:landuse=plant nursery
+    landuse=port: JA:Tag:landuse=port
      landuse=quarry: JA:Tag:landuse=quarry
      landuse=railway: JA:Tag:landuse=railway
      landuse=recreation_ground: JA:Tag:landuse=recreation ground
      landuse=quarry: JA:Tag:landuse=quarry
      landuse=railway: JA:Tag:landuse=railway
      landuse=recreation_ground: JA:Tag:landuse=recreation ground
+    landuse=religious: JA:Tag:landuse=religious
      landuse=reservoir: JA:Tag:landuse=reservoir
      landuse=residential: JA:Tag:landuse=residential
      landuse=retail: JA:Tag:landuse=retail
      landuse=salt_pond: JA:Tag:landuse=salt pond
      landuse=village_green: JA:Tag:landuse=village green
      landuse=wood: JA:Tag:landuse=wood
      landuse=reservoir: JA:Tag:landuse=reservoir
      landuse=residential: JA:Tag:landuse=residential
      landuse=retail: JA:Tag:landuse=retail
      landuse=salt_pond: JA:Tag:landuse=salt pond
      landuse=village_green: JA:Tag:landuse=village green
      landuse=wood: JA:Tag:landuse=wood
+    leaf_type=broadleaved: JA:Tag:leaf type=broadleaved
+    leaf_type=leafless: JA:Tag:leaf type=leafless
+    leaf_type=mixed: JA:Tag:leaf type=mixed
+    leaf_type=needleleaved: JA:Tag:leaf type=needleleaved
+    leisure=adult_gaming_centre: JA:Tag:leisure=adult gaming centre
      leisure=beach_resort: JA:Tag:leisure=beach resort
      leisure=bird_hide: JA:Tag:leisure=bird hide
      leisure=beach_resort: JA:Tag:leisure=beach resort
      leisure=bird_hide: JA:Tag:leisure=bird hide
+    leisure=bowling_alley: JA:Tag:leisure=bowling alley
      leisure=dance: JA:Tag:leisure=dance
      leisure=dog_park: JA:Tag:leisure=dog park
      leisure=garden: JA:Tag:leisure=garden
      leisure=dance: JA:Tag:leisure=dance
      leisure=dog_park: JA:Tag:leisure=dog park
      leisure=garden: JA:Tag:leisure=garden
@@ -3991,18 +6011,26 @@ ja:
      leisure=water_park: JA:Tag:leisure=water park
      man_made=adit: JA:Tag:man made=adit
      man_made=breakwater: JA:Tag:man made=breakwater
      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=bridge: JA:Tag:man made=bridge
+    man_made=communications_tower: JA:Tag:man made=communications tower
      man_made=crane: JA:Tag:man made=crane
      man_made=cutline: JA:Tag:man made=cutline
      man_made=flagpole: JA:Tag:man made=flagpole
      man_made=groyne: JA:Tag:man made=groyne
      man_made=kiln: JA:Tag:man made=kiln
      man_made=lighthouse: JA:Tag:man made=lighthouse
      man_made=crane: JA:Tag:man made=crane
      man_made=cutline: JA:Tag:man made=cutline
      man_made=flagpole: JA:Tag:man made=flagpole
      man_made=groyne: JA:Tag:man made=groyne
      man_made=kiln: JA:Tag:man made=kiln
      man_made=lighthouse: JA:Tag:man made=lighthouse
+    man_made=mast: JA:Tag:man made=mast
      man_made=mineshaft: JA:Tag:man made=mineshaft
      man_made=mineshaft: JA:Tag:man made=mineshaft
+    man_made=monitoring_station: JA:Tag:man made=monitoring station
      man_made=pier: JA:Tag:man made=pier
      man_made=pier: JA:Tag:man made=pier
+    man_made=reservoir_covered: JA:Tag:man made=reservoir covered
+    man_made=street_cabinet: JA:Tag:man made=street cabinet
      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
      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=arete: JA:Tag:natural=arete
+    natural=bare_rock: JA:Tag:natural=bare rock
      natural=bay: JA:Tag:natural=bay
      natural=beach: JA:Tag:natural=beach
      natural=cliff: JA:Tag:natural=cliff
      natural=bay: JA:Tag:natural=bay
      natural=beach: JA:Tag:natural=beach
      natural=cliff: JA:Tag:natural=cliff
@@ -4010,26 +6038,63 @@ ja:
      natural=fell: JA:Tag:natural=fell
      natural=grassland: JA:Tag:natural=grassland
      natural=heath: JA:Tag:natural=heath
      natural=fell: JA:Tag:natural=fell
      natural=grassland: JA:Tag:natural=grassland
      natural=heath: JA:Tag:natural=heath
+    natural=ridge: JA:Tag:natural=ridge
+    natural=saddle: JA:Tag:natural=saddle
      natural=scree: JA:Tag:natural=scree
      natural=scree: JA:Tag:natural=scree
+    natural=scrub: JA:Tag:natural=scrub
+    natural=spring: JA:Tag:natural=spring
      natural=tree: JA:Tag:natural=tree
      natural=tree_row: JA:Tag:natural=tree row
      natural=volcano: JA:Tag:natural=volcano
      natural=tree: JA:Tag:natural=tree
      natural=tree_row: JA:Tag:natural=tree row
      natural=volcano: JA:Tag:natural=volcano
+    natural=water: JA:Tag:natural=water
      natural=wetland: JA:Tag:natural=wetland
      natural=wood: JA:Tag:natural=wood
      natural=wetland: JA:Tag:natural=wetland
      natural=wood: JA:Tag:natural=wood
+    place=archipelago: JA:Tag:place=archipelago
+    place=city: JA:Tag:place=city
+    place=continent: JA:Tag:place=continent
+    place=country: JA:Tag:place=country
+    place=county: JA:Tag:place=county
+    place=hamlet: JA:Tag:place=hamlet
      place=island: JA:Tag:place=island
      place=islet: JA:Tag:place=islet
      place=island: JA:Tag:place=island
      place=islet: JA:Tag:place=islet
+    place=locality: JA:Tag:place=locality
      place=neighbourhood: JA:Tag:place=neighbourhood
      place=neighbourhood: JA:Tag:place=neighbourhood
+    place=state: JA:Tag:place=state
      place=suburb: JA:Tag:place=suburb
      place=suburb: JA:Tag:place=suburb
+    place=town: JA:Tag:place=town
+    place=village: JA:Tag:place=village
      power=generator: JA:Tag:power=generator
      public_transport=platform: JA:Tag:public transport=platform
      power=generator: JA:Tag:power=generator
      public_transport=platform: JA:Tag:public transport=platform
+    public_transport=station: JA:Tag:public transport=station
+    public_transport=stop_area: JA:Tag:public transport=stop area
+    public_transport=stop_position: JA:Tag:public transport=stop position
+    railway=abandoned: JA:Tag:railway=abandoned
      railway=crossing: JA:Tag:railway=crossing
      railway=crossing: JA:Tag:railway=crossing
+    railway=disused: JA:Tag:railway=disused
+    railway=funicular: JA:Tag:railway=funicular
+    railway=halt: JA:Tag:railway=halt
      railway=level_crossing: JA:Tag:railway=level crossing
      railway=level_crossing: JA:Tag:railway=level crossing
+    railway=light_rail: JA:Tag:railway=light rail
+    railway=miniature: JA:Tag:railway=miniature
      railway=monorail: JA:Tag:railway=monorail
      railway=monorail: JA:Tag:railway=monorail
+    railway=narrow_gauge: JA:Tag:railway=narrow gauge
+    railway=platform: JA:Tag:railway=platform
+    railway=preserved: JA:Tag:railway=preserved
      railway=rail: JA:Tag:railway=rail
      railway=rail: JA:Tag:railway=rail
+    railway=roundhouse: JA:Tag:railway=roundhouse
      railway=station: JA:Tag:railway=station
      railway=station: JA:Tag:railway=station
+    railway=stop: JA:Tag:railway=stop
      railway=subway: JA:Tag:railway=subway
      railway=subway: JA:Tag:railway=subway
+    railway=subway_entrance: JA:Tag:railway=subway entrance
      railway=tram: JA:Tag:railway=tram
      railway=tram: JA:Tag:railway=tram
+    railway=tram_stop: JA:Tag:railway=tram stop
+    railway=turntable: JA:Tag:railway=turntable
+    route=bicycle: JA:Tag:route=bicycle
+    route=bus: JA:Tag:route=bus
+    route=railway: JA:Tag:route=railway
      route=road: JA:Tag:route=road
      route=road: JA:Tag:route=road
+    route=train: JA:Tag:route=train
+    service=alley: JA:Tag:service=alley
      service=parking_aisle: JA:Tag:service=parking aisle
      service=siding: JA:Tag:service=siding
      service=spur: JA:Tag:service=spur
      service=parking_aisle: JA:Tag:service=parking aisle
      service=siding: JA:Tag:service=siding
      service=spur: JA:Tag:service=spur
@@ -4049,22 +6114,38 @@ ja:
      shop=deli: JA:Tag:shop=deli
      shop=department_store: JA:Tag:shop=department store
      shop=doityourself: JA:Tag:shop=doityourself
      shop=deli: JA:Tag:shop=deli
      shop=department_store: JA:Tag:shop=department store
      shop=doityourself: JA:Tag:shop=doityourself
+    shop=estate_agent: JA:Tag:shop=estate agent
      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=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=greengrocer: JA:Tag:shop=greengrocer
      shop=hairdresser: JA:Tag:shop=hairdresser
      shop=kiosk: JA:Tag:shop=kiosk
      shop=massage: JA:Tag:shop=massage
      shop=hairdresser: JA:Tag:shop=hairdresser
      shop=kiosk: JA:Tag:shop=kiosk
      shop=massage: JA:Tag:shop=massage
+    shop=money_lender: JA:Tag:shop=money lender
+    shop=moneylender: JA:Tag:shop=moneylender
      shop=motorcycle: JA:Tag:shop=motorcycle
      shop=outdoor: JA:Tag:shop=outdoor
      shop=motorcycle: JA:Tag:shop=motorcycle
      shop=outdoor: JA:Tag:shop=outdoor
+    shop=pastry: JA:Tag:shop=pastry
      shop=pet: JA:Tag:shop=pet
      shop=second_hand: JA:Tag:shop=second hand
      shop=supermarket: JA:Tag:shop=supermarket
      shop=pet: JA:Tag:shop=pet
      shop=second_hand: JA:Tag:shop=second hand
      shop=supermarket: JA:Tag:shop=supermarket
+    shop=tailor: JA:Tag:shop=tailor
      shop=tobacco: JA:Tag:shop=tobacco
      shop=tobacco: JA:Tag:shop=tobacco
+    shop=vacant: JA:Tag:shop=vacant
      shop=variety_store: JA:Tag:shop=variety store
      shop=variety_store: JA:Tag:shop=variety store
+    shop=watches: JA:Tag:shop=watches
+    ski=designated: JA:Tag:ski=designated
+    snowmobile=designated: JA:Tag:snowmobile=designated
+    sport=10pin: JA:Tag:sport=10pin
+    sport=judo: JA:Tag:sport=judo
+    sport=sailing: JA:Tag:sport=sailing
+    sport=water_ski: JA:Tag:sport=water ski
+    tourism=artwork: JA:Tag:tourism=artwork
      tourism=camp_site: JA:Tag:tourism=camp site
      tourism=camp_site: JA:Tag:tourism=camp site
+    tourism=caravan_site: JA:Tag:tourism=caravan site
      tourism=hostel: JA:Tag:tourism=hostel
      tourism=hotel: JA:Tag:tourism=hotel
      tourism=information: JA:Tag:tourism=information
      tourism=hostel: JA:Tag:tourism=hostel
      tourism=hotel: JA:Tag:tourism=hotel
      tourism=information: JA:Tag:tourism=information
@@ -4072,35 +6153,55 @@ ja:
      tourism=picnic_site: JA:Tag:tourism=picnic site
      tourism=viewpoint: JA:Tag:tourism=viewpoint
      tunnel=culvert: JA:Tag:tunnel=culvert
      tourism=picnic_site: JA:Tag:tourism=picnic site
      tourism=viewpoint: JA:Tag:tourism=viewpoint
      tunnel=culvert: JA:Tag:tunnel=culvert
+    type=public_transport: JA:Tag:type=public transport
+    vending=parking_tickets: JA:Tag:vending=parking tickets
+    water=river: JA:Tag:water=river
      waterway=canal: JA:Tag:waterway=canal
      waterway=dam: JA:Tag:waterway=dam
      waterway=ditch: JA:Tag:waterway=ditch
      waterway=canal: JA:Tag:waterway=canal
      waterway=dam: JA:Tag:waterway=dam
      waterway=ditch: JA:Tag:waterway=ditch
+    waterway=dock: JA:Tag:waterway=dock
      waterway=drain: JA:Tag:waterway=drain
      waterway=lock_gate: JA:Tag:waterway=lock gate
      waterway=drain: JA:Tag:waterway=drain
      waterway=lock_gate: JA:Tag:waterway=lock gate
+    waterway=river: JA:Tag:waterway=river
      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:
    key:
      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:
    key:
+    aerialway: Ko:Key:aerialway
      ele: Ko:Key:ele
      wikipedia: Ko:Key:wikipedia
    tag:
      ele: Ko:Key:ele
      wikipedia: Ko:Key:wikipedia
    tag:
+    aerialway=cable_car: Ko:Tag:aerialway=cable car
      craft=tailor: Ko:Tag:craft=tailor
      craft=tailor: Ko:Tag:craft=tailor
+    highway=motorway: Ko:Tag:highway=motorway
+    highway=track: Ko:Tag:highway=track
+    highway=trunk: Ko:Tag:highway=trunk
      shop=garden_centre: Ko:Tag:shop=garden centre
      shop=gift: Ko:Tag:shop=gift
  lt:
    key:
      cycleway: Lt:Key:cycleway
      shop=garden_centre: Ko:Tag:shop=garden centre
      shop=gift: Ko:Tag:shop=gift
  lt:
    key:
      cycleway: Lt:Key:cycleway
+lv:
+  key:
+    highway: Lv:Key:highway
  nl:
    key:
      AND_nosr_r: NL:Key:AND nosr r
      addr: NL:Key:addr
  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
      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
      colour: NL:Key:colour
      craft: NL:Key:craft
      crossing: NL:Key:crossing
@@ -4109,6 +6210,7 @@ nl:
      emergency: NL:Key:emergency
      fence_type: NL:Key:fence type
      fenced: NL:Key:fenced
      emergency: NL:Key:emergency
      fence_type: NL:Key:fence type
      fenced: NL:Key:fenced
+    internet_access: NL:Key:internet access
      landuse: NL:Key:landuse
      leisure: NL:Key:leisure
      man_made: NL:Key:man made
      landuse: NL:Key:landuse
      leisure: NL:Key:leisure
      man_made: NL:Key:man made
@@ -4116,6 +6218,7 @@ nl:
      name: NL:Key:name
      natural: NL:Key:natural
      office: NL:Key:office
      name: NL:Key:name
      natural: NL:Key:natural
      office: NL:Key:office
+    power_supply:schedule: NL:Key:power supply:schedule
      public_transport: NL:Key:public transport
      route_master: NL:Key:route master
      scenic: NL:Key:scenic
      public_transport: NL:Key:public transport
      route_master: NL:Key:route master
      scenic: NL:Key:scenic
@@ -4178,11 +6281,14 @@ pl:
      abutters: Pl:Key:abutters
      access: Pl:Key:access
      addr: Pl:Key:addr
      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: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: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:place: Pl:Key:addr:place
      addr:postcode: Pl:Key:addr:postcode
      addr:province: Pl:Key:addr:province
@@ -4190,6 +6296,8 @@ pl:
      addr:street: Pl:Key:addr:street
      addr:subdistrict: Pl:Key:addr:subdistrict
      addr:suburb: Pl:Key:addr:suburb
      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
      aerialway: Pl:Key:aerialway
      aeroway: Pl:Key:aeroway
      alt_name: Pl:Key:alt name
@@ -4210,12 +6318,15 @@ pl:
      bridge: Pl:Key:bridge
      building: Pl:Key:building
      building:cullis:height: Pl:Key:building:cullis:height
      bridge: Pl:Key:bridge
      building: Pl:Key:building
      building:cullis:height: Pl:Key:building:cullis:height
+    building:flats: Pl:Key:building:flats
      building:levels: Pl:Key:building:levels
      building:material: Pl:Key:building:material
      building:min_level: Pl:Key:building:min level
      building:part: Pl:Key:building:part
      bunker_type: Pl:Key:bunker type
      building:levels: Pl:Key:building:levels
      building:material: Pl:Key:building:material
      building:min_level: Pl:Key:building:min level
      building:part: Pl:Key:building:part
      bunker_type: Pl:Key:bunker type
+    bus: Pl:Key:bus
      busway: Pl:Key:busway
      busway: Pl:Key:busway
+    button_operated: Pl:Key:button operated
      capacity: Pl:Key:capacity
      circumference: Pl:Key:circumference
      colour: Pl:Key:colour
      capacity: Pl:Key:capacity
      circumference: Pl:Key:circumference
      colour: Pl:Key:colour
@@ -4223,6 +6334,7 @@ pl:
      construction: Pl:Key:construction
      contact: Pl:Key:contact
      covered: Pl:Key:covered
      construction: Pl:Key:construction
      contact: Pl:Key:contact
      covered: Pl:Key:covered
+    craft: Pl:Key:craft
      crop: Pl:Key:crop
      crossing: Pl:Key:crossing
      cutting: Pl:Key:cutting
      crop: Pl:Key:crop
      crossing: Pl:Key:crossing
      cutting: Pl:Key:cutting
@@ -4232,6 +6344,8 @@ pl:
      designation: Pl:Key:designation
      destination: Pl:Key:destination
      diocese: Pl:Key:diocese
      designation: Pl:Key:designation
      destination: Pl:Key:destination
      diocese: Pl:Key:diocese
+    direction: Pl:Key:direction
+    dispensing: Pl:Key:dispensing
      ele: Pl:Key:ele
      electrified: Pl:Key:electrified
      embankment: Pl:Key:embankment
      ele: Pl:Key:ele
      electrified: Pl:Key:electrified
      embankment: Pl:Key:embankment
@@ -4239,6 +6353,7 @@ pl:
      end_date: Pl:Key:end date
      entrance: Pl:Key:entrance
      fee: Pl:Key:fee
      end_date: Pl:Key:end date
      entrance: Pl:Key:entrance
      fee: Pl:Key:fee
+    fence_type: Pl:Key:fence type
      fixme: Pl:Key:fixme
      flood_prone: Pl:Key:flood prone
      foot: Pl:Key:foot
      fixme: Pl:Key:fixme
      flood_prone: Pl:Key:flood prone
      foot: Pl:Key:foot
@@ -4254,11 +6369,30 @@ pl:
      inscription: Pl:Key:inscription
      intermittent: Pl:Key:intermittent
      is_in: Pl:Key:is in
      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
      lanes: Pl:Key:lanes
      lanes:psv: Pl:Key:lanes:psv
      junction: Pl:Key:junction
      kerb: Pl:Key:kerb
      landuse: Pl:Key:landuse
      lanes: Pl:Key:lanes
      lanes:psv: Pl:Key:lanes:psv
+    layer: Pl:Key:layer
+    leaf_type: Pl:Key:leaf type
      leisure: Pl:Key:leisure
      lit: Pl:Key:lit
      location: Pl:Key:location
      leisure: Pl:Key:leisure
      lit: Pl:Key:lit
      location: Pl:Key:location
@@ -4266,11 +6400,17 @@ pl:
      lock_name: Pl:Key:lock name
      man_made: Pl:Key:man made
      manhole: Pl:Key:manhole
      lock_name: Pl:Key:lock name
      man_made: Pl:Key:man made
      manhole: Pl:Key:manhole
+    maxaxleload: Pl:Key:maxaxleload
      maxheight: Pl:Key:maxheight
      maxspeed: Pl:Key:maxspeed
      maxstay: Pl:Key:maxstay
      maxheight: Pl:Key:maxheight
      maxspeed: Pl:Key:maxspeed
      maxstay: Pl:Key:maxstay
+    maxweight: Pl:Key:maxweight
+    maxwidth: Pl:Key:maxwidth
      min_height: Pl:Key:min height
      min_height: Pl:Key:min height
+    mofa: Pl:Key:mofa
      mooring: Pl:Key:mooring
      mooring: Pl:Key:mooring
+    moped: Pl:Key:moped
+    motorcycle: Pl:Key:motorcycle
      name: Pl:Key:name
      natural: Pl:Key:natural
      noexit: Pl:Key:noexit
      name: Pl:Key:name
      natural: Pl:Key:natural
      noexit: Pl:Key:noexit
@@ -4286,8 +6426,12 @@ pl:
      parking:lane: Pl:Key:parking:lane
      place: Pl:Key:place
      place_name: Pl:Key:place name
      parking:lane: Pl:Key:parking:lane
      place: Pl:Key:place
      place_name: Pl:Key:place name
+    playground: Pl:Key:playground
      population: Pl:Key:population
      power: Pl:Key:power
      population: Pl:Key:population
      power: Pl:Key:power
+    priority: Pl:Key:priority
+    produce: Pl:Key:produce
+    product: Pl:Key:product
      psv: Pl:Key:psv
      public_transport: Pl:Key:public transport
      railway: Pl:Key:railway
      psv: Pl:Key:psv
      public_transport: Pl:Key:public transport
      railway: Pl:Key:railway
@@ -4295,6 +6439,7 @@ pl:
      ramp: Pl:Key:ramp
      recycling_type: Pl:Key:recycling type
      religion: Pl:Key:religion
      ramp: Pl:Key:ramp
      recycling_type: Pl:Key:recycling type
      religion: Pl:Key:religion
+    repair: Pl:Key:repair
      resource: Pl:Key:resource
      roof:material: Pl:Key:roof:material
      route: Pl:Key:route
      resource: Pl:Key:resource
      roof:material: Pl:Key:roof:material
      route: Pl:Key:route
@@ -4304,10 +6449,16 @@ pl:
      second_hand: Pl:Key:second hand
      service: Pl:Key:service
      service_times: Pl:Key:service times
      second_hand: Pl:Key:second hand
      service: Pl:Key:service
      service_times: Pl:Key:service times
+    shelter: Pl:Key:shelter
+    shelter_type: Pl:Key:shelter type
      shop: Pl:Key:shop
      sidewalk: Pl:Key:sidewalk
      smoothness: Pl:Key:smoothness
      shop: Pl:Key:shop
      sidewalk: Pl:Key:sidewalk
      smoothness: Pl:Key:smoothness
+    social_facility: Pl:Key:social facility
+    social_facility:for: Pl:Key:social facility:for
      source:date: Pl:Key:source:date
      source:date: Pl:Key:source:date
+    source:maxspeed: PL:Key:source:maxspeed
+    sport: Pl:Key:sport
      start_date: Pl:Key:start date
      step_count: Pl:Key:step count
      surface: Pl:Key:surface
      start_date: Pl:Key:start date
      step_count: Pl:Key:step count
      surface: Pl:Key:surface
@@ -4319,10 +6470,23 @@ pl:
      tourism: Pl:Key:tourism
      tracktype: Pl:Key:tracktype
      traffic_calming: Pl:Key:traffic calming
      tourism: Pl:Key:tourism
      tracktype: Pl:Key:tracktype
      traffic_calming: Pl:Key:traffic calming
+    traffic_signals: Pl:Key:traffic signals
+    traffic_signals:arrow: Pl:Key:traffic signals:arrow
+    traffic_signals:direction: Pl:Key:traffic signals:direction
+    traffic_signals:floor_vibration: Pl:Key:traffic signals:floor vibration
+    traffic_signals:minimap: Pl:Key:traffic signals:minimap
+    traffic_signals:sound: Pl:Key:traffic signals:sound
+    traffic_signals:vibration: Pl:Key:traffic signals:vibration
+    train: Pl:Key:train
+    tram: Pl:Key:tram
+    trolleybus: Pl:Key:trolleybus
+    tunnel: Pl:Key:tunnel
      turn: Pl:Key:turn
      turn: Pl:Key:turn
+    turn:lanes: Pl:Key:turn:lanes
      type: Pl:Key:type
      url: Pl:Key:url
      usage: Pl:Key:usage
      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
      voltage: Pl:Key:voltage
      waterway: Pl:Key:waterway
      website: Pl:Key:website
@@ -4335,6 +6499,7 @@ pl:
      access=designated: Pl:Tag:access=designated
      access=official: Pl:Tag:access=official
      access=private: Pl:Tag:access=private
      access=designated: Pl:Tag:access=designated
      access=official: Pl:Tag:access=official
      access=private: Pl:Tag:access=private
+    advertising=column: Pl:Tag:advertising=column
      aeroway=hangar: Pl:Tag:aeroway=hangar
      amenity=atm: Pl:Tag:amenity=atm
      amenity=baby_hatch: Pl:Tag:amenity=baby hatch
      aeroway=hangar: Pl:Tag:aeroway=hangar
      amenity=atm: Pl:Tag:amenity=atm
      amenity=baby_hatch: Pl:Tag:amenity=baby hatch
@@ -4343,6 +6508,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=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
      amenity=compressed_air: Pl:Tag:amenity=compressed air
      amenity=crypt: Pl:Tag:amenity=crypt
      amenity=doctors: Pl:Tag:amenity=doctors
@@ -4350,7 +6516,9 @@ pl:
      amenity=ferry_terminal: Pl:Tag:amenity=ferry terminal
      amenity=fire_station: Pl:Tag:amenity=fire station
      amenity=fuel: Pl:Tag:amenity=fuel
      amenity=ferry_terminal: Pl:Tag:amenity=ferry terminal
      amenity=fire_station: Pl:Tag:amenity=fire station
      amenity=fuel: Pl:Tag:amenity=fuel
+    amenity=game_feeding: Pl:Tag:amenity=game feeding
      amenity=grave_yard: Pl:Tag:amenity=grave yard
      amenity=grave_yard: Pl:Tag:amenity=grave yard
+    amenity=marketplace: Pl:Tag:amenity=marketplace
      amenity=parking: Pl:Tag:amenity=parking
      amenity=parking_entrance: Pl:Tag:amenity=parking entrance
      amenity=parking_space: Pl:Tag:amenity=parking space
      amenity=parking: Pl:Tag:amenity=parking
      amenity=parking_entrance: Pl:Tag:amenity=parking entrance
      amenity=parking_space: Pl:Tag:amenity=parking space
@@ -4360,9 +6528,12 @@ pl:
      amenity=post_office: Pl:Tag:amenity=post office
      amenity=recycling: Pl:Tag:amenity=recycling
      amenity=school: Pl:Tag:amenity=school
      amenity=post_office: Pl:Tag:amenity=post office
      amenity=recycling: Pl:Tag:amenity=recycling
      amenity=school: Pl:Tag:amenity=school
+    amenity=shelter: Pl:Tag:amenity=shelter
+    amenity=social_facility: Pl:Tag:amenity=social facility
      amenity=taxi: Pl:Tag:amenity=taxi
      amenity=vending_machine: Pl:Tag:amenity=vending machine
      amenity=waste_disposal: Pl:Tag:amenity=waste disposal
      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
      atm=yes: Pl:Tag:atm=yes
      barrier=block: Pl:Tag:barrier=block
      barrier=bollard: Pl:Tag:barrier=bollard
@@ -4376,6 +6547,7 @@ pl:
      barrier=fence: Pl:Tag:barrier=fence
      barrier=gate: Pl:Tag:barrier=gate
      barrier=guard_rail: Pl:Tag:barrier=guard rail
      barrier=fence: Pl:Tag:barrier=fence
      barrier=gate: Pl:Tag:barrier=gate
      barrier=guard_rail: Pl:Tag:barrier=guard rail
+    barrier=handrail: Pl:Tag:barrier=handrail
      barrier=hedge: Pl:Tag:barrier=hedge
      barrier=kerb: Pl:Tag:barrier=kerb
      barrier=lift_gate: Pl:Tag:barrier=lift gate
      barrier=hedge: Pl:Tag:barrier=hedge
      barrier=kerb: Pl:Tag:barrier=kerb
      barrier=lift_gate: Pl:Tag:barrier=lift gate
@@ -4383,6 +6555,7 @@ pl:
      barrier=toll_booth: Pl:Tag:barrier=toll booth
      barrier=turnstile: Pl:Tag:barrier=turnstile
      barrier=wall: Pl:Tag:barrier=wall
      barrier=toll_booth: Pl:Tag:barrier=toll booth
      barrier=turnstile: Pl:Tag:barrier=turnstile
      barrier=wall: Pl:Tag:barrier=wall
+    bicycle=use_sidepath: Pl:Tag:bicycle=use sidepath
      boundary=administrative: Pl:Tag:boundary=administrative
      boundary=religious_administration: Pl:Tag:boundary=religious administration
      building=apartments: Pl:Tag:building=apartments
      boundary=administrative: Pl:Tag:boundary=administrative
      boundary=religious_administration: Pl:Tag:boundary=religious administration
      building=apartments: Pl:Tag:building=apartments
@@ -4424,6 +6597,9 @@ pl:
      building=transportation: Pl:Tag:building=transportation
      building=university: Pl:Tag:building=university
      building=warehouse: Pl:Tag:building=warehouse
      building=transportation: Pl:Tag:building=transportation
      building=university: Pl:Tag:building=university
      building=warehouse: Pl:Tag:building=warehouse
+    craft=agricultural_engines: Pl:Tag:craft=agricultural engines
+    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
      emergency=defibrillator: Pl:Tag:emergency=defibrillator
      emergency=fire_extinguisher: Pl:Tag:emergency=fire extinguisher
      emergency=fire_flapper: Pl:Tag:emergency=fire flapper
@@ -4442,6 +6618,7 @@ pl:
      highway=give_way: Pl:Tag:highway=give way
      highway=living_street: Pl:Tag:highway=living street
      highway=milestone: Pl:Tag:highway=milestone
      highway=give_way: Pl:Tag:highway=give way
      highway=living_street: Pl:Tag:highway=living street
      highway=milestone: Pl:Tag:highway=milestone
+    highway=mini_roundabout: Pl:Tag:highway=mini roundabout
      highway=motorway: Pl:Tag:highway=motorway
      highway=path: Pl:Tag:highway=path
      highway=pedestrian: Pl:Tag:highway=pedestrian
      highway=motorway: Pl:Tag:highway=motorway
      highway=path: Pl:Tag:highway=path
      highway=pedestrian: Pl:Tag:highway=pedestrian
@@ -4453,10 +6630,14 @@ pl:
      highway=secondary: Pl:Tag:highway=secondary
      highway=service: Pl:Tag:highway=service
      highway=speed_camera: Pl:Tag:highway=speed camera
      highway=secondary: Pl:Tag:highway=secondary
      highway=service: Pl:Tag:highway=service
      highway=speed_camera: Pl:Tag:highway=speed camera
+    highway=steps: Pl:Tag:highway=steps
+    highway=stop: Pl:Tag:highway=stop
      highway=street_lamp: Pl:Tag:highway=street lamp
      highway=tertiary: Pl:Tag:highway=tertiary
      highway=track: Pl:Tag:highway=track
      highway=street_lamp: Pl:Tag:highway=street lamp
      highway=tertiary: Pl:Tag:highway=tertiary
      highway=track: Pl:Tag:highway=track
+    highway=traffic_signals: Pl:Tag:highway=traffic signals
      highway=trunk: Pl:Tag:highway=trunk
      highway=trunk: Pl:Tag:highway=trunk
+    highway=turning_circle: Pl:Tag:highway=turning circle
      highway=unclassified: Pl:Tag:highway=unclassified
      historic=battlefield: Pl:Tag:historic=battlefield
      historic=city_gate: Pl:Tag:historic=city gate
      highway=unclassified: Pl:Tag:highway=unclassified
      historic=battlefield: Pl:Tag:historic=battlefield
      historic=city_gate: Pl:Tag:historic=city gate
@@ -4471,20 +6652,29 @@ pl:
      landuse=brownfield: Pl:Tag:landuse=brownfield
      landuse=cemetery: Pl:Tag:landuse=cemetery
      landuse=commercial: Pl:Tag:landuse=commercial
      landuse=brownfield: Pl:Tag:landuse=brownfield
      landuse=cemetery: Pl:Tag:landuse=cemetery
      landuse=commercial: Pl:Tag:landuse=commercial
+    landuse=construction: Pl:Tag:landuse=construction
+    landuse=depot: Pl:Tag:landuse=depot
      landuse=farm: Pl:Tag:landuse=farm
      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=farmyard: Pl:Tag:landuse=farmyard
      landuse=forest: Pl:Tag:landuse=forest
+    landuse=grass: Pl:Tag:landuse=grass
      landuse=greenhouse_horticulture: Pl:Tag:landuse=greenhouse horticulture
      landuse=landfill: Pl:Tag:landuse=landfill
      landuse=meadow: Pl:Tag:landuse=meadow
      landuse=plant_nursery: Pl:Tag:landuse=plant nursery
      landuse=quarry: Pl:Tag:landuse=quarry
      landuse=railway: Pl:Tag:landuse=railway
      landuse=greenhouse_horticulture: Pl:Tag:landuse=greenhouse horticulture
      landuse=landfill: Pl:Tag:landuse=landfill
      landuse=meadow: Pl:Tag:landuse=meadow
      landuse=plant_nursery: Pl:Tag:landuse=plant nursery
      landuse=quarry: Pl:Tag:landuse=quarry
      landuse=railway: Pl:Tag:landuse=railway
+    landuse=recreation_ground: Pl:Tag:landuse=recreation ground
      landuse=religious: Pl:Tag:landuse=religious
      landuse=residential: Pl:Tag:landuse=residential
      landuse=retail: Pl:Tag:landuse=retail
      landuse=religious: Pl:Tag:landuse=religious
      landuse=residential: Pl:Tag:landuse=residential
      landuse=retail: Pl:Tag:landuse=retail
+    landuse=village_green: Pl:Tag:landuse=village green
      leisure=firepit: Pl:Tag:leisure=firepit
      leisure=fishing: Pl:Tag:leisure=fishing
      leisure=firepit: Pl:Tag:leisure=firepit
      leisure=fishing: Pl:Tag:leisure=fishing
+    leisure=pitch: Pl:Tag:leisure=pitch
+    leisure=playground: Pl:Tag:leisure=playground
+    leisure=tanning_salon: Pl:Tag:leisure=tanning salon
      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=adit: Pl:Tag:man made=adit
      man_made=cross: Pl:Tag:man made=cross
      man_made=cutline: Pl:Tag:man made=cutline
@@ -4496,13 +6686,16 @@ pl:
      man_made=watermill: Pl:Tag:man made=watermill
      man_made=windmill: Pl:Tag:man made=windmill
      man_made=windpump: Pl:Tag:man made=windpump
      man_made=watermill: Pl:Tag:man made=watermill
      man_made=windmill: Pl:Tag:man made=windmill
      man_made=windpump: Pl:Tag:man made=windpump
+    man_made=works: Pl:Tag:man made=works
      military=bunker: Pl:Tag:military=bunker
      mooring=ferry: Pl:Tag:mooring=ferry
      military=bunker: Pl:Tag:military=bunker
      mooring=ferry: Pl:Tag:mooring=ferry
+    natural=arete: Pl:Tag:natural=arete
      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=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=ridge: Pl:Tag:natural=ridge
      natural=scree: Pl:Tag:natural=scree
      natural=scrub: Pl:Tag:natural=scrub
      natural=sinkhole: Pl:Tag:natural=sinkhole
      natural=scree: Pl:Tag:natural=scree
      natural=scrub: Pl:Tag:natural=scrub
      natural=sinkhole: Pl:Tag:natural=sinkhole
@@ -4510,6 +6703,7 @@ pl:
      natural=tree_row: Pl:Tag:natural=tree row
      natural=wetland: Pl:Tag:natural=wetland
      natural=wood: Pl:Tag:natural=wood
      natural=tree_row: Pl:Tag:natural=tree row
      natural=wetland: Pl:Tag:natural=wetland
      natural=wood: Pl:Tag:natural=wood
+    office=religion: Pl:Tag:office=religion
      place=city: Pl:Tag:place=city
      place=farm: Pl:Tag:place=farm
      place=hamlet: Pl:Tag:place=hamlet
      place=city: Pl:Tag:place=city
      place=farm: Pl:Tag:place=farm
      place=hamlet: Pl:Tag:place=hamlet
@@ -4524,6 +6718,7 @@ pl:
      power=minor_line: Pl:Tag:power=minor line
      power=pole: Pl:Tag:power=pole
      power=sub_station: Pl:Tag:power=sub station
      power=minor_line: Pl:Tag:power=minor line
      power=pole: Pl:Tag:power=pole
      power=sub_station: Pl:Tag:power=sub station
+    power=substation: Pl:Tag:power=substation
      power=tower: Pl:Tag:power=tower
      power=transformer: Pl:Tag:power=transformer
      public_transport=platform: Pl:Tag:public transport=platform
      power=tower: Pl:Tag:power=tower
      power=transformer: Pl:Tag:power=transformer
      public_transport=platform: Pl:Tag:public transport=platform
@@ -4544,7 +6739,9 @@ pl:
      service=spur: Pl:Tag:service=spur
      service=yard: Pl:Tag:service=yard
      shop=baby_goods: Pl:Tag:shop=baby goods
      service=spur: Pl:Tag:service=spur
      service=yard: Pl:Tag:service=yard
      shop=baby_goods: Pl:Tag:shop=baby goods
+    shop=bakery: Pl:Tag:shop=bakery
      shop=bathroom_furnishing: Pl:Tag:shop=bathroom furnishing
      shop=bathroom_furnishing: Pl:Tag:shop=bathroom furnishing
+    shop=beauty: Pl:Tag:shop=beauty
      shop=bicycle: Pl:Tag:shop=bicycle
      shop=confectionery: Pl:Tag:shop=confectionery
      shop=convenience: Pl:Tag:shop=convenience
      shop=bicycle: Pl:Tag:shop=bicycle
      shop=confectionery: Pl:Tag:shop=confectionery
      shop=convenience: Pl:Tag:shop=convenience
@@ -4552,13 +6749,17 @@ pl:
      shop=funeral_directors: Pl:Tag:shop=funeral directors
      shop=furniture: Pl:Tag:shop=furniture
      shop=general: Pl:Tag:shop=general
      shop=funeral_directors: Pl:Tag:shop=funeral directors
      shop=furniture: Pl:Tag:shop=furniture
      shop=general: Pl:Tag:shop=general
+    shop=haberdashery: PL:Tag:shop=haberdashery
+    shop=hairdresser: Pl:Tag:shop=hairdresser
      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=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=tea: Pl:Tag:shop=tea
      shop=travel_agency: Pl:Tag:shop=travel agency
      shop=variety_store: Pl:Tag:shop=variety store
      shop=travel_agency: Pl:Tag:shop=travel agency
      shop=variety_store: Pl:Tag:shop=variety store
+    social_facility=outreach: Pl:Tag:social facility=outreach
      sport=aikido: Pl:Tag:sport=aikido
      sport=climbing: Pl:Tag:sport=climbing
      tourism=artwork: Pl:Tag:tourism=artwork
      sport=aikido: Pl:Tag:sport=aikido
      sport=climbing: Pl:Tag:sport=climbing
      tourism=artwork: Pl:Tag:tourism=artwork
@@ -4578,6 +6779,7 @@ pl:
      tourism=zoo: Pl:Tag:tourism=zoo
      tunnel=culvert: Pl:Tag:tunnel=culvert
      type=public_transport: Pl:Tag:type=public transport
      tourism=zoo: Pl:Tag:tourism=zoo
      tunnel=culvert: Pl:Tag:tunnel=culvert
      type=public_transport: Pl:Tag:type=public transport
+    wall=noise_barrier: Pl:Tag:wall=noise barrier
      waterway=boatyard: Pl:Tag:waterway=boatyard
      waterway=canal: Pl:Tag:waterway=canal
      waterway=dam: Pl:Tag:waterway=dam
      waterway=boatyard: Pl:Tag:waterway=boatyard
      waterway=canal: Pl:Tag:waterway=canal
      waterway=dam: Pl:Tag:waterway=dam
@@ -4604,21 +6806,50 @@ pl:
      wood=mixed: Pl:Tag:wood=mixed
  pt:
    key:
      wood=mixed: Pl:Tag:wood=mixed
  pt:
    key:
+    IBGE:CD_ADMINIS: Pt:Key:IBGE:CD ADMINIS
+    IBGE:GEOCODIGO: Pt:Key:IBGE:GEOCODIGO
      country: Pt:Key:country
      country: Pt:Key:country
+    dispensing: Pt:Key:dispensing
+    driving_side: Pt:Key:driving side
+    heritage: Pt:Key:heritage
      highway: Pt:Key:highway
      highway: Pt:Key:highway
+    iata: Pt:Key:iata
+    icao: Pt:Key:icao
+    maxheight:legal: Pt:Key:maxheight:legal
+    maxheight:marine: Pt:Key:maxheight:marine
+    maxheight:physical: Pt:Key:maxheight:physical
+    noexit: Pt:Key:noexit
      postal_code: Pt:Key:postal code
      ref:bag: Pt:Key:ref:bag
      postal_code: Pt:Key:postal code
      ref:bag: Pt:Key:ref:bag
+    religion: Pt:Key:religion
      source: Pt:Key:source
      sport: Pt:Key:sport
      tiger: Pt:Key:tiger
      source: Pt:Key:source
      sport: Pt:Key:sport
      tiger: Pt:Key:tiger
+    tracktype: Pt:Key:tracktype
+    waterway: Pt:Key:waterway
      wikidata: Pt:Key:wikidata
    tag:
      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=bicycle_parking: Pt:Tag:amenity=bicycle parking
+    amenity=crematorium: Pt:Tag:amenity=crematorium
      amenity=hospital: Pt:Tag:amenity=hospital
      amenity=hospital: Pt:Tag:amenity=hospital
+    amenity=marketplace: Pt:Tag:amenity=marketplace
+    amenity=parking: Pt:Tag:amenity=parking
+    amenity=parking_entrance: Pt:Tag:amenity=parking entrance
+    craft=upholsterer: Pt:Tag:craft=upholsterer
+    highway=motorway: Pt:Tag:highway=motorway
      highway=primary: Pt:Tag:highway=primary
      highway=primary: Pt:Tag:highway=primary
+    highway=residential: Pt:Tag:highway=residential
+    highway=secondary: Pt:Tag:highway=secondary
+    highway=tertiary: Pt:Tag:highway=tertiary
+    highway=trunk: Pt:Tag:highway=trunk
+    highway=unclassified: Pt:Tag:highway=unclassified
      leisure=fishing: Pt:Tag:leisure=fishing
      leisure=garden: Pt:Tag:leisure=garden
      leisure=golf_course: Pt:Tag:leisure=golf course
      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
      leisure=marina: Pt:Tag:leisure=marina
      leisure=nature_reserve: Pt:Tag:leisure=nature reserve
      leisure=park: Pt:Tag:leisure=park
@@ -4630,19 +6861,56 @@ pt:
      leisure=track: Pt:Tag:leisure=track
      leisure=water_park: Pt:Tag:leisure=water park
      natural=coastline: Pt:Tag:natural=coastline
      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
+    shop=jewelry: Pt:Tag:shop=jewelry
+    shop=lottery: Pt:Tag:shop=lottery
+    shop=perfumery: Pt:Tag:shop=perfumery
+    shop=watches: Pt:Tag:shop=watches
      sport=golf: Pt:Tag:sport=golf
      sport=golf: Pt:Tag:sport=golf
+    traffic_calming=table: Pt:Tag:traffic calming=table
+    waterway=river: Pt:Tag:waterway=river
+    waterway=riverbank: Pt:Tag:waterway=riverbank
+    waterway=stream: Pt:Tag:waterway=stream
+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
  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
      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: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
      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
      amenity: Pt-br:Key:amenity
      area: Pt-br:Key:area
      barrier: Pt-br:Key:barrier
@@ -4654,10 +6922,16 @@ pt-br:
      bridge: Pt-br:Key:bridge
      building: Pt-br:Key:building
      building:levels: Pt-br:Key:building:levels
      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
      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
      craft: Pt-br:Key:craft
      created_by: Pt-br:Key:created by
      crossing: Pt-br:Key:crossing
@@ -4674,6 +6948,7 @@ pt-br:
      fishing: Pt-br:Key:fishing
      foot: Pt-br:Key:foot
      frequency: Pt-br:Key:frequency
      fishing: Pt-br:Key:fishing
      foot: Pt-br:Key:foot
      frequency: Pt-br:Key:frequency
+    generator:method: Pt-br:Key:generator:method
      geological: Pt-br:Key:geological
      hgv: Pt-br:Key:hgv
      highway: Pt-br:Key:highway
      geological: Pt-br:Key:geological
      hgv: Pt-br:Key:hgv
      highway: Pt-br:Key:highway
@@ -4683,15 +6958,21 @@ pt-br:
      icao: Pt-br:Key:icao
      ice_road: Pt-br:Key:ice road
      incline: Pt-br:Key:incline
      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
      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
      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
      lock: Pt-br:Key:lock
      man_made: Pt-br:Key:man made
      maxdraught: Pt-br:Key:maxdraught
@@ -4703,15 +6984,25 @@ pt-br:
      maxweight: Pt-br:Key:maxweight
      military: Pt-br:Key:military
      mooring: Pt-br:Key:mooring
      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
      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
      name: Pt-br:Key:name
+    nat_name: Pt-br:Key:nat name
+    nat_ref: Pt-br:Key:nat ref
      natural: Pt-br:Key:natural
      natural: Pt-br:Key:natural
+    ncn_ref: Pt-br:Key:ncn ref
      noname: Pt-br:Key:noname
      office: Pt-br:Key:office
      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
      oneway: Pt-br:Key:oneway
      operator: Pt-br:Key:operator
      overtaking: Pt-br:Key:overtaking
@@ -4724,6 +7015,20 @@ pt-br:
      public_transport: Pt-br:Key:public transport
      railway: Pt-br:Key:railway
      ref: Pt-br:Key:ref
      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
      religion: Pt-br:Key:religion
      route: Pt-br:Key:route
      sac_scale: Pt-br:Key:sac scale
@@ -4733,11 +7038,17 @@ pt-br:
      segregated: Pt-br:Key:segregated
      service: Pt-br:Key:service
      shop: Pt-br:Key:shop
      segregated: Pt-br:Key:segregated
      service: Pt-br:Key:service
      shop: Pt-br:Key:shop
+    short_name: Pt-br:Key:short name
      sidewalk: Pt-br:Key:sidewalk
      ski: Pt-br:Key:ski
      smoothness: Pt-br:Key:smoothness
      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
      sport: Pt-br:Key:sport
      surface: Pt-br:Key:surface
+    survey:date: Pt-br:Key:survey:date
+    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
      tourism: Pt-br:Key:tourism
      tracktype: Pt-br:Key:tracktype
      traffic_calming: Pt-br:Key:traffic calming
@@ -4745,6 +7056,7 @@ pt-br:
      tunnel: Pt-br:Key:tunnel
      type: Pt-br:Key:type
      usage: Pt-br:Key:usage
      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
      voltage: Pt-br:Key:voltage
      waterway: Pt-br:Key:waterway
      wheelchair: Pt-br:Key:wheelchair
@@ -4771,6 +7083,7 @@ pt-br:
      amenity=bbq: Pt-br:Tag:amenity=bbq
      amenity=bench: Pt-br:Tag:amenity=bench
      amenity=bicycke_parking: Pt-br:Tag:amenity=bicycke parking
      amenity=bbq: Pt-br:Tag:amenity=bbq
      amenity=bench: Pt-br:Tag:amenity=bench
      amenity=bicycke_parking: Pt-br:Tag:amenity=bicycke parking
+    amenity=bicycle_parking: Pt-br:Tag:amenity=bicycle parking
      amenity=bicycle_rental: Pt-br:Tag:amenity=bicycle rental
      amenity=biergarten: Pt-br:Tag:amenity=biergarten
      amenity=brothel: Pt-br:Tag:amenity=brothel
      amenity=bicycle_rental: Pt-br:Tag:amenity=bicycle rental
      amenity=biergarten: Pt-br:Tag:amenity=biergarten
      amenity=brothel: Pt-br:Tag:amenity=brothel
@@ -4790,6 +7103,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=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
      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
@@ -4819,6 +7133,7 @@ pt-br:
      amenity=pub: Pt-br:Tag:amenity=pub
      amenity=public_building: Pt-br:Tag:amenity=public building
      amenity=recycling: Pt-br:Tag:amenity=recycling
      amenity=pub: Pt-br:Tag:amenity=pub
      amenity=public_building: Pt-br:Tag:amenity=public building
      amenity=recycling: Pt-br:Tag:amenity=recycling
+    amenity=register_office: Pt-br:Tag:amenity=register office
      amenity=restaurant: Pt-br:Tag:amenity=restaurant
      amenity=sauna: Pt-br:Tag:amenity=sauna
      amenity=school: Pt-br:Tag:amenity=school
      amenity=restaurant: Pt-br:Tag:amenity=restaurant
      amenity=sauna: Pt-br:Tag:amenity=sauna
      amenity=school: Pt-br:Tag:amenity=school
@@ -4847,6 +7162,7 @@ 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
      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=administrative: Pt-br:Tag:boundary=administrative
      boundary=civil: Pt-br:Tag:boundary=civil
      boundary=maritime: Pt-br:Tag:boundary=maritime
@@ -4901,6 +7217,7 @@ pt-br:
      craft=tailor: Pt-br:Tag:craft=tailor
      craft=tiler: Pt-br:Tag:craft=tiler
      craft=tinsmith: Pt-br:Tag:craft=tinsmith
      craft=tailor: Pt-br:Tag:craft=tailor
      craft=tiler: Pt-br:Tag:craft=tiler
      craft=tinsmith: Pt-br:Tag:craft=tinsmith
+    craft=upholsterer: Pt-br:Tag:craft=upholsterer
      craft=upholstrer: Pt-br:Tag:craft=upholstrer
      craft=watchmaker: Pt-br:Tag:craft=watchmaker
      emergency=ambulance_station: Pt-br:Tag:emergency=ambulance station
      craft=upholstrer: Pt-br:Tag:craft=upholstrer
      craft=watchmaker: Pt-br:Tag:craft=watchmaker
      emergency=ambulance_station: Pt-br:Tag:emergency=ambulance station
@@ -4929,11 +7246,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=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=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
      highway=service: Pt-br:Tag:highway=service
      highway=services: Pt-br:Tag:highway=services
      highway=speed_camera: Pt-br:Tag:highway=speed camera
@@ -4944,6 +7263,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=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
      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
@@ -4964,6 +7284,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=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
      landuse=farmyard: Pt-br:Tag:landuse=farmyard
      landuse=forest: Pt-br:Tag:landuse=forest
      landuse=garages: Pt-br:Tag:landuse=garages
@@ -4987,6 +7308,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=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
      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
@@ -5004,6 +7326,7 @@ pt-br:
      leisure=water_park: Pt-br:Tag:leisure=water park
      man_made=adit: Pt-br:Tag:man made=adit
      man_made=antenna: Pt-br:Tag:man made=antenna
      leisure=water_park: Pt-br:Tag:leisure=water park
      man_made=adit: Pt-br:Tag:man made=adit
      man_made=antenna: Pt-br:Tag:man made=antenna
+    man_made=beacon: Pt-br:Tag:man made=beacon
      man_made=breakwater: Pt-br:Tag:man made=breakwater
      man_made=crane: Pt-br:Tag:man made=crane
      man_made=cutline: Pt-br:Tag:man made=cutline
      man_made=breakwater: Pt-br:Tag:man made=breakwater
      man_made=crane: Pt-br:Tag:man made=crane
      man_made=cutline: Pt-br:Tag:man made=cutline
@@ -5173,6 +7496,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=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
      shop=insurance: Pt-br:Tag:shop=insurance
      shop=interior_decoration: Pt-br:Tag:shop=interior decoration
      shop=jewelry: Pt-br:Tag:shop=jewelry
@@ -5208,6 +7532,7 @@ pt-br:
      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
      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
+    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
      sport=soccer: Pt-br:Tag:sport=soccer
      tourism=alpine_hut: Pt-br:Tag:tourism=alpine hut
      tourism=artwork: Pt-br:Tag:tourism=artwork
@@ -5226,6 +7551,7 @@ pt-br:
      tourism=theme_park: Pt-br:Tag:tourism=theme park
      tourism=viewpoint: Pt-br:Tag:tourism=viewpoint
      tourism=zoo: Pt-br:Tag:tourism=zoo
      tourism=theme_park: Pt-br:Tag:tourism=theme park
      tourism=viewpoint: Pt-br:Tag:tourism=viewpoint
      tourism=zoo: Pt-br:Tag:tourism=zoo
+    traffic_calming=table: Pt-br:Tag:traffic calming=table
      waterway=boatyard: Pt-br:Tag:waterway=boatyard
      waterway=canal: Pt-br:Tag:waterway=canal
      waterway=dam: Pt-br:Tag:waterway=dam
      waterway=boatyard: Pt-br:Tag:waterway=boatyard
      waterway=canal: Pt-br:Tag:waterway=canal
      waterway=dam: Pt-br:Tag:waterway=dam
@@ -5238,6 +7564,13 @@ 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
      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
  ro:
    key:
      amenity: Ro:Key:amenity
@@ -5252,14 +7585,24 @@ ru:
      abutters: RU:Key:abutters
      access: RU:Key:access
      addr: RU:Key:addr
      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: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: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
      addr:suburb: RU:Key:addr:suburb
      aerialway: RU:Key:aerialway
      aeroway: RU:Key:aeroway
+    alt_name: RU:Key:alt name
      amenity: RU:Key:amenity
      area: RU:Key:area
      area:highway: RU:Key:area:highway
      amenity: RU:Key:amenity
      area: RU:Key:area
      area:highway: RU:Key:area:highway
+    artwork_type: RU:Key:artwork type
      barrier: RU:Key:barrier
      bench: RU:Key:bench
      bicycle: RU:Key:bicycle
      barrier: RU:Key:barrier
      bench: RU:Key:bench
      bicycle: RU:Key:bicycle
@@ -5271,12 +7614,14 @@ ru:
      brand: RU:Key:brand
      bridge: RU:Key:bridge
      building: RU:Key:building
      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
      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
      cafe: RU:Key:cafe
      capacity: RU:Key:capacity
      check_date: RU:Key:check date
@@ -5286,6 +7631,9 @@ ru:
      comment: RU:Key:comment
      construction: RU:Key:construction
      contact: RU:Key:contact
      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
      covered: RU:Key:covered
      craft: RU:Key:craft
      created_by: RU:Key:created by
@@ -5295,49 +7643,79 @@ ru:
      cutting: RU:Key:cutting
      denomination: RU:Key:denomination
      description: RU:Key:description
      cutting: RU:Key:cutting
      denomination: RU:Key:denomination
      description: RU:Key:description
+    description:ru: RU:Key:description:ru
+    design:code:SPb: RU:Key:design:code:SPb
+    design:ref: RU:Key:design:ref
      designation: RU:Key:designation
      direction: RU:Key:direction
      dispensing: RU:Key:dispensing
      disused: RU:Key:disused
      designation: RU:Key:designation
      direction: RU:Key:direction
      dispensing: RU:Key:dispensing
      disused: RU:Key:disused
+    disused:shop: RU:Key:disused:shop
+    drinking_water: RU:Key:drinking water
      drive_in: RU:Key:drive in
      drive_in: RU:Key:drive in
+    driving_side: RU:Key:driving side
      ele: RU:Key:ele
      electrified: RU:Key:electrified
      embankment: RU:Key:embankment
      emergency: RU:Key:emergency
      entrance: RU:Key:entrance
      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
      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
      fee: RU:Key:fee
      fence_type: RU:Key:fence type
      ferry: RU:Key:ferry
+    fire_boundary: RU:Key:fire boundary
+    fire_object:type: RU:Key:fire object:type
+    fire_operator: RU:Key:fire operator
+    fire_rank: RU:Key:fire rank
      fixme: RU:Key:fixme
      foot: RU:Key:foot
      footway: RU:Key:footway
      ford: RU:Key:ford
      fuel: RU:Key:fuel
      fixme: RU:Key:fixme
      foot: RU:Key:foot
      footway: RU:Key:footway
      ford: RU:Key:ford
      fuel: RU:Key:fuel
+    fuel:cng: RU:Key:fuel:cng
+    fuel:lpg: RU:Key:fuel:lpg
+    furniture: RU:Key:furniture
+    further: RU:Key:further
+    further:access: RU:Key:further:access
+    further:vehicle: RU:Key:further:vehicle
+    gas: RU:Key:gas
      gauge: RU:Key:gauge
      generator:output: RU:Key:generator:output
      generator:source: RU:Key:generator:source
      gauge: RU:Key:gauge
      generator:output: RU:Key:generator:output
      generator:source: RU:Key:generator:source
+    grassland: RU:Key:grassland
      gvr:code: RU:Key:gvr:code
      handrail: RU:Key:handrail
      height: RU:Key:height
      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
      ice_road: RU:Key:ice road
      highway: RU:Key:highway
      historic: RU:Key:historic
      horse: RU:Key:horse
      ice_road: RU:Key:ice road
+    image: RU:Key:image
      incline: RU:Key:incline
      information: RU:Key:information
      inscription: RU:Key:inscription
      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
      kerb: RU:Key:kerb
      intermittent: RU:Key:intermittent
      internet_access: RU:Key:internet access
      junction: RU:Key:junction
      kerb: RU:Key:kerb
+    landmark: RU:Key:landmark
      landuse: RU:Key:landuse
      lanes: RU:Key:lanes
      layer: RU:Key:layer
      landuse: RU:Key:landuse
      lanes: RU:Key:lanes
      layer: RU:Key:layer
+    leaf_cycle: RU:Key:leaf cycle
+    leaf_type: RU:Key:leaf type
      leisure: RU:Key:leisure
      length: RU:Key:length
      level: RU:Key:level
      leisure: RU:Key:leisure
      length: RU:Key:length
      level: RU:Key:level
+    living_street: RU:Key:living street
+    loc_name: RU:Key:loc name
+    loc_ref: RU:Key:loc ref
+    lock: RU:Key:lock
      man_made: RU:Key:man made
      manhole: RU:Key:manhole
      maxaxleload: RU:Key:maxaxleload
      man_made: RU:Key:man made
      manhole: RU:Key:manhole
      maxaxleload: RU:Key:maxaxleload
@@ -5351,22 +7729,35 @@ ru:
      military: RU:Key:military
      min_height: RU:Key:min height
      minspeed: RU:Key:minspeed
      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
      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
      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
      operator: RU:Key:operator
      oneway: RU:Key:oneway
      opening_date: RU:Key:opening date
      opening_hours: RU:Key:opening hours
      operator: RU:Key:operator
+    operator:type: RU:Key:operator:type
      overtaking: RU:Key:overtaking
      overtaking: RU:Key:overtaking
+    owner: RU:Key:owner
+    ownership: RU:Key:ownership
      parking: RU:Key:parking
      parking:lane: RU:Key:parking:lane
      passing_places: RU:Key:passing places
      paved:date: RU:Key:paved:date
      payment: RU:Key:payment
      parking: RU:Key:parking
      parking:lane: RU:Key:parking:lane
      passing_places: RU:Key:passing places
      paved:date: RU:Key:paved:date
      payment: RU:Key:payment
+    payment:notes: RU:Key:payment:notes
      phone: RU:Key:phone
      piste:type: RU:Key:piste:type
      place: RU:Key:place
      phone: RU:Key:phone
      piste:type: RU:Key:piste:type
      place: RU:Key:place
@@ -5374,16 +7765,25 @@ ru:
      police: RU:Key:police
      population: RU:Key:population
      power: RU:Key:power
      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
      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
      route: RU:Key:route
      religion: RU:Key:religion
      resource: RU:Key:resource
      roof:material: RU:Key:roof:material
      route: RU:Key:route
+    ruined: RU:Key:ruined
      ruins: RU:Key:ruins
      ruins: RU:Key:ruins
+    salt: RU:Key:salt
      seasonal:snowfall:regaintime: RU:Key:seasonal:snowfall:regaintime
      service: RU:Key:service
      service_times: RU:Key:service times
      seasonal:snowfall:regaintime: RU:Key:seasonal:snowfall:regaintime
      service: RU:Key:service
      service_times: RU:Key:service times
@@ -5398,20 +7798,27 @@ ru:
      social_facility: RU:Key:social facility
      sorting_name: RU:Key:sorting name
      source: RU:Key:source
      social_facility: RU:Key:social facility
      sorting_name: RU:Key:sorting name
      source: RU:Key:source
+    source:addr: RU:Key:source:addr
      source:maxspeed: RU:Key:source:maxspeed
      source:maxspeed: RU:Key:source:maxspeed
+    source_ref: RU:Key:source ref
      species: RU:Key:species
      sport: RU:Key:sport
      surface: RU:Key:surface
      surveillance: RU:Key:surveillance
      species: RU:Key:species
      sport: RU:Key:sport
      surface: RU:Key:surface
      surveillance: RU:Key:surveillance
+    survey:date: RU:Key:survey:date
      tactile_paving: RU:Key:tactile paving
      toll: RU:Key:toll
      tourism: RU:Key:tourism
      tracktype: RU:Key:tracktype
      traffic_calming: RU:Key:traffic calming
      traffic_sign: RU:Key:traffic sign
      tactile_paving: RU:Key:tactile paving
      toll: RU:Key:toll
      tourism: RU:Key:tourism
      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
      tunnel: RU:Key:tunnel
      turn: RU:Key:turn
+    turn:lanes: RU:Key:turn:lanes
      type: RU:Key:type
      type: RU:Key:type
+    vehicle: RU:Key:vehicle
      voltage: RU:Key:voltage
      water: RU:Key:water
      waterway: RU:Key:waterway
      voltage: RU:Key:voltage
      water: RU:Key:water
      waterway: RU:Key:waterway
@@ -5419,6 +7826,7 @@ ru:
      wheelchair: RU:Key:wheelchair
      width: RU:Key:width
      wikipedia: RU:Key:wikipedia
      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:
      winter_road: RU:Key:winter road
      wood: RU:Key:wood
    tag:
@@ -5436,6 +7844,7 @@ ru:
      aeroway=aerodrome: RU:Tag:aeroway=aerodrome
      aeroway=apron: RU:Tag:aeroway=apron
      aeroway=gate: RU:Tag:aeroway=gate
      aeroway=aerodrome: RU:Tag:aeroway=aerodrome
      aeroway=apron: RU:Tag:aeroway=apron
      aeroway=gate: RU:Tag:aeroway=gate
+    aeroway=hangar: RU:Tag:aeroway=hangar
      aeroway=helipad: RU:Tag:aeroway=helipad
      aeroway=navigationaid: RU:Tag:aeroway=navigationaid
      aeroway=runway: RU:Tag:aeroway=runway
      aeroway=helipad: RU:Tag:aeroway=helipad
      aeroway=navigationaid: RU:Tag:aeroway=navigationaid
      aeroway=runway: RU:Tag:aeroway=runway
@@ -5446,6 +7855,7 @@ ru:
      amenity=animal_shelter: RU:Tag:amenity=animal shelter
      amenity=arts_centre: RU:Tag:amenity=arts centre
      amenity=atm: RU:Tag:amenity=atm
      amenity=animal_shelter: RU:Tag:amenity=animal shelter
      amenity=arts_centre: RU:Tag:amenity=arts centre
      amenity=atm: RU:Tag:amenity=atm
+    amenity=baby_hatch: RU:Tag:amenity=baby hatch
      amenity=bank: RU:Tag:amenity=bank
      amenity=bar: RU:Tag:amenity=bar
      amenity=bbq: RU:Tag:amenity=bbq
      amenity=bank: RU:Tag:amenity=bank
      amenity=bar: RU:Tag:amenity=bar
      amenity=bbq: RU:Tag:amenity=bbq
@@ -5470,6 +7880,7 @@ ru:
      amenity=community_centre: RU:Tag:amenity=community centre
      amenity=compressed_air: RU:Tag:amenity=compressed air
      amenity=courthouse: RU:Tag:amenity=courthouse
      amenity=community_centre: RU:Tag:amenity=community centre
      amenity=compressed_air: RU:Tag:amenity=compressed air
      amenity=courthouse: RU:Tag:amenity=courthouse
+    amenity=coworking_space: RU:Tag:amenity=coworking space
      amenity=crematorium: RU:Tag:amenity=crematorium
      amenity=dentist: RU:Tag:amenity=dentist
      amenity=doctors: RU:Tag:amenity=doctors
      amenity=crematorium: RU:Tag:amenity=crematorium
      amenity=dentist: RU:Tag:amenity=dentist
      amenity=doctors: RU:Tag:amenity=doctors
@@ -5490,6 +7901,7 @@ ru:
      amenity=marketplace: RU:Tag:amenity=marketplace
      amenity=monastery: RU:Tag:amenity=monastery
      amenity=mortuary: RU:Tag:amenity=mortuary
      amenity=marketplace: RU:Tag:amenity=marketplace
      amenity=monastery: RU:Tag:amenity=monastery
      amenity=mortuary: RU:Tag:amenity=mortuary
+    amenity=motorcycle_parking: RU:Tag:amenity=motorcycle parking
      amenity=nightclub: RU:Tag:amenity=nightclub
      amenity=nursing_home: RU:Tag:amenity=nursing home
      amenity=parking: RU:Tag:amenity=parking
      amenity=nightclub: RU:Tag:amenity=nightclub
      amenity=nursing_home: RU:Tag:amenity=nursing home
      amenity=parking: RU:Tag:amenity=parking
@@ -5498,14 +7910,17 @@ ru:
      amenity=payment_terminal: RU:Tag:amenity=payment terminal
      amenity=pharmacy: RU:Tag:amenity=pharmacy
      amenity=place_of_worship: RU:Tag:amenity=place of worship
      amenity=payment_terminal: RU:Tag:amenity=payment terminal
      amenity=pharmacy: RU:Tag:amenity=pharmacy
      amenity=place_of_worship: RU:Tag:amenity=place of worship
+    amenity=planetarium: RU:Tag:amenity=planetarium
      amenity=police: RU:Tag:amenity=police
      amenity=post_box: RU:Tag:amenity=post box
      amenity=post_office: RU:Tag:amenity=post office
      amenity=prison: RU:Tag:amenity=prison
      amenity=pub: RU:Tag:amenity=pub
      amenity=police: RU:Tag:amenity=police
      amenity=post_box: RU:Tag:amenity=post box
      amenity=post_office: RU:Tag:amenity=post office
      amenity=prison: RU:Tag:amenity=prison
      amenity=pub: RU:Tag:amenity=pub
+    amenity=public_bookcase: RU:Tag:amenity=public bookcase
      amenity=public_building: RU:Tag:amenity=public building
      amenity=recycling: RU:Tag:amenity=recycling
      amenity=register_office: RU:Tag:amenity=register office
      amenity=public_building: RU:Tag:amenity=public building
      amenity=recycling: RU:Tag:amenity=recycling
      amenity=register_office: RU:Tag:amenity=register office
+    amenity=rescue_station: RU:Tag:amenity=rescue station
      amenity=restaurant: RU:Tag:amenity=restaurant
      amenity=sauna: RU:Tag:amenity=sauna
      amenity=school: RU:Tag:amenity=school
      amenity=restaurant: RU:Tag:amenity=restaurant
      amenity=sauna: RU:Tag:amenity=sauna
      amenity=school: RU:Tag:amenity=school
@@ -5524,6 +7939,8 @@ ru:
      amenity=veterinary: RU:Tag:amenity=veterinary
      amenity=waste_basket: RU:Tag:amenity=waste basket
      amenity=waste_disposal: RU:Tag:amenity=waste disposal
      amenity=veterinary: RU:Tag:amenity=veterinary
      amenity=waste_basket: RU:Tag:amenity=waste basket
      amenity=waste_disposal: RU:Tag:amenity=waste disposal
+    amenity=water_point: RU:Tag:amenity=water point
+    amenity=watering_place: RU:Tag:amenity=watering place
      atm=yes: RU:Tag:atm=yes
      barrier=block: RU:Tag:barrier=block
      barrier=bollard: RU:Tag:barrier=bollard
      atm=yes: RU:Tag:atm=yes
      barrier=block: RU:Tag:barrier=block
      barrier=bollard: RU:Tag:barrier=bollard
@@ -5533,18 +7950,42 @@ ru:
      barrier=fence: RU:Tag:barrier=fence
      barrier=gate: RU:Tag:barrier=gate
      barrier=hedge: RU:Tag:barrier=hedge
      barrier=fence: RU:Tag:barrier=fence
      barrier=gate: RU:Tag:barrier=gate
      barrier=hedge: RU:Tag:barrier=hedge
+    barrier=kerb: RU:Tag:barrier=kerb
      barrier=lift_gate: RU:Tag:barrier=lift gate
      barrier=retaining_wall: RU:Tag:barrier=retaining wall
      barrier=sally_port: RU:Tag:barrier=sally port
      barrier=toll_booth: RU:Tag:barrier=toll booth
      barrier=turnstile: RU:Tag:barrier=turnstile
      barrier=wall: RU:Tag:barrier=wall
      barrier=lift_gate: RU:Tag:barrier=lift gate
      barrier=retaining_wall: RU:Tag:barrier=retaining wall
      barrier=sally_port: RU:Tag:barrier=sally port
      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
+    boundary=forestry_compartment: RU:Tag:boundary=forestry compartment
+    boundary=postal_code: RU:Tag:boundary=postal code
+    boundary=protected_area: RU:Tag:boundary=protected area
+    bridge:movable=bascule: RU:Tag:bridge:movable=bascule
+    bridge:movable=drawbridge: RU:Tag:bridge:movable=drawbridge
+    bridge:movable=lift: RU:Tag:bridge:movable=lift
+    bridge:movable=submersible: RU:Tag:bridge:movable=submersible
+    bridge:movable=swing: RU:Tag:bridge:movable=swing
+    bridge:movable=transporter: RU:Tag:bridge:movable=transporter
+    bridge:structure=arch: RU:Tag:bridge:structure=arch
+    bridge:structure=beam: RU:Tag:bridge:structure=beam
+    bridge:structure=cable-stayed: RU:Tag:bridge:structure=cable-stayed
+    bridge:structure=humpback: RU:Tag:bridge:structure=humpback
+    bridge:structure=suspension: RU:Tag:bridge:structure=suspension
+    bridge=cantilever: RU:Tag:bridge=cantilever
+    bridge=covered: RU:Tag:bridge=covered
+    building=apartments: RU:Tag:building=apartments
      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=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=font: RU:Tag:building=font
+    building=garage: RU:Tag:building=garage
+    building=garages: RU:Tag:building=garages
+    building=hangar: RU:Tag:building=hangar
+    building=hut: RU:Tag:building=hut
      building=roof: RU:Tag:building=roof
      building=shed: RU:Tag:building=shed
      building=stable: RU:Tag:building=stable
      building=roof: RU:Tag:building=roof
      building=shed: RU:Tag:building=shed
      building=stable: RU:Tag:building=stable
@@ -5566,16 +8007,23 @@ ru:
      craft=electrician: RU:Tag:craft=electrician
      craft=glaziery: RU:Tag:craft=glaziery
      craft=handicraft: RU:Tag:craft=handicraft
      craft=electrician: RU:Tag:craft=electrician
      craft=glaziery: RU:Tag:craft=glaziery
      craft=handicraft: RU:Tag:craft=handicraft
+    craft=photographer: RU:Tag:craft=photographer
      craft=shoemaker: RU:Tag:craft=shoemaker
      craft=tailor: RU:Tag:craft=tailor
      craft=shoemaker: RU:Tag:craft=shoemaker
      craft=tailor: RU:Tag:craft=tailor
+    craft=window_construction: RU:Tag:craft=window construction
      emergency=ambulance_station: RU:Tag:emergency=ambulance station
      emergency=fire_hydrant: RU:Tag:emergency=fire hydrant
      emergency=fire_water_pond: RU:Tag:emergency=fire water pond
      emergency=ambulance_station: RU:Tag:emergency=ambulance station
      emergency=fire_hydrant: RU:Tag:emergency=fire hydrant
      emergency=fire_water_pond: RU:Tag:emergency=fire water pond
+    emergency=water_tank: RU:Tag:emergency=water tank
+    entrance=staircase: RU:Tag:entrance=staircase
      fast_food=cafeteria: RU:Tag:fast food=cafeteria
      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
      footway=crossing: RU:Tag:footway=crossing
      footway=sidewalk: RU:Tag:footway=sidewalk
+    generator:method=anaerobic_digestion: RU:Tag:generator:method=anaerobic digestion
      geological=palaeontological_site: RU:Tag:geological=palaeontological site
      highway=bridleway: RU:Tag:highway=bridleway
      geological=palaeontological_site: RU:Tag:geological=palaeontological site
      highway=bridleway: RU:Tag:highway=bridleway
+    highway=bus_guideway: RU:Tag:highway=bus guideway
      highway=bus_stop: RU:Tag:highway=bus stop
      highway=construction: RU:Tag:highway=construction
      highway=crossing: RU:Tag:highway=crossing
      highway=bus_stop: RU:Tag:highway=bus stop
      highway=construction: RU:Tag:highway=construction
      highway=crossing: RU:Tag:highway=crossing
@@ -5596,6 +8044,7 @@ ru:
      highway=platform: RU:Tag:highway=platform
      highway=primary: RU:Tag:highway=primary
      highway=primary_link: RU:Tag:highway=primary link
      highway=platform: RU:Tag:highway=platform
      highway=primary: RU:Tag:highway=primary
      highway=primary_link: RU:Tag:highway=primary link
+    highway=raceway: RU:Tag:highway=raceway
      highway=residential: RU:Tag:highway=residential
      highway=rest_area: RU:Tag:highway=rest area
      highway=road: RU:Tag:highway=road
      highway=residential: RU:Tag:highway=residential
      highway=rest_area: RU:Tag:highway=rest area
      highway=road: RU:Tag:highway=road
@@ -5629,13 +8078,16 @@ ru:
      historic=wayside_cross: RU:Tag:historic=wayside cross
      historic=wayside_shrine: RU:Tag:historic=wayside shrine
      historic=wreck: RU:Tag:historic=wreck
      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
      landuse=basin: RU:Tag:landuse=basin
      information=guidepost: RU:Tag:information=guidepost
      junction=roundabout: RU:Tag:junction=roundabout
      landuse=allotments: RU:Tag:landuse=allotments
      landuse=basin: RU:Tag:landuse=basin
+    landuse=brownfield: RU:Tag:landuse=brownfield
      landuse=cemetery: RU:Tag:landuse=cemetery
      landuse=commercial: RU:Tag:landuse=commercial
      landuse=construction: RU:Tag:landuse=construction
      landuse=cemetery: RU:Tag:landuse=cemetery
      landuse=commercial: RU:Tag:landuse=commercial
      landuse=construction: RU:Tag:landuse=construction
+    landuse=depot: RU:Tag:landuse=depot
      landuse=farm: RU:Tag:landuse=farm
      landuse=forest: RU:Tag:landuse=forest
      landuse=garages: RU:Tag:landuse=garages
      landuse=farm: RU:Tag:landuse=farm
      landuse=forest: RU:Tag:landuse=forest
      landuse=garages: RU:Tag:landuse=garages
@@ -5655,54 +8107,78 @@ ru:
      landuse=reservoir: RU:Tag:landuse=reservoir
      landuse=residential: RU:Tag:landuse=residential
      landuse=retail: RU:Tag:landuse=retail
      landuse=reservoir: RU:Tag:landuse=reservoir
      landuse=residential: RU:Tag:landuse=residential
      landuse=retail: RU:Tag:landuse=retail
+    landuse=salt_pond: RU:Tag:landuse=salt pond
      landuse=village_green: RU:Tag:landuse=village green
      landuse=vineyard: RU:Tag:landuse=vineyard
      landuse=village_green: RU:Tag:landuse=village green
      landuse=vineyard: RU:Tag:landuse=vineyard
+    leaf_cycle=deciduous: RU:Tag:leaf cycle=deciduous
+    leaf_cycle=evergreen: RU:Tag:leaf cycle=evergreen
+    leaf_cycle=mixed: RU:Tag:leaf cycle=mixed
      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
      leisure=marina: RU:Tag:leisure=marina
      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
      leisure=marina: RU:Tag:leisure=marina
+    leisure=miniature_golf: RU:Tag:leisure=miniature golf
      leisure=park: RU:Tag:leisure=park
      leisure=pitch: RU:Tag:leisure=pitch
      leisure=playground: RU:Tag:leisure=playground
      leisure=sports_centre: RU:Tag:leisure=sports centre
      leisure=stadium: RU:Tag:leisure=stadium
      leisure=park: RU:Tag:leisure=park
      leisure=pitch: RU:Tag:leisure=pitch
      leisure=playground: RU:Tag:leisure=playground
      leisure=sports_centre: RU:Tag:leisure=sports centre
      leisure=stadium: RU:Tag:leisure=stadium
+    leisure=summer_camp: RU:Tag:leisure=summer camp
      leisure=swimming_pool: RU:Tag:leisure=swimming pool
      leisure=track: RU:Tag:leisure=track
      leisure=water_park: RU:Tag:leisure=water park
      man_made=adit: RU:Tag:man made=adit
      man_made=beacon: RU:Tag:man made=beacon
      man_made=breakwater: RU:Tag:man made=breakwater
      leisure=swimming_pool: RU:Tag:leisure=swimming pool
      leisure=track: RU:Tag:leisure=track
      leisure=water_park: RU:Tag:leisure=water park
      man_made=adit: RU:Tag:man made=adit
      man_made=beacon: RU:Tag:man made=beacon
      man_made=breakwater: RU:Tag:man made=breakwater
+    man_made=crane: RU:Tag:man made=crane
      man_made=cutline: RU:Tag:man made=cutline
      man_made=cutline: RU:Tag:man made=cutline
+    man_made=dyke: RU:Tag:man made=dyke
+    man_made=embankment: RU:Tag:man made=embankment
      man_made=lighthouse: RU:Tag:man made=lighthouse
      man_made=lighthouse: RU:Tag:man made=lighthouse
+    man_made=mineshaft: RU:Tag:man made=mineshaft
      man_made=monitoring_station: RU:Tag:man made=monitoring station
      man_made=monitoring_station: RU:Tag:man made=monitoring station
+    man_made=obelisk: RU:Tag:man made=obelisk
      man_made=pier: RU:Tag:man made=pier
      man_made=pillar: RU:Tag:man made=pillar
      man_made=pipeline: RU:Tag:man made=pipeline
      man_made=reservoir_covered: RU:Tag:man made=reservoir covered
      man_made=pier: RU:Tag:man made=pier
      man_made=pillar: RU:Tag:man made=pillar
      man_made=pipeline: RU:Tag:man made=pipeline
      man_made=reservoir_covered: RU:Tag:man made=reservoir covered
+    man_made=storage_tank: RU:Tag:man made=storage tank
      man_made=surveillance: RU:Tag:man made=surveillance
      man_made=surveillance: RU:Tag:man made=surveillance
+    man_made=survey_point: RU:Tag:man made=survey point
      man_made=tower: RU:Tag:man made=tower
      man_made=wastewater_plant: RU:Tag:man made=wastewater plant
      man_made=water_tower: RU:Tag:man made=water tower
      man_made=tower: RU:Tag:man made=tower
      man_made=wastewater_plant: RU:Tag:man made=wastewater plant
      man_made=water_tower: RU:Tag:man made=water tower
+    man_made=water_well: RU:Tag:man made=water well
      man_made=water_works: RU:Tag:man made=water works
      man_made=water_works: RU:Tag:man made=water works
+    man_made=watermill: RU:Tag:man made=watermill
+    man_made=windmill: RU:Tag:man made=windmill
+    man_made=works: RU:Tag:man made=works
      military=airfield: RU:Tag:military=airfield
      natural=arete: RU:Tag:natural=arete
      military=airfield: RU:Tag:military=airfield
      natural=arete: RU:Tag:natural=arete
+    natural=bare_rock: RU:Tag:natural=bare rock
      natural=beach: RU:Tag:natural=beach
      natural=beach: RU:Tag:natural=beach
+    natural=cave_entrance: RU:Tag:natural=cave entrance
      natural=cliff: RU:Tag:natural=cliff
      natural=coastline: RU:Tag:natural=coastline
      natural=desert: RU:Tag:natural=desert
      natural=fell: RU:Tag:natural=fell
      natural=cliff: RU:Tag:natural=cliff
      natural=coastline: RU:Tag:natural=coastline
      natural=desert: RU:Tag:natural=desert
      natural=fell: RU:Tag:natural=fell
+    natural=glacier: RU:Tag:natural=glacier
      natural=grassland: RU:Tag:natural=grassland
      natural=grassland: RU:Tag:natural=grassland
+    natural=gully: RU:Tag:natural=gully
      natural=heath: RU:Tag:natural=heath
      natural=peak: RU:Tag:natural=peak
      natural=ridge: RU:Tag:natural=ridge
      natural=saddle: RU:Tag:natural=saddle
      natural=sand: RU:Tag:natural=sand
      natural=heath: RU:Tag:natural=heath
      natural=peak: RU:Tag:natural=peak
      natural=ridge: RU:Tag:natural=ridge
      natural=saddle: RU:Tag:natural=saddle
      natural=sand: RU:Tag:natural=sand
+    natural=scree: RU:Tag:natural=scree
      natural=scrub: RU:Tag:natural=scrub
      natural=scrub: RU:Tag:natural=scrub
+    natural=sinkhole: RU:Tag:natural=sinkhole
      natural=spring: RU:Tag:natural=spring
      natural=tree: RU:Tag:natural=tree
      natural=tree_row: RU:Tag:natural=tree row
      natural=spring: RU:Tag:natural=spring
      natural=tree: RU:Tag:natural=tree
      natural=tree_row: RU:Tag:natural=tree row
+    natural=valley: RU:Tag:natural=valley
      natural=volcano: RU:Tag:natural=volcano
      natural=water: RU:Tag:natural=water
      natural=wetland: RU:Tag:natural=wetland
      natural=volcano: RU:Tag:natural=volcano
      natural=water: RU:Tag:natural=water
      natural=wetland: RU:Tag:natural=wetland
@@ -5739,6 +8215,7 @@ ru:
      place=isolated_dwelling: RU:Tag:place=isolated dwelling
      place=locality: RU:Tag:place=locality
      place=neighbourhood: RU:Tag:place=neighbourhood
      place=isolated_dwelling: RU:Tag:place=isolated dwelling
      place=locality: RU:Tag:place=locality
      place=neighbourhood: RU:Tag:place=neighbourhood
+    place=quarter: RU:Tag:place=quarter
      place=suburb: RU:Tag:place=suburb
      place=town: RU:Tag:place=town
      place=village: RU:Tag:place=village
      place=suburb: RU:Tag:place=suburb
      place=town: RU:Tag:place=town
      place=village: RU:Tag:place=village
@@ -5754,6 +8231,7 @@ ru:
      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
      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
+    railway=abandoned: RU:Tag:railway=abandoned
      railway=crossing: RU:Tag:railway=crossing
      railway=level_crossing: RU:Tag:railway=level crossing
      railway=miniature: RU:Tag:railway=miniature
      railway=crossing: RU:Tag:railway=crossing
      railway=level_crossing: RU:Tag:railway=level crossing
      railway=miniature: RU:Tag:railway=miniature
@@ -5764,6 +8242,7 @@ ru:
      railway=subway: RU:Tag:railway=subway
      railway=subway_entrance: RU:Tag:railway=subway entrance
      railway=tram: RU:Tag:railway=tram
      railway=subway: RU:Tag:railway=subway
      railway=subway_entrance: RU:Tag:railway=subway entrance
      railway=tram: RU:Tag:railway=tram
+    railway=turntable: RU:Tag:railway=turntable
      religion=pagan: RU:Tag:religion=pagan
      route=bus: RU:Tag:route=bus
      route=ferry: RU:Tag:route=ferry
      religion=pagan: RU:Tag:religion=pagan
      route=bus: RU:Tag:route=bus
      route=ferry: RU:Tag:route=ferry
@@ -5771,8 +8250,12 @@ ru:
      route=train: RU:Tag:route=train
      route=tram: RU:Tag:route=tram
      service=alley: RU:Tag:service=alley
      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=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
      shop=alcohol: RU:Tag:shop=alcohol
      shop=anime: RU:Tag:shop=anime
      shop=antiques: RU:Tag:shop=antiques
@@ -5870,10 +8353,13 @@ ru:
      social_facility=group_home: RU:Tag:social facility=group home
      sport=archery: RU:Tag:sport=archery
      sport=scuba_diving: RU:Tag:sport=scuba diving
      social_facility=group_home: RU:Tag:social facility=group home
      sport=archery: RU:Tag:sport=archery
      sport=scuba_diving: RU:Tag:sport=scuba diving
+    substance: RU:Tag:substance
+    tourism=apartment: RU:Tag:tourism=apartment
      tourism=artwork: RU:Tag:tourism=artwork
      tourism=attraction: RU:Tag:tourism=attraction
      tourism=camp_site: RU:Tag:tourism=camp site
      tourism=chalet: RU:Tag:tourism=chalet
      tourism=artwork: RU:Tag:tourism=artwork
      tourism=attraction: RU:Tag:tourism=attraction
      tourism=camp_site: RU:Tag:tourism=camp site
      tourism=chalet: RU:Tag:tourism=chalet
+    tourism=gallery: RU:Tag:tourism=gallery
      tourism=guest_house: RU:Tag:tourism=guest house
      tourism=hostel: RU:Tag:tourism=hostel
      tourism=hotel: RU:Tag:tourism=hotel
      tourism=guest_house: RU:Tag:tourism=guest house
      tourism=hostel: RU:Tag:tourism=hostel
      tourism=hotel: RU:Tag:tourism=hotel
@@ -5890,12 +8376,20 @@ ru:
      waterway=dam: RU:Tag:waterway=dam
      waterway=dock: RU:Tag:waterway=dock
      waterway=drain: RU:Tag:waterway=drain
      waterway=dam: RU:Tag:waterway=dam
      waterway=dock: RU:Tag:waterway=dock
      waterway=drain: RU:Tag:waterway=drain
+    waterway=drystream: RU:Tag:waterway=drystream
+    waterway=lock_gate: RU:Tag:waterway=lock gate
      waterway=rapids: RU:Tag:waterway=rapids
      waterway=river: RU:Tag:waterway=river
      waterway=riverbank: RU:Tag:waterway=riverbank
      waterway=stream: RU:Tag:waterway=stream
      waterway=weir: RU:Tag:waterway=weir
      wood=mixed: RU:Tag:wood=mixed
      waterway=rapids: RU:Tag:waterway=rapids
      waterway=river: RU:Tag:waterway=river
      waterway=riverbank: RU:Tag:waterway=riverbank
      waterway=stream: RU:Tag:waterway=stream
      waterway=weir: RU:Tag:waterway=weir
      wood=mixed: RU:Tag:wood=mixed
+sh:
+  key:
+    tracktype: Sh:Key:tracktype
+sk:
+  key:
+    checkpoint: Sk:Key:checkpoint
  sq:
    key:
      highway: Sq:Key:highway
  sq:
    key:
      highway: Sq:Key:highway
@@ -5926,38 +8420,84 @@ uk:
    key:
      abutters: Uk:Key:abutters
      access: Uk:Key:access
    key:
      abutters: Uk:Key:abutters
      access: Uk:Key:access
+    alt_name: Uk:Key:alt name
      amenity: Uk:Key:amenity
      amenity: Uk:Key:amenity
+    arcade: Uk:Key:arcade
      area: Uk:Key:area
      area: Uk:Key:area
+    area:highway: Uk:Key:area:highway
+    backward: Uk:Key:backward
      bench: Uk:Key:bench
      bicycle: Uk:Key:bicycle
      bicycle_parking: Uk:Key:bicycle parking
      bench: Uk:Key:bench
      bicycle: Uk:Key:bicycle
      bicycle_parking: Uk:Key:bicycle parking
+    boundary: Uk:Key:boundary
      bridge: Uk:Key:bridge
      building: Uk:Key:building
      bridge: Uk:Key:bridge
      building: Uk:Key:building
+    building:use: Uk:Key:building:use
+    colonnade: Uk:Key:colonnade
+    covered: Uk:Key:covered
      cutting: Uk:Key:cutting
      cutting: Uk:Key:cutting
+    destination: Uk:Key:destination
      embankment: Uk:Key:embankment
      emergency: Uk:Key:emergency
      entrance: Uk:Key:entrance
      embankment: Uk:Key:embankment
      emergency: Uk:Key:emergency
      entrance: Uk:Key:entrance
+    est_width: Uk:Key:est width
+    exit_to: Uk:Key:exit to
      ford: Uk:Key:ford
      ford: Uk:Key:ford
+    forward: Uk:Key:forward
+    height: Uk:Key:height
      highway: Uk:Key:highway
      highway: Uk:Key:highway
+    historic: Uk:Key:historic
+    inscription: Uk:Key:inscription
+    inscription:url: Uk:Key:inscription:url
+    int_name: Uk:Key:int name
+    landuse: Uk:Key:landuse
      lanes: Uk:Key:lanes
      layer: Uk:Key:layer
      lanes: Uk:Key:lanes
      layer: Uk:Key:layer
+    left: Uk:Key:left
+    length: Uk:Key:length
+    loc_name: Uk:Key:loc name
+    man_made: Uk:Key:man made
+    managed: Uk:Key:managed
      maxheight: Uk:Key:maxheight
      maxspeed: Uk:Key:maxspeed
      motorroad: Uk:Key:motorroad
      name: Uk:Key:name
      maxheight: Uk:Key:maxheight
      maxspeed: Uk:Key:maxspeed
      motorroad: Uk:Key:motorroad
      name: Uk:Key:name
+    name:de: Uk:Key:name:de
+    name:el: Uk:Key:name:el
+    name:en: Uk:Key:name:en
+    name:fr: Uk:Key:name:fr
+    name:ja: Uk:Key:name:ja
+    name:ru: Uk:Key:name:ru
+    name:uk: Uk:Key:name:uk
+    nat_name: Uk:Key:nat name
+    natural: Uk:Key:natural
      office: Uk:Key:office
      office: Uk:Key:office
+    official_name: Uk:Key:official name
+    official_name:ru: Uk:Key:official name:ru
+    old_name: Uk:Key:old name
      oneway: Uk:Key:oneway
      oneway: Uk:Key:oneway
+    oneway:bicycle: Uk:Key:oneway:bicycle
+    oneway:moped: Uk:Key:oneway:moped
      place: Uk:Key:place
      playground: Uk:Key:playground
      place: Uk:Key:place
      playground: Uk:Key:playground
+    power: Uk:Key:power
      railway: Uk:Key:railway
      ref: Uk:Key:ref
      railway: Uk:Key:railway
      ref: Uk:Key:ref
+    reference: Uk:Key:reference
+    reg_name: Uk:Key:reg name
+    right: Uk:Key:right
      service: Uk:Key:service
      shelter_type: Uk:Key:shelter type
      service: Uk:Key:service
      shelter_type: Uk:Key:shelter type
+    short_name: Uk:Key:short name
+    short_name:ru: Uk:Key:short name:ru
+    sorting_name: Uk:Key:sorting name
      surface: Uk:Key:surface
      tracktype: Uk:Key:tracktype
      traffic_sign: Uk:Key:traffic sign
      tunnel: Uk:Key:tunnel
      url: Uk:Key:url
      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
+    water: Uk:Key:water
      waterway: Uk:Key:waterway
      width: Uk:Key:width
      wood: Uk:Key:wood
      waterway: Uk:Key:waterway
      width: Uk:Key:width
      wood: Uk:Key:wood
@@ -5966,29 +8506,48 @@ uk:
      amenity=bench: Uk:Tag:amenity=bench
      amenity=bicycle_parking: Uk:Tag:amenity=bicycle parking
      amenity=bicycle_rental: Uk:Tag:amenity=bicycle rental
      amenity=bench: Uk:Tag:amenity=bench
      amenity=bicycle_parking: Uk:Tag:amenity=bicycle parking
      amenity=bicycle_rental: Uk:Tag:amenity=bicycle rental
+    amenity=fuel: Uk:Tag:amenity=fuel
+    amenity=place_of_worship: Uk:Tag:amenity=place of worship
+    amenity=post_office: Uk:Tag:amenity=post office
      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
      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
+    emergency=fire_water_pond: Uk:Tag:emergency=fire water pond
+    emergency=suction_point: Uk:Tag:emergency=suction point
+    emergency=water_tank: Uk:Tag:emergency=water tank
      highway=bridleway: Uk:Tag:highway=bridleway
      highway=bridleway: Uk:Tag:highway=bridleway
+    highway=cycleway: Uk:Tag:highway=cycleway
+    highway=footway: Uk:Tag:highway=footway
      highway=ford: Uk:Tag:highway=ford
      highway=living_street: Uk:Tag:highway=living street
      highway=motorway: Uk:Tag:highway=motorway
      highway=ford: Uk:Tag:highway=ford
      highway=living_street: Uk:Tag:highway=living street
      highway=motorway: Uk:Tag:highway=motorway
+    highway=motorway_junction: Uk:Tag:highway=motorway junction
      highway=motorway_link: Uk:Tag:highway=motorway link
      highway=motorway_link: Uk:Tag:highway=motorway link
+    highway=path: Uk:Tag:highway=path
      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=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=steps: Uk:Tag:highway=steps
      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
      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
+    landuse=forest: Uk:Tag:landuse=forest
+    man_made=embankment: Uk:Tag:man made=embankment
+    man_made=pier: Uk:Tag:man made=pier
+    natural=bare_rock: Uk:Tag:natural=bare rock
      natural=grassland: Uk:Tag:natural=grassland
      natural=scrub: Uk:Tag:natural=scrub
      natural=grassland: Uk:Tag:natural=grassland
      natural=scrub: Uk:Tag:natural=scrub
+    natural=tree: Uk:Tag:natural=tree
+    natural=tree_row: Uk:Tag:natural=tree row
+    natural=water: Uk:Tag:natural=water
+    natural=wood: Uk:Tag:natural=wood
      office=accountant: Uk:Tag:office=accountant
      office=architect: Uk:Tag:office=architect
      office=company: Uk:Tag:office=company
      office=accountant: Uk:Tag:office=accountant
      office=architect: Uk:Tag:office=architect
      office=company: Uk:Tag:office=company
@@ -6011,11 +8570,19 @@ uk:
      shop=antiques: Uk:Tag:shop=antiques
      shop=bicycle: Uk:Tag:shop=bicycle
      shop=second_hand: Uk:Tag:shop=second hand
      shop=antiques: Uk:Tag:shop=antiques
      shop=bicycle: Uk:Tag:shop=bicycle
      shop=second_hand: Uk:Tag:shop=second hand
+    sport=shooting: Uk:Tag:sport=shooting
      vending=bicycle_tube: Uk:Tag:vending=bicycle tube
      waterway=riverbank: Uk:Tag:waterway=riverbank
  vi:
    key:
      vending=bicycle_tube: Uk:Tag:vending=bicycle tube
      waterway=riverbank: Uk:Tag:waterway=riverbank
  vi:
    key:
+    addr: Vi:Key:addr
      highway: Vi:Key:highway
      highway: Vi:Key:highway
+  tag:
+    highway=primary: Vi:Tag:highway=primary
+    highway=residential: Vi:Tag:highway=residential
+    highway=secondary: Vi:Tag:highway=secondary
+    highway=service: Vi:Tag:highway=service
+    highway=tertiary: Vi:Tag:highway=tertiary
  zh-hans:
    key:
      building:part: Zh-hans:Key:building:part
  zh-hans:
    key:
      building:part: Zh-hans:Key:building:part
@@ -6035,23 +8602,32 @@ zh-hans:
  zh-hant:
    key:
      amenity: Zh-hant:Key:amenity
  zh-hant:
    key:
      amenity: Zh-hant:Key:amenity
+    bridge: Zh-hant:Key:bridge
      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
      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
+    takeaway: Zh-hant:Key:takeaway
      tracktype: Zh-hant:Key:tracktype
      trail_visibility: Zh-hant:Key:trail visibility
    tag:
      amenity=bench: Zh-hant:Tag:amenity=bench
      amenity=crematorium: Zh-hant:Tag:amenity=crematorium
      tracktype: Zh-hant:Key:tracktype
      trail_visibility: Zh-hant:Key:trail visibility
    tag:
      amenity=bench: Zh-hant:Tag:amenity=bench
      amenity=crematorium: Zh-hant:Tag:amenity=crematorium
+    amenity=fountain: Zh-hant:Tag:amenity=fountain
      amenity=fuel: Zh-hant:Tag:amenity=fuel
      amenity=place_of_worship: Zh-hant:Tag:amenity=place of worship
      amenity=toilets: Zh-hant:Tag:amenity=toilets
      amenity=fuel: Zh-hant:Tag:amenity=fuel
      amenity=place_of_worship: Zh-hant:Tag:amenity=place of worship
      amenity=toilets: Zh-hant:Tag:amenity=toilets
+    building=roof: Zh-hant:Tag:building=roof
      highway=bus_stop: Zh-hant:Tag:highway=bus stop
      highway=bus_stop: Zh-hant:Tag:highway=bus stop
+    highway=milestone: Zh-hant:Tag:highway=milestone
+    historic=aircraft: Zh-hant:Tag:historic=aircraft
      landuse=cemetery: Zh-hant:Tag:landuse=cemetery
      landuse=cemetery: Zh-hant:Tag:landuse=cemetery
+    leisure=pitch: Zh-hant:Tag:leisure=pitch
      natural=peak: Zh-hant:Tag:natural=peak
      natural=peak: Zh-hant:Tag:natural=peak
+    service=drive-through: Zh-hant:Tag:service=drive-through
      shop=funeral_directors: Zh-hant:Tag:shop=funeral directors
      shop=gas: Zh-hant:Tag:shop=gas
      tourism=alpine_hut: Zh-hant:Tag:tourism=alpine hut
      shop=funeral_directors: Zh-hant:Tag:shop=funeral directors
      shop=gas: Zh-hant:Tag:shop=gas
      tourism=alpine_hut: Zh-hant:Tag:tourism=alpine hut
+