diff --git a/data/presets.yaml b/data/presets.yaml
index 9410e4628..325ee4116 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -469,9 +469,15 @@ en:
       design:
         # design=*
         label: Design
-      destination:
+      destination/ref_oneway:
+        # 'destination:ref=*'
+        label: Destination Road Numbers
+      destination/symbol_oneway:
+        # 'destination:symbol=*'
+        label: Destination Symbols
+      destination_oneway:
         # destination=*
-        label: Destination
+        label: Destinations
       devices:
         # devices=*
         label: Devices
@@ -852,6 +858,9 @@ en:
       internet_access/ssid:
         # 'internet_access:ssid=*'
         label: SSID (Network Name)
+      junction/ref_oneway:
+        # 'junction:ref=*'
+        label: Junction Number
       kerb:
         # kerb=*
         label: Curb
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 2282a3cbe..106bcf550 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -83,7 +83,9 @@
     "denotation": {"key": "denotation", "type": "combo", "label": "Denotation"},
     "description": {"key": "description", "type": "textarea", "label": "Description", "universal": true},
     "design": {"key": "design", "type": "combo", "label": "Design"},
-    "destination": {"key": "destination", "type": "text", "label": "Destination"},
+    "destination_oneway": {"key": "destination", "type": "semiCombo", "label": "Destinations", "prerequisiteTag": {"key": "oneway", "value": "yes"}},
+    "destination/ref_oneway": {"key": "destination:ref", "type": "semiCombo", "label": "Destination Road Numbers", "prerequisiteTag": {"key": "oneway", "value": "yes"}},
+    "destination/symbol_oneway": {"key": "destination:symbol", "type": "semiCombo", "label": "Destination Symbols", "prerequisiteTag": {"key": "oneway", "value": "yes"}},
     "devices": {"key": "devices", "type": "number", "minValue": 0, "label": "Devices", "placeholder": "1, 2, 3..."},
     "diaper": {"key": "diaper", "type": "combo", "label": "Diaper Changing Available", "options": ["yes", "no", "room", "1", "2", "3", "4", "5"]},
     "diet_multi": {"key": "diet:", "type": "multiCombo", "label": "Diet Types"},
@@ -161,6 +163,7 @@
     "internet_access": {"key": "internet_access", "type": "combo", "label": "Internet Access", "strings": {"options": {"yes": "Yes", "no": "No", "wlan": "Wifi", "wired": "Wired", "terminal": "Terminal"}}},
     "internet_access/fee": {"key": "internet_access:fee", "type": "check", "label": "Internet Access Fee", "prerequisiteTag": {"key": "internet_access", "valueNot": "no"}},
     "internet_access/ssid": {"key": "internet_access:ssid", "type": "text", "label": "SSID (Network Name)", "prerequisiteTag": {"key": "internet_access", "valueNot": "no"}},
+    "junction/ref_oneway": {"key": "junction:ref", "type": "text", "label": "Junction Number", "prerequisiteTag": {"key": "oneway", "value": "yes"}},
     "kerb": {"key": "kerb", "type": "combo", "label": "Curb"},
     "label": {"key": "label", "type": "textarea", "label": "Label"},
     "lamp_type": {"key": "lamp_type", "type": "combo", "label": "Type"},
diff --git a/data/presets/fields/destination.json b/data/presets/fields/destination.json
deleted file mode 100644
index a4e1f8946..000000000
--- a/data/presets/fields/destination.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "key": "destination",
-    "type": "text",
-    "label": "Destination"
-}
diff --git a/data/presets/fields/destination/ref_oneway.json b/data/presets/fields/destination/ref_oneway.json
new file mode 100644
index 000000000..fc360f211
--- /dev/null
+++ b/data/presets/fields/destination/ref_oneway.json
@@ -0,0 +1,9 @@
+{
+    "key": "destination:ref",
+    "type": "semiCombo",
+    "label": "Destination Road Numbers",
+    "prerequisiteTag": {
+        "key": "oneway",
+        "value": "yes"
+    }
+}
diff --git a/data/presets/fields/destination/symbol_oneway.json b/data/presets/fields/destination/symbol_oneway.json
new file mode 100644
index 000000000..a8ab38e37
--- /dev/null
+++ b/data/presets/fields/destination/symbol_oneway.json
@@ -0,0 +1,9 @@
+{
+    "key": "destination:symbol",
+    "type": "semiCombo",
+    "label": "Destination Symbols",
+    "prerequisiteTag": {
+        "key": "oneway",
+        "value": "yes"
+    }
+}
diff --git a/data/presets/fields/destination_oneway.json b/data/presets/fields/destination_oneway.json
new file mode 100644
index 000000000..2f71c079b
--- /dev/null
+++ b/data/presets/fields/destination_oneway.json
@@ -0,0 +1,9 @@
+{
+    "key": "destination",
+    "type": "semiCombo",
+    "label": "Destinations",
+    "prerequisiteTag": {
+        "key": "oneway",
+        "value": "yes"
+    }
+}
diff --git a/data/presets/fields/junction/ref_oneway.json b/data/presets/fields/junction/ref_oneway.json
new file mode 100644
index 000000000..d929f3372
--- /dev/null
+++ b/data/presets/fields/junction/ref_oneway.json
@@ -0,0 +1,9 @@
+{
+    "key": "junction:ref",
+    "type": "text",
+    "label": "Junction Number",
+    "prerequisiteTag": {
+        "key": "oneway",
+        "value": "yes"
+    }
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 5ab0c0d8e..65d74290e 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -425,14 +425,14 @@
     "highway/milestone": {"icon": "temaki-milestone", "geometry": ["point", "vertex"], "fields": ["distance", "direction_vertex"], "tags": {"highway": "milestone"}, "terms": ["milestone", "marker"], "name": "Highway Milestone"},
     "highway/mini_roundabout": {"icon": "maki-circle-stroked", "geometry": ["vertex"], "tags": {"highway": "mini_roundabout"}, "fields": ["direction_clock"], "name": "Mini-Roundabout"},
     "highway/motorway_junction": {"icon": "temaki-junction", "fields": ["ref_highway_junction", "name"], "geometry": ["vertex"], "tags": {"highway": "motorway_junction"}, "terms": ["exit"], "name": "Motorway Junction / Exit"},
-    "highway/motorway_link": {"icon": "iD-highway-motorway-link", "fields": ["name", "ref_road_number", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["destination", "maxspeed/advisory", "toll", "maxheight", "covered", "lit", "smoothness"], "geometry": ["line"], "tags": {"highway": "motorway_link"}, "addTags": {"highway": "motorway_link", "oneway": "yes"}, "removeTags": {"highway": "motorway_link", "oneway": "yes"}, "terms": ["exit", "ramp", "road", "street", "on ramp", "off ramp"], "name": "Motorway Link"},
+    "highway/motorway_link": {"icon": "iD-highway-motorway-link", "fields": ["destination_oneway", "destination/ref_oneway", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["covered", "destination/symbol_oneway", "junction/ref_oneway", "lit", "maxheight", "maxspeed/advisory", "name", "ref_road_number", "smoothness", "toll"], "geometry": ["line"], "tags": {"highway": "motorway_link"}, "addTags": {"highway": "motorway_link", "oneway": "yes"}, "removeTags": {"highway": "motorway_link", "oneway": "yes"}, "terms": ["exit", "ramp", "road", "street", "on ramp", "off ramp"], "name": "Motorway Link"},
     "highway/motorway": {"icon": "iD-highway-motorway", "fields": ["name", "ref_road_number", "oneway_yes", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["toll", "maxheight", "covered", "lit", "smoothness", "minspeed"], "geometry": ["line"], "tags": {"highway": "motorway"}, "terms": ["autobahn", "expressway", "freeway", "highway", "interstate", "parkway", "road", "street", "thruway", "turnpike"], "name": "Motorway"},
     "highway/passing_place": {"icon": "maki-circle-stroked", "geometry": ["vertex"], "tags": {"highway": "passing_place"}, "terms": ["turnout, pullout"], "name": "Passing Place"},
     "highway/path": {"icon": "iD-highway-path", "fields": ["name", "surface", "width", "structure", "access", "incline"], "moreFields": ["wheelchair", "lit", "smoothness", "trail_visibility", "sac_scale", "mtb/scale", "mtb/scale/uphill", "mtb/scale/imba", "horse_scale", "covered", "ref", "dog"], "geometry": ["line"], "terms": ["hike", "hiking", "trackway", "trail", "walk"], "tags": {"highway": "path"}, "name": "Path"},
     "highway/pedestrian_area": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "lit", "width", "structure", "access"], "geometry": ["area"], "tags": {"highway": "pedestrian", "area": "yes"}, "terms": ["center", "centre", "plaza", "quad", "square", "walkway"], "name": "Pedestrian Area"},
     "highway/pedestrian_line": {"icon": "iD-highway-footway", "fields": ["name", "surface", "lit", "width", "oneway", "structure", "access"], "moreFields": ["covered", "smoothness"], "geometry": ["line"], "tags": {"highway": "pedestrian"}, "terms": ["center", "centre", "plaza", "quad", "square", "walkway"], "name": "Pedestrian Street"},
-    "highway/primary_link": {"icon": "iD-highway-primary-link", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "ref_road_number", "access"], "moreFields": ["maxspeed/advisory", "cycleway", "maxheight", "covered", "lit", "smoothness", "oneway/bicycle"], "geometry": ["line"], "tags": {"highway": "primary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Primary Link"},
-    "highway/primary": {"icon": "iD-highway-primary", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "ref_road_number", "access"], "moreFields": ["covered", "cycleway", "lit", "oneway/bicycle", "maxheight", "maxspeed/advisory", "smoothness"], "geometry": ["line"], "tags": {"highway": "primary"}, "terms": ["road", "street"], "name": "Primary Road"},
+    "highway/primary_link": {"icon": "iD-highway-primary-link", "fields": ["destination_oneway", "destination/ref_oneway", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["covered", "cycleway", "destination/symbol_oneway", "junction/ref_oneway", "lit", "maxheight", "maxspeed/advisory", "name", "oneway/bicycle", "ref_road_number", "smoothness", "toll"], "geometry": ["line"], "tags": {"highway": "primary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Primary Link"},
+    "highway/primary": {"icon": "iD-highway-primary", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "ref_road_number", "access"], "moreFields": ["covered", "cycleway", "lit", "maxheight", "maxspeed/advisory", "oneway/bicycle", "smoothness", "toll"], "geometry": ["line"], "tags": {"highway": "primary"}, "terms": ["road", "street"], "name": "Primary Road"},
     "highway/raceway": {"icon": "iD-highway-unclassified", "fields": ["name", "oneway", "surface", "sport_racing_motor", "lit", "width", "lanes", "structure"], "geometry": ["point", "line", "area"], "tags": {"highway": "raceway"}, "addTags": {"highway": "raceway", "sport": "motor"}, "terms": ["auto*", "formula one", "kart", "motocross", "nascar", "race*", "track"], "name": "Racetrack (Motorsport)"},
     "highway/residential": {"icon": "iD-highway-residential", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["covered", "cycleway", "lit", "oneway/bicycle", "maxheight", "maxspeed/advisory", "smoothness"], "geometry": ["line"], "tags": {"highway": "residential"}, "terms": ["road", "street"], "name": "Residential Road"},
     "highway/rest_area": {"icon": "maki-car", "fields": ["name", "operator", "opening_hours"], "moreFields": ["address", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"highway": "rest_area"}, "terms": ["rest stop"], "name": "Rest Area"},
@@ -456,7 +456,7 @@
     "highway/track": {"icon": "iD-highway-track", "fields": ["name", "tracktype", "surface", "width", "structure", "access", "incline", "smoothness"], "moreFields": ["mtb/scale", "mtb/scale/uphill", "mtb/scale/imba", "horse_scale", "covered"], "geometry": ["line"], "tags": {"highway": "track"}, "terms": ["woods road", "forest road", "logging road", "fire road", "farm road", "agricultural road", "ranch road", "carriage road", "primitive", "unmaintained", "rut", "offroad", "4wd", "4x4", "four wheel drive", "atv", "quad", "jeep", "double track", "two track"], "name": "Unmaintained Track Road"},
     "highway/traffic_mirror": {"geometry": ["point", "vertex"], "fields": ["direction"], "tags": {"highway": "traffic_mirror"}, "terms": ["blind spot", "convex", "corner", "curved", "roadside", "round", "safety", "sphere", "visibility"], "name": "Traffic Mirror"},
     "highway/traffic_signals": {"icon": "temaki-traffic_signals", "geometry": ["vertex"], "tags": {"highway": "traffic_signals"}, "fields": ["traffic_signals", "traffic_signals/direction"], "terms": ["light", "stoplight", "traffic light"], "name": "Traffic Signals"},
-    "highway/trunk_link": {"icon": "iD-highway-trunk-link", "fields": ["name", "ref_road_number", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["destination", "maxspeed/advisory", "toll", "maxheight", "covered", "lit", "smoothness"], "geometry": ["line"], "tags": {"highway": "trunk_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Trunk Link"},
+    "highway/trunk_link": {"icon": "iD-highway-trunk-link", "fields": ["{highway/motorway_link}"], "moreFields": ["{highway/motorway_link}"], "geometry": ["line"], "tags": {"highway": "trunk_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Trunk Link"},
     "highway/trunk": {"icon": "iD-highway-trunk", "fields": ["name", "ref_road_number", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["toll", "maxheight", "covered", "lit", "smoothness", "minspeed"], "geometry": ["line"], "tags": {"highway": "trunk"}, "terms": ["road", "street"], "name": "Trunk Road"},
     "highway/turning_circle": {"icon": "maki-circle-stroked", "geometry": ["vertex"], "tags": {"highway": "turning_circle"}, "terms": ["cul-de-sac"], "name": "Turning Circle"},
     "highway/turning_loop": {"icon": "maki-circle", "geometry": ["vertex"], "tags": {"highway": "turning_loop"}, "terms": ["cul-de-sac"], "name": "Turning Loop (Island)"},
diff --git a/data/presets/presets/highway/motorway_link.json b/data/presets/presets/highway/motorway_link.json
index eaf5ab626..92155320c 100644
--- a/data/presets/presets/highway/motorway_link.json
+++ b/data/presets/presets/highway/motorway_link.json
@@ -1,8 +1,8 @@
 {
     "icon": "iD-highway-motorway-link",
     "fields": [
-        "name",
-        "ref_road_number",
+        "destination_oneway",
+        "destination/ref_oneway",
         "oneway",
         "maxspeed",
         "lanes",
@@ -11,13 +11,16 @@
         "access"
     ],
     "moreFields": [
-        "destination",
-        "maxspeed/advisory",
-        "toll",
-        "maxheight",
         "covered",
+        "destination/symbol_oneway",
+        "junction/ref_oneway",
         "lit",
-        "smoothness"
+        "maxheight",
+        "maxspeed/advisory",
+        "name",
+        "ref_road_number",
+        "smoothness",
+        "toll"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/highway/primary.json b/data/presets/presets/highway/primary.json
index a67d6487b..b5f7b4240 100644
--- a/data/presets/presets/highway/primary.json
+++ b/data/presets/presets/highway/primary.json
@@ -14,10 +14,11 @@
         "covered",
         "cycleway",
         "lit",
-        "oneway/bicycle",
         "maxheight",
         "maxspeed/advisory",
-        "smoothness"
+        "oneway/bicycle",
+        "smoothness",
+        "toll"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/highway/primary_link.json b/data/presets/presets/highway/primary_link.json
index e04187389..e49378f45 100644
--- a/data/presets/presets/highway/primary_link.json
+++ b/data/presets/presets/highway/primary_link.json
@@ -1,23 +1,28 @@
 {
     "icon": "iD-highway-primary-link",
     "fields": [
-        "name",
+        "destination_oneway",
+        "destination/ref_oneway",
         "oneway",
         "maxspeed",
         "lanes",
         "surface",
         "structure",
-        "ref_road_number",
         "access"
     ],
     "moreFields": [
-        "maxspeed/advisory",
-        "cycleway",
-        "maxheight",
         "covered",
+        "cycleway",
+        "destination/symbol_oneway",
+        "junction/ref_oneway",
         "lit",
+        "maxheight",
+        "maxspeed/advisory",
+        "name",
+        "oneway/bicycle",
+        "ref_road_number",
         "smoothness",
-        "oneway/bicycle"
+        "toll"
     ],
     "geometry": [
         "line"
diff --git a/data/presets/presets/highway/trunk_link.json b/data/presets/presets/highway/trunk_link.json
index e4344ca4d..2d92817e3 100644
--- a/data/presets/presets/highway/trunk_link.json
+++ b/data/presets/presets/highway/trunk_link.json
@@ -1,23 +1,10 @@
 {
     "icon": "iD-highway-trunk-link",
     "fields": [
-        "name",
-        "ref_road_number",
-        "oneway",
-        "maxspeed",
-        "lanes",
-        "surface",
-        "structure",
-        "access"
+        "{highway/motorway_link}"
     ],
     "moreFields": [
-        "destination",
-        "maxspeed/advisory",
-        "toll",
-        "maxheight",
-        "covered",
-        "lit",
-        "smoothness"
+        "{highway/motorway_link}"
     ],
     "geometry": [
         "line"
diff --git a/data/taginfo.json b/data/taginfo.json
index 9fad82fef..33399e652 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1173,7 +1173,9 @@
     {"key": "denotation", "description": "🄵 Denotation"},
     {"key": "description", "description": "🄵 Description"},
     {"key": "design", "description": "🄵 Design"},
-    {"key": "destination", "description": "🄵 Destination"},
+    {"key": "destination", "description": "🄵 Destinations"},
+    {"key": "destination:ref", "description": "🄵 Destination Road Numbers"},
+    {"key": "destination:symbol", "description": "🄵 Destination Symbols"},
     {"key": "devices", "description": "🄵 Devices"},
     {"key": "diaper", "description": "🄵 Diaper Changing Available"},
     {"key": "diet:", "description": "🄵 Diet Types"},
@@ -1280,6 +1282,7 @@
     {"key": "internet_access", "value": "terminal", "description": "🄵 Internet Access"},
     {"key": "internet_access:fee", "description": "🄵 Internet Access Fee"},
     {"key": "internet_access:ssid", "description": "🄵 SSID (Network Name)"},
+    {"key": "junction:ref", "description": "🄵 Junction Number"},
     {"key": "kerb", "description": "🄵 Curb"},
     {"key": "label", "description": "🄵 Label"},
     {"key": "lamp_type", "description": "🄵 Type"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 57e452954..9fdd5d9f4 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2244,8 +2244,14 @@
                 "design": {
                     "label": "Design"
                 },
-                "destination": {
-                    "label": "Destination"
+                "destination_oneway": {
+                    "label": "Destinations"
+                },
+                "destination/ref_oneway": {
+                    "label": "Destination Road Numbers"
+                },
+                "destination/symbol_oneway": {
+                    "label": "Destination Symbols"
                 },
                 "devices": {
                     "label": "Devices",
@@ -2572,6 +2578,9 @@
                 "internet_access/ssid": {
                     "label": "SSID (Network Name)"
                 },
+                "junction/ref_oneway": {
+                    "label": "Junction Number"
+                },
                 "kerb": {
                     "label": "Curb"
                 },