diff --git a/data.yml b/data.yml
index 810321b2..6f0c0759 100644
--- a/data.yml
+++ b/data.yml
@@ -47,6 +47,21 @@ Layer:
               UNION ALL
               SELECT * FROM water_z6
               WHERE z(!scale_denominator!) = 6
+              UNION ALL
+              SELECT * FROM water_z8
+              WHERE z(!scale_denominator!) BETWEEN 8 AND 10
+              UNION ALL
+              SELECT * FROM water_z11
+              WHERE z(!scale_denominator!) = 11
+              UNION ALL
+              SELECT * FROM water_z12
+              WHERE z(!scale_denominator!) = 12
+              UNION ALL
+              SELECT * FROM water_z13
+              WHERE z(!scale_denominator!) = 13
+              UNION ALL
+              SELECT * FROM water_z14
+              WHERE z(!scale_denominator!) >= 14
           ) AS water
           WHERE geom && !bbox!
         ) AS data
diff --git a/schema/layers/water.sql b/schema/layers/water.sql
index 649005c3..54392f48 100644
--- a/schema/layers/water.sql
+++ b/schema/layers/water.sql
@@ -51,3 +51,27 @@ CREATE OR REPLACE VIEW water_z6 AS (
     SELECT geom FROM ne_10m_rivers_lake_centerlines
     WHERE featurecla = 'River'
 );
+
+CREATE OR REPLACE VIEW water_z8 AS (
+    SELECT way AS geom FROM water_areas
+    WHERE way_area > 100000
+);
+
+CREATE OR REPLACE VIEW water_z11 AS (
+    SELECT way AS geom FROM water_areas
+    WHERE way_area > 50000
+);
+
+CREATE OR REPLACE VIEW water_z12 AS (
+    SELECT way AS geom FROM water_areas
+    WHERE way_area > 40000
+);
+
+CREATE OR REPLACE VIEW water_z13 AS (
+    SELECT way AS geom FROM water_areas
+    WHERE way_area > 2000
+);
+
+CREATE OR REPLACE VIEW water_z14 AS (
+    SELECT way AS geom FROM water_areas
+);