@@ -9,6 +9,7 @@ For more details see the [plugin's documentation](https://github.com/NotePlan/pl
 - TODO: fix isNoteFromAllowedFolder() for teamspace or possibly 2025-W21.md
 -->
 ## [2.4.0.b52] 2026-07-???
+- Change: **Calendar note terms to include** (was "Calendar note Sections to Include") now also matches task content, not only heading prefixes. Set a Perspective to `acme` or `#acme` to focus calendar and Overdue on that context without a new setting. When this is set and Hide Duplicates is on, matching items stay in calendar / Overdue sections rather than only in a TAG section. (Addresses #727 for @dwertheimer)
 - New: each Perspective can override which Apple Reminders lists to look in via **Reminder Lists to Include** (comma-separated). Blank keeps using NotePlan-enabled lists; named lists can include ones disabled in NotePlan.
 - Experimental Change: noteLink lozenges are right-aligned in task item rows (PROJ* sections unchanged).
 - Change: update set of available icons. dev: Use FA 7.0.1 instead of FA 6.0.0.b3.
 
@@ -239,6 +239,7 @@ The settings in "What to Include and Exclude" control what Spaces, folders, Remi
 
 - **Folders to Include**: Comma-separated list of folder(s) to include when searching for open or closed tasks/checklists. The matches ared partial, so 'Home' will include 'Home' and 'The Home Areas' etc. If left blank, all folders are included. Note: Calendar notes are always included, where relevant.
 - **Folders to Exclude**: Comma-separated list of folder(s) to ignore when searching for open or closed tasks/checklists. The matches are partial, so 'Work' will exclude 'Work' and 'Work/CompanyA' etc.  Where there is a conflict, exclusions will take precedence over inclusions.  To ignore notes at the top-level (not in a folder), include '/' in the list. (@Trash is always ignored, but other special folders need to be specified, e.g. @Archive, @Templates.)
+- **Calendar note terms to include**: Comma-separated list of terms for calendar notes only. A task is included if any heading above it starts with one of these values (case-insensitive prefix; e.g. `Wins` matches `Wins for 2026 Q2`), or if the task text itself contains the term (e.g. `#acme`, `@acme`, or `acme`). If left blank, all calendar items are included. Short terms can over-match. When this is set and Hide Duplicates is on, matching items stay in calendar / Overdue sections rather than only in a TAG section. Useful for Perspective focus (e.g. an ACME perspective with `acme` or `#acme`).
 - **Reminder Lists to Include**: Comma-separated list of Apple Reminders list names for this Perspective. Names must match exactly (after trimming). If left blank, Dashboard uses the lists enabled in NotePlan's Preferences → Calendars → Reminders. You can name lists that are disabled in NotePlan if this Perspective should include them.
 - **Ignore items in notes with these term(s)**: If set, open tasks/checklists with this word or tag will be ignored, and not counted as open or closed. (This check is not case sensitive.) This is useful for situations where completing the item is outside your control.
   - Apply to sections under headings in Calendar notes? If turned on, then all content in Calendar notes under headings that contains any of those phrases will be ignored. This applies to the preceding headings all the way up the H5->H1 hierarchy of section headings for that line. For example in the following note:
 
@@ -791,6 +791,75 @@ describe(`${PLUGIN_NAME}`, () => {
         expect(result[0]).toBe(para1)
         expect(result[1]).toBe(para3)
       })
+
+      test('should keep calendar paragraphs when content contains the term even if heading does not match', () => {
+        const calendarNote = new Note({ filename: '2025-01-25.md', type: 'Calendar' })
+        const para1 = new Paragraph({ type: 'open', content: 'Call client #acme', note: calendarNote })
+        const para2 = new Paragraph({ type: 'open', content: 'Personal errand', note: calendarNote })
+        const paras = [para1, para2]
+        const dashboardSettings = { includedCalendarSections: 'acme' }
+        const startTime = new Date()
+        const functionName = 'testFunction'
+
+        jest.spyOn(headings, 'getHeadingHierarchyForThisPara').mockReturnValue(['Inbox'])
+
+        const result = filterParasByIncludedCalendarSections(paras, dashboardSettings, startTime, functionName)
+        expect(result).toHaveLength(1)
+        expect(result).toContain(para1)
+        expect(result).not.toContain(para2)
+      })
+
+      test('should match content terms case-insensitively including #tag form', () => {
+        const calendarNote = new Note({ filename: '2025-01-25.md', type: 'Calendar' })
+        const para1 = new Paragraph({ type: 'open', content: 'Ship #ACME release', note: calendarNote })
+        const paras = [para1]
+        const dashboardSettings = { includedCalendarSections: '#acme' }
+        const startTime = new Date()
+        const functionName = 'testFunction'
+
+        jest.spyOn(headings, 'getHeadingHierarchyForThisPara').mockReturnValue(['Other'])
+
+        const result = filterParasByIncludedCalendarSections(paras, dashboardSettings, startTime, functionName)
+        expect(result).toHaveLength(1)
+        expect(result).toContain(para1)
+      })
+
+      test('should keep paragraph when heading matches even if content does not contain the term', () => {
+        const calendarNote = new Note({ filename: '2025-01-25.md', type: 'Calendar' })
+        const para1 = new Paragraph({ type: 'open', content: 'Untagged task under Acme heading', note: calendarNote })
+        const paras = [para1]
+        const dashboardSettings = { includedCalendarSections: 'Acme' }
+        const startTime = new Date()
+        const functionName = 'testFunction'
+
+        jest.spyOn(headings, 'getHeadingHierarchyForThisPara').mockReturnValue(['Acme Tasks'])
+
+        const result = filterParasByIncludedCalendarSections(paras, dashboardSettings, startTime, functionName)
+        expect(result).toHaveLength(1)
+        expect(result).toContain(para1)
+      })
+
+      test('should keep paragraph when either heading or content matches (OR)', () => {
+        const calendarNote = new Note({ filename: '2025-01-25.md', type: 'Calendar' })
+        const paraHeading = new Paragraph({ type: 'open', content: 'No tag here', note: calendarNote })
+        const paraContent = new Paragraph({ type: 'open', content: 'Tagged #acme elsewhere', note: calendarNote })
+        const paraNeither = new Paragraph({ type: 'open', content: 'Home chore', note: calendarNote })
+        const paras = [paraHeading, paraContent, paraNeither]
+        const dashboardSettings = { includedCalendarSections: 'acme' }
+        const startTime = new Date()
+        const functionName = 'testFunction'
+
+        jest.spyOn(headings, 'getHeadingHierarchyForThisPara').mockImplementation((p) => {
+          if (p === paraHeading) return ['acme']
+          return ['Inbox']
+        })
+
+        const result = filterParasByIncludedCalendarSections(paras, dashboardSettings, startTime, functionName)
+        expect(result).toHaveLength(2)
+        expect(result).toContain(paraHeading)
+        expect(result).toContain(paraContent)
+        expect(result).not.toContain(paraNeither)
+      })
     })
 
     describe('filterParasByExcludedCalendarSections()', () => {
 
@@ -1,7 +1,7 @@
 // @flow
 //-----------------------------------------------------------------------------
 // Dashboard plugin helper functions
-// Last updated 2026-07-16 for v2.4.0.b51 by @CursorAI
+// Last updated 2026-07-20 for v2.4.0.b52 by @CursorAI
 //-----------------------------------------------------------------------------
 
 // import pluginJson from '../plugin.json'
@@ -1126,11 +1126,15 @@ export function filterParasByIgnoreTerms(
 }
 
 /**
- * Filter paragraphs to only include those from included calendar sections. 
- * Heading matching is case-insensitive prefix: each configured section name must match the start of a heading in the paragraph's hierarchy (see caseInsensitiveStartsWith with strictSubset false).
+ * Filter paragraphs to only include those matching included calendar note terms.
+ * Applies only to calendar notes (project notes always pass through).
+ * A calendar task is kept if either:
+ * - any heading in its hierarchy matches a term as a case-insensitive prefix, or
+ * - its content contains a term as a case-insensitive substring (so `#acme`, `@acme`, or `acme` all work).
+ * Blank / unset setting keeps all paragraphs.
  * @tests in jest file
  * @param {Array<TParagraph>} paras - paragraphs to filter
- * @param {TDashboardSettings} dashboardSettings - dashboard settings containing included calendar sections
+ * @param {TDashboardSettings} dashboardSettings - dashboard settings containing included calendar sections/terms
  * @param {Date} startTime - timer start time for logging
  * @param {string} functionName - name of calling function for logging
  * @returns {Array<TParagraph>} filtered paragraphs
@@ -1147,18 +1151,28 @@ export function filterParasByIncludedCalendarSections(
   const includedCalendarSections = stringListOrArrayToArray(dashboardSettings.includedCalendarSections, ',')
     .map((s) => s.trim())
     .filter((s) => s !== '')
+  if (includedCalendarSections.length === 0) {
+    return paras
+  }
 
   // TEST: this is where TB defeat happens for headings
   const filteredParas = paras.filter((p) => {
     // only apply to calendar notes
     if (p.note?.type !== 'Calendar') return true
-    // Apply to all H4/H3/H2 headings in the hierarchy for this para
+
+    // Keep if task content contains any of the filter terms (e.g. #acme, @acme, or acme)
+    const contentLower = (p.content || '').toLowerCase()
+    if (includedCalendarSections.some((inc) => contentLower.includes(inc.toLowerCase()))) {
+      return true
+    }
+
+    // Or if any heading in the hierarchy matches as a case-insensitive prefix
     const theseHeadings = getHeadingHierarchyForThisPara(p)
     return theseHeadings.some((h) =>
       includedCalendarSections.some((inc) => caseInsensitiveStartsWith(inc, h.trim(), false))
     )
   })
-  logTimer(functionName, startTime, `- ${filteredParas.length} paras after filtering out calendar headings`)
+  logTimer(functionName, startTime, `- ${filteredParas.length} paras after includedCalendarSections filter`)
   return filteredParas
 }
 
 
@@ -1,7 +1,7 @@
 // @flow
 //-----------------------------------------------------------------------------
 // Settings for the dashboard - loaded/set in React Window
-// Last updated 2026-07-18 for v2.4.0.b52 by @jgclark + @CursorAI
+// Last updated 2026-07-20 for v2.4.0.b52 by @jgclark + @CursorAI
 //-----------------------------------------------------------------------------
 
 import { defaultSectionDisplayOrder } from './constants.js'
@@ -96,7 +96,7 @@ export const dashboardSettingDefs: Array<TSettingItem> = [
     type: 'heading',
     label: 'What to Include and Exclude',
     description:
-      "These settings control what Spaces, folders, Reminder lists and items are included and excluded in Dashboard's many sections. It will first use only the included Spaces. Then, it includes the folders from the next setting, and removes any specified from the following setting. Then certain Sections within Calendar notes can be included. Reminder Lists to Include can override which Apple Reminders lists this Perspective looks in. Finally, individual lines in notes can be ignored by adding terms to the last setting.",
+      "These settings control what Spaces, folders, Reminder lists and items are included and excluded in Dashboard's many sections. It will first use only the included Spaces. Then, it includes the folders from the next setting, and removes any specified from the following setting. Then calendar note terms (heading prefixes or task text) can focus which calendar items appear. Reminder Lists to Include can override which Apple Reminders lists this Perspective looks in. Finally, individual lines in notes can be ignored by adding terms to the last setting.",
   },
   {
     key: 'includedTeamspaces',
@@ -129,23 +129,13 @@ export const dashboardSettingDefs: Array<TSettingItem> = [
   },
   {
     key: 'includedCalendarSections',
-    label: 'Calendar note Sections to Include',
+    label: 'Calendar note terms to include',
     description:
-      "Comma-separated list of calendar note section heading prefixes (case-insensitive). A task is included if any heading above it starts with one of these values (after trimming). For example, 'Wins' matches 'Wins' and 'Wins for 2026 Q2'. If left blank, all sections are included. Very short names can match more than one section if one heading is a prefix of another.",
+      "Comma-separated list of terms for calendar notes only. A task is included if (1) any heading above it starts with one of these values (case-insensitive prefix; e.g. 'Wins' matches 'Wins for 2026 Q2'), or (2) the task text itself contains the term (e.g. #acme, @acme, or acme). If left blank, all calendar items are included. Short terms can over-match. When this is set and Hide Duplicates is on, matching items stay in calendar / Overdue sections rather than only in a TAG section.",
     type: 'input',
     default: '',
     compactDisplay: true,
   },
-  // {
-  //   key: 'TODO: req',
-  //   label: 'In Calendar notes, task contains term(s) or is in named Section',
-  //   description:
-  //     '...',
-  //   type: 'input',
-  //   default: '',
-  //   compactDisplay: false,
-  //   dependsOnKey: '',
-  // },
   {
     key: 'ignoreItemsWithTerms',
     label: 'Exclude items containing term(s)',
 
@@ -1,7 +1,7 @@
 // @flow
 //--------------------------------------------------------------------------
 // Helpers for the Section component.
-// Last updated 2026-07-10 for v2.4.0.b47 by @jgclark + @CursorAI
+// Last updated 2026-07-20 for v2.4.0.b52 by @jgclark + @CursorAI
 //--------------------------------------------------------------------------
 
 import type { TSection, TSectionItem, TDashboardSettings, TSectionCode, TSectionDetails, TSettingItem } from '../../../types.js'
@@ -172,6 +172,44 @@ function getUseFirstButVisible(useFirst: Array<TSectionCode>, dashboardSettings:
   return useFirstButVisible
 }
 
+/**
+ * When includedCalendarSections is set, prefer calendar period and Overdue sections over TAG
+ * for Hide Duplicates, so focused tagged items stay in Today/Overdue rather than only in TAG.
+ * Leaves the default order alone when the setting is blank.
+ * @param {Array<TSectionCode>} useFirst - base dedupe priority order
+ * @param {TDashboardSettings} dashboardSettings
+ * @returns {Array<TSectionCode>} possibly reordered priority list
+ */
+export function adjustDedupPriorityForCalendarFocus(
+  useFirst: Array<TSectionCode>,
+  dashboardSettings: TDashboardSettings,
+): Array<TSectionCode> {
+  if (!dashboardSettings?.includedCalendarSections) {
+    return useFirst
+  }
+  const terms = String(dashboardSettings.includedCalendarSections)
+    .split(',')
+    .map((s) => s.trim())
+    .filter((s) => s !== '')
+  if (terms.length === 0) {
+    return useFirst
+  }
+
+  const preferBeforeTag: Array<TSectionCode> = ['DT', 'DY', 'DO', 'LW', 'W', 'M', 'Q', 'Y', 'OVERDUE']
+  const tagIndex = useFirst.indexOf('TAG')
+  if (tagIndex < 0) {
+    return useFirst
+  }
+
+  const beforeTag = useFirst.slice(0, tagIndex)
+  const afterTag = useFirst.slice(tagIndex + 1)
+  const preferredInOrder = useFirst.filter((code) => preferBeforeTag.includes(code))
+  const restBefore = beforeTag.filter((code) => !preferBeforeTag.includes(code))
+  const restAfter = afterTag.filter((code) => !preferBeforeTag.includes(code))
+
+  return [...restBefore, ...preferredInOrder, 'TAG', ...restAfter]
+}
+
 /**
  * Removes duplicate items from sections based on specified fields and prioritizes sections based on a given order.
  * Note: This will be called multiple times for each section being displayed -- for all the other sections, it seems.
@@ -196,8 +234,11 @@ export function getSectionsWithoutDuplicateLines(
     // Deep copy the sections to avoid mutating the original data
     const sections = JSON.parse(JSON.stringify(_sections))
 
+    // When calendar focus terms are set, prefer calendar / Overdue over TAG for duplicates
+    const adjustedUseFirst = adjustDedupPriorityForCalendarFocus(useFirst, dashboardSettings)
+
     // Get ordered list of sectionCodes based on visibility and priority
-    const useFirstVisibleOnly: Array<TSectionCode> = getUseFirstButVisible(useFirst, dashboardSettings, sections)
+    const useFirstVisibleOnly: Array<TSectionCode> = getUseFirstButVisible(adjustedUseFirst, dashboardSettings, sections)
 
     // Create an array of ordered sections based on the `useFirstVisibleOnly` priority list.
     // For each section code (`st`) in `useFirstVisibleOnly`, use `flatMap` to:
@@ -210,7 +251,7 @@ export function getSectionsWithoutDuplicateLines(
     // logDebug('getSectionsWithoutDuplicateLines', `Starting with useFirstVisibleOnly: ${useFirstVisibleOnly.join('-')}  with ${totalItemsBeforeDedupe} items`)
 
     // Include sections not listed in useFirst at the end of the array
-    orderedSections.push(...sections.filter((section) => !useFirst.includes(section.sectionCode)))
+    orderedSections.push(...sections.filter((section) => !adjustedUseFirst.includes(section.sectionCode)))
     // Map to track unique items
     const itemMap: any = new Map()