diff --git a/schema/layers/water.sql b/schema/layers/water.sql
index 54392f4..21c2120 100644
--- a/schema/layers/water.sql
+++ b/schema/layers/water.sql
@@ -55,23 +55,37 @@ CREATE OR REPLACE VIEW water_z6 AS (
 CREATE OR REPLACE VIEW water_z8 AS (
     SELECT way AS geom FROM water_areas
     WHERE way_area > 100000
+	UNION ALL
+	SELECT way AS geom FROM waterways
+	WHERE waterway IN ('river')
 );
 
 CREATE OR REPLACE VIEW water_z11 AS (
     SELECT way AS geom FROM water_areas
     WHERE way_area > 50000
+	UNION ALL
+	SELECT way AS geom FROM waterways
+	WHERE waterway IN ('river')
 );
 
 CREATE OR REPLACE VIEW water_z12 AS (
     SELECT way AS geom FROM water_areas
     WHERE way_area > 40000
+	UNION ALL
+	SELECT way AS geom FROM waterways
+	WHERE waterway IN ('river', 'canal', 'stream')
 );
 
 CREATE OR REPLACE VIEW water_z13 AS (
     SELECT way AS geom FROM water_areas
     WHERE way_area > 2000
+	UNION ALL
+	SELECT way AS geom FROM waterways
+	WHERE waterway IN ('river', 'canal', 'stream', 'drain', 'ditch')
 );
 
 CREATE OR REPLACE VIEW water_z14 AS (
     SELECT way AS geom FROM water_areas
+	UNION ALL
+	SELECT way AS geom FROM waterways
 );