diff --git a/data/presets.yaml b/data/presets.yaml
index b6f50395b..d583f4104 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -8884,21 +8884,11 @@ en:
         name: City Limit Sign
         # 'terms: town,village,hamlet,boundary,edge,border,road,highway'
         terms: '<translate with synonyms or related terms for ''City Limit Sign'', separated by commas>'
-      traffic_sign/city_limit_vertex:
-        # traffic_sign=city_limit
-        name: City Limit Sign
-        # 'terms: town,village,hamlet,boundary,edge,border,road,highway'
-        terms: '<translate with synonyms or related terms for ''City Limit Sign'', separated by commas>'
       traffic_sign/maxspeed:
         # traffic_sign=maxspeed
         name: Speed Limit Sign
         # 'terms: max speed,maximum speed,road,highway'
         terms: '<translate with synonyms or related terms for ''Speed Limit Sign'', separated by commas>'
-      traffic_sign/maxspeed_vertex:
-        # traffic_sign=maxspeed
-        name: Speed Limit Sign
-        # 'terms: max speed,maximum speed,road,highway'
-        terms: '<translate with synonyms or related terms for ''Speed Limit Sign'', separated by commas>'
       type/boundary:
         # type=boundary
         name: Boundary
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 6eba633db..1d962cc78 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1282,10 +1282,8 @@
   "traffic_calming/rumble_strip": {"icon": "temaki-rumble_strip", "fields": ["direction_vertex"], "geometry": ["vertex", "line"], "terms": ["audible lines", "sleeper lines", "growlers"], "tags": {"traffic_calming": "rumble_strip"}, "name": "Rumble Strip"},
   "traffic_calming/table": {"icon": "temaki-speed_table", "fields": ["surface", "direction_vertex"], "geometry": ["vertex"], "tags": {"traffic_calming": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "name": "Speed Table"},
   "traffic_sign": {"icon": "fas-directions", "fields": ["traffic_sign", "traffic_sign/direction", "direction_point"], "geometry": ["point", "vertex"], "tags": {"traffic_sign": "*"}, "terms": ["road", "highway"], "name": "Traffic Sign"},
-  "traffic_sign/city_limit_vertex": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "traffic_sign/direction", "name"], "geometry": ["vertex"], "tags": {"traffic_sign": "city_limit"}, "terms": ["town", "village", "hamlet", "boundary", "edge", "border", "road", "highway"], "name": "City Limit Sign"},
-  "traffic_sign/city_limit": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "direction", "name"], "geometry": ["point"], "tags": {"traffic_sign": "city_limit"}, "terms": ["town", "village", "hamlet", "boundary", "edge", "border", "road", "highway"], "name": "City Limit Sign"},
-  "traffic_sign/maxspeed_vertex": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "traffic_sign/direction", "maxspeed"], "geometry": ["vertex"], "tags": {"traffic_sign": "maxspeed"}, "terms": ["max speed", "maximum speed", "road", "highway"], "name": "Speed Limit Sign"},
-  "traffic_sign/maxspeed": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "direction", "maxspeed"], "geometry": ["point"], "tags": {"traffic_sign": "maxspeed"}, "terms": ["max speed", "maximum speed", "road", "highway"], "name": "Speed Limit Sign"},
+  "traffic_sign/city_limit": {"icon": "maki-square-stroked", "fields": ["{traffic_sign}", "name"], "geometry": ["point", "vertex"], "tags": {"traffic_sign": "city_limit"}, "terms": ["town", "village", "hamlet", "boundary", "edge", "border", "road", "highway"], "name": "City Limit Sign"},
+  "traffic_sign/maxspeed": {"icon": "maki-square-stroked", "fields": ["{traffic_sign}", "maxspeed"], "geometry": ["point", "vertex"], "tags": {"traffic_sign": "maxspeed"}, "terms": ["max speed", "maximum speed", "road", "highway"], "name": "Speed Limit Sign"},
   "type/multipolygon": {"icon": "iD-multipolygon", "geometry": ["area", "relation"], "tags": {"type": "multipolygon"}, "removeTags": {}, "name": "Multipolygon", "searchable": false, "matchScore": 0.1},
   "type/boundary": {"icon": "iD-boundary", "fields": ["name", "boundary"], "geometry": ["relation"], "tags": {"type": "boundary"}, "name": "Boundary"},
   "type/boundary/administrative": {"icon": "iD-boundary", "fields": ["name", "admin_level"], "moreFields": ["gnis/feature_id"], "geometry": ["relation"], "tags": {"type": "boundary", "boundary": "administrative"}, "reference": {"key": "boundary", "value": "administrative"}, "name": "Administrative Boundary"},
diff --git a/data/presets/presets/traffic_sign/city_limit.json b/data/presets/presets/traffic_sign/city_limit.json
index bf32228f6..1175311b5 100644
--- a/data/presets/presets/traffic_sign/city_limit.json
+++ b/data/presets/presets/traffic_sign/city_limit.json
@@ -1,12 +1,12 @@
 {
     "icon": "maki-square-stroked",
     "fields": [
-        "traffic_sign",
-        "direction",
+        "{traffic_sign}",
         "name"
     ],
     "geometry": [
-        "point"
+        "point",
+        "vertex"
     ],
     "tags": {
         "traffic_sign": "city_limit"
diff --git a/data/presets/presets/traffic_sign/city_limit_vertex.json b/data/presets/presets/traffic_sign/city_limit_vertex.json
deleted file mode 100644
index 11c71e054..000000000
--- a/data/presets/presets/traffic_sign/city_limit_vertex.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "icon": "maki-square-stroked",
-    "fields": [
-        "traffic_sign",
-        "traffic_sign/direction",
-        "name"
-    ],
-    "geometry": [
-        "vertex"
-    ],
-    "tags": {
-        "traffic_sign": "city_limit"
-    },
-    "terms": [
-        "town",
-        "village",
-        "hamlet",
-        "boundary",
-        "edge",
-        "border",
-        "road",
-        "highway"
-    ],
-    "name": "City Limit Sign"
-}
diff --git a/data/presets/presets/traffic_sign/maxspeed.json b/data/presets/presets/traffic_sign/maxspeed.json
index 1845a779d..b5179284a 100644
--- a/data/presets/presets/traffic_sign/maxspeed.json
+++ b/data/presets/presets/traffic_sign/maxspeed.json
@@ -1,12 +1,12 @@
 {
     "icon": "maki-square-stroked",
     "fields": [
-        "traffic_sign",
-        "direction",
+        "{traffic_sign}",
         "maxspeed"
     ],
     "geometry": [
-        "point"
+        "point",
+        "vertex"
     ],
     "tags": {
         "traffic_sign": "maxspeed"
diff --git a/data/presets/presets/traffic_sign/maxspeed_vertex.json b/data/presets/presets/traffic_sign/maxspeed_vertex.json
deleted file mode 100644
index 667d3c7d9..000000000
--- a/data/presets/presets/traffic_sign/maxspeed_vertex.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "icon": "maki-square-stroked",
-    "fields": [
-        "traffic_sign",
-        "traffic_sign/direction",
-        "maxspeed"
-    ],
-    "geometry": [
-        "vertex"
-    ],
-    "tags": {
-        "traffic_sign": "maxspeed"
-    },
-    "terms": [
-        "max speed",
-        "maximum speed",
-        "road",
-        "highway"
-    ],
-    "name": "Speed Limit Sign"
-}
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 147067663..67f79a7c6 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -10299,18 +10299,10 @@
                     "name": "Traffic Sign",
                     "terms": "road,highway"
                 },
-                "traffic_sign/city_limit_vertex": {
-                    "name": "City Limit Sign",
-                    "terms": "town,village,hamlet,boundary,edge,border,road,highway"
-                },
                 "traffic_sign/city_limit": {
                     "name": "City Limit Sign",
                     "terms": "town,village,hamlet,boundary,edge,border,road,highway"
                 },
-                "traffic_sign/maxspeed_vertex": {
-                    "name": "Speed Limit Sign",
-                    "terms": "max speed,maximum speed,road,highway"
-                },
                 "traffic_sign/maxspeed": {
                     "name": "Speed Limit Sign",
                     "terms": "max speed,maximum speed,road,highway"