Merge branch 'develop' into help-edit-menu

2026-05-25 17:37:49 +02:00 · 2020-09-24 15:20:48 -04:00
parent b0dc469d83 c940d827e6
commit 03ea7816c7
443 changed files with 7978 additions and 5110 deletions
@@ -24,12 +24,6 @@ en:
      changes_context: "({changes}) {base} – {context}"
    labeled_and_more: "{labeled} and {count} more"
  modes:
-    add_feature:
-      title: Add a feature
-      description: "Search for features to add to the map."
-      key: Tab
-      result: "{count} result"
-      results: "{count} results"
    add_area:
      title: Area
      description: "Add parks, buildings, lakes or other areas to the map."
@@ -83,22 +77,22 @@ en:
    copy:
      title: Copy
      description:
-        single: Set this feature for pasting.
-        multiple: Set these features for pasting.
+        one: Set this feature for pasting.
+        other: Set these features for pasting.
      annotation:
-        single: Copied a feature.
-        multiple: "Copied {n} features."
+        one: Copied a feature.
+        other: "Copied {n} features."
      too_large:
-        single: This can't be copied because not enough of it is currently visible.
-        multiple: These can't be copied because not enough of them are currently visible.
+        one: This can't be copied because not enough of it is currently visible.
+        other: These can't be copied because not enough of them are currently visible.
    paste:
      title: Paste
      description:
-        single: "Add a duplicate {feature} here."
-        multiple: "Add {n} duplicate features here."
+        one: "Add a duplicate {feature} here."
+        other: "Add {n} duplicate features here."
      annotation:
-        single: Pasted a feature.
-        multiple: "Pasted {n} features."
+        one: Pasted a feature.
+        other: "Pasted {n} features."
      nothing_copied: No features have been copied.
    circularize:
      title: Circularize
@@ -107,8 +101,9 @@ en:
        multiple: Make these features circular.
      key: O
      annotation:
-        single: Made a feature circular.
-        multiple: Made features circular.
+        feature:
+          one: Made a feature circular.
+          other: "Made {n} features circular."
      multiple_blockers:
        multiple: These can't be made circular for multiple reasons.
      not_closed:
@@ -138,11 +133,11 @@ en:
      key: Q
      annotation:
        corner:
-          single: Squared a corner.
-          multiple: Squared several corners.
+          one: Squared a corner.
+          other: "Squared {n} corners."
        feature:
-          single: Squared the corners of a feature.
-          multiple: Squared the corners of several features.
+          one: Squared the corners of a feature.
+          other: "Squared the corners of {n} features."
      multiple_blockers:
        multiple: These can't be squared for multiple reasons.
      end_vertex:
@@ -171,12 +166,15 @@ en:
        lines: Straighten these lines.
      key: S
      annotation:
-        points: Straightened several points.
-        line: Straightened a line.
-        lines: Straightened several lines.
+        point:
+          one: Straightened a point.
+          other: "Straightened {n} points."
+        line:
+          one: Straightened a line.
+          other: "Straightened {n} lines."
      too_bendy:
        single: This can't be straightened because it bends too much.
-        multiple: These can't be straighted because they bend too much.
+        multiple: These can't be straightened because they bend too much.
      connected_to_hidden:
        single: This can't be straightened because it is connected to a hidden feature.
        multiple: These can't be straightened because some are connected to hidden features.
@@ -200,7 +198,9 @@ en:
        line: Deleted a line.
        area: Deleted an area.
        relation: Deleted a relation.
-        multiple: "Deleted {n} features."
+        feature:
+          one: "Deleted a feature."
+          other: "Deleted {n} features."
      too_large:
        single: This feature can't be deleted because not enough of it is currently visible.
        multiple: These features can't be deleted because not enough of them are currently visible.
@@ -227,12 +227,14 @@ en:
        address: Remove all non-address tags.
      annotation:
        building:
-          single: Downgraded a feature to a basic building.
-          multiple: "Downgraded {n} features to basic buildings."
+          one: Downgraded a feature to a basic building.
+          other: "Downgraded {n} features to basic buildings."
        address:
-          single: Downgraded a feature to an address.
-          multiple: "Downgraded {n} features to addresses."
-        multiple: "Downgraded {n} features."
+          one: Downgraded a feature to an address.
+          other: "Downgraded {n} features to addresses."
+        generic:
+          one: "Downgraded a feature."
+          other: "Downgraded {n} features."
      has_wikidata_tag:
        single: This feature can't be downgraded because it has a Wikidata tag.
        multiple: These features can't be downgraded because some have Wikidata tags.
@@ -295,7 +297,9 @@ en:
      title: Merge
      description: Merge these features.
      key: C
-      annotation: "Merged {n} features."
+      annotation:
+        one: "Merged a feature."
+        other: "Merged {n} features."
      not_eligible: These features can't be merged.
      not_adjacent: These features can't be merged because their endpoints aren't connected.
      restriction: "These features can't be merged because it would damage a \"{relation}\" relation."
@@ -316,7 +320,9 @@ en:
        line: Moved a line.
        area: Moved an area.
        relation: Moved a relation.
-        multiple: Moved multiple features.
+        feature:
+          one: "Moved a feature."
+          other: "Moved {n} features."
      incomplete_relation:
        single: This feature can't be moved because it hasn't been fully downloaded.
        multiple: These features can't be moved because they haven't been fully downloaded.
@@ -331,37 +337,39 @@ en:
        multiple: These features can't be moved because parts of them have not yet been downloaded.
    reflect:
      title:
-        long: Reflect Long
-        short: Reflect Short
+        long: Flip Long
+        short: Flip Short
      description:
        long:
-          single: Reflect this feature across its long axis.
-          multiple: Reflect these features across their long axis.
+          single: Flip this feature across its long axis.
+          multiple: Flip these features across their long axis.
        short:
-          single: Reflect this feature across its short axis.
-          multiple: Reflect these features across their short axis.
+          single: Flip this feature across its short axis.
+          multiple: Flip these features across their short axis.
      key:
        long: T
        short: Y
      annotation:
        long:
-          single: Reflected a feature across its long axis.
-          multiple: Reflected multiple features across their long axis.
+          feature:
+            one: Flipped a feature across its long axis.
+            other: "Flipped {n} features across their long axis."
        short:
-          single: Reflected a feature across its short axis.
-          multiple: Reflected multiple features across their short axis.
+          feature:
+            one: Flipped a feature across its short axis.
+            other: "Flipped {n} features across their short axis."
      incomplete_relation:
-        single: This feature can't be reflected because it hasn't been fully downloaded.
-        multiple: These features can't be reflected because they haven't been fully downloaded.
+        single: This feature can't be flipped because it hasn't been fully downloaded.
+        multiple: These features can't be flipped because they haven't been fully downloaded.
      too_large:
-        single: This feature can't be reflected because not enough of it is currently visible.
-        multiple: These features can't be reflected because not enough of them are currently visible.
+        single: This feature can't be flipped because not enough of it is currently visible.
+        multiple: These features can't be flipped because not enough of them are currently visible.
      connected_to_hidden:
-        single: This feature can't be reflected because it is connected to a hidden feature.
-        multiple: These features can't be reflected because some are connected to hidden features.
+        single: This feature can't be flipped because it is connected to a hidden feature.
+        multiple: These features can't be flipped because some are connected to hidden features.
      not_downloaded:
-        single: This feature can't be reflected because parts of it have not yet been downloaded.
-        multiple: These features can't be reflected because parts of them have not yet been downloaded.
+        single: This feature can't be flipped because parts of it have not yet been downloaded.
+        multiple: These features can't be flipped because parts of them have not yet been downloaded.
    rotate:
      title: Rotate
      description:
@@ -371,8 +379,10 @@ en:
      annotation:
        line: Rotated a line.
        area: Rotated an area.
-        multiple: Rotated multiple features.
        relation: Rotated a relation.
+        feature:
+          one: Rotated a feature.
+          other: "Rotated {n} features."
      incomplete_relation:
        single: This feature can't be rotated because it hasn't been fully downloaded.
        multiple: These features can't be rotated because they haven't been fully downloaded.
@@ -395,11 +405,37 @@ en:
        features: Flip the directions of these features.
      key: V
      annotation:
-        point: Reversed a point.
-        points: Reversed multiple points.
-        line: Reversed a line.
-        lines: Reversed multiple lines.
-        features: Reversed multiple features.
+        point:
+          one: Reversed a point.
+          other: "Reversed {n} points."
+        line:
+          one: Reversed a line.
+          other: "Reversed {n} lines."
+        feature:
+          one: Reversed a feature.
+          other: "Reversed {n} features."
+    scale:
+      annotation:
+        down:
+          feature:
+            one: Scaled down a feature.
+            other: "Scaled down {n} features."
+        up:
+          feature:
+            one: Scaled up a feature.
+            other: "Scaled up {n} features."
+      too_small:
+        single: This feature can't be scaled down because it would become too small.
+        multiple: These features can't be scaled down because they would become too small.
+      too_large:
+        single: This feature can't be scaled because not enough of it is currently visible.
+        multiple: These features can't be scaled because not enough of them are currently visible.
+      connected_to_hidden:
+        single: This feature can't be scaled because it is connected to a hidden feature.
+        multiple: These features can't be scaled because some are connected to hidden features.
+      not_downloaded:
+        single: This feature can't be scaled because parts of it have not yet been downloaded.
+        multiple: These features can't be scaled because parts of them have not yet been downloaded.
    split:
      title: Split
      description:
@@ -410,7 +446,9 @@ en:
      annotation:
        line: Split a line.
        area: Split an area boundary.
-        multiple: "Split {n} lines/area boundaries."
+        feature:
+          one: "Split a feature."
+          other: "Split {n} features."
      not_eligible: Lines can't be split at their beginning or end.
      multiple_ways: There are too many lines here to split.
      connected_to_hidden: This can't be split because it is connected to a hidden feature.
@@ -434,8 +472,8 @@ en:
        feature:
          multiple: Extract points from these features.
      annotation:
-        single: Extracted a point.
-        multiple: "Extracted {n} points."
+        one: Extracted a point.
+        other: "Extracted {n} points."
      too_large:
        single: A point can't be extracted because not enough of this feature is visible.
        multiple: Points can't be extracted because not enough of these features are visible.
@@ -500,8 +538,9 @@ en:
    key: '`'
    tooltip: Toggle the sidebar.
  feature_info:
-    hidden_warning: "{count} hidden features"
-    hidden_details: "These features are currently hidden: {details}"
+    hidden_warning:
+      one: "{count} hidden feature"
+      other: "{count} hidden features"
  osm_api_status:
    message:
      error: Unable to reach the OpenStreetMap API. Your edits are safe locally. Check your network connection.
@@ -516,7 +555,7 @@ en:
    request_review: "I would like someone to review my edits."
    save: Upload
    cancel: Cancel
-    changes: "Changes ({count})"
+    changes: Changes
    download_changes: Download osmChange file
    errors: Errors
    warnings: Warnings
@@ -531,9 +570,14 @@ en:
    google_warning_link: https://www.openstreetmap.org/copyright
  contributors:
    list: "Edits by {users}"
-    truncated_list: "Edits by {users} and {count} others"
+    truncated_list:
+      one: "Edits by {users} and {count} other"
+      other: "Edits by {users} and {count} others"
  info_panels:
    key: I
+    selected:
+      one: "{n} selected"
+      other: "{n} selected"
    background:
      key: B
      title: Background
@@ -551,7 +595,6 @@ en:
    history:
      key: H
      title: History
-      selected: "{n} selected"
      no_history: "No History (New Feature)"
      version: Version
      last_edit: Last Edit
@@ -571,7 +614,6 @@ en:
    measurement:
      key: M
      title: Measurement
-      selected: "{n} selected"
      geometry: Geometry
      closed_line: closed line
      closed_area: closed area
@@ -620,7 +662,9 @@ en:
    choose_relation: Choose a parent relation
    role: Role
    choose: Select feature type
-    results: "{n} results for {search}"
+    results:
+      one: "{n} result for {search}"
+      other: "{n} results for {search}"
    no_documentation_key: "There is no documentation available."
    edit_reference: "edit/translate"
    wiki_reference: View documentation
@@ -870,10 +914,7 @@ en:
      delete: Leave Deleted
      download_changes: Or download osmChange file
      done: "All conflicts resolved!"
-      help: |
-        Another user changed some of the same map features you changed.
-        Click on each feature below for more details about the conflict, and choose whether to keep
-        your changes or the other user's changes.
+      help: "Another user changed some of the same map features you changed. Click on each feature below for more details about the conflict, and choose whether to keep your changes or the other user's changes."
  merge_remote_changes:
    conflict:
      deleted: 'This feature has been deleted by {user}.'
@@ -1454,8 +1495,8 @@ en:
      title: Street Level Photos
      intro: "Street level photos are useful for mapping traffic signs, businesses, and other details that you can't see from satellite and aerial images. The iD editor supports street level photos from [Bing Streetside](https://www.microsoft.com/en-us/maps/streetside), [Mapillary](https://www.mapillary.com), and [OpenStreetCam](https://www.openstreetcam.org)."
      using_h: "Using Street Level Photos"
-      using: "To use street level photos for mapping, open the {data_icon} **{map_data}** panel on the side of the map to enable or disable the available photo layers."
-      photos: "When enabled, the photo layer displays a line along the sequence of photos. At higher zoom levels, a circle marks at each photo location, and at even higher zoom levels, a cone indicates the direction the camera was facing when the photo was taken."
+      using: "To use street level photos for mapping, open the {data_icon} **{map_data}** panel on the side of the map to enable or disable the available photo overlays."
+      photos: "When enabled, the photo overlay displays a line along the sequence of photos. At higher zoom levels, a circle marks at each photo location, and at even higher zoom levels, a cone indicates the direction the camera was facing when the photo was taken."
      viewer: "When you select one of the photo locations, a photo viewer appears in the bottom corner of the map. The photo viewer contains controls to step forward and backward in the image sequence. It also shows the username of the person who captured the image, the date it was captured, and a link to view the image on the original site."
    gps:
      title: GPS Traces
@@ -1507,11 +1548,11 @@ en:
  issues:
    title: Issues
    key: I
-    list_title: "Issues ({count})"
+    list_title: "Issues"
    errors:
-      list_title: "Errors ({count})"
+      list_title: "Errors"
    warnings:
-      list_title: "Warnings ({count})"
+      list_title: "Warnings"
    rules:
      title: Rules
    user_resolved_issues: Issues resolved by your edits
@@ -1544,7 +1585,7 @@ en:
    suggested: "Suggested updates:"
    enable_all: Enable All
    disable_all: Disable All
-    reset_ignored: Reset Ignored ({count})
+    reset_ignored: Reset Ignored
    fix_one:
      title: fix
    fix_all:
@@ -1607,10 +1648,9 @@ en:
      tip: "Find unroutable roads, paths, and ferry routes"
      routable:
        message:
-          multiple: "{count} routable features are connected only to each other."
+          one: "{highway} is disconnected from other roads and paths"
+          other: "{count} routable features are connected only to each other"
        reference: "All roads, paths, and ferry routes should connect to form a single routing network."
-      highway:
-        message: "{highway} is disconnected from other roads and paths"
    fixme_tag:
      message: '{feature} has a "Fix Me" request'
      reference: 'A "fixme" tag indicates that a mapper has requested help with a feature.'
@@ -2171,17 +2211,19 @@ en:
        merge: "Combine (merge) selected features"
        disconnect: "Disconnect selected features"
        extract: "Extract a point from a feature"
-        split: "Split a line into two at the selected node"
+        split: "Split features at the selected points"
        reverse: "Reverse selected features"
        move: "Move selected features"
        nudge: "Nudge selected features"
        nudge_more: "Nudge selected features by a lot"
+        scale: "Scale selected features"
+        scale_more: "Scale selected features by a lot"
        rotate: "Rotate selected features"
        orthogonalize: "Square corners of a line or area"
        straighten: "Straighten a line or points"
        circularize: "Circularize a closed line or area"
-        reflect_long: "Reflect features across the longer axis"
-        reflect_short: "Reflect features across the shorter axis"
+        reflect_long: "Flip features across the longer axis"
+        reflect_short: "Flip features across the shorter axis"
        delete: "Delete selected features"
      commands:
        title: "Commands"
@@ -7,6 +7,10 @@
    "old": {"aeroway": "aerobridge"},
    "replace": {"aeroway": "jet_bridge", "highway": "corridor"}
  },
+  {
+    "old": {"access": "customer"},
+    "replace": {"access": "customers"}
+  },
  {
    "old": {"access": "public"},
    "replace": {"access": "yes"}
@@ -111,6 +115,10 @@
    "old": {"amenity": "kiosk"},
    "replace": {"shop": "kiosk"}
  },
+  {
+    "old": {"amenity": "notice_board"},
+    "replace": {"advertising": "board"}
+  },
  {
    "old": {"amenity": "nursery"},
    "replace": {"amenity": "kindergarten"}
@@ -219,6 +227,10 @@
    "old": {"barrier": "wood_fence"},
    "replace": {"barrier": "fence", "fence_type": "wood"}
  },
+  {
+    "old": {"amenity": "bench", "capacity": "*"},
+    "replace": {"amenity": "bench", "seats": "$1"}
+  },
  {
    "old": {"bicycle:oneway": "*"},
    "replace": {"oneway:bicycle": "$1"}
@@ -470,6 +482,14 @@
    "old": {"escalator": "*"},
    "replace": {"highway": "steps", "conveying": "$1"}
  },
+  {
+    "old": {"fast_food": "pizza"},
+    "replace": {"cuisine": "pizza"}
+  },
+  {
+    "old": {"fast_food": "shawarma"},
+    "replace": {"cuisine": "shawarma"}
+  },
  {
    "old": {"fee": "0"},
    "replace": {"fee": "no"}
@@ -1138,6 +1158,10 @@
    "old": {"rwn_expected_route_relations": "*"},
    "replace": {"expected_rwn_route_relations": "$1"}
  },
+  {
+    "old": {"service": "drive_through"},
+    "replace": {"service": "drive-through"}
+  },
  {
    "old": {"shop": "adult"},
    "replace": {"shop": "erotic"}
@@ -367,6 +367,11 @@ en:
        label: Building
        # 'terms: structure'
        terms: '[translate with synonyms or related terms for ''Building'', separated by commas]'
+      building/flats:
+        # 'building:flats=*'
+        label: Units
+        # building/flats field placeholder
+        placeholder: '2, 4, 6, 8...'
      building/levels:
        # 'building:levels=*'
        label: Levels
@@ -625,6 +630,9 @@ en:
      date:
        # date=*
        label: Date
+      defibrillator/location:
+        # 'defibrillator:location=*'
+        label: Location Description
      delivery:
        # delivery=*
        label: Delivery
@@ -757,6 +765,11 @@ en:
          anticlockwise: Counterclockwise
          # direction=clockwise
          clockwise: Clockwise
+      direction_point:
+        # direction=*
+        label: Direction (Degrees Clockwise)
+        # direction_point field placeholder
+        placeholder: '45, 90, 180, 270'
      direction_vertex:
        # direction=*
        label: Direction Affected
@@ -1623,6 +1636,8 @@ en:
          undefined: Assumed to be No
          # oneway=yes
          'yes': 'Yes'
+        # 'terms: bidirectional,oneway,unidirectional'
+        terms: '[translate with synonyms or related terms for ''One Way'', separated by commas]'
      oneway/bicycle:
        # 'oneway:bicycle=*'
        label: One Way (Bicycles)
@@ -1713,6 +1728,14 @@ en:
          surface: Surface
          # parking=underground
          underground: Underground
+      parking_entrance:
+        # parking=*
+        label: Type
+        options:
+          # parking=multi-storey
+          multi-storey: Multilevel
+          # parking=underground
+          underground: Underground
      parking_space:
        # parking_space=*
        label: Type
@@ -1920,6 +1943,11 @@ en:
      population:
        # population=*
        label: Population
+      portable:
+        # portable=*
+        label: Portable
+        # 'terms: detached,mobile,moveable'
+        terms: '[translate with synonyms or related terms for ''Portable'', separated by commas]'
      post:
        # 'post:block_number=*, post:city=*, post:block_number=*, post:conscriptionnumber=*, post:county=*, post:country=*, post:county=*, post:district=*, post:floor=*, post:hamlet=*, post:housename=*, post:housenumber=*, post:neighbourhood=*, post:place=*, post:postcode=*, post:province=*, post:quarter=*, post:state=*, post:street=*, post:subdistrict=*, post:suburb=*, post:unit=*'
        label: Delivery Address
@@ -2560,6 +2588,9 @@ en:
      target:
        # target=*
        label: Target
+      telecom:
+        # telecom=*
+        label: Type
      telecom/medium:
        # 'telecom:medium=*'
        label: Medium
@@ -2746,6 +2777,26 @@ en:
      valve:
        # valve=*
        label: Type
+      vehicles:
+        # 'bus=*, trolleybus=*, tram=*, train=*, subway=*, light_rail=*, monorail=*, ferry=*'
+        label: Vehicles
+        options:
+          # bus=yes
+          bus: Bus
+          # ferry=yes
+          ferry: Ferry
+          # light_rail=yes
+          light_rail: Light Rail
+          # monorail=yes
+          monorail: Monorail
+          # subway=yes
+          subway: Subway
+          # train=yes
+          train: Train
+          # tram=yes
+          tram: Tram
+          # trolleybus=yes
+          trolleybus: Trolleybus
      vending:
        # vending=*
        label: Types of Goods
@@ -2822,6 +2873,11 @@ en:
      water_source:
        # water_source=*
        label: Water Source
+      water_tank/volume:
+        # 'water_tank:volume=*'
+        label: Volume (Liters)
+        # water_tank/volume field placeholder
+        placeholder: '10000, 20000, 30000…'
      water_volume:
        # water_volume=*
        label: Water Reserve Volume (m³)
@@ -3147,6 +3203,11 @@ en:
        name: Biergarten
        # 'terms: beer,bier,booze'
        terms: '<translate with synonyms or related terms for ''Biergarten'', separated by commas>'
+      amenity/binoculars:
+        # amenity=binoculars
+        name: Mounted Binoculars
+        # 'terms: observation viewer,optical ranger,spotting scope,sight,spyglass,telescope,tower viewer,viewfinder,viewing stand'
+        terms: '<translate with synonyms or related terms for ''Mounted Binoculars'', separated by commas>'
      amenity/boat_rental:
        # amenity=boat_rental
        name: Boat Rental
@@ -3167,7 +3228,7 @@ en:
      amenity/cafe/bubble_tea:
        # 'amenity=cafe, cuisine=bubble_tea'
        name: Bubble Tea Cafe
-        # 'terms: boba,bubble milk tea,pearl milk tea,taiwanese tea drink,tapioca'
+        # 'terms: boba,bubble milk tea,pearl milk tea,taiwanese tea drink,tapioca,pearl tea,boba drink'
        terms: '<translate with synonyms or related terms for ''Bubble Tea Cafe'', separated by commas>'
      amenity/cafe/coffee_shop:
        # 'amenity=cafe, cuisine=coffee_shop'
@@ -3351,6 +3412,11 @@ en:
      amenity/fast_food/ice_cream:
        # 'amenity=fast_food, cuisine=ice_cream'
        name: Ice Cream Fast Food
+      amenity/fast_food/juice:
+        # 'amenity=fast_food, cuisine=juice'
+        name: Juice Fast Food
+        # 'terms: cafe,café,beverages,fruit drinks,juice bar,shakes,smoothies'
+        terms: '<translate with synonyms or related terms for ''Juice Fast Food'', separated by commas>'
      amenity/fast_food/kebab:
        # 'amenity=fast_food, cuisine=kebab'
        name: Kebab Fast Food
@@ -3671,6 +3737,11 @@ en:
        name: Pub
        # 'terms: alcohol,drink,dive,beer,bier,booze'
        terms: '<translate with synonyms or related terms for ''Pub'', separated by commas>'
+      amenity/pub/irish:
+        # 'amenity=pub, theme=irish'
+        name: Irish Pub
+        # 'terms: irish pub,irish bar'
+        terms: '<translate with synonyms or related terms for ''Irish Pub'', separated by commas>'
      amenity/pub/lgbtq:
        # 'amenity=pub, lgbtq=primary'
        name: LGBTQ+ Pub
@@ -3959,6 +4030,11 @@ en:
        name: Pit Latrine
        # 'terms: head,lavatory,long drop,outhouse,pit toilet,privy'
        terms: '<translate with synonyms or related terms for ''Pit Latrine'', separated by commas>'
+      amenity/toilets/portable:
+        # 'amenity=toilets, portable=yes'
+        name: Portable Toilet
+        # 'terms: restroom,privy,porta john,porta potty,portapot,chemical toilet'
+        terms: '<translate with synonyms or related terms for ''Portable Toilet'', separated by commas>'
      amenity/townhall:
        # amenity=townhall
        name: Town Hall
@@ -5471,6 +5547,11 @@ en:
        name: Tertiary Link
        # 'terms: on ramp,off ramp,ramp,road,street'
        terms: '<translate with synonyms or related terms for ''Tertiary Link'', separated by commas>'
+      highway/toll_gantry:
+        # highway=toll_gantry
+        name: Open Road Toll
+        # 'terms: license plate camera toll,cashless toll,electronic toll,free-flow toll,toll gantry,transponder toll'
+        terms: '<translate with synonyms or related terms for ''Open Road Toll'', separated by commas>'
      highway/track:
        # highway=track
        name: Unmaintained Track Road
@@ -5818,6 +5899,7 @@ en:
      landuse/quarry:
        # landuse=quarry
        name: Quarry
+        # 'terms: aggregate quarry,open pit mine,sand mine,sand pit,sand quarry,sandpit'
        terms: '<translate with synonyms or related terms for ''Quarry'', separated by commas>'
      landuse/railway:
        # landuse=railway
@@ -6222,6 +6304,11 @@ en:
        name: Swimming Pool Facility
        # 'terms: dive,water'
        terms: '<translate with synonyms or related terms for ''Swimming Pool Facility'', separated by commas>'
+      leisure/sports_hall:
+        # leisure=sports_hall
+        name: Gymnasium
+        # 'terms: athletic courts,gym,sports hall,sports venue'
+        terms: '<translate with synonyms or related terms for ''Gymnasium'', separated by commas>'
      leisure/stadium:
        # leisure=stadium
        name: Stadium
@@ -6336,6 +6423,11 @@ en:
        # man_made=cutline
        name: Cut line
        terms: '<translate with synonyms or related terms for ''Cut line'', separated by commas>'
+      man_made/dovecote:
+        # man_made=dovecote
+        name: Dovecote
+        # 'terms: birds,doocot,dovecot,doves,pigeonholes,pigeons'
+        terms: '<translate with synonyms or related terms for ''Dovecote'', separated by commas>'
      man_made/dyke:
        # man_made=dyke
        name: Levee
@@ -7573,9 +7665,9 @@ en:
        terms: '<translate with synonyms or related terms for ''Railway Under Construction'', separated by commas>'
      railway/crossing:
        # railway=crossing
-        name: Railway Crossing (Path)
-        # 'terms: crossing,pedestrian crossing,railroad crossing,level crossing,grade crossing,path through railroad,train crossing'
-        terms: '<translate with synonyms or related terms for ''Railway Crossing (Path)'', separated by commas>'
+        name: Railway-Path Crossing
+        # 'terms: crossing,path railway crossing,pedestrian crossing,level crossing,grade crossing,railroad crossing,railway path crossing,path through railroad,train crossing'
+        terms: '<translate with synonyms or related terms for ''Railway-Path Crossing'', separated by commas>'
      railway/derail:
        # railway=derail
        name: Railway Derailer
@@ -7595,9 +7687,9 @@ en:
        name: Train Station (Halt / Request)
      railway/level_crossing:
        # railway=level_crossing
-        name: Railway Crossing (Road)
-        # 'terms: crossing,railroad crossing,level crossing,grade crossing,road through railroad,train crossing'
-        terms: '<translate with synonyms or related terms for ''Railway Crossing (Road)'', separated by commas>'
+        name: Railway-Road Crossing
+        # 'terms: crossing,level crossing,grade crossing,railroad crossing,railway road crossing,road railway crossing,road through railroad,train crossing'
+        terms: '<translate with synonyms or related terms for ''Railway-Road Crossing'', separated by commas>'
      railway/light_rail:
        # railway=light_rail
        name: Light Rail Track
@@ -7645,6 +7737,11 @@ en:
        name: High-Speed Train Track
        # 'terms: bullet train,fast rail,high speed rail,highspeed rail,HSR'
        terms: '<translate with synonyms or related terms for ''High-Speed Train Track'', separated by commas>'
+      railway/railway_crossing:
+        # railway=railway_crossing
+        name: Railway-Railway Crossing
+        # 'terms: diamond crossing,flat crossing,level junction,railway railway crossing'
+        terms: '<translate with synonyms or related terms for ''Railway-Railway Crossing'', separated by commas>'
      railway/signal:
        # railway=signal
        name: Railway Signal
@@ -7678,6 +7775,16 @@ en:
        name: Tram Track
        # 'terms: electric street railway,light rail,streetcar,tramway,trolley'
        terms: '<translate with synonyms or related terms for ''Tram Track'', separated by commas>'
+      railway/tram_crossing:
+        # railway=tram_crossing
+        name: Tram-Path Crossing
+        # 'terms: crossing,grade crossing,level crossing,path tram crossing,pedestrian crossing,streetcar crossing,tram path crossing,tramway crossing,trolley crossing'
+        terms: '<translate with synonyms or related terms for ''Tram-Path Crossing'', separated by commas>'
+      railway/tram_level_crossing:
+        # railway=tram_level_crossing
+        name: Tram-Road Crossing
+        # 'terms: crossing,grade crossing,level crossing,pedestrian crossing,road tram crossing,streetcar crossing,tram road crossing,tramway crossing,trolley crossing'
+        terms: '<translate with synonyms or related terms for ''Tram-Road Crossing'', separated by commas>'
      railway/tram_stop:
        # railway=tram_stop
        name: Tram Stopping Position
@@ -8252,7 +8359,7 @@ en:
      shop/music:
        # shop=music
        name: Music Store
-        # 'terms: tape casettes,CDs,compact discs,vinyl records'
+        # 'terms: tape cassettes,CDs,compact discs,vinyl records,CD store,casette,casette store'
        terms: '<translate with synonyms or related terms for ''Music Store'', separated by commas>'
      shop/musical_instrument:
        # shop=musical_instrument
@@ -8357,7 +8464,7 @@ en:
      shop/scuba_diving:
        # shop=scuba_diving
        name: Scuba Diving Shop
-        # 'terms: diving,scuba'
+        # 'terms: diving,scuba,snorkel'
        terms: '<translate with synonyms or related terms for ''Scuba Diving Shop'', separated by commas>'
      shop/seafood:
        # shop=seafood
@@ -8407,7 +8514,7 @@ en:
      shop/supermarket:
        # shop=supermarket
        name: Supermarket
-        # 'terms: grocery,store,shop'
+        # 'terms: grocery,store,shop,grocery store,market,food market'
        terms: '<translate with synonyms or related terms for ''Supermarket'', separated by commas>'
      shop/supermarket/organic:
        # 'shop=supermarket, organic=only'
@@ -8521,6 +8628,11 @@ en:
        name: Wholesale Store
        # 'terms: warehouse club,cash and carry'
        terms: '<translate with synonyms or related terms for ''Wholesale Store'', separated by commas>'
+      shop/wigs:
+        # shop=wigs
+        name: Wig Shop
+        # 'terms: hair extentions'
+        terms: '<translate with synonyms or related terms for ''Wig Shop'', separated by commas>'
      shop/window_blind:
        # shop=window_blind
        name: Window Blind Store
@@ -8529,6 +8641,9 @@ en:
        # shop=wine
        name: Wine Shop
        terms: '<translate with synonyms or related terms for ''Wine Shop'', separated by commas>'
+      telecom:
+        # telecom=*
+        name: Telecom Feature
      telecom/data_center:
        # telecom=data_center
        name: Data Center
@@ -8654,6 +8769,11 @@ en:
        # 'tourism=information, information=board'
        name: Information Board
        terms: '<translate with synonyms or related terms for ''Information Board'', separated by commas>'
+      tourism/information/board/welcome_sign:
+        # 'tourism=information, information=board, board_type=welcome_sign'
+        name: Welcome Sign
+        # 'terms: new location'
+        terms: '<translate with synonyms or related terms for ''Welcome Sign'', separated by commas>'
      tourism/information/guidepost:
        # 'tourism=information, information=guidepost'
        name: Guidepost
@@ -8665,8 +8785,9 @@ en:
        terms: '<translate with synonyms or related terms for ''Map'', separated by commas>'
      tourism/information/office:
        # 'tourism=information, information=office'
-        name: Tourist Information Office
-        terms: '<translate with synonyms or related terms for ''Tourist Information Office'', separated by commas>'
+        name: Visitor Center
+        # 'terms: information office,tour guide,tourism office,tourist information center,visitors center,visitors information center,welcome center'
+        terms: '<translate with synonyms or related terms for ''Visitor Center'', separated by commas>'
      tourism/information/route_marker:
        # 'tourism=information, information=route_marker'
        name: Trail Marker
@@ -8793,26 +8914,11 @@ en:
        name: City Limit Sign
        # 'terms: town,village,hamlet,boundary,edge,border,road,highway'
        terms: '<translate with synonyms or related terms for ''City Limit Sign'', separated by commas>'
-      traffic_sign/city_limit_vertex:
-        # traffic_sign=city_limit
-        name: City Limit Sign
-        # 'terms: town,village,hamlet,boundary,edge,border,road,highway'
-        terms: '<translate with synonyms or related terms for ''City Limit Sign'', separated by commas>'
      traffic_sign/maxspeed:
        # traffic_sign=maxspeed
        name: Speed Limit Sign
        # 'terms: max speed,maximum speed,road,highway'
        terms: '<translate with synonyms or related terms for ''Speed Limit Sign'', separated by commas>'
-      traffic_sign/maxspeed_vertex:
-        # traffic_sign=maxspeed
-        name: Speed Limit Sign
-        # 'terms: max speed,maximum speed,road,highway'
-        terms: '<translate with synonyms or related terms for ''Speed Limit Sign'', separated by commas>'
-      traffic_sign_vertex:
-        # traffic_sign=*
-        name: Traffic Sign
-        # 'terms: road,highway'
-        terms: '<translate with synonyms or related terms for ''Traffic Sign'', separated by commas>'
      type/boundary:
        # type=boundary
        name: Boundary
@@ -30,7 +30,7 @@ A basic preset is of the form:
    ],
    // The geometry types for which this preset is valid.
    // options are point, area, line, and vertex.
-    // vertexes are points that are parts of lines, like the nodes in a road
+    // vertices are points that are parts of lines, like the nodes in a road
    // lines are unclosed ways, and areas are closed ways
    "geometry": [
        "point", "area"
@@ -197,7 +197,7 @@ By default, presets are available everywhere.

 ##### `notCountryCodes`

-An array of two-letter, lowercase [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) country codes. Similar to `countryCodes` except a blacklist instead of a whitelist.
+An array of two-letter, lowercase [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) country codes. Similar to `countryCodes` except a blocklist.

 ##### `replacement`

@@ -270,8 +270,10 @@ A string specifying the UI and behavior of the field. Must be one of the followi
 * `combo` - Dropdown field for picking one option out of many (e.g. `surface=*`)
 * `typeCombo` - Dropdown field picking a specific type from a generic category key<br/>
 (e.g. `waterway=*`.  If unset, tag will be `waterway=yes`, but dropdown contains options like `stream`, `ditch`, `river`)
-* `multiCombo` - Dropdown field for adding `yes` values to a common multikey<br/>
+* `multiCombo` - Dropdown field for adding `yes` values to multiple keys with the same prefix (a common multikey)<br/>
 (e.g. `recycling:*` -> `recycling:glass=yes`, `recycling:paper=yes`, etc.)
+* `manyCombo` - Dropdown field for adding `yes` values to many different keys<br/>
+(e.g. `bus`, `tram`, `train` -> `bus=yes`, `tram=yes`, etc.)
 * `networkCombo` - Dropdown field that helps users pick a route `network` tag (localized for editing location)
 * `semiCombo` - Dropdown field for adding multiple values to a semicolon-delimited list<br/>
 (e.g. `sport=*` -> `soccer;lacrosse;athletics;field_hockey`)
@@ -379,7 +381,7 @@ For combo fields, spaces are replaced with underscores in the tag value if `snak

 ##### `caseSensitive`

-For combo fields, case-sensitve field values are allowed if `caseSensitive` is `true`. The default is `false`.
+For combo fields, case-sensitive field values are allowed if `caseSensitive` is `true`. The default is `false`.

 ##### `min_value`

@@ -423,7 +425,7 @@ By default, fields are available everywhere.

 ##### `notCountryCodes`

-An array of two-letter, lowercase [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) country codes. Similar to `countryCodes` except a blacklist instead of a whitelist.
+An array of two-letter, lowercase [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) country codes. Similar to `countryCodes` except a blocklist.

 ##### `urlFormat`

@@ -57,6 +57,7 @@
  "bridge/support": {"key": "bridge:support", "type": "typeCombo", "label": "Type"},
  "building_area": {"key": "building", "type": "combo", "default": "yes", "geometry": ["area"], "label": "Building"},
  "building": {"key": "building", "type": "combo", "label": "Building", "terms": ["structure"]},
+  "building/flats": {"key": "building:flats", "type": "number", "minValue": 0, "label": "Units", "placeholder": "2, 4, 6, 8..."},
  "building/levels_building": {"key": "building:levels", "type": "number", "minValue": 0, "label": "Building Levels", "placeholder": "2, 4, 6...", "prerequisiteTag": {"key": "building", "valueNot": "no"}},
  "building/levels": {"key": "building:levels", "type": "number", "minValue": 0, "label": "Levels", "placeholder": "2, 4, 6..."},
  "building/levels/underground": {"key": "building:levels:underground", "type": "number", "minValue": 0, "label": "Underground Levels", "placeholder": "2, 4, 6...", "terms": ["basement levels"]},
@@ -107,6 +108,7 @@
  "cycleway": {"keys": ["cycleway", "cycleway:left", "cycleway:right"], "reference": {"key": "cycleway"}, "type": "cycleway", "label": "Bike Lanes", "placeholder": "none", "strings": {"types": {"cycleway:left": "Left side", "cycleway:right": "Right side"}, "options": {"none": {"title": "None", "description": "No bike lane"}, "lane": {"title": "Standard bike lane", "description": "A bike lane separated from auto traffic by a painted line"}, "shared_lane": {"title": "Shared bike lane", "description": "A bike lane with no separation from auto traffic"}, "track": {"title": "Bike track", "description": "A bike lane separated from traffic by a physical barrier"}, "share_busway": {"title": "Bike lane shared with bus", "description": "A bike lane shared with a bus lane"}, "opposite_lane": {"title": "Opposite bike lane", "description": "A bike lane that travels in the opposite direction of traffic"}, "opposite": {"title": "Contraflow bike lane", "description": "A bike lane that travels in both directions on a one-way street"}}}},
  "dance/style": {"key": "dance:style", "type": "semiCombo", "label": "Dance Styles"},
  "date": {"key": "date", "type": "check", "label": "Date"},
+  "defibrillator/location": {"key": "defibrillator:location", "type": "textarea", "label": "Location Description"},
  "delivery": {"key": "delivery", "type": "check", "label": "Delivery"},
  "denomination": {"key": "denomination", "type": "combo", "label": "Denomination", "prerequisiteTag": {"key": "religion", "valueNot": "none"}},
  "denotation": {"key": "denotation", "type": "combo", "label": "Denotation"},
@@ -129,6 +131,7 @@
  "diplomatic/services": {"key": "diplomatic:services:", "type": "multiCombo", "label": "Services"},
  "direction_cardinal": {"key": "direction", "type": "combo", "label": "Direction", "strings": {"options": {"N": "North", "E": "East", "S": "South", "W": "West", "NE": "Northeast", "SE": "Southeast", "SW": "Southwest", "NW": "Northwest", "NNE": "North-northeast", "ENE": "East-northeast", "ESE": "East-southeast", "SSE": "South-southeast", "SSW": "South-southwest", "WSW": "West-southwest", "WNW": "West-northwest", "NNW": "North-northwest"}}},
  "direction_clock": {"key": "direction", "type": "combo", "label": "Direction", "strings": {"options": {"clockwise": "Clockwise", "anticlockwise": "Counterclockwise"}}},
+  "direction_point": {"key": "direction", "type": "number", "label": "Direction (Degrees Clockwise)", "placeholder": "45, 90, 180, 270", "geometry": ["point"]},
  "direction_vertex_dual": {"key": "direction", "type": "combo", "label": "Direction Affected", "strings": {"options": {"forward": "Forward", "backward": "Backward"}}},
  "direction_vertex": {"key": "direction", "type": "combo", "label": "Direction Affected", "strings": {"options": {"forward": "Forward", "backward": "Backward", "both": "Both / All"}}},
  "direction": {"key": "direction", "type": "number", "label": "Direction (Degrees Clockwise)", "placeholder": "45, 90, 180, 270"},
@@ -297,7 +300,7 @@
  "note": {"key": "note", "type": "textarea", "universal": true, "icon": "note", "label": "Note", "terms": ["comment"]},
  "office": {"key": "office", "type": "typeCombo", "label": "Type"},
  "oneway_yes": {"key": "oneway", "type": "onewayCheck", "label": "One Way", "strings": {"options": {"undefined": "Assumed to be Yes", "yes": "Yes", "no": "No", "reversible": "Reversible", "alternating": "Alternating"}}},
-  "oneway": {"key": "oneway", "type": "onewayCheck", "label": "One Way", "strings": {"options": {"undefined": "Assumed to be No", "yes": "Yes", "no": "No", "reversible": "Reversible", "alternating": "Alternating"}}},
+  "oneway": {"key": "oneway", "type": "onewayCheck", "label": "One Way", "strings": {"options": {"undefined": "Assumed to be No", "yes": "Yes", "no": "No", "reversible": "Reversible", "alternating": "Alternating"}}, "terms": ["bidirectional", "oneway", "unidirectional"]},
  "oneway/bicycle": {"key": "oneway:bicycle", "type": "check", "label": "One Way (Bicycles)", "prerequisiteTag": {"key": "oneway"}},
  "openfire": {"key": "openfire", "type": "check", "label": "Open Fires Allowed"},
  "opening_date": {"key": "opening_date", "type": "text", "label": "Expected Opening Date", "placeholder": "YYYY-MM-DD"},
@@ -309,6 +312,7 @@
  "outdoor_seating": {"key": "outdoor_seating", "type": "check", "label": "Outdoor Seating"},
  "par": {"key": "par", "type": "number", "minValue": 1, "label": "Par", "placeholder": "3, 4, 5..."},
  "park_ride": {"key": "park_ride", "type": "check", "label": "Park and Ride"},
+  "parking_entrance": {"key": "parking", "type": "combo", "label": "Type", "strings": {"options": {"underground": "Underground", "multi-storey": "Multilevel"}}},
  "parking_space": {"key": "parking_space", "type": "combo", "label": "Type"},
  "parking": {"key": "parking", "type": "combo", "label": "Type", "strings": {"options": {"surface": "Surface", "underground": "Underground", "multi-storey": "Multilevel", "lane": "Roadside Lane", "carports": "Carports", "garage_boxes": "Garage Boxes", "rooftop": "Rooftop", "sheds": "Sheds"}}},
  "payment_multi_fee": {"key": "payment:", "type": "multiCombo", "label": "Payment Types", "prerequisiteTag": {"key": "fee", "valueNot": "no"}},
@@ -334,6 +338,7 @@
  "plots": {"key": "plots", "type": "number", "minValue": 0, "label": "Plots", "placeholder": "10, 20, 30..."},
  "polling_station": {"key": "polling_station", "type": "check", "label": "Polling Place", "terms": ["voting place"]},
  "population": {"key": "population", "type": "text", "label": "Population"},
+  "portable": {"key": "portable", "type": "check", "label": "Portable", "terms": ["detached", "mobile", "moveable"]},
  "post": {"type": "address", "key": "post", "keys": ["post:block_number", "post:city", "post:block_number", "post:conscriptionnumber", "post:county", "post:country", "post:county", "post:district", "post:floor", "post:hamlet", "post:housename", "post:housenumber", "post:neighbourhood", "post:place", "post:postcode", "post:province", "post:quarter", "post:state", "post:street", "post:subdistrict", "post:suburb", "post:unit"], "label": "Delivery Address"},
  "power_supply": {"key": "power_supply", "type": "check", "label": "Power Supply"},
  "power": {"key": "power", "type": "typeCombo", "label": "Type"},
@@ -449,6 +454,7 @@
  "tactile_paving": {"key": "tactile_paving", "type": "check", "label": "Tactile Paving"},
  "takeaway": {"key": "takeaway", "type": "combo", "label": "Takeaway", "placeholder": "Yes, No, Takeaway Only...", "strings": {"options": {"yes": "Yes", "no": "No", "only": "Takeaway Only"}}, "terms": ["take out", "takeout"]},
  "target": {"key": "target", "type": "combo", "label": "Target"},
+  "telecom": {"key": "telecom", "type": "combo", "label": "Type"},
  "telecom/medium": {"key": "telecom:medium", "type": "combo", "label": "Medium"},
  "tidal": {"key": "tidal", "type": "check", "label": "Tidal"},
  "to": {"key": "to", "type": "text", "label": "To"},
@@ -466,7 +472,7 @@
  "trade": {"key": "trade", "type": "typeCombo", "label": "Type"},
  "traffic_calming": {"key": "traffic_calming", "type": "typeCombo", "label": "Type"},
  "traffic_sign": {"key": "traffic_sign", "type": "typeCombo", "label": "Traffic Sign"},
-  "traffic_sign/direction": {"key": "traffic_sign:direction", "type": "combo", "label": "Direction Affected", "strings": {"options": {"forward": "Forward", "backward": "Backward", "both": "Both / All"}}},
+  "traffic_sign/direction": {"key": "traffic_sign:direction", "type": "combo", "label": "Direction Affected", "strings": {"options": {"forward": "Forward", "backward": "Backward", "both": "Both / All"}}, "geometry": ["vertex"]},
  "traffic_signals": {"key": "traffic_signals", "type": "combo", "label": "Type", "default": "signal"},
  "traffic_signals/direction": {"key": "traffic_signals:direction", "type": "combo", "label": "Direction Affected", "strings": {"options": {"forward": "Forward", "backward": "Backward", "both": "Both / All"}}},
  "trail_visibility": {"key": "trail_visibility", "type": "combo", "label": "Trail Visibility", "placeholder": "Excellent, Good, Bad...", "strings": {"options": {"excellent": "Excellent: unambiguous path or markers everywhere", "good": "Good: markers visible, sometimes require searching", "intermediate": "Intermediate: few markers, path mostly visible", "bad": "Bad: no markers, path sometimes invisible/pathless", "horrible": "Horrible: often pathless, some orientation skills required", "no": "No: pathless, excellent orientation skills required"}}},
@@ -480,6 +486,7 @@
  "utility_semi": {"key": "utility", "type": "semiCombo", "label": "Utilities"},
  "utility": {"key": "utility", "type": "typeCombo", "label": "Utility"},
  "valve": {"key": "valve", "type": "combo", "label": "Type"},
+  "vehicles": {"keys": ["bus", "trolleybus", "tram", "train", "subway", "light_rail", "monorail", "ferry"], "type": "manyCombo", "label": "Vehicles", "strings": {"options": {"bus": "Bus", "trolleybus": "Trolleybus", "tram": "Tram", "train": "Train", "subway": "Subway", "light_rail": "Light Rail", "monorail": "Monorail", "ferry": "Ferry"}}, "reference": {"key": "public_transport"}, "prerequisiteTag": {"keyNot": "aerialway"}},
  "vending": {"key": "vending", "type": "semiCombo", "label": "Types of Goods"},
  "vhf": {"key": "vhf", "type": "text", "label": "VHF Channel", "terms": ["call sign", "very high frequency"]},
  "video_calls": {"key": "video", "type": "check", "label": "Video Calls"},
@@ -495,6 +502,7 @@
  "waste": {"key": "waste", "type": "semiCombo", "label": "Waste"},
  "water_point": {"key": "water_point", "type": "check", "label": "Water Point"},
  "water_source": {"key": "water_source", "default": "main", "type": "combo", "label": "Water Source"},
+  "water_tank/volume": {"key": "water_tank:volume", "type": "text", "label": "Volume (Liters)", "placeholder": "10000, 20000, 30000…"},
  "water_volume": {"key": "water_volume", "type": "number", "label": "Water Reserve Volume (m³)", "snake_case": false},
  "water": {"key": "water", "type": "combo", "label": "Type"},
  "waterway": {"key": "waterway", "type": "typeCombo", "label": "Type"},
@@ -5,4 +5,4 @@
    "terms": [
        "structure"
    ]
-}
+}
@@ -0,0 +1,7 @@
+{
+    "key": "building:flats",
+    "type": "number",
+    "minValue": 0,
+    "label": "Units",
+    "placeholder": "2, 4, 6, 8..."
+}
@@ -4,4 +4,4 @@
    "minValue": 0,
    "label": "Capacity",
    "placeholder": "50, 100, 200..."
-}
+}
@@ -0,0 +1,5 @@
+{
+    "key": "defibrillator:location",
+    "type": "textarea",
+    "label": "Location Description"
+}
@@ -0,0 +1,9 @@
+{
+    "key": "direction",
+    "type": "number",
+    "label": "Direction (Degrees Clockwise)",
+    "placeholder": "45, 90, 180, 270",
+    "geometry": [
+        "point"
+    ]
+}
@@ -10,5 +10,10 @@
            "reversible": "Reversible",
            "alternating": "Alternating"
        }
-    }
+    },
+    "terms": [
+        "bidirectional",
+        "oneway",
+        "unidirectional"
+    ]
 }
@@ -0,0 +1,11 @@
+{
+    "key": "parking",
+    "type": "combo",
+    "label": "Type",
+    "strings": {
+        "options": {
+            "underground": "Underground",
+            "multi-storey": "Multilevel"
+        }
+    }
+}
@@ -0,0 +1,10 @@
+{
+    "key": "portable",
+    "type": "check",
+    "label": "Portable",
+    "terms": [
+        "detached",
+        "mobile",
+        "moveable"
+    ]
+}
@@ -0,0 +1,5 @@
+{
+    "key": "telecom",
+    "type": "combo",
+    "label": "Type"
+}
@@ -8,5 +8,8 @@
          "backward": "Backward",
          "both": "Both / All"
        }
-    }
+    },
+    "geometry": [
+        "vertex"
+    ]
 }
@@ -0,0 +1,32 @@
+{
+    "keys": [
+        "bus",
+        "trolleybus",
+        "tram",
+        "train",
+        "subway",
+        "light_rail",
+        "monorail",
+        "ferry"
+    ],
+    "type": "manyCombo",
+    "label": "Vehicles",
+    "strings": {
+        "options": {
+            "bus": "Bus",
+            "trolleybus": "Trolleybus",
+            "tram": "Tram",
+            "train": "Train",
+            "subway": "Subway",
+            "light_rail": "Light Rail",
+            "monorail": "Monorail",
+            "ferry": "Ferry"
+        }
+    },
+    "reference": {
+        "key": "public_transport"
+    },
+    "prerequisiteTag": {
+        "keyNot": "aerialway"
+    }
+}
@@ -0,0 +1,6 @@
+{
+    "key": "water_tank:volume",
+    "type": "text",
+    "label": "Volume (Liters)",
+    "placeholder": "10000, 20000, 30000…"
+}
@@ -19,6 +19,7 @@
  "power": {"icon": "temaki-power", "geometry": ["point", "vertex", "line", "area"], "tags": {"power": "*"}, "fields": ["power"], "moreFields": ["material"], "searchable": false, "name": "Power Feature"},
  "railway": {"icon": "temaki-rail_profile", "fields": ["railway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"railway": "*"}, "searchable": false, "name": "Railway Feature"},
  "seamark": {"icon": "maki-harbor", "fields": ["seamark/type"], "geometry": ["point", "vertex", "line", "area"], "tags": {"seamark:type": "*"}, "searchable": false, "name": "Seamark"},
+  "telecom": {"icon": "temaki-cable", "fields": ["telecom", "operator"], "geometry": ["point", "vertex", "line", "area"], "tags": {"telecom": "*"}, "searchable": false, "name": "Telecom Feature"},
  "tourism": {"icon": "maki-attraction", "fields": ["name", "tourism"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "*"}, "searchable": false, "name": "Tourism Feature"},
  "waterway": {"fields": ["name", "waterway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"waterway": "*"}, "searchable": false, "name": "Waterway Feature"},
  "addr/interpolation": {"fields": ["addr/interpolation"], "geometry": ["line"], "tags": {"addr:interpolation": "*"}, "name": "Address Interpolation", "searchable": false, "matchScore": 0.2},
@@ -43,7 +44,7 @@
  "aerialway/zip_line": {"geometry": ["line"], "fields": ["name", "oneway_yes", "aerialway/duration", "maxweight", "access_simple"], "tags": {"aerialway": "zip_line"}, "terms": ["aerial runway", "canopy", "flying fox", "foefie slide", "gravity propelled aerial ropeslide", "Tyrolean traverse", "zip wire", "zip-line", "zipline", "zipwire"], "name": "Zip Line"},
  "aeroway/aerodrome": {"icon": "temaki-airport", "fields": ["name", "iata", "icao", "address", "operator", "operator/type", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["area", "point"], "tags": {"aeroway": "aerodrome"}, "terms": ["aerodrome", "aeroway", "airplane", "airport", "jet", "plane"], "matchScore": 0.9, "name": "Airport"},
  "aeroway/apron": {"icon": "temaki-planes", "fields": ["ref", "surface"], "geometry": ["area"], "tags": {"aeroway": "apron"}, "terms": ["aircraft parking", "flight line", "hardstand", "ramp", "tarmac", "taxiway"], "name": "Airport Apron"},
-  "aeroway/gate": {"icon": "fas-plane", "fields": ["ref_aeroway_gate"], "geometry": ["point"], "tags": {"aeroway": "gate"}, "name": "Airport Gate"},
+  "aeroway/gate": {"icon": "fas-plane", "fields": ["ref_aeroway_gate"], "geometry": ["point", "vertex"], "tags": {"aeroway": "gate"}, "name": "Airport Gate"},
  "aeroway/hangar": {"icon": "temaki-hangar", "fields": ["name", "building_area"], "geometry": ["area"], "tags": {"aeroway": "hangar"}, "addTags": {"building": "hangar", "aeroway": "hangar"}, "name": "Hangar"},
  "aeroway/helipad": {"icon": "maki-heliport", "fields": ["name", "ref", "operator", "surface", "lit"], "moreFields": ["access_simple", "address", "charge_fee", "fee", "opening_hours", "opening_hours/covid19"], "geometry": ["area", "point"], "tags": {"aeroway": "helipad"}, "terms": ["helicopter", "helipad", "heliport"], "name": "Helipad"},
  "aeroway/holding_position": {"icon": "temaki-plane_taxiing", "fields": ["ref"], "geometry": ["vertex"], "tags": {"aeroway": "holding_position"}, "name": "Aircraft Holding Position"},
@@ -78,10 +79,11 @@
  "amenity/bicycle_rental": {"icon": "temaki-bicycle_rental", "fields": ["capacity", "network", "operator", "operator/type", "fee", "payment_multi_fee"], "moreFields": ["address", "covered", "email", "fax", "level", "opening_hours", "opening_hours/covid19", "phone", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["bike", "bicycle", "bikeshare", "bike share", "bicycle share", "cycle dock", "cycle hub", "cycleshare", "cycling"], "tags": {"amenity": "bicycle_rental"}, "name": "Bicycle Rental"},
  "amenity/bicycle_repair_station": {"icon": "temaki-bicycle_repair", "fields": ["operator", "brand", "opening_hours", "opening_hours/covid19", "fee", "payment_multi_fee", "charge_fee", "service/bicycle"], "moreFields": ["colour", "covered", "indoor", "level", "manufacturer"], "geometry": ["point", "vertex"], "terms": ["bike chain", "bike multitool", "bike repair", "bike tools", "cycle pump", "cycle repair", "cycling"], "tags": {"amenity": "bicycle_repair_station"}, "name": "Bicycle Repair Tool Stand"},
  "amenity/biergarten": {"icon": "fas-beer", "fields": ["name", "address", "opening_hours", "opening_hours/covid19", "outdoor_seating", "brewery"], "moreFields": ["{amenity/bar}", "building_area", "cuisine"], "geometry": ["point", "area"], "tags": {"amenity": "biergarten"}, "terms": ["beer", "bier", "booze"], "name": "Biergarten"},
+  "amenity/binoculars": {"icon": "temaki-binoculars", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "direction", "height", "ele_node"], "moreFields": ["colour", "covered", "indoor", "lit", "manufacturer", "ref"], "geometry": ["point"], "terms": ["observation viewer", "optical ranger", "spotting scope", "sight", "spyglass", "telescope", "tower viewer", "viewfinder", "viewing stand"], "tags": {"amenity": "binoculars"}, "name": "Mounted Binoculars"},
  "amenity/boat_rental": {"icon": "temaki-boat_rental", "fields": ["name", "operator", "operator/type", "opening_hours", "opening_hours/covid19", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["access_simple", "address", "email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "boat_rental"}, "name": "Boat Rental"},
  "amenity/bureau_de_change": {"icon": "temaki-money_hand", "fields": ["name", "operator", "payment_multi", "currency_multi", "address", "building_area"], "moreFields": ["email", "fax", "level", "opening_hours", "opening_hours/covid19", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bureau de change", "money changer"], "tags": {"amenity": "bureau_de_change"}, "name": "Currency Exchange"},
-  "amenity/cafe": {"icon": "maki-cafe", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "opening_hours/covid19", "outdoor_seating", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "bar", "brand", "capacity", "delivery", "diet_multi", "email", "fax", "gnis/feature_id", "level", "min_age", "not/name", "payment_multi", "phone", "ref/vatin", "reservation", "smoking", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"},
-  "amenity/cafe/bubble_tea": {"icon": "temaki-bubble_tea", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "cuisine": "bubble_tea"}, "reference": {"key": "cuisine", "value": "bubble_tea"}, "terms": ["boba", "bubble milk tea", "pearl milk tea", "taiwanese tea drink", "tapioca"], "name": "Bubble Tea Cafe"},
+  "amenity/cafe": {"icon": "maki-cafe", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "opening_hours/covid19", "outdoor_seating", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website"], "moreFields": ["air_conditioning", "bar", "brand", "capacity", "delivery", "diet_multi", "email", "fax", "gnis/feature_id", "level", "min_age", "not/name", "payment_multi", "ref/vatin", "reservation", "smoking", "takeaway", "wheelchair"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"},
+  "amenity/cafe/bubble_tea": {"icon": "temaki-bubble_tea", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "cuisine": "bubble_tea"}, "reference": {"key": "cuisine", "value": "bubble_tea"}, "terms": ["boba", "bubble milk tea", "pearl milk tea", "taiwanese tea drink", "tapioca", "pearl tea", "boba drink"], "name": "Bubble Tea Cafe"},
  "amenity/cafe/coffee_shop": {"icon": "temaki-hot_drink_cup", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "cuisine": "coffee_shop"}, "reference": {"key": "cuisine", "value": "coffee_shop"}, "terms": ["americano", "brew", "cafe", "café", "caffe", "caffè", "cappuccino", "cocoa", "coffee shop", "drip", "espresso", "hot drinks", "latte", "macchiato", "tea"], "name": "Coffeehouse"},
  "amenity/car_pooling": {"icon": "temaki-car_pool", "fields": ["name", "operator", "operator/type", "capacity", "address", "opening_hours", "opening_hours/covid19", "lit"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_pooling"}, "terms": ["car sharing", "carpooling", "lift sharing", "ride sharing"], "name": "Car Pooling Station"},
  "amenity/car_rental": {"icon": "maki-car-rental", "fields": ["name", "operator", "address", "opening_hours", "opening_hours/covid19", "payment_multi"], "moreFields": ["brand", "email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_rental"}, "name": "Car Rental"},
@@ -112,13 +114,14 @@
  "amenity/driving_school": {"icon": "maki-car", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours", "opening_hours/covid19"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "driving_school"}, "name": "Driving School"},
  "amenity/events_venue": {"icon": "fas-users", "fields": ["name", "operator", "building_area", "address", "website", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "min_age", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "events_venue"}, "terms": ["banquet hall", "baptism", "Bar Mitzvah", "Bat Mitzvah", "birthdays", "celebrations", "conferences", "confirmation", "meetings", "parties", "party", "quinceañera", "reunions", "weddings"], "name": "Events Venue"},
  "amenity/exhibition_centre": {"icon": "fas-user-tie", "fields": ["name", "operator", "operator/type", "building_area", "address", "website", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "not/name", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "exhibition_centre"}, "terms": ["exhibition center", "fair", "exhibition", "exposition", "trade fair", "trade show", "trade exhibition", "expo", "tradeshow"], "name": "Exposition Center"},
-  "amenity/fast_food": {"icon": "maki-fast-food", "fields": ["name", "cuisine", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19", "drive_through"], "moreFields": ["air_conditioning", "brand", "capacity", "delivery", "diet_multi", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "opening_hours/covid19", "outdoor_seating", "payment_multi", "phone", "ref/vatin", "smoking", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "fast_food"}, "terms": ["restaurant", "takeaway"], "name": "Fast Food"},
+  "amenity/fast_food": {"icon": "maki-fast-food", "fields": ["name", "cuisine", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19", "drive_through", "phone", "website"], "moreFields": ["air_conditioning", "brand", "capacity", "delivery", "diet_multi", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "opening_hours/covid19", "outdoor_seating", "payment_multi", "ref/vatin", "smoking", "takeaway", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "fast_food"}, "terms": ["restaurant", "takeaway"], "name": "Fast Food"},
  "amenity/fast_food/ice_cream": {"icon": "fas-ice-cream", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "ice_cream"}, "reference": {"key": "cuisine", "value": "ice_cream"}, "name": "Ice Cream Fast Food", "searchable": false},
  "amenity/fast_food/burger": {"icon": "maki-fast-food", "geometry": ["point", "area"], "terms": ["breakfast", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "burger"}, "reference": {"key": "cuisine", "value": "burger"}, "name": "Burger Fast Food"},
  "amenity/fast_food/chicken": {"icon": "fas-drumstick-bite", "geometry": ["point", "area"], "terms": ["breakfast", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "chicken"}, "reference": {"key": "cuisine", "value": "chicken"}, "name": "Chicken Fast Food"},
  "amenity/fast_food/donut": {"icon": "temaki-donut", "geometry": ["point", "area"], "terms": ["breakfast", "brunch", "cafe", "canteen", "coffee", "dine", "diner", "donut", "doughnut", "dining", "eat", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "donut"}, "reference": {"key": "cuisine", "value": "donut"}, "name": "Donut Fast Food"},
  "amenity/fast_food/fish_and_chips": {"icon": "fas-fish", "geometry": ["point", "area"], "terms": ["breakfast", "cafe", "café", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "french fries"], "tags": {"amenity": "fast_food", "cuisine": "fish_and_chips"}, "reference": {"key": "cuisine", "value": "fish_and_chips"}, "name": "Fish & Chips Fast Food"},
  "amenity/fast_food/hot_dog": {"icon": "fas-hotdog", "geometry": ["point", "area"], "terms": ["ballpark", "frankfurter", "frank", "hotdog stand", "sandwich", "sausage", "wiener"], "tags": {"amenity": "fast_food", "cuisine": "hot_dog"}, "reference": {"key": "cuisine", "value": "hot_dog"}, "name": "Hot Dog Fast Food"},
+  "amenity/fast_food/juice": {"icon": "temaki-drink_cup", "geometry": ["point", "area"], "terms": ["cafe", "café", "beverages", "fruit drinks", "juice bar", "shakes", "smoothies"], "tags": {"amenity": "fast_food", "cuisine": "juice"}, "reference": {"key": "cuisine", "value": "juice"}, "name": "Juice Fast Food"},
  "amenity/fast_food/kebab": {"icon": "temaki-vertical_rotisserie", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "kebab"}, "reference": {"key": "cuisine", "value": "kebab"}, "name": "Kebab Fast Food"},
  "amenity/fast_food/mexican": {"icon": "fas-pepper-hot", "geometry": ["point", "area"], "terms": ["breakfast", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "tacos", "burritos", "enchiladas", "fajitas", "nachos", "tortillas", "salsa", "tamales", "quesadillas"], "tags": {"amenity": "fast_food", "cuisine": "mexican"}, "reference": {"key": "cuisine", "value": "mexican"}, "name": "Mexican Fast Food"},
  "amenity/fast_food/pizza": {"icon": "maki-restaurant-pizza", "geometry": ["point", "area"], "terms": ["dine", "dining", "dinner", "drive-in", "eat", "lunch", "table", "deep dish", "thin crust", "slice"], "tags": {"amenity": "fast_food", "cuisine": "pizza"}, "reference": {"key": "cuisine", "value": "pizza"}, "name": "Pizza Fast Food"},
@@ -134,7 +137,7 @@
  "amenity/hospital": {"icon": "maki-hospital", "fields": ["name", "operator", "operator/type", "healthcare/speciality", "address", "emergency"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["area", "point"], "terms": ["clinic", "doctor", "emergency room", "health", "infirmary", "institution", "sanatorium", "sanitarium", "sick", "surgery", "ward"], "tags": {"amenity": "hospital"}, "addTags": {"amenity": "hospital", "healthcare": "hospital"}, "reference": {"key": "amenity", "value": "hospital"}, "name": "Hospital Grounds"},
  "amenity/hunting_stand": {"icon": "temaki-binoculars", "fields": ["access_simple", "lockable"], "geometry": ["point", "vertex", "area"], "terms": ["game", "gun", "lookout", "rifle", "shoot*", "wild", "watch"], "tags": {"amenity": "hunting_stand"}, "name": "Hunting Stand"},
  "amenity/ice_cream": {"icon": "fas-ice-cream", "fields": ["name", "address", "building_area", "opening_hours", "opening_hours/covid19", "outdoor_seating"], "moreFields": ["delivery", "diet_multi", "drive_through", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["gelato", "sorbet", "sherbet", "frozen", "yogurt"], "tags": {"amenity": "ice_cream"}, "name": "Ice Cream Shop"},
-  "amenity/internet_cafe": {"icon": "temaki-antenna", "fields": ["name", "operator", "operator/type", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "min_age", "opening_hours", "opening_hours/covid19", "outdoor_seating", "payment_multi", "phone", "ref/vatin", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"},
+  "amenity/internet_cafe": {"icon": "temaki-antenna", "fields": ["name", "operator", "operator/type", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "min_age", "opening_hours", "opening_hours/covid19", "outdoor_seating", "payment_multi", "ref/vatin", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"},
  "amenity/karaoke_box": {"icon": "maki-karaoke", "fields": ["name", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19", "website"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "min_age", "payment_multi", "phone", "ref/vatin", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["karaoke club", "karaoke room", "karaoke television", "KTV"], "tags": {"amenity": "karaoke_box"}, "name": "Karaoke Box"},
  "amenity/kindergarten": {"icon": "temaki-school", "fields": ["name", "operator", "operator/type", "address", "phone", "preschool"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "max_age", "min_age", "not/name", "opening_hours", "opening_hours/covid19", "payment_multi", "website", "wheelchair"], "geometry": ["area", "point"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool / Kindergarten Grounds"},
  "amenity/kneipp_water_cure": {"icon": "maki-hospital", "fields": ["kneipp_water_cure_multi", "opening_hours", "opening_hours/covid19", "fee"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "kneipp_water_cure"}, "reference": {"key": "amenity", "value": "kneipp_water_cure"}, "name": "Kneipp Water Cure"},
@@ -151,7 +154,7 @@
  "amenity/music_school": {"icon": "fas-music", "fields": ["name", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["school of music"], "tags": {"amenity": "music_school"}, "name": "Music School"},
  "amenity/nightclub": {"icon": "fas-cocktail", "fields": ["name", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19", "min_age", "smoking"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair", "fee"], "geometry": ["point", "area"], "tags": {"amenity": "nightclub"}, "terms": ["disco*", "night club", "dancing", "dance club"], "name": "Nightclub"},
  "amenity/nightclub/lgbtq": {"icon": "fas-cocktail", "geometry": ["point", "area"], "tags": {"amenity": "nightclub", "lgbtq": "primary"}, "terms": ["gay nightclub", "lesbian nightclub", "lgbtq nightclub", "lgbt nightclub", "lgb nightclub"], "name": "LGBTQ+ Nightclub"},
-  "amenity/parking_entrance": {"icon": "maki-entrance-alt1", "fields": ["ref", "access_simple", "address", "level"], "geometry": ["vertex"], "tags": {"amenity": "parking_entrance"}, "name": "Parking Garage Entrance / Exit"},
+  "amenity/parking_entrance": {"icon": "maki-entrance-alt1", "fields": ["parking_entrance", "ref", "access_simple", "address", "level"], "geometry": ["vertex"], "tags": {"amenity": "parking_entrance"}, "name": "Parking Garage Entrance / Exit"},
  "amenity/parking_space": {"icon": "temaki-parking_space", "fields": ["parking_space", "capacity"], "geometry": ["area", "point", "vertex"], "tags": {"amenity": "parking_space"}, "addTags": {"amenity": "parking_space", "capacity": "1"}, "terms": ["parking spot", "parking stall"], "matchScore": 0.95, "name": "Parking Space"},
  "amenity/parking_space/disabled": {"icon": "temaki-accessible_space", "geometry": ["area", "point", "vertex"], "tags": {"amenity": "parking_space", "parking_space": "disabled"}, "addTags": {"amenity": "parking_space", "parking_space": "disabled", "capacity": "1"}, "terms": ["disability", "disabled parking stall", "handicap parking spot", "wheelchair"], "matchScore": 0.95, "name": "Accessible Parking Space"},
  "amenity/parking": {"icon": "temaki-car_parked", "fields": ["operator", "operator/type", "parking", "capacity_parking", "capacity/disabled_parking", "access_simple", "fee", "payment_multi_fee", "charge_fee", "surface"], "moreFields": ["address", "covered", "email", "fax", "maxstay", "name", "opening_hours", "opening_hours/covid19", "park_ride", "phone", "ref", "supervised", "website", "wheelchair"], "geometry": ["area", "point", "vertex"], "tags": {"amenity": "parking"}, "terms": ["automobile parking", "car lot", "car parking", "rv parking", "truck parking", "vehicle parking"], "name": "Parking Lot"},
@@ -183,6 +186,7 @@
  "amenity/prep_school": {"icon": "temaki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["academic", "ACT", "SAT", "homework", "math", "reading", "test prep", "tutoring", "writing"], "tags": {"amenity": "prep_school"}, "name": "Test Prep / Tutoring School"},
  "amenity/prison": {"icon": "maki-prison", "fields": ["name", "operator", "operator/type", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["area", "point"], "terms": ["cell", "jail", "correction"], "tags": {"amenity": "prison"}, "name": "Prison Grounds"},
  "amenity/pub": {"icon": "maki-beer", "fields": ["name", "address", "building_area", "opening_hours", "opening_hours/covid19", "smoking", "brewery"], "moreFields": ["air_conditioning", "cuisine", "diet_multi", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "min_age", "outdoor_seating", "payment_multi", "phone", "ref/vatin", "real_fire", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pub"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze"], "name": "Pub"},
+  "amenity/pub/irish": {"name": "Irish Pub", "icon": "maki-beer", "geometry": ["point", "area"], "tags": {"amenity": "pub", "theme": "irish"}, "reference": {"key": "theme", "value": "irish"}, "terms": ["irish pub", "irish bar"], "notCountryCodes": ["ie"]},
  "amenity/pub/lgbtq": {"icon": "maki-beer", "geometry": ["point", "area"], "tags": {"amenity": "pub", "lgbtq": "primary"}, "terms": ["gay pub", "lesbian pub", "lgbtq pub", "lgbt pub", "lgb pub"], "name": "LGBTQ+ Pub"},
  "amenity/pub/microbrewery": {"icon": "maki-beer", "geometry": ["point", "area"], "tags": {"amenity": "pub", "microbrewery": "yes"}, "reference": {"key": "microbrewery"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze", "craft brewery", "microbrewery", "small batch brewery"], "name": "Brewpub"},
  "amenity/public_bath": {"icon": "maki-water", "fields": ["name", "bath/type", "bath/open_air", "bath/sand_bath", "address", "building_area", "fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "opening_hours", "opening_hours/covid19", "payment_multi_fee", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "public_bath"}, "terms": ["onsen", "foot bath", "hot springs"], "name": "Public Bath"},
@@ -194,7 +198,7 @@
  "amenity/recycling/container/green_waste": {"icon": "maki-recycling", "fields": ["{amenity/recycling_container}"], "moreFields": ["{amenity/recycling_container}"], "geometry": ["point", "area"], "terms": ["biodegradable", "biological", "compost", "decomposable", "garbage bin", "garden waste", "organic", "rubbish", "food scrap"], "tags": {"amenity": "recycling", "recycling_type": "container", "recycling:green_waste": "yes"}, "reference": {"key": "recycling:green_waste", "value": "yes"}, "name": "Green Waste Container"},
  "amenity/refugee_site": {"icon": "tnp-2120771", "fields": ["name", "operator", "operator/type", "informal", "start_date", "capacity", "population"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "website"], "geometry": ["point", "area"], "tags": {"amenity": "refugee_site"}, "terms": ["displaced people", "evacuees", "migrants", "ngo", "refugee site"], "name": "Refugee Camp"},
  "amenity/research_institute": {"icon": "fas-flask", "fields": ["name", "operator", "operator/type", "address", "website", "internet_access", "internet_access/fee"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access/ssid", "phone", "wheelchair"], "geometry": ["point", "area"], "terms": ["applied research", "experimentation", "r&d", "r & d", "r and d", "research and development", "research institution", "research laboratory", "research labs"], "tags": {"amenity": "research_institute"}, "name": "Research Institute Grounds"},
-  "amenity/restaurant": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "opening_hours/covid19", "phone", "website"], "moreFields": ["air_conditioning", "bar", "brand", "brewery", "capacity", "delivery", "diet_multi", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "min_age", "not/name", "outdoor_seating", "ref/vatin", "reservation", "smoking", "stars", "takeaway", "wheelchair"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant"}, "name": "Restaurant"},
+  "amenity/restaurant": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "diet_multi", "address", "building_area", "opening_hours", "opening_hours/covid19", "phone", "website"], "moreFields": ["air_conditioning", "bar", "brand", "brewery", "capacity", "delivery", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "min_age", "not/name", "outdoor_seating", "ref/vatin", "reservation", "smoking", "stars", "takeaway", "wheelchair"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant"}, "name": "Restaurant"},
  "amenity/restaurant/american": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "american"}, "reference": {"key": "cuisine", "value": "american"}, "name": "American Restaurant"},
  "amenity/restaurant/asian": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "asian"}, "reference": {"key": "cuisine", "value": "asian"}, "name": "Asian Restaurant"},
  "amenity/restaurant/chinese": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "chinese"}, "reference": {"key": "cuisine", "value": "chinese"}, "name": "Chinese Restaurant"},
@@ -215,11 +219,11 @@
  "amenity/restaurant/vietnamese": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "vietnamese"}, "reference": {"key": "cuisine", "value": "vietnamese"}, "name": "Vietnamese Restaurant"},
  "amenity/sanitary_dump_station": {"icon": "temaki-camper_trailer_dump", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "water_point"], "moreFields": ["opening_hours", "opening_hours/covid19"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper", "Sanitary", "Dump Station", "Elsan", "CDP", "CTDP", "Chemical Toilet"], "tags": {"amenity": "sanitary_dump_station"}, "name": "RV Toilet Disposal"},
  "amenity/school": {"icon": "temaki-school", "fields": ["name", "operator", "operator/type", "address", "grades", "religion", "denomination", "website"], "moreFields": ["charge_fee", "email", "fax", "fee", "gnis/feature_id", "internet_access", "internet_access/ssid", "level", "phone", "polling_station", "wheelchair"], "geometry": ["area", "point"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"amenity": "school"}, "name": "School Grounds"},
-  "amenity/shelter": {"icon": "maki-shelter", "fields": ["name", "shelter_type", "building_area", "bench", "bin"], "moreFields": ["gnis/feature_id", "lit", "lockable", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["lean-to", "gazebo", "picnic"], "tags": {"amenity": "shelter"}, "name": "Shelter"},
+  "amenity/shelter": {"icon": "maki-shelter", "fields": ["name", "operator", "shelter_type", "building_area", "bench", "bin"], "moreFields": ["gnis/feature_id", "lit", "lockable", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["lean-to", "gazebo", "picnic"], "tags": {"amenity": "shelter"}, "name": "Shelter"},
  "amenity/shelter/gazebo": {"icon": "maki-shelter", "fields": ["name", "building_area", "bench", "lit"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "gazebo"}, "name": "Gazebo"},
  "amenity/shelter/lean_to": {"icon": "temaki-sleep_shelter", "fields": ["name", "operator", "building_area"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "lean_to"}, "terms": ["alpine hut", "cabin", "leanto", "lodging", "overnight accommodations", "sleeping shelter", "wilderness hut"], "name": "Lean-To"},
-  "amenity/shelter/picnic_shelter": {"icon": "temaki-picnic_shelter", "fields": ["name", "shelter_type", "building_area", "lit", "bin"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "picnic_shelter"}, "reference": {"key": "shelter_type", "value": "picnic_shelter"}, "terms": ["pavilion"], "name": "Picnic Shelter"},
-  "amenity/shelter/public_transport": {"icon": "temaki-transit_shelter", "fields": ["name", "shelter_type", "building_area", "bench", "lit"], "geometry": ["point", "area"], "terms": ["bus stop", "metro stop", "public transit shelter", "public transport shelter", "tram stop shelter", "waiting"], "tags": {"amenity": "shelter", "shelter_type": "public_transport"}, "reference": {"key": "shelter_type", "value": "public_transport"}, "name": "Transit Shelter"},
+  "amenity/shelter/picnic_shelter": {"icon": "temaki-picnic_shelter", "fields": ["name", "operator", "building_area", "lit", "bin"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "picnic_shelter"}, "reference": {"key": "shelter_type", "value": "picnic_shelter"}, "terms": ["pavilion"], "name": "Picnic Shelter"},
+  "amenity/shelter/public_transport": {"icon": "temaki-transit_shelter", "fields": ["name", "operator", "building_area", "bench", "lit", "bin"], "geometry": ["point", "area"], "terms": ["bus stop", "metro stop", "public transit shelter", "public transport shelter", "tram stop shelter", "waiting"], "tags": {"amenity": "shelter", "shelter_type": "public_transport"}, "reference": {"key": "shelter_type", "value": "public_transport"}, "name": "Transit Shelter"},
  "amenity/shower": {"icon": "temaki-shower", "fields": ["opening_hours", "opening_hours/covid19", "access_simple", "fee", "payment_multi_fee", "charge_fee", "supervised", "building_area", "hot_water", "wheelchair"], "moreFields": ["address", "gender", "level", "operator"], "geometry": ["point", "vertex", "area"], "terms": ["rain closet"], "tags": {"amenity": "shower"}, "name": "Shower"},
  "amenity/smoking_area": {"icon": "fas-smoking", "fields": ["name", "shelter", "bin", "bench", "opening_hours", "opening_hours/covid19"], "moreFields": ["covered", "level", "lit", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "smoking_area"}, "name": "Smoking Area"},
  "amenity/social_centre": {"icon": "fas-handshake", "fields": ["name", "brand", "operator", "operator/type", "address", "building_area"], "moreFields": ["air_conditioning", "baby_feeding", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["event", "fraternal", "fraternity", "hall", "organization", "professional", "society", "sorority", "union", "vetern"], "tags": {"amenity": "social_centre"}, "name": "Social Center"},
@@ -238,9 +242,10 @@
  "amenity/telephone": {"icon": "fas-phone-alt", "fields": ["operator", "phone", "fee", "payment_multi_fee", "charge_fee", "booth"], "moreFields": ["covered", "indoor", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "lit", "ref", "sms", "video_calls", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "telephone"}, "terms": ["phone"], "name": "Telephone"},
  "amenity/theatre": {"icon": "maki-theatre", "fields": ["name", "operator", "address", "building_area", "website"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "min_age", "payment_multi", "phone", "wheelchair"], "geometry": ["point", "area"], "terms": ["theatre", "performance", "play", "musical"], "tags": {"amenity": "theatre"}, "name": "Theater"},
  "amenity/theatre/type/amphi": {"icon": "maki-theatre", "fields": ["name", "operator", "address", "lit"], "geometry": ["point", "area"], "terms": ["open air", "outdoor", "greek", "ampi"], "tags": {"amenity": "theatre", "theatre:type": "amphi"}, "name": "Amphitheatre"},
-  "amenity/toilets": {"icon": "maki-toilet", "fields": ["toilets/disposal", "access_simple", "gender", "changing_table", "wheelchair", "building_area"], "moreFields": ["charge_fee", "fee", "level", "opening_hours", "opening_hours/covid19", "operator", "payment_multi_fee", "toilets/handwashing", "toilets/position"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "restroom", "outhouse", "privy", "head", "lavatory", "latrine", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets"}, "name": "Toilets"},
+  "amenity/toilets": {"icon": "maki-toilet", "fields": ["toilets/disposal", "access_simple", "gender", "changing_table", "wheelchair", "building_area"], "moreFields": ["charge_fee", "fee", "level", "opening_hours", "opening_hours/covid19", "operator", "payment_multi_fee", "portable", "toilets/handwashing", "toilets/position"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "restroom", "outhouse", "privy", "head", "lavatory", "latrine", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets"}, "name": "Toilets"},
  "amenity/toilets/disposal/flush": {"icon": "fas-toilet", "fields": ["toilets/disposal", "{amenity/toilets}"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "head", "lavatory", "privy", "restroom", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets", "toilets:disposal": "flush"}, "reference": {"key": "toilets:disposal", "value": "flush"}, "name": "Flush Toilets"},
  "amenity/toilets/disposal/pitlatrine": {"icon": "tnp-2009541", "fields": ["toilets/disposal", "{amenity/toilets}", "toilets/handwashing"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "vertex", "area"], "terms": ["head", "lavatory", "long drop", "outhouse", "pit toilet", "privy"], "tags": {"amenity": "toilets", "toilets:disposal": "pitlatrine"}, "reference": {"key": "toilets:disposal", "value": "pitlatrine"}, "name": "Pit Latrine"},
+  "amenity/toilets/portable": {"icon": "tnp-2009541", "fields": ["toilets/disposal", "{amenity/toilets}", "toilets/handwashing"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "area", "vertex"], "terms": ["restroom", "privy", "porta john", "porta potty", "portapot", "chemical toilet"], "addTags": {"amenity": "toilets", "toilets:disposal": "chemical", "portable": "yes"}, "tags": {"amenity": "toilets", "portable": "yes"}, "reference": {"key": "toilets:disposal", "value": "chemical"}, "name": "Portable Toilet"},
  "amenity/townhall": {"icon": "temaki-town_hall", "fields": ["name", "operator", "townhall/type", "address", "building_area"], "moreFields": ["baby_feeding", "email", "fax", "gnis/feature_id", "phone", "polling_station", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["village", "city", "government", "courthouse", "municipal"], "tags": {"amenity": "townhall"}, "name": "Town Hall"},
  "amenity/townhall/city": {"icon": "temaki-capitol", "geometry": ["point", "area"], "terms": ["council", "courthouse", "government", "mayor", "municipality"], "tags": {"amenity": "townhall", "townhall:type": "city"}, "reference": {"key": "townhall:type", "value": "city"}, "name": "City Hall"},
  "amenity/toy_library": {"icon": "fas-chess-knight", "fields": ["operator", "address", "building_area", "opening_hours", "opening_hours/covid19"], "moreFields": ["level", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["game", "toy"], "tags": {"amenity": "toy_library"}, "name": "Toy Library"},
@@ -339,7 +344,7 @@
  "building/bunker": {"icon": "temaki-bunker", "geometry": ["area"], "tags": {"building": "bunker"}, "matchScore": 0.5, "name": "Bunker", "searchable": false},
  "building/entrance": {"icon": "maki-entrance-alt1", "fields": [], "moreFields": [], "geometry": ["vertex"], "tags": {"building": "entrance"}, "name": "Entrance/Exit", "searchable": false},
  "building/train_station": {"icon": "maki-building", "geometry": ["point", "vertex", "area"], "tags": {"building": "train_station"}, "matchScore": 0.5, "name": "Train Station Building", "searchable": false},
-  "building/apartments": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "apartments"}, "matchScore": 0.5, "name": "Apartment Building"},
+  "building/apartments": {"icon": "maki-building", "fields": ["{building}", "building/flats"], "geometry": ["area"], "tags": {"building": "apartments"}, "matchScore": 0.5, "name": "Apartment Building"},
  "building/barn": {"icon": "temaki-barn", "geometry": ["area"], "tags": {"building": "barn"}, "matchScore": 0.5, "name": "Barn"},
  "building/boathouse": {"icon": "maki-harbor", "geometry": ["area"], "tags": {"building": "boathouse"}, "matchScore": 0.5, "terms": [], "name": "Boathouse"},
  "building/bungalow": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "bungalow"}, "terms": ["home", "detached"], "matchScore": 0.5, "name": "Bungalow"},
@@ -390,9 +395,9 @@
  "building/transportation": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "transportation"}, "matchScore": 0.5, "name": "Transportation Building"},
  "building/university": {"icon": "fas-school", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["college"], "tags": {"building": "university"}, "matchScore": 0.5, "name": "University Building"},
  "building/warehouse": {"icon": "maki-warehouse", "geometry": ["area"], "tags": {"building": "warehouse"}, "matchScore": 0.5, "name": "Warehouse"},
-  "club": {"icon": "fas-handshake", "fields": ["name", "club", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19"], "moreFields": ["access_simple", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "max_age", "min_age", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"club": "*"}, "terms": ["social"], "name": "Club"},
+  "club": {"icon": "fas-handshake", "fields": ["name", "club", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19", "phone", "website"], "moreFields": ["access_simple", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "max_age", "min_age", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"club": "*"}, "terms": ["social"], "name": "Club"},
  "club/sport": {"icon": "maki-pitch", "fields": ["name", "sport", "{club}"], "geometry": ["point", "area"], "tags": {"club": "sport"}, "terms": ["athletics club", "sporting club", "sports association", "sports society"], "name": "Sports Club"},
-  "craft": {"icon": "temaki-tools", "fields": ["name", "craft", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19"], "moreFields": ["air_conditioning", "building/levels_building", "ele", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "product", "ref/vatin", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"craft": "*"}, "terms": [], "name": "Craft"},
+  "craft": {"icon": "temaki-tools", "fields": ["name", "craft", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19", "phone", "website"], "moreFields": ["air_conditioning", "building/levels_building", "ele", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "product", "ref/vatin", "wheelchair"], "geometry": ["point", "area"], "tags": {"craft": "*"}, "terms": [], "name": "Craft"},
  "craft/locksmith": {"icon": "maki-marker-stroked", "geometry": ["point", "area"], "tags": {"craft": "locksmith"}, "reference": {"key": "shop", "value": "locksmith"}, "name": "Locksmith", "searchable": false},
  "craft/tailor": {"icon": "temaki-needle_and_spool", "geometry": ["point", "area"], "tags": {"craft": "tailor"}, "reference": {"key": "shop", "value": "tailor"}, "name": "Tailor", "searchable": false},
  "craft/agricultural_engines": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "agricultural_engines"}, "terms": ["combines", "farm equipment", "harvesters", "tractors"], "name": "Agricultural Engines Mechanic"},
@@ -456,7 +461,7 @@
  "emergency/private": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "private"}, "name": "Emergency Access Private", "searchable": false, "matchScore": 0.01},
  "emergency/yes": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "yes"}, "name": "Emergency Access Yes", "searchable": false, "matchScore": 0.01},
  "emergency/ambulance_station": {"icon": "fas-ambulance", "fields": ["name", "operator", "building_area", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["EMS", "EMT", "rescue"], "tags": {"emergency": "ambulance_station"}, "name": "Ambulance Station"},
-  "emergency/defibrillator": {"icon": "maki-defibrillator", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "terms": ["AED"], "tags": {"emergency": "defibrillator"}, "name": "Defibrillator"},
+  "emergency/defibrillator": {"icon": "maki-defibrillator", "fields": ["indoor", "ref", "operator", "defibrillator/location"], "moreFields": ["level", "opening_hours", "access_simple"], "geometry": ["point", "vertex"], "terms": ["AED"], "tags": {"emergency": "defibrillator"}, "name": "Defibrillator"},
  "emergency/fire_alarm": {"icon": "fas-bell", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_alarm_box"}, "name": "Fire Alarm Call Box"},
  "emergency/fire_extinguisher": {"icon": "fas-fire-extinguisher", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_extinguisher"}, "name": "Fire Extinguisher"},
  "emergency/fire_hose": {"icon": "fas-tape", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_hose"}, "name": "Fire Hose"},
@@ -468,7 +473,7 @@
  "emergency/mountain_rescue": {"icon": "temaki-mountain_rescue", "fields": ["name", "address", "operator", "building_area", "email", "website"], "moreFields": ["fax", "gnis/feature_id", "phone", "wheelchair"], "geometry": ["point", "area"], "terms": ["EMS", "EMT", "rescue"], "tags": {"emergency": "mountain_rescue"}, "name": "Mountain Rescue"},
  "emergency/phone": {"icon": "maki-emergency-phone", "fields": ["ref", "operator", "covered", "indoor", "booth"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "phone"}, "name": "Emergency Phone"},
  "emergency/siren": {"icon": "fas-volume-up", "fields": ["siren/purpose", "siren/type", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["air raid", "loud", "noise", "storm", "tornado", "warning"], "tags": {"emergency": "siren"}, "name": "Siren"},
-  "emergency/water_tank": {"icon": "maki-water", "fields": ["name", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["water tank", "cistern", "reservoir"], "tags": {"emergency": "water_tank"}, "name": "Emergency Water Tank"},
+  "emergency/water_tank": {"icon": "maki-water", "fields": ["name", "ref", "operator", "water_tank/volume", "drinking_water"], "moreFields": ["height", "material"], "geometry": ["point", "vertex", "area"], "terms": ["water tank", "cistern", "reservoir"], "tags": {"emergency": "water_tank"}, "name": "Emergency Water Tank"},
  "entrance": {"icon": "maki-entrance-alt1", "fields": ["ref", "entrance", "door", "access_simple", "wheelchair", "level", "address"], "geometry": ["vertex"], "tags": {"entrance": "*"}, "terms": ["entrance", "exit", "door"], "matchScore": 0.8, "name": "Entrance / Exit"},
  "entrance/emergency_ward_entrance": {"icon": "maki-hospital", "fields": ["ref", "emergency_ward_entrance", "address", "level", "opening_hours"], "geometry": ["vertex"], "tags": {"emergency": "emergency_ward_entrance"}, "addTags": {"emergency": "emergency_ward_entrance", "entrance": "yes"}, "terms": ["accident & emergency department", "casualty department", "ed", "emergency department", "emergency room", "emergency ward", "er", "ew"], "name": "Emergency Room Entrance"},
  "entrance/emergency": {"icon": "maki-entrance-alt1", "fields": ["ref", "door", "access_simple", "level"], "geometry": ["vertex"], "tags": {"entrance": "emergency"}, "terms": ["fire exit", "door"], "matchScore": 0.8, "name": "Emergency Exit"},
@@ -484,7 +489,7 @@
  "golf/rough": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "rough"}, "addTags": {"golf": "rough", "landuse": "grass"}, "name": "Rough"},
  "golf/tee": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "tee"}, "addTags": {"golf": "tee", "landuse": "grass"}, "terms": ["teeing ground"], "name": "Tee Box"},
  "golf/water_hazard": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "water_hazard"}, "addTags": {"golf": "water_hazard", "natural": "water"}, "name": "Water Hazard"},
-  "healthcare": {"icon": "maki-hospital", "fields": ["name", "healthcare", "operator", "healthcare/speciality", "address", "building_area"], "moreFields": ["brand", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "level", "opening_hours", "opening_hours/covid19", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"healthcare": "*"}, "terms": ["clinic", "doctor", "disease", "health", "institution", "sick", "surgery", "wellness"], "name": "Healthcare Facility"},
+  "healthcare": {"icon": "maki-hospital", "fields": ["name", "healthcare", "operator", "healthcare/speciality", "address", "building_area", "phone", "website"], "moreFields": ["brand", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "level", "opening_hours", "opening_hours/covid19", "payment_multi", "wheelchair"], "geometry": ["point", "area"], "tags": {"healthcare": "*"}, "terms": ["clinic", "doctor", "disease", "health", "institution", "sick", "surgery", "wellness"], "name": "Healthcare Facility"},
  "healthcare/alternative": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["acupuncture", "anthroposophical", "applied kinesiology", "aromatherapy", "ayurveda", "herbalism", "homeopathy", "hydrotherapy", "hypnosis", "naturopathy", "osteopathy", "reflexology", "reiki", "shiatsu", "traditional", "tuina", "unani"], "tags": {"healthcare": "alternative"}, "name": "Alternative Medicine"},
  "healthcare/alternative/chiropractic": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["back", "pain", "spine"], "tags": {"healthcare": "alternative", "healthcare:speciality": "chiropractic"}, "name": "Chiropractor"},
  "healthcare/audiologist": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["ear", "hearing", "sound"], "tags": {"healthcare": "audiologist"}, "name": "Audiologist"},
@@ -571,6 +576,7 @@
  "highway/street_lamp": {"icon": "temaki-street_lamp_arm", "geometry": ["point", "vertex"], "tags": {"highway": "street_lamp"}, "fields": ["lamp_type", "lamp_mount", "direction", "height", "ref"], "terms": ["streetlight", "street light", "lamp", "light", "gaslight"], "name": "Street Lamp"},
  "highway/tertiary_link": {"icon": "iD-highway-tertiary-link", "fields": ["{highway/primary_link}"], "moreFields": ["{highway/primary_link}"], "geometry": ["line"], "tags": {"highway": "tertiary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Tertiary Link"},
  "highway/tertiary": {"icon": "iD-highway-tertiary", "fields": ["{highway/primary}"], "moreFields": ["{highway/primary}"], "geometry": ["line"], "tags": {"highway": "tertiary"}, "terms": ["road", "street"], "name": "Tertiary Road"},
+  "highway/toll_gantry": {"notCountryCodes": ["de"], "icon": "temaki-toll_gantry", "fields": ["ref", "operator", "access", "maxheight", "opening_hours", "opening_hours/covid19", "payment_multi"], "moreFields": ["website"], "geometry": ["vertex"], "tags": {"highway": "toll_gantry"}, "terms": ["license plate camera toll", "cashless toll", "electronic toll", "free-flow toll", "toll gantry", "transponder toll"], "name": "Open Road Toll"},
  "highway/track": {"icon": "fas-truck-monster", "fields": ["name", "tracktype", "surface", "width", "structure", "access", "incline", "smoothness"], "moreFields": ["covered", "flood_prone", "horse_scale", "maxweight_bridge", "mtb/scale", "mtb/scale/imba", "mtb/scale/uphill", "stroller", "wheelchair"], "geometry": ["line"], "tags": {"highway": "track"}, "terms": ["woods road", "forest road", "logging road", "fire road", "farm road", "agricultural road", "ranch road", "carriage road", "primitive", "unmaintained", "rut", "offroad", "4wd", "4x4", "four wheel drive", "atv", "quad", "jeep", "double track", "two track"], "name": "Unmaintained Track Road"},
  "highway/traffic_mirror": {"icon": "maki-circle-stroked", "geometry": ["point", "vertex"], "fields": ["direction"], "tags": {"highway": "traffic_mirror"}, "terms": ["blind spot", "convex", "corner", "curved", "roadside", "round", "safety", "sphere", "visibility"], "name": "Traffic Mirror"},
  "highway/traffic_signals": {"icon": "temaki-traffic_signals", "geometry": ["vertex"], "tags": {"highway": "traffic_signals"}, "fields": ["traffic_signals", "traffic_signals/direction"], "terms": ["light", "stoplight", "traffic light"], "name": "Traffic Signals"},
@@ -645,7 +651,7 @@
  "landuse/military/training_area": {"icon": "temaki-military", "fields": ["name"], "geometry": ["point", "area"], "tags": {"military": "training_area"}, "addTags": {"landuse": "military", "military": "training_area"}, "terms": ["air force", "army", "base", "fight", "fire", "force", "guard", "gun", "marine", "navy", "rifle", "shoot*", "snip*", "train", "troop", "war"], "name": "Military Training Area"},
  "landuse/orchard": {"icon": "maki-park", "fields": ["name", "operator", "trees"], "moreFields": ["address", "email", "fax", "phone", "species/wikidata", "website"], "geometry": ["area"], "tags": {"landuse": "orchard"}, "terms": ["fruit"], "name": "Orchard"},
  "landuse/plant_nursery": {"icon": "fas-seedling", "fields": ["name", "operator", "plant"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "plant_nursery"}, "terms": ["flower", "garden", "grow", "vivero"], "name": "Plant Nursery"},
-  "landuse/quarry": {"icon": "temaki-pick_hammer", "geometry": ["area", "point"], "fields": ["name", "operator", "resource"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "quarry"}, "terms": [], "name": "Quarry"},
+  "landuse/quarry": {"icon": "temaki-pick_hammer", "geometry": ["area", "point"], "fields": ["name", "operator", "resource"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "quarry"}, "terms": ["aggregate quarry", "open pit mine", "sand mine", "sand pit", "sand quarry", "sandpit"], "name": "Quarry"},
  "landuse/railway": {"icon": "temaki-train", "fields": ["operator"], "geometry": ["area"], "tags": {"landuse": "railway"}, "terms": ["rail", "train", "track"], "name": "Railway Corridor"},
  "landuse/recreation_ground": {"icon": "maki-pitch", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "recreation_ground"}, "terms": ["playing fields"], "name": "Recreation Ground"},
  "landuse/religious": {"icon": "maki-place-of-worship", "geometry": ["area"], "fields": ["name", "religion", "denomination"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "religious"}, "terms": ["christian", "churchyard", "hindu", "jewish", "mosque", "muslim", "place of worship", "shinto", "sikh", "taoist", "temple", "shrine", "synagogue"], "name": "Religious Area"},
@@ -669,7 +675,7 @@
  "leisure/escape_game": {"icon": "fas-puzzle-piece", "fields": ["name", "address", "building_area", "opening_hours", "opening_hours/covid19", "website", "fee", "payment_multi_fee", "charge_fee", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "level", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["escape game", "escape the room", "puzzle room", "quest room"], "tags": {"leisure": "escape_game"}, "name": "Escape Room"},
  "leisure/firepit": {"icon": "temaki-campfire", "fields": ["access_simple", "seasonal", "width"], "moreFields": ["ref"], "geometry": ["point", "area"], "tags": {"leisure": "firepit"}, "terms": ["bonfire", "campfire", "fire circle", "fire hole", "fire place", "fire ring", "firepit", "fireplace", "firering"], "name": "Fire Pit"},
  "leisure/fishing": {"icon": "fas-fish", "fields": ["name", "access_simple", "fishing"], "geometry": ["vertex", "point", "area"], "tags": {"leisure": "fishing"}, "terms": ["angler"], "name": "Fishing Spot"},
-  "leisure/fitness_centre": {"icon": "fas-dumbbell", "fields": ["name", "sport", "address", "building_area", "opening_hours", "opening_hours/covid19", "phone", "website"], "moreFields": ["brand", "charge_fee", "email", "fax", "fee", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_centre"}, "terms": ["health", "gym", "leisure", "pilates", "studio"], "name": "Gym / Fitness Center"},
+  "leisure/fitness_centre": {"icon": "fas-dumbbell", "fields": ["name", "sport", "address", "building_area", "opening_hours", "opening_hours/covid19", "phone", "website"], "moreFields": ["brand", "charge_fee", "email", "fax", "fee", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_centre"}, "terms": ["health", "gym", "leisure", "pilates", "studio"], "name": "Gym / Fitness Center"},
  "leisure/fitness_centre/yoga": {"icon": "maki-pitch", "geometry": ["point", "area"], "terms": ["asanas", "meditation", "modern yoga", "studio"], "tags": {"leisure": "fitness_centre", "sport": "yoga"}, "reference": {"key": "sport", "value": "yoga"}, "name": "Yoga Studio"},
  "leisure/fitness_station": {"icon": "maki-pitch", "fields": ["fitness_station", "ref", "wheelchair", "blind"], "moreFields": ["access_simple", "opening_hours", "opening_hours/covid19"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_station"}, "addTags": {"leisure": "fitness_station", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["exercise", "fitness", "gym", "trim trail"], "name": "Outdoor Fitness Station"},
  "leisure/fitness_station/balance_beam": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "balance_beam"}, "addTags": {"leisure": "fitness_station", "fitness_station": "balance_beam", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["balance", "exercise", "fitness", "gym", "trim trail"], "name": "Exercise Balance Beam"},
@@ -695,7 +701,7 @@
  "leisure/nature_reserve": {"icon": "maki-park", "geometry": ["area", "point"], "fields": ["name", "operator", "address", "opening_hours", "opening_hours/covid19"], "moreFields": ["dog", "email", "fax", "gnis/feature_id", "phone", "website"], "tags": {"leisure": "nature_reserve"}, "terms": ["protected", "wildlife"], "name": "Nature Reserve"},
  "leisure/outdoor_seating": {"icon": "maki-picnic-site", "geometry": ["point", "area"], "fields": ["name", "operator"], "moreFields": ["level"], "terms": ["al fresco", "beer garden", "dining", "cafe", "restaurant", "pub", "bar", "patio"], "tags": {"leisure": "outdoor_seating"}, "name": "Outdoor Seating Area"},
  "leisure/park": {"icon": "temaki-tree_and_bench", "fields": ["name", "operator", "address", "opening_hours", "opening_hours/covid19"], "moreFields": ["dog", "email", "fax", "gnis/feature_id", "phone", "smoking", "website"], "geometry": ["area", "point"], "terms": ["esplanade", "estate", "forest", "garden", "grass", "green", "grounds", "lawn", "lot", "meadow", "parkland", "place", "playground", "plaza", "pleasure garden", "recreation area", "square", "tract", "village green", "woodland"], "tags": {"leisure": "park"}, "name": "Park"},
-  "leisure/picnic_table": {"icon": "maki-picnic-site", "fields": ["material", "lit", "bench"], "moreFields": ["level"], "geometry": ["point"], "tags": {"leisure": "picnic_table"}, "terms": ["bench"], "name": "Picnic Table"},
+  "leisure/picnic_table": {"icon": "maki-picnic-site", "fields": ["material", "lit", "bench", "colour"], "moreFields": ["height", "level", "manufacturer", "operator"], "geometry": ["point"], "tags": {"leisure": "picnic_table"}, "terms": ["bench"], "name": "Picnic Table"},
  "leisure/picnic_table/chess": {"icon": "fas-chess-pawn", "geometry": ["point"], "tags": {"leisure": "picnic_table", "sport": "chess"}, "reference": {"key": "sport", "value": "chess"}, "terms": ["bench", "chess board", "checkerboard", "checkers", "chequerboard", "game table"], "name": "Chess Table"},
  "leisure/pitch": {"icon": "maki-pitch", "fields": ["name", "sport", "access_simple", "surface", "lit"], "moreFields": ["address", "charge_fee", "covered", "fee", "gnis/feature_id", "indoor", "payment_multi_fee"], "geometry": ["area", "point"], "tags": {"leisure": "pitch"}, "terms": ["field"], "name": "Sport Pitch"},
  "leisure/pitch/american_football": {"icon": "maki-american-football", "geometry": ["area", "point"], "tags": {"leisure": "pitch", "sport": "american_football"}, "reference": {"key": "sport", "value": "american_football"}, "terms": ["football", "gridiron"], "name": "American Football Field"},
@@ -726,9 +732,10 @@
  "leisure/sauna": {"icon": "fas-thermometer-three-quarters", "fields": ["name", "operator", "address", "opening_hours", "opening_hours/covid19", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "sauna"}, "name": "Sauna"},
  "leisure/slipway_point": {"icon": "maki-slipway", "fields": ["{leisure/slipway}"], "moreFields": ["{leisure/slipway}"], "geometry": ["point", "vertex"], "terms": ["boat launch", "boat ramp", "boat landing"], "tags": {"leisure": "slipway"}, "name": "Slipway"},
  "leisure/slipway": {"icon": "maki-slipway", "fields": ["name", "surface", "access_simple", "fee", "payment_multi_fee", "charge_fee", "lanes"], "moreFields": ["lit", "opening_hours", "opening_hours/covid19", "seamark/type", "width"], "geometry": ["line"], "terms": ["boat launch", "boat ramp", "boat landing"], "tags": {"leisure": "slipway"}, "addTags": {"leisure": "slipway", "highway": "service", "service": "slipway"}, "matchScore": 1.1, "name": "Slipway"},
-  "leisure/sports_centre": {"icon": "maki-pitch", "fields": ["name", "sport", "building", "address", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "opening_hours", "opening_hours/covid19", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "sports_centre"}, "terms": [], "name": "Sports Center / Complex"},
+  "leisure/sports_centre": {"icon": "maki-pitch", "fields": ["name", "sport", "building", "address", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "level", "opening_hours", "opening_hours/covid19", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "sports_centre"}, "terms": [], "name": "Sports Center / Complex"},
  "leisure/sports_centre/climbing": {"icon": "temaki-abseiling", "geometry": ["point", "area"], "terms": ["abseiling", "artificial climbing wall", "belaying", "bouldering", "rock climbing facility", "indoor rock wall", "rappeling", "rock gym", "ropes"], "tags": {"leisure": "sports_centre", "sport": "climbing"}, "reference": {"key": "sport", "value": "climbing"}, "name": "Climbing Gym"},
  "leisure/sports_centre/swimming": {"icon": "fas-swimmer", "geometry": ["area", "point"], "terms": ["dive", "water"], "tags": {"leisure": "sports_centre", "sport": "swimming"}, "reference": {"key": "sport", "value": "swimming"}, "name": "Swimming Pool Facility"},
+  "leisure/sports_hall": {"icon": "maki-pitch", "fields": ["name", "operator", "sport", "address", "building_area", "access_simple"], "moreFields": ["air_conditioning", "level", "opening_hours", "opening_hours/covid19", "fee", "payment_multi_fee", "charge_fee", "wheelchair"], "geometry": ["point", "area"], "terms": ["athletic courts", "gym", "sports hall", "sports venue"], "tags": {"leisure": "sports_hall"}, "name": "Gymnasium"},
  "leisure/stadium": {"icon": "maki-pitch", "fields": ["name", "operator", "sport", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "stadium"}, "name": "Stadium"},
  "leisure/swimming_area": {"icon": "fas-swimmer", "fields": ["name", "access_simple", "supervised", "fee", "payment_multi_fee", "charge_fee", "lit"], "moreFields": ["opening_hours", "opening_hours/covid19", "operator"], "geometry": ["area"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_area"}, "name": "Natural Swimming Area"},
  "leisure/swimming_pool": {"icon": "fas-swimming-pool", "fields": ["name", "access_simple", "lit", "location_pool", "length", "swimming_pool"], "moreFields": ["address", "level", "gnis/feature_id", "opening_hours", "opening_hours/covid19", "operator"], "geometry": ["area", "point"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_pool"}, "name": "Swimming Pool"},
@@ -746,13 +753,14 @@
  "man_made/breakwater": {"fields": ["material", "seamark/type"], "geometry": ["line", "area"], "tags": {"man_made": "breakwater"}, "name": "Breakwater"},
  "man_made/bridge": {"icon": "maki-bridge", "fields": ["name", "bridge_combo", "layer", "maxweight"], "moreFields": ["gnis/feature_id", "manufacturer", "material", "seamark/type"], "geometry": ["area"], "tags": {"man_made": "bridge"}, "addTags": {"man_made": "bridge", "layer": "1"}, "removeTags": {"man_made": "bridge", "layer": "*"}, "reference": {"key": "man_made", "value": "bridge"}, "name": "Bridge Area", "matchScore": 0.85},
  "man_made/bunker_silo": {"icon": "temaki-bunker_silo", "fields": ["content"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "area"], "terms": ["Silage", "Storage"], "tags": {"man_made": "bunker_silo"}, "name": "Bunker Silo"},
-  "man_made/cairn": {"icon": "temaki-cairn", "geometry": ["point", "area"], "terms": ["rock pile", "stone stack", "stone pile", "càrn"], "tags": {"man_made": "cairn"}, "name": "Cairn"},
+  "man_made/cairn": {"icon": "temaki-cairn", "fields": ["height", "ele", "ele_node", "check_date"], "moreFields": ["colour", "material", "name", "operator", "ref"], "geometry": ["point", "area"], "terms": ["rock pile", "stone stack", "stone pile", "càrn"], "tags": {"man_made": "cairn"}, "name": "Cairn"},
  "man_made/chimney": {"icon": "temaki-chimney", "fields": ["operator", "material", "height"], "geometry": ["point", "area"], "tags": {"man_made": "chimney"}, "name": "Chimney"},
  "man_made/clearcut": {"icon": "maki-logging", "geometry": ["area"], "tags": {"man_made": "clearcut"}, "terms": ["cut", "forest", "lumber", "tree", "wood"], "name": "Clearcut Forest"},
  "man_made/courtyard": {"icon": "maki-square-stroked", "fields": ["name"], "moreFields": [], "geometry": ["area"], "tags": {"man_made": "courtyard"}, "terms": ["court", "enclosed open air", "quadrangle", "yard"], "name": "Courtyard"},
  "man_made/crane": {"icon": "temaki-crane", "fields": ["operator", "manufacturer", "height", "crane/type"], "geometry": ["point", "line", "vertex", "area"], "tags": {"man_made": "crane"}, "name": "Crane"},
  "man_made/cross": {"icon": "maki-religious-christian", "fields": ["name", "material", "height", "ele_node", "inscription", "direction"], "geometry": ["point", "vertex"], "tags": {"man_made": "cross"}, "name": "Cross"},
  "man_made/cutline": {"icon": "maki-logging", "geometry": ["line"], "tags": {"man_made": "cutline"}, "name": "Cut line"},
+  "man_made/dovecote": {"icon": "fas-dove", "fields": ["operator", "building_area", "height", "capacity"], "moreFields": ["layer", "location"], "geometry": ["area", "point"], "terms": ["birds", "doocot", "dovecot", "doves", "pigeonholes", "pigeons"], "tags": {"man_made": "dovecote"}, "name": "Dovecote"},
  "man_made/dyke": {"geometry": ["line"], "tags": {"man_made": "dyke"}, "terms": ["Dike", "Dyke", "Floodbank", "Stopbank"], "name": "Levee"},
  "man_made/embankment": {"geometry": ["line"], "tags": {"man_made": "embankment"}, "name": "Embankment"},
  "man_made/flagpole": {"icon": "maki-embassy", "fields": ["operator", "flag/type", "country_flag", "lit", "height"], "moreFields": ["manufacturer", "material"], "geometry": ["point", "vertex"], "tags": {"man_made": "flagpole"}, "name": "Flagpole"},
@@ -820,7 +828,7 @@
  "natural/bay": {"icon": "temaki-beach", "geometry": ["point", "line", "area"], "fields": ["name"], "tags": {"natural": "bay"}, "terms": [], "name": "Bay"},
  "natural/beach": {"icon": "temaki-beach", "fields": ["surface"], "geometry": ["point", "area"], "tags": {"natural": "beach"}, "terms": ["shore"], "name": "Beach"},
  "natural/cape": {"icon": "temaki-beach", "fields": ["name", "ele_node", "description"], "geometry": ["point", "vertex"], "tags": {"natural": "cape"}, "terms": ["bay", "coastline", "erosion", "headland", "promontory"], "name": "Cape"},
-  "natural/cave_entrance": {"icon": "maki-triangle", "geometry": ["point", "area"], "fields": ["name", "ele_node", "access_simple", "direction", "fee", "payment_multi_fee", "charge_fee"], "tags": {"natural": "cave_entrance"}, "terms": ["cavern", "hollow", "grotto", "shelter", "cavity"], "name": "Cave Entrance"},
+  "natural/cave_entrance": {"icon": "maki-triangle", "geometry": ["point", "vertex", "area"], "fields": ["name", "ele_node", "access_simple", "direction", "fee", "payment_multi_fee", "charge_fee"], "tags": {"natural": "cave_entrance"}, "terms": ["cavern", "hollow", "grotto", "shelter", "cavity"], "name": "Cave Entrance"},
  "natural/cliff": {"icon": "temaki-cliff_falling_rocks", "fields": ["name", "height"], "geometry": ["point", "vertex", "line", "area"], "tags": {"natural": "cliff"}, "terms": ["crag", "escarpment", "rock face", "scarp"], "name": "Cliff"},
  "natural/coastline": {"icon": "temaki-beach", "geometry": ["line"], "tags": {"natural": "coastline"}, "terms": ["shore"], "name": "Coastline"},
  "natural/fell": {"geometry": ["area"], "tags": {"natural": "fell"}, "terms": [], "name": "Fell"},
@@ -859,7 +867,7 @@
  "natural/wood": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle"], "geometry": ["area", "point"], "tags": {"natural": "wood"}, "terms": ["boreal", "forest", "forrest", "taiga", "tree", "trees", "woodlands", "woods"], "name": "Natural Wood"},
  "network/type/node_network": {"fields": ["name", "rwn_ref", "expected_rwn_route_relations", "rcn_ref", "expected_rcn_route_relations"], "geometry": ["vertex"], "tags": {"network:type": "node_network"}, "terms": ["node network", "rcn", "rwn"], "countryCodes": ["be", "de", "lu", "nl"], "matchScore": 0.2, "name": "Recreational Network Node"},
  "noexit/yes": {"icon": "maki-barrier", "geometry": ["vertex"], "terms": ["no exit", "road end", "dead end"], "tags": {"noexit": "yes"}, "reference": {"key": "noexit", "value": "*"}, "name": "No Exit"},
-  "office": {"icon": "maki-suitcase", "fields": ["name", "office", "address", "building_area", "opening_hours", "opening_hours/covid19"], "moreFields": ["air_conditioning", "baby_feeding", "building/levels_building", "ele", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "operator", "phone", "ref/vatin", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"office": "*"}, "terms": [], "name": "Office"},
+  "office": {"icon": "maki-suitcase", "fields": ["name", "office", "address", "building_area", "opening_hours", "opening_hours/covid19", "phone", "website"], "moreFields": ["air_conditioning", "baby_feeding", "building/levels_building", "ele", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "operator", "ref/vatin", "smoking", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"office": "*"}, "terms": [], "name": "Office"},
  "office/administrative": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "administrative"}, "searchable": false, "name": "Administrative Office"},
  "office/physician": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "physician"}, "searchable": false, "name": "Physician"},
  "office/travel_agent": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "travel_agent"}, "reference": {"key": "shop", "value": "travel_agency"}, "name": "Travel Agency", "searchable": false},
@@ -947,7 +955,7 @@
  "playground/swing": {"icon": "maki-playground", "fields": ["capacity", "baby_seat", "wheelchair", "blind"], "geometry": ["point"], "tags": {"playground": "swing"}, "name": "Swing"},
  "playground/zipwire": {"icon": "maki-playground", "geometry": ["point", "line"], "tags": {"playground": "zipwire"}, "terms": ["zipline", "zip wire", "zipwire"], "name": "Play Zip Line"},
  "point": {"fields": ["name"], "geometry": ["vertex", "point"], "tags": {}, "terms": ["node", "other", "vertex", "vertices"], "name": "Point", "matchScore": 0.1},
-  "polling_station": {"icon": "fas-vote-yea", "fields": ["name", "ref", "operator", "address", "opening_hours", "opening_hours/covid19", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["ballot box", "ballot drop", "democracy", "elections", "polling place", "vote", "voting booth", "voting machine"], "tags": {"polling_station": "*"}, "matchScore": 0.75, "name": "Temporary Polling Place"},
+  "polling_station": {"icon": "fas-vote-yea", "fields": ["name", "ref", "operator", "address", "opening_hours", "opening_hours/covid19", "building_area", "phone", "website"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "wheelchair"], "geometry": ["point", "area"], "terms": ["ballot box", "ballot drop", "democracy", "elections", "polling place", "vote", "voting booth", "voting machine"], "tags": {"polling_station": "*"}, "matchScore": 0.75, "name": "Temporary Polling Place"},
  "power/cable": {"icon": "temaki-cable", "fields": ["name", "ref", "operator", "voltage", "location", "layer"], "geometry": ["line"], "tags": {"power": "cable"}, "searchable": false, "name": "Power Cable"},
  "power/cable/underground": {"icon": "temaki-cable", "geometry": ["line"], "tags": {"power": "cable", "location": "underground"}, "addTags": {"power": "cable", "location": "underground", "layer": "-1"}, "name": "Underground Power Cable"},
  "power/generator": {"icon": "temaki-power", "fields": ["ref", "operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity"], "moreFields": ["colour", "height", "level", "manufacturer", "material"], "geometry": ["point", "vertex", "area"], "terms": ["hydro", "solar", "turbine", "wind"], "tags": {"power": "generator"}, "name": "Power Generator"},
@@ -969,8 +977,8 @@
  "power/switch": {"icon": "temaki-power_switch", "fields": ["switch", "operator", "location", "cables", "voltage", "ref"], "geometry": ["point", "vertex"], "tags": {"power": "switch"}, "name": "Power Switch"},
  "power/tower": {"icon": "temaki-power_tower", "fields": ["ref", "operator", "design", "height", "material", "line_attachment"], "moreFields": ["line_management", "manufacturer"], "geometry": ["point", "vertex"], "terms": ["power"], "tags": {"power": "tower"}, "matchScore": 1.05, "name": "High-Voltage Tower"},
  "power/transformer": {"icon": "temaki-power_transformer", "fields": ["ref", "operator", "transformer", "location", "rating", "devices", "phases"], "moreFields": ["frequency", "manufacturer", "voltage/primary", "voltage/secondary", "voltage/tertiary", "windings", "windings/configuration"], "geometry": ["point", "vertex"], "tags": {"power": "transformer"}, "name": "Transformer"},
-  "public_transport/platform_point": {"icon": "temaki-sign_and_bench", "fields": ["name", "ref_stop_position", "network", "operator", "departures_board", "shelter"], "moreFields": ["bench", "bin", "gnis/feature_id", "level", "lit", "tactile_paving", "wheelchair"], "geometry": ["point"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Stop / Platform", "matchScore": 0.6},
-  "public_transport/platform": {"icon": "temaki-board_transit", "fields": ["ref_platform", "network", "operator", "departures_board", "surface"], "moreFields": ["access", "covered", "indoor", "layer", "level", "lit", "wheelchair"], "geometry": ["line", "area"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Platform", "matchScore": 0.6},
+  "public_transport/platform_point": {"icon": "temaki-sign_and_bench", "fields": ["name", "ref_stop_position", "network", "operator", "vehicles", "departures_board", "shelter"], "moreFields": ["bench", "bin", "gnis/feature_id", "level", "lit", "tactile_paving", "wheelchair"], "geometry": ["point"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Stop / Platform", "matchScore": 0.6},
+  "public_transport/platform": {"icon": "temaki-board_transit", "fields": ["ref_platform", "network", "operator", "vehicles", "departures_board", "surface"], "moreFields": ["access", "covered", "indoor", "layer", "level", "lit", "wheelchair"], "geometry": ["line", "area"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Platform", "matchScore": 0.6},
  "public_transport/platform/aerialway_point": {"icon": "temaki-gondola_lift", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "searchable": false, "name": "Aerialway Stop / Platform"},
  "public_transport/platform/ferry_point": {"icon": "temaki-ferry", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "ferry": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "searchable": false, "name": "Ferry Stop / Platform"},
  "public_transport/platform/light_rail_point": {"icon": "temaki-light_rail", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "light_rail": "yes"}, "reference": {"key": "railway", "value": "platform"}, "searchable": false, "name": "Light Rail Stop / Platform"},
@@ -999,7 +1007,7 @@
  "public_transport/station_train": {"icon": "temaki-train", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["vertex", "point", "area"], "tags": {"public_transport": "station", "train": "yes"}, "addTags": {"public_transport": "station", "train": "yes", "railway": "station"}, "reference": {"key": "railway", "value": "station"}, "terms": ["public transit", "public transportation", "rail", "station", "terminal", "track", "train", "transit", "transportation"], "name": "Train Station"},
  "public_transport/station_tram": {"icon": "temaki-tram", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "tram": "yes"}, "reference": {"key": "public_transport", "value": "station"}, "terms": ["electric", "light rail", "public transit", "public transportation", "rail", "station", "streetcar", "terminal", "track", "tram", "trolley", "transit", "transportation"], "name": "Tram Station"},
  "public_transport/station_trolleybus": {"icon": "temaki-trolleybus", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "trolleybus": "yes"}, "addTags": {"public_transport": "station", "trolleybus": "yes", "amenity": "bus_station"}, "reference": {"key": "amenity", "value": "bus_station"}, "terms": ["bus", "electric", "public transit", "public transportation", "station", "streetcar", "terminal", "trackless", "tram", "trolley", "transit", "transportation"], "name": "Trolleybus Station / Terminal"},
-  "public_transport/station": {"icon": "temaki-transit", "fields": ["name", "network", "operator", "address", "building_area", "internet_access"], "moreFields": ["air_conditioning", "baby_feeding", "email", "fax", "gnis/feature_id", "internet_access/fee", "internet_access/ssid", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"public_transport": "station"}, "terms": ["public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Transit Station", "matchScore": 0.2},
+  "public_transport/station": {"icon": "temaki-transit", "fields": ["name", "network", "operator", "vehicles", "address", "building_area", "internet_access"], "moreFields": ["air_conditioning", "baby_feeding", "email", "fax", "gnis/feature_id", "internet_access/fee", "internet_access/ssid", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"public_transport": "station"}, "terms": ["public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Transit Station", "matchScore": 0.2},
  "public_transport/stop_area": {"icon": "iD-relation", "fields": ["name", "ref", "network", "operator"], "geometry": ["relation"], "tags": {"type": "public_transport", "public_transport": "stop_area"}, "reference": {"key": "public_transport", "value": "stop_area"}, "name": "Transit Stop Area"},
  "public_transport/stop_position_aerialway": {"icon": "temaki-gondola_lift", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["aerialway", "cable car", "public transit", "public transportation", "transit", "transportation"], "name": "Aerialway Stopping Location"},
  "public_transport/stop_position_bus": {"icon": "temaki-bus", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "bus": "yes"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["bus", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Stopping Location"},
@@ -1010,7 +1018,7 @@
  "public_transport/stop_position_train": {"icon": "temaki-train", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "train": "yes"}, "addTags": {"public_transport": "stop_position", "train": "yes", "railway": "stop"}, "reference": {"key": "railway", "value": "stop"}, "terms": ["public transit", "public transportation", "rail", "track", "train", "transit", "transportation"], "name": "Train Stopping Location"},
  "public_transport/stop_position_tram": {"icon": "temaki-tram", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "tram": "yes"}, "addTags": {"public_transport": "stop_position", "tram": "yes", "railway": "tram_stop"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["electric", "light rail", "public transit", "public transportation", "rail", "streetcar", "track", "tram", "trolley", "transit", "transportation"], "name": "Tram Stopping Location"},
  "public_transport/stop_position_trolleybus": {"icon": "temaki-trolleybus", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "trolleybus": "yes"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["bus", "electric", "public transit", "public transportation", "streetcar", "trackless", "tram", "trolley", "transit", "transportation"], "name": "Trolleybus Stopping Location"},
-  "public_transport/stop_position": {"icon": "temaki-transit", "fields": ["name", "ref_stop_position", "network", "operator"], "moreFields": [], "geometry": ["vertex"], "tags": {"public_transport": "stop_position"}, "terms": ["public transit", "public transportation", "transit", "transportation"], "name": "Transit Stopping Location", "matchScore": 0.2},
+  "public_transport/stop_position": {"icon": "temaki-transit", "fields": ["name", "ref_stop_position", "network", "operator", "vehicles"], "moreFields": [], "geometry": ["vertex"], "tags": {"public_transport": "stop_position"}, "terms": ["public transit", "public transportation", "transit", "transportation"], "name": "Transit Stopping Location", "matchScore": 0.2},
  "railway/halt": {"icon": "temaki-rail_flag", "geometry": ["point", "vertex"], "tags": {"railway": "halt"}, "name": "Train Station (Halt / Request)", "searchable": false},
  "railway/platform": {"icon": "temaki-board_train", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"railway": "platform"}, "name": "Train Platform", "searchable": false},
  "railway/station": {"icon": "temaki-train", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "vertex", "area"], "tags": {"railway": "station"}, "matchScore": 0.95, "name": "Train Station", "searchable": false},
@@ -1018,11 +1026,11 @@
  "railway/abandoned": {"icon": "temaki-railway_track_askew", "fields": ["name", "structure", "service_rail", "usage_rail"], "moreFields": ["covered", "incline"], "geometry": ["line"], "tags": {"railway": "abandoned"}, "terms": [], "matchScore": 0.85, "name": "Abandoned Railway"},
  "railway/buffer_stop": {"icon": "temaki-buffer_stop", "geometry": ["vertex"], "tags": {"railway": "buffer_stop"}, "terms": ["stop", "halt", "buffer"], "name": "Buffer Stop"},
  "railway/construction": {"icon": "temaki-railway_track_partial", "fields": ["name", "opening_date", "check_date", "note", "structure", "gauge", "electrified"], "moreFields": ["covered", "frequency_electrified", "highspeed", "incline", "maxspeed", "service_rail", "usage_rail", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "construction"}, "matchScore": 0.95, "name": "Railway Under Construction"},
-  "railway/crossing": {"icon": "temaki-pedestrian", "geometry": ["vertex"], "tags": {"railway": "crossing"}, "terms": ["crossing", "pedestrian crossing", "railroad crossing", "level crossing", "grade crossing", "path through railroad", "train crossing"], "name": "Railway Crossing (Path)"},
+  "railway/crossing": {"icon": "temaki-pedestrian", "geometry": ["vertex"], "tags": {"railway": "crossing"}, "terms": ["crossing", "path railway crossing", "pedestrian crossing", "level crossing", "grade crossing", "railroad crossing", "railway path crossing", "path through railroad", "train crossing"], "name": "Railway-Path Crossing"},
  "railway/derail": {"icon": "maki-roadblock", "geometry": ["vertex"], "tags": {"railway": "derail"}, "terms": ["derailer"], "name": "Railway Derailer"},
  "railway/disused": {"icon": "temaki-railway_track", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}", "highspeed"], "geometry": ["line"], "tags": {"railway": "disused"}, "matchScore": 0.95, "name": "Disused Railway"},
  "railway/funicular": {"icon": "temaki-railway_cable_track", "fields": ["name", "operator", "incline", "structure", "gauge", "service_rail"], "moreFields": ["covered", "electrified", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "terms": ["venicular", "cliff railway", "cable car", "cable railway", "funicular railway"], "tags": {"railway": "funicular"}, "name": "Funicular Track"},
-  "railway/level_crossing": {"icon": "maki-cross", "geometry": ["vertex"], "tags": {"railway": "level_crossing"}, "terms": ["crossing", "railroad crossing", "level crossing", "grade crossing", "road through railroad", "train crossing"], "name": "Railway Crossing (Road)"},
+  "railway/level_crossing": {"icon": "maki-cross", "geometry": ["vertex"], "tags": {"railway": "level_crossing"}, "terms": ["crossing", "level crossing", "grade crossing", "railroad crossing", "railway road crossing", "road railway crossing", "road through railroad", "train crossing"], "name": "Railway-Road Crossing"},
  "railway/light_rail": {"icon": "temaki-light_rail", "fields": ["name", "operator", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "incline", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "light_rail"}, "terms": ["light rail", "streetcar", "trolley"], "name": "Light Rail Track"},
  "railway/milestone": {"icon": "temaki-milestone", "geometry": ["point", "vertex"], "fields": ["railway/position", "direction_vertex"], "tags": {"railway": "milestone"}, "terms": ["milestone", "marker"], "name": "Railway Milestone"},
  "railway/miniature": {"icon": "temaki-railway_track_mini", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "miniature"}, "terms": ["rideable miniature railway", "narrow gauge railway", "minimum gauge railway"], "name": "Miniature Train Track"},
@@ -1032,22 +1040,25 @@
  "railway/preserved": {"icon": "temaki-train_steam", "fields": ["railway", "{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "*", "railway:preserved": "yes"}, "addTags": {"railway": "rail", "railway:preserved": "yes"}, "reference": {"key": "railway:preserved"}, "terms": ["historic train", "preserved rail", "steam train", "tourist train"], "name": "Heritage Railway Track"},
  "railway/rail": {"icon": "temaki-railway_track", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}", "highspeed"], "geometry": ["line"], "tags": {"railway": "rail"}, "terms": ["permanent way", "rail line", "railroad track", "railway track", "track", "train track"], "name": "Train Track"},
  "railway/rail/highspeed": {"icon": "temaki-train_bullet", "geometry": ["line"], "tags": {"railway": "rail", "highspeed": "yes"}, "reference": {"key": "highspeed"}, "terms": ["bullet train", "fast rail", "high speed rail", "highspeed rail", "HSR"], "name": "High-Speed Train Track"},
+  "railway/railway_crossing": {"icon": "temaki-x_oblique", "geometry": ["vertex"], "tags": {"railway": "railway_crossing"}, "terms": ["diamond crossing", "flat crossing", "level junction", "railway railway crossing"], "name": "Railway-Railway Crossing"},
  "railway/signal": {"icon": "temaki-railway_signals", "geometry": ["point", "vertex"], "fields": ["railway/position", "railway/signal/direction", "ref"], "tags": {"railway": "signal"}, "terms": ["signal", "lights"], "name": "Railway Signal"},
  "railway/subway_entrance": {"icon": "maki-entrance", "geometry": ["point", "vertex"], "fields": ["name", "level", "wheelchair"], "tags": {"railway": "subway_entrance"}, "terms": ["metro", "transit"], "name": "Subway Entrance"},
  "railway/subway": {"icon": "temaki-subway", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "subway"}, "terms": ["metro", "transit", "underground railway"], "name": "Subway Track"},
  "railway/switch": {"icon": "temaki-junction", "geometry": ["vertex"], "tags": {"railway": "switch"}, "terms": ["switch", "points"], "name": "Railway Switch"},
  "railway/train_wash": {"icon": "temaki-train_wash", "geometry": ["point", "vertex", "area"], "fields": ["operator", "building_area"], "tags": {"railway": "wash"}, "terms": ["wash", "clean"], "name": "Train Wash"},
+  "railway/tram_crossing": {"icon": "temaki-crossing_tram_striped", "geometry": ["vertex"], "tags": {"railway": "tram_crossing"}, "terms": ["crossing", "grade crossing", "level crossing", "path tram crossing", "pedestrian crossing", "streetcar crossing", "tram path crossing", "tramway crossing", "trolley crossing"], "name": "Tram-Path Crossing"},
+  "railway/tram_level_crossing": {"icon": "temaki-crossing_tram_solid", "geometry": ["vertex"], "tags": {"railway": "tram_level_crossing"}, "terms": ["crossing", "grade crossing", "level crossing", "pedestrian crossing", "road tram crossing", "streetcar crossing", "tram road crossing", "tramway crossing", "trolley crossing"], "name": "Tram-Road Crossing"},
  "railway/tram": {"icon": "temaki-tram", "fields": ["{railway/light_rail}"], "moreFields": ["{railway/light_rail}"], "geometry": ["line"], "tags": {"railway": "tram"}, "terms": ["electric street railway", "light rail", "streetcar", "tramway", "trolley"], "name": "Tram Track"},
  "railway/yard": {"icon": "temaki-freight_car", "fields": ["name", "operator"], "moreFields": ["gnis/feature_id"], "geometry": ["point"], "tags": {"railway": "yard"}, "terms": ["freight car stop", "freight train station", "rail freight station", "railroad yard", "railway yard"], "name": "Rail Yard"},
  "relation": {"icon": "iD-relation", "fields": ["name", "relation"], "geometry": ["relation"], "tags": {}, "name": "Relation"},
-  "route/ferry": {"icon": "temaki-ferry", "geometry": ["line"], "fields": ["name", "operator", "duration", "access", "toll", "from", "to"], "moreFields": ["charge_toll", "distance", "dog", "interval", "maxheight", "maxweight", "network", "opening_hours", "opening_hours/covid19", "ref_route", "roundtrip", "wheelchair"], "tags": {"route": "ferry"}, "terms": ["boat", "merchant vessel", "ship", "water bus", "water shuttle", "water taxi"], "name": "Ferry Route"},
+  "route/ferry": {"icon": "temaki-ferry", "geometry": ["line"], "fields": ["name", "operator", "duration", "access", "toll", "from", "to"], "moreFields": ["charge_toll", "distance", "dog", "email", "interval", "maxheight", "maxweight", "network", "oneway", "opening_hours", "opening_hours/covid19", "phone", "ref_route", "reservation", "roundtrip", "vhf", "website", "wheelchair"], "tags": {"route": "ferry"}, "terms": ["boat", "merchant vessel", "ship", "water bus", "water shuttle", "water taxi"], "name": "Ferry Route"},
  "seamark/beacon_isolated_danger": {"fields": ["ref", "operator", "seamark/beacon_isolated_danger/shape", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["beacon isolated danger", "isolated danger beacon", "iala"], "tags": {"seamark:type": "beacon_isolated_danger"}, "name": "Danger Beacon"},
  "seamark/beacon_lateral": {"fields": ["ref", "operator", "seamark/beacon_lateral/colour", "seamark/beacon_lateral/category", "seamark/beacon_lateral/shape", "seamark/beacon_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["lateral beacon", "beacon lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "beacon_lateral"}, "name": "Channel Beacon"},
  "seamark/buoy_lateral": {"icon": "temaki-buoy", "fields": ["ref", "operator", "seamark/buoy_lateral/colour", "seamark/buoy_lateral/category", "seamark/buoy_lateral/shape", "seamark/buoy_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral"}, "name": "Channel Buoy"},
  "seamark/buoy_lateral/green": {"icon": "temaki-buoy", "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "green"}, "name": "Green Buoy"},
  "seamark/buoy_lateral/red": {"icon": "temaki-buoy", "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "red"}, "name": "Red Buoy"},
  "seamark/mooring": {"icon": "temaki-buoy", "fields": ["ref", "operator", "seamark/mooring/category", "seamark/type"], "geometry": ["point"], "terms": ["dolphin", "pile", "bollard", "buoy", "post"], "tags": {"seamark:type": "mooring"}, "name": "Mooring"},
-  "shop": {"icon": "maki-shop", "fields": ["name", "shop", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19", "payment_multi"], "moreFields": ["air_conditioning", "brand", "building/levels_building", "currency_multi", "ele", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "phone", "ref/vatin", "second_hand", "stroller", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"shop": "*"}, "terms": [], "name": "Shop"},
+  "shop": {"icon": "maki-shop", "fields": ["name", "shop", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19", "payment_multi", "phone", "website"], "moreFields": ["air_conditioning", "brand", "building/levels_building", "currency_multi", "ele", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "ref/vatin", "second_hand", "stroller", "wheelchair"], "geometry": ["point", "area"], "tags": {"shop": "*"}, "terms": [], "name": "Shop"},
  "shop/boutique": {"icon": "maki-shop", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "boutique"}, "searchable": false, "name": "Boutique"},
  "shop/fashion": {"icon": "maki-shop", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "fashion"}, "searchable": false, "name": "Fashion Store"},
  "shop/vacant": {"icon": "maki-shop", "fields": ["name", "address", "building_area"], "geometry": ["point", "area"], "tags": {"shop": "vacant"}, "name": "Vacant Shop", "searchable": false},
@@ -1159,7 +1170,7 @@
  "shop/money_lender": {"icon": "temaki-money_hand", "fields": ["{shop}", "currency_multi"], "geometry": ["point", "area"], "tags": {"shop": "money_lender"}, "name": "Money Lender"},
  "shop/motorcycle_repair": {"icon": "temaki-motorcycle_repair", "fields": ["{shop}", "service/vehicle"], "geometry": ["point", "area"], "terms": ["auto", "bike", "garage", "motorcycle", "repair", "service"], "tags": {"shop": "motorcycle_repair"}, "name": "Motorcycle Repair Shop"},
  "shop/motorcycle": {"icon": "fas-motorcycle", "fields": ["name", "brand", "{shop}"], "geometry": ["point", "area"], "terms": ["bike"], "tags": {"shop": "motorcycle"}, "name": "Motorcycle Dealership"},
-  "shop/music": {"icon": "fas-compact-disc", "geometry": ["point", "area"], "terms": ["tape casettes", "CDs", "compact discs", "vinyl records"], "tags": {"shop": "music"}, "name": "Music Store"},
+  "shop/music": {"icon": "fas-compact-disc", "geometry": ["point", "area"], "terms": ["tape cassettes", "CDs", "compact discs", "vinyl records", "CD store", "casette", "casette store"], "tags": {"shop": "music"}, "name": "Music Store"},
  "shop/musical_instrument": {"icon": "fas-guitar", "geometry": ["point", "area"], "terms": ["guitar"], "tags": {"shop": "musical_instrument"}, "name": "Musical Instrument Store"},
  "shop/newsagent": {"icon": "fas-newspaper", "geometry": ["point", "area"], "tags": {"shop": "newsagent"}, "name": "Newspaper/Magazine Shop"},
  "shop/nutrition_supplements": {"icon": "fas-pills", "geometry": ["point", "area"], "terms": ["health", "supplement", "vitamin"], "tags": {"shop": "nutrition_supplements"}, "name": "Nutrition Supplements Store"},
@@ -1181,7 +1192,7 @@
  "shop/radiotechnics": {"icon": "fas-microchip", "geometry": ["point", "area"], "tags": {"shop": "radiotechnics"}, "terms": ["antenna", "transistor"], "name": "Radio/Electronic Component Store"},
  "shop/religion": {"icon": "maki-shop", "fields": ["{shop}", "religion", "denomination"], "geometry": ["point", "area"], "tags": {"shop": "religion"}, "name": "Religious Store"},
  "shop/rental": {"icon": "fas-dolly", "geometry": ["point", "area"], "tags": {"shop": "rental"}, "name": "Rental Shop"},
-  "shop/scuba_diving": {"icon": "temaki-scuba_diving", "fields": ["{shop}", "scuba_diving"], "geometry": ["point", "area"], "terms": ["diving", "scuba"], "tags": {"shop": "scuba_diving"}, "name": "Scuba Diving Shop"},
+  "shop/scuba_diving": {"icon": "temaki-scuba_diving", "fields": ["{shop}", "scuba_diving"], "geometry": ["point", "area"], "terms": ["diving", "scuba", "snorkel"], "tags": {"shop": "scuba_diving"}, "name": "Scuba Diving Shop"},
  "shop/seafood": {"icon": "temaki-fish_cleaning", "geometry": ["point", "area"], "terms": ["fishmonger"], "tags": {"shop": "seafood"}, "name": "Seafood Shop"},
  "shop/second_hand": {"icon": "maki-shop", "fields": ["{shop}", "second_hand"], "geometry": ["point", "area"], "terms": ["secondhand", "second hand", "resale", "thrift", "used"], "tags": {"shop": "second_hand"}, "name": "Consignment/Thrift Store"},
  "shop/sewing": {"icon": "temaki-needle_and_spool", "geometry": ["point", "area"], "terms": ["haberdashery"], "tags": {"shop": "sewing"}, "name": "Sewing Supply Shop"},
@@ -1191,7 +1202,7 @@
  "shop/sports": {"icon": "fas-futbol", "fields": ["name", "operator", "sport", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "sports"}, "terms": ["athletics"], "name": "Sporting Goods Store"},
  "shop/stationery": {"icon": "fas-paperclip", "geometry": ["point", "area"], "terms": ["card", "paper"], "tags": {"shop": "stationery"}, "name": "Stationery Store"},
  "shop/storage_rental": {"icon": "temaki-storage_rental", "geometry": ["point", "area"], "tags": {"shop": "storage_rental"}, "terms": ["device storage", "garages", "self storage", "self-service storage", "storage lockers", "storage rental", "storage units"], "name": "Storage Rental"},
-  "shop/supermarket": {"icon": "maki-grocery", "moreFields": ["{shop}", "diet_multi", "organic"], "geometry": ["point", "area"], "terms": ["grocery", "store", "shop"], "tags": {"shop": "supermarket"}, "name": "Supermarket"},
+  "shop/supermarket": {"icon": "maki-grocery", "moreFields": ["{shop}", "diet_multi", "organic"], "geometry": ["point", "area"], "terms": ["grocery", "store", "shop", "grocery store", "market", "food market"], "tags": {"shop": "supermarket"}, "name": "Supermarket"},
  "shop/supermarket/organic": {"icon": "maki-grocery", "geometry": ["point", "area"], "tags": {"shop": "supermarket", "organic": "only"}, "reference": {"key": "organic"}, "terms": ["natural foods"], "name": "Organic Supermarket"},
  "shop/swimming_pool": {"icon": "fas-swimmer", "geometry": ["point", "area"], "terms": ["hot tub equipment store", "hot tub maintenance store", "hot tub supply store", "pool shop", "pool store", "swimming pool equipment store", "swimming pool installation store", "swimming pool maintenance store", "swimming pool supply shop"], "tags": {"shop": "swimming_pool"}, "name": "Pool Supply Store"},
  "shop/tailor": {"icon": "temaki-needle_and_spool", "geometry": ["point", "area"], "terms": ["clothes", "suit"], "tags": {"shop": "tailor"}, "name": "Tailor"},
@@ -1216,6 +1227,7 @@
  "shop/water": {"icon": "tnp-2009234", "geometry": ["point", "area"], "tags": {"shop": "water"}, "name": "Drinking Water Shop"},
  "shop/weapons": {"icon": "temaki-dagger", "geometry": ["point", "area"], "terms": ["ammo", "gun", "knife", "knives"], "tags": {"shop": "weapons"}, "name": "Weapon Shop"},
  "shop/wholesale": {"icon": "maki-warehouse", "fields": ["{shop}", "wholesale"], "geometry": ["point", "area"], "terms": ["warehouse club", "cash and carry"], "tags": {"shop": "wholesale"}, "name": "Wholesale Store"},
+  "shop/wigs": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["hair extentions"], "tags": {"shop": "wigs"}, "name": "Wig Shop"},
  "shop/window_blind": {"icon": "temaki-window", "geometry": ["point", "area"], "tags": {"shop": "window_blind"}, "name": "Window Blind Store"},
  "shop/wine": {"icon": "maki-alcohol-shop", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "tags": {"shop": "wine"}, "name": "Wine Shop"},
  "telecom/data_center": {"icon": "fas-server", "fields": ["name", "ref", "operator", "building_area"], "moreFields": ["address", "gnis/feature_id", "phone", "website"], "geometry": ["point", "area"], "tags": {"telecom": "data_center"}, "terms": ["computer systems storage", "information technology", "server farm", "the cloud", "telecommunications"], "name": "Data Center"},
@@ -1224,9 +1236,9 @@
  "tourism/apartment": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["building/levels_building", "email", "fax", "height_building", "internet_access/ssid", "level", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "apartment"}, "terms": ["bnb", "holiday rental", "lodging", "overnight accommodations", "vacation rental"], "name": "Guest Apartment / Condo"},
  "tourism/aquarium": {"icon": "maki-aquarium", "fields": ["name", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19"], "moreFields": ["charge_fee", "email", "fax", "fee", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi_fee", "phone", "ref/vatin", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["fish", "sea", "water"], "tags": {"tourism": "aquarium"}, "name": "Aquarium"},
  "tourism/artwork": {"icon": "maki-art-gallery", "fields": ["name", "artwork_type", "artist"], "moreFields": ["level", "material", "website"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork"}, "terms": ["mural", "sculpture", "statue"], "name": "Artwork"},
-  "tourism/artwork/bust": {"icon": "fas-user-alt", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex"], "tags": {"tourism": "artwork", "artwork_type": "bust"}, "reference": {"key": "artwork_type"}, "terms": ["figure"], "name": "Bust"},
-  "tourism/artwork/graffiti": {"icon": "maki-art-gallery", "fields": ["name", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "graffiti"}, "reference": {"key": "artwork_type"}, "terms": ["Street Artwork", "Guerilla Artwork", "Graffiti Artwork"], "name": "Graffiti"},
-  "tourism/artwork/installation": {"icon": "temaki-sculpture", "fields": ["name", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "installation"}, "reference": {"key": "artwork_type"}, "terms": ["interactive art", "intervention art", "modern art"], "name": "Art Installation"},
+  "tourism/artwork/bust": {"icon": "fas-user-alt", "fields": ["name", "artist", "material", "inscription"], "geometry": ["point", "vertex"], "tags": {"tourism": "artwork", "artwork_type": "bust"}, "reference": {"key": "artwork_type", "value": "bust"}, "terms": ["figure"], "name": "Bust"},
+  "tourism/artwork/graffiti": {"icon": "maki-art-gallery", "fields": ["name", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "graffiti"}, "reference": {"key": "artwork_type", "value": "graffiti"}, "terms": ["Street Artwork", "Guerilla Artwork", "Graffiti Artwork"], "name": "Graffiti"},
+  "tourism/artwork/installation": {"icon": "temaki-sculpture", "fields": ["name", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "installation"}, "reference": {"key": "artwork_type", "value": "installation"}, "terms": ["interactive art", "intervention art", "modern art"], "name": "Art Installation"},
  "tourism/artwork/mural": {"icon": "maki-art-gallery", "fields": ["name", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "mural"}, "reference": {"key": "artwork_type", "value": "mural"}, "terms": ["fresco", "wall painting"], "name": "Mural"},
  "tourism/artwork/sculpture": {"icon": "temaki-sculpture", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "sculpture"}, "reference": {"key": "artwork_type", "value": "sculpture"}, "terms": ["statue", "figure", "carving"], "name": "Sculpture"},
  "tourism/artwork/statue": {"icon": "temaki-statue", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "statue"}, "reference": {"key": "artwork_type", "value": "statue"}, "terms": ["sculpture", "figure", "carving"], "name": "Statue"},
@@ -1243,9 +1255,10 @@
  "tourism/hotel": {"icon": "fas-concierge-bell", "fields": ["{tourism/motel}"], "moreFields": ["{tourism/motel}", "bar", "stars"], "geometry": ["point", "area"], "tags": {"tourism": "hotel"}, "terms": ["concierge", "lodge", "lodging", "overnight accommodations"], "name": "Hotel"},
  "tourism/information": {"icon": "maki-information", "fields": ["information", "operator", "address", "building_area"], "moreFields": ["level"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information"}, "name": "Information"},
  "tourism/information/board": {"icon": "temaki-info_board", "fields": ["name", "operator", "board_type", "direction"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "board"}, "reference": {"key": "information", "value": "board"}, "name": "Information Board"},
+  "tourism/information/board/welcome_sign": {"icon": "maki-embassy", "geometry": ["point"], "terms": ["new location"], "tags": {"tourism": "information", "information": "board", "board_type": "welcome_sign"}, "name": "Welcome Sign"},
  "tourism/information/guidepost": {"icon": "fas-map-signs", "fields": ["name", "ele_node", "operator", "ref"], "moreFields": ["material"], "geometry": ["point", "vertex"], "terms": ["signpost"], "tags": {"tourism": "information", "information": "guidepost"}, "reference": {"key": "information", "value": "guidepost"}, "name": "Guidepost"},
  "tourism/information/map": {"icon": "fas-map", "fields": ["operator", "map_type", "map_size", "direction"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "map"}, "reference": {"key": "information", "value": "map"}, "name": "Map"},
-  "tourism/information/office": {"icon": "maki-information", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee"], "moreFields": ["building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information", "information": "office"}, "reference": {"key": "information", "value": "office"}, "name": "Tourist Information Office"},
+  "tourism/information/office": {"icon": "maki-information", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee"], "moreFields": ["building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information", "information": "office"}, "reference": {"key": "information", "value": "office"}, "terms": ["information office", "tour guide", "tourism office", "tourist information center", "visitors center", "visitors information center", "welcome center"], "name": "Visitor Center"},
  "tourism/information/route_marker": {"icon": "maki-information", "fields": ["ref", "operator", "colour", "material", "ele_node"], "geometry": ["point", "vertex"], "terms": ["cairn", "painted blaze", "route flag", "route marker", "stone pile", "trail blaze", "trail post", "way marker"], "tags": {"tourism": "information", "information": "route_marker"}, "reference": {"key": "information", "value": "route_marker"}, "name": "Trail Marker"},
  "tourism/information/terminal": {"icon": "temaki-app_terminal", "fields": ["operator"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "terminal"}, "reference": {"key": "information", "value": "terminal"}, "name": "Information Terminal"},
  "tourism/motel": {"icon": "maki-lodging", "fields": ["name", "brand", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "brand", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access/ssid", "operator", "payment_multi", "phone", "ref/vatin", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "motel"}, "terms": ["lodging", "motor hotel", "overnight accommodations"], "name": "Motel"},
@@ -1254,7 +1267,7 @@
  "tourism/picnic_site": {"icon": "maki-picnic-site", "fields": ["name", "operator", "address", "access_simple", "capacity"], "moreFields": ["charge_fee", "fee", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi_fee", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["camp"], "tags": {"tourism": "picnic_site"}, "name": "Picnic Site"},
  "tourism/theme_park": {"icon": "maki-amusement-park", "fields": ["name", "operator", "address", "opening_hours", "opening_hours/covid19", "website"], "moreFields": ["brand", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "theme_park"}, "name": "Theme Park"},
  "tourism/trail_riding_station": {"icon": "maki-horse-riding", "fields": ["name", "horse_stables", "horse_riding", "horse_dressage"], "moreFields": ["address", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "opening_hours", "opening_hours/covid19", "phone", "website"], "geometry": ["point", "area"], "tags": {"tourism": "trail_riding_station"}, "name": "Trail Riding Station", "matchScore": 2},
-  "tourism/viewpoint": {"icon": "temaki-binoculars", "geometry": ["point", "vertex"], "fields": ["direction"], "moreFields": ["level"], "tags": {"tourism": "viewpoint"}, "name": "Viewpoint"},
+  "tourism/viewpoint": {"icon": "temaki-spotting_scope", "geometry": ["point", "vertex"], "fields": ["direction"], "moreFields": ["level"], "tags": {"tourism": "viewpoint"}, "name": "Viewpoint"},
  "tourism/wilderness_hut": {"icon": "temaki-cabin", "fields": ["name", "operator", "address", "building_area", "fee", "payment_multi_fee", "charge_fee", "fireplace"], "moreFields": ["gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "reservation", "wheelchair"], "geometry": ["point", "area"], "terms": ["alpine hut", "cabin", "backcountry hut", "bothy", "lodge", "lodging", "overnight accommodations", "sleeping shelter", "wilderness hut"], "tags": {"tourism": "wilderness_hut"}, "name": "Wilderness Hut"},
  "tourism/zoo": {"icon": "temaki-zoo", "fields": ["name", "operator", "address", "opening_hours", "opening_hours/covid19", "fee", "charge_fee"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "ref/vatin", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["animal"], "tags": {"tourism": "zoo"}, "name": "Zoo"},
  "tourism/zoo/petting": {"icon": "fas-horse", "geometry": ["point", "area"], "tags": {"tourism": "zoo", "zoo": "petting_zoo"}, "reference": {"key": "zoo", "value": "petting_zoo"}, "terms": ["Children's Zoo", "Children's Farm", "Petting Farm", "farm animals"], "name": "Petting Zoo"},
@@ -1270,12 +1283,9 @@
  "traffic_calming/island": {"icon": "temaki-diamond", "fields": ["surface"], "geometry": ["vertex", "line", "area"], "terms": ["circle", "roundabout", "slow"], "tags": {"traffic_calming": "island"}, "name": "Traffic Island"},
  "traffic_calming/rumble_strip": {"icon": "temaki-rumble_strip", "fields": ["direction_vertex"], "geometry": ["vertex", "line"], "terms": ["audible lines", "sleeper lines", "growlers"], "tags": {"traffic_calming": "rumble_strip"}, "name": "Rumble Strip"},
  "traffic_calming/table": {"icon": "temaki-speed_table", "fields": ["surface", "direction_vertex"], "geometry": ["vertex"], "tags": {"traffic_calming": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "name": "Speed Table"},
-  "traffic_sign_vertex": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "traffic_sign/direction"], "geometry": ["vertex"], "tags": {"traffic_sign": "*"}, "terms": ["road", "highway"], "name": "Traffic Sign"},
-  "traffic_sign": {"icon": "fas-directions", "fields": ["traffic_sign", "direction"], "geometry": ["point"], "tags": {"traffic_sign": "*"}, "terms": ["road", "highway"], "name": "Traffic Sign"},
-  "traffic_sign/city_limit_vertex": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "traffic_sign/direction", "name"], "geometry": ["vertex"], "tags": {"traffic_sign": "city_limit"}, "terms": ["town", "village", "hamlet", "boundary", "edge", "border", "road", "highway"], "name": "City Limit Sign"},
-  "traffic_sign/city_limit": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "direction", "name"], "geometry": ["point"], "tags": {"traffic_sign": "city_limit"}, "terms": ["town", "village", "hamlet", "boundary", "edge", "border", "road", "highway"], "name": "City Limit Sign"},
-  "traffic_sign/maxspeed_vertex": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "traffic_sign/direction", "maxspeed"], "geometry": ["vertex"], "tags": {"traffic_sign": "maxspeed"}, "terms": ["max speed", "maximum speed", "road", "highway"], "name": "Speed Limit Sign"},
-  "traffic_sign/maxspeed": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "direction", "maxspeed"], "geometry": ["point"], "tags": {"traffic_sign": "maxspeed"}, "terms": ["max speed", "maximum speed", "road", "highway"], "name": "Speed Limit Sign"},
+  "traffic_sign": {"icon": "fas-directions", "fields": ["traffic_sign", "traffic_sign/direction", "direction_point"], "geometry": ["point", "vertex"], "tags": {"traffic_sign": "*"}, "terms": ["road", "highway"], "name": "Traffic Sign"},
+  "traffic_sign/city_limit": {"icon": "maki-square-stroked", "fields": ["{traffic_sign}", "name"], "geometry": ["point", "vertex"], "tags": {"traffic_sign": "city_limit"}, "terms": ["town", "village", "hamlet", "boundary", "edge", "border", "road", "highway"], "name": "City Limit Sign"},
+  "traffic_sign/maxspeed": {"icon": "maki-square-stroked", "fields": ["{traffic_sign}", "maxspeed"], "geometry": ["point", "vertex"], "tags": {"traffic_sign": "maxspeed"}, "terms": ["max speed", "maximum speed", "road", "highway"], "name": "Speed Limit Sign"},
  "type/multipolygon": {"icon": "iD-multipolygon", "geometry": ["area", "relation"], "tags": {"type": "multipolygon"}, "removeTags": {}, "name": "Multipolygon", "searchable": false, "matchScore": 0.1},
  "type/boundary": {"icon": "iD-boundary", "fields": ["name", "boundary"], "geometry": ["relation"], "tags": {"type": "boundary"}, "name": "Boundary"},
  "type/boundary/administrative": {"icon": "iD-boundary", "fields": ["name", "admin_level"], "moreFields": ["gnis/feature_id"], "geometry": ["relation"], "tags": {"type": "boundary", "boundary": "administrative"}, "reference": {"key": "boundary", "value": "administrative"}, "name": "Administrative Boundary"},
@@ -1285,33 +1295,33 @@
  "type/enforcement/maxspeed": {"icon": "iD-relation", "fields": ["maxspeed"], "geometry": ["relation"], "tags": {"type": "enforcement", "enforcement": "maxspeed"}, "reference": {"key": "enforcement", "value": "maxspeed"}, "terms": ["maxspeed", "radar", "speed camera"], "name": "Speed Limit Enforcement"},
  "type/public_transport/stop_area_group": {"icon": "iD-relation", "fields": ["name", "ref", "network", "operator"], "geometry": ["relation"], "tags": {"type": "public_transport", "public_transport": "stop_area_group"}, "reference": {"key": "public_transport", "value": "stop_area_group"}, "name": "Transit Stop Area Group"},
  "type/restriction": {"icon": "iD-restriction", "fields": ["restriction", "except"], "geometry": ["relation"], "tags": {"type": "restriction"}, "name": "Restriction"},
-  "type/restriction/no_left_turn": {"icon": "iD-restriction-no-left-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "no_left_turn"}, "name": "No Left Turn"},
-  "type/restriction/no_right_turn": {"icon": "iD-restriction-no-right-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "no_right_turn"}, "name": "No Right Turn"},
-  "type/restriction/no_straight_on": {"icon": "iD-restriction-no-straight-on", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "no_straight_on"}, "name": "No Straight On"},
-  "type/restriction/no_u_turn": {"icon": "iD-restriction-no-u-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "no_u_turn"}, "name": "No U-turn"},
-  "type/restriction/only_left_turn": {"icon": "iD-restriction-only-left-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "only_left_turn"}, "name": "Only Left Turn"},
-  "type/restriction/only_right_turn": {"icon": "iD-restriction-only-right-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "only_right_turn"}, "name": "Only Right Turn"},
-  "type/restriction/only_straight_on": {"icon": "iD-restriction-only-straight-on", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "only_straight_on"}, "name": "Only Straight On"},
-  "type/restriction/only_u_turn": {"icon": "iD-restriction-only-u-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "only_u_turn"}, "name": "Only U-turn"},
+  "type/restriction/no_left_turn": {"icon": "iD-restriction-no-left-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "no_left_turn"}, "reference": {"key": "restriction", "value": "no_left_turn"}, "name": "No Left Turn"},
+  "type/restriction/no_right_turn": {"icon": "iD-restriction-no-right-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "no_right_turn"}, "reference": {"key": "restriction", "value": "no_right_turn"}, "name": "No Right Turn"},
+  "type/restriction/no_straight_on": {"icon": "iD-restriction-no-straight-on", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "no_straight_on"}, "reference": {"key": "restriction", "value": "no_straight_on"}, "name": "No Straight On"},
+  "type/restriction/no_u_turn": {"icon": "iD-restriction-no-u-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "no_u_turn"}, "reference": {"key": "restriction", "value": "no_u_turn"}, "name": "No U-turn"},
+  "type/restriction/only_left_turn": {"icon": "iD-restriction-only-left-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "only_left_turn"}, "reference": {"key": "restriction", "value": "only_left_turn"}, "name": "Only Left Turn"},
+  "type/restriction/only_right_turn": {"icon": "iD-restriction-only-right-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "only_right_turn"}, "reference": {"key": "restriction", "value": "only_right_turn"}, "name": "Only Right Turn"},
+  "type/restriction/only_straight_on": {"icon": "iD-restriction-only-straight-on", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "only_straight_on"}, "reference": {"key": "restriction", "value": "only_straight_on"}, "name": "Only Straight On"},
+  "type/restriction/only_u_turn": {"icon": "iD-restriction-only-u-turn", "geometry": ["relation"], "tags": {"type": "restriction", "restriction": "only_u_turn"}, "reference": {"key": "restriction", "value": "only_u_turn"}, "name": "Only U-turn"},
  "type/route_master": {"icon": "iD-route-master", "fields": ["name", "route_master", "ref", "operator", "network"], "moreFields": ["colour", "interval", "opening_hours", "opening_hours/covid19", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route_master"}, "name": "Route Master"},
  "type/route": {"icon": "iD-route", "fields": ["name", "route", "ref_route", "operator", "network", "network/type"], "moreFields": ["distance"], "geometry": ["relation"], "tags": {"type": "route"}, "name": "Route"},
-  "type/route/bicycle": {"icon": "maki-bicycle", "fields": ["name", "ref_route", "network_bicycle", "cycle_network", "network/type", "from", "to"], "moreFields": ["ascent", "colour", "descent", "distance", "roundtrip"], "geometry": ["relation"], "tags": {"type": "route", "route": "bicycle"}, "name": "Cycle Route"},
-  "type/route/bus": {"icon": "temaki-bus", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "bus"}, "name": "Bus Route"},
-  "type/route/detour": {"icon": "iD-route-detour", "fields": ["name", "ref_route", "from", "to"], "geometry": ["relation"], "tags": {"type": "route", "route": "detour"}, "name": "Detour Route"},
-  "type/route/ferry": {"icon": "temaki-ferry", "fields": ["{route/ferry}"], "moreFields": ["{route/ferry}"], "geometry": ["relation"], "tags": {"type": "route", "route": "ferry"}, "name": "Ferry Route"},
-  "type/route/foot": {"icon": "temaki-pedestrian", "fields": ["{type/route/hiking}"], "moreFields": ["{type/route/hiking}"], "geometry": ["relation"], "tags": {"type": "route", "route": "foot"}, "name": "Foot Route"},
-  "type/route/hiking": {"icon": "fas-hiking", "fields": ["name", "ref_route", "operator", "network_foot", "network/type", "from", "to"], "moreFields": ["ascent", "colour", "descent", "distance", "roundtrip"], "geometry": ["relation"], "tags": {"type": "route", "route": "hiking"}, "name": "Hiking Route"},
-  "type/route/horse": {"icon": "maki-horse-riding", "fields": ["name", "ref_route", "operator", "network_horse", "network/type", "from", "to"], "moreFields": ["ascent", "colour", "descent", "distance"], "geometry": ["relation"], "tags": {"type": "route", "route": "horse"}, "name": "Riding Route"},
-  "type/route/light_rail": {"icon": "temaki-light_rail", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "light_rail"}, "name": "Light Rail Route"},
-  "type/route/monorail": {"icon": "temaki-monorail", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "monorail"}, "name": "Monorail Route"},
-  "type/route/pipeline": {"icon": "iD-pipeline-line", "fields": ["{type/route/power}"], "moreFields": ["{type/route/power}"], "geometry": ["relation"], "tags": {"type": "route", "route": "pipeline"}, "name": "Pipeline Route"},
-  "type/route/piste": {"icon": "fas-skiing", "fields": ["name", "piste/type", "ref_route", "operator", "from", "to"], "moreFields": ["ascent", "colour", "descent", "distance", "roundtrip"], "geometry": ["relation"], "tags": {"type": "route", "route": "piste"}, "name": "Piste/Ski Route"},
-  "type/route/power": {"icon": "iD-power-line", "fields": ["name", "ref_route", "operator", "from", "to"], "moreFields": ["distance"], "geometry": ["relation"], "tags": {"type": "route", "route": "power"}, "name": "Power Route"},
-  "type/route/road": {"icon": "iD-highway-unclassified", "fields": ["name", "ref_route", "network_road", "from", "to"], "moreFields": ["colour", "distance", "roundtrip"], "geometry": ["relation"], "tags": {"type": "route", "route": "road"}, "name": "Road Route"},
-  "type/route/subway": {"icon": "temaki-subway", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "subway"}, "name": "Subway Route"},
-  "type/route/train": {"icon": "temaki-train", "fields": ["name", "ref_route", "operator", "network", "from", "to"], "moreFields": ["colour", "distance", "duration", "interval", "opening_hours", "opening_hours/covid19", "roundtrip", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "train"}, "name": "Train Route"},
-  "type/route/tram": {"icon": "temaki-tram", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "tram"}, "name": "Tram Route"},
-  "type/route/trolleybus": {"icon": "temaki-trolleybus", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "trolleybus"}, "name": "Trolleybus Route"},
+  "type/route/bicycle": {"icon": "maki-bicycle", "fields": ["name", "ref_route", "network_bicycle", "cycle_network", "network/type", "from", "to"], "moreFields": ["ascent", "colour", "descent", "distance", "roundtrip"], "geometry": ["relation"], "tags": {"type": "route", "route": "bicycle"}, "reference": {"key": "route", "value": "bicycle"}, "name": "Cycle Route"},
+  "type/route/bus": {"icon": "temaki-bus", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "bus"}, "reference": {"key": "route", "value": "bus"}, "name": "Bus Route"},
+  "type/route/detour": {"icon": "iD-route-detour", "fields": ["name", "ref_route", "from", "to"], "geometry": ["relation"], "tags": {"type": "route", "route": "detour"}, "reference": {"key": "route", "value": "detour"}, "name": "Detour Route"},
+  "type/route/ferry": {"icon": "temaki-ferry", "fields": ["{route/ferry}"], "moreFields": ["{route/ferry}"], "geometry": ["relation"], "tags": {"type": "route", "route": "ferry"}, "reference": {"key": "route", "value": "ferry"}, "name": "Ferry Route"},
+  "type/route/foot": {"icon": "temaki-pedestrian", "fields": ["{type/route/hiking}"], "moreFields": ["{type/route/hiking}"], "geometry": ["relation"], "tags": {"type": "route", "route": "foot"}, "reference": {"key": "route", "value": "foot"}, "name": "Foot Route"},
+  "type/route/hiking": {"icon": "fas-hiking", "fields": ["name", "ref_route", "operator", "network_foot", "network/type", "from", "to"], "moreFields": ["ascent", "colour", "descent", "distance", "roundtrip"], "geometry": ["relation"], "tags": {"type": "route", "route": "hiking"}, "reference": {"key": "route", "value": "hiking"}, "name": "Hiking Route"},
+  "type/route/horse": {"icon": "maki-horse-riding", "fields": ["name", "ref_route", "operator", "network_horse", "network/type", "from", "to"], "moreFields": ["ascent", "colour", "descent", "distance"], "geometry": ["relation"], "tags": {"type": "route", "route": "horse"}, "reference": {"key": "route", "value": "horse"}, "name": "Riding Route"},
+  "type/route/light_rail": {"icon": "temaki-light_rail", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "light_rail"}, "reference": {"key": "route", "value": "light_rail"}, "name": "Light Rail Route"},
+  "type/route/monorail": {"icon": "temaki-monorail", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "monorail"}, "reference": {"key": "route", "value": "monorail"}, "name": "Monorail Route"},
+  "type/route/pipeline": {"icon": "iD-pipeline-line", "fields": ["{type/route/power}"], "moreFields": ["{type/route/power}"], "geometry": ["relation"], "tags": {"type": "route", "route": "pipeline"}, "reference": {"key": "route", "value": "pipeline"}, "name": "Pipeline Route"},
+  "type/route/piste": {"icon": "fas-skiing", "fields": ["name", "piste/type", "ref_route", "operator", "from", "to"], "moreFields": ["ascent", "colour", "descent", "distance", "roundtrip"], "geometry": ["relation"], "tags": {"type": "route", "route": "piste"}, "reference": {"key": "route", "value": "piste"}, "name": "Piste/Ski Route"},
+  "type/route/power": {"icon": "iD-power-line", "fields": ["name", "ref_route", "operator", "from", "to"], "moreFields": ["distance"], "geometry": ["relation"], "tags": {"type": "route", "route": "power"}, "reference": {"key": "route", "value": "power"}, "name": "Power Route"},
+  "type/route/road": {"icon": "iD-highway-unclassified", "fields": ["name", "ref_route", "network_road", "from", "to"], "moreFields": ["colour", "distance", "roundtrip"], "geometry": ["relation"], "tags": {"type": "route", "route": "road"}, "reference": {"key": "route", "value": "road"}, "name": "Road Route"},
+  "type/route/subway": {"icon": "temaki-subway", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "subway"}, "reference": {"key": "route", "value": "subway"}, "name": "Subway Route"},
+  "type/route/train": {"icon": "temaki-train", "fields": ["name", "ref_route", "operator", "network", "from", "to"], "moreFields": ["colour", "distance", "duration", "interval", "opening_hours", "opening_hours/covid19", "roundtrip", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "train"}, "reference": {"key": "route", "value": "train"}, "name": "Train Route"},
+  "type/route/tram": {"icon": "temaki-tram", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "tram"}, "reference": {"key": "route", "value": "tram"}, "name": "Tram Route"},
+  "type/route/trolleybus": {"icon": "temaki-trolleybus", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "trolleybus"}, "reference": {"key": "route", "value": "trolleybus"}, "name": "Trolleybus Route"},
  "type/site": {"icon": "iD-relation", "fields": ["name", "site"], "geometry": ["relation"], "tags": {"type": "site"}, "name": "Site"},
  "type/waterway": {"icon": "iD-waterway-stream", "fields": ["name", "waterway", "destination_waterway", "ref"], "geometry": ["relation"], "tags": {"type": "waterway"}, "name": "Waterway"},
  "waterway/riverbank": {"icon": "maki-water", "geometry": ["area"], "tags": {"waterway": "riverbank"}, "name": "Riverbank", "searchable": false},
@@ -2332,7 +2342,7 @@
  "amenity/fast_food/sandwich/Blimpie": {"name": "Blimpie", "icon": "temaki-sandwich", "imageURL": "https://graph.facebook.com/Blimpie/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4926479", "amenity": "fast_food", "cuisine": "sandwich"}, "addTags": {"amenity": "fast_food", "brand": "Blimpie", "brand:wikidata": "Q4926479", "brand:wikipedia": "en:Blimpie", "cuisine": "sandwich", "name": "Blimpie", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "sandwich"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/burger/Bob's": {"name": "Bob's", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/bobsbrasil/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1392113", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "Bob's", "brand:wikidata": "Q1392113", "brand:wikipedia": "en:Bob's", "cuisine": "burger", "name": "Bob's", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["ao", "br", "cl", "pt"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/chicken/Bojangles'": {"name": "Bojangles'", "icon": "fas-drumstick-bite", "imageURL": "https://graph.facebook.com/Bojangles/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q891163", "amenity": "fast_food", "cuisine": "chicken"}, "addTags": {"amenity": "fast_food", "brand": "Bojangles'", "brand:wikidata": "Q891163", "brand:wikipedia": "en:Bojangles' Famous Chicken 'n Biscuits", "cuisine": "chicken", "name": "Bojangles'", "official_name": "Bojangles' Famous Chicken 'n Biscuits", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "chicken"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-  "amenity/fast_food/Booster Juice": {"name": "Booster Juice", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/boosterjuice/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4943796", "amenity": "fast_food"}, "addTags": {"amenity": "fast_food", "brand": "Booster Juice", "brand:wikidata": "Q4943796", "brand:wikipedia": "en:Booster Juice", "cuisine": "juice", "name": "Booster Juice", "takeaway": "yes"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
+  "amenity/fast_food/juice/Booster Juice": {"name": "Booster Juice", "icon": "temaki-drink_cup", "imageURL": "https://graph.facebook.com/boosterjuice/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4943796", "amenity": "fast_food", "cuisine": "juice"}, "addTags": {"amenity": "fast_food", "brand": "Booster Juice", "brand:wikidata": "Q4943796", "brand:wikipedia": "en:Booster Juice", "cuisine": "juice", "name": "Booster Juice", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "juice"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/chicken/Boston Market": {"name": "Boston Market", "icon": "fas-drumstick-bite", "imageURL": "https://graph.facebook.com/BostonMarket/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q603617", "amenity": "fast_food", "cuisine": "american;chicken"}, "addTags": {"amenity": "fast_food", "brand": "Boston Market", "brand:wikidata": "Q603617", "brand:wikipedia": "en:Boston Market", "cuisine": "american;chicken", "name": "Boston Market", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "chicken"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/ice_cream/Braum's": {"name": "Braum's", "icon": "fas-ice-cream", "imageURL": "https://graph.facebook.com/BraumsIceCreamandDairyStores/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4958263", "amenity": "fast_food", "cuisine": "ice_cream"}, "addTags": {"amenity": "fast_food", "brand": "Braum's", "brand:wikidata": "Q4958263", "brand:wikipedia": "en:Braum's", "cuisine": "ice_cream", "name": "Braum's", "shop": "dairy", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "ice_cream"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/Bruegger's Bagels": {"name": "Bruegger's Bagels", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/Brueggers/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4978656", "amenity": "fast_food"}, "addTags": {"amenity": "fast_food", "brand": "Bruegger's Bagels", "brand:wikidata": "Q4978656", "brand:wikipedia": "en:Bruegger's", "cuisine": "bagel", "name": "Bruegger's Bagels", "short_name": "Bruegger's", "takeaway": "yes"}, "countryCodes": ["us"], "terms": ["breuger's", "breugger's", "bruger's", "brugger's"], "matchScore": 2, "suggestion": true},
@@ -2390,7 +2400,7 @@
  "amenity/fast_food/ice_cream/Freddy's": {"name": "Freddy's", "icon": "fas-ice-cream", "imageURL": "https://graph.facebook.com/FreddysUSA/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5496837", "amenity": "fast_food", "cuisine": "ice_cream;burger"}, "addTags": {"amenity": "fast_food", "brand": "Freddy's", "brand:wikidata": "Q5496837", "brand:wikipedia": "en:Freddy's Frozen Custard & Steakburgers", "cuisine": "ice_cream;burger", "name": "Freddy's", "official_name": "Freddys Frozen Custard & Steakburgers", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "ice_cream"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/mexican/Freebirds": {"name": "Freebirds", "icon": "fas-pepper-hot", "imageURL": "https://graph.facebook.com/freebirdsworldburrito/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5500367", "amenity": "fast_food", "cuisine": "mexican"}, "addTags": {"amenity": "fast_food", "brand": "Freebirds", "brand:wikidata": "Q5500367", "brand:wikipedia": "en:Freebirds World Burrito", "cuisine": "mexican", "name": "Freebirds", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "mexican"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/pizza/Freshslice Pizza": {"name": "Freshslice Pizza", "icon": "maki-restaurant-pizza", "imageURL": "https://graph.facebook.com/Freshslice/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5503082", "amenity": "fast_food", "cuisine": "pizza"}, "addTags": {"amenity": "fast_food", "brand": "Freshslice Pizza", "brand:wikidata": "Q5503082", "brand:wikipedia": "en:Freshslice Pizza", "cuisine": "pizza", "name": "Freshslice Pizza", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "pizza"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
-  "amenity/fast_food/Freshëns": {"name": "Freshëns", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/Freshens/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q88353412", "amenity": "fast_food"}, "addTags": {"amenity": "fast_food", "brand": "Freshëns", "brand:wikidata": "Q88353412", "cuisine": "juice;salad", "name": "Freshëns", "takeaway": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+  "amenity/fast_food/juice/Freshëns": {"name": "Freshëns", "icon": "temaki-drink_cup", "imageURL": "https://graph.facebook.com/Freshens/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q88353412", "amenity": "fast_food", "cuisine": "juice;salad"}, "addTags": {"amenity": "fast_food", "brand": "Freshëns", "brand:wikidata": "Q88353412", "cuisine": "juice;salad", "name": "Freshëns", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "juice"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/pizza/Gabriel Pizza": {"name": "Gabriel Pizza", "icon": "maki-restaurant-pizza", "imageURL": "https://graph.facebook.com/gabrielpizza/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5515791", "amenity": "fast_food", "cuisine": "pizza"}, "addTags": {"amenity": "fast_food", "brand": "Gabriel Pizza", "brand:wikidata": "Q5515791", "brand:wikipedia": "en:Gabriel Pizza", "cuisine": "pizza", "name": "Gabriel Pizza", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "pizza"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/pizza/Gino's Pizza (Canada)": {"name": "Gino's Pizza (Canada)", "icon": "maki-restaurant-pizza", "imageURL": "https://graph.facebook.com/GinosPizzaGroup/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q84029134", "amenity": "fast_food", "cuisine": "pizza"}, "addTags": {"amenity": "fast_food", "brand": "Gino's Pizza", "brand:wikidata": "Q84029134", "cuisine": "pizza", "name": "Gino's Pizza", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "pizza"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/pizza/Gino's Pizza (West Virginia)": {"name": "Gino's Pizza (West Virginia)", "icon": "maki-restaurant-pizza", "imageURL": "https://pbs.twimg.com/profile_images/1240550288/TwitterProfile_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5563205", "amenity": "fast_food", "cuisine": "pizza"}, "addTags": {"amenity": "fast_food", "brand": "Gino's Pizza", "brand:wikidata": "Q5563205", "brand:wikipedia": "en:Gino's Pizza and Spaghetti", "cuisine": "pizza", "name": "Gino's Pizza", "official_name": "Gino's Pizza & Spaghetti House", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "pizza"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -2421,7 +2431,7 @@
  "amenity/fast_food/burger/In-N-Out Burger": {"name": "In-N-Out Burger", "icon": "maki-fast-food", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FInNOut.svg&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1205312", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "In-N-Out Burger", "brand:wikidata": "Q1205312", "brand:wikipedia": "en:In-N-Out Burger", "cuisine": "burger", "name": "In-N-Out Burger", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/burger/Jack in the Box": {"name": "Jack in the Box", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/jackinthebox/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1538507", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "Jack in the Box", "brand:wikidata": "Q1538507", "brand:wikipedia": "en:Jack in the Box", "cuisine": "burger", "name": "Jack in the Box", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/burger/Jack's": {"name": "Jack's", "icon": "maki-fast-food", "imageURL": "https://pbs.twimg.com/profile_images/1194591890965966848/ajrBO2Z3_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6110826", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "Jack's", "brand:wikidata": "Q6110826", "brand:wikipedia": "en:Jack's", "cuisine": "burger", "name": "Jack's", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-  "amenity/fast_food/Jamba Juice": {"name": "Jamba Juice", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/jambajuice/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3088784", "amenity": "fast_food"}, "addTags": {"amenity": "fast_food", "brand": "Jamba Juice", "brand:wikidata": "Q3088784", "brand:wikipedia": "en:Jamba Juice", "cuisine": "juice", "name": "Jamba Juice", "takeaway": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+  "amenity/fast_food/juice/Jamba Juice": {"name": "Jamba Juice", "icon": "temaki-drink_cup", "imageURL": "https://graph.facebook.com/jambajuice/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3088784", "amenity": "fast_food", "cuisine": "juice"}, "addTags": {"amenity": "fast_food", "brand": "Jamba Juice", "brand:wikidata": "Q3088784", "brand:wikipedia": "en:Jamba Juice", "cuisine": "juice", "name": "Jamba Juice", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "juice"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/sandwich/Jersey Mike's Subs": {"name": "Jersey Mike's Subs", "icon": "temaki-sandwich", "imageURL": "https://graph.facebook.com/jerseymikes/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6184897", "amenity": "fast_food", "cuisine": "sandwich"}, "addTags": {"amenity": "fast_food", "brand": "Jersey Mike's Subs", "brand:wikidata": "Q6184897", "brand:wikipedia": "en:Jersey Mike's Subs", "cuisine": "sandwich", "name": "Jersey Mike's Subs", "short_name": "Jersey Mike's", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "sandwich"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/sandwich/Jimmy John's": {"name": "Jimmy John's", "icon": "temaki-sandwich", "imageURL": "https://graph.facebook.com/jimmyjohns/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1689380", "amenity": "fast_food", "cuisine": "sandwich"}, "addTags": {"amenity": "fast_food", "brand": "Jimmy John's", "brand:wikidata": "Q1689380", "brand:wikipedia": "en:Jimmy John's", "cuisine": "sandwich", "name": "Jimmy John's", "official_name": "Jimmy John's Gourmet Sandwiches", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "sandwich"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/Jimmy the Greek": {"name": "Jimmy the Greek", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/gimmejimmy.jtg/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q17077817", "amenity": "fast_food"}, "addTags": {"amenity": "fast_food", "brand": "Jimmy the Greek", "brand:wikidata": "Q17077817", "brand:wikipedia": "en:Jimmy the Greek (restaurant)", "cuisine": "greek", "name": "Jimmy the Greek", "takeaway": "yes"}, "countryCodes": ["ae", "ca"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -2469,7 +2479,7 @@
  "amenity/fast_food/sandwich/Num Pang": {"name": "Num Pang", "icon": "temaki-sandwich", "imageURL": "https://graph.facebook.com/NumPangKitchen/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62079702", "amenity": "fast_food", "cuisine": "cambodian;sandwich"}, "addTags": {"amenity": "fast_food", "brand": "Num Pang", "brand:wikidata": "Q62079702", "brand:wikipedia": "en:Num Pang", "cuisine": "cambodian;sandwich", "name": "Num Pang", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "sandwich"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/mexican/O'Tacos": {"name": "O'Tacos", "icon": "fas-pepper-hot", "imageURL": "https://graph.facebook.com/Otacos.France/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q28494040", "amenity": "fast_food", "cuisine": "mexican"}, "addTags": {"amenity": "fast_food", "brand": "O'Tacos", "brand:wikidata": "Q28494040", "brand:wikipedia": "en:O'Tacos", "cuisine": "mexican", "name": "O'Tacos", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "mexican"}, "countryCodes": ["be", "fr"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/burger/Oporto": {"name": "Oporto", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/Oportos/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4412342", "amenity": "fast_food", "cuisine": "burger;chicken"}, "addTags": {"amenity": "fast_food", "brand": "Oporto", "brand:wikidata": "Q4412342", "brand:wikipedia": "en:Oporto (restaurant)", "cuisine": "burger;chicken", "name": "Oporto", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["au"], "terms": [], "matchScore": 2, "suggestion": true},
-  "amenity/fast_food/Orange Julius": {"name": "Orange Julius", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/OrangeJulius/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3355059", "amenity": "fast_food"}, "addTags": {"amenity": "fast_food", "brand": "Orange Julius", "brand:wikidata": "Q3355059", "brand:wikipedia": "en:Orange Julius", "cuisine": "juice", "name": "Orange Julius", "takeaway": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+  "amenity/fast_food/juice/Orange Julius": {"name": "Orange Julius", "icon": "temaki-drink_cup", "imageURL": "https://graph.facebook.com/OrangeJulius/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3355059", "amenity": "fast_food", "cuisine": "juice"}, "addTags": {"amenity": "fast_food", "brand": "Orange Julius", "brand:wikidata": "Q3355059", "brand:wikipedia": "en:Orange Julius", "cuisine": "juice", "name": "Orange Julius", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "juice"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/burger/P. Terry's": {"name": "P. Terry's", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/pterrys/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q19903521", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "P. Terry's", "brand:wikidata": "Q19903521", "brand:wikipedia": "en:P. Terry's", "cuisine": "burger", "name": "P. Terry's", "official_name": "P. Terry's Burger Stand", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/burger/Pal's": {"name": "Pal's", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/Palsweb/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7126094", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "Pal's", "brand:wikidata": "Q7126094", "brand:wikipedia": "en:Pal's", "cuisine": "burger", "name": "Pal's", "official_name": "Pal's Sudden Service", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/pizza/Panago": {"name": "Panago", "icon": "maki-restaurant-pizza", "imageURL": "https://graph.facebook.com/panago/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q17111672", "amenity": "fast_food", "cuisine": "pizza"}, "addTags": {"amenity": "fast_food", "brand": "Panago", "brand:wikidata": "Q17111672", "brand:wikipedia": "en:Panago", "cuisine": "pizza", "name": "Panago", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "pizza"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -2521,7 +2531,7 @@
  "amenity/fast_food/burger/Shake Shack": {"name": "Shake Shack", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/shakeshack/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1058722", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "Shake Shack", "brand:wikidata": "Q1058722", "brand:wikipedia": "en:Shake Shack", "cuisine": "burger", "name": "Shake Shack", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["gb", "us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/burger/Sibylla": {"name": "Sibylla", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/sibyllasverige/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q488643", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "Sibylla", "brand:wikidata": "Q488643", "brand:wikipedia": "en:Sibylla (fast food)", "cuisine": "burger", "name": "Sibylla", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["fi", "se"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/burger/Smashburger": {"name": "Smashburger", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/smashburger/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q17061332", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "Smashburger", "brand:wikidata": "Q17061332", "brand:wikipedia": "en:Smashburger", "cuisine": "burger", "name": "Smashburger", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
-  "amenity/fast_food/Smoothie King": {"name": "Smoothie King", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/SmoothieKing/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5491421", "amenity": "fast_food"}, "addTags": {"amenity": "fast_food", "brand": "Smoothie King", "brand:wikidata": "Q5491421", "brand:wikipedia": "en:Smoothie King", "cuisine": "juice", "name": "Smoothie King", "takeaway": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+  "amenity/fast_food/juice/Smoothie King": {"name": "Smoothie King", "icon": "temaki-drink_cup", "imageURL": "https://graph.facebook.com/SmoothieKing/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5491421", "amenity": "fast_food", "cuisine": "juice"}, "addTags": {"amenity": "fast_food", "brand": "Smoothie King", "brand:wikidata": "Q5491421", "brand:wikipedia": "en:Smoothie King", "cuisine": "juice", "name": "Smoothie King", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "juice"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/burger/Sonic": {"name": "Sonic", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/sonicdrivein/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7561808", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "Sonic", "brand:wikidata": "Q7561808", "brand:wikipedia": "en:Sonic Drive-In", "cuisine": "burger", "drive_in": "yes", "name": "Sonic", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "terms": ["sonic drive in"], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/sandwich/Specialty's": {"name": "Specialty's", "icon": "temaki-sandwich", "imageURL": "https://graph.facebook.com/specialtys/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64339210", "amenity": "fast_food", "cuisine": "sandwich;bakery"}, "addTags": {"amenity": "fast_food", "brand": "Specialty's", "brand:wikidata": "Q64339210", "cuisine": "sandwich;bakery", "name": "Specialty's", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "sandwich"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/chicken/St-Hubert Express": {"name": "St-Hubert Express", "icon": "fas-drumstick-bite", "imageURL": "https://graph.facebook.com/sthubert/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3495225", "amenity": "fast_food", "cuisine": "chicken;barbecue"}, "addTags": {"amenity": "fast_food", "brand": "St-Hubert", "brand:wikidata": "Q3495225", "brand:wikipedia": "fr:St-Hubert (restaurant)", "cuisine": "chicken;barbecue", "name": "St-Hubert Express", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "chicken"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -2548,7 +2558,7 @@
  "amenity/fast_food/burger/The Habit Burger Grill": {"name": "The Habit Burger Grill", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/habitburger/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q18158741", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"alt_name": "Habit Burger Grill", "amenity": "fast_food", "brand": "The Habit Burger Grill", "brand:wikidata": "Q18158741", "brand:wikipedia": "en:The Habit Burger Grill", "cuisine": "burger", "name": "The Habit Burger Grill", "short_name": "Habit Burger", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["us"], "terms": ["the habit burger"], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/pizza/The Pizza Company": {"name": "The Pizza Company", "icon": "maki-restaurant-pizza", "imageURL": "https://graph.facebook.com/thepizzacompany/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2413520", "amenity": "fast_food", "cuisine": "pizza"}, "addTags": {"alt_name": "Pizza Company", "amenity": "fast_food", "brand": "The Pizza Company", "brand:wikidata": "Q2413520", "brand:wikipedia": "en:The Pizza Company", "cuisine": "pizza", "name": "The Pizza Company", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "pizza"}, "countryCodes": ["ae", "bh", "cn", "jo", "kh", "la", "mm", "my", "sa", "th", "vn"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/sandwich/Togo's": {"name": "Togo's", "icon": "temaki-sandwich", "imageURL": "https://graph.facebook.com/togossandwiches/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3530375", "amenity": "fast_food", "cuisine": "sandwich"}, "addTags": {"amenity": "fast_food", "brand": "Togo's", "brand:wikidata": "Q3530375", "brand:wikipedia": "en:Togo's", "cuisine": "sandwich", "name": "Togo's", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "sandwich"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-  "amenity/fast_food/Tropical Smoothie Cafe": {"name": "Tropical Smoothie Cafe", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/tropicalsmoothiecafe/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7845817", "amenity": "fast_food"}, "addTags": {"amenity": "fast_food", "brand": "Tropical Smoothie Cafe", "brand:wikidata": "Q7845817", "brand:wikipedia": "en:Tropical Smoothie Cafe", "cuisine": "juice", "name": "Tropical Smoothie Cafe", "takeaway": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+  "amenity/fast_food/juice/Tropical Smoothie Cafe": {"name": "Tropical Smoothie Cafe", "icon": "temaki-drink_cup", "imageURL": "https://graph.facebook.com/tropicalsmoothiecafe/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7845817", "amenity": "fast_food", "cuisine": "juice"}, "addTags": {"amenity": "fast_food", "brand": "Tropical Smoothie Cafe", "brand:wikidata": "Q7845817", "brand:wikipedia": "en:Tropical Smoothie Cafe", "cuisine": "juice", "name": "Tropical Smoothie Cafe", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "juice"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/Tudor's Biscuit World": {"name": "Tudor's Biscuit World", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/tudorsbiscuitworld/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7851262", "amenity": "fast_food"}, "addTags": {"amenity": "fast_food", "brand": "Tudor's Biscuit World", "brand:wikidata": "Q7851262", "brand:wikipedia": "en:Tudor's Biscuit World", "cuisine": "american", "name": "Tudor's Biscuit World", "takeaway": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/sandwich/Upper Crust": {"name": "Upper Crust", "icon": "temaki-sandwich", "imageURL": "https://pbs.twimg.com/profile_images/1156194120324591619/0Wy7xKDd_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7898585", "amenity": "fast_food", "cuisine": "sandwich"}, "addTags": {"amenity": "fast_food", "brand": "Upper Crust", "brand:wikidata": "Q7898585", "brand:wikipedia": "en:Upper Crust (restaurant chain)", "cuisine": "sandwich", "name": "Upper Crust", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "sandwich"}, "countryCodes": ["de", "dk", "eg", "es", "fi", "gb", "ie", "no", "se"], "terms": [], "matchScore": 2, "suggestion": true},
  "amenity/fast_food/burger/Valentine": {"name": "Valentine", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/valentineqc/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3553635", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "Valentine", "brand:wikidata": "Q3553635", "brand:wikipedia": "fr:Valentine (restaurant)", "cuisine": "burger", "name": "Valentine", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -0,0 +1,18 @@
+{
+    "icon": "temaki-cable",
+    "fields": [
+        "telecom",
+        "operator"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "line",
+        "area"
+    ],
+    "tags": {
+        "telecom": "*"
+    },
+    "searchable": false,
+    "name": "Telecom Feature"
+}
@@ -4,7 +4,8 @@
        "ref_aeroway_gate"
    ],
    "geometry": [
-        "point"
+        "point",
+        "vertex"
    ],
    "tags": {
        "aeroway": "gate"
@@ -0,0 +1,39 @@
+{
+    "icon": "temaki-binoculars",
+    "fields": [
+        "operator",
+        "access_simple",
+        "fee",
+        "payment_multi_fee",
+        "charge_fee",
+        "direction",
+        "height",
+        "ele_node"
+    ],
+    "moreFields": [
+        "colour",
+        "covered",
+        "indoor",
+        "lit",
+        "manufacturer",
+        "ref"
+    ],
+    "geometry": [
+        "point"
+    ],
+    "terms": [
+        "observation viewer",
+        "optical ranger",
+        "spotting scope",
+        "sight",
+        "spyglass",
+        "telescope",
+        "tower viewer",
+        "viewfinder",
+        "viewing stand"
+    ],
+    "tags": {
+        "amenity": "binoculars"
+    },
+    "name": "Mounted Binoculars"
+}
@@ -10,7 +10,9 @@
        "outdoor_seating",
        "internet_access",
        "internet_access/fee",
-        "internet_access/ssid"
+        "internet_access/ssid",
+        "phone",
+        "website"
    ],
    "moreFields": [
        "air_conditioning",
@@ -26,12 +28,10 @@
        "min_age",
        "not/name",
        "payment_multi",
-        "phone",
        "ref/vatin",
        "reservation",
        "smoking",
        "takeaway",
-        "website",
        "wheelchair"
    ],
    "geometry": [
@@ -17,7 +17,10 @@
        "bubble milk tea",
        "pearl milk tea",
        "taiwanese tea drink",
-        "tapioca"
+        "tapioca",
+        "pearl tea",
+        "boba drink"
+        
    ],
    "name": "Bubble Tea Cafe"
 }
@@ -8,7 +8,9 @@
        "building_area",
        "opening_hours",
        "opening_hours/covid19",
-        "drive_through"
+        "drive_through",
+        "phone",
+        "website"
    ],
    "moreFields": [
        "air_conditioning",
@@ -27,11 +29,9 @@
        "opening_hours/covid19",
        "outdoor_seating",
        "payment_multi",
-        "phone",
        "ref/vatin",
        "smoking",
        "takeaway",
-        "website",
        "wheelchair"
    ],
    "geometry": [
@@ -0,0 +1,25 @@
+{
+    "icon": "temaki-drink_cup",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "cafe",
+        "café",
+        "beverages",
+        "fruit drinks",
+        "juice bar",
+        "shakes",
+        "smoothies"
+    ],
+    "tags": {
+        "amenity": "fast_food",
+        "cuisine": "juice"
+    },
+    "reference": {
+        "key": "cuisine",
+        "value": "juice"
+    },
+    "name": "Juice Fast Food"
+}
@@ -8,7 +8,9 @@
        "building_area",
        "internet_access",
        "internet_access/fee",
-        "internet_access/ssid"
+        "internet_access/ssid",
+        "phone",
+        "website"
    ],
    "moreFields": [
        "air_conditioning",
@@ -21,10 +23,8 @@
        "opening_hours/covid19",
        "outdoor_seating",
        "payment_multi",
-        "phone",
        "ref/vatin",
        "smoking",
-        "website",
        "wheelchair"
    ],
    "geometry": [
@@ -1,6 +1,7 @@
 {
    "icon": "maki-entrance-alt1",
    "fields": [
+	"parking_entrance",
        "ref",
        "access_simple",
        "address",
@@ -0,0 +1,21 @@
+{
+    "name": "Irish Pub",
+    "icon": "maki-beer",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "amenity": "pub",
+        "theme": "irish"
+    },
+    "reference": {
+        "key": "theme",
+        "value": "irish"
+    },
+    "terms": [
+        "irish pub",
+        "irish bar"
+    ],
+    "notCountryCodes": ["ie"]
+}
@@ -3,6 +3,7 @@
    "fields": [
        "name",
        "cuisine",
+        "diet_multi",
        "address",
        "building_area",
        "opening_hours",
@@ -17,7 +18,6 @@
        "brewery",
        "capacity",
        "delivery",
-        "diet_multi",
        "email",
        "fax",
        "gnis/feature_id",
@@ -2,6 +2,7 @@
    "icon": "maki-shelter",
    "fields": [
        "name",
+        "operator",
        "shelter_type",
        "building_area",
        "bench",
@@ -2,7 +2,7 @@
    "icon": "temaki-picnic_shelter",
    "fields": [
        "name",
-        "shelter_type",
+        "operator",
        "building_area",
        "lit",
        "bin"
@@ -2,10 +2,11 @@
    "icon": "temaki-transit_shelter",
    "fields": [
        "name",
-        "shelter_type",
+        "operator",
        "building_area",
        "bench",
-        "lit"
+        "lit",
+        "bin"
    ],
    "geometry": [
        "point",
@@ -16,6 +16,7 @@
        "opening_hours/covid19",
        "operator",
        "payment_multi_fee",
+        "portable",
        "toilets/handwashing",
        "toilets/position"
    ],
@@ -0,0 +1,38 @@
+{
+    "icon": "tnp-2009541",
+    "fields": [
+        "toilets/disposal",
+        "{amenity/toilets}",
+        "toilets/handwashing"
+    ],
+    "moreFields": [
+        "{amenity/toilets}"
+    ],
+    "geometry": [
+        "point",
+        "area",
+        "vertex"
+    ],
+    "terms": [
+        "restroom",
+        "privy",
+        "porta john",
+        "porta potty",
+        "portapot",
+        "chemical toilet"
+    ],
+    "addTags": {
+        "amenity": "toilets",
+        "toilets:disposal": "chemical",
+        "portable": "yes"
+    },
+    "tags": {
+        "amenity": "toilets",
+        "portable": "yes"
+    },
+    "reference": {
+        "key": "toilets:disposal",
+        "value": "chemical"
+    },
+    "name": "Portable Toilet"
+}
@@ -1,5 +1,9 @@
 {
    "icon": "maki-building",
+    "fields": [
+        "{building}",
+        "building/flats"
+    ],
    "geometry": [
        "area"
    ],
@@ -8,4 +12,4 @@
    },
    "matchScore": 0.5,
    "name": "Apartment Building"
-}
+}
@@ -7,7 +7,9 @@
        "address",
        "building_area",
        "opening_hours",
-        "opening_hours/covid19"
+        "opening_hours/covid19",
+        "phone",
+        "website"
    ],
    "moreFields": [
        "access_simple",
@@ -7,7 +7,9 @@
        "address",
        "building_area",
        "opening_hours",
-        "opening_hours/covid19"
+        "opening_hours/covid19",
+        "phone",
+        "website"
    ],
    "moreFields": [
        "air_conditioning",
@@ -21,10 +23,8 @@
        "internet_access/fee",
        "internet_access/ssid",
        "level",
-        "phone",
        "product",
        "ref/vatin",
-        "website",
        "wheelchair"
    ],
    "geometry": [
@@ -3,10 +3,13 @@
    "fields": [
        "indoor",
        "ref",
-        "operator"
+        "operator",
+        "defibrillator/location"
    ],
    "moreFields": [
-        "level"
+        "level",
+        "opening_hours",
+        "access_simple"
    ],
    "geometry": [
        "point",
@@ -3,11 +3,18 @@
    "fields": [
        "name",
        "ref",
-        "operator"
+        "operator",
+        "water_tank/volume",
+        "drinking_water"
+    ],
+    "moreFields": [
+        "height",
+        "material"
    ],
    "geometry": [
        "point",
-        "vertex"
+        "vertex",
+        "area"
    ],
    "terms": [
        "water tank",
@@ -6,7 +6,9 @@
        "operator",
        "healthcare/speciality",
        "address",
-        "building_area"
+        "building_area",
+        "phone",
+        "website"
    ],
    "moreFields": [
        "brand",
@@ -19,8 +21,6 @@
        "opening_hours",
        "opening_hours/covid19",
        "payment_multi",
-        "phone",
-        "website",
        "wheelchair"
    ],
    "geometry": [
@@ -0,0 +1,33 @@
+{
+    "notCountryCodes": [
+        "de"
+    ],
+    "icon": "temaki-toll_gantry",
+    "fields": [
+        "ref",
+        "operator",
+        "access",
+        "maxheight",
+        "opening_hours",
+        "opening_hours/covid19",
+        "payment_multi"
+    ],
+    "moreFields": [
+        "website"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "highway": "toll_gantry"
+    },
+    "terms": [
+        "license plate camera toll",
+        "cashless toll",
+        "electronic toll",
+        "free-flow toll",
+        "toll gantry",
+        "transponder toll"
+    ],
+    "name": "Open Road Toll"
+}
@@ -19,6 +19,13 @@
    "tags": {
        "landuse": "quarry"
    },
-    "terms": [],
+    "terms": [
+        "aggregate quarry",
+        "open pit mine",
+        "sand mine",
+        "sand pit",
+        "sand quarry",
+        "sandpit"
+    ],
    "name": "Quarry"
 }
@@ -20,6 +20,7 @@
        "internet_access",
        "internet_access/fee",
        "internet_access/ssid",
+        "level",
        "payment_multi"
    ],
    "geometry": [
@@ -3,10 +3,14 @@
    "fields": [
        "material",
        "lit",
-        "bench"
+        "bench",
+        "colour"
    ],
    "moreFields": [
-        "level"
+        "height",
+        "level",
+        "manufacturer",
+        "operator"
    ],
    "geometry": [
        "point"
@@ -13,6 +13,7 @@
        "email",
        "fax",
        "gnis/feature_id",
+        "level",
        "opening_hours",
        "opening_hours/covid19",
        "phone",
@@ -0,0 +1,35 @@
+{
+    "icon": "maki-pitch",
+    "fields": [
+        "name",
+        "operator",
+        "sport",
+        "address",
+        "building_area",
+        "access_simple"
+    ],
+    "moreFields": [
+        "air_conditioning",
+        "level",
+        "opening_hours",
+        "opening_hours/covid19",
+        "fee",
+        "payment_multi_fee",
+        "charge_fee",
+        "wheelchair"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "athletic courts",
+        "gym",
+        "sports hall",
+        "sports venue"
+    ],
+    "tags": {
+        "leisure": "sports_hall"
+    },
+    "name": "Gymnasium"
+}
@@ -1,5 +1,18 @@
 {
    "icon": "temaki-cairn",
+    "fields": [
+        "height",
+        "ele",
+        "ele_node",
+        "check_date"
+    ],
+    "moreFields": [
+        "colour",
+        "material",
+        "name",
+        "operator",
+        "ref"
+    ],
    "geometry": [
        "point",
        "area"
@@ -0,0 +1,29 @@
+{
+    "icon": "fas-dove",
+    "fields": [
+        "operator",
+        "building_area",
+        "height",
+        "capacity"
+    ],
+    "moreFields": [
+        "layer",
+        "location"
+    ],
+    "geometry": [
+        "area",
+        "point"
+    ],
+    "terms": [
+        "birds",
+        "doocot",
+        "dovecot",
+        "doves",
+        "pigeonholes",
+        "pigeons"
+    ],
+    "tags": {
+        "man_made": "dovecote"
+    },
+    "name": "Dovecote"
+}
@@ -2,6 +2,7 @@
    "icon": "maki-triangle",
    "geometry": [
        "point",
+        "vertex",
        "area"
    ],
    "fields": [
@@ -6,7 +6,9 @@
        "address",
        "building_area",
        "opening_hours",
-        "opening_hours/covid19"
+        "opening_hours/covid19",
+        "phone",
+        "website"
    ],
    "moreFields": [
        "air_conditioning",
@@ -23,10 +25,8 @@
        "level",
        "not/name",
        "operator",
-        "phone",
        "ref/vatin",
        "smoking",
-        "website",
        "wheelchair"
    ],
    "geometry": [
@@ -7,7 +7,9 @@
        "address",
        "opening_hours",
        "opening_hours/covid19",
-        "building_area"
+        "building_area",
+        "phone",
+        "website"
    ],
    "moreFields": [
        "air_conditioning",
@@ -17,8 +19,6 @@
        "internet_access/fee",
        "internet_access/ssid",
        "level",
-        "phone",
-        "website",
        "wheelchair"
    ],
    "geometry": [
@@ -4,6 +4,7 @@
        "ref_platform",
        "network",
        "operator",
+        "vehicles",
        "departures_board",
        "surface"
    ],
@@ -5,6 +5,7 @@
        "ref_stop_position",
        "network",
        "operator",
+        "vehicles",
        "departures_board",
        "shelter"
    ],
@@ -4,6 +4,7 @@
        "name",
        "network",
        "operator",
+        "vehicles",
        "address",
        "building_area",
        "internet_access"
@@ -4,7 +4,8 @@
        "name",
        "ref_stop_position",
        "network",
-        "operator"
+        "operator",
+        "vehicles"
    ],
    "moreFields": [],
    "geometry": [
@@ -8,12 +8,14 @@
    },
    "terms": [
        "crossing",
+        "path railway crossing",
        "pedestrian crossing",
-        "railroad crossing",
        "level crossing",
        "grade crossing",
+        "railroad crossing",
+        "railway path crossing",
        "path through railroad",
        "train crossing"
    ],
-    "name": "Railway Crossing (Path)"
+    "name": "Railway-Path Crossing"
 }
@@ -8,11 +8,13 @@
    },
    "terms": [
        "crossing",
-        "railroad crossing",
        "level crossing",
        "grade crossing",
+        "railroad crossing",
+        "railway road crossing",
+        "road railway crossing",
        "road through railroad",
        "train crossing"
    ],
-    "name": "Railway Crossing (Road)"
+    "name": "Railway-Road Crossing"
 }
@@ -0,0 +1,16 @@
+{
+    "icon": "temaki-x_oblique",
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "railway": "railway_crossing"
+    },
+    "terms": [
+        "diamond crossing",
+        "flat crossing",
+        "level junction",
+        "railway railway crossing"
+    ],
+    "name": "Railway-Railway Crossing"
+}
@@ -0,0 +1,21 @@
+{
+    "icon": "temaki-crossing_tram_striped",
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "railway": "tram_crossing"
+    },
+    "terms": [
+        "crossing",
+        "grade crossing",
+        "level crossing",
+        "path tram crossing",
+        "pedestrian crossing",
+        "streetcar crossing",
+        "tram path crossing",
+        "tramway crossing",
+        "trolley crossing"
+    ],
+    "name": "Tram-Path Crossing"
+}
@@ -0,0 +1,21 @@
+{
+    "icon": "temaki-crossing_tram_solid",
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "railway": "tram_level_crossing"
+    },
+    "terms": [
+        "crossing",
+        "grade crossing",
+        "level crossing",
+        "pedestrian crossing",
+        "road tram crossing",
+        "streetcar crossing",
+        "tram road crossing",
+        "tramway crossing",
+        "trolley crossing"
+    ],
+    "name": "Tram-Road Crossing"
+}
@@ -16,14 +16,20 @@
        "charge_toll",
        "distance",
        "dog",
+        "email",
        "interval",
        "maxheight",
        "maxweight",
        "network",
+        "oneway",
        "opening_hours",
        "opening_hours/covid19",
+        "phone",
        "ref_route",
+        "reservation",
        "roundtrip",
+        "vhf",
+        "website",
        "wheelchair"
    ],
    "tags": {
@@ -8,7 +8,9 @@
        "building_area",
        "opening_hours",
        "opening_hours/covid19",
-        "payment_multi"
+        "payment_multi",
+        "phone",
+        "website"
    ],
    "moreFields": [
        "air_conditioning",
@@ -25,11 +27,9 @@
        "internet_access/ssid",
        "level",
        "not/name",
-        "phone",
        "ref/vatin",
        "second_hand",
        "stroller",
-        "website",
        "wheelchair"
    ],
    "geometry": [
@@ -5,10 +5,13 @@
        "area"
    ],
    "terms": [
-        "tape casettes",
+        "tape cassettes",
        "CDs",
        "compact discs",
-        "vinyl records"
+        "vinyl records",
+        "CD store",
+        "casette",
+        "casette store"
    ],
    "tags": {
        "shop": "music"
@@ -10,7 +10,8 @@
    ],
    "terms": [
        "diving",
-        "scuba"
+        "scuba",
+        "snorkel"
    ],
    "tags": {
        "shop": "scuba_diving"
@@ -12,7 +12,10 @@
    "terms": [
        "grocery",
        "store",
-        "shop"
+        "shop",
+        "grocery store",
+        "market",
+        "food market"
    ],
    "tags": {
        "shop": "supermarket"
@@ -0,0 +1,14 @@
+{
+    "icon": "maki-shop",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "hair extentions"
+    ],
+    "tags": {
+        "shop": "wigs"
+    },
+    "name": "Wig Shop"
+}
@@ -3,7 +3,8 @@
    "fields": [
        "name",
        "artist",
-        "material"
+        "material",
+        "inscription"
    ],
    "geometry": [
        "point",
@@ -14,7 +15,8 @@
        "artwork_type": "bust"
    },
    "reference": {
-        "key": "artwork_type"
+        "key": "artwork_type",
+        "value": "bust"
    },
    "terms": [
        "figure"
@@ -15,7 +15,8 @@
        "artwork_type": "graffiti"
    },
    "reference": {
-        "key": "artwork_type"
+        "key": "artwork_type",
+        "value": "graffiti"
    },
    "terms": [
        "Street Artwork",
@@ -15,7 +15,8 @@
        "artwork_type": "installation"
    },
    "reference": {
-        "key": "artwork_type"
+        "key": "artwork_type",
+        "value": "installation"
    },
    "terms": [
        "interactive art",
@@ -0,0 +1,15 @@
+{
+  "icon": "maki-embassy",
+  "geometry": [
+    "point"
+  ],
+  "terms": [
+    "new location"
+  ],
+  "tags": {
+    "tourism": "information",
+    "information": "board",
+    "board_type": "welcome_sign"
+  },
+  "name": "Welcome Sign"
+}
@@ -32,5 +32,14 @@
        "key": "information",
        "value": "office"
    },
-    "name": "Tourist Information Office"
+    "terms": [
+        "information office",
+        "tour guide",
+        "tourism office",
+        "tourist information center",
+        "visitors center",
+        "visitors information center",
+        "welcome center"
+    ],
+    "name": "Visitor Center"
 }
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-binoculars",
+    "icon": "temaki-spotting_scope",
    "geometry": [
        "point",
        "vertex"
@@ -2,10 +2,12 @@
    "icon": "fas-directions",
    "fields": [
        "traffic_sign",
-        "direction"
+        "traffic_sign/direction",
+        "direction_point"
    ],
    "geometry": [
-        "point"
+        "point",
+        "vertex"
    ],
    "tags": {
        "traffic_sign": "*"
@@ -1,12 +1,12 @@
 {
    "icon": "maki-square-stroked",
    "fields": [
-        "traffic_sign",
-        "direction",
+        "{traffic_sign}",
        "name"
    ],
    "geometry": [
-        "point"
+        "point",
+        "vertex"
    ],
    "tags": {
        "traffic_sign": "city_limit"
@@ -1,25 +0,0 @@
-{
-    "icon": "maki-square-stroked",
-    "fields": [
-        "traffic_sign",
-        "traffic_sign/direction",
-        "name"
-    ],
-    "geometry": [
-        "vertex"
-    ],
-    "tags": {
-        "traffic_sign": "city_limit"
-    },
-    "terms": [
-        "town",
-        "village",
-        "hamlet",
-        "boundary",
-        "edge",
-        "border",
-        "road",
-        "highway"
-    ],
-    "name": "City Limit Sign"
-}
@@ -1,12 +1,12 @@
 {
    "icon": "maki-square-stroked",
    "fields": [
-        "traffic_sign",
-        "direction",
+        "{traffic_sign}",
        "maxspeed"
    ],
    "geometry": [
-        "point"
+        "point",
+        "vertex"
    ],
    "tags": {
        "traffic_sign": "maxspeed"
@@ -1,21 +0,0 @@
-{
-    "icon": "maki-square-stroked",
-    "fields": [
-        "traffic_sign",
-        "traffic_sign/direction",
-        "maxspeed"
-    ],
-    "geometry": [
-        "vertex"
-    ],
-    "tags": {
-        "traffic_sign": "maxspeed"
-    },
-    "terms": [
-        "max speed",
-        "maximum speed",
-        "road",
-        "highway"
-    ],
-    "name": "Speed Limit Sign"
-}
@@ -1,18 +0,0 @@
-{
-    "icon": "maki-square-stroked",
-    "fields": [
-        "traffic_sign",
-        "traffic_sign/direction"
-    ],
-    "geometry": [
-        "vertex"
-    ],
-    "tags": {
-        "traffic_sign": "*"
-    },
-    "terms": [
-        "road",
-        "highway"
-    ],
-    "name": "Traffic Sign"
-}
@@ -7,5 +7,9 @@
        "type": "restriction",
        "restriction": "no_left_turn"
    },
+    "reference": {
+        "key": "restriction",
+        "value": "no_left_turn"
+    },
    "name": "No Left Turn"
 }
@@ -7,5 +7,9 @@
        "type": "restriction",
        "restriction": "no_right_turn"
    },
+    "reference": {
+        "key": "restriction",
+        "value": "no_right_turn"
+    },
    "name": "No Right Turn"
 }
@@ -7,5 +7,9 @@
        "type": "restriction",
        "restriction": "no_straight_on"
    },
+    "reference": {
+        "key": "restriction",
+        "value": "no_straight_on"
+    },
    "name": "No Straight On"
 }
@@ -7,5 +7,9 @@
        "type": "restriction",
        "restriction": "no_u_turn"
    },
+    "reference": {
+        "key": "restriction",
+        "value": "no_u_turn"
+    },
    "name": "No U-turn"
 }
@@ -7,5 +7,9 @@
        "type": "restriction",
        "restriction": "only_left_turn"
    },
+    "reference": {
+        "key": "restriction",
+        "value": "only_left_turn"
+    },
    "name": "Only Left Turn"
 }
@@ -7,5 +7,9 @@
        "type": "restriction",
        "restriction": "only_right_turn"
    },
+    "reference": {
+        "key": "restriction",
+        "value": "only_right_turn"
+    },
    "name": "Only Right Turn"
 }
@@ -7,5 +7,9 @@
        "type": "restriction",
        "restriction": "only_straight_on"
    },
+    "reference": {
+        "key": "restriction",
+        "value": "only_straight_on"
+    },
    "name": "Only Straight On"
 }
@@ -7,5 +7,9 @@
        "type": "restriction",
        "restriction": "only_u_turn"
    },
+    "reference": {
+        "key": "restriction",
+        "value": "only_u_turn"
+    },
    "name": "Only U-turn"
 }
@@ -23,5 +23,9 @@
        "type": "route",
        "route": "bicycle"
    },
+    "reference": {
+        "key": "route",
+        "value": "bicycle"
+    },
    "name": "Cycle Route"
 }
@@ -13,5 +13,9 @@
        "type": "route",
        "route": "bus"
    },
+    "reference": {
+        "key": "route",
+        "value": "bus"
+    },
    "name": "Bus Route"
 }
@@ -13,5 +13,9 @@
        "type": "route",
        "route": "detour"
    },
+    "reference": {
+        "key": "route",
+        "value": "detour"
+    },
    "name": "Detour Route"
 }
@@ -13,5 +13,9 @@
        "type": "route",
        "route": "ferry"
    },
+    "reference": {
+        "key": "route",
+        "value": "ferry"
+    },
    "name": "Ferry Route"
 }
@@ -13,5 +13,9 @@
        "type": "route",
        "route": "foot"
    },
+    "reference": {
+        "key": "route",
+        "value": "foot"
+    },
    "name": "Foot Route"
 }
@@ -23,5 +23,9 @@
        "type": "route",
        "route": "hiking"
    },
+    "reference": {
+        "key": "route",
+        "value": "hiking"
+    },
    "name": "Hiking Route"
 }
@@ -22,5 +22,9 @@
        "type": "route",
        "route": "horse"
    },
+    "reference": {
+        "key": "route",
+        "value": "horse"
+    },
    "name": "Riding Route"
 }
@@ -13,5 +13,9 @@
        "type": "route",
        "route": "light_rail"
    },
+    "reference": {
+        "key": "route",
+        "value": "light_rail"
+    },
    "name": "Light Rail Route"
 }
@@ -13,5 +13,9 @@
        "type": "route",
        "route": "monorail"
    },
+    "reference": {
+        "key": "route",
+        "value": "monorail"
+    },
    "name": "Monorail Route"
 }
@@ -13,5 +13,9 @@
        "type": "route",
        "route": "pipeline"
    },
+    "reference": {
+        "key": "route",
+        "value": "pipeline"
+    },
    "name": "Pipeline Route"
 }
@@ -22,5 +22,9 @@
        "type": "route",
        "route": "piste"
    },
+    "reference": {
+        "key": "route",
+        "value": "piste"
+    },
    "name": "Piste/Ski Route"
 }
@@ -17,5 +17,9 @@
        "type": "route",
        "route": "power"
    },
+    "reference": {
+        "key": "route",
+        "value": "power"
+    },
    "name": "Power Route"
 }
--- a/Show More
+++ b/Show More