diff --git a/data/fields/curve.json b/data/fields/curve.json
new file mode 100644
index 000000000..6c18cc1fa
--- /dev/null
+++ b/data/fields/curve.json
@@ -0,0 +1,15 @@
+{
+    "key": "curve",
+    "type": "combo",
+    "strings": {
+        "options": {
+            "hairpin": "Hairpin/Switchback",
+            "loop": "Loop (270 Degrees or More)"
+        }
+    },
+    "label": "Type",
+    "prerequisiteTag": {
+        "key": "hazard",
+        "value": "curve"
+    }
+}
diff --git a/data/fields/curves.json b/data/fields/curves.json
new file mode 100644
index 000000000..0f1288096
--- /dev/null
+++ b/data/fields/curves.json
@@ -0,0 +1,15 @@
+{
+    "key": "curves",
+    "type": "combo",
+    "strings": {
+        "options": {
+            "serpentine": "Double Curve/Bend",
+            "extended": "Windy Road (Many Curves)"
+        }
+    },
+    "label": "Type",
+    "prerequisiteTag": {
+        "key": "hazard",
+        "value": "curves"
+    }
+}
diff --git a/data/fields/hazard/animal.json b/data/fields/hazard/animal.json
new file mode 100644
index 000000000..25c4c977b
--- /dev/null
+++ b/data/fields/hazard/animal.json
@@ -0,0 +1,21 @@
+{
+    "key": "hazard:animal",
+    "type": "combo",
+    "strings": {
+        "options": {
+            "wild_animal": "Wild Animal",
+            "moose": "Moose",
+            "livestock": "Livestock",
+            "deer": "Deer",
+            "cow": "Cow",
+            "snake": "Snake",
+            "amphibian": "Amphibian",
+            "duck": "Duck"
+        }
+    },
+    "label": "Type",
+    "prerequisiteTag": {
+        "key": "hazard",
+        "value": "animal_crossing"
+    }
+}
diff --git a/data/fields/hazard_traffic.json b/data/fields/hazard_traffic.json
new file mode 100644
index 000000000..001218200
--- /dev/null
+++ b/data/fields/hazard_traffic.json
@@ -0,0 +1,35 @@
+{
+    "key": "hazard",
+    "type": "combo",
+    "strings": {
+        "options": {
+            "animal_crossing": "Animal Crossing",
+            "cyclists": "Bicycle / Cyclist",
+            "bump": "Bump",
+            "children": "Children",
+            "queues_likely": "Congestion / Stoped Traffic",
+            "curve": "Curve",
+            "curves": "Curves",
+            "dangerous_junction": "Dangerous Intersection",
+            "dip": "Dip",
+            "emergency_vehicles": "Emergency Vehicles",
+            "falling_rocks": "Falling Rocks",
+            "flooding": "Flooding",
+            "fog": "Fog",
+            "horse_riders": "Horseback Rider",
+            "ice": "Ice",
+            "landslide": "Landslide",
+            "loose_gravel": "Loose Gravel",
+            "ground_clearance": "Low Ground Clearance",
+            "road_narrows": "Narrow Road",
+            "pedestrians": "Pedestrian",
+            "roundabout": "Roundabout",
+            "school_zone": "School Zone",
+            "turn": "Sharp Turn",
+            "turns": "Sharp Turns",
+            "slippery": "Slippery Road",
+            "traffic_signals": "Traffic Signal"
+        }
+    },
+    "label": "Hazard"
+}
diff --git a/data/fields/traffic_sign.json b/data/fields/traffic_sign.json
index 46f800d37..c65a2b4cf 100644
--- a/data/fields/traffic_sign.json
+++ b/data/fields/traffic_sign.json
@@ -1,6 +1,14 @@
 {
     "key": "traffic_sign",
     "type": "typeCombo",
+    "strings": {
+        "options": {
+            "city_limit": "City Limit Sign",
+            "hazard": "Warning Sign",
+            "maxspeed": "Speed Limit Sign",
+            "variable_message": "Variable Message Sign"
+        }
+    },
     "label": "Traffic Sign",
     "snake_case": false,
     "caseSensitive": true
diff --git a/data/presets/traffic_sign/hazard.json b/data/presets/traffic_sign/hazard.json
new file mode 100644
index 000000000..db11246e5
--- /dev/null
+++ b/data/presets/traffic_sign/hazard.json
@@ -0,0 +1,18 @@
+{
+    "icon": "fas-triangle-exclamation",
+    "fields": [
+        "{traffic_sign}",
+        "hazard_traffic"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard"
+    },
+    "aliases": [
+        "Hazard Sign"
+    ],
+    "name": "Warning Sign"
+}
diff --git a/data/presets/traffic_sign/hazard/animal_crossing.json b/data/presets/traffic_sign/hazard/animal_crossing.json
new file mode 100644
index 000000000..91181a510
--- /dev/null
+++ b/data/presets/traffic_sign/hazard/animal_crossing.json
@@ -0,0 +1,23 @@
+{
+    "icon": "fas-frog",
+    "fields": [
+        "{traffic_sign/hazard}",
+        "hazard/animal"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard",
+        "hazard": "animal_crossing"
+    },
+    "reference": {
+        "key": "hazard",
+        "value": "animal_crossing"
+    },
+    "aliases": [
+        "Wildlife Crossing Sign"
+    ],
+    "name": "Animal Crossing Warning Sign"
+}
diff --git a/data/presets/traffic_sign/hazard/bump.json b/data/presets/traffic_sign/hazard/bump.json
new file mode 100644
index 000000000..6635f50eb
--- /dev/null
+++ b/data/presets/traffic_sign/hazard/bump.json
@@ -0,0 +1,25 @@
+{
+    "icon": "temaki-speed_bump",
+    "fields": [
+        "{traffic_sign/hazard}",
+        "maxspeed/advisory"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard",
+        "hazard": "bump"
+    },
+    "reference": {
+        "key": "hazard",
+        "value": "bump"
+    },
+    "aliases": [
+        "Speed Bump Sign",
+        "Speed Hump Sign",
+        "Speed Table Sign"
+    ],
+    "name": "Bump Warning Sign"
+}
diff --git a/data/presets/traffic_sign/hazard/children.json b/data/presets/traffic_sign/hazard/children.json
new file mode 100644
index 000000000..e2f5ba0ea
--- /dev/null
+++ b/data/presets/traffic_sign/hazard/children.json
@@ -0,0 +1,23 @@
+{
+    "icon": "temaki-seesaw",
+    "fields": [
+        "{traffic_sign/hazard}",
+        "maxspeed/advisory"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard",
+        "hazard": "children"
+    },
+    "reference": {
+        "key": "hazard",
+        "value": "children"
+    },
+    "aliases": [
+        "Playing Children Sign"
+    ],
+    "name": "Children Warning Sign"
+}
diff --git a/data/presets/traffic_sign/hazard/curve.json b/data/presets/traffic_sign/hazard/curve.json
new file mode 100644
index 000000000..04e2dc95e
--- /dev/null
+++ b/data/presets/traffic_sign/hazard/curve.json
@@ -0,0 +1,20 @@
+{
+    "fields": [
+        "{traffic_sign/hazard}",
+        "curve",
+        "maxspeed/advisory"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard",
+        "hazard": "curve"
+    },
+    "reference": {
+        "key": "hazard",
+        "value": "curve"
+    },
+    "name": "Curve Warning Sign"
+}
diff --git a/data/presets/traffic_sign/hazard/curves.json b/data/presets/traffic_sign/hazard/curves.json
new file mode 100644
index 000000000..aff0baed5
--- /dev/null
+++ b/data/presets/traffic_sign/hazard/curves.json
@@ -0,0 +1,24 @@
+{
+    "fields": [
+        "{traffic_sign/hazard}",
+        "curves",
+        "maxspeed/advisory"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard",
+        "hazard": "curves"
+    },
+    "reference": {
+        "key": "hazard",
+        "value": "curves"
+    },
+    "terms": [
+        "reverse curve",
+        "winding road"
+    ],
+    "name": "Curves Warning Sign"
+}
diff --git a/data/presets/traffic_sign/hazard/cyclists.json b/data/presets/traffic_sign/hazard/cyclists.json
new file mode 100644
index 000000000..da5b9f83e
--- /dev/null
+++ b/data/presets/traffic_sign/hazard/cyclists.json
@@ -0,0 +1,22 @@
+{
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard",
+        "hazard": "cyclists"
+    },
+    "reference": {
+        "key": "hazard",
+        "value": "cyclists"
+    },
+    "aliases": [
+        "Bike Warning Sign",
+        "Cyclist Warning Sign"
+    ],
+    "terms": [
+        "share the road"
+    ],
+    "name": "Bicycle Warning Sign"
+}
diff --git a/data/presets/traffic_sign/hazard/dangerous_junction.json b/data/presets/traffic_sign/hazard/dangerous_junction.json
new file mode 100644
index 000000000..faca26aee
--- /dev/null
+++ b/data/presets/traffic_sign/hazard/dangerous_junction.json
@@ -0,0 +1,24 @@
+{
+    "fields": [
+        "{traffic_sign/hazard}",
+        "maxspeed/advisory"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard",
+        "hazard": "dangerous_junction"
+    },
+    "reference": {
+        "key": "hazard",
+        "value": "dangerous_junction"
+    },
+    "aliases": [
+        "Dangerous Junction Sign",
+        "Intersection Sign",
+        "Junction Sign"
+    ],
+    "name": "Dangerous Intersection Warning Sign"
+}
diff --git a/data/presets/traffic_sign/hazard/dip.json b/data/presets/traffic_sign/hazard/dip.json
new file mode 100644
index 000000000..2940a1755
--- /dev/null
+++ b/data/presets/traffic_sign/hazard/dip.json
@@ -0,0 +1,20 @@
+{
+    "icon": "temaki-speed_dip",
+    "fields": [
+        "{traffic_sign/hazard}",
+        "maxspeed/advisory"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard",
+        "hazard": "dip"
+    },
+    "reference": {
+        "key": "hazard",
+        "value": "dip"
+    },
+    "name": "Dip Warning Sign"
+}
diff --git a/data/presets/traffic_sign/hazard/emergency_vehicles.json b/data/presets/traffic_sign/hazard/emergency_vehicles.json
new file mode 100644
index 000000000..5d75904cb
--- /dev/null
+++ b/data/presets/traffic_sign/hazard/emergency_vehicles.json
@@ -0,0 +1,20 @@
+{
+    "icon": "fas-truck-medical",
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard",
+        "hazard": "emergency_vehicles"
+    },
+    "reference": {
+        "key": "hazard",
+        "value": "emergency_vehicles"
+    },
+    "terms": [
+        "ambulance",
+        "fire truck"
+    ],
+    "name": "Emergency Vehicles Warning Sign"
+}
diff --git a/data/presets/traffic_sign/hazard/falling_rocks.json b/data/presets/traffic_sign/hazard/falling_rocks.json
new file mode 100644
index 000000000..ea90fdfe6
--- /dev/null
+++ b/data/presets/traffic_sign/hazard/falling_rocks.json
@@ -0,0 +1,16 @@
+{
+    "icon": "fas-hill-rockslide",
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard",
+        "hazard": "falling_rocks"
+    },
+    "reference": {
+        "key": "hazard",
+        "value": "falling_rocks"
+    },
+    "name": "Falling Rocks Warning Sign"
+}
diff --git a/data/presets/traffic_sign/hazard/flooding.json b/data/presets/traffic_sign/hazard/flooding.json
new file mode 100644
index 000000000..9fe5db29b
--- /dev/null
+++ b/data/presets/traffic_sign/hazard/flooding.json
@@ -0,0 +1,18 @@
+{
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard",
+        "hazard": "flooding"
+    },
+    "reference": {
+        "key": "hazard",
+        "value": "flooding"
+    },
+    "terms": [
+        "road may flood"
+    ],
+    "name": "Flood Warning Sign"
+}
diff --git a/data/presets/traffic_sign/hazard/fog.json b/data/presets/traffic_sign/hazard/fog.json
new file mode 100644
index 000000000..6b1a9ccde
--- /dev/null
+++ b/data/presets/traffic_sign/hazard/fog.json
@@ -0,0 +1,18 @@
+{
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard",
+        "hazard": "fog"
+    },
+    "reference": {
+        "key": "hazard",
+        "value": "fog"
+    },
+    "terms": [
+        "fog area"
+    ],
+    "name": "Fog Warning Sign"
+}
diff --git a/data/presets/traffic_sign/hazard/ground_clearance.json b/data/presets/traffic_sign/hazard/ground_clearance.json
new file mode 100644
index 000000000..c4737a9f3
--- /dev/null
+++ b/data/presets/traffic_sign/hazard/ground_clearance.json
@@ -0,0 +1,15 @@
+{
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard",
+        "hazard": "ground_clearance"
+    },
+    "reference": {
+        "key": "hazard",
+        "value": "ground_clearance"
+    },
+    "name": "Low Ground Clearance Warning Sign"
+}
diff --git a/data/presets/traffic_sign/hazard/horse_riders.json b/data/presets/traffic_sign/hazard/horse_riders.json
new file mode 100644
index 000000000..898e6126e
--- /dev/null
+++ b/data/presets/traffic_sign/hazard/horse_riders.json
@@ -0,0 +1,20 @@
+{
+    "icon": "maki-horse-riding",
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard",
+        "hazard": "horse_riders"
+    },
+    "reference": {
+        "key": "hazard",
+        "value": "horse_riders"
+    },
+    "aliases": [
+        "Equestrian Sign",
+        "Horse Rider Sign"
+    ],
+    "name": "Horseback Rider Warning Sign"
+}
diff --git a/data/presets/traffic_sign/hazard/ice.json b/data/presets/traffic_sign/hazard/ice.json
new file mode 100644
index 000000000..ede1f49ed
--- /dev/null
+++ b/data/presets/traffic_sign/hazard/ice.json
@@ -0,0 +1,18 @@
+{
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard",
+        "hazard": "ice"
+    },
+    "reference": {
+        "key": "hazard",
+        "value": "ice"
+    },
+    "terms": [
+        "bridge ices before road"
+    ],
+    "name": "Ice Warning Sign"
+}
diff --git a/data/presets/traffic_sign/hazard/landslide.json b/data/presets/traffic_sign/hazard/landslide.json
new file mode 100644
index 000000000..25887fbfd
--- /dev/null
+++ b/data/presets/traffic_sign/hazard/landslide.json
@@ -0,0 +1,18 @@
+{
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard",
+        "hazard": "landslide"
+    },
+    "reference": {
+        "key": "hazard",
+        "value": "landslide"
+    },
+    "terms": [
+        "rock slide area"
+    ],
+    "name": "Landslide Warning Sign"
+}
diff --git a/data/presets/traffic_sign/hazard/loose_gravel.json b/data/presets/traffic_sign/hazard/loose_gravel.json
new file mode 100644
index 000000000..1ef1480c4
--- /dev/null
+++ b/data/presets/traffic_sign/hazard/loose_gravel.json
@@ -0,0 +1,15 @@
+{
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard",
+        "hazard": "loose_gravel"
+    },
+    "reference": {
+        "key": "hazard",
+        "value": "loose_gravel"
+    },
+    "name": "Loose Gravel Warning Sign"
+}
diff --git a/data/presets/traffic_sign/hazard/pedestrians.json b/data/presets/traffic_sign/hazard/pedestrians.json
new file mode 100644
index 000000000..16f040cad
--- /dev/null
+++ b/data/presets/traffic_sign/hazard/pedestrians.json
@@ -0,0 +1,19 @@
+{
+    "icon": "temaki-pedestrian",
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard",
+        "hazard": "pedestrian"
+    },
+    "reference": {
+        "key": "hazard",
+        "value": "pedestrian"
+    },
+    "aliases": [
+        "Pedestrian Crossing Sign"
+    ],
+    "name": "Pedestrian Warning Sign"
+}
diff --git a/data/presets/traffic_sign/hazard/queues_likely.json b/data/presets/traffic_sign/hazard/queues_likely.json
new file mode 100644
index 000000000..dacb31b4f
--- /dev/null
+++ b/data/presets/traffic_sign/hazard/queues_likely.json
@@ -0,0 +1,18 @@
+{
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard",
+        "hazard": "queues_likely"
+    },
+    "reference": {
+        "key": "hazard",
+        "value": "queues_likely"
+    },
+    "terms": [
+        "watch for stopped traffic"
+    ],
+    "name": "Congestion Warning Sign"
+}
diff --git a/data/presets/traffic_sign/hazard/road_narrows.json b/data/presets/traffic_sign/hazard/road_narrows.json
new file mode 100644
index 000000000..ab443dd99
--- /dev/null
+++ b/data/presets/traffic_sign/hazard/road_narrows.json
@@ -0,0 +1,18 @@
+{
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard",
+        "hazard": "road_narrows"
+    },
+    "reference": {
+        "key": "hazard",
+        "value": "road_narrows"
+    },
+    "aliases": [
+        "Narrow Road Warning Sign"
+    ],
+    "name": "Road Narrows Warning Sign"
+}
diff --git a/data/presets/traffic_sign/hazard/roundabout.json b/data/presets/traffic_sign/hazard/roundabout.json
new file mode 100644
index 000000000..95789ce12
--- /dev/null
+++ b/data/presets/traffic_sign/hazard/roundabout.json
@@ -0,0 +1,22 @@
+{
+    "icon": "fas-rotate",
+    "fields": [
+        "maxspeed/advisory"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard",
+        "hazard": "roundabout"
+    },
+    "reference": {
+        "key": "hazard",
+        "value": "roundabout"
+    },
+    "aliases": [
+        "Traffic Circle Sign"
+    ],
+    "name": "Roundabout Warning Sign"
+}
diff --git a/data/presets/traffic_sign/hazard/school_zone.json b/data/presets/traffic_sign/hazard/school_zone.json
new file mode 100644
index 000000000..4ca2a48bc
--- /dev/null
+++ b/data/presets/traffic_sign/hazard/school_zone.json
@@ -0,0 +1,16 @@
+{
+    "icon": "fas-school-flag",
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard",
+        "hazard": "school_zone"
+    },
+    "reference": {
+        "key": "hazard",
+        "value": "school_zone"
+    },
+    "name": "School Zone Warning Sign"
+}
diff --git a/data/presets/traffic_sign/hazard/slippery.json b/data/presets/traffic_sign/hazard/slippery.json
new file mode 100644
index 000000000..9c08f7f14
--- /dev/null
+++ b/data/presets/traffic_sign/hazard/slippery.json
@@ -0,0 +1,18 @@
+{
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard",
+        "hazard": "slippery"
+    },
+    "reference": {
+        "key": "hazard",
+        "value": "slippery"
+    },
+    "terms": [
+        "slippery when wet"
+    ],
+    "name": "Slippery Road Warning Sign"
+}
diff --git a/data/presets/traffic_sign/hazard/traffic_signals.json b/data/presets/traffic_sign/hazard/traffic_signals.json
new file mode 100644
index 000000000..befef9e44
--- /dev/null
+++ b/data/presets/traffic_sign/hazard/traffic_signals.json
@@ -0,0 +1,21 @@
+{
+    "fields": [
+        "maxspeed/advisory"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard",
+        "hazard": "traffic_signals"
+    },
+    "reference": {
+        "key": "hazard",
+        "value": "traffic_signals"
+    },
+    "aliases": [
+        "Traffic Light Sign"
+    ],
+    "name": "Traffic Signals Warning Sign"
+}
diff --git a/data/presets/traffic_sign/hazard/turn.json b/data/presets/traffic_sign/hazard/turn.json
new file mode 100644
index 000000000..b98423562
--- /dev/null
+++ b/data/presets/traffic_sign/hazard/turn.json
@@ -0,0 +1,24 @@
+{
+    "icon": "fas-diamond-turn-right",
+    "fields": [
+        "{traffic_sign/hazard}",
+        "maxspeed/advisory"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard",
+        "hazard": "turn"
+    },
+    "reference": {
+        "key": "hazard",
+        "value": "turn"
+    },
+    "terms": [
+        "turn",
+        "sharp curve"
+    ],
+    "name": "Sharp Turn Warning Sign"
+}
diff --git a/data/presets/traffic_sign/hazard/turns.json b/data/presets/traffic_sign/hazard/turns.json
new file mode 100644
index 000000000..e2363df9d
--- /dev/null
+++ b/data/presets/traffic_sign/hazard/turns.json
@@ -0,0 +1,22 @@
+{
+    "fields": [
+        "{traffic_sign/hazard}",
+        "maxspeed/advisory"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "traffic_sign": "hazard",
+        "hazard": "turns"
+    },
+    "reference": {
+        "key": "hazard",
+        "value": "turns"
+    },
+    "terms": [
+        "reverse turn"
+    ],
+    "name": "Sharp Turns Warning Sign"
+}