diff --git a/data.yml b/data.yml
index f63002d..3576292 100644
--- a/data.yml
+++ b/data.yml
@@ -108,7 +108,7 @@ Layer:
       table: |-
         ( SELECT *
           FROM (
-            SELECT * FROM road_z4 WHERE z(!scale_denominator!) = 4
+            SELECT * FROM road_z4 WHERE z(!scale_denominator!) BETWEEN 4 AND 5
             UNION ALL
             SELECT * FROM road_z5 WHERE z(!scale_denominator!) = 5
             UNION ALL
@@ -122,8 +122,8 @@ Layer:
       user: osm
     description: Buildings
     fields: 
+      class: String
       scalerank: Number
-      type: String
     properties: 
       "buffer-size": 4
     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
diff --git a/schema/layers/road.sql b/schema/layers/road.sql
index d6f1f07..48d75e8 100644
--- a/schema/layers/road.sql
+++ b/schema/layers/road.sql
@@ -22,19 +22,19 @@ CREATE OR REPLACE VIEW ne_10m_global_roads AS (
 CREATE OR REPLACE VIEW road_z4 AS (
     SELECT *
     FROM ne_10m_global_roads
-    WHERE scalerank <= 4
+    WHERE scalerank <= 5
 );
 
 CREATE OR REPLACE VIEW road_z5 AS (
     SELECT *
     FROM ne_10m_global_roads
-    WHERE scalerank <= 5
+    WHERE scalerank <= 6
 );
 
 CREATE OR REPLACE VIEW road_z6 AS (
     SELECT *
     FROM ne_10m_global_roads
-    WHERE scalerank <= 6
+    WHERE scalerank <= 7
 );
 
 CREATE OR REPLACE VIEW road_z7 AS (