Merge branch 'master' into validation

data/presets.yaml

@@ -2469,6 +2469,11 @@ en:
         name: Kebab Fast Food
         # 'terms: bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table'
         terms: '<translate with synonyms or related terms for ''Kebab Fast Food'', separated by commas>'
+      amenity/fast_food/mexican:
+        # 'amenity=fast_food, cuisine=mexican'
+        name: Mexican Fast Food
+        # 'terms: breakfast,dine,dining,dinner,drive-in,eat,grill,lunch,table,tacos,burritos,enchiladas,fajitas,nachos,tortillas,salsa,tamales,quesadillas'
+        terms: '<translate with synonyms or related terms for ''Mexican Fast Food'', separated by commas>'
       amenity/fast_food/pizza:
         # 'amenity=fast_food, cuisine=pizza'
         name: Pizza Fast Food
@@ -4645,6 +4650,11 @@ en:
         name: Picnic Table
         # 'terms: bench'
         terms: '<translate with synonyms or related terms for ''Picnic Table'', separated by commas>'
+      leisure/picnic_table/chess:
+        # 'leisure=picnic_table, sport=chess'
+        name: Chess Table
+        # 'terms: bench,chess board,checkerboard,checkers,chequerboard,game table'
+        terms: '<translate with synonyms or related terms for ''Chess Table'', separated by commas>'
       leisure/pitch:
         # leisure=pitch
         name: Sport Pitch

data/presets/presets.json

@@ -91,6 +91,7 @@
     "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/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/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": "maki-restaurant", "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": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "fire_station"}, "name": "Fire Station"},
@@ -150,7 +151,7 @@
     "amenity/restaurant/indian": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "curry"], "tags": {"amenity": "restaurant", "cuisine": "indian"}, "reference": {"key": "cuisine", "value": "indian"}, "name": "Indian Restaurant"},
     "amenity/restaurant/italian": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "pasta", "pizza"], "tags": {"amenity": "restaurant", "cuisine": "italian"}, "reference": {"key": "cuisine", "value": "italian"}, "name": "Italian Restaurant"},
     "amenity/restaurant/japanese": {"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": "japanese"}, "reference": {"key": "cuisine", "value": "japanese"}, "name": "Japanese Restaurant"},
-    "amenity/restaurant/mexican": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "tacos", "burritos", "enchiladas", "fajitas", "nachos", "tortillas", "salsa", "tamales", "quesadillas"], "tags": {"amenity": "restaurant", "cuisine": "mexican"}, "reference": {"key": "cuisine", "value": "mexican"}, "name": "Mexican Restaurant"},
+    "amenity/restaurant/mexican": {"icon": "fas-pepper-hot", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "tacos", "burritos", "enchiladas", "fajitas", "nachos", "tortillas", "salsa", "tamales", "quesadillas"], "tags": {"amenity": "restaurant", "cuisine": "mexican"}, "reference": {"key": "cuisine", "value": "mexican"}, "name": "Mexican Restaurant"},
     "amenity/restaurant/noodle": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "ramen noodles", "soup", "soba noodles", "cellophane noodles", "rice noodles"], "tags": {"amenity": "restaurant", "cuisine": "noodle"}, "reference": {"key": "cuisine", "value": "noodle"}, "name": "Noodle Restaurant"},
     "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"},
@@ -561,6 +562,7 @@
     "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/picnic_table/chess": {"icon": "fas-chess-knight", "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", "surface", "lit"], "moreFields": ["access_simple", "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"},
     "leisure/pitch/australian_football": {"icon": "maki-american-football", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "australian_football"}, "reference": {"key": "sport", "value": "australian_football"}, "terms": ["Aussie", "AFL", "football"], "name": "Australian Football Field"},
@@ -855,7 +857,7 @@
     "shop/bookmaker": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["betting"], "tags": {"shop": "bookmaker"}, "name": "Bookmaker"},
     "shop/books": {"icon": "maki-shop", "fields": ["{shop}", "internet_access"], "moreFields": ["{shop}", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"shop": "books"}, "name": "Book Store"},
     "shop/boutique": {"icon": "maki-shop", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "boutique"}, "name": "Boutique"},
-    "shop/butcher": {"icon": "maki-slaughterhouse", "geometry": ["point", "area"], "terms": ["meat"], "tags": {"shop": "butcher"}, "name": "Butcher"},
+    "shop/butcher": {"icon": "fas-bacon", "geometry": ["point", "area"], "terms": ["meat"], "tags": {"shop": "butcher"}, "name": "Butcher"},
     "shop/candles": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "candles"}, "name": "Candle Shop"},
     "shop/car_parts": {"icon": "maki-car", "geometry": ["point", "area"], "terms": ["auto"], "tags": {"shop": "car_parts"}, "name": "Car Parts Store"},
     "shop/car_repair": {"icon": "maki-car-repair", "fields": ["{shop}", "service/vehicle"], "geometry": ["point", "area"], "terms": ["auto", "garage", "service"], "tags": {"shop": "car_repair"}, "name": "Car Repair Shop"},
@@ -864,7 +866,7 @@
     "shop/carpet": {"icon": "maki-shop", "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": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "cheese"}, "name": "Cheese Store"},
+    "shop/cheese": {"icon": "fas-cheese", "geometry": ["point", "area"], "tags": {"shop": "cheese"}, "name": "Cheese Store"},
     "shop/chemist": {"icon": "maki-grocery", "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"}, "name": "Chocolate Store"},
     "shop/clothes": {"icon": "maki-clothing-store", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "clothes"}, "name": "Clothing Store"},
@@ -872,12 +874,12 @@
     "shop/computer": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "computer"}, "name": "Computer Store"},
     "shop/confectionery": {"icon": "maki-confectionery", "geometry": ["point", "area"], "terms": ["sweet"], "tags": {"shop": "confectionery"}, "name": "Candy Store"},
     "shop/convenience": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "convenience"}, "name": "Convenience Store"},
-    "shop/copyshop": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "copyshop"}, "name": "Copy Store"},
+    "shop/copyshop": {"icon": "fas-print", "geometry": ["point", "area"], "tags": {"shop": "copyshop"}, "name": "Copy Store"},
     "shop/cosmetics": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "cosmetics"}, "name": "Cosmetics Store"},
     "shop/country_store": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "country_store"}, "name": "Country Store"},
     "shop/craft": {"icon": "maki-shop", "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": "maki-shop", "geometry": ["point", "area"], "terms": ["milk", "egg", "cheese"], "tags": {"shop": "dairy"}, "name": "Dairy Store"},
+    "shop/dairy": {"icon": "fas-cheese", "geometry": ["point", "area"], "terms": ["milk", "egg", "cheese"], "tags": {"shop": "dairy"}, "name": "Dairy Store"},
     "shop/deli": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["lunch", "meat", "sandwich"], "tags": {"shop": "deli"}, "name": "Deli"},
     "shop/department_store": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "department_store"}, "name": "Department Store"},
     "shop/doityourself": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"shop": "doityourself"}, "name": "DIY Store"},
@@ -1641,7 +1643,7 @@
     "amenity/fast_food/burger/Checkers": {"name": "Checkers", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "burger", "brand:wikidata": "Q3419341"}, "addTags": {"amenity": "fast_food", "brand": "Checkers", "brand:wikidata": "Q3419341", "brand:wikipedia": "en:Checkers and Rally's", "cuisine": "burger", "name": "Checkers"}, "removeTags": {"amenity": "fast_food", "brand": "Checkers", "brand:wikidata": "Q3419341", "brand:wikipedia": "en:Checkers and Rally's", "cuisine": "burger", "name": "Checkers"}, "reference": {"key": "cuisine", "value": "burger"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/chicken/Chick-fil-A": {"name": "Chick-fil-A", "icon": "fas-drumstick-bite", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "chicken", "brand:wikidata": "Q491516"}, "addTags": {"amenity": "fast_food", "brand": "Chick-fil-A", "brand:wikidata": "Q491516", "brand:wikipedia": "en:Chick-fil-A", "cuisine": "chicken", "name": "Chick-fil-A"}, "removeTags": {"amenity": "fast_food", "brand": "Chick-fil-A", "brand:wikidata": "Q491516", "brand:wikipedia": "en:Chick-fil-A", "cuisine": "chicken", "name": "Chick-fil-A"}, "reference": {"key": "cuisine", "value": "chicken"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/chicken/Chicken Express": {"name": "Chicken Express", "icon": "fas-drumstick-bite", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "chicken", "brand:wikidata": "Q5096235"}, "addTags": {"amenity": "fast_food", "brand": "Chicken Express", "brand:wikidata": "Q5096235", "brand:wikipedia": "en:Chicken Express", "cuisine": "chicken", "name": "Chicken Express"}, "removeTags": {"amenity": "fast_food", "brand": "Chicken Express", "brand:wikidata": "Q5096235", "brand:wikipedia": "en:Chicken Express", "cuisine": "chicken", "name": "Chicken Express"}, "reference": {"key": "cuisine", "value": "chicken"}, "matchScore": 2, "suggestion": true},
-    "amenity/fast_food/Chipotle": {"name": "Chipotle", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q465751"}, "addTags": {"amenity": "fast_food", "brand": "Chipotle", "brand:wikidata": "Q465751", "brand:wikipedia": "en:Chipotle Mexican Grill", "cuisine": "mexican", "name": "Chipotle"}, "removeTags": {"amenity": "fast_food", "brand": "Chipotle", "brand:wikidata": "Q465751", "brand:wikipedia": "en:Chipotle Mexican Grill", "cuisine": "mexican", "name": "Chipotle"}, "matchScore": 2, "suggestion": true},
+    "amenity/fast_food/mexican/Chipotle": {"name": "Chipotle", "icon": "fas-pepper-hot", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "mexican", "brand:wikidata": "Q465751"}, "addTags": {"amenity": "fast_food", "brand": "Chipotle", "brand:wikidata": "Q465751", "brand:wikipedia": "en:Chipotle Mexican Grill", "cuisine": "mexican", "name": "Chipotle"}, "removeTags": {"amenity": "fast_food", "brand": "Chipotle", "brand:wikidata": "Q465751", "brand:wikipedia": "en:Chipotle Mexican Grill", "cuisine": "mexican", "name": "Chipotle"}, "reference": {"key": "cuisine", "value": "mexican"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/Chowking": {"name": "Chowking", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q1076816"}, "addTags": {"amenity": "fast_food", "brand": "Chowking", "brand:wikidata": "Q1076816", "brand:wikipedia": "en:Chowking", "cuisine": "asian", "name": "Chowking"}, "removeTags": {"amenity": "fast_food", "brand": "Chowking", "brand:wikidata": "Q1076816", "brand:wikipedia": "en:Chowking", "cuisine": "asian", "name": "Chowking"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/chicken/Church's Chicken": {"name": "Church's Chicken", "icon": "fas-drumstick-bite", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "chicken", "brand:wikidata": "Q1089932"}, "addTags": {"amenity": "fast_food", "brand": "Church's Chicken", "brand:wikidata": "Q1089932", "brand:wikipedia": "en:Church's Chicken", "cuisine": "chicken", "name": "Church's Chicken"}, "removeTags": {"amenity": "fast_food", "brand": "Church's Chicken", "brand:wikidata": "Q1089932", "brand:wikipedia": "en:Church's Chicken", "cuisine": "chicken", "name": "Church's Chicken"}, "reference": {"key": "cuisine", "value": "chicken"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/CoCo壱番屋": {"name": "CoCo壱番屋", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q5986105"}, "addTags": {"amenity": "fast_food", "brand": "CoCo壱番屋", "brand:en": "Ichibanya", "brand:wikidata": "Q5986105", "brand:wikipedia": "en:Ichibanya", "cuisine": "japanese", "name": "CoCo壱番屋", "name:en": "Ichibanya"}, "removeTags": {"amenity": "fast_food", "brand": "CoCo壱番屋", "brand:en": "Ichibanya", "brand:wikidata": "Q5986105", "brand:wikipedia": "en:Ichibanya", "cuisine": "japanese", "name": "CoCo壱番屋", "name:en": "Ichibanya"}, "matchScore": 2, "suggestion": true},
@@ -1649,17 +1651,17 @@
     "amenity/fast_food/Culver's": {"name": "Culver's", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q1143589"}, "addTags": {"amenity": "fast_food", "brand": "Culver's", "brand:wikidata": "Q1143589", "brand:wikipedia": "en:Culver's", "name": "Culver's"}, "removeTags": {"amenity": "fast_food", "brand": "Culver's", "brand:wikidata": "Q1143589", "brand:wikipedia": "en:Culver's", "name": "Culver's"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/Dairy Queen": {"name": "Dairy Queen", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q1141226"}, "addTags": {"amenity": "fast_food", "brand": "Dairy Queen", "brand:wikidata": "Q1141226", "brand:wikipedia": "en:Dairy Queen", "cuisine": "ice_cream", "name": "Dairy Queen"}, "removeTags": {"amenity": "fast_food", "brand": "Dairy Queen", "brand:wikidata": "Q1141226", "brand:wikipedia": "en:Dairy Queen", "cuisine": "ice_cream", "name": "Dairy Queen"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/Daylight Donuts": {"name": "Daylight Donuts", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q48970508"}, "addTags": {"amenity": "fast_food", "brand": "Daylight Donuts", "brand:wikidata": "Q48970508", "brand:wikipedia": "en:Daylight Donuts", "cuisine": "donut", "name": "Daylight Donuts"}, "removeTags": {"amenity": "fast_food", "brand": "Daylight Donuts", "brand:wikidata": "Q48970508", "brand:wikipedia": "en:Daylight Donuts", "cuisine": "donut", "name": "Daylight Donuts"}, "matchScore": 2, "suggestion": true},
-    "amenity/fast_food/Del Taco": {"name": "Del Taco", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q1183818"}, "addTags": {"amenity": "fast_food", "brand": "Del Taco", "brand:wikidata": "Q1183818", "brand:wikipedia": "en:Del Taco", "cuisine": "mexican", "name": "Del Taco"}, "removeTags": {"amenity": "fast_food", "brand": "Del Taco", "brand:wikidata": "Q1183818", "brand:wikipedia": "en:Del Taco", "cuisine": "mexican", "name": "Del Taco"}, "matchScore": 2, "suggestion": true},
+    "amenity/fast_food/mexican/Del Taco": {"name": "Del Taco", "icon": "fas-pepper-hot", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "mexican", "brand:wikidata": "Q1183818"}, "addTags": {"amenity": "fast_food", "brand": "Del Taco", "brand:wikidata": "Q1183818", "brand:wikipedia": "en:Del Taco", "cuisine": "mexican", "name": "Del Taco"}, "removeTags": {"amenity": "fast_food", "brand": "Del Taco", "brand:wikidata": "Q1183818", "brand:wikipedia": "en:Del Taco", "cuisine": "mexican", "name": "Del Taco"}, "reference": {"key": "cuisine", "value": "mexican"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/pizza/Domino's Pizza": {"name": "Domino's Pizza", "icon": "maki-restaurant-pizza", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "pizza", "brand:wikidata": "Q839466"}, "addTags": {"amenity": "fast_food", "brand": "Domino's Pizza", "brand:wikidata": "Q839466", "brand:wikipedia": "en:Domino's Pizza", "cuisine": "pizza", "name": "Domino's Pizza"}, "removeTags": {"amenity": "fast_food", "brand": "Domino's Pizza", "brand:wikidata": "Q839466", "brand:wikipedia": "en:Domino's Pizza", "cuisine": "pizza", "name": "Domino's Pizza"}, "reference": {"key": "cuisine", "value": "pizza"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/Dunkin' Donuts": {"name": "Dunkin' Donuts", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q847743"}, "addTags": {"amenity": "fast_food", "brand": "Dunkin' Donuts", "brand:wikidata": "Q847743", "brand:wikipedia": "en:Dunkin' Donuts", "cuisine": "donut", "name": "Dunkin' Donuts"}, "removeTags": {"amenity": "fast_food", "brand": "Dunkin' Donuts", "brand:wikidata": "Q847743", "brand:wikipedia": "en:Dunkin' Donuts", "cuisine": "donut", "name": "Dunkin' Donuts"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/Einstein Bros. Bagels": {"name": "Einstein Bros. Bagels", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q5349788"}, "addTags": {"amenity": "fast_food", "brand": "Einstein Bros. Bagels", "brand:wikidata": "Q5349788", "brand:wikipedia": "en:Einstein Bros. Bagels", "cuisine": "bagel", "name": "Einstein Bros. Bagels"}, "removeTags": {"amenity": "fast_food", "brand": "Einstein Bros. Bagels", "brand:wikidata": "Q5349788", "brand:wikipedia": "en:Einstein Bros. Bagels", "cuisine": "bagel", "name": "Einstein Bros. Bagels"}, "matchScore": 2, "suggestion": true},
-    "amenity/fast_food/El Pollo Loco": {"name": "El Pollo Loco", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q2353849"}, "addTags": {"amenity": "fast_food", "brand": "El Pollo Loco", "brand:wikidata": "Q2353849", "brand:wikipedia": "en:El Pollo Loco", "cuisine": "mexican", "name": "El Pollo Loco"}, "removeTags": {"amenity": "fast_food", "brand": "El Pollo Loco", "brand:wikidata": "Q2353849", "brand:wikipedia": "en:El Pollo Loco", "cuisine": "mexican", "name": "El Pollo Loco"}, "matchScore": 2, "suggestion": true},
+    "amenity/fast_food/mexican/El Pollo Loco": {"name": "El Pollo Loco", "icon": "fas-pepper-hot", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "mexican", "brand:wikidata": "Q2353849"}, "addTags": {"amenity": "fast_food", "brand": "El Pollo Loco", "brand:wikidata": "Q2353849", "brand:wikipedia": "en:El Pollo Loco", "cuisine": "mexican", "name": "El Pollo Loco"}, "removeTags": {"amenity": "fast_food", "brand": "El Pollo Loco", "brand:wikidata": "Q2353849", "brand:wikipedia": "en:El Pollo Loco", "cuisine": "mexican", "name": "El Pollo Loco"}, "reference": {"key": "cuisine", "value": "mexican"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/Extreme Pita": {"name": "Extreme Pita", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q5422367"}, "addTags": {"amenity": "fast_food", "brand": "Extreme Pita", "brand:wikidata": "Q5422367", "brand:wikipedia": "en:Extreme Pita", "cuisine": "pita", "name": "Extreme Pita"}, "removeTags": {"amenity": "fast_food", "brand": "Extreme Pita", "brand:wikidata": "Q5422367", "brand:wikipedia": "en:Extreme Pita", "cuisine": "pita", "name": "Extreme Pita"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/Fazoli's": {"name": "Fazoli's", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q1399195"}, "addTags": {"amenity": "fast_food", "brand": "Fazoli's", "brand:wikidata": "Q1399195", "brand:wikipedia": "en:Fazoli's", "cuisine": "italian", "name": "Fazoli's"}, "removeTags": {"amenity": "fast_food", "brand": "Fazoli's", "brand:wikidata": "Q1399195", "brand:wikipedia": "en:Fazoli's", "cuisine": "italian", "name": "Fazoli's"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/sandwich/Firehouse Subs": {"name": "Firehouse Subs", "icon": "maki-restaurant", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "sandwich", "brand:wikidata": "Q5451873"}, "addTags": {"amenity": "fast_food", "brand": "Firehouse Subs", "brand:wikidata": "Q5451873", "brand:wikipedia": "en:Firehouse Subs", "cuisine": "sandwich", "name": "Firehouse Subs"}, "removeTags": {"amenity": "fast_food", "brand": "Firehouse Subs", "brand:wikidata": "Q5451873", "brand:wikipedia": "en:Firehouse Subs", "cuisine": "sandwich", "name": "Firehouse Subs"}, "reference": {"key": "cuisine", "value": "sandwich"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/burger/Five Guys": {"name": "Five Guys", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "burger", "brand:wikidata": "Q1131810"}, "addTags": {"amenity": "fast_food", "brand": "Five Guys", "brand:wikidata": "Q1131810", "brand:wikipedia": "en:Five Guys", "cuisine": "burger", "name": "Five Guys"}, "removeTags": {"amenity": "fast_food", "brand": "Five Guys", "brand:wikidata": "Q1131810", "brand:wikipedia": "en:Five Guys", "cuisine": "burger", "name": "Five Guys"}, "reference": {"key": "cuisine", "value": "burger"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/burger/Freddy's": {"name": "Freddy's", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "burger", "brand:wikidata": "Q5496837"}, "addTags": {"amenity": "fast_food", "brand": "Freddy's", "brand:wikidata": "Q5496837", "brand:wikipedia": "en:Freddy's Frozen Custard & Steakburgers", "cuisine": "burger", "name": "Freddy's"}, "removeTags": {"amenity": "fast_food", "brand": "Freddy's", "brand:wikidata": "Q5496837", "brand:wikipedia": "en:Freddy's Frozen Custard & Steakburgers", "cuisine": "burger", "name": "Freddy's"}, "reference": {"key": "cuisine", "value": "burger"}, "matchScore": 2, "suggestion": true},
-    "amenity/fast_food/Freebirds": {"name": "Freebirds", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q5500367"}, "addTags": {"amenity": "fast_food", "brand": "Freebirds", "brand:wikidata": "Q5500367", "brand:wikipedia": "en:Freebirds World Burrito", "cuisine": "mexican", "name": "Freebirds"}, "removeTags": {"amenity": "fast_food", "brand": "Freebirds", "brand:wikidata": "Q5500367", "brand:wikipedia": "en:Freebirds World Burrito", "cuisine": "mexican", "name": "Freebirds"}, "matchScore": 2, "suggestion": true},
+    "amenity/fast_food/mexican/Freebirds": {"name": "Freebirds", "icon": "fas-pepper-hot", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "mexican", "brand:wikidata": "Q5500367"}, "addTags": {"amenity": "fast_food", "brand": "Freebirds", "brand:wikidata": "Q5500367", "brand:wikipedia": "en:Freebirds World Burrito", "cuisine": "mexican", "name": "Freebirds"}, "removeTags": {"amenity": "fast_food", "brand": "Freebirds", "brand:wikidata": "Q5500367", "brand:wikipedia": "en:Freebirds World Burrito", "cuisine": "mexican", "name": "Freebirds"}, "reference": {"key": "cuisine", "value": "mexican"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/pizza/Greenwich": {"name": "Greenwich", "icon": "maki-restaurant-pizza", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "pizza", "brand:wikidata": "Q2691308"}, "addTags": {"amenity": "fast_food", "brand": "Greenwich", "brand:wikidata": "Q2691308", "brand:wikipedia": "en:Greenwich Pizza", "cuisine": "pizza", "name": "Greenwich"}, "removeTags": {"amenity": "fast_food", "brand": "Greenwich", "brand:wikidata": "Q2691308", "brand:wikipedia": "en:Greenwich Pizza", "cuisine": "pizza", "name": "Greenwich"}, "reference": {"key": "cuisine", "value": "pizza"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/Habib's": {"name": "Habib's", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q2504930"}, "addTags": {"amenity": "fast_food", "brand": "Habib's", "brand:wikidata": "Q2504930", "brand:wikipedia": "en:Habib's", "cuisine": "middle_eastern", "name": "Habib's"}, "removeTags": {"amenity": "fast_food", "brand": "Habib's", "brand:wikidata": "Q2504930", "brand:wikipedia": "en:Habib's", "cuisine": "middle_eastern", "name": "Habib's"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/pizza/Hallo Pizza": {"name": "Hallo Pizza", "icon": "maki-restaurant-pizza", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "pizza", "brand:wikidata": "Q1571798"}, "addTags": {"amenity": "fast_food", "brand": "Hallo Pizza", "brand:wikidata": "Q1571798", "brand:wikipedia": "de:Hallo Pizza", "cuisine": "pizza", "name": "Hallo Pizza"}, "removeTags": {"amenity": "fast_food", "brand": "Hallo Pizza", "brand:wikidata": "Q1571798", "brand:wikipedia": "de:Hallo Pizza", "cuisine": "pizza", "name": "Hallo Pizza"}, "reference": {"key": "cuisine", "value": "pizza"}, "matchScore": 2, "suggestion": true},
@@ -1684,11 +1686,11 @@
     "amenity/fast_food/Mang Inasal": {"name": "Mang Inasal", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q6748573"}, "addTags": {"amenity": "fast_food", "brand": "Mang Inasal", "brand:wikidata": "Q6748573", "brand:wikipedia": "en:Mang Inasal", "cuisine": "barbecue", "name": "Mang Inasal"}, "removeTags": {"amenity": "fast_food", "brand": "Mang Inasal", "brand:wikidata": "Q6748573", "brand:wikipedia": "en:Mang Inasal", "cuisine": "barbecue", "name": "Mang Inasal"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/burger/Max": {"name": "Max", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "burger", "brand:wikidata": "Q1912172"}, "addTags": {"amenity": "fast_food", "brand": "Max", "brand:wikidata": "Q1912172", "brand:wikipedia": "en:Max Hamburgers", "cuisine": "burger", "name": "Max"}, "removeTags": {"amenity": "fast_food", "brand": "Max", "brand:wikidata": "Q1912172", "brand:wikipedia": "en:Max Hamburgers", "cuisine": "burger", "name": "Max"}, "reference": {"key": "cuisine", "value": "burger"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/burger/McDonald's": {"name": "McDonald's", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "burger", "brand:wikidata": "Q38076"}, "addTags": {"amenity": "fast_food", "brand": "McDonald's", "brand:wikidata": "Q38076", "brand:wikipedia": "en:McDonald's", "cuisine": "burger", "name": "McDonald's"}, "removeTags": {"amenity": "fast_food", "brand": "McDonald's", "brand:wikidata": "Q38076", "brand:wikipedia": "en:McDonald's", "cuisine": "burger", "name": "McDonald's"}, "reference": {"key": "cuisine", "value": "burger"}, "matchScore": 2, "suggestion": true},
-    "amenity/fast_food/Moe's Southwest Grill": {"name": "Moe's Southwest Grill", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q6889938"}, "addTags": {"amenity": "fast_food", "brand": "Moe's Southwest Grill", "brand:wikidata": "Q6889938", "brand:wikipedia": "en:Moe's Southwest Grill", "cuisine": "mexican", "name": "Moe's Southwest Grill"}, "removeTags": {"amenity": "fast_food", "brand": "Moe's Southwest Grill", "brand:wikidata": "Q6889938", "brand:wikipedia": "en:Moe's Southwest Grill", "cuisine": "mexican", "name": "Moe's Southwest Grill"}, "matchScore": 2, "suggestion": true},
+    "amenity/fast_food/mexican/Moe's Southwest Grill": {"name": "Moe's Southwest Grill", "icon": "fas-pepper-hot", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "mexican", "brand:wikidata": "Q6889938"}, "addTags": {"amenity": "fast_food", "brand": "Moe's Southwest Grill", "brand:wikidata": "Q6889938", "brand:wikipedia": "en:Moe's Southwest Grill", "cuisine": "mexican", "name": "Moe's Southwest Grill"}, "removeTags": {"amenity": "fast_food", "brand": "Moe's Southwest Grill", "brand:wikidata": "Q6889938", "brand:wikipedia": "en:Moe's Southwest Grill", "cuisine": "mexican", "name": "Moe's Southwest Grill"}, "reference": {"key": "cuisine", "value": "mexican"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/sandwich/Mr. Sub": {"name": "Mr. Sub", "icon": "maki-restaurant", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "sandwich", "brand:wikidata": "Q6929225"}, "addTags": {"amenity": "fast_food", "brand": "Mr. Sub", "brand:wikidata": "Q6929225", "brand:wikipedia": "en:Mr. Sub", "cuisine": "sandwich", "name": "Mr. Sub"}, "removeTags": {"amenity": "fast_food", "brand": "Mr. Sub", "brand:wikidata": "Q6929225", "brand:wikipedia": "en:Mr. Sub", "cuisine": "sandwich", "name": "Mr. Sub"}, "reference": {"key": "cuisine", "value": "sandwich"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/pizza/New York Pizza": {"name": "New York Pizza", "icon": "maki-restaurant-pizza", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "pizza", "brand:wikidata": "Q2639128"}, "addTags": {"amenity": "fast_food", "brand": "New York Pizza", "brand:wikidata": "Q2639128", "brand:wikipedia": "nl:New York Pizza", "cuisine": "pizza", "name": "New York Pizza"}, "removeTags": {"amenity": "fast_food", "brand": "New York Pizza", "brand:wikidata": "Q2639128", "brand:wikipedia": "nl:New York Pizza", "cuisine": "pizza", "name": "New York Pizza"}, "reference": {"key": "cuisine", "value": "pizza"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/Nordsee": {"name": "Nordsee", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q74866"}, "addTags": {"amenity": "fast_food", "brand": "Nordsee", "brand:wikidata": "Q74866", "brand:wikipedia": "en:Nordsee", "cuisine": "seafood", "name": "Nordsee"}, "removeTags": {"amenity": "fast_food", "brand": "Nordsee", "brand:wikidata": "Q74866", "brand:wikipedia": "en:Nordsee", "cuisine": "seafood", "name": "Nordsee"}, "matchScore": 2, "suggestion": true},
-    "amenity/fast_food/O'Tacos": {"name": "O'Tacos", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q28494040"}, "addTags": {"amenity": "fast_food", "brand": "O'Tacos", "brand:wikidata": "Q28494040", "brand:wikipedia": "en:O'Tacos", "cuisine": "mexican", "name": "O'Tacos"}, "removeTags": {"amenity": "fast_food", "brand": "O'Tacos", "brand:wikidata": "Q28494040", "brand:wikipedia": "en:O'Tacos", "cuisine": "mexican", "name": "O'Tacos"}, "matchScore": 2, "suggestion": true},
+    "amenity/fast_food/mexican/O'Tacos": {"name": "O'Tacos", "icon": "fas-pepper-hot", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "mexican", "brand:wikidata": "Q28494040"}, "addTags": {"amenity": "fast_food", "brand": "O'Tacos", "brand:wikidata": "Q28494040", "brand:wikipedia": "en:O'Tacos", "cuisine": "mexican", "name": "O'Tacos"}, "removeTags": {"amenity": "fast_food", "brand": "O'Tacos", "brand:wikidata": "Q28494040", "brand:wikipedia": "en:O'Tacos", "cuisine": "mexican", "name": "O'Tacos"}, "reference": {"key": "cuisine", "value": "mexican"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/burger/Pal's": {"name": "Pal's", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "burger", "brand:wikidata": "Q7126094"}, "addTags": {"amenity": "fast_food", "brand": "Pal's", "brand:wikidata": "Q7126094", "brand:wikipedia": "en:Pal's", "cuisine": "burger", "name": "Pal's"}, "removeTags": {"amenity": "fast_food", "brand": "Pal's", "brand:wikidata": "Q7126094", "brand:wikipedia": "en:Pal's", "cuisine": "burger", "name": "Pal's"}, "reference": {"key": "cuisine", "value": "burger"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/pizza/Panago": {"name": "Panago", "icon": "maki-restaurant-pizza", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "pizza", "brand:wikidata": "Q17111672"}, "addTags": {"amenity": "fast_food", "brand": "Panago", "brand:wikidata": "Q17111672", "brand:wikipedia": "en:Panago", "cuisine": "pizza", "name": "Panago"}, "removeTags": {"amenity": "fast_food", "brand": "Panago", "brand:wikidata": "Q17111672", "brand:wikipedia": "en:Panago", "cuisine": "pizza", "name": "Panago"}, "reference": {"key": "cuisine", "value": "pizza"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/Panda Express": {"name": "Panda Express", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q1358690"}, "addTags": {"amenity": "fast_food", "brand": "Panda Express", "brand:wikidata": "Q1358690", "brand:wikipedia": "en:Panda Express", "cuisine": "chinese", "name": "Panda Express"}, "removeTags": {"amenity": "fast_food", "brand": "Panda Express", "brand:wikidata": "Q1358690", "brand:wikipedia": "en:Panda Express", "cuisine": "chinese", "name": "Panda Express"}, "matchScore": 2, "suggestion": true},
@@ -1704,7 +1706,7 @@
     "amenity/fast_food/chicken/Pollo Campero": {"name": "Pollo Campero", "icon": "fas-drumstick-bite", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "chicken", "brand:wikidata": "Q942741"}, "addTags": {"amenity": "fast_food", "brand": "Pollo Campero", "brand:wikidata": "Q942741", "brand:wikipedia": "en:Pollo Campero", "cuisine": "chicken", "name": "Pollo Campero"}, "removeTags": {"amenity": "fast_food", "brand": "Pollo Campero", "brand:wikidata": "Q942741", "brand:wikipedia": "en:Pollo Campero", "cuisine": "chicken", "name": "Pollo Campero"}, "reference": {"key": "cuisine", "value": "chicken"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/chicken/Popeye's": {"name": "Popeye's", "icon": "fas-drumstick-bite", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "chicken", "brand:wikidata": "Q1330910"}, "addTags": {"amenity": "fast_food", "brand": "Popeye's", "brand:wikidata": "Q1330910", "brand:wikipedia": "en:Popeyes", "cuisine": "chicken", "name": "Popeye's"}, "removeTags": {"amenity": "fast_food", "brand": "Popeye's", "brand:wikidata": "Q1330910", "brand:wikipedia": "en:Popeyes", "cuisine": "chicken", "name": "Popeye's"}, "reference": {"key": "cuisine", "value": "chicken"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/sandwich/Potbelly": {"name": "Potbelly", "icon": "maki-restaurant", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "sandwich", "brand:wikidata": "Q7234777"}, "addTags": {"amenity": "fast_food", "brand": "Potbelly", "brand:wikidata": "Q7234777", "brand:wikipedia": "en:Potbelly Sandwich Works", "cuisine": "sandwich", "name": "Potbelly"}, "removeTags": {"amenity": "fast_food", "brand": "Potbelly", "brand:wikidata": "Q7234777", "brand:wikipedia": "en:Potbelly Sandwich Works", "cuisine": "sandwich", "name": "Potbelly"}, "reference": {"key": "cuisine", "value": "sandwich"}, "matchScore": 2, "suggestion": true},
-    "amenity/fast_food/Qdoba": {"name": "Qdoba", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q1363885"}, "addTags": {"amenity": "fast_food", "brand": "Qdoba", "brand:wikidata": "Q1363885", "brand:wikipedia": "en:Qdoba", "cuisine": "mexican", "name": "Qdoba"}, "removeTags": {"amenity": "fast_food", "brand": "Qdoba", "brand:wikidata": "Q1363885", "brand:wikipedia": "en:Qdoba", "cuisine": "mexican", "name": "Qdoba"}, "matchScore": 2, "suggestion": true},
+    "amenity/fast_food/mexican/Qdoba": {"name": "Qdoba", "icon": "fas-pepper-hot", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "mexican", "brand:wikidata": "Q1363885"}, "addTags": {"amenity": "fast_food", "brand": "Qdoba", "brand:wikidata": "Q1363885", "brand:wikipedia": "en:Qdoba", "cuisine": "mexican", "name": "Qdoba"}, "removeTags": {"amenity": "fast_food", "brand": "Qdoba", "brand:wikidata": "Q1363885", "brand:wikipedia": "en:Qdoba", "cuisine": "mexican", "name": "Qdoba"}, "reference": {"key": "cuisine", "value": "mexican"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/burger/Quick": {"name": "Quick", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "burger", "brand:wikidata": "Q286494"}, "addTags": {"amenity": "fast_food", "brand": "Quick", "brand:wikidata": "Q286494", "brand:wikipedia": "en:Quick (restaurant)", "cuisine": "burger", "name": "Quick"}, "removeTags": {"amenity": "fast_food", "brand": "Quick", "brand:wikidata": "Q286494", "brand:wikipedia": "en:Quick (restaurant)", "cuisine": "burger", "name": "Quick"}, "reference": {"key": "cuisine", "value": "burger"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/sandwich/Quiznos": {"name": "Quiznos", "icon": "maki-restaurant", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "sandwich", "brand:wikidata": "Q1936229"}, "addTags": {"amenity": "fast_food", "brand": "Quiznos", "brand:wikidata": "Q1936229", "brand:wikipedia": "en:Quiznos", "cuisine": "sandwich", "name": "Quiznos"}, "removeTags": {"amenity": "fast_food", "brand": "Quiznos", "brand:wikidata": "Q1936229", "brand:wikipedia": "en:Quiznos", "cuisine": "sandwich", "name": "Quiznos"}, "reference": {"key": "cuisine", "value": "sandwich"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/chicken/Raising Cane's": {"name": "Raising Cane's", "icon": "fas-drumstick-bite", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "chicken", "brand:wikidata": "Q7285144"}, "addTags": {"amenity": "fast_food", "brand": "Raising Cane's", "brand:wikidata": "Q7285144", "brand:wikipedia": "en:Raising Cane's Chicken Fingers", "cuisine": "chicken", "name": "Raising Cane's"}, "removeTags": {"amenity": "fast_food", "brand": "Raising Cane's", "brand:wikidata": "Q7285144", "brand:wikipedia": "en:Raising Cane's Chicken Fingers", "cuisine": "chicken", "name": "Raising Cane's"}, "reference": {"key": "cuisine", "value": "chicken"}, "matchScore": 2, "suggestion": true},
@@ -1721,11 +1723,11 @@
     "amenity/fast_food/sandwich/Subway": {"name": "Subway", "icon": "maki-restaurant", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "sandwich", "brand:wikidata": "Q244457"}, "addTags": {"amenity": "fast_food", "brand": "Subway", "brand:wikidata": "Q244457", "brand:wikipedia": "en:Subway (restaurant)", "cuisine": "sandwich", "name": "Subway"}, "removeTags": {"amenity": "fast_food", "brand": "Subway", "brand:wikidata": "Q244457", "brand:wikipedia": "en:Subway (restaurant)", "cuisine": "sandwich", "name": "Subway"}, "reference": {"key": "cuisine", "value": "sandwich"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/burger/Supermac's": {"name": "Supermac's", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "burger", "brand:wikidata": "Q7643750"}, "addTags": {"amenity": "fast_food", "brand": "Supermac's", "brand:wikidata": "Q7643750", "brand:wikipedia": "en:Supermac's", "cuisine": "burger", "name": "Supermac's"}, "removeTags": {"amenity": "fast_food", "brand": "Supermac's", "brand:wikidata": "Q7643750", "brand:wikipedia": "en:Supermac's", "cuisine": "burger", "name": "Supermac's"}, "reference": {"key": "cuisine", "value": "burger"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/Taco Bell": {"name": "Taco Bell", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q752941"}, "addTags": {"amenity": "fast_food", "brand": "Taco Bell", "brand:wikidata": "Q752941", "brand:wikipedia": "en:Taco Bell", "cuisine": "tex-mex", "name": "Taco Bell"}, "removeTags": {"amenity": "fast_food", "brand": "Taco Bell", "brand:wikidata": "Q752941", "brand:wikipedia": "en:Taco Bell", "cuisine": "tex-mex", "name": "Taco Bell"}, "matchScore": 2, "suggestion": true},
-    "amenity/fast_food/Taco Bueno": {"name": "Taco Bueno", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q7673958"}, "addTags": {"amenity": "fast_food", "brand": "Taco Bueno", "brand:wikidata": "Q7673958", "brand:wikipedia": "en:Taco Bueno", "cuisine": "mexican", "name": "Taco Bueno"}, "removeTags": {"amenity": "fast_food", "brand": "Taco Bueno", "brand:wikidata": "Q7673958", "brand:wikipedia": "en:Taco Bueno", "cuisine": "mexican", "name": "Taco Bueno"}, "matchScore": 2, "suggestion": true},
-    "amenity/fast_food/Taco Cabana": {"name": "Taco Cabana", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q12070488"}, "addTags": {"amenity": "fast_food", "brand": "Taco Cabana", "brand:wikidata": "Q12070488", "brand:wikipedia": "en:Taco Cabana", "cuisine": "mexican", "name": "Taco Cabana"}, "removeTags": {"amenity": "fast_food", "brand": "Taco Cabana", "brand:wikidata": "Q12070488", "brand:wikipedia": "en:Taco Cabana", "cuisine": "mexican", "name": "Taco Cabana"}, "matchScore": 2, "suggestion": true},
-    "amenity/fast_food/Taco Del Mar": {"name": "Taco Del Mar", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q7673972"}, "addTags": {"amenity": "fast_food", "brand": "Taco Del Mar", "brand:wikidata": "Q7673972", "brand:wikipedia": "en:Taco del Mar", "cuisine": "mexican", "name": "Taco Del Mar"}, "removeTags": {"amenity": "fast_food", "brand": "Taco Del Mar", "brand:wikidata": "Q7673972", "brand:wikipedia": "en:Taco del Mar", "cuisine": "mexican", "name": "Taco Del Mar"}, "matchScore": 2, "suggestion": true},
-    "amenity/fast_food/Taco John's": {"name": "Taco John's", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q7673962"}, "addTags": {"amenity": "fast_food", "brand": "Taco John's", "brand:wikidata": "Q7673962", "brand:wikipedia": "en:Taco John's", "cuisine": "mexican", "name": "Taco John's"}, "removeTags": {"amenity": "fast_food", "brand": "Taco John's", "brand:wikidata": "Q7673962", "brand:wikipedia": "en:Taco John's", "cuisine": "mexican", "name": "Taco John's"}, "matchScore": 2, "suggestion": true},
-    "amenity/fast_food/Taco Time": {"name": "Taco Time", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q7673969"}, "addTags": {"amenity": "fast_food", "brand": "Taco Time", "brand:wikidata": "Q7673969", "brand:wikipedia": "en:Taco Time", "cuisine": "mexican", "name": "Taco Time"}, "removeTags": {"amenity": "fast_food", "brand": "Taco Time", "brand:wikidata": "Q7673969", "brand:wikipedia": "en:Taco Time", "cuisine": "mexican", "name": "Taco Time"}, "matchScore": 2, "suggestion": true},
+    "amenity/fast_food/mexican/Taco Bueno": {"name": "Taco Bueno", "icon": "fas-pepper-hot", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "mexican", "brand:wikidata": "Q7673958"}, "addTags": {"amenity": "fast_food", "brand": "Taco Bueno", "brand:wikidata": "Q7673958", "brand:wikipedia": "en:Taco Bueno", "cuisine": "mexican", "name": "Taco Bueno"}, "removeTags": {"amenity": "fast_food", "brand": "Taco Bueno", "brand:wikidata": "Q7673958", "brand:wikipedia": "en:Taco Bueno", "cuisine": "mexican", "name": "Taco Bueno"}, "reference": {"key": "cuisine", "value": "mexican"}, "matchScore": 2, "suggestion": true},
+    "amenity/fast_food/mexican/Taco Cabana": {"name": "Taco Cabana", "icon": "fas-pepper-hot", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "mexican", "brand:wikidata": "Q12070488"}, "addTags": {"amenity": "fast_food", "brand": "Taco Cabana", "brand:wikidata": "Q12070488", "brand:wikipedia": "en:Taco Cabana", "cuisine": "mexican", "name": "Taco Cabana"}, "removeTags": {"amenity": "fast_food", "brand": "Taco Cabana", "brand:wikidata": "Q12070488", "brand:wikipedia": "en:Taco Cabana", "cuisine": "mexican", "name": "Taco Cabana"}, "reference": {"key": "cuisine", "value": "mexican"}, "matchScore": 2, "suggestion": true},
+    "amenity/fast_food/mexican/Taco Del Mar": {"name": "Taco Del Mar", "icon": "fas-pepper-hot", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "mexican", "brand:wikidata": "Q7673972"}, "addTags": {"amenity": "fast_food", "brand": "Taco Del Mar", "brand:wikidata": "Q7673972", "brand:wikipedia": "en:Taco del Mar", "cuisine": "mexican", "name": "Taco Del Mar"}, "removeTags": {"amenity": "fast_food", "brand": "Taco Del Mar", "brand:wikidata": "Q7673972", "brand:wikipedia": "en:Taco del Mar", "cuisine": "mexican", "name": "Taco Del Mar"}, "reference": {"key": "cuisine", "value": "mexican"}, "matchScore": 2, "suggestion": true},
+    "amenity/fast_food/mexican/Taco John's": {"name": "Taco John's", "icon": "fas-pepper-hot", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "mexican", "brand:wikidata": "Q7673962"}, "addTags": {"amenity": "fast_food", "brand": "Taco John's", "brand:wikidata": "Q7673962", "brand:wikipedia": "en:Taco John's", "cuisine": "mexican", "name": "Taco John's"}, "removeTags": {"amenity": "fast_food", "brand": "Taco John's", "brand:wikidata": "Q7673962", "brand:wikipedia": "en:Taco John's", "cuisine": "mexican", "name": "Taco John's"}, "reference": {"key": "cuisine", "value": "mexican"}, "matchScore": 2, "suggestion": true},
+    "amenity/fast_food/mexican/Taco Time": {"name": "Taco Time", "icon": "fas-pepper-hot", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "mexican", "brand:wikidata": "Q7673969"}, "addTags": {"amenity": "fast_food", "brand": "Taco Time", "brand:wikidata": "Q7673969", "brand:wikipedia": "en:Taco Time", "cuisine": "mexican", "name": "Taco Time"}, "removeTags": {"amenity": "fast_food", "brand": "Taco Time", "brand:wikidata": "Q7673969", "brand:wikipedia": "en:Taco Time", "cuisine": "mexican", "name": "Taco Time"}, "reference": {"key": "cuisine", "value": "mexican"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/pizza/Telepizza": {"name": "Telepizza", "icon": "maki-restaurant-pizza", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "pizza", "brand:wikidata": "Q2699863"}, "addTags": {"amenity": "fast_food", "brand": "Telepizza", "brand:wikidata": "Q2699863", "brand:wikipedia": "en:Telepizza", "cuisine": "pizza", "name": "Telepizza"}, "removeTags": {"amenity": "fast_food", "brand": "Telepizza", "brand:wikidata": "Q2699863", "brand:wikipedia": "en:Telepizza", "cuisine": "pizza", "name": "Telepizza"}, "reference": {"key": "cuisine", "value": "pizza"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/Thai Express": {"name": "Thai Express", "icon": "maki-fast-food", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "brand:wikidata": "Q7709119"}, "addTags": {"amenity": "fast_food", "brand": "Thai Express", "brand:wikidata": "Q7709119", "brand:wikipedia": "en:Thai Express", "cuisine": "thai", "name": "Thai Express"}, "removeTags": {"amenity": "fast_food", "brand": "Thai Express", "brand:wikidata": "Q7709119", "brand:wikipedia": "en:Thai Express", "cuisine": "thai", "name": "Thai Express"}, "matchScore": 2, "suggestion": true},
     "amenity/fast_food/pizza/The Pizza Company": {"name": "The Pizza Company", "icon": "maki-restaurant-pizza", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "pizza", "brand:wikidata": "Q2413520"}, "addTags": {"amenity": "fast_food", "brand": "The Pizza Company", "brand:wikidata": "Q2413520", "brand:wikipedia": "en:The Pizza Company", "cuisine": "pizza", "name": "The Pizza Company"}, "removeTags": {"amenity": "fast_food", "brand": "The Pizza Company", "brand:wikidata": "Q2413520", "brand:wikipedia": "en:The Pizza Company", "cuisine": "pizza", "name": "The Pizza Company"}, "reference": {"key": "cuisine", "value": "pizza"}, "matchScore": 2, "suggestion": true},
@@ -2093,7 +2095,7 @@
     "amenity/restaurant/pizza/Boston Pizza": {"name": "Boston Pizza", "icon": "maki-restaurant-pizza", "geometry": ["point", "area"], "tags": {"amenity": "restaurant", "cuisine": "pizza", "brand:wikidata": "Q894578"}, "addTags": {"amenity": "restaurant", "brand": "Boston Pizza", "brand:wikidata": "Q894578", "brand:wikipedia": "en:Boston Pizza", "cuisine": "pizza", "name": "Boston Pizza"}, "removeTags": {"amenity": "restaurant", "brand": "Boston Pizza", "brand:wikidata": "Q894578", "brand:wikipedia": "en:Boston Pizza", "cuisine": "pizza", "name": "Boston Pizza"}, "reference": {"key": "cuisine", "value": "pizza"}, "matchScore": 2, "suggestion": true},
     "amenity/restaurant/Buffalo Grill": {"name": "Buffalo Grill", "icon": "maki-restaurant", "geometry": ["point", "area"], "tags": {"amenity": "restaurant", "brand:wikidata": "Q944655"}, "addTags": {"amenity": "restaurant", "brand": "Buffalo Grill", "brand:wikidata": "Q944655", "brand:wikipedia": "en:Buffalo Grill", "cuisine": "steak_house", "name": "Buffalo Grill"}, "removeTags": {"amenity": "restaurant", "brand": "Buffalo Grill", "brand:wikidata": "Q944655", "brand:wikipedia": "en:Buffalo Grill", "cuisine": "steak_house", "name": "Buffalo Grill"}, "matchScore": 2, "suggestion": true},
     "amenity/restaurant/Buffalo Wild Wings": {"name": "Buffalo Wild Wings", "icon": "maki-restaurant", "geometry": ["point", "area"], "tags": {"amenity": "restaurant", "brand:wikidata": "Q509255"}, "addTags": {"amenity": "restaurant", "brand": "Buffalo Wild Wings", "brand:wikidata": "Q509255", "brand:wikipedia": "en:Buffalo Wild Wings", "cuisine": "wings", "name": "Buffalo Wild Wings"}, "removeTags": {"amenity": "restaurant", "brand": "Buffalo Wild Wings", "brand:wikidata": "Q509255", "brand:wikipedia": "en:Buffalo Wild Wings", "cuisine": "wings", "name": "Buffalo Wild Wings"}, "matchScore": 2, "suggestion": true},
-    "amenity/restaurant/mexican/Cafe Rio": {"name": "Cafe Rio", "icon": "maki-restaurant", "geometry": ["point", "area"], "tags": {"amenity": "restaurant", "cuisine": "mexican", "brand:wikidata": "Q5017108"}, "addTags": {"amenity": "restaurant", "brand": "Cafe Rio", "brand:wikidata": "Q5017108", "brand:wikipedia": "en:Cafe Rio", "cuisine": "mexican", "name": "Cafe Rio"}, "removeTags": {"amenity": "restaurant", "brand": "Cafe Rio", "brand:wikidata": "Q5017108", "brand:wikipedia": "en:Cafe Rio", "cuisine": "mexican", "name": "Cafe Rio"}, "reference": {"key": "cuisine", "value": "mexican"}, "matchScore": 2, "suggestion": true},
+    "amenity/restaurant/mexican/Cafe Rio": {"name": "Cafe Rio", "icon": "fas-pepper-hot", "geometry": ["point", "area"], "tags": {"amenity": "restaurant", "cuisine": "mexican", "brand:wikidata": "Q5017108"}, "addTags": {"amenity": "restaurant", "brand": "Cafe Rio", "brand:wikidata": "Q5017108", "brand:wikipedia": "en:Cafe Rio", "cuisine": "mexican", "name": "Cafe Rio"}, "removeTags": {"amenity": "restaurant", "brand": "Cafe Rio", "brand:wikidata": "Q5017108", "brand:wikipedia": "en:Cafe Rio", "cuisine": "mexican", "name": "Cafe Rio"}, "reference": {"key": "cuisine", "value": "mexican"}, "matchScore": 2, "suggestion": true},
     "amenity/restaurant/pizza/California Pizza Kitchen": {"name": "California Pizza Kitchen", "icon": "maki-restaurant-pizza", "geometry": ["point", "area"], "tags": {"amenity": "restaurant", "cuisine": "pizza", "brand:wikidata": "Q15109854"}, "addTags": {"amenity": "restaurant", "brand": "California Pizza Kitchen", "brand:wikidata": "Q15109854", "brand:wikipedia": "en:California Pizza Kitchen", "cuisine": "pizza", "name": "California Pizza Kitchen"}, "removeTags": {"amenity": "restaurant", "brand": "California Pizza Kitchen", "brand:wikidata": "Q15109854", "brand:wikipedia": "en:California Pizza Kitchen", "cuisine": "pizza", "name": "California Pizza Kitchen"}, "reference": {"key": "cuisine", "value": "pizza"}, "matchScore": 2, "suggestion": true},
     "amenity/restaurant/italian/Carluccio's": {"name": "Carluccio's", "icon": "maki-restaurant", "geometry": ["point", "area"], "tags": {"amenity": "restaurant", "cuisine": "italian", "brand:wikidata": "Q25111797"}, "addTags": {"amenity": "restaurant", "brand": "Carluccio's", "brand:wikidata": "Q25111797", "brand:wikipedia": "en:Carluccio's Ltd", "cuisine": "italian", "name": "Carluccio's"}, "removeTags": {"amenity": "restaurant", "brand": "Carluccio's", "brand:wikidata": "Q25111797", "brand:wikipedia": "en:Carluccio's Ltd", "cuisine": "italian", "name": "Carluccio's"}, "reference": {"key": "cuisine", "value": "italian"}, "matchScore": 2, "suggestion": true},
     "amenity/restaurant/italian/Carrabba's Italian Grill": {"name": "Carrabba's Italian Grill", "icon": "maki-restaurant", "geometry": ["point", "area"], "tags": {"amenity": "restaurant", "cuisine": "italian", "brand:wikidata": "Q5045999"}, "addTags": {"amenity": "restaurant", "brand": "Carrabba's Italian Grill", "brand:wikidata": "Q5045999", "brand:wikipedia": "en:Carrabba's Italian Grill", "cuisine": "italian", "name": "Carrabba's Italian Grill"}, "removeTags": {"amenity": "restaurant", "brand": "Carrabba's Italian Grill", "brand:wikidata": "Q5045999", "brand:wikipedia": "en:Carrabba's Italian Grill", "cuisine": "italian", "name": "Carrabba's Italian Grill"}, "reference": {"key": "cuisine", "value": "italian"}, "matchScore": 2, "suggestion": true},
@@ -2172,7 +2174,7 @@
     "amenity/restaurant/The Cheesecake Factory": {"name": "The Cheesecake Factory", "icon": "maki-restaurant", "geometry": ["point", "area"], "tags": {"amenity": "restaurant", "brand:wikidata": "Q1045842"}, "addTags": {"amenity": "restaurant", "brand": "The Cheesecake Factory", "brand:wikidata": "Q1045842", "brand:wikipedia": "en:The Cheesecake Factory", "name": "The Cheesecake Factory"}, "removeTags": {"amenity": "restaurant", "brand": "The Cheesecake Factory", "brand:wikidata": "Q1045842", "brand:wikipedia": "en:The Cheesecake Factory", "name": "The Cheesecake Factory"}, "matchScore": 2, "suggestion": true},
     "amenity/restaurant/The Keg": {"name": "The Keg", "icon": "maki-restaurant", "geometry": ["point", "area"], "tags": {"amenity": "restaurant", "brand:wikidata": "Q7744066"}, "addTags": {"amenity": "restaurant", "brand": "The Keg", "brand:wikidata": "Q7744066", "brand:wikipedia": "en:The Keg", "cuisine": "steak_house", "name": "The Keg"}, "removeTags": {"amenity": "restaurant", "brand": "The Keg", "brand:wikidata": "Q7744066", "brand:wikipedia": "en:The Keg", "cuisine": "steak_house", "name": "The Keg"}, "matchScore": 2, "suggestion": true},
     "amenity/restaurant/Toby Carvery": {"name": "Toby Carvery", "icon": "maki-restaurant", "geometry": ["point", "area"], "tags": {"amenity": "restaurant", "brand:wikidata": "Q7811777"}, "addTags": {"amenity": "restaurant", "brand": "Toby Carvery", "brand:wikidata": "Q7811777", "brand:wikipedia": "en:Toby Carvery", "name": "Toby Carvery"}, "removeTags": {"amenity": "restaurant", "brand": "Toby Carvery", "brand:wikidata": "Q7811777", "brand:wikipedia": "en:Toby Carvery", "name": "Toby Carvery"}, "matchScore": 2, "suggestion": true},
-    "amenity/restaurant/mexican/Toks": {"name": "Toks", "icon": "maki-restaurant", "geometry": ["point", "area"], "tags": {"amenity": "restaurant", "cuisine": "mexican", "brand:wikidata": "Q48835586"}, "addTags": {"amenity": "restaurant", "brand": "Toks", "brand:wikidata": "Q48835586", "brand:wikipedia": "en:Toks", "cuisine": "mexican", "name": "Toks"}, "removeTags": {"amenity": "restaurant", "brand": "Toks", "brand:wikidata": "Q48835586", "brand:wikipedia": "en:Toks", "cuisine": "mexican", "name": "Toks"}, "reference": {"key": "cuisine", "value": "mexican"}, "matchScore": 2, "suggestion": true},
+    "amenity/restaurant/mexican/Toks": {"name": "Toks", "icon": "fas-pepper-hot", "geometry": ["point", "area"], "tags": {"amenity": "restaurant", "cuisine": "mexican", "brand:wikidata": "Q48835586"}, "addTags": {"amenity": "restaurant", "brand": "Toks", "brand:wikidata": "Q48835586", "brand:wikipedia": "en:Toks", "cuisine": "mexican", "name": "Toks"}, "removeTags": {"amenity": "restaurant", "brand": "Toks", "brand:wikidata": "Q48835586", "brand:wikipedia": "en:Toks", "cuisine": "mexican", "name": "Toks"}, "reference": {"key": "cuisine", "value": "mexican"}, "matchScore": 2, "suggestion": true},
     "amenity/restaurant/Tony Roma's": {"name": "Tony Roma's", "icon": "maki-restaurant", "geometry": ["point", "area"], "tags": {"amenity": "restaurant", "brand:wikidata": "Q2213883"}, "addTags": {"amenity": "restaurant", "brand": "Tony Roma's", "brand:wikidata": "Q2213883", "brand:wikipedia": "en:Tony Roma's", "cuisine": "barbecue", "name": "Tony Roma's"}, "removeTags": {"amenity": "restaurant", "brand": "Tony Roma's", "brand:wikidata": "Q2213883", "brand:wikipedia": "en:Tony Roma's", "cuisine": "barbecue", "name": "Tony Roma's"}, "matchScore": 2, "suggestion": true},
     "amenity/restaurant/italian/Vapiano": {"name": "Vapiano", "icon": "maki-restaurant", "geometry": ["point", "area"], "tags": {"amenity": "restaurant", "cuisine": "italian", "brand:wikidata": "Q506252"}, "addTags": {"amenity": "restaurant", "brand": "Vapiano", "brand:wikidata": "Q506252", "brand:wikipedia": "en:Vapiano", "cuisine": "italian", "name": "Vapiano"}, "removeTags": {"amenity": "restaurant", "brand": "Vapiano", "brand:wikidata": "Q506252", "brand:wikipedia": "en:Vapiano", "cuisine": "italian", "name": "Vapiano"}, "reference": {"key": "cuisine", "value": "italian"}, "matchScore": 2, "suggestion": true},
     "amenity/restaurant/american/Village Inn": {"name": "Village Inn", "icon": "maki-restaurant", "geometry": ["point", "area"], "tags": {"amenity": "restaurant", "cuisine": "american", "brand:wikidata": "Q7930659"}, "addTags": {"amenity": "restaurant", "brand": "Village Inn", "brand:wikidata": "Q7930659", "brand:wikipedia": "en:Village Inn", "cuisine": "american", "name": "Village Inn"}, "removeTags": {"amenity": "restaurant", "brand": "Village Inn", "brand:wikidata": "Q7930659", "brand:wikipedia": "en:Village Inn", "cuisine": "american", "name": "Village Inn"}, "reference": {"key": "cuisine", "value": "american"}, "matchScore": 2, "suggestion": true},
@@ -2318,11 +2320,11 @@
     "shop/books/Читай-город": {"name": "Читай-город", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "books", "brand:wikidata": "Q4516645"}, "addTags": {"brand": "Читай-город", "brand:wikidata": "Q4516645", "brand:wikipedia": "ru:Читай-город", "name": "Читай-город", "shop": "books"}, "removeTags": {"brand": "Читай-город", "brand:wikidata": "Q4516645", "brand:wikipedia": "ru:Читай-город", "name": "Читай-город", "shop": "books"}, "matchScore": 2, "suggestion": true},
     "shop/books/ブックオフ": {"name": "ブックオフ", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "books", "brand:wikidata": "Q893011"}, "addTags": {"brand": "ブックオフ", "brand:en": "Book Off", "brand:wikidata": "Q893011", "brand:wikipedia": "en:Book Off", "name": "ブックオフ", "name:en": "Book Off", "shop": "books"}, "removeTags": {"brand": "ブックオフ", "brand:en": "Book Off", "brand:wikidata": "Q893011", "brand:wikipedia": "en:Book Off", "name": "ブックオフ", "name:en": "Book Off", "shop": "books"}, "matchScore": 2, "suggestion": true},
     "shop/books/新华书店": {"name": "新华书店", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "books", "brand:wikidata": "Q6124193"}, "addTags": {"brand": "新华书店", "brand:en": "Xinhua Bookstore", "brand:wikidata": "Q6124193", "brand:wikipedia": "en:Xinhua Bookstore", "name": "新华书店", "name:en": "Xinhua Bookstore", "shop": "books"}, "removeTags": {"brand": "新华书店", "brand:en": "Xinhua Bookstore", "brand:wikidata": "Q6124193", "brand:wikipedia": "en:Xinhua Bookstore", "name": "新华书店", "name:en": "Xinhua Bookstore", "shop": "books"}, "matchScore": 2, "suggestion": true},
-    "shop/butcher/Coqivoire": {"name": "Coqivoire", "icon": "maki-slaughterhouse", "geometry": ["point", "area"], "tags": {"shop": "butcher", "brand:wikidata": "Q60183284"}, "addTags": {"brand": "Coqivoire", "brand:wikidata": "Q60183284", "butcher": "poultry", "name": "Coqivoire", "shop": "butcher"}, "removeTags": {"brand": "Coqivoire", "brand:wikidata": "Q60183284", "butcher": "poultry", "name": "Coqivoire", "shop": "butcher"}, "matchScore": 2, "suggestion": true},
-    "shop/butcher/Foani": {"name": "Foani", "icon": "maki-slaughterhouse", "geometry": ["point", "area"], "tags": {"shop": "butcher", "brand:wikidata": "Q60183335"}, "addTags": {"brand": "Foani", "brand:wikidata": "Q60183335", "butcher": "poultry", "name": "Foani", "shop": "butcher"}, "removeTags": {"brand": "Foani", "brand:wikidata": "Q60183335", "butcher": "poultry", "name": "Foani", "shop": "butcher"}, "matchScore": 2, "suggestion": true},
-    "shop/butcher/Vinzenzmurr": {"name": "Vinzenzmurr", "icon": "maki-slaughterhouse", "geometry": ["point", "area"], "tags": {"shop": "butcher", "brand:wikidata": "Q2527361"}, "addTags": {"brand": "Vinzenzmurr", "brand:wikidata": "Q2527361", "brand:wikipedia": "de:Vinzenzmurr", "name": "Vinzenzmurr", "shop": "butcher"}, "removeTags": {"brand": "Vinzenzmurr", "brand:wikidata": "Q2527361", "brand:wikipedia": "de:Vinzenzmurr", "name": "Vinzenzmurr", "shop": "butcher"}, "matchScore": 2, "suggestion": true},
-    "shop/butcher/Великолукский мясокомбинат": {"name": "Великолукский мясокомбинат", "icon": "maki-slaughterhouse", "geometry": ["point", "area"], "tags": {"shop": "butcher", "brand:wikidata": "Q18401767"}, "addTags": {"brand": "Великолукский мясокомбинат", "brand:wikidata": "Q18401767", "brand:wikipedia": "ru:Великолукский мясокомбинат", "name": "Великолукский мясокомбинат", "shop": "butcher"}, "removeTags": {"brand": "Великолукский мясокомбинат", "brand:wikidata": "Q18401767", "brand:wikipedia": "ru:Великолукский мясокомбинат", "name": "Великолукский мясокомбинат", "shop": "butcher"}, "matchScore": 2, "suggestion": true},
-    "shop/butcher/Родинна ковбаска": {"name": "Родинна ковбаска", "icon": "maki-slaughterhouse", "geometry": ["point", "area"], "tags": {"shop": "butcher", "brand:wikidata": "Q30969660"}, "addTags": {"brand": "Родинна ковбаска", "brand:en": "Rodynna-kovbaska", "brand:wikidata": "Q30969660", "brand:wikipedia": "uk:ТзОВ «Барком»", "name": "Родинна ковбаска", "name:en": "Rodynna-kovbaska", "shop": "butcher"}, "removeTags": {"brand": "Родинна ковбаска", "brand:en": "Rodynna-kovbaska", "brand:wikidata": "Q30969660", "brand:wikipedia": "uk:ТзОВ «Барком»", "name": "Родинна ковбаска", "name:en": "Rodynna-kovbaska", "shop": "butcher"}, "matchScore": 2, "suggestion": true},
+    "shop/butcher/Coqivoire": {"name": "Coqivoire", "icon": "fas-bacon", "geometry": ["point", "area"], "tags": {"shop": "butcher", "brand:wikidata": "Q60183284"}, "addTags": {"brand": "Coqivoire", "brand:wikidata": "Q60183284", "butcher": "poultry", "name": "Coqivoire", "shop": "butcher"}, "removeTags": {"brand": "Coqivoire", "brand:wikidata": "Q60183284", "butcher": "poultry", "name": "Coqivoire", "shop": "butcher"}, "matchScore": 2, "suggestion": true},
+    "shop/butcher/Foani": {"name": "Foani", "icon": "fas-bacon", "geometry": ["point", "area"], "tags": {"shop": "butcher", "brand:wikidata": "Q60183335"}, "addTags": {"brand": "Foani", "brand:wikidata": "Q60183335", "butcher": "poultry", "name": "Foani", "shop": "butcher"}, "removeTags": {"brand": "Foani", "brand:wikidata": "Q60183335", "butcher": "poultry", "name": "Foani", "shop": "butcher"}, "matchScore": 2, "suggestion": true},
+    "shop/butcher/Vinzenzmurr": {"name": "Vinzenzmurr", "icon": "fas-bacon", "geometry": ["point", "area"], "tags": {"shop": "butcher", "brand:wikidata": "Q2527361"}, "addTags": {"brand": "Vinzenzmurr", "brand:wikidata": "Q2527361", "brand:wikipedia": "de:Vinzenzmurr", "name": "Vinzenzmurr", "shop": "butcher"}, "removeTags": {"brand": "Vinzenzmurr", "brand:wikidata": "Q2527361", "brand:wikipedia": "de:Vinzenzmurr", "name": "Vinzenzmurr", "shop": "butcher"}, "matchScore": 2, "suggestion": true},
+    "shop/butcher/Великолукский мясокомбинат": {"name": "Великолукский мясокомбинат", "icon": "fas-bacon", "geometry": ["point", "area"], "tags": {"shop": "butcher", "brand:wikidata": "Q18401767"}, "addTags": {"brand": "Великолукский мясокомбинат", "brand:wikidata": "Q18401767", "brand:wikipedia": "ru:Великолукский мясокомбинат", "name": "Великолукский мясокомбинат", "shop": "butcher"}, "removeTags": {"brand": "Великолукский мясокомбинат", "brand:wikidata": "Q18401767", "brand:wikipedia": "ru:Великолукский мясокомбинат", "name": "Великолукский мясокомбинат", "shop": "butcher"}, "matchScore": 2, "suggestion": true},
+    "shop/butcher/Родинна ковбаска": {"name": "Родинна ковбаска", "icon": "fas-bacon", "geometry": ["point", "area"], "tags": {"shop": "butcher", "brand:wikidata": "Q30969660"}, "addTags": {"brand": "Родинна ковбаска", "brand:en": "Rodynna-kovbaska", "brand:wikidata": "Q30969660", "brand:wikipedia": "uk:ТзОВ «Барком»", "name": "Родинна ковбаска", "name:en": "Rodynna-kovbaska", "shop": "butcher"}, "removeTags": {"brand": "Родинна ковбаска", "brand:en": "Rodynna-kovbaska", "brand:wikidata": "Q30969660", "brand:wikipedia": "uk:ТзОВ «Барком»", "name": "Родинна ковбаска", "name:en": "Rodynna-kovbaska", "shop": "butcher"}, "matchScore": 2, "suggestion": true},
     "shop/car_parts/Advance Auto Parts": {"name": "Advance Auto Parts", "icon": "maki-car", "geometry": ["point", "area"], "tags": {"shop": "car_parts", "brand:wikidata": "Q4686051"}, "addTags": {"brand": "Advance Auto Parts", "brand:wikidata": "Q4686051", "brand:wikipedia": "en:Advance Auto Parts", "name": "Advance Auto Parts", "shop": "car_parts"}, "removeTags": {"brand": "Advance Auto Parts", "brand:wikidata": "Q4686051", "brand:wikipedia": "en:Advance Auto Parts", "name": "Advance Auto Parts", "shop": "car_parts"}, "matchScore": 2, "suggestion": true},
     "shop/car_parts/AutoZone": {"name": "AutoZone", "icon": "maki-car", "geometry": ["point", "area"], "tags": {"shop": "car_parts", "brand:wikidata": "Q4826087"}, "addTags": {"brand": "AutoZone", "brand:wikidata": "Q4826087", "brand:wikipedia": "en:AutoZone", "name": "AutoZone", "shop": "car_parts"}, "removeTags": {"brand": "AutoZone", "brand:wikidata": "Q4826087", "brand:wikipedia": "en:AutoZone", "name": "AutoZone", "shop": "car_parts"}, "matchScore": 2, "suggestion": true},
     "shop/car_parts/Halfords": {"name": "Halfords", "icon": "maki-car", "geometry": ["point", "area"], "tags": {"shop": "car_parts", "brand:wikidata": "Q3398786"}, "addTags": {"brand": "Halfords", "brand:wikidata": "Q3398786", "brand:wikipedia": "en:Halfords", "name": "Halfords", "service:bicycle:retail": "yes", "shop": "car_parts"}, "removeTags": {"brand": "Halfords", "brand:wikidata": "Q3398786", "brand:wikipedia": "en:Halfords", "name": "Halfords", "service:bicycle:retail": "yes", "shop": "car_parts"}, "matchScore": 2, "suggestion": true},
@@ -2667,7 +2669,7 @@
     "shop/convenience/全家便利商店": {"name": "全家便利商店", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "convenience", "brand:wikidata": "Q10891564"}, "addTags": {"brand": "全家便利商店", "brand:wikidata": "Q10891564", "brand:wikipedia": "zh:全家便利商店", "name": "全家便利商店", "shop": "convenience"}, "removeTags": {"brand": "全家便利商店", "brand:wikidata": "Q10891564", "brand:wikipedia": "zh:全家便利商店", "name": "全家便利商店", "shop": "convenience"}, "matchScore": 2, "suggestion": true},
     "shop/convenience/萊爾富": {"name": "萊爾富", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "convenience", "brand:wikidata": "Q11326216"}, "addTags": {"brand": "萊爾富", "brand:wikidata": "Q11326216", "brand:wikipedia": "zh:萊爾富", "name": "萊爾富", "shop": "convenience"}, "removeTags": {"brand": "萊爾富", "brand:wikidata": "Q11326216", "brand:wikipedia": "zh:萊爾富", "name": "萊爾富", "shop": "convenience"}, "matchScore": 2, "suggestion": true},
     "shop/convenience/세븐일레븐": {"name": "세븐일레븐", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "convenience", "brand:wikidata": "Q259340"}, "addTags": {"brand": "세븐일레븐", "brand:en": "7-Eleven", "brand:wikidata": "Q259340", "brand:wikipedia": "en:7-Eleven", "name": "세븐일레븐", "name:en": "7-Eleven", "shop": "convenience"}, "removeTags": {"brand": "세븐일레븐", "brand:en": "7-Eleven", "brand:wikidata": "Q259340", "brand:wikipedia": "en:7-Eleven", "name": "세븐일레븐", "name:en": "7-Eleven", "shop": "convenience"}, "matchScore": 2, "suggestion": true},
-    "shop/copyshop/FedEx Office": {"name": "FedEx Office", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "copyshop", "brand:wikidata": "Q474379"}, "addTags": {"brand": "FedEx Office", "brand:wikidata": "Q474379", "brand:wikipedia": "en:FedEx Office", "name": "FedEx Office", "shop": "copyshop"}, "removeTags": {"brand": "FedEx Office", "brand:wikidata": "Q474379", "brand:wikipedia": "en:FedEx Office", "name": "FedEx Office", "shop": "copyshop"}, "matchScore": 2, "suggestion": true},
+    "shop/copyshop/FedEx Office": {"name": "FedEx Office", "icon": "fas-print", "geometry": ["point", "area"], "tags": {"shop": "copyshop", "brand:wikidata": "Q474379"}, "addTags": {"brand": "FedEx Office", "brand:wikidata": "Q474379", "brand:wikipedia": "en:FedEx Office", "name": "FedEx Office", "shop": "copyshop"}, "removeTags": {"brand": "FedEx Office", "brand:wikidata": "Q474379", "brand:wikipedia": "en:FedEx Office", "name": "FedEx Office", "shop": "copyshop"}, "matchScore": 2, "suggestion": true},
     "shop/cosmetics/KIKO Milano": {"name": "KIKO Milano", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "cosmetics", "brand:wikidata": "Q3812045"}, "addTags": {"brand": "KIKO Milano", "brand:wikidata": "Q3812045", "brand:wikipedia": "it:KIKO", "name": "KIKO Milano", "shop": "cosmetics"}, "removeTags": {"brand": "KIKO Milano", "brand:wikidata": "Q3812045", "brand:wikipedia": "it:KIKO", "name": "KIKO Milano", "shop": "cosmetics"}, "matchScore": 2, "suggestion": true},
     "shop/cosmetics/Lush": {"name": "Lush", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "cosmetics", "brand:wikidata": "Q1585448"}, "addTags": {"brand": "Lush", "brand:wikidata": "Q1585448", "brand:wikipedia": "en:Lush (company)", "name": "Lush", "shop": "cosmetics"}, "removeTags": {"brand": "Lush", "brand:wikidata": "Q1585448", "brand:wikipedia": "en:Lush (company)", "name": "Lush", "shop": "cosmetics"}, "matchScore": 2, "suggestion": true},
     "shop/cosmetics/Nocibé": {"name": "Nocibé", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "cosmetics", "brand:wikidata": "Q3342592"}, "addTags": {"brand": "Nocibé", "brand:wikidata": "Q3342592", "brand:wikipedia": "fr:Nocibé", "name": "Nocibé", "shop": "cosmetics"}, "removeTags": {"brand": "Nocibé", "brand:wikidata": "Q3342592", "brand:wikipedia": "fr:Nocibé", "name": "Nocibé", "shop": "cosmetics"}, "matchScore": 2, "suggestion": true},

data/presets/presets/amenity/fast_food/mexican.json

@@ -0,0 +1,36 @@
+{
+    "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"
+}

data/presets/presets/amenity/restaurant/mexican.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-restaurant",
+    "icon": "fas-pepper-hot",
     "geometry": [
         "point",
         "area"

data/presets/presets/leisure/picnic_table/chess.json

@@ -0,0 +1,23 @@
+{
+    "icon": "fas-chess-knight",
+    "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"
+}

data/presets/presets/shop/butcher.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-slaughterhouse",
+    "icon": "fas-bacon",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/cheese.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-cheese",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/copyshop.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-print",
     "geometry": [
         "point",
         "area"

data/presets/presets/shop/dairy.json

@@ -1,5 +1,5 @@
 {
-    "icon": "maki-shop",
+    "icon": "fas-cheese",
     "geometry": [
         "point",
         "area"

data/taginfo.json

@@ -94,6 +94,7 @@
     {"key": "cuisine", "value": "chicken", "description": "🄿 Chicken Fast Food", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-drumstick-bite.svg?sanitize=true"},
     {"key": "cuisine", "value": "fish_and_chips", "description": "🄿 Fish & Chips Fast Food", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-fish.svg?sanitize=true"},
     {"key": "cuisine", "value": "kebab", "description": "🄿 Kebab Fast Food", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-15.svg?sanitize=true"},
+    {"key": "cuisine", "value": "mexican", "description": "🄿 Mexican Fast Food, 🄿 Mexican Restaurant", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-pepper-hot.svg?sanitize=true"},
     {"key": "cuisine", "value": "pizza", "description": "🄿 Pizza Fast Food, 🄿 Pizza Restaurant", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-pizza-15.svg?sanitize=true"},
     {"key": "cuisine", "value": "sandwich", "description": "🄿 Sandwich Fast Food", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-15.svg?sanitize=true"},
     {"key": "amenity", "value": "fire_station", "description": "🄿 Fire Station", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/fire-station-15.svg?sanitize=true"},
@@ -153,7 +154,6 @@
     {"key": "cuisine", "value": "indian", "description": "🄿 Indian Restaurant", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-15.svg?sanitize=true"},
     {"key": "cuisine", "value": "italian", "description": "🄿 Italian Restaurant", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-15.svg?sanitize=true"},
     {"key": "cuisine", "value": "japanese", "description": "🄿 Japanese Restaurant", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-noodle-15.svg?sanitize=true"},
-    {"key": "cuisine", "value": "mexican", "description": "🄿 Mexican Restaurant", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-15.svg?sanitize=true"},
     {"key": "cuisine", "value": "noodle", "description": "🄿 Noodle Restaurant", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-noodle-15.svg?sanitize=true"},
     {"key": "cuisine", "value": "seafood", "description": "🄿 Seafood Restaurant", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-seafood-15.svg?sanitize=true"},
     {"key": "cuisine", "value": "steak_house", "description": "🄿 Steakhouse", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/slaughterhouse-15.svg?sanitize=true"},
@@ -549,6 +549,7 @@
     {"key": "leisure", "value": "outdoor_seating", "description": "🄿 Outdoor Seating Area", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/picnic-site-15.svg?sanitize=true"},
     {"key": "leisure", "value": "park", "description": "🄿 Park", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/park-15.svg?sanitize=true"},
     {"key": "leisure", "value": "picnic_table", "description": "🄿 Picnic Table", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/picnic-site-15.svg?sanitize=true"},
+    {"key": "sport", "value": "chess", "description": "🄿 Chess Table", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-chess-knight.svg?sanitize=true"},
     {"key": "leisure", "value": "pitch", "description": "🄿 Sport Pitch", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/pitch-15.svg?sanitize=true"},
     {"key": "sport", "value": "american_football", "description": "🄿 American Football Field", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/american-football-15.svg?sanitize=true"},
     {"key": "sport", "value": "australian_football", "description": "🄿 Australian Football Field", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/american-football-15.svg?sanitize=true"},
@@ -818,7 +819,7 @@
     {"key": "shop", "value": "bookmaker", "description": "🄿 Bookmaker", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "books", "description": "🄿 Book Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "boutique", "description": "🄿 Boutique", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
-    {"key": "shop", "value": "butcher", "description": "🄿 Butcher", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/slaughterhouse-15.svg?sanitize=true"},
+    {"key": "shop", "value": "butcher", "description": "🄿 Butcher", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-bacon.svg?sanitize=true"},
     {"key": "shop", "value": "candles", "description": "🄿 Candle Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "car_parts", "description": "🄿 Car Parts Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-15.svg?sanitize=true"},
     {"key": "shop", "value": "car_repair", "description": "🄿 Car Repair Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-repair-15.svg?sanitize=true"},
@@ -827,7 +828,7 @@
     {"key": "shop", "value": "carpet", "description": "🄿 Carpet Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "catalogue", "description": "🄿 Catalog Shop", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "charity", "description": "🄿 Charity Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
-    {"key": "shop", "value": "cheese", "description": "🄿 Cheese Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
+    {"key": "shop", "value": "cheese", "description": "🄿 Cheese Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-cheese.svg?sanitize=true"},
     {"key": "shop", "value": "chemist", "description": "🄿 Drugstore", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/grocery-15.svg?sanitize=true"},
     {"key": "shop", "value": "chocolate", "description": "🄿 Chocolate Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "clothes", "description": "🄿 Clothing Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/clothing-store-15.svg?sanitize=true"},
@@ -835,12 +836,12 @@
     {"key": "shop", "value": "computer", "description": "🄿 Computer Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "confectionery", "description": "🄿 Candy Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/confectionery-15.svg?sanitize=true"},
     {"key": "shop", "value": "convenience", "description": "🄿 Convenience Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
-    {"key": "shop", "value": "copyshop", "description": "🄿 Copy Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
+    {"key": "shop", "value": "copyshop", "description": "🄿 Copy Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-print.svg?sanitize=true"},
     {"key": "shop", "value": "cosmetics", "description": "🄿 Cosmetics Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "country_store", "description": "🄿 Country Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "craft", "description": "🄿 Arts and Crafts Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "curtain", "description": "🄿 Curtain Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
-    {"key": "shop", "value": "dairy", "description": "🄿 Dairy Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
+    {"key": "shop", "value": "dairy", "description": "🄿 Dairy Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-cheese.svg?sanitize=true"},
     {"key": "shop", "value": "deli", "description": "🄿 Deli", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/restaurant-15.svg?sanitize=true"},
     {"key": "shop", "value": "department_store", "description": "🄿 Department Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/shop-15.svg?sanitize=true"},
     {"key": "shop", "value": "doityourself", "description": "🄿 DIY Store", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/tools.svg?sanitize=true"},

dist/locales/en.json

@@ -4142,6 +4142,10 @@
                     "name": "Kebab Fast Food",
                     "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
                 },
+                "amenity/fast_food/mexican": {
+                    "name": "Mexican Fast Food",
+                    "terms": "breakfast,dine,dining,dinner,drive-in,eat,grill,lunch,table,tacos,burritos,enchiladas,fajitas,nachos,tortillas,salsa,tamales,quesadillas"
+                },
                 "amenity/fast_food/pizza": {
                     "name": "Pizza Fast Food",
                     "terms": "dine,dining,dinner,drive-in,eat,lunch,table,deep dish,thin crust,slice"
@@ -6022,6 +6026,10 @@
                     "name": "Picnic Table",
                     "terms": "bench"
                 },
+                "leisure/picnic_table/chess": {
+                    "name": "Chess Table",
+                    "terms": "bench,chess board,checkerboard,checkers,chequerboard,game table"
+                },
                 "leisure/pitch": {
                     "name": "Sport Pitch",
                     "terms": "field"

svg/fontawesome/fas-bacon.svg

@@ -0,0 +1 @@
+<svg aria-hidden="true" data-prefix="fas" data-icon="bacon" class="svg-inline--fa fa-bacon fa-w-18" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="currentColor" d="M218.92 336.39c34.89-34.89 44.2-59.7 54.05-86 10.61-28.29 21.59-57.54 61.37-97.34s69.05-50.77 97.35-61.38c23.88-9 46.64-17.68 76.79-45.37L470.81 8.91a31 31 0 0 0-40.18-2.83c-13.64 10.1-25.15 14.39-41 20.3C247 79.52 209.26 191.29 200.65 214.1c-29.75 78.83-89.55 94.68-98.72 98.09-24.86 9.26-54.73 20.38-91.07 50.36C-3 374-3.63 395 9.07 407.61l35.76 35.51C80 410.52 107 400.15 133 390.39c26.27-9.84 51.06-19.12 85.92-54zm348-232l-35.75-35.51c-35.19 32.63-62.18 43-88.25 52.79-26.26 9.85-51.06 19.16-85.95 54s-44.19 59.69-54 86C292.33 290 281.34 319.22 241.55 359s-69 50.73-97.3 61.32c-23.86 9-46.61 17.66-76.72 45.33l37.68 37.43a31 31 0 0 0 40.18 2.82c13.6-10.06 25.09-14.34 40.94-20.24 142.2-53 180-164.1 188.94-187.69C405 219.18 464.8 203.3 474 199.86c24.87-9.27 54.74-20.4 91.11-50.41 13.89-11.4 14.52-32.45 1.82-45.05z"></path></svg>

svg/fontawesome/fas-cheese.svg

@@ -0,0 +1 @@
+<svg aria-hidden="true" data-prefix="fas" data-icon="cheese" class="svg-inline--fa fa-cheese fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M0 288v160a32 32 0 0 0 32 32h448a32 32 0 0 0 32-32V288zM299.83 32a32 32 0 0 0-21.13 7L0 256h512c0-119.89-94-217.8-212.17-224z"></path></svg>

svg/fontawesome/fas-chess-knight.svg

@@ -0,0 +1 @@
+<svg aria-hidden="true" data-prefix="fas" data-icon="chess-knight" class="svg-inline--fa fa-chess-knight fa-w-12" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path fill="currentColor" d="M352 224v224H32v-46.557c0-30.302 17.12-58.003 44.223-71.554l57.243-28.622A48 48 0 0 0 160 258.334V208l-22.127 11.063a23.996 23.996 0 0 0-12.55 15.645l-11.835 47.338a12 12 0 0 1-7.185 8.231l-29.601 11.84a11.998 11.998 0 0 1-9.33-.176L7.126 275.167A12 12 0 0 1 0 264.201v-158.26c0-6.365 2.529-12.47 7.03-16.971L16 80 1.789 51.578A16.937 16.937 0 0 1 0 44c0-6.627 5.373-12 12-12h148c106.039 0 192 85.961 192 192zm20 240H12c-6.627 0-12 5.373-12 12v24c0 6.627 5.373 12 12 12h360c6.627 0 12-5.373 12-12v-24c0-6.627-5.373-12-12-12zM52 128c-11.046 0-20 8.954-20 20s8.954 20 20 20 20-8.954 20-20-8.954-20-20-20z"></path></svg>

svg/fontawesome/fas-pepper-hot.svg

@@ -0,0 +1 @@
+<svg aria-hidden="true" data-prefix="fas" data-icon="pepper-hot" class="svg-inline--fa fa-pepper-hot fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M330.67 263.12V173.4l-52.75-24.22C219.44 218.76 197.58 400 56 400a56 56 0 0 0 0 112c212.64 0 370.65-122.87 419.18-210.34l-37.05-38.54zm131.09-128.37C493.92 74.91 477.18 26.48 458.62 3a8 8 0 0 0-11.93-.59l-22.9 23a8.06 8.06 0 0 0-.89 10.23c6.86 10.36 17.05 35.1-1.4 72.32A142.85 142.85 0 0 0 364.34 96c-28 0-54 8.54-76.34 22.59l74.67 34.29v78.24h89.09L506.44 288c3.26-12.62 5.56-25.63 5.56-39.31a154 154 0 0 0-50.24-113.94z"></path></svg>

svg/fontawesome/fas-print.svg

@@ -0,0 +1 @@
+<svg aria-hidden="true" data-prefix="fas" data-icon="print" class="svg-inline--fa fa-print fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M448 192V77.25c0-8.49-3.37-16.62-9.37-22.63L393.37 9.37c-6-6-14.14-9.37-22.63-9.37H96C78.33 0 64 14.33 64 32v160c-35.35 0-64 28.65-64 64v112c0 8.84 7.16 16 16 16h48v96c0 17.67 14.33 32 32 32h320c17.67 0 32-14.33 32-32v-96h48c8.84 0 16-7.16 16-16V256c0-35.35-28.65-64-64-64zm-64 256H128v-96h256v96zm0-224H128V64h192v48c0 8.84 7.16 16 16 16h48v96zm48 72c-13.25 0-24-10.75-24-24 0-13.26 10.75-24 24-24s24 10.74 24 24c0 13.25-10.75 24-24 24z"></path></svg>