diff --git a/data/presets/presets.json b/data/presets/presets.json
index 989a199c4..719bc84b6 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -473,9 +473,9 @@
     "highway/road": {"icon": "iD-other-line", "fields": ["highway", "{highway/residential}"], "moreFields": ["{highway/residential}"], "geometry": ["line"], "tags": {"highway": "road"}, "terms": ["road", "street"], "name": "Unknown Road"},
     "highway/secondary_link": {"icon": "iD-highway-secondary-link", "fields": ["{highway/primary_link}"], "moreFields": ["{highway/primary_link}"], "geometry": ["line"], "tags": {"highway": "secondary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Secondary Link"},
     "highway/secondary": {"icon": "iD-highway-secondary", "fields": ["{highway/primary}"], "moreFields": ["{highway/primary}"], "geometry": ["line"], "tags": {"highway": "secondary"}, "terms": ["road", "street"], "name": "Secondary Road"},
-    "highway/service": {"icon": "iD-highway-service", "fields": ["name", "service", "oneway", "maxspeed", "surface", "structure", "access"], "moreFields": ["covered", "flood_prone", "incline", "lanes", "lit", "maxheight", "maxspeed/advisory", "maxweight_bridge", "oneway/bicycle", "trolley_wire"], "geometry": ["line"], "tags": {"highway": "service"}, "terms": ["road", "street"], "matchScore": 0.9, "name": "Service Road"},
+    "highway/service": {"icon": "iD-highway-service", "fields": ["name", "service", "oneway", "maxspeed", "surface", "covered", "structure", "access"], "moreFields": ["flood_prone", "incline", "lanes", "lit", "maxheight", "maxspeed/advisory", "maxweight_bridge", "oneway/bicycle", "trolley_wire"], "geometry": ["line"], "tags": {"highway": "service"}, "terms": ["road", "street"], "matchScore": 0.9, "name": "Service Road"},
     "highway/service/alley": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"service": "alley"}, "addTags": {"highway": "service", "service": "alley"}, "removeTags": {"highway": "service", "service": "alley"}, "reference": {"key": "service", "value": "alley"}, "name": "Alley"},
-    "highway/service/drive-through": {"icon": "iD-highway-service", "fields": ["{highway/service}", "covered"], "geometry": ["line"], "tags": {"service": "drive-through"}, "addTags": {"highway": "service", "service": "drive-through"}, "removeTags": {"highway": "service", "service": "drive-through"}, "reference": {"key": "service", "value": "drive-through"}, "name": "Drive-Through"},
+    "highway/service/drive-through": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"service": "drive-through"}, "addTags": {"highway": "service", "service": "drive-through"}, "removeTags": {"highway": "service", "service": "drive-through"}, "reference": {"key": "service", "value": "drive-through"}, "name": "Drive-Through"},
     "highway/service/driveway": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"service": "driveway"}, "addTags": {"highway": "service", "service": "driveway"}, "removeTags": {"highway": "service", "service": "driveway"}, "reference": {"key": "service", "value": "driveway"}, "name": "Driveway"},
     "highway/service/emergency_access": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"service": "emergency_access"}, "addTags": {"highway": "service", "service": "emergency_access"}, "removeTags": {"highway": "service", "service": "emergency_access"}, "reference": {"key": "service", "value": "emergency_access"}, "name": "Emergency Access"},
     "highway/service/parking_aisle": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"service": "parking_aisle"}, "addTags": {"highway": "service", "service": "parking_aisle"}, "removeTags": {"highway": "service", "service": "parking_aisle"}, "reference": {"key": "service", "value": "parking_aisle"}, "name": "Parking Aisle"},
diff --git a/data/presets/presets/highway/service.json b/data/presets/presets/highway/service.json
index 4b6d2d378..c4d151b95 100644
--- a/data/presets/presets/highway/service.json
+++ b/data/presets/presets/highway/service.json
@@ -6,11 +6,11 @@
         "oneway",
         "maxspeed",
         "surface",
+        "covered",
         "structure",
         "access"
     ],
     "moreFields": [
-        "covered",
         "flood_prone",
         "incline",
         "lanes",
diff --git a/data/presets/presets/highway/service/drive-through.json b/data/presets/presets/highway/service/drive-through.json
index aa77c59c1..d8ff17034 100644
--- a/data/presets/presets/highway/service/drive-through.json
+++ b/data/presets/presets/highway/service/drive-through.json
@@ -1,9 +1,5 @@
 {
     "icon": "iD-highway-service",
-    "fields": [
-        "{highway/service}",
-        "covered"
-    ],
     "geometry": [
         "line"
     ],