diff --git a/.env b/.env
index cd66767e..5a1ace5c 100644
--- a/.env
+++ b/.env
@@ -4,7 +4,7 @@
 TILESET_FILE=openmaptiles.yaml
 
 # Use 3-part patch version to ignore patch updates, e.g. 5.0.0
-TOOLS_VERSION=6.2
+TOOLS_VERSION=latest
 
 # Make sure these values are in sync with the ones in .env-postgres file
 PGDATABASE=openmaptiles
diff --git a/layers/place/update_city_point.sql b/layers/place/update_city_point.sql
index 6a7ec2a7..721bcd70 100644
--- a/layers/place/update_city_point.sql
+++ b/layers/place/update_city_point.sql
@@ -23,8 +23,8 @@ $$
              LEFT JOIN ne_10m_populated_places AS ne ON
             (
                 (osm.tags ? 'wikidata' AND osm.tags->'wikidata' = ne.wikidataid) OR
-                lower(osm.name) IN (lower(ne.name), lower(ne.namealt), lower(ne.meganame), lower(ne.gn_ascii), lower(ne.nameascii)) OR
-                lower(osm.name_en) IN (lower(ne.name), lower(ne.namealt), lower(ne.meganame), lower(ne.gn_ascii), lower(ne.nameascii)) OR
+                lower(osm.name) IN (lower(ne.name), lower(ne.namealt), lower(ne.meganame), lower(ne.name_en), lower(ne.nameascii)) OR
+                lower(osm.name_en) IN (lower(ne.name), lower(ne.namealt), lower(ne.meganame), lower(ne.name_en), lower(ne.nameascii)) OR
                 ne.name = unaccent(osm.name)
             )
           AND osm.place IN ('city', 'town', 'village')
diff --git a/layers/water/water.sql b/layers/water/water.sql
index 9dd3c9e0..a78c07ae 100644
--- a/layers/water/water.sql
+++ b/layers/water/water.sql
@@ -18,18 +18,6 @@ $$ LANGUAGE SQL IMMUTABLE
                 STRICT
                 PARALLEL SAFE;
 
--- Add ne_id for missing ne_50m_lakes.
-UPDATE ne_50m_lakes SET ne_id = ne_10m_lakes.ne_id
-FROM ne_50m_lakes lakes
-LEFT JOIN ne_10m_lakes USING (wikidataid)
-WHERE   ne_50m_lakes.wikidataid = ne_10m_lakes.wikidataid
-    AND ne_50m_lakes.ne_id = 0;
-
--- Update ne_110_lakes ne_id where two lakes (Lake Onega) have identical attributes.
--- New ne_id is taken from ne_50m_lakes
-UPDATE ne_110m_lakes SET ne_id = 1159126421
-WHERE   ne_id = 1159113251
-    AND ST_Area(geometry) < 10000000000;
 
 -- Get matching osm id for natural earth id.
 DROP MATERIALIZED VIEW IF EXISTS match_osm_ne_id CASCADE;