diff --git a/src/blackboard/queries.py b/src/blackboard/queries.py
index 847f0b3..2aee233 100644
--- a/src/blackboard/queries.py
+++ b/src/blackboard/queries.py
@@ -160,9 +160,9 @@ class Queries:
             rows = conn.execute(
                 """SELECT e.*, GROUP_CONCAT(et.tag) as tags
                 FROM experiences e
-                LEFT JOIN experience_tags et ON e.id = et.experience_id
-                WHERE e.source_task_id=?
-                GROUP BY e.id
+                LEFT JOIN experience_tags et ON e.experience_id = et.experience_id
+                WHERE e.task_id=?
+                GROUP BY e.experience_id
                 ORDER BY e.created_at DESC""",
                 (task_id,),
             ).fetchall()