diff --git a/map.mss b/map.mss
index f8b80b2..6576c90 100644
--- a/map.mss
+++ b/map.mss
@@ -45,12 +45,12 @@ Map {
   line-color: @color_administrative_lowzoom;
 }
 
-.country-boundary[scalerank<6] {
+.country-boundary[SCALERANK<6] {
   line-color: @color_administrative_dark;
   line-width: 0.5;
 }
 
-.country-boundary-10m[scalerank<6] {
+.country-boundary-10m[SCALERANK<6] {
   ::whiteout {
     [zoom>=7] {
       line-color: @color_administrative_bright;
@@ -80,40 +80,40 @@ Map {
 
 #admin1-lines-10m,
 #admin0-map-units-10m {
-  [zoom>=4][adm0_a3='CAN'],
-  [zoom>=4][adm0_a3='USA'],
-  [zoom>=4][adm0_a3='AUS'] {
+  [zoom>=4][ADM0_A3='CAN'],
+  [zoom>=4][ADM0_A3='USA'],
+  [zoom>=4][ADM0_A3='AUS'] {
     line-width: 0.6;
     line-color: @color_administrative_dark;
   }
 
-  [zoom>=5][scalerank<=2],
-  [zoom>=5][featurecla='Map unit boundary'][adm0_a3='GBR'] {
+  [zoom>=5][SCALERANK<=2],
+  [zoom>=5][FEATURECLA='Map unit boundary'][ADM0_A3='GBR'] {
     line-width: 0.6;
     line-color: @color_administrative_dark;
   }
 
-  [zoom>=6][scalerank<=4],
-  [zoom>=6][featurecla='Map unit boundary'][adm0_a3='GBR'] {
+  [zoom>=6][SCALERANK<=4],
+  [zoom>=6][FEATURECLA='Map unit boundary'][ADM0_A3='GBR'] {
     line-width: 0.8;
     line-color: @color_administrative_dark;
   }
 
-  [zoom>=7][scalerank<=5] {
+  [zoom>=7][SCALERANK<=5] {
     line-width: 1;
     line-color: @color_administrative_medium_low;
     line-dasharray: 1,5;
     line-cap: round;
   }
 
-  [zoom>=8][scalerank<=6] {
+  [zoom>=8][SCALERANK<=6] {
     line-width: 1.2;
     line-color: @color_administrative_medium_high;
     line-dasharray: 1,5;
     line-cap: round;
   }
 
-  [zoom>=9][scalerank<=8] {
+  [zoom>=9][SCALERANK<=8] {
     line-width: 1.2;
     line-color: @color_administrative_medium_high2;
     line-dasharray: 1,5;
@@ -121,10 +121,10 @@ Map {
   }
 }
 
-#lakes-50m[zoom<3][scalerank<1],
-#lakes-50m[zoom=3][scalerank<2],
-#lakes-50m[zoom=4][scalerank<3],
-#lakes-50m[zoom=5][scalerank<5],
+#lakes-50m[zoom<3][SCALERANK<1],
+#lakes-50m[zoom=3][SCALERANK<2],
+#lakes-50m[zoom=4][SCALERANK<3],
+#lakes-50m[zoom=5][SCALERANK<5],
 #lakes-50m[zoom=6],
 #lakes-10m,
 {
diff --git a/sql/functions/highroad.sql b/sql/functions/highroad.sql
index 5675863..548db14 100755
--- a/sql/functions/highroad.sql
+++ b/sql/functions/highroad.sql
@@ -132,7 +132,7 @@ CREATE VIEW highroad_z15plus AS
          railway,
          (CASE WHEN highway IN ('motorway', 'motorway_link') THEN 'highway'
                WHEN highway IN ('trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link') THEN 'major_road'
-               WHEN highway IN ('footpath', 'track', 'footway', 'steps', 'pedestrian', 'path', 'cycleway') THEN 'path'
+               WHEN highway IN ('footpath', 'track', 'footway', 'steps', 'pedestrian', 'living_street', 'path', 'cycleway') THEN 'path'
                WHEN railway IN ('rail', 'tram', 'light_rail', 'narrow_gauge', 'monorail') THEN 'rail'
                ELSE 'minor_road' END) AS kind,
          (CASE WHEN highway IN ('motorway_link','trunk_link','primary_link','secondary_link','tertiary_link') THEN 'yes'
@@ -164,7 +164,7 @@ CREATE VIEW highroad_z15plus AS
       WHERE highway IN ('motorway', 'motorway_link')
          OR highway IN ('trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link')
          OR highway IN ('residential', 'unclassified', 'road', 'unclassified', 'service', 'minor')
-         OR highway IN ('footpath', 'track', 'footway', 'steps', 'pedestrian', 'path', 'cycleway')
+         OR highway IN ('footpath', 'track', 'footway', 'steps', 'pedestrian', 'living_street', 'path', 'cycleway')
          OR railway IN ('rail', 'tram', 'light_rail', 'narrow_gauge', 'monorail')
       ORDER BY explicit_layer ASC, implied_layer ASC, priority DESC);