]> git.openstreetmap.org Git - rails.git/blobdiff - config/wiki_pages.yml
Update wiki_pages.yml, fix http url in update script
[rails.git] / config / wiki_pages.yml
index f38b7fe8dd513f6cc0e1ae5fb132a68a30f1e978..bc8719bcf6bfddc554d7df7b7bd7ba1f4dfd1289 100644 (file)
@@ -14,21 +14,38 @@ az:
     highway=speed_camera: Az:Tag:highway=speed camera
 bg:
   key:
+    building: Bg:Key:building
     lanes: Bg:Key:lanes
   tag:
+    building=chapel: Bg:Tag:building=chapel
     natural=heath: Bg:Tag:natural=heath
     railway=crossing: Bg:Tag:railway=crossing
     railway=level_crossing: Bg:Tag:railway=level crossing
 ca:
   key:
+    amenity: Ca:Key:amenity
     name: Ca:Key:name
     operator:type: Ca:Key:operator:type
+    phone: Ca:Key:phone
   tag:
     landuse=farmland: Ca:Tag:landuse=farmland
     leisure=swimming_pool: Ca:Tag:leisure=swimming pool
+    place=isolated_dwelling: Ca:Tag:place=isolated dwelling
     shop=frozen_food: Ca:Tag:shop=frozen food
 cs:
   key:
+    3dr:type: Cs:Key:3dr:type
+    4wd_only: Cs:Key:4wd only
+    Amenity: Cs:Key:Amenity
+    Boundary: Cs:Key:Boundary
+    FIXME: Cs:Key:FIXME
+    TODO: Cs:Key:TODO
+    abandoned: Cs:Key:abandoned
+    'abandoned:': 'Cs:Key:abandoned:'
+    abandoned:amenity: Cs:Key:abandoned:amenity
+    abutters: Cs:Key:abutters
+    access: Cs:Key:access
+    access:lanes: Cs:Key:access:lanes
     addr: Cs:Key:addr
     addr:city: Cs:Key:addr:city
     addr:conscriptionnumber: Cs:Key:addr:conscriptionnumber
@@ -53,83 +70,1388 @@ cs:
     addr:subdistrict: Cs:Key:addr:subdistrict
     addr:suburb: Cs:Key:addr:suburb
     addr:unit: Cs:Key:addr:unit
+    admin_level: Cs:Key:admin level
+    advertising: Cs:Key:advertising
     aerialway: Cs:Key:aerialway
+    aerialway:drag_lift: Cs:Key:aerialway:drag lift
+    aerialway:duration: Cs:Key:aerialway:duration
     aeroway: Cs:Key:aeroway
+    after_school: Cs:Key:after school
+    agricultural: Cs:Key:agricultural
     alt_name: Cs:Key:alt name
+    alt_name_1: Cs:Key:alt name 1
     amenity: Cs:Key:amenity
+    animated: Cs:Key:animated
+    architect: Cs:Key:architect
     area: Cs:Key:area
+    area:highway: Cs:Key:area:highway
+    artist_name: Cs:Key:artist name
     artwork_type: Cs:Key:artwork type
+    asb: Cs:Key:asb
+    ascent: Cs:Key:ascent
+    asset_ref: Cs:Key:asset ref
+    assisted_trail: Cs:Key:assisted trail
+    attribution: Cs:Key:attribution
+    atv: Cs:Key:atv
+    backcountry: Cs:Key:backcountry
+    backrest: Cs:Key:backrest
+    backward: Cs:Key:backward
+    bar: Cs:Key:bar
     barrier: Cs:Key:barrier
+    basin: Cs:Key:basin
+    bdouble: Cs:Key:bdouble
+    beacon: Cs:Key:beacon
+    beacon:type: Cs:Key:beacon:type
+    beds: Cs:Key:beds
+    bench: Cs:Key:bench
+    bicycle: Cs:Key:bicycle
+    bicycle_parking: Cs:Key:bicycle parking
+    bicycle_road: Cs:Key:bicycle road
+    bin: Cs:Key:bin
+    biotic_reef:type: Cs:Key:biotic reef:type
+    board_type: Cs:Key:board type
+    boat: Cs:Key:boat
+    bollard: Cs:Key:bollard
+    books: Cs:Key:books
+    border_type: Cs:Key:border type
+    both: Cs:Key:both
+    boundary: Cs:Key:boundary
+    brand: Cs:Key:brand
+    breakfast: Cs:Key:breakfast
+    brewery: Cs:Key:brewery
+    bridge: Cs:Key:bridge
+    bridge:movable: Cs:Key:bridge:movable
+    bridge:name: Cs:Key:bridge:name
+    bridge:structure: Cs:Key:bridge:structure
+    bridge:support: Cs:Key:bridge:support
+    bridge_name: Cs:Key:bridge name
     building: Cs:Key:building
+    building:architecture: Cs:Key:building:architecture
+    building:colour: Cs:Key:building:colour
+    building:condition: Cs:Key:building:condition
+    building:fireproof: Cs:Key:building:fireproof
     building:flats: Cs:Key:building:flats
     building:levels: Cs:Key:building:levels
+    building:levels:underground: Cs:Key:building:levels:underground
+    building:material: Cs:Key:building:material
+    building:min_level: Cs:Key:building:min level
+    building:part: Cs:Key:building:part
+    building:place: Cs:Key:building:place
+    building:ruian:type: Cs:Key:building:ruian:type
+    building:type: Cs:Key:building:type
+    building:use: Cs:Key:building:use
+    bulk_purchase: Cs:Key:bulk purchase
+    bunker_type: Cs:Key:bunker type
+    bus: Cs:Key:bus
+    busway: Cs:Key:busway
+    button_operated: Cs:Key:button operated
+    cable_number: Cs:Key:cable number
+    cafe: Cs:Key:cafe
+    camp_site: Cs:Key:camp site
+    camp_type: Cs:Key:camp type
+    campers: Cs:Key:campers
+    canoe: Cs:Key:canoe
+    capacity: Cs:Key:capacity
+    capacity:disabled: Cs:Key:capacity:disabled
+    capital: Cs:Key:capital
+    caravan: Cs:Key:caravan
+    caravans: Cs:Key:caravans
+    cargo: Cs:Key:cargo
+    carriage: Cs:Key:carriage
+    carriageway_ref: Cs:Key:carriageway ref
     castle_type: Cs:Key:castle type
+    cemetery: Cs:Key:cemetery
+    centralkey: Cs:Key:centralkey
+    change: Cs:Key:change
+    charge: Cs:Key:charge
+    charity: Cs:Key:charity
+    check_date: Cs:Key:check date
+    circumference: Cs:Key:circumference
+    clothes: Cs:Key:clothes
+    club: Cs:Key:club
+    cocktails: Cs:Key:cocktails
+    collection_times: Cs:Key:collection times
+    color: Cs:Key:color
+    colour: Cs:Key:colour
+    comment: Cs:Key:comment
+    communication:amateur_radio: Cs:Key:communication:amateur radio
+    communication:bos: Cs:Key:communication:bos
+    communication:microwave: Cs:Key:communication:microwave
+    communication:mobile_phone: Cs:Key:communication:mobile phone
+    communication:radio: Cs:Key:communication:radio
+    communication:television: Cs:Key:communication:television
+    community_centre: Cs:Key:community centre
+    community_centre:for: Cs:Key:community centre:for
+    conditional: Cs:Key:conditional
+    construction: Cs:Key:construction
+    construction:website: Cs:Key:construction:website
+    construction_end_expected: Cs:Key:construction end expected
     contact: Cs:Key:contact
+    contact:email: Cs:Key:contact:email
+    contact:facebook: Cs:Key:contact:facebook
+    contact:fax: Cs:Key:contact:fax
+    contact:google_plus: Cs:Key:contact:google plus
+    contact:linkedin: Cs:Key:contact:linkedin
+    contact:phone: Cs:Key:contact:phone
+    contact:twitter: Cs:Key:contact:twitter
+    contact:website: Cs:Key:contact:website
+    contact:xing: Cs:Key:contact:xing
+    content: Cs:Key:content
+    conveying: Cs:Key:conveying
+    country: Cs:Key:country
+    covered: Cs:Key:covered
     craft: Cs:Key:craft
+    created_by: Cs:Key:created by
+    crop: Cs:Key:crop
+    crossing: Cs:Key:crossing
+    crossing:activation: Cs:Key:crossing:activation
+    crossing:barrier: Cs:Key:crossing:barrier
+    crossing:bell: Cs:Key:crossing:bell
+    crossing:light: Cs:Key:crossing:light
+    crossing:on_demand: Cs:Key:crossing:on demand
+    crossing:saltire: Cs:Key:crossing:saltire
+    cuisine: Cs:Key:cuisine
+    currency: Cs:Key:currency
+    currency:EUR: Cs:Key:currency:EUR
+    currency:USD: Cs:Key:currency:USD
     cutting: Cs:Key:cutting
+    cyclestreets_id: Cs:Key:cyclestreets id
+    cycleway: Cs:Key:cycleway
+    cycleway:both: Cs:Key:cycleway:both
+    cycleway:left: Cs:Key:cycleway:left
+    cycleway:right: Cs:Key:cycleway:right
+    date: Cs:Key:date
+    date_off: Cs:Key:date off
+    date_on: Cs:Key:date on
+    day_off: Cs:Key:day off
+    day_on: Cs:Key:day on
+    de:amtlicher_gemeindeschluessel: Cs:Key:de:amtlicher gemeindeschluessel
+    de:regionalschluessel: Cs:Key:de:regionalschluessel
+    delivery: Cs:Key:delivery
+    demolished: Cs:Key:demolished
+    'demolished:': 'Cs:Key:demolished:'
+    denomination: Cs:Key:denomination
+    denotation: Cs:Key:denotation
+    depth: Cs:Key:depth
+    descent: Cs:Key:descent
+    description: Cs:Key:description
+    designation: Cs:Key:designation
+    destination: Cs:Key:destination
+    destination:lanes: Cs:Key:destination:lanes
+    detour: Cs:Key:detour
+    diameter: Cs:Key:diameter
+    dibavod:id: Cs:Key:dibavod:id
+    diet: Cs:Key:diet
+    diet:*: Cs:Key:diet:*
+    diet:vegan: Cs:Key:diet:vegan
+    diet:vegetarian: Cs:Key:diet:vegetarian
+    direction: Cs:Key:direction
+    disabled: Cs:Key:disabled
+    dispensing: Cs:Key:dispensing
+    display: Cs:Key:display
     distance: Cs:Key:distance
+    disused: Cs:Key:disused
+    'disused:': 'Cs:Key:disused:'
+    disused:amenity: Cs:Key:disused:amenity
+    disused:railway: Cs:Key:disused:railway
+    disused:shop: Cs:Key:disused:shop
+    dock: Cs:Key:dock
+    donation:compensation: Cs:Key:donation:compensation
+    draft: Cs:Key:draft
+    drink: Cs:Key:drink
+    drinking_water: Cs:Key:drinking water
+    drive_in: Cs:Key:drive in
+    drive_through: Cs:Key:drive through
+    driving_side: Cs:Key:driving side
+    duration: Cs:Key:duration
+    ele: Cs:Key:ele
+    electrified: Cs:Key:electrified
+    email: Cs:Key:email
+    embankment: Cs:Key:embankment
     emergency: Cs:Key:emergency
+    end_date: Cs:Key:end date
+    enforcement: Cs:Key:enforcement
+    entrance: Cs:Key:entrance
+    est_width: Cs:Key:est width
+    european_cultural_path: Cs:Key:european cultural path
+    exit: Cs:Key:exit
+    facebook: Cs:Key:facebook
+    faces: Cs:Key:faces
+    fair_trade: Cs:Key:fair trade
+    fast_food: Cs:Key:fast food
+    fax: Cs:Key:fax
+    fee: Cs:Key:fee
+    female: Cs:Key:female
+    fence_type: Cs:Key:fence type
+    ferry: Cs:Key:ferry
+    ferry:cable: Cs:Key:ferry:cable
+    field: Cs:Key:field
+    fire_boundary: Cs:Key:fire boundary
+    fire_hydrant:type: Cs:Key:fire hydrant:type
+    fireplace: Cs:Key:fireplace
+    fishing: Cs:Key:fishing
+    fixme: Cs:Key:fixme
+    floating: Cs:Key:floating
+    flood_prone: Cs:Key:flood prone
+    foot: Cs:Key:foot
+    footway: Cs:Key:footway
+    ford: Cs:Key:ford
+    forestry: Cs:Key:forestry
+    format: Cs:Key:format
+    fortification_type: Cs:Key:fortification type
+    forward: Cs:Key:forward
+    frequency: Cs:Key:frequency
+    fuel: Cs:Key:fuel
+    fuel:cng: Cs:Key:fuel:cng
+    fuel:diesel: Cs:Key:fuel:diesel
+    furniture: Cs:Key:furniture
+    garden:style: Cs:Key:garden:style
+    garden:type: Cs:Key:garden:type
+    gauge: Cs:Key:gauge
+    generator:method: Cs:Key:generator:method
+    generator:output: Cs:Key:generator:output
+    generator:output:biogas: Cs:Key:generator:output:biogas
+    generator:output:cold_air: Cs:Key:generator:output:cold air
+    generator:output:cold_water: Cs:Key:generator:output:cold water
+    generator:output:compressed_air: Cs:Key:generator:output:compressed air
+    generator:output:electricity: Cs:Key:generator:output:electricity
+    generator:output:heat: Cs:Key:generator:output:heat
+    generator:output:hot_air: Cs:Key:generator:output:hot air
+    generator:output:hot_water: Cs:Key:generator:output:hot water
+    generator:output:steam: Cs:Key:generator:output:steam
+    generator:output:vacuum: Cs:Key:generator:output:vacuum
+    generator:place: Cs:Key:generator:place
+    generator:plant: Cs:Key:generator:plant
+    generator:source: Cs:Key:generator:source
+    generator:type: Cs:Key:generator:type
+    genus: Cs:Key:genus
     geological: Cs:Key:geological
+    golf: Cs:Key:golf
+    golf_cart: Cs:Key:golf cart
+    goods: Cs:Key:goods
+    government: Cs:Key:government
+    grape_variety: Cs:Key:grape variety
+    grassland: Cs:Key:grassland
+    group_only: Cs:Key:group only
+    handrail: Cs:Key:handrail
+    happy_hours: Cs:Key:happy hours
+    hazmat: Cs:Key:hazmat
+    hazmat:water: Cs:Key:hazmat:water
+    healthcare: Cs:Key:healthcare
+    healthcare:speciality: Cs:Key:healthcare:speciality
     height: Cs:Key:height
+    hgv: Cs:Key:hgv
+    highspeed: Cs:Key:highspeed
     highway: Cs:Key:highway
+    hiking: Cs:Key:hiking
     historic: Cs:Key:historic
+    historic:civilization: Cs:Key:historic:civilization
+    historic:era: Cs:Key:historic:era
+    historic:period: Cs:Key:historic:period
+    horse: Cs:Key:horse
+    hour_off: Cs:Key:hour off
+    hour_on: Cs:Key:hour on
+    hov: Cs:Key:hov
+    iata: Cs:Key:iata
+    icao: Cs:Key:icao
+    ice_cream: Cs:Key:ice cream
+    ice_road: Cs:Key:ice road
+    ice_skates: Cs:Key:ice skates
+    ignore_for_routing: Cs:Key:ignore for routing
     image: Cs:Key:image
+    impromptu: Cs:Key:impromptu
+    incline: Cs:Key:incline
+    indoor: Cs:Key:indoor
+    industrial: Cs:Key:industrial
+    informal: Cs:Key:informal
     information: Cs:Key:information
+    inline_skates: Cs:Key:inline skates
+    inscription: Cs:Key:inscription
     int_name: Cs:Key:int name
+    int_ref: Cs:Key:int ref
     intermittent: Cs:Key:intermittent
+    internet_access: Cs:Key:internet access
+    is_in: Cs:Key:is in
+    is_in:archipelago: Cs:Key:is in:archipelago
+    is_in:city: Cs:Key:is in:city
+    is_in:continent: Cs:Key:is in:continent
+    is_in:country: Cs:Key:is in:country
+    is_in:country_code: Cs:Key:is in:country code
+    is_in:island: Cs:Key:is in:island
+    is_in:municipality: Cs:Key:is in:municipality
+    is_in:ocean: Cs:Key:is in:ocean
+    is_in:sea: Cs:Key:is in:sea
+    is_in:state: Cs:Key:is in:state
+    junction: Cs:Key:junction
+    kct_blue: Cs:Key:kct blue
+    kct_green: Cs:Key:kct green
+    kct_none: Cs:Key:kct none
+    kct_red: Cs:Key:kct red
+    kct_white: Cs:Key:kct white
+    kct_yellow: Cs:Key:kct yellow
+    kerb: Cs:Key:kerb
+    kids_area: Cs:Key:kids area
+    kudish: Cs:Key:kudish
+    ladder: Cs:Key:ladder
+    landmark: Cs:Key:landmark
     landuse: Cs:Key:landuse
+    lanes: Cs:Key:lanes
+    lanes:bus: Cs:Key:lanes:bus
+    lanes:psv: Cs:Key:lanes:psv
+    lanes:psv:backward: Cs:Key:lanes:psv:backward
+    lanes:psv:forward: Cs:Key:lanes:psv:forward
+    layer: Cs:Key:layer
     leaf_cycle: Cs:Key:leaf cycle
     leaf_type: Cs:Key:leaf type
+    left: Cs:Key:left
+    left:country: Cs:Key:left:country
     leisure: Cs:Key:leisure
     length: Cs:Key:length
+    level: Cs:Key:level
+    lhv: Cs:Key:lhv
+    lit: Cs:Key:lit
     loc_name: Cs:Key:loc name
+    location: Cs:Key:location
+    lock: Cs:Key:lock
+    lock_name: Cs:Key:lock name
+    lock_ref: Cs:Key:lock ref
+    lockable: Cs:Key:lockable
+    lottery: Cs:Key:lottery
+    lunch: Cs:Key:lunch
+    male: Cs:Key:male
     man_made: Cs:Key:man made
+    managed: Cs:Key:managed
+    manufacturer: Cs:Key:manufacturer
+    manufacturer:type: Cs:Key:manufacturer:type
+    mapillary: Cs:Key:mapillary
+    massage: Cs:Key:massage
+    material: Cs:Key:material
+    max_age: Cs:Key:max age
+    maxaxleload: Cs:Key:maxaxleload
+    maxheight: Cs:Key:maxheight
+    maxheight:physical: Cs:Key:maxheight:physical
     maxlength: Cs:Key:maxlength
+    maxspeed: Cs:Key:maxspeed
+    maxspeed:advisory: Cs:Key:maxspeed:advisory
+    maxspeed:type: Cs:Key:maxspeed:type
+    maxstay: Cs:Key:maxstay
+    maxweight: Cs:Key:maxweight
+    maxwidth: Cs:Key:maxwidth
+    maxwidth:physical: Cs:Key:maxwidth:physical
+    meadow: Cs:Key:meadow
+    measurement: Cs:Key:measurement
+    megalith_type: Cs:Key:megalith type
+    memorial: Cs:Key:memorial
+    memorial:type: Cs:Key:memorial:type
+    message: Cs:Key:message
+    microbrewery: Cs:Key:microbrewery
+    military: Cs:Key:military
+    min_age: Cs:Key:min age
+    min_height: Cs:Key:min height
+    minibus: Cs:Key:minibus
+    minspeed: Cs:Key:minspeed
+    mofa: Cs:Key:mofa
+    monitoring:air_quality: Cs:Key:monitoring:air quality
+    monitoring:bicycle: Cs:Key:monitoring:bicycle
+    monitoring:galileo: Cs:Key:monitoring:galileo
+    monitoring:glonass: Cs:Key:monitoring:glonass
+    monitoring:gps: Cs:Key:monitoring:gps
+    monitoring:groundwater: Cs:Key:monitoring:groundwater
+    monitoring:meteoric_activity: Cs:Key:monitoring:meteoric activity
+    monitoring:noise: Cs:Key:monitoring:noise
+    monitoring:radiation: Cs:Key:monitoring:radiation
+    monitoring:seismic_activity: Cs:Key:monitoring:seismic activity
+    monitoring:tide_gauge: Cs:Key:monitoring:tide gauge
+    monitoring:traffic: Cs:Key:monitoring:traffic
+    monitoring:water_level: Cs:Key:monitoring:water level
+    monitoring:weather: Cs:Key:monitoring:weather
+    mooring: Cs:Key:mooring
+    moped: Cs:Key:moped
+    motor_vehicle: Cs:Key:motor vehicle
+    motorboat: Cs:Key:motorboat
+    motorcar: Cs:Key:motorcar
+    motorcycle: Cs:Key:motorcycle
+    motorcycle:conditional: Cs:Key:motorcycle:conditional
+    motorhome: Cs:Key:motorhome
+    motorroad: Cs:Key:motorroad
     mountain_pass: Cs:Key:mountain pass
+    moved: Cs:Key:moved
+    mtb: Cs:Key:mtb
+    mtb:description: Cs:Key:mtb:description
     mtb:scale: Cs:Key:mtb:scale
+    mtb:scale:imba: Cs:Key:mtb:scale:imba
     mtb:scale:uphill: Cs:Key:mtb:scale:uphill
+    museum: Cs:Key:museum
+    museum_type: Cs:Key:museum type
     name: Cs:Key:name
+    name:cs: Cs:Key:name:cs
+    name:de: Cs:Key:name:de
+    name:en: Cs:Key:name:en
+    name_1: Cs:Key:name 1
+    narrow: Cs:Key:narrow
     nat_name: Cs:Key:nat name
+    nat_ref: Cs:Key:nat ref
     natural: Cs:Key:natural
+    navigationaid: Cs:Key:navigationaid
+    network: Cs:Key:network
+    noexit: Cs:Key:noexit
+    noname: Cs:Key:noname
+    noref: Cs:Key:noref
+    note: Cs:Key:note
+    nudism: Cs:Key:nudism
+    nursery: Cs:Key:nursery
     office: Cs:Key:office
     official_name: Cs:Key:official name
+    official_ref: Cs:Key:official ref
+    offshore: Cs:Key:offshore
     old_name: Cs:Key:old name
+    old_ref: Cs:Key:old ref
+    oneway: Cs:Key:oneway
+    oneway:bicycle: Cs:Key:oneway:bicycle
+    onkz: Cs:Key:onkz
+    openfire: Cs:Key:openfire
+    opening_date: Cs:Key:opening date
+    opening_hours: Cs:Key:opening hours
+    opensource: Cs:Key:opensource
+    operator: Cs:Key:operator
+    operator:type: Cs:Key:operator:type
+    organic: Cs:Key:organic
+    orientation: Cs:Key:orientation
+    origin: Cs:Key:origin
+    osmc:status: Cs:Key:osmc:status
+    osmc:symbol: Cs:Key:osmc:symbol
+    outdoor_seating: Cs:Key:outdoor seating
+    oven: Cs:Key:oven
+    overtaking: Cs:Key:overtaking
+    overtaking:hgv: Cs:Key:overtaking:hgv
+    owner: Cs:Key:owner
     parking: Cs:Key:parking
+    parking:condition: Cs:Key:parking:condition
+    parking:lane: Cs:Key:parking:lane
+    parking:lane:both: Cs:Key:parking:lane:both
+    parking:lane:left: Cs:Key:parking:lane:left
+    parking:lane:right: Cs:Key:parking:lane:right
+    passenger: Cs:Key:passenger
+    passing_places: Cs:Key:passing places
+    payment: Cs:Key:payment
+    payment:cash: Cs:Key:payment:cash
+    payment:coins: Cs:Key:payment:coins
+    payment:none: Cs:Key:payment:none
+    payment:notes: Cs:Key:payment:notes
+    phone: Cs:Key:phone
+    pilgrimage: Cs:Key:pilgrimage
+    pipeline: Cs:Key:pipeline
     place: Cs:Key:place
+    plant: Cs:Key:plant
+    plant:output: Cs:Key:plant:output
+    plant:output:cold_air: Cs:Key:plant:output:cold air
+    plant:output:cold_water: Cs:Key:plant:output:cold water
+    plant:output:compressed_air: Cs:Key:plant:output:compressed air
+    plant:output:electricity: Cs:Key:plant:output:electricity
+    plant:output:hot_air: Cs:Key:plant:output:hot air
+    plant:output:hot_water: Cs:Key:plant:output:hot water
+    plant:output:steam: Cs:Key:plant:output:steam
+    plant:output:vacuum: Cs:Key:plant:output:vacuum
+    playground: Cs:Key:playground
+    playground:theme: Cs:Key:playground:theme
     population: Cs:Key:population
+    post_box:type: Cs:Key:post box:type
+    postal_code: Cs:Key:postal code
     power: Cs:Key:power
+    power_source: Cs:Key:power source
+    power_supply: Cs:Key:power supply
+    power_supply:schedule: Cs:Key:power supply:schedule
+    preschool: Cs:Key:preschool
+    priority: Cs:Key:priority
+    priority_road: Cs:Key:priority road
+    produce: Cs:Key:produce
+    product: Cs:Key:product
+    proposed: Cs:Key:proposed
+    protect_class: Cs:Key:protect class
+    protected: Cs:Key:protected
+    protection_title: Cs:Key:protection title
+    psv: Cs:Key:psv
+    public_transport: Cs:Key:public transport
+    public_transport:version: Cs:Key:public transport:version
+    pump: Cs:Key:pump
+    rack: Cs:Key:rack
     railway: Cs:Key:railway
+    railway:position: Cs:Key:railway:position
+    railway:preserved: Cs:Key:railway:preserved
+    railway:track_ref: Cs:Key:railway:track ref
+    ramp: Cs:Key:ramp
+    ramp:bicycle: Cs:Key:ramp:bicycle
+    ramsar: Cs:Key:ramsar
+    recording: Cs:Key:recording
+    recycling_type: Cs:Key:recycling type
+    reef: Cs:Key:reef
+    ref: Cs:Key:ref
+    ref:cobe: Cs:Key:ref:cobe
+    ref:isil: Cs:Key:ref:isil
     ref:ruian: Cs:Key:ref:ruian
     ref:ruian:addr: Cs:Key:ref:ruian:addr
     ref:ruian:building: Cs:Key:ref:ruian:building
+    ref:ruian:street: Cs:Key:ref:ruian:street
+    ref:vatin: Cs:Key:ref:vatin
+    ref:zsj: Cs:Key:ref:zsj
+    reference_point: Cs:Key:reference point
     reg_name: Cs:Key:reg name
+    reg_ref: Cs:Key:reg ref
+    religion: Cs:Key:religion
+    'removed:': 'Cs:Key:removed:'
+    rental: Cs:Key:rental
+    repair: Cs:Key:repair
+    reservation: Cs:Key:reservation
+    residential: Cs:Key:residential
+    resource: Cs:Key:resource
+    right: Cs:Key:right
+    right:country: Cs:Key:right:country
+    roadtrain: Cs:Key:roadtrain
+    roof:colour: Cs:Key:roof:colour
+    roof:direction: Cs:Key:roof:direction
+    roof:material: Cs:Key:roof:material
+    roof:shape: Cs:Key:roof:shape
+    rooms: Cs:Key:rooms
+    roundtrip: Cs:Key:roundtrip
     route: Cs:Key:route
+    route_master: Cs:Key:route master
+    ruined: Cs:Key:ruined
+    'ruined:': 'Cs:Key:ruined:'
+    ruins: Cs:Key:ruins
+    'ruins:': 'Cs:Key:ruins:'
+    rungs: Cs:Key:rungs
+    sac_scale: Cs:Key:sac scale
+    safety_rope: Cs:Key:safety rope
     salt: Cs:Key:salt
+    sanitary_dump_station: Cs:Key:sanitary dump station
+    scenic: Cs:Key:scenic
+    seamark:bridge:category: Cs:Key:seamark:bridge:category
+    seasonal: Cs:Key:seasonal
+    seats: Cs:Key:seats
+    second_hand: Cs:Key:second hand
+    segregated: Cs:Key:segregated
+    self_service: Cs:Key:self service
+    sells:tobacco: Cs:Key:sells:tobacco
+    service: Cs:Key:service
+    service:bicycle:repair: Cs:Key:service:bicycle:repair
+    service_times: Cs:Key:service times
+    share_taxi: Cs:Key:share taxi
+    shelter: Cs:Key:shelter
+    shelter_type: Cs:Key:shelter type
+    ship: Cs:Key:ship
     shop: Cs:Key:shop
     short_name: Cs:Key:short name
+    shoulder: Cs:Key:shoulder
+    sides: Cs:Key:sides
+    sidewalk: Cs:Key:sidewalk
+    site_type: Cs:Key:site type
+    size: Cs:Key:size
+    ski: Cs:Key:ski
+    smokefree: Cs:Key:smokefree
+    smoking: Cs:Key:smoking
     smoothness: Cs:Key:smoothness
+    social_facility: Cs:Key:social facility
+    social_facility:for: Cs:Key:social facility:for
     sorting_name: Cs:Key:sorting name
+    source: Cs:Key:source
+    source:addr: Cs:Key:source:addr
+    source:date: Cs:Key:source:date
+    source:geometry: Cs:Key:source:geometry
+    source:geometry:date: Cs:Key:source:geometry:date
+    source:loc: Cs:Key:source:loc
+    source:maxspeed: Cs:Key:source:maxspeed
+    source:name: Cs:Key:source:name
+    source:position: Cs:Key:source:position
+    source:ref: Cs:Key:source:ref
+    species: Cs:Key:species
+    species:cs: Cs:Key:species:cs
+    species:de: Cs:Key:species:de
+    speech_input: Cs:Key:speech input
+    speech_input:lg: Cs:Key:speech input:lg
+    speech_output: Cs:Key:speech output
+    speech_output:lg: Cs:Key:speech output:lg
     sport: Cs:Key:sport
+    stars: Cs:Key:stars
+    start_date: Cs:Key:start date
+    station: Cs:Key:station
+    status: Cs:Key:status
+    step_count: Cs:Key:step count
+    stone_type: Cs:Key:stone type
+    stop: Cs:Key:stop
+    sub_sea: Cs:Key:sub sea
+    subject: Cs:Key:subject
+    subsea: Cs:Key:subsea
+    substance: Cs:Key:substance
+    support: Cs:Key:support
     surface: Cs:Key:surface
+    surveillance: Cs:Key:surveillance
+    surveillance:type: Cs:Key:surveillance:type
+    surveillance:zone: Cs:Key:surveillance:zone
+    survey:date: Cs:Key:survey:date
+    symbol: Cs:Key:symbol
+    tactile_paving: Cs:Key:tactile paving
+    tactile_writing: Cs:Key:tactile writing
+    tactile_writing:braille:lg: Cs:Key:tactile writing:braille:lg
+    takeaway: Cs:Key:takeaway
+    tank: Cs:Key:tank
+    tank_trap: Cs:Key:tank trap
+    target: Cs:Key:target
+    taxi: Cs:Key:taxi
+    taxon: Cs:Key:taxon
+    tenant: Cs:Key:tenant
+    tents: Cs:Key:tents
+    theme: Cs:Key:theme
+    tidal: Cs:Key:tidal
+    tobacco: Cs:Key:tobacco
+    todo: Cs:Key:todo
+    toilets:wheelchair: Cs:Key:toilets:wheelchair
+    toll: Cs:Key:toll
     tourism: Cs:Key:tourism
+    tourist_bus: Cs:Key:tourist bus
+    tower:type: Cs:Key:tower:type
+    tracks: Cs:Key:tracks
     tracktype: Cs:Key:tracktype
+    traffic_calming: Cs:Key:traffic calming
+    traffic_sign: Cs:Key:traffic sign
+    traffic_signals: Cs:Key:traffic signals
+    traffic_signals:arrow: Cs:Key:traffic signals:arrow
+    traffic_signals:direction: Cs:Key:traffic signals:direction
+    traffic_signals:floor_vibration: Cs:Key:traffic signals:floor vibration
+    traffic_signals:minimap: Cs:Key:traffic signals:minimap
+    traffic_signals:sound: Cs:Key:traffic signals:sound
+    traffic_signals:vibration: Cs:Key:traffic signals:vibration
+    trail_visibility: Cs:Key:trail visibility
+    trailer: Cs:Key:trailer
+    train: Cs:Key:train
+    tram: Cs:Key:tram
+    trees: Cs:Key:trees
+    trolley_wire: Cs:Key:trolley wire
+    trolleybus: Cs:Key:trolleybus
+    tunnel: Cs:Key:tunnel
+    turn: Cs:Key:turn
+    turn:lanes: Cs:Key:turn:lanes
+    twitter: Cs:Key:twitter
+    type: Cs:Key:type
+    uic_name: Cs:Key:uic name
+    uic_ref: Cs:Key:uic ref
+    uir_adr:ADRESA_KOD: Cs:Key:uir adr:ADRESA KOD
+    unisex: Cs:Key:unisex
+    unit: Cs:Key:unit
+    unnamed: Cs:Key:unnamed
+    unsigned: Cs:Key:unsigned
+    url: Cs:Key:url
+    usage: Cs:Key:usage
+    vehicle: Cs:Key:vehicle
+    vine_row_orientation: Cs:Key:vine row orientation
+    visibility: Cs:Key:visibility
+    voltage: Cs:Key:voltage
+    waste: Cs:Key:waste
     water: Cs:Key:water
+    water_point: Cs:Key:water point
     waterway: Cs:Key:waterway
+    website: Cs:Key:website
+    wetland: Cs:Key:wetland
+    wheelchair: Cs:Key:wheelchair
+    wholesale: Cs:Key:wholesale
     width: Cs:Key:width
+    wiki:symbol: Cs:Key:wiki:symbol
+    wikidata: Cs:Key:wikidata
+    wikimedia_commons: Cs:Key:wikimedia commons
+    wikipedia: Cs:Key:wikipedia
+    winter_road: Cs:Key:winter road
+    wood: Cs:Key:wood
+    zone:maxspeed: Cs:Key:zone:maxspeed
+    zone:traffic: Cs:Key:zone:traffic
+    zoo: Cs:Key:zoo
   tag:
+    FIXME=Position_estimated: Cs:Tag:FIXME=Position estimated
+    abandoned:amenity=prison: Cs:Tag:abandoned:amenity=prison
+    abandoned:amenity=prison_camp: Cs:Tag:abandoned:amenity=prison camp
+    access=customers: Cs:Tag:access=customers
+    access=designated: Cs:Tag:access=designated
+    access=exclusion_zone: Cs:Tag:access=exclusion zone
+    access=no: Cs:Tag:access=no
+    access=official: Cs:Tag:access=official
+    access=private: Cs:Tag:access=private
+    admin_level=2: Cs:Tag:admin level=2
+    advertising=billboard: Cs:Tag:advertising=billboard
+    advertising=board: Cs:Tag:advertising=board
+    advertising=column: Cs:Tag:advertising=column
+    advertising=flag: Cs:Tag:advertising=flag
+    advertising=poster_box: Cs:Tag:advertising=poster box
+    advertising=screen: Cs:Tag:advertising=screen
+    advertising=sculpture: Cs:Tag:advertising=sculpture
+    advertising=sign: Cs:Tag:advertising=sign
+    advertising=tarp: Cs:Tag:advertising=tarp
+    advertising=totem: Cs:Tag:advertising=totem
+    advertising=wall_painting: Cs:Tag:advertising=wall painting
+    aerialway=cable_car: Cs:Tag:aerialway=cable car
+    aerialway=canopy: Cs:Tag:aerialway=canopy
+    aerialway=chair_lift: Cs:Tag:aerialway=chair lift
+    aerialway=drag_lift: Cs:Tag:aerialway=drag lift
+    aerialway=gondola: Cs:Tag:aerialway=gondola
+    aerialway=goods: Cs:Tag:aerialway=goods
+    aerialway=j-bar: Cs:Tag:aerialway=j-bar
+    aerialway=magic_carpet: Cs:Tag:aerialway=magic carpet
+    aerialway=mixed_lift: Cs:Tag:aerialway=mixed lift
+    aerialway=platter: Cs:Tag:aerialway=platter
+    aerialway=pylon: Cs:Tag:aerialway=pylon
+    aerialway=rope_tow: Cs:Tag:aerialway=rope tow
+    aerialway=station: Cs:Tag:aerialway=station
+    aerialway=t-bar: Cs:Tag:aerialway=t-bar
+    aerialway=zip_line: Cs:Tag:aerialway=zip line
+    aeroway=aerodrome: Cs:Tag:aeroway=aerodrome
+    aeroway=apron: Cs:Tag:aeroway=apron
+    aeroway=fuel: Cs:Tag:aeroway=fuel
+    aeroway=gate: Cs:Tag:aeroway=gate
+    aeroway=hangar: Cs:Tag:aeroway=hangar
+    aeroway=helipad: Cs:Tag:aeroway=helipad
+    aeroway=heliport: Cs:Tag:aeroway=heliport
+    aeroway=holding_position: Cs:Tag:aeroway=holding position
+    aeroway=navigationaid: Cs:Tag:aeroway=navigationaid
+    aeroway=parking_position: Cs:Tag:aeroway=parking position
+    aeroway=runway: Cs:Tag:aeroway=runway
+    aeroway=taxilane: Cs:Tag:aeroway=taxilane
+    aeroway=taxiway: Cs:Tag:aeroway=taxiway
+    aeroway=terminal: Cs:Tag:aeroway=terminal
+    aeroway=windsock: Cs:Tag:aeroway=windsock
+    airmark=beacon: Cs:Tag:airmark=beacon
+    allotments=plot: Cs:Tag:allotments=plot
+    amenity=advertising: Cs:Tag:amenity=advertising
+    amenity=animal_boarding: Cs:Tag:amenity=animal boarding
+    amenity=animal_breeding: Cs:Tag:amenity=animal breeding
+    amenity=animal_shelter: Cs:Tag:amenity=animal shelter
+    amenity=arts_centre: Cs:Tag:amenity=arts centre
+    amenity=artwork: Cs:Tag:amenity=artwork
+    amenity=atm: Cs:Tag:amenity=atm
+    amenity=audiologist: Cs:Tag:amenity=audiologist
     amenity=baby_hatch: Cs:Tag:amenity=baby hatch
+    amenity=baking_oven: Cs:Tag:amenity=baking oven
+    amenity=bank: Cs:Tag:amenity=bank
+    amenity=bar: Cs:Tag:amenity=bar
+    amenity=bbq: Cs:Tag:amenity=bbq
+    amenity=bench: Cs:Tag:amenity=bench
+    amenity=bicycle_parking: Cs:Tag:amenity=bicycle parking
+    amenity=bicycle_rental: Cs:Tag:amenity=bicycle rental
+    amenity=bicycle_repair_station: Cs:Tag:amenity=bicycle repair station
+    amenity=biergarten: Cs:Tag:amenity=biergarten
+    amenity=boat_rental: Cs:Tag:amenity=boat rental
+    amenity=boat_sharing: Cs:Tag:amenity=boat sharing
+    amenity=boat_storage: Cs:Tag:amenity=boat storage
+    amenity=brothel: Cs:Tag:amenity=brothel
+    amenity=bts: Cs:Tag:amenity=bts
+    amenity=bureau_de_change: Cs:Tag:amenity=bureau de change
+    amenity=bus_station: Cs:Tag:amenity=bus station
+    amenity=cafe: Cs:Tag:amenity=cafe
+    amenity=car_pooling: Cs:Tag:amenity=car pooling
+    amenity=car_rental: Cs:Tag:amenity=car rental
+    amenity=car_repair: Cs:Tag:amenity=car repair
+    amenity=car_sharing: Cs:Tag:amenity=car sharing
+    amenity=car_wash: Cs:Tag:amenity=car wash
+    amenity=casino: Cs:Tag:amenity=casino
+    amenity=charging_station: Cs:Tag:amenity=charging station
+    amenity=childcare: Cs:Tag:amenity=childcare
+    amenity=cinema: Cs:Tag:amenity=cinema
+    amenity=citymap_post: Cs:Tag:amenity=citymap post
+    amenity=clinic: Cs:Tag:amenity=clinic
+    amenity=clock: Cs:Tag:amenity=clock
+    amenity=college: Cs:Tag:amenity=college
+    amenity=community_center: Cs:Tag:amenity=community center
+    amenity=community_centre: Cs:Tag:amenity=community centre
+    amenity=compressed_air: Cs:Tag:amenity=compressed air
+    amenity=courthouse: Cs:Tag:amenity=courthouse
+    amenity=coworking_space: Cs:Tag:amenity=coworking space
+    amenity=crematorium: Cs:Tag:amenity=crematorium
+    amenity=crypt: Cs:Tag:amenity=crypt
+    amenity=dentist: Cs:Tag:amenity=dentist
+    amenity=disused: Cs:Tag:amenity=disused
+    amenity=dive_centre: Cs:Tag:amenity=dive centre
+    amenity=doctors: Cs:Tag:amenity=doctors
+    amenity=dog_bin: Cs:Tag:amenity=dog bin
+    amenity=dog_waste_bin: Cs:Tag:amenity=dog waste bin
+    amenity=dojo: Cs:Tag:amenity=dojo
+    amenity=drinking_water: Cs:Tag:amenity=drinking water
+    amenity=driving_school: Cs:Tag:amenity=driving school
+    amenity=education: Cs:Tag:amenity=education
+    amenity=embassy: Cs:Tag:amenity=embassy
+    amenity=emergency_phone: Cs:Tag:amenity=emergency phone
+    amenity=ev_charging: Cs:Tag:amenity=ev charging
+    amenity=events_venue: Cs:Tag:amenity=events venue
+    amenity=exercise_point: Cs:Tag:amenity=exercise point
+    amenity=fast_food: Cs:Tag:amenity=fast food
+    amenity=feeding_place: Cs:Tag:amenity=feeding place
+    amenity=ferry_terminal: Cs:Tag:amenity=ferry terminal
+    amenity=fire_hydrant: Cs:Tag:amenity=fire hydrant
+    amenity=fire_station: Cs:Tag:amenity=fire station
+    amenity=food_court: Cs:Tag:amenity=food court
+    amenity=fountain: Cs:Tag:amenity=fountain
+    amenity=fuel: Cs:Tag:amenity=fuel
+    amenity=gambling: Cs:Tag:amenity=gambling
+    amenity=game_feeding: Cs:Tag:amenity=game feeding
+    amenity=garages: Cs:Tag:amenity=garages
+    amenity=grave_yard: Cs:Tag:amenity=grave yard
+    amenity=grit_bin: Cs:Tag:amenity=grit bin
+    amenity=gym: Cs:Tag:amenity=gym
+    amenity=hospital: Cs:Tag:amenity=hospital
+    amenity=hotel: Cs:Tag:amenity=hotel
+    amenity=hunting_stand: Cs:Tag:amenity=hunting stand
+    amenity=ice_cream: Cs:Tag:amenity=ice cream
+    amenity=internet_cafe: Cs:Tag:amenity=internet cafe
+    amenity=jobcentre: Cs:Tag:amenity=jobcentre
+    amenity=kindergarten: Cs:Tag:amenity=kindergarten
+    amenity=kiosk: Cs:Tag:amenity=kiosk
+    amenity=kneipp_water_cure: Cs:Tag:amenity=kneipp water cure
+    amenity=language_school: Cs:Tag:amenity=language school
+    amenity=library: Cs:Tag:amenity=library
+    amenity=life_ring: Cs:Tag:amenity=life ring
+    amenity=love_hotel: Cs:Tag:amenity=love hotel
+    amenity=marketplace: Cs:Tag:amenity=marketplace
+    amenity=mobile_library: Cs:Tag:amenity=mobile library
+    amenity=monastery: Cs:Tag:amenity=monastery
+    amenity=money_transfer: Cs:Tag:amenity=money transfer
+    amenity=motorcycle_parking: Cs:Tag:amenity=motorcycle parking
+    amenity=motorcycle_rental: Cs:Tag:amenity=motorcycle rental
+    amenity=music_school: Cs:Tag:amenity=music school
+    amenity=music_venue: Cs:Tag:amenity=music venue
+    amenity=nightclub: Cs:Tag:amenity=nightclub
+    amenity=nursery: Cs:Tag:amenity=nursery
+    amenity=nursing_home: Cs:Tag:amenity=nursing home
+    amenity=park: Cs:Tag:amenity=park
+    amenity=parking: Cs:Tag:amenity=parking
+    amenity=parking_entrance: Cs:Tag:amenity=parking entrance
+    amenity=parking_space: Cs:Tag:amenity=parking space
+    amenity=pharmacy: Cs:Tag:amenity=pharmacy
+    amenity=photo_booth: Cs:Tag:amenity=photo booth
+    amenity=place_of_worship: Cs:Tag:amenity=place of worship
+    amenity=planetarium: Cs:Tag:amenity=planetarium
+    amenity=police: Cs:Tag:amenity=police
+    amenity=post_box: Cs:Tag:amenity=post box
+    amenity=post_office: Cs:Tag:amenity=post office
+    amenity=preschool: Cs:Tag:amenity=preschool
+    amenity=prison: Cs:Tag:amenity=prison
+    amenity=prison_camp: Cs:Tag:amenity=prison camp
+    amenity=pub: Cs:Tag:amenity=pub
+    amenity=public_bath: Cs:Tag:amenity=public bath
+    amenity=public_bookcase: Cs:Tag:amenity=public bookcase
+    amenity=public_building: Cs:Tag:amenity=public building
+    amenity=ranger_station: Cs:Tag:amenity=ranger station
+    amenity=recycling: Cs:Tag:amenity=recycling
+    amenity=register_office: Cs:Tag:amenity=register office
+    amenity=rescue_station: Cs:Tag:amenity=rescue station
+    amenity=restaurant: Cs:Tag:amenity=restaurant
+    amenity=retirement_home: Cs:Tag:amenity=retirement home
+    amenity=sanitary_dump_station: Cs:Tag:amenity=sanitary dump station
+    amenity=sauna: Cs:Tag:amenity=sauna
+    amenity=school: Cs:Tag:amenity=school
+    amenity=shelter: Cs:Tag:amenity=shelter
+    amenity=shop: Cs:Tag:amenity=shop
+    amenity=shower: Cs:Tag:amenity=shower
+    amenity=smoking_area: Cs:Tag:amenity=smoking area
+    amenity=social_centre: Cs:Tag:amenity=social centre
+    amenity=social_facility: Cs:Tag:amenity=social facility
+    amenity=spa: Cs:Tag:amenity=spa
+    amenity=stables: Cs:Tag:amenity=stables
+    amenity=stripclub: Cs:Tag:amenity=stripclub
+    amenity=studio: Cs:Tag:amenity=studio
+    amenity=swimming_pool: Cs:Tag:amenity=swimming pool
+    amenity=swingerclub: Cs:Tag:amenity=swingerclub
+    amenity=table: Cs:Tag:amenity=table
+    amenity=taxi: Cs:Tag:amenity=taxi
+    amenity=telephone: Cs:Tag:amenity=telephone
+    amenity=theatre: Cs:Tag:amenity=theatre
+    amenity=ticket_booth: Cs:Tag:amenity=ticket booth
+    amenity=toilets: Cs:Tag:amenity=toilets
+    amenity=townhall: Cs:Tag:amenity=townhall
+    amenity=university: Cs:Tag:amenity=university
+    amenity=vacuum_cleaner: Cs:Tag:amenity=vacuum cleaner
+    amenity=vending_machine: Cs:Tag:amenity=vending machine
+    amenity=veterinary: Cs:Tag:amenity=veterinary
+    amenity=waste_basket: Cs:Tag:amenity=waste basket
+    amenity=waste_disposal: Cs:Tag:amenity=waste disposal
+    amenity=waste_transfer_station: Cs:Tag:amenity=waste transfer station
+    amenity=water: Cs:Tag:amenity=water
+    amenity=water_point: Cs:Tag:amenity=water point
+    amenity=watering_place: Cs:Tag:amenity=watering place
+    amenity=winery: Cs:Tag:amenity=winery
+    amenity=youth_centre: Cs:Tag:amenity=youth centre
+    atm=yes: Cs:Tag:atm=yes
+    attraction=animal: Cs:Tag:attraction=animal
     baby_hatch=yes: Cs:Tag:baby hatch=yes
+    barrier=block: Cs:Tag:barrier=block
+    barrier=bollard: Cs:Tag:barrier=bollard
+    barrier=border_control: Cs:Tag:barrier=border control
+    barrier=bump_gate: Cs:Tag:barrier=bump gate
+    barrier=bus_trap: Cs:Tag:barrier=bus trap
+    barrier=cable_barrier: Cs:Tag:barrier=cable barrier
+    barrier=cattle_grid: Cs:Tag:barrier=cattle grid
+    barrier=chain: Cs:Tag:barrier=chain
+    barrier=city_wall: Cs:Tag:barrier=city wall
+    barrier=cycle_barrier: Cs:Tag:barrier=cycle barrier
+    barrier=czech_hedgehog: Cs:Tag:barrier=czech hedgehog
+    barrier=debris: Cs:Tag:barrier=debris
+    barrier=ditch: Cs:Tag:barrier=ditch
+    barrier=entrance: Cs:Tag:barrier=entrance
+    barrier=fence: Cs:Tag:barrier=fence
+    barrier=full-height_turnstile: Cs:Tag:barrier=full-height turnstile
+    barrier=gate: Cs:Tag:barrier=gate
+    barrier=guard_rail: Cs:Tag:barrier=guard rail
+    barrier=hampshire_gate: Cs:Tag:barrier=hampshire gate
+    barrier=handrail: Cs:Tag:barrier=handrail
+    barrier=hedge: Cs:Tag:barrier=hedge
+    barrier=height_restrictor: Cs:Tag:barrier=height restrictor
+    barrier=horse_stile: Cs:Tag:barrier=horse stile
+    barrier=jersey_barrier: Cs:Tag:barrier=jersey barrier
+    barrier=kent_carriage_gap: Cs:Tag:barrier=kent carriage gap
+    barrier=kerb: Cs:Tag:barrier=kerb
+    barrier=kissing_gate: Cs:Tag:barrier=kissing gate
+    barrier=lift_gate: Cs:Tag:barrier=lift gate
+    barrier=log: Cs:Tag:barrier=log
+    barrier=motorcycle_barrier: Cs:Tag:barrier=motorcycle barrier
+    barrier=retaining_wall: Cs:Tag:barrier=retaining wall
+    barrier=rope: Cs:Tag:barrier=rope
+    barrier=sally_port: Cs:Tag:barrier=sally port
+    barrier=spikes: Cs:Tag:barrier=spikes
+    barrier=stile: Cs:Tag:barrier=stile
+    barrier=sump_buster: Cs:Tag:barrier=sump buster
+    barrier=swing_gate: Cs:Tag:barrier=swing gate
+    barrier=tank_trap: Cs:Tag:barrier=tank trap
+    barrier=toll_booth: Cs:Tag:barrier=toll booth
+    barrier=turnstile: Cs:Tag:barrier=turnstile
+    barrier=wall: Cs:Tag:barrier=wall
+    bath:type=onsen: Cs:Tag:bath:type=onsen
+    bicycle=designated: Cs:Tag:bicycle=designated
+    bicycle=use_sidepath: Cs:Tag:bicycle=use sidepath
+    boundary=administrative: Cs:Tag:boundary=administrative
+    boundary=civil: Cs:Tag:boundary=civil
+    boundary=economic: Cs:Tag:boundary=economic
+    boundary=historic: Cs:Tag:boundary=historic
+    boundary=maritime: Cs:Tag:boundary=maritime
+    boundary=military_district: Cs:Tag:boundary=military district
+    boundary=national: Cs:Tag:boundary=national
+    boundary=national_park: Cs:Tag:boundary=national park
+    boundary=political: Cs:Tag:boundary=political
+    boundary=postal_code: Cs:Tag:boundary=postal code
+    boundary=protected_area: Cs:Tag:boundary=protected area
+    boundary=regional_park: Cs:Tag:boundary=regional park
+    boundary=timezone: Cs:Tag:boundary=timezone
+    bridge:movable=bascule: Cs:Tag:bridge:movable=bascule
+    bridge:movable=drawbridge: Cs:Tag:bridge:movable=drawbridge
+    bridge:movable=lift: Cs:Tag:bridge:movable=lift
+    bridge:movable=submersible: Cs:Tag:bridge:movable=submersible
+    bridge:movable=swing: Cs:Tag:bridge:movable=swing
+    bridge:movable=transporter: Cs:Tag:bridge:movable=transporter
+    bridge:structure=arch: Cs:Tag:bridge:structure=arch
+    bridge:structure=beam: Cs:Tag:bridge:structure=beam
+    bridge:structure=cable-stayed: Cs:Tag:bridge:structure=cable-stayed
+    bridge:structure=floating: Cs:Tag:bridge:structure=floating
+    bridge:structure=humpback: Cs:Tag:bridge:structure=humpback
+    bridge:structure=simple-suspension: Cs:Tag:bridge:structure=simple-suspension
+    bridge:structure=suspension: Cs:Tag:bridge:structure=suspension
+    bridge:structure=truss: Cs:Tag:bridge:structure=truss
+    bridge=aqueduct: Cs:Tag:bridge=aqueduct
+    bridge=boardwalk: Cs:Tag:bridge=boardwalk
+    bridge=cantilever: Cs:Tag:bridge=cantilever
+    bridge=covered: Cs:Tag:bridge=covered
+    bridge=movable: Cs:Tag:bridge=movable
+    bridge=trestle: Cs:Tag:bridge=trestle
+    bridge=viaduct: Cs:Tag:bridge=viaduct
+    building:use=stable: Cs:Tag:building:use=stable
+    building=apartments: Cs:Tag:building=apartments
+    building=bakehouse: Cs:Tag:building=bakehouse
+    building=barn: Cs:Tag:building=barn
+    building=bridge: Cs:Tag:building=bridge
+    building=bungalow: Cs:Tag:building=bungalow
+    building=bunker: Cs:Tag:building=bunker
+    building=cabin: Cs:Tag:building=cabin
+    building=carport: Cs:Tag:building=carport
+    building=cathedral: Cs:Tag:building=cathedral
+    building=chapel: Cs:Tag:building=chapel
+    building=church: Cs:Tag:building=church
+    building=civic: Cs:Tag:building=civic
+    building=commercial: Cs:Tag:building=commercial
+    building=condominium: Cs:Tag:building=condominium
+    building=conservatory: Cs:Tag:building=conservatory
+    building=construction: Cs:Tag:building=construction
+    building=cowshed: Cs:Tag:building=cowshed
+    building=detached: Cs:Tag:building=detached
+    building=dormitory: Cs:Tag:building=dormitory
     building=farm: Cs:Tag:building=farm
+    building=farm_auxiliary: Cs:Tag:building=farm auxiliary
+    building=garage: Cs:Tag:building=garage
+    building=garages: Cs:Tag:building=garages
+    building=greenhouse: Cs:Tag:building=greenhouse
+    building=hangar: Cs:Tag:building=hangar
+    building=hospital: Cs:Tag:building=hospital
+    building=hotel: Cs:Tag:building=hotel
+    building=house: Cs:Tag:building=house
+    building=houseboat: Cs:Tag:building=houseboat
+    building=hut: Cs:Tag:building=hut
+    building=industrial: Cs:Tag:building=industrial
+    building=kiosk: Cs:Tag:building=kiosk
+    building=mosque: Cs:Tag:building=mosque
+    building=office: Cs:Tag:building=office
+    building=parking: Cs:Tag:building=parking
+    building=public: Cs:Tag:building=public
+    building=residential: Cs:Tag:building=residential
+    building=retail: Cs:Tag:building=retail
     building=roof: Cs:Tag:building=roof
+    building=ruins: Cs:Tag:building=ruins
     building=school: Cs:Tag:building=school
+    building=service: Cs:Tag:building=service
+    building=shed: Cs:Tag:building=shed
+    building=shrine: Cs:Tag:building=shrine
+    building=stable: Cs:Tag:building=stable
+    building=stadium: Cs:Tag:building=stadium
+    building=static_caravan: Cs:Tag:building=static caravan
+    building=sty: Cs:Tag:building=sty
+    building=synagogue: Cs:Tag:building=synagogue
+    building=temple: Cs:Tag:building=temple
+    building=terrace: Cs:Tag:building=terrace
+    building=train_station: Cs:Tag:building=train station
+    building=transformer_tower: Cs:Tag:building=transformer tower
+    building=transportation: Cs:Tag:building=transportation
     building=university: Cs:Tag:building=university
+    building=warehouse: Cs:Tag:building=warehouse
+    building=yes: Cs:Tag:building=yes
+    bunker_type=hardened_aircraft_shelter: Cs:Tag:bunker type=hardened aircraft shelter
+    bunker_type=munitions: Cs:Tag:bunker type=munitions
+    bunker_type=pillbox: Cs:Tag:bunker type=pillbox
+    busway=lane: Cs:Tag:busway=lane
+    busway=opposite_lane: Cs:Tag:busway=opposite lane
+    cafe=time-cafe: Cs:Tag:cafe=time-cafe
+    castle_type=castrum: Cs:Tag:castle type=castrum
+    castle_type=defensive: Cs:Tag:castle type=defensive
+    castle_type=fortress: Cs:Tag:castle type=fortress
+    castle_type=kremlin: Cs:Tag:castle type=kremlin
+    castle_type=manor: Cs:Tag:castle type=manor
+    castle_type=palace: Cs:Tag:castle type=palace
+    castle_type=shiro: Cs:Tag:castle type=shiro
+    castle_type=stately: Cs:Tag:castle type=stately
+    cemetery=grave: Cs:Tag:cemetery=grave
+    clothes=motorcycle: Cs:Tag:clothes=motorcycle
+    clothes=sports: Cs:Tag:clothes=sports
+    clothes=underwear: Cs:Tag:clothes=underwear
+    craft=agricultural_engines: Cs:Tag:craft=agricultural engines
+    craft=bakery: Cs:Tag:craft=bakery
+    craft=basket_maker: Cs:Tag:craft=basket maker
+    craft=beekeeper: Cs:Tag:craft=beekeeper
+    craft=blacksmith: Cs:Tag:craft=blacksmith
+    craft=boatbuilder: Cs:Tag:craft=boatbuilder
+    craft=bookbinder: Cs:Tag:craft=bookbinder
+    craft=brewery: Cs:Tag:craft=brewery
+    craft=builder: Cs:Tag:craft=builder
+    craft=carpenter: Cs:Tag:craft=carpenter
+    craft=carpet_layer: Cs:Tag:craft=carpet layer
+    craft=caterer: Cs:Tag:craft=caterer
+    craft=chimney_sweeper: Cs:Tag:craft=chimney sweeper
+    craft=clockmaker: Cs:Tag:craft=clockmaker
+    craft=confectionery: Cs:Tag:craft=confectionery
+    craft=distillery: Cs:Tag:craft=distillery
+    craft=dressmaker: Cs:Tag:craft=dressmaker
+    craft=electrician: Cs:Tag:craft=electrician
+    craft=floorer: Cs:Tag:craft=floorer
+    craft=gardener: Cs:Tag:craft=gardener
+    craft=glaziery: Cs:Tag:craft=glaziery
+    craft=grinding_mill: Cs:Tag:craft=grinding mill
+    craft=handicraft: Cs:Tag:craft=handicraft
+    craft=hvac: Cs:Tag:craft=hvac
+    craft=insulation: Cs:Tag:craft=insulation
+    craft=jeweller: Cs:Tag:craft=jeweller
+    craft=key_cutter: Cs:Tag:craft=key cutter
+    craft=locksmith: Cs:Tag:craft=locksmith
+    craft=metal_construction: Cs:Tag:craft=metal construction
+    craft=oil_mill: Cs:Tag:craft=oil mill
+    craft=optician: Cs:Tag:craft=optician
+    craft=painter: Cs:Tag:craft=painter
+    craft=parquet_layer: Cs:Tag:craft=parquet layer
+    craft=photographer: Cs:Tag:craft=photographer
+    craft=photographic_laboratory: Cs:Tag:craft=photographic laboratory
+    craft=piano_tuner: Cs:Tag:craft=piano tuner
+    craft=plasterer: Cs:Tag:craft=plasterer
+    craft=plumber: Cs:Tag:craft=plumber
+    craft=pottery: Cs:Tag:craft=pottery
+    craft=rigger: Cs:Tag:craft=rigger
+    craft=roofer: Cs:Tag:craft=roofer
+    craft=saddler: Cs:Tag:craft=saddler
+    craft=sailmaker: Cs:Tag:craft=sailmaker
+    craft=sawmill: Cs:Tag:craft=sawmill
+    craft=scaffolder: Cs:Tag:craft=scaffolder
+    craft=sculptor: Cs:Tag:craft=sculptor
+    craft=sewing: Cs:Tag:craft=sewing
+    craft=shoemaker: Cs:Tag:craft=shoemaker
+    craft=stand_builder: Cs:Tag:craft=stand builder
+    craft=stonemason: Cs:Tag:craft=stonemason
+    craft=sun_protection: Cs:Tag:craft=sun protection
+    craft=tailor: Cs:Tag:craft=tailor
+    craft=tiler: Cs:Tag:craft=tiler
+    craft=tinsmith: Cs:Tag:craft=tinsmith
+    craft=turner: Cs:Tag:craft=turner
+    craft=upholsterer: Cs:Tag:craft=upholsterer
+    craft=watchmaker: Cs:Tag:craft=watchmaker
+    craft=window_construction: Cs:Tag:craft=window construction
+    craft=winery: Cs:Tag:craft=winery
+    cuisine=brazilian: Cs:Tag:cuisine=brazilian
+    cuisine=coffee_shop: Cs:Tag:cuisine=coffee shop
+    cuisine=dessert: Cs:Tag:cuisine=dessert
+    cycleway:left=lane: Cs:Tag:cycleway:left=lane
+    cycleway:left=opposite_track: Cs:Tag:cycleway:left=opposite track
+    cycleway:left=track: Cs:Tag:cycleway:left=track
+    cycleway:right=lane: Cs:Tag:cycleway:right=lane
+    cycleway:right=opposite_track: Cs:Tag:cycleway:right=opposite track
+    cycleway:right=track: Cs:Tag:cycleway:right=track
+    cycleway=asl: Cs:Tag:cycleway=asl
+    cycleway=bike_box: Cs:Tag:cycleway=bike box
+    cycleway=crossing: Cs:Tag:cycleway=crossing
+    cycleway=lane: Cs:Tag:cycleway=lane
+    cycleway=opposite: Cs:Tag:cycleway=opposite
+    cycleway=opposite_lane: Cs:Tag:cycleway=opposite lane
+    cycleway=opposite_share_busway: Cs:Tag:cycleway=opposite share busway
+    cycleway=opposite_track: Cs:Tag:cycleway=opposite track
+    cycleway=share_busway: Cs:Tag:cycleway=share busway
+    cycleway=track: Cs:Tag:cycleway=track
+    defensive=bergfried: Cs:Tag:defensive=bergfried
+    defensive=donjon: Cs:Tag:defensive=donjon
+    defensive=keep: Cs:Tag:defensive=keep
+    denomination=mormon: Cs:Tag:denomination=mormon
+    denomination=reformed: Cs:Tag:denomination=reformed
+    dock=tidal: Cs:Tag:dock=tidal
+    emergency=access_point: Cs:Tag:emergency=access point
+    emergency=ambulance_station: Cs:Tag:emergency=ambulance station
+    emergency=assembly_point: Cs:Tag:emergency=assembly point
+    emergency=defibrillator: Cs:Tag:emergency=defibrillator
+    emergency=fire_extinguisher: Cs:Tag:emergency=fire extinguisher
+    emergency=fire_flapper: Cs:Tag:emergency=fire flapper
+    emergency=fire_hose: Cs:Tag:emergency=fire hose
+    emergency=fire_hydrant: Cs:Tag:emergency=fire hydrant
+    emergency=landing_site: Cs:Tag:emergency=landing site
+    emergency=life_ring: Cs:Tag:emergency=life ring
+    emergency=lifeguard_base: Cs:Tag:emergency=lifeguard base
+    emergency=lifeguard_place: Cs:Tag:emergency=lifeguard place
+    emergency=lifeguard_platform: Cs:Tag:emergency=lifeguard platform
+    emergency=lifeguard_tower: Cs:Tag:emergency=lifeguard tower
+    emergency=phone: Cs:Tag:emergency=phone
+    emergency=ses_station: Cs:Tag:emergency=ses station
+    emergency=siren: Cs:Tag:emergency=siren
+    emergency=suction_point: Cs:Tag:emergency=suction point
+    emergency=water_tank: Cs:Tag:emergency=water tank
+    fast_food=cafeteria: Cs:Tag:fast food=cafeteria
+    foot=designated: Cs:Tag:foot=designated
+    foot=yes: Cs:Tag:foot=yes
+    footway=crossing: Cs:Tag:footway=crossing
+    footway=sidewalk: Cs:Tag:footway=sidewalk
+    fortification_type=hill_fort: Cs:Tag:fortification type=hill fort
+    fortification_type=limes: Cs:Tag:fortification type=limes
+    fortification_type=ring_ditch: Cs:Tag:fortification type=ring ditch
+    fortification_type=ringfort: Cs:Tag:fortification type=ringfort
+    fortification_type=sconce: Cs:Tag:fortification type=sconce
+    garden:type=botanical: Cs:Tag:garden:type=botanical
+    generator:method=anaerobic_digestion: Cs:Tag:generator:method=anaerobic digestion
+    generator:method=barrage: Cs:Tag:generator:method=barrage
+    generator:method=combustion: Cs:Tag:generator:method=combustion
+    generator:method=fission: Cs:Tag:generator:method=fission
+    generator:method=fusion: Cs:Tag:generator:method=fusion
+    generator:method=gasification: Cs:Tag:generator:method=gasification
+    generator:method=photovoltaic: Cs:Tag:generator:method=photovoltaic
+    generator:method=run-of-the-river: Cs:Tag:generator:method=run-of-the-river
+    generator:method=stream: Cs:Tag:generator:method=stream
+    generator:method=thermal: Cs:Tag:generator:method=thermal
+    generator:method=water-pumped-storage: Cs:Tag:generator:method=water-pumped-storage
+    generator:method=water-storage: Cs:Tag:generator:method=water-storage
+    generator:method=wind_turbine: Cs:Tag:generator:method=wind turbine
+    generator:plant=intermediate: Cs:Tag:generator:plant=intermediate
+    generator:plant=output: Cs:Tag:generator:plant=output
+    generator:source=biofuel: Cs:Tag:generator:source=biofuel
+    generator:source=biogas: Cs:Tag:generator:source=biogas
+    generator:source=biomass: Cs:Tag:generator:source=biomass
+    generator:source=coal: Cs:Tag:generator:source=coal
+    generator:source=gas: Cs:Tag:generator:source=gas
+    generator:source=gasoline: Cs:Tag:generator:source=gasoline
+    generator:source=geothermal: Cs:Tag:generator:source=geothermal
+    generator:source=hydro: Cs:Tag:generator:source=hydro
+    generator:source=nuclear: Cs:Tag:generator:source=nuclear
+    generator:source=oil: Cs:Tag:generator:source=oil
+    generator:source=osmotic: Cs:Tag:generator:source=osmotic
+    generator:source=solar: Cs:Tag:generator:source=solar
+    generator:source=tidal: Cs:Tag:generator:source=tidal
+    generator:source=waste: Cs:Tag:generator:source=waste
+    generator:source=wave: Cs:Tag:generator:source=wave
+    generator:source=wind: Cs:Tag:generator:source=wind
+    generator:type=combined_cycle: Cs:Tag:generator:type=combined cycle
+    generator:type=francis_turbine: Cs:Tag:generator:type=francis turbine
+    generator:type=gas_turbine: Cs:Tag:generator:type=gas turbine
+    generator:type=heat_pump: Cs:Tag:generator:type=heat pump
+    generator:type=horizontal_axis: Cs:Tag:generator:type=horizontal axis
+    generator:type=hydrodynamic_screw: Cs:Tag:generator:type=hydrodynamic screw
+    generator:type=kaplan_turbine: Cs:Tag:generator:type=kaplan turbine
+    generator:type=pelton_turbine: Cs:Tag:generator:type=pelton turbine
+    generator:type=reciprocating_engine: Cs:Tag:generator:type=reciprocating engine
+    generator:type=solar_photovoltaic_panel: Cs:Tag:generator:type=solar photovoltaic
+      panel
+    generator:type=solar_thermal_collector: Cs:Tag:generator:type=solar thermal collector
+    generator:type=steam_generator: Cs:Tag:generator:type=steam generator
+    generator:type=steam_turbine: Cs:Tag:generator:type=steam turbine
+    generator:type=vertical_axis: Cs:Tag:generator:type=vertical axis
+    geological=moraine: Cs:Tag:geological=moraine
+    geological=outcrop: Cs:Tag:geological=outcrop
+    geological=palaeontological_site: Cs:Tag:geological=palaeontological site
+    government=ministry: Cs:Tag:government=ministry
+    government=prosecutor: Cs:Tag:government=prosecutor
+    government=register_office: Cs:Tag:government=register office
+    government=tax: Cs:Tag:government=tax
+    healthcare=blood_donation: Cs:Tag:healthcare=blood donation
+    highway=abandoned: Cs:Tag:highway=abandoned
+    highway=bridleway: Cs:Tag:highway=bridleway
+    highway=bus_guideway: Cs:Tag:highway=bus guideway
+    highway=bus_stop: Cs:Tag:highway=bus stop
+    highway=corridor: Cs:Tag:highway=corridor
+    highway=crossing: Cs:Tag:highway=crossing
+    highway=cycleway: Cs:Tag:highway=cycleway
+    highway=elevator: Cs:Tag:highway=elevator
+    highway=emergency_access_point: Cs:Tag:highway=emergency access point
+    highway=emergency_bay: Cs:Tag:highway=emergency bay
+    highway=escape: Cs:Tag:highway=escape
+    highway=footway: Cs:Tag:highway=footway
+    highway=ford: Cs:Tag:highway=ford
+    highway=give_way: Cs:Tag:highway=give way
+    highway=living_street: Cs:Tag:highway=living street
+    highway=milestone: Cs:Tag:highway=milestone
+    highway=mini_roundabout: Cs:Tag:highway=mini roundabout
+    highway=motorway: Cs:Tag:highway=motorway
+    highway=motorway_junction: Cs:Tag:highway=motorway junction
+    highway=motorway_link: Cs:Tag:highway=motorway link
+    highway=no: Cs:Tag:highway=no
+    highway=passing_place: Cs:Tag:highway=passing place
+    highway=path: Cs:Tag:highway=path
+    highway=pedestrian: Cs:Tag:highway=pedestrian
+    highway=primary: Cs:Tag:highway=primary
+    highway=proposed: Cs:Tag:highway=proposed
+    highway=raceway: Cs:Tag:highway=raceway
+    highway=razed: Cs:Tag:highway=razed
+    highway=residential: Cs:Tag:highway=residential
+    highway=rest_area: Cs:Tag:highway=rest area
+    highway=road: Cs:Tag:highway=road
+    highway=secondary: Cs:Tag:highway=secondary
+    highway=service: Cs:Tag:highway=service
+    highway=services: Cs:Tag:highway=services
+    highway=speed_camera: Cs:Tag:highway=speed camera
+    highway=speed_display: Cs:Tag:highway=speed display
+    highway=steps: Cs:Tag:highway=steps
+    highway=stile: Cs:Tag:highway=stile
+    highway=stop: Cs:Tag:highway=stop
+    highway=street_lamp: Cs:Tag:highway=street lamp
+    highway=tertiary: Cs:Tag:highway=tertiary
+    highway=track: Cs:Tag:highway=track
+    highway=traffic_mirror: Cs:Tag:highway=traffic mirror
+    highway=traffic_signals: Cs:Tag:highway=traffic signals
+    highway=trunk: Cs:Tag:highway=trunk
+    highway=turning_circle: Cs:Tag:highway=turning circle
+    highway=turning_loop: Cs:Tag:highway=turning loop
+    highway=unclassified: Cs:Tag:highway=unclassified
+    highway=unsurfaced: Cs:Tag:highway=unsurfaced
+    highway=via_ferrata: Cs:Tag:highway=via ferrata
+    historic=abandoned: Cs:Tag:historic=abandoned
+    historic=aircraft: Cs:Tag:historic=aircraft
+    historic=aqueduct: Cs:Tag:historic=aqueduct
+    historic=archaeological_site: Cs:Tag:historic=archaeological site
+    historic=battlefield: Cs:Tag:historic=battlefield
+    historic=boundary_stone: Cs:Tag:historic=boundary stone
     historic=cannon: Cs:Tag:historic=cannon
     historic=castle: Cs:Tag:historic=castle
+    historic=city_gate: Cs:Tag:historic=city gate
+    historic=citywalls: Cs:Tag:historic=citywalls
+    historic=farm: Cs:Tag:historic=farm
+    historic=fort: Cs:Tag:historic=fort
+    historic=gallows: Cs:Tag:historic=gallows
+    historic=highwater_mark: Cs:Tag:historic=highwater mark
+    historic=locomotive: Cs:Tag:historic=locomotive
+    historic=manor: Cs:Tag:historic=manor
+    historic=memorial: Cs:Tag:historic=memorial
+    historic=milestone: Cs:Tag:historic=milestone
+    historic=monastery: Cs:Tag:historic=monastery
+    historic=monument: Cs:Tag:historic=monument
+    historic=optical_telegraph: Cs:Tag:historic=optical telegraph
+    historic=pillory: Cs:Tag:historic=pillory
+    historic=ruins: Cs:Tag:historic=ruins
+    historic=rune_stone: Cs:Tag:historic=rune stone
+    historic=ship: Cs:Tag:historic=ship
+    historic=stone: Cs:Tag:historic=stone
     historic=tomb: Cs:Tag:historic=tomb
+    historic=tree_shrine: Cs:Tag:historic=tree shrine
+    historic=wayside_cross: Cs:Tag:historic=wayside cross
+    historic=wayside_shrine: Cs:Tag:historic=wayside shrine
+    historic=wreck: Cs:Tag:historic=wreck
+    horse=designated: Cs:Tag:horse=designated
+    industrial=aluminium_smelting: Cs:Tag:industrial=aluminium smelting
+    industrial=auto_wrecker: Cs:Tag:industrial=auto wrecker
+    industrial=bakery: Cs:Tag:industrial=bakery
+    industrial=brewery: Cs:Tag:industrial=brewery
+    industrial=brickyard: Cs:Tag:industrial=brickyard
+    industrial=depot: Cs:Tag:industrial=depot
+    industrial=distributor: Cs:Tag:industrial=distributor
+    industrial=factory: Cs:Tag:industrial=factory
+    industrial=furniture: Cs:Tag:industrial=furniture
+    industrial=grinding_mill: Cs:Tag:industrial=grinding mill
+    industrial=heating_station: Cs:Tag:industrial=heating station
+    industrial=ice_factory: Cs:Tag:industrial=ice factory
+    industrial=machine_shop: Cs:Tag:industrial=machine shop
+    industrial=mine: Cs:Tag:industrial=mine
+    industrial=mobile_equipment: Cs:Tag:industrial=mobile equipment
+    industrial=oil: Cs:Tag:industrial=oil
+    industrial=oil_mill: Cs:Tag:industrial=oil mill
+    industrial=port: Cs:Tag:industrial=port
+    industrial=salt_pond: Cs:Tag:industrial=salt pond
+    industrial=sawmill: Cs:Tag:industrial=sawmill
+    industrial=scrap_yard: Cs:Tag:industrial=scrap yard
+    industrial=shipyard: Cs:Tag:industrial=shipyard
+    industrial=slaughterhouse: Cs:Tag:industrial=slaughterhouse
+    industrial=steelmaking: Cs:Tag:industrial=steelmaking
+    industrial=warehouse: Cs:Tag:industrial=warehouse
+    industrial=well_cluster: Cs:Tag:industrial=well cluster
+    information=audioguide: Cs:Tag:information=audioguide
+    information=board: Cs:Tag:information=board
+    information=guidepost: Cs:Tag:information=guidepost
+    information=map: Cs:Tag:information=map
+    information=office: Cs:Tag:information=office
+    information=tactile_map: Cs:Tag:information=tactile map
+    information=tactile_model: Cs:Tag:information=tactile model
+    information=terminal: Cs:Tag:information=terminal
+    junction=roundabout: Cs:Tag:junction=roundabout
+    landcover=grass: Cs:Tag:landcover=grass
     landuse=allotments: Cs:Tag:landuse=allotments
+    landuse=aquaculture: Cs:Tag:landuse=aquaculture
     landuse=basin: Cs:Tag:landuse=basin
     landuse=brownfield: Cs:Tag:landuse=brownfield
+    landuse=cemetery: Cs:Tag:landuse=cemetery
+    landuse=commercial: Cs:Tag:landuse=commercial
+    landuse=construction: Cs:Tag:landuse=construction
+    landuse=depot: Cs:Tag:landuse=depot
+    landuse=farm: Cs:Tag:landuse=farm
+    landuse=farmland: Cs:Tag:landuse=farmland
+    landuse=farmyard: Cs:Tag:landuse=farmyard
+    landuse=field: Cs:Tag:landuse=field
+    landuse=forest: Cs:Tag:landuse=forest
+    landuse=garages: Cs:Tag:landuse=garages
+    landuse=grass: Cs:Tag:landuse=grass
     landuse=greenfield: Cs:Tag:landuse=greenfield
+    landuse=greenhouse_horticulture: Cs:Tag:landuse=greenhouse horticulture
+    landuse=industrial: Cs:Tag:landuse=industrial
+    landuse=landfill: Cs:Tag:landuse=landfill
+    landuse=meadow: Cs:Tag:landuse=meadow
+    landuse=military: Cs:Tag:landuse=military
+    landuse=orchard: Cs:Tag:landuse=orchard
+    landuse=peat_cutting: Cs:Tag:landuse=peat cutting
+    landuse=plant_nursery: Cs:Tag:landuse=plant nursery
+    landuse=port: Cs:Tag:landuse=port
+    landuse=quarry: Cs:Tag:landuse=quarry
+    landuse=railway: Cs:Tag:landuse=railway
+    landuse=recreation_ground: Cs:Tag:landuse=recreation ground
+    landuse=reservoir: Cs:Tag:landuse=reservoir
+    landuse=residential: Cs:Tag:landuse=residential
+    landuse=retail: Cs:Tag:landuse=retail
+    landuse=salt_pond: Cs:Tag:landuse=salt pond
+    landuse=village_green: Cs:Tag:landuse=village green
+    landuse=vineyard: Cs:Tag:landuse=vineyard
+    landuse=winter_sports: Cs:Tag:landuse=winter sports
     leaf_cycle=deciduous: Cs:Tag:leaf cycle=deciduous
     leaf_cycle=evergreen: Cs:Tag:leaf cycle=evergreen
     leaf_cycle=mixed: Cs:Tag:leaf cycle=mixed
@@ -139,31 +1461,745 @@ cs:
     leaf_type=leafless: Cs:Tag:leaf type=leafless
     leaf_type=mixed: Cs:Tag:leaf type=mixed
     leaf_type=needleleaved: Cs:Tag:leaf type=needleleaved
+    leisure=adult_gaming_centre: Cs:Tag:leisure=adult gaming centre
+    leisure=amusement_arcade: Cs:Tag:leisure=amusement arcade
+    leisure=arena: Cs:Tag:leisure=arena
+    leisure=bandstand: Cs:Tag:leisure=bandstand
+    leisure=beach: Cs:Tag:leisure=beach
+    leisure=beach_resort: Cs:Tag:leisure=beach resort
+    leisure=bird_hide: Cs:Tag:leisure=bird hide
+    leisure=club: Cs:Tag:leisure=club
+    leisure=common: Cs:Tag:leisure=common
+    leisure=dance: Cs:Tag:leisure=dance
+    leisure=disc_golf_course: Cs:Tag:leisure=disc golf course
+    leisure=dog_park: Cs:Tag:leisure=dog park
+    leisure=firepit: Cs:Tag:leisure=firepit
+    leisure=fishing: Cs:Tag:leisure=fishing
+    leisure=fitness_centre: Cs:Tag:leisure=fitness centre
+    leisure=fitness_station: Cs:Tag:leisure=fitness station
+    leisure=garden: Cs:Tag:leisure=garden
+    leisure=golf_course: Cs:Tag:leisure=golf course
+    leisure=hackerspace: Cs:Tag:leisure=hackerspace
+    leisure=horse_riding: Cs:Tag:leisure=horse riding
+    leisure=ice_rink: Cs:Tag:leisure=ice rink
+    leisure=landscape_reserve: Cs:Tag:leisure=landscape reserve
+    leisure=marina: Cs:Tag:leisure=marina
+    leisure=miniature_golf: Cs:Tag:leisure=miniature golf
+    leisure=nature_reserve: Cs:Tag:leisure=nature reserve
+    leisure=park: Cs:Tag:leisure=park
+    leisure=picnic_site: Cs:Tag:leisure=picnic site
+    leisure=picnic_table: Cs:Tag:leisure=picnic table
+    leisure=pitch: Cs:Tag:leisure=pitch
+    leisure=playground: Cs:Tag:leisure=playground
+    leisure=recreation_ground: Cs:Tag:leisure=recreation ground
+    leisure=resort: Cs:Tag:leisure=resort
+    leisure=sauna: Cs:Tag:leisure=sauna
+    leisure=slipway: Cs:Tag:leisure=slipway
+    leisure=sports_centre: Cs:Tag:leisure=sports centre
+    leisure=stadium: Cs:Tag:leisure=stadium
+    leisure=summer_camp: Cs:Tag:leisure=summer camp
+    leisure=swimming_area: Cs:Tag:leisure=swimming area
+    leisure=swimming_pool: Cs:Tag:leisure=swimming pool
+    leisure=tanning_salon: Cs:Tag:leisure=tanning salon
+    leisure=track: Cs:Tag:leisure=track
+    leisure=turkish_bath: Cs:Tag:leisure=turkish bath
+    leisure=video_arcade: Cs:Tag:leisure=video arcade
+    leisure=water_park: Cs:Tag:leisure=water park
+    leisure=wildlife_hide: Cs:Tag:leisure=wildlife hide
+    level_crossing=traffic_signals: Cs:Tag:level crossing=traffic signals
     man_made=adit: Cs:Tag:man made=adit
+    man_made=beacon: Cs:Tag:man made=beacon
+    man_made=beehive: Cs:Tag:man made=beehive
+    man_made=breakwater: Cs:Tag:man made=breakwater
+    man_made=bridge: Cs:Tag:man made=bridge
+    man_made=bunker_silo: Cs:Tag:man made=bunker silo
+    man_made=campanile: Cs:Tag:man made=campanile
+    man_made=chimney: Cs:Tag:man made=chimney
+    man_made=clearcut: Cs:Tag:man made=clearcut
+    man_made=communications_tower: Cs:Tag:man made=communications tower
+    man_made=cooling_tower: Cs:Tag:man made=cooling tower
+    man_made=crane: Cs:Tag:man made=crane
+    man_made=cross: Cs:Tag:man made=cross
+    man_made=cutline: Cs:Tag:man made=cutline
+    man_made=dike: Cs:Tag:man made=dike
+    man_made=dovecote: Cs:Tag:man made=dovecote
+    man_made=dyke: Cs:Tag:man made=dyke
+    man_made=embankment: Cs:Tag:man made=embankment
+    man_made=flagpole: Cs:Tag:man made=flagpole
+    man_made=gasometer: Cs:Tag:man made=gasometer
+    man_made=goods_conveyor: Cs:Tag:man made=goods conveyor
+    man_made=groyne: Cs:Tag:man made=groyne
+    man_made=hot_water_tank: Cs:Tag:man made=hot water tank
+    man_made=insect_hotel: Cs:Tag:man made=insect hotel
+    man_made=kiln: Cs:Tag:man made=kiln
+    man_made=levee: Cs:Tag:man made=levee
+    man_made=lighthouse: Cs:Tag:man made=lighthouse
+    man_made=mast: Cs:Tag:man made=mast
     man_made=mineshaft: Cs:Tag:man made=mineshaft
+    man_made=monitoring_station: Cs:Tag:man made=monitoring station
+    man_made=nesting_site: Cs:Tag:man made=nesting site
+    man_made=obelisk: Cs:Tag:man made=obelisk
+    man_made=observatory: Cs:Tag:man made=observatory
+    man_made=offshore_platform: Cs:Tag:man made=offshore platform
+    man_made=petroleum_well: Cs:Tag:man made=petroleum well
+    man_made=pier: Cs:Tag:man made=pier
+    man_made=pipeline: Cs:Tag:man made=pipeline
+    man_made=power_fossil: Cs:Tag:man made=power fossil
+    man_made=power_hydro: Cs:Tag:man made=power hydro
+    man_made=power_nuclear: Cs:Tag:man made=power nuclear
+    man_made=power_wind: Cs:Tag:man made=power wind
+    man_made=pumping_rig: Cs:Tag:man made=pumping rig
+    man_made=pumping_station: Cs:Tag:man made=pumping station
+    man_made=quay: Cs:Tag:man made=quay
+    man_made=reservoir_covered: Cs:Tag:man made=reservoir covered
+    man_made=silo: Cs:Tag:man made=silo
+    man_made=snow_fence: Cs:Tag:man made=snow fence
+    man_made=snow_net: Cs:Tag:man made=snow net
+    man_made=storage_tank: Cs:Tag:man made=storage tank
+    man_made=street_cabinet: Cs:Tag:man made=street cabinet
+    man_made=surveillance: Cs:Tag:man made=surveillance
+    man_made=survey_point: Cs:Tag:man made=survey point
+    man_made=telescope: Cs:Tag:man made=telescope
+    man_made=tower: Cs:Tag:man made=tower
+    man_made=wastewater_plant: Cs:Tag:man made=wastewater plant
+    man_made=water_tank: Cs:Tag:man made=water tank
+    man_made=water_tap: Cs:Tag:man made=water tap
+    man_made=water_tower: Cs:Tag:man made=water tower
+    man_made=water_well: Cs:Tag:man made=water well
+    man_made=water_works: Cs:Tag:man made=water works
+    man_made=watermill: Cs:Tag:man made=watermill
+    man_made=well: Cs:Tag:man made=well
+    man_made=wildlife_crossing: Cs:Tag:man made=wildlife crossing
+    man_made=windmill: Cs:Tag:man made=windmill
+    man_made=windpump: Cs:Tag:man made=windpump
+    man_made=works: Cs:Tag:man made=works
+    megalith_type=alignment: Cs:Tag:megalith type=alignment
+    megalith_type=chamber: Cs:Tag:megalith type=chamber
+    megalith_type=cist: Cs:Tag:megalith type=cist
+    megalith_type=dolmen: Cs:Tag:megalith type=dolmen
+    megalith_type=long_barrow: Cs:Tag:megalith type=long barrow
+    megalith_type=menhir: Cs:Tag:megalith type=menhir
+    megalith_type=nuraghe: Cs:Tag:megalith type=nuraghe
+    megalith_type=passage_grave: Cs:Tag:megalith type=passage grave
+    megalith_type=stone_circle: Cs:Tag:megalith type=stone circle
+    megalith_type=stone_ship: Cs:Tag:megalith type=stone ship
+    megalith_type=tholos: Cs:Tag:megalith type=tholos
+    megalith_type=well: Cs:Tag:megalith type=well
+    memorial:type=obelisk: Cs:Tag:memorial:type=obelisk
+    memorial:type=plaque: Cs:Tag:memorial:type=plaque
+    memorial:type=plate: Cs:Tag:memorial:type=plate
+    memorial:type=statue: Cs:Tag:memorial:type=statue
+    memorial:type=stele: Cs:Tag:memorial:type=stele
+    memorial:type=stolperstein: Cs:Tag:memorial:type=stolperstein
+    memorial=blue_plaque: Cs:Tag:memorial=blue plaque
+    memorial=bust: Cs:Tag:memorial=bust
+    memorial=obelisk: Cs:Tag:memorial=obelisk
+    memorial=plaque: Cs:Tag:memorial=plaque
+    memorial=statue: Cs:Tag:memorial=statue
+    memorial=stele: Cs:Tag:memorial=stele
+    memorial=stolperstein: Cs:Tag:memorial=stolperstein
+    memorial=stone: Cs:Tag:memorial=stone
+    memorial=war_memorial: Cs:Tag:memorial=war memorial
+    microbrewery=yes: Cs:Tag:microbrewery=yes
+    military=airfield: Cs:Tag:military=airfield
+    military=ammunition: Cs:Tag:military=ammunition
+    military=barracks: Cs:Tag:military=barracks
+    military=bunker: Cs:Tag:military=bunker
+    military=checkpoint: Cs:Tag:military=checkpoint
+    military=danger_area: Cs:Tag:military=danger area
+    military=exclusion_zone: Cs:Tag:military=exclusion zone
+    military=naval_base: Cs:Tag:military=naval base
+    military=nuclear_explosion_site: Cs:Tag:military=nuclear explosion site
+    military=obstacle_course: Cs:Tag:military=obstacle course
+    military=office: Cs:Tag:military=office
+    military=range: Cs:Tag:military=range
+    military=training_area: Cs:Tag:military=training area
+    military=trench: Cs:Tag:military=trench
     natural=arete: Cs:Tag:natural=arete
+    natural=bare_rock: Cs:Tag:natural=bare rock
+    natural=bay: Cs:Tag:natural=bay
+    natural=beach: Cs:Tag:natural=beach
+    natural=cape: Cs:Tag:natural=cape
     natural=cave_entrance: Cs:Tag:natural=cave entrance
+    natural=cliff: Cs:Tag:natural=cliff
+    natural=coastline: Cs:Tag:natural=coastline
+    natural=fell: Cs:Tag:natural=fell
+    natural=geyser: Cs:Tag:natural=geyser
+    natural=glacier: Cs:Tag:natural=glacier
+    natural=grassland: Cs:Tag:natural=grassland
+    natural=heath: Cs:Tag:natural=heath
+    natural=hot_spring: Cs:Tag:natural=hot spring
+    natural=marsh: Cs:Tag:natural=marsh
+    natural=meadow: Cs:Tag:natural=meadow
+    natural=moor: Cs:Tag:natural=moor
+    natural=mud: Cs:Tag:natural=mud
     natural=peak: Cs:Tag:natural=peak
+    natural=reef: Cs:Tag:natural=reef
     natural=ridge: Cs:Tag:natural=ridge
     natural=rock: Cs:Tag:natural=rock
+    natural=saddle: Cs:Tag:natural=saddle
+    natural=sand: Cs:Tag:natural=sand
+    natural=scree: Cs:Tag:natural=scree
+    natural=scrub: Cs:Tag:natural=scrub
+    natural=shingle: Cs:Tag:natural=shingle
+    natural=shoal: Cs:Tag:natural=shoal
     natural=sinkhole: Cs:Tag:natural=sinkhole
+    natural=spring: Cs:Tag:natural=spring
     natural=stone: Cs:Tag:natural=stone
+    natural=tree: Cs:Tag:natural=tree
     natural=tree_row: Cs:Tag:natural=tree row
+    natural=valley: Cs:Tag:natural=valley
+    natural=volcano: Cs:Tag:natural=volcano
     natural=water: Cs:Tag:natural=water
+    natural=wetland: Cs:Tag:natural=wetland
+    natural=wood: Cs:Tag:natural=wood
+    network=Flinkster: Cs:Tag:network=Flinkster
+    network=call-a-bike: Cs:Tag:network=call-a-bike
+    network=cambio_stadtmobil: Cs:Tag:network=cambio stadtmobil
+    network=iwn: Cs:Tag:network=iwn
+    network=lwn: Cs:Tag:network=lwn
+    network=nwn: Cs:Tag:network=nwn
+    network=rwn: Cs:Tag:network=rwn
+    office=accountant: Cs:Tag:office=accountant
+    office=administrative: Cs:Tag:office=administrative
+    office=adoption_agency: Cs:Tag:office=adoption agency
+    office=advertising_agency: Cs:Tag:office=advertising agency
+    office=architect: Cs:Tag:office=architect
+    office=association: Cs:Tag:office=association
+    office=charity: Cs:Tag:office=charity
+    office=company: Cs:Tag:office=company
+    office=coworking: Cs:Tag:office=coworking
+    office=educational_institution: Cs:Tag:office=educational institution
+    office=employment_agency: Cs:Tag:office=employment agency
+    office=energy_supplier: Cs:Tag:office=energy supplier
+    office=estate_agent: Cs:Tag:office=estate agent
+    office=financial: Cs:Tag:office=financial
+    office=forestry: Cs:Tag:office=forestry
+    office=foundation: Cs:Tag:office=foundation
+    office=government: Cs:Tag:office=government
+    office=guide: Cs:Tag:office=guide
+    office=insurance: Cs:Tag:office=insurance
+    office=it: Cs:Tag:office=it
+    office=lawyer: Cs:Tag:office=lawyer
+    office=logistics: Cs:Tag:office=logistics
+    office=moving_company: Cs:Tag:office=moving company
+    office=newspaper: Cs:Tag:office=newspaper
+    office=ngo: Cs:Tag:office=ngo
+    office=notary: Cs:Tag:office=notary
+    office=political_party: Cs:Tag:office=political party
+    office=private_investigator: Cs:Tag:office=private investigator
+    office=quango: Cs:Tag:office=quango
+    office=real_estate_agent: Cs:Tag:office=real estate agent
+    office=realtor: Cs:Tag:office=realtor
+    office=religion: Cs:Tag:office=religion
+    office=research: Cs:Tag:office=research
+    office=tax: Cs:Tag:office=tax
+    office=tax_advisor: Cs:Tag:office=tax advisor
+    office=telecommunication: Cs:Tag:office=telecommunication
+    office=therapist: Cs:Tag:office=therapist
+    office=travel_agent: Cs:Tag:office=travel agent
+    office=water_utility: Cs:Tag:office=water utility
+    office=yes: Cs:Tag:office=yes
+    oneway=alternating: Cs:Tag:oneway=alternating
+    oneway=reversible: Cs:Tag:oneway=reversible
+    operator=Cambio: Cs:Tag:operator=Cambio
+    operator=Drive_Carsharing: Cs:Tag:operator=Drive Carsharing
+    operator=Flinkster: Cs:Tag:operator=Flinkster
+    operator=book-n-drive: Cs:Tag:operator=book-n-drive
+    operator=teilAuto: Cs:Tag:operator=teilAuto
+    passenger=international: Cs:Tag:passenger=international
+    passenger=local: Cs:Tag:passenger=local
+    passenger=national: Cs:Tag:passenger=national
+    passenger=no: Cs:Tag:passenger=no
+    passenger=regional: Cs:Tag:passenger=regional
+    passenger=suburban: Cs:Tag:passenger=suburban
+    passenger=urban: Cs:Tag:passenger=urban
+    passenger=yes: Cs:Tag:passenger=yes
+    pipeline=marker: Cs:Tag:pipeline=marker
+    pipeline=substation: Cs:Tag:pipeline=substation
+    pipeline=valve: Cs:Tag:pipeline=valve
+    place=allotments: Cs:Tag:place=allotments
+    place=archipelago: Cs:Tag:place=archipelago
+    place=city: Cs:Tag:place=city
+    place=city_block: Cs:Tag:place=city block
+    place=continent: Cs:Tag:place=continent
+    place=country: Cs:Tag:place=country
+    place=county: Cs:Tag:place=county
+    place=farm: Cs:Tag:place=farm
+    place=hamlet: Cs:Tag:place=hamlet
+    place=island: Cs:Tag:place=island
+    place=islet: Cs:Tag:place=islet
+    place=isolated_dwelling: Cs:Tag:place=isolated dwelling
+    place=locality: Cs:Tag:place=locality
+    place=neighbourhood: Cs:Tag:place=neighbourhood
+    place=plot: Cs:Tag:place=plot
+    place=quarter: Cs:Tag:place=quarter
+    place=region: Cs:Tag:place=region
+    place=square: Cs:Tag:place=square
+    place=state: Cs:Tag:place=state
+    place=suburb: Cs:Tag:place=suburb
+    place=town: Cs:Tag:place=town
+    place=village: Cs:Tag:place=village
+    power=generator: Cs:Tag:power=generator
+    power=heliostat: Cs:Tag:power=heliostat
+    power=terminal: Cs:Tag:power=terminal
+    prison_camp=concentration_camp: Cs:Tag:prison camp=concentration camp
+    psv=designated: Cs:Tag:psv=designated
+    public_transport=platform: Cs:Tag:public transport=platform
+    public_transport=station: Cs:Tag:public transport=station
+    public_transport=stop_area: Cs:Tag:public transport=stop area
+    public_transport=stop_position: Cs:Tag:public transport=stop position
+    pump=manual: Cs:Tag:pump=manual
+    pump=no: Cs:Tag:pump=no
+    pump=powered: Cs:Tag:pump=powered
+    railway=abandoned: Cs:Tag:railway=abandoned
+    railway=buffer_stop: Cs:Tag:railway=buffer stop
+    railway=crossing: Cs:Tag:railway=crossing
+    railway=derail: Cs:Tag:railway=derail
+    railway=disused: Cs:Tag:railway=disused
+    railway=funicular: Cs:Tag:railway=funicular
+    railway=halt: Cs:Tag:railway=halt
+    railway=level_crossing: Cs:Tag:railway=level crossing
+    railway=light_rail: Cs:Tag:railway=light rail
+    railway=milestone: Cs:Tag:railway=milestone
+    railway=miniature: Cs:Tag:railway=miniature
+    railway=monorail: Cs:Tag:railway=monorail
+    railway=narrow_gauge: Cs:Tag:railway=narrow gauge
+    railway=platform: Cs:Tag:railway=platform
+    railway=preserved: Cs:Tag:railway=preserved
+    railway=rail: Cs:Tag:railway=rail
+    railway=railway_crossing: Cs:Tag:railway=railway crossing
+    railway=roundhouse: Cs:Tag:railway=roundhouse
+    railway=signal: Cs:Tag:railway=signal
+    railway=station: Cs:Tag:railway=station
+    railway=subway: Cs:Tag:railway=subway
+    railway=subway_entrance: Cs:Tag:railway=subway entrance
+    railway=switch: Cs:Tag:railway=switch
+    railway=tram: Cs:Tag:railway=tram
+    railway=tram_stop: Cs:Tag:railway=tram stop
+    railway=traverser: Cs:Tag:railway=traverser
+    railway=turntable: Cs:Tag:railway=turntable
+    railway=wash: Cs:Tag:railway=wash
+    recycling_type=container: Cs:Tag:recycling type=container
+    religion=buddhist: Cs:Tag:religion=buddhist
+    religion=christian: Cs:Tag:religion=christian
+    religion=hindu: Cs:Tag:religion=hindu
+    religion=jain: Cs:Tag:religion=jain
+    religion=jewish: Cs:Tag:religion=jewish
+    religion=muslim: Cs:Tag:religion=muslim
+    religion=pagan: Cs:Tag:religion=pagan
+    religion=shinto: Cs:Tag:religion=shinto
+    religion=sikh: Cs:Tag:religion=sikh
+    religion=taoist: Cs:Tag:religion=taoist
+    religion=zoroastrian: Cs:Tag:religion=zoroastrian
+    residential=rural: Cs:Tag:residential=rural
+    residential=university: Cs:Tag:residential=university
+    residential=urban: Cs:Tag:residential=urban
+    resource=aggregate: Cs:Tag:resource=aggregate
+    resource=gravel: Cs:Tag:resource=gravel
+    resource=sand: Cs:Tag:resource=sand
+    route=bicycle: Cs:Tag:route=bicycle
+    route=bus: Cs:Tag:route=bus
+    route=detour: Cs:Tag:route=detour
+    route=ferry: Cs:Tag:route=ferry
+    route=fitness_trail: Cs:Tag:route=fitness trail
+    route=hiking: Cs:Tag:route=hiking
+    route=horse: Cs:Tag:route=horse
+    route=inline_skates: Cs:Tag:route=inline skates
+    route=light_rail: Cs:Tag:route=light rail
+    route=nordic_walking: Cs:Tag:route=nordic walking
+    route=pipeline: Cs:Tag:route=pipeline
+    route=piste: Cs:Tag:route=piste
+    route=railway: Cs:Tag:route=railway
+    route=road: Cs:Tag:route=road
+    route=running: Cs:Tag:route=running
+    route=ski: Cs:Tag:route=ski
+    route=subway: Cs:Tag:route=subway
+    route=train: Cs:Tag:route=train
+    route=tram: Cs:Tag:route=tram
     route=trolleybus: Cs:Tag:route=trolleybus
+    service=alley: Cs:Tag:service=alley
+    service=drive-through: Cs:Tag:service=drive-through
+    service=driveway: Cs:Tag:service=driveway
+    service=emergency_access: Cs:Tag:service=emergency access
+    service=parking_aisle: Cs:Tag:service=parking aisle
+    service=siding: Cs:Tag:service=siding
+    service=spur: Cs:Tag:service=spur
+    service=yard: Cs:Tag:service=yard
+    shelter_type=basic_hut: Cs:Tag:shelter type=basic hut
+    shelter_type=lean_to: Cs:Tag:shelter type=lean to
+    shelter_type=public_transport: Cs:Tag:shelter type=public transport
+    shop=*: Cs:Tag:shop=*
+    shop=accessories: Cs:Tag:shop=accessories
+    shop=alcohol: Cs:Tag:shop=alcohol
+    shop=anime: Cs:Tag:shop=anime
+    shop=antique: Cs:Tag:shop=antique
+    shop=antiques: Cs:Tag:shop=antiques
+    shop=art: Cs:Tag:shop=art
+    shop=auto_parts: Cs:Tag:shop=auto parts
+    shop=baby_goods: Cs:Tag:shop=baby goods
+    shop=bag: Cs:Tag:shop=bag
+    shop=bakery: Cs:Tag:shop=bakery
+    shop=bathroom_furnishing: Cs:Tag:shop=bathroom furnishing
+    shop=beauty: Cs:Tag:shop=beauty
+    shop=bed: Cs:Tag:shop=bed
+    shop=betting: Cs:Tag:shop=betting
+    shop=beverages: Cs:Tag:shop=beverages
+    shop=bicycle: Cs:Tag:shop=bicycle
+    shop=boat: Cs:Tag:shop=boat
+    shop=bookmaker: Cs:Tag:shop=bookmaker
+    shop=books: Cs:Tag:shop=books
+    shop=boutique: Cs:Tag:shop=boutique
+    shop=brewing_supplies: Cs:Tag:shop=brewing supplies
+    shop=butcher: Cs:Tag:shop=butcher
+    shop=camera: Cs:Tag:shop=camera
+    shop=candles: Cs:Tag:shop=candles
+    shop=car: Cs:Tag:shop=car
+    shop=car_parts: Cs:Tag:shop=car parts
+    shop=car_repair: Cs:Tag:shop=car repair
+    shop=carpet: Cs:Tag:shop=carpet
+    shop=charity: Cs:Tag:shop=charity
+    shop=cheese: Cs:Tag:shop=cheese
+    shop=chemist: Cs:Tag:shop=chemist
+    shop=chocolate: Cs:Tag:shop=chocolate
+    shop=clothes: Cs:Tag:shop=clothes
+    shop=coffee: Cs:Tag:shop=coffee
+    shop=collector: Cs:Tag:shop=collector
+    shop=computer: Cs:Tag:shop=computer
+    shop=confectionery: Cs:Tag:shop=confectionery
+    shop=convenience: Cs:Tag:shop=convenience
+    shop=copyshop: Cs:Tag:shop=copyshop
+    shop=cosmetics: Cs:Tag:shop=cosmetics
+    shop=craft: Cs:Tag:shop=craft
+    shop=curtain: Cs:Tag:shop=curtain
+    shop=dairy: Cs:Tag:shop=dairy
+    shop=deli: Cs:Tag:shop=deli
+    shop=delicatessen: Cs:Tag:shop=delicatessen
+    shop=department_store: Cs:Tag:shop=department store
+    shop=discount: Cs:Tag:shop=discount
+    shop=dive: Cs:Tag:shop=dive
+    shop=doityourself: Cs:Tag:shop=doityourself
+    shop=dry_cleaning: Cs:Tag:shop=dry cleaning
+    shop=e-cigarette: Cs:Tag:shop=e-cigarette
+    shop=electrical: Cs:Tag:shop=electrical
+    shop=electronics: Cs:Tag:shop=electronics
+    shop=energy: Cs:Tag:shop=energy
+    shop=erotic: Cs:Tag:shop=erotic
+    shop=estate_agent: Cs:Tag:shop=estate agent
+    shop=fabric: Cs:Tag:shop=fabric
+    shop=fabrics: Cs:Tag:shop=fabrics
+    shop=farm: Cs:Tag:shop=farm
+    shop=fashion: Cs:Tag:shop=fashion
+    shop=fireplace: Cs:Tag:shop=fireplace
+    shop=fireworks: Cs:Tag:shop=fireworks
+    shop=fish: Cs:Tag:shop=fish
+    shop=fishing: Cs:Tag:shop=fishing
+    shop=fishmonger: Cs:Tag:shop=fishmonger
+    shop=flooring: Cs:Tag:shop=flooring
+    shop=florist: Cs:Tag:shop=florist
+    shop=flower: Cs:Tag:shop=flower
+    shop=flowers: Cs:Tag:shop=flowers
+    shop=frame: Cs:Tag:shop=frame
+    shop=free_flying: Cs:Tag:shop=free flying
+    shop=frozen_food: Cs:Tag:shop=frozen food
+    shop=fuel: Cs:Tag:shop=fuel
+    shop=funeral_directors: Cs:Tag:shop=funeral directors
+    shop=furniture: Cs:Tag:shop=furniture
+    shop=gallery: Cs:Tag:shop=gallery
+    shop=gambling: Cs:Tag:shop=gambling
+    shop=games: Cs:Tag:shop=games
+    shop=garden_centre: Cs:Tag:shop=garden centre
+    shop=garden_furniture: Cs:Tag:shop=garden furniture
+    shop=gas: Cs:Tag:shop=gas
+    shop=general: Cs:Tag:shop=general
+    shop=gift: Cs:Tag:shop=gift
+    shop=glass: Cs:Tag:shop=glass
+    shop=glaziery: Cs:Tag:shop=glaziery
+    shop=golf: Cs:Tag:shop=golf
+    shop=greengrocer: Cs:Tag:shop=greengrocer
+    shop=grocery: Cs:Tag:shop=grocery
+    shop=haberdashery: Cs:Tag:shop=haberdashery
+    shop=hairdresser: Cs:Tag:shop=hairdresser
+    shop=hairdresser_supply: Cs:Tag:shop=hairdresser supply
+    shop=hardware: Cs:Tag:shop=hardware
+    shop=health: Cs:Tag:shop=health
+    shop=health_food: Cs:Tag:shop=health food
+    shop=hearing_aids: Cs:Tag:shop=hearing aids
+    shop=herbalist: Cs:Tag:shop=herbalist
+    shop=hifi: Cs:Tag:shop=hifi
+    shop=household: Cs:Tag:shop=household
+    shop=houseware: Cs:Tag:shop=houseware
+    shop=hunting: Cs:Tag:shop=hunting
+    shop=ice_cream: Cs:Tag:shop=ice cream
+    shop=insurance: Cs:Tag:shop=insurance
+    shop=interior_decoration: Cs:Tag:shop=interior decoration
+    shop=jewellery: Cs:Tag:shop=jewellery
+    shop=jewelry: Cs:Tag:shop=jewelry
+    shop=junk_yard: Cs:Tag:shop=junk yard
+    shop=kiosk: Cs:Tag:shop=kiosk
+    shop=kitchen: Cs:Tag:shop=kitchen
+    shop=lamps: Cs:Tag:shop=lamps
+    shop=laundry: Cs:Tag:shop=laundry
+    shop=leather: Cs:Tag:shop=leather
+    shop=lighting: Cs:Tag:shop=lighting
+    shop=locksmith: Cs:Tag:shop=locksmith
+    shop=lottery: Cs:Tag:shop=lottery
+    shop=mall: Cs:Tag:shop=mall
+    shop=massage: Cs:Tag:shop=massage
+    shop=medical: Cs:Tag:shop=medical
+    shop=medical_supply: Cs:Tag:shop=medical supply
+    shop=military_surplus: Cs:Tag:shop=military surplus
+    shop=mobile_phone: Cs:Tag:shop=mobile phone
+    shop=model: Cs:Tag:shop=model
+    shop=money_lender: Cs:Tag:shop=money lender
+    shop=moneylender: Cs:Tag:shop=moneylender
+    shop=motorcycle: Cs:Tag:shop=motorcycle
+    shop=motorcycle_repair: Cs:Tag:shop=motorcycle repair
+    shop=music: Cs:Tag:shop=music
+    shop=musical_instrument: Cs:Tag:shop=musical instrument
+    shop=newsagent: Cs:Tag:shop=newsagent
+    shop=nutrition_supplements: Cs:Tag:shop=nutrition supplements
+    shop=office_supplies: Cs:Tag:shop=office supplies
+    shop=optician: Cs:Tag:shop=optician
+    shop=organic: Cs:Tag:shop=organic
+    shop=outdoor: Cs:Tag:shop=outdoor
+    shop=paint: Cs:Tag:shop=paint
+    shop=party: Cs:Tag:shop=party
+    shop=pasta: Cs:Tag:shop=pasta
+    shop=pastry: Cs:Tag:shop=pastry
+    shop=pawnbroker: Cs:Tag:shop=pawnbroker
+    shop=perfume: Cs:Tag:shop=perfume
+    shop=perfumery: Cs:Tag:shop=perfumery
+    shop=pet: Cs:Tag:shop=pet
+    shop=pharmacy: Cs:Tag:shop=pharmacy
+    shop=photo: Cs:Tag:shop=photo
+    shop=photography: Cs:Tag:shop=photography
+    shop=piercing: Cs:Tag:shop=piercing
+    shop=pottery: Cs:Tag:shop=pottery
+    shop=printing: Cs:Tag:shop=printing
+    shop=pyrotechnics: Cs:Tag:shop=pyrotechnics
+    shop=radiotechnics: Cs:Tag:shop=radiotechnics
+    shop=religion: Cs:Tag:shop=religion
+    shop=rental: Cs:Tag:shop=rental
+    shop=scuba_diving: Cs:Tag:shop=scuba diving
+    shop=seafood: Cs:Tag:shop=seafood
+    shop=second_hand: Cs:Tag:shop=second hand
+    shop=sewing: Cs:Tag:shop=sewing
+    shop=shoe_repair: Cs:Tag:shop=shoe repair
+    shop=shoes: Cs:Tag:shop=shoes
+    shop=shopping_centre: Cs:Tag:shop=shopping centre
+    shop=solarium: Cs:Tag:shop=solarium
+    shop=souvenir: Cs:Tag:shop=souvenir
+    shop=spices: Cs:Tag:shop=spices
+    shop=sports: Cs:Tag:shop=sports
+    shop=stationery: Cs:Tag:shop=stationery
+    shop=supermarket: Cs:Tag:shop=supermarket
+    shop=swimming_pool: Cs:Tag:shop=swimming pool
+    shop=tailor: Cs:Tag:shop=tailor
+    shop=tattoo: Cs:Tag:shop=tattoo
+    shop=tea: Cs:Tag:shop=tea
+    shop=ticket: Cs:Tag:shop=ticket
+    shop=tickets: Cs:Tag:shop=tickets
+    shop=tiles: Cs:Tag:shop=tiles
+    shop=tobacco: Cs:Tag:shop=tobacco
+    shop=toys: Cs:Tag:shop=toys
+    shop=trade: Cs:Tag:shop=trade
+    shop=travel_agency: Cs:Tag:shop=travel agency
+    shop=trophy: Cs:Tag:shop=trophy
+    shop=tyres: Cs:Tag:shop=tyres
+    shop=vacant: Cs:Tag:shop=vacant
+    shop=vacuum_cleaner: Cs:Tag:shop=vacuum cleaner
+    shop=variety_store: Cs:Tag:shop=variety store
+    shop=video: Cs:Tag:shop=video
+    shop=video_games: Cs:Tag:shop=video games
+    shop=watches: Cs:Tag:shop=watches
+    shop=water: Cs:Tag:shop=water
+    shop=weapons: Cs:Tag:shop=weapons
+    shop=wholesale: Cs:Tag:shop=wholesale
+    shop=wigs: Cs:Tag:shop=wigs
+    shop=window: Cs:Tag:shop=window
+    shop=window_blind: Cs:Tag:shop=window blind
+    shop=windows: Cs:Tag:shop=windows
+    shop=wine: Cs:Tag:shop=wine
+    shop=winery: Cs:Tag:shop=winery
+    shop=wool: Cs:Tag:shop=wool
+    shop=yes: Cs:Tag:shop=yes
+    site_type=bigstone: Cs:Tag:site type=bigstone
+    site_type=city: Cs:Tag:site type=city
+    site_type=fortification: Cs:Tag:site type=fortification
+    site_type=hut_circle: Cs:Tag:site type=hut circle
+    site_type=megalith: Cs:Tag:site type=megalith
+    site_type=necropolis: Cs:Tag:site type=necropolis
+    site_type=petroglyph: Cs:Tag:site type=petroglyph
+    site_type=roman_circus: Cs:Tag:site type=roman circus
+    site_type=roman_villa: Cs:Tag:site type=roman villa
+    site_type=settlement: Cs:Tag:site type=settlement
+    site_type=tumulus: Cs:Tag:site type=tumulus
+    social_facility=ambulatory_care: Cs:Tag:social facility=ambulatory care
+    social_facility=assisted_living: Cs:Tag:social facility=assisted living
+    social_facility=clothing_bank: Cs:Tag:social facility=clothing bank
+    social_facility=day_care: Cs:Tag:social facility=day care
+    social_facility=food_bank: Cs:Tag:social facility=food bank
+    social_facility=group_home: Cs:Tag:social facility=group home
+    social_facility=nursing_home: Cs:Tag:social facility=nursing home
+    social_facility=outreach: Cs:Tag:social facility=outreach
+    social_facility=shelter: Cs:Tag:social facility=shelter
+    social_facility=soup_kitchen: Cs:Tag:social facility=soup kitchen
+    social_facility=workshop: Cs:Tag:social facility=workshop
+    source:geometry=Bing: Cs:Tag:source:geometry=Bing
+    sport=10pin: Cs:Tag:sport=10pin
+    sport=9pin: Cs:Tag:sport=9pin
+    sport=aikido: Cs:Tag:sport=aikido
+    sport=american_football: Cs:Tag:sport=american football
+    sport=archery: Cs:Tag:sport=archery
+    sport=athletics: Cs:Tag:sport=athletics
+    sport=australian_football: Cs:Tag:sport=australian football
+    sport=badminton: Cs:Tag:sport=badminton
+    sport=bandy: Cs:Tag:sport=bandy
+    sport=base: Cs:Tag:sport=base
+    sport=baseball: Cs:Tag:sport=baseball
+    sport=basketball: Cs:Tag:sport=basketball
+    sport=beachvolleyball: Cs:Tag:sport=beachvolleyball
+    sport=billiards: Cs:Tag:sport=billiards
+    sport=bmx: Cs:Tag:sport=bmx
+    sport=bobsleigh: Cs:Tag:sport=bobsleigh
+    sport=boules: Cs:Tag:sport=boules
+    sport=bowls: Cs:Tag:sport=bowls
+    sport=boxing: Cs:Tag:sport=boxing
+    sport=canadian_football: Cs:Tag:sport=canadian football
+    station=light_rail: Cs:Tag:station=light rail
+    station=subway: Cs:Tag:station=subway
+    summit:cross=yes: Cs:Tag:summit:cross=yes
+    tank_trap=czech_hedgehog: Cs:Tag:tank trap=czech hedgehog
+    tourism=alpine_hut: Cs:Tag:tourism=alpine hut
+    tourism=apartment: Cs:Tag:tourism=apartment
+    tourism=aquarium: Cs:Tag:tourism=aquarium
     tourism=artwork: Cs:Tag:tourism=artwork
+    tourism=attraction: Cs:Tag:tourism=attraction
+    tourism=bed_and_breakfast: Cs:Tag:tourism=bed and breakfast
+    tourism=camp_site: Cs:Tag:tourism=camp site
+    tourism=caravan_site: Cs:Tag:tourism=caravan site
+    tourism=chalet: Cs:Tag:tourism=chalet
+    tourism=gallery: Cs:Tag:tourism=gallery
+    tourism=guest_house: Cs:Tag:tourism=guest house
+    tourism=hostel: Cs:Tag:tourism=hostel
+    tourism=hotel: Cs:Tag:tourism=hotel
     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
+    tourism=motel: Cs:Tag:tourism=motel
+    tourism=museum: Cs:Tag:tourism=museum
+    tourism=picnic_site: Cs:Tag:tourism=picnic site
+    tourism=resort: Cs:Tag:tourism=resort
+    tourism=theme_park: Cs:Tag:tourism=theme park
+    tourism=trail_riding_station: Cs:Tag:tourism=trail riding station
+    tourism=viewpoint: Cs:Tag:tourism=viewpoint
+    tourism=wilderness_hut: Cs:Tag:tourism=wilderness hut
+    tourism=yes: Cs:Tag:tourism=yes
+    tourism=zoo: Cs:Tag:tourism=zoo
+    tower:type=bell_tower: Cs:Tag:tower:type=bell tower
+    tower:type=bridge: Cs:Tag:tower:type=bridge
+    tower:type=communication: Cs:Tag:tower:type=communication
+    tower:type=cooling: Cs:Tag:tower:type=cooling
+    tower:type=defensive: Cs:Tag:tower:type=defensive
+    tower:type=hose: Cs:Tag:tower:type=hose
+    tower:type=lighting: Cs:Tag:tower:type=lighting
+    tower:type=siren: Cs:Tag:tower:type=siren
+    tower:type=watchtower: Cs:Tag:tower:type=watchtower
+    tunnel=culvert: Cs:Tag:tunnel=culvert
+    type=public_transport: Cs:Tag:type=public transport
+    vending=SIM_cards: Cs:Tag:vending=SIM cards
+    vending=admission_tickets: Cs:Tag:vending=admission tickets
+    vending=animal_feed: Cs:Tag:vending=animal feed
+    vending=bicycle_tube: Cs:Tag:vending=bicycle tube
+    vending=books: Cs:Tag:vending=books
+    vending=bottle_return: Cs:Tag:vending=bottle return
+    vending=bread: Cs:Tag:vending=bread
+    vending=candles: Cs:Tag:vending=candles
+    vending=chemist: Cs:Tag:vending=chemist
+    vending=chewing_gums: Cs:Tag:vending=chewing gums
+    vending=cigarettes: Cs:Tag:vending=cigarettes
+    vending=coffee: Cs:Tag:vending=coffee
+    vending=condoms: Cs:Tag:vending=condoms
+    vending=drinks: Cs:Tag:vending=drinks
+    vending=electronics: Cs:Tag:vending=electronics
+    vending=elongated_coin: Cs:Tag:vending=elongated coin
+    vending=excrement_bags: Cs:Tag:vending=excrement bags
+    vending=feminine_hygiene: Cs:Tag:vending=feminine hygiene
+    vending=first_aid: Cs:Tag:vending=first aid
+    vending=fishing_bait: Cs:Tag:vending=fishing bait
+    vending=fishing_tackle: Cs:Tag:vending=fishing tackle
+    vending=flowers: Cs:Tag:vending=flowers
+    vending=food: Cs:Tag:vending=food
+    vending=fuel: Cs:Tag:vending=fuel
+    vending=ice_cream: Cs:Tag:vending=ice cream
+    vending=ice_cubes: Cs:Tag:vending=ice cubes
+    vending=ink_cartridges: Cs:Tag:vending=ink cartridges
+    vending=laundry_detergent: Cs:Tag:vending=laundry detergent
+    vending=milk: Cs:Tag:vending=milk
+    vending=news_papers: Cs:Tag:vending=news papers
+    vending=newspapers: Cs:Tag:vending=newspapers
+    vending=parcel_mail_in: Cs:Tag:vending=parcel mail in
+    vending=parcel_pickup: Cs:Tag:vending=parcel pickup
+    vending=parcel_pickup;parcel_mail_in: Cs:Tag:vending=parcel pickup;parcel mail
+      in
+    vending=parking_tickets: Cs:Tag:vending=parking tickets
+    vending=pet_food: Cs:Tag:vending=pet food
+    vending=photo: Cs:Tag:vending=photo
+    vending=public_transport_tickets: Cs:Tag:vending=public transport tickets
+    vending=sex_toys: Cs:Tag:vending=sex toys
+    vending=stamps: Cs:Tag:vending=stamps
+    vending=sweets: Cs:Tag:vending=sweets
+    vending=syringes: Cs:Tag:vending=syringes
+    vending=toll: Cs:Tag:vending=toll
+    vending=toys: Cs:Tag:vending=toys
+    vending=umbrellas: Cs:Tag:vending=umbrellas
+    vending=water: Cs:Tag:vending=water
+    water=intermittent: Cs:Tag:water=intermittent
+    water=lake: Cs:Tag:water=lake
+    water=lock: Cs:Tag:water=lock
+    waterway=boatyard: Cs:Tag:waterway=boatyard
+    waterway=brook: Cs:Tag:waterway=brook
+    waterway=canal: Cs:Tag:waterway=canal
+    waterway=dam: Cs:Tag:waterway=dam
+    waterway=ditch: Cs:Tag:waterway=ditch
+    waterway=dock: Cs:Tag:waterway=dock
+    waterway=drain: Cs:Tag:waterway=drain
+    waterway=drystream: Cs:Tag:waterway=drystream
+    waterway=fuel: Cs:Tag:waterway=fuel
+    waterway=lock_gate: Cs:Tag:waterway=lock gate
+    waterway=milestone: Cs:Tag:waterway=milestone
+    waterway=mooring: Cs:Tag:waterway=mooring
+    waterway=river: Cs:Tag:waterway=river
+    waterway=riverbank: Cs:Tag:waterway=riverbank
+    waterway=stream: Cs:Tag:waterway=stream
+    waterway=stream_end: Cs:Tag:waterway=stream end
+    waterway=turning_point: Cs:Tag:waterway=turning point
+    waterway=wadi: Cs:Tag:waterway=wadi
+    waterway=water_point: Cs:Tag:waterway=water point
+    waterway=waterfall: Cs:Tag:waterway=waterfall
+    waterway=weir: Cs:Tag:waterway=weir
+    wetland=bog: Cs:Tag:wetland=bog
+    wetland=fen: Cs:Tag:wetland=fen
+    wetland=mangrove: Cs:Tag:wetland=mangrove
+    wetland=marsh: Cs:Tag:wetland=marsh
+    wetland=reedbed: Cs:Tag:wetland=reedbed
+    wetland=saltern: Cs:Tag:wetland=saltern
+    wetland=saltmarsh: Cs:Tag:wetland=saltmarsh
+    wetland=string_bog: Cs:Tag:wetland=string bog
+    wetland=swamp: Cs:Tag:wetland=swamp
+    wetland=tidalflat: Cs:Tag:wetland=tidalflat
+    wetland=wet_meadow: Cs:Tag:wetland=wet meadow
+    zoo=aviary: Cs:Tag:zoo=aviary
+    zoo=birds: Cs:Tag:zoo=birds
+    zoo=enclosure: Cs:Tag:zoo=enclosure
+    zoo=falconry: Cs:Tag:zoo=falconry
+    zoo=petting_zoo: Cs:Tag:zoo=petting zoo
+    zoo=reptile: Cs:Tag:zoo=reptile
+    zoo=safari_park: Cs:Tag:zoo=safari park
+    zoo=wildlife_park: Cs:Tag:zoo=wildlife park
 da:
   key:
     access: Da:Key:access
+    amenity: Da:Key:amenity
     fee: Da:Key:fee
     lit: Da:Key:lit
     man_made: Da:Key:man made
@@ -177,8 +2213,10 @@ da:
     amenity=veterinary: Da:Tag:amenity=veterinary
     highway=bridleway: Da:Tag:highway=bridleway
     highway=ford: Da:Tag:highway=ford
+    highway=road: Da:Tag:highway=road
     highway=tertiary: Da:Tag:highway=tertiary
     highway=track: Da:Tag:highway=track
+    highway=unclassified: Da:Tag:highway=unclassified
     leisure=dog_park: Da:Tag:leisure=dog park
     place=hamlet: Da:Tag:place=hamlet
     place=town: Da:Tag:place=town
@@ -188,35 +2226,63 @@ da:
 de:
   key:
     AlpinRes_ID: DE:Key:AlpinRes ID
+    Animal: DE:Key:Animal
+    Annotations: DE:Key:Annotations
+    FIXME: DE:Key:FIXME
     TODO: DE:Key:TODO
+    WDPA_ID:ref: DE:Key:WDPA ID:ref
+    'abandoned:': 'DE:Key:abandoned:'
     abandoned:*: DE:Key:abandoned:*
+    abandoned:amenity: DE:Key:abandoned:amenity
+    abandoned:railway: DE:Key:abandoned:railway
     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:inclusion: DE:Key:addr:inclusion
+    addr:interpolation: DE:Key:addr:interpolation
     addr:postcode: DE:Key:addr:postcode
     addr:street: DE:Key:addr:street
+    addr:suburb: DE:Key:addr:suburb
+    advertising: DE:Key:advertising
     aerialway: DE:Key:aerialway
+    aerialway:drag_lift: DE:Key:aerialway:drag lift
     aeroway: DE:Key:aeroway
+    after_school: DE:Key:after school
     agricultural: DE:Key:agricultural
     amenity: DE:Key:amenity
     area: DE:Key:area
+    artist_name: DE:Key:artist name
+    artwork_type: DE:Key:artwork type
     asb: DE:Key:asb
+    ascent: DE:Key:ascent
+    authentication: DE:Key:authentication
+    automated: DE:Key:automated
+    backcountry: DE:Key:backcountry
+    backrest: DE:Key:backrest
     barrier: DE:Key:barrier
     basin: DE:Key:basin
+    bdouble: DE:Key:bdouble
+    beacon:type: DE:Key:beacon:type
     beds: DE:Key:beds
+    bench: DE:Key:bench
     bicycle: DE:Key:bicycle
     bicycle:backward: DE:Key:bicycle:backward
     bicycle_parking: DE:Key:bicycle parking
     bicycle_road: DE:Key:bicycle road
+    bike_ride: DE:Key:bike ride
     bin: DE:Key:bin
     biosphärenwirt: DE:Key:biosphärenwirt
     board_type: DE:Key:board type
     boat: DE:Key:boat
     bollard: DE:Key:bollard
+    books: DE:Key:books
+    both: DE:Key:both
     boundary: DE:Key:boundary
+    brand: DE:Key:brand
+    breakfast: DE:Key:breakfast
     brewery: DE:Key:brewery
     bridge: DE:Key:bridge
     bridge:movable: DE:Key:bridge:movable
@@ -226,25 +2292,43 @@ de:
     building:architecture: DE:Key:building:architecture
     building:condition: DE:Key:building:condition
     building:levels: DE:Key:building:levels
+    building:levels:underground: DE:Key:building:levels:underground
     building:material: DE:Key:building:material
+    building:part: DE:Key:building:part
     bunker_type: DE:Key:bunker type
+    bus: DE:Key:bus
     busway: DE:Key:busway
+    cables: DE:Key:cables
+    canoe: DE:Key:canoe
     capacity: DE:Key:capacity
+    capital: DE:Key:capital
+    car_wash: DE:Key:car wash
+    caravans: DE:Key:caravans
+    cargo: DE:Key:cargo
+    carriage: DE:Key:carriage
     castle_type: DE:Key:castle type
     cemetery: DE:Key:cemetery
+    circuits: DE:Key:circuits
+    circumference: DE:Key:circumference
     city_limit: DE:Key:city limit
     class:bicycle: DE:Key:class:bicycle
     clothes: DE:Key:clothes
     club: DE:Key:club
+    cocktails: DE:Key:cocktails
+    coffee: DE:Key:coffee
     collection_times: DE:Key:collection times
     comment: DE:Key:comment
+    communication:amateur_radio:repeater: DE:Key:communication:amateur radio:repeater
     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
+    community_centre: DE:Key:community centre
+    community_centre:for: DE:Key:community centre:for
     construction: DE:Key:construction
     contact: DE:Key:contact
+    contact:email: DE:Key:contact:email
     contact:facebook: DE:Key:contact:facebook
     contact:fax: DE:Key:contact:fax
     contact:google_plus: DE:Key:contact:google plus
@@ -271,38 +2355,63 @@ de:
     currency:others: DE:Key:currency:others
     cutting: DE:Key:cutting
     cycleway: DE:Key:cycleway
+    cycleway:left: DE:Key:cycleway:left
+    cycleway:right: DE:Key:cycleway:right
+    date: DE:Key:date
     de:amtlicher_gemeindeschluessel: DE:Key:de:amtlicher gemeindeschluessel
     de:regionalschluessel: DE:Key:de:regionalschluessel
     de:strassenschluessel: DE:Key:de:strassenschluessel
+    delivery: DE:Key:delivery
     denomination: DE:Key:denomination
     denotation: DE:Key:denotation
     description: DE:Key:description
     designation: DE:Key:designation
     destination: DE:Key:destination
+    destination:ref: DE:Key:destination:ref
+    destination:ref:lanes: DE:Key:destination:ref:lanes
+    destination:ref:to: DE:Key:destination:ref:to
+    destination:symbol: DE:Key:destination:symbol
+    destination:to: DE:Key:destination:to
+    diameter: DE:Key:diameter
     diaper: DE:Key:diaper
     diet: DE:Key:diet
     diet:*: DE:Key:diet:*
+    diplomatic: DE:Key:diplomatic
     direction: DE:Key:direction
+    display: DE:Key:display
     distance: DE:Key:distance
     disused: DE:Key:disused
     'disused:': 'DE:Key:disused:'
+    disused:amenity: DE:Key:disused:amenity
+    disused:railway: DE:Key:disused:railway
+    door: DE:Key:door
+    draft: DE:Key:draft
     drink: DE:Key:drink
+    drinking_water: DE:Key:drinking water
+    drive_in: DE:Key:drive in
     drive_through: DE:Key:drive through
     ele: DE:Key:ele
     electrified: DE:Key:electrified
     embankment: DE:Key:embankment
     emergency: DE:Key:emergency
     entrance: DE:Key:entrance
+    facebook: DE:Key:facebook
     fair_trade: DE:Key:fair trade
     fee: DE:Key:fee
     fence_type: DE:Key:fence type
+    ferry:cable: DE:Key:ferry:cable
     fetish: DE:Key:fetish
+    fire_hydrant: DE:Key:fire hydrant
+    fire_hydrant:type: DE:Key:fire hydrant:type
     fireplace: DE:Key:fireplace
     fixme: DE:Key:fixme
+    floating: DE:Key:floating
     foot: DE:Key:foot
     footway: DE:Key:footway
     ford: DE:Key:ford
+    fortification_type: DE:Key:fortification type
     frequency: DE:Key:frequency
+    from: DE:Key:from
     fuel: DE:Key:fuel
     gauge: DE:Key:gauge
     generator:method: DE:Key:generator:method
@@ -312,23 +2421,33 @@ de:
     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:place: DE:Key:generator:place
     generator:source: DE:Key:generator:source
     generator:type: DE:Key:generator:type
+    genus: DE:Key:genus
     geological: DE:Key:geological
-    geological=moraine: DE:Key:geological=moraine
-    geological=outcrop: DE:Key:geological=outcrop
-    geological=palaeontological_site: DE:Key:geological=palaeontological site
+    golf:course: DE:Key:golf:course
+    government: DE:Key:government
+    guest_house: DE:Key:guest house
     hazard: DE:Key:hazard
     hazmat: DE:Key:hazmat
+    healthcare: DE:Key:healthcare
     height: DE:Key:height
+    heritage: DE:Key:heritage
     hgv: DE:Key:hgv
     highspeed: DE:Key:highspeed
     highway: DE:Key:highway
     historic: DE:Key:historic
+    historic:civilization: DE:Key:historic:civilization
+    historic:period: DE:Key:historic:period
     horse: DE:Key:horse
+    horse_scale: DE:Key:horse scale
     ice_road: DE:Key:ice road
+    image: DE:Key:image
     importance: DE:Key:importance
     incline: DE:Key:incline
+    indoor_seating: DE:Key:indoor seating
+    industrial: DE:Key:industrial
     informal: DE:Key:informal
     information: DE:Key:information
     inscription: DE:Key:inscription
@@ -338,41 +2457,57 @@ de:
     is_in: DE:Key:is in
     is_in:continent: DE:Key:is in:continent
     junction: DE:Key:junction
+    kids_area: DE:Key:kids area
     kms: DE:Key:kms
+    kneipp_water_cure: DE:Key:kneipp water cure
     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
+    lawyer: DE:Key:lawyer
     layer: DE:Key:layer
+    lcn_ref: DE:Key:lcn ref
     leaf_cycle: DE:Key:leaf cycle
     leaf_type: DE:Key:leaf type
     left: DE:Key:left
     leisure: DE:Key:leisure
     length: DE:Key:length
     level: DE:Key:level
+    line: DE:Key:line
     lit: DE:Key:lit
     loc_name: DE:Key:loc name
     location: DE:Key:location
     lock: DE:Key:lock
     lock_name: DE:Key:lock name
+    lock_ref: DE:Key:lock ref
+    lottery: DE:Key:lottery
+    love_locks: DE:Key:love locks
     man_made: DE:Key:man made
     manhole: DE:Key:manhole
+    manufacturer: DE:Key:manufacturer
+    manufacturer:type: DE:Key:manufacturer:type
+    material: DE:Key:material
     max_age: DE:Key:max age
     maxaxleload: DE:Key:maxaxleload
     maxheight: DE:Key:maxheight
+    maxlength: DE:Key:maxlength
     maxspeed: DE:Key:maxspeed
     maxstay: DE:Key:maxstay
     maxweight: DE:Key:maxweight
     maxwidth: DE:Key:maxwidth
     megalith_type: DE:Key:megalith type
+    memorial: DE:Key:memorial
     memorial:type: DE:Key:memorial:type
     military: DE:Key:military
     min_age: DE:Key:min age
+    mineshaft_type: DE:Key:mineshaft type
     minspeed: DE:Key:minspeed
+    minspeed:lanes: DE:Key:minspeed:lanes
     mofa: DE:Key:mofa
     monitoring:air_quality: DE:Key:monitoring:air quality
+    monitoring:bicycle: DE:Key:monitoring:bicycle
     monitoring:gps: DE:Key:monitoring:gps
     monitoring:groundwater: DE:Key:monitoring:groundwater
     monitoring:noise: DE:Key:monitoring:noise
@@ -383,30 +2518,44 @@ de:
     monitoring:water_level: DE:Key:monitoring:water level
     monitoring:weather: DE:Key:monitoring:weather
     monument:genesis: DE:Key:monument:genesis
+    mooring: DE:Key:mooring
     moped: DE:Key:moped
     motor_vehicle: DE:Key:motor vehicle
     motorboat: DE:Key:motorboat
     motorcar: DE:Key:motorcar
     motorcycle: DE:Key:motorcycle
+    motorcycle:clothes: DE:Key:motorcycle:clothes
+    motorcycle:conditional: DE:Key:motorcycle:conditional
+    motorcycle:parts: DE:Key:motorcycle:parts
+    motorcycle:rental: DE:Key:motorcycle:rental
+    motorcycle:repair: DE:Key:motorcycle:repair
+    motorcycle:sales: DE:Key:motorcycle:sales
+    motorcycle:type: DE:Key:motorcycle:type
+    motorcycle:tyres: DE:Key:motorcycle:tyres
     motorroad: DE:Key:motorroad
     mountain_pass: DE:Key:mountain pass
     mtb:scale: DE:Key:mtb:scale
+    mtb:scale:imba: DE:Key:mtb:scale:imba
+    museum: DE:Key:museum
     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
+    navigationaid: DE:Key:navigationaid
     network: DE:Key:network
     noexit: DE:Key:noexit
     note: DE:Key:note
+    nudism: DE:Key:nudism
+    nursery: DE:Key:nursery
     office: DE:Key:office
-    old_name: DE:Key:old name
+    offshore: DE:Key:offshore
     oneway: DE:Key:oneway
     oneway:bicycle: DE:Key:oneway:bicycle
     oneway:moped: DE:Key:oneway:moped
     onkz: DE:Key:onkz
+    openfire: DE:Key:openfire
     opening_hours: DE:Key:opening hours
     operator: DE:Key:operator
     operator:MNC: DE:Key:operator:MNC
@@ -414,78 +2563,132 @@ de:
     osak: DE:Key:osak
     osmc:status: DE:Key:osmc:status
     osmc:symbol: DE:Key:osmc:symbol
+    outdoor_seating: DE:Key:outdoor seating
     overtaking: DE:Key:overtaking
+    par: DE:Key:par
+    parking: DE:Key:parking
     parking:lane: DE:Key:parking:lane
     parking:lane:hgv: DE:Key:parking:lane:hgv
+    passenger_information_display: DE:Key:passenger information display
+    payment: DE:Key:payment
     phone: DE:Key:phone
+    pilgrimage: DE:Key:pilgrimage
     piste:difficulty: DE:Key:piste:difficulty
     piste:type: DE:Key:piste:type
     place: DE:Key:place
+    placement: DE:Key:placement
+    plant: DE:Key:plant
     plant:output: DE:Key:plant:output
     playground: DE:Key:playground
+    'playground:': 'DE:Key:playground:'
     population: DE:Key:population
+    post_office: DE:Key:post office
+    post_office:type: DE:Key:post office:type
     postal_code: DE:Key:postal code
     power: DE:Key:power
+    power_rating: DE:Key:power rating
+    preschool: DE:Key:preschool
     priority: DE:Key:priority
     priority_road: DE:Key:priority road
     proposed: DE:Key:proposed
+    protect_class: DE:Key:protect class
+    protected: DE:Key:protected
+    protection_title: DE:Key:protection title
+    psv: DE:Key:psv
     public_bookcase:type: DE:Key:public bookcase:type
     public_transport: DE:Key:public transport
     pump: DE:Key:pump
+    rack: DE:Key:rack
     railway: DE:Key:railway
     railway:preserved: DE:Key:railway:preserved
+    railway:track_ref: DE:Key:railway:track ref
     ramp: DE:Key:ramp
+    rcn_ref: DE:Key:rcn ref
     recycling_type: DE:Key:recycling type
     ref: DE:Key:ref
+    ref:IFOPT: DE:Key:ref:IFOPT
     ref:bufa: DE:Key:ref:bufa
     ref:mobil-parken.de: DE:Key:ref:mobil-parken.de
     reg_name: DE:Key:reg name
     religion: DE:Key:religion
+    reservation: DE:Key:reservation
     resource: DE:Key:resource
     right: DE:Key:right
     roof:material: DE:Key:roof:material
+    room: DE:Key:room
     rooms: DE:Key:rooms
+    rotor:diameter: DE:Key:rotor:diameter
     route: DE:Key:route
     ruins: DE:Key:ruins
     sac_scale: DE:Key:sac scale
+    salt: DE:Key:salt
     seamark: DE:Key:seamark
     seamark:fixme: DE:Key:seamark:fixme
     seamark:type: DE:Key:seamark:type
+    seats: DE:Key:seats
+    second_hand: DE:Key:second hand
     segregated: DE:Key:segregated
+    self_service: DE:Key:self service
     service: DE:Key:service
     service_times: DE:Key:service times
+    shelter: DE:Key:shelter
     shelter_type: DE:Key:shelter type
+    shooting: DE:Key:shooting
     shop: DE:Key:shop
+    shower: DE:Key:shower
     sidewalk: DE:Key:sidewalk
     site_type: DE:Key:site type
     smoking: DE:Key:smoking
     smoothness: DE:Key:smoothness
     social_facility: DE:Key:social facility
+    social_facility:for: DE:Key:social facility:for
+    socket: DE:Key:socket
     source: DE:Key:source
     source:maxspeed: DE:Key:source:maxspeed
+    species: DE:Key:species
+    speech_output: DE:Key:speech output
     speech_output:en: DE:Key:speech output:en
     speech_output:lg: DE:Key:speech output:lg
     speisebezirk: DE:Key:speisebezirk
     sport: DE:Key:sport
+    stamps: DE:Key:stamps
     start_date: DE:Key:start date
     station: DE:Key:station
     step_count: DE:Key:step count
+    stone_type: DE:Key:stone type
+    stroller: DE:Key:stroller
+    substance: DE:Key:substance
+    substation: DE:Key:substation
+    summit:register: DE:Key:summit:register
+    support: DE:Key:support
     surface: DE:Key:surface
+    surveillance: DE:Key:surveillance
+    surveillance:zone: DE:Key:surveillance:zone
     symbol: DE:Key:symbol
     tactile_paving: DE:Key:tactile paving
+    tactile_writing: DE:Key:tactile writing
+    takeaway: DE:Key:takeaway
+    target: DE:Key:target
     tidal: DE:Key:tidal
+    to: DE:Key:to
     todo: DE:Key:todo
+    toilets: DE:Key:toilets
     toilets:wheelchair: DE:Key:toilets:wheelchair
     toll: DE:Key:toll
+    tomb: DE:Key:tomb
     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
+    traffic_signals:arrow: DE:Key:traffic signals:arrow
     traffic_signals:direction: DE:Key:traffic signals:direction
+    traffic_signals:sound: DE:Key:traffic signals:sound
     trail_visibility: DE:Key:trail visibility
     trees: DE:Key:trees
+    trolley_wire: DE:Key:trolley wire
+    trolleybus: DE:Key:trolleybus
     tunnel: DE:Key:tunnel
     turn: DE:Key:turn
     turn:lanes: DE:Key:turn:lanes
@@ -493,12 +2696,16 @@ de:
     usage: DE:Key:usage
     vehicle: DE:Key:vehicle
     verbindung: DE:Key:verbindung
+    viewpoint: DE:Key:viewpoint
+    visibility: DE:Key:visibility
     voltage: DE:Key:voltage
     waste: DE:Key:waste
     water: DE:Key:water
     waterway: DE:Key:waterway
+    website: DE:Key:website
     wetland: DE:Key:wetland
     wheelchair: DE:Key:wheelchair
+    wholesale: DE:Key:wholesale
     width: DE:Key:width
     wiki:symbol: DE:Key:wiki:symbol
     wikidata: DE:Key:wikidata
@@ -508,30 +2715,47 @@ de:
     wires: DE:Key:wires
     wood: DE:Key:wood
     workrules: DE:Key:workrules
+    xmas:feature: DE:Key:xmas:feature
+    year_of_construction: DE:Key:year of construction
     zone:maxspeed: DE:Key:zone:maxspeed
+    zoo: DE:Key:zoo
   tag:
     abandoned:amenity=prison: DE:Tag:abandoned:amenity=prison
-    abandoned=village: DE:Tag:abandoned=village
+    abandoned:amenity=prison_camp: DE:Tag:abandoned:amenity=prison camp
     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
+    advertising=column: DE:Tag:advertising=column
     aerialway=cable_car: DE:Tag:aerialway=cable car
+    aerialway=chair_lift: DE:Tag:aerialway=chair lift
+    aerialway=drag_lift: DE:Tag:aerialway=drag lift
+    aerialway=gondola: DE:Tag:aerialway=gondola
+    aerialway=goods: DE:Tag:aerialway=goods
+    aerialway=magic_carpet: DE:Tag:aerialway=magic carpet
+    aerialway=pylon: DE:Tag:aerialway=pylon
+    aerialway=station: DE:Tag:aerialway=station
     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=heliport: DE:Tag:aeroway=heliport
+    aeroway=navigationaid: DE:Tag:aeroway=navigationaid
     aeroway=runway: DE:Tag:aeroway=runway
+    aeroway=spaceport: DE:Tag:aeroway=spaceport
     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_breeding: DE:Tag:amenity=animal breeding
     amenity=animal_shelter: DE:Tag:amenity=animal shelter
+    amenity=archive: DE:Tag:amenity=archive
     amenity=arts_centre: DE:Tag:amenity=arts centre
     amenity=atm: DE:Tag:amenity=atm
     amenity=baby_hatch: DE:Tag:amenity=baby hatch
+    amenity=baking_oven: DE:Tag:amenity=baking oven
     amenity=bank: DE:Tag:amenity=bank
     amenity=bar: DE:Tag:amenity=bar
     amenity=bbq: DE:Tag:amenity=bbq
@@ -540,6 +2764,7 @@ de:
     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=boat_rental: DE:Tag:amenity=boat rental
     amenity=brothel: DE:Tag:amenity=brothel
     amenity=bureau_de_change: DE:Tag:amenity=bureau de change
     amenity=bus_station: DE:Tag:amenity=bus station
@@ -550,9 +2775,12 @@ de:
     amenity=casino: DE:Tag:amenity=casino
     amenity=charging_station: DE:Tag:amenity=charging station
     amenity=cinema: DE:Tag:amenity=cinema
+    amenity=clinic: DE:Tag:amenity=clinic
     amenity=clock: DE:Tag:amenity=clock
+    amenity=college: DE:Tag:amenity=college
     amenity=community_centre: DE:Tag:amenity=community centre
     amenity=compressed_air: DE:Tag:amenity=compressed air
+    amenity=concert_hall: DE:Tag:amenity=concert hall
     amenity=conference_centre: DE:Tag:amenity=conference centre
     amenity=courthouse: DE:Tag:amenity=courthouse
     amenity=crematorium: DE:Tag:amenity=crematorium
@@ -565,9 +2793,11 @@ de:
     amenity=driving_school: DE:Tag:amenity=driving school
     amenity=embassy: DE:Tag:amenity=embassy
     amenity=emergency_phone: DE:Tag:amenity=emergency phone
+    amenity=events_venue: DE:Tag:amenity=events venue
     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=festival_grounds: DE:Tag:amenity=festival grounds
     amenity=fire_hydrant: DE:Tag:amenity=fire hydrant
     amenity=fire_station: DE:Tag:amenity=fire station
     amenity=fish_spa: DE:Tag:amenity=fish spa
@@ -575,16 +2805,20 @@ de:
     amenity=fuel: DE:Tag:amenity=fuel
     amenity=grave_yard: DE:Tag:amenity=grave yard
     amenity=grit_bin: DE:Tag:amenity=grit bin
+    amenity=hookah_lounge: DE:Tag:amenity=hookah lounge
     amenity=hospital: DE:Tag:amenity=hospital
     amenity=hunting_stand: DE:Tag:amenity=hunting stand
     amenity=ice_cream: DE:Tag:amenity=ice cream
+    amenity=internet_cafe: DE:Tag:amenity=internet cafe
     amenity=kindergarten: DE:Tag:amenity=kindergarten
     amenity=kneipp_water_cure: DE:Tag:amenity=kneipp water cure
+    amenity=language_school: DE:Tag:amenity=language school
     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=music_school: DE:Tag:amenity=music school
     amenity=nightclub: DE:Tag:amenity=nightclub
     amenity=nursing_home: DE:Tag:amenity=nursing home
     amenity=parking: DE:Tag:amenity=parking
@@ -601,18 +2835,24 @@ de:
     amenity=prison_camp: DE:Tag:amenity=prison camp
     amenity=pub: DE:Tag:amenity=pub
     amenity=public_bookcase: DE:Tag:amenity=public bookcase
+    amenity=ranger_station: DE:Tag:amenity=ranger station
     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=retirement_home: DE:Tag:amenity=retirement home
+    amenity=sanitary_dump_station: DE:Tag:amenity=sanitary dump station
     amenity=school: DE:Tag:amenity=school
     amenity=shelter: DE:Tag:amenity=shelter
     amenity=shower: DE:Tag:amenity=shower
+    amenity=smoking_area: DE:Tag:amenity=smoking area
     amenity=social_facility: DE:Tag:amenity=social facility
+    amenity=stables: DE:Tag:amenity=stables
     amenity=studio: DE:Tag:amenity=studio
     amenity=taxi: DE:Tag:amenity=taxi
     amenity=telephone: DE:Tag:amenity=telephone
     amenity=theatre: DE:Tag:amenity=theatre
+    amenity=ticket_validator: DE:Tag:amenity=ticket validator
     amenity=toilets: DE:Tag:amenity=toilets
     amenity=townhall: DE:Tag:amenity=townhall
     amenity=trolley_bay: DE:Tag:amenity=trolley bay
@@ -621,14 +2861,23 @@ de:
     amenity=vending_machine: DE:Tag:amenity=vending machine
     amenity=veterinary: DE:Tag:amenity=veterinary
     amenity=waste_basket: DE:Tag:amenity=waste basket
+    amenity=waste_transfer_station: DE:Tag:amenity=waste transfer station
+    amenity=water_point: DE:Tag:amenity=water point
     amenity=watering_place: DE:Tag:amenity=watering place
     amenity=weighbridge: DE:Tag:amenity=weighbridge
     amenity=youth_centre: DE:Tag:amenity=youth centre
+    animal=school: DE:Tag:animal=school
+    artwork_type=sculpture: DE:Tag:artwork type=sculpture
+    artwork_type=statue: DE:Tag:artwork type=statue
     atm=yes: DE:Tag:atm=yes
+    attraction=animal: DE:Tag:attraction=animal
+    attraction=train: DE:Tag:attraction=train
+    barrier=block: DE:Tag:barrier=block
     barrier=bollard: DE:Tag:barrier=bollard
     barrier=cattle_grid: DE:Tag:barrier=cattle grid
     barrier=city_wall: DE:Tag:barrier=city wall
     barrier=cycle_barrier: DE:Tag:barrier=cycle barrier
+    barrier=ditch: DE:Tag:barrier=ditch
     barrier=fence: DE:Tag:barrier=fence
     barrier=gate: DE:Tag:barrier=gate
     barrier=hedge: DE:Tag:barrier=hedge
@@ -657,6 +2906,7 @@ de:
     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=simple-suspension: DE:Tag:bridge:structure=simple-suspension
     bridge:structure=suspension: DE:Tag:bridge:structure=suspension
     bridge:structure=truss: DE:Tag:bridge:structure=truss
     bridge=aqueduct: DE:Tag:bridge=aqueduct
@@ -667,31 +2917,52 @@ de:
     bridge=viaduct: DE:Tag:bridge=viaduct
     building=apartments: DE:Tag:building=apartments
     building=barn: DE:Tag:building=barn
+    building=bungalow: DE:Tag:building=bungalow
     building=cathedral: DE:Tag:building=cathedral
     building=chapel: DE:Tag:building=chapel
     building=church: DE:Tag:building=church
+    building=civic: DE:Tag:building=civic
     building=commercial: DE:Tag:building=commercial
     building=detached: DE:Tag:building=detached
     building=dormitory: DE:Tag:building=dormitory
     building=entrance: DE:Tag:building=entrance
+    building=farm: DE:Tag:building=farm
     building=garage: DE:Tag:building=garage
     building=garages: DE:Tag:building=garages
+    building=grandstand: DE:Tag:building=grandstand
     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=hut: DE:Tag:building=hut
     building=industrial: DE:Tag:building=industrial
+    building=kiosk: DE:Tag:building=kiosk
+    building=marquee: DE:Tag:building=marquee
+    building=mosque: DE:Tag:building=mosque
+    building=parking: DE:Tag:building=parking
     building=public: DE:Tag:building=public
     building=residential: DE:Tag:building=residential
     building=retail: DE:Tag:building=retail
+    building=riding_hall: DE:Tag:building=riding hall
     building=roof: DE:Tag:building=roof
+    building=ruins: DE:Tag:building=ruins
     building=school: DE:Tag:building=school
+    building=shed: DE:Tag:building=shed
+    building=shrine: DE:Tag:building=shrine
+    building=slurry_tank: DE:Tag:building=slurry tank
     building=stable: DE:Tag:building=stable
+    building=static_caravan: DE:Tag:building=static caravan
     building=sty: DE:Tag:building=sty
+    building=synagogue: DE:Tag:building=synagogue
     building=tech_cab: DE:Tag:building=tech cab
     building=terrace: DE:Tag:building=terrace
+    building=train_station: DE:Tag:building=train station
+    building=university: DE:Tag:building=university
+    building=warehouse: DE:Tag:building=warehouse
+    building=water_tower: DE:Tag:building=water tower
     bunker_type=hardened_aircraft_shelter: DE:Tag:bunker type=hardened aircraft shelter
+    bunker_type=munitions: DE:Tag:bunker type=munitions
     bunker_type=pillbox: DE:Tag:bunker type=pillbox
     castle_type=castrum: DE:Tag:castle type=castrum
     castle_type=defensive: DE:Tag:castle type=defensive
@@ -707,23 +2978,26 @@ de:
     craft=agricultural_engines: DE:Tag:craft=agricultural engines
     craft=basket_maker: DE:Tag:craft=basket maker
     craft=beekeeper: DE:Tag:craft=beekeeper
+    craft=blacksmith: DE:Tag:craft=blacksmith
     craft=boatbuilder: DE:Tag:craft=boatbuilder
     craft=bookbinder: DE:Tag:craft=bookbinder
     craft=car_repair: DE:Tag:craft=car repair
     craft=carpenter: DE:Tag:craft=carpenter
     craft=carpet_layer: DE:Tag:craft=carpet layer
+    craft=chimney_sweeper: DE:Tag:craft=chimney sweeper
+    craft=cooper: DE:Tag:craft=cooper
     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=glaziery: DE:Tag:craft=glaziery
     craft=handicraft: DE:Tag:craft=handicraft
     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=organ_builder: DE:Tag:craft=organ builder
     craft=painter: DE:Tag:craft=painter
@@ -731,6 +3005,7 @@ de:
     craft=parquet_layer: DE:Tag:craft=parquet layer
     craft=photographer: DE:Tag:craft=photographer
     craft=plumber: DE:Tag:craft=plumber
+    craft=pottery: DE:Tag:craft=pottery
     craft=roofer: DE:Tag:craft=roofer
     craft=saddler: DE:Tag:craft=saddler
     craft=sawmill: DE:Tag:craft=sawmill
@@ -739,16 +3014,35 @@ de:
     craft=stonemason: DE:Tag:craft=stonemason
     craft=tiler: DE:Tag:craft=tiler
     craft=tinsmith: DE:Tag:craft=tinsmith
+    craft=toolmaker: DE:Tag:craft=toolmaker
+    craft=turner: DE:Tag:craft=turner
     craft=upholsterer: DE:Tag:craft=upholsterer
     craft=watchmaker: DE:Tag:craft=watchmaker
+    craft=window_construction: DE:Tag:craft=window construction
     craft=winery: DE:Tag:craft=winery
     cuisine=coffee_shop: DE:Tag:cuisine=coffee shop
+    cycleway:left=lane: DE:Tag:cycleway:left=lane
+    cycleway:right=lane: DE:Tag:cycleway:right=lane
+    cycleway:right=track: DE:Tag:cycleway:right=track
     cycleway=lane: DE:Tag:cycleway=lane
+    cycleway=opposite: DE:Tag:cycleway=opposite
+    cycleway=opposite_lane: DE:Tag:cycleway=opposite lane
+    cycleway=opposite_track: DE:Tag:cycleway=opposite track
     cycleway=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
+    diplomatic=ambassadors_residence: DE:Tag:diplomatic=ambassadors residence
+    diplomatic=consulate: DE:Tag:diplomatic=consulate
+    diplomatic=consulate_general: DE:Tag:diplomatic=consulate general
+    diplomatic=delegation: DE:Tag:diplomatic=delegation
+    diplomatic=embassy: DE:Tag:diplomatic=embassy
+    diplomatic=high_commission: DE:Tag:diplomatic=high commission
+    diplomatic=honorary_consulate: DE:Tag:diplomatic=honorary consulate
+    diplomatic=permanent_mission: DE:Tag:diplomatic=permanent mission
+    dock=drydock: DE:Tag:dock=drydock
+    dock=floating: DE:Tag:dock=floating
     emergency=access_point: DE:Tag:emergency=access point
     emergency=aed: DE:Tag:emergency=aed
     emergency=ambulance_station: DE:Tag:emergency=ambulance station
@@ -763,8 +3057,17 @@ de:
     emergency=siren: DE:Tag:emergency=siren
     emergency=suction_point: DE:Tag:emergency=suction point
     emergency=water_rescue_station: DE:Tag:emergency=water rescue station
+    emergency_service=technical: DE:Tag:emergency service=technical
+    entrance=main: DE:Tag:entrance=main
+    entrance=yes: DE:Tag:entrance=yes
+    food=gourmet: DE:Tag:food=gourmet
     foot=designated: DE:Tag:foot=designated
     footway=sidewalk: DE:Tag:footway=sidewalk
+    fortification_type=hill_fort: DE:Tag:fortification type=hill fort
+    fortification_type=limes: DE:Tag:fortification type=limes
+    fortification_type=ringfort: DE:Tag:fortification type=ringfort
+    fortification_type=sconce: DE:Tag:fortification type=sconce
+    garden:type=botanical: DE:Tag:garden:type=botanical
     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
@@ -786,6 +3089,7 @@ de:
     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=osmotic: DE:Tag:generator:source=osmotic
     generator:source=solar: DE:Tag:generator:source=solar
     generator:source=tidal: DE:Tag:generator:source=tidal
     generator:source=waste: DE:Tag:generator:source=waste
@@ -809,13 +3113,28 @@ de:
     geological=moraine: DE:Tag:geological=moraine
     geological=outcrop: DE:Tag:geological=outcrop
     geological=palaeontological_site: DE:Tag:geological=palaeontological site
+    golf=bunker: DE:Tag:golf=bunker
+    golf=driving_range: DE:Tag:golf=driving range
+    golf=fairway: DE:Tag:golf=fairway
+    golf=green: DE:Tag:golf=green
+    golf=hole: DE:Tag:golf=hole
+    golf=lateral_water_hazard: DE:Tag:golf=lateral water hazard
+    golf=pin: DE:Tag:golf=pin
+    golf=rough: DE:Tag:golf=rough
+    golf=tee: DE:Tag:golf=tee
+    golf=water_hazard: DE:Tag:golf=water hazard
+    government=ministry: DE:Tag:government=ministry
+    government=prosecutor: DE:Tag:government=prosecutor
+    government=register_office: DE:Tag:government=register office
+    government=tax: DE:Tag:government=tax
+    hazmat:water=permissive: DE:Tag:hazmat:water=permissive
+    healthcare=blood_donation: DE:Tag:healthcare=blood donation
     highway=abandoned: DE:Tag:highway=abandoned
     highway=access: DE:Tag:highway=access
     highway=bridleway: DE:Tag:highway=bridleway
     highway=bus_guideway: DE:Tag:highway=bus guideway
     highway=bus_stop: DE:Tag:highway=bus stop
-    highway=byway: DE:Tag:highway=byway
-    highway=centre_line: DE:Tag:highway=centre line
+    highway=corridor: DE:Tag:highway=corridor
     highway=crossing: DE:Tag:highway=crossing
     highway=cycleway: DE:Tag:highway=cycleway
     highway=disused: DE:Tag:highway=disused
@@ -833,12 +3152,14 @@ de:
     highway=motorway_junction: DE:Tag:highway=motorway junction
     highway=motorway_link: DE:Tag:highway=motorway link
     highway=no: DE:Tag:highway=no
+    highway=passing_place: DE:Tag:highway=passing place
     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=primary_link: DE:Tag:highway=primary link
+    highway=proposed: DE:Tag:highway=proposed
     highway=raceway: DE:Tag:highway=raceway
     highway=razed: DE:Tag:highway=razed
     highway=residential: DE:Tag:highway=residential
@@ -846,13 +3167,16 @@ de:
     highway=road: DE:Tag:highway=road
     highway=rural: DE:Tag:highway=rural
     highway=secondary: DE:Tag:highway=secondary
+    highway=secondary_link: DE:Tag:highway=secondary link
     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=stop: DE:Tag:highway=stop
     highway=street_lamp: DE:Tag:highway=street lamp
     highway=street_light: DE:Tag:highway=street light
     highway=tertiary: DE:Tag:highway=tertiary
+    highway=tertiary_link: DE:Tag:highway=tertiary link
     highway=track: DE:Tag:highway=track
     highway=traffic_sign: DE:Tag:highway=traffic sign
     highway=traffic_signals: DE:Tag:highway=traffic signals
@@ -866,12 +3190,15 @@ de:
     historic=aircraft: DE:Tag:historic=aircraft
     historic=archaeological_site: DE:Tag:historic=archaeological site
     historic=battlefield: DE:Tag:historic=battlefield
+    historic=bomb_crater: DE:Tag:historic=bomb crater
     historic=boundary_stone: DE:Tag:historic=boundary stone
     historic=castle: DE:Tag:historic=castle
+    historic=charcoal_pile: DE:Tag:historic=charcoal pile
     historic=city_gate: DE:Tag:historic=city gate
     historic=citywalls: DE:Tag:historic=citywalls
     historic=fort: DE:Tag:historic=fort
     historic=gallows: DE:Tag:historic=gallows
+    historic=locomotive: DE:Tag:historic=locomotive
     historic=manor: DE:Tag:historic=manor
     historic=memorial: DE:Tag:historic=memorial
     historic=milestone: DE:Tag:historic=milestone
@@ -888,8 +3215,16 @@ de:
     historic=wayside_shrine: DE:Tag:historic=wayside shrine
     historic=wreck: DE:Tag:historic=wreck
     horse=designated: DE:Tag:horse=designated
+    industrial=scrap_yard: DE:Tag:industrial=scrap yard
+    information=audioguide: DE:Tag:information=audioguide
+    information=board: DE:Tag:information=board
     information=guidepost: DE:Tag:information=guidepost
     information=map: DE:Tag:information=map
+    information=office: DE:Tag:information=office
+    information=tactile_map: DE:Tag:information=tactile map
+    information=tactile_model: DE:Tag:information=tactile model
+    information=terminal: DE:Tag:information=terminal
+    internet_access=wlan: DE:Tag:internet access=wlan
     junction=roundabout: DE:Tag:junction=roundabout
     landuse=allotments: DE:Tag:landuse=allotments
     landuse=aquaculture: DE:Tag:landuse=aquaculture
@@ -897,10 +3232,13 @@ de:
     landuse=brownfield: DE:Tag:landuse=brownfield
     landuse=cemetery: DE:Tag:landuse=cemetery
     landuse=commercial: DE:Tag:landuse=commercial
+    landuse=construction: DE:Tag:landuse=construction
+    landuse=depot: DE:Tag:landuse=depot
     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=flowerbed: DE:Tag:landuse=flowerbed
     landuse=forest: DE:Tag:landuse=forest
     landuse=garages: DE:Tag:landuse=garages
     landuse=grass: DE:Tag:landuse=grass
@@ -912,6 +3250,7 @@ de:
     landuse=military: DE:Tag:landuse=military
     landuse=orchard: DE:Tag:landuse=orchard
     landuse=plant_nursery: DE:Tag:landuse=plant nursery
+    landuse=pond: DE:Tag:landuse=pond
     landuse=quarry: DE:Tag:landuse=quarry
     landuse=railway: DE:Tag:landuse=railway
     landuse=recreation_ground: DE:Tag:landuse=recreation ground
@@ -922,32 +3261,46 @@ de:
     landuse=salt_pond: DE:Tag:landuse=salt pond
     landuse=village_green: DE:Tag:landuse=village green
     landuse=vineyard: DE:Tag:landuse=vineyard
+    leaf_cycle=deciduous: DE:Tag:leaf cycle=deciduous
+    leaf_cycle=evergreen: DE:Tag:leaf cycle=evergreen
     leaf_type=broadleaved: DE:Tag:leaf type=broadleaved
     leaf_type=leafless: DE:Tag:leaf type=leafless
     leaf_type=mixed: DE:Tag:leaf type=mixed
     leaf_type=needleleaved: DE:Tag:leaf type=needleleaved
     leisure=adult_gaming_centre: DE:Tag:leisure=adult gaming centre
+    leisure=bandstand: DE:Tag:leisure=bandstand
     leisure=beach_resort: DE:Tag:leisure=beach resort
+    leisure=bird_hide: DE:Tag:leisure=bird hide
     leisure=bowling_alley: DE:Tag:leisure=bowling alley
+    leisure=common: DE:Tag:leisure=common
+    leisure=dance: DE:Tag:leisure=dance
+    leisure=disc_golf_course: DE:Tag:leisure=disc golf course
     leisure=dog_park: DE:Tag:leisure=dog park
     leisure=firepit: DE:Tag:leisure=firepit
     leisure=fish_spa: DE:Tag:leisure=fish spa
+    leisure=fishing: DE:Tag:leisure=fishing
     leisure=fitness_centre: DE:Tag:leisure=fitness centre
+    leisure=fitness_station: DE:Tag:leisure=fitness station
     leisure=foot_bath: DE:Tag:leisure=foot bath
     leisure=garden: DE:Tag:leisure=garden
     leisure=golf_course: DE:Tag:leisure=golf course
+    leisure=horse_riding: DE:Tag:leisure=horse riding
+    leisure=hot_spring: DE:Tag:leisure=hot spring
     leisure=ice_rink: DE:Tag:leisure=ice rink
     leisure=marina: DE:Tag:leisure=marina
     leisure=miniature_golf: DE:Tag:leisure=miniature golf
     leisure=nature_reserve: DE:Tag:leisure=nature reserve
+    leisure=outdoor_seating: DE:Tag:leisure=outdoor seating
     leisure=park: DE:Tag:leisure=park
     leisure=picnic_table: DE:Tag:leisure=picnic table
     leisure=pitch: DE:Tag:leisure=pitch
     leisure=playground: DE:Tag:leisure=playground
+    leisure=resort: DE:Tag:leisure=resort
     leisure=sauna: DE:Tag:leisure=sauna
     leisure=slipway: DE:Tag:leisure=slipway
     leisure=sports_centre: DE:Tag:leisure=sports centre
     leisure=stadium: DE:Tag:leisure=stadium
+    leisure=swimming_area: DE:Tag:leisure=swimming area
     leisure=swimming_pool: DE:Tag:leisure=swimming pool
     leisure=table_tennis_table: DE:Tag:leisure=table tennis table
     leisure=tanning_salon: DE:Tag:leisure=tanning salon
@@ -956,43 +3309,82 @@ de:
     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
+    line=bay: DE:Tag:line=bay
+    line=busbar: DE:Tag:line=busbar
     man_made=MDF: DE:Tag:man made=MDF
     man_made=adit: DE:Tag:man made=adit
     man_made=antenna: DE:Tag:man made=antenna
+    man_made=beacon: DE:Tag:man made=beacon
+    man_made=beehive: DE:Tag:man made=beehive
     man_made=breakwater: DE:Tag:man made=breakwater
+    man_made=bridge: DE:Tag:man made=bridge
     man_made=bunker_silo: DE:Tag:man made=bunker silo
-    man_made=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=cooling_tower: DE:Tag:man made=cooling tower
     man_made=crane: DE:Tag:man made=crane
+    man_made=cross: DE:Tag:man made=cross
     man_made=cutline: DE:Tag:man made=cutline
     man_made=dyke: DE:Tag:man made=dyke
     man_made=embankment: DE:Tag:man made=embankment
     man_made=flagpole: DE:Tag:man made=flagpole
     man_made=gasometer: DE:Tag:man made=gasometer
+    man_made=goods_conveyor: DE:Tag:man made=goods conveyor
     man_made=groyne: DE:Tag:man made=groyne
+    man_made=hot_water_tank: DE:Tag:man made=hot water tank
+    man_made=insect_hotel: DE:Tag:man made=insect hotel
+    man_made=kiln: DE:Tag:man made=kiln
     man_made=lighthouse: DE:Tag:man made=lighthouse
     man_made=mast: DE:Tag:man made=mast
     man_made=mineshaft: DE:Tag:man made=mineshaft
     man_made=monitoring_station: DE:Tag:man made=monitoring station
+    man_made=nesting_site: DE:Tag:man made=nesting site
+    man_made=obelisk: DE:Tag:man made=obelisk
+    man_made=observatory: DE:Tag:man made=observatory
     man_made=offshore_platform: DE:Tag:man made=offshore platform
     man_made=petroleum_well: DE:Tag:man made=petroleum well
     man_made=pier: DE:Tag:man made=pier
     man_made=pipeline: DE:Tag:man made=pipeline
     man_made=power_wind: DE:Tag:man made=power wind
+    man_made=pumping_station: DE:Tag:man made=pumping station
     man_made=reservoir_covered: DE:Tag:man made=reservoir covered
     man_made=silo: DE:Tag:man made=silo
+    man_made=snow_cannon: DE:Tag:man made=snow cannon
+    man_made=spoil_heap: DE:Tag:man made=spoil heap
     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=telescope: DE:Tag:man made=telescope
     man_made=tower: DE:Tag:man made=tower
     man_made=wastewater_plant: DE:Tag:man made=wastewater plant
+    man_made=water_tank: DE:Tag:man made=water tank
+    man_made=water_tap: DE:Tag:man made=water tap
     man_made=water_tower: DE:Tag:man made=water tower
     man_made=water_well: DE:Tag:man made=water well
     man_made=water_works: DE:Tag:man made=water works
     man_made=watermill: DE:Tag:man made=watermill
+    man_made=wildlife_crossing: DE:Tag:man made=wildlife crossing
     man_made=windmill: DE:Tag:man made=windmill
     man_made=works: DE:Tag:man made=works
+    megalith_type=alignment: DE:Tag:megalith type=alignment
+    megalith_type=chamber: DE:Tag:megalith type=chamber
+    megalith_type=cist: DE:Tag:megalith type=cist
+    megalith_type=dolmen: DE:Tag:megalith type=dolmen
+    megalith_type=long_barrow: DE:Tag:megalith type=long barrow
+    megalith_type=menhir: DE:Tag:megalith type=menhir
+    megalith_type=nuraghe: DE:Tag:megalith type=nuraghe
+    megalith_type=passage_grave: DE:Tag:megalith type=passage grave
+    megalith_type=stone_circle: DE:Tag:megalith type=stone circle
+    megalith_type=stone_ship: DE:Tag:megalith type=stone ship
+    megalith_type=tholos: DE:Tag:megalith type=tholos
+    memorial:type=stolperstein: DE:Tag:memorial:type=stolperstein
+    memorial=bust: DE:Tag:memorial=bust
+    memorial=obelisk: DE:Tag:memorial=obelisk
+    memorial=plaque: DE:Tag:memorial=plaque
+    memorial=statue: DE:Tag:memorial=statue
+    memorial=stele: DE:Tag:memorial=stele
+    memorial=stone: DE:Tag:memorial=stone
+    memorial=war_memorial: DE:Tag:memorial=war memorial
     microbrewery=yes: DE:Tag:microbrewery=yes
     military=airfield: DE:Tag:military=airfield
     military=barracks: DE:Tag:military=barracks
@@ -1002,6 +3394,8 @@ de:
     military=nuclear_explosion_site: DE:Tag:military=nuclear explosion site
     military=range: DE:Tag:military=range
     military=training_area: DE:Tag:military=training area
+    motorcycle:type=scooter: DE:Tag:motorcycle:type=scooter
+    natural=anthill: DE:Tag:natural=anthill
     natural=arete: DE:Tag:natural=arete
     natural=bare_rock: DE:Tag:natural=bare rock
     natural=bay: DE:Tag:natural=bay
@@ -1009,22 +3403,29 @@ de:
     natural=cave_entrance: DE:Tag:natural=cave entrance
     natural=cliff: DE:Tag:natural=cliff
     natural=coastline: DE:Tag:natural=coastline
+    natural=earth_bank: DE:Tag:natural=earth bank
     natural=fell: DE:Tag:natural=fell
+    natural=geyser: DE:Tag:natural=geyser
     natural=glacier: DE:Tag:natural=glacier
     natural=grassland: DE:Tag:natural=grassland
     natural=heath: DE:Tag:natural=heath
+    natural=hot_spring: DE:Tag:natural=hot spring
     natural=moor: DE:Tag:natural=moor
     natural=mud: DE:Tag:natural=mud
     natural=peak: DE:Tag:natural=peak
     natural=reef: DE:Tag:natural=reef
     natural=ridge: DE:Tag:natural=ridge
+    natural=rock: DE:Tag:natural=rock
     natural=saddle: DE:Tag:natural=saddle
+    natural=sand: DE:Tag:natural=sand
     natural=scree: DE:Tag:natural=scree
     natural=scrub: DE:Tag:natural=scrub
     natural=shingle: DE:Tag:natural=shingle
+    natural=shoal: DE:Tag:natural=shoal
     natural=sinkhole: DE:Tag:natural=sinkhole
     natural=spring: DE:Tag:natural=spring
     natural=stone: DE:Tag:natural=stone
+    natural=termite_mound: DE:Tag:natural=termite mound
     natural=tree: DE:Tag:natural=tree
     natural=tree_group: DE:Tag:natural=tree group
     natural=tree_row: DE:Tag:natural=tree row
@@ -1032,25 +3433,58 @@ de:
     natural=water: DE:Tag:natural=water
     natural=wetland: DE:Tag:natural=wetland
     natural=wood: DE:Tag:natural=wood
+    network=Flinkster: DE:Tag:network=Flinkster
+    network=call-a-bike: DE:Tag:network=call-a-bike
+    network=cambio/stadtmobil: DE:Tag:network=cambio/stadtmobil
+    network=cambio_stadtmobil: DE:Tag:network=cambio stadtmobil
     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=nextbike: DE:Tag:network=nextbike
     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=accountant: DE:Tag:office=accountant
+    office=administrative: DE:Tag:office=administrative
+    office=advertising_agency: DE:Tag:office=advertising agency
+    office=architect: DE:Tag:office=architect
+    office=association: DE:Tag:office=association
+    office=charity: DE:Tag:office=charity
     office=employment_agency: DE:Tag:office=employment agency
+    office=energy_supplier: DE:Tag:office=energy supplier
     office=estate_agent: DE:Tag:office=estate agent
+    office=forestry: DE:Tag:office=forestry
+    office=government: DE:Tag:office=government
+    office=guide: DE:Tag:office=guide
     office=insurance: DE:Tag:office=insurance
     office=lawyer: DE:Tag:office=lawyer
+    office=moving_company: DE:Tag:office=moving company
+    office=newspaper: DE:Tag:office=newspaper
+    office=parish: DE:Tag:office=parish
     office=political_party: DE:Tag:office=political party
+    office=religion: DE:Tag:office=religion
+    office=research: DE:Tag:office=research
+    office=tax_advisor: DE:Tag:office=tax advisor
+    office=therapist: DE:Tag:office=therapist
     office=travel_agent: DE:Tag:office=travel agent
+    operator=Cambio: DE:Tag:operator=Cambio
+    operator=CiteeCar: DE:Tag:operator=CiteeCar
+    operator=Drive_Carsharing: DE:Tag:operator=Drive Carsharing
+    operator=Flinkster: DE:Tag:operator=Flinkster
+    operator=Stadtmobil: DE:Tag:operator=Stadtmobil
+    operator=book-n-drive: DE:Tag:operator=book-n-drive
+    operator=cambio: DE:Tag:operator=cambio
+    operator=stadtmobil: DE:Tag:operator=stadtmobil
+    operator=teilAuto: DE:Tag:operator=teilAuto
     parking:lane:hgv=on_street: DE:Tag:parking:lane:hgv=on street
     pipeline=marker: DE:Tag:pipeline=marker
+    pipeline=substation: DE:Tag:pipeline=substation
     pipeline=valve: DE:Tag:pipeline=valve
+    piste:type=nordic: DE:Tag:piste:type=nordic
     place=archipelago: DE:Tag:place=archipelago
     place=city: DE:Tag:place=city
     place=continent: DE:Tag:place=continent
@@ -1062,23 +3496,30 @@ de:
     place=isolated_dwelling: DE:Tag:place=isolated dwelling
     place=locality: DE:Tag:place=locality
     place=neighbourhood: DE:Tag:place=neighbourhood
+    place=square: DE:Tag:place=square
     place=state: DE:Tag:place=state
     place=suburb: DE:Tag:place=suburb
     place=town: DE:Tag:place=town
     place=village: DE:Tag:place=village
+    placement=transition: DE:Tag:placement=transition
     power=cable: DE:Tag:power=cable
     power=cable_distribution_cabinet: DE:Tag:power=cable distribution cabinet
+    power=converter: DE:Tag:power=converter
     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=pole: DE:Tag:power=pole
+    power=portal: DE:Tag:power=portal
     power=station: DE:Tag:power=station
     power=sub_station: DE:Tag:power=sub station
     power=substation: DE:Tag:power=substation
+    power=switch: DE:Tag:power=switch
+    power=switchgear: DE:Tag:power=switchgear
     power=tower: DE:Tag:power=tower
     power=transformer: DE:Tag:power=transformer
+    prison_camp=concentration_camp: DE:Tag:prison camp=concentration camp
     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
@@ -1094,14 +3535,17 @@ de:
     railway=halt: DE:Tag:railway=halt
     railway=level_crossing: DE:Tag:railway=level crossing
     railway=light_rail: DE:Tag:railway=light rail
+    railway=miniature: DE:Tag:railway=miniature
     railway=monorail: DE:Tag:railway=monorail
     railway=narrow_gauge: DE:Tag:railway=narrow gauge
     railway=platform: DE:Tag:railway=platform
     railway=preserved: DE:Tag:railway=preserved
     railway=rail: DE:Tag:railway=rail
+    railway=rail_brake: DE:Tag:railway=rail brake
     railway=railway_crossing: DE:Tag:railway=railway crossing
     railway=roundhouse: DE:Tag:railway=roundhouse
     railway=signal: DE:Tag:railway=signal
+    railway=signal_box: DE:Tag:railway=signal box
     railway=station: DE:Tag:railway=station
     railway=stop: DE:Tag:railway=stop
     railway=subway: DE:Tag:railway=subway
@@ -1109,10 +3553,21 @@ de:
     railway=switch: DE:Tag:railway=switch
     railway=tram: DE:Tag:railway=tram
     railway=tram_stop: DE:Tag:railway=tram stop
+    railway=traverser: DE:Tag:railway=traverser
     railway=turntable: DE:Tag:railway=turntable
+    railway=wash: DE:Tag:railway=wash
+    railway=yard: DE:Tag:railway=yard
+    religion=buddhist: DE:Tag:religion=buddhist
+    religion=christian: DE:Tag:religion=christian
+    religion=hindu: DE:Tag:religion=hindu
+    religion=jewish: DE:Tag:religion=jewish
+    religion=muslim: DE:Tag:religion=muslim
+    religion=shinto: DE:Tag:religion=shinto
+    rental=strandkorb: DE:Tag:rental=strandkorb
     route=bicycle: DE:Tag:route=bicycle
     route=bus: DE:Tag:route=bus
     route=ferry: DE:Tag:route=ferry
+    route=fitness_trail: DE:Tag:route=fitness trail
     route=foot: DE:Tag:route=foot
     route=hiking: DE:Tag:route=hiking
     route=horse: DE:Tag:route=horse
@@ -1120,6 +3575,7 @@ de:
     route=light_rail: DE:Tag:route=light rail
     route=mtb: DE:Tag:route=mtb
     route=nordic_walking: DE:Tag:route=nordic walking
+    route=pipeline: DE:Tag:route=pipeline
     route=piste: DE:Tag:route=piste
     route=railway: DE:Tag:route=railway
     route=road: DE:Tag:route=road
@@ -1129,6 +3585,7 @@ de:
     route=tracks: DE:Tag:route=tracks
     route=train: DE:Tag:route=train
     route=tram: DE:Tag:route=tram
+    route=trolleybus: DE:Tag:route=trolleybus
     service=alley: DE:Tag:service=alley
     service=crossover: DE:Tag:service=crossover
     service=driveway: DE:Tag:service=driveway
@@ -1137,91 +3594,198 @@ de:
     service=spur: DE:Tag:service=spur
     service=yard: DE:Tag:service=yard
     shelter_type=lean_to: DE:Tag:shelter type=lean to
+    shop=agrarian: DE:Tag:shop=agrarian
+    shop=alcohol: DE:Tag:shop=alcohol
+    shop=antiques: DE:Tag:shop=antiques
+    shop=art: DE:Tag:shop=art
+    shop=atv: DE:Tag:shop=atv
     shop=baby_goods: DE:Tag:shop=baby goods
     shop=bag: DE:Tag:shop=bag
     shop=bakery: DE:Tag:shop=bakery
+    shop=bathroom_furnishing: DE:Tag:shop=bathroom furnishing
+    shop=beauty: DE:Tag:shop=beauty
+    shop=bed: DE:Tag:shop=bed
     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=boutique: DE:Tag:shop=boutique
     shop=butcher: DE:Tag:shop=butcher
+    shop=camera: DE:Tag:shop=camera
     shop=car: DE:Tag:shop=car
     shop=car_parts: DE:Tag:shop=car parts
     shop=car_repair: DE:Tag:shop=car repair
+    shop=carpet: DE:Tag:shop=carpet
     shop=charity: DE:Tag:shop=charity
     shop=cheese: DE:Tag:shop=cheese
     shop=chemist: DE:Tag:shop=chemist
+    shop=chocolate: DE:Tag:shop=chocolate
     shop=clothes: DE:Tag:shop=clothes
     shop=coffee: DE:Tag:shop=coffee
+    shop=collector: DE:Tag:shop=collector
     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=cosmetics: DE:Tag:shop=cosmetics
+    shop=craft: DE:Tag:shop=craft
+    shop=curtain: DE:Tag:shop=curtain
+    shop=dairy: DE:Tag:shop=dairy
     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=erotic: DE:Tag:shop=erotic
     shop=fabric: DE:Tag:shop=fabric
     shop=farm: DE:Tag:shop=farm
+    shop=fashion: DE:Tag:shop=fashion
+    shop=fireplace: DE:Tag:shop=fireplace
     shop=fishing: DE:Tag:shop=fishing
+    shop=flooring: DE:Tag:shop=flooring
     shop=florist: DE:Tag:shop=florist
+    shop=frame: DE:Tag:shop=frame
     shop=funeral_directors: DE:Tag:shop=funeral directors
     shop=furniture: DE:Tag:shop=furniture
     shop=garden_centre: DE:Tag:shop=garden centre
+    shop=gas: DE:Tag:shop=gas
     shop=general: DE:Tag:shop=general
     shop=gift: DE:Tag:shop=gift
+    shop=golf: DE:Tag:shop=golf
     shop=greengrocer: DE:Tag:shop=greengrocer
+    shop=haberdashery: DE:Tag:shop=haberdashery
     shop=hairdresser: DE:Tag:shop=hairdresser
+    shop=hairdresser_supply: DE:Tag:shop=hairdresser supply
     shop=hardware: DE:Tag:shop=hardware
+    shop=hearing_aids: DE:Tag:shop=hearing aids
+    shop=herbalist: DE:Tag:shop=herbalist
+    shop=hifi: DE:Tag:shop=hifi
     shop=houseware: DE:Tag:shop=houseware
+    shop=hunting: DE:Tag:shop=hunting
+    shop=ice_cream: DE:Tag:shop=ice cream
+    shop=interior_decoration: DE:Tag:shop=interior decoration
     shop=jewelry: DE:Tag:shop=jewelry
     shop=kiosk: DE:Tag:shop=kiosk
     shop=kitchen: DE:Tag:shop=kitchen
+    shop=lamps: DE:Tag:shop=lamps
     shop=laundry: DE:Tag:shop=laundry
+    shop=leather: DE:Tag:shop=leather
     shop=locksmith: DE:Tag:shop=locksmith
     shop=mall: DE:Tag:shop=mall
+    shop=massage: DE:Tag:shop=massage
     shop=medical_supply: DE:Tag:shop=medical supply
+    shop=mobile_phone: DE:Tag:shop=mobile phone
+    shop=model: DE:Tag:shop=model
+    shop=motorcycle: DE:Tag:shop=motorcycle
+    shop=music: DE:Tag:shop=music
+    shop=musical_instrument: DE:Tag:shop=musical instrument
     shop=newsagent: DE:Tag:shop=newsagent
     shop=optician: DE:Tag:shop=optician
     shop=outdoor: DE:Tag:shop=outdoor
+    shop=paint: DE:Tag:shop=paint
+    shop=party: DE:Tag:shop=party
     shop=pastry: DE:Tag:shop=pastry
+    shop=pawnbroker: DE:Tag:shop=pawnbroker
+    shop=perfumery: DE:Tag:shop=perfumery
     shop=pet: DE:Tag:shop=pet
     shop=photo: DE:Tag:shop=photo
+    shop=scuba_diving: DE:Tag:shop=scuba diving
     shop=seafood: DE:Tag:shop=seafood
+    shop=second_hand: DE:Tag:shop=second hand
     shop=shoes: DE:Tag:shop=shoes
     shop=spare_parts: DE:Tag:shop=spare parts
+    shop=spices: DE:Tag:shop=spices
+    shop=sports: DE:Tag:shop=sports
     shop=stationery: DE:Tag:shop=stationery
+    shop=storage_rental: DE:Tag:shop=storage rental
     shop=supermarket: DE:Tag:shop=supermarket
+    shop=swimming_pool: DE:Tag:shop=swimming pool
+    shop=tattoo: DE:Tag:shop=tattoo
     shop=tea: DE:Tag:shop=tea
+    shop=ticket: DE:Tag:shop=ticket
+    shop=tiles: DE:Tag:shop=tiles
     shop=tobacco: DE:Tag:shop=tobacco
     shop=toys: DE:Tag:shop=toys
     shop=trade: DE:Tag:shop=trade
+    shop=travel_agency: DE:Tag:shop=travel agency
+    shop=trophy: DE:Tag:shop=trophy
     shop=tyres: DE:Tag:shop=tyres
     shop=vacant: DE:Tag:shop=vacant
     shop=variety_store: DE:Tag:shop=variety store
+    shop=video: DE:Tag:shop=video
     shop=watches: DE:Tag:shop=watches
+    shop=weapons: DE:Tag:shop=weapons
+    shop=wholesale: DE:Tag:shop=wholesale
+    shop=wigs: DE:Tag:shop=wigs
     shop=window_blind: DE:Tag:shop=window blind
     shop=wine: DE:Tag:shop=wine
+    shop=wool: DE:Tag:shop=wool
+    site_type=bigstone: DE:Tag:site type=bigstone
+    site_type=fortification: DE:Tag:site type=fortification
+    site_type=hut_circle: DE:Tag:site type=hut circle
+    site_type=megalith: DE:Tag:site type=megalith
+    site_type=necropolis: DE:Tag:site type=necropolis
+    site_type=petroglyph: DE:Tag:site type=petroglyph
+    site_type=roman_circus: DE:Tag:site type=roman circus
+    site_type=roman_villa: DE:Tag:site type=roman villa
+    site_type=settlement: DE:Tag:site type=settlement
+    site_type=tumulus: DE:Tag:site type=tumulus
+    social_facility=ambulatory_care: DE:Tag:social facility=ambulatory care
+    social_facility=assisted_living: DE:Tag:social facility=assisted living
+    social_facility=day_care: DE:Tag:social facility=day care
+    social_facility=food_bank: DE:Tag:social facility=food bank
+    social_facility=group_home: DE:Tag:social facility=group home
+    social_facility=hospice: DE:Tag:social facility=hospice
+    social_facility=nursing_home: DE:Tag:social facility=nursing home
+    social_facility=soup_kitchen: DE:Tag:social facility=soup kitchen
+    social_facility=workshop: DE:Tag:social facility=workshop
     source=HiRes_aerial_imagery: DE:Tag:source=HiRes aerial imagery
+    sport=10pin: DE:Tag:sport=10pin
     sport=9pin: DE:Tag:sport=9pin
+    sport=archery: DE:Tag:sport=archery
+    sport=baseball: DE:Tag:sport=baseball
+    sport=basketball: DE:Tag:sport=basketball
     sport=bobsleigh: DE:Tag:sport=bobsleigh
+    sport=chess: DE:Tag:sport=chess
     sport=climbing: DE:Tag:sport=climbing
     sport=climbing_adventure: DE:Tag:sport=climbing adventure
+    sport=equestrian: DE:Tag:sport=equestrian
+    sport=fencing: DE:Tag:sport=fencing
     sport=free_flying: DE:Tag:sport=free flying
     sport=golf: DE:Tag:sport=golf
+    sport=horse_racing: DE:Tag:sport=horse racing
+    sport=ice_skating: DE:Tag:sport=ice skating
+    sport=judo: DE:Tag:sport=judo
+    sport=karting: DE:Tag:sport=karting
+    sport=motocross: DE:Tag:sport=motocross
+    sport=motor: DE:Tag:sport=motor
     sport=multi: DE:Tag:sport=multi
     sport=sailing: DE:Tag:sport=sailing
     sport=scuba_diving: DE:Tag:sport=scuba diving
     sport=shooting: DE:Tag:sport=shooting
+    sport=skateboard: DE:Tag:sport=skateboard
     sport=soccer: DE:Tag:sport=soccer
+    sport=swimming: DE:Tag:sport=swimming
+    sport=table_soccer: DE:Tag:sport=table soccer
+    sport=table_tennis: DE:Tag:sport=table tennis
+    sport=tennis: DE:Tag:sport=tennis
+    sport=toboggan: DE:Tag:sport=toboggan
+    sport=trampoline: DE:Tag:sport=trampoline
+    sport=volleyball: DE:Tag:sport=volleyball
     station=light_rail: DE:Tag:station=light rail
     station=subway: DE:Tag:station=subway
+    substation=converter: DE:Tag:substation=converter
+    substation=distribution: DE:Tag:substation=distribution
+    substation=minor_distribution: DE:Tag:substation=minor distribution
+    substation=traction: DE:Tag:substation=traction
+    substation=transmission: DE:Tag:substation=transmission
     summit:cross=yes: DE:Tag:summit:cross=yes
     surface=asphalt: DE:Tag:surface=asphalt
     tourism=alpine_hut: DE:Tag:tourism=alpine hut
+    tourism=apartment: DE:Tag:tourism=apartment
     tourism=aquarium: DE:Tag:tourism=aquarium
     tourism=artwork: DE:Tag:tourism=artwork
+    tourism=attraction: DE:Tag:tourism=attraction
     tourism=camp_site: DE:Tag:tourism=camp site
     tourism=caravan_site: DE:Tag:tourism=caravan site
     tourism=chalet: DE:Tag:tourism=chalet
@@ -1233,7 +3797,11 @@ de:
     tourism=motel: DE:Tag:tourism=motel
     tourism=museum: DE:Tag:tourism=museum
     tourism=picnic_site: DE:Tag:tourism=picnic site
+    tourism=theme_park: DE:Tag:tourism=theme park
+    tourism=trail_riding_station: DE:Tag:tourism=trail riding station
     tourism=viewpoint: DE:Tag:tourism=viewpoint
+    tourism=wilderness_hut: DE:Tag:tourism=wilderness hut
+    tourism=wine_cellar: DE:Tag:tourism=wine cellar
     tourism=zoo: DE:Tag:tourism=zoo
     tower:type=bell_tower: DE:Tag:tower:type=bell tower
     tower:type=bridge: DE:Tag:tower:type=bridge
@@ -1250,50 +3818,131 @@ de:
     tower:type=radar: DE:Tag:tower:type=radar
     tower:type=siren: DE:Tag:tower:type=siren
     tower:type=watchtower: DE:Tag:tower:type=watchtower
+    traffic_sign=city_limit: DE:Tag:traffic sign=city limit
+    tunnel=culvert: DE:Tag:tunnel=culvert
     vending=animal_feed: DE:Tag:vending=animal feed
     vending=bicycle_tube: DE:Tag:vending=bicycle tube
+    vending=bread: DE:Tag:vending=bread
     vending=candles: DE:Tag:vending=candles
+    vending=chewing_gums: DE:Tag:vending=chewing gums
+    vending=coffee: DE:Tag:vending=coffee
+    vending=elongated_coin: DE:Tag:vending=elongated coin
     vending=excrement_bags: DE:Tag:vending=excrement bags
+    vending=flowers: DE:Tag:vending=flowers
+    vending=food: DE:Tag:vending=food
+    vending=ice_cream: DE:Tag:vending=ice cream
+    vending=milk: DE:Tag:vending=milk
     vending=newspapers: DE:Tag:vending=newspapers
+    vending=parcel_mail_in: DE:Tag:vending=parcel mail in
+    vending=parcel_pickup: DE:Tag:vending=parcel pickup
     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=sex_toys: DE:Tag:vending=sex toys
     vending=stamps: DE:Tag:vending=stamps
+    vending=toys: DE:Tag:vending=toys
+    vending=water: DE:Tag:vending=water
+    vending_machine=fuel: DE:Tag:vending machine=fuel
+    water=lake: DE:Tag:water=lake
+    water=lock: DE:Tag:water=lock
+    water=reservoir: DE:Tag:water=reservoir
+    waterway=boat_lift: DE:Tag:waterway=boat lift
     waterway=boatyard: DE:Tag:waterway=boatyard
     waterway=canal: DE:Tag:waterway=canal
     waterway=dam: DE:Tag:waterway=dam
+    waterway=derelict_canal: DE:Tag:waterway=derelict canal
     waterway=ditch: DE:Tag:waterway=ditch
     waterway=dock: DE:Tag:waterway=dock
     waterway=drain: DE:Tag:waterway=drain
     waterway=fish_pass: DE:Tag:waterway=fish pass
+    waterway=fuel: DE:Tag:waterway=fuel
     waterway=lock_gate: DE:Tag:waterway=lock gate
+    waterway=milestone: DE:Tag:waterway=milestone
     waterway=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
+    wetland=bog: DE:Tag:wetland=bog
+    wetland=fen: DE:Tag:wetland=fen
+    wetland=mangrove: DE:Tag:wetland=mangrove
+    wetland=marsh: DE:Tag:wetland=marsh
+    wetland=reedbed: DE:Tag:wetland=reedbed
+    wetland=saltern: DE:Tag:wetland=saltern
+    wetland=saltmarsh: DE:Tag:wetland=saltmarsh
+    wetland=swamp: DE:Tag:wetland=swamp
+    wetland=tidalflat: DE:Tag:wetland=tidalflat
+    wetland=wet_meadow: DE:Tag:wetland=wet meadow
+    zoo=aviary: DE:Tag:zoo=aviary
+    zoo=birds: DE:Tag:zoo=birds
+    zoo=enclosure: DE:Tag:zoo=enclosure
+    zoo=falconry: DE:Tag:zoo=falconry
+    zoo=petting_zoo: DE:Tag:zoo=petting zoo
+    zoo=reptile: DE:Tag:zoo=reptile
+    zoo=safari_park: DE:Tag:zoo=safari park
+    zoo=wildlife_park: DE:Tag:zoo=wildlife park
 el:
   key:
+    amenity: El:Key:amenity
+    building:architecture: El:Key:building:architecture
     building:levels: El:Key:building:levels
     height: El:Key:height
+  tag:
+    amenity=bar: El:Tag:amenity=bar
+    amenity=bbq: El:Tag:amenity=bbq
+    amenity=bicycle_parking: El:Tag:amenity=bicycle parking
+    amenity=bicycle_rental: El:Tag:amenity=bicycle rental
+    amenity=biergarten: El:Tag:amenity=biergarten
+    amenity=bus_station: El:Tag:amenity=bus station
+    amenity=cafe: El:Tag:amenity=cafe
+    amenity=car_rental: El:Tag:amenity=car rental
+    amenity=car_wash: El:Tag:amenity=car wash
+    amenity=drinking_water: El:Tag:amenity=drinking water
+    amenity=fast_food: El:Tag:amenity=fast food
+    amenity=food_court: El:Tag:amenity=food court
+    amenity=fuel: El:Tag:amenity=fuel
+    amenity=ice_cream: El:Tag:amenity=ice cream
+    amenity=kindergarten: El:Tag:amenity=kindergarten
+    amenity=language_school: El:Tag:amenity=language school
+    amenity=library: El:Tag:amenity=library
+    amenity=motorcycle_parking: El:Tag:amenity=motorcycle parking
+    amenity=pub: El:Tag:amenity=pub
+    amenity=public_bookcase: El:Tag:amenity=public bookcase
+    amenity=restaurant: El:Tag:amenity=restaurant
+    amenity=school: El:Tag:amenity=school
+    amenity=taxi: El:Tag:amenity=taxi
+    amenity=university: El:Tag:amenity=university
 en:
   key:
     3dr:type: Key:3dr:type
+    4wd_only: Key:4wd only
     :lanes: Key::lanes
     AND_nosr_r: Key:AND nosr r
+    AlpinRes_ID: Key:AlpinRes ID
     CEMT: Key:CEMT
     DGPS_correction: Key:DGPS correction
+    EHAK:code: Key:EHAK:code
     EH_ref: Key:EH ref
     FIXME: Key:FIXME
     Fetish: Key:Fetish
+    Finance_agent: Key:Finance agent
+    HE_ref: Key:HE ref
+    HU:hu-go:length: Key:HU:hu-go:length
+    HU:hu-go:milestone: Key:HU:hu-go:milestone
+    HU:hu-go:road: Key:HU:hu-go:road
     IBGE:CD_ADMINIS: Key:IBGE:CD ADMINIS
     IBGE:GEOCODIGO: Key:IBGE:GEOCODIGO
     IBGE:tipo: Key:IBGE:tipo
+    INEGI: Key:INEGI
+    INEGI:CVE_MUN: Key:INEGI:CVE MUN
+    INEGI:MUNID: Key:INEGI:MUNID
     Lock_ref: Key:Lock ref
     NHS: Key:NHS
     PMSA_ref: Key:PMSA ref
+    Power_supply:schedule: Key:Power supply:schedule
     RLIS:bicycle: Key:RLIS:bicycle
     RLIS:reviewed: Key:RLIS:reviewed
+    Schalansky_ref: Key:Schalansky ref
     Shop: Key:Shop
     TMC: Key:TMC
     TMC:Direction: Key:TMC:Direction
@@ -1303,21 +3952,29 @@ en:
     TODO: Key:TODO
     Touring: Key:Touring
     URL: Key:URL
+    WDPA_ID:ref: Key:WDPA ID:ref
     WLAN: Key:WLAN
     Wikipedia: Key:Wikipedia
     abandoned: Key:abandoned
+    'abandoned:': 'Key:abandoned:'
     abandoned:*: Key:abandoned:*
+    abandoned:amenity: Key:abandoned:amenity
+    abandoned:railway: Key:abandoned:railway
     abutters: Key:abutters
     access: Key:access
+    access:bdouble: Key:access:bdouble
+    access:conditional: Key:access:conditional
     access:lanes: Key:access:lanes
     access:lhv: Key:access:lhv
     access:roadtrain: Key:access:roadtrain
     access:roadtrain:trailers: Key:access:roadtrain:trailers
     addr: Key:addr
     addr:alternatenumber: Key:addr:alternatenumber
+    addr:block: Key:addr:block
     addr:borough: Key:addr:borough
     addr:city: Key:addr:city
     addr:city:de: Key:addr:city:de
+    addr:city:en: Key:addr:city:en
     addr:city:it: Key:addr:city:it
     addr:conscriptionnumber: Key:addr:conscriptionnumber
     addr:country: Key:addr:country
@@ -1331,6 +3988,7 @@ en:
     addr:hamlet:it: Key:addr:hamlet:it
     addr:housename: Key:addr:housename
     addr:housenumber: Key:addr:housenumber
+    addr:inclusion: Key:addr:inclusion
     addr:interpolation: Key:addr:interpolation
     addr:place: Key:addr:place
     addr:place:de: Key:addr:place:de
@@ -1342,6 +4000,7 @@ en:
     addr:state: Key:addr:state
     addr:street: Key:addr:street
     addr:street:de: Key:addr:street:de
+    addr:street:en: Key:addr:street:en
     addr:street:it: Key:addr:street:it
     addr:street:name: Key:addr:street:name
     addr:street:prefix: Key:addr:street:prefix
@@ -1354,32 +4013,54 @@ en:
     adr_les: Key:adr les
     advertising: Key:advertising
     aerialway: Key:aerialway
+    aerialway:drag_lift: Key:aerialway:drag lift
+    aerialway:duration: Key:aerialway:duration
     aerodrome: Key:aerodrome
     aeroway: Key:aeroway
+    after_school: Key:after school
     agricultural: Key:agricultural
-    airmark: Key:airmark
+    air_conditioning: Key:air conditioning
     alt_name: Key:alt name
+    alt_name:ar: Key:alt name:ar
     alt_name:en: Key:alt name:en
+    alt_name:ko: Key:alt name:ko
+    alt_name:mg: Key:alt name:mg
+    alt_name:th: Key:alt name:th
+    alt_name_1: Key:alt name 1
     amenity: Key:amenity
+    amenity:eftpos: Key:amenity:eftpos
+    amenity:restaurant: Key:amenity:restaurant
+    animal: Key:animal
+    animated: Key:animated
     architect: Key:architect
     area: Key:area
+    area:highway: Key:area:highway
+    artist_name: Key:artist name
+    artwork_subject: Key:artwork subject
     artwork_type: Key:artwork type
+    asb: Key:asb
     ascent: Key:ascent
     asset_ref: Key:asset ref
     assisted_trail: Key:assisted trail
     attribution: Key:attribution
     atv: Key:atv
+    atv:sales: Key:atv:sales
+    authentication: Key:authentication
+    automated: Key:automated
     automatic_door: Key:automatic door
+    backcountry: Key:backcountry
     backrest: Key:backrest
     backward: Key:backward
     bar: Key:bar
     barrier: Key:barrier
     barrier:personnel: Key:barrier:personnel
+    baseball: Key:baseball
     basin: Key:basin
     bdouble: Key:bdouble
     beacon: Key:beacon
     beacon:colour: Key:beacon:colour
     beacon:function: Key:beacon:function
+    beacon:type: Key:beacon:type
     beds: Key:beds
     bench: Key:bench
     bicycle: Key:bicycle
@@ -1388,19 +4069,27 @@ en:
     bicycle:conditional: Key:bicycle:conditional
     bicycle_parking: Key:bicycle parking
     bicycle_road: Key:bicycle road
+    bike_ride: Key:bike ride
     bin: Key:bin
     biosphärenwirt: Key:biosphärenwirt
     biotic_reef: Key:biotic reef
     biotic_reef:type: Key:biotic reef:type
+    blind:website: Key:blind:website
+    blind:website:lg: Key:blind:website:lg
     board_type: Key:board type
     boat: Key:boat
     bollard: Key:bollard
     books: Key:books
     border_type: Key:border type
+    both: Key:both
     bottom:material: Key:bottom:material
     boundary: Key:boundary
     boundary_type: Key:boundary type
+    branch: Key:branch
     brand: Key:brand
+    brand:wikidata: Key:brand:wikidata
+    brand:wikipedia: Key:brand:wikipedia
+    breakfast: Key:breakfast
     brewery: Key:brewery
     bridge: Key:bridge
     bridge:alt_name: Key:bridge:alt name
@@ -1412,6 +4101,7 @@ en:
     bridge:short_name: Key:bridge:short name
     bridge:structure: Key:bridge:structure
     bridge:support: Key:bridge:support
+    bridge_name: Key:bridge name
     building: Key:building
     building:architecture: Key:building:architecture
     building:colour: Key:building:colour
@@ -1427,12 +4117,17 @@ en:
     building:min_level: Key:building:min level
     building:obm: Key:building:obm
     building:part: Key:building:part
-    building:parts: Key:building:parts
+    building:place: Key:building:place
     building:roof:colour: Key:building:roof:colour
+    building:ruian:type: Key:building:ruian:type
     building:type: Key:building:type
+    building:units: Key:building:units
     building:usage:pl: Key:building:usage:pl
+    building:use: Key:building:use
+    bulk_purchase: Key:bulk purchase
     bunker_type: Key:bunker type
     bus: Key:bus
+    bus_bay: Key:bus bay
     busway: Key:busway
     busway:left: Key:busway:left
     busway:right: Key:busway:right
@@ -1440,14 +4135,26 @@ en:
     cable_number: Key:cable number
     cables: Key:cables
     cafe: Key:cafe
+    camp_site: Key:camp site
+    camp_type: Key:camp type
+    campers: Key:campers
+    canoe: Key:canoe
     capacity: Key:capacity
     capacity:disabled: Key:capacity:disabled
     capital: Key:capital
+    capital_city: Key:capital city
+    car_wash: Key:car wash
+    caravan: Key:caravan
+    caravans: Key:caravans
+    cargo: Key:cargo
     carriage: Key:carriage
     carriageway_ref: Key:carriageway ref
+    casemate: Key:casemate
     castle_type: Key:castle type
     castle_type:cs: Key:castle type:cs
     castle_type:de: Key:castle type:de
+    cave:name: Key:cave:name
+    cave:ref: Key:cave:ref
     cemetery: Key:cemetery
     cemt: Key:cemt
     center_turn_lane: Key:center turn lane
@@ -1455,10 +4162,14 @@ en:
     centre_turn_lane: Key:centre turn lane
     cep: Key:cep
     change: Key:change
+    charge: Key:charge
+    charity: Key:charity
     check_date: Key:check date
     checkpoint: Key:checkpoint
     circuits: Key:circuits
     circumference: Key:circumference
+    city_limit: Key:city limit
+    class: Key:class
     class:bicycle: Key:class:bicycle
     class:bicycle:commute: Key:class:bicycle:commute
     class:bicycle:mtb: Key:class:bicycle:mtb
@@ -1473,30 +4184,46 @@ en:
     club-mate: Key:club-mate
     coastline:survey_quality: Key:coastline:survey quality
     cocktails: Key:cocktails
+    coffee: Key:coffee
     collection_times: Key:collection times
     colonnade: Key:colonnade
     color: Key:color
     colour: Key:colour
     comment: Key:comment
-    common_good_land: Key:common good land
+    communication:amateur_radio: Key:communication:amateur radio
+    communication:amateur_radio:repeater: Key:communication:amateur radio:repeater
+    communication:bos: Key:communication:bos
+    communication:microwave: Key:communication:microwave
     communication:mobile_phone: Key:communication:mobile phone
     communication:radio: Key:communication:radio
     communication:television: Key:communication:television
+    community_centre: Key:community centre
+    community_centre:for: Key:community centre:for
+    condition: Key:condition
     conditional: Key:conditional
     construction: Key:construction
+    construction:website: Key:construction:website
     construction_end_expected: Key:construction end expected
     contact: Key:contact
+    contact:diaspora: Key:contact:diaspora
     contact:email: Key:contact:email
     contact:facebook: Key:contact:facebook
     contact:fax: Key:contact:fax
+    contact:flickr: Key:contact:flickr
+    contact:gnusocial: Key:contact:gnusocial
     contact:google_plus: Key:contact:google plus
+    contact:instagram: Key:contact:instagram
     contact:linkedin: Key:contact:linkedin
+    contact:mastodon: Key:contact:mastodon
     contact:phone: Key:contact:phone
+    contact:skype: Key:contact:skype
     contact:twitter: Key:contact:twitter
     contact:vhf: Key:contact:vhf
+    contact:vk: Key:contact:vk
     contact:webcam: Key:contact:webcam
     contact:website: Key:contact:website
     contact:xing: Key:contact:xing
+    contact:youtube: Key:contact:youtube
     content: Key:content
     conveying: Key:conveying
     country: Key:country
@@ -1505,6 +4232,12 @@ en:
     created_by: Key:created by
     crop: Key:crop
     crossing: Key:crossing
+    crossing:activation: Key:crossing:activation
+    crossing:barrier: Key:crossing:barrier
+    crossing:bell: Key:crossing:bell
+    crossing:light: Key:crossing:light
+    crossing:on_demand: Key:crossing:on demand
+    crossing:saltire: Key:crossing:saltire
     cuisine: Key:cuisine
     cultivation_method: Key:cultivation method
     currency: Key:currency
@@ -1528,11 +4261,19 @@ en:
     cycleway:left=backward: Key:cycleway:left=backward
     cycleway:right: Key:cycleway:right
     cycleway:right=forward: Key:cycleway:right=forward
+    date: Key:date
+    date_off: Key:date off
+    date_on: Key:date on
+    day_off: Key:day off
+    day_on: Key:day on
     de:amtlicher_gemeindeschluessel: Key:de:amtlicher gemeindeschluessel
+    de:regionalschluessel: Key:de:regionalschluessel
     de:strassenschluessel: Key:de:strassenschluessel
     deanery: Key:deanery
     dehoga: Key:dehoga
     delivery: Key:delivery
+    demolished: Key:demolished
+    'demolished:': 'Key:demolished:'
     denomination: Key:denomination
     denotation: Key:denotation
     depth: Key:depth
@@ -1548,6 +4289,7 @@ en:
     description: Key:description
     description:restrictions: Key:description:restrictions
     descriptions:restrictions: Key:descriptions:restrictions
+    design:ref: Key:design:ref
     designation: Key:designation
     destination: Key:destination
     destination:backward: Key:destination:backward
@@ -1555,7 +4297,11 @@ en:
     destination:lanes: Key:destination:lanes
     destination:lanes:backward: Key:destination:lanes:backward
     destination:lanes:forward: Key:destination:lanes:forward
+    detour: Key:detour
+    dhm_id: Key:dhm id
+    diameter: Key:diameter
     diaper: Key:diaper
+    dibavod:id: Key:dibavod:id
     diet: Key:diet
     diet:*: Key:diet:*
     diet:dairy_free: Key:diet:dairy free
@@ -1564,20 +4310,34 @@ en:
     diet:vegan: Key:diet:vegan
     diet:vegetarian: Key:diet:vegetarian
     diocese: Key:diocese
+    diplomatic: Key:diplomatic
+    diplomatic:receiving_country: Key:diplomatic:receiving country
+    diplomatic:sending_country: Key:diplomatic:sending country
     direction: Key:direction
     dirtbike:scale: Key:dirtbike:scale
     disabled: Key:disabled
     disabled_spaces: Key:disabled spaces
     dispensing: Key:dispensing
+    display: Key:display
     distance: Key:distance
     disused: Key:disused
     'disused:': 'Key:disused:'
+    disused:amenity: Key:disused:amenity
+    disused:railway: Key:disused:railway
+    disused:shop: Key:disused:shop
+    dog: Key:dog
     dominant_taxon: Key:dominant taxon
+    donation:compensation: Key:donation:compensation
+    donation:compensation:payment: Key:donation:compensation:payment
+    donation:compensation:vouchers: Key:donation:compensation:vouchers
     door: Key:door
+    draft: Key:draft
     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:milk: Key:drink:milk
+    drink:milk-raw: Key:drink:milk-raw
     drink:raw_milk: Key:drink:raw milk
     drinkable: Key:drinkable
     drinking_water: Key:drinking water
@@ -1590,8 +4350,12 @@ en:
     drive_thru: Key:drive thru
     driving_side: Key:driving side
     duration: Key:duration
+    earthquake: Key:earthquake
+    earthquake:damage: Key:earthquake:damage
     easy_overtaking: Key:easy overtaking
     ele: Key:ele
+    ele:NHN: Key:ele:NHN
+    ele:local: Key:ele:local
     electrified: Key:electrified
     email: Key:email
     embankment: Key:embankment
@@ -1604,27 +4368,46 @@ en:
     est_width: Key:est width
     etymology: Key:etymology
     european_cultural_path: Key:european cultural path
+    evacuation_route: Key:evacuation route
+    exhibit: Key:exhibit
     exit: Key:exit
     exit_to: Key:exit to
     expressway: Key:expressway
     facebook: Key:facebook
+    faces: Key:faces
     fair_trade: Key:fair trade
+    farming_system: Key:farming system
+    farmyard: Key:farmyard
     fast_food: Key:fast food
     fax: Key:fax
+    fcc:registration_number: Key:fcc:registration number
+    fcc:unique_system_identifier: Key:fcc:unique system identifier
     fee: Key:fee
+    fee:disabled: Key:fee:disabled
+    fee:disabled_assistant: Key:fee:disabled assistant
     female: Key:female
     fence_type: Key:fence type
     fenced: Key:fenced
     ferry: Key:ferry
+    ferry:cable: Key:ferry:cable
     fetish: Key:fetish
+    fhrs:authority: Key:fhrs:authority
     fhrs:id: Key:fhrs:id
+    fhrs:rating: Key:fhrs:rating
+    field: Key:field
+    finance_agent: Key:finance agent
     fire_boundary: Key:fire boundary
+    fire_hydrant: Key:fire hydrant
+    fire_hydrant:type: Key:fire hydrant:type
     fire_object:type: Key:fire object:type
     fire_operator: Key:fire operator
     fire_rank: Key:fire rank
     fireplace: Key:fireplace
     fishing: Key:fishing
     fixme: Key:fixme
+    flickr: Key:flickr
+    floating: Key:floating
+    flood_mark: Key:flood mark
     flood_prone: Key:flood prone
     floor:material: Key:floor:material
     foot: Key:foot
@@ -1632,8 +4415,11 @@ en:
     ford: Key:ford
     forestry: Key:forestry
     format: Key:format
+    fortification_type: Key:fortification type
     forward: Key:forward
     frequency: Key:frequency
+    fridge: Key:fridge
+    from: Key:from
     fruit: Key:fruit
     fuel: Key:fuel
     fuel:1_25: Key:fuel:1 25
@@ -1641,13 +4427,13 @@ en:
     fuel:E10: Key:fuel:E10
     fuel:GTL_diesel: Key:fuel:GTL diesel
     fuel:HGV_diesel: Key:fuel:HGV diesel
-    fuel:LH2: Key:fuel:LH2
     fuel:adblue: Key:fuel:adblue
     fuel:alcohol: Key:fuel:alcohol
     fuel:biodiesel: Key:fuel:biodiesel
     fuel:biogas: Key:fuel:biogas
     fuel:cng: Key:fuel:cng
     fuel:diesel: Key:fuel:diesel
+    fuel:diesel_G2: Key:fuel:diesel G2
     fuel:discount: Key:fuel:discount
     fuel:e10: Key:fuel:e10
     fuel:e20: Key:fuel:e20
@@ -1658,6 +4444,7 @@ en:
     fuel:methanol: Key:fuel:methanol
     fuel:octane_100: Key:fuel:octane 100
     fuel:octane_80: Key:fuel:octane 80
+    fuel:octane_87: Key:fuel:octane 87
     fuel:octane_91: Key:fuel:octane 91
     fuel:octane_92: Key:fuel:octane 92
     fuel:octane_95: Key:fuel:octane 95
@@ -1667,16 +4454,24 @@ en:
     further: Key:further
     further:access: Key:further:access
     further:vehicle: Key:further:vehicle
+    fvst:navnelbnr: Key:fvst:navnelbnr
     gambling: Key:gambling
+    garden:style: Key:garden:style
+    garden:type: Key:garden:type
     gauge: Key:gauge
     generator:method: Key:generator:method
     generator:output: Key:generator:output
     generator:output:biogas: Key:generator:output:biogas
+    generator:output:cold_air: Key:generator:output:cold air
+    generator:output:cold_water: Key:generator:output:cold water
+    generator:output:compressed_air: Key:generator:output:compressed air
     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:vacuum: Key:generator:output:vacuum
+    generator:place: Key:generator:place
     generator:plant: Key:generator:plant
     generator:source: Key:generator:source
     generator:type: Key:generator:type
@@ -1684,20 +4479,33 @@ en:
     genus:de: Key:genus:de
     geocodigo: Key:geocodigo
     geological: Key:geological
+    geothermal: Key:geothermal
     gluten_free: Key:gluten free
+    gnis:fcode: Key:gnis:fcode
     gnis:feature_id: Key:gnis:feature id
+    gnis:ftype: Key:gnis:ftype
     gnis:id: Key:gnis:id
     golf: Key:golf
+    golf:course: Key:golf:course
+    golf_cart: Key:golf cart
     goods: Key:goods
+    government: Key:government
+    grades: Key:grades
+    grape_variety: Key:grape variety
     grassland: Key:grassland
+    gritting: Key:gritting
     group_only: Key:group only
+    guest_house: Key:guest house
     guidepost: Key:guidepost
+    guidepost:hiking: Key:guidepost:hiking
+    gun_emplacement_type: Key:gun emplacement type
+    gun_turret: Key:gun turret
     gvr:code: Key:gvr:code
-    habitat: Key:habitat
     handrail: Key:handrail
     happy_hours: Key:happy hours
     harbour: Key:harbour
     harbour:category: Key:harbour:category
+    hazard: Key:hazard
     hazard_intensity: Key:hazard intensity
     hazard_occurence: Key:hazard occurence
     hazard_occurrence: Key:hazard occurrence
@@ -1709,8 +4517,12 @@ en:
     healthcare: Key:healthcare
     healthcare:speciality: Key:healthcare:speciality
     height: Key:height
+    heritage: Key:heritage
     hgv: Key:hgv
+    high_water_mark: Key:high water mark
+    highspeed: Key:highspeed
     highway: Key:highway
+    highway:category: Key:highway:category
     hiking: Key:hiking
     historic: Key:historic
     historic:civilization: Key:historic:civilization
@@ -1719,26 +4531,41 @@ en:
     historic_name: Key:historic name
     history: Key:history
     horse: Key:horse
+    horse-drawn_carriage: Key:horse-drawn carriage
+    horse_scale: Key:horse scale
     hour_off: Key:hour off
     hour_on: Key:hour on
     hov: Key:hov
     hov:lanes: Key:hov:lanes
     iata: Key:iata
     icao: Key:icao
+    ice_cream: Key:ice cream
+    ice_cream=yes: Key:ice cream=yes
     ice_road: Key:ice road
+    ice_skates: Key:ice skates
+    ifr: Key:ifr
+    ignore_for_routing: Key:ignore for routing
     image: Key:image
     imagery_offset: Key:imagery offset
     imagery_used: Key:imagery used
+    import_uuid: Key:import uuid
     importance: Key:importance
     impromptu: Key:impromptu
     incline: Key:incline
+    incline:across: Key:incline:across
     indoor: Key:indoor
+    indoor_seating: Key:indoor seating
+    indoormark: Key:indoormark
+    industrial: Key:industrial
+    industry:isic_code: Key:industry:isic code
     informal: Key:informal
     information: Key:information
     inline_skates: Key:inline skates
     inscription: Key:inscription
+    inscription:url: Key:inscription:url
     int_name: Key:int name
     int_ref: Key:int ref
+    int_ref:ar: Key:int ref:ar
     intermittent: Key:intermittent
     internet: Key:internet
     internet_access: Key:internet access
@@ -1755,13 +4582,24 @@ en:
     is_in:municipality: Key:is in:municipality
     is_in:ocean: Key:is in:ocean
     is_in:province: Key:is in:province
+    is_in:region: Key:is in:region
     is_in:sea: Key:is in:sea
     is_in:state: Key:is in:state
     is_in:ward: Key:is in:ward
+    it:fvg:ctrn:code: Key:it:fvg:ctrn:code
     jel: Key:jel
+    jetski:sales: Key:jetski:sales
     junction: Key:junction
+    junction:ref: Key:junction:ref
     junction_number: Key:junction number
+    kct_blue: Key:kct blue
+    kct_green: Key:kct green
+    kct_none: Key:kct none
+    kct_red: Key:kct red
+    kct_white: Key:kct white
+    kct_yellow: Key:kct yellow
     kerb: Key:kerb
+    kids_area: Key:kids area
     kms: Key:kms
     kms:county_name: Key:kms:county name
     kms:county_no: Key:kms:county no
@@ -1774,33 +4612,47 @@ en:
     kms:zip_code: Key:kms:zip code
     kms:zip_name: Key:kms:zip name
     kms:zip_no: Key:kms:zip no
+    kneipp_water_cure: Key:kneipp water cure
     kp: Key:kp
+    kudish: Key:kudish
     label: Key:label
+    lacounty:ain: Key:lacounty:ain
+    lacounty:bld_id: Key:lacounty:bld id
     lactose_free: Key:lactose free
     ladder: Key:ladder
+    lamp_mount: Key:lamp mount
+    lamp_type: Key:lamp type
     landmark: Key:landmark
     landuse: Key:landuse
     lane_hint: Key:lane hint
     lanes: Key:lanes
+    lanes:backward: Key:lanes:backward
+    lanes:both_ways: Key:lanes:both ways
     lanes:bus: Key:lanes:bus
+    lanes:forward: Key:lanes:forward
     lanes:psv: Key:lanes:psv
     lanes:psv:backward: Key:lanes:psv:backward
     lanes:psv:forward: Key:lanes:psv:forward
+    lawyer: Key:lawyer
     layer: Key:layer
     lcn_ref: Key:lcn ref
     leaf_cycle: Key:leaf cycle
     leaf_type: Key:leaf type
+    learner_driver: Key:learner driver
     left: Key:left
+    left:country: Key:left:country
     leisure: Key:leisure
-    leisure=beach: Key:leisure=beach
     length: Key:length
     level: Key:level
+    lhv: Key:lhv
     lighting:perceived: Key:lighting:perceived
+    line: Key:line
     lines: Key:lines
     listed_status: Key:listed status
     lit: Key:lit
     lit:perceived: Key:lit:perceived
     living_street: Key:living street
+    loading_gauge: Key:loading gauge
     loc_name: Key:loc name
     loc_ref: Key:loc ref
     local_ref: Key:local ref
@@ -1808,12 +4660,20 @@ en:
     lock: Key:lock
     lock_name: Key:lock name
     lock_ref: Key:lock ref
+    lockable: Key:lockable
+    long_name:ar: Key:long name:ar
+    lottery: Key:lottery
+    love_locks: Key:love locks
+    lunch: Key:lunch
+    lunch:specials: Key:lunch:specials
     maintained: Key:maintained
     maintenance: Key:maintenance
     male: Key:male
     man_made: Key:man made
     managed: Key:managed
     manhole: Key:manhole
+    manufacturer: Key:manufacturer
+    manufacturer:type: Key:manufacturer:type
     mapillary: Key:mapillary
     maritime: Key:maritime
     massage: Key:massage
@@ -1821,99 +4681,181 @@ en:
     max_age: Key:max age
     maxage: Key:maxage
     maxaxleload: Key:maxaxleload
+    maxbogieweight: Key:maxbogieweight
     maxheight: Key:maxheight
     maxheight:legal: Key:maxheight:legal
     maxheight:physical: Key:maxheight:physical
     maxlength: Key:maxlength
     maxspeed: Key:maxspeed
+    maxspeed:advisory: Key:maxspeed:advisory
     maxspeed:conditional: Key:maxspeed:conditional
+    maxspeed:practical: Key:maxspeed:practical
     maxspeed:source: Key:maxspeed:source
     maxspeed:type: Key:maxspeed:type
     maxstay: Key:maxstay
     maxweight: Key:maxweight
     maxwidth: Key:maxwidth
     maxwidth:physical: Key:maxwidth:physical
+    mdb_id: Key:mdb id
     measurement: Key:measurement
+    medical_supply: Key:medical supply
     megalith_type: Key:megalith type
     memorial: Key:memorial
+    memorial:type: Key:memorial:type
+    message: Key:message
+    microbrewery: Key:microbrewery
     military: Key:military
     min_age: Key:min age
     min_height: Key:min height
     minage: Key:minage
+    mineshaft_type: Key:mineshaft type
+    minibus: Key:minibus
     minspeed: Key:minspeed
     minspeed:lanes: Key:minspeed:lanes
     mofa: Key:mofa
     monitoring:air_quality: Key:monitoring:air quality
+    monitoring:bicycle: Key:monitoring:bicycle
     monitoring:galileo: Key:monitoring:galileo
     monitoring:glonass: Key:monitoring:glonass
     monitoring:gps: Key:monitoring:gps
     monitoring:groundwater: Key:monitoring:groundwater
+    monitoring:meteoric_activity: Key:monitoring:meteoric activity
     monitoring:noise: Key:monitoring:noise
+    monitoring:radiation: Key:monitoring:radiation
     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:traffic: Key:monitoring:traffic
     monitoring:water_level: Key:monitoring:water level
     monitoring:weather: Key:monitoring:weather
+    monument:genesis: Key:monument:genesis
     mooring: Key:mooring
     moped: Key:moped
     motor_vehicle: Key:motor vehicle
     motorboat: Key:motorboat
     motorcar: Key:motorcar
     motorcycle: Key:motorcycle
+    motorcycle:clothes: Key:motorcycle:clothes
+    motorcycle:conditional: Key:motorcycle:conditional
+    motorcycle:parts: Key:motorcycle:parts
+    motorcycle:rental: Key:motorcycle:rental
+    motorcycle:repair: Key:motorcycle:repair
+    motorcycle:sales: Key:motorcycle:sales
+    motorcycle:type: Key:motorcycle:type
+    motorcycle:tyres: Key:motorcycle:tyres
+    motorhome: Key:motorhome
     motorroad: Key:motorroad
     motorway: Key:motorway
     mountain_pass: Key:mountain pass
+    moved: Key:moved
     mtb: Key:mtb
     mtb:description: Key:mtb:description
     mtb:scale: Key:mtb:scale
     mtb:scale:imba: Key:mtb:scale:imba
     mtb:scale:uphill: Key:mtb:scale:uphill
     mtb_scale: Key:mtb scale
+    museum: Key:museum
+    museum_type: Key:museum type
     name: Key:name
     name:ar: Key:name:ar
     name:be: Key:name:be
+    name:be-tarask: Key:name:be-tarask
+    name:ber: Key:name:ber
     name:botanical: Key:name:botanical
+    name:br: Key:name:br
     name:ca: Key:name:ca
     name:cs: Key:name:cs
     name:cy: Key:name:cy
     name:de: Key:name:de
+    name:dv: Key:name:dv
+    name:el: Key:name:el
     name:en: Key:name:en
+    name:eo: Key:name:eo
     name:es: Key:name:es
     name:etymology: Key:name:etymology
     name:etymology:wikipedia: Key:name:etymology:wikipedia
+    name:eu: Key:name:eu
     name:fi: Key:name:fi
     name:fr: Key:name:fr
+    name:fy: Key:name:fy
     name:ga: Key:name:ga
     name:gd: Key:name:gd
+    name:he: Key:name:he
+    name:hi: Key:name:hi
+    name:hu: Key:name:hu
+    name:io: Key:name:io
     name:it: Key:name:it
     name:ja: Key:name:ja
+    name:ja-Hira: Key:name:ja-Hira
+    name:jbo: Key:name:jbo
+    name:kab: Key:name:kab
     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:ku: Key:name:ku
+    name:left: Key:name:left
+    name:left:fr: Key:name:left:fr
+    name:lg: Key:name:lg
+    name:mg: Key:name:mg
+    name:mk: Key:name:mk
+    name:ml: Key:name:ml
+    name:mr: Key:name:mr
+    name:nds-nl: Key:name:nds-nl
     name:nl: Key:name:nl
     name:nn: Key:name:nn
     name:no: Key:name:no
+    name:nov: Key:name:nov
     name:pl: Key:name:pl
+    name:prefix: Key:name:prefix
+    name:pronunciation: Key:name:pronunciation
     name:pt: Key:name:pt
+    name:right: Key:name:right
     name:ru: Key:name:ru
+    name:ru:word_stress: Key:name:ru:word stress
+    name:sc: Key:name:sc
+    name:sk: Key:name:sk
     name:sl: Key:name:sl
+    name:suffix: Key:name:suffix
     name:sv: Key:name:sv
+    name:ta: Key:name:ta
+    name:te: Key:name:te
+    name:th: Key:name:th
+    name:tok: Key:name:tok
+    name:tr: Key:name:tr
+    name:tzl: Key:name:tzl
     name:uk: Key:name:uk
+    name:vo: Key:name:vo
+    name:zh: Key:name:zh
+    name_1: Key:name 1
     narrow: Key:narrow
     nat_name: Key:nat name
     nat_ref: Key:nat ref
     natural: Key:natural
+    naturbase: Key:naturbase
+    naturbase:FORVALTNI: Key:naturbase:FORVALTNI
+    naturbase:IUCN: Key:naturbase:IUCN
+    naturbase:MOBLANDPRI: Key:naturbase:MOBLANDPRI
+    naturbase:OMRADENAVN: Key:naturbase:OMRADENAVN
+    naturbase:VERNEFORM: Key:naturbase:VERNEFORM
+    naturbase:VERNEF_ID: Key:naturbase:VERNEF ID
+    naturbase:VERNEPLAN: Key:naturbase:VERNEPLAN
+    naturbase:iid: Key:naturbase:iid
     navibot:categorize: Key:navibot:categorize
     navibot:connect: Key:navibot:connect
+    navigationaid: Key:navigationaid
     ncat: Key:ncat
     ncn_milepost: Key:ncn milepost
     ncn_ref: Key:ncn ref
     network: Key:network
+    no-barnehage:nsrid: Key:no-barnehage:nsrid
     noaddress: Key:noaddress
     noexit: Key:noexit
+    non_existent_levels: Key:non existent levels
     noname: Key:noname
+    noref: Key:noref
+    not:nccod: Key:not:nccod
     not_served_by: Key:not served by
     note: Key:note
     note:deplacer4mE: Key:note:deplacer4mE
@@ -1923,27 +4865,44 @@ en:
     note:pilotage: Key:note:pilotage
     notes: Key:notes
     nudism: Key:nudism
+    nursery: Key:nursery
+    nvdb:date: Key:nvdb:date
+    nvdb:id: Key:nvdb:id
     obstacle: Key:obstacle
+    occurrence: Key:occurrence
     office: Key:office
     official_name: Key:official name
+    official_name:ar: Key:official name:ar
+    official_ref: Key:official ref
     offshore: Key:offshore
     ois:fixme: Key:ois:fixme
-    old_name: Key:old name
+    old_name:ar: Key:old name:ar
+    old_name:etymology:wikidata: Key:old name:etymology:wikidata
+    old_railway_operator: Key:old railway operator
     old_ref: Key:old ref
     old_ref_legislative: Key:old ref legislative
+    oneclass: Key:oneclass
     oneway: Key:oneway
     oneway:bicycle: Key:oneway:bicycle
     oneway:moped: Key:oneway:moped
+    onkz: Key:onkz
+    openbenches:id: Key:openbenches:id
+    openfire: Key:openfire
     opening_date: Key:opening date
     opening_hours: Key:opening hours
+    opening_hours:kitchen: Key:opening hours:kitchen
     openplaques:id: Key:openplaques:id
     openplaques_plaque: Key:openplaques plaque
     opensource: Key:opensource
     operator: Key:operator
     operator:MNC: Key:operator:MNC
     operator:type: Key:operator:type
+    operator:wikipedia: Key:operator:wikipedia
     organic: Key:organic
+    orientation: Key:orientation
+    orienteering: Key:orienteering
     origin: Key:origin
+    osak: Key:osak
     osak:identifier: Key:osak:identifier
     osak:municipality_no: Key:osak:municipality no
     osak:revision: Key:osak:revision
@@ -1954,12 +4913,16 @@ en:
     osmarender:render: Key:osmarender:render
     osmarender:renderName: Key:osmarender:renderName
     osmarender:renderRef: Key:osmarender:renderRef
+    osmc:status: Key:osmc:status
     osmc:symbol: Key:osmc:symbol
     outdoor_seating: Key:outdoor seating
+    oven: Key:oven
     overtaking: Key:overtaking
     overtaking:hgv: Key:overtaking:hgv
     owner: Key:owner
     ownership: Key:ownership
+    par: Key:par
+    parish: Key:parish
     parking: Key:parking
     parking:condition: Key:parking:condition
     parking:condition:both: Key:parking:condition:both
@@ -1974,6 +4937,8 @@ en:
     parking:lane:right: Key:parking:lane:right
     parking:lane:side: Key:parking:lane:side
     passenger: Key:passenger
+    passenger_information_display: Key:passenger information display
+    passenger_lines: Key:passenger lines
     passing_places: Key:passing places
     paved: Key:paved
     paved:date: Key:paved:date
@@ -1984,27 +4949,34 @@ en:
     payment:credit_cards: Key:payment:credit cards
     payment:electronic_purses: Key:payment:electronic purses
     payment:foo: Key:payment:foo
+    payment:mastercard: Key:payment:mastercard
+    payment:mir: Key:payment:mir
     payment:none: Key:payment:none
     payment:notes: Key:payment:notes
+    payment:pro100: Key:payment:pro100
     payment:u-key: Key:payment:u-key
+    payment:visa: Key:payment:visa
     phoenixbikeguide: Key:phoenixbikeguide
     phone: Key:phone
     photo: Key:photo
     photograph: Key:photograph
     picture: Key:picture
+    pilgrimage: Key:pilgrimage
     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
-    pitlatrine: Key:pitlatrine
     pk: Key:pk
     place: Key:place
+    place:PH: Key:place:PH
     place:fr: Key:place:fr
+    place:ph: Key:place:ph
     place_name: Key:place name
     placement: Key:placement
     planned: Key:planned
+    plant: Key:plant
     plant:output: Key:plant:output
     plant:output:cold_air: Key:plant:output:cold air
     plant:output:cold_water: Key:plant:output:cold water
@@ -2014,21 +4986,27 @@ en:
     plant:output:hot_water: Key:plant:output:hot water
     plant:output:steam: Key:plant:output:steam
     plant:output:vacuum: Key:plant:output:vacuum
+    plant:source: Key:plant:source
     plant_community: Key:plant community
     platforms: Key:platforms
     playground: Key:playground
+    'playground:': 'Key:playground:'
+    playground:theme: Key:playground:theme
+    point: Key:point
     police: Key:police
     population: Key:population
+    population_rank: Key:population rank
     post_box:type: Key:post box:type
     post_office:type: Key:post office:type
     postal_code: Key:postal code
     postcode: Key:postcode
     power: Key:power
-    power_output: EN:Key:power output
+    power_output: Key:power output
     power_rating: Key:power rating
     power_source: Key:power source
     power_supply: Key:power supply
     power_supply:schedule: Key:power supply:schedule
+    preschool: Key:preschool
     previous: Key:previous
     previous:access: Key:previous:access
     previous:vehicle: Key:previous:vehicle
@@ -2039,6 +5017,7 @@ en:
     proposed: Key:proposed
     protect_class: Key:protect class
     protect_id: Key:protect id
+    protected: Key:protected
     protection_title: Key:protection title
     prow_ref: Key:prow ref
     psv: Key:psv
@@ -2060,7 +5039,14 @@ en:
     radio_transponder:range: Key:radio transponder:range
     radio_transponder:signal_frequency: Key:radio transponder:signal frequency
     railway: Key:railway
+    railway:position: Key:railway:position
     railway:preserved: Key:railway:preserved
+    railway:signal:combined: Key:railway:signal:combined
+    railway:signal:distant: Key:railway:signal:distant
+    railway:signal:main: Key:railway:signal:main
+    railway:signal:speed_limit: Key:railway:signal:speed limit
+    railway:signal:speed_limit_distant: Key:railway:signal:speed limit distant
+    railway:track_ref: Key:railway:track ref
     ramp: Key:ramp
     ramp:bicycle: Key:ramp:bicycle
     ramp:luggage: Key:ramp:luggage
@@ -2070,22 +5056,38 @@ en:
     rcn_ref: Key:rcn ref
     real_ale: Key:real ale
     real_cider: Key:real cider
+    real_fire: Key:real fire
+    recording: Key:recording
     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:EU:ENTSOE_EIC: Key:ref:EU:ENTSOE EIC
     ref:FR:42C: Key:ref:FR:42C
+    ref:FR:ARCEP: Key:ref:FR:ARCEP
     ref:FR:CEF: Key:ref:FR:CEF
+    ref:FR:FANTOIR:left: Key:ref:FR:FANTOIR:left
+    ref:FR:FANTOIR:right: Key:ref:FR:FANTOIR:right
     ref:FR:FINESS: Key:ref:FR:FINESS
+    ref:FR:INSEE: Key:ref:FR:INSEE
+    ref:FR:LaPoste: Key:ref:FR:LaPoste
     ref:FR:MemorialGenWeb: Key:ref:FR:MemorialGenWeb
     ref:FR:NAF: Key:ref:FR:NAF
+    ref:FR:Orange: Key:ref:FR:Orange
+    ref:FR:PTT: Key:ref:FR:PTT
+    ref:FR:RTE: Key:ref:FR:RTE
+    ref:FR:RTE_nom: Key:ref:FR:RTE nom
     ref:FR:SIREN: Key:ref:FR:SIREN
     ref:FR:SIRET: Key:ref:FR:SIRET
+    ref:FR:fantoir: Key:ref:FR:fantoir
+    ref:FR:prix-carburants: Key:ref:FR:prix-carburants
+    ref:HU:edid: Key:ref:HU:edid
     ref:IFOPT: Key:ref:IFOPT
     ref:INSEE: Key:ref:INSEE
     ref:ISTAT: Key:ref:ISTAT
+    ref:NPLG:UPRN:1: Key:ref:NPLG:UPRN:1
     ref:TECB: Key:ref:TECB
     ref:TECC: Key:ref:TECC
     ref:TECH: Key:ref:TECH
@@ -2093,50 +5095,74 @@ en:
     ref:TECN: Key:ref:TECN
     ref:TECX: Key:ref:TECX
     ref:UAI: Key:ref:UAI
+    ref:UrbIS: Key:ref:UrbIS
+    ref:ar: Key:ref:ar
     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:bic: Key:ref:bic
     ref:bufa: Key:ref:bufa
+    ref:cobe: Key:ref:cobe
     ref:color: Key:ref:color
     ref:colour: Key:ref:colour
+    ref:ctb: Key:ref:ctb
+    ref:edubase: Key:ref:edubase
     ref:isil: Key:ref:isil
+    ref:kmb: Key:ref:kmb
+    ref:lor: Key:ref:lor
     ref:mhs: Key:ref:mhs
+    ref:miaaddr: Key:ref:miaaddr
+    ref:miabldg: Key:ref:miabldg
     ref:mobil-parken.de: Key:ref:mobil-parken.de
     ref:ortsnetz: Key:ref:ortsnetz
+    ref:penndot: Key:ref:penndot
     ref:ruian: Key:ref:ruian
     ref:ruian:addr: Key:ref:ruian:addr
     ref:ruian:building: Key:ref:ruian:building
+    ref:ruian:street: Key:ref:ruian:street
     ref:sandre: Key:ref:sandre
+    ref:se:pts:postort: Key:ref:se:pts:postort
     ref:se:scb: Key:ref:se:scb
     ref:shop:num: Key:ref:shop:num
+    ref:sitp: Key:ref:sitp
     ref:taskey: Key:ref:taskey
     ref:vatin: Key:ref:vatin
     ref:vorwahl: Key:ref:vorwahl
     ref:wawa: Key:ref:wawa
+    ref:whc: Key:ref:whc
+    ref:zsj: Key:ref:zsj
     ref_name: Key:ref name
     reference: Key:reference
     reference_point: Key:reference point
     reg_name: Key:reg name
     reg_ref: Key:reg ref
+    regelbau: Key:regelbau
     religion: Key:religion
+    removed: Key:removed
+    'removed:': 'Key:removed:'
+    rental: Key:rental
     repair: Key:repair
     repeat_on: Key:repeat on
     reservation: Key:reservation
     residential: Key:residential
     resource: Key:resource
+    restriction:conditional: Key:restriction:conditional
     retreat: Key:retreat
     retroreflecting: Key:retroreflecting
+    rfr: Key:rfr
     right: Key:right
+    right/left/both: Key:right/left/both
+    right:country: Key:right:country
     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:direction: Key:roof:direction
     roof:material: Key:roof:material
     room: Key:room
     rooms: Key:rooms
+    rotor:diameter: Key:rotor:diameter
     roundtrip: Key:roundtrip
     route: Key:route
     route_master: Key:route master
@@ -2149,10 +5175,15 @@ en:
     route_ref:TECN: Key:route ref:TECN
     route_ref:TECX: Key:route ref:TECX
     royal_cypher: Key:royal cypher
+    royal_cypher:wikidata: Key:royal cypher:wikidata
     rtc_rate: Key:rtc rate
+    rtsa_scale: Key:rtsa scale
     ruined: Key:ruined
+    'ruined:': 'Key:ruined:'
     ruins: Key:ruins
+    'ruins:': 'Key:ruins:'
     rungs: Key:rungs
+    rv: Key:rv
     rwn_ref: Key:rwn ref
     sac_scale: Key:sac scale
     safety_rope: Key:safety rope
@@ -2160,9 +5191,6 @@ en:
     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
@@ -2195,10 +5223,14 @@ en:
     seamark:fog_signal:range: Key:seamark:fog signal:range
     seamark:fog_signal:sequence: Key:seamark:fog signal:sequence
     seamark:fog_signal:status: Key:seamark:fog signal:status
+    seamark:gate:category: Key:seamark:gate:category
+    seamark:gate:clearance_height: Key:seamark:gate:clearance height
+    seamark:gate:clearance_width: Key:seamark:gate:clearance width
     seamark:landmark:category: Key:seamark:landmark:category
     seamark:landmark:conspicuity: Key:seamark:landmark:conspicuity
     seamark:landmark:function: Key:seamark:landmark:function
     seamark:light:exhibition: Key:seamark:light:exhibition
+    seamark:light:range: Key:seamark:light:range
     seamark:light:status: Key:seamark:light:status
     seamark:light:visibility: Key:seamark:light:visibility
     seamark:light_vessel:colour: Key:seamark:light vessel:colour
@@ -2230,27 +5262,42 @@ en:
     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
+    seats: Key:seats
     second_hand: Key:second hand
     segregated: Key:segregated
     self_service: Key:self service
+    sells:tobacco: Key:sells:tobacco
     service: Key:service
+    service:bicycle:diy: Key:service:bicycle:diy
+    service:bicycle:rental: Key:service:bicycle:rental
+    service:bicycle:repair: Key:service:bicycle:repair
+    service:bicycle:retail: Key:service:bicycle:retail
+    service:bicycle:second_hand: Key:service:bicycle:second hand
     service_times: Key:service times
     shade: Key:shade
+    share_taxi: Key:share taxi
     shelter: Key:shelter
     shelter_type: Key:shelter type
     ship: Key:ship
+    shooting: Key:shooting
     shop: Key:shop
     short_name: Key:short name
+    short_name:ar: Key:short name:ar
+    shoulder: Key:shoulder
+    shower: Key:shower
     side_road: Key:side road
+    sides: Key:sides
     sidewalk: Key:sidewalk
+    sidewalk_orientation: Key:sidewalk orientation
     sign: Key:sign
     site_type: Key:site type
+    size: Key:size
     ski: Key:ski
     ski_tour_difficulty: Key:ski tour difficulty
+    sl_realtime: Key:sl realtime
     sl_stop_id: Key:sl stop id
     smokefree: Key:smokefree
     smoking: Key:smoking
@@ -2258,24 +5305,35 @@ en:
     smoking_hours: Key:smoking hours
     smoothness: Key:smoothness
     snowmobile: Key:snowmobile
+    snowmobile:sales: Key:snowmobile:sales
     snowplowing: Key:snowplowing
     snowplowing:category: Key:snowplowing:category
+    snowplowing:operator: Key:snowplowing:operator
     social_facility: Key:social facility
     social_facility:for: Key:social facility:for
+    socket: Key:socket
     sorting_name: Key:sorting name
     source: Key:source
+    source:ProRail: Key:source:ProRail
     source:addr: Key:source:addr
     source:building: Key:source:building
     source:date: Key:source:date
     source:en: Key:source:en
     source:geometry: Key:source:geometry
+    source:geometry:date: Key:source:geometry:date
+    source:ja: Key:source:ja
     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
+    source_ref: Key:source ref
     species: Key:species
+    species:FR: Key:species:FR
+    species:cs: Key:species:cs
+    species:de: Key:species:de
+    species:en: Key:species:en
     speech_input: Key:speech input
     speech_input:lg: Key:speech input:lg
     speech_output: Key:speech output
@@ -2284,18 +5342,31 @@ en:
     speech_output:pl: Key:speech output:pl
     speisebezirk: Key:speisebezirk
     sport: Key:sport
+    sqkm: Key:sqkm
+    stairs: Key:stairs
+    stamps: Key:stamps
     stars: Key:stars
     start_date: Key:start date
     station: Key:station
     status: Key:status
+    step:contrast: Key:step:contrast
     step_count: Key:step count
+    steps: Key:steps
+    stile: Key:stile
+    stone_type: Key:stone type
     stop: Key:stop
     storage_area: Key:storage area
     stranded: Key:stranded
     stream: Key:stream
+    stroller: Key:stroller
     sub_sea: Key:sub sea
-    subway: Key:subway
+    subject: Key:subject
+    subsea: Key:subsea
+    substance: Key:substance
+    substation: Key:substation
+    summit:register: Key:summit:register
     supervised: Key:supervised
+    support: Key:support
     support:notinsel: Key:support:notinsel
     surface: Key:surface
     surveillance: Key:surveillance
@@ -2303,26 +5374,53 @@ en:
     surveillance:zone: Key:surveillance:zone
     survey:date: Key:survey:date
     sustrans_ref: Key:sustrans ref
+    swimming_pool: Key:swimming pool
+    switch: Key:switch
     symbol: Key:symbol
     tactile_map: Key:tactile map
     tactile_paving: Key:tactile paving
+    tactile_writing: Key:tactile writing
+    tactile_writing:braille:de: Key:tactile writing:braille:de
+    tactile_writing:braille:lg: Key:tactile writing:braille:lg
+    tactile_writing:computer_braille:lg: Key:tactile writing:computer braille:lg
+    tactile_writing:embossed_printed_letters: Key:tactile writing:embossed printed
+      letters
+    tactile_writing:embossed_printed_letters:de: Key:tactile writing:embossed printed
+      letters:de
+    tactile_writing:fakoo: Key:tactile writing:fakoo
+    tactile_writing:moon: Key:tactile writing:moon
     takeaway: Key:takeaway
     tank: Key:tank
+    tank_trap: Key:tank trap
+    target: Key:target
     taxi: Key:taxi
     taxon: Key:taxon
+    technical_type: Key:technical type
     technology: Key:technology
     telecom: Key:telecom
+    temporary: Key:temporary
     tenant: Key:tenant
     tents: Key:tents
+    teryt: Key:teryt
+    teryt:simc: Key:teryt:simc
+    teryt:terc: Key:teryt:terc
+    theme: Key:theme
+    tickets:public_transport: Key:tickets:public transport
+    tickets:public_transport_subscription: Key:tickets:public transport subscription
+    ticks: Key:ticks
     tidal: Key:tidal
     tiger: Key:tiger
+    tiger:PLACENS: Key:tiger:PLACENS
     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
+    to: Key:to
+    tobacco: Key:tobacco
     todo: Key:todo
+    toilets: Key:toilets
     toilets:type: Key:toilets:type
     toilets:wheelchair: Key:toilets:wheelchair
     toll: Key:toll
@@ -2334,6 +5432,7 @@ en:
     tower:type: Key:tower:type
     tracks: Key:tracks
     tracktype: Key:tracktype
+    traffic: Key:traffic
     traffic:hourly: Key:traffic:hourly
     traffic_calming: Key:traffic calming
     traffic_sign: Key:traffic sign
@@ -2343,41 +5442,63 @@ en:
     traffic_signals:floor_vibration: Key:traffic signals:floor vibration
     traffic_signals:minimap: Key:traffic signals:minimap
     traffic_signals:sound: Key:traffic signals:sound
+    traffic_signals:turn: Key:traffic signals:turn
+    traffic_signals:turn:backward: Key:traffic signals:turn:backward
+    traffic_signals:turn:forward: Key:traffic signals:turn:forward
     traffic_signals:vibration: Key:traffic signals:vibration
     trail_visibility: Key:trail visibility
+    trailer: Key:trailer
     train: Key:train
     tram: Key:tram
     trees: Key:trees
     trolley_wire: Key:trolley wire
     trolleybus: Key:trolleybus
+    tsunami: Key:tsunami
+    tsunami:damage: Key:tsunami:damage
     tunnel: Key:tunnel
     turn: Key:turn
+    turn:backward: Key:turn:backward
+    turn:both_ways: Key:turn:both ways
+    turn:forward: Key:turn:forward
     turn:lanes: Key:turn:lanes
     turn:lanes:backward: Key:turn:lanes:backward
+    turn:lanes:both_ways: Key:turn:lanes:both ways
     turn:lanes:forward: Key:turn:lanes:forward
     turning_radius: Key:turning radius
     twitter: Key:twitter
     type: Key:type
     uic_name: Key:uic name
     uic_ref: Key:uic ref
+    uir_adr:ADRESA_KOD: Key:uir adr:ADRESA KOD
     unisex: Key:unisex
+    unit: Key:unit
     unnamed: Key:unnamed
     unsigned: Key:unsigned
     unsigned_ref: Key:unsigned ref
     url: Key:url
     url:restrictions: Key:url:restrictions
     usage: Key:usage
+    utahagrc:parcelid: Key:utahagrc:parcelid
     validate:no_name: Key:validate:no name
     validate:no_ref: Key:validate:no ref
     vehicle: Key:vehicle
+    vehicle:conditional: Key:vehicle:conditional
+    verge: Key:verge
+    viewpoint: Key:viewpoint
+    vine_row_orientation: Key:vine row orientation
+    visibility: Key:visibility
     voltage: Key:voltage
+    wall:material: Key:wall:material
     waste: Key:waste
     waste_basket: Key:waste basket
     water: Key:water
+    water_point: Key:water point
     waterway: Key:waterway
+    way_area: Key:way area
     website: Key:website
     wetland: Key:wetland
     wheelchair: Key:wheelchair
+    whitewater:rapid_grade: Key:whitewater:rapid grade
     wholesale: Key:wholesale
     width: Key:width
     wifi: Key:wifi
@@ -2385,14 +5506,17 @@ en:
     wikidata: Key:wikidata
     wikimedia_commons: Key:wikimedia commons
     wikipedia: Key:wikipedia
+    wikipedia:ar: Key:wikipedia:ar
     wikipedia:en: Key:wikipedia:en
     winter_road: Key:winter road
     wires: Key:wires
     woeid: Key:woeid
     wood: Key:wood
+    woody_species_100m: Key:woody species 100m
     workrules: Key:workrules
     www.prezzibenzina.it: Key:www.prezzibenzina.it
     xmas:feature: Key:xmas:feature
+    year_of_construction: Key:year of construction
     yh:LINE_NAME: Key:yh:LINE NAME
     yh:LINE_NUM: Key:yh:LINE NUM
     yh:STRUCTURE: Key:yh:STRUCTURE
@@ -2400,18 +5524,24 @@ en:
     yh:TYPE: Key:yh:TYPE
     yh:WIDTH_RANK: Key:yh:WIDTH RANK
     zone: Key:zone
+    zone:De_Lijn: Key:zone:De Lijn
+    zone:TEC: Key:zone:TEC
     zone:maxspeed: Key:zone:maxspeed
     zone:traffic: Key:zone:traffic
     zoo: Key:zoo
   tag:
-    4wd_only=yes: Tag:4wd only=yes
     FIXME=Position_estimated: Tag:FIXME=Position estimated
+    abandoned:amenity=prison: Tag:abandoned:amenity=prison
+    abandoned:amenity=prison_camp: Tag:abandoned:amenity=prison camp
+    abandoned=yes: Tag:abandoned=yes
+    access=customers: Tag:access=customers
     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=use_sidepath: Tag:access=use sidepath
     admin_level=1: Tag:admin level=1
     admin_level=10: Tag:admin level=10
     admin_level=11: Tag:admin level=11
@@ -2423,9 +5553,20 @@ en:
     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
     advertising=billboard: Tag:advertising=billboard
+    advertising=board: Tag:advertising=board
     advertising=column: Tag:advertising=column
+    advertising=flag: Tag:advertising=flag
+    advertising=poster_box: Tag:advertising=poster box
+    advertising=screen: Tag:advertising=screen
+    advertising=sculpture: Tag:advertising=sculpture
+    advertising=sign: Tag:advertising=sign
+    advertising=tarp: Tag:advertising=tarp
+    advertising=totem: Tag:advertising=totem
+    advertising=wall_painting: Tag:advertising=wall painting
+    aerialway:drag_lift=j-bar: Tag:aerialway:drag lift=j-bar
+    aerialway:drag_lift=platter: Tag:aerialway:drag lift=platter
+    aerialway:drag_lift=t-bar: Tag:aerialway:drag lift=t-bar
     aerialway=cable_car: Tag:aerialway=cable car
     aerialway=canopy: Tag:aerialway=canopy
     aerialway=chair_lift: Tag:aerialway=chair lift
@@ -2443,14 +5584,21 @@ en:
     aerialway=zip_line: Tag:aerialway=zip line
     aeroway=aerodrome: Tag:aeroway=aerodrome
     aeroway=airport: Tag:aeroway=airport
+    aeroway=airstrip: Tag:aeroway=airstrip
     aeroway=apron: Tag:aeroway=apron
+    aeroway=fuel: Tag:aeroway=fuel
     aeroway=gate: Tag:aeroway=gate
     aeroway=hangar: Tag:aeroway=hangar
     aeroway=helipad: Tag:aeroway=helipad
+    aeroway=heliport: Tag:aeroway=heliport
     aeroway=holding_position: Tag:aeroway=holding position
+    aeroway=landingpad: Tag:aeroway=landingpad
+    aeroway=launchpad: Tag:aeroway=launchpad
     aeroway=navigationaid: Tag:aeroway=navigationaid
     aeroway=parking_position: Tag:aeroway=parking position
     aeroway=runway: Tag:aeroway=runway
+    aeroway=spaceport: Tag:aeroway=spaceport
+    aeroway=taxilane: Tag:aeroway=taxilane
     aeroway=taxiway: Tag:aeroway=taxiway
     aeroway=terminal: Tag:aeroway=terminal
     aeroway=windsock: Tag:aeroway=windsock
@@ -2466,10 +5614,13 @@ en:
     amenity=animal_breeding: Tag:amenity=animal breeding
     amenity=animal_shelter: Tag:amenity=animal shelter
     amenity=architect_office: Tag:amenity=architect office
+    amenity=archive: Tag:amenity=archive
     amenity=arts_centre: Tag:amenity=arts centre
+    amenity=artwork: Tag:amenity=artwork
     amenity=atm: Tag:amenity=atm
     amenity=audiologist: Tag:amenity=audiologist
     amenity=baby_hatch: Tag:amenity=baby hatch
+    amenity=baking_oven: Tag:amenity=baking oven
     amenity=bank: Tag:amenity=bank
     amenity=bar: Tag:amenity=bar
     amenity=bbq: Tag:amenity=bbq
@@ -2480,6 +5631,7 @@ en:
     amenity=bicycle_trailer_sharing: Tag:amenity=bicycle trailer sharing
     amenity=biergarten: Tag:amenity=biergarten
     amenity=bikeshed: Tag:amenity=bikeshed
+    amenity=boat_rental: Tag:amenity=boat rental
     amenity=boat_sharing: Tag:amenity=boat sharing
     amenity=boat_storage: Tag:amenity=boat storage
     amenity=brothel: Tag:amenity=brothel
@@ -2489,7 +5641,9 @@ en:
     amenity=bus_stop: Tag:amenity=bus stop
     amenity=cafe: Tag:amenity=cafe
     amenity=canoe_hire: Tag:amenity=canoe hire
+    amenity=car_pooling: Tag:amenity=car pooling
     amenity=car_rental: Tag:amenity=car rental
+    amenity=car_repair: Tag:amenity=car repair
     amenity=car_sharing: Tag:amenity=car sharing
     amenity=car_wash: Tag:amenity=car wash
     amenity=carwash: Tag:amenity=carwash
@@ -2497,6 +5651,7 @@ en:
     amenity=charging_station: Tag:amenity=charging station
     amenity=childcare: Tag:amenity=childcare
     amenity=cinema: Tag:amenity=cinema
+    amenity=citymap_post: Tag:amenity=citymap post
     amenity=clinic: Tag:amenity=clinic
     amenity=clock: Tag:amenity=clock
     amenity=club: Tag:amenity=club
@@ -2506,6 +5661,7 @@ en:
     amenity=community_center: Tag:amenity=community center
     amenity=community_centre: Tag:amenity=community centre
     amenity=compressed_air: Tag:amenity=compressed air
+    amenity=concert_hall: Tag:amenity=concert hall
     amenity=conference_centre: Tag:amenity=conference centre
     amenity=courthouse: Tag:amenity=courthouse
     amenity=coworking_space: Tag:amenity=coworking space
@@ -2517,6 +5673,7 @@ en:
     amenity=dancing_school: Tag:amenity=dancing school
     amenity=dead_pub: Tag:amenity=dead pub
     amenity=dentist: Tag:amenity=dentist
+    amenity=disused: Tag:amenity=disused
     amenity=dive_centre: Tag:amenity=dive centre
     amenity=doctor: Tag:amenity=doctor
     amenity=doctors: Tag:amenity=doctors
@@ -2525,11 +5682,14 @@ en:
     amenity=dojo: Tag:amenity=dojo
     amenity=drinking_water: Tag:amenity=drinking water
     amenity=driving_school: Tag:amenity=driving school
+    amenity=dryer: Tag:amenity=dryer
+    amenity=education: Tag:amenity=education
     amenity=embassy: Tag:amenity=embassy
     amenity=emergency_phone: Tag:amenity=emergency phone
     amenity=emergency_service: Tag:amenity=emergency service
     amenity=ev_charging: Tag:amenity=ev charging
     amenity=events_venue: Tag:amenity=events venue
+    amenity=exercise_point: Tag:amenity=exercise point
     amenity=exhibition_centre: Tag:amenity=exhibition centre
     amenity=fast_food: Tag:amenity=fast food
     amenity=feeding_place: Tag:amenity=feeding place
@@ -2544,55 +5704,70 @@ en:
     amenity=fitness_station: Tag:amenity=fitness station
     amenity=food_court: Tag:amenity=food court
     amenity=fountain: Tag:amenity=fountain
+    amenity=fridge: Tag:amenity=fridge
     amenity=fuel: Tag:amenity=fuel
     amenity=gambling: Tag:amenity=gambling
     amenity=game_feeding: Tag:amenity=game feeding
+    amenity=garages: Tag:amenity=garages
     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=hookah_lounge: Tag:amenity=hookah lounge
     amenity=hospice: Tag:amenity=hospice
     amenity=hospital: Tag:amenity=hospital
+    amenity=hotel: Tag:amenity=hotel
     amenity=hunting_stand: Tag:amenity=hunting stand
     amenity=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=kiosk: Tag:amenity=kiosk
     amenity=kitchen: Tag:amenity=kitchen
     amenity=kneipp_water_cure: Tag:amenity=kneipp water cure
+    amenity=language_school: Tag:amenity=language school
     amenity=lavoir: Tag:amenity=lavoir
+    amenity=letter_box: Tag:amenity=letter box
     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=marae: Tag:amenity=marae
     amenity=marketplace: Tag:amenity=marketplace
+    amenity=microwave: Tag:amenity=microwave
     amenity=milk_dispenser: Tag:amenity=milk dispenser
     amenity=mobile_library: Tag:amenity=mobile library
     amenity=monastery: Tag:amenity=monastery
+    amenity=money_transfer: Tag:amenity=money transfer
+    amenity=mortuary: Tag:amenity=mortuary
     amenity=motorcycle_parking: Tag:amenity=motorcycle parking
+    amenity=motorcycle_rental: Tag:amenity=motorcycle rental
+    amenity=music_school: Tag:amenity=music school
     amenity=music_venue: Tag:amenity=music venue
-    amenity=nameplate: Tag:amenity=nameplate
     amenity=nightclub: Tag:amenity=nightclub
     amenity=nursery: Tag:amenity=nursery
     amenity=nursing_home: Tag:amenity=nursing home
-    amenity=office: Tag:amenity=office
+    amenity=park: Tag:amenity=park
     amenity=parking: Tag:amenity=parking
     amenity=parking_entrance: Tag:amenity=parking entrance
     amenity=parking_space: Tag:amenity=parking space
     amenity=parkink: Tag:amenity=parkink
+    amenity=payment_centre: Tag:amenity=payment centre
     amenity=pharmacy: Tag:amenity=pharmacy
     amenity=photo_booth: Tag:amenity=photo booth
     amenity=place_of_worship: Tag:amenity=place of worship
     amenity=planetarium: Tag:amenity=planetarium
     amenity=police: Tag:amenity=police
+    amenity=polling_station: Tag:amenity=polling station
     amenity=post_box: Tag:amenity=post box
     amenity=post_office: Tag:amenity=post office
+    amenity=preschool: Tag:amenity=preschool
     amenity=printer: Tag:amenity=printer
     amenity=prison: Tag:amenity=prison
+    amenity=prison_camp: Tag:amenity=prison camp
+    amenity=proposed: Tag:amenity=proposed
     amenity=pub: Tag:amenity=pub
     amenity=public_bath: Tag:amenity=public bath
     amenity=public_bookcase: Tag:amenity=public bookcase
@@ -2613,23 +5788,29 @@ en:
     amenity=sauna: Tag:amenity=sauna
     amenity=sceptic_tank: Tag:amenity=sceptic tank
     amenity=school: Tag:amenity=school
-    amenity=scout_hut: Tag:amenity=scout hut
-    amenity=security_booth: Tag:amenity=security booth
+    amenity=seat: Tag:amenity=seat
     amenity=septic_tank: Tag:amenity=septic tank
     amenity=shelter: Tag:amenity=shelter
+    amenity=shop: Tag:amenity=shop
     amenity=shower: Tag:amenity=shower
     amenity=ski_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=spa: Tag:amenity=spa
+    amenity=stables: Tag:amenity=stables
+    amenity=stool: Tag:amenity=stool
+    amenity=street_lamp: Tag:amenity=street lamp
+    amenity=street_light: Tag:amenity=street light
     amenity=stripclub: Tag:amenity=stripclub
     amenity=studio: Tag:amenity=studio
     amenity=swimming_pool: Tag:amenity=swimming pool
     amenity=swingerclub: Tag:amenity=swingerclub
+    amenity=table: Tag:amenity=table
     amenity=taxi: Tag:amenity=taxi
     amenity=taxi_point: Tag:amenity=taxi point
     amenity=telephone: Tag:amenity=telephone
+    amenity=television: Tag:amenity=television
     amenity=theatre: Tag:amenity=theatre
     amenity=ticket_booth: Tag:amenity=ticket booth
     amenity=ticket_validator: Tag:amenity=ticket validator
@@ -2639,10 +5820,12 @@ en:
     amenity=university: Tag:amenity=university
     amenity=vacuum_cleaner: Tag:amenity=vacuum cleaner
     amenity=vehicle_inspection: Tag:amenity=vehicle inspection
+    amenity=vehicle_ramp: Tag:amenity=vehicle ramp
     amenity=vending_machine: Tag:amenity=vending machine
     amenity=veterinary: Tag:amenity=veterinary
+    amenity=veterinary_pharmacy: Tag:amenity=veterinary pharmacy
     amenity=vivarium: Tag:amenity=vivarium
-    amenity=wash_center: Tag:amenity=wash center
+    amenity=washing_machine: Tag:amenity=washing machine
     amenity=waste_basket: Tag:amenity=waste basket
     amenity=waste_disposal: Tag:amenity=waste disposal
     amenity=waste_transfer_station: Tag:amenity=waste transfer station
@@ -2654,63 +5837,97 @@ en:
     amenity=yacht_club: Tag:amenity=yacht club
     amenity=youth_centre: Tag:amenity=youth centre
     aminety=sceptic_tank: Tag:aminety=sceptic tank
+    animal=school: Tag:animal=school
+    animated=trivision_blades: Tag:animated=trivision blades
+    animated=winding_posters: Tag:animated=winding posters
+    artwork_type=sculpture: Tag:artwork type=sculpture
+    artwork_type=statue: Tag:artwork type=statue
     atm=no: Tag:atm=no
     atm=yes: Tag:atm=yes
     attraction=animal: Tag:attraction=animal
     attraction=maze: Tag:attraction=maze
+    attraction=train: Tag:attraction=train
     baby_hatch=yes: Tag:baby hatch=yes
+    bakehouse: Tag:bakehouse
+    baking_oven: Tag:baking oven
     barrier=block: Tag:barrier=block
     barrier=bollard: Tag:barrier=bollard
     barrier=border_control: Tag:barrier=border control
+    barrier=bump_gate: Tag:barrier=bump gate
     barrier=bus_trap: Tag:barrier=bus trap
+    barrier=cable_barrier: Tag:barrier=cable barrier
     barrier=cattle_grid: Tag:barrier=cattle grid
     barrier=chain: Tag:barrier=chain
+    barrier=chech_hedgehog: Tag:barrier=chech hedgehog
     barrier=chicane: Tag:barrier=chicane
     barrier=city_wall: Tag:barrier=city wall
     barrier=cycle_barrier: Tag:barrier=cycle barrier
+    barrier=czech_hedgehog: Tag:barrier=czech hedgehog
+    barrier=debris: Tag:barrier=debris
     barrier=ditch: Tag:barrier=ditch
     barrier=entrance: Tag:barrier=entrance
     barrier=fence: Tag:barrier=fence
+    barrier=full-height_turnstile: Tag:barrier=full-height turnstile
     barrier=gate: Tag:barrier=gate
     barrier=guard_rail: Tag:barrier=guard rail
+    barrier=hampshire_gate: Tag:barrier=hampshire gate
     barrier=handrail: Tag:barrier=handrail
     barrier=hedge: Tag:barrier=hedge
+    barrier=hedge_bank: Tag:barrier=hedge bank
+    barrier=height_restrictor: Tag:barrier=height restrictor
+    barrier=horse_jump: Tag:barrier=horse jump
     barrier=horse_stile: Tag:barrier=horse stile
+    barrier=jersey_barrier: Tag:barrier=jersey barrier
     barrier=kent_carriage_gap: Tag:barrier=kent carriage gap
     barrier=kent_carriage_gate: Tag:barrier=kent carriage gate
     barrier=kerb: Tag:barrier=kerb
     barrier=kissing_gate: Tag:barrier=kissing gate
     barrier=lift_gate: Tag:barrier=lift gate
+    barrier=log: Tag:barrier=log
     barrier=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=rope: Tag:barrier=rope
     barrier=sally_port: Tag:barrier=sally port
+    barrier=select_acces: Tag:barrier=select acces
+    barrier=spikes: Tag:barrier=spikes
     barrier=stile: Tag:barrier=stile
     barrier=sump_buster: Tag:barrier=sump buster
     barrier=swing_gate: Tag:barrier=swing gate
+    barrier=tank_trap: Tag:barrier=tank trap
     barrier=toll_booth: Tag:barrier=toll booth
     barrier=turnstile: Tag:barrier=turnstile
     barrier=wall: Tag:barrier=wall
+    baseball=softball: Tag:baseball=softball
+    bay=fjord: Tag:bay=fjord
     bicycle=designated: Tag:bicycle=designated
     bicycle=official: Tag:bicycle=official
     bicycle=use_sidepath: Tag:bicycle=use sidepath
+    biosphärenwirt=yes: Tag:biosphärenwirt=yes
     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
     boundary=administrative: Tag:boundary=administrative
     boundary=civil: Tag:boundary=civil
+    boundary=economic: Tag:boundary=economic
+    boundary=forest_compartment: Tag:boundary=forest compartment
     boundary=historic: Tag:boundary=historic
     boundary=local_authority: Tag:boundary=local authority
     boundary=maritime: Tag:boundary=maritime
+    boundary=marker: Tag:boundary=marker
+    boundary=military_district: Tag:boundary=military district
     boundary=national: Tag:boundary=national
     boundary=national_park: Tag:boundary=national park
     boundary=political: Tag:boundary=political
     boundary=postal_code: Tag:boundary=postal code
     boundary=protected_area: Tag:boundary=protected area
     boundary=regional_park: Tag:boundary=regional park
+    boundary=timezone: Tag:boundary=timezone
     boundary=vice_county: Tag:boundary=vice county
+    boundary=water_protection_area: Tag:boundary=water protection area
+    brand=KTM: Tag:brand=KTM
+    brand=Zero: Tag:brand=Zero
     bridge:movable=bascule: Tag:bridge:movable=bascule
     bridge:movable=drawbridge: Tag:bridge:movable=drawbridge
     bridge:movable=lift: Tag:bridge:movable=lift
@@ -2726,30 +5943,35 @@ en:
     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=boardwalk: Tag:bridge=boardwalk
     bridge=cantilever: Tag:bridge=cantilever
     bridge=covered: Tag:bridge=covered
     bridge=drawbridge: Tag:bridge=drawbridge
     bridge=movable: Tag:bridge=movable
-    bridge=pontoon: Tag:bridge=pontoon
     bridge=simple_brunnel: Tag:bridge=simple brunnel
-    bridge=swing: Tag:bridge=swing
     bridge=trestle: Tag:bridge=trestle
     bridge=viaduct: Tag:bridge=viaduct
     building:use=stable: Tag:building:use=stable
+    building=allotment_house: Tag:building=allotment house
     building=apartments: Tag:building=apartments
+    building=bakehouse: Tag:building=bakehouse
     building=barn: Tag:building=barn
+    building=boathouse: Tag:building=boathouse
     building=brewery: Tag:building=brewery
     building=bridge: Tag:building=bridge
+    building=bungalow: Tag:building=bungalow
     building=bunker: Tag:building=bunker
     building=cabin: Tag:building=cabin
+    building=carport: Tag:building=carport
     building=cathedral: Tag:building=cathedral
     building=central_office: Tag:building=central office
     building=chapel: Tag:building=chapel
     building=church: Tag:building=church
     building=civic: Tag:building=civic
+    building=college: Tag:building=college
     building=commercial: Tag:building=commercial
+    building=condominium: Tag:building=condominium
+    building=conservatory: Tag:building=conservatory
     building=construction: Tag:building=construction
     building=container: Tag:building=container
     building=cowshed: Tag:building=cowshed
@@ -2759,8 +5981,10 @@ en:
     building=exit: Tag:building=exit
     building=farm: Tag:building=farm
     building=farm_auxiliary: Tag:building=farm auxiliary
+    building=font: Tag:building=font
     building=garage: Tag:building=garage
     building=garages: Tag:building=garages
+    building=grandstand: Tag:building=grandstand
     building=greenhouse: Tag:building=greenhouse
     building=ground_station: Tag:building=ground station
     building=hangar: Tag:building=hangar
@@ -2771,23 +5995,34 @@ en:
     building=hut: Tag:building=hut
     building=industrial: Tag:building=industrial
     building=kindergarten: Tag:building=kindergarten
+    building=kiosk: Tag:building=kiosk
     building=manufacture: Tag:building=manufacture
+    building=marquee: Tag:building=marquee
     building=mosque: Tag:building=mosque
     building=office: Tag:building=office
+    building=parking: Tag:building=parking
+    building=pavilion: Tag:building=pavilion
     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=riding_hall: Tag:building=riding hall
     building=roof: Tag:building=roof
     building=ruins: Tag:building=ruins
     building=school: Tag:building=school
+    building=semi: Tag:building=semi
+    building=service: Tag:building=service
     building=shed: Tag:building=shed
     building=shrine: Tag:building=shrine
+    building=slurry_tank: Tag:building=slurry tank
     building=stable: Tag:building=stable
+    building=stadium: Tag:building=stadium
     building=static_caravan: Tag:building=static caravan
+    building=stilt_house: Tag:building=stilt house
     building=sty: Tag:building=sty
     building=supermarket: Tag:building=supermarket
     building=synagogue: Tag:building=synagogue
+    building=tech_cab: Tag:building=tech cab
     building=temple: Tag:building=temple
     building=terrace: Tag:building=terrace
     building=train_station: Tag:building=train station
@@ -2795,6 +6030,8 @@ en:
     building=transportation: Tag:building=transportation
     building=university: Tag:building=university
     building=warehouse: Tag:building=warehouse
+    building=water_tower: Tag:building=water tower
+    building=yes: Tag:building=yes
     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
@@ -2803,7 +6040,16 @@ en:
     busway=lane: Tag:busway=lane
     busway=opposite_lane: Tag:busway=opposite lane
     cafe=time-cafe: Tag:cafe=time-cafe
+    castle_type=castrum: Tag:castle type=castrum
+    castle_type=defensive: Tag:castle type=defensive
+    castle_type=fortress: Tag:castle type=fortress
+    castle_type=kremlin: Tag:castle type=kremlin
+    castle_type=manor: Tag:castle type=manor
+    castle_type=palace: Tag:castle type=palace
+    castle_type=shiro: Tag:castle type=shiro
+    castle_type=stately: Tag:castle type=stately
     cemetery=grave: Tag:cemetery=grave
+    clothes=motorcycle: Tag:clothes=motorcycle
     clothes=sports: Tag:clothes=sports
     clothes=underwear: Tag:clothes=underwear
     club=automobile: Tag:club=automobile
@@ -2812,13 +6058,17 @@ en:
     club=sport: Tag:club=sport
     coastline:survey_quality=complete: Tag:coastline:survey quality=complete
     coastline:survey_quality=inadequate: Tag:coastline:survey quality=inadequate
+    communication=line: Tag:communication=line
+    construction=yes: Tag:construction=yes
     craft=agricultural_engines: Tag:craft=agricultural engines
+    craft=bakery: Tag:craft=bakery
     craft=basket_maker: Tag:craft=basket maker
     craft=beekeeper: Tag:craft=beekeeper
     craft=blacksmith: Tag:craft=blacksmith
     craft=boatbuilder: Tag:craft=boatbuilder
     craft=bookbinder: Tag:craft=bookbinder
     craft=brewery: Tag:craft=brewery
+    craft=builder: Tag:craft=builder
     craft=cabinet_maker: Tag:craft=cabinet maker
     craft=car_repair: Tag:craft=car repair
     craft=carpenter: Tag:craft=carpenter
@@ -2827,13 +6077,17 @@ en:
     craft=chimney_sweeper: Tag:craft=chimney sweeper
     craft=clockmaker: Tag:craft=clockmaker
     craft=confectionery: Tag:craft=confectionery
+    craft=cooper: Tag:craft=cooper
     craft=distillery: Tag:craft=distillery
     craft=dressmaker: Tag:craft=dressmaker
     craft=electrican: Tag:craft=electrican
     craft=electrician: Tag:craft=electrician
+    craft=electronics_repair: Tag:craft=electronics repair
+    craft=engraver: Tag:craft=engraver
     craft=floorer: Tag:craft=floorer
     craft=gardener: Tag:craft=gardener
     craft=glaziery: Tag:craft=glaziery
+    craft=grinding_mill: Tag:craft=grinding mill
     craft=handicraft: Tag:craft=handicraft
     craft=hvac: Tag:craft=hvac
     craft=information_electronics: Tag:craft=information electronics
@@ -2843,6 +6097,7 @@ en:
     craft=key_cutter: Tag:craft=key cutter
     craft=locksmith: Tag:craft=locksmith
     craft=metal_construction: Tag:craft=metal construction
+    craft=oil_mill: Tag:craft=oil mill
     craft=optician: Tag:craft=optician
     craft=organ_builder: Tag:craft=organ builder
     craft=painter: Tag:craft=painter
@@ -2850,6 +6105,7 @@ en:
     craft=parquet_layer: Tag:craft=parquet layer
     craft=photographer: Tag:craft=photographer
     craft=photographic_laboratory: Tag:craft=photographic laboratory
+    craft=piano_tuner: Tag:craft=piano tuner
     craft=plasterer: Tag:craft=plasterer
     craft=plumber: Tag:craft=plumber
     craft=pottery: Tag:craft=pottery
@@ -2860,6 +6116,7 @@ en:
     craft=sawmill: Tag:craft=sawmill
     craft=scaffolder: Tag:craft=scaffolder
     craft=sculptor: Tag:craft=sculptor
+    craft=sewing: Tag:craft=sewing
     craft=shoemaker: Tag:craft=shoemaker
     craft=stand_builder: Tag:craft=stand builder
     craft=stonemason: Tag:craft=stonemason
@@ -2868,6 +6125,8 @@ en:
     craft=tailor: Tag:craft=tailor
     craft=tiler: Tag:craft=tiler
     craft=tinsmith: Tag:craft=tinsmith
+    craft=toolmaker: Tag:craft=toolmaker
+    craft=turner: Tag:craft=turner
     craft=upholsterer: Tag:craft=upholsterer
     craft=watchmaker: Tag:craft=watchmaker
     craft=window_construction: Tag:craft=window construction
@@ -2893,10 +6152,12 @@ en:
     crop=sugar: Tag:crop=sugar
     crop=tea: Tag:crop=tea
     crop=wheat: Tag:crop=wheat
+    crossing=unknown: Tag:crossing=unknown
     cuisine=brazilian: Tag:cuisine=brazilian
     cuisine=brunch: Tag:cuisine=brunch
     cuisine=coffee_shop: Tag:cuisine=coffee shop
     cuisine=dessert: Tag:cuisine=dessert
+    cuisine=tea_shop: Tag:cuisine=tea shop
     cycle_network=US:CA:SF: Tag:cycle network=US:CA:SF
     cycle_network=US:GA: Tag:cycle network=US:GA
     cycle_network=US:NC: Tag:cycle network=US:NC
@@ -2905,17 +6166,40 @@ en:
     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:left=lane: Tag:cycleway:left=lane
+    cycleway:left=opposite_track: Tag:cycleway:left=opposite track
+    cycleway:left=track: Tag:cycleway:left=track
+    cycleway:right=lane: Tag:cycleway:right=lane
+    cycleway:right=opposite_track: Tag:cycleway:right=opposite track
+    cycleway:right=track: Tag:cycleway:right=track
     cycleway=asl: Tag:cycleway=asl
     cycleway=bike_box: Tag:cycleway=bike box
     cycleway=crossing: Tag:cycleway=crossing
+    cycleway=lane: Tag:cycleway=lane
+    cycleway=opposite: Tag:cycleway=opposite
+    cycleway=opposite_lane: Tag:cycleway=opposite lane
     cycleway=opposite_share_busway: Tag:cycleway=opposite share busway
     cycleway=opposite_shared_busway: Tag:cycleway=opposite shared busway
+    cycleway=opposite_track: Tag:cycleway=opposite track
     cycleway=share_busway: Tag:cycleway=share busway
     cycleway=shared_busway: Tag:cycleway=shared busway
+    cycleway=sidepath: Tag:cycleway=sidepath
+    cycleway=track: Tag:cycleway=track
+    defensive=bergfried: Tag:defensive=bergfried
+    defensive=donjon: Tag:defensive=donjon
+    defensive=keep: Tag:defensive=keep
     dennert_fir_tree=yes: Tag:dennert fir tree=yes
     denomination=mormon: Tag:denomination=mormon
     denomination=reformed: Tag:denomination=reformed
     denotation=cluster: Tag:denotation=cluster
+    diplomatic=ambassadors_residence: Tag:diplomatic=ambassadors residence
+    diplomatic=consulate: Tag:diplomatic=consulate
+    diplomatic=consulate_general: Tag:diplomatic=consulate general
+    diplomatic=delegation: Tag:diplomatic=delegation
+    diplomatic=embassy: Tag:diplomatic=embassy
+    diplomatic=high_commission: Tag:diplomatic=high commission
+    diplomatic=honorary_consulate: Tag:diplomatic=honorary consulate
+    diplomatic=permanent_mission: Tag:diplomatic=permanent mission
     dock=drydock: Tag:dock=drydock
     dock=floating: Tag:dock=floating
     dock=tidal: Tag:dock=tidal
@@ -2924,34 +6208,54 @@ en:
     emergency=ambulance_station: Tag:emergency=ambulance station
     emergency=assembly_point: Tag:emergency=assembly point
     emergency=coast_guard: Tag:emergency=coast guard
+    emergency=defibrilator: Tag:emergency=defibrilator
     emergency=defibrillator: Tag:emergency=defibrillator
+    emergency=dry_riser: Tag:emergency=dry riser
+    emergency=dry_riser_inlet: Tag:emergency=dry riser inlet
     emergency=emergency_ward_entrance: Tag:emergency=emergency ward entrance
-    emergency=fire_detection_system: Tag:emergency=fire detection system
     emergency=fire_extinguisher: Tag:emergency=fire extinguisher
     emergency=fire_flapper: Tag:emergency=fire flapper
     emergency=fire_hose: Tag:emergency=fire hose
     emergency=fire_hydrant: Tag:emergency=fire hydrant
     emergency=fire_water_pond: Tag:emergency=fire water pond
+    emergency=landing_site: Tag:emergency=landing site
     emergency=life_ring: Tag:emergency=life ring
     emergency=lifeboat_station: Tag:emergency=lifeboat station
+    emergency=lifeguard_base: Tag:emergency=lifeguard base
+    emergency=lifeguard_place: Tag:emergency=lifeguard place
+    emergency=lifeguard_platform: Tag:emergency=lifeguard platform
     emergency=lifeguard_tower: Tag:emergency=lifeguard tower
     emergency=marine_refuge: Tag:emergency=marine refuge
     emergency=phone: Tag:emergency=phone
     emergency=ses_station: Tag:emergency=ses station
+    emergency=siamese: Tag:emergency=siamese
     emergency=siren: Tag:emergency=siren
     emergency=slipway: Tag:emergency=slipway
+    emergency=sprinkler: Tag:emergency=sprinkler
+    emergency=sprinkler_connection: Tag:emergency=sprinkler connection
+    emergency=standpipe: Tag:emergency=standpipe
     emergency=suction_point: Tag:emergency=suction point
     emergency=water_rescue_station: Tag:emergency=water rescue station
     emergency=water_tank: Tag:emergency=water tank
+    emergency=wet_riser: Tag:emergency=wet riser
     emergency_service=technical: Tag:emergency service=technical
+    entrance=main: Tag:entrance=main
     entrance=staircase: Tag:entrance=staircase
+    entrance=yes: Tag:entrance=yes
     esperanto=esperanto: Tag:esperanto=esperanto
     estuary=yes: Tag:estuary=yes
     fast_food=cafeteria: Tag:fast food=cafeteria
+    food=gourmet: Tag:food=gourmet
     foot=designated: Tag:foot=designated
     foot=official: Tag:foot=official
     footway=crossing: Tag:footway=crossing
     footway=sidewalk: Tag:footway=sidewalk
+    fortification_type=hill_fort: Tag:fortification type=hill fort
+    fortification_type=limes: Tag:fortification type=limes
+    fortification_type=ring_ditch: Tag:fortification type=ring ditch
+    fortification_type=ringfort: Tag:fortification type=ringfort
+    fortification_type=sconce: Tag:fortification type=sconce
+    garden:type=botanical: Tag:garden:type=botanical
     generator:method=anaerobic_digestion: Tag:generator:method=anaerobic digestion
     generator:method=barrage: Tag:generator:method=barrage
     generator:method=combustion: Tag:generator:method=combustion
@@ -2968,6 +6272,7 @@ en:
     generator:plant=intermediate: Tag:generator:plant=intermediate
     generator:plant=output: Tag:generator:plant=output
     generator:source=biofuel: Tag:generator:source=biofuel
+    generator:source=biogas: Tag:generator:source=biogas
     generator:source=biomass: Tag:generator:source=biomass
     generator:source=coal: Tag:generator:source=coal
     generator:source=gas: Tag:generator:source=gas
@@ -2975,11 +6280,14 @@ en:
     generator:source=geothermal: Tag:generator:source=geothermal
     generator:source=hydro: Tag:generator:source=hydro
     generator:source=nuclear: Tag:generator:source=nuclear
+    generator:source=oil: Tag:generator:source=oil
+    generator:source=osmotic: Tag:generator:source=osmotic
     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:type=boiler: Tag:generator:type=boiler
     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
@@ -2995,10 +6303,28 @@ en:
     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
+    generator:type=zuppinger_water_wheel: Tag:generator:type=zuppinger water wheel
     geological=moraine: Tag:geological=moraine
     geological=outcrop: Tag:geological=outcrop
     geological=palaeontological_site: Tag:geological=palaeontological site
+    golf=bunker: Tag:golf=bunker
+    golf=driving_range: Tag:golf=driving range
+    golf=fairway: Tag:golf=fairway
+    golf=green: Tag:golf=green
+    golf=hole: Tag:golf=hole
+    golf=lateral_water_hazard: Tag:golf=lateral water hazard
+    golf=pin: Tag:golf=pin
+    golf=rough: Tag:golf=rough
+    golf=tee: Tag:golf=tee
+    golf=water_hazard: Tag:golf=water hazard
+    government=audit: Tag:government=audit
+    government=ministry: Tag:government=ministry
+    government=prosecutor: Tag:government=prosecutor
+    government=register_office: Tag:government=register office
+    government=statistics: Tag:government=statistics
+    government=tax: Tag:government=tax
     grit_bin: Tag:grit bin
+    guidepost=simple: Tag:guidepost=simple
     harbour:category=RoRo: Tag:harbour:category=RoRo
     harbour:category=bulk: Tag:harbour:category=bulk
     harbour:category=container: Tag:harbour:category=container
@@ -3015,15 +6341,16 @@ en:
     harbour:category=tanker: Tag:harbour:category=tanker
     harbour:category=tourism: Tag:harbour:category=tourism
     harbour:category=yacht: Tag:harbour:category=yacht
-    harbour=drinking_water: Tag:harbour=drinking water
     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
     hazmat:water=permissive: Tag:hazmat:water=permissive
+    healthcare=blood_donation: Tag:healthcare=blood donation
+    healthcare=laboratory: Tag:healthcare=laboratory
     highway=Bus_guideway: Tag:highway=Bus guideway
+    highway=abandoned: Tag:highway=abandoned
     highway=access: Tag:highway=access
     highway=bazaar: Tag:highway=bazaar
     highway=bridleway: Tag:highway=bridleway
@@ -3031,26 +6358,27 @@ en:
     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=disused: Tag:highway=disused
     highway=elevator: Tag:highway=elevator
     highway=emergency_access_point: Tag:highway=emergency access point
+    highway=emergency_bay: Tag:highway=emergency bay
     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=incline_steep: Tag:highway=incline steep
     highway=living_street: Tag:highway=living street
     highway=milestone: Tag:highway=milestone
     highway=mini_roundabout: Tag:highway=mini roundabout
     highway=motorway: Tag:highway=motorway
     highway=motorway_junction: Tag:highway=motorway junction
     highway=motorway_link: Tag:highway=motorway link
+    highway=no: Tag:highway=no
     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
@@ -3061,6 +6389,7 @@ en:
     highway=primary: Tag:highway=primary
     highway=proposed: Tag:highway=proposed
     highway=raceway: Tag:highway=raceway
+    highway=razed: Tag:highway=razed
     highway=residential: Tag:highway=residential
     highway=rest_area: Tag:highway=rest area
     highway=road: Tag:highway=road
@@ -3068,6 +6397,7 @@ en:
     highway=service: Tag:highway=service
     highway=services: Tag:highway=services
     highway=speed_camera: Tag:highway=speed camera
+    highway=speed_display: Tag:highway=speed display
     highway=steps: Tag:highway=steps
     highway=stile: Tag:highway=stile
     highway=stop: Tag:highway=stop
@@ -3079,6 +6409,7 @@ en:
     highway=traffic_signals: Tag:highway=traffic signals
     highway=trail: Tag:highway=trail
     highway=trunk: Tag:highway=trunk
+    highway=trunk_link: Tag:highway=trunk link
     highway=turning_circle: Tag:highway=turning circle
     highway=turning_loop: Tag:highway=turning loop
     highway=unclassified: Tag:highway=unclassified
@@ -3086,12 +6417,16 @@ en:
     highway=via_ferrata: Tag:highway=via ferrata
     highway=yes: Tag:highway=yes
     highway=yield: Tag:highway=yield
+    historic=abandoned: Tag:historic=abandoned
     historic=aircraft: Tag:historic=aircraft
+    historic=aqueduct: Tag:historic=aqueduct
     historic=archaeological_site: Tag:historic=archaeological site
     historic=battlefield: Tag:historic=battlefield
+    historic=bomb_crater: Tag:historic=bomb crater
     historic=boundary_stone: Tag:historic=boundary stone
     historic=cannon: Tag:historic=cannon
     historic=castle: Tag:historic=castle
+    historic=charcoal_pile: Tag:historic=charcoal pile
     historic=city_gate: Tag:historic=city gate
     historic=city_wall: Tag:historic=city wall
     historic=citywalls: Tag:historic=citywalls
@@ -3099,6 +6434,8 @@ en:
     historic=farm: Tag:historic=farm
     historic=fort: Tag:historic=fort
     historic=gallows: Tag:historic=gallows
+    historic=heritage: Tag:historic=heritage
+    historic=highwater_mark: Tag:historic=highwater mark
     historic=locomotive: Tag:historic=locomotive
     historic=manor: Tag:historic=manor
     historic=memorial: Tag:historic=memorial
@@ -3110,8 +6447,10 @@ en:
     historic=pa: Tag:historic=pa
     historic=paleontological_site: Tag:historic=paleontological site
     historic=pillory: Tag:historic=pillory
+    historic=railway_car: Tag:historic=railway car
     historic=ruins: Tag:historic=ruins
     historic=rune_stone: Tag:historic=rune stone
+    historic=shieling: Tag:historic=shieling
     historic=ship: Tag:historic=ship
     historic=stone: Tag:historic=stone
     historic=tomb: Tag:historic=tomb
@@ -3121,18 +6460,51 @@ en:
     historic=wreck: Tag:historic=wreck
     horse=designated: Tag:horse=designated
     hunting=raised_hide: Tag:hunting=raised hide
+    indoormark=beacon: Tag:indoormark=beacon
+    industrial=aluminium_smelting: Tag:industrial=aluminium smelting
     industrial=auto_wrecker: Tag:industrial=auto wrecker
+    industrial=bakery: Tag:industrial=bakery
+    industrial=brewery: Tag:industrial=brewery
+    industrial=brickyard: Tag:industrial=brickyard
+    industrial=depot: Tag:industrial=depot
+    industrial=distributor: Tag:industrial=distributor
+    industrial=factory: Tag:industrial=factory
+    industrial=furniture: Tag:industrial=furniture
+    industrial=grinding_mill: Tag:industrial=grinding mill
+    industrial=heating_station: Tag:industrial=heating station
+    industrial=ice_factory: Tag:industrial=ice factory
+    industrial=machine_shop: Tag:industrial=machine shop
+    industrial=mine: Tag:industrial=mine
+    industrial=mobile_equipment: Tag:industrial=mobile equipment
+    industrial=oil: Tag:industrial=oil
+    industrial=oil_mill: Tag:industrial=oil mill
+    industrial=port: Tag:industrial=port
+    industrial=salt_pond: Tag:industrial=salt pond
+    industrial=sawmill: Tag:industrial=sawmill
+    industrial=scrap_yard: Tag:industrial=scrap yard
+    industrial=shipyard: Tag:industrial=shipyard
+    industrial=slaughterhouse: Tag:industrial=slaughterhouse
+    industrial=steelmaking: Tag:industrial=steelmaking
+    industrial=warehouse: Tag:industrial=warehouse
     industrial=well_cluster: Tag:industrial=well cluster
+    information=audioguide: Tag:information=audioguide
     information=board: Tag:information=board
     information=guidepost: Tag:information=guidepost
     information=map: Tag:information=map
+    information=office: Tag:information=office
+    information=tactile_map: Tag:information=tactile map
     information=tactile_model: Tag:information=tactile model
+    information=terminal: Tag:information=terminal
     internet_access=wlan: Tag:internet access=wlan
+    junction=circular: Tag:junction=circular
     junction=crossing: Tag:junction=crossing
     junction=filter: Tag:junction=filter
     junction=jughandle: Tag:junction=jughandle
     junction=roundabout: Tag:junction=roundabout
     junction=yes: Tag:junction=yes
+    landcover=grass: Tag:landcover=grass
+    landcover=gravel: Tag:landcover=gravel
+    landcover=trees: Tag:landcover=trees
     landform=esker: Tag:landform=esker
     landform=raised_beach: Tag:landform=raised beach
     landmark=beacon: Tag:landmark=beacon
@@ -3159,6 +6531,7 @@ en:
     landmark=windsock: Tag:landmark=windsock
     landuse=agriculture: Tag:landuse=agriculture
     landuse=allotments: Tag:landuse=allotments
+    landuse=apiary: Tag:landuse=apiary
     landuse=aquaculture: Tag:landuse=aquaculture
     landuse=basin: Tag:landuse=basin
     landuse=breeding: Tag:landuse=breeding
@@ -3174,6 +6547,7 @@ en:
     landuse=farmyard: Tag:landuse=farmyard
     landuse=field: Tag:landuse=field
     landuse=fishfarm: Tag:landuse=fishfarm
+    landuse=flowerbed: Tag:landuse=flowerbed
     landuse=forest: Tag:landuse=forest
     landuse=garages: Tag:landuse=garages
     landuse=grass: Tag:landuse=grass
@@ -3185,6 +6559,7 @@ en:
     landuse=industrial: Tag:landuse=industrial
     landuse=institutional: Tag:landuse=institutional
     landuse=landfill: Tag:landuse=landfill
+    landuse=logging: Tag:landuse=logging
     landuse=meadow: Tag:landuse=meadow
     landuse=military: Tag:landuse=military
     landuse=observatory: Tag:landuse=observatory
@@ -3192,6 +6567,7 @@ en:
     landuse=peat_cutting: Tag:landuse=peat cutting
     landuse=plant_nursery: Tag:landuse=plant nursery
     landuse=plantation: Tag:landuse=plantation
+    landuse=pond: Tag:landuse=pond
     landuse=port: Tag:landuse=port
     landuse=prison: Tag:landuse=prison
     landuse=quarry: Tag:landuse=quarry
@@ -3205,6 +6581,7 @@ en:
     landuse=street: Tag:landuse=street
     landuse=traffic_island: Tag:landuse=traffic island
     landuse=trees: Tag:landuse=trees
+    landuse=turbary: Tag:landuse=turbary
     landuse=utility: Tag:landuse=utility
     landuse=village_green: Tag:landuse=village green
     landuse=vineyard: Tag:landuse=vineyard
@@ -3231,27 +6608,36 @@ en:
     leisure=bandstand: Tag:leisure=bandstand
     leisure=bathing_place: Tag:leisure=bathing place
     leisure=bbq: Tag:leisure=bbq
+    leisure=beach: Tag:leisure=beach
     leisure=beach_resort: Tag:leisure=beach resort
     leisure=bird_hide: Tag:leisure=bird hide
     leisure=bleachers: Tag:leisure=bleachers
     leisure=bowling_alley: Tag:leisure=bowling alley
     leisure=casino: Tag:leisure=casino
+    leisure=club: Tag:leisure=club
     leisure=common: Tag:leisure=common
     leisure=dance: Tag:leisure=dance
+    leisure=dancing: Tag:leisure=dancing
     leisure=disc_golf_course: Tag:leisure=disc golf course
     leisure=dog_park: Tag:leisure=dog park
+    leisure=escape_game: Tag:leisure=escape game
     leisure=firepit: Tag:leisure=firepit
     leisure=fishing: Tag:leisure=fishing
+    leisure=fitness_centre: Tag:leisure=fitness centre
     leisure=fitness_station: Tag:leisure=fitness station
     leisure=foot_bath: Tag:leisure=foot bath
+    leisure=gambling: Tag:leisure=gambling
     leisure=garden: Tag:leisure=garden
     leisure=golf_course: Tag:leisure=golf course
     leisure=hackerspace: Tag:leisure=hackerspace
+    leisure=horse_riding: Tag:leisure=horse riding
+    leisure=hot_spring: Tag:leisure=hot spring
     leisure=ice_rink: Tag:leisure=ice rink
     leisure=landscape_reserve: Tag:leisure=landscape reserve
     leisure=marina: Tag:leisure=marina
     leisure=miniature_golf: Tag:leisure=miniature golf
     leisure=nature_reserve: Tag:leisure=nature reserve
+    leisure=outdoor_seating: Tag:leisure=outdoor seating
     leisure=paddling_pool: Tag:leisure=paddling pool
     leisure=park: Tag:leisure=park
     leisure=picnic: Tag:leisure=picnic
@@ -3261,15 +6647,18 @@ en:
     leisure=playground: Tag:leisure=playground
     leisure=recreation_ground: Tag:leisure=recreation ground
     leisure=red_light_district: Tag:leisure=red light district
+    leisure=resort: Tag:leisure=resort
     leisure=sailing_club: Tag:leisure=sailing club
     leisure=sauna: Tag:leisure=sauna
+    leisure=shooting_ground: Tag:leisure=shooting ground
     leisure=ski_playground: Tag:leisure=ski playground
     leisure=slipway: Tag:leisure=slipway
+    leisure=soccer_golf: Tag:leisure=soccer golf
     leisure=social_club: Tag:leisure=social club
-    leisure=sport_centre: Tag:leisure=sport centre
     leisure=sports_centre: Tag:leisure=sports centre
     leisure=stadium: Tag:leisure=stadium
     leisure=summer_camp: Tag:leisure=summer camp
+    leisure=swimming_area: Tag:leisure=swimming area
     leisure=swimming_pool: Tag:leisure=swimming pool
     leisure=table_tennis_table: Tag:leisure=table tennis table
     leisure=tanning_salon: Tag:leisure=tanning salon
@@ -3280,73 +6669,96 @@ en:
     leisure=water_park: Tag:leisure=water park
     leisure=wildlife_hide: Tag:leisure=wildlife hide
     level_crossing=automatic_barrier: Tag:level crossing=automatic barrier
+    level_crossing=traffic_signals: Tag:level crossing=traffic signals
     level_crossing=uncontrolled: Tag:level crossing=uncontrolled
     line=bay: Tag:line=bay
     line=busbar: Tag:line=busbar
     lines=phone: Tag:lines=phone
     locality=subtownland: Tag:locality=subtownland
     locality=townland: Tag:locality=townland
+    location:transition=yes: Tag:location:transition=yes
     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=beacon: Tag:man made=beacon
+    man_made=beehive: Tag:man made=beehive
     man_made=breakwater: Tag:man made=breakwater
     man_made=bridge: Tag:man made=bridge
     man_made=bunker_silo: Tag:man made=bunker silo
     man_made=cairn: Tag:man made=cairn
     man_made=campanile: Tag:man made=campanile
-    man_made=cellar_entrance: Tag:man made=cellar entrance
     man_made=chimney: Tag:man made=chimney
+    man_made=clearcut: Tag:man made=clearcut
     man_made=communications_tower: Tag:man made=communications tower
     man_made=compass_rose: Tag:man made=compass rose
+    man_made=cooling_tower: Tag:man made=cooling tower
     man_made=crane: Tag:man made=crane
     man_made=cross: Tag:man made=cross
+    man_made=cut_line: Tag:man made=cut line
     man_made=cutline: Tag:man made=cutline
     man_made=dike: Tag:man made=dike
     man_made=dolphin: Tag:man made=dolphin
     man_made=dovecote: Tag:man made=dovecote
+    man_made=drinking_fountain: Tag:man made=drinking fountain
     man_made=dyke: Tag:man made=dyke
     man_made=embankment: Tag:man made=embankment
     man_made=flagpole: Tag:man made=flagpole
     man_made=flare: Tag:man made=flare
     man_made=floating_storage: Tag:man made=floating storage
+    man_made=frost_fan: Tag:man made=frost fan
     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=guy: Tag:man made=guy
+    man_made=hot_water_tank: Tag:man made=hot water tank
     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=levee: Tag:man made=levee
     man_made=lighthouse: Tag:man made=lighthouse
     man_made=mast: Tag:man made=mast
+    man_made=measurement_station: Tag:man made=measurement station
     man_made=mineshaft: Tag:man made=mineshaft
     man_made=monitoring_station: Tag:man made=monitoring station
+    man_made=nesting_site: Tag:man made=nesting site
     man_made=obelisk: Tag:man made=obelisk
+    man_made=observatory: Tag:man made=observatory
     man_made=offshore_platform: Tag:man made=offshore platform
     man_made=oil_well: Tag:man made=oil well
     man_made=petroleum_well: Tag:man made=petroleum well
     man_made=pier: Tag:man made=pier
     man_made=pillar: Tag:man made=pillar
     man_made=pipeline: Tag:man made=pipeline
+    man_made=power_fossil: Tag:man made=power fossil
+    man_made=power_hydro: Tag:man made=power hydro
+    man_made=power_nuclear: Tag:man made=power nuclear
+    man_made=power_wind: Tag:man made=power wind
     man_made=pumping_rig: Tag:man made=pumping rig
+    man_made=pumping_station: Tag:man made=pumping station
+    man_made=quay: Tag:man made=quay
     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_cannon: Tag:man made=snow cannon
     man_made=snow_fence: Tag:man made=snow fence
+    man_made=snow_net: Tag:man made=snow net
+    man_made=spoil_heap: Tag:man made=spoil heap
     man_made=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=telescope: Tag:man made=telescope
+    man_made=tell: Tag:man made=tell
     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_tank: Tag:man made=water tank
     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
@@ -3358,16 +6770,41 @@ en:
     man_made=windmill: Tag:man made=windmill
     man_made=windpump: Tag:man made=windpump
     man_made=works: Tag:man made=works
+    manhole=drain: Tag:manhole=drain
+    manhole=telecom: Tag:manhole=telecom
+    maxheight=default: Tag:maxheight=default
     medical=aed: Tag:medical=aed
     medical=witchdoctor: Tag:medical=witchdoctor
+    megalith_type=alignment: Tag:megalith type=alignment
+    megalith_type=chamber: Tag:megalith type=chamber
+    megalith_type=cist: Tag:megalith type=cist
+    megalith_type=dolmen: Tag:megalith type=dolmen
+    megalith_type=long_barrow: Tag:megalith type=long barrow
+    megalith_type=menhir: Tag:megalith type=menhir
+    megalith_type=nuraghe: Tag:megalith type=nuraghe
+    megalith_type=passage_grave: Tag:megalith type=passage grave
+    megalith_type=stone_circle: Tag:megalith type=stone circle
+    megalith_type=stone_ship: Tag:megalith type=stone ship
+    megalith_type=tholos: Tag:megalith type=tholos
+    megalith_type=well: Tag:megalith type=well
     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
+    memorial=blue_plaque: Tag:memorial=blue plaque
+    memorial=bust: Tag:memorial=bust
+    memorial=obelisk: Tag:memorial=obelisk
+    memorial=plaque: Tag:memorial=plaque
+    memorial=statue: Tag:memorial=statue
+    memorial=stele: Tag:memorial=stele
+    memorial=stolperstein: Tag:memorial=stolperstein
+    memorial=stone: Tag:memorial=stone
+    memorial=war_memorial: Tag:memorial=war memorial
     microbrewery=yes: Tag:microbrewery=yes
     military=airfield: Tag:military=airfield
+    military=ammunition: Tag:military=ammunition
     military=barracks: Tag:military=barracks
     military=bunker: Tag:military=bunker
     military=checkpoint: Tag:military=checkpoint
@@ -3376,8 +6813,10 @@ en:
     military=naval_base: Tag:military=naval base
     military=nuclear_explosion_site: Tag:military=nuclear explosion site
     military=obstacle_course: Tag:military=obstacle course
+    military=office: Tag:military=office
     military=range: Tag:military=range
     military=training_area: Tag:military=training area
+    military=trench: Tag:military=trench
     mooring=commercial: Tag:mooring=commercial
     mooring=cruise: Tag:mooring=cruise
     mooring=declaration: Tag:mooring=declaration
@@ -3388,15 +6827,32 @@ en:
     mooring=sbm: Tag:mooring=sbm
     mooring=spm: Tag:mooring=spm
     mooring=visitor: Tag:mooring=visitor
-    mooring=yes: Tag:mooring=yes
+    motorcycle:type=electric: Tag:motorcycle:type=electric
+    motorcycle:type=sportbike: Tag:motorcycle:type=sportbike
+    motorcycle_friendly: Tag:motorcycle friendly
+    name=7-Eleven: Tag:name=7-Eleven
+    name=BMO: Tag:name=BMO
+    name=BMO_Bank_of_Montreal: Tag:name=BMO Bank of Montreal
+    name=Bank_of_Montreal: Tag:name=Bank of Montreal
+    name=Burger_King: Tag:name=Burger King
+    name=CIBC_Banking_Centre: Tag:name=CIBC Banking Centre
+    name=Costco: Tag:name=Costco
+    name=Dollarama: Tag:name=Dollarama
+    name=Domino's_Pizza: Tag:name=Domino's Pizza
+    name=KFC: Tag:name=KFC
+    name=McDonald's: Tag:name=McDonald's
+    name=Subway: Tag:name=Subway
     name=The_Church_of_Jesus_Christ_of_Latter-day_Saints: Tag:name=The Church of Jesus
       Christ of Latter-day Saints
+    name=Walmart: Tag:name=Walmart
+    natural=anthill: Tag:natural=anthill
     natural=arete: Tag:natural=arete
     natural=avalanche_dam: Tag:natural=avalanche dam
     natural=bare_rock: Tag:natural=bare rock
     natural=bay: Tag:natural=bay
     natural=beach: Tag:natural=beach
     natural=bedrock: Tag:natural=bedrock
+    natural=blowhole: Tag:natural=blowhole
     natural=breaker: Tag:natural=breaker
     natural=cape: Tag:natural=cape
     natural=cave_entrance: Tag:natural=cave entrance
@@ -3404,25 +6860,39 @@ en:
     natural=cloud: Tag:natural=cloud
     natural=coastline: Tag:natural=coastline
     natural=continental_shelf: Tag:natural=continental shelf
+    natural=crater: Tag:natural=crater
     natural=crevasse: Tag:natural=crevasse
     natural=desert: Tag:natural=desert
     natural=dune: Tag:natural=dune
+    natural=earth_bank: Tag:natural=earth bank
     natural=esker: Tag:natural=esker
     natural=fell: Tag:natural=fell
+    natural=fjord: Tag:natural=fjord
+    natural=geothermal: Tag:natural=geothermal
+    natural=geothermal_area: Tag:natural=geothermal area
+    natural=geothermal_field: Tag:natural=geothermal field
+    natural=geyser: Tag:natural=geyser
     natural=glacier: Tag:natural=glacier
     natural=grassland: Tag:natural=grassland
     natural=gully: Tag:natural=gully
     natural=heath: Tag:natural=heath
+    natural=herb: Tag:natural=herb
+    natural=hot_spring: Tag:natural=hot spring
     natural=lake: Tag:natural=lake
     natural=land: Tag:natural=land
     natural=landform: Tag:natural=landform
+    natural=landslide: Tag:natural=landslide
     natural=lava: Tag:natural=lava
+    natural=marsh: Tag:natural=marsh
     natural=meadow: Tag:natural=meadow
     natural=moor: Tag:natural=moor
     natural=moraine: Tag:natural=moraine
+    natural=moss: Tag:natural=moss
     natural=mud: Tag:natural=mud
+    natural=naled: Tag:natural=naled
     natural=palaeontological_site: Tag:natural=palaeontological site
     natural=peak: Tag:natural=peak
+    natural=plant: Tag:natural=plant
     natural=reef: Tag:natural=reef
     natural=ridge: Tag:natural=ridge
     natural=riverbed: Tag:natural=riverbed
@@ -3434,15 +6904,18 @@ en:
     natural=scrub: Tag:natural=scrub
     natural=shingle: Tag:natural=shingle
     natural=shoal: Tag:natural=shoal
+    natural=shrub: Tag:natural=shrub
     natural=sinkhole: Tag:natural=sinkhole
     natural=spring: Tag:natural=spring
     natural=stone: Tag:natural=stone
     natural=strait: Tag:natural=strait
+    natural=termite_mound: Tag:natural=termite mound
     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=wallow: Tag:natural=wallow
     natural=water: Tag:natural=water
     natural=wetland: Tag:natural=wetland
     natural=wood: Tag:natural=wood
@@ -3450,55 +6923,152 @@ en:
     network=BR:ES: Tag:network=BR:ES
     network=BR:MG: Tag:network=BR:MG
     network=BR:PB: Tag:network=BR:PB
+    network=Flinkster: Tag:network=Flinkster
+    network=JP:national: Tag:network=JP:national
+    network=JP:prefectural:nagano: Tag:network=JP:prefectural:nagano
+    network=US:ADHS: Tag:network=US:ADHS
+    network=US:AK: Tag:network=US:AK
+    network=US:AL: Tag:network=US:AL
     network=US:AR: Tag:network=US:AR
+    network=US:AZ: Tag:network=US:AZ
     network=US:CA: Tag:network=US:CA
+    network=US:CO: Tag:network=US:CO
+    network=US:CT: Tag:network=US:CT
+    network=US:DE: Tag:network=US:DE
     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:HI: Tag:network=US:HI
     network=US:I: Tag:network=US:I
+    network=US:IA: Tag:network=US:IA
+    network=US:ID: Tag:network=US:ID
+    network=US:IL: Tag:network=US:IL
     network=US:IN: Tag:network=US:IN
+    network=US:KS: Tag:network=US:KS
     network=US:KY: Tag:network=US:KY
+    network=US:LA: Tag:network=US:LA
+    network=US:MA: Tag:network=US:MA
     network=US:MD: Tag:network=US:MD
+    network=US:ME: Tag:network=US:ME
+    network=US:MI: Tag:network=US:MI
+    network=US:MN: Tag:network=US:MN
+    network=US:MO: Tag:network=US:MO
+    network=US:MS: Tag:network=US:MS
     network=US:MT: Tag:network=US:MT
     network=US:MT:secondary: Tag:network=US:MT:secondary
+    network=US:NC: Tag:network=US:NC
+    network=US:ND: Tag:network=US:ND
+    network=US:NE: Tag:network=US:NE
+    network=US:NH: Tag:network=US:NH
+    network=US:NJ: Tag:network=US:NJ
     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:NV: Tag:network=US:NV
     network=US:NY: Tag:network=US:NY
+    network=US:NY:Albany: Tag:network=US:NY:Albany
+    network=US:NY:Allegany: Tag:network=US:NY:Allegany
+    network=US:NY:Broome: Tag:network=US:NY:Broome
+    network=US:NY:Cattaraugus: Tag:network=US:NY:Cattaraugus
+    network=US:NY:Chautauqua: Tag:network=US:NY:Chautauqua
+    network=US:NY:Chemung: Tag:network=US:NY:Chemung
+    network=US:NY:Chenango: Tag:network=US:NY:Chenango
+    network=US:NY:Columbia: Tag:network=US:NY:Columbia
+    network=US:NY:Delaware: Tag:network=US:NY:Delaware
+    network=US:NY:Dutchess: Tag:network=US:NY:Dutchess
+    network=US:NY:Erie: Tag:network=US:NY:Erie
+    network=US:NY:Essex: Tag:network=US:NY:Essex
+    network=US:NY:Franklin: Tag:network=US:NY:Franklin
+    network=US:NY:Fulton: Tag:network=US:NY:Fulton
+    network=US:NY:Greene: Tag:network=US:NY:Greene
+    network=US:NY:Hamilton: Tag:network=US:NY:Hamilton
     network=US:NY:Herkimer: Tag:network=US:NY:Herkimer
+    network=US:NY:Jefferson: Tag:network=US:NY:Jefferson
+    network=US:NY:Lewis: Tag:network=US:NY:Lewis
+    network=US:NY:Livingston: Tag:network=US:NY:Livingston
+    network=US:NY:Madison: Tag:network=US:NY:Madison
     network=US:NY:Montgomery: Tag:network=US:NY:Montgomery
+    network=US:NY:Oneida: Tag:network=US:NY:Oneida
     network=US:NY:Onondaga: Tag:network=US:NY:Onondaga
+    network=US:NY:Orange: Tag:network=US:NY:Orange
+    network=US:NY:Oswego: Tag:network=US:NY:Oswego
+    network=US:NY:Otsego: Tag:network=US:NY:Otsego
+    network=US:NY:Putnam: Tag:network=US:NY:Putnam
+    network=US:NY:Rensselaer: Tag:network=US:NY:Rensselaer
+    network=US:NY:Rockland: Tag:network=US:NY:Rockland
+    network=US:NY:Saint_Lawrence: Tag:network=US:NY:Saint Lawrence
+    network=US:NY:Saratoga: Tag:network=US:NY:Saratoga
+    network=US:NY:Schenectady: Tag:network=US:NY:Schenectady
+    network=US:NY:Schoharie: Tag:network=US:NY:Schoharie
+    network=US:NY:Schuyler: Tag:network=US:NY:Schuyler
+    network=US:NY:Steuben: Tag:network=US:NY:Steuben
+    network=US:NY:Sullivan: Tag:network=US:NY:Sullivan
+    network=US:NY:Tioga: Tag:network=US:NY:Tioga
+    network=US:NY:Tompkins: Tag:network=US:NY:Tompkins
+    network=US:NY:Ulster: Tag:network=US:NY:Ulster
+    network=US:NY:Warren: Tag:network=US:NY:Warren
+    network=US:NY:Washington: Tag:network=US:NY:Washington
+    network=US:NY:Westchester: Tag:network=US:NY:Westchester
+    network=US:NY:Yates: Tag:network=US:NY:Yates
     network=US:OH: Tag:network=US:OH
     network=US:OH:ASD: Tag:network=US:OH:ASD
+    network=US:OH:ATH: Tag:network=US:OH:ATH
+    network=US:OH:BEL: Tag:network=US:OH:BEL
     network=US:OH:CAR: Tag:network=US:OH:CAR
+    network=US:OH:COL: Tag:network=US:OH:COL
+    network=US:OH:COS: Tag:network=US:OH:COS
+    network=US:OH:FAY: Tag:network=US:OH:FAY
     network=US:OH:FUL: Tag:network=US:OH:FUL
     network=US:OH:GUE: Tag:network=US:OH:GUE
+    network=US:OH:HAR: Tag:network=US:OH:HAR
     network=US:OH:HAS: Tag:network=US:OH:HAS
+    network=US:OH:HEN: Tag:network=US:OH:HEN
+    network=US:OH:HOC: Tag:network=US:OH:HOC
     network=US:OH:HOL: Tag:network=US:OH:HOL
     network=US:OH:JEF: Tag:network=US:OH:JEF
+    network=US:OH:LIC: Tag:network=US:OH:LIC
     network=US:OH:LOG: Tag:network=US:OH:LOG
     network=US:OH:LOG:Jefferson: Tag:network=US:OH:LOG:Jefferson
     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:MAH: Tag:network=US:OH:MAH
     network=US:OH:MED: Tag:network=US:OH:MED
     network=US:OH:MED:Harrisville: Tag:network=US:OH:MED:Harrisville
     network=US:OH:MED:Litchfield: Tag:network=US:OH:MED:Litchfield
+    network=US:OH:MED:Sharon: Tag:network=US:OH:MED:Sharon
+    network=US:OH:MED:Wadsworth: Tag:network=US:OH:MED:Wadsworth
+    network=US:OH:MOE: Tag:network=US:OH:MOE
+    network=US:OH:MRW: Tag:network=US:OH:MRW
     network=US:OH:OTT: Tag:network=US:OH:OTT
     network=US:OH:PAU: Tag:network=US:OH:PAU
+    network=US:OH:PER: Tag:network=US:OH:PER
+    network=US:OH:POR: Tag:network=US:OH:POR
     network=US:OH:SAN:Fremont: Tag:network=US:OH:SAN:Fremont
+    network=US:OH:SEN: Tag:network=US:OH:SEN
     network=US:OH:STA: Tag:network=US:OH:STA
     network=US:OH:SUM: Tag:network=US:OH:SUM
+    network=US:OH:SUM:Bath: Tag:network=US:OH:SUM:Bath
     network=US:OH:TUS: Tag:network=US:OH:TUS
     network=US:OH:UNI: Tag:network=US:OH:UNI
+    network=US:OH:VIN: Tag:network=US:OH:VIN
     network=US:OH:WAY: Tag:network=US:OH:WAY
+    network=US:OH:WAY:Chester: Tag:network=US:OH:WAY:Chester
+    network=US:OH:WAY:Congress: Tag:network=US:OH:WAY:Congress
+    network=US:OH:WAY:Plain: Tag:network=US:OH:WAY:Plain
     network=US:OH:WIL: Tag:network=US:OH:WIL
     network=US:OH:WOO: Tag:network=US:OH:WOO
+    network=US:OH:WYA: Tag:network=US:OH:WYA
+    network=US:OK: Tag:network=US:OK
+    network=US:OR: Tag:network=US:OR
     network=US:PA: Tag:network=US:PA
+    network=US:RI: Tag:network=US:RI
+    network=US:SC: Tag:network=US:SC
+    network=US:SD: Tag:network=US:SD
     network=US:TN: Tag:network=US:TN
     network=US:TX: Tag:network=US:TX
     network=US:TX:Beltway: Tag:network=US:TX:Beltway
@@ -3508,14 +7078,26 @@ en:
     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:UT: Tag:network=US:UT
     network=US:VA: Tag:network=US:VA
+    network=US:VT: Tag:network=US:VT
+    network=US:WA: Tag:network=US:WA
+    network=US:WI: Tag:network=US:WI
+    network=US:WV: Tag:network=US:WV
     network=US:WV:Berkeley: Tag:network=US:WV:Berkeley
+    network=US:WY: Tag:network=US:WY
+    network=call-a-bike: Tag:network=call-a-bike
+    network=cambio/stadtmobil: Tag:network=cambio/stadtmobil
+    network=cambio_stadtmobil: Tag:network=cambio stadtmobil
     network=icn: Tag:network=icn
     network=iwn: Tag:network=iwn
+    network=jp:national: Tag:network=jp:national
+    network=jp:prefectural:nagano: Tag:network=jp:prefectural:nagano
     network=lcn: Tag:network=lcn
     network=lhn: Tag:network=lhn
     network=lwn: Tag:network=lwn
     network=ncn: Tag:network=ncn
+    network=nextbike: Tag:network=nextbike
     network=nwn: Tag:network=nwn
     network=rcn: Tag:network=rcn
     network=rhn: Tag:network=rhn
@@ -3525,31 +7107,63 @@ en:
     office:realtor: Tag:office:realtor
     office=accountant: Tag:office=accountant
     office=administrative: Tag:office=administrative
+    office=adoption_agency: Tag:office=adoption agency
+    office=advertising_agency: Tag:office=advertising agency
     office=architect: Tag:office=architect
     office=association: Tag:office=association
+    office=charity: Tag:office=charity
     office=company: Tag:office=company
+    office=coworking: Tag:office=coworking
     office=educational_institution: Tag:office=educational institution
     office=employment_agency: Tag:office=employment agency
+    office=energy_supplier: Tag:office=energy supplier
     office=estate_agent: Tag:office=estate agent
+    office=financial: Tag:office=financial
+    office=forestry: Tag:office=forestry
     office=foundation: Tag:office=foundation
     office=government: Tag:office=government
+    office=guide: Tag:office=guide
     office=insurance: Tag:office=insurance
     office=it: Tag:office=it
     office=lawyer: Tag:office=lawyer
+    office=logistics: Tag:office=logistics
+    office=moving_company: Tag:office=moving company
     office=newspaper: Tag:office=newspaper
     office=ngo: Tag:office=ngo
     office=non-governmental_organization: Tag:office=non-governmental organization
+    office=notary: Tag:office=notary
+    office=occupational_safety: Tag:office=occupational safety
+    office=parish: Tag:office=parish
     office=political_party: Tag:office=political party
+    office=private_investigator: Tag:office=private investigator
     office=quango: Tag:office=quango
+    office=real_estate_agent: Tag:office=real estate agent
     office=realtor: Tag:office=realtor
+    office=register: Tag:office=register
     office=religion: Tag:office=religion
     office=research: Tag:office=research
     office=surveyor: Tag:office=surveyor
+    office=tax: Tag:office=tax
+    office=tax_advisor: Tag:office=tax advisor
     office=telecommunication: Tag:office=telecommunication
+    office=therapist: Tag:office=therapist
     office=travel_agent: Tag:office=travel agent
     office=water_utility: Tag:office=water utility
+    office=yes: Tag:office=yes
+    oneway=alternating: Tag:oneway=alternating
+    oneway=reversible: Tag:oneway=reversible
+    operator=Cambio: Tag:operator=Cambio
+    operator=CiteeCar: Tag:operator=CiteeCar
+    operator=Drive_Carsharing: Tag:operator=Drive Carsharing
+    operator=Flinkster: Tag:operator=Flinkster
+    operator=Stadtmobil: Tag:operator=Stadtmobil
+    operator=book-n-drive: Tag:operator=book-n-drive
+    operator=cambio: Tag:operator=cambio
     operator=independent: Tag:operator=independent
+    operator=stadtmobil: Tag:operator=stadtmobil
+    operator=teilAuto: Tag:operator=teilAuto
     parking:lane:hgv=on_street: Tag:parking:lane:hgv=on street
+    parking=surface: Tag:parking=surface
     passenger=international: Tag:passenger=international
     passenger=local: Tag:passenger=local
     passenger=national: Tag:passenger=national
@@ -3564,8 +7178,11 @@ en:
     pipeline=marker: Tag:pipeline=marker
     pipeline=substation: Tag:pipeline=substation
     pipeline=valve: Tag:pipeline=valve
+    piste:type=downhill: Tag:piste:type=downhill
+    piste:type=nordic: Tag:piste:type=nordic
     place=allotments: Tag:place=allotments
     place=archipelago: Tag:place=archipelago
+    place=borough: Tag:place=borough
     place=city: Tag:place=city
     place=city_block: Tag:place=city block
     place=continent: Tag:place=continent
@@ -3579,45 +7196,64 @@ en:
     place=locality: Tag:place=locality
     place=neighbourhood: Tag:place=neighbourhood
     place=ocean: Tag:place=ocean
+    place=plot: Tag:place=plot
     place=quarter: Tag:place=quarter
     place=region: Tag:place=region
     place=sea: Tag:place=sea
+    place=square: Tag:place=square
     place=state: Tag:place=state
     place=suburb: Tag:place=suburb
     place=town: Tag:place=town
     place=village: Tag:place=village
     placement=right_of:1: Tag:placement=right of:1
     placement=transition: Tag:placement=transition
+    pole=transition: Tag:pole=transition
     power=cable: Tag:power=cable
     power=cable_distribution_cabinet: Tag:power=cable distribution cabinet
+    power=catenary_mast: Tag:power=catenary mast
     power=compensator: Tag:power=compensator
     power=converter: Tag:power=converter
     power=generator: Tag:power=generator
     power=heliostat: Tag:power=heliostat
+    power=insulator: Tag:power=insulator
     power=line: Tag:power=line
     power=minor_line: Tag:power=minor line
+    power=outlet: Tag:power=outlet
     power=plant: Tag:power=plant
     power=pole: Tag:power=pole
+    power=portal: Tag:power=portal
     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=terminal: Tag:power=terminal
     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
+    prison_camp=concentration_camp: Tag:prison camp=concentration camp
     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=pole: Tag:public transport=pole
     public_transport=station: Tag:public transport=station
     public_transport=stop_area: Tag:public transport=stop area
     public_transport=stop_position: Tag:public transport=stop position
     pump=manual: Tag:pump=manual
     pump=no: Tag:pump=no
     pump=powered: Tag:pump=powered
+    raba:id=1100: Tag:raba:id=1100
+    raba:id=1160: Tag:raba:id=1160
+    raba:id=1180: Tag:raba:id=1180
+    raba:id=1190: Tag:raba:id=1190
+    raba:id=1211: Tag:raba:id=1211
+    raba:id=1212: Tag:raba:id=1212
+    raba:id=1300: Tag:raba:id=1300
+    raba:id=1410: Tag:raba:id=1410
+    raba:id=1500: Tag:raba:id=1500
     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
@@ -3638,6 +7274,7 @@ en:
     railway=disused: Tag:railway=disused
     railway=funicular: Tag:railway=funicular
     railway=halt: Tag:railway=halt
+    railway=junction: Tag:railway=junction
     railway=level_crossing: Tag:railway=level crossing
     railway=light_rail: Tag:railway=light rail
     railway=milestone: Tag:railway=milestone
@@ -3645,11 +7282,15 @@ en:
     railway=monorail: Tag:railway=monorail
     railway=narrow_gauge: Tag:railway=narrow gauge
     railway=platform: Tag:railway=platform
+    railway=platform_edge: Tag:railway=platform edge
     railway=preserved: Tag:railway=preserved
     railway=rail: Tag:railway=rail
+    railway=rail_brake: Tag:railway=rail brake
     railway=railway_crossing: Tag:railway=railway crossing
     railway=roundhouse: Tag:railway=roundhouse
     railway=signal: Tag:railway=signal
+    railway=signal_box: Tag:railway=signal box
+    railway=spur_junction: Tag:railway=spur junction
     railway=station: Tag:railway=station
     railway=stop: Tag:railway=stop
     railway=subway: Tag:railway=subway
@@ -3657,13 +7298,32 @@ en:
     railway=switch: Tag:railway=switch
     railway=tram: Tag:railway=tram
     railway=tram_stop: Tag:railway=tram stop
+    railway=traverser: Tag:railway=traverser
     railway=turntable: Tag:railway=turntable
+    railway=wash: Tag:railway=wash
+    railway=yard: Tag:railway=yard
     recycling_type=container: Tag:recycling type=container
+    religion=buddhist: Tag:religion=buddhist
+    religion=christian: Tag:religion=christian
+    religion=hindu: Tag:religion=hindu
+    religion=jain: Tag:religion=jain
+    religion=jewish: Tag:religion=jewish
+    religion=multifaith: Tag:religion=multifaith
+    religion=muslim: Tag:religion=muslim
     religion=pagan: Tag:religion=pagan
+    religion=shinto: Tag:religion=shinto
+    religion=sikh: Tag:religion=sikh
+    religion=taoist: Tag:religion=taoist
+    religion=zoroastrian: Tag:religion=zoroastrian
+    rental=ski: Tag:rental=ski
+    rental=strandkorb: Tag:rental=strandkorb
+    residential=rural: Tag:residential=rural
     residential=university: Tag:residential=university
+    residential=urban: Tag:residential=urban
     resource=aggregate: Tag:resource=aggregate
     resource=gravel: Tag:resource=gravel
     resource=sand: Tag:resource=sand
+    route=aqueduct: Tag:route=aqueduct
     route=bicycle: Tag:route=bicycle
     route=bus: Tag:route=bus
     route=canal: Tag:route=canal
@@ -3671,8 +7331,14 @@ en:
     route=detour: Tag:route=detour
     route=ferry: Tag:route=ferry
     route=fitness_trail: Tag:route=fitness trail
+    route=foot: Tag:route=foot
+    route=hiking: Tag:route=hiking
+    route=horse: Tag:route=horse
     route=inline_skates: Tag:route=inline skates
+    route=light_rail: Tag:route=light rail
+    route=minibus: Tag:route=minibus
     route=monorail: Tag:route=monorail
+    route=ncn: Tag:route=ncn
     route=nordic_walking: Tag:route=nordic walking
     route=pipeline: Tag:route=pipeline
     route=piste: Tag:route=piste
@@ -3682,10 +7348,10 @@ en:
     route=share_taxi: Tag:route=share taxi
     route=ski: Tag:route=ski
     route=subway: Tag:route=subway
+    route=tracks: Tag:route=tracks
     route=train: Tag:route=train
     route=tram: Tag:route=tram
     route=trolleybus: Tag:route=trolleybus
-    sea_mark=day_beacon: Tag:sea mark=day beacon
     seamark:beacon_cardinal:colour_pattern=horizontal: Tag:seamark:beacon cardinal:colour
       pattern=horizontal
     seamark:beacon_cardinal:shape=tower: Tag:seamark:beacon cardinal:shape=tower
@@ -3797,12 +7463,10 @@ en:
     seamark:fog_signal:category=diaphone: Tag:seamark:fog signal:category=diaphone
     seamark:fog_signal:category=explosive: Tag:seamark:fog signal:category=explosive
     seamark:fog_signal:category=gong: Tag:seamark:fog signal:category=gong
-    seamark:fog_signal:category=gun: Tag:seamark:fog signal:category=gun
     seamark:fog_signal:category=horn: Tag:seamark:fog signal:category=horn
     seamark:fog_signal:category=nautophone: Tag:seamark:fog signal:category=nautophone
     seamark:fog_signal:category=siren: Tag:seamark:fog signal:category=siren
     seamark:fog_signal:category=whistle: Tag:seamark:fog signal:category=whistle
-    seamark:fog_signal: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
@@ -3929,6 +7593,8 @@ en:
     seamark:small_craft_facility:category=visitor_berth: Tag:seamark:small craft facility:category=visitor
       berth
     seamark:small_craft_facility:category=water: Tag:seamark:small craft facility:category=water
+    seamark:small_craft_facility:category=water_tap: Tag:seamark:small craft facility:category=water
+      tap
     seamark:topmark:colour=black: Tag:seamark:topmark:colour=black
     seamark:topmark:colour=green: Tag:seamark:topmark:colour=green
     seamark:topmark:colour=grey: Tag:seamark:topmark:colour=grey
@@ -3971,10 +7637,16 @@ en:
     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=causeway: Tag:seamark:type=causeway
+    seamark:type=checkpoint: Tag:seamark:type=checkpoint
+    seamark:type=communication_area: Tag:seamark:type=communication area
     seamark:type=distance_mark: Tag:seamark:type=distance mark
+    seamark:type=dry_dock: Tag:seamark:type=dry dock
+    seamark:type=exceptional_structure: Tag:seamark:type=exceptional structure
     seamark:type=gate: Tag:seamark:type=gate
     seamark:type=harbour: Tag:seamark:type=harbour
     seamark:type=landmark: Tag:seamark:type=landmark
+    seamark:type=light: Tag:seamark:type=light
     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
@@ -3984,6 +7656,7 @@ en:
     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=radar_transponder: Tag:seamark:type=radar transponder
     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
@@ -3991,11 +7664,12 @@ en:
     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=landmark: Tag:seamark=landmark
     segregated=no: Tag:segregated=no
     segregated=yes: Tag:segregated=yes
     service=alley: Tag:service=alley
+    service=bus: Tag:service=bus
+    service=crossover: Tag:service=crossover
     service=drive-through: Tag:service=drive-through
     service=drive_through: Tag:service=drive through
     service=driveway: Tag:service=driveway
@@ -4007,14 +7681,17 @@ en:
     service=yard: Tag:service=yard
     shelter_type=basic_hut: Tag:shelter type=basic hut
     shelter_type=lean_to: Tag:shelter type=lean to
+    shelter_type=public_transport: Tag:shelter type=public transport
+    shop=*: Tag:shop=*
     shop=Alko: Tag:shop=Alko
     shop=_business_machines: Tag:shop= business machines
-    shop=accessories: Tag:shop=accessories
+    shop=agrarian: Tag:shop=agrarian
     shop=alcohol: Tag:shop=alcohol
     shop=anime: Tag:shop=anime
+    shop=antique: Tag:shop=antique
     shop=antiques: Tag:shop=antiques
-    shop=appliance: Tag:shop=appliance
     shop=art: Tag:shop=art
+    shop=atv: Tag:shop=atv
     shop=audiologist: Tag:shop=audiologist
     shop=auto_parts: Tag:shop=auto parts
     shop=baby_care: Tag:shop=baby care
@@ -4031,9 +7708,11 @@ en:
     shop=bookmaker: Tag:shop=bookmaker
     shop=books: Tag:shop=books
     shop=boutique: Tag:shop=boutique
+    shop=brewing_supplies: Tag:shop=brewing supplies
     shop=business_machines: Tag:shop=business machines
     shop=butcher: Tag:shop=butcher
     shop=camera: Tag:shop=camera
+    shop=candles: Tag:shop=candles
     shop=canoe_hire: Tag:shop=canoe hire
     shop=car: Tag:shop=car
     shop=car_bodyshop: Tag:shop=car bodyshop
@@ -4049,12 +7728,15 @@ en:
     shop=chocolate: Tag:shop=chocolate
     shop=clothes: Tag:shop=clothes
     shop=coffee: Tag:shop=coffee
+    shop=collector: Tag:shop=collector
     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=cosmetics: Tag:shop=cosmetics
+    shop=country_store: Tag:shop=country store
+    shop=craft: Tag:shop=craft
     shop=curtain: Tag:shop=curtain
     shop=dairy: Tag:shop=dairy
     shop=deli: Tag:shop=deli
@@ -4064,10 +7746,11 @@ en:
     shop=dive: Tag:shop=dive
     shop=diy: Tag:shop=diy
     shop=doityourself: Tag:shop=doityourself
+    shop=doors: Tag:shop=doors
     shop=dry_cleaning: Tag:shop=dry cleaning
     shop=e-cigarette: Tag:shop=e-cigarette
+    shop=edible_seeds: Tag:shop=edible seeds
     shop=electrical: Tag:shop=electrical
-    shop=electronic_cigarette: Tag:shop=electronic cigarette
     shop=electronics: Tag:shop=electronics
     shop=energy: Tag:shop=energy
     shop=erotic: Tag:shop=erotic
@@ -4076,6 +7759,8 @@ en:
     shop=fabrics: Tag:shop=fabrics
     shop=farm: Tag:shop=farm
     shop=fashion: Tag:shop=fashion
+    shop=firearms: Tag:shop=firearms
+    shop=fireplace: Tag:shop=fireplace
     shop=fireworks: Tag:shop=fireworks
     shop=fish: Tag:shop=fish
     shop=fishing: Tag:shop=fishing
@@ -4083,23 +7768,33 @@ en:
     shop=flooring: Tag:shop=flooring
     shop=florist: Tag:shop=florist
     shop=flower: Tag:shop=flower
+    shop=flowers: Tag:shop=flowers
     shop=food: Tag:shop=food
     shop=frame: Tag:shop=frame
+    shop=free_flying: Tag:shop=free flying
     shop=frozen_food: Tag:shop=frozen food
+    shop=fuel: Tag:shop=fuel
     shop=funeral_directors: Tag:shop=funeral directors
     shop=furnace: Tag:shop=furnace
     shop=furniture: Tag:shop=furniture
+    shop=gallery: Tag:shop=gallery
     shop=gambling: Tag:shop=gambling
+    shop=games: Tag:shop=games
     shop=garden_centre: Tag:shop=garden centre
+    shop=garden_furniture: Tag:shop=garden furniture
     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=glass: Tag:shop=glass
     shop=glaziery: Tag:shop=glaziery
     shop=golf: Tag:shop=golf
     shop=greengrocer: Tag:shop=greengrocer
     shop=grocery: Tag:shop=grocery
+    shop=gun: Tag:shop=gun
+    shop=guns: Tag:shop=guns
+    shop=haberdashery: Tag:shop=haberdashery
     shop=hairdresser: Tag:shop=hairdresser
     shop=hairdresser_supply: Tag:shop=hairdresser supply
     shop=hardware: Tag:shop=hardware
@@ -4116,9 +7811,13 @@ en:
     shop=ice_cream: Tag:shop=ice cream
     shop=insurance: Tag:shop=insurance
     shop=interior_decoration: Tag:shop=interior decoration
+    shop=jetski: Tag:shop=jetski
+    shop=jewellery: Tag:shop=jewellery
     shop=jewelry: Tag:shop=jewelry
+    shop=junk_yard: Tag:shop=junk yard
     shop=kiosk: Tag:shop=kiosk
     shop=kitchen: Tag:shop=kitchen
+    shop=lamps: Tag:shop=lamps
     shop=laundromat: Tag:shop=laundromat
     shop=laundry: Tag:shop=laundry
     shop=leather: Tag:shop=leather
@@ -4126,11 +7825,13 @@ en:
     shop=locksmith: Tag:shop=locksmith
     shop=lottery: Tag:shop=lottery
     shop=mall: Tag:shop=mall
+    shop=marine: Tag:shop=marine
     shop=massage: Tag:shop=massage
     shop=medical: Tag:shop=medical
     shop=medical_supply: Tag:shop=medical supply
     shop=military_surplus: Tag:shop=military surplus
     shop=mobile_phone: Tag:shop=mobile phone
+    shop=model: Tag:shop=model
     shop=money_lender: Tag:shop=money lender
     shop=moneylender: Tag:shop=moneylender
     shop=motorcycle: Tag:shop=motorcycle
@@ -4139,27 +7840,34 @@ en:
     shop=musical_instrument: Tag:shop=musical instrument
     shop=musical_instruments: Tag:shop=musical instruments
     shop=newsagent: Tag:shop=newsagent
+    shop=nutrition_supplements: Tag:shop=nutrition supplements
+    shop=nuts: Tag:shop=nuts
     shop=office_supplies: Tag:shop=office supplies
     shop=optician: Tag:shop=optician
     shop=organic: Tag:shop=organic
     shop=outdoor: Tag:shop=outdoor
     shop=paint: Tag:shop=paint
     shop=party: Tag:shop=party
+    shop=pasta: Tag:shop=pasta
     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=pet_grooming: Tag:shop=pet grooming
     shop=pharmacy: Tag:shop=pharmacy
     shop=photo: Tag:shop=photo
     shop=photo_studio: Tag:shop=photo studio
     shop=photography: Tag:shop=photography
+    shop=piercing: Tag:shop=piercing
     shop=pottery: Tag:shop=pottery
     shop=printing: Tag:shop=printing
     shop=pyrotechnics: Tag:shop=pyrotechnics
+    shop=pépinière: Tag:shop=pépinière
     shop=radiotechnics: Tag:shop=radiotechnics
     shop=religion: Tag:shop=religion
     shop=rental: Tag:shop=rental
+    shop=robot: Tag:shop=robot
     shop=scuba_diving: Tag:shop=scuba diving
     shop=seafood: Tag:shop=seafood
     shop=second_hand: Tag:shop=second hand
@@ -4168,14 +7876,17 @@ en:
     shop=shoe_repair: Tag:shop=shoe repair
     shop=shoes: Tag:shop=shoes
     shop=shopping_centre: Tag:shop=shopping centre
+    shop=ski: Tag:shop=ski
+    shop=snowmobile: Tag:shop=snowmobile
     shop=solarium: Tag:shop=solarium
     shop=souvenir: Tag:shop=souvenir
     shop=spare_parts: Tag:shop=spare parts
+    shop=spices: Tag:shop=spices
     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=swimming_pool: Tag:shop=swimming pool
     shop=systembolaget: Tag:shop=systembolaget
     shop=tailor: Tag:shop=tailor
     shop=tattoo: Tag:shop=tattoo
@@ -4188,25 +7899,30 @@ en:
     shop=toys: Tag:shop=toys
     shop=trade: Tag:shop=trade
     shop=travel_agency: Tag:shop=travel agency
+    shop=trophy: Tag:shop=trophy
     shop=tyres: Tag:shop=tyres
     shop=vacant: Tag:shop=vacant
     shop=vacuum_cleaner: Tag:shop=vacuum cleaner
     shop=variety_store: Tag:shop=variety store
+    shop=vehicles: Tag:shop=vehicles
     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=wholesale: Tag:shop=wholesale
+    shop=wigs: Tag:shop=wigs
+    shop=window: Tag:shop=window
     shop=window_blind: Tag:shop=window blind
     shop=windows: Tag:shop=windows
     shop=wine: Tag:shop=wine
     shop=winery: Tag:shop=winery
+    shop=wool: Tag:shop=wool
     shop=yes: Tag:shop=yes
     sign=no: Tag:sign=no
     sign=yes: Tag:sign=yes
     signal_station=bridge: Tag:signal station=bridge
     signal_station=control: Tag:signal station=control
-    signal_station=danger: Tag:signal station=danger
     signal_station=distress: Tag:signal station=distress
     signal_station=firing: Tag:signal station=firing
     signal_station=ice: Tag:signal station=ice
@@ -4221,14 +7937,42 @@ en:
     signal_station=time: Tag:signal station=time
     signal_station=traffic: Tag:signal station=traffic
     signal_station=weather: Tag:signal station=weather
+    site=piste: Tag:site=piste
+    site_type=bigstone: Tag:site type=bigstone
+    site_type=city: Tag:site type=city
+    site_type=fortification: Tag:site type=fortification
+    site_type=hut_circle: Tag:site type=hut circle
+    site_type=megalith: Tag:site type=megalith
+    site_type=necropolis: Tag:site type=necropolis
+    site_type=petroglyph: Tag:site type=petroglyph
+    site_type=roman_circus: Tag:site type=roman circus
+    site_type=roman_villa: Tag:site type=roman villa
+    site_type=settlement: Tag:site type=settlement
+    site_type=tumulus: Tag:site type=tumulus
+    social_facility=ambulatory_care: Tag:social facility=ambulatory care
     social_facility=assisted_living: Tag:social facility=assisted living
+    social_facility=clothing_bank: Tag:social facility=clothing bank
+    social_facility=day_care: Tag:social facility=day care
     social_facility=food_bank: Tag:social facility=food bank
     social_facility=group_home: Tag:social facility=group home
+    social_facility=hospice: Tag:social facility=hospice
+    social_facility=nursing_home: Tag:social facility=nursing home
     social_facility=outreach: Tag:social facility=outreach
     social_facility=shelter: Tag:social facility=shelter
+    social_facility=soup_kitchen: Tag:social facility=soup kitchen
+    social_facility=workshop: Tag:social facility=workshop
     source:ele=barometric: Tag:source:ele=barometric
+    source:geometry=ACT2016: Tag:source:geometry=ACT2016
+    source:geometry=ACTMapiRoads: Tag:source:geometry=ACTMapiRoads
+    source:geometry=ACTMapiTP: Tag:source:geometry=ACTMapiTP
     source:geometry=Bing: Tag:source:geometry=Bing
+    source:geometry=NSW_LPI_Base_Map: Tag:source:geometry=NSW LPI Base Map
+    source:geometry=NSW_LPI_Imagery: Tag:source:geometry=NSW LPI Imagery
     source:maxspeed=implicit: Tag:source:maxspeed=implicit
+    source:name=NSW_LPI_Base_Map: Tag:source:name=NSW LPI Base Map
+    source=ACT2016: Tag:source=ACT2016
+    source=ACTMapiRoads: Tag:source=ACTMapiRoads
+    source=ACTMapiTP: Tag:source=ACTMapiTP
     source=Bymiljøetaten: Tag:source=Bymiljøetaten
     source=DNT_Oslo_og_Omegn: Tag:source=DNT Oslo og Omegn
     source=GURS: Tag:source=GURS
@@ -4237,10 +7981,17 @@ en:
       1:25000 map (2007)
     source=Isle_of_Man_Government_aerial_imagery_(2001): Tag:source=Isle of Man Government
       aerial imagery (2001)
+    source=LPI_NSW_Imagery: Tag:source=LPI NSW Imagery
     source=NAIP: Tag:source=NAIP
+    source=NSW_LPI_Base_Map: Tag:source=NSW LPI Base Map
+    source=NSW_LPI_Imagery: Tag:source=NSW LPI Imagery
+    source=Naturbase: Tag:source=Naturbase
+    source=PGS: Tag:source=PGS
     source=RABA-KGZ: Tag:source=RABA-KGZ
+    source=YahooJapan/ALPSMAP: Tag:source=YahooJapan/ALPSMAP
     source=gurs: Tag:source=gurs
     sport=10pin: Tag:sport=10pin
+    sport=8pin: Tag:sport=8pin
     sport=9pin: Tag:sport=9pin
     sport=BASE: Tag:sport=BASE
     sport=aikido: Tag:sport=aikido
@@ -4265,6 +8016,7 @@ en:
     sport=boxing: Tag:sport=boxing
     sport=canadian_football: Tag:sport=canadian football
     sport=canoe: Tag:sport=canoe
+    sport=canoe_polo: Tag:sport=canoe polo
     sport=chess: Tag:sport=chess
     sport=cliff_diving: Tag:sport=cliff diving
     sport=climbing: Tag:sport=climbing
@@ -4276,13 +8028,14 @@ en:
     sport=curling: Tag:sport=curling
     sport=cycling: Tag:sport=cycling
     sport=darts: Tag:sport=darts
+    sport=disc_golf: Tag:sport=disc golf
     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=footballgolf: Tag:sport=footballgolf
     sport=free_flying: Tag:sport=free flying
     sport=futsal: Tag:sport=futsal
     sport=gaelic_football: Tag:sport=gaelic football
@@ -4301,12 +8054,16 @@ en:
     sport=karting: Tag:sport=karting
     sport=kitesurfing: Tag:sport=kitesurfing
     sport=korfball: Tag:sport=korfball
+    sport=laser_tag: Tag:sport=laser tag
     sport=model_aerodrome: Tag:sport=model aerodrome
+    sport=motocross: Tag:sport=motocross
     sport=motor: Tag:sport=motor
     sport=multi: Tag:sport=multi
+    sport=netball: Tag:sport=netball
     sport=obstacle_course: Tag:sport=obstacle course
     sport=orienteering: Tag:sport=orienteering
     sport=paddle_tennis: Tag:sport=paddle tennis
+    sport=paintball: Tag:sport=paintball
     sport=parachuting: Tag:sport=parachuting
     sport=paragliding: Tag:sport=paragliding
     sport=pelota: Tag:sport=pelota
@@ -4321,23 +8078,31 @@ en:
     sport=scuba_diving: Tag:sport=scuba diving
     sport=shooting: Tag:sport=shooting
     sport=shooting_range: Tag:sport=shooting range
+    sport=shot-put: Tag:sport=shot-put
     sport=skateboard: Tag:sport=skateboard
     sport=skating: Tag:sport=skating
     sport=skiing: Tag:sport=skiing
     sport=soccer: Tag:sport=soccer
+    sport=sumo: Tag:sport=sumo
     sport=surfing: Tag:sport=surfing
     sport=swimming: Tag:sport=swimming
     sport=table_soccer: Tag:sport=table soccer
     sport=table_tennis: Tag:sport=table tennis
+    sport=taekwondo: Tag:sport=taekwondo
     sport=team_handball: Tag:sport=team handball
     sport=tennis: Tag:sport=tennis
     sport=toboggan: Tag:sport=toboggan
+    sport=trampoline: Tag:sport=trampoline
     sport=volleyball: Tag:sport=volleyball
+    sport=water_polo: Tag:sport=water polo
     sport=water_ski: Tag:sport=water ski
+    sport=weightlifting: Tag:sport=weightlifting
+    sport=wrestling: Tag:sport=wrestling
+    sport=yoga: Tag:sport=yoga
     sports=aikido: Tag:sports=aikido
     sports=athletics: Tag:sports=athletics
+    station=light_rail: Tag:station=light rail
     station=subway: Tag:station=subway
-    sub_sea=reef: Tag:sub sea=reef
     substation=compensation: Tag:substation=compensation
     substation=converter: Tag:substation=converter
     substation=distribution: Tag:substation=distribution
@@ -4347,8 +8112,15 @@ en:
     substation=transition: Tag:substation=transition
     substation=transmission: Tag:substation=transmission
     summit:cross=yes: Tag:summit:cross=yes
-    surface=pebbles: Tag:surface=pebbles
+    switch=circuit_breaker: Tag:switch=circuit breaker
+    switch=disconnector: Tag:switch=disconnector
+    switch=earthing: Tag:switch=earthing
+    switch=mechanical: Tag:switch=mechanical
+    tank_trap=czech_hedgehog: Tag:tank trap=czech hedgehog
     telecom=cross-connect: Tag:telecom=cross-connect
+    telecom=data_center: Tag:telecom=data center
+    telecom=data_centre: Tag:telecom=data centre
+    telecom=datacenter: Tag:telecom=datacenter
     telecom=remote_digital_terminal: Tag:telecom=remote digital terminal
     telecom=remote_terminal: Tag:telecom=remote terminal
     tourism=alpine_hut: Tag:tourism=alpine hut
@@ -4371,6 +8143,7 @@ en:
     tourism=resort: Tag:tourism=resort
     tourism=theme_park: Tag:tourism=theme park
     tourism=tourism-attraction: Tag:tourism=tourism-attraction
+    tourism=trail_riding_station: Tag:tourism=trail riding station
     tourism=viewpoint: Tag:tourism=viewpoint
     tourism=wilderness_hut: Tag:tourism=wilderness hut
     tourism=wine_cellar: Tag:tourism=wine cellar
@@ -4381,11 +8154,22 @@ en:
     tower:construction=freestanding: Tag:tower:construction=freestanding
     tower:construction=lattice: Tag:tower:construction=lattice
     tower:type: Tag:tower:type
+    tower:type=bell_tower: Tag:tower:type=bell tower
+    tower:type=bridge: Tag:tower:type=bridge
     tower:type=communication: Tag:tower:type=communication
     tower:type=cooling: Tag:tower:type=cooling
+    tower:type=defensive: Tag:tower:type=defensive
     tower:type=donjon: Tag:tower:type=donjon
+    tower:type=hose: Tag:tower:type=hose
+    tower:type=intake: Tag:tower:type=intake
     tower:type=lattice: Tag:tower:type=lattice
     tower:type=lighting: Tag:tower:type=lighting
+    tower:type=monitoring: Tag:tower:type=monitoring
+    tower:type=monument: Tag:tower:type=monument
+    tower:type=observation: Tag:tower:type=observation
+    tower:type=radar: Tag:tower:type=radar
+    tower:type=siren: Tag:tower:type=siren
+    tower:type=watchtower: Tag:tower:type=watchtower
     traffic=local: Tag:traffic=local
     traffic=national: Tag:traffic=national
     traffic=regional: Tag:traffic=regional
@@ -4393,6 +8177,7 @@ en:
     traffic=urban: Tag:traffic=urban
     traffic_calming=island: Tag:traffic calming=island
     traffic_calming=table: Tag:traffic calming=table
+    traffic_sign=city_limit: Tag:traffic sign=city limit
     transformer=auto: Tag:transformer=auto
     transformer=converter: Tag:transformer=converter
     transformer=distribution: Tag:transformer=distribution
@@ -4402,12 +8187,13 @@ en:
     transformer=yes: Tag:transformer=yes
     tunnel=culvert: Tag:tunnel=culvert
     two_sided=yes: Tag:two sided=yes
+    type=AutoPASS: Tag:type=AutoPASS
     type=autopass: Tag:type=autopass
     type=benchmark: Tag:type=benchmark
+    type=defaults: Tag:type=defaults
     type=fixed_point: Tag:type=fixed point
     type=observation_spot: Tag:type=observation spot
     type=public_transport: Tag:type=public transport
-    type=street: Tag:type=street
     type=triangulation: Tag:type=triangulation
     vending=SIM-cards: Tag:vending=SIM-cards
     vending=SIM_cards: Tag:vending=SIM cards
@@ -4415,10 +8201,14 @@ en:
     vending=animal_feed: Tag:vending=animal feed
     vending=bicycle_tube: Tag:vending=bicycle tube
     vending=books: Tag:vending=books
+    vending=bottle_return: Tag:vending=bottle return
+    vending=bread: Tag:vending=bread
     vending=bycicle_tube: Tag:vending=bycicle tube
     vending=candles: Tag:vending=candles
     vending=chemist: Tag:vending=chemist
+    vending=chewing_gums: Tag:vending=chewing gums
     vending=cigarettes: Tag:vending=cigarettes
+    vending=coffee: Tag:vending=coffee
     vending=condoms: Tag:vending=condoms
     vending=drinks: Tag:vending=drinks
     vending=electronics: Tag:vending=electronics
@@ -4430,10 +8220,12 @@ en:
     vending=fishing_tackle: Tag:vending=fishing tackle
     vending=flowers: Tag:vending=flowers
     vending=food: Tag:vending=food
+    vending=fuel: Tag:vending=fuel
     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=milk: Tag:vending=milk
     vending=news_papers: Tag:vending=news papers
     vending=newspapers: Tag:vending=newspapers
     vending=parcel_mail_in: Tag:vending=parcel mail in
@@ -4441,21 +8233,31 @@ en:
     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=photo: Tag:vending=photo
+    vending=public_transport_plans: Tag:vending=public transport plans
     vending=public_transport_tickets: Tag:vending=public transport tickets
+    vending=raw_milk: Tag:vending=raw milk
     vending=sex_toys: Tag:vending=sex toys
     vending=stamps: Tag:vending=stamps
     vending=sweets: Tag:vending=sweets
     vending=syringes: Tag:vending=syringes
+    vending=telephone_vouchers: Tag:vending=telephone vouchers
     vending=toll: Tag:vending=toll
     vending=toys: Tag:vending=toys
     vending=umbrellas: Tag:vending=umbrellas
+    vending=water: Tag:vending=water
     vending_machine: Tag:vending machine
+    vending_machine=fuel: Tag:vending machine=fuel
     wall=dry_stone: Tag:wall=dry stone
     wall=no: Tag:wall=no
+    wall=noise_barrier: Tag:wall=noise barrier
     wall=seawall: Tag:wall=seawall
     wall=training_wall: Tag:wall=training wall
+    waste=dog_excrement: Tag:waste=dog excrement
     water=intermittent: Tag:water=intermittent
-    water=river: Tag:water=river
+    water=lake: Tag:water=lake
+    water=lock: Tag:water=lock
+    water=reservoir: Tag:water=reservoir
     water=tidal: Tag:water=tidal
     waterway=boat_lift: Tag:waterway=boat lift
     waterway=boatyard: Tag:waterway=boatyard
@@ -4470,147 +8272,746 @@ en:
     waterway=dredged_area: Tag:waterway=dredged area
     waterway=drystream: Tag:waterway=drystream
     waterway=estuary: Tag:waterway=estuary
+    waterway=fairway: Tag:waterway=fairway
     waterway=fish_pass: Tag:waterway=fish pass
+    waterway=fuel: Tag:waterway=fuel
     waterway=lock_gate: Tag:waterway=lock gate
     waterway=milestone: Tag:waterway=milestone
+    waterway=mooring: Tag:waterway=mooring
     waterway=offshore_field: Tag:waterway=offshore field
     waterway=rapids: Tag:waterway=rapids
     waterway=river: Tag:waterway=river
     waterway=riverbank: Tag:waterway=riverbank
+    waterway=sanitary_dump_station: Tag:waterway=sanitary dump station
     waterway=seaway: Tag:waterway=seaway
     waterway=stream: Tag:waterway=stream
+    waterway=stream_end: Tag:waterway=stream end
     waterway=swept_area: Tag:waterway=swept area
     waterway=turning_point: Tag:waterway=turning point
     waterway=wadi: Tag:waterway=wadi
     waterway=water_point: Tag:waterway=water point
     waterway=waterfall: Tag:waterway=waterfall
     waterway=weir: Tag:waterway=weir
+    wetland=bog: Tag:wetland=bog
+    wetland=fen: Tag:wetland=fen
+    wetland=mangrove: Tag:wetland=mangrove
+    wetland=marsh: Tag:wetland=marsh
+    wetland=mud: Tag:wetland=mud
+    wetland=reedbed: Tag:wetland=reedbed
     wetland=saltern: Tag:wetland=saltern
-    wood=broad_leaved: Tag:wood=broad leaved
-    wood=casuarina: Tag:wood=casuarina
-    wood=coniferous: Tag:wood=coniferous
-    wood=deciduous: Tag:wood=deciduous
+    wetland=saltmarsh: Tag:wetland=saltmarsh
+    wetland=string_bog: Tag:wetland=string bog
+    wetland=swamp: Tag:wetland=swamp
+    wetland=tidalflat: Tag:wetland=tidalflat
+    wetland=wet_meadow: Tag:wetland=wet meadow
     wood=eucalypt: Tag:wood=eucalypt
     wood=evergreen: Tag:wood=evergreen
-    wood=filao: Tag:wood=filao
-    wood=mixed: Tag:wood=mixed
     wood=nipa_palm: Tag:wood=nipa palm
-    wood=palm: Tag:wood=palm
+    zoo=aviary: Tag:zoo=aviary
+    zoo=birds: Tag:zoo=birds
+    zoo=enclosure: Tag:zoo=enclosure
+    zoo=falconry: Tag:zoo=falconry
     zoo=petting_zoo: Tag:zoo=petting zoo
+    zoo=reptile: Tag:zoo=reptile
+    zoo=safari_park: Tag:zoo=safari park
+    zoo=wildlife_park: Tag:zoo=wildlife park
+eo:
+  key:
+    esperanto: Eo:Key:esperanto
+    esperanto=yes: Eo:Key:esperanto=yes
 es:
   key:
+    abandoned: ES:Key:abandoned
+    'abandoned:': 'ES:Key:abandoned:'
+    abandoned:railway: ES:Key:abandoned:railway
+    abutters: ES:Key:abutters
     addr: ES:Key:addr
+    addr:city: ES:Key:addr:city
+    addr:country: ES:Key:addr:country
+    addr:district: ES:Key:addr:district
+    addr:flats: ES:Key:addr:flats
+    addr:full: ES:Key:addr:full
+    addr:hamlet: ES:Key:addr:hamlet
+    addr:housename: ES:Key:addr:housename
+    addr:housenumber: ES:Key:addr:housenumber
+    addr:inclusion: ES:Key:addr:inclusion
+    addr:interpolation: ES:Key:addr:interpolation
+    addr:place: ES:Key:addr:place
+    addr:postcode: ES:Key:addr:postcode
+    addr:province: ES:Key:addr:province
+    addr:state: ES:Key:addr:state
+    addr:street: ES:Key:addr:street
+    addr:subdistrict: ES:Key:addr:subdistrict
+    addr:suburb: ES:Key:addr:suburb
+    aerialway: ES:Key:aerialway
     amenity: ES:Key:amenity
+    artist_name: ES:Key:artist name
+    artwork_subject: ES:Key:artwork subject
+    barrier: ES:Key:barrier
+    bicycle_parking: ES:Key:bicycle parking
+    bicycle_road: ES:Key:bicycle road
     brand: ES:Key:brand
+    brewery: ES:Key:brewery
+    bridge:structure: ES:Key:bridge:structure
     building: ES:Key:building
-    camino: ES:Key:camino
+    building:levels: ES:Key:building:levels
+    bus_bay: ES:Key:bus bay
+    busway: ES:Key:busway
+    cemetery: ES:Key:cemetery
+    circumference: ES:Key:circumference
+    clothes: ES:Key:clothes
+    comment: ES:Key:comment
+    construction: ES:Key:construction
+    contact: ES:Key:contact
+    conveying: ES:Key:conveying
+    craft: ES:Key:craft
+    cuisine: ES:Key:cuisine
+    cutting: ES:Key:cutting
     cycleway: ES:Key:cycleway
+    cycleway:left: ES:Key:cycleway:left
+    cycleway:right: ES:Key:cycleway:right
+    denotation: ES:Key:denotation
+    description: ES:Key:description
+    destination: ES:Key:destination
+    diaper: ES:Key:diaper
+    diet:*: ES:Key:diet:*
+    disused: ES:Key:disused
+    'disused:': 'ES:Key:disused:'
+    disused:railway: ES:Key:disused:railway
+    embankment: ES:Key:embankment
+    emergency: ES:Key:emergency
     end_date: ES:Key:end date
+    entrance: ES:Key:entrance
+    evacuation_route: ES:Key:evacuation route
+    fair_trade: ES:Key:fair trade
+    fee: ES:Key:fee
+    fence_type: ES:Key:fence type
+    fixme: ES:Key:fixme
+    footway: ES:Key:footway
+    ford: ES:Key:ford
+    fuel:diesel_G2: ES:Key:fuel:diesel G2
+    generator:output: ES:Key:generator:output
+    generator:source: ES:Key:generator:source
     geological: ES:Key:geological
+    government: ES:Key:government
+    grassland: ES:Key:grassland
+    hazard_prone: ES:Key:hazard prone
+    height: ES:Key:height
+    heritage: ES:Key:heritage
     highway: ES:Key:highway
+    historic: ES:Key:historic
+    historic:civilization: ES:Key:historic:civilization
+    image: ES:Key:image
+    indoor: ES:Key:indoor
+    intermittent: ES:Key:intermittent
     is_in: ES:Key:is in
+    ladder: ES:Key:ladder
+    landuse: ES:Key:landuse
+    lanes: ES:Key:lanes
+    lanes:psv: ES:Key:lanes:psv
+    leaf_cycle: ES:Key:leaf cycle
+    leaf_type: ES:Key:leaf type
+    leisure: ES:Key:leisure
+    local_ref: ES:Key:local ref
+    man_made: ES:Key:man made
+    manufacturer: ES:Key:manufacturer
+    mapillary: ES:Key:mapillary
+    material: ES:Key:material
+    maxheight: ES:Key:maxheight
     maxspeed: ES:Key:maxspeed
+    memorial: ES:Key:memorial
+    monitoring:galileo: ES:Key:monitoring:galileo
+    monitoring:glonass: ES:Key:monitoring:glonass
+    monitoring:gps: ES:Key:monitoring:gps
+    motorhome: ES:Key:motorhome
     motorroad: ES:Key:motorroad
+    mountain_pass: ES:Key:mountain pass
     name: ES:Key:name
     natural: ES:Key:natural
     noexit: ES:Key:noexit
+    note: ES:Key:note
+    office: ES:Key:office
+    oneway: ES:Key:oneway
     opening_hours: ES:Key:opening hours
     operator: ES:Key:operator
+    operator:type: ES:Key:operator:type
     organic: ES:Key:organic
     origin: ES:Key:origin
+    overtaking: ES:Key:overtaking
+    owner: ES:Key:owner
+    parking: ES:Key:parking
     parking:lane: ES:Key:parking:lane
+    passenger: ES:Key:passenger
     payment: ES:Key:payment
     phone: ES:Key:phone
     place: ES:Key:place
+    placement: ES:Key:placement
+    population: ES:Key:population
+    power: ES:Key:power
+    prepayment: ES:Key:prepayment
+    prepayment:*: ES:Key:prepayment:*
+    priority: ES:Key:priority
+    product: ES:Key:product
     proposed: ES:Key:proposed
+    public_bookcase:type: ES:Key:public bookcase:type
+    public_transport: ES:Key:public transport
+    public_transport:version: ES:Key:public transport:version
+    pump: ES:Key:pump
+    railway: ES:Key:railway
+    ref: ES:Key:ref
+    ref:bic: ES:Key:ref:bic
+    ref:color: ES:Key:ref:color
+    ref:colour: ES:Key:ref:colour
+    ref:isil: ES:Key:ref:isil
+    religion: ES:Key:religion
+    resource: ES:Key:resource
+    roof:direction: ES:Key:roof:direction
+    route: ES:Key:route
+    route_master: ES:Key:route master
+    ruins: ES:Key:ruins
+    'ruins:': 'ES:Key:ruins:'
+    rungs: ES:Key:rungs
+    sac_scale: ES:Key:sac scale
+    safety_rope: ES:Key:safety rope
+    seasonal: ES:Key:seasonal
     shop: ES:Key:shop
+    sidewalk: ES:Key:sidewalk
+    site_type: ES:Key:site type
+    social_facility: ES:Key:social facility
     source: ES:Key:source
+    species: ES:Key:species
+    sport: ES:Key:sport
     stars: ES:Key:stars
+    support: ES:Key:support
+    surface: ES:Key:surface
+    symbol: ES:Key:symbol
+    takeaway: ES:Key:takeaway
+    todo: ES:Key:todo
+    tourism: ES:Key:tourism
+    tracktype: ES:Key:tracktype
     traffic_calming: ES:Key:traffic calming
+    traffic_sign: ES:Key:traffic sign
+    traffic_signals: ES:Key:traffic signals
+    traffic_signals:direction: ES:Key:traffic signals:direction
+    trolley_wire: ES:Key:trolley wire
+    trolleybus: ES:Key:trolleybus
+    tunnel: ES:Key:tunnel
     turn: ES:Key:turn
+    type: ES:Key:type
+    url: ES:Key:url
+    water: ES:Key:water
+    waterway: ES:Key:waterway
     website: ES:Key:website
     wheelchair: ES:Key:wheelchair
     wholesale: ES:Key:wholesale
+    wikidata: ES:Key:wikidata
+    wikimedia_commons: ES:Key:wikimedia commons
+    wikipedia: ES:Key:wikipedia
   tag:
+    abandoned:amenity=prison_camp: ES:Tag:abandoned:amenity=prison camp
+    access=customers: ES:Tag:access=customers
     aerialway=cable_car: ES:Tag:aerialway=cable car
+    aerialway=gondola: ES:Tag:aerialway=gondola
+    aerialway=station: ES:Tag:aerialway=station
+    aeroway=apron: ES:Tag:aeroway=apron
+    aeroway=helipad: ES:Tag:aeroway=helipad
+    aeroway=heliport: ES:Tag:aeroway=heliport
     aeroway=terminal: ES:Tag:aeroway=terminal
+    aeroway=windsock: ES:Tag:aeroway=windsock
+    airmark=beacon: ES:Tag:airmark=beacon
+    amenity=animal_shelter: ES:Tag:amenity=animal shelter
+    amenity=archive: ES:Tag:amenity=archive
+    amenity=arts_centre: ES:Tag:amenity=arts centre
     amenity=atm: ES:Tag:amenity=atm
+    amenity=bank: ES:Tag:amenity=bank
     amenity=bar: ES:Tag:amenity=bar
+    amenity=bench: ES:Tag:amenity=bench
     amenity=bicycle_parking: ES:Tag:amenity=bicycle parking
     amenity=bicycle_rental: ES:Tag:amenity=bicycle rental
+    amenity=biergarten: ES:Tag:amenity=biergarten
     amenity=brothel: ES:Tag:amenity=brothel
+    amenity=bus_station: ES:Tag:amenity=bus station
+    amenity=cafe: ES:Tag:amenity=cafe
+    amenity=car_rental: ES:Tag:amenity=car rental
+    amenity=car_wash: ES:Tag:amenity=car wash
+    amenity=clinic: ES:Tag:amenity=clinic
+    amenity=college: ES:Tag:amenity=college
+    amenity=community_centre: ES:Tag:amenity=community centre
+    amenity=courthouse: ES:Tag:amenity=courthouse
+    amenity=crematorium: ES:Tag:amenity=crematorium
+    amenity=crypt: ES:Tag:amenity=crypt
+    amenity=dentist: ES:Tag:amenity=dentist
+    amenity=doctors: ES:Tag:amenity=doctors
+    amenity=drinking_water: ES:Tag:amenity=drinking water
+    amenity=driving_school: ES:Tag:amenity=driving school
+    amenity=embassy: ES:Tag:amenity=embassy
+    amenity=events_venue: ES:Tag:amenity=events venue
+    amenity=exhibition_centre: ES:Tag:amenity=exhibition centre
+    amenity=fast_food: ES:Tag:amenity=fast food
+    amenity=ferry_terminal: ES:Tag:amenity=ferry terminal
+    amenity=fountain: ES:Tag:amenity=fountain
     amenity=fuel: ES:Tag:amenity=fuel
+    amenity=grave_yard: ES:Tag:amenity=grave yard
+    amenity=hospital: ES:Tag:amenity=hospital
     amenity=ice_cream: ES:Tag:amenity=ice cream
+    amenity=internet_cafe: ES:Tag:amenity=internet cafe
+    amenity=kindergarten: ES:Tag:amenity=kindergarten
+    amenity=language_school: ES:Tag:amenity=language school
+    amenity=library: ES:Tag:amenity=library
     amenity=love_hotel: ES:Tag:amenity=love hotel
+    amenity=marketplace: ES:Tag:amenity=marketplace
+    amenity=mobile_library: ES:Tag:amenity=mobile library
+    amenity=music_school: ES:Tag:amenity=music school
     amenity=nightclub: ES:Tag:amenity=nightclub
     amenity=parking: ES:Tag:amenity=parking
+    amenity=parking_space: ES:Tag:amenity=parking space
+    amenity=payment_centre: ES:Tag:amenity=payment centre
     amenity=payment_terminal: ES:Tag:amenity=payment terminal
+    amenity=pharmacy: ES:Tag:amenity=pharmacy
+    amenity=photo_booth: ES:Tag:amenity=photo booth
+    amenity=place_of_worship: ES:Tag:amenity=place of worship
+    amenity=police: ES:Tag:amenity=police
+    amenity=prison_camp: ES:Tag:amenity=prison camp
+    amenity=pub: ES:Tag:amenity=pub
+    amenity=public_bookcase: ES:Tag:amenity=public bookcase
     amenity=public_building: ES:Tag:amenity=public building
     amenity=recycling: ES:Tag:amenity=recycling
+    amenity=refugee_housing: ES:Tag:amenity=refugee housing
     amenity=restaurant: ES:Tag:amenity=restaurant
+    amenity=school: ES:Tag:amenity=school
+    amenity=shelter: ES:Tag:amenity=shelter
+    amenity=shower: ES:Tag:amenity=shower
     amenity=stripclub: ES:Tag:amenity=stripclub
+    amenity=taxi: ES:Tag:amenity=taxi
+    amenity=theatre: ES:Tag:amenity=theatre
+    amenity=townhall: ES:Tag:amenity=townhall
     amenity=university: ES:Tag:amenity=university
+    amenity=vehicle_inspection: ES:Tag:amenity=vehicle inspection
+    amenity=vending_machine: ES:Tag:amenity=vending machine
     amenity=veterinary: ES:Tag:amenity=veterinary
+    amenity=waste_basket: ES:Tag:amenity=waste basket
     amenity=waste_disposal: ES:Tag:amenity=waste disposal
+    amenity=water_point: ES:Tag:amenity=water point
+    amenity=watering_place: ES:Tag:amenity=watering place
+    amenity=youth_centre: ES:Tag:amenity=youth centre
+    barrier=block: ES:Tag:barrier=block
+    barrier=bollard: ES:Tag:barrier=bollard
+    barrier=cable_barrier: ES:Tag:barrier=cable barrier
+    barrier=chain: ES:Tag:barrier=chain
+    barrier=entrance: ES:Tag:barrier=entrance
+    barrier=fence: ES:Tag:barrier=fence
+    barrier=gate: ES:Tag:barrier=gate
+    barrier=guard_rail: ES:Tag:barrier=guard rail
+    barrier=hedge: ES:Tag:barrier=hedge
+    barrier=jersey_barrier: ES:Tag:barrier=jersey barrier
+    barrier=kerb: ES:Tag:barrier=kerb
+    barrier=lift_gate: ES:Tag:barrier=lift gate
+    barrier=retaining_wall: ES:Tag:barrier=retaining wall
+    barrier=rope: ES:Tag:barrier=rope
+    barrier=swing_gate: ES:Tag:barrier=swing gate
+    barrier=wall: ES:Tag:barrier=wall
+    bicycle=use_sidepath: ES:Tag:bicycle=use sidepath
+    boundary=national_park: ES:Tag:boundary=national park
+    boundary=political: ES:Tag:boundary=political
+    boundary=protected_area: ES:Tag:boundary=protected area
+    boundary=regional_park: ES:Tag:boundary=regional park
+    bridge=aqueduct: ES:Tag:bridge=aqueduct
+    building=apartments: ES:Tag:building=apartments
+    building=barn: ES:Tag:building=barn
+    building=brewery: ES:Tag:building=brewery
+    building=bungalow: ES:Tag:building=bungalow
+    building=cathedral: ES:Tag:building=cathedral
+    building=chapel: ES:Tag:building=chapel
+    building=church: ES:Tag:building=church
+    building=civic: ES:Tag:building=civic
+    building=commercial: ES:Tag:building=commercial
+    building=construction: ES:Tag:building=construction
+    building=farm: ES:Tag:building=farm
+    building=garage: ES:Tag:building=garage
+    building=garages: ES:Tag:building=garages
+    building=grandstand: ES:Tag:building=grandstand
+    building=greenhouse: ES:Tag:building=greenhouse
+    building=hospital: ES:Tag:building=hospital
+    building=house: ES:Tag:building=house
+    building=hut: ES:Tag:building=hut
+    building=kiosk: ES:Tag:building=kiosk
+    building=office: ES:Tag:building=office
     building=public: ES:Tag:building=public
+    building=residential: ES:Tag:building=residential
+    building=retail: ES:Tag:building=retail
+    building=roof: ES:Tag:building=roof
+    building=ruins: ES:Tag:building=ruins
+    building=school: ES:Tag:building=school
+    building=shed: ES:Tag:building=shed
+    building=sty: ES:Tag:building=sty
+    building=university: ES:Tag:building=university
+    building=warehouse: ES:Tag:building=warehouse
+    cemetery=grave: ES:Tag:cemetery=grave
+    club=scout: ES:Tag:club=scout
+    craft=agricultural_engines: ES:Tag:craft=agricultural engines
+    craft=bakery: ES:Tag:craft=bakery
+    craft=beekeeper: ES:Tag:craft=beekeeper
+    craft=brewery: ES:Tag:craft=brewery
+    craft=clockmaker: ES:Tag:craft=clockmaker
+    craft=electrician: ES:Tag:craft=electrician
+    craft=handicraft: ES:Tag:craft=handicraft
+    craft=jeweller: ES:Tag:craft=jeweller
+    craft=oil_mill: ES:Tag:craft=oil mill
+    craft=optician: ES:Tag:craft=optician
+    craft=photographer: ES:Tag:craft=photographer
+    craft=plumber: ES:Tag:craft=plumber
+    craft=tiler: ES:Tag:craft=tiler
+    craft=watchmaker: ES:Tag:craft=watchmaker
+    cycleway=lane: ES:Tag:cycleway=lane
+    cycleway=share_busway: ES:Tag:cycleway=share busway
+    cycleway=track: ES:Tag:cycleway=track
+    emergency=ambulance_station: ES:Tag:emergency=ambulance station
     emergency=defibrillator: ES:Tag:emergency=defibrillator
     emergency=fire_extinguisher: ES:Tag:emergency=fire extinguisher
+    emergency=fire_hydrant: ES:Tag:emergency=fire hydrant
+    emergency=landing_site: ES:Tag:emergency=landing site
+    emergency=phone: ES:Tag:emergency=phone
+    emergency=ses_station: ES:Tag:emergency=ses station
+    footway=crossing: ES:Tag:footway=crossing
+    footway=sidewalk: ES:Tag:footway=sidewalk
+    generator:method=photovoltaic: ES:Tag:generator:method=photovoltaic
+    generator:method=thermal: ES:Tag:generator:method=thermal
+    generator:method=wind_turbine: ES:Tag:generator:method=wind turbine
+    generator:source=nuclear: ES:Tag:generator:source=nuclear
+    generator:source=solar: ES:Tag:generator:source=solar
+    generator:source=wind: ES:Tag:generator:source=wind
+    generator:type=horizontal_axis: ES:Tag:generator:type=horizontal axis
+    generator:type=solar_photovoltaic_panel: ES:Tag:generator:type=solar photovoltaic
+      panel
+    generator:type=solar_thermal_collector: ES:Tag:generator:type=solar thermal collector
+    generator:type=vertical_axis: ES:Tag:generator:type=vertical axis
+    geological=moraine: ES:Tag:geological=moraine
+    government=register_office: ES:Tag:government=register office
+    highway=bridleway: ES:Tag:highway=bridleway
+    highway=bus_guideway: ES:Tag:highway=bus guideway
     highway=bus_stop: ES:Tag:highway=bus stop
     highway=byway: ES:Tag:highway=byway
+    highway=corridor: ES:Tag:highway=corridor
+    highway=crossing: ES:Tag:highway=crossing
+    highway=cycleway: ES:Tag:highway=cycleway
+    highway=elevator: ES:Tag:highway=elevator
     highway=escape: ES:Tag:highway=escape
+    highway=footway: ES:Tag:highway=footway
     highway=living_street: ES:Tag:highway=living street
+    highway=milestone: ES:Tag:highway=milestone
     highway=motorway: ES:Tag:highway=motorway
     highway=motorway_junction: ES:Tag:highway=motorway junction
     highway=motorway_link: ES:Tag:highway=motorway link
+    highway=path: ES:Tag:highway=path
     highway=pedestrian: ES:Tag:highway=pedestrian
+    highway=platform: ES:Tag:highway=platform
+    highway=primary: ES:Tag:highway=primary
+    highway=raceway: ES:Tag:highway=raceway
     highway=residential: ES:Tag:highway=residential
+    highway=road: ES:Tag:highway=road
+    highway=secondary: ES:Tag:highway=secondary
+    highway=service: ES:Tag:highway=service
+    highway=speed_display: ES:Tag:highway=speed display
+    highway=steps: ES:Tag:highway=steps
     highway=stop: ES:Tag:highway=stop
+    highway=street_lamp: ES:Tag:highway=street lamp
+    highway=tertiary: ES:Tag:highway=tertiary
+    highway=track: ES:Tag:highway=track
+    highway=traffic_signals: ES:Tag:highway=traffic signals
+    highway=trunk: ES:Tag:highway=trunk
+    highway=turning_circle: ES:Tag:highway=turning circle
+    highway=turning_loop: ES:Tag:highway=turning loop
+    highway=unclassified: ES:Tag:highway=unclassified
+    historic=farm: ES:Tag:historic=farm
+    historic=heritage: ES:Tag:historic=heritage
+    historic=memorial: ES:Tag:historic=memorial
+    historic=milestone: ES:Tag:historic=milestone
+    historic=pillory: ES:Tag:historic=pillory
+    historic=ruins: ES:Tag:historic=ruins
+    historic=tomb: ES:Tag:historic=tomb
+    historic=wayside_shrine: ES:Tag:historic=wayside shrine
+    information=board: ES:Tag:information=board
+    information=guidepost: ES:Tag:information=guidepost
+    information=map: ES:Tag:information=map
+    information=tactile_map: ES:Tag:information=tactile map
+    internet_access=wlan: ES:Tag:internet access=wlan
     junction=roundabout: ES:Tag:junction=roundabout
+    landcover=grass: ES:Tag:landcover=grass
+    landcover=trees: ES:Tag:landcover=trees
     landuse=allotments: ES:Tag:landuse=allotments
+    landuse=apiary: ES:Tag:landuse=apiary
+    landuse=basin: ES:Tag:landuse=basin
+    landuse=brownfield: ES:Tag:landuse=brownfield
+    landuse=cemetery: ES:Tag:landuse=cemetery
+    landuse=construction: ES:Tag:landuse=construction
+    landuse=depot: ES:Tag:landuse=depot
+    landuse=farmland: ES:Tag:landuse=farmland
+    landuse=forest: ES:Tag:landuse=forest
+    landuse=garages: ES:Tag:landuse=garages
+    landuse=grass: ES:Tag:landuse=grass
+    landuse=greenfield: ES:Tag:landuse=greenfield
+    landuse=greenhouse_horticulture: ES:Tag:landuse=greenhouse horticulture
     landuse=industrial: ES:Tag:landuse=industrial
+    landuse=landfill: ES:Tag:landuse=landfill
+    landuse=meadow: ES:Tag:landuse=meadow
+    landuse=orchard: ES:Tag:landuse=orchard
+    landuse=quarry: ES:Tag:landuse=quarry
+    landuse=recreation_ground: ES:Tag:landuse=recreation ground
+    landuse=reservoir: ES:Tag:landuse=reservoir
+    landuse=residential: ES:Tag:landuse=residential
+    landuse=salt_pond: ES:Tag:landuse=salt pond
+    landuse=traffic_island: ES:Tag:landuse=traffic island
+    landuse=village_green: ES:Tag:landuse=village green
+    leaf_cycle=evergreen: ES:Tag:leaf cycle=evergreen
+    leaf_type=broadleaved: ES:Tag:leaf type=broadleaved
+    leaf_type=leafless: ES:Tag:leaf type=leafless
+    leaf_type=mixed: ES:Tag:leaf type=mixed
+    leaf_type=needleleaved: ES:Tag:leaf type=needleleaved
+    leisure=bandstand: ES:Tag:leisure=bandstand
+    leisure=bird_hide: ES:Tag:leisure=bird hide
+    leisure=bleachers: ES:Tag:leisure=bleachers
+    leisure=common: ES:Tag:leisure=common
+    leisure=dog_park: ES:Tag:leisure=dog park
+    leisure=firepit: ES:Tag:leisure=firepit
+    leisure=fitness_centre: ES:Tag:leisure=fitness centre
+    leisure=fitness_station: ES:Tag:leisure=fitness station
+    leisure=garden: ES:Tag:leisure=garden
+    leisure=golf_course: ES:Tag:leisure=golf course
+    leisure=horse_riding: ES:Tag:leisure=horse riding
+    leisure=marina: ES:Tag:leisure=marina
+    leisure=miniature_golf: ES:Tag:leisure=miniature golf
     leisure=nature_reserve: ES:Tag:leisure=nature reserve
+    leisure=park: ES:Tag:leisure=park
+    leisure=picnic_table: ES:Tag:leisure=picnic table
+    leisure=pitch: ES:Tag:leisure=pitch
     leisure=playground: ES:Tag:leisure=playground
+    leisure=sports_centre: ES:Tag:leisure=sports centre
     leisure=water_park: ES:Tag:leisure=water park
+    man_made=adit: ES:Tag:man made=adit
+    man_made=archimedes_screw: ES:Tag:man made=archimedes screw
+    man_made=beehive: ES:Tag:man made=beehive
+    man_made=bridge: ES:Tag:man made=bridge
+    man_made=cross: ES:Tag:man made=cross
+    man_made=cutline: ES:Tag:man made=cutline
+    man_made=embankment: ES:Tag:man made=embankment
+    man_made=flagpole: ES:Tag:man made=flagpole
+    man_made=mast: ES:Tag:man made=mast
+    man_made=monitoring_station: ES:Tag:man made=monitoring station
+    man_made=nesting_site: ES:Tag:man made=nesting site
     man_made=pier: ES:Tag:man made=pier
+    man_made=power_wind: ES:Tag:man made=power wind
+    man_made=pumping_rig: ES:Tag:man made=pumping rig
+    man_made=pumping_station: ES:Tag:man made=pumping station
+    man_made=reservoir_covered: ES:Tag:man made=reservoir covered
+    man_made=storage_tank: ES:Tag:man made=storage tank
+    man_made=survey_point: ES:Tag:man made=survey point
+    man_made=wastewater_plant: ES:Tag:man made=wastewater plant
+    man_made=water_tap: ES:Tag:man made=water tap
+    man_made=water_tower: ES:Tag:man made=water tower
+    man_made=water_well: ES:Tag:man made=water well
+    man_made=water_works: ES:Tag:man made=water works
+    man_made=watermill: ES:Tag:man made=watermill
+    man_made=wildlife_opening: ES:Tag:man made=wildlife opening
+    man_made=windpump: ES:Tag:man made=windpump
+    memorial=blue_plaque: ES:Tag:memorial=blue plaque
+    memorial=bust: ES:Tag:memorial=bust
+    memorial=obelisk: ES:Tag:memorial=obelisk
+    memorial=plaque: ES:Tag:memorial=plaque
+    memorial=statue: ES:Tag:memorial=statue
+    memorial=stele: ES:Tag:memorial=stele
+    memorial=stolperstein: ES:Tag:memorial=stolperstein
+    memorial=stone: ES:Tag:memorial=stone
+    memorial=war_memorial: ES:Tag:memorial=war memorial
+    military=naval_base: ES:Tag:military=naval base
+    military=training_area: ES:Tag:military=training area
+    name=Dollarama: ES:Tag:name=Dollarama
     natural=arete: ES:Tag:natural=arete
+    natural=bare_rock: ES:Tag:natural=bare rock
+    natural=bay: ES:Tag:natural=bay
     natural=beach: ES:Tag:natural=beach
     natural=cave_entrance: ES:Tag:natural=cave entrance
+    natural=cliff: ES:Tag:natural=cliff
+    natural=coastline: ES:Tag:natural=coastline
+    natural=fell: ES:Tag:natural=fell
+    natural=geyser: ES:Tag:natural=geyser
     natural=glacier: ES:Tag:natural=glacier
+    natural=grassland: ES:Tag:natural=grassland
+    natural=heath: ES:Tag:natural=heath
     natural=moor: ES:Tag:natural=moor
     natural=mud: ES:Tag:natural=mud
+    natural=peak: ES:Tag:natural=peak
+    natural=ridge: ES:Tag:natural=ridge
     natural=rock: ES:Tag:natural=rock
     natural=saddle: ES:Tag:natural=saddle
     natural=sand: ES:Tag:natural=sand
+    natural=scree: ES:Tag:natural=scree
+    natural=scrub: ES:Tag:natural=scrub
+    natural=shingle: ES:Tag:natural=shingle
     natural=sinkhole: ES:Tag:natural=sinkhole
+    natural=spring: ES:Tag:natural=spring
+    natural=stone: ES:Tag:natural=stone
     natural=tree: ES:Tag:natural=tree
+    natural=tree_row: ES:Tag:natural=tree row
+    natural=valley: ES:Tag:natural=valley
+    natural=volcano: ES:Tag:natural=volcano
     natural=water: ES:Tag:natural=water
+    natural=wetland: ES:Tag:natural=wetland
+    natural=wood: ES:Tag:natural=wood
+    office=advertising_agency: ES:Tag:office=advertising agency
+    office=association: ES:Tag:office=association
+    office=company: ES:Tag:office=company
+    office=foundation: ES:Tag:office=foundation
+    office=government: ES:Tag:office=government
+    office=insurance: ES:Tag:office=insurance
+    office=lawyer: ES:Tag:office=lawyer
+    office=logistics: ES:Tag:office=logistics
+    office=moving_company: ES:Tag:office=moving company
+    office=newspaper: ES:Tag:office=newspaper
+    office=ngo: ES:Tag:office=ngo
+    office=notary: ES:Tag:office=notary
+    office=occupational_safety: ES:Tag:office=occupational safety
+    office=private_investigator: ES:Tag:office=private investigator
+    office=quango: ES:Tag:office=quango
+    office=religion: ES:Tag:office=religion
+    office=research: ES:Tag:office=research
+    office=tax: ES:Tag:office=tax
+    office=therapist: ES:Tag:office=therapist
+    passenger=yes: ES:Tag:passenger=yes
+    place=borough: ES:Tag:place=borough
+    place=city: ES:Tag:place=city
+    place=city_block: ES:Tag:place=city block
+    place=hamlet: ES:Tag:place=hamlet
+    place=island: ES:Tag:place=island
+    place=islet: ES:Tag:place=islet
+    place=neighbourhood: ES:Tag:place=neighbourhood
+    place=plot: ES:Tag:place=plot
+    place=square: ES:Tag:place=square
+    place=suburb: ES:Tag:place=suburb
     place=village: ES:Tag:place=village
+    power=generator: ES:Tag:power=generator
+    power=heliostat: ES:Tag:power=heliostat
     power=pole: ES:Tag:power=pole
     power=tower: ES:Tag:power=tower
     public_transport=platform: ES:Tag:public transport=platform
+    public_transport=station: ES:Tag:public transport=station
     public_transport=stop_area: ES:Tag:public transport=stop area
     public_transport=stop_position: ES:Tag:public transport=stop position
+    pump=manual: ES:Tag:pump=manual
+    pump=no: ES:Tag:pump=no
+    pump=powered: ES:Tag:pump=powered
+    railway=crossing: ES:Tag:railway=crossing
+    railway=disused: ES:Tag:railway=disused
     railway=level_crossing: ES:Tag:railway=level crossing
+    railway=milestone: ES:Tag:railway=milestone
+    railway=narrow_gauge: ES:Tag:railway=narrow gauge
+    railway=subway: ES:Tag:railway=subway
+    railway=subway_entrance: ES:Tag:railway=subway entrance
+    railway=yard: ES:Tag:railway=yard
+    route=bus: ES:Tag:route=bus
+    service=crossover: ES:Tag:service=crossover
+    service=parking_aisle: ES:Tag:service=parking aisle
     shop=alcohol: ES:Tag:shop=alcohol
+    shop=baby_goods: ES:Tag:shop=baby goods
     shop=bakery: ES:Tag:shop=bakery
     shop=bed: ES:Tag:shop=bed
+    shop=beverages: ES:Tag:shop=beverages
+    shop=bicycle: ES:Tag:shop=bicycle
+    shop=bookmaker: ES:Tag:shop=bookmaker
+    shop=books: ES:Tag:shop=books
     shop=butcher: ES:Tag:shop=butcher
+    shop=car_parts: ES:Tag:shop=car parts
+    shop=car_repair: ES:Tag:shop=car repair
+    shop=chocolate: ES:Tag:shop=chocolate
+    shop=clothes: ES:Tag:shop=clothes
+    shop=collector: ES:Tag:shop=collector
     shop=computer: ES:Tag:shop=computer
     shop=confectionery: ES:Tag:shop=confectionery
+    shop=convenience: ES:Tag:shop=convenience
+    shop=copyshop: ES:Tag:shop=copyshop
+    shop=craft: ES:Tag:shop=craft
+    shop=doityourself: ES:Tag:shop=doityourself
+    shop=electrical: ES:Tag:shop=electrical
+    shop=florist: ES:Tag:shop=florist
+    shop=funeral_directors: ES:Tag:shop=funeral directors
+    shop=games: ES:Tag:shop=games
+    shop=garden_centre: ES:Tag:shop=garden centre
+    shop=gift: ES:Tag:shop=gift
+    shop=greengrocer: ES:Tag:shop=greengrocer
+    shop=hairdresser: ES:Tag:shop=hairdresser
     shop=hardware: ES:Tag:shop=hardware
+    shop=hearing_aids: ES:Tag:shop=hearing aids
+    shop=houseware: ES:Tag:shop=houseware
+    shop=ice_cream: ES:Tag:shop=ice cream
+    shop=jewelry: ES:Tag:shop=jewelry
+    shop=kiosk: ES:Tag:shop=kiosk
+    shop=laundry: ES:Tag:shop=laundry
     shop=locksmith: ES:Tag:shop=locksmith
     shop=lottery: ES:Tag:shop=lottery
+    shop=model: ES:Tag:shop=model
+    shop=motorcycle: ES:Tag:shop=motorcycle
+    shop=optician: ES:Tag:shop=optician
+    shop=outdoor: ES:Tag:shop=outdoor
     shop=paint: ES:Tag:shop=paint
+    shop=party: ES:Tag:shop=party
+    shop=pastry: ES:Tag:shop=pastry
+    shop=pawnbroker: ES:Tag:shop=pawnbroker
     shop=pet: ES:Tag:shop=pet
     shop=seafood: ES:Tag:shop=seafood
+    shop=shoes: ES:Tag:shop=shoes
+    shop=sports: ES:Tag:shop=sports
     shop=stationery: ES:Tag:shop=stationery
     shop=tattoo: ES:Tag:shop=tattoo
+    shop=tea: ES:Tag:shop=tea
+    shop=ticket: ES:Tag:shop=ticket
+    shop=tiles: ES:Tag:shop=tiles
+    shop=toys: ES:Tag:shop=toys
     shop=trade: ES:Tag:shop=trade
+    shop=tyres: ES:Tag:shop=tyres
+    shop=variety_store: ES:Tag:shop=variety store
+    shop=video_games: ES:Tag:shop=video games
+    shop=watches: ES:Tag:shop=watches
+    shop=water: ES:Tag:shop=water
+    shop=window_blind: ES:Tag:shop=window blind
+    social_facility=clothing_bank: ES:Tag:social facility=clothing bank
+    source:geometry=Bing: ES:Tag:source:geometry=Bing
+    sport=boules: ES:Tag:sport=boules
+    sport=cycling: ES:Tag:sport=cycling
+    sport=equestrian: ES:Tag:sport=equestrian
+    sport=futsal: ES:Tag:sport=futsal
+    sport=model_aerodrome: ES:Tag:sport=model aerodrome
+    sport=motocross: ES:Tag:sport=motocross
+    sport=shooting: ES:Tag:sport=shooting
+    sport=soccer: ES:Tag:sport=soccer
     tourism=alpine_hut: ES:Tag:tourism=alpine hut
+    tourism=apartment: ES:Tag:tourism=apartment
     tourism=artwork: ES:Tag:tourism=artwork
+    tourism=attraction: ES:Tag:tourism=attraction
     tourism=camp_site: ES:Tag:tourism=camp site
+    tourism=hotel: ES:Tag:tourism=hotel
     tourism=motel: ES:Tag:tourism=motel
+    tourism=picnic_site: ES:Tag:tourism=picnic site
+    tourism=trail_riding_station: ES:Tag:tourism=trail riding station
+    tourism=viewpoint: ES:Tag:tourism=viewpoint
+    traffic_calming=island: ES:Tag:traffic calming=island
+    tunnel=culvert: ES:Tag:tunnel=culvert
+    type=public_transport: ES:Tag:type=public transport
+    vending=bread: ES:Tag:vending=bread
+    vending=excrement_bags: ES:Tag:vending=excrement bags
+    vending=flowers: ES:Tag:vending=flowers
+    vending=ice_cream: ES:Tag:vending=ice cream
+    vending=milk: ES:Tag:vending=milk
+    vending=parking_tickets: ES:Tag:vending=parking tickets
+    wall=dry_stone: ES:Tag:wall=dry stone
+    water=reservoir: ES:Tag:water=reservoir
+    waterway=dam: ES:Tag:waterway=dam
+    waterway=ditch: ES:Tag:waterway=ditch
+    waterway=milestone: ES:Tag:waterway=milestone
+    waterway=river: ES:Tag:waterway=river
     waterway=riverbank: ES:Tag:waterway=riverbank
+    waterway=stream: ES:Tag:waterway=stream
+    waterway=water_point: ES:Tag:waterway=water point
+    waterway=weir: ES:Tag:waterway=weir
+    wetland=tidalflat: ES:Tag:wetland=tidalflat
 et:
   key:
     addr: Et:Key:addr
@@ -4624,8 +9025,15 @@ et:
     amenity=library: Et:Tag:amenity=library
     amenity=taxi: Et:Tag:amenity=taxi
     building=roof: Et:Tag:building=roof
+fa:
+  key:
+    highway: Fa:Key:highway
+    name: FA:Key:name
+  tag:
+    amenity=fountain: Fa:Tag:amenity=fountain
 fi:
   key:
+    addr: Fi:Key:addr
     amenity: Fi:Key:amenity
     bicycle_parking: Fi:Key:bicycle parking
     bridge: Fi:Key:bridge
@@ -4634,6 +9042,7 @@ fi:
     disused: Fi:Key:disused
     ele: Fi:Key:ele
     embankment: Fi:Key:embankment
+    entrance: Fi:Key:entrance
     hazmat: Fi:Key:hazmat
     lanes: Fi:Key:lanes
     layer: Fi:Key:layer
@@ -4732,11 +9141,15 @@ fr:
     addr:housenumber: FR:Key:addr:housenumber
     addr:place: FR:Key:addr:place
     addr:street: FR:Key:addr:street
+    addr:suburb: FR:Key:addr:suburb
     advertising: FR:Key:advertising
     aeroway: FR:Key:aeroway
     alt_name: FR:Key:alt name
     amenity: FR:Key:amenity
+    animated: FR:Key:animated
     area: FR:Key:area
+    artwork_type: FR:Key:artwork type
+    backrest: FR:Key:backrest
     backward: FR:Key:backward
     barrier: FR:Key:barrier
     basin: FR:Key:basin
@@ -4747,14 +9160,19 @@ fr:
     bollard: FR:Key:bollard
     books: FR:Key:books
     boundary: FR:Key:boundary
+    brand: FR:Key:brand
+    brewery: FR:Key:brewery
     bridge: FR:Key:bridge
     bridge:movable: FR:Key:bridge:movable
     building: FR:Key:building
     building:levels: FR:Key:building:levels
+    building:material: FR:Key:building:material
     building:part: FR:Key:building:part
+    bulk_purchase: FR:Key:bulk purchase
     bus: FR:Key:bus
     capacity: FR:Key:capacity
     capacity:disabled: FR:Key:capacity:disabled
+    class:bicycle:commute: FR:Key:class:bicycle:commute
     clothes: FR:Key:clothes
     collection_times: FR:Key:collection times
     color: FR:Key:color
@@ -4772,6 +9190,8 @@ fr:
     craft: FR:Key:craft
     crop: FR:Key:crop
     crossing: FR:Key:crossing
+    cuisine: FR:Key:cuisine
+    currency: FR:Key:currency
     cutting: FR:Key:cutting
     cycleway: FR:Key:cycleway
     delivery: FR:Key:delivery
@@ -4780,8 +9200,11 @@ fr:
     designation: FR:Key:designation
     destination: FR:Key:destination
     diet:*: FR:Key:diet:*
+    diplomatic: FR:Key:diplomatic
+    direction: FR:Key:direction
     dispensing: FR:Key:dispensing
     distance: FR:Key:distance
+    'disused:': 'FR:Key:disused:'
     door: FR:Key:door
     drink: FR:Key:drink
     ele: FR:Key:ele
@@ -4793,6 +9216,7 @@ fr:
     est_width: FR:Key:est width
     fax: FR:Key:fax
     fee: FR:Key:fee
+    fishing: FR:Key:fishing
     fixme: FR:Key:fixme
     flood_prone: FR:Key:flood prone
     foot: FR:Key:foot
@@ -4800,17 +9224,30 @@ fr:
     ford: FR:Key:ford
     format: FR:Key:format
     forward: FR:Key:forward
+    garden:style: FR:Key:garden:style
+    garden:type: FR:Key:garden:type
     generator:method: FR:Key:generator:method
     generator:output: FR:Key:generator:output
+    generator:output:battery_charging: FR:Key:generator:output:battery charging
+    generator:output:cold_air: FR:Key:generator:output:cold air
+    generator:output:cold_water: FR:Key:generator:output:cold water
+    generator:output:compressed_air: FR:Key:generator:output:compressed air
     generator:output:electricity: FR:Key:generator:output:electricity
+    generator:output:heat: FR:Key:generator:output:heat
     generator:output:hot_air: FR:Key:generator:output:hot air
     generator:output:hot_water: FR:Key:generator:output:hot water
     generator:output:steam: FR:Key:generator:output:steam
+    generator:output:vacuum: FR:Key:generator:output:vacuum
+    generator:plant: FR:Key:generator:plant
     generator:source: FR:Key:generator:source
     geological: FR:Key:geological
+    healthcare: FR:Key:healthcare
     height: FR:Key:height
+    heritage: FR:Key:heritage
+    high_water_mark: FR:Key:high water mark
     highway: FR:Key:highway
     historic: FR:Key:historic
+    historic:civilization: FR:Key:historic:civilization
     hov: FR:Key:hov
     incline: FR:Key:incline
     information: FR:Key:information
@@ -4818,11 +9255,13 @@ fr:
     int_name: FR:Key:int name
     intermittent: FR:Key:intermittent
     junction: FR:Key:junction
+    kindergarten:FR: FR:Key:kindergarten:FR
     landuse: FR:Key:landuse
     lanes: FR:Key:lanes
     layer: FR:Key:layer
     leaf_type: FR:Key:leaf type
     left: FR:Key:left
+    legal_type: FR:Key:legal type
     leisure: FR:Key:leisure
     length: FR:Key:length
     level: FR:Key:level
@@ -4832,6 +9271,7 @@ fr:
     lock_name: FR:Key:lock name
     lock_ref: FR:Key:lock ref
     man_made: FR:Key:man made
+    manhole: FR:Key:manhole
     manufacturer: FR:Key:manufacturer
     max_age: FR:Key:max age
     maxage: FR:Key:maxage
@@ -4844,9 +9284,11 @@ fr:
     maxweight: FR:Key:maxweight
     maxwidth: FR:Key:maxwidth
     memorial: FR:Key:memorial
+    message: FR:Key:message
     military: FR:Key:military
     min_age: FR:Key:min age
     minage: FR:Key:minage
+    monitoring:meteoric_activity: FR:Key:monitoring:meteoric activity
     mooring: FR:Key:mooring
     motorboat: FR:Key:motorboat
     mountain_pass: FR:Key:mountain pass
@@ -4855,6 +9297,7 @@ fr:
     nat_name: FR:Key:nat name
     natural: FR:Key:natural
     network: FR:Key:network
+    noexit: FR:Key:noexit
     noname: FR:Key:noname
     note: FR:Key:note
     office: FR:Key:office
@@ -4864,15 +9307,20 @@ fr:
     oneway:bicycle: FR:Key:oneway:bicycle
     opening_hours: FR:Key:opening hours
     operator: FR:Key:operator
+    operator:type: FR:Key:operator:type
+    outdoor_seating: FR:Key:outdoor seating
     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
+    permanent: FR:Key:permanent
     phone: FR:Key:phone
     place: FR:Key:place
     place:fr: FR:Key:place:fr
+    plant:output: FR:Key:plant:output
     playground: FR:Key:playground
+    post_box:type: FR:Key:post box:type
     post_office:type: FR:Key:post office:type
     power: FR:Key:power
     power_supply: FR:Key:power supply
@@ -4884,18 +9332,26 @@ fr:
     public_transport: FR:Key:public transport
     pump: FR:Key:pump
     railway: FR:Key:railway
+    railway:track_ref: FR:Key:railway:track ref
     ref: FR:Key:ref
     ref:CEF: FR:Key:ref:CEF
     ref:ERDF:gdo: FR:Key:ref:ERDF:gdo
     ref:FR:42C: FR:Key:ref:FR:42C
+    ref:FR:ARCEP: FR:Key:ref:FR:ARCEP
+    ref:FR:CEF: FR:Key:ref:FR:CEF
     ref:FR:FANTOIR: FR:Key:ref:FR:FANTOIR
     ref:FR:FINESS: FR:Key:ref:FR:FINESS
     ref:FR:MemorialGenWeb: FR:Key:ref:FR:MemorialGenWeb
     ref:FR:NAF: FR:Key:ref:FR:NAF
+    ref:FR:Orange: FR:Key:ref:FR:Orange
+    ref:FR:PTT: FR:Key:ref:FR:PTT
+    ref:FR:RTE: FR:Key:ref:FR:RTE
+    ref:FR:RTE_nom: FR:Key:ref:FR:RTE nom
     ref:FR:SIREN: FR:Key:ref:FR:SIREN
     ref:FR:SIRET: FR:Key:ref:FR:SIRET
     ref:FR:commune: FR:Key:ref:FR:commune
     ref:INSEE: FR:Key:ref:INSEE
+    ref:RTE:codnat: FR:Key:ref:RTE:codnat
     ref:UAI: FR:Key:ref:UAI
     ref:mhs: FR:Key:ref:mhs
     ref:sandre: FR:Key:ref:sandre
@@ -4904,7 +9360,11 @@ fr:
     repeat_on: FR:Key:repeat on
     resource: FR:Key:resource
     right: FR:Key:right
+    roof:material: FR:Key:roof:material
+    ruins: FR:Key:ruins
     sac_scale: FR:Key:sac scale
+    salt: FR:Key:salt
+    sanitary_dump_station: FR:Key:sanitary dump station
     seamark:fixme: FR:Key:seamark:fixme
     second_hand: FR:Key:second hand
     segregated: FR:Key:segregated
@@ -4912,22 +9372,34 @@ fr:
     shelter_type: FR:Key:shelter type
     shop: FR:Key:shop
     short_name: FR:Key:short name
+    sides: FR:Key:sides
+    sinkhole: FR:Key:sinkhole
+    size: FR:Key:size
     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
+    species: FR:Key:species
+    species:fr: FR:Key:species:fr
     sport: FR:Key:sport
+    step:condition: FR:Key:step:condition
+    step:contrast: FR:Key:step:contrast
+    step_count: FR:Key:step count
     surface: FR:Key:surface
     surveillance: FR:Key:surveillance
+    switch: FR:Key:switch
     tactile_paving: FR:Key:tactile paving
     takeaway: FR:Key:takeaway
+    tidal: FR:Key:tidal
     timezone: FR:Key:timezone
+    toilets:wheelchair: FR:Key:toilets:wheelchair
     toll: FR:Key:toll
     tourism: FR:Key:tourism
     tracktype: FR:Key:tracktype
     traffic_calming: FR:Key:traffic calming
     traffic_sign: FR:Key:traffic sign
+    traffic_signals:direction: FR:Key:traffic signals:direction
     trail_visibility: FR:Key:trail visibility
     trees: FR:Key:trees
     tunnel: FR:Key:tunnel
@@ -4937,51 +9409,78 @@ fr:
     type: FR:Key:type
     type:FR:FINESS: FR:Key:type:FR:FINESS
     url: FR:Key:url
+    usage: FR:Key:usage
+    visibility: FR:Key:visibility
     voltage: FR:Key:voltage
     waste: FR:Key:waste
     water: FR:Key:water
     waterway: FR:Key:waterway
     website: FR:Key:website
+    wetland: FR:Key:wetland
     wheelchair: FR:Key:wheelchair
     width: FR:Key:width
     wikidata: FR:Key:wikidata
+    wikimedia_commons: FR:Key:wikimedia commons
     wikipedia: FR:Key:wikipedia
+    xmas:feature: FR:Key:xmas:feature
   tag:
+    Bascule_publique: FR:Tag:Bascule publique
     FIXME=Position_estimated: FR:Tag:FIXME=Position estimated
     abandoned=yes: FR:Tag:abandoned=yes
     access=private: FR:Tag:access=private
+    advertising=billboard: FR:Tag:advertising=billboard
+    advertising=board: FR:Tag:advertising=board
+    advertising=column: FR:Tag:advertising=column
+    advertising=flag: FR:Tag:advertising=flag
+    advertising=poster_box: FR:Tag:advertising=poster box
+    advertising=totem: FR:Tag:advertising=totem
     aerialway=cable_car: FR:Tag:aerialway=cable car
     aerialway=chair_lift: FR:Tag:aerialway=chair lift
+    aeroway=aerodrome: FR:Tag:aeroway=aerodrome
     aeroway=helipad: FR:Tag:aeroway=helipad
     aeroway=runway: FR:Tag:aeroway=runway
     amenity=animal_boarding: FR:Tag:amenity=animal boarding
     amenity=animal_breeding: FR:Tag:amenity=animal breeding
     amenity=animal_shelter: FR:Tag:amenity=animal shelter
+    amenity=arts_centre: FR:Tag:amenity=arts centre
     amenity=atm: FR:Tag:amenity=atm
+    amenity=bank: FR:Tag:amenity=bank
     amenity=bench: FR:Tag:amenity=bench
     amenity=bicycle_parking: FR:Tag:amenity=bicycle parking
     amenity=bicycle_rental: FR:Tag:amenity=bicycle rental
+    amenity=biergarten: FR:Tag:amenity=biergarten
     amenity=cafe: FR:Tag:amenity=cafe
     amenity=car_rental: FR:Tag:amenity=car rental
     amenity=car_sharing: FR:Tag:amenity=car sharing
+    amenity=charging_station: FR:Tag:amenity=charging station
+    amenity=cinema: FR:Tag:amenity=cinema
+    amenity=clinic: FR:Tag:amenity=clinic
     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=courthouse: FR:Tag:amenity=courthouse
     amenity=coworking_space: FR:Tag:amenity=coworking space
     amenity=crematorium: FR:Tag:amenity=crematorium
     amenity=crypt: FR:Tag:amenity=crypt
+    amenity=dentist: FR:Tag:amenity=dentist
+    amenity=doctors: FR:Tag:amenity=doctors
     amenity=drinking_water: FR:Tag:amenity=drinking water
     amenity=embassy: FR:Tag:amenity=embassy
+    amenity=fast_food: FR:Tag:amenity=fast food
     amenity=fire_station: FR:Tag:amenity=fire station
+    amenity=food_court: FR:Tag:amenity=food court
     amenity=fountain: FR:Tag:amenity=fountain
     amenity=fuel: FR:Tag:amenity=fuel
     amenity=grave_yard: FR:Tag:amenity=grave yard
     amenity=hospital: FR:Tag:amenity=hospital
+    amenity=hunting_stand: FR:Tag:amenity=hunting stand
     amenity=kindergarten: FR:Tag:amenity=kindergarten
+    amenity=letter_box: FR:Tag:amenity=letter box
     amenity=library: FR:Tag:amenity=library
     amenity=marketplace: FR:Tag:amenity=marketplace
     amenity=motorcycle_parking: FR:Tag:amenity=motorcycle parking
+    amenity=nightclub: FR:Tag:amenity=nightclub
     amenity=parking: FR:Tag:amenity=parking
     amenity=parking_space: FR:Tag:amenity=parking space
     amenity=pharmacy: FR:Tag:amenity=pharmacy
@@ -4989,46 +9488,83 @@ fr:
     amenity=place_of_worship: FR:Tag:amenity=place of worship
     amenity=planetarium: FR:Tag:amenity=planetarium
     amenity=police: FR:Tag:amenity=police
+    amenity=post_box: FR:Tag:amenity=post box
     amenity=post_office: FR:Tag:amenity=post office
+    amenity=prison: FR:Tag:amenity=prison
+    amenity=pub: FR:Tag:amenity=pub
     amenity=public_bookcase: FR:Tag:amenity=public bookcase
     amenity=recycling: FR:Tag:amenity=recycling
     amenity=restaurant: FR:Tag:amenity=restaurant
+    amenity=sanitary_dump_station: FR:Tag:amenity=sanitary dump station
     amenity=school: FR:Tag:amenity=school
     amenity=shelter: FR:Tag:amenity=shelter
     amenity=social_centre: FR:Tag:amenity=social centre
     amenity=social_facility: FR:Tag:amenity=social facility
     amenity=taxi: FR:Tag:amenity=taxi
     amenity=telephone: FR:Tag:amenity=telephone
+    amenity=theatre: FR:Tag:amenity=theatre
     amenity=toilets: FR:Tag:amenity=toilets
     amenity=townhall: FR:Tag:amenity=townhall
     amenity=university: FR:Tag:amenity=university
+    amenity=vacuum_cleaner: FR:Tag:amenity=vacuum cleaner
+    amenity=vending_machine: FR:Tag:amenity=vending machine
     amenity=veterinary: FR:Tag:amenity=veterinary
     amenity=waste_basket: FR:Tag:amenity=waste basket
     amenity=waste_disposal: FR:Tag:amenity=waste disposal
+    amenity=weighbridge: FR:Tag:amenity=weighbridge
+    barrier=block: FR:Tag:barrier=block
     barrier=bollard: FR:Tag:barrier=bollard
     barrier=city_wall: FR:Tag:barrier=city wall
     barrier=cycle_barrier: FR:Tag:barrier=cycle barrier
     barrier=gate: FR:Tag:barrier=gate
     barrier=hedge: FR:Tag:barrier=hedge
+    barrier=lift_gate: FR:Tag:barrier=lift gate
     barrier=retaining_wall: FR:Tag:barrier=retaining wall
+    barrier=select_acces: FR:Tag:barrier=select acces
     barrier=wall: FR:Tag:barrier=wall
+    brand=Trilib': FR:Tag:brand=Trilib'
+    building=apartments: FR:Tag:building=apartments
+    building=barn: FR:Tag:building=barn
+    building=cabin: FR:Tag:building=cabin
+    building=commercial: FR:Tag:building=commercial
+    building=farm: FR:Tag:building=farm
     building=garage: FR:Tag:building=garage
     building=garages: FR:Tag:building=garages
+    building=greenhouse: FR:Tag:building=greenhouse
     building=hangar: FR:Tag:building=hangar
+    building=hotel: FR:Tag:building=hotel
     building=house: FR:Tag:building=house
+    building=hut: FR:Tag:building=hut
+    building=kiosk: FR:Tag:building=kiosk
     building=public: FR:Tag:building=public
+    building=residential: FR:Tag:building=residential
     building=roof: FR:Tag:building=roof
     building=ruins: FR:Tag:building=ruins
+    building=shed: FR:Tag:building=shed
+    building=stable: FR:Tag:building=stable
+    building=stadium: FR:Tag:building=stadium
     building=sty: FR:Tag:building=sty
+    building=terrace: FR:Tag:building=terrace
+    building=warehouse: FR:Tag:building=warehouse
+    construction=yes: FR:Tag:construction=yes
     craft=beekeeper: FR:Tag:craft=beekeeper
+    craft=brewery: FR:Tag:craft=brewery
+    craft=builder: FR:Tag:craft=builder
+    craft=cabinet_maker: FR:Tag:craft=cabinet maker
     craft=car_repair: FR:Tag:craft=car repair
+    craft=joiner: FR:Tag:craft=joiner
+    cuisine=coffee_shop: FR:Tag:cuisine=coffee shop
     cycleway=asl: FR:Tag:cycleway=asl
     cycleway=bike_box: FR:Tag:cycleway=bike box
+    cycleway=opposite: FR:Tag:cycleway=opposite
+    cycleway=opposite_lane: FR:Tag:cycleway=opposite lane
     disused=yes: FR:Tag:disused=yes
     emergency=aed: FR:Tag:emergency=aed
     emergency=defibrillator: FR:Tag:emergency=defibrillator
+    emergency=fire_extinguisher: FR:Tag:emergency=fire extinguisher
     emergency=fire_hydrant: FR:Tag:emergency=fire hydrant
     emergency=phone: FR:Tag:emergency=phone
+    emergency=water_rescue_station: FR:Tag:emergency=water rescue station
     footway=sidewalk: FR:Tag:footway=sidewalk
     generator:method=combustion: FR:Tag:generator:method=combustion
     generator:method=fission: FR:Tag:generator:method=fission
@@ -5047,12 +9583,14 @@ fr:
     generator:source=solar: FR:Tag:generator:source=solar
     generator:source=tidal: FR:Tag:generator:source=tidal
     generator:source=wind: FR:Tag:generator:source=wind
+    highway=bridleway: FR:Tag:highway=bridleway
     highway=bus_guideway: FR:Tag:highway=bus guideway
     highway=bus_stop: FR:Tag:highway=bus stop
     highway=crossing: FR:Tag:highway=crossing
     highway=cycleway: FR:Tag:highway=cycleway
     highway=elevator: FR:Tag:highway=elevator
     highway=emergency_access_point: FR:Tag:highway=emergency access point
+    highway=emergency_bay: FR:Tag:highway=emergency bay
     highway=escape: FR:Tag:highway=escape
     highway=footway: FR:Tag:highway=footway
     highway=give_way: FR:Tag:highway=give way
@@ -5071,6 +9609,7 @@ fr:
     highway=secondary: FR:Tag:highway=secondary
     highway=service: FR:Tag:highway=service
     highway=services: FR:Tag:highway=services
+    highway=speed_camera: FR:Tag:highway=speed camera
     highway=steps: FR:Tag:highway=steps
     highway=stop: FR:Tag:highway=stop
     highway=tertiary: FR:Tag:highway=tertiary
@@ -5080,6 +9619,7 @@ fr:
     highway=turning_circle: FR:Tag:highway=turning circle
     highway=unclassified: FR:Tag:highway=unclassified
     historic=aircraft: FR:Tag:historic=aircraft
+    historic=archaeological_site: FR:Tag:historic=archaeological site
     historic=battlefield: FR:Tag:historic=battlefield
     historic=boundary_stone: FR:Tag:historic=boundary stone
     historic=cannon: FR:Tag:historic=cannon
@@ -5089,8 +9629,11 @@ fr:
     historic=farm: FR:Tag:historic=farm
     historic=fort: FR:Tag:historic=fort
     historic=gallows: FR:Tag:historic=gallows
+    historic=highwater_mark: FR:Tag:historic=highwater mark
+    historic=locomotive: FR:Tag:historic=locomotive
     historic=memorial: FR:Tag:historic=memorial
     historic=milestone: FR:Tag:historic=milestone
+    historic=monastery: FR:Tag:historic=monastery
     historic=monument: FR:Tag:historic=monument
     historic=optical_telegraph: FR:Tag:historic=optical telegraph
     historic=pa: FR:Tag:historic=pa
@@ -5103,33 +9646,60 @@ fr:
     historic=wayside_cross: FR:Tag:historic=wayside cross
     historic=wayside_shrine: FR:Tag:historic=wayside shrine
     historic=wreck: FR:Tag:historic=wreck
+    industrial=brewery: FR:Tag:industrial=brewery
     junction=roundabout: FR:Tag:junction=roundabout
     landuse=allotments: FR:Tag:landuse=allotments
     landuse=basin: FR:Tag:landuse=basin
     landuse=cemetery: FR:Tag:landuse=cemetery
+    landuse=commercial: FR:Tag:landuse=commercial
+    landuse=construction: FR:Tag:landuse=construction
     landuse=farm: FR:Tag:landuse=farm
     landuse=farmland: FR:Tag:landuse=farmland
     landuse=farmyard: FR:Tag:landuse=farmyard
+    landuse=flowerbed: FR:Tag:landuse=flowerbed
     landuse=forest: FR:Tag:landuse=forest
+    landuse=garages: FR:Tag:landuse=garages
     landuse=grass: FR:Tag:landuse=grass
+    landuse=greenhouse_horticulture: FR:Tag:landuse=greenhouse horticulture
+    landuse=meadow: FR:Tag:landuse=meadow
     landuse=orchard: FR:Tag:landuse=orchard
     landuse=plant_nursery: FR:Tag:landuse=plant nursery
     landuse=pond: FR:Tag:landuse=pond
+    landuse=quarry: FR:Tag:landuse=quarry
     landuse=residential: FR:Tag:landuse=residential
+    landuse=retail: FR:Tag:landuse=retail
     landuse=salt_pond: FR:Tag:landuse=salt pond
     landuse=village_green: FR:Tag:landuse=village green
+    leaf_cycle=deciduous: FR:Tag:leaf cycle=deciduous
     leisure=dog_park: FR:Tag:leisure=dog park
+    leisure=fishing: FR:Tag:leisure=fishing
+    leisure=garden: FR:Tag:leisure=garden
     leisure=golf_course: FR:Tag:leisure=golf course
+    leisure=hackerspace: FR:Tag:leisure=hackerspace
+    leisure=horse_riding: FR:Tag:leisure=horse riding
+    leisure=miniature_golf: FR:Tag:leisure=miniature golf
     leisure=paddling_pool: FR:Tag:leisure=paddling pool
     leisure=park: FR:Tag:leisure=park
+    leisure=picnic_table: FR:Tag:leisure=picnic table
     leisure=pitch: FR:Tag:leisure=pitch
     leisure=playground: FR:Tag:leisure=playground
+    leisure=slipway: FR:Tag:leisure=slipway
+    leisure=sports_centre: FR:Tag:leisure=sports centre
     leisure=stadium: FR:Tag:leisure=stadium
+    leisure=swimming_area: FR:Tag:leisure=swimming area
     leisure=swimming_pool: FR:Tag:leisure=swimming pool
     leisure=track: FR:Tag:leisure=track
+    leisure=water_park: FR:Tag:leisure=water park
     man_made=adit: FR:Tag:man made=adit
     man_made=cutline: FR:Tag:man made=cutline
+    man_made=dovecote: FR:Tag:man made=dovecote
+    man_made=flagpole: FR:Tag:man made=flagpole
+    man_made=kiln: FR:Tag:man made=kiln
+    man_made=lighthouse: FR:Tag:man made=lighthouse
+    man_made=mineshaft: FR:Tag:man made=mineshaft
+    man_made=monitoring_station: FR:Tag:man made=monitoring station
     man_made=pier: FR:Tag:man made=pier
+    man_made=street_cabinet: FR:Tag:man made=street cabinet
     man_made=surveillance: FR:Tag:man made=surveillance
     man_made=survey_point: FR:Tag:man made=survey point
     man_made=tower: FR:Tag:man made=tower
@@ -5141,16 +9711,25 @@ fr:
     man_made=windmill: FR:Tag:man made=windmill
     man_made=windpump: FR:Tag:man made=windpump
     medical=aed: FR:Tag:medical=aed
+    microbrewery=yes: FR:Tag:microbrewery=yes
     military=bunker: FR:Tag:military=bunker
     natural=bare_rock: FR:Tag:natural=bare rock
+    natural=cave_entrance: FR:Tag:natural=cave entrance
     natural=cliff: FR:Tag:natural=cliff
     natural=coastline: FR:Tag:natural=coastline
     natural=glacier: FR:Tag:natural=glacier
+    natural=grassland: FR:Tag:natural=grassland
+    natural=heath: FR:Tag:natural=heath
+    natural=peak: FR:Tag:natural=peak
+    natural=saddle: FR:Tag:natural=saddle
     natural=scree: FR:Tag:natural=scree
+    natural=scrub: FR:Tag:natural=scrub
+    natural=sinkhole: FR:Tag:natural=sinkhole
     natural=spring: FR:Tag:natural=spring
     natural=stone: FR:Tag:natural=stone
     natural=tree: FR:Tag:natural=tree
     natural=tree_row: FR:Tag:natural=tree row
+    natural=volcano: FR:Tag:natural=volcano
     natural=water: FR:Tag:natural=water
     natural=wetland: FR:Tag:natural=wetland
     office=employment_agency: FR:Tag:office=employment agency
@@ -5159,33 +9738,64 @@ fr:
     office=ngo: FR:Tag:office=ngo
     place=city: FR:Tag:place=city
     place=hamlet: FR:Tag:place=hamlet
+    place=island: FR:Tag:place=island
     place=isolated_dwelling: FR:Tag:place=isolated dwelling
     place=locality: FR:Tag:place=locality
     place=neighbourhood: FR:Tag:place=neighbourhood
+    place=square: FR:Tag:place=square
     place=suburb: FR:Tag:place=suburb
     place=town: FR:Tag:place=town
     place=village: FR:Tag:place=village
+    power=cable: FR:Tag:power=cable
+    power=compensator: FR:Tag:power=compensator
+    power=converter: FR:Tag:power=converter
     power=generator: FR:Tag:power=generator
     power=heliostat: FR:Tag:power=heliostat
+    power=insulator: FR:Tag:power=insulator
     power=line: FR:Tag:power=line
     power=minor_line: FR:Tag:power=minor line
+    power=plant: FR:Tag:power=plant
     power=pole: FR:Tag:power=pole
+    power=portal: FR:Tag:power=portal
     power=station: FR:Tag:power=station
     power=sub_station: FR:Tag:power=sub station
+    power=substation: FR:Tag:power=substation
+    power=switch: FR:Tag:power=switch
+    power=terminal: FR:Tag:power=terminal
     power=tower: FR:Tag:power=tower
     power=transformer: FR:Tag:power=transformer
     public_transport=platform: FR:Tag:public transport=platform
     public_transport=station: FR:Tag:public transport=station
     pump=powered: FR:Tag:pump=powered
+    railway=crossing: FR:Tag:railway=crossing
+    railway=disused: FR:Tag:railway=disused
+    railway=funicular: FR:Tag:railway=funicular
+    railway=halt: FR:Tag:railway=halt
     railway=level_crossing: FR:Tag:railway=level crossing
+    railway=miniature: FR:Tag:railway=miniature
+    railway=narrow_gauge: FR:Tag:railway=narrow gauge
     railway=preserved: FR:Tag:railway=preserved
     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=tram: FR:Tag:railway=tram
+    railway=tram_stop: FR:Tag:railway=tram stop
+    religion=buddhist: FR:Tag:religion=buddhist
+    religion=christian: FR:Tag:religion=christian
+    religion=hindu: FR:Tag:religion=hindu
+    religion=jain: FR:Tag:religion=jain
+    religion=jewish: FR:Tag:religion=jewish
+    religion=muslim: FR:Tag:religion=muslim
+    religion=pagan: FR:Tag:religion=pagan
+    religion=shinto: FR:Tag:religion=shinto
+    religion=sikh: FR:Tag:religion=sikh
+    religion=taoist: FR:Tag:religion=taoist
+    religion=zoroastrian: FR:Tag:religion=zoroastrian
+    route=coach: FR:Tag:route=coach
     route=piste: FR:Tag:route=piste
     service=alley: FR:Tag:service=alley
+    service=driveway: FR:Tag:service=driveway
     service=parking_aisle: FR:Tag:service=parking aisle
     shelter_type=basic_hut: FR:Tag:shelter type=basic hut
     shop=alcohol: FR:Tag:shop=alcohol
@@ -5205,39 +9815,67 @@ fr:
     shop=carpet: FR:Tag:shop=carpet
     shop=charity: FR:Tag:shop=charity
     shop=cheese: FR:Tag:shop=cheese
+    shop=chemist: FR:Tag:shop=chemist
     shop=clothes: FR:Tag:shop=clothes
     shop=confectionery: FR:Tag:shop=confectionery
     shop=convenience: FR:Tag:shop=convenience
     shop=copyshop: FR:Tag:shop=copyshop
     shop=deli: FR:Tag:shop=deli
+    shop=department_store: FR:Tag:shop=department store
     shop=dive: FR:Tag:shop=dive
     shop=doityourself: FR:Tag:shop=doityourself
+    shop=electronics: FR:Tag:shop=electronics
     shop=farm: FR:Tag:shop=farm
+    shop=florist: FR:Tag:shop=florist
     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=furniture: FR:Tag:shop=furniture
     shop=garden_centre: FR:Tag:shop=garden centre
     shop=gift: FR:Tag:shop=gift
+    shop=haberdashery: FR:Tag:shop=haberdashery
     shop=hairdresser: FR:Tag:shop=hairdresser
+    shop=hardware: FR:Tag:shop=hardware
     shop=hunting: FR:Tag:shop=hunting
+    shop=jewelry: FR:Tag:shop=jewelry
     shop=kiosk: FR:Tag:shop=kiosk
     shop=kitchen: FR:Tag:shop=kitchen
+    shop=medical_supply: FR:Tag:shop=medical supply
     shop=military_surplus: FR:Tag:shop=military surplus
+    shop=mobile_phone: FR:Tag:shop=mobile phone
+    shop=motorcycle: FR:Tag:shop=motorcycle
     shop=newsagent: FR:Tag:shop=newsagent
+    shop=optician: FR:Tag:shop=optician
     shop=pastry: FR:Tag:shop=pastry
+    shop=pet: FR:Tag:shop=pet
+    shop=pharmacy: FR:Tag:shop=pharmacy
     shop=photo: FR:Tag:shop=photo
     shop=second_hand: FR:Tag:shop=second hand
+    shop=shoes: FR:Tag:shop=shoes
     shop=supermarket: FR:Tag:shop=supermarket
+    shop=ticket: FR:Tag:shop=ticket
     shop=toys: FR:Tag:shop=toys
     shop=trade: FR:Tag:shop=trade
     shop=video: FR:Tag:shop=video
+    sport=8pin: FR:Tag:sport=8pin
+    sport=boules: FR:Tag:sport=boules
+    sport=climbing: FR:Tag:sport=climbing
     sport=free_flying: FR:Tag:sport=free flying
     sport=shooting: FR:Tag:sport=shooting
+    sport=soccer: FR:Tag:sport=soccer
+    switch=circuit_breaker: FR:Tag:switch=circuit breaker
+    switch=disconnector: FR:Tag:switch=disconnector
+    switch=earthing: FR:Tag:switch=earthing
+    switch=mechanical: FR:Tag:switch=mechanical
+    tickets:public_transport=yes: FR:Tag:tickets:public transport=yes
     tourism=alpine_hut: FR:Tag:tourism=alpine hut
+    tourism=apartment: FR:Tag:tourism=apartment
+    tourism=aquarium: FR:Tag:tourism=aquarium
     tourism=artwork: FR:Tag:tourism=artwork
     tourism=attraction: FR:Tag:tourism=attraction
     tourism=camp_site: FR:Tag:tourism=camp site
+    tourism=caravan_site: FR:Tag:tourism=caravan site
     tourism=chalet: FR:Tag:tourism=chalet
     tourism=gallery: FR:Tag:tourism=gallery
     tourism=guest_house: FR:Tag:tourism=guest house
@@ -5246,19 +9884,38 @@ fr:
     tourism=information: FR:Tag:tourism=information
     tourism=motel: FR:Tag:tourism=motel
     tourism=museum: FR:Tag:tourism=museum
+    tourism=picnic_site: FR:Tag:tourism=picnic site
     tourism=theme_park: FR:Tag:tourism=theme park
     tourism=viewpoint: FR:Tag:tourism=viewpoint
+    tourism=wilderness_hut: FR:Tag:tourism=wilderness hut
+    tourism=zoo: FR:Tag:tourism=zoo
+    traffic_sign=city_limit: FR:Tag:traffic sign=city limit
     tunnel=culvert: FR:Tag:tunnel=culvert
+    vending=chemist: FR:Tag:vending=chemist
+    vending=condoms: FR:Tag:vending=condoms
+    vending=excrement_bags: FR:Tag:vending=excrement bags
+    vending=parcel_pickup: FR:Tag:vending=parcel pickup
     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=ditch: FR:Tag:waterway=ditch
     waterway=dock: FR:Tag:waterway=dock
+    waterway=drain: FR:Tag:waterway=drain
+    waterway=fish_pass: FR:Tag:waterway=fish pass
     waterway=lock_gate: FR:Tag:waterway=lock gate
     waterway=river: FR:Tag:waterway=river
     waterway=riverbank: FR:Tag:waterway=riverbank
     waterway=stream: FR:Tag:waterway=stream
+    waterway=waterfall: FR:Tag:waterway=waterfall
     waterway=weir: FR:Tag:waterway=weir
+    wetland=reedbed: FR:Tag:wetland=reedbed
+    wetland=swamp: FR:Tag:wetland=swamp
+gl:
+  key:
+    wheelchair: Gl:Key:wheelchair
+  tag:
+    amenity=recycling: Gl:Tag:amenity=recycling
 hr:
   key:
     amenity: Hr:Key:amenity
@@ -5280,14 +9937,20 @@ ht:
     pump: Ht:Key:pump
 hu:
   key:
+    HU:hu-go:length: Hu:Key:HU:hu-go:length
+    HU:hu-go:milestone: Hu:Key:HU:hu-go:milestone
+    HU:hu-go:road: Hu:Key:HU:hu-go:road
     aerialway: Hu:Key:aerialway
     aeroway: Hu:Key:aeroway
     amenity: Hu:Key:amenity
     barrier: Hu:Key:barrier
     building: Hu:Key:building
+    building:levels: Hu:Key:building:levels
+    crossing:barrier: Hu:Key:crossing:barrier
     denomination: Hu:Key:denomination
     destination: Hu:Key:destination
     highway: Hu:Key:highway
+    incline: HU:Key:incline
     jel: Hu:Key:jel
     landuse: Hu:Key:landuse
     leisure: Hu:Key:leisure
@@ -5299,6 +9962,7 @@ hu:
     office: Hu:Key:office
     place: Hu:Key:place
     railway: Hu:Key:railway
+    ref:HU:edid: Hu:Key:ref:HU:edid
     shop: Hu:Key:shop
     surface: Hu:Key:surface
     symbol: Hu:Key:symbol
@@ -5310,6 +9974,8 @@ hu:
     wood: Hu:Key:wood
   tag:
     boundary=administrative: Hu:Tag:boundary=administrative
+    natural=wallow: Hu:Tag:natural=wallow
+    railway=level_crossing: Hu:Tag:railway=level crossing
 id:
   tag:
     highway=track: Id:Tag:highway=track
@@ -5321,27 +9987,38 @@ it:
     aerialway: IT:Key:aerialway
     aeroway: IT:Key:aeroway
     amenity: IT:Key:amenity
+    artwork_type: IT:Key:artwork type
+    backrest: IT:Key:backrest
     barrier: IT:Key:barrier
     basin: IT:Key:basin
     bicycle_parking: IT:Key:bicycle parking
     boundary: IT:Key:boundary
     bridge: IT:Key:bridge
     building: IT:Key:building
+    building:levels: IT:Key:building:levels
     cables: IT:Key:cables
     circuits: IT:Key:circuits
+    communication:amateur_radio:repeater: IT:Key:communication:amateur radio:repeater
     construction: IT:Key:construction
+    contact:facebook: IT:Key:contact:facebook
     craft: IT:Key:craft
+    crossing: IT:Key:crossing
     cutting: IT:Key:cutting
     cycleway: IT:Key:cycleway
     denomination: IT:Key:denomination
     description: IT:Key:description
+    destination: IT:Key:destination
     diet: IT:Key:diet
     diet:*: IT:Key:diet:*
+    'disused:': 'IT:Key:disused:'
     drink: IT:Key:drink
     ele: IT:Key:ele
     embankment: IT:Key:embankment
     enforcement: IT:Key:enforcement
+    fee: IT:Key:fee
+    fence_type: IT:Key:fence type
     ford: IT:Key:ford
+    garden:type: IT:Key:garden:type
     generator:output: IT:Key:generator:output
     geological: IT:Key:geological
     highway: IT:Key:highway
@@ -5349,6 +10026,7 @@ it:
     incline: IT:Key:incline
     internet_access: IT:Key:internet access
     junction: IT:Key:junction
+    kerb: IT:Key:kerb
     landuse: IT:Key:landuse
     lanes:psv: IT:Key:lanes:psv
     leisure: IT:Key:leisure
@@ -5369,18 +10047,22 @@ it:
     noexit: IT:Key:noexit
     note: IT:Key:note
     office: IT:Key:office
+    opening_hours: IT:Key:opening hours
     operator: IT:Key:operator
+    organic: IT:Key:organic
     osmc:symbol: IT:Key:osmc:symbol
     parking:lane:both: IT:Key:parking:lane:both
     passing_places: IT:Key:passing places
     place: IT:Key:place
     playground: IT:Key:playground
     power: IT:Key:power
+    priority: IT:Key:priority
     proposed: IT:Key:proposed
     railway: IT:Key:railway
     ref: IT:Key:ref
     ref:vatin: IT:Key:ref:vatin
     religion: IT:Key:religion
+    residential: IT:Key:residential
     route: IT:Key:route
     sac_scale: IT:Key:sac scale
     service: IT:Key:service
@@ -5388,7 +10070,7 @@ it:
     smoothness: IT:Key:smoothness
     sport: IT:Key:sport
     stop: IT:Key:stop
-    summit:cross: IT:Key:summit:cross
+    surface: IT:Key:surface
     surveillance: IT:Key:surveillance
     tourism: IT:Key:tourism
     tracktype: IT:Key:tracktype
@@ -5400,7 +10082,9 @@ it:
     waterway: IT:Key:waterway
     wheelchair: IT:Key:wheelchair
     width: IT:Key:width
+    wikidata: IT:Key:wikidata
     wires: IT:Key:wires
+    zone:maxspeed: IT:Key:zone:maxspeed
   tag:
     amenity=animal_boarding: IT:Tag:amenity=animal boarding
     amenity=animal_breeding: IT:Tag:amenity=animal breeding
@@ -5411,6 +10095,7 @@ it:
     amenity=cafe: IT:Tag:amenity=cafe
     amenity=cinema: IT:Tag:amenity=cinema
     amenity=college: IT:Tag:amenity=college
+    amenity=driving_school: IT:Tag:amenity=driving school
     amenity=fast_food: IT:Tag:amenity=fast food
     amenity=fountain: IT:Tag:amenity=fountain
     amenity=fuel: IT:Tag:amenity=fuel
@@ -5433,14 +10118,20 @@ it:
     amenity=waste_basket: IT:Tag:amenity=waste basket
     barrier=ditch: IT:Tag:barrier=ditch
     barrier=fence: IT:Tag:barrier=fence
+    barrier=jersey_barrier: IT:Tag:barrier=jersey barrier
     barrier=retaining_wall: IT:Tag:barrier=retaining wall
     barrier=toll_booth: IT:Tag:barrier=toll booth
+    building=residential: IT:Tag:building=residential
+    building=train_station: IT:Tag:building=train station
+    emergency=fire_hydrant: IT:Tag:emergency=fire hydrant
     footway=crossing: IT:Tag:footway=crossing
     footway=sidewalk: IT:Tag:footway=sidewalk
     geological=palaeontological_site: IT:Tag:geological=palaeontological site
+    highway=crossing: IT:Tag:highway=crossing
     highway=cycleway: IT:Tag:highway=cycleway
     highway=footway: IT:Tag:highway=footway
     highway=ford: IT:Tag:highway=ford
+    highway=living_street: IT:Tag:highway=living street
     highway=mini_roundabout: IT:Tag:highway=mini roundabout
     highway=motorway: IT:Tag:highway=motorway
     highway=motorway_link: IT:Tag:highway=motorway link
@@ -5451,6 +10142,7 @@ it:
     highway=residential: IT:Tag:highway=residential
     highway=rest_area: IT:Tag:highway=rest area
     highway=secondary: IT:Tag:highway=secondary
+    highway=service: IT:Tag:highway=service
     highway=services: IT:Tag:highway=services
     highway=steps: IT:Tag:highway=steps
     highway=tertiary: IT:Tag:highway=tertiary
@@ -5458,24 +10150,31 @@ it:
     highway=trunk: IT:Tag:highway=trunk
     highway=trunk_link: IT:Tag:highway=trunk link
     historic=archaeological_site: IT:Tag:historic=archaeological site
+    historic=locomotive: IT:Tag:historic=locomotive
     historic=paleontological_site: IT:Tag:historic=paleontological site
     historic=wayside_shrine: IT:Tag:historic=wayside shrine
     industrial=auto_wrecker: IT:Tag:industrial=auto wrecker
+    internet_access=wlan: IT:Tag:internet access=wlan
     junction=roundabout: IT:Tag:junction=roundabout
     landuse=cemetery: IT:Tag:landuse=cemetery
     landuse=construction: IT:Tag:landuse=construction
+    landuse=greenhouse_horticulture: IT:Tag:landuse=greenhouse horticulture
     leisure=beach_resort: IT:Tag:leisure=beach resort
     leisure=dog_park: IT:Tag:leisure=dog park
     leisure=marina: IT:Tag:leisure=marina
     leisure=playground: IT:Tag:leisure=playground
     leisure=swimming_pool: IT:Tag:leisure=swimming pool
     man_made=mast: IT:Tag:man made=mast
+    man_made=works: IT:Tag:man made=works
+    natural=bare_rock: IT:Tag:natural=bare rock
+    natural=cape: IT:Tag:natural=cape
     natural=grassland: IT:Tag:natural=grassland
     natural=palaeontological_site: IT:Tag:natural=palaeontological site
     natural=scree: IT:Tag:natural=scree
     natural=spring: IT:Tag:natural=spring
     natural=tree_row: IT:Tag:natural=tree row
     natural=wetland: IT:Tag:natural=wetland
+    oneway=alternating: IT:Tag:oneway=alternating
     place=village: IT:Tag:place=village
     power=cable: IT:Tag:power=cable
     power=cable_distribution_cabinet: IT:Tag:power=cable distribution cabinet
@@ -5483,14 +10182,21 @@ it:
     power=line: IT:Tag:power=line
     power=plant: IT:Tag:power=plant
     power=pole: IT:Tag:power=pole
+    power=station: IT:Tag:power=station
+    power=sub_station: IT:Tag:power=sub station
     power=substation: IT:Tag:power=substation
     power=tower: IT:Tag:power=tower
     power=transformer: IT:Tag:power=transformer
     railway=level_crossing: IT:Tag:railway=level crossing
+    residential=rural: IT:Tag:residential=rural
+    residential=urban: IT:Tag:residential=urban
     route=bus: IT:Tag:route=bus
+    route=railway: IT:Tag:route=railway
     shop=alcohol: IT:Tag:shop=alcohol
     shop=bakery: IT:Tag:shop=bakery
+    shop=beauty: IT:Tag:shop=beauty
     shop=beverages: IT:Tag:shop=beverages
+    shop=bicycle: IT:Tag:shop=bicycle
     shop=butcher: IT:Tag:shop=butcher
     shop=car: IT:Tag:shop=car
     shop=chemist: IT:Tag:shop=chemist
@@ -5505,27 +10211,41 @@ it:
     shop=hifi: IT:Tag:shop=hifi
     shop=kiosk: IT:Tag:shop=kiosk
     shop=mall: IT:Tag:shop=mall
+    shop=motorcycle: IT:Tag:shop=motorcycle
     shop=newsagent: IT:Tag:shop=newsagent
     shop=pastry: IT:Tag:shop=pastry
     shop=seafood: IT:Tag:shop=seafood
+    shop=souvenir: IT:Tag:shop=souvenir
     shop=supermarket: IT:Tag:shop=supermarket
     shop=tea: IT:Tag:shop=tea
     shop=tobacco: IT:Tag:shop=tobacco
     shop=wine: IT:Tag:shop=wine
+    sport=climbing: IT:Tag:sport=climbing
     sport=surfing: IT:Tag:sport=surfing
+    summit:cross=yes: IT:Tag:summit:cross=yes
     tourism=artwork: IT:Tag:tourism=artwork
+    tourism=museum: IT:Tag:tourism=museum
+    waterway=ditch: IT:Tag:waterway=ditch
     waterway=stream: IT:Tag:waterway=stream
 ja:
   key:
+    3dr:type: JA:Key:3dr:type
     CEMT: JA:Key:CEMT
+    FIXME: JA:Key:FIXME
     abandoned: JA:Key:abandoned
+    'abandoned:': 'JA:Key:abandoned:'
+    abandoned:*: JA:Key:abandoned:*
+    abandoned:amenity: JA:Key:abandoned:amenity
     abutters: JA:Key:abutters
     access: JA:Key:access
+    access:bdouble: JA:Key:access:bdouble
     access:lanes: JA:Key:access:lanes
     addr: JA:Key:addr
     addr:city: JA:Key:addr:city
     addr:country: JA:Key:addr:country
+    addr:county: JA:Key:addr:county
     addr:district: JA:Key:addr:district
+    addr:flats: JA:Key:addr:flats
     addr:full: JA:Key:addr:full
     addr:hamlet: JA:Key:addr:hamlet
     addr:housename: JA:Key:addr:housename
@@ -5535,43 +10255,101 @@ ja:
     addr:place: JA:Key:addr:place
     addr:postcode: JA:Key:addr:postcode
     addr:province: JA:Key:addr:province
+    addr:region: JA:Key:addr:region
     addr:state: JA:Key:addr:state
     addr:street: JA:Key:addr:street
+    addr:street:name: JA:Key:addr:street:name
+    addr:street:prefix: JA:Key:addr:street:prefix
+    addr:street:type: JA:Key:addr:street:type
     addr:subdistrict: JA:Key:addr:subdistrict
+    addr:suburb: JA:Key:addr:suburb
+    addr:unit: JA:Key:addr:unit
+    admin_level: JA:Key:admin level
+    advertising: JA:Key:advertising
     aerialway: JA:Key:aerialway
+    aerialway:drag_lift: JA:Key:aerialway:drag lift
     aeroway: JA:Key:aeroway
     agricultural: JA:Key:agricultural
     alt_name: JA:Key:alt name
     amenity: JA:Key:amenity
+    architect: JA:Key:architect
     area: JA:Key:area
+    area:highway: JA:Key:area:highway
     artwork_type: JA:Key:artwork type
+    ascent: JA:Key:ascent
     attribution: JA:Key:attribution
     atv: JA:Key:atv
+    automated: JA:Key:automated
+    backrest: JA:Key:backrest
     backward: JA:Key:backward
+    bar: JA:Key:bar
     barrier: JA:Key:barrier
+    baseball: JA:Key:baseball
+    basin: JA:Key:basin
     bdouble: JA:Key:bdouble
+    beds: JA:Key:beds
+    bench: JA:Key:bench
     bicycle: JA:Key:bicycle
     bicycle_parking: JA:Key:bicycle parking
+    bicycle_road: JA:Key:bicycle road
+    bin: JA:Key:bin
+    board_type: JA:Key:board type
     boat: JA:Key:boat
     bollard: JA:Key:bollard
     books: JA:Key:books
     border_type: JA:Key:border type
+    both: JA:Key:both
     boundary: JA:Key:boundary
     brand: JA:Key:brand
+    brewery: JA:Key:brewery
     bridge: JA:Key:bridge
+    bridge:alt_name: JA:Key:bridge:alt name
+    bridge:loc_name: JA:Key:bridge:loc name
+    bridge:movable: JA:Key:bridge:movable
+    bridge:name: JA:Key:bridge:name
+    bridge:official_name: JA:Key:bridge:official name
+    bridge:old_name: JA:Key:bridge:old name
+    bridge:short_name: JA:Key:bridge:short name
+    bridge:structure: JA:Key:bridge:structure
+    bridge:support: JA:Key:bridge:support
+    bridge_name: JA:Key:bridge name
     building: JA:Key:building
+    building:architecture: JA:Key:building:architecture
+    building:colour: JA:Key:building:colour
+    building:fireproof: JA:Key:building:fireproof
+    building:flats: JA:Key:building:flats
+    building:levels: JA:Key:building:levels
     building:material: JA:Key:building:material
+    building:min_level: JA:Key:building:min level
     building:part: JA:Key:building:part
     building:parts: JA:Key:building:parts
+    building:units: JA:Key:building:units
+    building:use: JA:Key:building:use
+    bunker_type: JA:Key:bunker type
     bus: JA:Key:bus
+    busway: JA:Key:busway
+    cable_number: JA:Key:cable number
+    camp_type: JA:Key:camp type
     capacity: JA:Key:capacity
+    capacity:disabled: JA:Key:capacity:disabled
+    capital: JA:Key:capital
+    carriage: JA:Key:carriage
+    castle_type: JA:Key:castle type
+    cave:name: JA:Key:cave:name
+    cemetery: JA:Key:cemetery
+    change: JA:Key:change
+    check_date: JA:Key:check date
+    circumference: JA:Key:circumference
     clothes: JA:Key:clothes
     club: JA:Key:club
     collection_times: JA:Key:collection times
     colour: JA:Key:colour
     comment: JA:Key:comment
+    condition: JA:Key:condition
     conditional: JA:Key:conditional
     construction: JA:Key:construction
+    construction:website: JA:Key:construction:website
+    construction_end_expected: JA:Key:construction end expected
     contact: JA:Key:contact
     contact:email: JA:Key:contact:email
     contact:facebook: JA:Key:contact:facebook
@@ -5582,21 +10360,57 @@ ja:
     contact:twitter: JA:Key:contact:twitter
     contact:webcam: JA:Key:contact:webcam
     contact:website: JA:Key:contact:website
+    content: JA:Key:content
+    conveying: JA:Key:conveying
     covered: JA:Key:covered
     craft: JA:Key:craft
+    created_by: JA:Key:created by
+    crop: JA:Key:crop
     crossing: JA:Key:crossing
+    crossing:activation: JA:Key:crossing:activation
+    crossing:barrier: JA:Key:crossing:barrier
+    crossing:bell: JA:Key:crossing:bell
+    crossing:light: JA:Key:crossing:light
+    crossing:on_demand: JA:Key:crossing:on demand
+    crossing:saltire: JA:Key:crossing:saltire
+    crossing_ref: JA:Key:crossing ref
     cuisine: JA:Key:cuisine
+    currency: JA:Key:currency
     cutting: JA:Key:cutting
+    cycle_network: JA:Key:cycle network
     cycleway: JA:Key:cycleway
+    cycleway:left: JA:Key:cycleway:left
+    cycleway:right: JA:Key:cycleway:right
+    cycleway=lane: JA:Key:cycleway=lane
+    cycleway=opposite_track: JA:Key:cycleway=opposite track
+    cycleway=track: JA:Key:cycleway=track
+    delivery: JA:Key:delivery
+    'demolished:': 'JA:Key:demolished:'
     denomination: JA:Key:denomination
+    denotation: JA:Key:denotation
+    depth: JA:Key:depth
+    descent: JA:Key:descent
     description: JA:Key:description
+    designation: JA:Key:designation
     destination: JA:Key:destination
     destination:lanes: JA:Key:destination:lanes
+    detour: JA:Key:detour
+    diameter: JA:Key:diameter
     diet: JA:Key:diet
     diet:*: JA:Key:diet:*
+    direction: JA:Key:direction
+    dispensing: JA:Key:dispensing
+    display: JA:Key:display
+    distance: JA:Key:distance
     disused: JA:Key:disused
+    'disused:': 'JA:Key:disused:'
+    donation:compensation: JA:Key:donation:compensation
+    drink: JA:Key:drink
+    drinking_water: JA:Key:drinking water
     drive_in: JA:Key:drive in
     drive_through: JA:Key:drive through
+    driving_side: JA:Key:driving side
+    duration: JA:Key:duration
     easy_overtaking: JA:Key:easy overtaking
     ele: JA:Key:ele
     electrified: JA:Key:electrified
@@ -5604,48 +10418,118 @@ ja:
     embankment: JA:Key:embankment
     emergency: JA:Key:emergency
     end_date: JA:Key:end date
+    enforcement: JA:Key:enforcement
     entrance: JA:Key:entrance
     est_width: JA:Key:est width
+    exit: JA:Key:exit
     exit_to: JA:Key:exit to
+    expressway: JA:Key:expressway
     facebook: JA:Key:facebook
     fax: JA:Key:fax
     fee: JA:Key:fee
+    fence_type: JA:Key:fence type
+    fenced: JA:Key:fenced
+    ferry: JA:Key:ferry
+    fire_boundary: JA:Key:fire boundary
+    fireplace: JA:Key:fireplace
+    fishing: JA:Key:fishing
     fixme: JA:Key:fixme
+    flood_prone: JA:Key:flood prone
     foot: JA:Key:foot
     footway: JA:Key:footway
+    ford: JA:Key:ford
     forestry: JA:Key:forestry
+    format: JA:Key:format
     forward: JA:Key:forward
+    frequency: JA:Key:frequency
+    fuel: JA:Key:fuel
+    fuel:diesel: JA:Key:fuel:diesel
+    fuel:lpg: JA:Key:fuel:lpg
+    fuel:octane_91: JA:Key:fuel:octane 91
+    fuel:octane_98: JA:Key:fuel:octane 98
     furniture: JA:Key:furniture
+    garden:style: JA:Key:garden:style
+    garden:type: JA:Key:garden:type
+    gauge: JA:Key:gauge
     generator:method: JA:Key:generator:method
+    generator:output: JA:Key:generator:output
+    generator:output:biogas: JA:Key:generator:output:biogas
+    generator:output:cold_air: JA:Key:generator:output:cold air
+    generator:output:cold_water: JA:Key:generator:output:cold water
+    generator:output:compressed_air: JA:Key:generator:output:compressed air
+    generator:output:electricity: JA:Key:generator:output:electricity
+    generator:output:heat: JA:Key:generator:output:heat
+    generator:output:hot_air: JA:Key:generator:output:hot air
+    generator:output:hot_water: JA:Key:generator:output:hot water
+    generator:output:steam: JA:Key:generator:output:steam
+    generator:output:vacuum: JA:Key:generator:output:vacuum
     generator:plant: JA:Key:generator:plant
     generator:source: JA:Key:generator:source
+    generator:type: JA:Key:generator:type
     genus: JA:Key:genus
     geological: JA:Key:geological
+    golf: JA:Key:golf
+    goods: JA:Key:goods
+    government: JA:Key:government
+    grassland: JA:Key:grassland
+    guest_house: JA:Key:guest house
+    guidepost: JA:Key:guidepost
+    handrail: JA:Key:handrail
     happy_hours: JA:Key:happy hours
+    harbour: JA:Key:harbour
     hazard_type: JA:Key:hazard type
     hazmat: JA:Key:hazmat
     healthcare: JA:Key:healthcare
+    healthcare:speciality: JA:Key:healthcare:speciality
     height: JA:Key:height
+    heritage: JA:Key:heritage
     hgv: JA:Key:hgv
+    highspeed: JA:Key:highspeed
     highway: JA:Key:highway
+    hiking: JA:Key:hiking
     historic: JA:Key:historic
+    historic:civilization: JA:Key:historic:civilization
+    historic:era: JA:Key:historic:era
+    historic:period: JA:Key:historic:period
+    history: JA:Key:history
     horse: JA:Key:horse
+    hov: JA:Key:hov
     iata: JA:Key:iata
     icao: JA:Key:icao
+    ice_road: JA:Key:ice road
+    ignore_for_routing: JA:Key:ignore for routing
     image: JA:Key:image
     incline: JA:Key:incline
+    indoor: JA:Key:indoor
+    indoor_seating: JA:Key:indoor seating
+    indoormark: JA:Key:indoormark
+    industrial: JA:Key:industrial
+    informal: JA:Key:informal
     information: JA:Key:information
     inline_skates: JA:Key:inline skates
     inscription: JA:Key:inscription
     int_name: JA:Key:int name
+    int_ref: JA:Key:int ref
     intermittent: JA:Key:intermittent
     internet_access: JA:Key:internet access
+    internet_access:fee: JA:Key:internet access:fee
     is_in: JA:Key:is in
+    is_in:city: JA:Key:is in:city
     is_in:continent: JA:Key:is in:continent
+    is_in:country: JA:Key:is in:country
+    is_in:country_code: JA:Key:is in:country code
+    is_in:county: JA:Key:is in:county
+    is_in:province: JA:Key:is in:province
+    is_in:state: JA:Key:is in:state
     junction: JA:Key:junction
+    kerb: JA:Key:kerb
     landmark: JA:Key:landmark
     landuse: JA:Key:landuse
     lanes: JA:Key:lanes
+    lanes:bus: JA:Key:lanes:bus
+    lanes:psv: JA:Key:lanes:psv
+    lanes:psv:backward: JA:Key:lanes:psv:backward
+    lanes:psv:forward: JA:Key:lanes:psv:forward
     layer: JA:Key:layer
     lcn_ref: JA:Key:lcn ref
     leaf_cycle: JA:Key:leaf cycle
     leisure: JA:Key:leisure
     length: JA:Key:length
     level: JA:Key:level
-    level_crossing: JA:Key:level crossing
     lit: JA:Key:lit
+    living_street: JA:Key:living street
     loc_name: JA:Key:loc name
     loc_ref: JA:Key:loc ref
+    local_ref: JA:Key:local ref
+    location: JA:Key:location
+    lock: JA:Key:lock
+    lock_name: JA:Key:lock name
     man_made: JA:Key:man made
+    managed: JA:Key:managed
+    manhole: JA:Key:manhole
+    manufacturer:type: JA:Key:manufacturer:type
+    material: JA:Key:material
+    max_age: JA:Key:max age
     maxaxleload: JA:Key:maxaxleload
     maxheight: JA:Key:maxheight
     maxheight:physical: JA:Key:maxheight:physical
     maxlength: JA:Key:maxlength
     maxspeed: JA:Key:maxspeed
+    maxspeed:advisory: JA:Key:maxspeed:advisory
+    maxstay: JA:Key:maxstay
     maxweight: JA:Key:maxweight
     maxwidth: JA:Key:maxwidth
     maxwidth:physical: JA:Key:maxwidth:physical
+    microbrewery: JA:Key:microbrewery
     military: JA:Key:military
+    min_age: JA:Key:min age
     minspeed: JA:Key:minspeed
+    monitoring:air_quality: JA:Key:monitoring:air quality
+    monitoring:gps: JA:Key:monitoring:gps
+    monitoring:noise: JA:Key:monitoring:noise
+    monitoring:water_level: JA:Key:monitoring:water level
+    monitoring:weather: JA:Key:monitoring:weather
+    mooring: JA:Key:mooring
     moped: JA:Key:moped
     motor_vehicle: JA:Key:motor vehicle
     motorboat: JA:Key:motorboat
     motorcar: JA:Key:motorcar
     motorcycle: JA:Key:motorcycle
+    motorhome: JA:Key:motorhome
+    motorroad: JA:Key:motorroad
     mountain_pass: JA:Key:mountain pass
+    mtb: JA:Key:mtb
+    mtb:scale: JA:Key:mtb:scale
+    mtb:scale:uphill: JA:Key:mtb:scale:uphill
+    museum: JA:Key:museum
     name: JA:Key:name
     name:cs: JA:Key:name:cs
     name:de: JA:Key:name:de
     name:en: JA:Key:name:en
+    name:it: JA:Key:name:it
+    name:ja: JA:Key:name:ja
+    name:ja-Hira: JA:Key:name:ja-Hira
+    name:ja-Latn: JA:Key:name:ja-Latn
+    name:ja_kana: JA:Key:name:ja kana
+    name:ja_rm: JA:Key:name:ja rm
+    name:left: JA:Key:name:left
+    name:right: JA:Key:name:right
     narrow: JA:Key:narrow
     nat_ref: JA:Key:nat ref
     natural: JA:Key:natural
     ncn_ref: JA:Key:ncn ref
     network: JA:Key:network
     noexit: JA:Key:noexit
+    noname: JA:Key:noname
     note: JA:Key:note
+    note:ja: JA:Key:note:ja
     office: JA:Key:office
     official_name: JA:Key:official name
+    official_ref: JA:Key:official ref
     old_name: JA:Key:old name
     old_ref: JA:Key:old ref
     oneway: JA:Key:oneway
     oneway:bicycle: JA:Key:oneway:bicycle
+    opening_date: JA:Key:opening date
     opening_hours: JA:Key:opening hours
     operator: JA:Key:operator
+    operator:ja: JA:Key:operator:ja
+    operator:type: JA:Key:operator:type
     organic: JA:Key:organic
+    origin: JA:Key:origin
+    osmc:symbol: JA:Key:osmc:symbol
     outdoor_seating: JA:Key:outdoor seating
     overtaking: JA:Key:overtaking
+    owner: JA:Key:owner
+    parking: JA:Key:parking
     parking:condition: JA:Key:parking:condition
     parking:lane: JA:Key:parking:lane
+    passing_places: JA:Key:passing places
+    payment: JA:Key:payment
+    payment:coins: JA:Key:payment:coins
     phone: JA:Key:phone
+    piste:difficulty: JA:Key:piste:difficulty
+    piste:type: JA:Key:piste:type
     place: JA:Key:place
+    plant:output: JA:Key:plant:output
+    playground: JA:Key:playground
     population: JA:Key:population
+    postal_code: JA:Key:postal code
     power: JA:Key:power
     power_source: JA:Key:power source
     power_supply: JA:Key:power supply
+    priority: JA:Key:priority
+    priority_road: JA:Key:priority road
+    produce: JA:Key:produce
+    product: JA:Key:product
+    proposed: JA:Key:proposed
+    protect_class: JA:Key:protect class
     psv: JA:Key:psv
+    public_bookcase:type: JA:Key:public bookcase:type
     public_transport: JA:Key:public transport
     public_transport:version: JA:Key:public transport:version
+    pump: JA:Key:pump
     rack: JA:Key:rack
     railway: JA:Key:railway
     railway:preserved: JA:Key:railway:preserved
+    railway:track_ref: JA:Key:railway:track ref
+    ramp: JA:Key:ramp
     rcn_ref: JA:Key:rcn ref
+    recording: JA:Key:recording
+    recycling_type: JA:Key:recycling type
     ref: JA:Key:ref
+    ref:isil: JA:Key:ref:isil
     ref:shop:num: JA:Key:ref:shop:num
+    ref:vatin: JA:Key:ref:vatin
     reference: JA:Key:reference
+    reference_point: JA:Key:reference point
     reg_ref: JA:Key:reg ref
     religion: JA:Key:religion
+    removed: JA:Key:removed
+    'removed:': 'JA:Key:removed:'
+    reservation: JA:Key:reservation
+    residential: JA:Key:residential
+    resource: JA:Key:resource
     right: JA:Key:right
     roadtrain: JA:Key:roadtrain
+    roof:colour: JA:Key:roof:colour
     roof:material: JA:Key:roof:material
     room: JA:Key:room
+    rooms: JA:Key:rooms
+    rotor:diameter: JA:Key:rotor:diameter
     route: JA:Key:route
+    route_master: JA:Key:route master
+    route_ref: JA:Key:route ref
+    ruins: JA:Key:ruins
     sac_scale: JA:Key:sac scale
     salt: JA:Key:salt
     seamark:fixme: JA:Key:seamark:fixme
+    seamark:type: JA:Key:seamark:type
+    second_hand: JA:Key:second hand
     segregated: JA:Key:segregated
     service: JA:Key:service
     service_times: JA:Key:service times
+    shelter: JA:Key:shelter
+    shelter_type: JA:Key:shelter type
     shop: JA:Key:shop
     short_name: JA:Key:short name
+    shower: JA:Key:shower
+    sides: JA:Key:sides
     sidewalk: JA:Key:sidewalk
+    size: JA:Key:size
+    smokefree: JA:Key:smokefree
+    smoking: JA:Key:smoking
+    smoking:outside: JA:Key:smoking:outside
     smoothness: JA:Key:smoothness
+    snowmobile: JA:Key:snowmobile
     social_facility: JA:Key:social facility
+    social_facility:for: JA:Key:social facility:for
     source: JA:Key:source
+    source:addr: JA:Key:source:addr
+    source:building: JA:Key:source:building
     source:date: JA:Key:source:date
+    source:geometry: JA:Key:source:geometry
+    source:ja: JA:Key:source:ja
+    source:loc: JA:Key:source:loc
     source:maxspeed: JA:Key:source:maxspeed
     source:name: JA:Key:source:name
+    source:position: JA:Key:source:position
     source:ref: JA:Key:source:ref
     source_ref: JA:Key:source ref
     species: JA:Key:species
     sport: JA:Key:sport
+    stars: JA:Key:stars
     start_date: JA:Key:start date
+    station: JA:Key:station
     step_count: JA:Key:step count
+    stile: JA:Key:stile
+    stream: JA:Key:stream
+    substance: JA:Key:substance
+    subway: JA:Key:subway
+    support: JA:Key:support
     surface: JA:Key:surface
     surveillance: JA:Key:surveillance
     survey:date: JA:Key:survey:date
     tactile_paving: JA:Key:tactile paving
+    tactile_writing: JA:Key:tactile writing
     takeaway: JA:Key:takeaway
     tank: JA:Key:tank
     taxi: JA:Key:taxi
+    taxon: JA:Key:taxon
     tenant: JA:Key:tenant
+    tents: JA:Key:tents
+    tickets:public_transport: JA:Key:tickets:public transport
+    tickets:public_transport_subscription: JA:Key:tickets:public transport subscription
     tidal: JA:Key:tidal
+    todo: JA:Key:todo
     toilets:wheelchair: JA:Key:toilets:wheelchair
     toll: JA:Key:toll
     tourism: JA:Key:tourism
     tower:type: JA:Key:tower:type
+    tracks: JA:Key:tracks
     tracktype: JA:Key:tracktype
     traffic_calming: JA:Key:traffic calming
+    traffic_sign: JA:Key:traffic sign
+    traffic_signals: JA:Key:traffic signals
+    traffic_signals:sound: JA:Key:traffic signals:sound
     trail_visibility: JA:Key:trail visibility
+    train: JA:Key:train
+    tram: JA:Key:tram
+    trees: JA:Key:trees
+    trolley_wire: JA:Key:trolley wire
+    trolleybus: JA:Key:trolleybus
     tunnel: JA:Key:tunnel
     turn: JA:Key:turn
+    turn:lanes: JA:Key:turn:lanes
     twitter: JA:Key:twitter
     type: JA:Key:type
+    unsigned_ref: JA:Key:unsigned ref
     url: JA:Key:url
     usage: JA:Key:usage
     vehicle: JA:Key:vehicle
+    visibility: JA:Key:visibility
+    voltage: JA:Key:voltage
+    waste: JA:Key:waste
     water: JA:Key:water
+    water_point: JA:Key:water point
     waterway: JA:Key:waterway
     website: JA:Key:website
+    wetland: JA:Key:wetland
     wheelchair: JA:Key:wheelchair
+    wholesale: JA:Key:wholesale
     width: JA:Key:width
+    wifi: JA:Key:wifi
+    wikidata: JA:Key:wikidata
+    wikimedia_commons: JA:Key:wikimedia commons
     wikipedia: JA:Key:wikipedia
     winter_road: JA:Key:winter road
+    wires: JA:Key:wires
     wood: JA:Key:wood
+    yh:LINE_NAME: JA:Key:yh:LINE NAME
+    yh:LINE_NUM: JA:Key:yh:LINE NUM
+    yh:STRUCTURE: JA:Key:yh:STRUCTURE
+    yh:TOTYUMONO: JA:Key:yh:TOTYUMONO
+    yh:TYPE: JA:Key:yh:TYPE
+    yh:WIDTH: JA:Key:yh:WIDTH
+    yh:WIDTH_RANK: JA:Key:yh:WIDTH RANK
+    zone:traffic: JA:Key:zone:traffic
   tag:
+    access=agricultural: JA:Tag:access=agricultural
+    access=customers: JA:Tag:access=customers
+    access=delivery: JA:Tag:access=delivery
     access=designated: JA:Tag:access=designated
+    access=forestry: JA:Tag:access=forestry
+    access=license: JA:Tag:access=license
     access=no: JA:Tag:access=no
+    access=official: JA:Tag:access=official
     access=private: JA:Tag:access=private
+    access=unknown: JA:Tag:access=unknown
+    admin_level=10: JA:Tag:admin level=10
+    admin_level=11: JA:Tag:admin level=11
+    admin_level=2: JA:Tag:admin level=2
+    admin_level=3: JA:Tag:admin level=3
+    admin_level=4: JA:Tag:admin level=4
+    admin_level=5: JA:Tag:admin level=5
+    admin_level=6: JA:Tag:admin level=6
+    admin_level=7: JA:Tag:admin level=7
+    admin_level=8: JA:Tag:admin level=8
+    admin_level=9: JA:Tag:admin level=9
+    advertising=billboard: JA:Tag:advertising=billboard
+    advertising=board: JA:Tag:advertising=board
+    advertising=column: JA:Tag:advertising=column
+    advertising=flag: JA:Tag:advertising=flag
+    advertising=poster_box: JA:Tag:advertising=poster box
+    advertising=screen: JA:Tag:advertising=screen
+    advertising=sculpture: JA:Tag:advertising=sculpture
+    advertising=sign: JA:Tag:advertising=sign
+    advertising=tarp: JA:Tag:advertising=tarp
+    advertising=totem: JA:Tag:advertising=totem
+    advertising=wall_painting: JA:Tag:advertising=wall painting
     aerialway=cable_car: JA:Tag:aerialway=cable car
+    aerialway=canopy: JA:Tag:aerialway=canopy
+    aerialway=chair_lift: JA:Tag:aerialway=chair lift
+    aerialway=drag_lift: JA:Tag:aerialway=drag lift
+    aerialway=gondola: JA:Tag:aerialway=gondola
+    aerialway=goods: JA:Tag:aerialway=goods
+    aerialway=j-bar: JA:Tag:aerialway=j-bar
+    aerialway=magic_carpet: JA:Tag:aerialway=magic carpet
+    aerialway=platter: JA:Tag:aerialway=platter
+    aerialway=pylon: JA:Tag:aerialway=pylon
+    aerialway=rope_tow: JA:Tag:aerialway=rope tow
+    aerialway=station: JA:Tag:aerialway=station
     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=gate: JA:Tag:aeroway=gate
+    aeroway=hangar: JA:Tag:aeroway=hangar
     aeroway=helipad: JA:Tag:aeroway=helipad
+    aeroway=heliport: JA:Tag:aeroway=heliport
+    aeroway=parking_position: JA:Tag:aeroway=parking position
     aeroway=runway: JA:Tag:aeroway=runway
     aeroway=taxiway: JA:Tag:aeroway=taxiway
     aeroway=terminal: JA:Tag:aeroway=terminal
+    aeroway=windsock: JA:Tag:aeroway=windsock
+    allotments=plot: JA:Tag:allotments=plot
+    amenity=administration: JA:Tag:amenity=administration
+    amenity=animal_boarding: JA:Tag:amenity=animal boarding
+    amenity=animal_breeding: JA:Tag:amenity=animal breeding
     amenity=animal_shelter: JA:Tag:amenity=animal shelter
     amenity=arts_centre: JA:Tag:amenity=arts centre
     amenity=atm: JA:Tag:amenity=atm
@@ -5799,6 +10868,7 @@ ja:
     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_sharing: JA:Tag:amenity=boat sharing
     amenity=boat_storage: JA:Tag:amenity=boat storage
     amenity=brothel: JA:Tag:amenity=brothel
     amenity=bureau_de_change: JA:Tag:amenity=bureau de change
@@ -5811,17 +10881,24 @@ ja:
     amenity=charging_station: JA:Tag:amenity=charging station
     amenity=childcare: JA:Tag:amenity=childcare
     amenity=cinema: JA:Tag:amenity=cinema
+    amenity=clinic: JA:Tag:amenity=clinic
     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=coworking_space: JA:Tag:amenity=coworking space
     amenity=crematorium: JA:Tag:amenity=crematorium
+    amenity=crypt: JA:Tag:amenity=crypt
     amenity=dentist: JA:Tag:amenity=dentist
     amenity=doctor: JA:Tag:amenity=doctor
     amenity=doctors: JA:Tag:amenity=doctors
+    amenity=dojo: JA:Tag:amenity=dojo
     amenity=drinking_water: JA:Tag:amenity=drinking water
+    amenity=driving_school: JA:Tag:amenity=driving school
     amenity=embassy: JA:Tag:amenity=embassy
+    amenity=emergency_phone: JA:Tag:amenity=emergency phone
+    amenity=events_venue: JA:Tag:amenity=events venue
     amenity=fast_food: JA:Tag:amenity=fast food
     amenity=ferry_terminal: JA:Tag:amenity=ferry terminal
     amenity=financial_advice: JA:Tag:amenity=financial advice
@@ -5829,14 +10906,22 @@ ja:
     amenity=food_court: JA:Tag:amenity=food court
     amenity=fountain: JA:Tag:amenity=fountain
     amenity=fuel: JA:Tag:amenity=fuel
+    amenity=gambling: JA:Tag:amenity=gambling
+    amenity=game_feeding: JA:Tag:amenity=game feeding
     amenity=grave_yard: JA:Tag:amenity=grave yard
     amenity=grit_bin: JA:Tag:amenity=grit bin
     amenity=hospital: JA:Tag:amenity=hospital
     amenity=hunting_stand: JA:Tag:amenity=hunting stand
     amenity=ice_cream: JA:Tag:amenity=ice cream
+    amenity=internet_cafe: JA:Tag:amenity=internet cafe
     amenity=kindergarten: JA:Tag:amenity=kindergarten
+    amenity=language_school: JA:Tag:amenity=language school
     amenity=library: JA:Tag:amenity=library
+    amenity=love_hotel: JA:Tag:amenity=love hotel
     amenity=marketplace: JA:Tag:amenity=marketplace
+    amenity=monastery: JA:Tag:amenity=monastery
+    amenity=motorcycle_parking: JA:Tag:amenity=motorcycle parking
+    amenity=music_school: JA:Tag:amenity=music school
     amenity=nightclub: JA:Tag:amenity=nightclub
     amenity=nursing_home: JA:Tag:amenity=nursing home
     amenity=parking: JA:Tag:amenity=parking
@@ -5845,6 +10930,7 @@ ja:
     amenity=pharmacy: JA:Tag:amenity=pharmacy
     amenity=photo_booth: JA:Tag:amenity=photo booth
     amenity=place_of_worship: JA:Tag:amenity=place of worship
+    amenity=planetarium: JA:Tag:amenity=planetarium
     amenity=police: JA:Tag:amenity=police
     amenity=post_box: JA:Tag:amenity=post box
     amenity=post_office: JA:Tag:amenity=post office
@@ -5854,14 +10940,20 @@ ja:
     amenity=public_bookcase: JA:Tag:amenity=public bookcase
     amenity=public_building: JA:Tag:amenity=public building
     amenity=recycling: JA:Tag:amenity=recycling
+    amenity=register_office: JA:Tag:amenity=register office
     amenity=restaurant: JA:Tag:amenity=restaurant
+    amenity=retirement_home: JA:Tag:amenity=retirement home
+    amenity=sanitary_dump_station: JA:Tag:amenity=sanitary dump station
     amenity=sauna: JA:Tag:amenity=sauna
     amenity=school: JA:Tag:amenity=school
     amenity=shelter: JA:Tag:amenity=shelter
+    amenity=shower: JA:Tag:amenity=shower
+    amenity=smoking_area: JA:Tag:amenity=smoking area
     amenity=social_centre: JA:Tag:amenity=social centre
     amenity=social_facility: JA:Tag:amenity=social facility
     amenity=stripclub: JA:Tag:amenity=stripclub
     amenity=studio: JA:Tag:amenity=studio
+    amenity=swimming_pool: JA:Tag:amenity=swimming pool
     amenity=taxi: JA:Tag:amenity=taxi
     amenity=telephone: JA:Tag:amenity=telephone
     amenity=theatre: JA:Tag:amenity=theatre
@@ -5873,59 +10965,300 @@ ja:
     amenity=waste_basket: JA:Tag:amenity=waste basket
     amenity=waste_disposal: JA:Tag:amenity=waste disposal
     amenity=waste_transfer_station: JA:Tag:amenity=waste transfer station
+    amenity=water: JA:Tag:amenity=water
+    amenity=water_point: JA:Tag:amenity=water point
     amenity=watering_place: JA:Tag:amenity=watering place
     atm=yes: JA:Tag:atm=yes
+    attraction=animal: JA:Tag:attraction=animal
+    attraction=train: JA:Tag:attraction=train
+    barrier=block: JA:Tag:barrier=block
     barrier=bollard: JA:Tag:barrier=bollard
+    barrier=cable_barrier: JA:Tag:barrier=cable barrier
+    barrier=cattle_grid: JA:Tag:barrier=cattle grid
+    barrier=chain: JA:Tag:barrier=chain
+    barrier=city_wall: JA:Tag:barrier=city wall
+    barrier=cycle_barrier: JA:Tag:barrier=cycle barrier
     barrier=ditch: JA:Tag:barrier=ditch
+    barrier=entrance: JA:Tag:barrier=entrance
     barrier=fence: JA:Tag:barrier=fence
     barrier=gate: JA:Tag:barrier=gate
+    barrier=guard_rail: JA:Tag:barrier=guard rail
+    barrier=handrail: JA:Tag:barrier=handrail
     barrier=hedge: JA:Tag:barrier=hedge
+    barrier=kerb: JA:Tag:barrier=kerb
+    barrier=kissing_gate: JA:Tag:barrier=kissing gate
     barrier=lift_gate: JA:Tag:barrier=lift gate
+    barrier=log: JA:Tag:barrier=log
     barrier=retaining_wall: JA:Tag:barrier=retaining wall
+    barrier=sally_port: JA:Tag:barrier=sally port
+    barrier=stile: JA:Tag:barrier=stile
+    barrier=sump_buster: JA:Tag:barrier=sump buster
     barrier=toll_booth: JA:Tag:barrier=toll booth
+    barrier=turnstile: JA:Tag:barrier=turnstile
     barrier=wall: JA:Tag:barrier=wall
     bicycle=designated: JA:Tag:bicycle=designated
+    bicycle=use_sidepath: JA:Tag:bicycle=use sidepath
     boundary=administrative: JA:Tag:boundary=administrative
+    boundary=civil: JA:Tag:boundary=civil
+    boundary=economic: JA:Tag:boundary=economic
+    boundary=historic: JA:Tag:boundary=historic
+    boundary=local_authority: JA:Tag:boundary=local authority
+    boundary=maritime: JA:Tag:boundary=maritime
+    boundary=military_district: JA:Tag:boundary=military district
+    boundary=national: JA:Tag:boundary=national
     boundary=national_park: JA:Tag:boundary=national park
+    boundary=political: JA:Tag:boundary=political
+    boundary=postal_code: JA:Tag:boundary=postal code
     boundary=protected_area: JA:Tag:boundary=protected area
+    boundary=regional_park: JA:Tag:boundary=regional park
+    bridge:movable=bascule: JA:Tag:bridge:movable=bascule
+    bridge:movable=drawbridge: JA:Tag:bridge:movable=drawbridge
+    bridge:movable=lift: JA:Tag:bridge:movable=lift
+    bridge:movable=submersible: JA:Tag:bridge:movable=submersible
+    bridge:movable=swing: JA:Tag:bridge:movable=swing
+    bridge:movable=transporter: JA:Tag:bridge:movable=transporter
+    bridge:structure=arch: JA:Tag:bridge:structure=arch
+    bridge:structure=beam: JA:Tag:bridge:structure=beam
+    bridge:structure=cable-stayed: JA:Tag:bridge:structure=cable-stayed
+    bridge:structure=floating: JA:Tag:bridge:structure=floating
+    bridge:structure=humpback: JA:Tag:bridge:structure=humpback
+    bridge:structure=simple-suspension: JA:Tag:bridge:structure=simple-suspension
+    bridge:structure=suspension: JA:Tag:bridge:structure=suspension
+    bridge:structure=truss: JA:Tag:bridge:structure=truss
+    bridge=aqueduct: JA:Tag:bridge=aqueduct
+    bridge=boardwalk: JA:Tag:bridge=boardwalk
+    bridge=cantilever: JA:Tag:bridge=cantilever
+    bridge=covered: JA:Tag:bridge=covered
+    bridge=drawbridge: JA:Tag:bridge=drawbridge
+    bridge=movable: JA:Tag:bridge=movable
+    bridge=simple_brunnel: JA:Tag:bridge=simple brunnel
+    bridge=trestle: JA:Tag:bridge=trestle
     bridge=viaduct: JA:Tag:bridge=viaduct
+    building=apartments: JA:Tag:building=apartments
+    building=barn: JA:Tag:building=barn
     building=bridge: JA:Tag:building=bridge
+    building=bungalow: JA:Tag:building=bungalow
+    building=bunker: JA:Tag:building=bunker
+    building=cabin: JA:Tag:building=cabin
+    building=cathedral: JA:Tag:building=cathedral
+    building=chapel: JA:Tag:building=chapel
+    building=church: JA:Tag:building=church
+    building=civic: JA:Tag:building=civic
     building=commercial: JA:Tag:building=commercial
+    building=construction: JA:Tag:building=construction
+    building=cowshed: JA:Tag:building=cowshed
+    building=detached: JA:Tag:building=detached
+    building=dormitory: JA:Tag:building=dormitory
+    building=entrance: JA:Tag:building=entrance
+    building=farm: JA:Tag:building=farm
+    building=farm_auxiliary: JA:Tag:building=farm auxiliary
+    building=garage: JA:Tag:building=garage
+    building=garages: JA:Tag:building=garages
+    building=greenhouse: JA:Tag:building=greenhouse
+    building=hangar: JA:Tag:building=hangar
     building=hospital: JA:Tag:building=hospital
+    building=hotel: JA:Tag:building=hotel
     building=house: JA:Tag:building=house
+    building=houseboat: JA:Tag:building=houseboat
+    building=hut: JA:Tag:building=hut
     building=industrial: JA:Tag:building=industrial
+    building=kindergarten: JA:Tag:building=kindergarten
+    building=kiosk: JA:Tag:building=kiosk
+    building=manufacture: JA:Tag:building=manufacture
+    building=mosque: JA:Tag:building=mosque
+    building=office: JA:Tag:building=office
     building=public: JA:Tag:building=public
+    building=residential: JA:Tag:building=residential
+    building=retail: JA:Tag:building=retail
     building=roof: JA:Tag:building=roof
     building=ruins: JA:Tag:building=ruins
+    building=school: JA:Tag:building=school
+    building=service: JA:Tag:building=service
+    building=shed: JA:Tag:building=shed
     building=shrine: JA:Tag:building=shrine
+    building=stable: JA:Tag:building=stable
+    building=stadium: JA:Tag:building=stadium
+    building=static_caravan: JA:Tag:building=static caravan
+    building=sty: JA:Tag:building=sty
+    building=supermarket: JA:Tag:building=supermarket
+    building=synagogue: JA:Tag:building=synagogue
     building=temple: JA:Tag:building=temple
+    building=terrace: JA:Tag:building=terrace
     building=train_station: JA:Tag:building=train station
+    building=transformer_tower: JA:Tag:building=transformer tower
+    building=transportation: JA:Tag:building=transportation
+    building=university: JA:Tag:building=university
+    building=warehouse: JA:Tag:building=warehouse
+    busway=opposite_lane: JA:Tag:busway=opposite lane
+    castle_type=fortress: JA:Tag:castle type=fortress
+    cemetery=grave: JA:Tag:cemetery=grave
+    club=fan: JA:Tag:club=fan
+    craft=agricultural_engines: JA:Tag:craft=agricultural engines
+    craft=basket_maker: JA:Tag:craft=basket maker
+    craft=beekeeper: JA:Tag:craft=beekeeper
+    craft=blacksmith: JA:Tag:craft=blacksmith
+    craft=boatbuilder: JA:Tag:craft=boatbuilder
+    craft=bookbinder: JA:Tag:craft=bookbinder
     craft=brewery: JA:Tag:craft=brewery
+    craft=builder: JA:Tag:craft=builder
+    craft=cabinet_maker: JA:Tag:craft=cabinet maker
+    craft=carpenter: JA:Tag:craft=carpenter
+    craft=carpet_layer: JA:Tag:craft=carpet layer
+    craft=caterer: JA:Tag:craft=caterer
     craft=chimney_sweeper: JA:Tag:craft=chimney sweeper
+    craft=clockmaker: JA:Tag:craft=clockmaker
+    craft=confectionery: JA:Tag:craft=confectionery
+    craft=distillery: JA:Tag:craft=distillery
+    craft=dressmaker: JA:Tag:craft=dressmaker
+    craft=electrician: JA:Tag:craft=electrician
     craft=floorer: JA:Tag:craft=floorer
+    craft=gardener: JA:Tag:craft=gardener
+    craft=glaziery: JA:Tag:craft=glaziery
+    craft=handicraft: JA:Tag:craft=handicraft
+    craft=hvac: JA:Tag:craft=hvac
+    craft=insulation: JA:Tag:craft=insulation
+    craft=jeweller: JA:Tag:craft=jeweller
+    craft=key_cutter: JA:Tag:craft=key cutter
+    craft=locksmith: JA:Tag:craft=locksmith
+    craft=metal_construction: JA:Tag:craft=metal construction
+    craft=optician: JA:Tag:craft=optician
+    craft=painter: JA:Tag:craft=painter
+    craft=parquet_layer: JA:Tag:craft=parquet layer
+    craft=photographer: JA:Tag:craft=photographer
+    craft=photographic_laboratory: JA:Tag:craft=photographic laboratory
+    craft=piano_tuner: JA:Tag:craft=piano tuner
+    craft=plasterer: JA:Tag:craft=plasterer
+    craft=plumber: JA:Tag:craft=plumber
+    craft=pottery: JA:Tag:craft=pottery
+    craft=rigger: JA:Tag:craft=rigger
+    craft=roofer: JA:Tag:craft=roofer
+    craft=saddler: JA:Tag:craft=saddler
+    craft=sailmaker: JA:Tag:craft=sailmaker
+    craft=sawmill: JA:Tag:craft=sawmill
+    craft=scaffolder: JA:Tag:craft=scaffolder
+    craft=sculptor: JA:Tag:craft=sculptor
+    craft=shoemaker: JA:Tag:craft=shoemaker
+    craft=stand_builder: JA:Tag:craft=stand builder
+    craft=stonemason: JA:Tag:craft=stonemason
+    craft=sun_protection: JA:Tag:craft=sun protection
     craft=tailor: JA:Tag:craft=tailor
+    craft=tiler: JA:Tag:craft=tiler
+    craft=tinsmith: JA:Tag:craft=tinsmith
+    craft=turner: JA:Tag:craft=turner
+    craft=upholsterer: JA:Tag:craft=upholsterer
+    craft=watchmaker: JA:Tag:craft=watchmaker
+    craft=window_construction: JA:Tag:craft=window construction
     craft=winery: JA:Tag:craft=winery
+    crop=rice: JA:Tag:crop=rice
+    cuisine=brazilian: JA:Tag:cuisine=brazilian
+    cuisine=coffee_shop: JA:Tag:cuisine=coffee shop
+    cuisine=dessert: JA:Tag:cuisine=dessert
+    cycleway=lane: JA:Tag:cycleway=lane
+    cycleway=opposite_track: JA:Tag:cycleway=opposite track
+    cycleway=share_busway: JA:Tag:cycleway=share busway
+    cycleway=track: JA:Tag:cycleway=track
+    denomination=jodo_shinshu: JA:Tag:denomination=jodo shinshu
+    denomination=jodo_shu: JA:Tag:denomination=jodo shu
+    denomination=nichiren: JA:Tag:denomination=nichiren
+    denomination=shingon_shu: JA:Tag:denomination=shingon shu
+    denomination=soto: JA:Tag:denomination=soto
+    denomination=tiantai: JA:Tag:denomination=tiantai
+    emergency=ambulance_station: JA:Tag:emergency=ambulance station
     emergency=defibrillator: JA:Tag:emergency=defibrillator
     emergency=fire_extinguisher: JA:Tag:emergency=fire extinguisher
+    emergency=fire_hose: JA:Tag:emergency=fire hose
     emergency=fire_hydrant: JA:Tag:emergency=fire hydrant
+    emergency=fire_water_pond: JA:Tag:emergency=fire water pond
+    emergency=lifeguard_tower: JA:Tag:emergency=lifeguard tower
     emergency=phone: JA:Tag:emergency=phone
+    emergency=siren: JA:Tag:emergency=siren
+    emergency=water_tank: JA:Tag:emergency=water tank
+    entrance=staircase: JA:Tag:entrance=staircase
     foot=designated: JA:Tag:foot=designated
     foot=private: JA:Tag:foot=private
     footway=crossing: JA:Tag:footway=crossing
     footway=sidewalk: JA:Tag:footway=sidewalk
+    generator:method=anaerobic_digestion: JA:Tag:generator:method=anaerobic digestion
+    generator:method=barrage: JA:Tag:generator:method=barrage
+    generator:method=combustion: JA:Tag:generator:method=combustion
+    generator:method=fission: JA:Tag:generator:method=fission
+    generator:method=fusion: JA:Tag:generator:method=fusion
+    generator:method=gasification: JA:Tag:generator:method=gasification
+    generator:method=photovoltaic: JA:Tag:generator:method=photovoltaic
+    generator:method=run-of-the-river: JA:Tag:generator:method=run-of-the-river
+    generator:method=stream: JA:Tag:generator:method=stream
+    generator:method=thermal: JA:Tag:generator:method=thermal
+    generator:method=water-pumped-storage: JA:Tag:generator:method=water-pumped-storage
+    generator:method=water-storage: JA:Tag:generator:method=water-storage
+    generator:method=wind_turbine: JA:Tag:generator:method=wind turbine
+    generator:plant=intermediate: JA:Tag:generator:plant=intermediate
+    generator:plant=output: JA:Tag:generator:plant=output
+    generator:source=biofuel: JA:Tag:generator:source=biofuel
+    generator:source=biogas: JA:Tag:generator:source=biogas
+    generator:source=biomass: JA:Tag:generator:source=biomass
+    generator:source=coal: JA:Tag:generator:source=coal
+    generator:source=gas: JA:Tag:generator:source=gas
+    generator:source=gasoline: JA:Tag:generator:source=gasoline
+    generator:source=geothermal: JA:Tag:generator:source=geothermal
+    generator:source=hydro: JA:Tag:generator:source=hydro
+    generator:source=nuclear: JA:Tag:generator:source=nuclear
+    generator:source=oil: JA:Tag:generator:source=oil
     generator:source=solar: JA:Tag:generator:source=solar
+    generator:source=tidal: JA:Tag:generator:source=tidal
+    generator:source=waste: JA:Tag:generator:source=waste
+    generator:source=wave: JA:Tag:generator:source=wave
+    generator:source=wind: JA:Tag:generator:source=wind
+    generator:type=combined_cycle: JA:Tag:generator:type=combined cycle
+    generator:type=francis_turbine: JA:Tag:generator:type=francis turbine
+    generator:type=gas_turbine: JA:Tag:generator:type=gas turbine
+    generator:type=heat_pump: JA:Tag:generator:type=heat pump
+    generator:type=horizontal_axis: JA:Tag:generator:type=horizontal axis
+    generator:type=hydrodynamic_screw: JA:Tag:generator:type=hydrodynamic screw
+    generator:type=kaplan_turbine: JA:Tag:generator:type=kaplan turbine
+    generator:type=pelton_turbine: JA:Tag:generator:type=pelton turbine
+    generator:type=reciprocating_engine: JA:Tag:generator:type=reciprocating engine
+    generator:type=solar_photovoltaic_panel: JA:Tag:generator:type=solar photovoltaic
+      panel
+    generator:type=solar_thermal_collector: JA:Tag:generator:type=solar thermal collector
+    generator:type=steam_generator: JA:Tag:generator:type=steam generator
+    generator:type=steam_turbine: JA:Tag:generator:type=steam turbine
+    generator:type=vertical_axis: JA:Tag:generator:type=vertical axis
+    geological=moraine: JA:Tag:geological=moraine
+    geological=outcrop: JA:Tag:geological=outcrop
+    geological=palaeontological_site: JA:Tag:geological=palaeontological site
+    golf=bunker: JA:Tag:golf=bunker
+    golf=fairway: JA:Tag:golf=fairway
+    government=ministry: JA:Tag:government=ministry
+    government=prosecutor: JA:Tag:government=prosecutor
+    government=register_office: JA:Tag:government=register office
+    government=tax: JA:Tag:government=tax
+    guidepost=simple: JA:Tag:guidepost=simple
+    healthcare=blood_donation: JA:Tag:healthcare=blood donation
     hgv=designated: JA:Tag:hgv=designated
+    highway=bridleway: JA:Tag:highway=bridleway
+    highway=bus_guideway: JA:Tag:highway=bus guideway
     highway=bus_stop: JA:Tag:highway=bus stop
+    highway=corridor: JA:Tag:highway=corridor
     highway=crossing: JA:Tag:highway=crossing
     highway=cycleway: JA:Tag:highway=cycleway
     highway=elevator: JA:Tag:highway=elevator
+    highway=emergency_access_point: JA:Tag:highway=emergency access point
+    highway=escape: JA:Tag:highway=escape
     highway=footway: JA:Tag:highway=footway
+    highway=ford: JA:Tag:highway=ford
+    highway=give_way: JA:Tag:highway=give way
+    highway=living_street: JA:Tag:highway=living street
+    highway=milestone: JA:Tag:highway=milestone
+    highway=mini_roundabout: JA:Tag:highway=mini roundabout
     highway=motorway: JA:Tag:highway=motorway
     highway=motorway_junction: JA:Tag:highway=motorway junction
+    highway=motorway_link: JA:Tag:highway=motorway link
     highway=passing_place: JA:Tag:highway=passing place
     highway=path: JA:Tag:highway=path
     highway=pedestrian: JA:Tag:highway=pedestrian
+    highway=platform: JA:Tag:highway=platform
     highway=primary: JA:Tag:highway=primary
+    highway=proposed: JA:Tag:highway=proposed
     highway=raceway: JA:Tag:highway=raceway
     highway=residential: JA:Tag:highway=residential
     highway=rest_area: JA:Tag:highway=rest area
@@ -5935,23 +11268,81 @@ ja:
     highway=services: JA:Tag:highway=services
     highway=speed_camera: JA:Tag:highway=speed camera
     highway=steps: JA:Tag:highway=steps
+    highway=stop: JA:Tag:highway=stop
+    highway=street_lamp: JA:Tag:highway=street lamp
     highway=tertiary: JA:Tag:highway=tertiary
     highway=track: JA:Tag:highway=track
+    highway=traffic_mirror: JA:Tag:highway=traffic mirror
     highway=traffic_signals: JA:Tag:highway=traffic signals
     highway=trunk: JA:Tag:highway=trunk
     highway=turning_circle: JA:Tag:highway=turning circle
+    highway=turning_loop: JA:Tag:highway=turning loop
     highway=unclassified: JA:Tag:highway=unclassified
+    historic=aircraft: JA:Tag:historic=aircraft
     historic=archaeological_site: JA:Tag:historic=archaeological site
     historic=battlefield: JA:Tag:historic=battlefield
     historic=boundary_stone: JA:Tag:historic=boundary stone
+    historic=cannon: JA:Tag:historic=cannon
+    historic=castle: JA:Tag:historic=castle
+    historic=city_gate: JA:Tag:historic=city gate
+    historic=citywalls: JA:Tag:historic=citywalls
+    historic=farm: JA:Tag:historic=farm
+    historic=fort: JA:Tag:historic=fort
+    historic=gallows: JA:Tag:historic=gallows
+    historic=heritage: JA:Tag:historic=heritage
+    historic=highwater_mark: JA:Tag:historic=highwater mark
+    historic=locomotive: JA:Tag:historic=locomotive
+    historic=memorial: JA:Tag:historic=memorial
+    historic=milestone: JA:Tag:historic=milestone
+    historic=monastery: JA:Tag:historic=monastery
     historic=monument: JA:Tag:historic=monument
+    historic=optical_telegraph: JA:Tag:historic=optical telegraph
+    historic=pillory: JA:Tag:historic=pillory
+    historic=ruins: JA:Tag:historic=ruins
+    historic=rune_stone: JA:Tag:historic=rune stone
+    historic=ship: JA:Tag:historic=ship
     historic=tomb: JA:Tag:historic=tomb
+    historic=tree_shrine: JA:Tag:historic=tree shrine
+    historic=wayside_cross: JA:Tag:historic=wayside cross
     historic=wayside_shrine: JA:Tag:historic=wayside shrine
+    historic=wreck: JA:Tag:historic=wreck
     horse=designated: JA:Tag:horse=designated
+    industrial=aluminium_smelting: JA:Tag:industrial=aluminium smelting
+    industrial=auto_wrecker: JA:Tag:industrial=auto wrecker
+    industrial=bakery: JA:Tag:industrial=bakery
+    industrial=brewery: JA:Tag:industrial=brewery
+    industrial=brickyard: JA:Tag:industrial=brickyard
+    industrial=depot: JA:Tag:industrial=depot
+    industrial=distributor: JA:Tag:industrial=distributor
+    industrial=factory: JA:Tag:industrial=factory
+    industrial=furniture: JA:Tag:industrial=furniture
+    industrial=grinding_mill: JA:Tag:industrial=grinding mill
+    industrial=heating_station: JA:Tag:industrial=heating station
+    industrial=ice_factory: JA:Tag:industrial=ice factory
+    industrial=machine_shop: JA:Tag:industrial=machine shop
+    industrial=mine: JA:Tag:industrial=mine
+    industrial=mobile_equipment: JA:Tag:industrial=mobile equipment
+    industrial=oil: JA:Tag:industrial=oil
+    industrial=oil_mill: JA:Tag:industrial=oil mill
+    industrial=port: JA:Tag:industrial=port
+    industrial=salt_pond: JA:Tag:industrial=salt pond
+    industrial=sawmill: JA:Tag:industrial=sawmill
+    industrial=scrap_yard: JA:Tag:industrial=scrap yard
+    industrial=shipyard: JA:Tag:industrial=shipyard
+    industrial=slaughterhouse: JA:Tag:industrial=slaughterhouse
+    industrial=steelmaking: JA:Tag:industrial=steelmaking
+    industrial=warehouse: JA:Tag:industrial=warehouse
+    industrial=well_cluster: JA:Tag:industrial=well cluster
+    information=board: JA:Tag:information=board
     information=guidepost: JA:Tag:information=guidepost
+    information=map: JA:Tag:information=map
+    information=tactile_map: JA:Tag:information=tactile map
+    information=tactile_model: JA:Tag:information=tactile model
+    junction=circular: JA:Tag:junction=circular
     junction=roundabout: JA:Tag:junction=roundabout
     junction=yes: JA:Tag:junction=yes
     landuse=allotments: JA:Tag:landuse=allotments
+    landuse=aquaculture: JA:Tag:landuse=aquaculture
     landuse=basin: JA:Tag:landuse=basin
     landuse=brownfield: JA:Tag:landuse=brownfield
     landuse=cemetery: JA:Tag:landuse=cemetery
@@ -5968,6 +11359,7 @@ ja:
     landuse=greenhouse_horticulture: JA:Tag:landuse=greenhouse horticulture
     landuse=industrial: JA:Tag:landuse=industrial
     landuse=landfill: JA:Tag:landuse=landfill
+    landuse=logging: JA:Tag:landuse=logging
     landuse=meadow: JA:Tag:landuse=meadow
     landuse=military: JA:Tag:landuse=military
     landuse=orchard: JA:Tag:landuse=orchard
     landuse=residential: JA:Tag:landuse=residential
     landuse=retail: JA:Tag:landuse=retail
     landuse=salt_pond: JA:Tag:landuse=salt pond
+    landuse=traffic_island: JA:Tag:landuse=traffic island
     landuse=village_green: JA:Tag:landuse=village green
+    landuse=vineyard: JA:Tag:landuse=vineyard
     landuse=wood: JA:Tag:landuse=wood
+    leaf_cycle=deciduous: JA:Tag:leaf cycle=deciduous
+    leaf_cycle=evergreen: JA:Tag:leaf cycle=evergreen
+    leaf_cycle=mixed: JA:Tag:leaf cycle=mixed
+    leaf_cycle=semi_deciduous: JA:Tag:leaf cycle=semi deciduous
+    leaf_cycle=semi_evergreen: JA:Tag:leaf cycle=semi evergreen
     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=amusement_arcade: JA:Tag:leisure=amusement arcade
+    leisure=bandstand: JA:Tag:leisure=bandstand
     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=common: JA:Tag:leisure=common
     leisure=dance: JA:Tag:leisure=dance
     leisure=dog_park: JA:Tag:leisure=dog park
+    leisure=firepit: JA:Tag:leisure=firepit
+    leisure=fishing: JA:Tag:leisure=fishing
+    leisure=fitness_centre: JA:Tag:leisure=fitness centre
     leisure=garden: JA:Tag:leisure=garden
     leisure=golf_course: JA:Tag:leisure=golf course
+    leisure=hackerspace: JA:Tag:leisure=hackerspace
+    leisure=horse_riding: JA:Tag:leisure=horse riding
     leisure=ice_rink: JA:Tag:leisure=ice rink
     leisure=marina: JA:Tag:leisure=marina
     leisure=miniature_golf: JA:Tag:leisure=miniature golf
     leisure=nature_reserve: JA:Tag:leisure=nature reserve
     leisure=park: JA:Tag:leisure=park
+    leisure=picnic_table: JA:Tag:leisure=picnic table
     leisure=pitch: JA:Tag:leisure=pitch
     leisure=playground: JA:Tag:leisure=playground
+    leisure=sauna: JA:Tag:leisure=sauna
     leisure=slipway: JA:Tag:leisure=slipway
     leisure=sports_centre: JA:Tag:leisure=sports centre
     leisure=stadium: JA:Tag:leisure=stadium
+    leisure=summer_camp: JA:Tag:leisure=summer camp
+    leisure=swimming_area: JA:Tag:leisure=swimming area
     leisure=swimming_pool: JA:Tag:leisure=swimming pool
     leisure=track: JA:Tag:leisure=track
     leisure=water_park: JA:Tag:leisure=water park
     man_made=adit: JA:Tag:man made=adit
+    man_made=beacon: JA:Tag:man made=beacon
     man_made=breakwater: JA:Tag:man made=breakwater
     man_made=bridge: JA:Tag:man made=bridge
+    man_made=bunker_silo: JA:Tag:man made=bunker silo
+    man_made=campanile: JA:Tag:man made=campanile
+    man_made=chimney: JA:Tag:man made=chimney
+    man_made=clearcut: JA:Tag:man made=clearcut
     man_made=communications_tower: JA:Tag:man made=communications tower
     man_made=crane: JA:Tag:man made=crane
+    man_made=cross: JA:Tag:man made=cross
     man_made=cutline: JA:Tag:man made=cutline
+    man_made=dike: JA:Tag:man made=dike
+    man_made=dyke: JA:Tag:man made=dyke
+    man_made=embankment: JA:Tag:man made=embankment
     man_made=flagpole: JA:Tag:man made=flagpole
+    man_made=flare: JA:Tag:man made=flare
+    man_made=gasometer: JA:Tag:man made=gasometer
     man_made=groyne: JA:Tag:man made=groyne
+    man_made=hot_water_tank: JA:Tag:man made=hot water tank
+    man_made=insect_hotel: JA:Tag:man made=insect hotel
     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=monitoring_station: JA:Tag:man made=monitoring station
+    man_made=obelisk: JA:Tag:man made=obelisk
+    man_made=observatory: JA:Tag:man made=observatory
+    man_made=petroleum_well: JA:Tag:man made=petroleum well
     man_made=pier: JA:Tag:man made=pier
+    man_made=pipeline: JA:Tag:man made=pipeline
+    man_made=power_hydro: JA:Tag:man made=power hydro
+    man_made=pumping_station: JA:Tag:man made=pumping station
     man_made=reservoir_covered: JA:Tag:man made=reservoir covered
+    man_made=silo: JA:Tag:man made=silo
+    man_made=snow_fence: JA:Tag:man made=snow fence
+    man_made=snow_net: JA:Tag:man made=snow net
+    man_made=storage_tank: JA:Tag:man made=storage tank
     man_made=street_cabinet: JA:Tag:man made=street cabinet
+    man_made=surveillance: JA:Tag:man made=surveillance
+    man_made=survey_point: JA:Tag:man made=survey point
+    man_made=telescope: JA:Tag:man made=telescope
     man_made=tower: JA:Tag:man made=tower
     man_made=wastewater_plant: JA:Tag:man made=wastewater plant
+    man_made=water_tower: JA:Tag:man made=water tower
     man_made=water_well: JA:Tag:man made=water well
+    man_made=water_works: JA:Tag:man made=water works
+    man_made=watermill: JA:Tag:man made=watermill
+    man_made=wildlife_crossing: JA:Tag:man made=wildlife crossing
+    man_made=windmill: JA:Tag:man made=windmill
+    man_made=windpump: JA:Tag:man made=windpump
     man_made=works: JA:Tag:man made=works
+    microbrewery=yes: JA:Tag:microbrewery=yes
+    military=airfield: JA:Tag:military=airfield
+    military=ammunition: JA:Tag:military=ammunition
+    military=bunker: JA:Tag:military=bunker
+    military=checkpoint: JA:Tag:military=checkpoint
+    military=danger_area: JA:Tag:military=danger area
+    military=naval_base: JA:Tag:military=naval base
+    military=office: JA:Tag:military=office
+    military=range: JA:Tag:military=range
+    military=trench: JA:Tag:military=trench
     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=cave_entrance: JA:Tag:natural=cave entrance
     natural=cliff: JA:Tag:natural=cliff
     natural=coastline: JA:Tag:natural=coastline
+    natural=desert: JA:Tag:natural=desert
     natural=fell: JA:Tag:natural=fell
+    natural=geyser: JA:Tag:natural=geyser
+    natural=glacier: JA:Tag:natural=glacier
     natural=grassland: JA:Tag:natural=grassland
     natural=heath: JA:Tag:natural=heath
+    natural=hot_spring: JA:Tag:natural=hot spring
+    natural=land: JA:Tag:natural=land
+    natural=moor: JA:Tag:natural=moor
+    natural=mud: JA:Tag:natural=mud
+    natural=peak: JA:Tag:natural=peak
     natural=ridge: JA:Tag:natural=ridge
+    natural=riverbed: JA:Tag:natural=riverbed
+    natural=rock: JA:Tag:natural=rock
     natural=saddle: JA:Tag:natural=saddle
+    natural=sand: JA:Tag:natural=sand
     natural=scree: JA:Tag:natural=scree
     natural=scrub: JA:Tag:natural=scrub
+    natural=shingle: JA:Tag:natural=shingle
+    natural=shoal: JA:Tag:natural=shoal
+    natural=sinkhole: JA:Tag:natural=sinkhole
     natural=spring: JA:Tag:natural=spring
+    natural=stone: JA:Tag:natural=stone
     natural=tree: JA:Tag:natural=tree
     natural=tree_row: JA:Tag:natural=tree row
+    natural=valley: JA:Tag:natural=valley
     natural=volcano: JA:Tag:natural=volcano
     natural=water: JA:Tag:natural=water
     natural=wetland: JA:Tag:natural=wetland
     natural=wood: JA:Tag:natural=wood
+    network=JP:national: JA:Tag:network=JP:national
+    network=JP:prefectural: JA:Tag:network=JP:prefectural
+    network=JP:prefectural:gunma: JA:Tag:network=JP:prefectural:gunma
+    network=JP:prefectural:nagano: JA:Tag:network=JP:prefectural:nagano
+    network=jp:national: JA:Tag:network=jp:national
+    network=jp:prefectural: JA:Tag:network=jp:prefectural
+    network=jp:prefectural:gunma: JA:Tag:network=jp:prefectural:gunma
+    network=jp:prefectural:nagano: JA:Tag:network=jp:prefectural:nagano
+    network=ncn: JA:Tag:network=ncn
+    network=nwn: JA:Tag:network=nwn
+    office=accountant: JA:Tag:office=accountant
+    office=administrative: JA:Tag:office=administrative
+    office=architect: JA:Tag:office=architect
+    office=company: JA:Tag:office=company
+    office=employment_agency: JA:Tag:office=employment agency
+    office=estate_agent: JA:Tag:office=estate agent
+    office=government: JA:Tag:office=government
+    office=insurance: JA:Tag:office=insurance
+    office=it: JA:Tag:office=it
+    office=lawyer: JA:Tag:office=lawyer
+    office=newspaper: JA:Tag:office=newspaper
+    office=ngo: JA:Tag:office=ngo
+    office=political_party: JA:Tag:office=political party
+    office=quango: JA:Tag:office=quango
+    office=real_estate_agent: JA:Tag:office=real estate agent
+    office=religion: JA:Tag:office=religion
+    office=research: JA:Tag:office=research
+    office=tax_advisor: JA:Tag:office=tax advisor
+    office=telecommunication: JA:Tag:office=telecommunication
+    parking=surface: JA:Tag:parking=surface
     place=archipelago: JA:Tag:place=archipelago
     place=city: JA:Tag:place=city
+    place=city_block: JA:Tag:place=city block
     place=continent: JA:Tag:place=continent
     place=country: JA:Tag:place=country
     place=county: JA:Tag:place=county
+    place=farm: JA:Tag:place=farm
     place=hamlet: JA:Tag:place=hamlet
     place=island: JA:Tag:place=island
     place=islet: JA:Tag:place=islet
+    place=isolated_dwelling: JA:Tag:place=isolated dwelling
     place=locality: JA:Tag:place=locality
     place=neighbourhood: JA:Tag:place=neighbourhood
+    place=quarter: JA:Tag:place=quarter
+    place=square: JA:Tag:place=square
     place=state: JA:Tag:place=state
     place=suburb: JA:Tag:place=suburb
     place=town: JA:Tag:place=town
     place=village: JA:Tag:place=village
+    power=catenary_mast: JA:Tag:power=catenary mast
+    power=compensator: JA:Tag:power=compensator
     power=generator: JA:Tag:power=generator
+    power=heliostat: JA:Tag:power=heliostat
+    power=line: JA:Tag:power=line
+    power=minor_line: JA:Tag:power=minor line
+    power=plant: JA:Tag:power=plant
+    power=pole: JA:Tag:power=pole
+    power=station: JA:Tag:power=station
+    power=sub_station: JA:Tag:power=sub station
+    power=substation: JA:Tag:power=substation
+    power=tower: JA:Tag:power=tower
+    power=transformer: JA:Tag:power=transformer
     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
+    pump=manual: JA:Tag:pump=manual
+    pump=no: JA:Tag:pump=no
+    pump=powered: JA:Tag:pump=powered
     railway=abandoned: JA:Tag:railway=abandoned
+    railway=buffer_stop: JA:Tag:railway=buffer stop
     railway=crossing: JA:Tag:railway=crossing
+    railway=derail: JA:Tag:railway=derail
     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=light_rail: JA:Tag:railway=light rail
+    railway=milestone: JA:Tag:railway=milestone
     railway=miniature: JA:Tag:railway=miniature
     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=railway_crossing: JA:Tag:railway=railway crossing
     railway=roundhouse: JA:Tag:railway=roundhouse
+    railway=signal: JA:Tag:railway=signal
     railway=station: JA:Tag:railway=station
     railway=stop: JA:Tag:railway=stop
     railway=subway: JA:Tag:railway=subway
     railway=subway_entrance: JA:Tag:railway=subway entrance
+    railway=switch: JA:Tag:railway=switch
     railway=tram: JA:Tag:railway=tram
     railway=tram_stop: JA:Tag:railway=tram stop
+    railway=traverser: JA:Tag:railway=traverser
     railway=turntable: JA:Tag:railway=turntable
+    railway=yard: JA:Tag:railway=yard
+    recycling_type=container: JA:Tag:recycling type=container
+    religion=buddhist: JA:Tag:religion=buddhist
+    religion=christian: JA:Tag:religion=christian
+    religion=muslim: JA:Tag:religion=muslim
+    religion=shinto: JA:Tag:religion=shinto
+    residential=rural: JA:Tag:residential=rural
     route=bicycle: JA:Tag:route=bicycle
     route=bus: JA:Tag:route=bus
+    route=ferry: JA:Tag:route=ferry
+    route=fitness_trail: JA:Tag:route=fitness trail
+    route=light_rail: JA:Tag:route=light rail
     route=railway: JA:Tag:route=railway
     route=road: JA:Tag:route=road
+    route=running: JA:Tag:route=running
+    route=subway: JA:Tag:route=subway
     route=train: JA:Tag:route=train
+    route=tram: JA:Tag:route=tram
+    route=trolleybus: JA:Tag:route=trolleybus
+    segregated=no: JA:Tag:segregated=no
+    segregated=yes: JA:Tag:segregated=yes
     service=alley: JA:Tag:service=alley
+    service=bus: JA:Tag:service=bus
+    service=crossover: JA:Tag:service=crossover
+    service=drive-through: JA:Tag:service=drive-through
+    service=driveway: JA:Tag:service=driveway
+    service=emergency_access: JA:Tag:service=emergency access
     service=parking_aisle: JA:Tag:service=parking aisle
     service=siding: JA:Tag:service=siding
     service=spur: JA:Tag:service=spur
+    service=yard: JA:Tag:service=yard
     shop=alcohol: JA:Tag:shop=alcohol
     shop=anime: JA:Tag:shop=anime
+    shop=antiques: JA:Tag:shop=antiques
     shop=art: JA:Tag:shop=art
+    shop=baby_goods: JA:Tag:shop=baby goods
+    shop=bag: JA:Tag:shop=bag
     shop=bakery: JA:Tag:shop=bakery
+    shop=bathroom_furnishing: JA:Tag:shop=bathroom furnishing
     shop=beauty: JA:Tag:shop=beauty
+    shop=bed: JA:Tag:shop=bed
+    shop=beverages: JA:Tag:shop=beverages
     shop=bicycle: JA:Tag:shop=bicycle
+    shop=bookmaker: JA:Tag:shop=bookmaker
     shop=books: JA:Tag:shop=books
     shop=boutique: JA:Tag:shop=boutique
+    shop=brewing_supplies: JA:Tag:shop=brewing supplies
+    shop=butcher: JA:Tag:shop=butcher
+    shop=camera: JA:Tag:shop=camera
+    shop=candles: JA:Tag:shop=candles
+    shop=car: JA:Tag:shop=car
+    shop=car_parts: JA:Tag:shop=car parts
+    shop=car_repair: JA:Tag:shop=car repair
+    shop=carpet: JA:Tag:shop=carpet
     shop=charity: JA:Tag:shop=charity
+    shop=cheese: JA:Tag:shop=cheese
     shop=chemist: JA:Tag:shop=chemist
+    shop=chocolate: JA:Tag:shop=chocolate
     shop=clothes: JA:Tag:shop=clothes
+    shop=coffee: JA:Tag:shop=coffee
+    shop=collector: JA:Tag:shop=collector
+    shop=computer: JA:Tag:shop=computer
     shop=confectionery: JA:Tag:shop=confectionery
     shop=convenience: JA:Tag:shop=convenience
+    shop=copyshop: JA:Tag:shop=copyshop
+    shop=cosmetics: JA:Tag:shop=cosmetics
+    shop=craft: JA:Tag:shop=craft
+    shop=curtain: JA:Tag:shop=curtain
+    shop=dairy: JA:Tag:shop=dairy
     shop=deli: JA:Tag:shop=deli
     shop=department_store: JA:Tag:shop=department store
+    shop=dive: JA:Tag:shop=dive
     shop=doityourself: JA:Tag:shop=doityourself
+    shop=dry_cleaning: JA:Tag:shop=dry cleaning
+    shop=e-cigarette: JA:Tag:shop=e-cigarette
+    shop=electrical: JA:Tag:shop=electrical
+    shop=electronics: JA:Tag:shop=electronics
+    shop=energy: JA:Tag:shop=energy
+    shop=erotic: JA:Tag:shop=erotic
     shop=estate_agent: JA:Tag:shop=estate agent
+    shop=fabric: JA:Tag:shop=fabric
+    shop=farm: JA:Tag:shop=farm
+    shop=fashion: JA:Tag:shop=fashion
+    shop=fireplace: JA:Tag:shop=fireplace
+    shop=fishing: JA:Tag:shop=fishing
+    shop=fishmonger: JA:Tag:shop=fishmonger
     shop=florist: JA:Tag:shop=florist
+    shop=frame: JA:Tag:shop=frame
+    shop=frozen_food: JA:Tag:shop=frozen food
+    shop=funeral_directors: JA:Tag:shop=funeral directors
     shop=furniture: JA:Tag:shop=furniture
+    shop=gambling: JA:Tag:shop=gambling
+    shop=games: JA:Tag:shop=games
     shop=garden_centre: JA:Tag:shop=garden centre
+    shop=gas: JA:Tag:shop=gas
     shop=general: JA:Tag:shop=general
     shop=gift: JA:Tag:shop=gift
+    shop=glass: JA:Tag:shop=glass
+    shop=glaziery: JA:Tag:shop=glaziery
     shop=greengrocer: JA:Tag:shop=greengrocer
     shop=hairdresser: JA:Tag:shop=hairdresser
+    shop=hardware: JA:Tag:shop=hardware
+    shop=health: JA:Tag:shop=health
+    shop=health_food: JA:Tag:shop=health food
+    shop=hearing_aids: JA:Tag:shop=hearing aids
+    shop=herbalist: JA:Tag:shop=herbalist
+    shop=hifi: JA:Tag:shop=hifi
+    shop=houseware: JA:Tag:shop=houseware
+    shop=hunting: JA:Tag:shop=hunting
+    shop=ice_cream: JA:Tag:shop=ice cream
+    shop=interior_decoration: JA:Tag:shop=interior decoration
+    shop=jewelry: JA:Tag:shop=jewelry
+    shop=junk_yard: JA:Tag:shop=junk yard
     shop=kiosk: JA:Tag:shop=kiosk
+    shop=kitchen: JA:Tag:shop=kitchen
+    shop=lamps: JA:Tag:shop=lamps
+    shop=laundry: JA:Tag:shop=laundry
+    shop=leather: JA:Tag:shop=leather
+    shop=lighting: JA:Tag:shop=lighting
+    shop=locksmith: JA:Tag:shop=locksmith
+    shop=lottery: JA:Tag:shop=lottery
+    shop=mall: JA:Tag:shop=mall
     shop=massage: JA:Tag:shop=massage
+    shop=medical: JA:Tag:shop=medical
+    shop=medical_supply: JA:Tag:shop=medical supply
+    shop=mobile_phone: JA:Tag:shop=mobile phone
+    shop=model: JA:Tag:shop=model
     shop=money_lender: JA:Tag:shop=money lender
     shop=moneylender: JA:Tag:shop=moneylender
     shop=motorcycle: JA:Tag:shop=motorcycle
+    shop=motorcycle_repair: JA:Tag:shop=motorcycle repair
+    shop=music: JA:Tag:shop=music
+    shop=musical_instrument: JA:Tag:shop=musical instrument
+    shop=newsagent: JA:Tag:shop=newsagent
+    shop=nutrition_supplements: JA:Tag:shop=nutrition supplements
+    shop=optician: JA:Tag:shop=optician
+    shop=organic: JA:Tag:shop=organic
     shop=outdoor: JA:Tag:shop=outdoor
+    shop=paint: JA:Tag:shop=paint
+    shop=pasta: JA:Tag:shop=pasta
     shop=pastry: JA:Tag:shop=pastry
+    shop=pawnbroker: JA:Tag:shop=pawnbroker
+    shop=perfumery: JA:Tag:shop=perfumery
     shop=pet: JA:Tag:shop=pet
+    shop=pharmacy: JA:Tag:shop=pharmacy
+    shop=photo: JA:Tag:shop=photo
+    shop=printing: JA:Tag:shop=printing
+    shop=pyrotechnics: JA:Tag:shop=pyrotechnics
+    shop=radiotechnics: JA:Tag:shop=radiotechnics
+    shop=religion: JA:Tag:shop=religion
+    shop=scuba_diving: JA:Tag:shop=scuba diving
+    shop=seafood: JA:Tag:shop=seafood
     shop=second_hand: JA:Tag:shop=second hand
+    shop=sewing: JA:Tag:shop=sewing
+    shop=shoe_repair: JA:Tag:shop=shoe repair
+    shop=shoes: JA:Tag:shop=shoes
+    shop=souvenir: JA:Tag:shop=souvenir
+    shop=spices: JA:Tag:shop=spices
+    shop=sports: JA:Tag:shop=sports
+    shop=stationery: JA:Tag:shop=stationery
     shop=supermarket: JA:Tag:shop=supermarket
+    shop=swimming_pool: JA:Tag:shop=swimming pool
     shop=tailor: JA:Tag:shop=tailor
+    shop=tattoo: JA:Tag:shop=tattoo
+    shop=tea: JA:Tag:shop=tea
+    shop=ticket: JA:Tag:shop=ticket
     shop=tobacco: JA:Tag:shop=tobacco
+    shop=toys: JA:Tag:shop=toys
+    shop=trade: JA:Tag:shop=trade
+    shop=travel_agency: JA:Tag:shop=travel agency
+    shop=trophy: JA:Tag:shop=trophy
+    shop=tyres: JA:Tag:shop=tyres
     shop=vacant: JA:Tag:shop=vacant
+    shop=vacuum_cleaner: JA:Tag:shop=vacuum cleaner
     shop=variety_store: JA:Tag:shop=variety store
+    shop=video: JA:Tag:shop=video
+    shop=video_games: JA:Tag:shop=video games
     shop=watches: JA:Tag:shop=watches
+    shop=weapons: JA:Tag:shop=weapons
+    shop=wholesale: JA:Tag:shop=wholesale
+    shop=window_blind: JA:Tag:shop=window blind
+    shop=wine: JA:Tag:shop=wine
+    shop=yes: JA:Tag:shop=yes
     ski=designated: JA:Tag:ski=designated
     snowmobile=designated: JA:Tag:snowmobile=designated
+    social_facility=ambulatory_care: JA:Tag:social facility=ambulatory care
+    social_facility=assisted_living: JA:Tag:social facility=assisted living
+    social_facility=day_care: JA:Tag:social facility=day care
+    social_facility=food_bank: JA:Tag:social facility=food bank
+    social_facility=group_home: JA:Tag:social facility=group home
+    social_facility=nursing_home: JA:Tag:social facility=nursing home
+    social_facility=shelter: JA:Tag:social facility=shelter
+    social_facility=soup_kitchen: JA:Tag:social facility=soup kitchen
+    social_facility=workshop: JA:Tag:social facility=workshop
+    source=YahooJapan/ALPSMAP: JA:Tag:source=YahooJapan/ALPSMAP
     sport=10pin: JA:Tag:sport=10pin
+    sport=american_football: JA:Tag:sport=american football
+    sport=baseball: JA:Tag:sport=baseball
+    sport=basketball: JA:Tag:sport=basketball
+    sport=billiards: JA:Tag:sport=billiards
+    sport=golf: JA:Tag:sport=golf
     sport=judo: JA:Tag:sport=judo
+    sport=motocross: JA:Tag:sport=motocross
+    sport=multi: JA:Tag:sport=multi
     sport=sailing: JA:Tag:sport=sailing
+    sport=shooting: JA:Tag:sport=shooting
+    sport=soccer: JA:Tag:sport=soccer
+    sport=sumo: JA:Tag:sport=sumo
+    sport=swimming: JA:Tag:sport=swimming
+    sport=tennis: JA:Tag:sport=tennis
     sport=water_ski: JA:Tag:sport=water ski
+    station=light_rail: JA:Tag:station=light rail
+    station=subway: JA:Tag:station=subway
+    surface=asphalt: JA:Tag:surface=asphalt
+    tourism=alpine_hut: JA:Tag:tourism=alpine hut
+    tourism=apartment: JA:Tag:tourism=apartment
+    tourism=aquarium: JA:Tag:tourism=aquarium
     tourism=artwork: JA:Tag:tourism=artwork
+    tourism=attraction: JA:Tag:tourism=attraction
+    tourism=bed_and_breakfast: JA:Tag:tourism=bed and breakfast
     tourism=camp_site: JA:Tag:tourism=camp site
     tourism=caravan_site: JA:Tag:tourism=caravan site
+    tourism=chalet: JA:Tag:tourism=chalet
+    tourism=gallery: JA:Tag:tourism=gallery
+    tourism=guest_house: JA:Tag:tourism=guest house
     tourism=hostel: JA:Tag:tourism=hostel
     tourism=hotel: JA:Tag:tourism=hotel
     tourism=information: JA:Tag:tourism=information
+    tourism=motel: JA:Tag:tourism=motel
     tourism=museum: JA:Tag:tourism=museum
     tourism=picnic_site: JA:Tag:tourism=picnic site
+    tourism=resort: JA:Tag:tourism=resort
+    tourism=theme_park: JA:Tag:tourism=theme park
+    tourism=trail_riding_station: JA:Tag:tourism=trail riding station
     tourism=viewpoint: JA:Tag:tourism=viewpoint
+    tourism=wilderness_hut: JA:Tag:tourism=wilderness hut
+    tourism=wine_cellar: JA:Tag:tourism=wine cellar
+    tourism=zoo: JA:Tag:tourism=zoo
+    traffic_calming=island: JA:Tag:traffic calming=island
+    traffic_calming=table: JA:Tag:traffic calming=table
+    traffic_sign=city_limit: JA:Tag:traffic sign=city limit
     tunnel=culvert: JA:Tag:tunnel=culvert
     type=public_transport: JA:Tag:type=public transport
+    vending=bread: JA:Tag:vending=bread
+    vending=excrement_bags: JA:Tag:vending=excrement bags
+    vending=fuel: JA:Tag:vending=fuel
+    vending=milk: JA:Tag:vending=milk
     vending=parking_tickets: JA:Tag:vending=parking tickets
-    water=river: JA:Tag:water=river
+    vending=photo: JA:Tag:vending=photo
+    wall=no: JA:Tag:wall=no
+    water=intermittent: JA:Tag:water=intermittent
+    water=lock: JA:Tag:water=lock
+    waterway=boat_lift: JA:Tag:waterway=boat lift
+    waterway=boatyard: JA:Tag:waterway=boatyard
+    waterway=brook: JA:Tag:waterway=brook
     waterway=canal: JA:Tag:waterway=canal
     waterway=dam: JA:Tag:waterway=dam
+    waterway=deep_well: JA:Tag:waterway=deep well
     waterway=ditch: JA:Tag:waterway=ditch
     waterway=dock: JA:Tag:waterway=dock
     waterway=drain: JA:Tag:waterway=drain
+    waterway=dredged_area: JA:Tag:waterway=dredged area
+    waterway=drystream: JA:Tag:waterway=drystream
+    waterway=fairway: JA:Tag:waterway=fairway
+    waterway=fish_pass: JA:Tag:waterway=fish pass
+    waterway=fuel: JA:Tag:waterway=fuel
     waterway=lock_gate: JA:Tag:waterway=lock gate
+    waterway=milestone: JA:Tag:waterway=milestone
+    waterway=offshore_field: JA:Tag:waterway=offshore field
     waterway=river: JA:Tag:waterway=river
     waterway=riverbank: JA:Tag:waterway=riverbank
+    waterway=seaway: JA:Tag:waterway=seaway
     waterway=stream: JA:Tag:waterway=stream
+    waterway=turning_point: JA:Tag:waterway=turning point
     waterway=water_point: JA:Tag:waterway=water point
+    waterway=waterfall: JA:Tag:waterway=waterfall
     waterway=weir: JA:Tag:waterway=weir
+    wetland=bog: JA:Tag:wetland=bog
+    wetland=fen: JA:Tag:wetland=fen
+    wetland=mangrove: JA:Tag:wetland=mangrove
+    wetland=marsh: JA:Tag:wetland=marsh
+    wetland=reedbed: JA:Tag:wetland=reedbed
+    wetland=saltern: JA:Tag:wetland=saltern
+    wetland=saltmarsh: JA:Tag:wetland=saltmarsh
+    wetland=swamp: JA:Tag:wetland=swamp
+    wetland=tidalflat: JA:Tag:wetland=tidalflat
+    wetland=wet_meadow: JA:Tag:wetland=wet meadow
 ko:
   key:
     aerialway: Ko:Key:aerialway
+    amenity: Ko:Key:amenity
     ele: Ko:Key:ele
+    highway: Ko:Key:highway
+    name: Ko:Key:name
     wikipedia: Ko:Key:wikipedia
   tag:
     aerialway=cable_car: Ko:Tag:aerialway=cable car
@@ -6186,6 +11925,20 @@ lt:
 lv:
   key:
     highway: Lv:Key:highway
+ms:
+  tag:
+    highway=motorway: Ms:Tag:highway=motorway
+    highway=primary: MS:Tag:highway=primary
+    highway=residential: Ms:Tag:highway=residential
+    highway=secondary: Ms:Tag:highway=secondary
+    highway=service: Ms:Tag:highway=service
+    highway=tertiary: Ms:Tag:highway=tertiary
+    highway=trunk: Ms:Tag:highway=trunk
+    highway=unclassified: Ms:Tag:highway=unclassified
+ne:
+  tag:
+    landuse=meadow: Ne:Tag:landuse=meadow
+    natural=scrub: Ne:Tag:natural=scrub
 nl:
   key:
     AND_nosr_r: NL:Key:AND nosr r
@@ -6200,7 +11953,9 @@ nl:
     backrest: NL:Key:backrest
     barrier: NL:Key:barrier
     bench: NL:Key:bench
+    bicycle_road: NL:Key:bicycle road
     building: NL:Key:building
+    circumference: NL:Key:circumference
     color: NL:Key:color
     colour: NL:Key:colour
     craft: NL:Key:craft
@@ -6212,18 +11967,25 @@ nl:
     fenced: NL:Key:fenced
     internet_access: NL:Key:internet access
     landuse: NL:Key:landuse
+    leaf_cycle: NL:Key:leaf cycle
     leisure: NL:Key:leisure
     man_made: NL:Key:man made
     military: NL:Key:military
     name: NL:Key:name
     natural: NL:Key:natural
     office: NL:Key:office
+    place: NL:Key:place
     power_supply:schedule: NL:Key:power supply:schedule
     public_transport: NL:Key:public transport
+    religion: NL:Key:religion
     route_master: NL:Key:route master
     scenic: NL:Key:scenic
     shop: NL:Key:shop
+    surface: NL:Key:surface
     tourism: NL:Key:tourism
+    tracktype: NL:Key:tracktype
+    turn: NL:Key:turn
+    turn:lanes: NL:Key:turn:lanes
     type: NL:Key:type
     waste: NL:Key:waste
     wheelchair: NL:Key:wheelchair
@@ -6242,15 +12004,20 @@ nl:
     barrier=hedge: NL:Tag:barrier=hedge
     barrier=sump_buster: NL:Tag:barrier=sump buster
     building=entrance: NL:Tag:building=entrance
+    footway=sidewalk: NL:Tag:footway=sidewalk
+    healthcare=blood_donation: NL:Tag:healthcare=blood donation
+    highway=emergency_bay: NL:Tag:highway=emergency bay
     highway=footway: NL:Tag:highway=footway
     highway=motorway: NL:Tag:highway=motorway
     highway=path: NL:Tag:highway=path
+    historic=monument: NL:Tag:historic=monument
     information=tactile_map: NL:Tag:information=tactile map
     landuse=cemetery: NL:Tag:landuse=cemetery
     landuse=garages: NL:Tag:landuse=garages
     landuse=grass: NL:Tag:landuse=grass
     landuse=industrial: NL:Tag:landuse=industrial
     man_made=windmill: NL:Tag:man made=windmill
+    natural=tree: NL:Tag:natural=tree
     public_transport=platform: NL:Tag:public transport=platform
     public_transport=station: NL:Tag:public transport=station
     public_transport=stop_area: NL:Tag:public transport=stop area
@@ -6269,15 +12036,22 @@ no:
     maxheight:legal: No:Key:maxheight:legal
     maxheight:marine: No:Key:maxheight:marine
     maxheight:physical: No:Key:maxheight:physical
+    religion: No:Key:religion
+    room: No:Key:room
   tag:
     amenity=bank: No:Tag:amenity=bank
     amenity=fuel: No:Tag:amenity=fuel
     amenity=marketplace: No:Tag:amenity=marketplace
+    amenity=parking: No:Tag:amenity=parking
     amenity=pharmacy: No:Tag:amenity=pharmacy
     amenity=place_of_worship: No:Tag:amenity=place of worship
     boundary=maritime: No:Tag:boundary=maritime
+    leisure=park: No:Tag:leisure=park
+    natural=tree: No:Tag:natural=tree
 pl:
   key:
+    4wd_only: Pl:Key:4wd only
+    CEMT: Pl:Key:CEMT
     abutters: Pl:Key:abutters
     access: Pl:Key:access
     addr: Pl:Key:addr
@@ -6303,20 +12077,28 @@ pl:
     alt_name: Pl:Key:alt name
     amenity: Pl:Key:amenity
     area: Pl:Key:area
+    area:highway: Pl:Key:area:highway
+    artwork_type: Pl:Key:artwork type
     automatic_door: Pl:Key:automatic door
     backrest: Pl:Key:backrest
     bar: Pl:Key:bar
     barrier: Pl:Key:barrier
+    beds: Pl:Key:beds
     bench: Pl:Key:bench
     bicycle: Pl:Key:bicycle
     bicycle_parking: Pl:Key:bicycle parking
     bicycle_road: Pl:Key:bicycle road
+    board_type: Pl:Key:board type
     bollard: Pl:Key:bollard
     border_type: Pl:Key:border type
     boundary: Pl:Key:boundary
     brand: Pl:Key:brand
     bridge: Pl:Key:bridge
+    bridge:movable: Pl:Key:bridge:movable
+    bridge:structure: Pl:Key:bridge:structure
+    bridge:support: Pl:Key:bridge:support
     building: Pl:Key:building
+    building:architecture: Pl:Key:building:architecture
     building:cullis:height: Pl:Key:building:cullis:height
     building:flats: Pl:Key:building:flats
     building:levels: Pl:Key:building:levels
@@ -6328,9 +12110,13 @@ pl:
     busway: Pl:Key:busway
     button_operated: Pl:Key:button operated
     capacity: Pl:Key:capacity
+    castle_type: Pl:Key:castle type
+    cemetery: Pl:Key:cemetery
     circumference: Pl:Key:circumference
+    club: Pl:Key:club
     colour: Pl:Key:colour
     comment: Pl:Key:comment
+    communication:mobile_phone: Pl:Key:communication:mobile phone
     construction: Pl:Key:construction
     contact: Pl:Key:contact
     covered: Pl:Key:covered
@@ -6341,20 +12127,28 @@ pl:
     deanery: Pl:Key:deanery
     denomination: Pl:Key:denomination
     denotation: Pl:Key:denotation
+    depth: Pl:Key:depth
+    description: Pl:Key:description
     designation: Pl:Key:designation
     destination: Pl:Key:destination
     diocese: Pl:Key:diocese
     direction: Pl:Key:direction
     dispensing: Pl:Key:dispensing
+    distance: Pl:Key:distance
+    duration: Pl:Key:duration
     ele: Pl:Key:ele
     electrified: Pl:Key:electrified
     embankment: Pl:Key:embankment
     emergency: Pl:Key:emergency
     end_date: Pl:Key:end date
     entrance: Pl:Key:entrance
+    est_width: Pl:Key:est width
+    fair_trade: Pl:Key:fair trade
     fee: Pl:Key:fee
     fence_type: Pl:Key:fence type
+    fire_boundary: Pl:Key:fire boundary
     fixme: Pl:Key:fixme
+    flood_mark: Pl:Key:flood mark
     flood_prone: Pl:Key:flood prone
     foot: Pl:Key:foot
     footway: Pl:Key:footway
@@ -6362,12 +12156,15 @@ pl:
     fuel: Pl:Key:fuel
     gauge: Pl:Key:gauge
     generator:output: Pl:Key:generator:output
+    handrail: Pl:Key:handrail
     height: Pl:Key:height
     highway: Pl:Key:highway
     historic: Pl:Key:historic
+    industrial: Pl:Key:industrial
     information: Pl:Key:information
     inscription: Pl:Key:inscription
     intermittent: Pl:Key:intermittent
+    internet_access: Pl:Key:internet access
     is_in: Pl:Key:is in
     is_in:archipelago: Pl:Key:is in:archipelago
     is_in:city: Pl:Key:is in:city
@@ -6394,22 +12191,37 @@ pl:
     layer: Pl:Key:layer
     leaf_type: Pl:Key:leaf type
     leisure: Pl:Key:leisure
+    length: Pl:Key:length
     lit: Pl:Key:lit
     location: Pl:Key:location
     lock: Pl:Key:lock
     lock_name: Pl:Key:lock name
     man_made: Pl:Key:man made
     manhole: Pl:Key:manhole
+    max_age: Pl:Key:max age
+    maxage: Pl:Key:maxage
     maxaxleload: Pl:Key:maxaxleload
     maxheight: Pl:Key:maxheight
+    maxheight:legal: Pl:Key:maxheight:legal
+    maxheight:physical: Pl:Key:maxheight:physical
+    maxlength: Pl:Key:maxlength
     maxspeed: Pl:Key:maxspeed
+    maxspeed:advisory: Pl:Key:maxspeed:advisory
+    maxspeed:practical: Pl:Key:maxspeed:practical
     maxstay: Pl:Key:maxstay
     maxweight: Pl:Key:maxweight
     maxwidth: Pl:Key:maxwidth
+    maxwidth:physical: Pl:Key:maxwidth:physical
+    memorial:type: Pl:Key:memorial:type
+    min_age: Pl:Key:min age
     min_height: Pl:Key:min height
+    minage: Pl:Key:minage
+    minspeed: Pl:Key:minspeed
     mofa: Pl:Key:mofa
+    monitoring:air_quality: Pl:Key:monitoring:air quality
     mooring: Pl:Key:mooring
     moped: Pl:Key:moped
+    motorboat: Pl:Key:motorboat
     motorcycle: Pl:Key:motorcycle
     name: Pl:Key:name
     natural: Pl:Key:natural
@@ -6419,6 +12231,7 @@ pl:
     oneway: Pl:Key:oneway
     opening_hours: Pl:Key:opening hours
     operator: Pl:Key:operator
+    organic: Pl:Key:organic
     overtaking: Pl:Key:overtaking
     owner: Pl:Key:owner
     ownership: Pl:Key:ownership
@@ -6432,8 +12245,10 @@ pl:
     priority: Pl:Key:priority
     produce: Pl:Key:produce
     product: Pl:Key:product
+    protect_class: Pl:Key:protect class
     psv: Pl:Key:psv
     public_transport: Pl:Key:public transport
+    pump: Pl:Key:pump
     railway: Pl:Key:railway
     railway:area: Pl:Key:railway:area
     ramp: Pl:Key:ramp
@@ -6444,6 +12259,7 @@ pl:
     roof:material: Pl:Key:roof:material
     route: Pl:Key:route
     route_master: Pl:Key:route master
+    ruins: Pl:Key:ruins
     sac_scale: Pl:Key:sac scale
     seamark:fixme: Pl:Key:seamark:fixme
     second_hand: Pl:Key:second hand
@@ -6457,7 +12273,7 @@ pl:
     social_facility: Pl:Key:social facility
     social_facility:for: Pl:Key:social facility:for
     source:date: Pl:Key:source:date
-    source:maxspeed: PL:Key:source:maxspeed
+    source:maxspeed: Pl:Key:source:maxspeed
     sport: Pl:Key:sport
     start_date: Pl:Key:start date
     step_count: Pl:Key:step count
@@ -6492,33 +12308,60 @@ pl:
     website: Pl:Key:website
     wetland: Pl:Key:wetland
     wheelchair: Pl:Key:wheelchair
+    width: Pl:Key:width
     wikipedia: Pl:Key:wikipedia
     wood: Pl:Key:wood
+    zone:traffic: Pl:Key:zone:traffic
     zoo: Pl:Key:zoo
   tag:
+    access=customers: Pl:Tag:access=customers
     access=designated: Pl:Tag:access=designated
+    access=exclusion_zone: Pl:Tag:access=exclusion zone
+    access=license: Pl:Tag:access=license
+    access=no: Pl:Tag:access=no
     access=official: Pl:Tag:access=official
     access=private: Pl:Tag:access=private
+    advertising=billboard: Pl:Tag:advertising=billboard
+    advertising=board: Pl:Tag:advertising=board
     advertising=column: Pl:Tag:advertising=column
+    advertising=flag: Pl:Tag:advertising=flag
+    advertising=poster_box: Pl:Tag:advertising=poster box
+    advertising=screen: Pl:Tag:advertising=screen
+    advertising=sculpture: Pl:Tag:advertising=sculpture
+    advertising=sign: Pl:Tag:advertising=sign
+    advertising=tarp: Pl:Tag:advertising=tarp
+    advertising=totem: Pl:Tag:advertising=totem
+    advertising=wall_painting: Pl:Tag:advertising=wall painting
     aeroway=hangar: Pl:Tag:aeroway=hangar
+    allotments=plot: Pl:Tag:allotments=plot
+    amenity=administration: Pl:Tag:amenity=administration
     amenity=atm: Pl:Tag:amenity=atm
     amenity=baby_hatch: Pl:Tag:amenity=baby hatch
     amenity=bank: Pl:Tag:amenity=bank
+    amenity=bbq: Pl:Tag:amenity=bbq
     amenity=bench: Pl:Tag:amenity=bench
     amenity=bicycle_parking: Pl:Tag:amenity=bicycle parking
     amenity=bicycle_rental: Pl:Tag:amenity=bicycle rental
     amenity=brothel: Pl:Tag:amenity=brothel
     amenity=car_wash: Pl:Tag:amenity=car wash
+    amenity=casino: Pl:Tag:amenity=casino
     amenity=compressed_air: Pl:Tag:amenity=compressed air
     amenity=crypt: Pl:Tag:amenity=crypt
     amenity=doctors: Pl:Tag:amenity=doctors
     amenity=drinking_water: Pl:Tag:amenity=drinking water
+    amenity=driving_school: Pl:Tag:amenity=driving school
+    amenity=events_venue: Pl:Tag:amenity=events venue
     amenity=ferry_terminal: Pl:Tag:amenity=ferry terminal
     amenity=fire_station: Pl:Tag:amenity=fire station
+    amenity=food_court: Pl:Tag:amenity=food court
     amenity=fuel: Pl:Tag:amenity=fuel
     amenity=game_feeding: Pl:Tag:amenity=game feeding
     amenity=grave_yard: Pl:Tag:amenity=grave yard
+    amenity=hunting_stand: Pl:Tag:amenity=hunting stand
+    amenity=ice_cream: Pl:Tag:amenity=ice cream
     amenity=marketplace: Pl:Tag:amenity=marketplace
+    amenity=mortuary: Pl:Tag:amenity=mortuary
+    amenity=music_venue: Pl:Tag:amenity=music venue
     amenity=parking: Pl:Tag:amenity=parking
     amenity=parking_entrance: Pl:Tag:amenity=parking entrance
     amenity=parking_space: Pl:Tag:amenity=parking space
@@ -6527,14 +12370,19 @@ pl:
     amenity=post_box: Pl:Tag:amenity=post box
     amenity=post_office: Pl:Tag:amenity=post office
     amenity=recycling: Pl:Tag:amenity=recycling
+    amenity=restaurant: Pl:Tag:amenity=restaurant
     amenity=school: Pl:Tag:amenity=school
     amenity=shelter: Pl:Tag:amenity=shelter
     amenity=social_facility: Pl:Tag:amenity=social facility
     amenity=taxi: Pl:Tag:amenity=taxi
+    amenity=vehicle_ramp: Pl:Tag:amenity=vehicle ramp
     amenity=vending_machine: Pl:Tag:amenity=vending machine
     amenity=waste_disposal: Pl:Tag:amenity=waste disposal
+    amenity=water_point: Pl:Tag:amenity=water point
     atm=no: Pl:Tag:atm=no
     atm=yes: Pl:Tag:atm=yes
+    attraction=animal: Pl:Tag:attraction=animal
+    attraction=train: Pl:Tag:attraction=train
     barrier=block: Pl:Tag:barrier=block
     barrier=bollard: Pl:Tag:barrier=bollard
     barrier=bus_trap: Pl:Tag:barrier=bus trap
@@ -6557,7 +12405,42 @@ pl:
     barrier=wall: Pl:Tag:barrier=wall
     bicycle=use_sidepath: Pl:Tag:bicycle=use sidepath
     boundary=administrative: Pl:Tag:boundary=administrative
+    boundary=civil: Pl:Tag:boundary=civil
+    boundary=economic: Pl:Tag:boundary=economic
+    boundary=historic: Pl:Tag:boundary=historic
+    boundary=local_authority: Pl:Tag:boundary=local authority
+    boundary=maritime: Pl:Tag:boundary=maritime
+    boundary=military_district: Pl:Tag:boundary=military district
+    boundary=national: Pl:Tag:boundary=national
+    boundary=national_park: Pl:Tag:boundary=national park
+    boundary=political: Pl:Tag:boundary=political
+    boundary=postal_code: Pl:Tag:boundary=postal code
+    boundary=protected_area: Pl:Tag:boundary=protected area
+    boundary=regional_park: Pl:Tag:boundary=regional park
     boundary=religious_administration: Pl:Tag:boundary=religious administration
+    boundary=timezone: Pl:Tag:boundary=timezone
+    bridge:movable=bascule: Pl:Tag:bridge:movable=bascule
+    bridge:movable=drawbridge: Pl:Tag:bridge:movable=drawbridge
+    bridge:movable=lift: Pl:Tag:bridge:movable=lift
+    bridge:movable=submersible: Pl:Tag:bridge:movable=submersible
+    bridge:movable=swing: Pl:Tag:bridge:movable=swing
+    bridge:movable=transporter: Pl:Tag:bridge:movable=transporter
+    bridge:structure=beam: Pl:Tag:bridge:structure=beam
+    bridge:structure=cable-stayed: Pl:Tag:bridge:structure=cable-stayed
+    bridge:structure=floating: Pl:Tag:bridge:structure=floating
+    bridge:structure=humpback: Pl:Tag:bridge:structure=humpback
+    bridge:structure=simple-suspension: Pl:Tag:bridge:structure=simple-suspension
+    bridge:structure=suspension: Pl:Tag:bridge:structure=suspension
+    bridge:structure=truss: Pl:Tag:bridge:structure=truss
+    bridge=aqueduct: Pl:Tag:bridge=aqueduct
+    bridge=boardwalk: Pl:Tag:bridge=boardwalk
+    bridge=cantilever: Pl:Tag:bridge=cantilever
+    bridge=covered: Pl:Tag:bridge=covered
+    bridge=drawbridge: Pl:Tag:bridge=drawbridge
+    bridge=movable: Pl:Tag:bridge=movable
+    bridge=simple_brunnel: Pl:Tag:bridge=simple brunnel
+    bridge=trestle: Pl:Tag:bridge=trestle
+    bridge=viaduct: Pl:Tag:bridge=viaduct
     building=apartments: Pl:Tag:building=apartments
     building=barn: Pl:Tag:building=barn
     building=bridge: Pl:Tag:building=bridge
@@ -6583,22 +12466,51 @@ pl:
     building=hut: Pl:Tag:building=hut
     building=industrial: Pl:Tag:building=industrial
     building=manufacture: Pl:Tag:building=manufacture
+    building=mosque: Pl:Tag:building=mosque
     building=office: Pl:Tag:building=office
     building=public: Pl:Tag:building=public
     building=residential: Pl:Tag:building=residential
     building=retail: Pl:Tag:building=retail
     building=roof: Pl:Tag:building=roof
+    building=ruins: Pl:Tag:building=ruins
     building=school: Pl:Tag:building=school
     building=shed: Pl:Tag:building=shed
     building=stable: Pl:Tag:building=stable
+    building=sty: Pl:Tag:building=sty
     building=supermarket: Pl:Tag:building=supermarket
+    building=synagogue: Pl:Tag:building=synagogue
     building=terrace: Pl:Tag:building=terrace
     building=train_station: Pl:Tag:building=train station
     building=transportation: Pl:Tag:building=transportation
     building=university: Pl:Tag:building=university
     building=warehouse: Pl:Tag:building=warehouse
+    castle_type=castrum: Pl:Tag:castle type=castrum
+    castle_type=defensive: Pl:Tag:castle type=defensive
+    castle_type=fortress: Pl:Tag:castle type=fortress
+    castle_type=manor: Pl:Tag:castle type=manor
+    castle_type=palace: Pl:Tag:castle type=palace
+    castle_type=stately: Pl:Tag:castle type=stately
+    cemetery=grave: Pl:Tag:cemetery=grave
+    club=fan: Pl:Tag:club=fan
+    club=scout: Pl:Tag:club=scout
+    club=sport: Pl:Tag:club=sport
     craft=agricultural_engines: Pl:Tag:craft=agricultural engines
+    craft=bakery: Pl:Tag:craft=bakery
     craft=basket_maker: Pl:Tag:craft=basket maker
+    craft=beekeeper: Pl:Tag:craft=beekeeper
+    craft=blacksmith: Pl:Tag:craft=blacksmith
+    craft=boatbuilder: Pl:Tag:craft=boatbuilder
+    craft=bookbinder: Pl:Tag:craft=bookbinder
+    craft=brewery: Pl:Tag:craft=brewery
+    craft=builder: Pl:Tag:craft=builder
+    craft=cabinet_maker: Pl:Tag:craft=cabinet maker
+    craft=engraver: Pl:Tag:craft=engraver
+    craft=grinding_mill: Pl:Tag:craft=grinding mill
+    craft=oil_mill: Pl:Tag:craft=oil mill
+    craft=sawmill: Pl:Tag:craft=sawmill
+    craft=stonemason: Pl:Tag:craft=stonemason
+    craft=winery: Pl:Tag:craft=winery
+    crossing=island: Pl:Tag:crossing=island
     emergency=aed: Pl:Tag:emergency=aed
     emergency=defibrillator: Pl:Tag:emergency=defibrillator
     emergency=fire_extinguisher: Pl:Tag:emergency=fire extinguisher
@@ -6606,10 +12518,17 @@ pl:
     emergency=fire_hose: Pl:Tag:emergency=fire hose
     emergency=fire_hydrant: Pl:Tag:emergency=fire hydrant
     emergency=fire_water_pond: Pl:Tag:emergency=fire water pond
+    emergency=lifeguard_base: Pl:Tag:emergency=lifeguard base
+    emergency=lifeguard_place: Pl:Tag:emergency=lifeguard place
+    emergency=lifeguard_platform: Pl:Tag:emergency=lifeguard platform
+    emergency=lifeguard_tower: Pl:Tag:emergency=lifeguard tower
     emergency=suction_point: Pl:Tag:emergency=suction point
     emergency=water_tank: Pl:Tag:emergency=water tank
     footway=crossing: Pl:Tag:footway=crossing
     footway=sidewalk: Pl:Tag:footway=sidewalk
+    government=ministry: Pl:Tag:government=ministry
+    government=prosecutor: Pl:Tag:government=prosecutor
+    healthcare=laboratory: Pl:Tag:healthcare=laboratory
     highway=bridleway: Pl:Tag:highway=bridleway
     highway=bus_stop: Pl:Tag:highway=bus stop
     highway=crossing: Pl:Tag:highway=crossing
@@ -6626,9 +12545,11 @@ pl:
     highway=proposed: Pl:Tag:highway=proposed
     highway=raceway: Pl:Tag:highway=raceway
     highway=residential: Pl:Tag:highway=residential
+    highway=rest_area: Pl:Tag:highway=rest area
     highway=road: Pl:Tag:highway=road
     highway=secondary: Pl:Tag:highway=secondary
     highway=service: Pl:Tag:highway=service
+    highway=services: Pl:Tag:highway=services
     highway=speed_camera: Pl:Tag:highway=speed camera
     highway=steps: Pl:Tag:highway=steps
     highway=stop: Pl:Tag:highway=stop
@@ -6645,10 +12566,24 @@ pl:
     historic=monument: Pl:Tag:historic=monument
     historic=ruins: Pl:Tag:historic=ruins
     historic=tomb: Pl:Tag:historic=tomb
+    historic=tree_shrine: Pl:Tag:historic=tree shrine
+    historic=wayside_cross: Pl:Tag:historic=wayside cross
     historic=wayside_shrine: Pl:Tag:historic=wayside shrine
+    industrial=aluminium_smelting: Pl:Tag:industrial=aluminium smelting
+    industrial=bakery: Pl:Tag:industrial=bakery
+    industrial=brewery: Pl:Tag:industrial=brewery
+    industrial=furniture: Pl:Tag:industrial=furniture
+    industrial=grinding_mill: Pl:Tag:industrial=grinding mill
+    industrial=machine_shop: Pl:Tag:industrial=machine shop
+    industrial=mobile_equipment: Pl:Tag:industrial=mobile equipment
+    industrial=oil_mill: Pl:Tag:industrial=oil mill
+    industrial=salt_pond: Pl:Tag:industrial=salt pond
+    industrial=sawmill: Pl:Tag:industrial=sawmill
+    industrial=shipyard: Pl:Tag:industrial=shipyard
     information=guidepost: Pl:Tag:information=guidepost
     junction=roundabout: Pl:Tag:junction=roundabout
     landuse=allotments: Pl:Tag:landuse=allotments
+    landuse=apiary: Pl:Tag:landuse=apiary
     landuse=brownfield: Pl:Tag:landuse=brownfield
     landuse=cemetery: Pl:Tag:landuse=cemetery
     landuse=commercial: Pl:Tag:landuse=commercial
@@ -6657,9 +12592,12 @@ pl:
     landuse=farm: Pl:Tag:landuse=farm
     landuse=farmland: Pl:Tag:landuse=farmland
     landuse=farmyard: Pl:Tag:landuse=farmyard
+    landuse=flowerbed: Pl:Tag:landuse=flowerbed
     landuse=forest: Pl:Tag:landuse=forest
     landuse=grass: Pl:Tag:landuse=grass
+    landuse=greenfield: Pl:Tag:landuse=greenfield
     landuse=greenhouse_horticulture: Pl:Tag:landuse=greenhouse horticulture
+    landuse=industrial: Pl:Tag:landuse=industrial
     landuse=landfill: Pl:Tag:landuse=landfill
     landuse=meadow: Pl:Tag:landuse=meadow
     landuse=plant_nursery: Pl:Tag:landuse=plant nursery
@@ -6669,47 +12607,154 @@ pl:
     landuse=religious: Pl:Tag:landuse=religious
     landuse=residential: Pl:Tag:landuse=residential
     landuse=retail: Pl:Tag:landuse=retail
+    landuse=salt_pond: Pl:Tag:landuse=salt pond
+    landuse=traffic_island: Pl:Tag:landuse=traffic island
     landuse=village_green: Pl:Tag:landuse=village green
+    leisure=adult_gaming_centre: Pl:Tag:leisure=adult gaming centre
+    leisure=amusement_arcade: Pl:Tag:leisure=amusement arcade
+    leisure=arena: Pl:Tag:leisure=arena
+    leisure=bandstand: Pl:Tag:leisure=bandstand
+    leisure=bathing_place: Pl:Tag:leisure=bathing place
+    leisure=bbq: Pl:Tag:leisure=bbq
+    leisure=beach: Pl:Tag:leisure=beach
+    leisure=beach_resort: Pl:Tag:leisure=beach resort
+    leisure=bird_hide: Pl:Tag:leisure=bird hide
+    leisure=bleachers: Pl:Tag:leisure=bleachers
+    leisure=bowling_alley: Pl:Tag:leisure=bowling alley
+    leisure=casino: Pl:Tag:leisure=casino
+    leisure=club: Pl:Tag:leisure=club
+    leisure=common: Pl:Tag:leisure=common
+    leisure=dance: Pl:Tag:leisure=dance
+    leisure=disc_golf_course: Pl:Tag:leisure=disc golf course
+    leisure=dog_park: Pl:Tag:leisure=dog park
     leisure=firepit: Pl:Tag:leisure=firepit
     leisure=fishing: Pl:Tag:leisure=fishing
+    leisure=fitness_centre: Pl:Tag:leisure=fitness centre
+    leisure=fitness_station: Pl:Tag:leisure=fitness station
+    leisure=garden: Pl:Tag:leisure=garden
+    leisure=golf_course: Pl:Tag:leisure=golf course
+    leisure=hackerspace: Pl:Tag:leisure=hackerspace
+    leisure=horse_riding: Pl:Tag:leisure=horse riding
+    leisure=hot_spring: Pl:Tag:leisure=hot spring
+    leisure=ice_rink: Pl:Tag:leisure=ice rink
+    leisure=marina: Pl:Tag:leisure=marina
+    leisure=miniature_golf: Pl:Tag:leisure=miniature golf
+    leisure=nature_reserve: Pl:Tag:leisure=nature reserve
+    leisure=outdoor_seating: Pl:Tag:leisure=outdoor seating
+    leisure=paddling_pool: Pl:Tag:leisure=paddling pool
+    leisure=park: Pl:Tag:leisure=park
+    leisure=picnic: Pl:Tag:leisure=picnic
+    leisure=picnic_table: Pl:Tag:leisure=picnic table
     leisure=pitch: Pl:Tag:leisure=pitch
     leisure=playground: Pl:Tag:leisure=playground
+    leisure=recreation_ground: Pl:Tag:leisure=recreation ground
+    leisure=resort: Pl:Tag:leisure=resort
+    leisure=sailing_club: Pl:Tag:leisure=sailing club
+    leisure=sauna: Pl:Tag:leisure=sauna
+    leisure=ski_playground: Pl:Tag:leisure=ski playground
+    leisure=slipway: Pl:Tag:leisure=slipway
+    leisure=soccer_golf: Pl:Tag:leisure=soccer golf
+    leisure=social_club: Pl:Tag:leisure=social club
+    leisure=sports_centre: Pl:Tag:leisure=sports centre
+    leisure=stadium: Pl:Tag:leisure=stadium
+    leisure=summer_camp: Pl:Tag:leisure=summer camp
+    leisure=swimming_area: Pl:Tag:leisure=swimming area
+    leisure=swimming_pool: Pl:Tag:leisure=swimming pool
+    leisure=table_tennis_table: Pl:Tag:leisure=table tennis table
     leisure=tanning_salon: Pl:Tag:leisure=tanning salon
+    leisure=track: Pl:Tag:leisure=track
+    leisure=trampoline_park: Pl:Tag:leisure=trampoline park
+    leisure=turkish_bath: Pl:Tag:leisure=turkish bath
+    leisure=video_arcade: Pl:Tag:leisure=video arcade
+    leisure=water_park: Pl:Tag:leisure=water park
+    leisure=wildlife_hide: Pl:Tag:leisure=wildlife hide
     man_made=adit: Pl:Tag:man made=adit
+    man_made=beacon: Pl:Tag:man made=beacon
+    man_made=beehive: Pl:Tag:man made=beehive
+    man_made=bunker_silo: Pl:Tag:man made=bunker silo
+    man_made=chimney: Pl:Tag:man made=chimney
     man_made=cross: Pl:Tag:man made=cross
     man_made=cutline: Pl:Tag:man made=cutline
     man_made=dyke: Pl:Tag:man made=dyke
     man_made=embankment: Pl:Tag:man made=embankment
+    man_made=gasometer: Pl:Tag:man made=gasometer
+    man_made=insect_hotel: Pl:Tag:man made=insect hotel
+    man_made=kiln: Pl:Tag:man made=kiln
+    man_made=mineshaft: Pl:Tag:man made=mineshaft
+    man_made=monitoring_station: Pl:Tag:man made=monitoring station
+    man_made=petroleum_well: Pl:Tag:man made=petroleum well
+    man_made=pumping_station: Pl:Tag:man made=pumping station
+    man_made=reservoir_covered: Pl:Tag:man made=reservoir covered
+    man_made=silo: Pl:Tag:man made=silo
+    man_made=storage_tank: Pl:Tag:man made=storage tank
     man_made=surveillance: Pl:Tag:man made=surveillance
+    man_made=survey_point: Pl:Tag:man made=survey point
     man_made=tower: Pl:Tag:man made=tower
+    man_made=water_tap: Pl:Tag:man made=water tap
+    man_made=water_tower: Pl:Tag:man made=water tower
     man_made=water_well: Pl:Tag:man made=water well
     man_made=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
+    maxspeed=none: Pl:Tag:maxspeed=none
+    maxspeed=signals: Pl:Tag:maxspeed=signals
     military=bunker: Pl:Tag:military=bunker
+    military=trench: Pl:Tag:military=trench
     mooring=ferry: Pl:Tag:mooring=ferry
     natural=arete: Pl:Tag:natural=arete
+    natural=avalanche_dam: Pl:Tag:natural=avalanche dam
     natural=bare_rock: Pl:Tag:natural=bare rock
     natural=bay: Pl:Tag:natural=bay
+    natural=beach: Pl:Tag:natural=beach
+    natural=bedrock: Pl:Tag:natural=bedrock
+    natural=cape: Pl:Tag:natural=cape
     natural=cave_entrance: Pl:Tag:natural=cave entrance
+    natural=cliff: Pl:Tag:natural=cliff
+    natural=desert: Pl:Tag:natural=desert
+    natural=earth_bank: Pl:Tag:natural=earth bank
+    natural=esker: Pl:Tag:natural=esker
+    natural=fell: Pl:Tag:natural=fell
     natural=grassland: Pl:Tag:natural=grassland
+    natural=gully: Pl:Tag:natural=gully
     natural=heath: Pl:Tag:natural=heath
+    natural=hot_spring: Pl:Tag:natural=hot spring
+    natural=lake: Pl:Tag:natural=lake
+    natural=landslide: Pl:Tag:natural=landslide
+    natural=moor: Pl:Tag:natural=moor
+    natural=moraine: Pl:Tag:natural=moraine
+    natural=mud: Pl:Tag:natural=mud
+    natural=peak: Pl:Tag:natural=peak
+    natural=reef: Pl:Tag:natural=reef
     natural=ridge: Pl:Tag:natural=ridge
+    natural=riverbed: Pl:Tag:natural=riverbed
+    natural=rock: Pl:Tag:natural=rock
+    natural=saddle: Pl:Tag:natural=saddle
+    natural=sand: Pl:Tag:natural=sand
     natural=scree: Pl:Tag:natural=scree
     natural=scrub: Pl:Tag:natural=scrub
+    natural=shingle: Pl:Tag:natural=shingle
+    natural=shoal: Pl:Tag:natural=shoal
     natural=sinkhole: Pl:Tag:natural=sinkhole
+    natural=spring: Pl:Tag:natural=spring
+    natural=stone: Pl:Tag:natural=stone
     natural=tree: Pl:Tag:natural=tree
     natural=tree_row: Pl:Tag:natural=tree row
+    natural=valley: Pl:Tag:natural=valley
+    natural=water: Pl:Tag:natural=water
     natural=wetland: Pl:Tag:natural=wetland
     natural=wood: Pl:Tag:natural=wood
+    office=government: Pl:Tag:office=government
+    office=logistics: Pl:Tag:office=logistics
     office=religion: Pl:Tag:office=religion
+    place=allotments: Pl:Tag:place=allotments
     place=city: Pl:Tag:place=city
     place=farm: Pl:Tag:place=farm
     place=hamlet: Pl:Tag:place=hamlet
     place=isolated_dwelling: Pl:Tag:place=isolated dwelling
     place=locality: Pl:Tag:place=locality
     place=neighbourhood: Pl:Tag:place=neighbourhood
+    place=square: Pl:Tag:place=square
     place=suburb: Pl:Tag:place=suburb
     place=town: Pl:Tag:place=town
     place=village: Pl:Tag:place=village
@@ -6725,10 +12770,16 @@ pl:
     public_transport=stop_area: Pl:Tag:public transport=stop area
     public_transport=stop_position: Pl:Tag:public transport=stop position
     railway=abandoned: Pl:Tag:railway=abandoned
+    railway=buffer_stop: Pl:Tag:railway=buffer stop
     railway=crossing: Pl:Tag:railway=crossing
     railway=crossing_controller: Pl:Tag:railway=crossing controller
     railway=level_crossing: Pl:Tag:railway=level crossing
     railway=rail: Pl:Tag:railway=rail
+    railway=tram_stop: Pl:Tag:railway=tram stop
+    religion=christian: Pl:Tag:religion=christian
+    religion=jewish: Pl:Tag:religion=jewish
+    religion=muslim: Pl:Tag:religion=muslim
+    religion=pagan: Pl:Tag:religion=pagan
     service=alley: Pl:Tag:service=alley
     service=drive-through: Pl:Tag:service=drive-through
     service=driveway: Pl:Tag:service=driveway
@@ -6738,34 +12789,62 @@ pl:
     service=siding: Pl:Tag:service=siding
     service=spur: Pl:Tag:service=spur
     service=yard: Pl:Tag:service=yard
+    shop=agrarian: Pl:Tag:shop=agrarian
     shop=baby_goods: Pl:Tag:shop=baby goods
     shop=bakery: Pl:Tag:shop=bakery
     shop=bathroom_furnishing: Pl:Tag:shop=bathroom furnishing
     shop=beauty: Pl:Tag:shop=beauty
+    shop=bed: Pl:Tag:shop=bed
     shop=bicycle: Pl:Tag:shop=bicycle
+    shop=boutique: Pl:Tag:shop=boutique
+    shop=butcher: Pl:Tag:shop=butcher
+    shop=car: Pl:Tag:shop=car
+    shop=car_repair: Pl:Tag:shop=car repair
+    shop=clothes: Pl:Tag:shop=clothes
     shop=confectionery: Pl:Tag:shop=confectionery
     shop=convenience: Pl:Tag:shop=convenience
     shop=department_store: Pl:Tag:shop=department store
+    shop=doityourself: Pl:Tag:shop=doityourself
+    shop=erotic: Pl:Tag:shop=erotic
+    shop=fishing: Pl:Tag:shop=fishing
+    shop=fishmonger: Pl:Tag:shop=fishmonger
+    shop=florist: Pl:Tag:shop=florist
     shop=funeral_directors: Pl:Tag:shop=funeral directors
     shop=furniture: Pl:Tag:shop=furniture
+    shop=garden_centre: Pl:Tag:shop=garden centre
+    shop=gas: Pl:Tag:shop=gas
     shop=general: Pl:Tag:shop=general
-    shop=haberdashery: PL:Tag:shop=haberdashery
+    shop=haberdashery: Pl:Tag:shop=haberdashery
     shop=hairdresser: Pl:Tag:shop=hairdresser
+    shop=herbalist: Pl:Tag:shop=herbalist
     shop=houseware: Pl:Tag:shop=houseware
+    shop=ice_cream: Pl:Tag:shop=ice cream
+    shop=kiosk: Pl:Tag:shop=kiosk
     shop=kitchen: Pl:Tag:shop=kitchen
+    shop=mall: Pl:Tag:shop=mall
     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=ticket: Pl:Tag:shop=ticket
     shop=travel_agency: Pl:Tag:shop=travel agency
+    shop=tyres: Pl:Tag:shop=tyres
+    shop=vacant: Pl:Tag:shop=vacant
     shop=variety_store: Pl:Tag:shop=variety store
+    shop=yes: Pl:Tag:shop=yes
     social_facility=outreach: Pl:Tag:social facility=outreach
     sport=aikido: Pl:Tag:sport=aikido
     sport=climbing: Pl:Tag:sport=climbing
+    tourism=alpine_hut: Pl:Tag:tourism=alpine hut
+    tourism=apartment: Pl:Tag:tourism=apartment
+    tourism=aquarium: Pl:Tag:tourism=aquarium
     tourism=artwork: Pl:Tag:tourism=artwork
+    tourism=attraction: Pl:Tag:tourism=attraction
+    tourism=bed_and_breakfast: Pl:Tag:tourism=bed and breakfast
     tourism=camp_site: Pl:Tag:tourism=camp site
     tourism=caravan_site: Pl:Tag:tourism=caravan site
     tourism=chalet: Pl:Tag:tourism=chalet
+    tourism=gallery: Pl:Tag:tourism=gallery
     tourism=guest_house: Pl:Tag:tourism=guest house
     tourism=hostel: Pl:Tag:tourism=hostel
     tourism=hotel: Pl:Tag:tourism=hotel
@@ -6773,27 +12852,57 @@ pl:
     tourism=motel: Pl:Tag:tourism=motel
     tourism=museum: Pl:Tag:tourism=museum
     tourism=picnic_site: Pl:Tag:tourism=picnic site
+    tourism=resort: Pl:Tag:tourism=resort
     tourism=theme_park: Pl:Tag:tourism=theme park
+    tourism=trail_riding_station: Pl:Tag:tourism=trail riding station
     tourism=viewpoint: Pl:Tag:tourism=viewpoint
     tourism=wilderness_hut: Pl:Tag:tourism=wilderness hut
+    tourism=wine_cellar: Pl:Tag:tourism=wine cellar
+    tourism=yes: Pl:Tag:tourism=yes
     tourism=zoo: Pl:Tag:tourism=zoo
+    tower:type=bell_tower: Pl:Tag:tower:type=bell tower
+    traffic_calming=island: Pl:Tag:traffic calming=island
+    traffic_calming=table: Pl:Tag:traffic calming=table
+    traffic_sign=city_limit: Pl:Tag:traffic sign=city limit
     tunnel=culvert: Pl:Tag:tunnel=culvert
     type=public_transport: Pl:Tag:type=public transport
+    vending=candles: Pl:Tag:vending=candles
     wall=noise_barrier: Pl:Tag:wall=noise barrier
+    water=lake: Pl:Tag:water=lake
+    water=lock: Pl:Tag:water=lock
+    waterway=boat_lift: Pl:Tag:waterway=boat lift
     waterway=boatyard: Pl:Tag:waterway=boatyard
+    waterway=brook: Pl:Tag:waterway=brook
     waterway=canal: Pl:Tag:waterway=canal
     waterway=dam: Pl:Tag:waterway=dam
+    waterway=deep_well: Pl:Tag:waterway=deep well
+    waterway=derelict_canal: Pl:Tag:waterway=derelict canal
     waterway=ditch: Pl:Tag:waterway=ditch
+    waterway=dock: Pl:Tag:waterway=dock
     waterway=drain: Pl:Tag:waterway=drain
+    waterway=dredged_area: Pl:Tag:waterway=dredged area
+    waterway=drystream: Pl:Tag:waterway=drystream
+    waterway=fairway: Pl:Tag:waterway=fairway
     waterway=fish_pass: Pl:Tag:waterway=fish pass
+    waterway=fuel: Pl:Tag:waterway=fuel
     waterway=lock_gate: Pl:Tag:waterway=lock gate
+    waterway=milestone: Pl:Tag:waterway=milestone
+    waterway=offshore_field: Pl:Tag:waterway=offshore field
     waterway=river: Pl:Tag:waterway=river
     waterway=riverbank: Pl:Tag:waterway=riverbank
+    waterway=sanitary_dump_station: Pl:Tag:waterway=sanitary dump station
+    waterway=seaway: Pl:Tag:waterway=seaway
     waterway=stream: Pl:Tag:waterway=stream
+    waterway=turning_point: Pl:Tag:waterway=turning point
+    waterway=wadi: Pl:Tag:waterway=wadi
+    waterway=water_point: Pl:Tag:waterway=water point
+    waterway=waterfall: Pl:Tag:waterway=waterfall
     waterway=weir: Pl:Tag:waterway=weir
     wetland=bog: Pl:Tag:wetland=bog
+    wetland=fen: Pl:Tag:wetland=fen
     wetland=mangrove: Pl:Tag:wetland=mangrove
     wetland=marsh: Pl:Tag:wetland=marsh
+    wetland=mud: Pl:Tag:wetland=mud
     wetland=reedbed: Pl:Tag:wetland=reedbed
     wetland=saltern: Pl:Tag:wetland=saltern
     wetland=saltmarsh: Pl:Tag:wetland=saltmarsh
@@ -6808,49 +12917,446 @@ pt:
   key:
     IBGE:CD_ADMINIS: Pt:Key:IBGE:CD ADMINIS
     IBGE:GEOCODIGO: Pt:Key:IBGE:GEOCODIGO
+    IBGE:tipo: Pt:Key:IBGE:tipo
+    TMC:LocationCode: Pt:Key:TMC:LocationCode
+    abutters: Pt:Key:abutters
+    access: Pt:Key:access
+    addr: Pt:Key:addr
+    addr:housenumber: Pt:Key:addr:housenumber
+    admin_level: Pt:Key:admin level
+    aerialway: Pt:Key:aerialway
+    aeroway: Pt:Key:aeroway
+    amenity: Pt:Key:amenity
+    area: Pt:Key:area
+    barrier: Pt:Key:barrier
+    bicycle: Pt:Key:bicycle
+    bicycle_parking: Pt:Key:bicycle parking
+    boat: Pt:Key:boat
+    border_type: Pt:Key:border type
+    boundary: Pt:Key:boundary
+    bridge: Pt:Key:bridge
+    building: Pt:Key:building
+    building:levels: Pt:Key:building:levels
+    building:material: Pt:Key:building:material
+    building:min_level: Pt:Key:building:min level
+    building:part: Pt:Key:building:part
+    button_operated: Pt:Key:button operated
+    cables: Pt:Key:cables
+    cep: Pt:Key:cep
+    construction: Pt:Key:construction
+    contact: Pt:Key:contact
     country: Pt:Key:country
+    craft: Pt:Key:craft
+    created_by: Pt:Key:created by
+    crossing: Pt:Key:crossing
+    cuisine: Pt:Key:cuisine
+    cutting: Pt:Key:cutting
+    cycleway: Pt:Key:cycleway
+    denomination: Pt:Key:denomination
+    diet:*: Pt:Key:diet:*
     dispensing: Pt:Key:dispensing
+    display: Pt:Key:display
     driving_side: Pt:Key:driving side
+    ele: Pt:Key:ele
+    electrified: Pt:Key:electrified
+    embankment: Pt:Key:embankment
+    emergency: Pt:Key:emergency
+    fenced: Pt:Key:fenced
+    fishing: Pt:Key:fishing
+    foot: Pt:Key:foot
+    frequency: Pt:Key:frequency
+    generator:method: Pt:Key:generator:method
+    geological: Pt:Key:geological
+    happy_hours: Pt:Key:happy hours
+    height: Pt:Key:height
     heritage: Pt:Key:heritage
+    hgv: Pt:Key:hgv
     highway: Pt:Key:highway
+    historic: Pt:Key:historic
+    horse: Pt:Key:horse
     iata: Pt:Key:iata
     icao: Pt:Key:icao
+    ice_road: Pt:Key:ice road
+    incline: Pt:Key:incline
+    industrial: Pt:Key:industrial
+    intermittent: Pt:Key:intermittent
+    internet_access: Pt:Key:internet access
+    is_in: Pt:Key:is in
+    jetski:sales: Pt:Key:jetski:sales
+    junction: Pt:Key:junction
+    landuse: Pt:Key:landuse
+    lanes: Pt:Key:lanes
+    leisure: Pt:Key:leisure
+    listed_status: Pt:Key:listed status
+    lit: Pt:Key:lit
+    lock: Pt:Key:lock
+    man_made: Pt:Key:man made
+    maxdraught: Pt:Key:maxdraught
+    maxheight: Pt:Key:maxheight
     maxheight:legal: Pt:Key:maxheight:legal
     maxheight:marine: Pt:Key:maxheight:marine
     maxheight:physical: Pt:Key:maxheight:physical
+    maxspeed: Pt:Key:maxspeed
+    maxweight: Pt:Key:maxweight
+    military: Pt:Key:military
+    min_height: Pt:Key:min height
+    monitoring:bicycle: Pt:Key:monitoring:bicycle
+    monitoring:traffic: Pt:Key:monitoring:traffic
+    mooring: Pt:Key:mooring
+    motorcar: Pt:Key:motorcar
+    motorcycle: Pt:Key:motorcycle
+    motorroad: Pt:Key:motorroad
+    mountain_pass: Pt:Key:mountain pass
+    mtb: Pt:Key:mtb
+    name: Pt:Key:name
+    natural: Pt:Key:natural
     noexit: Pt:Key:noexit
+    noname: Pt:Key:noname
+    office: Pt:Key:office
+    oneway: Pt:Key:oneway
+    opening_hours: Pt:Key:opening hours
+    operator: Pt:Key:operator
+    overtaking: Pt:Key:overtaking
+    passing_places: Pt:Key:passing places
+    place: Pt:Key:place
+    population: Pt:Key:population
     postal_code: Pt:Key:postal code
+    power: Pt:Key:power
+    psv: Pt:Key:psv
+    public_transport: Pt:Key:public transport
+    public_transport:version: Pt:Key:public transport:version
+    railway: Pt:Key:railway
+    recording: Pt:Key:recording
+    ref: Pt:Key:ref
     ref:bag: Pt:Key:ref:bag
+    ref:vatin: Pt:Key:ref:vatin
     religion: Pt:Key:religion
+    roof:material: Pt:Key:roof:material
+    route: Pt:Key:route
+    sac_scale: Pt:Key:sac scale
+    seamark: Pt:Key:seamark
+    seasonal: Pt:Key:seasonal
+    second_hand: Pt:Key:second hand
+    segregated: Pt:Key:segregated
+    service: Pt:Key:service
+    service_times: Pt:Key:service times
+    shop: Pt:Key:shop
+    sidewalk: Pt:Key:sidewalk
+    ski: Pt:Key:ski
+    smoothness: Pt:Key:smoothness
     source: Pt:Key:source
     sport: Pt:Key:sport
+    substance: Pt:Key:substance
+    surface: Pt:Key:surface
+    survey:date: Pt:Key:survey:date
     tiger: Pt:Key:tiger
+    tourism: Pt:Key:tourism
     tracktype: Pt:Key:tracktype
+    traffic_calming: Pt:Key:traffic calming
+    traffic_signals: Pt:Key:traffic signals
+    trail_visibility: Pt:Key:trail visibility
+    tunnel: Pt:Key:tunnel
+    type: Pt:Key:type
+    usage: Pt:Key:usage
+    voltage: Pt:Key:voltage
+    water: Pt:Key:water
     waterway: Pt:Key:waterway
+    wheelchair: Pt:Key:wheelchair
     wikidata: Pt:Key:wikidata
+    wikipedia: Pt:Key:wikipedia
+    winter_road: Pt:Key:winter road
+    wires: Pt:Key:wires
   tag:
+    aerialway=cable_car: Pt:Tag:aerialway=cable car
+    aerialway=station: Pt:Tag:aerialway=station
+    aeroway=aerodrome: Pt:Tag:aeroway=aerodrome
+    aeroway=apron: Pt:Tag:aeroway=apron
+    aeroway=gate: Pt:Tag:aeroway=gate
     aeroway=hangar: Pt:Tag:aeroway=hangar
+    aeroway=helipad: Pt:Tag:aeroway=helipad
     aeroway=holding_position: Pt:Tag:aeroway=holding position
     aeroway=parking_position: Pt:Tag:aeroway=parking position
+    aeroway=runway: Pt:Tag:aeroway=runway
+    aeroway=taxiway: Pt:Tag:aeroway=taxiway
+    aeroway=terminal: Pt:Tag:aeroway=terminal
+    aeroway=windsock: Pt:Tag:aeroway=windsock
+    amenity=animal_boarding: Pt:Tag:amenity=animal boarding
+    amenity=architect_office: Pt:Tag:amenity=architect office
+    amenity=arts_centre: Pt:Tag:amenity=arts centre
+    amenity=atm: Pt:Tag:amenity=atm
+    amenity=baby_hatch: Pt:Tag:amenity=baby hatch
+    amenity=bank: Pt:Tag:amenity=bank
+    amenity=bar: Pt:Tag:amenity=bar
+    amenity=bbq: Pt:Tag:amenity=bbq
+    amenity=bench: Pt:Tag:amenity=bench
     amenity=bicycle_parking: Pt:Tag:amenity=bicycle parking
+    amenity=bicycle_rental: Pt:Tag:amenity=bicycle rental
+    amenity=bicycle_repair_station: Pt:Tag:amenity=bicycle repair station
+    amenity=biergarten: Pt:Tag:amenity=biergarten
+    amenity=blood_donation: Pt:Tag:amenity=blood donation
+    amenity=brothel: Pt:Tag:amenity=brothel
+    amenity=bureau_de_change: Pt:Tag:amenity=bureau de change
+    amenity=bus_station: Pt:Tag:amenity=bus station
+    amenity=cafe: Pt:Tag:amenity=cafe
+    amenity=car_rental: Pt:Tag:amenity=car rental
+    amenity=car_sharing: Pt:Tag:amenity=car sharing
+    amenity=car_wash: Pt:Tag:amenity=car wash
+    amenity=casino: Pt:Tag:amenity=casino
+    amenity=charging_station: Pt:Tag:amenity=charging station
+    amenity=cinema: Pt:Tag:amenity=cinema
+    amenity=clinic: Pt:Tag:amenity=clinic
+    amenity=clock: Pt:Tag:amenity=clock
+    amenity=college: Pt:Tag:amenity=college
+    amenity=community_centre: Pt:Tag:amenity=community centre
+    amenity=courthouse: Pt:Tag:amenity=courthouse
     amenity=crematorium: Pt:Tag:amenity=crematorium
+    amenity=dentist: Pt:Tag:amenity=dentist
+    amenity=doctors: Pt:Tag:amenity=doctors
+    amenity=dojo: Pt:Tag:amenity=dojo
+    amenity=drinking_water: Pt:Tag:amenity=drinking water
+    amenity=driving_school: Pt:Tag:amenity=driving school
+    amenity=embassy: Pt:Tag:amenity=embassy
+    amenity=emergency_phone: Pt:Tag:amenity=emergency phone
+    amenity=ev_charging: Pt:Tag:amenity=ev charging
+    amenity=fast_food: Pt:Tag:amenity=fast food
+    amenity=ferry_terminal: Pt:Tag:amenity=ferry terminal
+    amenity=fire_hydrant: Pt:Tag:amenity=fire hydrant
+    amenity=fire_station: Pt:Tag:amenity=fire station
+    amenity=food_court: Pt:Tag:amenity=food court
+    amenity=fountain: Pt:Tag:amenity=fountain
+    amenity=fuel: Pt:Tag:amenity=fuel
+    amenity=gambling: Pt:Tag:amenity=gambling
+    amenity=grave_yard: Pt:Tag:amenity=grave yard
+    amenity=grit_bin: Pt:Tag:amenity=grit bin
     amenity=hospital: Pt:Tag:amenity=hospital
+    amenity=hunting_stand: Pt:Tag:amenity=hunting stand
+    amenity=ice_cream: Pt:Tag:amenity=ice cream
+    amenity=internet_cafe: Pt:Tag:amenity=internet cafe
+    amenity=kindergarten: Pt:Tag:amenity=kindergarten
+    amenity=language_school: Pt:Tag:amenity=language school
+    amenity=letter_box: Pt:Tag:amenity=letter box
+    amenity=library: Pt:Tag:amenity=library
+    amenity=love_hotel: Pt:Tag:amenity=love hotel
     amenity=marketplace: Pt:Tag:amenity=marketplace
+    amenity=motorcycle_parking: Pt:Tag:amenity=motorcycle parking
+    amenity=music_school: Pt:Tag:amenity=music school
+    amenity=nightclub: Pt:Tag:amenity=nightclub
+    amenity=nursing_home: Pt:Tag:amenity=nursing home
     amenity=parking: Pt:Tag:amenity=parking
     amenity=parking_entrance: Pt:Tag:amenity=parking entrance
+    amenity=parking_space: Pt:Tag:amenity=parking space
+    amenity=pharmacy: Pt:Tag:amenity=pharmacy
+    amenity=place_of_worship: Pt:Tag:amenity=place of worship
+    amenity=planetarium: Pt:Tag:amenity=planetarium
+    amenity=police: Pt:Tag:amenity=police
+    amenity=post_box: Pt:Tag:amenity=post box
+    amenity=post_office: Pt:Tag:amenity=post office
+    amenity=prison: Pt:Tag:amenity=prison
+    amenity=pub: Pt:Tag:amenity=pub
+    amenity=public_building: Pt:Tag:amenity=public building
+    amenity=recycling: Pt:Tag:amenity=recycling
+    amenity=register_office: Pt:Tag:amenity=register office
+    amenity=restaurant: Pt:Tag:amenity=restaurant
+    amenity=sauna: Pt:Tag:amenity=sauna
+    amenity=school: Pt:Tag:amenity=school
+    amenity=shelter: Pt:Tag:amenity=shelter
+    amenity=social_centre: Pt:Tag:amenity=social centre
+    amenity=social_facility: Pt:Tag:amenity=social facility
+    amenity=stripclub: Pt:Tag:amenity=stripclub
+    amenity=studio: Pt:Tag:amenity=studio
+    amenity=swingerclub: Pt:Tag:amenity=swingerclub
+    amenity=taxi: Pt:Tag:amenity=taxi
+    amenity=telephone: Pt:Tag:amenity=telephone
+    amenity=theatre: Pt:Tag:amenity=theatre
+    amenity=toilets: Pt:Tag:amenity=toilets
+    amenity=townhall: Pt:Tag:amenity=townhall
+    amenity=university: Pt:Tag:amenity=university
+    amenity=vending_machine: Pt:Tag:amenity=vending machine
+    amenity=veterinary: Pt:Tag:amenity=veterinary
+    amenity=waste_basket: Pt:Tag:amenity=waste basket
+    amenity=waste_disposal: Pt:Tag:amenity=waste disposal
+    amenity=water_point: Pt:Tag:amenity=water point
+    amenity=watering_place: Pt:Tag:amenity=watering place
+    barrier=bollard: Pt:Tag:barrier=bollard
+    barrier=cattle_grid: Pt:Tag:barrier=cattle grid
+    barrier=city_wall: Pt:Tag:barrier=city wall
+    barrier=ditch: Pt:Tag:barrier=ditch
+    barrier=fence: Pt:Tag:barrier=fence
+    barrier=full-height_turnstile: Pt:Tag:barrier=full-height turnstile
+    barrier=gate: Pt:Tag:barrier=gate
+    barrier=guard_rail: Pt:Tag:barrier=guard rail
+    barrier=hampshire_gate: Pt:Tag:barrier=hampshire gate
+    barrier=handrail: Pt:Tag:barrier=handrail
+    barrier=hedge: Pt:Tag:barrier=hedge
+    barrier=kerb: Pt:Tag:barrier=kerb
+    barrier=kissing_gate: Pt:Tag:barrier=kissing gate
+    barrier=lift_gate: Pt:Tag:barrier=lift gate
+    barrier=retaining_wall: Pt:Tag:barrier=retaining wall
+    barrier=toll_booth: Pt:Tag:barrier=toll booth
+    barrier=wall: Pt:Tag:barrier=wall
+    boundary=administrative: Pt:Tag:boundary=administrative
+    boundary=civil: Pt:Tag:boundary=civil
+    boundary=maritime: Pt:Tag:boundary=maritime
+    boundary=national_park: Pt:Tag:boundary=national park
+    boundary=political: Pt:Tag:boundary=political
+    boundary=protected_area: Pt:Tag:boundary=protected area
+    bridge=viaduct: Pt:Tag:bridge=viaduct
+    building=church: Pt:Tag:building=church
+    building=commercial: Pt:Tag:building=commercial
+    building=house: Pt:Tag:building=house
+    building=residential: Pt:Tag:building=residential
+    building=roof: Pt:Tag:building=roof
+    building=school: Pt:Tag:building=school
+    building=yes: Pt:Tag:building=yes
+    craft=agricultural_engines: Pt:Tag:craft=agricultural engines
+    craft=basket_maker: Pt:Tag:craft=basket maker
+    craft=beekeeper: Pt:Tag:craft=beekeeper
+    craft=blacksmith: Pt:Tag:craft=blacksmith
+    craft=boatbuilder: Pt:Tag:craft=boatbuilder
+    craft=bookbinder: Pt:Tag:craft=bookbinder
+    craft=brewery: Pt:Tag:craft=brewery
+    craft=builder: Pt:Tag:craft=builder
+    craft=carpenter: Pt:Tag:craft=carpenter
+    craft=carpet_layer: Pt:Tag:craft=carpet layer
+    craft=caterer: Pt:Tag:craft=caterer
+    craft=chimney_sweeper: Pt:Tag:craft=chimney sweeper
+    craft=clockmaker: Pt:Tag:craft=clockmaker
+    craft=confectionery: Pt:Tag:craft=confectionery
+    craft=distillery: Pt:Tag:craft=distillery
+    craft=dressmaker: Pt:Tag:craft=dressmaker
+    craft=electrician: Pt:Tag:craft=electrician
+    craft=gardener: Pt:Tag:craft=gardener
+    craft=glaziery: Pt:Tag:craft=glaziery
+    craft=handicraft: Pt:Tag:craft=handicraft
+    craft=hvac: Pt:Tag:craft=hvac
+    craft=insulation: Pt:Tag:craft=insulation
+    craft=jeweller: Pt:Tag:craft=jeweller
+    craft=key_cutter: Pt:Tag:craft=key cutter
+    craft=locksmith: Pt:Tag:craft=locksmith
+    craft=metal_construction: Pt:Tag:craft=metal construction
+    craft=optician: Pt:Tag:craft=optician
+    craft=painter: Pt:Tag:craft=painter
+    craft=parquet_layer: Pt:Tag:craft=parquet layer
+    craft=photographer: Pt:Tag:craft=photographer
+    craft=photographic_laboratory: Pt:Tag:craft=photographic laboratory
+    craft=plasterer: Pt:Tag:craft=plasterer
+    craft=plumber: Pt:Tag:craft=plumber
+    craft=pottery: Pt:Tag:craft=pottery
+    craft=rigger: Pt:Tag:craft=rigger
+    craft=roofer: Pt:Tag:craft=roofer
+    craft=saddler: Pt:Tag:craft=saddler
+    craft=sailmaker: Pt:Tag:craft=sailmaker
+    craft=sawmill: Pt:Tag:craft=sawmill
+    craft=scaffolder: Pt:Tag:craft=scaffolder
+    craft=sculptor: Pt:Tag:craft=sculptor
+    craft=shoemaker: Pt:Tag:craft=shoemaker
+    craft=stand_builder: Pt:Tag:craft=stand builder
+    craft=stonemason: Pt:Tag:craft=stonemason
+    craft=sun_protection: Pt:Tag:craft=sun protection
+    craft=tailor: Pt:Tag:craft=tailor
+    craft=tiler: Pt:Tag:craft=tiler
+    craft=tinsmith: Pt:Tag:craft=tinsmith
     craft=upholsterer: Pt:Tag:craft=upholsterer
+    craft=watchmaker: Pt:Tag:craft=watchmaker
+    craft=winery: Pt:Tag:craft=winery
+    emergency=ambulance_station: Pt:Tag:emergency=ambulance station
+    emergency=fire_hydrant: Pt:Tag:emergency=fire hydrant
+    emergency=phone: Pt:Tag:emergency=phone
+    emergency=siren: Pt:Tag:emergency=siren
+    geological=palaeontological_site: Pt:Tag:geological=palaeontological site
+    healthcare=blood_donation: Pt:Tag:healthcare=blood donation
+    highway=bridleway: Pt:Tag:highway=bridleway
+    highway=bus_guideway: Pt:Tag:highway=bus guideway
+    highway=bus_stop: Pt:Tag:highway=bus stop
+    highway=corridor: Pt:Tag:highway=corridor
+    highway=crossing: Pt:Tag:highway=crossing
+    highway=cycleway: Pt:Tag:highway=cycleway
+    highway=emergency_access_point: Pt:Tag:highway=emergency access point
+    highway=footway: Pt:Tag:highway=footway
+    highway=ford: Pt:Tag:highway=ford
+    highway=give_way: Pt:Tag:highway=give way
+    highway=living_street: Pt:Tag:highway=living street
+    highway=mini_roundabout: Pt:Tag:highway=mini roundabout
     highway=motorway: Pt:Tag:highway=motorway
+    highway=motorway_junction: Pt:Tag:highway=motorway junction
+    highway=motorway_link: Pt:Tag:highway=motorway link
+    highway=passing_place: Pt:Tag:highway=passing place
+    highway=path: Pt:Tag:highway=path
+    highway=pedestrian: Pt:Tag:highway=pedestrian
+    highway=platform: Pt:Tag:highway=platform
     highway=primary: Pt:Tag:highway=primary
+    highway=raceway: Pt:Tag:highway=raceway
     highway=residential: Pt:Tag:highway=residential
+    highway=rest_area: Pt:Tag:highway=rest area
+    highway=road: Pt:Tag:highway=road
     highway=secondary: Pt:Tag:highway=secondary
+    highway=service: Pt:Tag:highway=service
+    highway=services: Pt:Tag:highway=services
+    highway=speed_camera: Pt:Tag:highway=speed camera
+    highway=steps: Pt:Tag:highway=steps
+    highway=stop: Pt:Tag:highway=stop
+    highway=street_lamp: Pt:Tag:highway=street lamp
     highway=tertiary: Pt:Tag:highway=tertiary
+    highway=track: Pt:Tag:highway=track
+    highway=traffic_signals: Pt:Tag:highway=traffic signals
     highway=trunk: Pt:Tag:highway=trunk
+    highway=turning_circle: Pt:Tag:highway=turning circle
     highway=unclassified: Pt:Tag:highway=unclassified
+    historic=aircraft: Pt:Tag:historic=aircraft
+    historic=archaeological_site: Pt:Tag:historic=archaeological site
+    historic=battlefield: Pt:Tag:historic=battlefield
+    historic=boundary_stone: Pt:Tag:historic=boundary stone
+    historic=cannon: Pt:Tag:historic=cannon
+    historic=castle: Pt:Tag:historic=castle
+    historic=city_gate: Pt:Tag:historic=city gate
+    historic=fort: Pt:Tag:historic=fort
+    historic=locomotive: Pt:Tag:historic=locomotive
+    historic=memorial: Pt:Tag:historic=memorial
+    historic=milestone: Pt:Tag:historic=milestone
+    historic=monument: Pt:Tag:historic=monument
+    historic=pillory: Pt:Tag:historic=pillory
+    historic=ruins: Pt:Tag:historic=ruins
+    historic=wayside_cross: Pt:Tag:historic=wayside cross
+    historic=wayside_shrine: Pt:Tag:historic=wayside shrine
+    historic=wreck: Pt:Tag:historic=wreck
+    junction=roundabout: Pt:Tag:junction=roundabout
+    landuse=allotments: Pt:Tag:landuse=allotments
+    landuse=basin: Pt:Tag:landuse=basin
+    landuse=brownfield: Pt:Tag:landuse=brownfield
+    landuse=cemetery: Pt:Tag:landuse=cemetery
+    landuse=commercial: Pt:Tag:landuse=commercial
+    landuse=farm: Pt:Tag:landuse=farm
+    landuse=farmyard: Pt:Tag:landuse=farmyard
+    landuse=forest: Pt:Tag:landuse=forest
+    landuse=garages: Pt:Tag:landuse=garages
+    landuse=grass: Pt:Tag:landuse=grass
+    landuse=greenfield: Pt:Tag:landuse=greenfield
+    landuse=greenhouse_horticulture: Pt:Tag:landuse=greenhouse horticulture
+    landuse=industrial: Pt:Tag:landuse=industrial
+    landuse=landfill: Pt:Tag:landuse=landfill
+    landuse=meadow: Pt:Tag:landuse=meadow
+    landuse=military: Pt:Tag:landuse=military
+    landuse=orchard: Pt:Tag:landuse=orchard
+    landuse=quarry: Pt:Tag:landuse=quarry
+    landuse=railway: Pt:Tag:landuse=railway
+    landuse=recreation_ground: Pt:Tag:landuse=recreation ground
+    landuse=reservoir: Pt:Tag:landuse=reservoir
+    landuse=residential: Pt:Tag:landuse=residential
+    landuse=retail: Pt:Tag:landuse=retail
+    landuse=salt_pond: Pt:Tag:landuse=salt pond
+    landuse=village_green: Pt:Tag:landuse=village green
+    landuse=vineyard: Pt:Tag:landuse=vineyard
+    leisure=bandstand: Pt:Tag:leisure=bandstand
+    leisure=common: Pt:Tag:leisure=common
+    leisure=dance: Pt:Tag:leisure=dance
+    leisure=dog_park: Pt:Tag:leisure=dog park
     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=ice_rink: Pt:Tag:leisure=ice rink
     leisure=marina: Pt:Tag:leisure=marina
+    leisure=miniature_golf: Pt:Tag:leisure=miniature golf
     leisure=nature_reserve: Pt:Tag:leisure=nature reserve
     leisure=park: Pt:Tag:leisure=park
     leisure=pitch: Pt:Tag:leisure=pitch
@@ -6858,26 +13364,289 @@ pt:
     leisure=slipway: Pt:Tag:leisure=slipway
     leisure=sports_centre: Pt:Tag:leisure=sports centre
     leisure=stadium: Pt:Tag:leisure=stadium
+    leisure=swimming_pool: Pt:Tag:leisure=swimming pool
     leisure=track: Pt:Tag:leisure=track
     leisure=water_park: Pt:Tag:leisure=water park
+    man_made=adit: Pt:Tag:man made=adit
+    man_made=antenna: Pt:Tag:man made=antenna
+    man_made=beacon: Pt:Tag:man made=beacon
+    man_made=breakwater: Pt:Tag:man made=breakwater
+    man_made=cairn: Pt:Tag:man made=cairn
+    man_made=crane: Pt:Tag:man made=crane
+    man_made=cutline: Pt:Tag:man made=cutline
+    man_made=dyke: Pt:Tag:man made=dyke
+    man_made=flagpole: Pt:Tag:man made=flagpole
+    man_made=groyne: Pt:Tag:man made=groyne
+    man_made=jetty: Pt:Tag:man made=jetty
+    man_made=lighthouse: Pt:Tag:man made=lighthouse
+    man_made=mineshaft: Pt:Tag:man made=mineshaft
+    man_made=monitoring_station: Pt:Tag:man made=monitoring station
+    man_made=petroleum_well: Pt:Tag:man made=petroleum well
+    man_made=pier: Pt:Tag:man made=pier
+    man_made=pipeline: Pt:Tag:man made=pipeline
+    man_made=pumping_station: Pt:Tag:man made=pumping station
+    man_made=reservoir_covered: Pt:Tag:man made=reservoir covered
+    man_made=surveillance: Pt:Tag:man made=surveillance
+    man_made=survey_point: Pt:Tag:man made=survey point
+    man_made=tower: Pt:Tag:man made=tower
+    man_made=wastewater_plant: Pt:Tag:man made=wastewater plant
+    man_made=water_tower: Pt:Tag:man made=water tower
+    man_made=water_well: Pt:Tag:man made=water well
+    man_made=water_works: Pt:Tag:man made=water works
+    man_made=watermill: Pt:Tag:man made=watermill
+    man_made=windmill: Pt:Tag:man made=windmill
+    man_made=works: Pt:Tag:man made=works
+    military=airfield: Pt:Tag:military=airfield
+    military=barracks: Pt:Tag:military=barracks
+    military=bunker: Pt:Tag:military=bunker
+    military=danger_area: Pt:Tag:military=danger area
+    military=naval_base: Pt:Tag:military=naval base
+    military=range: Pt:Tag:military=range
+    natural=bay: Pt:Tag:natural=bay
+    natural=beach: Pt:Tag:natural=beach
+    natural=cave_entrance: Pt:Tag:natural=cave entrance
+    natural=cliff: Pt:Tag:natural=cliff
     natural=coastline: Pt:Tag:natural=coastline
-    natural=wetland: PT:Tag:natural=wetland
+    natural=fell: Pt:Tag:natural=fell
+    natural=glacier: Pt:Tag:natural=glacier
+    natural=grassland: Pt:Tag:natural=grassland
+    natural=heath: Pt:Tag:natural=heath
+    natural=mud: Pt:Tag:natural=mud
+    natural=peak: Pt:Tag:natural=peak
+    natural=reef: Pt:Tag:natural=reef
+    natural=sand: Pt:Tag:natural=sand
+    natural=scree: Pt:Tag:natural=scree
+    natural=scrub: Pt:Tag:natural=scrub
+    natural=shoal: Pt:Tag:natural=shoal
+    natural=spring: Pt:Tag:natural=spring
+    natural=stone: Pt:Tag:natural=stone
+    natural=tree: Pt:Tag:natural=tree
+    natural=volcano: Pt:Tag:natural=volcano
+    natural=water: Pt:Tag:natural=water
+    natural=wetland: Pt:Tag:natural=wetland
+    natural=wood: Pt:Tag:natural=wood
     noexit=no: Pt:Tag:noexit=no
+    office=accountant: Pt:Tag:office=accountant
+    office=administrative: Pt:Tag:office=administrative
+    office=architect: Pt:Tag:office=architect
+    office=company: Pt:Tag:office=company
+    office=educational_institution: Pt:Tag:office=educational institution
+    office=employment_agency: Pt:Tag:office=employment agency
+    office=estate_agent: Pt:Tag:office=estate agent
+    office=government: Pt:Tag:office=government
+    office=insurance: Pt:Tag:office=insurance
+    office=it: Pt:Tag:office=it
+    office=lawyer: Pt:Tag:office=lawyer
+    office=newspaper: Pt:Tag:office=newspaper
+    office=ngo: Pt:Tag:office=ngo
+    office=quango: Pt:Tag:office=quango
+    office=research: Pt:Tag:office=research
+    office=surveyor: Pt:Tag:office=surveyor
+    office=telecommunication: Pt:Tag:office=telecommunication
+    office=travel_agent: Pt:Tag:office=travel agent
+    place=city: Pt:Tag:place=city
+    place=continent: Pt:Tag:place=continent
+    place=country: Pt:Tag:place=country
+    place=county: Pt:Tag:place=county
+    place=farm: Pt:Tag:place=farm
+    place=hamlet: Pt:Tag:place=hamlet
+    place=island: Pt:Tag:place=island
+    place=islet: Pt:Tag:place=islet
+    place=isolated_dwelling: Pt:Tag:place=isolated dwelling
+    place=locality: Pt:Tag:place=locality
+    place=plot: Pt:Tag:place=plot
+    place=region: Pt:Tag:place=region
+    place=state: Pt:Tag:place=state
+    place=suburb: Pt:Tag:place=suburb
+    place=town: Pt:Tag:place=town
+    place=village: Pt:Tag:place=village
+    power=cable_distribution_cabinet: Pt:Tag:power=cable distribution cabinet
+    power=generator: Pt:Tag:power=generator
+    power=line: Pt:Tag:power=line
+    power=minor_line: Pt:Tag:power=minor line
+    power=pole: Pt:Tag:power=pole
+    power=station: Pt:Tag:power=station
+    power=sub_station: Pt:Tag:power=sub station
+    power=tower: Pt:Tag:power=tower
+    railway=abandoned: Pt:Tag:railway=abandoned
+    railway=buffer_stop: Pt:Tag:railway=buffer stop
+    railway=crossing: Pt:Tag:railway=crossing
+    railway=derail: Pt:Tag:railway=derail
+    railway=disused: Pt:Tag:railway=disused
+    railway=funicular: Pt:Tag:railway=funicular
+    railway=halt: Pt:Tag:railway=halt
+    railway=level_crossing: Pt:Tag:railway=level crossing
+    railway=monorail: Pt:Tag:railway=monorail
+    railway=platform: Pt:Tag:railway=platform
+    railway=rail: Pt:Tag:railway=rail
+    railway=station: Pt:Tag:railway=station
+    railway=subway: Pt:Tag:railway=subway
+    railway=subway_entrance: Pt:Tag:railway=subway entrance
+    railway=switch: Pt:Tag:railway=switch
+    railway=tram: Pt:Tag:railway=tram
+    railway=tram_stop: Pt:Tag:railway=tram stop
+    railway=turntable: Pt:Tag:railway=turntable
+    route=bus: Pt:Tag:route=bus
+    route=detour: Pt:Tag:route=detour
+    route=ferry: Pt:Tag:route=ferry
+    route=railway: Pt:Tag:route=railway
+    route=road: Pt:Tag:route=road
+    route=train: Pt:Tag:route=train
+    route=tram: Pt:Tag:route=tram
+    service=alley: Pt:Tag:service=alley
+    service=driveway: Pt:Tag:service=driveway
+    service=parking_aisle: Pt:Tag:service=parking aisle
+    service=siding: Pt:Tag:service=siding
+    service=spur: Pt:Tag:service=spur
+    service=yard: Pt:Tag:service=yard
+    shop=alcohol: Pt:Tag:shop=alcohol
+    shop=anime: Pt:Tag:shop=anime
+    shop=art: Pt:Tag:shop=art
+    shop=açaí: Pt:Tag:shop=açaí
+    shop=baby_goods: Pt:Tag:shop=baby goods
+    shop=bag: Pt:Tag:shop=bag
+    shop=bakery: Pt:Tag:shop=bakery
+    shop=bathroom_furnishing: Pt:Tag:shop=bathroom furnishing
+    shop=beauty: Pt:Tag:shop=beauty
+    shop=bed: Pt:Tag:shop=bed
+    shop=beverages: Pt:Tag:shop=beverages
+    shop=bicycle: Pt:Tag:shop=bicycle
+    shop=bookmaker: Pt:Tag:shop=bookmaker
+    shop=books: Pt:Tag:shop=books
+    shop=boutique: Pt:Tag:shop=boutique
+    shop=brewing_supplies: Pt:Tag:shop=brewing supplies
+    shop=butcher: Pt:Tag:shop=butcher
+    shop=car: Pt:Tag:shop=car
+    shop=car_parts: Pt:Tag:shop=car parts
+    shop=car_repair: Pt:Tag:shop=car repair
+    shop=charity: Pt:Tag:shop=charity
+    shop=cheese: Pt:Tag:shop=cheese
+    shop=chemist: Pt:Tag:shop=chemist
+    shop=chocolate: Pt:Tag:shop=chocolate
+    shop=clothes: Pt:Tag:shop=clothes
+    shop=coffee: Pt:Tag:shop=coffee
+    shop=communication: Pt:Tag:shop=communication
+    shop=computer: Pt:Tag:shop=computer
+    shop=confectionery: Pt:Tag:shop=confectionery
+    shop=convenience: Pt:Tag:shop=convenience
+    shop=copyshop: Pt:Tag:shop=copyshop
+    shop=cosmetics: Pt:Tag:shop=cosmetics
+    shop=curtain: Pt:Tag:shop=curtain
+    shop=deli: Pt:Tag:shop=deli
+    shop=department_store: Pt:Tag:shop=department store
+    shop=dive: Pt:Tag:shop=dive
+    shop=doityourself: Pt:Tag:shop=doityourself
+    shop=dry_cleaning: Pt:Tag:shop=dry cleaning
+    shop=electronics: Pt:Tag:shop=electronics
+    shop=erotic: Pt:Tag:shop=erotic
+    shop=fabric: Pt:Tag:shop=fabric
+    shop=farm: Pt:Tag:shop=farm
+    shop=fishing: Pt:Tag:shop=fishing
+    shop=florist: Pt:Tag:shop=florist
+    shop=frame: Pt:Tag:shop=frame
+    shop=fuel: Pt:Tag:shop=fuel
+    shop=funeral_directors: Pt:Tag:shop=funeral directors
+    shop=furnace: Pt:Tag:shop=furnace
+    shop=furniture: Pt:Tag:shop=furniture
+    shop=garden_centre: Pt:Tag:shop=garden centre
+    shop=gas: Pt:Tag:shop=gas
+    shop=general: Pt:Tag:shop=general
+    shop=gift: Pt:Tag:shop=gift
+    shop=glaziery: Pt:Tag:shop=glaziery
+    shop=greengrocer: Pt:Tag:shop=greengrocer
+    shop=hairdresser: Pt:Tag:shop=hairdresser
+    shop=hairdresser_supply: Pt:Tag:shop=hairdresser supply
+    shop=hardware: Pt:Tag:shop=hardware
+    shop=hearing_aids: Pt:Tag:shop=hearing aids
+    shop=hifi: Pt:Tag:shop=hifi
+    shop=hunting: Pt:Tag:shop=hunting
+    shop=ice_cream: Pt:Tag:shop=ice cream
+    shop=interior_decoration: Pt:Tag:shop=interior decoration
+    shop=jetski: Pt:Tag:shop=jetski
     shop=jewelry: Pt:Tag:shop=jewelry
+    shop=kiosk: Pt:Tag:shop=kiosk
+    shop=kitchen: Pt:Tag:shop=kitchen
+    shop=laundry: Pt:Tag:shop=laundry
+    shop=leather: Pt:Tag:shop=leather
+    shop=locksmith: Pt:Tag:shop=locksmith
     shop=lottery: Pt:Tag:shop=lottery
+    shop=mall: Pt:Tag:shop=mall
+    shop=massage: Pt:Tag:shop=massage
+    shop=mobile_phone: Pt:Tag:shop=mobile phone
+    shop=money_lender: Pt:Tag:shop=money lender
+    shop=motorcycle: Pt:Tag:shop=motorcycle
+    shop=motorcycle_repair: Pt:Tag:shop=motorcycle repair
+    shop=musical_instrument: Pt:Tag:shop=musical instrument
+    shop=newsagent: Pt:Tag:shop=newsagent
+    shop=optician: Pt:Tag:shop=optician
+    shop=organic: Pt:Tag:shop=organic
+    shop=outdoor: Pt:Tag:shop=outdoor
+    shop=paint: Pt:Tag:shop=paint
+    shop=pasta: Pt:Tag:shop=pasta
+    shop=pastry: Pt:Tag:shop=pastry
+    shop=pawnbroker: Pt:Tag:shop=pawnbroker
     shop=perfumery: Pt:Tag:shop=perfumery
+    shop=pet: Pt:Tag:shop=pet
+    shop=photo: Pt:Tag:shop=photo
+    shop=pyrotechnics: Pt:Tag:shop=pyrotechnics
+    shop=radiotechnics: Pt:Tag:shop=radiotechnics
+    shop=scuba_diving: Pt:Tag:shop=scuba diving
+    shop=seafood: Pt:Tag:shop=seafood
+    shop=second_hand: Pt:Tag:shop=second hand
+    shop=shoes: Pt:Tag:shop=shoes
+    shop=spices: Pt:Tag:shop=spices
+    shop=sports: Pt:Tag:shop=sports
+    shop=stationery: Pt:Tag:shop=stationery
+    shop=supermarket: Pt:Tag:shop=supermarket
+    shop=swimming_pool: Pt:Tag:shop=swimming pool
+    shop=tattoo: Pt:Tag:shop=tattoo
+    shop=tea: Pt:Tag:shop=tea
+    shop=tobacco: Pt:Tag:shop=tobacco
+    shop=toys: Pt:Tag:shop=toys
+    shop=trade: Pt:Tag:shop=trade
+    shop=travel_agency: Pt:Tag:shop=travel agency
+    shop=tyres: Pt:Tag:shop=tyres
+    shop=vacant: Pt:Tag:shop=vacant
+    shop=vacuum_cleaner: Pt:Tag:shop=vacuum cleaner
+    shop=variety_store: Pt:Tag:shop=variety store
+    shop=video: Pt:Tag:shop=video
     shop=watches: Pt:Tag:shop=watches
+    sport=10pin: Pt:Tag:sport=10pin
+    sport=9pin: Pt:Tag:sport=9pin
     sport=golf: Pt:Tag:sport=golf
+    sport=soccer: Pt:Tag:sport=soccer
+    tourism=alpine_hut: Pt:Tag:tourism=alpine hut
+    tourism=artwork: Pt:Tag:tourism=artwork
+    tourism=attraction: Pt:Tag:tourism=attraction
+    tourism=bed_and_breakfast: Pt:Tag:tourism=bed and breakfast
+    tourism=camp_site: Pt:Tag:tourism=camp site
+    tourism=caravan_site: Pt:Tag:tourism=caravan site
+    tourism=chalet: Pt:Tag:tourism=chalet
+    tourism=guest_house: Pt:Tag:tourism=guest house
+    tourism=hostel: Pt:Tag:tourism=hostel
+    tourism=hotel: Pt:Tag:tourism=hotel
+    tourism=information: Pt:Tag:tourism=information
+    tourism=motel: Pt:Tag:tourism=motel
+    tourism=museum: Pt:Tag:tourism=museum
+    tourism=picnic_site: Pt:Tag:tourism=picnic site
+    tourism=theme_park: Pt:Tag:tourism=theme park
+    tourism=viewpoint: Pt:Tag:tourism=viewpoint
+    tourism=zoo: Pt:Tag:tourism=zoo
+    traffic_calming=island: Pt:Tag:traffic calming=island
     traffic_calming=table: Pt:Tag:traffic calming=table
+    vending=bicycle_tube: Pt:Tag:vending=bicycle tube
+    waterway=boatyard: Pt:Tag:waterway=boatyard
+    waterway=canal: Pt:Tag:waterway=canal
+    waterway=dam: Pt:Tag:waterway=dam
+    waterway=ditch: Pt:Tag:waterway=ditch
+    waterway=dock: Pt:Tag:waterway=dock
+    waterway=drain: Pt:Tag:waterway=drain
+    waterway=lock_gate: Pt:Tag:waterway=lock gate
     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
+    waterway=turning_point: Pt:Tag:waterway=turning point
+    waterway=weir: Pt:Tag:waterway=weir
 pt-br:
   key:
     IBGE:GEOCODIGO: Pt-br:Key:IBGE:GEOCODIGO
@@ -6950,6 +13719,7 @@ pt-br:
     frequency: Pt-br:Key:frequency
     generator:method: Pt-br:Key:generator:method
     geological: Pt-br:Key:geological
+    heritage: Pt-br:Key:heritage
     hgv: Pt-br:Key:hgv
     highway: Pt-br:Key:highway
     historic: Pt-br:Key:historic
@@ -7045,6 +13815,7 @@ pt-br:
     source: Pt-br:Key:source
     source_ref: Pt-br:Key:source ref
     sport: Pt-br:Key:sport
+    substance: Pt-br:Key:substance
     surface: Pt-br:Key:surface
     survey:date: Pt-br:Key:survey:date
     taxi: Pt-br:Key:taxi
@@ -7074,6 +13845,7 @@ pt-br:
     aeroway=taxiway: Pt-br:Tag:aeroway=taxiway
     aeroway=terminal: Pt-br:Tag:aeroway=terminal
     aeroway=windsock: Pt-br:Tag:aeroway=windsock
+    amenity=animal_boarding: Pt-br:Tag:amenity=animal boarding
     amenity=architect_office: Pt-br:Tag:amenity=architect office
     amenity=arts_centre: Pt-br:Tag:amenity=arts centre
     amenity=atm: Pt-br:Tag:amenity=atm
@@ -7082,7 +13854,6 @@ pt-br:
     amenity=bar: Pt-br:Tag:amenity=bar
     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
@@ -7094,6 +13865,7 @@ pt-br:
     amenity=car_sharing: Pt-br:Tag:amenity=car sharing
     amenity=car_wash: Pt-br:Tag:amenity=car wash
     amenity=cinema: Pt-br:Tag:amenity=cinema
+    amenity=clinic: Pt-br:Tag:amenity=clinic
     amenity=clock: Pt-br:Tag:amenity=clock
     amenity=college: Pt-br:Tag:amenity=college
     amenity=community_centre: Pt-br:Tag:amenity=community centre
@@ -7170,7 +13942,11 @@ pt-br:
     boundary=political: Pt-br:Tag:boundary=political
     boundary=protected_area: Pt-br:Tag:boundary=protected area
     bridge=viaduct: Pt-br:Tag:bridge=viaduct
+    building=commercial: Pt-br:Tag:building=commercial
     building=house: Pt-br:Tag:building=house
+    building=residential: Pt-br:Tag:building=residential
+    building=roof: Pt-br:Tag:building=roof
+    building=school: Pt-br:Tag:building=school
     craft=agricultural_engines: Pt-br:Tag:craft=agricultural engines
     craft=basket_maker: Pt-br:Tag:craft=basket maker
     craft=beekeeper: Pt-br:Tag:craft=beekeeper
@@ -7228,7 +14004,6 @@ pt-br:
     highway=bridleway: Pt-br:Tag:highway=bridleway
     highway=bus_guideway: Pt-br:Tag:highway=bus guideway
     highway=bus_stop: Pt-br:Tag:highway=bus stop
-    highway=byway: Pt-br:Tag:highway=byway
     highway=corridor: Pt-br:Tag:highway=corridor
     highway=crossing: Pt-br:Tag:highway=crossing
     highway=cycleway: Pt-br:Tag:highway=cycleway
@@ -7305,6 +14080,7 @@ pt-br:
     landuse=salt_pond: Pt-br:Tag:landuse=salt pond
     landuse=village_green: Pt-br:Tag:landuse=village green
     landuse=vineyard: Pt-br:Tag:landuse=vineyard
+    leisure=bandstand: Pt-br:Tag:leisure=bandstand
     leisure=common: Pt-br:Tag:leisure=common
     leisure=dance: Pt-br:Tag:leisure=dance
     leisure=dog_park: Pt-br:Tag:leisure=dog park
@@ -7375,12 +14151,11 @@ pt-br:
     natural=tree: Pt-br:Tag:natural=tree
     natural=volcano: Pt-br:Tag:natural=volcano
     natural=water: Pt-br:Tag:natural=water
-    natural=wetland: Pt-br:Tag:natural=wetland
+    natural=wetland: Pt-BR:Tag:natural=wetland
     natural=wood: Pt-br:Tag:natural=wood
     office=accountant: Pt-br:Tag:office=accountant
     office=administrative: Pt-br:Tag:office=administrative
     office=architect: Pt-br:Tag:office=architect
-    office=camping: Pt-br:Tag:office=camping
     office=company: Pt-br:Tag:office=company
     office=educational_institution: Pt-br:Tag:office=educational institution
     office=employment_agency: Pt-br:Tag:office=employment agency
@@ -7405,6 +14180,7 @@ pt-br:
     place=islet: Pt-br:Tag:place=islet
     place=isolated_dwelling: Pt-br:Tag:place=isolated dwelling
     place=locality: Pt-br:Tag:place=locality
+    place=plot: Pt-br:Tag:place=plot
     place=region: Pt-br:Tag:place=region
     place=state: Pt-br:Tag:place=state
     place=suburb: Pt-br:Tag:place=suburb
@@ -7450,6 +14226,7 @@ pt-br:
     shop=alcohol: Pt-br:Tag:shop=alcohol
     shop=anime: Pt-br:Tag:shop=anime
     shop=art: Pt-br:Tag:shop=art
+    shop=açaí: Pt-br:Tag:shop=açaí
     shop=baby_goods: Pt-br:Tag:shop=baby goods
     shop=bakery: Pt-br:Tag:shop=bakery
     shop=bathroom_furnishing: Pt-br:Tag:shop=bathroom furnishing
@@ -7503,6 +14280,7 @@ pt-br:
     shop=kiosk: Pt-br:Tag:shop=kiosk
     shop=kitchen: Pt-br:Tag:shop=kitchen
     shop=laundry: Pt-br:Tag:shop=laundry
+    shop=locksmith: Pt-br:Tag:shop=locksmith
     shop=mall: Pt-br:Tag:shop=mall
     shop=massage: Pt-br:Tag:shop=massage
     shop=mobile_phone: Pt-br:Tag:shop=mobile phone
@@ -7516,6 +14294,7 @@ pt-br:
     shop=paint: Pt-br:Tag:shop=paint
     shop=pawnbroker: Pt-br:Tag:shop=pawnbroker
     shop=pet: Pt-br:Tag:shop=pet
+    shop=pyrotechnics: Pt-br:Tag:shop=pyrotechnics
     shop=radiotechnics: Pt-br:Tag:shop=radiotechnics
     shop=seafood: Pt-br:Tag:shop=seafood
     shop=second_hand: Pt-br:Tag:shop=second hand
@@ -7551,6 +14330,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
+    traffic_calming=island: Pt-br:Tag:traffic calming=island
     traffic_calming=table: Pt-br:Tag:traffic calming=table
     waterway=boatyard: Pt-br:Tag:waterway=boatyard
     waterway=canal: Pt-br:Tag:waterway=canal
@@ -7608,32 +14388,39 @@ ru:
     bicycle: RU:Key:bicycle
     bicycle_parking: RU:Key:bicycle parking
     bin: RU:Key:bin
+    board_type: RU:Key:board type
     boat: RU:Key:boat
     border_type: RU:Key:border type
     boundary: RU:Key:boundary
     brand: RU:Key:brand
     bridge: RU:Key:bridge
     building: RU:Key:building
+    building:architecture: RU:Key:building:architecture
     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
+    building:use: RU:Key:building:use
     bunker_type: RU:Key:bunker type
     bus: RU:Key:bus
     cafe: RU:Key:cafe
     capacity: RU:Key:capacity
     check_date: RU:Key:check date
+    checkpoint: RU:Key:checkpoint
     clothes: RU:Key:clothes
     club: RU:Key:club
     colour: RU:Key:colour
     comment: RU:Key:comment
     construction: RU:Key:construction
     contact: RU:Key:contact
+    contact:facebook: RU:Key:contact:facebook
     contact:fax: RU:Key:contact:fax
     contact:phone: RU:Key:contact:phone
+    contact:vk: RU:Key:contact:vk
     contact:website: RU:Key:contact:website
+    conveying: RU:Key:conveying
     covered: RU:Key:covered
     craft: RU:Key:craft
     created_by: RU:Key:created by
@@ -7641,21 +14428,25 @@ ru:
     crossing: RU:Key:crossing
     cuisine: RU:Key:cuisine
     cutting: RU:Key:cutting
+    delivery: RU:Key:delivery
     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
+    diaper: RU:Key:diaper
     direction: RU:Key:direction
     dispensing: RU:Key:dispensing
     disused: RU:Key:disused
+    'disused:': 'RU:Key:disused:'
     disused:shop: RU:Key:disused:shop
     drinking_water: RU:Key:drinking water
     drive_in: RU:Key:drive in
     driving_side: RU:Key:driving side
     ele: RU:Key:ele
     electrified: RU:Key:electrified
+    email: RU:Key:email
     embankment: RU:Key:embankment
     emergency: RU:Key:emergency
     entrance: RU:Key:entrance
@@ -7670,6 +14461,7 @@ ru:
     fire_object:type: RU:Key:fire object:type
     fire_operator: RU:Key:fire operator
     fire_rank: RU:Key:fire rank
+    fire_station:type: RU:Key:fire station:type
     fixme: RU:Key:fixme
     foot: RU:Key:foot
     footway: RU:Key:footway
@@ -7681,10 +14473,12 @@ ru:
     further: RU:Key:further
     further:access: RU:Key:further:access
     further:vehicle: RU:Key:further:vehicle
+    garden:style: RU:Key:garden:style
     gas: RU:Key:gas
     gauge: RU:Key:gauge
     generator:output: RU:Key:generator:output
     generator:source: RU:Key:generator:source
+    genus: RU:Key:genus
     grassland: RU:Key:grassland
     gvr:code: RU:Key:gvr:code
     handrail: RU:Key:handrail
@@ -7693,9 +14487,11 @@ ru:
     highway: RU:Key:highway
     historic: RU:Key:historic
     horse: RU:Key:horse
+    iata: RU:Key:iata
     ice_road: RU:Key:ice road
     image: RU:Key:image
     incline: RU:Key:incline
+    industrial: RU:Key:industrial
     information: RU:Key:information
     inscription: RU:Key:inscription
     int_name: RU:Key:int name
@@ -7706,19 +14502,24 @@ ru:
     landmark: RU:Key:landmark
     landuse: RU:Key:landuse
     lanes: RU:Key:lanes
+    lanes:psv: RU:Key:lanes:psv
     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
+    lit: RU:Key:lit
     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
+    managed: RU:Key:managed
     manhole: RU:Key:manhole
+    material: RU:Key:material
     maxaxleload: RU:Key:maxaxleload
+    maxbogieweight: RU:Key:maxbogieweight
     maxheight: RU:Key:maxheight
     maxlength: RU:Key:maxlength
     maxspeed: RU:Key:maxspeed
@@ -7733,15 +14534,20 @@ ru:
     motor_vehicle: RU:Key:motor vehicle
     motorcycle: RU:Key:motorcycle
     motorroad: RU:Key:motorroad
+    mountain_pass: RU:Key:mountain pass
+    mtb:scale: RU:Key:mtb:scale
     name: RU:Key:name
     name:ru: RU:Key:name:ru
+    name:ru:word_stress: RU:Key:name:ru:word stress
     nat_name: RU:Key:nat name
     nat_ref: RU:Key:nat ref
     natural: RU:Key:natural
+    noaddress: RU:Key:noaddress
     noexit: RU:Key:noexit
     note: RU:Key:note
     office: RU:Key:office
     official_name: RU:Key:official name
+    official_short_type: RU:Key:official short type
     old_name: RU:Key:old name
     old_ref: RU:Key:old ref
     oneway: RU:Key:oneway
@@ -7749,21 +14555,28 @@ ru:
     opening_hours: RU:Key:opening hours
     operator: RU:Key:operator
     operator:type: RU:Key:operator:type
+    origin: RU:Key:origin
     overtaking: RU:Key:overtaking
     owner: RU:Key:owner
     ownership: RU:Key:ownership
     parking: RU:Key:parking
     parking:lane: RU:Key:parking:lane
+    parking:lane:both: RU:Key:parking:lane:both
+    parking:lane:left: RU:Key:parking:lane:left
+    parking:lane:right: RU:Key:parking:lane:right
     passing_places: RU:Key:passing places
     paved:date: RU:Key:paved:date
     payment: RU:Key:payment
+    payment:credit_cards: RU:Key:payment:credit cards
     payment:notes: RU:Key:payment:notes
     phone: RU:Key:phone
+    pipeline: RU:Key:pipeline
     piste:type: RU:Key:piste:type
     place: RU:Key:place
     playground: RU:Key:playground
     police: RU:Key:police
     population: RU:Key:population
+    postal_code: RU:Key:postal code
     power: RU:Key:power
     power_source: RU:Key:power source
     previous: RU:Key:previous
@@ -7771,8 +14584,11 @@ ru:
     previous:vehicle: RU:Key:previous:vehicle
     priority_road: RU:Key:priority road
     psv: RU:Key:psv
+    public_bookcase:type: RU:Key:public bookcase:type
+    pump: RU:Key:pump
     railway: RU:Key:railway
     ramp: RU:Key:ramp
+    recycling_type: RU:Key:recycling type
     ref: RU:Key:ref
     reference: RU:Key:reference
     reg_name: RU:Key:reg name
@@ -7780,15 +14596,22 @@ ru:
     religion: RU:Key:religion
     resource: RU:Key:resource
     roof:material: RU:Key:roof:material
+    rooms: RU:Key:rooms
     route: RU:Key:route
+    rtsa_scale: RU:Key:rtsa scale
     ruined: RU:Key:ruined
+    'ruined:': 'RU:Key:ruined:'
     ruins: RU:Key:ruins
     salt: RU:Key:salt
+    sanitary_dump_station: RU:Key:sanitary dump station
+    seasonal: RU:Key:seasonal
     seasonal:snowfall:regaintime: RU:Key:seasonal:snowfall:regaintime
+    second_hand: RU:Key:second hand
     service: RU:Key:service
     service_times: RU:Key:service times
     shelter: RU:Key:shelter
     shelter_type: RU:Key:shelter type
+    shooting: RU:Key:shooting
     shop: RU:Key:shop
     side_road: RU:Key:side road
     sidewalk: RU:Key:sidewalk
@@ -7800,18 +14623,23 @@ ru:
     source: RU:Key:source
     source:addr: RU:Key:source:addr
     source:maxspeed: RU:Key:source:maxspeed
-    source_ref: RU:Key:source ref
     species: RU:Key:species
     sport: RU:Key:sport
+    start_date: RU:Key:start date
+    step_count: RU:Key:step count
+    substance: RU:Key:substance
     surface: RU:Key:surface
     surveillance: RU:Key:surveillance
     survey:date: RU:Key:survey:date
     tactile_paving: RU:Key:tactile paving
+    todo: RU:Key:todo
+    toilets:wheelchair: RU:Key:toilets:wheelchair
     toll: RU:Key:toll
     tourism: RU:Key:tourism
     tracktype: RU:Key:tracktype
     traffic_calming: RU:Key:traffic calming
     traffic_sign: RU:Key:traffic sign
+    trail_visibility: RU:Key:trail visibility
     tram: RU:Key:tram
     trolleybus: RU:Key:trolleybus
     tunnel: RU:Key:tunnel
@@ -7820,17 +14648,21 @@ ru:
     type: RU:Key:type
     vehicle: RU:Key:vehicle
     voltage: RU:Key:voltage
+    waste: RU:Key:waste
     water: RU:Key:water
     waterway: RU:Key:waterway
     website: RU:Key:website
     wheelchair: RU:Key:wheelchair
+    wholesale: RU:Key:wholesale
     width: RU:Key:width
+    wikidata: RU:Key:wikidata
     wikipedia: RU:Key:wikipedia
     wikipedia:ru: RU:Key:wikipedia:ru
     winter_road: RU:Key:winter road
     wood: RU:Key:wood
   tag:
     access=agricultural: RU:Tag:access=agricultural
+    access=customers: RU:Tag:access=customers
     access=delivery: RU:Tag:access=delivery
     access=designated: RU:Tag:access=designated
     access=destination: RU:Tag:access=destination
@@ -7846,6 +14678,7 @@ ru:
     aeroway=gate: RU:Tag:aeroway=gate
     aeroway=hangar: RU:Tag:aeroway=hangar
     aeroway=helipad: RU:Tag:aeroway=helipad
+    aeroway=heliport: RU:Tag:aeroway=heliport
     aeroway=navigationaid: RU:Tag:aeroway=navigationaid
     aeroway=runway: RU:Tag:aeroway=runway
     aeroway=taxiway: RU:Tag:aeroway=taxiway
@@ -7862,6 +14695,7 @@ ru:
     amenity=bench: RU:Tag:amenity=bench
     amenity=bicycle_parking: RU:Tag:amenity=bicycle parking
     amenity=bicycle_rental: RU:Tag:amenity=bicycle rental
+    amenity=bicycle_repair_station: RU:Tag:amenity=bicycle repair station
     amenity=biergarten: RU:Tag:amenity=biergarten
     amenity=boat_storage: RU:Tag:amenity=boat storage
     amenity=brothel: RU:Tag:amenity=brothel
@@ -7873,6 +14707,7 @@ ru:
     amenity=car_wash: RU:Tag:amenity=car wash
     amenity=casino: RU:Tag:amenity=casino
     amenity=charging_station: RU:Tag:amenity=charging station
+    amenity=childcare: RU:Tag:amenity=childcare
     amenity=cinema: RU:Tag:amenity=cinema
     amenity=clinic: RU:Tag:amenity=clinic
     amenity=clock: RU:Tag:amenity=clock
@@ -7884,19 +14719,27 @@ ru:
     amenity=crematorium: RU:Tag:amenity=crematorium
     amenity=dentist: RU:Tag:amenity=dentist
     amenity=doctors: RU:Tag:amenity=doctors
+    amenity=dojo: RU:Tag:amenity=dojo
     amenity=drinking_water: RU:Tag:amenity=drinking water
     amenity=driving_school: RU:Tag:amenity=driving school
     amenity=embassy: RU:Tag:amenity=embassy
     amenity=fast_food: RU:Tag:amenity=fast food
     amenity=ferry_terminal: RU:Tag:amenity=ferry terminal
     amenity=fire_station: RU:Tag:amenity=fire station
+    amenity=fish_spa: RU:Tag:amenity=fish spa
     amenity=food_court: RU:Tag:amenity=food court
     amenity=fountain: RU:Tag:amenity=fountain
     amenity=fuel: RU:Tag:amenity=fuel
     amenity=grave_yard: RU:Tag:amenity=grave yard
+    amenity=grit_bin: RU:Tag:amenity=grit bin
+    amenity=hookah_lounge: RU:Tag:amenity=hookah lounge
     amenity=hospital: RU:Tag:amenity=hospital
+    amenity=ice_cream: RU:Tag:amenity=ice cream
     amenity=kindergarten: RU:Tag:amenity=kindergarten
+    amenity=kneipp_water_cure: RU:Tag:amenity=kneipp water cure
+    amenity=letter_box: RU:Tag:amenity=letter box
     amenity=library: RU:Tag:amenity=library
+    amenity=loading_dock: RU:Tag:amenity=loading dock
     amenity=love_hotel: RU:Tag:amenity=love hotel
     amenity=marketplace: RU:Tag:amenity=marketplace
     amenity=monastery: RU:Tag:amenity=monastery
@@ -7922,33 +14765,44 @@ ru:
     amenity=register_office: RU:Tag:amenity=register office
     amenity=rescue_station: RU:Tag:amenity=rescue station
     amenity=restaurant: RU:Tag:amenity=restaurant
+    amenity=sanatorium: RU:Tag:amenity=sanatorium
+    amenity=sanitary_dump_station: RU:Tag:amenity=sanitary dump station
     amenity=sauna: RU:Tag:amenity=sauna
     amenity=school: RU:Tag:amenity=school
     amenity=shelter: RU:Tag:amenity=shelter
+    amenity=shop: RU:Tag:amenity=shop
     amenity=shower: RU:Tag:amenity=shower
     amenity=smoking_area: RU:Tag:amenity=smoking area
     amenity=social_facility: RU:Tag:amenity=social facility
     amenity=stripclub: RU:Tag:amenity=stripclub
+    amenity=studio: RU:Tag:amenity=studio
     amenity=taxi: RU:Tag:amenity=taxi
     amenity=telephone: RU:Tag:amenity=telephone
     amenity=theatre: RU:Tag:amenity=theatre
     amenity=toilets: RU:Tag:amenity=toilets
     amenity=townhall: RU:Tag:amenity=townhall
     amenity=university: RU:Tag:amenity=university
+    amenity=vehicle_ramp: RU:Tag:amenity=vehicle ramp
     amenity=vending_machine: RU:Tag:amenity=vending machine
     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
+    amenity=weighbridge: RU:Tag:amenity=weighbridge
     atm=yes: RU:Tag:atm=yes
     barrier=block: RU:Tag:barrier=block
     barrier=bollard: RU:Tag:barrier=bollard
+    barrier=border_control: RU:Tag:barrier=border control
+    barrier=cattle_grid: RU:Tag:barrier=cattle grid
+    barrier=chech_hedgehog: RU:Tag:barrier=chech hedgehog
     barrier=city_wall: RU:Tag:barrier=city wall
+    barrier=czech_hedgehog: RU:Tag:barrier=czech hedgehog
     barrier=ditch: RU:Tag:barrier=ditch
     barrier=entrance: RU:Tag:barrier=entrance
     barrier=fence: RU:Tag:barrier=fence
     barrier=gate: RU:Tag:barrier=gate
+    barrier=handrail: RU:Tag:barrier=handrail
     barrier=hedge: RU:Tag:barrier=hedge
     barrier=kerb: RU:Tag:barrier=kerb
     barrier=lift_gate: RU:Tag:barrier=lift gate
@@ -7958,6 +14812,8 @@ ru:
     barrier=turnstile: RU:Tag:barrier=turnstile
     barrier=wall: RU:Tag:barrier=wall
     bicycle=designated: RU:Tag:bicycle=designated
+    boundary=administrative: RU:Tag:boundary=administrative
+    boundary=forest_compartment: RU:Tag:boundary=forest compartment
     boundary=forestry_compartment: RU:Tag:boundary=forestry compartment
     boundary=postal_code: RU:Tag:boundary=postal code
     boundary=protected_area: RU:Tag:boundary=protected area
@@ -7972,24 +14828,51 @@ ru:
     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=aqueduct: RU:Tag:bridge=aqueduct
     bridge=cantilever: RU:Tag:bridge=cantilever
     bridge=covered: RU:Tag:bridge=covered
     building=apartments: RU:Tag:building=apartments
+    building=barn: RU:Tag:building=barn
+    building=bridge: RU:Tag:building=bridge
+    building=bungalow: RU:Tag:building=bungalow
+    building=bunker: RU:Tag:building=bunker
+    building=cabin: RU:Tag:building=cabin
     building=cathedral: RU:Tag:building=cathedral
     building=chapel: RU:Tag:building=chapel
     building=church: RU:Tag:building=church
+    building=commercial: RU:Tag:building=commercial
+    building=construction: RU:Tag:building=construction
     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=greenhouse: RU:Tag:building=greenhouse
     building=hangar: RU:Tag:building=hangar
+    building=hospital: RU:Tag:building=hospital
+    building=hotel: RU:Tag:building=hotel
+    building=house: RU:Tag:building=house
+    building=houseboat: RU:Tag:building=houseboat
     building=hut: RU:Tag:building=hut
+    building=industrial: RU:Tag:building=industrial
+    building=kindergarten: RU:Tag:building=kindergarten
+    building=kiosk: RU:Tag:building=kiosk
+    building=mosque: RU:Tag:building=mosque
+    building=public: RU:Tag:building=public
+    building=residential: RU:Tag:building=residential
+    building=retail: RU:Tag:building=retail
     building=roof: RU:Tag:building=roof
+    building=ruins: RU:Tag:building=ruins
+    building=school: RU:Tag:building=school
+    building=service: RU:Tag:building=service
     building=shed: RU:Tag:building=shed
     building=stable: RU:Tag:building=stable
+    building=synagogue: RU:Tag:building=synagogue
     building=train_station: RU:Tag:building=train station
+    building=transportation: RU:Tag:building=transportation
+    building=university: RU:Tag:building=university
+    building=warehouse: RU:Tag:building=warehouse
     bunker_type=pillbox: RU:Tag:bunker type=pillbox
     cafe=time-cafe: RU:Tag:cafe=time-cafe
     craft=agricultural_engines: RU:Tag:craft=agricultural engines
@@ -8007,11 +14890,17 @@ ru:
     craft=electrician: RU:Tag:craft=electrician
     craft=glaziery: RU:Tag:craft=glaziery
     craft=handicraft: RU:Tag:craft=handicraft
+    craft=key_cutter: RU:Tag:craft=key cutter
     craft=photographer: RU:Tag:craft=photographer
     craft=shoemaker: RU:Tag:craft=shoemaker
+    craft=stonemason: RU:Tag:craft=stonemason
     craft=tailor: RU:Tag:craft=tailor
     craft=window_construction: RU:Tag:craft=window construction
+    crop=grape: RU:Tag:crop=grape
+    crop=hop: RU:Tag:crop=hop
     emergency=ambulance_station: RU:Tag:emergency=ambulance station
+    emergency=fire_extinguisher: RU:Tag:emergency=fire extinguisher
+    emergency=fire_hose: RU:Tag:emergency=fire hose
     emergency=fire_hydrant: RU:Tag:emergency=fire hydrant
     emergency=fire_water_pond: RU:Tag:emergency=fire water pond
     emergency=water_tank: RU:Tag:emergency=water tank
@@ -8021,7 +14910,9 @@ ru:
     footway=crossing: RU:Tag:footway=crossing
     footway=sidewalk: RU:Tag:footway=sidewalk
     generator:method=anaerobic_digestion: RU:Tag:generator:method=anaerobic digestion
+    generator:type=boiler: RU:Tag:generator:type=boiler
     geological=palaeontological_site: RU:Tag:geological=palaeontological site
+    healthcare=blood_donation: RU:Tag:healthcare=blood donation
     highway=bridleway: RU:Tag:highway=bridleway
     highway=bus_guideway: RU:Tag:highway=bus guideway
     highway=bus_stop: RU:Tag:highway=bus stop
@@ -8034,6 +14925,7 @@ ru:
     highway=ford: RU:Tag:highway=ford
     highway=give_way: RU:Tag:highway=give way
     highway=living_street: RU:Tag:highway=living street
+    highway=milestone: RU:Tag:highway=milestone
     highway=mini_roundabout: RU:Tag:highway=mini roundabout
     highway=motorway: RU:Tag:highway=motorway
     highway=motorway_junction: RU:Tag:highway=motorway junction
@@ -8063,13 +14955,18 @@ ru:
     highway=trunk_link: RU:Tag:highway=trunk link
     highway=turning_circle: RU:Tag:highway=turning circle
     highway=unclassified: RU:Tag:highway=unclassified
+    historic=aircraft: RU:Tag:historic=aircraft
     historic=archaeological_site: RU:Tag:historic=archaeological site
     historic=battlefield: RU:Tag:historic=battlefield
     historic=boundary_stone: RU:Tag:historic=boundary stone
+    historic=cannon: RU:Tag:historic=cannon
     historic=castle: RU:Tag:historic=castle
     historic=city_gate: RU:Tag:historic=city gate
+    historic=citywalls: RU:Tag:historic=citywalls
     historic=fort: RU:Tag:historic=fort
+    historic=locomotive: RU:Tag:historic=locomotive
     historic=memorial: RU:Tag:historic=memorial
+    historic=milestone: RU:Tag:historic=milestone
     historic=monument: RU:Tag:historic=monument
     historic=ruins: RU:Tag:historic=ruins
     historic=rune_stone: RU:Tag:historic=rune stone
@@ -8079,6 +14976,8 @@ ru:
     historic=wayside_shrine: RU:Tag:historic=wayside shrine
     historic=wreck: RU:Tag:historic=wreck
     horse=designated: RU:Tag:horse=designated
+    industrial=well_cluster: RU:Tag:industrial=well cluster
+    information=board: RU:Tag:information=board
     information=guidepost: RU:Tag:information=guidepost
     junction=roundabout: RU:Tag:junction=roundabout
     landuse=allotments: RU:Tag:landuse=allotments
@@ -8089,18 +14988,21 @@ ru:
     landuse=construction: RU:Tag:landuse=construction
     landuse=depot: RU:Tag:landuse=depot
     landuse=farm: RU:Tag:landuse=farm
+    landuse=flowerbed: RU:Tag:landuse=flowerbed
     landuse=forest: RU:Tag:landuse=forest
     landuse=garages: RU:Tag:landuse=garages
     landuse=grass: RU:Tag:landuse=grass
     landuse=greenhouse_horticulture: RU:Tag:landuse=greenhouse horticulture
     landuse=industrial: RU:Tag:landuse=industrial
     landuse=landfill: RU:Tag:landuse=landfill
+    landuse=logging: RU:Tag:landuse=logging
     landuse=meadow: RU:Tag:landuse=meadow
     landuse=military: RU:Tag:landuse=military
     landuse=orchard: RU:Tag:landuse=orchard
     landuse=peat_cutting: RU:Tag:landuse=peat cutting
     landuse=plant_nursery: RU:Tag:landuse=plant nursery
     landuse=pond: RU:Tag:landuse=pond
+    landuse=port: RU:Tag:landuse=port
     landuse=quarry: RU:Tag:landuse=quarry
     landuse=railway: RU:Tag:landuse=railway
     landuse=recreation_ground: RU:Tag:landuse=recreation ground
@@ -8113,16 +15015,24 @@ ru:
     leaf_cycle=deciduous: RU:Tag:leaf cycle=deciduous
     leaf_cycle=evergreen: RU:Tag:leaf cycle=evergreen
     leaf_cycle=mixed: RU:Tag:leaf cycle=mixed
+    leaf_type=broadleaved: RU:Tag:leaf type=broadleaved
+    leaf_type=leafless: RU:Tag:leaf type=leafless
+    leaf_type=mixed: RU:Tag:leaf type=mixed
+    leaf_type=needleleaved: RU:Tag:leaf type=needleleaved
     leisure=beach_resort: RU:Tag:leisure=beach resort
     leisure=common: RU:Tag:leisure=common
     leisure=dance: RU:Tag:leisure=dance
+    leisure=escape_game: RU:Tag:leisure=escape game
     leisure=firepit: RU:Tag:leisure=firepit
+    leisure=fitness_centre: RU:Tag:leisure=fitness centre
+    leisure=hackerspace: RU:Tag:leisure=hackerspace
     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=resort: RU:Tag:leisure=resort
     leisure=sports_centre: RU:Tag:leisure=sports centre
     leisure=stadium: RU:Tag:leisure=stadium
     leisure=summer_camp: RU:Tag:leisure=summer camp
@@ -8132,14 +15042,23 @@ ru:
     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=bridge: RU:Tag:man made=bridge
+    man_made=bunker_silo: RU:Tag:man made=bunker silo
+    man_made=campanile: RU:Tag:man made=campanile
+    man_made=clearcut: RU:Tag:man made=clearcut
+    man_made=communications_tower: RU:Tag:man made=communications tower
     man_made=crane: RU:Tag:man made=crane
     man_made=cutline: RU:Tag:man made=cutline
+    man_made=dovecote: RU:Tag:man made=dovecote
     man_made=dyke: RU:Tag:man made=dyke
     man_made=embankment: RU:Tag:man made=embankment
     man_made=lighthouse: RU:Tag:man made=lighthouse
+    man_made=mast: RU:Tag:man made=mast
     man_made=mineshaft: RU:Tag:man made=mineshaft
     man_made=monitoring_station: RU:Tag:man made=monitoring station
     man_made=obelisk: RU:Tag:man made=obelisk
+    man_made=observatory: RU:Tag:man made=observatory
+    man_made=petroleum_well: RU:Tag:man made=petroleum well
     man_made=pier: RU:Tag:man made=pier
     man_made=pillar: RU:Tag:man made=pillar
     man_made=pipeline: RU:Tag:man made=pipeline
@@ -8147,15 +15066,19 @@ ru:
     man_made=storage_tank: RU:Tag:man made=storage tank
     man_made=surveillance: RU:Tag:man made=surveillance
     man_made=survey_point: RU:Tag:man made=survey point
+    man_made=telescope: RU:Tag:man made=telescope
     man_made=tower: RU:Tag:man made=tower
     man_made=wastewater_plant: RU:Tag:man made=wastewater plant
     man_made=water_tower: RU:Tag:man made=water tower
     man_made=water_well: RU:Tag:man made=water well
     man_made=water_works: RU:Tag:man made=water works
     man_made=watermill: RU:Tag:man made=watermill
+    man_made=wildlife_crossing: RU:Tag:man made=wildlife crossing
     man_made=windmill: RU:Tag:man made=windmill
     man_made=works: RU:Tag:man made=works
     military=airfield: RU:Tag:military=airfield
+    military=bunker: RU:Tag:military=bunker
+    military=naval_base: RU:Tag:military=naval base
     natural=arete: RU:Tag:natural=arete
     natural=bare_rock: RU:Tag:natural=bare rock
     natural=beach: RU:Tag:natural=beach
@@ -8163,17 +15086,20 @@ ru:
     natural=cliff: RU:Tag:natural=cliff
     natural=coastline: RU:Tag:natural=coastline
     natural=desert: RU:Tag:natural=desert
+    natural=earth_bank: RU:Tag:natural=earth bank
     natural=fell: RU:Tag:natural=fell
     natural=glacier: RU:Tag:natural=glacier
     natural=grassland: RU:Tag:natural=grassland
     natural=gully: RU:Tag:natural=gully
     natural=heath: RU:Tag:natural=heath
+    natural=mud: RU:Tag:natural=mud
     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=shingle: RU:Tag:natural=shingle
     natural=sinkhole: RU:Tag:natural=sinkhole
     natural=spring: RU:Tag:natural=spring
     natural=tree: RU:Tag:natural=tree
@@ -8194,6 +15120,7 @@ ru:
     office=insurance: RU:Tag:office=insurance
     office=it: RU:Tag:office=it
     office=lawyer: RU:Tag:office=lawyer
+    office=logistics: RU:Tag:office=logistics
     office=newspaper: RU:Tag:office=newspaper
     office=ngo: RU:Tag:office=ngo
     office=political_party: RU:Tag:office=political party
@@ -8207,7 +15134,9 @@ ru:
     overtaking=no: RU:Tag:overtaking=no
     overtaking=yes: RU:Tag:overtaking=yes
     pipeline=marker: RU:Tag:pipeline=marker
+    pipeline=substation: RU:Tag:pipeline=substation
     place=allotments: RU:Tag:place=allotments
+    place=archipelago: RU:Tag:place=archipelago
     place=city: RU:Tag:place=city
     place=hamlet: RU:Tag:place=hamlet
     place=island: RU:Tag:place=island
@@ -8216,13 +15145,16 @@ ru:
     place=locality: RU:Tag:place=locality
     place=neighbourhood: RU:Tag:place=neighbourhood
     place=quarter: RU:Tag:place=quarter
+    place=square: RU:Tag:place=square
     place=suburb: RU:Tag:place=suburb
     place=town: RU:Tag:place=town
     place=village: RU:Tag:place=village
     power=generator: RU:Tag:power=generator
+    power=heliostat: RU:Tag:power=heliostat
     power=line: RU:Tag:power=line
     power=minor_line: RU:Tag:power=minor line
     power=plant: RU:Tag:power=plant
+    power=pole: RU:Tag:power=pole
     power=station: RU:Tag:power=station
     power=sub_station: RU:Tag:power=sub station
     power=substation: RU:Tag:power=substation
@@ -8231,6 +15163,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
+    pump=powered: RU:Tag:pump=powered
     railway=abandoned: RU:Tag:railway=abandoned
     railway=crossing: RU:Tag:railway=crossing
     railway=level_crossing: RU:Tag:railway=level crossing
@@ -8238,24 +15171,31 @@ ru:
     railway=narrow_gauge: RU:Tag:railway=narrow gauge
     railway=preserved: RU:Tag:railway=preserved
     railway=rail: RU:Tag:railway=rail
+    railway=railway_crossing: RU:Tag:railway=railway crossing
+    railway=roundhouse: RU:Tag:railway=roundhouse
     railway=station: RU:Tag:railway=station
     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
+    religion=zoroastrian: RU:Tag:religion=zoroastrian
     route=bus: RU:Tag:route=bus
     route=ferry: RU:Tag:route=ferry
     route=railway: RU:Tag:route=railway
     route=train: RU:Tag:route=train
     route=tram: RU:Tag:route=tram
     service=alley: RU:Tag:service=alley
+    service=crossover: RU:Tag:service=crossover
     service=dealer: RU:Tag:service=dealer
+    service=drive-through: RU:Tag:service=drive-through
     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
+    shelter_type=public_transport: RU:Tag:shelter type=public transport
+    shop=agrarian: RU:Tag:shop=agrarian
     shop=alcohol: RU:Tag:shop=alcohol
     shop=anime: RU:Tag:shop=anime
     shop=antiques: RU:Tag:shop=antiques
@@ -8278,10 +15218,12 @@ ru:
     shop=charity: RU:Tag:shop=charity
     shop=chemist: RU:Tag:shop=chemist
     shop=clothes: RU:Tag:shop=clothes
+    shop=coffee: RU:Tag:shop=coffee
     shop=computer: RU:Tag:shop=computer
     shop=confectionery: RU:Tag:shop=confectionery
     shop=convenience: RU:Tag:shop=convenience
     shop=copyshop: RU:Tag:shop=copyshop
+    shop=cosmetics: RU:Tag:shop=cosmetics
     shop=curtain: RU:Tag:shop=curtain
     shop=dairy: RU:Tag:shop=dairy
     shop=deli: RU:Tag:shop=deli
@@ -8289,12 +15231,16 @@ ru:
     shop=dive: RU:Tag:shop=dive
     shop=doityourself: RU:Tag:shop=doityourself
     shop=dry_cleaning: RU:Tag:shop=dry cleaning
+    shop=electrical: RU:Tag:shop=electrical
     shop=electronics: RU:Tag:shop=electronics
+    shop=electrotools: RU:Tag:shop=electrotools
     shop=erotic: RU:Tag:shop=erotic
     shop=fabric: RU:Tag:shop=fabric
     shop=fabrics: RU:Tag:shop=fabrics
     shop=farm: RU:Tag:shop=farm
+    shop=fashion: RU:Tag:shop=fashion
     shop=fishing: RU:Tag:shop=fishing
+    shop=fishmonger: RU:Tag:shop=fishmonger
     shop=florist: RU:Tag:shop=florist
     shop=frame: RU:Tag:shop=frame
     shop=funeral_directors: RU:Tag:shop=funeral directors
@@ -8311,17 +15257,21 @@ ru:
     shop=hearing_aids: RU:Tag:shop=hearing aids
     shop=herbalist: RU:Tag:shop=herbalist
     shop=hifi: RU:Tag:shop=hifi
+    shop=houseware: RU:Tag:shop=houseware
     shop=hunting: RU:Tag:shop=hunting
     shop=interior_decoration: RU:Tag:shop=interior decoration
     shop=jewelry: RU:Tag:shop=jewelry
     shop=kiosk: RU:Tag:shop=kiosk
     shop=kitchen: RU:Tag:shop=kitchen
+    shop=lamps: RU:Tag:shop=lamps
     shop=laundry: RU:Tag:shop=laundry
     shop=mall: RU:Tag:shop=mall
     shop=massage: RU:Tag:shop=massage
+    shop=medical_supply: RU:Tag:shop=medical supply
     shop=mobile_phone: RU:Tag:shop=mobile phone
     shop=money_lender: RU:Tag:shop=money lender
     shop=motorcycle: RU:Tag:shop=motorcycle
+    shop=music: RU:Tag:shop=music
     shop=musical_instrument: RU:Tag:shop=musical instrument
     shop=newsagent: RU:Tag:shop=newsagent
     shop=optician: RU:Tag:shop=optician
@@ -8330,6 +15280,7 @@ ru:
     shop=paint: RU:Tag:shop=paint
     shop=pawnbroker: RU:Tag:shop=pawnbroker
     shop=pet: RU:Tag:shop=pet
+    shop=power_tools: RU:Tag:shop=power tools
     shop=radiotechnics: RU:Tag:shop=radiotechnics
     shop=religion: RU:Tag:shop=religion
     shop=seafood: RU:Tag:shop=seafood
@@ -8339,21 +15290,28 @@ ru:
     shop=sports: RU:Tag:shop=sports
     shop=stationery: RU:Tag:shop=stationery
     shop=supermarket: RU:Tag:shop=supermarket
+    shop=swimming_pool: RU:Tag:shop=swimming pool
     shop=tattoo: RU:Tag:shop=tattoo
     shop=ticket: RU:Tag:shop=ticket
     shop=tobacco: RU:Tag:shop=tobacco
     shop=toys: RU:Tag:shop=toys
     shop=trade: RU:Tag:shop=trade
     shop=travel_agency: RU:Tag:shop=travel agency
+    shop=tyres: RU:Tag:shop=tyres
     shop=vacant: RU:Tag:shop=vacant
     shop=vacuum_cleaner: RU:Tag:shop=vacuum cleaner
     shop=variety_store: RU:Tag:shop=variety store
     shop=video: RU:Tag:shop=video
+    shop=watches: RU:Tag:shop=watches
+    shop=wholesale: RU:Tag:shop=wholesale
     shop=window_blind: RU:Tag:shop=window blind
     social_facility=group_home: RU:Tag:social facility=group home
     sport=archery: RU:Tag:sport=archery
+    sport=motocross: RU:Tag:sport=motocross
+    sport=motor: RU:Tag:sport=motor
     sport=scuba_diving: RU:Tag:sport=scuba diving
-    substance: RU:Tag:substance
+    sport=shooting: RU:Tag:sport=shooting
+    tank_trap=czech_hedgehog: RU:Tag:tank trap=czech hedgehog
     tourism=apartment: RU:Tag:tourism=apartment
     tourism=artwork: RU:Tag:tourism=artwork
     tourism=attraction: RU:Tag:tourism=attraction
@@ -8369,11 +15327,14 @@ ru:
     tourism=picnic_site: RU:Tag:tourism=picnic site
     tourism=theme_park: RU:Tag:tourism=theme park
     tourism=viewpoint: RU:Tag:tourism=viewpoint
+    tower:type=bell_tower: RU:Tag:tower:type=bell tower
     tunnel=culvert: RU:Tag:tunnel=culvert
     type=site: RU:Tag:type=site
     waterway=boatyard: RU:Tag:waterway=boatyard
+    waterway=brook: RU:Tag:waterway=brook
     waterway=canal: RU:Tag:waterway=canal
     waterway=dam: RU:Tag:waterway=dam
+    waterway=ditch: RU:Tag:waterway=ditch
     waterway=dock: RU:Tag:waterway=dock
     waterway=drain: RU:Tag:waterway=drain
     waterway=drystream: RU:Tag:waterway=drystream
@@ -8382,14 +15343,19 @@ ru:
     waterway=river: RU:Tag:waterway=river
     waterway=riverbank: RU:Tag:waterway=riverbank
     waterway=stream: RU:Tag:waterway=stream
+    waterway=turning_point: RU:Tag:waterway=turning point
     waterway=weir: RU:Tag:waterway=weir
+    wood=coniferous: RU:Tag:wood=coniferous
     wood=mixed: RU:Tag:wood=mixed
+    zoo=petting_zoo: RU:Tag:zoo=petting zoo
 sh:
   key:
     tracktype: Sh:Key:tracktype
 sk:
   key:
-    checkpoint: Sk:Key:checkpoint
+    addr:conscriptionnumber: Sk:Key:addr:conscriptionnumber
+    addr:streetnumber: Sk:Key:addr:streetnumber
+    note: Sk:Key:note
 sq:
   key:
     highway: Sq:Key:highway
@@ -8401,11 +15367,13 @@ sv:
     aerialway=cable_car: Sv:Tag:aerialway=cable car
     amenity=place_of_worship: Sv:Tag:amenity=place of worship
     amenity=recycling: Sv:Tag:amenity=recycling
+    amenity=townhall: Sv:Tag:amenity=townhall
     highway=path: Sv:Tag:highway=path
     highway=rest_area: Sv:Tag:highway=rest area
     highway=track: Sv:Tag:highway=track
     junction=roundabout: Sv:Tag:junction=roundabout
     leisure=dog_park: Sv:Tag:leisure=dog park
+    leisure=fitness_station: Sv:Tag:leisure=fitness station
     railway=rail: Sv:Tag:railway=rail
 tr:
   key:
@@ -8414,27 +15382,53 @@ tr:
     highway: Tr:Key:highway
     historic: Tr:Key:historic
     leisure: Tr:Key:leisure
+    religion: Tr:Key:religion
     shop: Tr:Key:shop
     sport: Tr:Key:sport
+  tag:
+    amenity=brothel: Tr:Tag:amenity=brothel
+    amenity=place_of_worship: Tr:Tag:amenity=place of worship
+    amenity=school: Tr:Tag:amenity=school
+    building=mosque: Tr:Tag:building=mosque
 uk:
   key:
     abutters: Uk:Key:abutters
     access: Uk:Key:access
+    addr: Uk:Key:addr
+    addr:city: Uk:Key:addr:city
+    addr:country: Uk:Key:addr:country
+    addr:district: Uk:Key:addr:district
+    addr:door: Uk:Key:addr:door
+    addr:flats: Uk:Key:addr:flats
+    addr:floor: Uk:Key:addr:floor
+    addr:full: Uk:Key:addr:full
+    addr:hamlet: Uk:Key:addr:hamlet
+    addr:housename: Uk:Key:addr:housename
+    addr:housenumber: Uk:Key:addr:housenumber
+    addr:inclusion: Uk:Key:addr:inclusion
+    addr:interpolation: Uk:Key:addr:interpolation
+    addr:place: Uk:Key:addr:place
+    addr:postcode: Uk:Key:addr:postcode
+    addr:province: Uk:Key:addr:province
+    addr:state: Uk:Key:addr:state
+    addr:street: Uk:Key:addr:street
+    addr:unit: Uk:Key:addr:unit
     alt_name: Uk:Key:alt name
     amenity: Uk:Key:amenity
     arcade: Uk:Key:arcade
     area: Uk:Key:area
     area:highway: Uk:Key:area:highway
     backward: Uk:Key:backward
+    barrier: Uk:Key:barrier
     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
-    building:use: Uk:Key:building:use
     colonnade: Uk:Key:colonnade
     covered: Uk:Key:covered
+    crossing: Uk:Key:crossing
     cutting: Uk:Key:cutting
     destination: Uk:Key:destination
     embankment: Uk:Key:embankment
@@ -8442,6 +15436,7 @@ uk:
     entrance: Uk:Key:entrance
     est_width: Uk:Key:est width
     exit_to: Uk:Key:exit to
+    footway: Uk:Key:footway
     ford: Uk:Key:ford
     forward: Uk:Key:forward
     height: Uk:Key:height
@@ -8454,6 +15449,7 @@ uk:
     lanes: Uk:Key:lanes
     layer: Uk:Key:layer
     left: Uk:Key:left
+    leisure: Uk:Key:leisure
     length: Uk:Key:length
     loc_name: Uk:Key:loc name
     man_made: Uk:Key:man made
@@ -8462,11 +15458,13 @@ uk:
     maxspeed: Uk:Key:maxspeed
     motorroad: Uk:Key:motorroad
     name: Uk:Key:name
+    name:''lg'': Uk:Key:name:''lg''
     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:lg: Uk:Key:name:lg
     name:ru: Uk:Key:name:ru
     name:uk: Uk:Key:name:uk
     nat_name: Uk:Key:nat name
@@ -8486,20 +15484,27 @@ uk:
     reference: Uk:Key:reference
     reg_name: Uk:Key:reg name
     right: Uk:Key:right
+    route: Uk:Key:route
     service: Uk:Key:service
     shelter_type: Uk:Key:shelter type
     short_name: Uk:Key:short name
     short_name:ru: Uk:Key:short name:ru
+    sidewalk: Uk:Key:sidewalk
     sorting_name: Uk:Key:sorting name
+    source: Uk:Key:source
+    source:addr: Uk:Key:source:addr
+    sport: Uk:Key:sport
     surface: Uk:Key:surface
     tracktype: Uk:Key:tracktype
     traffic_sign: Uk:Key:traffic sign
     tunnel: Uk:Key:tunnel
+    type: Uk:Key:type
     url: Uk:Key:url
     vehicle: Uk:Key:vehicle
     water: Uk:Key:water
     waterway: Uk:Key:waterway
     width: Uk:Key:width
+    wikipedia: Uk:Key:wikipedia
     wood: Uk:Key:wood
   tag:
     amenity=atm: Uk:Tag:amenity=atm
@@ -8507,15 +15512,23 @@ uk:
     amenity=bicycle_parking: Uk:Tag:amenity=bicycle parking
     amenity=bicycle_rental: Uk:Tag:amenity=bicycle rental
     amenity=fuel: Uk:Tag:amenity=fuel
+    amenity=payment_terminal: Uk:Tag:amenity=payment terminal
+    amenity=pharmacy: Uk:Tag:amenity=pharmacy
     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
+    barrier=retaining_wall: Uk:Tag:barrier=retaining wall
+    building=commercial: Uk:Tag:building=commercial
+    craft=bookbinder: Uk:Tag:craft=bookbinder
     emergency=fire_hydrant: Uk:Tag:emergency=fire hydrant
     emergency=fire_water_pond: Uk:Tag:emergency=fire water pond
     emergency=suction_point: Uk:Tag:emergency=suction point
     emergency=water_tank: Uk:Tag:emergency=water tank
+    entrance=staircase: Uk:Tag:entrance=staircase
+    footway=crossing: Uk:Tag:footway=crossing
+    footway=sidewalk: Uk:Tag:footway=sidewalk
     highway=bridleway: Uk:Tag:highway=bridleway
     highway=cycleway: Uk:Tag:highway=cycleway
     highway=footway: Uk:Tag:highway=footway
@@ -8534,11 +15547,18 @@ uk:
     highway=steps: Uk:Tag:highway=steps
     highway=tertiary: Uk:Tag:highway=tertiary
     highway=track: Uk:Tag:highway=track
+    highway=traffic_mirror: Uk:Tag:highway=traffic mirror
     highway=trunk: Uk:Tag:highway=trunk
     highway=unclassified: Uk:Tag:highway=unclassified
     historic=memorial: Uk:Tag:historic=memorial
     historic=monument: Uk:Tag:historic=monument
+    historic=wayside_cross: Uk:Tag:historic=wayside cross
+    landuse=flowerbed: Uk:Tag:landuse=flowerbed
     landuse=forest: Uk:Tag:landuse=forest
+    landuse=hop_garden: Uk:Tag:landuse=hop garden
+    landuse=village_green: Uk:Tag:landuse=village green
+    leaf_cycle=evergreen: Uk:Tag:leaf cycle=evergreen
+    leisure=common: Uk:Tag:leisure=common
     man_made=embankment: Uk:Tag:man made=embankment
     man_made=pier: Uk:Tag:man made=pier
     natural=bare_rock: Uk:Tag:natural=bare rock
@@ -8567,10 +15587,15 @@ uk:
     railway=rail: Uk:Tag:railway=rail
     railway=station: Uk:Tag:railway=station
     railway=tram: Uk:Tag:railway=tram
+    route=train: Uk:Tag:route=train
     shop=antiques: Uk:Tag:shop=antiques
+    shop=baby_goods: Uk:Tag:shop=baby goods
     shop=bicycle: Uk:Tag:shop=bicycle
+    shop=optician: Uk:Tag:shop=optician
     shop=second_hand: Uk:Tag:shop=second hand
+    sport=Swimming: Uk:Tag:sport=Swimming
     sport=shooting: Uk:Tag:sport=shooting
+    sport=swimming: Uk:Tag:sport=swimming
     vending=bicycle_tube: Uk:Tag:vending=bicycle tube
     waterway=riverbank: Uk:Tag:waterway=riverbank
 vi:
@@ -8583,8 +15608,57 @@ vi:
     highway=secondary: Vi:Tag:highway=secondary
     highway=service: Vi:Tag:highway=service
     highway=tertiary: Vi:Tag:highway=tertiary
+    highway=trunk: Vi:Tag:highway=trunk
+    highway=unclassified: Vi:Tag:highway=unclassified
+yue:
+  key:
+    building: Yue:Key:building
+    highway: Yue:Key:highway
+    man_made: Yue:Key:man made
+    public_transport: Yue:Key:public transport
+    traffic_calming: Yue:Key:traffic calming
+  tag:
+    amenity=police: Yue:Tag:amenity=police
+    amenity=public_building: Yue:Tag:amenity=public building
+    amenity=school: Yue:Tag:amenity=school
+    building=barn: Yue:Tag:building=barn
+    building=cabin: Yue:Tag:building=cabin
+    building=cathedral: Yue:Tag:building=cathedral
+    building=chapel: Yue:Tag:building=chapel
+    building=church: Yue:Tag:building=church
+    building=construction: Yue:Tag:building=construction
+    building=detached: Yue:Tag:building=detached
+    building=farm: Yue:Tag:building=farm
+    building=farm_auxiliary: Yue:Tag:building=farm auxiliary
+    building=garage: Yue:Tag:building=garage
+    building=hangar: Yue:Tag:building=hangar
+    building=hospital: Yue:Tag:building=hospital
+    building=hotel: Yue:Tag:building=hotel
+    building=houseboat: Yue:Tag:building=houseboat
+    building=hut: Yue:Tag:building=hut
+    building=public: Yue:Tag:building=public
+    building=residential: Yue:Tag:building=residential
+    building=school: Yue:Tag:building=school
+    building=stadium: Yue:Tag:building=stadium
+    building=static_caravan: Yue:Tag:building=static caravan
+    building=sty: Yue:Tag:building=sty
+    building=university: Yue:Tag:building=university
+    highway=residential: Yue:Tag:highway=residential
+    leisure=water_park: Yue:Tag:leisure=water park
+    man_made=adit: Yue:Tag:man made=adit
+    man_made=breakwater: Yue:Tag:man made=breakwater
+    man_made=campanile: Yue:Tag:man made=campanile
+    man_made=dovecote: Yue:Tag:man made=dovecote
+    man_made=dyke: Yue:Tag:man made=dyke
+    man_made=gasometer: Yue:Tag:man made=gasometer
+    residential=university: Yue:Tag:residential=university
+    tourism=attraction: Yue:Tag:tourism=attraction
+zh:
+  key:
+    name: ZH:Key:name
 zh-hans:
   key:
+    amenity: Zh-hans:Key:amenity
     building:part: Zh-hans:Key:building:part
     cuisine: Zh-hans:Key:cuisine
     ele: Zh-hans:Key:ele
@@ -8595,25 +15669,43 @@ zh-hans:
     place: Zh-hans:Key:place
     railway: Zh-hans:Key:railway
     toll: Zh-hans:Key:toll
+    wheelchair: Zh-hans:Key:wheelchair
   tag:
+    amenity=bar: Zh-hans:Tag:amenity=bar
     amenity=cafe: Zh-hans:Tag:amenity=cafe
     barrier=toll_booth: Zh-hans:Tag:barrier=toll booth
     barrier=wall: Zh-hans:Tag:barrier=wall
+    highway=residential: Zh-hans:Tag:highway=residential
+    highway=tertiary: Zh-hans:Tag:highway=tertiary
+    railway=light_rail: Zh-hans:Tag:railway=light rail
+    railway=subway: Zh-hans:Tag:railway=subway
+    railway=subway_entrance: Zh-hans:Tag:railway=subway entrance
+    route=light_rail: Zh-hans:Tag:route=light rail
+    route=subway: Zh-hans:Tag:route=subway
+    station=light_rail: Zh-hans:Tag:station=light rail
+    station=subway: Zh-hans:Tag:station=subway
 zh-hant:
   key:
+    aeroway: Zh-hant:Key:aeroway
     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
+    name: Zh-hant:Key:name
     noexit: Zh-hant:Key:noexit
+    office: Zh-hant:Key:office
     opening_hours: Zh-hant:Key:opening hours
+    playground: Zh-hant:Key:playground
     service: Zh-hant:Key:service
+    shop: Zh-hant:Key:shop
     takeaway: Zh-hant:Key:takeaway
     tracktype: Zh-hant:Key:tracktype
+    traffic_calming: Zh-hant:Key:traffic calming
     trail_visibility: Zh-hant:Key:trail visibility
   tag:
     amenity=bench: Zh-hant:Tag:amenity=bench
+    amenity=coworking_space: Zh-hant:Tag:amenity=coworking space
     amenity=crematorium: Zh-hant:Tag:amenity=crematorium
     amenity=fountain: Zh-hant:Tag:amenity=fountain
     amenity=fuel: Zh-hant:Tag:amenity=fuel
@@ -8630,4 +15722,7 @@ zh-hant:
     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
+·es:
+  key:
+    addr:inclusion: ·ES:Key:addr:inclusion