diff --git a/layers/water_name/update_marine_point.sql b/layers/water_name/update_marine_point.sql
index b42133c..983bef4 100644
--- a/layers/water_name/update_marine_point.sql
+++ b/layers/water_name/update_marine_point.sql
@@ -14,7 +14,10 @@ BEGIN
   WITH important_marine_point AS (
       SELECT osm.geometry, osm.osm_id, osm.name, osm.name_en, ne.scalerank
       FROM ne_10m_geography_marine_polys AS ne, osm_marine_point AS osm
-      WHERE ne.name ILIKE osm.name
+      WHERE trim(regexp_replace(ne.name, '\\s+', ' ', 'g')) ILIKE osm.name
+        OR trim(regexp_replace(ne.name, '\\s+', ' ', 'g')) ILIKE osm.tags->'name:en'
+        OR trim(regexp_replace(ne.name, '\\s+', ' ', 'g')) ILIKE osm.tags->'name:es'
+        OR osm.name ILIKE trim(regexp_replace(ne.name, '\\s+', ' ', 'g')) || ' %'
   )
   UPDATE osm_marine_point AS osm
   SET "rank" = scalerank