diff --git a/data.yml b/data.yml
index f3ecf11a..9877390c 100644
--- a/data.yml
+++ b/data.yml
@@ -40,10 +40,10 @@ Layer:
               WHERE z(!scale_denominator!) = 3
               UNION ALL
               SELECT * FROM water_z4
-              WHERE z(!scale_denominator!) = 4
+              WHERE z(!scale_denominator!) BETWEEN 4 AND 5
               UNION ALL
-              SELECT * FROM water_z5
-              WHERE z(!scale_denominator!) = 5
+              SELECT * FROM water_z6
+              WHERE z(!scale_denominator!) = 6
           ) AS water
           WHERE geom && !bbox!
         ) AS data
diff --git a/schema/layers/water.sql b/schema/layers/water.sql
index 95165aca..c80c11f4 100644
--- a/schema/layers/water.sql
+++ b/schema/layers/water.sql
@@ -26,7 +26,7 @@ CREATE OR REPLACE VIEW water_z3 AS (
 );
 
 CREATE OR REPLACE VIEW water_z4 AS (
-    SELECT geom FROM ne_10m_ocean
+    SELECT geom FROM ne_50m_ocean
     UNION ALL
     SELECT geom FROM ne_50m_lakes
     UNION ALL
@@ -34,7 +34,7 @@ CREATE OR REPLACE VIEW water_z4 AS (
     WHERE featurecla = 'River'
 );
 
-CREATE OR REPLACE VIEW water_z5 AS (
+CREATE OR REPLACE VIEW water_z6 AS (
     SELECT geom FROM ne_10m_ocean
     UNION ALL
     SELECT geom FROM ne_10m_lakes