diff --git a/data/brands/amenity/car_rental.json b/data/brands/amenity/car_rental.json
index 3812d3668e9..8361b9e2dd2 100644
--- a/data/brands/amenity/car_rental.json
+++ b/data/brands/amenity/car_rental.json
@@ -186,6 +186,7 @@
     },
     {
       "displayName": "Enterprise GO",
+      "id": "enterprisego-145c5e",
       "locationSet": {"include": ["ch"]},
       "matchNames": ["enterprise car rental"],
       "tags": {
@@ -193,8 +194,7 @@
         "brand": "Enterprise GO",
         "brand:wikidata": "Q130467239",
         "operator": "Helvetic Motion AG",
-        "supervised": "no",
-        "website": "https://enterprise-go.ch/"
+        "supervised": "no"
       }
     },
     {
diff --git a/data/brands/amenity/fuel.json b/data/brands/amenity/fuel.json
index 502cd3f0cc1..e57f0cd19fc 100644
--- a/data/brands/amenity/fuel.json
+++ b/data/brands/amenity/fuel.json
@@ -4598,11 +4598,12 @@
     },
     {
       "displayName": "Petroprix",
-      "id": "petroprix-b3d110",
-      "locationSet": {"include": ["001"]},
+      "id": "petroprix-57abaf",
+      "locationSet": {"include": ["es", "pt"]},
       "tags": {
         "amenity": "fuel",
         "brand": "Petroprix",
+        "brand:wikidata": "Q128327113",
         "name": "Petroprix"
       }
     },
diff --git a/data/brands/amenity/post_office.json b/data/brands/amenity/post_office.json
index bfc27e38372..d27e394832d 100644
--- a/data/brands/amenity/post_office.json
+++ b/data/brands/amenity/post_office.json
@@ -168,6 +168,16 @@
         "name": "FedEx Ship Center"
       }
     },
+    {
+      "displayName": "InTime",
+      "id": "intime-628448",
+      "locationSet": {"include": ["bg"]},
+      "tags": {
+        "amenity": "post_office",
+        "brand": "InTime",
+        "brand:wikidata": "Q130294472"
+      }
+    },
     {
       "displayName": "Mail Boxes Etc.",
       "id": "mailboxesetc-187121",
@@ -359,6 +369,35 @@
         "short_name": "UPS"
       }
     },
+    {
+      "displayName": "Български пощи",
+      "id": "6d0749-628448",
+      "locationSet": {"include": ["bg"]},
+      "matchNames": [
+        "bulgarian posts",
+        "български пощи еад"
+      ],
+      "tags": {
+        "amenity": "post_office",
+        "brand": "Български пощи",
+        "brand:wikidata": "Q2880826"
+      }
+    },
+    {
+      "displayName": "Еконт",
+      "id": "4f7c8b-628448",
+      "locationSet": {"include": ["bg"]},
+      "matchNames": [
+        "econt",
+        "ekont",
+        "еконт експрес еоод"
+      ],
+      "tags": {
+        "amenity": "post_office",
+        "brand": "Еконт",
+        "brand:wikidata": "Q12279603"
+      }
+    },
     {
       "displayName": "СДЭК",
       "id": "5ac048-1328c6",
@@ -546,41 +585,6 @@
         "name:zh": "顺丰速运",
         "short_name": "顺丰"
       }
-    },
-    {
-      "displayName": "Еконт",
-      "id": "27c606-03f0fb",
-      "locationSet": {"include": ["bg"]},
-      "matchNames": ["econt", "ekont", "еконт"],
-      "tags": {
-        "amenity": "post_office",
-        "brand": "Еконт",
-        "brand:wikidata": "Q12279603"
-      }
-    },
-    {
-      "displayName": "Български пощи",
-      "id": "6d0749-03f0fb",
-      "locationSet": {"include": ["bg"]},
-      "matchNames": [
-        "bulgarian posts",
-        "български пощи еад"
-      ],
-      "tags": {
-        "amenity": "post_office",
-        "brand": "Български пощи",
-        "brand:wikidata": "Q2880826"
-      }
-    },
-    {
-      "displayName": "InTime",
-      "id": "intime-03f0fb",
-      "locationSet": {"include": ["bg"]},
-      "tags": {
-        "amenity": "post_office",
-        "brand": "InTime",
-        "brand:wikidata": "Q130294472"
-      }
     }
   ]
 }
diff --git a/data/brands/shop/car_repair.json b/data/brands/shop/car_repair.json
index 1d28ae735b9..345eb0c1b2f 100644
--- a/data/brands/shop/car_repair.json
+++ b/data/brands/shop/car_repair.json
@@ -204,17 +204,6 @@
         "shop": "car_repair"
       }
     },
-    {
-      "displayName": "PG Glass",
-      "locationSet": {"include": ["za"]},
-      "tags": {
-        "brand": "PG Glass",
-        "brand:wikidata": "Q126901018",
-        "name": "PG Glass",
-        "service:vehicle:glass": "yes",
-        "shop": "car_repair"
-      }
-    },
     {
       "displayName": "Autotaalglas",
       "id": "autotaalglas-854910",
@@ -1055,6 +1044,18 @@
         "shop": "car_repair"
       }
     },
+    {
+      "displayName": "PG Glass",
+      "id": "pgglass-28277d",
+      "locationSet": {"include": ["za"]},
+      "tags": {
+        "brand": "PG Glass",
+        "brand:wikidata": "Q126901018",
+        "name": "PG Glass",
+        "service:vehicle:glass": "yes",
+        "shop": "car_repair"
+      }
+    },
     {
       "displayName": "pitstop",
       "id": "pitstop-c95f1a",
diff --git a/data/brands/shop/clothes.json b/data/brands/shop/clothes.json
index 8ee44015b01..144657887cc 100644
--- a/data/brands/shop/clothes.json
+++ b/data/brands/shop/clothes.json
@@ -65,26 +65,6 @@
         "shop": "clothes"
       }
     },
-    {
-      "displayName": "Nicci Boutiques",
-      "locationSet": {"include": ["za"]},
-      "tags": {
-        "brand": "Nicci Boutiques",
-        "brand:wikidata": "Q130572581",
-        "name": "Nicci Boutiques",
-        "shop": "clothes"
-      }
-    },
-    {
-      "displayName": "Senqu",
-      "locationSet": {"include": ["za"]},
-      "tags": {
-        "brand": "Senqu",
-        "brand:wikidata": "Q130581075",
-        "name": "Senqu",
-        "shop": "clothes"
-      }
-    },
     {
       "displayName": "8 Seconds",
       "id": "8seconds-d098b5",
@@ -7286,6 +7266,17 @@
         "shop": "clothes"
       }
     },
+    {
+      "displayName": "Nicci Boutiques",
+      "id": "nicciboutiques-bd328b",
+      "locationSet": {"include": ["za"]},
+      "tags": {
+        "brand": "Nicci Boutiques",
+        "brand:wikidata": "Q130572581",
+        "name": "Nicci Boutiques",
+        "shop": "clothes"
+      }
+    },
     {
       "displayName": "Nike",
       "id": "nike-3937bd",
@@ -9194,6 +9185,17 @@
         "shop": "clothes"
       }
     },
+    {
+      "displayName": "Senqu",
+      "id": "senqu-bd328b",
+      "locationSet": {"include": ["za"]},
+      "tags": {
+        "brand": "Senqu",
+        "brand:wikidata": "Q130581075",
+        "name": "Senqu",
+        "shop": "clothes"
+      }
+    },
     {
       "displayName": "Serge Blanco",
       "id": "sergeblanco-4a3e29",
diff --git a/data/brands/shop/houseware.json b/data/brands/shop/houseware.json
index f2d2a7e4996..4c1e83e4fcf 100644
--- a/data/brands/shop/houseware.json
+++ b/data/brands/shop/houseware.json
@@ -6,30 +6,6 @@
     }
   },
   "items": [
-    {
-      "displayName": "Plastics Depot",
-      "locationSet": {
-        "include": ["za"]
-      },
-      "tags": {
-        "brand": "Plastics Depot",
-        "brand:wikidata": "Q130596634",
-        "name": "Plastics Depot",
-        "shop": "houseware"
-      }
-    },
-    {
-      "displayName": "Crazy Plastics",
-      "locationSet": {
-        "include": ["za"]
-      },
-      "tags": {
-        "brand": "Crazy Plastics",
-        "brand:wikidata": "Q130596652",
-        "name": "Crazy Plastics",
-        "shop": "houseware"
-      }
-    },
     {
       "displayName": "@home",
       "id": "home-dd60e2",
@@ -185,6 +161,17 @@
         "shop": "houseware"
       }
     },
+    {
+      "displayName": "Crazy Plastics",
+      "id": "crazyplastics-4abcbe",
+      "locationSet": {"include": ["za"]},
+      "tags": {
+        "brand": "Crazy Plastics",
+        "brand:wikidata": "Q130596652",
+        "name": "Crazy Plastics",
+        "shop": "houseware"
+      }
+    },
     {
       "displayName": "Dille & Kamille",
       "id": "dilleandkamille-c5ed6b",
@@ -622,6 +609,17 @@
         "shop": "houseware"
       }
     },
+    {
+      "displayName": "Plastics Depot",
+      "id": "plasticsdepot-4abcbe",
+      "locationSet": {"include": ["za"]},
+      "tags": {
+        "brand": "Plastics Depot",
+        "brand:wikidata": "Q130596634",
+        "name": "Plastics Depot",
+        "shop": "houseware"
+      }
+    },
     {
       "displayName": "Preçolandia",
       "id": "precolandia-35237a",
diff --git a/data/brands/shop/storage_rental.json b/data/brands/shop/storage_rental.json
index 82ce9da0ef3..363f086e8a7 100644
--- a/data/brands/shop/storage_rental.json
+++ b/data/brands/shop/storage_rental.json
@@ -591,6 +591,7 @@
     },
     {
       "displayName": "Une pièce en plus",
+      "id": "unepieceenplus-1d8b68",
       "locationSet": {"include": ["fx"]},
       "tags": {
         "brand": "Une pièce en plus",