diff --git a/build.js b/build.js
index 84d5d5136..1814d03ee 100644
--- a/build.js
+++ b/build.js
@@ -90,15 +90,7 @@ function generateFields() {
 }
 
 function suggestionsToPresets(presets) {
-    var existing = {},
-        countThreshold = 0;
-
-    for (var preset in presets) {
-        existing[presets[preset].name] = {
-            category: preset,
-            count: -1
-        };
-    }
+    var existing = {};
 
     for (var key in suggestions) {
         for (var value in suggestions[key]) {
@@ -107,14 +99,19 @@ function suggestionsToPresets(presets) {
                     tags = {},
                     count = suggestions[key][value][name].count;
 
-                tags = _.extend({name: name}, suggestions[key][value][name].tags);
-
-                if (!existing[name] && count > countThreshold) addPreset(item, tags, name, count);
+                if (existing[name] && count > existing[name].count) {
+                    delete presets[existing[name].category];
+                    delete existing[name];
+                }
+                if (!existing[name]) {
+                    tags = _.extend({name: name}, suggestions[key][value][name].tags);
+                    addSuggestion(item, tags, name, count);
+                }
             }
         }
     }
 
-    function addPreset(category, tags, name, count) {
+    function addSuggestion(category, tags, name, count) {
         var tag = category.split('/'),
             parent = presets[tag[0] + '/' + tag[1]];
 
diff --git a/data/presets/presets.json b/data/presets/presets.json
index e66b254ff..eda3b52a2 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -8760,25 +8760,6 @@
         ],
         "suggestion": true
     },
-    "amenity/fuel/Sainsbury's": {
-        "tags": {
-            "name": "Sainsbury's",
-            "amenity": "fuel"
-        },
-        "name": "Sainsbury's",
-        "icon": "fuel",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area"
-        ],
-        "suggestion": true
-    },
     "amenity/fuel/OMV": {
         "tags": {
             "name": "OMV",
@@ -8817,25 +8798,6 @@
         ],
         "suggestion": true
     },
-    "amenity/fuel/Tesco": {
-        "tags": {
-            "name": "Tesco",
-            "amenity": "fuel"
-        },
-        "name": "Tesco",
-        "icon": "fuel",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area"
-        ],
-        "suggestion": true
-    },
     "amenity/fuel/JET": {
         "tags": {
             "name": "JET",
@@ -8855,25 +8817,6 @@
         ],
         "suggestion": true
     },
-    "amenity/fuel/Morrisons": {
-        "tags": {
-            "name": "Morrisons",
-            "amenity": "fuel"
-        },
-        "name": "Morrisons",
-        "icon": "fuel",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area"
-        ],
-        "suggestion": true
-    },
     "amenity/fuel/United": {
         "tags": {
             "name": "United",
@@ -8893,25 +8836,6 @@
         ],
         "suggestion": true
     },
-    "amenity/fuel/Canadian Tire": {
-        "tags": {
-            "name": "Canadian Tire",
-            "amenity": "fuel"
-        },
-        "name": "Canadian Tire",
-        "icon": "fuel",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area"
-        ],
-        "suggestion": true
-    },
     "amenity/fuel/Mobil": {
         "tags": {
             "name": "Mobil",
@@ -8988,25 +8912,6 @@
         ],
         "suggestion": true
     },
-    "amenity/fuel/ABC": {
-        "tags": {
-            "name": "ABC",
-            "amenity": "fuel"
-        },
-        "name": "ABC",
-        "icon": "fuel",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area"
-        ],
-        "suggestion": true
-    },
     "amenity/fuel/ARAL": {
         "tags": {
             "name": "ARAL",
@@ -9083,25 +8988,6 @@
         ],
         "suggestion": true
     },
-    "amenity/fuel/Intermarché": {
-        "tags": {
-            "name": "Intermarché",
-            "amenity": "fuel"
-        },
-        "name": "Intermarché",
-        "icon": "fuel",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area"
-        ],
-        "suggestion": true
-    },
     "amenity/fuel/Total Access": {
         "tags": {
             "name": "Total Access",
@@ -9121,44 +9007,6 @@
         ],
         "suggestion": true
     },
-    "amenity/fuel/Super U": {
-        "tags": {
-            "name": "Super U",
-            "amenity": "fuel"
-        },
-        "name": "Super U",
-        "icon": "fuel",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area"
-        ],
-        "suggestion": true
-    },
-    "amenity/fuel/Auchan": {
-        "tags": {
-            "name": "Auchan",
-            "amenity": "fuel"
-        },
-        "name": "Auchan",
-        "icon": "fuel",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area"
-        ],
-        "suggestion": true
-    },
     "amenity/fuel/Elf": {
         "tags": {
             "name": "Elf",
@@ -9178,25 +9026,6 @@
         ],
         "suggestion": true
     },
-    "amenity/fuel/Carrefour": {
-        "tags": {
-            "name": "Carrefour",
-            "amenity": "fuel"
-        },
-        "name": "Carrefour",
-        "icon": "fuel",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area"
-        ],
-        "suggestion": true
-    },
     "amenity/fuel/Station Service E. Leclerc": {
         "tags": {
             "name": "Station Service E. Leclerc",
@@ -9539,25 +9368,6 @@
         ],
         "suggestion": true
     },
-    "amenity/fuel/Raiffeisenbank": {
-        "tags": {
-            "name": "Raiffeisenbank",
-            "amenity": "fuel"
-        },
-        "name": "Raiffeisenbank",
-        "icon": "fuel",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area"
-        ],
-        "suggestion": true
-    },
     "amenity/fuel/Tamoil": {
         "tags": {
             "name": "Tamoil",
@@ -9653,25 +9463,6 @@
         ],
         "suggestion": true
     },
-    "amenity/fuel/Coop": {
-        "tags": {
-            "name": "Coop",
-            "amenity": "fuel"
-        },
-        "name": "Coop",
-        "icon": "fuel",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area"
-        ],
-        "suggestion": true
-    },
     "amenity/fuel/Orlen": {
         "tags": {
             "name": "Orlen",
@@ -9881,25 +9672,6 @@
         ],
         "suggestion": true
     },
-    "amenity/fuel/7-Eleven": {
-        "tags": {
-            "name": "7-Eleven",
-            "amenity": "fuel"
-        },
-        "name": "7-Eleven",
-        "icon": "fuel",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area"
-        ],
-        "suggestion": true
-    },
     "amenity/fuel/Agrola": {
         "tags": {
             "name": "Agrola",
@@ -11021,25 +10793,6 @@
         ],
         "suggestion": true
     },
-    "amenity/fuel/Wawa": {
-        "tags": {
-            "name": "Wawa",
-            "amenity": "fuel"
-        },
-        "name": "Wawa",
-        "icon": "fuel",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area"
-        ],
-        "suggestion": true
-    },
     "amenity/fuel/Pertamina": {
         "tags": {
             "name": "Pertamina",
@@ -11535,25 +11288,6 @@
         ],
         "suggestion": true
     },
-    "amenity/fuel/Circle K": {
-        "tags": {
-            "name": "Circle K",
-            "amenity": "fuel"
-        },
-        "name": "Circle K",
-        "icon": "fuel",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area"
-        ],
-        "suggestion": true
-    },
     "amenity/fuel/Posto Ipiranga": {
         "tags": {
             "name": "Posto Ipiranga",
@@ -11706,25 +11440,6 @@
         ],
         "suggestion": true
     },
-    "amenity/fuel/Stewart's": {
-        "tags": {
-            "name": "Stewart's",
-            "amenity": "fuel"
-        },
-        "name": "Stewart's",
-        "icon": "fuel",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area"
-        ],
-        "suggestion": true
-    },
     "amenity/fuel/Posto BR": {
         "tags": {
             "name": "Posto BR",
@@ -11896,25 +11611,6 @@
         ],
         "suggestion": true
     },
-    "amenity/fuel/H-E-B": {
-        "tags": {
-            "name": "H-E-B",
-            "amenity": "fuel"
-        },
-        "name": "H-E-B",
-        "icon": "fuel",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "address",
-            "building_area"
-        ],
-        "suggestion": true
-    },
     "amenity/fuel/Укрнафта": {
         "tags": {
             "name": "Укрнафта",
@@ -12991,6 +12687,28 @@
         ],
         "suggestion": true
     },
+    "amenity/fast_food/Subway": {
+        "tags": {
+            "name": "Subway",
+            "cuisine": "sandwich",
+            "amenity": "fast_food"
+        },
+        "name": "Subway",
+        "icon": "fast-food",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "cuisine",
+            "building_area",
+            "address",
+            "opening_hours",
+            "smoking"
+        ],
+        "suggestion": true
+    },
     "amenity/fast_food/Burger King": {
         "tags": {
             "name": "Burger King",
@@ -17698,6 +17416,26 @@
         ],
         "suggestion": true
     },
+    "amenity/bank/Raiffeisenbank": {
+        "tags": {
+            "name": "Raiffeisenbank",
+            "amenity": "bank"
+        },
+        "name": "Raiffeisenbank",
+        "icon": "bank",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "atm",
+            "building_area",
+            "address",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "amenity/bank/Yorkshire Bank": {
         "tags": {
             "name": "Yorkshire Bank",
@@ -23417,26 +23155,6 @@
         ],
         "suggestion": true
     },
-    "amenity/pharmacy/Радуга": {
-        "tags": {
-            "name": "Радуга",
-            "amenity": "pharmacy"
-        },
-        "name": "Радуга",
-        "icon": "pharmacy",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "building_area",
-            "address",
-            "opening_hours"
-        ],
-        "suggestion": true
-    },
     "amenity/pharmacy/サンドラッグ": {
         "tags": {
             "name": "サンドラッグ",
@@ -24597,6 +24315,25 @@
         ],
         "suggestion": true
     },
+    "shop/supermarket/Morrisons": {
+        "tags": {
+            "name": "Morrisons",
+            "shop": "supermarket"
+        },
+        "name": "Morrisons",
+        "icon": "grocery",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "operator",
+            "building_area",
+            "address"
+        ],
+        "suggestion": true
+    },
     "shop/supermarket/Interspar": {
         "tags": {
             "name": "Interspar",
@@ -24635,6 +24372,25 @@
         ],
         "suggestion": true
     },
+    "shop/supermarket/Sainsbury's": {
+        "tags": {
+            "name": "Sainsbury's",
+            "shop": "supermarket"
+        },
+        "name": "Sainsbury's",
+        "icon": "grocery",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "operator",
+            "building_area",
+            "address"
+        ],
+        "suggestion": true
+    },
     "shop/supermarket/Lidl": {
         "tags": {
             "name": "Lidl",
@@ -24711,6 +24467,44 @@
         ],
         "suggestion": true
     },
+    "shop/supermarket/Coop": {
+        "tags": {
+            "name": "Coop",
+            "shop": "supermarket"
+        },
+        "name": "Coop",
+        "icon": "grocery",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "operator",
+            "building_area",
+            "address"
+        ],
+        "suggestion": true
+    },
+    "shop/supermarket/Tesco": {
+        "tags": {
+            "name": "Tesco",
+            "shop": "supermarket"
+        },
+        "name": "Tesco",
+        "icon": "grocery",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "operator",
+            "building_area",
+            "address"
+        ],
+        "suggestion": true
+    },
     "shop/supermarket/Woolworths": {
         "tags": {
             "name": "Woolworths",
@@ -25053,25 +24847,6 @@
         ],
         "suggestion": true
     },
-    "shop/supermarket/Tesco Express": {
-        "tags": {
-            "name": "Tesco Express",
-            "shop": "supermarket"
-        },
-        "name": "Tesco Express",
-        "icon": "grocery",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "building_area",
-            "address"
-        ],
-        "suggestion": true
-    },
     "shop/supermarket/King Soopers": {
         "tags": {
             "name": "King Soopers",
@@ -25186,6 +24961,25 @@
         ],
         "suggestion": true
     },
+    "shop/supermarket/Carrefour": {
+        "tags": {
+            "name": "Carrefour",
+            "shop": "supermarket"
+        },
+        "name": "Carrefour",
+        "icon": "grocery",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "operator",
+            "building_area",
+            "address"
+        ],
+        "suggestion": true
+    },
     "shop/supermarket/Waitrose": {
         "tags": {
             "name": "Waitrose",
@@ -25585,6 +25379,25 @@
         ],
         "suggestion": true
     },
+    "shop/supermarket/Super U": {
+        "tags": {
+            "name": "Super U",
+            "shop": "supermarket"
+        },
+        "name": "Super U",
+        "icon": "grocery",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "operator",
+            "building_area",
+            "address"
+        ],
+        "suggestion": true
+    },
     "shop/supermarket/Metro": {
         "tags": {
             "name": "Metro",
@@ -25813,25 +25626,6 @@
         ],
         "suggestion": true
     },
-    "shop/supermarket/COOP Jednota": {
-        "tags": {
-            "name": "COOP Jednota",
-            "shop": "supermarket"
-        },
-        "name": "COOP Jednota",
-        "icon": "grocery",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "building_area",
-            "address"
-        ],
-        "suggestion": true
-    },
     "shop/supermarket/Rema 1000": {
         "tags": {
             "name": "Rema 1000",
@@ -26459,6 +26253,25 @@
         ],
         "suggestion": true
     },
+    "shop/supermarket/Auchan": {
+        "tags": {
+            "name": "Auchan",
+            "shop": "supermarket"
+        },
+        "name": "Auchan",
+        "icon": "grocery",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "operator",
+            "building_area",
+            "address"
+        ],
+        "suggestion": true
+    },
     "shop/supermarket/Mercadona": {
         "tags": {
             "name": "Mercadona",
@@ -26611,25 +26424,6 @@
         ],
         "suggestion": true
     },
-    "shop/supermarket/Costcutter": {
-        "tags": {
-            "name": "Costcutter",
-            "shop": "supermarket"
-        },
-        "name": "Costcutter",
-        "icon": "grocery",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "building_area",
-            "address"
-        ],
-        "suggestion": true
-    },
     "shop/supermarket/Maxi": {
         "tags": {
             "name": "Maxi",
@@ -26687,6 +26481,25 @@
         ],
         "suggestion": true
     },
+    "shop/supermarket/Intermarché": {
+        "tags": {
+            "name": "Intermarché",
+            "shop": "supermarket"
+        },
+        "name": "Intermarché",
+        "icon": "grocery",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "operator",
+            "building_area",
+            "address"
+        ],
+        "suggestion": true
+    },
     "shop/supermarket/Delhaize": {
         "tags": {
             "name": "Delhaize",
@@ -26858,25 +26671,6 @@
         ],
         "suggestion": true
     },
-    "shop/supermarket/dm": {
-        "tags": {
-            "name": "dm",
-            "shop": "supermarket"
-        },
-        "name": "dm",
-        "icon": "grocery",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "building_area",
-            "address"
-        ],
-        "suggestion": true
-    },
     "shop/supermarket/Kvickly": {
         "tags": {
             "name": "Kvickly",
@@ -27124,25 +26918,6 @@
         ],
         "suggestion": true
     },
-    "shop/supermarket/Petit Casino": {
-        "tags": {
-            "name": "Petit Casino",
-            "shop": "supermarket"
-        },
-        "name": "Petit Casino",
-        "icon": "grocery",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "building_area",
-            "address"
-        ],
-        "suggestion": true
-    },
     "shop/supermarket/Wasgau": {
         "tags": {
             "name": "Wasgau",
@@ -27732,25 +27507,6 @@
         ],
         "suggestion": true
     },
-    "shop/supermarket/Fressnapf": {
-        "tags": {
-            "name": "Fressnapf",
-            "shop": "supermarket"
-        },
-        "name": "Fressnapf",
-        "icon": "grocery",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "building_area",
-            "address"
-        ],
-        "suggestion": true
-    },
     "shop/supermarket/Coop Konsum": {
         "tags": {
             "name": "Coop Konsum",
@@ -27998,25 +27754,6 @@
         ],
         "suggestion": true
     },
-    "shop/supermarket/Centra": {
-        "tags": {
-            "name": "Centra",
-            "shop": "supermarket"
-        },
-        "name": "Centra",
-        "icon": "grocery",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "building_area",
-            "address"
-        ],
-        "suggestion": true
-    },
     "shop/supermarket/Квартал": {
         "tags": {
             "name": "Квартал",
@@ -28606,6 +28343,25 @@
         ],
         "suggestion": true
     },
+    "shop/supermarket/H-E-B": {
+        "tags": {
+            "name": "H-E-B",
+            "shop": "supermarket"
+        },
+        "name": "H-E-B",
+        "icon": "grocery",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "operator",
+            "building_area",
+            "address"
+        ],
+        "suggestion": true
+    },
     "shop/supermarket/Атак": {
         "tags": {
             "name": "Атак",
@@ -28663,25 +28419,6 @@
         ],
         "suggestion": true
     },
-    "shop/supermarket/Lewiatan": {
-        "tags": {
-            "name": "Lewiatan",
-            "shop": "supermarket"
-        },
-        "name": "Lewiatan",
-        "icon": "grocery",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "building_area",
-            "address"
-        ],
-        "suggestion": true
-    },
     "shop/supermarket/Sigma": {
         "tags": {
             "name": "Sigma",
@@ -28720,25 +28457,6 @@
         ],
         "suggestion": true
     },
-    "shop/supermarket/Społem": {
-        "tags": {
-            "name": "Społem",
-            "shop": "supermarket"
-        },
-        "name": "Społem",
-        "icon": "grocery",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "building_area",
-            "address"
-        ],
-        "suggestion": true
-    },
     "shop/supermarket/Bodega Aurrera": {
         "tags": {
             "name": "Bodega Aurrera",
@@ -28815,25 +28533,6 @@
         ],
         "suggestion": true
     },
-    "shop/supermarket/Магазин": {
-        "tags": {
-            "name": "Магазин",
-            "shop": "supermarket"
-        },
-        "name": "Магазин",
-        "icon": "grocery",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "operator",
-            "building_area",
-            "address"
-        ],
-        "suggestion": true
-    },
     "shop/supermarket/Монетка": {
         "tags": {
             "name": "Монетка",
@@ -29271,6 +28970,25 @@
         ],
         "suggestion": true
     },
+    "shop/convenience/Tesco Express": {
+        "tags": {
+            "name": "Tesco Express",
+            "shop": "convenience"
+        },
+        "name": "Tesco Express",
+        "icon": "shop",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "shop/convenience/One Stop": {
         "tags": {
             "name": "One Stop",
@@ -29309,6 +29027,25 @@
         ],
         "suggestion": true
     },
+    "shop/convenience/7-Eleven": {
+        "tags": {
+            "name": "7-Eleven",
+            "shop": "convenience"
+        },
+        "name": "7-Eleven",
+        "icon": "shop",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "shop/convenience/Sale": {
         "tags": {
             "name": "Sale",
@@ -29347,6 +29084,25 @@
         ],
         "suggestion": true
     },
+    "shop/convenience/COOP Jednota": {
+        "tags": {
+            "name": "COOP Jednota",
+            "shop": "convenience"
+        },
+        "name": "COOP Jednota",
+        "icon": "shop",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "shop/convenience/Mac's": {
         "tags": {
             "name": "Mac's",
@@ -29423,6 +29179,25 @@
         ],
         "suggestion": true
     },
+    "shop/convenience/Costcutter": {
+        "tags": {
+            "name": "Costcutter",
+            "shop": "convenience"
+        },
+        "name": "Costcutter",
+        "icon": "shop",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "shop/convenience/Valintatalo": {
         "tags": {
             "name": "Valintatalo",
@@ -29442,6 +29217,25 @@
         ],
         "suggestion": true
     },
+    "shop/convenience/Circle K": {
+        "tags": {
+            "name": "Circle K",
+            "shop": "convenience"
+        },
+        "name": "Circle K",
+        "icon": "shop",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "shop/convenience/セブンイレブン": {
         "tags": {
             "name": "セブンイレブン",
@@ -29482,6 +29276,25 @@
         ],
         "suggestion": true
     },
+    "shop/convenience/Petit Casino": {
+        "tags": {
+            "name": "Petit Casino",
+            "shop": "convenience"
+        },
+        "name": "Petit Casino",
+        "icon": "shop",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "shop/convenience/Mace": {
         "tags": {
             "name": "Mace",
@@ -29691,6 +29504,25 @@
         ],
         "suggestion": true
     },
+    "shop/convenience/ABC": {
+        "tags": {
+            "name": "ABC",
+            "shop": "convenience"
+        },
+        "name": "ABC",
+        "icon": "shop",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "shop/convenience/ミニストップ": {
         "tags": {
             "name": "ミニストップ",
@@ -29922,6 +29754,25 @@
         ],
         "suggestion": true
     },
+    "shop/convenience/Магазин": {
+        "tags": {
+            "name": "Магазин",
+            "shop": "convenience"
+        },
+        "name": "Магазин",
+        "icon": "shop",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "shop/convenience/Гастроном": {
         "tags": {
             "name": "Гастроном",
@@ -29960,6 +29811,25 @@
         ],
         "suggestion": true
     },
+    "shop/convenience/Centra": {
+        "tags": {
+            "name": "Centra",
+            "shop": "convenience"
+        },
+        "name": "Centra",
+        "icon": "shop",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "shop/convenience/サークルK": {
         "tags": {
             "name": "サークルK",
@@ -29980,6 +29850,25 @@
         ],
         "suggestion": true
     },
+    "shop/convenience/Wawa": {
+        "tags": {
+            "name": "Wawa",
+            "shop": "convenience"
+        },
+        "name": "Wawa",
+        "icon": "shop",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "shop/convenience/Proxi": {
         "tags": {
             "name": "Proxi",
@@ -30151,6 +30040,25 @@
         ],
         "suggestion": true
     },
+    "shop/convenience/Społem": {
+        "tags": {
+            "name": "Społem",
+            "shop": "convenience"
+        },
+        "name": "Społem",
+        "icon": "shop",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "shop/convenience/Cumberland Farms": {
         "tags": {
             "name": "Cumberland Farms",
@@ -30189,6 +30097,25 @@
         ],
         "suggestion": true
     },
+    "shop/convenience/Kiosk": {
+        "tags": {
+            "name": "Kiosk",
+            "shop": "convenience"
+        },
+        "name": "Kiosk",
+        "icon": "shop",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "shop/convenience/24 часа": {
         "tags": {
             "name": "24 часа",
@@ -30284,6 +30211,25 @@
         ],
         "suggestion": true
     },
+    "shop/convenience/Stewart's": {
+        "tags": {
+            "name": "Stewart's",
+            "shop": "convenience"
+        },
+        "name": "Stewart's",
+        "icon": "shop",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "shop/convenience/Продукти": {
         "tags": {
             "name": "Продукти",
@@ -30322,6 +30268,25 @@
         ],
         "suggestion": true
     },
+    "shop/convenience/Радуга": {
+        "tags": {
+            "name": "Радуга",
+            "shop": "convenience"
+        },
+        "name": "Радуга",
+        "icon": "shop",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "shop/convenience/ローソンストア100": {
         "tags": {
             "name": "ローソンストア100",
@@ -30702,6 +30667,25 @@
         ],
         "suggestion": true
     },
+    "shop/convenience/Lewiatan": {
+        "tags": {
+            "name": "Lewiatan",
+            "shop": "convenience"
+        },
+        "name": "Lewiatan",
+        "icon": "shop",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "shop/convenience/Продуктовый магазин": {
         "tags": {
             "name": "Продуктовый магазин",
@@ -30930,6 +30914,25 @@
         ],
         "suggestion": true
     },
+    "shop/convenience/Boutique": {
+        "tags": {
+            "name": "Boutique",
+            "shop": "convenience"
+        },
+        "name": "Boutique",
+        "icon": "shop",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "shop/convenience/მარკეტი (Market)": {
         "tags": {
             "name": "მარკეტი (Market)",
@@ -30968,6 +30971,25 @@
         ],
         "suggestion": true
     },
+    "shop/chemist/dm": {
+        "tags": {
+            "name": "dm",
+            "shop": "chemist"
+        },
+        "name": "dm",
+        "icon": "chemist",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "shop/chemist/Müller": {
         "tags": {
             "name": "Müller",
@@ -31139,25 +31161,6 @@
         ],
         "suggestion": true
     },
-    "shop/car_repair/Peugeot": {
-        "tags": {
-            "name": "Peugeot",
-            "shop": "car_repair"
-        },
-        "name": "Peugeot",
-        "icon": "car",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "address",
-            "building_area",
-            "opening_hours"
-        ],
-        "suggestion": true
-    },
     "shop/car_repair/Kwik Fit": {
         "tags": {
             "name": "Kwik Fit",
@@ -31291,44 +31294,6 @@
         ],
         "suggestion": true
     },
-    "shop/car_repair/Автозапчасти": {
-        "tags": {
-            "name": "Автозапчасти",
-            "shop": "car_repair"
-        },
-        "name": "Автозапчасти",
-        "icon": "car",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "address",
-            "building_area",
-            "opening_hours"
-        ],
-        "suggestion": true
-    },
-    "shop/car_repair/Renault": {
-        "tags": {
-            "name": "Renault",
-            "shop": "car_repair"
-        },
-        "name": "Renault",
-        "icon": "car",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "address",
-            "building_area",
-            "opening_hours"
-        ],
-        "suggestion": true
-    },
     "shop/car_repair/Pit Stop": {
         "tags": {
             "name": "Pit Stop",
@@ -31462,25 +31427,6 @@
         ],
         "suggestion": true
     },
-    "shop/car_repair/Citroen": {
-        "tags": {
-            "name": "Citroen",
-            "shop": "car_repair"
-        },
-        "name": "Citroen",
-        "icon": "car",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "address",
-            "building_area",
-            "opening_hours"
-        ],
-        "suggestion": true
-    },
     "shop/car_repair/Euromaster": {
         "tags": {
             "name": "Euromaster",
@@ -32089,6 +32035,25 @@
         ],
         "suggestion": true
     },
+    "shop/doityourself/Canadian Tire": {
+        "tags": {
+            "name": "Canadian Tire",
+            "shop": "doityourself"
+        },
+        "name": "Canadian Tire",
+        "icon": "shop",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "shop/doityourself/Leroy Merlin": {
         "tags": {
             "name": "Leroy Merlin",
@@ -32317,25 +32282,6 @@
         ],
         "suggestion": true
     },
-    "shop/doityourself/Хозтовары": {
-        "tags": {
-            "name": "Хозтовары",
-            "shop": "doityourself"
-        },
-        "name": "Хозтовары",
-        "icon": "shop",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "address",
-            "building_area",
-            "opening_hours"
-        ],
-        "suggestion": true
-    },
     "shop/doityourself/Стройматериалы": {
         "tags": {
             "name": "Стройматериалы",
@@ -32505,6 +32451,42 @@
         ],
         "suggestion": true
     },
+    "shop/car/Citroen": {
+        "tags": {
+            "name": "Citroen",
+            "shop": "car"
+        },
+        "name": "Citroen",
+        "icon": "car",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "address",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
+    "shop/car/Renault": {
+        "tags": {
+            "name": "Renault",
+            "shop": "car"
+        },
+        "name": "Renault",
+        "icon": "car",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "address",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "shop/car/Mercedes-Benz": {
         "tags": {
             "name": "Mercedes-Benz",
@@ -32541,6 +32523,24 @@
         ],
         "suggestion": true
     },
+    "shop/car/Ford": {
+        "tags": {
+            "name": "Ford",
+            "shop": "car"
+        },
+        "name": "Ford",
+        "icon": "car",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "address",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "shop/car/Volkswagen": {
         "tags": {
             "name": "Volkswagen",
@@ -32613,6 +32613,24 @@
         ],
         "suggestion": true
     },
+    "shop/car/Автозапчасти": {
+        "tags": {
+            "name": "Автозапчасти",
+            "shop": "car"
+        },
+        "name": "Автозапчасти",
+        "icon": "car",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "address",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "shop/car/Opel": {
         "tags": {
             "name": "Opel",
@@ -32721,6 +32739,24 @@
         ],
         "suggestion": true
     },
+    "shop/car/Peugeot": {
+        "tags": {
+            "name": "Peugeot",
+            "shop": "car"
+        },
+        "name": "Peugeot",
+        "icon": "car",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "address",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "shop/car/Hyundai": {
         "tags": {
             "name": "Hyundai",
@@ -33268,25 +33304,6 @@
         ],
         "suggestion": true
     },
-    "shop/clothes/Deichmann": {
-        "tags": {
-            "name": "Deichmann",
-            "shop": "clothes"
-        },
-        "name": "Deichmann",
-        "icon": "clothing-store",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "fields": [
-            "address",
-            "building_area",
-            "opening_hours"
-        ],
-        "suggestion": true
-    },
     "shop/clothes/Lindex": {
         "tags": {
             "name": "Lindex",
@@ -35567,6 +35584,25 @@
         ],
         "suggestion": true
     },
+    "shop/pet/Fressnapf": {
+        "tags": {
+            "name": "Fressnapf",
+            "shop": "pet"
+        },
+        "name": "Fressnapf",
+        "icon": "dog-park",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "shop/pet/PetSmart": {
         "tags": {
             "name": "PetSmart",
@@ -35662,6 +35698,25 @@
         ],
         "suggestion": true
     },
+    "shop/shoes/Deichmann": {
+        "tags": {
+            "name": "Deichmann",
+            "shop": "shoes"
+        },
+        "name": "Deichmann",
+        "icon": "shop",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "shop/shoes/Reno": {
         "tags": {
             "name": "Reno",
@@ -36973,6 +37028,25 @@
         ],
         "suggestion": true
     },
+    "shop/hardware/Хозтовары": {
+        "tags": {
+            "name": "Хозтовары",
+            "shop": "hardware"
+        },
+        "name": "Хозтовары",
+        "icon": "shop",
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "suggestion": true
+    },
     "shop/motorcycle/Yamaha": {
         "tags": {
             "name": "Yamaha",