diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index c71c03a4b7..4c3228a36e 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -330,7 +330,6 @@ area[sponsored=partner20]
 node[railway=halt],
 node[railway=station],
 area[building=train_station],
-node[railway=subway_entrance],
 node[railway=tram_stop],
 area[railway=tram_stop],
 node[historic=monument],
@@ -594,7 +593,6 @@ node[historic=castle],
 area[historic=castle]
 {z-index: 2890;}
 
-node[railway=station][transport=subway],
 node[amenity=hospital],
 node[building=hospital],
 area[building=hospital],
@@ -616,7 +614,9 @@ area[shop=mall]
 node[highway=bus_stop],
 area[highway=bus_stop],
 node[public_transport=station],
-area[public_transport=station]
+area[public_transport=station],
+node[railway=subway_entrance],
+node[railway=station][transport=subway]
 {z-index: 3000;}
 
 area[aeroway=airport],
@@ -643,7 +643,7 @@ node|z14-[natural=spring],
 area|z14-[natural=spring],
 node|z16-[natural=beach],
 area|z16-[natural=beach]
-{text: name;text-color: @poi_label;text-position: center;text-offset: 1;}
+{text: name;text-color: @poi_label;text-position: center;text-offset: 1;text-optional: true;}
 
 node|z12-[boundary=national_park],
 area|z12-[boundary=national_park],
@@ -653,41 +653,49 @@ node|z12-[leisure=nature_reserve],
 area|z12-[leisure=nature_reserve]
 {text: name;text-color: @park_label;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;text-halo-radius:0.5;}
 
+node|z18-[boundary=national_park],
+area|z18-[boundary=national_park],
+node|z18-[boundary=national_park],
+area|z18-[boundary=national_park],
+node|z18-[leisure=nature_reserve],
+area|z18-[leisure=nature_reserve]
+{text-optional: true;}
+
 node|z11[natural=cave_entrance],
 area|z11[natural=cave_entrance]
-{icon-image: cave-s.svg;icon-min-distance: 20;}
+{icon-image: cave-s.svg;icon-min-distance: 20;text-optional: true;}
 node|z12-[natural=cave_entrance],
 area|z12-[natural=cave_entrance]
-{icon-image: cave-s.svg;text-offset: 1;font-size: 10;}
+{icon-image: cave-s.svg;text-offset: 1;font-size: 10;text-optional: true;}
 node|z15-[natural=cave_entrance],
 area|z15-[natural=cave_entrance]
-{icon-image: cave-m.svg;text-offset: 1;font-size: 10;}
+{icon-image: cave-m.svg;text-offset: 1;font-size: 10;text-optional: true;}
 node|z17-[natural=cave_entrance],
 area|z17-[natural=cave_entrance]
-{icon-image: cave;text-offset: 1;font-size: 11;}
+{icon-image: cave;text-offset: 1;font-size: 11;text-optional: true;}
 
 node|z11[waterway=waterfall],
 area|z11[waterway=waterfall]
-{icon-image: waterfall-s.svg;icon-min-distance: 15;}
+{icon-image: waterfall-s.svg;icon-min-distance: 15;text-optional: true;}
 node|z12-[waterway=waterfall],
 area|z12-[waterway=waterfall]
-{icon-image: waterfall-s.svg;text-offset: 1;font-size: 10;}
+{icon-image: waterfall-s.svg;text-offset: 1;font-size: 10;text-optional: true;}
 node|z15-[waterway=waterfall],
 area|z15-[waterway=waterfall]
-{icon-image: waterfall-m.svg;text-offset: 1;font-size: 10;}
+{icon-image: waterfall-m.svg;text-offset: 1;font-size: 10;text-optional: true;}
 node|z17-[waterway=waterfall],
 area|z17-[waterway=waterfall]
-{icon-image: waterfall-m.svg;text-offset: 1;font-size: 10;}
+{icon-image: waterfall-m.svg;text-offset: 1;font-size: 10;text-optional: true;}
 node|z10-[natural=volcano],
 area|z10-[natural=volcano]
-{icon-image: volcano-s.svg;text-offset: 1;font-size: 10;}
+{icon-image: volcano-s.svg;text-offset: 1;font-size: 10;text-optional: true;}
 node|z15-[natural=volcano],
 area|z15-[natural=volcano]
-{icon-image: volcano-m.svg;text-offset: 1;font-size: 10;}
+{icon-image: volcano-m.svg;text-offset: 1;font-size: 10;text-optional: true;}
 
 node|z12[natural=peak][name],
 area|z12[natural=peak][name]
-{icon-image: peakt-s.svg;icon-min-distance: 10;text-offset: 1;text: name;text-color: @poi_label;text-position: center;}
+{icon-image: peakt-s.svg;icon-min-distance: 10;text-offset: 1;text: name;text-color: @poi_label;text-position: center;text-optional: true;}
 node|z12-14[natural=peak][!name],
 node|z12-14[natural=bare_rock][!name],
 node|z12-14[natural=rock][!name],
@@ -697,24 +705,24 @@ area|z12-14[natural=rock][!name]
 {font-size: 0;}
 node|z13[natural=peak][name],
 area|z13[natural=peak][name]
-{icon-image: peakt-s.svg;text-offset: 1;font-size: 9;}
+{icon-image: peakt-s.svg;text-offset: 1;font-size: 9;text-optional: true;}
 node|z14[natural=peak][name],
 area|z14[natural=peak][name]
-{icon-image: peakt-s.svg;text-offset: 1;font-size: 10;}
+{icon-image: peakt-s.svg;text-offset: 1;font-size: 10;text-optional: true;}
 node|z15-[natural=peak],
 node|z15-[natural=bare_rock],
 node|z15-[natural=rock],
 area|z15-[natural=peak],
 area|z15-[natural=bare_rock],
 area|z15-[natural=rock]
-{icon-image: peakt-m.svg;text-offset: 1;font-size: 10;}
+{icon-image: peakt-m.svg;text-offset: 1;font-size: 10;text-optional: true;}
 
 node|z16[natural=beach],
 area|z16[natural=beach]
 {icon-image: beach-m.svg;}
 node|z17-[natural=beach],
 area|z17-[natural=beach]
-{icon-image: beach-m.svg;font-size: 11;}
+{icon-image: beach-m.svg;font-size: 11;text-optional: true;}
 
 node|z11[boundary=national_park],
 area|z11[boundary=national_park],
@@ -763,10 +771,10 @@ area|z16-[landuse=forest]
 
 node|z14[natural=spring],
 area|z14[natural=spring]
-{icon-image: drinking-water-s.svg;text-offset:6;font-size: 10;icon-min-distance: 24;}
+{icon-image: drinking-water-s.svg;text-offset:6;font-size: 10;icon-min-distance: 24;text-optional: true;}
 node|z15-[natural=spring],
 area|z15-[natural=spring]
-{icon-image: drinking-water-m.svg;text-offset:8;font-size: 10;icon-min-distance: 24;}
+{icon-image: drinking-water-m.svg;text-offset:8;font-size: 10;icon-min-distance: 24;text-optional: true;}
 
 node|z15-[amenity=water_point],
 area|z15-[amenity=water_point],
@@ -776,45 +784,45 @@ node|z15-[man_made=water_tap],
 area|z15-[man_made=water_tap],
 node|z15-[amenity=water_point] ,
 area|z15-[amenity=water_point]
-{icon-image: drinking-water-m.svg;icon-min-distance: 36;}
+{icon-image: drinking-water-m.svg;icon-min-distance: 36;text-optional: true;}
 
 /* 3. TRANSPORT */
 
 node|z12-[railway=halt],
 node|z14-[railway=station][transport=subway],
 node|z16-[railway=subway_entrance]
-{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;}
+{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;text-optional: true;}
 node|z12-[railway=halt]::int_name,
 node|z14-[railway=station][transport=subway]::int_name,
 node|z16-[railway=subway_entrance]::int_name
-{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;}
+{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;text-optional: true;}
 
 node|z12-[railway=station][transport=subway][city=moscow],
 node|z12-[railway=station][transport=subway][city=spb],
 node|z16-[railway=subway_entrance][city=moscow],
 node|z17-[railway=tram_stop],
 area|z17-[railway=tram_stop]
-{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
+{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;text-optional: true;}
 node|z12-[railway=station][transport=subway][city=moscow]::int_name,
 node|z12-[railway=station][transport=subway][city=spb]::int_name,
 node|z16-[railway=subway_entrance][city=moscow]::int_name,
 node|z17-[railway=tram_stop]::int_name,
 area|z17-[railway=tram_stop]::int_name
-{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
+{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;text-optional: true;}
 node|z17-[highway=bus_stop],
 area|z17-[highway=bus_stop],
 node|z17-[public_transport=station],
 area|z17-[public_transport=station],
 node|z14-[amenity=bus_station],
 area|z14-[amenity=bus_station]
-{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;text-position: center;}
+{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;text-position: center;text-optional: true;}
 node|z17-[highway=bus_stop]::int_name,
 area|z17-[highway=bus_stop]::int_name,
 node|z17-[public_transport=station]::int_name,
 area|z17-[public_transport=station]::int_name,
 node|z14-[amenity=bus_station]::int_name,
 area|z14-[amenity=bus_station]::int_name
-{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;text-position: center;}
+{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;text-position: center;text-optional: true;}
 
 area|z10-[aeroway=airport],
 area|z10-[aeroway=aerodrome],
@@ -832,27 +840,27 @@ node|z15-[aerialway=magic_carpet],
 node|z15-[aerialway=platter],
 node|z15-[aerialway=rope_tow],
 node|z16-[amenity=ferry_terminal]
-{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;}
+{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;text-optional: true;}
 area|z12-[aeroway=airport]::int_name,
 area|z12-[aeroway=aerodrome]::int_name,
 node|z12-[aeroway=airport]::int_name,
 node|z12-[aeroway=aerodrome]::int_name,
-{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;}
+{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;text-optional: true;}
 
 /* 3.1 Train Station */
 
 /*check offset int_name*/
 
 node|z11[railway=halt]
-{icon-image: train-s.svg;icon-min-distance: 10;}
+{icon-image: train-s.svg;icon-min-distance: 10;text-optional: true;}
 node|z12[railway=halt]
-{icon-image: train-s.svg;text-offset: 1;font-size: 9;}
+{icon-image: train-s.svg;text-offset: 1;font-size: 9;text-optional: true;}
 node|z12[railway=halt]::int_name
-{text-offset: 1;font-size: 8;}
+{text-offset: 1;font-size: 8;text-optional: true;}
 node|z13[railway=station],
 node|z13[railway=halt],
 area|z13[building=train_station]
-{icon-image: train-s.svg;text-offset: 1;font-size: 10;}
+{icon-image: train-s.svg;text-offset: 1;font-size: 10;text-optional: true;}
 node|z13[railway=station]::int_name,
 node|z13[railway=halt]::int_name,
 area|z13[building=train_station]::int_name,
@@ -860,61 +868,61 @@ area|z13[building=train_station]::int_name,
 node|z14[railway=station],
 node|z14[railway=halt],
 area|z14[building=train_station]
-{icon-image: train-s.svg;text-offset: 1;font-size: 11;text-halo-opacity: 0.7;}
+{icon-image: train-s.svg;text-offset: 1;font-size: 11;text-halo-opacity: 0.7;text-optional: true;}
 node|z14[railway=station]::int_name,
 node|z14[railway=halt]::int_name,
 area|z14[building=train_station]::int_name,
-{text-offset: 1;font-size: 10;text-halo-opacity: 0.7;}
+{text-offset: 1;font-size: 10;text-halo-opacity: 0.7;text-optional: true;}
 node|z15[railway=station],
 node|z15[railway=halt],
 area|z15[building=train_station]
-{icon-image: train-m.svg;text-offset: 1;font-size: 12;text-halo-opacity: 0.8;}
+{icon-image: train-m.svg;text-offset: 1;font-size: 12;text-halo-opacity: 0.8;text-optional: true;}
 node|z15[railway=station]::int_name,
 node|z15[railway=halt]::int_name,
 area|z15[building=train_station]::int_name,
-{text-offset: 1;font-size: 10;text-halo-opacity: 0.8;}
+{text-offset: 1;font-size: 10;text-halo-opacity: 0.8;text-optional: true;}
 node|z16[railway=station],
 node|z16[railway=halt],
 area|z16[building=train_station]
-{icon-image: train-m.svg;text-offset: 1;font-size: 13;text-halo-opacity: 0.8;}
+{icon-image: train-m.svg;text-offset: 1;font-size: 13;text-halo-opacity: 0.8;text-optional: true;}
 node|z16[railway=station]::int_name,
 node|z16[railway=halt]::int_name,
 area|z16[building=train_station]::int_name,
-{text-offset: 1;font-size: 11;text-halo-opacity: 0.8;}
+{text-offset: 1;font-size: 11;text-halo-opacity: 0.8;text-optional: true;}
 node|z17-[railway=station],
 node|z17-[railway=halt],
 area|z17-[building=train_station]
-{icon-image: train-m.svg;text-offset: 1;font-size: 13;text-halo-opacity: 0.9;}
+{icon-image: train-m.svg;text-offset: 1;font-size: 13;text-halo-opacity: 0.9;text-optional: true;}
 node|z17-[railway=station]::int_name,
 node|z17-[railway=halt]::int_name,
 area|z17-[building=train_station]::int_name,
-{text-offset: 1;font-size: 12;text-halo-opacity: 0.9;}
+{text-offset: 1;font-size: 12;text-halo-opacity: 0.9;text-optional: true;}
 
 /* 3.2 Subway Station */
 
 node|z13[railway=station][transport=subway]
-{icon-image: subway-s.svg;icon-min-distance: 1;}
+{icon-image: subway-s.svg;icon-min-distance: 1;text-optional: true;}
 node|z14[railway=station][transport=subway]
-{icon-image: subway-s.svg;text-offset: 1;font-size: 11;text-halo-opacity: 0.7;icon-min-distance: 1;}
+{icon-image: subway-s.svg;text-offset: 1;font-size: 11;text-halo-opacity: 0.7;icon-min-distance: 1;text-optional: true;}
 node|z14[railway=station][transport=subway]::int_name
-{text-offset: 1;font-size: 9;text-halo-opacity: 0.7;icon-min-distance: 1;}
+{text-offset: 1;font-size: 9;text-halo-opacity: 0.7;icon-min-distance: 1;text-optional: true;}
 node|z15[railway=station][transport=subway]
-{icon-image: subway-m.svg;text-offset: 1;font-size: 12;text-halo-opacity: 0.8;}
+{icon-image: subway-m.svg;text-offset: 1;font-size: 12;text-halo-opacity: 0.8;text-optional: true;}
 node|z15[railway=station][transport=subway]::int_name
-{text-offset: 1;font-size: 10;text-halo-opacity: 0.8;} /*check*/
+{text-offset: 1;font-size: 10;text-halo-opacity: 0.8;text-optional: true;} /*check*/
 node|z16[railway=station][transport=subway]
-{icon-image: subway-m.svg;text-offset: 1;font-size: 13;text-halo-opacity: 0.8;}
+{icon-image: subway-m.svg;text-offset: 1;font-size: 13;text-halo-opacity: 0.8;text-optional: true;}
 node|z16[railway=station][transport=subway]::int_name
-{text-offset: 1;font-size: 11;text-halo-opacity: 0.8;} /*check*/
+{text-offset: 1;font-size: 11;text-halo-opacity: 0.8;text-optional: true;} /*check*/
 node|z17-[railway=station][transport=subway]
-{icon-image: subway-m.svg;text-offset: 1;font-size: 13;text-halo-opacity: 0.9;}
+{icon-image: subway-m.svg;text-offset: 1;font-size: 13;text-halo-opacity: 0.9;text-optional: true;}
 node|z17-[railway=station][transport=subway]::int_name
-{text-offset: 1;font-size: 11;text-halo-opacity: 0.9;} /*check*/
+{text-offset: 1;font-size: 11;text-halo-opacity: 0.9;text-optional: true;} /*check*/
 
 node|z17-[railway=subway_entrance]
-{icon-image: subway-entrance-m.svg;text-offset: 1;font-size: 13;text-halo-opacity: 0.9;}
+{icon-image: subway-entrance-m.svg;text-offset: 1;font-size: 13;text-halo-opacity: 0.9;text-optional: true;}
 node|z17-[railway=subway_entrance]::int_name
-{text-offset: 1;font-size: 11;text-halo-opacity: 0.9;} /*check*/
+{text-offset: 1;font-size: 11;text-halo-opacity: 0.9;text-optional: true;} /*check*/
 
 /* 3.3 Tram Station */
 
@@ -925,43 +933,43 @@ area|z15-16[railway=tram_stop]
 {icon-image: tram-m.svg;}
 node|z17[railway=tram_stop],
 area|z17[railway=tram_stop]
-{icon-image: tram-m.svg;text-offset: 1;font-size: 11;text-halo-opacity: 0.9;}
+{icon-image: tram-m.svg;text-offset: 1;font-size: 11;text-halo-opacity: 0.9;text-optional: true;}
 node|z17-[railway=tram_stop]::int_name,
 area|z17-[railway=tram_stop]::int_name
-{text-offset: 1;font-size: 10;text-halo-opacity: 0.9;} /*check*/
+{text-offset: 1;font-size: 10;text-halo-opacity: 0.9;text-optional: true;} /*check*/
 node|z18-[railway=tram_stop],
 area|z18-[railway=tram_stop]
-{icon-image: tram-m.svg;text-offset: 1;font-size: 12;text-halo-opacity: 0.9;}
+{icon-image: tram-m.svg;text-offset: 1;font-size: 12;text-halo-opacity: 0.9;text-optional: true;}
 
 /* 3.4 Bus Station */
 
 node|z12-13[amenity=bus_station],
 area|z12-13[amenity=bus_station]
-{icon-image: bus-s.svg;icon-min-distance: 1;}
+{icon-image: bus-s.svg;icon-min-distance: 1;text-optional: true;}
 node|z14[amenity=bus_station],
 area|z14[amenity=bus_station]
-{icon-image: bus-s.svg;text-offset: 1;font-size: 10;text-halo-opacity: 0.8;}
+{icon-image: bus-s.svg;text-offset: 1;font-size: 10;text-halo-opacity: 0.8;text-optional: true;}
 node|z15-16[amenity=bus_station],
 area|z15-16[amenity=bus_station]
-{icon-image: bus-m.svg;text-offset: 1;font-size: 11;text-halo-opacity: 0.8;}
+{icon-image: bus-m.svg;text-offset: 1;font-size: 11;text-halo-opacity: 0.8;text-optional: true;}
 node|z15-16[amenity=bus_station]::int_name,
 area|z15-16[amenity=bus_station]::int_name
-{text-offset: 1;font-size: 9;text-halo-opacity: 0.8;}
+{text-offset: 1;font-size: 9;text-halo-opacity: 0.8;text-optional: true;}
 node|z17[amenity=bus_station],
 area|z17[amenity=bus_station]
-{icon-image: bus-m.svg;text-offset: 1;font-size: 11;}
+{icon-image: bus-m.svg;text-offset: 1;font-size: 11;text-optional: true;}
 node|z17[amenity=bus_station]::int_name,
 area|z17[amenity=bus_station]::int_name
 {text-offset: 1;font-size: 9;}
 node|z18[amenity=bus_station],
 area|z18[amenity=bus_station]
-{icon-image: bus-m.svg;text-offset: 1;font-size: 12;}
+{icon-image: bus-m.svg;text-offset: 1;font-size: 12;text-optional: true;}
 node|z18[amenity=bus_station]::int_name,
 area|z18[amenity=bus_station]::int_name
 {text-offset: 1;font-size: 10;}
 node|z19-[amenity=bus_station],
 area|z19-[amenity=bus_station]
-{icon-image: bus-m.svg;text-offset: 1;font-size: 12;}
+{icon-image: bus-m.svg;text-offset: 1;font-size: 12;text-optional: true;}
 node|z19-[amenity=bus_station]::int_name,
 area|z19-[amenity=bus_station]::int_name
 {text-offset: 1;font-size: 10;}
@@ -973,25 +981,25 @@ node|z17-[highway=bus_stop],
 area|z17-[highway=bus_stop],
 node|z18-[public_transport=station],
 area|z18-[public_transport=station]
-{icon-image: bus-m.svg;text-offset: 1;font-size: 11;}
+{icon-image: bus-m.svg;text-offset: 1;font-size: 11;text-optional: true;}
 node|z18-19[highway=bus_stop]::int_name,
 area|z18-19[highway=bus_stop]::int_name,
 node|z18-19[public_transport=station]::int_name,
 area|z18-19[public_transport=station]::int_name
-{icon-image: bus-m.svg;text-offset: 1;font-size: 9;}
+{icon-image: bus-m.svg;text-offset: 1;font-size: 9;text-optional: true;}
 
 /* 3.5 Ferry terminal */
 
 node|z11-12[amenity=ferry_terminal]
-{icon-image: ship-s.svg;icon-min-distance: 12;}
+{icon-image: ship-s.svg;icon-min-distance: 12;text-optional: true;}
 node|z13-14[amenity=ferry_terminal]
-{icon-image: ship-s.svg;}
+{icon-image: ship-s.svg;text-optional: true;}
 node|z15[amenity=ferry_terminal]
-{icon-image: ship-m.svg;}
+{icon-image: ship-m.svg;text-optional: true;}
 node|z16[amenity=ferry_terminal]
-{icon-image: ship-m.svg;text-offset: 1;font-size: 11;text-halo-opacity: 0.8;}
+{icon-image: ship-m.svg;text-offset: 1;font-size: 11;text-halo-opacity: 0.8;text-optional: true;}
 node|z17-[amenity=ferry_terminal]
-{icon-image: ship-m.svg;text-offset: 1;font-size: 12;}
+{icon-image: ship-m.svg;text-offset: 1;font-size: 12;text-optional: true;}
 
 /* 3.6 Airport */
 
@@ -999,7 +1007,7 @@ area|z10[aeroway=airport][aerodrome=international],
 area|z10[aeroway=aerodrome][aerodrome=international],
 node|z10[aeroway=airport][aerodrome=international],
 node|z10[aeroway=aerodrome][aerodrome=international]
-{icon-image: airport-s.svg;text-offset: 1;font-size: 10;fill-opacity: 1;}
+{icon-image: airport-s.svg;text-offset: 1;font-size: 10;fill-opacity: 1;text-optional: true;}
 area|z11-14[aeroway=airport][aerodrome=international],
 area|z11-14[aeroway=aerodrome][aerodrome=international],
 node|z11-14[aeroway=airport][aerodrome=international],
@@ -1008,28 +1016,28 @@ area|z12-14[aeroway=airport],
 node|z12-14[aeroway=airport],
 area|z12-14[aeroway=aerodrome],
 node|z12-14[aeroway=aerodrome]
-{icon-image: airport-m.svg;text-offset: 1;font-size: 11;-x-me-icon-priority: 3100;}
+{icon-image: airport-m.svg;text-offset: 1;font-size: 11;-x-me-icon-priority: 3100;text-optional: true;}
 area|z12-14[aeroway=airport]::int_name,
 node|z12-14[aeroway=airport]::int_name,
 area|z12-14[aeroway=aerodrome]::int_name,
 node|z12-14[aeroway=aerodrome]::int_name,
-{font-size: 10;}
+{font-size: 10;text-optional: true;}
 area|z15-[aeroway=airport],
 node|z15-[aeroway=airport],
 area|z15-[aeroway=aerodrome],
 node|z15-[aeroway=aerodrome]
-{icon-image: airport-m.svg;text-offset: 1;font-size: 12;}
+{icon-image: airport-m.svg;text-offset: 1;font-size: 12;text-optional: true;}
 area|z15-[aeroway=airport]::int_name,
 node|z15-[aeroway=airport]::int_name,
 area|z15-[aeroway=aerodrome]::int_name,
 node|z15-[aeroway=aerodrome]::int_name,
-{font-size: 11;}
+{font-size: 11;text-optional: true;}
 
-area|z17-[aeroway=heliport],
-area|z17-[aeroway=helipad],
-node|z17-[aeroway=heliport],
-node|z17-[aeroway=helipad]
-{icon-image: helipad-m.svg;text-offset: 1;font-size: 10;text: name;text-color: @poi_label;}
+area|z16-[aeroway=heliport],
+area|z16-[aeroway=helipad],
+node|z16-[aeroway=heliport],
+node|z16-[aeroway=helipad]
+{icon-image: helipad-m.svg;text-offset: 1;font-size: 10;text: name;text-color: @poi_label;text-optional: true;}
 
 /* 3.7 Aerialway */
 
@@ -1038,13 +1046,13 @@ node|z12-13[aerialway=cable_car],
 node|z12-13[aerialway=chair_lift],
 node|z12-13[aerialway=gondola],
 node|z12-13[aerialway=mixed_lift]
-{icon-image: cable-car-s.svg;icon-min-distance: 10;}
+{icon-image: cable-car-s.svg;icon-min-distance: 10;text-optional: true;}
 node|z14[aerialway=station],
 node|z14[aerialway=cable_car],
 node|z14[aerialway=chair_lift],
 node|z14[aerialway=gondola],
 node|z14[aerialway=mixed_lift]
-{icon-image: cable-car-s.svg;}
+{icon-image: cable-car-s.svg;text-optional: true;}
 node|z15-16[aerialway=station],
 node|z15-16[aerialway=cable_car],
 node|z15-16[aerialway=chair_lift],
@@ -1056,7 +1064,7 @@ node|z15-16[aerialway=t-bar],
 node|z15-16[aerialway=magic_carpet],
 node|z15-16[aerialway=platter],
 node|z15-16[aerialway=rope_tow]
-{icon-image: cable-car-m.svg;text-offset: 1;font-size: 10;}
+{icon-image: cable-car-m.svg;text-offset: 1;font-size: 10;text-optional: true;}
 node|z17-[aerialway=station],
 node|z17-[aerialway=cable_car],
 node|z17-[aerialway=chair_lift],
@@ -1068,10 +1076,10 @@ node|z17-[aerialway=t-bar],
 node|z17-[aerialway=magic_carpet],
 node|z17-[aerialway=platter],
 node|z17-[aerialway=rope_tow]
-{icon-image: cable-car-m.svg;text-offset: 1;font-size: 12;}
+{icon-image: cable-car-m.svg;text-offset: 1;font-size: 12;text-optional: true;}
 
 node|z17-[railway=level_crossing]
-{icon-image: railway-crossing.svg;}
+{icon-image: railway-crossing.svg;text-optional: true;}
 
 /* 4.TOURISM */
 
@@ -1120,7 +1128,7 @@ node|z17-[historic=archaeological_site],
 area|z17-[historic=archaeological_site],
 node|z17-[amenity=arts_centre],
 area|z17-[amenity=arts_centre]
-{text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
+{text: name;text-offset: 1;font-size: 10;text-color: @poi_label;text-optional: true;}
 
 node|z12-14[historic=fort],
 area|z12-14[historic=fort],
@@ -1357,7 +1365,7 @@ node|z14[sponsored=booking][tourism=hotel][rating>=8],
 area|z14[sponsored=booking][tourism=hotel][rating>=8],
 node|z14[sponsored=booking][tourism=resort][rating>=8],
 area|z14[sponsored=booking][tourism=resort][rating>=8]
-{icon-image: hotel-s.svg;icon-min-distance: 24;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;}
+{icon-image: hotel-s.svg;icon-min-distance: 24;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;text-optional: true;}
 node|z14[sponsored=booking][rating<8],
 area|z14[sponsored=booking][rating<8]
 {icon-image: zero-icon.svg;text: none;}
@@ -1497,6 +1505,22 @@ node|z16-[amenity=biergarten],
 area|z16-[amenity=biergarten]
 {icon-image: beer-m.svg;icon-min-distance: 12;}
 
+node|z18-[amenity=cafe],
+area|z18-[amenity=cafe],
+node|z18-[amenity=restaurant],
+area|z18-[amenity=restaurant],
+node|z18-[amenity=fast_food],
+area|z18-[amenity=fast_food],
+node|z18-[amenity=food_court],
+area|z18-[amenity=food_court],
+node|z18-[amenity=bar],
+area|z18-[amenity=bar],
+node|z18-[amenity=pub],
+area|z18-[amenity=pub],
+node|z18-[amenity=biergarten],
+area|z18-[amenity=biergarten]
+{ text-optional: true;}
+
 
 /* 5.AMENITY (infrastructure) */
 
@@ -1635,18 +1659,18 @@ area|z19-[amenity]
 
 node|z18-[tourism],
 area|z18-[tourism]
-{font-size: 11;text-offset: 1;}
+{font-size: 11;text-offset: 1;text-optional: true;}
 node|z18-[office],
 area|z18-[office]
-{icon-image: office-m.svg;font-size: 11;}
+{icon-image: office-m.svg;font-size: 11;text-optional: true;}
 
 node|z18-[craft],
 area|z18-[craft]
-{icon-image: hand-m.svg;font-size: 11;}
+{icon-image: hand-m.svg;font-size: 11;text-optional: true;}
 
 node|z18-[shop=massage],
 area|z18-[shop=massage]
-{icon-image: sauna-m.svg;font-size: 11;}
+{icon-image: sauna-m.svg;font-size: 11;text-optional: true;}
 
 /* 5.1 Hospital */
 
@@ -1657,12 +1681,12 @@ node|z15[amenity=hospital]
 node|z16-[amenity=hospital],
 node|z16-[building=hospital],
 area|z16-[building=hospital]
-{icon-image: hospital-m.svg;icon-min-distance: 4;}
+{icon-image: hospital-m.svg;icon-min-distance: 4;text-optional: true;}
 node|z17[amenity=clinic],
 area|z17[amenity=clinic],
 node|z17[amenity=doctors],
 area|z17[amenity=doctors]
-{icon-image: hospital-m.svg;icon-min-distance: 4;}
+{icon-image: hospital-m.svg;icon-min-distance: 4;text-optional: true;}
 node|z18-[amenity=hospital],
 node|z18-[building=hospital],
 area|z18-[building=hospital],
@@ -1670,27 +1694,27 @@ node|z18-[amenity=clinic],
 area|z18-[amenity=clinic],
 node|z18-[amenity=doctors],
 area|z18-[amenity=doctors]
-{icon-image: hospital-m.svg;font-size: 11;}
+{icon-image: hospital-m.svg;font-size: 11;text-optional: true;}
 node|z17[amenity=dentist],
 area|z17[amenity=dentist]
 {icon-image: dentist-m.svg;}
 node|z18-[amenity=dentist],
 area|z18-[amenity=dentist]
-{icon-image: dentist-m.svg;font-size: 11;}
+{icon-image: dentist-m.svg;font-size: 11;text-optional: true;}
 
 node|z16-[amenity=veterinary],
 area|z16-[amenity=veterinary]
 {icon-image: veterinary-m.svg;}
 node|z18-[amenity=veterinary],
 area|z18-[amenity=veterinary]
-{font-size: 11;}
+{font-size: 11;text-optional: true;}
 
 node|z16-[amenity=pharmacy],
 area|z16-[amenity=pharmacy]
 {icon-image: pharmacy-m.svg;icon-min-distance: 20;}
 node|z17-[amenity=pharmacy],
 area|z17-[amenity=pharmacy]
-{text-offset: 1;font-size: 11;icon-min-distance: 20;}
+{text-offset: 1;font-size: 11;icon-min-distance: 20;text-optional: true;}
 
 /* 5.2 Education */
 
@@ -1715,7 +1739,7 @@ area|z17[amenity=university][!name]
 {}
 node|z18-[amenity=university][name],
 area|z18-[amenity=university][name]
-{icon-image: college-m.svg;font-size: 11;-x-me-text-priority:16000;}
+{icon-image: college-m.svg;font-size: 11;-x-me-text-priority:16000;text-optional: true;}
 node|z18-[amenity=university][!name],
 area|z18-[amenity=university][!name]
 {}
@@ -1725,25 +1749,25 @@ area|z17-[amenity=kindergarten]
 {icon-image: kindergarten-m.svg;}
 node|z18-[amenity=kindergarten],
 area|z18-[amenity=kindergarten]
-{font-size: 11;}
+{font-size: 11;text-optional: true;}
 node|z17-[amenity=childcare],
 area|z17-[amenity=childcare]
 {icon-image: kindergarten-m.svg;}
 node|z18-[amenity=childcare],
 area|z18-[amenity=childcare]
-{font-size: 11;}
+{font-size: 11;text-optional: true;}
 node|z17-[amenity=school],
 area|z17-[amenity=school]
 {icon-image: school-m.svg;}
 node|z18-[amenity=school],
 area|z18-[amenity=school]
-{font-size: 11;}
+{font-size: 11;text-optional: true;}
 node|z17-[amenity=college],
 area|z17-[amenity=college]
 {icon-image: college-m.svg;}
 node|z18-[amenity=college],
 area|z18-[amenity=college]
-{font-size: 11;}
+{font-size: 11;text-optional: true;}
 
 /* 5.3 Sport */
 
@@ -1820,96 +1844,121 @@ area|z17-[sport=scuba_diving]
 {icon-image: diving-m.svg;font-size: 11;icon-min-distance: 10;}
 
 node|z18-[sport=swimming]
-{icon-image: swimming-m.svg;font-size: 11;}
+{icon-image: swimming-m.svg;font-size: 11;text-optional: true;}
 node|z18-[sport=baseball]
-{icon-image: baseball-m.svg;font-size: 11;}
+{icon-image: baseball-m.svg;font-size: 11;text-optional: true;}
 node|z18-[sport=basketball]
-{icon-image: basketball-m.svg;font-size: 11;}
+{icon-image: basketball-m.svg;font-size: 11;text-optional: true;}
 node|z18-[sport=american_football]
-{icon-image: america-football-m.svg;font-size: 11;}
+{icon-image: america-football-m.svg;font-size: 11;text-optional: true;}
 node|z18-[sport=athletics]
-{icon-image: pitch-m.svg;font-size: 11;}
+{icon-image: pitch-m.svg;font-size: 11;text-optional: true;}
 node|z18-[sport=golf]
-{icon-image: golf-m.svg;font-size: 11;}
+{icon-image: golf-m.svg;font-size: 11;text-optional: true;}
 node|z18-[sport=gymnastics]
-{icon-image: pitch-m.svg;font-size: 11;}
+{icon-image: pitch-m.svg;font-size: 11;text-optional: true;}
 
 node|z18-[sport=archery],
 area|z18-[sport=archery]
-{icon-image: archery-m.svg;font-size: 11;}
+{icon-image: archery-m.svg;font-size: 11;text-optional: true;}
 node|z18-[sport=shooting],
 area|z18-[sport=shooting]
-{icon-image: archery-m.svg;font-size: 11;}
+{icon-image: archery-m.svg;font-size: 11;text-optional: true;}
 node|z18-[sport=australian_football],
 area|z18-[sport=australian_football]
-{icon-image: australian-football-m.svg;font-size: 11;}
+{icon-image: australian-football-m.svg;font-size: 11;text-optional: true;}
 node|z18-[sport=bowls],
 area|z18-[sport=bowls]
-{icon-image: bowls-m.svg;font-size: 11;}
+{icon-image: bowls-m.svg;font-size: 11;text-optional: true;}
 node|z18-[sport=cricket],
 area|z18-[sport=cricket]
-{icon-image: cricket-m.svg;font-size: 11;}
+{icon-image: cricket-m.svg;font-size: 11;text-optional: true;}
 node|z18-[sport=curling],
 area|z18-[sport=curling]
-{icon-image: curling-m.svg;font-size: 11;}
+{icon-image: curling-m.svg;font-size: 11;text-optional: true;}
 node|z18-[sport=diving],
 area|z18-[sport=diving]
-{icon-image: diving-m.svg;font-size: 11;}
+{icon-image: diving-m.svg;font-size: 11;text-optional: true;}
 node|z18-[sport=scuba_diving],
 area|z18-[sport=scuba_diving]
-{icon-image: diving-m.svg;font-size: 11;}
+{icon-image: diving-m.svg;font-size: 11;text-optional: true;}
 
 /* 5.4 Religion */
 
 node|z14[amenity=place_of_worship],
 area|z14[amenity=place_of_worship]
-{icon-image: place-of-worship-s.svg;text-offset: 1;icon-min-distance: 12;}
+{icon-image: place-of-worship-s.svg;text-offset: 1;icon-min-distance: 12;text-optional: true;}
 node|z14[amenity=place_of_worship][religion=christian],
 area|z14[amenity=place_of_worship][religion=christian]
-{icon-image: christian-s.svg;text-offset: 1;icon-min-distance: 12;}
+{icon-image: christian-s.svg;text-offset: 1;icon-min-distance: 12;text-optional: true;}
 node|z14[amenity=place_of_worship][religion=muslim],
 area|z14[amenity=place_of_worship][religion=muslim]
-{icon-image: muslim-s.svg;text-offset: 1;icon-min-distance: 12;}
+{icon-image: muslim-s.svg;text-offset: 1;icon-min-distance: 12;text-optional: true;}
 node|z14[amenity=place_of_worship][religion=buddhist],
 area|z14[amenity=place_of_worship][religion=buddhist]
-{icon-image: buddhist-s.svg;text-offset: 1;icon-min-distance: 12;}
+{icon-image: buddhist-s.svg;text-offset: 1;icon-min-distance: 12;text-optional: true;}
 node|z14[amenity=place_of_worship][religion=hindu],
 area|z14[amenity=place_of_worship][religion=hindu]
-{icon-image: hindu-s.svg;text-offset: 1;icon-min-distance: 12;}
+{icon-image: hindu-s.svg;text-offset: 1;icon-min-distance: 12;text-optional: true;}
 node|z14[amenity=place_of_worship][religion=shinto],
 area|z14[amenity=place_of_worship][religion=shinto]
-{icon-image: shinto-s.svg;text-offset: 1;icon-min-distance: 12;}
+{icon-image: shinto-s.svg;text-offset: 1;icon-min-distance: 12;text-optional: true;}
 node|z14[amenity=place_of_worship][religion=jewish],
 area|z14[amenity=place_of_worship][religion=jewish]
-{icon-image: jewish-s.svg;text-offset: 1;icon-min-distance: 12;}
+{icon-image: jewish-s.svg;text-offset: 1;icon-min-distance: 12;text-optional: true;}
 node|z14[amenity=place_of_worship][religion=taoist],
 area|z14[amenity=place_of_worship][religion=taoist]
-{icon-image: taoist-s.svg;text-offset: 1;icon-min-distance: 12;}
+{icon-image: taoist-s.svg;text-offset: 1;icon-min-distance: 12;text-optional: true;}
 
 node|z15-[amenity=place_of_worship],
 area|z15-[amenity=place_of_worship]
-{icon-image: place-of-worship-m.svg;icon-min-distance: 10;}
+{icon-image: place-of-worship-m.svg;icon-min-distance: 10;text-optional: true;}
 node|z15-[amenity=place_of_worship][religion=christian],
 area|z15-[amenity=place_of_worship][religion=christian]
-{icon-image: christian-m.svg;}
+{icon-image: christian-m.svg;text-optional: true;}
 node|z15-[amenity=place_of_worship][religion=muslim],
 area|z15-[amenity=place_of_worship][religion=muslim]
-{icon-image: muslim-m.svg;}
+{icon-image: muslim-m.svg;text-optional: true;}
 node|z15-[amenity=place_of_worship][religion=buddhist],
 area|z15-[amenity=place_of_worship][religion=buddhist]
-{icon-image: buddhist-m.svg;}
+{icon-image: buddhist-m.svg;text-optional: true;}
 node|z15-[amenity=place_of_worship][religion=hindu],
 area|z15-[amenity=place_of_worship][religion=hindu]
-{icon-image: hindu-m.svg;}
+{icon-image: hindu-m.svg;text-optional: true;}
 node|z15-[amenity=place_of_worship][religion=shinto],
 area|z15-[amenity=place_of_worship][religion=shinto]
-{icon-image: shinto-m.svg;}
+{icon-image: shinto-m.svg;text-optional: true;}
 node|z15-[amenity=place_of_worship][religion=jewish],
 area|z15-[amenity=place_of_worship][religion=jewish]
-{icon-image: jewish-m.svg;}
+{icon-image: jewish-m.svg;text-optional: true;}
 node|z15-[amenity=place_of_worship][religion=taoist],
 area|z15-[amenity=place_of_worship][religion=taoist]
-{icon-image: taoist-m.svg;}
+{icon-image: taoist-m.svg;text-optional: true;}
+
+node|z18-[amenity=place_of_worship],
+area|z18-[amenity=place_of_worship]
+{icon-image: place-of-worship-m.svg;icon-min-distance: 10;text-optional: true;}
+node|z18-[amenity=place_of_worship][religion=christian],
+area|z18-[amenity=place_of_worship][religion=christian]
+{icon-image: christian-m.svg;text-optional: true;}
+node|z18-[amenity=place_of_worship][religion=muslim],
+area|z18-[amenity=place_of_worship][religion=muslim]
+{icon-image: muslim-m.svg;text-optional: true;}
+node|z18-[amenity=place_of_worship][religion=buddhist],
+area|z18-[amenity=place_of_worship][religion=buddhist]
+{icon-image: buddhist-m.svg;text-optional: true;}
+node|z18-[amenity=place_of_worship][religion=hindu],
+area|z18-[amenity=place_of_worship][religion=hindu]
+{icon-image: hindu-m.svg;text-optional: true;}
+node|z18-[amenity=place_of_worship][religion=shinto],
+area|z18-[amenity=place_of_worship][religion=shinto]
+{icon-image: shinto-m.svg;text-optional: true;}
+node|z18-[amenity=place_of_worship][religion=jewish],
+area|z18-[amenity=place_of_worship][religion=jewish]
+{icon-image: jewish-m.svg;text-optional: true;}
+node|z18-[amenity=place_of_worship][religion=taoist],
+area|z18-[amenity=place_of_worship][religion=taoist]
+{icon-image: taoist-m.svg;text-optional: true;}
 
 /* 5.5 Others */
 
@@ -1948,10 +1997,10 @@ area|z12-14[barrier=toll_booth]
 {icon-image: toll_booth-s.svg;icon-min-distance: 8;}
 node|z15-16[barrier=toll_booth],
 area|z15-16[barrier=toll_booth]
-{icon-image: toll_booth-m.svg;icon-min-distance: 8;}
+{icon-image: toll_booth-m.svg;icon-min-distance: 8;text-optional: true;}
 node|z17-[barrier=toll_booth],
 area|z17-[barrier=toll_booth]
-{icon-image: toll_booth-m.svg;icon-min-distance: 8;}
+{icon-image: toll_booth-m.svg;icon-min-distance: 8;text-optional: true;}
 
 node|z15-[barrier=border_control]
 {icon-image:bcontrol-m.svg;}
@@ -1977,97 +2026,97 @@ area|z16-[barrier=lift_gate]
 {icon-image: lift_gate-m.svg;icon-min-distance: 30;}
 node|z17-[barrier=lift_gate],
 area|z17-[barrier=lift_gate]
-{icon-min-distance: 20;}
+{icon-min-distance: 20;text-optional: true;}
 
 node|z16-[leisure=dog_park],
 area|z16-[leisure=dog_park]
 {icon-image: dog_park-m.svg;icon-min-distance: 30;}
 node|z17-[leisure=dog_park],
 area|z17-[leisure=dog_park]
-{icon-min-distance: 20;}
+{icon-min-distance: 20;text-optional: true;}
 
 node|z16-[leisure=water_park],
 area|z16-[leisure=water_park]
 {icon-image: swimming-m.svg;icon-min-distance: 30;}
 node|z17-[leisure=water_park],
 area|z17-[leisure=water_park]
-{icon-min-distance: 20;}
+{icon-min-distance: 20;text-optional: true;}
 
 node|z16-[man_made=windmill],
 area|z16-[man_made=windmill]
 {icon-image: windmill-m.svg;icon-min-distance: 30;}
 node|z17-[man_made=windmill],
 area|z17-[man_made=windmill]
-{icon-min-distance: 20;}
+{icon-min-distance: 20;text-optional: true;}
 
 node|z17-[amenity=casino],
 area|z17-[amenity=casino]
-{icon-image: casino-m.svg;icon-min-distance: 20;}
+{icon-image: casino-m.svg;icon-min-distance: 20;text-optional: true;}
 
 node|z17-[shop=money_lender],
 area|z17-[shop=money_lender]
-{icon-image: bank-m.svg;icon-min-distance: 20;}
+{icon-image: bank-m.svg;icon-min-distance: 20;text-optional: true;}
 
 node|z17-[amenity=courthouse],
 area|z17-[amenity=courthouse]
-{icon-image: public-building-m.svg;}
+{icon-image: public-building-m.svg;text-optional: true;}
 
 node|z17-[amenity=nursing_home],
 area|z17-[amenity=nursing_home]
-{icon-image: home-m.svg;}
+{icon-image: home-m.svg;text-optional: true;}
 
 node|z17-[amenity=cinema],
 area|z17-[amenity=cinema]
-{icon-image: cinema-m.svg;}
+{icon-image: cinema-m.svg;text-optional: true;}
 node|z18-[amenity=cinema],
 area|z18-[amenity=cinema]
-{font-size: 11;}
+{font-size: 11;text-optional: true;}
 
 node|z17-[amenity=police],
 area|z17-[amenity=police]
-{icon-image: police-m.svg;}
+{icon-image: police-m.svg;text-optional: true;}
 node|z18-[amenity=police],
 area|z18-[amenity=police]
-{font-size: 11;}
+{font-size: 11;text-optional: true;}
 
 node|z17-[amenity=prison],
 area|z17-[amenity=prison]
 {icon-image: prison-m.svg;}
 node|z18-[amenity=prison],
 area|z18-[amenity=prison]
-{font-size: 11;}
+{font-size: 11;text-optional: true;}
 
 node|z17-[amenity=embassy],
 area|z17-[amenity=embassy]
-{icon-image: embassy-m.svg;}
+{icon-image: embassy-m.svg;text-optional: true;}
 node|z18-[amenity=embassy],
 area|z18-[amenity=embassy]
-{font-size: 11;}
+{font-size: 11;text-optional: true;}
 
 node|z17-[amenity=bicycle_rental],
 area|z17-[amenity=bicycle_rental]
-{icon-image: bicycle-m.svg;}
+{icon-image: bicycle-m.svg;text-optional: true;}
 node|z18-[amenity=bicycle_rental],
 area|z18-[amenity=bicycle_rental]
-{font-size: 11;}
+{font-size: 11;text-optional: true;}
 
 node|z17[amenity=post_office]
 {icon-image: mail-m.svg;}
 node|z18-[amenity=post_office],
 node|z18-[amenity=post_box],
 area|z18-[amenity=post_box]
-{icon-image: postbox-m.svg;font-size: 11;}
+{icon-image: postbox-m.svg;font-size: 11;text-optional: true;}
 node|z18-[emergency=fire_hydrant],
 area|z18-[emergency=fire_hydrant]
-{icon-image: firehydrant-m.svg;font-size: 11;}
+{icon-image: firehydrant-m.svg;font-size: 11;text-optional: true;}
 
 node|z18-[emergency=defibrillator],
 area|z18-[emergency=defibrillator]
-{icon-image: defibrillator-m.svg;font-size: 11;}
+{icon-image: defibrillator-m.svg;font-size: 11;text-optional: true;}
 
 node|z17-[office=lawyer],
 area|z17-[office=lawyer]
-{icon-image: lawyer-m.svg;icon-min-distance: 10;}
+{icon-image: lawyer-m.svg;icon-min-distance: 10;text-optional: true;}
 
 node|z17-[amenity=telephone],
 node|z17-[emergency=phone]
@@ -2105,21 +2154,21 @@ area|z18-[aeroway=gate]
 {icon-image: gate-m.svg;tfont-size: 11;z-index: 24200;}/*check*/
 
 node|z17-[amenity=bureau_de_change]
-{icon-image: banknote-m.svg;font-size: 11;}
+{icon-image: banknote-m.svg;font-size: 11;text-optional: true;}
 
 area|z17-[shop=pawnbroker],
 node|z17-[shop=pawnbroker]
-{icon-image: bookmaker-m.svg;font-size: 11;}
+{icon-image: bookmaker-m.svg;font-size: 11;text-optional: true;}
 
 node|z18-[amenity=fire_station],
 area|z18-[amenity=fire_station]
-{icon-image: fire_station-m.svg;font-size: 11;}
+{icon-image: fire_station-m.svg;font-size: 11;text-optional: true;}
 node|z18-[amenity=toilets],
 area|z18-[amenity=toilets]
-{icon-image: toilets-m.svg;font-size: 11;}
+{icon-image: toilets-m.svg;font-size: 11;text-optional: true;}
 node|z18-[amenity=atm],
 area|z18-[amenity=atm]
-{icon-image: atm-m.svg;font-size: 11;}
+{icon-image: atm-m.svg;font-size: 11;text-optional: true;}
 
 node|z18-[amenity=bench]
 {icon-image: bench.svg;}
@@ -2127,14 +2176,14 @@ node|z18-[amenity=waste_basket]
 {icon-image: waste-basket-s.svg;}
 
 node|z18-[amenity=library]
-{icon-image: library-m.svg;font-size: 11;}
+{icon-image: library-m.svg;font-size: 11;text-optional: true;}
 node|z18-[amenity=waste_disposal],
 area|z18-[amenity=waste_disposal]
 {icon-image: recycling-m.svg;font-size: 11;}
 
 node|z18-[amenity=hunting_stand],
 area|z18-[amenity=hunting_stand]
-{icon-image: hunting-tower-m.svg;font-size: 11;}
+{icon-image: hunting-tower-m.svg;font-size: 11;text-optional: true;}
 
 node|z18-[man_made=chimney],
 area|z18-[man_made=chimney],
@@ -2144,7 +2193,7 @@ area|z18-[man_made=works]
 
 node|z18-[amenity=bbq],
 area|z18-[amenity=bbq]
-{icon-image: bbq-m.svg;font-size: 11;-x-me-text-priority:16000;}
+{icon-image: bbq-m.svg;font-size: 11;-x-me-text-priority:16000;text-optional: true;}
 
 node|z19-[man_made=survey_point]
 {icon-image: survey_point-m.svg;}
@@ -2372,167 +2421,167 @@ area|z16[shop=fabric]
 
 node|z17-[shop=alcohol],
 area|z17-[shop=alcohol]
-{icon-image: alcohol-m.svg;icon-min-distance: 24;}
+{icon-image: alcohol-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=wine],
 area|z17-[shop=wine]
-{icon-image: alcohol-m.svg;icon-min-distance: 24;}
+{icon-image: alcohol-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=books],
 area|z17-[shop=books]
-{icon-image: book-shop-m.svg;icon-min-distance: 24;}
+{icon-image: book-shop-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=bookmaker],
 area|z17-[shop=bookmaker]
-{icon-image: bookmaker-m.svg;icon-min-distance: 24;}
+{icon-image: bookmaker-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=bakery],
 area|z17-[shop=bakery]
-{icon-image: bakery-m.svg;icon-min-distance: 24;}
+{icon-image: bakery-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=beauty],
 area|z17-[shop=beauty]
-{icon-image: beauty-m.svg;icon-min-distance: 24;}
+{icon-image: beauty-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=cosmetics],
 area|z17-[shop=cosmetics]
-{icon-image: beauty-m.svg;icon-min-distance: 24;}
+{icon-image: beauty-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=beverages],
 area|z17-[shop=beverages]
-{icon-image: alcohol-m.svg;icon-min-distance: 24;}
+{icon-image: alcohol-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=bicycle],
 area|z17-[shop=bicycle]
-{icon-image: shop-bicycle-m.svg;icon-min-distance: 24;}
+{icon-image: shop-bicycle-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=butcher],
 area|z17-[shop=butcher]
-{icon-image: butcher-m.svg;icon-min-distance: 24;}
+{icon-image: butcher-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=car],
 area|z17-[shop=car]
-{icon-image: car_shop-m.svg;icon-min-distance: 24;}
+{icon-image: car_shop-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=motorcycle],
 area|z17-[shop=motorcycle]
-{icon-image: motorcycle_shop-m.svg;icon-min-distance: 24;}
+{icon-image: motorcycle_shop-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=car_parts],
 area|z17-[shop=car_parts]
-{icon-image: car-part-m.svg;icon-min-distance: 24;}
+{icon-image: car-part-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=car_repair],
 area|z17-[shop=car_repair]
-{icon-image: car-repair-m.svg;icon-min-distance: 24;}
+{icon-image: car-repair-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=tyres],
 area|z17-[shop=tyres]
-{icon-image: car-repair-m.svg;icon-min-distance: 24;}
+{icon-image: car-repair-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=chemist],
 area|z17-[shop=chemist]
-{icon-image: chemist-m.svg;icon-min-distance: 24;}
+{icon-image: chemist-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=clothes],
 area|z17-[shop=clothes]
-{icon-image: clothes-m.svg;icon-min-distance: 24;}
+{icon-image: clothes-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=computer],
 area|z17-[shop=computer]
-{icon-image: computer-m.svg;icon-min-distance: 24;}
+{icon-image: computer-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=tattoo],
 area|z17-[shop=tattoo]
-{icon-image: hand-m.svg;icon-min-distance: 24;}
+{icon-image: hand-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=erotic],
 area|z17-[shop=erotic]
-{icon-image: erotic-m.svg;icon-min-distance: 24;}
+{icon-image: erotic-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=funeral_directors],
 area|z17-[shop=funeral_directors]
-{icon-image: funeral_directors-m.svg;icon-min-distance: 24;}
+{icon-image: funeral_directors-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=confectionery],
 area|z17-[shop=confectionery],
 node|z17-[shop=chocolate],
 area|z17-[shop=chocolate]
-{icon-image: sweets-m.svg;icon-min-distance: 24;}
+{icon-image: sweets-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17[amenity=ice_cream],
 area|z17[amenity=ice_cream]
-{icon-image: ice_cream-m.svg;icon-min-distance: 24;}
+{icon-image: ice_cream-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=convenience],
 area|z17-[shop=convenience]
-{icon-image: grocery-m.svg;icon-min-distance: 24;}
+{icon-image: grocery-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=copyshop],
 area|z17-[shop=copyshop]
-{icon-image: copyshop-m.svg;icon-min-distance: 24;}
+{icon-image: copyshop-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=photo],
 area|z17-[shop=photo]
-{icon-image: photo-shop-m.svg;icon-min-distance: 24;}
+{icon-image: photo-shop-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=pet],
 area|z17-[shop=pet]
-{icon-image: petshop-m.svg;icon-min-distance: 24;}
+{icon-image: petshop-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=department_store],
 area|z17-[shop=department_store]
-{icon-image: department_store-m.svg;icon-min-distance: 24;}
+{icon-image: department_store-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=doityourself],
 area|z17-[shop=doityourself]
-{icon-image: doityourself-m.svg;icon-min-distance: 24;}
+{icon-image: doityourself-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=electronics],
 area|z17-[shop=electronics]
-{icon-image: electronics-m.svg;icon-min-distance: 24;}
+{icon-image: electronics-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=florist],
 area|z17-[shop=florist]
-{icon-image: florist-m.svg;icon-min-distance: 24;}
+{icon-image: florist-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=furniture],
 area|z17-[shop=furniture]
-{icon-image: furniture-m.svg;icon-min-distance: 24;}
+{icon-image: furniture-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=garden_centre],
 area|z17-[shop=garden_centre]
-{icon-image: garden_center-m.svg;icon-min-distance: 24;}
+{icon-image: garden_center-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=gift],
 area|z17-[shop=gift]
-{icon-image: gift-m.svg;icon-min-distance: 24;}
+{icon-image: gift-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=music],
 area|z17-[shop=music],
 node|z17-[shop=video],
 area|z17-[shop=video]
-{icon-image: media-m.svg;icon-min-distance: 24;}
+{icon-image: media-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=musical_instrument],
 area|z17-[shop=musical_instrument]
-{icon-image: music-m.svg;icon-min-distance: 24;}
+{icon-image: music-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=greengrocer],
 area|z17-[shop=greengrocer]
-{icon-image: greengrocer-m.svg;icon-min-distance: 24;}
+{icon-image: greengrocer-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=hairdresser],
 area|z17-[shop=hairdresser]
-{icon-image: hairdresser-m.svg;icon-min-distance: 24;}
+{icon-image: hairdresser-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=hardware],
 area|z17-[shop=hardware]
-{icon-image: doityourself-m.svg;icon-min-distance: 24;}
+{icon-image: doityourself-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=jewelry],
 area|z17-[shop=jewelry]
-{icon-image: jewelry-m.svg;icon-min-distance: 24;}
+{icon-image: jewelry-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=kiosk],
 area|z17-[shop=kiosk]
-{icon-image: kiosk-m.svg;icon-min-distance: 24;}
+{icon-image: kiosk-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=laundry],
 area|z17-[shop=laundry]
-{icon-image:laundry-m.svg;icon-min-distance: 24;}
+{icon-image:laundry-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=dry_cleaning],
 area|z17-[shop=dry_cleaning]
-{icon-image:laundry-m.svg;icon-min-distance: 24;}
+{icon-image:laundry-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=mobile_phone],
 area|z17-[shop=mobile_phone]
-{icon-image: mobile_phone-m.svg;icon-min-distance: 24;}
+{icon-image: mobile_phone-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=optician],
 area|z17-[shop=optician]
-{icon-image: optician-m.svg;icon-min-distance: 24;}
+{icon-image: optician-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=outdoor],
 area|z17-[shop=outdoor]
-{icon-image: outdoor-shop-m.svg;icon-min-distance: 24;}
+{icon-image: outdoor-shop-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=seafood],
 area|z17-[shop=seafood]
-{icon-image: seafood-shop-m.svg;icon-min-distance: 24;}
+{icon-image: seafood-shop-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=shoes],
 area|z17-[shop=shoes]
-{icon-image: shoes-m.svg;icon-min-distance: 24;}
+{icon-image: shoes-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=sports],
 area|z17-[shop=sports]
-{icon-image: sports-m.svg;icon-min-distance: 24;}
+{icon-image: sports-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=ticket],
 area|z17-[shop=ticket]
-{icon-image: ticket-shop-m.svg;icon-min-distance: 24;}
+{icon-image: ticket-shop-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=toys],
 area|z17-[shop=toys]
-{icon-image: toys-m.svg;icon-min-distance: 24;}
+{icon-image: toys-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=stationery],
 area|z17-[shop=stationery]
-{icon-image: stationery_shop-m.svg;icon-min-distance: 24;}
+{icon-image: stationery_shop-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=newsagent],
 area|z17-[shop=newsagent]
-{icon-image: newsagent_shop-m.svg;icon-min-distance: 24;}
+{icon-image: newsagent_shop-m.svg;icon-min-distance: 24;text-optional: true;}
 node|z17-[shop=fabric],
 area|z17-[shop=fabric]
 {icon-image: shop-m.svg;}
@@ -2555,7 +2604,7 @@ node|z18-[amenity=car_rental],
 area|z18-[amenity=car_rental],
 node|z18-[amenity=car_sharing],
 area|z18-[amenity=car_sharing]
-{text: name;text-color: @poi_label;text-offset: 1;font-size: 10;}
+{text: name;text-color: @poi_label;text-offset: 1;font-size: 10;text-optional: true;}
 
 node|z14[amenity=fuel],
 area|z14[amenity=fuel]
@@ -2618,7 +2667,7 @@ node|z17[amenity=parking][access=private]
 
 node|z18-[amenity=parking],
 area|z18-[amenity=parking]
-{icon-image: parking-m.svg;font-size: 11;}
+{icon-image: parking-m.svg;font-size: 11;text-optional: true;}
 
 node|z17-[amenity=bicycle_parking],
 area|z17-[amenity=bicycle_parking]
@@ -2628,6 +2677,14 @@ node|z17-[amenity=motorcycle_parking],
 area|z17-[amenity=motorcycle_parking]
 {icon-image: motorcycle-parking-m.svg;icon-min-distance: 20;}
 
+node|z18-[amenity=bicycle_parking],
+area|z18-[amenity=bicycle_parking]
+{icon-image: bike-parking-m.svg;icon-min-distance: 20;text-optional: true;}
+
+node|z18-[amenity=motorcycle_parking],
+area|z18-[amenity=motorcycle_parking]
+{icon-image: motorcycle-parking-m.svg;icon-min-distance: 20;text-optional: true;}
+
 
 /* 8 Sponsored */
 
@@ -2637,7 +2694,7 @@ area|z14-[sponsored=partner2]
 
 node|z18-[sponsored=partner2],
 area|z18-[sponsored=partner2]
-{icon-image: partner2-l.svg;font-size: 11;}
+{icon-image: partner2-l.svg;font-size: 11;text-optional: true;}
 
 /* Adidas */
 
@@ -2647,7 +2704,7 @@ area|z15-[sponsored=partner4]
 
 node|z18-[sponsored=partner4],
 area|z18-[sponsored=partner4]
-{icon-image: partner4-l.svg;font-size: 11;}
+{icon-image: partner4-l.svg;font-size: 11;text-optional: true;}
 
 node|z15-[sponsored=partner6],
 area|z15-[sponsored=partner6]
@@ -2655,7 +2712,7 @@ area|z15-[sponsored=partner6]
 
 node|z18-[sponsored=partner6],
 area|z18-[sponsored=partner6]
-{icon-image: partner6-l.svg;font-size: 11;}
+{icon-image: partner6-l.svg;font-size: 11;text-optional: true;}
 
 node|z15-[sponsored=partner7],
 area|z15-[sponsored=partner7]
@@ -2663,7 +2720,7 @@ area|z15-[sponsored=partner7]
 
 node|z18-[sponsored=partner7],
 area|z18-[sponsored=partner7]
-{icon-image: partner7-l.svg;font-size: 11;}
+{icon-image: partner7-l.svg;font-size: 11;text-optional: true;}
 
 /* Rosinter */
 
@@ -2673,7 +2730,7 @@ area|z15-[sponsored=partner8]
 
 node|z18-[sponsored=partner8],
 area|z18-[sponsored=partner8]
-{icon-image: partner8-l.svg;font-size: 11;}
+{icon-image: partner8-l.svg;font-size: 11;text-optional: true;}
 
 node|z15-[sponsored=partner9],
 area|z15-[sponsored=partner9]
@@ -2681,7 +2738,7 @@ area|z15-[sponsored=partner9]
 
 node|z18-[sponsored=partner9],
 area|z18-[sponsored=partner9]
-{icon-image: partner9-l.svg;font-size: 11;}
+{icon-image: partner9-l.svg;font-size: 11;text-optional: true;}
 
 /* Sportmaster */
 
@@ -2691,7 +2748,7 @@ area|z15-[sponsored=partner10]
 
 node|z18-[sponsored=partner10],
 area|z18-[sponsored=partner10]
-{icon-image: partner10-l.svg;font-size: 11;}
+{icon-image: partner10-l.svg;font-size: 11;text-optional: true;}
 
 /* Azbuka vkusa */
 
@@ -2701,7 +2758,7 @@ area|z15-[sponsored=partner12]
 
 node|z18-[sponsored=partner12],
 area|z18-[sponsored=partner12]
-{icon-image: partner12-l.svg;font-size: 11;}
+{icon-image: partner12-l.svg;font-size: 11;text-optional: true;}
 
 /* Megafon */
 
@@ -2711,7 +2768,7 @@ area|z14-[sponsored=partner18]
 
 node|z18-[sponsored=partner18],
 area|z18-[sponsored=partner18]
-{icon-image: partner18-l.svg;}
+{icon-image: partner18-l.svg;text-optional: true;}
 
 node|z14-[sponsored=partner19],
 area|z14-[sponsored=partner19]
@@ -2719,7 +2776,7 @@ area|z14-[sponsored=partner19]
 
 node|z18-[sponsored=partner19],
 area|z18-[sponsored=partner19]
-{icon-image: partner19-l.svg;}
+{icon-image: partner19-l.svg;text-optional: true;}
 
 node|z15-[sponsored=partner20],
 area|z15-[sponsored=partner20]
@@ -2727,7 +2784,7 @@ area|z15-[sponsored=partner20]
 
 node|z18-[sponsored=partner20],
 area|z18-[sponsored=partner20]
-{icon-image: partner20-l.svg;font-size: 11;}
+{icon-image: partner20-l.svg;font-size: 11;text-optional: true;}
 
 /* Fifa */
 
@@ -2745,7 +2802,7 @@ area|z15-16[event=fc2018][leisure=stadium]
 
 node|z17-[event=fc2018][leisure=stadium],
 area|z17-[event=fc2018][leisure=stadium]
-{icon-image: wfc_stadium.svg;icon-min-distance: 10;}
+{icon-image: wfc_stadium.svg;icon-min-distance: 10;text-optional: true;}
 
 node|z15-[event=fc2018][shop=ticket],
 area|z15-[event=fc2018][shop=ticket],
diff --git a/data/styles/clear/include/Subways.mapcss b/data/styles/clear/include/Subways.mapcss
index 45ff02a5f7..652fcd2a29 100755
--- a/data/styles/clear/include/Subways.mapcss
+++ b/data/styles/clear/include/Subways.mapcss
@@ -9,541 +9,546 @@
 node|z12-13[railway=station][transport=subway][city=adana] {icon-image: subway-adana-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=adana] {icon-image: subway-adana-s.svg;}
 node|z15-16[railway=station][transport=subway][city=adana] {icon-image: subway-adana-m.svg;}
-node|z17-[railway=station][transport=subway][city=adana] {icon-image: subway-adana-m.svg;}
-node|z17[railway=subway_entrance][city=adana] {icon-image: subway-adana-s.svg;}
-node|z18-[railway=subway_entrance][city=adana] {icon-image: subway-adana-m.svg;}
+node|z17-[railway=station][transport=subway][city=adana] {icon-image: subway-adana-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=adana] {icon-image: subway-adana-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=adana] {icon-image: subway-adana-m.svg;text-optional: true;}
 
 /* Algiers Subway Station */
 node|z12-13[railway=station][transport=subway][city=algiers] {icon-image: subway-algeria-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=algiers] {icon-image: subway-algeria-s.svg;}
 node|z15-16[railway=station][transport=subway][city=algiers] {icon-image: subway-algeria-m.svg;}
-node|z17-[railway=station][transport=subway][city=algiers] {icon-image: subway-algeria-m.svg;}
-node|z17[railway=subway_entrance][city=algiers] {icon-image: subway-algeria-s.svg;}
-node|z18-[railway=subway_entrance][city=algiers] {icon-image: subway-algeria-m.svg;}
+node|z17-[railway=station][transport=subway][city=algiers] {icon-image: subway-algeria-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=algiers] {icon-image: subway-algeria-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=algiers] {icon-image: subway-algeria-m.svg;text-optional: true;}
 
 /* Almaty Subway Station */
 node|z12-13[railway=station][transport=subway][city=almaty] {icon-image: subway-almaty-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=almaty] {icon-image: subway-almaty-s.svg;}
 node|z15-16[railway=station][transport=subway][city=almaty] {icon-image: subway-almaty-m.svg;}
-node|z17-[railway=station][transport=subway][city=almaty] {icon-image: subway-almaty-m.svg;}
-node|z17[railway=subway_entrance][city=almaty] {icon-image: subway-almaty-s.svg;}
-node|z18-[railway=subway_entrance][city=almaty] {icon-image: subway-almaty-m.svg;}
+node|z17-[railway=station][transport=subway][city=almaty] {icon-image: subway-almaty-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=almaty] {icon-image: subway-almaty-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=almaty] {icon-image: subway-almaty-m.svg;text-optional: true;}
 
 /* Amsterdam Subway Station */
 node|z13[railway=station][transport=subway][city=amsterdam] {icon-image: subway-amsterdam-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=amsterdam] {icon-image: subway-amsterdam-s.svg;}
 node|z15-16[railway=station][transport=subway][city=amsterdam] {icon-image: subway-amsterdam-m.svg;}
-node|z17-[railway=station][transport=subway][city=amsterdam] {icon-image: subway-amsterdam-m.svg;}
-node|z17[railway=subway_entrance][city=amsterdam] {icon-image: subway-amsterdam-s.svg;}
-node|z18-[railway=subway_entrance][city=amsterdam] {icon-image: subway-amsterdam-m.svg;}
+node|z17-[railway=station][transport=subway][city=amsterdam] {icon-image: subway-amsterdam-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=amsterdam] {icon-image: subway-amsterdam-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=amsterdam] {icon-image: subway-amsterdam-m.svg;text-optional: true;}
 
 /* Ankara Subway Station */
 node|z13[railway=station][transport=subway][city=ankara] {icon-image: subway-ankara-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=ankara] {icon-image: subway-ankara-s.svg;}
 node|z15-16[railway=station][transport=subway][city=ankara] {icon-image: subway-ankara-m.svg;}
-node|z17-[railway=station][transport=subway][city=ankara] {icon-image: subway-ankara-m.svg;}
-node|z17[railway=subway_entrance][city=ankara] {icon-image: subway-ankara-s.svg;}
-node|z18-[railway=subway_entrance][city=ankara] {icon-image: subway-ankara-m.svg;}
+node|z17-[railway=station][transport=subway][city=ankara] {icon-image: subway-ankara-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=ankara] {icon-image: subway-ankara-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=ankara] {icon-image: subway-ankara-m.svg;text-optional: true;}
 
 /* Athens Subway Station */
 node|z13[railway=station][transport=subway][city=athens] {icon-image: subway-athens-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=athens] {icon-image: subway-athens-s.svg;}
 node|z15-16[railway=station][transport=subway][city=athens] {icon-image: subway-athens-m.svg;}
-node|z17-[railway=station][transport=subway][city=athens] {icon-image: subway-athens-m.svg;}
-node|z17[railway=subway_entrance][city=athens] {icon-image: subway-athens-s.svg;}
-node|z18-[railway=subway_entrance][city=athens] {icon-image: subway-athens-m.svg;}
+node|z17-[railway=station][transport=subway][city=athens] {icon-image: subway-athens-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=athens] {icon-image: subway-athens-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=athens] {icon-image: subway-athens-m.svg;text-optional: true;}
 
 /* Baku Subway Station */
 node|z13[railway=station][transport=subway][city=baku] {icon-image: subway-baku-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=baku] {icon-image: subway-baku-s.svg;}
 node|z15-16[railway=station][transport=subway][city=baku] {icon-image: subway-baku-m.svg;}
-node|z17-[railway=station][transport=subway][city=baku] {icon-image: subway-baku-m.svg;}
-node|z17[railway=subway_entrance][city=baku] {icon-image: subway-baku-s.svg;}
-node|z18-[railway=subway_entrance][city=baku] {icon-image: subway-baku-m.svg;}
+node|z17-[railway=station][transport=subway][city=baku] {icon-image: subway-baku-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=baku] {icon-image: subway-baku-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=baku] {icon-image: subway-baku-m.svg;text-optional: true;}
 
 /* Bangkok Subway Station */
 node|z13[railway=station][transport=subway][city=bangkok] {icon-image: subway-bangkok-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=bangkok] {icon-image: subway-bangkok-s.svg;}
 node|z15-16[railway=station][transport=subway][city=bangkok] {icon-image: subway-bangkok-m.svg;}
-node|z17-[railway=station][transport=subway][city=bangkok] {icon-image: subway-bangkok-m.svg;}
-node|z17[railway=subway_entrance][city=bangkok] {icon-image: subway-bangkok-s.svg;}
-node|z18-[railway=subway_entrance][city=bangkok] {icon-image: subway-bangkok-m.svg;}
+node|z17-[railway=station][transport=subway][city=bangkok] {icon-image: subway-bangkok-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=bangkok] {icon-image: subway-bangkok-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=bangkok] {icon-image: subway-bangkok-m.svg;text-optional: true;}
 
 /* Barselona Subway Station */
 node|z13[railway=station][transport=subway][city=barcelona] {icon-image: subway-barcelona-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=barcelona] {icon-image: subway-barcelona-s.svg;}
 node|z15-16[railway=station][transport=subway][city=barcelona] {icon-image: subway-barcelona-m.svg;}
-node|z17-[railway=station][transport=subway][city=barcelona] {icon-image: subway-barcelona-m.svg;}
-node|z17[railway=subway_entrance][city=barcelona] {icon-image: subway-barcelona-s.svg;}
-node|z18-[railway=subway_entrance][city=barcelona] {icon-image: subway-barcelona-m.svg;}
+node|z17-[railway=station][transport=subway][city=barcelona] {icon-image: subway-barcelona-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=barcelona] {icon-image: subway-barcelona-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=barcelona] {icon-image: subway-barcelona-m.svg;text-optional: true;}
 
 /* Beijing Subway Station */
 node|z13[railway=station][transport=subway][city=beijing] {icon-image: subway-beijing-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=beijing] {icon-image: subway-beijing-s.svg;}
 node|z15-16[railway=station][transport=subway][city=beijing] {icon-image: subway-beijing-m.svg;}
-node|z17-[railway=station][transport=subway][city=beijing] {icon-image: subway-beijing-m.svg;}
-node|z17[railway=subway_entrance][city=beijing] {icon-image: subway-beijing-s.svg;}
-node|z18-[railway=subway_entrance][city=beijing] {icon-image: subway-beijing-m.svg;}
+node|z17-[railway=station][transport=subway][city=beijing] {icon-image: subway-beijing-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=beijing] {icon-image: subway-beijing-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=beijing] {icon-image: subway-beijing-m.svg;text-optional: true;}
 
 /* Berlin Subway Station*/
 node|z13[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-s.svg;}
 node|z15-16[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-m.svg;}
-node|z17-[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-m.svg;}
-node|z17-[railway=subway_entrance][city=berlin] {icon-image: subway-berlin-s.svg;}
+node|z17-[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-m.svg;text-optional: true;}
+node|z17-[railway=subway_entrance][city=berlin] {icon-image: subway-berlin-s.svg;text-optional: true;}
 
 /* Bengaluru Subway Station*/
 node|z13[railway=station][transport=subway][city=bengalore] {icon-image: subway-bengaluru-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=bengalore] {icon-image: subway-bengaluru-s.svg;}
 node|z15-16[railway=station][transport=subway][city=bengalore] {icon-image: subway-bengaluru-m.svg;}
-node|z17-[railway=station][transport=subway][city=bengalore] {icon-image: subway-bengaluru-m.svg;}
-node|z17-[railway=subway_entrance][city=bengalore] {icon-image: subway-bengaluru-s.svg;}
+node|z17-[railway=station][transport=subway][city=bengalore] {icon-image: subway-bengaluru-m.svg;text-optional: true;}
+node|z17-[railway=subway_entrance][city=bengalore] {icon-image: subway-bengaluru-s.svg;text-optional: true;}
 
 /* Bilbao Subway Station*/
 node|z13[railway=station][transport=subway][city=bilbao] {icon-image: subway-bilbao-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=bilbao] {icon-image: subway-bilbao-s.svg;}
 node|z15-16[railway=station][transport=subway][city=bilbao] {icon-image: subway-bilbao-m.svg;}
-node|z17-[railway=station][transport=subway][city=bilbao] {icon-image: subway-bilbao-m.svg;}
-node|z17-[railway=subway_entrance][city=bilbao] {icon-image: subway-bilbao-s.svg;}
+node|z17-[railway=station][transport=subway][city=bilbao] {icon-image: subway-bilbao-m.svg;text-optional: true;}
+node|z17-[railway=subway_entrance][city=bilbao] {icon-image: subway-bilbao-s.svg;text-optional: true;}
 
 /* Brasilia Subway Station*/
 node|z13[railway=station][transport=subway][city=brasilia] {icon-image: subway-brasilia-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=brasilia] {icon-image: subway-brasilia-s.svg;}
 node|z15-16[railway=station][transport=subway][city=brasilia] {icon-image: subway-brasilia-m.svg;}
-node|z17-[railway=station][transport=subway][city=brasilia] {icon-image: subway-brasilia-m.svg;}
-node|z17-[railway=subway_entrance][city=brasilia] {icon-image: subway-brasilia-s.svg;}
+node|z17-[railway=station][transport=subway][city=brasilia] {icon-image: subway-brasilia-m.svg;text-optional: true;}
+node|z17-[railway=subway_entrance][city=brasilia] {icon-image: subway-brasilia-s.svg;text-optional: true;}
 
 /* brescia Subway Station*/
 node|z13[railway=station][transport=subway][city=brescia] {icon-image: subway-brescia-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=brescia] {icon-image: subway-brescia-s.svg;}
 node|z15-16[railway=station][transport=subway][city=brescia] {icon-image: subway-brescia-m.svg;}
-node|z17-[railway=station][transport=subway][city=brescia] {icon-image: subway-brescia-m.svg;}
-node|z17-[railway=subway_entrance][city=brescia] {icon-image: subway-brescia-s.svg;}
+node|z17-[railway=station][transport=subway][city=brescia] {icon-image: subway-brescia-m.svg;text-optional: true;}
+node|z17-[railway=subway_entrance][city=brescia] {icon-image: subway-brescia-s.svg;text-optional: true;}
 
 /* Brussel Subway Station */
 node|z13[railway=station][transport=subway][city=brussels] {icon-image: subway-brussel-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=brussels] {icon-image: subway-brussel-s.svg;}
 node|z15-16[railway=station][transport=subway][city=brussels] {icon-image: subway-brussel-m.svg;}
-node|z17-[railway=station][transport=subway][city=brussels] {icon-image: subway-brussel-m.svg;}
-node|z17[railway=subway_entrance][city=brussels] {icon-image: subway-brussel-s.svg;}
-node|z18-[railway=subway_entrance][city=brussels] {icon-image: subway-brussel-m.svg;}
+node|z17-[railway=station][transport=subway][city=brussels] {icon-image: subway-brussel-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=brussels] {icon-image: subway-brussel-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=brussels] {icon-image: subway-brussel-m.svg;text-optional: true;}
 
 /* bucharest Subway Station */
 node|z13[railway=station][transport=subway][city=bucharest] {icon-image: subway-bucharest-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=bucharest] {icon-image: subway-bucharest-s.svg;}
 node|z15-16[railway=station][transport=subway][city=bucharest] {icon-image: subway-bucharest-m.svg;}
-node|z17-[railway=station][transport=subway][city=bucharest] {icon-image: subway-bucharest-m.svg;}
-node|z17[railway=subway_entrance][city=bucharest] {icon-image: subway-bucharest-s.svg;}
-node|z18-[railway=subway_entrance][city=bucharest] {icon-image: subway-bucharest-m.svg;}
+node|z17-[railway=station][transport=subway][city=bucharest] {icon-image: subway-bucharest-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=bucharest] {icon-image: subway-bucharest-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=bucharest] {icon-image: subway-bucharest-m.svg;text-optional: true;}
 
 /* Budapest Subway Station */
 node|z13[railway=station][transport=subway][city=budapest] {icon-image: subway-budapest-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=budapest] {icon-image: subway-budapest-s.svg;}
 node|z15-16[railway=station][transport=subway][city=budapest] {icon-image: subway-budapest-m.svg;}
-node|z17-[railway=station][transport=subway][city=budapest] {icon-image: subway-budapest-m.svg;}
-node|z17[railway=subway_entrance][city=budapest] {icon-image: subway-budapest-s.svg;}
-node|z18-[railway=subway_entrance][city=budapest] {icon-image: subway-budapest-m.svg;}
+node|z17-[railway=station][transport=subway][city=budapest] {icon-image: subway-budapest-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=budapest] {icon-image: subway-budapest-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=budapest] {icon-image: subway-budapest-m.svg;text-optional: true;}
 
 /* Buenos Aires Subway Station */
 node|z13[railway=station][transport=subway][city=buenos_aires] {icon-image: subway-buenosaires-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=buenos_aires] {icon-image: subway-buenosaires-s.svg;}
 node|z15-16[railway=station][transport=subway][city=buenos_aires] {icon-image: subway-buenosaires-m.svg;}
-node|z17-[railway=station][transport=subway][city=buenos_aires] {icon-image: subway-buenosaires-m.svg;}
-node|z17[railway=subway_entrance][city=buenos_aires] {icon-image: subway-buenosaires-s.svg;}
-node|z18-[railway=subway_entrance][city=buenos_aires] {icon-image: subway-buenosaires-m.svg;}
+node|z17-[railway=station][transport=subway][city=buenos_aires] {icon-image: subway-buenosaires-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=buenos_aires] {icon-image: subway-buenosaires-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=buenos_aires] {icon-image: subway-buenosaires-m.svg;text-optional: true;}
 
 /* Bursaray Subway Station */
 node|z13[railway=station][transport=subway][city=bursa] {icon-image: subway-bursaray-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=bursa] {icon-image: subway-bursaray-s.svg;}
 node|z15-16[railway=station][transport=subway][city=bursa] {icon-image: subway-bursaray-m.svg;}
-node|z17-[railway=station][transport=subway][city=bursa] {icon-image: subway-bursaray-m.svg;}
-node|z17[railway=subway_entrance][city=bursa] {icon-image: subway-bursaray-s.svg;}
-node|z18-[railway=subway_entrance][city=bursa] {icon-image: subway-bursaray-m.svg;}
+node|z17-[railway=station][transport=subway][city=bursa] {icon-image: subway-bursaray-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=bursa] {icon-image: subway-bursaray-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=bursa] {icon-image: subway-bursaray-m.svg;text-optional: true;}
 
 /* Cairo Subway Station */
 node|z13[railway=station][transport=subway][city=cairo] {icon-image: subway-cairo-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=cairo] {icon-image: subway-cairo-s.svg;}
 node|z15-16[railway=station][transport=subway][city=cairo] {icon-image: subway-cairo-m.svg;}
-node|z17-[railway=station][transport=subway][city=cairo] {icon-image: subway-cairo-m.svg;}
-node|z17[railway=subway_entrance][city=cairo] {icon-image: subway-cairo-s.svg;}
-node|z18-[railway=subway_entrance][city=cairo] {icon-image: subway-cairo-m.svg;}
+node|z17-[railway=station][transport=subway][city=cairo] {icon-image: subway-cairo-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=cairo] {icon-image: subway-cairo-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=cairo] {icon-image: subway-cairo-m.svg;text-optional: true;}
 
 /* Caracas Subway Station */
 node|z13[railway=station][transport=subway][city=caracas] {icon-image: subway-caracas-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=caracas] {icon-image: subway-caracas-s.svg;}
 node|z15-16[railway=station][transport=subway][city=caracas] {icon-image: subway-caracas-m.svg;}
-node|z17-[railway=station][transport=subway][city=caracas] {icon-image: subway-caracas-m.svg;}
-node|z17[railway=subway_entrance][city=caracas] {icon-image: subway-caracas-s.svg;}
-node|z18-[railway=subway_entrance][city=caracas] {icon-image: subway-caracas-m.svg;}
+node|z17-[railway=station][transport=subway][city=caracas] {icon-image: subway-caracas-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=caracas] {icon-image: subway-caracas-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=caracas] {icon-image: subway-caracas-m.svg;text-optional: true;}
 
 /* Catania Subway Station */
 node|z13[railway=station][transport=subway][city=catania] {icon-image: subway-catania-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=catania] {icon-image: subway-catania-s.svg;}
 node|z15-16[railway=station][transport=subway][city=catania] {icon-image: subway-catania-m.svg;}
-node|z17-[railway=station][transport=subway][city=catania] {icon-image: subway-catania-m.svg;}
-node|z17[railway=subway_entrance][city=catania] {icon-image: subway-catania-s.svg;}
-node|z18-[railway=subway_entrance][city=catania] {icon-image: subway-catania-m.svg;}
+node|z17-[railway=station][transport=subway][city=catania] {icon-image: subway-catania-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=catania] {icon-image: subway-catania-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=catania] {icon-image: subway-catania-m.svg;text-optional: true;}
 
 /* Changchun Subway Station */
 node|z13[railway=station][transport=subway][city=changchun] {icon-image: subway-changchun-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=changchun] {icon-image: subway-changchun-s.svg;}
 node|z15-16[railway=station][transport=subway][city=changchun] {icon-image: subway-changchun-m.svg;}
-node|z17-[railway=station][transport=subway][city=changchun] {icon-image: subway-changchun-m.svg;}
-node|z17[railway=subway_entrance][city=changchun] {icon-image: subway-changchun-s.svg;}
-node|z18-[railway=subway_entrance][city=changchun] {icon-image: subway-changchun-m.svg;}
+node|z17-[railway=station][transport=subway][city=changchun] {icon-image: subway-changchun-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=changchun] {icon-image: subway-changchun-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=changchun] {icon-image: subway-changchun-m.svg;text-optional: true;}
 
 /* Chengdu Subway Station */
 node|z13[railway=station][transport=subway][city=chengdu] {icon-image: subway-chengdu-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=chengdu] {icon-image: subway-chengdu-s.svg;}
 node|z15-16[railway=station][transport=subway][city=chengdu] {icon-image: subway-chengdu-m.svg;}
-node|z17-[railway=station][transport=subway][city=chengdu] {icon-image: subway-chengdu-m.svg;}
-node|z17[railway=subway_entrance][city=chengdu] {icon-image: subway-chengdu-s.svg;}
-node|z18-[railway=subway_entrance][city=chengdu] {icon-image: subway-chengdu-m.svg;}
+node|z17-[railway=station][transport=subway][city=chengdu] {icon-image: subway-chengdu-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=chengdu] {icon-image: subway-chengdu-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=chengdu] {icon-image: subway-chengdu-m.svg;text-optional: true;}
 
 /* Chicago Subway Station */
 node|z13[railway=station][transport=subway][city=chicago] {icon-image: subway-chicago-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=chicago] {icon-image: subway-chicago-s.svg;}
 node|z15-16[railway=station][transport=subway][city=chicago] {icon-image: subway-chicago-m.svg;}
-node|z17-[railway=station][transport=subway][city=chicago] {icon-image: subway-chicago-m.svg;}
-node|z17[railway=subway_entrance][city=chicago] {icon-image: subway-chicago-s.svg;}
-node|z18-[railway=subway_entrance][city=chicago] {icon-image: subway-chicago-m.svg;}
+node|z17-[railway=station][transport=subway][city=chicago] {icon-image: subway-chicago-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=chicago] {icon-image: subway-chicago-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=chicago] {icon-image: subway-chicago-m.svg;text-optional: true;}
 
 /* Chongqing Subway Station */
 node|z13[railway=station][transport=subway][city=chongqing] {icon-image: subway-chongqing-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=chongqing] {icon-image: subway-chongqing-s.svg;}
 node|z15-16[railway=station][transport=subway][city=chongqing] {icon-image: subway-chongqing-m.svg;}
-node|z17-[railway=station][transport=subway][city=chongqing] {icon-image: subway-chongqing-m.svg;}
-node|z17[railway=subway_entrance][city=chongqing] {icon-image: subway-chongqing-s.svg;}
-node|z18-[railway=subway_entrance][city=chongqing] {icon-image: subway-chongqing-m.svg;}
+node|z17-[railway=station][transport=subway][city=chongqing] {icon-image: subway-chongqing-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=chongqing] {icon-image: subway-chongqing-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=chongqing] {icon-image: subway-chongqing-m.svg;text-optional: true;}
 
 /* Dalian Subway Station */
 node|z13[railway=station][transport=subway][city=dalian] {icon-image: subway-dalian-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=dalian] {icon-image: subway-dalian-s.svg;}
 node|z15-16[railway=station][transport=subway][city=dalian] {icon-image: subway-dalian-m.svg;}
-node|z17-[railway=station][transport=subway][city=dalian] {icon-image: subway-dalian-m.svg;}
-node|z17[railway=subway_entrance][city=dalian] {icon-image: subway-dalian-s.svg;}
-node|z18-[railway=subway_entrance][city=dalian] {icon-image: subway-dalian-m.svg;}
+node|z17-[railway=station][transport=subway][city=dalian] {icon-image: subway-dalian-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=dalian] {icon-image: subway-dalian-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=dalian] {icon-image: subway-dalian-m.svg;text-optional: true;}
 
 /* Delhi Subway Station */
 node|z13[railway=station][transport=subway][city=delhi] {icon-image: subway-delhi-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=delhi] {icon-image: subway-delhi-s.svg;}
 node|z15-16[railway=station][transport=subway][city=delhi] {icon-image: subway-delhi-m.svg;}
-node|z17-[railway=station][transport=subway][city=delhi] {icon-image: subway-delhi-m.svg;}
-node|z17[railway=subway_entrance][city=delhi] {icon-image: subway-delhi-s.svg;}
-node|z18-[railway=subway_entrance][city=delhi] {icon-image: subway-delhi-m.svg;}
+node|z17-[railway=station][transport=subway][city=delhi] {icon-image: subway-delhi-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=delhi] {icon-image: subway-delhi-s.svg;text-optional: true;
+node|z18-[railway=subway_entrance][city=delhi] {icon-image: subway-delhi-m.svg;text-optional: true;}
 
 /* Dnepro Subway Station */
 node|z13[railway=station][transport=subway][city=dnepro] {icon-image: subway-dnepro-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=dnepro] {icon-image: subway-dnepro-s.svg;}
 node|z15-16[railway=station][transport=subway][city=dnepro] {icon-image: subway-dnepro-m.svg;}
-node|z17-[railway=station][transport=subway][city=dnepro] {icon-image: subway-dnepro-m.svg;}
-node|z17[railway=subway_entrance][city=dnepro] {icon-image: subway-dnepro-s.svg;}
-node|z18-[railway=subway_entrance][city=dnepro] {icon-image: subway-dnepro-m.svg;}
+node|z17-[railway=station][transport=subway][city=dnepro] {icon-image: subway-dnepro-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=dnepro] {icon-image: subway-dnepro-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=dnepro] {icon-image: subway-dnepro-m.svg;text-optional: true;}
 
 /* Dubai Subway Station */
 node|z13[railway=station][transport=subway][city=dubai] {icon-image: subway-dubai-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=dubai] {icon-image: subway-dubai-s.svg;}
 node|z15-16[railway=station][transport=subway][city=dubai] {icon-image: subway-dubai-m.svg;}
-node|z17-[railway=station][transport=subway][city=dubai] {icon-image: subway-dubai-m.svg;}
-node|z17[railway=subway_entrance][city=dubai] {icon-image: subway-dubai-s.svg;}
-node|z18-[railway=subway_entrance][city=dubai] {icon-image: subway-dubai-m.svg;}
+node|z17-[railway=station][transport=subway][city=dubai] {icon-image: subway-dubai-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=dubai] {icon-image: subway-dubai-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=dubai] {icon-image: subway-dubai-m.svg;text-optional: true;}
 
 /* Ekaterinburg Subway Station */
 node|z13[railway=station][transport=subway][city=ekb] {icon-image: subway-ekb-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=ekb] {icon-image: subway-ekb-s.svg;}
 node|z15-16[railway=station][transport=subway][city=ekb] {icon-image: subway-ekb-m.svg;}
-node|z17-[railway=station][transport=subway][city=ekb] {icon-image: subway-ekb-m.svg;}
-node|z17[railway=subway_entrance][city=ekb] {icon-image: subway-ekb-s.svg;}
-node|z18-[railway=subway_entrance][city=ekb] {icon-image: subway-ekb-m.svg;}
+node|z17-[railway=station][transport=subway][city=ekb] {icon-image: subway-ekb-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=ekb] {icon-image: subway-ekb-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=ekb] {icon-image: subway-ekb-m.svg;text-optional: true;}
 
 /* Fukuoka Subway Station */
 node|z13[railway=station][transport=subway][city=fukuoka] {icon-image: subway-fukuoka-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=fukuoka] {icon-image: subway-fukuoka-s.svg;}
 node|z15-16[railway=station][transport=subway][city=fukuoka] {icon-image: subway-fukuoka-m.svg;}
-node|z17-[railway=station][transport=subway][city=fukuoka] {icon-image: subway-fukuoka-m.svg;}
-node|z17[railway=subway_entrance][city=fukuoka] {icon-image: subway-fukuoka-s.svg;}
-node|z18-[railway=subway_entrance][city=fukuoka] {icon-image: subway-fukuoka-m.svg;}
+node|z17-[railway=station][transport=subway][city=fukuoka] {icon-image: subway-fukuoka-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=fukuoka] {icon-image: subway-fukuoka-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=fukuoka] {icon-image: subway-fukuoka-m.svg;text-optional: true;}
 
 /* Glasgow Subway Station */
 node|z13[railway=station][transport=subway][city=glasgow] {icon-image: subway-glasgow-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=glasgow] {icon-image: subway-glasgow-s.svg;}
 node|z15-16[railway=station][transport=subway][city=glasgow] {icon-image: subway-glasgow-m.svg;}
-node|z17-[railway=station][transport=subway][city=glasgow] {icon-image: subway-glasgow-m.svg;}
-node|z17[railway=subway_entrance][city=glasgow] {icon-image: subway-glasgow-s.svg;}
-node|z18-[railway=subway_entrance][city=glasgow] {icon-image: subway-glasgow-m.svg;}
+node|z17-[railway=station][transport=subway][city=glasgow] {icon-image: subway-glasgow-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=glasgow] {icon-image: subway-glasgow-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=glasgow] {icon-image: subway-glasgow-m.svg;text-optional: true;}
 
 /* Guangzhou Subway Station */
 node|z13[railway=station][transport=subway][city=guangzhou] {icon-image: subway-guangzhou-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=guangzhou] {icon-image: subway-guangzhou-s.svg;}
 node|z15-16[railway=station][transport=subway][city=guangzhou] {icon-image: subway-guangzhou-m.svg;}
-node|z17-[railway=station][transport=subway][city=guangzhou] {icon-image: subway-guangzhou-m.svg;}
-node|z17[railway=subway_entrance][city=guangzhou] {icon-image: subway-guangzhou-s.svg;}
-node|z18-[railway=subway_entrance][city=guangzhou] {icon-image: subway-guangzhou-m.svg;}
+node|z17-[railway=station][transport=subway][city=guangzhou] {icon-image: subway-guangzhou-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=guangzhou] {icon-image: subway-guangzhou-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=guangzhou] {icon-image: subway-guangzhou-m.svg;text-optional: true;}
 
 /* Hamburg Subway Station */
 node|z13[railway=station][transport=subway][city=hamburg] {icon-image: subway-hamburg-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=hamburg] {icon-image: subway-hamburg-s.svg;}
 node|z15-16[railway=station][transport=subway][city=hamburg] {icon-image: subway-hamburg-m.svg;}
-node|z17-[railway=station][transport=subway][city=hamburg] {icon-image: subway-hamburg-m.svg;}
-node|z17[railway=subway_entrance][city=hamburg] {icon-image: subway-hamburg-s.svg;}
-node|z18-[railway=subway_entrance][city=hamburg] {icon-image: subway-hamburg-m.svg;}
+node|z17-[railway=station][transport=subway][city=hamburg] {icon-image: subway-hamburg-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=hamburg] {icon-image: subway-hamburg-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=hamburg] {icon-image: subway-hamburg-m.svg;text-optional: true;}
 
 /* Helsinki Subway Station */
 node|z13[railway=station][transport=subway][city=helsinki] {icon-image: subway-helsinki-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=helsinki] {icon-image: subway-helsinki-s.svg;}
 node|z15-16[railway=station][transport=subway][city=helsinki] {icon-image: subway-helsinki-m.svg;}
-node|z17-[railway=station][transport=subway][city=helsinki] {icon-image: subway-helsinki-m.svg;}
-node|z17[railway=subway_entrance][city=helsinki] {icon-image: subway-helsinki-s.svg;}
-node|z18-[railway=subway_entrance][city=helsinki] {icon-image: subway-helsinki-m.svg;}
+node|z17-[railway=station][transport=subway][city=helsinki] {icon-image: subway-helsinki-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=helsinki] {icon-image: subway-helsinki-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=helsinki] {icon-image: subway-helsinki-m.svg;text-optional: true;}
 
 /* Hirosima Subway Station */
 node|z13[railway=station][transport=subway][city=hiroshima] {icon-image: subway-hirosima-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=hiroshima] {icon-image: subway-hirosima-s.svg;}
 node|z15-16[railway=station][transport=subway][city=hiroshima] {icon-image: subway-hirosima-m.svg;}
-node|z17-[railway=station][transport=subway][city=hiroshima] {icon-image: subway-hirosima-m.svg;}
-node|z17[railway=subway_entrance][city=hiroshima] {icon-image: subway-hirosima-s.svg;}
-node|z18-[railway=subway_entrance][city=hiroshima] {icon-image: subway-hirosima-m.svg;}
+node|z17-[railway=station][transport=subway][city=hiroshima] {icon-image: subway-hirosima-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=hiroshima] {icon-image: subway-hirosima-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=hiroshima] {icon-image: subway-hirosima-m.svg;text-optional: true;}
 
 /* Isfahan Subway Station */
 node|z13[railway=station][transport=subway][city=isfahan] {icon-image: subway-isfahan-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=isfahan] {icon-image: subway-isfahan-s.svg;}
 node|z15-16[railway=station][transport=subway][city=isfahan] {icon-image: subway-isfahan-m.svg;}
-node|z17-[railway=station][transport=subway][city=isfahan] {icon-image: subway-isfahan-m.svg;}
-node|z17[railway=subway_entrance][city=isfahan] {icon-image: subway-isfahan-s.svg;}
-node|z18-[railway=subway_entrance][city=isfahan] {icon-image: subway-isfahan-m.svg;}
+node|z17-[railway=station][transport=subway][city=isfahan] {icon-image: subway-isfahan-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=isfahan] {icon-image: subway-isfahan-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=isfahan] {icon-image: subway-isfahan-m.svg;text-optional: true;}
 
 /* Istanbul Subway Station */
 node|z13[railway=station][transport=subway][city=istanbul] {icon-image: subway-istanbul-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=istanbul] {icon-image: subway-istanbul-s.svg;}
 node|z15-16[railway=station][transport=subway][city=istanbul] {icon-image: subway-istanbul-m.svg;}
-node|z17-[railway=station][transport=subway][city=istanbul] {icon-image: subway-istanbul-m.svg;}
-node|z17[railway=subway_entrance][city=istanbul] {icon-image: subway-istanbul-s.svg;}
-node|z18-[railway=subway_entrance][city=istanbul] {icon-image: subway-istanbul-m.svg;}
+node|z17-[railway=station][transport=subway][city=istanbul] {icon-image: subway-istanbul-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=istanbul] {icon-image: subway-istanbul-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=istanbul] {icon-image: subway-istanbul-m.svg;text-optional: true;}
 
 /* Izmir Subway Station */
 node|z13[railway=station][transport=subway][city=izmir] {icon-image: subway-izmir-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=izmir] {icon-image: subway-izmir-s.svg;}
 node|z15-16[railway=station][transport=subway][city=izmir] {icon-image: subway-izmir-m.svg;}
-node|z17-[railway=station][transport=subway][city=izmir] {icon-image: subway-izmir-m.svg;}
-node|z17[railway=subway_entrance][city=izmir] {icon-image: subway-izmir-s.svg;}
-node|z18-[railway=subway_entrance][city=izmir] {icon-image: subway-izmir-m.svg;}
+node|z17-[railway=station][transport=subway][city=izmir] {icon-image: subway-izmir-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=izmir] {icon-image: subway-izmir-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=izmir] {icon-image: subway-izmir-m.svg;text-optional: true;}
 
 /* Kazan Subway Station */
 node|z13[railway=station][transport=subway][city=kazan] {icon-image: subway-kazan-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=kazan] {icon-image: subway-kazan-s.svg;}
 node|z15-16[railway=station][transport=subway][city=kazan] {icon-image: subway-kazan-m.svg;}
-node|z17-[railway=station][transport=subway][city=kazan] {icon-image: subway-kazan-m.svg;}
-node|z17[railway=subway_entrance][city=kazan] {icon-image: subway-kazan-s.svg;}
-node|z18-[railway=subway_entrance][city=kazan] {icon-image: subway-kazan-m.svg;}
+node|z17-[railway=station][transport=subway][city=kazan] {icon-image: subway-kazan-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=kazan] {icon-image: subway-kazan-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=kazan] {icon-image: subway-kazan-m.svg;text-optional: true;}
 
 /* Kharkiv Subway Station */
 node|z13[railway=station][transport=subway][city=kharkiv] {icon-image: subway-kharkiv-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=kharkiv] {icon-image: subway-kharkiv-s.svg;}
 node|z15-16[railway=station][transport=subway][city=kharkiv] {icon-image: subway-kharkiv-m.svg;}
-node|z17-[railway=station][transport=subway][city=kharkiv] {icon-image: subway-kharkiv-m.svg;}
-node|z17[railway=subway_entrance][city=kharkiv] {icon-image: subway-kharkiv-s.svg;}
-node|z18-[railway=subway_entrance][city=kharkiv] {icon-image: subway-kharkiv-m.svg;}
+node|z17-[railway=station][transport=subway][city=kharkiv] {icon-image: subway-kharkiv-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=kharkiv] {icon-image: subway-kharkiv-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=kharkiv] {icon-image: subway-kharkiv-m.svg;text-optional: true;}
 
 /* Kiev Subway Station */
 node|z13[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-s.svg;text-offset: 1;font-size: 10;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-s.svg;}
 node|z15-16[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-m.svg;}
-node|z17-[railway=station][transport=subway][city=kiev] {icon-image: zero-icon.svg;font-size: 10;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/
-node|z17-[railway=subway_entrance][city=kiev] {icon-image: subway-kiev-m.svg;font-size: 13;}
+node|z17-[railway=station][transport=subway][city=kiev] {icon-image: zero-icon.svg;font-size: 10;text: name;text-color: @district_label;text-halo-radius: 0;text-optional: true;}/*check none*/
+node|z17-[railway=subway_entrance][city=kiev] {icon-image: subway-kiev-m.svg;font-size: 13;text-optional: true;}
 
 /* Kobe Subway Station */
 node|z13[railway=station][transport=subway][city=kobe] {icon-image: subway-kobe-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=kobe] {icon-image: subway-kobe-s.svg;}
 node|z15-16[railway=station][transport=subway][city=kobe] {icon-image: subway-kobe-m.svg;}
-node|z17-[railway=station][transport=subway][city=kobe] {icon-image: subway-kobe-m.svg;}
-node|z17[railway=subway_entrance][city=kobe] {icon-image: subway-kobe-s.svg;}
-node|z18-[railway=subway_entrance][city=kobe] {icon-image: subway-kobe-m.svg;}
+node|z17-[railway=station][transport=subway][city=kobe] {icon-image: subway-kobe-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=kobe] {icon-image: subway-kobe-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=kobe] {icon-image: subway-kobe-m.svg;text-optional: true;}
 
 /* Kolkata Subway Station */
 node|z13[railway=station][transport=subway][city=kolkata] {icon-image: subway-kolkata-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=kolkata] {icon-image: subway-kolkata-s.svg;}
 node|z15-16[railway=station][transport=subway][city=kolkata] {icon-image: subway-kolkata-m.svg;}
-node|z17-[railway=station][transport=subway][city=kolkata] {icon-image: subway-kolkata-m.svg;}
-node|z17[railway=subway_entrance][city=kolkata] {icon-image: subway-kolkata-s.svg;}
-node|z18-[railway=subway_entrance][city=kolkata] {icon-image: subway-kolkata-m.svg;}
+node|z17-[railway=station][transport=subway][city=kolkata] {icon-image: subway-kolkata-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=kolkata] {icon-image: subway-kolkata-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=kolkata] {icon-image: subway-kolkata-m.svg;text-optional: true;}
 
 /* Kunming Subway Station */
 node|z13[railway=station][transport=subway][city=kunming] {icon-image: subway-kunming-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=kunming] {icon-image: subway-kunming-s.svg;}
 node|z15-16[railway=station][transport=subway][city=kunming] {icon-image: subway-kunming-m.svg;}
-node|z17-[railway=station][transport=subway][city=kunming] {icon-image: subway-kunming-m.svg;}
-node|z17[railway=subway_entrance][city=kunming] {icon-image: subway-kunming-s.svg;}
-node|z18-[railway=subway_entrance][city=kunming] {icon-image: subway-kunming-m.svg;}
+node|z17-[railway=station][transport=subway][city=kunming] {icon-image: subway-kunming-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=kunming] {icon-image: subway-kunming-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=kunming] {icon-image: subway-kunming-m.svg;text-optional: true;}
 
 /* Kyoto Subway Station */
 node|z13[railway=station][transport=subway][city=kyoto] {icon-image: subway-kyoto-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=kyoto] {icon-image: subway-kyoto-s.svg;}
 node|z15-16[railway=station][transport=subway][city=kyoto] {icon-image: subway-kyoto-m.svg;}
-node|z17-[railway=station][transport=subway][city=kyoto] {icon-image: subway-kyoto-m.svg;}
-node|z17[railway=subway_entrance][city=kyoto] {icon-image: subway-kyoto-s.svg;}
-node|z18-[railway=subway_entrance][city=kyoto] {icon-image: subway-kyoto-m.svg;}
+node|z17-[railway=station][transport=subway][city=kyoto] {icon-image: subway-kyoto-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=kyoto] {icon-image: subway-kyoto-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=kyoto] {icon-image: subway-kyoto-m.svg;text-optional: true;}
 
 /* Lausanne Subway Station */
 node|z13[railway=station][transport=subway][city=lausanne] {icon-image: subway-lausanne-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=lausanne] {icon-image: subway-lausanne-s.svg;}
 node|z15-16[railway=station][transport=subway][city=lausanne] {icon-image: subway-lausanne-m.svg;}
-node|z17-[railway=station][transport=subway][city=lausanne] {icon-image: subway-lausanne-m.svg;}
-node|z17[railway=subway_entrance][city=lausanne] {icon-image: subway-lausanne-s.svg;}
-node|z18-[railway=subway_entrance][city=lausanne] {icon-image: subway-lausanne-m.svg;}
+node|z17-[railway=station][transport=subway][city=lausanne] {icon-image: subway-lausanne-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=lausanne] {icon-image: subway-lausanne-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=lausanne] {icon-image: subway-lausanne-m.svg;text-optional: true;}
 
 /* Lille Subway Station */
 node|z13[railway=station][transport=subway][city=lille] {icon-image: subway-lille-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=lille] {icon-image: subway-lille-s.svg;}
 node|z15-16[railway=station][transport=subway][city=lille] {icon-image: subway-lille-m.svg;}
-node|z17-[railway=station][transport=subway][city=lille] {icon-image: subway-lille-m.svg;}
-node|z17[railway=subway_entrance][city=lille] {icon-image: subway-lille-s.svg;}
-node|z18-[railway=subway_entrance][city=lille] {icon-image: subway-lille-m.svg;}
+node|z17-[railway=station][transport=subway][city=lille] {icon-image: subway-lille-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=lille] {icon-image: subway-lille-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=lille] {icon-image: subway-lille-m.svg;text-optional: true;}
 
 /* Lima Subway Station */
 node|z13[railway=station][transport=subway][city=lima] {icon-image: subway-lima-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=lima] {icon-image: subway-lima-s.svg;}
 node|z15-16[railway=station][transport=subway][city=lima] {icon-image: subway-lima-m.svg;}
-node|z17-[railway=station][transport=subway][city=lima] {icon-image: subway-lima-m.svg;}
-node|z17[railway=subway_entrance][city=lima] {icon-image: subway-lima-s.svg;}
-node|z18-[railway=subway_entrance][city=lima] {icon-image: subway-lima-m.svg;}
+node|z17-[railway=station][transport=subway][city=lima] {icon-image: subway-lima-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=lima] {icon-image: subway-lima-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=lima] {icon-image: subway-lima-m.svg;text-optional: true;}
 
 /* Lisboa Subway Station */
 node|z13[railway=station][transport=subway][city=lisboa] {icon-image: subway-lisboa-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=lisboa] {icon-image: subway-lisboa-s.svg;}
 node|z15-16[railway=station][transport=subway][city=lisboa] {icon-image: subway-lisboa-m.svg;}
-node|z17-[railway=station][transport=subway][city=lisboa] {icon-image: subway-lisboa-m.svg;}
-node|z17[railway=subway_entrance][city=lisboa] {icon-image: subway-lisboa-s.svg;}
-node|z18-[railway=subway_entrance][city=lisboa] {icon-image: subway-lisboa-m.svg;}
+node|z17-[railway=station][transport=subway][city=lisboa] {icon-image: subway-lisboa-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=lisboa] {icon-image: subway-lisboa-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=lisboa] {icon-image: subway-lisboa-m.svg;text-optional: true;}
 
 /* Lisbon Subway Station */
 node|z13[railway=station][transport=subway][city=lisbon] {icon-image: subway-lisboa-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=lisbon] {icon-image: subway-lisboa-s.svg;}
 node|z15-16[railway=station][transport=subway][city=lisbon] {icon-image: subway-lisboa-m.svg;}
-node|z17-[railway=station][transport=subway][city=lisbon] {icon-image: subway-lisboa-m.svg;}
-node|z17[railway=subway_entrance][city=lisbon] {icon-image: subway-lisboa-s.svg;}
+node|z17-[railway=station][transport=subway][city=lisbon] {icon-image: subway-lisboa-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=lisbon] {icon-image: subway-lisboa-s.svg;text-optional: true;text-optional: true;}
 node|z18-[railway=subway_entrance][city=lisbon] {icon-image: subway-lisboa-m.svg;}
 
 /* London Subway Station */
 node|z13[railway=station][transport=subway][city=london] {icon-image: subway-london-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=london] {icon-image: subway-london-s.svg;}
 node|z15-16[railway=station][transport=subway][city=london] {icon-image: subway-london-m.svg;}
-node|z17-[railway=station][transport=subway][city=london] {icon-image: subway-london-m.svg;}
-node|z17[railway=subway_entrance][city=london] {icon-image: subway-london-s.svg;}
-node|z18-[railway=subway_entrance][city=london] {icon-image: subway-london-m.svg;}
+node|z17-[railway=station][transport=subway][city=london] {icon-image: subway-london-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=london] {icon-image: subway-london-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=london] {icon-image: subway-london-m.svg;text-optional: true;}
 
 /* Los Angeles Subway Station */
 node|z13[railway=station][transport=subway][city=la] {icon-image: subway-losangeles-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=la] {icon-image: subway-losangeles-s.svg;}
 node|z15-16[railway=station][transport=subway][city=la] {icon-image: subway-losangeles-m.svg;}
-node|z17-[railway=station][transport=subway][city=la] {icon-image: subway-losangeles-m.svg;}
-node|z17[railway=subway_entrance][city=la] {icon-image: subway-losangeles-s.svg;}
-node|z18-[railway=subway_entrance][city=la] {icon-image: subway-losangeles-m.svg;}
+node|z17-[railway=station][transport=subway][city=la] {icon-image: subway-losangeles-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=la] {icon-image: subway-losangeles-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=la] {icon-image: subway-losangeles-m.svg;text-optional: true;}
 
 /* Lyon Subway Station */
 node|z13[railway=station][transport=subway][city=lyon] {icon-image: subway-lyon-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=lyon] {icon-image: subway-lyon-s.svg;}
 node|z15-16[railway=station][transport=subway][city=lyon] {icon-image: subway-lyon-m.svg;}
-node|z17-[railway=station][transport=subway][city=lyon] {icon-image: subway-lyon-m.svg;}
-node|z17[railway=subway_entrance][city=lyon] {icon-image: subway-lyon-s.svg;}
-node|z18-[railway=subway_entrance][city=lyon] {icon-image: subway-lyon-m.svg;}
+node|z17-[railway=station][transport=subway][city=lyon] {icon-image: subway-lyon-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=lyon] {icon-image: subway-lyon-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=lyon] {icon-image: subway-lyon-m.svg;text-optional: true;}
 
 /* Madrid Subway Station */
 node|z13[railway=station][transport=subway][city=madrid] {icon-image: subway-madrid-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=madrid] {icon-image: subway-madrid-s.svg;}
 node|z15-16[railway=station][transport=subway][city=madrid] {icon-image: subway-madrid-m.svg;}
-node|z17-[railway=station][transport=subway][city=madrid] {icon-image: subway-madrid-m.svg;}
-node|z17[railway=subway_entrance][city=madrid] {icon-image: subway-madrid-s.svg;}
-node|z18-[railway=subway_entrance][city=madrid] {icon-image: subway-madrid-m.svg;}
+node|z17-[railway=station][transport=subway][city=madrid] {icon-image: subway-madrid-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=madrid] {icon-image: subway-madrid-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=madrid] {icon-image: subway-madrid-m.svg;text-optional: true;}
 
 /* Malaga Subway Station */
 node|z13[railway=station][transport=subway][city=malaga] {icon-image: subway-malaga-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=malaga] {icon-image: subway-malaga-s.svg;}
 node|z15-16[railway=station][transport=subway][city=malaga] {icon-image: subway-malaga-m.svg;}
-node|z17-[railway=station][transport=subway][city=malaga] {icon-image: subway-malaga-m.svg;}
-node|z17[railway=subway_entrance][city=malaga] {icon-image: subway-malaga-s.svg;}
-node|z18-[railway=subway_entrance][city=malaga] {icon-image: subway-malaga-m.svg;}
+node|z17-[railway=station][transport=subway][city=malaga] {icon-image: subway-malaga-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=malaga] {icon-image: subway-malaga-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=malaga] {icon-image: subway-malaga-m.svg;text-optional: true;}
 
 /* Manila Subway Station */
 node|z13[railway=station][transport=subway][city=manila] {icon-image: subway-manila-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=manila] {icon-image: subway-manila-s.svg;}
 node|z15-16[railway=station][transport=subway][city=manila] {icon-image: subway-manila-m.svg;}
-node|z17-[railway=station][transport=subway][city=manila] {icon-image: subway-manila-m.svg;}
-node|z17[railway=subway_entrance][city=manila] {icon-image: subway-manila-s.svg;}
-node|z18-[railway=subway_entrance][city=manila] {icon-image: subway-manila-m.svg;}
+node|z17-[railway=station][transport=subway][city=manila] {icon-image: subway-manila-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=manila] {icon-image: subway-manila-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=manila] {icon-image: subway-manila-m.svg;text-optional: true;}
 
 /* Maracaibo Subway Station */
 node|z13[railway=station][transport=subway][city=maracaibo] {icon-image: subway-maracaibo-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=maracaibo] {icon-image: subway-maracaibo-s.svg;}
 node|z15-16[railway=station][transport=subway][city=maracaibo] {icon-image: subway-maracaibo-m.svg;}
-node|z17-[railway=station][transport=subway][city=maracaibo] {icon-image: subway-maracaibo-m.svg;}
-node|z17[railway=subway_entrance][city=maracaibo] {icon-image: subway-maracaibo-s.svg;}
-node|z18-[railway=subway_entrance][city=maracaibo] {icon-image: subway-maracaibo-m.svg;}
+node|z17-[railway=station][transport=subway][city=maracaibo] {icon-image: subway-maracaibo-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=maracaibo] {icon-image: subway-maracaibo-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=maracaibo] {icon-image: subway-maracaibo-m.svg;text-optional: true;}
 
 /* Mashhad Subway Station */
 node|z13[railway=station][transport=subway][city=mashhad] {icon-image: subway-mashhad-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=mashhad] {icon-image: subway-mashhad-s.svg;}
 node|z15-16[railway=station][transport=subway][city=mashhad] {icon-image: subway-mashhad-m.svg;}
-node|z17-[railway=station][transport=subway][city=mashhad] {icon-image: subway-mashhad-m.svg;}
-node|z17[railway=subway_entrance][city=mashhad] {icon-image: subway-mashhad-s.svg;}
-node|z18-[railway=subway_entrance][city=mashhad] {icon-image: subway-mashhad-m.svg;}
+node|z17-[railway=station][transport=subway][city=mashhad] {icon-image: subway-mashhad-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=mashhad] {icon-image: subway-mashhad-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=mashhad] {icon-image: subway-mashhad-m.svg;text-optional: true;}
 
 /* Mecca Subway Station */
 node|z13[railway=station][transport=subway][city=mecca] {icon-image: subway-mecca-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=mecca] {icon-image: subway-mecca-s.svg;}
 node|z15-16[railway=station][transport=subway][city=mecca] {icon-image: subway-mecca-m.svg;}
-node|z17-[railway=station][transport=subway][city=mecca] {icon-image: subway-mecca-m.svg;}
-node|z17[railway=subway_entrance][city=mecca] {icon-image: subway-mecca-s.svg;}
-node|z18-[railway=subway_entrance][city=mecca] {icon-image: subway-mecca-m.svg;}
+node|z17-[railway=station][transport=subway][city=mecca] {icon-image: subway-mecca-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=mecca] {icon-image: subway-mecca-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=mecca] {icon-image: subway-mecca-m.svg;text-optional: true;}
 
 /* Medellin Subway Station */
 node|z13[railway=station][transport=subway][city=medellin] {icon-image: subway-medellin-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=medellin] {icon-image: subway-medellin-s.svg;}
 node|z15-16[railway=station][transport=subway][city=medellin] {icon-image: subway-medellin-m.svg;}
-node|z17-[railway=station][transport=subway][city=medellin] {icon-image: subway-medellin-m.svg;}
-node|z17[railway=subway_entrance][city=medellin] {icon-image: subway-medellin-s.svg;}
-node|z18-[railway=subway_entrance][city=medellin] {icon-image: subway-medellin-m.svg;}
+node|z17-[railway=station][transport=subway][city=medellin] {icon-image: subway-medellin-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=medellin] {icon-image: subway-medellin-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=medellin] {icon-image: subway-medellin-m.svg;text-optional: true;}
 
 /* Mexico Subway Station */
 node|z13[railway=station][transport=subway][city=mexico] {icon-image: subway-mexico-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=mexico] {icon-image: subway-mexico-s.svg;}
 node|z15-16[railway=station][transport=subway][city=mexico] {icon-image: subway-mexico-m.svg;}
-node|z17-[railway=station][transport=subway][city=mexico] {icon-image: subway-mexico-m.svg;}
-node|z17[railway=subway_entrance][city=mexico] {icon-image: subway-mexico-s.svg;}
-node|z18-[railway=subway_entrance][city=mexico] {icon-image: subway-mexico-m.svg;}
+node|z17-[railway=station][transport=subway][city=mexico] {icon-image: subway-mexico-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=mexico] {icon-image: subway-mexico-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=mexico] {icon-image: subway-mexico-m.svg;text-optional: true;}
 
 /* Milan Subway Station */
 node|z13[railway=station][transport=subway][city=milan] {icon-image: subway-milan-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=milan] {icon-image: subway-milan-s.svg;}
 node|z15-16[railway=station][transport=subway][city=milan] {icon-image: subway-milan-m.svg;}
-node|z17-[railway=station][transport=subway][city=milan] {icon-image: subway-milan-m.svg;}
-node|z17[railway=subway_entrance][city=milan] {icon-image: subway-milan-s.svg;}
-node|z18-[railway=subway_entrance][city=milan] {icon-image: subway-milan-m.svg;}
+node|z17-[railway=station][transport=subway][city=milan] {icon-image: subway-milan-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=milan] {icon-image: subway-milan-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=milan] {icon-image: subway-milan-m.svg;text-optional: true;}
 
 /* Minsk Subway Station */
 node|z13[railway=station][transport=subway][city=minsk] {icon-image: subway-minsk-s.svg;text-offset: 1;font-size: 10;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=minsk] {icon-image: subway-minsk-s.svg;text-offset: 1;}
 node|z15[railway=station][transport=subway][city=minsk] {icon-image: subway-minsk-m.svg;text-offset: 1;}
 node|z16[railway=station][transport=subway][city=minsk] {icon-image: zero-icon.svg;font-size: 10;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/
-node|z17-[railway=station][transport=subway][city=minsk] {icon-image: zero-icon.svg;font-size: 10;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/
-node|z17-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-m.svg;text-offset: 1;font-size: 12;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;}
-node|z17[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-m.svg;font-size: 13;}
-node|z18-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-m.svg;font-size: 13;}
+node|z17-[railway=station][transport=subway][city=minsk] {icon-image: zero-icon.svg;font-size: 10;text: name;text-color: @district_label;text-halo-radius: 0;text-optional: true;}/*check none*/
+node|z17-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-m.svg;text-offset: 1;font-size: 12;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;text-optional: true;}
+node|z17[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-m.svg;font-size: 13;text-optional: true;}
+node|z18-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-m.svg;font-size: 13;text-optional: true;}
 
 /* Moscow Subway Station */
 node|z11[railway=station][transport=subway][city=moscow]
-{icon-image: subway-moscow-s.svg;icon-min-distance: 1;}
+{icon-image: subway-moscow-s.svg;icon-min-distance: 1;text-optional: true;}
 node|z12-13[railway=station][transport=subway][city=moscow]
-{icon-image: subway-moscow-s.svg;text-offset: 1;font-size: 10;text-halo-opacity: 0.7;icon-min-distance: 1;}
+{icon-image: subway-moscow-s.svg;text-offset: 1;font-size: 10;text-halo-opacity: 0.7;icon-min-distance: 1;text-optional: true;}
 node|z12-13[railway=station][transport=subway][city=moscow]::int_name
-{text-offset: 1;font-size: 9;text-halo-opacity: 0.7;}
+{text-offset: 1;font-size: 9;text-halo-opacity: 0.7;text-optional: true;}
 node|z14[railway=station][transport=subway][city=moscow]
-{icon-image: subway-moscow-s.svg;text-offset: 1;font-size: 11;}
+{icon-image: subway-moscow-s.svg;text-offset: 1;font-size: 11;text-optional: true;}
 node|z14[railway=station][transport=subway][city=moscow]::int_name
 {text-offset: 1;font-size: 9;}
 node|z15[railway=station][transport=subway][city=moscow]
-{icon-image: subway-moscow-m.svg;text-offset: 1;font-size: 12;}
+{icon-image: subway-moscow-m.svg;text-offset: 1;font-size: 12;text-optional: true;}
 node|z15[railway=station][transport=subway][city=moscow]::int_name
-{text-offset: 1;font-size: 10;}
+{text-offset: 1;font-size: 10;text-optional: true;}
+node|z16-[railway=station][transport=subway][city=moscow]
+{icon-image: zero-icon.svg;text: none;}
+node|z16-[railway=station][transport=subway][city=moscow]::int_name
+{text: none;}
+
 
 /*
 node[railway=station][transport=subway][city=moscow]check
@@ -554,189 +559,189 @@ node[railway=station][transport=subway][city=moscow]::int_name
 
 /* Moscow Subway Station entrance */
 node|z16[railway=subway_entrance][city=moscow]
-{icon-image: subway-moscow-m.svg;text-offset: 1;font-size: 12;}
+{icon-image: subway-moscow-m.svg;text-offset: 1;font-size: 12;text-optional: true;}
 node|z16[railway=subway_entrance][city=moscow]::int_name
-{text-offset: 25;font-size: 10;}
+{text-offset: 25;font-size: 10;text-optional: true;}
 node|z17[railway=subway_entrance][city=moscow]
-{icon-image: subway-moscow-m.svg;text-offset: 1;font-size: 12;}
+{icon-image: subway-moscow-m.svg;text-offset: 1;font-size: 12;text-optional: true;}
 node|z17[railway=subway_entrance][city=moscow]::int_name
-{text-offset: 25;font-size: 11;}
+{text-offset: 25;font-size: 11;text-optional: true;text-optional: true;}
 node|z18-[railway=subway_entrance][city=moscow]
-{icon-image: subway-moscow-m.svg;text-offset: 1;font-size: 13;}
+{icon-image: subway-moscow-m.svg;text-offset: 1;font-size: 13;text-optional: true;}
 node|z18-[railway=subway_entrance][city=moscow]::int_name
-{text-offset: 25;font-size: 11;}
+{text-offset: 25;font-size: 11;text-optional: true;}
 
 /* Montreal Subway Station */
 node|z13[railway=station][transport=subway][city=montreal] {icon-image: subway-montreal-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=montreal] {icon-image: subway-montreal-s.svg;}
 node|z15-16[railway=station][transport=subway][city=montreal] {icon-image: subway-montreal-m.svg;}
-node|z17-[railway=station][transport=subway][city=montreal] {icon-image: subway-montreal-m.svg;}
-node|z17[railway=subway_entrance][city=montreal] {icon-image: subway-montreal-s.svg;}
-node|z18-[railway=subway_entrance][city=montreal] {icon-image: subway-montreal-m.svg;}
+node|z17-[railway=station][transport=subway][city=montreal] {icon-image: subway-montreal-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=montreal] {icon-image: subway-montreal-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=montreal] {icon-image: subway-montreal-m.svg;text-optional: true;}
 
 /* Munchen Subway Station */
 node|z13[railway=station][transport=subway][city=munchen] {icon-image: subway-munchen-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=munchen] {icon-image: subway-munchen-s.svg;}
 node|z15-16[railway=station][transport=subway][city=munchen] {icon-image: subway-munchen-m.svg;}
-node|z17-[railway=station][transport=subway][city=munchen] {icon-image: subway-munchen-m.svg;}
-node|z17[railway=subway_entrance][city=munchen] {icon-image: subway-munchen-s.svg;}
-node|z18-[railway=subway_entrance][city=munchen] {icon-image: subway-munchen-m.svg;}
+node|z17-[railway=station][transport=subway][city=munchen] {icon-image: subway-munchen-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=munchen] {icon-image: subway-munchen-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=munchen] {icon-image: subway-munchen-m.svg;text-optional: true;}
 
 /* Nagoya Subway Station */
 node|z13[railway=station][transport=subway][city=nagoya] {icon-image: subway-nagoya-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=nagoya] {icon-image: subway-nagoya-s.svg;}
 node|z15-16[railway=station][transport=subway][city=nagoya] {icon-image: subway-nagoya-m.svg;}
-node|z17-[railway=station][transport=subway][city=nagoya] {icon-image: subway-nagoya-m.svg;}
-node|z17[railway=subway_entrance][city=nagoya] {icon-image: subway-nagoya-s.svg;}
-node|z18-[railway=subway_entrance][city=nagoya] {icon-image: subway-nagoya-m.svg;}
+node|z17-[railway=station][transport=subway][city=nagoya] {icon-image: subway-nagoya-m.svg;text-optional: true;}
+node|z17[railway=subway_entrance][city=nagoya] {icon-image: subway-nagoya-s.svg;text-optional: true;}
+node|z18-[railway=subway_entrance][city=nagoya] {icon-image: subway-nagoya-m.svg;text-optional: true;}
 
 /* New York Subway Station */
 node|z13[railway=station][transport=subway][city=newyork] {icon-image: subway-newyork-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=newyork] {icon-image: subway-newyork-s.svg;}
 node|z15-[railway=station][transport=subway][city=newyork] {icon-image: subway-newyork-m.svg;}
-node|z17-[railway=subway_entrance][city=newyork] {icon-image: subway-newyork-s.svg;}
+node|z17-[railway=subway_entrance][city=newyork] {icon-image: subway-newyork-s.svg;text-optional: true;}
 
 /* Nizhniy Novgorod Subway Station */
 node|z13[railway=station][transport=subway][city=nnov] {icon-image: subway-nnov-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=nnov] {icon-image: subway-nnov-s.svg;}
 node|z15-[railway=station][transport=subway][city=nnov] {icon-image: subway-nnov-m.svg;}
-node|z17-[railway=subway_entrance][city=nnov] {icon-image: subway-nnov-s.svg;}
+node|z17-[railway=subway_entrance][city=nnov] {icon-image: subway-nnov-s.svg;text-optional: true;}
 
 /* Novosibirsk Subway Station */
 node|z13[railway=station][transport=subway][city=novosibirsk] {icon-image: subway-novosibirsk-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=novosibirsk] {icon-image: subway-novosibirsk-s.svg;}
 node|z15-[railway=station][transport=subway][city=novosibirsk] {icon-image: subway-novosibirsk-m.svg;}
-node|z17-[railway=subway_entrance][city=novosibirsk] {icon-image: subway-novosibirsk-s.svg;}
+node|z17-[railway=subway_entrance][city=novosibirsk] {icon-image: subway-novosibirsk-s.svg;text-optional: true;}
 
 /* Osaka Subway Station */
 node|z13[railway=station][transport=subway][city=osaka] {icon-image: subway-osaka-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=osaka] {icon-image: subway-osaka-s.svg;}
 node|z15-[railway=station][transport=subway][city=osaka] {icon-image: subway-osaka-m.svg;}
-node|z17-[railway=subway_entrance][city=osaka] {icon-image: subway-osaka-s.svg;}
+node|z17-[railway=subway_entrance][city=osaka] {icon-image: subway-osaka-s.svg;text-optional: true;}
 
 /* Oslo Subway Station */
 node|z13[railway=station][transport=subway][city=oslo] {icon-image: subway-oslo-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=oslo] {icon-image: subway-oslo-s.svg;}
 node|z15-[railway=station][transport=subway][city=oslo] {icon-image: subway-oslo-m.svg;}
-node|z17-[railway=subway_entrance][city=oslo] {icon-image: subway-oslo-s.svg;}
+node|z17-[railway=subway_entrance][city=oslo] {icon-image: subway-oslo-s.svg;text-optional: true;}
 
 /* Palma Subway Station */
 node|z13[railway=station][transport=subway][city=palma] {icon-image: subway-palma-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=palma] {icon-image: subway-palma-s.svg;}
 node|z15-[railway=station][transport=subway][city=palma] {icon-image: subway-palma-m.svg;}
-node|z17-[railway=subway_entrance][city=palma] {icon-image: subway-palma-s.svg;}
+node|z17-[railway=subway_entrance][city=palma] {icon-image: subway-palma-s.svg;text-optional: true;}
 
 /* Panama Subway Station */
 node|z13[railway=station][transport=subway][city=panama] {icon-image: subway-panama-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=panama] {icon-image: subway-panama-s.svg;}
 node|z15-[railway=station][transport=subway][city=panama] {icon-image: subway-panama-m.svg;}
-node|z17-[railway=subway_entrance][city=panama] {icon-image: subway-panama-s.svg;}
+node|z17-[railway=subway_entrance][city=panama] {icon-image: subway-panama-s.svg;text-optional: true;}
 
 /* Paris Subway Station */
 node|z13[railway=station][transport=subway][city=paris] {icon-image: subway-paris-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=paris] {icon-image: subway-paris-s.svg;}
 node|z15-16[railway=station][transport=subway][city=paris] {icon-image: subway-paris-m.svg;}
-node|z17-[railway=station][transport=subway][city=paris] {icon-image: subway-paris-m.svg;}
-node|z17-[railway=subway_entrance][city=paris] {icon-image: subway-paris-s.svg;}
+node|z17-[railway=station][transport=subway][city=paris] {icon-image: subway-paris-m.svg;text-optional: true;}
+node|z17-[railway=subway_entrance][city=paris] {icon-image: subway-paris-s.svg;text-optional: true;}
 
 /* Philadelphia Subway Station */
 node|z13[railway=station][transport=subway][city=philadelphia] {icon-image: subway-philadelphia-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=philadelphia] {icon-image: subway-philadelphia-s.svg;}
 node|z15-[railway=station][transport=subway][city=philadelphia] {icon-image: subway-philadelphia-m.svg;}
-node|z17-[railway=subway_entrance][city=philadelphia] {icon-image: subway-philadelphia-s.svg;}
+node|z17-[railway=subway_entrance][city=philadelphia] {icon-image: subway-philadelphia-s.svg;text-optional: true;}
 
 /* Pyongyang Subway Station */
 node|z13[railway=station][transport=subway][city=pyongyang] {icon-image: subway-pyongyang-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=pyongyang] {icon-image: subway-pyongyang-s.svg;}
 node|z15-[railway=station][transport=subway][city=pyongyang] {icon-image: subway-pyongyang-m.svg;}
-node|z17-[railway=subway_entrance][city=pyongyang] {icon-image: subway-pyongyang-s.svg;}
+node|z17-[railway=subway_entrance][city=pyongyang] {icon-image: subway-pyongyang-s.svg;text-optional: true;}
 
 /* Rennes Subway Station */
 node|z13[railway=station][transport=subway][city=rennes] {icon-image: subway-rennes-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=rennes] {icon-image: subway-rennes-s.svg;}
 node|z15-[railway=station][transport=subway][city=rennes] {icon-image: subway-rennes-m.svg;}
-node|z17-[railway=subway_entrance][city=rennes] {icon-image: subway-rennes-s.svg;}
+node|z17-[railway=subway_entrance][city=rennes] {icon-image: subway-rennes-s.svg;text-optional: true;}
 
 /* Rio De Janeiro Subway Station */
 node|z13[railway=station][transport=subway][city=rio] {icon-image: subway-riodejaneiro-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=rio] {icon-image: subway-riodejaneiro-s.svg;}
 node|z15-[railway=station][transport=subway][city=rio] {icon-image: subway-riodejaneiro-m.svg;}
-node|z17-[railway=subway_entrance][city=rio] {icon-image: subway-riodejaneiro-s.svg;}
+node|z17-[railway=subway_entrance][city=rio] {icon-image: subway-riodejaneiro-s.svg;text-optional: true;}
 
 /* Roma Subway Station */
 node|z13[railway=station][transport=subway][city=roma] {icon-image: subway-rome-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=roma] {icon-image: subway-rome-s.svg;}
 node|z15[railway=station][transport=subway][city=roma] {icon-image: subway-rome-m.svg;}
 node|z16[railway=station][transport=subway][city=roma] {icon-image: subway-rome-m.svg;}
-node|z17-[railway=station][transport=subway][city=roma] {icon-image: zero-icon.svg;text: name;text-color: @district_label;text-halo-radius: 0;}
-node|z17-[railway=subway_entrance][city=roma] {icon-image: subway-rome-m.svg;}
+node|z17-[railway=station][transport=subway][city=roma] {icon-image: zero-icon.svg;text: name;text-color: @district_label;text-halo-radius: 0;text-optional: true;}
+node|z17-[railway=subway_entrance][city=roma] {icon-image: subway-rome-m.svg;text-optional: true;}
 
 /* Rotterdam Subway Station */
 node|z13[railway=station][transport=subway][city=rotterdam] {icon-image: subway-rotterdam-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=rotterdam] {icon-image: subway-rotterdam-s.svg;}
 node|z15-[railway=station][transport=subway][city=rotterdam] {icon-image: subway-rotterdam-m.svg;}
-node|z17-[railway=subway_entrance][city=rotterdam] {icon-image: subway-rotterdam-s.svg;}
+node|z17-[railway=subway_entrance][city=rotterdam] {icon-image: subway-rotterdam-s.svg;text-optional: true;}
 
 /* Samara Subway Station */
 node|z13[railway=station][transport=subway][city=samara] {icon-image: subway-samara-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=samara] {icon-image: subway-samara-s.svg;}
 node|z15-[railway=station][transport=subway][city=samara] {icon-image: subway-samara-m.svg;}
-node|z17-[railway=subway_entrance][city=samara] {icon-image: subway-samara-s.svg;}
+node|z17-[railway=subway_entrance][city=samara] {icon-image: subway-samara-s.svg;text-optional: true;}
 
 /* San Francisco Subway Station */
 node|z13[railway=station][transport=subway][city=sf] {icon-image: subway-sanfrancisco-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=sf] {icon-image: subway-sanfrancisco-s.svg;}
 node|z15-[railway=station][transport=subway][city=sf] {icon-image: subway-sanfrancisco-m.svg;}
-node|z17-[railway=subway_entrance][city=sf] {icon-image: subway-sanfrancisco-s.svg;}
+node|z17-[railway=subway_entrance][city=sf] {icon-image: subway-sanfrancisco-s.svg;text-optional: true;}
 
 /* Santiago Subway Station */
 node|z13[railway=station][transport=subway][city=santiago] {icon-image: subway-santiago-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=santiago] {icon-image: subway-santiago-s.svg;}
 node|z15-16[railway=station][transport=subway][city=santiago] {icon-image: subway-santiago-m.svg;}
-node|z17-[railway=station][transport=subway][city=santiago] {icon-image: subway-santiago-m.svg;}
-node|z17-[railway=subway_entrance][city=santiago] {icon-image: subway-santiago-s.svg;}
+node|z17-[railway=station][transport=subway][city=santiago] {icon-image: subway-santiago-m.svg;text-optional: true;}
+node|z17-[railway=subway_entrance][city=santiago] {icon-image: subway-santiago-s.svg;text-optional: true;}
 
 /* Santo Domingo Subway Station */
 node|z13[railway=station][transport=subway][city=santo_domingo] {icon-image: subway-santodomingo-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=santo_domingo] {icon-image: subway-santodomingo-s.svg;}
 node|z15-[railway=station][transport=subway][city=santo_domingo] {icon-image: subway-santodomingo-m.svg;}
-node|z17-[railway=subway_entrance][city=santo_domingo] {icon-image: subway-santodomingo-s.svg;}
+node|z17-[railway=subway_entrance][city=santo_domingo] {icon-image: subway-santodomingo-s.svg;text-optional: true;}
 
 /* Sao Paulo Subway Station */
 node|z13[railway=station][transport=subway][city=saopaulo] {icon-image: subway-saopaulo-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=saopaulo] {icon-image: subway-saopaulo-s.svg;}
 node|z15-[railway=station][transport=subway][city=saopaulo] {icon-image: subway-saopaulo-m.svg;}
-node|z17-[railway=subway_entrance][city=saopaulo] {icon-image: subway-saopaulo-s.svg;}
+node|z17-[railway=subway_entrance][city=saopaulo] {icon-image: subway-saopaulo-s.svg;text-optional: true;}
 
 /* Sapporo Subway Station */
 node|z13[railway=station][transport=subway][city=sapporo] {icon-image: subway-sapporo-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=sapporo] {icon-image: subway-sapporo-s.svg;}
 node|z15-[railway=station][transport=subway][city=sapporo] {icon-image: subway-sapporo-m.svg;}
-node|z17-[railway=subway_entrance][city=sapporo] {icon-image: subway-sapporo-s.svg;}
+node|z17-[railway=subway_entrance][city=sapporo] {icon-image: subway-sapporo-s.svg;text-optional: true;}
 
 /* Sendai Subway Station */
 node|z13[railway=station][transport=subway][city=sendai] {icon-image: subway-sendai-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=sendai] {icon-image: subway-sendai-s.svg;}
 node|z15-[railway=station][transport=subway][city=sendai] {icon-image: subway-sendai-m.svg;}
-node|z17-[railway=subway_entrance][city=sendai] {icon-image: subway-sendai-s.svg;}
+node|z17-[railway=subway_entrance][city=sendai] {icon-image: subway-sendai-s.svg;text-optional: true;}
 
 /* Shanghai Subway Station */
 node|z13[railway=station][transport=subway][city=shanghai] {icon-image: subway-shanghai-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=shanghai] {icon-image: subway-shanghai-s.svg;}
 node|z15-[railway=station][transport=subway][city=shanghai] {icon-image: subway-shanghai-m.svg;}
-node|z17-[railway=subway_entrance][city=shanghai] {icon-image: subway-shanghai-s.svg;}
+node|z17-[railway=subway_entrance][city=shanghai] {icon-image: subway-shanghai-s.svg;text-optional: true;}
 
 /* Shiraz Subway Station */
 node|z13[railway=station][transport=subway][city=shiraz] {icon-image: subway-shiraz-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=shiraz] {icon-image: subway-shiraz-s.svg;}
 node|z15-[railway=station][transport=subway][city=shiraz] {icon-image: subway-shiraz-m.svg;}
-node|z17-[railway=subway_entrance][city=shiraz] {icon-image: subway-shiraz-s.svg;}
+node|z17-[railway=subway_entrance][city=shiraz] {icon-image: subway-shiraz-s.svg;text-optional: true;}
 
 /* Sofia Subway Station */
 node|z13[railway=station][transport=subway][city=sofia] {icon-image: subway-sofia-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=sofia] {icon-image: subway-sofia-s.svg;}
 node|z15-[railway=station][transport=subway][city=sofia] {icon-image: subway-sofia-m.svg;}
-node|z17-[railway=subway_entrance][city=sofia] {icon-image: subway-sofia-s.svg;}
+node|z17-[railway=subway_entrance][city=sofia] {icon-image: subway-sofia-s.svg;text-optional: true;}
 
 /* Saint Petersburg Subway Station */
 node|z11[railway=station][transport=subway][city=spb]
@@ -774,119 +779,119 @@ node|z17[railway=subway_entrance][city=spb]
 node|z17[railway=subway_entrance][city=spb]::int_name
 {text-offset: 25;font-size: 11;text-halo-opacity: 0.8;}
 node|z18-[railway=subway_entrance][city=spb]
-{icon-image: subway-spb-m.svg;text-offset: 1;font-size: 13;text-halo-opacity: 0.8;}
+{icon-image: subway-spb-m.svg;text-offset: 1;font-size: 13;text-halo-opacity: 0.8;text-optional: true;}
 node|z18-[railway=subway_entrance][city=spb]::int_name
-{text-offset: 25;font-size: 12;text-halo-opacity: 0.8;}
+{text-offset: 25;font-size: 12;text-halo-opacity: 0.8;text-optional: true;}
 
 /* Stockholm Subway Station */
 node|z13[railway=station][transport=subway][city=stockholm] {icon-image: subway-stockholm-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=stockholm] {icon-image: subway-stockholm-s.svg;}
 node|z15-16[railway=station][transport=subway][city=stockholm] {icon-image: subway-stockholm-m.svg;}
-node|z17-[railway=station][transport=subway][city=stockholm] {icon-image: subway-stockholm-m.svg;}
-node|z17-[railway=subway_entrance][city=stockholm] {icon-image: subway-stockholm-s.svg;}
+node|z17-[railway=station][transport=subway][city=stockholm] {icon-image: subway-stockholm-m.svg;text-optional: true;}
+node|z17-[railway=subway_entrance][city=stockholm] {icon-image: subway-stockholm-s.svg;text-optional: true;}
 
 /* Tabriz Subway Station */
 node|z13[railway=station][transport=subway][city=tabriz] {icon-image: subway-tabriz-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=tabriz] {icon-image: subway-tabriz-s.svg;}
 node|z15-16[railway=station][transport=subway][city=tabriz] {icon-image: subway-tabriz-m.svg;}
-node|z17-[railway=station][transport=subway][city=tabriz] {icon-image: subway-tabriz-m.svg;}
-node|z17-[railway=subway_entrance][city=tabriz] {icon-image: subway-tabriz-s.svg;}
+node|z17-[railway=station][transport=subway][city=tabriz] {icon-image: subway-tabriz-m.svg;text-optional: true;}
+node|z17-[railway=subway_entrance][city=tabriz] {icon-image: subway-tabriz-s.svg;text-optional: true;}
 
 /* Taipei Subway Station */
 node|z13[railway=station][transport=subway][city=taipei] {icon-image: subway-taipei-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=taipei] {icon-image: subway-taipei-s.svg;}
 node|z15-16[railway=station][transport=subway][city=taipei] {icon-image: subway-taipei-m.svg;}
-node|z17-[railway=station][transport=subway][city=taipei] {icon-image: subway-taipei-m.svg;}
-node|z17-[railway=subway_entrance][city=taipei] {icon-image: subway-taipei-s.svg;}
+node|z17-[railway=station][transport=subway][city=taipei] {icon-image: subway-taipei-m.svg;text-optional: true;}
+node|z17-[railway=subway_entrance][city=taipei] {icon-image: subway-taipei-s.svg;text-optional: true;}
 
 /* Taoyuan Subway Station */
 node|z13[railway=station][transport=subway][city=taoyuan] {icon-image: subway-taoyuan-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=taoyuan] {icon-image: subway-taoyuan-s.svg;}
 node|z15-16[railway=station][transport=subway][city=taoyuan] {icon-image: subway-taoyuan-m.svg;}
-node|z17-[railway=station][transport=subway][city=taoyuan] {icon-image: subway-taoyuan-m.svg;}
-node|z17-[railway=subway_entrance][city=taoyuan] {icon-image: subway-taoyuan-s.svg;}
+node|z17-[railway=station][transport=subway][city=taoyuan] {icon-image: subway-taoyuan-m.svg;text-optional: true;}
+node|z17-[railway=subway_entrance][city=taoyuan] {icon-image: subway-taoyuan-s.svg;text-optional: true;}
 
 /* Tashkent Subway Station */
 node|z13[railway=station][transport=subway][city=tashkent] {icon-image: subway-tashkent-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=tashkent] {icon-image: subway-tashkent-s.svg;}
 node|z15-16[railway=station][transport=subway][city=tashkent] {icon-image: subway-tashkent-m.svg;}
-node|z17-[railway=station][transport=subway][city=tashkent] {icon-image: subway-tashkent-m.svg;}
-node|z17-[railway=subway_entrance][city=tashkent] {icon-image: subway-tashkent-s.svg;}
+node|z17-[railway=station][transport=subway][city=tashkent] {icon-image: subway-tashkent-m.svg;text-optional: true;}
+node|z17-[railway=subway_entrance][city=tashkent] {icon-image: subway-tashkent-s.svg;text-optional: true;}
 
 /* Tbilisi Subway Station */
 node|z13[railway=station][transport=subway][city=tbilisi] {icon-image: subway-tbilisi-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=tbilisi] {icon-image: subway-tbilisi-s.svg;}
 node|z15-16[railway=station][transport=subway][city=tbilisi] {icon-image: subway-tbilisi-m.svg;}
-node|z17-[railway=station][transport=subway][city=tbilisi] {icon-image: subway-tbilisi-m.svg;}
-node|z17-[railway=subway_entrance][city=tbilisi] {icon-image: subway-tbilisi-s.svg;}
+node|z17-[railway=station][transport=subway][city=tbilisi] {icon-image: subway-tbilisi-m.svg;text-optional: true;}
+node|z17-[railway=subway_entrance][city=tbilisi] {icon-image: subway-tbilisi-s.svg;text-optional: true;}
 
 /* Tianjin Subway Station */
 node|z13[railway=station][transport=subway][city=tianjin] {icon-image: subway-tianjin-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=tianjin] {icon-image: subway-tianjin-s.svg;}
 node|z15-16[railway=station][transport=subway][city=tianjin] {icon-image: subway-tianjin-m.svg;}
-node|z17-[railway=station][transport=subway][city=tianjin] {icon-image: subway-tianjin-m.svg;}
-node|z17-[railway=subway_entrance][city=tianjin] {icon-image: subway-tianjin-s.svg;}
+node|z17-[railway=station][transport=subway][city=tianjin] {icon-image: subway-tianjin-m.svg;text-optional: true;}
+node|z17-[railway=subway_entrance][city=tianjin] {icon-image: subway-tianjin-s.svg;text-optional: true;}
 
 /* Tokyo Subway Station */
 node|z13[railway=station][transport=subway][city=tokyo] {icon-image: subway-tokyo-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=tokyo] {icon-image: subway-tokyo-s.svg;}
 node|z15-16[railway=station][transport=subway][city=tokyo] {icon-image: subway-tokyo-m.svg;}
-node|z17-[railway=station][transport=subway][city=tokyo] {icon-image: subway-tokyo-m.svg;}
-node|z17-[railway=subway_entrance][city=tokyo] {icon-image: subway-tokyo-s.svg;}
+node|z17-[railway=station][transport=subway][city=tokyo] {icon-image: subway-tokyo-m.svg;text-optional: true;}
+node|z17-[railway=subway_entrance][city=tokyo] {icon-image: subway-tokyo-s.svg;text-optional: true;}
 
 /* Valencia Subway Station */
 node|z13[railway=station][transport=subway][city=valencia] {icon-image: subway-valencia-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=valencia] {icon-image: subway-valencia-s.svg;}
 node|z15-16[railway=station][transport=subway][city=valencia] {icon-image: subway-valencia-m.svg;}
-node|z17-[railway=station][transport=subway][city=valencia] {icon-image: subway-valencia-m.svg;}
-node|z17-[railway=subway_entrance][city=valencia] {icon-image: subway-valencia-s.svg;}
+node|z17-[railway=station][transport=subway][city=valencia] {icon-image: subway-valencia-m.svg;text-optional: true;}
+node|z17-[railway=subway_entrance][city=valencia] {icon-image: subway-valencia-s.svg;text-optional: true;}
 
 /* Valencia Subway Station */
 node|z13[railway=station][transport=subway][city=valencia] {icon-image: subway-valencia-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=valencia] {icon-image: subway-valencia-s.svg;}
 node|z15-16[railway=station][transport=subway][city=valencia] {icon-image: subway-valencia-m.svg;}
-node|z17-[railway=station][transport=subway][city=valencia] {icon-image: subway-valencia-m.svg;}
-node|z17-[railway=subway_entrance][city=valencia] {icon-image: subway-valencia-s.svg;}
+node|z17-[railway=station][transport=subway][city=valencia] {icon-image: subway-valencia-m.svg;text-optional: true;}
+node|z17-[railway=subway_entrance][city=valencia] {icon-image: subway-valencia-s.svg;text-optional: true;}
 
 /* Vienna Subway Station */
 node|z13[railway=station][transport=subway][city=vienna] {icon-image: subway-vienna-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=vienna] {icon-image: subway-vienna-s.svg;}
 node|z15-16[railway=station][transport=subway][city=vienna] {icon-image: subway-vienna-m.svg;}
-node|z17-[railway=station][transport=subway][city=vienna] {icon-image: subway-vienna-m.svg;}
-node|z17-[railway=subway_entrance][city=vienna] {icon-image: subway-vienna-s.svg;}
+node|z17-[railway=station][transport=subway][city=vienna] {icon-image: subway-vienna-m.svg;text-optional: true;}
+node|z17-[railway=subway_entrance][city=vienna] {icon-image: subway-vienna-s.svg;text-optional: true;}
 
 /* Washington Subway Station */
 node|z13[railway=station][transport=subway][city=washington] {icon-image: subway-washington-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=washington] {icon-image: subway-washington-s.svg;}
 node|z15-16[railway=station][transport=subway][city=washington] {icon-image: subway-washington-m.svg;}
-node|z17-[railway=station][transport=subway][city=washington] {icon-image: subway-washington-m.svg;}
-node|z17-[railway=subway_entrance][city=washington] {icon-image: subway-washington-s.svg;}
+node|z17-[railway=station][transport=subway][city=washington] {icon-image: subway-washington-m.svg;text-optional: true;}
+node|z17-[railway=subway_entrance][city=washington] {icon-image: subway-washington-s.svg;text-optional: true;}
 
 /* Wuhan Subway Station */
 node|z13[railway=station][transport=subway][city=wuhan] {icon-image: subway-wuhan-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=wuhan] {icon-image: subway-wuhan-s.svg;}
 node|z15-16[railway=station][transport=subway][city=wuhan] {icon-image: subway-wuhan-m.svg;}
-node|z17-[railway=station][transport=subway][city=wuhan] {icon-image: subway-wuhan-m.svg;}
-node|z17-[railway=subway_entrance][city=wuhan] {icon-image: subway-wuhan-s.svg;}
+node|z17-[railway=station][transport=subway][city=wuhan] {icon-image: subway-wuhan-m.svg;text-optional: true;}
+node|z17-[railway=subway_entrance][city=wuhan] {icon-image: subway-wuhan-s.svg;text-optional: true;}
 
 /* Warszawa Subway Station */
 node|z13[railway=station][transport=subway][city=warszawa] {icon-image: subway-warszawa-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=warszawa] {icon-image: subway-warszawa-s.svg;}
 node|z15-16[railway=station][transport=subway][city=warszawa] {icon-image: subway-warszawa-m.svg;}
-node|z17-[railway=station][transport=subway][city=warszawa] {icon-image: subway-warszawa-m.svg;}
-node|z17-[railway=subway_entrance][city=warszawa] {icon-image: subway-warszawa-s.svg;}
+node|z17-[railway=station][transport=subway][city=warszawa] {icon-image: subway-warszawa-m.svg;text-optional: true;}
+node|z17-[railway=subway_entrance][city=warszawa] {icon-image: subway-warszawa-s.svg;text-optional: true;}
 
 /* Yerevan Subway Station */
 node|z13[railway=station][transport=subway][city=yerevan] {icon-image: subway-yerevan-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=yerevan] {icon-image: subway-yerevan-s.svg;}
 node|z15-16[railway=station][transport=subway][city=yerevan] {icon-image: subway-yerevan-m.svg;}
-node|z17-[railway=station][transport=subway][city=yerevan] {icon-image: subway-yerevan-m.svg;}
-node|z17-[railway=subway_entrance][city=yerevan] {icon-image: subway-yerevan-s.svg;}
+node|z17-[railway=station][transport=subway][city=yerevan] {icon-image: subway-yerevan-m.svg;text-optional: true;}
+node|z17-[railway=subway_entrance][city=yerevan] {icon-image: subway-yerevan-s.svg;text-optional: true;}
 
 /* Yokohama Subway Station */
 node|z13[railway=station][transport=subway][city=yokohama] {icon-image: subway-yokohama-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=yokohama] {icon-image: subway-yokohama-s.svg;}
 node|z15-16[railway=station][transport=subway][city=yokohama] {icon-image: subway-yokohama-m.svg;}
-node|z17-[railway=station][transport=subway][city=yokohama] {icon-image: subway-yokohama-m.svg;}
-node|z17-[railway=subway_entrance][city=yokohama] {icon-image: subway-yokohama-s.svg;}
+node|z17-[railway=station][transport=subway][city=yokohama] {icon-image: subway-yokohama-m.svg;text-optional: true;}
+node|z17-[railway=subway_entrance][city=yokohama] {icon-image: subway-yokohama-s.svg;text-optional: true;}