diff --git a/admin.mss b/admin.mss
index 154e3b6c47..c9d97af791 100644
--- a/admin.mss
+++ b/admin.mss
@@ -104,14 +104,4 @@
       }
     }
   }
-  [way_area > 200000000][zoom >= 8][zoom < 12] {
-    text-name: "[name]";
-    text-size: 8;
-    text-fill: #9c9;
-    text-face-name: @bold-fonts;
-    text-halo-radius: 1;
-    text-wrap-width: 14;
-    text-placement: interior;
-    [zoom >= 11] { text-size: 11; }
-  }
 }
diff --git a/amenity-points.mss b/amenity-points.mss
index 1cbfbfd247..8834e7598f 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -1,10 +1,16 @@
 @marina-text: #576ddf; // also swimming_pool
-@military-text: #99001a;
-@park-text: #2c4b2c;
 @shop-icon: #ac39ac;
 @transportation-icon: #0092da;
 @transportation-text: #0066ff;
 
+@landcover-font-size: 9;
+@landcover-font-size-big: 12;
+@landcover-font-size-bigger: 15;
+@landcover-wrap-width-size: 25;
+@landcover-wrap-width-size-big: 35;
+@landcover-wrap-width-size-bigger: 45;
+@landcover-face-name: @oblique-fonts;
+
 .points {
   [feature = 'tourism_alpine_hut'][zoom >= 13] {
     point-file: url('symbols/alpinehut.p.16.png');
@@ -512,14 +518,22 @@
     text-placement: interior;
   }
 
-  [feature = 'natural_wood'][zoom >= 15] {
-    text-name: "[name]";
-    text-size: 10;
-    text-fill: darken(@wood, 50%);
-    text-face-name: @book-fonts;
-    text-halo-radius: 1;
-    text-wrap-width: 10;
-    text-placement: interior;
+  [feature = 'natural_wood'][is_building = 'no'] {
+    [zoom >= 8][way_pixels > 3000],
+    [zoom >= 17] {
+      text-name: "[name]";
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@wood, 40%);
+      text-face-name: @landcover-face-name;
+      text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
+      text-placement: interior;
+    }
   }
 
   [feature = 'natural_peak'],
@@ -600,50 +614,85 @@
     }
   }
 
-  [feature = 'leisure_swimming_pool'] {
+  [feature = 'leisure_swimming_pool'][is_building = 'no'] {
+    [zoom >= 14][way_pixels > 3000],
     [zoom >= 17] {
       text-name: "[name]";
-      text-size: 9;
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
       text-fill: @marina-text;
-      text-face-name: @book-fonts;
+      text-face-name: @landcover-face-name;
       text-halo-radius: 1;
-      text-wrap-width: 10;
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
       text-placement: interior;
     }
   }
 
-  [feature = 'leisure_sports_centre'],
-  [feature = 'leisure_stadium'],
-  [feature = 'leisure_track'],
-  [feature = 'leisure_pitch'] {
-    [zoom >= 15] {
+  [feature = 'leisure_sports_centre'][is_building = 'no'],
+  [feature = 'leisure_stadium'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
       text-name: "[name]";
-      text-size: 9;
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
       text-fill: darken(@stadium, 30%);
-      text-face-name: @book-fonts;
+      text-face-name: @landcover-face-name;
       text-halo-radius: 1;
-      text-wrap-width: 10;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
       text-placement: interior;
     }
   }
 
-  [feature = 'leisure_playground'],
-  [feature = 'leisure_park'],
-  [feature = 'leisure_recreation_ground'],
-  [feature = 'landuse_recreation_ground'],
-  [feature = 'landuse_conservation'],
-  [feature = 'landuse_village_green'],
-  [feature = 'leisure_common'],
-  [feature = 'leisure_garden'],
-  [feature = 'leisure_golf_course'],
-  [feature = 'leisure_nature_reserve'] {
+  [feature = 'leisure_track'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
+      text-name: "[name]";
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@track, 40%);
+      text-face-name: @landcover-face-name;
+      text-halo-radius: 1;
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
+      text-placement: interior;
+    }
+  }
+
+  [feature = 'leisure_pitch'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
+      text-name: "[name]";
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@pitch, 40%);
+      text-face-name: @landcover-face-name;
+      text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
+      text-placement: interior;
+    }
+  }
+
+  [feature = 'leisure_playground'] {
     [way_area >= 150000][zoom >= 14],
     [way_area >= 80000][zoom >= 15],
     [way_area >= 20000][zoom >= 16],
     [zoom >= 17] {
       text-name: "[name]";
       text-size: 11;
-      text-fill: @park-text;
+      text-fill: darken(@park, 60%);
       text-face-name: @book-fonts;
       text-halo-radius: 1;
       text-halo-fill: rgba(255,255,255,0.6);
@@ -652,180 +701,322 @@
     }
   }
 
-  [feature = 'landuse_quarry'] {
-    [zoom >= 15] {
+  [feature = 'leisure_park'][is_building = 'no'],
+  [feature = 'leisure_recreation_ground'][is_building = 'no'],
+  [feature = 'landuse_recreation_ground'][is_building = 'no'],
+  [feature = 'landuse_conservation'][is_building = 'no'],
+  [feature = 'landuse_village_green'][is_building = 'no'],
+  [feature = 'leisure_common'][is_building = 'no'],
+  [feature = 'leisure_garden'][is_building = 'no'],
+  [feature = 'leisure_golf_course'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
       text-name: "[name]";
-      text-size: 9;
-      text-fill: #000;
-      text-face-name: @book-fonts;
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@park, 60%);
+      text-face-name: @landcover-face-name;
       text-halo-radius: 1;
-      text-wrap-width: 10;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
       text-placement: interior;
     }
   }
 
-  [feature = 'landuse_vineyard'],
-  [feature = 'landuse_orchard']  {
-    [zoom >= 15] {
+  [feature = 'boundary_national_park'][is_building = 'no'],
+  [feature = 'leisure_nature_reserve'][is_building = 'no'] {
+    [zoom >= 8][way_pixels > 3000],
+    [zoom >= 17] {
       text-name: "[name]";
-      text-size: 9;
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@park, 70%);
+      text-face-name: @landcover-face-name;
+      text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
+      text-placement: interior;
+    }
+  }
+
+  [feature = 'landuse_quarry'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
+      text-name: "[name]";
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@quarry, 60%);
+      text-face-name: @landcover-face-name;
+      text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
+      text-placement: interior;
+    }
+  }
+
+  [feature = 'landuse_vineyard'][is_building = 'no'],
+  [feature = 'landuse_orchard'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
+      text-name: "[name]";
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
       text-fill: darken(@vineyard, 50%);
-      text-face-name: @book-fonts;
-      // extra halo needed to overpower the cemetery polygon pattern
-      text-halo-radius: 1.5;
-      text-wrap-width: 10;
+      text-face-name: @landcover-face-name;
+      text-halo-radius: 1.5; /* extra halo needed to overpower the vineyard polygon pattern */
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
       text-placement: interior;
     }
   }
 
-  [feature = 'landuse_cemetery'],
-  [feature = 'landuse_grave_yard']  {
-    [zoom >= 15] {
+  [feature = 'landuse_cemetery'][is_building = 'no'],
+  [feature = 'landuse_grave_yard'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
       text-name: "[name]";
-      text-size: 9;
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
       text-fill: darken(@cemetery, 50%);
-      text-face-name: @book-fonts;
-      // extra halo needed to overpower the cemetery polygon pattern
-      text-halo-radius: 1.5;
-      text-wrap-width: 10;
+      text-face-name: @landcover-face-name;
+      text-halo-radius: 1.5; /* extra halo needed to overpower the cemetery polygon pattern */
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
       text-placement: interior;
     }
   }
 
-  [feature = 'landuse_residential'] {
-    [zoom >= 15] {
+  [feature = 'landuse_residential'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
       text-name: "[name]";
-      text-size: 9;
-      text-fill: #000;
-      text-face-name: @book-fonts;
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@residential, 50%);
+      text-face-name: @landcover-face-name;
       text-halo-radius: 1;
-      text-wrap-width: 10;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
       text-placement: interior;
     }
   }
 
-  [feature = 'landuse_garages'] {
-    [zoom >= 15] {
+  [feature = 'landuse_garages'][is_building = 'no'] {
+    [zoom >= 13][way_pixels > 3000],
+    [zoom >= 17] {
       text-name: "[name]";
-      text-size: 9;
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
       text-fill: darken(@garages, 50%);
-      text-face-name: @book-fonts;
+      text-face-name: @landcover-face-name;
       text-halo-radius: 1;
-      text-wrap-width: 10;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
       text-placement: interior;
     }
   }
 
-  [feature = 'landuse_field'] {
-    [zoom >= 15] {
+  [feature = 'landuse_field'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
       text-name: "[name]";
-      text-size: 9;
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
       text-fill: darken(@field, 50%);
-      text-face-name: @book-fonts;
+      text-face-name: @landcover-face-name;
       text-halo-radius: 1;
-      text-wrap-width: 10;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
       text-placement: interior;
     }
   }
 
-  [feature = 'landuse_meadow'],
-  [feature = 'landuse_grass']  {
-    [zoom >= 15] {
+  [feature = 'landuse_meadow'][is_building = 'no'],
+  [feature = 'landuse_grass'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
       text-name: "[name]";
-      text-size: 9;
-      text-fill: darken(@grass, 65%);
-      text-face-name: @book-fonts;
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@grass, 50%);
+      text-face-name: @landcover-face-name;
       text-halo-radius: 1;
-      text-wrap-width: 10;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
       text-placement: interior;
     }
   }
 
-  [feature = 'landuse_allotments'] {
-    [zoom >= 15] {
+  [feature = 'landuse_allotments'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
       text-name: "[name]";
-      text-size: 9;
-      text-fill: darken(@allotments, 60%);
-      text-face-name: @book-fonts;
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@allotments, 50%);
+      text-face-name: @landcover-face-name;
       text-halo-radius: 1;
-      text-wrap-width: 10;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
       text-placement: interior;
     }
   }
 
-  [feature = 'landuse_forest'] {
-    [zoom >= 15] {
+  [feature = 'landuse_forest'][is_building = 'no'] {
+    [zoom >= 8][way_pixels > 3000],
+    [zoom >= 17] {
       text-name: "[name]";
-      text-size: 9;
-      text-fill: darken(@forest, 50%);
-      text-face-name: @book-fonts;
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@forest, 30%);
+      text-face-name: @landcover-face-name;
       text-halo-radius: 1;
-      text-wrap-width: 10;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
       text-placement: interior;
     }
   }
 
-  [feature = 'landuse_farm'],
-  [feature = 'landuse_farmland'],
-  [feature = 'landuse_farmyard'] {
-    [zoom >= 15] {
+  [feature = 'landuse_farmyard'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
+      text-name: "[name]"; 
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@farmyard, 50%);
+      text-face-name: @landcover-face-name;
+      text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
+      text-placement: interior;
+    }
+  }
+  [feature = 'landuse_farm'][is_building = 'no'],
+  [feature = 'landuse_farmland'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
       text-name: "[name]";
-      text-size: 9;
-      text-fill: darken(@farmland, 70%);
-      text-face-name: @book-fonts;
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@farmland, 50%);
+      text-face-name: @landcover-face-name;
       text-halo-radius: 1;
-      text-wrap-width: 10;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
       text-placement: interior;
     }
   }
 
-  [feature = 'landuse_retail'] {
-    [zoom >= 15] {
+  [feature = 'landuse_retail'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
       text-name: "[name]";
-      text-size: 9;
-      text-fill: darken(@retail, 60%);
-      text-face-name: @book-fonts;
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@retail, 50%);
+      text-face-name: @landcover-face-name;
       text-halo-radius: 1;
-      text-wrap-width: 10;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
       text-placement: interior;
     }
   }
 
-  [feature = 'landuse_industrial'],
-  [feature = 'landuse_railway'] {
-    [zoom >= 15] {
+  [feature = 'landuse_industrial'][is_building = 'no'],
+  [feature = 'landuse_railway'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
       text-name: "[name]";
-      text-size: 9;
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
       text-fill: darken(@industrial, 60%);
-      text-face-name: @book-fonts;
+      text-face-name: @landcover-face-name;
       text-halo-radius: 1;
-      text-wrap-width: 10;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
       text-placement: interior;
     }
   }
 
-  [feature = 'landuse_commercial'] {
-    [zoom >= 15] {
+  [feature = 'landuse_commercial'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
       text-name: "[name]";
-      text-size: 9;
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
       text-fill: darken(@commercial, 60%);
-      text-face-name: @book-fonts;
+      text-face-name: @landcover-face-name;
       text-halo-radius: 1;
-      text-wrap-width: 10;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
       text-placement: interior;
     }
   }
 
-  [feature = 'landuse_brownfield'],
-  [feature = 'landuse_landfill'],
-  [feature = 'landuse_construction'] {
-    [zoom >= 15] {
+  [feature = 'landuse_brownfield'][is_building = 'no'],
+  [feature = 'landuse_landfill'][is_building = 'no'],
+  [feature = 'landuse_construction'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
       text-name: "[name]";
-      text-size: 9;
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
       text-fill: darken(@construction, 50%);
-      text-face-name: @book-fonts;
+      text-face-name: @landcover-face-name;
       text-halo-radius: 1;
-      text-wrap-width: 10;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
       text-placement: interior;
     }
   }
@@ -966,15 +1157,22 @@
     text-placement: interior;
   }
 
-  [feature = 'tourism_caravan_site'][zoom >= 17] {
-    text-name: "[name]";
-    text-size: 10;
-    text-fill: #0066ff;
-    text-dy: 19;
-    text-face-name: @book-fonts;
-    text-halo-radius: 1;
-    text-wrap-width: 70;
-    text-placement: interior;
+  [feature = 'tourism_caravan_site'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
+      text-name: "[name]";
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@campsite, 50%);
+      text-face-name: @landcover-face-name;
+      text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
+      text-placement: interior;
+    }
   }
 
   [feature = 'waterway_lock'][zoom >= 15] {
@@ -1001,16 +1199,21 @@
     }
   }
 
-  [feature = 'tourism_theme_park'][zoom >= 14] {
-    text-name: "[name]";
-    text-size: 8;
-    text-fill: #734a08;
-    text-face-name: @book-fonts;
-    text-halo-radius: 1;
-    text-wrap-width: 30;
-    text-placement: interior;
-    [zoom >= 16] {
-      text-size: 10;
+  [feature = 'tourism_theme_park'][is_building = 'no'] {
+    [zoom >= 13][way_pixels > 3000],
+    [zoom >= 17] {
+      text-name: "[name]";
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: @theme_park;
+      text-face-name: @bold-fonts; /*rendered bold to improve visibility since theme parks tend to have crowded backgrounds*/
+      text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
+      text-placement: interior;
     }
   }
 
@@ -1034,47 +1237,77 @@
     text-placement: interior;
   }
 
-  [feature = 'tourism_attraction'][zoom >= 16] {
-    text-name: "[name]";
-    text-size: 10;
-    text-fill: #660033;
-    text-face-name: @book-fonts;
-    text-halo-radius: 2;
-    text-wrap-width: 10;
-    text-placement: interior;
+  [feature = 'tourism_attraction'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
+      text-name: "[name]";
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@attraction, 40%);
+      text-face-name: @landcover-face-name;
+      text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
+      text-placement: interior;
+    }
   }
 
-  [feature = 'amenity_university'][zoom >= 15] {
-    text-name: "[name]";
-    text-size: 9;
-    text-fill: #000033;
-    text-face-name: @bold-fonts;
-    text-halo-radius: 1;
-    text-wrap-width: 16;
-    text-placement: interior;
+  [feature = 'amenity_university'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
+      text-name: "[name]";
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@school, 65%);
+      text-face-name: @landcover-face-name;
+      text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
+      text-placement: interior;
+    }
   }
 
-  [feature = 'amenity_school'],
-  [feature = 'amenity_college'] {
-    [zoom >= 15] {
+  [feature = 'amenity_school'][is_building = 'no'],
+  [feature = 'amenity_college'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
       text-name: "[name]";
-      text-size: 9;
-      text-fill: #000033;
-      text-face-name: @book-fonts;
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@school, 65%);
+      text-face-name: @landcover-face-name;
       text-halo-radius: 1;
-      text-wrap-width: 14;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
       text-placement: interior;
     }
   }
 
-  [feature = 'amenity_kindergarten'][zoom >= 16] {
-    text-name: "[name]";
-    text-size: 8;
-    text-fill: #000033;
-    text-face-name: @book-fonts;
-    text-halo-radius: 1;
-    text-wrap-width: 14;
-    text-placement: interior;
+  [feature = 'amenity_kindergarten'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
+      text-name: "[name]";
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@school, 65%);
+      text-face-name: @landcover-face-name;
+      text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
+      text-placement: interior;
+    }
   }
 
   [feature = 'man_made_lighthouse'][zoom >= 15] {
@@ -1170,24 +1403,38 @@
     }
   }
 
-  [feature = 'military_danger_area'][zoom >= 12] {
-    text-name: "[name]";
-    text-size: 9;
-    text-fill: @military-text;
-    text-face-name: @bold-fonts;
-    text-halo-radius: 1;
-    text-wrap-width: 10;
-    text-placement: interior;
+  [feature = 'military_danger_area'][is_building = 'no'] {
+    [zoom >= 9][way_pixels > 3000],
+    [zoom >= 17] {
+      text-name: "[name]";
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@danger_area, 40%);
+      text-face-name: @bold-fonts;
+      text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
+      text-placement: interior;
+    }
   }
 
-  [feature = 'landuse_military'] {
-    [zoom >= 15] {
+  [feature = 'landuse_military'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
       text-name: "[name]";
-      text-size: 9;
-      text-fill: @military-text;
-      text-face-name: @book-fonts;
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@military, 40%);
+      text-face-name: @landcover-face-name;
       text-halo-radius: 1;
-      text-wrap-width: 10;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
       text-placement: interior;
     }
   }
@@ -1201,4 +1448,223 @@
     text-wrap-width: 10;
     text-placement: interior;
   }
+
+  [feature = 'military_barracks'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
+      text-name: "[name]";
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@barracks, 40%);
+      text-face-name: @landcover-face-name;
+      text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
+      text-placement: interior;
+    }
+  }
+
+  [feature = 'tourism_zoo'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
+      text-name: "[name]";
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@zoo, 40%);
+      text-face-name: @landcover-face-name;
+      text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
+      text-placement: interior;
+    }
+  }
+
+  [feature = 'power_station'][is_building = 'no'][zoom >= 10],
+  [feature = 'power_generator'][is_building = 'no'][zoom >= 10],
+  [feature = 'power_sub_station'][is_building = 'no'][zoom >= 13],
+  [feature = 'power_substation'][is_building = 'no'][zoom >= 13]{
+    [way_pixels > 3000],
+    [zoom >= 17] {
+      text-name: "[name]";
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@power, 40%);
+      text-face-name: @landcover-face-name;
+      text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
+      text-placement: interior;
+    }
+  }
+
+  [feature = 'natural_desert'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
+      text-name: "[name]";
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@desert, 40%);
+      text-face-name: @landcover-face-name;
+      text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
+      text-placement: interior;
+    }
+  }
+
+  [feature = 'natural_sand'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
+      text-name: "[name]";
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@sand, 50%);
+      text-face-name: @landcover-face-name;
+      text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
+      text-placement: interior;
+    }
+  }
+
+  [feature = 'natural_heath'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
+      text-name: "[name]";
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@heath, 40%);
+      text-face-name: @landcover-face-name;
+      text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
+      text-placement: interior;
+    }
+  }
+
+
+  [feature = 'natural_grassland'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
+      text-name: "[name]";
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@grassland, 60%);
+      text-face-name: @landcover-face-name;
+      text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
+      text-placement: interior;
+    }
+  }
+
+  [feature = 'natural_scrub'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
+      text-name: "[name]";
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@scrub, 60%);
+      text-face-name: @landcover-face-name;
+      text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
+      text-placement: interior;
+    }
+  }
+
+  [feature = 'aeroway_apron'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
+      text-name: "[name]";
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@apron, 60%);
+      text-face-name: @landcover-face-name;
+      text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
+      text-placement: interior;
+    }
+  }
+
+  [feature = 'natural_beach'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
+      text-name: "[name]";
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@beach, 60%);
+      text-face-name: @landcover-face-name;
+      text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
+      text-placement: interior;
+    }
+  }
+
+  [feature = 'highway_services'][is_building = 'no'],
+  [feature = 'highway_rest_area'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
+      text-name: "[name]";
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@rest_area, 40%);
+      text-face-name: @landcover-face-name;
+      text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
+    }
+  }
+
+  [feature = 'natural_glacier'][is_building = 'no'] {
+    [zoom >= 10][way_pixels > 3000],
+    [zoom >= 17] {
+      text-name: "[name]";
+      text-size: @landcover-font-size;
+      [way_pixels > 12000] { text-size: @landcover-font-size-big; }
+      [way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
+      text-fill: darken(@glacier, 40%);
+      text-face-name: @landcover-face-name;
+      text-halo-radius: 1;
+      text-halo-fill: rgba(255,255,255,0.6);
+      text-wrap-width: @landcover-wrap-width-size;
+      [way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
+      [way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
+    }
+  }
 }
diff --git a/landcover.mss b/landcover.mss
index 06a4594b8a..c0ba0c417b 100644
--- a/landcover.mss
+++ b/landcover.mss
@@ -3,10 +3,10 @@
 @forest: #a0cf85;
 @grass: #cfeca8; // also meadow, common, garden, village_green, conservation
 @golf_course: #b5e3b5;
-@natural: #c6e4b4; // also grassland
 @park: #cdf7c9; // also recreation_ground
 @wood: #aed1a0;
 @vineyard: #abdf96;
+@grassland: #c6e4b4;
 
 // --- sports ---
 
@@ -53,6 +53,12 @@
 @rest_area: #efc8c8; // also services
 @sand: #ffdf88;
 @school: #f0f0d8; // also university, college, hospital, kindergarten
+@scrub: #b5e3b5;
+@theme_park: #734a08;
+@quarry: #c5c3c3;
+@military: #f55;
+@zoo: #a4f3a1;
+@beach: #fff1ba;
 
 #landcover {
  [feature = 'leisure_swimming_pool'][zoom >= 14] {
@@ -315,12 +321,12 @@
   }
 
   [feature = 'natural_grassland'][zoom >= 10] {
-    polygon-fill: #c6e4b4;
+    polygon-fill: @grassland;
   }
 
   [feature = 'natural_scrub'] {
     [zoom >= 10][zoom < 14] {
-      polygon-fill: #b5e3b5;
+      polygon-fill: @scrub;
     }
     [zoom >= 14] {
       polygon-pattern-file: url('symbols/scrub.png');
@@ -411,7 +417,7 @@
   [landuse = 'military'][zoom >= 10]::landuse {
     polygon-pattern-file: url('symbols/military_red_hatch.png');
     polygon-pattern-alignment: global;
-    line-color: #f55;
+    line-color: @military;
     line-width: 3;
     line-opacity: 0.329;
   }
@@ -465,7 +471,7 @@
 
 #theme-park {
   [tourism = 'theme_park'][zoom >= 13] {
-    line-color: #734a08;
+    line-color: @theme_park;
     line-width: 1.5;
     line-dasharray: 9,3;
     line-opacity: 0.6;
diff --git a/project.mml b/project.mml
index b36ac72ef5..7e0ea1c8e2 100644
--- a/project.mml
+++ b/project.mml
@@ -85,7 +85,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT \n    way, name, religion,\n    COALESCE(aeroway, amenity, landuse, leisure, military, \"natural\", power, tourism, highway) AS feature \n  FROM (SELECT \n      way, COALESCE(name,'') AS name, \n      ('aeroway_' || (CASE WHEN aeroway IN ('apron', 'aerodrome') THEN aeroway ELSE NULL END)) AS aeroway,\n      ('amenity_' || (CASE WHEN amenity IN ('parking', 'university', 'college', 'school', 'hospital', 'kindergarten', 'grave_yard') THEN amenity ELSE NULL END)) AS amenity,\n      ('landuse_' || (CASE WHEN landuse IN ('quarry', 'vineyard', 'orchard', 'cemetery', 'residential', 'garages', 'field', 'meadow', 'grass', 'allotments', 'forest', 'farmyard', 'farm', 'farmland', 'recreation_ground', 'conservation', 'village_green', 'retail', 'industrial', 'railway', 'commercial', 'brownfield', 'landfill', 'construction') THEN landuse ELSE NULL END)) AS landuse,\n      ('leisure_' || (CASE WHEN leisure IN ('swimming_pool', 'playground', 'park', 'recreation_ground', 'common', 'garden', 'golf_course', 'picnic_table','sports_centre','stadium','pitch','track') THEN leisure ELSE NULL END)) AS leisure,\n      ('military_' || (CASE WHEN military IN ('barracks', 'danger_area') THEN military ELSE NULL END)) AS military,\n      ('natural_' || (CASE WHEN \"natural\" IN ('beach','desert','heath','mud','grassland','wood','sand','scrub') THEN \"natural\" ELSE NULL END)) AS \"natural\",\n      ('power_' || (CASE WHEN power IN ('station','sub_station','substation','generator') THEN power ELSE NULL END)) AS power,\n      ('tourism_' || (CASE WHEN tourism IN ('attraction', 'camp_site', 'caravan_site', 'picnic_site', 'zoo') THEN tourism ELSE NULL END)) AS tourism,\n      ('highway_' || (CASE WHEN highway IN ('services', 'rest_area') THEN highway ELSE NULL END)) AS highway,\n      CASE WHEN religion IN ('christian','jewish') THEN religion ELSE 'INT-generic'::text end AS religion\n    FROM planet_osm_polygon\n    WHERE landuse IS NOT NULL\n      OR leisure IS NOT NULL\n      OR aeroway IN ('apron','aerodrome')\n      OR amenity IN ('parking','university','college','school','hospital','kindergarten','grave_yard')\n      OR military IN ('barracks','danger_area')\n      OR \"natural\" IN ('beach','desert','heath','mud','grassland','wood','sand','scrub')\n      OR power IN ('station','sub_station','substation','generator')\n      OR tourism IN ('attraction','camp_site','caravan_site','picnic_site','zoo')\n      OR highway IN ('services','rest_area')\n    ORDER BY z_order, way_area DESC\n  ) AS landcover\n) AS features", 
+        "table": "(SELECT \n    way, name, religion,\n    COALESCE(aeroway, amenity, landuse, leisure, military, \"natural\", power, tourism, highway) AS feature \n  FROM (SELECT \n      way, COALESCE(name, '') AS name, \n      ('aeroway_' || (CASE WHEN aeroway IN ('apron', 'aerodrome') THEN aeroway ELSE NULL END)) AS aeroway,\n      ('amenity_' || (CASE WHEN amenity IN ('parking', 'university', 'college', 'school', 'hospital', 'kindergarten', 'grave_yard') THEN amenity ELSE NULL END)) AS amenity,\n      ('landuse_' || (CASE WHEN landuse IN ('quarry', 'vineyard', 'orchard', 'cemetery', 'residential', 'garages', 'field', 'meadow', 'grass', 'allotments', 'forest', 'farmyard', 'farm', 'farmland', 'recreation_ground', 'conservation', 'village_green', 'retail', 'industrial', 'railway', 'commercial', 'brownfield', 'landfill', 'construction') THEN landuse ELSE NULL END)) AS landuse,\n      ('leisure_' || (CASE WHEN leisure IN ('swimming_pool', 'playground', 'park', 'recreation_ground', 'common', 'garden', 'golf_course', 'picnic_table', 'sports_centre', 'stadium', 'pitch', 'track') THEN leisure ELSE NULL END)) AS leisure,\n      ('military_' || (CASE WHEN military IN ('barracks', 'danger_area') THEN military ELSE NULL END)) AS military,\n      ('natural_' || (CASE WHEN \"natural\" IN ('beach', 'desert', 'heath', 'mud', 'grassland', 'wood', 'sand', 'scrub') THEN \"natural\" ELSE NULL END)) AS \"natural\",\n      ('power_' || (CASE WHEN power IN ('station', 'sub_station', 'substation', 'generator') THEN power ELSE NULL END)) AS power,\n      ('tourism_' || (CASE WHEN tourism IN ('attraction', 'camp_site', 'caravan_site', 'picnic_site', 'zoo') THEN tourism ELSE NULL END)) AS tourism,\n      ('highway_' || (CASE WHEN highway IN ('services', 'rest_area') THEN highway ELSE NULL END)) AS highway,\n      CASE WHEN religion IN ('christian', 'jewish') THEN religion ELSE 'INT-generic'::text END AS religion\n    FROM planet_osm_polygon\n    WHERE landuse IS NOT NULL\n      OR leisure IS NOT NULL\n      OR aeroway IN ('apron', 'aerodrome')\n      OR amenity IN ('parking', 'university', 'college', 'school', 'hospital', 'kindergarten', 'grave_yard')\n      OR military IN ('barracks', 'danger_area')\n      OR \"natural\" IN ('beach', 'desert', 'heath', 'mud', 'grassland', 'wood', 'sand', 'scrub')\n      OR power IN ('station', 'sub_station', 'substation', 'generator')\n      OR tourism IN ('attraction', 'camp_site', 'caravan_site', 'picnic_site', 'zoo')\n      OR highway IN ('services', 'rest_area')\n    ORDER BY z_order, way_area DESC\n  ) AS landcover\n) AS features", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -200,7 +200,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT \n    way, \"natural\"\n  FROM planet_osm_polygon\n  WHERE \"natural\" IN ('marsh', 'wetland') AND building IS NULL\n  ORDER BY z_order,way_area DESC\n) AS water_areas_overlay", 
+        "table": "(SELECT \n    way, \"natural\"\n  FROM planet_osm_polygon\n  WHERE \"natural\" IN ('marsh', 'wetland') AND building IS NULL\n  ORDER BY z_order, way_area DESC\n) AS water_areas_overlay", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -223,7 +223,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT \n    way, waterway, lock, name,\n    CASE WHEN tunnel IN ('yes','culvert') THEN 'yes' ELSE 'no' END AS int_tunnel, \n    'no' as bridge\n  FROM planet_osm_line\n  WHERE waterway in ('weir', 'river', 'canal', 'derelict_canal', 'stream', 'drain', 'ditch', 'wadi')\n    AND (bridge IS NULL or bridge not in ('yes','aqueduct'))\n  ORDER BY z_order\n) AS water_lines", 
+        "table": "(SELECT \n    way, waterway, lock, name,\n    CASE WHEN tunnel IN ('yes', 'culvert') THEN 'yes' ELSE 'no' END AS int_tunnel, \n    'no' AS bridge\n  FROM planet_osm_line\n  WHERE waterway IN ('weir', 'river', 'canal', 'derelict_canal', 'stream', 'drain', 'ditch', 'wadi')\n    AND (bridge IS NULL OR bridge NOT IN ('yes', 'aqueduct'))\n  ORDER BY z_order\n) AS water_lines", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -384,7 +384,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT \n    way,aeroway,\n  CASE\n   WHEN building IN ('garage','roof','garages','service','shed','shelter','cabin','storage_tank','tank','support','glasshouse','greenhouse','mobile_home','kiosk','silo','canopy','tent') THEN 'INT-light'::text\n   ELSE building\n  END AS building\n  FROM planet_osm_polygon\n  WHERE (building IS NOT null\n      AND building NOT IN ('no','station','supermarket','planned')\n      AND (railway IS null OR railway != 'station')\n      AND (amenity IS null OR amenity != 'place_of_worship'))\n    OR aeroway = 'terminal'\n  ORDER BY z_order, way_area DESC\n) AS buildings", 
+        "table": "(SELECT \n    way, aeroway,\n  CASE\n   WHEN building IN ('garage', 'roof', 'garages', 'service', 'shed', 'shelter', 'cabin', 'storage_tank', 'tank', 'support', 'glasshouse', 'greenhouse', 'mobile_home', 'kiosk', 'silo', 'canopy', 'tent') THEN 'INT-light'::text\n   ELSE building\n  END AS building\n  FROM planet_osm_polygon\n  WHERE (building IS NOT NULL\n      AND building NOT IN ('no', 'station', 'supermarket', 'planned')\n      AND (railway IS NULL OR railway != 'station')\n      AND (amenity IS NULL OR amenity != 'place_of_worship'))\n    OR aeroway = 'terminal'\n  ORDER BY z_order, way_area DESC\n) AS buildings", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -408,7 +408,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT * \n  FROM (\n    (SELECT \n        way, prio, \n        ('highway_' || (CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN substr(highway,0,length(highway)-4) ELSE highway END)) AS feature, \n        horse, foot, bicycle, tracktype, \n        CASE WHEN access IN ('destination') THEN 'destination'::text \n          WHEN access IN ('no', 'private') THEN 'no'::text \n          ELSE NULL \n        END AS access, \n        construction, \n        CASE WHEN service IN ('parking_aisle','drive-through','driveway') THEN 'INT-minor'::text \n          ELSE 'INT-normal'::text \n        END AS service, \n        CASE WHEN oneway in ('yes', '-1') AND highway IN ('motorway','motorway_link','trunk','trunk_link','primary','primary_link','secondary','secondary_link','tertiary','tertiary_link','residential','unclassified','road','service','pedestrian','raceway','living_street','construction') THEN oneway \n          ELSE NULL \n        END AS oneway,\n        CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN 'yes' \n          ELSE 'no' END AS link, \n        CASE WHEN layer IS NULL THEN '0' \n          ELSE layer \n        END AS layernotnull \n    FROM planet_osm_line \n      JOIN (VALUES \n        ('highway_motorway', 380), \n        ('highway_trunk', 370), \n        ('highway_primary', 360), \n        ('highway_secondary', 350), \n        ('highway_tertiary', 340), \n        ('highway_residential', 330), \n        ('highway_unclassified', 330), \n        ('highway_road', 330), \n        ('highway_living_street', 320), \n        ('highway_pedestrian', 310), \n        ('highway_raceway', 300), \n        ('highway_motorway_link', 240), \n        ('highway_trunk_link', 230), \n        ('highway_primary_link', 220), \n        ('highway_secondary_link', 210), \n        ('highway_tertiary_link', 200),\n        ('highway_service', 150), \n        ('highway_track', 110), \n        ('highway_path', 100), \n        ('highway_footway', 100), \n        ('highway_bridleway', 100), \n        ('highway_cycleway', 100),\n        ('highway_steps', 100), \n        ('highway_platform', 90), \n        ('highway_proposed', 20), \n        ('highway_construction', 10)\n      ) AS ordertable (feature, prio) \n        ON ('highway_' || planet_osm_line.highway) = ordertable.feature \n    WHERE (tunnel='yes' OR tunnel = 'building_passage' OR covered='yes')) \n  UNION ALL\n  (SELECT \n      way, prio, \n      COALESCE(('railway_' || (CASE WHEN railway='preserved' AND service in ('spur','siding','yard') THEN 'INT-preserved-ssy'::text WHEN (railway='rail' AND service in ('spur','siding','yard'))  THEN 'INT-spur-siding-yard' else railway END)),\n       ('aeroway_' || aeroway)) AS feature,\n       horse, foot, bicycle, tracktype,\n      CASE WHEN access in ('destination') THEN 'destination'::text \n        WHEN access in ('no', 'private') THEN 'no'::text \n      ELSE NULL END as access,\n      construction,\n      CASE WHEN service in ('parking_aisle','drive-through','driveway') THEN 'INT-minor'::text else 'INT-normal'::text END as service, \n      null AS oneway, \n      'no' AS link,\n      CASE WHEN layer IS NULL THEN '0' ELSE layer END AS layernotnull \n    FROM planet_osm_line \n      JOIN (VALUES \n        ('railway_rail', 430), \n        ('railway_spur', 430), \n        ('railway_siding', 430), \n        ('railway_subway', 420), \n        ('railway_narrow_gauge', 420), \n        ('railway_light_rail', 420), \n        ('railway_preserved', 420), \n        ('railway_funicular', 420), \n        ('railway_monorail', 420), \n        ('railway_miniature', 420), \n        ('railway_turntable', 420), \n        ('railway_tram', 410), \n        ('railway_disused', 400), \n        ('railway_construction', 400), \n        ('aeroway_runway', 60), \n        ('aeroway_taxiway', 50), \n        ('railway_platform', 90)\n      ) AS ordertable (feature, prio) \n        ON COALESCE(('railway_' || planet_osm_line.railway), ('aeroway_' || planet_osm_line.aeroway)) = ordertable.feature\n    WHERE (tunnel='yes' or tunnel='building_passage' or covered='yes'))\n    ) AS features \n  ORDER BY layernotnull, prio\n) AS tunnels", 
+        "table": "(SELECT * \n  FROM (\n    (SELECT \n        way, prio, \n        ('highway_' || (CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN substr(highway, 0, length(highway)-4) ELSE highway END)) AS feature, \n        horse, foot, bicycle, tracktype, \n        CASE WHEN access IN ('destination') THEN 'destination'::text \n          WHEN access IN ('no', 'private') THEN 'no'::text \n          ELSE NULL \n        END AS access, \n        construction, \n        CASE WHEN service IN ('parking_aisle', 'drive-through', 'driveway') THEN 'INT-minor'::text \n          ELSE 'INT-normal'::text \n        END AS service, \n        CASE WHEN oneway IN ('yes', '-1') AND highway IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'residential', 'unclassified', 'road', 'service', 'pedestrian', 'raceway', 'living_street', 'construction') THEN oneway \n          ELSE NULL \n        END AS oneway,\n        CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN 'yes' \n          ELSE 'no' END AS link, \n        CASE WHEN layer IS NULL THEN '0' \n          ELSE layer \n        END AS layernotnull \n    FROM planet_osm_line \n      JOIN (VALUES \n        ('highway_motorway', 380), \n        ('highway_trunk', 370), \n        ('highway_primary', 360), \n        ('highway_secondary', 350), \n        ('highway_tertiary', 340), \n        ('highway_residential', 330), \n        ('highway_unclassified', 330), \n        ('highway_road', 330), \n        ('highway_living_street', 320), \n        ('highway_pedestrian', 310), \n        ('highway_raceway', 300), \n        ('highway_motorway_link', 240), \n        ('highway_trunk_link', 230), \n        ('highway_primary_link', 220), \n        ('highway_secondary_link', 210), \n        ('highway_tertiary_link', 200),\n        ('highway_service', 150), \n        ('highway_track', 110), \n        ('highway_path', 100), \n        ('highway_footway', 100), \n        ('highway_bridleway', 100), \n        ('highway_cycleway', 100),\n        ('highway_steps', 100), \n        ('highway_platform', 90), \n        ('highway_proposed', 20), \n        ('highway_construction', 10)\n      ) AS ordertable (feature, prio) \n        ON ('highway_' || planet_osm_line.highway) = ordertable.feature \n    WHERE (tunnel = 'yes' OR tunnel = 'building_passage' OR covered = 'yes')) \n  UNION ALL\n  (SELECT \n      way, prio, \n      COALESCE(('railway_' || (CASE WHEN railway = 'preserved' AND service IN ('spur', 'siding', 'yard') THEN 'INT-preserved-ssy'::text WHEN (railway = 'rail' AND service IN ('spur', 'siding', 'yard')) THEN 'INT-spur-siding-yard' ELSE railway END)),\n       ('aeroway_' || aeroway)) AS feature,\n       horse, foot, bicycle, tracktype,\n      CASE WHEN access IN ('destination') THEN 'destination'::text \n        WHEN access IN ('no', 'private') THEN 'no'::text \n      ELSE NULL END AS access,\n      construction,\n      CASE WHEN service IN ('parking_aisle', 'drive-through', 'driveway') THEN 'INT-minor'::text ELSE 'INT-normal'::text END AS service, \n      NULL AS oneway, \n      'no' AS link,\n      CASE WHEN layer IS NULL THEN '0' ELSE layer END AS layernotnull \n    FROM planet_osm_line \n      JOIN (VALUES \n        ('railway_rail', 430), \n        ('railway_spur', 430), \n        ('railway_siding', 430), \n        ('railway_subway', 420), \n        ('railway_narrow_gauge', 420), \n        ('railway_light_rail', 420), \n        ('railway_preserved', 420), \n        ('railway_funicular', 420), \n        ('railway_monorail', 420), \n        ('railway_miniature', 420), \n        ('railway_turntable', 420), \n        ('railway_tram', 410), \n        ('railway_disused', 400), \n        ('railway_construction', 400), \n        ('aeroway_runway', 60), \n        ('aeroway_taxiway', 50), \n        ('railway_platform', 90)\n      ) AS ordertable (feature, prio) \n        ON COALESCE(('railway_' || planet_osm_line.railway), ('aeroway_' || planet_osm_line.aeroway)) = ordertable.feature\n    WHERE (tunnel = 'yes' OR tunnel = 'building_passage' OR covered = 'yes')\n    )) AS features \n  ORDER BY layernotnull, prio\n) AS tunnels", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -548,7 +548,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT \n    way,\"natural\",man_made\n  FROM planet_osm_line \n  WHERE \"natural\" = 'cliff' OR man_made = 'embankment'\n) AS cliffs", 
+        "table": "(SELECT \n    way, \"natural\", man_made\n  FROM planet_osm_line \n  WHERE \"natural\" = 'cliff' OR man_made = 'embankment'\n) AS cliffs", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -571,7 +571,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT\n    way,barrier \n  FROM planet_osm_polygon \n  WHERE barrier IS NOT NULL\n) AS area_barriers", 
+        "table": "(SELECT\n    way, barrier \n  FROM planet_osm_polygon \n  WHERE barrier IS NOT NULL\n) AS area_barriers", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -640,7 +640,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT DISTINCT ON (p.way) \n    p.way AS way, l.highway AS int_tc_type,\n    CASE WHEN l.service IN ('parking_aisle','drive-through','driveway') \n      THEN 'INT-minor'::text \n      ELSE 'INT-normal'::text \n    END AS int_tc_service\n  FROM planet_osm_point p\n    JOIN planet_osm_line l ON ST_DWithin(p.way,l.way,0.1) -- Assumes Mercator\n    JOIN (VALUES\n      ('tertiary', 1),\n      ('unclassified', 2),\n      ('residential', 3),\n      ('living_street', 4),\n      ('service', 5)\n      ) AS v (highway, prio)\n      ON v.highway=l.highway\n  WHERE p.highway = 'turning_circle'\n    OR p.highway = 'turning_loop' \n  ORDER BY p.way, v.prio\n) AS turning_circle_casing", 
+        "table": "(SELECT DISTINCT ON (p.way) \n    p.way AS way, l.highway AS int_tc_type,\n    CASE WHEN l.service IN ('parking_aisle', 'drive-through', 'driveway') \n      THEN 'INT-minor'::text \n      ELSE 'INT-normal'::text \n    END AS int_tc_service\n  FROM planet_osm_point p\n    JOIN planet_osm_line l ON ST_DWithin(p.way, l.way, 0.1) -- Assumes Mercator\n    JOIN (VALUES\n      ('tertiary', 1),\n      ('unclassified', 2),\n      ('residential', 3),\n      ('living_street', 4),\n      ('service', 5)\n      ) AS v (highway, prio)\n      ON v.highway=l.highway\n  WHERE p.highway = 'turning_circle'\n    OR p.highway = 'turning_loop' \n  ORDER BY p.way, v.prio\n) AS turning_circle_casing", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -663,7 +663,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT \n    way,\n    COALESCE((\n      'highway_' || (CASE WHEN highway IN ('residential','unclassified','pedestrian','service','footway','cycleway','track','path','platform') THEN highway ELSE NULL END)), \n      ('railway_' || (CASE WHEN railway IN ('platform') THEN railway ELSE NULL END))\n    ) AS feature \n  FROM planet_osm_polygon\n  WHERE highway IN ('residential', 'unclassified', 'pedestrian', 'service', 'footway', 'track', 'path', 'platform')\n    OR railway IN ('platform')\n  ORDER BY z_order, way_area DESC\n) AS highway_area_casing", 
+        "table": "(SELECT \n    way,\n    COALESCE((\n      'highway_' || (CASE WHEN highway IN ('residential', 'unclassified', 'pedestrian', 'service', 'footway', 'cycleway', 'track', 'path', 'platform') THEN highway ELSE NULL END)), \n      ('railway_' || (CASE WHEN railway IN ('platform') THEN railway ELSE NULL END))\n    ) AS feature \n  FROM planet_osm_polygon\n  WHERE highway IN ('residential', 'unclassified', 'pedestrian', 'service', 'footway', 'track', 'path', 'platform')\n    OR railway IN ('platform')\n  ORDER BY z_order, way_area DESC\n) AS highway_area_casing", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -686,7 +686,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT\n    * \n  FROM \n  (\n    (SELECT \n        way, prio, \n        ('highway_' || (CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN substr(highway,0,length(highway)-4) ELSE highway END)) AS feature, \n        horse, foot, bicycle, tracktype, \n        CASE WHEN access IN ('destination') THEN 'destination'::text when access IN ('no', 'private') THEN 'no'::text ELSE NULL END as access, construction, \n        CASE WHEN service IN ('parking_aisle','drive-through','driveway') THEN 'INT-minor'::text ELSE 'INT-normal'::text end as service, \n        CASE WHEN oneway IN ('yes', '-1') \n            AND highway IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'residential', 'unclassified', 'road', 'service', 'pedestrian', 'raceway', 'living_street', 'construction') THEN oneway \n          ELSE NULL \n        END as oneway, \n        CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN 'yes' ELSE 'no' end as link, \n        CASE WHEN layer IS NULL THEN '0' ELSE layer END AS layernotnull \n      FROM planet_osm_line \n        JOIN (VALUES\n          ('highway_motorway',380), \n          ('highway_trunk',370), \n          ('highway_primary',360), \n          ('highway_secondary',350), \n          ('highway_tertiary',340), \n          ('highway_residential',330), \n          ('highway_unclassified',330), \n          ('highway_road',330), \n          ('highway_living_street',320), \n          ('highway_pedestrian',310),  \n          ('highway_raceway',300), \n          ('highway_motorway_link',240), \n          ('highway_trunk_link',230), \n          ('highway_primary_link',220), \n          ('highway_secondary_link',210), \n          ('highway_tertiary_link',200), \n          ('highway_service',150), \n          ('highway_track',110), \n          ('highway_path',100), \n          ('highway_footway',100), \n          ('highway_bridleway',100), \n          ('highway_cycleway',100),  \n          ('highway_steps',100), \n          ('highway_platform',90), \n          ('highway_proposed',20), \n          ('highway_construction',10)\n        ) AS ordertable (feature, prio) \n          ON ('highway_' || planet_osm_line.highway) = ordertable.feature \n        WHERE (tunnel IS NULL OR NOT tunnel IN ('yes', 'building_passage')) \n          AND (covered IS NULL OR NOT covered='yes') \n          AND (bridge IS NULL OR NOT bridge IN ('yes', 'viaduct'))) \n    UNION ALL \n    (SELECT \n        way, prio, \n        COALESCE(('railway_' ||(CASE WHEN railway='preserved' AND service in ('spur','siding','yard') THEN 'INT-preserved-ssy'::text when (railway='rail' AND service in ('spur','siding','yard'))  THEN 'INT-spur-siding-yard' else railway end)), ('aeroway_' || aeroway)) AS feature, \n        horse, foot, bicycle, tracktype, \n        CASE WHEN access in ('destination') THEN 'destination'::text when access in ('no', 'private') THEN 'no'::text ELSE NULL END as access, \n        construction, CASE WHEN service in ('parking_aisle','drive-through','driveway') THEN 'INT-minor'::text else 'INT-normal'::text end as service, \n        null as oneway, 'no' as link, \n        CASE WHEN layer IS NULL THEN '0' else layer end as layernotnull \n      FROM planet_osm_line \n        JOIN (VALUES \n          ('railway_rail', 430),\n          ('railway_spur', 430),\n          ('railway_siding', 430),\n          ('railway_subway', 420),\n          ('railway_narrow_gauge', 420),\n          ('railway_light_rail', 420),\n          ('railway_preserved', 420),\n          ('railway_funicular', 420),\n          ('railway_monorail', 420),\n          ('railway_miniature', 420),\n          ('railway_turntable', 420),\n          ('railway_tram', 410),\n          ('railway_disused', 400),\n          ('railway_construction', 400),\n          ('aeroway_runway', 60),\n          ('aeroway_taxiway', 50),\n          ('railway_platform', 90)\n        ) AS ordertable (feature, prio) \n          ON COALESCE(('railway_' || planet_osm_line.railway), ('aeroway_' || planet_osm_line.aeroway)) = ordertable.feature\n      WHERE (tunnel IS NULL or not tunnel in ('yes','building_passage'))\n        AND (covered IS NULL or not covered='yes') \n        AND (bridge IS NULL or not bridge in ('yes','viaduct'))\n      )\n    ) AS features \n  ORDER BY prio\n) AS roads_casing", 
+        "table": "(SELECT\n    * \n  FROM \n  (\n    (SELECT \n        way, prio, \n        ('highway_' || (CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN substr(highway, 0, length(highway)-4) ELSE highway END)) AS feature, \n        horse, foot, bicycle, tracktype, \n        CASE WHEN access IN ('destination') THEN 'destination'::text WHEN access IN ('no', 'private') THEN 'no'::text ELSE NULL END AS access, construction, \n        CASE WHEN service IN ('parking_aisle', 'drive-through', 'driveway') THEN 'INT-minor'::text ELSE 'INT-normal'::text END AS service, \n        CASE WHEN oneway IN ('yes', '-1') \n            AND highway IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'residential', 'unclassified', 'road', 'service', 'pedestrian', 'raceway', 'living_street', 'construction') THEN oneway \n          ELSE NULL \n        END AS oneway, \n        CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN 'yes' ELSE 'no' END AS link, \n        CASE WHEN layer IS NULL THEN '0' ELSE layer END AS layernotnull \n      FROM planet_osm_line \n        JOIN (VALUES\n          ('highway_motorway',380), \n          ('highway_trunk',370), \n          ('highway_primary',360), \n          ('highway_secondary',350), \n          ('highway_tertiary',340), \n          ('highway_residential',330), \n          ('highway_unclassified',330), \n          ('highway_road',330), \n          ('highway_living_street',320), \n          ('highway_pedestrian',310),  \n          ('highway_raceway',300), \n          ('highway_motorway_link',240), \n          ('highway_trunk_link',230), \n          ('highway_primary_link',220), \n          ('highway_secondary_link',210), \n          ('highway_tertiary_link',200), \n          ('highway_service',150), \n          ('highway_track',110), \n          ('highway_path',100), \n          ('highway_footway',100), \n          ('highway_bridleway',100), \n          ('highway_cycleway',100),  \n          ('highway_steps',100), \n          ('highway_platform',90), \n          ('highway_proposed',20), \n          ('highway_construction',10)\n        ) AS ordertable (feature, prio) \n          ON ('highway_' || planet_osm_line.highway) = ordertable.feature \n        WHERE (tunnel IS NULL OR NOT tunnel IN ('yes', 'building_passage')) \n          AND (covered IS NULL OR NOT covered = 'yes') \n          AND (bridge IS NULL OR NOT bridge IN ('yes', 'viaduct'))) \n    UNION ALL \n    (SELECT \n        way, prio, \n        COALESCE(('railway_' ||(CASE WHEN railway = 'preserved' AND service IN ('spur', 'siding', 'yard') THEN 'INT-preserved-ssy'::text WHEN (railway = 'rail' AND service IN ('spur', 'siding', 'yard')) THEN 'INT-spur-siding-yard' ELSE railway end)), ('aeroway_' || aeroway)) AS feature, \n        horse, foot, bicycle, tracktype, \n        CASE WHEN access IN ('destination') THEN 'destination'::text WHEN access IN ('no', 'private') THEN 'no'::text ELSE NULL END AS access, \n        construction, CASE WHEN service IN ('parking_aisle', 'drive-through', 'driveway') THEN 'INT-minor'::text ELSE 'INT-normal'::text END AS service, \n        NULL AS oneway, 'no' AS link, \n        CASE WHEN layer IS NULL THEN '0' ELSE layer END AS layernotnull \n      FROM planet_osm_line \n        JOIN (VALUES \n          ('railway_rail', 430),\n          ('railway_spur', 430),\n          ('railway_siding', 430),\n          ('railway_subway', 420),\n          ('railway_narrow_gauge', 420),\n          ('railway_light_rail', 420),\n          ('railway_preserved', 420),\n          ('railway_funicular', 420),\n          ('railway_monorail', 420),\n          ('railway_miniature', 420),\n          ('railway_turntable', 420),\n          ('railway_tram', 410),\n          ('railway_disused', 400),\n          ('railway_construction', 400),\n          ('aeroway_runway', 60),\n          ('aeroway_taxiway', 50),\n          ('railway_platform', 90)\n        ) AS ordertable (feature, prio) \n          ON COALESCE(('railway_' || planet_osm_line.railway), ('aeroway_' || planet_osm_line.aeroway)) = ordertable.feature\n      WHERE (tunnel IS NULL OR NOT tunnel IN ('yes', 'building_passage'))\n        AND (covered IS NULL OR NOT covered = 'yes') \n        AND (bridge IS NULL OR NOT bridge IN ('yes', 'viaduct'))\n      )\n    ) AS features \n  ORDER BY prio\n) AS roads_casing", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -708,7 +708,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT \n    way,\n    COALESCE(\n      ('highway_' || (CASE WHEN highway in ('residential','unclassified','pedestrian','service','footway','cycleway','living_street','track','path','platform','services') THEN highway ELSE NULL END)), \n      ('railway_' || (CASE WHEN railway in ('platform') THEN railway ELSE NULL END)),\n      (('aeroway_' || CASE WHEN aeroway in ('runway','taxiway','helipad') THEN aeroway ELSE NULL END))\n    ) AS feature \n  FROM planet_osm_polygon\n  WHERE highway in ('residential', 'unclassified', 'pedestrian', 'service', 'footway', 'living_street', 'track', 'path', 'platform', 'services')\n    OR railway IN ('platform')\n    OR aeroway IN ('runway', 'taxiway', 'helipad')\n  ORDER BY z_order, way_area desc\n) AS highway_area_fill", 
+        "table": "(SELECT \n    way,\n    COALESCE(\n      ('highway_' || (CASE WHEN highway IN ('residential', 'unclassified', 'pedestrian', 'service', 'footway', 'cycleway', 'living_street', 'track', 'path', 'platform', 'services') THEN highway ELSE NULL END)), \n      ('railway_' || (CASE WHEN railway IN ('platform') THEN railway ELSE NULL END)),\n      (('aeroway_' || CASE WHEN aeroway IN ('runway', 'taxiway', 'helipad') THEN aeroway ELSE NULL END))\n    ) AS feature \n  FROM planet_osm_polygon\n  WHERE highway IN ('residential', 'unclassified', 'pedestrian', 'service', 'footway', 'living_street', 'track', 'path', 'platform', 'services')\n    OR railway IN ('platform')\n    OR aeroway IN ('runway', 'taxiway', 'helipad')\n  ORDER BY z_order, way_area desc\n) AS highway_area_fill", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -731,7 +731,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT \n    * \n  FROM \n  (\n    (SELECT \n        way, prio, \n        ('highway_' || (CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN substr(highway,0,length(highway)-4) else highway end)) AS feature, \n        horse, foot, bicycle, tracktype, \n        CASE WHEN access in ('destination') THEN 'destination'::text \n          WHEN access in ('no', 'private') THEN 'no'::text \n          ELSE NULL \n        END AS access,\n        construction, \n        CASE WHEN service in ('parking_aisle','drive-through','driveway') THEN 'INT-minor'::text else 'INT-normal'::text end as service, \n        CASE WHEN oneway in ('yes', '-1') AND highway in ('motorway', 'motorway_link',  'trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'residential', 'unclassified', 'road', 'service', 'pedestrian', 'raceway', 'living_street', 'construction') THEN oneway ELSE NULL END as oneway, \n        CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN 'yes' else 'no' end as link, CASE WHEN layer IS NULL THEN '0' else layer end as layernotnull \n      FROM planet_osm_line \n        JOIN (VALUES \n          ('highway_motorway',380), \n          ('highway_trunk',370), \n          ('highway_primary',360), \n          ('highway_secondary',350), \n          ('highway_tertiary',340), \n          ('highway_residential',330),\n          ('highway_unclassified',330),\n          ('highway_road',330),\n          ('highway_living_street',320),\n          ('highway_pedestrian',310),\n          ('highway_raceway',300),\n          ('highway_motorway_link',240),\n          ('highway_trunk_link',230),\n          ('highway_primary_link',220),\n          ('highway_secondary_link',210),\n          ('highway_tertiary_link',200),\n          ('highway_service',150),\n          ('highway_track',110),\n          ('highway_path',100),\n          ('highway_footway',100),\n          ('highway_bridleway',100),\n          ('highway_cycleway',100),\n          ('highway_steps',100),\n          ('highway_platform',90),\n          ('highway_proposed',20),\n          ('highway_construction',10)\n        ) AS ordertable (feature, prio) \n          on ('highway_' || planet_osm_line.highway) = ordertable.feature \n      WHERE (tunnel IS NULL or not tunnel in ('yes','building_passage')) \n        AND (covered IS NULL or not covered='yes') \n        AND (bridge IS NULL or not bridge in ('yes','viaduct'))) \n    union all \n    (SELECT \n        way, prio, \n        COALESCE(\n          ('railway_' || (CASE WHEN railway='preserved' AND service IN ('spur','siding','yard') THEN 'INT-preserved-ssy'::text WHEN (railway='rail' AND service in ('spur','siding','yard')) THEN 'INT-spur-siding-yard' ELSE railway END)),\n          ('aeroway_' || aeroway)\n        ) AS feature,\n        horse, foot, bicycle, tracktype,\n        CASE WHEN access in ('destination') THEN 'destination'::text \n          WHEN access IN ('no', 'private') THEN 'no'::text \n          ELSE NULL \n        END as access,\n        construction,\n        CASE WHEN service in ('parking_aisle','drive-through','driveway') THEN 'INT-minor'::text \n          ELSE 'INT-normal'::text \n        END as service,\n        NULL as oneway, \n        'no' as link,\n        CASE WHEN layer IS NULL THEN '0' ELSE layer END AS layernotnull \n      FROM planet_osm_line \n        JOIN (VALUES\n          ('railway_rail',430),\n          ('railway_spur',430),\n          ('railway_siding',430),\n          ('railway_subway',420),\n          ('railway_narrow_gauge',420),\n          ('railway_light_rail',420),\n          ('railway_preserved',420),\n          ('railway_funicular',420),\n          ('railway_monorail',420), \n          ('railway_miniature',420),\n          ('railway_turntable',420),\n          ('railway_tram',410),\n          ('railway_disused',400),\n          ('railway_construction',400),\n          ('aeroway_runway',60),\n          ('aeroway_taxiway',50),\n          ('railway_platform',90)) AS ordertable (feature, prio) \n        ON COALESCE(('railway_' || planet_osm_line.railway), ('aeroway_' || planet_osm_line.aeroway)) = ordertable.feature \n      WHERE (tunnel IS NULL OR NOT tunnel IN ('yes','building_passage')) \n        AND (covered IS NULL OR NOT covered='yes') \n        AND (bridge IS NULL OR NOT bridge IN ('yes','viaduct'))\n    )\n  ) AS features ORDER BY prio\n) AS roads_fill", 
+        "table": "(SELECT \n    * \n  FROM \n  (\n    (SELECT \n        way, prio, \n        ('highway_' || (CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN substr(highway, 0, length(highway)-4) ELSE highway end)) AS feature, \n        horse, foot, bicycle, tracktype, \n        CASE WHEN access IN ('destination') THEN 'destination'::text \n          WHEN access IN ('no', 'private') THEN 'no'::text \n          ELSE NULL \n        END AS access,\n        construction, \n        CASE WHEN service IN ('parking_aisle', 'drive-through', 'driveway') THEN 'INT-minor'::text ELSE 'INT-normal'::text END AS service, \n        CASE WHEN oneway IN ('yes', '-1') AND highway IN ('motorway', 'motorway_link',  'trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'residential', 'unclassified', 'road', 'service', 'pedestrian', 'raceway', 'living_street', 'construction') THEN oneway ELSE NULL END AS oneway, \n        CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN 'yes' ELSE 'no' END AS link, CASE WHEN layer IS NULL THEN '0' ELSE layer END AS layernotnull \n      FROM planet_osm_line \n        JOIN (VALUES \n          ('highway_motorway',380), \n          ('highway_trunk',370), \n          ('highway_primary',360), \n          ('highway_secondary',350), \n          ('highway_tertiary',340), \n          ('highway_residential',330),\n          ('highway_unclassified',330),\n          ('highway_road',330),\n          ('highway_living_street',320),\n          ('highway_pedestrian',310),\n          ('highway_raceway',300),\n          ('highway_motorway_link',240),\n          ('highway_trunk_link',230),\n          ('highway_primary_link',220),\n          ('highway_secondary_link',210),\n          ('highway_tertiary_link',200),\n          ('highway_service',150),\n          ('highway_track',110),\n          ('highway_path',100),\n          ('highway_footway',100),\n          ('highway_bridleway',100),\n          ('highway_cycleway',100),\n          ('highway_steps',100),\n          ('highway_platform',90),\n          ('highway_proposed',20),\n          ('highway_construction',10)\n        ) AS ordertable (feature, prio) \n          on ('highway_' || planet_osm_line.highway) = ordertable.feature \n      WHERE (tunnel IS NULL OR NOT tunnel IN ('yes', 'building_passage')) \n        AND (covered IS NULL OR NOT covered = 'yes') \n        AND (bridge IS NULL OR NOT bridge IN ('yes', 'viaduct'))) \n    UNION ALL\n    (SELECT \n        way, prio, \n        COALESCE(\n          ('railway_' || (CASE WHEN railway = 'preserved' AND service IN ('spur', 'siding', 'yard') THEN 'INT-preserved-ssy'::text WHEN (railway = 'rail' AND service IN ('spur', 'siding', 'yard')) THEN 'INT-spur-siding-yard' ELSE railway END)),\n          ('aeroway_' || aeroway)\n        ) AS feature,\n        horse, foot, bicycle, tracktype,\n        CASE WHEN access IN ('destination') THEN 'destination'::text \n          WHEN access IN ('no', 'private') THEN 'no'::text \n          ELSE NULL \n        END AS access,\n        construction,\n        CASE WHEN service IN ('parking_aisle', 'drive-through', 'driveway') THEN 'INT-minor'::text \n          ELSE 'INT-normal'::text \n        END AS service,\n        NULL AS oneway, \n        'no' AS link,\n        CASE WHEN layer IS NULL THEN '0' ELSE layer END AS layernotnull \n      FROM planet_osm_line \n        JOIN (VALUES\n          ('railway_rail',430),\n          ('railway_spur',430),\n          ('railway_siding',430),\n          ('railway_subway',420),\n          ('railway_narrow_gauge',420),\n          ('railway_light_rail',420),\n          ('railway_preserved',420),\n          ('railway_funicular',420),\n          ('railway_monorail',420), \n          ('railway_miniature',420),\n          ('railway_turntable',420),\n          ('railway_tram',410),\n          ('railway_disused',400),\n          ('railway_construction',400),\n          ('aeroway_runway',60),\n          ('aeroway_taxiway',50),\n          ('railway_platform',90)) AS ordertable (feature, prio) \n        ON COALESCE(('railway_' || planet_osm_line.railway), ('aeroway_' || planet_osm_line.aeroway)) = ordertable.feature \n      WHERE (tunnel IS NULL OR NOT tunnel IN ('yes', 'building_passage')) \n        AND (covered IS NULL OR NOT covered = 'yes') \n        AND (bridge IS NULL OR NOT bridge IN ('yes', 'viaduct'))\n    )\n  ) AS features ORDER BY prio\n) AS roads_fill", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -754,7 +754,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT \n    DISTINCT on (p.way) \n    p.way as way, l.highway as int_tc_type,\n    CASE WHEN l.service IN ('parking_aisle','drive-through','driveway') THEN 'INT-minor'::text \n      ELSE 'INT-normal'::text end AS int_tc_service\n  FROM planet_osm_point p\n    JOIN planet_osm_line l\n      ON ST_DWithin(p.way, l.way, 0.1)\n    JOIN (VALUES\n      ('tertiary', 1),\n      ('unclassified', 2),\n      ('residential', 3),\n      ('living_street', 4),\n      ('service', 5)\n    ) AS v (highway,prio)\n      ON v.highway=l.highway\n  WHERE p.highway='turning_circle' or p.highway='turning_loop' \n  ORDER BY p.way,v.prio\n) AS turning_circle_fill", 
+        "table": "(SELECT \n    DISTINCT on (p.way) \n    p.way AS way, l.highway AS int_tc_type,\n    CASE WHEN l.service IN ('parking_aisle', 'drive-through', 'driveway') THEN 'INT-minor'::text \n      ELSE 'INT-normal'::text END AS int_tc_service\n  FROM planet_osm_point p\n    JOIN planet_osm_line l\n      ON ST_DWithin(p.way, l.way, 0.1)\n    JOIN (VALUES\n      ('tertiary', 1),\n      ('unclassified', 2),\n      ('residential', 3),\n      ('living_street', 4),\n      ('service', 5)\n    ) AS v (highway, prio)\n      ON v.highway=l.highway\n  WHERE p.highway = 'turning_circle' OR p.highway = 'turning_loop' \n  ORDER BY p.way, v.prio\n) AS turning_circle_fill", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -777,7 +777,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT way,aerialway FROM planet_osm_line WHERE aerialway IS NOT NULL) AS aerialways", 
+        "table": "(SELECT way, aerialway FROM planet_osm_line WHERE aerialway IS NOT NULL) AS aerialways", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -800,7 +800,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "      (SELECT way,coalesce(('highway_' || (CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN substr(highway,0,length(highway)-4) else highway end)), ('railway_' || (CASE WHEN (railway='rail' AND service in ('spur','siding','yard'))  THEN 'INT-spur-siding-yard' when railway in ('rail','tram','light_rail','funicular','narrow_gauge') THEN railway ELSE NULL END))) AS feature,tunnel\n       FROM planet_osm_roads\n       WHERE highway IS NOT NULL\n          or (railway IS NOT NULL AND railway!='preserved' AND (service IS NULL or service not in ('spur','siding','yard')))\n       ORDER BY z_order\n      ) AS roads_low_zoom", 
+        "table": "      (SELECT way, COALESCE(('highway_' || (CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN substr(highway, 0, length(highway)-4) ELSE highway end)), ('railway_' || (CASE WHEN (railway = 'rail' AND service IN ('spur', 'siding', 'yard')) THEN 'INT-spur-siding-yard' WHEN railway IN ('rail', 'tram', 'light_rail', 'funicular', 'narrow_gauge') THEN railway ELSE NULL END))) AS feature, tunnel\n       FROM planet_osm_roads\n       WHERE highway IS NOT NULL\n          OR (railway IS NOT NULL AND railway != 'preserved' AND (service IS NULL OR service NOT IN ('spur', 'siding', 'yard')))\n       ORDER BY z_order\n      ) AS roads_low_zoom", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -823,7 +823,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT way,waterway,name,CASE WHEN tunnel in ('yes','culvert') THEN 'yes' else 'no' end as int_tunnel, 'yes' as bridge FROM planet_osm_line WHERE waterway in ('river','canal','derelict_canal','stream','drain','ditch','wadi') AND bridge in ('yes','aqueduct') ORDER BY z_order) AS waterway_bridges", 
+        "table": "(SELECT way, waterway, name, CASE WHEN tunnel IN ('yes', 'culvert') THEN 'yes' ELSE 'no' END AS int_tunnel, 'yes' AS bridge FROM planet_osm_line WHERE waterway IN ('river', 'canal', 'derelict_canal', 'stream', 'drain', 'ditch', 'wadi') AND bridge IN ('yes', 'aqueduct') ORDER BY z_order) AS waterway_bridges", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -847,7 +847,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT * FROM ((SELECT way, prio, ('highway_' || (CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN substr(highway,0,length(highway)-4) else highway end)) AS feature, horse, foot, bicycle, tracktype, CASE WHEN access in ('destination') THEN 'destination'::text when access in ('no', 'private') THEN 'no'::text ELSE NULL END as access, construction, CASE WHEN service in ('parking_aisle','drive-through','driveway') THEN 'INT-minor'::text else 'INT-normal'::text end as service, CASE WHEN oneway in ('yes', '-1') AND highway in ('motorway','motorway_link','trunk','trunk_link','primary','primary_link','secondary','secondary_link','tertiary','tertiary_link','residential','unclassified','road','service','pedestrian','raceway','living_street','construction') THEN oneway ELSE NULL END as oneway, CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN 'yes' else 'no' end as link, CASE WHEN layer IS NULL THEN '0' else layer end as layernotnull FROM planet_osm_line JOIN ( values ('highway_motorway',380), ('highway_trunk',370), ('highway_primary',360), ('highway_secondary',350), ('highway_tertiary',340), ('highway_residential',330), ('highway_unclassified',330), ('highway_road',330), ('highway_living_street',320), ('highway_pedestrian',310),  ('highway_raceway',300), ('highway_motorway_link',240), ('highway_trunk_link',230), ('highway_primary_link',220), ('highway_secondary_link',210), ('highway_tertiary_link',200), ('highway_service',150), ('highway_track',110), ('highway_path',100), ('highway_footway',100), ('highway_bridleway',100), ('highway_cycleway',100),  ('highway_steps',100), ('highway_platform',90), ('highway_proposed',20), ('highway_construction',10)) AS ordertable (feature, prio) on ('highway_' || planet_osm_line.highway) = ordertable.feature WHERE bridge in ('yes','viaduct')) union all (SELECT way, prio, coalesce(('railway_' ||(CASE WHEN railway='preserved' AND service in ('spur','siding','yard') THEN 'INT-preserved-ssy'::text when (railway='rail' AND service in ('spur','siding','yard'))  THEN 'INT-spur-siding-yard' else railway end)), ('aeroway_' || aeroway)) AS feature, horse, foot, bicycle, tracktype, CASE WHEN access in ('destination') THEN 'destination'::text when access in ('no', 'private') THEN 'no'::text ELSE NULL END as access, construction, CASE WHEN service in ('parking_aisle','drive-through','driveway') THEN 'INT-minor'::text else 'INT-normal'::text end as service, null as oneway, 'no' as link, CASE WHEN layer IS NULL THEN '0' else layer end as layernotnull FROM planet_osm_line JOIN ( values ('railway_rail',430), ('railway_spur',430), ('railway_siding',430), ('railway_subway',420), ('railway_narrow_gauge',420), ('railway_light_rail',420), ('railway_preserved',420), ('railway_funicular',420), ('railway_monorail',420), ('railway_miniature',420), ('railway_turntable',420), ('railway_tram',410), ('railway_disused',400), ('railway_construction',400), ('aeroway_runway',60), ('aeroway_taxiway',50), ('railway_platform',90)) AS ordertable (feature, prio) on coalesce(('railway_' || planet_osm_line.railway), ('aeroway_' || planet_osm_line.aeroway)) = ordertable.feature WHERE bridge in ('yes','viaduct'))) AS features ORDER BY layernotnull,prio) AS bridges", 
+        "table": "(SELECT * \n  FROM (\n    (SELECT \n        way, prio, \n        ('highway_' || (CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN substr(highway, 0, length(highway)-4) ELSE highway END)) AS feature, \n        horse, foot, bicycle, tracktype, \n        CASE WHEN access IN ('destination') THEN 'destination'::text \n          WHEN access IN ('no', 'private') THEN 'no'::text \n          ELSE NULL \n        END AS access, \n        construction, \n        CASE WHEN service IN ('parking_aisle', 'drive-through', 'driveway') THEN 'INT-minor'::text \n          ELSE 'INT-normal'::text \n        END AS service, \n        CASE WHEN oneway IN ('yes', '-1') AND highway IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'residential', 'unclassified', 'road', 'service', 'pedestrian', 'raceway', 'living_street', 'construction') THEN oneway \n          ELSE NULL \n        END AS oneway,\n        CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN 'yes' \n          ELSE 'no' END AS link, \n        CASE WHEN layer IS NULL THEN '0' \n          ELSE layer \n        END AS layernotnull \n    FROM planet_osm_line \n      JOIN (VALUES \n        ('highway_motorway', 380), \n        ('highway_trunk', 370), \n        ('highway_primary', 360), \n        ('highway_secondary', 350), \n        ('highway_tertiary', 340), \n        ('highway_residential', 330), \n        ('highway_unclassified', 330), \n        ('highway_road', 330), \n        ('highway_living_street', 320), \n        ('highway_pedestrian', 310), \n        ('highway_raceway', 300), \n        ('highway_motorway_link', 240), \n        ('highway_trunk_link', 230), \n        ('highway_primary_link', 220), \n        ('highway_secondary_link', 210), \n        ('highway_tertiary_link', 200),\n        ('highway_service', 150), \n        ('highway_track', 110), \n        ('highway_path', 100), \n        ('highway_footway', 100), \n        ('highway_bridleway', 100), \n        ('highway_cycleway', 100),\n        ('highway_steps', 100), \n        ('highway_platform', 90), \n        ('highway_proposed', 20), \n        ('highway_construction', 10)\n      ) AS ordertable (feature, prio) \n        ON ('highway_' || planet_osm_line.highway) = ordertable.feature \n    WHERE bridge IN ('yes', 'viaduct')\n  ) \n  UNION ALL\n  (SELECT \n      way, prio, \n      COALESCE(('railway_' || (CASE WHEN railway = 'preserved' AND service IN ('spur', 'siding', 'yard') THEN 'INT-preserved-ssy'::text WHEN (railway = 'rail' AND service IN ('spur', 'siding', 'yard')) THEN 'INT-spur-siding-yard' ELSE railway END)),\n       ('aeroway_' || aeroway)) AS feature,\n       horse, foot, bicycle, tracktype,\n      CASE WHEN access IN ('destination') THEN 'destination'::text \n        WHEN access IN ('no', 'private') THEN 'no'::text \n      ELSE NULL END AS access,\n      construction,\n      CASE WHEN service IN ('parking_aisle', 'drive-through', 'driveway') THEN 'INT-minor'::text ELSE 'INT-normal'::text END AS service, \n      NULL AS oneway, \n      'no' AS link,\n      CASE WHEN layer IS NULL THEN '0' ELSE layer END AS layernotnull \n    FROM planet_osm_line \n      JOIN (VALUES \n        ('railway_rail', 430), \n        ('railway_spur', 430), \n        ('railway_siding', 430), \n        ('railway_subway', 420), \n        ('railway_narrow_gauge', 420), \n        ('railway_light_rail', 420), \n        ('railway_preserved', 420), \n        ('railway_funicular', 420), \n        ('railway_monorail', 420), \n        ('railway_miniature', 420), \n        ('railway_turntable', 420), \n        ('railway_tram', 410), \n        ('railway_disused', 400), \n        ('railway_construction', 400), \n        ('aeroway_runway', 60), \n        ('aeroway_taxiway', 50), \n        ('railway_platform', 90)\n      ) AS ordertable (feature, prio) \n        ON COALESCE(('railway_' || planet_osm_line.railway), ('aeroway_' || planet_osm_line.aeroway)) = ordertable.feature\n    WHERE bridge IN ('yes', 'viaduct')\n    )) AS features \n  ORDER BY layernotnull, prio\n) AS bridges", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -872,7 +872,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT way FROM planet_osm_line WHERE highway='bus_guideway' AND (tunnel IS NULL or tunnel != 'yes')) AS guideways", 
+        "table": "(SELECT way FROM planet_osm_line WHERE highway = 'bus_guideway' AND (tunnel IS NULL OR tunnel != 'yes')) AS guideways", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -895,7 +895,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT way,admin_level\n       FROM planet_osm_roads\n       WHERE \"boundary\"='administrative'\n         AND admin_level in ('0','1','2','3','4')\n       ) AS admin_01234", 
+        "table": "(SELECT way, admin_level\n       FROM planet_osm_roads\n       WHERE \"boundary\" = 'administrative'\n         AND admin_level IN ('0', '1', '2', '3', '4')\n       ) AS admin_01234", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -918,7 +918,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT way,admin_level\n       FROM planet_osm_roads\n       WHERE \"boundary\"='administrative'\n         AND admin_level in ('5','6','7','8')\n       ) AS admin_5678", 
+        "table": "(SELECT way, admin_level\n       FROM planet_osm_roads\n       WHERE \"boundary\" = 'administrative'\n         AND admin_level IN ('5', '6', '7', '8')\n       ) AS admin_5678", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -941,7 +941,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT way,admin_level\n       FROM planet_osm_roads\n       WHERE \"boundary\"='administrative'\n         AND admin_level in ('9', '10')\n       ) AS admin_other", 
+        "table": "(SELECT way, admin_level\n       FROM planet_osm_roads\n       WHERE \"boundary\" = 'administrative'\n         AND admin_level IN ('9', '10')\n       ) AS admin_other", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -964,7 +964,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT way FROM planet_osm_line WHERE \"power\"='minor_line') AS power_minorline", 
+        "table": "(SELECT way FROM planet_osm_line WHERE \"power\" = 'minor_line') AS power_minorline", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -987,7 +987,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT way FROM planet_osm_line WHERE \"power\"='line') AS power_line", 
+        "table": "(SELECT way FROM planet_osm_line WHERE \"power\" = 'line') AS power_line", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1032,7 +1032,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT way,place,name,ref\n       FROM planet_osm_point\n       WHERE place in ('country','state')\n      ) AS placenames_large", 
+        "table": "(SELECT way, place, name, ref\n       FROM planet_osm_point\n       WHERE place IN ('country', 'state')\n      ) AS placenames_large", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1055,7 +1055,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT way,place,name,ref\n       FROM planet_osm_point\n       WHERE place in ('city','town') AND capital='yes'\n      ) AS placenames_capital", 
+        "table": "(SELECT way, place, name, ref\n       FROM planet_osm_point\n       WHERE place IN ('city', 'town') AND capital = 'yes'\n      ) AS placenames_capital", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1078,7 +1078,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT way,place,name\n      FROM planet_osm_point\n      WHERE place in ('city','town')\n        AND (capital IS NULL or capital != 'yes')\n      ) AS placenames_medium", 
+        "table": "(SELECT way, place, name\n      FROM planet_osm_point\n      WHERE place IN ('city', 'town')\n        AND (capital IS NULL OR capital != 'yes')\n      ) AS placenames_medium", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1101,7 +1101,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT way,place,name\n      FROM planet_osm_point\n      WHERE place in ('suburb','village','hamlet','neighbourhood','locality','isolated_dwelling','farm')\n      ) AS placenames_small", 
+        "table": "(SELECT way, place, name\n      FROM planet_osm_point\n      WHERE place IN ('suburb', 'village', 'hamlet', 'neighbourhood', 'locality', 'isolated_dwelling', 'farm')\n      ) AS placenames_small", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1124,7 +1124,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "      (SELECT way,name,railway,aerialway,disused\n      FROM planet_osm_point\n      WHERE railway in ('station','halt','tram_stop','subway_entrance')\n         or aerialway='station'\n      ) AS stations", 
+        "table": "      (SELECT way, name, railway, aerialway, disused\n      FROM planet_osm_point\n      WHERE railway IN ('station', 'halt', 'tram_stop', 'subway_entrance')\n         OR aerialway = 'station'\n      ) AS stations", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1147,7 +1147,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "      (SELECT way,name,railway,aerialway,disused\n      FROM planet_osm_polygon\n      WHERE railway in ('station','halt','tram_stop')\n         or aerialway='station'\n      ) AS stations_poly", 
+        "table": "      (SELECT way, name, railway, aerialway, disused\n      FROM planet_osm_polygon\n      WHERE railway IN ('station', 'halt', 'tram_stop')\n         OR aerialway = 'station'\n      ) AS stations_poly", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1162,29 +1162,6 @@
       "id": "stations-poly", 
       "advanced": {}
     }, 
-    {
-      "name": "glaciers-text", 
-      "srs-name": "900913", 
-      "geometry": "polygon", 
-      "class": "", 
-      "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
-      "Datasource": {
-        "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "      (SELECT way,name,way_area\n      FROM planet_osm_polygon\n      WHERE \"natural\"='glacier' AND building IS NULL\n      ORDER BY way_area desc\n      ) AS glaciers_text", 
-        "geometry_field": "way", 
-        "type": "postgis", 
-        "key_field": "", 
-        "dbname": "gis"
-      }, 
-      "extent": [
-        -180, 
-        -85.05112877980659, 
-        180, 
-        85.05112877980659
-      ], 
-      "id": "glaciers-text", 
-      "advanced": {}
-    }, 
     {
       "name": "amenity-symbols", 
       "srs-name": "900913", 
@@ -1193,7 +1170,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT *\n      FROM planet_osm_point\n      WHERE aeroway in ('aerodrome','helipad')\n         or barrier in ('bollard','gate','lift_gate','block')\n         or highway in ('mini_roundabout','gate')\n         or man_made in ('lighthouse','power_wind','windmill','mast')\n         or (power='generator' AND (\"generator:source\"='wind' or power_source='wind'))\n         or \"natural\" in ('peak','volcano','spring','tree','cave_entrance')\n         or railway='level_crossing'\n      ) AS amenity_symbols", 
+        "table": "(SELECT *\n      FROM planet_osm_point\n      WHERE aeroway IN ('aerodrome', 'helipad')\n         OR barrier IN ('bollard', 'gate', 'lift_gate', 'block')\n         OR highway IN ('mini_roundabout', 'gate')\n         OR man_made IN ('lighthouse', 'power_wind', 'windmill', 'mast')\n         OR (power = 'generator' AND (\"generator:source\" = 'wind' OR power_source = 'wind'))\n         OR \"natural\" IN ('peak', 'volcano', 'spring', 'tree', 'cave_entrance')\n         OR railway = 'level_crossing'\n      ) AS amenity_symbols", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1216,7 +1193,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT *\n      FROM planet_osm_polygon\n      WHERE aeroway in ('aerodrome','helipad')\n         or barrier in ('bollard','gate','lift_gate','block')\n         or highway in ('mini_roundabout','gate')\n         or man_made in ('lighthouse','power_wind','windmill','mast')\n         or (power='generator' AND (\"generator:source\"='wind' or power_source='wind'))\n         or \"natural\" in ('peak','volcano','spring','tree')\n         or railway='level_crossing'\n      ) AS amenity_symbols_poly", 
+        "table": "(SELECT *\n      FROM planet_osm_polygon\n      WHERE aeroway IN ('aerodrome', 'helipad')\n         OR barrier IN ('bollard', 'gate', 'lift_gate', 'block')\n         OR highway IN ('mini_roundabout', 'gate')\n         OR man_made IN ('lighthouse', 'power_wind', 'windmill', 'mast')\n         OR (power = 'generator' AND (\"generator:source\" = 'wind' OR power_source = 'wind'))\n         OR \"natural\" IN ('peak', 'volcano', 'spring', 'tree')\n         OR railway = 'level_crossing'\n      ) AS amenity_symbols_poly", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1239,7 +1216,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT way,coalesce('aeroway_' || aeroway, 'shop_' || CASE WHEN shop in ('supermarket', 'bakery', 'butcher', 'clothes', 'fashion', 'convenience', 'department_store', 'doityourself', 'florist', 'hairdresser', 'car', 'car_repair', 'bicycle') THEN shop when not shop IS NULL THEN 'other' ELSE NULL END, 'amenity_' || amenity, 'leisure_' || leisure, 'landuse_' || landuse, 'man_made_' || man_made, 'natural_' || \"natural\", 'place_' || place, 'tourism_' || tourism, 'military_' || military, 'waterway_' || waterway, 'historic_' || historic, 'lock_' || lock, 'highway_' || highway) AS feature,access,religion\n      FROM planet_osm_polygon\n      WHERE amenity IS NOT NULL\n         or shop in ('accessories', 'alcohol', 'antique', 'antiques', 'appliance', 'art', 'baby_goods', 'bag', 'bags', 'bakery', 'bathroom_furnishing', 'beauty', 'bed', 'betting', 'beverages', 'bicycle', 'boat', 'bookmaker', 'books', 'boutique', 'builder', 'building_materials', 'butcher', 'camera', 'car', 'car_parts', 'car_repair', 'car_service', 'carpet', 'charity', 'cheese', 'chemist', 'chocolate', 'clothes', 'coffee', 'communication', 'computer', 'confectionery', 'convenience', 'copyshop', 'cosmetics', 'craft', 'curtain', 'dairy', 'deli', 'delicatessen', 'department_store', 'discount', 'dive', 'doityourself', 'dry_cleaning', 'e-cigarette', 'electrical', 'electronics', 'energy', 'erotic', 'estate_agent', 'fabric', 'farm', 'fashion', 'fish', 'fishing', 'fishmonger', 'flooring', 'florist', 'food', 'frame', 'frozen_food', 'funeral_directors', 'furnace', 'furniture', 'gallery', 'gambling', 'games', 'garden_centre', 'gas', 'general', 'gift', 'glaziery', 'greengrocer', 'grocery', 'hairdresser', 'hardware', 'health', 'health_food', 'hearing_aids', 'herbalist', 'hifi', 'hobby', 'household', 'houseware', 'hunting', 'ice_cream', 'insurance', 'interior_decoration', 'jewellery', 'jewelry', 'kiosk', 'kitchen', 'laundry', 'leather', 'lighting', 'locksmith', 'lottery', 'mall', 'market', 'massage', 'medical', 'medical_supply', 'mobile_phone', 'money_lender', 'motorcycle', 'motorcycle_repair', 'music', 'musical_instrument', 'newsagent', 'office_supplies', 'optician', 'organic', 'outdoor', 'paint', 'pastry', 'pawnbroker', 'perfumery', 'pet', 'pets', 'pharmacy', 'phone', 'photo', 'photo_studio', 'photography', 'pottery', 'printing', 'radiotechnics', 'real_estate', 'religion', 'rental', 'salon', 'scuba_diving', 'seafood', 'second_hand', 'sewing', 'shoe_repair', 'shoes', 'shopping_centre', 'solarium', 'souvenir', 'sports', 'stationery', 'supermarket', 'tailor', 'tanning', 'tattoo', 'tea', 'ticket', 'tiles', 'tobacco', 'toys', 'trade', 'travel_agency', 'tyres', 'vacuum_cleaner', 'variety_store', 'video', 'video_games', 'watches', 'wholesale', 'wine', 'winery', 'yes')\n         or tourism in ('alpine_hut','camp_site','picnic_site','caravan_site','guest_house','hostel','hotel','motel','museum','viewpoint','bed_and_breakfast','information','chalet')\n         or highway in ('bus_stop','traffic_signals')\n         or man_made in ('mast','water_tower')\n         or historic in ('memorial','archaeological_site')\n         or leisure in ('playground', 'picnic_table')\n ORDER BY way_area desc      ) AS amenity_points_poly", 
+        "table": "(SELECT way, COALESCE('aeroway_' || aeroway, 'shop_' || CASE WHEN shop IN ('supermarket', 'bakery', 'butcher', 'clothes', 'fashion', 'convenience', 'department_store', 'doityourself', 'florist', 'hairdresser', 'car', 'car_repair', 'bicycle') THEN shop WHEN NOT shop IS NULL THEN 'other' ELSE NULL END, 'amenity_' || amenity, 'leisure_' || leisure, 'landuse_' || landuse, 'man_made_' || man_made, 'natural_' || \"natural\", 'place_' || place, 'tourism_' || tourism, 'military_' || military, 'waterway_' || waterway, 'historic_' || historic, 'lock_' || lock, 'highway_' || highway) AS feature, access, religion\n      FROM planet_osm_polygon\n      WHERE amenity IS NOT NULL\n         OR shop IN ('accessories', 'alcohol', 'antique', 'antiques', 'appliance', 'art', 'baby_goods', 'bag', 'bags', 'bakery', 'bathroom_furnishing', 'beauty', 'bed', 'betting', 'beverages', 'bicycle', 'boat', 'bookmaker', 'books', 'boutique', 'builder', 'building_materials', 'butcher', 'camera', 'car', 'car_parts', 'car_repair', 'car_service', 'carpet', 'charity', 'cheese', 'chemist', 'chocolate', 'clothes', 'coffee', 'communication', 'computer', 'confectionery', 'convenience', 'copyshop', 'cosmetics', 'craft', 'curtain', 'dairy', 'deli', 'delicatessen', 'department_store', 'discount', 'dive', 'doityourself', 'dry_cleaning', 'e-cigarette', 'electrical', 'electronics', 'energy', 'erotic', 'estate_agent', 'fabric', 'farm', 'fashion', 'fish', 'fishing', 'fishmonger', 'flooring', 'florist', 'food', 'frame', 'frozen_food', 'funeral_directors', 'furnace', 'furniture', 'gallery', 'gambling', 'games', 'garden_centre', 'gas', 'general', 'gift', 'glaziery', 'greengrocer', 'grocery', 'hairdresser', 'hardware', 'health', 'health_food', 'hearing_aids', 'herbalist', 'hifi', 'hobby', 'household', 'houseware', 'hunting', 'ice_cream', 'insurance', 'interior_decoration', 'jewellery', 'jewelry', 'kiosk', 'kitchen', 'laundry', 'leather', 'lighting', 'locksmith', 'lottery', 'mall', 'market', 'massage', 'medical', 'medical_supply', 'mobile_phone', 'money_lender', 'motorcycle', 'motorcycle_repair', 'music', 'musical_instrument', 'newsagent', 'office_supplies', 'optician', 'organic', 'outdoor', 'paint', 'pastry', 'pawnbroker', 'perfumery', 'pet', 'pets', 'pharmacy', 'phone', 'photo', 'photo_studio', 'photography', 'pottery', 'printing', 'radiotechnics', 'real_estate', 'religion', 'rental', 'salon', 'scuba_diving', 'seafood', 'second_hand', 'sewing', 'shoe_repair', 'shoes', 'shopping_centre', 'solarium', 'souvenir', 'sports', 'stationery', 'supermarket', 'tailor', 'tanning', 'tattoo', 'tea', 'ticket', 'tiles', 'tobacco', 'toys', 'trade', 'travel_agency', 'tyres', 'vacuum_cleaner', 'variety_store', 'video', 'video_games', 'watches', 'wholesale', 'wine', 'winery', 'yes')\n         OR tourism IN ('alpine_hut', 'camp_site', 'picnic_site', 'caravan_site', 'guest_house', 'hostel', 'hotel', 'motel', 'museum', 'viewpoint', 'bed_and_breakfast', 'information', 'chalet')\n         OR highway IN ('bus_stop', 'traffic_signals')\n         OR man_made IN ('mast', 'water_tower')\n         OR historic IN ('memorial', 'archaeological_site')\n         OR leisure IN ('playground', 'picnic_table')\n ORDER BY way_area desc      ) AS amenity_points_poly", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1262,7 +1239,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT way,coalesce('aeroway_' || aeroway, 'shop_' || CASE WHEN shop in ('supermarket', 'bakery', 'butcher', 'clothes', 'fashion', 'convenience', 'department_store', 'doityourself', 'florist', 'hairdresser', 'car', 'car_repair', 'bicycle') THEN shop when not shop IS NULL THEN 'other' ELSE NULL END, 'amenity_' || amenity, 'leisure_' || leisure, 'landuse_' || landuse, 'man_made_' || man_made, 'natural_' || \"natural\", 'place_' || place, 'tourism_' || tourism, 'military_' || military, 'waterway_' || waterway, 'historic_' || historic, 'lock_' || lock, 'highway_' || highway) AS feature,access,religion\n      FROM planet_osm_point\n      WHERE shop in ('accessories', 'alcohol', 'antique', 'antiques', 'appliance', 'art', 'baby_goods', 'bag', 'bags', 'bakery', 'bathroom_furnishing', 'beauty', 'bed', 'betting', 'beverages', 'bicycle', 'boat', 'bookmaker', 'books', 'boutique', 'builder', 'building_materials', 'butcher', 'camera', 'car', 'car_parts', 'car_repair', 'car_service', 'carpet', 'charity', 'cheese', 'chemist', 'chocolate', 'clothes', 'coffee', 'communication', 'computer', 'confectionery', 'convenience', 'copyshop', 'cosmetics', 'craft', 'curtain', 'dairy', 'deli', 'delicatessen', 'department_store', 'discount', 'dive', 'doityourself', 'dry_cleaning', 'e-cigarette', 'electrical', 'electronics', 'energy', 'erotic', 'estate_agent', 'fabric', 'farm', 'fashion', 'fish', 'fishing', 'fishmonger', 'flooring', 'florist', 'food', 'frame', 'frozen_food', 'funeral_directors', 'furnace', 'furniture', 'gallery', 'gambling', 'games', 'garden_centre', 'gas', 'general', 'gift', 'glaziery', 'greengrocer', 'grocery', 'hairdresser', 'hardware', 'health', 'health_food', 'hearing_aids', 'herbalist', 'hifi', 'hobby', 'household', 'houseware', 'hunting', 'ice_cream', 'insurance', 'interior_decoration', 'jewellery', 'jewelry', 'kiosk', 'kitchen', 'laundry', 'leather', 'lighting', 'locksmith', 'lottery', 'mall', 'market', 'massage', 'medical', 'medical_supply', 'mobile_phone', 'money_lender', 'motorcycle', 'motorcycle_repair', 'music', 'musical_instrument', 'newsagent', 'office_supplies', 'optician', 'organic', 'outdoor', 'paint', 'pastry', 'pawnbroker', 'perfumery', 'pet', 'pets', 'pharmacy', 'phone', 'photo', 'photo_studio', 'photography', 'pottery', 'printing', 'radiotechnics', 'real_estate', 'religion', 'rental', 'salon', 'scuba_diving', 'seafood', 'second_hand', 'sewing', 'shoe_repair', 'shoes', 'shopping_centre', 'solarium', 'souvenir', 'sports', 'stationery', 'supermarket', 'tailor', 'tanning', 'tattoo', 'tea', 'ticket', 'tiles', 'tobacco', 'toys', 'trade', 'travel_agency', 'tyres', 'vacuum_cleaner', 'variety_store', 'video', 'video_games', 'watches', 'wholesale', 'wine', 'winery', 'yes')\n         or amenity IS NOT NULL\n         or tourism in ('alpine_hut','picnic_site','camp_site','caravan_site','guest_house','hostel','hotel','motel','museum','viewpoint','bed_and_breakfast','information','chalet')\n         or highway in ('bus_stop','traffic_signals','ford')\n         or man_made in ('mast','water_tower')\n         or historic in ('memorial','archaeological_site')\n         or waterway='lock'\n         or lock='yes'\n         or leisure in ('playground','slipway','picnic_table')\n      ) AS amenity_points", 
+        "table": "(SELECT way, COALESCE('aeroway_' || aeroway, 'shop_' || CASE WHEN shop IN ('supermarket', 'bakery', 'butcher', 'clothes', 'fashion', 'convenience', 'department_store', 'doityourself', 'florist', 'hairdresser', 'car', 'car_repair', 'bicycle') THEN shop WHEN NOT shop IS NULL THEN 'other' ELSE NULL END, 'amenity_' || amenity, 'leisure_' || leisure, 'landuse_' || landuse, 'man_made_' || man_made, 'natural_' || \"natural\", 'place_' || place, 'tourism_' || tourism, 'military_' || military, 'waterway_' || waterway, 'historic_' || historic, 'lock_' || lock, 'highway_' || highway) AS feature, access, religion\n      FROM planet_osm_point\n      WHERE shop IN ('accessories', 'alcohol', 'antique', 'antiques', 'appliance', 'art', 'baby_goods', 'bag', 'bags', 'bakery', 'bathroom_furnishing', 'beauty', 'bed', 'betting', 'beverages', 'bicycle', 'boat', 'bookmaker', 'books', 'boutique', 'builder', 'building_materials', 'butcher', 'camera', 'car', 'car_parts', 'car_repair', 'car_service', 'carpet', 'charity', 'cheese', 'chemist', 'chocolate', 'clothes', 'coffee', 'communication', 'computer', 'confectionery', 'convenience', 'copyshop', 'cosmetics', 'craft', 'curtain', 'dairy', 'deli', 'delicatessen', 'department_store', 'discount', 'dive', 'doityourself', 'dry_cleaning', 'e-cigarette', 'electrical', 'electronics', 'energy', 'erotic', 'estate_agent', 'fabric', 'farm', 'fashion', 'fish', 'fishing', 'fishmonger', 'flooring', 'florist', 'food', 'frame', 'frozen_food', 'funeral_directors', 'furnace', 'furniture', 'gallery', 'gambling', 'games', 'garden_centre', 'gas', 'general', 'gift', 'glaziery', 'greengrocer', 'grocery', 'hairdresser', 'hardware', 'health', 'health_food', 'hearing_aids', 'herbalist', 'hifi', 'hobby', 'household', 'houseware', 'hunting', 'ice_cream', 'insurance', 'interior_decoration', 'jewellery', 'jewelry', 'kiosk', 'kitchen', 'laundry', 'leather', 'lighting', 'locksmith', 'lottery', 'mall', 'market', 'massage', 'medical', 'medical_supply', 'mobile_phone', 'money_lender', 'motorcycle', 'motorcycle_repair', 'music', 'musical_instrument', 'newsagent', 'office_supplies', 'optician', 'organic', 'outdoor', 'paint', 'pastry', 'pawnbroker', 'perfumery', 'pet', 'pets', 'pharmacy', 'phone', 'photo', 'photo_studio', 'photography', 'pottery', 'printing', 'radiotechnics', 'real_estate', 'religion', 'rental', 'salon', 'scuba_diving', 'seafood', 'second_hand', 'sewing', 'shoe_repair', 'shoes', 'shopping_centre', 'solarium', 'souvenir', 'sports', 'stationery', 'supermarket', 'tailor', 'tanning', 'tattoo', 'tea', 'ticket', 'tiles', 'tobacco', 'toys', 'trade', 'travel_agency', 'tyres', 'vacuum_cleaner', 'variety_store', 'video', 'video_games', 'watches', 'wholesale', 'wine', 'winery', 'yes')\n         OR amenity IS NOT NULL\n         OR tourism IN ('alpine_hut', 'picnic_site', 'camp_site', 'caravan_site', 'guest_house', 'hostel', 'hotel', 'motel', 'museum', 'viewpoint', 'bed_and_breakfast', 'information', 'chalet')\n         OR highway IN ('bus_stop', 'traffic_signals', 'ford')\n         OR man_made IN ('mast', 'water_tower')\n         OR historic IN ('memorial', 'archaeological_site')\n         OR waterway = 'lock'\n         OR lock = 'yes'\n         OR leisure IN ('playground', 'slipway', 'picnic_table')\n      ) AS amenity_points", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1285,7 +1262,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT way FROM planet_osm_point WHERE power='tower') AS power_towers", 
+        "table": "(SELECT way FROM planet_osm_point WHERE power = 'tower') AS power_towers", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1308,7 +1285,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT way FROM planet_osm_point WHERE power='pole') AS power_poles", 
+        "table": "(SELECT way FROM planet_osm_point WHERE power = 'pole') AS power_poles", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1331,7 +1308,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT way, highway, height, width, refs FROM\n  (SELECT \n      way, highway, \n      array_length(refs,1) AS height, \n      (SELECT MAX(char_length(ref)) FROM unnest(refs) AS u(ref)) AS width, \n      array_to_string(refs,E'\\n') AS refs\n    FROM (\n      SELECT \n          way, \n          highway, \n          string_to_array(ref,';') AS refs\n      FROM planet_osm_roads\n        WHERE highway IN ('motorway','trunk','primary','secondary')\n        AND ref IS NOT NULL\n      ) AS p) AS q\n  WHERE height <= 4 AND width <= 11) AS roads_text_ref_low_zoom", 
+        "table": "(SELECT way, highway, height, width, refs FROM\n  (SELECT \n      way, highway, \n      array_length(refs,1) AS height, \n      (SELECT MAX(char_length(ref)) FROM unnest(refs) AS u(ref)) AS width, \n      array_to_string(refs, E'\\n') AS refs\n    FROM (\n      SELECT \n          way, \n          highway, \n          string_to_array(ref, ';') AS refs\n      FROM planet_osm_roads\n        WHERE highway IN ('motorway', 'trunk', 'primary', 'secondary')\n        AND ref IS NOT NULL\n      ) AS p) AS q\n  WHERE height <= 4 AND width <= 11) AS roads_text_ref_low_zoom", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1354,7 +1331,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "     (SELECT way,highway,junction,ref,name\n      FROM planet_osm_point\n      WHERE highway='motorway_junction' or highway = 'traffic_signals' or junction = 'yes'\n     ) AS junctions", 
+        "table": "     (SELECT way, highway, junction, ref, name\n      FROM planet_osm_point\n      WHERE highway = 'motorway_junction' OR highway = 'traffic_signals' OR junction = 'yes'\n     ) AS junctions", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1377,7 +1354,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT way, highway, height, width, refs FROM\n  (SELECT \n      way, highway, \n      array_length(refs,1) AS height, \n      (SELECT MAX(char_length(ref)) FROM unnest(refs) AS u(ref)) AS width, \n      array_to_string(refs,E'\\n') AS refs\n    FROM (\n      SELECT \n          way, \n          COALESCE(highway, aeroway) AS highway, \n          string_to_array(ref,';') AS refs\n      FROM planet_osm_line\n        WHERE (highway IN ('motorway','trunk','primary','secondary','tertiary','unclassified','residential') OR aeroway IN ('runway','taxiway'))\n        AND ref IS NOT NULL\n      ) AS p) AS q\n  WHERE height <= 4 AND width <= 11) AS roads_text_ref", 
+        "table": "(SELECT way, highway, height, width, refs FROM\n  (SELECT \n      way, highway, \n      array_length(refs,1) AS height, \n      (SELECT MAX(char_length(ref)) FROM unnest(refs) AS u(ref)) AS width, \n      array_to_string(refs, E'\\n') AS refs\n    FROM (\n      SELECT \n          way, \n          COALESCE(highway, aeroway) AS highway, \n          string_to_array(ref, ';') AS refs\n      FROM planet_osm_line\n        WHERE (highway IN ('motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'unclassified', 'residential') OR aeroway IN ('runway', 'taxiway'))\n        AND ref IS NOT NULL\n      ) AS p) AS q\n  WHERE height <= 4 AND width <= 11) AS roads_text_ref", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1400,7 +1377,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "      (SELECT way, way_area/(!pixel_width!*!pixel_height!) AS way_pixels, highway, name\n       FROM planet_osm_polygon\n       WHERE highway in ('residential','unclassified','pedestrian','service','footway','cycleway','living_street','track','path','platform') or railway in ('platform') AND name IS NOT NULL\n      ) AS roads_area_text_name", 
+        "table": "      (SELECT way, way_area/(!pixel_width!*!pixel_height!) AS way_pixels, highway, name\n       FROM planet_osm_polygon\n       WHERE highway IN ('residential', 'unclassified', 'pedestrian', 'service', 'footway', 'cycleway', 'living_street', 'track', 'path', 'platform') OR railway IN ('platform') AND name IS NOT NULL\n      ) AS roads_area_text_name", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1423,7 +1400,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "      (SELECT way, CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN substr(highway,0,length(highway)-4) else highway end, name\n       FROM planet_osm_line\n       WHERE highway in ('motorway','motorway_link','trunk','trunk_link','primary','primary_link','secondary','secondary_link','tertiary','tertiary_link','residential','unclassified','road','service','pedestrian','raceway','living_street', 'construction','proposed') \n         AND name IS NOT NULL\n      ) AS roads_text_name", 
+        "table": "      (SELECT way, CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN substr(highway, 0, length(highway)-4) ELSE highway end, name\n       FROM planet_osm_line\n       WHERE highway IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'residential', 'unclassified', 'road', 'service', 'pedestrian', 'raceway', 'living_street', 'construction', 'proposed') \n         AND name IS NOT NULL\n      ) AS roads_text_name", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1446,7 +1423,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "      (SELECT way, highway, name\n       FROM planet_osm_line\n       WHERE highway in ('bridleway', 'footway', 'cycleway', 'path', 'track', 'steps') \n         AND name IS NOT NULL\n      ) AS paths_text_name", 
+        "table": "      (SELECT way, highway, name\n       FROM planet_osm_line\n       WHERE highway IN ('bridleway', 'footway', 'cycleway', 'path', 'track', 'steps') \n         AND name IS NOT NULL\n      ) AS paths_text_name", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1469,7 +1446,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT way,coalesce('aeroway_' || aeroway, 'shop_' || CASE WHEN shop in ('supermarket', 'bakery', 'butcher', 'clothes', 'fashion', 'convenience', 'department_store', 'doityourself', 'florist', 'hairdresser', 'car', 'car_repair', 'bicycle') THEN shop when not shop IS NULL THEN 'other' ELSE NULL END, 'amenity_' || amenity, 'leisure_' || leisure, 'landuse_' || landuse, 'man_made_' || man_made, 'natural_' || \"natural\", 'place_' || place, 'tourism_' || tourism, 'military_' || military, 'waterway_' || waterway, 'historic_' || historic, 'highway_' || highway) AS feature,access,NULL as ele,name,ref,way_area\n       FROM planet_osm_polygon\n       WHERE amenity IS NOT NULL\n          or shop in ('accessories', 'alcohol', 'antique', 'antiques', 'appliance', 'art', 'baby_goods', 'bag', 'bags', 'bakery', 'bathroom_furnishing', 'beauty', 'bed', 'betting', 'beverages', 'bicycle', 'boat', 'bookmaker', 'books', 'boutique', 'builder', 'building_materials', 'butcher', 'camera', 'car', 'car_parts', 'car_repair', 'car_service', 'carpet', 'charity', 'cheese', 'chemist', 'chocolate', 'clothes', 'coffee', 'communication', 'computer', 'confectionery', 'convenience', 'copyshop', 'cosmetics', 'craft', 'curtain', 'dairy', 'deli', 'delicatessen', 'department_store', 'discount', 'dive', 'doityourself', 'dry_cleaning', 'e-cigarette', 'electrical', 'electronics', 'energy', 'erotic', 'estate_agent', 'fabric', 'farm', 'fashion', 'fish', 'fishing', 'fishmonger', 'flooring', 'florist', 'food', 'frame', 'frozen_food', 'funeral_directors', 'furnace', 'furniture', 'gallery', 'gambling', 'games', 'garden_centre', 'gas', 'general', 'gift', 'glaziery', 'greengrocer', 'grocery', 'hairdresser', 'hardware', 'health', 'health_food', 'hearing_aids', 'herbalist', 'hifi', 'hobby', 'household', 'houseware', 'hunting', 'ice_cream', 'insurance', 'interior_decoration', 'jewellery', 'jewelry', 'kiosk', 'kitchen', 'laundry', 'leather', 'lighting', 'locksmith', 'lottery', 'mall', 'market', 'massage', 'medical', 'medical_supply', 'mobile_phone', 'money_lender', 'motorcycle', 'motorcycle_repair', 'music', 'musical_instrument', 'newsagent', 'office_supplies', 'optician', 'organic', 'outdoor', 'paint', 'pastry', 'pawnbroker', 'perfumery', 'pet', 'pets', 'pharmacy', 'phone', 'photo', 'photo_studio', 'photography', 'pottery', 'printing', 'radiotechnics', 'real_estate', 'religion', 'rental', 'salon', 'scuba_diving', 'seafood', 'second_hand', 'sewing', 'shoe_repair', 'shoes', 'shopping_centre', 'solarium', 'souvenir', 'sports', 'stationery', 'supermarket', 'tailor', 'tanning', 'tattoo', 'tea', 'ticket', 'tiles', 'tobacco', 'toys', 'trade', 'travel_agency', 'tyres', 'vacuum_cleaner', 'variety_store', 'video', 'video_games', 'watches', 'wholesale', 'wine', 'winery', 'yes')\n          or leisure IS NOT NULL\n          or landuse IS NOT NULL\n          or tourism IS NOT NULL\n          or \"natural\" IS NOT NULL\n          or man_made in ('lighthouse','windmill')\n          or place='island'\n          or military='danger_area'\n          or historic in ('memorial','archaeological_site')\n ORDER BY way_area desc     ) AS text_poly", 
+        "table": "(SELECT way, way_area/(!pixel_width!*!pixel_height!) AS way_pixels, COALESCE('aeroway_' || aeroway, 'shop_' || CASE WHEN shop IN ('supermarket', 'bakery', 'butcher', 'clothes', 'fashion', 'convenience', 'department_store', 'doityourself', 'florist', 'hairdresser', 'car', 'car_repair', 'bicycle') THEN shop WHEN NOT shop IS NULL THEN 'other' ELSE NULL END, 'amenity_' || amenity, 'leisure_' || leisure, 'landuse_' || landuse, 'man_made_' || man_made, 'natural_' || \"natural\", 'place_' || place, 'tourism_' || tourism, 'military_' || military, 'waterway_' || waterway, 'historic_' || historic, 'highway_' || highway, 'power_' || power, 'boundary_' || boundary) AS feature, access, NULL AS ele, name, ref, way_area, CASE WHEN building = 'no' OR building IS NULL THEN 'no' ELSE 'yes' END AS is_building\n       FROM planet_osm_polygon\n       WHERE amenity IS NOT NULL\n          OR shop IN ('accessories', 'alcohol', 'antique', 'antiques', 'appliance', 'art', 'baby_goods', 'bag', 'bags', 'bakery', 'bathroom_furnishing', 'beauty', 'bed', 'betting', 'beverages', 'bicycle', 'boat', 'bookmaker', 'books', 'boutique', 'builder', 'building_materials', 'butcher', 'camera', 'car', 'car_parts', 'car_repair', 'car_service', 'carpet', 'charity', 'cheese', 'chemist', 'chocolate', 'clothes', 'coffee', 'communication', 'computer', 'confectionery', 'convenience', 'copyshop', 'cosmetics', 'craft', 'curtain', 'dairy', 'deli', 'delicatessen', 'department_store', 'discount', 'dive', 'doityourself', 'dry_cleaning', 'e-cigarette', 'electrical', 'electronics', 'energy', 'erotic', 'estate_agent', 'fabric', 'farm', 'fashion', 'fish', 'fishing', 'fishmonger', 'flooring', 'florist', 'food', 'frame', 'frozen_food', 'funeral_directors', 'furnace', 'furniture', 'gallery', 'gambling', 'games', 'garden_centre', 'gas', 'general', 'gift', 'glaziery', 'greengrocer', 'grocery', 'hairdresser', 'hardware', 'health', 'health_food', 'hearing_aids', 'herbalist', 'hifi', 'hobby', 'household', 'houseware', 'hunting', 'ice_cream', 'insurance', 'interior_decoration', 'jewellery', 'jewelry', 'kiosk', 'kitchen', 'laundry', 'leather', 'lighting', 'locksmith', 'lottery', 'mall', 'market', 'massage', 'medical', 'medical_supply', 'mobile_phone', 'money_lender', 'motorcycle', 'motorcycle_repair', 'music', 'musical_instrument', 'newsagent', 'office_supplies', 'optician', 'organic', 'outdoor', 'paint', 'pastry', 'pawnbroker', 'perfumery', 'pet', 'pets', 'pharmacy', 'phone', 'photo', 'photo_studio', 'photography', 'pottery', 'printing', 'radiotechnics', 'real_estate', 'religion', 'rental', 'salon', 'scuba_diving', 'seafood', 'second_hand', 'sewing', 'shoe_repair', 'shoes', 'shopping_centre', 'solarium', 'souvenir', 'sports', 'stationery', 'supermarket', 'tailor', 'tanning', 'tattoo', 'tea', 'ticket', 'tiles', 'tobacco', 'toys', 'trade', 'travel_agency', 'tyres', 'vacuum_cleaner', 'variety_store', 'video', 'video_games', 'watches', 'wholesale', 'wine', 'winery', 'yes')\n          OR leisure IS NOT NULL\n          OR landuse IS NOT NULL\n          OR tourism IS NOT NULL\n          OR \"natural\" IS NOT NULL\n          OR man_made IN ('lighthouse', 'windmill')\n          OR place = 'island'\n          OR military IS NOT NULL\n          OR historic IN ('memorial', 'archaeological_site')\n          OR power IS NOT NULL\n          OR aeroway IS NOT NULL\n          OR highway IN ('services', 'rest_area')\n          OR boundary = 'national_park'\n ORDER BY way_area desc     ) AS text_poly", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1492,7 +1469,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "      (SELECT way,coalesce('aeroway_' || aeroway, 'shop_' || CASE WHEN shop in ('supermarket', 'bakery', 'butcher', 'clothes', 'fashion', 'convenience', 'department_store', 'doityourself', 'florist', 'hairdresser', 'car', 'car_repair', 'bicycle') THEN shop when not shop IS NULL THEN 'other' ELSE NULL END, 'amenity_' || amenity, 'leisure_' || leisure, 'landuse_' || landuse, 'man_made_' || man_made, 'natural_' || \"natural\", 'place_' || place, 'tourism_' || tourism, 'military_' || military, 'waterway_' || waterway, 'historic_' || historic, 'highway_' || highway) AS feature,access,ele,name,ref,NULL as way_area\n       FROM planet_osm_point\n       WHERE amenity IS NOT NULL\n          or shop in ('accessories', 'alcohol', 'antique', 'antiques', 'appliance', 'art', 'baby_goods', 'bag', 'bags', 'bakery', 'bathroom_furnishing', 'beauty', 'bed', 'betting', 'beverages', 'bicycle', 'boat', 'bookmaker', 'books', 'boutique', 'builder', 'building_materials', 'butcher', 'camera', 'car', 'car_parts', 'car_repair', 'car_service', 'carpet', 'charity', 'cheese', 'chemist', 'chocolate', 'clothes', 'coffee', 'communication', 'computer', 'confectionery', 'convenience', 'copyshop', 'cosmetics', 'craft', 'curtain', 'dairy', 'deli', 'delicatessen', 'department_store', 'discount', 'dive', 'doityourself', 'dry_cleaning', 'e-cigarette', 'electrical', 'electronics', 'energy', 'erotic', 'estate_agent', 'fabric', 'farm', 'fashion', 'fish', 'fishing', 'fishmonger', 'flooring', 'florist', 'food', 'frame', 'frozen_food', 'funeral_directors', 'furnace', 'furniture', 'gallery', 'gambling', 'games', 'garden_centre', 'gas', 'general', 'gift', 'glaziery', 'greengrocer', 'grocery', 'hairdresser', 'hardware', 'health', 'health_food', 'hearing_aids', 'herbalist', 'hifi', 'hobby', 'household', 'houseware', 'hunting', 'ice_cream', 'insurance', 'interior_decoration', 'jewellery', 'jewelry', 'kiosk', 'kitchen', 'laundry', 'leather', 'lighting', 'locksmith', 'lottery', 'mall', 'market', 'massage', 'medical', 'medical_supply', 'mobile_phone', 'money_lender', 'motorcycle', 'motorcycle_repair', 'music', 'musical_instrument', 'newsagent', 'office_supplies', 'optician', 'organic', 'outdoor', 'paint', 'pastry', 'pawnbroker', 'perfumery', 'pet', 'pets', 'pharmacy', 'phone', 'photo', 'photo_studio', 'photography', 'pottery', 'printing', 'radiotechnics', 'real_estate', 'religion', 'rental', 'salon', 'scuba_diving', 'seafood', 'second_hand', 'sewing', 'shoe_repair', 'shoes', 'shopping_centre', 'solarium', 'souvenir', 'sports', 'stationery', 'supermarket', 'tailor', 'tanning', 'tattoo', 'tea', 'ticket', 'tiles', 'tobacco', 'toys', 'trade', 'travel_agency', 'tyres', 'vacuum_cleaner', 'variety_store', 'video', 'video_games', 'watches', 'wholesale', 'wine', 'winery', 'yes')\n          or leisure IS NOT NULL\n          or landuse IS NOT NULL\n          or tourism IS NOT NULL\n          or \"natural\" IS NOT NULL\n          or man_made in ('lighthouse','windmill')\n          or place='island'\n          or military='danger_area'\n          or aeroway='gate'\n          or waterway='lock'\n          or historic in ('memorial','archaeological_site')\n      ) AS text", 
+        "table": "      (SELECT way, NULL as way_pixels, COALESCE('aeroway_' || aeroway, 'shop_' || CASE WHEN shop IN ('supermarket', 'bakery', 'butcher', 'clothes', 'fashion', 'convenience', 'department_store', 'doityourself', 'florist', 'hairdresser', 'car', 'car_repair', 'bicycle') THEN shop WHEN NOT shop IS NULL THEN 'other' ELSE NULL END, 'amenity_' || amenity, 'leisure_' || leisure, 'landuse_' || landuse, 'man_made_' || man_made, 'natural_' || \"natural\", 'place_' || place, 'tourism_' || tourism, 'military_' || military, 'waterway_' || waterway, 'historic_' || historic, 'highway_' || highway, 'power_' || power, 'boundary_' || boundary) AS feature, access, ele, name, ref, NULL AS way_area, CASE WHEN building = 'no' OR building IS NULL THEN 'no' ELSE 'yes' END AS is_building\n       FROM planet_osm_point\n       WHERE amenity IS NOT NULL\n          OR shop IN ('accessories', 'alcohol', 'antique', 'antiques', 'appliance', 'art', 'baby_goods', 'bag', 'bags', 'bakery', 'bathroom_furnishing', 'beauty', 'bed', 'betting', 'beverages', 'bicycle', 'boat', 'bookmaker', 'books', 'boutique', 'builder', 'building_materials', 'butcher', 'camera', 'car', 'car_parts', 'car_repair', 'car_service', 'carpet', 'charity', 'cheese', 'chemist', 'chocolate', 'clothes', 'coffee', 'communication', 'computer', 'confectionery', 'convenience', 'copyshop', 'cosmetics', 'craft', 'curtain', 'dairy', 'deli', 'delicatessen', 'department_store', 'discount', 'dive', 'doityourself', 'dry_cleaning', 'e-cigarette', 'electrical', 'electronics', 'energy', 'erotic', 'estate_agent', 'fabric', 'farm', 'fashion', 'fish', 'fishing', 'fishmonger', 'flooring', 'florist', 'food', 'frame', 'frozen_food', 'funeral_directors', 'furnace', 'furniture', 'gallery', 'gambling', 'games', 'garden_centre', 'gas', 'general', 'gift', 'glaziery', 'greengrocer', 'grocery', 'hairdresser', 'hardware', 'health', 'health_food', 'hearing_aids', 'herbalist', 'hifi', 'hobby', 'household', 'houseware', 'hunting', 'ice_cream', 'insurance', 'interior_decoration', 'jewellery', 'jewelry', 'kiosk', 'kitchen', 'laundry', 'leather', 'lighting', 'locksmith', 'lottery', 'mall', 'market', 'massage', 'medical', 'medical_supply', 'mobile_phone', 'money_lender', 'motorcycle', 'motorcycle_repair', 'music', 'musical_instrument', 'newsagent', 'office_supplies', 'optician', 'organic', 'outdoor', 'paint', 'pastry', 'pawnbroker', 'perfumery', 'pet', 'pets', 'pharmacy', 'phone', 'photo', 'photo_studio', 'photography', 'pottery', 'printing', 'radiotechnics', 'real_estate', 'religion', 'rental', 'salon', 'scuba_diving', 'seafood', 'second_hand', 'sewing', 'shoe_repair', 'shoes', 'shopping_centre', 'solarium', 'souvenir', 'sports', 'stationery', 'supermarket', 'tailor', 'tanning', 'tattoo', 'tea', 'ticket', 'tiles', 'tobacco', 'toys', 'trade', 'travel_agency', 'tyres', 'vacuum_cleaner', 'variety_store', 'video', 'video_games', 'watches', 'wholesale', 'wine', 'winery', 'yes')\n          OR leisure IS NOT NULL\n          OR landuse IS NOT NULL\n          OR tourism IS NOT NULL\n          OR \"natural\" IS NOT NULL\n          OR man_made IN ('lighthouse', 'windmill')\n          OR place = 'island'\n          OR military IS NOT NULL\n          OR aeroway IS NOT NULL\n          OR waterway = 'lock'\n          OR historic IN ('memorial', 'archaeological_site')\n          OR power IS NOT NULL\n          OR highway IN ('services', 'rest_area')\n          OR boundary = 'national_park'\n      ) AS text", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1515,7 +1492,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT name, way, way_area FROM planet_osm_polygon WHERE building IS NOT NULL  AND building not in ('no','station','supermarket')) AS building_text", 
+        "table": "(SELECT name, way, way_area\nFROM planet_osm_polygon\nWHERE building IS NOT NULL AND building NOT IN ('no', 'station', 'supermarket')) AS building_text", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1538,7 +1515,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT way FROM planet_osm_line WHERE \"addr:interpolation\" IS NOT NULL) AS interpolation", 
+        "table": "(SELECT way\nFROM planet_osm_line\nWHERE \"addr:interpolation\" IS NOT NULL) AS interpolation", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1561,7 +1538,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "      (SELECT way,\"addr:housenumber\" FROM planet_osm_polygon WHERE \"addr:housenumber\" IS NOT NULL AND building IS NOT NULL\n       union\n       select way,\"addr:housenumber\" FROM planet_osm_point WHERE \"addr:housenumber\" IS NOT NULL\n      ) AS housenumbers", 
+        "table": "      (SELECT way,\"addr:housenumber\" FROM planet_osm_polygon WHERE \"addr:housenumber\" IS NOT NULL AND building IS NOT NULL\n       UNION\n       SELECT way,\"addr:housenumber\" FROM planet_osm_point WHERE \"addr:housenumber\" IS NOT NULL\n      ) AS housenumbers", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1584,7 +1561,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT way,\"addr:housename\" FROM planet_osm_polygon WHERE \"addr:housename\" IS NOT NULL AND building IS NOT NULL\n       union\n       select way,\"addr:housename\" FROM planet_osm_point WHERE \"addr:housename\" IS NOT NULL\n      ) AS housenames", 
+        "table": "(SELECT way,\"addr:housename\" FROM planet_osm_polygon WHERE \"addr:housename\" IS NOT NULL AND building IS NOT NULL\n       UNION\n       SELECT way,\"addr:housename\" FROM planet_osm_point WHERE \"addr:housename\" IS NOT NULL\n      ) AS housenames", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1607,7 +1584,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "      (SELECT way,waterway,lock,name,CASE WHEN tunnel in ('yes','culvert') THEN 'yes' else 'no' end as int_tunnel\n      FROM planet_osm_line\n      WHERE waterway in ('weir','river','canal','derelict_canal','stream','drain','ditch','wadi')\n       ORDER BY z_order\n      ) AS water_lines_text", 
+        "table": "      (SELECT way, waterway, lock, name, CASE WHEN tunnel IN ('yes', 'culvert') THEN 'yes' ELSE 'no' END AS int_tunnel\n      FROM planet_osm_line\n      WHERE waterway IN ('weir', 'river', 'canal', 'derelict_canal', 'stream', 'drain', 'ditch', 'wadi')\n       ORDER BY z_order\n      ) AS water_lines_text", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1630,7 +1607,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT way, name, admin_level FROM planet_osm_polygon WHERE \"boundary\" = 'administrative' AND admin_level in ('0','1','2','3','4','5','6','7','8','9','10')) AS admin_text", 
+        "table": "(SELECT way, name, admin_level FROM planet_osm_polygon WHERE \"boundary\" = 'administrative' AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10')) AS admin_text", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1653,7 +1630,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT way,way_area,name,boundary FROM planet_osm_polygon WHERE (boundary='national_park' or leisure='nature_reserve') AND building IS NULL) AS national_park_boundaries", 
+        "table": "(SELECT way, way_area, name, boundary FROM planet_osm_polygon WHERE (boundary = 'national_park' OR leisure = 'nature_reserve') AND building IS NULL) AS national_park_boundaries", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
@@ -1676,7 +1653,7 @@
       "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
       "Datasource": {
         "extent": "-20037508,-20037508,20037508,20037508", 
-        "table": "(SELECT way,name,tourism FROM planet_osm_polygon WHERE tourism='theme_park') AS theme_park", 
+        "table": "(SELECT way, name, tourism FROM planet_osm_polygon WHERE tourism = 'theme_park') AS theme_park", 
         "geometry_field": "way", 
         "type": "postgis", 
         "key_field": "", 
diff --git a/project.yaml b/project.yaml
index 95eea93868..56a265042b 100644
--- a/project.yaml
+++ b/project.yaml
@@ -104,27 +104,27 @@ Layer:
             way, name, religion,
             COALESCE(aeroway, amenity, landuse, leisure, military, "natural", power, tourism, highway) AS feature 
           FROM (SELECT 
-              way, COALESCE(name,'') AS name, 
+              way, COALESCE(name, '') AS name, 
               ('aeroway_' || (CASE WHEN aeroway IN ('apron', 'aerodrome') THEN aeroway ELSE NULL END)) AS aeroway,
               ('amenity_' || (CASE WHEN amenity IN ('parking', 'university', 'college', 'school', 'hospital', 'kindergarten', 'grave_yard') THEN amenity ELSE NULL END)) AS amenity,
               ('landuse_' || (CASE WHEN landuse IN ('quarry', 'vineyard', 'orchard', 'cemetery', 'residential', 'garages', 'field', 'meadow', 'grass', 'allotments', 'forest', 'farmyard', 'farm', 'farmland', 'recreation_ground', 'conservation', 'village_green', 'retail', 'industrial', 'railway', 'commercial', 'brownfield', 'landfill', 'construction') THEN landuse ELSE NULL END)) AS landuse,
-              ('leisure_' || (CASE WHEN leisure IN ('swimming_pool', 'playground', 'park', 'recreation_ground', 'common', 'garden', 'golf_course', 'picnic_table','sports_centre','stadium','pitch','track') THEN leisure ELSE NULL END)) AS leisure,
+              ('leisure_' || (CASE WHEN leisure IN ('swimming_pool', 'playground', 'park', 'recreation_ground', 'common', 'garden', 'golf_course', 'picnic_table', 'sports_centre', 'stadium', 'pitch', 'track') THEN leisure ELSE NULL END)) AS leisure,
               ('military_' || (CASE WHEN military IN ('barracks', 'danger_area') THEN military ELSE NULL END)) AS military,
-              ('natural_' || (CASE WHEN "natural" IN ('beach','desert','heath','mud','grassland','wood','sand','scrub') THEN "natural" ELSE NULL END)) AS "natural",
-              ('power_' || (CASE WHEN power IN ('station','sub_station','substation','generator') THEN power ELSE NULL END)) AS power,
+              ('natural_' || (CASE WHEN "natural" IN ('beach', 'desert', 'heath', 'mud', 'grassland', 'wood', 'sand', 'scrub') THEN "natural" ELSE NULL END)) AS "natural",
+              ('power_' || (CASE WHEN power IN ('station', 'sub_station', 'substation', 'generator') THEN power ELSE NULL END)) AS power,
               ('tourism_' || (CASE WHEN tourism IN ('attraction', 'camp_site', 'caravan_site', 'picnic_site', 'zoo') THEN tourism ELSE NULL END)) AS tourism,
               ('highway_' || (CASE WHEN highway IN ('services', 'rest_area') THEN highway ELSE NULL END)) AS highway,
-              CASE WHEN religion IN ('christian','jewish') THEN religion ELSE 'INT-generic'::text end AS religion
+              CASE WHEN religion IN ('christian', 'jewish') THEN religion ELSE 'INT-generic'::text END AS religion
             FROM planet_osm_polygon
             WHERE landuse IS NOT NULL
               OR leisure IS NOT NULL
-              OR aeroway IN ('apron','aerodrome')
-              OR amenity IN ('parking','university','college','school','hospital','kindergarten','grave_yard')
-              OR military IN ('barracks','danger_area')
-              OR "natural" IN ('beach','desert','heath','mud','grassland','wood','sand','scrub')
-              OR power IN ('station','sub_station','substation','generator')
-              OR tourism IN ('attraction','camp_site','caravan_site','picnic_site','zoo')
-              OR highway IN ('services','rest_area')
+              OR aeroway IN ('apron', 'aerodrome')
+              OR amenity IN ('parking', 'university', 'college', 'school', 'hospital', 'kindergarten', 'grave_yard')
+              OR military IN ('barracks', 'danger_area')
+              OR "natural" IN ('beach', 'desert', 'heath', 'mud', 'grassland', 'wood', 'sand', 'scrub')
+              OR power IN ('station', 'sub_station', 'substation', 'generator')
+              OR tourism IN ('attraction', 'camp_site', 'caravan_site', 'picnic_site', 'zoo')
+              OR highway IN ('services', 'rest_area')
             ORDER BY z_order, way_area DESC
           ) AS landcover
         ) AS features
@@ -204,7 +204,7 @@ Layer:
             way, "natural"
           FROM planet_osm_polygon
           WHERE "natural" IN ('marsh', 'wetland') AND building IS NULL
-          ORDER BY z_order,way_area DESC
+          ORDER BY z_order, way_area DESC
         ) AS water_areas_overlay
     advanced: {}
   - id: "water-lines"
@@ -217,11 +217,11 @@ Layer:
       table: |-
         (SELECT 
             way, waterway, lock, name,
-            CASE WHEN tunnel IN ('yes','culvert') THEN 'yes' ELSE 'no' END AS int_tunnel, 
-            'no' as bridge
+            CASE WHEN tunnel IN ('yes', 'culvert') THEN 'yes' ELSE 'no' END AS int_tunnel, 
+            'no' AS bridge
           FROM planet_osm_line
-          WHERE waterway in ('weir', 'river', 'canal', 'derelict_canal', 'stream', 'drain', 'ditch', 'wadi')
-            AND (bridge IS NULL or bridge not in ('yes','aqueduct'))
+          WHERE waterway IN ('weir', 'river', 'canal', 'derelict_canal', 'stream', 'drain', 'ditch', 'wadi')
+            AND (bridge IS NULL OR bridge NOT IN ('yes', 'aqueduct'))
           ORDER BY z_order
         ) AS water_lines
     advanced: {}
@@ -319,16 +319,16 @@ Layer:
       <<: *osm2pgsql
       table: |-
         (SELECT 
-            way,aeroway,
+            way, aeroway,
           CASE
-           WHEN building IN ('garage','roof','garages','service','shed','shelter','cabin','storage_tank','tank','support','glasshouse','greenhouse','mobile_home','kiosk','silo','canopy','tent') THEN 'INT-light'::text
+           WHEN building IN ('garage', 'roof', 'garages', 'service', 'shed', 'shelter', 'cabin', 'storage_tank', 'tank', 'support', 'glasshouse', 'greenhouse', 'mobile_home', 'kiosk', 'silo', 'canopy', 'tent') THEN 'INT-light'::text
            ELSE building
           END AS building
           FROM planet_osm_polygon
-          WHERE (building IS NOT null
-              AND building NOT IN ('no','station','supermarket','planned')
-              AND (railway IS null OR railway != 'station')
-              AND (amenity IS null OR amenity != 'place_of_worship'))
+          WHERE (building IS NOT NULL
+              AND building NOT IN ('no', 'station', 'supermarket', 'planned')
+              AND (railway IS NULL OR railway != 'station')
+              AND (amenity IS NULL OR amenity != 'place_of_worship'))
             OR aeroway = 'terminal'
           ORDER BY z_order, way_area DESC
         ) AS buildings
@@ -345,17 +345,17 @@ Layer:
           FROM (
             (SELECT 
                 way, prio, 
-                ('highway_' || (CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN substr(highway,0,length(highway)-4) ELSE highway END)) AS feature, 
+                ('highway_' || (CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN substr(highway, 0, length(highway)-4) ELSE highway END)) AS feature, 
                 horse, foot, bicycle, tracktype, 
                 CASE WHEN access IN ('destination') THEN 'destination'::text 
                   WHEN access IN ('no', 'private') THEN 'no'::text 
                   ELSE NULL 
                 END AS access, 
                 construction, 
-                CASE WHEN service IN ('parking_aisle','drive-through','driveway') THEN 'INT-minor'::text 
+                CASE WHEN service IN ('parking_aisle', 'drive-through', 'driveway') THEN 'INT-minor'::text 
                   ELSE 'INT-normal'::text 
                 END AS service, 
-                CASE WHEN oneway in ('yes', '-1') AND highway IN ('motorway','motorway_link','trunk','trunk_link','primary','primary_link','secondary','secondary_link','tertiary','tertiary_link','residential','unclassified','road','service','pedestrian','raceway','living_street','construction') THEN oneway 
+                CASE WHEN oneway IN ('yes', '-1') AND highway IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'residential', 'unclassified', 'road', 'service', 'pedestrian', 'raceway', 'living_street', 'construction') THEN oneway 
                   ELSE NULL 
                 END AS oneway,
                 CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN 'yes' 
@@ -393,19 +393,19 @@ Layer:
                 ('highway_construction', 10)
               ) AS ordertable (feature, prio) 
                 ON ('highway_' || planet_osm_line.highway) = ordertable.feature 
-            WHERE (tunnel='yes' OR tunnel = 'building_passage' OR covered='yes')) 
+            WHERE (tunnel = 'yes' OR tunnel = 'building_passage' OR covered = 'yes')) 
           UNION ALL
           (SELECT 
               way, prio, 
-              COALESCE(('railway_' || (CASE WHEN railway='preserved' AND service in ('spur','siding','yard') THEN 'INT-preserved-ssy'::text WHEN (railway='rail' AND service in ('spur','siding','yard'))  THEN 'INT-spur-siding-yard' else railway END)),
+              COALESCE(('railway_' || (CASE WHEN railway = 'preserved' AND service IN ('spur', 'siding', 'yard') THEN 'INT-preserved-ssy'::text WHEN (railway = 'rail' AND service IN ('spur', 'siding', 'yard')) THEN 'INT-spur-siding-yard' ELSE railway END)),
                ('aeroway_' || aeroway)) AS feature,
                horse, foot, bicycle, tracktype,
-              CASE WHEN access in ('destination') THEN 'destination'::text 
-                WHEN access in ('no', 'private') THEN 'no'::text 
-              ELSE NULL END as access,
+              CASE WHEN access IN ('destination') THEN 'destination'::text 
+                WHEN access IN ('no', 'private') THEN 'no'::text 
+              ELSE NULL END AS access,
               construction,
-              CASE WHEN service in ('parking_aisle','drive-through','driveway') THEN 'INT-minor'::text else 'INT-normal'::text END as service, 
-              null AS oneway, 
+              CASE WHEN service IN ('parking_aisle', 'drive-through', 'driveway') THEN 'INT-minor'::text ELSE 'INT-normal'::text END AS service, 
+              NULL AS oneway, 
               'no' AS link,
               CASE WHEN layer IS NULL THEN '0' ELSE layer END AS layernotnull 
             FROM planet_osm_line 
@@ -429,8 +429,8 @@ Layer:
                 ('railway_platform', 90)
               ) AS ordertable (feature, prio) 
                 ON COALESCE(('railway_' || planet_osm_line.railway), ('aeroway_' || planet_osm_line.aeroway)) = ordertable.feature
-            WHERE (tunnel='yes' or tunnel='building_passage' or covered='yes'))
-            ) AS features 
+            WHERE (tunnel = 'yes' OR tunnel = 'building_passage' OR covered = 'yes')
+            )) AS features 
           ORDER BY layernotnull, prio
         ) AS tunnels
     properties: 
@@ -515,7 +515,7 @@ Layer:
       <<: *osm2pgsql
       table: |-
         (SELECT 
-            way,"natural",man_made
+            way, "natural", man_made
           FROM planet_osm_line 
           WHERE "natural" = 'cliff' OR man_made = 'embankment'
         ) AS cliffs
@@ -529,7 +529,7 @@ Layer:
       <<: *osm2pgsql
       table: |-
         (SELECT
-            way,barrier 
+            way, barrier 
           FROM planet_osm_polygon 
           WHERE barrier IS NOT NULL
         ) AS area_barriers
@@ -572,12 +572,12 @@ Layer:
       table: |-
         (SELECT DISTINCT ON (p.way) 
             p.way AS way, l.highway AS int_tc_type,
-            CASE WHEN l.service IN ('parking_aisle','drive-through','driveway') 
+            CASE WHEN l.service IN ('parking_aisle', 'drive-through', 'driveway') 
               THEN 'INT-minor'::text 
               ELSE 'INT-normal'::text 
             END AS int_tc_service
           FROM planet_osm_point p
-            JOIN planet_osm_line l ON ST_DWithin(p.way,l.way,0.1) -- Assumes Mercator
+            JOIN planet_osm_line l ON ST_DWithin(p.way, l.way, 0.1) -- Assumes Mercator
             JOIN (VALUES
               ('tertiary', 1),
               ('unclassified', 2),
@@ -602,7 +602,7 @@ Layer:
         (SELECT 
             way,
             COALESCE((
-              'highway_' || (CASE WHEN highway IN ('residential','unclassified','pedestrian','service','footway','cycleway','track','path','platform') THEN highway ELSE NULL END)), 
+              'highway_' || (CASE WHEN highway IN ('residential', 'unclassified', 'pedestrian', 'service', 'footway', 'cycleway', 'track', 'path', 'platform') THEN highway ELSE NULL END)), 
               ('railway_' || (CASE WHEN railway IN ('platform') THEN railway ELSE NULL END))
             ) AS feature 
           FROM planet_osm_polygon
@@ -625,15 +625,15 @@ Layer:
           (
             (SELECT 
                 way, prio, 
-                ('highway_' || (CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN substr(highway,0,length(highway)-4) ELSE highway END)) AS feature, 
+                ('highway_' || (CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN substr(highway, 0, length(highway)-4) ELSE highway END)) AS feature, 
                 horse, foot, bicycle, tracktype, 
-                CASE WHEN access IN ('destination') THEN 'destination'::text when access IN ('no', 'private') THEN 'no'::text ELSE NULL END as access, construction, 
-                CASE WHEN service IN ('parking_aisle','drive-through','driveway') THEN 'INT-minor'::text ELSE 'INT-normal'::text end as service, 
+                CASE WHEN access IN ('destination') THEN 'destination'::text WHEN access IN ('no', 'private') THEN 'no'::text ELSE NULL END AS access, construction, 
+                CASE WHEN service IN ('parking_aisle', 'drive-through', 'driveway') THEN 'INT-minor'::text ELSE 'INT-normal'::text END AS service, 
                 CASE WHEN oneway IN ('yes', '-1') 
                     AND highway IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'residential', 'unclassified', 'road', 'service', 'pedestrian', 'raceway', 'living_street', 'construction') THEN oneway 
                   ELSE NULL 
-                END as oneway, 
-                CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN 'yes' ELSE 'no' end as link, 
+                END AS oneway, 
+                CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN 'yes' ELSE 'no' END AS link, 
                 CASE WHEN layer IS NULL THEN '0' ELSE layer END AS layernotnull 
               FROM planet_osm_line 
                 JOIN (VALUES
@@ -666,17 +666,17 @@ Layer:
                 ) AS ordertable (feature, prio) 
                   ON ('highway_' || planet_osm_line.highway) = ordertable.feature 
                 WHERE (tunnel IS NULL OR NOT tunnel IN ('yes', 'building_passage')) 
-                  AND (covered IS NULL OR NOT covered='yes') 
+                  AND (covered IS NULL OR NOT covered = 'yes') 
                   AND (bridge IS NULL OR NOT bridge IN ('yes', 'viaduct'))) 
             UNION ALL 
             (SELECT 
                 way, prio, 
-                COALESCE(('railway_' ||(CASE WHEN railway='preserved' AND service in ('spur','siding','yard') THEN 'INT-preserved-ssy'::text when (railway='rail' AND service in ('spur','siding','yard'))  THEN 'INT-spur-siding-yard' else railway end)), ('aeroway_' || aeroway)) AS feature, 
+                COALESCE(('railway_' ||(CASE WHEN railway = 'preserved' AND service IN ('spur', 'siding', 'yard') THEN 'INT-preserved-ssy'::text WHEN (railway = 'rail' AND service IN ('spur', 'siding', 'yard')) THEN 'INT-spur-siding-yard' ELSE railway end)), ('aeroway_' || aeroway)) AS feature, 
                 horse, foot, bicycle, tracktype, 
-                CASE WHEN access in ('destination') THEN 'destination'::text when access in ('no', 'private') THEN 'no'::text ELSE NULL END as access, 
-                construction, CASE WHEN service in ('parking_aisle','drive-through','driveway') THEN 'INT-minor'::text else 'INT-normal'::text end as service, 
-                null as oneway, 'no' as link, 
-                CASE WHEN layer IS NULL THEN '0' else layer end as layernotnull 
+                CASE WHEN access IN ('destination') THEN 'destination'::text WHEN access IN ('no', 'private') THEN 'no'::text ELSE NULL END AS access, 
+                construction, CASE WHEN service IN ('parking_aisle', 'drive-through', 'driveway') THEN 'INT-minor'::text ELSE 'INT-normal'::text END AS service, 
+                NULL AS oneway, 'no' AS link, 
+                CASE WHEN layer IS NULL THEN '0' ELSE layer END AS layernotnull 
               FROM planet_osm_line 
                 JOIN (VALUES 
                   ('railway_rail', 430),
@@ -698,9 +698,9 @@ Layer:
                   ('railway_platform', 90)
                 ) AS ordertable (feature, prio) 
                   ON COALESCE(('railway_' || planet_osm_line.railway), ('aeroway_' || planet_osm_line.aeroway)) = ordertable.feature
-              WHERE (tunnel IS NULL or not tunnel in ('yes','building_passage'))
-                AND (covered IS NULL or not covered='yes') 
-                AND (bridge IS NULL or not bridge in ('yes','viaduct'))
+              WHERE (tunnel IS NULL OR NOT tunnel IN ('yes', 'building_passage'))
+                AND (covered IS NULL OR NOT covered = 'yes') 
+                AND (bridge IS NULL OR NOT bridge IN ('yes', 'viaduct'))
               )
             ) AS features 
           ORDER BY prio
@@ -717,12 +717,12 @@ Layer:
         (SELECT 
             way,
             COALESCE(
-              ('highway_' || (CASE WHEN highway in ('residential','unclassified','pedestrian','service','footway','cycleway','living_street','track','path','platform','services') THEN highway ELSE NULL END)), 
-              ('railway_' || (CASE WHEN railway in ('platform') THEN railway ELSE NULL END)),
-              (('aeroway_' || CASE WHEN aeroway in ('runway','taxiway','helipad') THEN aeroway ELSE NULL END))
+              ('highway_' || (CASE WHEN highway IN ('residential', 'unclassified', 'pedestrian', 'service', 'footway', 'cycleway', 'living_street', 'track', 'path', 'platform', 'services') THEN highway ELSE NULL END)), 
+              ('railway_' || (CASE WHEN railway IN ('platform') THEN railway ELSE NULL END)),
+              (('aeroway_' || CASE WHEN aeroway IN ('runway', 'taxiway', 'helipad') THEN aeroway ELSE NULL END))
             ) AS feature 
           FROM planet_osm_polygon
-          WHERE highway in ('residential', 'unclassified', 'pedestrian', 'service', 'footway', 'living_street', 'track', 'path', 'platform', 'services')
+          WHERE highway IN ('residential', 'unclassified', 'pedestrian', 'service', 'footway', 'living_street', 'track', 'path', 'platform', 'services')
             OR railway IN ('platform')
             OR aeroway IN ('runway', 'taxiway', 'helipad')
           ORDER BY z_order, way_area desc
@@ -742,16 +742,16 @@ Layer:
           (
             (SELECT 
                 way, prio, 
-                ('highway_' || (CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN substr(highway,0,length(highway)-4) else highway end)) AS feature, 
+                ('highway_' || (CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN substr(highway, 0, length(highway)-4) ELSE highway end)) AS feature, 
                 horse, foot, bicycle, tracktype, 
-                CASE WHEN access in ('destination') THEN 'destination'::text 
-                  WHEN access in ('no', 'private') THEN 'no'::text 
+                CASE WHEN access IN ('destination') THEN 'destination'::text 
+                  WHEN access IN ('no', 'private') THEN 'no'::text 
                   ELSE NULL 
                 END AS access,
                 construction, 
-                CASE WHEN service in ('parking_aisle','drive-through','driveway') THEN 'INT-minor'::text else 'INT-normal'::text end as service, 
-                CASE WHEN oneway in ('yes', '-1') AND highway in ('motorway', 'motorway_link',  'trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'residential', 'unclassified', 'road', 'service', 'pedestrian', 'raceway', 'living_street', 'construction') THEN oneway ELSE NULL END as oneway, 
-                CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN 'yes' else 'no' end as link, CASE WHEN layer IS NULL THEN '0' else layer end as layernotnull 
+                CASE WHEN service IN ('parking_aisle', 'drive-through', 'driveway') THEN 'INT-minor'::text ELSE 'INT-normal'::text END AS service, 
+                CASE WHEN oneway IN ('yes', '-1') AND highway IN ('motorway', 'motorway_link',  'trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'residential', 'unclassified', 'road', 'service', 'pedestrian', 'raceway', 'living_street', 'construction') THEN oneway ELSE NULL END AS oneway, 
+                CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN 'yes' ELSE 'no' END AS link, CASE WHEN layer IS NULL THEN '0' ELSE layer END AS layernotnull 
               FROM planet_osm_line 
                 JOIN (VALUES 
                   ('highway_motorway',380), 
@@ -782,27 +782,27 @@ Layer:
                   ('highway_construction',10)
                 ) AS ordertable (feature, prio) 
                   on ('highway_' || planet_osm_line.highway) = ordertable.feature 
-              WHERE (tunnel IS NULL or not tunnel in ('yes','building_passage')) 
-                AND (covered IS NULL or not covered='yes') 
-                AND (bridge IS NULL or not bridge in ('yes','viaduct'))) 
-            union all 
+              WHERE (tunnel IS NULL OR NOT tunnel IN ('yes', 'building_passage')) 
+                AND (covered IS NULL OR NOT covered = 'yes') 
+                AND (bridge IS NULL OR NOT bridge IN ('yes', 'viaduct'))) 
+            UNION ALL
             (SELECT 
                 way, prio, 
                 COALESCE(
-                  ('railway_' || (CASE WHEN railway='preserved' AND service IN ('spur','siding','yard') THEN 'INT-preserved-ssy'::text WHEN (railway='rail' AND service in ('spur','siding','yard')) THEN 'INT-spur-siding-yard' ELSE railway END)),
+                  ('railway_' || (CASE WHEN railway = 'preserved' AND service IN ('spur', 'siding', 'yard') THEN 'INT-preserved-ssy'::text WHEN (railway = 'rail' AND service IN ('spur', 'siding', 'yard')) THEN 'INT-spur-siding-yard' ELSE railway END)),
                   ('aeroway_' || aeroway)
                 ) AS feature,
                 horse, foot, bicycle, tracktype,
-                CASE WHEN access in ('destination') THEN 'destination'::text 
+                CASE WHEN access IN ('destination') THEN 'destination'::text 
                   WHEN access IN ('no', 'private') THEN 'no'::text 
                   ELSE NULL 
-                END as access,
+                END AS access,
                 construction,
-                CASE WHEN service in ('parking_aisle','drive-through','driveway') THEN 'INT-minor'::text 
+                CASE WHEN service IN ('parking_aisle', 'drive-through', 'driveway') THEN 'INT-minor'::text 
                   ELSE 'INT-normal'::text 
-                END as service,
-                NULL as oneway, 
-                'no' as link,
+                END AS service,
+                NULL AS oneway, 
+                'no' AS link,
                 CASE WHEN layer IS NULL THEN '0' ELSE layer END AS layernotnull 
               FROM planet_osm_line 
                 JOIN (VALUES
@@ -824,9 +824,9 @@ Layer:
                   ('aeroway_taxiway',50),
                   ('railway_platform',90)) AS ordertable (feature, prio) 
                 ON COALESCE(('railway_' || planet_osm_line.railway), ('aeroway_' || planet_osm_line.aeroway)) = ordertable.feature 
-              WHERE (tunnel IS NULL OR NOT tunnel IN ('yes','building_passage')) 
-                AND (covered IS NULL OR NOT covered='yes') 
-                AND (bridge IS NULL OR NOT bridge IN ('yes','viaduct'))
+              WHERE (tunnel IS NULL OR NOT tunnel IN ('yes', 'building_passage')) 
+                AND (covered IS NULL OR NOT covered = 'yes') 
+                AND (bridge IS NULL OR NOT bridge IN ('yes', 'viaduct'))
             )
           ) AS features ORDER BY prio
         ) AS roads_fill
@@ -841,9 +841,9 @@ Layer:
       table: |-
         (SELECT 
             DISTINCT on (p.way) 
-            p.way as way, l.highway as int_tc_type,
-            CASE WHEN l.service IN ('parking_aisle','drive-through','driveway') THEN 'INT-minor'::text 
-              ELSE 'INT-normal'::text end AS int_tc_service
+            p.way AS way, l.highway AS int_tc_type,
+            CASE WHEN l.service IN ('parking_aisle', 'drive-through', 'driveway') THEN 'INT-minor'::text 
+              ELSE 'INT-normal'::text END AS int_tc_service
           FROM planet_osm_point p
             JOIN planet_osm_line l
               ON ST_DWithin(p.way, l.way, 0.1)
@@ -853,10 +853,10 @@ Layer:
               ('residential', 3),
               ('living_street', 4),
               ('service', 5)
-            ) AS v (highway,prio)
+            ) AS v (highway, prio)
               ON v.highway=l.highway
-          WHERE p.highway='turning_circle' or p.highway='turning_loop' 
-          ORDER BY p.way,v.prio
+          WHERE p.highway = 'turning_circle' OR p.highway = 'turning_loop' 
+          ORDER BY p.way, v.prio
         ) AS turning_circle_fill
     advanced: {}
   - id: "aerialways"
@@ -867,7 +867,7 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-        (SELECT way,aerialway FROM planet_osm_line WHERE aerialway IS NOT NULL) AS aerialways
+        (SELECT way, aerialway FROM planet_osm_line WHERE aerialway IS NOT NULL) AS aerialways
     advanced: {}
   - id: "roads-low-zoom"
     name: "roads-low-zoom"
@@ -877,10 +877,10 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-              (SELECT way,coalesce(('highway_' || (CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN substr(highway,0,length(highway)-4) else highway end)), ('railway_' || (CASE WHEN (railway='rail' AND service in ('spur','siding','yard'))  THEN 'INT-spur-siding-yard' when railway in ('rail','tram','light_rail','funicular','narrow_gauge') THEN railway ELSE NULL END))) AS feature,tunnel
+              (SELECT way, COALESCE(('highway_' || (CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN substr(highway, 0, length(highway)-4) ELSE highway end)), ('railway_' || (CASE WHEN (railway = 'rail' AND service IN ('spur', 'siding', 'yard')) THEN 'INT-spur-siding-yard' WHEN railway IN ('rail', 'tram', 'light_rail', 'funicular', 'narrow_gauge') THEN railway ELSE NULL END))) AS feature, tunnel
                FROM planet_osm_roads
                WHERE highway IS NOT NULL
-                  or (railway IS NOT NULL AND railway!='preserved' AND (service IS NULL or service not in ('spur','siding','yard')))
+                  OR (railway IS NOT NULL AND railway != 'preserved' AND (service IS NULL OR service NOT IN ('spur', 'siding', 'yard')))
                ORDER BY z_order
               ) AS roads_low_zoom
     advanced: {}
@@ -892,7 +892,7 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-        (SELECT way,waterway,name,CASE WHEN tunnel in ('yes','culvert') THEN 'yes' else 'no' end as int_tunnel, 'yes' as bridge FROM planet_osm_line WHERE waterway in ('river','canal','derelict_canal','stream','drain','ditch','wadi') AND bridge in ('yes','aqueduct') ORDER BY z_order) AS waterway_bridges
+        (SELECT way, waterway, name, CASE WHEN tunnel IN ('yes', 'culvert') THEN 'yes' ELSE 'no' END AS int_tunnel, 'yes' AS bridge FROM planet_osm_line WHERE waterway IN ('river', 'canal', 'derelict_canal', 'stream', 'drain', 'ditch', 'wadi') AND bridge IN ('yes', 'aqueduct') ORDER BY z_order) AS waterway_bridges
     advanced: {}
   - id: "bridges"
     name: "bridges"
@@ -902,7 +902,99 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-        (SELECT * FROM ((SELECT way, prio, ('highway_' || (CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN substr(highway,0,length(highway)-4) else highway end)) AS feature, horse, foot, bicycle, tracktype, CASE WHEN access in ('destination') THEN 'destination'::text when access in ('no', 'private') THEN 'no'::text ELSE NULL END as access, construction, CASE WHEN service in ('parking_aisle','drive-through','driveway') THEN 'INT-minor'::text else 'INT-normal'::text end as service, CASE WHEN oneway in ('yes', '-1') AND highway in ('motorway','motorway_link','trunk','trunk_link','primary','primary_link','secondary','secondary_link','tertiary','tertiary_link','residential','unclassified','road','service','pedestrian','raceway','living_street','construction') THEN oneway ELSE NULL END as oneway, CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN 'yes' else 'no' end as link, CASE WHEN layer IS NULL THEN '0' else layer end as layernotnull FROM planet_osm_line JOIN ( values ('highway_motorway',380), ('highway_trunk',370), ('highway_primary',360), ('highway_secondary',350), ('highway_tertiary',340), ('highway_residential',330), ('highway_unclassified',330), ('highway_road',330), ('highway_living_street',320), ('highway_pedestrian',310),  ('highway_raceway',300), ('highway_motorway_link',240), ('highway_trunk_link',230), ('highway_primary_link',220), ('highway_secondary_link',210), ('highway_tertiary_link',200), ('highway_service',150), ('highway_track',110), ('highway_path',100), ('highway_footway',100), ('highway_bridleway',100), ('highway_cycleway',100),  ('highway_steps',100), ('highway_platform',90), ('highway_proposed',20), ('highway_construction',10)) AS ordertable (feature, prio) on ('highway_' || planet_osm_line.highway) = ordertable.feature WHERE bridge in ('yes','viaduct')) union all (SELECT way, prio, coalesce(('railway_' ||(CASE WHEN railway='preserved' AND service in ('spur','siding','yard') THEN 'INT-preserved-ssy'::text when (railway='rail' AND service in ('spur','siding','yard'))  THEN 'INT-spur-siding-yard' else railway end)), ('aeroway_' || aeroway)) AS feature, horse, foot, bicycle, tracktype, CASE WHEN access in ('destination') THEN 'destination'::text when access in ('no', 'private') THEN 'no'::text ELSE NULL END as access, construction, CASE WHEN service in ('parking_aisle','drive-through','driveway') THEN 'INT-minor'::text else 'INT-normal'::text end as service, null as oneway, 'no' as link, CASE WHEN layer IS NULL THEN '0' else layer end as layernotnull FROM planet_osm_line JOIN ( values ('railway_rail',430), ('railway_spur',430), ('railway_siding',430), ('railway_subway',420), ('railway_narrow_gauge',420), ('railway_light_rail',420), ('railway_preserved',420), ('railway_funicular',420), ('railway_monorail',420), ('railway_miniature',420), ('railway_turntable',420), ('railway_tram',410), ('railway_disused',400), ('railway_construction',400), ('aeroway_runway',60), ('aeroway_taxiway',50), ('railway_platform',90)) AS ordertable (feature, prio) on coalesce(('railway_' || planet_osm_line.railway), ('aeroway_' || planet_osm_line.aeroway)) = ordertable.feature WHERE bridge in ('yes','viaduct'))) AS features ORDER BY layernotnull,prio) AS bridges
+        (SELECT * 
+          FROM (
+            (SELECT 
+                way, prio, 
+                ('highway_' || (CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN substr(highway, 0, length(highway)-4) ELSE highway END)) AS feature, 
+                horse, foot, bicycle, tracktype, 
+                CASE WHEN access IN ('destination') THEN 'destination'::text 
+                  WHEN access IN ('no', 'private') THEN 'no'::text 
+                  ELSE NULL 
+                END AS access, 
+                construction, 
+                CASE WHEN service IN ('parking_aisle', 'drive-through', 'driveway') THEN 'INT-minor'::text 
+                  ELSE 'INT-normal'::text 
+                END AS service, 
+                CASE WHEN oneway IN ('yes', '-1') AND highway IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'residential', 'unclassified', 'road', 'service', 'pedestrian', 'raceway', 'living_street', 'construction') THEN oneway 
+                  ELSE NULL 
+                END AS oneway,
+                CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN 'yes' 
+                  ELSE 'no' END AS link, 
+                CASE WHEN layer IS NULL THEN '0' 
+                  ELSE layer 
+                END AS layernotnull 
+            FROM planet_osm_line 
+              JOIN (VALUES 
+                ('highway_motorway', 380), 
+                ('highway_trunk', 370), 
+                ('highway_primary', 360), 
+                ('highway_secondary', 350), 
+                ('highway_tertiary', 340), 
+                ('highway_residential', 330), 
+                ('highway_unclassified', 330), 
+                ('highway_road', 330), 
+                ('highway_living_street', 320), 
+                ('highway_pedestrian', 310), 
+                ('highway_raceway', 300), 
+                ('highway_motorway_link', 240), 
+                ('highway_trunk_link', 230), 
+                ('highway_primary_link', 220), 
+                ('highway_secondary_link', 210), 
+                ('highway_tertiary_link', 200),
+                ('highway_service', 150), 
+                ('highway_track', 110), 
+                ('highway_path', 100), 
+                ('highway_footway', 100), 
+                ('highway_bridleway', 100), 
+                ('highway_cycleway', 100),
+                ('highway_steps', 100), 
+                ('highway_platform', 90), 
+                ('highway_proposed', 20), 
+                ('highway_construction', 10)
+              ) AS ordertable (feature, prio) 
+                ON ('highway_' || planet_osm_line.highway) = ordertable.feature 
+            WHERE bridge IN ('yes', 'viaduct')
+          ) 
+          UNION ALL
+          (SELECT 
+              way, prio, 
+              COALESCE(('railway_' || (CASE WHEN railway = 'preserved' AND service IN ('spur', 'siding', 'yard') THEN 'INT-preserved-ssy'::text WHEN (railway = 'rail' AND service IN ('spur', 'siding', 'yard')) THEN 'INT-spur-siding-yard' ELSE railway END)),
+               ('aeroway_' || aeroway)) AS feature,
+               horse, foot, bicycle, tracktype,
+              CASE WHEN access IN ('destination') THEN 'destination'::text 
+                WHEN access IN ('no', 'private') THEN 'no'::text 
+              ELSE NULL END AS access,
+              construction,
+              CASE WHEN service IN ('parking_aisle', 'drive-through', 'driveway') THEN 'INT-minor'::text ELSE 'INT-normal'::text END AS service, 
+              NULL AS oneway, 
+              'no' AS link,
+              CASE WHEN layer IS NULL THEN '0' ELSE layer END AS layernotnull 
+            FROM planet_osm_line 
+              JOIN (VALUES 
+                ('railway_rail', 430), 
+                ('railway_spur', 430), 
+                ('railway_siding', 430), 
+                ('railway_subway', 420), 
+                ('railway_narrow_gauge', 420), 
+                ('railway_light_rail', 420), 
+                ('railway_preserved', 420), 
+                ('railway_funicular', 420), 
+                ('railway_monorail', 420), 
+                ('railway_miniature', 420), 
+                ('railway_turntable', 420), 
+                ('railway_tram', 410), 
+                ('railway_disused', 400), 
+                ('railway_construction', 400), 
+                ('aeroway_runway', 60), 
+                ('aeroway_taxiway', 50), 
+                ('railway_platform', 90)
+              ) AS ordertable (feature, prio) 
+                ON COALESCE(('railway_' || planet_osm_line.railway), ('aeroway_' || planet_osm_line.aeroway)) = ordertable.feature
+            WHERE bridge IN ('yes', 'viaduct')
+            )) AS features 
+          ORDER BY layernotnull, prio
+        ) AS bridges
     properties: 
       group-by: "layernotnull"
     advanced: {}
@@ -914,7 +1006,7 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-        (SELECT way FROM planet_osm_line WHERE highway='bus_guideway' AND (tunnel IS NULL or tunnel != 'yes')) AS guideways
+        (SELECT way FROM planet_osm_line WHERE highway = 'bus_guideway' AND (tunnel IS NULL OR tunnel != 'yes')) AS guideways
     advanced: {}
   - name: "admin-01234"
     id: "admin-01234"
@@ -924,10 +1016,10 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-        (SELECT way,admin_level
+        (SELECT way, admin_level
                FROM planet_osm_roads
-               WHERE "boundary"='administrative'
-                 AND admin_level in ('0','1','2','3','4')
+               WHERE "boundary" = 'administrative'
+                 AND admin_level IN ('0', '1', '2', '3', '4')
                ) AS admin_01234
     advanced: {}
   - id: "admin-5678"
@@ -938,10 +1030,10 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-        (SELECT way,admin_level
+        (SELECT way, admin_level
                FROM planet_osm_roads
-               WHERE "boundary"='administrative'
-                 AND admin_level in ('5','6','7','8')
+               WHERE "boundary" = 'administrative'
+                 AND admin_level IN ('5', '6', '7', '8')
                ) AS admin_5678
     advanced: {}
   - id: "admin-other"
@@ -952,10 +1044,10 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-        (SELECT way,admin_level
+        (SELECT way, admin_level
                FROM planet_osm_roads
-               WHERE "boundary"='administrative'
-                 AND admin_level in ('9', '10')
+               WHERE "boundary" = 'administrative'
+                 AND admin_level IN ('9', '10')
                ) AS admin_other
     advanced: {}
   - id: "power-minorline"
@@ -966,7 +1058,7 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-        (SELECT way FROM planet_osm_line WHERE "power"='minor_line') AS power_minorline
+        (SELECT way FROM planet_osm_line WHERE "power" = 'minor_line') AS power_minorline
     advanced: {}
   - id: "power-line"
     name: "power-line"
@@ -976,7 +1068,7 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-        (SELECT way FROM planet_osm_line WHERE "power"='line') AS power_line
+        (SELECT way FROM planet_osm_line WHERE "power" = 'line') AS power_line
     advanced: {}
   - id: "nepopulated"
     name: "nepopulated"
@@ -997,9 +1089,9 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-        (SELECT way,place,name,ref
+        (SELECT way, place, name, ref
                FROM planet_osm_point
-               WHERE place in ('country','state')
+               WHERE place IN ('country', 'state')
               ) AS placenames_large
     advanced: {}
   - id: "placenames-capital"
@@ -1010,9 +1102,9 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-        (SELECT way,place,name,ref
+        (SELECT way, place, name, ref
                FROM planet_osm_point
-               WHERE place in ('city','town') AND capital='yes'
+               WHERE place IN ('city', 'town') AND capital = 'yes'
               ) AS placenames_capital
     advanced: {}
   - id: "placenames-medium"
@@ -1023,10 +1115,10 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-        (SELECT way,place,name
+        (SELECT way, place, name
               FROM planet_osm_point
-              WHERE place in ('city','town')
-                AND (capital IS NULL or capital != 'yes')
+              WHERE place IN ('city', 'town')
+                AND (capital IS NULL OR capital != 'yes')
               ) AS placenames_medium
     advanced: {}
   - id: "placenames-small"
@@ -1037,9 +1129,9 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-        (SELECT way,place,name
+        (SELECT way, place, name
               FROM planet_osm_point
-              WHERE place in ('suburb','village','hamlet','neighbourhood','locality','isolated_dwelling','farm')
+              WHERE place IN ('suburb', 'village', 'hamlet', 'neighbourhood', 'locality', 'isolated_dwelling', 'farm')
               ) AS placenames_small
     advanced: {}
   - id: "stations"
@@ -1050,10 +1142,10 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-              (SELECT way,name,railway,aerialway,disused
+              (SELECT way, name, railway, aerialway, disused
               FROM planet_osm_point
-              WHERE railway in ('station','halt','tram_stop','subway_entrance')
-                 or aerialway='station'
+              WHERE railway IN ('station', 'halt', 'tram_stop', 'subway_entrance')
+                 OR aerialway = 'station'
               ) AS stations
     advanced: {}
   - id: "stations-poly"
@@ -1064,26 +1156,12 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-              (SELECT way,name,railway,aerialway,disused
+              (SELECT way, name, railway, aerialway, disused
               FROM planet_osm_polygon
-              WHERE railway in ('station','halt','tram_stop')
-                 or aerialway='station'
+              WHERE railway IN ('station', 'halt', 'tram_stop')
+                 OR aerialway = 'station'
               ) AS stations_poly
     advanced: {}
-  - id: "glaciers-text"
-    name: "glaciers-text"
-    class: ""
-    geometry: "polygon"
-    <<: *extents
-    Datasource: 
-      <<: *osm2pgsql
-      table: |2-
-              (SELECT way,name,way_area
-              FROM planet_osm_polygon
-              WHERE "natural"='glacier' AND building IS NULL
-              ORDER BY way_area desc
-              ) AS glaciers_text
-    advanced: {}
   - id: "amenity-symbols"
     name: "amenity-symbols"
     class: "symbols"
@@ -1094,13 +1172,13 @@ Layer:
       table: |2-
         (SELECT *
               FROM planet_osm_point
-              WHERE aeroway in ('aerodrome','helipad')
-                 or barrier in ('bollard','gate','lift_gate','block')
-                 or highway in ('mini_roundabout','gate')
-                 or man_made in ('lighthouse','power_wind','windmill','mast')
-                 or (power='generator' AND ("generator:source"='wind' or power_source='wind'))
-                 or "natural" in ('peak','volcano','spring','tree','cave_entrance')
-                 or railway='level_crossing'
+              WHERE aeroway IN ('aerodrome', 'helipad')
+                 OR barrier IN ('bollard', 'gate', 'lift_gate', 'block')
+                 OR highway IN ('mini_roundabout', 'gate')
+                 OR man_made IN ('lighthouse', 'power_wind', 'windmill', 'mast')
+                 OR (power = 'generator' AND ("generator:source" = 'wind' OR power_source = 'wind'))
+                 OR "natural" IN ('peak', 'volcano', 'spring', 'tree', 'cave_entrance')
+                 OR railway = 'level_crossing'
               ) AS amenity_symbols
     advanced: {}
   - id: "amenity-symbols-poly"
@@ -1113,13 +1191,13 @@ Layer:
       table: |2-
         (SELECT *
               FROM planet_osm_polygon
-              WHERE aeroway in ('aerodrome','helipad')
-                 or barrier in ('bollard','gate','lift_gate','block')
-                 or highway in ('mini_roundabout','gate')
-                 or man_made in ('lighthouse','power_wind','windmill','mast')
-                 or (power='generator' AND ("generator:source"='wind' or power_source='wind'))
-                 or "natural" in ('peak','volcano','spring','tree')
-                 or railway='level_crossing'
+              WHERE aeroway IN ('aerodrome', 'helipad')
+                 OR barrier IN ('bollard', 'gate', 'lift_gate', 'block')
+                 OR highway IN ('mini_roundabout', 'gate')
+                 OR man_made IN ('lighthouse', 'power_wind', 'windmill', 'mast')
+                 OR (power = 'generator' AND ("generator:source" = 'wind' OR power_source = 'wind'))
+                 OR "natural" IN ('peak', 'volcano', 'spring', 'tree')
+                 OR railway = 'level_crossing'
               ) AS amenity_symbols_poly
     advanced: {}
   - id: "amenity-points-poly"
@@ -1130,15 +1208,15 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-        (SELECT way,coalesce('aeroway_' || aeroway, 'shop_' || CASE WHEN shop in ('supermarket', 'bakery', 'butcher', 'clothes', 'fashion', 'convenience', 'department_store', 'doityourself', 'florist', 'hairdresser', 'car', 'car_repair', 'bicycle') THEN shop when not shop IS NULL THEN 'other' ELSE NULL END, 'amenity_' || amenity, 'leisure_' || leisure, 'landuse_' || landuse, 'man_made_' || man_made, 'natural_' || "natural", 'place_' || place, 'tourism_' || tourism, 'military_' || military, 'waterway_' || waterway, 'historic_' || historic, 'lock_' || lock, 'highway_' || highway) AS feature,access,religion
+        (SELECT way, COALESCE('aeroway_' || aeroway, 'shop_' || CASE WHEN shop IN ('supermarket', 'bakery', 'butcher', 'clothes', 'fashion', 'convenience', 'department_store', 'doityourself', 'florist', 'hairdresser', 'car', 'car_repair', 'bicycle') THEN shop WHEN NOT shop IS NULL THEN 'other' ELSE NULL END, 'amenity_' || amenity, 'leisure_' || leisure, 'landuse_' || landuse, 'man_made_' || man_made, 'natural_' || "natural", 'place_' || place, 'tourism_' || tourism, 'military_' || military, 'waterway_' || waterway, 'historic_' || historic, 'lock_' || lock, 'highway_' || highway) AS feature, access, religion
               FROM planet_osm_polygon
               WHERE amenity IS NOT NULL
-                 or shop in ('accessories', 'alcohol', 'antique', 'antiques', 'appliance', 'art', 'baby_goods', 'bag', 'bags', 'bakery', 'bathroom_furnishing', 'beauty', 'bed', 'betting', 'beverages', 'bicycle', 'boat', 'bookmaker', 'books', 'boutique', 'builder', 'building_materials', 'butcher', 'camera', 'car', 'car_parts', 'car_repair', 'car_service', 'carpet', 'charity', 'cheese', 'chemist', 'chocolate', 'clothes', 'coffee', 'communication', 'computer', 'confectionery', 'convenience', 'copyshop', 'cosmetics', 'craft', 'curtain', 'dairy', 'deli', 'delicatessen', 'department_store', 'discount', 'dive', 'doityourself', 'dry_cleaning', 'e-cigarette', 'electrical', 'electronics', 'energy', 'erotic', 'estate_agent', 'fabric', 'farm', 'fashion', 'fish', 'fishing', 'fishmonger', 'flooring', 'florist', 'food', 'frame', 'frozen_food', 'funeral_directors', 'furnace', 'furniture', 'gallery', 'gambling', 'games', 'garden_centre', 'gas', 'general', 'gift', 'glaziery', 'greengrocer', 'grocery', 'hairdresser', 'hardware', 'health', 'health_food', 'hearing_aids', 'herbalist', 'hifi', 'hobby', 'household', 'houseware', 'hunting', 'ice_cream', 'insurance', 'interior_decoration', 'jewellery', 'jewelry', 'kiosk', 'kitchen', 'laundry', 'leather', 'lighting', 'locksmith', 'lottery', 'mall', 'market', 'massage', 'medical', 'medical_supply', 'mobile_phone', 'money_lender', 'motorcycle', 'motorcycle_repair', 'music', 'musical_instrument', 'newsagent', 'office_supplies', 'optician', 'organic', 'outdoor', 'paint', 'pastry', 'pawnbroker', 'perfumery', 'pet', 'pets', 'pharmacy', 'phone', 'photo', 'photo_studio', 'photography', 'pottery', 'printing', 'radiotechnics', 'real_estate', 'religion', 'rental', 'salon', 'scuba_diving', 'seafood', 'second_hand', 'sewing', 'shoe_repair', 'shoes', 'shopping_centre', 'solarium', 'souvenir', 'sports', 'stationery', 'supermarket', 'tailor', 'tanning', 'tattoo', 'tea', 'ticket', 'tiles', 'tobacco', 'toys', 'trade', 'travel_agency', 'tyres', 'vacuum_cleaner', 'variety_store', 'video', 'video_games', 'watches', 'wholesale', 'wine', 'winery', 'yes')
-                 or tourism in ('alpine_hut','camp_site','picnic_site','caravan_site','guest_house','hostel','hotel','motel','museum','viewpoint','bed_and_breakfast','information','chalet')
-                 or highway in ('bus_stop','traffic_signals')
-                 or man_made in ('mast','water_tower')
-                 or historic in ('memorial','archaeological_site')
-                 or leisure in ('playground', 'picnic_table')
+                 OR shop IN ('accessories', 'alcohol', 'antique', 'antiques', 'appliance', 'art', 'baby_goods', 'bag', 'bags', 'bakery', 'bathroom_furnishing', 'beauty', 'bed', 'betting', 'beverages', 'bicycle', 'boat', 'bookmaker', 'books', 'boutique', 'builder', 'building_materials', 'butcher', 'camera', 'car', 'car_parts', 'car_repair', 'car_service', 'carpet', 'charity', 'cheese', 'chemist', 'chocolate', 'clothes', 'coffee', 'communication', 'computer', 'confectionery', 'convenience', 'copyshop', 'cosmetics', 'craft', 'curtain', 'dairy', 'deli', 'delicatessen', 'department_store', 'discount', 'dive', 'doityourself', 'dry_cleaning', 'e-cigarette', 'electrical', 'electronics', 'energy', 'erotic', 'estate_agent', 'fabric', 'farm', 'fashion', 'fish', 'fishing', 'fishmonger', 'flooring', 'florist', 'food', 'frame', 'frozen_food', 'funeral_directors', 'furnace', 'furniture', 'gallery', 'gambling', 'games', 'garden_centre', 'gas', 'general', 'gift', 'glaziery', 'greengrocer', 'grocery', 'hairdresser', 'hardware', 'health', 'health_food', 'hearing_aids', 'herbalist', 'hifi', 'hobby', 'household', 'houseware', 'hunting', 'ice_cream', 'insurance', 'interior_decoration', 'jewellery', 'jewelry', 'kiosk', 'kitchen', 'laundry', 'leather', 'lighting', 'locksmith', 'lottery', 'mall', 'market', 'massage', 'medical', 'medical_supply', 'mobile_phone', 'money_lender', 'motorcycle', 'motorcycle_repair', 'music', 'musical_instrument', 'newsagent', 'office_supplies', 'optician', 'organic', 'outdoor', 'paint', 'pastry', 'pawnbroker', 'perfumery', 'pet', 'pets', 'pharmacy', 'phone', 'photo', 'photo_studio', 'photography', 'pottery', 'printing', 'radiotechnics', 'real_estate', 'religion', 'rental', 'salon', 'scuba_diving', 'seafood', 'second_hand', 'sewing', 'shoe_repair', 'shoes', 'shopping_centre', 'solarium', 'souvenir', 'sports', 'stationery', 'supermarket', 'tailor', 'tanning', 'tattoo', 'tea', 'ticket', 'tiles', 'tobacco', 'toys', 'trade', 'travel_agency', 'tyres', 'vacuum_cleaner', 'variety_store', 'video', 'video_games', 'watches', 'wholesale', 'wine', 'winery', 'yes')
+                 OR tourism IN ('alpine_hut', 'camp_site', 'picnic_site', 'caravan_site', 'guest_house', 'hostel', 'hotel', 'motel', 'museum', 'viewpoint', 'bed_and_breakfast', 'information', 'chalet')
+                 OR highway IN ('bus_stop', 'traffic_signals')
+                 OR man_made IN ('mast', 'water_tower')
+                 OR historic IN ('memorial', 'archaeological_site')
+                 OR leisure IN ('playground', 'picnic_table')
          ORDER BY way_area desc      ) AS amenity_points_poly
     advanced: {}
   - id: "amenity-points"
@@ -1149,17 +1227,17 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-        (SELECT way,coalesce('aeroway_' || aeroway, 'shop_' || CASE WHEN shop in ('supermarket', 'bakery', 'butcher', 'clothes', 'fashion', 'convenience', 'department_store', 'doityourself', 'florist', 'hairdresser', 'car', 'car_repair', 'bicycle') THEN shop when not shop IS NULL THEN 'other' ELSE NULL END, 'amenity_' || amenity, 'leisure_' || leisure, 'landuse_' || landuse, 'man_made_' || man_made, 'natural_' || "natural", 'place_' || place, 'tourism_' || tourism, 'military_' || military, 'waterway_' || waterway, 'historic_' || historic, 'lock_' || lock, 'highway_' || highway) AS feature,access,religion
+        (SELECT way, COALESCE('aeroway_' || aeroway, 'shop_' || CASE WHEN shop IN ('supermarket', 'bakery', 'butcher', 'clothes', 'fashion', 'convenience', 'department_store', 'doityourself', 'florist', 'hairdresser', 'car', 'car_repair', 'bicycle') THEN shop WHEN NOT shop IS NULL THEN 'other' ELSE NULL END, 'amenity_' || amenity, 'leisure_' || leisure, 'landuse_' || landuse, 'man_made_' || man_made, 'natural_' || "natural", 'place_' || place, 'tourism_' || tourism, 'military_' || military, 'waterway_' || waterway, 'historic_' || historic, 'lock_' || lock, 'highway_' || highway) AS feature, access, religion
               FROM planet_osm_point
-              WHERE shop in ('accessories', 'alcohol', 'antique', 'antiques', 'appliance', 'art', 'baby_goods', 'bag', 'bags', 'bakery', 'bathroom_furnishing', 'beauty', 'bed', 'betting', 'beverages', 'bicycle', 'boat', 'bookmaker', 'books', 'boutique', 'builder', 'building_materials', 'butcher', 'camera', 'car', 'car_parts', 'car_repair', 'car_service', 'carpet', 'charity', 'cheese', 'chemist', 'chocolate', 'clothes', 'coffee', 'communication', 'computer', 'confectionery', 'convenience', 'copyshop', 'cosmetics', 'craft', 'curtain', 'dairy', 'deli', 'delicatessen', 'department_store', 'discount', 'dive', 'doityourself', 'dry_cleaning', 'e-cigarette', 'electrical', 'electronics', 'energy', 'erotic', 'estate_agent', 'fabric', 'farm', 'fashion', 'fish', 'fishing', 'fishmonger', 'flooring', 'florist', 'food', 'frame', 'frozen_food', 'funeral_directors', 'furnace', 'furniture', 'gallery', 'gambling', 'games', 'garden_centre', 'gas', 'general', 'gift', 'glaziery', 'greengrocer', 'grocery', 'hairdresser', 'hardware', 'health', 'health_food', 'hearing_aids', 'herbalist', 'hifi', 'hobby', 'household', 'houseware', 'hunting', 'ice_cream', 'insurance', 'interior_decoration', 'jewellery', 'jewelry', 'kiosk', 'kitchen', 'laundry', 'leather', 'lighting', 'locksmith', 'lottery', 'mall', 'market', 'massage', 'medical', 'medical_supply', 'mobile_phone', 'money_lender', 'motorcycle', 'motorcycle_repair', 'music', 'musical_instrument', 'newsagent', 'office_supplies', 'optician', 'organic', 'outdoor', 'paint', 'pastry', 'pawnbroker', 'perfumery', 'pet', 'pets', 'pharmacy', 'phone', 'photo', 'photo_studio', 'photography', 'pottery', 'printing', 'radiotechnics', 'real_estate', 'religion', 'rental', 'salon', 'scuba_diving', 'seafood', 'second_hand', 'sewing', 'shoe_repair', 'shoes', 'shopping_centre', 'solarium', 'souvenir', 'sports', 'stationery', 'supermarket', 'tailor', 'tanning', 'tattoo', 'tea', 'ticket', 'tiles', 'tobacco', 'toys', 'trade', 'travel_agency', 'tyres', 'vacuum_cleaner', 'variety_store', 'video', 'video_games', 'watches', 'wholesale', 'wine', 'winery', 'yes')
-                 or amenity IS NOT NULL
-                 or tourism in ('alpine_hut','picnic_site','camp_site','caravan_site','guest_house','hostel','hotel','motel','museum','viewpoint','bed_and_breakfast','information','chalet')
-                 or highway in ('bus_stop','traffic_signals','ford')
-                 or man_made in ('mast','water_tower')
-                 or historic in ('memorial','archaeological_site')
-                 or waterway='lock'
-                 or lock='yes'
-                 or leisure in ('playground','slipway','picnic_table')
+              WHERE shop IN ('accessories', 'alcohol', 'antique', 'antiques', 'appliance', 'art', 'baby_goods', 'bag', 'bags', 'bakery', 'bathroom_furnishing', 'beauty', 'bed', 'betting', 'beverages', 'bicycle', 'boat', 'bookmaker', 'books', 'boutique', 'builder', 'building_materials', 'butcher', 'camera', 'car', 'car_parts', 'car_repair', 'car_service', 'carpet', 'charity', 'cheese', 'chemist', 'chocolate', 'clothes', 'coffee', 'communication', 'computer', 'confectionery', 'convenience', 'copyshop', 'cosmetics', 'craft', 'curtain', 'dairy', 'deli', 'delicatessen', 'department_store', 'discount', 'dive', 'doityourself', 'dry_cleaning', 'e-cigarette', 'electrical', 'electronics', 'energy', 'erotic', 'estate_agent', 'fabric', 'farm', 'fashion', 'fish', 'fishing', 'fishmonger', 'flooring', 'florist', 'food', 'frame', 'frozen_food', 'funeral_directors', 'furnace', 'furniture', 'gallery', 'gambling', 'games', 'garden_centre', 'gas', 'general', 'gift', 'glaziery', 'greengrocer', 'grocery', 'hairdresser', 'hardware', 'health', 'health_food', 'hearing_aids', 'herbalist', 'hifi', 'hobby', 'household', 'houseware', 'hunting', 'ice_cream', 'insurance', 'interior_decoration', 'jewellery', 'jewelry', 'kiosk', 'kitchen', 'laundry', 'leather', 'lighting', 'locksmith', 'lottery', 'mall', 'market', 'massage', 'medical', 'medical_supply', 'mobile_phone', 'money_lender', 'motorcycle', 'motorcycle_repair', 'music', 'musical_instrument', 'newsagent', 'office_supplies', 'optician', 'organic', 'outdoor', 'paint', 'pastry', 'pawnbroker', 'perfumery', 'pet', 'pets', 'pharmacy', 'phone', 'photo', 'photo_studio', 'photography', 'pottery', 'printing', 'radiotechnics', 'real_estate', 'religion', 'rental', 'salon', 'scuba_diving', 'seafood', 'second_hand', 'sewing', 'shoe_repair', 'shoes', 'shopping_centre', 'solarium', 'souvenir', 'sports', 'stationery', 'supermarket', 'tailor', 'tanning', 'tattoo', 'tea', 'ticket', 'tiles', 'tobacco', 'toys', 'trade', 'travel_agency', 'tyres', 'vacuum_cleaner', 'variety_store', 'video', 'video_games', 'watches', 'wholesale', 'wine', 'winery', 'yes')
+                 OR amenity IS NOT NULL
+                 OR tourism IN ('alpine_hut', 'picnic_site', 'camp_site', 'caravan_site', 'guest_house', 'hostel', 'hotel', 'motel', 'museum', 'viewpoint', 'bed_and_breakfast', 'information', 'chalet')
+                 OR highway IN ('bus_stop', 'traffic_signals', 'ford')
+                 OR man_made IN ('mast', 'water_tower')
+                 OR historic IN ('memorial', 'archaeological_site')
+                 OR waterway = 'lock'
+                 OR lock = 'yes'
+                 OR leisure IN ('playground', 'slipway', 'picnic_table')
               ) AS amenity_points
     advanced: {}
   - id: "power-towers"
@@ -1170,7 +1248,7 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-        (SELECT way FROM planet_osm_point WHERE power='tower') AS power_towers
+        (SELECT way FROM planet_osm_point WHERE power = 'tower') AS power_towers
     advanced: {}
   - id: "power-poles"
     name: "power-poles"
@@ -1180,7 +1258,7 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-        (SELECT way FROM planet_osm_point WHERE power='pole') AS power_poles
+        (SELECT way FROM planet_osm_point WHERE power = 'pole') AS power_poles
     advanced: {}
   - id: "roads-text-ref-low-zoom"
     name: "roads-text-ref-low-zoom"
@@ -1195,14 +1273,14 @@ Layer:
               way, highway, 
               array_length(refs,1) AS height, 
               (SELECT MAX(char_length(ref)) FROM unnest(refs) AS u(ref)) AS width, 
-              array_to_string(refs,E'\n') AS refs
+              array_to_string(refs, E'\n') AS refs
             FROM (
               SELECT 
                   way, 
                   highway, 
-                  string_to_array(ref,';') AS refs
+                  string_to_array(ref, ';') AS refs
               FROM planet_osm_roads
-                WHERE highway IN ('motorway','trunk','primary','secondary')
+                WHERE highway IN ('motorway', 'trunk', 'primary', 'secondary')
                 AND ref IS NOT NULL
               ) AS p) AS q
           WHERE height <= 4 AND width <= 11) AS roads_text_ref_low_zoom
@@ -1215,9 +1293,9 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-             (SELECT way,highway,junction,ref,name
+             (SELECT way, highway, junction, ref, name
               FROM planet_osm_point
-              WHERE highway='motorway_junction' or highway = 'traffic_signals' or junction = 'yes'
+              WHERE highway = 'motorway_junction' OR highway = 'traffic_signals' OR junction = 'yes'
              ) AS junctions
     advanced: {}
   - id: "roads-text-ref"
@@ -1233,14 +1311,14 @@ Layer:
               way, highway, 
               array_length(refs,1) AS height, 
               (SELECT MAX(char_length(ref)) FROM unnest(refs) AS u(ref)) AS width, 
-              array_to_string(refs,E'\n') AS refs
+              array_to_string(refs, E'\n') AS refs
             FROM (
               SELECT 
                   way, 
                   COALESCE(highway, aeroway) AS highway, 
-                  string_to_array(ref,';') AS refs
+                  string_to_array(ref, ';') AS refs
               FROM planet_osm_line
-                WHERE (highway IN ('motorway','trunk','primary','secondary','tertiary','unclassified','residential') OR aeroway IN ('runway','taxiway'))
+                WHERE (highway IN ('motorway', 'trunk', 'primary', 'secondary', 'tertiary', 'unclassified', 'residential') OR aeroway IN ('runway', 'taxiway'))
                 AND ref IS NOT NULL
               ) AS p) AS q
           WHERE height <= 4 AND width <= 11) AS roads_text_ref
@@ -1255,7 +1333,7 @@ Layer:
       table: |2-
               (SELECT way, way_area/(!pixel_width!*!pixel_height!) AS way_pixels, highway, name
                FROM planet_osm_polygon
-               WHERE highway in ('residential','unclassified','pedestrian','service','footway','cycleway','living_street','track','path','platform') or railway in ('platform') AND name IS NOT NULL
+               WHERE highway IN ('residential', 'unclassified', 'pedestrian', 'service', 'footway', 'cycleway', 'living_street', 'track', 'path', 'platform') OR railway IN ('platform') AND name IS NOT NULL
               ) AS roads_area_text_name
     advanced: {}
   - id: "roads-text-name"
@@ -1266,9 +1344,9 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-              (SELECT way, CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN substr(highway,0,length(highway)-4) else highway end, name
+              (SELECT way, CASE WHEN substr(highway, length(highway)-3, 4) = 'link' THEN substr(highway, 0, length(highway)-4) ELSE highway end, name
                FROM planet_osm_line
-               WHERE highway in ('motorway','motorway_link','trunk','trunk_link','primary','primary_link','secondary','secondary_link','tertiary','tertiary_link','residential','unclassified','road','service','pedestrian','raceway','living_street', 'construction','proposed') 
+               WHERE highway IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link', 'residential', 'unclassified', 'road', 'service', 'pedestrian', 'raceway', 'living_street', 'construction', 'proposed') 
                  AND name IS NOT NULL
               ) AS roads_text_name
     advanced: {}
@@ -1282,7 +1360,7 @@ Layer:
       table: |2-
               (SELECT way, highway, name
                FROM planet_osm_line
-               WHERE highway in ('bridleway', 'footway', 'cycleway', 'path', 'track', 'steps') 
+               WHERE highway IN ('bridleway', 'footway', 'cycleway', 'path', 'track', 'steps') 
                  AND name IS NOT NULL
               ) AS paths_text_name
     advanced: {}
@@ -1294,18 +1372,22 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-        (SELECT way,coalesce('aeroway_' || aeroway, 'shop_' || CASE WHEN shop in ('supermarket', 'bakery', 'butcher', 'clothes', 'fashion', 'convenience', 'department_store', 'doityourself', 'florist', 'hairdresser', 'car', 'car_repair', 'bicycle') THEN shop when not shop IS NULL THEN 'other' ELSE NULL END, 'amenity_' || amenity, 'leisure_' || leisure, 'landuse_' || landuse, 'man_made_' || man_made, 'natural_' || "natural", 'place_' || place, 'tourism_' || tourism, 'military_' || military, 'waterway_' || waterway, 'historic_' || historic, 'highway_' || highway) AS feature,access,NULL as ele,name,ref,way_area
+        (SELECT way, way_area/(!pixel_width!*!pixel_height!) AS way_pixels, COALESCE('aeroway_' || aeroway, 'shop_' || CASE WHEN shop IN ('supermarket', 'bakery', 'butcher', 'clothes', 'fashion', 'convenience', 'department_store', 'doityourself', 'florist', 'hairdresser', 'car', 'car_repair', 'bicycle') THEN shop WHEN NOT shop IS NULL THEN 'other' ELSE NULL END, 'amenity_' || amenity, 'leisure_' || leisure, 'landuse_' || landuse, 'man_made_' || man_made, 'natural_' || "natural", 'place_' || place, 'tourism_' || tourism, 'military_' || military, 'waterway_' || waterway, 'historic_' || historic, 'highway_' || highway, 'power_' || power, 'boundary_' || boundary) AS feature, access, NULL AS ele, name, ref, way_area, CASE WHEN building = 'no' OR building IS NULL THEN 'no' ELSE 'yes' END AS is_building
                FROM planet_osm_polygon
                WHERE amenity IS NOT NULL
-                  or shop in ('accessories', 'alcohol', 'antique', 'antiques', 'appliance', 'art', 'baby_goods', 'bag', 'bags', 'bakery', 'bathroom_furnishing', 'beauty', 'bed', 'betting', 'beverages', 'bicycle', 'boat', 'bookmaker', 'books', 'boutique', 'builder', 'building_materials', 'butcher', 'camera', 'car', 'car_parts', 'car_repair', 'car_service', 'carpet', 'charity', 'cheese', 'chemist', 'chocolate', 'clothes', 'coffee', 'communication', 'computer', 'confectionery', 'convenience', 'copyshop', 'cosmetics', 'craft', 'curtain', 'dairy', 'deli', 'delicatessen', 'department_store', 'discount', 'dive', 'doityourself', 'dry_cleaning', 'e-cigarette', 'electrical', 'electronics', 'energy', 'erotic', 'estate_agent', 'fabric', 'farm', 'fashion', 'fish', 'fishing', 'fishmonger', 'flooring', 'florist', 'food', 'frame', 'frozen_food', 'funeral_directors', 'furnace', 'furniture', 'gallery', 'gambling', 'games', 'garden_centre', 'gas', 'general', 'gift', 'glaziery', 'greengrocer', 'grocery', 'hairdresser', 'hardware', 'health', 'health_food', 'hearing_aids', 'herbalist', 'hifi', 'hobby', 'household', 'houseware', 'hunting', 'ice_cream', 'insurance', 'interior_decoration', 'jewellery', 'jewelry', 'kiosk', 'kitchen', 'laundry', 'leather', 'lighting', 'locksmith', 'lottery', 'mall', 'market', 'massage', 'medical', 'medical_supply', 'mobile_phone', 'money_lender', 'motorcycle', 'motorcycle_repair', 'music', 'musical_instrument', 'newsagent', 'office_supplies', 'optician', 'organic', 'outdoor', 'paint', 'pastry', 'pawnbroker', 'perfumery', 'pet', 'pets', 'pharmacy', 'phone', 'photo', 'photo_studio', 'photography', 'pottery', 'printing', 'radiotechnics', 'real_estate', 'religion', 'rental', 'salon', 'scuba_diving', 'seafood', 'second_hand', 'sewing', 'shoe_repair', 'shoes', 'shopping_centre', 'solarium', 'souvenir', 'sports', 'stationery', 'supermarket', 'tailor', 'tanning', 'tattoo', 'tea', 'ticket', 'tiles', 'tobacco', 'toys', 'trade', 'travel_agency', 'tyres', 'vacuum_cleaner', 'variety_store', 'video', 'video_games', 'watches', 'wholesale', 'wine', 'winery', 'yes')
-                  or leisure IS NOT NULL
-                  or landuse IS NOT NULL
-                  or tourism IS NOT NULL
-                  or "natural" IS NOT NULL
-                  or man_made in ('lighthouse','windmill')
-                  or place='island'
-                  or military='danger_area'
-                  or historic in ('memorial','archaeological_site')
+                  OR shop IN ('accessories', 'alcohol', 'antique', 'antiques', 'appliance', 'art', 'baby_goods', 'bag', 'bags', 'bakery', 'bathroom_furnishing', 'beauty', 'bed', 'betting', 'beverages', 'bicycle', 'boat', 'bookmaker', 'books', 'boutique', 'builder', 'building_materials', 'butcher', 'camera', 'car', 'car_parts', 'car_repair', 'car_service', 'carpet', 'charity', 'cheese', 'chemist', 'chocolate', 'clothes', 'coffee', 'communication', 'computer', 'confectionery', 'convenience', 'copyshop', 'cosmetics', 'craft', 'curtain', 'dairy', 'deli', 'delicatessen', 'department_store', 'discount', 'dive', 'doityourself', 'dry_cleaning', 'e-cigarette', 'electrical', 'electronics', 'energy', 'erotic', 'estate_agent', 'fabric', 'farm', 'fashion', 'fish', 'fishing', 'fishmonger', 'flooring', 'florist', 'food', 'frame', 'frozen_food', 'funeral_directors', 'furnace', 'furniture', 'gallery', 'gambling', 'games', 'garden_centre', 'gas', 'general', 'gift', 'glaziery', 'greengrocer', 'grocery', 'hairdresser', 'hardware', 'health', 'health_food', 'hearing_aids', 'herbalist', 'hifi', 'hobby', 'household', 'houseware', 'hunting', 'ice_cream', 'insurance', 'interior_decoration', 'jewellery', 'jewelry', 'kiosk', 'kitchen', 'laundry', 'leather', 'lighting', 'locksmith', 'lottery', 'mall', 'market', 'massage', 'medical', 'medical_supply', 'mobile_phone', 'money_lender', 'motorcycle', 'motorcycle_repair', 'music', 'musical_instrument', 'newsagent', 'office_supplies', 'optician', 'organic', 'outdoor', 'paint', 'pastry', 'pawnbroker', 'perfumery', 'pet', 'pets', 'pharmacy', 'phone', 'photo', 'photo_studio', 'photography', 'pottery', 'printing', 'radiotechnics', 'real_estate', 'religion', 'rental', 'salon', 'scuba_diving', 'seafood', 'second_hand', 'sewing', 'shoe_repair', 'shoes', 'shopping_centre', 'solarium', 'souvenir', 'sports', 'stationery', 'supermarket', 'tailor', 'tanning', 'tattoo', 'tea', 'ticket', 'tiles', 'tobacco', 'toys', 'trade', 'travel_agency', 'tyres', 'vacuum_cleaner', 'variety_store', 'video', 'video_games', 'watches', 'wholesale', 'wine', 'winery', 'yes')
+                  OR leisure IS NOT NULL
+                  OR landuse IS NOT NULL
+                  OR tourism IS NOT NULL
+                  OR "natural" IS NOT NULL
+                  OR man_made IN ('lighthouse', 'windmill')
+                  OR place = 'island'
+                  OR military IS NOT NULL
+                  OR historic IN ('memorial', 'archaeological_site')
+                  OR power IS NOT NULL
+                  OR aeroway IS NOT NULL
+                  OR highway IN ('services', 'rest_area')
+                  OR boundary = 'national_park'
          ORDER BY way_area desc     ) AS text_poly
     advanced: {}
   - id: "text"
@@ -1316,20 +1398,23 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-              (SELECT way,coalesce('aeroway_' || aeroway, 'shop_' || CASE WHEN shop in ('supermarket', 'bakery', 'butcher', 'clothes', 'fashion', 'convenience', 'department_store', 'doityourself', 'florist', 'hairdresser', 'car', 'car_repair', 'bicycle') THEN shop when not shop IS NULL THEN 'other' ELSE NULL END, 'amenity_' || amenity, 'leisure_' || leisure, 'landuse_' || landuse, 'man_made_' || man_made, 'natural_' || "natural", 'place_' || place, 'tourism_' || tourism, 'military_' || military, 'waterway_' || waterway, 'historic_' || historic, 'highway_' || highway) AS feature,access,ele,name,ref,NULL as way_area
+              (SELECT way, NULL as way_pixels, COALESCE('aeroway_' || aeroway, 'shop_' || CASE WHEN shop IN ('supermarket', 'bakery', 'butcher', 'clothes', 'fashion', 'convenience', 'department_store', 'doityourself', 'florist', 'hairdresser', 'car', 'car_repair', 'bicycle') THEN shop WHEN NOT shop IS NULL THEN 'other' ELSE NULL END, 'amenity_' || amenity, 'leisure_' || leisure, 'landuse_' || landuse, 'man_made_' || man_made, 'natural_' || "natural", 'place_' || place, 'tourism_' || tourism, 'military_' || military, 'waterway_' || waterway, 'historic_' || historic, 'highway_' || highway, 'power_' || power, 'boundary_' || boundary) AS feature, access, ele, name, ref, NULL AS way_area, CASE WHEN building = 'no' OR building IS NULL THEN 'no' ELSE 'yes' END AS is_building
                FROM planet_osm_point
                WHERE amenity IS NOT NULL
-                  or shop in ('accessories', 'alcohol', 'antique', 'antiques', 'appliance', 'art', 'baby_goods', 'bag', 'bags', 'bakery', 'bathroom_furnishing', 'beauty', 'bed', 'betting', 'beverages', 'bicycle', 'boat', 'bookmaker', 'books', 'boutique', 'builder', 'building_materials', 'butcher', 'camera', 'car', 'car_parts', 'car_repair', 'car_service', 'carpet', 'charity', 'cheese', 'chemist', 'chocolate', 'clothes', 'coffee', 'communication', 'computer', 'confectionery', 'convenience', 'copyshop', 'cosmetics', 'craft', 'curtain', 'dairy', 'deli', 'delicatessen', 'department_store', 'discount', 'dive', 'doityourself', 'dry_cleaning', 'e-cigarette', 'electrical', 'electronics', 'energy', 'erotic', 'estate_agent', 'fabric', 'farm', 'fashion', 'fish', 'fishing', 'fishmonger', 'flooring', 'florist', 'food', 'frame', 'frozen_food', 'funeral_directors', 'furnace', 'furniture', 'gallery', 'gambling', 'games', 'garden_centre', 'gas', 'general', 'gift', 'glaziery', 'greengrocer', 'grocery', 'hairdresser', 'hardware', 'health', 'health_food', 'hearing_aids', 'herbalist', 'hifi', 'hobby', 'household', 'houseware', 'hunting', 'ice_cream', 'insurance', 'interior_decoration', 'jewellery', 'jewelry', 'kiosk', 'kitchen', 'laundry', 'leather', 'lighting', 'locksmith', 'lottery', 'mall', 'market', 'massage', 'medical', 'medical_supply', 'mobile_phone', 'money_lender', 'motorcycle', 'motorcycle_repair', 'music', 'musical_instrument', 'newsagent', 'office_supplies', 'optician', 'organic', 'outdoor', 'paint', 'pastry', 'pawnbroker', 'perfumery', 'pet', 'pets', 'pharmacy', 'phone', 'photo', 'photo_studio', 'photography', 'pottery', 'printing', 'radiotechnics', 'real_estate', 'religion', 'rental', 'salon', 'scuba_diving', 'seafood', 'second_hand', 'sewing', 'shoe_repair', 'shoes', 'shopping_centre', 'solarium', 'souvenir', 'sports', 'stationery', 'supermarket', 'tailor', 'tanning', 'tattoo', 'tea', 'ticket', 'tiles', 'tobacco', 'toys', 'trade', 'travel_agency', 'tyres', 'vacuum_cleaner', 'variety_store', 'video', 'video_games', 'watches', 'wholesale', 'wine', 'winery', 'yes')
-                  or leisure IS NOT NULL
-                  or landuse IS NOT NULL
-                  or tourism IS NOT NULL
-                  or "natural" IS NOT NULL
-                  or man_made in ('lighthouse','windmill')
-                  or place='island'
-                  or military='danger_area'
-                  or aeroway='gate'
-                  or waterway='lock'
-                  or historic in ('memorial','archaeological_site')
+                  OR shop IN ('accessories', 'alcohol', 'antique', 'antiques', 'appliance', 'art', 'baby_goods', 'bag', 'bags', 'bakery', 'bathroom_furnishing', 'beauty', 'bed', 'betting', 'beverages', 'bicycle', 'boat', 'bookmaker', 'books', 'boutique', 'builder', 'building_materials', 'butcher', 'camera', 'car', 'car_parts', 'car_repair', 'car_service', 'carpet', 'charity', 'cheese', 'chemist', 'chocolate', 'clothes', 'coffee', 'communication', 'computer', 'confectionery', 'convenience', 'copyshop', 'cosmetics', 'craft', 'curtain', 'dairy', 'deli', 'delicatessen', 'department_store', 'discount', 'dive', 'doityourself', 'dry_cleaning', 'e-cigarette', 'electrical', 'electronics', 'energy', 'erotic', 'estate_agent', 'fabric', 'farm', 'fashion', 'fish', 'fishing', 'fishmonger', 'flooring', 'florist', 'food', 'frame', 'frozen_food', 'funeral_directors', 'furnace', 'furniture', 'gallery', 'gambling', 'games', 'garden_centre', 'gas', 'general', 'gift', 'glaziery', 'greengrocer', 'grocery', 'hairdresser', 'hardware', 'health', 'health_food', 'hearing_aids', 'herbalist', 'hifi', 'hobby', 'household', 'houseware', 'hunting', 'ice_cream', 'insurance', 'interior_decoration', 'jewellery', 'jewelry', 'kiosk', 'kitchen', 'laundry', 'leather', 'lighting', 'locksmith', 'lottery', 'mall', 'market', 'massage', 'medical', 'medical_supply', 'mobile_phone', 'money_lender', 'motorcycle', 'motorcycle_repair', 'music', 'musical_instrument', 'newsagent', 'office_supplies', 'optician', 'organic', 'outdoor', 'paint', 'pastry', 'pawnbroker', 'perfumery', 'pet', 'pets', 'pharmacy', 'phone', 'photo', 'photo_studio', 'photography', 'pottery', 'printing', 'radiotechnics', 'real_estate', 'religion', 'rental', 'salon', 'scuba_diving', 'seafood', 'second_hand', 'sewing', 'shoe_repair', 'shoes', 'shopping_centre', 'solarium', 'souvenir', 'sports', 'stationery', 'supermarket', 'tailor', 'tanning', 'tattoo', 'tea', 'ticket', 'tiles', 'tobacco', 'toys', 'trade', 'travel_agency', 'tyres', 'vacuum_cleaner', 'variety_store', 'video', 'video_games', 'watches', 'wholesale', 'wine', 'winery', 'yes')
+                  OR leisure IS NOT NULL
+                  OR landuse IS NOT NULL
+                  OR tourism IS NOT NULL
+                  OR "natural" IS NOT NULL
+                  OR man_made IN ('lighthouse', 'windmill')
+                  OR place = 'island'
+                  OR military IS NOT NULL
+                  OR aeroway IS NOT NULL
+                  OR waterway = 'lock'
+                  OR historic IN ('memorial', 'archaeological_site')
+                  OR power IS NOT NULL
+                  OR highway IN ('services', 'rest_area')
+                  OR boundary = 'national_park'
               ) AS text
     advanced: {}
   - id: "building-text"
@@ -1340,7 +1425,9 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-        (SELECT name, way, way_area FROM planet_osm_polygon WHERE building IS NOT NULL  AND building not in ('no','station','supermarket')) AS building_text
+        (SELECT name, way, way_area
+        FROM planet_osm_polygon
+        WHERE building IS NOT NULL AND building NOT IN ('no', 'station', 'supermarket')) AS building_text
     advanced: {}
   - id: "interpolation"
     name: "interpolation"
@@ -1350,7 +1437,9 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-        (SELECT way FROM planet_osm_line WHERE "addr:interpolation" IS NOT NULL) AS interpolation
+        (SELECT way
+        FROM planet_osm_line
+        WHERE "addr:interpolation" IS NOT NULL) AS interpolation
     advanced: {}
   - id: "housenumbers"
     name: "housenumbers"
@@ -1361,8 +1450,8 @@ Layer:
       <<: *osm2pgsql
       table: |2-
               (SELECT way,"addr:housenumber" FROM planet_osm_polygon WHERE "addr:housenumber" IS NOT NULL AND building IS NOT NULL
-               union
-               select way,"addr:housenumber" FROM planet_osm_point WHERE "addr:housenumber" IS NOT NULL
+               UNION
+               SELECT way,"addr:housenumber" FROM planet_osm_point WHERE "addr:housenumber" IS NOT NULL
               ) AS housenumbers
     advanced: {}
   - id: "housenames"
@@ -1374,8 +1463,8 @@ Layer:
       <<: *osm2pgsql
       table: |2-
         (SELECT way,"addr:housename" FROM planet_osm_polygon WHERE "addr:housename" IS NOT NULL AND building IS NOT NULL
-               union
-               select way,"addr:housename" FROM planet_osm_point WHERE "addr:housename" IS NOT NULL
+               UNION
+               SELECT way,"addr:housename" FROM planet_osm_point WHERE "addr:housename" IS NOT NULL
               ) AS housenames
     advanced: {}
   - id: "water-lines-text"
@@ -1386,9 +1475,9 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-              (SELECT way,waterway,lock,name,CASE WHEN tunnel in ('yes','culvert') THEN 'yes' else 'no' end as int_tunnel
+              (SELECT way, waterway, lock, name, CASE WHEN tunnel IN ('yes', 'culvert') THEN 'yes' ELSE 'no' END AS int_tunnel
               FROM planet_osm_line
-              WHERE waterway in ('weir','river','canal','derelict_canal','stream','drain','ditch','wadi')
+              WHERE waterway IN ('weir', 'river', 'canal', 'derelict_canal', 'stream', 'drain', 'ditch', 'wadi')
                ORDER BY z_order
               ) AS water_lines_text
     advanced: {}
@@ -1400,7 +1489,7 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-        (SELECT way, name, admin_level FROM planet_osm_polygon WHERE "boundary" = 'administrative' AND admin_level in ('0','1','2','3','4','5','6','7','8','9','10')) AS admin_text
+        (SELECT way, name, admin_level FROM planet_osm_polygon WHERE "boundary" = 'administrative' AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10')) AS admin_text
     advanced: {}
   - id: "nature-reserve-boundaries"
     name: "nature-reserve-boundaries"
@@ -1410,7 +1499,7 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-        (SELECT way,way_area,name,boundary FROM planet_osm_polygon WHERE (boundary='national_park' or leisure='nature_reserve') AND building IS NULL) AS national_park_boundaries
+        (SELECT way, way_area, name, boundary FROM planet_osm_polygon WHERE (boundary = 'national_park' OR leisure = 'nature_reserve') AND building IS NULL) AS national_park_boundaries
     advanced: {}
   - id: "theme-park"
     name: "theme-park"
@@ -1420,5 +1509,5 @@ Layer:
     Datasource: 
       <<: *osm2pgsql
       table: |2-
-        (SELECT way,name,tourism FROM planet_osm_polygon WHERE tourism='theme_park') AS theme_park
+        (SELECT way, name, tourism FROM planet_osm_polygon WHERE tourism = 'theme_park') AS theme_park
     advanced: {}
diff --git a/water.mss b/water.mss
index 591f024ca1..2f05169cb9 100644
--- a/water.mss
+++ b/water.mss
@@ -1,11 +1,13 @@
 @water-text: #6699cc;
+@glacier: #ddecec;
+@glacier-line: #9cf;
 
 #water-areas {
   [natural = 'glacier']::natural {
     [zoom >= 6] {
       line-dasharray: 4,2;
       line-width: 1.5;
-      line-color: #9cf;
+      line-color: @glacier-line;
       polygon-pattern-file: url('symbols/glacier.png');
       [zoom >= 8] {
         polygon-pattern-file: url('symbols/glacier2.png');
@@ -65,19 +67,6 @@
   }
 }
 
-#glaciers-text {
-  [way_area >= 10000000][zoom >= 10],
-  [way_area >= 5000000][way_area < 10000000][zoom >= 11],
-  [way_area < 5000000][zoom >= 12] {
-    text-name: "[name]";
-    text-size: 10;
-    text-fill: #77f;
-    text-face-name: @oblique-fonts;
-    text-halo-radius: 1.5;
-    text-wrap-width: 20;
-  }
-}
-
 #water-lines-casing {
   [waterway='stream'],
   [waterway='ditch'],