diff --git a/data/presets/amenity/cafe.json b/data/presets/amenity/cafe.json
index 5c9e482c4..90483b731 100644
--- a/data/presets/amenity/cafe.json
+++ b/data/presets/amenity/cafe.json
@@ -21,9 +21,11 @@
         "capacity",
         "delivery",
         "diet_multi",
+        "drive_through",
         "email",
         "fax",
         "gnis/feature_id-US",
+        "highchair",
         "level",
         "min_age",
         "not/name",
@@ -36,8 +38,7 @@
         "takeaway",
         "toilets",
         "toilets/wheelchair",
-        "wheelchair",
-        "highchair"
+        "wheelchair"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/amenity/fast_food.json b/data/presets/amenity/fast_food.json
index ebb07f119..80599c250 100644
--- a/data/presets/amenity/fast_food.json
+++ b/data/presets/amenity/fast_food.json
@@ -21,6 +21,7 @@
         "email",
         "fax",
         "gnis/feature_id-US",
+        "highchair",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
@@ -32,8 +33,7 @@
         "ref/FR/siret-FR",
         "smoking",
         "takeaway",
-        "wheelchair",
-        "highchair"
+        "wheelchair"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/amenity/restaurant.json b/data/presets/amenity/restaurant.json
index cb2dbdee8..972823a51 100644
--- a/data/presets/amenity/restaurant.json
+++ b/data/presets/amenity/restaurant.json
@@ -21,6 +21,7 @@
         "email",
         "fax",
         "gnis/feature_id-US",
+        "highchair",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
@@ -40,8 +41,7 @@
         "takeaway",
         "toilets",
         "toilets/wheelchair",
-        "wheelchair",
-        "highchair"
+        "wheelchair"
     ],
     "geometry": [
         "point",