diff --git a/layers/water/etl_diagram.png b/layers/water/etl_diagram.png
index 5563571f..998f535e 100644
Binary files a/layers/water/etl_diagram.png and b/layers/water/etl_diagram.png differ
diff --git a/layers/water/water.sql b/layers/water/water.sql
index a011dec8..6b8144ea 100644
--- a/layers/water/water.sql
+++ b/layers/water/water.sql
@@ -37,7 +37,8 @@ CREATE INDEX IF NOT EXISTS ne_10m_ocean_gen_z5_idx ON ne_10m_ocean_gen_z5 USING
 DROP MATERIALIZED VIEW IF EXISTS ne_10m_lakes_gen_z5 CASCADE;
 CREATE MATERIALIZED VIEW ne_10m_lakes_gen_z5 AS
 (
-SELECT ST_Simplify(geometry, ZRes(7)) AS geometry,
+SELECT ogc_fid,
+       ST_MakeValid(ST_Simplify(geometry, ZRes(7))) AS geometry,
        'lake'::text AS class,
        NULL::boolean AS is_intermittent,
        NULL::boolean AS is_bridge,
@@ -46,11 +47,12 @@ FROM ne_10m_lakes
     ) /* DELAY_MATERIALIZED_VIEW_CREATION */ ;
 CREATE INDEX IF NOT EXISTS ne_10m_lakes_gen_z5_idx ON ne_10m_lakes_gen_z5 USING gist (geometry);
 
--- etldoc:  ne_10m_lakes ->  ne_10m_lakes_gen_z4
+-- etldoc:  ne_10m_lakes_gen_z5 ->  ne_10m_lakes_gen_z4
 DROP MATERIALIZED VIEW IF EXISTS ne_10m_lakes_gen_z4 CASCADE;
 CREATE MATERIALIZED VIEW ne_10m_lakes_gen_z4 AS
 (
-SELECT ST_Simplify(geometry, ZRes(6)) AS geometry,
+SELECT ogc_fid,
+       ST_MakeValid(ST_Simplify(geometry, ZRes(6))) AS geometry,
        class,
        is_intermittent,
        is_bridge,
@@ -104,7 +106,8 @@ CREATE INDEX IF NOT EXISTS ne_50m_ocean_gen_z2_idx ON ne_50m_ocean_gen_z2 USING
 DROP MATERIALIZED VIEW IF EXISTS ne_50m_lakes_gen_z3 CASCADE;
 CREATE MATERIALIZED VIEW ne_50m_lakes_gen_z3 AS
 (
-SELECT ST_Simplify(geometry, ZRes(5)) AS geometry,
+SELECT ogc_fid,
+       ST_MakeValid(ST_Simplify(geometry, ZRes(5))) AS geometry,
        'lakes'::text AS class,
        NULL::boolean AS is_intermittent,
        NULL::boolean AS is_bridge,
@@ -117,7 +120,8 @@ CREATE INDEX IF NOT EXISTS ne_50m_lakes_gen_z3_idx ON ne_50m_lakes_gen_z3 USING
 DROP MATERIALIZED VIEW IF EXISTS ne_50m_lakes_gen_z2 CASCADE;
 CREATE MATERIALIZED VIEW ne_50m_lakes_gen_z2 AS
 (
-SELECT ST_Simplify(geometry, ZRes(4)) AS geometry,
+SELECT ogc_fid,
+       ST_MakeValid(ST_Simplify(geometry, ZRes(4))) AS geometry,
        class,
        is_intermittent,
        is_bridge,
@@ -159,7 +163,8 @@ CREATE INDEX IF NOT EXISTS ne_110m_ocean_gen_z0_idx ON ne_110m_ocean_gen_z0 USIN
 DROP MATERIALIZED VIEW IF EXISTS ne_110m_lakes_gen_z1 CASCADE;
 CREATE MATERIALIZED VIEW ne_110m_lakes_gen_z1 AS
 (
-SELECT ST_Simplify(geometry, ZRes(3)) AS geometry,
+SELECT ogc_fid,
+       ST_Simplify(geometry, ZRes(3)) AS geometry,
        'lakes'::text AS class,
        NULL::boolean AS is_intermittent,
        NULL::boolean AS is_bridge,
@@ -172,7 +177,8 @@ CREATE INDEX IF NOT EXISTS ne_110m_lakes_gen_z1_idx ON ne_110m_lakes_gen_z1 USIN
 DROP MATERIALIZED VIEW IF EXISTS ne_110m_lakes_gen_z0 CASCADE;
 CREATE MATERIALIZED VIEW ne_110m_lakes_gen_z0 AS
 (
-SELECT ST_Simplify(geometry, ZRes(2)) AS geometry,
+SELECT ogc_fid,
+       ST_Simplify(geometry, ZRes(2)) AS geometry,
        class,
        is_intermittent,
        is_bridge,