diff --git a/data/presets/presets.json b/data/presets/presets.json
index 36ec71b0b..6439f89a3 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -235,7 +235,7 @@
     "barrier/ditch": {"icon": "maki-roadblock", "geometry": ["line", "area"], "tags": {"barrier": "ditch"}, "name": "Trench", "matchScore": 0.25},
     "barrier/fence": {"icon": "maki-fence", "fields": ["fence_type", "height"], "geometry": ["line"], "tags": {"barrier": "fence"}, "name": "Fence", "matchScore": 0.25},
     "barrier/gate": {"icon": "maki-barrier", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "gate"}, "name": "Gate"},
-    "barrier/guard_rail": {"icon": "maki-barrier", "geometry": ["vertex", "line"], "tags": {"barrier": "guard_rail"}, "name": "Guard Rail", "terms": ["railing", "guardrail", "traffic barrier", "crash barrier", "median barrier", "roadside barrier", "Armco barrier"], "matchScore": 0.75},
+    "barrier/guard_rail": {"icon": "maki-barrier", "geometry": ["line"], "tags": {"barrier": "guard_rail"}, "name": "Guard Rail", "terms": ["railing", "guardrail", "traffic barrier", "crash barrier", "median barrier", "roadside barrier", "Armco barrier"], "matchScore": 0.75},
     "barrier/hedge": {"fields": ["height"], "geometry": ["line", "area"], "tags": {"barrier": "hedge"}, "name": "Hedge", "matchScore": 0.25},
     "barrier/kerb": {"icon": "maki-wheelchair", "fields": ["kerb", "tactile_paving"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb"}, "name": "Curb"},
     "barrier/kerb/lowered": {"icon": "maki-wheelchair", "fields": ["kerb", "tactile_paving"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "lowered"}, "reference": {"key": "kerb", "value": "lowered"}, "terms": ["curb cut", "curb ramp", "kerb ramp", "dropped kerb", "pram ramp"], "name": "Lowered Curb"},
diff --git a/data/presets/presets/barrier/guard_rail.json b/data/presets/presets/barrier/guard_rail.json
index 3e674a2c3..061d1ebf0 100644
--- a/data/presets/presets/barrier/guard_rail.json
+++ b/data/presets/presets/barrier/guard_rail.json
@@ -1,7 +1,6 @@
 {
     "icon": "maki-barrier",
     "geometry": [
-        "vertex",
         "line"
     ],
     "tags": {
diff --git a/data/taginfo.json b/data/taginfo.json
index 299da1432..e14e0b88f 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1601,7 +1601,7 @@
       "key": "barrier",
       "value": "guard_rail",
       "description": "Guard Rail",
-      "object_types": ["node", "way"],
+      "object_types": ["way"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/barrier-15.svg?sanitize=true"
     },
     {