diff --git a/apps/api/app/main.py b/apps/api/app/main.py
index e01e2a4..cf1ca5a 100644
--- a/apps/api/app/main.py
+++ b/apps/api/app/main.py
@@ -229,9 +229,9 @@ def community_observations(
         DataSource.enabled.is_(True),
     )
     if waterbody:
-        query = query.where(ExternalObservation.waterbody_name == waterbody)
+        query = query.join(ExternalObservation.waterbody).where(Waterbody.slug == waterbody)
     if fish:
-        query = query.where(ExternalObservation.fish_name == fish)
+        query = query.join(ExternalObservation.fish).where(Fish.slug == fish)
     items = list(db.scalars(query.order_by(ExternalObservation.last_seen_at.desc(), ExternalObservation.id.desc()).offset(offset).limit(limit)))
     result: list[PublicObservationOut] = []
     for item in items: