diff --git a/data/fields/barrier_planter.json b/data/fields/barrier_planter.json
new file mode 100644
index 00000000..841e0013
--- /dev/null
+++ b/data/fields/barrier_planter.json
@@ -0,0 +1,14 @@
+{
+    "key": "barrier",
+    "type": "defaultCheck",
+    "label": "Barrier",
+    "geometry": [
+        "vertex"
+    ],
+    "strings": {
+        "options": {
+            "undefined": "No",
+            "planter": "Yes"
+        }
+    }
+}
diff --git a/data/fields/maxwidth.json b/data/fields/maxwidth.json
new file mode 100644
index 00000000..6c4ee83c
--- /dev/null
+++ b/data/fields/maxwidth.json
@@ -0,0 +1,6 @@
+{
+    "key": "maxwidth",
+    "type": "roadheight",
+    "label": "Max Width",
+    "snake_case": false
+}
diff --git a/data/presets/barrier/_ditch.json b/data/presets/barrier/_ditch.json
new file mode 100644
index 00000000..92ef22df
--- /dev/null
+++ b/data/presets/barrier/_ditch.json
@@ -0,0 +1,11 @@
+{
+    "icon": "maki-roadblock",
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "barrier": "ditch"
+    },
+    "name": "Ditch",
+    "searchable": false
+}
diff --git a/data/presets/barrier/_handrail.json b/data/presets/barrier/_handrail.json
new file mode 100644
index 00000000..7178e10a
--- /dev/null
+++ b/data/presets/barrier/_handrail.json
@@ -0,0 +1,11 @@
+{
+    "icon": "temaki-railing",
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "barrier": "handrail"
+    },
+    "name": "Handrail",
+    "searchable": false
+}
diff --git a/data/presets/barrier/_log.json b/data/presets/barrier/_log.json
new file mode 100644
index 00000000..4785fa19
--- /dev/null
+++ b/data/presets/barrier/_log.json
@@ -0,0 +1,15 @@
+{
+    "icon": "maki-roadblock",
+    "fields": [
+        "access"
+    ],
+    "geometry": [
+        "vertex",
+        "line"
+    ],
+    "tags": {
+        "barrier": "log"
+    },
+    "name": "Fallen Tree",
+    "searchable": false
+}
diff --git a/data/presets/barrier/_planter.json b/data/presets/barrier/_planter.json
new file mode 100644
index 00000000..74949993
--- /dev/null
+++ b/data/presets/barrier/_planter.json
@@ -0,0 +1,16 @@
+{
+    "icon": "maki-garden",
+    "fields": [
+        "access",
+        "material"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "barrier": "planter",
+        "man_made": "planter"
+    },
+    "name": "Planter (Barrier)",
+    "searchable": false
+}
diff --git a/data/presets/barrier/bump_gate.json b/data/presets/barrier/bump_gate.json
new file mode 100644
index 00000000..2733cb8b
--- /dev/null
+++ b/data/presets/barrier/bump_gate.json
@@ -0,0 +1,16 @@
+{
+    "icon": "maki-roadblock",
+    "fields": [
+        "access"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "terms": [
+        "drive-through gate"
+    ],
+    "tags": {
+        "barrier": "bump_gate"
+    },
+    "name": "Bump Gate"
+}
diff --git a/data/presets/barrier/bus_trap.json b/data/presets/barrier/bus_trap.json
new file mode 100644
index 00000000..db5aa81d
--- /dev/null
+++ b/data/presets/barrier/bus_trap.json
@@ -0,0 +1,19 @@
+{
+    "icon": "maki-roadblock",
+    "fields": [
+        "access"
+    ],
+    "moreFields": [
+        "maxwidth"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "terms": [
+        "car trap"
+    ],
+    "tags": {
+        "barrier": "bus_trap"
+    },
+    "name": "Bus Trap"
+}
diff --git a/data/presets/barrier/cable_barrier.json b/data/presets/barrier/cable_barrier.json
new file mode 100644
index 00000000..18578124
--- /dev/null
+++ b/data/presets/barrier/cable_barrier.json
@@ -0,0 +1,18 @@
+{
+    "icon": "maki-roadblock",
+    "fields": [
+        "height",
+        "material"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "barrier": "cable_barrier"
+    },
+    "terms": [
+        "guard cable",
+        "wire rope safety barrier"
+    ],
+    "name": "Cable Barrier"
+}
diff --git a/data/presets/barrier/full-height_turnstile.json b/data/presets/barrier/full-height_turnstile.json
new file mode 100644
index 00000000..2f1389f8
--- /dev/null
+++ b/data/presets/barrier/full-height_turnstile.json
@@ -0,0 +1,17 @@
+{
+    "icon": "maki-roadblock",
+    "fields": [
+        "access"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "terms": [
+        "baffle gate",
+        "turnstyle"
+    ],
+    "tags": {
+        "barrier": "full-height_turnstile"
+    },
+    "name": "Full-height Turnstile"
+}
diff --git a/data/presets/barrier/hampshire_gate.json b/data/presets/barrier/hampshire_gate.json
new file mode 100644
index 00000000..4672f9b5
--- /dev/null
+++ b/data/presets/barrier/hampshire_gate.json
@@ -0,0 +1,17 @@
+{
+    "icon": "temaki-gate",
+    "fields": [
+        "access"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "barrier": "hampshire_gate"
+    },
+    "terms": [
+        "new zealand gate",
+        "wire gate"
+    ],
+    "name": "Hampshire Gate"
+}
diff --git a/data/presets/barrier/jersey_barrier.json b/data/presets/barrier/jersey_barrier.json
new file mode 100644
index 00000000..0921b9c2
--- /dev/null
+++ b/data/presets/barrier/jersey_barrier.json
@@ -0,0 +1,29 @@
+{
+    "icon": "maki-roadblock",
+    "fields": [
+        "height",
+        "material"
+    ],
+    "moreFields": [
+        "access"
+    ],
+    "geometry": [
+        "point",
+        "line"
+    ],
+    "tags": {
+        "barrier": "jersey_barrier"
+    },
+    "terms": [
+        "concrete median",
+        "concrete barrier",
+        "constant-slope barrier",
+        "f-shape barrier",
+        "k-rail",
+        "median",
+        "new jersey wall",
+        "ontario tall wall",
+        "plastic barrier"
+    ],
+    "name": "Jersey Barrier"
+}
diff --git a/data/presets/barrier/motorcycle_barrier.json b/data/presets/barrier/motorcycle_barrier.json
new file mode 100644
index 00000000..09ffe28f
--- /dev/null
+++ b/data/presets/barrier/motorcycle_barrier.json
@@ -0,0 +1,16 @@
+{
+    "icon": "maki-roadblock",
+    "fields": [
+        "access"
+    ],
+    "moreFields": [
+        "wheelchair"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "barrier": "motorcycle_barrier"
+    },
+    "name": "Motorcycle Barrier"
+}
diff --git a/data/presets/barrier/rope.json b/data/presets/barrier/rope.json
new file mode 100644
index 00000000..d4df1fff
--- /dev/null
+++ b/data/presets/barrier/rope.json
@@ -0,0 +1,14 @@
+{
+    "icon": "temaki-rope_fence",
+    "fields": [
+        "access"
+    ],
+    "geometry": [
+        "vertex",
+        "line"
+    ],
+    "tags": {
+        "barrier": "rope"
+    },
+    "name": "Rope Fence"
+}
diff --git a/data/presets/barrier/wicket_gate.json b/data/presets/barrier/wicket_gate.json
new file mode 100644
index 00000000..f63b313b
--- /dev/null
+++ b/data/presets/barrier/wicket_gate.json
@@ -0,0 +1,17 @@
+{
+    "icon": "temaki-gate",
+    "geometry": [
+        "vertex",
+        "line"
+    ],
+    "fields": [
+        "access"
+    ],
+    "moreFields": [
+        "entrance"
+    ],
+    "tags": {
+        "barrier": "wicket_gate"
+    },
+    "name": "Wicket Gate"
+}
diff --git a/data/presets/man_made/planter.json b/data/presets/man_made/planter.json
new file mode 100644
index 00000000..b0a5e2b0
--- /dev/null
+++ b/data/presets/man_made/planter.json
@@ -0,0 +1,17 @@
+{
+    "icon": "maki-garden",
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "fields": [
+        "material",
+        "barrier_planter"
+    ],
+    "tags": {
+        "man_made": "planter"
+    },
+    "matchScore": 0.9,
+    "name": "Planter"
+}