diff --git a/data/fields/maxaxleload_bridge.json b/data/fields/maxaxleload_bridge.json
new file mode 100644
index 000000000..ab13e4db9
--- /dev/null
+++ b/data/fields/maxaxleload_bridge.json
@@ -0,0 +1,10 @@
+{
+    "key": "maxaxleload",
+    "type": "combo",
+    "label": "Axle Weight Limit",
+    "snake_case": false,
+    "prerequisiteTag": {
+        "key": "bridge",
+        "valueNot": "no"
+    }
+}
diff --git a/data/fields/maxheight.json b/data/fields/maxheight.json
index 63a8e5209..1363aa2ed 100644
--- a/data/fields/maxheight.json
+++ b/data/fields/maxheight.json
@@ -1,6 +1,9 @@
 {
     "key": "maxheight",
     "type": "roadheight",
-    "label": "Max Height",
+    "label": "Height Limit",
+    "terms": [
+        "clearance"
+    ],
     "snake_case": false
 }
diff --git a/data/fields/maxlength.json b/data/fields/maxlength.json
new file mode 100644
index 000000000..0720da515
--- /dev/null
+++ b/data/fields/maxlength.json
@@ -0,0 +1,6 @@
+{
+    "key": "maxlength",
+    "type": "roadheight",
+    "label": "Length Limit",
+    "snake_case": false
+}
diff --git a/data/fields/maxstay.json b/data/fields/maxstay.json
index 54efad725..a55b333cc 100644
--- a/data/fields/maxstay.json
+++ b/data/fields/maxstay.json
@@ -1,7 +1,7 @@
 {
     "key": "maxstay",
     "type": "combo",
-    "label": "Max Stay",
+    "label": "Time Limit",
     "options": [
         "15 minutes",
         "30 minutes",
diff --git a/data/fields/maxweight.json b/data/fields/maxweight.json
index 973aa5bb4..a05b1df3e 100644
--- a/data/fields/maxweight.json
+++ b/data/fields/maxweight.json
@@ -1,6 +1,6 @@
 {
     "key": "maxweight",
     "type": "combo",
-    "label": "Max Weight",
+    "label": "Weight Limit",
     "snake_case": false
 }
diff --git a/data/fields/maxwidth.json b/data/fields/maxwidth.json
index 6c4ee83ce..f9263e3ac 100644
--- a/data/fields/maxwidth.json
+++ b/data/fields/maxwidth.json
@@ -1,6 +1,6 @@
 {
     "key": "maxwidth",
     "type": "roadheight",
-    "label": "Max Width",
+    "label": "Width Limit",
     "snake_case": false
 }
diff --git a/data/presets/highway/living_street.json b/data/presets/highway/living_street.json
index b14544cee..734b72fdf 100644
--- a/data/presets/highway/living_street.json
+++ b/data/presets/highway/living_street.json
@@ -17,7 +17,9 @@
         "flood_prone",
         "junction_line",
         "lit",
+        "maxaxleload_bridge",
         "maxheight",
+        "maxlength",
         "maxweight_bridge",
         "maxwidth",
         "oneway/bicycle",
diff --git a/data/presets/highway/motorway.json b/data/presets/highway/motorway.json
index 6887fd02f..d99392aba 100644
--- a/data/presets/highway/motorway.json
+++ b/data/presets/highway/motorway.json
@@ -16,7 +16,9 @@
         "incline",
         "junction_line",
         "lit",
+        "maxaxleload_bridge",
         "maxheight",
+        "maxlength",
         "maxspeed/advisory",
         "maxspeed/hgv",
         "maxweight_bridge",
diff --git a/data/presets/highway/motorway_link-US-CA.json b/data/presets/highway/motorway_link-US-CA.json
index a20fd1a44..154ebd27a 100644
--- a/data/presets/highway/motorway_link-US-CA.json
+++ b/data/presets/highway/motorway_link-US-CA.json
@@ -19,7 +19,9 @@
         "incline",
         "junction_line",
         "lit",
+        "maxaxleload_bridge",
         "maxheight",
+        "maxlength",
         "maxspeed",
         "maxweight_bridge",
         "maxwidth",
diff --git a/data/presets/highway/motorway_link.json b/data/presets/highway/motorway_link.json
index 1729226af..8ed37158a 100644
--- a/data/presets/highway/motorway_link.json
+++ b/data/presets/highway/motorway_link.json
@@ -19,7 +19,9 @@
         "incline",
         "junction_line",
         "lit",
+        "maxaxleload_bridge",
         "maxheight",
+        "maxlength",
         "maxspeed/advisory",
         "maxweight_bridge",
         "maxwidth",
diff --git a/data/presets/highway/primary.json b/data/presets/highway/primary.json
index fd8f01b27..bb092ac94 100644
--- a/data/presets/highway/primary.json
+++ b/data/presets/highway/primary.json
@@ -20,7 +20,9 @@
         "junction_line",
         "lane_markings",
         "lit",
+        "maxaxleload_bridge",
         "maxheight",
+        "maxlength",
         "maxspeed/advisory",
         "maxspeed/hgv",
         "maxweight_bridge",
diff --git a/data/presets/highway/primary_link-US-CA.json b/data/presets/highway/primary_link-US-CA.json
index 7d8b44a46..dfb14ea2b 100644
--- a/data/presets/highway/primary_link-US-CA.json
+++ b/data/presets/highway/primary_link-US-CA.json
@@ -21,7 +21,9 @@
         "junction_line",
         "junction/ref_oneway",
         "lit",
+        "maxaxleload_bridge",
         "maxheight",
+        "maxlength",
         "maxspeed",
         "maxweight_bridge",
         "maxwidth",
diff --git a/data/presets/highway/primary_link.json b/data/presets/highway/primary_link.json
index 086792cb4..572f5aa11 100644
--- a/data/presets/highway/primary_link.json
+++ b/data/presets/highway/primary_link.json
@@ -21,7 +21,9 @@
         "junction_line",
         "junction/ref_oneway",
         "lit",
+        "maxaxleload_bridge",
         "maxheight",
+        "maxlength",
         "maxspeed/advisory",
         "maxweight_bridge",
         "maxwidth",
diff --git a/data/presets/highway/residential.json b/data/presets/highway/residential.json
index 236483bef..1cd166801 100644
--- a/data/presets/highway/residential.json
+++ b/data/presets/highway/residential.json
@@ -19,9 +19,11 @@
         "junction_line",
         "lane_markings",
         "lit",
+        "maxaxleload_bridge",
         "maxheight",
+        "maxlength",
         "maxspeed/advisory",
-        "maxweight_bridge",
+        "maxweight",
         "maxwidth",
         "not/name",
         "oneway/bicycle",
diff --git a/data/presets/highway/service.json b/data/presets/highway/service.json
index 5cb463fdd..df0d27a84 100644
--- a/data/presets/highway/service.json
+++ b/data/presets/highway/service.json
@@ -15,7 +15,9 @@
         "incline",
         "lanes",
         "lit",
+        "maxaxleload_bridge",
         "maxheight",
+        "maxlength",
         "maxspeed/advisory",
         "maxweight_bridge",
         "maxwidth",
diff --git a/data/presets/highway/trunk.json b/data/presets/highway/trunk.json
index 724004136..07480e002 100644
--- a/data/presets/highway/trunk.json
+++ b/data/presets/highway/trunk.json
@@ -17,7 +17,9 @@
         "incline",
         "junction_line",
         "lit",
+        "maxaxleload_bridge",
         "maxheight",
+        "maxlength",
         "maxspeed/advisory",
         "maxspeed/hgv",
         "maxweight_bridge",