diff --git a/data/fields/hazard.json b/data/fields/hazard.json
deleted file mode 100644
index 764a0b7b..00000000
--- a/data/fields/hazard.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "key": "hazard",
-    "type": "combo",
-    "label": "Hazard"
-}
diff --git a/data/fields/hazard_traffic.json b/data/fields/hazard_traffic.json
new file mode 100644
index 00000000..00121820
--- /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/presets/boundary/hazard.json b/data/presets/boundary/hazard.json
deleted file mode 100644
index ad43ac01..00000000
--- a/data/presets/boundary/hazard.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "icon": "fas-triangle-exclamation",
-    "fields": [
-        "name",
-        "hazard"
-    ],
-    "geometry": [
-        "area"
-    ],
-    "tags": {
-        "boundary": "hazard"
-    },
-    "name": "Hazardous Area"
-}
diff --git a/data/presets/landuse/military/danger_area.json b/data/presets/landuse/military/danger_area.json
index c175261d..e5a08072 100644
--- a/data/presets/landuse/military/danger_area.json
+++ b/data/presets/landuse/military/danger_area.json
@@ -29,5 +29,5 @@
         "troop",
         "war"
     ],
-    "name": "Military Danger Area"
+    "name": "Danger Zone, Access Prohibited"
 }
diff --git a/data/presets/traffic_sign/hazard.json b/data/presets/traffic_sign/hazard.json
index 14c22e5b..db11246e 100644
--- a/data/presets/traffic_sign/hazard.json
+++ b/data/presets/traffic_sign/hazard.json
@@ -2,7 +2,7 @@
     "icon": "fas-triangle-exclamation",
     "fields": [
         "{traffic_sign}",
-        "hazard"
+        "hazard_traffic"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/traffic_sign/hazard/cyclists.json b/data/presets/traffic_sign/hazard/cyclists.json
index cbc5a70b..da5b9f83 100644
--- a/data/presets/traffic_sign/hazard/cyclists.json
+++ b/data/presets/traffic_sign/hazard/cyclists.json
@@ -15,5 +15,8 @@
         "Bike Warning Sign",
         "Cyclist Warning Sign"
     ],
+    "terms": [
+        "share the road"
+    ],
     "name": "Bicycle Warning Sign"
 }