diff --git a/data/name-suggestions.json b/data/name-suggestions.json
index 063ec2508..8077ee2f6 100644
--- a/data/name-suggestions.json
+++ b/data/name-suggestions.json
@@ -433,9 +433,6 @@
             "ENEOS": {
                 "count": 736
             },
-            "Stacja paliw": {
-                "count": 94
-            },
             "Bharat Petroleum": {
                 "count": 64
             },
@@ -846,7 +843,10 @@
                 }
             },
             "Taco Bell": {
-                "count": 1423
+                "count": 1423,
+                "tags": {
+                    "cuisine": "mexican"
+                }
             },
             "Pizza Nova": {
                 "count": 63
@@ -863,9 +863,6 @@
             "Mr. Sub": {
                 "count": 103
             },
-            "Kebab": {
-                "count": 182
-            },
             "Макдоналдс": {
                 "count": 324,
                 "tags": {
@@ -875,9 +872,6 @@
             "Asia Imbiss": {
                 "count": 111
             },
-            "Imbiss": {
-                "count": 199
-            },
             "Chipotle": {
                 "count": 290,
                 "tags": {
@@ -947,7 +941,10 @@
                 }
             },
             "Panda Express": {
-                "count": 238
+                "count": 238,
+                "tags": {
+                    "cuisine": "chinese"
+                }
             },
             "Whataburger": {
                 "count": 364
@@ -1003,7 +1000,10 @@
         },
         "restaurant": {
             "Pizza Hut": {
-                "count": 1180
+                "count": 1180,
+                "tags": {
+                    "cuisine": "pizza"
+                }
             },
             "Little Chef": {
                 "count": 64
@@ -1077,12 +1077,6 @@
             "Hirschen": {
                 "count": 79
             },
-            "Papa John's": {
-                "count": 67,
-                "tags": {
-                    "cuisine": "pizza"
-                }
-            },
             "Denny's": {
                 "count": 450
             },
@@ -1392,9 +1386,6 @@
             "ジョナサン": {
                 "count": 59
             },
-            "Arby's": {
-                "count": 51
-            },
             "Longhorn Steakhouse": {
                 "count": 66
             }
@@ -1961,7 +1952,7 @@
             "Security Bank": {
                 "count": 78
             },
-            "Millenium Bank": {
+            "Millenium": {
                 "count": 60
             },
             "Bankia": {
@@ -2456,9 +2447,6 @@
             "Second Cup": {
                 "count": 193
             },
-            "Eisdiele": {
-                "count": 73
-            },
             "Dunkin Donuts": {
                 "count": 428,
                 "tags": {
@@ -2554,10 +2542,10 @@
                 "count": 547
             },
             "Lidl": {
-                "count": 6208
+                "count": 7130
             },
-            "EDEKA": {
-                "count": 506
+            "Edeka": {
+                "count": 2293
             },
             "Coles": {
                 "count": 400
@@ -2566,7 +2554,7 @@
                 "count": 315
             },
             "Coop": {
-                "count": 1906
+                "count": 2100
             },
             "Tesco": {
                 "count": 1297
@@ -2613,11 +2601,8 @@
             "Netto": {
                 "count": 4379
             },
-            "REWE": {
-                "count": 1474
-            },
             "Rewe": {
-                "count": 1171
+                "count": 2645
             },
             "Aldi Süd": {
                 "count": 594
@@ -2634,9 +2619,6 @@
             "Kiwi": {
                 "count": 167
             },
-            "Edeka": {
-                "count": 1787
-            },
             "Pick n Pay": {
                 "count": 241
             },
@@ -2653,7 +2635,7 @@
                 "count": 258
             },
             "Spar": {
-                "count": 2100
+                "count": 2386
             },
             "Hofer": {
                 "count": 442
@@ -2661,9 +2643,6 @@
             "M-Preis": {
                 "count": 76
             },
-            "LIDL": {
-                "count": 922
-            },
             "tegut": {
                 "count": 210
             },
@@ -2736,9 +2715,6 @@
             "Hoogvliet": {
                 "count": 53
             },
-            "COOP": {
-                "count": 194
-            },
             "Food Basics": {
                 "count": 75
             },
@@ -2866,7 +2842,10 @@
                 "count": 80
             },
             "Whole Foods": {
-                "count": 210
+                "count": 210,
+                "tags": {
+                    "shop": "supermarket"
+                }
             },
             "Pam": {
                 "count": 56
@@ -2985,8 +2964,8 @@
             "Unimarc": {
                 "count": 177
             },
-            "Co-operative Food": {
-                "count": 59
+            "The Co-operative Food": {
+                "count": 190
             },
             "Santa Isabel": {
                 "count": 128
@@ -3069,9 +3048,6 @@
             "Carrefour Contact": {
                 "count": 83
             },
-            "SPAR": {
-                "count": 286
-            },
             "No Frills": {
                 "count": 105
             },
@@ -3087,9 +3063,6 @@
             "Biedronka": {
                 "count": 1335
             },
-            "The Co-operative Food": {
-                "count": 131
-            },
             "Eurospin": {
                 "count": 155
             },
@@ -3311,7 +3284,7 @@
                 "count": 255
             },
             "Spar": {
-                "count": 922
+                "count": 1119
             },
             "McColl's": {
                 "count": 100
@@ -3341,7 +3314,7 @@
                 "count": 135
             },
             "Coop": {
-                "count": 538
+                "count": 678
             },
             "Sale": {
                 "count": 80
@@ -3385,12 +3358,6 @@
             "Valintatalo": {
                 "count": 62
             },
-            "SPAR": {
-                "count": 197
-            },
-            "COOP": {
-                "count": 140
-            },
             "Casino": {
                 "count": 90
             },
@@ -3526,9 +3493,6 @@
             "Гастроном": {
                 "count": 152
             },
-            "Sklep spożywczy": {
-                "count": 318
-            },
             "Centra": {
                 "count": 111
             },
@@ -3595,6 +3559,9 @@
             "Kiosk": {
                 "count": 55
             },
+            "Sklep spożywczy": {
+                "count": 130
+            },
             "24 часа": {
                 "count": 58
             },
@@ -3634,9 +3601,6 @@
             "เซเว่นอีเลฟเว่น": {
                 "count": 185
             },
-            "Spożywczy": {
-                "count": 78
-            },
             "Delikatesy Centrum": {
                 "count": 53
             },
@@ -3798,14 +3762,11 @@
                 "count": 83
             },
             "Kwik Fit": {
-                "count": 75
+                "count": 128
             },
             "ATU": {
                 "count": 261
             },
-            "Kwik-Fit": {
-                "count": 53
-            },
             "Midas": {
                 "count": 202
             },
@@ -3854,9 +3815,6 @@
             "Firestone": {
                 "count": 88
             },
-            "AutoZone": {
-                "count": 82
-            },
             "Автосервис": {
                 "count": 361
             },
@@ -4490,9 +4448,6 @@
             "Backwerk": {
                 "count": 95
             },
-            "Bäcker": {
-                "count": 68
-            },
             "Schäfer's": {
                 "count": 51
             },
@@ -4514,9 +4469,6 @@
             "Хлеб": {
                 "count": 89
             },
-            "Piekarnia": {
-                "count": 62
-            },
             "Пекарня": {
                 "count": 52
             },
@@ -4803,9 +4755,6 @@
             "Стиль": {
                 "count": 51
             },
-            "Fryzjer": {
-                "count": 56
-            },
             "Franck Provost": {
                 "count": 70
             },
diff --git a/data/presets/presets.json b/data/presets/presets.json
index e3087ed70..09c1f3b4f 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -12443,25 +12443,6 @@
         ],
         "suggestion": true
     },
-    "amenity/fuel/Stacja paliw": {
-        "tags": {
-            "name": "Stacja paliw",
-            "amenity": "fuel"
-        },
-        "name": "Stacja paliw",
-        "icon": "fuel",
-        "geometry": [
-            "point",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area",
-            "opening_hours"
-        ],
-        "suggestion": true
-    },
     "amenity/fuel/Bharat Petroleum": {
         "tags": {
             "name": "Bharat Petroleum",
@@ -14919,6 +14900,7 @@
     "amenity/fast_food/Taco Bell": {
         "tags": {
             "name": "Taco Bell",
+            "cuisine": "mexican",
             "amenity": "fast_food"
         },
         "name": "Taco Bell",
@@ -15037,30 +15019,6 @@
         ],
         "suggestion": true
     },
-    "amenity/fast_food/Kebab": {
-        "tags": {
-            "name": "Kebab",
-            "amenity": "fast_food"
-        },
-        "name": "Kebab",
-        "icon": "fast-food",
-        "geometry": [
-            "point",
-            "area"
-        ],
-        "fields": [
-            "cuisine",
-            "operator",
-            "address",
-            "building_area",
-            "opening_hours",
-            "takeaway",
-            "delivery",
-            "drive_through",
-            "smoking"
-        ],
-        "suggestion": true
-    },
     "amenity/fast_food/Макдоналдс": {
         "tags": {
             "name": "Макдоналдс",
@@ -15110,30 +15068,6 @@
         ],
         "suggestion": true
     },
-    "amenity/fast_food/Imbiss": {
-        "tags": {
-            "name": "Imbiss",
-            "amenity": "fast_food"
-        },
-        "name": "Imbiss",
-        "icon": "fast-food",
-        "geometry": [
-            "point",
-            "area"
-        ],
-        "fields": [
-            "cuisine",
-            "operator",
-            "address",
-            "building_area",
-            "opening_hours",
-            "takeaway",
-            "delivery",
-            "drive_through",
-            "smoking"
-        ],
-        "suggestion": true
-    },
     "amenity/fast_food/Chipotle": {
         "tags": {
             "name": "Chipotle",
@@ -15552,6 +15486,7 @@
     "amenity/fast_food/Panda Express": {
         "tags": {
             "name": "Panda Express",
+            "cuisine": "chinese",
             "amenity": "fast_food"
         },
         "name": "Panda Express",
@@ -15915,6 +15850,7 @@
     "amenity/restaurant/Pizza Hut": {
         "tags": {
             "name": "Pizza Hut",
+            "cuisine": "pizza",
             "amenity": "restaurant"
         },
         "name": "Pizza Hut",
@@ -22715,12 +22651,12 @@
         ],
         "suggestion": true
     },
-    "amenity/bank/Millenium Bank": {
+    "amenity/bank/Millenium": {
         "tags": {
-            "name": "Millenium Bank",
+            "name": "Millenium",
             "amenity": "bank"
         },
-        "name": "Millenium Bank",
+        "name": "Millenium",
         "icon": "bank",
         "geometry": [
             "point",
@@ -25827,27 +25763,6 @@
         ],
         "suggestion": true
     },
-    "amenity/cafe/Eisdiele": {
-        "tags": {
-            "name": "Eisdiele",
-            "amenity": "cafe"
-        },
-        "name": "Eisdiele",
-        "icon": "cafe",
-        "geometry": [
-            "point",
-            "area"
-        ],
-        "fields": [
-            "cuisine",
-            "internet_access",
-            "address",
-            "building_area",
-            "opening_hours",
-            "smoking"
-        ],
-        "suggestion": true
-    },
     "amenity/cafe/Dunkin Donuts": {
         "tags": {
             "name": "Dunkin Donuts",
@@ -26386,12 +26301,12 @@
         ],
         "suggestion": true
     },
-    "shop/supermarket/EDEKA": {
+    "shop/supermarket/Edeka": {
         "tags": {
-            "name": "EDEKA",
+            "name": "Edeka",
             "shop": "supermarket"
         },
-        "name": "EDEKA",
+        "name": "Edeka",
         "icon": "grocery",
         "geometry": [
             "point",
@@ -26747,25 +26662,6 @@
         ],
         "suggestion": true
     },
-    "shop/supermarket/REWE": {
-        "tags": {
-            "name": "REWE",
-            "shop": "supermarket"
-        },
-        "name": "REWE",
-        "icon": "grocery",
-        "geometry": [
-            "point",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area",
-            "opening_hours"
-        ],
-        "suggestion": true
-    },
     "shop/supermarket/Rewe": {
         "tags": {
             "name": "Rewe",
@@ -26861,25 +26757,6 @@
         ],
         "suggestion": true
     },
-    "shop/supermarket/Edeka": {
-        "tags": {
-            "name": "Edeka",
-            "shop": "supermarket"
-        },
-        "name": "Edeka",
-        "icon": "grocery",
-        "geometry": [
-            "point",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area",
-            "opening_hours"
-        ],
-        "suggestion": true
-    },
     "shop/supermarket/Pick n Pay": {
         "tags": {
             "name": "Pick n Pay",
@@ -27032,25 +26909,6 @@
         ],
         "suggestion": true
     },
-    "shop/supermarket/LIDL": {
-        "tags": {
-            "name": "LIDL",
-            "shop": "supermarket"
-        },
-        "name": "LIDL",
-        "icon": "grocery",
-        "geometry": [
-            "point",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area",
-            "opening_hours"
-        ],
-        "suggestion": true
-    },
     "shop/supermarket/tegut": {
         "tags": {
             "name": "tegut",
@@ -27507,25 +27365,6 @@
         ],
         "suggestion": true
     },
-    "shop/supermarket/COOP": {
-        "tags": {
-            "name": "COOP",
-            "shop": "supermarket"
-        },
-        "name": "COOP",
-        "icon": "grocery",
-        "geometry": [
-            "point",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area",
-            "opening_hours"
-        ],
-        "suggestion": true
-    },
     "shop/supermarket/Food Basics": {
         "tags": {
             "name": "Food Basics",
@@ -29008,12 +28847,12 @@
         ],
         "suggestion": true
     },
-    "shop/supermarket/Co-operative Food": {
+    "shop/supermarket/The Co-operative Food": {
         "tags": {
-            "name": "Co-operative Food",
+            "name": "The Co-operative Food",
             "shop": "supermarket"
         },
-        "name": "Co-operative Food",
+        "name": "The Co-operative Food",
         "icon": "grocery",
         "geometry": [
             "point",
@@ -29521,25 +29360,6 @@
         ],
         "suggestion": true
     },
-    "shop/supermarket/SPAR": {
-        "tags": {
-            "name": "SPAR",
-            "shop": "supermarket"
-        },
-        "name": "SPAR",
-        "icon": "grocery",
-        "geometry": [
-            "point",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area",
-            "opening_hours"
-        ],
-        "suggestion": true
-    },
     "shop/supermarket/No Frills": {
         "tags": {
             "name": "No Frills",
@@ -29635,25 +29455,6 @@
         ],
         "suggestion": true
     },
-    "shop/supermarket/The Co-operative Food": {
-        "tags": {
-            "name": "The Co-operative Food",
-            "shop": "supermarket"
-        },
-        "name": "The Co-operative Food",
-        "icon": "grocery",
-        "geometry": [
-            "point",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area",
-            "opening_hours"
-        ],
-        "suggestion": true
-    },
     "shop/supermarket/Eurospin": {
         "tags": {
             "name": "Eurospin",
@@ -31768,25 +31569,6 @@
         ],
         "suggestion": true
     },
-    "shop/convenience/Sklep spożywczy": {
-        "tags": {
-            "name": "Sklep spożywczy",
-            "shop": "convenience"
-        },
-        "name": "Sklep spożywczy",
-        "icon": "shop",
-        "geometry": [
-            "point",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area",
-            "opening_hours"
-        ],
-        "suggestion": true
-    },
     "shop/convenience/Centra": {
         "tags": {
             "name": "Centra",
@@ -32092,6 +31874,25 @@
         ],
         "suggestion": true
     },
+    "shop/convenience/Sklep spożywczy": {
+        "tags": {
+            "name": "Sklep spożywczy",
+            "shop": "convenience"
+        },
+        "name": "Sklep spożywczy",
+        "icon": "shop",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "shop/convenience/24 часа": {
         "tags": {
             "name": "24 часа",
@@ -32301,25 +32102,6 @@
         ],
         "suggestion": true
     },
-    "shop/convenience/Spożywczy": {
-        "tags": {
-            "name": "Spożywczy",
-            "shop": "convenience"
-        },
-        "name": "Spożywczy",
-        "icon": "shop",
-        "geometry": [
-            "point",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area",
-            "opening_hours"
-        ],
-        "suggestion": true
-    },
     "shop/convenience/Фортуна": {
         "tags": {
             "name": "Фортуна",
@@ -33175,25 +32957,6 @@
         ],
         "suggestion": true
     },
-    "shop/car_repair/Kwik-Fit": {
-        "tags": {
-            "name": "Kwik-Fit",
-            "shop": "car_repair"
-        },
-        "name": "Kwik-Fit",
-        "icon": "car",
-        "geometry": [
-            "point",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area",
-            "opening_hours"
-        ],
-        "suggestion": true
-    },
     "shop/car_repair/Midas": {
         "tags": {
             "name": "Midas",
@@ -33441,25 +33204,6 @@
         ],
         "suggestion": true
     },
-    "shop/car_repair/AutoZone": {
-        "tags": {
-            "name": "AutoZone",
-            "shop": "car_repair"
-        },
-        "name": "AutoZone",
-        "icon": "car",
-        "geometry": [
-            "point",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area",
-            "opening_hours"
-        ],
-        "suggestion": true
-    },
     "shop/car_repair/Автосервис": {
         "tags": {
             "name": "Автосервис",
@@ -37177,25 +36921,6 @@
         ],
         "suggestion": true
     },
-    "shop/bakery/Bäcker": {
-        "tags": {
-            "name": "Bäcker",
-            "shop": "bakery"
-        },
-        "name": "Bäcker",
-        "icon": "bakery",
-        "geometry": [
-            "point",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area",
-            "opening_hours"
-        ],
-        "suggestion": true
-    },
     "shop/bakery/Schäfer's": {
         "tags": {
             "name": "Schäfer's",
@@ -37329,25 +37054,6 @@
         ],
         "suggestion": true
     },
-    "shop/bakery/Piekarnia": {
-        "tags": {
-            "name": "Piekarnia",
-            "shop": "bakery"
-        },
-        "name": "Piekarnia",
-        "icon": "bakery",
-        "geometry": [
-            "point",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area",
-            "opening_hours"
-        ],
-        "suggestion": true
-    },
     "shop/bakery/Пекарня": {
         "tags": {
             "name": "Пекарня",
@@ -38963,25 +38669,6 @@
         ],
         "suggestion": true
     },
-    "shop/hairdresser/Fryzjer": {
-        "tags": {
-            "name": "Fryzjer",
-            "shop": "hairdresser"
-        },
-        "name": "Fryzjer",
-        "icon": "hairdresser",
-        "geometry": [
-            "point",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area",
-            "opening_hours"
-        ],
-        "suggestion": true
-    },
     "shop/hairdresser/Franck Provost": {
         "tags": {
             "name": "Franck Provost",