diff --git a/data/presets/presets.json b/data/presets/presets.json
index 2be1e96e4..57f4841af 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -5692,6 +5692,7 @@
         },
         "highway/bridleway": {
             "fields": [
+                "name",
                 "surface",
                 "width",
                 "structure",
@@ -5714,6 +5715,7 @@
         "highway/bus_stop": {
             "icon": "bus",
             "fields": [
+                "name",
                 "network",
                 "operator",
                 "bench",
@@ -5732,6 +5734,7 @@
         "highway/corridor": {
             "icon": "highway-footway",
             "fields": [
+                "name",
                 "width",
                 "level",
                 "access_simple"
@@ -5754,6 +5757,7 @@
         },
         "highway/crossing": {
             "fields": [
+                "name",
                 "crossing",
                 "kerb",
                 "tactile_paving"
@@ -5774,6 +5778,7 @@
         "highway/crosswalk": {
             "icon": "poi-foot",
             "fields": [
+                "name",
                 "crossing",
                 "kerb",
                 "tactile_paving"
@@ -5797,6 +5802,7 @@
         "highway/cycleway": {
             "icon": "highway-cycleway",
             "fields": [
+                "name",
                 "oneway",
                 "surface",
                 "lit",
@@ -5837,6 +5843,7 @@
         "highway/footway": {
             "icon": "highway-footway",
             "fields": [
+                "name",
                 "surface",
                 "lit",
                 "width",
@@ -5880,6 +5887,7 @@
         "highway/living_street": {
             "icon": "highway-living-street",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "lanes",
@@ -5926,6 +5934,7 @@
         "highway/motorway_link": {
             "icon": "highway-motorway-link",
             "fields": [
+                "name",
                 "ref_road_number",
                 "oneway_yes",
                 "maxspeed",
@@ -5959,6 +5968,7 @@
         "highway/motorway": {
             "icon": "highway-motorway",
             "fields": [
+                "name",
                 "ref_road_number",
                 "oneway_yes",
                 "maxspeed",
@@ -5990,6 +6000,7 @@
         "highway/path": {
             "icon": "highway-path",
             "fields": [
+                "name",
                 "surface",
                 "width",
                 "structure",
@@ -6020,6 +6031,7 @@
         "highway/pedestrian": {
             "icon": "highway-footway",
             "fields": [
+                "name",
                 "surface",
                 "lit",
                 "width",
@@ -6040,6 +6052,7 @@
         "highway/primary_link": {
             "icon": "highway-primary-link",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "lanes",
@@ -6066,6 +6079,7 @@
         "highway/primary": {
             "icon": "highway-primary",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "lanes",
@@ -6088,6 +6102,7 @@
         "highway/raceway": {
             "icon": "highway-unclassified",
             "fields": [
+                "name",
                 "oneway",
                 "surface",
                 "sport_racing_motor",
@@ -6122,6 +6137,7 @@
         "highway/residential": {
             "icon": "highway-residential",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "lanes",
@@ -6142,6 +6158,9 @@
         },
         "highway/rest_area": {
             "icon": "car",
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "point",
                 "vertex",
@@ -6158,6 +6177,7 @@
         "highway/road": {
             "icon": "highway-road",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "lanes",
@@ -6178,6 +6198,7 @@
         "highway/secondary_link": {
             "icon": "highway-secondary-link",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "lanes",
@@ -6204,6 +6225,7 @@
         "highway/secondary": {
             "icon": "highway-secondary",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "lanes",
@@ -6226,6 +6248,7 @@
         "highway/service": {
             "icon": "highway-service",
             "fields": [
+                "name",
                 "service",
                 "oneway",
                 "maxspeed",
@@ -6246,6 +6269,7 @@
         "highway/service/alley": {
             "icon": "highway-service",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "structure",
@@ -6269,6 +6293,7 @@
         "highway/service/drive-through": {
             "icon": "highway-service",
             "fields": [
+                "name",
                 "oneway",
                 "covered",
                 "maxheight",
@@ -6293,6 +6318,7 @@
         "highway/service/driveway": {
             "icon": "highway-service",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "structure",
@@ -6316,6 +6342,7 @@
         "highway/service/emergency_access": {
             "icon": "highway-service",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "structure",
@@ -6339,6 +6366,7 @@
         "highway/service/parking_aisle": {
             "icon": "highway-service",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "structure",
@@ -6361,6 +6389,9 @@
         },
         "highway/services": {
             "icon": "car",
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "point",
                 "vertex",
@@ -6456,6 +6487,7 @@
         "highway/tertiary_link": {
             "icon": "highway-tertiary-link",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "lanes",
@@ -6482,6 +6514,7 @@
         "highway/tertiary": {
             "icon": "highway-tertiary",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "lanes",
@@ -6504,6 +6537,7 @@
         "highway/track": {
             "icon": "highway-track",
             "fields": [
+                "name",
                 "tracktype",
                 "surface",
                 "width",
@@ -6586,6 +6620,7 @@
         "highway/trunk_link": {
             "icon": "highway-trunk-link",
             "fields": [
+                "name",
                 "ref_road_number",
                 "oneway",
                 "maxspeed",
@@ -6611,6 +6646,7 @@
         "highway/trunk": {
             "icon": "highway-trunk",
             "fields": [
+                "name",
                 "ref_road_number",
                 "oneway",
                 "maxspeed",
@@ -6659,6 +6695,7 @@
         "highway/unclassified": {
             "icon": "highway-unclassified",
             "fields": [
+                "name",
                 "oneway",
                 "maxspeed",
                 "lanes",
diff --git a/data/presets/presets/highway/bridleway.json b/data/presets/presets/highway/bridleway.json
index f37224c38..387221bcc 100644
--- a/data/presets/presets/highway/bridleway.json
+++ b/data/presets/presets/highway/bridleway.json
@@ -1,5 +1,6 @@
 {
     "fields": [
+	    "name",
         "surface",
         "width",
         "structure",
diff --git a/data/presets/presets/highway/bus_stop.json b/data/presets/presets/highway/bus_stop.json
index 19981f3e8..8f48e5841 100644
--- a/data/presets/presets/highway/bus_stop.json
+++ b/data/presets/presets/highway/bus_stop.json
@@ -1,6 +1,7 @@
 {
     "icon": "bus",
     "fields": [
+	    "name",
         "network",
         "operator",
         "bench",
diff --git a/data/presets/presets/highway/corridor.json b/data/presets/presets/highway/corridor.json
index 040d997b5..9c52912d6 100644
--- a/data/presets/presets/highway/corridor.json
+++ b/data/presets/presets/highway/corridor.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-footway",
     "fields": [
+	    "name",
         "width",
         "level",
         "access_simple"
diff --git a/data/presets/presets/highway/crossing.json b/data/presets/presets/highway/crossing.json
index 971062c98..f6e39f710 100644
--- a/data/presets/presets/highway/crossing.json
+++ b/data/presets/presets/highway/crossing.json
@@ -1,5 +1,6 @@
 {
     "fields": [
+	    "name",
         "crossing",
         "kerb",
         "tactile_paving"
diff --git a/data/presets/presets/highway/crosswalk.json b/data/presets/presets/highway/crosswalk.json
index 08dc6a3b1..9018507a9 100644
--- a/data/presets/presets/highway/crosswalk.json
+++ b/data/presets/presets/highway/crosswalk.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-foot",
     "fields": [
+	    "name",
         "crossing",
         "kerb",
         "tactile_paving"
diff --git a/data/presets/presets/highway/cycleway.json b/data/presets/presets/highway/cycleway.json
index 03ce0bc46..c942d0d0a 100644
--- a/data/presets/presets/highway/cycleway.json
+++ b/data/presets/presets/highway/cycleway.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-cycleway",
     "fields": [
+	    "name",
         "oneway",
         "surface",
         "lit",
diff --git a/data/presets/presets/highway/footway.json b/data/presets/presets/highway/footway.json
index 180f0fcc6..1a647e2b8 100644
--- a/data/presets/presets/highway/footway.json
+++ b/data/presets/presets/highway/footway.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-footway",
     "fields": [
+	    "name",
         "surface",
         "lit",
         "width",
diff --git a/data/presets/presets/highway/living_street.json b/data/presets/presets/highway/living_street.json
index 962446eaf..f9badea09 100644
--- a/data/presets/presets/highway/living_street.json
+++ b/data/presets/presets/highway/living_street.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-living-street",
     "fields": [
+	    "name",
         "oneway",
         "maxspeed",
         "lanes",
diff --git a/data/presets/presets/highway/motorway.json b/data/presets/presets/highway/motorway.json
index 683898eab..bc4d2fafd 100644
--- a/data/presets/presets/highway/motorway.json
+++ b/data/presets/presets/highway/motorway.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-motorway",
     "fields": [
+	    "name",
         "ref_road_number",
         "oneway_yes",
         "maxspeed",
diff --git a/data/presets/presets/highway/motorway_link.json b/data/presets/presets/highway/motorway_link.json
index c9570b114..2ea74e9f0 100644
--- a/data/presets/presets/highway/motorway_link.json
+++ b/data/presets/presets/highway/motorway_link.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-motorway-link",
     "fields": [
+	    "name",
         "ref_road_number",
         "oneway_yes",
         "maxspeed",
diff --git a/data/presets/presets/highway/path.json b/data/presets/presets/highway/path.json
index a38306333..f1e23739b 100644
--- a/data/presets/presets/highway/path.json
+++ b/data/presets/presets/highway/path.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-path",
     "fields": [
+	    "name",
         "surface",
         "width",
         "structure",
diff --git a/data/presets/presets/highway/pedestrian.json b/data/presets/presets/highway/pedestrian.json
index 3fd75fda8..7d9517fd9 100644
--- a/data/presets/presets/highway/pedestrian.json
+++ b/data/presets/presets/highway/pedestrian.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-footway",
     "fields": [
+	    "name",
         "surface",
         "lit",
         "width",
diff --git a/data/presets/presets/highway/primary.json b/data/presets/presets/highway/primary.json
index e8b4a0b01..6aeab79d1 100644
--- a/data/presets/presets/highway/primary.json
+++ b/data/presets/presets/highway/primary.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-primary",
     "fields": [
+	    "name",
         "oneway",
         "maxspeed",
         "lanes",
diff --git a/data/presets/presets/highway/primary_link.json b/data/presets/presets/highway/primary_link.json
index 72becc139..c9c9cd62f 100644
--- a/data/presets/presets/highway/primary_link.json
+++ b/data/presets/presets/highway/primary_link.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-primary-link",
     "fields": [
+	    "name",
         "oneway",
         "maxspeed",
         "lanes",
diff --git a/data/presets/presets/highway/raceway.json b/data/presets/presets/highway/raceway.json
index d259408b1..4bb108874 100644
--- a/data/presets/presets/highway/raceway.json
+++ b/data/presets/presets/highway/raceway.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-unclassified",
     "fields": [
+	    "name",
         "oneway",
         "surface",
         "sport_racing_motor",
diff --git a/data/presets/presets/highway/residential.json b/data/presets/presets/highway/residential.json
index d233a6ebc..f3d1d1600 100644
--- a/data/presets/presets/highway/residential.json
+++ b/data/presets/presets/highway/residential.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-residential",
     "fields": [
+	    "name",
         "oneway",
         "maxspeed",
         "lanes",
diff --git a/data/presets/presets/highway/rest_area.json b/data/presets/presets/highway/rest_area.json
index 69e808bc2..69f6d18c5 100644
--- a/data/presets/presets/highway/rest_area.json
+++ b/data/presets/presets/highway/rest_area.json
@@ -1,5 +1,8 @@
 {
     "icon": "car",
+	"fields": [
+	    "name"
+    ],
     "geometry": [
         "point",
         "vertex",
diff --git a/data/presets/presets/highway/road.json b/data/presets/presets/highway/road.json
index 1213b0629..1151735f8 100644
--- a/data/presets/presets/highway/road.json
+++ b/data/presets/presets/highway/road.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-road",
     "fields": [
+	    "name",
         "oneway",
         "maxspeed",
         "lanes",
diff --git a/data/presets/presets/highway/secondary.json b/data/presets/presets/highway/secondary.json
index 79fa82ada..614e0aaa8 100644
--- a/data/presets/presets/highway/secondary.json
+++ b/data/presets/presets/highway/secondary.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-secondary",
     "fields": [
+	    "name",
         "oneway",
         "maxspeed",
         "lanes",
diff --git a/data/presets/presets/highway/secondary_link.json b/data/presets/presets/highway/secondary_link.json
index 7cf46aba7..ae77f312f 100644
--- a/data/presets/presets/highway/secondary_link.json
+++ b/data/presets/presets/highway/secondary_link.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-secondary-link",
     "fields": [
+	    "name",
         "oneway",
         "maxspeed",
         "lanes",
diff --git a/data/presets/presets/highway/service.json b/data/presets/presets/highway/service.json
index 131cf13d1..3d5b2fe96 100644
--- a/data/presets/presets/highway/service.json
+++ b/data/presets/presets/highway/service.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-service",
     "fields": [
+	    "name",
         "service",
         "oneway",
         "maxspeed",
diff --git a/data/presets/presets/highway/service/alley.json b/data/presets/presets/highway/service/alley.json
index f822f46ce..9438c374a 100644
--- a/data/presets/presets/highway/service/alley.json
+++ b/data/presets/presets/highway/service/alley.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-service",
     "fields": [
+	    "name",
         "oneway",
         "maxspeed",
         "structure",
diff --git a/data/presets/presets/highway/service/drive-through.json b/data/presets/presets/highway/service/drive-through.json
index 192760261..e6c70313f 100644
--- a/data/presets/presets/highway/service/drive-through.json
+++ b/data/presets/presets/highway/service/drive-through.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-service",
     "fields": [
+	    "name",
         "oneway",
         "covered",
         "maxheight",
diff --git a/data/presets/presets/highway/service/driveway.json b/data/presets/presets/highway/service/driveway.json
index 7768f40ac..30c52c7f1 100644
--- a/data/presets/presets/highway/service/driveway.json
+++ b/data/presets/presets/highway/service/driveway.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-service",
     "fields": [
+	    "name",
         "oneway",
         "maxspeed",
         "structure",
diff --git a/data/presets/presets/highway/service/emergency_access.json b/data/presets/presets/highway/service/emergency_access.json
index 0f31ef0cf..94be55d7b 100644
--- a/data/presets/presets/highway/service/emergency_access.json
+++ b/data/presets/presets/highway/service/emergency_access.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-service",
     "fields": [
+	    "name",
         "oneway",
         "maxspeed",
         "structure",
diff --git a/data/presets/presets/highway/service/parking_aisle.json b/data/presets/presets/highway/service/parking_aisle.json
index d3bd27baf..c02b397bf 100644
--- a/data/presets/presets/highway/service/parking_aisle.json
+++ b/data/presets/presets/highway/service/parking_aisle.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-service",
     "fields": [
+	    "name",
         "oneway",
         "maxspeed",
         "structure",
diff --git a/data/presets/presets/highway/services.json b/data/presets/presets/highway/services.json
index f460df847..4eb355eba 100644
--- a/data/presets/presets/highway/services.json
+++ b/data/presets/presets/highway/services.json
@@ -1,5 +1,8 @@
 {
     "icon": "car",
+	"fields": [
+	    "name"
+    ],
     "geometry": [
         "point",
         "vertex",
diff --git a/data/presets/presets/highway/tertiary.json b/data/presets/presets/highway/tertiary.json
index 74f2fb31c..8082026f6 100644
--- a/data/presets/presets/highway/tertiary.json
+++ b/data/presets/presets/highway/tertiary.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-tertiary",
     "fields": [
+	    "name",
         "oneway",
         "maxspeed",
         "lanes",
diff --git a/data/presets/presets/highway/tertiary_link.json b/data/presets/presets/highway/tertiary_link.json
index 40de4c203..8bd9b101c 100644
--- a/data/presets/presets/highway/tertiary_link.json
+++ b/data/presets/presets/highway/tertiary_link.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-tertiary-link",
     "fields": [
+	    "name",
         "oneway",
         "maxspeed",
         "lanes",
diff --git a/data/presets/presets/highway/track.json b/data/presets/presets/highway/track.json
index 50a59cb18..e0ae5a599 100644
--- a/data/presets/presets/highway/track.json
+++ b/data/presets/presets/highway/track.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-track",
     "fields": [
+	    "name",
         "tracktype",
         "surface",
         "width",
diff --git a/data/presets/presets/highway/trunk.json b/data/presets/presets/highway/trunk.json
index d6d10f797..369f90ab5 100644
--- a/data/presets/presets/highway/trunk.json
+++ b/data/presets/presets/highway/trunk.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-trunk",
     "fields": [
+	    "name",
         "ref_road_number",
         "oneway",
         "maxspeed",
diff --git a/data/presets/presets/highway/trunk_link.json b/data/presets/presets/highway/trunk_link.json
index 64119da50..9fdf2a9a4 100644
--- a/data/presets/presets/highway/trunk_link.json
+++ b/data/presets/presets/highway/trunk_link.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-trunk-link",
     "fields": [
+	    "name",
         "ref_road_number",
         "oneway",
         "maxspeed",
diff --git a/data/presets/presets/highway/unclassified.json b/data/presets/presets/highway/unclassified.json
index b3f31dd1e..d49feb876 100644
--- a/data/presets/presets/highway/unclassified.json
+++ b/data/presets/presets/highway/unclassified.json
@@ -1,6 +1,7 @@
 {
     "icon": "highway-unclassified",
     "fields": [
+	    "name",
         "oneway",
         "maxspeed",
         "lanes",