diff --git a/services/osm_local.py b/services/osm_local.py
index 0c992e6..ffa703a 100644
--- a/services/osm_local.py
+++ b/services/osm_local.py
@@ -104,18 +104,21 @@ def get_zone_features_postgis(lat: float, lon: float, direction: str, radius_m:
             FROM planet_osm_polygon p, s
             WHERE (p."natural" = 'water' OR p.landuse = 'reservoir')
               AND p.way && s.sector
+              AND ST_Intersects(p.way, s.sector)
         ),
         waterway_near AS (
             SELECT MIN(ST_Distance(l.way, s.center_m)) AS meters
             FROM planet_osm_line l, s
             WHERE l.waterway IN ('river','stream','canal','ditch','drain')
               AND l.way && s.sector
+              AND ST_Intersects(l.way, s.sector)
         ),
         settle_near AS (
             SELECT MIN(ST_Distance(p.way, s.center_m)) AS meters
             FROM planet_osm_point p, s
             WHERE p.place IN ('village','town','city')
               AND p.way && s.sector
+              AND ST_Intersects(p.way, s.sector)
         )
         SELECT
             (SELECT meters FROM road_len),