diff --git a/routers/focus.py b/routers/focus.py
index d21ad0a..75c9457 100644
--- a/routers/focus.py
+++ b/routers/focus.py
@@ -59,6 +59,8 @@ async def focus_view(
         LEFT JOIN domains ld ON l.domain_id = ld.id
         LEFT JOIN areas la ON l.area_id = la.id
         WHERE df.focus_date = :target_date AND df.is_deleted = false
+              AND (t.id IS NULL OR t.is_deleted = false)
+              AND (li.id IS NULL OR li.is_deleted = false)
         ORDER BY df.sort_order, df.created_at
     """), {"target_date": target_date})
     items = [dict(r._mapping) for r in result]
diff --git a/routers/tasks.py b/routers/tasks.py
index 5c67f5a..3d156b7 100644
--- a/routers/tasks.py
+++ b/routers/tasks.py
@@ -427,8 +427,7 @@ async def toggle_task(task_id: str, request: Request, db: AsyncSession = Depends
 async def delete_task(task_id: str, request: Request, db: AsyncSession = Depends(get_db)):
     repo = BaseRepository("tasks", db)
     await repo.soft_delete(task_id)
-    referer = request.headers.get("referer", "/tasks")
-    return RedirectResponse(url=referer, status_code=303)
+    return RedirectResponse(url="/tasks", status_code=303)
 
 
 # Quick add from any task list