diff --git a/data/brands/amenity/cafe.json b/data/brands/amenity/cafe.json
index cc9521d846c..cd48d0f60f8 100644
--- a/data/brands/amenity/cafe.json
+++ b/data/brands/amenity/cafe.json
@@ -1034,22 +1034,6 @@
         "takeaway": "yes"
       }
     },
-    {
-      "displayName": "coffeedream",
-      "locationSet": {"include": ["rs"]},
-      "matchNames": ["coffeedream", "coffee dream"],
-      "tags": {
-        "amenity": "cafe",
-        "brand": "coffeedream",
-        "brand:wikidata": "Q133001964",
-        "cuisine": "coffee_shop;cake;tea",
-        "name": "coffeedream",
-        "name:en": "coffeedream",
-        "name:sr": "кофидрим",
-        "name:sr-Latn": "kofidrim",
-        "takeaway": "yes"
-      }
-    },
     {
       "displayName": "Caffeine",
       "id": "caffeine-f2627b",
@@ -1510,6 +1494,22 @@
         "takeaway": "yes"
       }
     },
+    {
+      "displayName": "coffeedream",
+      "id": "coffeedream-95edc3",
+      "locationSet": {"include": ["rs"]},
+      "tags": {
+        "amenity": "cafe",
+        "brand": "coffeedream",
+        "brand:wikidata": "Q133001964",
+        "cuisine": "coffee_shop;cake;tea",
+        "name": "coffeedream",
+        "name:en": "coffeedream",
+        "name:sr": "кофидрим",
+        "name:sr-Latn": "kofidrim",
+        "takeaway": "yes"
+      }
+    },
     {
       "displayName": "Coffeeshop Company",
       "id": "coffeeshopcompany-e1ef51",
@@ -2343,7 +2343,7 @@
     },
     {
       "displayName": "IKEA Café",
-      "id": "ikeacafe-dbab72",
+      "id": "ikeacafe-883600",
       "locationSet": {
         "include": [
           "ae",
@@ -2370,8 +2370,7 @@
           "sa",
           "si",
           "sk"
-        ],
-        "exclude": ["cn", "ru"]
+        ]
       },
       "tags": {
         "amenity": "cafe",
diff --git a/data/brands/amenity/fast_food.json b/data/brands/amenity/fast_food.json
index 94444aff9b8..d238db7eacf 100644
--- a/data/brands/amenity/fast_food.json
+++ b/data/brands/amenity/fast_food.json
@@ -431,8 +431,10 @@
     },
     {
       "displayName": "B-Bop's",
-      "id": "bbops-4d2ff4",
-      "locationSet": {"include": ["us-ia.geojson"]},
+      "id": "bbops-185cf2",
+      "locationSet": {
+        "include": ["us-ia.geojson"]
+      },
       "tags": {
         "amenity": "fast_food",
         "brand": "B-Bop's",
@@ -738,8 +740,14 @@
     },
     {
       "displayName": "Biscuitville",
-      "id": "biscuitville-4d2ff4",
-      "locationSet": {"include": ["us-nc.geojson","us-sc.geojson","us-va.geojson"]},
+      "id": "biscuitville-79825c",
+      "locationSet": {
+        "include": [
+          "us-nc.geojson",
+          "us-sc.geojson",
+          "us-va.geojson"
+        ]
+      },
       "tags": {
         "amenity": "fast_food",
         "brand": "Biscuitville",
@@ -764,8 +772,14 @@
     },
     {
       "displayName": "Blake's Lotaburger",
-      "id": "blakeslotaburger-4d2ff4",
-      "locationSet": {"include": ["us-az.geojson","us-nm.geojson","us-tx.geojson"]},
+      "id": "blakeslotaburger-15ba98",
+      "locationSet": {
+        "include": [
+          "us-az.geojson",
+          "us-nm.geojson",
+          "us-tx.geojson"
+        ]
+      },
       "matchNames": ["lota' burger"],
       "tags": {
         "amenity": "fast_food",
@@ -1080,8 +1094,14 @@
     },
     {
       "displayName": "Buona",
-      "id": "buona-4d2ff4",
-      "locationSet": {"include": ["us-il.geojson","us-in.geojson","us-wi.geojson"]},
+      "id": "buona-8ba3f5",
+      "locationSet": {
+        "include": [
+          "us-il.geojson",
+          "us-in.geojson",
+          "us-wi.geojson"
+        ]
+      },
       "tags": {
         "amenity": "fast_food",
         "brand": "Buona",
@@ -1288,8 +1308,13 @@
     },
     {
       "displayName": "Burgerville",
-      "id": "burgerville-4d2ff4",
-      "locationSet": {"include": ["us-or.geojson","us-wa.geojson"]},
+      "id": "burgerville-c26124",
+      "locationSet": {
+        "include": [
+          "us-or.geojson",
+          "us-wa.geojson"
+        ]
+      },
       "tags": {
         "amenity": "fast_food",
         "brand": "Burgerville",
@@ -1329,8 +1354,10 @@
     },
     {
       "displayName": "Bush's Chicken",
-      "id": "bushschicken-4d2ff4",
-      "locationSet": {"include": ["us-tx.geojson"]},
+      "id": "bushschicken-1e257d",
+      "locationSet": {
+        "include": ["us-tx.geojson"]
+      },
       "tags": {
         "amenity": "fast_food",
         "brand": "Bush's Chicken",
@@ -1389,8 +1416,14 @@
     },
     {
       "displayName": "California Fish Grill",
-      "id": "californiafishgrill-4d2ff4",
-      "locationSet": {"include": ["us"]},
+      "id": "californiafishgrill-63b571",
+      "locationSet": {
+        "include": [
+          "us-az.geojson",
+          "us-ca.geojson",
+          "us-nv.geojson"
+        ]
+      },
       "tags": {
         "amenity": "fast_food",
         "brand": "California Fish Grill",
@@ -1904,11 +1937,8 @@
     },
     {
       "displayName": "Chungchun",
-      "id": "chungchun-c08753",
-      "locationSet": {
-        "include": ["ca"],
-        "exclude": ["kr"]
-      },
+      "id": "chungchun-e49d2e",
+      "locationSet": {"include": ["ca"]},
       "tags": {
         "amenity": "fast_food",
         "brand": "Chungchun Rice Dog",
@@ -2157,8 +2187,13 @@
     },
     {
       "displayName": "Cousins Subs",
-      "id": "cousinssubs-4d2ff4",
-      "locationSet": {"include": ["us"]},
+      "id": "cousinssubs-41b898",
+      "locationSet": {
+        "include": [
+          "us-in.geojson",
+          "us-wi.geojson"
+        ]
+      },
       "tags": {
         "amenity": "fast_food",
         "brand": "Cousins Subs",
@@ -3077,8 +3112,14 @@
     },
     {
       "displayName": "Farmer Boys",
-      "id": "farmerboys-4d2ff4",
-      "locationSet": {"include": ["us"]},
+      "id": "farmerboys-63b571",
+      "locationSet": {
+        "include": [
+          "us-az.geojson",
+          "us-ca.geojson",
+          "us-nv.geojson"
+        ]
+      },
       "tags": {
         "amenity": "fast_food",
         "brand": "Farmer Boys",
@@ -3454,8 +3495,10 @@
     },
     {
       "displayName": "Freebirds",
-      "id": "freebirds-4d2ff4",
-      "locationSet": {"include": ["us"]},
+      "id": "freebirds-1e257d",
+      "locationSet": {
+        "include": ["us-tx.geojson"]
+      },
       "tags": {
         "amenity": "fast_food",
         "brand": "Freebirds",
@@ -3534,11 +3577,8 @@
     },
     {
       "displayName": "Froots",
-      "id": "froots-d17423",
-      "locationSet": {
-        "include": ["gu", "tc"],
-        "exclude": ["pl"]
-      },
+      "id": "froots-9b3bc4",
+      "locationSet": {"include": ["gu", "tc"]},
       "tags": {
         "amenity": "fast_food",
         "brand": "Froots",
@@ -3680,8 +3720,10 @@
     },
     {
       "displayName": "Gino's Pizza & Spaghetti House (West Virginia)",
-      "id": "ginospizzaandspaghettihouse-4d2ff4",
-      "locationSet": {"include": ["us"]},
+      "id": "ginospizzaandspaghettihouse-74856e",
+      "locationSet": {
+        "include": ["us-wv.geojson"]
+      },
       "tags": {
         "amenity": "fast_food",
         "brand": "Gino's Pizza & Spaghetti House",
@@ -3740,8 +3782,14 @@
     },
     {
       "displayName": "Gold Star Chili",
-      "id": "goldstarchili-4d2ff4",
-      "locationSet": {"include": ["us"]},
+      "id": "goldstarchili-2fbc6d",
+      "locationSet": {
+        "include": [
+          "us-in.geojson",
+          "us-ky.geojson",
+          "us-oh.geojson"
+        ]
+      },
       "tags": {
         "alt_name": "Gold Star",
         "amenity": "fast_food",
@@ -3794,8 +3842,13 @@
     },
     {
       "displayName": "Good Times",
-      "id": "goodtimes-4d2ff4",
-      "locationSet": {"include": ["us"]},
+      "id": "goodtimes-b40047",
+      "locationSet": {
+        "include": [
+          "us-co.geojson",
+          "us-wy.geojson"
+        ]
+      },
       "tags": {
         "amenity": "fast_food",
         "brand": "Good Times",
@@ -4378,7 +4431,7 @@
     },
     {
       "displayName": "IKEA Restaurant",
-      "id": "ikearestaurant-f1d275",
+      "id": "ikearestaurant-282b9d",
       "locationSet": {
         "include": [
           "ae",
@@ -4421,8 +4474,7 @@
           "sk",
           "th",
           "us"
-        ],
-        "exclude": ["cn"]
+        ]
       },
       "tags": {
         "amenity": "fast_food",
@@ -13138,11 +13190,8 @@
     },
     {
       "displayName": "摩斯漢堡",
-      "id": "mosburger-c9f110",
-      "locationSet": {
-        "include": ["tw"],
-        "exclude": ["hk", "mo"]
-      },
+      "id": "mosburger-60a4d5",
+      "locationSet": {"include": ["tw"]},
       "tags": {
         "amenity": "fast_food",
         "brand": "摩斯漢堡",
diff --git a/data/brands/shop/hairdresser.json b/data/brands/shop/hairdresser.json
index fced84e3741..6d53b75268e 100644
--- a/data/brands/shop/hairdresser.json
+++ b/data/brands/shop/hairdresser.json
@@ -769,9 +769,8 @@
     },
     {
       "displayName": "Rush Hair",
-      "locationSet": {
-        "include": ["gb-eng"]
-      },
+      "id": "rushhair-7aa40b",
+      "locationSet": {"include": ["gb-eng"]},
       "matchNames": [
         "rush hair & beauty",
         "rush hairdressers"
diff --git a/data/brands/shop/supermarket.json b/data/brands/shop/supermarket.json
index 86f57cae705..97b70c62a65 100644
--- a/data/brands/shop/supermarket.json
+++ b/data/brands/shop/supermarket.json
@@ -4053,9 +4053,9 @@
         "shop": "supermarket"
       }
     },
-        {
+    {
       "displayName": "Jaya Grocer",
-      "id": "jayagrocer-6911b5",
+      "id": "jayagrocer-80e9ee",
       "locationSet": {"include": ["my"]},
       "tags": {
         "brand": "Jaya Grocer",
@@ -4064,7 +4064,7 @@
         "shop": "supermarket"
       }
     },
-        {
+    {
       "displayName": "Jewel-Osco",
       "id": "jewelosco-dde59d",
       "locationSet": {"include": ["us"]},
diff --git a/data/operators/man_made/surveillance.json b/data/operators/man_made/surveillance.json
index df1801e0e0d..fa593cf36ff 100644
--- a/data/operators/man_made/surveillance.json
+++ b/data/operators/man_made/surveillance.json
@@ -5184,12 +5184,13 @@
       }
     },
     {
-      "displayName": "Target",
-      "id": "target-cf76d3",
+      "displayName": "Target Corporation",
+      "id": "targetcorporation-cf76d3",
       "locationSet": {"include": ["us"]},
+      "matchNames": ["target"],
       "tags": {
         "man_made": "surveillance",
-        "operator": "Target",
+        "operator": "Target Corporation",
         "operator:wikidata": "Q1046951"
       }
     },
diff --git a/data/operators/power/generator.json b/data/operators/power/generator.json
index aefc9a1bb4d..e95acb05cdf 100644
--- a/data/operators/power/generator.json
+++ b/data/operators/power/generator.json
@@ -8022,6 +8022,7 @@
       "displayName": "Target Corporation",
       "id": "targetcorporation-19ecba",
       "locationSet": {"include": ["us"]},
+      "matchNames": ["target"],
       "tags": {
         "operator": "Target Corporation",
         "operator:wikidata": "Q1046951",