diff --git a/data.yml b/data.yml
index d73734f..f3ecf11 100644
--- a/data.yml
+++ b/data.yml
@@ -34,7 +34,10 @@ Layer:
               WHERE z(!scale_denominator!) = 1
               UNION ALL
               SELECT * FROM water_z2
-              WHERE z(!scale_denominator!) BETWEEN 2 AND 3
+              WHERE z(!scale_denominator!) = 2
+              UNION ALL
+              SELECT * FROM water_z3
+              WHERE z(!scale_denominator!) = 3
               UNION ALL
               SELECT * FROM water_z4
               WHERE z(!scale_denominator!) = 4
diff --git a/schema/layers/water.sql b/schema/layers/water.sql
index a25cbfe..95165ac 100644
--- a/schema/layers/water.sql
+++ b/schema/layers/water.sql
@@ -16,14 +16,29 @@ CREATE OR REPLACE VIEW water_z2 AS (
     SELECT geom FROM ne_110m_lakes
 );
 
+CREATE OR REPLACE VIEW water_z3 AS (
+    SELECT geom FROM ne_50m_ocean
+    UNION ALL
+    SELECT geom FROM ne_110m_lakes
+    UNION ALL
+    SELECT geom FROM ne_110m_rivers_lake_centerlines
+    WHERE featurecla = 'River'
+);
+
 CREATE OR REPLACE VIEW water_z4 AS (
     SELECT geom FROM ne_10m_ocean
     UNION ALL
     SELECT geom FROM ne_50m_lakes
+    UNION ALL
+    SELECT geom FROM ne_50m_rivers_lake_centerlines
+    WHERE featurecla = 'River'
 );
 
 CREATE OR REPLACE VIEW water_z5 AS (
     SELECT geom FROM ne_10m_ocean
     UNION ALL
     SELECT geom FROM ne_10m_lakes
+    UNION ALL
+    SELECT geom FROM ne_10m_rivers_lake_centerlines
+    WHERE featurecla = 'River'
 );