diff --git a/data/brands/amenity/language_school.json b/data/brands/amenity/language_school.json
index 6581735665e..e691500441e 100644
--- a/data/brands/amenity/language_school.json
+++ b/data/brands/amenity/language_school.json
@@ -1,6 +1,7 @@
 {
   "properties": {
     "path": "brands/amenity/language_school",
+    "preserveTags": ["^name"],
     "exclude": {"generic": ["^language school$"]}
   },
   "items": [
diff --git a/data/brands/amenity/music_school.json b/data/brands/amenity/music_school.json
index 8c91250289c..b37b5565ff1 100644
--- a/data/brands/amenity/music_school.json
+++ b/data/brands/amenity/music_school.json
@@ -1,6 +1,7 @@
 {
   "properties": {
     "path": "brands/amenity/music_school",
+    "preserveTags": ["^name"],
     "exclude": {
       "generic": [
         "^(music school|école de musique|музыкальная школа)$"
diff --git a/data/brands/amenity/prep_school.json b/data/brands/amenity/prep_school.json
index c368e423395..e7287bb7c5c 100644
--- a/data/brands/amenity/prep_school.json
+++ b/data/brands/amenity/prep_school.json
@@ -1,6 +1,7 @@
 {
   "properties": {
     "path": "brands/amenity/prep_school",
+    "preserveTags": ["^name"],
     "exclude": {"generic": ["^prep school$"]}
   },
   "items": [
diff --git a/data/brands/amenity/restaurant.json b/data/brands/amenity/restaurant.json
index 9e5dbd5f0db..a07116f4152 100644
--- a/data/brands/amenity/restaurant.json
+++ b/data/brands/amenity/restaurant.json
@@ -1019,8 +1019,20 @@
     },
     {
       "displayName": "Crepes & Waffles",
-      "id": "crepesandwaffles-96af40",
-      "locationSet": {"include": ["co", "cl", "ec", "es", "mx", "pa", "pe", "br", "ve"]},
+      "id": "crepesandwaffles-7b5290",
+      "locationSet": {
+        "include": [
+          "br",
+          "cl",
+          "co",
+          "ec",
+          "es",
+          "mx",
+          "pa",
+          "pe",
+          "ve"
+        ]
+      },
       "tags": {
         "alt_name": "Crepes & Waffles",
         "amenity": "restaurant",
diff --git a/data/brands/amenity/school.json b/data/brands/amenity/school.json
index 86ee6902c22..0f5926cc009 100644
--- a/data/brands/amenity/school.json
+++ b/data/brands/amenity/school.json
@@ -2,6 +2,7 @@
   "properties": {
     "path": "brands/amenity/school",
     "skipCollection": true,
+    "preserveTags": ["^name"],
     "exclude": {
       "generic": ["^school( building)?$"]
     }
diff --git a/data/brands/amenity/training.json b/data/brands/amenity/training.json
index 5ddd703eccb..4621099d02d 100644
--- a/data/brands/amenity/training.json
+++ b/data/brands/amenity/training.json
@@ -1,6 +1,7 @@
 {
   "properties": {
     "path": "brands/amenity/training",
+    "preserveTags": ["^name"],
     "exclude": {"generic": ["^training$"]}
   },
   "items": [