Merge branch master into validation

2026-05-16 13:59:27 +02:00 · 2019-01-29 14:51:59 -05:00
parent 94c8f9f9f7 7aea67fcfe
commit 0b19d5f93a
16 changed files with 180 additions and 192 deletions
@@ -101,7 +101,7 @@
    cursor: pointer;
 }

-.viewfield-group.selected * {
+.viewfield-group.currentView * {
    fill: #ffee00 !important;
 }
 .viewfield-group.hovered * {
@@ -125,7 +125,7 @@
    stroke-opacity: 0.9;
    fill-opacity: 0.9;
 }
-.viewfield-group.highlighted.selected circle {
+.viewfield-group.highlighted.currentView circle {
    stroke: #222;
    stroke-width: 2;
    stroke-opacity: 1;
@@ -145,12 +145,12 @@
    stroke-width: 1;
    fill-opacity: 0.8;
 }
-.viewfield-group.highlighted.selected .viewfield {
+.viewfield-group.highlighted.currentView .viewfield {
    stroke-width: 1;
    fill-opacity: 0.9;
 }

-.viewfield-group.selected .viewfield-scale {
+.viewfield-group.currentView .viewfield-scale {
    transform: scale(2,2);
 }

@@ -160,7 +160,7 @@
    stroke-opacity: 0.4;
 }
 .sequence.highlighted,
-.sequence.selected {
+.sequence.currentView {
    stroke-width: 4;
    stroke-opacity: 1;
 }
@@ -204,7 +204,7 @@
    outline: 5px solid #eebb00;
    background-color: #eebb00;
 }
-.layer-mapillary-signs .icon-sign.selected {
+.layer-mapillary-signs .icon-sign.currentView {
    outline: 5px solid #ffee00;
    background-color: #ffee00;
 }
@@ -129,7 +129,7 @@
    "amenity/place_of_worship/shinto": {"icon": "temaki-shinto", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["kami", "torii"], "tags": {"amenity": "place_of_worship", "religion": "shinto"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Shinto Shrine"},
    "amenity/place_of_worship/sikh": {"icon": "temaki-sikhism", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["gurudwara", "temple"], "tags": {"amenity": "place_of_worship", "religion": "sikh"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Sikh Temple"},
    "amenity/place_of_worship/taoist": {"icon": "temaki-taoism", "fields": ["name", "religion", "denomination", "building_area", "address", "service_times"], "geometry": ["point", "area"], "terms": ["daoist", "monastery", "temple"], "tags": {"amenity": "place_of_worship", "religion": "taoist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Taoist Temple"},
-    "amenity/planetarium": {"icon": "maki-museum", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["fee", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["museum", "astronomy", "observatory"], "tags": {"amenity": "planetarium"}, "name": "Planetarium"},
+    "amenity/planetarium": {"icon": "maki-globe", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["fee", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["museum", "astronomy", "observatory"], "tags": {"amenity": "planetarium"}, "name": "Planetarium"},
    "amenity/police": {"icon": "maki-police", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["badge", "constable", "constabulary", "cop", "detective", "fed", "law", "enforcement", "officer", "patrol"], "tags": {"amenity": "police"}, "name": "Police"},
    "amenity/post_box": {"icon": "temaki-post_box", "fields": ["operator", "collection_times", "drive_through", "ref"], "moreFields": ["wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "post_box"}, "terms": ["letter", "post"], "name": "Mailbox"},
    "amenity/post_office": {"icon": "maki-post", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["letter", "mail"], "tags": {"amenity": "post_office"}, "name": "Post Office"},
@@ -1004,7 +1004,7 @@
    "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"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "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", "brand", "address", "building_area", "rooms", "internet_access"], "moreFields": ["operator", "smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "motel"}, "name": "Motel"},
-    "tourism/museum": {"icon": "maki-museum", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["fee", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "gallery", "foundation", "hall", "institution", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "museum"}, "name": "Museum"},
+    "tourism/museum": {"icon": "temaki-museum", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["fee", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "gallery", "foundation", "hall", "institution", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "museum"}, "name": "Museum"},
    "tourism/picnic_site": {"icon": "maki-picnic-site", "fields": ["name", "operator", "address", "access_simple", "capacity"], "moreFields": ["smoking", "fee", "payment_multi", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["camp"], "tags": {"tourism": "picnic_site"}, "name": "Picnic Site"},
    "tourism/theme_park": {"icon": "maki-amusement-park", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "theme_park"}, "name": "Theme Park"},
    "tourism/trail_riding_station": {"icon": "maki-horse-riding", "fields": ["name", "horse_stables", "horse_riding", "horse_dressage"], "moreFields": ["address", "opening_hours", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"tourism": "trail_riding_station"}, "name": "Trail Riding Station", "matchScore": 2},
@@ -1396,7 +1396,6 @@
    "amenity/bank/Security Bank": {"name": "Security Bank", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q7444945"}, "addTags": {"amenity": "bank", "brand": "Security Bank", "brand:wikidata": "Q7444945", "brand:wikipedia": "en:Security Bank", "name": "Security Bank"}, "removeTags": {"amenity": "bank", "brand": "Security Bank", "brand:wikidata": "Q7444945", "brand:wikipedia": "en:Security Bank", "name": "Security Bank"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/Seylan Bank": {"name": "Seylan Bank", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q3532083"}, "addTags": {"amenity": "bank", "brand": "Seylan Bank", "brand:wikidata": "Q3532083", "brand:wikipedia": "en:Seylan Bank", "name": "Seylan Bank"}, "removeTags": {"amenity": "bank", "brand": "Seylan Bank", "brand:wikidata": "Q3532083", "brand:wikipedia": "en:Seylan Bank", "name": "Seylan Bank"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/Sicoob": {"name": "Sicoob", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q28679754"}, "addTags": {"amenity": "bank", "brand": "Sicoob", "brand:wikidata": "Q28679754", "brand:wikipedia": "pt:Sistema de Cooperativas de Crédito do Brasil", "name": "Sicoob"}, "removeTags": {"amenity": "bank", "brand": "Sicoob", "brand:wikidata": "Q28679754", "brand:wikipedia": "pt:Sistema de Cooperativas de Crédito do Brasil", "name": "Sicoob"}, "matchScore": 2, "suggestion": true},
-    "amenity/bank/Sicredi": {"name": "Sicredi", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q3483060"}, "addTags": {"amenity": "bank", "brand": "Sicredi", "brand:wikidata": "Q3483060", "brand:wikipedia": "pt:Sistema de Crédito Cooperativo", "name": "Sicredi"}, "removeTags": {"amenity": "bank", "brand": "Sicredi", "brand:wikidata": "Q3483060", "brand:wikipedia": "pt:Sistema de Crédito Cooperativo", "name": "Sicredi"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/Slovenská sporiteľňa": {"name": "Slovenská sporiteľňa", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q7541907"}, "addTags": {"amenity": "bank", "brand": "Slovenská sporiteľňa", "brand:wikidata": "Q7541907", "brand:wikipedia": "en:Slovenská sporiteľňa", "name": "Slovenská sporiteľňa"}, "removeTags": {"amenity": "bank", "brand": "Slovenská sporiteľňa", "brand:wikidata": "Q7541907", "brand:wikipedia": "en:Slovenská sporiteľňa", "name": "Slovenská sporiteľňa"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/Société Générale": {"name": "Société Générale", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q270363"}, "addTags": {"amenity": "bank", "brand": "Société Générale", "brand:wikidata": "Q270363", "brand:wikipedia": "en:Société Générale", "name": "Société Générale"}, "removeTags": {"amenity": "bank", "brand": "Société Générale", "brand:wikidata": "Q270363", "brand:wikipedia": "en:Société Générale", "name": "Société Générale"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/Sonali Bank": {"name": "Sonali Bank", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q3350382"}, "addTags": {"amenity": "bank", "brand": "Sonali Bank", "brand:wikipedia": "en:Sonali Bank", "brand:wikidata": "Q3350382", "name": "Sonali Bank"}, "removeTags": {"amenity": "bank", "brand": "Sonali Bank", "brand:wikipedia": "en:Sonali Bank", "brand:wikidata": "Q3350382", "name": "Sonali Bank"}, "matchScore": 2, "suggestion": true},
@@ -1408,7 +1407,6 @@
    "amenity/bank/State Bank of India": {"name": "State Bank of India", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q1340361"}, "addTags": {"amenity": "bank", "brand": "State Bank of India", "brand:wikidata": "Q1340361", "brand:wikipedia": "en:State Bank of India", "name": "State Bank of India"}, "removeTags": {"amenity": "bank", "brand": "State Bank of India", "brand:wikidata": "Q1340361", "brand:wikipedia": "en:State Bank of India", "name": "State Bank of India"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/Summit Bank": {"name": "Summit Bank", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q7637775"}, "addTags": {"amenity": "bank", "brand": "Summit Bank", "brand:wikidata": "Q7637775", "brand:wikipedia": "en:Summit Bank", "name": "Summit Bank"}, "removeTags": {"amenity": "bank", "brand": "Summit Bank", "brand:wikidata": "Q7637775", "brand:wikipedia": "en:Summit Bank", "name": "Summit Bank"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/SunTrust": {"name": "SunTrust", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q181507"}, "addTags": {"amenity": "bank", "brand": "SunTrust", "brand:wikidata": "Q181507", "brand:wikipedia": "en:SunTrust Banks", "name": "SunTrust"}, "removeTags": {"amenity": "bank", "brand": "SunTrust", "brand:wikidata": "Q181507", "brand:wikipedia": "en:SunTrust Banks", "name": "SunTrust"}, "matchScore": 2, "suggestion": true},
-    "amenity/bank/Supervielle": {"name": "Supervielle", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q5718035"}, "addTags": {"amenity": "bank", "brand": "Supervielle", "brand:wikidata": "Q5718035", "brand:wikipedia": "es:Banco Supervielle", "name": "Supervielle"}, "removeTags": {"amenity": "bank", "brand": "Supervielle", "brand:wikidata": "Q5718035", "brand:wikipedia": "es:Banco Supervielle", "name": "Supervielle"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/Swedbank": {"name": "Swedbank", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q1145493"}, "addTags": {"amenity": "bank", "brand": "Swedbank", "brand:wikidata": "Q1145493", "brand:wikipedia": "en:Swedbank", "name": "Swedbank"}, "removeTags": {"amenity": "bank", "brand": "Swedbank", "brand:wikidata": "Q1145493", "brand:wikipedia": "en:Swedbank", "name": "Swedbank"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/Syndicate Bank": {"name": "Syndicate Bank", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q2004088"}, "addTags": {"amenity": "bank", "brand": "Syndicate Bank", "brand:wikidata": "Q2004088", "brand:wikipedia": "en:Syndicate Bank", "name": "Syndicate Bank"}, "removeTags": {"amenity": "bank", "brand": "Syndicate Bank", "brand:wikidata": "Q2004088", "brand:wikipedia": "en:Syndicate Bank", "name": "Syndicate Bank"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/TCF Bank": {"name": "TCF Bank", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q7669687"}, "addTags": {"amenity": "bank", "brand": "TCF Bank", "brand:wikidata": "Q7669687", "brand:wikipedia": "en:TCF Bank", "name": "TCF Bank"}, "removeTags": {"amenity": "bank", "brand": "TCF Bank", "brand:wikidata": "Q7669687", "brand:wikipedia": "en:TCF Bank", "name": "TCF Bank"}, "matchScore": 2, "suggestion": true},
@@ -1432,8 +1430,7 @@
    "amenity/bank/UniCredit Bank": {"name": "UniCredit Bank", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q45568"}, "addTags": {"amenity": "bank", "brand": "UniCredit Bank", "brand:wikidata": "Q45568", "brand:wikipedia": "en:UniCredit", "name": "UniCredit Bank"}, "removeTags": {"amenity": "bank", "brand": "UniCredit Bank", "brand:wikidata": "Q45568", "brand:wikipedia": "en:UniCredit", "name": "UniCredit Bank"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/Unicaja Banco": {"name": "Unicaja Banco", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q2543704"}, "addTags": {"amenity": "bank", "brand": "Unicaja Banco", "brand:wikidata": "Q2543704", "brand:wikipedia": "en:Unicaja", "name": "Unicaja Banco"}, "removeTags": {"amenity": "bank", "brand": "Unicaja Banco", "brand:wikidata": "Q2543704", "brand:wikipedia": "en:Unicaja", "name": "Unicaja Banco"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/Union Bank of India": {"name": "Union Bank of India", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q2004078"}, "addTags": {"amenity": "bank", "brand": "Union Bank of India", "brand:wikidata": "Q2004078", "brand:wikipedia": "en:Union Bank of India", "name": "Union Bank of India"}, "removeTags": {"amenity": "bank", "brand": "Union Bank of India", "brand:wikidata": "Q2004078", "brand:wikipedia": "en:Union Bank of India", "name": "Union Bank of India"}, "matchScore": 2, "suggestion": true},
-    "amenity/bank/UnionBank (Philippines)": {"name": "UnionBank (Philippines)", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q7885403"}, "addTags": {"amenity": "bank", "brand": "UnionBank", "brand:wikidata": "Q7885403", "brand:wikipedia": "en:Union Bank of the Philippines", "name": "UnionBank"}, "removeTags": {"amenity": "bank", "brand": "UnionBank", "brand:wikidata": "Q7885403", "brand:wikipedia": "en:Union Bank of the Philippines", "name": "UnionBank"}, "matchScore": 2, "suggestion": true},
-    "amenity/bank/UnionBank (USA)": {"name": "UnionBank (USA)", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q1442804"}, "addTags": {"amenity": "bank", "brand": "UnionBank", "brand:wikidata": "Q1442804", "brand:wikipedia": "en:MUFG Union Bank", "name": "UnionBank"}, "removeTags": {"amenity": "bank", "brand": "UnionBank", "brand:wikidata": "Q1442804", "brand:wikipedia": "en:MUFG Union Bank", "name": "UnionBank"}, "matchScore": 2, "suggestion": true},
+    "amenity/bank/UnionBank": {"name": "UnionBank", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q1442804"}, "addTags": {"amenity": "bank", "brand": "UnionBank", "brand:wikidata": "Q1442804", "brand:wikipedia": "en:MUFG Union Bank", "name": "UnionBank"}, "removeTags": {"amenity": "bank", "brand": "UnionBank", "brand:wikidata": "Q1442804", "brand:wikipedia": "en:MUFG Union Bank", "name": "UnionBank"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/Vakıfbank": {"name": "Vakıfbank", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q1148521"}, "addTags": {"amenity": "bank", "brand": "Vakıfbank", "brand:wikidata": "Q1148521", "brand:wikipedia": "en:VakıfBank", "name": "Vakıfbank"}, "removeTags": {"amenity": "bank", "brand": "Vakıfbank", "brand:wikidata": "Q1148521", "brand:wikipedia": "en:VakıfBank", "name": "Vakıfbank"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/Veneto Banca": {"name": "Veneto Banca", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q3127221"}, "addTags": {"amenity": "bank", "brand": "Veneto Banca", "brand:wikidata": "Q3127221", "brand:wikipedia": "en:Veneto Banca", "name": "Veneto Banca"}, "removeTags": {"amenity": "bank", "brand": "Veneto Banca", "brand:wikidata": "Q3127221", "brand:wikipedia": "en:Veneto Banca", "name": "Veneto Banca"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/Vijaya Bank": {"name": "Vijaya Bank", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q2003171"}, "addTags": {"amenity": "bank", "brand": "Vijaya Bank", "brand:wikidata": "Q2003171", "brand:wikipedia": "en:Vijaya Bank", "name": "Vijaya Bank"}, "removeTags": {"amenity": "bank", "brand": "Vijaya Bank", "brand:wikidata": "Q2003171", "brand:wikipedia": "en:Vijaya Bank", "name": "Vijaya Bank"}, "matchScore": 2, "suggestion": true},
@@ -1459,10 +1456,8 @@
    "amenity/bank/Банка ДСК": {"name": "Банка ДСК", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q5206146"}, "addTags": {"amenity": "bank", "brand": "Банка ДСК", "brand:en": "DSK Bank", "brand:wikidata": "Q5206146", "brand:wikipedia": "en:DSK Bank", "name": "Банка ДСК", "name:en": "DSK Bank"}, "removeTags": {"amenity": "bank", "brand": "Банка ДСК", "brand:en": "DSK Bank", "brand:wikidata": "Q5206146", "brand:wikipedia": "en:DSK Bank", "name": "Банка ДСК", "name:en": "DSK Bank"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/Белагропромбанк": {"name": "Белагропромбанк", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q1991373"}, "addTags": {"amenity": "bank", "brand": "Белагропромбанк", "brand:en": "Belagroprom Bank", "brand:wikidata": "Q1991373", "brand:wikipedia": "be:Белаграпрамбанк", "name": "Белагропромбанк", "name:en": "Belagroprom Bank"}, "removeTags": {"amenity": "bank", "brand": "Белагропромбанк", "brand:en": "Belagroprom Bank", "brand:wikidata": "Q1991373", "brand:wikipedia": "be:Белаграпрамбанк", "name": "Белагропромбанк", "name:en": "Belagroprom Bank"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/Беларусбанк": {"name": "Беларусбанк", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q1997334"}, "addTags": {"amenity": "bank", "brand": "Беларусбанк", "brand:en": "Belarusbank", "brand:wikidata": "Q1997334", "brand:wikipedia": "en:Belarusbank", "name": "Беларусбанк", "name:en": "Belarusbank"}, "removeTags": {"amenity": "bank", "brand": "Беларусбанк", "brand:en": "Belarusbank", "brand:wikidata": "Q1997334", "brand:wikipedia": "en:Belarusbank", "name": "Беларусбанк", "name:en": "Belarusbank"}, "matchScore": 2, "suggestion": true},
-    "amenity/bank/Белинвестбанк": {"name": "Белинвестбанк", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q4081940"}, "addTags": {"amenity": "bank", "brand": "Белинвестбанк", "brand:wikidata": "Q4081940", "brand:wikipedia": "ru:Белинвестбанк", "name": "Белинвестбанк"}, "removeTags": {"amenity": "bank", "brand": "Белинвестбанк", "brand:wikidata": "Q4081940", "brand:wikipedia": "ru:Белинвестбанк", "name": "Белинвестбанк"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/Бинбанк": {"name": "Бинбанк", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q4086829"}, "addTags": {"amenity": "bank", "brand": "Бинбанк", "brand:en": "B&N Bank", "brand:wikidata": "Q4086829", "brand:wikipedia": "en:B&N Bank", "name": "Бинбанк", "name:en": "B&N Bank"}, "removeTags": {"amenity": "bank", "brand": "Бинбанк", "brand:en": "B&N Bank", "brand:wikidata": "Q4086829", "brand:wikipedia": "en:B&N Bank", "name": "Бинбанк", "name:en": "B&N Bank"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/ВТБ": {"name": "ВТБ", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q1549389"}, "addTags": {"amenity": "bank", "brand": "ВТБ", "brand:en": "VTB Bank", "brand:wikidata": "Q1549389", "brand:wikipedia": "en:VTB Bank", "name": "ВТБ", "name:en": "VTB Bank"}, "removeTags": {"amenity": "bank", "brand": "ВТБ", "brand:en": "VTB Bank", "brand:wikidata": "Q1549389", "brand:wikipedia": "en:VTB Bank", "name": "ВТБ", "name:en": "VTB Bank"}, "matchScore": 2, "suggestion": true},
-    "amenity/bank/Возрождение": {"name": "Возрождение", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q4114952"}, "addTags": {"amenity": "bank", "brand": "Возрождение", "brand:wikidata": "Q4114952", "brand:wikipedia": "en:Возрождение (банк)", "name": "Возрождение"}, "removeTags": {"amenity": "bank", "brand": "Возрождение", "brand:wikidata": "Q4114952", "brand:wikipedia": "en:Возрождение (банк)", "name": "Возрождение"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/Газпромбанк": {"name": "Газпромбанк", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q1924338"}, "addTags": {"amenity": "bank", "brand": "Газпромбанк", "brand:en": "Gazprombank", "brand:wikidata": "Q1924338", "brand:wikipedia": "en:Gazprombank", "name": "Газпромбанк", "name:en": "Gazprombank"}, "removeTags": {"amenity": "bank", "brand": "Газпромбанк", "brand:en": "Gazprombank", "brand:wikidata": "Q1924338", "brand:wikipedia": "en:Gazprombank", "name": "Газпромбанк", "name:en": "Gazprombank"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/Казкоммерцбанк": {"name": "Казкоммерцбанк", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q1168179"}, "addTags": {"amenity": "bank", "brand": "Казкоммерцбанк", "brand:en": "Kazkommertsbank", "brand:wikidata": "Q1168179", "brand:wikipedia": "en:Kazkommertsbank", "name": "Казкоммерцбанк", "name:en": "Kazkommertsbank"}, "removeTags": {"amenity": "bank", "brand": "Казкоммерцбанк", "brand:en": "Kazkommertsbank", "brand:wikidata": "Q1168179", "brand:wikipedia": "en:Kazkommertsbank", "name": "Казкоммерцбанк", "name:en": "Kazkommertsbank"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/Московский индустриальный банк": {"name": "Московский индустриальный банк", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q4304145"}, "addTags": {"amenity": "bank", "brand": "Московский индустриальный банк", "brand:en": "Moscow Industrial Bank", "brand:wikidata": "Q4304145", "brand:wikipedia": "ru:Московский индустриальный банк", "name": "Московский индустриальный банк", "name:en": "Moscow Industrial Bank"}, "removeTags": {"amenity": "bank", "brand": "Московский индустриальный банк", "brand:en": "Moscow Industrial Bank", "brand:wikidata": "Q4304145", "brand:wikipedia": "ru:Московский индустриальный банк", "name": "Московский индустриальный банк", "name:en": "Moscow Industrial Bank"}, "matchScore": 2, "suggestion": true},
@@ -1475,7 +1470,6 @@
    "amenity/bank/ПриватБанк": {"name": "ПриватБанк", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q1515015"}, "addTags": {"amenity": "bank", "brand": "ПриватБанк", "brand:en": "PrivatBank", "brand:wikidata": "Q1515015", "brand:wikipedia": "uk:ПриватБанк", "name": "ПриватБанк", "name:en": "PrivatBank"}, "removeTags": {"amenity": "bank", "brand": "ПриватБанк", "brand:en": "PrivatBank", "brand:wikidata": "Q1515015", "brand:wikipedia": "uk:ПриватБанк", "name": "ПриватБанк", "name:en": "PrivatBank"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/Приорбанк": {"name": "Приорбанк", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q3919658"}, "addTags": {"amenity": "bank", "brand": "Приорбанк", "brand:en": "PriorBank", "brand:wikidata": "Q3919658", "brand:wikipedia": "be:Пріорбанк", "name": "Приорбанк", "name:en": "PriorBank"}, "removeTags": {"amenity": "bank", "brand": "Приорбанк", "brand:en": "PriorBank", "brand:wikidata": "Q3919658", "brand:wikipedia": "be:Пріорбанк", "name": "Приорбанк", "name:en": "PriorBank"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/Промсвязьбанк": {"name": "Промсвязьбанк", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q649100"}, "addTags": {"amenity": "bank", "brand": "Промсвязьбанк", "brand:en": "Promsvyazbank", "brand:wikidata": "Q649100", "brand:wikipedia": "en:Promsvyazbank", "name": "Промсвязьбанк", "name:en": "Promsvyazbank"}, "removeTags": {"amenity": "bank", "brand": "Промсвязьбанк", "brand:en": "Promsvyazbank", "brand:wikidata": "Q649100", "brand:wikipedia": "en:Promsvyazbank", "name": "Промсвязьбанк", "name:en": "Promsvyazbank"}, "matchScore": 2, "suggestion": true},
-    "amenity/bank/РНКБ": {"name": "РНКБ", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q16912944"}, "addTags": {"amenity": "bank", "brand": "РНКБ", "brand:wikidata": "Q16912944", "brand:wikipedia": "en:Russian National Commercial Bank", "name": "РНКБ"}, "removeTags": {"amenity": "bank", "brand": "РНКБ", "brand:wikidata": "Q16912944", "brand:wikipedia": "en:Russian National Commercial Bank", "name": "РНКБ"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/Райффайзен": {"name": "Райффайзен", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q4389244"}, "addTags": {"amenity": "bank", "brand": "Райффайзен", "brand:en": "Raiffeisenbank", "brand:wikidata": "Q4389244", "brand:wikipedia": "en:Raiffeisenbank (Russia)", "name": "Райффайзен", "name:en": "Raiffeisenbank"}, "removeTags": {"amenity": "bank", "brand": "Райффайзен", "brand:en": "Raiffeisenbank", "brand:wikidata": "Q4389244", "brand:wikipedia": "en:Raiffeisenbank (Russia)", "name": "Райффайзен", "name:en": "Raiffeisenbank"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/Райффайзен Банк Аваль": {"name": "Райффайзен Банк Аваль", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q4389243"}, "addTags": {"amenity": "bank", "brand": "Райффайзен Банк Аваль", "brand:en": "Raiffeisen Bank Aval", "brand:wikidata": "Q4389243", "brand:wikipedia": "en:Raiffeisen Bank Aval", "name": "Райффайзен Банк Аваль", "name:en": "Raiffeisen Bank Aval"}, "removeTags": {"amenity": "bank", "brand": "Райффайзен Банк Аваль", "brand:en": "Raiffeisen Bank Aval", "brand:wikidata": "Q4389243", "brand:wikipedia": "en:Raiffeisen Bank Aval", "name": "Райффайзен Банк Аваль", "name:en": "Raiffeisen Bank Aval"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/Росбанк": {"name": "Росбанк", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q1119857"}, "addTags": {"amenity": "bank", "brand": "Росбанк", "brand:en": "Rosbank", "brand:wikidata": "Q1119857", "brand:wikipedia": "en:Rosbank", "name": "Росбанк", "name:en": "Rosbank"}, "removeTags": {"amenity": "bank", "brand": "Росбанк", "brand:en": "Rosbank", "brand:wikidata": "Q1119857", "brand:wikipedia": "en:Rosbank", "name": "Росбанк", "name:en": "Rosbank"}, "matchScore": 2, "suggestion": true},
@@ -1525,7 +1519,6 @@
    "amenity/bank/中国银行": {"name": "中国银行", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q790068"}, "addTags": {"amenity": "bank", "brand": "中国银行", "brand:en": "Bank of China", "brand:wikidata": "Q790068", "brand:wikipedia": "en:Bank of China", "name": "中国银行", "name:en": "Bank of China"}, "removeTags": {"amenity": "bank", "brand": "中国银行", "brand:en": "Bank of China", "brand:wikidata": "Q790068", "brand:wikipedia": "en:Bank of China", "name": "中国银行", "name:en": "Bank of China"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/中國信託商業銀行": {"name": "中國信託商業銀行", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q5100191"}, "addTags": {"amenity": "bank", "brand": "中國信託商業銀行", "brand:en": "CTBC Bank", "brand:wikidata": "Q5100191", "brand:wikipedia": "en:CTBC Bank", "name": "中國信託商業銀行", "name:en": "CTBC Bank"}, "removeTags": {"amenity": "bank", "brand": "中國信託商業銀行", "brand:en": "CTBC Bank", "brand:wikidata": "Q5100191", "brand:wikipedia": "en:CTBC Bank", "name": "中國信託商業銀行", "name:en": "CTBC Bank"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/交通银行": {"name": "交通银行", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q806680"}, "addTags": {"amenity": "bank", "brand": "交通银行", "brand:en": "Bank of Communications", "brand:wikidata": "Q806680", "brand:wikipedia": "en:Bank of Communications", "name": "交通银行", "name:en": "Bank of Communications"}, "removeTags": {"amenity": "bank", "brand": "交通银行", "brand:en": "Bank of Communications", "brand:wikidata": "Q806680", "brand:wikipedia": "en:Bank of Communications", "name": "交通银行", "name:en": "Bank of Communications"}, "matchScore": 2, "suggestion": true},
-    "amenity/bank/京城商業銀行": {"name": "京城商業銀行", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q10883132"}, "addTags": {"amenity": "bank", "brand": "京城商業銀行", "brand:wikidata": "Q10883132", "brand:wikipedia": "zh:京城商業銀行", "name": "京城商業銀行"}, "removeTags": {"amenity": "bank", "brand": "京城商業銀行", "brand:wikidata": "Q10883132", "brand:wikipedia": "zh:京城商業銀行", "name": "京城商業銀行"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/京都中央信用金庫": {"name": "京都中央信用金庫", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q11374844"}, "addTags": {"amenity": "bank", "brand": "京都中央信用金庫", "brand:en": "Kyoto Chuo Shinkin Bank", "brand:wikidata": "Q11374844", "brand:wikipedia": "jp:京都中央信用金庫", "name": "京都中央信用金庫", "name:en": "Kyoto Chuo Shinkin Bank"}, "removeTags": {"amenity": "bank", "brand": "京都中央信用金庫", "brand:en": "Kyoto Chuo Shinkin Bank", "brand:wikidata": "Q11374844", "brand:wikipedia": "jp:京都中央信用金庫", "name": "京都中央信用金庫", "name:en": "Kyoto Chuo Shinkin Bank"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/京都銀行": {"name": "京都銀行", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q11375713"}, "addTags": {"amenity": "bank", "brand": "京都銀行", "brand:en": "Bank of Kyoto", "brand:wikidata": "Q11375713", "brand:wikipedia": "en:Bank of Kyoto", "name": "京都銀行", "name:en": "Bank of Kyoto"}, "removeTags": {"amenity": "bank", "brand": "京都銀行", "brand:en": "Bank of Kyoto", "brand:wikidata": "Q11375713", "brand:wikipedia": "en:Bank of Kyoto", "name": "京都銀行", "name:en": "Bank of Kyoto"}, "matchScore": 2, "suggestion": true},
    "amenity/bank/元大商業銀行": {"name": "元大商業銀行", "icon": "maki-bank", "geometry": ["point", "area"], "tags": {"amenity": "bank", "brand:wikidata": "Q10889602"}, "addTags": {"amenity": "bank", "brand": "元大商業銀行", "brand:en": "Yuanta Commercial Bank", "brand:wikidata": "Q10889602", "brand:wikipedia": "zh:元大商業銀行", "name": "元大商業銀行", "name:en": "Yuanta Commercial Bank"}, "removeTags": {"amenity": "bank", "brand": "元大商業銀行", "brand:en": "Yuanta Commercial Bank", "brand:wikidata": "Q10889602", "brand:wikipedia": "zh:元大商業銀行", "name": "元大商業銀行", "name:en": "Yuanta Commercial Bank"}, "matchScore": 2, "suggestion": true},
@@ -1573,7 +1566,6 @@
    "amenity/cafe/Chatime": {"name": "Chatime", "icon": "maki-cafe", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "brand:wikidata": "Q16829306"}, "addTags": {"amenity": "cafe", "brand": "Chatime", "brand:wikidata": "Q16829306", "brand:wikipedia": "en:Chatime", "name": "Chatime"}, "removeTags": {"amenity": "cafe", "brand": "Chatime", "brand:wikidata": "Q16829306", "brand:wikipedia": "en:Chatime", "name": "Chatime"}, "matchScore": 2, "suggestion": true},
    "amenity/cafe/Coffee Fellows": {"name": "Coffee Fellows", "icon": "maki-cafe", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "brand:wikidata": "Q23461429"}, "addTags": {"amenity": "cafe", "brand": "Coffee Fellows", "brand:wikidata": "Q23461429", "brand:wikipedia": "en:Coffee Fellows", "name": "Coffee Fellows"}, "removeTags": {"amenity": "cafe", "brand": "Coffee Fellows", "brand:wikidata": "Q23461429", "brand:wikipedia": "en:Coffee Fellows", "name": "Coffee Fellows"}, "matchScore": 2, "suggestion": true},
    "amenity/cafe/Coffee House": {"name": "Coffee House", "icon": "maki-cafe", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "brand:wikidata": "Q11855430"}, "addTags": {"amenity": "cafe", "brand": "Coffee House", "brand:wikidata": "Q11855430", "brand:wikipedia": "fi:Coffee House", "name": "Coffee House"}, "removeTags": {"amenity": "cafe", "brand": "Coffee House", "brand:wikidata": "Q11855430", "brand:wikipedia": "fi:Coffee House", "name": "Coffee House"}, "matchScore": 2, "suggestion": true},
-    "amenity/cafe/Coffee Island": {"name": "Coffee Island", "icon": "maki-cafe", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "brand:wikidata": "Q60867333"}, "addTags": {"amenity": "cafe", "brand": "Coffee Island", "brand:wikidata": "Q60867333", "brand:wikipedia": "en:Coffee Island", "name": "Coffee Island"}, "removeTags": {"amenity": "cafe", "brand": "Coffee Island", "brand:wikidata": "Q60867333", "brand:wikipedia": "en:Coffee Island", "name": "Coffee Island"}, "matchScore": 2, "suggestion": true},
    "amenity/cafe/Coffee Time": {"name": "Coffee Time", "icon": "maki-cafe", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "brand:wikidata": "Q5140932"}, "addTags": {"amenity": "cafe", "brand": "Coffee Time", "brand:wikidata": "Q5140932", "brand:wikipedia": "en:Coffee Time", "name": "Coffee Time"}, "removeTags": {"amenity": "cafe", "brand": "Coffee Time", "brand:wikidata": "Q5140932", "brand:wikipedia": "en:Coffee Time", "name": "Coffee Time"}, "matchScore": 2, "suggestion": true},
    "amenity/cafe/Costa": {"name": "Costa", "icon": "maki-cafe", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "brand:wikidata": "Q608845"}, "addTags": {"amenity": "cafe", "brand": "Costa", "brand:wikidata": "Q608845", "brand:wikipedia": "en:Costa Coffee", "name": "Costa"}, "removeTags": {"amenity": "cafe", "brand": "Costa", "brand:wikidata": "Q608845", "brand:wikipedia": "en:Costa Coffee", "name": "Costa"}, "matchScore": 2, "suggestion": true},
    "amenity/cafe/Country Style": {"name": "Country Style", "icon": "maki-cafe", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "brand:wikidata": "Q5177435"}, "addTags": {"amenity": "cafe", "brand": "Country Style", "brand:wikidata": "Q5177435", "brand:wikipedia": "en:Country Style", "name": "Country Style"}, "removeTags": {"amenity": "cafe", "brand": "Country Style", "brand:wikidata": "Q5177435", "brand:wikipedia": "en:Country Style", "name": "Country Style"}, "matchScore": 2, "suggestion": true},
@@ -1584,10 +1576,9 @@
    "amenity/cafe/Le Pain Quotidien": {"name": "Le Pain Quotidien", "icon": "maki-cafe", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "brand:wikidata": "Q2046903"}, "addTags": {"amenity": "cafe", "brand": "Le Pain Quotidien", "brand:wikidata": "Q2046903", "brand:wikipedia": "en:Le Pain Quotidien", "name": "Le Pain Quotidien"}, "removeTags": {"amenity": "cafe", "brand": "Le Pain Quotidien", "brand:wikidata": "Q2046903", "brand:wikipedia": "en:Le Pain Quotidien", "name": "Le Pain Quotidien"}, "matchScore": 2, "suggestion": true},
    "amenity/cafe/Mado": {"name": "Mado", "icon": "maki-cafe", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "brand:wikidata": "Q17116336"}, "addTags": {"amenity": "cafe", "brand": "Mado", "brand:wikidata": "Q17116336", "brand:wikipedia": "en:Mado (food company)", "name": "Mado"}, "removeTags": {"amenity": "cafe", "brand": "Mado", "brand:wikidata": "Q17116336", "brand:wikipedia": "en:Mado (food company)", "name": "Mado"}, "matchScore": 2, "suggestion": true},
    "amenity/cafe/McCafé": {"name": "McCafé", "icon": "maki-cafe", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "brand:wikidata": "Q3114287"}, "addTags": {"amenity": "cafe", "brand": "McCafé", "brand:wikidata": "Q3114287", "brand:wikipedia": "en:McCafé", "cuisine": "coffee_shop", "name": "McCafé"}, "removeTags": {"amenity": "cafe", "brand": "McCafé", "brand:wikidata": "Q3114287", "brand:wikipedia": "en:McCafé", "cuisine": "coffee_shop", "name": "McCafé"}, "matchScore": 2, "suggestion": true},
-    "amenity/cafe/Patisserie Valerie": {"name": "Patisserie Valerie", "icon": "maki-cafe", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "brand:wikidata": "Q22101966"}, "addTags": {"amenity": "cafe", "brand": "Patisserie Valerie", "brand:wikidata": "Q22101966", "brand:wikipedia": "en:Patisserie Valerie", "cuisine": "cake", "name": "Patisserie Valerie"}, "removeTags": {"amenity": "cafe", "brand": "Patisserie Valerie", "brand:wikidata": "Q22101966", "brand:wikipedia": "en:Patisserie Valerie", "cuisine": "cake", "name": "Patisserie Valerie"}, "matchScore": 2, "suggestion": true},
+    "amenity/cafe/Patisserie Valerie": {"name": "Patisserie Valerie", "icon": "maki-cafe", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "brand:wikidata": "Q22101966"}, "addTags": {"amenity": "cafe", "brand": "Patisserie Valerie", "brand:wikidata": "Q22101966", "brand:wikipedia": "en:Patisserie Valerie", "name": "Patisserie Valerie"}, "removeTags": {"amenity": "cafe", "brand": "Patisserie Valerie", "brand:wikidata": "Q22101966", "brand:wikipedia": "en:Patisserie Valerie", "name": "Patisserie Valerie"}, "matchScore": 2, "suggestion": true},
    "amenity/cafe/Peet's Coffee": {"name": "Peet's Coffee", "icon": "maki-cafe", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "brand:wikidata": "Q1094101"}, "addTags": {"amenity": "cafe", "brand": "Peet's Coffee", "brand:wikidata": "Q1094101", "brand:wikipedia": "en:Peet's Coffee", "name": "Peet's Coffee"}, "removeTags": {"amenity": "cafe", "brand": "Peet's Coffee", "brand:wikidata": "Q1094101", "brand:wikipedia": "en:Peet's Coffee", "name": "Peet's Coffee"}, "matchScore": 2, "suggestion": true},
    "amenity/cafe/Pret A Manger": {"name": "Pret A Manger", "icon": "maki-cafe", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "brand:wikidata": "Q2109109"}, "addTags": {"amenity": "cafe", "brand": "Pret A Manger", "brand:wikidata": "Q2109109", "brand:wikipedia": "en:Pret a Manger", "name": "Pret A Manger"}, "removeTags": {"amenity": "cafe", "brand": "Pret A Manger", "brand:wikidata": "Q2109109", "brand:wikipedia": "en:Pret a Manger", "name": "Pret A Manger"}, "matchScore": 2, "suggestion": true},
-    "amenity/cafe/Pumpkin": {"name": "Pumpkin", "icon": "maki-cafe", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "brand:wikidata": "Q27825961"}, "addTags": {"amenity": "cafe", "brand": "Pumpkin", "brand:wikidata": "Q27825961", "brand:wikipedia": "en:Pumpkin Café Shop", "name": "Pumpkin"}, "removeTags": {"amenity": "cafe", "brand": "Pumpkin", "brand:wikidata": "Q27825961", "brand:wikipedia": "en:Pumpkin Café Shop", "name": "Pumpkin"}, "matchScore": 2, "suggestion": true},
    "amenity/cafe/Second Cup": {"name": "Second Cup", "icon": "maki-cafe", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "brand:wikidata": "Q862180"}, "addTags": {"amenity": "cafe", "brand": "Second Cup", "brand:wikidata": "Q862180", "brand:wikipedia": "en:Second Cup", "name": "Second Cup"}, "removeTags": {"amenity": "cafe", "brand": "Second Cup", "brand:wikidata": "Q862180", "brand:wikipedia": "en:Second Cup", "name": "Second Cup"}, "matchScore": 2, "suggestion": true},
    "amenity/cafe/Segafredo": {"name": "Segafredo", "icon": "maki-cafe", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "brand:wikidata": "Q21282762"}, "addTags": {"amenity": "cafe", "brand": "Segafredo", "brand:wikidata": "Q21282762", "brand:wikipedia": "it:Segafredo Zanetti", "name": "Segafredo"}, "removeTags": {"amenity": "cafe", "brand": "Segafredo", "brand:wikidata": "Q21282762", "brand:wikipedia": "it:Segafredo Zanetti", "name": "Segafredo"}, "matchScore": 2, "suggestion": true},
    "amenity/cafe/Starbucks": {"name": "Starbucks", "icon": "maki-cafe", "geometry": ["point", "area"], "tags": {"amenity": "cafe", "brand:wikidata": "Q37158"}, "addTags": {"amenity": "cafe", "brand": "Starbucks", "brand:wikidata": "Q37158", "brand:wikipedia": "en:Starbucks", "cuisine": "coffee_shop", "name": "Starbucks"}, "removeTags": {"amenity": "cafe", "brand": "Starbucks", "brand:wikidata": "Q37158", "brand:wikipedia": "en:Starbucks", "cuisine": "coffee_shop", "name": "Starbucks"}, "matchScore": 2, "suggestion": true},
@@ -1902,7 +1893,6 @@
    "amenity/fuel/Preem": {"name": "Preem", "icon": "maki-fuel", "geometry": ["point", "area"], "tags": {"amenity": "fuel", "brand:wikidata": "Q598835"}, "addTags": {"amenity": "fuel", "brand": "Preem", "brand:wikidata": "Q598835", "brand:wikipedia": "en:Preem", "name": "Preem"}, "removeTags": {"amenity": "fuel", "brand": "Preem", "brand:wikidata": "Q598835", "brand:wikipedia": "en:Preem", "name": "Preem"}, "matchScore": 2, "suggestion": true},
    "amenity/fuel/Puma": {"name": "Puma", "icon": "maki-fuel", "geometry": ["point", "area"], "tags": {"amenity": "fuel", "brand:wikidata": "Q7259769"}, "addTags": {"amenity": "fuel", "brand": "Puma", "brand:wikidata": "Q7259769", "brand:wikipedia": "en:Puma Energy", "name": "Puma"}, "removeTags": {"amenity": "fuel", "brand": "Puma", "brand:wikidata": "Q7259769", "brand:wikipedia": "en:Puma Energy", "name": "Puma"}, "matchScore": 2, "suggestion": true},
    "amenity/fuel/Q8": {"name": "Q8", "icon": "maki-fuel", "geometry": ["point", "area"], "tags": {"amenity": "fuel", "brand:wikidata": "Q1634762"}, "addTags": {"amenity": "fuel", "brand": "Q8", "brand:wikidata": "Q1634762", "brand:wikipedia": "en:Kuwait Petroleum Corporation", "name": "Q8"}, "removeTags": {"amenity": "fuel", "brand": "Q8", "brand:wikidata": "Q1634762", "brand:wikipedia": "en:Kuwait Petroleum Corporation", "name": "Q8"}, "matchScore": 2, "suggestion": true},
-    "amenity/fuel/Q8 Easy": {"name": "Q8 Easy", "icon": "maki-fuel", "geometry": ["point", "area"], "tags": {"amenity": "fuel", "brand:wikidata": "Q1806948"}, "addTags": {"amenity": "fuel", "brand": "Q8 Easy", "brand:wikidata": "Q1806948", "brand:wikipedia": "nl:Q8 Easy", "name": "Q8 Easy"}, "removeTags": {"amenity": "fuel", "brand": "Q8 Easy", "brand:wikidata": "Q1806948", "brand:wikipedia": "nl:Q8 Easy", "name": "Q8 Easy"}, "matchScore": 2, "suggestion": true},
    "amenity/fuel/QT": {"name": "QT", "icon": "maki-fuel", "geometry": ["point", "area"], "tags": {"amenity": "fuel", "brand:wikidata": "Q7271953"}, "addTags": {"amenity": "fuel", "brand": "QT", "brand:wikidata": "Q7271953", "brand:wikipedia": "en:QuikTrip", "name": "QT"}, "removeTags": {"amenity": "fuel", "brand": "QT", "brand:wikidata": "Q7271953", "brand:wikipedia": "en:QuikTrip", "name": "QT"}, "matchScore": 2, "suggestion": true},
    "amenity/fuel/Qstar": {"name": "Qstar", "icon": "maki-fuel", "geometry": ["point", "area"], "tags": {"amenity": "fuel", "brand:wikidata": "Q10647961"}, "addTags": {"amenity": "fuel", "brand": "Qstar", "brand:wikidata": "Q10647961", "brand:wikipedia": "sv:Qstar", "name": "Qstar"}, "removeTags": {"amenity": "fuel", "brand": "Qstar", "brand:wikidata": "Q10647961", "brand:wikipedia": "sv:Qstar", "name": "Qstar"}, "matchScore": 2, "suggestion": true},
    "amenity/fuel/QuikTrip": {"name": "QuikTrip", "icon": "maki-fuel", "geometry": ["point", "area"], "tags": {"amenity": "fuel", "brand:wikidata": "Q7271953"}, "addTags": {"amenity": "fuel", "brand": "QuikTrip", "brand:wikidata": "Q7271953", "brand:wikipedia": "en:QuikTrip", "name": "QuikTrip"}, "removeTags": {"amenity": "fuel", "brand": "QuikTrip", "brand:wikidata": "Q7271953", "brand:wikipedia": "en:QuikTrip", "name": "QuikTrip"}, "matchScore": 2, "suggestion": true},
@@ -2020,12 +2010,10 @@
    "amenity/pharmacy/Farmacias Cruz Verde": {"name": "Farmacias Cruz Verde", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q5856071"}, "addTags": {"amenity": "pharmacy", "brand": "Farmacias Cruz Verde", "brand:wikidata": "Q5856071", "brand:wikipedia": "es:Farmacias Cruz Verde", "healthcare": "pharmacy", "name": "Farmacias Cruz Verde"}, "removeTags": {"amenity": "pharmacy", "brand": "Farmacias Cruz Verde", "brand:wikidata": "Q5856071", "brand:wikipedia": "es:Farmacias Cruz Verde", "healthcare": "pharmacy", "name": "Farmacias Cruz Verde"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
    "amenity/pharmacy/Farmacias SalcoBrand": {"name": "Farmacias SalcoBrand", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q2877054"}, "addTags": {"amenity": "pharmacy", "brand": "Farmacias SalcoBrand", "brand:wikidata": "Q2877054", "brand:wikipedia": "es:Farmacias Salcobrand", "healthcare": "pharmacy", "name": "Farmacias SalcoBrand"}, "removeTags": {"amenity": "pharmacy", "brand": "Farmacias SalcoBrand", "brand:wikidata": "Q2877054", "brand:wikipedia": "es:Farmacias Salcobrand", "healthcare": "pharmacy", "name": "Farmacias SalcoBrand"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
    "amenity/pharmacy/Farmacity": {"name": "Farmacity", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q5856076"}, "addTags": {"amenity": "pharmacy", "brand": "Farmacity", "brand:wikidata": "Q5856076", "brand:wikipedia": "es:Farmacity", "healthcare": "pharmacy", "name": "Farmacity"}, "removeTags": {"amenity": "pharmacy", "brand": "Farmacity", "brand:wikidata": "Q5856076", "brand:wikipedia": "es:Farmacity", "healthcare": "pharmacy", "name": "Farmacity"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
-    "amenity/pharmacy/Farmahorro": {"name": "Farmahorro", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q20015002"}, "addTags": {"amenity": "pharmacy", "brand": "Farmahorro", "brand:wikidata": "Q20015002", "brand:wikipedia": "es:Farmahorro", "healthcare": "pharmacy", "name": "Farmahorro"}, "removeTags": {"amenity": "pharmacy", "brand": "Farmahorro", "brand:wikidata": "Q20015002", "brand:wikipedia": "es:Farmahorro", "healthcare": "pharmacy", "name": "Farmahorro"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
    "amenity/pharmacy/Farmatodo": {"name": "Farmatodo", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q5856092"}, "addTags": {"amenity": "pharmacy", "brand": "Farmatodo", "brand:wikidata": "Q5856092", "brand:wikipedia": "es:Farmatodo", "healthcare": "pharmacy", "name": "Farmatodo"}, "removeTags": {"amenity": "pharmacy", "brand": "Farmatodo", "brand:wikidata": "Q5856092", "brand:wikipedia": "es:Farmatodo", "healthcare": "pharmacy", "name": "Farmatodo"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
    "amenity/pharmacy/Gintarinė vaistinė": {"name": "Gintarinė vaistinė", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q15857801"}, "addTags": {"amenity": "pharmacy", "brand": "Gintarinė vaistinė", "brand:wikidata": "Q15857801", "brand:wikipedia": "lt:Gintarinė vaistinė", "healthcare": "pharmacy", "name": "Gintarinė vaistinė"}, "removeTags": {"amenity": "pharmacy", "brand": "Gintarinė vaistinė", "brand:wikidata": "Q15857801", "brand:wikipedia": "lt:Gintarinė vaistinė", "healthcare": "pharmacy", "name": "Gintarinė vaistinė"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
    "amenity/pharmacy/Guardian": {"name": "Guardian", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q13646560"}, "addTags": {"amenity": "pharmacy", "brand": "Guardian", "brand:wikidata": "Q13646560", "brand:wikipedia": "en:Mannings", "healthcare": "pharmacy", "name": "Guardian"}, "removeTags": {"amenity": "pharmacy", "brand": "Guardian", "brand:wikidata": "Q13646560", "brand:wikipedia": "en:Mannings", "healthcare": "pharmacy", "name": "Guardian"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
    "amenity/pharmacy/H-E-B Pharmacy": {"name": "H-E-B Pharmacy", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q830621"}, "addTags": {"amenity": "pharmacy", "brand": "H-E-B Pharmacy", "brand:wikidata": "Q830621", "brand:wikipedia": "en:H-E-B", "healthcare": "pharmacy", "name": "H-E-B Pharmacy"}, "removeTags": {"amenity": "pharmacy", "brand": "H-E-B Pharmacy", "brand:wikidata": "Q830621", "brand:wikipedia": "en:H-E-B", "healthcare": "pharmacy", "name": "H-E-B Pharmacy"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
-    "amenity/pharmacy/Hy-Vee Pharmacy": {"name": "Hy-Vee Pharmacy", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q1639719"}, "addTags": {"amenity": "pharmacy", "brand": "Hy-Vee Pharmacy", "brand:wikidata": "Q1639719", "brand:wikipedia": "en:Hy-Vee", "healthcare": "pharmacy", "name": "Hy-Vee Pharmacy"}, "removeTags": {"amenity": "pharmacy", "brand": "Hy-Vee Pharmacy", "brand:wikidata": "Q1639719", "brand:wikipedia": "en:Hy-Vee", "healthcare": "pharmacy", "name": "Hy-Vee Pharmacy"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
    "amenity/pharmacy/Inkafarma": {"name": "Inkafarma", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q10997748"}, "addTags": {"amenity": "pharmacy", "brand": "Inkafarma", "brand:wikidata": "Q10997748", "brand:wikipedia": "es:Inkafarma", "healthcare": "pharmacy", "name": "Inkafarma"}, "removeTags": {"amenity": "pharmacy", "brand": "Inkafarma", "brand:wikidata": "Q10997748", "brand:wikipedia": "es:Inkafarma", "healthcare": "pharmacy", "name": "Inkafarma"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
    "amenity/pharmacy/Jean Coutu": {"name": "Jean Coutu", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q3117457"}, "addTags": {"amenity": "pharmacy", "brand": "Jean Coutu", "brand:wikidata": "Q3117457", "brand:wikipedia": "en:Jean Coutu Group", "healthcare": "pharmacy", "name": "Jean Coutu"}, "removeTags": {"amenity": "pharmacy", "brand": "Jean Coutu", "brand:wikidata": "Q3117457", "brand:wikipedia": "en:Jean Coutu Group", "healthcare": "pharmacy", "name": "Jean Coutu"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
    "amenity/pharmacy/Kimia Farma": {"name": "Kimia Farma", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q11264892"}, "addTags": {"amenity": "pharmacy", "brand": "Kimia Farma", "brand:wikidata": "Q11264892", "brand:wikipedia": "en:Kimia Farma", "healthcare": "pharmacy", "name": "Kimia Farma"}, "removeTags": {"amenity": "pharmacy", "brand": "Kimia Farma", "brand:wikidata": "Q11264892", "brand:wikipedia": "en:Kimia Farma", "healthcare": "pharmacy", "name": "Kimia Farma"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
@@ -2033,7 +2021,6 @@
    "amenity/pharmacy/Lloyds Pharmacy": {"name": "Lloyds Pharmacy", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q6662870"}, "addTags": {"amenity": "pharmacy", "brand": "Lloyds Pharmacy", "brand:wikidata": "Q6662870", "brand:wikipedia": "en:LloydsPharmacy", "healthcare": "pharmacy", "name": "Lloyds Pharmacy"}, "removeTags": {"amenity": "pharmacy", "brand": "Lloyds Pharmacy", "brand:wikidata": "Q6662870", "brand:wikipedia": "en:LloydsPharmacy", "healthcare": "pharmacy", "name": "Lloyds Pharmacy"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
    "amenity/pharmacy/London Drugs": {"name": "London Drugs", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q3258955"}, "addTags": {"amenity": "pharmacy", "brand": "London Drugs", "brand:wikidata": "Q3258955", "brand:wikipedia": "en:London Drugs", "healthcare": "pharmacy", "name": "London Drugs"}, "removeTags": {"amenity": "pharmacy", "brand": "London Drugs", "brand:wikidata": "Q3258955", "brand:wikipedia": "en:London Drugs", "healthcare": "pharmacy", "name": "London Drugs"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
    "amenity/pharmacy/Mercury Drug": {"name": "Mercury Drug", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q6818610"}, "addTags": {"amenity": "pharmacy", "brand": "Mercury Drug", "brand:wikidata": "Q6818610", "brand:wikipedia": "en:Mercury Drug", "healthcare": "pharmacy", "name": "Mercury Drug"}, "removeTags": {"amenity": "pharmacy", "brand": "Mercury Drug", "brand:wikidata": "Q6818610", "brand:wikipedia": "en:Mercury Drug", "healthcare": "pharmacy", "name": "Mercury Drug"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
-    "amenity/pharmacy/Mēness aptieka": {"name": "Mēness aptieka", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q57583051"}, "addTags": {"amenity": "pharmacy", "brand": "Mēness aptieka", "brand:wikidata": "Q57583051", "healthcare": "pharmacy", "name": "Mēness aptieka"}, "removeTags": {"amenity": "pharmacy", "brand": "Mēness aptieka", "brand:wikidata": "Q57583051", "healthcare": "pharmacy", "name": "Mēness aptieka"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
    "amenity/pharmacy/Pague Menos": {"name": "Pague Menos", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q7124466"}, "addTags": {"amenity": "pharmacy", "brand": "Pague Menos", "brand:wikidata": "Q7124466", "brand:wikipedia": "pt:Pague Menos", "healthcare": "pharmacy", "name": "Pague Menos"}, "removeTags": {"amenity": "pharmacy", "brand": "Pague Menos", "brand:wikidata": "Q7124466", "brand:wikipedia": "pt:Pague Menos", "healthcare": "pharmacy", "name": "Pague Menos"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
    "amenity/pharmacy/Pharmacie Principale": {"name": "Pharmacie Principale", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q1547749"}, "addTags": {"amenity": "pharmacy", "brand": "Pharmacie Principale", "brand:wikidata": "Q1547749", "brand:wikipedia": "fr:PP Holding Group", "healthcare": "pharmacy", "name": "Pharmacie Principale"}, "removeTags": {"amenity": "pharmacy", "brand": "Pharmacie Principale", "brand:wikidata": "Q1547749", "brand:wikipedia": "fr:PP Holding Group", "healthcare": "pharmacy", "name": "Pharmacie Principale"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
    "amenity/pharmacy/Pharmaprix": {"name": "Pharmaprix", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q1820137"}, "addTags": {"amenity": "pharmacy", "brand": "Pharmaprix", "brand:wikidata": "Q1820137", "brand:wikipedia": "en:Shoppers Drug Mart", "healthcare": "pharmacy", "name": "Pharmaprix"}, "removeTags": {"amenity": "pharmacy", "brand": "Pharmaprix", "brand:wikidata": "Q1820137", "brand:wikipedia": "en:Shoppers Drug Mart", "healthcare": "pharmacy", "name": "Pharmaprix"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
@@ -2050,15 +2037,10 @@
    "amenity/pharmacy/Walmart Pharmacy": {"name": "Walmart Pharmacy", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q483551"}, "addTags": {"amenity": "pharmacy", "brand": "Walmart", "brand:wikidata": "Q483551", "brand:wikipedia": "en:Walmart", "healthcare": "pharmacy", "name": "Walmart Pharmacy", "operator": "Walmart", "operator:wikidata": "Q483551", "operator:wikipedia": "en:Walmart"}, "removeTags": {"amenity": "pharmacy", "brand": "Walmart", "brand:wikidata": "Q483551", "brand:wikipedia": "en:Walmart", "healthcare": "pharmacy", "name": "Walmart Pharmacy", "operator": "Walmart", "operator:wikidata": "Q483551", "operator:wikipedia": "en:Walmart"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
    "amenity/pharmacy/Watsons": {"name": "Watsons", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q7974785"}, "addTags": {"amenity": "pharmacy", "brand": "Watsons", "brand:wikidata": "Q7974785", "brand:wikipedia": "en:Watsons", "healthcare": "pharmacy", "name": "Watsons"}, "removeTags": {"amenity": "pharmacy", "brand": "Watsons", "brand:wikidata": "Q7974785", "brand:wikipedia": "en:Watsons", "healthcare": "pharmacy", "name": "Watsons"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
    "amenity/pharmacy/Well Pharmacy": {"name": "Well Pharmacy", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q7726524"}, "addTags": {"amenity": "pharmacy", "brand": "Well Pharmacy", "brand:wikidata": "Q7726524", "brand:wikipedia": "en:Well Pharmacy", "healthcare": "pharmacy", "name": "Well Pharmacy"}, "removeTags": {"amenity": "pharmacy", "brand": "Well Pharmacy", "brand:wikidata": "Q7726524", "brand:wikipedia": "en:Well Pharmacy", "healthcare": "pharmacy", "name": "Well Pharmacy"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
-    "amenity/pharmacy/くすりの福太郎": {"name": "くすりの福太郎", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q17214460"}, "addTags": {"amenity": "pharmacy", "brand": "くすりの福太郎", "brand:wikidata": "Q17214460", "brand:wikipedia": "ja:くすりの福太郎", "healthcare": "pharmacy", "name": "くすりの福太郎"}, "removeTags": {"amenity": "pharmacy", "brand": "くすりの福太郎", "brand:wikidata": "Q17214460", "brand:wikipedia": "ja:くすりの福太郎", "healthcare": "pharmacy", "name": "くすりの福太郎"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
    "amenity/pharmacy/ウエルシア": {"name": "ウエルシア", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q11288684"}, "addTags": {"amenity": "pharmacy", "brand": "ウエルシア", "brand:wikidata": "Q11288684", "brand:wikipedia": "ja:ウエルシアホールディングス", "healthcare": "pharmacy", "name": "ウエルシア"}, "removeTags": {"amenity": "pharmacy", "brand": "ウエルシア", "brand:wikidata": "Q11288684", "brand:wikipedia": "ja:ウエルシアホールディングス", "healthcare": "pharmacy", "name": "ウエルシア"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
    "amenity/pharmacy/ウエルシア薬局": {"name": "ウエルシア薬局", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q11288687"}, "addTags": {"amenity": "pharmacy", "brand": "ウエルシア薬局", "brand:wikidata": "Q11288687", "brand:wikipedia": "ja:ウエルシア薬局", "healthcare": "pharmacy", "name": "ウエルシア薬局"}, "removeTags": {"amenity": "pharmacy", "brand": "ウエルシア薬局", "brand:wikidata": "Q11288687", "brand:wikipedia": "ja:ウエルシア薬局", "healthcare": "pharmacy", "name": "ウエルシア薬局"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
    "amenity/pharmacy/カワチ薬品": {"name": "カワチ薬品", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q11295397"}, "addTags": {"amenity": "pharmacy", "brand": "カワチ薬品", "brand:wikidata": "Q11295397", "brand:wikipedia": "ja:カワチ薬品", "healthcare": "pharmacy", "name": "カワチ薬品"}, "removeTags": {"amenity": "pharmacy", "brand": "カワチ薬品", "brand:wikidata": "Q11295397", "brand:wikipedia": "ja:カワチ薬品", "healthcare": "pharmacy", "name": "カワチ薬品"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
    "amenity/pharmacy/キリン堂": {"name": "キリン堂", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q11297751"}, "addTags": {"amenity": "pharmacy", "brand": "キリン堂", "brand:wikidata": "Q11297751", "brand:wikipedia": "ja:キリン堂", "healthcare": "pharmacy", "name": "キリン堂"}, "removeTags": {"amenity": "pharmacy", "brand": "キリン堂", "brand:wikidata": "Q11297751", "brand:wikipedia": "ja:キリン堂", "healthcare": "pharmacy", "name": "キリン堂"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
-    "amenity/pharmacy/ココカラファイン": {"name": "ココカラファイン", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q11301948"}, "addTags": {"amenity": "pharmacy", "brand": "ココカラファイン", "brand:wikidata": "Q11301948", "brand:wikipedia": "ja:ココカラファイン", "healthcare": "pharmacy", "name": "ココカラファイン"}, "removeTags": {"amenity": "pharmacy", "brand": "ココカラファイン", "brand:wikidata": "Q11301948", "brand:wikipedia": "ja:ココカラファイン", "healthcare": "pharmacy", "name": "ココカラファイン"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
-    "amenity/pharmacy/サンドラッグ": {"name": "サンドラッグ", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q11305867"}, "addTags": {"amenity": "pharmacy", "brand": "サンドラッグ", "brand:wikidata": "Q11305867", "brand:wikipedia": "ja:サンドラッグ", "healthcare": "pharmacy", "name": "サンドラッグ"}, "removeTags": {"amenity": "pharmacy", "brand": "サンドラッグ", "brand:wikidata": "Q11305867", "brand:wikipedia": "ja:サンドラッグ", "healthcare": "pharmacy", "name": "サンドラッグ"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
-    "amenity/pharmacy/セイジョー": {"name": "セイジョー", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q11314133"}, "addTags": {"amenity": "pharmacy", "brand": "セイジョー", "brand:wikidata": "Q11314133", "brand:wikipedia": "ja:セイジョー", "healthcare": "pharmacy", "name": "セイジョー"}, "removeTags": {"amenity": "pharmacy", "brand": "セイジョー", "brand:wikidata": "Q11314133", "brand:wikipedia": "ja:セイジョー", "healthcare": "pharmacy", "name": "セイジョー"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
-    "amenity/pharmacy/マツモトキヨシ": {"name": "マツモトキヨシ", "icon": "maki-pharmacy", "geometry": ["point", "area"], "tags": {"amenity": "pharmacy", "brand:wikidata": "Q8014776"}, "addTags": {"amenity": "pharmacy", "brand": "マツモトキヨシ", "brand:wikidata": "Q8014776", "brand:wikipedia": "ja:マツモトキヨシ", "healthcare": "pharmacy", "name": "マツモトキヨシ"}, "removeTags": {"amenity": "pharmacy", "brand": "マツモトキヨシ", "brand:wikidata": "Q8014776", "brand:wikipedia": "ja:マツモトキヨシ", "healthcare": "pharmacy", "name": "マツモトキヨシ"}, "reference": {"key": "amenity", "value": "pharmacy"}, "matchScore": 2, "suggestion": true},
    "amenity/post_box/Deutsche Post": {"name": "Deutsche Post", "icon": "temaki-post_box", "geometry": ["point", "vertex"], "tags": {"amenity": "post_box", "brand:wikidata": "Q157645"}, "addTags": {"amenity": "post_box", "brand": "Deutsche Post", "brand:wikidata": "Q157645", "brand:wikipedia": "en:Deutsche Post", "name": "Deutsche Post"}, "removeTags": {"amenity": "post_box", "brand": "Deutsche Post", "brand:wikidata": "Q157645", "brand:wikipedia": "en:Deutsche Post", "name": "Deutsche Post"}, "matchScore": 2, "suggestion": true},
    "amenity/post_box/USPS": {"name": "USPS", "icon": "temaki-post_box", "geometry": ["point", "vertex"], "tags": {"amenity": "post_box", "brand:wikidata": "Q668687"}, "addTags": {"amenity": "post_box", "brand": "USPS", "brand:wikidata": "Q668687", "brand:wikipedia": "en:United States Postal Service", "name": "USPS", "operator": "USPS"}, "removeTags": {"amenity": "post_box", "brand": "USPS", "brand:wikidata": "Q668687", "brand:wikipedia": "en:United States Postal Service", "name": "USPS", "operator": "USPS"}, "matchScore": 2, "suggestion": true},
    "amenity/post_office/Australia Post": {"name": "Australia Post", "icon": "maki-post", "geometry": ["point", "area"], "tags": {"amenity": "post_office", "brand:wikidata": "Q1142936"}, "addTags": {"amenity": "post_office", "brand": "Australia Post", "brand:wikidata": "Q1142936", "brand:wikipedia": "en:Australia Post", "name": "Australia Post"}, "removeTags": {"amenity": "post_office", "brand": "Australia Post", "brand:wikidata": "Q1142936", "brand:wikipedia": "en:Australia Post", "name": "Australia Post"}, "matchScore": 2, "suggestion": true},
@@ -2092,7 +2074,6 @@
    "amenity/post_office/中国邮政": {"name": "中国邮政", "icon": "maki-post", "geometry": ["point", "area"], "tags": {"amenity": "post_office", "brand:wikidata": "Q1066476"}, "addTags": {"amenity": "post_office", "brand": "中国邮政", "brand:en": "China Post", "brand:wikidata": "Q1066476", "brand:wikipedia": "en:China Post", "name": "中国邮政", "name:en": "China Post"}, "removeTags": {"amenity": "post_office", "brand": "中国邮政", "brand:en": "China Post", "brand:wikidata": "Q1066476", "brand:wikipedia": "en:China Post", "name": "中国邮政", "name:en": "China Post"}, "matchScore": 2, "suggestion": true},
    "amenity/public_bookcase/Little Free Library": {"name": "Little Free Library", "icon": "maki-library", "geometry": ["point", "area"], "tags": {"amenity": "public_bookcase", "brand:wikidata": "Q6650101"}, "addTags": {"amenity": "public_bookcase", "brand": "Little Free Library", "brand:wikidata": "Q6650101", "brand:wikipedia": "en:Little Free Library", "name": "Little Free Library"}, "removeTags": {"amenity": "public_bookcase", "brand": "Little Free Library", "brand:wikidata": "Q6650101", "brand:wikipedia": "en:Little Free Library", "name": "Little Free Library"}, "matchScore": 2, "suggestion": true},
    "amenity/restaurant/100 Montaditos": {"name": "100 Montaditos", "icon": "maki-restaurant", "geometry": ["point", "area"], "tags": {"amenity": "restaurant", "brand:wikidata": "Q8355805"}, "addTags": {"amenity": "restaurant", "brand": "100 Montaditos", "brand:wikidata": "Q8355805", "brand:wikipedia": "en:Cervecería 100 Montaditos", "name": "100 Montaditos"}, "removeTags": {"amenity": "restaurant", "brand": "100 Montaditos", "brand:wikidata": "Q8355805", "brand:wikipedia": "en:Cervecería 100 Montaditos", "name": "100 Montaditos"}, "matchScore": 2, "suggestion": true},
-    "amenity/restaurant/italian/ASK Italian": {"name": "ASK Italian", "icon": "maki-restaurant", "geometry": ["point", "area"], "tags": {"amenity": "restaurant", "cuisine": "italian", "brand:wikidata": "Q4807056"}, "addTags": {"amenity": "restaurant", "brand": "ASK Italian", "brand:wikipedia": "en:ASK Italian", "brand:wikidata": "Q4807056", "cuisine": "italian", "name": "ASK Italian"}, "removeTags": {"amenity": "restaurant", "brand": "ASK Italian", "brand:wikipedia": "en:ASK Italian", "brand:wikidata": "Q4807056", "cuisine": "italian", "name": "ASK Italian"}, "reference": {"key": "cuisine", "value": "italian"}, "matchScore": 2, "suggestion": true},
    "amenity/restaurant/american/Applebee’s Neighborhood Grill & Bar": {"name": "Applebee’s Neighborhood Grill & Bar", "icon": "maki-restaurant", "geometry": ["point", "area"], "tags": {"amenity": "restaurant", "cuisine": "american", "brand:wikidata": "Q621532"}, "addTags": {"amenity": "restaurant", "brand": "Applebee’s Neighborhood Grill & Bar", "brand:wikidata": "Q621532", "brand:wikipedia": "en:Applebee's", "cuisine": "american", "name": "Applebee’s Neighborhood Grill & Bar"}, "removeTags": {"amenity": "restaurant", "brand": "Applebee’s Neighborhood Grill & Bar", "brand:wikidata": "Q621532", "brand:wikipedia": "en:Applebee's", "cuisine": "american", "name": "Applebee’s Neighborhood Grill & Bar"}, "reference": {"key": "cuisine", "value": "american"}, "matchScore": 2, "suggestion": true},
    "amenity/restaurant/Autogrill": {"name": "Autogrill", "icon": "maki-restaurant", "geometry": ["point", "area"], "tags": {"amenity": "restaurant", "brand:wikidata": "Q786790"}, "addTags": {"amenity": "restaurant", "brand": "Autogrill", "brand:wikidata": "Q786790", "brand:wikipedia": "en:Autogrill", "name": "Autogrill"}, "removeTags": {"amenity": "restaurant", "brand": "Autogrill", "brand:wikidata": "Q786790", "brand:wikipedia": "en:Autogrill", "name": "Autogrill"}, "matchScore": 2, "suggestion": true},
    "amenity/restaurant/Bella Italia": {"name": "Bella Italia", "icon": "maki-restaurant", "geometry": ["point", "area"], "tags": {"amenity": "restaurant", "brand:wikidata": "Q4883362"}, "addTags": {"amenity": "restaurant", "brand": "Bella Italia", "brand:wikidata": "Q4883362", "brand:wikipedia": "en:Bella Italia", "name": "Bella Italia"}, "removeTags": {"amenity": "restaurant", "brand": "Bella Italia", "brand:wikidata": "Q4883362", "brand:wikipedia": "en:Bella Italia", "name": "Bella Italia"}, "matchScore": 2, "suggestion": true},
@@ -2222,7 +2203,6 @@
    "amenity/vending_machine/public_transport_tickets/KKM": {"name": "KKM", "icon": "temaki-vending_machine", "geometry": ["point"], "tags": {"amenity": "vending_machine", "vending": "public_transport_tickets", "brand:wikidata": "Q57515549"}, "addTags": {"amenity": "vending_machine", "brand": "KKM", "brand:wikidata": "Q57515549", "name": "KKM", "vending": "public_transport_tickets"}, "removeTags": {"amenity": "vending_machine", "brand": "KKM", "brand:wikidata": "Q57515549", "name": "KKM", "vending": "public_transport_tickets"}, "reference": {"key": "vending", "value": "public_transport_tickets"}, "matchScore": 2, "suggestion": true},
    "amenity/vending_machine/parcel_pickup_dropoff/Paczkomat InPost": {"name": "Paczkomat InPost", "icon": "temaki-vending_machine", "geometry": ["point"], "tags": {"amenity": "vending_machine", "vending": "parcel_pickup;parcel_mail_in", "brand:wikidata": "Q3182097"}, "addTags": {"amenity": "vending_machine", "brand": "InPost", "brand:wikidata": "Q3182097", "brand:wikipedia": "pl:InPost", "name": "Paczkomat InPost", "vending": "parcel_pickup;parcel_mail_in"}, "removeTags": {"amenity": "vending_machine", "brand": "InPost", "brand:wikidata": "Q3182097", "brand:wikipedia": "pl:InPost", "name": "Paczkomat InPost", "vending": "parcel_pickup;parcel_mail_in"}, "reference": {"key": "vending", "value": "parcel_pickup;parcel_mail_in"}, "matchScore": 2, "suggestion": true},
    "amenity/vending_machine/Redbox": {"name": "Redbox", "icon": "temaki-vending_machine", "geometry": ["point"], "tags": {"amenity": "vending_machine", "brand:wikidata": "Q7305489"}, "addTags": {"amenity": "vending_machine", "brand": "Redbox", "brand:wikidata": "Q7305489", "brand:wikipedia": "en:Redbox", "name": "Redbox"}, "removeTags": {"amenity": "vending_machine", "brand": "Redbox", "brand:wikidata": "Q7305489", "brand:wikipedia": "en:Redbox", "name": "Redbox"}, "matchScore": 2, "suggestion": true},
-    "amenity/vending_machine/Robidog": {"name": "Robidog", "icon": "temaki-vending_machine", "geometry": ["point"], "tags": {"amenity": "vending_machine", "brand:wikidata": "Q2159689"}, "addTags": {"amenity": "vending_machine", "brand": "Robidog", "brand:wikidata": "Q2159689", "brand:wikipedia": "de:Robidog", "name": "Robidog"}, "removeTags": {"amenity": "vending_machine", "brand": "Robidog", "brand:wikidata": "Q2159689", "brand:wikipedia": "de:Robidog", "name": "Robidog"}, "matchScore": 2, "suggestion": true},
    "amenity/veterinary/Banfield Pet Hospital": {"name": "Banfield Pet Hospital", "icon": "temaki-veterinary_care", "geometry": ["point", "area"], "tags": {"amenity": "veterinary", "brand:wikidata": "Q2882416"}, "addTags": {"amenity": "veterinary", "brand": "Banfield Pet Hospital", "brand:wikidata": "Q2882416", "brand:wikipedia": "en:Banfield Pet Hospital", "name": "Banfield Pet Hospital"}, "removeTags": {"amenity": "veterinary", "brand": "Banfield Pet Hospital", "brand:wikidata": "Q2882416", "brand:wikipedia": "en:Banfield Pet Hospital", "name": "Banfield Pet Hospital"}, "matchScore": 2, "suggestion": true},
    "leisure/fitness_centre/24 Hour Fitness": {"name": "24 Hour Fitness", "icon": "fas-dumbbell", "geometry": ["point", "area"], "tags": {"leisure": "fitness_centre", "brand:wikidata": "Q4631849"}, "addTags": {"brand": "24 Hour Fitness", "brand:wikidata": "Q4631849", "brand:wikipedia": "en:24 Hour Fitness", "leisure": "fitness_centre", "name": "24 Hour Fitness"}, "removeTags": {"brand": "24 Hour Fitness", "brand:wikidata": "Q4631849", "brand:wikipedia": "en:24 Hour Fitness", "leisure": "fitness_centre", "name": "24 Hour Fitness"}, "matchScore": 2, "suggestion": true},
    "leisure/fitness_centre/Anytime Fitness": {"name": "Anytime Fitness", "icon": "fas-dumbbell", "geometry": ["point", "area"], "tags": {"leisure": "fitness_centre", "brand:wikidata": "Q4778364"}, "addTags": {"brand": "Anytime Fitness", "brand:wikidata": "Q4778364", "brand:wikipedia": "en:Anytime Fitness", "leisure": "fitness_centre", "name": "Anytime Fitness"}, "removeTags": {"brand": "Anytime Fitness", "brand:wikidata": "Q4778364", "brand:wikipedia": "en:Anytime Fitness", "leisure": "fitness_centre", "name": "Anytime Fitness"}, "matchScore": 2, "suggestion": true},
@@ -2238,69 +2218,47 @@
    "shop/alcohol/BWS": {"name": "BWS", "icon": "maki-alcohol-shop", "geometry": ["point", "area"], "tags": {"shop": "alcohol", "brand:wikidata": "Q4836848"}, "addTags": {"brand": "BWS", "brand:wikidata": "Q4836848", "brand:wikipedia": "en:BWS (liquor retailer)", "name": "BWS", "shop": "alcohol"}, "removeTags": {"brand": "BWS", "brand:wikidata": "Q4836848", "brand:wikipedia": "en:BWS (liquor retailer)", "name": "BWS", "shop": "alcohol"}, "matchScore": 2, "suggestion": true},
    "shop/alcohol/Bargain Booze": {"name": "Bargain Booze", "icon": "maki-alcohol-shop", "geometry": ["point", "area"], "tags": {"shop": "alcohol", "brand:wikidata": "Q16971315"}, "addTags": {"brand": "Bargain Booze", "brand:wikidata": "Q16971315", "brand:wikipedia": "en:Bargain Booze", "name": "Bargain Booze", "shop": "alcohol"}, "removeTags": {"brand": "Bargain Booze", "brand:wikidata": "Q16971315", "brand:wikipedia": "en:Bargain Booze", "name": "Bargain Booze", "shop": "alcohol"}, "matchScore": 2, "suggestion": true},
    "shop/alcohol/Dan Murphy's": {"name": "Dan Murphy's", "icon": "maki-alcohol-shop", "geometry": ["point", "area"], "tags": {"shop": "alcohol", "brand:wikidata": "Q5214075"}, "addTags": {"brand": "Dan Murphy's", "brand:wikidata": "Q5214075", "brand:wikipedia": "en:Dan Murphy's", "name": "Dan Murphy's", "shop": "alcohol"}, "removeTags": {"brand": "Dan Murphy's", "brand:wikidata": "Q5214075", "brand:wikipedia": "en:Dan Murphy's", "name": "Dan Murphy's", "shop": "alcohol"}, "matchScore": 2, "suggestion": true},
-    "shop/alcohol/Gall & Gall": {"name": "Gall & Gall", "icon": "maki-alcohol-shop", "geometry": ["point", "area"], "tags": {"shop": "alcohol", "brand:wikidata": "Q13639185"}, "addTags": {"brand": "Gall & Gall", "brand:wikidata": "Q13639185", "brand:wikipedia": "nl:Gall & Gall", "name": "Gall & Gall", "shop": "alcohol"}, "removeTags": {"brand": "Gall & Gall", "brand:wikidata": "Q13639185", "brand:wikipedia": "nl:Gall & Gall", "name": "Gall & Gall", "shop": "alcohol"}, "matchScore": 2, "suggestion": true},
    "shop/alcohol/LCBO": {"name": "LCBO", "icon": "maki-alcohol-shop", "geometry": ["point", "area"], "tags": {"shop": "alcohol", "brand:wikidata": "Q845263"}, "addTags": {"brand": "LCBO", "brand:wikidata": "Q845263", "brand:wikipedia": "en:Liquor Control Board of Ontario", "name": "LCBO", "shop": "alcohol"}, "removeTags": {"brand": "LCBO", "brand:wikidata": "Q845263", "brand:wikipedia": "en:Liquor Control Board of Ontario", "name": "LCBO", "shop": "alcohol"}, "matchScore": 2, "suggestion": true},
    "shop/alcohol/Liquorland": {"name": "Liquorland", "icon": "maki-alcohol-shop", "geometry": ["point", "area"], "tags": {"shop": "alcohol", "brand:wikidata": "Q2283837"}, "addTags": {"brand": "Liquorland", "brand:wikidata": "Q2283837", "brand:wikipedia": "en:Liquorland", "name": "Liquorland", "shop": "alcohol"}, "removeTags": {"brand": "Liquorland", "brand:wikidata": "Q2283837", "brand:wikipedia": "en:Liquorland", "name": "Liquorland", "shop": "alcohol"}, "matchScore": 2, "suggestion": true},
    "shop/alcohol/Nicolas": {"name": "Nicolas", "icon": "maki-alcohol-shop", "geometry": ["point", "area"], "tags": {"shop": "alcohol", "brand:wikidata": "Q3340012"}, "addTags": {"brand": "Nicolas", "brand:wikidata": "Q3340012", "brand:wikipedia": "en:Nicolas (wine retailer)", "name": "Nicolas", "shop": "alcohol"}, "removeTags": {"brand": "Nicolas", "brand:wikidata": "Q3340012", "brand:wikipedia": "en:Nicolas (wine retailer)", "name": "Nicolas", "shop": "alcohol"}, "matchScore": 2, "suggestion": true},
-    "shop/alcohol/SAQ": {"name": "SAQ", "icon": "maki-alcohol-shop", "geometry": ["point", "area"], "tags": {"shop": "alcohol", "brand:wikidata": "Q3488077"}, "addTags": {"brand": "SAQ", "brand:wikidata": "Q3488077", "brand:wikipedia": "en:Société des alcools du Québec", "name": "SAQ", "shop": "alcohol"}, "removeTags": {"brand": "SAQ", "brand:wikidata": "Q3488077", "brand:wikipedia": "en:Société des alcools du Québec", "name": "SAQ", "shop": "alcohol"}, "matchScore": 2, "suggestion": true},
    "shop/alcohol/Spec's": {"name": "Spec's", "icon": "maki-alcohol-shop", "geometry": ["point", "area"], "tags": {"shop": "alcohol", "brand:wikidata": "Q7574415"}, "addTags": {"brand": "Spec's", "brand:wikidata": "Q7574415", "brand:wikipedia": "en:Spec's Wine, Spirits & Finer Foods", "name": "Spec's", "shop": "alcohol"}, "removeTags": {"brand": "Spec's", "brand:wikidata": "Q7574415", "brand:wikipedia": "en:Spec's Wine, Spirits & Finer Foods", "name": "Spec's", "shop": "alcohol"}, "matchScore": 2, "suggestion": true},
    "shop/alcohol/Systembolaget": {"name": "Systembolaget", "icon": "maki-alcohol-shop", "geometry": ["point", "area"], "tags": {"shop": "alcohol", "brand:wikidata": "Q1476113"}, "addTags": {"brand": "Systembolaget", "brand:wikidata": "Q1476113", "brand:wikipedia": "en:Systembolaget", "name": "Systembolaget", "shop": "alcohol"}, "removeTags": {"brand": "Systembolaget", "brand:wikidata": "Q1476113", "brand:wikipedia": "en:Systembolaget", "name": "Systembolaget", "shop": "alcohol"}, "matchScore": 2, "suggestion": true},
    "shop/alcohol/The Beer Store": {"name": "The Beer Store", "icon": "maki-alcohol-shop", "geometry": ["point", "area"], "tags": {"shop": "alcohol", "brand:wikidata": "Q16243674"}, "addTags": {"brand": "The Beer Store", "brand:wikidata": "Q16243674", "brand:wikipedia": "en:The Beer Store", "name": "The Beer Store", "shop": "alcohol"}, "removeTags": {"brand": "The Beer Store", "brand:wikidata": "Q16243674", "brand:wikipedia": "en:The Beer Store", "name": "The Beer Store", "shop": "alcohol"}, "matchScore": 2, "suggestion": true},
    "shop/alcohol/Total Wine": {"name": "Total Wine", "icon": "maki-alcohol-shop", "geometry": ["point", "area"], "tags": {"shop": "alcohol", "brand:wikidata": "Q7828084"}, "addTags": {"brand": "Total Wine", "brand:wikidata": "Q7828084", "brand:wikipedia": "en:Total Wine & More", "name": "Total Wine", "shop": "alcohol"}, "removeTags": {"brand": "Total Wine", "brand:wikidata": "Q7828084", "brand:wikipedia": "en:Total Wine & More", "name": "Total Wine", "shop": "alcohol"}, "matchScore": 2, "suggestion": true},
    "shop/alcohol/Vinmonopolet": {"name": "Vinmonopolet", "icon": "maki-alcohol-shop", "geometry": ["point", "area"], "tags": {"shop": "alcohol", "brand:wikidata": "Q1740534"}, "addTags": {"brand": "Vinmonopolet", "brand:wikidata": "Q1740534", "brand:wikipedia": "en:Vinmonopolet", "name": "Vinmonopolet", "shop": "alcohol"}, "removeTags": {"brand": "Vinmonopolet", "brand:wikidata": "Q1740534", "brand:wikipedia": "en:Vinmonopolet", "name": "Vinmonopolet", "shop": "alcohol"}, "matchScore": 2, "suggestion": true},
-    "shop/alcohol/Virginia ABC": {"name": "Virginia ABC", "icon": "maki-alcohol-shop", "geometry": ["point", "area"], "tags": {"shop": "alcohol", "brand:wikidata": "Q7934236"}, "addTags": {"brand": "Virginia ABC", "brand:wikidata": "Q7934236", "brand:wikipedia": "en:Virginia Alcoholic Beverage Control Authority", "name": "Virginia ABC", "shop": "alcohol"}, "removeTags": {"brand": "Virginia ABC", "brand:wikidata": "Q7934236", "brand:wikipedia": "en:Virginia Alcoholic Beverage Control Authority", "name": "Virginia ABC", "shop": "alcohol"}, "matchScore": 2, "suggestion": true},
    "shop/alcohol/Красное & Белое": {"name": "Красное & Белое", "icon": "maki-alcohol-shop", "geometry": ["point", "area"], "tags": {"shop": "alcohol", "brand:wikidata": "Q24933790"}, "addTags": {"brand": "Красное & Белое", "brand:en": "Red&White", "brand:wikidata": "Q24933790", "brand:wikipedia": "en:Red&White", "name": "Красное & Белое", "name:en": "Red&White", "shop": "alcohol"}, "removeTags": {"brand": "Красное & Белое", "brand:en": "Red&White", "brand:wikidata": "Q24933790", "brand:wikipedia": "en:Red&White", "name": "Красное & Белое", "name:en": "Red&White", "shop": "alcohol"}, "matchScore": 2, "suggestion": true},
    "shop/baby_goods/Babies R Us": {"name": "Babies R Us", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "baby_goods", "brand:wikidata": "Q696334"}, "addTags": {"brand": "Babies R Us", "brand:wikidata": "Q696334", "brand:wikipedia": "en:Toys \"R\" Us", "name": "Babies R Us", "shop": "baby_goods"}, "removeTags": {"brand": "Babies R Us", "brand:wikidata": "Q696334", "brand:wikipedia": "en:Toys \"R\" Us", "name": "Babies R Us", "shop": "baby_goods"}, "matchScore": 2, "suggestion": true},
-    "shop/baby_goods/BabyOne": {"name": "BabyOne", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "baby_goods", "brand:wikidata": "Q57540408"}, "addTags": {"brand": "BabyOne", "brand:wikidata": "Q57540408", "name": "BabyOne", "shop": "baby_goods"}, "removeTags": {"brand": "BabyOne", "brand:wikidata": "Q57540408", "name": "BabyOne", "shop": "baby_goods"}, "matchScore": 2, "suggestion": true},
    "shop/baby_goods/Mothercare": {"name": "Mothercare", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "baby_goods", "brand:wikidata": "Q136738"}, "addTags": {"brand": "Mothercare", "brand:wikidata": "Q136738", "brand:wikipedia": "en:Mothercare", "name": "Mothercare", "shop": "baby_goods"}, "removeTags": {"brand": "Mothercare", "brand:wikidata": "Q136738", "brand:wikipedia": "en:Mothercare", "name": "Mothercare", "shop": "baby_goods"}, "matchScore": 2, "suggestion": true},
    "shop/bakery/Bakers Delight": {"name": "Bakers Delight", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q4849261"}, "addTags": {"brand": "Bakers Delight", "brand:wikidata": "Q4849261", "brand:wikipedia": "en:Bakers Delight", "name": "Bakers Delight", "shop": "bakery"}, "removeTags": {"brand": "Bakers Delight", "brand:wikidata": "Q4849261", "brand:wikipedia": "en:Bakers Delight", "name": "Bakers Delight", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
-    "shop/bakery/Bakker Bart": {"name": "Bakker Bart", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q2177445"}, "addTags": {"brand": "Bakker Bart", "brand:wikidata": "Q2177445", "brand:wikipedia": "nl:Bakker Bart", "name": "Bakker Bart", "shop": "bakery"}, "removeTags": {"brand": "Bakker Bart", "brand:wikidata": "Q2177445", "brand:wikipedia": "nl:Bakker Bart", "name": "Bakker Bart", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
-    "shop/bakery/Banette": {"name": "Banette", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q2882405"}, "addTags": {"brand": "Banette", "brand:wikidata": "Q2882405", "brand:wikipedia": "fr:Banette (entreprise)", "name": "Banette", "shop": "bakery"}, "removeTags": {"brand": "Banette", "brand:wikidata": "Q2882405", "brand:wikipedia": "fr:Banette (entreprise)", "name": "Banette", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
-    "shop/bakery/Bäckerei Fuchs": {"name": "Bäckerei Fuchs", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q42825993"}, "addTags": {"brand": "Bäckerei Fuchs", "brand:wikidata": "Q42825993", "brand:wikipedia": "de:Harald Fuchs Bäckerei – Konditorei", "name": "Bäckerei Fuchs", "shop": "bakery"}, "removeTags": {"brand": "Bäckerei Fuchs", "brand:wikidata": "Q42825993", "brand:wikipedia": "de:Harald Fuchs Bäckerei – Konditorei", "name": "Bäckerei Fuchs", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
    "shop/bakery/Cooplands": {"name": "Cooplands", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q5167971"}, "addTags": {"brand": "Cooplands", "brand:wikidata": "Q5167971", "brand:wikipedia": "en:Cooplands", "name": "Cooplands", "shop": "bakery"}, "removeTags": {"brand": "Cooplands", "brand:wikidata": "Q5167971", "brand:wikipedia": "en:Cooplands", "name": "Cooplands", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
    "shop/bakery/Der Beck": {"name": "Der Beck", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q1192443"}, "addTags": {"brand": "Der Beck", "brand:wikidata": "Q1192443", "brand:wikipedia": "en:Der Beck", "name": "Der Beck", "shop": "bakery"}, "removeTags": {"brand": "Der Beck", "brand:wikidata": "Q1192443", "brand:wikipedia": "en:Der Beck", "name": "Der Beck", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
    "shop/bakery/Ditsch": {"name": "Ditsch", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q911573"}, "addTags": {"brand": "Ditsch", "brand:wikidata": "Q911573", "brand:wikipedia": "en:Ditsch", "name": "Ditsch", "shop": "bakery"}, "removeTags": {"brand": "Ditsch", "brand:wikidata": "Q911573", "brand:wikipedia": "en:Ditsch", "name": "Ditsch", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
-    "shop/bakery/Fornetti": {"name": "Fornetti", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q1003020"}, "addTags": {"brand": "Fornetti", "brand:wikidata": "Q1003020", "brand:wikipedia": "en:Fornetti", "name": "Fornetti", "shop": "bakery"}, "removeTags": {"brand": "Fornetti", "brand:wikidata": "Q1003020", "brand:wikipedia": "en:Fornetti", "name": "Fornetti", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
-    "shop/bakery/Goldilocks": {"name": "Goldilocks", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q5580198"}, "addTags": {"brand": "Goldilocks", "brand:wikidata": "Q5580198", "brand:wikipedia": "en:Goldilocks Bakeshop", "name": "Goldilocks", "shop": "bakery"}, "removeTags": {"brand": "Goldilocks", "brand:wikidata": "Q5580198", "brand:wikipedia": "en:Goldilocks Bakeshop", "name": "Goldilocks", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
    "shop/bakery/Greggs": {"name": "Greggs", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q3403981"}, "addTags": {"brand": "Greggs", "brand:wikidata": "Q3403981", "brand:wikipedia": "en:Greggs", "name": "Greggs", "shop": "bakery"}, "removeTags": {"brand": "Greggs", "brand:wikidata": "Q3403981", "brand:wikipedia": "en:Greggs", "name": "Greggs", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
    "shop/bakery/Hofpfisterei": {"name": "Hofpfisterei", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q1623217"}, "addTags": {"brand": "Hofpfisterei", "brand:wikidata": "Q1623217", "brand:wikipedia": "en:Hofpfisterei", "name": "Hofpfisterei", "shop": "bakery"}, "removeTags": {"brand": "Hofpfisterei", "brand:wikidata": "Q1623217", "brand:wikipedia": "en:Hofpfisterei", "name": "Hofpfisterei", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
-    "shop/bakery/Ihle": {"name": "Ihle", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q881821"}, "addTags": {"brand": "Ihle", "brand:wikidata": "Q881821", "brand:wikipedia": "en:Ihle", "name": "Ihle", "shop": "bakery"}, "removeTags": {"brand": "Ihle", "brand:wikidata": "Q881821", "brand:wikipedia": "en:Ihle", "name": "Ihle", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
-    "shop/bakery/K&U Bäckerei": {"name": "K&U Bäckerei", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q1719433"}, "addTags": {"brand": "K&U Bäckerei", "brand:wikidata": "Q1719433", "brand:wikipedia": "de:K & U Bäckerei", "name": "K&U Bäckerei", "shop": "bakery"}, "removeTags": {"brand": "K&U Bäckerei", "brand:wikidata": "Q1719433", "brand:wikipedia": "de:K & U Bäckerei", "name": "K&U Bäckerei", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
    "shop/bakery/Kamps": {"name": "Kamps", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q1723381"}, "addTags": {"brand": "Kamps", "brand:wikidata": "Q1723381", "brand:wikipedia": "de:Kamps (Unternehmen)", "name": "Kamps", "shop": "bakery"}, "removeTags": {"brand": "Kamps", "brand:wikidata": "Q1723381", "brand:wikipedia": "de:Kamps (Unternehmen)", "name": "Kamps", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
    "shop/bakery/La Mie Câline": {"name": "La Mie Câline", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q3210704"}, "addTags": {"brand": "La Mie Câline", "brand:wikidata": "Q3210704", "brand:wikipedia": "fr:La Mie câline", "name": "La Mie Câline", "shop": "bakery"}, "removeTags": {"brand": "La Mie Câline", "brand:wikidata": "Q3210704", "brand:wikipedia": "fr:La Mie câline", "name": "La Mie Câline", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
-    "shop/bakery/Le Crobag": {"name": "Le Crobag", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q1558025"}, "addTags": {"brand": "Le Crobag", "brand:wikidata": "Q1558025", "brand:wikipedia": "de:Le Crobag", "name": "Le Crobag", "shop": "bakery"}, "removeTags": {"brand": "Le Crobag", "brand:wikidata": "Q1558025", "brand:wikipedia": "de:Le Crobag", "name": "Le Crobag", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
    "shop/bakery/Lila Bäcker": {"name": "Lila Bäcker", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q57516591"}, "addTags": {"brand": "Lila Bäcker", "brand:wikidata": "Q57516591", "name": "Lila Bäcker", "shop": "bakery"}, "removeTags": {"brand": "Lila Bäcker", "brand:wikidata": "Q57516591", "name": "Lila Bäcker", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
-    "shop/bakery/Musmanni": {"name": "Musmanni", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q19382082"}, "addTags": {"brand": "Musmanni", "brand:wikidata": "Q19382082", "brand:wikipedia": "no:Musmanni", "name": "Musmanni", "shop": "bakery"}, "removeTags": {"brand": "Musmanni", "brand:wikidata": "Q19382082", "brand:wikipedia": "no:Musmanni", "name": "Musmanni", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
-    "shop/bakery/Paul": {"name": "Paul", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q3370417"}, "addTags": {"brand": "Paul", "brand:wikidata": "Q3370417", "brand:wikipedia": "en:Paul (bakery)", "name": "Paul", "shop": "bakery"}, "removeTags": {"brand": "Paul", "brand:wikidata": "Q3370417", "brand:wikipedia": "en:Paul (bakery)", "name": "Paul", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
    "shop/bakery/Red Ribbon": {"name": "Red Ribbon", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q7304789"}, "addTags": {"brand": "Red Ribbon", "brand:wikidata": "Q7304789", "brand:wikipedia": "en:Red Ribbon Bakeshop", "name": "Red Ribbon", "shop": "bakery"}, "removeTags": {"brand": "Red Ribbon", "brand:wikidata": "Q7304789", "brand:wikipedia": "en:Red Ribbon Bakeshop", "name": "Red Ribbon", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
    "shop/bakery/Ronde des Pains": {"name": "Ronde des Pains", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q3441707"}, "addTags": {"brand": "Ronde des Pains", "brand:wikidata": "Q3441707", "brand:wikipedia": "fr:Ronde des Pains", "name": "Ronde des Pains", "shop": "bakery"}, "removeTags": {"brand": "Ronde des Pains", "brand:wikidata": "Q3441707", "brand:wikipedia": "fr:Ronde des Pains", "name": "Ronde des Pains", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
    "shop/bakery/Sehne": {"name": "Sehne", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q1314761"}, "addTags": {"brand": "Sehne", "brand:wikidata": "Q1314761", "brand:wikipedia": "de:Sehne Backwaren", "name": "Sehne", "shop": "bakery"}, "removeTags": {"brand": "Sehne", "brand:wikidata": "Q1314761", "brand:wikipedia": "de:Sehne Backwaren", "name": "Sehne", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
    "shop/bakery/Steinecke": {"name": "Steinecke", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q57516278"}, "addTags": {"brand": "Steinecke", "brand:wikidata": "Q57516278", "name": "Steinecke", "shop": "bakery"}, "removeTags": {"brand": "Steinecke", "brand:wikidata": "Q57516278", "name": "Steinecke", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
    "shop/bakery/Ströck": {"name": "Ströck", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q2357607"}, "addTags": {"brand": "Ströck", "brand:wikidata": "Q2357607", "brand:wikipedia": "de:Ströck-Brot", "name": "Ströck", "shop": "bakery"}, "removeTags": {"brand": "Ströck", "brand:wikidata": "Q2357607", "brand:wikipedia": "de:Ströck-Brot", "name": "Ströck", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
    "shop/bakery/Wiener Feinbäcker": {"name": "Wiener Feinbäcker", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q15854357"}, "addTags": {"brand": "Wiener Feinbäcker", "brand:wikidata": "Q15854357", "brand:wikipedia": "de:Wiener Feinbäckerei Heberer", "name": "Wiener Feinbäcker", "shop": "bakery"}, "removeTags": {"brand": "Wiener Feinbäcker", "brand:wikidata": "Q15854357", "brand:wikipedia": "de:Wiener Feinbäckerei Heberer", "name": "Wiener Feinbäcker", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
-    "shop/bakery/von Allwörden": {"name": "von Allwörden", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q60411349"}, "addTags": {"brand": "von Allwörden", "brand:wikidata": "Q60411349", "brand:wikipedia": "nds:Heinrich von Allwörden GmbH", "name": "von Allwörden", "shop": "bakery"}, "removeTags": {"brand": "von Allwörden", "brand:wikidata": "Q60411349", "brand:wikipedia": "nds:Heinrich von Allwörden GmbH", "name": "von Allwörden", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
    "shop/bakery/뚜레쥬르": {"name": "뚜레쥬르", "icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery", "brand:wikidata": "Q3535609"}, "addTags": {"brand": "뚜레쥬르", "brand:en": "Tous Les Jours", "brand:wikidata": "Q3535609", "brand:wikipedia": "ko:뚜레쥬르", "name": "뚜레쥬르", "name:en": "Tous Les Jours", "shop": "bakery"}, "removeTags": {"brand": "뚜레쥬르", "brand:en": "Tous Les Jours", "brand:wikidata": "Q3535609", "brand:wikipedia": "ko:뚜레쥬르", "name": "뚜레쥬르", "name:en": "Tous Les Jours", "shop": "bakery"}, "matchScore": 2, "suggestion": true},
    "shop/beauty/Bath & Body Works": {"name": "Bath & Body Works", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "beauty", "brand:wikidata": "Q810773"}, "addTags": {"brand": "Bath & Body Works", "brand:wikidata": "Q810773", "brand:wikipedia": "en:Bath & Body Works", "name": "Bath & Body Works", "shop": "beauty"}, "removeTags": {"brand": "Bath & Body Works", "brand:wikidata": "Q810773", "brand:wikipedia": "en:Bath & Body Works", "name": "Bath & Body Works", "shop": "beauty"}, "matchScore": 2, "suggestion": true},
    "shop/beauty/European Wax Center": {"name": "European Wax Center", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "beauty", "brand:wikidata": "Q5413426"}, "addTags": {"brand": "European Wax Center", "brand:wikidata": "Q5413426", "brand:wikipedia": "en:European Wax Center", "name": "European Wax Center", "shop": "beauty"}, "removeTags": {"brand": "European Wax Center", "brand:wikidata": "Q5413426", "brand:wikipedia": "en:European Wax Center", "name": "European Wax Center", "shop": "beauty"}, "matchScore": 2, "suggestion": true},
    "shop/beauty/Ulta Beauty": {"name": "Ulta Beauty", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "beauty", "brand:wikidata": "Q7880076"}, "addTags": {"brand": "Ulta Beauty", "brand:wikidata": "Q7880076", "brand:wikipedia": "en:Ulta Beauty", "name": "Ulta Beauty", "shop": "beauty"}, "removeTags": {"brand": "Ulta Beauty", "brand:wikidata": "Q7880076", "brand:wikipedia": "en:Ulta Beauty", "name": "Ulta Beauty", "shop": "beauty"}, "matchScore": 2, "suggestion": true},
    "shop/beauty/Yves Rocher": {"name": "Yves Rocher", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "beauty", "brand:wikidata": "Q28496595"}, "addTags": {"brand": "Yves Rocher", "brand:wikidata": "Q28496595", "brand:wikipedia": "fr:Yves Rocher (entreprise)", "name": "Yves Rocher", "shop": "beauty"}, "removeTags": {"brand": "Yves Rocher", "brand:wikidata": "Q28496595", "brand:wikipedia": "fr:Yves Rocher (entreprise)", "name": "Yves Rocher", "shop": "beauty"}, "matchScore": 2, "suggestion": true},
-    "shop/bed/Dreams": {"name": "Dreams", "icon": "maki-lodging", "geometry": ["point", "area"], "tags": {"shop": "bed", "brand:wikidata": "Q5306688"}, "addTags": {"brand": "Dreams", "brand:wikidata": "Q5306688", "brand:wikipedia": "en:Dreams (bed retailer)", "name": "Dreams", "shop": "bed"}, "removeTags": {"brand": "Dreams", "brand:wikidata": "Q5306688", "brand:wikipedia": "en:Dreams (bed retailer)", "name": "Dreams", "shop": "bed"}, "matchScore": 2, "suggestion": true},
    "shop/bed/Matratzen Concord": {"name": "Matratzen Concord", "icon": "maki-lodging", "geometry": ["point", "area"], "tags": {"shop": "bed", "brand:wikidata": "Q18629057"}, "addTags": {"brand": "Matratzen Concord", "brand:wikidata": "Q18629057", "brand:wikipedia": "de:Matratzen Concord", "name": "Matratzen Concord", "shop": "bed"}, "removeTags": {"brand": "Matratzen Concord", "brand:wikidata": "Q18629057", "brand:wikipedia": "de:Matratzen Concord", "name": "Matratzen Concord", "shop": "bed"}, "matchScore": 2, "suggestion": true},
    "shop/bed/Mattress Firm": {"name": "Mattress Firm", "icon": "maki-lodging", "geometry": ["point", "area"], "tags": {"shop": "bed", "brand:wikidata": "Q6791878"}, "addTags": {"brand": "Mattress Firm", "brand:wikidata": "Q6791878", "brand:wikipedia": "en:Mattress Firm", "name": "Mattress Firm", "shop": "bed"}, "removeTags": {"brand": "Mattress Firm", "brand:wikidata": "Q6791878", "brand:wikipedia": "en:Mattress Firm", "name": "Mattress Firm", "shop": "bed"}, "matchScore": 2, "suggestion": true},
    "shop/bed/Sleep Number": {"name": "Sleep Number", "icon": "maki-lodging", "geometry": ["point", "area"], "tags": {"shop": "bed", "brand:wikidata": "Q7447640"}, "addTags": {"brand": "Sleep Number", "brand:wikidata": "Q7447640", "brand:wikipedia": "en:Sleep Number", "name": "Sleep Number", "shop": "bed"}, "removeTags": {"brand": "Sleep Number", "brand:wikidata": "Q7447640", "brand:wikipedia": "en:Sleep Number", "name": "Sleep Number", "shop": "bed"}, "matchScore": 2, "suggestion": true},
    "shop/bed/Sleepy's": {"name": "Sleepy's", "icon": "maki-lodging", "geometry": ["point", "area"], "tags": {"shop": "bed", "brand:wikidata": "Q17088336"}, "addTags": {"brand": "Sleepy's", "brand:wikidata": "Q17088336", "brand:wikipedia": "en:Sleepy's", "name": "Sleepy's", "shop": "bed"}, "removeTags": {"brand": "Sleepy's", "brand:wikidata": "Q17088336", "brand:wikipedia": "en:Sleepy's", "name": "Sleepy's", "shop": "bed"}, "matchScore": 2, "suggestion": true},
-    "shop/beverages/Dursty": {"name": "Dursty", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "beverages", "brand:wikidata": "Q1267518"}, "addTags": {"brand": "Dursty", "brand:wikidata": "Q1267518", "brand:wikipedia": "de:Dursty Getränkemärkte", "name": "Dursty", "shop": "beverages"}, "removeTags": {"brand": "Dursty", "brand:wikidata": "Q1267518", "brand:wikipedia": "de:Dursty Getränkemärkte", "name": "Dursty", "shop": "beverages"}, "matchScore": 2, "suggestion": true},
    "shop/beverages/Edeka Getränkemarkt": {"name": "Edeka Getränkemarkt", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "beverages", "brand:wikidata": "Q57450576"}, "addTags": {"brand": "Edeka Getränkemarkt", "brand:wikidata": "Q57450576", "name": "Edeka Getränkemarkt", "shop": "beverages"}, "removeTags": {"brand": "Edeka Getränkemarkt", "brand:wikidata": "Q57450576", "name": "Edeka Getränkemarkt", "shop": "beverages"}, "matchScore": 2, "suggestion": true},
-    "shop/beverages/Fristo Getränkemarkt": {"name": "Fristo Getränkemarkt", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "beverages", "brand:wikidata": "Q1465151"}, "addTags": {"brand": "Fristo Getränkemarkt", "brand:wikidata": "Q1465151", "brand:wikipedia": "de:Fristo", "name": "Fristo Getränkemarkt", "shop": "beverages"}, "removeTags": {"brand": "Fristo Getränkemarkt", "brand:wikidata": "Q1465151", "brand:wikipedia": "de:Fristo", "name": "Fristo Getränkemarkt", "shop": "beverages"}, "matchScore": 2, "suggestion": true},
-    "shop/beverages/Getränke Hoffmann": {"name": "Getränke Hoffmann", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "beverages", "brand:wikidata": "Q19284021"}, "addTags": {"brand": "Getränke Hoffmann", "brand:wikidata": "Q19284021", "brand:wikipedia": "de:Getränke Hoffmann", "name": "Getränke Hoffmann", "shop": "beverages"}, "removeTags": {"brand": "Getränke Hoffmann", "brand:wikidata": "Q19284021", "brand:wikipedia": "de:Getränke Hoffmann", "name": "Getränke Hoffmann", "shop": "beverages"}, "matchScore": 2, "suggestion": true},
    "shop/beverages/Hol'ab": {"name": "Hol'ab", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "beverages", "brand:wikidata": "Q57557270"}, "addTags": {"brand": "Hol'ab", "brand:wikidata": "Q57557270", "name": "Hol'ab", "shop": "beverages"}, "removeTags": {"brand": "Hol'ab", "brand:wikidata": "Q57557270", "name": "Hol'ab", "shop": "beverages"}, "matchScore": 2, "suggestion": true},
-    "shop/beverages/Orterer Getränkemarkt": {"name": "Orterer Getränkemarkt", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "beverages", "brand:wikidata": "Q23787118"}, "addTags": {"brand": "Orterer Getränkemarkt", "brand:wikidata": "Q23787118", "brand:wikipedia": "de:Orterer Gruppe", "name": "Orterer Getränkemarkt", "shop": "beverages"}, "removeTags": {"brand": "Orterer Getränkemarkt", "brand:wikidata": "Q23787118", "brand:wikipedia": "de:Orterer Gruppe", "name": "Orterer Getränkemarkt", "shop": "beverages"}, "matchScore": 2, "suggestion": true},
    "shop/beverages/Rewe Getränkemarkt": {"name": "Rewe Getränkemarkt", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "beverages", "brand:wikidata": "Q57519344"}, "addTags": {"brand": "Rewe Getränkemarkt", "brand:wikidata": "Q57519344", "name": "Rewe Getränkemarkt", "shop": "beverages"}, "removeTags": {"brand": "Rewe Getränkemarkt", "brand:wikidata": "Q57519344", "name": "Rewe Getränkemarkt", "shop": "beverages"}, "matchScore": 2, "suggestion": true},
    "shop/beverages/Trinkgut": {"name": "Trinkgut", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "beverages", "brand:wikidata": "Q2453627"}, "addTags": {"brand": "Trinkgut", "brand:wikidata": "Q2453627", "brand:wikipedia": "de:Trinkgut", "name": "Trinkgut", "shop": "beverages"}, "removeTags": {"brand": "Trinkgut", "brand:wikidata": "Q2453627", "brand:wikipedia": "de:Trinkgut", "name": "Trinkgut", "shop": "beverages"}, "matchScore": 2, "suggestion": true},
    "shop/beverages/清心福全": {"name": "清心福全", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "beverages", "brand:wikidata": "Q10391229"}, "addTags": {"brand": "清心福全", "brand:wikidata": "Q10391229", "brand:wikipedia": "zh:清心福全冷飲站", "name": "清心福全", "shop": "beverages"}, "removeTags": {"brand": "清心福全", "brand:wikidata": "Q10391229", "brand:wikipedia": "zh:清心福全冷飲站", "name": "清心福全", "shop": "beverages"}, "matchScore": 2, "suggestion": true},
    "shop/bicycle/Evans Cycles": {"name": "Evans Cycles", "icon": "maki-bicycle", "geometry": ["point", "area"], "tags": {"shop": "bicycle", "brand:wikidata": "Q5415901"}, "addTags": {"brand": "Evans Cycles", "brand:wikidata": "Q5415901", "brand:wikipedia": "en:Evans Cycles", "name": "Evans Cycles", "shop": "bicycle"}, "removeTags": {"brand": "Evans Cycles", "brand:wikidata": "Q5415901", "brand:wikipedia": "en:Evans Cycles", "name": "Evans Cycles", "shop": "bicycle"}, "matchScore": 2, "suggestion": true},
-    "shop/bicycle/Fri BikeShop": {"name": "Fri BikeShop", "icon": "maki-bicycle", "geometry": ["point", "area"], "tags": {"shop": "bicycle", "brand:wikidata": "Q26721030"}, "addTags": {"brand": "Fri BikeShop", "brand:wikidata": "Q26721030", "name": "Fri BikeShop", "shop": "bicycle"}, "removeTags": {"brand": "Fri BikeShop", "brand:wikidata": "Q26721030", "name": "Fri BikeShop", "shop": "bicycle"}, "matchScore": 2, "suggestion": true},
-    "shop/bicycle/サイクルベースあさひ": {"name": "サイクルベースあさひ", "icon": "maki-bicycle", "geometry": ["point", "area"], "tags": {"shop": "bicycle", "brand:wikidata": "Q11257202"}, "addTags": {"brand": "サイクルベースあさひ", "brand:wikidata": "Q11257202", "brand:wikipedia": "ja:あさひ (企業)", "name": "サイクルベースあさひ", "shop": "bicycle"}, "removeTags": {"brand": "サイクルベースあさひ", "brand:wikidata": "Q11257202", "brand:wikipedia": "ja:あさひ (企業)", "name": "サイクルベースあさひ", "shop": "bicycle"}, "matchScore": 2, "suggestion": true},
    "shop/bookmaker/Betfred": {"name": "Betfred", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "bookmaker", "brand:wikidata": "Q4897425"}, "addTags": {"brand": "Betfred", "brand:wikidata": "Q4897425", "brand:wikipedia": "en:Betfred", "name": "Betfred", "shop": "bookmaker"}, "removeTags": {"brand": "Betfred", "brand:wikidata": "Q4897425", "brand:wikipedia": "en:Betfred", "name": "Betfred", "shop": "bookmaker"}, "matchScore": 2, "suggestion": true},
    "shop/bookmaker/Coral": {"name": "Coral", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "bookmaker", "brand:wikidata": "Q54621344"}, "addTags": {"brand": "Coral", "brand:wikidata": "Q54621344", "brand:wikipedia": "en:Coral (bookmaker)", "name": "Coral", "shop": "bookmaker"}, "removeTags": {"brand": "Coral", "brand:wikidata": "Q54621344", "brand:wikipedia": "en:Coral (bookmaker)", "name": "Coral", "shop": "bookmaker"}, "matchScore": 2, "suggestion": true},
    "shop/bookmaker/Ladbrokes": {"name": "Ladbrokes", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "bookmaker", "brand:wikidata": "Q1799875"}, "addTags": {"brand": "Ladbrokes", "brand:wikidata": "Q1799875", "brand:wikipedia": "en:Ladbrokes Coral", "name": "Ladbrokes", "shop": "bookmaker"}, "removeTags": {"brand": "Ladbrokes", "brand:wikidata": "Q1799875", "brand:wikipedia": "en:Ladbrokes Coral", "name": "Ladbrokes", "shop": "bookmaker"}, "matchScore": 2, "suggestion": true},
@@ -2308,30 +2266,22 @@
    "shop/bookmaker/Tipico": {"name": "Tipico", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "bookmaker", "brand:wikidata": "Q15851003"}, "addTags": {"brand": "Tipico", "brand:wikidata": "Q15851003", "brand:wikipedia": "en:Tipico", "name": "Tipico", "shop": "bookmaker"}, "removeTags": {"brand": "Tipico", "brand:wikidata": "Q15851003", "brand:wikipedia": "en:Tipico", "name": "Tipico", "shop": "bookmaker"}, "matchScore": 2, "suggestion": true},
    "shop/bookmaker/William Hill": {"name": "William Hill", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "bookmaker", "brand:wikidata": "Q4053147"}, "addTags": {"brand": "William Hill", "brand:wikidata": "Q4053147", "brand:wikipedia": "en:William Hill (bookmaker)", "name": "William Hill", "shop": "bookmaker"}, "removeTags": {"brand": "William Hill", "brand:wikidata": "Q4053147", "brand:wikipedia": "en:William Hill (bookmaker)", "name": "William Hill", "shop": "bookmaker"}, "matchScore": 2, "suggestion": true},
    "shop/bookmaker/ΟΠΑΠ": {"name": "ΟΠΑΠ", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "bookmaker", "brand:wikidata": "Q2007823"}, "addTags": {"brand": "ΟΠΑΠ", "brand:en": "OPAP", "brand:wikidata": "Q2007823", "brand:wikipedia": "en:OPAP", "name": "ΟΠΑΠ", "name:en": "OPAP", "shop": "bookmaker"}, "removeTags": {"brand": "ΟΠΑΠ", "brand:en": "OPAP", "brand:wikidata": "Q2007823", "brand:wikipedia": "en:OPAP", "name": "ΟΠΑΠ", "name:en": "OPAP", "shop": "bookmaker"}, "matchScore": 2, "suggestion": true},
-    "shop/bookmaker/Фонбет": {"name": "Фонбет", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "bookmaker", "brand:wikidata": "Q49137910"}, "addTags": {"brand": "Фонбет", "brand:wikidata": "Q49137910", "brand:wikipedia": "ru:Фонбет", "name": "Фонбет", "shop": "bookmaker"}, "removeTags": {"brand": "Фонбет", "brand:wikidata": "Q49137910", "brand:wikipedia": "ru:Фонбет", "name": "Фонбет", "shop": "bookmaker"}, "matchScore": 2, "suggestion": true},
    "shop/books/Akademibokhandeln": {"name": "Akademibokhandeln", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "books", "brand:wikidata": "Q10403918"}, "addTags": {"brand": "Akademibokhandeln", "brand:wikidata": "Q10403918", "brand:wikipedia": "sv:Akademibokhandeln", "name": "Akademibokhandeln", "shop": "books"}, "removeTags": {"brand": "Akademibokhandeln", "brand:wikidata": "Q10403918", "brand:wikipedia": "sv:Akademibokhandeln", "name": "Akademibokhandeln", "shop": "books"}, "matchScore": 2, "suggestion": true},
    "shop/books/Barnes & Noble": {"name": "Barnes & Noble", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "books", "brand:wikidata": "Q795454"}, "addTags": {"brand": "Barnes & Noble", "brand:wikidata": "Q795454", "brand:wikipedia": "en:Barnes & Noble", "name": "Barnes & Noble", "shop": "books"}, "removeTags": {"brand": "Barnes & Noble", "brand:wikidata": "Q795454", "brand:wikipedia": "en:Barnes & Noble", "name": "Barnes & Noble", "shop": "books"}, "matchScore": 2, "suggestion": true},
-    "shop/books/Bruna": {"name": "Bruna", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "books", "brand:wikidata": "Q3317555"}, "addTags": {"brand": "Bruna", "brand:wikidata": "Q3317555", "brand:wikipedia": "nl:Bruna (retail chain)", "name": "Bruna", "shop": "books"}, "removeTags": {"brand": "Bruna", "brand:wikidata": "Q3317555", "brand:wikipedia": "nl:Bruna (retail chain)", "name": "Bruna", "shop": "books"}, "matchScore": 2, "suggestion": true},
    "shop/books/Chapters": {"name": "Chapters", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "books", "brand:wikidata": "Q5073540"}, "addTags": {"brand": "Chapters", "brand:wikidata": "Q5073540", "brand:wikipedia": "en:Chapters", "name": "Chapters", "shop": "books"}, "removeTags": {"brand": "Chapters", "brand:wikidata": "Q5073540", "brand:wikipedia": "en:Chapters", "name": "Chapters", "shop": "books"}, "matchScore": 2, "suggestion": true},
    "shop/books/Empik": {"name": "Empik", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "books", "brand:wikidata": "Q3045978"}, "addTags": {"brand": "Empik", "brand:wikidata": "Q3045978", "brand:wikipedia": "en:Empik", "name": "Empik", "shop": "books"}, "removeTags": {"brand": "Empik", "brand:wikidata": "Q3045978", "brand:wikipedia": "en:Empik", "name": "Empik", "shop": "books"}, "matchScore": 2, "suggestion": true},
    "shop/books/Fnac": {"name": "Fnac", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "books", "brand:wikidata": "Q676585"}, "addTags": {"brand": "Fnac", "brand:wikidata": "Q676585", "brand:wikipedia": "en:Fnac", "name": "Fnac", "shop": "books"}, "removeTags": {"brand": "Fnac", "brand:wikidata": "Q676585", "brand:wikipedia": "en:Fnac", "name": "Fnac", "shop": "books"}, "matchScore": 2, "suggestion": true},
    "shop/books/Half Price Books": {"name": "Half Price Books", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "books", "brand:wikidata": "Q5641744"}, "addTags": {"brand": "Half Price Books", "brand:wikidata": "Q5641744", "brand:wikipedia": "en:Half Price Books", "name": "Half Price Books", "shop": "books"}, "removeTags": {"brand": "Half Price Books", "brand:wikidata": "Q5641744", "brand:wikipedia": "en:Half Price Books", "name": "Half Price Books", "shop": "books"}, "matchScore": 2, "suggestion": true},
    "shop/books/Hugendubel": {"name": "Hugendubel", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "books", "brand:wikidata": "Q1634142"}, "addTags": {"brand": "Hugendubel", "brand:wikidata": "Q1634142", "brand:wikipedia": "en:Hugendubel", "name": "Hugendubel", "shop": "books"}, "removeTags": {"brand": "Hugendubel", "brand:wikidata": "Q1634142", "brand:wikipedia": "en:Hugendubel", "name": "Hugendubel", "shop": "books"}, "matchScore": 2, "suggestion": true},
    "shop/books/National Book Store": {"name": "National Book Store", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "books", "brand:wikidata": "Q6971094"}, "addTags": {"brand": "National Book Store", "brand:wikidata": "Q6971094", "brand:wikipedia": "en:National Book Store", "name": "National Book Store", "shop": "books"}, "removeTags": {"brand": "National Book Store", "brand:wikidata": "Q6971094", "brand:wikipedia": "en:National Book Store", "name": "National Book Store", "shop": "books"}, "matchScore": 2, "suggestion": true},
-    "shop/books/Standaard Boekhandel": {"name": "Standaard Boekhandel", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "books", "brand:wikidata": "Q3496554"}, "addTags": {"brand": "Standaard Boekhandel", "brand:wikidata": "Q3496554", "brand:wikipedia": "nl:Standaard Boekhandel", "name": "Standaard Boekhandel", "shop": "books"}, "removeTags": {"brand": "Standaard Boekhandel", "brand:wikidata": "Q3496554", "brand:wikipedia": "nl:Standaard Boekhandel", "name": "Standaard Boekhandel", "shop": "books"}, "matchScore": 2, "suggestion": true},
    "shop/books/TSUTAYA": {"name": "TSUTAYA", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "books", "brand:wikidata": "Q5193457"}, "addTags": {"brand": "TSUTAYA", "brand:wikidata": "Q5193457", "brand:wikipedia": "ja:カルチュア・コンビニエンス・クラブ", "name": "TSUTAYA", "shop": "books"}, "removeTags": {"brand": "TSUTAYA", "brand:wikidata": "Q5193457", "brand:wikipedia": "ja:カルチュア・コンビニエンス・クラブ", "name": "TSUTAYA", "shop": "books"}, "matchScore": 2, "suggestion": true},
    "shop/books/Thalia": {"name": "Thalia", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "books", "brand:wikidata": "Q2408854"}, "addTags": {"brand": "Thalia", "brand:wikidata": "Q2408854", "brand:wikipedia": "de:Thalia Bücher", "name": "Thalia", "shop": "books"}, "removeTags": {"brand": "Thalia", "brand:wikidata": "Q2408854", "brand:wikipedia": "de:Thalia Bücher", "name": "Thalia", "shop": "books"}, "matchScore": 2, "suggestion": true},
-    "shop/books/The Works": {"name": "The Works", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "books", "brand:wikidata": "Q7775853"}, "addTags": {"brand": "The Works", "brand:wikidata": "Q7775853", "brand:wikipedia": "en:The Works (retailer)", "name": "The Works", "shop": "books"}, "removeTags": {"brand": "The Works", "brand:wikidata": "Q7775853", "brand:wikipedia": "en:The Works (retailer)", "name": "The Works", "shop": "books"}, "matchScore": 2, "suggestion": true},
    "shop/books/Waterstones": {"name": "Waterstones", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "books", "brand:wikidata": "Q151779"}, "addTags": {"brand": "Waterstones", "brand:wikidata": "Q151779", "brand:wikipedia": "en:Waterstones", "name": "Waterstones", "shop": "books"}, "removeTags": {"brand": "Waterstones", "brand:wikidata": "Q151779", "brand:wikipedia": "en:Waterstones", "name": "Waterstones", "shop": "books"}, "matchScore": 2, "suggestion": true},
    "shop/books/Weltbild": {"name": "Weltbild", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "books", "brand:wikidata": "Q883522"}, "addTags": {"brand": "Weltbild", "brand:wikidata": "Q883522", "brand:wikipedia": "en:Weltbild Publishing Group", "name": "Weltbild", "shop": "books"}, "removeTags": {"brand": "Weltbild", "brand:wikidata": "Q883522", "brand:wikipedia": "en:Weltbild Publishing Group", "name": "Weltbild", "shop": "books"}, "matchScore": 2, "suggestion": true},
-    "shop/books/Буквоед": {"name": "Буквоед", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "books", "brand:wikidata": "Q4098549"}, "addTags": {"brand": "Буквоед", "brand:wikidata": "Q4098549", "brand:wikipedia": "ru:Буквоед", "name": "Буквоед", "shop": "books"}, "removeTags": {"brand": "Буквоед", "brand:wikidata": "Q4098549", "brand:wikipedia": "ru:Буквоед", "name": "Буквоед", "shop": "books"}, "matchScore": 2, "suggestion": true},
-    "shop/books/Читай-город": {"name": "Читай-город", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "books", "brand:wikidata": "Q4516645"}, "addTags": {"brand": "Читай-город", "brand:wikidata": "Q4516645", "brand:wikipedia": "ru:Читай-город", "name": "Читай-город", "shop": "books"}, "removeTags": {"brand": "Читай-город", "brand:wikidata": "Q4516645", "brand:wikipedia": "ru:Читай-город", "name": "Читай-город", "shop": "books"}, "matchScore": 2, "suggestion": true},
    "shop/books/ブックオフ": {"name": "ブックオフ", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "books", "brand:wikidata": "Q893011"}, "addTags": {"brand": "ブックオフ", "brand:en": "Book Off", "brand:wikidata": "Q893011", "brand:wikipedia": "en:Book Off", "name": "ブックオフ", "name:en": "Book Off", "shop": "books"}, "removeTags": {"brand": "ブックオフ", "brand:en": "Book Off", "brand:wikidata": "Q893011", "brand:wikipedia": "en:Book Off", "name": "ブックオフ", "name:en": "Book Off", "shop": "books"}, "matchScore": 2, "suggestion": true},
    "shop/books/新华书店": {"name": "新华书店", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "books", "brand:wikidata": "Q6124193"}, "addTags": {"brand": "新华书店", "brand:en": "Xinhua Bookstore", "brand:wikidata": "Q6124193", "brand:wikipedia": "en:Xinhua Bookstore", "name": "新华书店", "name:en": "Xinhua Bookstore", "shop": "books"}, "removeTags": {"brand": "新华书店", "brand:en": "Xinhua Bookstore", "brand:wikidata": "Q6124193", "brand:wikipedia": "en:Xinhua Bookstore", "name": "新华书店", "name:en": "Xinhua Bookstore", "shop": "books"}, "matchScore": 2, "suggestion": true},
    "shop/butcher/Coqivoire": {"name": "Coqivoire", "icon": "maki-slaughterhouse", "geometry": ["point", "area"], "tags": {"shop": "butcher", "brand:wikidata": "Q60183284"}, "addTags": {"brand": "Coqivoire", "brand:wikidata": "Q60183284", "butcher": "poultry", "name": "Coqivoire", "shop": "butcher"}, "removeTags": {"brand": "Coqivoire", "brand:wikidata": "Q60183284", "butcher": "poultry", "name": "Coqivoire", "shop": "butcher"}, "matchScore": 2, "suggestion": true},
    "shop/butcher/Foani": {"name": "Foani", "icon": "maki-slaughterhouse", "geometry": ["point", "area"], "tags": {"shop": "butcher", "brand:wikidata": "Q60183335"}, "addTags": {"brand": "Foani", "brand:wikidata": "Q60183335", "butcher": "poultry", "name": "Foani", "shop": "butcher"}, "removeTags": {"brand": "Foani", "brand:wikidata": "Q60183335", "butcher": "poultry", "name": "Foani", "shop": "butcher"}, "matchScore": 2, "suggestion": true},
-    "shop/butcher/Vinzenzmurr": {"name": "Vinzenzmurr", "icon": "maki-slaughterhouse", "geometry": ["point", "area"], "tags": {"shop": "butcher", "brand:wikidata": "Q2527361"}, "addTags": {"brand": "Vinzenzmurr", "brand:wikidata": "Q2527361", "brand:wikipedia": "de:Vinzenzmurr", "name": "Vinzenzmurr", "shop": "butcher"}, "removeTags": {"brand": "Vinzenzmurr", "brand:wikidata": "Q2527361", "brand:wikipedia": "de:Vinzenzmurr", "name": "Vinzenzmurr", "shop": "butcher"}, "matchScore": 2, "suggestion": true},
-    "shop/butcher/Великолукский мясокомбинат": {"name": "Великолукский мясокомбинат", "icon": "maki-slaughterhouse", "geometry": ["point", "area"], "tags": {"shop": "butcher", "brand:wikidata": "Q18401767"}, "addTags": {"brand": "Великолукский мясокомбинат", "brand:wikidata": "Q18401767", "brand:wikipedia": "ru:Великолукский мясокомбинат", "name": "Великолукский мясокомбинат", "shop": "butcher"}, "removeTags": {"brand": "Великолукский мясокомбинат", "brand:wikidata": "Q18401767", "brand:wikipedia": "ru:Великолукский мясокомбинат", "name": "Великолукский мясокомбинат", "shop": "butcher"}, "matchScore": 2, "suggestion": true},
    "shop/butcher/Родинна ковбаска": {"name": "Родинна ковбаска", "icon": "maki-slaughterhouse", "geometry": ["point", "area"], "tags": {"shop": "butcher", "brand:wikidata": "Q30969660"}, "addTags": {"brand": "Родинна ковбаска", "brand:en": "Rodynna-kovbaska", "brand:wikidata": "Q30969660", "brand:wikipedia": "uk:ТзОВ «Барком»", "name": "Родинна ковбаска", "name:en": "Rodynna-kovbaska", "shop": "butcher"}, "removeTags": {"brand": "Родинна ковбаска", "brand:en": "Rodynna-kovbaska", "brand:wikidata": "Q30969660", "brand:wikipedia": "uk:ТзОВ «Барком»", "name": "Родинна ковбаска", "name:en": "Rodynna-kovbaska", "shop": "butcher"}, "matchScore": 2, "suggestion": true},
    "shop/car_parts/Advance Auto Parts": {"name": "Advance Auto Parts", "icon": "maki-car", "geometry": ["point", "area"], "tags": {"shop": "car_parts", "brand:wikidata": "Q4686051"}, "addTags": {"brand": "Advance Auto Parts", "brand:wikidata": "Q4686051", "brand:wikipedia": "en:Advance Auto Parts", "name": "Advance Auto Parts", "shop": "car_parts"}, "removeTags": {"brand": "Advance Auto Parts", "brand:wikidata": "Q4686051", "brand:wikipedia": "en:Advance Auto Parts", "name": "Advance Auto Parts", "shop": "car_parts"}, "matchScore": 2, "suggestion": true},
    "shop/car_parts/AutoZone": {"name": "AutoZone", "icon": "maki-car", "geometry": ["point", "area"], "tags": {"shop": "car_parts", "brand:wikidata": "Q4826087"}, "addTags": {"brand": "AutoZone", "brand:wikidata": "Q4826087", "brand:wikipedia": "en:AutoZone", "name": "AutoZone", "shop": "car_parts"}, "removeTags": {"brand": "AutoZone", "brand:wikidata": "Q4826087", "brand:wikipedia": "en:AutoZone", "name": "AutoZone", "shop": "car_parts"}, "matchScore": 2, "suggestion": true},
@@ -2340,15 +2290,10 @@
    "shop/car_parts/O'Reilly Auto Parts": {"name": "O'Reilly Auto Parts", "icon": "maki-car", "geometry": ["point", "area"], "tags": {"shop": "car_parts", "brand:wikidata": "Q7071951"}, "addTags": {"brand": "O'Reilly Auto Parts", "brand:wikidata": "Q7071951", "brand:wikipedia": "en:O'Reilly Auto Parts", "name": "O'Reilly Auto Parts", "shop": "car_parts"}, "removeTags": {"brand": "O'Reilly Auto Parts", "brand:wikidata": "Q7071951", "brand:wikipedia": "en:O'Reilly Auto Parts", "name": "O'Reilly Auto Parts", "shop": "car_parts"}, "matchScore": 2, "suggestion": true},
    "shop/car_parts/Repco": {"name": "Repco", "icon": "maki-car", "geometry": ["point", "area"], "tags": {"shop": "car_parts", "brand:wikidata": "Q173425"}, "addTags": {"brand": "Repco", "brand:wikidata": "Q173425", "brand:wikipedia": "en:Repco", "name": "Repco", "shop": "car_parts"}, "removeTags": {"brand": "Repco", "brand:wikidata": "Q173425", "brand:wikipedia": "en:Repco", "name": "Repco", "shop": "car_parts"}, "matchScore": 2, "suggestion": true},
    "shop/car_parts/Supercheap Auto": {"name": "Supercheap Auto", "icon": "maki-car", "geometry": ["point", "area"], "tags": {"shop": "car_parts", "brand:wikidata": "Q7643119"}, "addTags": {"brand": "Supercheap Auto", "brand:wikidata": "Q7643119", "brand:wikipedia": "en:Supercheap Auto", "name": "Supercheap Auto", "shop": "car_parts"}, "removeTags": {"brand": "Supercheap Auto", "brand:wikidata": "Q7643119", "brand:wikipedia": "en:Supercheap Auto", "name": "Supercheap Auto", "shop": "car_parts"}, "matchScore": 2, "suggestion": true},
-    "shop/car_parts/Автомир": {"name": "Автомир", "icon": "maki-car", "geometry": ["point", "area"], "tags": {"shop": "car_parts", "brand:wikidata": "Q4056321"}, "addTags": {"brand": "Автомир", "brand:wikidata": "Q4056321", "brand:wikipedia": "ru:Автомир (автодилер)", "name": "Автомир", "shop": "car_parts"}, "removeTags": {"brand": "Автомир", "brand:wikidata": "Q4056321", "brand:wikipedia": "ru:Автомир (автодилер)", "name": "Автомир", "shop": "car_parts"}, "matchScore": 2, "suggestion": true},
-    "shop/car_parts/イエローハット": {"name": "イエローハット", "icon": "maki-car", "geometry": ["point", "area"], "tags": {"shop": "car_parts", "brand:wikidata": "Q11285915"}, "addTags": {"brand": "イエローハット", "brand:wikidata": "Q11285915", "brand:wikipedia": "ja:イエローハット", "name": "イエローハット", "shop": "car_parts"}, "removeTags": {"brand": "イエローハット", "brand:wikidata": "Q11285915", "brand:wikipedia": "ja:イエローハット", "name": "イエローハット", "shop": "car_parts"}, "matchScore": 2, "suggestion": true},
-    "shop/car_parts/オートバックス": {"name": "オートバックス", "icon": "maki-car", "geometry": ["point", "area"], "tags": {"shop": "car_parts", "brand:wikidata": "Q7886426"}, "addTags": {"brand": "オートバックス", "brand:wikidata": "Q7886426", "brand:wikipedia": "ja:オートバックスセブン", "name": "オートバックス", "shop": "car_parts"}, "removeTags": {"brand": "オートバックス", "brand:wikidata": "Q7886426", "brand:wikipedia": "ja:オートバックスセブン", "name": "オートバックス", "shop": "car_parts"}, "matchScore": 2, "suggestion": true},
-    "shop/car_parts/タイヤ館": {"name": "タイヤ館", "icon": "maki-car", "geometry": ["point", "area"], "tags": {"shop": "car_parts", "brand:wikidata": "Q11315808"}, "addTags": {"brand": "タイヤ館", "brand:wikidata": "Q11315808", "brand:wikipedia": "ja:タイヤ館", "name": "タイヤ館", "shop": "car_parts"}, "removeTags": {"brand": "タイヤ館", "brand:wikidata": "Q11315808", "brand:wikipedia": "ja:タイヤ館", "name": "タイヤ館", "shop": "car_parts"}, "matchScore": 2, "suggestion": true},
    "shop/car_repair/A.T.U": {"name": "A.T.U", "icon": "maki-car-repair", "geometry": ["point", "area"], "tags": {"shop": "car_repair", "brand:wikidata": "Q784721"}, "addTags": {"brand": "A.T.U", "brand:wikidata": "Q784721", "brand:wikipedia": "de:Auto-Teile-Unger", "name": "A.T.U", "shop": "car_repair"}, "removeTags": {"brand": "A.T.U", "brand:wikidata": "Q784721", "brand:wikipedia": "de:Auto-Teile-Unger", "name": "A.T.U", "shop": "car_repair"}, "matchScore": 2, "suggestion": true},
    "shop/car_repair/ATS Euromaster": {"name": "ATS Euromaster", "icon": "maki-car-repair", "geometry": ["point", "area"], "tags": {"shop": "car_repair", "brand:wikidata": "Q4654920"}, "addTags": {"brand": "ATS Euromaster", "brand:wikidata": "Q4654920", "brand:wikipedia": "en:ATS Euromaster", "name": "ATS Euromaster", "shop": "car_repair"}, "removeTags": {"brand": "ATS Euromaster", "brand:wikidata": "Q4654920", "brand:wikipedia": "en:ATS Euromaster", "name": "ATS Euromaster", "shop": "car_repair"}, "matchScore": 2, "suggestion": true},
    "shop/car_repair/Bosch Car Service": {"name": "Bosch Car Service", "icon": "maki-car-repair", "geometry": ["point", "area"], "tags": {"shop": "car_repair", "brand:wikidata": "Q234021"}, "addTags": {"brand": "Bosch Car Service", "brand:wikidata": "Q234021", "brand:wikipedia": "de:Robert Bosch GmbH", "name": "Bosch Car Service", "shop": "car_repair"}, "removeTags": {"brand": "Bosch Car Service", "brand:wikidata": "Q234021", "brand:wikipedia": "de:Robert Bosch GmbH", "name": "Bosch Car Service", "shop": "car_repair"}, "matchScore": 2, "suggestion": true},
    "shop/car_repair/Carglass": {"name": "Carglass", "icon": "maki-car-repair", "geometry": ["point", "area"], "tags": {"shop": "car_repair", "brand:wikidata": "Q1035997"}, "addTags": {"brand": "Carglass", "brand:wikidata": "Q1035997", "brand:wikipedia": "de:Carglass", "name": "Carglass", "shop": "car_repair"}, "removeTags": {"brand": "Carglass", "brand:wikidata": "Q1035997", "brand:wikipedia": "de:Carglass", "name": "Carglass", "shop": "car_repair"}, "matchScore": 2, "suggestion": true},
-    "shop/car_repair/Feu Vert": {"name": "Feu Vert", "icon": "maki-car-repair", "geometry": ["point", "area"], "tags": {"shop": "car_repair", "brand:wikidata": "Q3070922"}, "addTags": {"brand": "Feu Vert", "brand:wikidata": "Q3070922", "brand:wikipedia": "fr:Feu Vert (entreprise)", "name": "Feu Vert", "shop": "car_repair"}, "removeTags": {"brand": "Feu Vert", "brand:wikidata": "Q3070922", "brand:wikipedia": "fr:Feu Vert (entreprise)", "name": "Feu Vert", "shop": "car_repair"}, "matchScore": 2, "suggestion": true},
    "shop/car_repair/Firestone": {"name": "Firestone", "icon": "maki-car-repair", "geometry": ["point", "area"], "tags": {"shop": "car_repair", "brand:wikidata": "Q420837"}, "addTags": {"brand": "Firestone", "brand:wikidata": "Q420837", "brand:wikipedia": "en:Firestone Tire and Rubber Company", "name": "Firestone", "shop": "car_repair"}, "removeTags": {"brand": "Firestone", "brand:wikidata": "Q420837", "brand:wikipedia": "en:Firestone Tire and Rubber Company", "name": "Firestone", "shop": "car_repair"}, "matchScore": 2, "suggestion": true},
    "shop/car_repair/Ford": {"name": "Ford", "icon": "maki-car-repair", "geometry": ["point", "area"], "tags": {"shop": "car_repair", "brand:wikidata": "Q44294"}, "addTags": {"brand": "Ford", "brand:wikidata": "Q44294", "brand:wikipedia": "en:Ford Motor Company", "name": "Ford", "shop": "car_repair"}, "removeTags": {"brand": "Ford", "brand:wikidata": "Q44294", "brand:wikipedia": "en:Ford Motor Company", "name": "Ford", "shop": "car_repair"}, "matchScore": 2, "suggestion": true},
    "shop/car_repair/Goodyear": {"name": "Goodyear", "icon": "maki-car-repair", "geometry": ["point", "area"], "tags": {"shop": "car_repair", "brand:wikidata": "Q620875"}, "addTags": {"brand": "Goodyear", "brand:wikidata": "Q620875", "brand:wikipedia": "en:Goodyear Tire and Rubber Company", "name": "Goodyear", "shop": "car_repair"}, "removeTags": {"brand": "Goodyear", "brand:wikidata": "Q620875", "brand:wikipedia": "en:Goodyear Tire and Rubber Company", "name": "Goodyear", "shop": "car_repair"}, "matchScore": 2, "suggestion": true},
@@ -2357,7 +2302,6 @@
    "shop/car_repair/Jiffy Lube": {"name": "Jiffy Lube", "icon": "maki-car-repair", "geometry": ["point", "area"], "tags": {"shop": "car_repair", "brand:wikidata": "Q6192247"}, "addTags": {"brand": "Jiffy Lube", "brand:wikidata": "Q6192247", "brand:wikipedia": "en:Jiffy Lube", "name": "Jiffy Lube", "shop": "car_repair"}, "removeTags": {"brand": "Jiffy Lube", "brand:wikidata": "Q6192247", "brand:wikipedia": "en:Jiffy Lube", "name": "Jiffy Lube", "shop": "car_repair"}, "matchScore": 2, "suggestion": true},
    "shop/car_repair/Kwik Fit": {"name": "Kwik Fit", "icon": "maki-car-repair", "geometry": ["point", "area"], "tags": {"shop": "car_repair", "brand:wikidata": "Q958053"}, "addTags": {"brand": "Kwik Fit", "brand:wikidata": "Q958053", "brand:wikipedia": "en:Kwik Fit", "name": "Kwik Fit", "shop": "car_repair"}, "removeTags": {"brand": "Kwik Fit", "brand:wikidata": "Q958053", "brand:wikipedia": "en:Kwik Fit", "name": "Kwik Fit", "shop": "car_repair"}, "matchScore": 2, "suggestion": true},
    "shop/car_repair/Meineke": {"name": "Meineke", "icon": "maki-car-repair", "geometry": ["point", "area"], "tags": {"shop": "car_repair", "brand:wikidata": "Q6810159"}, "addTags": {"brand": "Meineke", "brand:wikidata": "Q6810159", "brand:wikipedia": "en:Meineke Car Care Centers", "name": "Meineke", "shop": "car_repair"}, "removeTags": {"brand": "Meineke", "brand:wikidata": "Q6810159", "brand:wikipedia": "en:Meineke Car Care Centers", "name": "Meineke", "shop": "car_repair"}, "matchScore": 2, "suggestion": true},
-    "shop/car_repair/Mekonomen": {"name": "Mekonomen", "icon": "maki-car-repair", "geometry": ["point", "area"], "tags": {"shop": "car_repair", "brand:wikidata": "Q10580079"}, "addTags": {"brand": "Mekonomen", "brand:wikidata": "Q10580079", "brand:wikipedia": "sv:Mekonomen", "name": "Mekonomen", "shop": "car_repair"}, "removeTags": {"brand": "Mekonomen", "brand:wikidata": "Q10580079", "brand:wikipedia": "sv:Mekonomen", "name": "Mekonomen", "shop": "car_repair"}, "matchScore": 2, "suggestion": true},
    "shop/car_repair/Midas": {"name": "Midas", "icon": "maki-car-repair", "geometry": ["point", "area"], "tags": {"shop": "car_repair", "brand:wikidata": "Q3312613"}, "addTags": {"brand": "Midas", "brand:wikidata": "Q3312613", "brand:wikipedia": "en:Midas (automotive service)", "name": "Midas", "shop": "car_repair"}, "removeTags": {"brand": "Midas", "brand:wikidata": "Q3312613", "brand:wikipedia": "en:Midas (automotive service)", "name": "Midas", "shop": "car_repair"}, "matchScore": 2, "suggestion": true},
    "shop/car_repair/Mr. Lube": {"name": "Mr. Lube", "icon": "maki-car-repair", "geometry": ["point", "area"], "tags": {"shop": "car_repair", "brand:wikidata": "Q17104067"}, "addTags": {"brand": "Mr. Lube", "brand:wikidata": "Q17104067", "brand:wikipedia": "en:Mr. Lube", "name": "Mr. Lube", "shop": "car_repair"}, "removeTags": {"brand": "Mr. Lube", "brand:wikidata": "Q17104067", "brand:wikipedia": "en:Mr. Lube", "name": "Mr. Lube", "shop": "car_repair"}, "matchScore": 2, "suggestion": true},
    "shop/car_repair/Norauto": {"name": "Norauto", "icon": "maki-car-repair", "geometry": ["point", "area"], "tags": {"shop": "car_repair", "brand:wikidata": "Q3317698"}, "addTags": {"brand": "Norauto", "brand:wikidata": "Q3317698", "brand:wikipedia": "en:Mobivia Groupe", "name": "Norauto", "shop": "car_repair"}, "removeTags": {"brand": "Norauto", "brand:wikidata": "Q3317698", "brand:wikipedia": "en:Mobivia Groupe", "name": "Norauto", "shop": "car_repair"}, "matchScore": 2, "suggestion": true},
@@ -2590,7 +2534,6 @@
    "shop/clothes/Zara": {"name": "Zara", "icon": "maki-clothing-store", "geometry": ["point", "area"], "tags": {"shop": "clothes", "brand:wikidata": "Q147662"}, "addTags": {"brand": "Zara", "brand:wikidata": "Q147662", "brand:wikipedia": "en:Zara (retailer)", "name": "Zara", "shop": "clothes"}, "removeTags": {"brand": "Zara", "brand:wikidata": "Q147662", "brand:wikipedia": "en:Zara (retailer)", "name": "Zara", "shop": "clothes"}, "matchScore": 2, "suggestion": true},
    "shop/clothes/Zeeman": {"name": "Zeeman", "icon": "maki-clothing-store", "geometry": ["point", "area"], "tags": {"shop": "clothes", "brand:wikidata": "Q184399"}, "addTags": {"brand": "Zeeman", "brand:wikidata": "Q184399", "brand:wikipedia": "en:Zeeman (store)", "name": "Zeeman", "shop": "clothes"}, "removeTags": {"brand": "Zeeman", "brand:wikidata": "Q184399", "brand:wikipedia": "en:Zeeman (store)", "name": "Zeeman", "shop": "clothes"}, "matchScore": 2, "suggestion": true},
    "shop/clothes/Zumiez": {"name": "Zumiez", "icon": "maki-clothing-store", "geometry": ["point", "area"], "tags": {"shop": "clothes", "brand:wikidata": "Q8075252"}, "addTags": {"brand": "Zumiez", "brand:wikidata": "Q8075252", "brand:wikipedia": "en:Zumiez", "name": "Zumiez", "shop": "clothes"}, "removeTags": {"brand": "Zumiez", "brand:wikidata": "Q8075252", "brand:wikipedia": "en:Zumiez", "name": "Zumiez", "shop": "clothes"}, "matchScore": 2, "suggestion": true},
-    "shop/clothes/mister*lady": {"name": "mister*lady", "icon": "maki-clothing-store", "geometry": ["point", "area"], "tags": {"shop": "clothes", "brand:wikidata": "Q18640136"}, "addTags": {"brand": "mister*lady", "brand:wikidata": "Q18640136", "brand:wikipedia": "de:mister*lady", "name": "mister*lady", "shop": "clothes"}, "removeTags": {"brand": "mister*lady", "brand:wikidata": "Q18640136", "brand:wikipedia": "de:mister*lady", "name": "mister*lady", "shop": "clothes"}, "matchScore": 2, "suggestion": true},
    "shop/clothes/rue21": {"name": "rue21", "icon": "maki-clothing-store", "geometry": ["point", "area"], "tags": {"shop": "clothes", "brand:wikidata": "Q7377762"}, "addTags": {"brand": "rue21", "brand:wikidata": "Q7377762", "brand:wikipedia": "en:rue21", "name": "rue21", "shop": "clothes"}, "removeTags": {"brand": "rue21", "brand:wikidata": "Q7377762", "brand:wikipedia": "en:rue21", "name": "rue21", "shop": "clothes"}, "matchScore": 2, "suggestion": true},
    "shop/clothes/s.Oliver": {"name": "s.Oliver", "icon": "maki-clothing-store", "geometry": ["point", "area"], "tags": {"shop": "clothes", "brand:wikidata": "Q265056"}, "addTags": {"brand": "s.Oliver", "brand:wikidata": "Q265056", "brand:wikipedia": "en:S.Oliver", "name": "s.Oliver", "shop": "clothes"}, "removeTags": {"brand": "s.Oliver", "brand:wikidata": "Q265056", "brand:wikipedia": "en:S.Oliver", "name": "s.Oliver", "shop": "clothes"}, "matchScore": 2, "suggestion": true},
    "shop/clothes/しまむら": {"name": "しまむら", "icon": "maki-clothing-store", "geometry": ["point", "area"], "tags": {"shop": "clothes", "brand:wikidata": "Q7758173"}, "addTags": {"brand": "しまむら", "brand:wikidata": "Q7758173", "brand:wikipedia": "ja:しまむら", "name": "しまむら", "shop": "clothes"}, "removeTags": {"brand": "しまむら", "brand:wikidata": "Q7758173", "brand:wikipedia": "ja:しまむら", "name": "しまむら", "shop": "clothes"}, "matchScore": 2, "suggestion": true},
@@ -2616,7 +2559,6 @@
    "shop/convenience/COOP Jednota": {"name": "COOP Jednota", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "convenience", "brand:wikidata": "Q41629254"}, "addTags": {"brand": "COOP Jednota", "brand:wikidata": "Q41629254", "brand:wikipedia": "sk:COOP Jednota Slovensko", "name": "COOP Jednota", "shop": "convenience"}, "removeTags": {"brand": "COOP Jednota", "brand:wikidata": "Q41629254", "brand:wikipedia": "sk:COOP Jednota Slovensko", "name": "COOP Jednota", "shop": "convenience"}, "matchScore": 2, "suggestion": true},
    "shop/convenience/Circle K": {"name": "Circle K", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "convenience", "brand:wikidata": "Q3268010"}, "addTags": {"brand": "Circle K", "brand:wikidata": "Q3268010", "brand:wikipedia": "en:Circle K", "name": "Circle K", "shop": "convenience"}, "removeTags": {"brand": "Circle K", "brand:wikidata": "Q3268010", "brand:wikipedia": "en:Circle K", "name": "Circle K", "shop": "convenience"}, "matchScore": 2, "suggestion": true},
    "shop/convenience/Co-op": {"name": "Co-op", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "convenience", "brand:wikidata": "Q5440676"}, "addTags": {"brand": "Federated Co-operatives", "brand:wikidata": "Q5440676", "brand:wikipedia": "en:Federated Co-operatives", "name": "Co-op", "shop": "convenience"}, "removeTags": {"brand": "Federated Co-operatives", "brand:wikidata": "Q5440676", "brand:wikipedia": "en:Federated Co-operatives", "name": "Co-op", "shop": "convenience"}, "matchScore": 2, "suggestion": true},
-    "shop/convenience/Coop Pronto": {"name": "Coop Pronto", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "convenience", "brand:wikidata": "Q1129777"}, "addTags": {"brand": "Coop Pronto", "brand:wikidata": "Q1129777", "brand:wikipedia": "de:Coop Mineraloel", "name": "Coop Pronto", "shop": "convenience"}, "removeTags": {"brand": "Coop Pronto", "brand:wikidata": "Q1129777", "brand:wikipedia": "de:Coop Mineraloel", "name": "Coop Pronto", "shop": "convenience"}, "matchScore": 2, "suggestion": true},
    "shop/convenience/FamilyMart": {"name": "FamilyMart", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "convenience", "brand:wikidata": "Q1191685"}, "addTags": {"brand": "FamilyMart", "brand:wikidata": "Q1191685", "brand:wikipedia": "en:FamilyMart", "name": "FamilyMart", "shop": "convenience"}, "removeTags": {"brand": "FamilyMart", "brand:wikidata": "Q1191685", "brand:wikipedia": "en:FamilyMart", "name": "FamilyMart", "shop": "convenience"}, "matchScore": 2, "suggestion": true},
    "shop/convenience/Four Square": {"name": "Four Square", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "convenience", "brand:wikidata": "Q5475558"}, "addTags": {"brand": "Four Square", "brand:wikidata": "Q5475558", "brand:wikipedia": "en:Four Square (supermarket)", "name": "Four Square", "shop": "convenience"}, "removeTags": {"brand": "Four Square", "brand:wikidata": "Q5475558", "brand:wikipedia": "en:Four Square (supermarket)", "name": "Four Square", "shop": "convenience"}, "matchScore": 2, "suggestion": true},
    "shop/convenience/Hasty Market": {"name": "Hasty Market", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "convenience", "brand:wikidata": "Q58022603"}, "addTags": {"brand": "Hasty Market", "brand:wikidata": "Q58022603", "name": "Hasty Market", "shop": "convenience"}, "removeTags": {"brand": "Hasty Market", "brand:wikidata": "Q58022603", "name": "Hasty Market", "shop": "convenience"}, "matchScore": 2, "suggestion": true},
@@ -2699,7 +2641,6 @@
    "shop/department_store/Debenhams": {"name": "Debenhams", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "department_store", "brand:wikidata": "Q1181484"}, "addTags": {"brand": "Debenhams", "brand:wikidata": "Q1181484", "brand:wikipedia": "en:Debenhams", "name": "Debenhams", "shop": "department_store"}, "removeTags": {"brand": "Debenhams", "brand:wikidata": "Q1181484", "brand:wikipedia": "en:Debenhams", "name": "Debenhams", "shop": "department_store"}, "matchScore": 2, "suggestion": true},
    "shop/department_store/Dillard's": {"name": "Dillard's", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "department_store", "brand:wikidata": "Q844805"}, "addTags": {"brand": "Dillard's", "brand:wikidata": "Q844805", "brand:wikipedia": "en:Dillard's", "name": "Dillard's", "shop": "department_store"}, "removeTags": {"brand": "Dillard's", "brand:wikidata": "Q844805", "brand:wikipedia": "en:Dillard's", "name": "Dillard's", "shop": "department_store"}, "matchScore": 2, "suggestion": true},
    "shop/department_store/El Corte Inglés": {"name": "El Corte Inglés", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "department_store", "brand:wikidata": "Q623133"}, "addTags": {"brand": "El Corte Inglés", "brand:wikidata": "Q623133", "brand:wikipedia": "en:El Corte Inglés", "name": "El Corte Inglés", "shop": "department_store"}, "removeTags": {"brand": "El Corte Inglés", "brand:wikidata": "Q623133", "brand:wikipedia": "en:El Corte Inglés", "name": "El Corte Inglés", "shop": "department_store"}, "matchScore": 2, "suggestion": true},
-    "shop/department_store/Falabella": {"name": "Falabella", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "department_store", "brand:wikidata": "Q5135229"}, "addTags": {"brand": "Falabella", "brand:wikidata": "Q5135229", "brand:wikipedia": "en:Falabella (retail store)", "name": "Falabella", "shop": "department_store"}, "removeTags": {"brand": "Falabella", "brand:wikidata": "Q5135229", "brand:wikipedia": "en:Falabella (retail store)", "name": "Falabella", "shop": "department_store"}, "matchScore": 2, "suggestion": true},
    "shop/department_store/Galeria Kaufhof": {"name": "Galeria Kaufhof", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "department_store", "brand:wikidata": "Q322598"}, "addTags": {"brand": "Galeria Kaufhof", "brand:wikidata": "Q322598", "brand:wikipedia": "en:Galeria Kaufhof", "name": "Galeria Kaufhof", "shop": "department_store"}, "removeTags": {"brand": "Galeria Kaufhof", "brand:wikidata": "Q322598", "brand:wikipedia": "en:Galeria Kaufhof", "name": "Galeria Kaufhof", "shop": "department_store"}, "matchScore": 2, "suggestion": true},
    "shop/department_store/Giant Tiger": {"name": "Giant Tiger", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "department_store", "brand:wikidata": "Q5558429"}, "addTags": {"brand": "Giant Tiger", "brand:wikidata": "Q5558429", "brand:wikipedia": "en:Giant Tiger", "name": "Giant Tiger", "shop": "department_store"}, "removeTags": {"brand": "Giant Tiger", "brand:wikidata": "Q5558429", "brand:wikipedia": "en:Giant Tiger", "name": "Giant Tiger", "shop": "department_store"}, "matchScore": 2, "suggestion": true},
    "shop/department_store/HEMA": {"name": "HEMA", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "department_store", "brand:wikidata": "Q903805"}, "addTags": {"brand": "HEMA", "brand:wikidata": "Q903805", "brand:wikipedia": "en:HEMA (store)", "name": "HEMA", "shop": "department_store"}, "removeTags": {"brand": "HEMA", "brand:wikidata": "Q903805", "brand:wikipedia": "en:HEMA (store)", "name": "HEMA", "shop": "department_store"}, "matchScore": 2, "suggestion": true},
@@ -2891,6 +2832,7 @@
    "shop/jewelry/Kay Jewelers": {"name": "Kay Jewelers", "icon": "maki-jewelry-store", "geometry": ["point", "area"], "tags": {"shop": "jewelry", "brand:wikidata": "Q7611434"}, "addTags": {"brand": "Kay Jewelers", "brand:wikidata": "Q7611434", "brand:wikipedia": "en:Sterling Jewelers", "name": "Kay Jewelers", "shop": "jewelry"}, "removeTags": {"brand": "Kay Jewelers", "brand:wikidata": "Q7611434", "brand:wikipedia": "en:Sterling Jewelers", "name": "Kay Jewelers", "shop": "jewelry"}, "matchScore": 2, "suggestion": true},
    "shop/jewelry/Pandora": {"name": "Pandora", "icon": "maki-jewelry-store", "geometry": ["point", "area"], "tags": {"shop": "jewelry", "brand:wikidata": "Q2241604"}, "addTags": {"brand": "Pandora", "brand:wikidata": "Q2241604", "brand:wikipedia": "en:Pandora (jewelry)", "name": "Pandora", "shop": "jewelry"}, "removeTags": {"brand": "Pandora", "brand:wikidata": "Q2241604", "brand:wikipedia": "en:Pandora (jewelry)", "name": "Pandora", "shop": "jewelry"}, "matchScore": 2, "suggestion": true},
    "shop/jewelry/Swarovski": {"name": "Swarovski", "icon": "maki-jewelry-store", "geometry": ["point", "area"], "tags": {"shop": "jewelry", "brand:wikidata": "Q611115"}, "addTags": {"brand": "Swarovski", "brand:wikidata": "Q611115", "brand:wikipedia": "en:Swarovski", "name": "Swarovski", "shop": "jewelry"}, "removeTags": {"brand": "Swarovski", "brand:wikidata": "Q611115", "brand:wikipedia": "en:Swarovski", "name": "Swarovski", "shop": "jewelry"}, "matchScore": 2, "suggestion": true},
+    "shop/kiosk/Kolporter": {"name": "Kolporter", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "kiosk", "brand:wikidata": "Q6427874"}, "addTags": {"brand": "Kolporter", "brand:wikidata": "Q6427874", "brand:wikipedia": "pl:Kolporter (przedsiębiorstwo)", "name": "Kolporter", "shop": "kiosk"}, "removeTags": {"brand": "Kolporter", "brand:wikidata": "Q6427874", "brand:wikipedia": "pl:Kolporter (przedsiębiorstwo)", "name": "Kolporter", "shop": "kiosk"}, "matchScore": 2, "suggestion": true},
    "shop/kiosk/Lietuvos spauda": {"name": "Lietuvos spauda", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "kiosk", "brand:wikidata": "Q6514414"}, "addTags": {"brand": "Lietuvos spauda", "brand:wikidata": "Q6514414", "brand:wikipedia": "lt:Lietuvos spauda", "name": "Lietuvos spauda", "shop": "kiosk"}, "removeTags": {"brand": "Lietuvos spauda", "brand:wikidata": "Q6514414", "brand:wikipedia": "lt:Lietuvos spauda", "name": "Lietuvos spauda", "shop": "kiosk"}, "matchScore": 2, "suggestion": true},
    "shop/kiosk/Narvesen": {"name": "Narvesen", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "kiosk", "brand:wikidata": "Q6514414"}, "addTags": {"brand": "Narvesen", "brand:wikidata": "Q6514414", "brand:wikipedia": "en:Narvesen", "name": "Narvesen", "shop": "kiosk"}, "removeTags": {"brand": "Narvesen", "brand:wikidata": "Q6514414", "brand:wikipedia": "en:Narvesen", "name": "Narvesen", "shop": "kiosk"}, "matchScore": 2, "suggestion": true},
    "shop/kiosk/Pressbyrån": {"name": "Pressbyrån", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "kiosk", "brand:wikidata": "Q2489072"}, "addTags": {"brand": "Pressbyrån", "brand:wikidata": "Q2489072", "brand:wikipedia": "en:Pressbyrån", "name": "Pressbyrån", "shop": "kiosk"}, "removeTags": {"brand": "Pressbyrån", "brand:wikidata": "Q2489072", "brand:wikipedia": "en:Pressbyrån", "name": "Pressbyrån", "shop": "kiosk"}, "matchScore": 2, "suggestion": true},
@@ -2960,7 +2902,6 @@
    "shop/musical_instrument/Guitar Center": {"name": "Guitar Center", "icon": "maki-music", "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", "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", "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},
-    "shop/newsagent/Kolporter": {"name": "Kolporter", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "newsagent", "brand:wikidata": "Q6427874"}, "addTags": {"brand": "Kolporter", "brand:wikidata": "Q6427874", "brand:wikipedia": "pl:Kolporter (przedsiębiorstwo)", "name": "Kolporter", "shop": "kiosk"}, "removeTags": {"brand": "Kolporter", "brand:wikidata": "Q6427874", "brand:wikipedia": "pl:Kolporter (przedsiębiorstwo)", "name": "Kolporter", "shop": "kiosk"}, "matchScore": 2, "suggestion": true},
    "shop/newsagent/読売新聞": {"name": "読売新聞", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "newsagent", "brand:wikidata": "Q645218"}, "addTags": {"brand": "読売新聞", "brand:en": "Yomiuri Shimbun", "brand:wikidata": "Q645218", "brand:wikipedia": "en:Yomiuri Shimbun", "name": "読売新聞", "name:en": "Yomiuri Shimbun", "shop": "newsagent"}, "removeTags": {"brand": "読売新聞", "brand:en": "Yomiuri Shimbun", "brand:wikidata": "Q645218", "brand:wikipedia": "en:Yomiuri Shimbun", "name": "読売新聞", "name:en": "Yomiuri Shimbun", "shop": "newsagent"}, "matchScore": 2, "suggestion": true},
    "shop/nutrition_supplements/GNC": {"name": "GNC", "icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "nutrition_supplements", "brand:wikidata": "Q4808595"}, "addTags": {"brand": "GNC", "brand:wikidata": "Q4808595", "brand:wikipedia": "en:GNC (store)", "name": "GNC", "shop": "nutrition_supplements"}, "removeTags": {"brand": "GNC", "brand:wikidata": "Q4808595", "brand:wikipedia": "en:GNC (store)", "name": "GNC", "shop": "nutrition_supplements"}, "matchScore": 2, "suggestion": true},
    "shop/optician/Alain Afflelou": {"name": "Alain Afflelou", "icon": "maki-optician", "geometry": ["point", "area"], "tags": {"shop": "optician", "brand:wikidata": "Q2829511"}, "addTags": {"brand": "Alain Afflelou", "brand:wikidata": "Q2829511", "brand:wikipedia": "fr:Alain Afflelou (entreprise)", "name": "Alain Afflelou", "shop": "optician"}, "removeTags": {"brand": "Alain Afflelou", "brand:wikidata": "Q2829511", "brand:wikipedia": "fr:Alain Afflelou (entreprise)", "name": "Alain Afflelou", "shop": "optician"}, "matchScore": 2, "suggestion": true},
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-museum",
+    "icon": "maki-globe",
    "fields": [
        "name",
        "operator",
@@ -1,5 +1,5 @@
 {
-    "icon": "maki-museum",
+    "icon": "temaki-museum",
    "fields": [
        "name",
        "operator",
@@ -132,7 +132,7 @@
    {"key": "religion", "value": "shinto", "description": "🄿 Shinto Shrine", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/shinto.svg?sanitize=true"},
    {"key": "religion", "value": "sikh", "description": "🄿 Sikh Temple", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/sikhism.svg?sanitize=true"},
    {"key": "religion", "value": "taoist", "description": "🄿 Taoist Temple", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/taoism.svg?sanitize=true"},
-    {"key": "amenity", "value": "planetarium", "description": "🄿 Planetarium", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/museum-15.svg?sanitize=true"},
+    {"key": "amenity", "value": "planetarium", "description": "🄿 Planetarium", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/globe-15.svg?sanitize=true"},
    {"key": "amenity", "value": "police", "description": "🄿 Police", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/police-15.svg?sanitize=true"},
    {"key": "amenity", "value": "post_box", "description": "🄿 Mailbox", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/post_box.svg?sanitize=true"},
    {"key": "amenity", "value": "post_office", "description": "🄿 Post Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/post-15.svg?sanitize=true"},
@@ -957,7 +957,7 @@
    {"key": "information", "value": "map", "description": "🄿 Map", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/information-15.svg?sanitize=true"},
    {"key": "information", "value": "office", "description": "🄿 Tourist Information Office", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/information-15.svg?sanitize=true"},
    {"key": "tourism", "value": "motel", "description": "🄿 Motel", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/lodging-15.svg?sanitize=true"},
-    {"key": "tourism", "value": "museum", "description": "🄿 Museum", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/museum-15.svg?sanitize=true"},
+    {"key": "tourism", "value": "museum", "description": "🄿 Museum", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/museum.svg?sanitize=true"},
    {"key": "tourism", "value": "picnic_site", "description": "🄿 Picnic Site", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/picnic-site-15.svg?sanitize=true"},
    {"key": "tourism", "value": "theme_park", "description": "🄿 Theme Park", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/amusement-park-15.svg?sanitize=true"},
    {"key": "tourism", "value": "trail_riding_station", "description": "🄿 Trail Riding Station", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/horse-riding-15.svg?sanitize=true"},
@@ -193,7 +193,9 @@
                "restriction": "These features can't be merged because it would damage a \"{relation}\" relation.",
                "relation": "These features can't be merged because they have conflicting relation roles.",
                "incomplete_relation": "These features can't be merged because at least one hasn't been fully downloaded.",
-                "conflicting_tags": "These features can't be merged because some of their tags have conflicting values."
+                "conflicting_tags": "These features can't be merged because some of their tags have conflicting values.",
+                "paths_intersect": "These features can't be merged because the resulting path would intersect itself"
+
            },
            "move": {
                "title": "Move",
@@ -1,8 +1,10 @@
 import _extend from 'lodash-es/extend';
 import _groupBy from 'lodash-es/groupBy';
+import _intersection from 'lodash-es/intersection';

 import { actionDeleteWay } from './delete_way';
 import { osmIsInterestingTag, osmJoinWays } from '../osm';
+import { geoPathIntersections } from '../geo';


 // Join ways at the end node they share.
@@ -70,6 +72,27 @@ export function actionJoin(ids) {
        if (joined.length > 1)
            return 'not_adjacent';

+        // Loop through all combinations of path-pairs to check potential intersections
+        //  between all pairs
+        for (var i = 0; i < ids.length-1; i++) {
+            for (var j = i+1; j < ids.length; j++) {
+                var path1 = graph.childNodes(graph.entity(ids[i])).map(function(e) {
+                    return e.loc;
+                });
+                var path2 = graph.childNodes(graph.entity(ids[j])).map(function(e) {
+                    return e.loc;
+                });
+                var intersections = geoPathIntersections(path1, path2);
+
+                // Check if intersections are just nodes lying on top of each other/the line,
+                //  as opposed to crossing it
+                if (_intersection(
+                        joined[0].nodes.map(function(n) { return n.loc.toString(); }),
+                        intersections.map(function(n) { return n.toString(); })
+                    ).length !== intersections.length) return 'paths_intersect';
+            }
+        }
+
        var nodeIds = joined[0].nodes.map(function(n) { return n.id; }).slice(1, -1);
        var relation;
        var tags = {};
@@ -20,6 +20,7 @@ References:
 export function actionReverse(wayID, options) {
    var ignoreKey = /^.*(_|:)?(description|name|note|website|ref|source|comment|watch|attribution)(_|:)?/;
    var numeric = /^([+\-]?)(?=[\d.])/;
+    var turn_lanes = /^turn:lanes:?/;
    var keyReplacements = [
        [/:right$/, ':left'],
        [/:left$/, ':right'],
@@ -63,7 +64,10 @@ export function actionReverse(wayID, options) {
    function reverseValue(key, value) {
        if (ignoreKey.test(key)) return value;

-        if (key === 'incline' && numeric.test(value)) {
+        // Turn lanes are left/right to key (not way) direction - #5674
+        if (turn_lanes.test(key)) {
+            return value;
+        } else if (key === 'incline' && numeric.test(value)) {
            return value.replace(numeric, function(_, sign) { return sign === '-' ? '' : '-'; });
        } else if (options && options.reverseOneway && key === 'oneway') {
            return onewayReplacements[value] || value;
@@ -410,7 +410,7 @@ export default {
            .classed('hide', true);

        d3_selectAll('.viewfield-group, .sequence, .icon-sign')
-            .classed('selected', false);
+            .classed('currentView', false);

        return this.setStyles(null, true);
    },
@@ -531,7 +531,7 @@ export default {

        // if signs signs are shown, highlight the ones that appear in this image
        d3_selectAll('.layer-mapillary-signs .icon-sign')
-            .classed('selected', function(d) {
+            .classed('currentView', function(d) {
                return _some(d.detections, function(detection) {
                    return detection.image_key === imageKey;
                });
@@ -556,16 +556,19 @@ export default {
    },


+    // Updates the currently highlighted sequence and selected bubble.
+    // Reset is only necessary when interacting with the viewport because
+    // this implicitly changes the currently selected bubble/sequence
    setStyles: function(hovered, reset) {
        if (reset) {  // reset all layers
            d3_selectAll('.viewfield-group')
                .classed('highlighted', false)
                .classed('hovered', false)
-                .classed('selected', false);
+                .classed('currentView', false);

            d3_selectAll('.sequence')
                .classed('highlighted', false)
-                .classed('selected', false);
+                .classed('currentView', false);
        }

        var hoveredImageKey = hovered && hovered.key;
@@ -586,11 +589,11 @@ export default {
        d3_selectAll('.layer-mapillary-images .viewfield-group')
            .classed('highlighted', function(d) { return highlightedImageKeys.indexOf(d.key) !== -1; })
            .classed('hovered', function(d) { return d.key === hoveredImageKey; })
-            .classed('selected', function(d) { return d.key === selectedImageKey; });
+            .classed('currentView', function(d) { return d.key === selectedImageKey; });

        d3_selectAll('.layer-mapillary-images .sequence')
            .classed('highlighted', function(d) { return d.properties.key === hoveredSequenceKey; })
-            .classed('selected', function(d) { return d.properties.key === selectedSequenceKey; });
+            .classed('currentView', function(d) { return d.properties.key === selectedSequenceKey; });

        // update viewfields if needed
        d3_selectAll('.viewfield-group .viewfield')
@@ -403,7 +403,7 @@ export default {
            .classed('hide', true);

        d3_selectAll('.viewfield-group, .sequence, .icon-sign')
-            .classed('selected', false);
+            .classed('currentView', false);

        return this.setStyles(null, true);
    },
@@ -476,7 +476,7 @@ export default {
        this.setStyles(null, true);

        d3_selectAll('.icon-sign')
-            .classed('selected', false);
+            .classed('currentView', false);

        return this;
    },
@@ -492,16 +492,19 @@ export default {
    },


+    // Updates the currently highlighted sequence and selected bubble.
+    // Reset is only necessary when interacting with the viewport because
+    // this implicitly changes the currently selected bubble/sequence
    setStyles: function(hovered, reset) {
        if (reset) {  // reset all layers
            d3_selectAll('.viewfield-group')
                .classed('highlighted', false)
                .classed('hovered', false)
-                .classed('selected', false);
+                .classed('currentView', false);

            d3_selectAll('.sequence')
                .classed('highlighted', false)
-                .classed('selected', false);
+                .classed('currentView', false);
        }

        var hoveredImageKey = hovered && hovered.key;
@@ -522,11 +525,11 @@ export default {
        d3_selectAll('.layer-openstreetcam-images .viewfield-group')
            .classed('highlighted', function(d) { return highlightedImageKeys.indexOf(d.key) !== -1; })
            .classed('hovered', function(d) { return d.key === hoveredImageKey; })
-            .classed('selected', function(d) { return d.key === selectedImageKey; });
+            .classed('currentView', function(d) { return d.key === selectedImageKey; });

        d3_selectAll('.layer-openstreetcam-images .sequence')
            .classed('highlighted', function(d) { return d.properties.key === hoveredSequenceKey; })
-            .classed('selected', function(d) { return d.properties.key === selectedSequenceKey; });
+            .classed('currentView', function(d) { return d.properties.key === selectedSequenceKey; });

        // update viewfields if needed
        d3_selectAll('.viewfield-group .viewfield')
@@ -750,7 +750,7 @@ export default {
            .classed('hide', true);

        d3_selectAll('.viewfield-group, .sequence, .icon-sign')
-            .classed('selected', false);
+            .classed('currentView', false);

        return this.setStyles(null, true);
    },
@@ -925,19 +925,19 @@ export default {
    },


-    /**
-     * setStyles().
-     */
+    // Updates the currently highlighted sequence and selected bubble.
+    // Reset is only necessary when interacting with the viewport because
+    // this implicitly changes the currently selected bubble/sequence
    setStyles: function (hovered, reset) {
        if (reset) {  // reset all layers
            d3_selectAll('.viewfield-group')
                .classed('highlighted', false)
                .classed('hovered', false)
-                .classed('selected', false);
+                .classed('currentView', false);

            d3_selectAll('.sequence')
                .classed('highlighted', false)
-                .classed('selected', false);
+                .classed('currentView', false);
        }

        var hoveredBubbleKey = hovered && hovered.key;
@@ -958,11 +958,11 @@ export default {
        d3_selectAll('.layer-streetside-images .viewfield-group')
            .classed('highlighted', function (d) { return highlightedBubbleKeys.indexOf(d.key) !== -1; })
            .classed('hovered', function (d) { return d.key === hoveredBubbleKey; })
-            .classed('selected', function (d) { return d.key === selectedBubbleKey; });
+            .classed('currentView', function (d) { return d.key === selectedBubbleKey; });

        d3_selectAll('.layer-streetside-images .sequence')
            .classed('highlighted', function (d) { return d.properties.key === hoveredSequenceKey; })
-            .classed('selected', function (d) { return d.properties.key === selectedSequenceKey; });
+            .classed('currentView', function (d) { return d.properties.key === selectedSequenceKey; });

        // update viewfields if needed
        d3_selectAll('.viewfield-group .viewfield')
@@ -33,7 +33,7 @@ export function svgMapillaryImages(projection, context, dispatch) {
                // e.g. during drags or easing.
                if (context.map().isTransformed()) return;

-                layer.selectAll('.viewfield-group.selected')
+                layer.selectAll('.viewfield-group.currentView')
                    .filter(function(d) {
                        return d.pano;
                    })
@@ -164,8 +164,8 @@ export function svgMapillaryImages(projection, context, dispatch) {
        var groupsEnter = groups.enter()
            .append('g')
            .attr('class', 'viewfield-group')
-            .on('mouseover', mouseover)
-            .on('mouseout', mouseout)
+            .on('mouseenter', mouseover)
+            .on('mouseleave', mouseout)
            .on('click', click);

        groupsEnter
@@ -105,7 +105,7 @@ export function svgMapillarySigns(projection, context, dispatch) {
            .attr('x', '-12px')
            .attr('y', '-12px')
            .attr('xlink:href', function(d) { return '#' + d.value; })
-            .classed('selected', function(d) {
+            .classed('currentView', function(d) {
                return _some(d.detections, function(detection) {
                    return detection.image_key === selectedImageKey;
                });
@@ -147,8 +147,8 @@ export function svgOpenstreetcamImages(projection, context, dispatch) {
        var groupsEnter = groups.enter()
            .append('g')
            .attr('class', 'viewfield-group')
-            .on('mouseover', mouseover)
-            .on('mouseout', mouseout)
+            .on('mouseenter', mouseover)
+            .on('mouseleave', mouseout)
            .on('click', click);

        groupsEnter
@@ -12,7 +12,6 @@ export function svgStreetside(projection, context, dispatch) {
    var layer = d3_select(null);
    var _viewerYaw = 0;
    var _selectedSequence = null;
-    var _hoveredBubble = null;
    var _streetside;

    /**
@@ -121,8 +120,7 @@ export function svgStreetside(projection, context, dispatch) {
     */
    function mouseover(d) {
        var service = getService();
-        _hoveredBubble = d;
-        if (service) service.setStyles(d, true);
+        if (service) service.setStyles(d);
    }

    /**
@@ -130,8 +128,7 @@ export function svgStreetside(projection, context, dispatch) {
     */
    function mouseout() {
        var service = getService();
-        _hoveredBubble = null;
-        if (service) service.setStyles(null, true);
+        if (service) service.setStyles(null);
    }

    /**
@@ -161,7 +158,7 @@ export function svgStreetside(projection, context, dispatch) {
        // e.g. during drags or easing.
        if (context.map().isTransformed()) return;

-        layer.selectAll('.viewfield-group.selected')
+        layer.selectAll('.viewfield-group.currentView')
            .attr('transform', transform);
    }

@@ -209,8 +206,8 @@ export function svgStreetside(projection, context, dispatch) {
        var groupsEnter = groups.enter()
            .append('g')
            .attr('class', 'viewfield-group')
-            .on('mouseover', mouseover)
-            .on('mouseout', mouseout)
+            .on('mouseenter', mouseover)
+            .on('mouseleave', mouseout)
            .on('click', click);

        groupsEnter
@@ -251,12 +248,6 @@ export function svgStreetside(projection, context, dispatch) {
            .attr('transform', 'scale(1.5,1.5),translate(-8, -13)')
            .attr('d', viewfieldPath);

-
-        if (service) {
-            service.setStyles(_hoveredBubble, true);
-        }
-
-
        function viewfieldPath() {
            var d = this.parentNode.__data__;
            if (d.pano) {
@@ -3,9 +3,9 @@ describe('iD.actionJoin', function () {
        it('returns falsy for ways that share an end/start node', function () {
            // a --> b ==> c
            var graph = iD.coreGraph([
-                iD.osmNode({id: 'a'}),
-                iD.osmNode({id: 'b'}),
-                iD.osmNode({id: 'c'}),
+                iD.osmNode({id: 'a', loc: [0,0]}),
+                iD.osmNode({id: 'b', loc: [2,0]}),
+                iD.osmNode({id: 'c', loc: [4,0]}),
                iD.osmWay({id: '-', nodes: ['a', 'b']}),
                iD.osmWay({id: '=', nodes: ['b', 'c']})
            ]);
@@ -16,9 +16,9 @@ describe('iD.actionJoin', function () {
        it('returns falsy for ways that share a start/end node', function () {
            // a <-- b <== c
            var graph = iD.coreGraph([
-                iD.osmNode({id: 'a'}),
-                iD.osmNode({id: 'b'}),
-                iD.osmNode({id: 'c'}),
+                iD.osmNode({id: 'a', loc: [0,0]}),
+                iD.osmNode({id: 'b', loc: [2,0]}),
+                iD.osmNode({id: 'c', loc: [4,0]}),
                iD.osmWay({id: '-', nodes: ['b', 'a']}),
                iD.osmWay({id: '=', nodes: ['c', 'b']})
            ]);
@@ -29,9 +29,9 @@ describe('iD.actionJoin', function () {
        it('returns falsy for ways that share a start/start node', function () {
            // a <-- b ==> c
            var graph = iD.coreGraph([
-                iD.osmNode({id: 'a'}),
-                iD.osmNode({id: 'b'}),
-                iD.osmNode({id: 'c'}),
+                iD.osmNode({id: 'a', loc: [0,0]}),
+                iD.osmNode({id: 'b', loc: [2,0]}),
+                iD.osmNode({id: 'c', loc: [4,0]}),
                iD.osmWay({id: '-', nodes: ['b', 'a']}),
                iD.osmWay({id: '=', nodes: ['b', 'c']})
            ]);
@@ -42,9 +42,9 @@ describe('iD.actionJoin', function () {
        it('returns falsy for ways that share an end/end node', function () {
            // a --> b <== c
            var graph = iD.coreGraph([
-                iD.osmNode({id: 'a'}),
-                iD.osmNode({id: 'b'}),
-                iD.osmNode({id: 'c'}),
+                iD.osmNode({id: 'a', loc: [0,0]}),
+                iD.osmNode({id: 'b', loc: [2,0]}),
+                iD.osmNode({id: 'c', loc: [4,0]}),
                iD.osmWay({id: '-', nodes: ['a', 'b']}),
                iD.osmWay({id: '=', nodes: ['c', 'b']})
            ]);
@@ -55,10 +55,10 @@ describe('iD.actionJoin', function () {
        it('returns falsy for more than two ways when connected, regardless of order', function () {
            // a --> b ==> c ~~> d
            var graph = iD.coreGraph([
-                iD.osmNode({id: 'a'}),
-                iD.osmNode({id: 'b'}),
-                iD.osmNode({id: 'c'}),
-                iD.osmNode({id: 'd'}),
+                iD.osmNode({id: 'a', loc: [0,0]}),
+                iD.osmNode({id: 'b', loc: [2,0]}),
+                iD.osmNode({id: 'c', loc: [4,0]}),
+                iD.osmNode({id: 'd', loc: [6,0]}),
                iD.osmWay({id: '-', nodes: ['a', 'b']}),
                iD.osmWay({id: '=', nodes: ['b', 'c']}),
                iD.osmWay({id: '~', nodes: ['c', 'd']})
@@ -74,7 +74,7 @@ describe('iD.actionJoin', function () {

        it('returns \'not_eligible\' for non-line geometries', function () {
            var graph = iD.coreGraph([
-                iD.osmNode({id: 'a'})
+                iD.osmNode({id: 'a', loc: [0,0]})
            ]);

            expect(iD.actionJoin(['a']).disabled(graph)).to.equal('not_eligible');
@@ -85,10 +85,10 @@ describe('iD.actionJoin', function () {
            //      |
            //      d
            var graph = iD.coreGraph([
-                iD.osmNode({id: 'a'}),
-                iD.osmNode({id: 'b'}),
-                iD.osmNode({id: 'c'}),
-                iD.osmNode({id: 'd'}),
+                iD.osmNode({id: 'a', loc: [0,0]}),
+                iD.osmNode({id: 'b', loc: [2,0]}),
+                iD.osmNode({id: 'c', loc: [4,0]}),
+                iD.osmNode({id: 'd', loc: [2,2]}),
                iD.osmWay({id: '-', nodes: ['a', 'b', 'c']}),
                iD.osmWay({id: '=', nodes: ['b', 'd']})
            ]);
@@ -102,9 +102,9 @@ describe('iD.actionJoin', function () {
            // to: =
            // via: b
            var graph = iD.coreGraph([
-                iD.osmNode({id: 'a'}),
-                iD.osmNode({id: 'b'}),
-                iD.osmNode({id: 'c'}),
+                iD.osmNode({id: 'a', loc: [0,0]}),
+                iD.osmNode({id: 'b', loc: [2,0]}),
+                iD.osmNode({id: 'c', loc: [4,0]}),
                iD.osmWay({id: '-', nodes: ['a', 'b']}),
                iD.osmWay({id: '=', nodes: ['b', 'c']}),
                iD.osmRelation({id: 'r', tags: {type: 'restriction'}, members: [
@@ -125,10 +125,10 @@ describe('iD.actionJoin', function () {
            // to: |
            // via: b
            var graph = iD.coreGraph([
-                iD.osmNode({id: 'a'}),
-                iD.osmNode({id: 'b'}),
-                iD.osmNode({id: 'c'}),
-                iD.osmNode({id: 'd'}),
+                iD.osmNode({id: 'a', loc: [0,0]}),
+                iD.osmNode({id: 'b', loc: [2,0]}),
+                iD.osmNode({id: 'c', loc: [4,0]}),
+                iD.osmNode({id: 'd', loc: [2,2]}),
                iD.osmWay({id: '-', nodes: ['a', 'b']}),
                iD.osmWay({id: '=', nodes: ['b', 'c']}),
                iD.osmWay({id: '|', nodes: ['b', 'd']}),
@@ -142,6 +142,25 @@ describe('iD.actionJoin', function () {
            expect(iD.actionJoin(['-', '=']).disabled(graph)).to.equal('restriction');
        });

+        it('returns \'paths_intersect\' if resulting way intersects itself', function () {
+            //   d
+            //   |
+            // a ---b
+            //   |  /
+            //   | /
+            //   c
+            var graph = iD.coreGraph([
+                iD.osmNode({id: 'a', loc: [0,0]}),
+                iD.osmNode({id: 'b', loc: [0,10]}),
+                iD.osmNode({id: 'c', loc: [5,5]}),
+                iD.osmNode({id: 'd', loc: [-5,5]}),
+                iD.osmWay({id: '-', nodes: ['a', 'b', 'c']}),
+                iD.osmWay({id: '=', nodes: ['c', 'd']}),
+            ]);
+
+            expect(iD.actionJoin(['-', '=']).disabled(graph)).to.equal('paths_intersect');
+        });
+
        it('returns falsy in situations where a turn restriction wouldn\'t be damaged (a)', function () {
            // a --> b ==> c
            // |
@@ -150,10 +169,10 @@ describe('iD.actionJoin', function () {
            // to: |
            // via: a
            var graph = iD.coreGraph([
-                iD.osmNode({id: 'a'}),
-                iD.osmNode({id: 'b'}),
-                iD.osmNode({id: 'c'}),
-                iD.osmNode({id: 'd'}),
+                iD.osmNode({id: 'a', loc: [0,0]}),
+                iD.osmNode({id: 'b', loc: [2,0]}),
+                iD.osmNode({id: 'c', loc: [4,0]}),
+                iD.osmNode({id: 'd', loc: [0,2]}),
                iD.osmWay({id: '-', nodes: ['a', 'b']}),
                iD.osmWay({id: '=', nodes: ['b', 'c']}),
                iD.osmWay({id: '|', nodes: ['a', 'd']}),
@@ -177,10 +196,11 @@ describe('iD.actionJoin', function () {
            // to: \
            // via: b
            var graph = iD.coreGraph([
-                iD.osmNode({id: 'a'}),
-                iD.osmNode({id: 'b'}),
-                iD.osmNode({id: 'c'}),
-                iD.osmNode({id: 'd'}),
+                iD.osmNode({id: 'a', loc: [0,0]}),
+                iD.osmNode({id: 'b', loc: [2,0]}),
+                iD.osmNode({id: 'c', loc: [4,0]}),
+                iD.osmNode({id: 'd', loc: [2,-2]}),
+                iD.osmNode({id: 'e', loc: [3,2]}),
                iD.osmWay({id: '-', nodes: ['a', 'b']}),
                iD.osmWay({id: '=', nodes: ['b', 'c']}),
                iD.osmWay({id: '|', nodes: ['d', 'b']}),
@@ -197,9 +217,9 @@ describe('iD.actionJoin', function () {

        it('returns \'conflicting_tags\' for two entities that have conflicting tags', function () {
            var graph = iD.coreGraph([
-                iD.osmNode({id: 'a'}),
-                iD.osmNode({id: 'b'}),
-                iD.osmNode({id: 'c'}),
+                iD.osmNode({id: 'a', loc: [0,0]}),
+                iD.osmNode({id: 'b', loc: [2,0]}),
+                iD.osmNode({id: 'c', loc: [4,0]}),
                iD.osmWay({id: '-', nodes: ['a', 'b'], tags: {highway: 'primary'}}),
                iD.osmWay({id: '=', nodes: ['b', 'c'], tags: {highway: 'secondary'}})
            ]);
@@ -209,9 +229,9 @@ describe('iD.actionJoin', function () {

        it('takes tag reversals into account when calculating conflicts', function () {
            var graph = iD.coreGraph([
-                iD.osmNode({id: 'a'}),
-                iD.osmNode({id: 'b'}),
-                iD.osmNode({id: 'c'}),
+                iD.osmNode({id: 'a', loc: [0,0]}),
+                iD.osmNode({id: 'b', loc: [2,0]}),
+                iD.osmNode({id: 'c', loc: [4,0]}),
                iD.osmWay({id: '-', nodes: ['a', 'b'], tags: {'oneway': 'yes'}}),
                iD.osmWay({id: '=', nodes: ['c', 'b'], tags: {'oneway': '-1'}})
            ]);
@@ -221,9 +241,9 @@ describe('iD.actionJoin', function () {

        it('returns falsy for exceptions to tag conflicts: missing tag', function () {
            var graph = iD.coreGraph([
-                iD.osmNode({id: 'a'}),
-                iD.osmNode({id: 'b'}),
-                iD.osmNode({id: 'c'}),
+                iD.osmNode({id: 'a', loc: [0,0]}),
+                iD.osmNode({id: 'b', loc: [2,0]}),
+                iD.osmNode({id: 'c', loc: [4,0]}),
                iD.osmWay({id: '-', nodes: ['a', 'b'], tags: {highway: 'primary'}}),
                iD.osmWay({id: '=', nodes: ['b', 'c'], tags: {}})
            ]);
@@ -233,9 +253,9 @@ describe('iD.actionJoin', function () {

        it('returns falsy for exceptions to tag conflicts: uninteresting tag', function () {
            var graph = iD.coreGraph([
-                iD.osmNode({id: 'a'}),
-                iD.osmNode({id: 'b'}),
-                iD.osmNode({id: 'c'}),
+                iD.osmNode({id: 'a', loc: [0,0]}),
+                iD.osmNode({id: 'b', loc: [2,0]}),
+                iD.osmNode({id: 'c', loc: [4,0]}),
                iD.osmWay({id: '-', nodes: ['a', 'b'], tags: {'tiger:cfcc': 'A41'}}),
                iD.osmWay({id: '=', nodes: ['b', 'c'], tags: {'tiger:cfcc': 'A42'}})
            ]);
@@ -248,9 +268,9 @@ describe('iD.actionJoin', function () {
        // Expected result:
        // a --> b --> c
        var graph = iD.coreGraph([
-            iD.osmNode({id: 'a'}),
-            iD.osmNode({id: 'b'}),
-            iD.osmNode({id: 'c'}),
+            iD.osmNode({id: 'a', loc: [0,0]}),
+            iD.osmNode({id: 'b', loc: [2,0]}),
+            iD.osmNode({id: 'c', loc: [4,0]}),
            iD.osmWay({id: '-', nodes: ['a', 'b']}),
            iD.osmWay({id: '=', nodes: ['b', 'c']})
        ]);
@@ -265,9 +285,9 @@ describe('iD.actionJoin', function () {
        // Expected result:
        // a <-- b <-- c
        var graph = iD.coreGraph([
-            iD.osmNode({id: 'a'}),
-            iD.osmNode({id: 'b'}),
-            iD.osmNode({id: 'c'}),
+            iD.osmNode({id: 'a', loc: [0,0]}),
+            iD.osmNode({id: 'b', loc: [2,0]}),
+            iD.osmNode({id: 'c', loc: [4,0]}),
            iD.osmWay({id: '-', nodes: ['b', 'a']}),
            iD.osmWay({id: '=', nodes: ['c', 'b']})
        ]);
@@ -281,9 +301,9 @@ describe('iD.actionJoin', function () {
        // Expected result:
        // a --> b --> c
        var graph = iD.coreGraph([
-            iD.osmNode({id: 'a'}),
-            iD.osmNode({id: 'b'}),
-            iD.osmNode({id: 'c'}),
+            iD.osmNode({id: 'a', loc: [0,0]}),
+            iD.osmNode({id: 'b', loc: [2,0]}),
+            iD.osmNode({id: 'c', loc: [4,0]}),
            iD.osmWay({id: '-', nodes: ['b', 'a'], tags: {'lanes:forward': 2}}),
            iD.osmWay({id: '=', nodes: ['b', 'c']})
        ]);
@@ -300,9 +320,9 @@ describe('iD.actionJoin', function () {
        // a --> b --> c
        // tags on === reversed
        var graph = iD.coreGraph([
-            iD.osmNode({id: 'a'}),
-            iD.osmNode({id: 'b'}),
-            iD.osmNode({id: 'c'}),
+            iD.osmNode({id: 'a', loc: [0,0]}),
+            iD.osmNode({id: 'b', loc: [2,0]}),
+            iD.osmNode({id: 'c', loc: [4,0]}),
            iD.osmWay({id: '-', nodes: ['a', 'b']}),
            iD.osmWay({id: '=', nodes: ['c', 'b'], tags: {'lanes:forward': 2}})
        ]);
@@ -319,11 +339,11 @@ describe('iD.actionJoin', function () {
        // a --> b --> c --> d --> e
        // tags on === reversed
        var graph = iD.coreGraph([
-            iD.osmNode({id: 'a'}),
-            iD.osmNode({id: 'b'}),
-            iD.osmNode({id: 'c'}),
-            iD.osmNode({id: 'd'}),
-            iD.osmNode({id: 'e'}),
+            iD.osmNode({id: 'a', loc: [0,0]}),
+            iD.osmNode({id: 'b', loc: [2,0]}),
+            iD.osmNode({id: 'c', loc: [4,0]}),
+            iD.osmNode({id: 'd', loc: [6,0]}),
+            iD.osmNode({id: 'e', loc: [8,0]}),
            iD.osmWay({id: '-', nodes: ['a', 'b']}),
            iD.osmWay({id: '=', nodes: ['c', 'b'], tags: {'lanes:forward': 2}}),
            iD.osmWay({id: '+', nodes: ['d', 'c']}),
@@ -345,10 +365,10 @@ describe('iD.actionJoin', function () {
        // Expected result:
        // a ==> b ==> c ==> d
        var graph = iD.coreGraph([
-            iD.osmNode({id: 'a'}),
-            iD.osmNode({id: 'b'}),
-            iD.osmNode({id: 'c'}),
-            iD.osmNode({id: 'd'}),
+            iD.osmNode({id: 'a', loc: [0,0]}),
+            iD.osmNode({id: 'b', loc: [2,0]}),
+            iD.osmNode({id: 'c', loc: [4,0]}),
+            iD.osmNode({id: 'd', loc: [6,0]}),
            iD.osmWay({id: 'w-1', nodes: ['a', 'b']}),
            iD.osmWay({id: 'w1', nodes: ['b', 'c']}),
            iD.osmWay({id: 'w-2', nodes: ['c', 'd']})
@@ -363,10 +383,11 @@ describe('iD.actionJoin', function () {

    it('merges tags', function () {
        var graph = iD.coreGraph([
-            iD.osmNode({id: 'a'}),
-            iD.osmNode({id: 'b'}),
-            iD.osmNode({id: 'c'}),
-            iD.osmNode({id: 'd'}),
+            iD.osmNode({id: 'a', loc: [0,0]}),
+            iD.osmNode({id: 'b', loc: [2,0]}),
+            iD.osmNode({id: 'c', loc: [4,0]}),
+            iD.osmNode({id: 'd', loc: [6,0]}),
+            iD.osmNode({id: 'e', loc: [8,0]}),
            iD.osmWay({id: '-', nodes: ['a', 'b'], tags: {a: 'a', b: '-', c: 'c'}}),
            iD.osmWay({id: '=', nodes: ['b', 'c'], tags: {a: 'a', b: '=', d: 'd'}}),
            iD.osmWay({id: '+', nodes: ['c', 'd'], tags: {a: 'a', b: '=', e: 'e'}})
@@ -379,9 +400,9 @@ describe('iD.actionJoin', function () {

    it('merges relations', function () {
        var graph = iD.coreGraph([
-            iD.osmNode({id: 'a'}),
-            iD.osmNode({id: 'b'}),
-            iD.osmNode({id: 'c'}),
+            iD.osmNode({id: 'a', loc: [0,0]}),
+            iD.osmNode({id: 'b', loc: [2,0]}),
+            iD.osmNode({id: 'c', loc: [4,0]}),
            iD.osmWay({id: '-', nodes: ['a', 'b']}),
            iD.osmWay({id: '=', nodes: ['b', 'c']}),
            iD.osmRelation({id: 'r1', members: [