diff --git a/layers/water/water.sql b/layers/water/water.sql
index 2b4e88c..d12a5af 100644
--- a/layers/water/water.sql
+++ b/layers/water/water.sql
@@ -1,6 +1,7 @@
 CREATE OR REPLACE FUNCTION water_class(waterway TEXT) RETURNS TEXT AS $$
     SELECT CASE
            WHEN waterway='' THEN 'lake'
+           WHEN waterway='lake' THEN 'lake'
            WHEN waterway='dock' THEN 'dock'
            ELSE 'river'
    END;
@@ -54,6 +55,7 @@ CREATE OR REPLACE VIEW water_z6 AS (
     UNION ALL
    -- etldoc:  osm_water_polygon_gen6 ->  water_z6
     SELECT geometry, water_class(waterway) AS class FROM osm_water_polygon_gen6
+    WHERE "natural" != 'bay'
 );
 
 CREATE OR REPLACE VIEW water_z7 AS (
@@ -62,6 +64,7 @@ CREATE OR REPLACE VIEW water_z7 AS (
     UNION ALL
     -- etldoc:  osm_water_polygon_gen5 ->  water_z7
     SELECT geometry, water_class(waterway) AS class FROM osm_water_polygon_gen5
+    WHERE "natural" != 'bay'
 );
 
 CREATE OR REPLACE VIEW water_z8 AS (
@@ -70,6 +73,7 @@ CREATE OR REPLACE VIEW water_z8 AS (
     UNION ALL
     -- etldoc:  osm_water_polygon_gen4 ->  water_z8
     SELECT geometry, water_class(waterway) AS class FROM osm_water_polygon_gen4
+    WHERE "natural" != 'bay'
 );
 
 CREATE OR REPLACE VIEW water_z9 AS (
@@ -78,6 +82,7 @@ CREATE OR REPLACE VIEW water_z9 AS (
     UNION ALL
     -- etldoc:  osm_water_polygon_gen3 ->  water_z9
     SELECT geometry, water_class(waterway) AS class FROM osm_water_polygon_gen3
+    WHERE "natural" != 'bay'
 );
 
 CREATE OR REPLACE VIEW water_z10 AS (
@@ -86,6 +91,7 @@ CREATE OR REPLACE VIEW water_z10 AS (
     UNION ALL
     -- etldoc:  osm_water_polygon_gen2 ->  water_z10
     SELECT geometry, water_class(waterway) AS class FROM osm_water_polygon_gen2
+    WHERE "natural" != 'bay'
 );
 
 CREATE OR REPLACE VIEW water_z11 AS (
@@ -94,6 +100,7 @@ CREATE OR REPLACE VIEW water_z11 AS (
     UNION ALL
     -- etldoc:  osm_water_polygon_gen1 ->  water_z11
     SELECT geometry, water_class(waterway) AS class FROM osm_water_polygon_gen1
+    WHERE "natural" != 'bay'
 );
 
 CREATE OR REPLACE VIEW water_z12 AS (
@@ -102,6 +109,7 @@ CREATE OR REPLACE VIEW water_z12 AS (
     UNION ALL
     -- etldoc:  osm_water_polygon ->  water_z12
     SELECT geometry, water_class(waterway) AS class FROM osm_water_polygon
+    WHERE "natural" != 'bay'
 );
 
 CREATE OR REPLACE VIEW water_z13 AS (
@@ -110,6 +118,7 @@ CREATE OR REPLACE VIEW water_z13 AS (
     UNION ALL
     -- etldoc:  osm_water_polygon ->  water_z13
     SELECT geometry, water_class(waterway) AS class FROM osm_water_polygon
+    WHERE "natural" != 'bay'
 );
 
 CREATE OR REPLACE VIEW water_z14 AS (
@@ -118,6 +127,7 @@ CREATE OR REPLACE VIEW water_z14 AS (
     UNION ALL
     -- etldoc:  osm_water_polygon ->  water_z14
     SELECT geometry, water_class(waterway) AS class FROM osm_water_polygon
+    WHERE "natural" != 'bay'
 );
 
 -- etldoc: layer_water [shape=record fillcolor=lightpink, style="rounded,filled",