diff --git a/api/db/services/canvas_service.py b/api/db/services/canvas_service.py
index f72c6f92a..4c9da3ac3 100644
--- a/api/db/services/canvas_service.py
+++ b/api/db/services/canvas_service.py
@@ -143,15 +143,12 @@ class UserCanvasService(CommonService):
         ]
         if keywords:
             agents = cls.model.select(*fields).join(User, on=(cls.model.user_id == User.id)).where(
-                cls.model.user_id.in_(joined_tenant_ids),
-                fn.LOWER(cls.model.title).contains(keywords.lower())
-                #(((cls.model.user_id.in_(joined_tenant_ids)) & (cls.model.permission == TenantPermission.TEAM.value)) | (cls.model.user_id == user_id)),
-                #(fn.LOWER(cls.model.title).contains(keywords.lower()))
+                (((cls.model.user_id.in_(joined_tenant_ids)) & (cls.model.permission == TenantPermission.TEAM.value)) | (cls.model.user_id == user_id)),
+                (fn.LOWER(cls.model.title).contains(keywords.lower()))
             )
         else:
             agents = cls.model.select(*fields).join(User, on=(cls.model.user_id == User.id)).where(
-                cls.model.user_id.in_(joined_tenant_ids)
-                #(((cls.model.user_id.in_(joined_tenant_ids)) & (cls.model.permission == TenantPermission.TEAM.value)) | (cls.model.user_id == user_id))
+                (((cls.model.user_id.in_(joined_tenant_ids)) & (cls.model.permission == TenantPermission.TEAM.value)) | (cls.model.user_id == user_id))
             )
         if canvas_category:
             agents = agents.where(cls.model.canvas_category == canvas_category)
diff --git a/rag/prompts/generator.py b/rag/prompts/generator.py
index 1b593bf6b..7214a32b1 100644
--- a/rag/prompts/generator.py
+++ b/rag/prompts/generator.py
@@ -733,7 +733,7 @@ async def run_toc_from_text(chunks, chat_mdl, callback=None):
     max_len = 12 if prune else 22
     filtered = []
     for x in titles:
-        if not x.get("title") or x["title"] == "-1":
+        if not isinstance(x, dict) or not x.get("title") or x["title"] == "-1":
             continue
         if len(rag_tokenizer.tokenize(x["title"]).split(" ")) > max_len:
             continue