diff --git a/initdb/02_5_signalk_api_deps.sql b/initdb/02_5_signalk_api_deps.sql
index 3fc4e09..bf101d9 100644
--- a/initdb/02_5_signalk_api_deps.sql
+++ b/initdb/02_5_signalk_api_deps.sql
@@ -61,12 +61,15 @@ AS $vessel$
 			                    longitude,latitude,
 			                    st_makepoint(longitude,latitude) AS geo_point
 			                    FROM public.last_metric
-			                    WHERE latitude IS NOT NULL
-			                        AND longitude IS NOT NULL
+			                    WHERE
+                                    latitude IS NOT NULL
+                                    AND longitude IS NOT NULL
+                                    AND client_id LIKE '%' || current_setting('vessel.mmsi', false)
 			                )
 			            ) AS t
 	            ) AS geojson_t
-            WHERE v.mmsi = current_setting('vessel.mmsi')
+            WHERE
+                m.mmsi = current_setting('vessel.mmsi')
                 AND m.mmsi = v.mmsi;
 		--RAISE notice 'api.vessel_fn %', obj;
     END;