diff --git a/data/brands/amenity/bank.json b/data/brands/amenity/bank.json
index 9897d6ed656..36fb114d77d 100644
--- a/data/brands/amenity/bank.json
+++ b/data/brands/amenity/bank.json
@@ -1216,18 +1216,6 @@
         "name": "Banca Mediolanum"
       }
     },
-    {
-      "displayName": "CiviBank",
-      "id": "bancapopolaredicividale-7b36b5",
-      "locationSet": {"include": ["it"]},
-      "matchNames": ["banca popolare di cividale"],
-      "tags": {
-        "amenity": "bank",
-        "brand": "CiviBank",
-        "brand:wikidata": "Q15639942",
-        "name": "CiviBank"
-      }
-    },
     {
       "displayName": "Banca Popolare di Sondrio",
       "id": "bancapopolaredisondrio-7b36b5",
@@ -5102,6 +5090,20 @@
         "short_name": "CUB"
       }
     },
+    {
+      "displayName": "CiviBank",
+      "id": "civibank-7b36b5",
+      "locationSet": {"include": ["it"]},
+      "matchNames": [
+        "banca popolare di cividale"
+      ],
+      "tags": {
+        "amenity": "bank",
+        "brand": "CiviBank",
+        "brand:wikidata": "Q15639942",
+        "name": "CiviBank"
+      }
+    },
     {
       "displayName": "CNEP (الصندوق الوطني للتوفير والاحتياط)",
       "id": "cnep-47c9bd",
@@ -5477,8 +5479,8 @@
       "id": "creditagricole-7b36b5",
       "locationSet": {"include": ["it"]},
       "matchNames": [
-        "cariparma", 
-        "credito artigiano", 
+        "cariparma",
+        "credito artigiano",
         "credito valtellinese"
       ],
       "tags": {
diff --git a/data/brands/club/scout.json b/data/brands/club/scout.json
index 11b2c844ae7..d0f56318470 100644
--- a/data/brands/club/scout.json
+++ b/data/brands/club/scout.json
@@ -9,39 +9,6 @@
     }
   },
   "items": [
-    {
-      "displayName": "Pfadfinderinnenschaft St. Georg",
-      "locationSet": {"include": ["de"]},
-      "matchNames": ["psg"],
-      "preserveTags": ["^name"],
-      "tags": {
-        "brand": "Pfadfinderinnenschaft St. Georg",
-        "brand:wikidata": "Q2081993",
-        "club": "scout"
-      }
-    },
-    {
-      "displayName": "Bund Muslimischer Pfadfinderinnen und Pfadfinder Deutschlands",
-      "locationSet": {"include": ["de"]},
-      "matchNames": ["BMPPD"],
-      "preserveTags": ["^name"],
-      "tags": {
-        "brand": "Bund Muslimischer Pfadfinderinnen und Pfadfinder Deutschlands",
-        "brand:wikidata": "Q16318690",
-        "club": "scout"
-      }
-    },
-    {
-      "displayName": "Pfadfinderbund Weltenbummler",
-      "locationSet": {"include": ["de"]},
-      "matchNames": ["pbw"],
-      "preserveTags": ["^name"],
-      "tags": {
-        "brand": "Pfadfinderbund Weltenbummler",
-        "brand:wikidata": "Q1755705",
-        "club": "scout"
-      }
-    },
     {
       "displayName": "Associação de Escuteiros de Angola",
       "id": "associacaodeescuteirosdeangola-110cb7",
@@ -65,6 +32,18 @@
         "club": "scout"
       }
     },
+    {
+      "displayName": "Bund Muslimischer Pfadfinderinnen und Pfadfinder Deutschlands",
+      "id": "bundmuslimischerpfadfinderinnenundpfadfinderdeutschlands-9e77d2",
+      "locationSet": {"include": ["de"]},
+      "matchNames": ["bmppd"],
+      "preserveTags": ["^name"],
+      "tags": {
+        "brand": "Bund Muslimischer Pfadfinderinnen und Pfadfinder Deutschlands",
+        "brand:wikidata": "Q16318690",
+        "club": "scout"
+      }
+    },
     {
       "displayName": "Deutsche Pfadfinderschaft Sankt Georg",
       "id": "deutschepfadfinderschaftsanktgeorg-9e77d2",
@@ -110,6 +89,30 @@
         "club": "scout"
       }
     },
+    {
+      "displayName": "Pfadfinderbund Weltenbummler",
+      "id": "pfadfinderbundweltenbummler-9e77d2",
+      "locationSet": {"include": ["de"]},
+      "matchNames": ["pbw"],
+      "preserveTags": ["^name"],
+      "tags": {
+        "brand": "Pfadfinderbund Weltenbummler",
+        "brand:wikidata": "Q1755705",
+        "club": "scout"
+      }
+    },
+    {
+      "displayName": "Pfadfinderinnenschaft St. Georg",
+      "id": "pfadfinderinnenschaftstgeorg-9e77d2",
+      "locationSet": {"include": ["de"]},
+      "matchNames": ["psg"],
+      "preserveTags": ["^name"],
+      "tags": {
+        "brand": "Pfadfinderinnenschaft St. Georg",
+        "brand:wikidata": "Q2081993",
+        "club": "scout"
+      }
+    },
     {
       "displayName": "Scoutisme Béninois",
       "id": "scoutismebeninois-7b4b06",
diff --git a/data/brands/shop/convenience.json b/data/brands/shop/convenience.json
index ada254bf345..a7baf8dd113 100644
--- a/data/brands/shop/convenience.json
+++ b/data/brands/shop/convenience.json
@@ -5099,6 +5099,7 @@
     },
     {
       "displayName": "Super DIS",
+      "id": "superdis-3015fb",
       "locationSet": {"include": ["rs"]},
       "tags": {
         "brand": "Super DIS",
diff --git a/data/operators/amenity/charging_station.json b/data/operators/amenity/charging_station.json
index dd040419ad7..28f521c3fa8 100644
--- a/data/operators/amenity/charging_station.json
+++ b/data/operators/amenity/charging_station.json
@@ -3232,8 +3232,10 @@
     },
     {
       "displayName": "GreenWay",
-      "id": "greenway-db76f0",
-      "locationSet": {"include": ["hr", "pl", "sk"]},
+      "id": "greenway-40951a",
+      "locationSet": {
+        "include": ["hr", "pl", "sk"]
+      },
       "tags": {
         "amenity": "charging_station",
         "operator": "GreenWay",
diff --git a/data/operators/power/substation.json b/data/operators/power/substation.json
index bc962c36699..e754468d593 100644
--- a/data/operators/power/substation.json
+++ b/data/operators/power/substation.json
@@ -2239,7 +2239,10 @@
       "displayName": "e-distribuzione S.p.A.",
       "id": "edistribuzionespa-5e9b52",
       "locationSet": {"include": ["it"]},
-      "matchNames": ["e-distribuzione", "Enel Distribuzione"],
+      "matchNames": [
+        "e-distribuzione",
+        "enel distribuzione"
+      ],
       "tags": {
         "operator": "e-distribuzione S.p.A.",
         "operator:wikidata": "Q3725215",