diff --git a/data/fields/crossing/whistle.json b/data/fields/crossing/whistle_optional.json
similarity index 64%
rename from data/fields/crossing/whistle.json
rename to data/fields/crossing/whistle_optional.json
index 9bc1109a..a9a397e4 100644
--- a/data/fields/crossing/whistle.json
+++ b/data/fields/crossing/whistle_optional.json
@@ -2,13 +2,18 @@
     "key": "crossing:whistle",
     "type": "combo",
     "label": "Train Horn",
+    "placeholder": "Only as Needed",
     "strings": {
         "options": {
             "yes": "Mandatory",
-            "optional": "Only as Needed",
             "wayside": "Wayside/Stationary Horn"
         }
     },
     "autoSuggestions": false,
-    "customValues": false
+    "customValues": false,
+    "locationSet": {
+        "include": [
+            "150"
+        ]
+    }
 }
diff --git a/data/fields/crossing/whistle_yes.json b/data/fields/crossing/whistle_yes.json
new file mode 100644
index 00000000..614f6fab
--- /dev/null
+++ b/data/fields/crossing/whistle_yes.json
@@ -0,0 +1,20 @@
+{
+    "key": "crossing:whistle",
+    "type": "combo",
+    "label": "Train Horn",
+    "placeholder": "Mandatory",
+    "strings": {
+        "options": {
+            "optional": "Only as Needed",
+            "wayside": "Wayside/Stationary Horn"
+        }
+    },
+    "autoSuggestions": false,
+    "customValues": false,
+    "locationSet": {
+        "include": [
+            "ca",
+            "us"
+        ]
+    }
+}
diff --git a/data/presets/railway/crossing.json b/data/presets/railway/crossing.json
index d5035b88..2055cc50 100644
--- a/data/presets/railway/crossing.json
+++ b/data/presets/railway/crossing.json
@@ -8,7 +8,8 @@
     ],
     "moreFields": [
         "crossing/markings",
-        "crossing/whistle"
+        "crossing/whistle_optional",
+        "crossing/whistle_yes"
     ],
     "geometry": [
         "vertex"
diff --git a/data/presets/railway/level_crossing.json b/data/presets/railway/level_crossing.json
index 66152407..7cbf4476 100644
--- a/data/presets/railway/level_crossing.json
+++ b/data/presets/railway/level_crossing.json
@@ -6,7 +6,8 @@
         "crossing/light"
     ],
     "moreFields": [
-        "crossing/whistle"
+        "crossing/whistle_optional",
+        "crossing/whistle_yes"
     ],
     "geometry": [
         "vertex"