diff --git a/data/styles/default/include/Basemap_label.mapcss b/data/styles/default/include/Basemap_label.mapcss
index d57b6e418..6f80b6540 100644
--- a/data/styles/default/include/Basemap_label.mapcss
+++ b/data/styles/default/include/Basemap_label.mapcss
@@ -39,14 +39,10 @@
 node|z1-2[place=continent],
 /* TODO: add to mapping
 node|z9-[place=archipelago],
-area|z9-[place=archipelago],
 */
 node|z9-[place=island],
-area|z9-[place=island],
 node|z14-[natural=cape],
-area|z14-[natural=cape],
 node|z14-[place=islet],
-area|z14-[place=islet],
 {text: name; text-color: @district_label;}
 
 node|z1-2[place=continent]
@@ -54,42 +50,31 @@ node|z1-2[place=continent]
 
 /*
 node|z9-[place=archipelago],
-area|z9-[place=archipelago],
 */
 node|z9-[place=island],
-area|z9-[place=island],
 {font-size: 8;}
 
 /*
 node|z12-[place=archipelago],
-area|z12-[place=archipelago],
 */
 node|z12-[place=island],
-area|z12-[place=island]
 {font-size: 9;}
 
 /*
 node|z14-[place=archipelago],
-area|z14-[place=archipelago],
 */
 node|z14-[place=island],
-area|z14-[place=island],
 node|z14-[place=islet],
-area|z14-[place=islet],
 {font-size: 10;}
 
 /*
 node|z16-[place=archipelago],
-area|z16-[place=archipelago],
 */
 node|z16-[place=island],
-area|z16-[place=island],
 node|z16-[place=islet],
-area|z16-[place=islet],
 {font-size: 12;}
 
 node|z14-[natural=cape],
-area|z14-[natural=cape]
 {font-size: 8;text-color: @poi_label;}
 
 /* 3.COUNTRIES & STATES */
@@ -483,7 +468,6 @@ area|z17-[landuse=plant_nursery],
 /* 5.2 Beach, Glacier, Desert, etc. */
 
 area|z14-[natural=desert],
-area|z15-[natural=beach],
 node|z15-[natural=beach],
 {text: name;font-size: 10;text-color: @poi_label;}
 
@@ -523,7 +507,6 @@ line|z13-[natural=strait],
 node|z14-[natural=strait],
 node|z14-[natural=bay],
 node|z16-[natural=wetland],
-area|z16-[natural=wetland],
 {text:name;text-color: @water_label;text-halo-color: @water;text-halo-radius: 0.1;text-halo-opacity: 0.4;}
 
 area|z10-[natural=water][!tunnel][bbox_area<4000000],
@@ -631,10 +614,8 @@ area|z18-[piste:type=snow_park],
 
 area|z15-[landuse=cemetery],
 node|z17-[landuse=cemetery],
-area|z17-[amenity=grave_yard],
 node|z17-[amenity=grave_yard],
 node|z17-[cemetery=grave],
-area|z17-[cemetery=grave],
 {icon-image: cemetery-m.svg; text: name; text-offset: 1; font-size: 10; text-color: @poi_label;}
 
 /* 	7.5 Pedestrian areas */
@@ -649,12 +630,10 @@ area|z16-[place=square],
 {text: name;font-size: 11;text-color: @city_label;text-position: center;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;}
 /* 	7.6 Military */
 
-area|z16[landuse=military],
-node|z16[landuse=military]
+node|z16[landuse=military],
 {icon-image: military-m.svg;icon-min-distance: 10;}
 
-area|z17-[landuse=military],
-node|z17-[landuse=military]
+node|z17-[landuse=military],
 {icon-image: military-m.svg;text-offset: 1;text: name;font-size: 10;text-color: @poi_label;}
 
 /* 	7.7 Commercial */
@@ -665,10 +644,8 @@ area|z16-[landuse=commercial],
 
 /* 8.BUILDINGS */
 
-area|z16-[building],
 node|z16-[building],
 {text: name;text-color: @building_label;text-position: center;}
-area|z16-[building]::int_name,
 node|z16-[building]::int_name,
 {text:int_name;text-color: @building_label;text-position: center;}
 
@@ -712,16 +689,12 @@ node|z17-[man_made=breakwater]
 
 /*	8.2 Building */
 
-area|z16-17[building],
 node|z16-17[building],
 {font-size: 9;}
-area|z16-17[building]::int_name,
 node|z16-17[building]::int_name,
 {font-size: 8;}
-area|z18-[building],
 node|z18-[building],
 {font-size: 11;}
-area|z18-[building]::int_name,
 node|z18-[building]::int_name,
 {font-size: 10;}
 
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index b2f3717ce..0e71478a5 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -2040,7 +2040,6 @@ node|z17-[amenity=bicycle_parking],
 {icon-image: bicycle-parking-m.svg;}
 
 node|z17-[amenity=bicycle_parking][covered=yes],
-area|z17-[amenity=bicycle_parking][covered=yes],
 {icon-image: bicycle-parking-covered-m.svg;}
 
 node|z17-[amenity=motorcycle_parking],
diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss
index 934d9d80f..9e63ee350 100644
--- a/data/styles/outdoors/include/Icons.mapcss
+++ b/data/styles/outdoors/include/Icons.mapcss
@@ -5,23 +5,16 @@
 /* 2. NATURAL */
 
 node|z11-[natural=cave_entrance],
-area|z11-[natural=cave_entrance],
 node|z11-[waterway=waterfall],
-area|z11-[waterway=waterfall],
 node|z11-[natural=peak][name],
 node|z15-[natural=saddle],
 node|z12-[mountain_pass],
 node|z13-[man_made=communications_tower],
 node|z14-[natural=spring],
-area|z14-[natural=spring],
 node|z14-[amenity=water_point],
-area|z14-[amenity=water_point],
 node|z14-[amenity=drinking_water],
-area|z14-[amenity=drinking_water],
 node|z14-[man_made=water_tap],
-area|z14-[man_made=water_tap],
 node|z14-[man_made=water_well],
-area|z14-[man_made=water_well],
 node|z15-[tourism=information],
 node|z14-[tourism=information][information=office],
 node|z14-[tourism=information][information=visitor_centre],
@@ -35,11 +28,8 @@ node|z14-[man_made=tower],
 node|z15-[amenity=hunting_stand],
 node|z15-[man_made=survey_point],
 node|z15-[natural=hot_spring],
-area|z15-[natural=hot_spring],
 node|z12-[natural=geyser],
-area|z12-[natural=geyser],
 node|z14-[natural=beach],
-area|z14-[natural=beach],
 area|z13-[natural=bare_rock][name],
 {text: name;text-color: @poi_label;text-position: center;text-offset: 1;font-size: 10;}
 node|z11-[natural=peak][!name],
@@ -47,46 +37,31 @@ area|z13-[natural=bare_rock][!name],
 {text: none;}
 
 node|z11-17[boundary=national_park],
-area|z11-17[boundary=national_park],
 node|z11-17[boundary=protected_area],
-area|z11-17[boundary=protected_area],
 node|z11-17[leisure=nature_reserve],
-area|z11-17[leisure=nature_reserve],
 area|z13-[landuse=forest][name],
 {text: name;text-offset: 1;text-color: @park_label;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;text-halo-radius:0.5;font-size: 10;}
 
 node|z10-12[natural=cave_entrance],
-area|z10-12[natural=cave_entrance],
 {icon-image: cave-s.svg; icon-min-distance: 20;}
 node|z13-[natural=cave_entrance],
-area|z13-[natural=cave_entrance],
 {icon-image: cave-m.svg; font-size: 11;}
 node|z16-[natural=cave_entrance],
-area|z16-[natural=cave_entrance],
 {font-size: 12;}
 
 node|z10-12[boundary=national_park],
-area|z10-12[boundary=national_park],
 node|z10-12[boundary=protected_area],
-area|z10-12[boundary=protected_area],
 node|z10-12[leisure=nature_reserve],
-area|z10-12[leisure=nature_reserve],
 area|z12[landuse=forest][name],
 {icon-image: nparkf-outline-s.svg;}
 node|z13-17[boundary=national_park],
-area|z13-17[boundary=national_park],
 node|z13-17[boundary=protected_area],
-area|z13-17[boundary=protected_area],
 node|z13-17[leisure=nature_reserve],
-area|z13-17[leisure=nature_reserve],
 area|z13-[landuse=forest][name],
 {icon-image: nparkf-outline-m.svg;font-size: 11;text-halo-opacity: 0.9;}
 node|z17[boundary=national_park],
-area|z17[boundary=national_park],
 node|z17[boundary=protected_area],
-area|z17[boundary=protected_area],
 node|z17[leisure=nature_reserve],
-area|z17[leisure=nature_reserve],
 area|z17-[landuse=forest][name],
 {font-size: 12;}
 
@@ -94,23 +69,17 @@ area|z12-[landuse=forest][!name],
 {}
 
 node|z10-12[waterway=waterfall],
-area|z10-12[waterway=waterfall],
 {icon-image: waterfall-s.svg; icon-min-distance: 15;}
 node|z13-[waterway=waterfall],
-area|z13-[waterway=waterfall],
 {icon-image: waterfall-m.svg; font-size: 11;}
 node|z16-[waterway=waterfall],
-area|z16-[waterway=waterfall],
 {font-size: 12;}
 
 node|z10-12[natural=volcano],
-area|z10-12[natural=volcano],
 {icon-image: volcano-s.svg;}
 node|z13-[natural=volcano],
-area|z13-[natural=volcano],
 {icon-image: volcano-m.svg; font-size: 11;}
 node|z16-[natural=volcano],
-area|z16-[natural=volcano],
 {font-size: 12;}
 
 node|z10-12[natural=peak][name],
@@ -139,41 +108,26 @@ node|z16-[mountain_pass],
 {font-size: 12;}
 
 node|z10-12[natural=geyser],
-area|z10-12[natural=geyser],
 {icon-image: geyser-s.svg; icon-min-distance: 24;}
 node|z13-[natural=geyser],
-area|z13-[natural=geyser],
 {icon-image: geyser-m.svg; font-size: 11;}
 node|z16-[natural=geyser],
-area|z16-[natural=geyser],
 {font-size: 12;}
 
 node|z12-14[amenity=water_point],
-area|z12-14[amenity=water_point],
 node|z12-14[amenity=drinking_water],
-area|z12-14[amenity=drinking_water],
 node|z12-14[man_made=water_tap],
-area|z12-14[man_made=water_tap],
 node|z12-14[man_made=water_well],
-area|z12-14[man_made=water_well],
 node|z12-14[natural=spring],
-area|z12-14[natural=spring],
 node|z12-14[natural=hot_spring],
-area|z12-14[natural=hot_spring],
 {icon-image: drinking-water-s.svg;}
 
 node|z15-[amenity=water_point],
-area|z15-[amenity=water_point],
 node|z15-[amenity=drinking_water],
-area|z15-[amenity=drinking_water],
 node|z15-[man_made=water_tap],
-area|z15-[man_made=water_tap],
 node|z15-[man_made=water_well],
-area|z15-[man_made=water_well],
 node|z15-[natural=spring],
-area|z15-[natural=spring],
 node|z15-[natural=hot_spring],
-area|z15-[natural=hot_spring],
 {icon-image: drinking-water-m.svg; font-size: 11;}
 
 node|z12-[natural=spring][drinking_water=not],
@@ -199,83 +153,55 @@ node|z15-[amenity=water_point][drinking_water=not],
 /* 4.2 Apartament */
 
 node|z11-[tourism=alpine_hut],
-area|z11-[tourism=alpine_hut],
 node|z13-[tourism=wilderness_hut],
-area|z13-[tourism=wilderness_hut],
 node|z12-[emergency=mountain_rescue],
 node|z13-[tourism=viewpoint],
 node|z14-[tourism=chalet],
-area|z14-[tourism=chalet],
 node|z13-[tourism=camp_site],
-area|z13-[tourism=camp_site],
 node|z14-[tourism=picnic_site],
-area|z14-[tourism=picnic_site],
 node|z16-[leisure=picnic_table],
-area|z16-[leisure=picnic_table],
 node|z17-[amenity=bbq],
-area|z17-[amenity=bbq],
 node|z17-[leisure=firepit],
 node|z13-[amenity=shelter],
-area|z13-[amenity=shelter],
 node|z13-[amenity=shelter][shelter_type=basic_hut],
 node|z13-[amenity=shelter][shelter_type=lean_to],
 node|z13-[tourism=caravan_site],
-area|z13-[tourism=caravan_site],
 {text: name; text-color: @poi_label; text-offset: 1; font-size: 10;}
 
 node|z11-[tourism=alpine_hut],
-area|z11-[tourism=alpine_hut],
 node|z12-[tourism=wilderness_hut],
-area|z12-[tourism=wilderness_hut],
 {icon-image: alpine_hut-s.svg; icon-min-distance: 24;}
 node|z13-[tourism=alpine_hut],
-area|z13-[tourism=alpine_hut],
 node|z13-[tourism=wilderness_hut],
-area|z13-[tourism=wilderness_hut],
 node|z14-[tourism=chalet],
-area|z14-[tourism=chalet],
 {font-size: 11;}
 node|z14-[tourism=alpine_hut],
-area|z14-[tourism=alpine_hut],
 node|z14-[tourism=wilderness_hut],
-area|z14-[tourism=wilderness_hut],
 node|z14-[tourism=chalet],
-area|z14-[tourism=chalet],
 {icon-image: alpine_hut-m.svg;}
 node|z16-[tourism=alpine_hut],
-area|z16-[tourism=alpine_hut],
 node|z16-[tourism=wilderness_hut],
-area|z16-[tourism=wilderness_hut],
 node|z16-[tourism=chalet],
-area|z16-[tourism=chalet],
 {font-size: 12; icon-min-distance: 0;}
 
 node|z13-[tourism=camp_site],
-area|z13-[tourism=camp_site],
 {icon-image: campsite-s.svg; icon-min-distance: 12; font-size: 11;}
 node|z14-[tourism=camp_site],
-area|z14-[tourism=camp_site],
 {icon-image: campsite-m.svg;}
 node|z16-[tourism=camp_site],
-area|z16-[tourism=camp_site],
 {font-size: 12; icon-min-distance: 0;}
 
 node|z14-[tourism=picnic_site],
-area|z14-[tourism=picnic_site],
 {icon-image: picnic-m.svg;icon-min-distance: 10;font-size: 11;}
 node|z16-[tourism=picnic_site],
-area|z16-[tourism=picnic_site],
 {font-size: 12; icon-min-distance: 0;}
 
 node|z15-[leisure=picnic_table],
-area|z15-[leisure=picnic_table],
 {icon-image: picnic_table-m.svg;}
 node|z16-[leisure=picnic_table],
-area|z16-[leisure=picnic_table],
 {font-size: 11;}
 
 node|z16-[amenity=bbq],
-area|z16-[amenity=bbq],
 {icon-image: bbq-m.svg; font-size: 11;}
 
 node|z16-[leisure=firepit],
@@ -287,13 +213,11 @@ node|z12-[amenity=shelter][shelter_type=lean_to],
 node|z12-[amenity=shelter][shelter_type=basic_hut],
 {icon-image: alpine_hut-s.svg; icon-min-distance: 10; font-size: 11;}
 node|z14-[amenity=shelter],
-area|z14-[amenity=shelter],
 node|z14-[amenity=shelter][shelter_type=lean_to],
 {icon-image: shelter-m.svg;}
 node|z14-[amenity=shelter][shelter_type=basic_hut],
 {icon-image: alpine_hut-m.svg;}
 node|z16-[amenity=shelter],
-area|z16-[amenity=shelter],
 node|z16-[amenity=shelter][shelter_type=lean_to],
 node|z16-[amenity=shelter][shelter_type=basic_hut],
 {font-size: 12; icon-min-distance: 0;}
@@ -303,13 +227,10 @@ node|z14-[amenity=shelter][shelter_type=public_transport],
 {icon-image: shelter-public_transport-m.svg;}
 
 node|z13-[tourism=caravan_site],
-area|z13-[tourism=caravan_site],
 {icon-image: caravan_site-s.svg; font-size: 11; icon-min-distance: 12;}
 node|z14-[tourism=caravan_site],
-area|z14-[tourism=caravan_site],
 {icon-image: caravan_site-m.svg;}
 node|z16-[tourism=caravan_site],
-area|z16-[tourism=caravan_site],
 {font-size: 12; icon-min-distance: 0;}
 
 node|z11-12[tourism=viewpoint],
@@ -349,17 +270,13 @@ area|z14-[highway=rest_area],
 {icon-image: picnic-m.svg;}
 
 node|z15-[amenity=toilets],
-area|z15-[amenity=toilets],
 {icon-image: toilets-m.svg; font-size: 11;}
 
 node|z11-12[man_made=lighthouse],
-area|z11-12[man_made=lighthouse],
 {icon-image: lighthouse-s.svg; icon-min-distance: 10;}
 node|z13-[man_made=lighthouse],
-area|z13-[man_made=lighthouse],
 {icon-image: lighthouse-m.svg; font-size: 11;}
 node|z16-[man_made=lighthouse],
-area|z16-[man_made=lighthouse],
 {font-size: 12;}
 
 node|z12-[barrier=border_control],
@@ -382,14 +299,11 @@ node|z15-[man_made=utility_pole],
 {icon-image: mast-m.svg;}
 
 node|z13-[power=generator][generator:source=wind],
-area|z13-[power=generator][generator:source=wind],
 {icon-image: dot-m.svg;}
 node|z16-[power=generator][generator:source=wind],
-area|z16-[power=generator][generator:source=wind],
 {icon-image: wind_turbine-m.svg;text: name;text-color: @poi_label; text-offset: 1; font-size: 10;}
 
 node|z13-[power=plant][plant:source=wind],
-area|z13-[power=plant][plant:source=wind],
 {icon-image: power_plant_wind-m.svg;}
 
 node|z12-[man_made=flagpole],
diff --git a/data/styles/vehicle/include/Basemap_label.mapcss b/data/styles/vehicle/include/Basemap_label.mapcss
index ebaa6df1e..418aa675d 100644
--- a/data/styles/vehicle/include/Basemap_label.mapcss
+++ b/data/styles/vehicle/include/Basemap_label.mapcss
@@ -37,12 +37,9 @@
 node|z1-2[place=continent],
 /*
 node|z12-[place=archipelago],
-area|z12-[place=archipelago],
 */
 node|z12-14[place=island],
-area|z12-14[place=island],
 node|z14-[natural=cape],
-area|z14-[natural=cape]
 {text: name;}
 
 node|z1-2[place=continent]
@@ -50,14 +47,11 @@ node|z1-2[place=continent]
 
 /*
 node|z12-[place=archipelago],
-area|z12-[place=archipelago],
 */
 node|z12-14[place=island],
-area|z12-14[place=island]
 {font-size: 9;text-color: @district_label;}
 
 node|z14-[natural=cape],
-area|z14-[natural=cape]
 {font-size: 8;text-color: @poi_label;}
 
 /* 3.COUNTRIES & STATES */
@@ -383,7 +377,6 @@ area|z10-[natural=water][!tunnel][bbox_area>=4000000],
 line|z11-[waterway=river],
 node|z14-[natural=bay],
 node|z16-[natural=wetland],
-area|z16-[natural=wetland],
 {text:name;text-color: @water_label;}
 
 area|z10-[natural=water][!tunnel][bbox_area<4000000],
@@ -487,10 +480,8 @@ area|z17-[landuse=military],
 
 /* 8.BUILDINGS */
 
-area|z18-[building],
 node|z18-[building],
 {text: name; text-color: @building_label; text-position: center;}
-area|z18-[building]::int_name,
 node|z18-[building]::int_name,
 {text: int_name; text-color: @building_label; text-position: center;}
 
@@ -524,16 +515,12 @@ node|z19-[entrance=exit]::flats,
 
 /* 8.2 Building */
 
-area|z18[building],
 node|z18[building],
 {font-size: 13;}
-area|z18[building]::int_name,
 node|z18[building]::int_name,
 {font-size: 12;}
-area|z19-[building],
 node|z19-[building],
 {font-size: 14;}
-area|z19-[building]::int_name,
 node|z19-[building]::int_name,
 {font-size: 13;}
 
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index 0110dcf9e..86d41ffd8 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -27,13 +27,9 @@
 /* 2. NATURAL */
 
 node|z12-[landuse=forest][name],
-area|z12-[landuse=forest][name],
 node|z12-[boundary=national_park],
-area|z12-[boundary=national_park],
 node|z12-[boundary=protected_area],
-area|z12-[boundary=protected_area],
 node|z12-[leisure=nature_reserve],
-area|z12-[leisure=nature_reserve]
 {text: name;text-color: @park_label;text-halo-opacity: 0.75;text-halo-color: @label_halo_light;text-halo-radius:0.4;}
 
 
@@ -42,54 +38,33 @@ node|z14-[highway=ford]
 
 /*
 node|z11[landuse=forest][name],
-area|z11[landuse=forest][name],
 node|z11[boundary=national_park],
-area|z11[boundary=national_park],
 node|z11[boundary=protected_area],
-area|z11[boundary=protected_area],
 node|z11[leisure=nature_reserve],
-area|z11[leisure=nature_reserve]
 {icon-image: nparkf-outline-s.svg;icon-min-distance: 20;}
 */
 node|z12-13[landuse=forest][name],
-area|z12-13[landuse=forest][name],
 node|z12-13[boundary=national_park],
-area|z12-13[boundary=national_park],
 node|z12-13[boundary=protected_area],
-area|z12-13[boundary=protected_area],
 node|z12-13[leisure=nature_reserve],
-area|z12-13[leisure=nature_reserve]
 {icon-image: nparkf-outline-s.svg;text-offset: 1;font-size: 11;icon-min-distance: 12;}
 node|z14[landuse=forest][name],
-area|z14[landuse=forest][name],
 node|z14[boundary=national_park],
-area|z14[boundary=national_park],
 node|z14[boundary=protected_area],
-area|z14[boundary=protected_area],
 node|z14[leisure=nature_reserve],
-area|z14[leisure=nature_reserve]
 {icon-image: nparkf-outline-m.svg;text-offset: 1;font-size: 12.25;}
 node|z15-16[landuse=forest][name],
-area|z15-16[landuse=forest][name],
 node|z15-16[boundary=national_park],
-area|z15-16[boundary=national_park],
 node|z15-16[boundary=protected_area],
-area|z15-16[boundary=protected_area],
 node|z15-16[leisure=nature_reserve],
-area|z15-16[leisure=nature_reserve]
 {icon-image: nparkf-outline-m.svg;text-offset: 1;font-size: 12.5;text-halo-opacity: 0.85;}
 node|z17-[landuse=forest][name],
-area|z17-[landuse=forest][name],
 node|z17-[boundary=national_park],
-area|z17-[boundary=national_park],
 node|z17-[boundary=protected_area],
-area|z17-[boundary=protected_area],
 node|z17-[leisure=nature_reserve],
-area|z17-[leisure=nature_reserve]
 {icon-image: nparkf-outline-m.svg;text-offset: 1;font-size: 13.75;text-halo-opacity: 0.9;}
 
 node|z12-[landuse=forest][!name],
-area|z12-[landuse=forest][!name],
 {}
 
 
@@ -103,20 +78,14 @@ node|z14-[railway=halt]::int_name,
 {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;}
 
 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;}
 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;}
 
-area|z10-[aeroway=aerodrome][aerodrome=international],
 node|z10-[aeroway=aerodrome][aerodrome=international],
-area|z14-[aeroway=aerodrome],
 node|z14-[aeroway=aerodrome],
 {text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;}
-area|z12-[aeroway=aerodrome][aerodrome=international]::int_name,
 node|z12-[aeroway=aerodrome][aerodrome=international]::int_name,
-area|z14-[aeroway=aerodrome]::int_name,
 node|z14-[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;}
 
@@ -163,13 +132,10 @@ node|z15-[highway=traffic_signals],
 /* 3.3 Tram Station */
 
 node|z17[railway=tram_stop],
-area|z17[railway=tram_stop]
 {icon-image: tram-m.svg;text-offset: 1;font-size: 13;text-opacity: 0;text-halo-opacity: 0;}
 node|z17-[railway=tram_stop]::int_name,
-area|z17-[railway=tram_stop]::int_name
 {text-offset: 1;font-size: 11;text-opacity: 0; text-halo-opacity: 0;} /*check*/
 node|z18-[railway=tram_stop],
-area|z18-[railway=tram_stop]
 {icon-image: tram-m.svg;text-offset: 1;font-size: 13;text-opacity: 0; text-halo-opacity: 0;}
 
 /* 3.4 Bus Station */
@@ -182,25 +148,19 @@ area|z18-[railway=tram_stop]
 
 /* 3.6 Airport */
 
-area|z7-9[aeroway=aerodrome][aerodrome=international],
 node|z7-9[aeroway=aerodrome][aerodrome=international],
 {icon-image: airport-s.svg;}
 
-area|z10[aeroway=aerodrome][aerodrome=international],
 node|z10[aeroway=aerodrome][aerodrome=international],
 {icon-image: airport-s.svg;text-offset: 1;font-size: 10;}
-area|z11-13[aeroway=aerodrome][aerodrome=international],
 node|z11-13[aeroway=aerodrome][aerodrome=international],
 {icon-image: airport-m.svg; text-offset: 1; font-size: 11;}
-area|z14-[aeroway=aerodrome],
-node|z14-[aeroway=aerodrome]
+node|z14-[aeroway=aerodrome],
 {icon-image: airport-m.svg;text-offset: 1;font-size: 12;}
-area|z14-[aeroway=aerodrome]::int_name,
 node|z14-[aeroway=aerodrome]::int_name,
 {font-size: 11;}
 
 /*
-area|z17-[aeroway=heliport],
 node|z17-[aeroway=heliport],
 {icon-image: helipad-m.svg;text-offset: 1;font-size: 11;text: name;text-color: @poi_label;}
 */
@@ -217,151 +177,96 @@ node|z17-[railway=level_crossing]
 /* 4.1 Main POI */
 
 node|z15-[historic=fort],
-area|z15-[historic=fort],
 node|z15-[historic=castle],
-area|z15-[historic=castle],
 node|z15-[historic=monument],
-area|z15-[historic=monument],
 node|z15-[historic=city_gate],
-area|z15-[historic=city_gate],
 node|z15-[tourism=museum],
-area|z15-[tourism=museum],
 node|z15-[tourism=zoo],
-area|z15-[tourism=zoo],
 node|z15-[amenity=theatre],
-area|z15-[amenity=theatre],
 node|z15-[tourism=attraction],
-area|z15-[tourism=attraction],
 node|z15-[tourism=theme_park],
-area|z15-[tourism=theme_park],
 node|z15-[tourism=viewpoint],
 node|z15-[historic=memorial],
-area|z15-[historic=memorial],
 node|z15-[historic=battlefield],
-area|z15-[historic=battlefield],
 node|z15-[tourism=gallery],
-area|z15-[tourism=gallery],
 node|z16-[amenity=community_centre],
-area|z16-[amenity=community_centre],
 node|z16-[historic=boundary_stone],
-area|z16-[historic=boundary_stone],
 node|z16-[historic=wayside_cross],
-area|z16-[historic=wayside_cross],
 node|z16-[historic=gallows],
-area|z16-[historic=gallows],
 node|z16-[historic=pillory],
-area|z16-[historic=pillory],
 node|z16-[historic=ship],
-area|z16-[historic=ship],
 node|z16-[historic=tomb],
-area|z16-[historic=tomb],
 node|z17-[historic=ruins],
-area|z17-[historic=ruins],
 node|z17-[historic=wayside_shrine],
-area|z17-[historic=wayside_shrine],
 node|z17-[historic=archaeological_site],
-area|z17-[historic=archaeological_site],
 node|z17-[amenity=arts_centre],
-area|z17-[amenity=arts_centre],
 node|z18-[tourism=artwork],
 {text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 
 node|z12-14[historic=fort],
-area|z12-14[historic=fort],
 node|z12-14[historic=castle],
-area|z12-14[historic=castle]
 {icon-image: remains-m.svg;}
 node|z15[historic=fort],
-area|z15[historic=fort],
 node|z15[historic=castle],
-area|z15[historic=castle]
 {icon-image: remains-m.svg;icon-min-distance: 5;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 node|z16[historic=fort],
-area|z16[historic=fort],
 node|z16[historic=castle],
-area|z16[historic=castle]
 {icon-image: remains-m.svg;text-offset: 1;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 node|z17-[historic=ruins][name],
-area|z17-[historic=ruins][name],
 node|z17-[historic=fort],
-area|z17-[historic=fort],
 node|z17-[historic=castle],
-area|z17-[historic=castle]
 {icon-image: remains-m.svg;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 
 node|z17-[historic=archaeological_site],
-area|z17-[historic=archaeological_site]
 {icon-image: archaeological-site-m.svg;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 
 node|z19-[historic=ruins][!name],
-area|z19-[historic=ruins][!name],
 {icon-image: remains-m.svg;}
 
 node|z13-14[historic=monument],
-area|z13-14[historic=monument],
 {icon-image: monument-m.svg;}
 node|z15[historic=monument],
-area|z15[historic=monument],
 node|z15[historic=memorial],
-area|z15[historic=memorial],
 node|z15[historic=battlefield],
-area|z15[historic=battlefield],
 {icon-image: monument-m.svg;icon-min-distance: 24;}
 node|z16-[historic=monument],
-area|z16-[historic=monument],
 node|z16-[historic=memorial],
-area|z16-[historic=memorial],
 node|z16-[historic=battlefield],
-area|z16-[historic=battlefield],
 {icon-image: monument-m.svg;icon-min-distance: 12;}
 
 /* Do not display following features on lower zoom levels */
 node|z15-[historic=memorial][memorial=plaque],
-area|z15-[historic=memorial][memorial=plaque],
 node|z15-[historic=memorial][memorial=stolperstein],
-area|z15-[historic=memorial][memorial=stolperstein],
 node|z15-16[historic=memorial][memorial=cross],
-area|z15-16[historic=memorial][memorial=cross],
 {icon-image: none; text: none;}
 
 node|z17-[historic=memorial][memorial=cross],
-area|z17-[historic=memorial][memorial=cross],
 {icon-image: cross-m.svg; icon-min-distance: 12;}
 
 node|z13-14[historic=city_gate],
-area|z13-14[historic=city_gate]
 {icon-image: remains-m.svg;}
 node|z15[historic=city_gate],
-area|z15[historic=city_gate],
 {icon-image: remains-m.svg;icon-min-distance: 24;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 node|z16-[historic=city_gate],
-area|z16-[historic=city_gate],
 {icon-image: remains-m.svg;icon-min-distance: 12;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 
 node|z15[tourism=museum],
-area|z15[tourism=museum]
 {icon-image: museum-m.svg;icon-min-distance: 24;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 node|z16-[tourism=museum],
-area|z16-[tourism=museum],
 {icon-image: museum-m.svg;text-offset: 1;icon-min-distance: 12;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 
 node|z15[tourism=gallery]
 {icon-image: gallery-m.svg;icon-min-distance: 8;} /* <-- <-- не показывается, непонятно почему, позже разобраться */
 node|z16-[tourism=gallery],
-area|z16-[tourism=gallery],
 node|z17-[amenity=arts_centre],
-area|z17-[amenity=arts_centre]
 {icon-image: gallery-m.svg;text-offset: 1;icon-min-distance: 12;}
 
 node|z15-[amenity=theatre],
-area|z15-[amenity=theatre],
 {icon-image: theatre-m.svg;icon-min-distance: 10;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 
 node|z15[tourism=zoo],
-area|z15[tourism=zoo]
 {icon-image: zoo-m.svg;icon-min-distance: 8;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 node|z16-[tourism=zoo],
-area|z16-[tourism=zoo]
 {icon-image: zoo-m.svg;text-offset: 1;icon-min-distance: 8;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 
 node|z14[tourism=viewpoint]
@@ -370,168 +275,114 @@ node|z15-[tourism=viewpoint]
 {icon-image: viewpoint-m.svg;icon-min-distance: 8;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 
 node|z16[historic=boundary_stone],
-area|z16[historic=boundary_stone],
 node|z16[historic=wayside_cross],
-area|z16[historic=wayside_cross],
 node|z16[historic=gallows],
-area|z16[historic=gallows],
 node|z16[historic=pillory],
-area|z16[historic=pillory]
 {icon-image: monument-m.svg;font-size: 11;icon-min-distance: 8;}
 node|z16[historic=ship],
-area|z16[historic=ship]
 {icon-image: historic-ship-m.svg;font-size: 11;icon-min-distance: 8;}
 node|z16[historic=tomb],
-area|z16[historic=tomb]
 {icon-image: tomb-m.svg;font-size: 11;icon-min-distance: 8;}
 node|z16[historic=wayside_shrine],
-area|z16[historic=wayside_shrine]
 {icon-image: wayside_shrine-m.svg;font-size: 11;icon-min-distance: 8;}
 
 node|z17-[historic=boundary_stone],
-area|z17-[historic=boundary_stone],
 node|z17-[historic=wayside_cross],
-area|z17-[historic=wayside_cross],
 node|z17-[historic=gallows],
-area|z17-[historic=gallows],
 node|z17-[historic=pillory],
-area|z17-[historic=pillory],
 {icon-image: monument-m.svg;font-size: 11;icon-min-distance: 8;}
 node|z17-[historic=ship],
-area|z17-[historic=ship]
 {icon-image: historic-ship-m.svg;font-size: 11;icon-min-distance: 8;}
 node|z17-[historic=tomb],
-area|z17-[historic=tomb]
 {icon-image: tomb-m.svg;font-size: 11;icon-min-distance: 8;}
 node|z17-[historic=wayside_shrine],
-area|z17-[historic=wayside_shrine]
 {icon-image: wayside_shrine-m.svg;font-size: 11;icon-min-distance: 8;}
 
 node|z18-[tourism=artwork]
 {icon-image: tourism-m.svg;}
 
 node|z14[tourism=theme_park],
-area|z14[tourism=theme_park]
 {icon-image: theme_park-m.svg;icon-min-distance: 12;}
 node|z15[tourism=attraction],
-area|z15[tourism=attraction]
 {icon-image: tourism-m.svg;icon-min-distance: 36;}
 node|z15[tourism=theme_park],
-area|z15[tourism=theme_park]
 {icon-image: theme_park-m.svg;icon-min-distance: 36;}
 node|z16-[tourism=attraction],
-area|z16-[tourism=attraction]
 {icon-image: tourism-m.svg;icon-min-distance: 36;}
 node|z16-[tourism=theme_park],
-area|z16-[tourism=theme_park]
 {icon-image: theme_park-m.svg;icon-min-distance: 24;}
 
 node|z16-[amenity=community_centre],
-area|z16-[amenity=community_centre],
 node|z16-[amenity=conference_centre],
-area|z16-[amenity=conference_centre],
 node|z16-[amenity=events_venue],
-area|z16-[amenity=events_venue],
 node|z16-[amenity=exhibition_centre],
-area|z16-[amenity=exhibition_centre],
 {icon-image: community-m.svg;icon-min-distance: 24;}
 
 
 /* 4.3 Food */
 node|z15-[amenity=cafe],
-area|z15-[amenity=cafe],
 node|z16-[amenity=restaurant],
-area|z16-[amenity=restaurant],
 node|z16-[amenity=pub],
-area|z16-[amenity=pub],
 node|z17-[amenity=fast_food],
-area|z17-[amenity=fast_food],
 {text: name;text-color: @poi_label;text-offset: 1;font-size: 13;}
 
 node|z15[amenity=cafe],
-area|z15[amenity=cafe]
 {icon-image: cafe-m.svg;icon-min-distance: 3;font-size: 12.5;}
 node|z16[amenity=cafe],
-area|z16[amenity=cafe]
 {icon-image: cafe-m.svg;icon-min-distance: 10;font-size: 12.75;}
 node|z16[amenity=restaurant],
-area|z16[amenity=restaurant]
 {icon-image: restaurant-m.svg;icon-min-distance: 22;font-size: 12.75;}
 node|z16[amenity=pub],
-area|z16[amenity=pub]
 {icon-image: pub-m.svg;icon-min-distance: 22;font-size: 12.75;}
 
 node|z17[amenity=cafe],
-area|z17[amenity=cafe]
 {icon-image: cafe-m.svg;icon-min-distance: 20;font-size: 13.75;}
 node|z17[amenity=restaurant],
-area|z17[amenity=restaurant]
 {icon-image: restaurant-m.svg;icon-min-distance: 22;font-size: 13.75;}
 node|z17[amenity=pub],
-area|z17[amenity=pub]
 {icon-image: pub-m.svg;icon-min-distance: 22;font-size: 13.75;}
 node|z17[amenity=fast_food],
-area|z17[amenity=fast_food]
 {icon-image: fastfood-m.svg;icon-min-distance: 25;font-size: 13.75;}
 
 node|z18[amenity=cafe],
-area|z18[amenity=cafe]
 {icon-image: cafe-m.svg;icon-min-distance: 25;font-size: 14.5;}
 node|z18[amenity=restaurant],
-area|z18[amenity=restaurant]
 {icon-image: restaurant-m.svg;icon-min-distance: 25;font-size: 14.5;}
 node|z18[amenity=pub],
-area|z18[amenity=pub]
 {icon-image: pub-m.svg;icon-min-distance: 25;font-size: 14.5;}
 node|z18[amenity=fast_food],
-area|z18[amenity=fast_food]
 {icon-image: fastfood-m.svg;icon-min-distance: 25;font-size: 14.5;}
 
 node|z19-[amenity=cafe],
-area|z19-[amenity=cafe]
 {icon-image: cafe-m.svg;icon-min-distance: 35;font-size: 14.5;}
 node|z19-[amenity=restaurant],
-area|z19-[amenity=restaurant]
 {icon-image: restaurant-m.svg;icon-min-distance: 40;font-size: 14.5;}
 node|z19-[amenity=pub],
-area|z19-[amenity=pub]
 {icon-image: pub-m.svg;icon-min-distance: 40;font-size: 14.5;}
 node|z19-[amenity=fast_food],
-area|z19-[amenity=fast_food]
 {icon-image: fastfood-m.svg;icon-min-distance: 45;font-size: 14.5;}
 
 /* 5.AMENITY (infrastructure) */
 node|z17-[amenity=place_of_worship],
-area|z17-[amenity=place_of_worship],
 {text: name;text-color: @poi_label;text-offset: 1;font-size: 10;}
 
 node|z16-[amenity=prison],
-area|z16-[amenity=prison]
 {icon-image: prison-m.svg;text: name;text-color: @poi_label;text-offset: 1;font-size: 11;}
 
 /*node|z13-[leisure=stadium],
 area|z13-[leisure=stadium],*/
-area|z15-[amenity=university],
 node|z15-[amenity=university],
 node|z15-[amenity=hospital],
 node|z14-[barrier=toll_booth],
-area|z14-[barrier=toll_booth],
 node|z14-[barrier=border_control],
 node|z16-[barrier=lift_gate],
-area|z16-[barrier=lift_gate],
 node|z16-[man_made=communications_tower],
 node|z17-[amenity=bank],
-area|z17-[amenity=bank],
 node|z17-[amenity=vending_machine][vending=fuel],
-area|z17-[amenity=vending_machine][vending=fuel],
 node|z17-[amenity=vending_machine][vending=parking_tickets],
-area|z17-[amenity=vending_machine][vending=parking_tickets],
 node|z17-[amenity=parcel_locker],
-area|z17-[amenity=parcel_locker],
 node|z17-[amenity=post_office],
-area|z17-[amenity=post_office],
 node|z18-[post_office=post_partner],
-area|z18-[post_office=post_partner],
 {text: name;text-color: @poi_label;text-offset: 1;font-size: 11;}
 
 /* POI */
@@ -553,20 +404,15 @@ node|z18-[amenity=hospital],
 
 /* 5.2 Education */
 
-area|z15-[amenity=university][name],
-node|z15-[amenity=university][name]
+node|z15-[amenity=university][name],
 {icon-image: college-m.svg;icon-min-distance: 15;font-size: 12.5;}
-area|z16[amenity=university][name],
-node|z16[amenity=university][name]
+node|z16[amenity=university][name],
 {icon-min-distance: 9;font-size: 12.75;}
 node|z17[amenity=university][name],
-area|z17[amenity=university][name]
 {icon-min-distance: 9;font-size: 13.75;}
 node|z18[amenity=university][name],
-area|z18[amenity=university][name]
 {icon-min-distance: 10;font-size: 14.5;}
 node|z19-[amenity=university][name],
-area|z19-[amenity=university][name]
 {icon-min-distance: 0; font-size: 14.5;}
 
 node|z15-[amenity=university][!name]
@@ -581,72 +427,52 @@ node|z15-[amenity=university][!name]
 
 
 node|z16-[amenity=place_of_worship],
-area|z16-[amenity=place_of_worship]
 {icon-image: place-of-worship-m.svg;icon-min-distance: 10;font-size: 13;}
 node|z16-[amenity=place_of_worship][religion=christian],
-area|z16-[amenity=place_of_worship][religion=christian]
 {icon-image: christian-m.svg;font-size: 13;}
 node|z16-[amenity=place_of_worship][religion=muslim],
-area|z16-[amenity=place_of_worship][religion=muslim]
 {icon-image: muslim-m.svg;font-size: 13;}
 node|z16-[amenity=place_of_worship][religion=buddhist],
-area|z16-[amenity=place_of_worship][religion=buddhist]
 {icon-image: buddhist-m.svg;font-size: 13;}
 node|z16-[amenity=place_of_worship][religion=hindu],
-area|z16-[amenity=place_of_worship][religion=hindu]
 {icon-image: hindu-m.svg;font-size: 13;}
 node|z16-[amenity=place_of_worship][religion=christian][denomination=mormon],
-area|z16-[amenity=place_of_worship][religion=christian][denomination=mormon],
 {icon-image: mormon-m.svg;font-size: 13;}
 node|z16-[amenity=place_of_worship][religion=christian][denomination=jehovahs_witness],
-area|z16-[amenity=place_of_worship][religion=christian][denomination=jehovahs_witness],
 {icon-image: place-of-worship-m.svg;font-size: 13;}
 
 
 node|z18-[amenity=place_of_worship],
-area|z18-[amenity=place_of_worship]
 {icon-image: place-of-worship-m.svg;font-size: 14.5;}
 node|z18-[amenity=place_of_worship][religion=christian],
-area|z18-[amenity=place_of_worship][religion=christian]
 {icon-image: christian-m.svg;font-size: 14.5;}
 node|z18-[amenity=place_of_worship][religion=muslim],
-area|z18-[amenity=place_of_worship][religion=muslim]
 {icon-image: muslim-m.svg;font-size: 14.5;}
 node|z18-[amenity=place_of_worship][religion=buddhist],
-area|z18-[amenity=place_of_worship][religion=buddhist]
 {icon-image: buddhist-m.svg;font-size: 14.5;}
 node|z18-[amenity=place_of_worship][religion=hindu],
-area|z18-[amenity=place_of_worship][religion=hindu]
 {icon-image: hindu-m.svg;font-size: 14.5;}
 node|z18-[amenity=place_of_worship][religion=christian][denomination=mormon],
-area|z18-[amenity=place_of_worship][religion=christian][denomination=mormon],
 {icon-image: mormon-m.svg;font-size: 14.5;}
 node|z18-[amenity=place_of_worship][religion=christian][denomination=jehovahs_witness],
-area|z18-[amenity=place_of_worship][religion=christian][denomination=jehovahs_witness],
 {icon-image: place-of-worship-m.svg;font-size: 14.5;}
 
 
 /* 5.5 Others */
 
 node|z17[amenity=bank],
-area|z17[amenity=bank]
 {icon-image: bank-m.svg;font-size: 13.75; icon-min-distance: 15;}
 node|z18-[amenity=bank],
-area|z18-[amenity=bank]
 {icon-image: bank-m.svg;font-size: 14.5; icon-min-distance: 10;}
 
 node|z17[amenity=police],
-area|z17[amenity=police]
 {icon-image: police-m.svg; font-size: 13.75; icon-min-distance: 15;}
 node|z18-[amenity=police],
-area|z18-[amenity=police]
 {icon-image: police-m.svg; font-size: 14.5; icon-min-distance: 10;}
 
 node|z12[barrier=toll_booth],
-area|z12[barrier=toll_booth],
 {icon-image: toll_booth-s.svg; icon-min-distance: 8;}
 node|z13-[barrier=toll_booth],
-area|z13-[barrier=toll_booth],
 {icon-image: toll_booth-m.svg; icon-min-distance: 8;}
 
 node|z14-[barrier=border_control],
@@ -657,76 +483,55 @@ node|z15-[man_made=communications_tower],
 {icon-image: mast-m.svg;}
 
 node|z16-[barrier=lift_gate],
-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-image: lift_gate-m.svg;icon-min-distance: 20;}
 node|z18-[barrier=lift_gate],
-area|z18-[barrier=lift_gate]
 {icon-image: lift_gate-m.svg;}
 
 node|z17-[amenity=vending_machine][vending=parking_tickets],
-area|z17-[amenity=vending_machine][vending=parking_tickets],
 {icon-image: parking-meter-m.svg;font-size: 13.5;}
 
 node|z17-[amenity=vending_machine][vending=fuel],
-area|z17-[amenity=vending_machine][vending=fuel],
 {icon-image: fuel-dispenser-m.svg;}
 
 node|z17-[amenity=parcel_locker],
-area|z17-[amenity=parcel_locker],
 {icon-image: parcel_locker-m.svg;}
 
 node|z17-[amenity=post_office],
-area|z17-[amenity=post_office],
 node|z18-[post_office=post_partner],
-area|z18-[post_office=post_partner],
 {icon-image: mail-m.svg;}
 node|z18-[amenity=post_office],
-area|z18-[amenity=post_office],
 node|z18-[post_office=post_partner],
-area|z18-[post_office=post_partner],
 {font-size: 11;}
 
 /* 6. SHOP */
 
 node|z14-[shop=mall],
-area|z14-[shop=mall],
 node|z14-[shop=supermarket],
-area|z14-[shop=supermarket],
 node|z15-[shop=car_repair][service=tyres],
-area|z15-[shop=car_repair][service=tyres],
 node|z18-[shop=convenience],
 {text: name;text-color: @poi_label;text-offset: 1;font-size: 11.5;text-min-distance: 3;}
 
 
 node|z14[shop=mall],
-area|z14[shop=mall]
 {icon-image: shop-m.svg;font-size:12.25;icon-min-distance: 5;}
 node|z15[shop=mall],
-area|z15[shop=mall]
 {icon-image: shop-m.svg;font-size:12.5;icon-min-distance: 6;}
 node|z16-17[shop=mall],
-area|z16-17[shop=mall]
 {icon-image: shop-m.svg;font-size: 13.25;icon-min-distance: 8;}
 node|z18-[shop=mall],
-area|z18-[shop=mall]
 {icon-image: shop-m.svg;font-size: 14.5;icon-min-distance: 8;}
 
 node|z14[shop=supermarket],
-area|z14[shop=supermarket]
 {icon-image: supermarket-m.svg;font-size:12.25;icon-min-distance: 4;}
 node|z15[shop=supermarket],
-area|z15[shop=supermarket]
 {icon-image: supermarket-m.svg;font-size:12.5;icon-min-distance: 3;}
 node|z16-17[shop=supermarket],
-area|z16-17[shop=supermarket]
 {icon-image: supermarket-m.svg;font-size: 13.25;icon-min-distance: 16;text-min-distance:6;}
 
 
 node|z18-[shop=supermarket],
-area|z18-[shop=supermarket]
 {icon-image: supermarket-m.svg;font-size: 14.5;icon-min-distance: 15;}
 
 node|z17-[shop=convenience],
@@ -735,55 +540,39 @@ node|z18-[shop=convenience],
 {font-size: 14.5;}
 
 node|z15[shop=car_repair][service=tyres],
-area|z15[shop=car_repair][service=tyres]
 {icon-image: car-repair-m.svg; text-offset: 1; icon-min-distance: 20; font-size:12.5;}
 node|z16-[shop=car_repair][service=tyres],
-area|z16-[shop=car_repair][service=tyres]
 {icon-image: car-repair-m.svg; font-size: 12.75;}
 node|z17[shop=car_repair][service=tyres],
-area|z17[shop=car_repair][service=tyres]
 {font-size: 13.75;}
 node|z18-[shop=car_repair][service=tyres],
-area|z18-[shop=car_repair][service=tyres]
 {font-size: 14.5;}
 
 
 node|z17[shop=car],
-area|z17[shop=car]
 {icon-image: car_shop-m.svg;icon-min-distance: 24;font-size: 13.75;}
 node|z17[shop=caravan],
-area|z17[shop=caravan]
 {icon-image: caravan-shop-m.svg;icon-min-distance: 24;font-size: 13.75;}
 node|z17[shop=motorcycle],
-area|z17[shop=motorcycle]
 {icon-image: motorcycle_shop-m.svg;icon-min-distance: 24;font-size: 13.75;}
 node|z17[shop=car_parts],
-area|z17[shop=car_parts]
 {icon-image: car-part-m.svg;icon-min-distance: 24;font-size: 13.75;}
 node|z17[shop=car_repair],
-area|z17[shop=car_repair]
 {icon-image: car-repair-m.svg;icon-min-distance: 24;font-size: 13.75;}
 node|z17[amenity=vehicle_inspection],
-area|z17[amenity=vehicle_inspection],
 {icon-image: vehicle_inspection-m.svg;icon-min-distance: 24;font-size: 13.75;}
 
 node|z18-[shop=car],
-area|z18-[shop=car]
 {icon-image: car_shop-m.svg;font-size: 14.5;}
 node|z18-[shop=caravan],
-area|z18-[shop=caravan]
 {icon-image: caravan-shop-m.svg;font-size: 14.5;}
 node|z18-[shop=motorcycle],
-area|z18-[shop=motorcycle]
 {icon-image: motorcycle_shop-m.svg;font-size: 14.5;}
 node|z18-[shop=car_parts],
-area|z18-[shop=car_parts]
 {icon-image: car-part-m.svg;font-size: 14.5;}
 node|z18-[shop=car_repair],
-area|z18-[shop=car_repair]
 {icon-image: car-repair-m.svg;font-size: 14.5;}
 node|z18-[amenity=vehicle_inspection],
-area|z18-[amenity=vehicle_inspection],
 {icon-image: vehicle_inspection-m.svg;font-size: 14.5;}
 
 /* 7. CAR */
@@ -793,64 +582,44 @@ area|z14-[highway=rest_area],
 {text-position: center;}
 
 node|z12-[amenity=fuel],
-area|z12-[amenity=fuel],
 area|z13-[highway=services],
 area|z14-[highway=rest_area],
 node|z14-[amenity=charging_station][motorcar?],
-area|z14-[amenity=charging_station][motorcar?],
 node|z15-[amenity=sanitary_dump_station],
-area|z15-[amenity=sanitary_dump_station],
 node|z16-[amenity=charging_station],
-area|z16-[amenity=charging_station],
 node|z16-[amenity=parking],
-area|z16-[amenity=parking],
 area|z16-[landuse=garages],
 node|z17-[amenity=car_wash],
-area|z17-[amenity=car_wash],
 node|z17-[amenity=toilets],
 node|z18-[amenity=motorcycle_rental],
 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: 11;}
 
 node|z12[amenity=fuel],
-area|z12[amenity=fuel]
 {icon-image: fuel-s.svg; text-offset: 1; icon-min-distance: 20;}
 node|z13[amenity=fuel],
-area|z13[amenity=fuel]
 {icon-image: fuel-m.svg; text-offset: 1; icon-min-distance: 20; font-size: 11.75;}
 node|z14[amenity=fuel],
-area|z14[amenity=fuel]
 {icon-image: fuel-m.svg; icon-min-distance: 20; font-size: 12.25;}
 node|z15[amenity=fuel],
-area|z15[amenity=fuel]
 {icon-image: fuel-m.svg; icon-min-distance: 20; font-size: 12.5;}
 node|z16[amenity=fuel],
-area|z16[amenity=fuel]
 {icon-image: fuel-m.svg; icon-min-distance: 10; font-size: 12.75;}
 node|z17[amenity=fuel],
-area|z17[amenity=fuel]
 {icon-image: fuel-m.svg;font-size: 13.75;}
 node|z18-[amenity=fuel],
-area|z18-[amenity=fuel]
 {icon-image: fuel-m.svg;font-size: 14.5;}
 
 node|z14[amenity=charging_station][motorcar?],
-area|z14[amenity=charging_station][motorcar?],
 {icon-image: charging-station-m.svg;text-offset: 1;font-size: 12.25;icon-min-distance: 20;}
 node|z15[amenity=charging_station][motorcar?],
-area|z15[amenity=charging_station][motorcar?],
 {icon-image: charging-station-m.svg;icon-min-distance: 20;font-size: 12.5;}
 node|z16[amenity=charging_station],
-area|z16[amenity=charging_station]
 {icon-image: charging-station-m.svg;icon-min-distance: 10;font-size: 12.75;}
 node|z17[amenity=charging_station],
-area|z17[amenity=charging_station]
 {icon-image: charging-station-m.svg; font-size: 13.75;}
 node|z18-[amenity=charging_station],
-area|z18-[amenity=charging_station]
 {icon-image: charging-station-m.svg;font-size: 14.75;}
 
 area|z12[highway=services],
@@ -884,10 +653,8 @@ node|z14-[highway=speed_camera]
 {icon-image: speedcam-m.svg;}
 
 node|z17[amenity=car_wash],
-area|z17[amenity=car_wash]
 {icon-image: car-wash-m.svg;font-size: 13.75;icon-min-distance: 24;}
 node|z18-[amenity=car_wash],
-area|z18-[amenity=car_wash],
 {icon-image: car-wash-m.svg;text-offset: 1;font-size: 14.5;}
 
 node|z17-[amenity=toilets],
@@ -899,21 +666,16 @@ node|z18-[amenity=motorcycle_rental],
 {icon-image: motorcycle_rental-m.svg; font-size: 14.5;}
 
 node|z18-[amenity=car_rental],
-area|z18-[amenity=car_rental]
 {icon-image: car_sharing-m.svg;text-offset: 1;font-size: 14.5;}
 
 node|z18-[amenity=car_sharing],
-area|z18-[amenity=car_sharing]
 {icon-image: car_sharing-m.svg;text-offset: 1;font-size: 14.5;}
 
 node|z15-[amenity=sanitary_dump_station],
-area|z15-[amenity=sanitary_dump_station],
 {icon-image: dump-station-m.svg; font-size: 12.5; icon-min-distance: 20;}
 node|z17-[amenity=sanitary_dump_station],
-area|z17-[amenity=sanitary_dump_station]
 {font-size: 13.75; icon-min-distance: 15;}
 node|z18-[amenity=sanitary_dump_station],
-area|z18-[amenity=sanitary_dump_station]
 {font-size: 14.5; icon-min-distance: 10;}
 
 area|z16[landuse=garages],
@@ -924,7 +686,6 @@ area|z18-[landuse=garages],
 {font-size: 14.5;}
 
 node|z18-[amenity=compressed_air],
-area|z18-[amenity=compressed_air],
 {icon-image: compressed_air-m.svg;}
 
 node|z16-[amenity=water_point],
@@ -937,80 +698,56 @@ node|z18-[amenity=water_point][drinking_water=not],
 /* 7.1 Parking */
 
 node|z15-[amenity=parking],
-area|z15-[amenity=parking],
 {icon-image: parking-m.svg;icon-min-distance: 10;font-size: 12.5;}
 node|z17[amenity=parking],
-area|z17[amenity=parking],
 {icon-min-distance: 15;font-size: 13.75;}
 node|z18-[amenity=parking],
-area|z18-[amenity=parking],
 {font-size: 14.5;}
 
 node|z15-[amenity=parking][location=underground],
-area|z15-[amenity=parking][location=underground],
 {icon-image: parking_underground-m.svg;}
 
 /* no icon as these subtypes should display later */
 node|z15-[amenity=parking][access=private],
-area|z15-[amenity=parking][access=private],
 node|z15-[amenity=parking][parking=street_side],
-area|z15-[amenity=parking][parking=street_side],
 node|z15-[amenity=parking][parking=lane],
-area|z15-[amenity=parking][parking=lane],
 node|z15-[amenity=parking][parking=street_side][fee?],
-area|z15-[amenity=parking][parking=street_side][fee?],
 node|z15-[amenity=parking][parking=lane][fee?],
-area|z15-[amenity=parking][parking=lane][fee?],
 {icon-image: none; text: none;}
 
 node|z15-[amenity=parking][fee?],
-area|z15-[amenity=parking][fee?],
 {icon-image: parking_pay-m.svg;}
 
 node|z15-[amenity=parking][location=underground][fee],
-area|z15-[amenity=parking][location=underground][fee],
 {icon-image: parking_underground_pay-m.svg;}
 
 node|z17-[amenity=parking][access=private],
-area|z17-[amenity=parking][access=private],
 {icon-image: parking_private-m.svg;text: name;}
 
 node|z17-[amenity=parking][location=underground][access=private],
-area|z17-[amenity=parking][location=underground][access=private],
 {icon-image: parking_underground_private-m.svg;}
 
 node|z17-[amenity=parking][parking=street_side],
-area|z17-[amenity=parking][parking=street_side],
 node|z17-[amenity=parking][parking=lane],
-area|z17-[amenity=parking][parking=lane],
 {icon-image: parking-s.svg;}
 
 node|z17-[amenity=parking][parking=street_side][fee?],
-area|z17-[amenity=parking][parking=street_side][fee?],
 node|z17-[amenity=parking][parking=lane][fee?],
-area|z17-[amenity=parking][parking=lane][fee?],
 {icon-image: parking_pay-s.svg;}
 
 node|z17-[amenity=parking][parking=street_side][access=private],
-area|z17-[amenity=parking][parking=street_side][access=private],
 {icon-image: parking_private-s.svg;}
 node|z17-[amenity=parking][parking=lane][access=private],
-area|z17-[amenity=parking][parking=lane][access=private],
 {icon-image: none; text: none;}
 node|z18-[amenity=parking][parking=lane][access=private],
-area|z18-[amenity=parking][parking=lane][access=private],
 {icon-image: parking_private-s.svg; text: name;}
 
 node|z16-[amenity=parking_entrance],
-area|z16-[amenity=parking_entrance],
 {icon-image: parking_entrance-m.svg; font-size: 12.5;}
 node|z16-[amenity=parking_entrance][access=private],
-area|z16-[amenity=parking_entrance][access=private],
 {icon-image: none;}
 node|z19-[amenity=parking_entrance][access=private],
-area|z19-[amenity=parking_entrance][access=private],
 {icon-image: parking_entrance_private-m.svg; font-size: 12.5;}
 
 node|z17-[amenity=motorcycle_parking],
-area|z17-[amenity=motorcycle_parking],
 {icon-image: motorcycle-parking-m.svg;}