Update config/wiki_pages.yml
authorTom Hughes <tom@compton.nu>
Sat, 1 Mar 2014 12:36:30 +0000 (12:36 +0000)
committerTom Hughes <tom@compton.nu>
Sat, 1 Mar 2014 12:36:30 +0000 (12:36 +0000)
config/wiki_pages.yml

index 8b6b774..3e0f48a 100644 (file)
 # PROGRAM DO NOT MANUALLY EDIT IT
 
 ---
-cz:
+az:
+  tag:
+    craft=locksmith: Az:Tag:craft=locksmith
+    highway=speed_camera: Az:Tag:highway=speed camera
+bg:
   key:
-    historic: Cz:Key:historic
-    railway: Cz:Key:railway
-    tracktype: Cz:Key:tracktype
+    lanes: Bg:Key:lanes
+  tag:
+    railway=crossing: Bg:Tag:railway=crossing
+    railway=level_crossing: Bg:Tag:railway=level crossing
+ca:
   tag:
-    route=trolleybus: Cz:Tag:route=trolleybus
+    leisure=swimming_pool: Ca:Tag:leisure=swimming pool
 da:
   key:
-    access: Da:Key:access
     fee: Da:Key:fee
     lit: Da:Key:lit
     maxheight: Da:Key:maxheight
+    maxspeed: Da:Key:maxspeed
   tag:
-    highway=tertiary: Da:Tag:highway=tertiary
-    highway=track: Da:Tag:highway=track
-    route=ferry: Da:Tag:route=ferry
+    amenity=place_of_worship: Da:Tag:amenity=place of worship
 de:
   key:
+    AlpinRes_ID: DE:Key:AlpinRes ID
     abutters: DE:Key:abutters
     access: DE:Key:access
     addr: DE:Key:addr
     aerialway: DE:Key:aerialway
     aeroway: DE:Key:aeroway
     amenity: DE:Key:amenity
+    area: DE:Key:area
+    asb: DE:Key:asb
     barrier: DE:Key:barrier
     basin: DE:Key:basin
-    bridge: DE:Key:bridge
-    building: DE:Key:building
+    beds: DE:Key:beds
+    bicycle: DE:Key:bicycle
+    bicycle_parking: DE:Key:bicycle parking
+    bicycle_road: DE:Key:bicycle road
+    biosphärenwirt: DE:Key:biosphärenwirt
+    bollard: DE:Key:bollard
+    brewery: DE:Key:brewery
+    building:condition: DE:Key:building:condition
+    building:material: DE:Key:building:material
+    capacity: DE:Key:capacity
+    clothes: DE:Key:clothes
     comment: DE:Key:comment
+    construction: DE:Key:construction
+    contact: DE:Key:contact
+    content: DE:Key:content
+    country: DE:Key:country
+    covered: DE:Key:covered
+    created_by: DE:Key:created by
     crossing: DE:Key:crossing
+    cuisine: DE:Key:cuisine
+    currency: DE:Key:currency
+    cutting: DE:Key:cutting
     cycleway: DE:Key:cycleway
+    de:amtlicher_gemeindeschluessel: DE:Key:de:amtlicher gemeindeschluessel
+    de:regionalschluessel: DE:Key:de:regionalschluessel
     denomination: DE:Key:denomination
+    denotation: DE:Key:denotation
     description: DE:Key:description
+    designation: DE:Key:designation
     destination: DE:Key:destination
-    disused: DE:Key:disused
+    diaper: DE:Key:diaper
+    direction: DE:Key:direction
     drink: DE:Key:drink
+    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
+    fee: DE:Key:fee
+    fetish: DE:Key:fetish
     fixme: DE:Key:fixme
+    foot: DE:Key:foot
+    footway: DE:Key:footway
+    ford: DE:Key:ford
+    generator:method: DE:Key:generator:method
+    generator:output: DE:Key:generator:output
+    generator:source: DE:Key:generator:source
     geological: DE:Key:geological
+    hazard: DE:Key:hazard
     hazmat: DE:Key:hazmat
+    height: DE:Key:height
     highway: DE:Key:highway
     historic: DE:Key:historic
+    horse: DE:Key:horse
+    ice_road: DE:Key:ice road
+    importance: DE:Key:importance
     incline: DE:Key:incline
+    informal: DE:Key:informal
+    information: DE:Key:information
+    intermittent: DE:Key:intermittent
+    internet_access: DE:Key:internet access
+    junction: DE:Key:junction
     landuse: DE:Key:landuse
     lanes: DE:Key:lanes
     layer: DE:Key:layer
     leisure: DE:Key:leisure
+    level: DE:Key:level
     lit: DE:Key:lit
+    lock: DE:Key:lock
     man_made: DE:Key:man made
+    manhole: DE:Key:manhole
     maxheight: DE:Key:maxheight
     maxspeed: DE:Key:maxspeed
+    maxstay: DE:Key:maxstay
     maxweight: DE:Key:maxweight
+    maxwidth: DE:Key:maxwidth
     military: DE:Key:military
+    minspeed: DE:Key:minspeed
+    motorroad: DE:Key:motorroad
     mtb:scale: DE:Key:mtb:scale
     name: DE:Key:name
     natural: DE:Key:natural
+    network: DE:Key:network
     noexit: DE:Key:noexit
     note: DE:Key:note
-    oneway: DE:Key:oneway
+    office: DE:Key:office
+    onkz: DE:Key:onkz
     opening_hours: DE:Key:opening hours
     operator: DE:Key:operator
+    osmc:status: DE:Key:osmc:status
     osmc:symbol: DE:Key:osmc:symbol
+    overtaking: DE:Key:overtaking
+    parking:lane: DE:Key:parking:lane
+    phone: DE:Key:phone
+    piste:difficulty: DE:Key:piste:difficulty
+    piste:type: DE:Key:piste:type
     place: DE:Key:place
+    playground: DE:Key:playground
+    population: DE:Key:population
     power: DE:Key:power
-    power_rating: DE:Key:power rating
+    priority: DE:Key:priority
+    priority_road: DE:Key:priority road
+    proposed: DE:Key:proposed
+    public_transport: DE:Key:public transport
     railway: DE:Key:railway
+    recycling_type: DE:Key:recycling type
+    ref: DE:Key:ref
+    ref:bufa: DE:Key:ref:bufa
+    ref:mobil-parken.de: DE:Key:ref:mobil-parken.de
+    religion: DE:Key:religion
+    resource: DE:Key:resource
+    roof:material: DE:Key:roof:material
+    rooms: DE:Key:rooms
     route: DE:Key:route
+    ruins: DE:Key:ruins
     sac_scale: DE:Key:sac scale
     seamark: DE:Key:seamark
+    seamark:fixme: DE:Key:seamark:fixme
+    seamark:type: DE:Key:seamark:type
+    segregated: DE:Key:segregated
     service: DE:Key:service
+    shelter_type: DE:Key:shelter type
     shop: DE:Key:shop
+    sidewalk: DE:Key:sidewalk
     smoking: DE:Key:smoking
     smoothness: DE:Key:smoothness
+    social_facility: DE:Key:social facility
+    source: DE:Key:source
+    source:maxspeed: DE:Key:source:maxspeed
+    speisebezirk: DE:Key:speisebezirk
     sport: DE:Key:sport
+    start_date: DE:Key:start date
     step_count: DE:Key:step count
     surface: DE:Key:surface
+    symbol: DE:Key:symbol
+    tactile_paving: DE:Key:tactile paving
+    toll: DE:Key:toll
     tourism: DE:Key:tourism
     tracktype: DE:Key:tracktype
+    traffic_calming: DE:Key:traffic calming
+    traffic_sign: DE:Key:traffic sign
     trail_visibility: DE:Key:trail visibility
-    tunnel: DE:Key:tunnel
+    turn: DE:Key:turn
+    type: DE:Key:type
+    usage: DE:Key:usage
+    verbindung: DE:Key:verbindung
     voltage: DE:Key:voltage
     waterway: DE:Key:waterway
     wheelchair: DE:Key:wheelchair
+    width: DE:Key:width
+    wiki:symbol: DE:Key:wiki:symbol
+    wikipedia: DE:Key:wikipedia
     wires: DE:Key:wires
     wood: DE:Key:wood
+    zone:maxspeed: DE:Key:zone:maxspeed
   tag:
+    abandoned=village: DE:Tag:abandoned=village
+    abandoned=yes: DE:Tag:abandoned=yes
+    access=designated: DE:Tag:access=designated
+    access=private: DE:Tag:access=private
+    aerialway=cable_car: DE:Tag:aerialway=cable car
+    aeroway=helipad: DE:Tag:aeroway=helipad
+    amenity=administration: DE:Tag:amenity=administration
+    amenity=animal_boarding: DE:Tag:amenity=animal boarding
+    amenity=animal_shelter: DE:Tag:amenity=animal shelter
+    amenity=arts_centre: DE:Tag:amenity=arts centre
     amenity=atm: DE:Tag:amenity=atm
     amenity=baby_hatch: DE:Tag:amenity=baby hatch
     amenity=bank: DE:Tag:amenity=bank
+    amenity=bar: DE:Tag:amenity=bar
+    amenity=bbq: DE:Tag:amenity=bbq
     amenity=bench: DE:Tag:amenity=bench
+    amenity=bicycle_parking: DE:Tag:amenity=bicycle parking
     amenity=bicycle_rental: DE:Tag:amenity=bicycle rental
     amenity=biergarten: DE:Tag:amenity=biergarten
+    amenity=brothel: DE:Tag:amenity=brothel
+    amenity=bureau_de_change: DE:Tag:amenity=bureau de change
     amenity=bus_station: DE:Tag:amenity=bus station
+    amenity=cafe: DE:Tag:amenity=cafe
+    amenity=car_rental: DE:Tag:amenity=car rental
+    amenity=car_sharing: DE:Tag:amenity=car sharing
+    amenity=car_wash: DE:Tag:amenity=car wash
+    amenity=charging_station: DE:Tag:amenity=charging station
+    amenity=cinema: DE:Tag:amenity=cinema
     amenity=clock: DE:Tag:amenity=clock
     amenity=compressed_air: DE:Tag:amenity=compressed air
+    amenity=courthouse: DE:Tag:amenity=courthouse
+    amenity=crematorium: DE:Tag:amenity=crematorium
+    amenity=customs: DE:Tag:amenity=customs
     amenity=drinking_water: DE:Tag:amenity=drinking water
+    amenity=driving_school: DE:Tag:amenity=driving school
+    amenity=embassy: DE:Tag:amenity=embassy
     amenity=emergency_phone: DE:Tag:amenity=emergency phone
+    amenity=fast_food: DE:Tag:amenity=fast food
+    amenity=ferry_terminal: DE:Tag:amenity=ferry terminal
+    amenity=fire_station: DE:Tag:amenity=fire station
+    amenity=fountain: DE:Tag:amenity=fountain
     amenity=fuel: DE:Tag:amenity=fuel
+    amenity=grave_yard: DE:Tag:amenity=grave yard
     amenity=grit_bin: DE:Tag:amenity=grit bin
     amenity=hospital: DE:Tag:amenity=hospital
     amenity=hunting_stand: DE:Tag:amenity=hunting stand
+    amenity=ice_cream: DE:Tag:amenity=ice cream
+    amenity=kindergarten: DE:Tag:amenity=kindergarten
+    amenity=kneipp_water_cure: DE:Tag:amenity=kneipp water cure
+    amenity=library: DE:Tag:amenity=library
+    amenity=marketplace: DE:Tag:amenity=marketplace
+    amenity=motorcycle_parking: DE:Tag:amenity=motorcycle parking
     amenity=nightclub: DE:Tag:amenity=nightclub
     amenity=nursing_home: DE:Tag:amenity=nursing home
     amenity=parking: DE:Tag:amenity=parking
+    amenity=parking_entrance: DE:Tag:amenity=parking entrance
+    amenity=parking_space: DE:Tag:amenity=parking space
     amenity=pharmacy: DE:Tag:amenity=pharmacy
     amenity=place_of_worship: DE:Tag:amenity=place of worship
+    amenity=police: DE:Tag:amenity=police
     amenity=post_box: DE:Tag:amenity=post box
+    amenity=post_office: DE:Tag:amenity=post office
+    amenity=prison: DE:Tag:amenity=prison
     amenity=pub: DE:Tag:amenity=pub
     amenity=recycling: DE:Tag:amenity=recycling
     amenity=register_office: DE:Tag:amenity=register office
     amenity=restaurant: DE:Tag:amenity=restaurant
     amenity=school: DE:Tag:amenity=school
+    amenity=shelter: DE:Tag:amenity=shelter
+    amenity=social_facility: DE:Tag:amenity=social facility
+    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=toilets: DE:Tag:amenity=toilets
+    amenity=townhall: DE:Tag:amenity=townhall
+    amenity=university: DE:Tag:amenity=university
     amenity=vending_machine: DE:Tag:amenity=vending machine
+    amenity=veterinary: DE:Tag:amenity=veterinary
     amenity=waste_basket: DE:Tag:amenity=waste basket
+    atm=yes: DE:Tag:atm=yes
+    barrier=bollard: DE:Tag:barrier=bollard
+    barrier=cattle_grid: DE:Tag:barrier=cattle grid
     barrier=cycle_barrier: DE:Tag:barrier=cycle barrier
+    barrier=fence: DE:Tag:barrier=fence
+    barrier=gate: DE:Tag:barrier=gate
+    barrier=hedge: DE:Tag:barrier=hedge
+    barrier=hedge_bank: DE:Tag:barrier=hedge bank
+    barrier=kissing_gate: DE:Tag:barrier=kissing gate
     barrier=lift_gate: DE:Tag:barrier=lift gate
+    barrier=retaining_wall: DE:Tag:barrier=retaining wall
+    barrier=sally_port: DE:Tag:barrier=sally port
+    barrier=toll_booth: DE:Tag:barrier=toll booth
+    barrier=wall: DE:Tag:barrier=wall
+    biosphärenwirt=yes: DE:Tag:biosphärenwirt=yes
+    boundary=national_park: DE:Tag:boundary=national park
+    boundary=protected_area: DE:Tag:boundary=protected area
     boundary=water_protection_area: DE:Tag:boundary=water protection area
-    club-mate=yes: DE:Tag:club-mate=yes
+    building=barn: DE:Tag:building=barn
+    building=entrance: DE:Tag:building=entrance
+    building=garage: DE:Tag:building=garage
+    building=garages: DE:Tag:building=garages
+    building=industrial: DE:Tag:building=industrial
+    building=roof: DE:Tag:building=roof
+    building=school: DE:Tag:building=school
+    building=stable: DE:Tag:building=stable
+    craft=car_repair: DE:Tag:craft=car repair
+    craft=hvac: DE:Tag:craft=hvac
+    craft=information_electronics: DE:Tag:craft=information electronics
+    craft=optician: DE:Tag:craft=optician
+    craft=painter: DE:Tag:craft=painter
+    craft=paperhanger: DE:Tag:craft=paperhanger
+    craft=plumber: DE:Tag:craft=plumber
+    craft=scaffolder: DE:Tag:craft=scaffolder
+    craft=stonemason: DE:Tag:craft=stonemason
+    emergency=ambulance_station: DE:Tag:emergency=ambulance station
+    emergency=defibrillator: DE:Tag:emergency=defibrillator
     emergency=fire_hydrant: DE:Tag:emergency=fire hydrant
+    emergency=fire_water_pond: DE:Tag:emergency=fire water pond
+    emergency=life_ring: DE:Tag:emergency=life ring
+    emergency=phone: DE:Tag:emergency=phone
+    emergency=siren: DE:Tag:emergency=siren
+    emergency=suction_point: DE:Tag:emergency=suction point
+    footway=sidewalk: DE:Tag:footway=sidewalk
+    generator:source=solar: DE:Tag:generator:source=solar
+    generator:source=wind: DE:Tag:generator:source=wind
+    highway=bridleway: DE:Tag:highway=bridleway
     highway=bus_stop: DE:Tag:highway=bus stop
     highway=crossing: DE:Tag:highway=crossing
     highway=cycleway: DE:Tag:highway=cycleway
+    highway=elevator: DE:Tag:highway=elevator
     highway=emergency_access_point: DE:Tag:highway=emergency access point
     highway=footway: DE:Tag:highway=footway
+    highway=give_way: DE:Tag:highway=give way
     highway=living_street: DE:Tag:highway=living street
     highway=mini_roundabout: DE:Tag:highway=mini roundabout
     highway=motorway: DE:Tag:highway=motorway
+    highway=motorway_junction: DE:Tag:highway=motorway junction
     highway=motorway_link: DE:Tag:highway=motorway link
     highway=path: DE:Tag:highway=path
     highway=pedestrian: DE:Tag:highway=pedestrian
+    highway=platform: DE:Tag:highway=platform
     highway=primary: DE:Tag:highway=primary
+    highway=raceway: DE:Tag:highway=raceway
     highway=residential: DE:Tag:highway=residential
+    highway=rest_area: DE:Tag:highway=rest area
     highway=road: DE:Tag:highway=road
     highway=secondary: DE:Tag:highway=secondary
     highway=service: DE:Tag:highway=service
     highway=services: DE:Tag:highway=services
+    highway=speed_camera: DE:Tag:highway=speed camera
     highway=steps: DE:Tag:highway=steps
+    highway=street_lamp: DE:Tag:highway=street lamp
     highway=tertiary: DE:Tag:highway=tertiary
     highway=track: DE:Tag:highway=track
     highway=traffic_signals: DE:Tag:highway=traffic signals
@@ -150,164 +353,513 @@ de:
     highway=trunk_link: DE:Tag:highway=trunk link
     highway=turning_circle: DE:Tag:highway=turning circle
     highway=unclassified: DE:Tag:highway=unclassified
+    historic=aircraft: DE:Tag:historic=aircraft
     historic=archaeological_site: DE:Tag:historic=archaeological site
+    historic=boundary_stone: DE:Tag:historic=boundary stone
     historic=castle: DE:Tag:historic=castle
+    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=manor: DE:Tag:historic=manor
+    historic=memorial: DE:Tag:historic=memorial
+    historic=milestone: DE:Tag:historic=milestone
+    historic=mine: DE:Tag:historic=mine
     historic=monastery: DE:Tag:historic=monastery
+    historic=monument: DE:Tag:historic=monument
+    historic=pillory: DE:Tag:historic=pillory
+    historic=ship: DE:Tag:historic=ship
+    historic=stone: DE:Tag:historic=stone
+    historic=wayside_cross: DE:Tag:historic=wayside cross
+    historic=wayside_shrine: DE:Tag:historic=wayside shrine
+    historic=wreck: DE:Tag:historic=wreck
     junction=roundabout: DE:Tag:junction=roundabout
     landuse=allotments: DE:Tag:landuse=allotments
+    landuse=basin: DE:Tag:landuse=basin
+    landuse=brownfield: DE:Tag:landuse=brownfield
     landuse=cemetery: DE:Tag:landuse=cemetery
+    landuse=commercial: DE:Tag:landuse=commercial
+    landuse=farm: DE:Tag:landuse=farm
     landuse=farmland: DE:Tag:landuse=farmland
     landuse=farmyard: DE:Tag:landuse=farmyard
     landuse=forest: DE:Tag:landuse=forest
+    landuse=garages: DE:Tag:landuse=garages
+    landuse=grass: DE:Tag:landuse=grass
+    landuse=greenfield: DE:Tag:landuse=greenfield
+    landuse=industrial: DE:Tag:landuse=industrial
+    landuse=landfill: DE:Tag:landuse=landfill
     landuse=meadow: DE:Tag:landuse=meadow
+    landuse=military: DE:Tag:landuse=military
     landuse=orchard: DE:Tag:landuse=orchard
+    landuse=plant_nursery: DE:Tag:landuse=plant nursery
     landuse=quarry: DE:Tag:landuse=quarry
+    landuse=railway: DE:Tag:landuse=railway
+    landuse=recreation_ground: DE:Tag:landuse=recreation ground
+    landuse=reservoir: DE:Tag:landuse=reservoir
     landuse=residential: DE:Tag:landuse=residential
+    landuse=retail: DE:Tag:landuse=retail
     landuse=village_green: DE:Tag:landuse=village green
+    landuse=vineyard: DE:Tag:landuse=vineyard
+    leisure=beach_resort: DE:Tag:leisure=beach resort
     leisure=dog_park: DE:Tag:leisure=dog park
     leisure=garden: DE:Tag:leisure=garden
+    leisure=golf_course: DE:Tag:leisure=golf course
+    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=park: DE:Tag:leisure=park
+    leisure=pitch: DE:Tag:leisure=pitch
     leisure=playground: DE:Tag:leisure=playground
     leisure=slipway: DE:Tag:leisure=slipway
+    leisure=sports_centre: DE:Tag:leisure=sports centre
+    leisure=stadium: DE:Tag:leisure=stadium
+    leisure=swimming_pool: DE:Tag:leisure=swimming pool
+    leisure=track: DE:Tag:leisure=track
+    leisure=water_park: DE:Tag:leisure=water park
+    level_crossing=uncontrolled: DE:Tag:level crossing=uncontrolled
+    man_made=adit: DE:Tag:man made=adit
+    man_made=bunker_silo: DE:Tag:man made=bunker silo
+    man_made=communications_tower: DE:Tag:man made=communications tower
     man_made=crane: DE:Tag:man made=crane
+    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=gasometer: DE:Tag:man made=gasometer
+    man_made=groyne: DE:Tag:man made=groyne
+    man_made=lighthouse: DE:Tag:man made=lighthouse
+    man_made=mast: DE:Tag:man made=mast
     man_made=mineshaft: DE:Tag:man made=mineshaft
     man_made=pier: DE:Tag:man made=pier
     man_made=pipeline: DE:Tag:man made=pipeline
+    man_made=reservoir_covered: DE:Tag:man made=reservoir covered
+    man_made=surveillance: DE:Tag:man made=surveillance
     man_made=survey_point: DE:Tag:man made=survey point
+    man_made=tower: DE:Tag:man made=tower
     man_made=wastewater_plant: DE:Tag:man made=wastewater plant
+    man_made=water_tower: DE:Tag:man made=water tower
+    man_made=water_works: DE:Tag:man made=water works
+    man_made=watermill: DE:Tag:man made=watermill
+    man_made=windmill: DE:Tag:man made=windmill
     microbrewery=yes: DE:Tag:microbrewery=yes
     military=bunker: DE:Tag:military=bunker
+    natural=arete: DE:Tag:natural=arete
+    natural=bare_rock: DE:Tag:natural=bare rock
+    natural=bay: DE:Tag:natural=bay
+    natural=beach: DE:Tag:natural=beach
+    natural=cliff: DE:Tag:natural=cliff
+    natural=glacier: DE:Tag:natural=glacier
+    natural=grassland: DE:Tag:natural=grassland
+    natural=heath: DE:Tag:natural=heath
+    natural=ridge: DE:Tag:natural=ridge
+    natural=scree: DE:Tag:natural=scree
+    natural=scrub: DE:Tag:natural=scrub
+    natural=sinkhole: DE:Tag:natural=sinkhole
+    natural=spring: DE:Tag:natural=spring
     natural=stone: DE:Tag:natural=stone
     natural=tree: DE:Tag:natural=tree
+    natural=tree_row: DE:Tag:natural=tree row
+    natural=volcano: DE:Tag:natural=volcano
     natural=water: DE:Tag:natural=water
     natural=wetland: DE:Tag:natural=wetland
     natural=wood: DE:Tag:natural=wood
+    office=lawyer: DE:Tag:office=lawyer
+    office=political_party: DE:Tag:office=political party
     pipeline=marker: DE:Tag:pipeline=marker
+    place=archipelago: DE:Tag:place=archipelago
+    place=city: DE:Tag:place=city
+    place=hamlet: DE:Tag:place=hamlet
+    place=island: DE:Tag:place=island
+    place=isolated_dwelling: DE:Tag:place=isolated dwelling
+    place=locality: DE:Tag:place=locality
+    place=neighbourhood: DE:Tag:place=neighbourhood
+    place=suburb: DE:Tag:place=suburb
+    place=town: DE:Tag:place=town
+    place=village: DE:Tag:place=village
     power=cable: DE:Tag:power=cable
     power=cable_distribution_cabinet: DE:Tag:power=cable distribution cabinet
     power=generator: DE:Tag:power=generator
     power=line: DE:Tag:power=line
     power=minor_line: DE:Tag:power=minor line
     power=pole: DE:Tag:power=pole
+    power=station: DE:Tag:power=station
     power=sub_station: DE:Tag:power=sub station
+    power=substation: DE:Tag:power=substation
     power=tower: DE:Tag:power=tower
+    public_transport=platform: DE:Tag:public transport=platform
+    public_transport=stop_area: DE:Tag:public transport=stop area
+    public_transport=stop_position: DE:Tag:public transport=stop position
+    railway=abandoned: DE:Tag:railway=abandoned
     railway=crossing: DE:Tag:railway=crossing
+    railway=disused: DE:Tag:railway=disused
     railway=halt: DE:Tag:railway=halt
+    railway=level_crossing: DE:Tag:railway=level crossing
     railway=monorail: DE:Tag:railway=monorail
     railway=platform: DE:Tag:railway=platform
+    railway=rail: DE:Tag:railway=rail
     railway=station: DE:Tag:railway=station
     railway=tram: DE:Tag:railway=tram
     railway=tram_stop: DE:Tag:railway=tram stop
     railway=turntable: DE:Tag:railway=turntable
     route=ferry: DE:Tag:route=ferry
+    route=ski: DE:Tag:route=ski
+    service=driveway: DE:Tag:service=driveway
     service=parking_aisle: DE:Tag:service=parking aisle
+    shelter_type=lean_to: DE:Tag:shelter type=lean to
+    shop=baby_goods: DE:Tag:shop=baby goods
+    shop=bag: DE:Tag:shop=bag
     shop=bakery: DE:Tag:shop=bakery
+    shop=beverages: DE:Tag:shop=beverages
+    shop=bicycle: DE:Tag:shop=bicycle
+    shop=books: DE:Tag:shop=books
+    shop=butcher: DE:Tag:shop=butcher
+    shop=car: DE:Tag:shop=car
+    shop=car_parts: DE:Tag:shop=car parts
+    shop=car_repair: DE:Tag:shop=car repair
+    shop=charity: DE:Tag:shop=charity
+    shop=chemist: DE:Tag:shop=chemist
+    shop=clothes: DE:Tag:shop=clothes
+    shop=computer: DE:Tag:shop=computer
+    shop=convenience: DE:Tag:shop=convenience
+    shop=copyshop: DE:Tag:shop=copyshop
+    shop=deli: DE:Tag:shop=deli
+    shop=doityourself: DE:Tag:shop=doityourself
+    shop=dry_cleaning: DE:Tag:shop=dry cleaning
+    shop=electronics: DE:Tag:shop=electronics
+    shop=fabric: DE:Tag:shop=fabric
+    shop=florist: DE:Tag:shop=florist
+    shop=funeral_directors: DE:Tag:shop=funeral directors
+    shop=garden_centre: DE:Tag:shop=garden centre
     shop=general: DE:Tag:shop=general
+    shop=hairdresser: DE:Tag:shop=hairdresser
+    shop=hardware: DE:Tag:shop=hardware
+    shop=houseware: DE:Tag:shop=houseware
+    shop=kiosk: DE:Tag:shop=kiosk
+    shop=kitchen: DE:Tag:shop=kitchen
+    shop=laundry: DE:Tag:shop=laundry
+    shop=mall: DE:Tag:shop=mall
+    shop=medical_supply: DE:Tag:shop=medical supply
+    shop=newsagent: DE:Tag:shop=newsagent
+    shop=outdoor: DE:Tag:shop=outdoor
+    shop=photo: DE:Tag:shop=photo
+    shop=shoes: DE:Tag:shop=shoes
+    shop=spare_parts: DE:Tag:shop=spare parts
+    shop=stationery: DE:Tag:shop=stationery
+    shop=supermarket: DE:Tag:shop=supermarket
+    shop=toys: DE:Tag:shop=toys
+    shop=vacant: DE:Tag:shop=vacant
+    shop=variety_store: DE:Tag:shop=variety store
+    shop=window_blind: DE:Tag:shop=window blind
+    source=HiRes_aerial_imagery: DE:Tag:source=HiRes aerial imagery
+    sport=9pin: DE:Tag:sport=9pin
+    sport=climbing: DE:Tag:sport=climbing
+    sport=free_flying: DE:Tag:sport=free flying
+    sport=golf: DE:Tag:sport=golf
+    sport=scuba_diving: DE:Tag:sport=scuba diving
+    sport=soccer: DE:Tag:sport=soccer
+    summit:cross=yes: DE:Tag:summit:cross=yes
+    tourism=alpine_hut: DE:Tag:tourism=alpine hut
+    tourism=aquarium: DE:Tag:tourism=aquarium
+    tourism=artwork: DE:Tag:tourism=artwork
     tourism=camp_site: DE:Tag:tourism=camp site
     tourism=caravan_site: DE:Tag:tourism=caravan site
+    tourism=chalet: DE:Tag:tourism=chalet
+    tourism=gallery: DE:Tag:tourism=gallery
+    tourism=guest_house: DE:Tag:tourism=guest house
+    tourism=hostel: DE:Tag:tourism=hostel
+    tourism=hotel: DE:Tag:tourism=hotel
+    tourism=information: DE:Tag:tourism=information
+    tourism=motel: DE:Tag:tourism=motel
+    tourism=museum: DE:Tag:tourism=museum
     tourism=picnic_site: DE:Tag:tourism=picnic site
+    tourism=viewpoint: DE:Tag:tourism=viewpoint
+    tourism=zoo: DE:Tag:tourism=zoo
     vending=bicycle_tube: DE:Tag:vending=bicycle tube
+    waterway=canal: DE:Tag:waterway=canal
+    waterway=dam: DE:Tag:waterway=dam
+    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=lock_gate: DE:Tag:waterway=lock gate
     waterway=river: DE:Tag:waterway=river
     waterway=riverbank: DE:Tag:waterway=riverbank
     waterway=stream: DE:Tag:waterway=stream
+    waterway=weir: DE:Tag:waterway=weir
 en:
   key:
-    Demolished: Key:Demolished
+    3dr:type: Key:3dr:type
+    AND_nosr_r: Key:AND nosr r
+    CEMT: Key:CEMT
+    DGPS_correction: Key:DGPS correction
+    IBGE:tipo: Key:IBGE:tipo
+    NHS: Key:NHS
+    RLIS:bicycle: Key:RLIS:bicycle
+    RLIS:reviewed: Key:RLIS:reviewed
     TMC:Direction: Key:TMC:Direction
     TMC:LocationCode: Key:TMC:LocationCode
     TMC:NextLocationCode: Key:TMC:NextLocationCode
     TMC:PrevLocationCode: Key:TMC:PrevLocationCode
+    abandoned: Key:abandoned
     abutters: Key:abutters
     access: Key:access
+    access:lhv: Key:access:lhv
+    access:roadtrain: Key:access:roadtrain
+    access:roadtrain:trailers: Key:access:roadtrain:trailers
     addr: Key:addr
     addr:conscriptionnumber: Key:addr:conscriptionnumber
+    addr:flats: Key:addr:flats
+    addr:place: Key:addr:place
     addr:provisionalnumber: Key:addr:provisionalnumber
     addr:streetnumber: Key:addr:streetnumber
+    addr:suburb: Key:addr:suburb
+    adr_les: Key:adr les
     aerialway: Key:aerialway
     aeroway: Key:aeroway
+    airmark: Key:airmark
     amenity: Key:amenity
     architect: Key:architect
     area: Key:area
+    artwork_type: Key:artwork type
+    ascent: Key:ascent
+    asset_ref: Key:asset ref
     atv: Key:atv
+    automatic_door: Key:automatic door
+    backrest: Key:backrest
+    bar: Key:bar
     barrier: Key:barrier
+    barrier:personnel: Key:barrier:personnel
     basin: Key:basin
     beacon: Key:beacon
+    beds: Key:beds
+    bench: Key:bench
     bicycle: Key:bicycle
+    bicycle_parking: Key:bicycle parking
+    bicycle_road: Key:bicycle road
+    bin: Key:bin
+    board_type: Key:board type
     boat: Key:boat
+    bollard: Key:bollard
+    books: Key:books
     border_type: Key:border type
     boundary: Key:boundary
+    brand: Key:brand
+    brewery: Key:brewery
     bridge: Key:bridge
     building: Key:building
+    building:condition: Key:building:condition
+    building:cullis:height: Key:building:cullis:height
+    building:fireproof: Key:building:fireproof
+    building:levels: Key:building:levels
+    building:levels:underground: Key:building:levels:underground
+    building:material: Key:building:material
+    building:min_level: Key:building:min level
+    building:obm: Key:building:obm
+    building:part: Key:building:part
     bunker_type: Key:bunker type
     buoy: Key:buoy
+    busway: Key:busway
+    button_operated: Key:button operated
+    cables: Key:cables
     capacity: Key:capacity
+    carriageway_ref: Key:carriageway ref
+    castle_type: Key:castle type
+    castle_type:de: Key:castle type:de
+    centralkey: Key:centralkey
+    centre_turn_lane: Key:centre turn lane
     cep: Key:cep
+    check_date: Key:check date
+    checkpoint: Key:checkpoint
+    circuits: Key:circuits
+    circumference: Key:circumference
     clothes: Key:clothes
+    club: Key:club
+    coastline:survey_quality: Key:coastline:survey quality
     collection_times: Key:collection times
+    colour: Key:colour
     comment: Key:comment
+    common_good_land: Key:common good land
     construction: Key:construction
+    construction_end_expected: Key:construction end expected
     contact: Key:contact
+    content: Key:content
+    conveying: Key:conveying
+    country: Key:country
     covered: Key:covered
+    craft: Key:craft
     created_by: Key:created by
+    crop: Key:crop
     crossing: Key:crossing
     cuisine: Key:cuisine
+    cultivation_method: Key:cultivation method
+    currency: Key:currency
     cutting: Key:cutting
+    cyclability: Key:cyclability
+    cyclestreets_id: Key:cyclestreets id
     cycleway: Key:cycleway
+    cycleway:buffer: Key:cycleway:buffer
+    de:amtlicher_gemeindeschluessel: Key:de:amtlicher gemeindeschluessel
+    de:regionalschluessel: Key:de:regionalschluessel
+    deanery: Key:deanery
+    delivery: Key:delivery
     denomination: Key:denomination
+    denotation: Key:denotation
     depth: Key:depth
+    descent: Key:descent
     description: Key:description
+    description:restrictions: Key:description:restrictions
     designation: Key:designation
     destination: Key:destination
+    diaper: Key:diaper
+    diet: Key:diet
+    diocese: Key:diocese
     direction: Key:direction
+    dirtbike:scale: Key:dirtbike:scale
     disabled: Key:disabled
     dispensing: Key:dispensing
+    distance: Key:distance
     disused: Key:disused
+    door: Key:door
     drink: Key:drink
+    drinking_water: Key:drinking water
+    drive_in: Key:drive in
+    drive_through: Key:drive through
+    driving_side: Key:driving side
+    duration: Key:duration
     easy_overtaking: Key:easy overtaking
     ele: Key:ele
     electrified: Key:electrified
+    email: Key:email
     embankment: Key:embankment
     emergency: Key:emergency
     end_date: Key:end date
     enforcement: Key:enforcement
+    entrance: Key:entrance
+    escalator: Key:escalator
+    esperanto: Key:esperanto
+    european_cultural_path: Key:european cultural path
+    exit: Key:exit
+    exit_to: Key:exit to
+    expressway: Key:expressway
+    fair_trade: Key:fair trade
     fee: Key:fee
+    female: Key:female
     fence_type: Key:fence type
     fenced: Key:fenced
+    ferry: Key:ferry
+    fetish: Key:fetish
+    fishing: Key:fishing
     fixme: Key:fixme
     flood_prone: Key:flood prone
+    floor:material: Key:floor:material
     fog_signal: Key:fog signal
     foot: Key:foot
+    footway: Key:footway
     ford: Key:ford
+    fork: Key:fork
+    format: Key:format
+    frequency: Key:frequency
+    fruit: Key:fruit
+    fuel: Key:fuel
     fuel:discount: Key:fuel:discount
+    furniture: Key:furniture
+    gambling: Key:gambling
     gauge: Key:gauge
+    generator:method: Key:generator:method
+    generator:output: Key:generator:output
+    generator:output:electricity: Key:generator:output:electricity
+    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:plant: Key:generator:plant
+    generator:source: Key:generator:source
+    generator:type: Key:generator:type
+    genus: Key:genus
+    geocodigo: Key:geocodigo
     geological: Key:geological
+    gnis:feature_id: Key:gnis:feature id
+    golf: Key:golf
+    group_only: Key:group only
+    guidepost: Key:guidepost
+    habitat: Key:habitat
+    handrail: Key:handrail
+    harbour: Key:harbour
+    harbour:access:swell: Key:harbour:access:swell
+    harbour:access:tide: Key:harbour:access:tide
+    harbour:category: Key:harbour:category
+    harbour:main: Key:harbour:main
+    hazard_intensity: Key:hazard intensity
+    hazard_occurrence: Key:hazard occurrence
+    hazard_prone: Key:hazard prone
+    hazard_return_period: Key:hazard return period
+    hazard_type: Key:hazard type
     hazmat: Key:hazmat
     healthcare: Key:healthcare
     height: Key:height
     highway: Key:highway
+    hiking: Key:hiking
     historic: Key:historic
+    historic:civilization: Key:historic:civilization
+    history: Key:history
     horse: Key:horse
+    hov: Key:hov
+    iata: Key:iata
+    ice_road: Key:ice road
+    image: Key:image
+    importance: Key:importance
     incline: Key:incline
+    informal: Key:informal
     information: Key:information
+    inline_skates: Key:inline skates
+    inscription: Key:inscription
+    intermittent: Key:intermittent
     internet_access: Key:internet access
     is_in: Key:is in
+    jel: Key:jel
     junction: Key:junction
+    junction_number: Key:junction number
+    kerb: Key:kerb
+    kms: Key:kms
+    kms:county_name: Key:kms:county name
+    kms:county_no: Key:kms:county no
+    kms:house_no: Key:kms:house no
+    kms:last_updated: Key:kms:last updated
+    kms:municipality_name: Key:kms:municipality name
+    kms:municipality_no: Key:kms:municipality no
+    kms:street_name: Key:kms:street name
+    kms:street_no: Key:kms:street no
+    kms:zip_code: Key:kms:zip code
+    kms:zip_name: Key:kms:zip name
+    kp: Key:kp
+    label: Key:label
     landmark: Key:landmark
     landuse: Key:landuse
+    lane_hint: Key:lane hint
     lanes: Key:lanes
+    lanes:psv: Key:lanes:psv
     layer: Key:layer
     lcn_ref: Key:lcn ref
     leisure: Key:leisure
     length: Key:length
+    level: Key:level
     light: Key:light
+    lines: Key:lines
+    listed_status: Key:listed status
     lit: Key:lit
     lit:perceived: Key:lit:perceived
+    local_ref: Key:local ref
+    location: Key:location
     lock: Key:lock
+    lock_name: Key:lock name
+    maintained: Key:maintained
+    maintenance: Key:maintenance
+    male: Key:male
     man_made: Key:man made
     managed: Key:managed
     manhole: Key:manhole
+    massage: Key:massage
+    material: Key:material
+    max_age: Key:max age
     maxage: Key:maxage
     maxairdraft: Key:maxairdraft
     maxaxleload: Key:maxaxleload
@@ -318,18 +870,31 @@ en:
     maxheight:physical: Key:maxheight:physical
     maxlength: Key:maxlength
     maxspeed: Key:maxspeed
+    maxspeed:type: Key:maxspeed:type
     maxstay: Key:maxstay
     maxweight: Key:maxweight
     maxwidth: Key:maxwidth
     military: Key:military
+    min_age: Key:min age
+    min_height: Key:min height
     minage: Key:minage
     minspeed: Key:minspeed
+    mofa: Key:mofa
+    monitoring:air_quality: Key:monitoring:air quality
+    monitoring:galileo: Key:monitoring:galileo
     monitoring:glonass: Key:monitoring:glonass
     monitoring:gps: Key:monitoring:gps
+    monitoring:noise: Key:monitoring:noise
+    monitoring:seismic_activity: Key:monitoring:seismic activity
+    monitoring:tide_gauge: Key:monitoring:tide gauge
+    monitoring:water_level: Key:monitoring:water level
+    monitoring:weather: Key:monitoring:weather
     mooring: Key:mooring
+    motorboat: Key:motorboat
     motorcar: Key:motorcar
     motorcycle: Key:motorcycle
     motorroad: Key:motorroad
+    motorway: Key:motorway
     mountain_pass: Key:mountain pass
     mtb:description: Key:mtb:description
     mtb:scale: Key:mtb:scale
@@ -337,104 +902,364 @@ en:
     name:cy: Key:name:cy
     narrow: Key:narrow
     natural: Key:natural
+    navibot:categorize: Key:navibot:categorize
+    navibot:connect: Key:navibot:connect
+    ncat: Key:ncat
+    ncn_milepost: Key:ncn milepost
     ncn_ref: Key:ncn ref
+    network: Key:network
     noexit: Key:noexit
     noname: Key:noname
+    not_served_by: Key:not served by
     note: Key:note
+    note:deplacer4mE: Key:note:deplacer4mE
+    notes: Key:notes
     office: Key:office
+    offshore: Key:offshore
+    ois:fixme: Key:ois:fixme
+    old_ref_legislative: Key:old ref legislative
     oneway: Key:oneway
+    opening_date: Key:opening date
     opening_hours: Key:opening hours
+    openplaques:id: Key:openplaques:id
+    openplaques_plaque: Key:openplaques plaque
+    opensource: Key:opensource
     operator: Key:operator
+    operator:type: Key:operator:type
+    organic: Key:organic
+    origin: Key:origin
+    osak:identifier: Key:osak:identifier
+    osak:municipality_no: Key:osak:municipality no
+    osak:revision: Key:osak:revision
+    osak:street_name: Key:osak:street name
+    osak:street_no: Key:osak:street no
+    osak:subdivision: Key:osak:subdivision
     osmarender:nameDirection: Key:osmarender:nameDirection
     osmarender:render: Key:osmarender:render
     osmarender:renderName: Key:osmarender:renderName
     osmarender:renderRef: Key:osmarender:renderRef
     osmc:symbol: Key:osmc:symbol
     overtaking: Key:overtaking
+    owner: Key:owner
+    ownership: Key:ownership
     parking: Key:parking
+    parking:lane: Key:parking:lane
     passing_places: Key:passing places
     paved:date: Key:paved:date
+    payment: Key:payment
+    phoenixbikeguide: Key:phoenixbikeguide
     phone: Key:phone
+    pilotage: Key:pilotage
+    pipeline: Key:pipeline
+    piste:difficulty: Key:piste:difficulty
+    piste:grooming: Key:piste:grooming
+    piste:type: Key:piste:type
+    pk: Key:pk
     place: Key:place
+    place:fr: Key:place:fr
+    place_name: Key:place name
+    placement: Key:placement
+    planned: Key:planned
+    plant:output: Key:plant:output
+    plant_community: Key:plant community
+    platforms: Key:platforms
+    playground: Key:playground
+    police: Key:police
     population: Key:population
+    post_office:type: Key:post office:type
     postal_code: Key:postal code
     power: Key:power
-    power_rating: Key:power rating
-    power_source: Key:power source
+    power_output: Key:power output
+    power_supply: Key:power supply
+    priority: Key:priority
+    priority_road: Key:priority road
+    produce: Key:produce
+    product: Key:product
     proposed: Key:proposed
+    protect_class: Key:protect class
+    protect_id: Key:protect id
+    protection_title: Key:protection title
+    prow_ref: Key:prow ref
     psv: Key:psv
+    public_transport: Key:public transport
+    pump: Key:pump
+    pyörä_väistää_aina_autoa: Key:pyörä väistää aina autoa
+    rack: Key:rack
+    radar_conspicious: Key:radar conspicious
+    radar_reflector: Key:radar reflector
+    radar_transponder: Key:radar transponder
+    radar_transponder:signal_group: Key:radar transponder:signal group
+    radio_transponder: Key:radio transponder
+    radio_transponder:AIS: Key:radio transponder:AIS
+    radio_transponder:signal_frequency: Key:radio transponder:signal frequency
     railway: Key:railway
     ramp: Key:ramp
+    ramsar: Key:ramsar
     rcn_ref: Key:rcn ref
+    real_ale: Key:real ale
+    real_cider: Key:real cider
+    recycling_type: Key:recycling type
+    reef: Key:reef
     ref: Key:ref
+    ref:ERDF:gdo: Key:ref:ERDF:gdo
+    ref:FR:42C: Key:ref:FR:42C
+    ref:FR:CEF: Key:ref:FR:CEF
+    ref:FR:FINESS: Key:ref:FR:FINESS
+    ref:FR:SIRET: Key:ref:FR:SIRET
+    ref:INSEE: Key:ref:INSEE
+    ref:ISTAT: Key:ref:ISTAT
+    ref:UAI: Key:ref:UAI
+    ref:at:gkz: Key:ref:at:gkz
+    ref:at:okz: Key:ref:at:okz
+    ref:bam.brno.cz: Key:ref:bam.brno.cz
+    ref:bufa: Key:ref:bufa
+    ref:colour: Key:ref:colour
     ref:isil: Key:ref:isil
+    ref:mhs: Key:ref:mhs
+    ref:mobil-parken.de: Key:ref:mobil-parken.de
+    ref:ortsnetz: Key:ref:ortsnetz
+    ref:sandre: Key:ref:sandre
+    ref:taskey: Key:ref:taskey
+    ref:vatin: Key:ref:vatin
+    ref:vorwahl: Key:ref:vorwahl
+    ref:wawa: Key:ref:wawa
+    reference_point: Key:reference point
     religion: Key:religion
+    removed: Key:removed
+    repair: Key:repair
+    reservation: Key:reservation
     resource: Key:resource
+    retreat: Key:retreat
+    retroreflecting: Key:retroreflecting
+    roof:material: Key:roof:material
+    room: Key:room
+    rooms: Key:rooms
+    roundtrip: Key:roundtrip
     route: Key:route
+    route_master: Key:route master
+    route_ref: Key:route ref
+    royal_cypher: Key:royal cypher
+    rtc_rate: Key:rtc rate
+    rugby: Key:rugby
+    ruins: Key:ruins
+    rwn_ref: Key:rwn ref
     sac_scale: Key:sac scale
     sagns_id: Key:sagns id
+    scenic: Key:scenic
+    school: Key:school
     seabed_surface: Key:seabed surface
     seamark: Key:seamark
+    seamark:beacon_isolated_danger:shape: Key:seamark:beacon isolated danger:shape
+    seamark:beacon_safe_water:colour: Key:seamark:beacon safe water:colour
+    seamark:beacon_safe_water:colour_pattern: Key:seamark:beacon safe water:colour
+      pattern
+    seamark:beacon_safe_water:shape: Key:seamark:beacon safe water:shape
+    seamark:bridge:category: Key:seamark:bridge:category
+    seamark:bridge:clearance_height: Key:seamark:bridge:clearance height
+    seamark:bridge:clearance_height_closed: Key:seamark:bridge:clearance height closed
+    seamark:bridge:clearance_height_open: Key:seamark:bridge:clearance height open
+    seamark:bridge:clearance_width: Key:seamark:bridge:clearance width
+    seamark:buoy_lateral:reflectivity: Key:seamark:buoy lateral:reflectivity
+    seamark:buoy_special_purpose:reflectivity: Key:seamark:buoy special purpose:reflectivity
+    seamark:cable_overhead:category: Key:seamark:cable overhead:category
+    seamark:cable_overhead:vertical_clearance_safe: Key:seamark:cable overhead:vertical
+      clearance safe
+    seamark:cable_submarine:category: Key:seamark:cable submarine:category
+    seamark:conspicuity: Key:seamark:conspicuity
+    seamark:distance_mark:category: Key:seamark:distance mark:category
+    seamark:distance_mark:distance: Key:seamark:distance mark:distance
+    seamark:distance_mark:units: Key:seamark:distance mark:units
+    seamark:fixme: Key:seamark:fixme
+    seamark:fog_signal: Key:seamark:fog signal
+    seamark:fog_signal:category: Key:seamark:fog signal:category
+    seamark:fog_signal:group: Key:seamark:fog signal:group
+    seamark:fog_signal:period: Key:seamark:fog signal:period
+    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: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:status: Key:seamark:light:status
+    seamark:light:visibility: Key:seamark:light:visibility
+    seamark:light_vessel:colour: Key:seamark:light vessel:colour
+    seamark:obstruction:category: Key:seamark:obstruction:category
+    seamark:pilot_boarding:category: Key:seamark:pilot boarding:category
+    seamark:pipeline_submarine:category: Key:seamark:pipeline submarine:category
+    seamark:pipeline_submarine:name: Key:seamark:pipeline submarine:name
+    seamark:pipeline_submarine:product: Key:seamark:pipeline submarine:product
+    seamark:platform:category: Key:seamark:platform:category
+    seamark:radar_reflector: Key:seamark:radar reflector
+    seamark:radar_station:category: Key:seamark:radar station:category
+    seamark:radar_station:channel: Key:seamark:radar station:channel
+    seamark:radar_transponder:category: Key:seamark:radar transponder:category
+    seamark:radar_transponder:group: Key:seamark:radar transponder:group
+    seamark:radar_transponder:period: Key:seamark:radar transponder:period
+    seamark:radar_transponder:range: Key:seamark:radar transponder:range
+    seamark:radar_transponder:sector_end: Key:seamark:radar transponder:sector end
+    seamark:radar_transponder:sector_start: Key:seamark:radar transponder:sector start
+    seamark:radar_transponder:sequence: Key:seamark:radar transponder:sequence
+    seamark:radar_transponder:wavelength: Key:seamark:radar transponder:wavelength
+    seamark:radio_station:group: Key:seamark:radio station:group
+    seamark:reflectivity: Key:seamark:reflectivity
+    seamark:restricted_area:category: Key:seamark:restricted area:category
+    seamark:restricted_area:name: Key:seamark:restricted area:name
+    seamark:restricted_area:restriction: Key:seamark:restricted area:restriction
+    seamark:sea_area:category: Key:seamark:sea area:category
+    seamark:seabed_area:surface: Key:seamark:seabed area:surface
+    seamark:shoreline_construction:category: Key:seamark:shoreline construction:category
+    seamark:small_craft_facility:category: Key:seamark:small craft facility:category
+    seamark:small_craft_facility:name: Key:seamark:small craft facility:name
+    seasonal: Key:seasonal
     seasonal:snowfall:regaintime: Key:seasonal:snowfall:regaintime
+    second_hand: Key:second hand
+    segregated: Key:segregated
     service: Key:service
+    service_times: Key:service times
+    shade: Key:shade
+    shelter: Key:shelter
+    shelter_type: Key:shelter type
     shop: Key:shop
+    side_road: Key:side road
+    sidewalk: Key:sidewalk
+    sign: Key:sign
+    signal_station: Key:signal station
+    site_type: Key:site type
     ski: Key:ski
+    ski_tour_difficulty: Key:ski tour difficulty
     smoothness: Key:smoothness
+    snowmobile: Key:snowmobile
     snowplowing: Key:snowplowing
     snowplowing:category: Key:snowplowing:category
+    social_facility: Key:social facility
+    sorting_name: Key:sorting name
     source: Key:source
+    source:addr: Key:source:addr
+    source:date: Key:source:date
+    source:loc: Key:source:loc
+    source:maxspeed: Key:source:maxspeed
+    species: Key:species
+    speech_output: Key:speech output
+    speisebezirk: Key:speisebezirk
     sport: Key:sport
     stars: Key:stars
     start_date: Key:start date
+    station: Key:station
+    status: Key:status
     step_count: Key:step count
     stop: Key:stop
+    storage_area: Key:storage area
+    stranded: Key:stranded
+    stream: Key:stream
     sub_sea: Key:sub sea
-    sulky: Key:sulky
     surface: Key:surface
+    surveillance: Key:surveillance
+    surveillance:type: Key:surveillance:type
+    surveillance:zone: Key:surveillance:zone
+    sustrans_ref: Key:sustrans ref
+    symbol: Key:symbol
     tactile_paving: Key:tactile paving
+    takeaway: Key:takeaway
+    taxon: Key:taxon
+    technology: Key:technology
+    tidal: Key:tidal
+    tiger: Key:tiger
     timezone: Key:timezone
+    toilets:wheelchair: Key:toilets:wheelchair
     toll: Key:toll
+    topmark: Key:topmark
+    touring: Key:touring
     tourism: Key:tourism
+    tourist_bus: Key:tourist bus
+    tracks: Key:tracks
     tracktype: Key:tracktype
     traffic:hourly: Key:traffic:hourly
     traffic_calming: Key:traffic calming
     traffic_sign: Key:traffic sign
+    traffic_signals: Key:traffic signals
+    traffic_signals:arrow: Key:traffic signals:arrow
+    traffic_signals:direction: Key:traffic signals:direction
+    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:vibration: Key:traffic signals:vibration
     trail_visibility: Key:trail visibility
+    trees: Key:trees
     trolley_wire: Key:trolley wire
     tunnel: Key:tunnel
+    turn: Key:turn
+    turning_radius: Key:turning radius
+    twitter: Key:twitter
     type: Key:type
+    uic_name: Key:uic name
+    uic_ref: Key:uic ref
+    unisex: Key:unisex
+    url: Key:url
+    url:restrictions: Key:url:restrictions
+    usage: Key:usage
+    validate:no_name: Key:validate:no name
+    validate:no_ref: Key:validate:no ref
     voltage: Key:voltage
+    waste: Key:waste
+    water: Key:water
     waterway: Key:waterway
     website: Key:website
     wheelchair: Key:wheelchair
+    wholesale: Key:wholesale
     width: Key:width
+    wiki:symbol: Key:wiki:symbol
     wikipedia: Key:wikipedia
+    winter_road: Key:winter road
     wires: Key:wires
     woeid: Key:woeid
     wood: Key:wood
+    xmas:feature: Key:xmas:feature
+    zone:maxspeed: Key:zone:maxspeed
+    zone:traffic: Key:zone:traffic
     zoo: Key:zoo
   tag:
     4wd_only=yes: Tag:4wd only=yes
-    abandoned=yes: Tag:abandoned=yes
+    FIXME=Position_estimated: Tag:FIXME=Position estimated
     access=designated: Tag:access=designated
+    access=exclusion_zone: Tag:access=exclusion zone
+    access=license: Tag:access=license
     access=official: Tag:access=official
+    access=private: Tag:access=private
+    admin_level=aboriginal_land: Tag:admin level=aboriginal land
     aerialway=cable_car: Tag:aerialway=cable car
+    aerialway=canopy: Tag:aerialway=canopy
     aerialway=chair_lift: Tag:aerialway=chair lift
     aerialway=drag_lift: Tag:aerialway=drag lift
     aerialway=gondola: Tag:aerialway=gondola
+    aerialway=goods: Tag:aerialway=goods
+    aerialway=j-bar: Tag:aerialway=j-bar
+    aerialway=magic_carpet: Tag:aerialway=magic carpet
     aerialway=mixed_lift: Tag:aerialway=mixed lift
+    aerialway=platter: Tag:aerialway=platter
     aerialway=pylon: Tag:aerialway=pylon
+    aerialway=rope_tow: Tag:aerialway=rope tow
     aerialway=station: Tag:aerialway=station
+    aerialway=t-bar: Tag:aerialway=t-bar
     aeroway=aerodrome: Tag:aeroway=aerodrome
+    aeroway=airport: Tag:aeroway=airport
     aeroway=apron: Tag:aeroway=apron
-    aeroway=control_tower: Tag:aeroway=control tower
     aeroway=gate: Tag:aeroway=gate
+    aeroway=hangar: Tag:aeroway=hangar
     aeroway=helipad: Tag:aeroway=helipad
     aeroway=navigationaid: Tag:aeroway=navigationaid
+    aeroway=parking_position: Tag:aeroway=parking position
     aeroway=runway: Tag:aeroway=runway
     aeroway=taxiway: Tag:aeroway=taxiway
     aeroway=terminal: Tag:aeroway=terminal
     aeroway=windsock: Tag:aeroway=windsock
+    airmark=beacon: Tag:airmark=beacon
+    ale_supply=limited: Tag:ale supply=limited
+    allotments=plot: Tag:allotments=plot
+    amenity=Kneippbecken: Tag:amenity=Kneippbecken
+    amenity=animal_boarding: Tag:amenity=animal boarding
+    amenity=animal_breeding: Tag:amenity=animal breeding
+    amenity=animal_shelter: Tag:amenity=animal shelter
     amenity=architect_office: Tag:amenity=architect office
     amenity=arts_centre: Tag:amenity=arts centre
     amenity=atm: Tag:amenity=atm
@@ -446,7 +1271,9 @@ en:
     amenity=bench: Tag:amenity=bench
     amenity=bicycle_parking: Tag:amenity=bicycle parking
     amenity=bicycle_rental: Tag:amenity=bicycle rental
+    amenity=bicycle_trailer_sharing: Tag:amenity=bicycle trailer sharing
     amenity=biergarten: Tag:amenity=biergarten
+    amenity=bikeshed: Tag:amenity=bikeshed
     amenity=boat_storage: Tag:amenity=boat storage
     amenity=brothel: Tag:amenity=brothel
     amenity=bureau_de_change: Tag:amenity=bureau de change
@@ -454,52 +1281,93 @@ en:
     amenity=cafe: Tag:amenity=cafe
     amenity=car_rental: Tag:amenity=car rental
     amenity=car_sharing: Tag:amenity=car sharing
+    amenity=car_wash: Tag:amenity=car wash
     amenity=casino: Tag:amenity=casino
+    amenity=charging_station: Tag:amenity=charging station
     amenity=cinema: Tag:amenity=cinema
+    amenity=clinic: Tag:amenity=clinic
     amenity=clock: Tag:amenity=clock
     amenity=coast_guard: Tag:amenity=coast guard
+    amenity=coast_radar_station: Tag:amenity=coast radar station
     amenity=college: Tag:amenity=college
     amenity=community_centre: Tag:amenity=community centre
     amenity=compressed_air: Tag:amenity=compressed air
     amenity=courthouse: Tag:amenity=courthouse
+    amenity=coworking_space: Tag:amenity=coworking space
     amenity=crematorium: Tag:amenity=crematorium
+    amenity=crucifix: Tag:amenity=crucifix
+    amenity=crypt: Tag:amenity=crypt
+    amenity=customs: Tag:amenity=customs
+    amenity=dead_pub: Tag:amenity=dead pub
     amenity=dentist: Tag:amenity=dentist
     amenity=doctors: Tag:amenity=doctors
+    amenity=dojo: Tag:amenity=dojo
     amenity=drinking_water: Tag:amenity=drinking water
+    amenity=driving_school: Tag:amenity=driving school
     amenity=embassy: Tag:amenity=embassy
+    amenity=ev_charging: Tag:amenity=ev charging
     amenity=fast_food: Tag:amenity=fast food
     amenity=ferry_terminal: Tag:amenity=ferry terminal
+    amenity=festival_grounds: Tag:amenity=festival grounds
+    amenity=fire_hydrant: Tag:amenity=fire hydrant
     amenity=fire_station: Tag:amenity=fire station
     amenity=food_court: Tag:amenity=food court
     amenity=fountain: Tag:amenity=fountain
     amenity=fuel: Tag:amenity=fuel
+    amenity=gambling: Tag:amenity=gambling
+    amenity=game_feeding: Tag:amenity=game feeding
     amenity=grave_yard: Tag:amenity=grave yard
     amenity=grit_bin: Tag:amenity=grit bin
+    amenity=harbourmaster: Tag:amenity=harbourmaster
     amenity=hospital: Tag:amenity=hospital
     amenity=hunting_stand: Tag:amenity=hunting stand
+    amenity=ice_cream: Tag:amenity=ice cream
+    amenity=jobcentre: Tag:amenity=jobcentre
     amenity=kindergarten: Tag:amenity=kindergarten
+    amenity=kneipp_water_cure: Tag:amenity=kneipp water cure
     amenity=library: Tag:amenity=library
     amenity=life_ring: Tag:amenity=life ring
+    amenity=lifeboat_station: Tag:amenity=lifeboat station
+    amenity=love_hotel: Tag:amenity=love hotel
     amenity=marketplace: Tag:amenity=marketplace
     amenity=milk_dispenser: Tag:amenity=milk dispenser
+    amenity=mobile_library: Tag:amenity=mobile library
+    amenity=motorcycle_parking: Tag:amenity=motorcycle parking
+    amenity=music_venue: Tag:amenity=music venue
     amenity=nightclub: Tag:amenity=nightclub
     amenity=nursing_home: Tag:amenity=nursing home
     amenity=parking: Tag:amenity=parking
+    amenity=parking_entrance: Tag:amenity=parking entrance
+    amenity=parking_space: Tag:amenity=parking space
     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=post_box: Tag:amenity=post box
     amenity=post_office: Tag:amenity=post office
     amenity=prison: Tag:amenity=prison
     amenity=pub: Tag:amenity=pub
+    amenity=public_bath: Tag:amenity=public bath
     amenity=public_building: Tag:amenity=public building
+    amenity=ranger_station: Tag:amenity=ranger station
     amenity=recycling: Tag:amenity=recycling
     amenity=register_office: Tag:amenity=register office
+    amenity=rescue_box: Tag:amenity=rescue box
     amenity=restaurant: Tag:amenity=restaurant
+    amenity=retirement_home: Tag:amenity=retirement home
     amenity=sauna: Tag:amenity=sauna
     amenity=school: Tag:amenity=school
+    amenity=security_booth: Tag:amenity=security booth
+    amenity=shelter: Tag:amenity=shelter
+    amenity=shower: Tag:amenity=shower
+    amenity=social_centre: Tag:amenity=social centre
+    amenity=social_facility: Tag:amenity=social facility
+    amenity=spa: Tag:amenity=spa
     amenity=stripclub: Tag:amenity=stripclub
     amenity=studio: Tag:amenity=studio
+    amenity=swimming_pool: Tag:amenity=swimming pool
+    amenity=swingerclub: Tag:amenity=swingerclub
     amenity=taxi: Tag:amenity=taxi
     amenity=telephone: Tag:amenity=telephone
     amenity=theatre: Tag:amenity=theatre
@@ -511,68 +1379,278 @@ en:
     amenity=waste_basket: Tag:amenity=waste basket
     amenity=waste_disposal: Tag:amenity=waste disposal
     amenity=waste_transfer_station: Tag:amenity=waste transfer station
+    amenity=water_point: Tag:amenity=water point
     amenity=watering_place: Tag:amenity=watering place
-    atm=no: Tag:atm=no
+    amenity=weighbridge: Tag:amenity=weighbridge
     atm=yes: Tag:atm=yes
     barrier=block: Tag:barrier=block
     barrier=bollard: Tag:barrier=bollard
+    barrier=border_control: Tag:barrier=border control
+    barrier=bus_trap: Tag:barrier=bus trap
     barrier=cattle_grid: Tag:barrier=cattle grid
+    barrier=chain: Tag:barrier=chain
     barrier=city_wall: Tag:barrier=city wall
     barrier=cycle_barrier: Tag:barrier=cycle barrier
     barrier=ditch: Tag:barrier=ditch
+    barrier=entrance: Tag:barrier=entrance
     barrier=fence: Tag:barrier=fence
     barrier=gate: Tag:barrier=gate
+    barrier=guard_rail: Tag:barrier=guard rail
     barrier=hedge: Tag:barrier=hedge
     barrier=horse_stile: Tag:barrier=horse stile
     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=motorcycle_barrier: Tag:barrier=motorcycle barrier
+    barrier=ohm:military:wireObstacle: Tag:barrier=ohm:military:wireObstacle
     barrier=retaining_wall: Tag:barrier=retaining wall
     barrier=sally_port: Tag:barrier=sally port
     barrier=stile: Tag:barrier=stile
+    barrier=sump_buster: Tag:barrier=sump buster
+    barrier=swing_gate: Tag:barrier=swing gate
     barrier=toll_booth: Tag:barrier=toll booth
     barrier=turnstile: Tag:barrier=turnstile
     barrier=wall: Tag:barrier=wall
+    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=historic: Tag:boundary=historic
+    boundary=local_authority: Tag:boundary=local authority
     boundary=maritime: Tag:boundary=maritime
     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=vice_county: Tag:boundary=vice county
+    bridge=bascule: Tag:bridge=bascule
+    bridge=beam: Tag:bridge=beam
+    bridge=drawbridge: Tag:bridge=drawbridge
+    bridge=lift: Tag:bridge=lift
+    bridge=opening: Tag:bridge=opening
+    bridge=pontoon: Tag:bridge=pontoon
+    bridge=suspension: Tag:bridge=suspension
+    bridge=transporter: Tag:bridge=transporter
+    bridge=viaduct: Tag:bridge=viaduct
+    building=apartments: Tag:building=apartments
+    building=barn: Tag:building=barn
+    building=bridge: Tag:building=bridge
+    building=bunker: Tag:building=bunker
+    building=cabin: Tag:building=cabin
+    building=cathedral: Tag:building=cathedral
+    building=chapel: Tag:building=chapel
+    building=church: Tag:building=church
+    building=civic: Tag:building=civic
+    building=commercial: Tag:building=commercial
+    building=construction: Tag:building=construction
+    building=cowshed: Tag:building=cowshed
+    building=detached: Tag:building=detached
     building=dormitory: Tag:building=dormitory
     building=entrance: Tag:building=entrance
-    building=parliament: Tag:building=parliament
+    building=farm: Tag:building=farm
+    building=farm_auxiliary: Tag:building=farm auxiliary
+    building=garage: Tag:building=garage
+    building=garages: Tag:building=garages
+    building=greenhouse: Tag:building=greenhouse
+    building=ground_station: Tag:building=ground station
+    building=hangar: Tag:building=hangar
+    building=hospital: Tag:building=hospital
+    building=hotel: Tag:building=hotel
+    building=house: Tag:building=house
+    building=houseboat: Tag:building=houseboat
+    building=hut: Tag:building=hut
+    building=industrial: Tag:building=industrial
+    building=manufacture: Tag:building=manufacture
+    building=mosque: Tag:building=mosque
+    building=office: Tag:building=office
+    building=public: Tag:building=public
+    building=residential: Tag:building=residential
+    building=retail: Tag:building=retail
+    building=roof: Tag:building=roof
+    building=school: Tag:building=school
+    building=shed: Tag:building=shed
+    building=stable: Tag:building=stable
+    building=static_caravan: Tag:building=static caravan
+    building=sty: Tag:building=sty
+    building=supermarket: Tag:building=supermarket
+    building=terrace: Tag:building=terrace
+    building=train_station: Tag:building=train station
+    building=transformer_tower: Tag:building=transformer tower
+    building=transportation: Tag:building=transportation
+    building=university: Tag:building=university
+    building=warehouse: Tag:building=warehouse
     bunker_type=munitions: Tag:bunker type=munitions
     bunker_type=pillbox: Tag:bunker type=pillbox
+    busway=lane: Tag:busway=lane
+    busway=opposite_lane: Tag:busway=opposite lane
+    cafe=time-cafe: Tag:cafe=time-cafe
     clothes=sports: Tag:clothes=sports
-    club-mate=yes: Tag:club-mate=yes
+    coastline:survey_quality=complete: Tag:coastline:survey quality=complete
+    coastline:survey_quality=inadequate: Tag:coastline:survey quality=inadequate
+    craft=agricultural_engines: Tag:craft=agricultural engines
+    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=car_repair: Tag:craft=car repair
+    craft=carpenter: Tag:craft=carpenter
+    craft=carpet_layer: Tag:craft=carpet layer
+    craft=caterer: Tag:craft=caterer
+    craft=clockmaker: Tag:craft=clockmaker
+    craft=confectionery: Tag:craft=confectionery
+    craft=dressmaker: Tag:craft=dressmaker
+    craft=electrician: Tag:craft=electrician
+    craft=falles: Tag:craft=falles
+    craft=gardener: Tag:craft=gardener
+    craft=glaziery: Tag:craft=glaziery
+    craft=handicraft: Tag:craft=handicraft
+    craft=hvac: Tag:craft=hvac
+    craft=information_electronics: Tag:craft=information electronics
+    craft=insulation: Tag:craft=insulation
+    craft=jeweller: Tag:craft=jeweller
+    craft=key_cutter: Tag:craft=key cutter
+    craft=locksmith: Tag:craft=locksmith
+    craft=metal_construction: Tag:craft=metal construction
+    craft=optician: Tag:craft=optician
+    craft=painter: Tag:craft=painter
+    craft=parquet_layer: Tag:craft=parquet layer
+    craft=photographer: Tag:craft=photographer
+    craft=photographic_laboratory: Tag:craft=photographic laboratory
+    craft=plasterer: Tag:craft=plasterer
+    craft=plumber: Tag:craft=plumber
+    craft=pottery: Tag:craft=pottery
+    craft=rigger: Tag:craft=rigger
+    craft=roofer: Tag:craft=roofer
+    craft=saddler: Tag:craft=saddler
+    craft=sailmaker: Tag:craft=sailmaker
+    craft=sawmill: Tag:craft=sawmill
+    craft=scaffolder: Tag:craft=scaffolder
+    craft=sculptor: Tag:craft=sculptor
+    craft=shoemaker: Tag:craft=shoemaker
+    craft=stand_builder: Tag:craft=stand builder
+    craft=stonemason: Tag:craft=stonemason
+    craft=sun_protection: Tag:craft=sun protection
+    craft=sweep: Tag:craft=sweep
+    craft=tailor: Tag:craft=tailor
+    craft=tiler: Tag:craft=tiler
+    craft=tinsmith: Tag:craft=tinsmith
+    craft=upholsterer: Tag:craft=upholsterer
+    craft=watchmaker: Tag:craft=watchmaker
+    craft=window_construction: Tag:craft=window construction
+    crop=asparagus: Tag:crop=asparagus
+    crop=bananas: Tag:crop=bananas
+    crop=barley: Tag:crop=barley
+    crop=coffee: Tag:crop=coffee
+    crop=corn: Tag:crop=corn
+    crop=flowers: Tag:crop=flowers
+    crop=grape: Tag:crop=grape
+    crop=grass: Tag:crop=grass
+    crop=hay: Tag:crop=hay
+    crop=maize: Tag:crop=maize
+    crop=oats: Tag:crop=oats
+    crop=rape: Tag:crop=rape
+    crop=rice: Tag:crop=rice
+    crop=rye: Tag:crop=rye
+    crop=strawberry: Tag:crop=strawberry
+    crop=sugar: Tag:crop=sugar
+    crop=tea: Tag:crop=tea
+    crop=wheat: Tag:crop=wheat
+    cuisine=brazilian: Tag:cuisine=brazilian
+    cuisine=coffee_shop: Tag:cuisine=coffee shop
+    cycleway=asl: Tag:cycleway=asl
     cycleway=bike_box: Tag:cycleway=bike box
+    cycleway=share_busway: Tag:cycleway=share busway
     denomination=mormon: Tag:denomination=mormon
+    denomination=reformed: Tag:denomination=reformed
+    denotation=landmark: Tag:denotation=landmark
     emergency=ambulance_station: Tag:emergency=ambulance station
+    emergency=coast_guard: Tag:emergency=coast guard
+    emergency=defibrillator: Tag:emergency=defibrillator
+    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=life_ring: Tag:emergency=life ring
+    emergency=lifeboat_station: Tag:emergency=lifeboat station
+    emergency=marine_refuge: Tag:emergency=marine refuge
     emergency=phone: Tag:emergency=phone
     emergency=ses_station: Tag:emergency=ses station
     emergency=siren: Tag:emergency=siren
+    emergency=suction_point: Tag:emergency=suction point
+    emergency=water_rescue_station: Tag:emergency=water rescue station
+    emergency=water_tank: Tag:emergency=water tank
+    emergency_service=technical: Tag:emergency service=technical
+    esperanto=esperanto: Tag:esperanto=esperanto
+    estuary=yes: Tag:estuary=yes
+    fast_food=cafeteria: Tag:fast food=cafeteria
+    footway=crossing: Tag:footway=crossing
+    footway=sidewalk: Tag:footway=sidewalk
+    generator:method=fission: Tag:generator:method=fission
+    generator:method=fusion: Tag:generator:method=fusion
+    generator:plant=intermediate: Tag:generator:plant=intermediate
+    generator:plant=output: Tag:generator:plant=output
+    generator:source=hydro: Tag:generator:source=hydro
+    generator:source=nuclear: Tag:generator:source=nuclear
+    generator:source=solar: Tag:generator:source=solar
+    generator:source=wind: Tag:generator:source=wind
+    geological=outcrop: Tag:geological=outcrop
     geological=palaeontological_site: Tag:geological=palaeontological site
+    harbour:category=RoRo: Tag:harbour:category=RoRo
+    harbour:category=bulk: Tag:harbour:category=bulk
+    harbour:category=container: Tag:harbour:category=container
+    harbour:category=ferry: Tag:harbour:category=ferry
+    harbour:category=fishing: Tag:harbour:category=fishing
+    harbour:category=general: Tag:harbour:category=general
+    harbour:category=industrial: Tag:harbour:category=industrial
+    harbour:category=marina: Tag:harbour:category=marina
+    harbour:category=military: Tag:harbour:category=military
+    harbour:category=oil_platform: Tag:harbour:category=oil platform
+    harbour:category=passenger: Tag:harbour:category=passenger
+    harbour:category=seaport: Tag:harbour:category=seaport
+    harbour:category=shipyard: Tag:harbour:category=shipyard
+    harbour:category=tanker: Tag:harbour:category=tanker
+    harbour:category=tourism: Tag:harbour:category=tourism
+    harbour:category=yacht: Tag:harbour:category=yacht
+    harbour=dolphin: Tag:harbour=dolphin
+    harbour=drinking_water: Tag:harbour=drinking water
+    harbour=harbour_master: Tag:harbour=harbour master
+    harbour=jetty: Tag:harbour=jetty
+    harbour=slipway: Tag:harbour=slipway
+    harbour=yes: Tag:harbour=yes
+    hazard_prone=yes: Tag:hazard prone=yes
+    hazard_type=avalanche: Tag:hazard type=avalanche
+    hazard_type=flood: Tag:hazard type=flood
+    hazard_type=landslide: Tag:hazard type=landslide
     highway=bridleway: Tag:highway=bridleway
     highway=bus_guideway: Tag:highway=bus guideway
     highway=bus_stop: Tag:highway=bus stop
     highway=byway: Tag:highway=byway
     highway=crossing: Tag:highway=crossing
     highway=cycleway: Tag:highway=cycleway
+    highway=elevator: Tag:highway=elevator
     highway=emergency_access_point: Tag:highway=emergency access point
+    highway=escape: Tag:highway=escape
     highway=footway: Tag:highway=footway
     highway=ford: Tag:highway=ford
     highway=give_way: Tag:highway=give way
+    highway=incline: Tag:highway=incline
+    highway=lane: Tag:highway=lane
     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=ohm:military:Trench: Tag:highway=ohm:military:Trench
     highway=passing_place: Tag:highway=passing place
     highway=path: Tag:highway=path
     highway=pedestrian: Tag:highway=pedestrian
@@ -592,35 +1670,87 @@ en:
     highway=street_lamp: Tag:highway=street lamp
     highway=tertiary: Tag:highway=tertiary
     highway=track: Tag:highway=track
+    highway=traffic_mirror: Tag:highway=traffic mirror
     highway=traffic_signals: Tag:highway=traffic signals
     highway=trail: Tag:highway=trail
     highway=trunk: Tag:highway=trunk
     highway=turning_circle: Tag:highway=turning circle
+    highway=turning_loop: Tag:highway=turning loop
     highway=unclassified: Tag:highway=unclassified
+    highway=unsurfaced: Tag:highway=unsurfaced
+    highway=via_ferrata: Tag:highway=via ferrata
+    historic=aircraft: Tag:historic=aircraft
     historic=archaeological_site: Tag:historic=archaeological site
     historic=battlefield: Tag:historic=battlefield
+    historic=boundary_stone: Tag:historic=boundary stone
+    historic=cannon: Tag:historic=cannon
     historic=castle: Tag:historic=castle
+    historic=city_gate: Tag:historic=city gate
+    historic=citywalls: Tag:historic=citywalls
+    historic=farm: Tag:historic=farm
+    historic=fort: Tag:historic=fort
+    historic=gallows: Tag:historic=gallows
     historic=manor: Tag:historic=manor
     historic=memorial: Tag:historic=memorial
+    historic=milestone: Tag:historic=milestone
+    historic=mine: Tag:historic=mine
     historic=monastery: Tag:historic=monastery
     historic=monument: Tag:historic=monument
+    historic=pa: Tag:historic=pa
     historic=paleontological_site: Tag:historic=paleontological site
+    historic=pillory: Tag:historic=pillory
     historic=ruins: Tag:historic=ruins
+    historic=rune_stone: Tag:historic=rune stone
+    historic=ship: Tag:historic=ship
+    historic=stone: Tag:historic=stone
+    historic=tree_shrine: Tag:historic=tree shrine
     historic=wayside_cross: Tag:historic=wayside cross
     historic=wayside_shrine: Tag:historic=wayside shrine
     historic=wreck: Tag:historic=wreck
     hunting=raised_hide: Tag:hunting=raised hide
+    industrial=auto_wrecker: Tag:industrial=auto wrecker
+    industrial=well_cluster: Tag:industrial=well cluster
     information=guidepost: Tag:information=guidepost
+    information=tactile_model: Tag:information=tactile model
+    junction=crossing: Tag:junction=crossing
+    junction=filter: Tag:junction=filter
     junction=roundabout: Tag:junction=roundabout
+    landform=esker: Tag:landform=esker
+    landform=raised_beach: Tag:landform=raised beach
+    landmark=beacon: Tag:landmark=beacon
+    landmark=cairn: Tag:landmark=cairn
+    landmark=cemetery: Tag:landmark=cemetery
+    landmark=chimney: Tag:landmark=chimney
+    landmark=cross: Tag:landmark=cross
+    landmark=dish_aerial: Tag:landmark=dish aerial
+    landmark=flare_stack: Tag:landmark=flare stack
+    landmark=large_rock: Tag:landmark=large rock
+    landmark=mast: Tag:landmark=mast
+    landmark=memorial_plaque: Tag:landmark=memorial plaque
+    landmark=monument: Tag:landmark=monument
+    landmark=obelisk: Tag:landmark=obelisk
+    landmark=pillar: Tag:landmark=pillar
+    landmark=radar_scanner: Tag:landmark=radar scanner
+    landmark=rock_pinnacle: Tag:landmark=rock pinnacle
+    landmark=spire: Tag:landmark=spire
+    landmark=tower: Tag:landmark=tower
+    landmark=windmill: Tag:landmark=windmill
+    landmark=windmotor: Tag:landmark=windmotor
+    landmark=windsock: Tag:landmark=windsock
+    landuse=agriculture: Tag:landuse=agriculture
     landuse=allotments: Tag:landuse=allotments
+    landuse=aquaculture: Tag:landuse=aquaculture
     landuse=basin: Tag:landuse=basin
     landuse=brownfield: Tag:landuse=brownfield
     landuse=cemetery: Tag:landuse=cemetery
+    landuse=churchyard: Tag:landuse=churchyard
     landuse=commercial: Tag:landuse=commercial
     landuse=construction: Tag:landuse=construction
+    landuse=depot: Tag:landuse=depot
     landuse=farm: Tag:landuse=farm
-    landuse=farmland: Tag:landuse=farmland
     landuse=farmyard: Tag:landuse=farmyard
+    landuse=field: Tag:landuse=field
+    landuse=fishfarm: Tag:landuse=fishfarm
     landuse=forest: Tag:landuse=forest
     landuse=garages: Tag:landuse=garages
     landuse=grass: Tag:landuse=grass
@@ -630,9 +1760,13 @@ en:
     landuse=landfill: Tag:landuse=landfill
     landuse=meadow: Tag:landuse=meadow
     landuse=military: Tag:landuse=military
+    landuse=observatory: Tag:landuse=observatory
     landuse=orchard: Tag:landuse=orchard
     landuse=peat_cutting: Tag:landuse=peat cutting
+    landuse=plant_nursery: Tag:landuse=plant nursery
+    landuse=plantation: Tag:landuse=plantation
     landuse=pond: Tag:landuse=pond
+    landuse=prison: Tag:landuse=prison
     landuse=quarry: Tag:landuse=quarry
     landuse=railway: Tag:landuse=railway
     landuse=recreation_ground: Tag:landuse=recreation ground
@@ -641,55 +1775,99 @@ en:
     landuse=retail: Tag:landuse=retail
     landuse=salt_pond: Tag:landuse=salt pond
     landuse=street: Tag:landuse=street
+    landuse=traffic_island: Tag:landuse=traffic island
+    landuse=utility: Tag:landuse=utility
     landuse=village_green: Tag:landuse=village green
     landuse=vineyard: Tag:landuse=vineyard
+    landuse=well: Tag:landuse=well
+    landuse=wellsite: Tag:landuse=wellsite
+    lane=buffered: Tag:lane=buffered
+    leisure=adult_gaming_centre: Tag:leisure=adult gaming centre
+    leisure=amusement_arcade: Tag:leisure=amusement arcade
+    leisure=bathing_place: Tag:leisure=bathing place
+    leisure=bbq: Tag:leisure=bbq
     leisure=beach_resort: Tag:leisure=beach resort
+    leisure=bird_hide: Tag:leisure=bird hide
     leisure=common: Tag:leisure=common
     leisure=dance: Tag:leisure=dance
     leisure=dog_park: Tag:leisure=dog park
+    leisure=firepit: Tag:leisure=firepit
     leisure=fishing: Tag:leisure=fishing
+    leisure=fitness_station: Tag:leisure=fitness station
     leisure=garden: Tag:leisure=garden
     leisure=golf_course: Tag:leisure=golf course
     leisure=hackerspace: Tag:leisure=hackerspace
     leisure=ice_rink: Tag:leisure=ice rink
+    leisure=landscape_reserve: Tag:leisure=landscape reserve
     leisure=marina: Tag:leisure=marina
     leisure=miniature_golf: Tag:leisure=miniature golf
     leisure=nature_reserve: Tag:leisure=nature reserve
     leisure=paddling_pool: Tag:leisure=paddling pool
     leisure=park: Tag:leisure=park
+    leisure=picnic: Tag:leisure=picnic
+    leisure=picnic_site: Tag:leisure=picnic site
     leisure=picnic_table: Tag:leisure=picnic table
     leisure=pitch: Tag:leisure=pitch
     leisure=playground: Tag:leisure=playground
+    leisure=red_light_district: Tag:leisure=red light district
+    leisure=sailing_club: Tag:leisure=sailing club
     leisure=ski_playground: Tag:leisure=ski playground
     leisure=slipway: Tag:leisure=slipway
     leisure=sports_centre: Tag:leisure=sports centre
+    leisure=stadium: Tag:leisure=stadium
+    leisure=swimming_pool: Tag:leisure=swimming pool
     leisure=track: Tag:leisure=track
     leisure=video_arcade: Tag:leisure=video arcade
     leisure=water_park: Tag:leisure=water park
+    leisure=wildlife_hide: Tag:leisure=wildlife hide
+    level_crossing=uncontrolled: Tag:level crossing=uncontrolled
+    lines=phone: Tag:lines=phone
     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=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=chimney: Tag:man made=chimney
+    man_made=communications_tower: Tag:man made=communications tower
     man_made=compass_rose: Tag:man made=compass rose
     man_made=crane: Tag:man made=crane
+    man_made=cross: Tag:man made=cross
     man_made=cutline: Tag:man made=cutline
     man_made=dyke: Tag:man made=dyke
-    man_made=fish_passage: Tag:man made=fish passage
+    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=gasometer: Tag:man made=gasometer
+    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=jetty: Tag:man made=jetty
+    man_made=kiln: Tag:man made=kiln
     man_made=lighthouse: Tag:man made=lighthouse
+    man_made=mast: Tag:man made=mast
     man_made=mineshaft: Tag:man made=mineshaft
     man_made=monitoring_station: Tag:man made=monitoring station
+    man_made=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=pumping_rig: Tag:man made=pumping rig
     man_made=reservoir_covered: Tag:man made=reservoir covered
+    man_made=school_sentry: Tag:man made=school sentry
+    man_made=silo: Tag:man made=silo
+    man_made=snow_fence: Tag:man made=snow fence
     man_made=storage_tank: Tag:man made=storage tank
+    man_made=submarine_cable: Tag:man made=submarine cable
     man_made=surveillance: Tag:man made=surveillance
     man_made=survey_point: Tag:man made=survey point
     man_made=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_tower: Tag:man made=water tower
     man_made=water_well: Tag:man made=water well
@@ -697,51 +1875,107 @@ en:
     man_made=watermill: Tag:man made=watermill
     man_made=well: Tag:man made=well
     man_made=wildlife_crossing: Tag:man made=wildlife crossing
+    man_made=wildlife_opening: Tag:man made=wildlife opening
     man_made=windmill: Tag:man made=windmill
     man_made=windpump: Tag:man made=windpump
     man_made=works: Tag:man made=works
+    medical=witchdoctor: Tag:medical=witchdoctor
     microbrewery=yes: Tag:microbrewery=yes
     military=airfield: Tag:military=airfield
+    military=barracks: Tag:military=barracks
     military=bunker: Tag:military=bunker
+    military=checkpoint: Tag:military=checkpoint
+    military=danger_area: Tag:military=danger area
+    military=exclusion_zone: Tag:military=exclusion zone
     military=naval_base: Tag:military=naval base
+    military=obstacle_course: Tag:military=obstacle course
+    military=range: Tag:military=range
+    military=training_area: Tag:military=training area
+    mooring=commercial: Tag:mooring=commercial
+    mooring=cruise: Tag:mooring=cruise
+    mooring=declaration: Tag:mooring=declaration
+    mooring=ferry: Tag:mooring=ferry
+    mooring=guest: Tag:mooring=guest
+    mooring=monobuoy: Tag:mooring=monobuoy
+    mooring=ring: Tag:mooring=ring
+    mooring=sbm: Tag:mooring=sbm
+    mooring=spm: Tag:mooring=spm
+    mooring=visitor: Tag:mooring=visitor
+    mooring=yes: Tag:mooring=yes
+    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=breaker: Tag:natural=breaker
+    natural=cape: Tag:natural=cape
     natural=cave_entrance: Tag:natural=cave entrance
     natural=cliff: Tag:natural=cliff
     natural=coastline: Tag:natural=coastline
+    natural=continental_shelf: Tag:natural=continental shelf
+    natural=desert: Tag:natural=desert
     natural=dune: Tag:natural=dune
+    natural=esker: Tag:natural=esker
     natural=fell: Tag:natural=fell
     natural=glacier: Tag:natural=glacier
+    natural=grassland: Tag:natural=grassland
     natural=heath: Tag:natural=heath
     natural=lake: Tag:natural=lake
     natural=land: Tag:natural=land
+    natural=landform: Tag:natural=landform
+    natural=lava: Tag:natural=lava
+    natural=moor: Tag:natural=moor
+    natural=moraine: Tag:natural=moraine
+    natural=mud: Tag:natural=mud
     natural=peak: Tag:natural=peak
+    natural=reef: Tag:natural=reef
+    natural=ridge: Tag:natural=ridge
     natural=rock: Tag:natural=rock
+    natural=saddle: Tag:natural=saddle
+    natural=sand: Tag:natural=sand
     natural=scree: Tag:natural=scree
     natural=scrub: Tag:natural=scrub
+    natural=shoal: Tag:natural=shoal
+    natural=sinkhole: Tag:natural=sinkhole
     natural=spring: Tag:natural=spring
     natural=stone: Tag:natural=stone
+    natural=tidal: Tag:natural=tidal
     natural=tree: Tag:natural=tree
+    natural=tree_row: Tag:natural=tree row
+    natural=tundra: Tag:natural=tundra
     natural=volcano: Tag:natural=volcano
     natural=water: Tag:natural=water
     natural=wetland: Tag:natural=wetland
     natural=wood: Tag:natural=wood
+    odbl=clean: Tag:odbl=clean
     office=accountant: Tag:office=accountant
+    office=administrative: Tag:office=administrative
     office=architect: Tag:office=architect
+    office=camping: Tag:office=camping
     office=company: Tag:office=company
+    office=educational_institution: Tag:office=educational institution
     office=employment_agency: Tag:office=employment agency
     office=estate_agent: Tag:office=estate agent
+    office=foundation: Tag:office=foundation
     office=government: Tag:office=government
     office=insurance: Tag:office=insurance
+    office=it: Tag:office=it
     office=lawyer: Tag:office=lawyer
     office=newspaper: Tag:office=newspaper
     office=ngo: Tag:office=ngo
+    office=political_party: Tag:office=political party
     office=quango: Tag:office=quango
     office=research: Tag:office=research
+    office=surveyor: Tag:office=surveyor
     office=telecommunication: Tag:office=telecommunication
     office=travel_agent: Tag:office=travel agent
+    pilotage=boarding_point: Tag:pilotage=boarding point
+    pilotage=office: Tag:pilotage=office
     pipeline=marker: Tag:pipeline=marker
     pipeline=valve: Tag:pipeline=valve
+    place=allotments: Tag:place=allotments
+    place=archipelago: Tag:place=archipelago
     place=city: Tag:place=city
     place=continent: Tag:place=continent
     place=country: Tag:place=country
@@ -752,78 +1986,409 @@ en:
     place=islet: Tag:place=islet
     place=isolated_dwelling: Tag:place=isolated dwelling
     place=locality: Tag:place=locality
+    place=neighbourhood: Tag:place=neighbourhood
+    place=ocean: Tag:place=ocean
     place=region: Tag:place=region
+    place=sea: Tag:place=sea
     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
+    power=cable: Tag:power=cable
     power=cable_distribution_cabinet: Tag:power=cable distribution cabinet
     power=generator: Tag:power=generator
+    power=heliostat: Tag:power=heliostat
     power=line: Tag:power=line
     power=minor_line: Tag:power=minor line
+    power=plant: Tag:power=plant
     power=pole: Tag:power=pole
     power=station: Tag:power=station
     power=sub_station: Tag:power=sub station
+    power=substation: Tag:power=substation
     power=tower: Tag:power=tower
+    power=transformer: Tag:power=transformer
+    power=underground_cable: Tag:power=underground cable
     public_transport=pay_scale_area: Tag:public transport=pay scale area
+    public_transport=platform: Tag:public transport=platform
+    public_transport=station: Tag:public transport=station
+    public_transport=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
+    radar_transponder=ramark: Tag:radar transponder=ramark
+    radio_transponder:category=aeronautical: Tag:radio transponder:category=aeronautical
+    radio_transponder:category=circular: Tag:radio transponder:category=circular
+    radio_transponder:category=coast_radio: Tag:radio transponder:category=coast radio
+    radio_transponder:category=consol: Tag:radio transponder:category=consol
+    radio_transponder:category=direction_finding: Tag:radio transponder:category=direction
+      finding
+    radio_transponder:category=directional: Tag:radio transponder:category=directional
+    radio_transponder:category=rotating_pattern: Tag:radio transponder:category=rotating
+      pattern
     railway=PRT: Tag:railway=PRT
+    railway=abandoned: Tag:railway=abandoned
+    railway=buffer_stop: Tag:railway=buffer stop
     railway=crossing: Tag:railway=crossing
+    railway=derail: Tag:railway=derail
+    railway=disused: Tag:railway=disused
+    railway=funicular: Tag:railway=funicular
     railway=halt: Tag:railway=halt
     railway=level_crossing: Tag:railway=level crossing
+    railway=light_rail: Tag:railway=light rail
+    railway=milestone: Tag:railway=milestone
     railway=miniature: Tag:railway=miniature
     railway=monorail: Tag:railway=monorail
+    railway=narrow_gauge: Tag:railway=narrow gauge
     railway=platform: Tag:railway=platform
+    railway=preserved: Tag:railway=preserved
     railway=rail: Tag:railway=rail
+    railway=roundhouse: Tag:railway=roundhouse
     railway=station: Tag:railway=station
     railway=stop: Tag:railway=stop
     railway=subway: Tag:railway=subway
     railway=subway_entrance: Tag:railway=subway entrance
+    railway=switch: Tag:railway=switch
     railway=tram: Tag:railway=tram
     railway=tram_stop: Tag:railway=tram stop
     railway=turntable: Tag:railway=turntable
     religion=pagan: Tag:religion=pagan
+    resource=aggregate: Tag:resource=aggregate
+    resource=gravel: Tag:resource=gravel
+    resource=sand: Tag:resource=sand
     route=bus: Tag:route=bus
     route=canal: Tag:route=canal
     route=detour: Tag:route=detour
     route=ferry: Tag:route=ferry
+    route=fitness_trail: Tag:route=fitness trail
+    route=monorail: Tag:route=monorail
+    route=pipeline: Tag:route=pipeline
     route=railway: Tag:route=railway
     route=road: Tag:route=road
     route=share_taxi: Tag:route=share taxi
     route=ski: Tag:route=ski
+    route=subway: Tag:route=subway
     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
+    seamark:beacon_isolated_danger:colour=black;red;black: Tag:seamark:beacon isolated
+      danger:colour=black;red;black
+    seamark:beacon_isolated_danger:colour_pattern=horizontal: Tag:seamark:beacon isolated
+      danger:colour pattern=horizontal
+    seamark:beacon_isolated_danger:shape=tower: Tag:seamark:beacon isolated danger:shape=tower
+    seamark:beacon_lateral:colour=green: Tag:seamark:beacon lateral:colour=green
+    seamark:beacon_lateral:colour=green;red;green: Tag:seamark:beacon lateral:colour=green;red;green
+    seamark:beacon_lateral:colour=green;white;green;white: Tag:seamark:beacon lateral:colour=green;white;green;white
+    seamark:beacon_lateral:colour=red: Tag:seamark:beacon lateral:colour=red
+    seamark:beacon_lateral:colour=red;green;red: Tag:seamark:beacon lateral:colour=red;green;red
+    seamark:beacon_lateral:colour=red;white;red;white: Tag:seamark:beacon lateral:colour=red;white;red;white
+    seamark:beacon_lateral:colour_pattern=horizontal: Tag:seamark:beacon lateral:colour
+      pattern=horizontal
+    seamark:beacon_lateral:shape=perch: Tag:seamark:beacon lateral:shape=perch
+    seamark:beacon_lateral:shape=pole: Tag:seamark:beacon lateral:shape=pole
+    seamark:beacon_lateral:shape=tower: Tag:seamark:beacon lateral:shape=tower
+    seamark:beacon_lateral:shape=withy: Tag:seamark:beacon lateral:shape=withy
+    seamark:beacon_safe_water:colour=red;white: Tag:seamark:beacon safe water:colour=red;white
+    seamark:beacon_safe_water:colour_pattern=vertical: Tag:seamark:beacon safe water:colour
+      pattern=vertical
+    seamark:beacon_safe_water:shape=tower: Tag:seamark:beacon safe water:shape=tower
+    seamark:beacon_special_purpose:category=cable: Tag:seamark:beacon special purpose:category=cable
+    seamark:beacon_special_purpose:category=notice: Tag:seamark:beacon special purpose:category=notice
+    seamark:beacon_special_purpose:category=racing: Tag:seamark:beacon special purpose:category=racing
+    seamark:beacon_special_purpose:category=warning: Tag:seamark:beacon special purpose:category=warning
+    seamark:beacon_special_purpose:colour=black: Tag:seamark:beacon special purpose:colour=black
+    seamark:beacon_special_purpose:colour=blue: Tag:seamark:beacon special purpose:colour=blue
+    seamark:beacon_special_purpose:colour=green: Tag:seamark:beacon special purpose:colour=green
+    seamark:beacon_special_purpose:colour=grey: Tag:seamark:beacon special purpose:colour=grey
+    seamark:beacon_special_purpose:colour=orange: Tag:seamark:beacon special purpose:colour=orange
+    seamark:beacon_special_purpose:colour=red: Tag:seamark:beacon special purpose:colour=red
+    seamark:beacon_special_purpose:colour=white: Tag:seamark:beacon special purpose:colour=white
+    seamark:beacon_special_purpose:colour=yellow: Tag:seamark:beacon special purpose:colour=yellow
+    seamark:beacon_special_purpose:shape=cairn: Tag:seamark:beacon special purpose:shape=cairn
+    seamark:beacon_special_purpose:shape=pole: Tag:seamark:beacon special purpose:shape=pole
+    seamark:beacon_special_purpose:shape=tower: Tag:seamark:beacon special purpose:shape=tower
+    seamark:buoy_cardinal:colour_pattern=horizontal: Tag:seamark:buoy cardinal:colour
+      pattern=horizontal
+    seamark:buoy_cardinal:shape=can: Tag:seamark:buoy cardinal:shape=can
+    seamark:buoy_cardinal:shape=conical: Tag:seamark:buoy cardinal:shape=conical
+    seamark:buoy_cardinal:shape=pillar: Tag:seamark:buoy cardinal:shape=pillar
+    seamark:buoy_cardinal:shape=spar: Tag:seamark:buoy cardinal:shape=spar
+    seamark:buoy_cardinal:shape=spherical: Tag:seamark:buoy cardinal:shape=spherical
+    seamark:buoy_isolated_danger:colour=black;red;black: Tag:seamark:buoy isolated
+      danger:colour=black;red;black
+    seamark:buoy_isolated_danger:colour_pattern=horizontal: Tag:seamark:buoy isolated
+      danger:colour pattern=horizontal
+    seamark:buoy_isolated_danger:shape=can: Tag:seamark:buoy isolated danger:shape=can
+    seamark:buoy_isolated_danger:shape=conical: Tag:seamark:buoy isolated danger:shape=conical
+    seamark:buoy_isolated_danger:shape=pillar: Tag:seamark:buoy isolated danger:shape=pillar
+    seamark:buoy_isolated_danger:shape=spar: Tag:seamark:buoy isolated danger:shape=spar
+    seamark:buoy_isolated_danger:shape=spherical: Tag:seamark:buoy isolated danger:shape=spherical
+    seamark:buoy_lateral:colour=green: Tag:seamark:buoy lateral:colour=green
+    seamark:buoy_lateral:colour=green;red;green: Tag:seamark:buoy lateral:colour=green;red;green
+    seamark:buoy_lateral:colour=green;white;green;white: Tag:seamark:buoy lateral:colour=green;white;green;white
+    seamark:buoy_lateral:colour=red: Tag:seamark:buoy lateral:colour=red
+    seamark:buoy_lateral:colour=red;green;red: Tag:seamark:buoy lateral:colour=red;green;red
+    seamark:buoy_lateral:colour=red;white;red;white: Tag:seamark:buoy lateral:colour=red;white;red;white
+    seamark:buoy_lateral:colour_pattern=horizontal: Tag:seamark:buoy lateral:colour
+      pattern=horizontal
+    seamark:buoy_lateral:shape=can: Tag:seamark:buoy lateral:shape=can
+    seamark:buoy_lateral:shape=conical: Tag:seamark:buoy lateral:shape=conical
+    seamark:buoy_lateral:shape=pillar: Tag:seamark:buoy lateral:shape=pillar
+    seamark:buoy_lateral:shape=spar: Tag:seamark:buoy lateral:shape=spar
+    seamark:buoy_lateral:shape=spherical: Tag:seamark:buoy lateral:shape=spherical
+    seamark:buoy_safe_water:colour=red;white: Tag:seamark:buoy safe water:colour=red;white
+    seamark:buoy_safe_water:colour_pattern=vertical: Tag:seamark:buoy safe water:colour
+      pattern=vertical
+    seamark:buoy_safe_water:shape=can: Tag:seamark:buoy safe water:shape=can
+    seamark:buoy_safe_water:shape=conical: Tag:seamark:buoy safe water:shape=conical
+    seamark:buoy_safe_water:shape=pillar: Tag:seamark:buoy safe water:shape=pillar
+    seamark:buoy_safe_water:shape=spar: Tag:seamark:buoy safe water:shape=spar
+    seamark:buoy_safe_water:shape=spherical: Tag:seamark:buoy safe water:shape=spherical
+    seamark:buoy_special_purpose:category=odas: Tag:seamark:buoy special purpose:category=odas
+    seamark:buoy_special_purpose:category=racing: Tag:seamark:buoy special purpose:category=racing
+    seamark:buoy_special_purpose:colour=black: Tag:seamark:buoy special purpose:colour=black
+    seamark:buoy_special_purpose:colour=blue: Tag:seamark:buoy special purpose:colour=blue
+    seamark:buoy_special_purpose:colour=green: Tag:seamark:buoy special purpose:colour=green
+    seamark:buoy_special_purpose:colour=orange: Tag:seamark:buoy special purpose:colour=orange
+    seamark:buoy_special_purpose:colour=red: Tag:seamark:buoy special purpose:colour=red
+    seamark:buoy_special_purpose:colour=white: Tag:seamark:buoy special purpose:colour=white
+    seamark:buoy_special_purpose:colour=yellow: Tag:seamark:buoy special purpose:colour=yellow
+    seamark:buoy_special_purpose:colour_pattern=diagonal: Tag:seamark:buoy special
+      purpose:colour pattern=diagonal
+    seamark:buoy_special_purpose:colour_pattern=horizontal: Tag:seamark:buoy special
+      purpose:colour pattern=horizontal
+    seamark:buoy_special_purpose:colour_pattern=vertical: Tag:seamark:buoy special
+      purpose:colour pattern=vertical
+    seamark:buoy_special_purpose:shape=barrel: Tag:seamark:buoy special purpose:shape=barrel
+    seamark:buoy_special_purpose:shape=can: Tag:seamark:buoy special purpose:shape=can
+    seamark:buoy_special_purpose:shape=conical: Tag:seamark:buoy special purpose:shape=conical
+    seamark:buoy_special_purpose:shape=pillar: Tag:seamark:buoy special purpose:shape=pillar
+    seamark:buoy_special_purpose:shape=spar: Tag:seamark:buoy special purpose:shape=spar
+    seamark:buoy_special_purpose:shape=spherical: Tag:seamark:buoy special purpose:shape=spherical
+    seamark:buoy_special_purpose:shape=super-buoy: Tag:seamark:buoy special purpose:shape=super-buoy
+    seamark:cable_overhead:category=power: Tag:seamark:cable overhead:category=power
+    seamark:cable_overhead:category=telephone: Tag:seamark:cable overhead:category=telephone
+    seamark:conspicuity=conspicuous: Tag:seamark:conspicuity=conspicuous
+    seamark:distance_mark:category=board: Tag:seamark:distance mark:category=board
+    seamark:distance_mark:category=not_installed: Tag:seamark:distance mark:category=not
+      installed
+    seamark:fog_signal:category=bell: Tag:seamark:fog signal:category=bell
+    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:landmark:category=cairn: Tag:seamark:landmark:category=cairn
+    seamark:landmark:category=cemetery: Tag:seamark:landmark:category=cemetery
+    seamark:landmark:category=chimney: Tag:seamark:landmark:category=chimney
+    seamark:landmark:category=column: Tag:seamark:landmark:category=column
+    seamark:landmark:category=cross: Tag:seamark:landmark:category=cross
+    seamark:landmark:category=dish_aerial: Tag:seamark:landmark:category=dish aerial
+    seamark:landmark:category=dome: Tag:seamark:landmark:category=dome
+    seamark:landmark:category=flagstaff: Tag:seamark:landmark:category=flagstaff
+    seamark:landmark:category=flare_stack: Tag:seamark:landmark:category=flare stack
+    seamark:landmark:category=mast: Tag:seamark:landmark:category=mast
+    seamark:landmark:category=memorial: Tag:seamark:landmark:category=memorial
+    seamark:landmark:category=minaret: Tag:seamark:landmark:category=minaret
+    seamark:landmark:category=monument: Tag:seamark:landmark:category=monument
+    seamark:landmark:category=obelisk: Tag:seamark:landmark:category=obelisk
+    seamark:landmark:category=radar_scanner: Tag:seamark:landmark:category=radar scanner
+    seamark:landmark:category=spire: Tag:seamark:landmark:category=spire
+    seamark:landmark:category=statue: Tag:seamark:landmark:category=statue
+    seamark:landmark:category=tower: Tag:seamark:landmark:category=tower
+    seamark:landmark:category=water_tower: Tag:seamark:landmark:category=water tower
+    seamark:landmark:category=windmill: Tag:seamark:landmark:category=windmill
+    seamark:landmark:category=windmotor: Tag:seamark:landmark:category=windmotor
+    seamark:landmark:category=windsock: Tag:seamark:landmark:category=windsock
+    seamark:landmark:conspicuity=conspicuous: Tag:seamark:landmark:conspicuity=conspicuous
+    seamark:landmark:function=buddhist_temple: Tag:seamark:landmark:function=buddhist
+      temple
+    seamark:landmark:function=chapel: Tag:seamark:landmark:function=chapel
+    seamark:landmark:function=church: Tag:seamark:landmark:function=church
+    seamark:landmark:function=marabout: Tag:seamark:landmark:function=marabout
+    seamark:landmark:function=mosque: Tag:seamark:landmark:function=mosque
+    seamark:landmark:function=pagoda: Tag:seamark:landmark:function=pagoda
+    seamark:landmark:function=shinto_shrine: Tag:seamark:landmark:function=shinto
+      shrine
+    seamark:landmark:function=temple: Tag:seamark:landmark:function=temple
+    seamark:light:category=aero: Tag:seamark:light:category=aero
+    seamark:light:category=air_obstruction: Tag:seamark:light:category=air obstruction
+    seamark:light:category=directional: Tag:seamark:light:category=directional
+    seamark:light:category=floodlight: Tag:seamark:light:category=floodlight
+    seamark:light:category=fog_detector: Tag:seamark:light:category=fog detector
+    seamark:light:category=front: Tag:seamark:light:category=front
+    seamark:light:category=lower: Tag:seamark:light:category=lower
+    seamark:light:category=moire: Tag:seamark:light:category=moire
+    seamark:light:category=rear: Tag:seamark:light:category=rear
+    seamark:light:category=striplight: Tag:seamark:light:category=striplight
+    seamark:light:category=subsidiary: Tag:seamark:light:category=subsidiary
+    seamark:light:category=upper: Tag:seamark:light:category=upper
+    seamark:light:exhibition=day: Tag:seamark:light:exhibition=day
+    seamark:light:exhibition=fog: Tag:seamark:light:exhibition=fog
+    seamark:light:exhibition=on_demand: Tag:seamark:light:exhibition=on demand
+    seamark:light:status=extinguished: Tag:seamark:light:status=extinguished
+    seamark:light:status=private: Tag:seamark:light:status=private
+    seamark:light:status=temporary: Tag:seamark:light:status=temporary
+    seamark:light:status=unreliable: Tag:seamark:light:status=unreliable
+    seamark:light:visibility=intensified: Tag:seamark:light:visibility=intensified
+    seamark:light:visibility=part_obscured: Tag:seamark:light:visibility=part obscured
+    seamark:light:visibility=unintensified: Tag:seamark:light:visibility=unintensified
+    seamark:mooring:category=wall: Tag:seamark:mooring:category=wall
+    seamark:obstruction:category=boom: Tag:seamark:obstruction:category=boom
+    seamark:radar_transponder:category=racon: Tag:seamark:radar transponder:category=racon
+    seamark:radar_transponder:category=ramark: Tag:seamark:radar transponder:category=ramark
+    seamark:radio_station:category=chiaka: Tag:seamark:radio station:category=chiaka
+    seamark:radio_station:category=commercial_broadcast: Tag:seamark:radio station:category=commercial
+      broadcast
+    seamark:radio_station:category=public_communication: Tag:seamark:radio station:category=public
+      communication
+    seamark:radio_station:category=time_signal: Tag:seamark:radio station:category=time
+      signal
+    seamark:restricted_area:category=ecological_reserve: Tag:seamark:restricted area:category=ecological
+      reserve
+    seamark:restricted_area:category=foul_ground: Tag:seamark:restricted area:category=foul
+      ground
+    seamark:restricted_area:category=military: Tag:seamark:restricted area:category=military
+    seamark:restricted_area:category=nature_reserve: Tag:seamark:restricted area:category=nature
+      reserve
+    seamark:restricted_area:category=no_wake: Tag:seamark:restricted area:category=no
+      wake
+    seamark:restricted_area:category=noise_limit: Tag:seamark:restricted area:category=noise
+      limit
+    seamark:restricted_area:restriction=berthing_prohibited: Tag:seamark:restricted
+      area:restriction=berthing prohibited
+    seamark:restricted_area:restriction=berthing_restricted: Tag:seamark:restricted
+      area:restriction=berthing restricted
+    seamark:restricted_area:restriction=entry_prohibited: Tag:seamark:restricted area:restriction=entry
+      prohibited
+    seamark:restricted_area:restriction=no_anchoring: Tag:seamark:restricted area:restriction=no
+      anchoring
+    seamark:restricted_area:restriction=no_boating: Tag:seamark:restricted area:restriction=no
+      boating
+    seamark:restricted_area:restriction=no_diving: Tag:seamark:restricted area:restriction=no
+      diving
+    seamark:restricted_area:restriction=no_entry: Tag:seamark:restricted area:restriction=no
+      entry
+    seamark:restricted_area:restriction=no_fishing: Tag:seamark:restricted area:restriction=no
+      fishing
+    seamark:restricted_area:restriction=no_wake: Tag:seamark:restricted area:restriction=no
+      wake
+    seamark:restricted_area:restriction=overtaking_prohibited: Tag:seamark:restricted
+      area:restriction=overtaking prohibited
+    seamark:restricted_area:restriction=passing_or_overtaking_prohibited: Tag:seamark:restricted
+      area:restriction=passing or overtaking prohibited
+    seamark:restricted_area:restriction=restricted_fairway_depth: Tag:seamark:restricted
+      area:restriction=restricted fairway depth
+    seamark:restricted_area:restriction=restricted_speed: Tag:seamark:restricted area:restriction=restricted
+      speed
+    seamark:restricted_area:restriction=turning_prohibited: Tag:seamark:restricted
+      area:restriction=turning prohibited
+    seamark:small_craft_facility:category=boat_hoist: Tag:seamark:small craft facility:category=boat
+      hoist
+    seamark:small_craft_facility:category=boatyard: Tag:seamark:small craft facility:category=boatyard
+    seamark:small_craft_facility:category=chandler: Tag:seamark:small craft facility:category=chandler
+    seamark:small_craft_facility:category=electricity: Tag:seamark:small craft facility:category=electricity
+    seamark:small_craft_facility:category=fuel_station: Tag:seamark:small craft facility:category=fuel
+      station
+    seamark:small_craft_facility:category=laundrette: Tag:seamark:small craft facility:category=laundrette
+    seamark:small_craft_facility:category=pump-out: Tag:seamark:small craft facility:category=pump-out
+    seamark:small_craft_facility:category=showers: Tag:seamark:small craft facility:category=showers
+    seamark:small_craft_facility:category=slipway: Tag:seamark:small craft facility:category=slipway
+    seamark:small_craft_facility:category=toilets: Tag:seamark:small craft facility:category=toilets
+    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:topmark:colour=black: Tag:seamark:topmark:colour=black
+    seamark:topmark:colour=green: Tag:seamark:topmark:colour=green
+    seamark:topmark:colour=grey: Tag:seamark:topmark:colour=grey
+    seamark:topmark:colour=orange: Tag:seamark:topmark:colour=orange
+    seamark:topmark:colour=red: Tag:seamark:topmark:colour=red
+    seamark:topmark:colour=white: Tag:seamark:topmark:colour=white
+    seamark:topmark:colour=yellow: Tag:seamark:topmark:colour=yellow
+    seamark:topmark:shape=2_cones_base_together: Tag:seamark:topmark:shape=2 cones
+      base together
+    seamark:topmark:shape=2_cones_down: Tag:seamark:topmark:shape=2 cones down
+    seamark:topmark:shape=2_cones_point_together: Tag:seamark:topmark:shape=2 cones
+      point together
+    seamark:topmark:shape=2_cones_up: Tag:seamark:topmark:shape=2 cones up
+    seamark:topmark:shape=2_spheres: Tag:seamark:topmark:shape=2 spheres
+    seamark:topmark:shape=board: Tag:seamark:topmark:shape=board
+    seamark:topmark:shape=cone: Tag:seamark:topmark:shape=cone
+    seamark:topmark:shape=cone,_point_down: Tag:seamark:topmark:shape=cone, point
+      down
+    seamark:topmark:shape=cone,_point_up: Tag:seamark:topmark:shape=cone, point up
+    seamark:topmark:shape=cylinder: Tag:seamark:topmark:shape=cylinder
+    seamark:topmark:shape=diamond: Tag:seamark:topmark:shape=diamond
+    seamark:topmark:shape=flag: Tag:seamark:topmark:shape=flag
+    seamark:topmark:shape=rectangle: Tag:seamark:topmark:shape=rectangle
+    seamark:topmark:shape=rhombus: Tag:seamark:topmark:shape=rhombus
+    seamark:topmark:shape=sphere: Tag:seamark:topmark:shape=sphere
+    seamark:topmark:shape=square: Tag:seamark:topmark:shape=square
+    seamark:topmark:shape=upright-cross: Tag:seamark:topmark:shape=upright-cross
+    seamark:topmark:shape=x-shape: Tag:seamark:topmark:shape=x-shape
+    seamark=anchorage: Tag:seamark=anchorage
+    seamark=beacon: Tag:seamark=beacon
+    seamark=buoy: Tag:seamark=buoy
+    seamark=lighthouse: Tag:seamark=lighthouse
+    segregated=no: Tag:segregated=no
+    segregated=yes: Tag:segregated=yes
     service=alley: Tag:service=alley
     service=drive-through: Tag:service=drive-through
     service=driveway: Tag:service=driveway
     service=emergency_access: Tag:service=emergency access
     service=parking_aisle: Tag:service=parking aisle
+    service=parts: Tag:service=parts
     service=siding: Tag:service=siding
     service=spur: Tag:service=spur
     service=yard: Tag:service=yard
+    shelter_type=basic_hut: Tag:shelter type=basic hut
+    shelter_type=lean_to: Tag:shelter type=lean to
     shop=SpotColor: Tag:shop=SpotColor
     shop=alcohol: Tag:shop=alcohol
+    shop=anime: Tag:shop=anime
+    shop=antiques: Tag:shop=antiques
     shop=art: Tag:shop=art
+    shop=auto_parts: Tag:shop=auto parts
+    shop=baby_goods: Tag:shop=baby goods
     shop=bakery: Tag:shop=bakery
+    shop=bathroom_furnishing: Tag:shop=bathroom furnishing
     shop=beauty: Tag:shop=beauty
     shop=bed: Tag:shop=bed
+    shop=betting: Tag:shop=betting
     shop=beverages: Tag:shop=beverages
     shop=bicycle: Tag:shop=bicycle
+    shop=bookmaker: Tag:shop=bookmaker
     shop=books: Tag:shop=books
     shop=boutique: Tag:shop=boutique
     shop=butcher: Tag:shop=butcher
+    shop=canoe_hire: Tag:shop=canoe hire
     shop=car: Tag:shop=car
+    shop=car_bodyshop: Tag:shop=car bodyshop
+    shop=car_parts: Tag:shop=car parts
     shop=car_repair: Tag:shop=car repair
-    shop=cell_phones: Tag:shop=cell phones
+    shop=carpet: Tag:shop=carpet
+    shop=chandler: Tag:shop=chandler
     shop=charity: Tag:shop=charity
+    shop=cheese: Tag:shop=cheese
     shop=chemist: Tag:shop=chemist
     shop=clothes: Tag:shop=clothes
-    shop=communication: Tag:shop=communication
     shop=computer: Tag:shop=computer
     shop=confectionery: Tag:shop=confectionery
     shop=convenience: Tag:shop=convenience
     shop=copyshop: Tag:shop=copyshop
     shop=curtain: Tag:shop=curtain
+    shop=dairy: Tag:shop=dairy
     shop=deli: Tag:shop=deli
     shop=department_store: Tag:shop=department store
     shop=dive: Tag:shop=dive
@@ -831,86 +2396,162 @@ en:
     shop=dry_cleaning: Tag:shop=dry cleaning
     shop=electronics: Tag:shop=electronics
     shop=erotic: Tag:shop=erotic
+    shop=estate_agent: Tag:shop=estate agent
     shop=fabric: Tag:shop=fabric
     shop=farm: Tag:shop=farm
+    shop=fashion: Tag:shop=fashion
+    shop=fish: Tag:shop=fish
+    shop=fishmonger: Tag:shop=fishmonger
     shop=florist: Tag:shop=florist
     shop=food: Tag:shop=food
     shop=frame: Tag:shop=frame
     shop=funeral_directors: Tag:shop=funeral directors
     shop=furnace: Tag:shop=furnace
     shop=furniture: Tag:shop=furniture
+    shop=gambling: Tag:shop=gambling
     shop=garden_centre: Tag:shop=garden centre
+    shop=gas: Tag:shop=gas
     shop=general: Tag:shop=general
     shop=gift: Tag:shop=gift
     shop=glaziery: Tag:shop=glaziery
     shop=greengrocer: Tag:shop=greengrocer
     shop=hairdresser: Tag:shop=hairdresser
+    shop=hairdresser_supply: Tag:shop=hairdresser supply
     shop=hardware: Tag:shop=hardware
     shop=hearing_aids: Tag:shop=hearing aids
+    shop=herbalist: Tag:shop=herbalist
     shop=hifi: Tag:shop=hifi
     shop=houseware: Tag:shop=houseware
+    shop=hunting: Tag:shop=hunting
     shop=ice_cream: Tag:shop=ice cream
+    shop=insurance: Tag:shop=insurance
+    shop=interior_decoration: Tag:shop=interior decoration
     shop=jewelry: Tag:shop=jewelry
     shop=kiosk: Tag:shop=kiosk
+    shop=kitchen: Tag:shop=kitchen
     shop=laundry: Tag:shop=laundry
+    shop=leather: Tag:shop=leather
     shop=locksmith: Tag:shop=locksmith
+    shop=lottery: Tag:shop=lottery
     shop=mall: Tag:shop=mall
     shop=massage: Tag:shop=massage
+    shop=medical_supply: Tag:shop=medical supply
+    shop=military_surplus: Tag:shop=military surplus
     shop=mobile_phone: Tag:shop=mobile phone
     shop=money_lender: Tag:shop=money lender
     shop=motorcycle: Tag:shop=motorcycle
     shop=motorcycle_repair: Tag:shop=motorcycle repair
+    shop=music: Tag:shop=music
     shop=musical_instrument: Tag:shop=musical instrument
     shop=newsagent: Tag:shop=newsagent
+    shop=office_supplies: Tag:shop=office supplies
     shop=optician: Tag:shop=optician
     shop=organic: Tag:shop=organic
     shop=outdoor: Tag:shop=outdoor
     shop=paint: Tag:shop=paint
+    shop=pastry: Tag:shop=pastry
     shop=pawnbroker: Tag:shop=pawnbroker
+    shop=perfumery: Tag:shop=perfumery
     shop=pet: Tag:shop=pet
+    shop=photo: Tag:shop=photo
+    shop=printing: Tag:shop=printing
+    shop=radiotechnics: Tag:shop=radiotechnics
+    shop=salon: Tag:shop=salon
+    shop=scuba_diving: Tag:shop=scuba diving
     shop=seafood: Tag:shop=seafood
     shop=second_hand: Tag:shop=second hand
+    shop=ship_chandler: Tag:shop=ship chandler
     shop=shoes: Tag:shop=shoes
+    shop=shopping_centre: Tag:shop=shopping centre
     shop=sports: Tag:shop=sports
     shop=stationery: Tag:shop=stationery
     shop=supermarket: Tag:shop=supermarket
     shop=systembolaget: Tag:shop=systembolaget
     shop=tattoo: Tag:shop=tattoo
+    shop=tea: Tag:shop=tea
+    shop=ticket: Tag:shop=ticket
+    shop=tobacco: Tag:shop=tobacco
     shop=toys: Tag:shop=toys
     shop=trade: Tag:shop=trade
+    shop=travel_agency: Tag:shop=travel agency
+    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=video: Tag:shop=video
+    shop=video_games: Tag:shop=video games
+    shop=window_blind: Tag:shop=window blind
+    shop=windows: Tag:shop=windows
+    shop=wine: Tag:shop=wine
+    shop=winery: Tag:shop=winery
+    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
+    signal_station=international_port_traffic: Tag:signal station=international port
+      traffic
+    signal_station=lock: Tag:signal station=lock
+    signal_station=storm: Tag:signal station=storm
+    signal_station=stream: Tag:signal station=stream
+    signal_station=telegraph: Tag:signal station=telegraph
+    signal_station=tide: Tag:signal station=tide
+    signal_station=tide_gauge: Tag:signal station=tide gauge
+    signal_station=tide_scale: Tag:signal station=tide scale
+    signal_station=time: Tag:signal station=time
+    signal_station=traffic: Tag:signal station=traffic
+    signal_station=weather: Tag:signal station=weather
+    social_facility=assisted_living: Tag:social facility=assisted living
+    social_facility=food_bank: Tag:social facility=food bank
+    social_facility=group_home: Tag:social facility=group home
+    social_facility=outreach: Tag:social facility=outreach
+    social_facility=shelter: Tag:social facility=shelter
     source:ele=barometric: Tag:source:ele=barometric
+    source:maxspeed=implicit: Tag:source:maxspeed=implicit
+    source=Bymiljøetaten: Tag:source=Bymiljøetaten
+    source=DNT_Oslo_og_Omegn: Tag:source=DNT Oslo og Omegn
     source=GURS: Tag:source=GURS
-    source=IBGE: Tag:source=IBGE
+    source=HiRes_aerial_imagery: Tag:source=HiRes aerial imagery
     source=Isle_of_Man_Government_1:25000_map_(2007): Tag:source=Isle of Man Government
       1:25000 map (2007)
     source=Isle_of_Man_Government_aerial_imagery_(2001): Tag:source=Isle of Man Government
       aerial imagery (2001)
+    source=NAIP: Tag:source=NAIP
     sport=10pin: Tag:sport=10pin
     sport=9pin: Tag:sport=9pin
+    sport=aikido: Tag:sport=aikido
     sport=american_football: Tag:sport=american football
     sport=archery: Tag:sport=archery
     sport=athletics: Tag:sport=athletics
     sport=australian_football: Tag:sport=australian football
     sport=badminton: Tag:sport=badminton
+    sport=base: Tag:sport=base
     sport=baseball: Tag:sport=baseball
     sport=basketball: Tag:sport=basketball
     sport=beachvolleyball: Tag:sport=beachvolleyball
+    sport=billards: Tag:sport=billards
+    sport=bmx: Tag:sport=bmx
     sport=boules: Tag:sport=boules
     sport=bowls: Tag:sport=bowls
     sport=canadian_football: Tag:sport=canadian football
     sport=canoe: Tag:sport=canoe
     sport=chess: Tag:sport=chess
+    sport=cliff_diving: Tag:sport=cliff diving
     sport=climbing: Tag:sport=climbing
+    sport=climbing_adventure: Tag:sport=climbing adventure
+    sport=cockfighting: Tag:sport=cockfighting
     sport=cricket: Tag:sport=cricket
     sport=cricket_nets: Tag:sport=cricket nets
     sport=croquet: Tag:sport=croquet
     sport=cycling: Tag:sport=cycling
+    sport=darts: Tag:sport=darts
     sport=diving: Tag:sport=diving
     sport=dog_racing: Tag:sport=dog racing
     sport=equestrian: Tag:sport=equestrian
+    sport=free_flying: Tag:sport=free flying
     sport=gaelic_football: Tag:sport=gaelic football
     sport=gaelic_games: Tag:sport=gaelic games
     sport=golf: Tag:sport=golf
@@ -919,17 +2560,22 @@ en:
     sport=horse_racing: Tag:sport=horse racing
     sport=horseshoes: Tag:sport=horseshoes
     sport=ice_stock: Tag:sport=ice stock
+    sport=kitesurfing: Tag:sport=kitesurfing
     sport=korfball: Tag:sport=korfball
+    sport=model_aerodrome: Tag:sport=model aerodrome
     sport=motor: Tag:sport=motor
     sport=multi: Tag:sport=multi
+    sport=obstacle_course: Tag:sport=obstacle course
     sport=orienteering: Tag:sport=orienteering
     sport=paddle_tennis: Tag:sport=paddle tennis
     sport=paragliding: Tag:sport=paragliding
     sport=pelota: Tag:sport=pelota
     sport=racquet: Tag:sport=racquet
     sport=rowing: Tag:sport=rowing
+    sport=rugby: Tag:sport=rugby
     sport=rugby_league: Tag:sport=rugby league
     sport=rugby_union: Tag:sport=rugby union
+    sport=scuba_diving: Tag:sport=scuba diving
     sport=shooting: Tag:sport=shooting
     sport=skateboard: Tag:sport=skateboard
     sport=skating: Tag:sport=skating
@@ -937,6 +2583,7 @@ en:
     sport=soccer: Tag:sport=soccer
     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=team_handball: Tag:sport=team handball
     sport=tennis: Tag:sport=tennis
@@ -944,6 +2591,12 @@ en:
     sport=volleyball: Tag:sport=volleyball
     sport=water_ski: Tag:sport=water ski
     sub_sea=reef: Tag:sub sea=reef
+    summit:cross=yes: Tag:summit:cross=yes
+    surface=pebbles: Tag:surface=pebbles
+    tidal=mud: Tag:tidal=mud
+    tidal=pebbles: Tag:tidal=pebbles
+    tidal=rocks: Tag:tidal=rocks
+    tidal=sand: Tag:tidal=sand
     tourism=alpine_hut: Tag:tourism=alpine hut
     tourism=aquarium: Tag:tourism=aquarium
     tourism=artwork: Tag:tourism=artwork
@@ -951,6 +2604,7 @@ en:
     tourism=camp_site: Tag:tourism=camp site
     tourism=caravan_site: Tag:tourism=caravan site
     tourism=chalet: Tag:tourism=chalet
+    tourism=gallery: Tag:tourism=gallery
     tourism=guest_house: Tag:tourism=guest house
     tourism=hostel: Tag:tourism=hostel
     tourism=hotel: Tag:tourism=hotel
@@ -960,38 +2614,130 @@ en:
     tourism=picnic_site: Tag:tourism=picnic site
     tourism=theme_park: Tag:tourism=theme park
     tourism=viewpoint: Tag:tourism=viewpoint
+    tourism=wilderness_hut: Tag:tourism=wilderness hut
     tourism=zoo: Tag:tourism=zoo
+    tower:construction=dish: Tag:tower:construction=dish
+    tower:construction=dome: Tag:tower:construction=dome
+    tower:construction=freestanding: Tag:tower:construction=freestanding
+    tower:construction=lattice: Tag:tower:construction=lattice
+    tower:type=lattice: Tag:tower:type=lattice
+    traffic=local: Tag:traffic=local
+    traffic=national: Tag:traffic=national
+    traffic=regional: Tag:traffic=regional
+    traffic=suburban: Tag:traffic=suburban
+    traffic=urban: Tag:traffic=urban
+    traffic_calming=island: Tag:traffic calming=island
     tunnel=culvert: Tag:tunnel=culvert
-    type=site: Tag:type=site
+    type=autopass: Tag:type=autopass
+    type=benchmark: Tag:type=benchmark
+    type=fixed_point: Tag:type=fixed point
+    type=leading_light: Tag:type=leading light
+    type=leading_line: Tag:type=leading line
+    type=observation_spot: Tag:type=observation spot
+    type=public_transport: Tag:type=public transport
+    type=street: Tag:type=street
+    type=triangulation: Tag:type=triangulation
     vending=bicycle_tube: Tag:vending=bicycle tube
+    wall=dry_stone: Tag:wall=dry stone
+    wall=no: Tag:wall=no
+    wall=seawall: Tag:wall=seawall
+    wall=training_wall: Tag:wall=training wall
+    water=intermittent: Tag:water=intermittent
+    water=tidal: Tag:water=tidal
+    waterway=boat_lift: Tag:waterway=boat lift
     waterway=boatyard: Tag:waterway=boatyard
+    waterway=brook: Tag:waterway=brook
     waterway=canal: Tag:waterway=canal
     waterway=dam: Tag:waterway=dam
+    waterway=deep_well: Tag:waterway=deep well
     waterway=derelict_canal: Tag:waterway=derelict canal
+    waterway=ditch: Tag:waterway=ditch
     waterway=dock: Tag:waterway=dock
     waterway=drain: Tag:waterway=drain
+    waterway=dredged_area: Tag:waterway=dredged area
+    waterway=fish_pass: Tag:waterway=fish pass
     waterway=lock_gate: Tag:waterway=lock gate
+    waterway=milestone: Tag:waterway=milestone
+    waterway=offshore_field: Tag:waterway=offshore field
+    waterway=rapids: Tag:waterway=rapids
     waterway=river: Tag:waterway=river
     waterway=riverbank: Tag:waterway=riverbank
     waterway=seaway: Tag:waterway=seaway
     waterway=stream: Tag:waterway=stream
+    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
+    wood=casuarina: Tag:wood=casuarina
+    wood=coniferous: Tag:wood=coniferous
+    wood=deciduous: Tag:wood=deciduous
+    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=petting_zoo: Tag:zoo=petting zoo
 es:
+  key:
+    amenity: ES:Key:amenity
+    highway: ES:Key:highway
+    proposed: ES:Key:proposed
+    stars: ES:Key:stars
+    traffic_calming: ES:Key:traffic calming
   tag:
+    aerialway=cable_car: ES:Tag:aerialway=cable car
+    amenity=atm: ES:Tag:amenity=atm
     amenity=bar: ES:Tag:amenity=bar
+    amenity=bicycle_parking: ES:Tag:amenity=bicycle parking
+    amenity=bicycle_rental: ES:Tag:amenity=bicycle rental
+    amenity=fuel: ES:Tag:amenity=fuel
     amenity=recycling: ES:Tag:amenity=recycling
+    amenity=university: ES:Tag:amenity=university
+    emergency=fire_extinguisher: ES:Tag:emergency=fire extinguisher
     highway=bus_stop: ES:Tag:highway=bus stop
+    highway=escape: ES:Tag:highway=escape
+    highway=living_street: ES:Tag:highway=living street
+    highway=motorway_junction: ES:Tag:highway=motorway junction
+    highway=motorway_link: ES:Tag:highway=motorway link
+    highway=pedestrian: ES:Tag:highway=pedestrian
+    highway=residential: ES:Tag:highway=residential
+    highway=stop: ES:Tag:highway=stop
+    landuse=allotments: ES:Tag:landuse=allotments
+    landuse=industrial: ES:Tag:landuse=industrial
+    leisure=playground: ES:Tag:leisure=playground
+    leisure=water_park: ES:Tag:leisure=water park
+    natural=beach: ES:Tag:natural=beach
+    natural=glacier: ES:Tag:natural=glacier
+    natural=saddle: ES:Tag:natural=saddle
+    natural=tree: ES:Tag:natural=tree
+    natural=water: ES:Tag:natural=water
+    power=pole: ES:Tag:power=pole
+    power=tower: ES:Tag:power=tower
     railway=level_crossing: ES:Tag:railway=level crossing
+    shop=alcohol: ES:Tag:shop=alcohol
+    shop=computer: ES:Tag:shop=computer
+    shop=lottery: ES:Tag:shop=lottery
+    tourism=alpine_hut: ES:Tag:tourism=alpine hut
+    tourism=artwork: ES:Tag:tourism=artwork
+    tourism=camp_site: ES:Tag:tourism=camp site
 et:
   key:
+    addr: Et:Key:addr
+    backrest: Et:Key:backrest
     highway: Et:Key:highway
+  tag:
+    amenity=bench: Et:Tag:amenity=bench
+    amenity=cafe: Et:Tag:amenity=cafe
+    amenity=library: Et:Tag:amenity=library
+    amenity=taxi: Et:Tag:amenity=taxi
+    building=roof: Et:Tag:building=roof
 fi:
   key:
     amenity: Fi:Key:amenity
+    bicycle_parking: Fi:Key:bicycle parking
     bridge: Fi:Key:bridge
     crossing: Fi:Key:crossing
     description: Fi:Key:description
@@ -1004,15 +2750,23 @@ fi:
     leisure: Fi:Key:leisure
     man_made: Fi:Key:man made
     manhole: Fi:Key:manhole
+    maxspeed: Fi:Key:maxspeed
+    mtb:scale: Fi:Key:mtb:scale
+    name: Fi:Key:name
     narrow: Fi:Key:narrow
     natural: Fi:Key:natural
     note: Fi:Key:note
     operator: Fi:Key:operator
-    parking:lane:both: Fi:Key:parking:lane:both
+    parking:lane: Fi:Key:parking:lane
+    priority_road: Fi:Key:priority road
+    pyörä_väistää_aina_autoa: Fi:Key:pyörä väistää aina autoa
     shop: Fi:Key:shop
+    snowmobile: Fi:Key:snowmobile
+    snowplowing: Fi:Key:snowplowing
     surface: Fi:Key:surface
     tracktype: Fi:Key:tracktype
     traffic_calming: Fi:Key:traffic calming
+    traffic_sign: Fi:Key:traffic sign
     tunnel: Fi:Key:tunnel
     waterway: Fi:Key:waterway
     wheelchair: Fi:Key:wheelchair
@@ -1021,6 +2775,8 @@ fi:
     amenity=atm: Fi:Tag:amenity=atm
     amenity=baby_hatch: Fi:Tag:amenity=baby hatch
     amenity=bank: Fi:Tag:amenity=bank
+    amenity=bicycle_parking: Fi:Tag:amenity=bicycle parking
+    amenity=bicycle_rental: Fi:Tag:amenity=bicycle rental
     amenity=bureau_de_change: Fi:Tag:amenity=bureau de change
     amenity=car_rental: Fi:Tag:amenity=car rental
     amenity=car_sharing: Fi:Tag:amenity=car sharing
@@ -1041,11 +2797,17 @@ fi:
     amenity=theatre: Fi:Tag:amenity=theatre
     amenity=townhall: Fi:Tag:amenity=townhall
     amenity=veterinary: Fi:Tag:amenity=veterinary
+    building=garage: Fi:Tag:building=garage
+    building=garages: Fi:Tag:building=garages
+    highway=crossing: Fi:Tag:highway=crossing
+    highway=footway: Fi:Tag:highway=footway
     highway=secondary: Fi:Tag:highway=secondary
+    highway=speed_camera: Fi:Tag:highway=speed camera
     highway=steps: Fi:Tag:highway=steps
     highway=tertiary: Fi:Tag:highway=tertiary
     highway=track: Fi:Tag:highway=track
     highway=unclassified: Fi:Tag:highway=unclassified
+    leisure=dance: Fi:Tag:leisure=dance
     leisure=dog_park: Fi:Tag:leisure=dog park
     leisure=slipway: Fi:Tag:leisure=slipway
     man_made=wastewater_plant: Fi:Tag:man made=wastewater plant
     waterway=stream: Fi:Tag:waterway=stream
 fr:
   key:
+    CEMT: FR:Key:CEMT
+    abutters: FR:Key:abutters
+    access: FR:Key:access
     addr: FR:Key:addr
+    advertising: FR:Key:advertising
+    aeroway: FR:Key:aeroway
     amenity: FR:Key:amenity
+    area: FR:Key:area
     barrier: FR:Key:barrier
+    basin: FR:Key:basin
+    bench: FR:Key:bench
+    bicycle: FR:Key:bicycle
+    bicycle_parking: FR:Key:bicycle parking
+    boat: FR:Key:boat
+    bollard: FR:Key:bollard
+    books: FR:Key:books
     boundary: FR:Key:boundary
     bridge: FR:Key:bridge
     building: FR:Key:building
+    capacity: FR:Key:capacity
+    clothes: FR:Key:clothes
     collection_times: FR:Key:collection times
+    colour: FR:Key:colour
+    comment: FR:Key:comment
+    construction: FR:Key:construction
+    contact: FR:Key:contact
+    covered: FR:Key:covered
+    craft: FR:Key:craft
+    crop: FR:Key:crop
+    crossing: FR:Key:crossing
+    cutting: FR:Key:cutting
     cycleway: FR:Key:cycleway
+    denomination: FR:Key:denomination
+    description: FR:Key:description
+    designation: FR:Key:designation
+    destination: FR:Key:destination
+    diet:*: FR:Key:diet:*
+    dispensing: FR:Key:dispensing
+    distance: FR:Key:distance
+    drink: FR:Key:drink
+    ele: FR:Key:ele
+    email: FR:Key:email
+    embankment: FR:Key:embankment
     enforcement: FR:Key:enforcement
+    entrance: FR:Key:entrance
+    fee: FR:Key:fee
+    fixme: FR:Key:fixme
+    flood_prone: FR:Key:flood prone
+    foot: FR:Key:foot
+    footway: FR:Key:footway
+    generator:method: FR:Key:generator:method
+    generator:output: FR:Key:generator:output
+    generator:output:electricity: FR:Key:generator:output:electricity
+    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:source: FR:Key:generator:source
+    height: FR:Key:height
     highway: FR:Key:highway
+    historic: FR:Key:historic
+    incline: FR:Key:incline
+    information: FR:Key:information
+    intermittent: FR:Key:intermittent
+    junction: FR:Key:junction
     landuse: FR:Key:landuse
     lanes: FR:Key:lanes
     leisure: FR:Key:leisure
+    length: FR:Key:length
+    level: FR:Key:level
+    lit: FR:Key:lit
+    lock: FR:Key:lock
     man_made: FR:Key:man made
+    manufacturer: FR:Key:manufacturer
+    maxage: FR:Key:maxage
+    maxheight: FR:Key:maxheight
+    maxheight:physical: FR:Key:maxheight:physical
+    maxlength: FR:Key:maxlength
+    maxspeed: FR:Key:maxspeed
+    maxstay: FR:Key:maxstay
     maxweight: FR:Key:maxweight
+    maxwidth: FR:Key:maxwidth
+    military: FR:Key:military
+    minage: FR:Key:minage
+    mountain_pass: FR:Key:mountain pass
+    mtb:scale: FR:Key:mtb:scale
     name: FR:Key:name
     natural: FR:Key:natural
+    network: FR:Key:network
     noname: FR:Key:noname
+    note: FR:Key:note
+    office: FR:Key:office
+    oneway: FR:Key:oneway
     opening_hours: FR:Key:opening hours
     operator: FR:Key:operator
     parking: FR:Key:parking
+    parking:lane: FR:Key:parking:lane
+    paved:date: FR:Key:paved:date
+    phone: FR:Key:phone
     place: FR:Key:place
+    place:fr: FR:Key:place:fr
+    post_office:type: FR:Key:post office:type
     power: FR:Key:power
+    power_supply: FR:Key:power supply
+    priority: FR:Key:priority
+    proposed: FR:Key:proposed
+    psv: FR:Key:psv
+    public_transport: FR:Key:public transport
+    railway: FR:Key:railway
+    ref: FR:Key:ref
+    ref:CEF: FR:Key:ref:CEF
+    ref:ERDF:gdo: FR:Key:ref:ERDF:gdo
+    ref:FR:42C: FR:Key:ref:FR:42C
+    ref:FR:FINESS: FR:Key:ref:FR:FINESS
+    ref:INSEE: FR:Key:ref:INSEE
+    ref:UAI: FR:Key:ref:UAI
+    ref:mhs: FR:Key:ref:mhs
+    ref:sandre: FR:Key:ref:sandre
+    religion: FR:Key:religion
+    resource: FR:Key:resource
     sac_scale: FR:Key:sac scale
+    second_hand: FR:Key:second hand
+    segregated: FR:Key:segregated
+    service: FR:Key:service
+    shelter_type: FR:Key:shelter type
     shop: FR:Key:shop
     smoothness: FR:Key:smoothness
+    social_facility: FR:Key:social facility
+    source: FR:Key:source
+    source:maxspeed: FR:Key:source:maxspeed
     sport: FR:Key:sport
     surface: FR:Key:surface
+    surveillance: FR:Key:surveillance
+    tactile_paving: FR:Key:tactile paving
+    takeaway: FR:Key:takeaway
+    timezone: FR:Key:timezone
+    toll: FR:Key:toll
+    tourism: FR:Key:tourism
     tracktype: FR:Key:tracktype
+    traffic_calming: FR:Key:traffic calming
+    traffic_sign: FR:Key:traffic sign
+    trail_visibility: FR:Key:trail visibility
+    tunnel: FR:Key:tunnel
+    turn: FR:Key:turn
+    turning_radius: FR:Key:turning radius
+    type: FR:Key:type
+    url: FR:Key:url
+    voltage: FR:Key:voltage
+    waste: FR:Key:waste
+    water: FR:Key:water
     waterway: FR:Key:waterway
+    website: FR:Key:website
+    wheelchair: FR:Key:wheelchair
+    width: FR:Key:width
+    wikipedia: FR:Key:wikipedia
   tag:
+    FIXME=Position_estimated: FR:Tag:FIXME=Position estimated
+    abandoned=yes: FR:Tag:abandoned=yes
+    access=private: FR:Tag:access=private
+    aerialway=cable_car: FR:Tag:aerialway=cable car
+    aerialway=chair_lift: FR:Tag:aerialway=chair lift
+    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=atm: FR:Tag:amenity=atm
+    amenity=bench: FR:Tag:amenity=bench
     amenity=bicycle_parking: FR:Tag:amenity=bicycle parking
     amenity=bicycle_rental: FR:Tag:amenity=bicycle rental
+    amenity=cafe: FR:Tag:amenity=cafe
+    amenity=car_rental: FR:Tag:amenity=car rental
+    amenity=car_sharing: FR:Tag:amenity=car sharing
     amenity=community_centre: FR:Tag:amenity=community centre
+    amenity=compressed_air: FR:Tag:amenity=compressed air
+    amenity=coworking_space: FR:Tag:amenity=coworking space
+    amenity=crematorium: FR:Tag:amenity=crematorium
+    amenity=crypt: FR:Tag:amenity=crypt
+    amenity=drinking_water: FR:Tag:amenity=drinking water
     amenity=fire_station: FR:Tag:amenity=fire station
+    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=kindergarten: FR:Tag:amenity=kindergarten
     amenity=library: FR:Tag:amenity=library
+    amenity=marketplace: FR:Tag:amenity=marketplace
+    amenity=parking: FR:Tag:amenity=parking
+    amenity=parking_space: FR:Tag:amenity=parking space
     amenity=pharmacy: FR:Tag:amenity=pharmacy
+    amenity=photo_booth: FR:Tag:amenity=photo booth
+    amenity=place_of_worship: FR:Tag:amenity=place of worship
+    amenity=police: FR:Tag:amenity=police
     amenity=recycling: FR:Tag:amenity=recycling
+    amenity=restaurant: FR:Tag:amenity=restaurant
+    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=toilets: FR:Tag:amenity=toilets
     amenity=townhall: FR:Tag:amenity=townhall
+    amenity=university: FR:Tag:amenity=university
+    amenity=veterinary: FR:Tag:amenity=veterinary
+    amenity=waste_basket: FR:Tag:amenity=waste basket
     barrier=bollard: FR:Tag:barrier=bollard
+    barrier=cycle_barrier: FR:Tag:barrier=cycle barrier
     barrier=gate: FR:Tag:barrier=gate
+    barrier=hedge: FR:Tag:barrier=hedge
+    barrier=retaining_wall: FR:Tag:barrier=retaining wall
+    barrier=wall: FR:Tag:barrier=wall
+    building=house: FR:Tag:building=house
+    building=roof: FR:Tag:building=roof
+    craft=beekeeper: FR:Tag:craft=beekeeper
+    craft=car_repair: FR:Tag:craft=car repair
+    cycleway=asl: FR:Tag:cycleway=asl
     cycleway=bike_box: FR:Tag:cycleway=bike box
+    disused=yes: FR:Tag:disused=yes
+    emergency=defibrillator: FR:Tag:emergency=defibrillator
+    emergency=fire_hydrant: FR:Tag:emergency=fire hydrant
+    emergency=phone: FR:Tag:emergency=phone
+    footway=sidewalk: FR:Tag:footway=sidewalk
+    generator:method=combustion: FR:Tag:generator:method=combustion
+    generator:method=fission: FR:Tag:generator:method=fission
+    generator:method=fusion: FR:Tag:generator:method=fusion
+    generator:method=gasification: FR:Tag:generator:method=gasification
+    generator:method=photovoltaic: FR:Tag:generator:method=photovoltaic
+    generator:method=thermal: FR:Tag:generator:method=thermal
+    generator:source=biofuel: FR:Tag:generator:source=biofuel
+    generator:source=biogas: FR:Tag:generator:source=biogas
+    generator:source=biomass: FR:Tag:generator:source=biomass
+    generator:source=coal: FR:Tag:generator:source=coal
+    generator:source=gas: FR:Tag:generator:source=gas
+    generator:source=hydro: FR:Tag:generator:source=hydro
+    generator:source=nuclear: FR:Tag:generator:source=nuclear
+    generator:source=oil: FR:Tag:generator:source=oil
+    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=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=footway: FR:Tag:highway=footway
     highway=give_way: FR:Tag:highway=give way
+    highway=living_street: FR:Tag:highway=living street
+    highway=mini_roundabout: FR:Tag:highway=mini roundabout
     highway=motorway: FR:Tag:highway=motorway
     highway=motorway_link: FR:Tag:highway=motorway link
+    highway=path: FR:Tag:highway=path
+    highway=pedestrian: FR:Tag:highway=pedestrian
+    highway=primary: FR:Tag:highway=primary
+    highway=raceway: FR:Tag:highway=raceway
+    highway=residential: FR:Tag:highway=residential
+    highway=rest_area: FR:Tag:highway=rest area
+    highway=road: FR:Tag:highway=road
+    highway=secondary: FR:Tag:highway=secondary
+    highway=service: FR:Tag:highway=service
+    highway=services: FR:Tag:highway=services
+    highway=steps: FR:Tag:highway=steps
+    highway=stop: FR:Tag:highway=stop
+    highway=tertiary: FR:Tag:highway=tertiary
     highway=track: FR:Tag:highway=track
+    highway=trunk: FR:Tag:highway=trunk
+    highway=turning_circle: FR:Tag:highway=turning circle
+    highway=unclassified: FR:Tag:highway=unclassified
+    historic=battlefield: FR:Tag:historic=battlefield
+    historic=memorial: FR:Tag:historic=memorial
+    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=farm: FR:Tag:landuse=farm
+    landuse=farmland: FR:Tag:landuse=farmland
     landuse=farmyard: FR:Tag:landuse=farmyard
     landuse=forest: FR:Tag:landuse=forest
+    landuse=grass: FR:Tag:landuse=grass
+    landuse=orchard: FR:Tag:landuse=orchard
+    landuse=plant_nursery: FR:Tag:landuse=plant nursery
+    landuse=pond: FR:Tag:landuse=pond
+    landuse=residential: FR:Tag:landuse=residential
+    landuse=salt_pond: FR:Tag:landuse=salt pond
+    landuse=village_green: FR:Tag:landuse=village green
+    leisure=dog_park: FR:Tag:leisure=dog park
+    leisure=golf_course: FR:Tag:leisure=golf course
+    leisure=park: FR:Tag:leisure=park
+    leisure=pitch: FR:Tag:leisure=pitch
     leisure=playground: FR:Tag:leisure=playground
+    leisure=stadium: FR:Tag:leisure=stadium
+    leisure=swimming_pool: FR:Tag:leisure=swimming pool
+    leisure=track: FR:Tag:leisure=track
+    man_made=adit: FR:Tag:man made=adit
     man_made=cutline: FR:Tag:man made=cutline
+    man_made=pier: FR:Tag:man made=pier
     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
+    man_made=wastewater_plant: FR:Tag:man made=wastewater plant
     man_made=water_works: FR:Tag:man made=water works
+    man_made=watermill: FR:Tag:man made=watermill
+    man_made=windmill: FR:Tag:man made=windmill
+    man_made=windpump: FR:Tag:man made=windpump
+    natural=cliff: FR:Tag:natural=cliff
+    natural=spring: FR:Tag:natural=spring
+    natural=stone: FR:Tag:natural=stone
     natural=tree: FR:Tag:natural=tree
+    natural=tree_row: FR:Tag:natural=tree row
     natural=water: FR:Tag:natural=water
+    natural=wetland: FR:Tag:natural=wetland
+    office=estate_agent: FR:Tag:office=estate agent
+    office=ngo: FR:Tag:office=ngo
     place=city: FR:Tag:place=city
     place=hamlet: FR:Tag:place=hamlet
+    place=isolated_dwelling: FR:Tag:place=isolated dwelling
     place=locality: FR:Tag:place=locality
+    place=neighbourhood: FR:Tag:place=neighbourhood
     place=town: FR:Tag:place=town
     place=village: FR:Tag:place=village
     power=generator: FR:Tag:power=generator
+    power=heliostat: FR:Tag:power=heliostat
     power=line: FR:Tag:power=line
+    power=minor_line: FR:Tag:power=minor line
+    power=pole: FR:Tag:power=pole
+    power=station: FR:Tag:power=station
+    power=sub_station: FR:Tag:power=sub station
     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
+    railway=level_crossing: FR:Tag:railway=level crossing
+    railway=rail: FR:Tag:railway=rail
     railway=station: FR:Tag:railway=station
     railway=subway_entrance: FR:Tag:railway=subway entrance
+    route=piste: FR:Tag:route=piste
+    service=alley: FR:Tag:service=alley
+    service=parking_aisle: FR:Tag:service=parking aisle
+    shelter_type=basic_hut: FR:Tag:shelter type=basic hut
+    shop=alcohol: FR:Tag:shop=alcohol
+    shop=anime: FR:Tag:shop=anime
+    shop=baby_goods: FR:Tag:shop=baby goods
     shop=bakery: FR:Tag:shop=bakery
+    shop=bathroom_furnishing: FR:Tag:shop=bathroom furnishing
+    shop=beauty: FR:Tag:shop=beauty
+    shop=bed: FR:Tag:shop=bed
+    shop=beverages: FR:Tag:shop=beverages
+    shop=bicycle: FR:Tag:shop=bicycle
+    shop=books: FR:Tag:shop=books
+    shop=boutique: FR:Tag:shop=boutique
+    shop=butcher: FR:Tag:shop=butcher
+    shop=car: FR:Tag:shop=car
+    shop=car_repair: FR:Tag:shop=car repair
+    shop=carpet: FR:Tag:shop=carpet
+    shop=charity: FR:Tag:shop=charity
+    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=dive: FR:Tag:shop=dive
+    shop=doityourself: FR:Tag:shop=doityourself
+    shop=farm: FR:Tag:shop=farm
+    shop=frame: FR:Tag:shop=frame
+    shop=funeral_directors: FR:Tag:shop=funeral directors
+    shop=furnace: FR:Tag:shop=furnace
+    shop=garden_centre: FR:Tag:shop=garden centre
+    shop=gift: FR:Tag:shop=gift
+    shop=hairdresser: FR:Tag:shop=hairdresser
+    shop=hunting: FR:Tag:shop=hunting
+    shop=kitchen: FR:Tag:shop=kitchen
+    shop=military_surplus: FR:Tag:shop=military surplus
+    shop=newsagent: FR:Tag:shop=newsagent
+    shop=photo: FR:Tag:shop=photo
+    shop=second_hand: FR:Tag:shop=second hand
     shop=supermarket: FR:Tag:shop=supermarket
+    shop=toys: FR:Tag:shop=toys
+    shop=trade: FR:Tag:shop=trade
+    shop=video: FR:Tag:shop=video
+    sport=free_flying: FR:Tag:sport=free flying
+    sport=shooting: FR:Tag:sport=shooting
+    tourism=alpine_hut: FR:Tag:tourism=alpine hut
+    tourism=artwork: FR:Tag:tourism=artwork
+    tourism=camp_site: FR:Tag:tourism=camp site
+    tourism=hostel: FR:Tag:tourism=hostel
+    tourism=hotel: FR:Tag:tourism=hotel
+    tourism=information: FR:Tag:tourism=information
+    tourism=viewpoint: FR:Tag:tourism=viewpoint
+    tunnel=culvert: FR:Tag:tunnel=culvert
+    type=associatedStreet: FR:Tag:type=associatedStreet
+    wall=no: FR:Tag:wall=no
+    waterway=boatyard: FR:Tag:waterway=boatyard
+    waterway=canal: FR:Tag:waterway=canal
+    waterway=lock_gate: FR:Tag:waterway=lock gate
     waterway=river: FR:Tag:waterway=river
     waterway=riverbank: FR:Tag:waterway=riverbank
     waterway=stream: FR:Tag:waterway=stream
-    waterway=weir: FR:Tag:waterway=weir
 hr:
   key:
+    amenity: Hr:Key:amenity
+    historic: Hr:Key:historic
+    leisure: Hr:Key:leisure
+    man_made: Hr:Key:man made
+    military: Hr:Key:military
+    natural: Hr:Key:natural
+    railway: Hr:Key:railway
+    shop: Hr:Key:shop
+    tourism: Hr:Key:tourism
     tracktype: Hr:Key:tracktype
   tag:
     amenity=atm: Hr:Tag:amenity=atm
+    amenity=bank: Hr:Tag:amenity=bank
+ht:
+  key:
+    intermittent: Ht:Key:intermittent
+    pump: Ht:Key:pump
+  tag:
+    landuse=residential: Ht:Tag:landuse=residential
 hu:
   key:
-    aeroway: HU:Key:aeroway
-    shop: HU:Key:shop
-    tourism: HU:Key:tourism
+    amenity: Hu:Key:amenity
+    building: Hu:Key:building
+    jel: Hu:Key:jel
+    office: Hu:Key:office
+    symbol: Hu:Key:symbol
+    wood: Hu:Key:wood
+  tag:
+    boundary=administrative: Hu:Tag:boundary=administrative
 it:
   key:
+    abutters: IT:Key:abutters
+    access: IT:Key:access
+    addr: IT:Key:addr
     aerialway: IT:Key:aerialway
     aeroway: IT:Key:aeroway
     amenity: IT:Key:amenity
     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
+    cables: IT:Key:cables
+    circuits: IT:Key:circuits
     construction: IT:Key:construction
+    craft: IT:Key:craft
     cutting: IT:Key:cutting
     cycleway: IT:Key:cycleway
     denomination: IT:Key:denomination
+    ele: IT:Key:ele
     embankment: IT:Key:embankment
     enforcement: IT:Key:enforcement
+    ford: IT:Key:ford
+    generator:output: IT:Key:generator:output
     geological: IT:Key:geological
     highway: IT:Key:highway
     historic: IT:Key:historic
     incline: IT:Key:incline
+    internet_access: IT:Key:internet access
     junction: IT:Key:junction
     landuse: IT:Key:landuse
+    lanes:psv: IT:Key:lanes:psv
     leisure: IT:Key:leisure
     lock: IT:Key:lock
     man_made: IT:Key:man made
+    maxaxleload: IT:Key:maxaxleload
     maxheight: IT:Key:maxheight
+    maxlength: IT:Key:maxlength
+    maxweight: IT:Key:maxweight
     maxwidth: IT:Key:maxwidth
     military: IT:Key:military
     mooring: IT:Key:mooring
+    mountain_pass: IT:Key:mountain pass
+    mtb:scale: IT:Key:mtb:scale
     name: IT:Key:name
     natural: IT:Key:natural
+    noexit: IT:Key:noexit
+    note: IT:Key:note
+    operator: IT:Key:operator
     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
     proposed: IT:Key:proposed
     railway: IT:Key:railway
     ref: IT:Key:ref
+    ref:vatin: IT:Key:ref:vatin
     religion: IT:Key:religion
     route: IT:Key:route
     sac_scale: IT:Key:sac scale
     service: IT:Key:service
-    shop: IT:Key:shop
+    smoothness: IT:Key:smoothness
     sport: IT:Key:sport
     stop: IT:Key:stop
+    summit:cross: IT:Key:summit:cross
+    surveillance: IT:Key:surveillance
     tourism: IT:Key:tourism
     tracktype: IT:Key:tracktype
     traffic_calming: IT:Key:traffic calming
     trail_visibility: IT:Key:trail visibility
     tunnel: IT:Key:tunnel
     type: IT:Key:type
+    voltage: IT:Key:voltage
     waterway: IT:Key:waterway
     wheelchair: IT:Key:wheelchair
     width: IT:Key:width
+    wires: IT:Key:wires
   tag:
+    amenity=animal_boarding: IT:Tag:amenity=animal boarding
+    amenity=animal_breeding: IT:Tag:amenity=animal breeding
+    amenity=animal_shelter: IT:Tag:amenity=animal shelter
+    amenity=bar: IT:Tag:amenity=bar
     amenity=bicycle_rental: IT:Tag:amenity=bicycle rental
+    amenity=cinema: IT:Tag:amenity=cinema
     amenity=college: IT:Tag:amenity=college
     amenity=fountain: IT:Tag:amenity=fountain
     amenity=fuel: IT:Tag:amenity=fuel
     amenity=hospital: IT:Tag:amenity=hospital
+    amenity=hunting_stand: IT:Tag:amenity=hunting stand
+    amenity=ice_cream: IT:Tag:amenity=ice cream
     amenity=kindergarten: IT:Tag:amenity=kindergarten
+    amenity=milk_dispenser: IT:Tag:amenity=milk dispenser
     amenity=parking: IT:Tag:amenity=parking
     amenity=place_of_worship: IT:Tag:amenity=place of worship
     amenity=police: IT:Tag:amenity=police
     amenity=post_office: IT:Tag:amenity=post office
+    amenity=recycling: IT:Tag:amenity=recycling
     amenity=school: IT:Tag:amenity=school
+    amenity=spa: IT:Tag:amenity=spa
     amenity=university: IT:Tag:amenity=university
     amenity=waste_basket: IT:Tag:amenity=waste basket
+    barrier=ditch: IT:Tag:barrier=ditch
+    barrier=fence: IT:Tag:barrier=fence
     barrier=toll_booth: IT:Tag:barrier=toll booth
+    footway=crossing: IT:Tag:footway=crossing
+    footway=sidewalk: IT:Tag:footway=sidewalk
     geological=palaeontological_site: IT:Tag:geological=palaeontological site
     highway=cycleway: IT:Tag:highway=cycleway
+    highway=footway: IT:Tag:highway=footway
     highway=ford: IT:Tag:highway=ford
     highway=mini_roundabout: IT:Tag:highway=mini roundabout
     highway=motorway: IT:Tag:highway=motorway
     highway=motorway_link: IT:Tag:highway=motorway link
+    highway=path: IT:Tag:highway=path
     highway=pedestrian: IT:Tag:highway=pedestrian
     highway=primary: IT:Tag:highway=primary
     highway=primary_link: IT:Tag:highway=primary link
+    highway=residential: IT:Tag:highway=residential
+    highway=rest_area: IT:Tag:highway=rest area
+    highway=secondary: IT:Tag:highway=secondary
+    highway=services: IT:Tag:highway=services
+    highway=tertiary: IT:Tag:highway=tertiary
+    highway=track: IT:Tag:highway=track
     highway=trunk: IT:Tag:highway=trunk
     highway=trunk_link: IT:Tag:highway=trunk link
     historic=paleontological_site: IT:Tag:historic=paleontological site
+    historic=wayside_shrine: IT:Tag:historic=wayside shrine
     junction=roundabout: IT:Tag:junction=roundabout
     landuse=construction: IT:Tag:landuse=construction
     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
+    natural=grassland: IT:Tag:natural=grassland
+    natural=scree: IT:Tag:natural=scree
+    natural=spring: IT:Tag:natural=spring
+    natural=wetland: IT:Tag:natural=wetland
+    place=village: IT:Tag:place=village
+    power=cable: IT:Tag:power=cable
+    power=cable_distribution_cabinet: IT:Tag:power=cable distribution cabinet
+    power=generator: IT:Tag:power=generator
+    power=line: IT:Tag:power=line
+    power=plant: IT:Tag:power=plant
+    power=pole: IT:Tag:power=pole
+    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
+    route=bus: IT:Tag:route=bus
     shop=butcher: IT:Tag:shop=butcher
     shop=car: IT:Tag:shop=car
     shop=clothes: IT:Tag:shop=clothes
+    shop=confectionery: IT:Tag:shop=confectionery
     shop=florist: IT:Tag:shop=florist
+    shop=greengrocer: IT:Tag:shop=greengrocer
+    shop=hifi: IT:Tag:shop=hifi
+    shop=kiosk: IT:Tag:shop=kiosk
+    shop=mall: IT:Tag:shop=mall
     shop=newsagent: IT:Tag:shop=newsagent
+    shop=tobacco: IT:Tag:shop=tobacco
+    sport=surfing: IT:Tag:sport=surfing
     tourism=artwork: IT:Tag:tourism=artwork
+    waterway=stream: IT:Tag:waterway=stream
 ja:
   key:
-    abutters: JA:Key:abutters
     access: JA:Key:access
+    addr: JA:Key:addr
     aerialway: JA:Key:aerialway
-    aeroway: JA:Key:aeroway
-    amenity: JA:Key:amenity
-    barrier: JA:Key:barrier
-    boundary: JA:Key:boundary
+    area: JA:Key:area
+    books: JA:Key:books
+    brand: JA:Key:brand
     bridge: JA:Key:bridge
     building: JA:Key:building
+    building:material: JA:Key:building:material
+    building:part: JA:Key:building:part
+    building:parts: JA:Key:building:parts
+    capacity: JA:Key:capacity
+    clothes: JA:Key:clothes
+    contact: JA:Key:contact
     crossing: JA:Key:crossing
     cuisine: JA:Key:cuisine
     cycleway: JA:Key:cycleway
+    denomination: JA:Key:denomination
+    description: JA:Key:description
+    diet:*: JA:Key:diet:*
+    disused: JA:Key:disused
+    drive_in: JA:Key:drive in
+    drive_through: JA:Key:drive through
+    easy_overtaking: JA:Key:easy overtaking
     electrified: JA:Key:electrified
+    emergency: JA:Key:emergency
+    end_date: JA:Key:end date
+    fee: JA:Key:fee
     fixme: JA:Key:fixme
     foot: JA:Key:foot
-    highway: JA:Key:highway
-    historic: JA:Key:historic
+    footway: JA:Key:footway
+    furniture: JA:Key:furniture
+    geological: JA:Key:geological
+    hazard_type: JA:Key:hazard type
+    height: JA:Key:height
     incline: JA:Key:incline
-    information: JA:Key:information
-    internet_access: JA:Key:internet access
-    landuse: JA:Key:landuse
     lanes: JA:Key:lanes
-    leisure: JA:Key:leisure
-    man_made: JA:Key:man made
-    military: JA:Key:military
+    level: JA:Key:level
+    lit: JA:Key:lit
+    mountain_pass: JA:Key:mountain pass
     name: JA:Key:name
-    natural: JA:Key:natural
+    note: JA:Key:note
+    oneway: JA:Key:oneway
+    opening_hours: JA:Key:opening hours
     operator: JA:Key:operator
+    overtaking: JA:Key:overtaking
     phone: JA:Key:phone
     power: JA:Key:power
     power_source: JA:Key:power source
-    railway: JA:Key:railway
+    public_transport: JA:Key:public transport
     ref: JA:Key:ref
-    route: JA:Key:route
-    shop: JA:Key:shop
+    religion: JA:Key:religion
+    roof:material: JA:Key:roof:material
+    room: JA:Key:room
+    seamark:fixme: JA:Key:seamark:fixme
+    segregated: JA:Key:segregated
+    social_facility: JA:Key:social facility
+    sport: JA:Key:sport
+    start_date: JA:Key:start date
     step_count: JA:Key:step count
     surface: JA:Key:surface
     tactile_paving: JA:Key:tactile paving
-    tourism: JA:Key:tourism
+    takeaway: JA:Key:takeaway
     tracktype: JA:Key:tracktype
     type: JA:Key:type
-    waterway: JA:Key:waterway
+    url: JA:Key:url
+    website: JA:Key:website
     wheelchair: JA:Key:wheelchair
+    width: JA:Key:width
     wikipedia: JA:Key:wikipedia
+    winter_road: JA:Key:winter road
     wood: JA:Key:wood
   tag:
-    amenity=arts_centre: JA:Tag:amenity=arts centre
+    abandoned=yes: JA:Tag:abandoned=yes
+    access=designated: JA:Tag:access=designated
+    aeroway=apron: JA:Tag:aeroway=apron
+    aeroway=helipad: JA:Tag:aeroway=helipad
+    aeroway=runway: JA:Tag:aeroway=runway
+    aeroway=taxiway: JA:Tag:aeroway=taxiway
     amenity=baby_hatch: JA:Tag:amenity=baby hatch
+    amenity=bank: JA:Tag:amenity=bank
+    amenity=bbq: JA:Tag:amenity=bbq
+    amenity=bench: JA:Tag:amenity=bench
+    amenity=bicycle_parking: JA:Tag:amenity=bicycle parking
+    amenity=bicycle_rental: JA:Tag:amenity=bicycle rental
+    amenity=biergarten: JA:Tag:amenity=biergarten
+    amenity=boat_storage: JA:Tag:amenity=boat storage
+    amenity=brothel: JA:Tag:amenity=brothel
+    amenity=bureau_de_change: JA:Tag:amenity=bureau de change
     amenity=bus_station: JA:Tag:amenity=bus station
-    amenity=cafe: JA:Tag:amenity=cafe
-    amenity=crematorium: JA:Tag:amenity=crematorium
-    amenity=drinking_water: JA:Tag:amenity=drinking water
-    amenity=fast_food: JA:Tag:amenity=fast food
+    amenity=car_rental: JA:Tag:amenity=car rental
+    amenity=car_wash: JA:Tag:amenity=car wash
+    amenity=clock: JA:Tag:amenity=clock
+    amenity=college: JA:Tag:amenity=college
+    amenity=courthouse: JA:Tag:amenity=courthouse
+    amenity=dentist: JA:Tag:amenity=dentist
+    amenity=embassy: JA:Tag:amenity=embassy
+    amenity=ferry_terminal: JA:Tag:amenity=ferry terminal
     amenity=fire_station: JA:Tag:amenity=fire station
+    amenity=food_court: JA:Tag:amenity=food court
+    amenity=fountain: JA:Tag:amenity=fountain
+    amenity=grave_yard: JA:Tag:amenity=grave yard
+    amenity=hunting_stand: JA:Tag:amenity=hunting stand
+    amenity=kindergarten: JA:Tag:amenity=kindergarten
+    amenity=library: JA:Tag:amenity=library
+    amenity=nightclub: JA:Tag:amenity=nightclub
+    amenity=nursing_home: JA:Tag:amenity=nursing home
     amenity=parking: JA:Tag:amenity=parking
-    amenity=place_of_worship: JA:Tag:amenity=place of worship
-    amenity=pub: JA:Tag:amenity=pub
+    amenity=parking_entrance: JA:Tag:amenity=parking entrance
+    amenity=parking_space: JA:Tag:amenity=parking space
+    amenity=pharmacy: JA:Tag:amenity=pharmacy
+    amenity=police: JA:Tag:amenity=police
+    amenity=post_box: JA:Tag:amenity=post box
+    amenity=post_office: JA:Tag:amenity=post office
+    amenity=recycling: JA:Tag:amenity=recycling
     amenity=restaurant: JA:Tag:amenity=restaurant
-    amenity=toilets: JA:Tag:amenity=toilets
-    amenity=vending_machine: JA:Tag:amenity=vending machine
-    amenity=veterinary: JA:Tag:amenity=veterinary
+    amenity=sauna: JA:Tag:amenity=sauna
+    amenity=shelter: JA:Tag:amenity=shelter
+    amenity=social_centre: JA:Tag:amenity=social centre
+    amenity=stripclub: JA:Tag:amenity=stripclub
+    amenity=studio: JA:Tag:amenity=studio
+    amenity=taxi: JA:Tag:amenity=taxi
+    amenity=university: JA:Tag:amenity=university
+    amenity=waste_basket: JA:Tag:amenity=waste basket
+    amenity=waste_disposal: JA:Tag:amenity=waste disposal
+    amenity=watering_place: JA:Tag:amenity=watering place
+    atm=yes: JA:Tag:atm=yes
+    barrier=bollard: JA:Tag:barrier=bollard
+    barrier=fence: JA:Tag:barrier=fence
     barrier=lift_gate: JA:Tag:barrier=lift gate
+    barrier=toll_booth: JA:Tag:barrier=toll booth
+    boundary=administrative: JA:Tag:boundary=administrative
+    boundary=national_park: JA:Tag:boundary=national park
+    boundary=protected_area: JA:Tag:boundary=protected area
+    bridge=viaduct: JA:Tag:bridge=viaduct
+    craft=brewery: JA:Tag:craft=brewery
+    emergency=fire_extinguisher: JA:Tag:emergency=fire extinguisher
+    emergency=fire_hydrant: JA:Tag:emergency=fire hydrant
     highway=crossing: JA:Tag:highway=crossing
-    highway=footway: JA:Tag:highway=footway
-    highway=pedestrian: JA:Tag:highway=pedestrian
+    highway=cycleway: JA:Tag:highway=cycleway
+    highway=motorway_link: JA:Tag:highway=motorway link
+    highway=path: JA:Tag:highway=path
     highway=residential: JA:Tag:highway=residential
-    highway=steps: JA:Tag:highway=steps
+    highway=rest_area: JA:Tag:highway=rest area
+    highway=road: JA:Tag:highway=road
+    highway=secondary: JA:Tag:highway=secondary
+    highway=services: JA:Tag:highway=services
+    highway=tertiary: JA:Tag:highway=tertiary
     highway=track: JA:Tag:highway=track
     highway=traffic_signals: JA:Tag:highway=traffic signals
+    highway=trunk: JA:Tag:highway=trunk
+    highway=unclassified: JA:Tag:highway=unclassified
     historic=archaeological_site: JA:Tag:historic=archaeological site
+    historic=battlefield: JA:Tag:historic=battlefield
+    historic=boundary_stone: JA:Tag:historic=boundary stone
+    historic=monument: JA:Tag:historic=monument
+    information=guidepost: JA:Tag:information=guidepost
+    landuse=allotments: JA:Tag:landuse=allotments
+    landuse=basin: JA:Tag:landuse=basin
+    landuse=brownfield: JA:Tag:landuse=brownfield
+    landuse=cemetery: JA:Tag:landuse=cemetery
+    landuse=commercial: JA:Tag:landuse=commercial
+    landuse=construction: JA:Tag:landuse=construction
+    landuse=farmyard: JA:Tag:landuse=farmyard
     landuse=forest: JA:Tag:landuse=forest
     landuse=garages: JA:Tag:landuse=garages
+    landuse=grass: JA:Tag:landuse=grass
+    landuse=greenfield: JA:Tag:landuse=greenfield
+    landuse=industrial: JA:Tag:landuse=industrial
+    landuse=landfill: JA:Tag:landuse=landfill
+    landuse=meadow: JA:Tag:landuse=meadow
+    landuse=military: JA:Tag:landuse=military
+    landuse=orchard: JA:Tag:landuse=orchard
+    landuse=plant_nursery: JA:Tag:landuse=plant nursery
+    landuse=quarry: JA:Tag:landuse=quarry
+    landuse=railway: JA:Tag:landuse=railway
+    landuse=recreation_ground: JA:Tag:landuse=recreation ground
+    landuse=reservoir: JA:Tag:landuse=reservoir
+    landuse=residential: JA:Tag:landuse=residential
+    landuse=retail: JA:Tag:landuse=retail
+    landuse=salt_pond: JA:Tag:landuse=salt pond
+    landuse=village_green: JA:Tag:landuse=village green
     landuse=wood: JA:Tag:landuse=wood
+    leisure=beach_resort: JA:Tag:leisure=beach resort
+    leisure=bird_hide: JA:Tag:leisure=bird hide
+    leisure=dance: JA:Tag:leisure=dance
     leisure=dog_park: JA:Tag:leisure=dog park
-    leisure=ice_rink: JA:Tag:leisure=ice rink
+    leisure=garden: JA:Tag:leisure=garden
+    leisure=golf_course: JA:Tag:leisure=golf course
+    leisure=marina: JA:Tag:leisure=marina
+    leisure=miniature_golf: JA:Tag:leisure=miniature golf
+    leisure=nature_reserve: JA:Tag:leisure=nature reserve
+    leisure=playground: JA:Tag:leisure=playground
+    leisure=slipway: JA:Tag:leisure=slipway
+    leisure=sports_centre: JA:Tag:leisure=sports centre
+    leisure=swimming_pool: JA:Tag:leisure=swimming pool
+    leisure=track: JA:Tag:leisure=track
+    man_made=adit: JA:Tag:man made=adit
+    man_made=breakwater: JA:Tag:man made=breakwater
+    man_made=crane: JA:Tag:man made=crane
+    man_made=cutline: JA:Tag:man made=cutline
+    man_made=flagpole: JA:Tag:man made=flagpole
+    man_made=groyne: JA:Tag:man made=groyne
+    man_made=kiln: JA:Tag:man made=kiln
     man_made=lighthouse: JA:Tag:man made=lighthouse
-    natural=coastline: JA:Tag:natural=coastline
+    man_made=mineshaft: JA:Tag:man made=mineshaft
+    man_made=pier: JA:Tag:man made=pier
+    man_made=tower: JA:Tag:man made=tower
+    man_made=water_well: JA:Tag:man made=water well
+    man_made=works: JA:Tag:man made=works
+    natural=heath: JA:Tag:natural=heath
+    natural=scree: JA:Tag:natural=scree
+    natural=tree_row: JA:Tag:natural=tree row
     natural=wood: JA:Tag:natural=wood
+    place=island: JA:Tag:place=island
+    place=islet: JA:Tag:place=islet
+    place=neighbourhood: JA:Tag:place=neighbourhood
+    place=suburb: JA:Tag:place=suburb
     power=generator: JA:Tag:power=generator
+    public_transport=platform: JA:Tag:public transport=platform
     railway=crossing: JA:Tag:railway=crossing
     railway=level_crossing: JA:Tag:railway=level crossing
     railway=rail: JA:Tag:railway=rail
-    railway=station: JA:Tag:railway=station
+    railway=tram: JA:Tag:railway=tram
+    route=road: JA:Tag:route=road
+    service=parking_aisle: JA:Tag:service=parking aisle
+    shop=alcohol: JA:Tag:shop=alcohol
+    shop=art: JA:Tag:shop=art
+    shop=bakery: JA:Tag:shop=bakery
+    shop=beauty: JA:Tag:shop=beauty
+    shop=bicycle: JA:Tag:shop=bicycle
+    shop=books: JA:Tag:shop=books
+    shop=boutique: JA:Tag:shop=boutique
+    shop=charity: JA:Tag:shop=charity
+    shop=chemist: JA:Tag:shop=chemist
+    shop=clothes: JA:Tag:shop=clothes
+    shop=confectionery: JA:Tag:shop=confectionery
+    shop=convenience: JA:Tag:shop=convenience
+    shop=deli: JA:Tag:shop=deli
+    shop=department_store: JA:Tag:shop=department store
     shop=doityourself: JA:Tag:shop=doityourself
-    shop=garden_centre: JA:Tag:shop=garden centre
-    shop=gift: JA:Tag:shop=gift
+    shop=florist: JA:Tag:shop=florist
+    shop=general: JA:Tag:shop=general
+    shop=hairdresser: JA:Tag:shop=hairdresser
     shop=motorcycle: JA:Tag:shop=motorcycle
-    shop=outdoor: JA:Tag:shop=outdoor
-    tourism=hostel: JA:Tag:tourism=hostel
+    shop=pet: JA:Tag:shop=pet
+    shop=second_hand: JA:Tag:shop=second hand
+    shop=supermarket: JA:Tag:shop=supermarket
+    shop=tobacco: JA:Tag:shop=tobacco
     tourism=hotel: JA:Tag:tourism=hotel
-    tourism=information: JA:Tag:tourism=information
-    tourism=viewpoint: JA:Tag:tourism=viewpoint
-    waterway=riverbank: JA:Tag:waterway=riverbank
+    tourism=museum: JA:Tag:tourism=museum
+    tourism=picnic_site: JA:Tag:tourism=picnic site
+    waterway=dam: JA:Tag:waterway=dam
+    waterway=ditch: JA:Tag:waterway=ditch
+    waterway=drain: JA:Tag:waterway=drain
     waterway=water_point: JA:Tag:waterway=water point
+    waterway=weir: JA:Tag:waterway=weir
+ko:
+  key:
+    ele: Ko:Key:ele
+    wikipedia: Ko:Key:wikipedia
+  tag:
+    craft=tailor: Ko:Tag:craft=tailor
+    shop=garden_centre: Ko:Tag:shop=garden centre
+    shop=gift: Ko:Tag:shop=gift
 nl:
   key:
-    cycleway: NL:Key:cycleway
+    AND_nosr_r: NL:Key:AND nosr r
+    crossing: NL:Key:crossing
+    scenic: NL:Key:scenic
+    wheelchair: NL:Key:wheelchair
   tag:
-    highway=motorway: NL:Tag:highway=motorway
-    landuse=industrial: NL:Tag:landuse=industrial
-    shop=car: NL:Tag:shop=car
-    zoo=petting_zoo: NL:Tag:zoo=petting zoo
+    amenity=post_office: NL:Tag:amenity=post office
+    highway=footway: NL:Tag:highway=footway
+    highway=path: NL:Tag:highway=path
+    man_made=windmill: NL:Tag:man made=windmill
 no:
   key:
     amenity: No:Key:amenity
     boundary: No:Key:boundary
+    building: No:Key:building
     fenced: No:Key:fenced
     maxheight:legal: No:Key:maxheight:legal
     maxheight:marine: No:Key:maxheight:marine
     maxheight:physical: No:Key:maxheight:physical
   tag:
     amenity=bank: No:Tag:amenity=bank
+    amenity=fuel: No:Tag:amenity=fuel
     amenity=marketplace: No:Tag:amenity=marketplace
     amenity=pharmacy: No:Tag:amenity=pharmacy
     amenity=place_of_worship: No:Tag:amenity=place of worship
     boundary=maritime: No:Tag:boundary=maritime
 pl:
   key:
+    abutters: Pl:Key:abutters
+    access: Pl:Key:access
+    addr: Pl:Key:addr
+    addr:flats: Pl:Key:addr:flats
+    addr:place: Pl:Key:addr:place
+    addr:suburb: Pl:Key:addr:suburb
+    aerialway: Pl:Key:aerialway
+    aeroway: Pl:Key:aeroway
+    amenity: Pl:Key:amenity
+    area: Pl:Key:area
+    automatic_door: Pl:Key:automatic door
+    backrest: Pl:Key:backrest
+    bar: Pl:Key:bar
+    barrier: Pl:Key:barrier
+    bench: Pl:Key:bench
+    bicycle: Pl:Key:bicycle
+    bicycle_parking: Pl:Key:bicycle parking
+    bicycle_road: Pl:Key:bicycle road
+    bollard: Pl:Key:bollard
+    border_type: Pl:Key:border type
+    boundary: Pl:Key:boundary
+    brand: Pl:Key:brand
+    bridge: Pl:Key:bridge
+    building: Pl:Key:building
+    building:cullis:height: Pl:Key:building:cullis:height
+    building:levels: Pl:Key:building:levels
+    building:material: Pl:Key:building:material
+    building:min_level: Pl:Key:building:min level
+    building:part: Pl:Key:building:part
+    bunker_type: Pl:Key:bunker type
+    busway: Pl:Key:busway
+    capacity: Pl:Key:capacity
+    circumference: Pl:Key:circumference
+    colour: Pl:Key:colour
+    comment: Pl:Key:comment
+    construction: Pl:Key:construction
+    contact: Pl:Key:contact
+    covered: Pl:Key:covered
+    crop: Pl:Key:crop
+    crossing: Pl:Key:crossing
+    cutting: Pl:Key:cutting
+    deanery: Pl:Key:deanery
+    denomination: Pl:Key:denomination
+    denotation: Pl:Key:denotation
+    designation: Pl:Key:designation
+    destination: Pl:Key:destination
+    diocese: Pl:Key:diocese
+    ele: Pl:Key:ele
+    embankment: Pl:Key:embankment
+    emergency: Pl:Key:emergency
+    entrance: Pl:Key:entrance
+    fee: Pl:Key:fee
+    fixme: Pl:Key:fixme
+    foot: Pl:Key:foot
+    footway: Pl:Key:footway
+    generator:output: Pl:Key:generator:output
     height: Pl:Key:height
+    highway: Pl:Key:highway
+    historic: Pl:Key:historic
+    information: Pl:Key:information
+    inscription: Pl:Key:inscription
+    intermittent: Pl:Key:intermittent
+    is_in: Pl:Key:is in
+    junction: Pl:Key:junction
+    kerb: Pl:Key:kerb
+    landuse: Pl:Key:landuse
+    lanes: Pl:Key:lanes
+    lanes:psv: Pl:Key:lanes:psv
+    leisure: Pl:Key:leisure
+    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
+    maxheight: Pl:Key:maxheight
+    maxspeed: Pl:Key:maxspeed
+    maxstay: Pl:Key:maxstay
+    mooring: Pl:Key:mooring
+    name: Pl:Key:name
+    natural: Pl:Key:natural
+    noexit: Pl:Key:noexit
+    note: Pl:Key:note
+    office: Pl:Key:office
     oneway: Pl:Key:oneway
+    opening_hours: Pl:Key:opening hours
+    operator: Pl:Key:operator
+    overtaking: Pl:Key:overtaking
+    owner: Pl:Key:owner
+    ownership: Pl:Key:ownership
+    parking: Pl:Key:parking
+    parking:lane: Pl:Key:parking:lane
+    place: Pl:Key:place
+    place_name: Pl:Key:place name
+    power: Pl:Key:power
+    psv: Pl:Key:psv
+    public_transport: Pl:Key:public transport
+    railway: Pl:Key:railway
+    railway:area: Pl:Key:railway:area
+    ramp: Pl:Key:ramp
+    recycling_type: Pl:Key:recycling type
+    religion: Pl:Key:religion
+    roof:material: Pl:Key:roof:material
+    route: Pl:Key:route
+    route_master: Pl:Key:route master
+    sac_scale: Pl:Key:sac scale
+    seamark:fixme: Pl:Key:seamark:fixme
+    service: Pl:Key:service
+    service_times: Pl:Key:service times
+    shop: Pl:Key:shop
+    sidewalk: Pl:Key:sidewalk
+    step_count: Pl:Key:step count
+    surface: Pl:Key:surface
+    surveillance: Pl:Key:surveillance
+    surveillance:type: Pl:Key:surveillance:type
+    surveillance:zone: Pl:Key:surveillance:zone
+    tomb: Pl:Key:tomb
+    tourism: Pl:Key:tourism
+    tracktype: Pl:Key:tracktype
+    traffic_calming: Pl:Key:traffic calming
+    turn: Pl:Key:turn
+    type: Pl:Key:type
+    url: Pl:Key:url
+    usage: Pl:Key:usage
+    voltage: Pl:Key:voltage
+    waterway: Pl:Key:waterway
+    website: Pl:Key:website
+    wheelchair: Pl:Key:wheelchair
+    wikipedia: Pl:Key:wikipedia
+    wood: Pl:Key:wood
+    zoo: Pl:Key:zoo
+  tag:
+    access=designated: Pl:Tag:access=designated
+    access=official: Pl:Tag:access=official
+    access=private: Pl:Tag:access=private
+    aeroway=hangar: Pl:Tag:aeroway=hangar
+    amenity=atm: Pl:Tag:amenity=atm
+    amenity=baby_hatch: Pl:Tag:amenity=baby hatch
+    amenity=bank: Pl:Tag:amenity=bank
+    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=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=ferry_terminal: Pl:Tag:amenity=ferry terminal
+    amenity=fire_station: Pl:Tag:amenity=fire station
+    amenity=fuel: Pl:Tag:amenity=fuel
+    amenity=grave_yard: Pl:Tag:amenity=grave yard
+    amenity=parking: Pl:Tag:amenity=parking
+    amenity=parking_entrance: Pl:Tag:amenity=parking entrance
+    amenity=parking_space: Pl:Tag:amenity=parking space
+    amenity=pharmacy: Pl:Tag:amenity=pharmacy
+    amenity=place_of_worship: Pl:Tag:amenity=place of worship
+    amenity=post_box: Pl:Tag:amenity=post box
+    amenity=post_office: Pl:Tag:amenity=post office
+    amenity=recycling: Pl:Tag:amenity=recycling
+    amenity=school: Pl:Tag:amenity=school
+    amenity=taxi: Pl:Tag:amenity=taxi
+    amenity=vending_machine: Pl:Tag:amenity=vending machine
+    amenity=waste_disposal: Pl:Tag:amenity=waste disposal
+    atm=yes: Pl:Tag:atm=yes
+    barrier=block: Pl:Tag:barrier=block
+    barrier=bollard: Pl:Tag:barrier=bollard
+    barrier=bus_trap: Pl:Tag:barrier=bus trap
+    barrier=cattle_grid: Pl:Tag:barrier=cattle grid
+    barrier=chain: Pl:Tag:barrier=chain
+    barrier=city_wall: Pl:Tag:barrier=city wall
+    barrier=cycle_barrier: Pl:Tag:barrier=cycle barrier
+    barrier=ditch: Pl:Tag:barrier=ditch
+    barrier=entrance: Pl:Tag:barrier=entrance
+    barrier=fence: Pl:Tag:barrier=fence
+    barrier=gate: Pl:Tag:barrier=gate
+    barrier=guard_rail: Pl:Tag:barrier=guard rail
+    barrier=hedge: Pl:Tag:barrier=hedge
+    barrier=kerb: Pl:Tag:barrier=kerb
+    barrier=lift_gate: Pl:Tag:barrier=lift gate
+    barrier=retaining_wall: Pl:Tag:barrier=retaining wall
+    barrier=toll_booth: Pl:Tag:barrier=toll booth
+    barrier=turnstile: Pl:Tag:barrier=turnstile
+    barrier=wall: Pl:Tag:barrier=wall
+    boundary=administrative: Pl:Tag:boundary=administrative
+    boundary=religious_administration: Pl:Tag:boundary=religious administration
+    building=apartments: Pl:Tag:building=apartments
+    building=barn: Pl:Tag:building=barn
+    building=bridge: Pl:Tag:building=bridge
+    building=bunker: Pl:Tag:building=bunker
+    building=cabin: Pl:Tag:building=cabin
+    building=chapel: Pl:Tag:building=chapel
+    building=church: Pl:Tag:building=church
+    building=civic: Pl:Tag:building=civic
+    building=commercial: Pl:Tag:building=commercial
+    building=construction: Pl:Tag:building=construction
+    building=detached: Pl:Tag:building=detached
+    building=dormitory: Pl:Tag:building=dormitory
+    building=farm_auxiliary: Pl:Tag:building=farm auxiliary
+    building=garage: Pl:Tag:building=garage
+    building=garages: Pl:Tag:building=garages
+    building=greenhouse: Pl:Tag:building=greenhouse
+    building=hangar: Pl:Tag:building=hangar
+    building=hospital: Pl:Tag:building=hospital
+    building=hotel: Pl:Tag:building=hotel
+    building=house: Pl:Tag:building=house
+    building=hut: Pl:Tag:building=hut
+    building=industrial: Pl:Tag:building=industrial
+    building=manufacture: Pl:Tag:building=manufacture
+    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=school: Pl:Tag:building=school
+    building=shed: Pl:Tag:building=shed
+    building=supermarket: Pl:Tag:building=supermarket
+    building=terrace: Pl:Tag:building=terrace
+    building=train_station: Pl:Tag:building=train station
+    building=transportation: Pl:Tag:building=transportation
+    building=university: Pl:Tag:building=university
+    building=warehouse: Pl:Tag:building=warehouse
+    emergency=defibrillator: Pl:Tag:emergency=defibrillator
+    emergency=fire_extinguisher: Pl:Tag:emergency=fire extinguisher
+    emergency=fire_flapper: Pl:Tag:emergency=fire flapper
+    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=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
+    highway=bridleway: Pl:Tag:highway=bridleway
+    highway=bus_stop: Pl:Tag:highway=bus stop
+    highway=crossing: Pl:Tag:highway=crossing
+    highway=cycleway: Pl:Tag:highway=cycleway
+    highway=footway: Pl:Tag:highway=footway
+    highway=give_way: Pl:Tag:highway=give way
+    highway=living_street: Pl:Tag:highway=living street
+    highway=milestone: Pl:Tag:highway=milestone
+    highway=motorway: Pl:Tag:highway=motorway
+    highway=path: Pl:Tag:highway=path
+    highway=pedestrian: Pl:Tag:highway=pedestrian
+    highway=primary: Pl:Tag:highway=primary
+    highway=proposed: Pl:Tag:highway=proposed
+    highway=raceway: Pl:Tag:highway=raceway
+    highway=residential: Pl:Tag:highway=residential
+    highway=road: Pl:Tag:highway=road
+    highway=secondary: Pl:Tag:highway=secondary
+    highway=service: Pl:Tag:highway=service
+    highway=speed_camera: Pl:Tag:highway=speed camera
+    highway=street_lamp: Pl:Tag:highway=street lamp
+    highway=tertiary: Pl:Tag:highway=tertiary
+    highway=track: Pl:Tag:highway=track
+    highway=trunk: Pl:Tag:highway=trunk
+    highway=unclassified: Pl:Tag:highway=unclassified
+    historic=battlefield: Pl:Tag:historic=battlefield
+    historic=city_gate: Pl:Tag:historic=city gate
+    historic=memorial: Pl:Tag:historic=memorial
+    historic=monument: Pl:Tag:historic=monument
+    historic=ruins: Pl:Tag:historic=ruins
+    historic=tomb: Pl:Tag:historic=tomb
+    historic=wayside_shrine: Pl:Tag:historic=wayside shrine
+    information=guidepost: Pl:Tag:information=guidepost
+    junction=roundabout: Pl:Tag:junction=roundabout
+    landuse=allotments: Pl:Tag:landuse=allotments
+    landuse=brownfield: Pl:Tag:landuse=brownfield
+    landuse=cemetery: Pl:Tag:landuse=cemetery
+    landuse=farm: Pl:Tag:landuse=farm
+    landuse=farmyard: Pl:Tag:landuse=farmyard
+    landuse=forest: Pl:Tag:landuse=forest
+    landuse=greenhouse_horticulture: Pl:Tag:landuse=greenhouse horticulture
+    landuse=landfill: Pl:Tag:landuse=landfill
+    landuse=meadow: Pl:Tag:landuse=meadow
+    landuse=plant_nursery: Pl:Tag:landuse=plant nursery
+    landuse=quarry: Pl:Tag:landuse=quarry
+    landuse=railway: Pl:Tag:landuse=railway
+    landuse=religious: Pl:Tag:landuse=religious
+    leisure=firepit: Pl:Tag:leisure=firepit
+    leisure=fishing: Pl:Tag:leisure=fishing
+    man_made=cross: Pl:Tag:man made=cross
+    man_made=cutline: Pl:Tag:man made=cutline
+    man_made=dyke: Pl:Tag:man made=dyke
+    man_made=embankment: Pl:Tag:man made=embankment
+    man_made=surveillance: Pl:Tag:man made=surveillance
+    man_made=tower: Pl:Tag:man made=tower
+    man_made=watermill: Pl:Tag:man made=watermill
+    man_made=windmill: Pl:Tag:man made=windmill
+    mooring=ferry: Pl:Tag:mooring=ferry
+    natural=bay: Pl:Tag:natural=bay
+    natural=cave_entrance: Pl:Tag:natural=cave entrance
+    natural=grassland: Pl:Tag:natural=grassland
+    natural=heath: Pl:Tag:natural=heath
+    natural=scrub: Pl:Tag:natural=scrub
+    natural=sinkhole: Pl:Tag:natural=sinkhole
+    natural=tree: Pl:Tag:natural=tree
+    natural=tree_row: Pl:Tag:natural=tree row
+    natural=wetland: Pl:Tag:natural=wetland
+    natural=wood: Pl:Tag:natural=wood
+    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=suburb: Pl:Tag:place=suburb
+    place=town: Pl:Tag:place=town
+    place=village: Pl:Tag:place=village
+    power=generator: Pl:Tag:power=generator
+    power=line: Pl:Tag:power=line
+    power=minor_line: Pl:Tag:power=minor line
+    power=pole: Pl:Tag:power=pole
+    power=sub_station: Pl:Tag:power=sub station
+    power=tower: Pl:Tag:power=tower
+    power=transformer: Pl:Tag:power=transformer
+    public_transport=platform: Pl:Tag:public transport=platform
+    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=crossing: Pl:Tag:railway=crossing
+    railway=crossing_controller: Pl:Tag:railway=crossing controller
+    railway=level_crossing: Pl:Tag:railway=level crossing
+    service=alley: Pl:Tag:service=alley
+    service=drive-through: Pl:Tag:service=drive-through
+    service=driveway: Pl:Tag:service=driveway
+    service=emergency_access: Pl:Tag:service=emergency access
+    service=parking_aisle: Pl:Tag:service=parking aisle
+    service=parts: Pl:Tag:service=parts
+    service=siding: Pl:Tag:service=siding
+    service=spur: Pl:Tag:service=spur
+    service=yard: Pl:Tag:service=yard
+    shop=baby_goods: Pl:Tag:shop=baby goods
+    shop=bicycle: Pl:Tag:shop=bicycle
+    shop=funeral_directors: Pl:Tag:shop=funeral directors
+    sport=aikido: Pl:Tag:sport=aikido
+    tourism=artwork: Pl:Tag:tourism=artwork
+    tourism=camp_site: Pl:Tag:tourism=camp site
+    tourism=caravan_site: Pl:Tag:tourism=caravan site
+    tourism=chalet: Pl:Tag:tourism=chalet
+    tourism=guest_house: Pl:Tag:tourism=guest house
+    tourism=hostel: Pl:Tag:tourism=hostel
+    tourism=hotel: Pl:Tag:tourism=hotel
+    tourism=information: Pl:Tag:tourism=information
+    tourism=motel: Pl:Tag:tourism=motel
+    tourism=museum: Pl:Tag:tourism=museum
+    tourism=picnic_site: Pl:Tag:tourism=picnic site
+    tourism=theme_park: Pl:Tag:tourism=theme park
+    tourism=viewpoint: Pl:Tag:tourism=viewpoint
+    tourism=wilderness_hut: Pl:Tag:tourism=wilderness hut
+    tourism=zoo: Pl:Tag:tourism=zoo
+    tunnel=culvert: Pl:Tag:tunnel=culvert
+    type=public_transport: Pl:Tag:type=public transport
+    waterway=boatyard: Pl:Tag:waterway=boatyard
+    waterway=canal: Pl:Tag:waterway=canal
+    waterway=dam: Pl:Tag:waterway=dam
+    waterway=ditch: Pl:Tag:waterway=ditch
+    waterway=drain: Pl:Tag:waterway=drain
+    waterway=fish_pass: Pl:Tag:waterway=fish pass
+    waterway=lock_gate: Pl:Tag:waterway=lock gate
+    waterway=river: Pl:Tag:waterway=river
+    waterway=riverbank: Pl:Tag:waterway=riverbank
+    waterway=stream: Pl:Tag:waterway=stream
+    waterway=weir: Pl:Tag:waterway=weir
+    wood=coniferous: Pl:Tag:wood=coniferous
+    wood=deciduous: Pl:Tag:wood=deciduous
+    wood=evergreen: Pl:Tag:wood=evergreen
+    wood=mixed: Pl:Tag:wood=mixed
+pt:
+  key:
+    postal_code: Pt:Key:postal code
+    sport: Pt:Key:sport
+  tag:
+    amenity=hospital: Pt:Tag:amenity=hospital
+    highway=primary: Pt:Tag:highway=primary
+    leisure=fishing: Pt:Tag:leisure=fishing
+    leisure=garden: Pt:Tag:leisure=garden
+    leisure=golf_course: Pt:Tag:leisure=golf course
+    leisure=marina: Pt:Tag:leisure=marina
+    leisure=nature_reserve: Pt:Tag:leisure=nature reserve
+    leisure=park: Pt:Tag:leisure=park
+    leisure=pitch: Pt:Tag:leisure=pitch
+    leisure=playground: Pt:Tag:leisure=playground
+    leisure=slipway: Pt:Tag:leisure=slipway
+    leisure=sports_centre: Pt:Tag:leisure=sports centre
+    leisure=stadium: Pt:Tag:leisure=stadium
+    leisure=track: Pt:Tag:leisure=track
+    leisure=water_park: Pt:Tag:leisure=water park
+    sport=golf: Pt:Tag:sport=golf
 pt-br:
   key:
+    IBGE:tipo: Pt-br:Key:IBGE:tipo
+    TMC: Pt-br:Key:TMC
     abutters: Pt-br:Key:abutters
     access: Pt-br:Key:access
     addr: Pt-br:Key:addr
+    aerialway: Pt-br:Key:aerialway
     aeroway: Pt-br:Key:aeroway
     amenity: Pt-br:Key:amenity
+    area: Pt-br:Key:area
     barrier: Pt-br:Key:barrier
     bicycle: Pt-br:Key:bicycle
     boat: Pt-br:Key:boat
@@ -1386,23 +4131,42 @@ pt-br:
     boundary: Pt-br:Key:boundary
     bridge: Pt-br:Key:bridge
     building: Pt-br:Key:building
+    cables: Pt-br:Key:cables
     cep: Pt-br:Key:cep
     construction: Pt-br:Key:construction
+    contact: Pt-br:Key:contact
+    craft: Pt-br:Key:craft
+    created_by: Pt-br:Key:created by
+    crossing: Pt-br:Key:crossing
+    cuisine: Pt-br:Key:cuisine
+    cutting: Pt-br:Key:cutting
     cycleway: Pt-br:Key:cycleway
     ele: Pt-br:Key:ele
+    electrified: Pt-br:Key:electrified
+    embankment: Pt-br:Key:embankment
     emergency: Pt-br:Key:emergency
     fenced: Pt-br:Key:fenced
     foot: Pt-br:Key:foot
+    frequency: Pt-br:Key:frequency
     geological: Pt-br:Key:geological
     hgv: Pt-br:Key:hgv
     highway: Pt-br:Key:highway
     historic: Pt-br:Key:historic
     horse: Pt-br:Key:horse
+    iata: Pt-br:Key:iata
+    icao: Pt-br:Key:icao
+    ice_road: Pt-br:Key:ice road
+    incline: Pt-br:Key:incline
+    intermittent: Pt-br:Key:intermittent
     internet_access: Pt-br:Key:internet access
+    is_in: Pt-br:Key:is in
+    junction: Pt-br:Key:junction
     landuse: Pt-br:Key:landuse
     lanes: Pt-br:Key:lanes
     leisure: Pt-br:Key:leisure
+    listed_status: Pt-br:Key:listed status
     lit: Pt-br:Key:lit
+    lock: Pt-br:Key:lock
     man_made: Pt-br:Key:man made
     maxdraught: Pt-br:Key:maxdraught
     maxheight: Pt-br:Key:maxheight
@@ -1412,195 +4176,865 @@ pt-br:
     maxspeed: Pt-br:Key:maxspeed
     maxweight: Pt-br:Key:maxweight
     military: Pt-br:Key:military
+    mooring: Pt-br:Key:mooring
     motorcar: Pt-br:Key:motorcar
     motorcycle: Pt-br:Key:motorcycle
+    motorroad: Pt-br:Key:motorroad
+    mountain_pass: Pt-br:Key:mountain pass
+    mtb: Pt-br:Key:mtb
     name: Pt-br:Key:name
     natural: Pt-br:Key:natural
     noname: Pt-br:Key:noname
     office: Pt-br:Key:office
     oneway: Pt-br:Key:oneway
     operator: Pt-br:Key:operator
+    overtaking: Pt-br:Key:overtaking
+    passing_places: Pt-br:Key:passing places
+    place: Pt-br:Key:place
+    population: Pt-br:Key:population
+    postal_code: Pt-br:Key:postal code
+    power: Pt-br:Key:power
     psv: Pt-br:Key:psv
+    public_transport: Pt-br:Key:public transport
     railway: Pt-br:Key:railway
+    ref: Pt-br:Key:ref
     religion: Pt-br:Key:religion
     route: Pt-br:Key:route
+    sac_scale: Pt-br:Key:sac scale
     seamark: Pt-br:Key:seamark
+    seasonal: Pt-br:Key:seasonal
     service: Pt-br:Key:service
     shop: Pt-br:Key:shop
     ski: Pt-br:Key:ski
+    smoothness: Pt-br:Key:smoothness
     source: Pt-br:Key:source
     sport: Pt-br:Key:sport
     surface: Pt-br:Key:surface
     tourism: Pt-br:Key:tourism
     tracktype: Pt-br:Key:tracktype
     traffic_calming: Pt-br:Key:traffic calming
+    trail_visibility: Pt-br:Key:trail visibility
+    tunnel: Pt-br:Key:tunnel
     type: Pt-br:Key:type
+    usage: Pt-br:Key:usage
+    voltage: Pt-br:Key:voltage
     waterway: Pt-br:Key:waterway
+    winter_road: Pt-br:Key:winter road
+    wires: Pt-br:Key:wires
   tag:
+    aerialway=cable_car: Pt-br:Tag:aerialway=cable car
+    aerialway=station: Pt-br:Tag:aerialway=station
+    aeroway=aerodrome: Pt-br:Tag:aeroway=aerodrome
+    aeroway=apron: Pt-br:Tag:aeroway=apron
+    aeroway=gate: Pt-br:Tag:aeroway=gate
+    aeroway=helipad: Pt-br:Tag:aeroway=helipad
+    aeroway=runway: Pt-br:Tag:aeroway=runway
+    aeroway=taxiway: Pt-br:Tag:aeroway=taxiway
+    aeroway=terminal: Pt-br:Tag:aeroway=terminal
+    aeroway=windsock: Pt-br:Tag:aeroway=windsock
+    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
+    amenity=baby_hatch: Pt-br:Tag:amenity=baby hatch
     amenity=bank: Pt-br:Tag:amenity=bank
+    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_rental: Pt-br:Tag:amenity=bicycle rental
+    amenity=biergarten: Pt-br:Tag:amenity=biergarten
     amenity=brothel: Pt-br:Tag:amenity=brothel
+    amenity=bureau_de_change: Pt-br:Tag:amenity=bureau de change
+    amenity=bus_station: Pt-br:Tag:amenity=bus station
+    amenity=cafe: Pt-br:Tag:amenity=cafe
+    amenity=car_rental: Pt-br:Tag:amenity=car rental
+    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=clock: Pt-br:Tag:amenity=clock
+    amenity=college: Pt-br:Tag:amenity=college
+    amenity=community_centre: Pt-br:Tag:amenity=community centre
+    amenity=courthouse: Pt-br:Tag:amenity=courthouse
+    amenity=crematorium: Pt-br:Tag:amenity=crematorium
+    amenity=dentist: Pt-br:Tag:amenity=dentist
+    amenity=doctors: Pt-br:Tag:amenity=doctors
+    amenity=drinking_water: Pt-br:Tag:amenity=drinking water
+    amenity=embassy: Pt-br:Tag:amenity=embassy
+    amenity=ev_charging: Pt-br:Tag:amenity=ev charging
+    amenity=fast_food: Pt-br:Tag:amenity=fast food
+    amenity=ferry_terminal: Pt-br:Tag:amenity=ferry terminal
+    amenity=fire_hydrant: Pt-br:Tag:amenity=fire hydrant
+    amenity=fire_station: Pt-br:Tag:amenity=fire station
+    amenity=food_court: Pt-br:Tag:amenity=food court
+    amenity=fountain: Pt-br:Tag:amenity=fountain
     amenity=fuel: Pt-br:Tag:amenity=fuel
+    amenity=grave_yard: Pt-br:Tag:amenity=grave yard
+    amenity=grit_bin: Pt-br:Tag:amenity=grit bin
+    amenity=hospital: Pt-br:Tag:amenity=hospital
+    amenity=hunting_stand: Pt-br:Tag:amenity=hunting stand
+    amenity=ice_cream: Pt-br:Tag:amenity=ice cream
+    amenity=kindergarten: Pt-br:Tag:amenity=kindergarten
+    amenity=library: Pt-br:Tag:amenity=library
+    amenity=love_hotel: Pt-br:Tag:amenity=love hotel
     amenity=marketplace: Pt-br:Tag:amenity=marketplace
     amenity=nightclub: Pt-br:Tag:amenity=nightclub
+    amenity=nursing_home: Pt-br:Tag:amenity=nursing home
+    amenity=parking: Pt-br:Tag:amenity=parking
+    amenity=pharmacy: Pt-br:Tag:amenity=pharmacy
     amenity=place_of_worship: Pt-br:Tag:amenity=place of worship
+    amenity=police: Pt-br:Tag:amenity=police
+    amenity=post_box: Pt-br:Tag:amenity=post box
+    amenity=post_office: Pt-br:Tag:amenity=post office
+    amenity=prison: Pt-br:Tag:amenity=prison
+    amenity=pub: Pt-br:Tag:amenity=pub
+    amenity=public_building: Pt-br:Tag:amenity=public building
+    amenity=recycling: Pt-br:Tag:amenity=recycling
+    amenity=restaurant: Pt-br:Tag:amenity=restaurant
+    amenity=sauna: Pt-br:Tag:amenity=sauna
+    amenity=school: Pt-br:Tag:amenity=school
+    amenity=shelter: Pt-br:Tag:amenity=shelter
+    amenity=social_centre: Pt-br:Tag:amenity=social centre
+    amenity=social_facility: Pt-br:Tag:amenity=social facility
     amenity=stripclub: Pt-br:Tag:amenity=stripclub
+    amenity=studio: Pt-br:Tag:amenity=studio
+    amenity=taxi: Pt-br:Tag:amenity=taxi
+    amenity=telephone: Pt-br:Tag:amenity=telephone
+    amenity=theatre: Pt-br:Tag:amenity=theatre
+    amenity=toilets: Pt-br:Tag:amenity=toilets
+    amenity=townhall: Pt-br:Tag:amenity=townhall
+    amenity=university: Pt-br:Tag:amenity=university
+    amenity=vending_machine: Pt-br:Tag:amenity=vending machine
+    amenity=veterinary: Pt-br:Tag:amenity=veterinary
+    amenity=waste_basket: Pt-br:Tag:amenity=waste basket
+    amenity=waste_disposal: Pt-br:Tag:amenity=waste disposal
+    amenity=watering_place: Pt-br:Tag:amenity=watering place
+    barrier=city_wall: Pt-br:Tag:barrier=city wall
+    barrier=ditch: Pt-br:Tag:barrier=ditch
+    barrier=fence: Pt-br:Tag:barrier=fence
+    barrier=gate: Pt-br:Tag:barrier=gate
+    barrier=hedge: Pt-br:Tag:barrier=hedge
+    barrier=lift_gate: Pt-br:Tag:barrier=lift gate
+    barrier=retaining_wall: Pt-br:Tag:barrier=retaining wall
+    barrier=toll_booth: Pt-br:Tag:barrier=toll booth
+    barrier=wall: Pt-br:Tag:barrier=wall
+    boundary=administrative: Pt-br:Tag:boundary=administrative
+    boundary=civil: Pt-br:Tag:boundary=civil
     boundary=maritime: Pt-br:Tag:boundary=maritime
+    boundary=national_park: Pt-br:Tag:boundary=national park
+    boundary=political: Pt-br:Tag:boundary=political
+    boundary=protected_area: Pt-br:Tag:boundary=protected area
+    building=house: Pt-br:Tag:building=house
+    craft=agricultural_engines: Pt-br:Tag:craft=agricultural engines
+    craft=basket_maker: Pt-br:Tag:craft=basket maker
+    craft=beekeeper: Pt-br:Tag:craft=beekeeper
+    craft=blacksmith: Pt-br:Tag:craft=blacksmith
+    craft=boatbuilder: Pt-br:Tag:craft=boatbuilder
+    craft=bookbinder: Pt-br:Tag:craft=bookbinder
+    craft=brewery: Pt-br:Tag:craft=brewery
+    craft=carpenter: Pt-br:Tag:craft=carpenter
+    craft=carpet_layer: Pt-br:Tag:craft=carpet layer
+    craft=caterer: Pt-br:Tag:craft=caterer
+    craft=clockmaker: Pt-br:Tag:craft=clockmaker
+    craft=confectionery: Pt-br:Tag:craft=confectionery
+    craft=dressmaker: Pt-br:Tag:craft=dressmaker
+    craft=electrician: Pt-br:Tag:craft=electrician
+    craft=gardener: Pt-br:Tag:craft=gardener
+    craft=glaziery: Pt-br:Tag:craft=glaziery
+    craft=handicraft: Pt-br:Tag:craft=handicraft
+    craft=hvac: Pt-br:Tag:craft=hvac
+    craft=insulation: Pt-br:Tag:craft=insulation
+    craft=jeweller: Pt-br:Tag:craft=jeweller
+    craft=key_cutter: Pt-br:Tag:craft=key cutter
+    craft=locksmith: Pt-br:Tag:craft=locksmith
+    craft=metal_construction: Pt-br:Tag:craft=metal construction
+    craft=optician: Pt-br:Tag:craft=optician
+    craft=painter: Pt-br:Tag:craft=painter
+    craft=parquet_layer: Pt-br:Tag:craft=parquet layer
+    craft=photographer: Pt-br:Tag:craft=photographer
+    craft=photographic_laboratory: Pt-br:Tag:craft=photographic laboratory
+    craft=plasterer: Pt-br:Tag:craft=plasterer
+    craft=plumber: Pt-br:Tag:craft=plumber
+    craft=pottery: Pt-br:Tag:craft=pottery
+    craft=rigger: Pt-br:Tag:craft=rigger
+    craft=roofer: Pt-br:Tag:craft=roofer
+    craft=saddler: Pt-br:Tag:craft=saddler
+    craft=sailmaker: Pt-br:Tag:craft=sailmaker
+    craft=sawmill: Pt-br:Tag:craft=sawmill
+    craft=scaffolder: Pt-br:Tag:craft=scaffolder
+    craft=sculptor: Pt-br:Tag:craft=sculptor
+    craft=shoemaker: Pt-br:Tag:craft=shoemaker
+    craft=stand_builder: Pt-br:Tag:craft=stand builder
+    craft=stonemason: Pt-br:Tag:craft=stonemason
+    craft=sun_protection: Pt-br:Tag:craft=sun protection
+    craft=sweep: Pt-br:Tag:craft=sweep
+    craft=tailor: Pt-br:Tag:craft=tailor
+    craft=tiler: Pt-br:Tag:craft=tiler
+    craft=tinsmith: Pt-br:Tag:craft=tinsmith
+    craft=upholstrer: Pt-br:Tag:craft=upholstrer
+    craft=watchmaker: Pt-br:Tag:craft=watchmaker
+    emergency=ambulance_station: Pt-br:Tag:emergency=ambulance station
+    emergency=fire_hydrant: Pt-br:Tag:emergency=fire hydrant
+    emergency=phone: Pt-br:Tag:emergency=phone
+    emergency=siren: Pt-br:Tag:emergency=siren
+    geological=palaeontological_site: Pt-br:Tag:geological=palaeontological site
+    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=crossing: Pt-br:Tag:highway=crossing
+    highway=cycleway: Pt-br:Tag:highway=cycleway
+    highway=emergency_access_point: Pt-br:Tag:highway=emergency access point
+    highway=footway: Pt-br:Tag:highway=footway
+    highway=ford: Pt-br:Tag:highway=ford
+    highway=give_way: Pt-br:Tag:highway=give way
+    highway=living_street: Pt-br:Tag:highway=living street
+    highway=mini_roundabout: Pt-br:Tag:highway=mini roundabout
     highway=motorway: Pt-br:Tag:highway=motorway
     highway=motorway_junction: Pt-br:Tag:highway=motorway junction
     highway=motorway_link: Pt-br:Tag:highway=motorway link
+    highway=passing_place: Pt-br:Tag:highway=passing place
+    highway=path: Pt-br:Tag:highway=path
+    highway=pedestrian: Pt-br:Tag:highway=pedestrian
+    highway=platform: Pt-br:Tag:highway=platform
+    highway=primary: Pt-br:Tag:highway=primary
+    highway=raceway: Pt-br:Tag:highway=raceway
+    highway=residential: Pt-br:Tag:highway=residential
+    highway=rest_area: Pt-br:Tag:highway=rest area
     highway=road: Pt-br:Tag:highway=road
+    highway=secondary: Pt-br:Tag:highway=secondary
+    highway=service: Pt-br:Tag:highway=service
+    highway=services: Pt-br:Tag:highway=services
+    highway=speed_camera: Pt-br:Tag:highway=speed camera
+    highway=steps: Pt-br:Tag:highway=steps
     highway=stop: Pt-br:Tag:highway=stop
+    highway=street_lamp: Pt-br:Tag:highway=street lamp
+    highway=tertiary: Pt-br:Tag:highway=tertiary
+    highway=track: Pt-br:Tag:highway=track
+    highway=traffic_signals: Pt-br:Tag:highway=traffic signals
+    highway=trunk: Pt-br:Tag:highway=trunk
+    highway=turning_circle: Pt-br:Tag:highway=turning circle
     highway=unclassified: Pt-br:Tag:highway=unclassified
+    historic=archaeological_site: Pt-br:Tag:historic=archaeological site
+    historic=battlefield: Pt-br:Tag:historic=battlefield
+    historic=boundary_stone: Pt-br:Tag:historic=boundary stone
+    historic=castle: Pt-br:Tag:historic=castle
+    historic=city_gate: Pt-br:Tag:historic=city gate
+    historic=memorial: Pt-br:Tag:historic=memorial
+    historic=monument: Pt-br:Tag:historic=monument
+    historic=ruins: Pt-br:Tag:historic=ruins
+    historic=wayside_cross: Pt-br:Tag:historic=wayside cross
+    historic=wayside_shrine: Pt-br:Tag:historic=wayside shrine
+    historic=wreck: Pt-br:Tag:historic=wreck
+    junction=roundabout: Pt-br:Tag:junction=roundabout
+    landuse=allotments: Pt-br:Tag:landuse=allotments
+    landuse=basin: Pt-br:Tag:landuse=basin
+    landuse=brownfield: Pt-br:Tag:landuse=brownfield
     landuse=cemetery: Pt-br:Tag:landuse=cemetery
+    landuse=commercial: Pt-br:Tag:landuse=commercial
+    landuse=farm: Pt-br:Tag:landuse=farm
+    landuse=farmyard: Pt-br:Tag:landuse=farmyard
+    landuse=forest: Pt-br:Tag:landuse=forest
+    landuse=garages: Pt-br:Tag:landuse=garages
+    landuse=grass: Pt-br:Tag:landuse=grass
+    landuse=greenfield: Pt-br:Tag:landuse=greenfield
+    landuse=greenhouse_horticulture: Pt-br:Tag:landuse=greenhouse horticulture
+    landuse=industrial: Pt-br:Tag:landuse=industrial
+    landuse=landfill: Pt-br:Tag:landuse=landfill
     landuse=meadow: Pt-br:Tag:landuse=meadow
+    landuse=military: Pt-br:Tag:landuse=military
+    landuse=orchard: Pt-br:Tag:landuse=orchard
+    landuse=quarry: Pt-br:Tag:landuse=quarry
+    landuse=railway: Pt-br:Tag:landuse=railway
+    landuse=recreation_ground: Pt-br:Tag:landuse=recreation ground
+    landuse=reservoir: Pt-br:Tag:landuse=reservoir
+    landuse=residential: Pt-br:Tag:landuse=residential
+    landuse=retail: Pt-br:Tag:landuse=retail
+    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=common: Pt-br:Tag:leisure=common
+    leisure=dance: Pt-br:Tag:leisure=dance
+    leisure=dog_park: Pt-br:Tag:leisure=dog park
+    leisure=garden: Pt-br:Tag:leisure=garden
+    leisure=golf_course: Pt-br:Tag:leisure=golf course
+    leisure=ice_rink: Pt-br:Tag:leisure=ice rink
+    leisure=marina: Pt-br:Tag:leisure=marina
+    leisure=miniature_golf: Pt-br:Tag:leisure=miniature golf
+    leisure=nature_reserve: Pt-br:Tag:leisure=nature reserve
+    leisure=park: Pt-br:Tag:leisure=park
+    leisure=pitch: Pt-br:Tag:leisure=pitch
+    leisure=playground: Pt-br:Tag:leisure=playground
+    leisure=slipway: Pt-br:Tag:leisure=slipway
+    leisure=sports_centre: Pt-br:Tag:leisure=sports centre
+    leisure=stadium: Pt-br:Tag:leisure=stadium
+    leisure=swimming_pool: Pt-br:Tag:leisure=swimming pool
+    leisure=track: Pt-br:Tag:leisure=track
+    leisure=water_park: Pt-br:Tag:leisure=water park
+    man_made=adit: Pt-br:Tag:man made=adit
+    man_made=antenna: Pt-br:Tag:man made=antenna
+    man_made=beacon: Pt-br:Tag:man made=beacon
+    man_made=breakwater: Pt-br:Tag:man made=breakwater
+    man_made=crane: Pt-br:Tag:man made=crane
+    man_made=cutline: Pt-br:Tag:man made=cutline
+    man_made=flagpole: Pt-br:Tag:man made=flagpole
+    man_made=groyne: Pt-br:Tag:man made=groyne
+    man_made=jetty: Pt-br:Tag:man made=jetty
+    man_made=lighthouse: Pt-br:Tag:man made=lighthouse
+    man_made=mineshaft: Pt-br:Tag:man made=mineshaft
+    man_made=monitoring_station: Pt-br:Tag:man made=monitoring station
+    man_made=petroleum_well: Pt-br:Tag:man made=petroleum well
+    man_made=pier: Pt-br:Tag:man made=pier
+    man_made=pipeline: Pt-br:Tag:man made=pipeline
+    man_made=reservoir_covered: Pt-br:Tag:man made=reservoir covered
+    man_made=surveillance: Pt-br:Tag:man made=surveillance
     man_made=survey_point: Pt-br:Tag:man made=survey point
+    man_made=tower: Pt-br:Tag:man made=tower
+    man_made=wastewater_plant: Pt-br:Tag:man made=wastewater plant
+    man_made=water_tower: Pt-br:Tag:man made=water tower
+    man_made=water_well: Pt-br:Tag:man made=water well
+    man_made=water_works: Pt-br:Tag:man made=water works
+    man_made=watermill: Pt-br:Tag:man made=watermill
+    man_made=windmill: Pt-br:Tag:man made=windmill
+    man_made=works: Pt-br:Tag:man made=works
+    military=airfield: Pt-br:Tag:military=airfield
+    military=barracks: Pt-br:Tag:military=barracks
+    military=bunker: Pt-br:Tag:military=bunker
+    military=danger_area: Pt-br:Tag:military=danger area
+    military=naval_base: Pt-br:Tag:military=naval base
+    military=range: Pt-br:Tag:military=range
+    natural=bay: Pt-br:Tag:natural=bay
     natural=beach: Pt-br:Tag:natural=beach
+    natural=cave_entrance: Pt-br:Tag:natural=cave entrance
+    natural=cliff: Pt-br:Tag:natural=cliff
+    natural=coastline: Pt-br:Tag:natural=coastline
+    natural=fell: Pt-br:Tag:natural=fell
+    natural=glacier: Pt-br:Tag:natural=glacier
+    natural=grassland: Pt-br:Tag:natural=grassland
+    natural=heath: Pt-br:Tag:natural=heath
+    natural=mud: Pt-br:Tag:natural=mud
+    natural=peak: Pt-br:Tag:natural=peak
+    natural=sand: Pt-br:Tag:natural=sand
+    natural=scree: Pt-br:Tag:natural=scree
+    natural=scrub: Pt-br:Tag:natural=scrub
+    natural=spring: Pt-br:Tag:natural=spring
+    natural=stone: Pt-br:Tag:natural=stone
+    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=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
+    office=estate_agent: Pt-br:Tag:office=estate agent
+    office=government: Pt-br:Tag:office=government
+    office=insurance: Pt-br:Tag:office=insurance
+    office=it: Pt-br:Tag:office=it
+    office=lawyer: Pt-br:Tag:office=lawyer
+    office=newspaper: Pt-br:Tag:office=newspaper
+    office=ngo: Pt-br:Tag:office=ngo
+    office=quango: Pt-br:Tag:office=quango
+    office=research: Pt-br:Tag:office=research
+    office=telecommunication: Pt-br:Tag:office=telecommunication
+    office=travel_agent: Pt-br:Tag:office=travel agent
+    place=city: Pt-br:Tag:place=city
+    place=continent: Pt-br:Tag:place=continent
+    place=country: Pt-br:Tag:place=country
+    place=county: Pt-br:Tag:place=county
+    place=farm: Pt-br:Tag:place=farm
+    place=hamlet: Pt-br:Tag:place=hamlet
+    place=island: Pt-br:Tag:place=island
+    place=islet: Pt-br:Tag:place=islet
+    place=isolated_dwelling: Pt-br:Tag:place=isolated dwelling
+    place=locality: Pt-br:Tag:place=locality
+    place=region: Pt-br:Tag:place=region
+    place=state: Pt-br:Tag:place=state
+    place=suburb: Pt-br:Tag:place=suburb
+    place=town: Pt-br:Tag:place=town
+    place=village: Pt-br:Tag:place=village
+    power=cable_distribution_cabinet: Pt-br:Tag:power=cable distribution cabinet
+    power=generator: Pt-br:Tag:power=generator
+    power=line: Pt-br:Tag:power=line
+    power=minor_line: Pt-br:Tag:power=minor line
+    power=pole: Pt-br:Tag:power=pole
+    power=station: Pt-br:Tag:power=station
+    power=sub_station: Pt-br:Tag:power=sub station
+    power=tower: Pt-br:Tag:power=tower
+    railway=buffer_stop: Pt-br:Tag:railway=buffer stop
+    railway=crossing: Pt-br:Tag:railway=crossing
+    railway=derail: Pt-br:Tag:railway=derail
+    railway=funicular: Pt-br:Tag:railway=funicular
+    railway=halt: Pt-br:Tag:railway=halt
+    railway=level_crossing: Pt-br:Tag:railway=level crossing
+    railway=monorail: Pt-br:Tag:railway=monorail
+    railway=platform: Pt-br:Tag:railway=platform
     railway=rail: Pt-br:Tag:railway=rail
+    railway=station: Pt-br:Tag:railway=station
+    railway=subway: Pt-br:Tag:railway=subway
+    railway=subway_entrance: Pt-br:Tag:railway=subway entrance
+    railway=switch: Pt-br:Tag:railway=switch
+    railway=tram: Pt-br:Tag:railway=tram
+    railway=tram_stop: Pt-br:Tag:railway=tram stop
+    railway=turntable: Pt-br:Tag:railway=turntable
+    route=bus: Pt-br:Tag:route=bus
+    route=detour: Pt-br:Tag:route=detour
+    route=ferry: Pt-br:Tag:route=ferry
+    route=railway: Pt-br:Tag:route=railway
+    route=road: Pt-br:Tag:route=road
+    route=train: Pt-br:Tag:route=train
+    route=tram: Pt-br:Tag:route=tram
+    service=alley: Pt-br:Tag:service=alley
+    service=driveway: Pt-br:Tag:service=driveway
+    service=parking_aisle: Pt-br:Tag:service=parking aisle
+    service=siding: Pt-br:Tag:service=siding
+    service=spur: Pt-br:Tag:service=spur
+    service=yard: Pt-br:Tag:service=yard
+    shop=alcohol: Pt-br:Tag:shop=alcohol
+    shop=anime: Pt-br:Tag:shop=anime
+    shop=art: Pt-br:Tag:shop=art
+    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
+    shop=beauty: Pt-br:Tag:shop=beauty
+    shop=bed: Pt-br:Tag:shop=bed
+    shop=beverages: Pt-br:Tag:shop=beverages
+    shop=bicycle: Pt-br:Tag:shop=bicycle
+    shop=books: Pt-br:Tag:shop=books
+    shop=boutique: Pt-br:Tag:shop=boutique
+    shop=butcher: Pt-br:Tag:shop=butcher
+    shop=car: Pt-br:Tag:shop=car
+    shop=car_repair: Pt-br:Tag:shop=car repair
+    shop=charity: Pt-br:Tag:shop=charity
+    shop=chemist: Pt-br:Tag:shop=chemist
+    shop=clothes: Pt-br:Tag:shop=clothes
+    shop=computer: Pt-br:Tag:shop=computer
+    shop=confectionery: Pt-br:Tag:shop=confectionery
+    shop=convenience: Pt-br:Tag:shop=convenience
+    shop=copyshop: Pt-br:Tag:shop=copyshop
+    shop=curtain: Pt-br:Tag:shop=curtain
+    shop=deli: Pt-br:Tag:shop=deli
+    shop=department_store: Pt-br:Tag:shop=department store
+    shop=dive: Pt-br:Tag:shop=dive
+    shop=doityourself: Pt-br:Tag:shop=doityourself
+    shop=dry_cleaning: Pt-br:Tag:shop=dry cleaning
+    shop=electronics: Pt-br:Tag:shop=electronics
+    shop=erotic: Pt-br:Tag:shop=erotic
+    shop=fabric: Pt-br:Tag:shop=fabric
+    shop=farm: Pt-br:Tag:shop=farm
+    shop=florist: Pt-br:Tag:shop=florist
+    shop=frame: Pt-br:Tag:shop=frame
+    shop=funeral_directors: Pt-br:Tag:shop=funeral directors
+    shop=furnace: Pt-br:Tag:shop=furnace
+    shop=furniture: Pt-br:Tag:shop=furniture
+    shop=garden_centre: Pt-br:Tag:shop=garden centre
+    shop=gas: Pt-br:Tag:shop=gas
+    shop=general: Pt-br:Tag:shop=general
+    shop=gift: Pt-br:Tag:shop=gift
+    shop=glaziery: Pt-br:Tag:shop=glaziery
+    shop=greengrocer: Pt-br:Tag:shop=greengrocer
+    shop=hairdresser: Pt-br:Tag:shop=hairdresser
+    shop=hardware: Pt-br:Tag:shop=hardware
+    shop=hearing_aids: Pt-br:Tag:shop=hearing aids
+    shop=hifi: Pt-br:Tag:shop=hifi
+    shop=hunting: Pt-br:Tag:shop=hunting
+    shop=insurance: Pt-br:Tag:shop=insurance
+    shop=interior_decoration: Pt-br:Tag:shop=interior decoration
+    shop=jewelry: Pt-br:Tag:shop=jewelry
+    shop=kiosk: Pt-br:Tag:shop=kiosk
+    shop=kitchen: Pt-br:Tag:shop=kitchen
+    shop=laundry: Pt-br:Tag:shop=laundry
     shop=mall: Pt-br:Tag:shop=mall
+    shop=massage: Pt-br:Tag:shop=massage
+    shop=mobile_phone: Pt-br:Tag:shop=mobile phone
+    shop=money_lender: Pt-br:Tag:shop=money lender
+    shop=motorcycle: Pt-br:Tag:shop=motorcycle
+    shop=musical_instrument: Pt-br:Tag:shop=musical instrument
+    shop=newsagent: Pt-br:Tag:shop=newsagent
+    shop=optician: Pt-br:Tag:shop=optician
+    shop=organic: Pt-br:Tag:shop=organic
+    shop=outdoor: Pt-br:Tag:shop=outdoor
+    shop=paint: Pt-br:Tag:shop=paint
+    shop=pawnbroker: Pt-br:Tag:shop=pawnbroker
+    shop=pet: Pt-br:Tag:shop=pet
+    shop=radiotechnics: Pt-br:Tag:shop=radiotechnics
+    shop=seafood: Pt-br:Tag:shop=seafood
+    shop=second_hand: Pt-br:Tag:shop=second hand
+    shop=shoes: Pt-br:Tag:shop=shoes
+    shop=sports: Pt-br:Tag:shop=sports
     shop=stationery: Pt-br:Tag:shop=stationery
+    shop=supermarket: Pt-br:Tag:shop=supermarket
+    shop=tattoo: Pt-br:Tag:shop=tattoo
+    shop=tobacco: Pt-br:Tag:shop=tobacco
+    shop=toys: Pt-br:Tag:shop=toys
+    shop=trade: Pt-br:Tag:shop=trade
+    shop=vacant: Pt-br:Tag:shop=vacant
+    shop=vacuum_cleaner: Pt-br:Tag:shop=vacuum cleaner
+    shop=variety_store: Pt-br:Tag:shop=variety store
+    shop=video: Pt-br:Tag:shop=video
     source=IBGE: Pt-br:Tag:source=IBGE
+    sport=soccer: Pt-br:Tag:sport=soccer
+    tourism=alpine_hut: Pt-br:Tag:tourism=alpine hut
+    tourism=artwork: Pt-br:Tag:tourism=artwork
+    tourism=attraction: Pt-br:Tag:tourism=attraction
+    tourism=camp_site: Pt-br:Tag:tourism=camp site
+    tourism=caravan_site: Pt-br:Tag:tourism=caravan site
+    tourism=chalet: Pt-br:Tag:tourism=chalet
+    tourism=guest_house: Pt-br:Tag:tourism=guest house
+    tourism=hostel: Pt-br:Tag:tourism=hostel
+    tourism=hotel: Pt-br:Tag:tourism=hotel
+    tourism=information: Pt-br:Tag:tourism=information
+    tourism=motel: Pt-br:Tag:tourism=motel
+    tourism=museum: Pt-br:Tag:tourism=museum
+    tourism=picnic_site: Pt-br:Tag:tourism=picnic site
+    tourism=theme_park: Pt-br:Tag:tourism=theme park
     tourism=viewpoint: Pt-br:Tag:tourism=viewpoint
+    tourism=zoo: Pt-br:Tag:tourism=zoo
+    waterway=boatyard: Pt-br:Tag:waterway=boatyard
+    waterway=canal: Pt-br:Tag:waterway=canal
+    waterway=dam: Pt-br:Tag:waterway=dam
+    waterway=ditch: Pt-br:Tag:waterway=ditch
+    waterway=dock: Pt-br:Tag:waterway=dock
+    waterway=drain: Pt-br:Tag:waterway=drain
+    waterway=lock_gate: Pt-br:Tag:waterway=lock gate
+    waterway=river: Pt-br:Tag:waterway=river
     waterway=riverbank: Pt-br:Tag:waterway=riverbank
+    waterway=stream: Pt-br:Tag:waterway=stream
+    waterway=turning_point: Pt-br:Tag:waterway=turning point
+    waterway=weir: Pt-br:Tag:waterway=weir
 ro:
+  key:
+    leisure: Ro:Key:leisure
+    tracktype: Ro:Key:tracktype
   tag:
+    amenity=nightclub: Ro:Tag:amenity=nightclub
     junction=roundabout: Ro:Tag:junction=roundabout
-ro-md:
-  tag:
-    amenity=nightclub: Ro-md:Tag:amenity=nightclub
 ru:
   key:
     abutters: RU:Key:abutters
     access: RU:Key:access
     addr: RU:Key:addr
+    addr:flats: RU:Key:addr:flats
+    addr:place: RU:Key:addr:place
+    addr:suburb: RU:Key:addr:suburb
     aerialway: RU:Key:aerialway
     aeroway: RU:Key:aeroway
     amenity: RU:Key:amenity
     area: RU:Key:area
+    area:highway: RU:Key:area:highway
     barrier: RU:Key:barrier
+    bench: RU:Key:bench
     bicycle: RU:Key:bicycle
+    bicycle_parking: RU:Key:bicycle parking
+    bin: RU:Key:bin
     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:levels: RU:Key:building:levels
+    building:material: RU:Key:building:material
+    building:min_level: RU:Key:building:min level
+    building:part: RU:Key:building:part
+    building:parts: RU:Key:building:parts
     bunker_type: RU:Key:bunker type
+    cafe: RU:Key:cafe
     capacity: RU:Key:capacity
+    check_date: RU:Key:check date
+    clothes: RU:Key:clothes
+    club: RU:Key:club
+    colour: RU:Key:colour
     comment: RU:Key:comment
     construction: RU:Key:construction
+    contact: RU:Key:contact
     covered: RU:Key:covered
+    craft: RU:Key:craft
     created_by: RU:Key:created by
+    crop: RU:Key:crop
     crossing: RU:Key:crossing
     cuisine: RU:Key:cuisine
     cutting: RU:Key:cutting
     denomination: RU:Key:denomination
     description: RU:Key:description
+    designation: RU:Key:designation
     direction: RU:Key:direction
+    dispensing: RU:Key:dispensing
     disused: RU:Key:disused
+    drive_in: RU:Key:drive in
     ele: RU:Key:ele
+    electrified: RU:Key:electrified
     embankment: RU:Key:embankment
+    emergency: RU:Key:emergency
+    entrance: RU:Key:entrance
+    exit: RU:Key:exit
+    fast_food: RU:Key:fast food
     fee: RU:Key:fee
+    fence_type: RU:Key:fence type
+    ferry: RU:Key:ferry
     fixme: RU:Key:fixme
     foot: RU:Key:foot
+    footway: RU:Key:footway
+    ford: RU:Key:ford
+    fuel: RU:Key:fuel
     gauge: RU:Key:gauge
+    generator:output: RU:Key:generator:output
+    generator:source: RU:Key:generator:source
+    gvr:code: RU:Key:gvr:code
+    handrail: RU:Key:handrail
     height: RU:Key:height
     highway: RU:Key:highway
     historic: RU:Key:historic
     horse: RU:Key:horse
+    ice_road: RU:Key:ice road
+    incline: RU:Key:incline
     information: RU:Key:information
+    inscription: RU:Key:inscription
+    intermittent: RU:Key:intermittent
     internet_access: RU:Key:internet access
     junction: RU:Key:junction
+    kerb: RU:Key:kerb
+    landmark: RU:Key:landmark
     landuse: RU:Key:landuse
     lanes: RU:Key:lanes
+    layer: RU:Key:layer
     leisure: RU:Key:leisure
+    length: RU:Key:length
+    level: RU:Key:level
     man_made: RU:Key:man made
+    manhole: RU:Key:manhole
+    maxaxleload: RU:Key:maxaxleload
     maxheight: RU:Key:maxheight
     maxlength: RU:Key:maxlength
     maxspeed: RU:Key:maxspeed
+    maxspeed:practical: RU:Key:maxspeed:practical
+    maxstay: RU:Key:maxstay
     maxweight: RU:Key:maxweight
     maxwidth: RU:Key:maxwidth
     military: RU:Key:military
+    min_height: RU:Key:min height
     minspeed: RU:Key:minspeed
+    motorroad: RU:Key:motorroad
     name: RU:Key:name
     natural: RU:Key:natural
     noexit: RU:Key:noexit
     note: RU:Key:note
+    office: RU:Key:office
     oneway: RU:Key:oneway
+    opening_date: RU:Key:opening date
     opening_hours: RU:Key:opening hours
     operator: RU:Key:operator
+    overtaking: RU:Key:overtaking
     parking: RU:Key:parking
+    parking:lane: RU:Key:parking:lane
     passing_places: RU:Key:passing places
     paved:date: RU:Key:paved:date
+    payment: RU:Key:payment
     phone: RU:Key:phone
+    piste:type: RU:Key:piste:type
     place: RU:Key:place
+    playground: RU:Key:playground
     population: RU:Key:population
     power: RU:Key:power
-    power_source: RU:Key:power source
+    priority_road: RU:Key:priority road
+    psv: RU:Key:psv
     railway: RU:Key:railway
+    ramp: RU:Key:ramp
     ref: RU:Key:ref
     religion: RU:Key:religion
+    resource: RU:Key:resource
+    roof:material: RU:Key:roof:material
     route: RU:Key:route
+    ruins: RU:Key:ruins
+    seasonal:snowfall:regaintime: RU:Key:seasonal:snowfall:regaintime
     service: RU:Key:service
+    shelter: RU:Key:shelter
+    shelter_type: RU:Key:shelter type
     shop: RU:Key:shop
+    side_road: RU:Key:side road
+    sidewalk: RU:Key:sidewalk
+    smoking: RU:Key:smoking
     smoothness: RU:Key:smoothness
+    snowplowing: RU:Key:snowplowing
+    social_facility: RU:Key:social facility
+    sorting_name: RU:Key:sorting name
     source: RU:Key:source
+    source:maxspeed: RU:Key:source:maxspeed
+    species: RU:Key:species
+    sport: RU:Key:sport
     surface: RU:Key:surface
+    surveillance: RU:Key:surveillance
+    tactile_paving: RU:Key:tactile paving
+    toll: RU:Key:toll
     tourism: RU:Key:tourism
     tracktype: RU:Key:tracktype
     traffic_calming: RU:Key:traffic calming
+    traffic_sign: RU:Key:traffic sign
+    tunnel: RU:Key:tunnel
+    turn: RU:Key:turn
     type: RU:Key:type
+    voltage: RU:Key:voltage
+    water: RU:Key:water
     waterway: RU:Key:waterway
     website: RU:Key:website
+    wheelchair: RU:Key:wheelchair
     width: RU:Key:width
     wikipedia: RU:Key:wikipedia
+    winter_road: RU:Key:winter road
     wood: RU:Key:wood
   tag:
+    abandoned=yes: RU:Tag:abandoned=yes
     access=designated: RU:Tag:access=designated
     aeroway=aerodrome: RU:Tag:aeroway=aerodrome
     aeroway=apron: RU:Tag:aeroway=apron
     aeroway=gate: RU:Tag:aeroway=gate
     aeroway=helipad: RU:Tag:aeroway=helipad
+    aeroway=navigationaid: RU:Tag:aeroway=navigationaid
     aeroway=runway: RU:Tag:aeroway=runway
     aeroway=taxiway: RU:Tag:aeroway=taxiway
     aeroway=terminal: RU:Tag:aeroway=terminal
+    aeroway=windsock: RU:Tag:aeroway=windsock
+    amenity=animal_boarding: RU:Tag:amenity=animal boarding
+    amenity=animal_shelter: RU:Tag:amenity=animal shelter
+    amenity=arts_centre: RU:Tag:amenity=arts centre
+    amenity=atm: RU:Tag:amenity=atm
     amenity=bank: RU:Tag:amenity=bank
+    amenity=bar: RU:Tag:amenity=bar
+    amenity=bbq: RU:Tag:amenity=bbq
+    amenity=bench: RU:Tag:amenity=bench
+    amenity=bicycle_parking: RU:Tag:amenity=bicycle parking
     amenity=bicycle_rental: RU:Tag:amenity=bicycle rental
+    amenity=biergarten: RU:Tag:amenity=biergarten
+    amenity=boat_storage: RU:Tag:amenity=boat storage
     amenity=brothel: RU:Tag:amenity=brothel
+    amenity=bureau_de_change: RU:Tag:amenity=bureau de change
     amenity=bus_station: RU:Tag:amenity=bus station
+    amenity=cafe: RU:Tag:amenity=cafe
     amenity=car_rental: RU:Tag:amenity=car rental
     amenity=car_sharing: RU:Tag:amenity=car sharing
+    amenity=car_wash: RU:Tag:amenity=car wash
+    amenity=casino: RU:Tag:amenity=casino
+    amenity=cinema: RU:Tag:amenity=cinema
+    amenity=clinic: RU:Tag:amenity=clinic
+    amenity=clock: RU:Tag:amenity=clock
+    amenity=college: RU:Tag:amenity=college
+    amenity=community_centre: RU:Tag:amenity=community centre
+    amenity=compressed_air: RU:Tag:amenity=compressed air
+    amenity=courthouse: RU:Tag:amenity=courthouse
     amenity=crematorium: RU:Tag:amenity=crematorium
+    amenity=dentist: RU:Tag:amenity=dentist
+    amenity=doctors: RU:Tag:amenity=doctors
+    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=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=hospital: RU:Tag:amenity=hospital
+    amenity=kindergarten: RU:Tag:amenity=kindergarten
+    amenity=library: RU:Tag:amenity=library
+    amenity=love_hotel: RU:Tag:amenity=love hotel
+    amenity=marketplace: RU:Tag:amenity=marketplace
+    amenity=monastery: RU:Tag:amenity=monastery
+    amenity=mortuary: RU:Tag:amenity=mortuary
     amenity=nightclub: RU:Tag:amenity=nightclub
+    amenity=nursing_home: RU:Tag:amenity=nursing home
     amenity=parking: RU:Tag:amenity=parking
+    amenity=parking_entrance: RU:Tag:amenity=parking entrance
+    amenity=parking_space: RU:Tag:amenity=parking space
+    amenity=payment_terminal: RU:Tag:amenity=payment terminal
     amenity=pharmacy: RU:Tag:amenity=pharmacy
     amenity=place_of_worship: RU:Tag:amenity=place of worship
+    amenity=police: RU:Tag:amenity=police
+    amenity=post_box: RU:Tag:amenity=post box
+    amenity=post_office: RU:Tag:amenity=post office
+    amenity=prison: RU:Tag:amenity=prison
+    amenity=pub: RU:Tag:amenity=pub
+    amenity=public_building: RU:Tag:amenity=public building
+    amenity=recycling: RU:Tag:amenity=recycling
+    amenity=register_office: RU:Tag:amenity=register office
     amenity=restaurant: RU:Tag:amenity=restaurant
+    amenity=sauna: RU:Tag:amenity=sauna
     amenity=school: RU:Tag:amenity=school
+    amenity=shelter: RU:Tag:amenity=shelter
+    amenity=shower: RU:Tag:amenity=shower
+    amenity=social_facility: RU:Tag:amenity=social facility
     amenity=stripclub: RU:Tag:amenity=stripclub
     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=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
     atm=yes: RU:Tag:atm=yes
+    barrier=block: RU:Tag:barrier=block
+    barrier=bollard: RU:Tag:barrier=bollard
+    barrier=city_wall: RU:Tag:barrier=city wall
+    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=hedge: RU:Tag:barrier=hedge
     barrier=lift_gate: RU:Tag:barrier=lift gate
+    barrier=retaining_wall: RU:Tag:barrier=retaining wall
+    barrier=sally_port: RU:Tag:barrier=sally port
     barrier=toll_booth: RU:Tag:barrier=toll booth
+    barrier=turnstile: RU:Tag:barrier=turnstile
+    barrier=wall: RU:Tag:barrier=wall
+    building=detached: RU:Tag:building=detached
+    building=dormitory: RU:Tag:building=dormitory
     building=entrance: RU:Tag:building=entrance
+    building=roof: RU:Tag:building=roof
+    building=shed: RU:Tag:building=shed
+    building=stable: RU:Tag:building=stable
+    building=train_station: RU:Tag:building=train station
+    bunker_type=pillbox: RU:Tag:bunker type=pillbox
+    cafe=time-cafe: RU:Tag:cafe=time-cafe
+    craft=agricultural_engines: RU:Tag:craft=agricultural engines
+    craft=basket_maker: RU:Tag:craft=basket maker
+    craft=beekeeper: RU:Tag:craft=beekeeper
+    craft=blacksmith: RU:Tag:craft=blacksmith
+    craft=boatbuilder: RU:Tag:craft=boatbuilder
+    craft=bookbinder: RU:Tag:craft=bookbinder
+    craft=brewery: RU:Tag:craft=brewery
+    craft=carpenter: RU:Tag:craft=carpenter
+    craft=carpet_layer: RU:Tag:craft=carpet layer
+    craft=caterer: RU:Tag:craft=caterer
+    craft=clockmaker: RU:Tag:craft=clockmaker
+    craft=dressmaker: RU:Tag:craft=dressmaker
+    craft=electrician: RU:Tag:craft=electrician
+    craft=glaziery: RU:Tag:craft=glaziery
+    craft=handicraft: RU:Tag:craft=handicraft
+    craft=shoemaker: RU:Tag:craft=shoemaker
+    craft=tailor: RU:Tag:craft=tailor
+    emergency=ambulance_station: RU:Tag:emergency=ambulance station
+    emergency=fire_hydrant: RU:Tag:emergency=fire hydrant
+    emergency=fire_water_pond: RU:Tag:emergency=fire water pond
+    fast_food=cafeteria: RU:Tag:fast food=cafeteria
+    footway=crossing: RU:Tag:footway=crossing
+    footway=sidewalk: RU:Tag:footway=sidewalk
+    geological=palaeontological_site: RU:Tag:geological=palaeontological site
     highway=bridleway: RU:Tag:highway=bridleway
     highway=bus_stop: RU:Tag:highway=bus stop
+    highway=construction: RU:Tag:highway=construction
     highway=crossing: RU:Tag:highway=crossing
     highway=cycleway: RU:Tag:highway=cycleway
+    highway=elevator: RU:Tag:highway=elevator
     highway=emergency_access_point: RU:Tag:highway=emergency access point
     highway=footway: RU:Tag:highway=footway
     highway=ford: RU:Tag:highway=ford
+    highway=give_way: RU:Tag:highway=give way
     highway=living_street: RU:Tag:highway=living street
     highway=mini_roundabout: RU:Tag:highway=mini roundabout
     highway=motorway: RU:Tag:highway=motorway
@@ -1613,6 +5047,7 @@ ru:
     highway=primary: RU:Tag:highway=primary
     highway=primary_link: RU:Tag:highway=primary link
     highway=residential: RU:Tag:highway=residential
+    highway=rest_area: RU:Tag:highway=rest area
     highway=road: RU:Tag:highway=road
     highway=secondary: RU:Tag:highway=secondary
     highway=secondary_link: RU:Tag:highway=secondary link
@@ -1622,6 +5057,7 @@ ru:
     highway=steps: RU:Tag:highway=steps
     highway=stop: RU:Tag:highway=stop
     highway=tertiary: RU:Tag:highway=tertiary
+    highway=tertiary_link: RU:Tag:highway=tertiary link
     highway=track: RU:Tag:highway=track
     highway=traffic_signals: RU:Tag:highway=traffic signals
     highway=trunk: RU:Tag:highway=trunk
@@ -1630,77 +5066,288 @@ ru:
     highway=unclassified: RU:Tag:highway=unclassified
     historic=archaeological_site: RU:Tag:historic=archaeological site
     historic=battlefield: RU:Tag:historic=battlefield
+    historic=boundary_stone: RU:Tag:historic=boundary stone
+    historic=castle: RU:Tag:historic=castle
+    historic=city_gate: RU:Tag:historic=city gate
+    historic=fort: RU:Tag:historic=fort
+    historic=memorial: RU:Tag:historic=memorial
+    historic=monument: RU:Tag:historic=monument
+    historic=ruins: RU:Tag:historic=ruins
+    historic=rune_stone: RU:Tag:historic=rune stone
+    historic=ship: RU:Tag:historic=ship
+    historic=tree_shrine: RU:Tag:historic=tree shrine
+    historic=wayside_cross: RU:Tag:historic=wayside cross
+    historic=wayside_shrine: RU:Tag:historic=wayside shrine
+    historic=wreck: RU:Tag:historic=wreck
     information=guidepost: RU:Tag:information=guidepost
     junction=roundabout: RU:Tag:junction=roundabout
     landuse=allotments: RU:Tag:landuse=allotments
+    landuse=basin: RU:Tag:landuse=basin
     landuse=cemetery: RU:Tag:landuse=cemetery
+    landuse=commercial: RU:Tag:landuse=commercial
+    landuse=construction: RU:Tag:landuse=construction
+    landuse=farm: RU:Tag:landuse=farm
     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=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=quarry: RU:Tag:landuse=quarry
     landuse=railway: RU:Tag:landuse=railway
+    landuse=recreation_ground: RU:Tag:landuse=recreation ground
     landuse=reservoir: RU:Tag:landuse=reservoir
     landuse=residential: RU:Tag:landuse=residential
+    landuse=retail: RU:Tag:landuse=retail
+    landuse=village_green: RU:Tag:landuse=village green
+    landuse=vineyard: RU:Tag:landuse=vineyard
+    leisure=beach_resort: RU:Tag:leisure=beach resort
+    leisure=dance: RU:Tag:leisure=dance
+    leisure=firepit: RU:Tag:leisure=firepit
+    leisure=ice_rink: RU:Tag:leisure=ice rink
     leisure=marina: RU:Tag:leisure=marina
+    leisure=park: RU:Tag:leisure=park
+    leisure=pitch: RU:Tag:leisure=pitch
+    leisure=playground: RU:Tag:leisure=playground
+    leisure=sports_centre: RU:Tag:leisure=sports centre
+    leisure=stadium: RU:Tag:leisure=stadium
+    leisure=swimming_pool: RU:Tag:leisure=swimming pool
+    leisure=track: RU:Tag:leisure=track
     leisure=water_park: RU:Tag:leisure=water park
+    man_made=adit: RU:Tag:man made=adit
     man_made=beacon: RU:Tag:man made=beacon
+    man_made=breakwater: RU:Tag:man made=breakwater
     man_made=cutline: RU:Tag:man made=cutline
     man_made=lighthouse: RU:Tag:man made=lighthouse
+    man_made=monitoring_station: RU:Tag:man made=monitoring station
     man_made=pier: RU:Tag:man made=pier
+    man_made=pillar: RU:Tag:man made=pillar
+    man_made=pipeline: RU:Tag:man made=pipeline
+    man_made=reservoir_covered: RU:Tag:man made=reservoir covered
+    man_made=surveillance: RU:Tag:man made=surveillance
+    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_works: RU:Tag:man made=water works
+    military=airfield: RU:Tag:military=airfield
+    natural=arete: RU:Tag:natural=arete
     natural=beach: RU:Tag:natural=beach
+    natural=cliff: RU:Tag:natural=cliff
+    natural=coastline: RU:Tag:natural=coastline
+    natural=desert: RU:Tag:natural=desert
     natural=fell: RU:Tag:natural=fell
+    natural=grassland: RU:Tag:natural=grassland
+    natural=heath: RU:Tag:natural=heath
+    natural=peak: RU:Tag:natural=peak
+    natural=ridge: RU:Tag:natural=ridge
+    natural=saddle: RU:Tag:natural=saddle
+    natural=sand: RU:Tag:natural=sand
+    natural=scrub: RU:Tag:natural=scrub
     natural=spring: RU:Tag:natural=spring
     natural=tree: RU:Tag:natural=tree
+    natural=tree_row: RU:Tag:natural=tree row
+    natural=volcano: RU:Tag:natural=volcano
     natural=water: RU:Tag:natural=water
     natural=wetland: RU:Tag:natural=wetland
     natural=wood: RU:Tag:natural=wood
+    office=accountant: RU:Tag:office=accountant
+    office=administrative: RU:Tag:office=administrative
+    office=architect: RU:Tag:office=architect
+    office=company: RU:Tag:office=company
+    office=educational_institution: RU:Tag:office=educational institution
+    office=employment_agency: RU:Tag:office=employment agency
+    office=estate_agent: RU:Tag:office=estate agent
+    office=government: RU:Tag:office=government
+    office=insurance: RU:Tag:office=insurance
+    office=it: RU:Tag:office=it
     office=lawyer: RU:Tag:office=lawyer
+    office=newspaper: RU:Tag:office=newspaper
+    office=ngo: RU:Tag:office=ngo
+    office=political_party: RU:Tag:office=political party
+    office=research: RU:Tag:office=research
+    office=telecommunication: RU:Tag:office=telecommunication
+    office=travel_agent: RU:Tag:office=travel agent
     opening_hours=24/7: RU:Tag:opening hours=24/7
+    pipeline=marker: RU:Tag:pipeline=marker
+    place=allotments: RU:Tag:place=allotments
+    place=city: RU:Tag:place=city
+    place=hamlet: RU:Tag:place=hamlet
     place=island: RU:Tag:place=island
+    place=islet: RU:Tag:place=islet
+    place=isolated_dwelling: RU:Tag:place=isolated dwelling
+    place=locality: RU:Tag:place=locality
+    place=neighbourhood: RU:Tag:place=neighbourhood
+    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=line: RU:Tag:power=line
+    power=minor_line: RU:Tag:power=minor line
+    power=plant: RU:Tag:power=plant
     power=station: RU:Tag:power=station
     power=sub_station: RU:Tag:power=sub station
+    power=substation: RU:Tag:power=substation
     power=tower: RU:Tag:power=tower
+    public_transport=platform: RU:Tag:public transport=platform
+    public_transport=station: RU:Tag:public transport=station
+    public_transport=stop_position: RU:Tag:public transport=stop position
     railway=crossing: RU:Tag:railway=crossing
+    railway=level_crossing: RU:Tag:railway=level crossing
+    railway=miniature: RU:Tag:railway=miniature
+    railway=narrow_gauge: RU:Tag:railway=narrow gauge
+    railway=preserved: RU:Tag:railway=preserved
+    railway=rail: RU:Tag:railway=rail
+    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
     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=driveway: RU:Tag:service=driveway
     service=parking_aisle: RU:Tag:service=parking aisle
+    shop=alcohol: RU:Tag:shop=alcohol
+    shop=anime: RU:Tag:shop=anime
+    shop=antiques: RU:Tag:shop=antiques
+    shop=art: RU:Tag:shop=art
+    shop=baby_goods: RU:Tag:shop=baby goods
+    shop=bag: RU:Tag:shop=bag
     shop=bakery: RU:Tag:shop=bakery
+    shop=bathroom_furnishing: RU:Tag:shop=bathroom furnishing
+    shop=beauty: RU:Tag:shop=beauty
+    shop=bed: RU:Tag:shop=bed
+    shop=beverages: RU:Tag:shop=beverages
     shop=bicycle: RU:Tag:shop=bicycle
+    shop=books: RU:Tag:shop=books
+    shop=boutique: RU:Tag:shop=boutique
+    shop=butcher: RU:Tag:shop=butcher
     shop=car: RU:Tag:shop=car
+    shop=car_parts: RU:Tag:shop=car parts
+    shop=car_repair: RU:Tag:shop=car repair
+    shop=carpet: RU:Tag:shop=carpet
+    shop=charity: RU:Tag:shop=charity
+    shop=chemist: RU:Tag:shop=chemist
     shop=clothes: RU:Tag:shop=clothes
     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=curtain: RU:Tag:shop=curtain
+    shop=dairy: RU:Tag:shop=dairy
+    shop=deli: RU:Tag:shop=deli
     shop=department_store: RU:Tag:shop=department store
+    shop=dive: RU:Tag:shop=dive
+    shop=doityourself: RU:Tag:shop=doityourself
+    shop=dry_cleaning: RU:Tag:shop=dry cleaning
+    shop=electronics: RU:Tag:shop=electronics
+    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=fishing: RU:Tag:shop=fishing
     shop=florist: RU:Tag:shop=florist
+    shop=frame: RU:Tag:shop=frame
+    shop=funeral_directors: RU:Tag:shop=funeral directors
+    shop=furnace: RU:Tag:shop=furnace
+    shop=furniture: RU:Tag:shop=furniture
+    shop=garden_centre: RU:Tag:shop=garden centre
+    shop=gas: RU:Tag:shop=gas
+    shop=gift: RU:Tag:shop=gift
+    shop=glaziery: RU:Tag:shop=glaziery
+    shop=greengrocer: RU:Tag:shop=greengrocer
+    shop=haberdashery: RU:Tag:shop=haberdashery
     shop=hairdresser: RU:Tag:shop=hairdresser
+    shop=hardware: RU:Tag:shop=hardware
+    shop=hearing_aids: RU:Tag:shop=hearing aids
+    shop=herbalist: RU:Tag:shop=herbalist
+    shop=hifi: RU:Tag:shop=hifi
+    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=laundry: RU:Tag:shop=laundry
+    shop=mall: RU:Tag:shop=mall
+    shop=massage: RU:Tag:shop=massage
+    shop=mobile_phone: RU:Tag:shop=mobile phone
+    shop=money_lender: RU:Tag:shop=money lender
+    shop=motorcycle: RU:Tag:shop=motorcycle
+    shop=musical_instrument: RU:Tag:shop=musical instrument
+    shop=newsagent: RU:Tag:shop=newsagent
+    shop=optician: RU:Tag:shop=optician
+    shop=organic: RU:Tag:shop=organic
+    shop=outdoor: RU:Tag:shop=outdoor
+    shop=paint: RU:Tag:shop=paint
+    shop=pawnbroker: RU:Tag:shop=pawnbroker
+    shop=pet: RU:Tag:shop=pet
+    shop=radiotechnics: RU:Tag:shop=radiotechnics
+    shop=religion: RU:Tag:shop=religion
+    shop=seafood: RU:Tag:shop=seafood
+    shop=second_hand: RU:Tag:shop=second hand
+    shop=ship_chandler: RU:Tag:shop=ship chandler
+    shop=shoes: RU:Tag:shop=shoes
+    shop=sports: RU:Tag:shop=sports
+    shop=stationery: RU:Tag:shop=stationery
     shop=supermarket: RU:Tag:shop=supermarket
+    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=vacuum_cleaner: RU:Tag:shop=vacuum cleaner
+    shop=variety_store: RU:Tag:shop=variety store
+    shop=video: RU:Tag:shop=video
+    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=scuba_diving: RU:Tag:sport=scuba diving
+    tourism=artwork: RU:Tag:tourism=artwork
+    tourism=attraction: RU:Tag:tourism=attraction
+    tourism=camp_site: RU:Tag:tourism=camp site
+    tourism=chalet: RU:Tag:tourism=chalet
+    tourism=hostel: RU:Tag:tourism=hostel
     tourism=hotel: RU:Tag:tourism=hotel
     tourism=information: RU:Tag:tourism=information
+    tourism=museum: RU:Tag:tourism=museum
+    tourism=picnic_site: RU:Tag:tourism=picnic site
+    tourism=theme_park: RU:Tag:tourism=theme park
+    tourism=viewpoint: RU:Tag:tourism=viewpoint
+    tunnel=culvert: RU:Tag:tunnel=culvert
+    type=site: RU:Tag:type=site
+    waterway=boatyard: RU:Tag:waterway=boatyard
+    waterway=canal: RU:Tag:waterway=canal
     waterway=dam: RU:Tag:waterway=dam
+    waterway=dock: RU:Tag:waterway=dock
+    waterway=drain: RU:Tag:waterway=drain
     waterway=rapids: RU:Tag:waterway=rapids
     waterway=river: RU:Tag:waterway=river
     waterway=riverbank: RU:Tag:waterway=riverbank
     waterway=stream: RU:Tag:waterway=stream
     waterway=weir: RU:Tag:waterway=weir
+    wood=mixed: RU:Tag:wood=mixed
+sq:
+  key:
+    highway: Sq:Key:highway
 sv:
   key:
     access: Sv:Key:access
   tag:
+    aerialway=cable_car: Sv:Tag:aerialway=cable car
     amenity=place_of_worship: Sv:Tag:amenity=place of worship
+    highway=rest_area: Sv:Tag:highway=rest area
+    junction=roundabout: Sv:Tag:junction=roundabout
+    leisure=dog_park: Sv:Tag:leisure=dog park
+    railway=rail: Sv:Tag:railway=rail
 tr:
   key:
     amenity: Tr:Key:amenity
@@ -1712,18 +5359,39 @@ tr:
     sport: Tr:Key:sport
 uk:
   key:
-    access: Uk:Key:access
-    highway: Uk:Key:highway
-    place: Uk:Key:place
+    bicycle_parking: Uk:Key:bicycle parking
+  tag:
+    amenity=bicycle_parking: Uk:Tag:amenity=bicycle parking
+    amenity=bicycle_rental: Uk:Tag:amenity=bicycle rental
+    shop=antiques: Uk:Tag:shop=antiques
+    shop=bicycle: Uk:Tag:shop=bicycle
+    shop=second_hand: Uk:Tag:shop=second hand
+    vending=bicycle_tube: Uk:Tag:vending=bicycle tube
+zh-hans:
+  key:
+    cuisine: Zh-hans:Key:cuisine
+    name: Zh-hans:Key:name
+  tag:
+    amenity=cafe: Zh-hans:Tag:amenity=cafe
+zh-hant:
+  key:
+    amenity: Zh-hant:Key:amenity
+    fixme: Zh-hant:Key:fixme
+    fuel: Zh-hant:Key:fuel
+    noexit: Zh-hant:Key:noexit
+    opening_hours: Zh-hant:Key:opening hours
+    tracktype: Zh-hant:Key:tracktype
+    trail_visibility: Zh-hant:Key:trail visibility
   tag:
-    highway=motorway: Uk:Tag:highway=motorway
-    highway=motorway_link: Uk:Tag:highway=motorway link
-    highway=primary: Uk:Tag:highway=primary
-    highway=primary_link: Uk:Tag:highway=primary link
-    highway=secondary: Uk:Tag:highway=secondary
-    highway=secondary_link: Uk:Tag:highway=secondary link
-    highway=tertiary: Uk:Tag:highway=tertiary
-    highway=trunk: Uk:Tag:highway=trunk
-    highway=trunk_link: Uk:Tag:highway=trunk link
-    highway=unclassified: Uk:Tag:highway=unclassified
+    amenity=bench: Zh-hant:Tag:amenity=bench
+    amenity=crematorium: Zh-hant:Tag:amenity=crematorium
+    amenity=fuel: Zh-hant:Tag:amenity=fuel
+    amenity=place_of_worship: Zh-hant:Tag:amenity=place of worship
+    amenity=toilets: Zh-hant:Tag:amenity=toilets
+    highway=bus_stop: Zh-hant:Tag:highway=bus stop
+    landuse=cemetery: Zh-hant:Tag:landuse=cemetery
+    natural=peak: Zh-hant:Tag:natural=peak
+    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