diff --git a/.claude/commands/evening-prep.md b/.claude/commands/evening-prep.md
index 6fce673..61d3a75 100644
--- a/.claude/commands/evening-prep.md
+++ b/.claude/commands/evening-prep.md
@@ -23,17 +23,15 @@ Format my calendar events in a simple Markdown table with columns: Time (ET), Ev
 Let me know how much unscheduled time I have.
 
 ## Step 3: Get task data
-Fetch Notion data directly from these collection URLs (do NOT fetch the DB URLs first — skip schema discovery):
-- Tasks: collection://2c0abd6c-450a-8085-80a0-000ba136a154
-- Projects: collection://2c0abd6c-450a-807a-a3d7-000b8d8aaecc
+Fetch Notion data using these URLs. Run all three in parallel:
 
-Run these two searches in parallel within the tasks collection:
-1. Query: "blocking in progress" — surfaces tasks blocking others
-2. Query: "suggested for today not started in progress" — surfaces time-sensitive tasks
+1. **Blocking tasks** — fetch view://2c0abd6c-450a-8060-b247-000c30138b80 (pre-filtered: Blocking populated + not Done)
+2. **Daily planning tasks** — fetch view://2c0abd6c-450a-8064-869a-000cf1f5a919 (pre-filtered: incomplete tasks sorted by Suggested for today)
+3. **Focus projects** — fetch view://2c0abd6c-450a-806e-a2c9-000c8aa14a44 (pre-filtered: Focus this week = true)
 
-Fetch only the top 5 results from each search in parallel. Ignore Done and Blocked tasks.
-
-For projects, search for "focus this week active" and fetch the top 5 results in parallel with the task fetches.
+If the view fetches fail, fall back to fetching the full databases:
+- Tasks: https://www.notion.so/solutioninnovation/2c0abd6c450a805098d3cc0e7d3dfccf (data source: collection://2c0abd6c-450a-8085-80a0-000ba136a154)
+- Projects: https://www.notion.so/solutioninnovation/2c0abd6c450a8090aca3e0b2b0373c17 (data source: collection://2c0abd6c-450a-807a-a3d7-000b8d8aaecc)
 
 Format the note with the following sections:
 1. Under **Suggested Tasks** look at all tasks not complete and identify up to 3 tasks with a suggestedForToday of tomorrow or earlier, or tasks that are blocking others. Ignore tasks with a status of Blocked. Add these to a list.
diff --git a/.claude/commands/weekly-template.md b/.claude/commands/weekly-template.md
index 7f6e6df..a9c5d8a 100644
--- a/.claude/commands/weekly-template.md
+++ b/.claude/commands/weekly-template.md
@@ -12,21 +12,27 @@ Please create a new note in the "Weekly Notes" folder.
 The title should be "Weekly Note - Month, Day Year" using today's date.
 
 ## Step 2: Review Notion data and create the note
-First, use the Notion MCP to review the Projects and Task Tracker to get insight into focus areas for this week.
+Fetch these in parallel:
+- **Active projects** — fetch view://2c0abd6c-450a-8053-b2e8-000caaf77931 (pre-filtered: Active status)
+- **This week's tasks** — fetch view://2c0abd6c-450a-80ce-9fa7-000c27dd9719 (pre-filtered: incomplete, sorted by Suggested for today)
 
-List all projects with status active and ask me which 3 i want to prioritize for thie upcoming week.
+If view fetches fail, fall back to the full database URLs:
+- Projects: https://www.notion.so/solutioninnovation/2c0abd6c450a8090aca3e0b2b0373c17
+- Tasks: https://www.notion.so/solutioninnovation/2c0abd6c450a805098d3cc0e7d3dfccf
+
+List all active projects and ask me which 3 I want to prioritize for the upcoming week.
 If there isn't a weekly goal for the selected projects, ask me to write one.
-Update the Focus this week field to true for the selected projects.
+Update the Focus this week field to true for the selected projects (and set to false for any previously selected projects not in my new list).
 
 Then add the following to the note
 
-
 Format the note with the following sections:
 1. **Priorities for this week** - List the three projects I selected with their weekly goal.
 2. **Key tasks** - List all tasks that are due this week. Order by due date and blocker status. Show the task name, related project, type, and effort level. Provide a link to the task in Notion.
 
 ## Step 3: Generate my reading list
-Then, query the Reading List database (collection://2c4abd6c-450a-804a-809a-000bc77d02c1) for articles with Status = "To Read" or "In Progress".
+Then, query the Reading List database using view://2c4abd6c-450a-80c1-9cda-000c5fa5bcc8 (pre-filtered: Status = To Read or In Progress).
+If the view fetch fails, fall back to: https://www.notion.so/solutioninnovation/2c4abd6c450a80cbae55c440dd9e2427
 
 3. Under **Suggested Reading** recommend 2 articles that fit the available time blocks:
    - Look at the unscheduled time blocks to determine what reading time is appropriate
diff --git a/CLAUDE.md b/CLAUDE.md
index dd86f36..6f67ea9 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -70,8 +70,16 @@ When creating or modifying notes:
 * You have access to a OneDrive folder with AJ's calendar for the current day and the next day
 	* IMPORTANT: Use the startET and endET fields to get the times in my local time zone.
 	* ALWAYS exclude "NDS Design Readiness & Refinement" meetings from calendar displays and time calculations.
-* Notion MCP – Projects: All active projects with various, Status, Focus This Week checkbox, and weekly goals 
-* Notion MCP – Task Tracker: All units of work with: - Name and Status - Blocking (multi-select of people waiting on AJ) - Deadline dates - Project relation (links to Projects) - Key Contact information - Priority, Effort Estimate, Energy Type 
+* Notion MCP – Projects: https://www.notion.so/solutioninnovation/2c0abd6c450a8090aca3e0b2b0373c17 — All active projects with Status, Focus This Week checkbox, and weekly goals. Data source: `collection://2c0abd6c-450a-807a-a3d7-000b8d8aaecc`
+* Notion MCP – Task Tracker: https://www.notion.so/solutioninnovation/2c0abd6c450a805098d3cc0e7d3dfccf — All units of work with: Name and Status, Blocking (multi-select of people waiting on AJ), Deadline dates, Project relation, Key Contact, Priority, Effort Estimate, Energy Type. Data source: `collection://2c0abd6c-450a-8085-80a0-000ba136a154`
+* IMPORTANT: Always fetch these databases using the full `https://www.notion.so/solutioninnovation/...` URL — bare UUIDs and collection:// URIs will fail. The collection:// URIs can be used as `data_source_url` in searches after the initial fetch.
+* Useful pre-filtered views in Tasks Tracker:
+  * **Blocking others**: `view://2c0abd6c-450a-8060-b247-000c30138b80` — tasks with Blocking populated, not Done
+  * **Daily planning**: `view://2c0abd6c-450a-8064-869a-000cf1f5a919` — all incomplete tasks sorted by Suggested for today
+  * **This week**: `view://2c0abd6c-450a-80ce-9fa7-000c27dd9719` — incomplete tasks sorted by Suggested for today
+* Useful pre-filtered views in Projects:
+  * **This week's focus**: `view://2c0abd6c-450a-806e-a2c9-000c8aa14a44` — projects with Focus this week = true
+  * **Active**: `view://2c0abd6c-450a-8053-b2e8-000caaf77931` — Active status projects only
 * CRITICAL: Always read these resources when planning. Check: 1. Which tasks have Blocking field populated (priority #1) 2. Which deadlines are this week 3. Which projects have Focus This Week = true 4. Task Status (ignore Done tasks) Base ALL suggestions on this real data, not examples.
 
 ## Your job