diff --git a/FAQ.md b/FAQ.md
index 1185ea9a6..402aa3f26 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -11,7 +11,7 @@ Please see [CONTRIBUTING.md](https://github.com/openstreetmap/iD/blob/master/CON
 ## How can I report an issue with background imagery?
 
 To report an issue with missing or cloudy imagery:
-* _For Mapbox Satellite layer:_ Use [this imagery request tool](https://www.mapbox.com/bites/00240/#3/0.00/0.00) to zoom to the location with the issue and draw a box around it.
+* _For Mapbox Satellite layer:_ Zoom into the location in [this imagery feedback tool](https://apps.mapbox.com/feedback/satellite/) and describe the problem.
 * _For Bing Satellite layer:_ Open the location in [Bing Maps](https://www.bing.com/maps), click the "Feedback" button and choose "Report a map problem" option.
 * _For Esri World Imagery:_ You can open a new issue using the [Imagery Map Feedback tool](https://www.arcgis.com/home/item.html?id=ebdfa4146680410bb952c7d532ea5407).
 
diff --git a/build_data.js b/build_data.js
index 6711f2045..3414cd5b0 100644
--- a/build_data.js
+++ b/build_data.js
@@ -437,10 +437,8 @@ function generateTaginfo(presets, fields) {
             'description': 'Online editor for OSM data.',
             'project_url': 'https://github.com/openstreetmap/iD',
             'doc_url': 'https://github.com/openstreetmap/iD/blob/master/data/presets/README.md',
-            'icon_url': 'https://cdn.jsdelivr.net/gh/openstreetmap/iD/dist/img/logo.png',
-            'keywords': [
-                'editor'
-            ]
+            'icon_url': 'https://cdn.jsdelivr.net/gh/openstreetmap/iD@release/dist/img/logo.png',
+            'keywords': ['editor']
         },
         'tags': []
     };
@@ -474,13 +472,13 @@ function generateTaginfo(presets, fields) {
             tag.icon_url = 'https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/' +
                 preset.icon.replace(/^temaki-/, '') + '.svg';
         } else if (/^fa[srb]-/.test(preset.icon)) {
-            tag.icon_url = 'https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/' +
+            tag.icon_url = 'https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/' +
                 preset.icon + '.svg';
         } else if (/^iD-/.test(preset.icon)) {
-            tag.icon_url = 'https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/' +
+            tag.icon_url = 'https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/' +
                 preset.icon.replace(/^iD-/, '') + '.svg';
         } else if (/^tnp-/.test(preset.icon)) {
-            tag.icon_url = 'https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/the-noun-project/' +
+            tag.icon_url = 'https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/the-noun-project/' +
                 preset.icon.replace(/^tnp-/, '') + '.svg';
         }
 
@@ -601,8 +599,12 @@ function generateTerritoryLanguages() {
         if (!territoryLangInfo) return;
         var langCodes = Object.keys(territoryLangInfo);
         territoryLanguages[territoryCode.toLowerCase()] = langCodes.sort(function(langCode1, langCode2) {
-            return parseFloat(territoryLangInfo[langCode2]._populationPercent) -
-                   parseFloat(territoryLangInfo[langCode1]._populationPercent);
+            var popPercent1 = parseFloat(territoryLangInfo[langCode1]._populationPercent);
+            var popPercent2 = parseFloat(territoryLangInfo[langCode2]._populationPercent);
+            if (popPercent1 === popPercent2) {
+                return langCode1.localeCompare(langCode2, 'en', { sensitivity: 'base' });
+            }
+            return popPercent2 - popPercent1;
         }).map(function(langCode) {
             return langCode.replace('_', '-');
         });
@@ -648,22 +650,22 @@ function validatePresetFields(presets, fields) {
         var fieldKeys = ['fields', 'moreFields'];
         for (var fieldsKeyIndex in fieldKeys) {
             var fieldsKey = fieldKeys[fieldsKeyIndex];
-            if (preset[fieldsKey]) {
-                for (var fieldIndex in preset[fieldsKey]) {
-                    var field = preset[fieldsKey][fieldIndex];
-                    if (fields[field] === undefined) {
-                        var regexResult = betweenBracketsRegex.exec(field);
-                        if (regexResult) {
-                            var foreignPresetID = regexResult[0];
-                            if (presets[foreignPresetID] === undefined) {
-                                console.error('Unknown preset "' + foreignPresetID + '" referenced in "' + fieldsKey + '" array of preset ' + preset.name);
-                                process.exit(1);
-                            }
-                        } else {
-                            console.error('Unknown preset field "' + field + '" in "' + fieldsKey + '" array of preset ' + preset.name);
-                            process.exit(1);
-                        }
+            if (!preset[fieldsKey]) continue; // no fields are referenced, okay
+
+            for (var fieldIndex in preset[fieldsKey]) {
+                var field = preset[fieldsKey][fieldIndex];
+                if (fields[field] !== undefined) continue; // field found, okay
+
+                var regexResult = betweenBracketsRegex.exec(field);
+                if (regexResult) {
+                    var foreignPresetID = regexResult[0];
+                    if (presets[foreignPresetID] === undefined) {
+                        console.error('Unknown preset "' + foreignPresetID + '" referenced in "' + fieldsKey + '" array of preset ' + preset.name);
+                        process.exit(1);
                     }
+                } else {
+                    console.error('Unknown preset field "' + field + '" in "' + fieldsKey + '" array of preset ' + preset.name);
+                    process.exit(1);
                 }
             }
         }
diff --git a/css/20_map.css b/css/20_map.css
index 390fb6d2e..a0d82d1c4 100644
--- a/css/20_map.css
+++ b/css/20_map.css
@@ -5,7 +5,7 @@
 
 /* IE/Edge needs these overrides for markers to show up */
 .layer-osm path.oneway-marker-path          { fill: #000; }
-.layer-osm path.sided-marker-natural-path   { fill: rgb(140, 208, 95); }
+.layer-osm path.sided-marker-natural-path   { fill: rgb(170, 170, 170); }
 .layer-osm path.sided-marker-coastline-path { fill: #77dede; }
 .layer-osm path.sided-marker-barrier-path   { fill: #ddd; }
 .layer-osm path.sided-marker-man_made-path  { fill: #fff; }
diff --git a/css/25_areas.css b/css/25_areas.css
index f389ea117..36873b938 100644
--- a/css/25_areas.css
+++ b/css/25_areas.css
@@ -141,7 +141,8 @@ path.stroke.tag-landuse-residential,
 path.stroke.tag-status-construction {
     stroke: rgb(196, 189, 25);
 }
-path.fill.tag-landuse-residential {
+path.fill.tag-landuse-residential,
+path.fill.tag-status-construction {
     stroke: rgba(196, 189, 25, 0.3);
     fill: rgba(196, 189, 25, 0.3);
 }
diff --git a/css/50_misc.css b/css/50_misc.css
index 6d098ba7b..e8d022691 100644
--- a/css/50_misc.css
+++ b/css/50_misc.css
@@ -187,26 +187,26 @@ path.line.casing.tag-boundary-national_park {
 
 
 /* barriers and similar */
-path.line.stroke.tag-barrier:not(.tag-barrier-hedge) {
+path.line.stroke.tag-barrier:not(.tag-barrier-hedge):not(.tag-waterway) {
     stroke: #ddd;
 }
 .preset-icon-container path.line.stroke.tag-barrier:not(.tag-barrier-hedge) {
     stroke: rgb(170, 170, 170);
 }
 path.line.casing.tag-natural,
-path.line.casing.tag-barrier,
+path.line.casing.tag-barrier:not(.tag-waterway),
 path.line.casing.tag-man_made-groyne,
 path.line.casing.tag-man_made-breakwater {
     stroke: none;
 }
-path.line.stroke.tag-barrier,
+path.line.stroke.tag-barrier:not(.tag-waterway),
 path.line.stroke.tag-man_made-groyne,
 path.line.stroke.tag-man_made-breakwater {
     stroke-width: 3px;
     stroke-linecap: round;
     stroke-dasharray: 15, 5, 1, 5;
 }
-.low-zoom path.line.stroke.tag-barrier,
+.low-zoom path.line.stroke.tag-barrier:not(.tag-waterway),
 .low-zoom path.line.stroke.tag-man_made-groyne,
 .low-zoom path.line.stroke.tag-man_made-breakwater {
     stroke-width: 2px;
@@ -218,6 +218,20 @@ path.line.stroke.tag-man_made-breakwater {
 .preset-icon-container path.line.stroke.tag-man_made-breakwater {
     stroke-dasharray: 1, 4, 6, 4;
 }
+path.line.stroke.tag-barrier.tag-barrier-wall,
+path.line.stroke.tag-barrier.tag-barrier-retaining_wall,
+path.line.stroke.tag-barrier.tag-barrier-city_wall {
+    stroke-linecap: butt;
+    stroke-dasharray: 16, 3, 9, 3;
+}
+.low-zoom path.line.stroke.tag-barrier.tag-barrier-wall,
+.low-zoom path.line.stroke.tag-barrier.tag-barrier-retaining_wall,
+.low-zoom path.line.stroke.tag-barrier.tag-barrier-city_wall,
+.preset-icon-container path.line.stroke.tag-barrier.tag-barrier-wall,
+.preset-icon-container path.line.stroke.tag-barrier.tag-barrier-retaining_wall,
+.preset-icon-container path.line.stroke.tag-barrier.tag-barrier-city_wall {
+    stroke-dasharray: 8, 1, 4, 1;
+}
 
 
 /* bridges */
diff --git a/css/80_app.css b/css/80_app.css
index 0f5fddbb3..d7d61a3f0 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -2977,8 +2977,8 @@ input.key-trap {
     border-radius: 0;
 }
 
-.map-control > button:hover,
-.map-control > button:focus {
+.map-control > button:not(.disabled):hover,
+.map-control > button:not(.disabled):focus {
     background: rgba(0, 0, 0, .8);
 }
 
@@ -2987,6 +2987,10 @@ input.key-trap {
     background: #7092ff;
 }
 
+.map-control > button.disabled .icon {
+    color: rgba(255, 255, 255, 0.5);
+}
+
 
 /* Fullscreen Button (disabled)
 ------------------------------------------------------- */
@@ -5696,4 +5700,4 @@ li.hide + li.version .badge .tooltip .tooltip-arrow {
 .list-item-photos.list-item-mapillary-map-features .request-data-link {
     float: right;
     margin-top: -20px;
-}
\ No newline at end of file
+}
diff --git a/data/core.yaml b/data/core.yaml
index 16c9f145b..0f6014a41 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -306,9 +306,19 @@ en:
         multiple: These features can't be rotated because parts of them have not yet been downloaded.
     reverse:
       title: Reverse
-      description: Make this line go in the opposite direction.
+      description:
+        point: Flip the direction of this point.
+        points: Flip the direction of these points.
+        line: Make this line go in the opposite direction.
+        lines: Make these lines go in the opposite direction.
+        features: Flip the directions of these features.
       key: V
-      annotation: Reversed a line.
+      annotation:
+        point: Reversed a point.
+        points: Reversed multiple points.
+        line: Reversed a line.
+        lines: Reversed multiple lines.
+        features: Reversed multiple features.
     split:
       title: Split
       description:
@@ -1407,9 +1417,8 @@ en:
       tip: 'Find features with "fixme" tags'
       reference: 'A "fixme" tag indicates that a mapper has requested help with a feature.'
     generic_name:
-      title: Suspicious Names
       message: '{feature} has the suspicious name "{name}"'
-      tip: "Find features with generic or suspicious names"
+      message_language: '{feature} has the suspicious name "{name}" in {language}'
       reference: "Names should be the actual, on-the-ground names of features."
     incompatible_source:
       title: Suspicious Sources
@@ -1418,17 +1427,19 @@ en:
         feature:
           message: '{feature} lists Google as a data source'
         reference: "Google products are proprietary and must not be used as references."
+    incorrect_name:
+      message: '{feature} has the mistaken name "{name}"'
+      message_language: '{feature} has the mistaken name "{name}" in {language}'
     invalid_format:
       title: Invalid Formatting
       tip: Find tags with unexpected formats
       email:
-        message: '{feature} has an invalid email address.'
-        message_multi: '{feature} has multiple invalid email addresses.'
+        message: '{feature} has an invalid email address'
+        message_multi: '{feature} has multiple invalid email addresses'
         reference: 'Email addresses must look like "user@example.com".'
-      website:
-        message: '{feature} has an invalid website.'
-        message_multi: '{feature} has multiple invalid websites.'
-        reference: 'Websites should start with "http" or "https".'
+    mismatched_geometry:
+      title: Mismatched Geometry
+      tip: "Find features with conflicting tags and geometry"
     missing_role:
       title: Missing Roles
       message: "{member} has no role within {relation}"
@@ -1458,17 +1469,22 @@ en:
         reference: "Some features should have additional tags."
       noncanonical_brand:
         message: "{feature} looks like a brand with nonstandard tags"
+        message_incomplete: "{feature} looks like a brand with incomplete tags"
         reference: "All features of the same brand should be tagged the same way."
+    point_as_vertex:
+      message: '{feature} should be a standalone point based on its tags'
+      reference: "Some features shouldn't be part of lines or areas."
     private_data:
       title: Private Information
       tip: "Find features that may contain private information"
       reference: "Sensitive data like personal phone numbers should not be tagged."
       contact:
         message: '{feature} might be tagged with private contact information'
+    suspicious_name:
+      title: Suspicious Names
+      tip: "Find features with generic or suspicious names"
     tag_suggests_area:
-      title: Lines Tagged as Areas
       message: '{feature} should be a closed area based on the tag "{tag}"'
-      tip: "Find features that are tagged as lines and should possibly be tagged as areas"
       reference: "Areas must have connected endpoints."
     unknown_road:
       message: "{feature} has no classification"
@@ -1496,6 +1512,9 @@ en:
       tip: "Find features with unsquare corners that can be drawn better"
       buildings:
         reference: "Buildings with unsquare corners can often be drawn more accurately."
+    vertex_as_point:
+      message: '{feature} should be part of a line or area based on its tags'
+      reference: "Some features shouldn't be standalone points."
     fix:
       connect_almost_junction:
         annotation: Connected very close features.
@@ -1516,6 +1535,8 @@ en:
         title: Continue drawing from end
       delete_feature:
         title: Delete this feature
+      extract_point:
+        title: Extract this point
       ignore_issue:
         title: Ignore this issue
       merge_close_vertices:
@@ -1530,8 +1551,9 @@ en:
       remove_from_relation:
         title: Remove from relation
       remove_generic_name:
-        title: Remove the name
         annotation: Removed a generic name.
+      remove_mistaken_name:
+        annotation: Removed a mistaken name.
       remove_private_info:
         annotation: Removed private information.
       remove_proprietary_data:
@@ -1541,6 +1563,8 @@ en:
         annotation: Removed tag.
       remove_tags:
         title: Remove the tags
+      remove_the_name:
+        title: Remove the name
       reposition_features:
         title: Reposition the features
       reverse_feature:
@@ -1903,7 +1927,7 @@ en:
         disconnect: "Disconnect features at the selected node"
         extract: "Extract a point from a feature"
         split: "Split a line into two at the selected node"
-        reverse: "Reverse a line"
+        reverse: "Reverse selected features"
         move: "Move selected features"
         rotate: "Rotate selected features"
         orthogonalize: "Square corners of a line or area"
diff --git a/data/deprecated.json b/data/deprecated.json
index 1e352c77d..32e5e9b06 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -6,7 +6,7 @@
     },
     {
       "old": {"aeroway": "aerobridge"},
-      "replace": {"aeroway": "jet_bridge"}
+      "replace": {"aeroway": "jet_bridge", "highway": "corridor"}
     },
     {
       "old": {"access": "public"},
@@ -148,6 +148,10 @@
       "old": {"amenity": "vending_machine", "vending": "news_papers"},
       "replace": {"amenity": "vending_machine", "vending": "newspapers"}
     },
+    {
+      "old": {"amenity": "weigh_bridge"},
+      "replace": {"amenity": "weighbridge"}
+    },
     {
       "old": {"amenity": "winery"},
       "replace": {"craft": "winery"}
@@ -284,6 +288,46 @@
       "old": {"diaper": "yes"},
       "replace": {"changing_table": "yes"}
     },
+    {
+      "old": {"direction": "all"},
+      "replace": {"direction": "both"}
+    },
+    {
+      "old": {"direction": "down", "highway": "*"},
+      "replace": {"incline": "down", "highway": "$1"}
+    },
+    {
+      "old": {"direction": "downhill"},
+      "replace": {"incline": "down"}
+    },
+    {
+      "old": {"direction": "East"},
+      "replace": {"direction": "E"}
+    },
+    {
+      "old": {"direction": "forward;backward"},
+      "replace": {"direction": "both"}
+    },
+    {
+      "old": {"direction": "North"},
+      "replace": {"direction": "N"}
+    },
+    {
+      "old": {"direction": "South"},
+      "replace": {"direction": "S"}
+    },
+    {
+      "old": {"direction": "up", "highway": "*"},
+      "replace": {"incline": "up", "highway": "$1"}
+    },
+    {
+      "old": {"direction": "uphill"},
+      "replace": {"incline": "up"}
+    },
+    {
+      "old": {"direction": "West"},
+      "replace": {"direction": "W"}
+    },
     {
       "old": {"drinkable": "*"},
       "replace": {"drinking_water": "$1"}
@@ -292,6 +336,22 @@
       "old": {"dropped_kerb": "*"},
       "replace": {"kerb": "lowered"}
     },
+    {
+      "old": {"embankment": "1"},
+      "replace": {"embankment": "yes"}
+    },
+    {
+      "old": {"embankment": "false"},
+      "replace": {"embankment": "no"}
+    },
+    {
+      "old": {"embankment": "right", "man_made": "embankment"},
+      "replace": {"man_made": "embankment"}
+    },
+    {
+      "old": {"embankment": "true"},
+      "replace": {"embankment": "yes"}
+    },
     {
       "old": {"escalator": "*"},
       "replace": {"highway": "steps", "conveying": "$1"}
@@ -366,27 +426,27 @@
     },
     {
       "old": {"golf": "faiway"},
-      "replace": {"golf": "fairway"}
+      "replace": {"golf": "fairway", "landuse": "grass"}
     },
     {
       "old": {"golf": "putting_green"},
-      "replace": {"golf": "green"}
+      "replace": {"golf": "green", "landuse": "grass"}
     },
     {
       "old": {"golf": "sand_trap"},
-      "replace": {"golf": "bunker"}
+      "replace": {"golf": "bunker", "natural": "sand"}
     },
     {
       "old": {"golf": "tee_area"},
-      "replace": {"golf": "tee"}
+      "replace": {"golf": "tee", "landuse": "grass"}
     },
     {
       "old": {"golf": "tee_box"},
-      "replace": {"golf": "tee"}
+      "replace": {"golf": "tee", "landuse": "grass"}
     },
     {
       "old": {"golf": "teebox"},
-      "replace": {"golf": "tee"}
+      "replace": {"golf": "tee", "landuse": "grass"}
     },
     {
       "old": {"highway": "abandoned"},
@@ -400,6 +460,10 @@
       "old": {"highway": "cycleway", "bicycle": "no"},
       "replace": {"highway": "path", "bicycle": "no"}
     },
+    {
+      "old": {"highway": "cycleway", "cycleway": "track"},
+      "replace": {"highway": "cycleway"}
+    },
     {
       "old": {"highway": "footway", "foot": "no"},
       "replace": {"highway": "path", "foot": "no"}
@@ -567,6 +631,30 @@
       "old": {"man_made": "water_tank"},
       "replace": {"man_made": "storage_tank", "content": "water"}
     },
+    {
+      "old": {"man_made": "weigh_bridge"},
+      "replace": {"amenity": "weighbridge"}
+    },
+    {
+      "old": {"man_made": "weighbridge"},
+      "replace": {"amenity": "weighbridge"}
+    },
+    {
+      "old": {"man_made": "weighing_machine"},
+      "replace": {"amenity": "weighbridge"}
+    },
+    {
+      "old": {"man_made": "weighing_scale"},
+      "replace": {"amenity": "weighbridge"}
+    },
+    {
+      "old": {"man_made": "weighting machine"},
+      "replace": {"amenity": "weighbridge"}
+    },
+    {
+      "old": {"man_made": "weighting_machine"},
+      "replace": {"amenity": "weighbridge"}
+    },
     {
       "old": {"man_made": "well"},
       "replace": {"man_made": "water_well"}
diff --git a/data/locales.json b/data/locales.json
index 5adf89daf..9954a0c24 100644
--- a/data/locales.json
+++ b/data/locales.json
@@ -85,6 +85,6 @@
     "zh": {"rtl": false, "languageNames": {"aa": "阿法尔语", "ab": "阿布哈西亚语", "ace": "亚齐语", "ach": "阿乔利语", "ada": "阿当梅语", "ady": "阿迪格语", "ae": "阿维斯塔语", "af": "南非荷兰语", "afh": "阿弗里希利语", "agq": "亚罕语", "ain": "阿伊努语", "ak": "阿肯语", "akk": "阿卡德语", "ale": "阿留申语", "alt": "南阿尔泰语", "am": "阿姆哈拉语", "an": "阿拉贡语", "ang": "古英语", "anp": "昂加语", "ar": "阿拉伯语", "ar-001": "现代标准阿拉伯语", "arc": "阿拉米语", "arn": "马普切语", "arp": "阿拉帕霍语", "ars": "纳吉迪阿拉伯语", "arw": "阿拉瓦克语", "as": "阿萨姆语", "asa": "帕雷语", "ast": "阿斯图里亚斯语", "av": "阿瓦尔语", "awa": "阿瓦德语", "ay": "艾马拉语", "az": "阿塞拜疆语", "az-Arab": "南阿塞拜疆语", "ba": "巴什基尔语", "bal": "俾路支语", "ban": "巴厘语", "bas": "巴萨语", "bax": "巴姆穆语", "bbj": "戈马拉语", "be": "白俄罗斯语", "bej": "贝沙语", "bem": "本巴语", "bez": "贝纳语", "bfd": "巴非特语", "bg": "保加利亚语", "bgn": "西俾路支语", "bho": "博杰普尔语", "bi": "比斯拉马语", "bik": "比科尔语", "bin": "比尼语", "bkm": "科姆语", "bla": "西克西卡语", "bm": "班巴拉语", "bn": "孟加拉语", "bo": "藏语", "br": "布列塔尼语", "bra": "布拉杰语", "brx": "博多语", "bs": "波斯尼亚语", "bss": "阿库色语", "bua": "布里亚特语", "bug": "布吉语", "bum": "布鲁语", "byn": "比林语", "byv": "梅敦巴语", "ca": "加泰罗尼亚语", "cad": "卡多语", "car": "加勒比语", "cay": "卡尤加语", "cch": "阿灿语", "ccp": "查克玛语", "ce": "车臣语", "ceb": "宿务语", "cgg": "奇加语", "ch": "查莫罗语", "chb": "奇布查语", "chg": "察合台语", "chk": "楚克语", "chm": "马里语", "chn": "奇努克混合语", "cho": "乔克托语", "chp": "奇佩维安语", "chr": "切罗基语", "chy": "夏延语", "ckb": "中库尔德语", "co": "科西嘉语", "cop": "科普特语", "cr": "克里族语", "crh": "克里米亚土耳其语", "crs": "塞舌尔克里奥尔语", "cs": "捷克语", "csb": "卡舒比语", "cu": "教会斯拉夫语", "cv": "楚瓦什语", "cy": "威尔士语", "da": "丹麦语", "dak": "达科他语", "dar": "达尔格瓦语", "dav": "台塔语", "de": "德语", "de-AT": "奥地利德语", "de-CH": "瑞士高地德语", "del": "特拉华语", "den": "史拉维语", "dgr": "多格里布语", "din": "丁卡语", "dje": "哲尔马语", "doi": "多格拉语", "dsb": "下索布语", "dua": "都阿拉语", "dum": "中古荷兰语", "dv": "迪维希语", "dyo": "朱拉语", "dyu": "迪尤拉语", "dz": "宗卡语", "dzg": "达扎葛语", "ebu": "恩布语", "ee": "埃维语", "efi": "埃菲克语", "egy": "古埃及语", "eka": "艾卡朱克语", "el": "希腊语", "elx": "埃兰语", "en": "英语", "en-AU": "澳大利亚英语", "en-CA": "加拿大英语", "en-GB": "英国英语", "en-US": "美国英语", "enm": "中古英语", "eo": "世界语", "es": "西班牙语", "es-419": "拉丁美洲西班牙语", "es-ES": "欧洲西班牙语", "es-MX": "墨西哥西班牙语", "et": "爱沙尼亚语", "eu": "巴斯克语", "ewo": "旺杜语", "fa": "波斯语", "fan": "芳格语", "fat": "芳蒂语", "ff": "富拉语", "fi": "芬兰语", "fil": "菲律宾语", "fj": "斐济语", "fo": "法罗语", "fon": "丰语", "fr": "法语", "fr-CA": "加拿大法语", "fr-CH": "瑞士法语", "frc": "卡真法语", "frm": "中古法语", "fro": "古法语", "frr": "北弗里西亚语", "frs": "东弗里西亚语", "fur": "弗留利语", "fy": "西弗里西亚语", "ga": "爱尔兰语", "gaa": "加族语", "gag": "加告兹语", "gan": "赣语", "gay": "迦约语", "gba": "格巴亚语", "gd": "苏格兰盖尔语", "gez": "吉兹语", "gil": "吉尔伯特语", "gl": "加利西亚语", "gmh": "中古高地德语", "gn": "瓜拉尼语", "goh": "古高地德语", "gon": "冈德语", "gor": "哥伦打洛语", "got": "哥特语", "grb": "格列博语", "grc": "古希腊语", "gsw": "瑞士德语", "gu": "古吉拉特语", "guz": "古西语", "gv": "马恩语", "gwi": "哥威迅语", "ha": "豪萨语", "hai": "海达语", "hak": "客家语", "haw": "夏威夷语", "he": "希伯来语", "hi": "印地语", "hil": "希利盖农语", "hit": "赫梯语", "hmn": "苗语", "ho": "希里莫图语", "hr": "克罗地亚语", "hsb": "上索布语", "hsn": "湘语", "ht": "海地克里奥尔语", "hu": "匈牙利语", "hup": "胡帕语", "hy": "亚美尼亚语", "hz": "赫雷罗语", "ia": "国际语", "iba": "伊班语", "ibb": "伊比比奥语", "id": "印度尼西亚语", "ie": "国际文字（E）", "ig": "伊博语", "ii": "四川彝语", "ik": "伊努皮克语", "ilo": "伊洛卡诺语", "inh": "印古什语", "io": "伊多语", "is": "冰岛语", "it": "意大利语", "iu": "因纽特语", "ja": "日语", "jbo": "逻辑语", "jgo": "恩艮巴语", "jmc": "马切姆语", "jpr": "犹太波斯语", "jrb": "犹太阿拉伯语", "jv": "爪哇语", "ka": "格鲁吉亚语", "kaa": "卡拉卡尔帕克语", "kab": "卡拜尔语", "kac": "克钦语", "kaj": "卡捷语", "kam": "卡姆巴语", "kaw": "卡威语", "kbd": "卡巴尔德语", "kbl": "加涅姆布语", "kcg": "卡塔布语", "kde": "马孔德语", "kea": "卡布佛得鲁语", "kfo": "克罗语", "kg": "刚果语", "kha": "卡西语", "kho": "和田语", "khq": "西桑海语", "ki": "吉库尤语", "kj": "宽亚玛语", "kk": "哈萨克语", "kkj": "卡库语", "kl": "格陵兰语", "kln": "卡伦金语", "km": "高棉语", "kmb": "金邦杜语", "kn": "卡纳达语", "ko": "韩语", "koi": "科米-彼尔米亚克语", "kok": "孔卡尼语", "kos": "科斯拉伊语", "kpe": "克佩列语", "kr": "卡努里语", "krc": "卡拉恰伊巴尔卡尔语", "krl": "卡累利阿语", "kru": "库鲁克语", "ks": "克什米尔语", "ksb": "香巴拉语", "ksf": "巴菲亚语", "ksh": "科隆语", "ku": "库尔德语", "kum": "库梅克语", "kut": "库特奈语", "kv": "科米语", "kw": "康沃尔语", "ky": "柯尔克孜语", "la": "拉丁语", "lad": "拉迪诺语", "lag": "朗吉语", "lah": "印度-雅利安语", "lam": "兰巴语", "lb": "卢森堡语", "lez": "列兹金语", "lg": "卢干达语", "li": "林堡语", "lkt": "拉科塔语", "ln": "林加拉语", "lo": "老挝语", "lol": "蒙戈语", "lou": "路易斯安那克里奥尔语", "loz": "洛齐语", "lrc": "北卢尔语", "lt": "立陶宛语", "lu": "鲁巴加丹加语", "lua": "卢巴-卢拉语", "lui": "卢伊塞诺语", "lun": "隆达语", "luo": "卢奥语", "lus": "米佐语", "luy": "卢雅语", "lv": "拉脱维亚语", "mad": "马都拉语", "maf": "马法语", "mag": "摩揭陀语", "mai": "迈蒂利语", "mak": "望加锡语", "man": "曼丁哥语", "mas": "马赛语", "mde": "马坝语", "mdf": "莫克沙语", "mdr": "曼达尔语", "men": "门德语", "mer": "梅鲁语", "mfe": "毛里求斯克里奥尔语", "mg": "马拉加斯语", "mga": "中古爱尔兰语", "mgh": "马库阿语", "mgo": "梅塔语", "mh": "马绍尔语", "mi": "毛利语", "mic": "密克马克语", "min": "米南佳保语", "mk": "马其顿语", "ml": "马拉雅拉姆语", "mn": "蒙古语", "mnc": "满语", "mni": "曼尼普尔语", "moh": "摩霍克语", "mos": "莫西语", "mr": "马拉地语", "ms": "马来语", "mt": "马耳他语", "mua": "蒙当语", "mus": "克里克语", "mwl": "米兰德斯语", "mwr": "马尔瓦里语", "my": "缅甸语", "mye": "姆耶内语", "myv": "厄尔兹亚语", "mzn": "马赞德兰语", "na": "瑙鲁语", "nan": "闽南语", "nap": "那不勒斯语", "naq": "纳马语", "nb": "书面挪威语", "nd": "北恩德贝勒语", "nds": "低地德语", "nds-NL": "低萨克森语", "ne": "尼泊尔语", "new": "尼瓦尔语", "ng": "恩东加语", "nia": "尼亚斯语", "niu": "纽埃语", "nl": "荷兰语", "nl-BE": "弗拉芒语", "nmg": "夸西奥语", "nn": "挪威尼诺斯克语", "nnh": "恩甘澎语", "no": "挪威语", "nog": "诺盖语", "non": "古诺尔斯语", "nqo": "西非书面文字", "nr": "南恩德贝勒语", "nso": "北索托语", "nus": "努埃尔语", "nv": "纳瓦霍语", "nwc": "古典尼瓦尔语", "ny": "齐切瓦语", "nym": "尼扬韦齐语", "nyn": "尼昂科勒语", "nyo": "尼奥罗语", "nzi": "恩济马语", "oc": "奥克语", "oj": "奥吉布瓦语", "om": "奥罗莫语", "or": "奥里亚语", "os": "奥塞梯语", "osa": "奥塞治语", "ota": "奥斯曼土耳其语", "pa": "旁遮普语", "pag": "邦阿西南语", "pal": "巴拉维语", "pam": "邦板牙语", "pap": "帕皮阿门托语", "pau": "帕劳语", "pcm": "尼日利亚皮钦语", "peo": "古波斯语", "phn": "腓尼基语", "pi": "巴利语", "pl": "波兰语", "pon": "波纳佩语", "prg": "普鲁士语", "pro": "古普罗文斯语", "ps": "普什图语", "pt": "葡萄牙语", "pt-BR": "巴西葡萄牙语", "pt-PT": "欧洲葡萄牙语", "qu": "克丘亚语", "quc": "基切语", "raj": "拉贾斯坦语", "rap": "拉帕努伊语", "rar": "拉罗汤加语", "rm": "罗曼什语", "rn": "隆迪语", "ro": "罗马尼亚语", "ro-MD": "摩尔多瓦语", "rof": "兰博语", "rom": "吉普赛语", "root": "根语言", "ru": "俄语", "rup": "阿罗马尼亚语", "rw": "卢旺达语", "rwk": "罗瓦语", "sa": "梵语", "sad": "桑达韦语", "sah": "萨哈语", "sam": "萨马利亚阿拉姆语", "saq": "桑布鲁语", "sas": "萨萨克文", "sat": "桑塔利语", "sba": "甘拜语", "sbp": "桑古语", "sc": "萨丁语", "scn": "西西里语", "sco": "苏格兰语", "sd": "信德语", "sdh": "南库尔德语", "se": "北方萨米语", "see": "塞内卡语", "seh": "塞纳语", "sel": "塞尔库普语", "ses": "东桑海语", "sg": "桑戈语", "sga": "古爱尔兰语", "sh": "塞尔维亚-克罗地亚语", "shi": "希尔哈语", "shn": "掸语", "shu": "乍得阿拉伯语", "si": "僧伽罗语", "sid": "悉达摩语", "sk": "斯洛伐克语", "sl": "斯洛文尼亚语", "sm": "萨摩亚语", "sma": "南萨米语", "smj": "吕勒萨米语", "smn": "伊纳里萨米语", "sms": "斯科特萨米语", "sn": "绍纳语", "snk": "索宁克语", "so": "索马里语", "sog": "粟特语", "sq": "阿尔巴尼亚语", "sr": "塞尔维亚语", "srn": "苏里南汤加语", "srr": "塞雷尔语", "ss": "斯瓦蒂语", "ssy": "萨霍语", "st": "南索托语", "su": "巽他语", "suk": "苏库马语", "sus": "苏苏语", "sux": "苏美尔语", "sv": "瑞典语", "sw": "斯瓦希里语", "sw-CD": "刚果斯瓦希里语", "swb": "科摩罗语", "syc": "古典叙利亚语", "syr": "叙利亚语", "ta": "泰米尔语", "te": "泰卢固语", "tem": "泰姆奈语", "teo": "特索语", "ter": "特伦诺语", "tet": "德顿语", "tg": "塔吉克语", "th": "泰语", "ti": "提格利尼亚语", "tig": "提格雷语", "tiv": "蒂夫语", "tk": "土库曼语", "tkl": "托克劳语", "tl": "他加禄语", "tlh": "克林贡语", "tli": "特林吉特语", "tmh": "塔马奇克语", "tn": "茨瓦纳语", "to": "汤加语", "tog": "尼亚萨汤加语", "tpi": "托克皮辛语", "tr": "土耳其语", "trv": "赛德克语", "ts": "聪加语", "tsi": "钦西安语", "tt": "鞑靼语", "tum": "通布卡语", "tvl": "图瓦卢语", "tw": "契维语", "twq": "北桑海语", "ty": "塔希提语", "tyv": "图瓦语", "tzm": "塔马齐格特语", "udm": "乌德穆尔特语", "ug": "维吾尔语", "uga": "乌加里特语", "uk": "乌克兰语", "umb": "翁本杜语", "ur": "乌尔都语", "uz": "乌兹别克语", "vai": "瓦伊语", "ve": "文达语", "vep": "维普森语", "vi": "越南语", "vo": "沃拉普克语", "vot": "沃提克语", "vun": "温旧语", "wa": "瓦隆语", "wae": "瓦尔瑟语", "wal": "瓦拉莫语", "war": "瓦瑞语", "was": "瓦绍语", "wbp": "瓦尔皮瑞语", "wo": "沃洛夫语", "wuu": "吴语", "xal": "卡尔梅克语", "xh": "科萨语", "xog": "索加语", "yao": "瑶族语", "yap": "雅浦语", "yav": "洋卞语", "ybb": "耶姆巴语", "yi": "意第绪语", "yo": "约鲁巴语", "yue": "粤语", "za": "壮语", "zap": "萨波蒂克语", "zbl": "布里斯符号", "zen": "泽纳加语", "zgh": "标准摩洛哥塔马塞特语", "zh": "中文", "zh-Hans": "简体中文", "zh-Hant": "繁体中文", "zu": "祖鲁语", "zun": "祖尼语", "zza": "扎扎语"}, "scriptNames": {"Cyrl": "西里尔文", "Latn": "拉丁文", "Arab": "阿拉伯文", "Guru": "果鲁穆奇文", "Tfng": "提非纳文", "Vaii": "瓦依文", "Hans": "简体", "Hant": "繁体"}},
     "zh-CN": {"rtl": false, "languageNames": {"aa": "阿法尔语", "ab": "阿布哈西亚语", "ace": "亚齐语", "ach": "阿乔利语", "ada": "阿当梅语", "ady": "阿迪格语", "ae": "阿维斯塔语", "af": "南非荷兰语", "afh": "阿弗里希利语", "agq": "亚罕语", "ain": "阿伊努语", "ak": "阿肯语", "akk": "阿卡德语", "ale": "阿留申语", "alt": "南阿尔泰语", "am": "阿姆哈拉语", "an": "阿拉贡语", "ang": "古英语", "anp": "昂加语", "ar": "阿拉伯语", "ar-001": "现代标准阿拉伯语", "arc": "阿拉米语", "arn": "马普切语", "arp": "阿拉帕霍语", "ars": "纳吉迪阿拉伯语", "arw": "阿拉瓦克语", "as": "阿萨姆语", "asa": "帕雷语", "ast": "阿斯图里亚斯语", "av": "阿瓦尔语", "awa": "阿瓦德语", "ay": "艾马拉语", "az": "阿塞拜疆语", "az-Arab": "南阿塞拜疆语", "ba": "巴什基尔语", "bal": "俾路支语", "ban": "巴厘语", "bas": "巴萨语", "bax": "巴姆穆语", "bbj": "戈马拉语", "be": "白俄罗斯语", "bej": "贝沙语", "bem": "本巴语", "bez": "贝纳语", "bfd": "巴非特语", "bg": "保加利亚语", "bgn": "西俾路支语", "bho": "博杰普尔语", "bi": "比斯拉马语", "bik": "比科尔语", "bin": "比尼语", "bkm": "科姆语", "bla": "西克西卡语", "bm": "班巴拉语", "bn": "孟加拉语", "bo": "藏语", "br": "布列塔尼语", "bra": "布拉杰语", "brx": "博多语", "bs": "波斯尼亚语", "bss": "阿库色语", "bua": "布里亚特语", "bug": "布吉语", "bum": "布鲁语", "byn": "比林语", "byv": "梅敦巴语", "ca": "加泰罗尼亚语", "cad": "卡多语", "car": "加勒比语", "cay": "卡尤加语", "cch": "阿灿语", "ccp": "查克玛语", "ce": "车臣语", "ceb": "宿务语", "cgg": "奇加语", "ch": "查莫罗语", "chb": "奇布查语", "chg": "察合台语", "chk": "楚克语", "chm": "马里语", "chn": "奇努克混合语", "cho": "乔克托语", "chp": "奇佩维安语", "chr": "切罗基语", "chy": "夏延语", "ckb": "中库尔德语", "co": "科西嘉语", "cop": "科普特语", "cr": "克里族语", "crh": "克里米亚土耳其语", "crs": "塞舌尔克里奥尔语", "cs": "捷克语", "csb": "卡舒比语", "cu": "教会斯拉夫语", "cv": "楚瓦什语", "cy": "威尔士语", "da": "丹麦语", "dak": "达科他语", "dar": "达尔格瓦语", "dav": "台塔语", "de": "德语", "de-AT": "奥地利德语", "de-CH": "瑞士高地德语", "del": "特拉华语", "den": "史拉维语", "dgr": "多格里布语", "din": "丁卡语", "dje": "哲尔马语", "doi": "多格拉语", "dsb": "下索布语", "dua": "都阿拉语", "dum": "中古荷兰语", "dv": "迪维希语", "dyo": "朱拉语", "dyu": "迪尤拉语", "dz": "宗卡语", "dzg": "达扎葛语", "ebu": "恩布语", "ee": "埃维语", "efi": "埃菲克语", "egy": "古埃及语", "eka": "艾卡朱克语", "el": "希腊语", "elx": "埃兰语", "en": "英语", "en-AU": "澳大利亚英语", "en-CA": "加拿大英语", "en-GB": "英国英语", "en-US": "美国英语", "enm": "中古英语", "eo": "世界语", "es": "西班牙语", "es-419": "拉丁美洲西班牙语", "es-ES": "欧洲西班牙语", "es-MX": "墨西哥西班牙语", "et": "爱沙尼亚语", "eu": "巴斯克语", "ewo": "旺杜语", "fa": "波斯语", "fan": "芳格语", "fat": "芳蒂语", "ff": "富拉语", "fi": "芬兰语", "fil": "菲律宾语", "fj": "斐济语", "fo": "法罗语", "fon": "丰语", "fr": "法语", "fr-CA": "加拿大法语", "fr-CH": "瑞士法语", "frc": "卡真法语", "frm": "中古法语", "fro": "古法语", "frr": "北弗里西亚语", "frs": "东弗里西亚语", "fur": "弗留利语", "fy": "西弗里西亚语", "ga": "爱尔兰语", "gaa": "加族语", "gag": "加告兹语", "gan": "赣语", "gay": "迦约语", "gba": "格巴亚语", "gd": "苏格兰盖尔语", "gez": "吉兹语", "gil": "吉尔伯特语", "gl": "加利西亚语", "gmh": "中古高地德语", "gn": "瓜拉尼语", "goh": "古高地德语", "gon": "冈德语", "gor": "哥伦打洛语", "got": "哥特语", "grb": "格列博语", "grc": "古希腊语", "gsw": "瑞士德语", "gu": "古吉拉特语", "guz": "古西语", "gv": "马恩语", "gwi": "哥威迅语", "ha": "豪萨语", "hai": "海达语", "hak": "客家语", "haw": "夏威夷语", "he": "希伯来语", "hi": "印地语", "hil": "希利盖农语", "hit": "赫梯语", "hmn": "苗语", "ho": "希里莫图语", "hr": "克罗地亚语", "hsb": "上索布语", "hsn": "湘语", "ht": "海地克里奥尔语", "hu": "匈牙利语", "hup": "胡帕语", "hy": "亚美尼亚语", "hz": "赫雷罗语", "ia": "国际语", "iba": "伊班语", "ibb": "伊比比奥语", "id": "印度尼西亚语", "ie": "国际文字（E）", "ig": "伊博语", "ii": "四川彝语", "ik": "伊努皮克语", "ilo": "伊洛卡诺语", "inh": "印古什语", "io": "伊多语", "is": "冰岛语", "it": "意大利语", "iu": "因纽特语", "ja": "日语", "jbo": "逻辑语", "jgo": "恩艮巴语", "jmc": "马切姆语", "jpr": "犹太波斯语", "jrb": "犹太阿拉伯语", "jv": "爪哇语", "ka": "格鲁吉亚语", "kaa": "卡拉卡尔帕克语", "kab": "卡拜尔语", "kac": "克钦语", "kaj": "卡捷语", "kam": "卡姆巴语", "kaw": "卡威语", "kbd": "卡巴尔德语", "kbl": "加涅姆布语", "kcg": "卡塔布语", "kde": "马孔德语", "kea": "卡布佛得鲁语", "kfo": "克罗语", "kg": "刚果语", "kha": "卡西语", "kho": "和田语", "khq": "西桑海语", "ki": "吉库尤语", "kj": "宽亚玛语", "kk": "哈萨克语", "kkj": "卡库语", "kl": "格陵兰语", "kln": "卡伦金语", "km": "高棉语", "kmb": "金邦杜语", "kn": "卡纳达语", "ko": "韩语", "koi": "科米-彼尔米亚克语", "kok": "孔卡尼语", "kos": "科斯拉伊语", "kpe": "克佩列语", "kr": "卡努里语", "krc": "卡拉恰伊巴尔卡尔语", "krl": "卡累利阿语", "kru": "库鲁克语", "ks": "克什米尔语", "ksb": "香巴拉语", "ksf": "巴菲亚语", "ksh": "科隆语", "ku": "库尔德语", "kum": "库梅克语", "kut": "库特奈语", "kv": "科米语", "kw": "康沃尔语", "ky": "柯尔克孜语", "la": "拉丁语", "lad": "拉迪诺语", "lag": "朗吉语", "lah": "印度-雅利安语", "lam": "兰巴语", "lb": "卢森堡语", "lez": "列兹金语", "lg": "卢干达语", "li": "林堡语", "lkt": "拉科塔语", "ln": "林加拉语", "lo": "老挝语", "lol": "蒙戈语", "lou": "路易斯安那克里奥尔语", "loz": "洛齐语", "lrc": "北卢尔语", "lt": "立陶宛语", "lu": "鲁巴加丹加语", "lua": "卢巴-卢拉语", "lui": "卢伊塞诺语", "lun": "隆达语", "luo": "卢奥语", "lus": "米佐语", "luy": "卢雅语", "lv": "拉脱维亚语", "mad": "马都拉语", "maf": "马法语", "mag": "摩揭陀语", "mai": "迈蒂利语", "mak": "望加锡语", "man": "曼丁哥语", "mas": "马赛语", "mde": "马坝语", "mdf": "莫克沙语", "mdr": "曼达尔语", "men": "门德语", "mer": "梅鲁语", "mfe": "毛里求斯克里奥尔语", "mg": "马拉加斯语", "mga": "中古爱尔兰语", "mgh": "马库阿语", "mgo": "梅塔语", "mh": "马绍尔语", "mi": "毛利语", "mic": "密克马克语", "min": "米南佳保语", "mk": "马其顿语", "ml": "马拉雅拉姆语", "mn": "蒙古语", "mnc": "满语", "mni": "曼尼普尔语", "moh": "摩霍克语", "mos": "莫西语", "mr": "马拉地语", "ms": "马来语", "mt": "马耳他语", "mua": "蒙当语", "mus": "克里克语", "mwl": "米兰德斯语", "mwr": "马尔瓦里语", "my": "缅甸语", "mye": "姆耶内语", "myv": "厄尔兹亚语", "mzn": "马赞德兰语", "na": "瑙鲁语", "nan": "闽南语", "nap": "那不勒斯语", "naq": "纳马语", "nb": "书面挪威语", "nd": "北恩德贝勒语", "nds": "低地德语", "nds-NL": "低萨克森语", "ne": "尼泊尔语", "new": "尼瓦尔语", "ng": "恩东加语", "nia": "尼亚斯语", "niu": "纽埃语", "nl": "荷兰语", "nl-BE": "弗拉芒语", "nmg": "夸西奥语", "nn": "挪威尼诺斯克语", "nnh": "恩甘澎语", "no": "挪威语", "nog": "诺盖语", "non": "古诺尔斯语", "nqo": "西非书面文字", "nr": "南恩德贝勒语", "nso": "北索托语", "nus": "努埃尔语", "nv": "纳瓦霍语", "nwc": "古典尼瓦尔语", "ny": "齐切瓦语", "nym": "尼扬韦齐语", "nyn": "尼昂科勒语", "nyo": "尼奥罗语", "nzi": "恩济马语", "oc": "奥克语", "oj": "奥吉布瓦语", "om": "奥罗莫语", "or": "奥里亚语", "os": "奥塞梯语", "osa": "奥塞治语", "ota": "奥斯曼土耳其语", "pa": "旁遮普语", "pag": "邦阿西南语", "pal": "巴拉维语", "pam": "邦板牙语", "pap": "帕皮阿门托语", "pau": "帕劳语", "pcm": "尼日利亚皮钦语", "peo": "古波斯语", "phn": "腓尼基语", "pi": "巴利语", "pl": "波兰语", "pon": "波纳佩语", "prg": "普鲁士语", "pro": "古普罗文斯语", "ps": "普什图语", "pt": "葡萄牙语", "pt-BR": "巴西葡萄牙语", "pt-PT": "欧洲葡萄牙语", "qu": "克丘亚语", "quc": "基切语", "raj": "拉贾斯坦语", "rap": "拉帕努伊语", "rar": "拉罗汤加语", "rm": "罗曼什语", "rn": "隆迪语", "ro": "罗马尼亚语", "ro-MD": "摩尔多瓦语", "rof": "兰博语", "rom": "吉普赛语", "root": "根语言", "ru": "俄语", "rup": "阿罗马尼亚语", "rw": "卢旺达语", "rwk": "罗瓦语", "sa": "梵语", "sad": "桑达韦语", "sah": "萨哈语", "sam": "萨马利亚阿拉姆语", "saq": "桑布鲁语", "sas": "萨萨克文", "sat": "桑塔利语", "sba": "甘拜语", "sbp": "桑古语", "sc": "萨丁语", "scn": "西西里语", "sco": "苏格兰语", "sd": "信德语", "sdh": "南库尔德语", "se": "北方萨米语", "see": "塞内卡语", "seh": "塞纳语", "sel": "塞尔库普语", "ses": "东桑海语", "sg": "桑戈语", "sga": "古爱尔兰语", "sh": "塞尔维亚-克罗地亚语", "shi": "希尔哈语", "shn": "掸语", "shu": "乍得阿拉伯语", "si": "僧伽罗语", "sid": "悉达摩语", "sk": "斯洛伐克语", "sl": "斯洛文尼亚语", "sm": "萨摩亚语", "sma": "南萨米语", "smj": "吕勒萨米语", "smn": "伊纳里萨米语", "sms": "斯科特萨米语", "sn": "绍纳语", "snk": "索宁克语", "so": "索马里语", "sog": "粟特语", "sq": "阿尔巴尼亚语", "sr": "塞尔维亚语", "srn": "苏里南汤加语", "srr": "塞雷尔语", "ss": "斯瓦蒂语", "ssy": "萨霍语", "st": "南索托语", "su": "巽他语", "suk": "苏库马语", "sus": "苏苏语", "sux": "苏美尔语", "sv": "瑞典语", "sw": "斯瓦希里语", "sw-CD": "刚果斯瓦希里语", "swb": "科摩罗语", "syc": "古典叙利亚语", "syr": "叙利亚语", "ta": "泰米尔语", "te": "泰卢固语", "tem": "泰姆奈语", "teo": "特索语", "ter": "特伦诺语", "tet": "德顿语", "tg": "塔吉克语", "th": "泰语", "ti": "提格利尼亚语", "tig": "提格雷语", "tiv": "蒂夫语", "tk": "土库曼语", "tkl": "托克劳语", "tl": "他加禄语", "tlh": "克林贡语", "tli": "特林吉特语", "tmh": "塔马奇克语", "tn": "茨瓦纳语", "to": "汤加语", "tog": "尼亚萨汤加语", "tpi": "托克皮辛语", "tr": "土耳其语", "trv": "赛德克语", "ts": "聪加语", "tsi": "钦西安语", "tt": "鞑靼语", "tum": "通布卡语", "tvl": "图瓦卢语", "tw": "契维语", "twq": "北桑海语", "ty": "塔希提语", "tyv": "图瓦语", "tzm": "塔马齐格特语", "udm": "乌德穆尔特语", "ug": "维吾尔语", "uga": "乌加里特语", "uk": "乌克兰语", "umb": "翁本杜语", "ur": "乌尔都语", "uz": "乌兹别克语", "vai": "瓦伊语", "ve": "文达语", "vep": "维普森语", "vi": "越南语", "vo": "沃拉普克语", "vot": "沃提克语", "vun": "温旧语", "wa": "瓦隆语", "wae": "瓦尔瑟语", "wal": "瓦拉莫语", "war": "瓦瑞语", "was": "瓦绍语", "wbp": "瓦尔皮瑞语", "wo": "沃洛夫语", "wuu": "吴语", "xal": "卡尔梅克语", "xh": "科萨语", "xog": "索加语", "yao": "瑶族语", "yap": "雅浦语", "yav": "洋卞语", "ybb": "耶姆巴语", "yi": "意第绪语", "yo": "约鲁巴语", "yue": "粤语", "za": "壮语", "zap": "萨波蒂克语", "zbl": "布里斯符号", "zen": "泽纳加语", "zgh": "标准摩洛哥塔马塞特语", "zh": "中文", "zh-Hans": "简体中文", "zh-Hant": "繁体中文", "zu": "祖鲁语", "zun": "祖尼语", "zza": "扎扎语"}, "scriptNames": {"Cyrl": "西里尔文", "Latn": "拉丁文", "Arab": "阿拉伯文", "Guru": "果鲁穆奇文", "Tfng": "提非纳文", "Vaii": "瓦依文", "Hans": "简体", "Hant": "繁体"}},
     "zh-HK": {"rtl": false, "languageNames": {"aa": "阿法爾文", "ab": "阿布哈茲文", "ace": "亞齊文", "ach": "阿僑利文", "ada": "阿當莫文", "ady": "阿迪各文", "ae": "阿維斯塔文", "aeb": "突尼斯阿拉伯文", "af": "南非荷蘭文", "afh": "阿弗里希利文", "agq": "亞罕文", "ain": "阿伊努文", "ak": "阿坎文", "akk": "阿卡德文", "akz": "阿拉巴馬文", "ale": "阿留申文", "aln": "蓋格阿爾巴尼亞文", "alt": "南阿爾泰文", "am": "阿姆哈拉文", "an": "阿拉貢文", "ang": "古英文", "anp": "昂加文", "ar": "阿拉伯文", "ar-001": "現代標準阿拉伯文", "arc": "阿拉米文", "arn": "馬普切文", "aro": "阿拉奧納文", "arp": "阿拉帕霍文", "arq": "阿爾及利亞阿拉伯文", "ars": "納吉迪阿拉伯文", "arw": "阿拉瓦克文", "ary": "摩洛哥阿拉伯文", "arz": "埃及阿拉伯文", "as": "阿薩姆文", "asa": "阿蘇文", "ase": "美國手語", "ast": "阿斯圖里亞文", "av": "阿瓦爾文", "avk": "科塔瓦文", "awa": "阿瓦文", "ay": "艾馬拉文", "az": "阿塞拜疆文", "az-Arab": "南阿塞拜疆文", "ba": "巴什基爾文", "bal": "俾路支文", "ban": "峇里文", "bar": "巴伐利亞文", "bas": "巴薩文", "bax": "巴姆穆文", "bbc": "巴塔克托巴文", "bbj": "戈馬拉文", "be": "白俄羅斯文", "bej": "貝扎文", "bem": "別姆巴文", "bew": "貝塔維文", "bez": "貝納文", "bfd": "富特文", "bfq": "巴達加文", "bg": "保加利亞文", "bgn": "西俾路支文", "bho": "博傑普爾文", "bi": "比斯拉馬文", "bik": "比科爾文", "bin": "比尼文", "bjn": "班亞爾文", "bkm": "康姆文", "bla": "錫克錫卡文", "bm": "班巴拉文", "bn": "孟加拉文", "bo": "藏文", "bpy": "比什奴普萊利亞文", "bqi": "巴赫蒂亞里文", "br": "布里多尼文", "bra": "布拉杰文", "brh": "布拉維文", "brx": "博多文", "bs": "波斯尼亞文", "bss": "阿庫色文", "bua": "布里阿特文", "bug": "布吉斯文", "bum": "布魯文", "byn": "比林文", "byv": "梅敦巴文", "ca": "加泰隆尼亞文", "cad": "卡多文", "car": "加勒比文", "cay": "卡尤加文", "cch": "阿燦文", "ccp": "查克馬文", "ce": "車臣文", "ceb": "宿霧文", "cgg": "奇加文", "ch": "查莫洛文", "chb": "奇布查文", "chg": "查加文", "chk": "處奇斯文", "chm": "馬里文", "chn": "契奴克文", "cho": "喬克托文", "chp": "奇佩瓦揚文", "chr": "柴羅基文", "chy": "沙伊安文", "ckb": "中庫德文", "co": "科西嘉文", "cop": "科普特文", "cps": "卡皮茲文", "cr": "克里文", "crh": "克里米亞韃靼文", "crs": "塞舌爾克里奧爾法文", "cs": "捷克文", "csb": "卡舒布文", "cu": "宗教斯拉夫文", "cv": "楚瓦什文", "cy": "威爾斯文", "da": "丹麥文", "dak": "達科他文", "dar": "達爾格瓦文", "dav": "台塔文", "de": "德文", "de-AT": "奧地利德文", "de-CH": "瑞士德語", "del": "德拉瓦文", "den": "斯拉夫文", "dgr": "多格里布文", "din": "丁卡文", "dje": "扎爾馬文", "doi": "多格來文", "dsb": "下索布文", "dtp": "中部杜順文", "dua": "杜亞拉文", "dum": "中古荷蘭文", "dv": "迪維西文", "dyo": "朱拉文", "dyu": "迪尤拉文", "dz": "宗卡文", "dzg": "達薩文", "ebu": "恩布文", "ee": "埃維文", "efi": "埃菲克文", "egl": "埃米利安文", "egy": "古埃及文", "eka": "艾卡朱克文", "el": "希臘文", "elx": "埃蘭文", "en": "英文", "en-AU": "澳洲英文", "en-CA": "加拿大英文", "en-GB": "英國英文", "en-US": "美國英文", "enm": "中古英文", "eo": "世界語", "es": "西班牙文", "es-419": "拉丁美洲西班牙文", "es-ES": "歐洲西班牙文", "es-MX": "墨西哥西班牙文", "esu": "中尤皮克文", "et": "愛沙尼亞文", "eu": "巴斯克文", "ewo": "依汪都文", "ext": "埃斯特雷馬杜拉文", "fa": "波斯文", "fan": "芳族文", "fat": "芳蒂文", "ff": "富拉文", "fi": "芬蘭文", "fil": "菲律賓文", "fit": "托爾訥芬蘭文", "fj": "斐濟文", "fo": "法羅文", "fon": "豐文", "fr": "法文", "fr-CA": "加拿大法文", "fr-CH": "瑞士法文", "frc": "卡真法文", "frm": "中古法文", "fro": "古法文", "frp": "法蘭克-普羅旺斯文", "frr": "北弗里西亞文", "frs": "東弗里西亞文", "fur": "弗留利文", "fy": "西弗里西亞文", "ga": "愛爾蘭文", "gaa": "加族文", "gag": "加告茲文", "gan": "贛語", "gay": "加約文", "gba": "葛巴亞文", "gbz": "索羅亞斯德教達里文", "gd": "蘇格蘭蓋爾文", "gez": "吉茲文", "gil": "吉爾伯特文", "gl": "加里西亞文", "glk": "吉拉基文", "gmh": "中古高地德文", "gn": "瓜拉尼文", "goh": "古高地德文", "gom": "孔卡尼文", "gon": "岡德文", "gor": "科隆達羅文", "got": "哥德文", "grb": "格列博文", "grc": "古希臘文", "gsw": "瑞士德文", "gu": "古吉拉特文", "guc": "瓦尤文", "gur": "弗拉弗拉文", "guz": "古西文", "gv": "曼島文", "gwi": "圭契文", "ha": "豪撒文", "hai": "海達文", "hak": "客家話", "haw": "夏威夷文", "he": "希伯來文", "hi": "印度文", "hif": "斐濟印地文", "hil": "希利蓋農文", "hit": "赫梯文", "hmn": "苗語", "ho": "西里莫圖土文", "hr": "克羅地亞文", "hsb": "上索布文", "hsn": "湘語", "ht": "海地文", "hu": "匈牙利文", "hup": "胡帕文", "hy": "亞美尼亞文", "hz": "赫雷羅文", "ia": "國際文", "iba": "伊班文", "ibb": "伊比比奧文", "id": "印尼文", "ie": "國際文（E）", "ig": "伊布文", "ii": "四川彝文", "ik": "依奴皮維克文", "ilo": "伊洛闊文", "inh": "印古什文", "io": "伊多文", "is": "冰島文", "it": "意大利文", "iu": "因紐特文", "izh": "英格里亞文", "ja": "日文", "jam": "牙買加克里奧爾英文", "jbo": "邏輯文", "jgo": "恩格姆巴文", "jmc": "馬恰美文", "jpr": "猶太波斯文", "jrb": "猶太阿拉伯文", "jut": "日德蘭文", "jv": "爪哇文", "ka": "格魯吉亞文", "kaa": "卡拉卡爾帕克文", "kab": "卡比爾文", "kac": "卡琴文", "kaj": "卡捷文", "kam": "卡姆巴文", "kaw": "卡威文", "kbd": "卡巴爾達文", "kbl": "卡念布文", "kcg": "卡塔布文", "kde": "馬孔德文", "kea": "卡布威爾第文", "ken": "肯揚文", "kfo": "科羅文", "kg": "剛果文", "kgp": "坎剛文", "kha": "卡西文", "kho": "和闐文", "khq": "西桑海文", "khw": "科瓦文", "ki": "吉庫尤文", "kiu": "扎扎其文", "kj": "廣亞馬文", "kk": "哈薩克文", "kkj": "卡庫文", "kl": "格陵蘭文", "kln": "卡倫金文", "km": "高棉文", "kmb": "金邦杜文", "kn": "坎納達文", "ko": "韓文", "koi": "科米-彼爾米亞克文", "kok": "貢根文", "kos": "科斯雷恩文", "kpe": "克佩列文", "kr": "卡努里文", "krc": "卡拉柴-包爾卡爾文", "kri": "克裡奧爾文", "krj": "基那來阿文", "krl": "卡累利阿文", "kru": "庫魯科文", "ks": "喀什米爾文", "ksb": "尚巴拉文", "ksf": "巴菲亞文", "ksh": "科隆文", "ku": "庫德文", "kum": "庫密克文", "kut": "庫特奈文", "kv": "科米文", "kw": "康瓦耳文", "ky": "吉爾吉斯文", "la": "拉丁文", "lad": "拉迪諾文", "lag": "朗吉文", "lah": "拉亨達文", "lam": "蘭巴文", "lb": "盧森堡文", "lez": "列茲干文", "lfn": "新共同語言", "lg": "干達文", "li": "林堡文", "lij": "利古里亞文", "liv": "利伏尼亞文", "lkt": "拉科塔文", "lmo": "倫巴底文", "ln": "林加拉文", "lo": "老撾文", "lol": "芒戈文", "lou": "路易斯安那克里奧爾文", "loz": "洛齊文", "lrc": "北盧爾文", "lt": "立陶宛文", "ltg": "拉特加萊文", "lu": "魯巴加丹加文", "lua": "魯巴魯魯亞文", "lui": "路易塞諾文", "lun": "盧恩達文", "luo": "盧歐文", "lus": "米佐文", "luy": "盧雅文", "lv": "拉脫維亞文", "lzh": "文言文", "lzz": "拉茲文", "mad": "馬都拉文", "maf": "馬法文", "mag": "馬加伊文", "mai": "邁蒂利文", "mak": "望加錫文", "man": "曼丁哥文", "mas": "馬賽文", "mde": "馬巴文", "mdf": "莫克沙文", "mdr": "曼達文", "men": "門德文", "mer": "梅魯文", "mfe": "毛里裘斯克里奧爾文", "mg": "馬拉加斯文", "mga": "中古愛爾蘭文", "mgh": "馬夸文", "mgo": "美塔文", "mh": "馬紹爾文", "mi": "毛利文", "mic": "米克馬克文", "min": "米南卡堡文", "mk": "馬其頓文", "ml": "馬拉雅拉姆文", "mn": "蒙古文", "mnc": "滿族文", "mni": "曼尼普爾文", "moh": "莫霍克文", "mos": "莫西文", "mr": "馬拉地文", "mrj": "西馬里文", "ms": "馬來文", "mt": "馬耳他文", "mua": "蒙當文", "mus": "克里克文", "mwl": "米蘭德斯文", "mwr": "馬瓦里文", "mwv": "明打威文", "my": "緬甸文", "mye": "姆耶內文", "myv": "厄爾茲亞文", "mzn": "馬贊德蘭文", "na": "諾魯文", "nan": "閩南語", "nap": "拿波里文", "naq": "納馬文", "nb": "巴克摩挪威文", "nd": "北地畢列文", "nds": "低地德文", "nds-NL": "低地薩克遜文", "ne": "尼泊爾文", "new": "尼瓦爾文", "ng": "恩東加文", "nia": "尼亞斯文", "niu": "紐埃文", "njo": "阿沃那加文", "nl": "荷蘭文", "nl-BE": "比利時荷蘭文", "nmg": "夸西奧文", "nn": "耐諾斯克挪威文", "nnh": "恩甘澎文", "no": "挪威文", "nog": "諾蓋文", "non": "古諾爾斯文", "nov": "諾維亞文", "nqo": "西非書面語言（N’ko）", "nr": "南地畢列文", "nso": "北索托文", "nus": "努埃爾文", "nv": "納瓦霍文", "nwc": "古尼瓦爾文", "ny": "尼揚賈文", "nym": "尼揚韋齊文", "nyn": "尼揚科萊文", "nyo": "尼奧囉文", "nzi": "尼茲馬文", "oc": "奧克西坦文", "oj": "奧杰布瓦文", "om": "奧羅莫文", "or": "奧里雅文", "os": "奧塞提文", "osa": "歐塞奇文", "ota": "鄂圖曼土耳其文", "pa": "旁遮普文", "pag": "潘加辛文", "pal": "巴列維文", "pam": "潘帕嘉文", "pap": "帕皮阿門托文", "pau": "帛琉文", "pcd": "庇卡底文", "pcm": "尼日利亞皮欽文", "pdc": "賓夕法尼亞德文", "pdt": "門諾低地德文", "peo": "古波斯文", "pfl": "普法爾茨德文", "phn": "腓尼基文", "pi": "巴利文", "pl": "波蘭文", "pms": "皮埃蒙特文", "pnt": "旁狄希臘文", "pon": "波那貝文", "prg": "普魯士文", "pro": "古普羅旺斯文", "ps": "普什圖文", "pt": "葡萄牙文", "pt-BR": "巴西葡萄牙文", "pt-PT": "歐洲葡萄牙文", "qu": "蓋楚瓦文", "quc": "基切文", "qug": "欽博拉索海蘭蓋丘亞文", "raj": "拉賈斯坦諸文", "rap": "復活島文", "rar": "拉羅通加文", "rgn": "羅馬格諾里文", "rif": "里菲亞諾文", "rm": "羅曼斯文", "rn": "隆迪文", "ro": "羅馬尼亞文", "ro-MD": "摩爾多瓦羅馬尼亞文", "rof": "蘭博文", "rom": "吉普賽文", "root": "根語言", "rtm": "羅圖馬島文", "ru": "俄文", "rue": "盧森尼亞文", "rug": "羅維阿納文", "rup": "阿羅馬尼亞語", "rw": "盧旺達文", "rwk": "羅瓦文", "sa": "梵文", "sad": "桑達韋文", "sah": "雅庫特文", "sam": "薩瑪利亞阿拉姆文", "saq": "薩布魯文", "sas": "撒撒克文", "sat": "桑塔利文", "saz": "索拉什特拉文", "sba": "甘拜文", "sbp": "桑古文", "sc": "撒丁文", "scn": "西西里文", "sco": "蘇格蘭文", "sd": "信德文", "sdc": "薩丁尼亞-薩薩里文", "sdh": "南庫德文", "se": "北薩米文", "see": "塞訥卡文", "seh": "賽納文", "sei": "瑟里文", "sel": "塞爾庫普文", "ses": "東桑海文", "sg": "桑戈文", "sga": "古愛爾蘭文", "sgs": "薩莫吉希亞文", "sh": "塞爾維亞克羅埃西亞文", "shi": "希爾哈文", "shn": "撣文", "shu": "阿拉伯文（查德）", "si": "僧伽羅文", "sid": "希達摩文", "sk": "斯洛伐克文", "sl": "斯洛文尼亞文", "sli": "下西利西亞文", "sly": "塞拉亞文", "sm": "薩摩亞文", "sma": "南薩米文", "smj": "魯勒薩米文", "smn": "伊納里薩米文", "sms": "斯科特薩米文", "sn": "修納文", "snk": "索尼基文", "so": "索馬里文", "sog": "索格底亞納文", "sq": "阿爾巴尼亞文", "sr": "塞爾維亞文", "srn": "蘇拉南東墎文", "srr": "塞雷爾文", "ss": "斯瓦特文", "ssy": "薩霍文", "st": "塞索托文", "stq": "沙特菲士蘭文", "su": "巽他文", "suk": "蘇庫馬文", "sus": "蘇蘇文", "sux": "蘇美文", "sv": "瑞典文", "sw": "史瓦希里文", "sw-CD": "剛果史瓦希里文", "swb": "葛摩文", "syc": "古敘利亞文", "syr": "敍利亞文", "szl": "西利西亞文", "ta": "泰米爾文", "tcy": "圖盧文", "te": "泰盧固文", "tem": "提姆文", "teo": "特索文", "ter": "泰雷諾文", "tet": "泰頓文", "tg": "塔吉克文", "th": "泰文", "ti": "提格利尼亞文", "tig": "蒂格雷文", "tiv": "提夫文", "tk": "土庫曼文", "tkl": "托克勞文", "tkr": "查庫爾文", "tl": "塔加路族文", "tlh": "克林貢文", "tli": "特林基特文", "tly": "塔里什文", "tmh": "塔馬奇克文", "tn": "突尼西亞文", "to": "湯加文", "tog": "東加文（尼亞薩）", "tpi": "托比辛文", "tr": "土耳其文", "tru": "圖羅尤文", "trv": "太魯閣文", "ts": "特松加文", "tsd": "特薩克尼恩文", "tsi": "欽西安文", "tt": "韃靼文", "ttt": "穆斯林塔特文", "tum": "圖姆布卡文", "tvl": "吐瓦魯文", "tw": "特威文", "twq": "北桑海文", "ty": "大溪地文", "tyv": "圖瓦文", "tzm": "中阿特拉斯塔馬塞特文", "udm": "烏德穆爾特文", "ug": "維吾爾文", "uga": "烏加列文", "uk": "烏克蘭文", "umb": "姆本杜文", "ur": "烏爾都文", "uz": "烏茲別克文", "vai": "瓦伊文", "ve": "溫達文", "vec": "威尼斯文", "vep": "維普森文", "vi": "越南文", "vls": "西佛蘭德文", "vmf": "美茵-法蘭克尼亞文", "vo": "沃拉普克文", "vot": "沃提克文", "vro": "佛羅文", "vun": "溫舊文", "wa": "瓦隆文", "wae": "瓦爾瑟文", "wal": "瓦拉莫文", "war": "瓦瑞文", "was": "瓦紹文", "wbp": "瓦爾皮里文", "wo": "沃洛夫文", "wuu": "吳語", "xal": "卡爾梅克文", "xh": "科薩文", "xmf": "明格列爾文", "xog": "索加文", "yao": "瑤文", "yap": "雅浦文", "yav": "洋卞文", "ybb": "耶姆巴文", "yi": "意第緒文", "yo": "約魯巴文", "yrl": "奈恩加圖文", "yue": "廣東話", "za": "壯文", "zap": "薩波特克文", "zbl": "布列斯符號", "zea": "西蘭文", "zen": "澤納加文", "zgh": "摩洛哥標準塔馬齊格特文", "zh": "中文", "zh-Hans": "簡體中文", "zh-Hant": "繁體中文", "zu": "祖魯文", "zun": "祖尼文", "zza": "扎扎文"}, "scriptNames": {"Cyrl": "西里爾文", "Latn": "拉丁字母", "Arab": "阿拉伯文", "Guru": "古木基文", "Tfng": "提非納文", "Vaii": "瓦依文", "Hans": "簡體字", "Hant": "繁體字"}},
-    "zh-TW": {"rtl": false, "languageNames": {"aa": "阿法尔语", "ab": "阿布哈西亚语", "ace": "亚齐语", "ach": "阿乔利语", "ada": "阿当梅语", "ady": "阿迪格语", "ae": "阿维斯塔语", "af": "南非荷兰语", "afh": "阿弗里希利语", "agq": "亚罕语", "ain": "阿伊努语", "ak": "阿肯语", "akk": "阿卡德语", "ale": "阿留申语", "alt": "南阿尔泰语", "am": "阿姆哈拉语", "an": "阿拉贡语", "ang": "古英语", "anp": "昂加语", "ar": "阿拉伯语", "ar-001": "现代标准阿拉伯语", "arc": "阿拉米语", "arn": "马普切语", "arp": "阿拉帕霍语", "ars": "纳吉迪阿拉伯语", "arw": "阿拉瓦克语", "as": "阿萨姆语", "asa": "帕雷语", "ast": "阿斯图里亚斯语", "av": "阿瓦尔语", "awa": "阿瓦德语", "ay": "艾马拉语", "az": "阿塞拜疆语", "az-Arab": "南阿塞拜疆语", "ba": "巴什基尔语", "bal": "俾路支语", "ban": "巴厘语", "bas": "巴萨语", "bax": "巴姆穆语", "bbj": "戈马拉语", "be": "白俄罗斯语", "bej": "贝沙语", "bem": "本巴语", "bez": "贝纳语", "bfd": "巴非特语", "bg": "保加利亚语", "bgn": "西俾路支语", "bho": "博杰普尔语", "bi": "比斯拉马语", "bik": "比科尔语", "bin": "比尼语", "bkm": "科姆语", "bla": "西克西卡语", "bm": "班巴拉语", "bn": "孟加拉语", "bo": "藏语", "br": "布列塔尼语", "bra": "布拉杰语", "brx": "博多语", "bs": "波斯尼亚语", "bss": "阿库色语", "bua": "布里亚特语", "bug": "布吉语", "bum": "布鲁语", "byn": "比林语", "byv": "梅敦巴语", "ca": "加泰罗尼亚语", "cad": "卡多语", "car": "加勒比语", "cay": "卡尤加语", "cch": "阿灿语", "ccp": "查克玛语", "ce": "车臣语", "ceb": "宿务语", "cgg": "奇加语", "ch": "查莫罗语", "chb": "奇布查语", "chg": "察合台语", "chk": "楚克语", "chm": "马里语", "chn": "奇努克混合语", "cho": "乔克托语", "chp": "奇佩维安语", "chr": "切罗基语", "chy": "夏延语", "ckb": "中库尔德语", "co": "科西嘉语", "cop": "科普特语", "cr": "克里族语", "crh": "克里米亚土耳其语", "crs": "塞舌尔克里奥尔语", "cs": "捷克语", "csb": "卡舒比语", "cu": "教会斯拉夫语", "cv": "楚瓦什语", "cy": "威尔士语", "da": "丹麦语", "dak": "达科他语", "dar": "达尔格瓦语", "dav": "台塔语", "de": "德语", "de-AT": "奥地利德语", "de-CH": "瑞士高地德语", "del": "特拉华语", "den": "史拉维语", "dgr": "多格里布语", "din": "丁卡语", "dje": "哲尔马语", "doi": "多格拉语", "dsb": "下索布语", "dua": "都阿拉语", "dum": "中古荷兰语", "dv": "迪维希语", "dyo": "朱拉语", "dyu": "迪尤拉语", "dz": "宗卡语", "dzg": "达扎葛语", "ebu": "恩布语", "ee": "埃维语", "efi": "埃菲克语", "egy": "古埃及语", "eka": "艾卡朱克语", "el": "希腊语", "elx": "埃兰语", "en": "英语", "en-AU": "澳大利亚英语", "en-CA": "加拿大英语", "en-GB": "英国英语", "en-US": "美国英语", "enm": "中古英语", "eo": "世界语", "es": "西班牙语", "es-419": "拉丁美洲西班牙语", "es-ES": "欧洲西班牙语", "es-MX": "墨西哥西班牙语", "et": "爱沙尼亚语", "eu": "巴斯克语", "ewo": "旺杜语", "fa": "波斯语", "fan": "芳格语", "fat": "芳蒂语", "ff": "富拉语", "fi": "芬兰语", "fil": "菲律宾语", "fj": "斐济语", "fo": "法罗语", "fon": "丰语", "fr": "法语", "fr-CA": "加拿大法语", "fr-CH": "瑞士法语", "frc": "卡真法语", "frm": "中古法语", "fro": "古法语", "frr": "北弗里西亚语", "frs": "东弗里西亚语", "fur": "弗留利语", "fy": "西弗里西亚语", "ga": "爱尔兰语", "gaa": "加族语", "gag": "加告兹语", "gan": "赣语", "gay": "迦约语", "gba": "格巴亚语", "gd": "苏格兰盖尔语", "gez": "吉兹语", "gil": "吉尔伯特语", "gl": "加利西亚语", "gmh": "中古高地德语", "gn": "瓜拉尼语", "goh": "古高地德语", "gon": "冈德语", "gor": "哥伦打洛语", "got": "哥特语", "grb": "格列博语", "grc": "古希腊语", "gsw": "瑞士德语", "gu": "古吉拉特语", "guz": "古西语", "gv": "马恩语", "gwi": "哥威迅语", "ha": "豪萨语", "hai": "海达语", "hak": "客家语", "haw": "夏威夷语", "he": "希伯来语", "hi": "印地语", "hil": "希利盖农语", "hit": "赫梯语", "hmn": "苗语", "ho": "希里莫图语", "hr": "克罗地亚语", "hsb": "上索布语", "hsn": "湘语", "ht": "海地克里奥尔语", "hu": "匈牙利语", "hup": "胡帕语", "hy": "亚美尼亚语", "hz": "赫雷罗语", "ia": "国际语", "iba": "伊班语", "ibb": "伊比比奥语", "id": "印度尼西亚语", "ie": "国际文字（E）", "ig": "伊博语", "ii": "四川彝语", "ik": "伊努皮克语", "ilo": "伊洛卡诺语", "inh": "印古什语", "io": "伊多语", "is": "冰岛语", "it": "意大利语", "iu": "因纽特语", "ja": "日语", "jbo": "逻辑语", "jgo": "恩艮巴语", "jmc": "马切姆语", "jpr": "犹太波斯语", "jrb": "犹太阿拉伯语", "jv": "爪哇语", "ka": "格鲁吉亚语", "kaa": "卡拉卡尔帕克语", "kab": "卡拜尔语", "kac": "克钦语", "kaj": "卡捷语", "kam": "卡姆巴语", "kaw": "卡威语", "kbd": "卡巴尔德语", "kbl": "加涅姆布语", "kcg": "卡塔布语", "kde": "马孔德语", "kea": "卡布佛得鲁语", "kfo": "克罗语", "kg": "刚果语", "kha": "卡西语", "kho": "和田语", "khq": "西桑海语", "ki": "吉库尤语", "kj": "宽亚玛语", "kk": "哈萨克语", "kkj": "卡库语", "kl": "格陵兰语", "kln": "卡伦金语", "km": "高棉语", "kmb": "金邦杜语", "kn": "卡纳达语", "ko": "韩语", "koi": "科米-彼尔米亚克语", "kok": "孔卡尼语", "kos": "科斯拉伊语", "kpe": "克佩列语", "kr": "卡努里语", "krc": "卡拉恰伊巴尔卡尔语", "krl": "卡累利阿语", "kru": "库鲁克语", "ks": "克什米尔语", "ksb": "香巴拉语", "ksf": "巴菲亚语", "ksh": "科隆语", "ku": "库尔德语", "kum": "库梅克语", "kut": "库特奈语", "kv": "科米语", "kw": "康沃尔语", "ky": "柯尔克孜语", "la": "拉丁语", "lad": "拉迪诺语", "lag": "朗吉语", "lah": "印度-雅利安语", "lam": "兰巴语", "lb": "卢森堡语", "lez": "列兹金语", "lg": "卢干达语", "li": "林堡语", "lkt": "拉科塔语", "ln": "林加拉语", "lo": "老挝语", "lol": "蒙戈语", "lou": "路易斯安那克里奥尔语", "loz": "洛齐语", "lrc": "北卢尔语", "lt": "立陶宛语", "lu": "鲁巴加丹加语", "lua": "卢巴-卢拉语", "lui": "卢伊塞诺语", "lun": "隆达语", "luo": "卢奥语", "lus": "米佐语", "luy": "卢雅语", "lv": "拉脱维亚语", "mad": "马都拉语", "maf": "马法语", "mag": "摩揭陀语", "mai": "迈蒂利语", "mak": "望加锡语", "man": "曼丁哥语", "mas": "马赛语", "mde": "马坝语", "mdf": "莫克沙语", "mdr": "曼达尔语", "men": "门德语", "mer": "梅鲁语", "mfe": "毛里求斯克里奥尔语", "mg": "马拉加斯语", "mga": "中古爱尔兰语", "mgh": "马库阿语", "mgo": "梅塔语", "mh": "马绍尔语", "mi": "毛利语", "mic": "密克马克语", "min": "米南佳保语", "mk": "马其顿语", "ml": "马拉雅拉姆语", "mn": "蒙古语", "mnc": "满语", "mni": "曼尼普尔语", "moh": "摩霍克语", "mos": "莫西语", "mr": "马拉地语", "ms": "马来语", "mt": "马耳他语", "mua": "蒙当语", "mus": "克里克语", "mwl": "米兰德斯语", "mwr": "马尔瓦里语", "my": "缅甸语", "mye": "姆耶内语", "myv": "厄尔兹亚语", "mzn": "马赞德兰语", "na": "瑙鲁语", "nan": "闽南语", "nap": "那不勒斯语", "naq": "纳马语", "nb": "书面挪威语", "nd": "北恩德贝勒语", "nds": "低地德语", "nds-NL": "低萨克森语", "ne": "尼泊尔语", "new": "尼瓦尔语", "ng": "恩东加语", "nia": "尼亚斯语", "niu": "纽埃语", "nl": "荷兰语", "nl-BE": "弗拉芒语", "nmg": "夸西奥语", "nn": "挪威尼诺斯克语", "nnh": "恩甘澎语", "no": "挪威语", "nog": "诺盖语", "non": "古诺尔斯语", "nqo": "西非书面文字", "nr": "南恩德贝勒语", "nso": "北索托语", "nus": "努埃尔语", "nv": "纳瓦霍语", "nwc": "古典尼瓦尔语", "ny": "齐切瓦语", "nym": "尼扬韦齐语", "nyn": "尼昂科勒语", "nyo": "尼奥罗语", "nzi": "恩济马语", "oc": "奥克语", "oj": "奥吉布瓦语", "om": "奥罗莫语", "or": "奥里亚语", "os": "奥塞梯语", "osa": "奥塞治语", "ota": "奥斯曼土耳其语", "pa": "旁遮普语", "pag": "邦阿西南语", "pal": "巴拉维语", "pam": "邦板牙语", "pap": "帕皮阿门托语", "pau": "帕劳语", "pcm": "尼日利亚皮钦语", "peo": "古波斯语", "phn": "腓尼基语", "pi": "巴利语", "pl": "波兰语", "pon": "波纳佩语", "prg": "普鲁士语", "pro": "古普罗文斯语", "ps": "普什图语", "pt": "葡萄牙语", "pt-BR": "巴西葡萄牙语", "pt-PT": "欧洲葡萄牙语", "qu": "克丘亚语", "quc": "基切语", "raj": "拉贾斯坦语", "rap": "拉帕努伊语", "rar": "拉罗汤加语", "rm": "罗曼什语", "rn": "隆迪语", "ro": "罗马尼亚语", "ro-MD": "摩尔多瓦语", "rof": "兰博语", "rom": "吉普赛语", "root": "根语言", "ru": "俄语", "rup": "阿罗马尼亚语", "rw": "卢旺达语", "rwk": "罗瓦语", "sa": "梵语", "sad": "桑达韦语", "sah": "萨哈语", "sam": "萨马利亚阿拉姆语", "saq": "桑布鲁语", "sas": "萨萨克文", "sat": "桑塔利语", "sba": "甘拜语", "sbp": "桑古语", "sc": "萨丁语", "scn": "西西里语", "sco": "苏格兰语", "sd": "信德语", "sdh": "南库尔德语", "se": "北方萨米语", "see": "塞内卡语", "seh": "塞纳语", "sel": "塞尔库普语", "ses": "东桑海语", "sg": "桑戈语", "sga": "古爱尔兰语", "sh": "塞尔维亚-克罗地亚语", "shi": "希尔哈语", "shn": "掸语", "shu": "乍得阿拉伯语", "si": "僧伽罗语", "sid": "悉达摩语", "sk": "斯洛伐克语", "sl": "斯洛文尼亚语", "sm": "萨摩亚语", "sma": "南萨米语", "smj": "吕勒萨米语", "smn": "伊纳里萨米语", "sms": "斯科特萨米语", "sn": "绍纳语", "snk": "索宁克语", "so": "索马里语", "sog": "粟特语", "sq": "阿尔巴尼亚语", "sr": "塞尔维亚语", "srn": "苏里南汤加语", "srr": "塞雷尔语", "ss": "斯瓦蒂语", "ssy": "萨霍语", "st": "南索托语", "su": "巽他语", "suk": "苏库马语", "sus": "苏苏语", "sux": "苏美尔语", "sv": "瑞典语", "sw": "斯瓦希里语", "sw-CD": "刚果斯瓦希里语", "swb": "科摩罗语", "syc": "古典叙利亚语", "syr": "叙利亚语", "ta": "泰米尔语", "te": "泰卢固语", "tem": "泰姆奈语", "teo": "特索语", "ter": "特伦诺语", "tet": "德顿语", "tg": "塔吉克语", "th": "泰语", "ti": "提格利尼亚语", "tig": "提格雷语", "tiv": "蒂夫语", "tk": "土库曼语", "tkl": "托克劳语", "tl": "他加禄语", "tlh": "克林贡语", "tli": "特林吉特语", "tmh": "塔马奇克语", "tn": "茨瓦纳语", "to": "汤加语", "tog": "尼亚萨汤加语", "tpi": "托克皮辛语", "tr": "土耳其语", "trv": "赛德克语", "ts": "聪加语", "tsi": "钦西安语", "tt": "鞑靼语", "tum": "通布卡语", "tvl": "图瓦卢语", "tw": "契维语", "twq": "北桑海语", "ty": "塔希提语", "tyv": "图瓦语", "tzm": "塔马齐格特语", "udm": "乌德穆尔特语", "ug": "维吾尔语", "uga": "乌加里特语", "uk": "乌克兰语", "umb": "翁本杜语", "ur": "乌尔都语", "uz": "乌兹别克语", "vai": "瓦伊语", "ve": "文达语", "vep": "维普森语", "vi": "越南语", "vo": "沃拉普克语", "vot": "沃提克语", "vun": "温旧语", "wa": "瓦隆语", "wae": "瓦尔瑟语", "wal": "瓦拉莫语", "war": "瓦瑞语", "was": "瓦绍语", "wbp": "瓦尔皮瑞语", "wo": "沃洛夫语", "wuu": "吴语", "xal": "卡尔梅克语", "xh": "科萨语", "xog": "索加语", "yao": "瑶族语", "yap": "雅浦语", "yav": "洋卞语", "ybb": "耶姆巴语", "yi": "意第绪语", "yo": "约鲁巴语", "yue": "粤语", "za": "壮语", "zap": "萨波蒂克语", "zbl": "布里斯符号", "zen": "泽纳加语", "zgh": "标准摩洛哥塔马塞特语", "zh": "中文", "zh-Hans": "简体中文", "zh-Hant": "繁体中文", "zu": "祖鲁语", "zun": "祖尼语", "zza": "扎扎语"}, "scriptNames": {"Cyrl": "西里尔文", "Latn": "拉丁文", "Arab": "阿拉伯文", "Guru": "果鲁穆奇文", "Tfng": "提非纳文", "Vaii": "瓦依文", "Hans": "简体", "Hant": "繁体"}}
+    "zh-TW": {"rtl": false, "languageNames": {"aa": "阿法文", "ab": "阿布哈茲文", "ace": "亞齊文", "ach": "阿僑利文", "ada": "阿當莫文", "ady": "阿迪各文", "ae": "阿維斯塔文", "aeb": "突尼斯阿拉伯文", "af": "南非荷蘭文", "afh": "阿弗里希利文", "agq": "亞罕文", "ain": "阿伊努文", "ak": "阿坎文", "akk": "阿卡德文", "akz": "阿拉巴馬文", "ale": "阿留申文", "aln": "蓋格阿爾巴尼亞文", "alt": "南阿爾泰文", "am": "阿姆哈拉文", "an": "阿拉貢文", "ang": "古英文", "anp": "昂加文", "ar": "阿拉伯文", "ar-001": "現代標準阿拉伯文", "arc": "阿拉米文", "arn": "馬普切文", "aro": "阿拉奧納文", "arp": "阿拉帕霍文", "arq": "阿爾及利亞阿拉伯文", "ars": "納吉迪阿拉伯文", "arw": "阿拉瓦克文", "ary": "摩洛哥阿拉伯文", "arz": "埃及阿拉伯文", "as": "阿薩姆文", "asa": "阿蘇文", "ase": "美國手語", "ast": "阿斯圖里亞文", "av": "阿瓦爾文", "avk": "科塔瓦文", "awa": "阿瓦文", "ay": "艾馬拉文", "az": "亞塞拜然文", "ba": "巴什喀爾文", "bal": "俾路支文", "ban": "峇里文", "bar": "巴伐利亞文", "bas": "巴薩文", "bax": "巴姆穆文", "bbc": "巴塔克托巴文", "bbj": "戈馬拉文", "be": "白俄羅斯文", "bej": "貝扎文", "bem": "別姆巴文", "bew": "貝塔維文", "bez": "貝納文", "bfd": "富特文", "bfq": "巴達加文", "bg": "保加利亞文", "bgn": "西俾路支文", "bho": "博傑普爾文", "bi": "比斯拉馬文", "bik": "比科爾文", "bin": "比尼文", "bjn": "班亞爾文", "bkm": "康姆文", "bla": "錫克錫卡文", "bm": "班巴拉文", "bn": "孟加拉文", "bo": "藏文", "bpy": "比什奴普萊利亞文", "bqi": "巴赫蒂亞里文", "br": "布列塔尼文", "bra": "布拉杰文", "brh": "布拉維文", "brx": "博多文", "bs": "波士尼亞文", "bss": "阿庫色文", "bua": "布里阿特文", "bug": "布吉斯文", "bum": "布魯文", "byn": "比林文", "byv": "梅敦巴文", "ca": "加泰蘭文", "cad": "卡多文", "car": "加勒比文", "cay": "卡尤加文", "cch": "阿燦文", "ccp": "查克馬文", "ce": "車臣文", "ceb": "宿霧文", "cgg": "奇加文", "ch": "查莫洛文", "chb": "奇布查文", "chg": "查加文", "chk": "處奇斯文", "chm": "馬里文", "chn": "契奴克文", "cho": "喬克托文", "chp": "奇佩瓦揚文", "chr": "柴羅基文", "chy": "沙伊安文", "ckb": "中庫德文", "co": "科西嘉文", "cop": "科普特文", "cps": "卡皮茲文", "cr": "克里文", "crh": "土耳其文（克里米亞半島）", "crs": "塞席爾克里奧爾法文", "cs": "捷克文", "csb": "卡舒布文", "cu": "宗教斯拉夫文", "cv": "楚瓦什文", "cy": "威爾斯文", "da": "丹麥文", "dak": "達科他文", "dar": "達爾格瓦文", "dav": "台塔文", "de": "德文", "de-AT": "德文（奧地利）", "de-CH": "高地德文（瑞士）", "del": "德拉瓦文", "den": "斯拉夫", "dgr": "多格里布文", "din": "丁卡文", "dje": "扎爾馬文", "doi": "多格來文", "dsb": "下索布文", "dtp": "中部杜順文", "dua": "杜亞拉文", "dum": "中古荷蘭文", "dv": "迪維西文", "dyo": "朱拉文", "dyu": "迪尤拉文", "dz": "宗卡文", "dzg": "達薩文", "ebu": "恩布文", "ee": "埃維文", "efi": "埃菲克文", "egl": "埃米利安文", "egy": "古埃及文", "eka": "艾卡朱克文", "el": "希臘文", "elx": "埃蘭文", "en": "英文", "en-AU": "英文（澳洲）", "en-CA": "英文（加拿大）", "en-GB": "英文（英國）", "en-US": "英文（美國）", "enm": "中古英文", "eo": "世界文", "es": "西班牙文", "es-419": "西班牙文（拉丁美洲）", "es-ES": "西班牙文（西班牙）", "es-MX": "西班牙文（墨西哥）", "esu": "中尤皮克文", "et": "愛沙尼亞文", "eu": "巴斯克文", "ewo": "依汪都文", "ext": "埃斯特雷馬杜拉文", "fa": "波斯文", "fan": "芳族文", "fat": "芳蒂文", "ff": "富拉文", "fi": "芬蘭文", "fil": "菲律賓文", "fit": "托爾訥芬蘭文", "fj": "斐濟文", "fo": "法羅文", "fon": "豐文", "fr": "法文", "fr-CA": "法文（加拿大）", "fr-CH": "法文（瑞士）", "frc": "卡真法文", "frm": "中古法文", "fro": "古法文", "frp": "法蘭克-普羅旺斯文", "frr": "北弗里西亞文", "frs": "東弗里西亞文", "fur": "弗留利文", "fy": "西弗里西亞文", "ga": "愛爾蘭文", "gaa": "加族文", "gag": "加告茲文", "gan": "贛語", "gay": "加約文", "gba": "葛巴亞文", "gbz": "索羅亞斯德教達里文", "gd": "蘇格蘭蓋爾文", "gez": "吉茲文", "gil": "吉爾伯特群島文", "gl": "加利西亞文", "glk": "吉拉基文", "gmh": "中古高地德文", "gn": "瓜拉尼文", "goh": "古高地德文", "gom": "孔卡尼文", "gon": "岡德文", "gor": "科隆達羅文", "got": "哥德文", "grb": "格列博文", "grc": "古希臘文", "gsw": "德文（瑞士）", "gu": "古吉拉特文", "guc": "瓦尤文", "gur": "弗拉弗拉文", "guz": "古西文", "gv": "曼島文", "gwi": "圭契文", "ha": "豪撒文", "hai": "海達文", "hak": "客家話", "haw": "夏威夷文", "he": "希伯來文", "hi": "印地文", "hif": "斐濟印地文", "hil": "希利蓋農文", "hit": "赫梯文", "hmn": "孟文", "ho": "西里莫圖土文", "hr": "克羅埃西亞文", "hsb": "上索布文", "hsn": "湘語", "ht": "海地文", "hu": "匈牙利文", "hup": "胡帕文", "hy": "亞美尼亞文", "hz": "赫雷羅文", "ia": "國際文", "iba": "伊班文", "ibb": "伊比比奧文", "id": "印尼文", "ie": "國際文（E）", "ig": "伊布文", "ii": "四川彝文", "ik": "依奴皮維克文", "ilo": "伊洛闊文", "inh": "印古什文", "io": "伊多文", "is": "冰島文", "it": "義大利文", "iu": "因紐特文", "izh": "英格里亞文", "ja": "日文", "jam": "牙買加克里奧爾英文", "jbo": "邏輯文", "jgo": "恩格姆巴文", "jmc": "馬恰美文", "jpr": "猶太教-波斯文", "jrb": "猶太阿拉伯文", "jut": "日德蘭文", "jv": "爪哇文", "ka": "喬治亞文", "kaa": "卡拉卡爾帕克文", "kab": "卡比爾文", "kac": "卡琴文", "kaj": "卡捷文", "kam": "卡姆巴文", "kaw": "卡威文", "kbd": "卡巴爾達文", "kbl": "卡念布文", "kcg": "卡塔布文", "kde": "馬孔德文", "kea": "卡布威爾第文", "ken": "肯揚文", "kfo": "科羅文", "kg": "剛果文", "kgp": "坎剛文", "kha": "卡西文", "kho": "和闐文", "khq": "西桑海文", "khw": "科瓦文", "ki": "吉庫尤文", "kiu": "北紮紮其文", "kj": "廣亞馬文", "kk": "哈薩克文", "kkj": "卡庫文", "kl": "格陵蘭文", "kln": "卡倫金文", "km": "高棉文", "kmb": "金邦杜文", "kn": "坎那達文", "ko": "韓文", "koi": "科米-彼爾米亞克文", "kok": "貢根文", "kos": "科斯雷恩文", "kpe": "克佩列文", "kr": "卡努里文", "krc": "卡拉柴-包爾卡爾文", "kri": "塞拉利昂克裏奧爾文", "krj": "基那來阿文", "krl": "卡累利阿文", "kru": "庫魯科文", "ks": "喀什米爾文", "ksb": "尚巴拉文", "ksf": "巴菲亞文", "ksh": "科隆文", "ku": "庫德文", "kum": "庫密克文", "kut": "庫特奈文", "kv": "科米文", "kw": "康瓦耳文", "ky": "吉爾吉斯文", "la": "拉丁文", "lad": "拉迪諾文", "lag": "朗吉文", "lah": "拉亨達文", "lam": "蘭巴文", "lb": "盧森堡文", "lez": "列茲干文", "lfn": "新共同語言", "lg": "干達文", "li": "林堡文", "lij": "利古里亞文", "liv": "利伏尼亞文", "lkt": "拉科塔文", "lmo": "倫巴底文", "ln": "林加拉文", "lo": "寮文", "lol": "芒戈文", "lou": "路易斯安那克里奧爾文", "loz": "洛齊文", "lrc": "北盧爾文", "lt": "立陶宛文", "ltg": "拉特加萊文", "lu": "魯巴加丹加文", "lua": "魯巴魯魯亞文", "lui": "路易塞諾文", "lun": "盧恩達文", "luo": "盧奧文", "lus": "米佐文", "luy": "盧雅文", "lv": "拉脫維亞文", "lzh": "文言文", "lzz": "拉茲文", "mad": "馬都拉文", "maf": "馬法文", "mag": "馬加伊文", "mai": "邁蒂利文", "mak": "望加錫文", "man": "曼丁哥文", "mas": "馬賽文", "mde": "馬巴文", "mdf": "莫克沙文", "mdr": "曼達文", "men": "門德文", "mer": "梅魯文", "mfe": "克里奧文（模里西斯）", "mg": "馬達加斯加文", "mga": "中古愛爾蘭文", "mgh": "馬夸文", "mgo": "美塔文", "mh": "馬紹爾文", "mi": "毛利文", "mic": "米克馬克文", "min": "米南卡堡文", "mk": "馬其頓文", "ml": "馬來亞拉姆文", "mn": "蒙古文", "mnc": "滿族文", "mni": "曼尼普爾文", "moh": "莫霍克文", "mos": "莫西文", "mr": "馬拉地文", "mrj": "西馬里文", "ms": "馬來文", "mt": "馬爾他文", "mua": "蒙當文", "mus": "克里克文", "mwl": "米蘭德斯文", "mwr": "馬瓦里文", "mwv": "明打威文", "my": "緬甸文", "mye": "姆耶內文", "myv": "厄爾茲亞文", "mzn": "馬贊德蘭文", "na": "諾魯文", "nan": "閩南語", "nap": "拿波里文", "naq": "納馬文", "nb": "巴克摩挪威文", "nd": "北地畢列文", "nds": "低地德文", "nds-NL": "低地薩克遜文", "ne": "尼泊爾文", "new": "尼瓦爾文", "ng": "恩東加文", "nia": "尼亞斯文", "niu": "紐埃文", "njo": "阿沃那加文", "nl": "荷蘭文", "nl-BE": "佛蘭芒文", "nmg": "夸西奧文", "nn": "耐諾斯克挪威文", "nnh": "恩甘澎文", "no": "挪威文", "nog": "諾蓋文", "non": "古諾爾斯文", "nov": "諾維亞文", "nqo": "曼德文字 (N’Ko)", "nr": "南地畢列文", "nso": "北索托文", "nus": "努埃爾文", "nv": "納瓦霍文", "nwc": "古尼瓦爾文", "ny": "尼揚賈文", "nym": "尼揚韋齊文", "nyn": "尼揚科萊文", "nyo": "尼奧囉文", "nzi": "尼茲馬文", "oc": "奧克西坦文", "oj": "奧杰布瓦文", "om": "奧羅莫文", "or": "歐迪亞文", "os": "奧塞提文", "osa": "歐塞奇文", "ota": "鄂圖曼土耳其文", "pa": "旁遮普文", "pag": "潘加辛文", "pal": "巴列維文", "pam": "潘帕嘉文", "pap": "帕皮阿門托文", "pau": "帛琉文", "pcd": "庇卡底文", "pcm": "奈及利亞皮欽文", "pdc": "賓夕法尼亞德文", "pdt": "門諾低地德文", "peo": "古波斯文", "pfl": "普法爾茨德文", "phn": "腓尼基文", "pi": "巴利文", "pl": "波蘭文", "pms": "皮埃蒙特文", "pnt": "旁狄希臘文", "pon": "波那貝文", "prg": "普魯士文", "pro": "古普羅旺斯文", "ps": "普什圖文", "pt": "葡萄牙文", "pt-BR": "葡萄牙文（巴西）", "pt-PT": "葡萄牙文（葡萄牙）", "qu": "蓋楚瓦文", "quc": "基切文", "qug": "欽博拉索海蘭蓋丘亞文", "raj": "拉賈斯坦諸文", "rap": "復活島文", "rar": "拉羅通加文", "rgn": "羅馬格諾里文", "rif": "里菲亞諾文", "rm": "羅曼斯文", "rn": "隆迪文", "ro": "羅馬尼亞文", "ro-MD": "摩爾多瓦文", "rof": "蘭博文", "rom": "吉普賽文", "root": "根語言", "rtm": "羅圖馬島文", "ru": "俄文", "rue": "盧森尼亞文", "rug": "羅維阿納文", "rup": "羅馬尼亞語系", "rw": "盧安達文", "rwk": "羅瓦文", "sa": "梵文", "sad": "桑達韋文", "sah": "雅庫特文", "sam": "薩瑪利亞阿拉姆文", "saq": "薩布魯文", "sas": "撒撒克文", "sat": "桑塔利文", "saz": "索拉什特拉文", "sba": "甘拜文", "sbp": "桑古文", "sc": "撒丁文", "scn": "西西里文", "sco": "蘇格蘭文", "sd": "信德文", "sdc": "薩丁尼亞-薩薩里文", "sdh": "南庫德文", "se": "北薩米文", "see": "塞訥卡文", "seh": "賽納文", "sei": "瑟里文", "sel": "塞爾庫普文", "ses": "東桑海文", "sg": "桑戈文", "sga": "古愛爾蘭文", "sgs": "薩莫吉希亞文", "sh": "塞爾維亞克羅埃西亞文", "shi": "希爾哈文", "shn": "撣文", "shu": "阿拉伯文（查德）", "si": "僧伽羅文", "sid": "希達摩文", "sk": "斯洛伐克文", "sl": "斯洛維尼亞文", "sli": "下西利西亞文", "sly": "塞拉亞文", "sm": "薩摩亞文", "sma": "南薩米文", "smj": "魯勒薩米文", "smn": "伊納里薩米文", "sms": "斯科特薩米文", "sn": "紹納文", "snk": "索尼基文", "so": "索馬利文", "sog": "索格底亞納文", "sq": "阿爾巴尼亞文", "sr": "塞爾維亞文", "srn": "蘇拉南東墎文", "srr": "塞雷爾文", "ss": "斯瓦特文", "ssy": "薩霍文", "st": "塞索托文", "stq": "沙特菲士蘭文", "su": "巽他文", "suk": "蘇庫馬文", "sus": "蘇蘇文", "sux": "蘇美文", "sv": "瑞典文", "sw": "史瓦希里文", "sw-CD": "史瓦希里文（剛果）", "swb": "葛摩文", "syc": "古敘利亞文", "syr": "敘利亞文", "szl": "西利西亞文", "ta": "坦米爾文", "tcy": "圖盧文", "te": "泰盧固文", "tem": "提姆文", "teo": "特索文", "ter": "泰雷諾文", "tet": "泰頓文", "tg": "塔吉克文", "th": "泰文", "ti": "提格利尼亞文", "tig": "蒂格雷文", "tiv": "提夫文", "tk": "土庫曼文", "tkl": "托克勞文", "tkr": "查庫爾文", "tl": "塔加路族文", "tlh": "克林貢文", "tli": "特林基特文", "tly": "塔里什文", "tmh": "塔馬奇克文", "tn": "塞茲瓦納文", "to": "東加文", "tog": "東加文（尼亞薩）", "tpi": "托比辛文", "tr": "土耳其文", "tru": "圖羅尤文", "trv": "太魯閣文", "ts": "特松加文", "tsd": "特薩克尼恩文", "tsi": "欽西安文", "tt": "韃靼文", "ttt": "穆斯林塔特文", "tum": "圖姆布卡文", "tvl": "吐瓦魯文", "tw": "特威文", "twq": "北桑海文", "ty": "大溪地文", "tyv": "圖瓦文", "tzm": "中阿特拉斯塔馬塞特文", "udm": "烏德穆爾特文", "ug": "維吾爾文", "uga": "烏加列文", "uk": "烏克蘭文", "umb": "姆本杜文", "ur": "烏都文", "uz": "烏茲別克文", "vai": "瓦伊文", "ve": "溫達文", "vec": "威尼斯文", "vep": "維普森文", "vi": "越南文", "vls": "西佛蘭德文", "vmf": "美茵-法蘭克尼亞文", "vo": "沃拉普克文", "vot": "沃提克文", "vro": "佛羅文", "vun": "溫舊文", "wa": "瓦隆文", "wae": "瓦爾瑟文", "wal": "瓦拉莫文", "war": "瓦瑞文", "was": "瓦紹文", "wbp": "沃皮瑞文", "wo": "沃洛夫文", "wuu": "吳語", "xal": "卡爾梅克文", "xh": "科薩文", "xmf": "明格列爾文", "xog": "索加文", "yao": "瑤文", "yap": "雅浦文", "yav": "洋卞文", "ybb": "耶姆巴文", "yi": "意第緒文", "yo": "約魯巴文", "yrl": "奈恩加圖文", "yue": "粵語", "za": "壯文", "zap": "薩波特克文", "zbl": "布列斯符號", "zea": "西蘭文", "zen": "澤納加文", "zgh": "標準摩洛哥塔馬塞特文", "zh": "中文", "zh-Hans": "簡體中文", "zh-Hant": "繁體中文", "zu": "祖魯文", "zun": "祖尼文", "zza": "扎扎文"}, "scriptNames": {"Cyrl": "斯拉夫文", "Latn": "拉丁文", "Arab": "阿拉伯文", "Guru": "古魯穆奇文", "Tfng": "提非納文", "Vaii": "瓦依文", "Hans": "簡體", "Hant": "繁體"}}
   }
 }
\ No newline at end of file
diff --git a/data/presets.yaml b/data/presets.yaml
index e50b8d74c..2607d38bc 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -277,6 +277,18 @@ en:
         label: Waste Bin
         # 'terms: garbage can,trash can'
         terms: '[translate with synonyms or related terms for ''Waste Bin'', separated by commas]'
+      blind:
+        # blind=*
+        label: Blind Person Access
+        options:
+          # blind=limited
+          limited: Limited
+          # blind=no
+          'no': 'No'
+          # blind=yes
+          'yes': 'Yes'
+        # 'terms: sight impairment,vision impairment'
+        terms: '[translate with synonyms or related terms for ''Blind Person Access'', separated by commas]'
       blood_components:
         # 'blood:=*'
         label: Blood Components
@@ -292,6 +304,9 @@ en:
       board_type:
         # board_type=*
         label: Type
+      bollard:
+        # bollard=*
+        label: Type
       booth:
         # booth=*
         label: Booth
@@ -445,6 +460,9 @@ en:
           forward: Forward
           # conveying=reversible
           reversible: Reversible
+      conveying_escalator:
+        # conveying=*
+        label: Escalator
       country:
         # country=*
         label: Country
@@ -879,6 +897,7 @@ en:
       handrail:
         # handrail=*
         label: Handrail
+        terms: '[translate with synonyms or related terms for ''Handrail'', separated by commas]'
       hashtags:
         # hashtags=*
         label: Suggested Hashtags
@@ -996,6 +1015,10 @@ en:
       industrial:
         # industrial=*
         label: Type
+      informal:
+        # informal=*
+        label: Informal
+        terms: '[translate with synonyms or related terms for ''Informal'', separated by commas]'
       information:
         # information=*
         label: Type
@@ -1144,6 +1167,11 @@ en:
         label: Level
         # 'terms: building floor,deck,storey,story'
         terms: '[translate with synonyms or related terms for ''Level'', separated by commas]'
+      level_semi:
+        # level=*
+        label: Levels
+        # 'terms: building floors,decks,stories,storeys,storys'
+        terms: '[translate with synonyms or related terms for ''Levels'', separated by commas]'
       levels:
         # 'building:levels=*'
         label: Levels
@@ -1178,6 +1206,10 @@ en:
       lock:
         # lock=*
         label: Lock
+      lockable:
+        # lockable=*
+        label: Lockable
+        terms: '[translate with synonyms or related terms for ''Lockable'', separated by commas]'
       man_made:
         # man_made=*
         label: Type
@@ -1645,6 +1677,9 @@ en:
       playground:
         # playground=*
         label: Type
+      playground/theme:
+        # 'playground:theme=*'
+        label: Theme
       polling_station:
         # polling_station=*
         label: Polling Place
@@ -1775,6 +1810,9 @@ en:
           # reservation=yes
           'yes': Accepted
         terms: '[translate with synonyms or related terms for ''Reservations'', separated by commas]'
+      residential:
+        # residential=*
+        label: Type
       resort:
         # resort=*
         label: Type
@@ -2111,6 +2149,10 @@ en:
       step_count:
         # step_count=*
         label: Number of Steps
+        terms: '[translate with synonyms or related terms for ''Number of Steps'', separated by commas]'
+      stile:
+        # stile=*
+        label: Type
       stop:
         # stop=*
         label: Stop Type
@@ -2125,6 +2167,13 @@ en:
       stroller:
         # stroller=*
         label: Stroller Access
+        options:
+          # stroller=limited
+          limited: Limited
+          # stroller=no
+          'no': 'No'
+          # stroller=yes
+          'yes': 'Yes'
         # 'terms: baby carriage,perambulator,pram,pushchair'
         terms: '[translate with synonyms or related terms for ''Stroller Access'', separated by commas]'
       structure:
@@ -2143,6 +2192,7 @@ en:
           tunnel: Tunnel
         # structure field placeholder
         placeholder: Unknown
+        terms: '[translate with synonyms or related terms for ''Structure'', separated by commas]'
       structure_waterway:
         # tunnel=*
         label: Structure
@@ -2171,6 +2221,7 @@ en:
       surface:
         # surface=*
         label: Surface
+        terms: '[translate with synonyms or related terms for ''Surface'', separated by commas]'
       surveillance:
         # surveillance=*
         label: Surveillance Kind
@@ -2481,6 +2532,13 @@ en:
       wheelchair:
         # wheelchair=*
         label: Wheelchair Access
+        options:
+          # wheelchair=limited
+          limited: Limited
+          # wheelchair=no
+          'no': 'No'
+          # wheelchair=yes
+          'yes': 'Yes'
         # 'terms: handicap access'
         terms: '[translate with synonyms or related terms for ''Wheelchair Access'', separated by commas]'
       wholesale:
@@ -2647,6 +2705,11 @@ en:
         name: Runway
         # 'terms: landing strip'
         terms: '<translate with synonyms or related terms for ''Runway'', separated by commas>'
+      aeroway/spaceport:
+        # aeroway=spaceport
+        name: Spaceport
+        # 'terms: cosmodrome,rocket launch center,rocket launch complex,rocket launch site,rocket range,space port'
+        terms: '<translate with synonyms or related terms for ''Spaceport'', separated by commas>'
       aeroway/taxiway:
         # aeroway=taxiway
         name: Taxiway
@@ -2719,32 +2782,32 @@ en:
       amenity/bicycle_parking:
         # amenity=bicycle_parking
         name: Bicycle Parking
-        # 'terms: bike'
+        # 'terms: bike,cycle parking,cycling'
         terms: '<translate with synonyms or related terms for ''Bicycle Parking'', separated by commas>'
       amenity/bicycle_parking/building:
         # 'amenity=bicycle_parking, bicycle_parking=building'
         name: Bicycle Parking Garage
-        # 'terms: Multi-Storey Bicycle Park,Multi-Storey Bike Park,Bike Parking Station'
+        # 'terms: Bike Parking Station,cycle parking,cycling,Multi-Storey Bicycle Park,Multi-Storey Bike Park'
         terms: '<translate with synonyms or related terms for ''Bicycle Parking Garage'', separated by commas>'
       amenity/bicycle_parking/lockers:
         # 'amenity=bicycle_parking, bicycle_parking=lockers'
         name: Bicycle Lockers
-        # 'terms: Bike Lockers'
+        # 'terms: cycle locker,cycling,Bike Lockers'
         terms: '<translate with synonyms or related terms for ''Bicycle Lockers'', separated by commas>'
       amenity/bicycle_parking/shed:
         # 'amenity=bicycle_parking, bicycle_parking=shed'
         name: Bicycle Shed
-        # 'terms: Bike Shed'
+        # 'terms: cycle shed,cycling,Bike Shed'
         terms: '<translate with synonyms or related terms for ''Bicycle Shed'', separated by commas>'
       amenity/bicycle_rental:
         # amenity=bicycle_rental
         name: Bicycle Rental
-        # 'terms: bike,bicycle,bikeshare,bike share,bicycle share,hub,dock'
+        # 'terms: bike,bicycle,bikeshare,bike share,bicycle share,cycle dock,cycle hub,cycleshare,cycling'
         terms: '<translate with synonyms or related terms for ''Bicycle Rental'', separated by commas>'
       amenity/bicycle_repair_station:
         # amenity=bicycle_repair_station
         name: Bicycle Repair Tool Stand
-        # 'terms: bike,repair,chain,pump,tools,stand,multitool'
+        # 'terms: bike chain,bike multitool,bike repair,bike tools,cycle pump,cycle repair,cycling'
         terms: '<translate with synonyms or related terms for ''Bicycle Repair Tool Stand'', separated by commas>'
       amenity/biergarten:
         # amenity=biergarten
@@ -2931,6 +2994,11 @@ en:
         name: Fish & Chips Fast Food
         # 'terms: breakfast,cafe,café,dine,dining,dinner,drive-in,eat,grill,lunch,table,french fries'
         terms: '<translate with synonyms or related terms for ''Fish & Chips Fast Food'', separated by commas>'
+      amenity/fast_food/hot_dog:
+        # 'amenity=fast_food, cuisine=hot_dog'
+        name: Hot Dog Fast Food
+        # 'terms: ballpark,frankfurter,frank,hotdog stand,sandwich,sausage,wiener'
+        terms: '<translate with synonyms or related terms for ''Hot Dog Fast Food'', separated by commas>'
       amenity/fast_food/ice_cream:
         # 'amenity=fast_food, cuisine=ice_cream'
         name: Ice Cream Fast Food
@@ -3029,6 +3097,11 @@ en:
         name: Library
         # 'terms: book'
         terms: '<translate with synonyms or related terms for ''Library'', separated by commas>'
+      amenity/loading_dock:
+        # amenity=loading_dock
+        name: Loading Dock
+        # 'terms: door,loading bay,shipping,unloading,warehouse'
+        terms: '<translate with synonyms or related terms for ''Loading Dock'', separated by commas>'
       amenity/love_hotel:
         # amenity=love_hotel
         name: Love Hotel
@@ -3450,6 +3523,26 @@ en:
         name: Studio
         # 'terms: recording,radio,television'
         terms: '<translate with synonyms or related terms for ''Studio'', separated by commas>'
+      amenity/studio/audio:
+        # 'amenity=studio, studio=audio'
+        name: Recording Studio
+        # 'terms: audio mixing,audio production,audio recording,audio studio'
+        terms: '<translate with synonyms or related terms for ''Recording Studio'', separated by commas>'
+      amenity/studio/radio:
+        # 'amenity=studio, studio=radio'
+        name: Radio Station
+        # 'terms: am radio,fm radio,radio broadcast,radio studio'
+        terms: '<translate with synonyms or related terms for ''Radio Station'', separated by commas>'
+      amenity/studio/television:
+        # 'amenity=studio, studio=television'
+        name: Television Station
+        # 'terms: television broadcast,television studio,tv broadcast,tv station,tv studio'
+        terms: '<translate with synonyms or related terms for ''Television Station'', separated by commas>'
+      amenity/studio/video:
+        # 'amenity=studio, studio=video'
+        name: Film Studio
+        # 'terms: movie production,movie studio,video production,video recording,video studio'
+        terms: '<translate with synonyms or related terms for ''Film Studio'', separated by commas>'
       amenity/swimming_pool:
         # amenity=swimming_pool
         name: Swimming Pool
@@ -3640,6 +3733,11 @@ en:
         # amenity=watering_place
         name: Animal Watering Place
         terms: '<translate with synonyms or related terms for ''Animal Watering Place'', separated by commas>'
+      amenity/weighbridge:
+        # amenity=weighbridge
+        name: Truck Scale
+        # 'terms: weigh station,weighbridge'
+        terms: '<translate with synonyms or related terms for ''Truck Scale'', separated by commas>'
       area:
         # area=yes
         name: Area
@@ -3670,9 +3768,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Big Wheel'', separated by commas>'
       attraction/bumper_car:
         # attraction=bumper_car
-        name: Bumper Car
+        name: Bumper Cars
         # 'terms: theme park,dodgem cars,autoscooter'
-        terms: '<translate with synonyms or related terms for ''Bumper Car'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Bumper Cars'', separated by commas>'
       attraction/bungee_jumping:
         # attraction=bungee_jumping
         name: Bungee Jumping
@@ -3740,6 +3838,10 @@ en:
         # barrier=bollard
         name: Bollard
         terms: '<translate with synonyms or related terms for ''Bollard'', separated by commas>'
+      barrier/bollard_line:
+        # barrier=bollard
+        name: Bollard Row
+        terms: '<translate with synonyms or related terms for ''Bollard Row'', separated by commas>'
       barrier/border_control:
         # barrier=border_control
         name: Border Control
@@ -4609,7 +4711,7 @@ en:
       highway/cycleway:
         # highway=cycleway
         name: Cycle Path
-        # 'terms: bike path,bicyle path'
+        # 'terms: bicyle path,bike path,cycling path'
         terms: '<translate with synonyms or related terms for ''Cycle Path'', separated by commas>'
       highway/cycleway/bicycle_foot:
         # 'highway=cycleway, foot=designated'
@@ -4727,6 +4829,11 @@ en:
         name: Path
         # 'terms: hike,hiking,trackway,trail,walk'
         terms: '<translate with synonyms or related terms for ''Path'', separated by commas>'
+      highway/path/informal:
+        # 'highway=path, informal=yes'
+        name: Informal Path
+        # 'terms: bootleg trail,cow path,desire line,desire path,desireline,desirepath,elephant path,game trail,goat track,herd path,pig trail,shortcut,social trail,use trail'
+        terms: '<translate with synonyms or related terms for ''Informal Path'', separated by commas>'
       highway/pedestrian_area:
         # 'highway=pedestrian, area=yes'
         name: Pedestrian Area
@@ -4998,11 +5105,21 @@ en:
         name: Indoor Door
         # 'terms: doorframe,doorway,portal,room access,threshold'
         terms: '<translate with synonyms or related terms for ''Indoor Door'', separated by commas>'
+      indoor/elevator:
+        # 'indoor=room, elevator=yes'
+        name: Indoor Elevator Shaft
+        # 'terms: elevator,lift'
+        terms: '<translate with synonyms or related terms for ''Indoor Elevator Shaft'', separated by commas>'
       indoor/room:
         # indoor=room
         name: Room
         # 'terms: antechamber,anteroom,atrium,cell,chamber,concourse,foyer,indoor room,lobby,vestibule'
         terms: '<translate with synonyms or related terms for ''Room'', separated by commas>'
+      indoor/stairs:
+        # 'indoor=room, stairs=yes'
+        name: Indoor Stairwell
+        # 'terms: stair,stairs,staircase,stairway,stairwell,steps'
+        terms: '<translate with synonyms or related terms for ''Indoor Stairwell'', separated by commas>'
       indoor/wall:
         # indoor=wall
         name: Indoor Wall
@@ -5870,6 +5987,10 @@ en:
         name: Tunnel
         # 'terms: bore,dig,shaft,underground passage,underpass'
         terms: '<translate with synonyms or related terms for ''Tunnel'', separated by commas>'
+      man_made/utility_pole:
+        # man_made=utility_pole
+        name: Utility Pole
+        terms: '<translate with synonyms or related terms for ''Utility Pole'', separated by commas>'
       man_made/wastewater_plant:
         # man_made=wastewater_plant
         name: Wastewater Plant
@@ -6314,6 +6435,7 @@ en:
       office/research:
         # office=research
         name: Research Office
+        # 'terms: R and D,research and development,research lab'
         terms: '<translate with synonyms or related terms for ''Research Office'', separated by commas>'
       office/surveyor:
         # office=surveyor
@@ -7212,7 +7334,7 @@ en:
       shop/farm:
         # shop=farm
         name: Produce Stand
-        # 'terms: farm shop,farm stand'
+        # 'terms: baked goods,farm shop,farm stand,fresh food,fruits,greengrocer,organics,vegetables'
         terms: '<translate with synonyms or related terms for ''Produce Stand'', separated by commas>'
       shop/fashion:
         # shop=fashion
@@ -7284,7 +7406,7 @@ en:
       shop/general:
         # shop=general
         name: General Store
-        # 'terms: Village Shop'
+        # 'terms: village shop'
         terms: '<translate with synonyms or related terms for ''General Store'', separated by commas>'
       shop/gift:
         # shop=gift
@@ -7505,6 +7627,11 @@ en:
         name: Printer Ink Store
         # 'terms: copier ink,fax ink,ink cartridges,toner'
         terms: '<translate with synonyms or related terms for ''Printer Ink Store'', separated by commas>'
+      shop/psychic:
+        # shop=psychic
+        name: Psychic
+        # 'terms: astrology,crystal ball,divination,fortune teller,seer,spirit'
+        terms: '<translate with synonyms or related terms for ''Psychic'', separated by commas>'
       shop/pyrotechnics:
         # shop=pyrotechnics
         name: Fireworks Store
diff --git a/data/presets/README.md b/data/presets/README.md
index a923b79cd..a7751b898 100644
--- a/data/presets/README.md
+++ b/data/presets/README.md
@@ -189,10 +189,14 @@ The default is `1.0`.
 
 ##### `countryCodes`
 
-An array of two-letter, lowercase [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) country codes. The preset will only be searchable when the user is editing over the specified countries. The locale and language of iD are not factors, just the position of the map.
+An array of two-letter, lowercase [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) country codes. The preset will only be searchable when the user is editing over the specified, whitelisted countries. The locale and language of iD are not factors, just the position of the map.
 
 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.
+
 ##### `replacement`
 
 The ID of a preset that is preferable to this one. iD's validator will flag features matching this preset and recommend that the user upgrade the tags.
@@ -203,7 +207,7 @@ When possible, use `deprecated.json` instead to specify upgrade paths for old ta
 
 A key and optionally a value to link to the wiki documentation for this preset. Only necessary if the preset consists of several tags.
 
-For example, 
+For example,
 ```javascript
 "reference": {
     "key": "tower:type",
@@ -384,15 +388,19 @@ For number fields, the greatest valid value. There is no default.
 
 ##### `prerequisiteTag`
 
-An object defining the tags the feature needs before this field will be displayed. It must have this property:
+An object defining the tags the feature needs before this field will be displayed. It may have this property:
 
 - `key`: The key for the required tag.
 
-And may optionally have one of these properties:
+And may optionally be combined with one of these properties:
 
 - `value`: The value that the key must have.
 - `valueNot`: The value that the key must not have.
 
+Alternatively, the object may contain a single property:
+
+- `keyNot`: The key that must not be present.
+
 For example, this is how we show the Internet Access Fee field only if the feature has an `internet_access` tag not equal to `no`.
 
 ```js
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 78c3005c3..0609662da 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -38,8 +38,10 @@
     "bench": {"key": "bench", "type": "check", "label": "Bench", "terms": ["seating"]},
     "bicycle_parking": {"key": "bicycle_parking", "type": "combo", "label": "Type"},
     "bin": {"key": "bin", "type": "check", "label": "Waste Bin", "terms": ["garbage can", "trash can"]},
+    "blind": {"key": "blind", "type": "radio", "strings": {"options": {"yes": "Yes", "limited": "Limited", "no": "No"}}, "label": "Blind Person Access", "terms": ["sight impairment", "vision impairment"]},
     "blood_components": {"key": "blood:", "type": "multiCombo", "label": "Blood Components", "strings": {"options": {"whole": "whole blood", "plasma": "plasma", "platelets": "platelets", "stemcells": "stem cell samples"}}},
     "board_type": {"key": "board_type", "type": "typeCombo", "label": "Type"},
+    "bollard": {"key": "bollard", "type": "combo", "label": "Type"},
     "booth": {"key": "booth", "type": "combo", "label": "Booth", "caseSensitive": true},
     "boules": {"key": "boules", "type": "typeCombo", "label": "Type"},
     "boundary": {"key": "boundary", "type": "combo", "label": "Type"},
@@ -74,6 +76,7 @@
     "consulate": {"key": "consulate", "type": "combo", "label": "Type"},
     "contact/webcam": {"key": "contact:webcam", "type": "url", "icon": "website", "label": "Webcam URL", "placeholder": "http://example.com/"},
     "content": {"key": "content", "type": "combo", "label": "Content", "options": ["silage", "water", "oil", "fuel", "slurry", "gas", "manure", "sewage"]},
+    "conveying_escalator": {"key": "conveying", "type": "check", "label": "Escalator"},
     "conveying": {"key": "conveying", "type": "typeCombo", "label": "Movement Direction", "strings": {"options": {"forward": "Forward", "backward": "Backward", "reversible": "Reversible"}}},
     "country": {"key": "country", "type": "combo", "label": "Country"},
     "couplings": {"key": "couplings", "type": "number", "minValue": 1, "label": "Couplings", "placeholder": "1, 2, 3..."},
@@ -182,6 +185,7 @@
     "indoor_type": {"key": "indoor", "type": "typeCombo", "label": "Type"},
     "indoor": {"key": "indoor", "type": "check", "label": "Indoor"},
     "industrial": {"key": "industrial", "type": "combo", "label": "Type"},
+    "informal": {"key": "informal", "type": "check", "label": "Informal"},
     "information": {"key": "information", "type": "typeCombo", "label": "Type"},
     "inscription": {"key": "inscription", "type": "textarea", "label": "Inscription"},
     "intermittent_yes": {"key": "intermittent", "type": "check", "label": "Intermittent", "default": "yes"},
@@ -206,7 +210,8 @@
     "leaf_type": {"key": "leaf_type", "type": "combo", "label": "Leaf Type", "strings": {"options": {"broadleaved": "Broadleaved", "needleleaved": "Needleleaved", "mixed": "Mixed", "leafless": "Leafless"}}},
     "leisure": {"key": "leisure", "type": "typeCombo", "label": "Type"},
     "length": {"key": "length", "type": "number", "minValue": 0, "label": "Length (Meters)"},
-    "level": {"key": "level", "type": "combo", "label": "Level", "universal": true, "terms": ["building floor", "deck", "storey", "story"]},
+    "level_semi": {"key": "level", "type": "semiCombo", "label": "Levels", "terms": ["building floors", "decks", "stories", "storeys", "storys"]},
+    "level": {"key": "level", "type": "combo", "label": "Level", "terms": ["building floor", "deck", "storey", "story"], "prerequisiteTag": {"keyNot": "building"}},
     "levels": {"key": "building:levels", "type": "number", "minValue": 0, "label": "Levels", "placeholder": "2, 4, 6..."},
     "liaison": {"key": "liaison", "type": "combo", "label": "Type"},
     "line_attachment": {"key": "line_attachment", "type": "combo", "label": "Line Attachment"},
@@ -214,6 +219,7 @@
     "location_pool": {"key": "location", "type": "typeCombo", "label": "Location", "strings": {"options": {"outdoor": "Outdoor", "indoor": "Indoor", "roof": "Rooftop"}}},
     "location": {"key": "location", "type": "combo", "label": "Location"},
     "lock": {"key": "lock", "type": "check", "label": "Lock"},
+    "lockable": {"key": "lockable", "type": "check", "label": "Lockable"},
     "man_made": {"key": "man_made", "type": "typeCombo", "label": "Type"},
     "manhole": {"key": "manhole", "type": "typeCombo", "label": "Type"},
     "manufacturer": {"key": "manufacturer", "type": "combo", "snake_case": false, "caseSensitive": true, "label": "Manufacturer"},
@@ -273,6 +279,7 @@
     "plant": {"key": "plant", "type": "combo", "label": "Plant"},
     "plant/output/electricity": {"key": "plant:output:electricity", "type": "text", "label": "Power Output", "placeholder": "500 MW, 1000 MW, 2000 MW..."},
     "playground": {"key": "playground", "type": "combo", "label": "Type"},
+    "playground/theme": {"key": "playground:theme", "type": "combo", "label": "Theme"},
     "polling_station": {"key": "polling_station", "type": "check", "label": "Polling Place", "terms": ["voting place"]},
     "population": {"key": "population", "type": "text", "label": "Population"},
     "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"},
@@ -303,6 +310,7 @@
     "relation": {"key": "type", "type": "combo", "label": "Type"},
     "religion": {"key": "religion", "type": "combo", "label": "Religion"},
     "reservation": {"key": "reservation", "type": "combo", "label": "Reservations", "strings": {"options": {"yes": "Accepted", "no": "Not Accepted", "required": "Required", "recommended": "Recommended"}}},
+    "residential": {"key": "residential", "type": "combo", "label": "Type"},
     "resort": {"key": "resort", "type": "combo", "label": "Type"},
     "resource": {"key": "resource", "type": "semiCombo", "label": "Resources"},
     "restriction": {"key": "restriction", "type": "combo", "label": "Type"},
@@ -358,9 +366,10 @@
     "stars": {"key": "stars", "type": "combo", "label": "Stars", "terms": ["rating"]},
     "start_date": {"key": "start_date", "type": "text", "universal": true, "label": "Start Date", "terms": ["inception"]},
     "step_count": {"key": "step_count", "type": "number", "minValue": 0, "label": "Number of Steps"},
+    "stile": {"key": "stile", "type": "combo", "label": "Type"},
     "stop": {"key": "stop", "type": "combo", "label": "Stop Type", "strings": {"options": {"all": "All Ways", "minor": "Minor Road"}}},
     "street_cabinet": {"key": "street_cabinet", "type": "combo", "label": "Type"},
-    "stroller": {"key": "stroller", "type": "radio", "options": ["yes", "limited", "no"], "label": "Stroller Access", "terms": ["baby carriage", "perambulator", "pram", "pushchair"]},
+    "stroller": {"key": "stroller", "type": "radio", "strings": {"options": {"yes": "Yes", "limited": "Limited", "no": "No"}}, "label": "Stroller Access", "terms": ["baby carriage", "perambulator", "pram", "pushchair"]},
     "structure_waterway": {"type": "structureRadio", "keys": ["tunnel"], "label": "Structure", "placeholder": "Unknown", "strings": {"options": {"tunnel": "Tunnel"}}},
     "structure": {"type": "structureRadio", "keys": ["bridge", "tunnel", "embankment", "cutting", "ford"], "label": "Structure", "placeholder": "Unknown", "strings": {"options": {"bridge": "Bridge", "tunnel": "Tunnel", "embankment": "Embankment", "cutting": "Cutting", "ford": "Ford"}}},
     "studio": {"key": "studio", "type": "combo", "label": "Type"},
@@ -421,7 +430,7 @@
     "waterway": {"key": "waterway", "type": "typeCombo", "label": "Type"},
     "website": {"key": "website", "type": "url", "icon": "website", "placeholder": "https://example.com", "label": "Website", "terms": ["internet presence", "uri", "url", "webpage"]},
     "wetland": {"key": "wetland", "type": "combo", "label": "Type"},
-    "wheelchair": {"key": "wheelchair", "type": "radio", "options": ["yes", "limited", "no"], "icon": "maki-wheelchair", "label": "Wheelchair Access", "terms": ["handicap access"]},
+    "wheelchair": {"key": "wheelchair", "type": "radio", "strings": {"options": {"yes": "Yes", "limited": "Limited", "no": "No"}}, "icon": "maki-wheelchair", "label": "Wheelchair Access", "terms": ["handicap access"]},
     "wholesale": {"key": "wholesale", "type": "typeCombo", "label": "Wholesale"},
     "width": {"key": "width", "type": "number", "minValue": 0, "label": "Width (Meters)"},
     "wikidata": {"key": "wikidata", "keys": ["wikidata", "wikipedia"], "type": "wikidata", "icon": "wikipedia", "universal": true, "label": "Wikidata"},
diff --git a/data/presets/fields/blind.json b/data/presets/fields/blind.json
new file mode 100644
index 000000000..0aa46adc8
--- /dev/null
+++ b/data/presets/fields/blind.json
@@ -0,0 +1,16 @@
+{
+    "key": "blind",
+    "type": "radio",
+    "strings": {
+        "options": {
+            "yes": "Yes",
+            "limited": "Limited",
+            "no": "No"
+        }
+    },
+    "label": "Blind Person Access",
+    "terms": [
+        "sight impairment",
+        "vision impairment"
+    ]
+}
diff --git a/data/presets/fields/bollard.json b/data/presets/fields/bollard.json
new file mode 100644
index 000000000..d610d379a
--- /dev/null
+++ b/data/presets/fields/bollard.json
@@ -0,0 +1,5 @@
+{
+    "key": "bollard",
+    "type": "combo",
+    "label": "Type"
+}
diff --git a/data/presets/fields/conveying_escalator.json b/data/presets/fields/conveying_escalator.json
new file mode 100644
index 000000000..66dfa64be
--- /dev/null
+++ b/data/presets/fields/conveying_escalator.json
@@ -0,0 +1,5 @@
+{
+    "key": "conveying",
+    "type": "check",
+    "label": "Escalator"
+}
diff --git a/data/presets/fields/informal.json b/data/presets/fields/informal.json
new file mode 100644
index 000000000..ebc4be5e5
--- /dev/null
+++ b/data/presets/fields/informal.json
@@ -0,0 +1,5 @@
+{
+    "key": "informal",
+    "type": "check",
+    "label": "Informal"
+}
diff --git a/data/presets/fields/level.json b/data/presets/fields/level.json
index 6c5604abb..42c002dd8 100644
--- a/data/presets/fields/level.json
+++ b/data/presets/fields/level.json
@@ -2,11 +2,13 @@
     "key": "level",
     "type": "combo",
     "label": "Level",
-    "universal": true,
     "terms": [
         "building floor",
         "deck",
         "storey",
         "story"
-    ]
+    ],
+    "prerequisiteTag": {
+        "keyNot": "building"
+    }
 }
diff --git a/data/presets/fields/level_semi.json b/data/presets/fields/level_semi.json
new file mode 100644
index 000000000..673681d16
--- /dev/null
+++ b/data/presets/fields/level_semi.json
@@ -0,0 +1,12 @@
+{
+    "key": "level",
+    "type": "semiCombo",
+    "label": "Levels",
+    "terms": [
+        "building floors",
+        "decks",
+        "stories",
+        "storeys",
+        "storys"
+    ]
+}
diff --git a/data/presets/fields/lockable.json b/data/presets/fields/lockable.json
new file mode 100644
index 000000000..b679ea466
--- /dev/null
+++ b/data/presets/fields/lockable.json
@@ -0,0 +1,5 @@
+{
+    "key": "lockable",
+    "type": "check",
+    "label": "Lockable"
+}
diff --git a/data/presets/fields/playground/theme.json b/data/presets/fields/playground/theme.json
new file mode 100644
index 000000000..4d2d6eb2a
--- /dev/null
+++ b/data/presets/fields/playground/theme.json
@@ -0,0 +1,5 @@
+{
+    "key": "playground:theme",
+    "type": "combo",
+    "label": "Theme"
+}
diff --git a/data/presets/fields/residential.json b/data/presets/fields/residential.json
new file mode 100644
index 000000000..8de70a9ff
--- /dev/null
+++ b/data/presets/fields/residential.json
@@ -0,0 +1,5 @@
+{
+    "key": "residential",
+    "type": "combo",
+    "label": "Type"
+}
diff --git a/data/presets/fields/stile.json b/data/presets/fields/stile.json
new file mode 100644
index 000000000..ffb0fbb71
--- /dev/null
+++ b/data/presets/fields/stile.json
@@ -0,0 +1,5 @@
+{
+    "key": "stile",
+    "type": "combo",
+    "label": "Type"
+}
diff --git a/data/presets/fields/stroller.json b/data/presets/fields/stroller.json
index cc3535769..122ca4c05 100644
--- a/data/presets/fields/stroller.json
+++ b/data/presets/fields/stroller.json
@@ -1,11 +1,13 @@
 {
     "key": "stroller",
     "type": "radio",
-    "options": [
-        "yes",
-        "limited",
-        "no"
-    ],
+    "strings": {
+        "options": {
+            "yes": "Yes",
+            "limited": "Limited",
+            "no": "No"
+        }
+    },
     "label": "Stroller Access",
     "terms": [
         "baby carriage",
diff --git a/data/presets/fields/wheelchair.json b/data/presets/fields/wheelchair.json
index 8bdf49aae..127042d86 100644
--- a/data/presets/fields/wheelchair.json
+++ b/data/presets/fields/wheelchair.json
@@ -1,11 +1,13 @@
 {
     "key": "wheelchair",
     "type": "radio",
-    "options": [
-        "yes",
-        "limited",
-        "no"
-    ],
+    "strings": {
+        "options": {
+            "yes": "Yes",
+            "limited": "Limited",
+            "no": "No"
+        }
+    },
     "icon": "maki-wheelchair",
     "label": "Wheelchair Access",
     "terms": [
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 8775dab27..fbbed9eb8 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -16,7 +16,7 @@
     "man_made": {"icon": "temaki-storage_tank", "fields": ["name", "man_made"], "moreFields": ["material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"man_made": "*"}, "matchScore": 0.95, "searchable": false, "name": "Man Made"},
     "natural": {"icon": "maki-natural", "fields": ["name", "natural"], "geometry": ["point", "vertex", "line", "area"], "tags": {"natural": "*"}, "searchable": false, "name": "Natural"},
     "place": {"fields": ["name", "place"], "geometry": ["point", "vertex", "area"], "tags": {"place": "*"}, "searchable": false, "name": "Place"},
-    "playground": {"icon": "maki-playground", "fields": ["playground", "min_age", "max_age", "wheelchair", "height"], "geometry": ["point", "vertex", "line", "area"], "tags": {"playground": "*"}, "searchable": false, "name": "Playground Equipment"},
+    "playground": {"icon": "maki-playground", "fields": ["playground", "playground/theme", "min_age", "max_age", "wheelchair", "blind", "height"], "moreFields": ["access_simple", "colour", "ref"], "geometry": ["point", "vertex", "line", "area"], "tags": {"playground": "*"}, "searchable": false, "name": "Playground Equipment"},
     "power": {"geometry": ["point", "vertex", "line", "area"], "tags": {"power": "*"}, "fields": ["power"], "moreFields": ["material"], "searchable": false, "name": "Power"},
     "railway": {"fields": ["railway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"railway": "*"}, "searchable": false, "name": "Railway"},
     "seamark": {"icon": "maki-harbor", "fields": ["seamark/type"], "geometry": ["point", "vertex", "line", "area"], "tags": {"seamark:type": "*"}, "searchable": false, "name": "Seamark"},
@@ -49,111 +49,114 @@
     "aeroway/jet_bridge": {"icon": "temaki-pedestrian", "geometry": ["line"], "fields": ["ref_aeroway_gate", "width", "access_simple", "wheelchair"], "moreFields": ["manufacturer"], "terms": ["aerobridge", "air jetty", "airbridge", "finger", "gangway", "jet way", "jetway", "passenger boarding bridge", "PBB", "portal", "skybridge", "terminal gate connector"], "tags": {"aeroway": "jet_bridge"}, "addTags": {"aeroway": "jet_bridge", "highway": "corridor"}, "matchScore": 1.05, "name": "Jet Bridge"},
     "aeroway/parking_position": {"icon": "maki-airport", "geometry": ["vertex", "point", "line"], "fields": ["ref"], "tags": {"aeroway": "parking_position"}, "name": "Aircraft Parking Position"},
     "aeroway/runway": {"icon": "fas-plane-departure", "geometry": ["line", "area"], "terms": ["landing strip"], "fields": ["ref_runway", "surface", "length", "width"], "tags": {"aeroway": "runway"}, "name": "Runway"},
+    "aeroway/spaceport": {"icon": "fas-space-shuttle", "geometry": ["area", "point"], "fields": ["name", "operator", "access_simple", "website", "wikidata"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone"], "terms": ["cosmodrome", "rocket launch center", "rocket launch complex", "rocket launch site", "rocket range", "space port"], "tags": {"aeroway": "spaceport"}, "name": "Spaceport"},
     "aeroway/taxiway": {"icon": "fas-plane", "geometry": ["line"], "fields": ["ref_taxiway", "surface"], "tags": {"aeroway": "taxiway"}, "name": "Taxiway"},
-    "aeroway/terminal": {"icon": "maki-airport", "geometry": ["point", "area"], "terms": ["airport", "aerodrome"], "fields": ["name", "operator", "building_area"], "moreFields": ["wheelchair", "smoking"], "tags": {"aeroway": "terminal"}, "name": "Airport Terminal"},
+    "aeroway/terminal": {"icon": "maki-airport", "geometry": ["point", "area"], "terms": ["airport", "aerodrome"], "fields": ["name", "operator", "building_area"], "moreFields": ["smoking", "wheelchair"], "tags": {"aeroway": "terminal"}, "name": "Airport Terminal"},
     "aeroway/windsock": {"icon": "fas-wind", "geometry": ["point", "vertex"], "fields": ["ref", "lit", "height"], "moreFields": ["manufacturer"], "tags": {"aeroway": "windsock"}, "name": "Windsock"},
     "allotments/plot": {"geometry": ["area"], "fields": ["name", "ref"], "tags": {"allotments": "plot"}, "reference": {"key": "allotments", "value": "plot"}, "name": "Community Garden Plot"},
     "amenity/bus_station": {"icon": "maki-bus", "fields": ["name", "building_area", "operator", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"amenity": "bus_station"}, "name": "Bus Station / Terminal", "searchable": false, "replacement": "public_transport/station_bus"},
     "amenity/coworking_space": {"icon": "maki-commercial", "fields": ["name", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"amenity": "coworking_space"}, "name": "Coworking Space", "searchable": false},
-    "amenity/embassy": {"icon": "maki-embassy", "fields": ["name", "country", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "embassy"}, "searchable": false, "name": "Embassy"},
+    "amenity/embassy": {"icon": "maki-embassy", "fields": ["name", "country", "address", "building_area"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "embassy"}, "searchable": false, "name": "Embassy"},
     "amenity/ferry_terminal": {"icon": "maki-ferry", "fields": ["name", "network", "operator", "address", "building_area"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "ferry_terminal"}, "matchScore": 0.95, "name": "Ferry Station / Terminal", "searchable": false, "replacement": "public_transport/station_ferry"},
     "amenity/nursing_home": {"icon": "maki-wheelchair", "fields": ["name", "operator", "address", "building_area", "social_facility", "social_facility_for", "opening_hours", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "nursing_home"}, "reference": {"key": "social_facility", "value": "nursing_home"}, "name": "Nursing Home", "searchable": false},
     "amenity/recycling": {"icon": "maki-recycling", "fields": ["recycling_type", "recycling_accepts", "collection_times"], "geometry": ["point", "area"], "terms": ["bin", "can", "bottle", "glass", "garbage", "rubbish", "scrap", "trash"], "tags": {"amenity": "recycling"}, "name": "Recycling", "searchable": false},
     "amenity/register_office": {"icon": "maki-town-hall", "fields": ["name", "address", "building_area", "opening_hours", "operator"], "geometry": ["point", "area"], "tags": {"amenity": "register_office"}, "reference": {"key": "government", "value": "register_office"}, "name": "Register Office", "searchable": false},
     "amenity/scrapyard": {"icon": "maki-car", "fields": ["name", "operator", "address", "opening_hours"], "geometry": ["point", "area"], "tags": {"amenity": "scrapyard"}, "reference": {"key": "industrial", "value": "scrap_yard"}, "name": "Scrap Yard", "searchable": false},
     "amenity/swimming_pool": {"icon": "fas-swimmer", "geometry": ["point", "vertex", "area"], "tags": {"amenity": "swimming_pool"}, "reference": {"key": "leisure", "value": "swimming_pool"}, "name": "Swimming Pool", "searchable": false},
-    "amenity/animal_boarding": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_boarding"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["boarding", "cat", "cattery", "dog", "horse", "kennel", "kitten", "pet", "pet boarding", "pet care", "pet hotel", "puppy", "reptile"], "tags": {"amenity": "animal_boarding"}, "name": "Animal Boarding Facility"},
-    "amenity/animal_breeding": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_breeding"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["breeding", "bull", "cat", "cow", "dog", "horse", "husbandry", "kitten", "livestock", "pet breeding", "puppy", "reptile"], "tags": {"amenity": "animal_breeding"}, "name": "Animal Breeding Facility"},
-    "amenity/animal_shelter": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_shelter"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["adoption", "aspca", "cat", "dog", "horse", "kitten", "pet care", "pet rescue", "puppy", "raptor", "reptile", "rescue", "spca", "pound"], "tags": {"amenity": "animal_shelter"}, "name": "Animal Shelter"},
-    "amenity/arts_centre": {"icon": "maki-theatre", "fields": ["name", "address", "building_area", "opening_hours", "website"], "moreFields": ["charge_fee", "email", "fax", "fee", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "arts_centre"}, "name": "Arts Center"},
-    "amenity/atm": {"icon": "maki-bank", "fields": ["operator", "network", "cash_in", "currency_multi", "drive_through"], "moreFields": ["brand", "covered", "height", "indoor", "lit", "manufacturer", "name", "opening_hours", "wheelchair"], "geometry": ["point", "vertex"], "terms": ["money", "cash", "machine"], "tags": {"amenity": "atm"}, "name": "ATM"},
-    "amenity/bank": {"icon": "maki-bank", "fields": ["name", "operator", "address", "building_area", "atm", "drive_through"], "moreFields": ["air_conditioning", "currency_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["credit union", "check", "deposit", "fund", "investment", "repository", "reserve", "safe", "savings", "stock", "treasury", "trust", "vault"], "tags": {"amenity": "bank"}, "name": "Bank"},
-    "amenity/bar": {"icon": "maki-bar", "fields": ["name", "address", "building_area", "outdoor_seating", "min_age", "brewery"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "microbrewery", "opening_hours", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["dive", "beer", "bier", "booze"], "tags": {"amenity": "bar"}, "name": "Bar"},
+    "amenity/animal_boarding": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_boarding"], "moreFields": ["email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["boarding", "cat", "cattery", "dog", "horse", "kennel", "kitten", "pet", "pet boarding", "pet care", "pet hotel", "puppy", "reptile"], "tags": {"amenity": "animal_boarding"}, "name": "Animal Boarding Facility"},
+    "amenity/animal_breeding": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_breeding"], "moreFields": ["email", "fax", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["breeding", "bull", "cat", "cow", "dog", "horse", "husbandry", "kitten", "livestock", "pet breeding", "puppy", "reptile"], "tags": {"amenity": "animal_breeding"}, "name": "Animal Breeding Facility"},
+    "amenity/animal_shelter": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_shelter"], "moreFields": ["email", "fax", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["adoption", "aspca", "cat", "dog", "horse", "kitten", "pet care", "pet rescue", "puppy", "raptor", "reptile", "rescue", "spca", "pound"], "tags": {"amenity": "animal_shelter"}, "name": "Animal Shelter"},
+    "amenity/arts_centre": {"icon": "maki-theatre", "fields": ["name", "address", "building_area", "opening_hours", "website"], "moreFields": ["charge_fee", "email", "fax", "fee", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "arts_centre"}, "name": "Arts Center"},
+    "amenity/atm": {"icon": "maki-bank", "fields": ["operator", "network", "cash_in", "currency_multi", "drive_through"], "moreFields": ["brand", "covered", "height", "indoor", "level", "lit", "manufacturer", "name", "opening_hours", "wheelchair"], "geometry": ["point", "vertex"], "terms": ["money", "cash", "machine"], "tags": {"amenity": "atm"}, "name": "ATM"},
+    "amenity/bank": {"icon": "maki-bank", "fields": ["name", "operator", "address", "building_area", "atm", "drive_through"], "moreFields": ["air_conditioning", "currency_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["credit union", "check", "deposit", "fund", "investment", "repository", "reserve", "safe", "savings", "stock", "treasury", "trust", "vault"], "tags": {"amenity": "bank"}, "name": "Bank"},
+    "amenity/bar": {"icon": "maki-bar", "fields": ["name", "address", "building_area", "outdoor_seating", "min_age", "brewery"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "opening_hours", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["dive", "beer", "bier", "booze"], "tags": {"amenity": "bar"}, "name": "Bar"},
     "amenity/bar/lgbtq": {"icon": "maki-bar", "geometry": ["point", "area"], "terms": ["gay bar", "lesbian bar", "lgbtq bar", "lgbt bar", "lgb bar"], "tags": {"amenity": "bar", "lgbtq": "primary"}, "name": "LGBTQ+ Bar"},
     "amenity/bbq": {"icon": "maki-bbq", "fields": ["covered", "fuel", "access_simple"], "moreFields": ["lit"], "geometry": ["point"], "terms": ["bbq", "grill"], "tags": {"amenity": "bbq"}, "name": "Barbecue/Grill"},
-    "amenity/bench": {"icon": "temaki-bench", "fields": ["backrest", "material", "seats", "colour"], "moreFields": ["access_simple", "height", "inscription", "lit", "manufacturer", "operator"], "geometry": ["point", "vertex", "line"], "terms": ["seat", "chair"], "tags": {"amenity": "bench"}, "name": "Bench"},
-    "amenity/bicycle_parking": {"icon": "maki-bicycle", "fields": ["bicycle_parking", "capacity", "operator", "operator/type", "covered", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["colour", "indoor", "lit"], "geometry": ["point", "vertex", "area"], "terms": ["bike"], "tags": {"amenity": "bicycle_parking"}, "name": "Bicycle Parking"},
-    "amenity/bicycle_parking/building": {"icon": "maki-bicycle", "fields": ["{amenity/bicycle_parking}", "opening_hours", "building_area"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "bicycle_parking", "bicycle_parking": "building"}, "reference": {"key": "bicycle_parking"}, "terms": ["Multi-Storey Bicycle Park", "Multi-Storey Bike Park", "Bike Parking Station"], "name": "Bicycle Parking Garage"},
-    "amenity/bicycle_parking/lockers": {"icon": "maki-bicycle", "geometry": ["point", "vertex", "area"], "tags": {"amenity": "bicycle_parking", "bicycle_parking": "lockers"}, "reference": {"key": "bicycle_parking"}, "terms": ["Bike Lockers"], "name": "Bicycle Lockers"},
-    "amenity/bicycle_parking/shed": {"icon": "maki-bicycle", "fields": ["{amenity/bicycle_parking}", "building_area"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "bicycle_parking", "bicycle_parking": "shed"}, "reference": {"key": "bicycle_parking"}, "terms": ["Bike Shed"], "name": "Bicycle Shed"},
-    "amenity/bicycle_rental": {"icon": "maki-bicycle", "fields": ["capacity", "network", "operator", "operator/type", "fee", "payment_multi_fee"], "moreFields": ["address", "email", "covered", "fax", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["bike", "bicycle", "bikeshare", "bike share", "bicycle share", "hub", "dock"], "tags": {"amenity": "bicycle_rental"}, "name": "Bicycle Rental"},
-    "amenity/bicycle_repair_station": {"icon": "maki-bicycle", "fields": ["operator", "brand", "opening_hours", "fee", "payment_multi_fee", "charge_fee", "service/bicycle"], "moreFields": ["colour", "covered", "indoor", "manufacturer"], "geometry": ["point", "vertex"], "terms": ["bike", "repair", "chain", "pump", "tools", "stand", "multitool"], "tags": {"amenity": "bicycle_repair_station"}, "name": "Bicycle Repair Tool Stand"},
+    "amenity/bench": {"icon": "temaki-bench", "fields": ["backrest", "material", "seats", "colour"], "moreFields": ["access_simple", "height", "inscription", "level", "lit", "manufacturer", "operator"], "geometry": ["point", "vertex", "line"], "terms": ["seat", "chair"], "tags": {"amenity": "bench"}, "name": "Bench"},
+    "amenity/bicycle_parking": {"icon": "maki-bicycle", "fields": ["bicycle_parking", "capacity", "operator", "operator/type", "covered", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["colour", "indoor", "level", "lit"], "geometry": ["point", "vertex", "area"], "terms": ["bike", "cycle parking", "cycling"], "tags": {"amenity": "bicycle_parking"}, "name": "Bicycle Parking"},
+    "amenity/bicycle_parking/building": {"icon": "maki-bicycle", "fields": ["{amenity/bicycle_parking}", "opening_hours", "building_area"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "bicycle_parking", "bicycle_parking": "building"}, "reference": {"key": "bicycle_parking"}, "terms": ["Bike Parking Station", "cycle parking", "cycling", "Multi-Storey Bicycle Park", "Multi-Storey Bike Park"], "name": "Bicycle Parking Garage"},
+    "amenity/bicycle_parking/lockers": {"icon": "maki-bicycle", "geometry": ["point", "vertex", "area"], "tags": {"amenity": "bicycle_parking", "bicycle_parking": "lockers"}, "reference": {"key": "bicycle_parking"}, "terms": ["cycle locker", "cycling", "Bike Lockers"], "name": "Bicycle Lockers"},
+    "amenity/bicycle_parking/shed": {"icon": "maki-bicycle", "fields": ["{amenity/bicycle_parking}", "building_area"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "bicycle_parking", "bicycle_parking": "shed"}, "reference": {"key": "bicycle_parking"}, "terms": ["cycle shed", "cycling", "Bike Shed"], "name": "Bicycle Shed"},
+    "amenity/bicycle_rental": {"icon": "maki-bicycle", "fields": ["capacity", "network", "operator", "operator/type", "fee", "payment_multi_fee"], "moreFields": ["address", "covered", "email", "fax", "level", "opening_hours", "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": "maki-bicycle", "fields": ["operator", "brand", "opening_hours", "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", "building", "outdoor_seating", "brewery"], "moreFields": ["{amenity/bar}"], "geometry": ["point", "area"], "tags": {"amenity": "biergarten"}, "terms": ["beer", "bier", "booze"], "name": "Biergarten"},
-    "amenity/boat_rental": {"icon": "temaki-boating", "fields": ["name", "operator", "operator/type", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["address", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "boat_rental"}, "name": "Boat Rental"},
-    "amenity/bureau_de_change": {"icon": "maki-bank", "fields": ["name", "operator", "payment_multi", "currency_multi", "address", "building_area"], "moreFields": ["opening_hours", "website", "phone", "email", "fax", "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", "outdoor_seating", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "bar", "capacity", "delivery", "diet_multi", "email", "fax", "internet_access/ssid", "min_age", "not/name", "opening_hours", "payment_multi", "phone", "reservation", "smoking", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"},
-    "amenity/car_pooling": {"icon": "maki-car", "fields": ["name", "operator", "operator/type", "capacity", "address", "opening_hours", "lit"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_pooling"}, "name": "Car Pooling"},
-    "amenity/car_rental": {"icon": "maki-car-rental", "fields": ["name", "operator", "address", "opening_hours", "payment_multi"], "moreFields": ["brand", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_rental"}, "name": "Car Rental"},
-    "amenity/car_sharing": {"icon": "maki-car", "fields": ["name", "operator", "operator/type", "capacity", "address", "payment_multi", "supervised"], "moreFields": ["lit", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_sharing"}, "name": "Car Sharing"},
-    "amenity/car_wash": {"icon": "temaki-car_wash", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "self_service"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_wash"}, "name": "Car Wash"},
-    "amenity/casino": {"icon": "maki-casino", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "min_age", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["gambling", "roulette", "craps", "poker", "blackjack"], "tags": {"amenity": "casino"}, "name": "Casino"},
-    "amenity/charging_station": {"icon": "fas-charging-station", "fields": ["name", "operator", "capacity", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["brand", "covered", "manufacturer"], "geometry": ["point"], "tags": {"amenity": "charging_station"}, "terms": ["EV", "Electric Vehicle", "Supercharger"], "name": "Charging Station"},
-    "amenity/childcare": {"icon": "fas-child", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "min_age", "max_age", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["daycare", "orphanage", "playgroup"], "tags": {"amenity": "childcare"}, "name": "Nursery/Childcare"},
-    "amenity/cinema": {"icon": "maki-cinema", "fields": ["name", "address", "screen", "building_area", "opening_hours", "payment_multi"], "moreFields": ["air_conditioning", "email", "fax", "min_age", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["drive-in", "film", "flick", "movie", "theater", "picture", "show", "screen"], "tags": {"amenity": "cinema"}, "name": "Cinema"},
-    "amenity/clinic": {"icon": "maki-doctor", "fields": ["name", "operator", "operator/type", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["medical", "urgentcare"], "tags": {"amenity": "clinic"}, "addTags": {"amenity": "clinic", "healthcare": "clinic"}, "reference": {"key": "amenity", "value": "clinic"}, "name": "Clinic"},
+    "amenity/boat_rental": {"icon": "temaki-boating", "fields": ["name", "operator", "operator/type", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["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", "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", "outdoor_seating", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "bar", "capacity", "delivery", "diet_multi", "email", "fax", "internet_access/ssid", "level", "min_age", "not/name", "opening_hours", "payment_multi", "phone", "reservation", "smoking", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"},
+    "amenity/car_pooling": {"icon": "maki-car", "fields": ["name", "operator", "operator/type", "capacity", "address", "opening_hours", "lit"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_pooling"}, "name": "Car Pooling"},
+    "amenity/car_rental": {"icon": "maki-car-rental", "fields": ["name", "operator", "address", "opening_hours", "payment_multi"], "moreFields": ["brand", "email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_rental"}, "name": "Car Rental"},
+    "amenity/car_sharing": {"icon": "maki-car", "fields": ["name", "operator", "operator/type", "capacity", "address", "payment_multi", "supervised"], "moreFields": ["email", "fax", "lit", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_sharing"}, "name": "Car Sharing"},
+    "amenity/car_wash": {"icon": "temaki-car_wash", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "self_service"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_wash"}, "name": "Car Wash"},
+    "amenity/casino": {"icon": "maki-casino", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "min_age", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["gambling", "roulette", "craps", "poker", "blackjack"], "tags": {"amenity": "casino"}, "name": "Casino"},
+    "amenity/charging_station": {"icon": "fas-charging-station", "fields": ["name", "operator", "capacity", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["brand", "covered", "level", "manufacturer"], "geometry": ["point"], "tags": {"amenity": "charging_station"}, "terms": ["EV", "Electric Vehicle", "Supercharger"], "name": "Charging Station"},
+    "amenity/childcare": {"icon": "fas-child", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "level", "max_age", "min_age", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["daycare", "orphanage", "playgroup"], "tags": {"amenity": "childcare"}, "name": "Nursery/Childcare"},
+    "amenity/cinema": {"icon": "maki-cinema", "fields": ["name", "address", "screen", "building_area", "opening_hours", "payment_multi"], "moreFields": ["air_conditioning", "email", "fax", "level", "min_age", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["drive-in", "film", "flick", "movie", "theater", "picture", "show", "screen"], "tags": {"amenity": "cinema"}, "name": "Cinema"},
+    "amenity/clinic": {"icon": "maki-doctor", "fields": ["name", "operator", "operator/type", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["medical", "urgentcare"], "tags": {"amenity": "clinic"}, "addTags": {"amenity": "clinic", "healthcare": "clinic"}, "reference": {"key": "amenity", "value": "clinic"}, "name": "Clinic"},
     "amenity/clinic/abortion": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "clinic", "healthcare": "clinic", "healthcare:speciality": "abortion"}, "reference": {"key": "amenity", "value": "clinic"}, "name": "Abortion Clinic"},
     "amenity/clinic/fertility": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["egg", "fertility", "reproductive", "sperm", "ovulation"], "tags": {"amenity": "clinic", "healthcare": "clinic", "healthcare:speciality": "fertility"}, "reference": {"key": "amenity", "value": "clinic"}, "name": "Fertility Clinic"},
-    "amenity/clock": {"icon": "temaki-clock", "fields": ["name", "support", "display", "visibility", "date", "faces"], "moreFields": ["covered", "height", "indoor", "lit", "manufacturer"], "geometry": ["point", "vertex"], "terms": ["time"], "tags": {"amenity": "clock"}, "name": "Clock"},
+    "amenity/clock": {"icon": "temaki-clock", "fields": ["name", "support", "display", "visibility", "date", "faces"], "moreFields": ["covered", "height", "indoor", "level", "lit", "manufacturer"], "geometry": ["point", "vertex"], "terms": ["time"], "tags": {"amenity": "clock"}, "name": "Clock"},
     "amenity/clock/sundial": {"icon": "temaki-clock", "fields": ["name", "support", "visibility", "inscription"], "moreFields": [], "geometry": ["point", "vertex"], "terms": ["gnomon", "shadow"], "tags": {"amenity": "clock", "display": "sundial"}, "reference": {"key": "display", "value": "sundial"}, "name": "Sundial"},
-    "amenity/college": {"icon": "maki-college", "fields": ["name", "operator", "operator/type", "address", "website", "internet_access", "internet_access/fee"], "moreFields": ["religion", "denomination", "internet_access/ssid", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["university", "undergraduate school"], "tags": {"amenity": "college"}, "name": "College Grounds"},
+    "amenity/college": {"icon": "maki-college", "fields": ["name", "operator", "operator/type", "address", "website", "internet_access", "internet_access/fee"], "moreFields": ["denomination", "email", "fax", "internet_access/ssid", "phone", "religion", "wheelchair"], "geometry": ["point", "area"], "terms": ["university", "undergraduate school"], "tags": {"amenity": "college"}, "name": "College Grounds"},
     "amenity/community_centre": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["event", "hall"], "tags": {"amenity": "community_centre"}, "name": "Community Center"},
     "amenity/community_centre/lgbtq": {"icon": "maki-town-hall", "geometry": ["point", "area"], "terms": ["lgbtq event", "lgbtq hall", "lgbt event", "lgbt hall", "lgb event", "lgb hall"], "tags": {"amenity": "community_centre", "lgbtq": "primary"}, "name": "LGBTQ+ Community Center"},
-    "amenity/compressed_air": {"icon": "maki-car", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "covered", "lit"], "moreFields": ["brand", "manufacturer"], "geometry": ["point", "area"], "tags": {"amenity": "compressed_air"}, "name": "Compressed Air"},
+    "amenity/compressed_air": {"icon": "fas-tachometer-alt", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "covered", "lit"], "moreFields": ["brand", "manufacturer"], "geometry": ["point", "area"], "tags": {"amenity": "compressed_air"}, "name": "Compressed Air"},
     "amenity/conference_centre": {"icon": "fas-user-tie", "fields": ["name", "operator", "building_area", "address", "website", "internet_access"], "moreFields": ["air_conditioning", "email", "fax", "internet_access/fee", "internet_access/ssid", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "conference_centre"}, "terms": ["auditorium", "conference", "exhibition", "exposition", "lecture"], "name": "Convention Center"},
-    "amenity/courthouse": {"icon": "fas-gavel", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["email", "fax", "phone", "polling_station", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "courthouse"}, "name": "Courthouse"},
-    "amenity/crematorium": {"icon": "maki-cemetery", "fields": ["name", "website", "phone", "opening_hours", "wheelchair"], "moreFields": ["address", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["area", "point"], "tags": {"amenity": "crematorium"}, "terms": ["cemetery", "funeral"], "name": "Crematorium"},
-    "amenity/dentist": {"icon": "maki-dentist", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["tooth", "teeth"], "tags": {"amenity": "dentist"}, "addTags": {"amenity": "dentist", "healthcare": "dentist"}, "reference": {"key": "amenity", "value": "dentist"}, "name": "Dentist"},
-    "amenity/dive_centre": {"icon": "temaki-scuba_diving", "fields": ["name", "operator", "address", "building_area", "opening_hours", "scuba_diving"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["diving", "scuba"], "tags": {"amenity": "dive_centre"}, "name": "Dive Center"},
-    "amenity/doctors": {"icon": "maki-doctor", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["medic*", "physician"], "tags": {"amenity": "doctors"}, "addTags": {"amenity": "doctors", "healthcare": "doctor"}, "reference": {"key": "amenity", "value": "doctors"}, "name": "Doctor"},
-    "amenity/dojo": {"icon": "maki-pitch", "fields": ["name", "sport", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["martial arts", "dojang"], "tags": {"amenity": "dojo"}, "name": "Dojo / Martial Arts Academy"},
-    "amenity/dressing_room": {"icon": "maki-clothing-store", "fields": ["operator", "access_simple", "gender", "wheelchair", "building_area"], "moreFields": ["charge_fee", "fee", "opening_hours", "payment_multi_fee", "ref"], "geometry": ["point", "area"], "terms": ["changeroom", "dressing room", "fitting room", "locker room"], "tags": {"amenity": "dressing_room"}, "name": "Changing Room"},
-    "amenity/drinking_water": {"icon": "maki-drinking-water", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "wheelchair"], "moreFields": ["covered", "indoor", "lit"], "geometry": ["point"], "tags": {"amenity": "drinking_water"}, "terms": ["potable water source", "water fountain", "drinking fountain", "bubbler", "water tap"], "name": "Drinking Water"},
-    "amenity/driving_school": {"icon": "maki-car", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "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", "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/fast_food": {"icon": "maki-fast-food", "fields": ["name", "cuisine", "operator", "address", "building_area", "drive_through"], "moreFields": ["air_conditioning", "opening_hours", "diet_multi", "takeaway", "delivery", "smoking", "capacity", "outdoor_seating", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "fast_food"}, "terms": ["restaurant", "takeaway"], "name": "Fast Food"},
+    "amenity/courthouse": {"icon": "fas-gavel", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["email", "fax", "level", "phone", "polling_station", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "courthouse"}, "name": "Courthouse"},
+    "amenity/crematorium": {"icon": "maki-cemetery", "fields": ["name", "website", "phone", "opening_hours", "wheelchair"], "moreFields": ["address", "email", "fax", "level", "phone", "website", "wheelchair"], "geometry": ["area", "point"], "tags": {"amenity": "crematorium"}, "terms": ["cemetery", "funeral"], "name": "Crematorium"},
+    "amenity/dentist": {"icon": "maki-dentist", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["tooth", "teeth"], "tags": {"amenity": "dentist"}, "addTags": {"amenity": "dentist", "healthcare": "dentist"}, "reference": {"key": "amenity", "value": "dentist"}, "name": "Dentist"},
+    "amenity/dive_centre": {"icon": "temaki-scuba_diving", "fields": ["name", "operator", "address", "building_area", "opening_hours", "scuba_diving"], "moreFields": ["email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["diving", "scuba"], "tags": {"amenity": "dive_centre"}, "name": "Dive Center"},
+    "amenity/doctors": {"icon": "maki-doctor", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["medic*", "physician"], "tags": {"amenity": "doctors"}, "addTags": {"amenity": "doctors", "healthcare": "doctor"}, "reference": {"key": "amenity", "value": "doctors"}, "name": "Doctor"},
+    "amenity/dojo": {"icon": "maki-pitch", "fields": ["name", "sport", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["martial arts", "dojang"], "tags": {"amenity": "dojo"}, "name": "Dojo / Martial Arts Academy"},
+    "amenity/dressing_room": {"icon": "maki-clothing-store", "fields": ["operator", "access_simple", "gender", "wheelchair", "building_area"], "moreFields": ["charge_fee", "fee", "level", "opening_hours", "payment_multi_fee", "ref"], "geometry": ["point", "area"], "terms": ["changeroom", "dressing room", "fitting room", "locker room"], "tags": {"amenity": "dressing_room"}, "name": "Changing Room"},
+    "amenity/drinking_water": {"icon": "maki-drinking-water", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "wheelchair"], "moreFields": ["covered", "indoor", "level", "lit"], "geometry": ["point"], "tags": {"amenity": "drinking_water"}, "terms": ["potable water source", "water fountain", "drinking fountain", "bubbler", "water tap"], "name": "Drinking Water"},
+    "amenity/driving_school": {"icon": "maki-car", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "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", "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/fast_food": {"icon": "maki-fast-food", "fields": ["name", "cuisine", "operator", "address", "building_area", "drive_through"], "moreFields": ["air_conditioning", "capacity", "delivery", "diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "outdoor_seating", "payment_multi", "phone", "smoking", "takeaway", "website", "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/kebab": {"icon": "maki-restaurant", "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"},
     "amenity/fast_food/sandwich": {"icon": "temaki-sandwich", "geometry": ["point", "area"], "terms": ["breakfast", "cafe", "café", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "sandwich"}, "reference": {"key": "cuisine", "value": "sandwich"}, "name": "Sandwich Fast Food"},
     "amenity/fire_station": {"icon": "maki-fire-station", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["email", "fax", "phone", "polling_station", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "fire_station"}, "name": "Fire Station"},
-    "amenity/food_court": {"icon": "maki-restaurant", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["smoking", "outdoor_seating", "capacity", "internet_access", "internet_access/fee", "internet_access/ssid", "diet_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["fast food", "restaurant", "food"], "tags": {"amenity": "food_court"}, "name": "Food Court"},
-    "amenity/fountain": {"icon": "temaki-fountain", "fields": ["name", "operator", "height", "lit"], "moreFields": ["covered", "indoor", "manufacturer"], "geometry": ["point", "area"], "tags": {"amenity": "fountain"}, "name": "Fountain"},
-    "amenity/fuel": {"icon": "maki-fuel", "fields": ["name", "brand", "operator", "address", "fuel_multi", "self_service"], "moreFields": ["opening_hours", "payment_multi", "building", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["petrol", "fuel", "gasoline", "propane", "diesel", "lng", "cng", "biodiesel"], "tags": {"amenity": "fuel"}, "name": "Gas Station"},
-    "amenity/grave_yard": {"icon": "maki-cemetery", "fields": ["religion", "address"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"amenity": "grave_yard"}, "name": "Graveyard"},
+    "amenity/food_court": {"icon": "maki-restaurant", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["capacity", "diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "outdoor_seating", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["fast food", "restaurant", "food"], "tags": {"amenity": "food_court"}, "name": "Food Court"},
+    "amenity/fountain": {"icon": "temaki-fountain", "fields": ["name", "operator", "height", "lit"], "moreFields": ["covered", "indoor", "level", "manufacturer"], "geometry": ["point", "area"], "tags": {"amenity": "fountain"}, "name": "Fountain"},
+    "amenity/fuel": {"icon": "maki-fuel", "fields": ["name", "brand", "operator", "address", "fuel_multi", "self_service"], "moreFields": ["building", "email", "fax", "opening_hours", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["petrol", "fuel", "gasoline", "propane", "diesel", "lng", "cng", "biodiesel"], "tags": {"amenity": "fuel"}, "name": "Gas Station"},
+    "amenity/grave_yard": {"icon": "maki-cemetery", "fields": ["religion", "address"], "moreFields": ["email", "fax", "phone", "website"], "geometry": ["point", "area"], "tags": {"amenity": "grave_yard"}, "name": "Graveyard"},
     "amenity/grit_bin": {"icon": "fas-box", "fields": ["operator", "access_simple", "material", "collection_times"], "moreFields": ["colour", "height", "lit"], "geometry": ["point", "vertex"], "tags": {"amenity": "grit_bin"}, "terms": ["salt", "sand"], "name": "Grit Bin"},
-    "amenity/hospital": {"icon": "maki-hospital", "fields": ["name", "operator", "operator/type", "healthcare/speciality", "address", "emergency"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "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"], "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", "outdoor_seating"], "moreFields": ["takeaway", "delivery", "drive_through", "internet_access", "internet_access/fee", "internet_access/ssid", "diet_multi", "payment_multi", "website", "phone", "email", "fax", "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", "opening_hours", "outdoor_seating", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"},
-    "amenity/karaoke": {"icon": "maki-karaoke", "fields": ["name", "operator", "address", "building_area", "opening_hours", "website"], "moreFields": ["air_conditioning", "email", "fax", "min_age", "payment_multi", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["karaoke club", "karaoke room", "karaoke television", "KTV"], "tags": {"amenity": "karaoke_box"}, "name": "Karaoke Box"},
-    "amenity/kindergarten": {"icon": "maki-school", "fields": ["name", "operator", "address", "phone", "preschool"], "moreFields": ["email", "fax", "min_age", "max_age", "opening_hours", "payment_multi", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool/Kindergarten Grounds"},
-    "amenity/language_school": {"icon": "maki-school", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours", "language_multi"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["esl"], "tags": {"amenity": "language_school"}, "name": "Language School"},
-    "amenity/letter_box": {"icon": "temaki-letter_box", "fields": ["post", "access_simple", "collection_times", "height"], "moreFields": ["covered", "indoor", "lit", "manufacturer", "material", "operator", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "letter_box"}, "terms": ["curbside delivery box", "home delivery box", "direct-to-door delivery box", "letter hole", "letter plate", "letter slot", "letterbox", "letterhole", "letterplate", "letterslot", "mail box", "mail hole", "mail slot", "mailbox", "mailhole", "mailslot", "through-door delivery box"], "name": "Letter Box"},
-    "amenity/library": {"icon": "maki-library", "fields": ["name", "operator", "operator/type", "building_area", "address", "ref/isil", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["access_simple", "air_conditioning", "email", "fax", "opening_hours", "payment_multi", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["book"], "tags": {"amenity": "library"}, "name": "Library"},
+    "amenity/hospital": {"icon": "maki-hospital", "fields": ["name", "operator", "operator/type", "healthcare/speciality", "address", "emergency"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "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", "outdoor_seating"], "moreFields": ["delivery", "diet_multi", "drive_through", "email", "fax", "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", "level", "min_age", "opening_hours", "outdoor_seating", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"},
+    "amenity/karaoke": {"icon": "maki-karaoke", "fields": ["name", "operator", "address", "building_area", "opening_hours", "website"], "moreFields": ["air_conditioning", "email", "fax", "level", "min_age", "payment_multi", "phone", "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", "address", "phone", "preschool"], "moreFields": ["email", "fax", "level", "max_age", "min_age", "opening_hours", "payment_multi", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool/Kindergarten Grounds"},
+    "amenity/language_school": {"icon": "temaki-school", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours", "language_multi"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["esl"], "tags": {"amenity": "language_school"}, "name": "Language School"},
+    "amenity/letter_box": {"icon": "temaki-letter_box", "fields": ["post", "access_simple", "collection_times", "height"], "moreFields": ["covered", "indoor", "level", "lit", "lockable", "manufacturer", "material", "operator", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "letter_box"}, "terms": ["curbside delivery box", "home delivery box", "direct-to-door delivery box", "letter hole", "letter plate", "letter slot", "letterbox", "letterhole", "letterplate", "letterslot", "mail box", "mail hole", "mail slot", "mailbox", "mailhole", "mailslot", "through-door delivery box"], "name": "Letter Box"},
+    "amenity/library": {"icon": "maki-library", "fields": ["name", "operator", "operator/type", "building_area", "address", "ref/isil", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["access_simple", "air_conditioning", "email", "fax", "level", "opening_hours", "payment_multi", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["book"], "tags": {"amenity": "library"}, "name": "Library"},
+    "amenity/loading_dock": {"icon": "fas-truck-loading", "fields": ["ref", "operator", "access_simple", "door", "width", "height"], "moreFields": ["address", "colour", "level", "lit", "wheelchair"], "geometry": ["vertex"], "terms": ["door", "loading bay", "shipping", "unloading", "warehouse"], "tags": {"amenity": "loading_dock"}, "name": "Loading Dock"},
     "amenity/love_hotel": {"icon": "maki-heart", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["email", "fax", "min_age", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "love_hotel"}, "name": "Love Hotel"},
-    "amenity/marketplace": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building", "opening_hours"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "marketplace"}, "name": "Marketplace"},
-    "amenity/monastery": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "monastery", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "monastery"}, "name": "Monastery Grounds"},
-    "amenity/money_transfer": {"icon": "maki-bank", "fields": ["name", "brand", "address", "building_area", "payment_multi", "currency_multi"], "moreFields": ["opening_hours", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["money order", "check", "bill", "currency", "finance", "wire transfer", "cable", "person to person", "cash to cash", "exchange"], "tags": {"amenity": "money_transfer"}, "name": "Money Transfer Station"},
+    "amenity/marketplace": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building", "opening_hours"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "marketplace"}, "name": "Marketplace"},
+    "amenity/monastery": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "monastery", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "monastery"}, "name": "Monastery Grounds"},
+    "amenity/money_transfer": {"icon": "temaki-money_hand", "fields": ["name", "brand", "address", "building_area", "payment_multi", "currency_multi"], "moreFields": ["email", "fax", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["money order", "check", "bill", "currency", "finance", "wire transfer", "cable", "person to person", "cash to cash", "exchange"], "tags": {"amenity": "money_transfer"}, "name": "Money Transfer Station"},
     "amenity/motorcycle_parking": {"icon": "fas-motorcycle", "fields": ["capacity", "operator", "covered", "access_simple"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "motorcycle_parking"}, "name": "Motorcycle Parking"},
-    "amenity/music_school": {"icon": "maki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["school of music"], "tags": {"amenity": "music_school"}, "name": "Music School"},
-    "amenity/nightclub": {"icon": "maki-bar", "fields": ["name", "operator", "address", "building_area", "opening_hours", "min_age", "smoking"], "moreFields": ["air_conditioning", "email", "fax", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "nightclub"}, "terms": ["disco*", "night club", "dancing", "dance club"], "name": "Nightclub"},
+    "amenity/music_school": {"icon": "fas-music", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["school of music"], "tags": {"amenity": "music_school"}, "name": "Music School"},
+    "amenity/nightclub": {"icon": "maki-bar", "fields": ["name", "operator", "address", "building_area", "opening_hours", "min_age", "smoking"], "moreFields": ["air_conditioning", "email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "nightclub"}, "terms": ["disco*", "night club", "dancing", "dance club"], "name": "Nightclub"},
     "amenity/nightclub/lgbtq": {"icon": "maki-bar", "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": ["access_simple", "ref"], "geometry": ["vertex"], "tags": {"amenity": "parking_entrance"}, "name": "Parking Garage Entrance/Exit"},
+    "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_space": {"fields": ["capacity"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "parking_space"}, "matchScore": 0.95, "name": "Parking Space"},
     "amenity/parking": {"icon": "maki-car", "fields": ["operator", "operator/type", "parking", "capacity", "access_simple", "fee", "payment_multi_fee", "charge_fee", "surface"], "moreFields": ["address", "covered", "email", "fax", "maxstay", "name", "opening_hours", "park_ride", "phone", "ref", "supervised", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "parking"}, "terms": ["automobile parking", "car lot", "car parking", "rv parking", "truck parking", "vehicle parking"], "name": "Parking Lot"},
-    "amenity/parking/multi-storey": {"icon": "maki-car", "fields": ["name", "{amenity/parking}", "building"], "moreFields": ["{amenity/parking}", "levels", "height"], "geometry": ["area"], "tags": {"amenity": "parking", "parking": "multi-storey"}, "addTags": {"building": "parking", "amenity": "parking", "parking": "multi-storey"}, "reference": {"key": "parking", "value": "multi-storey"}, "terms": ["car", "indoor parking", "multistorey car park", "parkade", "parking building", "parking deck", "parking garage", "parking ramp", "parking structure"], "matchScore": 1.05, "name": "Multilevel Parking Garage"},
+    "amenity/parking/multi-storey": {"icon": "maki-car", "fields": ["name", "{amenity/parking}", "building"], "moreFields": ["{amenity/parking}", "height", "levels"], "geometry": ["area"], "tags": {"amenity": "parking", "parking": "multi-storey"}, "addTags": {"building": "parking", "amenity": "parking", "parking": "multi-storey"}, "reference": {"key": "parking", "value": "multi-storey"}, "terms": ["car", "indoor parking", "multistorey car park", "parkade", "parking building", "parking deck", "parking garage", "parking ramp", "parking structure"], "matchScore": 1.05, "name": "Multilevel Parking Garage"},
     "amenity/parking/park_ride": {"icon": "maki-car", "geometry": ["point", "vertex", "area"], "tags": {"amenity": "parking", "park_ride": "yes"}, "reference": {"key": "park_ride", "value": "yes"}, "terms": ["commuter parking lot", "incentive parking lot", "metro parking lot", "park and pool lot", "park and ride lot", "P+R", "public transport parking lot", "public transit parking lot", "train parking lot"], "name": "Park & Ride Lot"},
     "amenity/parking/underground": {"icon": "maki-car", "fields": ["{amenity/parking}", "layer"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "parking", "parking": "underground"}, "addTags": {"amenity": "parking", "parking": "underground", "layer": "-1"}, "reference": {"key": "parking", "value": "underground"}, "terms": ["automobile parking", "car lot", "car parking", "rv parking", "subsurface parking", "truck parking", "vehicle parking"], "matchScore": 1.05, "name": "Underground Parking"},
-    "amenity/payment_centre": {"icon": "maki-bank", "fields": ["name", "brand", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["currency_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["check", "tax pay", "bill pay", "currency", "finance", "cash", "money"], "tags": {"amenity": "payment_centre"}, "name": "Payment Center"},
-    "amenity/payment_terminal": {"icon": "far-credit-card", "fields": ["name", "brand", "address", "opening_hours", "payment_multi"], "moreFields": ["currency_multi", "wheelchair"], "geometry": ["point"], "terms": ["interactive kiosk", "ekiosk", "atm", "bill pay", "tax pay", "phone pay", "finance", "cash", "money transfer", "card"], "tags": {"amenity": "payment_terminal"}, "name": "Payment Terminal"},
-    "amenity/pharmacy": {"icon": "maki-pharmacy", "fields": ["name", "operator", "address", "building_area", "drive_through", "dispensing"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pharmacy"}, "addTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "reference": {"key": "amenity", "value": "pharmacy"}, "terms": ["apothecary", "drug store", "drugstore", "med*", "prescription"], "name": "Pharmacy Counter"},
-    "amenity/photo_booth": {"icon": "fas-person-booth", "fields": ["name", "operator", "payment_multi", "wheelchair"], "moreFields": ["brand", "indoor"], "geometry": ["point", "area"], "terms": ["photobooth", "photo", "booth", "kiosk", "camera"], "tags": {"amenity": "photo_booth"}, "name": "Photo Booth"},
-    "amenity/place_of_worship": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area", "service_times"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/ssid", "opening_hours", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship"}, "name": "Place of Worship"},
+    "amenity/payment_centre": {"icon": "temaki-money_hand", "fields": ["name", "brand", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["currency_multi", "email", "fax", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["check", "tax pay", "bill pay", "currency", "finance", "cash", "money"], "tags": {"amenity": "payment_centre"}, "name": "Payment Center"},
+    "amenity/payment_terminal": {"icon": "far-credit-card", "fields": ["name", "brand", "address", "opening_hours", "payment_multi"], "moreFields": ["covered", "currency_multi", "indoor", "level", "wheelchair"], "geometry": ["point"], "terms": ["interactive kiosk", "ekiosk", "atm", "bill pay", "tax pay", "phone pay", "finance", "cash", "money transfer", "card"], "tags": {"amenity": "payment_terminal"}, "name": "Payment Terminal"},
+    "amenity/pharmacy": {"icon": "maki-pharmacy", "fields": ["name", "operator", "address", "building_area", "drive_through", "dispensing"], "moreFields": ["email", "fax", "level", "opening_hours", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pharmacy"}, "addTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "reference": {"key": "amenity", "value": "pharmacy"}, "terms": ["apothecary", "drug store", "drugstore", "med*", "prescription"], "name": "Pharmacy Counter"},
+    "amenity/photo_booth": {"icon": "fas-person-booth", "fields": ["name", "operator", "payment_multi", "wheelchair"], "moreFields": ["brand", "indoor", "level"], "geometry": ["point", "area"], "terms": ["photobooth", "photo", "booth", "kiosk", "camera"], "tags": {"amenity": "photo_booth"}, "name": "Photo Booth"},
+    "amenity/place_of_worship": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area", "service_times"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/ssid", "level", "opening_hours", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship"}, "name": "Place of Worship"},
     "amenity/place_of_worship/buddhist": {"icon": "maki-religious-buddhist", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["stupa", "vihara", "monastery", "temple", "pagoda", "zendo", "dojo"], "tags": {"amenity": "place_of_worship", "religion": "buddhist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Buddhist Temple"},
     "amenity/place_of_worship/christian": {"icon": "maki-religious-christian", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["christian", "abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "oratory", "parish", "sacellum", "sanctuary", "shrine", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship", "religion": "christian"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Christian Church"},
     "amenity/place_of_worship/christian/jehovahs_witness": {"icon": "maki-place-of-worship", "geometry": ["point", "area"], "terms": ["christian", "church", "house of God", "house of prayer", "house of worship"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "jehovahs_witness"}, "reference": {"key": "denomination", "value": "jehovahs_witness"}, "name": "Kingdom Hall of Jehovah's Witnesses"},
@@ -165,25 +168,25 @@
     "amenity/place_of_worship/shinto": {"icon": "temaki-shinto", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["kami", "torii"], "tags": {"amenity": "place_of_worship", "religion": "shinto"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Shinto Shrine"},
     "amenity/place_of_worship/sikh": {"icon": "temaki-sikhism", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["gurudwara", "temple"], "tags": {"amenity": "place_of_worship", "religion": "sikh"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Sikh Temple"},
     "amenity/place_of_worship/taoist": {"icon": "temaki-taoism", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["daoist", "monastery", "temple"], "tags": {"amenity": "place_of_worship", "religion": "taoist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Taoist Temple"},
-    "amenity/planetarium": {"icon": "maki-globe", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "charge_fee", "fee", "payment_multi_fee", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["museum", "astronomy", "observatory"], "tags": {"amenity": "planetarium"}, "name": "Planetarium"},
-    "amenity/police": {"icon": "maki-police", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["badge", "constable", "constabulary", "cop", "detective", "fed", "law", "enforcement", "officer", "patrol"], "tags": {"amenity": "police"}, "name": "Police"},
-    "amenity/polling_station": {"icon": "fas-vote-yea", "fields": ["name", "ref", "operator", "address", "opening_hours", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["ballot box", "ballot drop", "democracy", "elections", "polling place", "vote", "voting booth", "voting machine"], "tags": {"amenity": "polling_station"}, "addTags": {"amenity": "polling_station", "polling_station": "yes"}, "name": "Permanent Polling Place"},
-    "amenity/post_box": {"icon": "temaki-post_box", "fields": ["operator", "collection_times", "drive_through", "ref"], "moreFields": ["access_simple", "brand", "covered", "height", "indoor", "manufacturer", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "post_box"}, "terms": ["letter drop", "mail box", "package drop", "post box", "postal box"], "name": "Mailbox"},
+    "amenity/planetarium": {"icon": "maki-globe", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "charge_fee", "email", "fax", "fee", "payment_multi_fee", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["museum", "astronomy", "observatory"], "tags": {"amenity": "planetarium"}, "name": "Planetarium"},
+    "amenity/police": {"icon": "maki-police", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "level", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["badge", "constable", "constabulary", "cop", "detective", "fed", "law", "enforcement", "officer", "patrol"], "tags": {"amenity": "police"}, "name": "Police"},
+    "amenity/polling_station": {"icon": "fas-vote-yea", "fields": ["name", "ref", "operator", "address", "opening_hours", "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": {"amenity": "polling_station"}, "addTags": {"amenity": "polling_station", "polling_station": "yes"}, "name": "Permanent Polling Place"},
+    "amenity/post_box": {"icon": "temaki-post_box", "fields": ["operator", "collection_times", "drive_through", "ref"], "moreFields": ["access_simple", "brand", "covered", "height", "indoor", "level", "manufacturer", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "post_box"}, "terms": ["letter drop", "mail box", "package drop", "post box", "postal box"], "name": "Mailbox"},
     "amenity/post_depot": {"icon": "fas-mail-bulk", "fields": ["name", "operator", "address", "building_area", "phone"], "moreFields": ["email", "fax", "opening_hours", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["mail processing and distribution center", "post depot"], "tags": {"amenity": "post_depot"}, "name": "Post Sorting Office"},
-    "amenity/post_office": {"icon": "maki-post", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["letter", "mail"], "tags": {"amenity": "post_office"}, "name": "Post Office"},
-    "amenity/prep_school": {"icon": "temaki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "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": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["cell", "jail", "correction"], "tags": {"amenity": "prison"}, "name": "Prison Grounds"},
-    "amenity/pub": {"icon": "maki-beer", "fields": ["name", "address", "building_area", "opening_hours", "smoking", "brewery"], "moreFields": ["air_conditioning", "diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "microbrewery", "min_age", "outdoor_seating", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pub"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze"], "name": "Pub"},
+    "amenity/post_office": {"icon": "maki-post", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["letter", "mail"], "tags": {"amenity": "post_office"}, "name": "Post Office"},
+    "amenity/prep_school": {"icon": "temaki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "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", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["cell", "jail", "correction"], "tags": {"amenity": "prison"}, "name": "Prison Grounds"},
+    "amenity/pub": {"icon": "maki-beer", "fields": ["name", "address", "building_area", "opening_hours", "smoking", "brewery"], "moreFields": ["air_conditioning", "diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "min_age", "outdoor_seating", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pub"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze"], "name": "Pub"},
     "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", "internet_access", "internet_access/fee", "internet_access/ssid", "opening_hours", "payment_multi_fee", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "public_bath"}, "terms": ["onsen", "foot bath", "hot springs"], "name": "Public Bath"},
-    "amenity/public_bookcase": {"icon": "maki-library", "fields": ["name", "public_bookcase/type", "operator", "opening_hours", "capacity", "website", "lit"], "moreFields": ["wheelchair", "location", "address", "access_simple", "brand", "email", "phone"], "geometry": ["point", "area"], "terms": ["library", "bookcrossing"], "tags": {"amenity": "public_bookcase"}, "name": "Public Bookcase"},
+    "amenity/public_bookcase": {"icon": "maki-library", "fields": ["name", "public_bookcase/type", "operator", "opening_hours", "capacity", "website", "lit"], "moreFields": ["access_simple", "address", "brand", "email", "level", "location", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["library", "bookcrossing"], "tags": {"amenity": "public_bookcase"}, "name": "Public Bookcase"},
     "amenity/ranger_station": {"icon": "maki-ranger-station", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["visitor center", "visitor centre", "permit center", "permit centre", "backcountry office", "warden office", "warden center"], "tags": {"amenity": "ranger_station"}, "name": "Ranger Station"},
-    "amenity/recycling_centre": {"icon": "maki-recycling", "fields": ["name", "operator", "operator/type", "address", "building", "opening_hours", "recycling_accepts"], "moreFields": ["charge_fee", "fee", "payment_multi_fee", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["bottle", "can", "dump", "glass", "garbage", "rubbish", "scrap", "trash"], "tags": {"amenity": "recycling", "recycling_type": "centre"}, "reference": {"key": "recycling_type", "value": "*"}, "name": "Recycling Center"},
-    "amenity/recycling_container": {"icon": "maki-recycling", "fields": ["operator", "recycling_accepts", "collection_times"], "moreFields": ["colour", "covered", "indoor", "manufacturer", "material"], "geometry": ["point", "area"], "terms": ["bin", "can", "bottle", "glass", "garbage", "rubbish", "scrap", "trash"], "tags": {"amenity": "recycling", "recycling_type": "container"}, "reference": {"key": "amenity", "value": "recycling"}, "name": "Recycling Container"},
+    "amenity/recycling_centre": {"icon": "maki-recycling", "fields": ["name", "operator", "operator/type", "address", "building", "opening_hours", "recycling_accepts"], "moreFields": ["charge_fee", "email", "fax", "fee", "payment_multi_fee", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bottle", "can", "dump", "glass", "garbage", "rubbish", "scrap", "trash"], "tags": {"amenity": "recycling", "recycling_type": "centre"}, "reference": {"key": "recycling_type", "value": "*"}, "name": "Recycling Center"},
+    "amenity/recycling_container": {"icon": "maki-recycling", "fields": ["operator", "recycling_accepts", "collection_times"], "moreFields": ["colour", "covered", "indoor", "level", "manufacturer", "material", "opening_hours"], "geometry": ["point", "area"], "terms": ["bin", "can", "bottle", "glass", "garbage", "rubbish", "scrap", "trash"], "tags": {"amenity": "recycling", "recycling_type": "container"}, "reference": {"key": "amenity", "value": "recycling"}, "name": "Recycling Container"},
     "amenity/recycling/container/electrical_items": {"icon": "maki-recycling", "fields": ["{amenity/recycling_container}"], "moreFields": ["{amenity/recycling_container}"], "geometry": ["point", "area"], "terms": ["computers", "electronic waste", "electronics recycling", "ewaste bin", "phones", "tablets"], "tags": {"amenity": "recycling", "recycling_type": "container", "recycling:electrical_items": "yes"}, "reference": {"key": "recycling:electrical_items", "value": "yes"}, "name": "E-Waste Container"},
     "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/restaurant": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "phone"], "moreFields": ["air_conditioning", "bar", "brewery", "capacity", "delivery", "diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "microbrewery", "min_age", "not/name", "outdoor_seating", "reservation", "smoking", "stars", "takeaway", "website", "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", "address", "building_area", "opening_hours", "phone"], "moreFields": ["air_conditioning", "bar", "brewery", "capacity", "delivery", "diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "min_age", "not/name", "outdoor_seating", "reservation", "smoking", "stars", "takeaway", "website", "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"},
@@ -198,39 +201,43 @@
     "amenity/restaurant/pizza": {"icon": "maki-restaurant-pizza", "geometry": ["point", "area"], "terms": ["bar", "dine", "dining", "dinner", "drive-in", "eat", "lunch", "table", "deep dish", "thin crust", "slice"], "tags": {"amenity": "restaurant", "cuisine": "pizza"}, "reference": {"key": "cuisine", "value": "pizza"}, "name": "Pizza Restaurant"},
     "amenity/restaurant/seafood": {"icon": "maki-restaurant-seafood", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "fish", "shellfish", "molluscs", "crustaceans", "clams", "oysters", "lobsters", "crab", "shrimp", "squid", "octopus"], "tags": {"amenity": "restaurant", "cuisine": "seafood"}, "reference": {"key": "cuisine", "value": "seafood"}, "name": "Seafood Restaurant"},
     "amenity/restaurant/steakhouse": {"icon": "maki-slaughterhouse", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "steak house", "chop house", "beef"], "tags": {"amenity": "restaurant", "cuisine": "steak_house"}, "reference": {"key": "cuisine", "value": "steak_house"}, "name": "Steakhouse"},
-    "amenity/restaurant/sushi": {"icon": "fas-fish", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "sushi"}, "reference": {"key": "cuisine", "value": "sushi"}, "name": "Sushi Restaurant"},
+    "amenity/restaurant/sushi": {"icon": "temaki-temaki", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "sushi"}, "reference": {"key": "cuisine", "value": "sushi"}, "name": "Sushi Restaurant"},
     "amenity/restaurant/thai": {"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": "thai"}, "reference": {"key": "cuisine", "value": "thai"}, "name": "Thai Restaurant"},
     "amenity/restaurant/turkish": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "turkish"}, "reference": {"key": "cuisine", "value": "turkish"}, "name": "Turkish Restaurant"},
     "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-storage_tank", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "water_point"], "moreFields": ["opening_hours"], "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": "maki-school", "fields": ["name", "operator", "operator/type", "address", "religion", "denomination", "website"], "moreFields": ["charge_fee", "email", "fax", "fee", "internet_access", "internet_access/ssid", "phone", "polling_station", "wheelchair"], "geometry": ["point", "area"], "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": ["lit", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["lean-to", "gazebo", "picnic"], "tags": {"amenity": "shelter"}, "name": "Shelter"},
+    "amenity/school": {"icon": "temaki-school", "fields": ["name", "operator", "operator/type", "address", "religion", "denomination", "website"], "moreFields": ["charge_fee", "email", "fax", "fee", "internet_access", "internet_access/ssid", "level", "phone", "polling_station", "wheelchair"], "geometry": ["point", "area"], "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": ["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": "maki-shelter", "fields": ["name", "operator", "building_area"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "lean_to"}, "name": "Lean-To"},
     "amenity/shelter/picnic_shelter": {"icon": "maki-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": "maki-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/shower": {"icon": "fas-shower", "fields": ["opening_hours", "access_simple", "fee", "payment_multi_fee", "charge_fee", "supervised", "building_area", "wheelchair"], "moreFields": ["address", "operator", "gender"], "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"], "moreFields": ["lit", "wheelchair", "covered"], "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", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "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"},
-    "amenity/social_facility": {"icon": "temaki-social_facility", "fields": ["name", "operator", "operator/type", "address", "building_area", "social_facility", "social_facility_for"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "social_facility"}, "name": "Social Facility"},
+    "amenity/shower": {"icon": "temaki-shower", "fields": ["opening_hours", "access_simple", "fee", "payment_multi_fee", "charge_fee", "supervised", "building_area", "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"], "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", "email", "fax", "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"},
+    "amenity/social_facility": {"icon": "temaki-social_facility", "fields": ["name", "operator", "operator/type", "address", "building_area", "social_facility", "social_facility_for"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "social_facility"}, "name": "Social Facility"},
     "amenity/social_facility/ambulatory_care": {"icon": "maki-wheelchair", "geometry": ["point", "area"], "tags": {"amenity": "social_facility", "social_facility": "ambulatory_care"}, "reference": {"key": "social_facility", "value": "ambulatory_care"}, "name": "Ambulatory Care"},
     "amenity/social_facility/food_bank": {"icon": "temaki-social_facility", "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "social_facility", "social_facility": "food_bank"}, "reference": {"key": "social_facility", "value": "food_bank"}, "name": "Food Bank"},
     "amenity/social_facility/group_home": {"icon": "maki-wheelchair", "fields": ["{amenity/social_facility}", "wheelchair"], "geometry": ["point", "area"], "terms": ["old", "senior", "living", "care home", "assisted living"], "tags": {"amenity": "social_facility", "social_facility": "group_home", "social_facility:for": "senior"}, "reference": {"key": "social_facility", "value": "group_home"}, "name": "Elderly Group Home"},
     "amenity/social_facility/homeless_shelter": {"icon": "temaki-social_facility", "geometry": ["point", "area"], "terms": ["houseless", "unhoused", "displaced"], "tags": {"amenity": "social_facility", "social_facility": "shelter", "social_facility:for": "homeless"}, "reference": {"key": "social_facility", "value": "shelter"}, "name": "Homeless Shelter"},
     "amenity/social_facility/nursing_home": {"icon": "maki-wheelchair", "fields": ["{amenity/social_facility}", "wheelchair"], "geometry": ["point", "area"], "terms": ["elderly", "living", "nursing", "old", "senior", "assisted living"], "tags": {"amenity": "social_facility", "social_facility": "nursing_home", "social_facility:for": "senior"}, "reference": {"key": "social_facility", "value": "nursing_home"}, "name": "Nursing Home"},
-    "amenity/studio": {"icon": "fas-microphone", "fields": ["name", "studio", "address", "building_area"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["recording", "radio", "television"], "tags": {"amenity": "studio"}, "name": "Studio"},
+    "amenity/studio": {"icon": "fas-microphone", "fields": ["name", "studio", "address", "building_area", "website"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "wheelchair"], "geometry": ["point", "area"], "terms": ["recording", "radio", "television"], "tags": {"amenity": "studio"}, "name": "Studio"},
+    "amenity/studio/audio": {"icon": "fas-microphone", "geometry": ["point", "area"], "terms": ["audio mixing", "audio production", "audio recording", "audio studio"], "tags": {"amenity": "studio", "studio": "audio"}, "reference": {"key": "studio", "value": "audio"}, "name": "Recording Studio"},
+    "amenity/studio/radio": {"icon": "fas-microphone", "geometry": ["point", "area"], "terms": ["am radio", "fm radio", "radio broadcast", "radio studio"], "tags": {"amenity": "studio", "studio": "radio"}, "reference": {"key": "studio", "value": "radio"}, "name": "Radio Station"},
+    "amenity/studio/television": {"icon": "fas-video", "geometry": ["point", "area"], "terms": ["television broadcast", "television studio", "tv broadcast", "tv station", "tv studio"], "tags": {"amenity": "studio", "studio": "television"}, "reference": {"key": "studio", "value": "television"}, "name": "Television Station"},
+    "amenity/studio/video": {"icon": "fas-video", "geometry": ["point", "area"], "terms": ["movie production", "movie studio", "video production", "video recording", "video studio"], "tags": {"amenity": "studio", "studio": "video"}, "reference": {"key": "studio", "value": "video"}, "name": "Film Studio"},
     "amenity/taxi": {"icon": "fas-taxi", "fields": ["name", "operator", "capacity", "address"], "moreFields": ["access_simple", "brand", "opening_hours", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["cab"], "tags": {"amenity": "taxi"}, "name": "Taxi Stand"},
-    "amenity/telephone": {"icon": "maki-telephone", "fields": ["operator", "phone", "fee", "payment_multi_fee", "charge_fee", "booth"], "moreFields": ["covered", "indoor", "lit", "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", "internet_access", "internet_access/fee", "internet_access/ssid", "min_age", "payment_multi", "phone", "wheelchair"], "geometry": ["point", "area"], "terms": ["theatre", "performance", "play", "musical"], "tags": {"amenity": "theatre"}, "name": "Theater"},
+    "amenity/telephone": {"icon": "maki-telephone", "fields": ["operator", "phone", "fee", "payment_multi_fee", "charge_fee", "booth"], "moreFields": ["covered", "indoor", "level", "lit", "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", "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", "opening_hours", "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", "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/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/townhall": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["email", "fax", "phone", "polling_station", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["village", "city", "government", "courthouse", "municipal"], "tags": {"amenity": "townhall"}, "name": "Town Hall"},
-    "amenity/toy_library": {"icon": "fas-chess-knight", "fields": ["operator", "address", "building_area", "opening_hours"], "moreFields": ["website", "wheelchair"], "geometry": ["point", "area"], "terms": ["game", "toy"], "tags": {"amenity": "toy_library"}, "name": "Toy Library"},
+    "amenity/toy_library": {"icon": "fas-chess-knight", "fields": ["operator", "address", "building_area", "opening_hours"], "moreFields": ["level", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["game", "toy"], "tags": {"amenity": "toy_library"}, "name": "Toy Library"},
     "amenity/university": {"icon": "maki-college", "fields": ["{amenity/college}"], "moreFields": ["{amenity/college}"], "geometry": ["point", "area"], "terms": ["college", "graduate school", "PhD program", "master's degree program"], "tags": {"amenity": "university"}, "name": "University Grounds"},
     "amenity/vehicle_inspection": {"icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["car inspection"], "tags": {"amenity": "vehicle_inspection"}, "name": "Vehicle Inspection"},
-    "amenity/vending_machine": {"icon": "temaki-vending_machine", "fields": ["vending", "operator", "payment_multi", "currency_multi"], "moreFields": ["brand", "covered", "height", "indoor", "manufacturer"], "geometry": ["point"], "terms": [], "tags": {"amenity": "vending_machine"}, "matchScore": 0.9, "name": "Vending Machine"},
+    "amenity/vending_machine": {"icon": "temaki-vending_machine", "fields": ["vending", "operator", "payment_multi", "currency_multi"], "moreFields": ["blind", "brand", "covered", "height", "indoor", "level", "manufacturer"], "geometry": ["point"], "terms": [], "tags": {"amenity": "vending_machine"}, "matchScore": 0.9, "name": "Vending Machine"},
     "amenity/vending_machine/bottle_return": {"icon": "temaki-vending_machine", "fields": ["vending", "operator"], "geometry": ["point"], "terms": ["bottle return"], "tags": {"amenity": "vending_machine", "vending": "bottle_return"}, "reference": {"key": "vending", "value": "bottle_return"}, "name": "Bottle Return Machine"},
     "amenity/vending_machine/cigarettes": {"icon": "temaki-vending_machine", "moreFields": ["{amenity/vending_machine}", "min_age"], "geometry": ["point"], "terms": ["cigarette"], "tags": {"amenity": "vending_machine", "vending": "cigarettes"}, "reference": {"key": "vending", "value": "cigarettes"}, "name": "Cigarette Vending Machine"},
     "amenity/vending_machine/coffee": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["coffee"], "tags": {"amenity": "vending_machine", "vending": "coffee"}, "reference": {"key": "vending", "value": "coffee"}, "name": "Coffee Vending Machine"},
@@ -243,26 +250,27 @@
     "amenity/vending_machine/food": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["food"], "tags": {"amenity": "vending_machine", "vending": "food"}, "reference": {"key": "vending", "value": "food"}, "name": "Food Vending Machine"},
     "amenity/vending_machine/fuel": {"icon": "maki-fuel", "geometry": ["point"], "terms": ["petrol", "fuel", "gasoline", "propane", "diesel", "lng", "cng", "biodiesel"], "tags": {"amenity": "vending_machine", "vending": "fuel"}, "reference": {"key": "vending", "value": "fuel"}, "name": "Gas Pump", "matchScore": 0.5},
     "amenity/vending_machine/ice_cream": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["chocolate", "ice cream", "frozen", "popsicle", "vanilla"], "tags": {"amenity": "vending_machine", "vending": "ice_cream"}, "reference": {"key": "vending", "value": "ice_cream"}, "name": "Ice Cream Vending Machine"},
-    "amenity/vending_machine/newspapers": {"icon": "far-newspaper", "fields": ["vending", "operator", "fee", "payment_multi_fee", "charge_fee", "currency_multi"], "geometry": ["point"], "terms": ["newspaper"], "tags": {"amenity": "vending_machine", "vending": "newspapers"}, "reference": {"key": "vending", "value": "newspapers"}, "name": "Newspaper Vending Machine"},
+    "amenity/vending_machine/newspapers": {"icon": "temaki-vending_newspaper", "fields": ["vending", "operator", "fee", "payment_multi_fee", "charge_fee", "currency_multi"], "geometry": ["point"], "terms": ["newspaper"], "tags": {"amenity": "vending_machine", "vending": "newspapers"}, "reference": {"key": "vending", "value": "newspapers"}, "name": "Newspaper Vending Machine"},
     "amenity/vending_machine/parcel_pickup_dropoff": {"icon": "temaki-vending_machine", "fields": ["vending", "operator", "payment_multi", "currency_multi"], "geometry": ["point"], "terms": ["mail", "parcel", "pickup"], "tags": {"amenity": "vending_machine", "vending": "parcel_pickup;parcel_mail_in"}, "reference": {"key": "vending", "value": "parcel_pickup;parcel_mail_in"}, "name": "Parcel Pickup/Dropoff Locker"},
     "amenity/vending_machine/parcel_pickup": {"icon": "temaki-vending_machine", "fields": ["vending", "operator"], "geometry": ["point"], "terms": ["amazon", "locker", "mail", "parcel", "pickup"], "tags": {"amenity": "vending_machine", "vending": "parcel_pickup"}, "reference": {"key": "vending", "value": "parcel_pickup"}, "name": "Parcel Pickup Locker"},
     "amenity/vending_machine/parking_tickets": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["parking", "ticket"], "tags": {"amenity": "vending_machine", "vending": "parking_tickets"}, "reference": {"key": "vending", "value": "parking_tickets"}, "matchScore": 0.94, "name": "Parking Ticket Vending Machine"},
     "amenity/vending_machine/public_transport_tickets": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["bus", "train", "ferry", "rail", "ticket", "transportation"], "tags": {"amenity": "vending_machine", "vending": "public_transport_tickets"}, "reference": {"key": "vending", "value": "public_transport_tickets"}, "name": "Transit Ticket Vending Machine"},
     "amenity/vending_machine/stamps": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["mail", "postage", "stamp"], "tags": {"amenity": "vending_machine", "vending": "stamps"}, "reference": {"key": "vending", "value": "stamps"}, "name": "Postage Vending Machine"},
     "amenity/vending_machine/sweets": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["candy", "gum", "chip", "pretzel", "cookie", "cracker"], "tags": {"amenity": "vending_machine", "vending": "sweets"}, "reference": {"key": "vending", "value": "sweets"}, "name": "Snack Vending Machine"},
-    "amenity/veterinary": {"icon": "temaki-veterinary_care", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["charge_fee", "fee", "payment_multi_fee", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["pet clinic", "veterinarian", "animal hospital", "pet doctor"], "tags": {"amenity": "veterinary"}, "name": "Veterinary"},
+    "amenity/veterinary": {"icon": "temaki-veterinary_care", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["charge_fee", "email", "fax", "fee", "level", "payment_multi_fee", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["pet clinic", "veterinarian", "animal hospital", "pet doctor"], "tags": {"amenity": "veterinary"}, "name": "Veterinary"},
     "amenity/waste_basket": {"icon": "maki-waste-basket", "fields": ["operator", "waste", "collection_times", "material", "colour"], "moreFields": ["covered", "indoor", "manufacturer"], "geometry": ["point", "vertex"], "tags": {"amenity": "waste_basket"}, "terms": ["bin", "garbage", "rubbish", "litter", "trash"], "name": "Waste Basket"},
     "amenity/waste_disposal": {"icon": "fas-dumpster", "fields": ["operator", "waste", "collection_times", "access_simple"], "moreFields": ["brand", "colour", "height", "manufacturer", "material"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "waste_disposal"}, "terms": ["garbage", "rubbish", "litter", "trash"], "name": "Garbage Dumpster"},
     "amenity/waste_transfer_station": {"icon": "maki-waste-basket", "fields": ["name", "operator", "operator/type", "waste", "address", "opening_hours", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["dump", "garbage", "recycling", "rubbish", "scrap", "trash"], "tags": {"amenity": "waste_transfer_station"}, "name": "Waste Transfer Station"},
     "amenity/waste/dog_excrement": {"icon": "maki-waste-basket", "fields": ["collection_times"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "waste_basket", "waste": "dog_excrement"}, "reference": {"key": "waste", "value": "dog_excrement"}, "terms": ["bin", "garbage", "rubbish", "litter", "trash", "poo", "dog"], "name": "Dog Excrement Bin"},
     "amenity/water_point": {"icon": "maki-drinking-water", "fields": ["operator", "fee", "payment_multi_fee", "charge_fee", "opening_hours"], "geometry": ["area", "vertex", "point"], "tags": {"amenity": "water_point"}, "name": "RV Drinking Water"},
     "amenity/watering_place": {"icon": "maki-drinking-water", "fields": ["operator", "fee", "payment_multi_fee", "charge_fee", "opening_hours"], "geometry": ["area", "vertex", "point"], "tags": {"amenity": "watering_place"}, "name": "Animal Watering Place"},
+    "amenity/weighbridge": {"icon": "fas-weight", "fields": ["ref", "operator", "access_simple", "maxweight"], "moreFields": ["address", "colour", "lit", "manufacturer", "material", "wheelchair"], "geometry": ["point", "vertex"], "terms": ["weigh station", "weighbridge"], "tags": {"amenity": "weighbridge"}, "name": "Truck Scale"},
     "area": {"fields": ["name"], "geometry": ["area"], "tags": {"area": "yes"}, "terms": ["polygon"], "name": "Area", "matchScore": 0.1},
     "area/highway": {"fields": ["name", "area/highway", "surface"], "geometry": ["area"], "terms": ["area:highway", "edge of pavement", "highway area", "highway shape", "pavement", "road shape", "street area"], "tags": {"area:highway": "*"}, "name": "Road Surface"},
     "attraction/amusement_ride": {"icon": "maki-amusement-park", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "carnival ride"], "tags": {"attraction": "amusement_ride"}, "name": "Amusement Ride"},
     "attraction/animal": {"icon": "maki-zoo", "fields": ["name", "operator", "species/wikidata"], "geometry": ["point", "area"], "terms": ["amphibian", "animal park", "aquarium", "bear", "bird", "fish", "insect", "lion", "mammal", "monkey", "penguin", "reptile", "safari", "theme park", "tiger", "zoo"], "tags": {"attraction": "animal"}, "name": "Animal Enclosure"},
     "attraction/big_wheel": {"icon": "maki-amusement-park", "fields": ["{attraction}", "height"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point"], "terms": ["ferris wheel", "theme park", "amusement ride"], "tags": {"attraction": "big_wheel"}, "name": "Big Wheel"},
-    "attraction/bumper_car": {"icon": "maki-car", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "dodgem cars", "autoscooter"], "tags": {"attraction": "bumper_car"}, "name": "Bumper Car"},
+    "attraction/bumper_car": {"icon": "fas-car-crash", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "dodgem cars", "autoscooter"], "tags": {"attraction": "bumper_car"}, "name": "Bumper Cars"},
     "attraction/bungee_jumping": {"icon": "maki-pitch", "fields": ["{attraction}", "height"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "bungy jumping", "jumping platform"], "tags": {"attraction": "bungee_jumping"}, "name": "Bungee Jumping"},
     "attraction/carousel": {"icon": "temaki-amusement_park", "fields": ["{attraction}", "building_area"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "roundabout", "merry-go-round", "galloper", "jumper", "horseabout", "flying horses"], "tags": {"attraction": "carousel"}, "name": "Carousel"},
     "attraction/dark_ride": {"icon": "maki-rail-metro", "fields": ["{attraction}", "building_area"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "line", "area"], "terms": ["theme park", "ghost train"], "tags": {"attraction": "dark_ride"}, "name": "Dark Ride"},
@@ -270,15 +278,16 @@
     "attraction/maze": {"icon": "maki-amusement-park", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "amusement ride", "labyrinth"], "tags": {"attraction": "maze"}, "name": "Maze"},
     "attraction/pirate_ship": {"icon": "maki-danger", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point"], "terms": ["theme park", "carnival ride", "amusement ride"], "tags": {"attraction": "pirate_ship"}, "name": "Pirate Ship"},
     "attraction/river_rafting": {"icon": "maki-ferry", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "line"], "terms": ["theme park", "aquatic park", "water park", "rafting simulator", "river rafting ride", "river rapids ride"], "tags": {"attraction": "river_rafting"}, "name": "River Rafting"},
-    "attraction/roller_coaster": {"icon": "maki-amusement-park", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "amusement ride"], "tags": {"attraction": "roller_coaster"}, "name": "Roller Coaster"},
+    "attraction/roller_coaster": {"icon": "temaki-roller_coaster", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "amusement ride"], "tags": {"attraction": "roller_coaster"}, "name": "Roller Coaster"},
     "attraction/summer_toboggan": {"icon": "temaki-sledding", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["line"], "terms": ["alpine slide", "mountain coaster"], "tags": {"attraction": "summer_toboggan"}, "name": "Summer Toboggan"},
     "attraction/train": {"icon": "maki-rail", "fields": ["{attraction}", "fee", "charge_fee"], "geometry": ["point", "line"], "terms": ["theme park", "rackless train", "road train", "Tschu-Tschu train", "dotto train", "park train"], "tags": {"attraction": "train"}, "name": "Tourist Train"},
     "attraction/water_slide": {"icon": "fas-swimmer", "fields": ["{attraction}", "height"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["line", "area"], "terms": ["theme park", "aquatic park", "water park", "flumes", "water chutes", "hydroslides"], "tags": {"attraction": "water_slide"}, "name": "Water Slide"},
-    "barrier": {"icon": "maki-roadblock", "geometry": ["point", "vertex", "line", "area"], "tags": {"barrier": "*"}, "fields": ["barrier"], "name": "Barrier", "matchScore": 0.4},
+    "barrier": {"icon": "maki-roadblock", "geometry": ["point", "vertex", "line", "area"], "tags": {"barrier": "*"}, "fields": ["barrier"], "moreFields": ["level"], "name": "Barrier", "matchScore": 0.4},
     "barrier/entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "tags": {"barrier": "entrance"}, "name": "Entrance", "searchable": false},
     "barrier/block": {"icon": "maki-roadblock", "fields": ["access", "material"], "geometry": ["point", "vertex"], "tags": {"barrier": "block"}, "name": "Block"},
-    "barrier/bollard": {"icon": "maki-roadblock", "fields": ["access", "material"], "geometry": ["point", "vertex", "line"], "tags": {"barrier": "bollard"}, "name": "Bollard"},
-    "barrier/border_control": {"icon": "maki-roadblock", "fields": ["access", "building_area"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["vertex", "area"], "tags": {"barrier": "border_control"}, "name": "Border Control"},
+    "barrier/bollard_line": {"icon": "temaki-silo", "fields": ["access", "bollard", "height", "material", "colour"], "geometry": ["line"], "tags": {"barrier": "bollard"}, "name": "Bollard Row"},
+    "barrier/bollard": {"icon": "temaki-silo", "fields": ["access", "bollard", "height", "width", "material", "colour"], "geometry": ["point", "vertex"], "tags": {"barrier": "bollard"}, "name": "Bollard"},
+    "barrier/border_control": {"icon": "maki-roadblock", "fields": ["access", "building_area"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["vertex", "area"], "tags": {"barrier": "border_control"}, "name": "Border Control"},
     "barrier/cattle_grid": {"icon": "maki-barrier", "geometry": ["vertex"], "tags": {"barrier": "cattle_grid"}, "name": "Cattle Grid"},
     "barrier/chain": {"icon": "maki-barrier", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "chain"}, "name": "Chain"},
     "barrier/city_wall": {"icon": "temaki-wall", "fields": ["height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "city_wall"}, "name": "City Wall"},
@@ -296,10 +305,10 @@
     "barrier/kerb/raised": {"icon": "temaki-kerb-raised", "fields": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"kerb": "raised"}, "addTags": {"barrier": "kerb", "kerb": "raised"}, "reference": {"key": "kerb", "value": "raised"}, "terms": [], "matchScore": 0.55, "name": "Raised Curb"},
     "barrier/kerb/rolled": {"icon": "temaki-kerb-rolled", "fields": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"kerb": "rolled"}, "addTags": {"barrier": "kerb", "kerb": "rolled"}, "reference": {"key": "kerb", "value": "rolled"}, "terms": ["gutter"], "matchScore": 0.55, "name": "Rolled Curb"},
     "barrier/kissing_gate": {"icon": "maki-barrier", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "kissing_gate"}, "name": "Kissing Gate"},
-    "barrier/lift_gate": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "lift_gate"}, "name": "Lift Gate"},
+    "barrier/lift_gate": {"icon": "temaki-lift_gate", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "lift_gate"}, "name": "Lift Gate"},
     "barrier/retaining_wall": {"icon": "temaki-wall", "fields": ["height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "retaining_wall"}, "name": "Retaining Wall"},
     "barrier/sally_port": {"icon": "fas-dungeon", "geometry": ["vertex"], "tags": {"barrier": "sally_port"}, "terms": ["Postern", "castle side gate"], "name": "Sally Port"},
-    "barrier/stile": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "stile"}, "name": "Stile"},
+    "barrier/stile": {"icon": "maki-roadblock", "fields": ["access", "stile", "material"], "geometry": ["vertex"], "tags": {"barrier": "stile"}, "name": "Stile"},
     "barrier/toll_booth": {"icon": "maki-roadblock", "fields": ["access", "building_area", "payment_multi", "currency_multi"], "moreFields": ["address", "email", "fax", "opening_hours", "phone", "website"], "geometry": ["vertex", "area"], "tags": {"barrier": "toll_booth"}, "name": "Toll Booth"},
     "barrier/turnstile": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex"], "terms": ["baffle gate", "turnstyle"], "tags": {"barrier": "turnstile"}, "name": "Turnstile"},
     "barrier/wall": {"icon": "temaki-wall", "fields": ["wall", "height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "wall"}, "name": "Wall", "matchScore": 0.25},
@@ -307,7 +316,7 @@
     "bridge/support": {"icon": "fas-archway", "fields": ["bridge/support", "height", "layer", "material"], "moreFields": ["colour", "seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "*"}, "name": "Bridge Support"},
     "bridge/support/pier": {"icon": "fas-archway", "fields": ["bridge/support", "{bridge/support}"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "pier"}, "name": "Bridge Pier"},
     "building_part": {"icon": "maki-building", "fields": ["levels", "height", "building/material", "roof/colour"], "moreFields": ["layer"], "geometry": ["area"], "tags": {"building:part": "*"}, "matchScore": 0.5, "terms": ["roof", "simple 3D buildings"], "name": "Building Part"},
-    "building": {"icon": "maki-home", "fields": ["name", "building", "levels", "height", "address"], "moreFields": ["architect", "building/levels/underground", "building/material", "not/name", "layer", "operator", "roof/colour", "smoking", "wheelchair"], "geometry": ["area"], "tags": {"building": "*"}, "matchScore": 0.6, "terms": [], "name": "Building"},
+    "building": {"icon": "maki-home", "fields": ["name", "building", "levels", "height", "address"], "moreFields": ["architect", "building/levels/underground", "building/material", "layer", "not/name", "operator", "roof/colour", "smoking", "wheelchair"], "geometry": ["area"], "tags": {"building": "*"}, "matchScore": 0.6, "terms": [], "name": "Building"},
     "building/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},
@@ -349,8 +358,8 @@
     "building/ruins": {"icon": "temaki-ruins", "geometry": ["area"], "tags": {"building": "ruins"}, "matchScore": 0.5, "name": "Building Ruins"},
     "building/school": {"icon": "maki-building", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"building": "school"}, "matchScore": 0.5, "name": "School Building"},
     "building/semidetached_house": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "semidetached_house"}, "terms": ["home", "double", "duplex", "twin", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "Semi-Detached House"},
-    "building/service": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "service"}, "matchScore": 0.5, "name": "Service Building"},
-    "building/shed": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "shed"}, "matchScore": 0.5, "name": "Shed"},
+    "building/service": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "service"}, "matchScore": 0.5, "name": "Service Building"},
+    "building/shed": {"icon": "fas-warehouse", "fields": ["{building}", "lockable"], "geometry": ["area"], "tags": {"building": "shed"}, "matchScore": 0.5, "name": "Shed"},
     "building/stable": {"icon": "maki-horse-riding", "geometry": ["area"], "tags": {"building": "stable"}, "matchScore": 0.5, "name": "Stable"},
     "building/stadium": {"icon": "maki-stadium", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "stadium"}, "matchScore": 0.5, "name": "Stadium Building"},
     "building/static_caravan": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "static_caravan"}, "matchScore": 0.5, "name": "Static Mobile Home"},
@@ -359,9 +368,9 @@
     "building/transportation": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "transportation"}, "matchScore": 0.5, "name": "Transportation Building"},
     "building/university": {"icon": "maki-building", "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"], "moreFields": ["access_simple", "building/levels_building", "height_building", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "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"], "moreFields": ["access_simple", "building/levels_building", "email", "fax", "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"], "moreFields": ["air_conditioning", "building/levels_building", "height_building", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "product", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"craft": "*"}, "terms": [], "name": "Craft"},
+    "craft": {"icon": "temaki-tools", "fields": ["name", "craft", "operator", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "email", "fax", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "product", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"craft": "*"}, "terms": [], "name": "Craft"},
     "craft/jeweler": {"icon": "maki-marker-stroked", "geometry": ["point", "area"], "tags": {"craft": "jeweler"}, "reference": {"key": "shop", "value": "jewelry"}, "name": "Jeweler", "searchable": false, "replacement": "shop/jewelry"},
     "craft/locksmith": {"icon": "maki-marker-stroked", "geometry": ["point", "area"], "tags": {"craft": "locksmith"}, "reference": {"key": "shop", "value": "locksmith"}, "name": "Locksmith", "searchable": false},
     "craft/optician": {"icon": "maki-marker-stroked", "geometry": ["point", "area"], "tags": {"craft": "optician"}, "reference": {"key": "shop", "value": "optician"}, "name": "Optician", "searchable": false, "replacement": "shop/optician"},
@@ -421,19 +430,19 @@
     "emergency/official": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "official"}, "terms": [], "name": "Emergency Access Official", "searchable": false, "matchScore": 0.01},
     "emergency/private": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "private"}, "terms": [], "name": "Emergency Access Private", "searchable": false, "matchScore": 0.01},
     "emergency/yes": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "yes"}, "terms": [], "name": "Emergency Access Yes", "searchable": false, "matchScore": 0.01},
-    "emergency/ambulance_station": {"icon": "fas-ambulance", "fields": ["name", "operator", "building_area", "address"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["EMS", "EMT", "rescue"], "tags": {"emergency": "ambulance_station"}, "name": "Ambulance Station"},
-    "emergency/defibrillator": {"icon": "maki-defibrillator", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["AED"], "tags": {"emergency": "defibrillator"}, "name": "Defibrillator"},
-    "emergency/fire_alarm": {"icon": "fas-bell", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_alarm_box"}, "name": "Fire Alarm Call Box"},
-    "emergency/fire_extinguisher": {"icon": "fas-fire-extinguisher", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_extinguisher"}, "name": "Fire Extinguisher"},
-    "emergency/fire_hose": {"icon": "fas-fire-extinguisher", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_hose"}, "name": "Fire Hose"},
-    "emergency/fire_hydrant": {"icon": "temaki-fire_hydrant", "fields": ["ref", "fire_hydrant/type", "colour", "water_source", "couplings"], "moreFields": ["fire_hydrant/pressure", "fire_hydrant/diameter", "water_volume", "survey/date"], "geometry": ["point", "vertex"], "terms": ["fire plug", "fire water well", "hydrant"], "tags": {"emergency": "fire_hydrant"}, "name": "Fire Hydrant"},
-    "emergency/first_aid_kit": {"icon": "fas-medkit", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["bandage", "first aid", "med", "med kit", "medic*", "medkit"], "tags": {"emergency": "first_aid_kit"}, "name": "First Aid Kit"},
+    "emergency/ambulance_station": {"icon": "fas-ambulance", "fields": ["name", "operator", "building_area", "address"], "moreFields": ["email", "fax", "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/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"},
+    "emergency/fire_hydrant": {"icon": "temaki-fire_hydrant", "fields": ["ref", "fire_hydrant/type", "colour", "water_source", "couplings"], "moreFields": ["fire_hydrant/diameter", "fire_hydrant/pressure", "level", "survey/date", "water_volume"], "geometry": ["point", "vertex"], "terms": ["fire plug", "fire water well", "hydrant"], "tags": {"emergency": "fire_hydrant"}, "name": "Fire Hydrant"},
+    "emergency/first_aid_kit": {"icon": "fas-medkit", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "terms": ["bandage", "first aid", "med", "med kit", "medic*", "medkit"], "tags": {"emergency": "first_aid_kit"}, "name": "First Aid Kit"},
     "emergency/life_ring": {"icon": "fas-life-ring", "fields": ["ref", "operator"], "geometry": ["point", "vertex"], "terms": ["life buoy", "kisby ring", "kisbie ring", "perry buoy"], "tags": {"emergency": "life_ring"}, "name": "Life Ring"},
     "emergency/lifeguard": {"icon": "fas-life-ring", "fields": ["ref", "operator", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["CPR", "rescue"], "tags": {"emergency": "lifeguard"}, "name": "Lifeguard"},
-    "emergency/phone": {"icon": "maki-emergency-phone", "fields": ["ref", "operator", "covered", "indoor", "booth"], "geometry": ["point", "vertex"], "tags": {"emergency": "phone"}, "name": "Emergency Phone"},
+    "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"},
-    "entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "terms": ["entrance", "exit", "door"], "tags": {"entrance": "*"}, "fields": ["entrance", "door", "access_simple", "address"], "matchScore": 0.8, "name": "Entrance/Exit"},
+    "entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "terms": ["entrance", "exit", "door"], "tags": {"entrance": "*"}, "fields": ["entrance", "door", "access_simple", "level", "address"], "matchScore": 0.8, "name": "Entrance/Exit"},
     "ford": {"icon": "temaki-pedestrian", "fields": ["name", "access", "seasonal"], "geometry": ["vertex"], "tags": {"ford": "yes"}, "name": "Ford"},
     "golf/bunker": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "bunker"}, "addTags": {"golf": "bunker", "natural": "sand"}, "terms": ["hazard", "bunker"], "name": "Sand Trap"},
     "golf/cartpath": {"icon": "temaki-golf_cart", "fields": ["{golf/path}", "maxspeed"], "geometry": ["line"], "tags": {"golf": "cartpath"}, "addTags": {"golf": "cartpath", "golf_cart": "designated", "highway": "service"}, "name": "Golf Cartpath"},
@@ -446,7 +455,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": ["building/levels_building", "height_building", "opening_hours", "payment_multi", "brand", "website", "phone", "email", "fax", "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"], "moreFields": ["brand", "building/levels_building", "email", "fax", "height_building", "level", "opening_hours", "payment_multi", "phone", "website", "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"},
@@ -475,12 +484,12 @@
     "highway/crossing/marked": {"icon": "temaki-pedestrian", "fields": ["crossing", "tactile_paving", "crossing/island"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "marked"}, "addTags": {"highway": "crossing", "crossing": "marked"}, "reference": {"key": "highway", "value": "crossing"}, "terms": ["zebra crossing", "marked crossing", "crosswalk"], "name": "Marked Crosswalk"},
     "highway/crossing/unmarked-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "tactile_paving", "crossing/island"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "name": "Unmarked Crossing (Raised)"},
     "highway/crossing/unmarked": {"icon": "temaki-pedestrian", "fields": ["crossing", "tactile_paving", "crossing/island"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "unmarked"}, "addTags": {"highway": "crossing", "crossing": "unmarked"}, "reference": {"key": "crossing", "value": "unmarked"}, "terms": [], "name": "Unmarked Crossing"},
-    "highway/cycleway": {"icon": "fas-biking", "fields": ["name", "oneway", "surface", "width", "structure", "access", "incline"], "moreFields": ["covered", "dog", "lit", "maxspeed", "maxweight_bridge", "not/name", "smoothness", "stroller", "wheelchair"], "geometry": ["line"], "tags": {"highway": "cycleway"}, "terms": ["bike path", "bicyle path"], "matchScore": 0.9, "name": "Cycle Path"},
+    "highway/cycleway": {"icon": "fas-biking", "fields": ["name", "oneway", "surface", "width", "structure", "access", "incline"], "moreFields": ["covered", "dog", "lit", "maxspeed", "maxweight_bridge", "not/name", "smoothness", "stroller", "wheelchair"], "geometry": ["line"], "tags": {"highway": "cycleway"}, "terms": ["bicyle path", "bike path", "cycling path"], "matchScore": 0.9, "name": "Cycle Path"},
     "highway/cycleway/crossing": {"icon": "fas-biking", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"cycleway": "crossing"}, "addTags": {"highway": "cycleway", "cycleway": "crossing"}, "reference": {"key": "cycleway", "value": "crossing"}, "searchable": false, "matchScore": 0.95, "name": "Cycle Crossing"},
-    "highway/cycleway/bicycle_foot": {"countryCodes": ["ca", "gb", "mx", "us"], "icon": "fas-biking", "geometry": ["line"], "tags": {"highway": "cycleway", "foot": "designated"}, "addTags": {"highway": "cycleway", "foot": "designated", "bicycle": "designated"}, "terms": ["bicycle and foot path", "bike and pedestrian path", "green way", "greenway", "mixed-use trail", "multi-use trail", "segregated trail", "rail trail"], "matchScore": 0.95, "name": "Cycle & Foot Path"},
+    "highway/cycleway/bicycle_foot": {"notCountryCodes": ["fr", "lt"], "icon": "fas-biking", "geometry": ["line"], "tags": {"highway": "cycleway", "foot": "designated"}, "addTags": {"highway": "cycleway", "foot": "designated", "bicycle": "designated"}, "terms": ["bicycle and foot path", "bike and pedestrian path", "green way", "greenway", "mixed-use trail", "multi-use trail", "segregated trail", "rail trail"], "matchScore": 0.95, "name": "Cycle & Foot Path"},
     "highway/cycleway/crossing/marked": {"icon": "fas-biking", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"cycleway": "crossing", "crossing": "marked"}, "addTags": {"highway": "cycleway", "cycleway": "crossing", "crossing": "marked"}, "reference": {"key": "cycleway", "value": "crossing"}, "terms": ["cycle crosswalk", "cycle path crossing", "cycleway crossing", "bicycle crossing", "bike crossing"], "name": "Marked Cycle Crossing"},
     "highway/cycleway/crossing/unmarked": {"icon": "fas-biking", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"cycleway": "crossing", "crossing": "unmarked"}, "addTags": {"highway": "cycleway", "cycleway": "crossing", "crossing": "unmarked"}, "reference": {"key": "cycleway", "value": "crossing"}, "terms": ["cycle path crossing", "cycleway crossing", "bicycle crossing", "bike crossing"], "name": "Unmarked Cycle Crossing"},
-    "highway/elevator": {"icon": "temaki-elevator", "fields": ["access_simple", "opening_hours", "maxweight", "ref", "wheelchair"], "moreFields": ["maxheight"], "geometry": ["vertex"], "tags": {"highway": "elevator"}, "terms": ["lift"], "name": "Elevator"},
+    "highway/elevator": {"icon": "temaki-elevator", "fields": ["ref", "level_semi", "access_simple", "wheelchair", "maxweight"], "moreFields": ["maxheight", "opening_hours"], "geometry": ["vertex"], "tags": {"highway": "elevator"}, "terms": ["lift"], "name": "Elevator"},
     "highway/emergency_bay": {"icon": "maki-car", "geometry": ["vertex"], "tags": {"highway": "emergency_bay"}, "terms": ["Highway Emergency Bay"], "name": "Emergency Stopping Place"},
     "highway/footway": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "width", "structure", "access", "incline"], "moreFields": ["covered", "dog", "lit", "maxweight_bridge", "not/name", "smoothness", "stroller", "tactile_paving", "wheelchair"], "geometry": ["line"], "terms": ["hike", "hiking", "promenade", "trackway", "trail", "walk"], "tags": {"highway": "footway"}, "matchScore": 0.9, "name": "Foot Path"},
     "highway/footway/crossing": {"fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"footway": "crossing"}, "addTags": {"highway": "footway", "footway": "crossing"}, "reference": {"key": "footway", "value": "crossing"}, "matchScore": 0.95, "searchable": false, "name": "Pedestrian Crossing"},
@@ -500,16 +509,17 @@
     "highway/motorway_link": {"icon": "iD-highway-motorway-link", "fields": ["destination_oneway", "destination/ref_oneway", "junction/ref_oneway", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["charge_toll", "covered", "destination/symbol_oneway", "incline", "junction_line", "lit", "maxheight", "maxspeed/advisory", "maxweight_bridge", "name", "ref_road_number", "smoothness", "toll"], "geometry": ["line"], "tags": {"highway": "motorway_link"}, "addTags": {"highway": "motorway_link", "oneway": "yes"}, "terms": ["exit", "ramp", "road", "street", "on ramp", "off ramp"], "name": "Motorway Link"},
     "highway/motorway": {"icon": "iD-highway-motorway", "fields": ["name", "ref_road_number", "oneway_yes", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["charge_toll", "covered", "incline", "junction_line", "lit", "maxheight", "maxweight_bridge", "minspeed", "not/name", "smoothness", "toll"], "geometry": ["line"], "tags": {"highway": "motorway"}, "terms": ["autobahn", "expressway", "freeway", "highway", "interstate", "parkway", "road", "street", "thruway", "turnpike"], "name": "Motorway"},
     "highway/passing_place": {"icon": "maki-circle-stroked", "geometry": ["vertex"], "tags": {"highway": "passing_place"}, "terms": ["turnout, pullout"], "name": "Passing Place"},
-    "highway/path": {"icon": "iD-other-line", "fields": ["name", "surface", "width", "structure", "access", "incline"], "moreFields": ["covered", "dog", "horse_scale", "lit", "maxweight_bridge", "mtb/scale", "mtb/scale/uphill", "mtb/scale/imba", "not/name", "ref", "sac_scale", "smoothness", "stroller", "trail_visibility", "wheelchair"], "geometry": ["line"], "terms": ["hike", "hiking", "trackway", "trail", "walk"], "tags": {"highway": "path"}, "name": "Path"},
+    "highway/path": {"icon": "iD-other-line", "fields": ["name", "surface", "width", "structure", "access", "incline"], "moreFields": ["covered", "dog", "horse_scale", "informal", "lit", "maxweight_bridge", "mtb/scale", "mtb/scale/imba", "mtb/scale/uphill", "not/name", "ref", "sac_scale", "smoothness", "stroller", "trail_visibility", "wheelchair"], "geometry": ["line"], "terms": ["hike", "hiking", "trackway", "trail", "walk"], "tags": {"highway": "path"}, "name": "Path"},
+    "highway/path/informal": {"icon": "iD-other-line", "fields": ["surface", "width", "access", "trail_visibility", "smoothness", "incline"], "moreFields": ["covered", "dog", "horse_scale", "informal", "lit", "maxweight_bridge", "mtb/scale", "mtb/scale/imba", "mtb/scale/uphill", "sac_scale", "stroller", "structure", "wheelchair"], "geometry": ["line"], "terms": ["bootleg trail", "cow path", "desire line", "desire path", "desireline", "desirepath", "elephant path", "game trail", "goat track", "herd path", "pig trail", "shortcut", "social trail", "use trail"], "tags": {"highway": "path", "informal": "yes"}, "reference": {"key": "informal"}, "name": "Informal Path"},
     "highway/pedestrian_area": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "lit", "width", "structure", "access"], "geometry": ["area"], "tags": {"highway": "pedestrian", "area": "yes"}, "terms": ["center", "centre", "plaza", "quad", "square", "walkway"], "name": "Pedestrian Area"},
     "highway/pedestrian_line": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "lit", "width", "oneway", "structure", "access"], "moreFields": ["covered", "incline", "maxweight_bridge", "smoothness"], "geometry": ["line"], "tags": {"highway": "pedestrian"}, "terms": ["center", "centre", "plaza", "quad", "square", "walkway"], "name": "Pedestrian Street"},
-    "highway/primary_link": {"icon": "iD-highway-primary-link", "fields": ["destination_oneway", "destination/ref_oneway", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["charge_toll", "covered", "cycleway", "destination/symbol_oneway", "flood_prone", "incline", "junction/ref_oneway", "junction_line", "lit", "maxheight", "maxspeed/advisory", "maxweight_bridge", "name", "oneway/bicycle", "ref_road_number", "smoothness", "toll", "trolley_wire"], "geometry": ["line"], "tags": {"highway": "primary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Primary Link"},
+    "highway/primary_link": {"icon": "iD-highway-primary-link", "fields": ["destination_oneway", "destination/ref_oneway", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["charge_toll", "covered", "cycleway", "destination/symbol_oneway", "flood_prone", "incline", "junction_line", "junction/ref_oneway", "lit", "maxheight", "maxspeed/advisory", "maxweight_bridge", "name", "oneway/bicycle", "ref_road_number", "smoothness", "toll", "trolley_wire"], "geometry": ["line"], "tags": {"highway": "primary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Primary Link"},
     "highway/primary": {"icon": "iD-highway-primary", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "ref_road_number", "access"], "moreFields": ["charge_toll", "covered", "cycleway", "flood_prone", "incline", "junction_line", "lit", "maxheight", "maxspeed/advisory", "maxweight_bridge", "not/name", "oneway/bicycle", "smoothness", "toll", "trolley_wire"], "geometry": ["line"], "tags": {"highway": "primary"}, "terms": ["road", "street"], "name": "Primary Road"},
     "highway/raceway": {"icon": "fas-flag-checkered", "fields": ["name", "oneway", "surface", "sport_racing_motor", "lit", "width", "lanes", "structure"], "geometry": ["line", "area"], "tags": {"highway": "raceway"}, "addTags": {"highway": "raceway", "sport": "motor"}, "terms": ["auto*", "formula one", "kart", "motocross", "nascar", "race*", "track"], "name": "Motorsport Racetrack"},
     "highway/raceway/karting": {"icon": "fas-flag-checkered", "geometry": ["line", "area"], "tags": {"highway": "raceway", "sport": "karting"}, "terms": ["carting", "go carts", "go karts", "go-karts", "gokarts", "kart racing", "karting track", "motorsports", "shifter karts", "superkarts"], "name": "Karting Racetrack"},
     "highway/raceway/motocross": {"icon": "fas-motorcycle", "geometry": ["line", "area"], "tags": {"highway": "raceway", "sport": "motocross"}, "terms": ["off-road racing", "offroad moto racing", "motocross circuit", "motorcycle track", "motorsports"], "name": "Motocross Racetrack"},
-    "highway/residential": {"icon": "iD-highway-residential", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["covered", "cycleway", "flood_prone", "incline", "junction_line", "lit", "oneway/bicycle", "maxheight", "maxspeed/advisory", "maxweight_bridge", "not/name", "smoothness", "trolley_wire"], "geometry": ["line"], "tags": {"highway": "residential"}, "terms": ["road", "street"], "name": "Residential Road"},
-    "highway/rest_area": {"icon": "maki-car", "fields": ["name", "operator", "opening_hours"], "moreFields": ["address", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"highway": "rest_area"}, "terms": ["rest stop"], "name": "Rest Area"},
+    "highway/residential": {"icon": "iD-highway-residential", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["covered", "cycleway", "flood_prone", "incline", "junction_line", "lit", "maxheight", "maxspeed/advisory", "maxweight_bridge", "not/name", "oneway/bicycle", "smoothness", "trolley_wire"], "geometry": ["line"], "tags": {"highway": "residential"}, "terms": ["road", "street"], "name": "Residential Road"},
+    "highway/rest_area": {"icon": "maki-car", "fields": ["name", "operator", "opening_hours"], "moreFields": ["address", "email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"highway": "rest_area"}, "terms": ["rest stop"], "name": "Rest Area"},
     "highway/road": {"icon": "iD-other-line", "fields": ["highway", "{highway/residential}"], "moreFields": ["{highway/residential}"], "geometry": ["line"], "tags": {"highway": "road"}, "terms": ["road", "street"], "name": "Unknown Road"},
     "highway/secondary_link": {"icon": "iD-highway-secondary-link", "fields": ["{highway/primary_link}"], "moreFields": ["{highway/primary_link}"], "geometry": ["line"], "tags": {"highway": "secondary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Secondary Link"},
     "highway/secondary": {"icon": "iD-highway-secondary", "fields": ["{highway/primary}"], "moreFields": ["{highway/primary}"], "geometry": ["line"], "tags": {"highway": "secondary"}, "terms": ["road", "street"], "name": "Secondary Road"},
@@ -521,18 +531,18 @@
     "highway/service/parking_aisle": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"highway": "service", "service": "parking_aisle"}, "reference": {"key": "service", "value": "parking_aisle"}, "name": "Parking Aisle"},
     "highway/services": {"icon": "maki-car", "fields": ["{highway/rest_area}"], "moreFields": ["{highway/rest_area}"], "geometry": ["point", "vertex", "area"], "tags": {"highway": "services"}, "terms": ["services", "travel plaza", "service station"], "name": "Service Area"},
     "highway/speed_camera": {"icon": "temaki-security_camera", "geometry": ["point", "vertex"], "fields": ["direction", "ref", "maxspeed"], "tags": {"highway": "speed_camera"}, "terms": [], "name": "Speed Camera"},
-    "highway/steps": {"icon": "iD-highway-steps", "fields": ["incline_steps", "handrail", "step_count", "surface", "lit", "width"], "moreFields": ["covered", "dog", "indoor", "stroller", "wheelchair"], "geometry": ["line"], "tags": {"highway": "steps"}, "terms": ["stairs", "staircase", "stairway"], "name": "Steps"},
-    "highway/steps/conveying": {"icon": "maki-entrance", "fields": ["name", "incline_steps", "conveying", "access_simple", "lit", "width", "handrail", "step_count"], "geometry": ["line"], "terms": ["moving staircase", "moving stairway", "people mover"], "tags": {"highway": "steps", "conveying": "*"}, "name": "Escalator"},
+    "highway/steps": {"icon": "iD-highway-steps", "fields": ["incline_steps", "access_simple", "handrail", "step_count", "surface", "width"], "moreFields": ["covered", "dog", "indoor", "level_semi", "lit", "name", "ref", "stroller", "wheelchair"], "geometry": ["line"], "tags": {"highway": "steps"}, "terms": ["stairs", "staircase", "stairway"], "name": "Steps"},
+    "highway/steps/conveying": {"icon": "maki-entrance", "fields": ["incline_steps", "conveying", "access_simple", "indoor", "level_semi", "width"], "moreFields": ["{highway/steps}", "handrail", "step_count", "surface"], "geometry": ["line"], "terms": ["moving staircase", "moving stairway", "people mover"], "tags": {"highway": "steps", "conveying": "*"}, "name": "Escalator"},
     "highway/stop": {"icon": "temaki-stop", "fields": ["stop", "direction_vertex"], "geometry": ["vertex"], "tags": {"highway": "stop"}, "terms": ["stop", "halt", "sign"], "name": "Stop Sign"},
-    "highway/street_lamp": {"icon": "temaki-bulb", "geometry": ["point", "vertex"], "tags": {"highway": "street_lamp"}, "fields": ["lamp_type", "direction", "ref"], "terms": ["streetlight", "street light", "lamp", "light", "gaslight"], "name": "Street Lamp"},
+    "highway/street_lamp": {"icon": "temaki-bulb3", "geometry": ["point", "vertex"], "tags": {"highway": "street_lamp"}, "fields": ["lamp_type", "direction", "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/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/uphill", "mtb/scale/imba", "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/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"},
     "highway/trailhead": {"icon": "fas-hiking", "fields": ["name", "operator", "elevation", "address", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["opening_hours"], "geometry": ["vertex"], "tags": {"highway": "trailhead"}, "terms": ["hiking", "mile zero", "mountain biking", "mountaineering", "trail endpoint", "trail start", "staging area", "trekking"], "name": "Trailhead"},
     "highway/trunk_link": {"icon": "iD-highway-trunk-link", "fields": ["{highway/motorway_link}"], "moreFields": ["{highway/motorway_link}"], "geometry": ["line"], "tags": {"highway": "trunk_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Trunk Link"},
-    "highway/trunk": {"icon": "iD-highway-trunk", "fields": ["name", "ref_road_number", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["charge_toll", "covered", "incline", "junction_line", "lit", "maxheight", "minspeed", "maxweight_bridge", "not/name", "smoothness", "toll"], "geometry": ["line"], "tags": {"highway": "trunk"}, "terms": ["road", "street"], "name": "Trunk Road"},
+    "highway/trunk": {"icon": "iD-highway-trunk", "fields": ["name", "ref_road_number", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["charge_toll", "covered", "incline", "junction_line", "lit", "maxheight", "maxweight_bridge", "minspeed", "not/name", "smoothness", "toll"], "geometry": ["line"], "tags": {"highway": "trunk"}, "terms": ["road", "street"], "name": "Trunk Road"},
     "highway/turning_circle": {"icon": "maki-circle-stroked", "geometry": ["vertex"], "tags": {"highway": "turning_circle"}, "terms": ["cul-de-sac"], "name": "Turning Circle"},
     "highway/turning_loop": {"icon": "maki-circle", "geometry": ["vertex"], "tags": {"highway": "turning_loop"}, "terms": ["cul-de-sac"], "name": "Turning Loop (Island)"},
     "highway/unclassified": {"icon": "iD-highway-unclassified", "fields": ["{highway/residential}"], "moreFields": ["{highway/residential}"], "geometry": ["line"], "tags": {"highway": "unclassified"}, "terms": ["road", "street"], "name": "Minor/Unclassified Road"},
@@ -558,9 +568,11 @@
     "indoor/area": {"fields": ["level", "name", "ref_room_number", "height"], "geometry": ["area"], "tags": {"indoor": "area"}, "terms": ["indoor space"], "matchScore": 0.8, "name": "Indoor Area"},
     "indoor/corridor": {"icon": "temaki-pedestrian", "fields": ["level", "name", "ref", "height"], "geometry": ["area"], "tags": {"indoor": "corridor"}, "terms": ["concourse", "foyer", "hallway", "passageway"], "matchScore": 0.8, "name": "Indoor Corridor"},
     "indoor/door": {"icon": "maki-entrance-alt1", "fields": ["level", "ref", "door_type", "access_simple", "width", "height"], "moreFields": ["wheelchair"], "geometry": ["vertex"], "tags": {"indoor": "door"}, "addTags": {"indoor": "door", "door": "yes"}, "removeTags": {"indoor": "door", "door": "*"}, "terms": ["doorframe", "doorway", "portal", "room access", "threshold"], "name": "Indoor Door"},
+    "indoor/elevator": {"icon": "temaki-elevator", "fields": ["ref", "level_semi"], "geometry": ["area"], "tags": {"indoor": "room", "elevator": "yes"}, "terms": ["elevator", "lift"], "matchScore": 0.8, "name": "Indoor Elevator Shaft"},
     "indoor/room": {"fields": ["level", "name", "ref_room_number", "room", "height"], "geometry": ["area"], "tags": {"indoor": "room"}, "terms": ["antechamber", "anteroom", "atrium", "cell", "chamber", "concourse", "foyer", "indoor room", "lobby", "vestibule"], "matchScore": 0.8, "name": "Room"},
+    "indoor/stairs": {"icon": "iD-highway-steps", "fields": ["ref", "level_semi", "conveying_escalator"], "geometry": ["area"], "tags": {"indoor": "room", "stairs": "yes"}, "terms": ["stair", "stairs", "staircase", "stairway", "stairwell", "steps"], "matchScore": 0.8, "name": "Indoor Stairwell"},
     "indoor/wall": {"icon": "temaki-wall", "fields": ["level", "height"], "geometry": ["line"], "tags": {"indoor": "wall"}, "terms": ["indoor barrier", "room divider", "room partition"], "name": "Indoor Wall"},
-    "internet_access/wlan": {"icon": "fas-wifi", "geometry": ["point", "area"], "fields": ["internet_access/fee", "internet_access/ssid"], "terms": ["wi-fi", "wifi", "hotspot"], "tags": {"internet_access": "wlan"}, "matchScore": 0.25, "name": "Wi-Fi Hotspot"},
+    "internet_access/wlan": {"icon": "fas-wifi", "geometry": ["point", "area"], "fields": ["internet_access/ssid", "internet_access/fee"], "moreFields": ["level"], "terms": ["wi-fi", "wifi", "hotspot"], "tags": {"internet_access": "wlan"}, "matchScore": 0.25, "name": "Wi-Fi Hotspot"},
     "junction": {"icon": "temaki-junction", "fields": ["name"], "geometry": ["vertex", "area"], "tags": {"junction": "yes"}, "name": "Junction"},
     "junction/circular": {"geometry": ["vertex", "line"], "fields": ["name"], "tags": {"junction": "circular"}, "name": "Traffic Circle", "searchable": false},
     "junction/jughandle": {"geometry": ["line"], "fields": ["name"], "tags": {"junction": "jughandle"}, "name": "Jughandle", "searchable": false},
@@ -569,28 +581,28 @@
     "landuse/farm": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "geometry": ["point", "area"], "tags": {"landuse": "farm"}, "name": "Farmland", "searchable": false},
     "landuse/pond": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"landuse": "pond"}, "name": "Pond", "searchable": false},
     "landuse/reservoir": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"landuse": "reservoir"}, "name": "Reservoir", "searchable": false},
-    "landuse/allotments": {"icon": "maki-garden-centre", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "allotments"}, "terms": ["allotment", "garden"], "name": "Community Garden"},
-    "landuse/aquaculture": {"icon": "maki-aquarium", "fields": ["name", "operator", "produce"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "aquaculture"}, "terms": ["fish farm", "crustacean", "algae", "aquafarming", "shrimp farm", "oyster farm", "mariculture", "algaculture"], "name": "Aquaculture"},
-    "landuse/brownfield": {"geometry": ["area"], "fields": ["name"], "tags": {"landuse": "brownfield"}, "terms": [], "matchScore": 0.9, "name": "Brownfield"},
-    "landuse/cemetery": {"icon": "maki-cemetery", "fields": ["name", "religion", "denomination"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "cemetery"}, "terms": [], "name": "Cemetery"},
-    "landuse/churchyard": {"icon": "maki-religious-christian", "fields": ["name", "religion", "denomination"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "churchyard"}, "terms": [], "name": "Churchyard"},
-    "landuse/commercial": {"icon": "maki-suitcase", "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "commercial"}, "terms": [], "matchScore": 0.9, "name": "Commercial Area"},
-    "landuse/construction": {"icon": "temaki-tools", "fields": ["name", "construction", "operator", "opening_date", "check_date", "note"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "construction"}, "terms": [], "name": "Construction"},
-    "landuse/farmland": {"icon": "fas-tractor", "fields": ["name", "operator", "crop", "produce"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "farmland"}, "terms": ["crop", "grow", "plant"], "name": "Farmland"},
-    "landuse/farmyard": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "farmyard"}, "terms": ["crop", "grow", "plant"], "name": "Farmyard"},
+    "landuse/allotments": {"icon": "maki-garden-centre", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "allotments"}, "terms": ["allotment", "garden"], "name": "Community Garden"},
+    "landuse/aquaculture": {"icon": "maki-aquarium", "fields": ["name", "operator", "produce"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "aquaculture"}, "terms": ["fish farm", "crustacean", "algae", "aquafarming", "shrimp farm", "oyster farm", "mariculture", "algaculture"], "name": "Aquaculture"},
+    "landuse/brownfield": {"icon": "temaki-bulldozer", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "brownfield"}, "terms": [], "matchScore": 0.9, "name": "Brownfield"},
+    "landuse/cemetery": {"icon": "maki-cemetery", "fields": ["name", "religion", "denomination"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "cemetery"}, "terms": [], "name": "Cemetery"},
+    "landuse/churchyard": {"icon": "maki-religious-christian", "fields": ["name", "religion", "denomination"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "churchyard"}, "terms": [], "name": "Churchyard"},
+    "landuse/commercial": {"icon": "maki-suitcase", "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "commercial"}, "terms": [], "matchScore": 0.9, "name": "Commercial Area"},
+    "landuse/construction": {"icon": "temaki-bulldozer", "fields": ["name", "construction", "operator", "opening_date", "check_date", "note"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "construction"}, "terms": [], "name": "Construction"},
+    "landuse/farmland": {"icon": "fas-tractor", "fields": ["name", "operator", "crop", "produce"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "farmland"}, "terms": ["crop", "grow", "plant"], "name": "Farmland"},
+    "landuse/farmyard": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "farmyard"}, "terms": ["crop", "grow", "plant"], "name": "Farmyard"},
     "landuse/flowerbed": {"icon": "maki-garden", "fields": ["operator"], "moreFields": ["address", "name"], "geometry": ["area"], "tags": {"landuse": "flowerbed"}, "terms": ["floral garden", "flower garden"], "name": "Flowerbed"},
-    "landuse/forest": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle", "produce"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "forest"}, "terms": ["cut", "forest", "forestry", "lumber", "silviculture", "tree"], "name": "Managed Forest"},
-    "landuse/garages": {"icon": "fas-warehouse", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "garages"}, "terms": [], "name": "Garage Landuse"},
+    "landuse/forest": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle", "produce"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "forest"}, "terms": ["cut", "forest", "forestry", "lumber", "silviculture", "tree"], "name": "Managed Forest"},
+    "landuse/garages": {"icon": "fas-warehouse", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "garages"}, "terms": [], "name": "Garage Landuse"},
     "landuse/grass": {"geometry": ["area"], "tags": {"landuse": "grass"}, "terms": [], "name": "Grass"},
-    "landuse/greenfield": {"geometry": ["area"], "fields": ["name"], "tags": {"landuse": "greenfield"}, "terms": [], "matchScore": 0.9, "name": "Greenfield"},
-    "landuse/greenhouse_horticulture": {"icon": "maki-garden", "fields": ["name", "operator"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "terms": ["flower", "greenhouse", "horticulture", "grow", "vivero"], "tags": {"landuse": "greenhouse_horticulture"}, "matchScore": 0.9, "name": "Greenhouse Horticulture"},
-    "landuse/harbour": {"icon": "maki-harbor", "fields": ["name", "operator"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "terms": ["boat"], "tags": {"landuse": "harbour"}, "name": "Harbor"},
-    "landuse/industrial": {"icon": "maki-industry", "fields": ["name", "industrial"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "industrial"}, "terms": [], "matchScore": 0.9, "name": "Industrial Area"},
+    "landuse/greenfield": {"icon": "temaki-bulldozer", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "greenfield"}, "terms": [], "matchScore": 0.9, "name": "Greenfield"},
+    "landuse/greenhouse_horticulture": {"icon": "maki-garden", "fields": ["name", "operator"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "terms": ["flower", "greenhouse", "horticulture", "grow", "vivero"], "tags": {"landuse": "greenhouse_horticulture"}, "matchScore": 0.9, "name": "Greenhouse Horticulture"},
+    "landuse/harbour": {"icon": "maki-harbor", "fields": ["name", "operator"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "terms": ["boat"], "tags": {"landuse": "harbour"}, "name": "Harbor"},
+    "landuse/industrial": {"icon": "maki-industry", "fields": ["name", "industrial"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "industrial"}, "terms": [], "matchScore": 0.9, "name": "Industrial Area"},
     "landuse/industrial/scrap_yard": {"icon": "maki-car", "fields": ["name", "operator", "address", "opening_hours"], "geometry": ["point", "area"], "tags": {"industrial": "scrap_yard"}, "addTags": {"landuse": "industrial", "industrial": "scrap_yard"}, "reference": {"key": "industrial", "value": "scrap_yard"}, "terms": ["car", "junk", "metal", "salvage", "scrap", "u-pull-it", "vehicle", "wreck", "yard"], "name": "Scrap Yard"},
     "landuse/industrial/slaughterhouse": {"icon": "maki-slaughterhouse", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"industrial": "slaughterhouse"}, "addTags": {"landuse": "industrial", "industrial": "slaughterhouse"}, "reference": {"key": "industrial", "value": "slaughterhouse"}, "terms": ["abattoir", "beef", "butchery", "calf", "chicken", "cow", "killing house", "meat", "pig", "pork", "poultry", "shambles", "stockyard"], "name": "Slaughterhouse"},
-    "landuse/landfill": {"geometry": ["area"], "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "landfill"}, "terms": ["dump"], "name": "Landfill"},
+    "landuse/landfill": {"icon": "temaki-bulldozer", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "landfill"}, "terms": ["dump"], "name": "Landfill"},
     "landuse/meadow": {"icon": "maki-garden", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "meadow"}, "terms": ["grazing", "hay field", "pasture"], "name": "Meadow"},
-    "landuse/military": {"icon": "temaki-military", "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "military"}, "terms": [], "matchScore": 0.9, "name": "Military Area"},
+    "landuse/military": {"icon": "temaki-military", "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "military"}, "terms": [], "matchScore": 0.9, "name": "Military Area"},
     "landuse/military/airfield": {"icon": "tnp-2009265", "fields": ["name", "iata", "icao"], "geometry": ["point", "area"], "tags": {"military": "airfield"}, "addTags": {"aeroway": "aerodrome", "landuse": "military", "military": "airfield"}, "reference": {"key": "military", "value": "airfield"}, "terms": ["aerodrome", "aeroway", "air force", "airplane", "airport", "army", "base", "bomb", "fight", "force", "guard", "heli*", "jet", "marine", "navy", "plane", "troop", "war"], "name": "Military Airfield"},
     "landuse/military/barracks": {"icon": "temaki-military", "fields": ["name", "building_area"], "geometry": ["point", "area"], "tags": {"military": "barracks"}, "addTags": {"landuse": "military", "military": "barracks"}, "terms": ["air force", "army", "base", "fight", "force", "guard", "marine", "navy", "troop", "war"], "name": "Barracks"},
     "landuse/military/danger_area": {"icon": "maki-danger", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"military": "danger_area"}, "addTags": {"landuse": "military", "military": "danger_area"}, "terms": ["air force", "army", "base", "blast", "bomb", "explo*", "force", "guard", "mine", "marine", "navy", "troop", "war"], "name": "Danger Area"},
@@ -599,34 +611,34 @@
     "landuse/military/range": {"icon": "temaki-military", "fields": ["name"], "geometry": ["point", "area"], "tags": {"military": "range"}, "addTags": {"landuse": "military", "military": "range"}, "terms": ["air force", "army", "base", "fight", "fire", "force", "guard", "gun", "marine", "navy", "rifle", "shoot*", "snip*", "train", "troop", "war"], "name": "Military Range"},
     "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": "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": "maki-garden", "fields": ["name", "operator", "plant"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "plant_nursery"}, "terms": ["flower", "garden", "grow", "vivero"], "name": "Plant Nursery"},
-    "landuse/quarry": {"geometry": ["area"], "fields": ["name", "operator", "resource"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "quarry"}, "terms": [], "name": "Quarry"},
+    "landuse/plant_nursery": {"icon": "maki-garden", "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": {"geometry": ["area"], "fields": ["name", "operator", "resource"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "quarry"}, "terms": [], "name": "Quarry"},
     "landuse/railway": {"icon": "maki-rail", "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", "website", "phone", "email", "fax"], "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", "website", "phone", "email", "fax"], "tags": {"landuse": "religious"}, "terms": [], "name": "Religious Area"},
-    "landuse/residential": {"icon": "maki-building", "geometry": ["area"], "tags": {"landuse": "residential"}, "terms": [], "matchScore": 0.9, "name": "Residential Area"},
+    "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": [], "name": "Religious Area"},
+    "landuse/residential": {"icon": "maki-building", "fields": ["name", "residential"], "geometry": ["area"], "tags": {"landuse": "residential"}, "terms": [], "matchScore": 0.9, "name": "Residential Area"},
     "landuse/residential/apartments": {"icon": "maki-building", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "tags": {"residential": "apartments"}, "addTags": {"landuse": "residential", "residential": "apartments"}, "reference": {"key": "residential", "value": "apartments"}, "terms": ["flat", "residence", "tenement"], "name": "Apartment Complex"},
-    "landuse/retail": {"icon": "maki-commercial", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "retail"}, "matchScore": 0.9, "name": "Retail Area"},
-    "landuse/vineyard": {"fields": ["name", "operator", "grape_variety"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "vineyard"}, "addTags": {"landuse": "vineyard", "crop": "grape"}, "removeTags": {"landuse": "vineyard", "crop": "grape", "grape_variety": "*"}, "terms": ["grape", "wine"], "name": "Vineyard"},
-    "landuse/winter_sports": {"icon": "fas-skiing", "geometry": ["area"], "fields": ["name", "operator"], "moreFields": ["address", "access_simple", "opening_hours"], "tags": {"landuse": "winter_sports"}, "terms": ["piste area", "ski area", "ski hill", "ski mountain", "ski resort", "snow board area", "snowboard area"], "name": "Winter Sports Area"},
+    "landuse/retail": {"icon": "maki-commercial", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "retail"}, "matchScore": 0.9, "name": "Retail Area"},
+    "landuse/vineyard": {"fields": ["name", "operator", "grape_variety"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "vineyard"}, "addTags": {"landuse": "vineyard", "crop": "grape"}, "removeTags": {"landuse": "vineyard", "crop": "grape", "grape_variety": "*"}, "terms": ["grape", "wine"], "name": "Vineyard"},
+    "landuse/winter_sports": {"icon": "fas-skiing", "geometry": ["area"], "fields": ["name", "operator"], "moreFields": ["access_simple", "address", "opening_hours"], "tags": {"landuse": "winter_sports"}, "terms": ["piste area", "ski area", "ski hill", "ski mountain", "ski resort", "snow board area", "snowboard area"], "name": "Winter Sports Area"},
     "leisure/adult_gaming_centre": {"icon": "temaki-casino", "fields": ["{amenity/casino}"], "moreFields": ["{amenity/casino}"], "geometry": ["point", "area"], "terms": ["gambling", "slot machine"], "tags": {"leisure": "adult_gaming_centre"}, "name": "Adult Gaming Center"},
-    "leisure/amusement_arcade": {"icon": "maki-gaming", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "max_age", "min_age", "opening_hours", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["pay-to-play games", "video games", "driving simulators", "pinball machines"], "tags": {"leisure": "amusement_arcade"}, "name": "Amusement Arcade"},
-    "leisure/bandstand": {"icon": "maki-music", "fields": ["name", "building_area", "operator"], "moreFields": ["website"], "geometry": ["point", "area"], "tags": {"leisure": "bandstand"}, "name": "Bandstand"},
-    "leisure/beach_resort": {"icon": "maki-beach", "fields": ["name", "address", "opening_hours", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["smoking", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"leisure": "beach_resort"}, "name": "Beach Resort"},
+    "leisure/amusement_arcade": {"icon": "maki-gaming", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "level", "max_age", "min_age", "opening_hours", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["pay-to-play games", "video games", "driving simulators", "pinball machines"], "tags": {"leisure": "amusement_arcade"}, "name": "Amusement Arcade"},
+    "leisure/bandstand": {"icon": "fas-music", "fields": ["name", "building_area", "operator"], "moreFields": ["website"], "geometry": ["point", "area"], "tags": {"leisure": "bandstand"}, "name": "Bandstand"},
+    "leisure/beach_resort": {"icon": "fas-umbrella-beach", "fields": ["name", "address", "opening_hours", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "phone", "smoking", "website"], "geometry": ["point", "area"], "tags": {"leisure": "beach_resort"}, "name": "Beach Resort"},
     "leisure/bird_hide": {"icon": "temaki-binoculars", "fields": ["name", "building_area", "address", "opening_hours"], "moreFields": ["website"], "geometry": ["point", "area"], "tags": {"leisure": "bird_hide"}, "terms": ["machan", "ornithology"], "name": "Bird Hide"},
-    "leisure/bleachers": {"geometry": ["point", "area"], "tags": {"leisure": "bleachers"}, "terms": ["crowd", "bench", "sports", "stand", "stands", "seat", "seating"], "name": "Bleachers"},
-    "leisure/bowling_alley": {"icon": "temaki-bowling", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "min_age", "opening_hours", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bowling center"], "tags": {"leisure": "bowling_alley"}, "name": "Bowling Alley"},
+    "leisure/bleachers": {"geometry": ["area"], "tags": {"leisure": "bleachers"}, "terms": ["crowd", "bench", "sports", "stand", "stands", "seat", "seating"], "name": "Bleachers"},
+    "leisure/bowling_alley": {"icon": "temaki-bowling", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "level", "min_age", "opening_hours", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bowling center"], "tags": {"leisure": "bowling_alley"}, "name": "Bowling Alley"},
     "leisure/common": {"icon": "temaki-pedestrian", "fields": ["name"], "moreFields": ["website"], "geometry": ["point", "area"], "terms": ["open space"], "tags": {"leisure": "common"}, "name": "Common"},
-    "leisure/dance": {"icon": "maki-music", "fields": ["name", "operator", "address", "building_area", "dance/style"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["ballroom", "jive", "swing", "tango", "waltz"], "tags": {"leisure": "dance"}, "name": "Dance Hall"},
-    "leisure/dancing_school": {"icon": "maki-music", "fields": ["name", "operator", "address", "building_area", "dance/style"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["jive", "swing", "tango", "waltz", "dance teaching"], "tags": {"leisure": "dance", "dance:teaching": "yes"}, "reference": {"key": "leisure", "value": "dance"}, "name": "Dance School"},
+    "leisure/dance": {"icon": "fas-music", "fields": ["name", "operator", "address", "building_area", "dance/style"], "moreFields": ["email", "fax", "level", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "terms": ["ballroom", "jive", "swing", "tango", "waltz"], "tags": {"leisure": "dance"}, "name": "Dance Hall"},
+    "leisure/dancing_school": {"icon": "fas-music", "fields": ["name", "operator", "address", "building_area", "dance/style"], "moreFields": ["email", "fax", "level", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "terms": ["jive", "swing", "tango", "waltz", "dance teaching"], "tags": {"leisure": "dance", "dance:teaching": "yes"}, "reference": {"key": "leisure", "value": "dance"}, "name": "Dance School"},
     "leisure/disc_golf_course": {"icon": "temaki-disc_golf_basket", "fields": ["name", "operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "opening_hours"], "moreFields": ["address", "dog", "email", "fax", "lit", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"leisure": "disc_golf_course"}, "addTags": {"leisure": "disc_golf_course", "sport": "disc_golf"}, "terms": ["disk golf", "frisbee golf", "flying disc golf", "frolf", "ultimate"], "name": "Disc Golf Course"},
-    "leisure/dog_park": {"icon": "maki-dog-park", "fields": ["name"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": [], "tags": {"leisure": "dog_park"}, "name": "Dog Park"},
-    "leisure/escape_game": {"icon": "fas-puzzle-piece", "fields": ["name", "address", "building_area", "opening_hours", "website", "fee", "payment_multi_fee", "charge_fee", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["escape game", "escape the room", "puzzle room", "quest room"], "tags": {"leisure": "escape_game"}, "name": "Escape Room"},
+    "leisure/dog_park": {"icon": "maki-dog-park", "fields": ["name"], "moreFields": ["email", "fax", "phone", "website"], "geometry": ["point", "area"], "terms": [], "tags": {"leisure": "dog_park"}, "name": "Dog Park"},
+    "leisure/escape_game": {"icon": "fas-puzzle-piece", "fields": ["name", "address", "building_area", "opening_hours", "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": "maki-fire-station", "fields": ["access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "firepit"}, "terms": ["fireplace", "campfire"], "name": "Firepit"},
     "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"], "moreFields": ["charge_fee", "opening_hours", "fee", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_centre"}, "terms": ["health", "gym", "leisure", "studio"], "name": "Gym / Fitness Center"},
+    "leisure/fitness_centre": {"icon": "fas-dumbbell", "fields": ["name", "sport", "address", "building_area"], "moreFields": ["charge_fee", "email", "fax", "fee", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_centre"}, "terms": ["health", "gym", "leisure", "studio"], "name": "Gym / Fitness Center"},
     "leisure/fitness_centre/yoga": {"icon": "maki-pitch", "geometry": ["point", "area"], "terms": ["studio", "asanas", "modern yoga", "meditation"], "tags": {"leisure": "fitness_centre", "sport": "yoga"}, "reference": {"key": "sport", "value": "yoga"}, "name": "Yoga Studio"},
-    "leisure/fitness_station": {"icon": "maki-pitch", "fields": ["fitness_station", "ref"], "moreFields": ["opening_hours"], "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": {"icon": "maki-pitch", "fields": ["fitness_station", "ref", "wheelchair", "blind"], "moreFields": ["access_simple", "opening_hours"], "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"},
     "leisure/fitness_station/box": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "box"}, "addTags": {"leisure": "fitness_station", "fitness_station": "box", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["box", "exercise", "fitness", "gym", "jump", "trim trail"], "name": "Exercise Box"},
     "leisure/fitness_station/horizontal_bar": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "horizontal_bar"}, "addTags": {"leisure": "fitness_station", "fitness_station": "horizontal_bar", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["bar", "chinup", "chin up", "exercise", "fitness", "gym", "pullup", "pull up", "trim trail"], "name": "Exercise Horizontal Bar"},
@@ -638,17 +650,17 @@
     "leisure/fitness_station/sign": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "sign"}, "addTags": {"leisure": "fitness_station", "fitness_station": "sign", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["exercise", "fitness", "gym", "trim trail"], "name": "Exercise Instruction Sign"},
     "leisure/fitness_station/sit-up": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "sit-up"}, "addTags": {"leisure": "fitness_station", "fitness_station": "sit-up", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["crunch", "exercise", "fitness", "gym", "situp", "sit up", "trim trail"], "name": "Sit-Up Station"},
     "leisure/fitness_station/stairs": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "stairs"}, "addTags": {"leisure": "fitness_station", "fitness_station": "stairs", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["exercise", "fitness", "gym", "steps", "trim trail"], "name": "Exercise Stairs"},
-    "leisure/garden": {"icon": "maki-garden", "fields": ["name", "operator", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "vertex", "area"], "tags": {"leisure": "garden"}, "name": "Garden"},
-    "leisure/golf_course": {"icon": "maki-golf", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["links"], "tags": {"leisure": "golf_course"}, "name": "Golf Course"},
-    "leisure/hackerspace": {"icon": "fas-code", "fields": ["name", "address", "building_area", "opening_hours", "website", "fee", "payment_multi_fee", "charge_fee", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["makerspace", "hackspace", "hacklab"], "tags": {"leisure": "hackerspace"}, "name": "Hackerspace"},
-    "leisure/horse_riding": {"icon": "maki-horse-riding", "fields": ["name", "access_simple", "operator", "address", "building"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["equestrian", "stable"], "tags": {"leisure": "horse_riding"}, "name": "Horseback Riding Facility"},
-    "leisure/ice_rink": {"icon": "fas-skating", "fields": ["name", "seasonal", "sport_ice", "operator", "address", "building"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["hockey", "skating", "curling"], "tags": {"leisure": "ice_rink"}, "name": "Ice Rink"},
-    "leisure/marina": {"icon": "tnp-2009223", "fields": ["name", "operator", "capacity", "fee", "payment_multi_fee", "charge_fee", "sanitary_dump_station", "power_supply"], "moreFields": ["address", "internet_access", "internet_access/fee", "internet_access/ssid", "seamark/type", "website", "phone", "email", "fax"], "geometry": ["point", "vertex", "area"], "terms": ["boat"], "tags": {"leisure": "marina"}, "name": "Marina"},
-    "leisure/miniature_golf": {"icon": "maki-golf", "fields": ["name", "operator", "address", "opening_hours", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["crazy golf", "mini golf", "putt-putt"], "tags": {"leisure": "miniature_golf"}, "name": "Miniature Golf"},
-    "leisure/nature_reserve": {"icon": "maki-park", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["dog", "website", "phone", "email", "fax"], "tags": {"leisure": "nature_reserve"}, "terms": ["protected", "wildlife"], "name": "Nature Reserve"},
-    "leisure/outdoor_seating": {"icon": "maki-picnic-site", "geometry": ["point", "area"], "fields": ["name", "operator"], "terms": ["al fresco", "beer garden", "dining", "cafe", "restaurant", "pub", "bar", "patio"], "tags": {"leisure": "outdoor_seating"}, "name": "Outdoor Seating Area"},
-    "leisure/park": {"icon": "maki-park", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["dog", "smoking", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "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"], "geometry": ["point"], "tags": {"leisure": "picnic_table"}, "terms": ["bench"], "name": "Picnic Table"},
+    "leisure/garden": {"icon": "maki-garden", "fields": ["name", "operator", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "phone", "website"], "geometry": ["point", "vertex", "area"], "tags": {"leisure": "garden"}, "name": "Garden"},
+    "leisure/golf_course": {"icon": "maki-golf", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["email", "fax", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "terms": ["links"], "tags": {"leisure": "golf_course"}, "name": "Golf Course"},
+    "leisure/hackerspace": {"icon": "fas-code", "fields": ["name", "address", "building_area", "opening_hours", "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": ["makerspace", "hackspace", "hacklab"], "tags": {"leisure": "hackerspace"}, "name": "Hackerspace"},
+    "leisure/horse_riding": {"icon": "maki-horse-riding", "fields": ["name", "access_simple", "operator", "address", "building"], "moreFields": ["email", "fax", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "terms": ["equestrian", "stable"], "tags": {"leisure": "horse_riding"}, "name": "Horseback Riding Facility"},
+    "leisure/ice_rink": {"icon": "fas-skating", "fields": ["name", "seasonal", "sport_ice", "operator", "address", "building"], "moreFields": ["email", "fax", "level", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "terms": ["hockey", "skating", "curling"], "tags": {"leisure": "ice_rink"}, "name": "Ice Rink"},
+    "leisure/marina": {"icon": "tnp-2009223", "fields": ["name", "operator", "capacity", "fee", "payment_multi_fee", "charge_fee", "sanitary_dump_station", "power_supply"], "moreFields": ["address", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "seamark/type", "website"], "geometry": ["point", "vertex", "area"], "terms": ["boat"], "tags": {"leisure": "marina"}, "name": "Marina"},
+    "leisure/miniature_golf": {"icon": "maki-golf", "fields": ["name", "operator", "address", "opening_hours", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "phone", "website"], "geometry": ["point", "area"], "terms": ["crazy golf", "mini golf", "putt-putt"], "tags": {"leisure": "miniature_golf"}, "name": "Miniature Golf"},
+    "leisure/nature_reserve": {"icon": "maki-park", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["dog", "email", "fax", "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": "maki-park", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["dog", "email", "fax", "phone", "smoking", "website"], "geometry": ["point", "area"], "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/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": ["charge_fee", "covered", "fee", "indoor", "payment_multi_fee"], "geometry": ["point", "area"], "tags": {"leisure": "pitch"}, "terms": ["field"], "name": "Sport Pitch"},
     "leisure/pitch/american_football": {"icon": "maki-american-football", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "american_football"}, "reference": {"key": "sport", "value": "american_football"}, "terms": ["football", "gridiron"], "name": "American Football Field"},
@@ -673,25 +685,25 @@
     "leisure/pitch/table_tennis": {"icon": "maki-tennis", "fields": ["name", "lit", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "table_tennis"}, "reference": {"key": "sport", "value": "table_tennis"}, "terms": ["table tennis", "ping pong"], "name": "Ping Pong Table"},
     "leisure/pitch/tennis": {"icon": "maki-tennis", "fields": ["{leisure/pitch}", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "tennis"}, "reference": {"key": "sport", "value": "tennis"}, "terms": [], "name": "Tennis Court"},
     "leisure/pitch/volleyball": {"icon": "maki-volleyball", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "volleyball"}, "reference": {"key": "sport", "value": "volleyball"}, "terms": [], "name": "Volleyball Court"},
-    "leisure/playground": {"icon": "maki-playground", "fields": ["name", "operator", "surface", "min_age", "max_age", "access_simple"], "geometry": ["point", "area"], "terms": ["jungle gym", "play area"], "tags": {"leisure": "playground"}, "name": "Playground"},
+    "leisure/playground": {"icon": "maki-playground", "fields": ["name", "operator", "playground/theme", "surface", "access_simple", "min_age", "max_age"], "moreFields": ["blind", "dog", "wheelchair"], "geometry": ["point", "area"], "terms": ["jungle gym", "play area"], "tags": {"leisure": "playground"}, "name": "Playground"},
     "leisure/resort": {"icon": "maki-lodging", "fields": ["name", "operator", "resort", "address", "opening_hours"], "moreFields": ["access_simple", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "resort"}, "terms": ["recreation center", "sanatorium", "ski and snowboard resort", "vacation resort", "winter sports resort"], "name": "Resort"},
-    "leisure/sauna": {"icon": "fas-thermometer-three-quarters", "fields": ["name", "operator", "address", "opening_hours", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"leisure": "sauna"}, "name": "Sauna"},
+    "leisure/sauna": {"icon": "fas-thermometer-three-quarters", "fields": ["name", "operator", "address", "opening_hours", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "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", "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": ["opening_hours", "website", "phone", "email", "fax"], "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", "opening_hours", "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": ["point", "area"], "terms": ["dive", "water"], "tags": {"leisure": "sports_centre", "sport": "swimming"}, "reference": {"key": "sport", "value": "swimming"}, "name": "Swimming Pool Facility"},
-    "leisure/stadium": {"icon": "maki-pitch", "fields": ["name", "sport", "address"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"leisure": "stadium"}, "name": "Stadium"},
+    "leisure/stadium": {"icon": "maki-pitch", "fields": ["name", "sport", "address"], "moreFields": ["email", "fax", "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", "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", "opening_hours", "operator"], "geometry": ["point", "area"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_pool"}, "name": "Swimming Pool"},
-    "leisure/track": {"icon": "iD-other-line", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "moreFields": ["access", "covered", "indoor"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track"}, "terms": ["cycle", "dog", "greyhound", "horse", "race*", "track"], "name": "Racetrack (Non-Motorsport)"},
+    "leisure/swimming_pool": {"icon": "fas-swimming-pool", "fields": ["name", "access_simple", "lit", "location_pool", "length", "swimming_pool"], "moreFields": ["address", "level", "opening_hours", "operator"], "geometry": ["point", "area"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_pool"}, "name": "Swimming Pool"},
+    "leisure/track": {"icon": "iD-other-line", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "moreFields": ["access", "covered", "indoor", "level"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track"}, "terms": ["cycle", "dog", "greyhound", "horse", "race*", "track"], "name": "Racetrack (Non-Motorsport)"},
     "leisure/track/cycling_point": {"icon": "fas-biking", "fields": ["{leisure/track/cycling}"], "geometry": ["point"], "tags": {"leisure": "track", "sport": "cycling"}, "terms": ["bicycle track", "bicycling track", "cycle racetrack", "velodrome"], "name": "Cycling Track"},
     "leisure/track/cycling": {"icon": "fas-biking", "fields": ["name", "surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["line", "area"], "tags": {"leisure": "track", "sport": "cycling"}, "terms": ["bicycle track", "bicycling track", "cycle racetrack", "velodrome"], "name": "Cycling Track"},
     "leisure/track/horse_racing_point": {"icon": "maki-horse-riding", "fields": ["{leisure/track/horse_racing}"], "geometry": ["point"], "tags": {"leisure": "track", "sport": "horse_racing"}, "terms": ["equestrian race track", "horse race betting", "horseracing", "horsetrack", "horse racetrack"], "name": "Horse Racing Track"},
     "leisure/track/horse_racing": {"icon": "maki-horse-riding", "fields": ["name", "surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["line", "area"], "tags": {"leisure": "track", "sport": "horse_racing"}, "terms": ["equestrian race track", "horse race betting", "horseracing", "horsetrack", "horse racetrack"], "name": "Horse Racing Track"},
     "leisure/track/running_point": {"icon": "maki-pitch", "fields": ["{leisure/track/running}"], "geometry": ["point"], "tags": {"leisure": "track", "sport": "running"}, "terms": ["athletics track", "decathlon", "foot race", "long distance running", "marathon", "middle distance running", "racetrack", "running", "sprint", "track", "walking"], "name": "Running Track"},
     "leisure/track/running": {"icon": "maki-pitch", "fields": ["name", "surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["line", "area"], "tags": {"leisure": "track", "sport": "running"}, "terms": ["athletics track", "decathlon", "foot race", "long distance running", "marathon", "middle distance running", "racetrack", "running", "sprint", "track", "walking"], "name": "Running Track"},
-    "leisure/water_park": {"icon": "fas-swimmer", "fields": ["name", "operator", "address"], "moreFields": ["payment_multi", "brand", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["swim", "pool", "dive"], "tags": {"leisure": "water_park"}, "name": "Water Park"},
+    "leisure/water_park": {"icon": "fas-swimmer", "fields": ["name", "operator", "address"], "moreFields": ["brand", "email", "fax", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "terms": ["swim", "pool", "dive"], "tags": {"leisure": "water_park"}, "name": "Water Park"},
     "line": {"fields": ["name"], "geometry": ["line"], "tags": {}, "terms": ["polyline"], "name": "Line", "matchScore": 0.1},
     "man_made/adit": {"icon": "maki-triangle", "geometry": ["point", "area"], "fields": ["name", "operator", "resource", "direction"], "terms": ["cave", "horizontal mine entrance", "tunnel", "underground"], "tags": {"man_made": "adit"}, "name": "Adit"},
     "man_made/antenna": {"icon": "temaki-antenna", "fields": ["communication_multi", "operator", "manufacturer", "height"], "geometry": ["point"], "terms": ["broadcast", "cell phone", "cell", "communication", "mobile phone", "radio", "television", "transmission", "tv"], "tags": {"man_made": "antenna"}, "name": "Antenna"},
@@ -712,7 +724,7 @@
     "man_made/gasometer": {"icon": "temaki-storage_tank", "fields": ["content", "building_area"], "geometry": ["point", "area"], "terms": ["gas holder"], "tags": {"man_made": "gasometer"}, "name": "Gasometer"},
     "man_made/groyne": {"fields": ["material", "seamark/type"], "geometry": ["line", "area"], "tags": {"man_made": "groyne"}, "name": "Groyne"},
     "man_made/lighthouse": {"icon": "maki-lighthouse", "fields": ["name", "operator", "building_area", "height"], "moreFields": ["address", "email", "fax", "phone", "seamark/type", "website"], "geometry": ["point", "area"], "tags": {"man_made": "lighthouse"}, "addTags": {"man_made": "lighthouse", "seamark:type": "light_major"}, "removeTags": {"man_made": "lighthouse", "seamark:type": "*"}, "name": "Lighthouse"},
-    "man_made/mast": {"icon": "maki-communications-tower", "fields": ["tower/type", "tower/construction", "height"], "moreFields": ["manufacturer", "material", "communication_multi"], "geometry": ["point"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "mast"}, "name": "Mast"},
+    "man_made/mast": {"icon": "maki-communications-tower", "fields": ["tower/type", "tower/construction", "height"], "moreFields": ["communication_multi", "manufacturer", "material"], "geometry": ["point"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "mast"}, "name": "Mast"},
     "man_made/mast/communication": {"icon": "maki-communications-tower", "fields": ["{man_made/mast}", "communication_multi"], "geometry": ["point"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "mast", "tower:type": "communication"}, "reference": {"key": "tower:type", "value": "communication"}, "name": "Communication Mast"},
     "man_made/mast/communication/mobile_phone": {"icon": "maki-communications-tower", "geometry": ["point"], "terms": ["antenna", "cell mast", "cell phone mast", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "transmission mast", "transmission tower"], "tags": {"man_made": "mast", "tower:type": "communication", "communication:mobile_phone": "yes"}, "reference": {"key": "communication:mobile_phone", "value": "yes"}, "name": "Mobile Phone Mast"},
     "man_made/mast/communication/radio": {"icon": "maki-communications-tower", "geometry": ["point"], "terms": ["antenna", "broadcast tower", "communication mast", "communication tower", "guyed tower", "radio mast", "radio tower", "transmission mast", "transmission tower"], "tags": {"man_made": "mast", "tower:type": "communication", "communication:radio": "yes"}, "reference": {"key": "communication:radio", "value": "yes"}, "name": "Radio Broadcast Mast"},
@@ -720,9 +732,9 @@
     "man_made/mineshaft": {"icon": "maki-triangle", "geometry": ["point", "area"], "fields": ["name", "operator", "resource"], "terms": ["cave", "mine shaft", "tunnel", "underground", "vertical mine entrance"], "tags": {"man_made": "mineshaft"}, "name": "Mineshaft"},
     "man_made/monitoring_station": {"icon": "temaki-antenna", "geometry": ["point", "vertex", "area"], "fields": ["monitoring_multi", "operator", "manufacturer"], "terms": ["weather", "earthquake", "seismology", "air", "gps"], "tags": {"man_made": "monitoring_station"}, "name": "Monitoring Station"},
     "man_made/obelisk": {"icon": "maki-monument", "fields": ["name", "inscription", "height", "material", "colour"], "geometry": ["point", "vertex", "area"], "tags": {"man_made": "obelisk"}, "name": "Obelisk"},
-    "man_made/observatory": {"fields": ["name", "operator", "address", "access_simple", "building_area"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["astronomical", "meteorological"], "tags": {"man_made": "observatory"}, "name": "Observatory"},
+    "man_made/observatory": {"fields": ["name", "operator", "address", "access_simple", "building_area"], "moreFields": ["email", "fax", "phone", "website"], "geometry": ["point", "area"], "terms": ["astronomical", "meteorological"], "tags": {"man_made": "observatory"}, "name": "Observatory"},
     "man_made/petroleum_well": {"icon": "temaki-storage_tank", "geometry": ["point"], "terms": ["drilling rig", "oil derrick", "oil drill", "oil horse", "oil rig", "oil pump", "petroleum well", "pumpjack"], "tags": {"man_made": "petroleum_well"}, "name": "Oil Well"},
-    "man_made/pier": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "floating", "width", "access", "lit"], "moreFields": ["access", "fishing", "incline", "{highway/footway}"], "geometry": ["line", "area"], "terms": ["berth", "dock", "jetty", "landing", "promenade", "wharf"], "tags": {"man_made": "pier"}, "name": "Pier"},
+    "man_made/pier": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "floating", "width", "access", "lit"], "moreFields": ["{highway/footway}", "access", "fishing", "incline"], "geometry": ["line", "area"], "terms": ["berth", "dock", "jetty", "landing", "promenade", "wharf"], "tags": {"man_made": "pier"}, "name": "Pier"},
     "man_made/pier/floating": {"icon": "temaki-pedestrian", "geometry": ["line", "area"], "terms": ["berth", "dock", "jetty", "landing", "promenade", "wharf"], "tags": {"man_made": "pier", "floating": "yes"}, "addTags": {"highway": "footway", "man_made": "pier", "floating": "yes"}, "name": "Floating Pier"},
     "man_made/pipeline": {"icon": "iD-pipeline-line", "fields": ["operator", "location", "substance", "layer", "diameter"], "geometry": ["line"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"man_made": "pipeline"}, "name": "Pipeline"},
     "man_made/pipeline/underground": {"icon": "iD-pipeline-line", "geometry": ["line"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"man_made": "pipeline", "location": "underground"}, "addTags": {"man_made": "pipeline", "location": "underground", "layer": "-1"}, "name": "Underground Pipeline"},
@@ -743,20 +755,21 @@
     "man_made/tower/minaret": {"icon": "temaki-tower", "geometry": ["point", "area"], "terms": ["Islam", "mosque", "Muezzin", "Muslim"], "tags": {"man_made": "tower", "tower:type": "minaret"}, "reference": {"key": "tower:type", "value": "minaret"}, "name": "Minaret"},
     "man_made/tower/observation": {"icon": "temaki-tower", "moreFields": ["{man_made/tower}", "opening_hours"], "geometry": ["point", "area"], "terms": ["lookout tower", "fire tower"], "tags": {"man_made": "tower", "tower:type": "observation"}, "reference": {"key": "tower:type", "value": "observation"}, "name": "Observation Tower"},
     "man_made/tunnel": {"icon": "tnp-2009642", "fields": ["name", "tunnel", "layer", "width", "length", "height"], "geometry": ["area"], "tags": {"man_made": "tunnel"}, "addTags": {"man_made": "tunnel", "layer": "-1"}, "removeTags": {"man_made": "tunnel", "layer": "*"}, "reference": {"key": "man_made", "value": "tunnel"}, "terms": ["bore", "dig", "shaft", "underground passage", "underpass"], "name": "Tunnel"},
-    "man_made/wastewater_plant": {"icon": "maki-water", "fields": ["name", "operator", "address"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["sewage*", "water treatment plant", "reclamation plant"], "tags": {"man_made": "wastewater_plant"}, "name": "Wastewater Plant"},
+    "man_made/utility_pole": {"icon": "temaki-utility_pole", "fields": ["ref", "operator", "height", "material"], "moreFields": ["colour", "manufacturer"], "geometry": ["point", "vertex"], "tags": {"man_made": "utility_pole"}, "name": "Utility Pole"},
+    "man_made/wastewater_plant": {"icon": "maki-water", "fields": ["name", "operator", "address"], "moreFields": ["email", "fax", "phone", "website"], "geometry": ["point", "area"], "terms": ["sewage*", "water treatment plant", "reclamation plant"], "tags": {"man_made": "wastewater_plant"}, "name": "Wastewater Plant"},
     "man_made/water_tower": {"icon": "maki-water", "fields": ["operator", "height"], "geometry": ["point", "area"], "tags": {"man_made": "water_tower"}, "name": "Water Tower"},
     "man_made/water_well": {"icon": "maki-water", "fields": ["operator"], "geometry": ["point", "area"], "tags": {"man_made": "water_well"}, "name": "Water Well"},
     "man_made/water_works": {"icon": "maki-water", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "tags": {"man_made": "water_works"}, "name": "Water Works"},
     "man_made/watermill": {"icon": "maki-watermill", "fields": ["building_area"], "geometry": ["point", "area"], "terms": ["water", "wheel", "mill"], "tags": {"man_made": "watermill"}, "name": "Watermill"},
     "man_made/windmill": {"icon": "maki-windmill", "fields": ["building_area"], "geometry": ["point", "area"], "terms": ["wind", "wheel", "mill"], "tags": {"man_made": "windmill"}, "name": "Windmill"},
-    "man_made/works": {"icon": "maki-industry", "fields": ["name", "operator", "address", "building_area", "product"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["assembly", "build", "brewery", "car", "plant", "plastic", "processing", "manufacture", "refinery"], "tags": {"man_made": "works"}, "name": "Factory"},
+    "man_made/works": {"icon": "maki-industry", "fields": ["name", "operator", "address", "building_area", "product"], "moreFields": ["email", "fax", "phone", "website"], "geometry": ["point", "area"], "terms": ["assembly", "build", "brewery", "car", "plant", "plastic", "processing", "manufacture", "refinery"], "tags": {"man_made": "works"}, "name": "Factory"},
     "manhole": {"icon": "maki-circle-stroked", "fields": ["manhole", "operator", "label", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "*"}, "addTags": {"man_made": "manhole", "manhole": "*"}, "terms": ["cover", "hole", "sewer", "sewage", "telecom"], "name": "Manhole"},
     "manhole/drain": {"icon": "maki-water", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "drain"}, "addTags": {"man_made": "manhole", "manhole": "drain"}, "terms": ["cover", "drain", "hole", "rain", "sewer", "sewage", "storm"], "name": "Storm Drain"},
     "manhole/telecom": {"icon": "maki-circle-stroked", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "telecom"}, "addTags": {"man_made": "manhole", "manhole": "telecom"}, "terms": ["cover", "phone", "hole", "telecom", "telephone", "bt"], "name": "Telecom Manhole"},
     "military/bunker": {"icon": "temaki-military", "fields": ["name", "bunker_type", "building_area"], "geometry": ["point", "area"], "tags": {"military": "bunker"}, "addTags": {"building": "bunker", "military": "bunker"}, "terms": ["air force", "army", "base", "fight", "force", "guard", "marine", "navy", "troop", "war"], "name": "Military Bunker"},
     "military/checkpoint": {"icon": "maki-barrier", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"military": "checkpoint"}, "terms": ["air force", "army", "base", "force", "guard", "marine", "navy", "troop", "war"], "name": "Checkpoint"},
     "military/nuclear_explosion_site": {"icon": "maki-danger", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"military": "nuclear_explosion_site"}, "terms": ["atom", "blast", "bomb", "detonat*", "nuke", "site", "test"], "name": "Nuclear Explosion Site"},
-    "military/office": {"icon": "temaki-military", "fields": ["name", "building_area"], "geometry": ["point", "area"], "tags": {"military": "office"}, "terms": ["air force", "army", "base", "enlist", "fight", "force", "guard", "marine", "navy", "recruit", "troop", "war"], "name": "Military Office"},
+    "military/office": {"icon": "temaki-military", "fields": ["name", "building_area"], "moreFields": ["level"], "geometry": ["point", "area"], "tags": {"military": "office"}, "terms": ["air force", "army", "base", "enlist", "fight", "force", "guard", "marine", "navy", "recruit", "troop", "war"], "name": "Military Office"},
     "military/trench": {"icon": "temaki-military", "fields": ["name", "trench"], "geometry": ["point", "line"], "tags": {"military": "trench"}, "terms": ["dugout", "firestep", "fox hole", "infantry trench", "war trench"], "name": "Military Trench"},
     "natural/bare_rock": {"geometry": ["area"], "tags": {"natural": "bare_rock"}, "terms": ["rock"], "name": "Bare Rock"},
     "natural/bay": {"icon": "temaki-beach", "geometry": ["point", "line", "area"], "fields": ["name"], "tags": {"natural": "bay"}, "terms": [], "name": "Bay"},
@@ -798,7 +811,7 @@
     "natural/wetland": {"icon": "maki-wetland", "fields": ["wetland", "salt", "tidal"], "geometry": ["point", "area"], "tags": {"natural": "wetland"}, "terms": ["bog", "fen", "marsh", "mire", "moor", "muskeg", "peatland", "quagmire", "reedbed", "saltmarsh", "swamp", "tidalflat", "wet meadow"], "name": "Wetland"},
     "natural/wood": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle"], "geometry": ["point", "area"], "tags": {"natural": "wood"}, "terms": ["tree"], "name": "Wood"},
     "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"], "moreFields": ["air_conditioning", "building/levels_building", "height_building", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "not/name", "operator", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"office": "*"}, "terms": [], "name": "Office"},
+    "office": {"icon": "maki-suitcase", "fields": ["name", "office", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "email", "fax", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "operator", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"office": "*"}, "terms": [], "name": "Office"},
     "office/administrative": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "administrative"}, "terms": [], "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"}, "terms": [], "name": "Travel Agency", "searchable": false},
@@ -839,7 +852,7 @@
     "office/private_investigator": {"icon": "fas-user-secret", "geometry": ["point", "area"], "tags": {"office": "private_investigator"}, "terms": ["PI", "private eye", "private detective"], "name": "Private Investigator Office"},
     "office/quango": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "quango"}, "terms": ["ngo", "non government", "non-government", "organization", "organisation", "quasi autonomous", "quasi-autonomous"], "name": "Quasi-NGO Office"},
     "office/religion": {"icon": "maki-suitcase", "fields": ["{office}", "religion", "denomination"], "geometry": ["point", "area"], "tags": {"office": "religion"}, "terms": [], "name": "Religious Office"},
-    "office/research": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "research"}, "terms": [], "name": "Research Office"},
+    "office/research": {"icon": "fas-flask", "geometry": ["point", "area"], "tags": {"office": "research"}, "terms": ["R and D", "research and development", "research lab"], "name": "Research Office"},
     "office/surveyor": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "surveyor"}, "terms": [], "name": "Surveyor Office"},
     "office/tax_advisor": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "tax_advisor"}, "terms": ["tax", "tax consultant"], "name": "Tax Advisor Office"},
     "office/telecommunication": {"icon": "maki-telephone", "geometry": ["point", "area"], "tags": {"office": "telecommunication"}, "terms": ["communication", "internet service provider", "isp", "network", "telephone", "voice"], "name": "Telecom Office"},
@@ -881,13 +894,13 @@
     "playground/seesaw": {"icon": "maki-playground", "geometry": ["point"], "tags": {"playground": "seesaw"}, "name": "Seesaw"},
     "playground/slide": {"icon": "maki-playground", "geometry": ["point", "line"], "tags": {"playground": "slide"}, "name": "Slide"},
     "playground/structure": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"playground": "structure"}, "name": "Play Structure"},
-    "playground/swing": {"icon": "maki-playground", "fields": ["capacity", "baby_seat", "wheelchair"], "geometry": ["point"], "tags": {"playground": "swing"}, "name": "Swing"},
+    "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"}, "name": "Zip Wire"},
     "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", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "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", "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"},
     "power/sub_station": {"icon": "temaki-power", "fields": ["substation", "operator", "building", "ref"], "geometry": ["point", "area"], "tags": {"power": "sub_station"}, "reference": {"key": "power", "value": "substation"}, "name": "Substation", "searchable": false},
     "power/cable/underground": {"fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "tags": {"power": "cable", "location": "underground"}, "addTags": {"power": "cable", "location": "underground", "layer": "-1"}, "name": "Underground Power Cable"},
-    "power/generator": {"icon": "temaki-power", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "ref"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["hydro", "solar", "turbine", "wind"], "tags": {"power": "generator"}, "name": "Power Generator"},
+    "power/generator": {"icon": "temaki-power", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "ref"], "moreFields": ["level", "manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["hydro", "solar", "turbine", "wind"], "tags": {"power": "generator"}, "name": "Power Generator"},
     "power/generator/method/photovoltaic": {"icon": "fas-solar-panel", "fields": ["operator", "generator/output/electricity", "ref"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["photovoltaic module", "PV module", "sunlight"], "tags": {"power": "generator", "generator:method": "photovoltaic"}, "addTags": {"power": "generator", "generator:source": "solar", "generator:method": "photovoltaic", "generator:type": "solar_photovoltaic_panel", "generator:output:electricity": "yes"}, "reference": {"key": "generator:method", "value": "photovoltaic"}, "name": "Solar Panel"},
     "power/generator/source/hydro": {"icon": "temaki-power", "fields": ["operator", "generator/method", "generator/type", "generator/output/electricity", "ref"], "moreFields": ["height", "manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["dam", "generator", "francis turbine", "hydroelectricity", "kaplan turbine", "pelton turbine"], "tags": {"power": "generator", "generator:source": "hydro"}, "addTags": {"power": "generator", "generator:source": "hydro", "generator:output:electricity": "yes"}, "reference": {"key": "generator:source", "value": "hydro"}, "name": "Water Turbine"},
     "power/generator/source/nuclear": {"icon": "temaki-radiation", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "ref"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["fission", "generator", "nuclear", "nuke", "reactor"], "tags": {"power": "generator", "generator:source": "nuclear", "generator:method": "fission"}, "reference": {"key": "generator:source", "value": "nuclear"}, "name": "Nuclear Reactor"},
@@ -895,13 +908,13 @@
     "power/line": {"icon": "temaki-power_tower", "fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "terms": ["electric power transmission line", "high voltage line", "high tension line"], "tags": {"power": "line"}, "name": "Power Line"},
     "power/minor_line": {"icon": "iD-power-line", "fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "tags": {"power": "minor_line"}, "name": "Minor Power Line"},
     "power/plant": {"icon": "maki-industry", "fields": ["name", "operator", "address", "plant/output/electricity", "start_date"], "geometry": ["area"], "tags": {"power": "plant"}, "addTags": {"power": "plant", "landuse": "industrial"}, "terms": ["coal", "gas", "generat*", "hydro", "nuclear", "power", "station"], "name": "Power Station Grounds"},
-    "power/pole": {"icon": "temaki-utility_pole", "fields": ["ref", "operator", "material", "line_attachment"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex"], "tags": {"power": "pole"}, "name": "Power Pole"},
+    "power/pole": {"icon": "temaki-utility_pole", "fields": ["ref", "operator", "height", "material", "line_attachment"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex"], "tags": {"power": "pole"}, "name": "Power Pole"},
     "power/substation": {"icon": "temaki-power", "fields": ["substation", "operator", "building", "ref"], "geometry": ["point", "area"], "tags": {"power": "substation"}, "name": "Substation"},
     "power/switch": {"icon": "temaki-power", "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", "material", "line_attachment"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex"], "terms": ["power"], "tags": {"power": "tower"}, "matchScore": 1.05, "name": "High-Voltage Tower"},
+    "power/tower": {"icon": "temaki-power_tower", "fields": ["ref", "operator", "design", "height", "material", "line_attachment"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex"], "terms": ["power"], "tags": {"power": "tower"}, "matchScore": 1.05, "name": "High-Voltage Tower"},
     "power/transformer": {"icon": "temaki-power", "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": "maki-rail", "fields": ["name", "network", "operator", "departures_board", "shelter"], "moreFields": ["bench", "bin", "lit", "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-pedestrian", "fields": ["ref_platform", "network", "operator", "departures_board", "surface"], "moreFields": ["access", "covered", "indoor", "layer", "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": "maki-rail", "fields": ["name", "network", "operator", "departures_board", "shelter"], "moreFields": ["bench", "bin", "level", "lit", "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-pedestrian", "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/aerialway_point": {"icon": "maki-aerialway", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["aerialway", "cable car", "platform", "public transit", "public transportation", "transit", "transportation"], "searchable": false, "name": "Aerialway Stop / Platform"},
     "public_transport/platform/ferry_point": {"icon": "maki-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"}, "terms": ["boat", "dock", "ferry", "pier", "platform", "public transit", "public transportation", "transit", "transportation"], "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"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "track", "tram", "trolley", "transit", "transportation"], "searchable": false, "name": "Light Rail Stop / Platform"},
@@ -930,7 +943,7 @@
     "public_transport/station_train": {"icon": "maki-rail", "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": "maki-rail", "fields": ["name", "network", "operator", "address", "building_area", "internet_access"], "moreFields": ["air_conditioning", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "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": "maki-rail", "fields": ["name", "network", "operator", "address", "building_area", "internet_access"], "moreFields": ["air_conditioning", "email", "fax", "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": "maki-aerialway", "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": "maki-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"},
@@ -941,7 +954,7 @@
     "public_transport/stop_position_train": {"icon": "maki-rail", "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": "maki-bus", "fields": ["name", "ref_stop_position", "network", "operator"], "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": "maki-bus", "fields": ["name", "ref_stop_position", "network", "operator"], "moreFields": ["level"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position"}, "terms": ["public transit", "public transportation", "transit", "transportation"], "name": "Transit Stopping Location", "matchScore": 0.2},
     "railway/halt": {"icon": "maki-rail", "geometry": ["point", "vertex"], "tags": {"railway": "halt"}, "terms": ["break", "interrupt", "rest", "wait", "interruption"], "name": "Train Station (Halt / Request)", "searchable": false},
     "railway/platform": {"icon": "temaki-pedestrian", "fields": ["name", "ref_platform", "surface", "lit", "shelter"], "geometry": ["line", "area"], "tags": {"railway": "platform"}, "name": "Train Platform", "searchable": false, "replacement": "public_transport/platform/train"},
     "railway/station": {"icon": "maki-rail", "fields": ["name", "network", "operator", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "vertex", "area"], "tags": {"railway": "station"}, "terms": ["train station", "station"], "matchScore": 0.95, "name": "Train Station", "searchable": false, "replacement": "public_transport/station_train"},
@@ -962,7 +975,7 @@
     "railway/rail": {"icon": "iD-railway-rail", "fields": ["name", "operator", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "highspeed", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "rail"}, "terms": ["rail line", "railroad track", "train track"], "name": "Rail"},
     "railway/rail/highspeed": {"icon": "iD-railway-rail", "geometry": ["line"], "tags": {"railway": "rail", "highspeed": "yes"}, "reference": {"key": "highspeed"}, "terms": ["bullet train", "fast rail", "high speed rail", "highspeed rail", "HSR"], "name": "High-Speed Rail"},
     "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"], "tags": {"railway": "subway_entrance"}, "terms": ["metro", "transit"], "name": "Subway Entrance"},
+    "railway/subway_entrance": {"icon": "maki-entrance", "geometry": ["point", "vertex"], "fields": ["name", "level"], "tags": {"railway": "subway_entrance"}, "terms": ["metro", "transit"], "name": "Subway Entrance"},
     "railway/subway": {"icon": "temaki-subway", "fields": ["{railway/rail}"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "subway"}, "terms": ["metro", "transit"], "name": "Subway"},
     "railway/switch": {"icon": "temaki-junction", "geometry": ["vertex"], "tags": {"railway": "switch"}, "terms": ["switch", "points"], "name": "Railway Switch"},
     "railway/train_wash": {"icon": "maki-rail", "geometry": ["point", "vertex", "area"], "fields": ["operator", "building_area"], "tags": {"railway": "wash"}, "terms": ["wash", "clean"], "name": "Train Wash"},
@@ -975,7 +988,7 @@
     "seamark/buoy_lateral/green": {"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": {"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": {"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", "payment_multi"], "moreFields": ["air_conditioning", "brand", "building/levels_building", "height_building", "currency_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "not/name", "phone", "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", "payment_multi"], "moreFields": ["air_conditioning", "brand", "building/levels_building", "currency_multi", "email", "fax", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "phone", "second_hand", "stroller", "website", "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/fishmonger": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "fishmonger"}, "reference": {"key": "shop", "value": "seafood"}, "name": "Fishmonger", "searchable": false},
@@ -984,21 +997,21 @@
     "shop/agrarian": {"icon": "fas-tractor", "fields": ["{shop}", "agrarian"], "geometry": ["point", "area"], "terms": ["agricultural inputs", "agricultural machines", "seeds", "pesticides", "fertilizer", "agricultural tools"], "tags": {"shop": "agrarian"}, "name": "Farm Supply Shop"},
     "shop/alcohol": {"icon": "fas-wine-bottle", "fields": ["{shop}", "drive_through"], "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["alcohol", "beer", "booze", "wine"], "tags": {"shop": "alcohol"}, "name": "Liquor Store"},
     "shop/anime": {"icon": "fas-dragon", "geometry": ["point", "area"], "tags": {"shop": "anime"}, "terms": ["manga", "japan", "cosplay", "figurine", "dakimakura"], "name": "Anime Shop"},
-    "shop/antiques": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "antiques"}, "name": "Antiques Shop"},
-    "shop/appliance": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["air conditioner", "appliance", "dishwasher", "dryer", "freezer", "fridge", "grill", "kitchen", "oven", "refrigerator", "stove", "washer", "washing machine"], "tags": {"shop": "appliance"}, "name": "Appliance Store"},
+    "shop/antiques": {"icon": "temaki-furniture", "geometry": ["point", "area"], "tags": {"shop": "antiques"}, "name": "Antiques Shop"},
+    "shop/appliance": {"icon": "temaki-laundry", "geometry": ["point", "area"], "terms": ["air conditioner", "appliance", "dishwasher", "dryer", "freezer", "fridge", "grill", "kitchen", "oven", "refrigerator", "stove", "washer", "washing machine"], "tags": {"shop": "appliance"}, "name": "Appliance Store"},
     "shop/art": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "gallery"], "tags": {"shop": "art"}, "name": "Art Store"},
     "shop/baby_goods": {"icon": "fas-baby-carriage", "geometry": ["point", "area"], "tags": {"shop": "baby_goods"}, "name": "Baby Goods Store"},
     "shop/bag": {"icon": "fas-suitcase-rolling", "geometry": ["point", "area"], "terms": ["handbag", "purse"], "tags": {"shop": "bag"}, "name": "Bag/Luggage Store"},
     "shop/bakery": {"icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery"}, "terms": ["bread", "cakes", "rolls"], "name": "Bakery"},
     "shop/bathroom_furnishing": {"icon": "fas-bath", "geometry": ["point", "area"], "tags": {"shop": "bathroom_furnishing"}, "name": "Bathroom Furnishing Store"},
-    "shop/beauty": {"icon": "maki-shop", "fields": ["{shop}", "beauty"], "geometry": ["point", "area"], "terms": ["spa", "salon", "tanning"], "tags": {"shop": "beauty"}, "name": "Beauty Shop"},
+    "shop/beauty": {"icon": "temaki-lipstick", "fields": ["{shop}", "beauty"], "geometry": ["point", "area"], "terms": ["spa", "salon", "tanning"], "tags": {"shop": "beauty"}, "name": "Beauty Shop"},
     "shop/beauty/nails": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["manicure", "pedicure"], "tags": {"shop": "beauty", "beauty": "nails"}, "reference": {"key": "shop", "value": "beauty"}, "name": "Nail Salon"},
-    "shop/beauty/tanning": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "beauty", "beauty": "tanning"}, "reference": {"key": "leisure", "value": "tanning_salon"}, "name": "Tanning Salon"},
+    "shop/beauty/tanning": {"icon": "temaki-tanning", "geometry": ["point", "area"], "tags": {"shop": "beauty", "beauty": "tanning"}, "reference": {"key": "leisure", "value": "tanning_salon"}, "name": "Tanning Salon"},
     "shop/bed": {"icon": "maki-lodging", "geometry": ["point", "area"], "tags": {"shop": "bed"}, "name": "Bedding/Mattress Store"},
-    "shop/beverages": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "beverages"}, "terms": ["drinks"], "name": "Beverage Store"},
+    "shop/beverages": {"icon": "temaki-bottles", "geometry": ["point", "area"], "tags": {"shop": "beverages"}, "terms": ["drinks"], "name": "Beverage Store"},
     "shop/bicycle": {"icon": "maki-bicycle", "fields": ["{shop}", "service/bicycle"], "geometry": ["point", "area"], "terms": ["bike", "repair", "tricycle", "unicycle"], "tags": {"shop": "bicycle"}, "name": "Bicycle Shop"},
     "shop/boat": {"icon": "temaki-boating", "geometry": ["point", "area"], "terms": ["fishing boat", "jetski", "motorboat", "rowboat", "sailboat", "vessel", "watercraft"], "tags": {"shop": "boat"}, "name": "Boat Store"},
-    "shop/bookmaker": {"icon": "maki-shop", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["betting", "bookie"], "tags": {"shop": "bookmaker"}, "name": "Bookmaker"},
+    "shop/bookmaker": {"icon": "temaki-money_hand", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["betting", "bookie"], "tags": {"shop": "bookmaker"}, "name": "Bookmaker"},
     "shop/books": {"icon": "fas-book", "fields": ["{shop}", "internet_access"], "moreFields": ["{shop}", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"shop": "books"}, "name": "Book Store"},
     "shop/butcher": {"icon": "fas-bacon", "geometry": ["point", "area"], "terms": ["chicken", "beef", "lamb", "meat", "pork"], "tags": {"shop": "butcher"}, "name": "Butcher"},
     "shop/candles": {"icon": "fas-burn", "geometry": ["point", "area"], "tags": {"shop": "candles"}, "terms": ["wax"], "name": "Candle Shop"},
@@ -1007,12 +1020,12 @@
     "shop/car_repair": {"icon": "maki-car-repair", "fields": ["{shop}", "service/vehicle"], "geometry": ["point", "area"], "terms": ["automobile", "automotive", "garage", "service"], "tags": {"shop": "car_repair"}, "name": "Car Repair Shop"},
     "shop/car": {"icon": "maki-car", "fields": ["name", "brand", "{shop}", "second_hand", "service/vehicle"], "geometry": ["point", "area"], "terms": ["automobile", "automotive"], "tags": {"shop": "car"}, "name": "Car Dealership"},
     "shop/caravan": {"icon": "temaki-rv_park", "fields": ["name", "brand", "{shop}", "second_hand", "service/vehicle"], "geometry": ["point", "area"], "tags": {"shop": "caravan"}, "terms": ["auto", "camper", "recreational vehicle"], "name": "RV Dealership"},
-    "shop/carpet": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["rug"], "tags": {"shop": "carpet"}, "name": "Carpet Store"},
+    "shop/carpet": {"icon": "fas-tape", "geometry": ["point", "area"], "terms": ["rug"], "tags": {"shop": "carpet"}, "name": "Carpet Store"},
     "shop/catalogue": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "catalogue"}, "name": "Catalog Shop"},
     "shop/charity": {"icon": "maki-shop", "fields": ["{shop}", "second_hand"], "geometry": ["point", "area"], "terms": ["thrift", "op shop", "nonprofit"], "tags": {"shop": "charity"}, "name": "Charity Store"},
     "shop/cheese": {"icon": "fas-cheese", "geometry": ["point", "area"], "tags": {"shop": "cheese"}, "name": "Cheese Store"},
     "shop/chemist": {"icon": "fas-shopping-basket", "geometry": ["point", "area"], "tags": {"shop": "chemist"}, "terms": ["apothecary", "beauty", "drug store", "drugstore", "gift", "hair", "med*", "pharmacy", "prescription", "tooth"], "name": "Drugstore"},
-    "shop/chocolate": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "chocolate"}, "terms": ["cocoa"], "name": "Chocolate Store"},
+    "shop/chocolate": {"icon": "temaki-chocolate", "geometry": ["point", "area"], "tags": {"shop": "chocolate"}, "terms": ["cocoa"], "name": "Chocolate Store"},
     "shop/clothes": {"icon": "maki-clothing-store", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "clothes"}, "terms": ["blouses", "boutique", "bras", "clothes", "dresses", "fashion", "pants", "shirts", "shorts", "skirts", "slacks", "socks", "suits", "underwear"], "name": "Clothing Store"},
     "shop/clothes/underwear": {"icon": "maki-clothing-store", "geometry": ["point", "area"], "tags": {"shop": "clothes", "clothes": "underwear"}, "reference": {"key": "clothes", "value": "underwear"}, "terms": ["boutique", "bras", "brassieres", "briefs", "boxers", "fashion", "lingerie", "panties", "slips", "socks", "stockings", "underclothes", "undergarments", "underpants", "undies"], "name": "Underwear Store"},
     "shop/coffee": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "coffee"}, "name": "Coffee Store"},
@@ -1020,8 +1033,8 @@
     "shop/confectionery": {"icon": "maki-confectionery", "geometry": ["point", "area"], "terms": ["sweet"], "tags": {"shop": "confectionery"}, "name": "Candy Store"},
     "shop/convenience": {"icon": "fas-shopping-basket", "geometry": ["point", "area"], "tags": {"shop": "convenience"}, "name": "Convenience Store"},
     "shop/copyshop": {"icon": "fas-print", "geometry": ["point", "area"], "tags": {"shop": "copyshop"}, "terms": ["print", "scan"], "name": "Copy Store"},
-    "shop/cosmetics": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "cosmetics"}, "terms": ["make-up", "makeup"], "name": "Cosmetics Store"},
-    "shop/country_store": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "country_store"}, "name": "Country Store"},
+    "shop/cosmetics": {"icon": "temaki-lipstick", "geometry": ["point", "area"], "tags": {"shop": "cosmetics"}, "terms": ["make-up", "makeup"], "name": "Cosmetics Store"},
+    "shop/country_store": {"icon": "fas-hat-cowboy-side", "geometry": ["point", "area"], "tags": {"shop": "country_store"}, "name": "Country Store"},
     "shop/craft": {"icon": "fas-palette", "geometry": ["point", "area"], "tags": {"shop": "craft"}, "terms": ["art*", "paint*", "frame"], "name": "Arts and Crafts Store"},
     "shop/curtain": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["drape*", "window"], "tags": {"shop": "curtain"}, "name": "Curtain Store"},
     "shop/dairy": {"icon": "fas-cheese", "geometry": ["point", "area"], "terms": ["milk", "egg", "cheese"], "tags": {"shop": "dairy"}, "name": "Dairy Store"},
@@ -1034,54 +1047,54 @@
     "shop/erotic": {"icon": "maki-shop", "fields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["sex", "porn"], "tags": {"shop": "erotic"}, "name": "Erotic Store"},
     "shop/erotic/lgbtq": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["sex", "porn"], "tags": {"shop": "erotic", "lgbtq": "primary"}, "name": "LGBTQ+ Erotic Store"},
     "shop/fabric": {"icon": "fas-tape", "geometry": ["point", "area"], "terms": ["sew"], "tags": {"shop": "fabric"}, "name": "Fabric Store"},
-    "shop/farm": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["farm shop", "farm stand"], "tags": {"shop": "farm"}, "name": "Produce Stand"},
-    "shop/fashion_accessories": {"icon": "maki-shop", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "fashion_accessories"}, "terms": ["bag", "cologne", "fragrance", "hat", "jewellery", "purfume", "purse", "scarf", "sunglasses", "umbrella", "wallet", "watch"], "name": "Fashion Accessories Store"},
+    "shop/farm": {"icon": "fas-apple-alt", "geometry": ["point", "area"], "terms": ["baked goods", "farm shop", "farm stand", "fresh food", "fruits", "greengrocer", "organics", "vegetables"], "tags": {"shop": "farm"}, "name": "Produce Stand"},
+    "shop/fashion_accessories": {"icon": "temaki-fashion_accessories", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "fashion_accessories"}, "terms": ["bag", "cologne", "fragrance", "hat", "jewellery", "purfume", "purse", "scarf", "sunglasses", "umbrella", "wallet", "watch"], "name": "Fashion Accessories Store"},
     "shop/fireplace": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["fireplace", "stove", "masonry heater"], "tags": {"shop": "fireplace"}, "name": "Fireplace Store"},
-    "shop/fishing": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "fishing"}, "terms": ["bait", "fishing line", "flies", "fly", "lure", "reel", "rod", "tackle"], "name": "Fishing Shop"},
+    "shop/fishing": {"icon": "temaki-ice_fishing", "geometry": ["point", "area"], "tags": {"shop": "fishing"}, "terms": ["bait", "fishing line", "flies", "fly", "lure", "reel", "rod", "tackle"], "name": "Fishing Shop"},
     "shop/florist": {"icon": "maki-florist", "geometry": ["point", "area"], "terms": ["flower"], "tags": {"shop": "florist"}, "name": "Florist"},
     "shop/frame": {"icon": "fas-vector-square", "geometry": ["point", "area"], "tags": {"shop": "frame"}, "terms": ["art*", "paint*", "photo*", "frame"], "name": "Framing Shop"},
     "shop/frozen_food": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "frozen_food"}, "name": "Frozen Food"},
-    "shop/fuel": {"icon": "maki-shop", "fields": ["{shop}", "fuel_multi"], "geometry": ["point", "area"], "tags": {"shop": "fuel"}, "name": "Fuel Shop", "matchScore": 0.5},
+    "shop/fuel": {"icon": "temaki-gas", "fields": ["{shop}", "fuel_multi"], "geometry": ["point", "area"], "tags": {"shop": "fuel"}, "name": "Fuel Shop", "matchScore": 0.5},
     "shop/funeral_directors": {"icon": "maki-cemetery", "fields": ["{shop}", "religion", "denomination"], "geometry": ["point", "area"], "terms": ["undertaker", "memorial home"], "tags": {"shop": "funeral_directors"}, "name": "Funeral Home"},
     "shop/furniture": {"icon": "fas-couch", "geometry": ["point", "area"], "terms": ["chair", "sofa", "table"], "tags": {"shop": "furniture"}, "name": "Furniture Store"},
     "shop/games": {"icon": "fas-dice", "geometry": ["point", "area"], "tags": {"shop": "games"}, "terms": ["board game", "card game", "dice game", "game shop", "live action role-playing game", "miniatures wargame", "strategy game"], "name": "Tabletop Game Store"},
     "shop/garden_centre": {"icon": "maki-garden-centre", "geometry": ["point", "area"], "terms": ["landscape", "mulch", "shrub", "tree"], "tags": {"shop": "garden_centre"}, "name": "Garden Center"},
-    "shop/gas": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["cng", "lpg", "natural gas", "propane", "refill", "tank"], "tags": {"shop": "gas"}, "name": "Bottled Gas Shop"},
-    "shop/general": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "general"}, "terms": ["Village Shop"], "name": "General Store"},
+    "shop/gas": {"icon": "temaki-gas", "geometry": ["point", "area"], "terms": ["cng", "lpg", "natural gas", "propane", "refill", "tank"], "tags": {"shop": "gas"}, "name": "Bottled Gas Shop"},
+    "shop/general": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "general"}, "terms": ["village shop"], "name": "General Store"},
     "shop/gift": {"icon": "maki-gift", "geometry": ["point", "area"], "terms": ["souvenir"], "tags": {"shop": "gift"}, "name": "Gift Shop"},
     "shop/greengrocer": {"icon": "fas-carrot", "geometry": ["point", "area"], "terms": ["fruit", "produce", "vegetable"], "tags": {"shop": "greengrocer"}, "name": "Greengrocer"},
-    "shop/hairdresser_supply": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["barber", "shampoo", "conditioner"], "tags": {"shop": "hairdresser_supply"}, "name": "Hairdresser Supply Store"},
+    "shop/hairdresser_supply": {"icon": "temaki-hair_care", "geometry": ["point", "area"], "terms": ["barber", "shampoo", "conditioner"], "tags": {"shop": "hairdresser_supply"}, "name": "Hairdresser Supply Store"},
     "shop/hairdresser": {"icon": "temaki-beauty_salon", "geometry": ["point", "area"], "terms": ["barber"], "tags": {"shop": "hairdresser"}, "name": "Hairdresser"},
     "shop/hardware": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"shop": "hardware"}, "name": "Hardware Store"},
     "shop/health_food": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["wholefood", "vitamins", "vegetarian", "vegan"], "tags": {"shop": "health_food"}, "name": "Health Food Shop"},
-    "shop/hearing_aids": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "hearing_aids"}, "name": "Hearing Aids Store"},
+    "shop/hearing_aids": {"icon": "temaki-hearing_aid", "geometry": ["point", "area"], "tags": {"shop": "hearing_aids"}, "name": "Hearing Aids Store"},
     "shop/herbalist": {"icon": "fas-leaf", "geometry": ["point", "area"], "tags": {"shop": "herbalist"}, "name": "Herbalist"},
     "shop/hifi": {"icon": "temaki-speaker", "geometry": ["point", "area"], "terms": ["audio", "hi-fi", "high fidelity", "stereo", "video"], "tags": {"shop": "hifi"}, "name": "Hifi Store"},
     "shop/hobby": {"icon": "fas-dragon", "geometry": ["point", "area"], "tags": {"shop": "hobby"}, "terms": ["manga", "figurine", "model"], "name": "Hobby Shop"},
     "shop/houseware": {"icon": "fas-blender", "geometry": ["point", "area"], "terms": ["home", "household", "kitchenware"], "tags": {"shop": "houseware"}, "name": "Houseware Store"},
-    "shop/hunting": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "hunting"}, "terms": ["arrows", "bows", "bullets", "crossbows", "rifles", "traps"], "name": "Hunting Shop"},
+    "shop/hunting": {"icon": "temaki-binoculars", "geometry": ["point", "area"], "tags": {"shop": "hunting"}, "terms": ["arrows", "bows", "bullets", "crossbows", "rifles", "traps"], "name": "Hunting Shop"},
     "shop/interior_decoration": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "interior_decoration"}, "name": "Interior Decoration Store"},
     "shop/jewelry": {"icon": "maki-jewelry-store", "geometry": ["point", "area"], "terms": ["bracelet", "diamond", "earrings", "gem", "gold", "jeweler", "jewellery", "jeweller", "necklace", "pins", "ring", "silver"], "tags": {"shop": "jewelry"}, "name": "Jewelry Store"},
     "shop/kiosk": {"icon": "maki-shop", "fields": ["{shop}", "levels"], "geometry": ["point", "area"], "tags": {"shop": "kiosk"}, "name": "Kiosk"},
-    "shop/kitchen": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "kitchen"}, "terms": ["cabinets", "countertops", "sinks"], "name": "Kitchen Design Store"},
-    "shop/laundry": {"icon": "maki-laundry", "fields": ["{shop}", "self_service"], "geometry": ["point", "area"], "tags": {"shop": "laundry"}, "name": "Laundry"},
-    "shop/laundry/self_service": {"icon": "maki-laundry", "geometry": ["point", "area"], "tags": {"shop": "laundry", "self_service": "yes"}, "terms": ["Coin Laundry", "Laundromat", "Coin Wash", "Launderette", "Washateria"], "name": "Self-Service Laundry"},
-    "shop/leather": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "leather"}, "name": "Leather Store"},
-    "shop/lighting": {"icon": "far-lightbulb", "geometry": ["point", "area"], "terms": ["fluorescent lighting", "lamps", "LEDs", "light fixtures", "lightbulbs"], "tags": {"shop": "lighting"}, "name": "Lighting Store"},
+    "shop/kitchen": {"icon": "temaki-kitchen_sink", "geometry": ["point", "area"], "tags": {"shop": "kitchen"}, "terms": ["cabinets", "countertops", "sinks"], "name": "Kitchen Design Store"},
+    "shop/laundry": {"icon": "temaki-laundry", "fields": ["{shop}", "self_service"], "geometry": ["point", "area"], "tags": {"shop": "laundry"}, "name": "Laundry"},
+    "shop/laundry/self_service": {"icon": "temaki-laundry", "geometry": ["point", "area"], "tags": {"shop": "laundry", "self_service": "yes"}, "terms": ["Coin Laundry", "Laundromat", "Coin Wash", "Launderette", "Washateria"], "name": "Self-Service Laundry"},
+    "shop/leather": {"icon": "temaki-handbag", "geometry": ["point", "area"], "tags": {"shop": "leather"}, "name": "Leather Store"},
+    "shop/lighting": {"icon": "temaki-bulb3", "geometry": ["point", "area"], "terms": ["fluorescent lighting", "lamps", "LEDs", "light fixtures", "lightbulbs"], "tags": {"shop": "lighting"}, "name": "Lighting Store"},
     "shop/locksmith": {"icon": "fas-key", "geometry": ["point", "area"], "terms": ["key", "lockpick"], "tags": {"shop": "locksmith"}, "name": "Locksmith"},
-    "shop/lottery": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "lottery"}, "name": "Lottery Shop"},
+    "shop/lottery": {"icon": "fas-ticket-alt", "geometry": ["point", "area"], "tags": {"shop": "lottery"}, "name": "Lottery Shop"},
     "shop/mall": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["shopping"], "tags": {"shop": "mall"}, "name": "Mall"},
     "shop/massage": {"icon": "temaki-spa", "geometry": ["point", "area"], "tags": {"shop": "massage"}, "name": "Massage Shop"},
-    "shop/medical_supply": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "medical_supply"}, "name": "Medical Supply Store"},
+    "shop/medical_supply": {"icon": "fas-crutch", "geometry": ["point", "area"], "tags": {"shop": "medical_supply"}, "name": "Medical Supply Store"},
     "shop/military_surplus": {"icon": "temaki-military", "geometry": ["point", "area"], "terms": ["armor", "army-navy store", "army surplus", "navy surplus", "tactical gear", "war surplus shop", "weapons"], "tags": {"shop": "military_surplus"}, "name": "Military Surplus Store"},
     "shop/mobile_phone": {"icon": "fas-mobile-alt", "geometry": ["point", "area"], "tags": {"shop": "mobile_phone"}, "name": "Mobile Phone Store"},
-    "shop/money_lender": {"icon": "maki-bank", "fields": ["{shop}", "currency_multi"], "geometry": ["point", "area"], "tags": {"shop": "money_lender"}, "name": "Money Lender"},
+    "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": "fas-motorcycle", "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/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": "maki-shop", "geometry": ["point", "area"], "terms": ["health", "supplement", "vitamin"], "tags": {"shop": "nutrition_supplements"}, "name": "Nutrition Supplements Store"},
+    "shop/nutrition_supplements": {"icon": "fas-pills", "geometry": ["point", "area"], "terms": ["health", "supplement", "vitamin"], "tags": {"shop": "nutrition_supplements"}, "name": "Nutrition Supplements Store"},
     "shop/optician": {"icon": "maki-optician", "geometry": ["point", "area"], "terms": ["eye", "glasses"], "tags": {"shop": "optician"}, "name": "Optician"},
     "shop/organic": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "supermarket", "organic": "only"}, "name": "Organic Goods Store"},
     "shop/outdoor": {"icon": "temaki-compass", "fields": ["{shop}", "clothes"], "geometry": ["point", "area"], "terms": ["camping", "climbing", "hiking", "outfitter", "outdoor equipment", "outdoor supplies"], "tags": {"shop": "outdoor"}, "name": "Outdoors Store"},
@@ -1089,42 +1102,43 @@
     "shop/paint": {"icon": "fas-paint-roller", "geometry": ["point", "area"], "tags": {"shop": "paint"}, "name": "Paint Store"},
     "shop/party": {"icon": "temaki-balloon", "geometry": ["point", "area"], "terms": ["balloons", "costumes", "decorations", "invitations"], "tags": {"shop": "party"}, "name": "Party Supply Store"},
     "shop/pastry": {"icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "pastry"}, "terms": ["patisserie", "cake shop", "cakery"], "name": "Pastry Shop"},
-    "shop/pawnbroker": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "pawnbroker"}, "name": "Pawn Shop"},
-    "shop/perfumery": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "perfumery"}, "terms": ["cologne", "fragrance", "purfume"], "name": "Perfume Store"},
+    "shop/pawnbroker": {"icon": "temaki-money_hand", "geometry": ["point", "area"], "tags": {"shop": "pawnbroker"}, "name": "Pawn Shop"},
+    "shop/perfumery": {"icon": "temaki-perfume", "geometry": ["point", "area"], "tags": {"shop": "perfumery"}, "terms": ["cologne", "fragrance", "purfume"], "name": "Perfume Store"},
     "shop/pet_grooming": {"icon": "maki-dog-park", "geometry": ["point", "area"], "terms": ["cat", "dog"], "tags": {"shop": "pet_grooming"}, "name": "Pet Grooming Store"},
     "shop/pet": {"icon": "maki-dog-park", "geometry": ["point", "area"], "terms": ["animal", "cat", "dog", "fish", "kitten", "puppy", "reptile"], "tags": {"shop": "pet"}, "name": "Pet Store"},
     "shop/photo": {"icon": "fas-camera-retro", "geometry": ["point", "area"], "terms": ["camera", "film"], "tags": {"shop": "photo"}, "name": "Photography Store"},
-    "shop/printer_ink": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["copier ink", "fax ink", "ink cartridges", "toner"], "tags": {"shop": "printer_ink"}, "name": "Printer Ink Store"},
+    "shop/printer_ink": {"icon": "fas-print", "geometry": ["point", "area"], "terms": ["copier ink", "fax ink", "ink cartridges", "toner"], "tags": {"shop": "printer_ink"}, "name": "Printer Ink Store"},
+    "shop/psychic": {"icon": "temaki-psychic", "geometry": ["point", "area"], "tags": {"shop": "psychic"}, "terms": ["astrology", "crystal ball", "divination", "fortune teller", "seer", "spirit"], "name": "Psychic"},
     "shop/pyrotechnics": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "pyrotechnics"}, "terms": ["fireworks"], "name": "Fireworks Store"},
     "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": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "rental"}, "name": "Rental Shop"},
+    "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/seafood": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["fishmonger"], "tags": {"shop": "seafood"}, "name": "Seafood 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": "maki-shop", "geometry": ["point", "area"], "terms": ["haberdashery"], "tags": {"shop": "sewing"}, "name": "Sewing Supply Shop"},
     "shop/shoes": {"icon": "maki-shoe", "geometry": ["point", "area"], "tags": {"shop": "shoes"}, "terms": ["boots", "cleats", "clogs", "heels", "loafers", "oxfords", "sneakers"], "name": "Shoe Store"},
     "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": "fas-warehouse", "geometry": ["point", "area"], "tags": {"shop": "storage_rental"}, "terms": ["garages"], "name": "Storage Rental"},
-    "shop/supermarket": {"icon": "maki-grocery", "moreFields": ["diet_multi", "{shop}"], "geometry": ["point", "area"], "terms": ["grocery", "store", "shop"], "tags": {"shop": "supermarket"}, "name": "Supermarket"},
+    "shop/supermarket": {"icon": "maki-grocery", "moreFields": ["{shop}", "diet_multi"], "geometry": ["point", "area"], "terms": ["grocery", "store", "shop"], "tags": {"shop": "supermarket"}, "name": "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": "maki-clothing-store", "geometry": ["point", "area"], "terms": ["clothes", "suit"], "tags": {"shop": "tailor"}, "name": "Tailor"},
     "shop/tattoo": {"icon": "maki-shop", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "tags": {"shop": "tattoo"}, "terms": ["ink"], "name": "Tattoo Parlor"},
     "shop/tea": {"icon": "maki-teahouse", "geometry": ["point", "area"], "tags": {"shop": "tea"}, "name": "Tea Store"},
     "shop/ticket": {"icon": "fas-ticket-alt", "geometry": ["point", "area"], "tags": {"shop": "ticket"}, "terms": ["box office"], "name": "Ticket Seller"},
     "shop/tiles": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "tiles"}, "name": "Tile Shop"},
-    "shop/tobacco": {"icon": "maki-shop", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "tags": {"shop": "tobacco"}, "terms": ["cigarettes", "cigars"], "name": "Tobacco Shop"},
-    "shop/toys": {"icon": "fas-space-shuttle", "geometry": ["point", "area"], "tags": {"shop": "toys"}, "terms": ["games"], "name": "Toy Store"},
-    "shop/trade": {"icon": "maki-shop", "fields": ["name", "trade", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "trade"}, "name": "Trade Shop"},
+    "shop/tobacco": {"icon": "temaki-pipe", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "tags": {"shop": "tobacco"}, "terms": ["cigarettes", "cigars"], "name": "Tobacco Shop"},
+    "shop/toys": {"icon": "fas-rocket", "geometry": ["point", "area"], "tags": {"shop": "toys"}, "terms": ["games"], "name": "Toy Store"},
+    "shop/trade": {"icon": "temaki-tools", "fields": ["name", "trade", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "trade"}, "name": "Trade Shop"},
     "shop/travel_agency": {"icon": "fas-suitcase", "geometry": ["point", "area"], "tags": {"shop": "travel_agency"}, "terms": ["cruises", "flights", "hotels", "tickets", "travel packages"], "name": "Travel Agency"},
-    "shop/tyres": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "tyres"}, "name": "Tire Store"},
-    "shop/vacuum_cleaner": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "vacuum_cleaner"}, "name": "Vacuum Cleaner Store"},
+    "shop/tyres": {"icon": "temaki-tire", "geometry": ["point", "area"], "tags": {"shop": "tyres"}, "name": "Tire Store"},
+    "shop/vacuum_cleaner": {"icon": "temaki-vacuum", "geometry": ["point", "area"], "tags": {"shop": "vacuum_cleaner"}, "name": "Vacuum Cleaner Store"},
     "shop/variety_store": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "variety_store"}, "name": "Variety Store"},
     "shop/video_games": {"icon": "maki-gaming", "geometry": ["point", "area"], "tags": {"shop": "video_games"}, "name": "Video Game Store"},
     "shop/video": {"icon": "temaki-movie_rental", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["DVD", "VHS", "video casette"], "tags": {"shop": "video"}, "name": "Video Store"},
     "shop/watches": {"icon": "maki-watch", "geometry": ["point", "area"], "tags": {"shop": "watches"}, "name": "Watches Shop"},
-    "shop/water_sports": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "water_sports"}, "name": "Watersport/Swim Shop"},
+    "shop/water_sports": {"icon": "fas-swimmer", "geometry": ["point", "area"], "tags": {"shop": "water_sports"}, "name": "Watersport/Swim Shop"},
     "shop/water": {"icon": "tnp-2009234", "geometry": ["point", "area"], "tags": {"shop": "water"}, "name": "Drinking Water Shop"},
     "shop/weapons": {"icon": "maki-shop", "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"},
@@ -1132,9 +1146,9 @@
     "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", "phone", "website"], "geometry": ["point", "area"], "tags": {"telecom": "data_center"}, "terms": ["computer systems storage", "information technology", "server farm", "the cloud", "telecommunications"], "name": "Data Center"},
     "tourism/alpine_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "internet_access/ssid", "phone", "reservation", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["climbing hut"], "tags": {"tourism": "alpine_hut"}, "name": "Alpine Hut"},
-    "tourism/apartment": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["building/levels_building", "height_building", "email", "fax", "internet_access/ssid", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "apartment"}, "name": "Guest Apartment / Condo"},
-    "tourism/aquarium": {"icon": "maki-aquarium", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["charge_fee", "fee", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi_fee", "smoking", "website", "phone", "email", "fax", "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": ["material", "website"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork"}, "terms": ["mural", "sculpture", "statue"], "name": "Artwork"},
+    "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"}, "name": "Guest Apartment / Condo"},
+    "tourism/aquarium": {"icon": "maki-aquarium", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["charge_fee", "email", "fax", "fee", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi_fee", "phone", "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": "maki-art-gallery", "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"},
@@ -1144,27 +1158,27 @@
     "tourism/attraction": {"icon": "maki-star", "fields": ["name", "operator", "address"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "attraction"}, "matchScore": 0.75, "name": "Tourist Attraction"},
     "tourism/camp_pitch": {"icon": "maki-campsite", "fields": ["name", "ref"], "geometry": ["point", "area"], "terms": ["tent", "rv"], "tags": {"tourism": "camp_pitch"}, "name": "Camp Pitch"},
     "tourism/camp_site": {"icon": "maki-campsite", "fields": ["name", "operator", "address", "access_simple", "capacity", "fee", "payment_multi_fee", "charge_fee", "internet_access", "internet_access/fee"], "moreFields": ["email", "fax", "internet_access/ssid", "phone", "power_supply", "reservation", "sanitary_dump_station", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["tent", "rv"], "tags": {"tourism": "camp_site"}, "name": "Campground"},
-    "tourism/caravan_site": {"icon": "temaki-rv_park", "fields": ["name", "address", "capacity", "sanitary_dump_station", "power_supply", "internet_access", "internet_access/fee"], "moreFields": ["charge_fee", "operator", "fee", "payment_multi_fee", "internet_access/ssid", "smoking", "website", "phone", "email", "fax", "wheelchair", "reservation"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper"], "tags": {"tourism": "caravan_site"}, "name": "RV Park"},
-    "tourism/chalet": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "building/levels_building", "height_building", "smoking", "payment_multi", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair", "reservation"], "geometry": ["point", "area"], "terms": ["holiday", "holiday cottage", "holiday home", "vacation", "vacation home"], "tags": {"tourism": "chalet"}, "name": "Holiday Cottage"},
-    "tourism/gallery": {"icon": "maki-art-gallery", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "gallery"}, "name": "Art Gallery"},
-    "tourism/guest_house": {"icon": "maki-lodging", "fields": ["name", "operator", "guest_house", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "building/levels_building", "height_building", "smoking", "payment_multi", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair", "reservation"], "geometry": ["point", "area"], "tags": {"tourism": "guest_house"}, "terms": ["B&B", "Bed and Breakfast"], "name": "Guest House"},
+    "tourism/caravan_site": {"icon": "temaki-rv_park", "fields": ["name", "address", "capacity", "sanitary_dump_station", "power_supply", "internet_access", "internet_access/fee"], "moreFields": ["charge_fee", "email", "fax", "fee", "internet_access/ssid", "operator", "payment_multi_fee", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper"], "tags": {"tourism": "caravan_site"}, "name": "RV Park"},
+    "tourism/chalet": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "building/levels_building", "email", "fax", "height_building", "internet_access/ssid", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["holiday", "holiday cottage", "holiday home", "vacation", "vacation home"], "tags": {"tourism": "chalet"}, "name": "Holiday Cottage"},
+    "tourism/gallery": {"icon": "maki-art-gallery", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "gallery"}, "name": "Art Gallery"},
+    "tourism/guest_house": {"icon": "maki-lodging", "fields": ["name", "operator", "guest_house", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "building/levels_building", "email", "fax", "height_building", "internet_access/ssid", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "guest_house"}, "terms": ["B&B", "Bed and Breakfast"], "name": "Guest House"},
     "tourism/hostel": {"icon": "maki-lodging", "fields": ["{tourism/guest_house}"], "moreFields": ["{tourism/guest_house}"], "geometry": ["point", "area"], "tags": {"tourism": "hostel"}, "name": "Hostel"},
-    "tourism/hotel": {"icon": "fas-concierge-bell", "fields": ["{tourism/motel}"], "moreFields": ["{tourism/motel}", "stars", "bar"], "geometry": ["point", "area"], "tags": {"tourism": "hotel"}, "name": "Hotel"},
-    "tourism/information": {"icon": "maki-information", "fields": ["information", "operator", "address", "building_area"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information"}, "name": "Information"},
+    "tourism/hotel": {"icon": "fas-concierge-bell", "fields": ["{tourism/motel}"], "moreFields": ["{tourism/motel}", "bar", "stars"], "geometry": ["point", "area"], "tags": {"tourism": "hotel"}, "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": "maki-information", "fields": ["name", "operator", "board_type", "direction"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "board"}, "reference": {"key": "information", "value": "board"}, "name": "Information Board"},
     "tourism/information/guidepost": {"icon": "fas-map-signs", "fields": ["name", "elevation", "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", "height_building", "email", "fax", "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", "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/route_marker": {"icon": "maki-information", "fields": ["ref", "operator", "colour", "material", "elevation"], "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": "maki-information", "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", "building/levels_building", "height_building", "email", "fax", "internet_access/ssid", "operator", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "motel"}, "name": "Motel"},
-    "tourism/museum": {"icon": "temaki-museum", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "charge_fee", "height_building", "fee", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "gallery", "foundation", "hall", "institution", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "museum"}, "name": "Museum"},
-    "tourism/picnic_site": {"icon": "maki-picnic-site", "fields": ["name", "operator", "address", "access_simple", "capacity"], "moreFields": ["charge_fee", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "fee", "payment_multi_fee", "phone", "reservation", "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"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "website", "phone", "email", "fax", "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": ["internet_access", "internet_access/fee", "internet_access/ssid", "address", "opening_hours", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"tourism": "trail_riding_station"}, "name": "Trail Riding Station", "matchScore": 2},
-    "tourism/viewpoint": {"icon": "temaki-binoculars", "geometry": ["point", "vertex"], "fields": ["direction"], "tags": {"tourism": "viewpoint"}, "name": "Viewpoint"},
+    "tourism/motel": {"icon": "maki-lodging", "fields": ["name", "brand", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "building/levels_building", "email", "fax", "height_building", "internet_access/ssid", "operator", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "motel"}, "name": "Motel"},
+    "tourism/museum": {"icon": "temaki-museum", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "charge_fee", "email", "fax", "fee", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "gallery", "foundation", "hall", "institution", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "museum"}, "name": "Museum"},
+    "tourism/picnic_site": {"icon": "maki-picnic-site", "fields": ["name", "operator", "address", "access_simple", "capacity"], "moreFields": ["charge_fee", "fee", "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"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website", "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", "internet_access", "internet_access/fee", "internet_access/ssid", "opening_hours", "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/wilderness_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "fee", "payment_multi_fee", "charge_fee", "fireplace"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "reservation", "wheelchair"], "geometry": ["point", "area"], "terms": ["wilderness hut", "backcountry hut", "bothy"], "tags": {"tourism": "wilderness_hut"}, "name": "Wilderness Hut"},
-    "tourism/zoo": {"icon": "temaki-zoo", "fields": ["name", "operator", "address", "opening_hours", "fee", "charge_fee"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["animal"], "tags": {"tourism": "zoo"}, "name": "Zoo"},
+    "tourism/zoo": {"icon": "temaki-zoo", "fields": ["name", "operator", "address", "opening_hours", "fee", "charge_fee"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "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"},
     "tourism/zoo/safari": {"icon": "temaki-zoo", "geometry": ["point", "area"], "tags": {"tourism": "zoo", "zoo": "safari_park"}, "reference": {"key": "zoo", "value": "safari_park"}, "terms": ["Drive-Through Zoo", "Drive-In Zoo"], "name": "Safari Park"},
     "tourism/zoo/wildlife": {"icon": "fas-frog", "geometry": ["point", "area"], "tags": {"tourism": "zoo", "zoo": "wildlife_park"}, "reference": {"key": "zoo", "value": "wildlife_park"}, "terms": ["indigenous animals"], "name": "Wildlife Park"},
@@ -1214,19 +1228,19 @@
     "type/route/power": {"icon": "iD-power-line", "fields": ["name", "ref_route", "operator", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "power"}, "name": "Power Route"},
     "type/route/road": {"icon": "iD-highway-unclassified", "fields": ["name", "ref_route", "network_road", "to", "from"], "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": "iD-railway-rail", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["colour", "interval", "opening_hours", "duration", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "train"}, "name": "Train Route"},
+    "type/route/train": {"icon": "iD-railway-rail", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["colour", "duration", "interval", "opening_hours", "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/site": {"icon": "iD-relation", "fields": ["name", "site"], "geometry": ["relation"], "tags": {"type": "site"}, "name": "Site"},
     "type/waterway": {"icon": "iD-waterway-stream", "fields": ["name", "waterway", "ref"], "geometry": ["relation"], "tags": {"type": "waterway"}, "name": "Waterway"},
     "waterway/riverbank": {"icon": "maki-water", "geometry": ["area"], "tags": {"waterway": "riverbank"}, "name": "Riverbank", "searchable": false},
-    "waterway/boatyard": {"icon": "maki-harbor", "fields": ["name", "operator"], "moreFields": ["address", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["area", "vertex", "point"], "tags": {"waterway": "boatyard"}, "name": "Boatyard"},
+    "waterway/boatyard": {"icon": "maki-harbor", "fields": ["name", "operator"], "moreFields": ["address", "email", "fax", "phone", "website", "wheelchair"], "geometry": ["area", "vertex", "point"], "tags": {"waterway": "boatyard"}, "name": "Boatyard"},
     "waterway/canal": {"icon": "iD-waterway-canal", "fields": ["name", "structure_waterway", "width", "intermittent", "lock"], "moreFields": ["fishing", "salt", "tidal"], "geometry": ["line"], "tags": {"waterway": "canal"}, "name": "Canal"},
     "waterway/canal/lock": {"icon": "iD-waterway-canal", "fields": ["name", "width", "lock"], "moreFields": ["intermittent", "salt", "tidal"], "geometry": ["line"], "tags": {"waterway": "canal", "lock": "yes"}, "name": "Canal Lock"},
     "waterway/dam": {"icon": "maki-dam", "geometry": ["point", "vertex", "line", "area"], "fields": ["name", "operator", "height", "material"], "moreFields": ["seamark/type", "website"], "tags": {"waterway": "dam"}, "name": "Dam"},
     "waterway/ditch": {"icon": "iD-waterway-ditch", "fields": ["{waterway/drain}"], "moreFields": ["{waterway/drain}"], "geometry": ["line"], "tags": {"waterway": "ditch"}, "name": "Ditch"},
     "waterway/dock": {"icon": "maki-harbor", "fields": ["name", "dock", "operator"], "geometry": ["area", "vertex", "point"], "terms": ["boat", "ship", "vessel", "marine"], "tags": {"waterway": "dock"}, "name": "Wet Dock / Dry Dock"},
     "waterway/drain": {"icon": "iD-waterway-ditch", "fields": ["structure_waterway", "intermittent"], "moreFields": ["covered"], "geometry": ["line"], "tags": {"waterway": "drain"}, "name": "Drain"},
-    "waterway/fuel": {"icon": "maki-fuel", "fields": ["name", "operator", "address", "opening_hours", "fuel_multi"], "moreFields": ["payment_multi", "brand", "seamark/type", "building", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["petrol", "gas", "diesel", "boat"], "tags": {"waterway": "fuel"}, "name": "Marine Fuel Station"},
+    "waterway/fuel": {"icon": "maki-fuel", "fields": ["name", "operator", "address", "opening_hours", "fuel_multi"], "moreFields": ["brand", "building", "email", "fax", "payment_multi", "phone", "seamark/type", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["petrol", "gas", "diesel", "boat"], "tags": {"waterway": "fuel"}, "name": "Marine Fuel Station"},
     "waterway/lock_gate": {"icon": "maki-dam", "geometry": ["vertex", "line"], "fields": ["name", "ref", "height", "material"], "tags": {"waterway": "lock_gate"}, "addTags": {"waterway": "lock_gate", "seamark:type": "gate"}, "terms": ["canal"], "name": "Lock Gate"},
     "waterway/milestone": {"icon": "temaki-milestone", "fields": ["distance", "direction_vertex"], "moreFields": ["seamark/type"], "geometry": ["point", "vertex"], "tags": {"waterway": "milestone"}, "terms": ["milestone", "marker"], "name": "Waterway Milestone"},
     "waterway/river": {"icon": "iD-waterway-river", "fields": ["name", "structure_waterway", "width", "intermittent", "tidal"], "moreFields": ["covered", "fishing", "salt"], "geometry": ["line"], "terms": ["beck", "branch", "brook", "course", "creek", "estuary", "rill", "rivulet", "run", "runnel", "stream", "tributary", "watercourse"], "tags": {"waterway": "river"}, "name": "River"},
@@ -1895,8 +1909,8 @@
     "amenity/bicycle_rental/Swapfiets": {"name": "Swapfiets", "icon": "maki-bicycle", "imageURL": "https://graph.facebook.com/Swapfiets/picture?type=large", "geometry": ["point", "vertex", "area"], "tags": {"brand:wikidata": "Q62104374", "amenity": "bicycle_rental"}, "addTags": {"amenity": "bicycle_rental", "brand": "Swapfiets", "brand:wikidata": "Q62104374", "name": "Swapfiets"}, "countryCodes": ["be", "de", "dk", "nl"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/bicycle_rental/metropolradruhr": {"name": "metropolradruhr", "icon": "maki-bicycle", "imageURL": "https://graph.facebook.com/nextbike/picture?type=large", "geometry": ["point", "vertex", "area"], "tags": {"brand:wikidata": "Q62104274", "amenity": "bicycle_rental"}, "addTags": {"amenity": "bicycle_rental", "brand": "metropolradruhr", "brand:wikidata": "Q62104274", "name": "metropolradruhr"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/bicycle_rental/nextbike": {"name": "nextbike", "icon": "maki-bicycle", "imageURL": "https://graph.facebook.com/nextbike/picture?type=large", "geometry": ["point", "vertex", "area"], "tags": {"brand:wikidata": "Q2351279", "amenity": "bicycle_rental"}, "addTags": {"amenity": "bicycle_rental", "brand": "nextbike", "brand:wikidata": "Q2351279", "brand:wikipedia": "de:Nextbike", "name": "nextbike"}, "countryCodes": ["at", "de"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/bureau_de_change/CADECA": {"name": "CADECA", "icon": "maki-bank", "imageURL": "https://graph.facebook.com/CadecaCasasdeCambioOficial/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62122716", "amenity": "bureau_de_change"}, "addTags": {"amenity": "bureau_de_change", "brand": "CADECA", "brand:wikidata": "Q62122716", "name": "CADECA"}, "countryCodes": ["cu"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/bureau_de_change/Travelex": {"name": "Travelex", "icon": "maki-bank", "imageURL": "https://graph.facebook.com/TravelexUK/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2337964", "amenity": "bureau_de_change"}, "addTags": {"amenity": "bureau_de_change", "brand": "Travelex", "brand:wikidata": "Q2337964", "brand:wikipedia": "en:Travelex", "name": "Travelex"}, "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/bureau_de_change/CADECA": {"name": "CADECA", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/CadecaCasasdeCambioOficial/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62122716", "amenity": "bureau_de_change"}, "addTags": {"amenity": "bureau_de_change", "brand": "CADECA", "brand:wikidata": "Q62122716", "name": "CADECA"}, "countryCodes": ["cu"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/bureau_de_change/Travelex": {"name": "Travelex", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/TravelexUK/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2337964", "amenity": "bureau_de_change"}, "addTags": {"amenity": "bureau_de_change", "brand": "Travelex", "brand:wikidata": "Q2337964", "brand:wikipedia": "en:Travelex", "name": "Travelex"}, "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/cafe/85°C": {"name": "85°C", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/85CBakeryCafe/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4644852", "amenity": "cafe"}, "addTags": {"alt_name": "85C", "amenity": "cafe", "brand": "85°C", "brand:wikidata": "Q4644852", "brand:wikipedia": "en:85C Bakery Cafe", "cuisine": "coffee_shop;chinese", "name": "85°C", "takeaway": "yes"}, "countryCodes": ["au", "us"], "terms": ["85 cafe", "85 degrees", "85 degrees c", "85 degrees celsius", "85c bakery cafe", "85c daily cafe", "85oc"], "matchScore": 2, "suggestion": true},
     "amenity/cafe/85度C": {"name": "85度C", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/85CBakeryCafe/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4644852", "amenity": "cafe"}, "addTags": {"amenity": "cafe", "brand": "85度C", "brand:en": "85C Bakery Cafe", "brand:wikidata": "Q4644852", "brand:wikipedia": "en:85C Bakery Cafe", "cuisine": "coffee_shop", "name": "85度C", "name:en": "85C Bakery Cafe", "takeaway": "yes"}, "countryCodes": ["cn", "tw"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/cafe/Aroma Espresso Bar": {"name": "Aroma Espresso Bar", "icon": "maki-cafe", "imageURL": "https://graph.facebook.com/Israel.Aroma/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2909872", "amenity": "cafe"}, "addTags": {"amenity": "cafe", "brand": "Aroma Espresso Bar", "brand:wikidata": "Q2909872", "brand:wikipedia": "en:Aroma Espresso Bar", "cuisine": "coffee_shop", "name": "Aroma Espresso Bar", "takeaway": "yes"}, "countryCodes": ["ca", "kz", "ro", "ua", "us"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -2140,7 +2154,7 @@
     "amenity/fast_food/burger/Herfy": {"name": "Herfy", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/herfyfscksa/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5738371", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "Herfy", "brand:ar": "هرفي", "brand:en": "Herfy", "brand:wikidata": "Q5738371", "brand:wikipedia": "en:Herfy", "cuisine": "burger", "name": "Herfy", "name:ar": "هرفي", "name:en": "Herfy", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["ae", "bd", "bh", "kw", "sa"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/fast_food/burger/Hero Certified Burgers": {"name": "Hero Certified Burgers", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/HeroBurgers/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5742641", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "Hero Certified Burgers", "brand:wikidata": "Q5742641", "brand:wikipedia": "en:Hero Certified Burgers", "cuisine": "burger", "name": "Hero Certified Burgers", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/fast_food/burger/Hesburger": {"name": "Hesburger", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/hesburger/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1276832", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "Hesburger", "brand:wikidata": "Q1276832", "brand:wikipedia": "en:Hesburger", "cuisine": "burger", "name": "Hesburger", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/fast_food/Hot Dog on a Stick": {"name": "Hot Dog on a Stick", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/HotDogonaStick/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5909922", "amenity": "fast_food"}, "addTags": {"amenity": "fast_food", "brand": "Hot Dog on a Stick", "brand:wikidata": "Q5909922", "brand:wikipedia": "en:Hot Dog on a Stick", "cuisine": "hot_dog", "name": "Hot Dog on a Stick", "takeaway": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/fast_food/hot_dog/Hot Dog on a Stick": {"name": "Hot Dog on a Stick", "icon": "fas-hotdog", "imageURL": "https://graph.facebook.com/HotDogonaStick/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5909922", "amenity": "fast_food", "cuisine": "hot_dog"}, "addTags": {"amenity": "fast_food", "brand": "Hot Dog on a Stick", "brand:wikidata": "Q5909922", "brand:wikipedia": "en:Hot Dog on a Stick", "cuisine": "hot_dog", "name": "Hot Dog on a Stick", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "hot_dog"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/fast_food/mexican/Hot Head Burritos": {"name": "Hot Head Burritos", "icon": "fas-pepper-hot", "imageURL": "https://pbs.twimg.com/profile_images/956274820035022853/SBuliAdo_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5910008", "amenity": "fast_food", "cuisine": "mexican"}, "addTags": {"amenity": "fast_food", "brand": "Hot Head Burritos", "brand:wikidata": "Q5910008", "brand:wikipedia": "en:Hot Head Burritos", "cuisine": "mexican", "name": "Hot Head Burritos", "short_name": "Hot Head", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "mexican"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/fast_food/pizza/Hungry Howie's": {"name": "Hungry Howie's", "icon": "maki-restaurant-pizza", "imageURL": "https://graph.facebook.com/hungryhowies/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16985303", "amenity": "fast_food", "cuisine": "pizza"}, "addTags": {"amenity": "fast_food", "brand": "Hungry Howie's", "brand:wikidata": "Q16985303", "brand:wikipedia": "en:Hungry Howie's Pizza", "cuisine": "pizza", "name": "Hungry Howie's", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "pizza"}, "countryCodes": ["us"], "terms": ["hungry howies pizza"], "matchScore": 2, "suggestion": true},
     "amenity/fast_food/burger/Hungry Jacks": {"name": "Hungry Jacks", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/HungryJacks/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3036373", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "Hungry Jacks", "brand:wikidata": "Q3036373", "brand:wikipedia": "en:Hungry Jack's", "cuisine": "burger", "name": "Hungry Jacks", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["au"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -2263,7 +2277,7 @@
     "amenity/fast_food/burger/Whataburger": {"name": "Whataburger", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/whataburger/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q376627", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "Whataburger", "brand:wikidata": "Q376627", "brand:wikipedia": "en:Whataburger", "cuisine": "burger", "name": "Whataburger", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/fast_food/sandwich/Which Wich?": {"name": "Which Wich?", "icon": "temaki-sandwich", "imageURL": "https://graph.facebook.com/whichwich/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7993556", "amenity": "fast_food", "cuisine": "sandwich"}, "addTags": {"amenity": "fast_food", "brand": "Which Wich?", "brand:wikidata": "Q7993556", "brand:wikipedia": "en:Which Wich?", "cuisine": "sandwich", "name": "Which Wich?", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "sandwich"}, "countryCodes": ["ae", "gb", "gt", "mx", "om", "qa", "sa", "us"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/fast_food/burger/White Castle": {"name": "White Castle", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/WhiteCastle/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1244034", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "White Castle", "brand:wikidata": "Q1244034", "brand:wikipedia": "en:White Castle (restaurant)", "cuisine": "burger", "name": "White Castle", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/fast_food/Wienerschnitzel": {"name": "Wienerschnitzel", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/Wienerschnitzel/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q324679", "amenity": "fast_food"}, "addTags": {"amenity": "fast_food", "brand": "Wienerschnitzel", "brand:wikidata": "Q324679", "brand:wikipedia": "en:Wienerschnitzel", "cuisine": "hot_dog", "name": "Wienerschnitzel", "takeaway": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/fast_food/hot_dog/Wienerschnitzel": {"name": "Wienerschnitzel", "icon": "fas-hotdog", "imageURL": "https://graph.facebook.com/Wienerschnitzel/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q324679", "amenity": "fast_food", "cuisine": "hot_dog"}, "addTags": {"amenity": "fast_food", "brand": "Wienerschnitzel", "brand:wikidata": "Q324679", "brand:wikipedia": "en:Wienerschnitzel", "cuisine": "hot_dog", "name": "Wienerschnitzel", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "hot_dog"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/fast_food/burger/Wimpy": {"name": "Wimpy", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/wimpyrestaurants/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2811992", "amenity": "fast_food", "cuisine": "burger"}, "addTags": {"amenity": "fast_food", "brand": "Wimpy", "brand:wikidata": "Q2811992", "brand:wikipedia": "en:Wimpy (restaurant)", "cuisine": "burger", "name": "Wimpy", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "burger"}, "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/fast_food/Xi'an Famous Foods": {"name": "Xi'an Famous Foods", "icon": "maki-fast-food", "imageURL": "https://graph.facebook.com/xianfoods/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q8044020", "amenity": "fast_food"}, "addTags": {"amenity": "fast_food", "brand": "Xi'an Famous Foods", "brand:wikidata": "Q8044020", "brand:wikipedia": "en:Xi'an Famous Foods", "cuisine": "chinese", "name": "Xi'an Famous Foods", "takeaway": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/fast_food/chicken/Zaxby's": {"name": "Zaxby's", "icon": "fas-drumstick-bite", "imageURL": "https://graph.facebook.com/Zaxbys/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q8067525", "amenity": "fast_food", "cuisine": "chicken"}, "addTags": {"amenity": "fast_food", "brand": "Zaxby's", "brand:wikidata": "Q8067525", "brand:wikipedia": "en:Zaxby's", "cuisine": "chicken", "name": "Zaxby's", "official_name": "Zaxby's Chicken Fingers & Buffalo Wings", "takeaway": "yes"}, "reference": {"key": "cuisine", "value": "chicken"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -2625,35 +2639,35 @@
     "amenity/ice_cream/Yogurtland": {"name": "Yogurtland", "icon": "fas-ice-cream", "imageURL": "https://graph.facebook.com/yogurtland/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q8054428", "amenity": "ice_cream"}, "addTags": {"amenity": "ice_cream", "brand": "Yogurtland", "brand:wikidata": "Q8054428", "brand:wikipedia": "en:Yogurtland", "cuisine": "frozen_yogurt", "name": "Yogurtland", "takeaway": "yes"}, "countryCodes": ["ae", "au", "sg", "th", "us", "ve"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/ice_cream/sweetFrog": {"name": "sweetFrog", "icon": "fas-ice-cream", "imageURL": "https://graph.facebook.com/sweetfrogfroyo/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16952110", "amenity": "ice_cream"}, "addTags": {"amenity": "ice_cream", "brand": "sweetFrog", "brand:wikidata": "Q16952110", "brand:wikipedia": "en:Sweet Frog", "cuisine": "frozen_yogurt", "name": "sweetFrog"}, "countryCodes": ["us"], "terms": ["sweetfrog frozen yogurt", "sweetfrog premium frozen yogurt"], "matchScore": 2, "suggestion": true},
     "amenity/ice_cream/サーティワンアイスクリーム": {"name": "サーティワンアイスクリーム", "icon": "fas-ice-cream", "imageURL": "https://graph.facebook.com/baskinrobbinsUS/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q584601", "amenity": "ice_cream"}, "addTags": {"amenity": "ice_cream", "brand": "バスキン・ロビンス", "brand:en": "Baskin-Robbins", "brand:ja": "バスキン・ロビンス", "brand:wikidata": "Q584601", "brand:wikipedia": "ja:バスキン・ロビンス", "cuisine": "ice_cream", "name": "サーティワンアイスクリーム", "name:en": "Baskin-Robbins", "name:ja": "サーティワンアイスクリーム"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/kindergarten/Children's Learning Adventure": {"name": "Children's Learning Adventure", "icon": "maki-school", "imageURL": "https://graph.facebook.com/Childrenslearningadventure/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64821213", "amenity": "kindergarten"}, "addTags": {"after_school": "yes", "amenity": "kindergarten", "brand": "Children's Learning Adventure", "brand:wikidata": "Q64821213", "brand:wikipedia": "en:Children's Learning Adventure", "fee": "yes", "isced:level": "0", "name": "Children's Learning Adventure", "nursery": "yes", "preschool": "yes", "short_name": "CLA"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/kindergarten/Childtime": {"name": "Childtime", "icon": "maki-school", "imageURL": "https://graph.facebook.com/Childtime/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64877793", "amenity": "kindergarten"}, "addTags": {"amenity": "kindergarten", "brand": "Childtime", "brand:wikidata": "Q64877793", "fee": "yes", "isced:level": "0", "name": "Childtime", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": ["childtime learning center", "childtime learning centers"], "matchScore": 2, "suggestion": true},
-    "amenity/kindergarten/KinderCare": {"name": "KinderCare", "icon": "maki-school", "imageURL": "https://graph.facebook.com/kindercare/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6410551", "amenity": "kindergarten"}, "addTags": {"after_school": "yes", "alt_name": "KinderCare Learning Center", "amenity": "kindergarten", "brand": "KinderCare", "brand:wikidata": "Q6410551", "brand:wikipedia": "en:KinderCare Learning Centers", "fee": "yes", "isced:level": "0", "max_age": "12", "min_age": "6 weeks", "name": "KinderCare", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/kindergarten/La Petite Academy": {"name": "La Petite Academy", "icon": "maki-school", "imageURL": "https://graph.facebook.com/LaPetiteAcademy/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64877784", "amenity": "kindergarten"}, "addTags": {"amenity": "kindergarten", "brand": "La Petite Academy", "brand:wikidata": "Q64877784", "fee": "yes", "isced:level": "0", "name": "La Petite Academy", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": ["la petite"], "matchScore": 2, "suggestion": true},
-    "amenity/kindergarten/New Horizon Academy": {"name": "New Horizon Academy", "icon": "maki-school", "imageURL": "https://pbs.twimg.com/profile_images/778681004206592001/ZQF3Eurh_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64821306", "amenity": "kindergarten"}, "addTags": {"after_school": "yes", "amenity": "kindergarten", "brand": "New Horizon Academy", "brand:wikidata": "Q64821306", "fee": "yes", "isced:level": "0", "name": "New Horizon Academy", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/kindergarten/Primrose School": {"name": "Primrose School", "icon": "maki-school", "imageURL": "https://graph.facebook.com/PrimroseSchools/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7243677", "amenity": "kindergarten"}, "addTags": {"after_school": "yes", "alt_name": "Primrose Schools", "amenity": "kindergarten", "brand": "Primrose School", "brand:wikidata": "Q7243677", "brand:wikipedia": "en:Primrose Schools", "fee": "yes", "isced:level": "0", "max_age": "12", "min_age": "6 weeks", "name": "Primrose School", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": ["primrose"], "matchScore": 2, "suggestion": true},
-    "amenity/kindergarten/The Children's Courtyard": {"name": "The Children's Courtyard", "icon": "maki-school", "imageURL": "https://graph.facebook.com/ChildrensCourtyard/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64877852", "amenity": "kindergarten"}, "addTags": {"amenity": "kindergarten", "brand": "The Children's Courtyard", "brand:wikidata": "Q64877852", "fee": "yes", "isced:level": "0", "name": "The Children's Courtyard", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": ["children's courtyard"], "matchScore": 2, "suggestion": true},
-    "amenity/kindergarten/The Goddard School": {"name": "The Goddard School", "icon": "maki-school", "imageURL": "https://graph.facebook.com/goddardschool/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5576260", "amenity": "kindergarten"}, "addTags": {"after_school": "yes", "alt_name": "Goddard School", "amenity": "kindergarten", "brand": "The Goddard School", "brand:wikidata": "Q5576260", "brand:wikipedia": "en:Goddard School", "fee": "yes", "isced:level": "0", "min_age": "6 weeks", "name": "The Goddard School", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/kindergarten/Tutor Time": {"name": "Tutor Time", "icon": "maki-school", "imageURL": "https://graph.facebook.com/TutorTime/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64877826", "amenity": "kindergarten"}, "addTags": {"amenity": "kindergarten", "brand": "Tutor Time", "brand:wikidata": "Q64877826", "fee": "yes", "isced:level": "0", "name": "Tutor Time", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": ["tutor time child care", "tutor time child care learning center", "tutor time learning center", "tutor time learning centers"], "matchScore": 2, "suggestion": true},
-    "amenity/language_school/AEON": {"name": "AEON", "icon": "maki-school", "imageURL": "https://graph.facebook.com/AEONCorporation/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4687898", "amenity": "language_school"}, "addTags": {"amenity": "language_school", "brand": "AEON", "brand:en": "Aeon", "brand:ja": "AEON", "brand:ja-Hira": "イーオン", "brand:ja-Latn": "AEON", "brand:wikidata": "Q4687898", "brand:wikipedia": "ja:イーオン", "language:en": "main", "name": "AEON", "name:en": "Aeon", "name:ja": "AEON", "name:ja-Hira": "イーオン", "name:ja-Latn": "AEON"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/language_school/Berlitz": {"name": "Berlitz", "icon": "maki-school", "imageURL": "https://graph.facebook.com/BerlitzUS/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q821960", "amenity": "language_school"}, "addTags": {"amenity": "language_school", "brand": "Berlitz", "brand:wikidata": "Q821960", "brand:wikipedia": "en:Berlitz Corporation", "name": "Berlitz"}, "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/language_school/ECC外語学院": {"name": "ECC外語学院", "icon": "maki-school", "imageURL": "https://graph.facebook.com/ecc.co.jp/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5322655", "amenity": "language_school"}, "addTags": {"amenity": "language_school", "brand": "ECC外語学院", "brand:en": "ECC Foreign Language Institute", "brand:ja": "ECC外語学院", "brand:ja-Hira": "イーシーシーがいごがくいん", "brand:ja-Latn": "ECC Gaigo Gakuin", "brand:wikidata": "Q5322655", "brand:wikipedia": "ja:ECC総合教育機関", "language:en": "main", "name": "ECC外語学院", "name:en": "ECC Foreign Language Institute", "name:ja": "ECC外語学院", "name:ja-Hira": "イーシーシーがいごがくいん", "name:ja-Latn": "ECC Gaigo Gakuin", "short_name": "ECC", "short_name:en": "ECC", "short_name:ja": "ECC", "short_name:ja-Hira": "イーシーシー", "short_name:ja-Latn": "ECC"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/language_school/ELS": {"name": "ELS", "icon": "maki-school", "imageURL": "https://graph.facebook.com/els/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5323325", "amenity": "language_school"}, "addTags": {"amenity": "language_school", "brand": "ELS", "brand:en": "ELS", "brand:wikidata": "Q5323325", "brand:wikipedia": "en:ELS Language Centers", "language:en": "main", "name": "ELS", "name:en": "ELS", "official_name": "ELS Language Centers", "official_name:en": "ELS Language Centers"}, "countryCodes": ["ca", "in", "my", "pa", "sa", "tr", "us", "vn"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/language_school/GABA": {"name": "GABA", "icon": "maki-school", "imageURL": "https://graph.facebook.com/gaba.corp/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5515241", "amenity": "language_school"}, "addTags": {"amenity": "language_school", "brand": "GABA", "brand:en": "Gaba", "brand:ja": "GABA", "brand:ja-Kana": "ガバ", "brand:ja-Latn": "GABA", "brand:wikidata": "Q5515241", "brand:wikipedia": "ja:GABA (企業)", "language:en": "main", "name": "GABA", "name:en": "Gaba", "name:ja": "GABA", "name:ja-Kana": "ガバ", "name:ja-Latn": "GABA"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/language_school/NOVA": {"name": "NOVA", "icon": "maki-school", "imageURL": "https://graph.facebook.com/nova.jp/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7064000", "amenity": "language_school"}, "addTags": {"amenity": "language_school", "brand": "NOVA", "brand:en": "Nova", "brand:ja": "NOVA", "brand:ja-Hira": "ノヴァ", "brand:ja-Latn": "NOVA", "brand:wikidata": "Q7064000", "brand:wikipedia": "ja:NOVA", "language:en": "main", "name": "NOVA", "name:en": "Nova", "name:ja": "NOVA", "name:ja-Hira": "ノヴァ", "name:ja-Latn": "NOVA"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/language_school/Shane English School": {"name": "Shane English School", "icon": "maki-school", "imageURL": "https://graph.facebook.com/ShaneEnglishSchool/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q17054332", "amenity": "language_school"}, "addTags": {"amenity": "language_school", "brand": "Shane English School", "brand:en": "Shane English School", "brand:ja": "シェーン英会話", "brand:ja-Latn": "Shēn Eikaiwa", "brand:wikidata": "Q17054332", "brand:wikipedia": "en:Shane English School", "language:en": "main", "name": "Shane English School", "name:en": "Shane English School", "name:ja": "シェーン英会話", "name:ja-Latn": "Shēn Eikaiwa"}, "countryCodes": ["cn", "dz", "gb", "hk", "id", "kr", "pl", "th", "tw", "vn"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/language_school/シェーン英会話": {"name": "シェーン英会話", "icon": "maki-school", "imageURL": "https://graph.facebook.com/ShaneEnglishSchool/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q17054332", "amenity": "language_school"}, "addTags": {"amenity": "language_school", "brand": "シェーン英会話", "brand:en": "Shane English School", "brand:ja": "シェーン英会話", "brand:ja-Latn": "Shēn Eikaiwa", "brand:wikidata": "Q17054332", "brand:wikipedia": "ja:シェーン英会話スクール", "language:en": "main", "name": "シェーン英会話", "name:en": "Shane English School", "name:ja": "シェーン英会話", "name:ja-Latn": "Shēn Eikaiwa"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/language_school/セイハ英語学院": {"name": "セイハ英語学院", "icon": "maki-school", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7446694", "amenity": "language_school"}, "addTags": {"amenity": "language_school", "brand": "セイハ英語学院", "brand:en": "Seiha English Academy", "brand:ja": "セイハ英語学院", "brand:ja-Hani": "セイハえいごがくいん", "brand:ja-Latn": "Seiha Eigo Gakuin", "brand:wikidata": "Q7446694", "language:en": "main", "name": "セイハ英語学院", "name:en": "Seiha English Academy", "name:ja": "セイハ英語学院", "name:ja-Hani": "セイハえいごがくいん", "name:ja-Latn": "Seiha Eigo Gakuin"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/language_school/ベルリッツ": {"name": "ベルリッツ", "icon": "maki-school", "imageURL": "https://graph.facebook.com/BerlitzJapan/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4892545", "amenity": "language_school"}, "addTags": {"amenity": "language_school", "brand": "ベルリッツ", "brand:en": "Berlitz", "brand:ja": "ベルリッツ", "brand:ja-Hira": "ベルリッツ", "brand:wikidata": "Q4892545", "brand:wikipedia": "ja:ベルリッツ・ジャパン", "name": "ベルリッツ", "name:en": "Berlitz", "name:ja": "ベルリッツ", "name:ja-Hira": "ベルリッツ"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/language_school/ペッピーキッズクラブ": {"name": "ペッピーキッズクラブ", "icon": "maki-school", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7166471", "amenity": "language_school"}, "addTags": {"amenity": "language_school", "brand": "ペッピーキッズクラブ", "brand:en": "Peppy Kids Club", "brand:ja": "ペッピーキッズクラブ", "brand:ja-Latn": "Peppi Kizzu Kurabu", "brand:wikidata": "Q7166471", "brand:wikipedia": "ja:ペッピーキッズクラブ", "language:en": "main", "name": "ペッピーキッズクラブ", "name:en": "Peppy Kids Club", "name:ja": "ペッピーキッズクラブ", "name:ja-Latn": "Peppi Kizzu Kurabu"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/money_transfer/Express Union": {"name": "Express Union", "icon": "maki-bank", "imageURL": "https://graph.facebook.com/ExpressUnionFinance/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3062276", "amenity": "money_transfer"}, "addTags": {"amenity": "money_transfer", "brand": "Express Union", "brand:wikidata": "Q3062276", "brand:wikipedia": "fr:Express Union", "name": "Express Union"}, "countryCodes": ["td"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/money_transfer/Hoa Phát": {"name": "Hoa Phát", "icon": "maki-bank", "imageURL": "https://pbs.twimg.com/profile_images/692515699349135364/P4MUVfcJ_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q65116775", "amenity": "money_transfer"}, "addTags": {"amenity": "money_transfer", "brand": "Hoa Phát", "brand:wikidata": "Q65116775", "name": "Hoa Phát", "name:vi": "Hoa Phát"}, "countryCodes": ["us"], "terms": ["hoa phat goi tien", "hoa phat gui tien"], "matchScore": 2, "suggestion": true},
-    "amenity/money_transfer/MoneyGram": {"name": "MoneyGram", "icon": "maki-bank", "imageURL": "https://graph.facebook.com/moneygram/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1944412", "amenity": "money_transfer"}, "addTags": {"amenity": "money_transfer", "brand": "MoneyGram", "brand:wikidata": "Q1944412", "brand:wikipedia": "en:MoneyGram", "name": "MoneyGram"}, "countryCodes": ["de", "fr", "gr"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/money_transfer/Orange Money": {"name": "Orange Money", "icon": "maki-bank", "imageURL": "https://graph.facebook.com/orange/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16668220", "amenity": "money_transfer"}, "addTags": {"amenity": "money_transfer", "brand": "Orange Money", "brand:wikidata": "Q16668220", "brand:wikipedia": "en:Orange Money", "name": "Orange Money"}, "countryCodes": ["ml"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/money_transfer/Western Union": {"name": "Western Union", "icon": "maki-bank", "imageURL": "https://graph.facebook.com/WesternUnion/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q861042", "amenity": "money_transfer"}, "addTags": {"amenity": "money_transfer", "brand": "Western Union", "brand:wikidata": "Q861042", "brand:wikipedia": "en:Western Union", "name": "Western Union"}, "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/kindergarten/Children's Learning Adventure": {"name": "Children's Learning Adventure", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/Childrenslearningadventure/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64821213", "amenity": "kindergarten"}, "addTags": {"after_school": "yes", "amenity": "kindergarten", "brand": "Children's Learning Adventure", "brand:wikidata": "Q64821213", "brand:wikipedia": "en:Children's Learning Adventure", "fee": "yes", "isced:level": "0", "name": "Children's Learning Adventure", "nursery": "yes", "preschool": "yes", "short_name": "CLA"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/kindergarten/Childtime": {"name": "Childtime", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/Childtime/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64877793", "amenity": "kindergarten"}, "addTags": {"amenity": "kindergarten", "brand": "Childtime", "brand:wikidata": "Q64877793", "fee": "yes", "isced:level": "0", "name": "Childtime", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": ["childtime learning center", "childtime learning centers"], "matchScore": 2, "suggestion": true},
+    "amenity/kindergarten/KinderCare": {"name": "KinderCare", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/kindercare/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6410551", "amenity": "kindergarten"}, "addTags": {"after_school": "yes", "alt_name": "KinderCare Learning Center", "amenity": "kindergarten", "brand": "KinderCare", "brand:wikidata": "Q6410551", "brand:wikipedia": "en:KinderCare Learning Centers", "fee": "yes", "isced:level": "0", "max_age": "12", "min_age": "6 weeks", "name": "KinderCare", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/kindergarten/La Petite Academy": {"name": "La Petite Academy", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/LaPetiteAcademy/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64877784", "amenity": "kindergarten"}, "addTags": {"amenity": "kindergarten", "brand": "La Petite Academy", "brand:wikidata": "Q64877784", "fee": "yes", "isced:level": "0", "name": "La Petite Academy", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": ["la petite"], "matchScore": 2, "suggestion": true},
+    "amenity/kindergarten/New Horizon Academy": {"name": "New Horizon Academy", "icon": "temaki-school", "imageURL": "https://pbs.twimg.com/profile_images/778681004206592001/ZQF3Eurh_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64821306", "amenity": "kindergarten"}, "addTags": {"after_school": "yes", "amenity": "kindergarten", "brand": "New Horizon Academy", "brand:wikidata": "Q64821306", "fee": "yes", "isced:level": "0", "name": "New Horizon Academy", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/kindergarten/Primrose School": {"name": "Primrose School", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/PrimroseSchools/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7243677", "amenity": "kindergarten"}, "addTags": {"after_school": "yes", "alt_name": "Primrose Schools", "amenity": "kindergarten", "brand": "Primrose School", "brand:wikidata": "Q7243677", "brand:wikipedia": "en:Primrose Schools", "fee": "yes", "isced:level": "0", "max_age": "12", "min_age": "6 weeks", "name": "Primrose School", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": ["primrose"], "matchScore": 2, "suggestion": true},
+    "amenity/kindergarten/The Children's Courtyard": {"name": "The Children's Courtyard", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/ChildrensCourtyard/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64877852", "amenity": "kindergarten"}, "addTags": {"amenity": "kindergarten", "brand": "The Children's Courtyard", "brand:wikidata": "Q64877852", "fee": "yes", "isced:level": "0", "name": "The Children's Courtyard", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": ["children's courtyard"], "matchScore": 2, "suggestion": true},
+    "amenity/kindergarten/The Goddard School": {"name": "The Goddard School", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/goddardschool/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5576260", "amenity": "kindergarten"}, "addTags": {"after_school": "yes", "alt_name": "Goddard School", "amenity": "kindergarten", "brand": "The Goddard School", "brand:wikidata": "Q5576260", "brand:wikipedia": "en:Goddard School", "fee": "yes", "isced:level": "0", "min_age": "6 weeks", "name": "The Goddard School", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/kindergarten/Tutor Time": {"name": "Tutor Time", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/TutorTime/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64877826", "amenity": "kindergarten"}, "addTags": {"amenity": "kindergarten", "brand": "Tutor Time", "brand:wikidata": "Q64877826", "fee": "yes", "isced:level": "0", "name": "Tutor Time", "nursery": "yes", "preschool": "yes"}, "countryCodes": ["us"], "terms": ["tutor time child care", "tutor time child care learning center", "tutor time learning center", "tutor time learning centers"], "matchScore": 2, "suggestion": true},
+    "amenity/language_school/AEON": {"name": "AEON", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/AEONCorporation/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4687898", "amenity": "language_school"}, "addTags": {"amenity": "language_school", "brand": "AEON", "brand:en": "Aeon", "brand:ja": "AEON", "brand:ja-Hira": "イーオン", "brand:ja-Latn": "AEON", "brand:wikidata": "Q4687898", "brand:wikipedia": "ja:イーオン", "language:en": "main", "name": "AEON", "name:en": "Aeon", "name:ja": "AEON", "name:ja-Hira": "イーオン", "name:ja-Latn": "AEON"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/language_school/Berlitz": {"name": "Berlitz", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/BerlitzUS/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q821960", "amenity": "language_school"}, "addTags": {"amenity": "language_school", "brand": "Berlitz", "brand:wikidata": "Q821960", "brand:wikipedia": "en:Berlitz Corporation", "name": "Berlitz"}, "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/language_school/ECC外語学院": {"name": "ECC外語学院", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/ecc.co.jp/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5322655", "amenity": "language_school"}, "addTags": {"amenity": "language_school", "brand": "ECC外語学院", "brand:en": "ECC Foreign Language Institute", "brand:ja": "ECC外語学院", "brand:ja-Hira": "イーシーシーがいごがくいん", "brand:ja-Latn": "ECC Gaigo Gakuin", "brand:wikidata": "Q5322655", "brand:wikipedia": "ja:ECC総合教育機関", "language:en": "main", "name": "ECC外語学院", "name:en": "ECC Foreign Language Institute", "name:ja": "ECC外語学院", "name:ja-Hira": "イーシーシーがいごがくいん", "name:ja-Latn": "ECC Gaigo Gakuin", "short_name": "ECC", "short_name:en": "ECC", "short_name:ja": "ECC", "short_name:ja-Hira": "イーシーシー", "short_name:ja-Latn": "ECC"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/language_school/ELS": {"name": "ELS", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/els/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5323325", "amenity": "language_school"}, "addTags": {"amenity": "language_school", "brand": "ELS", "brand:en": "ELS", "brand:wikidata": "Q5323325", "brand:wikipedia": "en:ELS Language Centers", "language:en": "main", "name": "ELS", "name:en": "ELS", "official_name": "ELS Language Centers", "official_name:en": "ELS Language Centers"}, "countryCodes": ["ca", "in", "my", "pa", "sa", "tr", "us", "vn"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/language_school/GABA": {"name": "GABA", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/gaba.corp/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5515241", "amenity": "language_school"}, "addTags": {"amenity": "language_school", "brand": "GABA", "brand:en": "Gaba", "brand:ja": "GABA", "brand:ja-Kana": "ガバ", "brand:ja-Latn": "GABA", "brand:wikidata": "Q5515241", "brand:wikipedia": "ja:GABA (企業)", "language:en": "main", "name": "GABA", "name:en": "Gaba", "name:ja": "GABA", "name:ja-Kana": "ガバ", "name:ja-Latn": "GABA"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/language_school/NOVA": {"name": "NOVA", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/nova.jp/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7064000", "amenity": "language_school"}, "addTags": {"amenity": "language_school", "brand": "NOVA", "brand:en": "Nova", "brand:ja": "NOVA", "brand:ja-Hira": "ノヴァ", "brand:ja-Latn": "NOVA", "brand:wikidata": "Q7064000", "brand:wikipedia": "ja:NOVA", "language:en": "main", "name": "NOVA", "name:en": "Nova", "name:ja": "NOVA", "name:ja-Hira": "ノヴァ", "name:ja-Latn": "NOVA"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/language_school/Shane English School": {"name": "Shane English School", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/ShaneEnglishSchool/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q17054332", "amenity": "language_school"}, "addTags": {"amenity": "language_school", "brand": "Shane English School", "brand:en": "Shane English School", "brand:ja": "シェーン英会話", "brand:ja-Latn": "Shēn Eikaiwa", "brand:wikidata": "Q17054332", "brand:wikipedia": "en:Shane English School", "language:en": "main", "name": "Shane English School", "name:en": "Shane English School", "name:ja": "シェーン英会話", "name:ja-Latn": "Shēn Eikaiwa"}, "countryCodes": ["cn", "dz", "gb", "hk", "id", "kr", "pl", "th", "tw", "vn"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/language_school/シェーン英会話": {"name": "シェーン英会話", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/ShaneEnglishSchool/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q17054332", "amenity": "language_school"}, "addTags": {"amenity": "language_school", "brand": "シェーン英会話", "brand:en": "Shane English School", "brand:ja": "シェーン英会話", "brand:ja-Latn": "Shēn Eikaiwa", "brand:wikidata": "Q17054332", "brand:wikipedia": "ja:シェーン英会話スクール", "language:en": "main", "name": "シェーン英会話", "name:en": "Shane English School", "name:ja": "シェーン英会話", "name:ja-Latn": "Shēn Eikaiwa"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/language_school/セイハ英語学院": {"name": "セイハ英語学院", "icon": "temaki-school", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7446694", "amenity": "language_school"}, "addTags": {"amenity": "language_school", "brand": "セイハ英語学院", "brand:en": "Seiha English Academy", "brand:ja": "セイハ英語学院", "brand:ja-Hani": "セイハえいごがくいん", "brand:ja-Latn": "Seiha Eigo Gakuin", "brand:wikidata": "Q7446694", "language:en": "main", "name": "セイハ英語学院", "name:en": "Seiha English Academy", "name:ja": "セイハ英語学院", "name:ja-Hani": "セイハえいごがくいん", "name:ja-Latn": "Seiha Eigo Gakuin"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/language_school/ベルリッツ": {"name": "ベルリッツ", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/BerlitzJapan/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4892545", "amenity": "language_school"}, "addTags": {"amenity": "language_school", "brand": "ベルリッツ", "brand:en": "Berlitz", "brand:ja": "ベルリッツ", "brand:ja-Hira": "ベルリッツ", "brand:wikidata": "Q4892545", "brand:wikipedia": "ja:ベルリッツ・ジャパン", "name": "ベルリッツ", "name:en": "Berlitz", "name:ja": "ベルリッツ", "name:ja-Hira": "ベルリッツ"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/language_school/ペッピーキッズクラブ": {"name": "ペッピーキッズクラブ", "icon": "temaki-school", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7166471", "amenity": "language_school"}, "addTags": {"amenity": "language_school", "brand": "ペッピーキッズクラブ", "brand:en": "Peppy Kids Club", "brand:ja": "ペッピーキッズクラブ", "brand:ja-Latn": "Peppi Kizzu Kurabu", "brand:wikidata": "Q7166471", "brand:wikipedia": "ja:ペッピーキッズクラブ", "language:en": "main", "name": "ペッピーキッズクラブ", "name:en": "Peppy Kids Club", "name:ja": "ペッピーキッズクラブ", "name:ja-Latn": "Peppi Kizzu Kurabu"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/money_transfer/Express Union": {"name": "Express Union", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/ExpressUnionFinance/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3062276", "amenity": "money_transfer"}, "addTags": {"amenity": "money_transfer", "brand": "Express Union", "brand:wikidata": "Q3062276", "brand:wikipedia": "fr:Express Union", "name": "Express Union"}, "countryCodes": ["td"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/money_transfer/Hoa Phát": {"name": "Hoa Phát", "icon": "temaki-money_hand", "imageURL": "https://pbs.twimg.com/profile_images/692515699349135364/P4MUVfcJ_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q65116775", "amenity": "money_transfer"}, "addTags": {"amenity": "money_transfer", "brand": "Hoa Phát", "brand:wikidata": "Q65116775", "name": "Hoa Phát", "name:vi": "Hoa Phát"}, "countryCodes": ["us"], "terms": ["hoa phat goi tien", "hoa phat gui tien"], "matchScore": 2, "suggestion": true},
+    "amenity/money_transfer/MoneyGram": {"name": "MoneyGram", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/moneygram/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1944412", "amenity": "money_transfer"}, "addTags": {"amenity": "money_transfer", "brand": "MoneyGram", "brand:wikidata": "Q1944412", "brand:wikipedia": "en:MoneyGram", "name": "MoneyGram"}, "countryCodes": ["de", "fr", "gr"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/money_transfer/Orange Money": {"name": "Orange Money", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/orange/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16668220", "amenity": "money_transfer"}, "addTags": {"amenity": "money_transfer", "brand": "Orange Money", "brand:wikidata": "Q16668220", "brand:wikipedia": "en:Orange Money", "name": "Orange Money"}, "countryCodes": ["ml"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/money_transfer/Western Union": {"name": "Western Union", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/WesternUnion/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q861042", "amenity": "money_transfer"}, "addTags": {"amenity": "money_transfer", "brand": "Western Union", "brand:wikidata": "Q861042", "brand:wikipedia": "en:Western Union", "name": "Western Union"}, "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/parking/Parking Company of America": {"name": "Parking Company of America", "icon": "maki-car", "imageURL": "https://graph.facebook.com/parkingcompanyofamerica/picture?type=large", "geometry": ["point", "vertex", "area"], "tags": {"brand:wikidata": "Q65491376", "amenity": "parking"}, "addTags": {"amenity": "parking", "brand": "Parking Company of America", "brand:wikidata": "Q65491376", "fee": "yes", "name": "Parking Company of America", "short_name": "PCA"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/parking/SP+": {"name": "SP+", "icon": "maki-car", "imageURL": "https://graph.facebook.com/sppluscorp/picture?type=large", "geometry": ["point", "vertex", "area"], "tags": {"brand:wikidata": "Q7598289", "amenity": "parking"}, "addTags": {"alt_name": "SP Plus", "amenity": "parking", "brand": "SP+", "brand:wikidata": "Q7598289", "brand:wikipedia": "en:SP Plus Corporation", "fee": "yes", "name": "SP+"}, "countryCodes": ["ca", "us"], "terms": ["central parking", "central parking system", "standard parking"], "matchScore": 2, "suggestion": true},
-    "amenity/payment_centre/Abitab": {"name": "Abitab", "icon": "maki-bank", "imageURL": "https://graph.facebook.com/Abitaboficial/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16488129", "amenity": "payment_centre"}, "addTags": {"amenity": "payment_centre", "brand": "Abitab", "brand:wikidata": "Q16488129", "brand:wikipedia": "es:Abitab", "name": "Abitab"}, "countryCodes": ["uy"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/payment_centre/Rapipago": {"name": "Rapipago", "icon": "maki-bank", "imageURL": "https://graph.facebook.com/Rapipago/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6100413", "amenity": "payment_centre"}, "addTags": {"amenity": "payment_centre", "brand": "Rapipago", "brand:wikidata": "Q6100413", "brand:wikipedia": "es:Rapipago", "name": "Rapipago"}, "countryCodes": ["ar"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/payment_centre/Abitab": {"name": "Abitab", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/Abitaboficial/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16488129", "amenity": "payment_centre"}, "addTags": {"amenity": "payment_centre", "brand": "Abitab", "brand:wikidata": "Q16488129", "brand:wikipedia": "es:Abitab", "name": "Abitab"}, "countryCodes": ["uy"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/payment_centre/Rapipago": {"name": "Rapipago", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/Rapipago/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6100413", "amenity": "payment_centre"}, "addTags": {"amenity": "payment_centre", "brand": "Rapipago", "brand:wikidata": "Q6100413", "brand:wikipedia": "es:Rapipago", "name": "Rapipago"}, "countryCodes": ["ar"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/payment_terminal/Qiwi": {"name": "Qiwi", "icon": "far-credit-card", "imageURL": "https://graph.facebook.com/qiwirussia/picture?type=large", "geometry": ["point"], "tags": {"brand:wikidata": "Q4047736", "amenity": "payment_terminal"}, "addTags": {"amenity": "payment_terminal", "brand": "Qiwi", "brand:wikidata": "Q4047736", "brand:wikipedia": "en:Qiwi", "name": "Qiwi"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/payment_terminal/ПриватБанк": {"name": "ПриватБанк", "icon": "far-credit-card", "imageURL": "https://graph.facebook.com/privatbank/picture?type=large", "geometry": ["point"], "tags": {"brand:wikidata": "Q1515015", "amenity": "payment_terminal"}, "addTags": {"amenity": "payment_terminal", "brand": "ПриватБанк", "brand:wikidata": "Q1515015", "brand:wikipedia": "en:PrivatBank", "name": "ПриватБанк"}, "countryCodes": ["ua"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/payment_terminal/Элекснет": {"name": "Элекснет", "icon": "far-credit-card", "imageURL": "https://graph.facebook.com/elecsnet/picture?type=large", "geometry": ["point"], "tags": {"brand:wikidata": "Q4530795", "amenity": "payment_terminal"}, "addTags": {"amenity": "payment_terminal", "brand": "Элекснет", "brand:wikidata": "Q4530795", "brand:wikipedia": "ru:Элекснет", "name": "Элекснет"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -3009,13 +3023,13 @@
     "amenity/restaurant/White Spot": {"name": "White Spot", "icon": "maki-restaurant", "imageURL": "https://graph.facebook.com/whitespot/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7995414", "amenity": "restaurant"}, "addTags": {"amenity": "restaurant", "brand": "White Spot", "brand:wikidata": "Q7995414", "brand:wikipedia": "en:White Spot", "cuisine": "burger", "name": "White Spot"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/restaurant/Wild Wing": {"name": "Wild Wing", "icon": "maki-restaurant", "imageURL": "https://graph.facebook.com/WildWingRestaurants/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q8000869", "amenity": "restaurant"}, "addTags": {"amenity": "restaurant", "brand": "Wild Wing", "brand:wikidata": "Q8000869", "brand:wikipedia": "en:Wild Wing Restaurants", "cuisine": "chicken", "name": "Wild Wing"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/restaurant/Wingstop": {"name": "Wingstop", "icon": "maki-restaurant", "imageURL": "https://graph.facebook.com/Wingstop/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q8025339", "amenity": "restaurant"}, "addTags": {"amenity": "restaurant", "brand": "Wingstop", "brand:wikidata": "Q8025339", "brand:wikipedia": "en:Wingstop", "cuisine": "wings", "name": "Wingstop"}, "countryCodes": ["mx", "us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/restaurant/sushi/YO! Sushi": {"name": "YO! Sushi", "icon": "fas-fish", "imageURL": "https://graph.facebook.com/YOSushi/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3105441", "amenity": "restaurant", "cuisine": "sushi"}, "addTags": {"amenity": "restaurant", "brand": "YO! Sushi", "brand:wikidata": "Q3105441", "brand:wikipedia": "en:YO! Sushi", "cuisine": "sushi", "name": "YO! Sushi"}, "reference": {"key": "cuisine", "value": "sushi"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/restaurant/sushi/YO! Sushi": {"name": "YO! Sushi", "icon": "temaki-temaki", "imageURL": "https://graph.facebook.com/YOSushi/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3105441", "amenity": "restaurant", "cuisine": "sushi"}, "addTags": {"amenity": "restaurant", "brand": "YO! Sushi", "brand:wikidata": "Q3105441", "brand:wikipedia": "en:YO! Sushi", "cuisine": "sushi", "name": "YO! Sushi"}, "reference": {"key": "cuisine", "value": "sushi"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/restaurant/american/Yard House": {"name": "Yard House", "icon": "maki-restaurant", "imageURL": "https://graph.facebook.com/yardhouse/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q21189156", "amenity": "restaurant", "cuisine": "american"}, "addTags": {"alcohol": "yes", "amenity": "restaurant", "brand": "Yard House", "brand:wikidata": "Q21189156", "brand:wikipedia": "en:Yard House", "cuisine": "american", "name": "Yard House"}, "reference": {"key": "cuisine", "value": "american"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/restaurant/italian/Zizzi": {"name": "Zizzi", "icon": "maki-restaurant", "imageURL": "https://graph.facebook.com/wearezizzi/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q8072944", "amenity": "restaurant", "cuisine": "italian"}, "addTags": {"amenity": "restaurant", "brand": "Zizzi", "brand:wikidata": "Q8072944", "brand:wikipedia": "en:Zizzi", "cuisine": "italian", "name": "Zizzi"}, "reference": {"key": "cuisine", "value": "italian"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/restaurant/dean&david": {"name": "dean&david", "icon": "maki-restaurant", "imageURL": "https://graph.facebook.com/deananddavid07/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q66132404", "amenity": "restaurant"}, "addTags": {"amenity": "restaurant", "brand": "dean&david", "brand:wikidata": "Q66132404", "cuisine": "salad;sandwich", "name": "dean&david"}, "countryCodes": ["at", "ch", "de", "lu", "qa"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/restaurant/Евразия (Russia)": {"name": "Евразия (Russia)", "icon": "maki-restaurant", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q66087936", "amenity": "restaurant"}, "addTags": {"amenity": "restaurant", "brand": "Евразия", "brand:wikidata": "Q66087936", "cuisine": "international", "name": "Евразия"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/restaurant/Евразия (Ukraine)": {"name": "Евразия (Ukraine)", "icon": "maki-restaurant", "imageURL": "https://graph.facebook.com/EvrasiaKiev/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q66088028", "amenity": "restaurant"}, "addTags": {"amenity": "restaurant", "brand": "Евразия", "brand:wikidata": "Q66088028", "cuisine": "international", "name": "Евразия"}, "countryCodes": ["ua"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/restaurant/sushi/Планета Суши": {"name": "Планета Суши", "icon": "fas-fish", "imageURL": "https://graph.facebook.com/sushiplanet.ru/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62739250", "amenity": "restaurant", "cuisine": "sushi"}, "addTags": {"amenity": "restaurant", "brand": "Планета Суши", "brand:wikidata": "Q62739250", "cuisine": "sushi", "name": "Планета Суши", "name:en": "Planet Sushi"}, "reference": {"key": "cuisine", "value": "sushi"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/restaurant/sushi/Планета Суши": {"name": "Планета Суши", "icon": "temaki-temaki", "imageURL": "https://graph.facebook.com/sushiplanet.ru/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62739250", "amenity": "restaurant", "cuisine": "sushi"}, "addTags": {"amenity": "restaurant", "brand": "Планета Суши", "brand:wikidata": "Q62739250", "cuisine": "sushi", "name": "Планета Суши", "name:en": "Planet Sushi"}, "reference": {"key": "cuisine", "value": "sushi"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/restaurant/japanese/Тануки": {"name": "Тануки", "icon": "maki-restaurant-noodle", "imageURL": "https://graph.facebook.com/tanuki.official/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62758690", "amenity": "restaurant", "cuisine": "japanese"}, "addTags": {"amenity": "restaurant", "brand": "Тануки", "brand:wikidata": "Q62758690", "cuisine": "japanese", "name": "Тануки", "name:en": "Tanuki", "name:ru": "Тануки"}, "reference": {"key": "cuisine", "value": "japanese"}, "countryCodes": ["kz", "ru", "ua"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/restaurant/japanese/Якитория": {"name": "Якитория", "icon": "maki-restaurant-noodle", "imageURL": "https://graph.facebook.com/yakitoriyacafe/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q66088063", "amenity": "restaurant", "cuisine": "japanese;international"}, "addTags": {"amenity": "restaurant", "brand": "Якитория", "brand:wikidata": "Q66088063", "cuisine": "japanese;international", "name": "Якитория"}, "reference": {"key": "cuisine", "value": "japanese"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/restaurant/בורגר סאלון": {"name": "בורגר סאלון", "icon": "maki-restaurant", "imageURL": "https://graph.facebook.com/BurgerSaloon/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64760057", "amenity": "restaurant"}, "addTags": {"amenity": "restaurant", "brand": "בורגר סאלון", "brand:en": "Burger Saloon", "brand:he": "בורגר סאלון", "brand:wikidata": "Q64760057", "cuisine": "burger", "name": "בורגר סאלון", "name:en": "Burger Saloon", "name:he": "בורגר סאלון"}, "countryCodes": ["il"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -3049,9 +3063,9 @@
     "amenity/restaurant/japanese/華屋与兵衛": {"name": "華屋与兵衛", "icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q11620063", "amenity": "restaurant", "cuisine": "japanese"}, "addTags": {"amenity": "restaurant", "brand": "華屋与兵衛", "brand:en": "Hanaya Yohei", "brand:ja": "華屋与兵衛", "brand:wikidata": "Q11620063", "brand:wikipedia": "ja:華屋与兵衛 (レストラン)", "cuisine": "japanese", "name": "華屋与兵衛", "name:en": "Hanaya Yohei", "name:ja": "華屋与兵衛"}, "reference": {"key": "cuisine", "value": "japanese"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/restaurant/chinese/餃子の王将": {"name": "餃子の王将", "icon": "maki-restaurant-noodle", "imageURL": "https://graph.facebook.com/ohshosaiyo/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q11666805", "amenity": "restaurant", "cuisine": "chinese;gyoza"}, "addTags": {"amenity": "restaurant", "brand": "餃子の王将", "brand:en": "Gyoza no Ohsho", "brand:ja": "餃子の王将", "brand:wikidata": "Q11666805", "brand:wikipedia": "en:Gyoza no Ohsho", "cuisine": "chinese;gyoza", "name": "餃子の王将", "name:en": "Gyoza no Ohsho", "name:ja": "餃子の王将"}, "reference": {"key": "cuisine", "value": "chinese"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/restaurant/빕스": {"name": "빕스", "icon": "maki-restaurant", "imageURL": "https://graph.facebook.com/ivips/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q12599540", "amenity": "restaurant"}, "addTags": {"amenity": "restaurant", "brand": "빕스", "brand:en": "Vips", "brand:ko": "빕스", "brand:wikidata": "Q12599540", "brand:wikipedia": "ko:빕스", "cuisine": "salad;steak_house", "name": "빕스", "name:en": "Vips", "name:ko": "빕스"}, "countryCodes": ["kr"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/school/Imagine Schools": {"name": "Imagine Schools", "icon": "maki-school", "imageURL": "https://pbs.twimg.com/profile_images/378800000441414844/d5dd1489ee04654b0efb3f99873bea51_bigger.jpeg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6002737", "amenity": "school"}, "addTags": {"amenity": "school", "brand": "Imagine Schools", "brand:wikidata": "Q6002737", "brand:wikipedia": "en:Imagine Schools", "name": "Imagine Schools", "operator:type": "private_non_profit"}, "countryCodes": ["us"], "terms": ["imagine", "imagine school"], "matchScore": 2, "suggestion": true},
-    "amenity/school/KIPP": {"name": "KIPP", "icon": "maki-school", "imageURL": "https://graph.facebook.com/KIPPFoundation/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6423304", "amenity": "school"}, "addTags": {"amenity": "school", "brand": "KIPP", "brand:wikidata": "Q6423304", "brand:wikipedia": "en:KIPP (organization)", "name": "KIPP", "official_name": "Knowledge Is Power Program", "operator:type": "private_non_profit"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "amenity/school/Success Academy": {"name": "Success Academy", "icon": "maki-school", "imageURL": "https://graph.facebook.com/SuccessAcademies/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q14707388", "amenity": "school"}, "addTags": {"amenity": "school", "brand": "Success Academy", "brand:wikidata": "Q14707388", "brand:wikipedia": "en:Success Academy Charter Schools", "name": "Success Academy", "operator:type": "private_non_profit"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/school/Imagine Schools": {"name": "Imagine Schools", "icon": "temaki-school", "imageURL": "https://pbs.twimg.com/profile_images/378800000441414844/d5dd1489ee04654b0efb3f99873bea51_bigger.jpeg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6002737", "amenity": "school"}, "addTags": {"amenity": "school", "brand": "Imagine Schools", "brand:wikidata": "Q6002737", "brand:wikipedia": "en:Imagine Schools", "name": "Imagine Schools", "operator:type": "private_non_profit"}, "countryCodes": ["us"], "terms": ["imagine", "imagine school"], "matchScore": 2, "suggestion": true},
+    "amenity/school/KIPP": {"name": "KIPP", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/KIPPFoundation/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6423304", "amenity": "school"}, "addTags": {"amenity": "school", "brand": "KIPP", "brand:wikidata": "Q6423304", "brand:wikipedia": "en:KIPP (organization)", "name": "KIPP", "official_name": "Knowledge Is Power Program", "operator:type": "private_non_profit"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "amenity/school/Success Academy": {"name": "Success Academy", "icon": "temaki-school", "imageURL": "https://graph.facebook.com/SuccessAcademies/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q14707388", "amenity": "school"}, "addTags": {"amenity": "school", "brand": "Success Academy", "brand:wikidata": "Q14707388", "brand:wikipedia": "en:Success Academy Charter Schools", "name": "Success Academy", "operator:type": "private_non_profit"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "amenity/social_centre/American Legion Hall": {"name": "American Legion Hall", "icon": "fas-handshake", "imageURL": "https://graph.facebook.com/americanlegionhq/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q468865", "amenity": "social_centre"}, "addTags": {"amenity": "social_centre", "brand": "American Legion", "brand:wikidata": "Q468865", "brand:wikipedia": "en:American Legion", "name": "American Legion Hall", "social_centre:for": "veterans"}, "countryCodes": ["us"], "terms": ["american legion"], "matchScore": 2, "suggestion": true},
     "amenity/social_centre/Eagles Lodge": {"name": "Eagles Lodge", "icon": "fas-handshake", "imageURL": "https://graph.facebook.com/foegrandaerie/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5493810", "amenity": "social_centre"}, "addTags": {"alt_name": "Aeries Lodge", "amenity": "social_centre", "brand": "Fraternal Order of Eagles", "brand:wikidata": "Q5493810", "brand:wikipedia": "en:Fraternal Order of Eagles", "name": "Eagles Lodge", "official_name": "Fraternal Order of Eagles", "short_name": "FOE"}, "countryCodes": ["us"], "terms": ["aeries", "eagles"], "matchScore": 2, "suggestion": true},
     "amenity/social_centre/Elks Lodge": {"name": "Elks Lodge", "icon": "fas-handshake", "imageURL": "https://graph.facebook.com/107605905935671/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2895789", "amenity": "social_centre"}, "addTags": {"amenity": "social_centre", "brand": "Benevolent and Protective Order of Elks", "brand:wikidata": "Q2895789", "brand:wikipedia": "en:Benevolent and Protective Order of Elks", "name": "Elks Lodge", "official_name": "Benevolent and Protective Order of Elks", "short_name": "BPOE"}, "countryCodes": ["us"], "terms": ["elks"], "matchScore": 2, "suggestion": true},
@@ -3127,7 +3141,7 @@
     "leisure/playground/McDonald's PlayPlace": {"name": "McDonald's PlayPlace", "icon": "maki-playground", "imageURL": "https://graph.facebook.com/mcdonalds/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q38076", "leisure": "playground"}, "addTags": {"access": "customers", "brand": "McDonald's", "brand:wikidata": "Q38076", "brand:wikipedia": "en:McDonald's", "leisure": "playground", "name": "McDonald's PlayPlace"}, "terms": ["mcdonald's"], "matchScore": 2, "suggestion": true},
     "leisure/sports_centre/YMCA": {"name": "YMCA", "icon": "maki-pitch", "imageURL": "https://graph.facebook.com/YMCA/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q157169", "leisure": "sports_centre"}, "addTags": {"brand": "YMCA", "brand:wikidata": "Q157169", "brand:wikipedia": "en:YMCA", "leisure": "sports_centre", "name": "YMCA"}, "terms": [], "matchScore": 2, "suggestion": true},
     "leisure/sports_centre/iFLY": {"name": "iFLY", "icon": "maki-pitch", "imageURL": "https://graph.facebook.com/iFLYUS/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64767105", "leisure": "sports_centre"}, "addTags": {"brand": "iFLY", "brand:wikidata": "Q64767105", "leisure": "sports_centre", "name": "iFLY", "sport": "indoor_skydiving"}, "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/beauty/tanning/Palm Beach Tan": {"name": "Palm Beach Tan", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/PBTOfficial/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64027086", "shop": "beauty", "beauty": "tanning"}, "addTags": {"beauty": "tanning", "brand": "Palm Beach Tan", "brand:wikidata": "Q64027086", "brand:wikipedia": "en:Palm Beach Tan", "leisure": "tanning_salon", "name": "Palm Beach Tan", "shop": "beauty"}, "reference": {"key": "leisure", "value": "tanning_salon"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/beauty/tanning/Palm Beach Tan": {"name": "Palm Beach Tan", "icon": "temaki-tanning", "imageURL": "https://graph.facebook.com/PBTOfficial/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64027086", "shop": "beauty", "beauty": "tanning"}, "addTags": {"beauty": "tanning", "brand": "Palm Beach Tan", "brand:wikidata": "Q64027086", "brand:wikipedia": "en:Palm Beach Tan", "leisure": "tanning_salon", "name": "Palm Beach Tan", "shop": "beauty"}, "reference": {"key": "leisure", "value": "tanning_salon"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "office/bail_bond_agent/Aladdin Bail Bonds": {"name": "Aladdin Bail Bonds", "icon": "maki-bank", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FAladdin%20Bail%20Bonds%20logo.png&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64166257", "office": "bail_bond_agent"}, "addTags": {"brand": "Aladdin Bail Bonds", "brand:wikidata": "Q64166257", "brand:wikipedia": "en:Aladdin Bail Bonds", "name": "Aladdin Bail Bonds", "office": "bail_bond_agent", "opening_hours": "24/7"}, "countryCodes": ["us"], "terms": ["aladdin", "aladin bail bonds", "alladin bail bonds"], "matchScore": 2, "suggestion": true},
     "office/coworking/Awfis": {"name": "Awfis", "icon": "maki-suitcase", "imageURL": "https://graph.facebook.com/myawfis/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q60747757", "office": "coworking"}, "addTags": {"brand": "Awfis", "brand:wikidata": "Q60747757", "brand:wikipedia": "en:Awfis", "fee": "yes", "name": "Awfis", "office": "coworking"}, "reference": {"key": "amenity", "value": "coworking_space"}, "countryCodes": ["in"], "terms": [], "matchScore": 2, "suggestion": true},
     "office/coworking/Ucommune (China)": {"name": "Ucommune (China)", "icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q60785187", "office": "coworking"}, "addTags": {"brand": "优客工场", "brand:en": "Ucommune", "brand:wikidata": "Q60785187", "brand:wikipedia": "en:Ucommune", "brand:zh": "优客工场", "brand:zh-Hans": "优客工场", "fee": "yes", "name": "优客工场", "name:en": "Ucommune", "name:zh": "优客工场", "name:zh-Hans": "优客工场", "office": "coworking"}, "reference": {"key": "amenity", "value": "coworking_space"}, "countryCodes": ["cn"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -3281,12 +3295,12 @@
     "shop/bakery/巴黎贝甜 (China)": {"name": "巴黎贝甜 (China)", "icon": "maki-bakery", "imageURL": "https://graph.facebook.com/parisbaguetteus/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62605260", "shop": "bakery"}, "addTags": {"brand": "巴黎贝甜", "brand:en": "Paris Baguette", "brand:wikidata": "Q62605260", "brand:zh": "巴黎贝甜", "name": "巴黎贝甜", "name:en": "Paris Baguette", "name:zh": "巴黎贝甜", "shop": "bakery"}, "countryCodes": ["cn"], "terms": ["paris baguette", "paris baguette cafe", "巴黎貝甜"], "matchScore": 2, "suggestion": true},
     "shop/bakery/뚜레쥬르": {"name": "뚜레쥬르", "icon": "maki-bakery", "imageURL": "https://graph.facebook.com/TousLesJoursUSA/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3535609", "shop": "bakery"}, "addTags": {"brand": "뚜레쥬르", "brand:en": "Tous Les Jours", "brand:ko": "뚜레쥬르", "brand:wikidata": "Q3535609", "brand:wikipedia": "ko:뚜레쥬르", "name": "뚜레쥬르", "name:en": "Tous Les Jours", "name:ko": "뚜레쥬르", "shop": "bakery"}, "countryCodes": ["kr"], "terms": ["뚜레주르"], "matchScore": 2, "suggestion": true},
     "shop/bakery/파리바게뜨 (South Korea)": {"name": "파리바게뜨 (South Korea)", "icon": "maki-bakery", "imageURL": "https://graph.facebook.com/parisbaguetteus/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62605260", "shop": "bakery"}, "addTags": {"alt_name:ko": "파리바게트", "brand": "파리바게뜨", "brand:en": "Paris Baguette", "brand:ko": "파리바게뜨", "brand:wikidata": "Q62605260", "name": "파리바게뜨", "name:en": "Paris Baguette", "name:ko": "파리바게뜨", "shop": "bakery"}, "countryCodes": ["kr"], "terms": ["paris baguette", "paris baguette cafe", "파리바게트"], "matchScore": 2, "suggestion": true},
-    "shop/beauty/Benefit Brow Bar": {"name": "Benefit Brow Bar", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/benefitcosmetics/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2895769", "shop": "beauty"}, "addTags": {"beauty": "eyebrow;eyelash;waxing", "brand": "Benefit", "brand:wikidata": "Q2895769", "brand:wikipedia": "en:Benefit Cosmetics", "name": "Benefit Brow Bar", "shop": "beauty"}, "countryCodes": ["us"], "terms": ["benefit", "ulta brow bar"], "matchScore": 2, "suggestion": true},
-    "shop/beauty/European Wax Center": {"name": "European Wax Center", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/EuropeanWax/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5413426", "shop": "beauty"}, "addTags": {"beauty": "waxing", "brand": "European Wax Center", "brand:wikidata": "Q5413426", "brand:wikipedia": "en:European Wax Center", "name": "European Wax Center", "shop": "beauty"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/beauty/Indigo Sun": {"name": "Indigo Sun", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/indigosunretail/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q63436906", "shop": "beauty"}, "addTags": {"beauty": "tanning", "brand": "Indigo Sun", "brand:wikidata": "Q63436906", "name": "Indigo Sun", "shop": "beauty"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/beauty/Sola Salons": {"name": "Sola Salons", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/solasalons/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64337426", "shop": "beauty"}, "addTags": {"beauty": "hair;nails;skin_care;massage", "brand": "Sola Salons", "brand:wikidata": "Q64337426", "name": "Sola Salons", "shop": "beauty"}, "countryCodes": ["us"], "terms": ["sola", "sola salon studios"], "matchScore": 2, "suggestion": true},
-    "shop/beauty/The Skin Bar at Ulta Beauty": {"name": "The Skin Bar at Ulta Beauty", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/UltaBeauty/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7880076", "shop": "beauty"}, "addTags": {"alt_name": "Ulta Skin Bar", "beauty": "skin_care", "brand": "Ulta Beauty", "brand:wikidata": "Q7880076", "brand:wikipedia": "en:Ulta Beauty", "name": "The Skin Bar at Ulta Beauty", "shop": "beauty"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/beauty/Yves Rocher": {"name": "Yves Rocher", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/YvesRocherUSA/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q28496595", "shop": "beauty"}, "addTags": {"beauty": "cosmetics", "brand": "Yves Rocher", "brand:wikidata": "Q28496595", "brand:wikipedia": "en:Yves Rocher (company)", "name": "Yves Rocher", "shop": "beauty"}, "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/beauty/Benefit Brow Bar": {"name": "Benefit Brow Bar", "icon": "temaki-lipstick", "imageURL": "https://graph.facebook.com/benefitcosmetics/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2895769", "shop": "beauty"}, "addTags": {"beauty": "eyebrow;eyelash;waxing", "brand": "Benefit", "brand:wikidata": "Q2895769", "brand:wikipedia": "en:Benefit Cosmetics", "name": "Benefit Brow Bar", "shop": "beauty"}, "countryCodes": ["us"], "terms": ["benefit", "ulta brow bar"], "matchScore": 2, "suggestion": true},
+    "shop/beauty/European Wax Center": {"name": "European Wax Center", "icon": "temaki-lipstick", "imageURL": "https://graph.facebook.com/EuropeanWax/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5413426", "shop": "beauty"}, "addTags": {"beauty": "waxing", "brand": "European Wax Center", "brand:wikidata": "Q5413426", "brand:wikipedia": "en:European Wax Center", "name": "European Wax Center", "shop": "beauty"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/beauty/Indigo Sun": {"name": "Indigo Sun", "icon": "temaki-lipstick", "imageURL": "https://graph.facebook.com/indigosunretail/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q63436906", "shop": "beauty"}, "addTags": {"beauty": "tanning", "brand": "Indigo Sun", "brand:wikidata": "Q63436906", "name": "Indigo Sun", "shop": "beauty"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/beauty/Sola Salons": {"name": "Sola Salons", "icon": "temaki-lipstick", "imageURL": "https://graph.facebook.com/solasalons/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64337426", "shop": "beauty"}, "addTags": {"beauty": "hair;nails;skin_care;massage", "brand": "Sola Salons", "brand:wikidata": "Q64337426", "name": "Sola Salons", "shop": "beauty"}, "countryCodes": ["us"], "terms": ["sola", "sola salon studios"], "matchScore": 2, "suggestion": true},
+    "shop/beauty/The Skin Bar at Ulta Beauty": {"name": "The Skin Bar at Ulta Beauty", "icon": "temaki-lipstick", "imageURL": "https://graph.facebook.com/UltaBeauty/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7880076", "shop": "beauty"}, "addTags": {"alt_name": "Ulta Skin Bar", "beauty": "skin_care", "brand": "Ulta Beauty", "brand:wikidata": "Q7880076", "brand:wikipedia": "en:Ulta Beauty", "name": "The Skin Bar at Ulta Beauty", "shop": "beauty"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/beauty/Yves Rocher": {"name": "Yves Rocher", "icon": "temaki-lipstick", "imageURL": "https://graph.facebook.com/YvesRocherUSA/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q28496595", "shop": "beauty"}, "addTags": {"beauty": "cosmetics", "brand": "Yves Rocher", "brand:wikidata": "Q28496595", "brand:wikipedia": "en:Yves Rocher (company)", "name": "Yves Rocher", "shop": "beauty"}, "terms": [], "matchScore": 2, "suggestion": true},
     "shop/bed/Casper": {"name": "Casper", "icon": "maki-lodging", "imageURL": "https://graph.facebook.com/224110981099062/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q20539294", "shop": "bed"}, "addTags": {"brand": "Casper", "brand:wikidata": "Q20539294", "brand:wikipedia": "en:Casper Sleep", "name": "Casper", "shop": "bed"}, "terms": [], "matchScore": 2, "suggestion": true},
     "shop/bed/Dreams": {"name": "Dreams", "icon": "maki-lodging", "imageURL": "https://graph.facebook.com/dreamsbeds/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5306688", "shop": "bed"}, "addTags": {"brand": "Dreams", "brand:wikidata": "Q5306688", "brand:wikipedia": "en:Dreams (bed retailer)", "name": "Dreams", "shop": "bed"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/bed/Matratzen Concord": {"name": "Matratzen Concord", "icon": "maki-lodging", "imageURL": "https://graph.facebook.com/MatratzenConcord/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q18629057", "shop": "bed"}, "addTags": {"brand": "Matratzen Concord", "brand:wikidata": "Q18629057", "brand:wikipedia": "de:Matratzen Concord", "name": "Matratzen Concord", "shop": "bed"}, "countryCodes": ["at", "ch", "de"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -3294,31 +3308,31 @@
     "shop/bed/Mattress Warehouse": {"name": "Mattress Warehouse", "icon": "maki-lodging", "imageURL": "https://graph.facebook.com/mattresswhse/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q61995079", "shop": "bed"}, "addTags": {"brand": "Mattress Warehouse", "brand:wikidata": "Q61995079", "name": "Mattress Warehouse", "shop": "bed"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/bed/Sleep Country": {"name": "Sleep Country", "icon": "maki-lodging", "imageURL": "https://graph.facebook.com/SleepCountryCanada/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7539684", "shop": "bed"}, "addTags": {"brand": "Sleep Country", "brand:wikidata": "Q7539684", "brand:wikipedia": "en:Sleep Country Canada", "name": "Sleep Country", "shop": "bed"}, "countryCodes": ["ca"], "terms": ["Sleep Country Canada"], "matchScore": 2, "suggestion": true},
     "shop/bed/Sleep Number": {"name": "Sleep Number", "icon": "maki-lodging", "imageURL": "https://graph.facebook.com/SleepNumber/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7447640", "shop": "bed"}, "addTags": {"brand": "Sleep Number", "brand:wikidata": "Q7447640", "brand:wikipedia": "en:Sleep Number", "name": "Sleep Number", "shop": "bed"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/beverages/Dursty": {"name": "Dursty", "icon": "maki-shop", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FDursty%20Logo.svg&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1267518", "shop": "beverages"}, "addTags": {"brand": "Dursty", "brand:wikidata": "Q1267518", "brand:wikipedia": "de:Dursty Getränkemärkte", "name": "Dursty", "shop": "beverages"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/beverages/Edeka Getränkemarkt": {"name": "Edeka Getränkemarkt", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q57450576", "shop": "beverages"}, "addTags": {"brand": "Edeka Getränkemarkt", "brand:wikidata": "Q57450576", "name": "Edeka Getränkemarkt", "shop": "beverages"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/beverages/Fristo": {"name": "Fristo", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1465151", "shop": "beverages"}, "addTags": {"brand": "Fristo", "brand:wikidata": "Q1465151", "brand:wikipedia": "de:Fristo", "name": "Fristo", "shop": "beverages"}, "countryCodes": ["at", "de"], "terms": ["fristo getränkemarkt"], "matchScore": 2, "suggestion": true},
-    "shop/beverages/Getränke Hoffmann": {"name": "Getränke Hoffmann", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/getraenkehoffmann/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q19284021", "shop": "beverages"}, "addTags": {"brand": "Getränke Hoffmann", "brand:wikidata": "Q19284021", "brand:wikipedia": "de:Getränke Hoffmann", "name": "Getränke Hoffmann", "shop": "beverages"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/beverages/Getränkeland": {"name": "Getränkeland", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/Getraenkeland/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62594849", "shop": "beverages"}, "addTags": {"brand": "Getränkeland", "brand:wikidata": "Q62594849", "name": "Getränkeland", "shop": "beverages"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/beverages/Hol'ab": {"name": "Hol'ab", "icon": "maki-shop", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FLogo%20hol%20ab.svg&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q57557270", "shop": "beverages"}, "addTags": {"brand": "Hol'ab", "brand:wikidata": "Q57557270", "name": "Hol'ab", "shop": "beverages"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/beverages/Orterer Getränkemarkt": {"name": "Orterer Getränkemarkt", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q23787118", "shop": "beverages"}, "addTags": {"brand": "Orterer Getränkemarkt", "brand:wikidata": "Q23787118", "brand:wikipedia": "de:Orterer Gruppe", "name": "Orterer Getränkemarkt", "shop": "beverages"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/beverages/Rewe Getränkemarkt": {"name": "Rewe Getränkemarkt", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q57519344", "shop": "beverages"}, "addTags": {"brand": "Rewe Getränkemarkt", "brand:wikidata": "Q57519344", "name": "Rewe Getränkemarkt", "shop": "beverages"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/beverages/Trinkgut": {"name": "Trinkgut", "icon": "maki-shop", "imageURL": "https://pbs.twimg.com/profile_images/339373337/twitter_icon_trinkgut_bigger.png", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2453627", "shop": "beverages"}, "addTags": {"brand": "Trinkgut", "brand:wikidata": "Q2453627", "brand:wikipedia": "de:Trinkgut", "name": "Trinkgut", "shop": "beverages"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/beverages/清心福全": {"name": "清心福全", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/chingshin1987/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q10391229", "shop": "beverages"}, "addTags": {"brand": "清心福全", "brand:en": "Ching Shin", "brand:wikidata": "Q10391229", "brand:wikipedia": "zh:清心福全冷飲站", "brand:zh": "清心福全", "name": "清心福全", "name:en": "Ching Shin", "name:zh": "清心福全", "shop": "beverages"}, "countryCodes": ["tw"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/beverages/Dursty": {"name": "Dursty", "icon": "temaki-bottles", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FDursty%20Logo.svg&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1267518", "shop": "beverages"}, "addTags": {"brand": "Dursty", "brand:wikidata": "Q1267518", "brand:wikipedia": "de:Dursty Getränkemärkte", "name": "Dursty", "shop": "beverages"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/beverages/Edeka Getränkemarkt": {"name": "Edeka Getränkemarkt", "icon": "temaki-bottles", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q57450576", "shop": "beverages"}, "addTags": {"brand": "Edeka Getränkemarkt", "brand:wikidata": "Q57450576", "name": "Edeka Getränkemarkt", "shop": "beverages"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/beverages/Fristo": {"name": "Fristo", "icon": "temaki-bottles", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1465151", "shop": "beverages"}, "addTags": {"brand": "Fristo", "brand:wikidata": "Q1465151", "brand:wikipedia": "de:Fristo", "name": "Fristo", "shop": "beverages"}, "countryCodes": ["at", "de"], "terms": ["fristo getränkemarkt"], "matchScore": 2, "suggestion": true},
+    "shop/beverages/Getränke Hoffmann": {"name": "Getränke Hoffmann", "icon": "temaki-bottles", "imageURL": "https://graph.facebook.com/getraenkehoffmann/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q19284021", "shop": "beverages"}, "addTags": {"brand": "Getränke Hoffmann", "brand:wikidata": "Q19284021", "brand:wikipedia": "de:Getränke Hoffmann", "name": "Getränke Hoffmann", "shop": "beverages"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/beverages/Getränkeland": {"name": "Getränkeland", "icon": "temaki-bottles", "imageURL": "https://graph.facebook.com/Getraenkeland/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62594849", "shop": "beverages"}, "addTags": {"brand": "Getränkeland", "brand:wikidata": "Q62594849", "name": "Getränkeland", "shop": "beverages"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/beverages/Hol'ab": {"name": "Hol'ab", "icon": "temaki-bottles", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FLogo%20hol%20ab.svg&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q57557270", "shop": "beverages"}, "addTags": {"brand": "Hol'ab", "brand:wikidata": "Q57557270", "name": "Hol'ab", "shop": "beverages"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/beverages/Orterer Getränkemarkt": {"name": "Orterer Getränkemarkt", "icon": "temaki-bottles", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q23787118", "shop": "beverages"}, "addTags": {"brand": "Orterer Getränkemarkt", "brand:wikidata": "Q23787118", "brand:wikipedia": "de:Orterer Gruppe", "name": "Orterer Getränkemarkt", "shop": "beverages"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/beverages/Rewe Getränkemarkt": {"name": "Rewe Getränkemarkt", "icon": "temaki-bottles", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q57519344", "shop": "beverages"}, "addTags": {"brand": "Rewe Getränkemarkt", "brand:wikidata": "Q57519344", "name": "Rewe Getränkemarkt", "shop": "beverages"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/beverages/Trinkgut": {"name": "Trinkgut", "icon": "temaki-bottles", "imageURL": "https://pbs.twimg.com/profile_images/339373337/twitter_icon_trinkgut_bigger.png", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2453627", "shop": "beverages"}, "addTags": {"brand": "Trinkgut", "brand:wikidata": "Q2453627", "brand:wikipedia": "de:Trinkgut", "name": "Trinkgut", "shop": "beverages"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/beverages/清心福全": {"name": "清心福全", "icon": "temaki-bottles", "imageURL": "https://graph.facebook.com/chingshin1987/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q10391229", "shop": "beverages"}, "addTags": {"brand": "清心福全", "brand:en": "Ching Shin", "brand:wikidata": "Q10391229", "brand:wikipedia": "zh:清心福全冷飲站", "brand:zh": "清心福全", "name": "清心福全", "name:en": "Ching Shin", "name:zh": "清心福全", "shop": "beverages"}, "countryCodes": ["tw"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/bicycle/Evans Cycles": {"name": "Evans Cycles", "icon": "maki-bicycle", "imageURL": "https://graph.facebook.com/evanscycles/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5415901", "shop": "bicycle"}, "addTags": {"brand": "Evans Cycles", "brand:wikidata": "Q5415901", "brand:wikipedia": "en:Evans Cycles", "name": "Evans Cycles", "shop": "bicycle"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/bicycle/Fri BikeShop": {"name": "Fri BikeShop", "icon": "maki-bicycle", "imageURL": "https://graph.facebook.com/Cykelbutikken/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q26721030", "shop": "bicycle"}, "addTags": {"brand": "Fri BikeShop", "brand:wikidata": "Q26721030", "name": "Fri BikeShop", "shop": "bicycle"}, "countryCodes": ["dk"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/bicycle/Giant": {"name": "Giant", "icon": "maki-bicycle", "imageURL": "https://graph.facebook.com/giantbicycles/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q703557", "shop": "bicycle"}, "addTags": {"brand": "Giant", "brand:wikidata": "Q703557", "brand:wikipedia": "en:Giant Bicycles", "name": "Giant", "shop": "bicycle"}, "terms": [], "matchScore": 2, "suggestion": true},
     "shop/bicycle/Trek": {"name": "Trek", "icon": "maki-bicycle", "imageURL": "https://graph.facebook.com/TrekBicycle/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1067617", "shop": "bicycle"}, "addTags": {"alt_name": "Trek Bicycle Store", "brand": "Trek", "brand:wikidata": "Q1067617", "brand:wikipedia": "en:Trek Bicycle Corporation", "name": "Trek", "shop": "bicycle"}, "terms": ["treck", "trek bicycle"], "matchScore": 2, "suggestion": true},
     "shop/bicycle/サイクルベースあさひ": {"name": "サイクルベースあさひ", "icon": "maki-bicycle", "imageURL": "https://graph.facebook.com/cbasahi/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q11257202", "shop": "bicycle"}, "addTags": {"brand": "サイクルベースあさひ", "brand:en": "Cycle Base Asahi", "brand:ja": "サイクルベースあさひ", "brand:wikidata": "Q11257202", "brand:wikipedia": "ja:あさひ (企業)", "name": "サイクルベースあさひ", "name:en": "Cycle Base Asahi", "name:ja": "サイクルベースあさひ", "shop": "bicycle"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/bookmaker/Betfred": {"name": "Betfred", "icon": "maki-shop", "imageURL": "https://pbs.twimg.com/profile_images/1034363254758359041/dxetDfNN_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4897425", "shop": "bookmaker"}, "addTags": {"brand": "Betfred", "brand:wikidata": "Q4897425", "brand:wikipedia": "en:Betfred", "name": "Betfred", "shop": "bookmaker"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/bookmaker/Coral": {"name": "Coral", "icon": "maki-shop", "imageURL": "https://pbs.twimg.com/profile_images/1000461740772134913/T9-zMXmF_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q54621344", "shop": "bookmaker"}, "addTags": {"brand": "Coral", "brand:wikidata": "Q54621344", "brand:wikipedia": "en:Coral (bookmaker)", "name": "Coral", "shop": "bookmaker"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/bookmaker/Fortuna": {"name": "Fortuna", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/703606549739592/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q25857973", "shop": "bookmaker"}, "addTags": {"brand": "Fortuna", "brand:wikidata": "Q25857973", "brand:wikipedia": "en:Fortuna Entertainment Group", "name": "Fortuna", "shop": "bookmaker"}, "countryCodes": ["cz", "hr", "pl", "ro", "sk"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/bookmaker/Ladbrokes": {"name": "Ladbrokes", "icon": "maki-shop", "imageURL": "https://pbs.twimg.com/profile_images/1148531433947967488/3zGk1STM_bigger.png", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1799875", "shop": "bookmaker"}, "addTags": {"brand": "Ladbrokes", "brand:wikidata": "Q1799875", "brand:wikipedia": "en:Ladbrokes Coral", "name": "Ladbrokes", "shop": "bookmaker"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/bookmaker/Paddy Power": {"name": "Paddy Power", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/2039606582931195/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3888718", "shop": "bookmaker"}, "addTags": {"brand": "Paddy Power", "brand:wikidata": "Q3888718", "brand:wikipedia": "en:Paddy Power", "name": "Paddy Power", "shop": "bookmaker"}, "countryCodes": ["gb", "ie"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/bookmaker/Tipico": {"name": "Tipico", "icon": "maki-shop", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FTipico%20Unternehmenslogo.jpg&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q15851003", "shop": "bookmaker"}, "addTags": {"brand": "Tipico", "brand:wikidata": "Q15851003", "brand:wikipedia": "en:Tipico", "name": "Tipico", "shop": "bookmaker"}, "countryCodes": ["at", "co", "de", "gi", "hr", "mt"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/bookmaker/William Hill": {"name": "William Hill", "icon": "maki-shop", "imageURL": "https://pbs.twimg.com/profile_images/797028677733253120/bW9oFXT-_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4053147", "shop": "bookmaker"}, "addTags": {"brand": "William Hill", "brand:wikidata": "Q4053147", "brand:wikipedia": "en:William Hill (bookmaker)", "name": "William Hill", "shop": "bookmaker"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/bookmaker/ΟΠΑΠ": {"name": "ΟΠΑΠ", "icon": "maki-shop", "imageURL": "https://pbs.twimg.com/profile_images/1024247841135452160/UlceXxkv_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2007823", "shop": "bookmaker"}, "addTags": {"brand": "ΟΠΑΠ", "brand:el": "ΟΠΑΠ", "brand:en": "OPAP", "brand:wikidata": "Q2007823", "brand:wikipedia": "en:OPAP", "name": "ΟΠΑΠ", "name:el": "ΟΠΑΠ", "name:en": "OPAP", "shop": "bookmaker"}, "countryCodes": ["gr"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/bookmaker/Лига ставок": {"name": "Лига ставок", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/ligastavok05/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6545804", "shop": "bookmaker"}, "addTags": {"brand": "Лига ставок", "brand:en": "Liga Stavok", "brand:ru": "Лига ставок", "brand:wikidata": "Q6545804", "brand:wikipedia": "ru:Лига Ставок", "name": "Лига ставок", "name:en": "Liga Stavok", "name:ru": "Лига ставок", "shop": "bookmaker"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/bookmaker/Фонбет": {"name": "Фонбет", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/fonbetrussia/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q49137910", "shop": "bookmaker"}, "addTags": {"brand": "Фонбет", "brand:en": "Fonbet", "brand:ru": "Фонбет", "brand:wikidata": "Q49137910", "brand:wikipedia": "ru:Фонбет", "name": "Фонбет", "name:en": "Fonbet", "name:ru": "Фонбет", "shop": "bookmaker"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/bookmaker/Betfred": {"name": "Betfred", "icon": "temaki-money_hand", "imageURL": "https://pbs.twimg.com/profile_images/1034363254758359041/dxetDfNN_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4897425", "shop": "bookmaker"}, "addTags": {"brand": "Betfred", "brand:wikidata": "Q4897425", "brand:wikipedia": "en:Betfred", "name": "Betfred", "shop": "bookmaker"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/bookmaker/Coral": {"name": "Coral", "icon": "temaki-money_hand", "imageURL": "https://pbs.twimg.com/profile_images/1000461740772134913/T9-zMXmF_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q54621344", "shop": "bookmaker"}, "addTags": {"brand": "Coral", "brand:wikidata": "Q54621344", "brand:wikipedia": "en:Coral (bookmaker)", "name": "Coral", "shop": "bookmaker"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/bookmaker/Fortuna": {"name": "Fortuna", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/703606549739592/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q25857973", "shop": "bookmaker"}, "addTags": {"brand": "Fortuna", "brand:wikidata": "Q25857973", "brand:wikipedia": "en:Fortuna Entertainment Group", "name": "Fortuna", "shop": "bookmaker"}, "countryCodes": ["cz", "hr", "pl", "ro", "sk"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/bookmaker/Ladbrokes": {"name": "Ladbrokes", "icon": "temaki-money_hand", "imageURL": "https://pbs.twimg.com/profile_images/1148531433947967488/3zGk1STM_bigger.png", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1799875", "shop": "bookmaker"}, "addTags": {"brand": "Ladbrokes", "brand:wikidata": "Q1799875", "brand:wikipedia": "en:Ladbrokes Coral", "name": "Ladbrokes", "shop": "bookmaker"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/bookmaker/Paddy Power": {"name": "Paddy Power", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/2039606582931195/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3888718", "shop": "bookmaker"}, "addTags": {"brand": "Paddy Power", "brand:wikidata": "Q3888718", "brand:wikipedia": "en:Paddy Power", "name": "Paddy Power", "shop": "bookmaker"}, "countryCodes": ["gb", "ie"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/bookmaker/Tipico": {"name": "Tipico", "icon": "temaki-money_hand", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FTipico%20Unternehmenslogo.jpg&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q15851003", "shop": "bookmaker"}, "addTags": {"brand": "Tipico", "brand:wikidata": "Q15851003", "brand:wikipedia": "en:Tipico", "name": "Tipico", "shop": "bookmaker"}, "countryCodes": ["at", "co", "de", "gi", "hr", "mt"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/bookmaker/William Hill": {"name": "William Hill", "icon": "temaki-money_hand", "imageURL": "https://pbs.twimg.com/profile_images/797028677733253120/bW9oFXT-_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4053147", "shop": "bookmaker"}, "addTags": {"brand": "William Hill", "brand:wikidata": "Q4053147", "brand:wikipedia": "en:William Hill (bookmaker)", "name": "William Hill", "shop": "bookmaker"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/bookmaker/ΟΠΑΠ": {"name": "ΟΠΑΠ", "icon": "temaki-money_hand", "imageURL": "https://pbs.twimg.com/profile_images/1024247841135452160/UlceXxkv_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2007823", "shop": "bookmaker"}, "addTags": {"brand": "ΟΠΑΠ", "brand:el": "ΟΠΑΠ", "brand:en": "OPAP", "brand:wikidata": "Q2007823", "brand:wikipedia": "en:OPAP", "name": "ΟΠΑΠ", "name:el": "ΟΠΑΠ", "name:en": "OPAP", "shop": "bookmaker"}, "countryCodes": ["gr"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/bookmaker/Лига ставок": {"name": "Лига ставок", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/ligastavok05/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6545804", "shop": "bookmaker"}, "addTags": {"brand": "Лига ставок", "brand:en": "Liga Stavok", "brand:ru": "Лига ставок", "brand:wikidata": "Q6545804", "brand:wikipedia": "ru:Лига Ставок", "name": "Лига ставок", "name:en": "Liga Stavok", "name:ru": "Лига ставок", "shop": "bookmaker"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/bookmaker/Фонбет": {"name": "Фонбет", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/fonbetrussia/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q49137910", "shop": "bookmaker"}, "addTags": {"brand": "Фонбет", "brand:en": "Fonbet", "brand:ru": "Фонбет", "brand:wikidata": "Q49137910", "brand:wikipedia": "ru:Фонбет", "name": "Фонбет", "name:en": "Fonbet", "name:ru": "Фонбет", "shop": "bookmaker"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/books/Akademibokhandeln": {"name": "Akademibokhandeln", "icon": "fas-book", "imageURL": "https://graph.facebook.com/Akademibokhandeln/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q10403918", "shop": "books"}, "addTags": {"brand": "Akademibokhandeln", "brand:wikidata": "Q10403918", "brand:wikipedia": "sv:Akademibokhandeln", "name": "Akademibokhandeln", "shop": "books"}, "countryCodes": ["se"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/books/Akateeminen Kirjakauppa": {"name": "Akateeminen Kirjakauppa", "icon": "fas-book", "imageURL": "https://graph.facebook.com/AkateeminenCOM/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q10403942", "shop": "books"}, "addTags": {"brand": "Akateeminen Kirjakauppa", "brand:wikidata": "Q10403942", "brand:wikipedia": "fi:Akateeminen Kirjakauppa", "name": "Akateeminen Kirjakauppa", "shop": "books"}, "countryCodes": ["fi"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/books/Barnes & Noble": {"name": "Barnes & Noble", "icon": "fas-book", "imageURL": "https://graph.facebook.com/barnesandnoble/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q795454", "shop": "books"}, "addTags": {"brand": "Barnes & Noble", "brand:wikidata": "Q795454", "brand:wikipedia": "en:Barnes & Noble", "name": "Barnes & Noble", "shop": "books"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -3461,7 +3475,7 @@
     "shop/car/ガリバー": {"name": "ガリバー", "icon": "maki-car", "imageURL": "https://graph.facebook.com/gulliver.nz/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q11296264", "shop": "car"}, "addTags": {"brand": "ガリバー", "brand:en": "Gulliver", "brand:ja": "ガリバー", "brand:wikidata": "Q11296264", "brand:wikipedia": "ja:IDOM", "name": "ガリバー", "name:en": "Gulliver", "name:ja": "ガリバー", "shop": "car"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/car/ダイハツ": {"name": "ダイハツ", "icon": "maki-car", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FDaihatsu%20Logo.svg&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q27511", "shop": "car"}, "addTags": {"brand": "ダイハツ", "brand:en": "Daihatsu", "brand:ja": "ダイハツ", "brand:wikidata": "Q27511", "brand:wikipedia": "ja:ダイハツ工業", "name": "ダイハツ", "name:en": "Daihatsu", "name:ja": "ダイハツ", "shop": "car"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/car/ホンダ": {"name": "ホンダ", "icon": "maki-car", "imageURL": "https://graph.facebook.com/HondaJP/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q9584", "shop": "car"}, "addTags": {"brand": "ホンダ", "brand:en": "Honda", "brand:ja": "ホンダ", "brand:wikidata": "Q9584", "brand:wikipedia": "ja:本田技研工業", "name": "ホンダ", "name:en": "Honda", "name:ja": "ホンダ", "shop": "car"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/carpet/Carpetright": {"name": "Carpetright", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/carpetright/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5045782", "shop": "carpet"}, "addTags": {"brand": "Carpetright", "brand:wikidata": "Q5045782", "brand:wikipedia": "en:Carpetright", "name": "Carpetright", "shop": "carpet"}, "countryCodes": ["be", "gb", "ie", "nl"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/carpet/Carpetright": {"name": "Carpetright", "icon": "fas-tape", "imageURL": "https://graph.facebook.com/carpetright/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5045782", "shop": "carpet"}, "addTags": {"brand": "Carpetright", "brand:wikidata": "Q5045782", "brand:wikipedia": "en:Carpetright", "name": "Carpetright", "shop": "carpet"}, "countryCodes": ["be", "gb", "ie", "nl"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/catalogue/Argos": {"name": "Argos", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/argos/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4789707", "shop": "catalogue"}, "addTags": {"brand": "Argos", "brand:wikidata": "Q4789707", "brand:wikipedia": "en:Argos (retailer)", "name": "Argos", "shop": "catalogue"}, "countryCodes": ["gb", "ie"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/charity/Age UK": {"name": "Age UK", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/ageuk/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4691850", "shop": "charity"}, "addTags": {"brand": "Age UK", "brand:wikidata": "Q4691850", "brand:wikipedia": "en:Age UK", "name": "Age UK", "shop": "charity"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/charity/Barnardo's": {"name": "Barnardo's", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/barnardos/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2884670", "shop": "charity"}, "addTags": {"brand": "Barnardo's", "brand:wikidata": "Q2884670", "brand:wikipedia": "en:Barnardo's", "name": "Barnardo's", "shop": "charity"}, "countryCodes": ["gb", "ie"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -3499,14 +3513,14 @@
     "shop/chemist/dm": {"name": "dm", "icon": "fas-shopping-basket", "imageURL": "https://graph.facebook.com/dm.Deutschland/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q266572", "shop": "chemist"}, "addTags": {"brand": "dm", "brand:wikidata": "Q266572", "brand:wikipedia": "en:Dm-drogerie markt", "name": "dm", "shop": "chemist"}, "countryCodes": ["at", "ba", "bg", "cz", "de", "hr", "hu", "it", "mk", "ro", "rs", "si", "sk"], "terms": ["dm drogerie markt"], "matchScore": 2, "suggestion": true},
     "shop/chemist/屈臣氏": {"name": "屈臣氏", "icon": "fas-shopping-basket", "imageURL": "https://graph.facebook.com/WatsonsPH/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7974785", "shop": "chemist"}, "addTags": {"brand": "屈臣氏", "brand:wikidata": "Q7974785", "brand:wikipedia": "zh:屈臣氏", "name": "屈臣氏", "shop": "chemist"}, "countryCodes": ["cn", "hk", "tw"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/chemist/康是美": {"name": "康是美", "icon": "fas-shopping-basket", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q11063876", "shop": "chemist"}, "addTags": {"brand": "康是美", "brand:wikidata": "Q11063876", "brand:wikipedia": "zh:康是美藥妝店", "name": "康是美", "shop": "chemist"}, "countryCodes": ["tw"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/chocolate/Cacau Show": {"name": "Cacau Show", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/CacauShow/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q9671713", "shop": "chocolate"}, "addTags": {"brand": "Cacau Show", "brand:wikidata": "Q9671713", "brand:wikipedia": "en:Cacau Show", "name": "Cacau Show", "shop": "chocolate"}, "countryCodes": ["br"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/chocolate/Gertrude Hawk Chocolates": {"name": "Gertrude Hawk Chocolates", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/gertrudehawkchocolates/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5553326", "shop": "chocolate"}, "addTags": {"brand": "Gertrude Hawk Chocolates", "brand:wikidata": "Q5553326", "brand:wikipedia": "en:Gertrude Hawk Chocolates", "name": "Gertrude Hawk Chocolates", "shop": "chocolate", "short_name": "Gertrude Hawk"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/chocolate/Godiva Chocolatier": {"name": "Godiva Chocolatier", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/Godiva/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q931084", "shop": "chocolate"}, "addTags": {"brand": "Godiva Chocolatier", "brand:wikidata": "Q931084", "brand:wikipedia": "en:Godiva Chocolatier", "name": "Godiva Chocolatier", "shop": "chocolate", "short_name": "Godiva"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/chocolate/Jeff de Bruges": {"name": "Jeff de Bruges", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/JeffdeBrugesofficiel/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3176626", "shop": "chocolate"}, "addTags": {"brand": "Jeff de Bruges", "brand:wikidata": "Q3176626", "brand:wikipedia": "fr:Jeff de Bruges", "name": "Jeff de Bruges", "shop": "chocolate"}, "countryCodes": ["ca", "cz", "fr", "gb"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/chocolate/Laura Secord": {"name": "Laura Secord", "icon": "maki-shop", "imageURL": "https://pbs.twimg.com/profile_images/771761705336639488/0S9UP_QL_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6499418", "shop": "chocolate"}, "addTags": {"brand": "Laura Secord", "brand:wikidata": "Q6499418", "brand:wikipedia": "en:Laura Secord Chocolates", "name": "Laura Secord", "shop": "chocolate"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/chocolate/Leonidas": {"name": "Leonidas", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/Leonidas.Official/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q80335", "shop": "chocolate"}, "addTags": {"brand": "Leonidas", "brand:wikidata": "Q80335", "brand:wikipedia": "en:Leonidas (chocolate maker)", "name": "Leonidas", "shop": "chocolate"}, "countryCodes": ["be", "cz", "fr", "gb", "gr", "nl"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/chocolate/Lindt": {"name": "Lindt", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/lindtchocolateusa/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q152822", "shop": "chocolate"}, "addTags": {"brand": "Lindt", "brand:wikidata": "Q152822", "brand:wikipedia": "en:Lindt & Sprüngli", "name": "Lindt", "shop": "chocolate"}, "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/chocolate/Purdys Chocolatier": {"name": "Purdys Chocolatier", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/PurdysChocolatier/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7261007", "shop": "chocolate"}, "addTags": {"brand": "Purdys Chocolatier", "brand:wikidata": "Q7261007", "brand:wikipedia": "en:Purdy's Chocolates", "name": "Purdys Chocolatier", "shop": "chocolate"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/chocolate/Cacau Show": {"name": "Cacau Show", "icon": "temaki-chocolate", "imageURL": "https://graph.facebook.com/CacauShow/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q9671713", "shop": "chocolate"}, "addTags": {"brand": "Cacau Show", "brand:wikidata": "Q9671713", "brand:wikipedia": "en:Cacau Show", "name": "Cacau Show", "shop": "chocolate"}, "countryCodes": ["br"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/chocolate/Gertrude Hawk Chocolates": {"name": "Gertrude Hawk Chocolates", "icon": "temaki-chocolate", "imageURL": "https://graph.facebook.com/gertrudehawkchocolates/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5553326", "shop": "chocolate"}, "addTags": {"brand": "Gertrude Hawk Chocolates", "brand:wikidata": "Q5553326", "brand:wikipedia": "en:Gertrude Hawk Chocolates", "name": "Gertrude Hawk Chocolates", "shop": "chocolate", "short_name": "Gertrude Hawk"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/chocolate/Godiva Chocolatier": {"name": "Godiva Chocolatier", "icon": "temaki-chocolate", "imageURL": "https://graph.facebook.com/Godiva/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q931084", "shop": "chocolate"}, "addTags": {"brand": "Godiva Chocolatier", "brand:wikidata": "Q931084", "brand:wikipedia": "en:Godiva Chocolatier", "name": "Godiva Chocolatier", "shop": "chocolate", "short_name": "Godiva"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/chocolate/Jeff de Bruges": {"name": "Jeff de Bruges", "icon": "temaki-chocolate", "imageURL": "https://graph.facebook.com/JeffdeBrugesofficiel/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3176626", "shop": "chocolate"}, "addTags": {"brand": "Jeff de Bruges", "brand:wikidata": "Q3176626", "brand:wikipedia": "fr:Jeff de Bruges", "name": "Jeff de Bruges", "shop": "chocolate"}, "countryCodes": ["ca", "cz", "fr", "gb"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/chocolate/Laura Secord": {"name": "Laura Secord", "icon": "temaki-chocolate", "imageURL": "https://pbs.twimg.com/profile_images/771761705336639488/0S9UP_QL_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6499418", "shop": "chocolate"}, "addTags": {"brand": "Laura Secord", "brand:wikidata": "Q6499418", "brand:wikipedia": "en:Laura Secord Chocolates", "name": "Laura Secord", "shop": "chocolate"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/chocolate/Leonidas": {"name": "Leonidas", "icon": "temaki-chocolate", "imageURL": "https://graph.facebook.com/Leonidas.Official/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q80335", "shop": "chocolate"}, "addTags": {"brand": "Leonidas", "brand:wikidata": "Q80335", "brand:wikipedia": "en:Leonidas (chocolate maker)", "name": "Leonidas", "shop": "chocolate"}, "countryCodes": ["be", "cz", "fr", "gb", "gr", "nl"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/chocolate/Lindt": {"name": "Lindt", "icon": "temaki-chocolate", "imageURL": "https://graph.facebook.com/lindtchocolateusa/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q152822", "shop": "chocolate"}, "addTags": {"brand": "Lindt", "brand:wikidata": "Q152822", "brand:wikipedia": "en:Lindt & Sprüngli", "name": "Lindt", "shop": "chocolate"}, "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/chocolate/Purdys Chocolatier": {"name": "Purdys Chocolatier", "icon": "temaki-chocolate", "imageURL": "https://graph.facebook.com/PurdysChocolatier/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7261007", "shop": "chocolate"}, "addTags": {"brand": "Purdys Chocolatier", "brand:wikidata": "Q7261007", "brand:wikipedia": "en:Purdy's Chocolates", "name": "Purdys Chocolatier", "shop": "chocolate"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/clothes/AOKI": {"name": "AOKI", "icon": "maki-clothing-store", "imageURL": "https://graph.facebook.com/aokistyle/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q11189480", "shop": "clothes"}, "addTags": {"brand": "AOKI", "brand:wikidata": "Q11189480", "brand:wikipedia": "ja:AOKIホールディングス", "clothes": "men", "name": "AOKI", "name:ja": "アオキ", "shop": "clothes"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/clothes/Abercrombie & Fitch": {"name": "Abercrombie & Fitch", "icon": "maki-clothing-store", "imageURL": "https://graph.facebook.com/abercrombieofficial/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q319344", "shop": "clothes"}, "addTags": {"brand": "Abercrombie & Fitch", "brand:wikidata": "Q319344", "brand:wikipedia": "en:Abercrombie & Fitch", "clothes": "men;women", "name": "Abercrombie & Fitch", "shop": "clothes"}, "countryCodes": ["de", "us"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/clothes/Accessorize": {"name": "Accessorize", "icon": "maki-clothing-store", "imageURL": "https://graph.facebook.com/AccessorizeUK/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q65007482", "shop": "clothes"}, "addTags": {"brand": "Accessorize", "brand:wikidata": "Q65007482", "name": "Accessorize", "shop": "clothes"}, "countryCodes": ["gb", "it", "ru"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -3963,38 +3977,38 @@
     "shop/copyshop/FedEx Office": {"name": "FedEx Office", "icon": "fas-print", "imageURL": "https://graph.facebook.com/FedExOffice/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q474379", "shop": "copyshop"}, "addTags": {"brand": "FedEx Office", "brand:wikidata": "Q474379", "brand:wikipedia": "en:FedEx Office", "name": "FedEx Office", "shop": "copyshop"}, "countryCodes": ["us"], "terms": ["fedex office print and ship center"], "matchScore": 2, "suggestion": true},
     "shop/copyshop/Minuteman Press": {"name": "Minuteman Press", "icon": "fas-print", "imageURL": "https://graph.facebook.com/MinutemanPressFranchise/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64866081", "shop": "copyshop"}, "addTags": {"brand": "Minuteman Press", "brand:wikidata": "Q64866081", "name": "Minuteman Press", "shop": "copyshop"}, "terms": [], "matchScore": 2, "suggestion": true},
     "shop/copyshop/Sir Speedy": {"name": "Sir Speedy", "icon": "fas-print", "imageURL": "https://graph.facebook.com/SirSpeedyCorporate/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q17088225", "shop": "copyshop"}, "addTags": {"brand": "Sir Speedy", "brand:wikidata": "Q17088225", "brand:wikipedia": "en:Sir Speedy", "name": "Sir Speedy", "shop": "copyshop"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/cosmetics/Aveda": {"name": "Aveda", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/Aveda/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4827965", "shop": "cosmetics"}, "addTags": {"brand": "Aveda", "brand:wikidata": "Q4827965", "brand:wikipedia": "en:Aveda", "name": "Aveda", "shop": "cosmetics"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/cosmetics/Bath & Body Works": {"name": "Bath & Body Works", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/bathandbodyworks/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q810773", "shop": "cosmetics"}, "addTags": {"brand": "Bath & Body Works", "brand:wikidata": "Q810773", "brand:wikipedia": "en:Bath & Body Works", "name": "Bath & Body Works", "shop": "cosmetics"}, "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/cosmetics/KIKO Milano": {"name": "KIKO Milano", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/KikoMilanoGlobal/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3812045", "shop": "cosmetics"}, "addTags": {"brand": "KIKO Milano", "brand:wikidata": "Q3812045", "brand:wikipedia": "it:KIKO", "name": "KIKO Milano", "shop": "cosmetics"}, "countryCodes": ["be", "fr", "gb", "nl"], "terms": ["kiko"], "matchScore": 2, "suggestion": true},
-    "shop/cosmetics/Kiehl's": {"name": "Kiehl's", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/KiehlsUS/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3196447", "shop": "cosmetics"}, "addTags": {"brand": "Kiehl's", "brand:wikidata": "Q3196447", "brand:wikipedia": "en:Kiehl's", "name": "Kiehl's", "shop": "cosmetics"}, "countryCodes": ["ca", "us"], "terms": ["kiehl's since 1851"], "matchScore": 2, "suggestion": true},
-    "shop/cosmetics/L'Occitane": {"name": "L'Occitane", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/loccitaneusa/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1880676", "shop": "cosmetics"}, "addTags": {"brand": "L'Occitane", "brand:wikidata": "Q1880676", "brand:wikipedia": "en:L'Occitane en Provence", "name": "L'Occitane", "shop": "cosmetics"}, "terms": ["l'occitane en provence"], "matchScore": 2, "suggestion": true},
-    "shop/cosmetics/Lush": {"name": "Lush", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/LUSHJAPAN/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1585448", "shop": "cosmetics"}, "addTags": {"brand": "Lush", "brand:wikidata": "Q1585448", "brand:wikipedia": "en:Lush (company)", "name": "Lush", "shop": "cosmetics"}, "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/cosmetics/MAC Cosmetics": {"name": "MAC Cosmetics", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/MACcosmetics/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2624442", "shop": "cosmetics"}, "addTags": {"brand": "MAC Cosmetics", "brand:wikidata": "Q2624442", "brand:wikipedia": "en:MAC Cosmetics", "name": "MAC Cosmetics", "shop": "cosmetics", "short_name": "M·A·C"}, "countryCodes": ["ca", "de", "us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/cosmetics/Nature Republic": {"name": "Nature Republic", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/naturerepublic.kr/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16935507", "shop": "cosmetics"}, "addTags": {"brand": "Nature Republic", "brand:wikidata": "Q16935507", "brand:wikipedia": "en:Nature Republic", "name": "Nature Republic", "shop": "cosmetics"}, "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/cosmetics/Nocibé": {"name": "Nocibé", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/nocibe/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3342592", "shop": "cosmetics"}, "addTags": {"brand": "Nocibé", "brand:wikidata": "Q3342592", "brand:wikipedia": "fr:Nocibé", "name": "Nocibé", "shop": "cosmetics"}, "countryCodes": ["fr"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/cosmetics/Origins": {"name": "Origins", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/Origins/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6643229", "shop": "cosmetics"}, "addTags": {"brand": "Origins", "brand:wikidata": "Q6643229", "brand:wikipedia": "en:Origins (cosmetics)", "name": "Origins", "shop": "cosmetics"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/cosmetics/Rituals": {"name": "Rituals", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/RitualsCosmetics/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62874140", "shop": "cosmetics"}, "addTags": {"brand": "Rituals", "brand:wikidata": "Q62874140", "name": "Rituals", "shop": "cosmetics"}, "countryCodes": ["be", "ch", "de", "es", "gb", "nl", "se", "us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/cosmetics/Saje": {"name": "Saje", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/SajeWellness/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q44631749", "shop": "cosmetics"}, "addTags": {"brand": "Saje", "brand:wikidata": "Q44631749", "brand:wikipedia": "en:Saje Natural Wellness", "name": "Saje", "shop": "cosmetics"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/cosmetics/Sephora": {"name": "Sephora", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/sephora/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2408041", "shop": "cosmetics"}, "addTags": {"brand": "Sephora", "brand:wikidata": "Q2408041", "brand:wikipedia": "en:Sephora", "name": "Sephora", "shop": "cosmetics"}, "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/cosmetics/The Body Shop": {"name": "The Body Shop", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/TheBodyShopUSA/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q837851", "shop": "cosmetics"}, "addTags": {"brand": "The Body Shop", "brand:wikidata": "Q837851", "brand:wikipedia": "en:The Body Shop", "name": "The Body Shop", "shop": "cosmetics"}, "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/cosmetics/Ulta Beauty": {"name": "Ulta Beauty", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/UltaBeauty/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7880076", "shop": "cosmetics"}, "addTags": {"brand": "Ulta Beauty", "brand:wikidata": "Q7880076", "brand:wikipedia": "en:Ulta Beauty", "name": "Ulta Beauty", "shop": "cosmetics"}, "countryCodes": ["us"], "terms": ["ulta"], "matchScore": 2, "suggestion": true},
-    "shop/cosmetics/bareMinerals": {"name": "bareMinerals", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/bareminerals/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q66740659", "shop": "cosmetics"}, "addTags": {"brand": "bareMinerals", "brand:wikidata": "Q66740659", "name": "bareMinerals", "shop": "cosmetics"}, "countryCodes": ["au", "ca", "dk", "gb", "ie", "us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/cosmetics/Л'Этуаль": {"name": "Л'Этуаль", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/letoile.ru/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q18400706", "shop": "cosmetics"}, "addTags": {"brand": "Л'Этуаль", "brand:wikidata": "Q18400706", "brand:wikipedia": "ru:Л’Этуаль", "name": "Л'Этуаль", "shop": "cosmetics"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/cosmetics/Магнит Косметик": {"name": "Магнит Косметик", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/magnitretail/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q940518", "shop": "cosmetics"}, "addTags": {"brand": "Магнит Косметик", "brand:en": "Magnit Cosmetics", "brand:wikidata": "Q940518", "brand:wikipedia": "ru:Магнит (сеть магазинов)", "name": "Магнит Косметик", "name:en": "Magnit Cosmetics", "shop": "cosmetics"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/country_store/Atwoods": {"name": "Atwoods", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/Atwoods.Ranch.and.Home.Stores/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4818874", "shop": "country_store"}, "addTags": {"brand": "Atwoods", "brand:wikidata": "Q4818874", "brand:wikipedia": "en:Atwoods", "name": "Atwoods", "shop": "country_store"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/country_store/Blain's Farm & Fleet": {"name": "Blain's Farm & Fleet", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/BlainsFarmandFleet/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4923906", "shop": "country_store"}, "addTags": {"brand": "Blain's Farm & Fleet", "brand:wikidata": "Q4923906", "brand:wikipedia": "en:Blain's Farm & Fleet", "name": "Blain's Farm & Fleet", "shop": "country_store"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/country_store/Bomgaars": {"name": "Bomgaars", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/BomgaarsSupply.Corporate/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q22059070", "shop": "country_store"}, "addTags": {"brand": "Bomgaars", "brand:wikidata": "Q22059070", "brand:wikipedia": "en:Bomgaars", "name": "Bomgaars", "shop": "country_store"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/country_store/Fleet Farm": {"name": "Fleet Farm", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/fleetfarm/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6859973", "shop": "country_store"}, "addTags": {"brand": "Fleet Farm", "brand:wikidata": "Q6859973", "brand:wikipedia": "en:Fleet Farm", "name": "Fleet Farm", "shop": "country_store"}, "countryCodes": ["us"], "terms": ["mills fleet farm"], "matchScore": 2, "suggestion": true},
-    "shop/country_store/Grange Co-op": {"name": "Grange Co-op", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/grangecoop/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5595639", "shop": "country_store"}, "addTags": {"brand": "Grange Co-op", "brand:wikidata": "Q5595639", "brand:wikipedia": "en:Grange Cooperative", "name": "Grange Co-op", "shop": "country_store"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/country_store/Home of Economy": {"name": "Home of Economy", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/Homeofeconomy/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5889100", "shop": "country_store"}, "addTags": {"brand": "Home of Economy", "brand:wikidata": "Q5889100", "brand:wikipedia": "en:Home of Economy", "name": "Home of Economy", "shop": "country_store"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/country_store/Norbys Farm Fleet": {"name": "Norbys Farm Fleet", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/norbysfarmfleet/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7050461", "shop": "country_store"}, "addTags": {"brand": "Norbys Farm Fleet", "brand:wikidata": "Q7050461", "brand:wikipedia": "en:Norby's Farm Fleet", "name": "Norbys Farm Fleet", "shop": "country_store"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/country_store/Orscheln Farm & Home": {"name": "Orscheln Farm & Home", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/orschelnfarmandhome/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q22060331", "shop": "country_store"}, "addTags": {"brand": "Orscheln Farm & Home", "brand:wikidata": "Q22060331", "brand:wikipedia": "en:Orscheln Farm & Home", "name": "Orscheln Farm & Home", "shop": "country_store"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/country_store/Peavey Mart": {"name": "Peavey Mart", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/PeaveyMart/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7158483", "shop": "country_store"}, "addTags": {"brand": "Peavey Mart", "brand:wikidata": "Q7158483", "brand:wikipedia": "en:Peavey Mart", "name": "Peavey Mart", "shop": "country_store"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/country_store/Rural King": {"name": "Rural King", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/RuralKing/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7380525", "shop": "country_store"}, "addTags": {"brand": "Rural King", "brand:wikidata": "Q7380525", "brand:wikipedia": "en:Rural King", "name": "Rural King", "shop": "country_store"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/country_store/TSC Stores": {"name": "TSC Stores", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/TSCStoresCanada/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62720230", "shop": "country_store"}, "addTags": {"brand": "TSC Stores", "brand:wikidata": "Q62720230", "name": "TSC Stores", "shop": "country_store"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/country_store/Theisen's": {"name": "Theisen's", "icon": "maki-shop", "imageURL": "https://pbs.twimg.com/profile_images/743446346414227456/6V3KBxMe_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7777850", "shop": "country_store"}, "addTags": {"brand": "Theisen's", "brand:wikidata": "Q7777850", "brand:wikipedia": "en:Theisen's", "name": "Theisen's", "shop": "country_store"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/country_store/Tractor Supply Company": {"name": "Tractor Supply Company", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/TractorSupplyCo/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q15109925", "shop": "country_store"}, "addTags": {"brand": "Tractor Supply Company", "brand:wikidata": "Q15109925", "brand:wikipedia": "en:Tractor Supply Company", "name": "Tractor Supply Company", "shop": "country_store"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/country_store/Wynnstay": {"name": "Wynnstay", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/WynnstayCountryStores/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q63016351", "shop": "country_store"}, "addTags": {"brand": "Wynnstay", "brand:wikidata": "Q63016351", "name": "Wynnstay", "shop": "country_store"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/cosmetics/Aveda": {"name": "Aveda", "icon": "temaki-lipstick", "imageURL": "https://graph.facebook.com/Aveda/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4827965", "shop": "cosmetics"}, "addTags": {"brand": "Aveda", "brand:wikidata": "Q4827965", "brand:wikipedia": "en:Aveda", "name": "Aveda", "shop": "cosmetics"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/cosmetics/Bath & Body Works": {"name": "Bath & Body Works", "icon": "temaki-lipstick", "imageURL": "https://graph.facebook.com/bathandbodyworks/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q810773", "shop": "cosmetics"}, "addTags": {"brand": "Bath & Body Works", "brand:wikidata": "Q810773", "brand:wikipedia": "en:Bath & Body Works", "name": "Bath & Body Works", "shop": "cosmetics"}, "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/cosmetics/KIKO Milano": {"name": "KIKO Milano", "icon": "temaki-lipstick", "imageURL": "https://graph.facebook.com/KikoMilanoGlobal/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3812045", "shop": "cosmetics"}, "addTags": {"brand": "KIKO Milano", "brand:wikidata": "Q3812045", "brand:wikipedia": "it:KIKO", "name": "KIKO Milano", "shop": "cosmetics"}, "countryCodes": ["be", "fr", "gb", "nl"], "terms": ["kiko"], "matchScore": 2, "suggestion": true},
+    "shop/cosmetics/Kiehl's": {"name": "Kiehl's", "icon": "temaki-lipstick", "imageURL": "https://graph.facebook.com/KiehlsUS/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3196447", "shop": "cosmetics"}, "addTags": {"brand": "Kiehl's", "brand:wikidata": "Q3196447", "brand:wikipedia": "en:Kiehl's", "name": "Kiehl's", "shop": "cosmetics"}, "countryCodes": ["ca", "us"], "terms": ["kiehl's since 1851"], "matchScore": 2, "suggestion": true},
+    "shop/cosmetics/L'Occitane": {"name": "L'Occitane", "icon": "temaki-lipstick", "imageURL": "https://graph.facebook.com/loccitaneusa/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1880676", "shop": "cosmetics"}, "addTags": {"brand": "L'Occitane", "brand:wikidata": "Q1880676", "brand:wikipedia": "en:L'Occitane en Provence", "name": "L'Occitane", "shop": "cosmetics"}, "terms": ["l'occitane en provence"], "matchScore": 2, "suggestion": true},
+    "shop/cosmetics/Lush": {"name": "Lush", "icon": "temaki-lipstick", "imageURL": "https://graph.facebook.com/LUSHJAPAN/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1585448", "shop": "cosmetics"}, "addTags": {"brand": "Lush", "brand:wikidata": "Q1585448", "brand:wikipedia": "en:Lush (company)", "name": "Lush", "shop": "cosmetics"}, "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/cosmetics/MAC Cosmetics": {"name": "MAC Cosmetics", "icon": "temaki-lipstick", "imageURL": "https://graph.facebook.com/MACcosmetics/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2624442", "shop": "cosmetics"}, "addTags": {"brand": "MAC Cosmetics", "brand:wikidata": "Q2624442", "brand:wikipedia": "en:MAC Cosmetics", "name": "MAC Cosmetics", "shop": "cosmetics", "short_name": "M·A·C"}, "countryCodes": ["ca", "de", "us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/cosmetics/Nature Republic": {"name": "Nature Republic", "icon": "temaki-lipstick", "imageURL": "https://graph.facebook.com/naturerepublic.kr/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16935507", "shop": "cosmetics"}, "addTags": {"brand": "Nature Republic", "brand:wikidata": "Q16935507", "brand:wikipedia": "en:Nature Republic", "name": "Nature Republic", "shop": "cosmetics"}, "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/cosmetics/Nocibé": {"name": "Nocibé", "icon": "temaki-lipstick", "imageURL": "https://graph.facebook.com/nocibe/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3342592", "shop": "cosmetics"}, "addTags": {"brand": "Nocibé", "brand:wikidata": "Q3342592", "brand:wikipedia": "fr:Nocibé", "name": "Nocibé", "shop": "cosmetics"}, "countryCodes": ["fr"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/cosmetics/Origins": {"name": "Origins", "icon": "temaki-lipstick", "imageURL": "https://graph.facebook.com/Origins/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6643229", "shop": "cosmetics"}, "addTags": {"brand": "Origins", "brand:wikidata": "Q6643229", "brand:wikipedia": "en:Origins (cosmetics)", "name": "Origins", "shop": "cosmetics"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/cosmetics/Rituals": {"name": "Rituals", "icon": "temaki-lipstick", "imageURL": "https://graph.facebook.com/RitualsCosmetics/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62874140", "shop": "cosmetics"}, "addTags": {"brand": "Rituals", "brand:wikidata": "Q62874140", "name": "Rituals", "shop": "cosmetics"}, "countryCodes": ["be", "ch", "de", "es", "gb", "nl", "se", "us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/cosmetics/Saje": {"name": "Saje", "icon": "temaki-lipstick", "imageURL": "https://graph.facebook.com/SajeWellness/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q44631749", "shop": "cosmetics"}, "addTags": {"brand": "Saje", "brand:wikidata": "Q44631749", "brand:wikipedia": "en:Saje Natural Wellness", "name": "Saje", "shop": "cosmetics"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/cosmetics/Sephora": {"name": "Sephora", "icon": "temaki-lipstick", "imageURL": "https://graph.facebook.com/sephora/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2408041", "shop": "cosmetics"}, "addTags": {"brand": "Sephora", "brand:wikidata": "Q2408041", "brand:wikipedia": "en:Sephora", "name": "Sephora", "shop": "cosmetics"}, "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/cosmetics/The Body Shop": {"name": "The Body Shop", "icon": "temaki-lipstick", "imageURL": "https://graph.facebook.com/TheBodyShopUSA/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q837851", "shop": "cosmetics"}, "addTags": {"brand": "The Body Shop", "brand:wikidata": "Q837851", "brand:wikipedia": "en:The Body Shop", "name": "The Body Shop", "shop": "cosmetics"}, "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/cosmetics/Ulta Beauty": {"name": "Ulta Beauty", "icon": "temaki-lipstick", "imageURL": "https://graph.facebook.com/UltaBeauty/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7880076", "shop": "cosmetics"}, "addTags": {"brand": "Ulta Beauty", "brand:wikidata": "Q7880076", "brand:wikipedia": "en:Ulta Beauty", "name": "Ulta Beauty", "shop": "cosmetics"}, "countryCodes": ["us"], "terms": ["ulta"], "matchScore": 2, "suggestion": true},
+    "shop/cosmetics/bareMinerals": {"name": "bareMinerals", "icon": "temaki-lipstick", "imageURL": "https://graph.facebook.com/bareminerals/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q66740659", "shop": "cosmetics"}, "addTags": {"brand": "bareMinerals", "brand:wikidata": "Q66740659", "name": "bareMinerals", "shop": "cosmetics"}, "countryCodes": ["au", "ca", "dk", "gb", "ie", "us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/cosmetics/Л'Этуаль": {"name": "Л'Этуаль", "icon": "temaki-lipstick", "imageURL": "https://graph.facebook.com/letoile.ru/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q18400706", "shop": "cosmetics"}, "addTags": {"brand": "Л'Этуаль", "brand:wikidata": "Q18400706", "brand:wikipedia": "ru:Л’Этуаль", "name": "Л'Этуаль", "shop": "cosmetics"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/cosmetics/Магнит Косметик": {"name": "Магнит Косметик", "icon": "temaki-lipstick", "imageURL": "https://graph.facebook.com/magnitretail/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q940518", "shop": "cosmetics"}, "addTags": {"brand": "Магнит Косметик", "brand:en": "Magnit Cosmetics", "brand:wikidata": "Q940518", "brand:wikipedia": "ru:Магнит (сеть магазинов)", "name": "Магнит Косметик", "name:en": "Magnit Cosmetics", "shop": "cosmetics"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/country_store/Atwoods": {"name": "Atwoods", "icon": "fas-hat-cowboy-side", "imageURL": "https://graph.facebook.com/Atwoods.Ranch.and.Home.Stores/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4818874", "shop": "country_store"}, "addTags": {"brand": "Atwoods", "brand:wikidata": "Q4818874", "brand:wikipedia": "en:Atwoods", "name": "Atwoods", "shop": "country_store"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/country_store/Blain's Farm & Fleet": {"name": "Blain's Farm & Fleet", "icon": "fas-hat-cowboy-side", "imageURL": "https://graph.facebook.com/BlainsFarmandFleet/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4923906", "shop": "country_store"}, "addTags": {"brand": "Blain's Farm & Fleet", "brand:wikidata": "Q4923906", "brand:wikipedia": "en:Blain's Farm & Fleet", "name": "Blain's Farm & Fleet", "shop": "country_store"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/country_store/Bomgaars": {"name": "Bomgaars", "icon": "fas-hat-cowboy-side", "imageURL": "https://graph.facebook.com/BomgaarsSupply.Corporate/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q22059070", "shop": "country_store"}, "addTags": {"brand": "Bomgaars", "brand:wikidata": "Q22059070", "brand:wikipedia": "en:Bomgaars", "name": "Bomgaars", "shop": "country_store"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/country_store/Fleet Farm": {"name": "Fleet Farm", "icon": "fas-hat-cowboy-side", "imageURL": "https://graph.facebook.com/fleetfarm/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6859973", "shop": "country_store"}, "addTags": {"brand": "Fleet Farm", "brand:wikidata": "Q6859973", "brand:wikipedia": "en:Fleet Farm", "name": "Fleet Farm", "shop": "country_store"}, "countryCodes": ["us"], "terms": ["mills fleet farm"], "matchScore": 2, "suggestion": true},
+    "shop/country_store/Grange Co-op": {"name": "Grange Co-op", "icon": "fas-hat-cowboy-side", "imageURL": "https://graph.facebook.com/grangecoop/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5595639", "shop": "country_store"}, "addTags": {"brand": "Grange Co-op", "brand:wikidata": "Q5595639", "brand:wikipedia": "en:Grange Cooperative", "name": "Grange Co-op", "shop": "country_store"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/country_store/Home of Economy": {"name": "Home of Economy", "icon": "fas-hat-cowboy-side", "imageURL": "https://graph.facebook.com/Homeofeconomy/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5889100", "shop": "country_store"}, "addTags": {"brand": "Home of Economy", "brand:wikidata": "Q5889100", "brand:wikipedia": "en:Home of Economy", "name": "Home of Economy", "shop": "country_store"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/country_store/Norbys Farm Fleet": {"name": "Norbys Farm Fleet", "icon": "fas-hat-cowboy-side", "imageURL": "https://graph.facebook.com/norbysfarmfleet/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7050461", "shop": "country_store"}, "addTags": {"brand": "Norbys Farm Fleet", "brand:wikidata": "Q7050461", "brand:wikipedia": "en:Norby's Farm Fleet", "name": "Norbys Farm Fleet", "shop": "country_store"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/country_store/Orscheln Farm & Home": {"name": "Orscheln Farm & Home", "icon": "fas-hat-cowboy-side", "imageURL": "https://graph.facebook.com/orschelnfarmandhome/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q22060331", "shop": "country_store"}, "addTags": {"brand": "Orscheln Farm & Home", "brand:wikidata": "Q22060331", "brand:wikipedia": "en:Orscheln Farm & Home", "name": "Orscheln Farm & Home", "shop": "country_store"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/country_store/Peavey Mart": {"name": "Peavey Mart", "icon": "fas-hat-cowboy-side", "imageURL": "https://graph.facebook.com/PeaveyMart/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7158483", "shop": "country_store"}, "addTags": {"brand": "Peavey Mart", "brand:wikidata": "Q7158483", "brand:wikipedia": "en:Peavey Mart", "name": "Peavey Mart", "shop": "country_store"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/country_store/Rural King": {"name": "Rural King", "icon": "fas-hat-cowboy-side", "imageURL": "https://graph.facebook.com/RuralKing/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7380525", "shop": "country_store"}, "addTags": {"brand": "Rural King", "brand:wikidata": "Q7380525", "brand:wikipedia": "en:Rural King", "name": "Rural King", "shop": "country_store"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/country_store/TSC Stores": {"name": "TSC Stores", "icon": "fas-hat-cowboy-side", "imageURL": "https://graph.facebook.com/TSCStoresCanada/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62720230", "shop": "country_store"}, "addTags": {"brand": "TSC Stores", "brand:wikidata": "Q62720230", "name": "TSC Stores", "shop": "country_store"}, "countryCodes": ["ca"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/country_store/Theisen's": {"name": "Theisen's", "icon": "fas-hat-cowboy-side", "imageURL": "https://pbs.twimg.com/profile_images/743446346414227456/6V3KBxMe_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7777850", "shop": "country_store"}, "addTags": {"brand": "Theisen's", "brand:wikidata": "Q7777850", "brand:wikipedia": "en:Theisen's", "name": "Theisen's", "shop": "country_store"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/country_store/Tractor Supply Company": {"name": "Tractor Supply Company", "icon": "fas-hat-cowboy-side", "imageURL": "https://graph.facebook.com/TractorSupplyCo/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q15109925", "shop": "country_store"}, "addTags": {"brand": "Tractor Supply Company", "brand:wikidata": "Q15109925", "brand:wikipedia": "en:Tractor Supply Company", "name": "Tractor Supply Company", "shop": "country_store"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/country_store/Wynnstay": {"name": "Wynnstay", "icon": "fas-hat-cowboy-side", "imageURL": "https://graph.facebook.com/WynnstayCountryStores/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q63016351", "shop": "country_store"}, "addTags": {"brand": "Wynnstay", "brand:wikidata": "Q63016351", "name": "Wynnstay", "shop": "country_store"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/craft/A.C. Moore": {"name": "A.C. Moore", "icon": "fas-palette", "imageURL": "https://graph.facebook.com/acmoore/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4647066", "shop": "craft"}, "addTags": {"brand": "A.C. Moore", "brand:wikidata": "Q4647066", "brand:wikipedia": "en:A.C. Moore", "name": "A.C. Moore", "shop": "craft"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/craft/Hobby Lobby": {"name": "Hobby Lobby", "icon": "fas-palette", "imageURL": "https://graph.facebook.com/HobbyLobby/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5874938", "shop": "craft"}, "addTags": {"brand": "Hobby Lobby", "brand:wikidata": "Q5874938", "brand:wikipedia": "en:Hobby Lobby", "name": "Hobby Lobby", "shop": "craft"}, "countryCodes": ["in", "us"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/craft/Hobbycraft": {"name": "Hobbycraft", "icon": "fas-palette", "imageURL": "https://graph.facebook.com/HobbycraftUK/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16984508", "shop": "craft"}, "addTags": {"brand": "Hobbycraft", "brand:wikidata": "Q16984508", "brand:wikipedia": "en:Hobbycraft", "name": "Hobbycraft", "shop": "craft"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -4177,14 +4191,14 @@
     "shop/erotic/Orion": {"name": "Orion", "icon": "maki-shop", "imageURL": "https://pbs.twimg.com/profile_images/807193082244505600/DWoJxqGu_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1609577", "shop": "erotic"}, "addTags": {"brand": "Orion", "brand:wikidata": "Q1609577", "brand:wikipedia": "de:Orion (Erotik)", "name": "Orion", "shop": "erotic"}, "countryCodes": ["at", "de"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/erotic/Pulse and Cocktails": {"name": "Pulse and Cocktails", "icon": "maki-shop", "imageURL": "https://pbs.twimg.com/profile_images/820968242835587072/oAqqidgR_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7259672", "shop": "erotic"}, "addTags": {"brand": "Pulse and Cocktails", "brand:wikidata": "Q7259672", "brand:wikipedia": "en:Pulse and Cocktails", "name": "Pulse and Cocktails", "shop": "erotic"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/fabric/Mondial Tissus": {"name": "Mondial Tissus", "icon": "fas-tape", "imageURL": "https://graph.facebook.com/MondialTissus/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q17635288", "shop": "fabric"}, "addTags": {"brand": "Mondial Tissus", "brand:wikidata": "Q17635288", "brand:wikipedia": "fr:Mondial Tissus", "name": "Mondial Tissus", "shop": "fabric"}, "countryCodes": ["fr"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/fashion_accessories/Brighton Collectibles": {"name": "Brighton Collectibles", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/BrightonCollectibles/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4967623", "shop": "fashion_accessories"}, "addTags": {"brand": "Brighton Collectibles", "brand:wikidata": "Q4967623", "brand:wikipedia": "en:Brighton Collectibles", "name": "Brighton Collectibles", "shop": "fashion_accessories"}, "countryCodes": ["us"], "terms": ["brighton"], "matchScore": 2, "suggestion": true},
-    "shop/fashion_accessories/Bvlgari": {"name": "Bvlgari", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/Bulgari/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q752515", "shop": "fashion_accessories"}, "addTags": {"brand": "Bulgari", "brand:wikidata": "Q752515", "brand:wikipedia": "en:Bulgari", "name": "Bvlgari", "shop": "fashion_accessories"}, "terms": ["bulgari"], "matchScore": 2, "suggestion": true},
-    "shop/fashion_accessories/Claire's": {"name": "Claire's", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/claires/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2974996", "shop": "fashion_accessories"}, "addTags": {"brand": "Claire's", "brand:wikidata": "Q2974996", "brand:wikipedia": "en:Claire's", "name": "Claire's", "shop": "fashion_accessories"}, "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/fashion_accessories/Jimmy Choo": {"name": "Jimmy Choo", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/JimmyChoo/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5213855", "shop": "fashion_accessories"}, "addTags": {"brand": "Jimmy Choo", "brand:wikidata": "Q5213855", "brand:wikipedia": "en:Jimmy Choo Ltd", "name": "Jimmy Choo", "shop": "fashion_accessories"}, "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/fashion_accessories/Prada": {"name": "Prada", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/Prada/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q193136", "shop": "fashion_accessories"}, "addTags": {"brand": "Prada", "brand:wikidata": "Q193136", "brand:wikipedia": "en:Prada", "name": "Prada", "shop": "fashion_accessories"}, "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/fashion_accessories/Radley London": {"name": "Radley London", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7281436", "shop": "fashion_accessories"}, "addTags": {"brand": "Radley London", "brand:wikidata": "Q7281436", "name": "Radley London", "shop": "fashion_accessories", "short_name": "Radley"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/fashion_accessories/Salvatore Ferragamo": {"name": "Salvatore Ferragamo", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/SalvatoreFerragamo/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3946053", "shop": "fashion_accessories"}, "addTags": {"brand": "Salvatore Ferragamo", "brand:wikidata": "Q3946053", "brand:wikipedia": "en:Salvatore Ferragamo S.p.A.", "name": "Salvatore Ferragamo", "shop": "fashion_accessories"}, "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/fashion_accessories/Van Cleef & Arpels": {"name": "Van Cleef & Arpels", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/vancleef.arpels/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2708181", "shop": "fashion_accessories"}, "addTags": {"brand": "Van Cleef & Arpels", "brand:wikidata": "Q2708181", "brand:wikipedia": "en:Van Cleef & Arpels", "name": "Van Cleef & Arpels", "shop": "fashion_accessories"}, "terms": ["van cleef & arples"], "matchScore": 2, "suggestion": true},
+    "shop/fashion_accessories/Brighton Collectibles": {"name": "Brighton Collectibles", "icon": "temaki-fashion_accessories", "imageURL": "https://graph.facebook.com/BrightonCollectibles/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4967623", "shop": "fashion_accessories"}, "addTags": {"brand": "Brighton Collectibles", "brand:wikidata": "Q4967623", "brand:wikipedia": "en:Brighton Collectibles", "name": "Brighton Collectibles", "shop": "fashion_accessories"}, "countryCodes": ["us"], "terms": ["brighton"], "matchScore": 2, "suggestion": true},
+    "shop/fashion_accessories/Bvlgari": {"name": "Bvlgari", "icon": "temaki-fashion_accessories", "imageURL": "https://graph.facebook.com/Bulgari/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q752515", "shop": "fashion_accessories"}, "addTags": {"brand": "Bulgari", "brand:wikidata": "Q752515", "brand:wikipedia": "en:Bulgari", "name": "Bvlgari", "shop": "fashion_accessories"}, "terms": ["bulgari"], "matchScore": 2, "suggestion": true},
+    "shop/fashion_accessories/Claire's": {"name": "Claire's", "icon": "temaki-fashion_accessories", "imageURL": "https://graph.facebook.com/claires/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2974996", "shop": "fashion_accessories"}, "addTags": {"brand": "Claire's", "brand:wikidata": "Q2974996", "brand:wikipedia": "en:Claire's", "name": "Claire's", "shop": "fashion_accessories"}, "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/fashion_accessories/Jimmy Choo": {"name": "Jimmy Choo", "icon": "temaki-fashion_accessories", "imageURL": "https://graph.facebook.com/JimmyChoo/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5213855", "shop": "fashion_accessories"}, "addTags": {"brand": "Jimmy Choo", "brand:wikidata": "Q5213855", "brand:wikipedia": "en:Jimmy Choo Ltd", "name": "Jimmy Choo", "shop": "fashion_accessories"}, "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/fashion_accessories/Prada": {"name": "Prada", "icon": "temaki-fashion_accessories", "imageURL": "https://graph.facebook.com/Prada/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q193136", "shop": "fashion_accessories"}, "addTags": {"brand": "Prada", "brand:wikidata": "Q193136", "brand:wikipedia": "en:Prada", "name": "Prada", "shop": "fashion_accessories"}, "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/fashion_accessories/Radley London": {"name": "Radley London", "icon": "temaki-fashion_accessories", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7281436", "shop": "fashion_accessories"}, "addTags": {"brand": "Radley London", "brand:wikidata": "Q7281436", "name": "Radley London", "shop": "fashion_accessories", "short_name": "Radley"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/fashion_accessories/Salvatore Ferragamo": {"name": "Salvatore Ferragamo", "icon": "temaki-fashion_accessories", "imageURL": "https://graph.facebook.com/SalvatoreFerragamo/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3946053", "shop": "fashion_accessories"}, "addTags": {"brand": "Salvatore Ferragamo", "brand:wikidata": "Q3946053", "brand:wikipedia": "en:Salvatore Ferragamo S.p.A.", "name": "Salvatore Ferragamo", "shop": "fashion_accessories"}, "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/fashion_accessories/Van Cleef & Arpels": {"name": "Van Cleef & Arpels", "icon": "temaki-fashion_accessories", "imageURL": "https://graph.facebook.com/vancleef.arpels/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2708181", "shop": "fashion_accessories"}, "addTags": {"brand": "Van Cleef & Arpels", "brand:wikidata": "Q2708181", "brand:wikipedia": "en:Van Cleef & Arpels", "name": "Van Cleef & Arpels", "shop": "fashion_accessories"}, "terms": ["van cleef & arples"], "matchScore": 2, "suggestion": true},
     "shop/florist/Blume 2000": {"name": "Blume 2000", "icon": "maki-florist", "imageURL": "https://graph.facebook.com/Blume2000.de/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q886166", "shop": "florist"}, "addTags": {"brand": "Blume 2000", "brand:wikidata": "Q886166", "brand:wikipedia": "de:Blume 2000", "name": "Blume 2000", "shop": "florist"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/florist/Blumen Risse": {"name": "Blumen Risse", "icon": "maki-florist", "imageURL": "https://graph.facebook.com/BlumenRisse/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q886177", "shop": "florist"}, "addTags": {"brand": "Blumen Risse", "brand:wikidata": "Q886177", "brand:wikipedia": "de:Blumen Risse", "name": "Blumen Risse", "shop": "florist"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/florist/Interflora": {"name": "Interflora", "icon": "maki-florist", "imageURL": "https://graph.facebook.com/Interflora.France/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q692179", "shop": "florist"}, "addTags": {"brand": "Interflora", "brand:wikidata": "Q692179", "brand:wikipedia": "en:Interflora", "name": "Interflora", "shop": "florist"}, "countryCodes": ["fr", "gb", "no", "se"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -4247,9 +4261,9 @@
     "shop/garden_centre/Jardiland": {"name": "Jardiland", "icon": "maki-garden-centre", "imageURL": "https://graph.facebook.com/Jardiland/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3162276", "shop": "garden_centre"}, "addTags": {"brand": "Jardiland", "brand:wikidata": "Q3162276", "brand:wikipedia": "fr:Jardiland", "name": "Jardiland", "shop": "garden_centre"}, "countryCodes": ["fr"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/garden_centre/Point Vert": {"name": "Point Vert", "icon": "maki-garden-centre", "imageURL": "https://graph.facebook.com/444739795728913/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16661975", "shop": "garden_centre"}, "addTags": {"brand": "Point Vert", "brand:wikidata": "Q16661975", "brand:wikipedia": "fr:Magasin vert", "name": "Point Vert", "shop": "garden_centre"}, "countryCodes": ["fr"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/garden_centre/Truffaut": {"name": "Truffaut", "icon": "maki-garden-centre", "imageURL": "https://graph.facebook.com/truffautfr/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3162640", "shop": "garden_centre"}, "addTags": {"brand": "Truffaut", "brand:wikidata": "Q3162640", "brand:wikipedia": "fr:Jardineries Truffaut", "name": "Truffaut", "shop": "garden_centre"}, "countryCodes": ["fr"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/gas/Airgas": {"name": "Airgas", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/airgasusa/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q80635", "shop": "gas"}, "addTags": {"brand": "Airgas", "brand:wikidata": "Q80635", "brand:wikipedia": "en:Airgas", "name": "Airgas", "shop": "gas"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/gas/AmeriGas": {"name": "AmeriGas", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/AmeriGas/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q23130318", "shop": "gas"}, "addTags": {"brand": "AmeriGas", "brand:wikidata": "Q23130318", "brand:wikipedia": "en:AmeriGas", "fuel:lpg": "yes", "name": "AmeriGas", "shop": "gas"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/gas/Ferrellgas": {"name": "Ferrellgas", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/Ferrellgas/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5445299", "shop": "gas"}, "addTags": {"brand": "Ferrellgas", "brand:wikidata": "Q5445299", "brand:wikipedia": "en:Ferrellgas", "fuel:lpg": "yes", "name": "Ferrellgas", "shop": "gas"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/gas/Airgas": {"name": "Airgas", "icon": "temaki-gas", "imageURL": "https://graph.facebook.com/airgasusa/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q80635", "shop": "gas"}, "addTags": {"brand": "Airgas", "brand:wikidata": "Q80635", "brand:wikipedia": "en:Airgas", "name": "Airgas", "shop": "gas"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/gas/AmeriGas": {"name": "AmeriGas", "icon": "temaki-gas", "imageURL": "https://graph.facebook.com/AmeriGas/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q23130318", "shop": "gas"}, "addTags": {"brand": "AmeriGas", "brand:wikidata": "Q23130318", "brand:wikipedia": "en:AmeriGas", "fuel:lpg": "yes", "name": "AmeriGas", "shop": "gas"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/gas/Ferrellgas": {"name": "Ferrellgas", "icon": "temaki-gas", "imageURL": "https://graph.facebook.com/Ferrellgas/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5445299", "shop": "gas"}, "addTags": {"brand": "Ferrellgas", "brand:wikidata": "Q5445299", "brand:wikipedia": "en:Ferrellgas", "fuel:lpg": "yes", "name": "Ferrellgas", "shop": "gas"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/gift/American Greetings": {"name": "American Greetings", "icon": "maki-gift", "imageURL": "https://graph.facebook.com/AmericanGreetings/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q464767", "shop": "gift"}, "addTags": {"brand": "American Greetings", "brand:wikidata": "Q464767", "brand:wikipedia": "en:American Greetings", "name": "American Greetings", "shop": "gift"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/gift/Card Factory": {"name": "Card Factory", "icon": "maki-gift", "imageURL": "https://graph.facebook.com/cardfactoryplc/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5038192", "shop": "gift"}, "addTags": {"brand": "Card Factory", "brand:wikidata": "Q5038192", "brand:wikipedia": "en:Card Factory", "name": "Card Factory", "shop": "gift"}, "countryCodes": ["gb", "im"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/gift/Carlton Cards": {"name": "Carlton Cards", "icon": "maki-gift", "imageURL": "https://graph.facebook.com/Carltoncards.ca/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5042968", "shop": "gift"}, "addTags": {"brand": "Carlton Cards", "brand:wikidata": "Q5042968", "brand:wikipedia": "en:Carlton Cards", "name": "Carlton Cards", "shop": "gift"}, "countryCodes": ["ca"], "terms": ["carlton"], "matchScore": 2, "suggestion": true},
@@ -4264,7 +4278,7 @@
     "shop/gift/Spencer's": {"name": "Spencer's", "icon": "maki-gift", "imageURL": "https://graph.facebook.com/spencers/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7576055", "shop": "gift"}, "addTags": {"brand": "Spencer Gifts", "brand:wikidata": "Q7576055", "brand:wikipedia": "en:Spencer Gifts", "name": "Spencer's", "official_name": "Spencer Gifts", "shop": "gift"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/gift/Things Remembered": {"name": "Things Remembered", "icon": "maki-gift", "imageURL": "https://graph.facebook.com/thingsremembered/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q54958287", "shop": "gift"}, "addTags": {"brand": "Things Remembered", "brand:wikidata": "Q54958287", "brand:wikipedia": "en:Things Remembered", "name": "Things Remembered", "shop": "gift"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/greengrocer/Produce Junction": {"name": "Produce Junction", "icon": "fas-carrot", "imageURL": "https://graph.facebook.com/ProduceJunction/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q60583541", "shop": "greengrocer"}, "addTags": {"brand": "Produce Junction", "brand:wikidata": "Q60583541", "name": "Produce Junction", "shop": "greengrocer"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/hairdresser_supply/Sally Beauty Supply": {"name": "Sally Beauty Supply", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/sallybeauty/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7405065", "shop": "hairdresser_supply"}, "addTags": {"brand": "Sally Beauty Supply", "brand:wikidata": "Q7405065", "brand:wikipedia": "en:Sally Beauty Holdings", "name": "Sally Beauty Supply", "shop": "hairdresser_supply"}, "countryCodes": ["ca", "mx", "us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/hairdresser_supply/Sally Beauty Supply": {"name": "Sally Beauty Supply", "icon": "temaki-hair_care", "imageURL": "https://graph.facebook.com/sallybeauty/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7405065", "shop": "hairdresser_supply"}, "addTags": {"brand": "Sally Beauty Supply", "brand:wikidata": "Q7405065", "brand:wikipedia": "en:Sally Beauty Holdings", "name": "Sally Beauty Supply", "shop": "hairdresser_supply"}, "countryCodes": ["ca", "mx", "us"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/hairdresser/Camille Albane": {"name": "Camille Albane", "icon": "temaki-beauty_salon", "imageURL": "https://graph.facebook.com/CamilleAlbane.Paris/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62965183", "shop": "hairdresser"}, "addTags": {"brand": "Camille Albane", "brand:wikidata": "Q62965183", "name": "Camille Albane", "shop": "hairdresser"}, "countryCodes": ["fr"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/hairdresser/Cost Cutters": {"name": "Cost Cutters", "icon": "temaki-beauty_salon", "imageURL": "https://graph.facebook.com/CostCutters/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62029366", "shop": "hairdresser"}, "addTags": {"brand": "Cost Cutters", "brand:wikidata": "Q62029366", "name": "Cost Cutters", "shop": "hairdresser"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/hairdresser/Dessange": {"name": "Dessange", "icon": "temaki-beauty_salon", "imageURL": "https://graph.facebook.com/DESSANGE.Paris/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62979914", "shop": "hairdresser"}, "addTags": {"brand": "Dessange", "brand:wikidata": "Q62979914", "name": "Dessange", "shop": "hairdresser"}, "terms": [], "matchScore": 2, "suggestion": true},
@@ -4297,12 +4311,12 @@
     "shop/hardware/Würth": {"name": "Würth", "icon": "temaki-tools", "imageURL": "https://graph.facebook.com/Wuerth.Group/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q679750", "shop": "hardware"}, "addTags": {"brand": "Würth", "brand:wikidata": "Q679750", "brand:wikipedia": "de:Würth-Gruppe", "name": "Würth", "shop": "hardware"}, "countryCodes": ["be", "de", "fi", "fr", "it", "no"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/hardware/Мосхозторг": {"name": "Мосхозторг", "icon": "temaki-tools", "imageURL": "https://graph.facebook.com/MosHozTorg/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62499092", "shop": "hardware"}, "addTags": {"brand": "Мосхозторг", "brand:wikidata": "Q62499092", "name": "Мосхозторг", "shop": "hardware"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/health_food/Holland & Barrett": {"name": "Holland & Barrett", "icon": "maki-shop", "imageURL": "https://pbs.twimg.com/profile_images/1146032750463504384/jGVlI8rw_bigger.png", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5880870", "shop": "health_food"}, "addTags": {"brand": "Holland & Barrett", "brand:wikidata": "Q5880870", "brand:wikipedia": "en:Holland & Barrett", "name": "Holland & Barrett", "shop": "health_food"}, "countryCodes": ["gb", "ie", "nl"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/hearing_aids/Amplifon": {"name": "Amplifon", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/AmplifonGroupCareers/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q477222", "shop": "hearing_aids"}, "addTags": {"brand": "Amplifon", "brand:wikidata": "Q477222", "brand:wikipedia": "en:Amplifon", "name": "Amplifon", "shop": "hearing_aids"}, "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/hearing_aids/Audika": {"name": "Audika", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/audikafrance/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2870745", "shop": "hearing_aids"}, "addTags": {"brand": "Audika", "brand:wikidata": "Q2870745", "brand:wikipedia": "fr:Audika", "name": "Audika", "shop": "hearing_aids"}, "countryCodes": ["ch", "fr"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/hearing_aids/Geers": {"name": "Geers", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/geers.hoerakustik/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1497707", "shop": "hearing_aids"}, "addTags": {"brand": "Geers", "brand:wikidata": "Q1497707", "brand:wikipedia": "de:Geers Hörakustik", "name": "Geers", "shop": "hearing_aids"}, "countryCodes": ["de", "pl"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/hearing_aids/Kind Hörgeräte": {"name": "Kind Hörgeräte", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/kindhoergeraete/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q43598590", "shop": "hearing_aids"}, "addTags": {"brand": "Kind Hörgeräte", "brand:wikidata": "Q43598590", "brand:wikipedia": "de:Kind Hörgeräte", "name": "Kind Hörgeräte", "shop": "hearing_aids"}, "countryCodes": ["de"], "terms": ["kind"], "matchScore": 2, "suggestion": true},
-    "shop/hearing_aids/Miracle-Ear": {"name": "Miracle-Ear", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/miracleear/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q17108572", "shop": "hearing_aids"}, "addTags": {"brand": "Miracle-Ear", "brand:wikidata": "Q17108572", "brand:wikipedia": "en:Miracle-Ear", "name": "Miracle-Ear", "shop": "hearing_aids"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/hearing_aids/Neuroth": {"name": "Neuroth", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/NeurothAG/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q15836645", "shop": "hearing_aids"}, "addTags": {"brand": "Neuroth", "brand:wikidata": "Q15836645", "brand:wikipedia": "de:Neuroth AG", "name": "Neuroth", "shop": "hearing_aids"}, "countryCodes": ["at", "de"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/hearing_aids/Amplifon": {"name": "Amplifon", "icon": "temaki-hearing_aid", "imageURL": "https://graph.facebook.com/AmplifonGroupCareers/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q477222", "shop": "hearing_aids"}, "addTags": {"brand": "Amplifon", "brand:wikidata": "Q477222", "brand:wikipedia": "en:Amplifon", "name": "Amplifon", "shop": "hearing_aids"}, "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/hearing_aids/Audika": {"name": "Audika", "icon": "temaki-hearing_aid", "imageURL": "https://graph.facebook.com/audikafrance/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2870745", "shop": "hearing_aids"}, "addTags": {"brand": "Audika", "brand:wikidata": "Q2870745", "brand:wikipedia": "fr:Audika", "name": "Audika", "shop": "hearing_aids"}, "countryCodes": ["ch", "fr"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/hearing_aids/Geers": {"name": "Geers", "icon": "temaki-hearing_aid", "imageURL": "https://graph.facebook.com/geers.hoerakustik/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1497707", "shop": "hearing_aids"}, "addTags": {"brand": "Geers", "brand:wikidata": "Q1497707", "brand:wikipedia": "de:Geers Hörakustik", "name": "Geers", "shop": "hearing_aids"}, "countryCodes": ["de", "pl"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/hearing_aids/Kind Hörgeräte": {"name": "Kind Hörgeräte", "icon": "temaki-hearing_aid", "imageURL": "https://graph.facebook.com/kindhoergeraete/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q43598590", "shop": "hearing_aids"}, "addTags": {"brand": "Kind Hörgeräte", "brand:wikidata": "Q43598590", "brand:wikipedia": "de:Kind Hörgeräte", "name": "Kind Hörgeräte", "shop": "hearing_aids"}, "countryCodes": ["de"], "terms": ["kind"], "matchScore": 2, "suggestion": true},
+    "shop/hearing_aids/Miracle-Ear": {"name": "Miracle-Ear", "icon": "temaki-hearing_aid", "imageURL": "https://graph.facebook.com/miracleear/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q17108572", "shop": "hearing_aids"}, "addTags": {"brand": "Miracle-Ear", "brand:wikidata": "Q17108572", "brand:wikipedia": "en:Miracle-Ear", "name": "Miracle-Ear", "shop": "hearing_aids"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/hearing_aids/Neuroth": {"name": "Neuroth", "icon": "temaki-hearing_aid", "imageURL": "https://graph.facebook.com/NeurothAG/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q15836645", "shop": "hearing_aids"}, "addTags": {"brand": "Neuroth", "brand:wikidata": "Q15836645", "brand:wikipedia": "de:Neuroth AG", "name": "Neuroth", "shop": "hearing_aids"}, "countryCodes": ["at", "de"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/hifi/Bang & Olufsen": {"name": "Bang & Olufsen", "icon": "temaki-speaker", "imageURL": "https://graph.facebook.com/bangolufsenusa/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q790020", "shop": "hifi"}, "addTags": {"brand": "Bang & Olufsen", "brand:wikidata": "Q790020", "brand:wikipedia": "en:Bang & Olufsen", "name": "Bang & Olufsen", "shop": "hifi"}, "terms": [], "matchScore": 2, "suggestion": true},
     "shop/hifi/Bose": {"name": "Bose", "icon": "temaki-speaker", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FBose%20logo.svg&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q328568", "shop": "hifi"}, "addTags": {"brand": "Bose", "brand:wikidata": "Q328568", "brand:wikipedia": "en:Bose Corporation", "name": "Bose", "shop": "hifi"}, "terms": [], "matchScore": 2, "suggestion": true},
     "shop/hobby/アニメイト": {"name": "アニメイト", "icon": "fas-dragon", "imageURL": "https://pbs.twimg.com/profile_images/1098862296787382272/pLo1nSbN_bigger.png", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1041890", "shop": "hobby"}, "addTags": {"brand": "アニメイト", "brand:en": "Animate", "brand:ja": "アニメイト", "brand:wikidata": "Q1041890", "brand:wikipedia": "ja:アニメイト", "name": "アニメイト", "name:en": "Animate", "name:ja": "アニメイト", "shop": "hobby"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -4366,15 +4380,15 @@
     "shop/kiosk/Tisak": {"name": "Tisak", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/tisakmedia/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q12643627", "shop": "kiosk"}, "addTags": {"brand": "Tisak", "brand:wikidata": "Q12643627", "brand:wikipedia": "hr:Tisak (tvrtka)", "name": "Tisak", "shop": "kiosk"}, "countryCodes": ["hr"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/kiosk/k kiosk": {"name": "k kiosk", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/kkiosk/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q60381703", "shop": "kiosk"}, "addTags": {"brand": "k kiosk", "brand:wikidata": "Q60381703", "brand:wikipedia": "it:K Kiosk", "name": "k kiosk", "shop": "kiosk"}, "countryCodes": ["ch"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/kiosk/キヨスク": {"name": "キヨスク", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1334796", "shop": "kiosk"}, "addTags": {"brand": "キヨスク", "brand:en": "KIOSK", "brand:ja": "キヨスク", "brand:wikidata": "Q1334796", "brand:wikipedia": "ja:キヨスク", "name": "キヨスク", "name:en": "KIOSK", "name:ja": "キヨスク", "shop": "kiosk"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/kitchen/Cuisinella": {"name": "Cuisinella", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/CuisinellaFR/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3007012", "shop": "kitchen"}, "addTags": {"brand": "Cuisinella", "brand:wikidata": "Q3007012", "brand:wikipedia": "fr:Cuisinella", "name": "Cuisinella", "shop": "kitchen"}, "countryCodes": ["fr", "tn"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/kitchen/Magnet": {"name": "Magnet", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/MagnetKitchens/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6731427", "shop": "kitchen"}, "addTags": {"brand": "Magnet", "brand:wikidata": "Q6731427", "brand:wikipedia": "en:Magnet Kitchens", "name": "Magnet", "shop": "kitchen"}, "countryCodes": ["gb"], "terms": ["magnet kitchens"], "matchScore": 2, "suggestion": true},
-    "shop/kitchen/Mobalpa": {"name": "Mobalpa", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/Mobalpa/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3317571", "shop": "kitchen"}, "addTags": {"brand": "Mobalpa", "brand:wikidata": "Q3317571", "brand:wikipedia": "fr:Mobalpa", "name": "Mobalpa", "shop": "kitchen"}, "countryCodes": ["be", "fr", "gb"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/kitchen/Schmidt": {"name": "Schmidt", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/Schmidt.HomeDesign/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3487620", "shop": "kitchen"}, "addTags": {"brand": "Schmidt", "brand:wikidata": "Q3487620", "brand:wikipedia": "de:Schmidt Groupe", "name": "Schmidt", "shop": "kitchen"}, "countryCodes": ["be", "es", "fr", "gb"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/kitchen/SoCoo'c": {"name": "SoCoo'c", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/SoCooc/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62783840", "shop": "kitchen"}, "addTags": {"brand": "SoCoo'c", "brand:wikidata": "Q62783840", "brand:wikipedia": "fr:SoCoo'c", "name": "SoCoo'c", "shop": "kitchen"}, "countryCodes": ["fr"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/kitchen/Cuisinella": {"name": "Cuisinella", "icon": "temaki-kitchen_sink", "imageURL": "https://graph.facebook.com/CuisinellaFR/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3007012", "shop": "kitchen"}, "addTags": {"brand": "Cuisinella", "brand:wikidata": "Q3007012", "brand:wikipedia": "fr:Cuisinella", "name": "Cuisinella", "shop": "kitchen"}, "countryCodes": ["fr", "tn"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/kitchen/Magnet": {"name": "Magnet", "icon": "temaki-kitchen_sink", "imageURL": "https://graph.facebook.com/MagnetKitchens/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6731427", "shop": "kitchen"}, "addTags": {"brand": "Magnet", "brand:wikidata": "Q6731427", "brand:wikipedia": "en:Magnet Kitchens", "name": "Magnet", "shop": "kitchen"}, "countryCodes": ["gb"], "terms": ["magnet kitchens"], "matchScore": 2, "suggestion": true},
+    "shop/kitchen/Mobalpa": {"name": "Mobalpa", "icon": "temaki-kitchen_sink", "imageURL": "https://graph.facebook.com/Mobalpa/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3317571", "shop": "kitchen"}, "addTags": {"brand": "Mobalpa", "brand:wikidata": "Q3317571", "brand:wikipedia": "fr:Mobalpa", "name": "Mobalpa", "shop": "kitchen"}, "countryCodes": ["be", "fr", "gb"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/kitchen/Schmidt": {"name": "Schmidt", "icon": "temaki-kitchen_sink", "imageURL": "https://graph.facebook.com/Schmidt.HomeDesign/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3487620", "shop": "kitchen"}, "addTags": {"brand": "Schmidt", "brand:wikidata": "Q3487620", "brand:wikipedia": "de:Schmidt Groupe", "name": "Schmidt", "shop": "kitchen"}, "countryCodes": ["be", "es", "fr", "gb"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/kitchen/SoCoo'c": {"name": "SoCoo'c", "icon": "temaki-kitchen_sink", "imageURL": "https://graph.facebook.com/SoCooc/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62783840", "shop": "kitchen"}, "addTags": {"brand": "SoCoo'c", "brand:wikidata": "Q62783840", "brand:wikipedia": "fr:SoCoo'c", "name": "SoCoo'c", "shop": "kitchen"}, "countryCodes": ["fr"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/massage/Massage Envy": {"name": "Massage Envy", "icon": "temaki-spa", "imageURL": "https://graph.facebook.com/MassageEnvy/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q22922899", "shop": "massage"}, "addTags": {"brand": "Massage Envy", "brand:wikidata": "Q22922899", "brand:wikipedia": "en:Massage Envy", "name": "Massage Envy", "shop": "massage"}, "countryCodes": ["us"], "terms": ["massage envy spa"], "matchScore": 2, "suggestion": true},
     "shop/massage/Massage Heights": {"name": "Massage Heights", "icon": "temaki-spa", "imageURL": "https://graph.facebook.com/MassageHeights/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64573956", "shop": "massage"}, "addTags": {"brand": "Massage Heights", "brand:wikidata": "Q64573956", "name": "Massage Heights", "shop": "massage"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/medical_supply/Pofam-Poznań": {"name": "Pofam-Poznań", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/381601628634155/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62057457", "shop": "medical_supply"}, "addTags": {"brand": "Pofam-Poznań", "brand:wikidata": "Q62057457", "name": "Pofam-Poznań", "shop": "medical_supply"}, "countryCodes": ["pl"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/medical_supply/Ортека": {"name": "Ортека", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/orteka.rus/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62393660", "shop": "medical_supply"}, "addTags": {"brand": "Ортека", "brand:wikidata": "Q62393660", "name": "Ортека", "shop": "medical_supply"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/medical_supply/Pofam-Poznań": {"name": "Pofam-Poznań", "icon": "fas-crutch", "imageURL": "https://graph.facebook.com/381601628634155/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62057457", "shop": "medical_supply"}, "addTags": {"brand": "Pofam-Poznań", "brand:wikidata": "Q62057457", "name": "Pofam-Poznań", "shop": "medical_supply"}, "countryCodes": ["pl"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/medical_supply/Ортека": {"name": "Ортека", "icon": "fas-crutch", "imageURL": "https://graph.facebook.com/orteka.rus/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62393660", "shop": "medical_supply"}, "addTags": {"brand": "Ортека", "brand:wikidata": "Q62393660", "name": "Ортека", "shop": "medical_supply"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/mobile_phone/3 Store": {"name": "3 Store", "icon": "fas-mobile-alt", "imageURL": "https://graph.facebook.com/ThreeUK/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q407009", "shop": "mobile_phone"}, "addTags": {"brand": "3 Store", "brand:wikidata": "Q407009", "brand:wikipedia": "en:3 (telecommunications)", "name": "3 Store", "shop": "mobile_phone"}, "countryCodes": ["gb", "it"], "terms": ["3", "three", "three store"], "matchScore": 2, "suggestion": true},
     "shop/mobile_phone/A1": {"name": "A1", "icon": "fas-mobile-alt", "imageURL": "https://graph.facebook.com/A1Fanpage/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q688755", "shop": "mobile_phone"}, "addTags": {"brand": "A1", "brand:wikidata": "Q688755", "brand:wikipedia": "en:A1 Telekom Austria Group", "name": "A1", "shop": "mobile_phone"}, "countryCodes": ["at", "bg", "by", "hr", "si"], "terms": ["velcom", "velcom|a1", "велком"], "matchScore": 2, "suggestion": true},
     "shop/mobile_phone/AT&T": {"name": "AT&T", "icon": "fas-mobile-alt", "imageURL": "https://graph.facebook.com/ATT/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q298594", "shop": "mobile_phone"}, "addTags": {"brand": "AT&T", "brand:wikidata": "Q298594", "brand:wikipedia": "en:AT&T Mobility", "name": "AT&T", "shop": "mobile_phone"}, "countryCodes": ["mx", "us"], "terms": ["att mobile", "att mobility", "att wireless"], "matchScore": 2, "suggestion": true},
@@ -4442,14 +4456,14 @@
     "shop/mobile_phone/ソフトバンク": {"name": "ソフトバンク", "icon": "fas-mobile-alt", "imageURL": "https://graph.facebook.com/SoftBank/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7553832", "shop": "mobile_phone"}, "addTags": {"brand": "ソフトバンク", "brand:en": "SoftBank Telecom", "brand:ja": "ソフトバンク", "brand:wikidata": "Q7553832", "brand:wikipedia": "en:SoftBank Telecom", "name": "ソフトバンク", "name:en": "SoftBank Telecom", "name:ja": "ソフトバンク", "shop": "mobile_phone"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/mobile_phone/ソフトバンクショップ": {"name": "ソフトバンクショップ", "icon": "fas-mobile-alt", "imageURL": "https://graph.facebook.com/SoftBank/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q11315281", "shop": "mobile_phone"}, "addTags": {"brand": "ソフトバンクショップ", "brand:en": "SoftBankShop", "brand:ja": "ソフトバンクショップ", "brand:wikidata": "Q11315281", "brand:wikipedia": "ja:ソフトバンクショップ", "name": "ソフトバンクショップ", "name:en": "SoftBankShop", "name:ja": "ソフトバンクショップ", "shop": "mobile_phone"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/mobile_phone/ドコモショップ": {"name": "ドコモショップ", "icon": "fas-mobile-alt", "imageURL": "https://graph.facebook.com/docomo.official/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q853958", "shop": "mobile_phone"}, "addTags": {"brand": "ドコモショップ", "brand:en": "DoCoMo Shop", "brand:ja": "ドコモショップ", "brand:wikidata": "Q853958", "brand:wikipedia": "ja:NTTドコモ", "name": "ドコモショップ", "name:en": "DoCoMo Shop", "name:ja": "ドコモショップ", "shop": "mobile_phone"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/money_lender/ACE Cash Express": {"name": "ACE Cash Express", "icon": "maki-bank", "imageURL": "https://graph.facebook.com/acecashexpress/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q24260962", "shop": "money_lender"}, "addTags": {"brand": "ACE Cash Express", "brand:wikidata": "Q24260962", "brand:wikipedia": "en:ACE Cash Express", "name": "ACE Cash Express", "shop": "money_lender"}, "countryCodes": ["us"], "terms": ["ace"], "matchScore": 2, "suggestion": true},
-    "shop/money_lender/Advance America": {"name": "Advance America", "icon": "maki-bank", "imageURL": "https://graph.facebook.com/AdvanceAmerica/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4686044", "shop": "money_lender"}, "addTags": {"brand": "Advance America", "brand:wikidata": "Q4686044", "name": "Advance America", "shop": "money_lender"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/money_lender/California Check Cashing Stores": {"name": "California Check Cashing Stores", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64390932", "shop": "money_lender"}, "addTags": {"brand": "California Check Cashing Stores", "brand:wikidata": "Q64390932", "name": "California Check Cashing Stores", "shop": "money_lender"}, "countryCodes": ["us"], "terms": ["california check cashing"], "matchScore": 2, "suggestion": true},
-    "shop/money_lender/Cash Store": {"name": "Cash Store", "icon": "maki-bank", "imageURL": "https://graph.facebook.com/cashstore/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q61943411", "shop": "money_lender"}, "addTags": {"brand": "Cash Store", "brand:wikidata": "Q61943411", "name": "Cash Store", "shop": "money_lender"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/money_lender/Check Into Cash": {"name": "Check Into Cash", "icon": "maki-bank", "imageURL": "https://graph.facebook.com/checkintocash/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16961246", "shop": "money_lender"}, "addTags": {"brand": "Check Into Cash", "brand:wikidata": "Q16961246", "brand:wikipedia": "en:Check Into Cash", "name": "Check Into Cash", "shop": "money_lender"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/money_lender/CheckSmart": {"name": "CheckSmart", "icon": "maki-bank", "imageURL": "https://graph.facebook.com/166958136649293/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q65640213", "shop": "money_lender"}, "addTags": {"alt_name": "Check$mart", "brand": "CheckSmart", "brand:wikidata": "Q65640213", "name": "CheckSmart", "shop": "money_lender"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/money_lender/First Virginia": {"name": "First Virginia", "icon": "maki-bank", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FFirst%20Virginia%20logo.png&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q65640051", "shop": "money_lender"}, "addTags": {"brand": "First Virginia", "brand:wikidata": "Q65640051", "name": "First Virginia", "shop": "money_lender"}, "countryCodes": ["us"], "terms": ["1st virginia"], "matchScore": 2, "suggestion": true},
-    "shop/money_lender/Money Mart": {"name": "Money Mart", "icon": "maki-bank", "imageURL": "https://graph.facebook.com/moneymartusa/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6899166", "shop": "money_lender"}, "addTags": {"brand": "Money Mart", "brand:wikidata": "Q6899166", "brand:wikipedia": "en:Money Mart", "name": "Money Mart", "shop": "money_lender"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/money_lender/ACE Cash Express": {"name": "ACE Cash Express", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/acecashexpress/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q24260962", "shop": "money_lender"}, "addTags": {"brand": "ACE Cash Express", "brand:wikidata": "Q24260962", "brand:wikipedia": "en:ACE Cash Express", "name": "ACE Cash Express", "shop": "money_lender"}, "countryCodes": ["us"], "terms": ["ace"], "matchScore": 2, "suggestion": true},
+    "shop/money_lender/Advance America": {"name": "Advance America", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/AdvanceAmerica/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4686044", "shop": "money_lender"}, "addTags": {"brand": "Advance America", "brand:wikidata": "Q4686044", "name": "Advance America", "shop": "money_lender"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/money_lender/California Check Cashing Stores": {"name": "California Check Cashing Stores", "icon": "temaki-money_hand", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64390932", "shop": "money_lender"}, "addTags": {"brand": "California Check Cashing Stores", "brand:wikidata": "Q64390932", "name": "California Check Cashing Stores", "shop": "money_lender"}, "countryCodes": ["us"], "terms": ["california check cashing"], "matchScore": 2, "suggestion": true},
+    "shop/money_lender/Cash Store": {"name": "Cash Store", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/cashstore/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q61943411", "shop": "money_lender"}, "addTags": {"brand": "Cash Store", "brand:wikidata": "Q61943411", "name": "Cash Store", "shop": "money_lender"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/money_lender/Check Into Cash": {"name": "Check Into Cash", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/checkintocash/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16961246", "shop": "money_lender"}, "addTags": {"brand": "Check Into Cash", "brand:wikidata": "Q16961246", "brand:wikipedia": "en:Check Into Cash", "name": "Check Into Cash", "shop": "money_lender"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/money_lender/CheckSmart": {"name": "CheckSmart", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/166958136649293/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q65640213", "shop": "money_lender"}, "addTags": {"alt_name": "Check$mart", "brand": "CheckSmart", "brand:wikidata": "Q65640213", "name": "CheckSmart", "shop": "money_lender"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/money_lender/First Virginia": {"name": "First Virginia", "icon": "temaki-money_hand", "imageURL": "https://commons.wikimedia.org/w/index.php?title=Special%3ARedirect%2Ffile%2FFirst%20Virginia%20logo.png&width=100", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q65640051", "shop": "money_lender"}, "addTags": {"brand": "First Virginia", "brand:wikidata": "Q65640051", "name": "First Virginia", "shop": "money_lender"}, "countryCodes": ["us"], "terms": ["1st virginia"], "matchScore": 2, "suggestion": true},
+    "shop/money_lender/Money Mart": {"name": "Money Mart", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/moneymartusa/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6899166", "shop": "money_lender"}, "addTags": {"brand": "Money Mart", "brand:wikidata": "Q6899166", "brand:wikipedia": "en:Money Mart", "name": "Money Mart", "shop": "money_lender"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/motorcycle/Harley-Davidson": {"name": "Harley-Davidson", "icon": "fas-motorcycle", "imageURL": "https://graph.facebook.com/harley-davidson/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q192814", "shop": "motorcycle"}, "addTags": {"brand": "Harley-Davidson", "brand:wikidata": "Q192814", "brand:wikipedia": "en:Harley-Davidson", "name": "Harley-Davidson", "shop": "motorcycle"}, "terms": [], "matchScore": 2, "suggestion": true},
     "shop/motorcycle/Honda": {"name": "Honda", "icon": "fas-motorcycle", "imageURL": "https://graph.facebook.com/HondaJP/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q9584", "shop": "motorcycle"}, "addTags": {"brand": "Honda", "brand:wikidata": "Q9584", "brand:wikipedia": "en:Honda", "name": "Honda", "shop": "motorcycle"}, "terms": [], "matchScore": 2, "suggestion": true},
     "shop/motorcycle/Kawasaki": {"name": "Kawasaki", "icon": "fas-motorcycle", "imageURL": "https://graph.facebook.com/kawasaki/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6379855", "shop": "motorcycle"}, "addTags": {"brand": "Kawasaki", "brand:wikidata": "Q6379855", "brand:wikipedia": "en:Kawasaki motorcycles", "name": "Kawasaki", "shop": "motorcycle"}, "terms": [], "matchScore": 2, "suggestion": true},
@@ -4475,9 +4489,9 @@
     "shop/newsagent/Первая полоса": {"name": "Первая полоса", "icon": "fas-newspaper", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62736412", "shop": "newsagent"}, "addTags": {"brand": "Первая полоса", "brand:wikidata": "Q62736412", "name": "Первая полоса", "shop": "newsagent"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/newsagent/Союзпечать": {"name": "Союзпечать", "icon": "fas-newspaper", "imageURL": "https://graph.facebook.com/Belsouzpechat/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4430611", "shop": "newsagent"}, "addTags": {"brand": "Союзпечать", "brand:wikidata": "Q4430611", "brand:wikipedia": "ru:Союзпечать", "name": "Союзпечать", "shop": "newsagent"}, "countryCodes": ["by", "kz", "ru", "ua"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/newsagent/読売新聞": {"name": "読売新聞", "icon": "fas-newspaper", "imageURL": "https://pbs.twimg.com/profile_images/1091035339232227328/elp0X_L6_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q645218", "shop": "newsagent"}, "addTags": {"brand": "読売新聞", "brand:en": "Yomiuri Shimbun", "brand:wikidata": "Q645218", "brand:wikipedia": "en:Yomiuri Shimbun", "name": "読売新聞", "name:en": "Yomiuri Shimbun", "shop": "newsagent"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/nutrition_supplements/GNC": {"name": "GNC", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/GNCLiveWell/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4808595", "shop": "nutrition_supplements"}, "addTags": {"brand": "GNC", "brand:wikidata": "Q4808595", "brand:wikipedia": "en:GNC (store)", "name": "GNC", "shop": "nutrition_supplements"}, "terms": ["gnc live well"], "matchScore": 2, "suggestion": true},
-    "shop/nutrition_supplements/The Vitamin Shoppe": {"name": "The Vitamin Shoppe", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/THEVITAMINSHOPPE/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7772938", "shop": "nutrition_supplements"}, "addTags": {"brand": "The Vitamin Shoppe", "brand:wikidata": "Q7772938", "brand:wikipedia": "en:The Vitamin Shoppe", "name": "The Vitamin Shoppe", "shop": "nutrition_supplements"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/nutrition_supplements/Vitamin World": {"name": "Vitamin World", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/OfficialVitaminWorld/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7936979", "shop": "nutrition_supplements"}, "addTags": {"brand": "Vitamin World", "brand:wikidata": "Q7936979", "brand:wikipedia": "en:Vitamin World", "name": "Vitamin World", "shop": "nutrition_supplements"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/nutrition_supplements/GNC": {"name": "GNC", "icon": "fas-pills", "imageURL": "https://graph.facebook.com/GNCLiveWell/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4808595", "shop": "nutrition_supplements"}, "addTags": {"brand": "GNC", "brand:wikidata": "Q4808595", "brand:wikipedia": "en:GNC (store)", "name": "GNC", "shop": "nutrition_supplements"}, "terms": ["gnc live well"], "matchScore": 2, "suggestion": true},
+    "shop/nutrition_supplements/The Vitamin Shoppe": {"name": "The Vitamin Shoppe", "icon": "fas-pills", "imageURL": "https://graph.facebook.com/THEVITAMINSHOPPE/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7772938", "shop": "nutrition_supplements"}, "addTags": {"brand": "The Vitamin Shoppe", "brand:wikidata": "Q7772938", "brand:wikipedia": "en:The Vitamin Shoppe", "name": "The Vitamin Shoppe", "shop": "nutrition_supplements"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/nutrition_supplements/Vitamin World": {"name": "Vitamin World", "icon": "fas-pills", "imageURL": "https://graph.facebook.com/OfficialVitaminWorld/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7936979", "shop": "nutrition_supplements"}, "addTags": {"brand": "Vitamin World", "brand:wikidata": "Q7936979", "brand:wikipedia": "en:Vitamin World", "name": "Vitamin World", "shop": "nutrition_supplements"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/optician/Alain Afflelou": {"name": "Alain Afflelou", "icon": "maki-optician", "imageURL": "https://graph.facebook.com/AlainAfflelouOptico/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2829511", "shop": "optician"}, "addTags": {"brand": "Alain Afflelou", "brand:wikidata": "Q2829511", "brand:wikipedia": "fr:Alain Afflelou (entreprise)", "name": "Alain Afflelou", "shop": "optician"}, "countryCodes": ["be", "ch", "es", "fr", "pt"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/optician/America's Best Contacts & Eyeglasses": {"name": "America's Best Contacts & Eyeglasses", "icon": "maki-optician", "imageURL": "https://graph.facebook.com/AmericasBestContactsandEyeglasses/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4742504", "shop": "optician"}, "addTags": {"brand": "America's Best Contacts & Eyeglasses", "brand:wikidata": "Q4742504", "brand:wikipedia": "en:America's Best Contacts & Eyeglasses", "name": "America's Best Contacts & Eyeglasses", "shop": "optician", "short_name": "America's Best"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/optician/Apollo-Optik": {"name": "Apollo-Optik", "icon": "maki-optician", "imageURL": "https://graph.facebook.com/ApolloOptik/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q618940", "shop": "optician"}, "addTags": {"brand": "Apollo-Optik", "brand:wikidata": "Q618940", "brand:wikipedia": "de:Apollo-Optik", "name": "Apollo-Optik", "shop": "optician", "short_name": "Apollo"}, "countryCodes": ["de"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -4539,15 +4553,15 @@
     "shop/party/Party City": {"name": "Party City", "icon": "temaki-balloon", "imageURL": "https://graph.facebook.com/PartyCity/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7140896", "shop": "party"}, "addTags": {"brand": "Party City", "brand:wikidata": "Q7140896", "brand:wikipedia": "en:Party City", "name": "Party City", "shop": "party"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/pastry/Cookies by Design": {"name": "Cookies by Design", "icon": "maki-bakery", "imageURL": "https://graph.facebook.com/CookiesbyDesignHQ/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5167112", "shop": "pastry"}, "addTags": {"brand": "Cookies by Design", "brand:wikidata": "Q5167112", "brand:wikipedia": "en:Cookies by Design", "craft": "bakery", "name": "Cookies by Design", "shop": "pastry"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/pastry/Smallcakes": {"name": "Smallcakes", "icon": "maki-bakery", "imageURL": "https://graph.facebook.com/SmallcakesKC/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62384749", "shop": "pastry"}, "addTags": {"brand": "Smallcakes", "brand:wikidata": "Q62384749", "name": "Smallcakes", "shop": "pastry"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/pawnbroker/Cash Converters": {"name": "Cash Converters", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/CashConvertersUK/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5048645", "shop": "pawnbroker"}, "addTags": {"brand": "Cash Converters", "brand:wikidata": "Q5048645", "brand:wikipedia": "en:Cash Converters", "name": "Cash Converters", "shop": "pawnbroker"}, "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/pawnbroker/Cebuana Lhuillier": {"name": "Cebuana Lhuillier", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/cebuanalhuillierpawnshop/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q17064661", "shop": "pawnbroker"}, "addTags": {"brand": "Cebuana Lhuillier", "brand:wikidata": "Q17064661", "brand:wikipedia": "en:Cebuana Lhuillier", "name": "Cebuana Lhuillier", "shop": "pawnbroker", "short_name": "Cebuana"}, "countryCodes": ["ph"], "terms": ["agencia cebuana", "m lhuillier"], "matchScore": 2, "suggestion": true},
-    "shop/pawnbroker/Palawan Pawnshop": {"name": "Palawan Pawnshop", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/palawan.pawnshop/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62391488", "shop": "pawnbroker"}, "addTags": {"brand": "Palawan Pawnshop", "brand:wikidata": "Q62391488", "name": "Palawan Pawnshop", "shop": "pawnbroker"}, "countryCodes": ["ph"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/pawnbroker/Villarica Pawnshop": {"name": "Villarica Pawnshop", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/155765647803482/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62391438", "shop": "pawnbroker"}, "addTags": {"brand": "Villarica Pawnshop", "brand:wikidata": "Q62391438", "name": "Villarica Pawnshop", "shop": "pawnbroker"}, "countryCodes": ["ph"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/perfumery/Douglas": {"name": "Douglas", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/DouglasDeutschland/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2052213", "shop": "perfumery"}, "addTags": {"brand": "Douglas", "brand:wikidata": "Q2052213", "brand:wikipedia": "de:Parfümerie Douglas", "name": "Douglas", "shop": "perfumery"}, "countryCodes": ["at", "ch", "de", "es", "it", "nl", "pl"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/perfumery/FAnn": {"name": "FAnn", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/FAnn.cz/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62391353", "shop": "perfumery"}, "addTags": {"brand": "FAnn", "brand:wikidata": "Q62391353", "name": "FAnn", "shop": "perfumery"}, "countryCodes": ["cz", "sk"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/perfumery/ICI PARIS XL": {"name": "ICI PARIS XL", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/iciparisxlbe/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q769749", "shop": "perfumery"}, "addTags": {"brand": "ICI PARIS XL", "brand:wikidata": "Q769749", "brand:wikipedia": "en:ICI Paris XL", "name": "ICI PARIS XL", "shop": "perfumery"}, "countryCodes": ["be", "lu", "nl"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/perfumery/Marionnaud": {"name": "Marionnaud", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/Marionnaud.France/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1129073", "shop": "perfumery"}, "addTags": {"brand": "Marionnaud", "brand:wikidata": "Q1129073", "brand:wikipedia": "fr:Marionnaud", "name": "Marionnaud", "shop": "perfumery"}, "countryCodes": ["at", "ch", "es", "fr", "it", "sk"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/perfumery/O Boticário": {"name": "O Boticário", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/oboticario/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7073219", "shop": "perfumery"}, "addTags": {"brand": "O Boticário", "brand:wikidata": "Q7073219", "brand:wikipedia": "en:O Boticário", "name": "O Boticário", "shop": "perfumery"}, "countryCodes": ["br"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/pawnbroker/Cash Converters": {"name": "Cash Converters", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/CashConvertersUK/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5048645", "shop": "pawnbroker"}, "addTags": {"brand": "Cash Converters", "brand:wikidata": "Q5048645", "brand:wikipedia": "en:Cash Converters", "name": "Cash Converters", "shop": "pawnbroker"}, "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/pawnbroker/Cebuana Lhuillier": {"name": "Cebuana Lhuillier", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/cebuanalhuillierpawnshop/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q17064661", "shop": "pawnbroker"}, "addTags": {"brand": "Cebuana Lhuillier", "brand:wikidata": "Q17064661", "brand:wikipedia": "en:Cebuana Lhuillier", "name": "Cebuana Lhuillier", "shop": "pawnbroker", "short_name": "Cebuana"}, "countryCodes": ["ph"], "terms": ["agencia cebuana", "m lhuillier"], "matchScore": 2, "suggestion": true},
+    "shop/pawnbroker/Palawan Pawnshop": {"name": "Palawan Pawnshop", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/palawan.pawnshop/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62391488", "shop": "pawnbroker"}, "addTags": {"brand": "Palawan Pawnshop", "brand:wikidata": "Q62391488", "name": "Palawan Pawnshop", "shop": "pawnbroker"}, "countryCodes": ["ph"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/pawnbroker/Villarica Pawnshop": {"name": "Villarica Pawnshop", "icon": "temaki-money_hand", "imageURL": "https://graph.facebook.com/155765647803482/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62391438", "shop": "pawnbroker"}, "addTags": {"brand": "Villarica Pawnshop", "brand:wikidata": "Q62391438", "name": "Villarica Pawnshop", "shop": "pawnbroker"}, "countryCodes": ["ph"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/perfumery/Douglas": {"name": "Douglas", "icon": "temaki-perfume", "imageURL": "https://graph.facebook.com/DouglasDeutschland/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2052213", "shop": "perfumery"}, "addTags": {"brand": "Douglas", "brand:wikidata": "Q2052213", "brand:wikipedia": "de:Parfümerie Douglas", "name": "Douglas", "shop": "perfumery"}, "countryCodes": ["at", "ch", "de", "es", "it", "nl", "pl"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/perfumery/FAnn": {"name": "FAnn", "icon": "temaki-perfume", "imageURL": "https://graph.facebook.com/FAnn.cz/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62391353", "shop": "perfumery"}, "addTags": {"brand": "FAnn", "brand:wikidata": "Q62391353", "name": "FAnn", "shop": "perfumery"}, "countryCodes": ["cz", "sk"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/perfumery/ICI PARIS XL": {"name": "ICI PARIS XL", "icon": "temaki-perfume", "imageURL": "https://graph.facebook.com/iciparisxlbe/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q769749", "shop": "perfumery"}, "addTags": {"brand": "ICI PARIS XL", "brand:wikidata": "Q769749", "brand:wikipedia": "en:ICI Paris XL", "name": "ICI PARIS XL", "shop": "perfumery"}, "countryCodes": ["be", "lu", "nl"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/perfumery/Marionnaud": {"name": "Marionnaud", "icon": "temaki-perfume", "imageURL": "https://graph.facebook.com/Marionnaud.France/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1129073", "shop": "perfumery"}, "addTags": {"brand": "Marionnaud", "brand:wikidata": "Q1129073", "brand:wikipedia": "fr:Marionnaud", "name": "Marionnaud", "shop": "perfumery"}, "countryCodes": ["at", "ch", "es", "fr", "it", "sk"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/perfumery/O Boticário": {"name": "O Boticário", "icon": "temaki-perfume", "imageURL": "https://graph.facebook.com/oboticario/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7073219", "shop": "perfumery"}, "addTags": {"brand": "O Boticário", "brand:wikidata": "Q7073219", "brand:wikipedia": "en:O Boticário", "name": "O Boticário", "shop": "perfumery"}, "countryCodes": ["br"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/pet/Das Futterhaus": {"name": "Das Futterhaus", "icon": "maki-dog-park", "imageURL": "https://graph.facebook.com/futterhaus.deutschland/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1167914", "shop": "pet"}, "addTags": {"brand": "Das Futterhaus", "brand:wikidata": "Q1167914", "brand:wikipedia": "de:Das Futterhaus", "name": "Das Futterhaus", "shop": "pet"}, "countryCodes": ["at", "de"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/pet/Faunatar": {"name": "Faunatar", "icon": "maki-dog-park", "imageURL": "https://graph.facebook.com/Faunatar/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q11859415", "shop": "pet"}, "addTags": {"brand": "Faunatar", "brand:wikidata": "Q11859415", "brand:wikipedia": "fi:Faunatar", "name": "Faunatar", "shop": "pet"}, "countryCodes": ["fi"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/pet/Fressnapf": {"name": "Fressnapf", "icon": "maki-dog-park", "imageURL": "https://graph.facebook.com/Fressnapf/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q875796", "shop": "pet"}, "addTags": {"brand": "Fressnapf", "brand:wikidata": "Q875796", "brand:wikipedia": "en:Fressnapf", "name": "Fressnapf", "shop": "pet"}, "countryCodes": ["at", "ch", "de", "hu", "lu"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -4569,8 +4583,8 @@
     "shop/pet/Бетховен": {"name": "Бетховен", "icon": "maki-dog-park", "imageURL": "https://graph.facebook.com/zoobethowenclub/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62390798", "shop": "pet"}, "addTags": {"brand": "Бетховен", "brand:wikidata": "Q62390798", "name": "Бетховен", "shop": "pet"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/pet/Четыре лапы": {"name": "Четыре лапы", "icon": "maki-dog-park", "imageURL": "https://graph.facebook.com/4laps/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q62390783", "shop": "pet"}, "addTags": {"brand": "Четыре лапы", "brand:wikidata": "Q62390783", "name": "Четыре лапы", "shop": "pet"}, "countryCodes": ["kz", "ru"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/photo/Kodak Express": {"name": "Kodak Express", "icon": "fas-camera-retro", "imageURL": "https://graph.facebook.com/kodakexpress/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6425126", "shop": "photo"}, "addTags": {"brand": "Kodak Express", "brand:wikidata": "Q6425126", "brand:wikipedia": "en:Kodak Express", "name": "Kodak Express", "shop": "photo"}, "terms": ["kodak"], "matchScore": 2, "suggestion": true},
-    "shop/printer_ink/Cartridge World": {"name": "Cartridge World", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/CartridgeWorldNewsUK/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5047439", "shop": "printer_ink"}, "addTags": {"brand": "Cartridge World", "brand:wikidata": "Q5047439", "brand:wikipedia": "en:Cartridge World", "name": "Cartridge World", "shop": "printer_ink"}, "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/rental/U-Haul": {"name": "U-Haul", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/uhaul/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7862902", "shop": "rental"}, "addTags": {"brand": "U-Haul", "brand:wikidata": "Q7862902", "brand:wikipedia": "en:U-Haul", "name": "U-Haul", "shop": "rental"}, "countryCodes": ["ca", "us"], "terms": ["uhaul neighborhood dealer"], "matchScore": 2, "suggestion": true},
+    "shop/printer_ink/Cartridge World": {"name": "Cartridge World", "icon": "fas-print", "imageURL": "https://graph.facebook.com/CartridgeWorldNewsUK/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5047439", "shop": "printer_ink"}, "addTags": {"brand": "Cartridge World", "brand:wikidata": "Q5047439", "brand:wikipedia": "en:Cartridge World", "name": "Cartridge World", "shop": "printer_ink"}, "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/rental/U-Haul": {"name": "U-Haul", "icon": "fas-dolly", "imageURL": "https://graph.facebook.com/uhaul/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7862902", "shop": "rental"}, "addTags": {"brand": "U-Haul", "brand:wikidata": "Q7862902", "brand:wikipedia": "en:U-Haul", "name": "U-Haul", "shop": "rental"}, "countryCodes": ["ca", "us"], "terms": ["uhaul neighborhood dealer"], "matchScore": 2, "suggestion": true},
     "shop/second_hand/Value Village": {"name": "Value Village", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/savers/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7428188", "shop": "second_hand"}, "addTags": {"brand": "Value Village", "brand:wikidata": "Q7428188", "brand:wikipedia": "en:Savers", "name": "Value Village", "shop": "second_hand"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/shoes/ABC Schuh-Center": {"name": "ABC Schuh-Center", "icon": "maki-shoe", "imageURL": "https://graph.facebook.com/ABCSchuhCenter/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q66007228", "shop": "shoes"}, "addTags": {"brand": "ABC Schuh-Center", "brand:wikidata": "Q66007228", "name": "ABC Schuh-Center", "shop": "shoes"}, "countryCodes": ["de"], "terms": ["abc schuhe"], "matchScore": 2, "suggestion": true},
     "shop/shoes/ABCマート": {"name": "ABCマート", "icon": "maki-shoe", "imageURL": "https://graph.facebook.com/172547912801644/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q11188787", "shop": "shoes"}, "addTags": {"brand": "ABCマート", "brand:ja": "ABCマート", "brand:wikidata": "Q11188787", "brand:wikipedia": "en:ABC-Mart", "name": "ABCマート", "name:ja": "ABCマート", "shop": "shoes"}, "countryCodes": ["jp"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -5117,28 +5131,28 @@
     "shop/ticket/Boutique Grandes Lignes": {"name": "Boutique Grandes Lignes", "icon": "fas-ticket-alt", "imageURL": "https://graph.facebook.com/SNCFOFFICIEL/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q13646", "shop": "ticket"}, "addTags": {"brand": "Boutique Grandes Lignes", "brand:wikidata": "Q13646", "brand:wikipedia": "fr:Société nationale des chemins de fer français", "name": "Boutique Grandes Lignes", "shop": "ticket"}, "countryCodes": ["fr"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/ticket/DB Reisezentrum": {"name": "DB Reisezentrum", "icon": "fas-ticket-alt", "imageURL": "https://graph.facebook.com/348950735250586/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q15842100", "shop": "ticket"}, "addTags": {"brand": "DB Reisezentrum", "brand:wikidata": "Q15842100", "brand:wikipedia": "de:Reisezentrum", "name": "DB Reisezentrum", "shop": "ticket"}, "countryCodes": ["de"], "terms": ["reisezentrum"], "matchScore": 2, "suggestion": true},
     "shop/ticket/Guichet Transilien": {"name": "Guichet Transilien", "icon": "fas-ticket-alt", "imageURL": "https://pbs.twimg.com/profile_images/776102546045865984/-NPGF3eG_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q389554", "shop": "ticket"}, "addTags": {"brand": "Guichet Transilien", "brand:wikidata": "Q389554", "brand:wikipedia": "fr:Transilien", "name": "Guichet Transilien", "shop": "ticket"}, "countryCodes": ["fr"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/tobacco/Nemzeti Dohánybolt": {"name": "Nemzeti Dohánybolt", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q20639040", "shop": "tobacco"}, "addTags": {"brand": "Nemzeti Dohánybolt", "brand:wikidata": "Q20639040", "brand:wikipedia": "en:Dohánybolt", "name": "Nemzeti Dohánybolt", "shop": "tobacco"}, "countryCodes": ["hu"], "terms": ["dohánybolt"], "matchScore": 2, "suggestion": true},
-    "shop/toys/Build-A-Bear Workshop": {"name": "Build-A-Bear Workshop", "icon": "fas-space-shuttle", "imageURL": "https://graph.facebook.com/Buildabear/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1002992", "shop": "toys"}, "addTags": {"brand": "Build-A-Bear Workshop", "brand:wikidata": "Q1002992", "brand:wikipedia": "en:Build-A-Bear Workshop", "name": "Build-A-Bear Workshop", "shop": "toys"}, "countryCodes": ["ca", "gb", "us"], "terms": ["build a bear"], "matchScore": 2, "suggestion": true},
-    "shop/toys/Dráčik": {"name": "Dráčik", "icon": "fas-space-shuttle", "imageURL": "https://graph.facebook.com/2185187834828492/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q57653669", "shop": "toys"}, "addTags": {"brand": "Dráčik", "brand:wikidata": "Q57653669", "name": "Dráčik", "shop": "toys"}, "countryCodes": ["cz", "sk"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/toys/Hawkin's Bazaar": {"name": "Hawkin's Bazaar", "icon": "fas-space-shuttle", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16983539", "shop": "toys"}, "addTags": {"brand": "Hawkin's Bazaar", "brand:wikidata": "Q16983539", "name": "Hawkin's Bazaar", "shop": "toys"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/toys/Intertoys": {"name": "Intertoys", "icon": "fas-space-shuttle", "imageURL": "https://graph.facebook.com/Intertoys/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1891407", "shop": "toys"}, "addTags": {"brand": "Intertoys", "brand:wikidata": "Q1891407", "brand:wikipedia": "nl:Intertoys", "name": "Intertoys", "shop": "toys"}, "countryCodes": ["be", "de", "nl"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/toys/JouéClub": {"name": "JouéClub", "icon": "fas-space-shuttle", "imageURL": "https://graph.facebook.com/JoueClubFr/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3187152", "shop": "toys"}, "addTags": {"brand": "JouéClub", "brand:wikidata": "Q3187152", "brand:wikipedia": "fr:JouéClub", "name": "JouéClub", "shop": "toys"}, "countryCodes": ["ad", "fr", "it", "lb", "ma", "qa"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/toys/King Jouet": {"name": "King Jouet", "icon": "fas-space-shuttle", "imageURL": "https://graph.facebook.com/KingJouet/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3197009", "shop": "toys"}, "addTags": {"brand": "King Jouet", "brand:en": "King Toy", "brand:wikidata": "Q3197009", "brand:wikipedia": "fr:King Jouet", "name": "King Jouet", "name:en": "King Toy", "shop": "toys"}, "countryCodes": ["fr"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/toys/La Grande Récré": {"name": "La Grande Récré", "icon": "fas-space-shuttle", "imageURL": "https://graph.facebook.com/lagranderecre/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3209556", "shop": "toys"}, "addTags": {"brand": "La Grande Récré", "brand:wikidata": "Q3209556", "brand:wikipedia": "fr:La Grande Récré (magasin)", "name": "La Grande Récré", "shop": "toys"}, "countryCodes": ["be", "ci", "es", "fr", "ma"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/toys/Lego": {"name": "Lego", "icon": "fas-space-shuttle", "imageURL": "https://graph.facebook.com/lego/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1063455", "shop": "toys"}, "addTags": {"brand": "Lego", "brand:wikidata": "Q1063455", "brand:wikipedia": "en:The Lego Group", "name": "Lego", "shop": "toys"}, "terms": ["lego store"], "matchScore": 2, "suggestion": true},
-    "shop/toys/Lekia": {"name": "Lekia", "icon": "fas-space-shuttle", "imageURL": "https://graph.facebook.com/lekiasweden/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q56303274", "shop": "toys"}, "addTags": {"brand": "Lekia", "brand:wikidata": "Q56303274", "brand:wikipedia": "sv:Lekia", "name": "Lekia", "shop": "toys"}, "countryCodes": ["no", "se"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/toys/Maxi Toys": {"name": "Maxi Toys", "icon": "fas-space-shuttle", "imageURL": "https://graph.facebook.com/MaxiToys.FR/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16663879", "shop": "toys"}, "addTags": {"brand": "Maxi Toys", "brand:wikidata": "Q16663879", "brand:wikipedia": "fr:Maxi Toys", "name": "Maxi Toys", "shop": "toys"}, "countryCodes": ["be", "de", "fr", "it"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/toys/Menkind": {"name": "Menkind", "icon": "fas-space-shuttle", "imageURL": "https://graph.facebook.com/Menkind/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q66725844", "shop": "toys"}, "addTags": {"brand": "Menkind", "brand:wikidata": "Q66725844", "name": "Menkind", "shop": "toys"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/toys/Smyths": {"name": "Smyths", "icon": "fas-space-shuttle", "imageURL": "https://pbs.twimg.com/profile_images/1067119121245048834/S_SSe3Yd_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7546779", "shop": "toys"}, "addTags": {"brand": "Smyths", "brand:wikidata": "Q7546779", "brand:wikipedia": "en:Smyths", "name": "Smyths", "shop": "toys"}, "countryCodes": ["at", "ch", "de", "gb", "ie"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/toys/The Entertainer": {"name": "The Entertainer", "icon": "fas-space-shuttle", "imageURL": "https://graph.facebook.com/TheEntertainerToyShop/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7732289", "shop": "toys"}, "addTags": {"brand": "The Entertainer", "brand:wikidata": "Q7732289", "brand:wikipedia": "en:The Entertainer (retailer)", "name": "The Entertainer", "shop": "toys"}, "countryCodes": ["gb", "je"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/toys/Toys R Us": {"name": "Toys R Us", "icon": "fas-space-shuttle", "imageURL": "https://graph.facebook.com/toysrus/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q696334", "shop": "toys"}, "addTags": {"brand": "Toys R Us", "brand:wikidata": "Q696334", "brand:wikipedia": "en:Toys \"R\" Us", "name": "Toys R Us", "shop": "toys"}, "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/toys/Детский мир": {"name": "Детский мир", "icon": "fas-space-shuttle", "imageURL": "https://graph.facebook.com/detmir/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16643324", "shop": "toys"}, "addTags": {"brand": "Детский мир", "brand:en": "Detskiy Mir", "brand:wikidata": "Q16643324", "brand:wikipedia": "en:Detsky Mir", "name": "Детский мир", "name:en": "Detskiy Mir", "shop": "toys"}, "countryCodes": ["kz", "ru"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/toys/Кораблик": {"name": "Кораблик", "icon": "fas-space-shuttle", "imageURL": "https://graph.facebook.com/korablik.ru/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q57653416", "shop": "toys"}, "addTags": {"brand": "Кораблик", "brand:wikidata": "Q57653416", "name": "Кораблик", "shop": "toys"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/trade/84 Lumber": {"name": "84 Lumber", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/84lumber/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4644779", "shop": "trade"}, "addTags": {"brand": "84 Lumber", "brand:wikidata": "Q4644779", "brand:wikipedia": "en:84 Lumber", "name": "84 Lumber", "shop": "trade", "trade": "building_supplies"}, "countryCodes": ["us"], "terms": ["84", "eighty-four lumber"], "matchScore": 2, "suggestion": true},
-    "shop/trade/Caterpillar": {"name": "Caterpillar", "icon": "maki-shop", "imageURL": "https://pbs.twimg.com/profile_images/1104430883761733639/nhptxXQp_bigger.png", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q459965", "shop": "trade"}, "addTags": {"brand": "Caterpillar", "brand:wikidata": "Q459965", "brand:wikipedia": "en:Caterpillar Inc.", "name": "Caterpillar", "shop": "trade", "short_name": "CAT", "trade": "agricultural_equipment"}, "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/trade/Fastenal": {"name": "Fastenal", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/fastenalcompany/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3067119", "shop": "trade"}, "addTags": {"brand": "Fastenal", "brand:wikidata": "Q3067119", "brand:wikipedia": "en:Fastenal", "name": "Fastenal", "shop": "trade"}, "countryCodes": ["ca", "pa", "us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/trade/Grainger": {"name": "Grainger", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/grainger/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1627894", "shop": "trade"}, "addTags": {"brand": "Grainger", "brand:wikidata": "Q1627894", "brand:wikipedia": "en:W. W. Grainger", "name": "Grainger", "shop": "trade"}, "countryCodes": ["ca", "us"], "terms": ["granger", "w. w. grainger"], "matchScore": 2, "suggestion": true},
-    "shop/trade/John Deere": {"name": "John Deere", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/JohnDeereUSCA/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q496302", "shop": "trade"}, "addTags": {"brand": "John Deere", "brand:wikidata": "Q496302", "brand:wikipedia": "en:John Deere", "name": "John Deere", "shop": "trade", "trade": "agricultural_equipment"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/tobacco/Nemzeti Dohánybolt": {"name": "Nemzeti Dohánybolt", "icon": "temaki-pipe", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q20639040", "shop": "tobacco"}, "addTags": {"brand": "Nemzeti Dohánybolt", "brand:wikidata": "Q20639040", "brand:wikipedia": "en:Dohánybolt", "name": "Nemzeti Dohánybolt", "shop": "tobacco"}, "countryCodes": ["hu"], "terms": ["dohánybolt"], "matchScore": 2, "suggestion": true},
+    "shop/toys/Build-A-Bear Workshop": {"name": "Build-A-Bear Workshop", "icon": "fas-rocket", "imageURL": "https://graph.facebook.com/Buildabear/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1002992", "shop": "toys"}, "addTags": {"brand": "Build-A-Bear Workshop", "brand:wikidata": "Q1002992", "brand:wikipedia": "en:Build-A-Bear Workshop", "name": "Build-A-Bear Workshop", "shop": "toys"}, "countryCodes": ["ca", "gb", "us"], "terms": ["build a bear"], "matchScore": 2, "suggestion": true},
+    "shop/toys/Dráčik": {"name": "Dráčik", "icon": "fas-rocket", "imageURL": "https://graph.facebook.com/2185187834828492/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q57653669", "shop": "toys"}, "addTags": {"brand": "Dráčik", "brand:wikidata": "Q57653669", "name": "Dráčik", "shop": "toys"}, "countryCodes": ["cz", "sk"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/toys/Hawkin's Bazaar": {"name": "Hawkin's Bazaar", "icon": "fas-rocket", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16983539", "shop": "toys"}, "addTags": {"brand": "Hawkin's Bazaar", "brand:wikidata": "Q16983539", "name": "Hawkin's Bazaar", "shop": "toys"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/toys/Intertoys": {"name": "Intertoys", "icon": "fas-rocket", "imageURL": "https://graph.facebook.com/Intertoys/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1891407", "shop": "toys"}, "addTags": {"brand": "Intertoys", "brand:wikidata": "Q1891407", "brand:wikipedia": "nl:Intertoys", "name": "Intertoys", "shop": "toys"}, "countryCodes": ["be", "de", "nl"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/toys/JouéClub": {"name": "JouéClub", "icon": "fas-rocket", "imageURL": "https://graph.facebook.com/JoueClubFr/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3187152", "shop": "toys"}, "addTags": {"brand": "JouéClub", "brand:wikidata": "Q3187152", "brand:wikipedia": "fr:JouéClub", "name": "JouéClub", "shop": "toys"}, "countryCodes": ["ad", "fr", "it", "lb", "ma", "qa"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/toys/King Jouet": {"name": "King Jouet", "icon": "fas-rocket", "imageURL": "https://graph.facebook.com/KingJouet/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3197009", "shop": "toys"}, "addTags": {"brand": "King Jouet", "brand:en": "King Toy", "brand:wikidata": "Q3197009", "brand:wikipedia": "fr:King Jouet", "name": "King Jouet", "name:en": "King Toy", "shop": "toys"}, "countryCodes": ["fr"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/toys/La Grande Récré": {"name": "La Grande Récré", "icon": "fas-rocket", "imageURL": "https://graph.facebook.com/lagranderecre/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3209556", "shop": "toys"}, "addTags": {"brand": "La Grande Récré", "brand:wikidata": "Q3209556", "brand:wikipedia": "fr:La Grande Récré (magasin)", "name": "La Grande Récré", "shop": "toys"}, "countryCodes": ["be", "ci", "es", "fr", "ma"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/toys/Lego": {"name": "Lego", "icon": "fas-rocket", "imageURL": "https://graph.facebook.com/lego/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1063455", "shop": "toys"}, "addTags": {"brand": "Lego", "brand:wikidata": "Q1063455", "brand:wikipedia": "en:The Lego Group", "name": "Lego", "shop": "toys"}, "terms": ["lego store"], "matchScore": 2, "suggestion": true},
+    "shop/toys/Lekia": {"name": "Lekia", "icon": "fas-rocket", "imageURL": "https://graph.facebook.com/lekiasweden/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q56303274", "shop": "toys"}, "addTags": {"brand": "Lekia", "brand:wikidata": "Q56303274", "brand:wikipedia": "sv:Lekia", "name": "Lekia", "shop": "toys"}, "countryCodes": ["no", "se"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/toys/Maxi Toys": {"name": "Maxi Toys", "icon": "fas-rocket", "imageURL": "https://graph.facebook.com/MaxiToys.FR/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16663879", "shop": "toys"}, "addTags": {"brand": "Maxi Toys", "brand:wikidata": "Q16663879", "brand:wikipedia": "fr:Maxi Toys", "name": "Maxi Toys", "shop": "toys"}, "countryCodes": ["be", "de", "fr", "it"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/toys/Menkind": {"name": "Menkind", "icon": "fas-rocket", "imageURL": "https://graph.facebook.com/Menkind/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q66725844", "shop": "toys"}, "addTags": {"brand": "Menkind", "brand:wikidata": "Q66725844", "name": "Menkind", "shop": "toys"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/toys/Smyths": {"name": "Smyths", "icon": "fas-rocket", "imageURL": "https://pbs.twimg.com/profile_images/1067119121245048834/S_SSe3Yd_bigger.jpg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7546779", "shop": "toys"}, "addTags": {"brand": "Smyths", "brand:wikidata": "Q7546779", "brand:wikipedia": "en:Smyths", "name": "Smyths", "shop": "toys"}, "countryCodes": ["at", "ch", "de", "gb", "ie"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/toys/The Entertainer": {"name": "The Entertainer", "icon": "fas-rocket", "imageURL": "https://graph.facebook.com/TheEntertainerToyShop/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7732289", "shop": "toys"}, "addTags": {"brand": "The Entertainer", "brand:wikidata": "Q7732289", "brand:wikipedia": "en:The Entertainer (retailer)", "name": "The Entertainer", "shop": "toys"}, "countryCodes": ["gb", "je"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/toys/Toys R Us": {"name": "Toys R Us", "icon": "fas-rocket", "imageURL": "https://graph.facebook.com/toysrus/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q696334", "shop": "toys"}, "addTags": {"brand": "Toys R Us", "brand:wikidata": "Q696334", "brand:wikipedia": "en:Toys \"R\" Us", "name": "Toys R Us", "shop": "toys"}, "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/toys/Детский мир": {"name": "Детский мир", "icon": "fas-rocket", "imageURL": "https://graph.facebook.com/detmir/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q16643324", "shop": "toys"}, "addTags": {"brand": "Детский мир", "brand:en": "Detskiy Mir", "brand:wikidata": "Q16643324", "brand:wikipedia": "en:Detsky Mir", "name": "Детский мир", "name:en": "Detskiy Mir", "shop": "toys"}, "countryCodes": ["kz", "ru"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/toys/Кораблик": {"name": "Кораблик", "icon": "fas-rocket", "imageURL": "https://graph.facebook.com/korablik.ru/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q57653416", "shop": "toys"}, "addTags": {"brand": "Кораблик", "brand:wikidata": "Q57653416", "name": "Кораблик", "shop": "toys"}, "countryCodes": ["ru"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/trade/84 Lumber": {"name": "84 Lumber", "icon": "temaki-tools", "imageURL": "https://graph.facebook.com/84lumber/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4644779", "shop": "trade"}, "addTags": {"brand": "84 Lumber", "brand:wikidata": "Q4644779", "brand:wikipedia": "en:84 Lumber", "name": "84 Lumber", "shop": "trade", "trade": "building_supplies"}, "countryCodes": ["us"], "terms": ["84", "eighty-four lumber"], "matchScore": 2, "suggestion": true},
+    "shop/trade/Caterpillar": {"name": "Caterpillar", "icon": "temaki-tools", "imageURL": "https://pbs.twimg.com/profile_images/1104430883761733639/nhptxXQp_bigger.png", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q459965", "shop": "trade"}, "addTags": {"brand": "Caterpillar", "brand:wikidata": "Q459965", "brand:wikipedia": "en:Caterpillar Inc.", "name": "Caterpillar", "shop": "trade", "short_name": "CAT", "trade": "agricultural_equipment"}, "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/trade/Fastenal": {"name": "Fastenal", "icon": "temaki-tools", "imageURL": "https://graph.facebook.com/fastenalcompany/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q3067119", "shop": "trade"}, "addTags": {"brand": "Fastenal", "brand:wikidata": "Q3067119", "brand:wikipedia": "en:Fastenal", "name": "Fastenal", "shop": "trade"}, "countryCodes": ["ca", "pa", "us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/trade/Grainger": {"name": "Grainger", "icon": "temaki-tools", "imageURL": "https://graph.facebook.com/grainger/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q1627894", "shop": "trade"}, "addTags": {"brand": "Grainger", "brand:wikidata": "Q1627894", "brand:wikipedia": "en:W. W. Grainger", "name": "Grainger", "shop": "trade"}, "countryCodes": ["ca", "us"], "terms": ["granger", "w. w. grainger"], "matchScore": 2, "suggestion": true},
+    "shop/trade/John Deere": {"name": "John Deere", "icon": "temaki-tools", "imageURL": "https://graph.facebook.com/JohnDeereUSCA/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q496302", "shop": "trade"}, "addTags": {"brand": "John Deere", "brand:wikidata": "Q496302", "brand:wikipedia": "en:John Deere", "name": "John Deere", "shop": "trade", "trade": "agricultural_equipment"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/travel_agency/American Automobile Association": {"name": "American Automobile Association", "icon": "fas-suitcase", "imageURL": "https://graph.facebook.com/AAAFanPage/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q463436", "shop": "travel_agency"}, "addTags": {"brand": "American Automobile Association", "brand:wikidata": "Q463436", "brand:wikipedia": "en:American Automobile Association", "name": "American Automobile Association", "shop": "travel_agency", "short_name": "AAA"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/travel_agency/Coral Travel": {"name": "Coral Travel", "icon": "fas-suitcase", "imageURL": "https://graph.facebook.com/coraltravelofficial/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q58011479", "shop": "travel_agency"}, "addTags": {"brand": "Coral Travel", "brand:wikidata": "Q58011479", "name": "Coral Travel", "shop": "travel_agency"}, "countryCodes": ["pl", "ru", "ua"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/travel_agency/D-reizen": {"name": "D-reizen", "icon": "fas-suitcase", "imageURL": "https://graph.facebook.com/dreizenvakanties/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2445498", "shop": "travel_agency"}, "addTags": {"brand": "D-reizen", "brand:wikidata": "Q2445498", "brand:wikipedia": "nl:D-reizen", "name": "D-reizen", "shop": "travel_agency"}, "countryCodes": ["nl"], "terms": [], "matchScore": 2, "suggestion": true},
@@ -5156,16 +5170,16 @@
     "shop/travel_agency/The Co-operative Travel": {"name": "The Co-operative Travel", "icon": "fas-suitcase", "imageURL": "https://graph.facebook.com/cooperativetraveluk/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q7726526", "shop": "travel_agency"}, "addTags": {"brand": "The Co-operative Travel", "brand:wikidata": "Q7726526", "brand:wikipedia": "en:The Co-operative Travel", "name": "The Co-operative Travel", "shop": "travel_agency"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/travel_agency/Thomas Cook": {"name": "Thomas Cook", "icon": "fas-suitcase", "imageURL": "https://graph.facebook.com/thomascook/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2141800", "shop": "travel_agency"}, "addTags": {"brand": "Thomas Cook", "brand:wikidata": "Q2141800", "brand:wikipedia": "en:Thomas Cook Group", "name": "Thomas Cook", "shop": "travel_agency"}, "terms": [], "matchScore": 2, "suggestion": true},
     "shop/travel_agency/Поехали с нами": {"name": "Поехали с нами", "icon": "fas-suitcase", "imageURL": "https://graph.facebook.com/PoehaliSNamiua/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q25439141", "shop": "travel_agency"}, "addTags": {"brand": "Поехали с нами", "brand:wikidata": "Q25439141", "brand:wikipedia": "uk:Поїхали з нами", "name": "Поехали с нами", "shop": "travel_agency"}, "countryCodes": ["ua"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/tyres/Big O Tires": {"name": "Big O Tires", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/BigOTires/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4906085", "shop": "tyres"}, "addTags": {"brand": "Big O Tires", "brand:wikidata": "Q4906085", "brand:wikipedia": "en:Big O Tires", "name": "Big O Tires", "shop": "tyres"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/tyres/Bridgestone": {"name": "Bridgestone", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/BridgestoneTires/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q179433", "shop": "tyres"}, "addTags": {"brand": "Bridgestone", "brand:wikidata": "Q179433", "brand:wikipedia": "en:Bridgestone", "name": "Bridgestone", "shop": "tyres"}, "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/tyres/Discount Tire": {"name": "Discount Tire", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/DiscountTire/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5281735", "shop": "tyres"}, "addTags": {"brand": "Discount Tire", "brand:wikidata": "Q5281735", "brand:wikipedia": "en:Discount Tire", "name": "Discount Tire", "shop": "tyres"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/tyres/Express Oil Change & Tire Engineers": {"name": "Express Oil Change & Tire Engineers", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/expressoil/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q39057654", "shop": "tyres"}, "addTags": {"brand": "Express Oil Change & Tire Engineers", "brand:wikidata": "Q39057654", "brand:wikipedia": "en:Express Oil Change & Tire Engineers", "name": "Express Oil Change & Tire Engineers", "shop": "tyres"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/tyres/Les Schwab Tire Center": {"name": "Les Schwab Tire Center", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/lesschwab/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6529977", "shop": "tyres"}, "addTags": {"brand": "Les Schwab Tire Center", "brand:wikidata": "Q6529977", "brand:wikipedia": "en:Les Schwab Tire Centers", "name": "Les Schwab Tire Center", "shop": "tyres"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/tyres/Michelin": {"name": "Michelin", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/MichelinSustainableMobility/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q151107", "shop": "tyres"}, "addTags": {"brand": "Michelin", "brand:wikidata": "Q151107", "brand:wikipedia": "en:Michelin", "name": "Michelin", "shop": "tyres"}, "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/tyres/Tire Discounters": {"name": "Tire Discounters", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/TireDiscounters/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q29093639", "shop": "tyres"}, "addTags": {"brand": "Tire Discounters", "brand:wikidata": "Q29093639", "brand:wikipedia": "en:Tire Discounters", "name": "Tire Discounters", "shop": "tyres"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/tyres/Tires Plus": {"name": "Tires Plus", "icon": "maki-shop", "imageURL": "https://pbs.twimg.com/profile_images/378800000821067695/d59e0a647859aabacc690ebb962670aa_bigger.jpeg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64015091", "shop": "tyres"}, "addTags": {"brand": "Tires Plus", "brand:wikidata": "Q64015091", "name": "Tires Plus", "shop": "tyres"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/tyres/Vianor": {"name": "Vianor", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/VianorSuomi/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q10714920", "shop": "tyres"}, "addTags": {"brand": "Vianor", "brand:wikidata": "Q10714920", "brand:wikipedia": "sv:Vianor", "name": "Vianor", "shop": "tyres"}, "terms": [], "matchScore": 2, "suggestion": true},
-    "shop/vacuum_cleaner/Oreck": {"name": "Oreck", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/oreck/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q57273844", "shop": "vacuum_cleaner"}, "addTags": {"brand": "Oreck", "brand:wikidata": "Q57273844", "name": "Oreck", "shop": "vacuum_cleaner"}, "countryCodes": ["us"], "terms": ["oreck vacuums"], "matchScore": 2, "suggestion": true},
+    "shop/tyres/Big O Tires": {"name": "Big O Tires", "icon": "temaki-tire", "imageURL": "https://graph.facebook.com/BigOTires/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4906085", "shop": "tyres"}, "addTags": {"brand": "Big O Tires", "brand:wikidata": "Q4906085", "brand:wikipedia": "en:Big O Tires", "name": "Big O Tires", "shop": "tyres"}, "countryCodes": ["ca", "us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/tyres/Bridgestone": {"name": "Bridgestone", "icon": "temaki-tire", "imageURL": "https://graph.facebook.com/BridgestoneTires/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q179433", "shop": "tyres"}, "addTags": {"brand": "Bridgestone", "brand:wikidata": "Q179433", "brand:wikipedia": "en:Bridgestone", "name": "Bridgestone", "shop": "tyres"}, "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/tyres/Discount Tire": {"name": "Discount Tire", "icon": "temaki-tire", "imageURL": "https://graph.facebook.com/DiscountTire/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q5281735", "shop": "tyres"}, "addTags": {"brand": "Discount Tire", "brand:wikidata": "Q5281735", "brand:wikipedia": "en:Discount Tire", "name": "Discount Tire", "shop": "tyres"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/tyres/Express Oil Change & Tire Engineers": {"name": "Express Oil Change & Tire Engineers", "icon": "temaki-tire", "imageURL": "https://graph.facebook.com/expressoil/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q39057654", "shop": "tyres"}, "addTags": {"brand": "Express Oil Change & Tire Engineers", "brand:wikidata": "Q39057654", "brand:wikipedia": "en:Express Oil Change & Tire Engineers", "name": "Express Oil Change & Tire Engineers", "shop": "tyres"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/tyres/Les Schwab Tire Center": {"name": "Les Schwab Tire Center", "icon": "temaki-tire", "imageURL": "https://graph.facebook.com/lesschwab/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q6529977", "shop": "tyres"}, "addTags": {"brand": "Les Schwab Tire Center", "brand:wikidata": "Q6529977", "brand:wikipedia": "en:Les Schwab Tire Centers", "name": "Les Schwab Tire Center", "shop": "tyres"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/tyres/Michelin": {"name": "Michelin", "icon": "temaki-tire", "imageURL": "https://graph.facebook.com/MichelinSustainableMobility/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q151107", "shop": "tyres"}, "addTags": {"brand": "Michelin", "brand:wikidata": "Q151107", "brand:wikipedia": "en:Michelin", "name": "Michelin", "shop": "tyres"}, "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/tyres/Tire Discounters": {"name": "Tire Discounters", "icon": "temaki-tire", "imageURL": "https://graph.facebook.com/TireDiscounters/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q29093639", "shop": "tyres"}, "addTags": {"brand": "Tire Discounters", "brand:wikidata": "Q29093639", "brand:wikipedia": "en:Tire Discounters", "name": "Tire Discounters", "shop": "tyres"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/tyres/Tires Plus": {"name": "Tires Plus", "icon": "temaki-tire", "imageURL": "https://pbs.twimg.com/profile_images/378800000821067695/d59e0a647859aabacc690ebb962670aa_bigger.jpeg", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q64015091", "shop": "tyres"}, "addTags": {"brand": "Tires Plus", "brand:wikidata": "Q64015091", "name": "Tires Plus", "shop": "tyres"}, "countryCodes": ["us"], "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/tyres/Vianor": {"name": "Vianor", "icon": "temaki-tire", "imageURL": "https://graph.facebook.com/VianorSuomi/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q10714920", "shop": "tyres"}, "addTags": {"brand": "Vianor", "brand:wikidata": "Q10714920", "brand:wikipedia": "sv:Vianor", "name": "Vianor", "shop": "tyres"}, "terms": [], "matchScore": 2, "suggestion": true},
+    "shop/vacuum_cleaner/Oreck": {"name": "Oreck", "icon": "temaki-vacuum", "imageURL": "https://graph.facebook.com/oreck/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q57273844", "shop": "vacuum_cleaner"}, "addTags": {"brand": "Oreck", "brand:wikidata": "Q57273844", "name": "Oreck", "shop": "vacuum_cleaner"}, "countryCodes": ["us"], "terms": ["oreck vacuums"], "matchScore": 2, "suggestion": true},
     "shop/variety_store/99 Cents Only Stores": {"name": "99 Cents Only Stores", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/99CentsOnly/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4646294", "shop": "variety_store"}, "addTags": {"brand": "99 Cents Only Stores", "brand:wikidata": "Q4646294", "brand:wikipedia": "en:99 Cents Only Stores", "name": "99 Cents Only Stores", "shop": "variety_store"}, "countryCodes": ["us"], "terms": ["99 cent only stores", "99 cents only"], "matchScore": 2, "suggestion": true},
     "shop/variety_store/Action": {"name": "Action", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/actiondotcom/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q2634111", "shop": "variety_store"}, "addTags": {"brand": "Action", "brand:wikidata": "Q2634111", "brand:wikipedia": "nl:Action (winkel)", "name": "Action", "shop": "variety_store"}, "countryCodes": ["at", "be", "de", "fr", "nl", "pl"], "terms": [], "matchScore": 2, "suggestion": true},
     "shop/variety_store/B&M Bargains": {"name": "B&M Bargains", "icon": "maki-shop", "imageURL": "https://graph.facebook.com/bmstores/picture?type=large", "geometry": ["point", "area"], "tags": {"brand:wikidata": "Q4836931", "shop": "variety_store"}, "addTags": {"brand": "B&M Bargains", "brand:wikidata": "Q4836931", "brand:wikipedia": "en:B & M", "name": "B&M Bargains", "shop": "variety_store"}, "countryCodes": ["gb"], "terms": [], "matchScore": 2, "suggestion": true},
diff --git a/data/presets/presets/_playground.json b/data/presets/presets/_playground.json
index 747d37b1a..b5fe6555b 100644
--- a/data/presets/presets/_playground.json
+++ b/data/presets/presets/_playground.json
@@ -2,11 +2,18 @@
     "icon": "maki-playground",
     "fields": [
         "playground",
+        "playground/theme",
         "min_age",
         "max_age",
         "wheelchair",
+        "blind",
         "height"
     ],
+    "moreFields": [
+        "access_simple",
+        "colour",
+        "ref"
+    ],
     "geometry": [
         "point",
         "vertex",
diff --git a/data/presets/presets/advertising/billboard.json b/data/presets/presets/advertising/billboard.json
index 1259e8888..2e4def2ab 100644
--- a/data/presets/presets/advertising/billboard.json
+++ b/data/presets/presets/advertising/billboard.json
@@ -1,7 +1,7 @@
 {
     "fields": [
-       "direction",
-       "lit"
+        "direction",
+        "lit"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/advertising/column.json b/data/presets/presets/advertising/column.json
index 8be158ff1..7d893a91c 100644
--- a/data/presets/presets/advertising/column.json
+++ b/data/presets/presets/advertising/column.json
@@ -1,7 +1,7 @@
 {
     "icon": "temaki-storage_tank",
     "fields": [
-       "lit"
+        "lit"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/aerialway/mixed_lift.json b/data/presets/presets/aerialway/mixed_lift.json
index 43554e19d..c669a6eb1 100644
--- a/data/presets/presets/aerialway/mixed_lift.json
+++ b/data/presets/presets/aerialway/mixed_lift.json
@@ -3,13 +3,13 @@
         "line"
     ],
     "fields": [
-      "name",
-      "oneway_yes",
-      "aerialway/occupancy",
-      "aerialway/capacity",
-      "aerialway/duration",
-      "aerialway/bubble",
-      "aerialway/heating"
+        "name",
+        "oneway_yes",
+        "aerialway/occupancy",
+        "aerialway/capacity",
+        "aerialway/duration",
+        "aerialway/bubble",
+        "aerialway/heating"
     ],
     "tags": {
         "aerialway": "mixed_lift"
diff --git a/data/presets/presets/aeroway/spaceport.json b/data/presets/presets/aeroway/spaceport.json
new file mode 100644
index 000000000..437d81816
--- /dev/null
+++ b/data/presets/presets/aeroway/spaceport.json
@@ -0,0 +1,34 @@
+{
+    "icon": "fas-space-shuttle",
+    "geometry": [
+        "area",
+        "point"
+    ],
+    "fields": [
+        "name",
+        "operator",
+        "access_simple",
+        "website",
+        "wikidata"
+    ],
+    "moreFields": [
+        "email",
+        "fax",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid",
+        "phone"
+    ],
+    "terms": [
+        "cosmodrome",
+        "rocket launch center",
+        "rocket launch complex",
+        "rocket launch site",
+        "rocket range",
+        "space port"
+    ],
+    "tags": {
+        "aeroway": "spaceport"
+    },
+    "name": "Spaceport"
+}
diff --git a/data/presets/presets/aeroway/terminal.json b/data/presets/presets/aeroway/terminal.json
index d1c978626..a86d57be7 100644
--- a/data/presets/presets/aeroway/terminal.json
+++ b/data/presets/presets/aeroway/terminal.json
@@ -14,8 +14,8 @@
         "building_area"
     ],
     "moreFields": [
-        "wheelchair",
-        "smoking"
+        "smoking",
+        "wheelchair"
     ],
     "tags": {
         "aeroway": "terminal"
diff --git a/data/presets/presets/amenity/_embassy.json b/data/presets/presets/amenity/_embassy.json
index 74bdfa3f8..c2822d5e1 100644
--- a/data/presets/presets/amenity/_embassy.json
+++ b/data/presets/presets/amenity/_embassy.json
@@ -7,10 +7,10 @@
         "building_area"
     ],
     "moreFields": [
-        "website",
-        "phone",
         "email",
         "fax",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/animal_boarding.json b/data/presets/presets/amenity/animal_boarding.json
index ef7554cc6..519afc83b 100644
--- a/data/presets/presets/amenity/animal_boarding.json
+++ b/data/presets/presets/amenity/animal_boarding.json
@@ -9,11 +9,12 @@
         "animal_boarding"
     ],
     "moreFields": [
-        "payment_multi",
-        "website",
-        "phone",
         "email",
         "fax",
+        "level",
+        "payment_multi",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/animal_breeding.json b/data/presets/presets/amenity/animal_breeding.json
index 40f87cf57..d58ca4667 100644
--- a/data/presets/presets/amenity/animal_breeding.json
+++ b/data/presets/presets/amenity/animal_breeding.json
@@ -9,10 +9,11 @@
         "animal_breeding"
     ],
     "moreFields": [
-        "website",
-        "phone",
         "email",
         "fax",
+        "level",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/animal_shelter.json b/data/presets/presets/amenity/animal_shelter.json
index f514b66d7..f3ac8bcb4 100644
--- a/data/presets/presets/amenity/animal_shelter.json
+++ b/data/presets/presets/amenity/animal_shelter.json
@@ -9,10 +9,11 @@
         "animal_shelter"
     ],
     "moreFields": [
-        "website",
-        "phone",
         "email",
         "fax",
+        "level",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/arts_centre.json b/data/presets/presets/amenity/arts_centre.json
index 5b8a022fb..9a658be81 100644
--- a/data/presets/presets/amenity/arts_centre.json
+++ b/data/presets/presets/amenity/arts_centre.json
@@ -15,6 +15,7 @@
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "level",
         "payment_multi",
         "phone",
         "website",
@@ -24,8 +25,7 @@
         "point",
         "area"
     ],
-    "terms": [
-    ],
+    "terms": [],
     "tags": {
         "amenity": "arts_centre"
     },
diff --git a/data/presets/presets/amenity/atm.json b/data/presets/presets/amenity/atm.json
index f1c4cab84..f84229a45 100644
--- a/data/presets/presets/amenity/atm.json
+++ b/data/presets/presets/amenity/atm.json
@@ -12,6 +12,7 @@
         "covered",
         "height",
         "indoor",
+        "level",
         "lit",
         "manufacturer",
         "name",
diff --git a/data/presets/presets/amenity/bank.json b/data/presets/presets/amenity/bank.json
index 6657298aa..26310e19b 100644
--- a/data/presets/presets/amenity/bank.json
+++ b/data/presets/presets/amenity/bank.json
@@ -1,7 +1,7 @@
 {
     "icon": "maki-bank",
     "fields": [
-	    "name",
+        "name",
         "operator",
         "address",
         "building_area",
@@ -16,6 +16,7 @@
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "level",
         "opening_hours",
         "phone",
         "website",
diff --git a/data/presets/presets/amenity/bar.json b/data/presets/presets/amenity/bar.json
index 44ece7a95..ad1696397 100644
--- a/data/presets/presets/amenity/bar.json
+++ b/data/presets/presets/amenity/bar.json
@@ -15,6 +15,7 @@
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "level",
         "microbrewery",
         "opening_hours",
         "payment_multi",
diff --git a/data/presets/presets/amenity/bench.json b/data/presets/presets/amenity/bench.json
index 419a05a79..a0cbbbbf3 100644
--- a/data/presets/presets/amenity/bench.json
+++ b/data/presets/presets/amenity/bench.json
@@ -10,6 +10,7 @@
         "access_simple",
         "height",
         "inscription",
+        "level",
         "lit",
         "manufacturer",
         "operator"
diff --git a/data/presets/presets/amenity/bicycle_parking.json b/data/presets/presets/amenity/bicycle_parking.json
index abffacc51..d314ffd4d 100644
--- a/data/presets/presets/amenity/bicycle_parking.json
+++ b/data/presets/presets/amenity/bicycle_parking.json
@@ -14,6 +14,7 @@
     "moreFields": [
         "colour",
         "indoor",
+        "level",
         "lit"
     ],
     "geometry": [
@@ -22,7 +23,9 @@
         "area"
     ],
     "terms": [
-        "bike"
+        "bike",
+        "cycle parking",
+        "cycling"
     ],
     "tags": {
         "amenity": "bicycle_parking"
diff --git a/data/presets/presets/amenity/bicycle_parking/building.json b/data/presets/presets/amenity/bicycle_parking/building.json
index c1e4c64c2..3489b45a9 100644
--- a/data/presets/presets/amenity/bicycle_parking/building.json
+++ b/data/presets/presets/amenity/bicycle_parking/building.json
@@ -18,9 +18,11 @@
         "key": "bicycle_parking"
     },
     "terms": [
+        "Bike Parking Station",
+        "cycle parking",
+        "cycling",
         "Multi-Storey Bicycle Park",
-        "Multi-Storey Bike Park",
-        "Bike Parking Station"
+        "Multi-Storey Bike Park"
     ],
     "name": "Bicycle Parking Garage"
 }
diff --git a/data/presets/presets/amenity/bicycle_parking/lockers.json b/data/presets/presets/amenity/bicycle_parking/lockers.json
index 34b60afc1..ba78e0187 100644
--- a/data/presets/presets/amenity/bicycle_parking/lockers.json
+++ b/data/presets/presets/amenity/bicycle_parking/lockers.json
@@ -13,6 +13,8 @@
         "key": "bicycle_parking"
     },
     "terms": [
+        "cycle locker",
+        "cycling",
         "Bike Lockers"
     ],
     "name": "Bicycle Lockers"
diff --git a/data/presets/presets/amenity/bicycle_parking/shed.json b/data/presets/presets/amenity/bicycle_parking/shed.json
index cbd45b90a..f8fa3d03b 100644
--- a/data/presets/presets/amenity/bicycle_parking/shed.json
+++ b/data/presets/presets/amenity/bicycle_parking/shed.json
@@ -17,6 +17,8 @@
         "key": "bicycle_parking"
     },
     "terms": [
+        "cycle shed",
+        "cycling",
         "Bike Shed"
     ],
     "name": "Bicycle Shed"
diff --git a/data/presets/presets/amenity/bicycle_rental.json b/data/presets/presets/amenity/bicycle_rental.json
index 26079e601..d76175bd8 100644
--- a/data/presets/presets/amenity/bicycle_rental.json
+++ b/data/presets/presets/amenity/bicycle_rental.json
@@ -10,9 +10,10 @@
     ],
     "moreFields": [
         "address",
-        "email",
         "covered",
+        "email",
         "fax",
+        "level",
         "opening_hours",
         "phone",
         "website",
@@ -29,8 +30,10 @@
         "bikeshare",
         "bike share",
         "bicycle share",
-        "hub",
-        "dock"
+        "cycle dock",
+        "cycle hub",
+        "cycleshare",
+        "cycling"
     ],
     "tags": {
         "amenity": "bicycle_rental"
diff --git a/data/presets/presets/amenity/bicycle_repair_station.json b/data/presets/presets/amenity/bicycle_repair_station.json
index 1120e8d01..ebd5fa92a 100644
--- a/data/presets/presets/amenity/bicycle_repair_station.json
+++ b/data/presets/presets/amenity/bicycle_repair_station.json
@@ -13,6 +13,7 @@
         "colour",
         "covered",
         "indoor",
+        "level",
         "manufacturer"
     ],
     "geometry": [
@@ -20,13 +21,13 @@
         "vertex"
     ],
     "terms": [
-        "bike",
-        "repair",
-        "chain",
-        "pump",
-        "tools",
-        "stand",
-        "multitool"
+        "bike chain",
+        "bike multitool",
+        "bike repair",
+        "bike tools",
+        "cycle pump",
+        "cycle repair",
+        "cycling"
     ],
     "tags": {
         "amenity": "bicycle_repair_station"
diff --git a/data/presets/presets/amenity/boat_rental.json b/data/presets/presets/amenity/boat_rental.json
index 3218ddf31..b7c4be724 100644
--- a/data/presets/presets/amenity/boat_rental.json
+++ b/data/presets/presets/amenity/boat_rental.json
@@ -10,10 +10,10 @@
     ],
     "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
         "fax",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/bureau_de_change.json b/data/presets/presets/amenity/bureau_de_change.json
index d2add9ae0..4d9e6759a 100644
--- a/data/presets/presets/amenity/bureau_de_change.json
+++ b/data/presets/presets/amenity/bureau_de_change.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-bank",
+    "icon": "temaki-money_hand",
     "fields": [
         "name",
         "operator",
@@ -9,11 +9,12 @@
         "building_area"
     ],
     "moreFields": [
-        "opening_hours",
-        "website",
-        "phone",
         "email",
         "fax",
+        "level",
+        "opening_hours",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/cafe.json b/data/presets/presets/amenity/cafe.json
index ff784ea2f..d5547b33b 100644
--- a/data/presets/presets/amenity/cafe.json
+++ b/data/presets/presets/amenity/cafe.json
@@ -18,6 +18,7 @@
         "email",
         "fax",
         "internet_access/ssid",
+        "level",
         "min_age",
         "not/name",
         "opening_hours",
diff --git a/data/presets/presets/amenity/car_pooling.json b/data/presets/presets/amenity/car_pooling.json
index 8f04613c2..2e7801b91 100644
--- a/data/presets/presets/amenity/car_pooling.json
+++ b/data/presets/presets/amenity/car_pooling.json
@@ -10,10 +10,10 @@
         "lit"
     ],
     "moreFields": [
-        "website",
-        "phone",
         "email",
         "fax",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/car_rental.json b/data/presets/presets/amenity/car_rental.json
index 4b33a4b6d..d570c1943 100644
--- a/data/presets/presets/amenity/car_rental.json
+++ b/data/presets/presets/amenity/car_rental.json
@@ -9,10 +9,10 @@
     ],
     "moreFields": [
         "brand",
-        "website",
-        "phone",
         "email",
         "fax",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/car_sharing.json b/data/presets/presets/amenity/car_sharing.json
index 3afa5b55b..3f8756e29 100644
--- a/data/presets/presets/amenity/car_sharing.json
+++ b/data/presets/presets/amenity/car_sharing.json
@@ -10,11 +10,11 @@
         "supervised"
     ],
     "moreFields": [
-        "lit",
-        "website",
-        "phone",
         "email",
         "fax",
+        "lit",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/car_wash.json b/data/presets/presets/amenity/car_wash.json
index 71191c521..7f8cfdb8d 100644
--- a/data/presets/presets/amenity/car_wash.json
+++ b/data/presets/presets/amenity/car_wash.json
@@ -10,10 +10,10 @@
         "self_service"
     ],
     "moreFields": [
-        "website",
-        "phone",
         "email",
         "fax",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/casino.json b/data/presets/presets/amenity/casino.json
index 00bf7d535..96b0a756c 100644
--- a/data/presets/presets/amenity/casino.json
+++ b/data/presets/presets/amenity/casino.json
@@ -15,6 +15,7 @@
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "level",
         "min_age",
         "payment_multi",
         "phone",
diff --git a/data/presets/presets/amenity/charging_station.json b/data/presets/presets/amenity/charging_station.json
index 3e51a1580..f8125b461 100644
--- a/data/presets/presets/amenity/charging_station.json
+++ b/data/presets/presets/amenity/charging_station.json
@@ -12,6 +12,7 @@
     "moreFields": [
         "brand",
         "covered",
+        "level",
         "manufacturer"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/childcare.json b/data/presets/presets/amenity/childcare.json
index 184200d98..7444dd577 100644
--- a/data/presets/presets/amenity/childcare.json
+++ b/data/presets/presets/amenity/childcare.json
@@ -11,8 +11,9 @@
     "moreFields": [
         "email",
         "fax",
-        "min_age",
+        "level",
         "max_age",
+        "min_age",
         "payment_multi",
         "phone",
         "website",
diff --git a/data/presets/presets/amenity/cinema.json b/data/presets/presets/amenity/cinema.json
index eea52e86a..5c8b82924 100644
--- a/data/presets/presets/amenity/cinema.json
+++ b/data/presets/presets/amenity/cinema.json
@@ -12,6 +12,7 @@
         "air_conditioning",
         "email",
         "fax",
+        "level",
         "min_age",
         "phone",
         "website",
diff --git a/data/presets/presets/amenity/clinic.json b/data/presets/presets/amenity/clinic.json
index 16d477d7d..720fbc644 100644
--- a/data/presets/presets/amenity/clinic.json
+++ b/data/presets/presets/amenity/clinic.json
@@ -11,11 +11,12 @@
     ],
     "moreFields": [
         "air_conditioning",
-        "payment_multi",
-        "website",
-        "phone",
         "email",
         "fax",
+        "level",
+        "payment_multi",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/clinic/abortion.json b/data/presets/presets/amenity/clinic/abortion.json
index c6b0d820a..54305eaac 100644
--- a/data/presets/presets/amenity/clinic/abortion.json
+++ b/data/presets/presets/amenity/clinic/abortion.json
@@ -4,8 +4,7 @@
         "point",
         "area"
     ],
-    "terms": [
-    ],
+    "terms": [],
     "tags": {
         "amenity": "clinic",
         "healthcare": "clinic",
diff --git a/data/presets/presets/amenity/clock.json b/data/presets/presets/amenity/clock.json
index 6ab6dcc6e..03175dc37 100644
--- a/data/presets/presets/amenity/clock.json
+++ b/data/presets/presets/amenity/clock.json
@@ -12,6 +12,7 @@
         "covered",
         "height",
         "indoor",
+        "level",
         "lit",
         "manufacturer"
     ],
@@ -19,7 +20,7 @@
         "point",
         "vertex"
     ],
-    "terms":[
+    "terms": [
         "time"
     ],
     "tags": {
diff --git a/data/presets/presets/amenity/college.json b/data/presets/presets/amenity/college.json
index 7d7884509..27c8c7338 100644
--- a/data/presets/presets/amenity/college.json
+++ b/data/presets/presets/amenity/college.json
@@ -10,12 +10,12 @@
         "internet_access/fee"
     ],
     "moreFields": [
-        "religion",
         "denomination",
-        "internet_access/ssid",
-        "phone",
         "email",
         "fax",
+        "internet_access/ssid",
+        "phone",
+        "religion",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/compressed_air.json b/data/presets/presets/amenity/compressed_air.json
index a1d626d7e..f6c3a045c 100644
--- a/data/presets/presets/amenity/compressed_air.json
+++ b/data/presets/presets/amenity/compressed_air.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-car",
+    "icon": "fas-tachometer-alt",
     "fields": [
         "operator",
         "access_simple",
diff --git a/data/presets/presets/amenity/conference_centre.json b/data/presets/presets/amenity/conference_centre.json
index fbece2906..d6921622d 100644
--- a/data/presets/presets/amenity/conference_centre.json
+++ b/data/presets/presets/amenity/conference_centre.json
@@ -8,7 +8,7 @@
         "website",
         "internet_access"
     ],
-    "moreFields" : [
+    "moreFields": [
         "air_conditioning",
         "email",
         "fax",
diff --git a/data/presets/presets/amenity/courthouse.json b/data/presets/presets/amenity/courthouse.json
index 505940ec2..e003317e9 100644
--- a/data/presets/presets/amenity/courthouse.json
+++ b/data/presets/presets/amenity/courthouse.json
@@ -9,6 +9,7 @@
     "moreFields": [
         "email",
         "fax",
+        "level",
         "phone",
         "polling_station",
         "smoking",
diff --git a/data/presets/presets/amenity/crematorium.json b/data/presets/presets/amenity/crematorium.json
index fad213605..b8bfd88ac 100644
--- a/data/presets/presets/amenity/crematorium.json
+++ b/data/presets/presets/amenity/crematorium.json
@@ -9,10 +9,11 @@
     ],
     "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
         "fax",
+        "level",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/dentist.json b/data/presets/presets/amenity/dentist.json
index c2bace037..79ae57d27 100644
--- a/data/presets/presets/amenity/dentist.json
+++ b/data/presets/presets/amenity/dentist.json
@@ -9,11 +9,12 @@
         "opening_hours"
     ],
     "moreFields": [
-        "payment_multi",
-        "website",
-        "phone",
         "email",
         "fax",
+        "level",
+        "payment_multi",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/dive_centre.json b/data/presets/presets/amenity/dive_centre.json
index 3c54ea7a0..2c3c9f77c 100644
--- a/data/presets/presets/amenity/dive_centre.json
+++ b/data/presets/presets/amenity/dive_centre.json
@@ -9,11 +9,12 @@
         "scuba_diving"
     ],
     "moreFields": [
-        "payment_multi",
-        "website",
-        "phone",
         "email",
         "fax",
+        "level",
+        "payment_multi",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/doctors.json b/data/presets/presets/amenity/doctors.json
index 3ec1460a9..eb11b46a5 100644
--- a/data/presets/presets/amenity/doctors.json
+++ b/data/presets/presets/amenity/doctors.json
@@ -9,11 +9,12 @@
         "opening_hours"
     ],
     "moreFields": [
-        "payment_multi",
-        "website",
-        "phone",
         "email",
         "fax",
+        "level",
+        "payment_multi",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/dojo.json b/data/presets/presets/amenity/dojo.json
index 2a7eaf45e..d362dc527 100644
--- a/data/presets/presets/amenity/dojo.json
+++ b/data/presets/presets/amenity/dojo.json
@@ -8,14 +8,15 @@
         "opening_hours"
     ],
     "moreFields": [
-        "payment_multi",
-        "website",
-        "phone",
         "email",
         "fax",
+        "level",
+        "payment_multi",
+        "phone",
+        "website",
         "wheelchair"
     ],
-    "geometry" : [
+    "geometry": [
         "point",
         "area"
     ],
diff --git a/data/presets/presets/amenity/dressing_room.json b/data/presets/presets/amenity/dressing_room.json
index dfb824be1..5d270f9dc 100644
--- a/data/presets/presets/amenity/dressing_room.json
+++ b/data/presets/presets/amenity/dressing_room.json
@@ -10,6 +10,7 @@
     "moreFields": [
         "charge_fee",
         "fee",
+        "level",
         "opening_hours",
         "payment_multi_fee",
         "ref"
diff --git a/data/presets/presets/amenity/drinking_water.json b/data/presets/presets/amenity/drinking_water.json
index 031c32ca5..19b80403a 100644
--- a/data/presets/presets/amenity/drinking_water.json
+++ b/data/presets/presets/amenity/drinking_water.json
@@ -11,6 +11,7 @@
     "moreFields": [
         "covered",
         "indoor",
+        "level",
         "lit"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/driving_school.json b/data/presets/presets/amenity/driving_school.json
index 5adfcdde5..3f26d297f 100644
--- a/data/presets/presets/amenity/driving_school.json
+++ b/data/presets/presets/amenity/driving_school.json
@@ -9,11 +9,12 @@
         "opening_hours"
     ],
     "moreFields": [
-        "payment_multi",
-        "website",
-        "phone",
         "email",
         "fax",
+        "level",
+        "payment_multi",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/events_venue.json b/data/presets/presets/amenity/events_venue.json
index 4896017ba..cd8be4011 100644
--- a/data/presets/presets/amenity/events_venue.json
+++ b/data/presets/presets/amenity/events_venue.json
@@ -10,10 +10,11 @@
         "internet_access/fee",
         "internet_access/ssid"
     ],
-    "moreFields" : [
+    "moreFields": [
         "air_conditioning",
         "email",
         "fax",
+        "level",
         "min_age",
         "phone",
         "smoking",
diff --git a/data/presets/presets/amenity/fast_food.json b/data/presets/presets/amenity/fast_food.json
index 69a423b22..3ff164cac 100644
--- a/data/presets/presets/amenity/fast_food.json
+++ b/data/presets/presets/amenity/fast_food.json
@@ -10,21 +10,22 @@
     ],
     "moreFields": [
         "air_conditioning",
-        "opening_hours",
-        "diet_multi",
-        "takeaway",
-        "delivery",
-        "smoking",
         "capacity",
-        "outdoor_seating",
+        "delivery",
+        "diet_multi",
+        "email",
+        "fax",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "level",
+        "opening_hours",
+        "outdoor_seating",
         "payment_multi",
-        "website",
         "phone",
-        "email",
-        "fax",
+        "smoking",
+        "takeaway",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/fast_food/hot_dog.json b/data/presets/presets/amenity/fast_food/hot_dog.json
new file mode 100644
index 000000000..0a39973c7
--- /dev/null
+++ b/data/presets/presets/amenity/fast_food/hot_dog.json
@@ -0,0 +1,25 @@
+{
+    "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"
+}
diff --git a/data/presets/presets/amenity/food_court.json b/data/presets/presets/amenity/food_court.json
index 03e177bb1..a8806d724 100644
--- a/data/presets/presets/amenity/food_court.json
+++ b/data/presets/presets/amenity/food_court.json
@@ -8,17 +8,18 @@
         "opening_hours"
     ],
     "moreFields": [
-        "smoking",
-        "outdoor_seating",
         "capacity",
+        "diet_multi",
+        "email",
+        "fax",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
-        "diet_multi",
-        "website",
+        "level",
+        "outdoor_seating",
         "phone",
-        "email",
-        "fax",
+        "smoking",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/fountain.json b/data/presets/presets/amenity/fountain.json
index 122f40675..bb3116457 100644
--- a/data/presets/presets/amenity/fountain.json
+++ b/data/presets/presets/amenity/fountain.json
@@ -9,6 +9,7 @@
     "moreFields": [
         "covered",
         "indoor",
+        "level",
         "manufacturer"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/fuel.json b/data/presets/presets/amenity/fuel.json
index 97370c581..e7451cda9 100644
--- a/data/presets/presets/amenity/fuel.json
+++ b/data/presets/presets/amenity/fuel.json
@@ -9,13 +9,13 @@
         "self_service"
     ],
     "moreFields": [
-        "opening_hours",
-        "payment_multi",
         "building",
-        "website",
-        "phone",
         "email",
         "fax",
+        "opening_hours",
+        "payment_multi",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/grave_yard.json b/data/presets/presets/amenity/grave_yard.json
index 0f6c60eb1..77d483e6d 100644
--- a/data/presets/presets/amenity/grave_yard.json
+++ b/data/presets/presets/amenity/grave_yard.json
@@ -5,10 +5,10 @@
         "address"
     ],
     "moreFields": [
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/amenity/hospital.json b/data/presets/presets/amenity/hospital.json
index ff219e0f0..665a070aa 100644
--- a/data/presets/presets/amenity/hospital.json
+++ b/data/presets/presets/amenity/hospital.json
@@ -9,13 +9,13 @@
         "emergency"
     ],
     "moreFields": [
+        "email",
+        "fax",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
-        "website",
         "phone",
-        "email",
-        "fax",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/hunting_stand.json b/data/presets/presets/amenity/hunting_stand.json
index 00e3a754e..f77aa5c84 100644
--- a/data/presets/presets/amenity/hunting_stand.json
+++ b/data/presets/presets/amenity/hunting_stand.json
@@ -1,7 +1,8 @@
 {
     "icon": "temaki-binoculars",
     "fields": [
-        "access_simple"
+        "access_simple",
+        "lockable"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/amenity/ice_cream.json b/data/presets/presets/amenity/ice_cream.json
index a78ac05e4..57603381f 100644
--- a/data/presets/presets/amenity/ice_cream.json
+++ b/data/presets/presets/amenity/ice_cream.json
@@ -8,18 +8,19 @@
         "outdoor_seating"
     ],
     "moreFields": [
-        "takeaway",
         "delivery",
+        "diet_multi",
         "drive_through",
+        "email",
+        "fax",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
-        "diet_multi",
+        "level",
         "payment_multi",
-        "website",
         "phone",
-        "email",
-        "fax",
+        "takeaway",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/internet_cafe.json b/data/presets/presets/amenity/internet_cafe.json
index 5124eeb59..b1f6c39b6 100644
--- a/data/presets/presets/amenity/internet_cafe.json
+++ b/data/presets/presets/amenity/internet_cafe.json
@@ -14,6 +14,8 @@
         "air_conditioning",
         "email",
         "fax",
+        "level",
+        "min_age",
         "opening_hours",
         "outdoor_seating",
         "payment_multi",
@@ -34,7 +36,7 @@
         "cafe",
         "net",
         "lanhouse"
-     ],
+    ],
     "tags": {
         "amenity": "internet_cafe"
     },
diff --git a/data/presets/presets/amenity/karaoke.json b/data/presets/presets/amenity/karaoke.json
index 3673f42de..7e3a9ebae 100644
--- a/data/presets/presets/amenity/karaoke.json
+++ b/data/presets/presets/amenity/karaoke.json
@@ -12,6 +12,7 @@
         "air_conditioning",
         "email",
         "fax",
+        "level",
         "min_age",
         "payment_multi",
         "phone",
diff --git a/data/presets/presets/amenity/kindergarten.json b/data/presets/presets/amenity/kindergarten.json
index 01893966a..e40b9c9bc 100644
--- a/data/presets/presets/amenity/kindergarten.json
+++ b/data/presets/presets/amenity/kindergarten.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-school",
+    "icon": "temaki-school",
     "fields": [
         "name",
         "operator",
@@ -10,8 +10,9 @@
     "moreFields": [
         "email",
         "fax",
-        "min_age",
+        "level",
         "max_age",
+        "min_age",
         "opening_hours",
         "payment_multi",
         "website",
diff --git a/data/presets/presets/amenity/language_school.json b/data/presets/presets/amenity/language_school.json
index 10fd0da7d..6b0ca953f 100644
--- a/data/presets/presets/amenity/language_school.json
+++ b/data/presets/presets/amenity/language_school.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-school",
+    "icon": "temaki-school",
     "fields": [
         "name",
         "operator",
@@ -15,6 +15,7 @@
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "level",
         "payment_multi",
         "phone",
         "website",
diff --git a/data/presets/presets/amenity/letter_box.json b/data/presets/presets/amenity/letter_box.json
index 08901eab3..8b95050a8 100644
--- a/data/presets/presets/amenity/letter_box.json
+++ b/data/presets/presets/amenity/letter_box.json
@@ -9,7 +9,9 @@
     "moreFields": [
         "covered",
         "indoor",
+        "level",
         "lit",
+        "lockable",
         "manufacturer",
         "material",
         "operator",
diff --git a/data/presets/presets/amenity/library.json b/data/presets/presets/amenity/library.json
index 77473b7af..7a1910036 100644
--- a/data/presets/presets/amenity/library.json
+++ b/data/presets/presets/amenity/library.json
@@ -11,11 +11,12 @@
         "internet_access/fee",
         "internet_access/ssid"
     ],
-    "moreFields" : [
+    "moreFields": [
         "access_simple",
         "air_conditioning",
         "email",
         "fax",
+        "level",
         "opening_hours",
         "payment_multi",
         "phone",
diff --git a/data/presets/presets/amenity/loading_dock.json b/data/presets/presets/amenity/loading_dock.json
new file mode 100644
index 000000000..e6ef9014f
--- /dev/null
+++ b/data/presets/presets/amenity/loading_dock.json
@@ -0,0 +1,32 @@
+{
+    "icon": "fas-truck-loading",
+    "fields": [
+        "ref",
+        "operator",
+        "access_simple",
+        "door",
+        "width",
+        "height"
+    ],
+    "moreFields": [
+        "address",
+        "colour",
+        "level",
+        "lit",
+        "wheelchair"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "terms": [
+        "door",
+        "loading bay",
+        "shipping",
+        "unloading",
+        "warehouse"
+    ],
+    "tags": {
+        "amenity": "loading_dock"
+    },
+    "name": "Loading Dock"
+}
diff --git a/data/presets/presets/amenity/love_hotel.json b/data/presets/presets/amenity/love_hotel.json
index d9b4c0389..ae9aa2c2d 100644
--- a/data/presets/presets/amenity/love_hotel.json
+++ b/data/presets/presets/amenity/love_hotel.json
@@ -10,7 +10,7 @@
         "internet_access/fee",
         "internet_access/ssid"
     ],
-    "moreFields" : [
+    "moreFields": [
         "email",
         "fax",
         "min_age",
diff --git a/data/presets/presets/amenity/marketplace.json b/data/presets/presets/amenity/marketplace.json
index 638f391af..cc33fc810 100644
--- a/data/presets/presets/amenity/marketplace.json
+++ b/data/presets/presets/amenity/marketplace.json
@@ -8,10 +8,10 @@
         "opening_hours"
     ],
     "moreFields": [
-        "website",
-        "phone",
         "email",
         "fax",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/monastery.json b/data/presets/presets/amenity/monastery.json
index a6592a462..0a1611e63 100644
--- a/data/presets/presets/amenity/monastery.json
+++ b/data/presets/presets/amenity/monastery.json
@@ -8,10 +8,10 @@
         "building_area"
     ],
     "moreFields": [
-        "website",
-        "phone",
         "email",
         "fax",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/money_transfer.json b/data/presets/presets/amenity/money_transfer.json
index 4296111a4..418a80e08 100644
--- a/data/presets/presets/amenity/money_transfer.json
+++ b/data/presets/presets/amenity/money_transfer.json
@@ -1,7 +1,7 @@
 {
-    "icon": "maki-bank",
+    "icon": "temaki-money_hand",
     "fields": [
-	    "name",
+        "name",
         "brand",
         "address",
         "building_area",
@@ -9,11 +9,12 @@
         "currency_multi"
     ],
     "moreFields": [
-        "opening_hours",
-        "website",
-        "phone",
         "email",
         "fax",
+        "level",
+        "opening_hours",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/music_school.json b/data/presets/presets/amenity/music_school.json
index 7857f354f..431a0d17b 100644
--- a/data/presets/presets/amenity/music_school.json
+++ b/data/presets/presets/amenity/music_school.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-school",
+    "icon": "fas-music",
     "fields": [
         "name",
         "operator",
@@ -8,11 +8,12 @@
         "opening_hours"
     ],
     "moreFields": [
-        "payment_multi",
-        "website",
-        "phone",
         "email",
         "fax",
+        "level",
+        "payment_multi",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/nightclub.json b/data/presets/presets/amenity/nightclub.json
index 5feba3394..2a39c60bc 100644
--- a/data/presets/presets/amenity/nightclub.json
+++ b/data/presets/presets/amenity/nightclub.json
@@ -13,6 +13,7 @@
         "air_conditioning",
         "email",
         "fax",
+        "level",
         "payment_multi",
         "phone",
         "website",
@@ -26,10 +27,10 @@
         "amenity": "nightclub"
     },
     "terms": [
-       "disco*",
-       "night club",
-       "dancing",
-       "dance club"
+        "disco*",
+        "night club",
+        "dancing",
+        "dance club"
     ],
     "name": "Nightclub"
 }
diff --git a/data/presets/presets/amenity/parking/multi-storey.json b/data/presets/presets/amenity/parking/multi-storey.json
index 9cb7ebe9f..69d55fc36 100644
--- a/data/presets/presets/amenity/parking/multi-storey.json
+++ b/data/presets/presets/amenity/parking/multi-storey.json
@@ -7,8 +7,8 @@
     ],
     "moreFields": [
         "{amenity/parking}",
-        "levels",
-        "height"
+        "height",
+        "levels"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/amenity/parking_entrance.json b/data/presets/presets/amenity/parking_entrance.json
index 8d1d86d3f..4408208bd 100644
--- a/data/presets/presets/amenity/parking_entrance.json
+++ b/data/presets/presets/amenity/parking_entrance.json
@@ -1,8 +1,10 @@
 {
     "icon": "maki-entrance-alt1",
     "fields": [
+        "ref",
         "access_simple",
-        "ref"
+        "address",
+        "level"
     ],
     "geometry": [
         "vertex"
diff --git a/data/presets/presets/amenity/payment_centre.json b/data/presets/presets/amenity/payment_centre.json
index a18112cb4..64eda1567 100644
--- a/data/presets/presets/amenity/payment_centre.json
+++ b/data/presets/presets/amenity/payment_centre.json
@@ -1,7 +1,7 @@
 {
-    "icon": "maki-bank",
+    "icon": "temaki-money_hand",
     "fields": [
-	    "name",
+        "name",
         "brand",
         "address",
         "building_area",
@@ -10,10 +10,11 @@
     ],
     "moreFields": [
         "currency_multi",
-        "website",
-        "phone",
         "email",
         "fax",
+        "level",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/payment_terminal.json b/data/presets/presets/amenity/payment_terminal.json
index 45cd35389..17163ce32 100644
--- a/data/presets/presets/amenity/payment_terminal.json
+++ b/data/presets/presets/amenity/payment_terminal.json
@@ -1,14 +1,17 @@
 {
     "icon": "far-credit-card",
     "fields": [
-	    "name",
+        "name",
         "brand",
         "address",
         "opening_hours",
         "payment_multi"
     ],
     "moreFields": [
+        "covered",
         "currency_multi",
+        "indoor",
+        "level",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/pharmacy.json b/data/presets/presets/amenity/pharmacy.json
index b75fb2ecc..8237fa8d3 100644
--- a/data/presets/presets/amenity/pharmacy.json
+++ b/data/presets/presets/amenity/pharmacy.json
@@ -9,12 +9,13 @@
         "dispensing"
     ],
     "moreFields": [
-        "opening_hours",
-        "payment_multi",
-        "website",
-        "phone",
         "email",
         "fax",
+        "level",
+        "opening_hours",
+        "payment_multi",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/photo_booth.json b/data/presets/presets/amenity/photo_booth.json
index 72d9659ea..0b38f5931 100644
--- a/data/presets/presets/amenity/photo_booth.json
+++ b/data/presets/presets/amenity/photo_booth.json
@@ -1,28 +1,29 @@
 {
-	"icon": "fas-person-booth",
-	"fields": [
-		"name",
-		"operator",
-		"payment_multi",
-		"wheelchair"
-	],
-	"moreFields": [
-		"brand",
-		"indoor"
-	],
-	"geometry": [
-		"point",
-		"area"
-	],
-	"terms": [
-		"photobooth",
-		"photo",
-		"booth",
-		"kiosk",
-		"camera"
-	],
-	"tags": {
-		"amenity": "photo_booth"
-	},
-	"name": "Photo Booth"
+    "icon": "fas-person-booth",
+    "fields": [
+        "name",
+        "operator",
+        "payment_multi",
+        "wheelchair"
+    ],
+    "moreFields": [
+        "brand",
+        "indoor",
+        "level"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "photobooth",
+        "photo",
+        "booth",
+        "kiosk",
+        "camera"
+    ],
+    "tags": {
+        "amenity": "photo_booth"
+    },
+    "name": "Photo Booth"
 }
diff --git a/data/presets/presets/amenity/place_of_worship.json b/data/presets/presets/amenity/place_of_worship.json
index 75f88f329..8585ef114 100644
--- a/data/presets/presets/amenity/place_of_worship.json
+++ b/data/presets/presets/amenity/place_of_worship.json
@@ -14,6 +14,7 @@
         "fax",
         "internet_access",
         "internet_access/ssid",
+        "level",
         "opening_hours",
         "phone",
         "polling_station",
diff --git a/data/presets/presets/amenity/planetarium.json b/data/presets/presets/amenity/planetarium.json
index e305cf1e7..bc9527776 100644
--- a/data/presets/presets/amenity/planetarium.json
+++ b/data/presets/presets/amenity/planetarium.json
@@ -10,12 +10,12 @@
     "moreFields": [
         "air_conditioning",
         "charge_fee",
-        "fee",
-        "payment_multi_fee",
-        "website",
-        "phone",
         "email",
         "fax",
+        "fee",
+        "payment_multi_fee",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/police.json b/data/presets/presets/amenity/police.json
index 4baafae63..df9879b36 100644
--- a/data/presets/presets/amenity/police.json
+++ b/data/presets/presets/amenity/police.json
@@ -10,6 +10,7 @@
     "moreFields": [
         "email",
         "fax",
+        "level",
         "phone",
         "polling_station",
         "website",
diff --git a/data/presets/presets/amenity/polling_station.json b/data/presets/presets/amenity/polling_station.json
index abffa2213..5b609d7b3 100644
--- a/data/presets/presets/amenity/polling_station.json
+++ b/data/presets/presets/amenity/polling_station.json
@@ -15,6 +15,7 @@
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "level",
         "phone",
         "website",
         "wheelchair"
diff --git a/data/presets/presets/amenity/post_box.json b/data/presets/presets/amenity/post_box.json
index c14ea1873..b65948d92 100644
--- a/data/presets/presets/amenity/post_box.json
+++ b/data/presets/presets/amenity/post_box.json
@@ -12,6 +12,7 @@
         "covered",
         "height",
         "indoor",
+        "level",
         "manufacturer",
         "wheelchair"
     ],
diff --git a/data/presets/presets/amenity/post_office.json b/data/presets/presets/amenity/post_office.json
index a9d8e35dc..26b5d3db7 100644
--- a/data/presets/presets/amenity/post_office.json
+++ b/data/presets/presets/amenity/post_office.json
@@ -13,6 +13,7 @@
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "level",
         "payment_multi",
         "phone",
         "polling_station",
diff --git a/data/presets/presets/amenity/prep_school.json b/data/presets/presets/amenity/prep_school.json
index 88079944b..40a4532f7 100644
--- a/data/presets/presets/amenity/prep_school.json
+++ b/data/presets/presets/amenity/prep_school.json
@@ -8,11 +8,12 @@
         "opening_hours"
     ],
     "moreFields": [
-        "payment_multi",
-        "website",
-        "phone",
         "email",
         "fax",
+        "level",
+        "payment_multi",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/prison.json b/data/presets/presets/amenity/prison.json
index 20ff3f871..0753862ee 100644
--- a/data/presets/presets/amenity/prison.json
+++ b/data/presets/presets/amenity/prison.json
@@ -7,10 +7,10 @@
         "address"
     ],
     "moreFields": [
-        "website",
-        "phone",
         "email",
         "fax",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/pub.json b/data/presets/presets/amenity/pub.json
index 09225c93d..ca943bd4e 100644
--- a/data/presets/presets/amenity/pub.json
+++ b/data/presets/presets/amenity/pub.json
@@ -16,6 +16,7 @@
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "level",
         "microbrewery",
         "min_age",
         "outdoor_seating",
diff --git a/data/presets/presets/amenity/public_bookcase.json b/data/presets/presets/amenity/public_bookcase.json
index 8289dec6a..dcd36eafc 100644
--- a/data/presets/presets/amenity/public_bookcase.json
+++ b/data/presets/presets/amenity/public_bookcase.json
@@ -10,13 +10,15 @@
         "lit"
     ],
     "moreFields": [
-        "wheelchair",
-        "location",
+        "access_simple",
         "address",
-        "access_simple", 
         "brand",
         "email",
-        "phone"
+        "level",
+        "location",
+        "phone",
+        "website",
+        "wheelchair"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/amenity/recycling_centre.json b/data/presets/presets/amenity/recycling_centre.json
index 40ffe93c5..3e3f2d467 100644
--- a/data/presets/presets/amenity/recycling_centre.json
+++ b/data/presets/presets/amenity/recycling_centre.json
@@ -11,12 +11,12 @@
     ],
     "moreFields": [
         "charge_fee",
-        "fee",
-        "payment_multi_fee",
-        "website",
-        "phone",
         "email",
         "fax",
+        "fee",
+        "payment_multi_fee",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/recycling_container.json b/data/presets/presets/amenity/recycling_container.json
index d728501dd..28c8c4aa4 100644
--- a/data/presets/presets/amenity/recycling_container.json
+++ b/data/presets/presets/amenity/recycling_container.json
@@ -9,8 +9,10 @@
         "colour",
         "covered",
         "indoor",
+        "level",
         "manufacturer",
-        "material"
+        "material",
+        "opening_hours"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/amenity/restaurant.json b/data/presets/presets/amenity/restaurant.json
index fdde3f829..2f173d746 100644
--- a/data/presets/presets/amenity/restaurant.json
+++ b/data/presets/presets/amenity/restaurant.json
@@ -20,6 +20,7 @@
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "level",
         "microbrewery",
         "min_age",
         "not/name",
diff --git a/data/presets/presets/amenity/restaurant/sushi.json b/data/presets/presets/amenity/restaurant/sushi.json
index 7b014cbe5..1797fd31d 100644
--- a/data/presets/presets/amenity/restaurant/sushi.json
+++ b/data/presets/presets/amenity/restaurant/sushi.json
@@ -1,5 +1,5 @@
 {
-    "icon": "fas-fish",
+    "icon": "temaki-temaki",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/amenity/school.json b/data/presets/presets/amenity/school.json
index 3916ecc44..2ea579c15 100644
--- a/data/presets/presets/amenity/school.json
+++ b/data/presets/presets/amenity/school.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-school",
+    "icon": "temaki-school",
     "fields": [
         "name",
         "operator",
@@ -16,6 +16,7 @@
         "fee",
         "internet_access",
         "internet_access/ssid",
+        "level",
         "phone",
         "polling_station",
         "wheelchair"
diff --git a/data/presets/presets/amenity/shelter.json b/data/presets/presets/amenity/shelter.json
index 6230446ec..16f276840 100644
--- a/data/presets/presets/amenity/shelter.json
+++ b/data/presets/presets/amenity/shelter.json
@@ -9,6 +9,7 @@
     ],
     "moreFields": [
         "lit",
+        "lockable",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/shelter/picnic_shelter.json b/data/presets/presets/amenity/shelter/picnic_shelter.json
index 2b7e08374..ff048a1a8 100644
--- a/data/presets/presets/amenity/shelter/picnic_shelter.json
+++ b/data/presets/presets/amenity/shelter/picnic_shelter.json
@@ -1,7 +1,16 @@
 {
     "icon": "maki-shelter",
-    "fields": ["name", "shelter_type", "building_area", "lit", "bin"],
-    "geometry": ["point", "area"],
+    "fields": [
+        "name",
+        "shelter_type",
+        "building_area",
+        "lit",
+        "bin"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
     "tags": {
         "amenity": "shelter",
         "shelter_type": "picnic_shelter"
@@ -10,6 +19,8 @@
         "key": "shelter_type",
         "value": "picnic_shelter"
     },
-    "terms": ["pavilion"],
+    "terms": [
+        "pavilion"
+    ],
     "name": "Picnic Shelter"
 }
diff --git a/data/presets/presets/amenity/shower.json b/data/presets/presets/amenity/shower.json
index 47cc92e3c..22643524c 100644
--- a/data/presets/presets/amenity/shower.json
+++ b/data/presets/presets/amenity/shower.json
@@ -1,5 +1,5 @@
 {
-    "icon": "fas-shower",
+    "icon": "temaki-shower",
     "fields": [
         "opening_hours",
         "access_simple",
@@ -12,8 +12,9 @@
     ],
     "moreFields": [
         "address",
-        "operator",
-        "gender"
+        "gender",
+        "level",
+        "operator"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/amenity/smoking_area.json b/data/presets/presets/amenity/smoking_area.json
index cf4535d22..8fa7f5157 100644
--- a/data/presets/presets/amenity/smoking_area.json
+++ b/data/presets/presets/amenity/smoking_area.json
@@ -8,17 +8,17 @@
         "opening_hours"
     ],
     "moreFields": [
+        "covered",
+        "level",
         "lit",
-        "wheelchair",
-        "covered"
+        "wheelchair"
     ],
     "geometry": [
         "point",
         "vertex",
         "area"
     ],
-    "terms": [
-    ],
+    "terms": [],
     "tags": {
         "amenity": "smoking_area"
     },
diff --git a/data/presets/presets/amenity/social_centre.json b/data/presets/presets/amenity/social_centre.json
index 361041963..aea97bd2a 100644
--- a/data/presets/presets/amenity/social_centre.json
+++ b/data/presets/presets/amenity/social_centre.json
@@ -15,6 +15,7 @@
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "level",
         "phone",
         "polling_station",
         "website",
diff --git a/data/presets/presets/amenity/social_facility.json b/data/presets/presets/amenity/social_facility.json
index f1bb0a534..c6ec59246 100644
--- a/data/presets/presets/amenity/social_facility.json
+++ b/data/presets/presets/amenity/social_facility.json
@@ -15,6 +15,7 @@
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "level",
         "opening_hours",
         "phone",
         "website",
diff --git a/data/presets/presets/amenity/social_facility/food_bank.json b/data/presets/presets/amenity/social_facility/food_bank.json
index a951c42c5..e1da92324 100644
--- a/data/presets/presets/amenity/social_facility/food_bank.json
+++ b/data/presets/presets/amenity/social_facility/food_bank.json
@@ -4,8 +4,7 @@
         "point",
         "area"
     ],
-    "terms": [
-    ],
+    "terms": [],
     "tags": {
         "amenity": "social_facility",
         "social_facility": "food_bank"
diff --git a/data/presets/presets/amenity/studio.json b/data/presets/presets/amenity/studio.json
index 7e0bd23a1..d7e969103 100644
--- a/data/presets/presets/amenity/studio.json
+++ b/data/presets/presets/amenity/studio.json
@@ -4,16 +4,17 @@
         "name",
         "studio",
         "address",
-        "building_area"
+        "building_area",
+        "website"
     ],
     "moreFields": [
+        "email",
+        "fax",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
-        "website",
+        "level",
         "phone",
-        "email",
-        "fax",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/studio/audio.json b/data/presets/presets/amenity/studio/audio.json
new file mode 100644
index 000000000..23e1fc452
--- /dev/null
+++ b/data/presets/presets/amenity/studio/audio.json
@@ -0,0 +1,22 @@
+{
+    "icon": "fas-microphone",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "audio mixing",
+        "audio production",
+        "audio recording",
+        "audio studio"
+    ],
+    "tags": {
+        "amenity": "studio",
+        "studio": "audio"
+    },
+    "reference": {
+        "key": "studio",
+        "value": "audio"
+    },
+    "name": "Recording Studio"
+}
diff --git a/data/presets/presets/amenity/studio/radio.json b/data/presets/presets/amenity/studio/radio.json
new file mode 100644
index 000000000..b7ed657e7
--- /dev/null
+++ b/data/presets/presets/amenity/studio/radio.json
@@ -0,0 +1,22 @@
+{
+    "icon": "fas-microphone",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "am radio",
+        "fm radio",
+        "radio broadcast",
+        "radio studio"
+    ],
+    "tags": {
+        "amenity": "studio",
+        "studio": "radio"
+    },
+    "reference": {
+        "key": "studio",
+        "value": "radio"
+    },
+    "name": "Radio Station"
+}
diff --git a/data/presets/presets/amenity/studio/television.json b/data/presets/presets/amenity/studio/television.json
new file mode 100644
index 000000000..9a79255a1
--- /dev/null
+++ b/data/presets/presets/amenity/studio/television.json
@@ -0,0 +1,23 @@
+{
+    "icon": "fas-video",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "television broadcast",
+        "television studio",
+        "tv broadcast",
+        "tv station",
+        "tv studio"
+    ],
+    "tags": {
+        "amenity": "studio",
+        "studio": "television"
+    },
+    "reference": {
+        "key": "studio",
+        "value": "television"
+    },
+    "name": "Television Station"
+}
diff --git a/data/presets/presets/amenity/studio/video.json b/data/presets/presets/amenity/studio/video.json
new file mode 100644
index 000000000..3e2fa9e1a
--- /dev/null
+++ b/data/presets/presets/amenity/studio/video.json
@@ -0,0 +1,23 @@
+{
+    "icon": "fas-video",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "movie production",
+        "movie studio",
+        "video production",
+        "video recording",
+        "video studio"
+    ],
+    "tags": {
+        "amenity": "studio",
+        "studio": "video"
+    },
+    "reference": {
+        "key": "studio",
+        "value": "video"
+    },
+    "name": "Film Studio"
+}
diff --git a/data/presets/presets/amenity/telephone.json b/data/presets/presets/amenity/telephone.json
index 7bc3fb005..cca13f6e8 100644
--- a/data/presets/presets/amenity/telephone.json
+++ b/data/presets/presets/amenity/telephone.json
@@ -11,6 +11,7 @@
     "moreFields": [
         "covered",
         "indoor",
+        "level",
         "lit",
         "wheelchair"
     ],
@@ -21,7 +22,7 @@
     "tags": {
         "amenity": "telephone"
     },
-    "terms":  [
+    "terms": [
         "phone"
     ],
     "name": "Telephone"
diff --git a/data/presets/presets/amenity/theatre.json b/data/presets/presets/amenity/theatre.json
index 5240d53c4..4e9d0133c 100644
--- a/data/presets/presets/amenity/theatre.json
+++ b/data/presets/presets/amenity/theatre.json
@@ -1,7 +1,7 @@
 {
     "icon": "maki-theatre",
     "fields": [
-	    "name",
+        "name",
         "operator",
         "address",
         "building_area",
@@ -14,6 +14,7 @@
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "level",
         "min_age",
         "payment_multi",
         "phone",
diff --git a/data/presets/presets/amenity/theatre/type/amphi.json b/data/presets/presets/amenity/theatre/type/amphi.json
index 6d18e1e5f..d1d6b1709 100644
--- a/data/presets/presets/amenity/theatre/type/amphi.json
+++ b/data/presets/presets/amenity/theatre/type/amphi.json
@@ -7,7 +7,8 @@
         "lit"
     ],
     "geometry": [
-        "point", "area"
+        "point",
+        "area"
     ],
     "terms": [
         "open air",
diff --git a/data/presets/presets/amenity/toilets.json b/data/presets/presets/amenity/toilets.json
index 3fb1ba68b..f01fc9fdd 100644
--- a/data/presets/presets/amenity/toilets.json
+++ b/data/presets/presets/amenity/toilets.json
@@ -11,6 +11,7 @@
     "moreFields": [
         "charge_fee",
         "fee",
+        "level",
         "opening_hours",
         "operator",
         "payment_multi_fee",
diff --git a/data/presets/presets/amenity/toy_library.json b/data/presets/presets/amenity/toy_library.json
index 50c137ebb..3b295525a 100644
--- a/data/presets/presets/amenity/toy_library.json
+++ b/data/presets/presets/amenity/toy_library.json
@@ -7,6 +7,7 @@
         "opening_hours"
     ],
     "moreFields": [
+        "level",
         "website",
         "wheelchair"
     ],
diff --git a/data/presets/presets/amenity/vending_machine.json b/data/presets/presets/amenity/vending_machine.json
index bc54d232d..d24377526 100644
--- a/data/presets/presets/amenity/vending_machine.json
+++ b/data/presets/presets/amenity/vending_machine.json
@@ -7,17 +7,18 @@
         "currency_multi"
     ],
     "moreFields": [
+        "blind",
         "brand",
         "covered",
         "height",
         "indoor",
+        "level",
         "manufacturer"
     ],
     "geometry": [
         "point"
     ],
-    "terms": [
-    ],
+    "terms": [],
     "tags": {
         "amenity": "vending_machine"
     },
diff --git a/data/presets/presets/amenity/vending_machine/newspapers.json b/data/presets/presets/amenity/vending_machine/newspapers.json
index bba0dd4c6..6c7f3a254 100644
--- a/data/presets/presets/amenity/vending_machine/newspapers.json
+++ b/data/presets/presets/amenity/vending_machine/newspapers.json
@@ -1,5 +1,5 @@
 {
-    "icon": "far-newspaper",
+    "icon": "temaki-vending_newspaper",
     "fields": [
         "vending",
         "operator",
diff --git a/data/presets/presets/amenity/veterinary.json b/data/presets/presets/amenity/veterinary.json
index b01188adb..5343c8914 100644
--- a/data/presets/presets/amenity/veterinary.json
+++ b/data/presets/presets/amenity/veterinary.json
@@ -9,12 +9,13 @@
     ],
     "moreFields": [
         "charge_fee",
-        "fee",
-        "payment_multi_fee",
-        "website",
-        "phone",
         "email",
         "fax",
+        "fee",
+        "level",
+        "payment_multi_fee",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/weighbridge.json b/data/presets/presets/amenity/weighbridge.json
new file mode 100644
index 000000000..0e71b1f2c
--- /dev/null
+++ b/data/presets/presets/amenity/weighbridge.json
@@ -0,0 +1,29 @@
+{
+    "icon": "fas-weight",
+    "fields": [
+        "ref",
+        "operator",
+        "access_simple",
+        "maxweight"
+    ],
+    "moreFields": [
+        "address",
+        "colour",
+        "lit",
+        "manufacturer",
+        "material",
+        "wheelchair"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "terms": [
+        "weigh station",
+        "weighbridge"
+    ],
+    "tags": {
+        "amenity": "weighbridge"
+    },
+    "name": "Truck Scale"
+}
diff --git a/data/presets/presets/attraction/bumper_car.json b/data/presets/presets/attraction/bumper_car.json
index 4b93e3405..6b2d057ed 100644
--- a/data/presets/presets/attraction/bumper_car.json
+++ b/data/presets/presets/attraction/bumper_car.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-car",
+    "icon": "fas-car-crash",
     "moreFields": [
         "{attraction}",
         "max_age",
@@ -17,5 +17,5 @@
     "tags": {
         "attraction": "bumper_car"
     },
-    "name": "Bumper Car"
+    "name": "Bumper Cars"
 }
diff --git a/data/presets/presets/attraction/roller_coaster.json b/data/presets/presets/attraction/roller_coaster.json
index ff4ab086e..5da6f1c88 100644
--- a/data/presets/presets/attraction/roller_coaster.json
+++ b/data/presets/presets/attraction/roller_coaster.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-amusement-park",
+    "icon": "temaki-roller_coaster",
     "moreFields": [
         "{attraction}",
         "max_age",
diff --git a/data/presets/presets/barrier.json b/data/presets/presets/barrier.json
index dd3aa8be8..3be9fb592 100644
--- a/data/presets/presets/barrier.json
+++ b/data/presets/presets/barrier.json
@@ -12,6 +12,9 @@
     "fields": [
         "barrier"
     ],
+    "moreFields": [
+        "level"
+    ],
     "name": "Barrier",
     "matchScore": 0.4
 }
diff --git a/data/presets/presets/barrier/bollard.json b/data/presets/presets/barrier/bollard.json
index 2cabf08e0..db295b4d4 100644
--- a/data/presets/presets/barrier/bollard.json
+++ b/data/presets/presets/barrier/bollard.json
@@ -1,13 +1,16 @@
 {
-    "icon": "maki-roadblock",
+    "icon": "temaki-silo",
     "fields": [
         "access",
-        "material"
+        "bollard",
+        "height",
+        "width",
+        "material",
+        "colour"
     ],
     "geometry": [
         "point",
-        "vertex",
-        "line"
+        "vertex"
     ],
     "tags": {
         "barrier": "bollard"
diff --git a/data/presets/presets/barrier/bollard_line.json b/data/presets/presets/barrier/bollard_line.json
new file mode 100644
index 000000000..7a8bfac7e
--- /dev/null
+++ b/data/presets/presets/barrier/bollard_line.json
@@ -0,0 +1,17 @@
+{
+    "icon": "temaki-silo",
+    "fields": [
+        "access",
+        "bollard",
+        "height",
+        "material",
+        "colour"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "barrier": "bollard"
+    },
+    "name": "Bollard Row"
+}
diff --git a/data/presets/presets/barrier/border_control.json b/data/presets/presets/barrier/border_control.json
index 61d9573e0..18d77a2b3 100644
--- a/data/presets/presets/barrier/border_control.json
+++ b/data/presets/presets/barrier/border_control.json
@@ -6,10 +6,10 @@
     ],
     "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "geometry": [
         "vertex",
diff --git a/data/presets/presets/barrier/height_restrictor.json b/data/presets/presets/barrier/height_restrictor.json
index 072185832..3c255a863 100644
--- a/data/presets/presets/barrier/height_restrictor.json
+++ b/data/presets/presets/barrier/height_restrictor.json
@@ -3,7 +3,9 @@
     "fields": [
         "maxheight"
     ],
-    "geometry": [ "vertex" ],
+    "geometry": [
+        "vertex"
+    ],
     "tags": {
         "barrier": "height_restrictor"
     },
diff --git a/data/presets/presets/barrier/kerb.json b/data/presets/presets/barrier/kerb.json
index bdc5ced5a..1c55a9c5c 100644
--- a/data/presets/presets/barrier/kerb.json
+++ b/data/presets/presets/barrier/kerb.json
@@ -15,6 +15,6 @@
     "tags": {
         "barrier": "kerb"
     },
-    "matchScore": 0.50,
+    "matchScore": 0.5,
     "name": "Curb"
 }
diff --git a/data/presets/presets/barrier/lift_gate.json b/data/presets/presets/barrier/lift_gate.json
index 3ee52dd18..3b00ff51f 100644
--- a/data/presets/presets/barrier/lift_gate.json
+++ b/data/presets/presets/barrier/lift_gate.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-roadblock",
+    "icon": "temaki-lift_gate",
     "fields": [
         "access"
     ],
diff --git a/data/presets/presets/barrier/stile.json b/data/presets/presets/barrier/stile.json
index e6a2fcf4d..ebf85e144 100644
--- a/data/presets/presets/barrier/stile.json
+++ b/data/presets/presets/barrier/stile.json
@@ -1,7 +1,9 @@
 {
     "icon": "maki-roadblock",
     "fields": [
-        "access"
+        "access",
+        "stile",
+        "material"
     ],
     "geometry": [
         "vertex"
diff --git a/data/presets/presets/building.json b/data/presets/presets/building.json
index 63db553f2..6db75c722 100644
--- a/data/presets/presets/building.json
+++ b/data/presets/presets/building.json
@@ -11,8 +11,8 @@
         "architect",
         "building/levels/underground",
         "building/material",
-        "not/name",
         "layer",
+        "not/name",
         "operator",
         "roof/colour",
         "smoking",
diff --git a/data/presets/presets/building/service.json b/data/presets/presets/building/service.json
index 194e1d21a..72d356a04 100644
--- a/data/presets/presets/building/service.json
+++ b/data/presets/presets/building/service.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-home",
+    "icon": "maki-building",
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/building/shed.json b/data/presets/presets/building/shed.json
index 77ad3935e..23f8c497d 100644
--- a/data/presets/presets/building/shed.json
+++ b/data/presets/presets/building/shed.json
@@ -1,5 +1,9 @@
 {
-    "icon": "maki-home",
+    "icon": "fas-warehouse",
+    "fields": [
+        "{building}",
+        "lockable"
+    ],
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/club.json b/data/presets/presets/club.json
index 521511b9b..441c359d8 100644
--- a/data/presets/presets/club.json
+++ b/data/presets/presets/club.json
@@ -11,12 +11,13 @@
     "moreFields": [
         "access_simple",
         "building/levels_building",
-        "height_building",
         "email",
         "fax",
+        "height_building",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "level",
         "max_age",
         "min_age",
         "phone",
diff --git a/data/presets/presets/craft.json b/data/presets/presets/craft.json
index 96b36f24c..02207450f 100644
--- a/data/presets/presets/craft.json
+++ b/data/presets/presets/craft.json
@@ -11,12 +11,13 @@
     "moreFields": [
         "air_conditioning",
         "building/levels_building",
-        "height_building",
         "email",
         "fax",
+        "height_building",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "level",
         "phone",
         "product",
         "website",
diff --git a/data/presets/presets/emergency/ambulance_station.json b/data/presets/presets/emergency/ambulance_station.json
index 7d932dba7..47108d621 100644
--- a/data/presets/presets/emergency/ambulance_station.json
+++ b/data/presets/presets/emergency/ambulance_station.json
@@ -7,10 +7,10 @@
         "address"
     ],
     "moreFields": [
-        "website",
-        "phone",
         "email",
         "fax",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/emergency/defibrillator.json b/data/presets/presets/emergency/defibrillator.json
index 5e8005d87..f3cae15de 100644
--- a/data/presets/presets/emergency/defibrillator.json
+++ b/data/presets/presets/emergency/defibrillator.json
@@ -5,6 +5,9 @@
         "ref",
         "operator"
     ],
+    "moreFields": [
+        "level"
+    ],
     "geometry": [
         "point",
         "vertex"
@@ -12,7 +15,7 @@
     "terms": [
         "AED"
     ],
-   "tags": {
+    "tags": {
         "emergency": "defibrillator"
     },
     "name": "Defibrillator"
diff --git a/data/presets/presets/emergency/fire_alarm.json b/data/presets/presets/emergency/fire_alarm.json
index de3ce125a..8d0529562 100644
--- a/data/presets/presets/emergency/fire_alarm.json
+++ b/data/presets/presets/emergency/fire_alarm.json
@@ -5,6 +5,9 @@
         "ref",
         "operator"
     ],
+    "moreFields": [
+        "level"
+    ],
     "geometry": [
         "point",
         "vertex"
diff --git a/data/presets/presets/emergency/fire_extinguisher.json b/data/presets/presets/emergency/fire_extinguisher.json
index b71b686a8..25c794cbf 100644
--- a/data/presets/presets/emergency/fire_extinguisher.json
+++ b/data/presets/presets/emergency/fire_extinguisher.json
@@ -5,6 +5,9 @@
         "ref",
         "operator"
     ],
+    "moreFields": [
+        "level"
+    ],
     "geometry": [
         "point",
         "vertex"
diff --git a/data/presets/presets/emergency/fire_hose.json b/data/presets/presets/emergency/fire_hose.json
index 8152f100e..d5ec6c8c5 100644
--- a/data/presets/presets/emergency/fire_hose.json
+++ b/data/presets/presets/emergency/fire_hose.json
@@ -1,10 +1,13 @@
 {
-    "icon": "fas-fire-extinguisher",
+    "icon": "fas-tape",
     "fields": [
         "indoor",
         "ref",
         "operator"
     ],
+    "moreFields": [
+        "level"
+    ],
     "geometry": [
         "point",
         "vertex"
diff --git a/data/presets/presets/emergency/fire_hydrant.json b/data/presets/presets/emergency/fire_hydrant.json
index 6349a8ad6..bf133b350 100644
--- a/data/presets/presets/emergency/fire_hydrant.json
+++ b/data/presets/presets/emergency/fire_hydrant.json
@@ -8,10 +8,11 @@
         "couplings"
     ],
     "moreFields": [
-        "fire_hydrant/pressure",
         "fire_hydrant/diameter",
-        "water_volume",
-        "survey/date"
+        "fire_hydrant/pressure",
+        "level",
+        "survey/date",
+        "water_volume"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/emergency/first_aid_kit.json b/data/presets/presets/emergency/first_aid_kit.json
index 0ec0fe38d..e5ddc5fa1 100644
--- a/data/presets/presets/emergency/first_aid_kit.json
+++ b/data/presets/presets/emergency/first_aid_kit.json
@@ -5,6 +5,9 @@
         "ref",
         "operator"
     ],
+    "moreFields": [
+        "level"
+    ],
     "geometry": [
         "point",
         "vertex"
@@ -17,7 +20,7 @@
         "medic*",
         "medkit"
     ],
-   "tags": {
+    "tags": {
         "emergency": "first_aid_kit"
     },
     "name": "First Aid Kit"
diff --git a/data/presets/presets/emergency/life_ring.json b/data/presets/presets/emergency/life_ring.json
index ba6fd624a..80bdaaa73 100644
--- a/data/presets/presets/emergency/life_ring.json
+++ b/data/presets/presets/emergency/life_ring.json
@@ -14,7 +14,7 @@
         "kisbie ring",
         "perry buoy"
     ],
-   "tags": {
+    "tags": {
         "emergency": "life_ring"
     },
     "name": "Life Ring"
diff --git a/data/presets/presets/emergency/lifeguard.json b/data/presets/presets/emergency/lifeguard.json
index e8db4df69..becfd7d3c 100644
--- a/data/presets/presets/emergency/lifeguard.json
+++ b/data/presets/presets/emergency/lifeguard.json
@@ -5,7 +5,7 @@
         "operator",
         "building_area",
         "opening_hours"
-     ],
+    ],
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/emergency/phone.json b/data/presets/presets/emergency/phone.json
index 8846a234b..efea67f53 100644
--- a/data/presets/presets/emergency/phone.json
+++ b/data/presets/presets/emergency/phone.json
@@ -7,6 +7,9 @@
         "indoor",
         "booth"
     ],
+    "moreFields": [
+        "level"
+    ],
     "geometry": [
         "point",
         "vertex"
diff --git a/data/presets/presets/emergency/siren.json b/data/presets/presets/emergency/siren.json
index 90c7fe9a7..becaf7f13 100644
--- a/data/presets/presets/emergency/siren.json
+++ b/data/presets/presets/emergency/siren.json
@@ -18,7 +18,7 @@
         "tornado",
         "warning"
     ],
-   "tags": {
+    "tags": {
         "emergency": "siren"
     },
     "name": "Siren"
diff --git a/data/presets/presets/entrance.json b/data/presets/presets/entrance.json
index d63a5609b..51951e4f3 100644
--- a/data/presets/presets/entrance.json
+++ b/data/presets/presets/entrance.json
@@ -15,6 +15,7 @@
         "entrance",
         "door",
         "access_simple",
+        "level",
         "address"
     ],
     "matchScore": 0.8,
diff --git a/data/presets/presets/healthcare.json b/data/presets/presets/healthcare.json
index f6dc5a845..abd775604 100644
--- a/data/presets/presets/healthcare.json
+++ b/data/presets/presets/healthcare.json
@@ -9,15 +9,16 @@
         "building_area"
     ],
     "moreFields": [
-        "building/levels_building",
-        "height_building",
-        "opening_hours",
-        "payment_multi",
         "brand",
-        "website",
-        "phone",
+        "building/levels_building",
         "email",
         "fax",
+        "height_building",
+        "level",
+        "opening_hours",
+        "payment_multi",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/highway/cycleway.json b/data/presets/presets/highway/cycleway.json
index 8cf1df18e..0135da430 100644
--- a/data/presets/presets/highway/cycleway.json
+++ b/data/presets/presets/highway/cycleway.json
@@ -27,8 +27,9 @@
         "highway": "cycleway"
     },
     "terms": [
+        "bicyle path",
         "bike path",
-        "bicyle path"
+        "cycling path"
     ],
     "matchScore": 0.9,
     "name": "Cycle Path"
diff --git a/data/presets/presets/highway/cycleway/bicycle_foot.json b/data/presets/presets/highway/cycleway/bicycle_foot.json
index a697ff2c7..b488266c5 100644
--- a/data/presets/presets/highway/cycleway/bicycle_foot.json
+++ b/data/presets/presets/highway/cycleway/bicycle_foot.json
@@ -1,6 +1,6 @@
 {
-    "countryCodes": [
-        "ca", "gb", "mx", "us"
+    "notCountryCodes": [
+        "fr", "lt"
     ],
     "icon": "fas-biking",
     "geometry": [
diff --git a/data/presets/presets/highway/elevator.json b/data/presets/presets/highway/elevator.json
index cfc1c6c7d..194e85bb1 100644
--- a/data/presets/presets/highway/elevator.json
+++ b/data/presets/presets/highway/elevator.json
@@ -1,14 +1,15 @@
 {
     "icon": "temaki-elevator",
     "fields": [
-        "access_simple",
-        "opening_hours",
-        "maxweight",
         "ref",
-        "wheelchair"
+        "level_semi",
+        "access_simple",
+        "wheelchair",
+        "maxweight"
     ],
     "moreFields": [
-        "maxheight"
+        "maxheight",
+        "opening_hours"
     ],
     "geometry": [
         "vertex"
diff --git a/data/presets/presets/highway/emergency_bay.json b/data/presets/presets/highway/emergency_bay.json
index 65598e82c..bbb109cee 100644
--- a/data/presets/presets/highway/emergency_bay.json
+++ b/data/presets/presets/highway/emergency_bay.json
@@ -1,6 +1,8 @@
 {
     "icon": "maki-car",
-    "geometry": [ "vertex" ],
+    "geometry": [
+        "vertex"
+    ],
     "tags": {
         "highway": "emergency_bay"
     },
diff --git a/data/presets/presets/highway/path.json b/data/presets/presets/highway/path.json
index b126b9414..96d4a7924 100644
--- a/data/presets/presets/highway/path.json
+++ b/data/presets/presets/highway/path.json
@@ -12,11 +12,12 @@
         "covered",
         "dog",
         "horse_scale",
+        "informal",
         "lit",
         "maxweight_bridge",
         "mtb/scale",
-        "mtb/scale/uphill",
         "mtb/scale/imba",
+        "mtb/scale/uphill",
         "not/name",
         "ref",
         "sac_scale",
diff --git a/data/presets/presets/highway/path/informal.json b/data/presets/presets/highway/path/informal.json
new file mode 100644
index 000000000..a4efc554d
--- /dev/null
+++ b/data/presets/presets/highway/path/informal.json
@@ -0,0 +1,53 @@
+{
+    "icon": "iD-other-line",
+    "fields": [
+        "surface",
+        "width",
+        "access",
+        "trail_visibility",
+        "smoothness",
+        "incline"
+    ],
+    "moreFields": [
+        "covered",
+        "dog",
+        "horse_scale",
+        "informal",
+        "lit",
+        "maxweight_bridge",
+        "mtb/scale",
+        "mtb/scale/imba",
+        "mtb/scale/uphill",
+        "sac_scale",
+        "stroller",
+        "structure",
+        "wheelchair"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "terms": [
+        "bootleg trail",
+        "cow path",
+        "desire line",
+        "desire path",
+        "desireline",
+        "desirepath",
+        "elephant path",
+        "game trail",
+        "goat track",
+        "herd path",
+        "pig trail",
+        "shortcut",
+        "social trail",
+        "use trail"
+    ],
+    "tags": {
+        "highway": "path",
+        "informal": "yes"
+    },
+    "reference": {
+        "key": "informal"
+    },
+    "name": "Informal Path"
+}
diff --git a/data/presets/presets/highway/primary_link.json b/data/presets/presets/highway/primary_link.json
index c6405e97b..cb6b16075 100644
--- a/data/presets/presets/highway/primary_link.json
+++ b/data/presets/presets/highway/primary_link.json
@@ -17,8 +17,8 @@
         "destination/symbol_oneway",
         "flood_prone",
         "incline",
-        "junction/ref_oneway",
         "junction_line",
+        "junction/ref_oneway",
         "lit",
         "maxheight",
         "maxspeed/advisory",
diff --git a/data/presets/presets/highway/residential.json b/data/presets/presets/highway/residential.json
index b121d06fc..2fdc3c5c0 100644
--- a/data/presets/presets/highway/residential.json
+++ b/data/presets/presets/highway/residential.json
@@ -16,11 +16,11 @@
         "incline",
         "junction_line",
         "lit",
-        "oneway/bicycle",
         "maxheight",
         "maxspeed/advisory",
         "maxweight_bridge",
         "not/name",
+        "oneway/bicycle",
         "smoothness",
         "trolley_wire"
     ],
diff --git a/data/presets/presets/highway/rest_area.json b/data/presets/presets/highway/rest_area.json
index d6e7f3be6..1a694f0c4 100644
--- a/data/presets/presets/highway/rest_area.json
+++ b/data/presets/presets/highway/rest_area.json
@@ -7,10 +7,10 @@
     ],
     "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
         "fax",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/highway/speed_camera.json b/data/presets/presets/highway/speed_camera.json
index 81e5fe78b..f2d08621f 100644
--- a/data/presets/presets/highway/speed_camera.json
+++ b/data/presets/presets/highway/speed_camera.json
@@ -8,11 +8,10 @@
         "direction",
         "ref",
         "maxspeed"
-     ],
+    ],
     "tags": {
         "highway": "speed_camera"
     },
-    "terms": [
-    ],
+    "terms": [],
     "name": "Speed Camera"
 }
diff --git a/data/presets/presets/highway/steps.json b/data/presets/presets/highway/steps.json
index 307d25ace..33f09e587 100644
--- a/data/presets/presets/highway/steps.json
+++ b/data/presets/presets/highway/steps.json
@@ -2,16 +2,20 @@
     "icon": "iD-highway-steps",
     "fields": [
         "incline_steps",
+        "access_simple",
         "handrail",
         "step_count",
         "surface",
-        "lit",
         "width"
     ],
     "moreFields": [
         "covered",
         "dog",
         "indoor",
+        "level_semi",
+        "lit",
+        "name",
+        "ref",
         "stroller",
         "wheelchair"
     ],
diff --git a/data/presets/presets/highway/steps/conveying.json b/data/presets/presets/highway/steps/conveying.json
index e138240f0..81b1a2b6b 100644
--- a/data/presets/presets/highway/steps/conveying.json
+++ b/data/presets/presets/highway/steps/conveying.json
@@ -1,14 +1,18 @@
 {
     "icon": "maki-entrance",
     "fields": [
-        "name",
         "incline_steps",
         "conveying",
         "access_simple",
-        "lit",
-        "width",
+        "indoor",
+        "level_semi",
+        "width"
+    ],
+    "moreFields": [
+        "{highway/steps}",
         "handrail",
-        "step_count"
+        "step_count",
+        "surface"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/highway/street_lamp.json b/data/presets/presets/highway/street_lamp.json
index e6c50d362..282b09254 100644
--- a/data/presets/presets/highway/street_lamp.json
+++ b/data/presets/presets/highway/street_lamp.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-bulb",
+    "icon": "temaki-bulb3",
     "geometry": [
         "point",
         "vertex"
diff --git a/data/presets/presets/highway/track.json b/data/presets/presets/highway/track.json
index e80e01441..c4c8adc00 100644
--- a/data/presets/presets/highway/track.json
+++ b/data/presets/presets/highway/track.json
@@ -16,8 +16,8 @@
         "horse_scale",
         "maxweight_bridge",
         "mtb/scale",
-        "mtb/scale/uphill",
         "mtb/scale/imba",
+        "mtb/scale/uphill",
         "stroller",
         "wheelchair"
     ],
diff --git a/data/presets/presets/highway/traffic_mirror.json b/data/presets/presets/highway/traffic_mirror.json
index 06c9ef1ce..45ab4a276 100644
--- a/data/presets/presets/highway/traffic_mirror.json
+++ b/data/presets/presets/highway/traffic_mirror.json
@@ -6,7 +6,7 @@
     ],
     "fields": [
         "direction"
-     ],
+    ],
     "tags": {
         "highway": "traffic_mirror"
     },
diff --git a/data/presets/presets/highway/trunk.json b/data/presets/presets/highway/trunk.json
index 9a3d67cff..3b7d314c7 100644
--- a/data/presets/presets/highway/trunk.json
+++ b/data/presets/presets/highway/trunk.json
@@ -17,8 +17,8 @@
         "junction_line",
         "lit",
         "maxheight",
-        "minspeed",
         "maxweight_bridge",
+        "minspeed",
         "not/name",
         "smoothness",
         "toll"
diff --git a/data/presets/presets/historic/wreck.json b/data/presets/presets/historic/wreck.json
index 3c624455f..722cdc10f 100644
--- a/data/presets/presets/historic/wreck.json
+++ b/data/presets/presets/historic/wreck.json
@@ -19,7 +19,7 @@
         "historic": "wreck"
     },
     "addTags": {
-    	"historic": "wreck",
+        "historic": "wreck",
         "seamark:type": "wreck"
     },
     "terms": [
diff --git a/data/presets/presets/indoor/elevator.json b/data/presets/presets/indoor/elevator.json
new file mode 100644
index 000000000..c2c0a710f
--- /dev/null
+++ b/data/presets/presets/indoor/elevator.json
@@ -0,0 +1,20 @@
+{
+    "icon": "temaki-elevator",
+    "fields": [
+        "ref",
+        "level_semi"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "indoor": "room",
+        "elevator": "yes"
+    },
+    "terms": [
+        "elevator",
+        "lift"
+    ],
+    "matchScore": 0.8,
+    "name": "Indoor Elevator Shaft"
+}
diff --git a/data/presets/presets/indoor/stairs.json b/data/presets/presets/indoor/stairs.json
new file mode 100644
index 000000000..c3e210554
--- /dev/null
+++ b/data/presets/presets/indoor/stairs.json
@@ -0,0 +1,25 @@
+{
+    "icon": "iD-highway-steps",
+    "fields": [
+        "ref",
+        "level_semi",
+        "conveying_escalator"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "indoor": "room",
+        "stairs": "yes"
+    },
+    "terms": [
+        "stair",
+        "stairs",
+        "staircase",
+        "stairway",
+        "stairwell",
+        "steps"
+    ],
+    "matchScore": 0.8,
+    "name": "Indoor Stairwell"
+}
diff --git a/data/presets/presets/internet_access/wlan.json b/data/presets/presets/internet_access/wlan.json
index 9ecd76da3..966329b3d 100644
--- a/data/presets/presets/internet_access/wlan.json
+++ b/data/presets/presets/internet_access/wlan.json
@@ -5,8 +5,11 @@
         "area"
     ],
     "fields": [
-        "internet_access/fee",
-        "internet_access/ssid"
+        "internet_access/ssid",
+        "internet_access/fee"
+    ],
+    "moreFields": [
+        "level"
     ],
     "terms": [
         "wi-fi",
diff --git a/data/presets/presets/landuse/allotments.json b/data/presets/presets/landuse/allotments.json
index abe1e91ce..f2e07f04d 100644
--- a/data/presets/presets/landuse/allotments.json
+++ b/data/presets/presets/landuse/allotments.json
@@ -8,10 +8,10 @@
     ],
     "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "tags": {
         "landuse": "allotments"
diff --git a/data/presets/presets/landuse/aquaculture.json b/data/presets/presets/landuse/aquaculture.json
index 4900c997c..7eebb8852 100644
--- a/data/presets/presets/landuse/aquaculture.json
+++ b/data/presets/presets/landuse/aquaculture.json
@@ -7,10 +7,10 @@
     ],
     "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/landuse/brownfield.json b/data/presets/presets/landuse/brownfield.json
index 9fb617e35..893d36c68 100644
--- a/data/presets/presets/landuse/brownfield.json
+++ b/data/presets/presets/landuse/brownfield.json
@@ -1,4 +1,5 @@
 {
+    "icon": "temaki-bulldozer",
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/landuse/cemetery.json b/data/presets/presets/landuse/cemetery.json
index bb447fb9a..b0c457498 100644
--- a/data/presets/presets/landuse/cemetery.json
+++ b/data/presets/presets/landuse/cemetery.json
@@ -7,10 +7,10 @@
     ],
     "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/landuse/churchyard.json b/data/presets/presets/landuse/churchyard.json
index fac0bf0af..1341d70e3 100644
--- a/data/presets/presets/landuse/churchyard.json
+++ b/data/presets/presets/landuse/churchyard.json
@@ -7,10 +7,10 @@
     ],
     "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/landuse/commercial.json b/data/presets/presets/landuse/commercial.json
index cb1a1724b..7d12a5ea6 100644
--- a/data/presets/presets/landuse/commercial.json
+++ b/data/presets/presets/landuse/commercial.json
@@ -5,10 +5,10 @@
     ],
     "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/landuse/construction.json b/data/presets/presets/landuse/construction.json
index 52b68447a..0c3a668fc 100644
--- a/data/presets/presets/landuse/construction.json
+++ b/data/presets/presets/landuse/construction.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-tools",
+    "icon": "temaki-bulldozer",
     "fields": [
         "name",
         "construction",
@@ -10,10 +10,10 @@
     ],
     "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/landuse/farmland.json b/data/presets/presets/landuse/farmland.json
index 730a46e22..b4431b9b5 100644
--- a/data/presets/presets/landuse/farmland.json
+++ b/data/presets/presets/landuse/farmland.json
@@ -8,10 +8,10 @@
     ],
     "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/landuse/farmyard.json b/data/presets/presets/landuse/farmyard.json
index 13641d2d2..0e72cafb0 100644
--- a/data/presets/presets/landuse/farmyard.json
+++ b/data/presets/presets/landuse/farmyard.json
@@ -7,10 +7,10 @@
     ],
     "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/landuse/forest.json b/data/presets/presets/landuse/forest.json
index 567a442bf..9d5173723 100644
--- a/data/presets/presets/landuse/forest.json
+++ b/data/presets/presets/landuse/forest.json
@@ -8,10 +8,10 @@
     ],
     "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/landuse/garages.json b/data/presets/presets/landuse/garages.json
index 04fa226ac..e1cd1cd0a 100644
--- a/data/presets/presets/landuse/garages.json
+++ b/data/presets/presets/landuse/garages.json
@@ -8,10 +8,10 @@
     ],
     "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "tags": {
         "landuse": "garages"
diff --git a/data/presets/presets/landuse/greenfield.json b/data/presets/presets/landuse/greenfield.json
index 1fee223ed..9560a2e11 100644
--- a/data/presets/presets/landuse/greenfield.json
+++ b/data/presets/presets/landuse/greenfield.json
@@ -1,4 +1,5 @@
 {
+    "icon": "temaki-bulldozer",
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/landuse/greenhouse_horticulture.json b/data/presets/presets/landuse/greenhouse_horticulture.json
index ba49e9209..aae0b0fef 100644
--- a/data/presets/presets/landuse/greenhouse_horticulture.json
+++ b/data/presets/presets/landuse/greenhouse_horticulture.json
@@ -6,10 +6,10 @@
     ],
     "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/landuse/harbour.json b/data/presets/presets/landuse/harbour.json
index 24e820f1d..969c64b3e 100644
--- a/data/presets/presets/landuse/harbour.json
+++ b/data/presets/presets/landuse/harbour.json
@@ -6,10 +6,10 @@
     ],
     "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/landuse/industrial.json b/data/presets/presets/landuse/industrial.json
index f65a0bd09..85cfdf8e8 100644
--- a/data/presets/presets/landuse/industrial.json
+++ b/data/presets/presets/landuse/industrial.json
@@ -6,10 +6,10 @@
     ],
     "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/landuse/landfill.json b/data/presets/presets/landuse/landfill.json
index ff867219b..141752719 100644
--- a/data/presets/presets/landuse/landfill.json
+++ b/data/presets/presets/landuse/landfill.json
@@ -1,4 +1,5 @@
 {
+    "icon": "temaki-bulldozer",
     "geometry": [
         "area"
     ],
@@ -7,10 +8,10 @@
     ],
     "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "tags": {
         "landuse": "landfill"
diff --git a/data/presets/presets/landuse/military.json b/data/presets/presets/landuse/military.json
index 90d4025da..c0f878012 100644
--- a/data/presets/presets/landuse/military.json
+++ b/data/presets/presets/landuse/military.json
@@ -5,10 +5,10 @@
     ],
     "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/landuse/plant_nursery.json b/data/presets/presets/landuse/plant_nursery.json
index 1b3d5d806..27e6d0b91 100644
--- a/data/presets/presets/landuse/plant_nursery.json
+++ b/data/presets/presets/landuse/plant_nursery.json
@@ -7,10 +7,10 @@
     ],
     "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/landuse/quarry.json b/data/presets/presets/landuse/quarry.json
index f037975de..7581d6723 100644
--- a/data/presets/presets/landuse/quarry.json
+++ b/data/presets/presets/landuse/quarry.json
@@ -9,10 +9,10 @@
     ],
     "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "tags": {
         "landuse": "quarry"
diff --git a/data/presets/presets/landuse/recreation_ground.json b/data/presets/presets/landuse/recreation_ground.json
index a92533df9..f70675ac2 100644
--- a/data/presets/presets/landuse/recreation_ground.json
+++ b/data/presets/presets/landuse/recreation_ground.json
@@ -8,10 +8,10 @@
     ],
     "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "tags": {
         "landuse": "recreation_ground"
diff --git a/data/presets/presets/landuse/religious.json b/data/presets/presets/landuse/religious.json
index e136b970f..937829569 100644
--- a/data/presets/presets/landuse/religious.json
+++ b/data/presets/presets/landuse/religious.json
@@ -10,10 +10,10 @@
     ],
     "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "tags": {
         "landuse": "religious"
diff --git a/data/presets/presets/landuse/residential.json b/data/presets/presets/landuse/residential.json
index 5b2686df9..99e68d292 100644
--- a/data/presets/presets/landuse/residential.json
+++ b/data/presets/presets/landuse/residential.json
@@ -1,5 +1,9 @@
 {
     "icon": "maki-building",
+    "fields": [
+        "name",
+        "residential"
+    ],
     "geometry": [
         "area"
     ],
diff --git a/data/presets/presets/landuse/retail.json b/data/presets/presets/landuse/retail.json
index 49ccf270a..946e49956 100644
--- a/data/presets/presets/landuse/retail.json
+++ b/data/presets/presets/landuse/retail.json
@@ -8,10 +8,10 @@
     ],
     "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "tags": {
         "landuse": "retail"
diff --git a/data/presets/presets/landuse/vineyard.json b/data/presets/presets/landuse/vineyard.json
index f57194155..f417f11e4 100644
--- a/data/presets/presets/landuse/vineyard.json
+++ b/data/presets/presets/landuse/vineyard.json
@@ -6,10 +6,10 @@
     ],
     "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/landuse/winter_sports.json b/data/presets/presets/landuse/winter_sports.json
index 5267adc1d..7d621758a 100644
--- a/data/presets/presets/landuse/winter_sports.json
+++ b/data/presets/presets/landuse/winter_sports.json
@@ -8,8 +8,8 @@
         "operator"
     ],
     "moreFields": [
-        "address",
         "access_simple",
+        "address",
         "opening_hours"
     ],
     "tags": {
diff --git a/data/presets/presets/leisure/amusement_arcade.json b/data/presets/presets/leisure/amusement_arcade.json
index 170b076e2..f4e77ec15 100644
--- a/data/presets/presets/leisure/amusement_arcade.json
+++ b/data/presets/presets/leisure/amusement_arcade.json
@@ -10,6 +10,7 @@
         "air_conditioning",
         "email",
         "fax",
+        "level",
         "max_age",
         "min_age",
         "opening_hours",
diff --git a/data/presets/presets/leisure/bandstand.json b/data/presets/presets/leisure/bandstand.json
index 72bf903fc..be248dad3 100644
--- a/data/presets/presets/leisure/bandstand.json
+++ b/data/presets/presets/leisure/bandstand.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-music",
+    "icon": "fas-music",
     "fields": [
         "name",
         "building_area",
diff --git a/data/presets/presets/leisure/beach_resort.json b/data/presets/presets/leisure/beach_resort.json
index 087a4709c..2470a6cf2 100644
--- a/data/presets/presets/leisure/beach_resort.json
+++ b/data/presets/presets/leisure/beach_resort.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-beach",
+    "icon": "fas-umbrella-beach",
     "fields": [
         "name",
         "address",
@@ -9,11 +9,11 @@
         "charge_fee"
     ],
     "moreFields": [
-        "smoking",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "smoking",
+        "website"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/bird_hide.json b/data/presets/presets/leisure/bird_hide.json
index 7f08dc038..9970aeeea 100644
--- a/data/presets/presets/leisure/bird_hide.json
+++ b/data/presets/presets/leisure/bird_hide.json
@@ -7,7 +7,7 @@
         "opening_hours"
     ],
     "moreFields": [
-        "website" 
+        "website"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/bleachers.json b/data/presets/presets/leisure/bleachers.json
index 1faa3e8e1..05b072521 100644
--- a/data/presets/presets/leisure/bleachers.json
+++ b/data/presets/presets/leisure/bleachers.json
@@ -1,6 +1,5 @@
 {
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
diff --git a/data/presets/presets/leisure/bowling_alley.json b/data/presets/presets/leisure/bowling_alley.json
index 8ec49b44f..301d25fb6 100644
--- a/data/presets/presets/leisure/bowling_alley.json
+++ b/data/presets/presets/leisure/bowling_alley.json
@@ -10,6 +10,7 @@
         "air_conditioning",
         "email",
         "fax",
+        "level",
         "min_age",
         "opening_hours",
         "payment_multi",
diff --git a/data/presets/presets/leisure/common.json b/data/presets/presets/leisure/common.json
index ce506e6a0..91de2a283 100644
--- a/data/presets/presets/leisure/common.json
+++ b/data/presets/presets/leisure/common.json
@@ -1,9 +1,7 @@
 {
     "icon": "temaki-pedestrian",
     "fields": [
-        "name",
-        "address",
-        "opening_hours"
+        "name"
     ],
     "moreFields": [
         "website"
@@ -12,9 +10,6 @@
         "point",
         "area"
     ],
-    "fields": [
-        "name"
-    ],
     "terms": [
         "open space"
     ],
diff --git a/data/presets/presets/leisure/dance.json b/data/presets/presets/leisure/dance.json
index 5b4c413be..0045342eb 100644
--- a/data/presets/presets/leisure/dance.json
+++ b/data/presets/presets/leisure/dance.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-music",
+    "icon": "fas-music",
     "fields": [
         "name",
         "operator",
@@ -8,12 +8,13 @@
         "dance/style"
     ],
     "moreFields": [
+        "email",
+        "fax",
+        "level",
         "opening_hours",
         "payment_multi",
-        "website",
         "phone",
-        "email",
-        "fax"
+        "website"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/dancing_school.json b/data/presets/presets/leisure/dancing_school.json
index 8edfe09d9..ea3317958 100644
--- a/data/presets/presets/leisure/dancing_school.json
+++ b/data/presets/presets/leisure/dancing_school.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-music",
+    "icon": "fas-music",
     "fields": [
         "name",
         "operator",
@@ -8,12 +8,13 @@
         "dance/style"
     ],
     "moreFields": [
+        "email",
+        "fax",
+        "level",
         "opening_hours",
         "payment_multi",
-        "website",
         "phone",
-        "email",
-        "fax"
+        "website"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/dog_park.json b/data/presets/presets/leisure/dog_park.json
index a942a85c0..f66be0581 100644
--- a/data/presets/presets/leisure/dog_park.json
+++ b/data/presets/presets/leisure/dog_park.json
@@ -1,27 +1,19 @@
 {
     "icon": "maki-dog-park",
     "fields": [
-        "name",
-        "operator",
-        "address",
-        "opening_hours",
-        "dog"
+        "name"
     ],
     "moreFields": [
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "geometry": [
         "point",
         "area"
     ],
-    "fields": [
-        "name"
-    ],
-    "terms": [
-    ],
+    "terms": [],
     "tags": {
         "leisure": "dog_park"
     },
diff --git a/data/presets/presets/leisure/escape_game.json b/data/presets/presets/leisure/escape_game.json
index 569a0e5ce..f0da0c2ad 100644
--- a/data/presets/presets/leisure/escape_game.json
+++ b/data/presets/presets/leisure/escape_game.json
@@ -17,6 +17,7 @@
         "air_conditioning",
         "email",
         "fax",
+        "level",
         "phone",
         "smoking",
         "wheelchair"
diff --git a/data/presets/presets/leisure/fitness_centre.json b/data/presets/presets/leisure/fitness_centre.json
index 7bd3602e6..c25973595 100644
--- a/data/presets/presets/leisure/fitness_centre.json
+++ b/data/presets/presets/leisure/fitness_centre.json
@@ -8,13 +8,13 @@
     ],
     "moreFields": [
         "charge_fee",
-        "opening_hours",
-        "fee",
-        "payment_multi",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "fee",
+        "opening_hours",
+        "payment_multi",
+        "phone",
+        "website"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/fitness_station.json b/data/presets/presets/leisure/fitness_station.json
index 5929b1356..a75e23b95 100644
--- a/data/presets/presets/leisure/fitness_station.json
+++ b/data/presets/presets/leisure/fitness_station.json
@@ -2,9 +2,12 @@
     "icon": "maki-pitch",
     "fields": [
         "fitness_station",
-        "ref"
+        "ref",
+        "wheelchair",
+        "blind"
     ],
     "moreFields": [
+        "access_simple",
         "opening_hours"
     ],
     "geometry": [
diff --git a/data/presets/presets/leisure/garden.json b/data/presets/presets/leisure/garden.json
index d7c999379..23c1e275e 100644
--- a/data/presets/presets/leisure/garden.json
+++ b/data/presets/presets/leisure/garden.json
@@ -9,10 +9,10 @@
         "charge_fee"
     ],
     "moreFields": [
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/golf_course.json b/data/presets/presets/leisure/golf_course.json
index e19df464c..798969a26 100644
--- a/data/presets/presets/leisure/golf_course.json
+++ b/data/presets/presets/leisure/golf_course.json
@@ -7,11 +7,11 @@
         "opening_hours"
     ],
     "moreFields": [
-        "payment_multi",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "payment_multi",
+        "phone",
+        "website"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/hackerspace.json b/data/presets/presets/leisure/hackerspace.json
index 9fae23ff9..35028b9bc 100644
--- a/data/presets/presets/leisure/hackerspace.json
+++ b/data/presets/presets/leisure/hackerspace.json
@@ -17,6 +17,7 @@
         "air_conditioning",
         "email",
         "fax",
+        "level",
         "phone",
         "smoking",
         "wheelchair"
diff --git a/data/presets/presets/leisure/horse_riding.json b/data/presets/presets/leisure/horse_riding.json
index 1f1522d5d..ff07af779 100644
--- a/data/presets/presets/leisure/horse_riding.json
+++ b/data/presets/presets/leisure/horse_riding.json
@@ -8,12 +8,12 @@
         "building"
     ],
     "moreFields": [
+        "email",
+        "fax",
         "opening_hours",
         "payment_multi",
-        "website",
         "phone",
-        "email",
-        "fax"
+        "website"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/ice_rink.json b/data/presets/presets/leisure/ice_rink.json
index dbc9889bf..fb8247b32 100644
--- a/data/presets/presets/leisure/ice_rink.json
+++ b/data/presets/presets/leisure/ice_rink.json
@@ -9,12 +9,13 @@
         "building"
     ],
     "moreFields": [
+        "email",
+        "fax",
+        "level",
         "opening_hours",
         "payment_multi",
-        "website",
         "phone",
-        "email",
-        "fax"
+        "website"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/marina.json b/data/presets/presets/leisure/marina.json
index 771fee736..0eb663554 100644
--- a/data/presets/presets/leisure/marina.json
+++ b/data/presets/presets/leisure/marina.json
@@ -10,16 +10,16 @@
         "sanitary_dump_station",
         "power_supply"
     ],
-    "moreFields" : [
+    "moreFields": [
         "address",
+        "email",
+        "fax",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
-        "seamark/type",
-        "website",
         "phone",
-        "email",
-        "fax"
+        "seamark/type",
+        "website"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/miniature_golf.json b/data/presets/presets/leisure/miniature_golf.json
index 23c06a97d..0a26fe8ca 100644
--- a/data/presets/presets/leisure/miniature_golf.json
+++ b/data/presets/presets/leisure/miniature_golf.json
@@ -10,10 +10,10 @@
         "charge_fee"
     ],
     "moreFields": [
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/nature_reserve.json b/data/presets/presets/leisure/nature_reserve.json
index 6abc93f7e..d3df0e7b9 100644
--- a/data/presets/presets/leisure/nature_reserve.json
+++ b/data/presets/presets/leisure/nature_reserve.json
@@ -12,10 +12,10 @@
     ],
     "moreFields": [
         "dog",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "tags": {
         "leisure": "nature_reserve"
diff --git a/data/presets/presets/leisure/outdoor_seating.json b/data/presets/presets/leisure/outdoor_seating.json
index 1cd8ddd6e..2090a1947 100644
--- a/data/presets/presets/leisure/outdoor_seating.json
+++ b/data/presets/presets/leisure/outdoor_seating.json
@@ -8,6 +8,9 @@
         "name",
         "operator"
     ],
+    "moreFields": [
+        "level"
+    ],
     "terms": [
         "al fresco",
         "beer garden",
diff --git a/data/presets/presets/leisure/park.json b/data/presets/presets/leisure/park.json
index bcd5da096..0bcc9f9f0 100644
--- a/data/presets/presets/leisure/park.json
+++ b/data/presets/presets/leisure/park.json
@@ -8,11 +8,11 @@
     ],
     "moreFields": [
         "dog",
-        "smoking",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "smoking",
+        "website"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/picnic_table.json b/data/presets/presets/leisure/picnic_table.json
index fe2f9d4cd..24ad415f4 100644
--- a/data/presets/presets/leisure/picnic_table.json
+++ b/data/presets/presets/leisure/picnic_table.json
@@ -5,6 +5,9 @@
         "lit",
         "bench"
     ],
+    "moreFields": [
+        "level"
+    ],
     "geometry": [
         "point"
     ],
diff --git a/data/presets/presets/leisure/pitch/soccer.json b/data/presets/presets/leisure/pitch/soccer.json
index e6399cf8e..fa7def4a7 100644
--- a/data/presets/presets/leisure/pitch/soccer.json
+++ b/data/presets/presets/leisure/pitch/soccer.json
@@ -13,7 +13,7 @@
         "value": "soccer"
     },
     "terms": [
-    	"football"
+        "football"
     ],
     "name": "Soccer Field"
 }
diff --git a/data/presets/presets/leisure/pitch/softball.json b/data/presets/presets/leisure/pitch/softball.json
index 7aaa317e6..1de4cc41e 100644
--- a/data/presets/presets/leisure/pitch/softball.json
+++ b/data/presets/presets/leisure/pitch/softball.json
@@ -1,20 +1,20 @@
 {
-  "icon": "maki-baseball",
-  "geometry": [
-    "point",
-    "area"
-  ],
-  "tags": {
-    "leisure": "pitch",
-    "sport": "softball"
-  },
-  "reference": {
-    "key": "sport",
-    "value": "softball"
-  },
-  "terms": [
-    "softball",
-    "diamond"
-  ],
-  "name": "Softball Field"
+    "icon": "maki-baseball",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "leisure": "pitch",
+        "sport": "softball"
+    },
+    "reference": {
+        "key": "sport",
+        "value": "softball"
+    },
+    "terms": [
+        "softball",
+        "diamond"
+    ],
+    "name": "Softball Field"
 }
diff --git a/data/presets/presets/leisure/playground.json b/data/presets/presets/leisure/playground.json
index 17e58c840..a4c666bb1 100644
--- a/data/presets/presets/leisure/playground.json
+++ b/data/presets/presets/leisure/playground.json
@@ -3,10 +3,16 @@
     "fields": [
         "name",
         "operator",
+        "playground/theme",
         "surface",
+        "access_simple",
         "min_age",
-        "max_age",
-        "access_simple"
+        "max_age"
+    ],
+    "moreFields": [
+        "blind",
+        "dog",
+        "wheelchair"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/sauna.json b/data/presets/presets/leisure/sauna.json
index 52843ab18..7b012afaf 100644
--- a/data/presets/presets/leisure/sauna.json
+++ b/data/presets/presets/leisure/sauna.json
@@ -11,10 +11,11 @@
         "charge_fee"
     ],
     "moreFields": [
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "level",
+        "phone",
+        "website"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/sports_centre.json b/data/presets/presets/leisure/sports_centre.json
index 08eff4a4f..5ed928f15 100644
--- a/data/presets/presets/leisure/sports_centre.json
+++ b/data/presets/presets/leisure/sports_centre.json
@@ -10,11 +10,11 @@
         "charge_fee"
     ],
     "moreFields": [
-        "opening_hours",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "opening_hours",
+        "phone",
+        "website"
     ],
     "geometry": [
         "point",
@@ -23,7 +23,6 @@
     "tags": {
         "leisure": "sports_centre"
     },
-    "terms": [
-    ],
+    "terms": [],
     "name": "Sports Center / Complex"
 }
diff --git a/data/presets/presets/leisure/sports_centre/climbing.json b/data/presets/presets/leisure/sports_centre/climbing.json
index 2a1d836c8..2bbc6db73 100644
--- a/data/presets/presets/leisure/sports_centre/climbing.json
+++ b/data/presets/presets/leisure/sports_centre/climbing.json
@@ -16,8 +16,8 @@
         "ropes"
     ],
     "tags": {
-      "leisure": "sports_centre",
-      "sport": "climbing"
+        "leisure": "sports_centre",
+        "sport": "climbing"
     },
     "reference": {
         "key": "sport",
diff --git a/data/presets/presets/leisure/sports_centre/swimming.json b/data/presets/presets/leisure/sports_centre/swimming.json
index 59b1f07d1..df445e242 100644
--- a/data/presets/presets/leisure/sports_centre/swimming.json
+++ b/data/presets/presets/leisure/sports_centre/swimming.json
@@ -9,8 +9,8 @@
         "water"
     ],
     "tags": {
-      "leisure": "sports_centre",
-      "sport": "swimming"
+        "leisure": "sports_centre",
+        "sport": "swimming"
     },
     "reference": {
         "key": "sport",
diff --git a/data/presets/presets/leisure/stadium.json b/data/presets/presets/leisure/stadium.json
index 105fd501c..d30bbc67c 100644
--- a/data/presets/presets/leisure/stadium.json
+++ b/data/presets/presets/leisure/stadium.json
@@ -6,10 +6,10 @@
         "address"
     ],
     "moreFields": [
-        "website",
-        "phone",
         "email",
-        "fax"    
+        "fax",
+        "phone",
+        "website"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/swimming_pool.json b/data/presets/presets/leisure/swimming_pool.json
index 35cc577e5..237196a85 100644
--- a/data/presets/presets/leisure/swimming_pool.json
+++ b/data/presets/presets/leisure/swimming_pool.json
@@ -10,6 +10,7 @@
     ],
     "moreFields": [
         "address",
+        "level",
         "opening_hours",
         "operator"
     ],
diff --git a/data/presets/presets/leisure/track.json b/data/presets/presets/leisure/track.json
index 9f46b4ad9..d4f8899d7 100644
--- a/data/presets/presets/leisure/track.json
+++ b/data/presets/presets/leisure/track.json
@@ -10,7 +10,8 @@
     "moreFields": [
         "access",
         "covered",
-        "indoor"
+        "indoor",
+        "level"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/water_park.json b/data/presets/presets/leisure/water_park.json
index a5ff7596a..3887295e8 100644
--- a/data/presets/presets/leisure/water_park.json
+++ b/data/presets/presets/leisure/water_park.json
@@ -6,12 +6,12 @@
         "address"
     ],
     "moreFields": [
-        "payment_multi",
         "brand",
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "payment_multi",
+        "phone",
+        "website"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/man_made/dyke.json b/data/presets/presets/man_made/dyke.json
index 88304126c..dedbc3997 100644
--- a/data/presets/presets/man_made/dyke.json
+++ b/data/presets/presets/man_made/dyke.json
@@ -6,7 +6,10 @@
         "man_made": "dyke"
     },
     "terms": [
-        "Dike", "Dyke", "Floodbank", "Stopbank"
+        "Dike",
+        "Dyke",
+        "Floodbank",
+        "Stopbank"
     ],
     "name": "Levee"
 }
diff --git a/data/presets/presets/man_made/mast.json b/data/presets/presets/man_made/mast.json
index 619890817..98dce19ef 100644
--- a/data/presets/presets/man_made/mast.json
+++ b/data/presets/presets/man_made/mast.json
@@ -6,9 +6,9 @@
         "height"
     ],
     "moreFields": [
+        "communication_multi",
         "manufacturer",
-        "material",
-        "communication_multi"
+        "material"
     ],
     "geometry": [
         "point"
diff --git a/data/presets/presets/man_made/observatory.json b/data/presets/presets/man_made/observatory.json
index e54c1030f..8c4faa794 100644
--- a/data/presets/presets/man_made/observatory.json
+++ b/data/presets/presets/man_made/observatory.json
@@ -7,10 +7,10 @@
         "building_area"
     ],
     "moreFields": [
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/man_made/pier.json b/data/presets/presets/man_made/pier.json
index a57584e16..1adf4bb42 100644
--- a/data/presets/presets/man_made/pier.json
+++ b/data/presets/presets/man_made/pier.json
@@ -9,10 +9,10 @@
         "lit"
     ],
     "moreFields": [
+        "{highway/footway}",
         "access",
         "fishing",
-        "incline",
-        "{highway/footway}"
+        "incline"
     ],
     "geometry": [
         "line",
diff --git a/data/presets/presets/man_made/surveillance.json b/data/presets/presets/man_made/surveillance.json
index 0265586be..832a61017 100644
--- a/data/presets/presets/man_made/surveillance.json
+++ b/data/presets/presets/man_made/surveillance.json
@@ -9,7 +9,7 @@
         "surveillance/type",
         "surveillance/zone",
         "direction"
-     ],
+    ],
     "terms": [
         "anpr",
         "alpr",
diff --git a/data/presets/presets/man_made/utility_pole.json b/data/presets/presets/man_made/utility_pole.json
new file mode 100644
index 000000000..9f859bead
--- /dev/null
+++ b/data/presets/presets/man_made/utility_pole.json
@@ -0,0 +1,21 @@
+{
+    "icon": "temaki-utility_pole",
+    "fields": [
+        "ref",
+        "operator",
+        "height",
+        "material"
+    ],
+    "moreFields": [
+        "colour",
+        "manufacturer"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "man_made": "utility_pole"
+    },
+    "name": "Utility Pole"
+}
diff --git a/data/presets/presets/man_made/wastewater_plant.json b/data/presets/presets/man_made/wastewater_plant.json
index c18ee06bc..2fe0f1b33 100644
--- a/data/presets/presets/man_made/wastewater_plant.json
+++ b/data/presets/presets/man_made/wastewater_plant.json
@@ -1,15 +1,15 @@
 {
     "icon": "maki-water",
     "fields": [
-	    "name",
+        "name",
         "operator",
         "address"
     ],
     "moreFields": [
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/man_made/works.json b/data/presets/presets/man_made/works.json
index 5325831c8..ffc492fbf 100644
--- a/data/presets/presets/man_made/works.json
+++ b/data/presets/presets/man_made/works.json
@@ -1,17 +1,17 @@
 {
     "icon": "maki-industry",
     "fields": [
-	    "name",
+        "name",
         "operator",
         "address",
         "building_area",
         "product"
     ],
     "moreFields": [
-        "website",
-        "phone",
         "email",
-        "fax"
+        "fax",
+        "phone",
+        "website"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/military/office.json b/data/presets/presets/military/office.json
index 8b8cad122..2fc50f919 100644
--- a/data/presets/presets/military/office.json
+++ b/data/presets/presets/military/office.json
@@ -4,6 +4,9 @@
         "name",
         "building_area"
     ],
+    "moreFields": [
+        "level"
+    ],
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/office.json b/data/presets/presets/office.json
index 693b8d8be..01ec84eb1 100644
--- a/data/presets/presets/office.json
+++ b/data/presets/presets/office.json
@@ -10,12 +10,13 @@
     "moreFields": [
         "air_conditioning",
         "building/levels_building",
-        "height_building",
         "email",
         "fax",
+        "height_building",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "level",
         "not/name",
         "operator",
         "phone",
diff --git a/data/presets/presets/office/estate_agent.json b/data/presets/presets/office/estate_agent.json
index 51ae020f2..bee728617 100644
--- a/data/presets/presets/office/estate_agent.json
+++ b/data/presets/presets/office/estate_agent.json
@@ -7,6 +7,8 @@
     "tags": {
         "office": "estate_agent"
     },
-    "terms": ["real estate"],
+    "terms": [
+        "real estate"
+    ],
     "name": "Real Estate Office"
 }
diff --git a/data/presets/presets/office/government/tax.json b/data/presets/presets/office/government/tax.json
index 1f5a946e4..cc10ddcd6 100644
--- a/data/presets/presets/office/government/tax.json
+++ b/data/presets/presets/office/government/tax.json
@@ -1,25 +1,25 @@
 {
-  "icon": "maki-town-hall",
-  "fields": [
-      "{office}",
-      "operator"
-  ],
-  "geometry": [
-      "point",
-      "area"
-  ],
-  "terms": [
-      "fiscal authorities",
-      "revenue office",
-      "tax office"
-  ],
-  "tags": {
-      "office": "government",
-      "government": "tax"
-  },
-  "reference": {
-      "key": "government",
-      "value": "tax"
-  },
-  "name": "Tax and Revenue Office"
+    "icon": "maki-town-hall",
+    "fields": [
+        "{office}",
+        "operator"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "fiscal authorities",
+        "revenue office",
+        "tax office"
+    ],
+    "tags": {
+        "office": "government",
+        "government": "tax"
+    },
+    "reference": {
+        "key": "government",
+        "value": "tax"
+    },
+    "name": "Tax and Revenue Office"
 }
diff --git a/data/presets/presets/office/research.json b/data/presets/presets/office/research.json
index f00d6784b..2a18457ee 100644
--- a/data/presets/presets/office/research.json
+++ b/data/presets/presets/office/research.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-suitcase",
+    "icon": "fas-flask",
     "geometry": [
         "point",
         "area"
@@ -7,6 +7,10 @@
     "tags": {
         "office": "research"
     },
-    "terms": [],
+    "terms": [
+        "R and D",
+        "research and development",
+        "research lab"
+    ],
     "name": "Research Office"
 }
diff --git a/data/presets/presets/playground/swing.json b/data/presets/presets/playground/swing.json
index 449bc8b3c..22b6676e3 100644
--- a/data/presets/presets/playground/swing.json
+++ b/data/presets/presets/playground/swing.json
@@ -3,7 +3,8 @@
     "fields": [
         "capacity",
         "baby_seat",
-        "wheelchair"
+        "wheelchair",
+        "blind"
     ],
     "geometry": [
         "point"
diff --git a/data/presets/presets/polling_station.json b/data/presets/presets/polling_station.json
index ea789818b..a4d12c876 100644
--- a/data/presets/presets/polling_station.json
+++ b/data/presets/presets/polling_station.json
@@ -15,6 +15,7 @@
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "level",
         "phone",
         "website",
         "wheelchair"
diff --git a/data/presets/presets/power/generator.json b/data/presets/presets/power/generator.json
index eb0027e52..84cac5b68 100644
--- a/data/presets/presets/power/generator.json
+++ b/data/presets/presets/power/generator.json
@@ -9,6 +9,7 @@
         "ref"
     ],
     "moreFields": [
+        "level",
         "manufacturer"
     ],
     "geometry": [
diff --git a/data/presets/presets/power/pole.json b/data/presets/presets/power/pole.json
index 1f38d0ca7..ea3272a85 100644
--- a/data/presets/presets/power/pole.json
+++ b/data/presets/presets/power/pole.json
@@ -3,6 +3,7 @@
     "fields": [
         "ref",
         "operator",
+        "height",
         "material",
         "line_attachment"
     ],
diff --git a/data/presets/presets/power/tower.json b/data/presets/presets/power/tower.json
index 32084f4cb..63f34acbc 100644
--- a/data/presets/presets/power/tower.json
+++ b/data/presets/presets/power/tower.json
@@ -4,6 +4,7 @@
         "ref",
         "operator",
         "design",
+        "height",
         "material",
         "line_attachment"
     ],
diff --git a/data/presets/presets/public_transport/platform.json b/data/presets/presets/public_transport/platform.json
index 284ffadaf..243c0929c 100644
--- a/data/presets/presets/public_transport/platform.json
+++ b/data/presets/presets/public_transport/platform.json
@@ -12,6 +12,7 @@
         "covered",
         "indoor",
         "layer",
+        "level",
         "lit",
         "wheelchair"
     ],
diff --git a/data/presets/presets/public_transport/platform_point.json b/data/presets/presets/public_transport/platform_point.json
index a25dfbd98..4c7f7b4be 100644
--- a/data/presets/presets/public_transport/platform_point.json
+++ b/data/presets/presets/public_transport/platform_point.json
@@ -10,6 +10,7 @@
     "moreFields": [
         "bench",
         "bin",
+        "level",
         "lit",
         "wheelchair"
     ],
diff --git a/data/presets/presets/public_transport/station.json b/data/presets/presets/public_transport/station.json
index 126cf7f0f..c3fc82592 100644
--- a/data/presets/presets/public_transport/station.json
+++ b/data/presets/presets/public_transport/station.json
@@ -10,12 +10,13 @@
     ],
     "moreFields": [
         "air_conditioning",
-        "internet_access/fee",
-        "internet_access/ssid",
-        "website",
-        "phone",
         "email",
         "fax",
+        "internet_access/fee",
+        "internet_access/ssid",
+        "level",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/public_transport/stop_position.json b/data/presets/presets/public_transport/stop_position.json
index 9ca4ff2ba..72d35cc03 100644
--- a/data/presets/presets/public_transport/stop_position.json
+++ b/data/presets/presets/public_transport/stop_position.json
@@ -6,6 +6,9 @@
         "network",
         "operator"
     ],
+    "moreFields": [
+        "level"
+    ],
     "geometry": [
         "vertex"
     ],
diff --git a/data/presets/presets/railway/subway_entrance.json b/data/presets/presets/railway/subway_entrance.json
index 97e052796..b593bd040 100644
--- a/data/presets/presets/railway/subway_entrance.json
+++ b/data/presets/presets/railway/subway_entrance.json
@@ -5,7 +5,8 @@
         "vertex"
     ],
     "fields": [
-        "name"
+        "name",
+        "level"
     ],
     "tags": {
         "railway": "subway_entrance"
diff --git a/data/presets/presets/seamark/beacon_isolated_danger.json b/data/presets/presets/seamark/beacon_isolated_danger.json
index 0df363aab..93449c790 100644
--- a/data/presets/presets/seamark/beacon_isolated_danger.json
+++ b/data/presets/presets/seamark/beacon_isolated_danger.json
@@ -11,7 +11,7 @@
     ],
     "terms": [
         "beacon isolated danger",
-    	"isolated danger beacon",
+        "isolated danger beacon",
         "iala"
     ],
     "tags": {
diff --git a/data/presets/presets/seamark/beacon_lateral.json b/data/presets/presets/seamark/beacon_lateral.json
index 086692993..9b9aab950 100644
--- a/data/presets/presets/seamark/beacon_lateral.json
+++ b/data/presets/presets/seamark/beacon_lateral.json
@@ -14,9 +14,9 @@
     ],
     "terms": [
         "lateral beacon",
-    	"beacon lateral",
-    	"cevni",
-     	"channel marker",
+        "beacon lateral",
+        "cevni",
+        "channel marker",
         "iala",
         "lateral mark"
     ],
diff --git a/data/presets/presets/seamark/buoy_lateral.json b/data/presets/presets/seamark/buoy_lateral.json
index a1f6775ec..26f44e2ce 100644
--- a/data/presets/presets/seamark/buoy_lateral.json
+++ b/data/presets/presets/seamark/buoy_lateral.json
@@ -14,9 +14,9 @@
     ],
     "terms": [
         "lateral buoy",
-    	"buoy lateral",
-	 	"cevni",
-     	"channel marker",
+        "buoy lateral",
+        "cevni",
+        "channel marker",
         "iala",
         "lateral mark"
     ],
diff --git a/data/presets/presets/seamark/buoy_lateral/green.json b/data/presets/presets/seamark/buoy_lateral/green.json
index 362b83714..857ae3046 100644
--- a/data/presets/presets/seamark/buoy_lateral/green.json
+++ b/data/presets/presets/seamark/buoy_lateral/green.json
@@ -5,9 +5,9 @@
     ],
     "terms": [
         "lateral buoy",
-    	"buoy lateral",
-	 	"cevni",
-     	"channel marker",
+        "buoy lateral",
+        "cevni",
+        "channel marker",
         "iala",
         "lateral mark"
     ],
diff --git a/data/presets/presets/seamark/buoy_lateral/red.json b/data/presets/presets/seamark/buoy_lateral/red.json
index 851cf7e85..431ff7266 100644
--- a/data/presets/presets/seamark/buoy_lateral/red.json
+++ b/data/presets/presets/seamark/buoy_lateral/red.json
@@ -5,9 +5,9 @@
     ],
     "terms": [
         "lateral buoy",
-    	"buoy lateral",
-	 	"cevni",
-     	"channel marker",
+        "buoy lateral",
+        "cevni",
+        "channel marker",
         "iala",
         "lateral mark"
     ],
diff --git a/data/presets/presets/seamark/mooring.json b/data/presets/presets/seamark/mooring.json
index 1b2e946c1..247015bf3 100644
--- a/data/presets/presets/seamark/mooring.json
+++ b/data/presets/presets/seamark/mooring.json
@@ -9,11 +9,11 @@
         "point"
     ],
     "terms": [
-    	"dolphin",
-    	"pile",
-    	"bollard",
-    	"buoy",
-    	"post"
+        "dolphin",
+        "pile",
+        "bollard",
+        "buoy",
+        "post"
     ],
     "tags": {
         "seamark:type": "mooring"
diff --git a/data/presets/presets/shop.json b/data/presets/presets/shop.json
index 31848ffb5..1ae037b71 100644
--- a/data/presets/presets/shop.json
+++ b/data/presets/presets/shop.json
@@ -13,13 +13,14 @@
         "air_conditioning",
         "brand",
         "building/levels_building",
-        "height_building",
         "currency_multi",
         "email",
         "fax",
+        "height_building",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "level",
         "not/name",
         "phone",
         "second_hand",
diff --git a/data/presets/presets/shop/antiques.json b/data/presets/presets/shop/antiques.json
index 534da36ba..b8682ca1e 100644
--- a/data/presets/presets/shop/antiques.json
+++ b/data/presets/presets/shop/antiques.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-furniture",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/appliance.json b/data/presets/presets/shop/appliance.json
index 393fa2c70..2cb32ad55 100644
--- a/data/presets/presets/shop/appliance.json
+++ b/data/presets/presets/shop/appliance.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-laundry",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/beauty.json b/data/presets/presets/shop/beauty.json
index b4b695856..d16863034 100644
--- a/data/presets/presets/shop/beauty.json
+++ b/data/presets/presets/shop/beauty.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-lipstick",
     "fields": [
         "{shop}",
         "beauty"
diff --git a/data/presets/presets/shop/beauty/tanning.json b/data/presets/presets/shop/beauty/tanning.json
index 60b63a24b..454e4b88d 100644
--- a/data/presets/presets/shop/beauty/tanning.json
+++ b/data/presets/presets/shop/beauty/tanning.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-tanning",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/beverages.json b/data/presets/presets/shop/beverages.json
index e353144c3..781c77507 100644
--- a/data/presets/presets/shop/beverages.json
+++ b/data/presets/presets/shop/beverages.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-bottles",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/bookmaker.json b/data/presets/presets/shop/bookmaker.json
index 1a7ea899d..3a7ef107a 100644
--- a/data/presets/presets/shop/bookmaker.json
+++ b/data/presets/presets/shop/bookmaker.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-money_hand",
     "moreFields": [
         "{shop}",
         "min_age"
diff --git a/data/presets/presets/shop/carpet.json b/data/presets/presets/shop/carpet.json
index a0a75f919..3f7c23a00 100644
--- a/data/presets/presets/shop/carpet.json
+++ b/data/presets/presets/shop/carpet.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-tape",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/chocolate.json b/data/presets/presets/shop/chocolate.json
index 0dfd9cf1c..6009e60d5 100644
--- a/data/presets/presets/shop/chocolate.json
+++ b/data/presets/presets/shop/chocolate.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-chocolate",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/cosmetics.json b/data/presets/presets/shop/cosmetics.json
index 2230c22a4..76e22ca1a 100644
--- a/data/presets/presets/shop/cosmetics.json
+++ b/data/presets/presets/shop/cosmetics.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-lipstick",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/country_store.json b/data/presets/presets/shop/country_store.json
index 23c24ea3f..e4701b490 100644
--- a/data/presets/presets/shop/country_store.json
+++ b/data/presets/presets/shop/country_store.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-hat-cowboy-side",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/farm.json b/data/presets/presets/shop/farm.json
index 5be1cc712..8e64a36b8 100644
--- a/data/presets/presets/shop/farm.json
+++ b/data/presets/presets/shop/farm.json
@@ -1,12 +1,18 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-apple-alt",
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
+        "baked goods",
         "farm shop",
-        "farm stand"
+        "farm stand",
+        "fresh food",
+        "fruits",
+        "greengrocer",
+        "organics",
+        "vegetables"
     ],
     "tags": {
         "shop": "farm"
diff --git a/data/presets/presets/shop/fashion_accessories.json b/data/presets/presets/shop/fashion_accessories.json
index cc36a61f1..3ba61db25 100644
--- a/data/presets/presets/shop/fashion_accessories.json
+++ b/data/presets/presets/shop/fashion_accessories.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-fashion_accessories",
     "fields": [
         "name",
         "clothes",
diff --git a/data/presets/presets/shop/fishing.json b/data/presets/presets/shop/fishing.json
index ce1456156..d1264b216 100644
--- a/data/presets/presets/shop/fishing.json
+++ b/data/presets/presets/shop/fishing.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-ice_fishing",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/fuel.json b/data/presets/presets/shop/fuel.json
index 95dad7f1a..efa07c12f 100644
--- a/data/presets/presets/shop/fuel.json
+++ b/data/presets/presets/shop/fuel.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-gas",
     "fields": [
         "{shop}",
         "fuel_multi"
diff --git a/data/presets/presets/shop/gas.json b/data/presets/presets/shop/gas.json
index 224610f44..de683ca73 100644
--- a/data/presets/presets/shop/gas.json
+++ b/data/presets/presets/shop/gas.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-gas",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/general.json b/data/presets/presets/shop/general.json
index 07c330e21..293b1e78f 100644
--- a/data/presets/presets/shop/general.json
+++ b/data/presets/presets/shop/general.json
@@ -7,6 +7,8 @@
     "tags": {
         "shop": "general"
     },
-    "terms": ["Village Shop"],
+    "terms": [
+        "village shop"
+    ],
     "name": "General Store"
 }
diff --git a/data/presets/presets/shop/hairdresser_supply.json b/data/presets/presets/shop/hairdresser_supply.json
index 0e484c96e..3b16dab80 100644
--- a/data/presets/presets/shop/hairdresser_supply.json
+++ b/data/presets/presets/shop/hairdresser_supply.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-hair_care",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/hearing_aids.json b/data/presets/presets/shop/hearing_aids.json
index 1234d1ad6..1cab5caa1 100644
--- a/data/presets/presets/shop/hearing_aids.json
+++ b/data/presets/presets/shop/hearing_aids.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-hearing_aid",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/hunting.json b/data/presets/presets/shop/hunting.json
index b8e75679d..8c7157122 100644
--- a/data/presets/presets/shop/hunting.json
+++ b/data/presets/presets/shop/hunting.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-binoculars",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/kitchen.json b/data/presets/presets/shop/kitchen.json
index dc909bcfa..d4eb44460 100644
--- a/data/presets/presets/shop/kitchen.json
+++ b/data/presets/presets/shop/kitchen.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-kitchen_sink",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/laundry.json b/data/presets/presets/shop/laundry.json
index 9f085df43..e6735082e 100644
--- a/data/presets/presets/shop/laundry.json
+++ b/data/presets/presets/shop/laundry.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-laundry",
+    "icon": "temaki-laundry",
     "fields": [
         "{shop}",
         "self_service"
diff --git a/data/presets/presets/shop/laundry/self_service.json b/data/presets/presets/shop/laundry/self_service.json
index 27557f243..e15727ec8 100644
--- a/data/presets/presets/shop/laundry/self_service.json
+++ b/data/presets/presets/shop/laundry/self_service.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-laundry",
+    "icon": "temaki-laundry",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/leather.json b/data/presets/presets/shop/leather.json
index cbbb8c339..73a4fd4d7 100644
--- a/data/presets/presets/shop/leather.json
+++ b/data/presets/presets/shop/leather.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-handbag",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/lighting.json b/data/presets/presets/shop/lighting.json
index 34ee5d4a3..647126311 100644
--- a/data/presets/presets/shop/lighting.json
+++ b/data/presets/presets/shop/lighting.json
@@ -1,5 +1,5 @@
 {
-    "icon": "far-lightbulb",
+    "icon": "temaki-bulb3",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/lottery.json b/data/presets/presets/shop/lottery.json
index df1dc2381..a2bb41daf 100644
--- a/data/presets/presets/shop/lottery.json
+++ b/data/presets/presets/shop/lottery.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-ticket-alt",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/medical_supply.json b/data/presets/presets/shop/medical_supply.json
index a2d4156a0..8377c66e9 100644
--- a/data/presets/presets/shop/medical_supply.json
+++ b/data/presets/presets/shop/medical_supply.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-crutch",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/money_lender.json b/data/presets/presets/shop/money_lender.json
index 77ebdd8e1..a5a37dcd9 100644
--- a/data/presets/presets/shop/money_lender.json
+++ b/data/presets/presets/shop/money_lender.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-bank",
+    "icon": "temaki-money_hand",
     "fields": [
         "{shop}",
         "currency_multi"
diff --git a/data/presets/presets/shop/nutrition_supplements.json b/data/presets/presets/shop/nutrition_supplements.json
index 0cb694b46..1199da5dd 100644
--- a/data/presets/presets/shop/nutrition_supplements.json
+++ b/data/presets/presets/shop/nutrition_supplements.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-pills",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/pawnbroker.json b/data/presets/presets/shop/pawnbroker.json
index 4edfec752..0ce584243 100644
--- a/data/presets/presets/shop/pawnbroker.json
+++ b/data/presets/presets/shop/pawnbroker.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-money_hand",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/perfumery.json b/data/presets/presets/shop/perfumery.json
index afd9fdaca..1df606a27 100644
--- a/data/presets/presets/shop/perfumery.json
+++ b/data/presets/presets/shop/perfumery.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-perfume",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/printer_ink.json b/data/presets/presets/shop/printer_ink.json
index e0c7b1253..4c34d4ade 100644
--- a/data/presets/presets/shop/printer_ink.json
+++ b/data/presets/presets/shop/printer_ink.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-print",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/psychic.json b/data/presets/presets/shop/psychic.json
new file mode 100644
index 000000000..4cbce9fb1
--- /dev/null
+++ b/data/presets/presets/shop/psychic.json
@@ -0,0 +1,19 @@
+{
+    "icon": "temaki-psychic",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "psychic"
+    },
+    "terms": [
+        "astrology",
+        "crystal ball",
+        "divination",
+        "fortune teller",
+        "seer",
+        "spirit"
+    ],
+    "name": "Psychic"
+}
diff --git a/data/presets/presets/shop/rental.json b/data/presets/presets/shop/rental.json
index d8c7cfd65..7d8f9d2ef 100644
--- a/data/presets/presets/shop/rental.json
+++ b/data/presets/presets/shop/rental.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-dolly",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/seafood.json b/data/presets/presets/shop/seafood.json
index 5b949c930..421deddfb 100644
--- a/data/presets/presets/shop/seafood.json
+++ b/data/presets/presets/shop/seafood.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-fish_cleaning",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/supermarket.json b/data/presets/presets/shop/supermarket.json
index 2a056da7b..506f763d7 100644
--- a/data/presets/presets/shop/supermarket.json
+++ b/data/presets/presets/shop/supermarket.json
@@ -1,8 +1,8 @@
 {
     "icon": "maki-grocery",
     "moreFields": [
-        "diet_multi",
-        "{shop}"
+        "{shop}",
+        "diet_multi"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/shop/tobacco.json b/data/presets/presets/shop/tobacco.json
index 044f7b66c..2651cc199 100644
--- a/data/presets/presets/shop/tobacco.json
+++ b/data/presets/presets/shop/tobacco.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-pipe",
     "moreFields": [
         "{shop}",
         "min_age"
diff --git a/data/presets/presets/shop/toys.json b/data/presets/presets/shop/toys.json
index 7c3976996..5245f92ed 100644
--- a/data/presets/presets/shop/toys.json
+++ b/data/presets/presets/shop/toys.json
@@ -1,5 +1,5 @@
 {
-    "icon": "fas-space-shuttle",
+    "icon": "fas-rocket",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/trade.json b/data/presets/presets/shop/trade.json
index d9b5b365b..17a0d815a 100644
--- a/data/presets/presets/shop/trade.json
+++ b/data/presets/presets/shop/trade.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-tools",
     "fields": [
         "name",
         "trade",
diff --git a/data/presets/presets/shop/tyres.json b/data/presets/presets/shop/tyres.json
index 53597b40a..aa7ed02ee 100644
--- a/data/presets/presets/shop/tyres.json
+++ b/data/presets/presets/shop/tyres.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-tire",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/vacuum_cleaner.json b/data/presets/presets/shop/vacuum_cleaner.json
index 1ffe96816..529ee8588 100644
--- a/data/presets/presets/shop/vacuum_cleaner.json
+++ b/data/presets/presets/shop/vacuum_cleaner.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "temaki-vacuum",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/shop/water_sports.json b/data/presets/presets/shop/water_sports.json
index d1cfe2233..a05ce2b19 100644
--- a/data/presets/presets/shop/water_sports.json
+++ b/data/presets/presets/shop/water_sports.json
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-swimmer",
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/tourism/alpine_hut.json b/data/presets/presets/tourism/alpine_hut.json
index 6d8281160..75fa63a66 100644
--- a/data/presets/presets/tourism/alpine_hut.json
+++ b/data/presets/presets/tourism/alpine_hut.json
@@ -11,7 +11,7 @@
         "payment_multi_fee",
         "charge_fee"
     ],
-    "moreFields" : [
+    "moreFields": [
         "email",
         "fax",
         "internet_access/ssid",
diff --git a/data/presets/presets/tourism/apartment.json b/data/presets/presets/tourism/apartment.json
index cc9103e34..da35f53b0 100644
--- a/data/presets/presets/tourism/apartment.json
+++ b/data/presets/presets/tourism/apartment.json
@@ -9,12 +9,13 @@
         "internet_access",
         "internet_access/fee"
     ],
-    "moreFields" : [
+    "moreFields": [
         "building/levels_building",
-        "height_building",
         "email",
         "fax",
+        "height_building",
         "internet_access/ssid",
+        "level",
         "payment_multi",
         "phone",
         "reservation",
diff --git a/data/presets/presets/tourism/aquarium.json b/data/presets/presets/tourism/aquarium.json
index 097908c2c..edc8b1392 100644
--- a/data/presets/presets/tourism/aquarium.json
+++ b/data/presets/presets/tourism/aquarium.json
@@ -9,16 +9,16 @@
     ],
     "moreFields": [
         "charge_fee",
+        "email",
+        "fax",
         "fee",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
         "payment_multi_fee",
+        "phone",
         "smoking",
         "website",
-        "phone",
-        "email",
-        "fax",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/tourism/artwork.json b/data/presets/presets/tourism/artwork.json
index 1c384bdc5..57625ee3d 100644
--- a/data/presets/presets/tourism/artwork.json
+++ b/data/presets/presets/tourism/artwork.json
@@ -6,6 +6,7 @@
         "artist"
     ],
     "moreFields": [
+        "level",
         "material",
         "website"
     ],
diff --git a/data/presets/presets/tourism/artwork/bust.json b/data/presets/presets/tourism/artwork/bust.json
index 78c63c016..dedaa4b21 100644
--- a/data/presets/presets/tourism/artwork/bust.json
+++ b/data/presets/presets/tourism/artwork/bust.json
@@ -6,7 +6,8 @@
         "material"
     ],
     "geometry": [
-        "point", "vertex"
+        "point",
+        "vertex"
     ],
     "tags": {
         "tourism": "artwork",
diff --git a/data/presets/presets/tourism/camp_site.json b/data/presets/presets/tourism/camp_site.json
index e0448cb9b..2baeb13dd 100644
--- a/data/presets/presets/tourism/camp_site.json
+++ b/data/presets/presets/tourism/camp_site.json
@@ -12,7 +12,7 @@
         "internet_access",
         "internet_access/fee"
     ],
-    "moreFields" : [
+    "moreFields": [
         "email",
         "fax",
         "internet_access/ssid",
diff --git a/data/presets/presets/tourism/caravan_site.json b/data/presets/presets/tourism/caravan_site.json
index 3ba999620..50034d0a1 100644
--- a/data/presets/presets/tourism/caravan_site.json
+++ b/data/presets/presets/tourism/caravan_site.json
@@ -9,19 +9,19 @@
         "internet_access",
         "internet_access/fee"
     ],
-    "moreFields" : [
+    "moreFields": [
         "charge_fee",
-        "operator",
-        "fee",
-        "payment_multi_fee",
-        "internet_access/ssid",
-        "smoking",
-        "website",
-        "phone",
         "email",
         "fax",
-        "wheelchair",
-        "reservation"
+        "fee",
+        "internet_access/ssid",
+        "operator",
+        "payment_multi_fee",
+        "phone",
+        "reservation",
+        "smoking",
+        "website",
+        "wheelchair"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/tourism/chalet.json b/data/presets/presets/tourism/chalet.json
index aa08dbcba..096004bf1 100644
--- a/data/presets/presets/tourism/chalet.json
+++ b/data/presets/presets/tourism/chalet.json
@@ -8,19 +8,19 @@
         "internet_access",
         "internet_access/fee"
     ],
-    "moreFields" : [
+    "moreFields": [
         "air_conditioning",
         "building/levels_building",
-        "height_building",
-        "smoking",
-        "payment_multi",
-        "internet_access/ssid",
-        "website",
-        "phone",
         "email",
         "fax",
-        "wheelchair",
-        "reservation"
+        "height_building",
+        "internet_access/ssid",
+        "payment_multi",
+        "phone",
+        "reservation",
+        "smoking",
+        "website",
+        "wheelchair"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/tourism/gallery.json b/data/presets/presets/tourism/gallery.json
index e9e6f328a..c63459547 100644
--- a/data/presets/presets/tourism/gallery.json
+++ b/data/presets/presets/tourism/gallery.json
@@ -8,14 +8,14 @@
         "opening_hours"
     ],
     "moreFields": [
+        "email",
+        "fax",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
         "payment_multi",
-        "website",
         "phone",
-        "email",
-        "fax",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/tourism/guest_house.json b/data/presets/presets/tourism/guest_house.json
index c5d5d861c..6b092d3e4 100644
--- a/data/presets/presets/tourism/guest_house.json
+++ b/data/presets/presets/tourism/guest_house.json
@@ -10,19 +10,19 @@
         "internet_access",
         "internet_access/fee"
     ],
-    "moreFields" : [
+    "moreFields": [
         "air_conditioning",
         "building/levels_building",
-        "height_building",
-        "smoking",
-        "payment_multi",
-        "internet_access/ssid",
-        "website",
-        "phone",
         "email",
         "fax",
-        "wheelchair",
-        "reservation"
+        "height_building",
+        "internet_access/ssid",
+        "payment_multi",
+        "phone",
+        "reservation",
+        "smoking",
+        "website",
+        "wheelchair"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/tourism/hostel.json b/data/presets/presets/tourism/hostel.json
index d3dca59dd..2302fc165 100644
--- a/data/presets/presets/tourism/hostel.json
+++ b/data/presets/presets/tourism/hostel.json
@@ -3,7 +3,7 @@
     "fields": [
         "{tourism/guest_house}"
     ],
-    "moreFields" : [
+    "moreFields": [
         "{tourism/guest_house}"
     ],
     "geometry": [
diff --git a/data/presets/presets/tourism/hotel.json b/data/presets/presets/tourism/hotel.json
index 20ccd7b1d..c6387f994 100644
--- a/data/presets/presets/tourism/hotel.json
+++ b/data/presets/presets/tourism/hotel.json
@@ -5,8 +5,8 @@
     ],
     "moreFields": [
         "{tourism/motel}",
-        "stars",
-        "bar"
+        "bar",
+        "stars"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/tourism/information.json b/data/presets/presets/tourism/information.json
index 550278cd1..e0f1c16f5 100644
--- a/data/presets/presets/tourism/information.json
+++ b/data/presets/presets/tourism/information.json
@@ -6,6 +6,9 @@
         "address",
         "building_area"
     ],
+    "moreFields": [
+        "level"
+    ],
     "geometry": [
         "point",
         "vertex",
diff --git a/data/presets/presets/tourism/information/office.json b/data/presets/presets/tourism/information/office.json
index 675475115..876a3a15b 100644
--- a/data/presets/presets/tourism/information/office.json
+++ b/data/presets/presets/tourism/information/office.json
@@ -10,9 +10,9 @@
     ],
     "moreFields": [
         "building/levels_building",
-        "height_building",
         "email",
         "fax",
+        "height_building",
         "internet_access/ssid",
         "phone",
         "website",
diff --git a/data/presets/presets/tourism/motel.json b/data/presets/presets/tourism/motel.json
index 3cca03a2a..6d8b9a2ad 100644
--- a/data/presets/presets/tourism/motel.json
+++ b/data/presets/presets/tourism/motel.json
@@ -9,12 +9,12 @@
         "internet_access",
         "internet_access/fee"
     ],
-    "moreFields" : [
+    "moreFields": [
         "air_conditioning",
         "building/levels_building",
-        "height_building",
         "email",
         "fax",
+        "height_building",
         "internet_access/ssid",
         "operator",
         "payment_multi",
diff --git a/data/presets/presets/tourism/museum.json b/data/presets/presets/tourism/museum.json
index 5b60a5b81..676355b3c 100644
--- a/data/presets/presets/tourism/museum.json
+++ b/data/presets/presets/tourism/museum.json
@@ -12,16 +12,17 @@
         "air_conditioning",
         "building/levels_building",
         "charge_fee",
-        "height_building",
+        "email",
+        "fax",
         "fee",
+        "height_building",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "level",
         "payment_multi",
-        "website",
         "phone",
-        "email",
-        "fax",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/tourism/picnic_site.json b/data/presets/presets/tourism/picnic_site.json
index 236f8af2f..12f3d3808 100644
--- a/data/presets/presets/tourism/picnic_site.json
+++ b/data/presets/presets/tourism/picnic_site.json
@@ -9,14 +9,15 @@
     ],
     "moreFields": [
         "charge_fee",
+        "fee",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
-        "smoking",
-        "fee",
+        "level",
         "payment_multi_fee",
         "phone",
         "reservation",
+        "smoking",
         "website",
         "wheelchair"
     ],
diff --git a/data/presets/presets/tourism/theme_park.json b/data/presets/presets/tourism/theme_park.json
index ecb8c5fd3..199ecb2ce 100644
--- a/data/presets/presets/tourism/theme_park.json
+++ b/data/presets/presets/tourism/theme_park.json
@@ -7,14 +7,14 @@
         "opening_hours"
     ],
     "moreFields": [
+        "email",
+        "fax",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
         "payment_multi",
-        "website",
         "phone",
-        "email",
-        "fax",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/tourism/trail_riding_station.json b/data/presets/presets/tourism/trail_riding_station.json
index 71793a453..74f1de99a 100644
--- a/data/presets/presets/tourism/trail_riding_station.json
+++ b/data/presets/presets/tourism/trail_riding_station.json
@@ -7,15 +7,15 @@
         "horse_dressage"
     ],
     "moreFields": [
+        "address",
+        "email",
+        "fax",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
-        "address",
         "opening_hours",
-        "website",
         "phone",
-        "email",
-        "fax"
+        "website"
     ],
     "geometry": [
         "point",
@@ -25,5 +25,5 @@
         "tourism": "trail_riding_station"
     },
     "name": "Trail Riding Station",
-    "matchScore": 2.0
+    "matchScore": 2
 }
diff --git a/data/presets/presets/tourism/viewpoint.json b/data/presets/presets/tourism/viewpoint.json
index 6cd2a2f4d..88e52df81 100644
--- a/data/presets/presets/tourism/viewpoint.json
+++ b/data/presets/presets/tourism/viewpoint.json
@@ -7,6 +7,9 @@
     "fields": [
         "direction"
     ],
+    "moreFields": [
+        "level"
+    ],
     "tags": {
         "tourism": "viewpoint"
     },
diff --git a/data/presets/presets/tourism/zoo.json b/data/presets/presets/tourism/zoo.json
index 9cda5f2ef..08686b593 100644
--- a/data/presets/presets/tourism/zoo.json
+++ b/data/presets/presets/tourism/zoo.json
@@ -9,14 +9,14 @@
         "charge_fee"
     ],
     "moreFields": [
+        "email",
+        "fax",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
         "payment_multi",
-        "website",
         "phone",
-        "email",
-        "fax",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/route/bus.json b/data/presets/presets/type/route/bus.json
index 0a7905da2..f50c64aae 100644
--- a/data/presets/presets/type/route/bus.json
+++ b/data/presets/presets/type/route/bus.json
@@ -3,7 +3,7 @@
     "fields": [
         "{type/route/train}"
     ],
-    "moreFields" : [
+    "moreFields": [
         "{type/route/train}"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/route/detour.json b/data/presets/presets/type/route/detour.json
index 3966df1a9..0fdfe0cd0 100644
--- a/data/presets/presets/type/route/detour.json
+++ b/data/presets/presets/type/route/detour.json
@@ -3,7 +3,7 @@
     "fields": [
         "name",
         "ref_route",
-        "to", 
+        "to",
         "from"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/route/ferry.json b/data/presets/presets/type/route/ferry.json
index 51d262c3e..a2d7862c8 100644
--- a/data/presets/presets/type/route/ferry.json
+++ b/data/presets/presets/type/route/ferry.json
@@ -3,7 +3,7 @@
     "fields": [
         "{route/ferry}"
     ],
-    "moreFields" : [
+    "moreFields": [
         "{route/ferry}"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/route/hiking.json b/data/presets/presets/type/route/hiking.json
index e53811c2a..c13f52e71 100644
--- a/data/presets/presets/type/route/hiking.json
+++ b/data/presets/presets/type/route/hiking.json
@@ -7,7 +7,7 @@
         "network_foot",
         "description",
         "distance",
-        "to", 
+        "to",
         "from"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/route/light_rail.json b/data/presets/presets/type/route/light_rail.json
index fcc168eb7..c01c6ba1e 100644
--- a/data/presets/presets/type/route/light_rail.json
+++ b/data/presets/presets/type/route/light_rail.json
@@ -3,7 +3,7 @@
     "fields": [
         "{type/route/train}"
     ],
-    "moreFields" : [
+    "moreFields": [
         "{type/route/train}"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/route/monorail.json b/data/presets/presets/type/route/monorail.json
index a9f2c6a8c..5f9016fbb 100644
--- a/data/presets/presets/type/route/monorail.json
+++ b/data/presets/presets/type/route/monorail.json
@@ -3,7 +3,7 @@
     "fields": [
         "{type/route/train}"
     ],
-    "moreFields" : [
+    "moreFields": [
         "{type/route/train}"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/route/subway.json b/data/presets/presets/type/route/subway.json
index 7806a8194..695c98937 100644
--- a/data/presets/presets/type/route/subway.json
+++ b/data/presets/presets/type/route/subway.json
@@ -3,7 +3,7 @@
     "fields": [
         "{type/route/train}"
     ],
-    "moreFields" : [
+    "moreFields": [
         "{type/route/train}"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/route/train.json b/data/presets/presets/type/route/train.json
index 0868434ad..a392297d0 100644
--- a/data/presets/presets/type/route/train.json
+++ b/data/presets/presets/type/route/train.json
@@ -8,11 +8,11 @@
         "to",
         "from"
     ],
-    "moreFields" : [
+    "moreFields": [
         "colour",
+        "duration",
         "interval",
         "opening_hours",
-        "duration",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/route/tram.json b/data/presets/presets/type/route/tram.json
index 67f56756e..b9355041a 100644
--- a/data/presets/presets/type/route/tram.json
+++ b/data/presets/presets/type/route/tram.json
@@ -3,7 +3,7 @@
     "fields": [
         "{type/route/train}"
     ],
-    "moreFields" : [
+    "moreFields": [
         "{type/route/train}"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/route_master.json b/data/presets/presets/type/route_master.json
index df59e4d6c..a187d8695 100644
--- a/data/presets/presets/type/route_master.json
+++ b/data/presets/presets/type/route_master.json
@@ -7,7 +7,7 @@
         "operator",
         "network"
     ],
-    "moreFields" : [
+    "moreFields": [
         "colour",
         "interval",
         "opening_hours",
diff --git a/data/presets/presets/waterway/boatyard.json b/data/presets/presets/waterway/boatyard.json
index a32b6353b..70b6af834 100644
--- a/data/presets/presets/waterway/boatyard.json
+++ b/data/presets/presets/waterway/boatyard.json
@@ -1,15 +1,15 @@
 {
-     "icon": "maki-harbor",
-     "fields":[
+    "icon": "maki-harbor",
+    "fields": [
         "name",
         "operator"
     ],
     "moreFields": [
         "address",
-        "website",
-        "phone",
         "email",
         "fax",
+        "phone",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/waterway/fuel.json b/data/presets/presets/waterway/fuel.json
index e353d0467..2fa78c19d 100644
--- a/data/presets/presets/waterway/fuel.json
+++ b/data/presets/presets/waterway/fuel.json
@@ -8,14 +8,14 @@
         "fuel_multi"
     ],
     "moreFields": [
-        "payment_multi",
         "brand",
-        "seamark/type",
         "building",
-        "website",
-        "phone",
         "email",
         "fax",
+        "payment_multi",
+        "phone",
+        "seamark/type",
+        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/waterway/water_point.json b/data/presets/presets/waterway/water_point.json
index effdd291f..a7bad2434 100644
--- a/data/presets/presets/waterway/water_point.json
+++ b/data/presets/presets/waterway/water_point.json
@@ -1,6 +1,6 @@
 {
-     "icon": "maki-drinking-water",
-     "geometry": [
+    "icon": "maki-drinking-water",
+    "geometry": [
         "area",
         "vertex",
         "point"
diff --git a/data/presets/presets/waterway/weir.json b/data/presets/presets/waterway/weir.json
index e9c7f0452..aaae8ff74 100644
--- a/data/presets/presets/waterway/weir.json
+++ b/data/presets/presets/waterway/weir.json
@@ -7,7 +7,7 @@
         "material"
     ],
     "moreFields": [
-        "seamark/type"    
+        "seamark/type"
     ],
     "geometry": [
         "vertex",
diff --git a/data/presets/schema/field.json b/data/presets/schema/field.json
index 262e82dac..82dc4e34a 100644
--- a/data/presets/schema/field.json
+++ b/data/presets/schema/field.json
@@ -109,8 +109,18 @@
             "type": "string"
         },
         "strings": {
-            "description": "Translatable strings options (combo fields)",
-            "type": "object"
+            "description": "Strings sent to transifex for translation",
+            "type": "object",
+            "properties": {
+                "options": {
+                    "description": "Translatable options (combo fields)",
+                    "type": "object"
+                }
+            },
+            "additionalProperties": {
+                "description": "Specialized fields can request translation of arbitrary strings",
+                "type": "object"
+            }
         },
         "snake_case": {
             "description": "If true, replace spaces with underscores in the tag value (combo fields only)",
@@ -133,23 +143,38 @@
         "prerequisiteTag": {
             "description": "Tagging constraint for showing this field in the editor",
             "type": {
-                "type": "object",
-                "properties": {
-                    "key": {
-                        "description": "The key of the required tag",
-                        "type": "string",
-                        "required": true
+                "anyOf": [
+                    {
+                        "type": "object",
+                        "properties": {
+                            "key": {
+                                "description": "The key of the required tag",
+                                "type": "string",
+                                "required": true
+                            },
+                            "value": {
+                                "description": "The value that the tag must have. (alternative to 'valueNot')",
+                                "type": "string"
+                            },
+                            "valueNot": {
+                                "description": "The value that the tag cannot have. (alternative to 'value')",
+                                "type": "string"
+                            }
+                        },
+                        "additionalProperties": false
                     },
-                    "value": {
-                        "description": "The value that the tag must have. (alternative to 'valueNot')",
-                        "type": "string"
-                    },
-                    "valueNot": {
-                        "description": "The value that the tag cannot have. (alternative to 'value')",
-                        "type": "string"
+                    {
+                        "type": "object",
+                        "properties": {
+                            "keyNot": {
+                                "description": "A key that must not be present",
+                                "type": "string",
+                                "required": true
+                            }
+                        },
+                        "additionalProperties": false
                     }
-                },
-                "additionalProperties": false
+                ]
             }
         },
         "terms": {
diff --git a/data/presets/schema/preset.json b/data/presets/schema/preset.json
index 22e116400..9c5e44a84 100644
--- a/data/presets/schema/preset.json
+++ b/data/presets/schema/preset.json
@@ -108,6 +108,15 @@
                 "type": "string",
                 "pattern": "^[a-z]{2}$"
             }
+        },
+        "notCountryCodes":  {
+            "description": "Countries where NOT to display the preset, as lowercase ISO 3166-1 alpha-2 codes (https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)",
+            "type": "array",
+            "uniqueItems": true,
+            "items": {
+                "type": "string",
+                "pattern": "^[a-z]{2}$"
+            }
         }
     },
     "additionalProperties": false
diff --git a/data/taginfo.json b/data/taginfo.json
index 567d042a3..db9fe23cf 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1,7 +1,7 @@
 {
   "data_format": 1,
   "data_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/data/taginfo.json",
-  "project": {"name": "iD Editor", "description": "Online editor for OSM data.", "project_url": "https://github.com/openstreetmap/iD", "doc_url": "https://github.com/openstreetmap/iD/blob/master/data/presets/README.md", "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/dist/img/logo.png", "keywords": ["editor"]},
+  "project": {"name": "iD Editor", "description": "Online editor for OSM data.", "project_url": "https://github.com/openstreetmap/iD", "doc_url": "https://github.com/openstreetmap/iD/blob/master/data/presets/README.md", "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@release/dist/img/logo.png", "keywords": ["editor"]},
   "tags": [
     {"key": "aerialway", "description": "🄿 Aerialway (unsearchable), 🄵 Type", "object_types": ["node", "way"]},
     {"key": "aeroway", "description": "🄿 Aeroway (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/airport-15.svg"},
@@ -30,7 +30,7 @@
     {"key": "advertising", "value": "billboard", "description": "🄿 Billboard", "object_types": ["node", "way"]},
     {"key": "advertising", "value": "column", "description": "🄿 Advertising Column", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/storage_tank.svg"},
     {"key": "aerialway", "value": "station", "description": "🄿 Aerialway Station (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/aerialway-15.svg"},
-    {"key": "aerialway", "value": "cable_car", "description": "🄿 Cable Car", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-tram.svg"},
+    {"key": "aerialway", "value": "cable_car", "description": "🄿 Cable Car", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-tram.svg"},
     {"key": "aerialway", "value": "chair_lift", "description": "🄿 Chair Lift", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/chairlift.svg"},
     {"key": "aerialway", "value": "drag_lift", "description": "🄿 Drag Lift", "object_types": ["way"]},
     {"key": "aerialway", "value": "gondola", "description": "🄿 Gondola", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/aerialway-15.svg"},
@@ -46,15 +46,16 @@
     {"key": "aeroway", "value": "aerodrome", "description": "🄿 Airport", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/airport-15.svg"},
     {"key": "aeroway", "value": "apron", "description": "🄿 Apron", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/airport-15.svg"},
     {"key": "aeroway", "value": "gate", "description": "🄿 Airport Gate", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/airport-15.svg"},
-    {"key": "aeroway", "value": "hangar", "description": "🄿 Hangar", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-warehouse.svg"},
+    {"key": "aeroway", "value": "hangar", "description": "🄿 Hangar", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-warehouse.svg"},
     {"key": "aeroway", "value": "helipad", "description": "🄿 Helipad", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/heliport-15.svg"},
     {"key": "aeroway", "value": "holding_position", "description": "🄿 Aircraft Holding Position", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/airport-15.svg"},
     {"key": "aeroway", "value": "jet_bridge", "description": "🄿 Jet Bridge", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/pedestrian.svg"},
     {"key": "aeroway", "value": "parking_position", "description": "🄿 Aircraft Parking Position", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/airport-15.svg"},
-    {"key": "aeroway", "value": "runway", "description": "🄿 Runway", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-plane-departure.svg"},
-    {"key": "aeroway", "value": "taxiway", "description": "🄿 Taxiway", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-plane.svg"},
+    {"key": "aeroway", "value": "runway", "description": "🄿 Runway", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-plane-departure.svg"},
+    {"key": "aeroway", "value": "spaceport", "description": "🄿 Spaceport", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-space-shuttle.svg"},
+    {"key": "aeroway", "value": "taxiway", "description": "🄿 Taxiway", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-plane.svg"},
     {"key": "aeroway", "value": "terminal", "description": "🄿 Airport Terminal", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/airport-15.svg"},
-    {"key": "aeroway", "value": "windsock", "description": "🄿 Windsock", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-wind.svg"},
+    {"key": "aeroway", "value": "windsock", "description": "🄿 Windsock", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-wind.svg"},
     {"key": "allotments", "value": "plot", "description": "🄿 Community Garden Plot", "object_types": ["area"]},
     {"key": "amenity", "value": "bus_station", "description": "🄿 Bus Station / Terminal (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bus-15.svg"},
     {"key": "amenity", "value": "coworking_space", "description": "🄿 Coworking Space (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/commercial-15.svg"},
@@ -64,7 +65,7 @@
     {"key": "amenity", "value": "recycling", "description": "🄿 Recycling (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/recycling-15.svg"},
     {"key": "amenity", "value": "register_office", "description": "🄿 Register Office (unsearchable), 🄳 ➜ office=government + government=register_office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-hall-15.svg"},
     {"key": "amenity", "value": "scrapyard", "description": "🄿 Scrap Yard (unsearchable), 🄳 ➜ landuse=industrial + industrial=scrap_yard", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"},
-    {"key": "amenity", "value": "swimming_pool", "description": "🄿 Swimming Pool (unsearchable), 🄳 ➜ leisure=swimming_pool", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-swimmer.svg"},
+    {"key": "amenity", "value": "swimming_pool", "description": "🄿 Swimming Pool (unsearchable), 🄳 ➜ leisure=swimming_pool", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-swimmer.svg"},
     {"key": "amenity", "value": "animal_boarding", "description": "🄿 Animal Boarding Facility", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/veterinary-15.svg"},
     {"key": "amenity", "value": "animal_breeding", "description": "🄿 Animal Breeding Facility", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/veterinary-15.svg"},
     {"key": "amenity", "value": "animal_shelter", "description": "🄿 Animal Shelter", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/veterinary-15.svg"},
@@ -81,17 +82,17 @@
     {"key": "bicycle_parking", "value": "shed", "description": "🄿 Bicycle Shed", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bicycle-15.svg"},
     {"key": "amenity", "value": "bicycle_rental", "description": "🄿 Bicycle Rental", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bicycle-15.svg"},
     {"key": "amenity", "value": "bicycle_repair_station", "description": "🄿 Bicycle Repair Tool Stand", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bicycle-15.svg"},
-    {"key": "amenity", "value": "biergarten", "description": "🄿 Biergarten", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-beer.svg"},
+    {"key": "amenity", "value": "biergarten", "description": "🄿 Biergarten", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-beer.svg"},
     {"key": "amenity", "value": "boat_rental", "description": "🄿 Boat Rental", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/boating.svg"},
-    {"key": "amenity", "value": "bureau_de_change", "description": "🄿 Currency Exchange", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bank-15.svg"},
+    {"key": "amenity", "value": "bureau_de_change", "description": "🄿 Currency Exchange", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/money_hand.svg"},
     {"key": "amenity", "value": "cafe", "description": "🄿 Cafe", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cafe-15.svg"},
     {"key": "amenity", "value": "car_pooling", "description": "🄿 Car Pooling", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"},
     {"key": "amenity", "value": "car_rental", "description": "🄿 Car Rental", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-rental-15.svg"},
     {"key": "amenity", "value": "car_sharing", "description": "🄿 Car Sharing", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"},
     {"key": "amenity", "value": "car_wash", "description": "🄿 Car Wash", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/car_wash.svg"},
     {"key": "amenity", "value": "casino", "description": "🄿 Casino", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/casino-15.svg"},
-    {"key": "amenity", "value": "charging_station", "description": "🄿 Charging Station", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-charging-station.svg"},
-    {"key": "amenity", "value": "childcare", "description": "🄿 Nursery/Childcare", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-child.svg"},
+    {"key": "amenity", "value": "charging_station", "description": "🄿 Charging Station", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-charging-station.svg"},
+    {"key": "amenity", "value": "childcare", "description": "🄿 Nursery/Childcare", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-child.svg"},
     {"key": "amenity", "value": "cinema", "description": "🄿 Cinema", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cinema-15.svg"},
     {"key": "amenity", "value": "clinic", "description": "🄿 Clinic", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/doctor-15.svg"},
     {"key": "healthcare:speciality", "value": "abortion", "description": "🄿 Abortion Clinic", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/hospital-15.svg"},
@@ -100,9 +101,9 @@
     {"key": "display", "value": "sundial", "description": "🄿 Sundial", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/clock.svg"},
     {"key": "amenity", "value": "college", "description": "🄿 College Grounds", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/college-15.svg"},
     {"key": "amenity", "value": "community_centre", "description": "🄿 Community Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-hall-15.svg"},
-    {"key": "amenity", "value": "compressed_air", "description": "🄿 Compressed Air", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"},
-    {"key": "amenity", "value": "conference_centre", "description": "🄿 Convention Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-user-tie.svg"},
-    {"key": "amenity", "value": "courthouse", "description": "🄿 Courthouse", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-gavel.svg"},
+    {"key": "amenity", "value": "compressed_air", "description": "🄿 Compressed Air", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-tachometer-alt.svg"},
+    {"key": "amenity", "value": "conference_centre", "description": "🄿 Convention Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-user-tie.svg"},
+    {"key": "amenity", "value": "courthouse", "description": "🄿 Courthouse", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-gavel.svg"},
     {"key": "amenity", "value": "crematorium", "description": "🄿 Crematorium", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cemetery-15.svg"},
     {"key": "amenity", "value": "dentist", "description": "🄿 Dentist", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/dentist-15.svg"},
     {"key": "amenity", "value": "dive_centre", "description": "🄿 Dive Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/scuba_diving.svg"},
@@ -111,15 +112,16 @@
     {"key": "amenity", "value": "dressing_room", "description": "🄿 Changing Room", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/clothing-store-15.svg"},
     {"key": "amenity", "value": "drinking_water", "description": "🄿 Drinking Water", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/drinking-water-15.svg"},
     {"key": "amenity", "value": "driving_school", "description": "🄿 Driving School", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"},
-    {"key": "amenity", "value": "events_venue", "description": "🄿 Events Venue", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-users.svg"},
+    {"key": "amenity", "value": "events_venue", "description": "🄿 Events Venue", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-users.svg"},
     {"key": "amenity", "value": "fast_food", "description": "🄿 Fast Food", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/fast-food-15.svg"},
-    {"key": "cuisine", "value": "ice_cream", "description": "🄿 Ice Cream Fast Food (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-ice-cream.svg"},
+    {"key": "cuisine", "value": "ice_cream", "description": "🄿 Ice Cream Fast Food (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-ice-cream.svg"},
     {"key": "cuisine", "value": "burger", "description": "🄿 Burger Fast Food", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/fast-food-15.svg"},
-    {"key": "cuisine", "value": "chicken", "description": "🄿 Chicken Fast Food", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-drumstick-bite.svg"},
+    {"key": "cuisine", "value": "chicken", "description": "🄿 Chicken Fast Food", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-drumstick-bite.svg"},
     {"key": "cuisine", "value": "donut", "description": "🄿 Donut Fast Food", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/donut.svg"},
-    {"key": "cuisine", "value": "fish_and_chips", "description": "🄿 Fish & Chips Fast Food", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-fish.svg"},
+    {"key": "cuisine", "value": "fish_and_chips", "description": "🄿 Fish & Chips Fast Food", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-fish.svg"},
+    {"key": "cuisine", "value": "hot_dog", "description": "🄿 Hot Dog Fast Food", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-hotdog.svg"},
     {"key": "cuisine", "value": "kebab", "description": "🄿 Kebab Fast Food", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/restaurant-15.svg"},
-    {"key": "cuisine", "value": "mexican", "description": "🄿 Mexican Fast Food, 🄿 Mexican Restaurant", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-pepper-hot.svg"},
+    {"key": "cuisine", "value": "mexican", "description": "🄿 Mexican Fast Food, 🄿 Mexican Restaurant", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-pepper-hot.svg"},
     {"key": "cuisine", "value": "pizza", "description": "🄿 Pizza Fast Food, 🄿 Pizza Restaurant", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/restaurant-pizza-15.svg"},
     {"key": "cuisine", "value": "sandwich", "description": "🄿 Sandwich Fast Food", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/sandwich.svg"},
     {"key": "amenity", "value": "fire_station", "description": "🄿 Fire Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/fire-station-15.svg"},
@@ -127,22 +129,23 @@
     {"key": "amenity", "value": "fountain", "description": "🄿 Fountain", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/fountain.svg"},
     {"key": "amenity", "value": "fuel", "description": "🄿 Gas Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/fuel-15.svg"},
     {"key": "amenity", "value": "grave_yard", "description": "🄿 Graveyard", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cemetery-15.svg"},
-    {"key": "amenity", "value": "grit_bin", "description": "🄿 Grit Bin", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-box.svg"},
+    {"key": "amenity", "value": "grit_bin", "description": "🄿 Grit Bin", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-box.svg"},
     {"key": "amenity", "value": "hospital", "description": "🄿 Hospital Grounds", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/hospital-15.svg"},
     {"key": "amenity", "value": "hunting_stand", "description": "🄿 Hunting Stand", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/binoculars.svg"},
-    {"key": "amenity", "value": "ice_cream", "description": "🄿 Ice Cream Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-ice-cream.svg"},
+    {"key": "amenity", "value": "ice_cream", "description": "🄿 Ice Cream Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-ice-cream.svg"},
     {"key": "amenity", "value": "internet_cafe", "description": "🄿 Internet Cafe", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/antenna.svg"},
     {"key": "amenity", "value": "karaoke_box", "description": "🄿 Karaoke Box", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/karaoke-15.svg"},
-    {"key": "amenity", "value": "kindergarten", "description": "🄿 Preschool/Kindergarten Grounds", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/school-15.svg"},
-    {"key": "amenity", "value": "language_school", "description": "🄿 Language School", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/school-15.svg"},
+    {"key": "amenity", "value": "kindergarten", "description": "🄿 Preschool/Kindergarten Grounds", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/school.svg"},
+    {"key": "amenity", "value": "language_school", "description": "🄿 Language School", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/school.svg"},
     {"key": "amenity", "value": "letter_box", "description": "🄿 Letter Box", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/letter_box.svg"},
     {"key": "amenity", "value": "library", "description": "🄿 Library", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/library-15.svg"},
+    {"key": "amenity", "value": "loading_dock", "description": "🄿 Loading Dock", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-truck-loading.svg"},
     {"key": "amenity", "value": "love_hotel", "description": "🄿 Love Hotel", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/heart-15.svg"},
     {"key": "amenity", "value": "marketplace", "description": "🄿 Marketplace", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
     {"key": "amenity", "value": "monastery", "description": "🄿 Monastery Grounds", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"},
-    {"key": "amenity", "value": "money_transfer", "description": "🄿 Money Transfer Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bank-15.svg"},
-    {"key": "amenity", "value": "motorcycle_parking", "description": "🄿 Motorcycle Parking", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-motorcycle.svg"},
-    {"key": "amenity", "value": "music_school", "description": "🄿 Music School", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/school-15.svg"},
+    {"key": "amenity", "value": "money_transfer", "description": "🄿 Money Transfer Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/money_hand.svg"},
+    {"key": "amenity", "value": "motorcycle_parking", "description": "🄿 Motorcycle Parking", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-motorcycle.svg"},
+    {"key": "amenity", "value": "music_school", "description": "🄿 Music School", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-music.svg"},
     {"key": "amenity", "value": "nightclub", "description": "🄿 Nightclub", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bar-15.svg"},
     {"key": "amenity", "value": "parking_entrance", "description": "🄿 Parking Garage Entrance/Exit", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-alt1-15.svg"},
     {"key": "amenity", "value": "parking_space", "description": "🄿 Parking Space", "object_types": ["node", "area"]},
@@ -150,10 +153,10 @@
     {"key": "parking", "value": "multi-storey", "description": "🄿 Multilevel Parking Garage, 🄵 Type", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"},
     {"key": "park_ride", "value": "yes", "description": "🄿 Park & Ride Lot", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"},
     {"key": "parking", "value": "underground", "description": "🄿 Underground Parking, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"},
-    {"key": "amenity", "value": "payment_centre", "description": "🄿 Payment Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bank-15.svg"},
-    {"key": "amenity", "value": "payment_terminal", "description": "🄿 Payment Terminal", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/far-credit-card.svg"},
+    {"key": "amenity", "value": "payment_centre", "description": "🄿 Payment Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/money_hand.svg"},
+    {"key": "amenity", "value": "payment_terminal", "description": "🄿 Payment Terminal", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/far-credit-card.svg"},
     {"key": "amenity", "value": "pharmacy", "description": "🄿 Pharmacy Counter", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pharmacy-15.svg"},
-    {"key": "amenity", "value": "photo_booth", "description": "🄿 Photo Booth", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-person-booth.svg"},
+    {"key": "amenity", "value": "photo_booth", "description": "🄿 Photo Booth", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-person-booth.svg"},
     {"key": "amenity", "value": "place_of_worship", "description": "🄿 Place of Worship", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"},
     {"key": "religion", "value": "buddhist", "description": "🄿 Buddhist Temple", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/religious-buddhist-15.svg"},
     {"key": "religion", "value": "christian", "description": "🄿 Christian Church", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/religious-christian-15.svg"},
@@ -168,9 +171,9 @@
     {"key": "religion", "value": "taoist", "description": "🄿 Taoist Temple", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/taoism.svg"},
     {"key": "amenity", "value": "planetarium", "description": "🄿 Planetarium", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/globe-15.svg"},
     {"key": "amenity", "value": "police", "description": "🄿 Police", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/police-15.svg"},
-    {"key": "amenity", "value": "polling_station", "description": "🄿 Permanent Polling Place", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-vote-yea.svg"},
+    {"key": "amenity", "value": "polling_station", "description": "🄿 Permanent Polling Place", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-vote-yea.svg"},
     {"key": "amenity", "value": "post_box", "description": "🄿 Mailbox", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/post_box.svg"},
-    {"key": "amenity", "value": "post_depot", "description": "🄿 Post Sorting Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-mail-bulk.svg"},
+    {"key": "amenity", "value": "post_depot", "description": "🄿 Post Sorting Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-mail-bulk.svg"},
     {"key": "amenity", "value": "post_office", "description": "🄿 Post Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/post-15.svg"},
     {"key": "amenity", "value": "prep_school", "description": "🄿 Test Prep / Tutoring School", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/school.svg"},
     {"key": "amenity", "value": "prison", "description": "🄿 Prison Grounds", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/prison-15.svg"},
@@ -196,35 +199,39 @@
     {"key": "cuisine", "value": "noodle", "description": "🄿 Noodle Restaurant", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/restaurant-noodle-15.svg"},
     {"key": "cuisine", "value": "seafood", "description": "🄿 Seafood Restaurant", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/restaurant-seafood-15.svg"},
     {"key": "cuisine", "value": "steak_house", "description": "🄿 Steakhouse", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/slaughterhouse-15.svg"},
-    {"key": "cuisine", "value": "sushi", "description": "🄿 Sushi Restaurant", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-fish.svg"},
+    {"key": "cuisine", "value": "sushi", "description": "🄿 Sushi Restaurant", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/temaki.svg"},
     {"key": "cuisine", "value": "thai", "description": "🄿 Thai Restaurant", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/restaurant-noodle-15.svg"},
     {"key": "cuisine", "value": "turkish", "description": "🄿 Turkish Restaurant", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/restaurant-15.svg"},
     {"key": "cuisine", "value": "vietnamese", "description": "🄿 Vietnamese Restaurant", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/restaurant-noodle-15.svg"},
     {"key": "amenity", "value": "sanitary_dump_station", "description": "🄿 RV Toilet Disposal", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/storage_tank.svg"},
-    {"key": "amenity", "value": "school", "description": "🄿 School Grounds", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/school-15.svg"},
+    {"key": "amenity", "value": "school", "description": "🄿 School Grounds", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/school.svg"},
     {"key": "amenity", "value": "shelter", "description": "🄿 Shelter", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shelter-15.svg"},
     {"key": "shelter_type", "value": "gazebo", "description": "🄿 Gazebo", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shelter-15.svg"},
     {"key": "shelter_type", "value": "lean_to", "description": "🄿 Lean-To", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shelter-15.svg"},
     {"key": "shelter_type", "value": "picnic_shelter", "description": "🄿 Picnic Shelter", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shelter-15.svg"},
     {"key": "shelter_type", "value": "public_transport", "description": "🄿 Transit Shelter", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shelter-15.svg"},
-    {"key": "amenity", "value": "shower", "description": "🄿 Shower", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-shower.svg"},
-    {"key": "amenity", "value": "smoking_area", "description": "🄿 Smoking Area", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-smoking.svg"},
-    {"key": "amenity", "value": "social_centre", "description": "🄿 Social Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-handshake.svg"},
+    {"key": "amenity", "value": "shower", "description": "🄿 Shower", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/shower.svg"},
+    {"key": "amenity", "value": "smoking_area", "description": "🄿 Smoking Area", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-smoking.svg"},
+    {"key": "amenity", "value": "social_centre", "description": "🄿 Social Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-handshake.svg"},
     {"key": "amenity", "value": "social_facility", "description": "🄿 Social Facility", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/social_facility.svg"},
     {"key": "social_facility", "value": "ambulatory_care", "description": "🄿 Ambulatory Care", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/wheelchair-15.svg"},
     {"key": "social_facility", "value": "food_bank", "description": "🄿 Food Bank", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/social_facility.svg"},
     {"key": "social_facility:for", "value": "senior", "description": "🄿 Elderly Group Home, 🄿 Nursing Home", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/wheelchair-15.svg"},
     {"key": "social_facility:for", "value": "homeless", "description": "🄿 Homeless Shelter", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/social_facility.svg"},
-    {"key": "amenity", "value": "studio", "description": "🄿 Studio", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-microphone.svg"},
-    {"key": "amenity", "value": "taxi", "description": "🄿 Taxi Stand", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-taxi.svg"},
+    {"key": "amenity", "value": "studio", "description": "🄿 Studio", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-microphone.svg"},
+    {"key": "studio", "value": "audio", "description": "🄿 Recording Studio", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-microphone.svg"},
+    {"key": "studio", "value": "radio", "description": "🄿 Radio Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-microphone.svg"},
+    {"key": "studio", "value": "television", "description": "🄿 Television Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-video.svg"},
+    {"key": "studio", "value": "video", "description": "🄿 Film Studio", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-video.svg"},
+    {"key": "amenity", "value": "taxi", "description": "🄿 Taxi Stand", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-taxi.svg"},
     {"key": "amenity", "value": "telephone", "description": "🄿 Telephone", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/telephone-15.svg"},
     {"key": "amenity", "value": "theatre", "description": "🄿 Theater", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/theatre-15.svg"},
     {"key": "theatre:type", "value": "amphi", "description": "🄿 Amphitheatre", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/theatre-15.svg"},
     {"key": "amenity", "value": "toilets", "description": "🄿 Toilets", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/toilet-15.svg"},
-    {"key": "toilets:disposal", "value": "flush", "description": "🄿 Flush Toilets, 🄵 Disposal", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-toilet.svg"},
-    {"key": "toilets:disposal", "value": "pitlatrine", "description": "🄿 Pit Latrine, 🄵 Disposal", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/the-noun-project/2009541.svg"},
+    {"key": "toilets:disposal", "value": "flush", "description": "🄿 Flush Toilets, 🄵 Disposal", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-toilet.svg"},
+    {"key": "toilets:disposal", "value": "pitlatrine", "description": "🄿 Pit Latrine, 🄵 Disposal", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/the-noun-project/2009541.svg"},
     {"key": "amenity", "value": "townhall", "description": "🄿 Town Hall", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-hall-15.svg"},
-    {"key": "amenity", "value": "toy_library", "description": "🄿 Toy Library", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-chess-knight.svg"},
+    {"key": "amenity", "value": "toy_library", "description": "🄿 Toy Library", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-chess-knight.svg"},
     {"key": "amenity", "value": "university", "description": "🄿 University Grounds", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/college-15.svg"},
     {"key": "amenity", "value": "vehicle_inspection", "description": "🄿 Vehicle Inspection", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"},
     {"key": "amenity", "value": "vending_machine", "description": "🄿 Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_machine.svg"},
@@ -240,7 +247,7 @@
     {"key": "vending", "value": "food", "description": "🄿 Food Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_machine.svg"},
     {"key": "vending", "value": "fuel", "description": "🄿 Gas Pump", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/fuel-15.svg"},
     {"key": "vending", "value": "ice_cream", "description": "🄿 Ice Cream Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_machine.svg"},
-    {"key": "vending", "value": "newspapers", "description": "🄿 Newspaper Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/far-newspaper.svg"},
+    {"key": "vending", "value": "newspapers", "description": "🄿 Newspaper Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_newspaper.svg"},
     {"key": "vending", "value": "parcel_pickup;parcel_mail_in", "description": "🄿 Parcel Pickup/Dropoff Locker", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_machine.svg"},
     {"key": "vending", "value": "parcel_pickup", "description": "🄿 Parcel Pickup Locker", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_machine.svg"},
     {"key": "vending", "value": "parking_tickets", "description": "🄿 Parking Ticket Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_machine.svg"},
@@ -249,17 +256,18 @@
     {"key": "vending", "value": "sweets", "description": "🄿 Snack Vending Machine", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vending_machine.svg"},
     {"key": "amenity", "value": "veterinary", "description": "🄿 Veterinary", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/veterinary_care.svg"},
     {"key": "amenity", "value": "waste_basket", "description": "🄿 Waste Basket", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/waste-basket-15.svg"},
-    {"key": "amenity", "value": "waste_disposal", "description": "🄿 Garbage Dumpster", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-dumpster.svg"},
+    {"key": "amenity", "value": "waste_disposal", "description": "🄿 Garbage Dumpster", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-dumpster.svg"},
     {"key": "amenity", "value": "waste_transfer_station", "description": "🄿 Waste Transfer Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/waste-basket-15.svg"},
     {"key": "waste", "value": "dog_excrement", "description": "🄿 Dog Excrement Bin", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/waste-basket-15.svg"},
     {"key": "amenity", "value": "water_point", "description": "🄿 RV Drinking Water", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/drinking-water-15.svg"},
     {"key": "amenity", "value": "watering_place", "description": "🄿 Animal Watering Place", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/drinking-water-15.svg"},
+    {"key": "amenity", "value": "weighbridge", "description": "🄿 Truck Scale", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-weight.svg"},
     {"key": "area", "value": "yes", "description": "🄿 Area, 🄿 Pedestrian Area", "object_types": ["area"]},
     {"key": "area:highway", "description": "🄿 Road Surface, 🄵 Type", "object_types": ["area"]},
     {"key": "attraction", "value": "amusement_ride", "description": "🄿 Amusement Ride", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/amusement-park-15.svg"},
     {"key": "attraction", "value": "animal", "description": "🄿 Animal Enclosure", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/zoo-15.svg"},
     {"key": "attraction", "value": "big_wheel", "description": "🄿 Big Wheel", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/amusement-park-15.svg"},
-    {"key": "attraction", "value": "bumper_car", "description": "🄿 Bumper Car", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"},
+    {"key": "attraction", "value": "bumper_car", "description": "🄿 Bumper Cars", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-car-crash.svg"},
     {"key": "attraction", "value": "bungee_jumping", "description": "🄿 Bungee Jumping", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"},
     {"key": "attraction", "value": "carousel", "description": "🄿 Carousel", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/amusement_park.svg"},
     {"key": "attraction", "value": "dark_ride", "description": "🄿 Dark Ride", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/rail-metro-15.svg"},
@@ -267,14 +275,14 @@
     {"key": "attraction", "value": "maze", "description": "🄿 Maze", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/amusement-park-15.svg"},
     {"key": "attraction", "value": "pirate_ship", "description": "🄿 Pirate Ship", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/danger-15.svg"},
     {"key": "attraction", "value": "river_rafting", "description": "🄿 River Rafting", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/ferry-15.svg"},
-    {"key": "attraction", "value": "roller_coaster", "description": "🄿 Roller Coaster", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/amusement-park-15.svg"},
+    {"key": "attraction", "value": "roller_coaster", "description": "🄿 Roller Coaster", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/roller_coaster.svg"},
     {"key": "attraction", "value": "summer_toboggan", "description": "🄿 Summer Toboggan", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/sledding.svg"},
     {"key": "attraction", "value": "train", "description": "🄿 Tourist Train", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/rail-15.svg"},
-    {"key": "attraction", "value": "water_slide", "description": "🄿 Water Slide", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-swimmer.svg"},
+    {"key": "attraction", "value": "water_slide", "description": "🄿 Water Slide", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-swimmer.svg"},
     {"key": "barrier", "description": "🄿 Barrier, 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
     {"key": "barrier", "value": "entrance", "description": "🄿 Entrance (unsearchable)", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-alt1-15.svg"},
     {"key": "barrier", "value": "block", "description": "🄿 Block", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
-    {"key": "barrier", "value": "bollard", "description": "🄿 Bollard", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
+    {"key": "barrier", "value": "bollard", "description": "🄿 Bollard Row, 🄿 Bollard", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/silo.svg"},
     {"key": "barrier", "value": "border_control", "description": "🄿 Border Control", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
     {"key": "barrier", "value": "cattle_grid", "description": "🄿 Cattle Grid", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/barrier-15.svg"},
     {"key": "barrier", "value": "chain", "description": "🄿 Chain", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/barrier-15.svg"},
@@ -293,16 +301,16 @@
     {"key": "kerb", "value": "raised", "description": "🄿 Raised Curb", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/kerb-raised.svg"},
     {"key": "kerb", "value": "rolled", "description": "🄿 Rolled Curb", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/kerb-rolled.svg"},
     {"key": "barrier", "value": "kissing_gate", "description": "🄿 Kissing Gate", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/barrier-15.svg"},
-    {"key": "barrier", "value": "lift_gate", "description": "🄿 Lift Gate", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
+    {"key": "barrier", "value": "lift_gate", "description": "🄿 Lift Gate", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/lift_gate.svg"},
     {"key": "barrier", "value": "retaining_wall", "description": "🄿 Retaining Wall", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/wall.svg"},
-    {"key": "barrier", "value": "sally_port", "description": "🄿 Sally Port", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-dungeon.svg"},
+    {"key": "barrier", "value": "sally_port", "description": "🄿 Sally Port", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-dungeon.svg"},
     {"key": "barrier", "value": "stile", "description": "🄿 Stile", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
     {"key": "barrier", "value": "toll_booth", "description": "🄿 Toll Booth", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
     {"key": "barrier", "value": "turnstile", "description": "🄿 Turnstile", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
     {"key": "barrier", "value": "wall", "description": "🄿 Wall", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/wall.svg"},
     {"key": "boundary", "value": "administrative", "description": "🄿 Administrative Boundary", "object_types": ["way"]},
-    {"key": "bridge:support", "description": "🄿 Bridge Support, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-archway.svg"},
-    {"key": "bridge:support", "value": "pier", "description": "🄿 Bridge Pier", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-archway.svg"},
+    {"key": "bridge:support", "description": "🄿 Bridge Support, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-archway.svg"},
+    {"key": "bridge:support", "value": "pier", "description": "🄿 Bridge Pier", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-archway.svg"},
     {"key": "building:part", "description": "🄿 Building Part", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
     {"key": "building", "value": "bunker", "description": "🄿 Bunker (unsearchable)", "object_types": ["area"]},
     {"key": "building", "value": "entrance", "description": "🄿 Entrance/Exit (unsearchable), 🄳 ➜ entrance=*", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-alt1-15.svg"},
@@ -312,7 +320,7 @@
     {"key": "building", "value": "boathouse", "description": "🄿 Boathouse", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/harbor-15.svg"},
     {"key": "building", "value": "bungalow", "description": "🄿 Bungalow", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"},
     {"key": "building", "value": "cabin", "description": "🄿 Cabin", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"},
-    {"key": "building", "value": "carport", "description": "🄿 Carport", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-warehouse.svg"},
+    {"key": "building", "value": "carport", "description": "🄿 Carport", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-warehouse.svg"},
     {"key": "building", "value": "cathedral", "description": "🄿 Cathedral Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"},
     {"key": "building", "value": "chapel", "description": "🄿 Chapel Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"},
     {"key": "building", "value": "church", "description": "🄿 Church Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/place-of-worship-15.svg"},
@@ -324,11 +332,11 @@
     {"key": "building", "value": "dormitory", "description": "🄿 Dormitory", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
     {"key": "building", "value": "farm_auxiliary", "description": "🄿 Farm Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/farm-15.svg"},
     {"key": "building", "value": "farm", "description": "🄿 Farm House", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/farm-15.svg"},
-    {"key": "building", "value": "garage", "description": "🄿 Garage", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-warehouse.svg"},
-    {"key": "building", "value": "garages", "description": "🄿 Garages", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-warehouse.svg"},
+    {"key": "building", "value": "garage", "description": "🄿 Garage", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-warehouse.svg"},
+    {"key": "building", "value": "garages", "description": "🄿 Garages", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-warehouse.svg"},
     {"key": "building", "value": "grandstand", "description": "🄿 Grandstand", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
     {"key": "building", "value": "greenhouse", "description": "🄿 Greenhouse", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/garden-centre-15.svg"},
-    {"key": "building", "value": "hangar", "description": "🄿 Hangar Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-warehouse.svg"},
+    {"key": "building", "value": "hangar", "description": "🄿 Hangar Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-warehouse.svg"},
     {"key": "building", "value": "hospital", "description": "🄿 Hospital Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
     {"key": "building", "value": "hotel", "description": "🄿 Hotel Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
     {"key": "building", "value": "house", "description": "🄿 House", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"},
@@ -345,8 +353,8 @@
     {"key": "building", "value": "ruins", "description": "🄿 Building Ruins", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/ruins.svg"},
     {"key": "building", "value": "school", "description": "🄿 School Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
     {"key": "building", "value": "semidetached_house", "description": "🄿 Semi-Detached House", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"},
-    {"key": "building", "value": "service", "description": "🄿 Service Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"},
-    {"key": "building", "value": "shed", "description": "🄿 Shed", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"},
+    {"key": "building", "value": "service", "description": "🄿 Service Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
+    {"key": "building", "value": "shed", "description": "🄿 Shed", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-warehouse.svg"},
     {"key": "building", "value": "stable", "description": "🄿 Stable", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/horse-riding-15.svg"},
     {"key": "building", "value": "stadium", "description": "🄿 Stadium Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/stadium-15.svg"},
     {"key": "building", "value": "static_caravan", "description": "🄿 Static Mobile Home", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/home-15.svg"},
@@ -355,7 +363,7 @@
     {"key": "building", "value": "transportation", "description": "🄿 Transportation Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
     {"key": "building", "value": "university", "description": "🄿 University Building", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
     {"key": "building", "value": "warehouse", "description": "🄿 Warehouse", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/warehouse-15.svg"},
-    {"key": "club", "description": "🄿 Club, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-handshake.svg"},
+    {"key": "club", "description": "🄿 Club, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-handshake.svg"},
     {"key": "club", "value": "sport", "description": "🄿 Sports Club", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"},
     {"key": "craft", "description": "🄿 Craft, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tools.svg"},
     {"key": "craft", "value": "jeweler", "description": "🄿 Jeweler (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/marker-stroked-15.svg"},
@@ -386,12 +394,12 @@
     {"key": "craft", "value": "hvac", "description": "🄿 HVAC", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tools.svg"},
     {"key": "craft", "value": "insulation", "description": "🄿 Insulator", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tools.svg"},
     {"key": "craft", "value": "joiner", "description": "🄿 Joiner", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tools.svg"},
-    {"key": "craft", "value": "key_cutter", "description": "🄿 Key Cutter", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-key.svg"},
+    {"key": "craft", "value": "key_cutter", "description": "🄿 Key Cutter", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-key.svg"},
     {"key": "craft", "value": "metal_construction", "description": "🄿 Metal Construction", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tools.svg"},
-    {"key": "craft", "value": "painter", "description": "🄿 Painter", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-paint-roller.svg"},
+    {"key": "craft", "value": "painter", "description": "🄿 Painter", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-paint-roller.svg"},
     {"key": "craft", "value": "parquet_layer", "description": "🄿 Parquet Layer", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tools.svg"},
     {"key": "craft", "value": "photographer", "description": "🄿 Photographer", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/attraction-15.svg"},
-    {"key": "craft", "value": "photographic_laboratory", "description": "🄿 Photographic Laboratory", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-film.svg"},
+    {"key": "craft", "value": "photographic_laboratory", "description": "🄿 Photographic Laboratory", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-film.svg"},
     {"key": "craft", "value": "plasterer", "description": "🄿 Plasterer", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tools.svg"},
     {"key": "craft", "value": "plumber", "description": "🄿 Plumber", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/plumber.svg"},
     {"key": "craft", "value": "pottery", "description": "🄿 Pottery", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/art-gallery-15.svg"},
@@ -417,17 +425,17 @@
     {"key": "emergency", "value": "official", "description": "🄿 Emergency Access Official (unsearchable)", "object_types": ["way"]},
     {"key": "emergency", "value": "private", "description": "🄿 Emergency Access Private (unsearchable)", "object_types": ["way"]},
     {"key": "emergency", "value": "yes", "description": "🄿 Emergency Access Yes (unsearchable)", "object_types": ["way"]},
-    {"key": "emergency", "value": "ambulance_station", "description": "🄿 Ambulance Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-ambulance.svg"},
+    {"key": "emergency", "value": "ambulance_station", "description": "🄿 Ambulance Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-ambulance.svg"},
     {"key": "emergency", "value": "defibrillator", "description": "🄿 Defibrillator", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/defibrillator-15.svg"},
-    {"key": "emergency", "value": "fire_alarm_box", "description": "🄿 Fire Alarm Call Box", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-bell.svg"},
-    {"key": "emergency", "value": "fire_extinguisher", "description": "🄿 Fire Extinguisher", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-fire-extinguisher.svg"},
-    {"key": "emergency", "value": "fire_hose", "description": "🄿 Fire Hose", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-fire-extinguisher.svg"},
+    {"key": "emergency", "value": "fire_alarm_box", "description": "🄿 Fire Alarm Call Box", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-bell.svg"},
+    {"key": "emergency", "value": "fire_extinguisher", "description": "🄿 Fire Extinguisher", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-fire-extinguisher.svg"},
+    {"key": "emergency", "value": "fire_hose", "description": "🄿 Fire Hose", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-tape.svg"},
     {"key": "emergency", "value": "fire_hydrant", "description": "🄿 Fire Hydrant", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/fire_hydrant.svg"},
-    {"key": "emergency", "value": "first_aid_kit", "description": "🄿 First Aid Kit", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-medkit.svg"},
-    {"key": "emergency", "value": "life_ring", "description": "🄿 Life Ring", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-life-ring.svg"},
-    {"key": "emergency", "value": "lifeguard", "description": "🄿 Lifeguard", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-life-ring.svg"},
+    {"key": "emergency", "value": "first_aid_kit", "description": "🄿 First Aid Kit", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-medkit.svg"},
+    {"key": "emergency", "value": "life_ring", "description": "🄿 Life Ring", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-life-ring.svg"},
+    {"key": "emergency", "value": "lifeguard", "description": "🄿 Lifeguard", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-life-ring.svg"},
     {"key": "emergency", "value": "phone", "description": "🄿 Emergency Phone", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/emergency-phone-15.svg"},
-    {"key": "emergency", "value": "siren", "description": "🄿 Siren", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-volume-up.svg"},
+    {"key": "emergency", "value": "siren", "description": "🄿 Siren", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-volume-up.svg"},
     {"key": "emergency", "value": "water_tank", "description": "🄿 Emergency Water Tank", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "entrance", "description": "🄿 Entrance/Exit, 🄵 Type", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-alt1-15.svg"},
     {"key": "ford", "value": "yes", "description": "🄿 Ford", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/pedestrian.svg"},
@@ -446,19 +454,19 @@
     {"key": "healthcare", "value": "alternative", "description": "🄿 Alternative Medicine", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/hospital-15.svg"},
     {"key": "healthcare:speciality", "value": "chiropractic", "description": "🄿 Chiropractor", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/hospital-15.svg"},
     {"key": "healthcare", "value": "audiologist", "description": "🄿 Audiologist", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/hospital-15.svg"},
-    {"key": "healthcare", "value": "birthing_center", "description": "🄿 Birthing Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-baby.svg"},
+    {"key": "healthcare", "value": "birthing_center", "description": "🄿 Birthing Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-baby.svg"},
     {"key": "healthcare", "value": "blood_donation", "description": "🄿 Blood Donor Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/blood-bank-15.svg"},
-    {"key": "healthcare", "value": "counselling", "description": "🄿 Counselling Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-comments.svg"},
+    {"key": "healthcare", "value": "counselling", "description": "🄿 Counselling Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-comments.svg"},
     {"key": "healthcare", "value": "hospice", "description": "🄿 Hospice", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/hospital-15.svg"},
-    {"key": "healthcare", "value": "laboratory", "description": "🄿 Medical Laboratory", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-vial.svg"},
-    {"key": "healthcare", "value": "midwife", "description": "🄿 Midwife", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-baby.svg"},
+    {"key": "healthcare", "value": "laboratory", "description": "🄿 Medical Laboratory", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-vial.svg"},
+    {"key": "healthcare", "value": "midwife", "description": "🄿 Midwife", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-baby.svg"},
     {"key": "healthcare", "value": "occupational_therapist", "description": "🄿 Occupational Therapist", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/hospital-15.svg"},
-    {"key": "healthcare", "value": "optometrist", "description": "🄿 Optometrist", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-eye.svg"},
+    {"key": "healthcare", "value": "optometrist", "description": "🄿 Optometrist", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-eye.svg"},
     {"key": "healthcare", "value": "physiotherapist", "description": "🄿 Physiotherapist", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/physiotherapist.svg"},
     {"key": "healthcare", "value": "podiatrist", "description": "🄿 Podiatrist", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/hospital-15.svg"},
     {"key": "healthcare", "value": "psychotherapist", "description": "🄿 Psychotherapist", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/hospital-15.svg"},
     {"key": "healthcare", "value": "rehabilitation", "description": "🄿 Rehabilitation Facility", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/hospital-15.svg"},
-    {"key": "healthcare", "value": "speech_therapist", "description": "🄿 Speech Therapist", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-comment.svg"},
+    {"key": "healthcare", "value": "speech_therapist", "description": "🄿 Speech Therapist", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-comment.svg"},
     {"key": "highway", "value": "bus_stop", "description": "🄿 Bus Stop (unsearchable)", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bus-15.svg"},
     {"key": "highway", "value": "crossing", "description": "🄿 Crossing (unsearchable)", "object_types": ["node"]},
     {"key": "highway", "value": "bridleway", "description": "🄿 Bridle Path", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/horse-riding-15.svg"},
@@ -469,64 +477,65 @@
     {"key": "crossing", "value": "zebra", "description": "🄿 Marked Crosswalk (unsearchable), 🄳 ➜ crossing=marked", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/pedestrian.svg"},
     {"key": "crossing", "value": "marked", "description": "🄿 Marked Crosswalk, 🄿 Marked Cycle Crossing", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/pedestrian.svg"},
     {"key": "crossing", "value": "unmarked", "description": "🄿 Unmarked Crossing, 🄿 Unmarked Cycle Crossing", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/pedestrian.svg"},
-    {"key": "highway", "value": "cycleway", "description": "🄿 Cycle Path", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-biking.svg"},
-    {"key": "cycleway", "value": "crossing", "description": "🄿 Cycle Crossing (unsearchable)", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-biking.svg"},
-    {"key": "foot", "value": "designated", "description": "🄿 Cycle & Foot Path, 🄵 Allowed Access", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-biking.svg"},
+    {"key": "highway", "value": "cycleway", "description": "🄿 Cycle Path", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-biking.svg"},
+    {"key": "cycleway", "value": "crossing", "description": "🄿 Cycle Crossing (unsearchable)", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-biking.svg"},
+    {"key": "foot", "value": "designated", "description": "🄿 Cycle & Foot Path, 🄵 Allowed Access", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-biking.svg"},
     {"key": "highway", "value": "elevator", "description": "🄿 Elevator", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/elevator.svg"},
     {"key": "highway", "value": "emergency_bay", "description": "🄿 Emergency Stopping Place", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"},
     {"key": "highway", "value": "footway", "description": "🄿 Foot Path", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/pedestrian.svg"},
     {"key": "footway", "value": "crossing", "description": "🄿 Pedestrian Crossing (unsearchable)", "object_types": ["way"]},
-    {"key": "conveying", "description": "🄿 Moving Walkway, 🄿 Escalator", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/pedestrian.svg"},
+    {"key": "conveying", "description": "🄿 Moving Walkway, 🄿 Escalator, 🄵 Escalator", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/pedestrian.svg"},
     {"key": "footway", "value": "sidewalk", "description": "🄿 Sidewalk", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/pedestrian.svg"},
     {"key": "highway", "value": "give_way", "description": "🄿 Yield Sign", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/yield.svg"},
-    {"key": "highway", "value": "living_street", "description": "🄿 Living Street", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/highway-living-street.svg"},
+    {"key": "highway", "value": "living_street", "description": "🄿 Living Street", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-living-street.svg"},
     {"key": "highway", "value": "milestone", "description": "🄿 Highway Milestone", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/milestone.svg"},
     {"key": "highway", "value": "mini_roundabout", "description": "🄿 Mini-Roundabout", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/circle-stroked-15.svg"},
     {"key": "highway", "value": "motorway_junction", "description": "🄿 Motorway Junction / Exit", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/junction.svg"},
-    {"key": "highway", "value": "motorway_link", "description": "🄿 Motorway Link", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/highway-motorway-link.svg"},
-    {"key": "highway", "value": "motorway", "description": "🄿 Motorway", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/highway-motorway.svg"},
+    {"key": "highway", "value": "motorway_link", "description": "🄿 Motorway Link", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-motorway-link.svg"},
+    {"key": "highway", "value": "motorway", "description": "🄿 Motorway", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-motorway.svg"},
     {"key": "highway", "value": "passing_place", "description": "🄿 Passing Place", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/circle-stroked-15.svg"},
-    {"key": "highway", "value": "path", "description": "🄿 Path", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/other-line.svg"},
+    {"key": "highway", "value": "path", "description": "🄿 Path", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/other-line.svg"},
+    {"key": "informal", "value": "yes", "description": "🄿 Informal Path", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/other-line.svg"},
     {"key": "highway", "value": "pedestrian", "description": "🄿 Pedestrian Street", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/pedestrian.svg"},
-    {"key": "highway", "value": "primary_link", "description": "🄿 Primary Link", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/highway-primary-link.svg"},
-    {"key": "highway", "value": "primary", "description": "🄿 Primary Road", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/highway-primary.svg"},
-    {"key": "highway", "value": "raceway", "description": "🄿 Motorsport Racetrack", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-flag-checkered.svg"},
-    {"key": "sport", "value": "karting", "description": "🄿 Karting Racetrack", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-flag-checkered.svg"},
-    {"key": "sport", "value": "motocross", "description": "🄿 Motocross Racetrack", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-motorcycle.svg"},
-    {"key": "highway", "value": "residential", "description": "🄿 Residential Road", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/highway-residential.svg"},
+    {"key": "highway", "value": "primary_link", "description": "🄿 Primary Link", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-primary-link.svg"},
+    {"key": "highway", "value": "primary", "description": "🄿 Primary Road", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-primary.svg"},
+    {"key": "highway", "value": "raceway", "description": "🄿 Motorsport Racetrack", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-flag-checkered.svg"},
+    {"key": "sport", "value": "karting", "description": "🄿 Karting Racetrack", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-flag-checkered.svg"},
+    {"key": "sport", "value": "motocross", "description": "🄿 Motocross Racetrack", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-motorcycle.svg"},
+    {"key": "highway", "value": "residential", "description": "🄿 Residential Road", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-residential.svg"},
     {"key": "highway", "value": "rest_area", "description": "🄿 Rest Area", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"},
-    {"key": "highway", "value": "road", "description": "🄿 Unknown Road", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/other-line.svg"},
-    {"key": "highway", "value": "secondary_link", "description": "🄿 Secondary Link", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/highway-secondary-link.svg"},
-    {"key": "highway", "value": "secondary", "description": "🄿 Secondary Road", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/highway-secondary.svg"},
-    {"key": "highway", "value": "service", "description": "🄿 Service Road", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/highway-service.svg"},
-    {"key": "service", "value": "alley", "description": "🄿 Alley", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/highway-service.svg"},
-    {"key": "service", "value": "drive-through", "description": "🄿 Drive-Through", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/highway-service.svg"},
-    {"key": "service", "value": "driveway", "description": "🄿 Driveway", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/highway-service.svg"},
-    {"key": "service", "value": "emergency_access", "description": "🄿 Emergency Access", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/highway-service.svg"},
-    {"key": "service", "value": "parking_aisle", "description": "🄿 Parking Aisle", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/highway-service.svg"},
+    {"key": "highway", "value": "road", "description": "🄿 Unknown Road", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/other-line.svg"},
+    {"key": "highway", "value": "secondary_link", "description": "🄿 Secondary Link", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-secondary-link.svg"},
+    {"key": "highway", "value": "secondary", "description": "🄿 Secondary Road", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-secondary.svg"},
+    {"key": "highway", "value": "service", "description": "🄿 Service Road", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-service.svg"},
+    {"key": "service", "value": "alley", "description": "🄿 Alley", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-service.svg"},
+    {"key": "service", "value": "drive-through", "description": "🄿 Drive-Through", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-service.svg"},
+    {"key": "service", "value": "driveway", "description": "🄿 Driveway", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-service.svg"},
+    {"key": "service", "value": "emergency_access", "description": "🄿 Emergency Access", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-service.svg"},
+    {"key": "service", "value": "parking_aisle", "description": "🄿 Parking Aisle", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-service.svg"},
     {"key": "highway", "value": "services", "description": "🄿 Service Area", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"},
     {"key": "highway", "value": "speed_camera", "description": "🄿 Speed Camera", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/security_camera.svg"},
-    {"key": "highway", "value": "steps", "description": "🄿 Steps", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/highway-steps.svg"},
+    {"key": "highway", "value": "steps", "description": "🄿 Steps", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-steps.svg"},
     {"key": "highway", "value": "stop", "description": "🄿 Stop Sign", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/stop.svg"},
-    {"key": "highway", "value": "street_lamp", "description": "🄿 Street Lamp", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/bulb.svg"},
-    {"key": "highway", "value": "tertiary_link", "description": "🄿 Tertiary Link", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/highway-tertiary-link.svg"},
-    {"key": "highway", "value": "tertiary", "description": "🄿 Tertiary Road", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/highway-tertiary.svg"},
-    {"key": "highway", "value": "track", "description": "🄿 Unmaintained Track Road", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-truck-monster.svg"},
+    {"key": "highway", "value": "street_lamp", "description": "🄿 Street Lamp", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/bulb3.svg"},
+    {"key": "highway", "value": "tertiary_link", "description": "🄿 Tertiary Link", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-tertiary-link.svg"},
+    {"key": "highway", "value": "tertiary", "description": "🄿 Tertiary Road", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-tertiary.svg"},
+    {"key": "highway", "value": "track", "description": "🄿 Unmaintained Track Road", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-truck-monster.svg"},
     {"key": "highway", "value": "traffic_mirror", "description": "🄿 Traffic Mirror", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/circle-stroked-15.svg"},
     {"key": "highway", "value": "traffic_signals", "description": "🄿 Traffic Signals", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/traffic_signals.svg"},
-    {"key": "highway", "value": "trailhead", "description": "🄿 Trailhead", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-hiking.svg"},
-    {"key": "highway", "value": "trunk_link", "description": "🄿 Trunk Link", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/highway-trunk-link.svg"},
-    {"key": "highway", "value": "trunk", "description": "🄿 Trunk Road", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/highway-trunk.svg"},
+    {"key": "highway", "value": "trailhead", "description": "🄿 Trailhead", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-hiking.svg"},
+    {"key": "highway", "value": "trunk_link", "description": "🄿 Trunk Link", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-trunk-link.svg"},
+    {"key": "highway", "value": "trunk", "description": "🄿 Trunk Road", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-trunk.svg"},
     {"key": "highway", "value": "turning_circle", "description": "🄿 Turning Circle", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/circle-stroked-15.svg"},
     {"key": "highway", "value": "turning_loop", "description": "🄿 Turning Loop (Island)", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/circle-15.svg"},
-    {"key": "highway", "value": "unclassified", "description": "🄿 Minor/Unclassified Road", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/highway-unclassified.svg"},
+    {"key": "highway", "value": "unclassified", "description": "🄿 Minor/Unclassified Road", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-unclassified.svg"},
     {"key": "historic", "description": "🄿 Historic Site, 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/ruins.svg"},
     {"key": "historic", "value": "archaeological_site", "description": "🄿 Archaeological Site", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/ruins.svg"},
     {"key": "historic", "value": "boundary_stone", "description": "🄿 Boundary Stone", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/milestone.svg"},
     {"key": "historic", "value": "castle", "description": "🄿 Castle", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/castle-15.svg"},
     {"key": "castle_type", "value": "fortress", "description": "🄿 Historic Fortress", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/castle-15.svg"},
-    {"key": "castle_type", "value": "palace", "description": "🄿 Palace", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-crown.svg"},
-    {"key": "castle_type", "value": "stately", "description": "🄿 Château", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-crown.svg"},
+    {"key": "castle_type", "value": "palace", "description": "🄿 Palace", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-crown.svg"},
+    {"key": "castle_type", "value": "stately", "description": "🄿 Château", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-crown.svg"},
     {"key": "historic", "value": "city_gate", "description": "🄿 City Gate", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/castle-15.svg"},
     {"key": "historic", "value": "fort", "description": "🄿 Historic Fort", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/castle-15.svg"},
     {"key": "historic", "value": "manor", "description": "🄿 Manor House", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/castle-15.svg"},
@@ -541,9 +550,11 @@
     {"key": "indoor", "value": "corridor", "description": "🄿 Indoor Corridor (unsearchable), 🄿 Indoor Corridor", "object_types": ["way"]},
     {"key": "indoor", "value": "area", "description": "🄿 Indoor Area", "object_types": ["area"]},
     {"key": "indoor", "value": "door", "description": "🄿 Indoor Door", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-alt1-15.svg"},
+    {"key": "elevator", "value": "yes", "description": "🄿 Indoor Elevator Shaft", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/elevator.svg"},
     {"key": "indoor", "value": "room", "description": "🄿 Room", "object_types": ["area"]},
+    {"key": "stairs", "value": "yes", "description": "🄿 Indoor Stairwell", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-steps.svg"},
     {"key": "indoor", "value": "wall", "description": "🄿 Indoor Wall", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/wall.svg"},
-    {"key": "internet_access", "value": "wlan", "description": "🄿 Wi-Fi Hotspot, 🄵 Internet Access", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-wifi.svg"},
+    {"key": "internet_access", "value": "wlan", "description": "🄿 Wi-Fi Hotspot, 🄵 Internet Access", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-wifi.svg"},
     {"key": "junction", "value": "yes", "description": "🄿 Junction", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/junction.svg"},
     {"key": "junction", "value": "circular", "description": "🄿 Traffic Circle (unsearchable), 🄵 Junction", "object_types": ["node", "way"]},
     {"key": "junction", "value": "jughandle", "description": "🄿 Jughandle (unsearchable), 🄵 Junction", "object_types": ["way"]},
@@ -554,27 +565,27 @@
     {"key": "landuse", "value": "reservoir", "description": "🄿 Reservoir (unsearchable), 🄳 ➜ natural=water + water=reservoir", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "landuse", "value": "allotments", "description": "🄿 Community Garden", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/garden-centre-15.svg"},
     {"key": "landuse", "value": "aquaculture", "description": "🄿 Aquaculture", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/aquarium-15.svg"},
-    {"key": "landuse", "value": "brownfield", "description": "🄿 Brownfield", "object_types": ["area"]},
+    {"key": "landuse", "value": "brownfield", "description": "🄿 Brownfield", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/bulldozer.svg"},
     {"key": "landuse", "value": "cemetery", "description": "🄿 Cemetery", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cemetery-15.svg"},
     {"key": "landuse", "value": "churchyard", "description": "🄿 Churchyard", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/religious-christian-15.svg"},
     {"key": "landuse", "value": "commercial", "description": "🄿 Commercial Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
-    {"key": "landuse", "value": "construction", "description": "🄿 Construction", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tools.svg"},
-    {"key": "landuse", "value": "farmland", "description": "🄿 Farmland", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-tractor.svg"},
+    {"key": "landuse", "value": "construction", "description": "🄿 Construction", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/bulldozer.svg"},
+    {"key": "landuse", "value": "farmland", "description": "🄿 Farmland", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-tractor.svg"},
     {"key": "landuse", "value": "farmyard", "description": "🄿 Farmyard", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/farm-15.svg"},
     {"key": "landuse", "value": "flowerbed", "description": "🄿 Flowerbed", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/garden-15.svg"},
     {"key": "landuse", "value": "forest", "description": "🄿 Managed Forest", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/park-alt1-15.svg"},
-    {"key": "landuse", "value": "garages", "description": "🄿 Garage Landuse", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-warehouse.svg"},
+    {"key": "landuse", "value": "garages", "description": "🄿 Garage Landuse", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-warehouse.svg"},
     {"key": "landuse", "value": "grass", "description": "🄿 Grass", "object_types": ["area"]},
-    {"key": "landuse", "value": "greenfield", "description": "🄿 Greenfield", "object_types": ["area"]},
+    {"key": "landuse", "value": "greenfield", "description": "🄿 Greenfield", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/bulldozer.svg"},
     {"key": "landuse", "value": "greenhouse_horticulture", "description": "🄿 Greenhouse Horticulture", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/garden-15.svg"},
     {"key": "landuse", "value": "harbour", "description": "🄿 Harbor", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/harbor-15.svg"},
     {"key": "landuse", "value": "industrial", "description": "🄿 Industrial Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/industry-15.svg"},
     {"key": "industrial", "value": "scrap_yard", "description": "🄿 Scrap Yard", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"},
     {"key": "industrial", "value": "slaughterhouse", "description": "🄿 Slaughterhouse", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/slaughterhouse-15.svg"},
-    {"key": "landuse", "value": "landfill", "description": "🄿 Landfill", "object_types": ["area"]},
+    {"key": "landuse", "value": "landfill", "description": "🄿 Landfill", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/bulldozer.svg"},
     {"key": "landuse", "value": "meadow", "description": "🄿 Meadow", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/garden-15.svg"},
     {"key": "landuse", "value": "military", "description": "🄿 Military Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/military.svg"},
-    {"key": "military", "value": "airfield", "description": "🄿 Military Airfield", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/the-noun-project/2009265.svg"},
+    {"key": "military", "value": "airfield", "description": "🄿 Military Airfield", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/the-noun-project/2009265.svg"},
     {"key": "military", "value": "barracks", "description": "🄿 Barracks", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/military.svg"},
     {"key": "military", "value": "danger_area", "description": "🄿 Danger Area", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/danger-15.svg"},
     {"key": "military", "value": "naval_base", "description": "🄿 Naval Base", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/military.svg"},
@@ -591,23 +602,23 @@
     {"key": "residential", "value": "apartments", "description": "🄿 Apartment Complex", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/building-15.svg"},
     {"key": "landuse", "value": "retail", "description": "🄿 Retail Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/commercial-15.svg"},
     {"key": "landuse", "value": "vineyard", "description": "🄿 Vineyard", "object_types": ["area"]},
-    {"key": "landuse", "value": "winter_sports", "description": "🄿 Winter Sports Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-skiing.svg"},
+    {"key": "landuse", "value": "winter_sports", "description": "🄿 Winter Sports Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-skiing.svg"},
     {"key": "leisure", "value": "adult_gaming_centre", "description": "🄿 Adult Gaming Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/casino.svg"},
     {"key": "leisure", "value": "amusement_arcade", "description": "🄿 Amusement Arcade", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/gaming-15.svg"},
-    {"key": "leisure", "value": "bandstand", "description": "🄿 Bandstand", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/music-15.svg"},
-    {"key": "leisure", "value": "beach_resort", "description": "🄿 Beach Resort", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/beach-15.svg"},
+    {"key": "leisure", "value": "bandstand", "description": "🄿 Bandstand", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-music.svg"},
+    {"key": "leisure", "value": "beach_resort", "description": "🄿 Beach Resort", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-umbrella-beach.svg"},
     {"key": "leisure", "value": "bird_hide", "description": "🄿 Bird Hide", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/binoculars.svg"},
-    {"key": "leisure", "value": "bleachers", "description": "🄿 Bleachers", "object_types": ["node", "area"]},
+    {"key": "leisure", "value": "bleachers", "description": "🄿 Bleachers", "object_types": ["area"]},
     {"key": "leisure", "value": "bowling_alley", "description": "🄿 Bowling Alley", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/bowling.svg"},
     {"key": "leisure", "value": "common", "description": "🄿 Common", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/pedestrian.svg"},
-    {"key": "leisure", "value": "dance", "description": "🄿 Dance Hall", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/music-15.svg"},
-    {"key": "dance:teaching", "value": "yes", "description": "🄿 Dance School", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/music-15.svg"},
+    {"key": "leisure", "value": "dance", "description": "🄿 Dance Hall", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-music.svg"},
+    {"key": "dance:teaching", "value": "yes", "description": "🄿 Dance School", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-music.svg"},
     {"key": "leisure", "value": "disc_golf_course", "description": "🄿 Disc Golf Course", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/disc_golf_basket.svg"},
     {"key": "leisure", "value": "dog_park", "description": "🄿 Dog Park", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/dog-park-15.svg"},
-    {"key": "leisure", "value": "escape_game", "description": "🄿 Escape Room", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-puzzle-piece.svg"},
+    {"key": "leisure", "value": "escape_game", "description": "🄿 Escape Room", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-puzzle-piece.svg"},
     {"key": "leisure", "value": "firepit", "description": "🄿 Firepit", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/fire-station-15.svg"},
-    {"key": "leisure", "value": "fishing", "description": "🄿 Fishing Spot", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-fish.svg"},
-    {"key": "leisure", "value": "fitness_centre", "description": "🄿 Gym / Fitness Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-dumbbell.svg"},
+    {"key": "leisure", "value": "fishing", "description": "🄿 Fishing Spot", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-fish.svg"},
+    {"key": "leisure", "value": "fitness_centre", "description": "🄿 Gym / Fitness Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-dumbbell.svg"},
     {"key": "sport", "value": "yoga", "description": "🄿 Yoga Studio", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"},
     {"key": "leisure", "value": "fitness_station", "description": "🄿 Outdoor Fitness Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"},
     {"key": "fitness_station", "value": "balance_beam", "description": "🄿 Exercise Balance Beam", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"},
@@ -623,16 +634,16 @@
     {"key": "fitness_station", "value": "stairs", "description": "🄿 Exercise Stairs", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"},
     {"key": "leisure", "value": "garden", "description": "🄿 Garden", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/garden-15.svg"},
     {"key": "leisure", "value": "golf_course", "description": "🄿 Golf Course", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/golf-15.svg"},
-    {"key": "leisure", "value": "hackerspace", "description": "🄿 Hackerspace", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-code.svg"},
+    {"key": "leisure", "value": "hackerspace", "description": "🄿 Hackerspace", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-code.svg"},
     {"key": "leisure", "value": "horse_riding", "description": "🄿 Horseback Riding Facility, 🄵 Horseback Riding", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/horse-riding-15.svg"},
-    {"key": "leisure", "value": "ice_rink", "description": "🄿 Ice Rink", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-skating.svg"},
-    {"key": "leisure", "value": "marina", "description": "🄿 Marina", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/the-noun-project/2009223.svg"},
+    {"key": "leisure", "value": "ice_rink", "description": "🄿 Ice Rink", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-skating.svg"},
+    {"key": "leisure", "value": "marina", "description": "🄿 Marina", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/the-noun-project/2009223.svg"},
     {"key": "leisure", "value": "miniature_golf", "description": "🄿 Miniature Golf", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/golf-15.svg"},
     {"key": "leisure", "value": "nature_reserve", "description": "🄿 Nature Reserve", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/park-15.svg"},
     {"key": "leisure", "value": "outdoor_seating", "description": "🄿 Outdoor Seating Area", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/picnic-site-15.svg"},
     {"key": "leisure", "value": "park", "description": "🄿 Park", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/park-15.svg"},
     {"key": "leisure", "value": "picnic_table", "description": "🄿 Picnic Table", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/picnic-site-15.svg"},
-    {"key": "sport", "value": "chess", "description": "🄿 Chess Table", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-chess-pawn.svg"},
+    {"key": "sport", "value": "chess", "description": "🄿 Chess Table", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-chess-pawn.svg"},
     {"key": "leisure", "value": "pitch", "description": "🄿 Sport Pitch", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"},
     {"key": "sport", "value": "american_football", "description": "🄿 American Football Field", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/american-football-15.svg"},
     {"key": "sport", "value": "australian_football", "description": "🄿 Australian Football Field", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/american-football-15.svg"},
@@ -658,23 +669,23 @@
     {"key": "sport", "value": "volleyball", "description": "🄿 Volleyball Court", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/volleyball-15.svg"},
     {"key": "leisure", "value": "playground", "description": "🄿 Playground", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/playground-15.svg"},
     {"key": "leisure", "value": "resort", "description": "🄿 Resort", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/lodging-15.svg"},
-    {"key": "leisure", "value": "sauna", "description": "🄿 Sauna", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-thermometer-three-quarters.svg"},
+    {"key": "leisure", "value": "sauna", "description": "🄿 Sauna", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-thermometer-three-quarters.svg"},
     {"key": "leisure", "value": "slipway", "description": "🄿 Slipway", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/slipway-15.svg"},
     {"key": "leisure", "value": "sports_centre", "description": "🄿 Sports Center / Complex", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"},
     {"key": "sport", "value": "climbing", "description": "🄿 Climbing Gym", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/abseiling.svg"},
-    {"key": "sport", "value": "swimming", "description": "🄿 Swimming Pool Facility", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-swimmer.svg"},
+    {"key": "sport", "value": "swimming", "description": "🄿 Swimming Pool Facility", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-swimmer.svg"},
     {"key": "leisure", "value": "stadium", "description": "🄿 Stadium", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"},
-    {"key": "leisure", "value": "swimming_area", "description": "🄿 Natural Swimming Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-swimmer.svg"},
-    {"key": "leisure", "value": "swimming_pool", "description": "🄿 Swimming Pool", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-swimming-pool.svg"},
-    {"key": "leisure", "value": "track", "description": "🄿 Racetrack (Non-Motorsport)", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/other-line.svg"},
-    {"key": "sport", "value": "cycling", "description": "🄿 Cycling Track", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-biking.svg"},
+    {"key": "leisure", "value": "swimming_area", "description": "🄿 Natural Swimming Area", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-swimmer.svg"},
+    {"key": "leisure", "value": "swimming_pool", "description": "🄿 Swimming Pool", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-swimming-pool.svg"},
+    {"key": "leisure", "value": "track", "description": "🄿 Racetrack (Non-Motorsport)", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/other-line.svg"},
+    {"key": "sport", "value": "cycling", "description": "🄿 Cycling Track", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-biking.svg"},
     {"key": "sport", "value": "horse_racing", "description": "🄿 Horse Racing Track", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/horse-riding-15.svg"},
     {"key": "sport", "value": "running", "description": "🄿 Running Track", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"},
-    {"key": "leisure", "value": "water_park", "description": "🄿 Water Park", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-swimmer.svg"},
+    {"key": "leisure", "value": "water_park", "description": "🄿 Water Park", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-swimmer.svg"},
     {"key": "man_made", "value": "adit", "description": "🄿 Adit", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/triangle-15.svg"},
     {"key": "man_made", "value": "antenna", "description": "🄿 Antenna", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/antenna.svg"},
     {"key": "man_made", "value": "beacon", "description": "🄿 Beacon", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/communications-tower-15.svg"},
-    {"key": "man_made", "value": "beehive", "description": "🄿 Beehive", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-archive.svg"},
+    {"key": "man_made", "value": "beehive", "description": "🄿 Beehive", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-archive.svg"},
     {"key": "man_made", "value": "breakwater", "description": "🄿 Breakwater", "object_types": ["way", "area"]},
     {"key": "man_made", "value": "bridge", "description": "🄿 Bridge", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bridge-15.svg"},
     {"key": "man_made", "value": "bunker_silo", "description": "🄿 Bunker Silo", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/silo.svg"},
@@ -702,24 +713,25 @@
     {"key": "man_made", "value": "petroleum_well", "description": "🄿 Oil Well", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/storage_tank.svg"},
     {"key": "man_made", "value": "pier", "description": "🄿 Pier", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/pedestrian.svg"},
     {"key": "floating", "value": "yes", "description": "🄿 Floating Pier", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/pedestrian.svg"},
-    {"key": "man_made", "value": "pipeline", "description": "🄿 Pipeline", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/pipeline-line.svg"},
-    {"key": "location", "value": "underground", "description": "🄿 Underground Pipeline, 🄿 Underground Power Cable", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/pipeline-line.svg"},
+    {"key": "man_made", "value": "pipeline", "description": "🄿 Pipeline", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/pipeline-line.svg"},
+    {"key": "location", "value": "underground", "description": "🄿 Underground Pipeline, 🄿 Underground Power Cable", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/pipeline-line.svg"},
     {"key": "pipeline", "value": "valve", "description": "🄿 Pipeline Valve", "object_types": ["node"]},
     {"key": "man_made", "value": "pumping_station", "description": "🄿 Pumping Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "man_made", "value": "silo", "description": "🄿 Silo", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/silo.svg"},
     {"key": "man_made", "value": "storage_tank", "description": "🄿 Storage Tank", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/storage_tank.svg"},
     {"key": "content", "value": "water", "description": "🄿 Water Tank", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/storage_tank.svg"},
-    {"key": "man_made", "value": "street_cabinet", "description": "🄿 Street Cabinet", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-door-closed.svg"},
+    {"key": "man_made", "value": "street_cabinet", "description": "🄿 Street Cabinet", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-door-closed.svg"},
     {"key": "man_made", "value": "surveillance", "description": "🄿 Surveillance", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/security_camera.svg"},
     {"key": "surveillance:type", "value": "camera", "description": "🄿 Surveillance Camera, 🄵 Surveillance Type", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/security_camera.svg"},
     {"key": "man_made", "value": "survey_point", "description": "🄿 Survey Point", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/monument-15.svg"},
     {"key": "man_made", "value": "torii", "description": "🄿 Torii", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/shinto.svg"},
     {"key": "man_made", "value": "tower", "description": "🄿 Tower", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tower.svg"},
-    {"key": "tower:type", "value": "bell_tower", "description": "🄿 Bell Tower", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-bell.svg"},
+    {"key": "tower:type", "value": "bell_tower", "description": "🄿 Bell Tower", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-bell.svg"},
     {"key": "tower:type", "value": "defensive", "description": "🄿 Fortified Tower", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/castle-15.svg"},
     {"key": "tower:type", "value": "minaret", "description": "🄿 Minaret", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tower.svg"},
     {"key": "tower:type", "value": "observation", "description": "🄿 Observation Tower", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tower.svg"},
-    {"key": "man_made", "value": "tunnel", "description": "🄿 Tunnel", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/the-noun-project/2009642.svg"},
+    {"key": "man_made", "value": "tunnel", "description": "🄿 Tunnel", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/the-noun-project/2009642.svg"},
+    {"key": "man_made", "value": "utility_pole", "description": "🄿 Utility Pole", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/utility_pole.svg"},
     {"key": "man_made", "value": "wastewater_plant", "description": "🄿 Wastewater Plant", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "man_made", "value": "water_tower", "description": "🄿 Water Tower", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "man_made", "value": "water_well", "description": "🄿 Water Well", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
@@ -764,13 +776,13 @@
     {"key": "natural", "value": "volcano", "description": "🄿 Volcano", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/volcano-15.svg"},
     {"key": "natural", "value": "water", "description": "🄿 Water", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "water", "value": "basin", "description": "🄿 Basin", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
-    {"key": "water", "value": "canal", "description": "🄿 Canal", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/waterway-canal.svg"},
+    {"key": "water", "value": "canal", "description": "🄿 Canal", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-canal.svg"},
     {"key": "water", "value": "lake", "description": "🄿 Lake", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "water", "value": "moat", "description": "🄿 Moat", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "water", "value": "pond", "description": "🄿 Pond", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "water", "value": "reservoir", "description": "🄿 Reservoir", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
-    {"key": "water", "value": "river", "description": "🄿 River", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/waterway-river.svg"},
-    {"key": "water", "value": "stream", "description": "🄿 Stream", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/waterway-stream.svg"},
+    {"key": "water", "value": "river", "description": "🄿 River", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-river.svg"},
+    {"key": "water", "value": "stream", "description": "🄿 Stream", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-stream.svg"},
     {"key": "water", "value": "wastewater", "description": "🄿 Wastewater Basin", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "natural", "value": "wetland", "description": "🄿 Wetland", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/wetland-15.svg"},
     {"key": "natural", "value": "wood", "description": "🄿 Wood", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/park-alt1-15.svg"},
@@ -782,7 +794,7 @@
     {"key": "office", "value": "accountant", "description": "🄿 Accountant Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/accounting.svg"},
     {"key": "office", "value": "adoption_agency", "description": "🄿 Adoption Agency", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
     {"key": "office", "value": "advertising_agency", "description": "🄿 Advertising Agency", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
-    {"key": "office", "value": "architect", "description": "🄿 Architect Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-drafting-compass.svg"},
+    {"key": "office", "value": "architect", "description": "🄿 Architect Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-drafting-compass.svg"},
     {"key": "office", "value": "association", "description": "🄿 Nonprofit Organization Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
     {"key": "office", "value": "bail_bond_agent", "description": "🄿 Bail Bond Agent", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bank-15.svg"},
     {"key": "office", "value": "charity", "description": "🄿 Charity Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
@@ -806,31 +818,31 @@
     {"key": "office", "value": "guide", "description": "🄿 Tour Guide Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
     {"key": "office", "value": "insurance", "description": "🄿 Insurance Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
     {"key": "office", "value": "it", "description": "🄿 Information Technology Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
-    {"key": "office", "value": "lawyer", "description": "🄿 Law Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-balance-scale.svg"},
+    {"key": "office", "value": "lawyer", "description": "🄿 Law Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-balance-scale.svg"},
     {"key": "lawyer", "value": "notary", "description": "🄿 Notary Office (unsearchable), 🄳 ➜ office=notary", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
-    {"key": "office", "value": "moving_company", "description": "🄿 Moving Company Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-people-carry.svg"},
-    {"key": "office", "value": "newspaper", "description": "🄿 Newspaper Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-newspaper.svg"},
+    {"key": "office", "value": "moving_company", "description": "🄿 Moving Company Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-people-carry.svg"},
+    {"key": "office", "value": "newspaper", "description": "🄿 Newspaper Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-newspaper.svg"},
     {"key": "office", "value": "ngo", "description": "🄿 NGO Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
-    {"key": "office", "value": "notary", "description": "🄿 Notary Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-stamp.svg"},
+    {"key": "office", "value": "notary", "description": "🄿 Notary Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-stamp.svg"},
     {"key": "office", "value": "political_party", "description": "🄿 Political Party Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/town-hall-15.svg"},
-    {"key": "office", "value": "private_investigator", "description": "🄿 Private Investigator Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-user-secret.svg"},
+    {"key": "office", "value": "private_investigator", "description": "🄿 Private Investigator Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-user-secret.svg"},
     {"key": "office", "value": "quango", "description": "🄿 Quasi-NGO Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
     {"key": "office", "value": "religion", "description": "🄿 Religious Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
-    {"key": "office", "value": "research", "description": "🄿 Research Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
+    {"key": "office", "value": "research", "description": "🄿 Research Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-flask.svg"},
     {"key": "office", "value": "surveyor", "description": "🄿 Surveyor Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
     {"key": "office", "value": "tax_advisor", "description": "🄿 Tax Advisor Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
     {"key": "office", "value": "telecommunication", "description": "🄿 Telecom Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/telephone-15.svg"},
     {"key": "office", "value": "therapist", "description": "🄿 Therapist Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
     {"key": "office", "value": "water_utility", "description": "🄿 Water Utility Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/suitcase-15.svg"},
-    {"key": "piste:type", "value": "downhill", "description": "🄿 Downhill Piste/Ski Run, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-skiing.svg"},
-    {"key": "man_made", "value": "piste:halfpipe", "description": "🄿 Halfpipe", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-snowboarding.svg"},
+    {"key": "piste:type", "value": "downhill", "description": "🄿 Downhill Piste/Ski Run, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-skiing.svg"},
+    {"key": "man_made", "value": "piste:halfpipe", "description": "🄿 Halfpipe", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-snowboarding.svg"},
     {"key": "piste:type", "value": "hike", "description": "🄿 Snowshoeing or Winter Hiking Trail, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/snow_shoeing.svg"},
-    {"key": "piste:type", "value": "ice_skate", "description": "🄿 Ice Skating Piste, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-skating.svg"},
-    {"key": "piste:type", "value": "nordic", "description": "🄿 Nordic or Crosscountry Piste/Ski Trail, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-skiing-nordic.svg"},
-    {"key": "piste:type", "description": "🄿 Winter Sport Trails", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-skiing.svg"},
-    {"key": "piste:type", "value": "skitour", "description": "🄿 Ski Touring Trail, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-skiing-nordic.svg"},
+    {"key": "piste:type", "value": "ice_skate", "description": "🄿 Ice Skating Piste, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-skating.svg"},
+    {"key": "piste:type", "value": "nordic", "description": "🄿 Nordic or Crosscountry Piste/Ski Trail, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-skiing-nordic.svg"},
+    {"key": "piste:type", "description": "🄿 Winter Sport Trails", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-skiing.svg"},
+    {"key": "piste:type", "value": "skitour", "description": "🄿 Ski Touring Trail, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-skiing-nordic.svg"},
     {"key": "piste:type", "value": "sled", "description": "🄿 Sled Piste, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/sledding.svg"},
-    {"key": "piste:type", "value": "sleigh", "description": "🄿 Sleigh Piste, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-sleigh.svg"},
+    {"key": "piste:type", "value": "sleigh", "description": "🄿 Sleigh Piste, 🄵 Type", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-sleigh.svg"},
     {"key": "place", "value": "farm", "description": "🄿 Farm (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/farm-15.svg"},
     {"key": "place", "value": "city_block", "description": "🄿 City Block", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/triangle-stroked-15.svg"},
     {"key": "place", "value": "city", "description": "🄿 City", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/city-15.svg"},
@@ -860,15 +872,15 @@
     {"key": "playground", "value": "structure", "description": "🄿 Play Structure", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"},
     {"key": "playground", "value": "swing", "description": "🄿 Swing", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/playground-15.svg"},
     {"key": "playground", "value": "zipwire", "description": "🄿 Zip Wire", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/playground-15.svg"},
-    {"key": "polling_station", "description": "🄿 Temporary Polling Place, 🄵 Polling Place", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-vote-yea.svg"},
+    {"key": "polling_station", "description": "🄿 Temporary Polling Place, 🄵 Polling Place", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-vote-yea.svg"},
     {"key": "power", "value": "sub_station", "description": "🄿 Substation (unsearchable), 🄳 ➜ power=substation", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/power.svg"},
     {"key": "power", "value": "generator", "description": "🄿 Power Generator", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/power.svg"},
-    {"key": "generator:method", "value": "photovoltaic", "description": "🄿 Solar Panel", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-solar-panel.svg"},
+    {"key": "generator:method", "value": "photovoltaic", "description": "🄿 Solar Panel", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-solar-panel.svg"},
     {"key": "generator:source", "value": "hydro", "description": "🄿 Water Turbine", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/power.svg"},
     {"key": "generator:method", "value": "fission", "description": "🄿 Nuclear Reactor", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/radiation.svg"},
     {"key": "generator:method", "value": "wind_turbine", "description": "🄿 Wind Turbine", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/wind_turbine.svg"},
     {"key": "power", "value": "line", "description": "🄿 Power Line", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/power_tower.svg"},
-    {"key": "power", "value": "minor_line", "description": "🄿 Minor Power Line", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/power-line.svg"},
+    {"key": "power", "value": "minor_line", "description": "🄿 Minor Power Line", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/power-line.svg"},
     {"key": "power", "value": "plant", "description": "🄿 Power Station Grounds", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/industry-15.svg"},
     {"key": "power", "value": "pole", "description": "🄿 Power Pole", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/utility_pole.svg"},
     {"key": "power", "value": "substation", "description": "🄿 Substation", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/power.svg"},
@@ -887,26 +899,26 @@
     {"key": "trolleybus", "value": "yes", "description": "🄿 Trolleybus Stop, 🄿 Trolleybus Platform, 🄿 Trolleybus Station / Terminal, 🄿 Trolleybus Stopping Location", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/trolleybus.svg"},
     {"key": "railway", "value": "halt", "description": "🄿 Train Station (Halt / Request), 🄿 Train Station (Halt / Request) (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/rail-15.svg"},
     {"key": "public_transport", "value": "station", "description": "🄿 Transit Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/rail-15.svg"},
-    {"key": "public_transport", "value": "stop_area", "description": "🄿 Transit Stop Area", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/relation.svg"},
+    {"key": "public_transport", "value": "stop_area", "description": "🄿 Transit Stop Area", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/relation.svg"},
     {"key": "public_transport", "value": "stop_position", "description": "🄿 Transit Stopping Location", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bus-15.svg"},
     {"key": "railway", "value": "platform", "description": "🄿 Train Platform (unsearchable)", "object_types": ["way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/pedestrian.svg"},
     {"key": "railway", "value": "station", "description": "🄿 Train Station (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/rail-15.svg"},
     {"key": "railway", "value": "tram_stop", "description": "🄿 Tram Stopping Position (unsearchable)", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tram.svg"},
-    {"key": "railway", "value": "abandoned", "description": "🄿 Abandoned Railway", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/railway-abandoned.svg"},
+    {"key": "railway", "value": "abandoned", "description": "🄿 Abandoned Railway", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/railway-abandoned.svg"},
     {"key": "railway", "value": "buffer_stop", "description": "🄿 Buffer Stop", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/buffer_stop.svg"},
-    {"key": "railway", "value": "construction", "description": "🄿 Railway Under Construction", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/railway-rail.svg"},
+    {"key": "railway", "value": "construction", "description": "🄿 Railway Under Construction", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/railway-rail.svg"},
     {"key": "railway", "value": "crossing", "description": "🄿 Railway Crossing (Path)", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/pedestrian.svg"},
     {"key": "railway", "value": "derail", "description": "🄿 Railway Derailer", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/roadblock-15.svg"},
-    {"key": "railway", "value": "disused", "description": "🄿 Disused Railway", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/railway-disused.svg"},
-    {"key": "railway", "value": "funicular", "description": "🄿 Funicular", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/railway-rail.svg"},
+    {"key": "railway", "value": "disused", "description": "🄿 Disused Railway", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/railway-disused.svg"},
+    {"key": "railway", "value": "funicular", "description": "🄿 Funicular", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/railway-rail.svg"},
     {"key": "railway", "value": "level_crossing", "description": "🄿 Railway Crossing (Road)", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cross-15.svg"},
     {"key": "railway", "value": "light_rail", "description": "🄿 Light Rail", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/light_rail.svg"},
     {"key": "railway", "value": "milestone", "description": "🄿 Railway Milestone", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/milestone.svg"},
-    {"key": "railway", "value": "miniature", "description": "🄿 Miniature Railway", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/railway-rail.svg"},
+    {"key": "railway", "value": "miniature", "description": "🄿 Miniature Railway", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/railway-rail.svg"},
     {"key": "railway", "value": "monorail", "description": "🄿 Monorail", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/monorail.svg"},
-    {"key": "railway", "value": "narrow_gauge", "description": "🄿 Narrow Gauge Rail", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/railway-rail.svg"},
-    {"key": "railway", "value": "rail", "description": "🄿 Rail", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/railway-rail.svg"},
-    {"key": "highspeed", "value": "yes", "description": "🄿 High-Speed Rail", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/railway-rail.svg"},
+    {"key": "railway", "value": "narrow_gauge", "description": "🄿 Narrow Gauge Rail", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/railway-rail.svg"},
+    {"key": "railway", "value": "rail", "description": "🄿 Rail", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/railway-rail.svg"},
+    {"key": "highspeed", "value": "yes", "description": "🄿 High-Speed Rail", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/railway-rail.svg"},
     {"key": "railway", "value": "signal", "description": "🄿 Railway Signal", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/railway_signals.svg"},
     {"key": "railway", "value": "subway_entrance", "description": "🄿 Subway Entrance", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-15.svg"},
     {"key": "railway", "value": "subway", "description": "🄿 Subway", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/subway.svg"},
@@ -926,165 +938,166 @@
     {"key": "shop", "value": "fishmonger", "description": "🄿 Fishmonger (unsearchable), 🄳 ➜ shop=seafood", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
     {"key": "shop", "value": "furnace", "description": "🄿 Furnace Store (unsearchable), 🄳 ➜ shop=fireplace", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
     {"key": "shop", "value": "vacant", "description": "🄿 Vacant Shop (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "agrarian", "description": "🄿 Farm Supply Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-tractor.svg"},
-    {"key": "shop", "value": "alcohol", "description": "🄿 Liquor Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-wine-bottle.svg"},
-    {"key": "shop", "value": "anime", "description": "🄿 Anime Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-dragon.svg"},
-    {"key": "shop", "value": "antiques", "description": "🄿 Antiques Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "appliance", "description": "🄿 Appliance Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
+    {"key": "shop", "value": "agrarian", "description": "🄿 Farm Supply Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-tractor.svg"},
+    {"key": "shop", "value": "alcohol", "description": "🄿 Liquor Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-wine-bottle.svg"},
+    {"key": "shop", "value": "anime", "description": "🄿 Anime Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-dragon.svg"},
+    {"key": "shop", "value": "antiques", "description": "🄿 Antiques Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/furniture.svg"},
+    {"key": "shop", "value": "appliance", "description": "🄿 Appliance Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/laundry.svg"},
     {"key": "shop", "value": "art", "description": "🄿 Art Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "baby_goods", "description": "🄿 Baby Goods Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-baby-carriage.svg"},
-    {"key": "shop", "value": "bag", "description": "🄿 Bag/Luggage Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-suitcase-rolling.svg"},
+    {"key": "shop", "value": "baby_goods", "description": "🄿 Baby Goods Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-baby-carriage.svg"},
+    {"key": "shop", "value": "bag", "description": "🄿 Bag/Luggage Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-suitcase-rolling.svg"},
     {"key": "shop", "value": "bakery", "description": "🄿 Bakery", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bakery-15.svg"},
-    {"key": "shop", "value": "bathroom_furnishing", "description": "🄿 Bathroom Furnishing Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-bath.svg"},
-    {"key": "shop", "value": "beauty", "description": "🄿 Beauty Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
+    {"key": "shop", "value": "bathroom_furnishing", "description": "🄿 Bathroom Furnishing Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-bath.svg"},
+    {"key": "shop", "value": "beauty", "description": "🄿 Beauty Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/lipstick.svg"},
     {"key": "beauty", "value": "nails", "description": "🄿 Nail Salon", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "beauty", "value": "tanning", "description": "🄿 Tanning Salon", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
+    {"key": "beauty", "value": "tanning", "description": "🄿 Tanning Salon", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tanning.svg"},
     {"key": "shop", "value": "bed", "description": "🄿 Bedding/Mattress Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/lodging-15.svg"},
-    {"key": "shop", "value": "beverages", "description": "🄿 Beverage Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
+    {"key": "shop", "value": "beverages", "description": "🄿 Beverage Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/bottles.svg"},
     {"key": "shop", "value": "bicycle", "description": "🄿 Bicycle Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bicycle-15.svg"},
     {"key": "shop", "value": "boat", "description": "🄿 Boat Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/boating.svg"},
-    {"key": "shop", "value": "bookmaker", "description": "🄿 Bookmaker", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "books", "description": "🄿 Book Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-book.svg"},
-    {"key": "shop", "value": "butcher", "description": "🄿 Butcher", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-bacon.svg"},
-    {"key": "shop", "value": "candles", "description": "🄿 Candle Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-burn.svg"},
-    {"key": "shop", "value": "cannabis", "description": "🄿 Cannabis Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-cannabis.svg"},
-    {"key": "shop", "value": "car_parts", "description": "🄿 Car Parts Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-car-battery.svg"},
+    {"key": "shop", "value": "bookmaker", "description": "🄿 Bookmaker", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/money_hand.svg"},
+    {"key": "shop", "value": "books", "description": "🄿 Book Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-book.svg"},
+    {"key": "shop", "value": "butcher", "description": "🄿 Butcher", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-bacon.svg"},
+    {"key": "shop", "value": "candles", "description": "🄿 Candle Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-burn.svg"},
+    {"key": "shop", "value": "cannabis", "description": "🄿 Cannabis Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-cannabis.svg"},
+    {"key": "shop", "value": "car_parts", "description": "🄿 Car Parts Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-car-battery.svg"},
     {"key": "shop", "value": "car_repair", "description": "🄿 Car Repair Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-repair-15.svg"},
     {"key": "shop", "value": "car", "description": "🄿 Car Dealership", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"},
     {"key": "shop", "value": "caravan", "description": "🄿 RV Dealership", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/rv_park.svg"},
-    {"key": "shop", "value": "carpet", "description": "🄿 Carpet Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
+    {"key": "shop", "value": "carpet", "description": "🄿 Carpet Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-tape.svg"},
     {"key": "shop", "value": "catalogue", "description": "🄿 Catalog Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
     {"key": "shop", "value": "charity", "description": "🄿 Charity Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "cheese", "description": "🄿 Cheese Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-cheese.svg"},
-    {"key": "shop", "value": "chemist", "description": "🄿 Drugstore", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-shopping-basket.svg"},
-    {"key": "shop", "value": "chocolate", "description": "🄿 Chocolate Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
+    {"key": "shop", "value": "cheese", "description": "🄿 Cheese Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-cheese.svg"},
+    {"key": "shop", "value": "chemist", "description": "🄿 Drugstore", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-shopping-basket.svg"},
+    {"key": "shop", "value": "chocolate", "description": "🄿 Chocolate Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/chocolate.svg"},
     {"key": "shop", "value": "clothes", "description": "🄿 Clothing Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/clothing-store-15.svg"},
     {"key": "clothes", "value": "underwear", "description": "🄿 Underwear Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/clothing-store-15.svg"},
     {"key": "shop", "value": "coffee", "description": "🄿 Coffee Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "computer", "description": "🄿 Computer Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-laptop.svg"},
+    {"key": "shop", "value": "computer", "description": "🄿 Computer Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-laptop.svg"},
     {"key": "shop", "value": "confectionery", "description": "🄿 Candy Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/confectionery-15.svg"},
-    {"key": "shop", "value": "convenience", "description": "🄿 Convenience Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-shopping-basket.svg"},
-    {"key": "shop", "value": "copyshop", "description": "🄿 Copy Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-print.svg"},
-    {"key": "shop", "value": "cosmetics", "description": "🄿 Cosmetics Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "country_store", "description": "🄿 Country Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "craft", "description": "🄿 Arts and Crafts Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-palette.svg"},
+    {"key": "shop", "value": "convenience", "description": "🄿 Convenience Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-shopping-basket.svg"},
+    {"key": "shop", "value": "copyshop", "description": "🄿 Copy Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-print.svg"},
+    {"key": "shop", "value": "cosmetics", "description": "🄿 Cosmetics Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/lipstick.svg"},
+    {"key": "shop", "value": "country_store", "description": "🄿 Country Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-hat-cowboy-side.svg"},
+    {"key": "shop", "value": "craft", "description": "🄿 Arts and Crafts Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-palette.svg"},
     {"key": "shop", "value": "curtain", "description": "🄿 Curtain Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "dairy", "description": "🄿 Dairy Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-cheese.svg"},
+    {"key": "shop", "value": "dairy", "description": "🄿 Dairy Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-cheese.svg"},
     {"key": "shop", "value": "deli", "description": "🄿 Deli", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/restaurant-15.svg"},
     {"key": "shop", "value": "department_store", "description": "🄿 Department Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
     {"key": "shop", "value": "doityourself", "description": "🄿 DIY Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tools.svg"},
     {"key": "shop", "value": "dry_cleaning", "description": "🄿 Dry Cleaner", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/clothes_hanger.svg"},
     {"key": "shop", "value": "e-cigarette", "description": "🄿 E-Cigarette Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "electronics", "description": "🄿 Electronics Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-plug.svg"},
+    {"key": "shop", "value": "electronics", "description": "🄿 Electronics Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-plug.svg"},
     {"key": "shop", "value": "erotic", "description": "🄿 Erotic Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "fabric", "description": "🄿 Fabric Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-tape.svg"},
-    {"key": "shop", "value": "farm", "description": "🄿 Produce Stand", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "fashion_accessories", "description": "🄿 Fashion Accessories Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
+    {"key": "shop", "value": "fabric", "description": "🄿 Fabric Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-tape.svg"},
+    {"key": "shop", "value": "farm", "description": "🄿 Produce Stand", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-apple-alt.svg"},
+    {"key": "shop", "value": "fashion_accessories", "description": "🄿 Fashion Accessories Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/fashion_accessories.svg"},
     {"key": "shop", "value": "fireplace", "description": "🄿 Fireplace Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "fishing", "description": "🄿 Fishing Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
+    {"key": "shop", "value": "fishing", "description": "🄿 Fishing Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/ice_fishing.svg"},
     {"key": "shop", "value": "florist", "description": "🄿 Florist", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/florist-15.svg"},
-    {"key": "shop", "value": "frame", "description": "🄿 Framing Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-vector-square.svg"},
+    {"key": "shop", "value": "frame", "description": "🄿 Framing Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-vector-square.svg"},
     {"key": "shop", "value": "frozen_food", "description": "🄿 Frozen Food", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "fuel", "description": "🄿 Fuel Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
+    {"key": "shop", "value": "fuel", "description": "🄿 Fuel Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/gas.svg"},
     {"key": "shop", "value": "funeral_directors", "description": "🄿 Funeral Home", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/cemetery-15.svg"},
-    {"key": "shop", "value": "furniture", "description": "🄿 Furniture Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-couch.svg"},
-    {"key": "shop", "value": "games", "description": "🄿 Tabletop Game Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-dice.svg"},
+    {"key": "shop", "value": "furniture", "description": "🄿 Furniture Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-couch.svg"},
+    {"key": "shop", "value": "games", "description": "🄿 Tabletop Game Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-dice.svg"},
     {"key": "shop", "value": "garden_centre", "description": "🄿 Garden Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/garden-centre-15.svg"},
-    {"key": "shop", "value": "gas", "description": "🄿 Bottled Gas Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
+    {"key": "shop", "value": "gas", "description": "🄿 Bottled Gas Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/gas.svg"},
     {"key": "shop", "value": "general", "description": "🄿 General Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
     {"key": "shop", "value": "gift", "description": "🄿 Gift Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/gift-15.svg"},
-    {"key": "shop", "value": "greengrocer", "description": "🄿 Greengrocer", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-carrot.svg"},
-    {"key": "shop", "value": "hairdresser_supply", "description": "🄿 Hairdresser Supply Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
+    {"key": "shop", "value": "greengrocer", "description": "🄿 Greengrocer", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-carrot.svg"},
+    {"key": "shop", "value": "hairdresser_supply", "description": "🄿 Hairdresser Supply Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/hair_care.svg"},
     {"key": "shop", "value": "hairdresser", "description": "🄿 Hairdresser", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/beauty_salon.svg"},
     {"key": "shop", "value": "hardware", "description": "🄿 Hardware Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tools.svg"},
     {"key": "shop", "value": "health_food", "description": "🄿 Health Food Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "hearing_aids", "description": "🄿 Hearing Aids Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "herbalist", "description": "🄿 Herbalist", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-leaf.svg"},
+    {"key": "shop", "value": "hearing_aids", "description": "🄿 Hearing Aids Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/hearing_aid.svg"},
+    {"key": "shop", "value": "herbalist", "description": "🄿 Herbalist", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-leaf.svg"},
     {"key": "shop", "value": "hifi", "description": "🄿 Hifi Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/speaker.svg"},
-    {"key": "shop", "value": "hobby", "description": "🄿 Hobby Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-dragon.svg"},
-    {"key": "shop", "value": "houseware", "description": "🄿 Houseware Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-blender.svg"},
-    {"key": "shop", "value": "hunting", "description": "🄿 Hunting Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
+    {"key": "shop", "value": "hobby", "description": "🄿 Hobby Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-dragon.svg"},
+    {"key": "shop", "value": "houseware", "description": "🄿 Houseware Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-blender.svg"},
+    {"key": "shop", "value": "hunting", "description": "🄿 Hunting Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/binoculars.svg"},
     {"key": "shop", "value": "interior_decoration", "description": "🄿 Interior Decoration Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
     {"key": "shop", "value": "jewelry", "description": "🄿 Jewelry Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/jewelry-store-15.svg"},
     {"key": "shop", "value": "kiosk", "description": "🄿 Kiosk", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "kitchen", "description": "🄿 Kitchen Design Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "laundry", "description": "🄿 Laundry", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/laundry-15.svg"},
-    {"key": "self_service", "value": "yes", "description": "🄿 Self-Service Laundry", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/laundry-15.svg"},
-    {"key": "shop", "value": "leather", "description": "🄿 Leather Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "lighting", "description": "🄿 Lighting Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/far-lightbulb.svg"},
-    {"key": "shop", "value": "locksmith", "description": "🄿 Locksmith", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-key.svg"},
-    {"key": "shop", "value": "lottery", "description": "🄿 Lottery Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
+    {"key": "shop", "value": "kitchen", "description": "🄿 Kitchen Design Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/kitchen_sink.svg"},
+    {"key": "shop", "value": "laundry", "description": "🄿 Laundry", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/laundry.svg"},
+    {"key": "self_service", "value": "yes", "description": "🄿 Self-Service Laundry", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/laundry.svg"},
+    {"key": "shop", "value": "leather", "description": "🄿 Leather Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/handbag.svg"},
+    {"key": "shop", "value": "lighting", "description": "🄿 Lighting Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/bulb3.svg"},
+    {"key": "shop", "value": "locksmith", "description": "🄿 Locksmith", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-key.svg"},
+    {"key": "shop", "value": "lottery", "description": "🄿 Lottery Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-ticket-alt.svg"},
     {"key": "shop", "value": "mall", "description": "🄿 Mall", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
     {"key": "shop", "value": "massage", "description": "🄿 Massage Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/spa.svg"},
-    {"key": "shop", "value": "medical_supply", "description": "🄿 Medical Supply Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
+    {"key": "shop", "value": "medical_supply", "description": "🄿 Medical Supply Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-crutch.svg"},
     {"key": "shop", "value": "military_surplus", "description": "🄿 Military Surplus Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/military.svg"},
-    {"key": "shop", "value": "mobile_phone", "description": "🄿 Mobile Phone Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-mobile-alt.svg"},
-    {"key": "shop", "value": "money_lender", "description": "🄿 Money Lender", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bank-15.svg"},
-    {"key": "shop", "value": "motorcycle_repair", "description": "🄿 Motorcycle Repair Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-motorcycle.svg"},
-    {"key": "shop", "value": "motorcycle", "description": "🄿 Motorcycle Dealership", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-motorcycle.svg"},
-    {"key": "shop", "value": "music", "description": "🄿 Music Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-compact-disc.svg"},
-    {"key": "shop", "value": "musical_instrument", "description": "🄿 Musical Instrument Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-guitar.svg"},
-    {"key": "shop", "value": "newsagent", "description": "🄿 Newspaper/Magazine Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-newspaper.svg"},
-    {"key": "shop", "value": "nutrition_supplements", "description": "🄿 Nutrition Supplements Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
+    {"key": "shop", "value": "mobile_phone", "description": "🄿 Mobile Phone Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-mobile-alt.svg"},
+    {"key": "shop", "value": "money_lender", "description": "🄿 Money Lender", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/money_hand.svg"},
+    {"key": "shop", "value": "motorcycle_repair", "description": "🄿 Motorcycle Repair Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-motorcycle.svg"},
+    {"key": "shop", "value": "motorcycle", "description": "🄿 Motorcycle Dealership", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-motorcycle.svg"},
+    {"key": "shop", "value": "music", "description": "🄿 Music Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-compact-disc.svg"},
+    {"key": "shop", "value": "musical_instrument", "description": "🄿 Musical Instrument Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-guitar.svg"},
+    {"key": "shop", "value": "newsagent", "description": "🄿 Newspaper/Magazine Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-newspaper.svg"},
+    {"key": "shop", "value": "nutrition_supplements", "description": "🄿 Nutrition Supplements Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-pills.svg"},
     {"key": "shop", "value": "optician", "description": "🄿 Optician", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/optician-15.svg"},
     {"key": "organic", "value": "only", "description": "🄿 Organic Goods Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
     {"key": "shop", "value": "outdoor", "description": "🄿 Outdoors Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/compass.svg"},
     {"key": "shop", "value": "outpost", "description": "🄿 Online Retailer Outpost", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "paint", "description": "🄿 Paint Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-paint-roller.svg"},
+    {"key": "shop", "value": "paint", "description": "🄿 Paint Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-paint-roller.svg"},
     {"key": "shop", "value": "party", "description": "🄿 Party Supply Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/balloon.svg"},
     {"key": "shop", "value": "pastry", "description": "🄿 Pastry Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bakery-15.svg"},
-    {"key": "shop", "value": "pawnbroker", "description": "🄿 Pawn Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "perfumery", "description": "🄿 Perfume Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
+    {"key": "shop", "value": "pawnbroker", "description": "🄿 Pawn Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/money_hand.svg"},
+    {"key": "shop", "value": "perfumery", "description": "🄿 Perfume Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/perfume.svg"},
     {"key": "shop", "value": "pet_grooming", "description": "🄿 Pet Grooming Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/dog-park-15.svg"},
     {"key": "shop", "value": "pet", "description": "🄿 Pet Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/dog-park-15.svg"},
-    {"key": "shop", "value": "photo", "description": "🄿 Photography Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-camera-retro.svg"},
-    {"key": "shop", "value": "printer_ink", "description": "🄿 Printer Ink Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
+    {"key": "shop", "value": "photo", "description": "🄿 Photography Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-camera-retro.svg"},
+    {"key": "shop", "value": "printer_ink", "description": "🄿 Printer Ink Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-print.svg"},
+    {"key": "shop", "value": "psychic", "description": "🄿 Psychic", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/psychic.svg"},
     {"key": "shop", "value": "pyrotechnics", "description": "🄿 Fireworks Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "radiotechnics", "description": "🄿 Radio/Electronic Component Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-microchip.svg"},
+    {"key": "shop", "value": "radiotechnics", "description": "🄿 Radio/Electronic Component Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-microchip.svg"},
     {"key": "shop", "value": "religion", "description": "🄿 Religious Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "rental", "description": "🄿 Rental Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
+    {"key": "shop", "value": "rental", "description": "🄿 Rental Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-dolly.svg"},
     {"key": "shop", "value": "scuba_diving", "description": "🄿 Scuba Diving Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/scuba_diving.svg"},
-    {"key": "shop", "value": "seafood", "description": "🄿 Seafood Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
+    {"key": "shop", "value": "seafood", "description": "🄿 Seafood Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/fish_cleaning.svg"},
     {"key": "shop", "value": "second_hand", "description": "🄿 Consignment/Thrift Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
     {"key": "shop", "value": "sewing", "description": "🄿 Sewing Supply Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
     {"key": "shop", "value": "shoes", "description": "🄿 Shoe Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shoe-15.svg"},
-    {"key": "shop", "value": "sports", "description": "🄿 Sporting Goods Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-futbol.svg"},
-    {"key": "shop", "value": "stationery", "description": "🄿 Stationery Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-paperclip.svg"},
-    {"key": "shop", "value": "storage_rental", "description": "🄿 Storage Rental", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-warehouse.svg"},
+    {"key": "shop", "value": "sports", "description": "🄿 Sporting Goods Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-futbol.svg"},
+    {"key": "shop", "value": "stationery", "description": "🄿 Stationery Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-paperclip.svg"},
+    {"key": "shop", "value": "storage_rental", "description": "🄿 Storage Rental", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-warehouse.svg"},
     {"key": "shop", "value": "supermarket", "description": "🄿 Supermarket", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/grocery-15.svg"},
-    {"key": "shop", "value": "swimming_pool", "description": "🄿 Pool Supply Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-swimmer.svg"},
+    {"key": "shop", "value": "swimming_pool", "description": "🄿 Pool Supply Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-swimmer.svg"},
     {"key": "shop", "value": "tailor", "description": "🄿 Tailor", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/clothing-store-15.svg"},
     {"key": "shop", "value": "tattoo", "description": "🄿 Tattoo Parlor", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
     {"key": "shop", "value": "tea", "description": "🄿 Tea Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/teahouse-15.svg"},
-    {"key": "shop", "value": "ticket", "description": "🄿 Ticket Seller", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-ticket-alt.svg"},
+    {"key": "shop", "value": "ticket", "description": "🄿 Ticket Seller", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-ticket-alt.svg"},
     {"key": "shop", "value": "tiles", "description": "🄿 Tile Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "tobacco", "description": "🄿 Tobacco Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "toys", "description": "🄿 Toy Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-space-shuttle.svg"},
-    {"key": "shop", "value": "trade", "description": "🄿 Trade Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "travel_agency", "description": "🄿 Travel Agency", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-suitcase.svg"},
-    {"key": "shop", "value": "tyres", "description": "🄿 Tire Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "vacuum_cleaner", "description": "🄿 Vacuum Cleaner Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
+    {"key": "shop", "value": "tobacco", "description": "🄿 Tobacco Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/pipe.svg"},
+    {"key": "shop", "value": "toys", "description": "🄿 Toy Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-rocket.svg"},
+    {"key": "shop", "value": "trade", "description": "🄿 Trade Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tools.svg"},
+    {"key": "shop", "value": "travel_agency", "description": "🄿 Travel Agency", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-suitcase.svg"},
+    {"key": "shop", "value": "tyres", "description": "🄿 Tire Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tire.svg"},
+    {"key": "shop", "value": "vacuum_cleaner", "description": "🄿 Vacuum Cleaner Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/vacuum.svg"},
     {"key": "shop", "value": "variety_store", "description": "🄿 Variety Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
     {"key": "shop", "value": "video_games", "description": "🄿 Video Game Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/gaming-15.svg"},
     {"key": "shop", "value": "video", "description": "🄿 Video Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/movie_rental.svg"},
     {"key": "shop", "value": "watches", "description": "🄿 Watches Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/watch-15.svg"},
-    {"key": "shop", "value": "water_sports", "description": "🄿 Watersport/Swim Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
-    {"key": "shop", "value": "water", "description": "🄿 Drinking Water Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/the-noun-project/2009234.svg"},
+    {"key": "shop", "value": "water_sports", "description": "🄿 Watersport/Swim Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-swimmer.svg"},
+    {"key": "shop", "value": "water", "description": "🄿 Drinking Water Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/the-noun-project/2009234.svg"},
     {"key": "shop", "value": "weapons", "description": "🄿 Weapon Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/shop-15.svg"},
     {"key": "shop", "value": "wholesale", "description": "🄿 Wholesale Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/warehouse-15.svg"},
     {"key": "shop", "value": "window_blind", "description": "🄿 Window Blind Store", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/window.svg"},
     {"key": "shop", "value": "wine", "description": "🄿 Wine Shop", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/alcohol-shop-15.svg"},
-    {"key": "telecom", "value": "data_center", "description": "🄿 Data Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-server.svg"},
+    {"key": "telecom", "value": "data_center", "description": "🄿 Data Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-server.svg"},
     {"key": "tourism", "value": "alpine_hut", "description": "🄿 Alpine Hut", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/lodging-15.svg"},
     {"key": "tourism", "value": "apartment", "description": "🄿 Guest Apartment / Condo", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/lodging-15.svg"},
     {"key": "tourism", "value": "aquarium", "description": "🄿 Aquarium", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/aquarium-15.svg"},
     {"key": "tourism", "value": "artwork", "description": "🄿 Artwork", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/art-gallery-15.svg"},
-    {"key": "artwork_type", "value": "bust", "description": "🄿 Bust", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-user-alt.svg"},
+    {"key": "artwork_type", "value": "bust", "description": "🄿 Bust", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-user-alt.svg"},
     {"key": "artwork_type", "value": "graffiti", "description": "🄿 Graffiti", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/art-gallery-15.svg"},
     {"key": "artwork_type", "value": "installation", "description": "🄿 Art Installation", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/art-gallery-15.svg"},
     {"key": "artwork_type", "value": "mural", "description": "🄿 Mural", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/art-gallery-15.svg"},
     {"key": "artwork_type", "value": "sculpture", "description": "🄿 Sculpture", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/art-gallery-15.svg"},
-    {"key": "artwork_type", "value": "statue", "description": "🄿 Statue", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-female.svg"},
+    {"key": "artwork_type", "value": "statue", "description": "🄿 Statue", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-female.svg"},
     {"key": "tourism", "value": "attraction", "description": "🄿 Tourist Attraction", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/star-15.svg"},
     {"key": "tourism", "value": "camp_pitch", "description": "🄿 Camp Pitch", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/campsite-15.svg"},
     {"key": "tourism", "value": "camp_site", "description": "🄿 Campground", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/campsite-15.svg"},
@@ -1093,11 +1106,11 @@
     {"key": "tourism", "value": "gallery", "description": "🄿 Art Gallery", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/art-gallery-15.svg"},
     {"key": "tourism", "value": "guest_house", "description": "🄿 Guest House", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/lodging-15.svg"},
     {"key": "tourism", "value": "hostel", "description": "🄿 Hostel", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/lodging-15.svg"},
-    {"key": "tourism", "value": "hotel", "description": "🄿 Hotel", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-concierge-bell.svg"},
+    {"key": "tourism", "value": "hotel", "description": "🄿 Hotel", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-concierge-bell.svg"},
     {"key": "tourism", "value": "information", "description": "🄿 Information", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/information-15.svg"},
     {"key": "information", "value": "board", "description": "🄿 Information Board", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/information-15.svg"},
-    {"key": "information", "value": "guidepost", "description": "🄿 Guidepost", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-map-signs.svg"},
-    {"key": "information", "value": "map", "description": "🄿 Map", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-map.svg"},
+    {"key": "information", "value": "guidepost", "description": "🄿 Guidepost", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-map-signs.svg"},
+    {"key": "information", "value": "map", "description": "🄿 Map", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-map.svg"},
     {"key": "information", "value": "office", "description": "🄿 Tourist Information Office", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/information-15.svg"},
     {"key": "information", "value": "route_marker", "description": "🄿 Trail Marker", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/information-15.svg"},
     {"key": "information", "value": "terminal", "description": "🄿 Information Terminal", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/information-15.svg"},
@@ -1109,9 +1122,9 @@
     {"key": "tourism", "value": "viewpoint", "description": "🄿 Viewpoint", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/binoculars.svg"},
     {"key": "tourism", "value": "wilderness_hut", "description": "🄿 Wilderness Hut", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/lodging-15.svg"},
     {"key": "tourism", "value": "zoo", "description": "🄿 Zoo", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/zoo.svg"},
-    {"key": "zoo", "value": "petting_zoo", "description": "🄿 Petting Zoo", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-horse.svg"},
+    {"key": "zoo", "value": "petting_zoo", "description": "🄿 Petting Zoo", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-horse.svg"},
     {"key": "zoo", "value": "safari_park", "description": "🄿 Safari Park", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/zoo.svg"},
-    {"key": "zoo", "value": "wildlife_park", "description": "🄿 Wildlife Park", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-frog.svg"},
+    {"key": "zoo", "value": "wildlife_park", "description": "🄿 Wildlife Park", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-frog.svg"},
     {"key": "traffic_calming", "description": "🄿 Traffic Calming, 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/diamond.svg"},
     {"key": "traffic_calming", "value": "bump", "description": "🄿 Speed Bump", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/diamond.svg"},
     {"key": "traffic_calming", "value": "chicane", "description": "🄿 Traffic Chicane", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/diamond.svg"},
@@ -1124,53 +1137,53 @@
     {"key": "traffic_sign", "description": "🄿 Traffic Sign, 🄵 Traffic Sign", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/square-stroked-15.svg"},
     {"key": "traffic_sign", "value": "city_limit", "description": "🄿 City Limit Sign", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/square-stroked-15.svg"},
     {"key": "traffic_sign", "value": "maxspeed", "description": "🄿 Speed Limit Sign", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/square-stroked-15.svg"},
-    {"key": "type", "value": "multipolygon", "description": "🄿 Multipolygon (unsearchable)", "object_types": ["area", "relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/multipolygon.svg"},
-    {"key": "type", "value": "boundary", "description": "🄿 Boundary", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/boundary.svg"},
-    {"key": "type", "value": "enforcement", "description": "🄿 Enforcement", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/relation.svg"},
-    {"key": "public_transport", "value": "stop_area_group", "description": "🄿 Transit Stop Area Group", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/relation.svg"},
-    {"key": "type", "value": "restriction", "description": "🄿 Restriction", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/restriction.svg"},
-    {"key": "restriction", "value": "no_left_turn", "description": "🄿 No Left Turn", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/restriction-no-left-turn.svg"},
-    {"key": "restriction", "value": "no_right_turn", "description": "🄿 No Right Turn", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/restriction-no-right-turn.svg"},
-    {"key": "restriction", "value": "no_straight_on", "description": "🄿 No Straight On", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/restriction-no-straight-on.svg"},
-    {"key": "restriction", "value": "no_u_turn", "description": "🄿 No U-turn", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/restriction-no-u-turn.svg"},
-    {"key": "restriction", "value": "only_left_turn", "description": "🄿 Only Left Turn", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/restriction-only-left-turn.svg"},
-    {"key": "restriction", "value": "only_right_turn", "description": "🄿 Only Right Turn", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/restriction-only-right-turn.svg"},
-    {"key": "restriction", "value": "only_straight_on", "description": "🄿 Only Straight On", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/restriction-only-straight-on.svg"},
-    {"key": "restriction", "value": "only_u_turn", "description": "🄿 Only U-turn", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/restriction-only-u-turn.svg"},
-    {"key": "type", "value": "route_master", "description": "🄿 Route Master", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/route-master.svg"},
-    {"key": "type", "value": "route", "description": "🄿 Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/route.svg"},
+    {"key": "type", "value": "multipolygon", "description": "🄿 Multipolygon (unsearchable)", "object_types": ["area", "relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/multipolygon.svg"},
+    {"key": "type", "value": "boundary", "description": "🄿 Boundary", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/boundary.svg"},
+    {"key": "type", "value": "enforcement", "description": "🄿 Enforcement", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/relation.svg"},
+    {"key": "public_transport", "value": "stop_area_group", "description": "🄿 Transit Stop Area Group", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/relation.svg"},
+    {"key": "type", "value": "restriction", "description": "🄿 Restriction", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/restriction.svg"},
+    {"key": "restriction", "value": "no_left_turn", "description": "🄿 No Left Turn", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/restriction-no-left-turn.svg"},
+    {"key": "restriction", "value": "no_right_turn", "description": "🄿 No Right Turn", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/restriction-no-right-turn.svg"},
+    {"key": "restriction", "value": "no_straight_on", "description": "🄿 No Straight On", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/restriction-no-straight-on.svg"},
+    {"key": "restriction", "value": "no_u_turn", "description": "🄿 No U-turn", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/restriction-no-u-turn.svg"},
+    {"key": "restriction", "value": "only_left_turn", "description": "🄿 Only Left Turn", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/restriction-only-left-turn.svg"},
+    {"key": "restriction", "value": "only_right_turn", "description": "🄿 Only Right Turn", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/restriction-only-right-turn.svg"},
+    {"key": "restriction", "value": "only_straight_on", "description": "🄿 Only Straight On", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/restriction-only-straight-on.svg"},
+    {"key": "restriction", "value": "only_u_turn", "description": "🄿 Only U-turn", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/restriction-only-u-turn.svg"},
+    {"key": "type", "value": "route_master", "description": "🄿 Route Master", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/route-master.svg"},
+    {"key": "type", "value": "route", "description": "🄿 Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/route.svg"},
     {"key": "route", "value": "bicycle", "description": "🄿 Cycle Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bicycle-15.svg"},
     {"key": "route", "value": "bus", "description": "🄿 Bus Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/bus-15.svg"},
-    {"key": "route", "value": "detour", "description": "🄿 Detour Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/route-detour.svg"},
+    {"key": "route", "value": "detour", "description": "🄿 Detour Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/route-detour.svg"},
     {"key": "route", "value": "foot", "description": "🄿 Foot Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/pedestrian.svg"},
-    {"key": "route", "value": "hiking", "description": "🄿 Hiking Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-hiking.svg"},
+    {"key": "route", "value": "hiking", "description": "🄿 Hiking Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-hiking.svg"},
     {"key": "route", "value": "horse", "description": "🄿 Riding Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/horse-riding-15.svg"},
     {"key": "route", "value": "light_rail", "description": "🄿 Light Rail Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/light_rail.svg"},
     {"key": "route", "value": "monorail", "description": "🄿 Monorail Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/monorail.svg"},
-    {"key": "route", "value": "pipeline", "description": "🄿 Pipeline Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/pipeline-line.svg"},
-    {"key": "route", "value": "piste", "description": "🄿 Piste/Ski Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-skiing.svg"},
-    {"key": "route", "value": "power", "description": "🄿 Power Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/power-line.svg"},
-    {"key": "route", "value": "road", "description": "🄿 Road Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/highway-unclassified.svg"},
+    {"key": "route", "value": "pipeline", "description": "🄿 Pipeline Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/pipeline-line.svg"},
+    {"key": "route", "value": "piste", "description": "🄿 Piste/Ski Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/fontawesome/fas-skiing.svg"},
+    {"key": "route", "value": "power", "description": "🄿 Power Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/power-line.svg"},
+    {"key": "route", "value": "road", "description": "🄿 Road Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/highway-unclassified.svg"},
     {"key": "route", "value": "subway", "description": "🄿 Subway Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/subway.svg"},
-    {"key": "route", "value": "train", "description": "🄿 Train Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/railway-rail.svg"},
+    {"key": "route", "value": "train", "description": "🄿 Train Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/railway-rail.svg"},
     {"key": "route", "value": "tram", "description": "🄿 Tram Route", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/tram.svg"},
-    {"key": "type", "value": "site", "description": "🄿 Site", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/relation.svg"},
-    {"key": "type", "value": "waterway", "description": "🄿 Waterway", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/waterway-stream.svg"},
+    {"key": "type", "value": "site", "description": "🄿 Site", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/relation.svg"},
+    {"key": "type", "value": "waterway", "description": "🄿 Waterway", "object_types": ["relation"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-stream.svg"},
     {"key": "waterway", "value": "riverbank", "description": "🄿 Riverbank (unsearchable), 🄳 ➜ natural=water + water=river", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "waterway", "value": "boatyard", "description": "🄿 Boatyard", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/harbor-15.svg"},
-    {"key": "waterway", "value": "canal", "description": "🄿 Canal", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/waterway-canal.svg"},
-    {"key": "lock", "value": "yes", "description": "🄿 Canal Lock", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/waterway-canal.svg"},
+    {"key": "waterway", "value": "canal", "description": "🄿 Canal", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-canal.svg"},
+    {"key": "lock", "value": "yes", "description": "🄿 Canal Lock", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-canal.svg"},
     {"key": "waterway", "value": "dam", "description": "🄿 Dam", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/dam-15.svg"},
-    {"key": "waterway", "value": "ditch", "description": "🄿 Ditch", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/waterway-ditch.svg"},
+    {"key": "waterway", "value": "ditch", "description": "🄿 Ditch", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-ditch.svg"},
     {"key": "waterway", "value": "dock", "description": "🄿 Wet Dock / Dry Dock", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/harbor-15.svg"},
-    {"key": "waterway", "value": "drain", "description": "🄿 Drain", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/waterway-ditch.svg"},
+    {"key": "waterway", "value": "drain", "description": "🄿 Drain", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-ditch.svg"},
     {"key": "waterway", "value": "fuel", "description": "🄿 Marine Fuel Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/fuel-15.svg"},
     {"key": "waterway", "value": "lock_gate", "description": "🄿 Lock Gate", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/dam-15.svg"},
     {"key": "waterway", "value": "milestone", "description": "🄿 Waterway Milestone", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/milestone.svg"},
-    {"key": "waterway", "value": "river", "description": "🄿 River", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/waterway-river.svg"},
+    {"key": "waterway", "value": "river", "description": "🄿 River", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-river.svg"},
     {"key": "waterway", "value": "sanitary_dump_station", "description": "🄿 Marine Toilet Disposal", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/storage_tank.svg"},
-    {"key": "intermittent", "value": "yes", "description": "🄿 Intermittent Stream", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/waterway-stream.svg"},
-    {"key": "waterway", "value": "stream", "description": "🄿 Stream", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/waterway-stream.svg"},
+    {"key": "intermittent", "value": "yes", "description": "🄿 Intermittent Stream", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-stream.svg"},
+    {"key": "waterway", "value": "stream", "description": "🄿 Stream", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD@master/svg/iD-sprite/presets/waterway-stream.svg"},
     {"key": "waterway", "value": "water_point", "description": "🄿 Marine Drinking Water", "object_types": ["area", "node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/drinking-water-15.svg"},
     {"key": "waterway", "value": "waterfall", "description": "🄿 Waterfall", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/waterfall-15.svg"},
     {"key": "waterway", "value": "weir", "description": "🄿 Weir", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/dam-15.svg"},
@@ -1271,11 +1284,13 @@
     {"key": "bench", "description": "🄵 Bench"},
     {"key": "bicycle_parking", "description": "🄵 Type"},
     {"key": "bin", "description": "🄵 Waste Bin"},
+    {"key": "blind", "description": "🄵 Blind Person Access"},
     {"key": "blood:", "value": "whole", "description": "🄵 Blood Components"},
     {"key": "blood:", "value": "plasma", "description": "🄵 Blood Components"},
     {"key": "blood:", "value": "platelets", "description": "🄵 Blood Components"},
     {"key": "blood:", "value": "stemcells", "description": "🄵 Blood Components"},
     {"key": "board_type", "description": "🄵 Type"},
+    {"key": "bollard", "description": "🄵 Type"},
     {"key": "booth", "description": "🄵 Booth"},
     {"key": "boules", "description": "🄵 Type"},
     {"key": "brand", "description": "🄵 Brand"},
@@ -1460,6 +1475,7 @@
     {"key": "incline", "value": "down", "description": "🄵 Incline"},
     {"key": "incline", "description": "🄵 Incline"},
     {"key": "industrial", "description": "🄵 Type"},
+    {"key": "informal", "description": "🄵 Informal"},
     {"key": "information", "description": "🄵 Type"},
     {"key": "inscription", "description": "🄵 Inscription"},
     {"key": "intermittent", "description": "🄵 Intermittent"},
@@ -1488,7 +1504,7 @@
     {"key": "leaf_type", "value": "leafless", "description": "🄵 Leaf Type"},
     {"key": "leaf_type", "value": "mixed", "description": "🄵 Leaf Type"},
     {"key": "length", "description": "🄵 Length (Meters)"},
-    {"key": "level", "description": "🄵 Level"},
+    {"key": "level", "description": "🄵 Levels, 🄵 Level"},
     {"key": "liaison", "description": "🄵 Type"},
     {"key": "line_attachment", "description": "🄵 Line Attachment"},
     {"key": "lit", "description": "🄵 Lit"},
@@ -1497,6 +1513,7 @@
     {"key": "location", "value": "roof", "description": "🄵 Location"},
     {"key": "location", "description": "🄵 Location"},
     {"key": "lock", "description": "🄵 Lock"},
+    {"key": "lockable", "description": "🄵 Lockable"},
     {"key": "manufacturer", "description": "🄵 Manufacturer"},
     {"key": "map_size", "description": "🄵 Coverage"},
     {"key": "map_type", "description": "🄵 Type"},
@@ -1584,6 +1601,7 @@
     {"key": "piste:type", "value": "connection", "description": "🄵 Type"},
     {"key": "plant", "description": "🄵 Plant"},
     {"key": "plant:output:electricity", "description": "🄵 Power Output"},
+    {"key": "playground:theme", "description": "🄵 Theme"},
     {"key": "population", "description": "🄵 Population"},
     {"key": "post:block_number", "description": "🄵 Delivery Address"},
     {"key": "post:city", "description": "🄵 Delivery Address"},
@@ -1624,6 +1642,7 @@
     {"key": "reservation", "value": "no", "description": "🄵 Reservations"},
     {"key": "reservation", "value": "required", "description": "🄵 Reservations"},
     {"key": "reservation", "value": "recommended", "description": "🄵 Reservations"},
+    {"key": "residential", "description": "🄵 Type"},
     {"key": "resort", "description": "🄵 Type"},
     {"key": "resource", "description": "🄵 Resources"},
     {"key": "restriction", "description": "🄵 Type"},
@@ -1725,6 +1744,7 @@
     {"key": "stars", "description": "🄵 Stars"},
     {"key": "start_date", "description": "🄵 Start Date"},
     {"key": "step_count", "description": "🄵 Number of Steps"},
+    {"key": "stile", "description": "🄵 Type"},
     {"key": "stop", "value": "all", "description": "🄵 Stop Type"},
     {"key": "stop", "value": "minor", "description": "🄵 Stop Type"},
     {"key": "street_cabinet", "description": "🄵 Type"},
@@ -1834,7 +1854,7 @@
     {"key": "windings:configuration", "value": "scott", "description": "🄵 Windings Configuration"},
     {"key": "windings:configuration", "value": "leblanc", "description": "🄵 Windings Configuration"},
     {"key": "aerialway", "value": "canopy", "description": "🄳 ➜ aerialway=zip_line"},
-    {"key": "aeroway", "value": "aerobridge", "description": "🄳 ➜ aeroway=jet_bridge"},
+    {"key": "aeroway", "value": "aerobridge", "description": "🄳 ➜ aeroway=jet_bridge + highway=corridor"},
     {"key": "access", "value": "public", "description": "🄳 ➜ access=yes"},
     {"key": "amenity", "value": "advertising", "description": "🄳 ➜ advertising=*"},
     {"key": "amenity", "value": "artwork", "description": "🄳 ➜ tourism=artwork"},
@@ -1865,6 +1885,7 @@
     {"key": "amenity", "value": "social_club", "description": "🄳 ➜ club=*"},
     {"key": "amenity", "value": "ticket_booth", "description": "🄳 ➜ shop=ticket"},
     {"key": "amenity", "value": "toilet", "description": "🄳 ➜ amenity=toilets"},
+    {"key": "amenity", "value": "weigh_bridge", "description": "🄳 ➜ amenity=weighbridge"},
     {"key": "amenity", "value": "winery", "description": "🄳 ➜ craft=winery"},
     {"key": "amenity", "value": "youth_center", "description": "🄳 ➜ amenity=community_centre + community_centre:for=juvenile"},
     {"key": "amenity", "value": "youth_centre", "description": "🄳 ➜ amenity=community_centre + community_centre:for=juvenile"},
@@ -1897,8 +1918,19 @@
     {"key": "diaper", "value": "no", "description": "🄳 ➜ changing_table=no"},
     {"key": "diaper", "value": "room", "description": "🄳 ➜ changing_table=yes + changing_table:location=room"},
     {"key": "diaper", "value": "yes", "description": "🄳 ➜ changing_table=yes"},
+    {"key": "direction", "value": "all", "description": "🄳 ➜ direction=both"},
+    {"key": "direction", "value": "downhill", "description": "🄳 ➜ incline=down"},
+    {"key": "direction", "value": "East", "description": "🄳 ➜ direction=E"},
+    {"key": "direction", "value": "forward;backward", "description": "🄳 ➜ direction=both"},
+    {"key": "direction", "value": "North", "description": "🄳 ➜ direction=N"},
+    {"key": "direction", "value": "South", "description": "🄳 ➜ direction=S"},
+    {"key": "direction", "value": "uphill", "description": "🄳 ➜ incline=up"},
+    {"key": "direction", "value": "West", "description": "🄳 ➜ direction=W"},
     {"key": "drinkable", "description": "🄳 ➜ drinking_water=*"},
     {"key": "dropped_kerb", "description": "🄳 ➜ kerb=lowered"},
+    {"key": "embankment", "value": "1", "description": "🄳 ➜ embankment=yes"},
+    {"key": "embankment", "value": "false", "description": "🄳 ➜ embankment=no"},
+    {"key": "embankment", "value": "true", "description": "🄳 ➜ embankment=yes"},
     {"key": "escalator", "description": "🄳 ➜ highway=steps + conveying=*"},
     {"key": "fee", "value": "0", "description": "🄳 ➜ fee=no"},
     {"key": "fee", "value": "free", "description": "🄳 ➜ fee=no"},
@@ -1916,12 +1948,12 @@
     {"key": "footway", "value": "right", "description": "🄳 ➜ sidewalk=right"},
     {"key": "footway", "value": "separate", "description": "🄳 ➜ sidewalk=separate"},
     {"key": "generator:source", "value": "photovoltaic", "description": "🄳 ➜ generator:source=solar + generator:method=photovoltaic"},
-    {"key": "golf", "value": "faiway", "description": "🄳 ➜ golf=fairway"},
-    {"key": "golf", "value": "putting_green", "description": "🄳 ➜ golf=green"},
-    {"key": "golf", "value": "sand_trap", "description": "🄳 ➜ golf=bunker"},
-    {"key": "golf", "value": "tee_area", "description": "🄳 ➜ golf=tee"},
-    {"key": "golf", "value": "tee_box", "description": "🄳 ➜ golf=tee"},
-    {"key": "golf", "value": "teebox", "description": "🄳 ➜ golf=tee"},
+    {"key": "golf", "value": "faiway", "description": "🄳 ➜ golf=fairway + landuse=grass"},
+    {"key": "golf", "value": "putting_green", "description": "🄳 ➜ golf=green + landuse=grass"},
+    {"key": "golf", "value": "sand_trap", "description": "🄳 ➜ golf=bunker + natural=sand"},
+    {"key": "golf", "value": "tee_area", "description": "🄳 ➜ golf=tee + landuse=grass"},
+    {"key": "golf", "value": "tee_box", "description": "🄳 ➜ golf=tee + landuse=grass"},
+    {"key": "golf", "value": "teebox", "description": "🄳 ➜ golf=tee + landuse=grass"},
     {"key": "highway", "value": "abandoned", "description": "🄳 ➜ abandoned:highway=*"},
     {"key": "highway", "value": "ford", "description": "🄳 ➜ ford=*"},
     {"key": "highway", "value": "no", "description": "🄳"},
@@ -1957,6 +1989,12 @@
     {"key": "man_made", "value": "oil_tank", "description": "🄳 ➜ man_made=storage_tank + content=oil"},
     {"key": "man_made", "value": "wastewater_tank", "description": "🄳 ➜ man_made=storage_tank + content=wastewater"},
     {"key": "man_made", "value": "water_tank", "description": "🄳 ➜ man_made=storage_tank + content=water"},
+    {"key": "man_made", "value": "weigh_bridge", "description": "🄳 ➜ amenity=weighbridge"},
+    {"key": "man_made", "value": "weighbridge", "description": "🄳 ➜ amenity=weighbridge"},
+    {"key": "man_made", "value": "weighing_machine", "description": "🄳 ➜ amenity=weighbridge"},
+    {"key": "man_made", "value": "weighing_scale", "description": "🄳 ➜ amenity=weighbridge"},
+    {"key": "man_made", "value": "weighting machine", "description": "🄳 ➜ amenity=weighbridge"},
+    {"key": "man_made", "value": "weighting_machine", "description": "🄳 ➜ amenity=weighbridge"},
     {"key": "man_made", "value": "well", "description": "🄳 ➜ man_made=water_well"},
     {"key": "man_made", "value": "winery", "description": "🄳 ➜ craft=winery"},
     {"key": "maxage", "description": "🄳 ➜ max_age=*"},
diff --git a/data/update_locales.js b/data/update_locales.js
index f09a9024b..6bb76afbb 100644
--- a/data/update_locales.js
+++ b/data/update_locales.js
@@ -269,7 +269,7 @@ function getLangNamesInNativeLang() {
     return ordered;
 }
 
-var rematchCodes = { 'ar-AA': 'ar', 'zh-CN': 'zh', 'zh-HK': 'zh-Hant-HK', 'zh-TW': 'zh', 'pt-BR': 'pt', 'pt': 'pt-PT' };
+var rematchCodes = { 'ar-AA': 'ar', 'zh-CN': 'zh', 'zh-HK': 'zh-Hant-HK', 'zh-TW': 'zh-Hant', 'pt-BR': 'pt', 'pt': 'pt-PT' };
 
 function languageNamesInLanguageOf(code) {
 
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 7dc2c5c3a..e94b4fd7b 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -396,9 +396,21 @@
             },
             "reverse": {
                 "title": "Reverse",
-                "description": "Make this line go in the opposite direction.",
+                "description": {
+                    "point": "Flip the direction of this point.",
+                    "points": "Flip the direction of these points.",
+                    "line": "Make this line go in the opposite direction.",
+                    "lines": "Make these lines go in the opposite direction.",
+                    "features": "Flip the directions of these features."
+                },
                 "key": "V",
-                "annotation": "Reversed a line."
+                "annotation": {
+                    "point": "Reversed a point.",
+                    "points": "Reversed multiple points.",
+                    "line": "Reversed a line.",
+                    "lines": "Reversed multiple lines.",
+                    "features": "Reversed multiple features."
+                }
             },
             "split": {
                 "title": "Split",
@@ -1735,9 +1747,8 @@
                 "reference": "A \"fixme\" tag indicates that a mapper has requested help with a feature."
             },
             "generic_name": {
-                "title": "Suspicious Names",
                 "message": "{feature} has the suspicious name \"{name}\"",
-                "tip": "Find features with generic or suspicious names",
+                "message_language": "{feature} has the suspicious name \"{name}\" in {language}",
                 "reference": "Names should be the actual, on-the-ground names of features."
             },
             "incompatible_source": {
@@ -1750,20 +1761,23 @@
                     "reference": "Google products are proprietary and must not be used as references."
                 }
             },
+            "incorrect_name": {
+                "message": "{feature} has the mistaken name \"{name}\"",
+                "message_language": "{feature} has the mistaken name \"{name}\" in {language}"
+            },
             "invalid_format": {
                 "title": "Invalid Formatting",
                 "tip": "Find tags with unexpected formats",
                 "email": {
-                    "message": "{feature} has an invalid email address.",
-                    "message_multi": "{feature} has multiple invalid email addresses.",
+                    "message": "{feature} has an invalid email address",
+                    "message_multi": "{feature} has multiple invalid email addresses",
                     "reference": "Email addresses must look like \"user@example.com\"."
-                },
-                "website": {
-                    "message": "{feature} has an invalid website.",
-                    "message_multi": "{feature} has multiple invalid websites.",
-                    "reference": "Websites should start with \"http\" or \"https\"."
                 }
             },
+            "mismatched_geometry": {
+                "title": "Mismatched Geometry",
+                "tip": "Find features with conflicting tags and geometry"
+            },
             "missing_role": {
                 "title": "Missing Roles",
                 "message": "{member} has no role within {relation}",
@@ -1801,9 +1815,14 @@
                 },
                 "noncanonical_brand": {
                     "message": "{feature} looks like a brand with nonstandard tags",
+                    "message_incomplete": "{feature} looks like a brand with incomplete tags",
                     "reference": "All features of the same brand should be tagged the same way."
                 }
             },
+            "point_as_vertex": {
+                "message": "{feature} should be a standalone point based on its tags",
+                "reference": "Some features shouldn't be part of lines or areas."
+            },
             "private_data": {
                 "title": "Private Information",
                 "tip": "Find features that may contain private information",
@@ -1812,10 +1831,12 @@
                     "message": "{feature} might be tagged with private contact information"
                 }
             },
+            "suspicious_name": {
+                "title": "Suspicious Names",
+                "tip": "Find features with generic or suspicious names"
+            },
             "tag_suggests_area": {
-                "title": "Lines Tagged as Areas",
                 "message": "{feature} should be a closed area based on the tag \"{tag}\"",
-                "tip": "Find features that are tagged as lines and should possibly be tagged as areas",
                 "reference": "Areas must have connected endpoints."
             },
             "unknown_road": {
@@ -1855,6 +1876,10 @@
                     "reference": "Buildings with unsquare corners can often be drawn more accurately."
                 }
             },
+            "vertex_as_point": {
+                "message": "{feature} should be part of a line or area based on its tags",
+                "reference": "Some features shouldn't be standalone points."
+            },
             "fix": {
                 "connect_almost_junction": {
                     "annotation": "Connected very close features."
@@ -1884,6 +1909,9 @@
                 "delete_feature": {
                     "title": "Delete this feature"
                 },
+                "extract_point": {
+                    "title": "Extract this point"
+                },
                 "ignore_issue": {
                     "title": "Ignore this issue"
                 },
@@ -1904,9 +1932,11 @@
                     "title": "Remove from relation"
                 },
                 "remove_generic_name": {
-                    "title": "Remove the name",
                     "annotation": "Removed a generic name."
                 },
+                "remove_mistaken_name": {
+                    "annotation": "Removed a mistaken name."
+                },
                 "remove_private_info": {
                     "annotation": "Removed private information."
                 },
@@ -1920,6 +1950,9 @@
                 "remove_tags": {
                     "title": "Remove the tags"
                 },
+                "remove_the_name": {
+                    "title": "Remove the name"
+                },
                 "reposition_features": {
                     "title": "Reposition the features"
                 },
@@ -2321,7 +2354,7 @@
                     "disconnect": "Disconnect features at the selected node",
                     "extract": "Extract a point from a feature",
                     "split": "Split a line into two at the selected node",
-                    "reverse": "Reverse a line",
+                    "reverse": "Reverse selected features",
                     "move": "Move selected features",
                     "rotate": "Rotate selected features",
                     "orthogonalize": "Square corners of a line or area",
@@ -2679,6 +2712,15 @@
                     "label": "Waste Bin",
                     "terms": "garbage can,trash can"
                 },
+                "blind": {
+                    "label": "Blind Person Access",
+                    "terms": "sight impairment,vision impairment",
+                    "options": {
+                        "yes": "Yes",
+                        "limited": "Limited",
+                        "no": "No"
+                    }
+                },
                 "blood_components": {
                     "label": "Blood Components",
                     "terms": "",
@@ -2693,6 +2735,10 @@
                     "label": "Type",
                     "terms": ""
                 },
+                "bollard": {
+                    "label": "Type",
+                    "terms": ""
+                },
                 "booth": {
                     "label": "Booth",
                     "terms": ""
@@ -2844,6 +2890,10 @@
                     "label": "Content",
                     "terms": ""
                 },
+                "conveying_escalator": {
+                    "label": "Escalator",
+                    "terms": ""
+                },
                 "conveying": {
                     "label": "Movement Direction",
                     "terms": "",
@@ -3417,6 +3467,10 @@
                     "label": "Type",
                     "terms": ""
                 },
+                "informal": {
+                    "label": "Informal",
+                    "terms": ""
+                },
                 "information": {
                     "label": "Type",
                     "terms": ""
@@ -3551,6 +3605,10 @@
                     "label": "Length (Meters)",
                     "terms": ""
                 },
+                "level_semi": {
+                    "label": "Levels",
+                    "terms": "building floors,decks,stories,storeys,storys"
+                },
                 "level": {
                     "label": "Level",
                     "terms": "building floor,deck,storey,story"
@@ -3589,6 +3647,10 @@
                     "label": "Lock",
                     "terms": ""
                 },
+                "lockable": {
+                    "label": "Lockable",
+                    "terms": ""
+                },
                 "man_made": {
                     "label": "Type",
                     "terms": ""
@@ -3980,6 +4042,10 @@
                     "label": "Type",
                     "terms": ""
                 },
+                "playground/theme": {
+                    "label": "Theme",
+                    "terms": ""
+                },
                 "polling_station": {
                     "label": "Polling Place",
                     "terms": "voting place"
@@ -4120,6 +4186,10 @@
                         "recommended": "Recommended"
                     }
                 },
+                "residential": {
+                    "label": "Type",
+                    "terms": ""
+                },
                 "resort": {
                     "label": "Type",
                     "terms": ""
@@ -4435,6 +4505,10 @@
                     "label": "Number of Steps",
                     "terms": ""
                 },
+                "stile": {
+                    "label": "Type",
+                    "terms": ""
+                },
                 "stop": {
                     "label": "Stop Type",
                     "terms": "",
@@ -4449,7 +4523,12 @@
                 },
                 "stroller": {
                     "label": "Stroller Access",
-                    "terms": "baby carriage,perambulator,pram,pushchair"
+                    "terms": "baby carriage,perambulator,pram,pushchair",
+                    "options": {
+                        "yes": "Yes",
+                        "limited": "Limited",
+                        "no": "No"
+                    }
                 },
                 "structure_waterway": {
                     "label": "Structure",
@@ -4791,7 +4870,12 @@
                 },
                 "wheelchair": {
                     "label": "Wheelchair Access",
-                    "terms": "handicap access"
+                    "terms": "handicap access",
+                    "options": {
+                        "yes": "Yes",
+                        "limited": "Limited",
+                        "no": "No"
+                    }
                 },
                 "wholesale": {
                     "label": "Wholesale",
@@ -5025,6 +5109,10 @@
                     "name": "Runway",
                     "terms": "landing strip"
                 },
+                "aeroway/spaceport": {
+                    "name": "Spaceport",
+                    "terms": "cosmodrome,rocket launch center,rocket launch complex,rocket launch site,rocket range,space port"
+                },
                 "aeroway/taxiway": {
                     "name": "Taxiway",
                     "terms": ""
@@ -5119,27 +5207,27 @@
                 },
                 "amenity/bicycle_parking": {
                     "name": "Bicycle Parking",
-                    "terms": "bike"
+                    "terms": "bike,cycle parking,cycling"
                 },
                 "amenity/bicycle_parking/building": {
                     "name": "Bicycle Parking Garage",
-                    "terms": "Multi-Storey Bicycle Park,Multi-Storey Bike Park,Bike Parking Station"
+                    "terms": "Bike Parking Station,cycle parking,cycling,Multi-Storey Bicycle Park,Multi-Storey Bike Park"
                 },
                 "amenity/bicycle_parking/lockers": {
                     "name": "Bicycle Lockers",
-                    "terms": "Bike Lockers"
+                    "terms": "cycle locker,cycling,Bike Lockers"
                 },
                 "amenity/bicycle_parking/shed": {
                     "name": "Bicycle Shed",
-                    "terms": "Bike Shed"
+                    "terms": "cycle shed,cycling,Bike Shed"
                 },
                 "amenity/bicycle_rental": {
                     "name": "Bicycle Rental",
-                    "terms": "bike,bicycle,bikeshare,bike share,bicycle share,hub,dock"
+                    "terms": "bike,bicycle,bikeshare,bike share,bicycle share,cycle dock,cycle hub,cycleshare,cycling"
                 },
                 "amenity/bicycle_repair_station": {
                     "name": "Bicycle Repair Tool Stand",
-                    "terms": "bike,repair,chain,pump,tools,stand,multitool"
+                    "terms": "bike chain,bike multitool,bike repair,bike tools,cycle pump,cycle repair,cycling"
                 },
                 "amenity/biergarten": {
                     "name": "Biergarten",
@@ -5293,6 +5381,10 @@
                     "name": "Fish & Chips Fast Food",
                     "terms": "breakfast,cafe,café,dine,dining,dinner,drive-in,eat,grill,lunch,table,french fries"
                 },
+                "amenity/fast_food/hot_dog": {
+                    "name": "Hot Dog Fast Food",
+                    "terms": "ballpark,frankfurter,frank,hotdog stand,sandwich,sausage,wiener"
+                },
                 "amenity/fast_food/kebab": {
                     "name": "Kebab Fast Food",
                     "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
@@ -5369,6 +5461,10 @@
                     "name": "Library",
                     "terms": "book"
                 },
+                "amenity/loading_dock": {
+                    "name": "Loading Dock",
+                    "terms": "door,loading bay,shipping,unloading,warehouse"
+                },
                 "amenity/love_hotel": {
                     "name": "Love Hotel",
                     "terms": ""
@@ -5705,6 +5801,22 @@
                     "name": "Studio",
                     "terms": "recording,radio,television"
                 },
+                "amenity/studio/audio": {
+                    "name": "Recording Studio",
+                    "terms": "audio mixing,audio production,audio recording,audio studio"
+                },
+                "amenity/studio/radio": {
+                    "name": "Radio Station",
+                    "terms": "am radio,fm radio,radio broadcast,radio studio"
+                },
+                "amenity/studio/television": {
+                    "name": "Television Station",
+                    "terms": "television broadcast,television studio,tv broadcast,tv station,tv studio"
+                },
+                "amenity/studio/video": {
+                    "name": "Film Studio",
+                    "terms": "movie production,movie studio,video production,video recording,video studio"
+                },
                 "amenity/taxi": {
                     "name": "Taxi Stand",
                     "terms": "cab"
@@ -5857,6 +5969,10 @@
                     "name": "Animal Watering Place",
                     "terms": ""
                 },
+                "amenity/weighbridge": {
+                    "name": "Truck Scale",
+                    "terms": "weigh station,weighbridge"
+                },
                 "area": {
                     "name": "Area",
                     "terms": "polygon"
@@ -5878,7 +5994,7 @@
                     "terms": "ferris wheel,theme park,amusement ride"
                 },
                 "attraction/bumper_car": {
-                    "name": "Bumper Car",
+                    "name": "Bumper Cars",
                     "terms": "theme park,dodgem cars,autoscooter"
                 },
                 "attraction/bungee_jumping": {
@@ -5937,6 +6053,10 @@
                     "name": "Block",
                     "terms": ""
                 },
+                "barrier/bollard_line": {
+                    "name": "Bollard Row",
+                    "terms": ""
+                },
                 "barrier/bollard": {
                     "name": "Bollard",
                     "terms": ""
@@ -6731,7 +6851,7 @@
                 },
                 "highway/cycleway": {
                     "name": "Cycle Path",
-                    "terms": "bike path,bicyle path"
+                    "terms": "bicyle path,bike path,cycling path"
                 },
                 "highway/cycleway/crossing": {
                     "name": "Cycle Crossing",
@@ -6833,6 +6953,10 @@
                     "name": "Path",
                     "terms": "hike,hiking,trackway,trail,walk"
                 },
+                "highway/path/informal": {
+                    "name": "Informal Path",
+                    "terms": "bootleg trail,cow path,desire line,desire path,desireline,desirepath,elephant path,game trail,goat track,herd path,pig trail,shortcut,social trail,use trail"
+                },
                 "highway/pedestrian_area": {
                     "name": "Pedestrian Area",
                     "terms": "center,centre,plaza,quad,square,walkway"
@@ -7061,10 +7185,18 @@
                     "name": "Indoor Door",
                     "terms": "doorframe,doorway,portal,room access,threshold"
                 },
+                "indoor/elevator": {
+                    "name": "Indoor Elevator Shaft",
+                    "terms": "elevator,lift"
+                },
                 "indoor/room": {
                     "name": "Room",
                     "terms": "antechamber,anteroom,atrium,cell,chamber,concourse,foyer,indoor room,lobby,vestibule"
                 },
+                "indoor/stairs": {
+                    "name": "Indoor Stairwell",
+                    "terms": "stair,stairs,staircase,stairway,stairwell,steps"
+                },
                 "indoor/wall": {
                     "name": "Indoor Wall",
                     "terms": "indoor barrier,room divider,room partition"
@@ -7801,6 +7933,10 @@
                     "name": "Tunnel",
                     "terms": "bore,dig,shaft,underground passage,underpass"
                 },
+                "man_made/utility_pole": {
+                    "name": "Utility Pole",
+                    "terms": ""
+                },
                 "man_made/wastewater_plant": {
                     "name": "Wastewater Plant",
                     "terms": "sewage*,water treatment plant,reclamation plant"
@@ -8187,7 +8323,7 @@
                 },
                 "office/research": {
                     "name": "Research Office",
-                    "terms": ""
+                    "terms": "R and D,research and development,research lab"
                 },
                 "office/surveyor": {
                     "name": "Surveyor Office",
@@ -8967,7 +9103,7 @@
                 },
                 "shop/farm": {
                     "name": "Produce Stand",
-                    "terms": "farm shop,farm stand"
+                    "terms": "baked goods,farm shop,farm stand,fresh food,fruits,greengrocer,organics,vegetables"
                 },
                 "shop/fashion_accessories": {
                     "name": "Fashion Accessories Store",
@@ -9019,7 +9155,7 @@
                 },
                 "shop/general": {
                     "name": "General Store",
-                    "terms": "Village Shop"
+                    "terms": "village shop"
                 },
                 "shop/gift": {
                     "name": "Gift Shop",
@@ -9209,6 +9345,10 @@
                     "name": "Printer Ink Store",
                     "terms": "copier ink,fax ink,ink cartridges,toner"
                 },
+                "shop/psychic": {
+                    "name": "Psychic",
+                    "terms": "astrology,crystal ball,divination,fortune teller,seer,spirit"
+                },
                 "shop/pyrotechnics": {
                     "name": "Fireworks Store",
                     "terms": "fireworks"
diff --git a/modules/actions/reverse.js b/modules/actions/reverse.js
index a560abbc0..31f498f03 100644
--- a/modules/actions/reverse.js
+++ b/modules/actions/reverse.js
@@ -17,9 +17,10 @@ References:
     http://wiki.openstreetmap.org/wiki/Tag:highway%3Dstop
     http://wiki.openstreetmap.org/wiki/Key:traffic_sign#On_a_way_or_area
 */
-export function actionReverse(wayID, options) {
+export function actionReverse(entityID, options) {
     var ignoreKey = /^.*(_|:)?(description|name|note|website|ref|source|comment|watch|attribution)(_|:)?/;
     var numeric = /^([+\-]?)(?=[\d.])/;
+    var directionKey = /direction$/;
     var turn_lanes = /^turn:lanes:?/;
     var keyReplacements = [
         [/:right$/, ':left'],
@@ -53,6 +54,25 @@ export function actionReverse(wayID, options) {
         '-1': 'yes'
     };
 
+    var compassReplacements = {
+        N: 'S',
+        NNE: 'SSW',
+        NE: 'SW',
+        ENE: 'WSW',
+        E: 'W',
+        ESE: 'WNW',
+        SE: 'NW',
+        SSE: 'NNW',
+        S: 'N',
+        SSW: 'NNE',
+        SW: 'NE',
+        WSW: 'ENE',
+        W: 'E',
+        WNW: 'ESE',
+        NW: 'SE',
+        NNW: 'SSE'
+    };
+
 
     function reverseKey(key) {
         for (var i = 0; i < keyReplacements.length; ++i) {
@@ -65,19 +85,34 @@ export function actionReverse(wayID, options) {
     }
 
 
-    function reverseValue(key, value) {
+    function reverseValue(key, value, includeAbsolute) {
         if (ignoreKey.test(key)) return value;
 
         // Turn lanes are left/right to key (not way) direction - #5674
         if (turn_lanes.test(key)) {
             return value;
+
         } else if (key === 'incline' && numeric.test(value)) {
             return value.replace(numeric, function(_, sign) { return sign === '-' ? '' : '-'; });
+
         } else if (options && options.reverseOneway && key === 'oneway') {
             return onewayReplacements[value] || value;
-        } else {
-            return valueReplacements[value] || value;
+
+        } else if (includeAbsolute && directionKey.test(key)) {
+            if (compassReplacements[value]) return compassReplacements[value];
+
+            var degrees = parseFloat(value);
+            if (typeof degrees === 'number' && !isNaN(degrees)) {
+                if (degrees < 180) {
+                    degrees += 180;
+                } else {
+                    degrees -= 180;
+                }
+                return degrees.toString();
+            }
         }
+
+        return valueReplacements[value] || value;
     }
 
 
@@ -89,7 +124,7 @@ export function actionReverse(wayID, options) {
 
             var tags = {};
             for (var key in node.tags) {
-                tags[reverseKey(key)] = reverseValue(key, node.tags[key]);
+                tags[reverseKey(key)] = reverseValue(key, node.tags[key], node.id === entityID);
             }
             graph = graph.replace(node.update({tags: tags}));
         }
@@ -97,8 +132,7 @@ export function actionReverse(wayID, options) {
     }
 
 
-    return function(graph) {
-        var way = graph.entity(wayID);
+    function reverseWay(graph, way) {
         var nodes = way.nodes.slice().reverse();
         var tags = {};
         var role;
@@ -120,5 +154,33 @@ export function actionReverse(wayID, options) {
         // the way itself with the reversed node ids and updated way tags
         return reverseNodeTags(graph, nodes)
             .replace(way.update({nodes: nodes, tags: tags}));
+    }
+
+
+    var action = function(graph) {
+        var entity = graph.entity(entityID);
+        if (entity.type === 'way') {
+            return reverseWay(graph, entity);
+        }
+        return reverseNodeTags(graph, [entityID]);
     };
+
+    action.disabled = function(graph) {
+        var entity = graph.hasEntity(entityID);
+        if (!entity || entity.type === 'way') return false;
+
+        for (var key in entity.tags) {
+            var value = entity.tags[key];
+            if (reverseKey(key) !== key || reverseValue(key, value, true) !== value) {
+                return false;
+            }
+        }
+        return 'nondirectional_node';
+    };
+
+    action.entityID = function() {
+        return entityID;
+    };
+
+    return action;
 }
diff --git a/modules/core/validator.js b/modules/core/validator.js
index e01a207a5..d5c42f74c 100644
--- a/modules/core/validator.js
+++ b/modules/core/validator.js
@@ -16,9 +16,9 @@ export function coreValidator(context) {
     var _rules = {};
     var _disabledRules = {};
 
-    var _ignoredIssueIDs = {};       // issue.id -> true
-    var _issuesByIssueID = {};       // issue.id -> issue
-    var _issuesByEntityID = {};      // entity.id -> set(issue.id)
+    var _ignoredIssueIDs = {};          // issue.id -> true
+    var _baseCache = validationCache(); // issues before any user edits
+    var _headCache = validationCache(); // issues after all user edits
     var _validatedGraph = null;
     var _deferred = new Set();
 
@@ -53,15 +53,9 @@ export function coreValidator(context) {
 
         // clear caches
         _ignoredIssueIDs = {};
-        _issuesByIssueID = {};
-        _issuesByEntityID = {};
+        _baseCache = validationCache();
+        _headCache = validationCache();
         _validatedGraph = null;
-
-        for (var key in _rules) {
-            if (typeof _rules[key].reset === 'function') {
-                _rules[key].reset();   // 'crossing_ways' is the only one like this
-            }
-        }
     };
 
     validator.resetIgnoredIssues = function() {
@@ -73,28 +67,29 @@ export function coreValidator(context) {
 
     // when the user changes the squaring thereshold, rerun this on all buildings
     validator.changeSquareThreshold = function() {
+
+        reloadUnsquareIssues(_headCache, context.graph());
+        reloadUnsquareIssues(_baseCache, context.history().base());
+
+        dispatch.call('validated');
+    };
+
+    function reloadUnsquareIssues(cache, graph) {
+
         var checkUnsquareWay = _rules.unsquare_way;
         if (typeof checkUnsquareWay !== 'function') return;
 
         // uncache existing
-        Object.values(_issuesByIssueID)
-            .filter(function(issue) { return issue.type === 'unsquare_way'; })
-            .forEach(function(issue) {
-                var entityId = issue.entityIds[0];   // always 1 entity for unsquare way
-                if (_issuesByEntityID[entityId]) {
-                    _issuesByEntityID[entityId].delete(issue.id);
-                }
-                delete _issuesByIssueID[issue.id];
-            });
+        cache.uncacheIssuesOfType('unsquare_way');
 
-        var buildings = context.intersects(geoExtent([-180,-90],[180, 90]))  // everywhere
+        var buildings = context.history().tree().intersects(geoExtent([-180,-90],[180, 90]), graph)  // everywhere
             .filter(function(entity) {
                 return entity.type === 'way' && entity.tags.building && entity.tags.building !== 'no';
             });
 
         // rerun for all buildings
         buildings.forEach(function(entity) {
-            var detected = checkUnsquareWay(entity, context.graph());
+            var detected = checkUnsquareWay(entity, graph);
             if (detected.length !== 1) return;
 
             var issue = detected[0];
@@ -109,15 +104,13 @@ export function coreValidator(context) {
             ignoreFix.issue = issue;
             issue.fixes.push(ignoreFix);
 
-            if (!_issuesByEntityID[entity.id]) {
-                _issuesByEntityID[entity.id] = new Set();
+            if (!cache.issuesByEntityID[entity.id]) {
+                cache.issuesByEntityID[entity.id] = new Set();
             }
-            _issuesByEntityID[entity.id].add(issue.id);
-            _issuesByIssueID[issue.id] = issue;
+            cache.issuesByEntityID[entity.id].add(issue.id);
+            cache.issuesByIssueID[issue.id] = issue;
         });
-
-        dispatch.call('validated');
-    };
+    }
 
 
     // options = {
@@ -128,8 +121,7 @@ export function coreValidator(context) {
     // };
     validator.getIssues = function(options) {
         var opts = Object.assign({ what: 'all', where: 'all', includeIgnored: false, includeDisabledRules: false }, options);
-        var issues = Object.values(_issuesByIssueID);
-        var changes = context.history().difference().changes();
+        var issues = Object.values(_headCache.issuesByIssueID);
         var view = context.map().extent();
 
         return issues.filter(function(issue) {
@@ -145,16 +137,13 @@ export function coreValidator(context) {
             for (var i = 0; i < entityIds.length; i++) {
                 var entityId = entityIds[i];
                 if (!context.hasEntity(entityId)) {
-                    delete _issuesByEntityID[entityId];
-                    delete _issuesByIssueID[issue.id];
+                    delete _headCache.issuesByEntityID[entityId];
+                    delete _headCache.issuesByIssueID[issue.id];
                     return false;
                 }
             }
 
-            if (opts.what === 'edited') {
-                var isEdited = entityIds.some(function(entityId) { return changes[entityId]; });
-                if (entityIds.length && !isEdited) return false;
-            }
+            if (opts.what === 'edited' && _baseCache.issuesByIssueID[issue.id]) return false;
 
             if (opts.where === 'visible') {
                 var extent = issue.extent(context.graph());
@@ -165,6 +154,13 @@ export function coreValidator(context) {
         });
     };
 
+    validator.getResolvedIssues = function() {
+        var baseIssues = Object.values(_baseCache.issuesByIssueID);
+        return baseIssues.filter(function(issue) {
+            return !_headCache.issuesByIssueID[issue.id];
+        });
+    };
+
     validator.focusIssue = function(issue) {
         var extent = issue.extent(context.graph());
 
@@ -193,13 +189,15 @@ export function coreValidator(context) {
 
 
     validator.getEntityIssues = function(entityID, options) {
-        var issueIDs = _issuesByEntityID[entityID];
+        var cache = _headCache;
+
+        var issueIDs = cache.issuesByEntityID[entityID];
         if (!issueIDs) return [];
 
         var opts = options || {};
 
         return Array.from(issueIDs)
-            .map(function(id) { return _issuesByIssueID[id]; })
+            .map(function(id) { return cache.issuesByIssueID[id]; })
             .filter(function(issue) {
                 if (opts.includeDisabledRules === 'only' && !_disabledRules[issue.type]) return false;
                 if (!opts.includeDisabledRules && _disabledRules[issue.type]) return false;
@@ -250,35 +248,6 @@ export function coreValidator(context) {
     };
 
 
-    //
-    // Remove a single entity and all its related issues from the caches
-    //
-    function uncacheEntityID(entityID) {
-        var issueIDs = _issuesByEntityID[entityID];
-        if (!issueIDs) return;
-
-        issueIDs.forEach(function(issueID) {
-            var issue = _issuesByIssueID[issueID];
-            if (issue) {
-                // When multiple entities are involved (e.g. crossing_ways),
-                // remove this issue from the other entity caches too..
-                var entityIds = issue.entityIds || [];
-                entityIds.forEach(function(other) {
-                    if (other !== entityID) {
-                        if (_issuesByEntityID[other]) {
-                            _issuesByEntityID[other].delete(issueID);
-                        }
-                    }
-                });
-            }
-
-            delete _issuesByIssueID[issueID];
-        });
-
-        delete _issuesByEntityID[entityID];
-    }
-
-
     function ignoreIssue(id) {
         _ignoredIssueIDs[id] = true;
     }
@@ -349,7 +318,7 @@ export function coreValidator(context) {
             ran.impossible_oneway = true;
         }
 
-        runValidation('tag_suggests_area');
+        runValidation('mismatched_geometry');
 
         // run all rules not yet run
         Object.keys(_rules).forEach(runValidation);
@@ -372,19 +341,20 @@ export function coreValidator(context) {
 
             var checkParentRels = [entity];
 
-            if (entity.type === 'node') {   // include parent ways
+            if (entity.type === 'node') {
                 graph.parentWays(entity).forEach(function(parentWay) {
-                    acc.add(parentWay.id);
+                    acc.add(parentWay.id); // include parent ways
                     checkParentRels.push(parentWay);
                 });
-            } else if (entity.type === 'relation') {   // include members
+            } else if (entity.type === 'relation') {
                 entity.members.forEach(function(member) {
-                    acc.add(member.id);
+                    acc.add(member.id); // include members
                 });
-            } else if (entity.type === 'way') {   // include connected ways
+            } else if (entity.type === 'way') {
                 entity.nodes.forEach(function(nodeID) {
+                    acc.add(nodeID); // include child nodes
                     graph._parentWays[nodeID].forEach(function(wayID) {
-                        acc.add(wayID);
+                        acc.add(wayID); // include connected ways
                     });
                 });
             }
@@ -403,14 +373,13 @@ export function coreValidator(context) {
     }
 
     //
-    // Run validation for several entities, supplied `entityIDs`
+    // Run validation for several entities, supplied `entityIDs`,
+    // against `graph` for the given `cache`
     //
-    function validateEntities(entityIDs) {
-
-        var graph = context.graph();
+    function validateEntities(entityIDs, graph, cache) {
 
         // clear caches for existing issues related to these entities
-        entityIDs.forEach(uncacheEntityID);
+        entityIDs.forEach(cache.uncacheEntityID);
 
         // detect new issues and update caches
         entityIDs.forEach(function(entityID) {
@@ -419,19 +388,8 @@ export function coreValidator(context) {
             if (!entity) return;
 
             var issues = validateEntity(entity, graph);
-            issues.forEach(function(issue) {
-                var entityIds = issue.entityIds || [];
-                entityIds.forEach(function(entityId) {
-                    if (!_issuesByEntityID[entityId]) {
-                        _issuesByEntityID[entityId] = new Set();
-                    }
-                    _issuesByEntityID[entityId].add(issue.id);
-                });
-                _issuesByIssueID[issue.id] = issue;
-            });
+            cache.cacheIssues(issues);
         });
-
-        dispatch.call('validated');
     }
 
 
@@ -441,6 +399,7 @@ export function coreValidator(context) {
     // and dispatches a `validated` event when finished.
     //
     validator.validate = function() {
+
         var currGraph = context.graph();
         _validatedGraph = _validatedGraph || context.history().base();
         if (currGraph === _validatedGraph) {
@@ -451,24 +410,21 @@ export function coreValidator(context) {
         var difference = coreDifference(oldGraph, currGraph);
         _validatedGraph = currGraph;
 
-        for (var key in _rules) {
-            if (typeof _rules[key].reset === 'function') {
-                _rules[key].reset();   // 'crossing_ways' is the only one like this
-            }
-        }
-
         var createdAndModifiedEntityIDs = difference.extantIDs(true);   // created/modified (true = w/relation members)
         var entityIDsToCheck = entityIDsToValidate(createdAndModifiedEntityIDs, currGraph);
 
-        // "validate" deleted entities in order to update their related entities
+        // check modified and deleted entities against the old graph in order to update their related entities
         // (e.g. deleting the only highway connected to a road should create a disconnected highway issue)
-        var deletedEntityIDs = difference.deleted().map(function(entity) { return entity.id; });
-        var entityIDsToCheckForDeleted = entityIDsToValidate(deletedEntityIDs, oldGraph);
+        var modifiedAndDeletedEntityIDs = difference.deleted().concat(difference.modified())
+            .map(function(entity) { return entity.id; });
+        var entityIDsToCheckForOldGraph = entityIDsToValidate(modifiedAndDeletedEntityIDs, oldGraph);
 
         // concat the sets
-        entityIDsToCheckForDeleted.forEach(entityIDsToCheck.add, entityIDsToCheck);
+        entityIDsToCheckForOldGraph.forEach(entityIDsToCheck.add, entityIDsToCheck);
 
-        validateEntities(entityIDsToCheck);   // dispatches 'validated'
+        validateEntities(entityIDsToCheck, context.graph(), _headCache);
+
+        dispatch.call('validated');
     };
 
 
@@ -489,8 +445,14 @@ export function coreValidator(context) {
         .on('merge.validator', function(entities) {
             if (!entities) return;
             var handle = window.requestIdleCallback(function() {
-                var ids = entities.map(function(entity) { return entity.id; });
-                validateEntities(entityIDsToValidate(ids, context.graph()));
+                var entityIDs = entities.map(function(entity) { return entity.id; });
+                var headGraph = context.graph();
+                validateEntities(entityIDsToValidate(entityIDs, headGraph), headGraph, _headCache);
+
+                var baseGraph = context.history().base();
+                validateEntities(entityIDsToValidate(entityIDs, baseGraph), baseGraph, _baseCache);
+
+                dispatch.call('validated');
             });
             _deferred.add(handle);
         });
@@ -498,3 +460,68 @@ export function coreValidator(context) {
 
     return validator;
 }
+
+
+function validationCache() {
+
+    var cache = {
+        issuesByIssueID: {},  // issue.id -> issue
+        issuesByEntityID: {} // entity.id -> set(issue.id)
+    };
+
+    cache.cacheIssues = function(issues) {
+        issues.forEach(function(issue) {
+            var entityIds = issue.entityIds || [];
+            entityIds.forEach(function(entityId) {
+                if (!cache.issuesByEntityID[entityId]) {
+                    cache.issuesByEntityID[entityId] = new Set();
+                }
+                cache.issuesByEntityID[entityId].add(issue.id);
+            });
+            cache.issuesByIssueID[issue.id] = issue;
+        });
+    };
+
+    cache.uncacheIssue = function(issue) {
+        // When multiple entities are involved (e.g. crossing_ways),
+        // remove this issue from the other entity caches too..
+        var entityIds = issue.entityIds || [];
+        entityIds.forEach(function(entityId) {
+            if (cache.issuesByEntityID[entityId]) {
+                cache.issuesByEntityID[entityId].delete(issue.id);
+            }
+        });
+        delete cache.issuesByIssueID[issue.id];
+    };
+
+    cache.uncacheIssues = function(issues) {
+        issues.forEach(cache.uncacheIssue);
+    };
+
+    cache.uncacheIssuesOfType = function(type) {
+        var issuesOfType = Object.values(cache.issuesByIssueID)
+            .filter(function(issue) { return issue.type === type; });
+        cache.uncacheIssues(issuesOfType);
+    };
+
+    //
+    // Remove a single entity and all its related issues from the caches
+    //
+    cache.uncacheEntityID = function(entityID) {
+        var issueIDs = cache.issuesByEntityID[entityID];
+        if (!issueIDs) return;
+
+        issueIDs.forEach(function(issueID) {
+            var issue = cache.issuesByIssueID[issueID];
+            if (issue) {
+                cache.uncacheIssue(issue);
+            } else {
+                delete cache.issuesByIssueID[issueID];
+            }
+        });
+
+        delete cache.issuesByEntityID[entityID];
+    };
+
+    return cache;
+}
diff --git a/modules/modes/select.js b/modules/modes/select.js
index 541c65cc7..e68906bf3 100644
--- a/modules/modes/select.js
+++ b/modules/modes/select.js
@@ -229,13 +229,17 @@ export function modeSelect(context, selectedIDs) {
         return mode;
     };
 
+    var operations = [];
 
-    mode.enter = function() {
-        if (!checkSelectedIDs()) return;
+    function loadOperations() {
 
-        context.features().forceVisible(selectedIDs);
+        operations.forEach(function(operation) {
+            if (operation.behavior) {
+                context.uninstall(operation.behavior);
+            }
+        });
 
-        var operations = Object.values(Operations)
+        operations = Object.values(Operations)
             .map(function(o) { return o(selectedIDs, context); })
             .filter(function(o) { return o.available() && o.id !== 'delete' && o.id !== 'downgrade'; });
 
@@ -254,10 +258,25 @@ export function modeSelect(context, selectedIDs) {
 
         operations.forEach(function(operation) {
             if (operation.behavior) {
-                behaviors.push(operation.behavior);
+                context.install(operation.behavior);
             }
         });
 
+        // deprecation warning - Radial Menu to be removed in iD v3
+        editMenu = isRadialMenu
+            ? uiRadialMenu(context, operations)
+            : uiEditMenu(context, operations);
+
+    }
+
+
+    mode.enter = function() {
+        if (!checkSelectedIDs()) return;
+
+        context.features().forceVisible(selectedIDs);
+
+        loadOperations();
+
         behaviors.forEach(context.install);
 
         keybinding
@@ -273,16 +292,11 @@ export function modeSelect(context, selectedIDs) {
         d3_select(document)
             .call(keybinding);
 
-
-        // deprecation warning - Radial Menu to be removed in iD v3
-        editMenu = isRadialMenu
-            ? uiRadialMenu(context, operations)
-            : uiEditMenu(context, operations);
-
         context.ui().sidebar
             .select(singular() ? singular().id : null, _newFeature);
 
         context.history()
+            .on('change.select', loadOperations)
             .on('undone.select', update)
             .on('redone.select', update);
 
@@ -519,6 +533,12 @@ export function modeSelect(context, selectedIDs) {
         if (_timeout) window.clearTimeout(_timeout);
         if (inspector) wrap.call(inspector.close);
 
+        operations.forEach(function(operation) {
+            if (operation.behavior) {
+                context.uninstall(operation.behavior);
+            }
+        });
+
         behaviors.forEach(context.uninstall);
 
         d3_select(document)
@@ -528,6 +548,7 @@ export function modeSelect(context, selectedIDs) {
         editMenu = undefined;
 
         context.history()
+            .on('change.select', null)
             .on('undone.select', null)
             .on('redone.select', null);
 
diff --git a/modules/operations/reverse.js b/modules/operations/reverse.js
index 0f0a0952b..2116a6b6c 100644
--- a/modules/operations/reverse.js
+++ b/modules/operations/reverse.js
@@ -4,16 +4,51 @@ import { behaviorOperation } from '../behavior/operation';
 
 
 export function operationReverse(selectedIDs, context) {
-    var entityID = selectedIDs[0];
 
     var operation = function() {
-        context.perform(actionReverse(entityID), operation.annotation());
+        context.perform(function combinedReverseAction(graph) {
+            actions().forEach(function(action) {
+                graph = action(graph);
+            });
+            return graph;
+        }, operation.annotation());
         context.validator().validate();
     };
 
+    function actions(situation) {
+        return selectedIDs.map(function(entityID) {
+            var entity = context.hasEntity(entityID);
+            if (!entity) return;
 
-    operation.available = function() {
-        return selectedIDs.length === 1 && context.geometry(entityID) === 'line';
+            if (situation === 'toolbar') {
+                if (entity.type === 'way' &&
+                    (!entity.isOneWay() && !entity.isSided())) return;
+            }
+
+            var geometry = entity.geometry(context.graph());
+            if (entity.type !== 'node' && geometry !== 'line') return;
+
+            var action = actionReverse(entityID);
+            if (action.disabled(context.graph())) return;
+
+            return action;
+        }).filter(Boolean);
+    }
+
+    function reverseTypeID() {
+        var acts = actions();
+        var nodeActionCount = acts.filter(function(act) {
+            var entity = context.hasEntity(act.entityID());
+            return entity && entity.type === 'node';
+        }).length;
+        var typeID = nodeActionCount === 0 ? 'line' : (nodeActionCount === acts.length ? 'point' : 'features');
+        if (typeID !== 'features' && acts.length > 1) typeID += 's';
+        return typeID;
+    }
+
+
+    operation.available = function(situation) {
+        return actions(situation).length > 0;
     };
 
 
@@ -23,12 +58,12 @@ export function operationReverse(selectedIDs, context) {
 
 
     operation.tooltip = function() {
-        return t('operations.reverse.description');
+        return t('operations.reverse.description.' + reverseTypeID());
     };
 
 
     operation.annotation = function() {
-        return t('operations.reverse.annotation');
+        return t('operations.reverse.annotation.' + reverseTypeID());
     };
 
 
diff --git a/modules/presets/collection.js b/modules/presets/collection.js
index 82429c1cb..86f4591fe 100644
--- a/modules/presets/collection.js
+++ b/modules/presets/collection.js
@@ -81,8 +81,13 @@ export function presetCollection(collection) {
             var pool = this.collection;
             if (countryCode) {
                 pool = pool.filter(function(a) {
-                    if (!a.countryCodes) return true;
-                    return a.countryCodes.indexOf(countryCode) !== -1;
+                    if (a.countryCodes && a.countryCodes.indexOf(countryCode) === -1) {
+                        return false;
+                    }
+                    if (a.notCountryCodes && a.notCountryCodes.indexOf(countryCode) !== -1) {
+                        return false;
+                    }
+                    return true;
                 });
             }
             var searchable = pool.filter(function(a) {
diff --git a/modules/presets/index.js b/modules/presets/index.js
index 315002e55..03cb31e8a 100644
--- a/modules/presets/index.js
+++ b/modules/presets/index.js
@@ -134,15 +134,14 @@ export function presetIndex(context) {
 
         // blacklist
         presets.forEach(function(d) {
-            for (var key in d.tags) break;
-            if (!key) return;
-            if (ignore.indexOf(key) !== -1) return;
-
-            var value = d.tags[key];
-            if (key in areaKeys &&                      // probably an area...
-                d.geometry.indexOf('line') !== -1 &&    // but sometimes a line
-                value !== '*') {
-                areaKeys[key][value] = true;
+            for (var key in d.addTags) {
+                // examine all addTags to get a better sense of what can be tagged on lines - #6800
+                var value = d.addTags[key];
+                if (key in areaKeys &&                      // probably an area...
+                    d.geometry.indexOf('line') !== -1 &&    // but sometimes a line
+                    value !== '*') {
+                    areaKeys[key][value] = true;
+                }
             }
         });
 
diff --git a/modules/renderer/map.js b/modules/renderer/map.js
index 8e52f720a..e3bd47316 100644
--- a/modules/renderer/map.js
+++ b/modules/renderer/map.js
@@ -19,8 +19,10 @@ import { utilGetDimensions } from '../util/dimensions';
 
 // constants
 var TILESIZE = 256;
-var kMin = geoZoomToScale(2, TILESIZE);
-var kMax = geoZoomToScale(24, TILESIZE);
+var minZoom = 2;
+var maxZoom = 24;
+var kMin = geoZoomToScale(minZoom, TILESIZE);
+var kMax = geoZoomToScale(maxZoom, TILESIZE);
 
 function clamp(num, min, max) {
     return Math.max(min, Math.min(num, max));
@@ -424,6 +426,7 @@ export function rendererMap(context) {
                 p0 = _getMouseCoords(source);
                 p1 = t0.invert(p0);
                 k2 = t0.k * Math.pow(2, -dY / 500);
+                k2 = clamp(k2, kMin, kMax);
                 x2 = p0[0] - p1[0] * k2;
                 y2 = p0[1] - p1[1] * k2;
 
@@ -435,6 +438,7 @@ export function rendererMap(context) {
                 p0 = _getMouseCoords(source);
                 p1 = t0.invert(p0);
                 k2 = t0.k * source._scale;
+                k2 = clamp(k2, kMin, kMax);
                 x2 = p0[0] - p1[0] * k2;
                 y2 = p0[1] - p1[1] * k2;
 
@@ -450,6 +454,7 @@ export function rendererMap(context) {
                 p0 = _getMouseCoords(source);
                 p1 = t0.invert(p0);
                 k2 = t0.k * Math.pow(2, -dY / 500);
+                k2 = clamp(k2, kMin, kMax);
                 x2 = p0[0] - p1[0] * k2;
                 y2 = p0[1] - p1[1] * k2;
 
@@ -460,6 +465,7 @@ export function rendererMap(context) {
                 p0 = _getMouseCoords(source);
                 p1 = t0.invert(p0);
                 k2 = t0.k * Math.pow(2, -dY / 500);
+                k2 = clamp(k2, kMin, kMax);
                 x2 = p0[0] - p1[0] * k2;
                 y2 = p0[1] - p1[1] * k2;
 
@@ -472,6 +478,7 @@ export function rendererMap(context) {
                 x2 = p1[0] - dX;
                 y2 = p1[1] - dY;
                 k2 = projection.scale();
+                k2 = clamp(k2, kMin, kMax);
             }
 
             // something changed - replace the event transform
@@ -720,10 +727,11 @@ export function rendererMap(context) {
 
     map.zoomIn = function() { zoomIn(1); };
     map.zoomInFurther = function() { zoomIn(4); };
+    map.canZoomIn = function() { return map.zoom() < maxZoom; };
 
     map.zoomOut = function() { zoomOut(1); };
     map.zoomOutFurther = function() { zoomOut(4); };
-
+    map.canZoomOut = function() { return map.zoom() > minZoom; };
 
     map.center = function(loc2) {
         if (!arguments.length) {
diff --git a/modules/services/taginfo.js b/modules/services/taginfo.js
index 7bcca4237..0ecbb6c71 100644
--- a/modules/services/taginfo.js
+++ b/modules/services/taginfo.js
@@ -299,7 +299,7 @@ export default {
                 // A few OSM keys expect values to contain uppercase values (see #3377).
                 // This is not an exhaustive list (e.g. `name` also has uppercase values)
                 // but these are the fields where taginfo value lookup is most useful.
-                var re = /network|taxon|genus|species|brand|grape_variety|royal_cypher|listed_status|booth|rating|stars|:output|_hours|_times|_ref|manufacturer/;
+                var re = /network|taxon|genus|species|brand|grape_variety|royal_cypher|listed_status|booth|rating|stars|:output|_hours|_times|_ref|manufacturer|country|target/;
                 var allowUpperCase = re.test(params.key);
                 var f = filterValues(allowUpperCase);
 
diff --git a/modules/svg/areas.js b/modules/svg/areas.js
index 4df9ac0ad..90e7357c5 100644
--- a/modules/svg/areas.js
+++ b/modules/svg/areas.js
@@ -5,134 +5,17 @@ import { svgPath, svgSegmentWay } from './helpers';
 import { svgTagClasses } from './tag_classes';
 import _isEqual from 'lodash-es/isEqual';
 import _omit from 'lodash-es/omit';
+import { svgTagPattern } from './tag_pattern';
 
 export function svgAreas(projection, context) {
-    // Patterns only work in Firefox when set directly on element.
-    // (This is not a bug: https://bugzilla.mozilla.org/show_bug.cgi?id=750632)
-    var patterns = {
-        // tag - pattern name
-        // -or-
-        // tag - value - pattern name
-        // -or-
-        // tag - value - rules (optional tag-values, pattern name)
-        // (matches earlier rules first, so fallback should be last entry)
-        amenity: {
-            grave_yard: 'cemetery',
-            fountain: 'water_standing'
-        },
-        landuse: {
-            cemetery: [
-                { religion: 'christian', pattern: 'cemetery_christian' },
-                { religion: 'buddhist', pattern: 'cemetery_buddhist' },
-                { religion: 'muslim', pattern: 'cemetery_muslim' },
-                { religion: 'jewish', pattern: 'cemetery_jewish' },
-                { pattern: 'cemetery' }
-            ],
-            construction: 'construction',
-            farmland: 'farmland',
-            farmyard: 'farmyard',
-            forest: [
-                { leaf_type: 'broadleaved', pattern: 'forest_broadleaved' },
-                { leaf_type: 'needleleaved', pattern: 'forest_needleleaved' },
-                { leaf_type: 'leafless', pattern: 'forest_leafless' },
-                { pattern: 'forest' } // same as 'leaf_type:mixed'
-            ],
-            grave_yard: 'cemetery',
-            grass: 'grass',
-            landfill: 'landfill',
-            meadow: 'meadow',
-            military: 'construction',
-            orchard: 'orchard',
-            quarry: 'quarry',
-            vineyard: 'vineyard'
-        },
-        natural: {
-            beach: 'beach',
-            grassland: 'grass',
-            sand: 'beach',
-            scrub: 'scrub',
-            water: [
-                { water: 'pond', pattern: 'pond' },
-                { water: 'reservoir', pattern: 'water_standing' },
-                { pattern: 'waves' }
-            ],
-            wetland: [
-                { wetland: 'marsh', pattern: 'wetland_marsh' },
-                { wetland: 'swamp', pattern: 'wetland_swamp' },
-                { wetland: 'bog', pattern: 'wetland_bog' },
-                { wetland: 'reedbed', pattern: 'wetland_reedbed' },
-                { pattern: 'wetland' }
-            ],
-            wood: [
-                { leaf_type: 'broadleaved', pattern: 'forest_broadleaved' },
-                { leaf_type: 'needleleaved', pattern: 'forest_needleleaved' },
-                { leaf_type: 'leafless', pattern: 'forest_leafless' },
-                { pattern: 'forest' } // same as 'leaf_type:mixed'
-            ]
-        },
-        traffic_calming: {
-            island: [
-                { surface: 'grass', pattern: 'grass' },
-            ],
-            chicane: [
-                { surface: 'grass', pattern: 'grass' },
-            ],
-            choker: [
-                { surface: 'grass', pattern: 'grass' },
-            ]
+
+
+    function getPatternStyle(tags) {
+        var imageID = svgTagPattern(tags);
+        if (imageID) {
+            return 'url("#' + imageID + '")';
         }
-    };
-
-    function setPattern(entity) {
-        // Skip pattern filling if this is a building (buildings don't get patterns applied)
-        if (entity.tags.building && entity.tags.building !== 'no') {
-            this.style.fill = this.style.stroke = '';
-            return;
-        }
-
-        for (var tag in patterns) {
-            var entityValue = entity.tags[tag];
-            if (!entityValue) continue;
-
-            if (typeof patterns[tag] === 'string') { // extra short syntax (just tag) - pattern name
-                this.style.fill = this.style.stroke = 'url("#pattern-' + patterns[tag] + '")';
-                return;
-            } else {
-                var values = patterns[tag];
-                for (var value in values) {
-                    if (entityValue !== value) continue;
-
-                    var rules = values[value];
-                    if (typeof rules === 'string') { // short syntax - pattern name
-                        this.style.fill = this.style.stroke = 'url("#pattern-' + rules + '")';
-                        return;
-                    } else { // long syntax - rule array
-                        for (var ruleKey in rules) {
-                            var rule = rules[ruleKey];
-
-                            var pass = true;
-                            for (var criterion in rule) {
-                                if (criterion !== 'pattern') { // reserved for pattern name
-                                    // The only rule is a required tag-value pair
-                                    var v = entity.tags[criterion];
-                                    if (!v || v !== rule[criterion]) {
-                                        pass = false;
-                                        break;
-                                    }
-                                }
-                            }
-
-                            if (pass) {
-                                this.style.fill = this.style.stroke = 'url("#pattern-' + rule.pattern + '")';
-                                return;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        this.style.fill = this.style.stroke = '';
+        return '';
     }
 
 
@@ -280,18 +163,18 @@ export function svgAreas(projection, context) {
 
         var graphEditClass = function(d) {
             if (d.type !== 'way'){
-                return ''; 
+                return '';
             }
             var graphEdited = d.nodes.some(function(n) {
                 if (!base.entities[n]) {
-                    return true; 
-                }                
-                var result = !_isEqual(_omit(graph.entities[n], ['tags', 'v']), _omit(base.entities[n], ['tags', 'v'])); 
-                return result; 
+                    return true;
+                }
+                var result = !_isEqual(_omit(graph.entities[n], ['tags', 'v']), _omit(base.entities[n], ['tags', 'v']));
+                return result;
             });
 
             if (graphEdited){
-                return 'graphedited'; 
+                return 'graphedited';
             }
 
             return (!_isEqual(graph.entities[d.id].tags, base.entities[d.id].tags)) ? 'tagedited' : '';
@@ -306,7 +189,7 @@ export function svgAreas(projection, context) {
 
                 if (layer === 'fill') {
                     this.setAttribute('clip-path', 'url(#' + entity.id + '-clippath)');
-                    setPattern.call(this, entity);
+                    this.style.fill = this.style.stroke = getPatternStyle(entity.tags);
                 }
             })
             .call(svgTagClasses())
diff --git a/modules/svg/defs.js b/modules/svg/defs.js
index f0c886b5e..ccbe794cf 100644
--- a/modules/svg/defs.js
+++ b/modules/svg/defs.js
@@ -53,7 +53,7 @@ export function svgDefs(context) {
                 .attr('stroke', 'none')
                 .attr('fill', color);
         }
-        addSidedMarker('natural', 'rgb(140, 208, 95)', 0);
+        addSidedMarker('natural', 'rgb(170, 170, 170)', 0);
         // for a coastline, the arrows are (somewhat unintuitively) on
         // the water side, so let's color them blue (with a gap) to
         // give a stronger indication
diff --git a/modules/svg/index.js b/modules/svg/index.js
index 82d6bfe9a..40554720f 100644
--- a/modules/svg/index.js
+++ b/modules/svg/index.js
@@ -23,6 +23,7 @@ export { svgRelationMemberTags } from './helpers.js';
 export { svgSegmentWay } from './helpers.js';
 export { svgStreetside } from './streetside.js';
 export { svgTagClasses } from './tag_classes.js';
+export { svgTagPattern } from './tag_pattern.js';
 export { svgTouch } from './touch.js';
 export { svgTurns } from './turns.js';
 export { svgVertices } from './vertices.js';
diff --git a/modules/svg/tag_pattern.js b/modules/svg/tag_pattern.js
new file mode 100644
index 000000000..a286e1e5b
--- /dev/null
+++ b/modules/svg/tag_pattern.js
@@ -0,0 +1,125 @@
+
+// Patterns only work in Firefox when set directly on element.
+// (This is not a bug: https://bugzilla.mozilla.org/show_bug.cgi?id=750632)
+var patterns = {
+    // tag - pattern name
+    // -or-
+    // tag - value - pattern name
+    // -or-
+    // tag - value - rules (optional tag-values, pattern name)
+    // (matches earlier rules first, so fallback should be last entry)
+    amenity: {
+        grave_yard: 'cemetery',
+        fountain: 'water_standing'
+    },
+    landuse: {
+        cemetery: [
+            { religion: 'christian', pattern: 'cemetery_christian' },
+            { religion: 'buddhist', pattern: 'cemetery_buddhist' },
+            { religion: 'muslim', pattern: 'cemetery_muslim' },
+            { religion: 'jewish', pattern: 'cemetery_jewish' },
+            { pattern: 'cemetery' }
+        ],
+        construction: 'construction',
+        farmland: 'farmland',
+        farmyard: 'farmyard',
+        forest: [
+            { leaf_type: 'broadleaved', pattern: 'forest_broadleaved' },
+            { leaf_type: 'needleleaved', pattern: 'forest_needleleaved' },
+            { leaf_type: 'leafless', pattern: 'forest_leafless' },
+            { pattern: 'forest' } // same as 'leaf_type:mixed'
+        ],
+        grave_yard: 'cemetery',
+        grass: 'grass',
+        landfill: 'landfill',
+        meadow: 'meadow',
+        military: 'construction',
+        orchard: 'orchard',
+        quarry: 'quarry',
+        vineyard: 'vineyard'
+    },
+    natural: {
+        beach: 'beach',
+        grassland: 'grass',
+        sand: 'beach',
+        scrub: 'scrub',
+        water: [
+            { water: 'pond', pattern: 'pond' },
+            { water: 'reservoir', pattern: 'water_standing' },
+            { pattern: 'waves' }
+        ],
+        wetland: [
+            { wetland: 'marsh', pattern: 'wetland_marsh' },
+            { wetland: 'swamp', pattern: 'wetland_swamp' },
+            { wetland: 'bog', pattern: 'wetland_bog' },
+            { wetland: 'reedbed', pattern: 'wetland_reedbed' },
+            { pattern: 'wetland' }
+        ],
+        wood: [
+            { leaf_type: 'broadleaved', pattern: 'forest_broadleaved' },
+            { leaf_type: 'needleleaved', pattern: 'forest_needleleaved' },
+            { leaf_type: 'leafless', pattern: 'forest_leafless' },
+            { pattern: 'forest' } // same as 'leaf_type:mixed'
+        ]
+    },
+    traffic_calming: {
+        island: [
+            { surface: 'grass', pattern: 'grass' },
+        ],
+        chicane: [
+            { surface: 'grass', pattern: 'grass' },
+        ],
+        choker: [
+            { surface: 'grass', pattern: 'grass' },
+        ]
+    }
+};
+
+export function svgTagPattern(tags) {
+    // Skip pattern filling if this is a building (buildings don't get patterns applied)
+    if (tags.building && tags.building !== 'no') {
+        return null;
+    }
+
+    for (var tag in patterns) {
+        var entityValue = tags[tag];
+        if (!entityValue) continue;
+
+        if (typeof patterns[tag] === 'string') { // extra short syntax (just tag) - pattern name
+            return 'pattern-' + patterns[tag];
+        } else {
+            var values = patterns[tag];
+            for (var value in values) {
+                if (entityValue !== value) continue;
+
+                var rules = values[value];
+                if (typeof rules === 'string') { // short syntax - pattern name
+                    return 'pattern-' + rules;
+                }
+
+                // long syntax - rule array
+                for (var ruleKey in rules) {
+                    var rule = rules[ruleKey];
+
+                    var pass = true;
+                    for (var criterion in rule) {
+                        if (criterion !== 'pattern') { // reserved for pattern name
+                            // The only rule is a required tag-value pair
+                            var v = tags[criterion];
+                            if (!v || v !== rule[criterion]) {
+                                pass = false;
+                                break;
+                            }
+                        }
+                    }
+
+                    if (pass) {
+                        return 'pattern-' + rule.pattern;
+                    }
+                }
+            }
+        }
+    }
+
+    return null;
+}
diff --git a/modules/ui/commit.js b/modules/ui/commit.js
index 0b0a402d0..3b758aa5d 100644
--- a/modules/ui/commit.js
+++ b/modules/ui/commit.js
@@ -24,7 +24,8 @@ var readOnlyTags = [
     /^imagery_used$/,
     /^host$/,
     /^locale$/,
-    /^warnings:/
+    /^warnings:/,
+    /^resolved:/
 ];
 
 // treat most punctuation (except -, _, +, &) as hashtag delimiters - #4398
@@ -147,31 +148,37 @@ export function uiCommit(context) {
             }
         }
 
-        // remove existing warning counts
+        // remove existing issue counts
         for (var key in tags) {
-            if (key.match(/^warnings:/)) {
+            if (key.match(/(^warnings:)|(^resolved:)/)) {
                 delete tags[key];
             }
         }
 
+        function addIssueCounts(issues, prefix) {
+            var issuesByType = utilArrayGroupBy(issues, 'type');
+            for (var issueType in issuesByType) {
+                var issuesOfType = issuesByType[issueType];
+                if (issuesOfType[0].subtype) {
+                    var issuesBySubtype = utilArrayGroupBy(issuesOfType, 'subtype');
+                    for (var issueSubtype in issuesBySubtype) {
+                        var issuesOfSubtype = issuesBySubtype[issueSubtype];
+                        tags[prefix + ':' + issueType + ':' + issueSubtype] = issuesOfSubtype.length.toString().substr(0, 255);
+                    }
+                } else {
+                    tags[prefix + ':' + issueType] = issuesOfType.length.toString().substr(0, 255);
+                }
+            }
+        }
+
         // add counts of warnings generated by the user's edits
         var warnings = context.validator()
             .getIssuesBySeverity({ what: 'edited', where: 'all', includeIgnored: true, includeDisabledRules: true }).warning;
+        addIssueCounts(warnings, 'warnings');
 
-        var warningsByType = utilArrayGroupBy(warnings, 'type');
-        for (var warningType in warningsByType) {
-            var warningsOfType = warningsByType[warningType];
-            if (warningsOfType[0].subtype) {
-                var warningsBySubtype = utilArrayGroupBy(warningsOfType, 'subtype');
-                for (var warningSubtype in warningsBySubtype) {
-                    var warningsOfSubtype = warningsBySubtype[warningSubtype];
-                    tags['warnings:' + warningType + ':' + warningSubtype] = warningsOfSubtype.length.toString();
-                }
-            } else {
-                tags['warnings:' + warningType] = warningsOfType.length.toString();
-            }
-        }
-
+        // add counts of issues resolved by the user's edits
+        var resolvedIssues = context.validator().getResolvedIssues();
+        addIssueCounts(resolvedIssues, 'resolved');
 
         _changeset = _changeset.update({ tags: tags });
 
diff --git a/modules/ui/entity_editor.js b/modules/ui/entity_editor.js
index fd04d260f..876dc28b4 100644
--- a/modules/ui/entity_editor.js
+++ b/modules/ui/entity_editor.js
@@ -262,6 +262,16 @@ export function uiEntityEditor(context) {
             // Don't replace a weak preset with a fallback preset (e.g. "Point")
             if (!(weakPreset && match.isFallback())) {
                 entityEditor.preset(match);
+
+                if (match.id !== activePreset.id) {
+                    // flash the button to indicate the preset changed
+                    selection
+                        .selectAll('button.preset-reset .label')
+                        .style('background-color', '#fff')
+                        .transition()
+                        .duration(500)
+                        .style('background-color', null);
+                }
             }
             entityEditor.modified(_base !== graph);
             entityEditor(selection);
diff --git a/modules/ui/field.js b/modules/ui/field.js
index d38fa9450..18ede7f9b 100644
--- a/modules/ui/field.js
+++ b/modules/ui/field.js
@@ -291,18 +291,21 @@ export function uiField(context, presetField, entity, options) {
         var latest = context.hasEntity(entity.id);   // check the most current copy of the entity
         if (!latest) return true;
 
-        var require = field.prerequisiteTag;
-        if (require && require.key) {
-            var value = latest.tags[require.key];
-            if (!value) return false;
+        var prerequisiteTag = field.prerequisiteTag;
+        if (prerequisiteTag) {
+            if (prerequisiteTag.key) {
+                var value = latest.tags[prerequisiteTag.key];
+                if (!value) return false;
 
-            if (require.valueNot) {
-                return require.valueNot !== value;
+                if (prerequisiteTag.valueNot) {
+                    return prerequisiteTag.valueNot !== value;
+                }
+                if (prerequisiteTag.value) {
+                    return prerequisiteTag.value === value;
+                }
+            } else if (prerequisiteTag.keyNot) {
+                if (latest.tags[prerequisiteTag.keyNot]) return false;
             }
-            if (require.value) {
-                return require.value === value;
-            }
-            return true;
         }
         return true;
     };
diff --git a/modules/ui/fields/radio.js b/modules/ui/fields/radio.js
index 96d4fdade..3b8bc5a86 100644
--- a/modules/ui/fields/radio.js
+++ b/modules/ui/fields/radio.js
@@ -15,7 +15,7 @@ export function uiFieldRadio(field, context) {
     var wrap = d3_select(null);
     var labels = d3_select(null);
     var radios = d3_select(null);
-    var radioData = (field.options || field.keys).slice();  // shallow copy
+    var radioData = (field.options || (field.strings && field.strings.options && Object.keys(field.strings.options)) || field.keys).slice();  // shallow copy
     var typeField;
     var layerField;
     var _oldType = {};
diff --git a/modules/ui/init.js b/modules/ui/init.js
index fe43c4844..7d1e2dcde 100644
--- a/modules/ui/init.js
+++ b/modules/ui/init.js
@@ -278,7 +278,7 @@ export function uiInit(context) {
         var panPixels = 80;
         context.keybinding()
             .on('⌫', function() { d3_event.preventDefault(); })
-            .on([t('sidebar.key'), '`', '²'], ui.sidebar.toggle)   // #5663 - common QWERTY, AZERTY
+            .on([t('sidebar.key'), '`', '²', '@'], ui.sidebar.toggle)   // #5663, #6864 - common QWERTY, AZERTY
             .on('←', pan([panPixels, 0]))
             .on('↑', pan([0, panPixels]))
             .on('→', pan([-panPixels, 0]))
diff --git a/modules/ui/panels/history.js b/modules/ui/panels/history.js
index 008d95546..507fd4855 100644
--- a/modules/ui/panels/history.js
+++ b/modules/ui/panels/history.js
@@ -90,6 +90,14 @@ export function uiPanelHistory(context) {
             .attr('target', '_blank')
             .attr('tabindex', -1)
             .text('OSMCha');
+
+        links
+            .append('a')
+            .attr('class', 'changeset-achavi-link')
+            .attr('href', 'https://overpass-api.de/achavi/?changeset=' + changeset)
+            .attr('target', '_blank')
+            .attr('tabindex', -1)
+            .text('Achavi');
     }
 
 
diff --git a/modules/ui/raw_tag_editor.js b/modules/ui/raw_tag_editor.js
index 1e28ec7f1..0242402e5 100644
--- a/modules/ui/raw_tag_editor.js
+++ b/modules/ui/raw_tag_editor.js
@@ -364,8 +364,10 @@ export function uiRawTagEditor(context) {
 
 
         function pushMore() {
+            // if pressing Tab on the last value field with content, add a blank row
             if (d3_event.keyCode === 9 && !d3_event.shiftKey &&
-                list.selectAll('li:last-child input.value').node() === this) {
+                list.selectAll('li:last-child input.value').node() === this &&
+                utilGetSetValue(d3_select(this))) {
                 addTag();
             }
         }
diff --git a/modules/ui/zoom.js b/modules/ui/zoom.js
index ac1704f64..2893b4798 100644
--- a/modules/ui/zoom.js
+++ b/modules/ui/zoom.js
@@ -79,5 +79,21 @@ export function uiZoom(context) {
             context.keybinding().on([key], zoomOut);
             context.keybinding().on([uiCmd('⌘' + key)], zoomOutFurther);
         });
+
+        function updateButtonStates() {
+            var canZoomIn = context.map().canZoomIn();
+            selection.select('button.zoom-in')
+                .classed('disabled', !canZoomIn)
+                .attr('disabled', canZoomIn ? null : true);
+
+            var canZoomOut = context.map().canZoomOut();
+            selection.select('button.zoom-out')
+                .classed('disabled', !canZoomOut)
+                .attr('disabled', canZoomOut ? null : true);
+        }
+
+        updateButtonStates();
+
+        context.map().on('move.uiZoom', updateButtonStates);
     };
 }
diff --git a/modules/validations/crossing_ways.js b/modules/validations/crossing_ways.js
index 08f2c7d4b..d07e951e2 100644
--- a/modules/validations/crossing_ways.js
+++ b/modules/validations/crossing_ways.js
@@ -12,19 +12,6 @@ import { validationIssue, validationIssueFix } from '../core/validation';
 export function validationCrossingWays(context) {
     var type = 'crossing_ways';
 
-    /*
-    Avoid duplicate work by cacheing issues. The same issues live under two paths.
-    {
-        w-123: {
-            w-456: [{issue1}, {issue2}…]
-        },
-        w-456: {
-            w-123: [{issue1}, {issue2}…]
-        }
-    }
-    */
-    var _issueCache = {};
-
     // returns the way or its parent relation, whichever has a useful feature type
     function getFeatureWithFeatureTypeTagsForWay(way, graph) {
         if (getFeatureTypeForTags(way.tags) === null) {
@@ -252,9 +239,6 @@ export function validationCrossingWays(context) {
                 // skip if this way was already checked and only one issue is needed
                 if (checkedSingleCrossingWays[way2.id]) continue;
 
-                // don't re-check previously checked features
-                if (_issueCache[way1.id] && _issueCache[way1.id][way2.id]) continue;
-
                 // mark this way as checked even if there are no crossings
                 comparedWays[way2.id] = true;
 
@@ -295,12 +279,6 @@ export function validationCrossingWays(context) {
                 }
             }
         }
-        for (var way2ID in comparedWays) {
-            if (!_issueCache[way1.id]) _issueCache[way1.id] = {};
-            if (!_issueCache[way1.id][way2ID]) _issueCache[way1.id][way2ID] = [];
-            if (!_issueCache[way2ID]) _issueCache[way2ID] = {};
-            if (!_issueCache[way2ID][way1.id]) _issueCache[way2ID][way1.id] = [];
-        }
         return edgeCrossInfos;
     }
 
@@ -337,20 +315,11 @@ export function validationCrossingWays(context) {
 
         var issues = [];
         // declare these here to reduce garbage collection
-        var wayIndex, crossingIndex, key, crossings, crossing, issue;
+        var wayIndex, crossingIndex, crossings;
         for (wayIndex in ways) {
-            var way = ways[wayIndex];
-            crossings = findCrossingsByWay(way, graph, tree);
+            crossings = findCrossingsByWay(ways[wayIndex], graph, tree);
             for (crossingIndex in crossings) {
-                crossing = crossings[crossingIndex];
-                var way2 = crossing.ways[1];
-                issue = createIssue(crossing, graph);
-                // cache the issues for each way
-                _issueCache[way.id][way2.id].push(issue);
-                _issueCache[way2.id][way.id].push(issue);
-            }
-            for (key in _issueCache[way.id]) {
-                issues = issues.concat(_issueCache[way.id][key]);
+                issues.push(createIssue(crossings[crossingIndex], graph));
             }
         }
         return issues;
@@ -457,9 +426,12 @@ export function validationCrossingWays(context) {
                 connectionTags: connectionTags
             },
             // differentiate based on the loc since two ways can cross multiple times
-            hash: JSON.stringify(crossing.crossPoint) +
+            hash: crossing.crossPoint.toString() +
                 // if the edges change then so does the fix
-                JSON.stringify(crossing.edges) +
+                crossing.edges.slice().sort(function(edge1, edge2) {
+                    // order to assure hash is deterministic
+                    return edge1[0] < edge2[0] ? -1 : 1;
+                }).toString() +
                 // ensure the correct connection tags are added in the fix
                 JSON.stringify(connectionTags),
             loc: crossing.crossPoint,
@@ -569,10 +541,6 @@ export function validationCrossingWays(context) {
         });
     }
 
-    validation.reset = function() {
-        _issueCache = {};
-    };
-
     validation.type = type;
 
     return validation;
diff --git a/modules/validations/disconnected_way.js b/modules/validations/disconnected_way.js
index b16323f25..ef1a566f4 100644
--- a/modules/validations/disconnected_way.js
+++ b/modules/validations/disconnected_way.js
@@ -110,37 +110,58 @@ export function validationDisconnectedWay() {
 
         function routingIslandForEntity(entity) {
 
-            if (entity.type !== 'way') return null;
+            var routingIsland = new Set();  // the interconnected routable features
+            var waysToCheck = [];           // the queue of remaining routable ways to traverse
 
-            if (!isRoutableWay(entity, true)) return null;
+            function queueParentWays(node) {
+                graph.parentWays(node).forEach(function(parentWay) {
+                    if (!routingIsland.has(parentWay) &&    // only check each feature once
+                        isRoutableWay(parentWay, false)) {  // only check routable features
+                        routingIsland.add(parentWay);
+                        waysToCheck.push(parentWay);
+                    }
+                });
+            }
 
-            var waysToCheck = [entity];
-            var routingIsland = new Set([entity]);
+            if (entity.type === 'way' && isRoutableWay(entity, true)) {
+
+                routingIsland.add(entity);
+                waysToCheck.push(entity);
+
+            } else if (entity.type === 'node' && isRoutableNode(entity)) {
+
+                routingIsland.add(entity);
+                queueParentWays(entity);
+
+            } else {
+                // this feature isn't routable, cannot be a routing island
+                return null;
+            }
 
             while (waysToCheck.length) {
                 var wayToCheck = waysToCheck.pop();
                 var childNodes = graph.childNodes(wayToCheck);
                 for (var i in childNodes) {
                     var vertex = childNodes[i];
-                    var result = isConnectedVertex(vertex, routingIsland);
-                    if (result === true) {
+
+                    if (isConnectedVertex(vertex)) {
+                        // found a link to the wider network, not a routing island
                         return null;
-                    } else if (result === false) {
-                        continue;
                     }
-                    result.forEach(function(connectedWay) {
-                        if (!routingIsland.has(connectedWay)) {
-                            routingIsland.add(connectedWay);
-                            waysToCheck.push(connectedWay);
-                        }
-                    });
+
+                    if (isRoutableNode(vertex)) {
+                        routingIsland.add(vertex);
+                    }
+
+                    queueParentWays(vertex);
                 }
             }
 
+            // no network link found, this is a routing island, return its members
             return routingIsland;
         }
 
-        function isConnectedVertex(vertex, routingIslandWays) {
+        function isConnectedVertex(vertex) {
             // assume ways overlapping unloaded tiles are connected to the wider road network  - #5938
             var osm = services.osm;
             if (osm && !osm.isDataLoaded(vertex.loc)) return true;
@@ -150,24 +171,12 @@ export function validationDisconnectedWay() {
                 vertex.tags.entrance !== 'no') return true;
             if (vertex.tags.amenity === 'parking_entrance') return true;
 
-            var parentsWays = graph.parentWays(vertex);
-
-            // standalone vertex
-            if (parentsWays.length === 1) return false;
-
-            var connectedWays = new Set();
-
-            for (var i in parentsWays) {
-                var parentWay = parentsWays[i];
-
-                // ignore any way we've already accounted for
-                if (routingIslandWays.has(parentWay)) continue;
-
-                if (isRoutableWay(parentWay, false)) connectedWays.add(parentWay);
-            }
-
-            if (connectedWays.size) return connectedWays;
+            return false;
+        }
 
+        function isRoutableNode(node) {
+            // treat elevators as distinct features in the highway network
+            if (node.tags.highway === 'elevator') return true;
             return false;
         }
 
diff --git a/modules/validations/generic_name.js b/modules/validations/generic_name.js
deleted file mode 100644
index 657840e2f..000000000
--- a/modules/validations/generic_name.js
+++ /dev/null
@@ -1,102 +0,0 @@
-import { filters } from 'name-suggestion-index';
-
-import { t } from '../util/locale';
-import { utilPreset } from '../util';
-import { validationIssue, validationIssueFix } from '../core/validation';
-import { actionChangeTags } from '../actions/change_tags';
-
-
-export function validationGenericName() {
-    var type = 'generic_name';
-
-    // known list of generic names (e.g. "bar")
-    var discardNamesRegexes = filters.discardNames.map(function(discardName) {
-        return new RegExp(discardName, 'i');
-    });
-
-    var keysToTestForGenericValues = ['amenity', 'building', 'leisure', 'man_made', 'shop', 'tourism'];
-
-    function isGenericName(entity) {
-        var name = entity.tags.name;
-        if (!name) return false;
-        // a generic name is okay if it's a known brand or entity
-        if (entity.hasWikidata()) return false;
-        name = name.toLowerCase();
-
-        var i, key, val;
-
-        // test if the name is just the key or tag value (e.g. "park")
-        for (i = 0; i < keysToTestForGenericValues.length; i++) {
-            key = keysToTestForGenericValues[i];
-            val = entity.tags[key];
-            if (val) {
-                val = val.toLowerCase();
-                if (key === name ||
-                    val === name ||
-                    key.replace(/\_/g, ' ') === name ||
-                    val.replace(/\_/g, ' ') === name) {
-                    return entity.tags.name;
-                }
-            }
-        }
-
-        // test if the name is otherwise generic
-        for (i = 0; i < discardNamesRegexes.length; i++) {
-            if (discardNamesRegexes[i].test(name)) {
-                return entity.tags.name;
-            }
-        }
-
-        return false;
-    }
-
-
-    var validation = function checkGenericName(entity) {
-        var generic = isGenericName(entity);
-        if (!generic) return [];
-
-        return [new validationIssue({
-            type: type,
-            severity: 'warning',
-            message: function(context) {
-                var entity = context.hasEntity(this.entityIds[0]);
-                if (!entity) return '';
-                var preset = utilPreset(entity, context);
-                return t('issues.generic_name.message', { feature: preset.name(), name: generic });
-            },
-            reference: showReference,
-            entityIds: [entity.id],
-            hash: generic,
-            fixes: [
-                new validationIssueFix({
-                    icon: 'iD-operation-delete',
-                    title: t('issues.fix.remove_generic_name.title'),
-                    onClick: function(context) {
-                        var entityId = this.issue.entityIds[0];
-                        var entity = context.entity(entityId);
-                        var tags = Object.assign({}, entity.tags);   // shallow copy
-                        delete tags.name;
-                        context.perform(
-                            actionChangeTags(entityId, tags),
-                            t('issues.fix.remove_generic_name.annotation')
-                        );
-                    }
-                })
-            ]
-        })];
-
-
-        function showReference(selection) {
-            selection.selectAll('.issue-reference')
-                .data([0])
-                .enter()
-                .append('div')
-                .attr('class', 'issue-reference')
-                .text(t('issues.generic_name.reference'));
-        }
-    };
-
-    validation.type = type;
-
-    return validation;
-}
\ No newline at end of file
diff --git a/modules/validations/index.js b/modules/validations/index.js
index bf3bd8abc..345a0c034 100644
--- a/modules/validations/index.js
+++ b/modules/validations/index.js
@@ -3,14 +3,14 @@ export { validationCloseNodes } from './close_nodes';
 export { validationCrossingWays } from './crossing_ways';
 export { validationDisconnectedWay } from './disconnected_way';
 export { validationFixmeTag } from './fixme_tag';
-export { validationGenericName } from './generic_name';
+export { validationFormatting } from './invalid_format';
 export { validationImpossibleOneway } from './impossible_oneway';
 export { validationIncompatibleSource } from './incompatible_source';
-export { validationFormatting } from './invalid_format';
 export { validationMaprules } from './maprules';
+export { validationMismatchedGeometry } from './mismatched_geometry';
 export { validationMissingRole } from './missing_role';
 export { validationMissingTag } from './missing_tag';
 export { validationOutdatedTags } from './outdated_tags';
 export { validationPrivateData } from './private_data';
-export { validationTagSuggestsArea } from './tag_suggests_area';
-export { validationUnsquareWay } from './unsquare_way';
\ No newline at end of file
+export { validationSuspiciousName } from './suspicious_name';
+export { validationUnsquareWay } from './unsquare_way';
diff --git a/modules/validations/invalid_format.js b/modules/validations/invalid_format.js
index 7448428f1..991cd1204 100644
--- a/modules/validations/invalid_format.js
+++ b/modules/validations/invalid_format.js
@@ -16,12 +16,12 @@ export function validationFormatting() {
             // An empty value is also acceptable
             return (!email || valid_email.test(email));
         }
-
+        /*
         function isSchemePresent(url) {
             var valid_scheme = /^https?:\/\//i;
             return (!url || valid_scheme.test(url));
         }
-
+        */
         function showReferenceEmail(selection) {
             selection.selectAll('.issue-reference')
                 .data([0])
@@ -30,7 +30,7 @@ export function validationFormatting() {
                 .attr('class', 'issue-reference')
                 .text(t('issues.invalid_format.email.reference'));
         }
-
+        /*
         function showReferenceWebsite(selection) {
             selection.selectAll('.issue-reference')
                 .data([0])
@@ -65,7 +65,7 @@ export function validationFormatting() {
                 }));
             }
         }
-
+        */
         if (entity.tags.email) {
             // Multiple emails are possible
             var emails = entity.tags.email
@@ -97,4 +97,4 @@ export function validationFormatting() {
     validation.type = type;
 
     return validation;
-}
\ No newline at end of file
+}
diff --git a/modules/validations/mismatched_geometry.js b/modules/validations/mismatched_geometry.js
new file mode 100644
index 000000000..4d2880078
--- /dev/null
+++ b/modules/validations/mismatched_geometry.js
@@ -0,0 +1,234 @@
+import { actionAddVertex } from '../actions/add_vertex';
+import { actionChangeTags } from '../actions/change_tags';
+import { actionMergeNodes } from '../actions/merge_nodes';
+import { actionExtract } from '../actions/extract';
+import { modeSelect } from '../modes/select';
+import { osmNodeGeometriesForTags } from '../osm/tags';
+import { geoHasSelfIntersections, geoSphericalDistance } from '../geo';
+import { t } from '../util/locale';
+import { utilDisplayLabel, utilTagText } from '../util';
+import { validationIssue, validationIssueFix } from '../core/validation';
+
+
+export function validationMismatchedGeometry(context) {
+    var type = 'mismatched_geometry';
+
+    function tagSuggestingLineIsArea(entity) {
+        if (entity.type !== 'way' || entity.isClosed()) return null;
+
+        var tagSuggestingArea = entity.tagSuggestingArea();
+        if (!tagSuggestingArea) {
+            return null;
+        }
+
+        if (context.presets().matchTags(tagSuggestingArea, 'line') ===
+            context.presets().matchTags(tagSuggestingArea, 'area')) {
+            // these tags also allow lines and making this an area wouldn't matter
+            return null;
+        }
+
+        return tagSuggestingArea;
+    }
+
+    function makeConnectEndpointsFixOnClick(way, graph) {
+        // must have at least three nodes to close this automatically
+        if (way.nodes.length < 3) return null;
+
+        var nodes = graph.childNodes(way), testNodes;
+        var firstToLastDistanceMeters = geoSphericalDistance(nodes[0].loc, nodes[nodes.length-1].loc);
+
+        // if the distance is very small, attempt to merge the endpoints
+        if (firstToLastDistanceMeters < 0.75) {
+            testNodes = nodes.slice();   // shallow copy
+            testNodes.pop();
+            testNodes.push(testNodes[0]);
+            // make sure this will not create a self-intersection
+            if (!geoHasSelfIntersections(testNodes, testNodes[0].id)) {
+                return function(context) {
+                    var way = context.entity(this.issue.entityIds[0]);
+                    context.perform(
+                        actionMergeNodes([way.nodes[0], way.nodes[way.nodes.length-1]], nodes[0].loc),
+                        t('issues.fix.connect_endpoints.annotation')
+                    );
+                };
+            }
+        }
+
+        // if the points were not merged, attempt to close the way
+        testNodes = nodes.slice();   // shallow copy
+        testNodes.push(testNodes[0]);
+        // make sure this will not create a self-intersection
+        if (!geoHasSelfIntersections(testNodes, testNodes[0].id)) {
+            return function(context) {
+                var wayId = this.issue.entityIds[0];
+                var way = context.entity(wayId);
+                var nodeId = way.nodes[0];
+                var index = way.nodes.length;
+                context.perform(
+                    actionAddVertex(wayId, nodeId, index),
+                    t('issues.fix.connect_endpoints.annotation')
+                );
+            };
+        }
+    }
+
+    function lineTaggedAsAreaIssue(entity, graph) {
+
+        var tagSuggestingArea = tagSuggestingLineIsArea(entity);
+        if (!tagSuggestingArea) return null;
+
+        var fixes = [];
+
+        var connectEndsOnClick = makeConnectEndpointsFixOnClick(entity, graph);
+
+        fixes.push(new validationIssueFix({
+            title: t('issues.fix.connect_endpoints.title'),
+            onClick: connectEndsOnClick
+        }));
+
+        fixes.push(new validationIssueFix({
+            icon: 'iD-operation-delete',
+            title: t('issues.fix.remove_tag.title'),
+            onClick: function(context) {
+                var entityId = this.issue.entityIds[0];
+                var entity = context.entity(entityId);
+                var tags = Object.assign({}, entity.tags);  // shallow copy
+                for (var key in tagSuggestingArea) {
+                    delete tags[key];
+                }
+                context.perform(
+                    actionChangeTags(entityId, tags),
+                    t('issues.fix.remove_tag.annotation')
+                );
+            }
+        }));
+
+        return new validationIssue({
+            type: type,
+            subtype: 'area_as_line',
+            severity: 'warning',
+            message: function(context) {
+                var entity = context.hasEntity(this.entityIds[0]);
+                return entity ? t('issues.tag_suggests_area.message', {
+                    feature: utilDisplayLabel(entity, context),
+                    tag: utilTagText({ tags: tagSuggestingArea })
+                }) : '';
+            },
+            reference: showReference,
+            entityIds: [entity.id],
+            hash: JSON.stringify(tagSuggestingArea) +
+                // avoid stale "connect endpoints" fix
+                (typeof connectEndsOnClick),
+            fixes: fixes
+        });
+
+
+        function showReference(selection) {
+            selection.selectAll('.issue-reference')
+                .data([0])
+                .enter()
+                .append('div')
+                .attr('class', 'issue-reference')
+                .text(t('issues.tag_suggests_area.reference'));
+        }
+    }
+
+    function vertexTaggedAsPointIssue(entity, graph) {
+        // we only care about nodes
+        if (entity.type !== 'node') return null;
+
+        // ignore tagless points
+        if (Object.keys(entity.tags).length === 0) return null;
+
+        // address lines are special so just ignore them
+        if (entity.isOnAddressLine(graph)) return null;
+
+        var geometry = entity.geometry(graph);
+        var allowedGeometries = osmNodeGeometriesForTags(entity.tags);
+
+        if (geometry === 'point' && !allowedGeometries.point && allowedGeometries.vertex) {
+
+            return new validationIssue({
+                type: type,
+                subtype: 'vertex_as_point',
+                severity: 'warning',
+                message: function(context) {
+                    var entity = context.hasEntity(this.entityIds[0]);
+                    return entity ? t('issues.vertex_as_point.message', {
+                        feature: utilDisplayLabel(entity, context)
+                    }) : '';
+                },
+                reference: function showReference(selection) {
+                    selection.selectAll('.issue-reference')
+                        .data([0])
+                        .enter()
+                        .append('div')
+                        .attr('class', 'issue-reference')
+                        .text(t('issues.vertex_as_point.reference'));
+                },
+                entityIds: [entity.id]
+            });
+
+        } else if (geometry === 'vertex' && !allowedGeometries.vertex && allowedGeometries.point) {
+
+            var extractOnClick = null;
+            if (!context.hasHiddenConnections(entity.id) &&
+                !actionExtract(entity.id, context.projection).disabled(context.graph())) {
+
+                extractOnClick = function(context) {
+                    var entityId = this.issue.entityIds[0];
+                    var action = actionExtract(entityId, context.projection);
+                    context.perform(
+                        action,
+                        t('operations.extract.annotation.single')
+                    );
+                    // re-enter mode to trigger updates
+                    context.enter(modeSelect(context, [action.getExtractedNodeID()]));
+                };
+            }
+
+            return new validationIssue({
+                type: type,
+                subtype: 'point_as_vertex',
+                severity: 'warning',
+                message: function(context) {
+                    var entity = context.hasEntity(this.entityIds[0]);
+                    return entity ? t('issues.point_as_vertex.message', {
+                        feature: utilDisplayLabel(entity, context)
+                    }) : '';
+                },
+                reference: function showReference(selection) {
+                    selection.selectAll('.issue-reference')
+                        .data([0])
+                        .enter()
+                        .append('div')
+                        .attr('class', 'issue-reference')
+                        .text(t('issues.point_as_vertex.reference'));
+                },
+                entityIds: [entity.id],
+                fixes: [
+                    new validationIssueFix({
+                        icon: 'iD-operation-extract',
+                        title: t('issues.fix.extract_point.title'),
+                        onClick: extractOnClick
+                    })
+                ],
+                hash: typeof extractOnClick, // avoid stale extraction fix
+            });
+        }
+
+        return null;
+    }
+
+    var validation = function checkMismatchedGeometry(entity, graph) {
+        var issues = [
+            vertexTaggedAsPointIssue(entity, graph),
+            lineTaggedAsAreaIssue(entity, graph)
+        ];
+        return issues.filter(Boolean);
+    };
+
+    validation.type = type;
+
+    return validation;
+}
diff --git a/modules/validations/outdated_tags.js b/modules/validations/outdated_tags.js
index aed803451..000484e93 100644
--- a/modules/validations/outdated_tags.js
+++ b/modules/validations/outdated_tags.js
@@ -173,7 +173,15 @@ export function validationOutdatedTags(context) {
             var currEntity = context.hasEntity(entity.id);
             if (!currEntity) return '';
 
-            return t('issues.outdated_tags.' + prefix + 'message',
+            var messageID = 'issues.outdated_tags.' + prefix + 'message';
+
+            if (subtype === 'noncanonical_brand' && tagDiff.every(function(d) {
+                return d.type === '+';
+            })) {
+                messageID += '_incomplete';
+            }
+
+            return t(messageID,
                 { feature: utilDisplayLabel(currEntity, context) }
             );
         }
diff --git a/modules/validations/suspicious_name.js b/modules/validations/suspicious_name.js
new file mode 100644
index 000000000..33153f5a4
--- /dev/null
+++ b/modules/validations/suspicious_name.js
@@ -0,0 +1,178 @@
+import { filters } from 'name-suggestion-index';
+
+import { t, languageName } from '../util/locale';
+import { utilPreset } from '../util';
+import { validationIssue, validationIssueFix } from '../core/validation';
+import { actionChangeTags } from '../actions/change_tags';
+
+
+export function validationSuspiciousName() {
+    var type = 'suspicious_name';
+
+    // known list of generic names (e.g. "bar")
+    var discardNamesRegexes = filters.discardNames.map(function(discardName) {
+        return new RegExp(discardName, 'i');
+    });
+
+    var keysToTestForGenericValues = ['amenity', 'building', 'leisure', 'man_made', 'shop', 'tourism'];
+
+    function isDiscardedSuggestionName(lowercaseName) {
+        for (var i = 0; i < discardNamesRegexes.length; i++) {
+            if (discardNamesRegexes[i].test(lowercaseName)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    // test if the name is just the key or tag value (e.g. "park")
+    function nameMatchesRawTag(lowercaseName, tags) {
+        var i, key, val;
+        for (i = 0; i < keysToTestForGenericValues.length; i++) {
+            key = keysToTestForGenericValues[i];
+            val = tags[key];
+            if (val) {
+                val = val.toLowerCase();
+                if (key === lowercaseName ||
+                    val === lowercaseName ||
+                    key.replace(/\_/g, ' ') === lowercaseName ||
+                    val.replace(/\_/g, ' ') === lowercaseName) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    function isGenericName(name, tags) {
+        name = name.toLowerCase();
+        return nameMatchesRawTag(name, tags) || isDiscardedSuggestionName(name);
+    }
+
+    function makeGenericNameIssue(entityId, nameKey, genericName, langCode) {
+        return new validationIssue({
+            type: type,
+            subtype: 'generic_name',
+            severity: 'warning',
+            message: function(context) {
+                var entity = context.hasEntity(this.entityIds[0]);
+                if (!entity) return '';
+                var preset = utilPreset(entity, context);
+                var langName = langCode && languageName(langCode);
+                return t('issues.generic_name.message' + (langName ? '_language' : ''),
+                    { feature: preset.name(), name: genericName, language: langName }
+                );
+            },
+            reference: showReference,
+            entityIds: [entityId],
+            hash: nameKey + '=' + genericName,
+            fixes: [
+                new validationIssueFix({
+                    icon: 'iD-operation-delete',
+                    title: t('issues.fix.remove_the_name.title'),
+                    onClick: function(context) {
+                        var entityId = this.issue.entityIds[0];
+                        var entity = context.entity(entityId);
+                        var tags = Object.assign({}, entity.tags);   // shallow copy
+                        delete tags[nameKey];
+                        context.perform(
+                            actionChangeTags(entityId, tags),
+                            t('issues.fix.remove_generic_name.annotation')
+                        );
+                    }
+                })
+            ]
+        });
+
+        function showReference(selection) {
+            selection.selectAll('.issue-reference')
+                .data([0])
+                .enter()
+                .append('div')
+                .attr('class', 'issue-reference')
+                .text(t('issues.generic_name.reference'));
+        }
+    }
+
+    function makeIncorrectNameIssue(entityId, nameKey, incorrectName, langCode) {
+        return new validationIssue({
+            type: type,
+            subtype: 'not_name',
+            severity: 'warning',
+            message: function(context) {
+                var entity = context.hasEntity(this.entityIds[0]);
+                if (!entity) return '';
+                var preset = utilPreset(entity, context);
+                var langName = langCode && languageName(langCode);
+                return t('issues.incorrect_name.message' + (langName ? '_language' : ''),
+                    { feature: preset.name(), name: incorrectName, language: langName }
+                );
+            },
+            reference: showReference,
+            entityIds: [entityId],
+            hash: nameKey + '=' + incorrectName,
+            fixes: [
+                new validationIssueFix({
+                    icon: 'iD-operation-delete',
+                    title: t('issues.fix.remove_the_name.title'),
+                    onClick: function(context) {
+                        var entityId = this.issue.entityIds[0];
+                        var entity = context.entity(entityId);
+                        var tags = Object.assign({}, entity.tags);   // shallow copy
+                        delete tags[nameKey];
+                        context.perform(
+                            actionChangeTags(entityId, tags),
+                            t('issues.fix.remove_mistaken_name.annotation')
+                        );
+                    }
+                })
+            ]
+        });
+
+        function showReference(selection) {
+            selection.selectAll('.issue-reference')
+                .data([0])
+                .enter()
+                .append('div')
+                .attr('class', 'issue-reference')
+                .text(t('issues.generic_name.reference'));
+        }
+    }
+
+
+    var validation = function checkGenericName(entity) {
+        // a generic name is okay if it's a known brand or entity
+        if (entity.hasWikidata()) return [];
+
+        var issues = [];
+
+        var notNames = (entity.tags['not:name'] || '').split(';');
+
+        for (var key in entity.tags) {
+            var m = key.match(/^name(?:(?::)([a-zA-Z_-]+))?$/);
+            if (!m) continue;
+
+            var langCode = m.length >= 2 ? m[1] : null;
+
+            var value = entity.tags[key];
+            if (notNames.length) {
+                for (var i in notNames) {
+                    var notName = notNames[i];
+                    if (value === notName) {
+                        issues.push(makeIncorrectNameIssue(entity.id, key, value, langCode));
+                        continue;
+                    }
+                }
+            }
+            if (isGenericName(value, entity.tags)) {
+                issues.push(makeGenericNameIssue(entity.id, key, value, langCode));
+            }
+        }
+
+        return issues;
+    };
+
+    validation.type = type;
+
+    return validation;
+}
diff --git a/modules/validations/tag_suggests_area.js b/modules/validations/tag_suggests_area.js
deleted file mode 100644
index cfd92772e..000000000
--- a/modules/validations/tag_suggests_area.js
+++ /dev/null
@@ -1,129 +0,0 @@
-import { actionAddVertex } from '../actions/add_vertex';
-import { actionChangeTags } from '../actions/change_tags';
-import { actionMergeNodes } from '../actions/merge_nodes';
-import { geoHasSelfIntersections, geoSphericalDistance } from '../geo';
-import { t } from '../util/locale';
-import { utilDisplayLabel, utilTagText } from '../util';
-import { validationIssue, validationIssueFix } from '../core/validation';
-
-
-export function validationTagSuggestsArea(context) {
-    var type = 'tag_suggests_area';
-
-
-    var validation = function checkTagSuggestsArea(entity, graph) {
-        if (entity.type !== 'way' || entity.isClosed()) return [];
-
-        var tagSuggestingArea = entity.tagSuggestingArea();
-        if (!tagSuggestingArea) {
-            return [];
-        }
-
-        if (context.presets().matchTags(tagSuggestingArea, 'line') ===
-            context.presets().matchTags(tagSuggestingArea, 'area')) {
-            // these tags also allow lines and making this an area wouldn't matter
-            return [];
-        }
-
-        var tagText = utilTagText({ tags: tagSuggestingArea });
-        var fixes = [];
-
-        var connectEndpointsOnClick;
-
-        // must have at least three nodes to close this automatically
-        if (entity.nodes.length >= 3) {
-            var nodes = graph.childNodes(entity), testNodes;
-            var firstToLastDistanceMeters = geoSphericalDistance(nodes[0].loc, nodes[nodes.length-1].loc);
-
-            // if the distance is very small, attempt to merge the endpoints
-            if (firstToLastDistanceMeters < 0.75) {
-                testNodes = nodes.slice();   // shallow copy
-                testNodes.pop();
-                testNodes.push(testNodes[0]);
-                // make sure this will not create a self-intersection
-                if (!geoHasSelfIntersections(testNodes, testNodes[0].id)) {
-                    connectEndpointsOnClick = function(context) {
-                        var way = context.entity(this.issue.entityIds[0]);
-                        context.perform(
-                            actionMergeNodes([way.nodes[0], way.nodes[way.nodes.length-1]], nodes[0].loc),
-                            t('issues.fix.connect_endpoints.annotation')
-                        );
-                    };
-                }
-            }
-
-            if (!connectEndpointsOnClick) {
-                // if the points were not merged, attempt to close the way
-                testNodes = nodes.slice();   // shallow copy
-                testNodes.push(testNodes[0]);
-                // make sure this will not create a self-intersection
-                if (!geoHasSelfIntersections(testNodes, testNodes[0].id)) {
-                    connectEndpointsOnClick = function(context) {
-                        var wayId = this.issue.entityIds[0];
-                        var way = context.entity(wayId);
-                        var nodeId = way.nodes[0];
-                        var index = way.nodes.length;
-                        context.perform(
-                            actionAddVertex(wayId, nodeId, index),
-                            t('issues.fix.connect_endpoints.annotation')
-                        );
-                    };
-                }
-            }
-        }
-
-        fixes.push(new validationIssueFix({
-            title: t('issues.fix.connect_endpoints.title'),
-            onClick: connectEndpointsOnClick
-        }));
-
-        fixes.push(new validationIssueFix({
-            icon: 'iD-operation-delete',
-            title: t('issues.fix.remove_tag.title'),
-            onClick: function(context) {
-                var entityId = this.issue.entityIds[0];
-                var entity = context.entity(entityId);
-                var tags = Object.assign({}, entity.tags);  // shallow copy
-                for (var key in tagSuggestingArea) {
-                    delete tags[key];
-                }
-                context.perform(
-                    actionChangeTags(entityId, tags),
-                    t('issues.fix.remove_tag.annotation')
-                );
-            }
-        }));
-
-        return [new validationIssue({
-            type: type,
-            severity: 'warning',
-            message: function(context) {
-                var entity = context.hasEntity(this.entityIds[0]);
-                return entity ? t('issues.tag_suggests_area.message', {
-                    feature: utilDisplayLabel(entity, context),
-                    tag: tagText
-                }) : '';
-            },
-            reference: showReference,
-            entityIds: [entity.id],
-            hash: JSON.stringify(tagSuggestingArea) +
-                // avoid stale "connect endpoints" fix
-                (typeof connectEndpointsOnClick),
-            fixes: fixes
-        })];
-
-
-        function showReference(selection) {
-            selection.selectAll('.issue-reference')
-                .data([0])
-                .enter()
-                .append('div')
-                .attr('class', 'issue-reference')
-                .text(t('issues.tag_suggests_area.reference'));
-        }
-    };
-
-    validation.type = type;
-
-    return validation;
-}
diff --git a/package.json b/package.json
index c9c974071..07671fa20 100644
--- a/package.json
+++ b/package.json
@@ -56,10 +56,10 @@
     "wmf-sitematrix": "0.1.4"
   },
   "devDependencies": {
-    "@fortawesome/fontawesome-svg-core": "^1.2.19",
-    "@fortawesome/free-brands-svg-icons": "^5.9.0",
-    "@fortawesome/free-regular-svg-icons": "^5.9.0",
-    "@fortawesome/free-solid-svg-icons": "^5.9.0",
+    "@fortawesome/fontawesome-svg-core": "^1.2.25",
+    "@fortawesome/free-brands-svg-icons": "^5.11.2",
+    "@fortawesome/free-regular-svg-icons": "^5.11.2",
+    "@fortawesome/free-solid-svg-icons": "^5.11.2",
     "@mapbox/maki": "^6.0.0",
     "chai": "^4.1.0",
     "cldr-core": "35.1.0",
@@ -86,12 +86,12 @@
     "osm-community-index": "0.12.0",
     "phantomjs-prebuilt": "~2.1.11",
     "request": "^2.88.0",
-    "rollup": "~1.19.4",
+    "rollup": "~1.21.4",
     "rollup-plugin-commonjs": "^10.0.0",
     "rollup-plugin-includepaths": "~0.2.3",
     "rollup-plugin-json": "~4.0.0",
     "rollup-plugin-node-resolve": "~5.1.0",
-    "rollup-plugin-visualizer": "~2.5.4",
+    "rollup-plugin-visualizer": "~2.6.0",
     "shelljs": "^0.8.0",
     "shx": "^0.3.0",
     "sinon": "7.3.2",
@@ -99,7 +99,7 @@
     "smash": "0.0",
     "static-server": "^2.2.1",
     "svg-sprite": "1.5.0",
-    "temaki": "1.8.0",
+    "temaki": "1.9.0",
     "uglify-js": "~3.6.0"
   },
   "greenkeeper": {
diff --git a/svg/fontawesome/far-lightbulb.svg b/svg/fontawesome/far-lightbulb.svg
deleted file mode 100644
index b2c677898..000000000
--- a/svg/fontawesome/far-lightbulb.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg aria-hidden="true" focusable="false" data-prefix="far" data-icon="lightbulb" class="svg-inline--fa fa-lightbulb fa-w-11" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 352 512"><path fill="currentColor" d="M176 80c-52.94 0-96 43.06-96 96 0 8.84 7.16 16 16 16s16-7.16 16-16c0-35.3 28.72-64 64-64 8.84 0 16-7.16 16-16s-7.16-16-16-16zM96.06 459.17c0 3.15.93 6.22 2.68 8.84l24.51 36.84c2.97 4.46 7.97 7.14 13.32 7.14h78.85c5.36 0 10.36-2.68 13.32-7.14l24.51-36.84c1.74-2.62 2.67-5.7 2.68-8.84l.05-43.18H96.02l.04 43.18zM176 0C73.72 0 0 82.97 0 176c0 44.37 16.45 84.85 43.56 115.78 16.64 18.99 42.74 58.8 52.42 92.16v.06h48v-.12c-.01-4.77-.72-9.51-2.15-14.07-5.59-17.81-22.82-64.77-62.17-109.67-20.54-23.43-31.52-53.15-31.61-84.14-.2-73.64 59.67-128 127.95-128 70.58 0 128 57.42 128 128 0 30.97-11.24 60.85-31.65 84.14-39.11 44.61-56.42 91.47-62.1 109.46a47.507 47.507 0 0 0-2.22 14.3v.1h48v-.05c9.68-33.37 35.78-73.18 52.42-92.16C335.55 260.85 352 220.37 352 176 352 78.8 273.2 0 176 0z"></path></svg>
\ No newline at end of file
diff --git a/svg/fontawesome/far-newspaper.svg b/svg/fontawesome/far-newspaper.svg
deleted file mode 100644
index 3967c15b8..000000000
--- a/svg/fontawesome/far-newspaper.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg aria-hidden="true" focusable="false" data-prefix="far" data-icon="newspaper" class="svg-inline--fa fa-newspaper fa-w-18" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="currentColor" d="M552 64H112c-20.858 0-38.643 13.377-45.248 32H24c-13.255 0-24 10.745-24 24v272c0 30.928 25.072 56 56 56h496c13.255 0 24-10.745 24-24V88c0-13.255-10.745-24-24-24zM48 392V144h16v248c0 4.411-3.589 8-8 8s-8-3.589-8-8zm480 8H111.422c.374-2.614.578-5.283.578-8V112h416v288zM172 280h136c6.627 0 12-5.373 12-12v-96c0-6.627-5.373-12-12-12H172c-6.627 0-12 5.373-12 12v96c0 6.627 5.373 12 12 12zm28-80h80v40h-80v-40zm-40 140v-24c0-6.627 5.373-12 12-12h136c6.627 0 12 5.373 12 12v24c0 6.627-5.373 12-12 12H172c-6.627 0-12-5.373-12-12zm192 0v-24c0-6.627 5.373-12 12-12h104c6.627 0 12 5.373 12 12v24c0 6.627-5.373 12-12 12H364c-6.627 0-12-5.373-12-12zm0-144v-24c0-6.627 5.373-12 12-12h104c6.627 0 12 5.373 12 12v24c0 6.627-5.373 12-12 12H364c-6.627 0-12-5.373-12-12zm0 72v-24c0-6.627 5.373-12 12-12h104c6.627 0 12 5.373 12 12v24c0 6.627-5.373 12-12 12H364c-6.627 0-12-5.373-12-12z"></path></svg>
\ No newline at end of file
diff --git a/svg/fontawesome/fas-apple-alt.svg b/svg/fontawesome/fas-apple-alt.svg
new file mode 100644
index 000000000..6ad147cd2
--- /dev/null
+++ b/svg/fontawesome/fas-apple-alt.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="apple-alt" class="svg-inline--fa fa-apple-alt fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M350.85 129c25.97 4.67 47.27 18.67 63.92 42 14.65 20.67 24.64 46.67 29.96 78 4.67 28.67 4.32 57.33-1 86-7.99 47.33-23.97 87-47.94 119-28.64 38.67-64.59 58-107.87 58-10.66 0-22.3-3.33-34.96-10-8.66-5.33-18.31-8-28.97-8s-20.3 2.67-28.97 8c-12.66 6.67-24.3 10-34.96 10-43.28 0-79.23-19.33-107.87-58-23.97-32-39.95-71.67-47.94-119-5.32-28.67-5.67-57.33-1-86 5.32-31.33 15.31-57.33 29.96-78 16.65-23.33 37.95-37.33 63.92-42 15.98-2.67 37.95-.33 65.92 7 23.97 6.67 44.28 14.67 60.93 24 16.65-9.33 36.96-17.33 60.93-24 27.98-7.33 49.96-9.67 65.94-7zm-54.94-41c-9.32 8.67-21.65 15-36.96 19-10.66 3.33-22.3 5-34.96 5l-14.98-1c-1.33-9.33-1.33-20 0-32 2.67-24 10.32-42.33 22.97-55 9.32-8.67 21.65-15 36.96-19 10.66-3.33 22.3-5 34.96-5l14.98 1 1 15c0 12.67-1.67 24.33-4.99 35-3.99 15.33-10.31 27.67-18.98 37z"></path></svg>
\ No newline at end of file
diff --git a/svg/fontawesome/fas-car-crash.svg b/svg/fontawesome/fas-car-crash.svg
new file mode 100644
index 000000000..f75814624
--- /dev/null
+++ b/svg/fontawesome/fas-car-crash.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="car-crash" class="svg-inline--fa fa-car-crash fa-w-20" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M143.25 220.81l-12.42 46.37c-3.01 11.25-3.63 22.89-2.41 34.39l-35.2 28.98c-6.57 5.41-16.31-.43-14.62-8.77l15.44-76.68c1.06-5.26-2.66-10.28-8-10.79l-77.86-7.55c-8.47-.82-11.23-11.83-4.14-16.54l65.15-43.3c4.46-2.97 5.38-9.15 1.98-13.29L21.46 93.22c-5.41-6.57.43-16.3 8.78-14.62l76.68 15.44c5.26 1.06 10.28-2.66 10.8-8l7.55-77.86c.82-8.48 11.83-11.23 16.55-4.14l43.3 65.14c2.97 4.46 9.15 5.38 13.29 1.98l60.4-49.71c6.57-5.41 16.3.43 14.62 8.77L262.1 86.38c-2.71 3.05-5.43 6.09-7.91 9.4l-32.15 42.97-10.71 14.32c-32.73 8.76-59.18 34.53-68.08 67.74zm494.57 132.51l-12.42 46.36c-3.13 11.68-9.38 21.61-17.55 29.36a66.876 66.876 0 0 1-8.76 7l-13.99 52.23c-1.14 4.27-3.1 8.1-5.65 11.38-7.67 9.84-20.74 14.68-33.54 11.25L515 502.62c-17.07-4.57-27.2-22.12-22.63-39.19l8.28-30.91-247.28-66.26-8.28 30.91c-4.57 17.07-22.12 27.2-39.19 22.63l-30.91-8.28c-12.8-3.43-21.7-14.16-23.42-26.51-.57-4.12-.35-8.42.79-12.68l13.99-52.23a66.62 66.62 0 0 1-4.09-10.45c-3.2-10.79-3.65-22.52-.52-34.2l12.42-46.37c5.31-19.8 19.36-34.83 36.89-42.21a64.336 64.336 0 0 1 18.49-4.72l18.13-24.23 32.15-42.97c3.45-4.61 7.19-8.9 11.2-12.84 8-7.89 17.03-14.44 26.74-19.51 4.86-2.54 9.89-4.71 15.05-6.49 10.33-3.58 21.19-5.63 32.24-6.04 11.05-.41 22.31.82 33.43 3.8l122.68 32.87c11.12 2.98 21.48 7.54 30.85 13.43a111.11 111.11 0 0 1 34.69 34.5c8.82 13.88 14.64 29.84 16.68 46.99l6.36 53.29 3.59 30.05a64.49 64.49 0 0 1 22.74 29.93c4.39 11.88 5.29 25.19 1.75 38.39zM255.58 234.34c-18.55-4.97-34.21 4.04-39.17 22.53-4.96 18.49 4.11 34.12 22.65 39.09 18.55 4.97 45.54 15.51 50.49-2.98 4.96-18.49-15.43-53.67-33.97-58.64zm290.61 28.17l-6.36-53.29c-.58-4.87-1.89-9.53-3.82-13.86-5.8-12.99-17.2-23.01-31.42-26.82l-122.68-32.87a48.008 48.008 0 0 0-50.86 17.61l-32.15 42.97 172 46.08 75.29 20.18zm18.49 54.65c-18.55-4.97-53.8 15.31-58.75 33.79-4.95 18.49 23.69 22.86 42.24 27.83 18.55 4.97 34.21-4.04 39.17-22.53 4.95-18.48-4.11-34.12-22.66-39.09z"></path></svg>
\ No newline at end of file
diff --git a/svg/fontawesome/fas-crutch.svg b/svg/fontawesome/fas-crutch.svg
new file mode 100644
index 000000000..57a475d96
--- /dev/null
+++ b/svg/fontawesome/fas-crutch.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="crutch" class="svg-inline--fa fa-crutch fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M507.31 185.71l-181-181a16 16 0 0 0-22.62 0L281 27.31a16 16 0 0 0 0 22.63l181 181a16 16 0 0 0 22.63 0l22.62-22.63a16 16 0 0 0 .06-22.6zm-179.54 66.41l-67.89-67.89 55.1-55.1-45.25-45.25-109.67 109.67a96.08 96.08 0 0 0-25.67 46.29L106.65 360.1l-102 102a16 16 0 0 0 0 22.63l22.62 22.62a16 16 0 0 0 22.63 0l102-102 120.25-27.75a95.88 95.88 0 0 0 46.29-25.65l109.68-109.68L382.87 197zm-54.57 54.57a32 32 0 0 1-15.45 8.54l-79.3 18.32 18.3-79.3a32.22 32.22 0 0 1 8.56-15.45l9.31-9.31 67.89 67.89z"></path></svg>
\ No newline at end of file
diff --git a/svg/fontawesome/fas-dolly.svg b/svg/fontawesome/fas-dolly.svg
new file mode 100644
index 000000000..6cd48b441
--- /dev/null
+++ b/svg/fontawesome/fas-dolly.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="dolly" class="svg-inline--fa fa-dolly fa-w-18" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="currentColor" d="M294.2 277.7c18 5 34.7 13.4 49.5 24.7l161.5-53.8c8.4-2.8 12.9-11.9 10.1-20.2L454.9 47.2c-2.8-8.4-11.9-12.9-20.2-10.1l-61.1 20.4 33.1 99.4L346 177l-33.1-99.4-61.6 20.5c-8.4 2.8-12.9 11.9-10.1 20.2l53 159.4zm281 48.7L565 296c-2.8-8.4-11.9-12.9-20.2-10.1l-213.5 71.2c-17.2-22-43.6-36.4-73.5-37L158.4 21.9C154 8.8 141.8 0 128 0H16C7.2 0 0 7.2 0 16v32c0 8.8 7.2 16 16 16h88.9l92.2 276.7c-26.1 20.4-41.7 53.6-36 90.5 6.1 39.4 37.9 72.3 77.3 79.2 60.2 10.7 112.3-34.8 113.4-92.6l213.3-71.2c8.3-2.8 12.9-11.8 10.1-20.2zM256 464c-26.5 0-48-21.5-48-48s21.5-48 48-48 48 21.5 48 48-21.5 48-48 48z"></path></svg>
\ No newline at end of file
diff --git a/svg/fontawesome/fas-flask.svg b/svg/fontawesome/fas-flask.svg
new file mode 100644
index 000000000..69275dd1f
--- /dev/null
+++ b/svg/fontawesome/fas-flask.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="flask" class="svg-inline--fa fa-flask fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M437.2 403.5L320 215V64h8c13.3 0 24-10.7 24-24V24c0-13.3-10.7-24-24-24H120c-13.3 0-24 10.7-24 24v16c0 13.3 10.7 24 24 24h8v151L10.8 403.5C-18.5 450.6 15.3 512 70.9 512h306.2c55.7 0 89.4-61.5 60.1-108.5zM137.9 320l48.2-77.6c3.7-5.2 5.8-11.6 5.8-18.4V64h64v160c0 6.9 2.2 13.2 5.8 18.4l48.2 77.6h-172z"></path></svg>
\ No newline at end of file
diff --git a/svg/fontawesome/fas-guitar.svg b/svg/fontawesome/fas-guitar.svg
index 7da98ba43..419d2f3ff 100644
--- a/svg/fontawesome/fas-guitar.svg
+++ b/svg/fontawesome/fas-guitar.svg
@@ -1 +1 @@
-<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="guitar" class="svg-inline--fa fa-guitar fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M502.6 54.6L457.4 9.4c-12.5-12.5-32.8-12.5-45.3 0l-67.9 67.9c-12.5 12.5-12.5 32.8 0 45.3L290 176.7c-45.4-29-100.4-28.9-133.5 4.2-9.7 9.7-16.4 21.2-20.5 33.9-6.1 18.8-23.5 33.1-42.7 34.9-24 2.3-46.3 11.6-63.4 28.8C-16.3 324.6-8 407.6 48.2 463.8c56.2 56.2 139.2 64.4 185.3 18.3 17.2-17.1 26.5-39.4 28.8-63.5 1.8-19.1 16.1-36.6 34.9-42.7 12.7-4.1 24.2-10.8 33.9-20.5 33.1-33.1 33.1-88.1 4.2-133.5l54.2-54.2c12.5 12.5 32.8 12.5 45.3 0l67.9-67.9c12.4-12.4 12.4-32.7-.1-45.2zM208 352c-26.5 0-48-21.5-48-48s21.5-48 48-48 48 21.5 48 48-21.5 48-48 48z"></path></svg>
\ No newline at end of file
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="guitar" class="svg-inline--fa fa-guitar fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M502.63 39L473 9.37a32 32 0 0 0-45.26 0L381.46 55.7a35.14 35.14 0 0 0-8.53 13.79L360.77 106l-76.26 76.26c-12.16-8.76-25.5-15.74-40.1-19.14-33.45-7.78-67-.88-89.88 22a82.45 82.45 0 0 0-20.24 33.47c-6 18.56-23.21 32.69-42.15 34.46-23.7 2.27-45.73 11.45-62.61 28.44C-16.11 327-7.9 409 47.58 464.45S185 528 230.56 482.52c17-16.88 26.16-38.9 28.45-62.71 1.76-18.85 15.89-36.13 34.43-42.14a82.6 82.6 0 0 0 33.48-20.25c22.87-22.88 29.74-56.36 22-89.75-3.39-14.64-10.37-28-19.16-40.2L406 151.23l36.48-12.16a35.14 35.14 0 0 0 13.79-8.53l46.33-46.32a32 32 0 0 0 .03-45.22zM208 352a48 48 0 1 1 48-48 48 48 0 0 1-48 48z"></path></svg>
\ No newline at end of file
diff --git a/svg/fontawesome/fas-hat-cowboy-side.svg b/svg/fontawesome/fas-hat-cowboy-side.svg
new file mode 100644
index 000000000..6f06ccb22
--- /dev/null
+++ b/svg/fontawesome/fas-hat-cowboy-side.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="hat-cowboy-side" class="svg-inline--fa fa-hat-cowboy-side fa-w-20" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M260.8 291.06c-28.63-22.94-62-35.06-96.4-35.06C87 256 21.47 318.72 1.43 412.06c-3.55 16.6-.43 33.83 8.57 47.3C18.75 472.47 31.83 480 45.88 480H592c-103.21 0-155-37.07-233.19-104.46zm234.65-18.29L468.4 116.2A64 64 0 0 0 392 64.41L200.85 105a64 64 0 0 0-50.35 55.79L143.61 226c6.9-.83 13.7-2 20.79-2 41.79 0 82 14.55 117.29 42.82l98 84.48C450.76 412.54 494.9 448 592 448a48 48 0 0 0 48-48c0-25.39-29.6-119.33-144.55-127.23z"></path></svg>
\ No newline at end of file
diff --git a/svg/fontawesome/fas-hotdog.svg b/svg/fontawesome/fas-hotdog.svg
new file mode 100644
index 000000000..fc663ebb9
--- /dev/null
+++ b/svg/fontawesome/fas-hotdog.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="hotdog" class="svg-inline--fa fa-hotdog fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M488.56 23.44a80 80 0 0 0-113.12 0l-352 352a80 80 0 1 0 113.12 113.12l352-352a80 80 0 0 0 0-113.12zm-49.93 95.19c-19.6 19.59-37.52 22.67-51.93 25.14C373.76 146 364.4 147.6 352 160s-14 21.76-16.23 34.71c-2.48 14.4-5.55 32.33-25.15 51.92s-37.52 22.67-51.92 25.15C245.75 274 236.4 275.6 224 288s-14 21.75-16.23 34.7c-2.47 14.4-5.54 32.33-25.14 51.92s-37.53 22.68-51.93 25.15C117.76 402 108.4 403.6 96 416a16 16 0 0 1-22.63-22.63c19.6-19.59 37.52-22.67 51.92-25.14 13-2.22 22.3-3.82 34.71-16.23s14-21.75 16.22-34.7c2.48-14.4 5.55-32.33 25.15-51.92s37.52-22.67 51.92-25.14c13-2.22 22.3-3.83 34.7-16.23s14-21.76 16.24-34.71c2.47-14.4 5.54-32.33 25.14-51.92s37.52-22.68 51.92-25.15C394.24 110 403.59 108.41 416 96a16 16 0 0 1 22.63 22.63zM31.44 322.18L322.18 31.44l-11.54-11.55c-25-25-63.85-26.66-86.79-3.72L16.17 223.85c-22.94 22.94-21.27 61.79 3.72 86.78zm449.12-132.36L189.82 480.56l11.54 11.55c25 25 63.85 26.66 86.79 3.72l207.68-207.68c22.94-22.94 21.27-61.79-3.72-86.79z"></path></svg>
\ No newline at end of file
diff --git a/svg/fontawesome/fas-music.svg b/svg/fontawesome/fas-music.svg
new file mode 100644
index 000000000..6f6314fa9
--- /dev/null
+++ b/svg/fontawesome/fas-music.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="music" class="svg-inline--fa fa-music fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M470.38 1.51L150.41 96A32 32 0 0 0 128 126.51v261.41A139 139 0 0 0 96 384c-53 0-96 28.66-96 64s43 64 96 64 96-28.66 96-64V214.32l256-75v184.61a138.4 138.4 0 0 0-32-3.93c-53 0-96 28.66-96 64s43 64 96 64 96-28.65 96-64V32a32 32 0 0 0-41.62-30.49z"></path></svg>
\ No newline at end of file
diff --git a/svg/fontawesome/fas-pills.svg b/svg/fontawesome/fas-pills.svg
new file mode 100644
index 000000000..25d63db3a
--- /dev/null
+++ b/svg/fontawesome/fas-pills.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="pills" class="svg-inline--fa fa-pills fa-w-18" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="currentColor" d="M112 32C50.1 32 0 82.1 0 144v224c0 61.9 50.1 112 112 112s112-50.1 112-112V144c0-61.9-50.1-112-112-112zm48 224H64V144c0-26.5 21.5-48 48-48s48 21.5 48 48v112zm139.7-29.7c-3.5-3.5-9.4-3.1-12.3.8-45.3 62.5-40.4 150.1 15.9 206.4 56.3 56.3 143.9 61.2 206.4 15.9 4-2.9 4.3-8.8.8-12.3L299.7 226.3zm229.8-19c-56.3-56.3-143.9-61.2-206.4-15.9-4 2.9-4.3 8.8-.8 12.3l210.8 210.8c3.5 3.5 9.4 3.1 12.3-.8 45.3-62.6 40.5-150.1-15.9-206.4z"></path></svg>
\ No newline at end of file
diff --git a/svg/fontawesome/fas-rocket.svg b/svg/fontawesome/fas-rocket.svg
new file mode 100644
index 000000000..d84d3e5e3
--- /dev/null
+++ b/svg/fontawesome/fas-rocket.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="rocket" class="svg-inline--fa fa-rocket fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M505.05 19.1a15.89 15.89 0 0 0-12.2-12.2C460.65 0 435.46 0 410.36 0c-103.2 0-165.1 55.2-211.29 128H94.87A48 48 0 0 0 52 154.49l-49.42 98.8A24 24 0 0 0 24.07 288h103.77l-22.47 22.47a32 32 0 0 0 0 45.25l50.9 50.91a32 32 0 0 0 45.26 0L224 384.16V488a24 24 0 0 0 34.7 21.49l98.7-49.39a47.91 47.91 0 0 0 26.5-42.9V312.79c72.59-46.3 128-108.4 128-211.09.1-25.2.1-50.4-6.85-82.6zM384 168a40 40 0 1 1 40-40 40 40 0 0 1-40 40z"></path></svg>
\ No newline at end of file
diff --git a/svg/fontawesome/fas-shower.svg b/svg/fontawesome/fas-shower.svg
deleted file mode 100644
index bb8841a14..000000000
--- a/svg/fontawesome/fas-shower.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="shower" class="svg-inline--fa fa-shower fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M389.66 135.6L231.6 293.66c-9.37 9.37-24.57 9.37-33.94 0l-11.32-11.32c-9.37-9.37-9.37-24.57 0-33.94l.11-.11c-34.03-40.21-35.16-98.94-3.39-140.38-11.97-7.55-26.14-11.91-41.3-11.91C98.88 96 64 130.88 64 173.76V480H0V173.76C0 95.59 63.59 32 141.76 32c36.93 0 70.61 14.2 95.86 37.42 35.9-11.51 76.5-4.5 106.67 21.03l.11-.11c9.37-9.37 24.57-9.37 33.94 0l11.32 11.32c9.37 9.37 9.37 24.57 0 33.94zM384 208c0 8.837-7.163 16-16 16s-16-7.163-16-16 7.163-16 16-16 16 7.163 16 16zm32 0c0-8.837 7.163-16 16-16s16 7.163 16 16-7.163 16-16 16-16-7.163-16-16zm96 0c0 8.837-7.163 16-16 16s-16-7.163-16-16 7.163-16 16-16 16 7.163 16 16zm-160 32c0 8.837-7.163 16-16 16s-16-7.163-16-16 7.163-16 16-16 16 7.163 16 16zm48-16c8.837 0 16 7.163 16 16s-7.163 16-16 16-16-7.163-16-16 7.163-16 16-16zm80 16c0 8.837-7.163 16-16 16s-16-7.163-16-16 7.163-16 16-16 16 7.163 16 16zm-160 32c0 8.837-7.163 16-16 16s-16-7.163-16-16 7.163-16 16-16 16 7.163 16 16zm32 0c0-8.837 7.163-16 16-16s16 7.163 16 16-7.163 16-16 16-16-7.163-16-16zm96 0c0 8.837-7.163 16-16 16s-16-7.163-16-16 7.163-16 16-16 16 7.163 16 16zm-128 32c0-8.837 7.163-16 16-16s16 7.163 16 16-7.163 16-16 16-16-7.163-16-16zm96 0c0 8.837-7.163 16-16 16s-16-7.163-16-16 7.163-16 16-16 16 7.163 16 16zm-96 32c0 8.837-7.163 16-16 16s-16-7.163-16-16 7.163-16 16-16 16 7.163 16 16zm64 0c0 8.837-7.163 16-16 16s-16-7.163-16-16 7.163-16 16-16 16 7.163 16 16zm-32 32c0 8.837-7.163 16-16 16s-16-7.163-16-16 7.163-16 16-16 16 7.163 16 16zm-32 32c0 8.837-7.163 16-16 16s-16-7.163-16-16 7.163-16 16-16 16 7.163 16 16z"></path></svg>
\ No newline at end of file
diff --git a/svg/fontawesome/fas-tachometer-alt.svg b/svg/fontawesome/fas-tachometer-alt.svg
new file mode 100644
index 000000000..966108151
--- /dev/null
+++ b/svg/fontawesome/fas-tachometer-alt.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="tachometer-alt" class="svg-inline--fa fa-tachometer-alt fa-w-18" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="currentColor" d="M288 32C128.94 32 0 160.94 0 320c0 52.8 14.25 102.26 39.06 144.8 5.61 9.62 16.3 15.2 27.44 15.2h443c11.14 0 21.83-5.58 27.44-15.2C561.75 422.26 576 372.8 576 320c0-159.06-128.94-288-288-288zm0 64c14.71 0 26.58 10.13 30.32 23.65-1.11 2.26-2.64 4.23-3.45 6.67l-9.22 27.67c-5.13 3.49-10.97 6.01-17.64 6.01-17.67 0-32-14.33-32-32S270.33 96 288 96zM96 384c-17.67 0-32-14.33-32-32s14.33-32 32-32 32 14.33 32 32-14.33 32-32 32zm48-160c-17.67 0-32-14.33-32-32s14.33-32 32-32 32 14.33 32 32-14.33 32-32 32zm246.77-72.41l-61.33 184C343.13 347.33 352 364.54 352 384c0 11.72-3.38 22.55-8.88 32H232.88c-5.5-9.45-8.88-20.28-8.88-32 0-33.94 26.5-61.43 59.9-63.59l61.34-184.01c4.17-12.56 17.73-19.45 30.36-15.17 12.57 4.19 19.35 17.79 15.17 30.36zm14.66 57.2l15.52-46.55c3.47-1.29 7.13-2.23 11.05-2.23 17.67 0 32 14.33 32 32s-14.33 32-32 32c-11.38-.01-20.89-6.28-26.57-15.22zM480 384c-17.67 0-32-14.33-32-32s14.33-32 32-32 32 14.33 32 32-14.33 32-32 32z"></path></svg>
\ No newline at end of file
diff --git a/svg/fontawesome/fas-truck-loading.svg b/svg/fontawesome/fas-truck-loading.svg
new file mode 100644
index 000000000..70d95937c
--- /dev/null
+++ b/svg/fontawesome/fas-truck-loading.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="truck-loading" class="svg-inline--fa fa-truck-loading fa-w-20" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M50.2 375.6c2.3 8.5 11.1 13.6 19.6 11.3l216.4-58c8.5-2.3 13.6-11.1 11.3-19.6l-49.7-185.5c-2.3-8.5-11.1-13.6-19.6-11.3L151 133.3l24.8 92.7-61.8 16.5-24.8-92.7-77.3 20.7C3.4 172.8-1.7 181.6.6 190.1l49.6 185.5zM384 0c-17.7 0-32 14.3-32 32v323.6L5.9 450c-4.3 1.2-6.8 5.6-5.6 9.8l12.6 46.3c1.2 4.3 5.6 6.8 9.8 5.6l393.7-107.4C418.8 464.1 467.6 512 528 512c61.9 0 112-50.1 112-112V0H384zm144 448c-26.5 0-48-21.5-48-48s21.5-48 48-48 48 21.5 48 48-21.5 48-48 48z"></path></svg>
\ No newline at end of file
diff --git a/svg/fontawesome/fas-umbrella-beach.svg b/svg/fontawesome/fas-umbrella-beach.svg
new file mode 100644
index 000000000..72c3ff8be
--- /dev/null
+++ b/svg/fontawesome/fas-umbrella-beach.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="umbrella-beach" class="svg-inline--fa fa-umbrella-beach fa-w-20" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M115.38 136.9l102.11 37.18c35.19-81.54 86.21-144.29 139-173.7-95.88-4.89-188.78 36.96-248.53 111.8-6.69 8.4-2.66 21.05 7.42 24.72zm132.25 48.16l238.48 86.83c35.76-121.38 18.7-231.66-42.63-253.98-7.4-2.7-15.13-4-23.09-4-58.02.01-128.27 69.17-172.76 171.15zM521.48 60.5c6.22 16.3 10.83 34.6 13.2 55.19 5.74 49.89-1.42 108.23-18.95 166.98l102.62 37.36c10.09 3.67 21.31-3.43 21.57-14.17 2.32-95.69-41.91-187.44-118.44-245.36zM560 447.98H321.06L386 269.5l-60.14-21.9-72.9 200.37H16c-8.84 0-16 7.16-16 16.01v32.01C0 504.83 7.16 512 16 512h544c8.84 0 16-7.17 16-16.01v-32.01c0-8.84-7.16-16-16-16z"></path></svg>
\ No newline at end of file
diff --git a/svg/fontawesome/fas-video.svg b/svg/fontawesome/fas-video.svg
new file mode 100644
index 000000000..b74550da3
--- /dev/null
+++ b/svg/fontawesome/fas-video.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="video" class="svg-inline--fa fa-video fa-w-18" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="currentColor" d="M336.2 64H47.8C21.4 64 0 85.4 0 111.8v288.4C0 426.6 21.4 448 47.8 448h288.4c26.4 0 47.8-21.4 47.8-47.8V111.8c0-26.4-21.4-47.8-47.8-47.8zm189.4 37.7L416 177.3v157.4l109.6 75.5c21.2 14.6 50.4-.3 50.4-25.8V127.5c0-25.4-29.1-40.4-50.4-25.8z"></path></svg>
\ No newline at end of file
diff --git a/svg/fontawesome/fas-weight.svg b/svg/fontawesome/fas-weight.svg
new file mode 100644
index 000000000..bd0ef5e4b
--- /dev/null
+++ b/svg/fontawesome/fas-weight.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="weight" class="svg-inline--fa fa-weight fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M448 64h-25.98C438.44 92.28 448 125.01 448 160c0 105.87-86.13 192-192 192S64 265.87 64 160c0-34.99 9.56-67.72 25.98-96H64C28.71 64 0 92.71 0 128v320c0 35.29 28.71 64 64 64h384c35.29 0 64-28.71 64-64V128c0-35.29-28.71-64-64-64zM256 320c88.37 0 160-71.63 160-160S344.37 0 256 0 96 71.63 96 160s71.63 160 160 160zm-.3-151.94l33.58-78.36c3.5-8.17 12.94-11.92 21.03-8.41 8.12 3.48 11.88 12.89 8.41 21l-33.67 78.55C291.73 188 296 197.45 296 208c0 22.09-17.91 40-40 40s-40-17.91-40-40c0-21.98 17.76-39.77 39.7-39.94z"></path></svg>
\ No newline at end of file
diff --git a/test/index.html b/test/index.html
index 6587d173f..378346730 100644
--- a/test/index.html
+++ b/test/index.html
@@ -155,14 +155,14 @@
     <script src='spec/validations/almost_junction.js'></script>
     <script src='spec/validations/crossing_ways.js'></script>
     <script src='spec/validations/disconnected_way.js'></script>
-    <script src='spec/validations/generic_name.js'></script>
     <script src='spec/validations/incompatible_source.js'></script>
+    <script src='spec/validations/mismatched_geometry.js'></script>
     <script src='spec/validations/missing_role.js'></script>
     <script src='spec/validations/missing_tag.js'></script>
     <script src='spec/validations/old_multipolygon.js'></script>
     <script src='spec/validations/outdated_tags.js'></script>
     <script src='spec/validations/private_data.js'></script>
-    <script src='spec/validations/tag_suggests_area.js'></script>
+    <script src='spec/validations/suspicious_name.js'></script>
 
     <script>
         window.mocha.run();
diff --git a/test/spec/actions/reverse.js b/test/spec/actions/reverse.js
index 6ed6ca10c..efccf39ea 100644
--- a/test/spec/actions/reverse.js
+++ b/test/spec/actions/reverse.js
@@ -15,6 +15,73 @@ describe('iD.actionReverse', function () {
         expect(graph.entity(way.id).tags).to.eql({'highway': 'residential'});
     });
 
+    describe('reverses directional tags on nodes', function () {
+        it('reverses relative directions', function () {
+            var node1 = iD.osmNode({ tags: { 'direction': 'forward' } });
+            var graph = iD.actionReverse(node1.id)(iD.coreGraph([node1]));
+            expect(graph.entity(node1.id).tags).to.eql({ 'direction': 'backward' });
+        });
+
+        it('reverses relative directions for arbitrary direction tags', function () {
+            var node1 = iD.osmNode({ tags: { 'traffic_sign:direction': 'forward' } });
+            var graph = iD.actionReverse(node1.id)(iD.coreGraph([node1]));
+            expect(graph.entity(node1.id).tags).to.eql({ 'traffic_sign:direction': 'backward' });
+        });
+
+        it('reverses absolute directions, cardinal compass points', function () {
+            var node1 = iD.osmNode({ tags: { 'direction': 'E' } });
+            var graph = iD.actionReverse(node1.id)(iD.coreGraph([node1]));
+            expect(graph.entity(node1.id).tags).to.eql({ 'direction': 'W' });
+        });
+
+        it('reverses absolute directions, intercardinal compass points', function () {
+            var node1 = iD.osmNode({ tags: { 'direction': 'SE' } });
+            var graph = iD.actionReverse(node1.id)(iD.coreGraph([node1]));
+            expect(graph.entity(node1.id).tags).to.eql({ 'direction': 'NW' });
+        });
+
+        it('reverses absolute directions, secondary intercardinal compass points', function () {
+            var node1 = iD.osmNode({ tags: { 'direction': 'NNE' } });
+            var graph = iD.actionReverse(node1.id)(iD.coreGraph([node1]));
+            expect(graph.entity(node1.id).tags).to.eql({ 'direction': 'SSW' });
+        });
+
+        it('reverses absolute directions, 0 degrees', function () {
+            var node1 = iD.osmNode({ tags: { 'direction': '0' } });
+            var graph = iD.actionReverse(node1.id)(iD.coreGraph([node1]));
+            expect(graph.entity(node1.id).tags).to.eql({ 'direction': '180' });
+        });
+
+        it('reverses absolute directions, positive degrees', function () {
+            var node1 = iD.osmNode({ tags: { 'direction': '85.5' } });
+            var graph = iD.actionReverse(node1.id)(iD.coreGraph([node1]));
+            expect(graph.entity(node1.id).tags).to.eql({ 'direction': '265.5' });
+        });
+
+        it('reverses absolute directions, positive degrees > 360', function () {
+            var node1 = iD.osmNode({ tags: { 'direction': '385.5' } });
+            var graph = iD.actionReverse(node1.id)(iD.coreGraph([node1]));
+            expect(graph.entity(node1.id).tags).to.eql({ 'direction': '205.5' });
+        });
+
+        it('reverses absolute directions, negative degrees', function () {
+            var node1 = iD.osmNode({ tags: { 'direction': '-85.5' } });
+            var graph = iD.actionReverse(node1.id)(iD.coreGraph([node1]));
+            expect(graph.entity(node1.id).tags).to.eql({ 'direction': '94.5' });
+        });
+
+        it('preserves non-directional tags', function () {
+            var node1 = iD.osmNode({ tags: { 'traffic_sign': 'maxspeed' } });
+            var graph = iD.actionReverse(node1.id)(iD.coreGraph([node1]));
+            expect(graph.entity(node1.id).tags).to.eql({ 'traffic_sign': 'maxspeed' });
+        });
+
+        it('preserves non-reversible direction tags', function () {
+            var node1 = iD.osmNode({ tags: { 'direction': 'both' } });
+            var graph = iD.actionReverse(node1.id)(iD.coreGraph([node1]));
+            expect(graph.entity(node1.id).tags).to.eql({ 'direction': 'both' });
+        });
+    });
 
     describe('reverses oneway', function () {
         it('preserves oneway tags', function () {
diff --git a/test/spec/validations/tag_suggests_area.js b/test/spec/validations/mismatched_geometry.js
similarity index 90%
rename from test/spec/validations/tag_suggests_area.js
rename to test/spec/validations/mismatched_geometry.js
index 5f6d99b13..2970ae23f 100644
--- a/test/spec/validations/tag_suggests_area.js
+++ b/test/spec/validations/mismatched_geometry.js
@@ -1,4 +1,4 @@
-describe('iD.validations.tag_suggests_area', function () {
+describe('iD.validations.mismatched_geometry', function () {
     var context;
 
     beforeEach(function() {
@@ -41,7 +41,7 @@ describe('iD.validations.tag_suggests_area', function () {
     }
 
     function validate() {
-        var validator = iD.validationTagSuggestsArea(context);
+        var validator = iD.validationMismatchedGeometry(context);
         var changes = context.history().changes();
         var entities = changes.modified.concat(changes.created);
         var issues = [];
@@ -86,7 +86,8 @@ describe('iD.validations.tag_suggests_area', function () {
         var issues = validate();
         expect(issues).to.have.lengthOf(1);
         var issue = issues[0];
-        expect(issue.type).to.eql('tag_suggests_area');
+        expect(issue.type).to.eql('mismatched_geometry');
+        expect(issue.subtype).to.eql('area_as_line');
         expect(issue.severity).to.eql('warning');
         expect(issue.entityIds).to.have.lengthOf(1);
         expect(issue.entityIds[0]).to.eql('w-1');
@@ -97,7 +98,8 @@ describe('iD.validations.tag_suggests_area', function () {
         var issues = validate();
         expect(issues).to.have.lengthOf(1);
         var issue = issues[0];
-        expect(issue.type).to.eql('tag_suggests_area');
+        expect(issue.type).to.eql('mismatched_geometry');
+        expect(issue.subtype).to.eql('area_as_line');
         expect(issue.severity).to.eql('warning');
         expect(issue.entityIds).to.have.lengthOf(1);
         expect(issue.entityIds[0]).to.eql('w-1');
diff --git a/test/spec/validations/generic_name.js b/test/spec/validations/suspicious_name.js
similarity index 63%
rename from test/spec/validations/generic_name.js
rename to test/spec/validations/suspicious_name.js
index f128fb8ff..ba2fb186e 100644
--- a/test/spec/validations/generic_name.js
+++ b/test/spec/validations/suspicious_name.js
@@ -1,4 +1,4 @@
-describe('iD.validations.generic_name', function () {
+describe('iD.validations.suspicious_name', function () {
     var context;
 
     beforeEach(function() {
@@ -20,7 +20,7 @@ describe('iD.validations.generic_name', function () {
     }
 
     function validate() {
-        var validator = iD.validationGenericName(context);
+        var validator = iD.validationSuspiciousName(context);
         var changes = context.history().changes();
         var entities = changes.modified.concat(changes.created);
         var issues = [];
@@ -64,7 +64,8 @@ describe('iD.validations.generic_name', function () {
         var issues = validate();
         expect(issues).to.have.lengthOf(1);
         var issue = issues[0];
-        expect(issue.type).to.eql('generic_name');
+        expect(issue.type).to.eql('suspicious_name');
+        expect(issue.subtype).to.eql('generic_name');
         expect(issue.entityIds).to.have.lengthOf(1);
         expect(issue.entityIds[0]).to.eql('w-1');
     });
@@ -74,7 +75,8 @@ describe('iD.validations.generic_name', function () {
         var issues = validate();
         expect(issues).to.have.lengthOf(1);
         var issue = issues[0];
-        expect(issue.type).to.eql('generic_name');
+        expect(issue.type).to.eql('suspicious_name');
+        expect(issue.subtype).to.eql('generic_name');
         expect(issue.entityIds).to.have.lengthOf(1);
         expect(issue.entityIds[0]).to.eql('w-1');
     });
@@ -84,7 +86,36 @@ describe('iD.validations.generic_name', function () {
         var issues = validate();
         expect(issues).to.have.lengthOf(1);
         var issue = issues[0];
-        expect(issue.type).to.eql('generic_name');
+        expect(issue.type).to.eql('suspicious_name');
+        expect(issue.subtype).to.eql('generic_name');
+        expect(issue.entityIds).to.have.lengthOf(1);
+        expect(issue.entityIds[0]).to.eql('w-1');
+    });
+
+    it('ignores feature with a non-matching `not:name` tag', function() {
+        createWay({ shop: 'supermarket', name: 'Lou\'s', 'not:name': 'Lous' });
+        var issues = validate();
+        expect(issues).to.have.lengthOf(0);
+    });
+
+    it('flags feature with a matching `not:name` tag', function() {
+        createWay({ shop: 'supermarket', name: 'Lous', 'not:name': 'Lous' });
+        var issues = validate();
+        expect(issues).to.have.lengthOf(1);
+        var issue = issues[0];
+        expect(issue.type).to.eql('suspicious_name');
+        expect(issue.subtype).to.eql('not_name');
+        expect(issue.entityIds).to.have.lengthOf(1);
+        expect(issue.entityIds[0]).to.eql('w-1');
+    });
+
+    it('flags feature with a matching a semicolon-separated `not:name` tag', function() {
+        createWay({ shop: 'supermarket', name: 'Lous', 'not:name': 'Louis\';Lous;Louis\'s' });
+        var issues = validate();
+        expect(issues).to.have.lengthOf(1);
+        var issue = issues[0];
+        expect(issue.type).to.eql('suspicious_name');
+        expect(issue.subtype).to.eql('not_name');
         expect(issue.entityIds).to.have.lengthOf(1);
         expect(issue.entityIds[0]).to.eql('w-1');
     });