diff --git a/data/presets/presets.json b/data/presets/presets.json
index 10b2c7aa6..5f3961ade 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -845,7 +845,7 @@
     "shop/candles": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "candles"}, "name": "Candle Shop"},
     "shop/car_parts": {"icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["auto"], "tags": {"shop": "car_parts"}, "name": "Car Parts Store"},
     "shop/car_repair": {"icon": "maki-car-repair", "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["auto", "garage", "service"], "tags": {"shop": "car_repair"}, "name": "Car Repair Shop"},
-    "shop/car": {"icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["auto"], "tags": {"shop": "car"}, "name": "Car Dealership"},
+    "shop/car": {"icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["auto"], "tags": {"shop": "car"}, "name": "Car Dealership"},
     "shop/carpet": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["rug"], "tags": {"shop": "carpet"}, "name": "Carpet Store"},
     "shop/charity": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "second_hand", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["thrift", "op shop", "nonprofit"], "tags": {"shop": "charity"}, "name": "Charity Store"},
     "shop/cheese": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "cheese"}, "name": "Cheese Store"},
@@ -900,7 +900,7 @@
     "shop/mobile_phone": {"icon": "maki-mobile-phone", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "mobile_phone"}, "name": "Mobile Phone Store"},
     "shop/money_lender": {"icon": "maki-bank", "fields": ["name", "operator", "address", "building_area", "opening_hours", "currency_multi"], "geometry": ["point", "area"], "tags": {"shop": "money_lender"}, "name": "Money Lender"},
     "shop/motorcycle_repair": {"icon": "fas-motorcycle", "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["auto", "bike", "garage", "motorcycle", "repair", "service"], "tags": {"shop": "motorcycle_repair"}, "name": "Motorcycle Repair Shop"},
-    "shop/motorcycle": {"icon": "fas-motorcycle", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["bike"], "tags": {"shop": "motorcycle"}, "name": "Motorcycle Dealership"},
+    "shop/motorcycle": {"icon": "fas-motorcycle", "fields": ["name", "brand", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["bike"], "tags": {"shop": "motorcycle"}, "name": "Motorcycle Dealership"},
     "shop/music": {"icon": "maki-music", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["CD", "vinyl"], "tags": {"shop": "music"}, "name": "Music Store"},
     "shop/musical_instrument": {"icon": "maki-music", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "terms": ["guitar"], "tags": {"shop": "musical_instrument"}, "name": "Musical Instrument Store"},
     "shop/newsagent": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "newsagent"}, "name": "Newspaper/Magazine Shop"},
@@ -968,7 +968,7 @@
     "tourism/information/guidepost": {"icon": "maki-information", "fields": ["name", "elevation", "operator", "ref"], "geometry": ["point", "vertex"], "terms": ["signpost"], "tags": {"tourism": "information", "information": "guidepost"}, "reference": {"key": "information", "value": "guidepost"}, "name": "Guidepost"},
     "tourism/information/map": {"icon": "maki-information", "fields": ["operator", "map_type", "map_size", "direction"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "map"}, "reference": {"key": "information", "value": "map"}, "name": "Map"},
     "tourism/information/office": {"icon": "maki-information", "fields": ["name", "operator", "address", "building_area"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information", "information": "office"}, "reference": {"key": "information", "value": "office"}, "name": "Tourist Information Office"},
-    "tourism/motel": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "smoking", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"tourism": "motel"}, "name": "Motel"},
+    "tourism/motel": {"icon": "maki-lodging", "fields": ["name", "brand", "operator", "address", "building_area", "smoking", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"tourism": "motel"}, "name": "Motel"},
     "tourism/museum": {"icon": "maki-museum", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "gallery", "foundation", "hall", "institution", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "museum"}, "name": "Museum"},
     "tourism/picnic_site": {"icon": "maki-picnic-site", "fields": ["name", "operator", "address", "access_simple", "capacity", "smoking"], "geometry": ["point", "vertex", "area"], "terms": ["camp"], "tags": {"tourism": "picnic_site"}, "name": "Picnic Site"},
     "tourism/theme_park": {"icon": "maki-amusement-park", "fields": ["name", "operator", "address", "opening_hours"], "geometry": ["point", "area"], "tags": {"tourism": "theme_park"}, "name": "Theme Park"},
@@ -2050,36 +2050,36 @@
     "shop/car_repair/Toyota": {"name": "Toyota", "icon": "maki-car-repair", "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car_repair", "brand:wikidata": "Q53268"}, "addTags": {"brand": "Toyota", "brand:wikidata": "Q53268", "brand:wikipedia": "en:Toyota", "name": "Toyota", "shop": "car_repair"}, "removeTags": {"brand": "Toyota", "brand:wikidata": "Q53268", "brand:wikipedia": "en:Toyota", "name": "Toyota", "shop": "car_repair"}, "matchScore": 2, "suggestion": true},
     "shop/car_repair/Valvoline": {"name": "Valvoline", "icon": "maki-car-repair", "fields": ["name", "operator", "address", "building_area", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car_repair", "brand:wikidata": "Q7912852"}, "addTags": {"brand": "Valvoline", "brand:wikidata": "Q7912852", "brand:wikipedia": "en:Valvoline Instant Oil Change", "name": "Valvoline", "shop": "car_repair"}, "removeTags": {"brand": "Valvoline", "brand:wikidata": "Q7912852", "brand:wikipedia": "en:Valvoline Instant Oil Change", "name": "Valvoline", "shop": "car_repair"}, "matchScore": 2, "suggestion": true},
     "shop/carpet/Carpetright": {"name": "Carpetright", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "carpet", "brand:wikidata": "Q5045782"}, "addTags": {"brand": "Carpetright", "brand:wikidata": "Q5045782", "brand:wikipedia": "en:Carpetright", "name": "Carpetright", "shop": "carpet"}, "removeTags": {"brand": "Carpetright", "brand:wikidata": "Q5045782", "brand:wikipedia": "en:Carpetright", "name": "Carpetright", "shop": "carpet"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Audi": {"name": "Audi", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q23317"}, "addTags": {"brand": "Audi", "brand:wikidata": "Q23317", "brand:wikipedia": "en:Audi", "name": "Audi", "shop": "car"}, "removeTags": {"brand": "Audi", "brand:wikidata": "Q23317", "brand:wikipedia": "en:Audi", "name": "Audi", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/BMW": {"name": "BMW", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q26678"}, "addTags": {"brand": "BMW", "brand:wikidata": "Q26678", "brand:wikipedia": "en:BMW", "name": "BMW", "shop": "car"}, "removeTags": {"brand": "BMW", "brand:wikidata": "Q26678", "brand:wikipedia": "en:BMW", "name": "BMW", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Chevrolet": {"name": "Chevrolet", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q29570"}, "addTags": {"brand": "Chevrolet", "brand:wikidata": "Q29570", "brand:wikipedia": "en:Chevrolet", "name": "Chevrolet", "shop": "car"}, "removeTags": {"brand": "Chevrolet", "brand:wikidata": "Q29570", "brand:wikipedia": "en:Chevrolet", "name": "Chevrolet", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Dacia": {"name": "Dacia", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q27460"}, "addTags": {"brand": "Dacia", "brand:wikidata": "Q27460", "brand:wikipedia": "en:Automobile Dacia", "name": "Dacia", "shop": "car"}, "removeTags": {"brand": "Dacia", "brand:wikidata": "Q27460", "brand:wikipedia": "en:Automobile Dacia", "name": "Dacia", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Fiat": {"name": "Fiat", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q27597"}, "addTags": {"brand": "Fiat", "brand:wikidata": "Q27597", "brand:wikipedia": "en:Fiat Automobiles", "name": "Fiat", "shop": "car"}, "removeTags": {"brand": "Fiat", "brand:wikidata": "Q27597", "brand:wikipedia": "en:Fiat Automobiles", "name": "Fiat", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Ford": {"name": "Ford", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q44294"}, "addTags": {"brand": "Ford", "brand:wikidata": "Q44294", "brand:wikipedia": "en:Ford Motor Company", "name": "Ford", "shop": "car"}, "removeTags": {"brand": "Ford", "brand:wikidata": "Q44294", "brand:wikipedia": "en:Ford Motor Company", "name": "Ford", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Honda": {"name": "Honda", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q9584"}, "addTags": {"brand": "Honda", "brand:wikidata": "Q9584", "brand:wikipedia": "en:Honda", "name": "Honda", "shop": "car"}, "removeTags": {"brand": "Honda", "brand:wikidata": "Q9584", "brand:wikipedia": "en:Honda", "name": "Honda", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Hyundai": {"name": "Hyundai", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q55931"}, "addTags": {"brand": "Hyundai", "brand:wikidata": "Q55931", "brand:wikipedia": "en:Hyundai Motor Company", "name": "Hyundai", "shop": "car"}, "removeTags": {"brand": "Hyundai", "brand:wikidata": "Q55931", "brand:wikipedia": "en:Hyundai Motor Company", "name": "Hyundai", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Isuzu": {"name": "Isuzu", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q29803"}, "addTags": {"brand": "Isuzu", "brand:wikidata": "Q29803", "brand:wikipedia": "en:Isuzu Motors", "name": "Isuzu", "shop": "car"}, "removeTags": {"brand": "Isuzu", "brand:wikidata": "Q29803", "brand:wikipedia": "en:Isuzu Motors", "name": "Isuzu", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Kia": {"name": "Kia", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q35349"}, "addTags": {"brand": "Kia", "brand:wikidata": "Q35349", "brand:wikipedia": "en:Kia Motors", "name": "Kia", "shop": "car"}, "removeTags": {"brand": "Kia", "brand:wikidata": "Q35349", "brand:wikipedia": "en:Kia Motors", "name": "Kia", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Land Rover": {"name": "Land Rover", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q35907"}, "addTags": {"brand": "Land Rover", "brand:wikidata": "Q35907", "brand:wikipedia": "en:Land Rover", "name": "Land Rover", "shop": "car"}, "removeTags": {"brand": "Land Rover", "brand:wikidata": "Q35907", "brand:wikipedia": "en:Land Rover", "name": "Land Rover", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Lexus": {"name": "Lexus", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q35919"}, "addTags": {"brand": "Lexus", "brand:wikidata": "Q35919", "brand:wikipedia": "en:Lexus", "name": "Lexus", "shop": "car"}, "removeTags": {"brand": "Lexus", "brand:wikidata": "Q35919", "brand:wikipedia": "en:Lexus", "name": "Lexus", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Mazda": {"name": "Mazda", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q35996"}, "addTags": {"brand": "Mazda", "brand:wikidata": "Q35996", "brand:wikipedia": "en:Mazda", "name": "Mazda", "shop": "car"}, "removeTags": {"brand": "Mazda", "brand:wikidata": "Q35996", "brand:wikipedia": "en:Mazda", "name": "Mazda", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Mercedes-Benz": {"name": "Mercedes-Benz", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q36008"}, "addTags": {"brand": "Mercedes-Benz", "brand:wikidata": "Q36008", "brand:wikipedia": "en:Mercedes-Benz", "name": "Mercedes-Benz", "shop": "car"}, "removeTags": {"brand": "Mercedes-Benz", "brand:wikidata": "Q36008", "brand:wikipedia": "en:Mercedes-Benz", "name": "Mercedes-Benz", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Mitsubishi": {"name": "Mitsubishi", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q36033"}, "addTags": {"brand": "Mitsubishi", "brand:wikidata": "Q36033", "brand:wikipedia": "en:Mitsubishi Motors", "name": "Mitsubishi", "shop": "car"}, "removeTags": {"brand": "Mitsubishi", "brand:wikidata": "Q36033", "brand:wikipedia": "en:Mitsubishi Motors", "name": "Mitsubishi", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Netz": {"name": "Netz", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q11325416"}, "addTags": {"brand": "Netz", "brand:wikidata": "Q11325416", "brand:wikipedia": "ja:ネッツ店", "name": "Netz", "shop": "car"}, "removeTags": {"brand": "Netz", "brand:wikidata": "Q11325416", "brand:wikipedia": "ja:ネッツ店", "name": "Netz", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Nissan": {"name": "Nissan", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q20165"}, "addTags": {"brand": "Nissan", "brand:wikidata": "Q20165", "brand:wikipedia": "ja:日産自動車", "name": "Nissan", "shop": "car"}, "removeTags": {"brand": "Nissan", "brand:wikidata": "Q20165", "brand:wikipedia": "ja:日産自動車", "name": "Nissan", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Opel": {"name": "Opel", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q40966"}, "addTags": {"brand": "Opel", "brand:wikidata": "Q40966", "brand:wikipedia": "en:Opel", "name": "Opel", "shop": "car"}, "removeTags": {"brand": "Opel", "brand:wikidata": "Q40966", "brand:wikipedia": "en:Opel", "name": "Opel", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Peugeot": {"name": "Peugeot", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q6742"}, "addTags": {"brand": "Peugeot", "brand:wikidata": "Q6742", "brand:wikipedia": "en:Peugeot", "name": "Peugeot", "shop": "car"}, "removeTags": {"brand": "Peugeot", "brand:wikidata": "Q6742", "brand:wikipedia": "en:Peugeot", "name": "Peugeot", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Porsche": {"name": "Porsche", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q40993"}, "addTags": {"brand": "Porsche", "brand:wikidata": "Q40993", "brand:wikipedia": "en:Porsche", "name": "Porsche", "shop": "car"}, "removeTags": {"brand": "Porsche", "brand:wikidata": "Q40993", "brand:wikipedia": "en:Porsche", "name": "Porsche", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Renault": {"name": "Renault", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q6686"}, "addTags": {"brand": "Renault", "brand:wikidata": "Q6686", "brand:wikipedia": "en:Renault", "name": "Renault", "shop": "car"}, "removeTags": {"brand": "Renault", "brand:wikidata": "Q6686", "brand:wikipedia": "en:Renault", "name": "Renault", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Seat": {"name": "Seat", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q188217"}, "addTags": {"brand": "Seat", "brand:wikidata": "Q188217", "brand:wikipedia": "en:SEAT", "name": "Seat", "shop": "car"}, "removeTags": {"brand": "Seat", "brand:wikidata": "Q188217", "brand:wikipedia": "en:SEAT", "name": "Seat", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Skoda": {"name": "Skoda", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q29637"}, "addTags": {"brand": "Skoda", "brand:wikidata": "Q29637", "brand:wikipedia": "en:Škoda Auto", "name": "Skoda", "shop": "car"}, "removeTags": {"brand": "Skoda", "brand:wikidata": "Q29637", "brand:wikipedia": "en:Škoda Auto", "name": "Skoda", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Subaru": {"name": "Subaru", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q172741"}, "addTags": {"brand": "Subaru", "brand:wikidata": "Q172741", "brand:wikipedia": "en:Subaru", "name": "Subaru", "shop": "car"}, "removeTags": {"brand": "Subaru", "brand:wikidata": "Q172741", "brand:wikipedia": "en:Subaru", "name": "Subaru", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Suzuki": {"name": "Suzuki", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q181642"}, "addTags": {"brand": "Suzuki", "brand:wikidata": "Q181642", "brand:wikipedia": "en:Suzuki", "name": "Suzuki", "shop": "car"}, "removeTags": {"brand": "Suzuki", "brand:wikidata": "Q181642", "brand:wikipedia": "en:Suzuki", "name": "Suzuki", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Tesla": {"name": "Tesla", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q478214"}, "addTags": {"brand": "Tesla", "brand:wikidata": "Q478214", "brand:wikipedia": "en:Tesla, Inc.", "name": "Tesla", "shop": "car"}, "removeTags": {"brand": "Tesla", "brand:wikidata": "Q478214", "brand:wikipedia": "en:Tesla, Inc.", "name": "Tesla", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Toyota": {"name": "Toyota", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q53268"}, "addTags": {"brand": "Toyota", "brand:wikidata": "Q53268", "brand:wikipedia": "en:Toyota", "name": "Toyota", "shop": "car"}, "removeTags": {"brand": "Toyota", "brand:wikidata": "Q53268", "brand:wikipedia": "en:Toyota", "name": "Toyota", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Volkswagen": {"name": "Volkswagen", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q246"}, "addTags": {"brand": "Volkswagen", "brand:wikidata": "Q246", "brand:wikipedia": "en:Volkswagen", "name": "Volkswagen", "shop": "car"}, "removeTags": {"brand": "Volkswagen", "brand:wikidata": "Q246", "brand:wikipedia": "en:Volkswagen", "name": "Volkswagen", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/Volvo": {"name": "Volvo", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q215293"}, "addTags": {"brand": "Volvo", "brand:wikidata": "Q215293", "brand:wikipedia": "en:Volvo Cars", "name": "Volvo", "shop": "car"}, "removeTags": {"brand": "Volvo", "brand:wikidata": "Q215293", "brand:wikipedia": "en:Volvo Cars", "name": "Volvo", "shop": "car"}, "matchScore": 2, "suggestion": true},
-    "shop/car/ホンダ": {"name": "ホンダ", "icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "brand", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q9584"}, "addTags": {"brand": "ホンダ", "brand:en": "Honda", "brand:wikidata": "Q9584", "brand:wikipedia": "ja:本田技研工業", "name": "ホンダ", "name:en": "Honda", "shop": "car"}, "removeTags": {"brand": "ホンダ", "brand:en": "Honda", "brand:wikidata": "Q9584", "brand:wikipedia": "ja:本田技研工業", "name": "ホンダ", "name:en": "Honda", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Audi": {"name": "Audi", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q23317"}, "addTags": {"brand": "Audi", "brand:wikidata": "Q23317", "brand:wikipedia": "en:Audi", "name": "Audi", "shop": "car"}, "removeTags": {"brand": "Audi", "brand:wikidata": "Q23317", "brand:wikipedia": "en:Audi", "name": "Audi", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/BMW": {"name": "BMW", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q26678"}, "addTags": {"brand": "BMW", "brand:wikidata": "Q26678", "brand:wikipedia": "en:BMW", "name": "BMW", "shop": "car"}, "removeTags": {"brand": "BMW", "brand:wikidata": "Q26678", "brand:wikipedia": "en:BMW", "name": "BMW", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Chevrolet": {"name": "Chevrolet", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q29570"}, "addTags": {"brand": "Chevrolet", "brand:wikidata": "Q29570", "brand:wikipedia": "en:Chevrolet", "name": "Chevrolet", "shop": "car"}, "removeTags": {"brand": "Chevrolet", "brand:wikidata": "Q29570", "brand:wikipedia": "en:Chevrolet", "name": "Chevrolet", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Dacia": {"name": "Dacia", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q27460"}, "addTags": {"brand": "Dacia", "brand:wikidata": "Q27460", "brand:wikipedia": "en:Automobile Dacia", "name": "Dacia", "shop": "car"}, "removeTags": {"brand": "Dacia", "brand:wikidata": "Q27460", "brand:wikipedia": "en:Automobile Dacia", "name": "Dacia", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Fiat": {"name": "Fiat", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q27597"}, "addTags": {"brand": "Fiat", "brand:wikidata": "Q27597", "brand:wikipedia": "en:Fiat Automobiles", "name": "Fiat", "shop": "car"}, "removeTags": {"brand": "Fiat", "brand:wikidata": "Q27597", "brand:wikipedia": "en:Fiat Automobiles", "name": "Fiat", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Ford": {"name": "Ford", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q44294"}, "addTags": {"brand": "Ford", "brand:wikidata": "Q44294", "brand:wikipedia": "en:Ford Motor Company", "name": "Ford", "shop": "car"}, "removeTags": {"brand": "Ford", "brand:wikidata": "Q44294", "brand:wikipedia": "en:Ford Motor Company", "name": "Ford", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Honda": {"name": "Honda", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q9584"}, "addTags": {"brand": "Honda", "brand:wikidata": "Q9584", "brand:wikipedia": "en:Honda", "name": "Honda", "shop": "car"}, "removeTags": {"brand": "Honda", "brand:wikidata": "Q9584", "brand:wikipedia": "en:Honda", "name": "Honda", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Hyundai": {"name": "Hyundai", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q55931"}, "addTags": {"brand": "Hyundai", "brand:wikidata": "Q55931", "brand:wikipedia": "en:Hyundai Motor Company", "name": "Hyundai", "shop": "car"}, "removeTags": {"brand": "Hyundai", "brand:wikidata": "Q55931", "brand:wikipedia": "en:Hyundai Motor Company", "name": "Hyundai", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Isuzu": {"name": "Isuzu", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q29803"}, "addTags": {"brand": "Isuzu", "brand:wikidata": "Q29803", "brand:wikipedia": "en:Isuzu Motors", "name": "Isuzu", "shop": "car"}, "removeTags": {"brand": "Isuzu", "brand:wikidata": "Q29803", "brand:wikipedia": "en:Isuzu Motors", "name": "Isuzu", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Kia": {"name": "Kia", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q35349"}, "addTags": {"brand": "Kia", "brand:wikidata": "Q35349", "brand:wikipedia": "en:Kia Motors", "name": "Kia", "shop": "car"}, "removeTags": {"brand": "Kia", "brand:wikidata": "Q35349", "brand:wikipedia": "en:Kia Motors", "name": "Kia", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Land Rover": {"name": "Land Rover", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q35907"}, "addTags": {"brand": "Land Rover", "brand:wikidata": "Q35907", "brand:wikipedia": "en:Land Rover", "name": "Land Rover", "shop": "car"}, "removeTags": {"brand": "Land Rover", "brand:wikidata": "Q35907", "brand:wikipedia": "en:Land Rover", "name": "Land Rover", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Lexus": {"name": "Lexus", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q35919"}, "addTags": {"brand": "Lexus", "brand:wikidata": "Q35919", "brand:wikipedia": "en:Lexus", "name": "Lexus", "shop": "car"}, "removeTags": {"brand": "Lexus", "brand:wikidata": "Q35919", "brand:wikipedia": "en:Lexus", "name": "Lexus", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Mazda": {"name": "Mazda", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q35996"}, "addTags": {"brand": "Mazda", "brand:wikidata": "Q35996", "brand:wikipedia": "en:Mazda", "name": "Mazda", "shop": "car"}, "removeTags": {"brand": "Mazda", "brand:wikidata": "Q35996", "brand:wikipedia": "en:Mazda", "name": "Mazda", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Mercedes-Benz": {"name": "Mercedes-Benz", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q36008"}, "addTags": {"brand": "Mercedes-Benz", "brand:wikidata": "Q36008", "brand:wikipedia": "en:Mercedes-Benz", "name": "Mercedes-Benz", "shop": "car"}, "removeTags": {"brand": "Mercedes-Benz", "brand:wikidata": "Q36008", "brand:wikipedia": "en:Mercedes-Benz", "name": "Mercedes-Benz", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Mitsubishi": {"name": "Mitsubishi", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q36033"}, "addTags": {"brand": "Mitsubishi", "brand:wikidata": "Q36033", "brand:wikipedia": "en:Mitsubishi Motors", "name": "Mitsubishi", "shop": "car"}, "removeTags": {"brand": "Mitsubishi", "brand:wikidata": "Q36033", "brand:wikipedia": "en:Mitsubishi Motors", "name": "Mitsubishi", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Netz": {"name": "Netz", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q11325416"}, "addTags": {"brand": "Netz", "brand:wikidata": "Q11325416", "brand:wikipedia": "ja:ネッツ店", "name": "Netz", "shop": "car"}, "removeTags": {"brand": "Netz", "brand:wikidata": "Q11325416", "brand:wikipedia": "ja:ネッツ店", "name": "Netz", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Nissan": {"name": "Nissan", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q20165"}, "addTags": {"brand": "Nissan", "brand:wikidata": "Q20165", "brand:wikipedia": "ja:日産自動車", "name": "Nissan", "shop": "car"}, "removeTags": {"brand": "Nissan", "brand:wikidata": "Q20165", "brand:wikipedia": "ja:日産自動車", "name": "Nissan", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Opel": {"name": "Opel", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q40966"}, "addTags": {"brand": "Opel", "brand:wikidata": "Q40966", "brand:wikipedia": "en:Opel", "name": "Opel", "shop": "car"}, "removeTags": {"brand": "Opel", "brand:wikidata": "Q40966", "brand:wikipedia": "en:Opel", "name": "Opel", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Peugeot": {"name": "Peugeot", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q6742"}, "addTags": {"brand": "Peugeot", "brand:wikidata": "Q6742", "brand:wikipedia": "en:Peugeot", "name": "Peugeot", "shop": "car"}, "removeTags": {"brand": "Peugeot", "brand:wikidata": "Q6742", "brand:wikipedia": "en:Peugeot", "name": "Peugeot", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Porsche": {"name": "Porsche", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q40993"}, "addTags": {"brand": "Porsche", "brand:wikidata": "Q40993", "brand:wikipedia": "en:Porsche", "name": "Porsche", "shop": "car"}, "removeTags": {"brand": "Porsche", "brand:wikidata": "Q40993", "brand:wikipedia": "en:Porsche", "name": "Porsche", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Renault": {"name": "Renault", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q6686"}, "addTags": {"brand": "Renault", "brand:wikidata": "Q6686", "brand:wikipedia": "en:Renault", "name": "Renault", "shop": "car"}, "removeTags": {"brand": "Renault", "brand:wikidata": "Q6686", "brand:wikipedia": "en:Renault", "name": "Renault", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Seat": {"name": "Seat", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q188217"}, "addTags": {"brand": "Seat", "brand:wikidata": "Q188217", "brand:wikipedia": "en:SEAT", "name": "Seat", "shop": "car"}, "removeTags": {"brand": "Seat", "brand:wikidata": "Q188217", "brand:wikipedia": "en:SEAT", "name": "Seat", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Skoda": {"name": "Skoda", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q29637"}, "addTags": {"brand": "Skoda", "brand:wikidata": "Q29637", "brand:wikipedia": "en:Škoda Auto", "name": "Skoda", "shop": "car"}, "removeTags": {"brand": "Skoda", "brand:wikidata": "Q29637", "brand:wikipedia": "en:Škoda Auto", "name": "Skoda", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Subaru": {"name": "Subaru", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q172741"}, "addTags": {"brand": "Subaru", "brand:wikidata": "Q172741", "brand:wikipedia": "en:Subaru", "name": "Subaru", "shop": "car"}, "removeTags": {"brand": "Subaru", "brand:wikidata": "Q172741", "brand:wikipedia": "en:Subaru", "name": "Subaru", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Suzuki": {"name": "Suzuki", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q181642"}, "addTags": {"brand": "Suzuki", "brand:wikidata": "Q181642", "brand:wikipedia": "en:Suzuki", "name": "Suzuki", "shop": "car"}, "removeTags": {"brand": "Suzuki", "brand:wikidata": "Q181642", "brand:wikipedia": "en:Suzuki", "name": "Suzuki", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Tesla": {"name": "Tesla", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q478214"}, "addTags": {"brand": "Tesla", "brand:wikidata": "Q478214", "brand:wikipedia": "en:Tesla, Inc.", "name": "Tesla", "shop": "car"}, "removeTags": {"brand": "Tesla", "brand:wikidata": "Q478214", "brand:wikipedia": "en:Tesla, Inc.", "name": "Tesla", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Toyota": {"name": "Toyota", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q53268"}, "addTags": {"brand": "Toyota", "brand:wikidata": "Q53268", "brand:wikipedia": "en:Toyota", "name": "Toyota", "shop": "car"}, "removeTags": {"brand": "Toyota", "brand:wikidata": "Q53268", "brand:wikipedia": "en:Toyota", "name": "Toyota", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Volkswagen": {"name": "Volkswagen", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q246"}, "addTags": {"brand": "Volkswagen", "brand:wikidata": "Q246", "brand:wikipedia": "en:Volkswagen", "name": "Volkswagen", "shop": "car"}, "removeTags": {"brand": "Volkswagen", "brand:wikidata": "Q246", "brand:wikipedia": "en:Volkswagen", "name": "Volkswagen", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/Volvo": {"name": "Volvo", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q215293"}, "addTags": {"brand": "Volvo", "brand:wikidata": "Q215293", "brand:wikipedia": "en:Volvo Cars", "name": "Volvo", "shop": "car"}, "removeTags": {"brand": "Volvo", "brand:wikidata": "Q215293", "brand:wikipedia": "en:Volvo Cars", "name": "Volvo", "shop": "car"}, "matchScore": 2, "suggestion": true},
+    "shop/car/ホンダ": {"name": "ホンダ", "icon": "maki-car", "fields": ["name", "brand", "operator", "address", "building_area", "second_hand", "service/vehicle", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "car", "brand:wikidata": "Q9584"}, "addTags": {"brand": "ホンダ", "brand:en": "Honda", "brand:wikidata": "Q9584", "brand:wikipedia": "ja:本田技研工業", "name": "ホンダ", "name:en": "Honda", "shop": "car"}, "removeTags": {"brand": "ホンダ", "brand:en": "Honda", "brand:wikidata": "Q9584", "brand:wikipedia": "ja:本田技研工業", "name": "ホンダ", "name:en": "Honda", "shop": "car"}, "matchScore": 2, "suggestion": true},
     "shop/charity/Age UK": {"name": "Age UK", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "second_hand", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "charity", "brand:wikidata": "Q4691850"}, "addTags": {"brand": "Age UK", "brand:wikidata": "Q4691850", "brand:wikipedia": "en:Age UK", "name": "Age UK", "shop": "charity"}, "removeTags": {"brand": "Age UK", "brand:wikidata": "Q4691850", "brand:wikipedia": "en:Age UK", "name": "Age UK", "shop": "charity"}, "matchScore": 2, "suggestion": true},
     "shop/charity/Barnardo's": {"name": "Barnardo's", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "second_hand", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "charity", "brand:wikidata": "Q2884670"}, "addTags": {"brand": "Barnardo's", "brand:wikidata": "Q2884670", "brand:wikipedia": "en:Barnardo's", "name": "Barnardo's", "shop": "charity"}, "removeTags": {"brand": "Barnardo's", "brand:wikidata": "Q2884670", "brand:wikipedia": "en:Barnardo's", "name": "Barnardo's", "shop": "charity"}, "matchScore": 2, "suggestion": true},
     "shop/charity/British Heart Foundation": {"name": "British Heart Foundation", "icon": "maki-shop", "fields": ["name", "operator", "address", "building_area", "second_hand", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "charity", "brand:wikidata": "Q4970039"}, "addTags": {"brand": "British Heart Foundation", "brand:wikidata": "Q4970039", "brand:wikipedia": "en:British Heart Foundation", "name": "British Heart Foundation", "shop": "charity"}, "removeTags": {"brand": "British Heart Foundation", "brand:wikidata": "Q4970039", "brand:wikipedia": "en:British Heart Foundation", "name": "British Heart Foundation", "shop": "charity"}, "matchScore": 2, "suggestion": true},
@@ -2493,12 +2493,12 @@
     "shop/mobile_phone/ソフトバンク": {"name": "ソフトバンク", "icon": "maki-mobile-phone", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "mobile_phone", "brand:wikidata": "Q7553832"}, "addTags": {"brand": "ソフトバンク", "brand:en": "SoftBank Telecom", "brand:wikidata": "Q7553832", "brand:wikipedia": "en:SoftBank Telecom", "name": "ソフトバンク", "name:en": "SoftBank Telecom", "shop": "mobile_phone"}, "removeTags": {"brand": "ソフトバンク", "brand:en": "SoftBank Telecom", "brand:wikidata": "Q7553832", "brand:wikipedia": "en:SoftBank Telecom", "name": "ソフトバンク", "name:en": "SoftBank Telecom", "shop": "mobile_phone"}, "matchScore": 2, "suggestion": true},
     "shop/mobile_phone/ソフトバンクショップ": {"name": "ソフトバンクショップ", "icon": "maki-mobile-phone", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "mobile_phone", "brand:wikidata": "Q11315281"}, "addTags": {"brand": "ソフトバンクショップ", "brand:en": "SoftBankShop", "brand:wikidata": "Q11315281", "brand:wikipedia": "ja:ソフトバンクショップ", "name": "ソフトバンクショップ", "name:en": "SoftBankShop", "shop": "mobile_phone"}, "removeTags": {"brand": "ソフトバンクショップ", "brand:en": "SoftBankShop", "brand:wikidata": "Q11315281", "brand:wikipedia": "ja:ソフトバンクショップ", "name": "ソフトバンクショップ", "name:en": "SoftBankShop", "shop": "mobile_phone"}, "matchScore": 2, "suggestion": true},
     "shop/money_lender/Money Mart": {"name": "Money Mart", "icon": "maki-bank", "fields": ["name", "operator", "address", "building_area", "opening_hours", "currency_multi"], "geometry": ["point", "area"], "tags": {"shop": "money_lender", "brand:wikidata": "Q6899166"}, "addTags": {"brand": "Money Mart", "brand:wikidata": "Q6899166", "brand:wikipedia": "en:Money Mart", "name": "Money Mart", "shop": "money_lender"}, "removeTags": {"brand": "Money Mart", "brand:wikidata": "Q6899166", "brand:wikipedia": "en:Money Mart", "name": "Money Mart", "shop": "money_lender"}, "matchScore": 2, "suggestion": true},
-    "shop/motorcycle/Harley Davidson": {"name": "Harley Davidson", "icon": "fas-motorcycle", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "motorcycle", "brand:wikidata": "Q192814"}, "addTags": {"brand": "Harley Davidson", "brand:wikidata": "Q192814", "brand:wikipedia": "en:Harley-Davidson", "name": "Harley Davidson", "shop": "motorcycle"}, "removeTags": {"brand": "Harley Davidson", "brand:wikidata": "Q192814", "brand:wikipedia": "en:Harley-Davidson", "name": "Harley Davidson", "shop": "motorcycle"}, "matchScore": 2, "suggestion": true},
-    "shop/motorcycle/Honda": {"name": "Honda", "icon": "fas-motorcycle", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "motorcycle", "brand:wikidata": "Q9584"}, "addTags": {"brand": "Honda", "brand:wikidata": "Q9584", "brand:wikipedia": "en:Honda", "name": "Honda", "shop": "motorcycle"}, "removeTags": {"brand": "Honda", "brand:wikidata": "Q9584", "brand:wikipedia": "en:Honda", "name": "Honda", "shop": "motorcycle"}, "matchScore": 2, "suggestion": true},
-    "shop/motorcycle/Kawasaki": {"name": "Kawasaki", "icon": "fas-motorcycle", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "motorcycle", "brand:wikidata": "Q6379855"}, "addTags": {"brand": "Kawasaki", "brand:wikidata": "Q6379855", "brand:wikipedia": "en:Kawasaki motorcycles", "name": "Kawasaki", "shop": "motorcycle"}, "removeTags": {"brand": "Kawasaki", "brand:wikidata": "Q6379855", "brand:wikipedia": "en:Kawasaki motorcycles", "name": "Kawasaki", "shop": "motorcycle"}, "matchScore": 2, "suggestion": true},
-    "shop/motorcycle/Motortrade": {"name": "Motortrade", "icon": "fas-motorcycle", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "motorcycle", "brand:wikidata": "Q48803162"}, "addTags": {"brand": "Motortrade", "brand:wikidata": "Q48803162", "brand:wikipedia": "en:Motortrade", "name": "Motortrade", "shop": "motorcycle"}, "removeTags": {"brand": "Motortrade", "brand:wikidata": "Q48803162", "brand:wikipedia": "en:Motortrade", "name": "Motortrade", "shop": "motorcycle"}, "matchScore": 2, "suggestion": true},
-    "shop/motorcycle/Suzuki": {"name": "Suzuki", "icon": "fas-motorcycle", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "motorcycle", "brand:wikidata": "Q181642"}, "addTags": {"brand": "Suzuki", "brand:wikidata": "Q181642", "brand:wikipedia": "en:Suzuki", "name": "Suzuki", "shop": "motorcycle"}, "removeTags": {"brand": "Suzuki", "brand:wikidata": "Q181642", "brand:wikipedia": "en:Suzuki", "name": "Suzuki", "shop": "motorcycle"}, "matchScore": 2, "suggestion": true},
-    "shop/motorcycle/Yamaha": {"name": "Yamaha", "icon": "fas-motorcycle", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "motorcycle", "brand:wikidata": "Q158888"}, "addTags": {"brand": "Yamaha", "brand:wikidata": "Q158888", "brand:wikipedia": "en:Yamaha Motor Company", "name": "Yamaha", "shop": "motorcycle"}, "removeTags": {"brand": "Yamaha", "brand:wikidata": "Q158888", "brand:wikipedia": "en:Yamaha Motor Company", "name": "Yamaha", "shop": "motorcycle"}, "matchScore": 2, "suggestion": true},
+    "shop/motorcycle/Harley Davidson": {"name": "Harley Davidson", "icon": "fas-motorcycle", "fields": ["name", "brand", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "motorcycle", "brand:wikidata": "Q192814"}, "addTags": {"brand": "Harley Davidson", "brand:wikidata": "Q192814", "brand:wikipedia": "en:Harley-Davidson", "name": "Harley Davidson", "shop": "motorcycle"}, "removeTags": {"brand": "Harley Davidson", "brand:wikidata": "Q192814", "brand:wikipedia": "en:Harley-Davidson", "name": "Harley Davidson", "shop": "motorcycle"}, "matchScore": 2, "suggestion": true},
+    "shop/motorcycle/Honda": {"name": "Honda", "icon": "fas-motorcycle", "fields": ["name", "brand", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "motorcycle", "brand:wikidata": "Q9584"}, "addTags": {"brand": "Honda", "brand:wikidata": "Q9584", "brand:wikipedia": "en:Honda", "name": "Honda", "shop": "motorcycle"}, "removeTags": {"brand": "Honda", "brand:wikidata": "Q9584", "brand:wikipedia": "en:Honda", "name": "Honda", "shop": "motorcycle"}, "matchScore": 2, "suggestion": true},
+    "shop/motorcycle/Kawasaki": {"name": "Kawasaki", "icon": "fas-motorcycle", "fields": ["name", "brand", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "motorcycle", "brand:wikidata": "Q6379855"}, "addTags": {"brand": "Kawasaki", "brand:wikidata": "Q6379855", "brand:wikipedia": "en:Kawasaki motorcycles", "name": "Kawasaki", "shop": "motorcycle"}, "removeTags": {"brand": "Kawasaki", "brand:wikidata": "Q6379855", "brand:wikipedia": "en:Kawasaki motorcycles", "name": "Kawasaki", "shop": "motorcycle"}, "matchScore": 2, "suggestion": true},
+    "shop/motorcycle/Motortrade": {"name": "Motortrade", "icon": "fas-motorcycle", "fields": ["name", "brand", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "motorcycle", "brand:wikidata": "Q48803162"}, "addTags": {"brand": "Motortrade", "brand:wikidata": "Q48803162", "brand:wikipedia": "en:Motortrade", "name": "Motortrade", "shop": "motorcycle"}, "removeTags": {"brand": "Motortrade", "brand:wikidata": "Q48803162", "brand:wikipedia": "en:Motortrade", "name": "Motortrade", "shop": "motorcycle"}, "matchScore": 2, "suggestion": true},
+    "shop/motorcycle/Suzuki": {"name": "Suzuki", "icon": "fas-motorcycle", "fields": ["name", "brand", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "motorcycle", "brand:wikidata": "Q181642"}, "addTags": {"brand": "Suzuki", "brand:wikidata": "Q181642", "brand:wikipedia": "en:Suzuki", "name": "Suzuki", "shop": "motorcycle"}, "removeTags": {"brand": "Suzuki", "brand:wikidata": "Q181642", "brand:wikipedia": "en:Suzuki", "name": "Suzuki", "shop": "motorcycle"}, "matchScore": 2, "suggestion": true},
+    "shop/motorcycle/Yamaha": {"name": "Yamaha", "icon": "fas-motorcycle", "fields": ["name", "brand", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "motorcycle", "brand:wikidata": "Q158888"}, "addTags": {"brand": "Yamaha", "brand:wikidata": "Q158888", "brand:wikipedia": "en:Yamaha Motor Company", "name": "Yamaha", "shop": "motorcycle"}, "removeTags": {"brand": "Yamaha", "brand:wikidata": "Q158888", "brand:wikipedia": "en:Yamaha Motor Company", "name": "Yamaha", "shop": "motorcycle"}, "matchScore": 2, "suggestion": true},
     "shop/musical_instrument/Guitar Center": {"name": "Guitar Center", "icon": "maki-music", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "musical_instrument", "brand:wikidata": "Q3622794"}, "addTags": {"brand": "Guitar Center", "brand:wikidata": "Q3622794", "brand:wikipedia": "en:Guitar Center", "name": "Guitar Center", "shop": "musical_instrument"}, "removeTags": {"brand": "Guitar Center", "brand:wikidata": "Q3622794", "brand:wikipedia": "en:Guitar Center", "name": "Guitar Center", "shop": "musical_instrument"}, "matchScore": 2, "suggestion": true},
     "shop/music/HMV": {"name": "HMV", "icon": "maki-music", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "music", "brand:wikidata": "Q10854572"}, "addTags": {"brand": "HMV", "brand:wikidata": "Q10854572", "brand:wikipedia": "en:HMV", "name": "HMV", "shop": "music"}, "removeTags": {"brand": "HMV", "brand:wikidata": "Q10854572", "brand:wikipedia": "en:HMV", "name": "HMV", "shop": "music"}, "matchScore": 2, "suggestion": true},
     "shop/music/TSUTAYA": {"name": "TSUTAYA", "icon": "maki-music", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi"], "geometry": ["point", "area"], "tags": {"shop": "music", "brand:wikidata": "Q5193457"}, "addTags": {"brand": "TSUTAYA", "brand:wikidata": "Q5193457", "brand:wikipedia": "ja:カルチュア・コンビニエンス・クラブ", "name": "TSUTAYA", "shop": "music"}, "removeTags": {"brand": "TSUTAYA", "brand:wikidata": "Q5193457", "brand:wikipedia": "ja:カルチュア・コンビニエンス・クラブ", "name": "TSUTAYA", "shop": "music"}, "matchScore": 2, "suggestion": true},
@@ -3004,9 +3004,9 @@
     "tourism/hotel/Staybridge Suites": {"name": "Staybridge Suites", "icon": "maki-lodging", "fields": ["name", "brand", "operator", "address", "building_area", "smoking", "stars", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"tourism": "hotel", "brand:wikidata": "Q7605116"}, "addTags": {"brand": "Staybridge Suites", "brand:wikidata": "Q7605116", "brand:wikipedia": "en:Staybridge Suites", "name": "Staybridge Suites", "tourism": "hotel"}, "removeTags": {"brand": "Staybridge Suites", "brand:wikidata": "Q7605116", "brand:wikipedia": "en:Staybridge Suites", "name": "Staybridge Suites", "tourism": "hotel"}, "matchScore": 2, "suggestion": true},
     "tourism/hotel/Travelodge": {"name": "Travelodge", "icon": "maki-lodging", "fields": ["name", "brand", "operator", "address", "building_area", "smoking", "stars", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"tourism": "hotel", "brand:wikidata": "Q7836087"}, "addTags": {"brand": "Travelodge", "brand:wikidata": "Q7836087", "brand:wikipedia": "en:Travelodge", "name": "Travelodge", "tourism": "hotel"}, "removeTags": {"brand": "Travelodge", "brand:wikidata": "Q7836087", "brand:wikipedia": "en:Travelodge", "name": "Travelodge", "tourism": "hotel"}, "matchScore": 2, "suggestion": true},
     "tourism/hotel/東横イン": {"name": "東横イン", "icon": "maki-lodging", "fields": ["name", "brand", "operator", "address", "building_area", "smoking", "stars", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"tourism": "hotel", "brand:wikidata": "Q1320541"}, "addTags": {"brand": "東横イン", "brand:en": "Toyoko Inn", "brand:wikidata": "Q1320541", "brand:wikipedia": "en:Toyoko Inn", "name": "東横イン", "name:en": "Toyoko Inn", "tourism": "hotel"}, "removeTags": {"brand": "東横イン", "brand:en": "Toyoko Inn", "brand:wikidata": "Q1320541", "brand:wikipedia": "en:Toyoko Inn", "name": "東横イン", "name:en": "Toyoko Inn", "tourism": "hotel"}, "matchScore": 2, "suggestion": true},
-    "tourism/motel/Econo Lodge": {"name": "Econo Lodge", "icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "smoking", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"tourism": "motel", "brand:wikidata": "Q5333330"}, "addTags": {"brand": "Econo Lodge", "brand:wikidata": "Q5333330", "brand:wikipedia": "en:Econo Lodge", "name": "Econo Lodge", "tourism": "motel"}, "removeTags": {"brand": "Econo Lodge", "brand:wikidata": "Q5333330", "brand:wikipedia": "en:Econo Lodge", "name": "Econo Lodge", "tourism": "motel"}, "matchScore": 2, "suggestion": true},
-    "tourism/motel/Motel 6": {"name": "Motel 6", "icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "smoking", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"tourism": "motel", "brand:wikidata": "Q2188884"}, "addTags": {"brand": "Motel 6", "brand:wikidata": "Q2188884", "brand:wikipedia": "en:Motel 6", "name": "Motel 6", "tourism": "motel"}, "removeTags": {"brand": "Motel 6", "brand:wikidata": "Q2188884", "brand:wikipedia": "en:Motel 6", "name": "Motel 6", "tourism": "motel"}, "matchScore": 2, "suggestion": true},
-    "tourism/motel/Rodeway Inn": {"name": "Rodeway Inn", "icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "smoking", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"tourism": "motel", "brand:wikidata": "Q7356709"}, "addTags": {"brand": "Rodeway Inn", "brand:wikidata": "Q7356709", "brand:wikipedia": "en:Rodeway Inn", "name": "Rodeway Inn", "tourism": "motel"}, "removeTags": {"brand": "Rodeway Inn", "brand:wikidata": "Q7356709", "brand:wikipedia": "en:Rodeway Inn", "name": "Rodeway Inn", "tourism": "motel"}, "matchScore": 2, "suggestion": true},
-    "tourism/motel/Super 8": {"name": "Super 8", "icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "smoking", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"tourism": "motel", "brand:wikidata": "Q5364003"}, "addTags": {"brand": "Super 8", "brand:wikidata": "Q5364003", "brand:wikipedia": "en:Super 8 Motels", "name": "Super 8", "tourism": "motel"}, "removeTags": {"brand": "Super 8", "brand:wikidata": "Q5364003", "brand:wikipedia": "en:Super 8 Motels", "name": "Super 8", "tourism": "motel"}, "matchScore": 2, "suggestion": true}
+    "tourism/motel/Econo Lodge": {"name": "Econo Lodge", "icon": "maki-lodging", "fields": ["name", "brand", "operator", "address", "building_area", "smoking", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"tourism": "motel", "brand:wikidata": "Q5333330"}, "addTags": {"brand": "Econo Lodge", "brand:wikidata": "Q5333330", "brand:wikipedia": "en:Econo Lodge", "name": "Econo Lodge", "tourism": "motel"}, "removeTags": {"brand": "Econo Lodge", "brand:wikidata": "Q5333330", "brand:wikipedia": "en:Econo Lodge", "name": "Econo Lodge", "tourism": "motel"}, "matchScore": 2, "suggestion": true},
+    "tourism/motel/Motel 6": {"name": "Motel 6", "icon": "maki-lodging", "fields": ["name", "brand", "operator", "address", "building_area", "smoking", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"tourism": "motel", "brand:wikidata": "Q2188884"}, "addTags": {"brand": "Motel 6", "brand:wikidata": "Q2188884", "brand:wikipedia": "en:Motel 6", "name": "Motel 6", "tourism": "motel"}, "removeTags": {"brand": "Motel 6", "brand:wikidata": "Q2188884", "brand:wikipedia": "en:Motel 6", "name": "Motel 6", "tourism": "motel"}, "matchScore": 2, "suggestion": true},
+    "tourism/motel/Rodeway Inn": {"name": "Rodeway Inn", "icon": "maki-lodging", "fields": ["name", "brand", "operator", "address", "building_area", "smoking", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"tourism": "motel", "brand:wikidata": "Q7356709"}, "addTags": {"brand": "Rodeway Inn", "brand:wikidata": "Q7356709", "brand:wikipedia": "en:Rodeway Inn", "name": "Rodeway Inn", "tourism": "motel"}, "removeTags": {"brand": "Rodeway Inn", "brand:wikidata": "Q7356709", "brand:wikipedia": "en:Rodeway Inn", "name": "Rodeway Inn", "tourism": "motel"}, "matchScore": 2, "suggestion": true},
+    "tourism/motel/Super 8": {"name": "Super 8", "icon": "maki-lodging", "fields": ["name", "brand", "operator", "address", "building_area", "smoking", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"tourism": "motel", "brand:wikidata": "Q5364003"}, "addTags": {"brand": "Super 8", "brand:wikidata": "Q5364003", "brand:wikipedia": "en:Super 8 Motels", "name": "Super 8", "tourism": "motel"}, "removeTags": {"brand": "Super 8", "brand:wikidata": "Q5364003", "brand:wikipedia": "en:Super 8 Motels", "name": "Super 8", "tourism": "motel"}, "matchScore": 2, "suggestion": true}
   }
 }
\ No newline at end of file
diff --git a/data/presets/presets/shop/car.json b/data/presets/presets/shop/car.json
index de2a13982..7dea9ee2b 100644
--- a/data/presets/presets/shop/car.json
+++ b/data/presets/presets/shop/car.json
@@ -2,10 +2,10 @@
     "icon": "maki-car",
     "fields": [
         "name",
+        "brand",
         "operator",
         "address",
         "building_area",
-        "brand",
         "second_hand",
         "service/vehicle",
         "opening_hours",
diff --git a/data/presets/presets/shop/motorcycle.json b/data/presets/presets/shop/motorcycle.json
index a7da7320c..fcbf0f56c 100644
--- a/data/presets/presets/shop/motorcycle.json
+++ b/data/presets/presets/shop/motorcycle.json
@@ -2,6 +2,7 @@
     "icon": "fas-motorcycle",
     "fields": [
         "name",
+        "brand",
         "operator",
         "address",
         "building_area",
diff --git a/data/presets/presets/tourism/motel.json b/data/presets/presets/tourism/motel.json
index e227738ef..48dfdc2f3 100644
--- a/data/presets/presets/tourism/motel.json
+++ b/data/presets/presets/tourism/motel.json
@@ -2,6 +2,7 @@
     "icon": "maki-lodging",
     "fields": [
         "name",
+        "brand",
         "operator",
         "address",
         "building_area",