diff --git a/biome.json b/biome.json
index 077e2a520..f2383d9b2 100644
--- a/biome.json
+++ b/biome.json
@@ -58,6 +58,7 @@
         "useDefaultSwitchClause": "error",
         "noParameterAssign": "error",
         "useAsConstAssertion": "error",
+        "useBlockStatements": "error",
         "useDefaultParameterLast": "error",
         "useEnumInitializers": "error",
         "useSelfClosingElements": "error",
diff --git a/package.json b/package.json
index de4563eb4..b49995cef 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gitify",
-  "version": "6.6.0",
+  "version": "6.8.0",
   "description": "GitHub notifications on your menu bar.",
   "main": "build/main.js",
   "scripts": {
@@ -78,7 +78,7 @@
     "@discordapp/twemoji": "16.0.1",
     "@electron/notarize": "3.1.0",
     "@primer/css": "22.0.2",
-    "@primer/octicons-react": "19.16.0",
+    "@primer/octicons-react": "19.18.0",
     "@primer/primitives": "11.1.0",
     "@primer/react": "36.27.0",
     "@tailwindcss/postcss": "4.1.13",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0f229aa89..089bb26eb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -40,8 +40,8 @@ importers:
         specifier: 22.0.2
         version: 22.0.2(@primer/primitives@11.1.0)
       '@primer/octicons-react':
-        specifier: 19.16.0
-        version: 19.16.0(react@19.1.1)
+        specifier: 19.18.0
+        version: 19.18.0(react@19.1.1)
       '@primer/primitives':
         specifier: 11.1.0
         version: 11.1.0
@@ -771,8 +771,8 @@ packages:
   '@primer/live-region-element@0.7.1':
     resolution: {integrity: sha512-9uQCeBCb3wefz3kJNSo+PECc7T7TNB3k22JUdHY08Zlv9bd1rtsQgpazM5umcbZQrACzGbgufAfdbhGUBXI3jA==}
 
-  '@primer/octicons-react@19.16.0':
-    resolution: {integrity: sha512-IbM5Qn2uOpHia2oQ9WtR6ZsnsiQk7Otc4Y7YfE4Q5023co24iGlu+xz2pOUxd5iSACM4qLZOPyWiwsL8P9Inkw==}
+  '@primer/octicons-react@19.18.0':
+    resolution: {integrity: sha512-nLFlLmWfz3McbTiOUKVO+iwB15ALYQC9rHeP8K3qM1pyJ8svGaPjGR72BQSEM8ThyQUUodq/Re1n94tO5NNhzQ==}
     engines: {node: '>=8'}
     peerDependencies:
       react: '>=16.3'
@@ -5431,7 +5431,7 @@ snapshots:
     dependencies:
       '@lit-labs/ssr-dom-shim': 1.2.1
 
-  '@primer/octicons-react@19.16.0(react@19.1.1)':
+  '@primer/octicons-react@19.18.0(react@19.1.1)':
     dependencies:
       react: 19.1.1
 
@@ -5450,7 +5450,7 @@ snapshots:
       '@oddbird/popover-polyfill': 0.3.8
       '@primer/behaviors': 1.8.0
       '@primer/live-region-element': 0.7.1
-      '@primer/octicons-react': 19.16.0(react@19.1.1)
+      '@primer/octicons-react': 19.18.0(react@19.1.1)
       '@primer/primitives': 7.17.1
       '@styled-system/css': 5.1.5
       '@styled-system/props': 5.1.5
diff --git a/sonar-project.properties b/sonar-project.properties
index 2c85e2b1a..ccb2c9d7e 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -4,7 +4,7 @@
 # =====================================================
 sonar.projectKey=gitify-app_gitify
 sonar.organization=gitify-app
-sonar.projectVersion=v6.6.0
+sonar.projectVersion=v6.8.0
 sonar.projectDescription=GitHub notifications on your menu bar.
 
 
diff --git a/src/main/first-run.ts b/src/main/first-run.ts
index c5fe6daeb..224d79c8b 100644
--- a/src/main/first-run.ts
+++ b/src/main/first-run.ts
@@ -17,10 +17,14 @@ export async function onFirstRunMaybe() {
  * Ask user if the app should be moved to the applications folder (masOS).
  */
 async function promptMoveToApplicationsFolder() {
-  if (!isMacOS()) return;
+  if (!isMacOS()) {
+    return;
+  }
 
   const isDevMode = !!process.defaultApp;
-  if (isDevMode || app.isInApplicationsFolder()) return;
+  if (isDevMode || app.isInApplicationsFolder()) {
+    return;
+  }
 
   const { response } = await dialog.showMessageBox({
     type: 'question',
diff --git a/src/main/index.ts b/src/main/index.ts
index 5c3de8ec5..b78e26f8a 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -1,4 +1,4 @@
-import path from 'path';
+import path from 'node:path';
 
 import {
   app,
diff --git a/src/main/updater.test.ts b/src/main/updater.test.ts
index 3ff570ebd..7c460aa09 100644
--- a/src/main/updater.test.ts
+++ b/src/main/updater.test.ts
@@ -22,7 +22,9 @@ const listeners: ListenerMap = {};
 jest.mock('electron-updater', () => ({
   autoUpdater: {
     on: jest.fn((event: string, cb: Listener) => {
-      if (!listeners[event]) listeners[event] = [];
+      if (!listeners[event]) {
+        listeners[event] = [];
+      }
       listeners[event].push(cb);
       return this;
     }),
@@ -59,16 +61,16 @@ describe('main/updater.ts', () => {
     public setNoUpdateAvailableMenuVisibility = jest.fn();
     public setUpdateAvailableMenuVisibility = jest.fn();
     public setUpdateReadyForInstallMenuVisibility = jest.fn();
-    constructor(mb: Menubar) {
-      super(mb);
-    }
   }
+
   let menuBuilder: TestMenuBuilder;
   let updater: AppUpdater;
 
   beforeEach(() => {
     jest.clearAllMocks();
-    for (const k of Object.keys(listeners)) delete listeners[k];
+    for (const k of Object.keys(listeners)) {
+      delete listeners[k];
+    }
 
     menubar = {
       app: {
diff --git a/src/main/updater.ts b/src/main/updater.ts
index 60dac989a..fd37bea02 100644
--- a/src/main/updater.ts
+++ b/src/main/updater.ts
@@ -140,7 +140,9 @@ export default class AppUpdater {
     };
 
     dialog.showMessageBox(dialogOpts).then((returnValue) => {
-      if (returnValue.response === 0) autoUpdater.quitAndInstall();
+      if (returnValue.response === 0) {
+        autoUpdater.quitAndInstall();
+      }
     });
   }
 }
diff --git a/src/renderer/__helpers__/jest.setup.ts b/src/renderer/__helpers__/jest.setup.ts
index 38e52824b..2eb95b8c6 100644
--- a/src/renderer/__helpers__/jest.setup.ts
+++ b/src/renderer/__helpers__/jest.setup.ts
@@ -67,3 +67,5 @@ global.CSS = {
     return false;
   }),
 };
+
+window.HTMLMediaElement.prototype.play = jest.fn();
diff --git a/src/renderer/__mocks__/partial-mocks.ts b/src/renderer/__mocks__/partial-mocks.ts
index b98d1890e..d40b01e73 100644
--- a/src/renderer/__mocks__/partial-mocks.ts
+++ b/src/renderer/__mocks__/partial-mocks.ts
@@ -1,10 +1,11 @@
 import { Constants } from '../constants';
 import type { Hostname, Link } from '../types';
-import type { Notification, Subject, User } from '../typesGitHub';
+import type { Notification, Repository, Subject, User } from '../typesGitHub';
 import { mockGitifyUser, mockToken } from './state-mocks';
 
 export function partialMockNotification(
   subject: Partial<Subject>,
+  repository?: Partial<Repository>,
 ): Notification {
   const mockNotification: Partial<Notification> = {
     account: {
@@ -16,6 +17,7 @@ export function partialMockNotification(
       hasRequiredScopes: true,
     },
     subject: subject as Subject,
+    repository: repository as Repository,
   };
 
   return mockNotification as Notification;
diff --git a/src/renderer/__mocks__/state-mocks.ts b/src/renderer/__mocks__/state-mocks.ts
index 377000f3f..a03520d44 100644
--- a/src/renderer/__mocks__/state-mocks.ts
+++ b/src/renderer/__mocks__/state-mocks.ts
@@ -109,10 +109,8 @@ const mockSystemSettings: SystemSettingsState = {
 
 const mockFilters: FilterSettingsState = {
   filterUserTypes: [],
-  filterIncludeHandles: [],
-  filterExcludeHandles: [],
-  filterIncludeOrganizations: [],
-  filterExcludeOrganizations: [],
+  filterIncludeSearchTokens: [],
+  filterExcludeSearchTokens: [],
   filterSubjectTypes: [],
   filterStates: [],
   filterReasons: [],
diff --git a/src/renderer/components/AllRead.test.tsx b/src/renderer/components/AllRead.test.tsx
index 10cc58cb9..743e4d6cf 100644
--- a/src/renderer/components/AllRead.test.tsx
+++ b/src/renderer/components/AllRead.test.tsx
@@ -1,5 +1,4 @@
 import { act, render } from '@testing-library/react';
-import { MemoryRouter } from 'react-router-dom';
 
 import { mockSettings } from '../__mocks__/state-mocks';
 import { ensureStableEmojis } from '../__mocks__/utils';
@@ -44,9 +43,7 @@ describe('renderer/components/AllRead.tsx', () => {
             },
           }}
         >
-          <MemoryRouter>
-            <AllRead />
-          </MemoryRouter>
+          <AllRead />
         </AppContext.Provider>,
       );
     });
diff --git a/src/renderer/components/avatars/AvatarWithFallback.test.tsx b/src/renderer/components/avatars/AvatarWithFallback.test.tsx
index b94762e47..e358c048a 100644
--- a/src/renderer/components/avatars/AvatarWithFallback.test.tsx
+++ b/src/renderer/components/avatars/AvatarWithFallback.test.tsx
@@ -1,4 +1,4 @@
-import { render, screen } from '@testing-library/react';
+import { fireEvent, render, screen } from '@testing-library/react';
 
 import { type Link, Size } from '../../types';
 import {
@@ -47,8 +47,8 @@ describe('renderer/components/avatars/AvatarWithFallback.tsx', () => {
     // Find the avatar element by its alt text
     const avatar = screen.getByAltText('gitify-app') as HTMLImageElement;
 
-    // Simulate an error event on the image element
-    avatar.dispatchEvent(new Event('error'));
+    // Simulate image load error (wrapped in act via fireEvent)
+    fireEvent.error(avatar);
 
     expect(screen.getByTestId('avatar')).toMatchSnapshot();
   });
@@ -59,8 +59,8 @@ describe('renderer/components/avatars/AvatarWithFallback.tsx', () => {
     // Find the avatar element by its alt text
     const avatar = screen.getByAltText('gitify-app') as HTMLImageElement;
 
-    // Simulate an error event on the image element
-    avatar.dispatchEvent(new Event('error'));
+    // Simulate image load error (wrapped in act via fireEvent)
+    fireEvent.error(avatar);
 
     expect(screen.getByTestId('avatar')).toMatchSnapshot();
   });
diff --git a/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap b/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap
index d7a5d4110..d02e07b1d 100644
--- a/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap
+++ b/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap
@@ -273,16 +273,22 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx renders the fallback
   data-testid="avatar"
   data-wrap="nowrap"
 >
-  <img
-    alt="gitify-app"
-    class="Avatar__StyledAvatar-sc-2lv0r8-0 hAAPGf"
-    data-component="Avatar"
+  <svg
+    aria-hidden="true"
+    class="octicon octicon-feed-person"
+    display="inline-block"
+    fill="currentColor"
+    focusable="false"
     height="16"
-    size="16"
-    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-    sx="[object Object]"
+    overflow="visible"
+    style="vertical-align: text-bottom;"
+    viewBox="0 0 16 16"
     width="16"
-  />
+  >
+    <path
+      d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+    />
+  </svg>
   <div
     class="Truncate__StyledTruncate-sc-23o1d2-0 MmGIa"
     maxwidth="280"
@@ -304,16 +310,22 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx renders the fallback
   data-testid="avatar"
   data-wrap="nowrap"
 >
-  <img
-    alt="gitify-app"
-    class="Avatar__StyledAvatar-sc-2lv0r8-0 cZJOrN"
-    data-component="Avatar"
+  <svg
+    aria-hidden="true"
+    class="octicon octicon-mark-github"
+    display="inline-block"
+    fill="currentColor"
+    focusable="false"
     height="16"
-    size="16"
-    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-    sx="[object Object]"
+    overflow="visible"
+    style="vertical-align: text-bottom;"
+    viewBox="0 0 16 16"
     width="16"
-  />
+  >
+    <path
+      d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+    />
+  </svg>
   <div
     class="Truncate__StyledTruncate-sc-23o1d2-0 MmGIa"
     maxwidth="280"
diff --git a/src/renderer/components/filters/FilterSection.test.tsx b/src/renderer/components/filters/FilterSection.test.tsx
index 1f8332428..0d28d4248 100644
--- a/src/renderer/components/filters/FilterSection.test.tsx
+++ b/src/renderer/components/filters/FilterSection.test.tsx
@@ -1,6 +1,5 @@
 import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
 import { MarkGithubIcon } from '@primer/octicons-react';
 
@@ -29,18 +28,16 @@ describe('renderer/components/filters/FilterSection.tsx', () => {
             notifications: mockAccountNotifications,
           }}
         >
-          <MemoryRouter>
-            <FilterSection
-              filter={{
-                ...mockFilter,
-                requiresDetailsNotifications: true,
-              }}
-              filterSetting={mockFilterSetting}
-              icon={MarkGithubIcon}
-              id={'FilterSectionTest'}
-              title={'FilterSectionTitle'}
-            />
-          </MemoryRouter>
+          <FilterSection
+            filter={{
+              ...mockFilter,
+              requiresDetailsNotifications: true,
+            }}
+            filterSetting={mockFilterSetting}
+            icon={MarkGithubIcon}
+            id={'FilterSectionTest'}
+            title={'FilterSectionTitle'}
+          />
         </AppContext.Provider>,
       );
 
@@ -88,15 +85,13 @@ describe('renderer/components/filters/FilterSection.tsx', () => {
             updateFilter,
           }}
         >
-          <MemoryRouter>
-            <FilterSection
-              filter={mockFilter}
-              filterSetting={mockFilterSetting}
-              icon={MarkGithubIcon}
-              id={'FilterSectionTest'}
-              title={'FilterSectionTitle'}
-            />
-          </MemoryRouter>
+          <FilterSection
+            filter={mockFilter}
+            filterSetting={mockFilterSetting}
+            icon={MarkGithubIcon}
+            id={'FilterSectionTest'}
+            title={'FilterSectionTitle'}
+          />
         </AppContext.Provider>,
       );
     });
@@ -123,15 +118,13 @@ describe('renderer/components/filters/FilterSection.tsx', () => {
             updateFilter,
           }}
         >
-          <MemoryRouter>
-            <FilterSection
-              filter={mockFilter}
-              filterSetting={mockFilterSetting}
-              icon={MarkGithubIcon}
-              id={'FilterSectionTest'}
-              title={'FilterSectionTitle'}
-            />
-          </MemoryRouter>
+          <FilterSection
+            filter={mockFilter}
+            filterSetting={mockFilterSetting}
+            icon={MarkGithubIcon}
+            id={'FilterSectionTest'}
+            title={'FilterSectionTitle'}
+          />
         </AppContext.Provider>,
       );
     });
diff --git a/src/renderer/components/filters/FilterSection.tsx b/src/renderer/components/filters/FilterSection.tsx
index 47dbf8517..9fc98e521 100644
--- a/src/renderer/components/filters/FilterSection.tsx
+++ b/src/renderer/components/filters/FilterSection.tsx
@@ -7,7 +7,6 @@ import { AppContext } from '../../context/App';
 import type { FilterSettingsState, FilterValue } from '../../types';
 import type { Filter } from '../../utils/notifications/filters';
 import { Checkbox } from '../fields/Checkbox';
-import { Tooltip } from '../fields/Tooltip';
 import { Title } from '../primitives/Title';
 import { RequiresDetailedNotificationWarning } from './RequiresDetailedNotificationsWarning';
 
@@ -34,22 +33,21 @@ export const FilterSection = <T extends FilterValue>({
 
   return (
     <fieldset id={id}>
-      <Stack align="baseline" direction="horizontal" gap="condensed">
-        <Title icon={icon}>{title}</Title>
-        {tooltip && (
-          <Tooltip
-            name={`tooltip-${id}`}
-            tooltip={
-              <Stack direction="vertical" gap="condensed">
-                {tooltip}
-                {filter.requiresDetailsNotifications && (
-                  <RequiresDetailedNotificationWarning />
-                )}
-              </Stack>
-            }
-          />
-        )}
-      </Stack>
+      <Title
+        icon={icon}
+        tooltip={
+          tooltip && (
+            <>
+              {tooltip}
+              {filter.requiresDetailsNotifications && (
+                <RequiresDetailedNotificationWarning />
+              )}
+            </>
+          )
+        }
+      >
+        {title}
+      </Title>
 
       <Stack
         direction={layout}
diff --git a/src/renderer/components/filters/OrganizationFilter.test.tsx b/src/renderer/components/filters/OrganizationFilter.test.tsx
deleted file mode 100644
index ab0aff667..000000000
--- a/src/renderer/components/filters/OrganizationFilter.test.tsx
+++ /dev/null
@@ -1,130 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-
-import { mockSettings } from '../../__mocks__/state-mocks';
-import { AppContext } from '../../context/App';
-import type { SettingsState } from '../../types';
-import { OrganizationFilter } from './OrganizationFilter';
-
-const mockUpdateFilter = jest.fn();
-
-describe('components/filters/OrganizationFilter.tsx', () => {
-  beforeEach(() => {
-    mockUpdateFilter.mockReset();
-  });
-
-  it('should render itself & its children', () => {
-    const props = {
-      updateFilter: mockUpdateFilter,
-      settings: mockSettings,
-    };
-
-    render(
-      <AppContext.Provider value={props}>
-        <OrganizationFilter />
-      </AppContext.Provider>,
-    );
-
-    expect(screen.getByText('Organizations')).toBeInTheDocument();
-    expect(screen.getByText('Include:')).toBeInTheDocument();
-    expect(screen.getByText('Exclude:')).toBeInTheDocument();
-  });
-
-  describe('Include organizations', () => {
-    it('should handle organization includes', async () => {
-      const props = {
-        updateFilter: mockUpdateFilter,
-        settings: mockSettings,
-      };
-
-      render(
-        <AppContext.Provider value={props}>
-          <OrganizationFilter />
-        </AppContext.Provider>,
-      );
-
-      await userEvent.type(
-        screen.getByTitle('Include organizations'),
-        'microsoft{enter}',
-      );
-
-      expect(mockUpdateFilter).toHaveBeenCalledWith(
-        'filterIncludeOrganizations',
-        'microsoft',
-        true,
-      );
-    });
-
-    it('should not allow duplicate include organizations', async () => {
-      const props = {
-        updateFilter: mockUpdateFilter,
-        settings: {
-          ...mockSettings,
-          filterIncludeOrganizations: ['microsoft'],
-        } as SettingsState,
-      };
-
-      render(
-        <AppContext.Provider value={props}>
-          <OrganizationFilter />
-        </AppContext.Provider>,
-      );
-
-      await userEvent.type(
-        screen.getByTitle('Include organizations'),
-        'microsoft{enter}',
-      );
-
-      expect(mockUpdateFilter).toHaveBeenCalledTimes(0);
-    });
-  });
-
-  describe('Exclude organizations', () => {
-    it('should handle organization excludes', async () => {
-      const props = {
-        updateFilter: mockUpdateFilter,
-        settings: mockSettings,
-      };
-
-      render(
-        <AppContext.Provider value={props}>
-          <OrganizationFilter />
-        </AppContext.Provider>,
-      );
-
-      await userEvent.type(
-        screen.getByTitle('Exclude organizations'),
-        'github{enter}',
-      );
-
-      expect(mockUpdateFilter).toHaveBeenCalledWith(
-        'filterExcludeOrganizations',
-        'github',
-        true,
-      );
-    });
-
-    it('should not allow duplicate exclude organizations', async () => {
-      const props = {
-        updateFilter: mockUpdateFilter,
-        settings: {
-          ...mockSettings,
-          filterExcludeOrganizations: ['github'],
-        } as SettingsState,
-      };
-
-      render(
-        <AppContext.Provider value={props}>
-          <OrganizationFilter />
-        </AppContext.Provider>,
-      );
-
-      await userEvent.type(
-        screen.getByTitle('Exclude organizations'),
-        'github{enter}',
-      );
-
-      expect(mockUpdateFilter).toHaveBeenCalledTimes(0);
-    });
-  });
-});
diff --git a/src/renderer/components/filters/OrganizationFilter.tsx b/src/renderer/components/filters/OrganizationFilter.tsx
deleted file mode 100644
index 0bea7ab21..000000000
--- a/src/renderer/components/filters/OrganizationFilter.tsx
+++ /dev/null
@@ -1,206 +0,0 @@
-import { type FC, useContext, useEffect, useState } from 'react';
-
-import {
-  CheckCircleFillIcon,
-  NoEntryFillIcon,
-  OrganizationIcon,
-} from '@primer/octicons-react';
-import { Box, Stack, Text, TextInputWithTokens } from '@primer/react';
-
-import { AppContext } from '../../context/App';
-import { IconColor, type Organization } from '../../types';
-import {
-  hasExcludeOrganizationFilters,
-  hasIncludeOrganizationFilters,
-} from '../../utils/notifications/filters/organizations';
-import { Tooltip } from '../fields/Tooltip';
-import { Title } from '../primitives/Title';
-
-type InputToken = {
-  id: number;
-  text: string;
-};
-
-const tokenEvents = ['Enter', 'Tab', ' ', ','];
-
-export const OrganizationFilter: FC = () => {
-  const { updateFilter, settings } = useContext(AppContext);
-
-  // biome-ignore lint/correctness/useExhaustiveDependencies: we only want to run this effect on organization filter changes
-  useEffect(() => {
-    if (!hasIncludeOrganizationFilters(settings)) {
-      setIncludeOrganizations([]);
-    }
-
-    if (!hasExcludeOrganizationFilters(settings)) {
-      setExcludeOrganizations([]);
-    }
-  }, [
-    settings.filterIncludeOrganizations,
-    settings.filterExcludeOrganizations,
-  ]);
-
-  const mapValuesToTokens = (values: string[]): InputToken[] => {
-    return values.map((value, index) => ({
-      id: index,
-      text: value,
-    }));
-  };
-
-  const [includeOrganizations, setIncludeOrganizations] = useState<
-    InputToken[]
-  >(mapValuesToTokens(settings.filterIncludeOrganizations));
-
-  const addIncludeOrganizationsToken = (
-    event:
-      | React.KeyboardEvent<HTMLInputElement>
-      | React.FocusEvent<HTMLInputElement>,
-  ) => {
-    const value = (event.target as HTMLInputElement).value.trim();
-
-    if (
-      value.length > 0 &&
-      !includeOrganizations.some((v) => v.text === value)
-    ) {
-      setIncludeOrganizations([
-        ...includeOrganizations,
-        { id: includeOrganizations.length, text: value },
-      ]);
-      updateFilter('filterIncludeOrganizations', value as Organization, true);
-
-      (event.target as HTMLInputElement).value = '';
-    }
-  };
-
-  const removeIncludeOrganizationToken = (tokenId: string | number) => {
-    const value =
-      includeOrganizations.find((v) => v.id === tokenId)?.text || '';
-    updateFilter('filterIncludeOrganizations', value as Organization, false);
-
-    setIncludeOrganizations(
-      includeOrganizations.filter((v) => v.id !== tokenId),
-    );
-  };
-
-  const includeOrganizationsKeyDown = (
-    event: React.KeyboardEvent<HTMLInputElement>,
-  ) => {
-    if (tokenEvents.includes(event.key)) {
-      addIncludeOrganizationsToken(event);
-    }
-  };
-
-  const [excludeOrganizations, setExcludeOrganizations] = useState<
-    InputToken[]
-  >(mapValuesToTokens(settings.filterExcludeOrganizations));
-
-  const addExcludeOrganizationsToken = (
-    event:
-      | React.KeyboardEvent<HTMLInputElement>
-      | React.FocusEvent<HTMLInputElement>,
-  ) => {
-    const value = (event.target as HTMLInputElement).value.trim();
-
-    if (
-      value.length > 0 &&
-      !excludeOrganizations.some((v) => v.text === value)
-    ) {
-      setExcludeOrganizations([
-        ...excludeOrganizations,
-        { id: excludeOrganizations.length, text: value },
-      ]);
-      updateFilter('filterExcludeOrganizations', value as Organization, true);
-
-      (event.target as HTMLInputElement).value = '';
-    }
-  };
-
-  const removeExcludeOrganizationToken = (tokenId: string | number) => {
-    const value =
-      excludeOrganizations.find((v) => v.id === tokenId)?.text || '';
-    updateFilter('filterExcludeOrganizations', value as Organization, false);
-
-    setExcludeOrganizations(
-      excludeOrganizations.filter((v) => v.id !== tokenId),
-    );
-  };
-
-  const excludeOrganizationsKeyDown = (
-    event: React.KeyboardEvent<HTMLInputElement>,
-  ) => {
-    if (tokenEvents.includes(event.key)) {
-      addExcludeOrganizationsToken(event);
-    }
-  };
-
-  return (
-    <fieldset id="filter-organizations">
-      <Stack align="baseline" direction="horizontal" gap="condensed">
-        <Title icon={OrganizationIcon}>Organizations</Title>
-        <Tooltip
-          name="tooltip-filter-organizations"
-          tooltip={
-            <Stack direction="vertical" gap="condensed">
-              <Text>Filter notifications by organization.</Text>
-            </Stack>
-          }
-        />
-      </Stack>
-      <Stack direction="vertical" gap="condensed">
-        <Stack
-          align="center"
-          className="text-sm"
-          direction="horizontal"
-          gap="condensed"
-        >
-          <Box className="font-medium text-gitify-font w-28">
-            <Stack align="center" direction="horizontal" gap="condensed">
-              <CheckCircleFillIcon className={IconColor.GREEN} />
-              <Text>Include:</Text>
-            </Stack>
-          </Box>
-          <TextInputWithTokens
-            block
-            disabled={
-              !settings.detailedNotifications ||
-              hasExcludeOrganizationFilters(settings)
-            }
-            onBlur={addIncludeOrganizationsToken}
-            onKeyDown={includeOrganizationsKeyDown}
-            onTokenRemove={removeIncludeOrganizationToken}
-            size="small"
-            title="Include organizations"
-            tokens={includeOrganizations}
-          />
-        </Stack>
-
-        <Stack
-          align="center"
-          className="text-sm"
-          direction="horizontal"
-          gap="condensed"
-        >
-          <Box className="font-medium text-gitify-font w-28">
-            <Stack align="center" direction="horizontal" gap="condensed">
-              <NoEntryFillIcon className={IconColor.RED} />
-              <Text>Exclude:</Text>
-            </Stack>
-          </Box>
-          <TextInputWithTokens
-            block
-            disabled={
-              !settings.detailedNotifications ||
-              hasIncludeOrganizationFilters(settings)
-            }
-            onBlur={addExcludeOrganizationsToken}
-            onKeyDown={excludeOrganizationsKeyDown}
-            onTokenRemove={removeExcludeOrganizationToken}
-            size="small"
-            title="Exclude organizations"
-            tokens={excludeOrganizations}
-          />
-        </Stack>
-      </Stack>
-    </fieldset>
-  );
-};
diff --git a/src/renderer/components/filters/ReasonFilter.test.tsx b/src/renderer/components/filters/ReasonFilter.test.tsx
index 9fe104f18..81beb41ce 100644
--- a/src/renderer/components/filters/ReasonFilter.test.tsx
+++ b/src/renderer/components/filters/ReasonFilter.test.tsx
@@ -1,5 +1,4 @@
 import { render } from '@testing-library/react';
-import { MemoryRouter } from 'react-router-dom';
 
 import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../__mocks__/state-mocks';
@@ -15,9 +14,7 @@ describe('renderer/components/filters/ReasonFilter.tsx', () => {
           notifications: mockAccountNotifications,
         }}
       >
-        <MemoryRouter>
-          <ReasonFilter />
-        </MemoryRouter>
+        <ReasonFilter />
       </AppContext.Provider>,
     );
 
diff --git a/src/renderer/components/filters/RequiresDetailedNotificationsWarning.test.tsx b/src/renderer/components/filters/RequiresDetailedNotificationsWarning.test.tsx
index f0348091f..cd57cb5f8 100644
--- a/src/renderer/components/filters/RequiresDetailedNotificationsWarning.test.tsx
+++ b/src/renderer/components/filters/RequiresDetailedNotificationsWarning.test.tsx
@@ -1,5 +1,4 @@
 import { render } from '@testing-library/react';
-import { MemoryRouter } from 'react-router-dom';
 
 import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../__mocks__/state-mocks';
@@ -15,9 +14,7 @@ describe('renderer/components/filters/RequiresDetailedNotificationsWarning.tsx',
           notifications: mockAccountNotifications,
         }}
       >
-        <MemoryRouter>
-          <RequiresDetailedNotificationWarning />
-        </MemoryRouter>
+        <RequiresDetailedNotificationWarning />
       </AppContext.Provider>,
     );
 
diff --git a/src/renderer/components/filters/SearchFilter.test.tsx b/src/renderer/components/filters/SearchFilter.test.tsx
new file mode 100644
index 000000000..2299ce16c
--- /dev/null
+++ b/src/renderer/components/filters/SearchFilter.test.tsx
@@ -0,0 +1,161 @@
+import { fireEvent, render, screen } from '@testing-library/react';
+
+import { mockSettings } from '../../__mocks__/state-mocks';
+import { AppContext } from '../../context/App';
+import { SearchFilter } from './SearchFilter';
+
+const updateFilter = jest.fn();
+
+describe('renderer/components/filters/SearchFilter.tsx', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('Include Search Tokens', () => {
+    it('adds include actor token with prefix', () => {
+      render(
+        <AppContext.Provider value={{ settings: mockSettings, updateFilter }}>
+          <SearchFilter />
+        </AppContext.Provider>,
+      );
+
+      const includeInput = screen.getByTitle('Include searches');
+      fireEvent.change(includeInput, { target: { value: 'author:octocat' } });
+      fireEvent.keyDown(includeInput, { key: 'Enter' });
+
+      expect(updateFilter).toHaveBeenCalledWith(
+        'filterIncludeSearchTokens',
+        'author:octocat',
+        true,
+      );
+    });
+
+    it('adds include org token with prefix', () => {
+      render(
+        <AppContext.Provider value={{ settings: mockSettings, updateFilter }}>
+          <SearchFilter />
+        </AppContext.Provider>,
+      );
+
+      const includeInput = screen.getByTitle('Include searches');
+      fireEvent.change(includeInput, { target: { value: 'org:gitify-app' } });
+      fireEvent.keyDown(includeInput, { key: 'Enter' });
+
+      expect(updateFilter).toHaveBeenCalledWith(
+        'filterIncludeSearchTokens',
+        'org:gitify-app',
+        true,
+      );
+    });
+
+    it('adds include repo token with prefix', () => {
+      render(
+        <AppContext.Provider value={{ settings: mockSettings, updateFilter }}>
+          <SearchFilter />
+        </AppContext.Provider>,
+      );
+
+      const includeInput = screen.getByTitle('Include searches');
+      fireEvent.change(includeInput, {
+        target: { value: 'repo:gitify-app/gitify' },
+      });
+      fireEvent.keyDown(includeInput, { key: 'Enter' });
+
+      expect(updateFilter).toHaveBeenCalledWith(
+        'filterIncludeSearchTokens',
+        'repo:gitify-app/gitify',
+        true,
+      );
+    });
+
+    it('prevent unrecognized include prefixes', () => {
+      render(
+        <AppContext.Provider value={{ settings: mockSettings, updateFilter }}>
+          <SearchFilter />
+        </AppContext.Provider>,
+      );
+
+      const includeInput = screen.getByTitle('Include searches');
+      fireEvent.change(includeInput, {
+        target: { value: 'some:search' },
+      });
+      fireEvent.keyDown(includeInput, { key: 'Enter' });
+
+      expect(updateFilter).not.toHaveBeenCalledWith();
+    });
+  });
+
+  describe('Exclude Search Tokens', () => {
+    it('adds exclude actor token with prefix', () => {
+      render(
+        <AppContext.Provider value={{ settings: mockSettings, updateFilter }}>
+          <SearchFilter />
+        </AppContext.Provider>,
+      );
+
+      const includeInput = screen.getByTitle('Exclude searches');
+      fireEvent.change(includeInput, { target: { value: 'author:octocat' } });
+      fireEvent.keyDown(includeInput, { key: 'Enter' });
+
+      expect(updateFilter).toHaveBeenCalledWith(
+        'filterExcludeSearchTokens',
+        'author:octocat',
+        true,
+      );
+    });
+
+    it('adds exclude org token with prefix', () => {
+      render(
+        <AppContext.Provider value={{ settings: mockSettings, updateFilter }}>
+          <SearchFilter />
+        </AppContext.Provider>,
+      );
+
+      const excludeInput = screen.getByTitle('Exclude searches');
+      fireEvent.change(excludeInput, { target: { value: 'org:gitify-app' } });
+      fireEvent.keyDown(excludeInput, { key: 'Enter' });
+
+      expect(updateFilter).toHaveBeenCalledWith(
+        'filterExcludeSearchTokens',
+        'org:gitify-app',
+        true,
+      );
+    });
+
+    it('adds exclude repo token with prefix', () => {
+      render(
+        <AppContext.Provider value={{ settings: mockSettings, updateFilter }}>
+          <SearchFilter />
+        </AppContext.Provider>,
+      );
+
+      const excludeInput = screen.getByTitle('Exclude searches');
+      fireEvent.change(excludeInput, {
+        target: { value: 'repo:gitify-app/gitify' },
+      });
+      fireEvent.keyDown(excludeInput, { key: 'Enter' });
+
+      expect(updateFilter).toHaveBeenCalledWith(
+        'filterExcludeSearchTokens',
+        'repo:gitify-app/gitify',
+        true,
+      );
+    });
+
+    it('prevent unrecognized exclude prefixes', () => {
+      render(
+        <AppContext.Provider value={{ settings: mockSettings, updateFilter }}>
+          <SearchFilter />
+        </AppContext.Provider>,
+      );
+
+      const excludeInput = screen.getByTitle('Exclude searches');
+      fireEvent.change(excludeInput, {
+        target: { value: 'some:search' },
+      });
+      fireEvent.keyDown(excludeInput, { key: 'Enter' });
+
+      expect(updateFilter).not.toHaveBeenCalledWith();
+    });
+  });
+});
diff --git a/src/renderer/components/filters/SearchFilter.tsx b/src/renderer/components/filters/SearchFilter.tsx
new file mode 100644
index 000000000..0183b63e8
--- /dev/null
+++ b/src/renderer/components/filters/SearchFilter.tsx
@@ -0,0 +1,142 @@
+import { type FC, useContext, useEffect, useState } from 'react';
+
+import {
+  CheckCircleFillIcon,
+  NoEntryFillIcon,
+  OrganizationIcon,
+  PersonIcon,
+  RepoIcon,
+  SearchIcon,
+} from '@primer/octicons-react';
+import { Box, Stack, Text } from '@primer/react';
+
+import { AppContext } from '../../context/App';
+import { IconColor, type SearchToken, Size } from '../../types';
+import { cn } from '../../utils/cn';
+import {
+  hasExcludeSearchFilters,
+  hasIncludeSearchFilters,
+} from '../../utils/notifications/filters/search';
+import { Title } from '../primitives/Title';
+import { RequiresDetailedNotificationWarning } from './RequiresDetailedNotificationsWarning';
+import { TokenSearchInput } from './TokenSearchInput';
+
+export const SearchFilter: FC = () => {
+  const { updateFilter, settings } = useContext(AppContext);
+
+  // biome-ignore lint/correctness/useExhaustiveDependencies: only run on search filter changes
+  useEffect(() => {
+    if (!hasIncludeSearchFilters(settings)) {
+      setIncludeSearchTokens([]);
+    }
+
+    if (!hasExcludeSearchFilters(settings)) {
+      setExcludeSearchTokens([]);
+    }
+  }, [settings.filterIncludeSearchTokens, settings.filterExcludeSearchTokens]);
+
+  const [includeSearchTokens, setIncludeSearchTokens] = useState<SearchToken[]>(
+    settings.filterIncludeSearchTokens,
+  );
+
+  const addIncludeSearchToken = (value: string) => {
+    if (!value || includeSearchTokens.includes(value as SearchToken)) {
+      return;
+    }
+
+    setIncludeSearchTokens([...includeSearchTokens, value as SearchToken]);
+    updateFilter('filterIncludeSearchTokens', value as SearchToken, true);
+  };
+
+  const removeIncludeSearchToken = (token: SearchToken) => {
+    if (!token) {
+      return;
+    }
+
+    updateFilter('filterIncludeSearchTokens', token, false);
+    setIncludeSearchTokens(includeSearchTokens.filter((t) => t !== token));
+  };
+
+  const [excludeSearchTokens, setExcludeSearchTokens] = useState<SearchToken[]>(
+    settings.filterExcludeSearchTokens,
+  );
+
+  const addExcludeSearchToken = (value: string) => {
+    if (!value || excludeSearchTokens.includes(value as SearchToken)) {
+      return;
+    }
+
+    setExcludeSearchTokens([...excludeSearchTokens, value as SearchToken]);
+    updateFilter('filterExcludeSearchTokens', value as SearchToken, true);
+  };
+
+  const removeExcludeSearchToken = (token: SearchToken) => {
+    if (!token) {
+      return;
+    }
+
+    updateFilter('filterExcludeSearchTokens', token, false);
+    setExcludeSearchTokens(excludeSearchTokens.filter((t) => t !== token));
+  };
+
+  return (
+    <fieldset>
+      <Title
+        icon={SearchIcon}
+        tooltip={
+          <Stack direction="vertical" gap="condensed">
+            <Text>Filter notifications by:</Text>
+            <Box className="pl-4">
+              <Stack direction="vertical" gap="condensed">
+                <Stack direction="horizontal" gap="condensed">
+                  <PersonIcon size={Size.SMALL} />
+                  <Text
+                    className={cn(
+                      'text-gitify-caution',
+                      !settings.detailedNotifications && 'line-through',
+                    )}
+                  >
+                    Author (author:handle)
+                  </Text>
+                </Stack>
+                <Stack direction="horizontal" gap="condensed">
+                  <OrganizationIcon size={Size.SMALL} />
+                  <Text>Organization (org:name)</Text>
+                </Stack>
+                <Stack direction="horizontal" gap="condensed">
+                  <RepoIcon size={Size.SMALL} />
+                  <Text>Repository (repo:fullname)</Text>
+                </Stack>
+              </Stack>
+            </Box>
+            <RequiresDetailedNotificationWarning />
+          </Stack>
+        }
+      >
+        Search
+      </Title>
+
+      <Stack direction="vertical" gap="condensed">
+        <TokenSearchInput
+          icon={CheckCircleFillIcon}
+          iconColorClass={IconColor.GREEN}
+          label="Include"
+          onAdd={addIncludeSearchToken}
+          onRemove={removeIncludeSearchToken}
+          showSuggestionsOnFocusIfEmpty={!hasIncludeSearchFilters(settings)}
+          tokens={includeSearchTokens}
+        />
+
+        <TokenSearchInput
+          icon={NoEntryFillIcon}
+          iconColorClass={IconColor.RED}
+          label="Exclude"
+          onAdd={addExcludeSearchToken}
+          onRemove={removeExcludeSearchToken}
+          showSuggestionsOnFocusIfEmpty={!hasExcludeSearchFilters(settings)}
+          tokens={excludeSearchTokens}
+        />
+      </Stack>
+    </fieldset>
+  );
+};
diff --git a/src/renderer/components/filters/SearchFilterSuggestions.test.tsx b/src/renderer/components/filters/SearchFilterSuggestions.test.tsx
new file mode 100644
index 000000000..092d1de03
--- /dev/null
+++ b/src/renderer/components/filters/SearchFilterSuggestions.test.tsx
@@ -0,0 +1,115 @@
+import { render } from '@testing-library/react';
+
+import { mockSettings } from '../../__mocks__/state-mocks';
+import { AppContext } from '../../context/App';
+import type { SettingsState } from '../../types';
+import { SearchFilterSuggestions } from './SearchFilterSuggestions';
+
+describe('renderer/components/filters/SearchFilterSuggestions.tsx', () => {
+  const mockOnClose = jest.fn();
+
+  it('should render itself & its children - closed', () => {
+    const tree = render(
+      <AppContext.Provider
+        value={{
+          settings: {
+            ...mockSettings,
+            detailedNotifications: false,
+          } as SettingsState,
+        }}
+      >
+        <SearchFilterSuggestions
+          inputValue={''}
+          onClose={mockOnClose}
+          open={false}
+        />
+      </AppContext.Provider>,
+    );
+
+    expect(tree).toMatchSnapshot();
+  });
+
+  it('should render itself & its children - open', () => {
+    const tree = render(
+      <AppContext.Provider
+        value={{
+          settings: {
+            ...mockSettings,
+            detailedNotifications: true,
+          } as SettingsState,
+        }}
+      >
+        <SearchFilterSuggestions
+          inputValue={''}
+          onClose={mockOnClose}
+          open={true}
+        />
+      </AppContext.Provider>,
+    );
+
+    expect(tree).toMatchSnapshot();
+  });
+
+  it('should render itself & its children - open with detailed enabled', () => {
+    const tree = render(
+      <AppContext.Provider
+        value={{
+          settings: {
+            ...mockSettings,
+            detailedNotifications: true,
+          } as SettingsState,
+        }}
+      >
+        <SearchFilterSuggestions
+          inputValue={''}
+          onClose={mockOnClose}
+          open={true}
+        />
+      </AppContext.Provider>,
+    );
+
+    expect(tree).toMatchSnapshot();
+  });
+
+  it('should render itself & its children - input token invalid', () => {
+    const tree = render(
+      <AppContext.Provider
+        value={{
+          settings: {
+            ...mockSettings,
+            detailedNotifications: false,
+          } as SettingsState,
+        }}
+      >
+        <SearchFilterSuggestions
+          inputValue={'invalid'}
+          onClose={mockOnClose}
+          open={true}
+        />
+      </AppContext.Provider>,
+    );
+
+    expect(tree).toMatchSnapshot();
+  });
+
+  it('should render itself & its children - input token valid', () => {
+    const tree = render(
+      <AppContext.Provider
+        value={{
+          settings: {
+            ...mockSettings,
+            detailedNotifications: false,
+          } as SettingsState,
+        }}
+      >
+        <SearchFilterSuggestions
+          inputValue={'repo:'}
+          onClose={mockOnClose}
+          open={true}
+        />
+      </AppContext.Provider>,
+    );
+
+    expect(tree).toMatchSnapshot();
+  });
+});
diff --git a/src/renderer/components/filters/SearchFilterSuggestions.tsx b/src/renderer/components/filters/SearchFilterSuggestions.tsx
new file mode 100644
index 000000000..6bcf0ebd8
--- /dev/null
+++ b/src/renderer/components/filters/SearchFilterSuggestions.tsx
@@ -0,0 +1,72 @@
+import { type FC, useContext } from 'react';
+
+import { Box, Popover, Stack, Text } from '@primer/react';
+
+import { AppContext } from '../../context/App';
+import { Opacity } from '../../types';
+import { cn } from '../../utils/cn';
+import {
+  ALL_SEARCH_QUALIFIERS,
+  BASE_SEARCH_QUALIFIERS,
+  SEARCH_DELIMITER,
+} from '../../utils/notifications/filters/search';
+
+interface SearchFilterSuggestionsProps {
+  open: boolean;
+  inputValue: string;
+  onClose: () => void;
+}
+
+export const SearchFilterSuggestions: FC<SearchFilterSuggestionsProps> = ({
+  open,
+  inputValue,
+  onClose,
+}) => {
+  const { settings } = useContext(AppContext);
+
+  if (!open) {
+    return null;
+  }
+
+  const lower = inputValue.toLowerCase();
+  const base = settings.detailedNotifications
+    ? ALL_SEARCH_QUALIFIERS
+    : BASE_SEARCH_QUALIFIERS;
+  const suggestions = base.filter(
+    (q) => q.prefix.startsWith(lower) || inputValue === '',
+  );
+  const beginsWithKnownQualifier = base.some((q) => lower.startsWith(q.prefix));
+
+  return (
+    <Popover caret={false} onOpenChange={onClose} open>
+      <Popover.Content sx={{ p: 2, mt: 2, width: '100%' }}>
+        <Stack direction="vertical" gap="condensed">
+          {suggestions.length > 0 &&
+            suggestions.map((q) => (
+              <Box key={q.prefix}>
+                <Stack direction="vertical" gap="none">
+                  <Text className="text-xs font-semibold">{q.prefix}</Text>
+                  <Text className={cn('text-xs', Opacity.HIGH)}>
+                    {q.description}
+                  </Text>
+                </Stack>
+              </Box>
+            ))}
+          {inputValue !== '' &&
+            suggestions.length === 0 &&
+            !beginsWithKnownQualifier && (
+              <Box>
+                <Text className={cn('text-xs', Opacity.HIGH)}>
+                  Please use one of the supported filters [
+                  {base
+                    .map((q) => q.prefix.replace(SEARCH_DELIMITER, ''))
+                    .join(', ')}
+                  ]
+                </Text>
+              </Box>
+            )}
+        </Stack>
+      </Popover.Content>
+    </Popover>
+  );
+};
diff --git a/src/renderer/components/filters/StateFilter.test.tsx b/src/renderer/components/filters/StateFilter.test.tsx
index 264bafac3..a924580ac 100644
--- a/src/renderer/components/filters/StateFilter.test.tsx
+++ b/src/renderer/components/filters/StateFilter.test.tsx
@@ -1,5 +1,4 @@
 import { render } from '@testing-library/react';
-import { MemoryRouter } from 'react-router-dom';
 
 import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../__mocks__/state-mocks';
@@ -19,9 +18,7 @@ describe('renderer/components/filters/StateFilter.tsx', () => {
           notifications: mockAccountNotifications,
         }}
       >
-        <MemoryRouter>
-          <StateFilter />
-        </MemoryRouter>
+        <StateFilter />
       </AppContext.Provider>,
     );
 
diff --git a/src/renderer/components/filters/SubjectTypeFilter.test.tsx b/src/renderer/components/filters/SubjectTypeFilter.test.tsx
index e6c86b800..1015df381 100644
--- a/src/renderer/components/filters/SubjectTypeFilter.test.tsx
+++ b/src/renderer/components/filters/SubjectTypeFilter.test.tsx
@@ -1,5 +1,4 @@
 import { render } from '@testing-library/react';
-import { MemoryRouter } from 'react-router-dom';
 
 import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../__mocks__/state-mocks';
@@ -18,9 +17,7 @@ describe('renderer/components/filters/SubjectTypeFilter.tsx', () => {
           notifications: mockAccountNotifications,
         }}
       >
-        <MemoryRouter>
-          <SubjectTypeFilter />
-        </MemoryRouter>
+        <SubjectTypeFilter />
       </AppContext.Provider>,
     );
 
diff --git a/src/renderer/components/filters/TokenSearchInput.tsx b/src/renderer/components/filters/TokenSearchInput.tsx
new file mode 100644
index 000000000..e80c39321
--- /dev/null
+++ b/src/renderer/components/filters/TokenSearchInput.tsx
@@ -0,0 +1,122 @@
+import { type FC, useState } from 'react';
+
+import { Box, Stack, Text, TextInputWithTokens } from '@primer/react';
+
+import type { SearchToken } from '../../types';
+import {
+  parseSearchInput,
+  SEARCH_DELIMITER,
+} from '../../utils/notifications/filters/search';
+import { SearchFilterSuggestions } from './SearchFilterSuggestions';
+
+interface TokenSearchInputProps {
+  label: string;
+  icon: FC<{ className?: string }>;
+  iconColorClass: string;
+  tokens: readonly SearchToken[]; // raw token strings
+  showSuggestionsOnFocusIfEmpty: boolean;
+  onAdd: (token: SearchToken) => void;
+  onRemove: (token: SearchToken) => void;
+}
+
+const INPUT_KEY_EVENTS = ['Enter', 'Tab', ' ', ','];
+
+export const TokenSearchInput: FC<TokenSearchInputProps> = ({
+  label,
+  icon: Icon,
+  iconColorClass,
+  tokens,
+  showSuggestionsOnFocusIfEmpty,
+  onAdd,
+  onRemove,
+}) => {
+  const [inputValue, setInputValue] = useState('');
+  const [showSuggestions, setShowSuggestions] = useState(false);
+
+  const tokenItems = tokens.map((text, id) => ({ id, text }));
+
+  function tryAddToken(
+    event:
+      | React.KeyboardEvent<HTMLInputElement>
+      | React.FocusEvent<HTMLInputElement>,
+  ) {
+    const raw = (event.target as HTMLInputElement).value;
+    const parsed = parseSearchInput(raw);
+    const token = parsed?.token as SearchToken | undefined;
+    if (token && !tokens.includes(token)) {
+      onAdd(token);
+      (event.target as HTMLInputElement).value = '';
+      setInputValue('');
+    }
+  }
+
+  function onKeyDown(e: React.KeyboardEvent<HTMLInputElement>) {
+    if (INPUT_KEY_EVENTS.includes(e.key)) {
+      tryAddToken(e);
+      setShowSuggestions(false);
+    } else if (e.key === 'ArrowDown') {
+      setShowSuggestions(true);
+    }
+  }
+
+  return (
+    <Stack
+      align="center"
+      className="text-sm"
+      direction="horizontal"
+      gap="condensed"
+    >
+      <Box className="font-medium text-gitify-font w-20">
+        <Stack align="center" direction="horizontal" gap="condensed">
+          <Icon className={iconColorClass} />
+          <Text>{label}:</Text>
+        </Stack>
+      </Box>
+      <Box flexGrow={1} position="relative">
+        <TextInputWithTokens
+          block
+          onBlur={(e) => {
+            tryAddToken(e);
+            setShowSuggestions(false);
+          }}
+          onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
+            setInputValue(e.target.value);
+            const val = e.target.value.trim();
+            if (
+              !val.includes(SEARCH_DELIMITER) ||
+              val.endsWith(SEARCH_DELIMITER)
+            ) {
+              setShowSuggestions(true);
+            } else {
+              setShowSuggestions(false);
+            }
+          }}
+          onFocus={(e) => {
+            if (
+              showSuggestionsOnFocusIfEmpty &&
+              (e.target as HTMLInputElement).value.trim() === ''
+            ) {
+              setShowSuggestions(true);
+            }
+          }}
+          onKeyDown={onKeyDown}
+          onTokenRemove={(id) => {
+            const token = tokenItems.find((t) => t.id === id)?.text;
+
+            if (token) {
+              onRemove(token);
+            }
+          }}
+          size="small"
+          title={`${label} searches`}
+          tokens={tokenItems}
+        />
+        <SearchFilterSuggestions
+          inputValue={inputValue}
+          onClose={() => setShowSuggestions(false)}
+          open={showSuggestions}
+        />
+      </Box>
+    </Stack>
+  );
+};
diff --git a/src/renderer/components/filters/UserHandleFilter.test.tsx b/src/renderer/components/filters/UserHandleFilter.test.tsx
deleted file mode 100644
index 796791cf2..000000000
--- a/src/renderer/components/filters/UserHandleFilter.test.tsx
+++ /dev/null
@@ -1,183 +0,0 @@
-import { act, render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
-
-import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
-import { mockSettings } from '../../__mocks__/state-mocks';
-import { AppContext } from '../../context/App';
-import type { SettingsState } from '../../types';
-import { UserHandleFilter } from './UserHandleFilter';
-
-describe('renderer/components/filters/UserHandleFilter.tsx', () => {
-  const updateFilter = jest.fn();
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  describe('should render itself & its children', () => {
-    it('with detailed notifications enabled', () => {
-      const tree = render(
-        <AppContext.Provider
-          value={{
-            settings: {
-              ...mockSettings,
-              detailedNotifications: true,
-            } as SettingsState,
-            notifications: mockAccountNotifications,
-          }}
-        >
-          <MemoryRouter>
-            <UserHandleFilter />
-          </MemoryRouter>
-        </AppContext.Provider>,
-      );
-
-      expect(tree).toMatchSnapshot();
-    });
-
-    it('with detailed notifications disabled', () => {
-      const tree = render(
-        <AppContext.Provider
-          value={{
-            settings: {
-              ...mockSettings,
-              detailedNotifications: false,
-            } as SettingsState,
-            notifications: mockAccountNotifications,
-          }}
-        >
-          <MemoryRouter>
-            <UserHandleFilter />
-          </MemoryRouter>
-        </AppContext.Provider>,
-      );
-
-      expect(tree).toMatchSnapshot();
-    });
-  });
-
-  describe('Include user handles', () => {
-    it('should be able to filter by include user handle - none already set', async () => {
-      await act(async () => {
-        render(
-          <AppContext.Provider
-            value={{
-              settings: {
-                ...mockSettings,
-                filterIncludeHandles: [],
-              },
-              notifications: [],
-              updateFilter,
-            }}
-          >
-            <MemoryRouter>
-              <UserHandleFilter />
-            </MemoryRouter>
-          </AppContext.Provider>,
-        );
-      });
-
-      await userEvent.type(
-        screen.getByTitle('Include handles'),
-        'github-user{enter}',
-      );
-
-      expect(updateFilter).toHaveBeenCalledWith(
-        'filterIncludeHandles',
-        'github-user',
-        true,
-      );
-    });
-
-    it('should not allow duplicate include user handle', async () => {
-      await act(async () => {
-        render(
-          <AppContext.Provider
-            value={{
-              settings: {
-                ...mockSettings,
-                filterIncludeHandles: ['github-user'],
-              },
-              notifications: [],
-              updateFilter,
-            }}
-          >
-            <MemoryRouter>
-              <UserHandleFilter />
-            </MemoryRouter>
-          </AppContext.Provider>,
-        );
-      });
-
-      await userEvent.type(
-        screen.getByTitle('Include handles'),
-        'github-user{enter}',
-      );
-
-      expect(updateFilter).toHaveBeenCalledTimes(0);
-    });
-  });
-
-  describe('Exclude user handles', () => {
-    it('should be able to filter by exclude user handle - none already set', async () => {
-      await act(async () => {
-        render(
-          <AppContext.Provider
-            value={{
-              settings: {
-                ...mockSettings,
-                filterExcludeHandles: [],
-              },
-              notifications: [],
-              updateFilter,
-            }}
-          >
-            <MemoryRouter>
-              <UserHandleFilter />
-            </MemoryRouter>
-          </AppContext.Provider>,
-        );
-      });
-
-      await userEvent.type(
-        screen.getByTitle('Exclude handles'),
-        'github-user{enter}',
-      );
-
-      expect(updateFilter).toHaveBeenCalledWith(
-        'filterExcludeHandles',
-        'github-user',
-        true,
-      );
-    });
-
-    it('should not allow duplicate exclude user handle', async () => {
-      await act(async () => {
-        render(
-          <AppContext.Provider
-            value={{
-              settings: {
-                ...mockSettings,
-                filterExcludeHandles: ['github-user'],
-              },
-              notifications: [],
-              updateFilter,
-            }}
-          >
-            <MemoryRouter>
-              <UserHandleFilter />
-            </MemoryRouter>
-          </AppContext.Provider>,
-        );
-      });
-
-      await userEvent.type(
-        screen.getByTitle('Exclude handles'),
-        'github-user{enter}',
-      );
-
-      expect(updateFilter).toHaveBeenCalledTimes(0);
-    });
-  });
-});
diff --git a/src/renderer/components/filters/UserHandleFilter.tsx b/src/renderer/components/filters/UserHandleFilter.tsx
deleted file mode 100644
index 9c96a7e7b..000000000
--- a/src/renderer/components/filters/UserHandleFilter.tsx
+++ /dev/null
@@ -1,193 +0,0 @@
-import { type FC, useContext, useEffect, useState } from 'react';
-
-import {
-  CheckCircleFillIcon,
-  MentionIcon,
-  NoEntryFillIcon,
-} from '@primer/octicons-react';
-import { Box, Stack, Text, TextInputWithTokens } from '@primer/react';
-
-import { AppContext } from '../../context/App';
-import { IconColor, type UserHandle } from '../../types';
-import {
-  hasExcludeHandleFilters,
-  hasIncludeHandleFilters,
-} from '../../utils/notifications/filters/handles';
-import { Tooltip } from '../fields/Tooltip';
-import { Title } from '../primitives/Title';
-import { RequiresDetailedNotificationWarning } from './RequiresDetailedNotificationsWarning';
-
-type InputToken = {
-  id: number;
-  text: string;
-};
-
-const tokenEvents = ['Enter', 'Tab', ' ', ','];
-
-export const UserHandleFilter: FC = () => {
-  const { updateFilter, settings } = useContext(AppContext);
-
-  // biome-ignore lint/correctness/useExhaustiveDependencies: we only want to run this effect on handle filter changes
-  useEffect(() => {
-    if (!hasIncludeHandleFilters(settings)) {
-      setIncludeHandles([]);
-    }
-
-    if (!hasExcludeHandleFilters(settings)) {
-      setExcludeHandles([]);
-    }
-  }, [settings.filterIncludeHandles, settings.filterExcludeHandles]);
-
-  const mapValuesToTokens = (values: string[]): InputToken[] => {
-    return values.map((value, index) => ({
-      id: index,
-      text: value,
-    }));
-  };
-
-  const [includeHandles, setIncludeHandles] = useState<InputToken[]>(
-    mapValuesToTokens(settings.filterIncludeHandles),
-  );
-
-  const addIncludeHandlesToken = (
-    event:
-      | React.KeyboardEvent<HTMLInputElement>
-      | React.FocusEvent<HTMLInputElement>,
-  ) => {
-    const value = (event.target as HTMLInputElement).value.trim();
-
-    if (value.length > 0 && !includeHandles.some((v) => v.text === value)) {
-      setIncludeHandles([
-        ...includeHandles,
-        { id: includeHandles.length, text: value },
-      ]);
-      updateFilter('filterIncludeHandles', value as UserHandle, true);
-
-      (event.target as HTMLInputElement).value = '';
-    }
-  };
-
-  const removeIncludeHandleToken = (tokenId: string | number) => {
-    const value = includeHandles.find((v) => v.id === tokenId)?.text || '';
-    updateFilter('filterIncludeHandles', value as UserHandle, false);
-
-    setIncludeHandles(includeHandles.filter((v) => v.id !== tokenId));
-  };
-
-  const includeHandlesKeyDown = (
-    event: React.KeyboardEvent<HTMLInputElement>,
-  ) => {
-    if (tokenEvents.includes(event.key)) {
-      addIncludeHandlesToken(event);
-    }
-  };
-
-  const [excludeHandles, setExcludeHandles] = useState<InputToken[]>(
-    mapValuesToTokens(settings.filterExcludeHandles),
-  );
-
-  const addExcludeHandlesToken = (
-    event:
-      | React.KeyboardEvent<HTMLInputElement>
-      | React.FocusEvent<HTMLInputElement>,
-  ) => {
-    const value = (event.target as HTMLInputElement).value.trim();
-
-    if (value.length > 0 && !excludeHandles.some((v) => v.text === value)) {
-      setExcludeHandles([
-        ...excludeHandles,
-        { id: excludeHandles.length, text: value },
-      ]);
-      updateFilter('filterExcludeHandles', value as UserHandle, true);
-
-      (event.target as HTMLInputElement).value = '';
-    }
-  };
-
-  const removeExcludeHandleToken = (tokenId: string | number) => {
-    const value = excludeHandles.find((v) => v.id === tokenId)?.text || '';
-    updateFilter('filterExcludeHandles', value as UserHandle, false);
-
-    setExcludeHandles(excludeHandles.filter((v) => v.id !== tokenId));
-  };
-
-  const excludeHandlesKeyDown = (
-    event: React.KeyboardEvent<HTMLInputElement>,
-  ) => {
-    if (tokenEvents.includes(event.key)) {
-      addExcludeHandlesToken(event);
-    }
-  };
-
-  return (
-    <fieldset id="filter-user-handles">
-      <Stack align="baseline" direction="horizontal" gap="condensed">
-        <Title icon={MentionIcon}>Handles</Title>
-        <Tooltip
-          name="tooltip-filter-handles"
-          tooltip={
-            <Stack direction="vertical" gap="condensed">
-              <Text>Filter notifications by user handle.</Text>
-              <RequiresDetailedNotificationWarning />
-            </Stack>
-          }
-        />
-      </Stack>
-      <Stack direction="vertical" gap="condensed">
-        <Stack
-          align="center"
-          className="text-sm"
-          direction="horizontal"
-          gap="condensed"
-        >
-          <Box className="font-medium text-gitify-font w-28">
-            <Stack align="center" direction="horizontal" gap="condensed">
-              <CheckCircleFillIcon className={IconColor.GREEN} />
-              <Text>Include:</Text>
-            </Stack>
-          </Box>
-          <TextInputWithTokens
-            block
-            disabled={
-              !settings.detailedNotifications ||
-              hasExcludeHandleFilters(settings)
-            }
-            onBlur={addIncludeHandlesToken}
-            onKeyDown={includeHandlesKeyDown}
-            onTokenRemove={removeIncludeHandleToken}
-            size="small"
-            title="Include handles"
-            tokens={includeHandles}
-          />
-        </Stack>
-
-        <Stack
-          align="center"
-          className="text-sm"
-          direction="horizontal"
-          gap="condensed"
-        >
-          <Box className="font-medium text-gitify-font w-28">
-            <Stack align="center" direction="horizontal" gap="condensed">
-              <NoEntryFillIcon className={IconColor.RED} />
-              <Text>Exclude:</Text>
-            </Stack>
-          </Box>
-          <TextInputWithTokens
-            block
-            disabled={
-              !settings.detailedNotifications ||
-              hasIncludeHandleFilters(settings)
-            }
-            onBlur={addExcludeHandlesToken}
-            onKeyDown={excludeHandlesKeyDown}
-            onTokenRemove={removeExcludeHandleToken}
-            size="small"
-            title="Exclude handles"
-            tokens={excludeHandles}
-          />
-        </Stack>
-      </Stack>
-    </fieldset>
-  );
-};
diff --git a/src/renderer/components/filters/UserTypeFilter.test.tsx b/src/renderer/components/filters/UserTypeFilter.test.tsx
index c1433500a..fa3009361 100644
--- a/src/renderer/components/filters/UserTypeFilter.test.tsx
+++ b/src/renderer/components/filters/UserTypeFilter.test.tsx
@@ -1,5 +1,4 @@
 import { render } from '@testing-library/react';
-import { MemoryRouter } from 'react-router-dom';
 
 import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../__mocks__/state-mocks';
@@ -19,9 +18,7 @@ describe('renderer/components/filters/UserTypeFilter.tsx', () => {
           notifications: mockAccountNotifications,
         }}
       >
-        <MemoryRouter>
-          <UserTypeFilter />
-        </MemoryRouter>
+        <UserTypeFilter />
       </AppContext.Provider>,
     );
 
diff --git a/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap b/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap
index baa7eb0d1..c080cd2dc 100644
--- a/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap
@@ -443,55 +443,45 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
       <fieldset
         id="FilterSectionTest"
       >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
+        <legend>
+          <div
+            class="Box-sc-g0xbh4-0 mb-2"
+          >
             <div
-              class="Box-sc-g0xbh4-0 mb-2"
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-filtersectiontitle"
             >
-              <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="filtersectiontitle"
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-mark-github"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+                />
+              </svg>
+              <h2
+                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+                sx="[object Object]"
               >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-mark-github"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-                  />
-                </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  FilterSectionTitle
-                </h2>
-              </div>
+                FilterSectionTitle
+              </h2>
             </div>
-          </legend>
-        </div>
+          </div>
+        </legend>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
           data-align="stretch"
@@ -713,55 +703,45 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
     <fieldset
       id="FilterSectionTest"
     >
-      <div
-        class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-        data-align="baseline"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <legend>
+      <legend>
+        <div
+          class="Box-sc-g0xbh4-0 mb-2"
+        >
           <div
-            class="Box-sc-g0xbh4-0 mb-2"
+            class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+            id="title-filtersectiontitle"
           >
-            <div
-              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-              id="filtersectiontitle"
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-mark-github"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="16"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="16"
             >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-mark-github"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-                />
-              </svg>
-              <h2
-                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                sx="[object Object]"
-              >
-                FilterSectionTitle
-              </h2>
-            </div>
+              <path
+                d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+              />
+            </svg>
+            <h2
+              class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+              sx="[object Object]"
+            >
+              FilterSectionTitle
+            </h2>
           </div>
-        </legend>
-      </div>
+        </div>
+      </legend>
       <div
         class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
         data-align="stretch"
@@ -1040,55 +1020,45 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
       <fieldset
         id="FilterSectionTest"
       >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
+        <legend>
+          <div
+            class="Box-sc-g0xbh4-0 mb-2"
+          >
             <div
-              class="Box-sc-g0xbh4-0 mb-2"
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-filtersectiontitle"
             >
-              <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="filtersectiontitle"
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-mark-github"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+                />
+              </svg>
+              <h2
+                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+                sx="[object Object]"
               >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-mark-github"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-                  />
-                </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  FilterSectionTitle
-                </h2>
-              </div>
+                FilterSectionTitle
+              </h2>
             </div>
-          </legend>
-        </div>
+          </div>
+        </legend>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
           data-align="stretch"
@@ -1310,55 +1280,45 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
     <fieldset
       id="FilterSectionTest"
     >
-      <div
-        class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-        data-align="baseline"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <legend>
+      <legend>
+        <div
+          class="Box-sc-g0xbh4-0 mb-2"
+        >
           <div
-            class="Box-sc-g0xbh4-0 mb-2"
+            class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+            id="title-filtersectiontitle"
           >
-            <div
-              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-              id="filtersectiontitle"
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-mark-github"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="16"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="16"
             >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-mark-github"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-                />
-              </svg>
-              <h2
-                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                sx="[object Object]"
-              >
-                FilterSectionTitle
-              </h2>
-            </div>
+              <path
+                d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+              />
+            </svg>
+            <h2
+              class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+              sx="[object Object]"
+            >
+              FilterSectionTitle
+            </h2>
           </div>
-        </legend>
-      </div>
+        </div>
+      </legend>
       <div
         class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
         data-align="stretch"
diff --git a/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap
index 923c279b8..ef51bd517 100644
--- a/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap
@@ -8,32 +8,51 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
       <fieldset
         id="filter-reasons"
       >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
+        <legend>
+          <div
+            class="Box-sc-g0xbh4-0 mb-2"
+          >
             <div
-              class="Box-sc-g0xbh4-0 mb-2"
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-reason"
             >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-note"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M0 3.75C0 2.784.784 2 1.75 2h12.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25Zm1.75-.25a.25.25 0 0 0-.25.25v8.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25ZM3.5 6.25a.75.75 0 0 1 .75-.75h7a.75.75 0 0 1 0 1.5h-7a.75.75 0 0 1-.75-.75Zm.75 2.25h4a.75.75 0 0 1 0 1.5h-4a.75.75 0 0 1 0-1.5Z"
+                />
+              </svg>
+              <h2
+                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+                sx="[object Object]"
+              >
+                Reason
+              </h2>
               <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="reason"
+                aria-label="tooltip-reason"
+                class="Box-sc-g0xbh4-0 relative"
+                data-testid="tooltip-tooltip-reason"
+                id="tooltip-reason"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-note"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -44,42 +63,13 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                   width="16"
                 >
                   <path
-                    d="M0 3.75C0 2.784.784 2 1.75 2h12.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25Zm1.75-.25a.25.25 0 0 0-.25.25v8.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25ZM3.5 6.25a.75.75 0 0 1 .75-.75h7a.75.75 0 0 1 0 1.5h-7a.75.75 0 0 1-.75-.75Zm.75 2.25h4a.75.75 0 0 1 0 1.5h-4a.75.75 0 0 1 0-1.5Z"
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                   />
                 </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  Reason
-                </h2>
               </div>
             </div>
-          </legend>
-          <div
-            aria-label="tooltip-filter-reasons"
-            class="Box-sc-g0xbh4-0 relative"
-            data-testid="tooltip-tooltip-filter-reasons"
-            id="tooltip-filter-reasons"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-              />
-            </svg>
           </div>
-        </div>
+        </legend>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
           data-align="stretch"
@@ -847,32 +837,51 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
     <fieldset
       id="filter-reasons"
     >
-      <div
-        class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-        data-align="baseline"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <legend>
+      <legend>
+        <div
+          class="Box-sc-g0xbh4-0 mb-2"
+        >
           <div
-            class="Box-sc-g0xbh4-0 mb-2"
+            class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+            id="title-reason"
           >
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-note"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="16"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="16"
+            >
+              <path
+                d="M0 3.75C0 2.784.784 2 1.75 2h12.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25Zm1.75-.25a.25.25 0 0 0-.25.25v8.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25ZM3.5 6.25a.75.75 0 0 1 .75-.75h7a.75.75 0 0 1 0 1.5h-7a.75.75 0 0 1-.75-.75Zm.75 2.25h4a.75.75 0 0 1 0 1.5h-4a.75.75 0 0 1 0-1.5Z"
+              />
+            </svg>
+            <h2
+              class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+              sx="[object Object]"
+            >
+              Reason
+            </h2>
             <div
-              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-              id="reason"
+              aria-label="tooltip-reason"
+              class="Box-sc-g0xbh4-0 relative"
+              data-testid="tooltip-tooltip-reason"
+              id="tooltip-reason"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-note"
+                class="octicon octicon-question text-gitify-tooltip-icon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -883,42 +892,13 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
                 width="16"
               >
                 <path
-                  d="M0 3.75C0 2.784.784 2 1.75 2h12.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25Zm1.75-.25a.25.25 0 0 0-.25.25v8.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25ZM3.5 6.25a.75.75 0 0 1 .75-.75h7a.75.75 0 0 1 0 1.5h-7a.75.75 0 0 1-.75-.75Zm.75 2.25h4a.75.75 0 0 1 0 1.5h-4a.75.75 0 0 1 0-1.5Z"
+                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                 />
               </svg>
-              <h2
-                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                sx="[object Object]"
-              >
-                Reason
-              </h2>
             </div>
           </div>
-        </legend>
-        <div
-          aria-label="tooltip-filter-reasons"
-          class="Box-sc-g0xbh4-0 relative"
-          data-testid="tooltip-tooltip-filter-reasons"
-          id="tooltip-filter-reasons"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-question text-gitify-tooltip-icon"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-            />
-          </svg>
         </div>
-      </div>
+      </legend>
       <div
         class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
         data-align="stretch"
diff --git a/src/renderer/components/filters/__snapshots__/SearchFilterSuggestions.test.tsx.snap b/src/renderer/components/filters/__snapshots__/SearchFilterSuggestions.test.tsx.snap
new file mode 100644
index 000000000..bd80ee8aa
--- /dev/null
+++ b/src/renderer/components/filters/__snapshots__/SearchFilterSuggestions.test.tsx.snap
@@ -0,0 +1,832 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`renderer/components/filters/SearchFilterSuggestions.tsx should render itself & its children - closed 1`] = `
+{
+  "asFragment": [Function],
+  "baseElement": <body>
+    <div />
+  </body>,
+  "container": <div />,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "unmount": [Function],
+}
+`;
+
+exports[`renderer/components/filters/SearchFilterSuggestions.tsx should render itself & its children - input token invalid 1`] = `
+{
+  "asFragment": [Function],
+  "baseElement": <body>
+    <div>
+      <div
+        class="Popover-sc-q9r75g-0 kZtvVv caret-pos--false"
+        open=""
+      >
+        <div
+          class="Popover__PopoverContent-sc-q9r75g-1 WOpWG"
+          sx="[object Object]"
+        >
+          <div
+            class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+            data-align="stretch"
+            data-direction="vertical"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <div
+              class="Box-sc-g0xbh4-0"
+            >
+              <span
+                class="Text-sc-17v1xeu-0 ezOLpc text-xs opacity-90"
+              >
+                Please use one of the supported filters [
+                org, repo
+                ]
+              </span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="Popover-sc-q9r75g-0 kZtvVv caret-pos--false"
+      open=""
+    >
+      <div
+        class="Popover__PopoverContent-sc-q9r75g-1 WOpWG"
+        sx="[object Object]"
+      >
+        <div
+          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+          data-align="stretch"
+          data-direction="vertical"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-wrap="nowrap"
+        >
+          <div
+            class="Box-sc-g0xbh4-0"
+          >
+            <span
+              class="Text-sc-17v1xeu-0 ezOLpc text-xs opacity-90"
+            >
+              Please use one of the supported filters [
+              org, repo
+              ]
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "unmount": [Function],
+}
+`;
+
+exports[`renderer/components/filters/SearchFilterSuggestions.tsx should render itself & its children - input token valid 1`] = `
+{
+  "asFragment": [Function],
+  "baseElement": <body>
+    <div>
+      <div
+        class="Popover-sc-q9r75g-0 kZtvVv caret-pos--false"
+        open=""
+      >
+        <div
+          class="Popover__PopoverContent-sc-q9r75g-1 WOpWG"
+          sx="[object Object]"
+        >
+          <div
+            class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+            data-align="stretch"
+            data-direction="vertical"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <div
+              class="Box-sc-g0xbh4-0"
+            >
+              <div
+                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+                data-align="stretch"
+                data-direction="vertical"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <span
+                  class="Text-sc-17v1xeu-0 ezOLpc text-xs font-semibold"
+                >
+                  repo:
+                </span>
+                <span
+                  class="Text-sc-17v1xeu-0 ezOLpc text-xs opacity-90"
+                >
+                  filter by repository full name
+                </span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="Popover-sc-q9r75g-0 kZtvVv caret-pos--false"
+      open=""
+    >
+      <div
+        class="Popover__PopoverContent-sc-q9r75g-1 WOpWG"
+        sx="[object Object]"
+      >
+        <div
+          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+          data-align="stretch"
+          data-direction="vertical"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-wrap="nowrap"
+        >
+          <div
+            class="Box-sc-g0xbh4-0"
+          >
+            <div
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="stretch"
+              data-direction="vertical"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <span
+                class="Text-sc-17v1xeu-0 ezOLpc text-xs font-semibold"
+              >
+                repo:
+              </span>
+              <span
+                class="Text-sc-17v1xeu-0 ezOLpc text-xs opacity-90"
+              >
+                filter by repository full name
+              </span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "unmount": [Function],
+}
+`;
+
+exports[`renderer/components/filters/SearchFilterSuggestions.tsx should render itself & its children - open 1`] = `
+{
+  "asFragment": [Function],
+  "baseElement": <body>
+    <div>
+      <div
+        class="Popover-sc-q9r75g-0 kZtvVv caret-pos--false"
+        open=""
+      >
+        <div
+          class="Popover__PopoverContent-sc-q9r75g-1 WOpWG"
+          sx="[object Object]"
+        >
+          <div
+            class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+            data-align="stretch"
+            data-direction="vertical"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <div
+              class="Box-sc-g0xbh4-0"
+            >
+              <div
+                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+                data-align="stretch"
+                data-direction="vertical"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <span
+                  class="Text-sc-17v1xeu-0 ezOLpc text-xs font-semibold"
+                >
+                  author:
+                </span>
+                <span
+                  class="Text-sc-17v1xeu-0 ezOLpc text-xs opacity-90"
+                >
+                  filter by notification author
+                </span>
+              </div>
+            </div>
+            <div
+              class="Box-sc-g0xbh4-0"
+            >
+              <div
+                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+                data-align="stretch"
+                data-direction="vertical"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <span
+                  class="Text-sc-17v1xeu-0 ezOLpc text-xs font-semibold"
+                >
+                  org:
+                </span>
+                <span
+                  class="Text-sc-17v1xeu-0 ezOLpc text-xs opacity-90"
+                >
+                  filter by organization owner
+                </span>
+              </div>
+            </div>
+            <div
+              class="Box-sc-g0xbh4-0"
+            >
+              <div
+                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+                data-align="stretch"
+                data-direction="vertical"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <span
+                  class="Text-sc-17v1xeu-0 ezOLpc text-xs font-semibold"
+                >
+                  repo:
+                </span>
+                <span
+                  class="Text-sc-17v1xeu-0 ezOLpc text-xs opacity-90"
+                >
+                  filter by repository full name
+                </span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="Popover-sc-q9r75g-0 kZtvVv caret-pos--false"
+      open=""
+    >
+      <div
+        class="Popover__PopoverContent-sc-q9r75g-1 WOpWG"
+        sx="[object Object]"
+      >
+        <div
+          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+          data-align="stretch"
+          data-direction="vertical"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-wrap="nowrap"
+        >
+          <div
+            class="Box-sc-g0xbh4-0"
+          >
+            <div
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="stretch"
+              data-direction="vertical"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <span
+                class="Text-sc-17v1xeu-0 ezOLpc text-xs font-semibold"
+              >
+                author:
+              </span>
+              <span
+                class="Text-sc-17v1xeu-0 ezOLpc text-xs opacity-90"
+              >
+                filter by notification author
+              </span>
+            </div>
+          </div>
+          <div
+            class="Box-sc-g0xbh4-0"
+          >
+            <div
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="stretch"
+              data-direction="vertical"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <span
+                class="Text-sc-17v1xeu-0 ezOLpc text-xs font-semibold"
+              >
+                org:
+              </span>
+              <span
+                class="Text-sc-17v1xeu-0 ezOLpc text-xs opacity-90"
+              >
+                filter by organization owner
+              </span>
+            </div>
+          </div>
+          <div
+            class="Box-sc-g0xbh4-0"
+          >
+            <div
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="stretch"
+              data-direction="vertical"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <span
+                class="Text-sc-17v1xeu-0 ezOLpc text-xs font-semibold"
+              >
+                repo:
+              </span>
+              <span
+                class="Text-sc-17v1xeu-0 ezOLpc text-xs opacity-90"
+              >
+                filter by repository full name
+              </span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "unmount": [Function],
+}
+`;
+
+exports[`renderer/components/filters/SearchFilterSuggestions.tsx should render itself & its children - open with detailed enabled 1`] = `
+{
+  "asFragment": [Function],
+  "baseElement": <body>
+    <div>
+      <div
+        class="Popover-sc-q9r75g-0 kZtvVv caret-pos--false"
+        open=""
+      >
+        <div
+          class="Popover__PopoverContent-sc-q9r75g-1 WOpWG"
+          sx="[object Object]"
+        >
+          <div
+            class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+            data-align="stretch"
+            data-direction="vertical"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <div
+              class="Box-sc-g0xbh4-0"
+            >
+              <div
+                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+                data-align="stretch"
+                data-direction="vertical"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <span
+                  class="Text-sc-17v1xeu-0 ezOLpc text-xs font-semibold"
+                >
+                  author:
+                </span>
+                <span
+                  class="Text-sc-17v1xeu-0 ezOLpc text-xs opacity-90"
+                >
+                  filter by notification author
+                </span>
+              </div>
+            </div>
+            <div
+              class="Box-sc-g0xbh4-0"
+            >
+              <div
+                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+                data-align="stretch"
+                data-direction="vertical"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <span
+                  class="Text-sc-17v1xeu-0 ezOLpc text-xs font-semibold"
+                >
+                  org:
+                </span>
+                <span
+                  class="Text-sc-17v1xeu-0 ezOLpc text-xs opacity-90"
+                >
+                  filter by organization owner
+                </span>
+              </div>
+            </div>
+            <div
+              class="Box-sc-g0xbh4-0"
+            >
+              <div
+                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+                data-align="stretch"
+                data-direction="vertical"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <span
+                  class="Text-sc-17v1xeu-0 ezOLpc text-xs font-semibold"
+                >
+                  repo:
+                </span>
+                <span
+                  class="Text-sc-17v1xeu-0 ezOLpc text-xs opacity-90"
+                >
+                  filter by repository full name
+                </span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      class="Popover-sc-q9r75g-0 kZtvVv caret-pos--false"
+      open=""
+    >
+      <div
+        class="Popover__PopoverContent-sc-q9r75g-1 WOpWG"
+        sx="[object Object]"
+      >
+        <div
+          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+          data-align="stretch"
+          data-direction="vertical"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-wrap="nowrap"
+        >
+          <div
+            class="Box-sc-g0xbh4-0"
+          >
+            <div
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="stretch"
+              data-direction="vertical"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <span
+                class="Text-sc-17v1xeu-0 ezOLpc text-xs font-semibold"
+              >
+                author:
+              </span>
+              <span
+                class="Text-sc-17v1xeu-0 ezOLpc text-xs opacity-90"
+              >
+                filter by notification author
+              </span>
+            </div>
+          </div>
+          <div
+            class="Box-sc-g0xbh4-0"
+          >
+            <div
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="stretch"
+              data-direction="vertical"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <span
+                class="Text-sc-17v1xeu-0 ezOLpc text-xs font-semibold"
+              >
+                org:
+              </span>
+              <span
+                class="Text-sc-17v1xeu-0 ezOLpc text-xs opacity-90"
+              >
+                filter by organization owner
+              </span>
+            </div>
+          </div>
+          <div
+            class="Box-sc-g0xbh4-0"
+          >
+            <div
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="stretch"
+              data-direction="vertical"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <span
+                class="Text-sc-17v1xeu-0 ezOLpc text-xs font-semibold"
+              >
+                repo:
+              </span>
+              <span
+                class="Text-sc-17v1xeu-0 ezOLpc text-xs opacity-90"
+              >
+                filter by repository full name
+              </span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>,
+  "debug": [Function],
+  "findAllByAltText": [Function],
+  "findAllByDisplayValue": [Function],
+  "findAllByLabelText": [Function],
+  "findAllByPlaceholderText": [Function],
+  "findAllByRole": [Function],
+  "findAllByTestId": [Function],
+  "findAllByText": [Function],
+  "findAllByTitle": [Function],
+  "findByAltText": [Function],
+  "findByDisplayValue": [Function],
+  "findByLabelText": [Function],
+  "findByPlaceholderText": [Function],
+  "findByRole": [Function],
+  "findByTestId": [Function],
+  "findByText": [Function],
+  "findByTitle": [Function],
+  "getAllByAltText": [Function],
+  "getAllByDisplayValue": [Function],
+  "getAllByLabelText": [Function],
+  "getAllByPlaceholderText": [Function],
+  "getAllByRole": [Function],
+  "getAllByTestId": [Function],
+  "getAllByText": [Function],
+  "getAllByTitle": [Function],
+  "getByAltText": [Function],
+  "getByDisplayValue": [Function],
+  "getByLabelText": [Function],
+  "getByPlaceholderText": [Function],
+  "getByRole": [Function],
+  "getByTestId": [Function],
+  "getByText": [Function],
+  "getByTitle": [Function],
+  "queryAllByAltText": [Function],
+  "queryAllByDisplayValue": [Function],
+  "queryAllByLabelText": [Function],
+  "queryAllByPlaceholderText": [Function],
+  "queryAllByRole": [Function],
+  "queryAllByTestId": [Function],
+  "queryAllByText": [Function],
+  "queryAllByTitle": [Function],
+  "queryByAltText": [Function],
+  "queryByDisplayValue": [Function],
+  "queryByLabelText": [Function],
+  "queryByPlaceholderText": [Function],
+  "queryByRole": [Function],
+  "queryByTestId": [Function],
+  "queryByText": [Function],
+  "queryByTitle": [Function],
+  "rerender": [Function],
+  "unmount": [Function],
+}
+`;
diff --git a/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap
index be2e10838..0a1cff88f 100644
--- a/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap
@@ -8,32 +8,54 @@ exports[`renderer/components/filters/StateFilter.tsx should render itself & its
       <fieldset
         id="filter-state"
       >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
+        <legend>
+          <div
+            class="Box-sc-g0xbh4-0 mb-2"
+          >
             <div
-              class="Box-sc-g0xbh4-0 mb-2"
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-state"
             >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-issue-opened"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                />
+                <path
+                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                />
+              </svg>
+              <h2
+                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+                sx="[object Object]"
+              >
+                State
+              </h2>
               <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="state"
+                aria-label="tooltip-state"
+                class="Box-sc-g0xbh4-0 relative"
+                data-testid="tooltip-tooltip-state"
+                id="tooltip-state"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-issue-opened"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -44,45 +66,13 @@ exports[`renderer/components/filters/StateFilter.tsx should render itself & its
                   width="16"
                 >
                   <path
-                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-                  />
-                  <path
-                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                   />
                 </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  State
-                </h2>
               </div>
             </div>
-          </legend>
-          <div
-            aria-label="tooltip-filter-state"
-            class="Box-sc-g0xbh4-0 relative"
-            data-testid="tooltip-tooltip-filter-state"
-            id="tooltip-filter-state"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-              />
-            </svg>
           </div>
-        </div>
+        </legend>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
           data-align="stretch"
@@ -304,32 +294,54 @@ exports[`renderer/components/filters/StateFilter.tsx should render itself & its
     <fieldset
       id="filter-state"
     >
-      <div
-        class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-        data-align="baseline"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <legend>
+      <legend>
+        <div
+          class="Box-sc-g0xbh4-0 mb-2"
+        >
           <div
-            class="Box-sc-g0xbh4-0 mb-2"
+            class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+            id="title-state"
           >
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-issue-opened"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="16"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="16"
+            >
+              <path
+                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+              />
+              <path
+                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+              />
+            </svg>
+            <h2
+              class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+              sx="[object Object]"
+            >
+              State
+            </h2>
             <div
-              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-              id="state"
+              aria-label="tooltip-state"
+              class="Box-sc-g0xbh4-0 relative"
+              data-testid="tooltip-tooltip-state"
+              id="tooltip-state"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-issue-opened"
+                class="octicon octicon-question text-gitify-tooltip-icon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -340,45 +352,13 @@ exports[`renderer/components/filters/StateFilter.tsx should render itself & its
                 width="16"
               >
                 <path
-                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-                />
-                <path
-                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                 />
               </svg>
-              <h2
-                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                sx="[object Object]"
-              >
-                State
-              </h2>
             </div>
           </div>
-        </legend>
-        <div
-          aria-label="tooltip-filter-state"
-          class="Box-sc-g0xbh4-0 relative"
-          data-testid="tooltip-tooltip-filter-state"
-          id="tooltip-filter-state"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-question text-gitify-tooltip-icon"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-            />
-          </svg>
         </div>
-      </div>
+      </legend>
       <div
         class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
         data-align="stretch"
diff --git a/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap
index 763193dba..b113c009d 100644
--- a/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap
@@ -8,32 +8,51 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx should render itself
       <fieldset
         id="filter-subject-type"
       >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
+        <legend>
+          <div
+            class="Box-sc-g0xbh4-0 mb-2"
+          >
             <div
-              class="Box-sc-g0xbh4-0 mb-2"
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-type"
             >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-bell"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
+                />
+              </svg>
+              <h2
+                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+                sx="[object Object]"
+              >
+                Type
+              </h2>
               <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="type"
+                aria-label="tooltip-type"
+                class="Box-sc-g0xbh4-0 relative"
+                data-testid="tooltip-tooltip-type"
+                id="tooltip-type"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -44,42 +63,13 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx should render itself
                   width="16"
                 >
                   <path
-                    d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                   />
                 </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  Type
-                </h2>
               </div>
             </div>
-          </legend>
-          <div
-            aria-label="tooltip-filter-subject-type"
-            class="Box-sc-g0xbh4-0 relative"
-            data-testid="tooltip-tooltip-filter-subject-type"
-            id="tooltip-filter-subject-type"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-              />
-            </svg>
           </div>
-        </div>
+        </legend>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
           data-align="stretch"
@@ -367,32 +357,51 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx should render itself
     <fieldset
       id="filter-subject-type"
     >
-      <div
-        class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-        data-align="baseline"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <legend>
+      <legend>
+        <div
+          class="Box-sc-g0xbh4-0 mb-2"
+        >
           <div
-            class="Box-sc-g0xbh4-0 mb-2"
+            class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+            id="title-type"
           >
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-bell"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="16"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="16"
+            >
+              <path
+                d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
+              />
+            </svg>
+            <h2
+              class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+              sx="[object Object]"
+            >
+              Type
+            </h2>
             <div
-              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-              id="type"
+              aria-label="tooltip-type"
+              class="Box-sc-g0xbh4-0 relative"
+              data-testid="tooltip-tooltip-type"
+              id="tooltip-type"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-bell"
+                class="octicon octicon-question text-gitify-tooltip-icon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -403,42 +412,13 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx should render itself
                 width="16"
               >
                 <path
-                  d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
+                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                 />
               </svg>
-              <h2
-                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                sx="[object Object]"
-              >
-                Type
-              </h2>
             </div>
           </div>
-        </legend>
-        <div
-          aria-label="tooltip-filter-subject-type"
-          class="Box-sc-g0xbh4-0 relative"
-          data-testid="tooltip-tooltip-filter-subject-type"
-          id="tooltip-filter-subject-type"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-question text-gitify-tooltip-icon"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-            />
-          </svg>
         </div>
-      </div>
+      </legend>
       <div
         class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
         data-align="stretch"
diff --git a/src/renderer/components/filters/__snapshots__/UserHandleFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/UserHandleFilter.test.tsx.snap
deleted file mode 100644
index d19785def..000000000
--- a/src/renderer/components/filters/__snapshots__/UserHandleFilter.test.tsx.snap
+++ /dev/null
@@ -1,1027 +0,0 @@
-// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
-
-exports[`renderer/components/filters/UserHandleFilter.tsx should render itself & its children with detailed notifications disabled 1`] = `
-{
-  "asFragment": [Function],
-  "baseElement": <body>
-    <div>
-      <fieldset
-        id="filter-user-handles"
-      >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
-            <div
-              class="Box-sc-g0xbh4-0 mb-2"
-            >
-              <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="handles"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-mention"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M8 .5a7.499 7.499 0 0 1 7.499 7.462l.002.038v1.164a2.612 2.612 0 0 1-4.783 1.454A3.763 3.763 0 0 1 8 11.776 3.776 3.776 0 1 1 11.776 8v1.164a1.112 1.112 0 0 0 2.225 0L14 8a6 6 0 1 0-3.311 5.365.75.75 0 0 1 .673 1.341A7.5 7.5 0 1 1 8 .5Zm0 5.225a2.275 2.275 0 1 0 0 4.552 2.275 2.275 0 0 0 0-4.552Z"
-                  />
-                </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  Handles
-                </h2>
-              </div>
-            </div>
-          </legend>
-          <div
-            aria-label="tooltip-filter-handles"
-            class="Box-sc-g0xbh4-0 relative"
-            data-testid="tooltip-tooltip-filter-handles"
-            id="tooltip-filter-handles"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-              />
-            </svg>
-          </div>
-        </div>
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="stretch"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ text-sm"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <div
-              class="Box-sc-g0xbh4-0 font-medium text-gitify-font w-28"
-            >
-              <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-check-circle-fill text-gitify-icon-open"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm3.78-9.72a.751.751 0 0 0-.018-1.042.751.751 0 0 0-1.042-.018L6.75 9.19 5.28 7.72a.751.751 0 0 0-1.042.018.751.751 0 0 0-.018 1.042l2 2a.75.75 0 0 0 1.06 0Z"
-                  />
-                </svg>
-                <span
-                  class="Text-sc-17v1xeu-0 ezOLpc"
-                >
-                  Include:
-                </span>
-              </div>
-            </div>
-            <span
-              class="TextInputWrapper__TextInputBaseWrapper-sc-1mqhpbi-0 TextInputWrapper-sc-1mqhpbi-1 dOliEx gesWdT"
-              disabled=""
-              sx="[object Object]"
-            >
-              <div
-                class="Box-sc-g0xbh4-0 gYTInF"
-                display="flex"
-                sx="[object Object]"
-              >
-                <div
-                  class="Box-sc-g0xbh4-0 gffXDM"
-                  sx="[object Object]"
-                >
-                  <input
-                    aria-invalid="false"
-                    class="UnstyledTextInput-sc-14ypya-0 iVOvhD"
-                    disabled=""
-                    sx="[object Object]"
-                    title="Include handles"
-                    type="text"
-                  />
-                </div>
-              </div>
-            </span>
-          </div>
-          <div
-            class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ text-sm"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <div
-              class="Box-sc-g0xbh4-0 font-medium text-gitify-font w-28"
-            >
-              <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-no-entry-fill text-gitify-icon-closed"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 12 12"
-                  width="16"
-                >
-                  <path
-                    d="M6 0a6 6 0 1 1 0 12A6 6 0 0 1 6 0Zm3 5H3v2h6Z"
-                  />
-                </svg>
-                <span
-                  class="Text-sc-17v1xeu-0 ezOLpc"
-                >
-                  Exclude:
-                </span>
-              </div>
-            </div>
-            <span
-              class="TextInputWrapper__TextInputBaseWrapper-sc-1mqhpbi-0 TextInputWrapper-sc-1mqhpbi-1 dOliEx gesWdT"
-              disabled=""
-              sx="[object Object]"
-            >
-              <div
-                class="Box-sc-g0xbh4-0 gYTInF"
-                display="flex"
-                sx="[object Object]"
-              >
-                <div
-                  class="Box-sc-g0xbh4-0 gffXDM"
-                  sx="[object Object]"
-                >
-                  <input
-                    aria-invalid="false"
-                    class="UnstyledTextInput-sc-14ypya-0 iVOvhD"
-                    disabled=""
-                    sx="[object Object]"
-                    title="Exclude handles"
-                    type="text"
-                  />
-                </div>
-              </div>
-            </span>
-          </div>
-        </div>
-      </fieldset>
-    </div>
-  </body>,
-  "container": <div>
-    <fieldset
-      id="filter-user-handles"
-    >
-      <div
-        class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-        data-align="baseline"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <legend>
-          <div
-            class="Box-sc-g0xbh4-0 mb-2"
-          >
-            <div
-              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-              id="handles"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-mention"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M8 .5a7.499 7.499 0 0 1 7.499 7.462l.002.038v1.164a2.612 2.612 0 0 1-4.783 1.454A3.763 3.763 0 0 1 8 11.776 3.776 3.776 0 1 1 11.776 8v1.164a1.112 1.112 0 0 0 2.225 0L14 8a6 6 0 1 0-3.311 5.365.75.75 0 0 1 .673 1.341A7.5 7.5 0 1 1 8 .5Zm0 5.225a2.275 2.275 0 1 0 0 4.552 2.275 2.275 0 0 0 0-4.552Z"
-                />
-              </svg>
-              <h2
-                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                sx="[object Object]"
-              >
-                Handles
-              </h2>
-            </div>
-          </div>
-        </legend>
-        <div
-          aria-label="tooltip-filter-handles"
-          class="Box-sc-g0xbh4-0 relative"
-          data-testid="tooltip-tooltip-filter-handles"
-          id="tooltip-filter-handles"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-question text-gitify-tooltip-icon"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-            />
-          </svg>
-        </div>
-      </div>
-      <div
-        class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-        data-align="stretch"
-        data-direction="vertical"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ text-sm"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="Box-sc-g0xbh4-0 font-medium text-gitify-font w-28"
-          >
-            <div
-              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-check-circle-fill text-gitify-icon-open"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm3.78-9.72a.751.751 0 0 0-.018-1.042.751.751 0 0 0-1.042-.018L6.75 9.19 5.28 7.72a.751.751 0 0 0-1.042.018.751.751 0 0 0-.018 1.042l2 2a.75.75 0 0 0 1.06 0Z"
-                />
-              </svg>
-              <span
-                class="Text-sc-17v1xeu-0 ezOLpc"
-              >
-                Include:
-              </span>
-            </div>
-          </div>
-          <span
-            class="TextInputWrapper__TextInputBaseWrapper-sc-1mqhpbi-0 TextInputWrapper-sc-1mqhpbi-1 dOliEx gesWdT"
-            disabled=""
-            sx="[object Object]"
-          >
-            <div
-              class="Box-sc-g0xbh4-0 gYTInF"
-              display="flex"
-              sx="[object Object]"
-            >
-              <div
-                class="Box-sc-g0xbh4-0 gffXDM"
-                sx="[object Object]"
-              >
-                <input
-                  aria-invalid="false"
-                  class="UnstyledTextInput-sc-14ypya-0 iVOvhD"
-                  disabled=""
-                  sx="[object Object]"
-                  title="Include handles"
-                  type="text"
-                />
-              </div>
-            </div>
-          </span>
-        </div>
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ text-sm"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="Box-sc-g0xbh4-0 font-medium text-gitify-font w-28"
-          >
-            <div
-              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-no-entry-fill text-gitify-icon-closed"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 12 12"
-                width="16"
-              >
-                <path
-                  d="M6 0a6 6 0 1 1 0 12A6 6 0 0 1 6 0Zm3 5H3v2h6Z"
-                />
-              </svg>
-              <span
-                class="Text-sc-17v1xeu-0 ezOLpc"
-              >
-                Exclude:
-              </span>
-            </div>
-          </div>
-          <span
-            class="TextInputWrapper__TextInputBaseWrapper-sc-1mqhpbi-0 TextInputWrapper-sc-1mqhpbi-1 dOliEx gesWdT"
-            disabled=""
-            sx="[object Object]"
-          >
-            <div
-              class="Box-sc-g0xbh4-0 gYTInF"
-              display="flex"
-              sx="[object Object]"
-            >
-              <div
-                class="Box-sc-g0xbh4-0 gffXDM"
-                sx="[object Object]"
-              >
-                <input
-                  aria-invalid="false"
-                  class="UnstyledTextInput-sc-14ypya-0 iVOvhD"
-                  disabled=""
-                  sx="[object Object]"
-                  title="Exclude handles"
-                  type="text"
-                />
-              </div>
-            </div>
-          </span>
-        </div>
-      </div>
-    </fieldset>
-  </div>,
-  "debug": [Function],
-  "findAllByAltText": [Function],
-  "findAllByDisplayValue": [Function],
-  "findAllByLabelText": [Function],
-  "findAllByPlaceholderText": [Function],
-  "findAllByRole": [Function],
-  "findAllByTestId": [Function],
-  "findAllByText": [Function],
-  "findAllByTitle": [Function],
-  "findByAltText": [Function],
-  "findByDisplayValue": [Function],
-  "findByLabelText": [Function],
-  "findByPlaceholderText": [Function],
-  "findByRole": [Function],
-  "findByTestId": [Function],
-  "findByText": [Function],
-  "findByTitle": [Function],
-  "getAllByAltText": [Function],
-  "getAllByDisplayValue": [Function],
-  "getAllByLabelText": [Function],
-  "getAllByPlaceholderText": [Function],
-  "getAllByRole": [Function],
-  "getAllByTestId": [Function],
-  "getAllByText": [Function],
-  "getAllByTitle": [Function],
-  "getByAltText": [Function],
-  "getByDisplayValue": [Function],
-  "getByLabelText": [Function],
-  "getByPlaceholderText": [Function],
-  "getByRole": [Function],
-  "getByTestId": [Function],
-  "getByText": [Function],
-  "getByTitle": [Function],
-  "queryAllByAltText": [Function],
-  "queryAllByDisplayValue": [Function],
-  "queryAllByLabelText": [Function],
-  "queryAllByPlaceholderText": [Function],
-  "queryAllByRole": [Function],
-  "queryAllByTestId": [Function],
-  "queryAllByText": [Function],
-  "queryAllByTitle": [Function],
-  "queryByAltText": [Function],
-  "queryByDisplayValue": [Function],
-  "queryByLabelText": [Function],
-  "queryByPlaceholderText": [Function],
-  "queryByRole": [Function],
-  "queryByTestId": [Function],
-  "queryByText": [Function],
-  "queryByTitle": [Function],
-  "rerender": [Function],
-  "unmount": [Function],
-}
-`;
-
-exports[`renderer/components/filters/UserHandleFilter.tsx should render itself & its children with detailed notifications enabled 1`] = `
-{
-  "asFragment": [Function],
-  "baseElement": <body>
-    <div>
-      <fieldset
-        id="filter-user-handles"
-      >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
-            <div
-              class="Box-sc-g0xbh4-0 mb-2"
-            >
-              <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="handles"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-mention"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M8 .5a7.499 7.499 0 0 1 7.499 7.462l.002.038v1.164a2.612 2.612 0 0 1-4.783 1.454A3.763 3.763 0 0 1 8 11.776 3.776 3.776 0 1 1 11.776 8v1.164a1.112 1.112 0 0 0 2.225 0L14 8a6 6 0 1 0-3.311 5.365.75.75 0 0 1 .673 1.341A7.5 7.5 0 1 1 8 .5Zm0 5.225a2.275 2.275 0 1 0 0 4.552 2.275 2.275 0 0 0 0-4.552Z"
-                  />
-                </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  Handles
-                </h2>
-              </div>
-            </div>
-          </legend>
-          <div
-            aria-label="tooltip-filter-handles"
-            class="Box-sc-g0xbh4-0 relative"
-            data-testid="tooltip-tooltip-filter-handles"
-            id="tooltip-filter-handles"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-              />
-            </svg>
-          </div>
-        </div>
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="stretch"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ text-sm"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <div
-              class="Box-sc-g0xbh4-0 font-medium text-gitify-font w-28"
-            >
-              <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-check-circle-fill text-gitify-icon-open"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm3.78-9.72a.751.751 0 0 0-.018-1.042.751.751 0 0 0-1.042-.018L6.75 9.19 5.28 7.72a.751.751 0 0 0-1.042.018.751.751 0 0 0-.018 1.042l2 2a.75.75 0 0 0 1.06 0Z"
-                  />
-                </svg>
-                <span
-                  class="Text-sc-17v1xeu-0 ezOLpc"
-                >
-                  Include:
-                </span>
-              </div>
-            </div>
-            <span
-              class="TextInputWrapper__TextInputBaseWrapper-sc-1mqhpbi-0 TextInputWrapper-sc-1mqhpbi-1 khKVBN gesWdT"
-              sx="[object Object]"
-            >
-              <div
-                class="Box-sc-g0xbh4-0 gYTInF"
-                display="flex"
-                sx="[object Object]"
-              >
-                <div
-                  class="Box-sc-g0xbh4-0 gffXDM"
-                  sx="[object Object]"
-                >
-                  <input
-                    aria-invalid="false"
-                    class="UnstyledTextInput-sc-14ypya-0 iVOvhD"
-                    sx="[object Object]"
-                    tabindex="0"
-                    title="Include handles"
-                    type="text"
-                  />
-                </div>
-              </div>
-            </span>
-          </div>
-          <div
-            class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ text-sm"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <div
-              class="Box-sc-g0xbh4-0 font-medium text-gitify-font w-28"
-            >
-              <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-no-entry-fill text-gitify-icon-closed"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 12 12"
-                  width="16"
-                >
-                  <path
-                    d="M6 0a6 6 0 1 1 0 12A6 6 0 0 1 6 0Zm3 5H3v2h6Z"
-                  />
-                </svg>
-                <span
-                  class="Text-sc-17v1xeu-0 ezOLpc"
-                >
-                  Exclude:
-                </span>
-              </div>
-            </div>
-            <span
-              class="TextInputWrapper__TextInputBaseWrapper-sc-1mqhpbi-0 TextInputWrapper-sc-1mqhpbi-1 khKVBN gesWdT"
-              sx="[object Object]"
-            >
-              <div
-                class="Box-sc-g0xbh4-0 gYTInF"
-                display="flex"
-                sx="[object Object]"
-              >
-                <div
-                  class="Box-sc-g0xbh4-0 gffXDM"
-                  sx="[object Object]"
-                >
-                  <input
-                    aria-invalid="false"
-                    class="UnstyledTextInput-sc-14ypya-0 iVOvhD"
-                    sx="[object Object]"
-                    tabindex="0"
-                    title="Exclude handles"
-                    type="text"
-                  />
-                </div>
-              </div>
-            </span>
-          </div>
-        </div>
-      </fieldset>
-    </div>
-  </body>,
-  "container": <div>
-    <fieldset
-      id="filter-user-handles"
-    >
-      <div
-        class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-        data-align="baseline"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <legend>
-          <div
-            class="Box-sc-g0xbh4-0 mb-2"
-          >
-            <div
-              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-              id="handles"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-mention"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M8 .5a7.499 7.499 0 0 1 7.499 7.462l.002.038v1.164a2.612 2.612 0 0 1-4.783 1.454A3.763 3.763 0 0 1 8 11.776 3.776 3.776 0 1 1 11.776 8v1.164a1.112 1.112 0 0 0 2.225 0L14 8a6 6 0 1 0-3.311 5.365.75.75 0 0 1 .673 1.341A7.5 7.5 0 1 1 8 .5Zm0 5.225a2.275 2.275 0 1 0 0 4.552 2.275 2.275 0 0 0 0-4.552Z"
-                />
-              </svg>
-              <h2
-                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                sx="[object Object]"
-              >
-                Handles
-              </h2>
-            </div>
-          </div>
-        </legend>
-        <div
-          aria-label="tooltip-filter-handles"
-          class="Box-sc-g0xbh4-0 relative"
-          data-testid="tooltip-tooltip-filter-handles"
-          id="tooltip-filter-handles"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-question text-gitify-tooltip-icon"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-            />
-          </svg>
-        </div>
-      </div>
-      <div
-        class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-        data-align="stretch"
-        data-direction="vertical"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ text-sm"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="Box-sc-g0xbh4-0 font-medium text-gitify-font w-28"
-          >
-            <div
-              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-check-circle-fill text-gitify-icon-open"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm3.78-9.72a.751.751 0 0 0-.018-1.042.751.751 0 0 0-1.042-.018L6.75 9.19 5.28 7.72a.751.751 0 0 0-1.042.018.751.751 0 0 0-.018 1.042l2 2a.75.75 0 0 0 1.06 0Z"
-                />
-              </svg>
-              <span
-                class="Text-sc-17v1xeu-0 ezOLpc"
-              >
-                Include:
-              </span>
-            </div>
-          </div>
-          <span
-            class="TextInputWrapper__TextInputBaseWrapper-sc-1mqhpbi-0 TextInputWrapper-sc-1mqhpbi-1 khKVBN gesWdT"
-            sx="[object Object]"
-          >
-            <div
-              class="Box-sc-g0xbh4-0 gYTInF"
-              display="flex"
-              sx="[object Object]"
-            >
-              <div
-                class="Box-sc-g0xbh4-0 gffXDM"
-                sx="[object Object]"
-              >
-                <input
-                  aria-invalid="false"
-                  class="UnstyledTextInput-sc-14ypya-0 iVOvhD"
-                  sx="[object Object]"
-                  tabindex="0"
-                  title="Include handles"
-                  type="text"
-                />
-              </div>
-            </div>
-          </span>
-        </div>
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ text-sm"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="Box-sc-g0xbh4-0 font-medium text-gitify-font w-28"
-          >
-            <div
-              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-no-entry-fill text-gitify-icon-closed"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 12 12"
-                width="16"
-              >
-                <path
-                  d="M6 0a6 6 0 1 1 0 12A6 6 0 0 1 6 0Zm3 5H3v2h6Z"
-                />
-              </svg>
-              <span
-                class="Text-sc-17v1xeu-0 ezOLpc"
-              >
-                Exclude:
-              </span>
-            </div>
-          </div>
-          <span
-            class="TextInputWrapper__TextInputBaseWrapper-sc-1mqhpbi-0 TextInputWrapper-sc-1mqhpbi-1 khKVBN gesWdT"
-            sx="[object Object]"
-          >
-            <div
-              class="Box-sc-g0xbh4-0 gYTInF"
-              display="flex"
-              sx="[object Object]"
-            >
-              <div
-                class="Box-sc-g0xbh4-0 gffXDM"
-                sx="[object Object]"
-              >
-                <input
-                  aria-invalid="false"
-                  class="UnstyledTextInput-sc-14ypya-0 iVOvhD"
-                  sx="[object Object]"
-                  tabindex="0"
-                  title="Exclude handles"
-                  type="text"
-                />
-              </div>
-            </div>
-          </span>
-        </div>
-      </div>
-    </fieldset>
-  </div>,
-  "debug": [Function],
-  "findAllByAltText": [Function],
-  "findAllByDisplayValue": [Function],
-  "findAllByLabelText": [Function],
-  "findAllByPlaceholderText": [Function],
-  "findAllByRole": [Function],
-  "findAllByTestId": [Function],
-  "findAllByText": [Function],
-  "findAllByTitle": [Function],
-  "findByAltText": [Function],
-  "findByDisplayValue": [Function],
-  "findByLabelText": [Function],
-  "findByPlaceholderText": [Function],
-  "findByRole": [Function],
-  "findByTestId": [Function],
-  "findByText": [Function],
-  "findByTitle": [Function],
-  "getAllByAltText": [Function],
-  "getAllByDisplayValue": [Function],
-  "getAllByLabelText": [Function],
-  "getAllByPlaceholderText": [Function],
-  "getAllByRole": [Function],
-  "getAllByTestId": [Function],
-  "getAllByText": [Function],
-  "getAllByTitle": [Function],
-  "getByAltText": [Function],
-  "getByDisplayValue": [Function],
-  "getByLabelText": [Function],
-  "getByPlaceholderText": [Function],
-  "getByRole": [Function],
-  "getByTestId": [Function],
-  "getByText": [Function],
-  "getByTitle": [Function],
-  "queryAllByAltText": [Function],
-  "queryAllByDisplayValue": [Function],
-  "queryAllByLabelText": [Function],
-  "queryAllByPlaceholderText": [Function],
-  "queryAllByRole": [Function],
-  "queryAllByTestId": [Function],
-  "queryAllByText": [Function],
-  "queryAllByTitle": [Function],
-  "queryByAltText": [Function],
-  "queryByDisplayValue": [Function],
-  "queryByLabelText": [Function],
-  "queryByPlaceholderText": [Function],
-  "queryByRole": [Function],
-  "queryByTestId": [Function],
-  "queryByText": [Function],
-  "queryByTitle": [Function],
-  "rerender": [Function],
-  "unmount": [Function],
-}
-`;
diff --git a/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap
index 088c5eadf..69c78ceb7 100644
--- a/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap
@@ -8,32 +8,51 @@ exports[`renderer/components/filters/UserTypeFilter.tsx should render itself & i
       <fieldset
         id="filter-user-types"
       >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
+        <legend>
+          <div
+            class="Box-sc-g0xbh4-0 mb-2"
+          >
             <div
-              class="Box-sc-g0xbh4-0 mb-2"
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-user-type"
             >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-feed-person"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                />
+              </svg>
+              <h2
+                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+                sx="[object Object]"
+              >
+                User Type
+              </h2>
               <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="user-type"
+                aria-label="tooltip-user-type"
+                class="Box-sc-g0xbh4-0 relative"
+                data-testid="tooltip-tooltip-user-type"
+                id="tooltip-user-type"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-feed-person"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -44,42 +63,13 @@ exports[`renderer/components/filters/UserTypeFilter.tsx should render itself & i
                   width="16"
                 >
                   <path
-                    d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                   />
                 </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  User Type
-                </h2>
               </div>
             </div>
-          </legend>
-          <div
-            aria-label="tooltip-filter-user-types"
-            class="Box-sc-g0xbh4-0 relative"
-            data-testid="tooltip-tooltip-filter-user-types"
-            id="tooltip-filter-user-types"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-              />
-            </svg>
           </div>
-        </div>
+        </legend>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
           data-align="stretch"
@@ -201,32 +191,51 @@ exports[`renderer/components/filters/UserTypeFilter.tsx should render itself & i
     <fieldset
       id="filter-user-types"
     >
-      <div
-        class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-        data-align="baseline"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <legend>
+      <legend>
+        <div
+          class="Box-sc-g0xbh4-0 mb-2"
+        >
           <div
-            class="Box-sc-g0xbh4-0 mb-2"
+            class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+            id="title-user-type"
           >
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-feed-person"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="16"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="16"
+            >
+              <path
+                d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+              />
+            </svg>
+            <h2
+              class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+              sx="[object Object]"
+            >
+              User Type
+            </h2>
             <div
-              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-              id="user-type"
+              aria-label="tooltip-user-type"
+              class="Box-sc-g0xbh4-0 relative"
+              data-testid="tooltip-tooltip-user-type"
+              id="tooltip-user-type"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-feed-person"
+                class="octicon octicon-question text-gitify-tooltip-icon"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -237,42 +246,13 @@ exports[`renderer/components/filters/UserTypeFilter.tsx should render itself & i
                 width="16"
               >
                 <path
-                  d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                 />
               </svg>
-              <h2
-                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                sx="[object Object]"
-              >
-                User Type
-              </h2>
             </div>
           </div>
-        </legend>
-        <div
-          aria-label="tooltip-filter-user-types"
-          class="Box-sc-g0xbh4-0 relative"
-          data-testid="tooltip-tooltip-filter-user-types"
-          id="tooltip-filter-user-types"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-question text-gitify-tooltip-icon"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-            />
-          </svg>
         </div>
-      </div>
+      </legend>
       <div
         class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
         data-align="stretch"
diff --git a/src/renderer/components/layout/Page.test.tsx b/src/renderer/components/layout/Page.test.tsx
index 92aae65fd..be7289cb8 100644
--- a/src/renderer/components/layout/Page.test.tsx
+++ b/src/renderer/components/layout/Page.test.tsx
@@ -4,7 +4,7 @@ import { Page } from './Page';
 
 describe('renderer/components/layout/Page.tsx', () => {
   it('should render itself & its children', () => {
-    const tree = render(<Page id="test">Test</Page>);
+    const tree = render(<Page testId="test">Test</Page>);
 
     expect(tree).toMatchSnapshot();
   });
diff --git a/src/renderer/components/layout/Page.tsx b/src/renderer/components/layout/Page.tsx
index cb347c199..d69148a97 100644
--- a/src/renderer/components/layout/Page.tsx
+++ b/src/renderer/components/layout/Page.tsx
@@ -4,7 +4,7 @@ import { Box } from '@primer/react';
 
 interface IPage {
   children: ReactNode;
-  id: string;
+  testId?: string;
 }
 
 /**
@@ -12,9 +12,9 @@ interface IPage {
  * It creates a column layout for header, content, and footer.
  * The height is 100% to fill the parent container.
  */
-export const Page: FC<IPage> = ({ children, id }) => {
+export const Page: FC<IPage> = ({ children, testId }) => {
   return (
-    <Box className="flex flex-col h-screen" data-testid={id}>
+    <Box className="flex flex-col h-screen" data-testid={testId}>
       {children}
     </Box>
   );
diff --git a/src/renderer/components/notifications/AccountNotifications.tsx b/src/renderer/components/notifications/AccountNotifications.tsx
index c11af63dc..5fd203fbf 100644
--- a/src/renderer/components/notifications/AccountNotifications.tsx
+++ b/src/renderer/components/notifications/AccountNotifications.tsx
@@ -42,7 +42,10 @@ export const AccountNotifications: FC<IAccountNotifications> = (
     notifications.reduce(
       (acc: { [key: string]: Notification[] }, notification) => {
         const key = notification.repository.full_name;
-        if (!acc[key]) acc[key] = [];
+        if (!acc[key]) {
+          acc[key] = [];
+        }
+
         acc[key].push(notification);
         return acc;
       },
diff --git a/src/renderer/components/primitives/Header.tsx b/src/renderer/components/primitives/Header.tsx
index eeba64059..1d0ba9fec 100644
--- a/src/renderer/components/primitives/Header.tsx
+++ b/src/renderer/components/primitives/Header.tsx
@@ -19,7 +19,7 @@ export const Header: FC<IHeader> = (props: IHeader) => {
   const { fetchNotifications } = useContext(AppContext);
 
   return (
-    <Box className="px-6 py-4">
+    <Box className="pl-4 pr-6 pt-3 pb-1">
       <Stack direction="horizontal" justify="space-between">
         <IconButton
           aria-labelledby="Go Back"
diff --git a/src/renderer/components/primitives/Title.tsx b/src/renderer/components/primitives/Title.tsx
index b55fba6b8..d589bacce 100644
--- a/src/renderer/components/primitives/Title.tsx
+++ b/src/renderer/components/primitives/Title.tsx
@@ -1,15 +1,20 @@
-import type { FC } from 'react';
+import type { FC, ReactNode } from 'react';
 
 import type { Icon } from '@primer/octicons-react';
 import { Box, Heading, Stack } from '@primer/react';
 
+import { Tooltip } from '../fields/Tooltip';
+
 interface ITitle {
   icon: Icon;
   children: string;
   size?: number;
+  tooltip?: ReactNode;
 }
 
 export const Title: FC<ITitle> = ({ size = 2, ...props }) => {
+  const name = props.children.toLowerCase().replace(' ', '-');
+
   return (
     <legend>
       <Box className="mb-2">
@@ -17,10 +22,20 @@ export const Title: FC<ITitle> = ({ size = 2, ...props }) => {
           align="center"
           direction="horizontal"
           gap="condensed"
-          id={props.children.toLowerCase().replace(' ', '-')}
+          id={`title-${name}`}
         >
           <props.icon size="small" />
           <Heading sx={{ fontSize: size }}>{props.children}</Heading>
+          {props.tooltip && (
+            <Tooltip
+              name={`tooltip-${name}`}
+              tooltip={
+                <Stack direction="vertical" gap="condensed">
+                  {props.tooltip}
+                </Stack>
+              }
+            />
+          )}
         </Stack>
       </Box>
     </legend>
diff --git a/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
index 3bc0df9d2..6ab3e59d1 100644
--- a/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`renderer/components/primitives/Header.tsx should render itself & its ch
   "baseElement": <body>
     <div>
       <div
-        class="Box-sc-g0xbh4-0 px-6 py-4"
+        class="Box-sc-g0xbh4-0 pl-4 pr-6 pt-3 pb-1"
       >
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
@@ -56,7 +56,7 @@ exports[`renderer/components/primitives/Header.tsx should render itself & its ch
                 data-justify="start"
                 data-padding="none"
                 data-wrap="nowrap"
-                id="test-header"
+                id="title-test-header"
               >
                 <svg
                   aria-hidden="true"
@@ -89,7 +89,7 @@ exports[`renderer/components/primitives/Header.tsx should render itself & its ch
   </body>,
   "container": <div>
     <div
-      class="Box-sc-g0xbh4-0 px-6 py-4"
+      class="Box-sc-g0xbh4-0 pl-4 pr-6 pt-3 pb-1"
     >
       <div
         class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
@@ -139,7 +139,7 @@ exports[`renderer/components/primitives/Header.tsx should render itself & its ch
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
-              id="test-header"
+              id="title-test-header"
             >
               <svg
                 aria-hidden="true"
diff --git a/src/renderer/components/primitives/__snapshots__/Title.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/Title.test.tsx.snap
index e5966e391..1f81c39a5 100644
--- a/src/renderer/components/primitives/__snapshots__/Title.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/Title.test.tsx.snap
@@ -14,7 +14,7 @@ exports[`renderer/routes/components/primitives/Title.tsx should render the title
         data-justify="start"
         data-padding="none"
         data-wrap="nowrap"
-        id="legend"
+        id="title-legend"
       >
         <svg
           aria-hidden="true"
@@ -58,7 +58,7 @@ exports[`renderer/routes/components/primitives/Title.tsx should render the title
         data-justify="start"
         data-padding="none"
         data-wrap="nowrap"
-        id="legend"
+        id="title-legend"
       >
         <svg
           aria-hidden="true"
diff --git a/src/renderer/components/settings/AppearanceSettings.test.tsx b/src/renderer/components/settings/AppearanceSettings.test.tsx
index 210949b64..9aa4eacd7 100644
--- a/src/renderer/components/settings/AppearanceSettings.test.tsx
+++ b/src/renderer/components/settings/AppearanceSettings.test.tsx
@@ -1,6 +1,5 @@
 import { act, fireEvent, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
 import {
   mockAuth,
@@ -28,9 +27,7 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <AppearanceSettings />
-          </MemoryRouter>
+          <AppearanceSettings />
         </AppContext.Provider>,
       );
     });
@@ -56,9 +53,7 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <AppearanceSettings />
-          </MemoryRouter>
+          <AppearanceSettings />
         </AppContext.Provider>,
       );
     });
@@ -81,9 +76,7 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <AppearanceSettings />
-          </MemoryRouter>
+          <AppearanceSettings />
         </AppContext.Provider>,
       );
     });
@@ -111,9 +104,7 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <AppearanceSettings />
-          </MemoryRouter>
+          <AppearanceSettings />
         </AppContext.Provider>,
       );
     });
@@ -166,9 +157,7 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <AppearanceSettings />
-          </MemoryRouter>
+          <AppearanceSettings />
         </AppContext.Provider>,
       );
     });
@@ -191,9 +180,7 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <AppearanceSettings />
-          </MemoryRouter>
+          <AppearanceSettings />
         </AppContext.Provider>,
       );
     });
diff --git a/src/renderer/components/settings/NotificationSettings.test.tsx b/src/renderer/components/settings/NotificationSettings.test.tsx
index 23ee6107b..0cdcc13cf 100644
--- a/src/renderer/components/settings/NotificationSettings.test.tsx
+++ b/src/renderer/components/settings/NotificationSettings.test.tsx
@@ -1,6 +1,5 @@
 import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
 import { mockAuth, mockSettings } from '../../__mocks__/state-mocks';
 import { AppContext } from '../../context/App';
@@ -24,9 +23,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <NotificationSettings />
-          </MemoryRouter>
+          <NotificationSettings />
         </AppContext.Provider>,
       );
     });
@@ -47,9 +44,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <NotificationSettings />
-          </MemoryRouter>
+          <NotificationSettings />
         </AppContext.Provider>,
       );
     });
@@ -70,9 +65,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <NotificationSettings />
-          </MemoryRouter>
+          <NotificationSettings />
         </AppContext.Provider>,
       );
     });
@@ -93,9 +86,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <NotificationSettings />
-          </MemoryRouter>
+          <NotificationSettings />
         </AppContext.Provider>,
       );
     });
@@ -116,9 +107,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <NotificationSettings />
-          </MemoryRouter>
+          <NotificationSettings />
         </AppContext.Provider>,
       );
     });
@@ -139,9 +128,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <NotificationSettings />
-          </MemoryRouter>
+          <NotificationSettings />
         </AppContext.Provider>,
       );
     });
@@ -166,9 +153,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <NotificationSettings />
-          </MemoryRouter>
+          <NotificationSettings />
         </AppContext.Provider>,
       );
     });
@@ -200,9 +185,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <NotificationSettings />
-          </MemoryRouter>
+          <NotificationSettings />
         </AppContext.Provider>,
       );
     });
@@ -223,9 +206,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <NotificationSettings />
-          </MemoryRouter>
+          <NotificationSettings />
         </AppContext.Provider>,
       );
     });
@@ -248,9 +229,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <NotificationSettings />
-          </MemoryRouter>
+          <NotificationSettings />
         </AppContext.Provider>,
       );
     });
diff --git a/src/renderer/components/settings/SettingsFooter.test.tsx b/src/renderer/components/settings/SettingsFooter.test.tsx
index 35d2fdd89..4fec2ae51 100644
--- a/src/renderer/components/settings/SettingsFooter.test.tsx
+++ b/src/renderer/components/settings/SettingsFooter.test.tsx
@@ -1,6 +1,5 @@
 import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
 import { mockAuth, mockSettings } from '../../__mocks__/state-mocks';
 import { AppContext } from '../../context/App';
@@ -35,9 +34,7 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => {
             settings: mockSettings,
           }}
         >
-          <MemoryRouter>
-            <SettingsFooter />
-          </MemoryRouter>
+          <SettingsFooter />
         </AppContext.Provider>,
       );
     });
@@ -58,9 +55,7 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => {
             settings: mockSettings,
           }}
         >
-          <MemoryRouter>
-            <SettingsFooter />
-          </MemoryRouter>
+          <SettingsFooter />
         </AppContext.Provider>,
       );
     });
@@ -82,9 +77,7 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => {
             settings: mockSettings,
           }}
         >
-          <MemoryRouter>
-            <SettingsFooter />
-          </MemoryRouter>
+          <SettingsFooter />
         </AppContext.Provider>,
       );
     });
@@ -105,9 +98,7 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => {
             settings: mockSettings,
           }}
         >
-          <MemoryRouter>
-            <SettingsFooter />
-          </MemoryRouter>
+          <SettingsFooter />
         </AppContext.Provider>,
       );
     });
diff --git a/src/renderer/components/settings/SettingsReset.test.tsx b/src/renderer/components/settings/SettingsReset.test.tsx
index 471dacbb3..ef058dc2b 100644
--- a/src/renderer/components/settings/SettingsReset.test.tsx
+++ b/src/renderer/components/settings/SettingsReset.test.tsx
@@ -1,6 +1,5 @@
 import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
 import { mockAuth, mockSettings } from '../../__mocks__/state-mocks';
 import { AppContext } from '../../context/App';
@@ -25,9 +24,7 @@ describe('renderer/components/settings/SettingsReset.tsx', () => {
             resetSettings,
           }}
         >
-          <MemoryRouter>
-            <SettingsReset />
-          </MemoryRouter>
+          <SettingsReset />
         </AppContext.Provider>,
       );
     });
@@ -50,9 +47,7 @@ describe('renderer/components/settings/SettingsReset.tsx', () => {
             resetSettings,
           }}
         >
-          <MemoryRouter>
-            <SettingsReset />
-          </MemoryRouter>
+          <SettingsReset />
         </AppContext.Provider>,
       );
     });
diff --git a/src/renderer/components/settings/SystemSettings.test.tsx b/src/renderer/components/settings/SystemSettings.test.tsx
index 0a9d7d7d6..3ff4bfc04 100644
--- a/src/renderer/components/settings/SystemSettings.test.tsx
+++ b/src/renderer/components/settings/SystemSettings.test.tsx
@@ -1,6 +1,5 @@
 import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
 import { mockAuth, mockSettings } from '../../__mocks__/state-mocks';
 import { AppContext } from '../../context/App';
@@ -23,9 +22,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <SystemSettings />
-          </MemoryRouter>
+          <SystemSettings />
         </AppContext.Provider>,
       );
     });
@@ -46,9 +43,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <SystemSettings />
-          </MemoryRouter>
+          <SystemSettings />
         </AppContext.Provider>,
       );
     });
@@ -69,9 +64,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <SystemSettings />
-          </MemoryRouter>
+          <SystemSettings />
         </AppContext.Provider>,
       );
     });
@@ -97,9 +90,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <SystemSettings />
-          </MemoryRouter>
+          <SystemSettings />
         </AppContext.Provider>,
       );
     });
@@ -120,9 +111,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <SystemSettings />
-          </MemoryRouter>
+          <SystemSettings />
         </AppContext.Provider>,
       );
 
@@ -140,9 +129,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <SystemSettings />
-          </MemoryRouter>
+          <SystemSettings />
         </AppContext.Provider>,
       );
 
@@ -158,9 +145,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <SystemSettings />
-          </MemoryRouter>
+          <SystemSettings />
         </AppContext.Provider>,
       );
 
@@ -179,9 +164,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <SystemSettings />
-          </MemoryRouter>
+          <SystemSettings />
         </AppContext.Provider>,
       );
 
@@ -203,9 +186,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <SystemSettings />
-          </MemoryRouter>
+          <SystemSettings />
         </AppContext.Provider>,
       );
 
@@ -226,9 +207,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <SystemSettings />
-          </MemoryRouter>
+          <SystemSettings />
         </AppContext.Provider>,
       );
     });
@@ -249,9 +228,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
             updateSetting,
           }}
         >
-          <MemoryRouter>
-            <SystemSettings />
-          </MemoryRouter>
+          <SystemSettings />
         </AppContext.Provider>,
       );
     });
diff --git a/src/renderer/context/App.test.tsx b/src/renderer/context/App.test.tsx
index 07dcc1815..f696eca43 100644
--- a/src/renderer/context/App.test.tsx
+++ b/src/renderer/context/App.test.tsx
@@ -201,6 +201,10 @@ describe('renderer/context/App.tsx', () => {
       });
     });
 
+    afterEach(() => {
+      jest.clearAllMocks();
+    });
+
     it('should call loginWithPersonalAccessToken', async () => {
       apiRequestAuthMock.mockResolvedValueOnce(null);
 
@@ -230,15 +234,10 @@ describe('renderer/context/App.tsx', () => {
         expect(fetchNotificationsMock).toHaveBeenCalledTimes(1),
       );
 
-      expect(apiRequestAuthMock).toHaveBeenCalledTimes(2);
+      expect(apiRequestAuthMock).toHaveBeenCalledTimes(1);
       expect(apiRequestAuthMock).toHaveBeenCalledWith(
         'https://api.github.com/notifications',
         'HEAD',
-        '123-456',
-      );
-      expect(apiRequestAuthMock).toHaveBeenCalledWith(
-        'https://api.github.com/user',
-        'GET',
         'encrypted',
       );
     });
@@ -353,9 +352,11 @@ describe('renderer/context/App.tsx', () => {
         } as AuthState,
         settings: {
           ...mockSettings,
+          filterIncludeSearchTokens: defaultSettings.filterIncludeSearchTokens,
+          filterExcludeSearchTokens: defaultSettings.filterExcludeSearchTokens,
           filterUserTypes: defaultSettings.filterUserTypes,
-          filterIncludeHandles: defaultSettings.filterIncludeHandles,
-          filterExcludeHandles: defaultSettings.filterExcludeHandles,
+          filterSubjectTypes: defaultSettings.filterSubjectTypes,
+          filterStates: defaultSettings.filterStates,
           filterReasons: defaultSettings.filterReasons,
         },
       });
diff --git a/src/renderer/context/App.tsx b/src/renderer/context/App.tsx
index 15d0ac14d..881e5269a 100644
--- a/src/renderer/context/App.tsx
+++ b/src/renderer/context/App.tsx
@@ -132,10 +132,8 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
   }, [
     auth.accounts,
     settings.filterUserTypes,
-    settings.filterIncludeHandles,
-    settings.filterExcludeHandles,
-    settings.filterIncludeOrganizations,
-    settings.filterExcludeOrganizations,
+    settings.filterIncludeSearchTokens,
+    settings.filterExcludeSearchTokens,
     settings.filterReasons,
   ]);
 
@@ -225,7 +223,9 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
   const loginWithOAuthApp = useCallback(
     async (data: LoginOAuthAppOptions) => {
       const { authOptions, authCode } = await authGitHub(data);
+
       const { token, hostname } = await getToken(authCode, authOptions);
+
       const updatedAuth = await addAccount(auth, 'OAuth App', token, hostname);
       setAuth(updatedAuth);
       saveState({ auth: updatedAuth, settings });
@@ -235,7 +235,9 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
 
   const loginWithPersonalAccessToken = useCallback(
     async ({ token, hostname }: LoginPersonalAccessTokenOptions) => {
-      await headNotifications(hostname, token);
+      const encryptedToken = (await encryptValue(token)) as Token;
+      await headNotifications(hostname, encryptedToken);
+
       const updatedAuth = await addAccount(
         auth,
         'Personal Access Token',
@@ -250,10 +252,8 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
 
   const logoutFromAccount = useCallback(
     async (account: Account) => {
-      // Remove notifications for account
       removeAccountNotifications(account);
 
-      // Remove from auth state
       const updatedAuth = removeAccount(auth, account);
       setAuth(updatedAuth);
       saveState({ auth: updatedAuth, settings });
diff --git a/src/renderer/context/defaults.ts b/src/renderer/context/defaults.ts
index c65402a01..31557df06 100644
--- a/src/renderer/context/defaults.ts
+++ b/src/renderer/context/defaults.ts
@@ -47,10 +47,8 @@ const defaultSystemSettings: SystemSettingsState = {
 
 export const defaultFilters: FilterSettingsState = {
   filterUserTypes: [],
-  filterIncludeHandles: [],
-  filterExcludeHandles: [],
-  filterIncludeOrganizations: [],
-  filterExcludeOrganizations: [],
+  filterIncludeSearchTokens: [],
+  filterExcludeSearchTokens: [],
   filterSubjectTypes: [],
   filterStates: [],
   filterReasons: [],
diff --git a/src/renderer/routes/Accounts.test.tsx b/src/renderer/routes/Accounts.test.tsx
index 1ae325703..a30413c06 100644
--- a/src/renderer/routes/Accounts.test.tsx
+++ b/src/renderer/routes/Accounts.test.tsx
@@ -1,6 +1,5 @@
 import { act, render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
 import { BaseStyles, ThemeProvider } from '@primer/react';
 
@@ -45,9 +44,7 @@ describe('renderer/routes/Accounts.tsx', () => {
               settings: mockSettings,
             }}
           >
-            <MemoryRouter>
-              <AccountsRoute />
-            </MemoryRouter>
+            <AccountsRoute />
           </AppContext.Provider>,
         );
       });
@@ -64,9 +61,7 @@ describe('renderer/routes/Accounts.tsx', () => {
               settings: mockSettings,
             }}
           >
-            <MemoryRouter>
-              <AccountsRoute />
-            </MemoryRouter>
+            <AccountsRoute />
           </AppContext.Provider>,
         );
       });
@@ -93,9 +88,7 @@ describe('renderer/routes/Accounts.tsx', () => {
               settings: mockSettings,
             }}
           >
-            <MemoryRouter>
-              <AccountsRoute />
-            </MemoryRouter>
+            <AccountsRoute />
           </AppContext.Provider>,
         );
       });
@@ -123,9 +116,7 @@ describe('renderer/routes/Accounts.tsx', () => {
               settings: mockSettings,
             }}
           >
-            <MemoryRouter>
-              <AccountsRoute />
-            </MemoryRouter>
+            <AccountsRoute />
           </AppContext.Provider>,
         );
       });
@@ -151,9 +142,7 @@ describe('renderer/routes/Accounts.tsx', () => {
               settings: mockSettings,
             }}
           >
-            <MemoryRouter>
-              <AccountsRoute />
-            </MemoryRouter>
+            <AccountsRoute />
           </AppContext.Provider>,
         );
       });
@@ -188,9 +177,7 @@ describe('renderer/routes/Accounts.tsx', () => {
               settings: mockSettings,
             }}
           >
-            <MemoryRouter>
-              <AccountsRoute />
-            </MemoryRouter>
+            <AccountsRoute />
           </AppContext.Provider>,
         );
       });
@@ -224,9 +211,7 @@ describe('renderer/routes/Accounts.tsx', () => {
               settings: mockSettings,
             }}
           >
-            <MemoryRouter>
-              <AccountsRoute />
-            </MemoryRouter>
+            <AccountsRoute />
           </AppContext.Provider>,
         );
       });
@@ -251,9 +236,7 @@ describe('renderer/routes/Accounts.tsx', () => {
               settings: mockSettings,
             }}
           >
-            <MemoryRouter>
-              <AccountsRoute />
-            </MemoryRouter>
+            <AccountsRoute />
           </AppContext.Provider>,
         );
       });
@@ -289,9 +272,7 @@ describe('renderer/routes/Accounts.tsx', () => {
               logoutFromAccount: logoutFromAccountMock,
             }}
           >
-            <MemoryRouter>
-              <AccountsRoute />
-            </MemoryRouter>
+            <AccountsRoute />
           </AppContext.Provider>,
         );
       });
@@ -322,9 +303,7 @@ describe('renderer/routes/Accounts.tsx', () => {
                   loginWithGitHubApp: mockLoginWithGitHubApp,
                 }}
               >
-                <MemoryRouter>
-                  <AccountsRoute />
-                </MemoryRouter>
+                <AccountsRoute />
               </AppContext.Provider>
             </BaseStyles>
           </ThemeProvider>,
@@ -348,9 +327,7 @@ describe('renderer/routes/Accounts.tsx', () => {
                   settings: mockSettings,
                 }}
               >
-                <MemoryRouter>
-                  <AccountsRoute />
-                </MemoryRouter>
+                <AccountsRoute />
               </AppContext.Provider>
             </BaseStyles>
           </ThemeProvider>,
@@ -380,9 +357,7 @@ describe('renderer/routes/Accounts.tsx', () => {
                   settings: mockSettings,
                 }}
               >
-                <MemoryRouter>
-                  <AccountsRoute />
-                </MemoryRouter>
+                <AccountsRoute />
               </AppContext.Provider>
             </BaseStyles>
           </ThemeProvider>,
diff --git a/src/renderer/routes/Accounts.tsx b/src/renderer/routes/Accounts.tsx
index d1352cc81..256a5c157 100644
--- a/src/renderer/routes/Accounts.tsx
+++ b/src/renderer/routes/Accounts.tsx
@@ -110,7 +110,7 @@ export const AccountsRoute: FC = () => {
   }, []);
 
   return (
-    <Page id="accounts">
+    <Page testId="accounts">
       <Header icon={PersonIcon}>Accounts</Header>
 
       <Contents>
diff --git a/src/renderer/routes/Filters.test.tsx b/src/renderer/routes/Filters.test.tsx
index 25b6ba782..115c26d3e 100644
--- a/src/renderer/routes/Filters.test.tsx
+++ b/src/renderer/routes/Filters.test.tsx
@@ -1,6 +1,5 @@
 import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
 import { mockAuth, mockSettings } from '../__mocks__/state-mocks';
 import { AppContext } from '../context/App';
@@ -31,9 +30,7 @@ describe('renderer/routes/Filters.tsx', () => {
               notifications: [],
             }}
           >
-            <MemoryRouter>
-              <FiltersRoute />
-            </MemoryRouter>
+            <FiltersRoute />
           </AppContext.Provider>,
         );
       });
@@ -52,9 +49,7 @@ describe('renderer/routes/Filters.tsx', () => {
               fetchNotifications,
             }}
           >
-            <MemoryRouter>
-              <FiltersRoute />
-            </MemoryRouter>
+            <FiltersRoute />
           </AppContext.Provider>,
         );
       });
@@ -78,9 +73,7 @@ describe('renderer/routes/Filters.tsx', () => {
               clearFilters,
             }}
           >
-            <MemoryRouter>
-              <FiltersRoute />
-            </MemoryRouter>
+            <FiltersRoute />
           </AppContext.Provider>,
         );
       });
diff --git a/src/renderer/routes/Filters.tsx b/src/renderer/routes/Filters.tsx
index fff1568e5..160af183e 100644
--- a/src/renderer/routes/Filters.tsx
+++ b/src/renderer/routes/Filters.tsx
@@ -3,11 +3,10 @@ import { type FC, useContext } from 'react';
 import { FilterIcon, FilterRemoveIcon } from '@primer/octicons-react';
 import { Button, Stack, Tooltip } from '@primer/react';
 
-import { OrganizationFilter } from '../components/filters/OrganizationFilter';
 import { ReasonFilter } from '../components/filters/ReasonFilter';
+import { SearchFilter } from '../components/filters/SearchFilter';
 import { StateFilter } from '../components/filters/StateFilter';
 import { SubjectTypeFilter } from '../components/filters/SubjectTypeFilter';
-import { UserHandleFilter } from '../components/filters/UserHandleFilter';
 import { UserTypeFilter } from '../components/filters/UserTypeFilter';
 import { Contents } from '../components/layout/Contents';
 import { Page } from '../components/layout/Page';
@@ -19,16 +18,15 @@ export const FiltersRoute: FC = () => {
   const { clearFilters } = useContext(AppContext);
 
   return (
-    <Page id="filters">
+    <Page testId="filters">
       <Header fetchOnBack icon={FilterIcon}>
         Filters
       </Header>
 
       <Contents paddingBottom>
         <Stack direction="vertical" gap="spacious">
+          <SearchFilter />
           <UserTypeFilter />
-          <UserHandleFilter />
-          <OrganizationFilter />
           <SubjectTypeFilter />
           <StateFilter />
           <ReasonFilter />
diff --git a/src/renderer/routes/Login.test.tsx b/src/renderer/routes/Login.test.tsx
index ebe226cde..df3f75476 100644
--- a/src/renderer/routes/Login.test.tsx
+++ b/src/renderer/routes/Login.test.tsx
@@ -1,6 +1,5 @@
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
 import { AppContext } from '../context/App';
 import * as comms from '../utils/comms';
@@ -18,11 +17,7 @@ describe('renderer/routes/Login.tsx', () => {
   });
 
   it('should render itself & its children', () => {
-    const tree = render(
-      <MemoryRouter>
-        <LoginRoute />
-      </MemoryRouter>,
-    );
+    const tree = render(<LoginRoute />);
 
     expect(tree).toMatchSnapshot();
   });
@@ -32,17 +27,13 @@ describe('renderer/routes/Login.tsx', () => {
 
     const { rerender } = render(
       <AppContext.Provider value={{ isLoggedIn: false }}>
-        <MemoryRouter>
-          <LoginRoute />
-        </MemoryRouter>
+        <LoginRoute />
       </AppContext.Provider>,
     );
 
     rerender(
       <AppContext.Provider value={{ isLoggedIn: true }}>
-        <MemoryRouter>
-          <LoginRoute />
-        </MemoryRouter>
+        <LoginRoute />
       </AppContext.Provider>,
     );
 
@@ -58,10 +49,7 @@ describe('renderer/routes/Login.tsx', () => {
           loginWithGitHubApp: mockLoginWithGitHubApp,
         }}
       >
-        <MemoryRouter>
-          <LoginRoute />
-        </MemoryRouter>
-        ,
+        <LoginRoute />
       </AppContext.Provider>,
     );
 
@@ -71,11 +59,7 @@ describe('renderer/routes/Login.tsx', () => {
   });
 
   it('should navigate to login with personal access token', async () => {
-    render(
-      <MemoryRouter>
-        <LoginRoute />
-      </MemoryRouter>,
-    );
+    render(<LoginRoute />);
 
     await userEvent.click(screen.getByTestId('login-pat'));
 
@@ -86,11 +70,7 @@ describe('renderer/routes/Login.tsx', () => {
   });
 
   it('should navigate to login with oauth app', async () => {
-    render(
-      <MemoryRouter>
-        <LoginRoute />
-      </MemoryRouter>,
-    );
+    render(<LoginRoute />);
 
     await userEvent.click(screen.getByTestId('login-oauth-app'));
 
diff --git a/src/renderer/routes/LoginWithOAuthApp.test.tsx b/src/renderer/routes/LoginWithOAuthApp.test.tsx
index 598e8821c..bdad525ea 100644
--- a/src/renderer/routes/LoginWithOAuthApp.test.tsx
+++ b/src/renderer/routes/LoginWithOAuthApp.test.tsx
@@ -1,6 +1,5 @@
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
 import { AppContext } from '../context/App';
 import type { AuthState, ClientID, ClientSecret, Hostname } from '../types';
@@ -31,9 +30,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
   it('renders correctly', () => {
     const tree = render(
       <AppContext.Provider value={{ auth: mockAuth }}>
-        <MemoryRouter>
-          <LoginWithOAuthAppRoute />
-        </MemoryRouter>
+        <LoginWithOAuthAppRoute />
       </AppContext.Provider>,
     );
 
@@ -43,9 +40,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
   it('let us go back', async () => {
     render(
       <AppContext.Provider value={{ auth: mockAuth }}>
-        <MemoryRouter>
-          <LoginWithOAuthAppRoute />
-        </MemoryRouter>
+        <LoginWithOAuthAppRoute />
       </AppContext.Provider>,
     );
 
@@ -85,9 +80,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
     it('should be disabled if no hostname configured', async () => {
       render(
         <AppContext.Provider value={{ auth: mockAuth }}>
-          <MemoryRouter>
-            <LoginWithOAuthAppRoute />
-          </MemoryRouter>
+          <LoginWithOAuthAppRoute />
         </AppContext.Provider>,
       );
 
@@ -101,9 +94,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
     it('should open in browser if hostname configured', async () => {
       render(
         <AppContext.Provider value={{ auth: mockAuth }}>
-          <MemoryRouter>
-            <LoginWithOAuthAppRoute />
-          </MemoryRouter>
+          <LoginWithOAuthAppRoute />
         </AppContext.Provider>,
       );
 
@@ -126,9 +117,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
           loginWithOAuthApp: mockLoginWithOAuthApp,
         }}
       >
-        <MemoryRouter>
-          <LoginWithOAuthAppRoute />
-        </MemoryRouter>
+        <LoginWithOAuthAppRoute />
       </AppContext.Provider>,
     );
 
@@ -155,9 +144,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
   it('should render the form with errors', async () => {
     render(
       <AppContext.Provider value={{ auth: mockAuth }}>
-        <MemoryRouter>
-          <LoginWithOAuthAppRoute />
-        </MemoryRouter>
+        <LoginWithOAuthAppRoute />
       </AppContext.Provider>,
     );
 
@@ -182,9 +169,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
   it('should open help docs in the browser', async () => {
     render(
       <AppContext.Provider value={{ auth: mockAuth }}>
-        <MemoryRouter>
-          <LoginWithOAuthAppRoute />
-        </MemoryRouter>
+        <LoginWithOAuthAppRoute />
       </AppContext.Provider>,
     );
 
diff --git a/src/renderer/routes/LoginWithOAuthApp.tsx b/src/renderer/routes/LoginWithOAuthApp.tsx
index 64c16e145..26826178b 100644
--- a/src/renderer/routes/LoginWithOAuthApp.tsx
+++ b/src/renderer/routes/LoginWithOAuthApp.tsx
@@ -133,7 +133,7 @@ export const LoginWithOAuthAppRoute: FC = () => {
   );
 
   return (
-    <Page id="Login With OAuth App">
+    <Page testId="Login With OAuth App">
       <Header icon={PersonIcon}>Login with OAuth App</Header>
 
       <Contents>
diff --git a/src/renderer/routes/LoginWithPersonalAccessToken.test.tsx b/src/renderer/routes/LoginWithPersonalAccessToken.test.tsx
index 59c54093c..229f4b78e 100644
--- a/src/renderer/routes/LoginWithPersonalAccessToken.test.tsx
+++ b/src/renderer/routes/LoginWithPersonalAccessToken.test.tsx
@@ -1,6 +1,5 @@
 import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
 import { AppContext } from '../context/App';
 import * as comms from '../utils/comms';
@@ -26,21 +25,13 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
   });
 
   it('renders correctly', () => {
-    const tree = render(
-      <MemoryRouter>
-        <LoginWithPersonalAccessTokenRoute />
-      </MemoryRouter>,
-    );
+    const tree = render(<LoginWithPersonalAccessTokenRoute />);
 
     expect(tree).toMatchSnapshot();
   });
 
   it('let us go back', async () => {
-    render(
-      <MemoryRouter>
-        <LoginWithPersonalAccessTokenRoute />
-      </MemoryRouter>,
-    );
+    render(<LoginWithPersonalAccessTokenRoute />);
 
     await userEvent.click(screen.getByTestId('header-nav-back'));
 
@@ -76,9 +67,7 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
             loginWithPersonalAccessToken: mockLoginWithPersonalAccessToken,
           }}
         >
-          <MemoryRouter>
-            <LoginWithPersonalAccessTokenRoute />
-          </MemoryRouter>
+          <LoginWithPersonalAccessTokenRoute />
         </AppContext.Provider>,
       );
 
@@ -96,9 +85,7 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
             loginWithPersonalAccessToken: mockLoginWithPersonalAccessToken,
           }}
         >
-          <MemoryRouter>
-            <LoginWithPersonalAccessTokenRoute />
-          </MemoryRouter>
+          <LoginWithPersonalAccessTokenRoute />
         </AppContext.Provider>,
       );
 
@@ -117,9 +104,7 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
           loginWithPersonalAccessToken: mockLoginWithPersonalAccessToken,
         }}
       >
-        <MemoryRouter>
-          <LoginWithPersonalAccessTokenRoute />
-        </MemoryRouter>
+        <LoginWithPersonalAccessTokenRoute />
       </AppContext.Provider>,
     );
 
@@ -151,9 +136,7 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
           loginWithPersonalAccessToken: mockLoginWithPersonalAccessToken,
         }}
       >
-        <MemoryRouter>
-          <LoginWithPersonalAccessTokenRoute />
-        </MemoryRouter>
+        <LoginWithPersonalAccessTokenRoute />
       </AppContext.Provider>,
     );
 
@@ -177,11 +160,7 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
   });
 
   it('should render the form with errors', async () => {
-    render(
-      <MemoryRouter>
-        <LoginWithPersonalAccessTokenRoute />
-      </MemoryRouter>,
-    );
+    render(<LoginWithPersonalAccessTokenRoute />);
 
     const hostname = screen.getByTestId('login-hostname');
     await userEvent.clear(hostname);
@@ -203,9 +182,7 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
           loginWithPersonalAccessToken: mockLoginWithPersonalAccessToken,
         }}
       >
-        <MemoryRouter>
-          <LoginWithPersonalAccessTokenRoute />
-        </MemoryRouter>
+        <LoginWithPersonalAccessTokenRoute />
       </AppContext.Provider>,
     );
 
diff --git a/src/renderer/routes/LoginWithPersonalAccessToken.tsx b/src/renderer/routes/LoginWithPersonalAccessToken.tsx
index 2a97ee91e..885483af0 100644
--- a/src/renderer/routes/LoginWithPersonalAccessToken.tsx
+++ b/src/renderer/routes/LoginWithPersonalAccessToken.tsx
@@ -125,7 +125,7 @@ export const LoginWithPersonalAccessTokenRoute: FC = () => {
   );
 
   return (
-    <Page id="Login With Personal Access Token">
+    <Page testId="Login With Personal Access Token">
       <Header icon={KeyIcon}>Login with Personal Access Token</Header>
 
       <Contents>
diff --git a/src/renderer/routes/Notifications.tsx b/src/renderer/routes/Notifications.tsx
index 7aca46a15..07ec3f60c 100644
--- a/src/renderer/routes/Notifications.tsx
+++ b/src/renderer/routes/Notifications.tsx
@@ -37,7 +37,7 @@ export const NotificationsRoute: FC = () => {
   }
 
   return (
-    <Page id="notifications">
+    <Page testId="notifications">
       <Contents paddingHorizontal={false}>
         {notifications.map((accountNotifications) => (
           <AccountNotifications
diff --git a/src/renderer/routes/Settings.test.tsx b/src/renderer/routes/Settings.test.tsx
index cbba9861d..ba03a471a 100644
--- a/src/renderer/routes/Settings.test.tsx
+++ b/src/renderer/routes/Settings.test.tsx
@@ -1,6 +1,5 @@
 import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { MemoryRouter } from 'react-router-dom';
 
 import { mockAuth, mockSettings } from '../__mocks__/state-mocks';
 import { AppContext } from '../context/App';
@@ -23,9 +22,7 @@ describe('renderer/routes/Settings.tsx', () => {
     await act(async () => {
       render(
         <AppContext.Provider value={{ auth: mockAuth, settings: mockSettings }}>
-          <MemoryRouter>
-            <SettingsRoute />
-          </MemoryRouter>
+          <SettingsRoute />
         </AppContext.Provider>,
       );
     });
@@ -43,9 +40,7 @@ describe('renderer/routes/Settings.tsx', () => {
             fetchNotifications,
           }}
         >
-          <MemoryRouter>
-            <SettingsRoute />
-          </MemoryRouter>
+          <SettingsRoute />
         </AppContext.Provider>,
       );
     });
diff --git a/src/renderer/routes/Settings.tsx b/src/renderer/routes/Settings.tsx
index c61be49c0..3a43e24ce 100644
--- a/src/renderer/routes/Settings.tsx
+++ b/src/renderer/routes/Settings.tsx
@@ -14,7 +14,7 @@ import { SystemSettings } from '../components/settings/SystemSettings';
 
 export const SettingsRoute: FC = () => {
   return (
-    <Page id="settings">
+    <Page testId="settings">
       <Header fetchOnBack icon={GearIcon}>
         Settings
       </Header>
diff --git a/src/renderer/routes/__snapshots__/Accounts.test.tsx.snap b/src/renderer/routes/__snapshots__/Accounts.test.tsx.snap
index 608e8356c..c191eba65 100644
--- a/src/renderer/routes/__snapshots__/Accounts.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Accounts.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`renderer/routes/Accounts.tsx Account interactions should render with PA
   data-testid="accounts"
 >
   <div
-    class="Box-sc-g0xbh4-0 px-6 py-4"
+    class="Box-sc-g0xbh4-0 pl-4 pr-6 pt-3 pb-1"
   >
     <div
       class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
@@ -56,7 +56,7 @@ exports[`renderer/routes/Accounts.tsx Account interactions should render with PA
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
-            id="accounts"
+            id="title-accounts"
           >
             <svg
               aria-hidden="true"
@@ -1273,7 +1273,7 @@ exports[`renderer/routes/Accounts.tsx Account interactions should set account as
   data-testid="accounts"
 >
   <div
-    class="Box-sc-g0xbh4-0 px-6 py-4"
+    class="Box-sc-g0xbh4-0 pl-4 pr-6 pt-3 pb-1"
   >
     <div
       class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
@@ -1323,7 +1323,7 @@ exports[`renderer/routes/Accounts.tsx Account interactions should set account as
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
-            id="accounts"
+            id="title-accounts"
           >
             <svg
               aria-hidden="true"
@@ -2540,7 +2540,7 @@ exports[`renderer/routes/Accounts.tsx General should render itself & its childre
   data-testid="accounts"
 >
   <div
-    class="Box-sc-g0xbh4-0 px-6 py-4"
+    class="Box-sc-g0xbh4-0 pl-4 pr-6 pt-3 pb-1"
   >
     <div
       class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
@@ -2590,7 +2590,7 @@ exports[`renderer/routes/Accounts.tsx General should render itself & its childre
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
-            id="accounts"
+            id="title-accounts"
           >
             <svg
               aria-hidden="true"
diff --git a/src/renderer/routes/__snapshots__/Filters.test.tsx.snap b/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
index dae095aab..7d8639512 100644
--- a/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
   data-testid="filters"
 >
   <div
-    class="Box-sc-g0xbh4-0 px-6 py-4"
+    class="Box-sc-g0xbh4-0 pl-4 pr-6 pt-3 pb-1"
   >
     <div
       class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
@@ -56,7 +56,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
-            id="filters"
+            id="title-filters"
           >
             <svg
               aria-hidden="true"
@@ -97,147 +97,24 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
       data-padding="none"
       data-wrap="nowrap"
     >
-      <fieldset
-        id="filter-user-types"
-      >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
-            <div
-              class="Box-sc-g0xbh4-0 mb-2"
-            >
-              <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="user-type"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-feed-person"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
-                  />
-                </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  User Type
-                </h2>
-              </div>
-            </div>
-          </legend>
-          <div
-            aria-label="tooltip-filter-user-types"
-            class="Box-sc-g0xbh4-0 relative"
-            data-testid="tooltip-tooltip-filter-user-types"
-            id="tooltip-filter-user-types"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-              />
-            </svg>
-          </div>
-        </div>
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="stretch"
-          data-direction="horizontal"
-          data-gap="normal"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ text-sm"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-User"
-              id="User"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="User"
-            >
-              User
-            </label>
-            <span
-              class="Text-sc-17v1xeu-0 ezOLpc px-1.5 py-0.75 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary"
-            >
-              0
-            </span>
-          </div>
+      <fieldset>
+        <legend>
           <div
-            class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ text-sm"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+            class="Box-sc-g0xbh4-0 mb-2"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Bot"
-              id="Bot"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Bot"
-            >
-              Bot
-            </label>
             <div
-              aria-label="tooltip-Bot"
-              class="Box-sc-g0xbh4-0 relative"
-              data-testid="tooltip-tooltip-Bot"
-              id="tooltip-Bot"
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-search"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
+                class="octicon octicon-search"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -248,74 +125,24 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
                 width="16"
               >
                 <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                  d="M10.68 11.74a6 6 0 0 1-7.922-8.982 6 6 0 0 1 8.982 7.922l3.04 3.04a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215ZM11.5 7a4.499 4.499 0 1 0-8.997 0A4.499 4.499 0 0 0 11.5 7Z"
                 />
               </svg>
-            </div>
-            <span
-              class="Text-sc-17v1xeu-0 ezOLpc px-1.5 py-0.75 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ text-sm"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Organization"
-              id="Organization"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Organization"
-            >
-              Organization
-            </label>
-            <span
-              class="Text-sc-17v1xeu-0 ezOLpc px-1.5 py-0.75 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary"
-            >
-              0
-            </span>
-          </div>
-        </div>
-      </fieldset>
-      <fieldset
-        id="filter-user-handles"
-      >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
-            <div
-              class="Box-sc-g0xbh4-0 mb-2"
-            >
+              <h2
+                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+                sx="[object Object]"
+              >
+                Search
+              </h2>
               <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="handles"
+                aria-label="tooltip-search"
+                class="Box-sc-g0xbh4-0 relative"
+                data-testid="tooltip-tooltip-search"
+                id="tooltip-search"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-mention"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -326,42 +153,13 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
                   width="16"
                 >
                   <path
-                    d="M8 .5a7.499 7.499 0 0 1 7.499 7.462l.002.038v1.164a2.612 2.612 0 0 1-4.783 1.454A3.763 3.763 0 0 1 8 11.776 3.776 3.776 0 1 1 11.776 8v1.164a1.112 1.112 0 0 0 2.225 0L14 8a6 6 0 1 0-3.311 5.365.75.75 0 0 1 .673 1.341A7.5 7.5 0 1 1 8 .5Zm0 5.225a2.275 2.275 0 1 0 0 4.552 2.275 2.275 0 0 0 0-4.552Z"
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                   />
                 </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  Handles
-                </h2>
               </div>
             </div>
-          </legend>
-          <div
-            aria-label="tooltip-filter-handles"
-            class="Box-sc-g0xbh4-0 relative"
-            data-testid="tooltip-tooltip-filter-handles"
-            id="tooltip-filter-handles"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-              />
-            </svg>
           </div>
-        </div>
+        </legend>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
           data-align="stretch"
@@ -381,7 +179,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
             data-wrap="nowrap"
           >
             <div
-              class="Box-sc-g0xbh4-0 font-medium text-gitify-font w-28"
+              class="Box-sc-g0xbh4-0 font-medium text-gitify-font w-20"
             >
               <div
                 class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
@@ -411,34 +209,41 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
                 <span
                   class="Text-sc-17v1xeu-0 ezOLpc"
                 >
-                  Include:
+                  Include
+                  :
                 </span>
               </div>
             </div>
-            <span
-              class="TextInputWrapper__TextInputBaseWrapper-sc-1mqhpbi-0 TextInputWrapper-sc-1mqhpbi-1 khKVBN gesWdT"
-              sx="[object Object]"
+            <div
+              class="Box-sc-g0xbh4-0 keyEPu"
+              flexgrow="1"
+              position="relative"
             >
-              <div
-                class="Box-sc-g0xbh4-0 gYTInF"
-                display="flex"
+              <span
+                class="TextInputWrapper__TextInputBaseWrapper-sc-1mqhpbi-0 TextInputWrapper-sc-1mqhpbi-1 khKVBN gesWdT"
                 sx="[object Object]"
               >
                 <div
-                  class="Box-sc-g0xbh4-0 gffXDM"
+                  class="Box-sc-g0xbh4-0 gYTInF"
+                  display="flex"
                   sx="[object Object]"
                 >
-                  <input
-                    aria-invalid="false"
-                    class="UnstyledTextInput-sc-14ypya-0 iVOvhD"
+                  <div
+                    class="Box-sc-g0xbh4-0 gffXDM"
                     sx="[object Object]"
-                    tabindex="0"
-                    title="Include handles"
-                    type="text"
-                  />
+                  >
+                    <input
+                      aria-invalid="false"
+                      class="UnstyledTextInput-sc-14ypya-0 iVOvhD"
+                      sx="[object Object]"
+                      tabindex="0"
+                      title="Include searches"
+                      type="text"
+                    />
+                  </div>
                 </div>
-              </div>
-            </span>
+              </span>
+            </div>
           </div>
           <div
             class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ text-sm"
@@ -450,7 +255,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
             data-wrap="nowrap"
           >
             <div
-              class="Box-sc-g0xbh4-0 font-medium text-gitify-font w-28"
+              class="Box-sc-g0xbh4-0 font-medium text-gitify-font w-20"
             >
               <div
                 class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
@@ -480,66 +285,92 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
                 <span
                   class="Text-sc-17v1xeu-0 ezOLpc"
                 >
-                  Exclude:
+                  Exclude
+                  :
                 </span>
               </div>
             </div>
-            <span
-              class="TextInputWrapper__TextInputBaseWrapper-sc-1mqhpbi-0 TextInputWrapper-sc-1mqhpbi-1 khKVBN gesWdT"
-              sx="[object Object]"
+            <div
+              class="Box-sc-g0xbh4-0 keyEPu"
+              flexgrow="1"
+              position="relative"
             >
-              <div
-                class="Box-sc-g0xbh4-0 gYTInF"
-                display="flex"
+              <span
+                class="TextInputWrapper__TextInputBaseWrapper-sc-1mqhpbi-0 TextInputWrapper-sc-1mqhpbi-1 khKVBN gesWdT"
                 sx="[object Object]"
               >
                 <div
-                  class="Box-sc-g0xbh4-0 gffXDM"
+                  class="Box-sc-g0xbh4-0 gYTInF"
+                  display="flex"
                   sx="[object Object]"
                 >
-                  <input
-                    aria-invalid="false"
-                    class="UnstyledTextInput-sc-14ypya-0 iVOvhD"
+                  <div
+                    class="Box-sc-g0xbh4-0 gffXDM"
                     sx="[object Object]"
-                    tabindex="0"
-                    title="Exclude handles"
-                    type="text"
-                  />
+                  >
+                    <input
+                      aria-invalid="false"
+                      class="UnstyledTextInput-sc-14ypya-0 iVOvhD"
+                      sx="[object Object]"
+                      tabindex="0"
+                      title="Exclude searches"
+                      type="text"
+                    />
+                  </div>
                 </div>
-              </div>
-            </span>
+              </span>
+            </div>
           </div>
         </div>
       </fieldset>
       <fieldset
-        id="filter-organizations"
+        id="filter-user-types"
       >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
+        <legend>
+          <div
+            class="Box-sc-g0xbh4-0 mb-2"
+          >
             <div
-              class="Box-sc-g0xbh4-0 mb-2"
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-user-type"
             >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-feed-person"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                />
+              </svg>
+              <h2
+                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+                sx="[object Object]"
+              >
+                User Type
+              </h2>
               <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="organizations"
+                aria-label="tooltip-user-type"
+                class="Box-sc-g0xbh4-0 relative"
+                data-testid="tooltip-tooltip-user-type"
+                id="tooltip-user-type"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-organization"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -550,47 +381,18 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
                   width="16"
                 >
                   <path
-                    d="M1.75 16A1.75 1.75 0 0 1 0 14.25V1.75C0 .784.784 0 1.75 0h8.5C11.216 0 12 .784 12 1.75v12.5c0 .085-.006.168-.018.25h2.268a.25.25 0 0 0 .25-.25V8.285a.25.25 0 0 0-.111-.208l-1.055-.703a.749.749 0 1 1 .832-1.248l1.055.703c.487.325.779.871.779 1.456v5.965A1.75 1.75 0 0 1 14.25 16h-3.5a.766.766 0 0 1-.197-.026c-.099.017-.2.026-.303.026h-3a.75.75 0 0 1-.75-.75V14h-1v1.25a.75.75 0 0 1-.75.75Zm-.25-1.75c0 .138.112.25.25.25H4v-1.25a.75.75 0 0 1 .75-.75h2.5a.75.75 0 0 1 .75.75v1.25h2.25a.25.25 0 0 0 .25-.25V1.75a.25.25 0 0 0-.25-.25h-8.5a.25.25 0 0 0-.25.25ZM3.75 6h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1 0-1.5ZM3 3.75A.75.75 0 0 1 3.75 3h.5a.75.75 0 0 1 0 1.5h-.5A.75.75 0 0 1 3 3.75Zm4 3A.75.75 0 0 1 7.75 6h.5a.75.75 0 0 1 0 1.5h-.5A.75.75 0 0 1 7 6.75ZM7.75 3h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1 0-1.5ZM3 9.75A.75.75 0 0 1 3.75 9h.5a.75.75 0 0 1 0 1.5h-.5A.75.75 0 0 1 3 9.75ZM7.75 9h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1 0-1.5Z"
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                   />
                 </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  Organizations
-                </h2>
               </div>
             </div>
-          </legend>
-          <div
-            aria-label="tooltip-filter-organizations"
-            class="Box-sc-g0xbh4-0 relative"
-            data-testid="tooltip-tooltip-filter-organizations"
-            id="tooltip-filter-organizations"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-              />
-            </svg>
           </div>
-        </div>
+        </legend>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
           data-align="stretch"
-          data-direction="vertical"
-          data-gap="condensed"
+          data-direction="horizontal"
+          data-gap="normal"
           data-justify="start"
           data-padding="none"
           data-wrap="nowrap"
@@ -604,64 +406,72 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
             data-padding="none"
             data-wrap="nowrap"
           >
+            <input
+              class="size-4 rounded-sm cursor-pointer"
+              data-testid="checkbox-User"
+              id="User"
+              type="checkbox"
+            />
+            <label
+              class="font-medium text-gitify-font cursor-pointer"
+              for="User"
+            >
+              User
+            </label>
+            <span
+              class="Text-sc-17v1xeu-0 ezOLpc px-1.5 py-0.75 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary"
+            >
+              0
+            </span>
+          </div>
+          <div
+            class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ text-sm"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <input
+              class="size-4 rounded-sm cursor-pointer"
+              data-testid="checkbox-Bot"
+              id="Bot"
+              type="checkbox"
+            />
+            <label
+              class="font-medium text-gitify-font cursor-pointer"
+              for="Bot"
+            >
+              Bot
+            </label>
             <div
-              class="Box-sc-g0xbh4-0 font-medium text-gitify-font w-28"
+              aria-label="tooltip-Bot"
+              class="Box-sc-g0xbh4-0 relative"
+              data-testid="tooltip-tooltip-Bot"
+              id="tooltip-Bot"
             >
-              <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-question text-gitify-tooltip-icon"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
               >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-check-circle-fill text-gitify-icon-open"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm3.78-9.72a.751.751 0 0 0-.018-1.042.751.751 0 0 0-1.042-.018L6.75 9.19 5.28 7.72a.751.751 0 0 0-1.042.018.751.751 0 0 0-.018 1.042l2 2a.75.75 0 0 0 1.06 0Z"
-                  />
-                </svg>
-                <span
-                  class="Text-sc-17v1xeu-0 ezOLpc"
-                >
-                  Include:
-                </span>
-              </div>
+                <path
+                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                />
+              </svg>
             </div>
             <span
-              class="TextInputWrapper__TextInputBaseWrapper-sc-1mqhpbi-0 TextInputWrapper-sc-1mqhpbi-1 khKVBN gesWdT"
-              sx="[object Object]"
+              class="Text-sc-17v1xeu-0 ezOLpc px-1.5 py-0.75 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary"
             >
-              <div
-                class="Box-sc-g0xbh4-0 gYTInF"
-                display="flex"
-                sx="[object Object]"
-              >
-                <div
-                  class="Box-sc-g0xbh4-0 gffXDM"
-                  sx="[object Object]"
-                >
-                  <input
-                    aria-invalid="false"
-                    class="UnstyledTextInput-sc-14ypya-0 iVOvhD"
-                    sx="[object Object]"
-                    tabindex="0"
-                    title="Include organizations"
-                    type="text"
-                  />
-                </div>
-              </div>
+              0
             </span>
           </div>
           <div
@@ -673,64 +483,22 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
             data-padding="none"
             data-wrap="nowrap"
           >
-            <div
-              class="Box-sc-g0xbh4-0 font-medium text-gitify-font w-28"
+            <input
+              class="size-4 rounded-sm cursor-pointer"
+              data-testid="checkbox-Organization"
+              id="Organization"
+              type="checkbox"
+            />
+            <label
+              class="font-medium text-gitify-font cursor-pointer"
+              for="Organization"
             >
-              <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-no-entry-fill text-gitify-icon-closed"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 12 12"
-                  width="16"
-                >
-                  <path
-                    d="M6 0a6 6 0 1 1 0 12A6 6 0 0 1 6 0Zm3 5H3v2h6Z"
-                  />
-                </svg>
-                <span
-                  class="Text-sc-17v1xeu-0 ezOLpc"
-                >
-                  Exclude:
-                </span>
-              </div>
-            </div>
+              Organization
+            </label>
             <span
-              class="TextInputWrapper__TextInputBaseWrapper-sc-1mqhpbi-0 TextInputWrapper-sc-1mqhpbi-1 khKVBN gesWdT"
-              sx="[object Object]"
+              class="Text-sc-17v1xeu-0 ezOLpc px-1.5 py-0.75 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary"
             >
-              <div
-                class="Box-sc-g0xbh4-0 gYTInF"
-                display="flex"
-                sx="[object Object]"
-              >
-                <div
-                  class="Box-sc-g0xbh4-0 gffXDM"
-                  sx="[object Object]"
-                >
-                  <input
-                    aria-invalid="false"
-                    class="UnstyledTextInput-sc-14ypya-0 iVOvhD"
-                    sx="[object Object]"
-                    tabindex="0"
-                    title="Exclude organizations"
-                    type="text"
-                  />
-                </div>
-              </div>
+              0
             </span>
           </div>
         </div>
@@ -738,32 +506,51 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
       <fieldset
         id="filter-subject-type"
       >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
+        <legend>
+          <div
+            class="Box-sc-g0xbh4-0 mb-2"
+          >
             <div
-              class="Box-sc-g0xbh4-0 mb-2"
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-type"
             >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-bell"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
+                />
+              </svg>
+              <h2
+                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+                sx="[object Object]"
+              >
+                Type
+              </h2>
               <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="type"
+                aria-label="tooltip-type"
+                class="Box-sc-g0xbh4-0 relative"
+                data-testid="tooltip-tooltip-type"
+                id="tooltip-type"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-bell"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -774,42 +561,13 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
                   width="16"
                 >
                   <path
-                    d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                   />
                 </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  Type
-                </h2>
               </div>
             </div>
-          </legend>
-          <div
-            aria-label="tooltip-filter-subject-type"
-            class="Box-sc-g0xbh4-0 relative"
-            data-testid="tooltip-tooltip-filter-subject-type"
-            id="tooltip-filter-subject-type"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-              />
-            </svg>
           </div>
-        </div>
+        </legend>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
           data-align="stretch"
@@ -1094,32 +852,54 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
       <fieldset
         id="filter-state"
       >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
+        <legend>
+          <div
+            class="Box-sc-g0xbh4-0 mb-2"
+          >
             <div
-              class="Box-sc-g0xbh4-0 mb-2"
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-state"
             >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-issue-opened"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                />
+                <path
+                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                />
+              </svg>
+              <h2
+                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+                sx="[object Object]"
+              >
+                State
+              </h2>
               <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="state"
+                aria-label="tooltip-state"
+                class="Box-sc-g0xbh4-0 relative"
+                data-testid="tooltip-tooltip-state"
+                id="tooltip-state"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-issue-opened"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1130,45 +910,13 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
                   width="16"
                 >
                   <path
-                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-                  />
-                  <path
-                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                   />
                 </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  State
-                </h2>
               </div>
             </div>
-          </legend>
-          <div
-            aria-label="tooltip-filter-state"
-            class="Box-sc-g0xbh4-0 relative"
-            data-testid="tooltip-tooltip-filter-state"
-            id="tooltip-filter-state"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-              />
-            </svg>
           </div>
-        </div>
+        </legend>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
           data-align="stretch"
@@ -1387,32 +1135,51 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
       <fieldset
         id="filter-reasons"
       >
-        <div
-          class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-          data-align="baseline"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <legend>
+        <legend>
+          <div
+            class="Box-sc-g0xbh4-0 mb-2"
+          >
             <div
-              class="Box-sc-g0xbh4-0 mb-2"
+              class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+              id="title-reason"
             >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-note"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M0 3.75C0 2.784.784 2 1.75 2h12.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25Zm1.75-.25a.25.25 0 0 0-.25.25v8.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25ZM3.5 6.25a.75.75 0 0 1 .75-.75h7a.75.75 0 0 1 0 1.5h-7a.75.75 0 0 1-.75-.75Zm.75 2.25h4a.75.75 0 0 1 0 1.5h-4a.75.75 0 0 1 0-1.5Z"
+                />
+              </svg>
+              <h2
+                class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
+                sx="[object Object]"
+              >
+                Reason
+              </h2>
               <div
-                class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="reason"
+                aria-label="tooltip-reason"
+                class="Box-sc-g0xbh4-0 relative"
+                data-testid="tooltip-tooltip-reason"
+                id="tooltip-reason"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-note"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -1423,42 +1190,13 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
                   width="16"
                 >
                   <path
-                    d="M0 3.75C0 2.784.784 2 1.75 2h12.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25Zm1.75-.25a.25.25 0 0 0-.25.25v8.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25ZM3.5 6.25a.75.75 0 0 1 .75-.75h7a.75.75 0 0 1 0 1.5h-7a.75.75 0 0 1-.75-.75Zm.75 2.25h4a.75.75 0 0 1 0 1.5h-4a.75.75 0 0 1 0-1.5Z"
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
                   />
                 </svg>
-                <h2
-                  class="Heading__StyledHeading-sc-1c1dgg0-0 fokFLB"
-                  sx="[object Object]"
-                >
-                  Reason
-                </h2>
               </div>
             </div>
-          </legend>
-          <div
-            aria-label="tooltip-filter-reasons"
-            class="Box-sc-g0xbh4-0 relative"
-            data-testid="tooltip-tooltip-filter-reasons"
-            id="tooltip-filter-reasons"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-              />
-            </svg>
           </div>
-        </div>
+        </legend>
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
           data-align="stretch"
diff --git a/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap b/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
index ffe4f176a..d64718307 100644
--- a/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
@@ -10,7 +10,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
         data-testid="Login With OAuth App"
       >
         <div
-          class="Box-sc-g0xbh4-0 px-6 py-4"
+          class="Box-sc-g0xbh4-0 pl-4 pr-6 pt-3 pb-1"
         >
           <div
             class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
@@ -60,7 +60,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                   data-justify="start"
                   data-padding="none"
                   data-wrap="nowrap"
-                  id="login-with oauth app"
+                  id="title-login-with oauth app"
                 >
                   <svg
                     aria-hidden="true"
@@ -485,7 +485,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
       data-testid="Login With OAuth App"
     >
       <div
-        class="Box-sc-g0xbh4-0 px-6 py-4"
+        class="Box-sc-g0xbh4-0 pl-4 pr-6 pt-3 pb-1"
       >
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
@@ -535,7 +535,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                 data-justify="start"
                 data-padding="none"
                 data-wrap="nowrap"
-                id="login-with oauth app"
+                id="title-login-with oauth app"
               >
                 <svg
                   aria-hidden="true"
diff --git a/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap b/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
index 8728a3379..cb2e945a2 100644
--- a/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
@@ -10,7 +10,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
         data-testid="Login With Personal Access Token"
       >
         <div
-          class="Box-sc-g0xbh4-0 px-6 py-4"
+          class="Box-sc-g0xbh4-0 pl-4 pr-6 pt-3 pb-1"
         >
           <div
             class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
@@ -60,7 +60,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                   data-justify="start"
                   data-padding="none"
                   data-wrap="nowrap"
-                  id="login-with personal access token"
+                  id="title-login-with personal access token"
                 >
                   <svg
                     aria-hidden="true"
@@ -462,7 +462,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
       data-testid="Login With Personal Access Token"
     >
       <div
-        class="Box-sc-g0xbh4-0 px-6 py-4"
+        class="Box-sc-g0xbh4-0 pl-4 pr-6 pt-3 pb-1"
       >
         <div
           class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
@@ -512,7 +512,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                 data-justify="start"
                 data-padding="none"
                 data-wrap="nowrap"
-                id="login-with personal access token"
+                id="title-login-with personal access token"
               >
                 <svg
                   aria-hidden="true"
diff --git a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
index 543df50cc..9807cd2b1 100644
--- a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
   data-testid="settings"
 >
   <div
-    class="Box-sc-g0xbh4-0 px-6 py-4"
+    class="Box-sc-g0xbh4-0 pl-4 pr-6 pt-3 pb-1"
   >
     <div
       class="Stack__StyledStack-sc-x3xa2i-0 kzRZTJ"
@@ -56,7 +56,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
-            id="settings"
+            id="title-settings"
           >
             <svg
               aria-hidden="true"
@@ -110,7 +110,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
-              id="appearance"
+              id="title-appearance"
             >
               <svg
                 aria-hidden="true"
@@ -481,7 +481,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
-              id="notifications"
+              id="title-notifications"
             >
               <svg
                 aria-hidden="true"
@@ -975,7 +975,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
-              id="system"
+              id="title-system"
             >
               <svg
                 aria-hidden="true"
diff --git a/src/renderer/types.ts b/src/renderer/types.ts
index 9960c43b1..662eec5c8 100644
--- a/src/renderer/types.ts
+++ b/src/renderer/types.ts
@@ -32,9 +32,7 @@ export type Hostname = Branded<string, 'Hostname'>;
 
 export type Link = Branded<string, 'WebUrl'>;
 
-export type UserHandle = Branded<string, 'UserHandle'>;
-
-export type Organization = Branded<string, 'Organization'>;
+export type SearchToken = Branded<string, 'SearchToken'>;
 
 export type Status = 'loading' | 'success' | 'error';
 
@@ -57,12 +55,11 @@ export type SettingsValue =
   | FilterValue[];
 
 export type FilterValue =
-  | Reason
-  | UserType
-  | UserHandle
-  | Organization
   | FilterStateType
-  | SubjectType;
+  | Reason
+  | SearchToken
+  | SubjectType
+  | UserType;
 
 export type SettingsState = AppearanceSettingsState &
   NotificationSettingsState &
@@ -101,11 +98,9 @@ export interface SystemSettingsState {
 }
 
 export interface FilterSettingsState {
+  filterIncludeSearchTokens: SearchToken[];
+  filterExcludeSearchTokens: SearchToken[];
   filterUserTypes: UserType[];
-  filterIncludeHandles: string[];
-  filterExcludeHandles: string[];
-  filterIncludeOrganizations: string[];
-  filterExcludeOrganizations: string[];
   filterSubjectTypes: SubjectType[];
   filterStates: FilterStateType[];
   filterReasons: Reason[];
diff --git a/src/renderer/utils/api/errors.test.ts b/src/renderer/utils/api/errors.test.ts
index da440b18e..1f0ca9d97 100644
--- a/src/renderer/utils/api/errors.test.ts
+++ b/src/renderer/utils/api/errors.test.ts
@@ -1,5 +1,7 @@
 import { AxiosError, type AxiosResponse } from 'axios';
 
+import { EVENTS } from '../../../shared/events';
+
 import type { Link } from '../../types';
 import type { GitHubRESTError } from '../../typesGitHub';
 import { Errors } from '../errors';
@@ -93,6 +95,18 @@ describe('renderer/utils/api/errors.ts', () => {
     });
   });
 
+  it('bad credentials - safe storage', async () => {
+    const mockError: Partial<AxiosError<GitHubRESTError>> = {
+      message: `Error invoking remote method '${EVENTS.SAFE_STORAGE_DECRYPT}': Error: Error while decrypting the ciphertext provided to safeStorage.decryptString. Ciphertext does not appear to be encrypted.`,
+    };
+
+    const result = determineFailureType(
+      mockError as AxiosError<GitHubRESTError>,
+    );
+
+    expect(result).toBe(Errors.BAD_CREDENTIALS);
+  });
+
   it('unknown error', async () => {
     const mockError: Partial<AxiosError<GitHubRESTError>> = {
       code: 'anything',
diff --git a/src/renderer/utils/api/errors.ts b/src/renderer/utils/api/errors.ts
index 71503f9f3..468a63041 100644
--- a/src/renderer/utils/api/errors.ts
+++ b/src/renderer/utils/api/errors.ts
@@ -13,6 +13,10 @@ export function determineFailureType(
     return Errors.NETWORK;
   }
 
+  if (err.message?.includes('safeStorage')) {
+    return Errors.BAD_CREDENTIALS;
+  }
+
   if (code !== AxiosError.ERR_BAD_REQUEST) {
     return Errors.UNKNOWN;
   }
diff --git a/src/renderer/utils/notifications/filters/filter.test.ts b/src/renderer/utils/notifications/filters/filter.test.ts
index 07bd76bfb..5ade78f89 100644
--- a/src/renderer/utils/notifications/filters/filter.test.ts
+++ b/src/renderer/utils/notifications/filters/filter.test.ts
@@ -1,7 +1,8 @@
 import { partialMockNotification } from '../../../__mocks__/partial-mocks';
 import { mockSettings } from '../../../__mocks__/state-mocks';
 import { defaultSettings } from '../../../context/defaults';
-import type { Link, SettingsState } from '../../../types';
+import type { Link, SearchToken, SettingsState } from '../../../types';
+import type { Owner } from '../../../typesGitHub';
 import {
   filterBaseNotifications,
   filterDetailedNotifications,
@@ -15,26 +16,42 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
 
   describe('filterNotifications', () => {
     const mockNotifications = [
-      partialMockNotification({
-        title: 'User authored notification',
-        user: {
-          login: 'github-user',
-          html_url: 'https://github.com/user' as Link,
-          avatar_url:
-            'https://avatars.githubusercontent.com/u/133795385?s=200&v=4' as Link,
-          type: 'User',
+      partialMockNotification(
+        {
+          title: 'User authored notification',
+          user: {
+            login: 'github-user',
+            html_url: 'https://github.com/user' as Link,
+            avatar_url:
+              'https://avatars.githubusercontent.com/u/133795385?s=200&v=4' as Link,
+            type: 'User',
+          },
         },
-      }),
-      partialMockNotification({
-        title: 'Bot authored notification',
-        user: {
-          login: 'github-bot',
-          html_url: 'https://github.com/bot' as Link,
-          avatar_url:
-            'https://avatars.githubusercontent.com/u/133795385?s=200&v=4' as Link,
-          type: 'Bot',
+        {
+          owner: {
+            login: 'gitify-app',
+          } as Owner,
+          full_name: 'gitify-app/gitify',
         },
-      }),
+      ),
+      partialMockNotification(
+        {
+          title: 'Bot authored notification',
+          user: {
+            login: 'github-bot',
+            html_url: 'https://github.com/bot' as Link,
+            avatar_url:
+              'https://avatars.githubusercontent.com/u/133795385?s=200&v=4' as Link,
+            type: 'Bot',
+          },
+        },
+        {
+          owner: {
+            login: 'github',
+          } as Owner,
+          full_name: 'github/github',
+        },
+      ),
     ];
 
     describe('filterBaseNotifications', () => {
@@ -61,6 +78,46 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
         expect(result.length).toBe(1);
         expect(result).toEqual([mockNotifications[1]]);
       });
+
+      it('should filter notifications that match include organization', async () => {
+        const result = filterBaseNotifications(mockNotifications, {
+          ...mockSettings,
+          filterIncludeSearchTokens: ['org:gitify-app' as SearchToken],
+        });
+
+        expect(result.length).toBe(1);
+        expect(result).toEqual([mockNotifications[0]]);
+      });
+
+      it('should filter notifications that match exclude organization', async () => {
+        const result = filterBaseNotifications(mockNotifications, {
+          ...mockSettings,
+          filterExcludeSearchTokens: ['org:github' as SearchToken],
+        });
+
+        expect(result.length).toBe(1);
+        expect(result).toEqual([mockNotifications[0]]);
+      });
+
+      it('should filter notifications that match include repository', async () => {
+        const result = filterBaseNotifications(mockNotifications, {
+          ...mockSettings,
+          filterIncludeSearchTokens: ['repo:gitify-app/gitify' as SearchToken],
+        });
+
+        expect(result.length).toBe(1);
+        expect(result).toEqual([mockNotifications[0]]);
+      });
+
+      it('should filter notifications that match exclude repository', async () => {
+        const result = filterBaseNotifications(mockNotifications, {
+          ...mockSettings,
+          filterExcludeSearchTokens: ['repo:github/github' as SearchToken],
+        });
+
+        expect(result.length).toBe(1);
+        expect(result).toEqual([mockNotifications[0]]);
+      });
     });
 
     describe('filterDetailedNotifications', () => {
@@ -69,8 +126,8 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
           ...mockSettings,
           detailedNotifications: false,
           filterUserTypes: ['Bot'],
-          filterIncludeHandles: ['github-user'],
-          filterExcludeHandles: ['github-bot'],
+          filterIncludeSearchTokens: ['author:github-user' as SearchToken],
+          filterExcludeSearchTokens: ['author:github-bot' as SearchToken],
           filterStates: ['merged'],
         });
 
@@ -89,22 +146,22 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
         expect(result).toEqual([mockNotifications[1]]);
       });
 
-      it('should filter notifications that match include user handle', async () => {
+      it('should filter notifications that match include author handle', async () => {
         const result = filterDetailedNotifications(mockNotifications, {
           ...mockSettings,
           detailedNotifications: true,
-          filterIncludeHandles: ['github-user'],
+          filterIncludeSearchTokens: ['author:github-user' as SearchToken],
         });
 
         expect(result.length).toBe(1);
         expect(result).toEqual([mockNotifications[0]]);
       });
 
-      it('should filter notifications that match exclude user handle', async () => {
+      it('should filter notifications that match exclude author handle', async () => {
         const result = filterDetailedNotifications(mockNotifications, {
           ...mockSettings,
           detailedNotifications: true,
-          filterExcludeHandles: ['github-bot'],
+          filterExcludeSearchTokens: ['author:github-bot' as SearchToken],
         });
 
         expect(result.length).toBe(1);
@@ -122,76 +179,6 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
         expect(result.length).toBe(1);
         expect(result).toEqual([mockNotifications[1]]);
       });
-
-      it('should filter notifications that match include organization', async () => {
-        // Initialize repository owner structure if it doesn't exist
-        if (!mockNotifications[0].repository) {
-          mockNotifications[0].repository = {} as any;
-        }
-        if (!mockNotifications[0].repository.owner) {
-          mockNotifications[0].repository.owner = {} as any;
-        }
-        if (!mockNotifications[1].repository) {
-          mockNotifications[1].repository = {} as any;
-        }
-        if (!mockNotifications[1].repository.owner) {
-          mockNotifications[1].repository.owner = {} as any;
-        }
-
-        mockNotifications[0].repository.owner.login = 'microsoft';
-        mockNotifications[1].repository.owner.login = 'github';
-
-        // Apply base filtering first (where organization filtering now happens)
-        let result = filterBaseNotifications(mockNotifications, {
-          ...mockSettings,
-          filterIncludeOrganizations: ['microsoft'],
-        });
-
-        // Then apply detailed filtering
-        result = filterDetailedNotifications(result, {
-          ...mockSettings,
-          detailedNotifications: true,
-          filterIncludeOrganizations: ['microsoft'],
-        });
-
-        expect(result.length).toBe(1);
-        expect(result).toEqual([mockNotifications[0]]);
-      });
-
-      it('should filter notifications that match exclude organization', async () => {
-        // Initialize repository owner structure if it doesn't exist
-        if (!mockNotifications[0].repository) {
-          mockNotifications[0].repository = {} as any;
-        }
-        if (!mockNotifications[0].repository.owner) {
-          mockNotifications[0].repository.owner = {} as any;
-        }
-        if (!mockNotifications[1].repository) {
-          mockNotifications[1].repository = {} as any;
-        }
-        if (!mockNotifications[1].repository.owner) {
-          mockNotifications[1].repository.owner = {} as any;
-        }
-
-        mockNotifications[0].repository.owner.login = 'microsoft';
-        mockNotifications[1].repository.owner.login = 'github';
-
-        // Apply base filtering first (where organization filtering now happens)
-        let result = filterBaseNotifications(mockNotifications, {
-          ...mockSettings,
-          filterExcludeOrganizations: ['github'],
-        });
-
-        // Then apply detailed filtering
-        result = filterDetailedNotifications(result, {
-          ...mockSettings,
-          detailedNotifications: true,
-          filterExcludeOrganizations: ['github'],
-        });
-
-        expect(result.length).toBe(1);
-        expect(result).toEqual([mockNotifications[0]]);
-      });
     });
   });
 
@@ -200,42 +187,26 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
       expect(hasAnyFiltersSet(defaultSettings)).toBe(false);
     });
 
-    it('non-default user type filters', () => {
-      const settings: SettingsState = {
-        ...defaultSettings,
-        filterUserTypes: ['Bot'],
-      };
-      expect(hasAnyFiltersSet(settings)).toBe(true);
-    });
-
-    it('non-default user handle includes filters', () => {
-      const settings: SettingsState = {
-        ...defaultSettings,
-        filterIncludeHandles: ['gitify'],
-      };
-      expect(hasAnyFiltersSet(settings)).toBe(true);
-    });
-
-    it('non-default user handle excludes filters', () => {
+    it('non-default search token includes filters', () => {
       const settings: SettingsState = {
         ...defaultSettings,
-        filterExcludeHandles: ['gitify'],
+        filterIncludeSearchTokens: ['author:gitify' as SearchToken],
       };
       expect(hasAnyFiltersSet(settings)).toBe(true);
     });
 
-    it('non-default organization includes filters', () => {
+    it('non-default search token excludes filters', () => {
       const settings: SettingsState = {
         ...defaultSettings,
-        filterIncludeOrganizations: ['microsoft'],
+        filterExcludeSearchTokens: ['org:github' as SearchToken],
       };
       expect(hasAnyFiltersSet(settings)).toBe(true);
     });
 
-    it('non-default organization excludes filters', () => {
+    it('non-default user type filters', () => {
       const settings: SettingsState = {
         ...defaultSettings,
-        filterExcludeOrganizations: ['github'],
+        filterUserTypes: ['Bot'],
       };
       expect(hasAnyFiltersSet(settings)).toBe(true);
     });
diff --git a/src/renderer/utils/notifications/filters/filter.ts b/src/renderer/utils/notifications/filters/filter.ts
index 5961dbcc7..2c1c93011 100644
--- a/src/renderer/utils/notifications/filters/filter.ts
+++ b/src/renderer/utils/notifications/filters/filter.ts
@@ -5,13 +5,13 @@ import type {
   SubjectUser,
 } from '../../../typesGitHub';
 import {
-  filterNotificationByHandle,
-  filterNotificationByOrganization,
-  hasExcludeHandleFilters,
-  hasExcludeOrganizationFilters,
-  hasIncludeHandleFilters,
-  hasIncludeOrganizationFilters,
+  BASE_SEARCH_QUALIFIERS,
+  DETAILED_ONLY_SEARCH_QUALIFIERS,
+  filterNotificationBySearchTerm,
+  hasExcludeSearchFilters,
+  hasIncludeSearchFilters,
   reasonFilter,
+  type SearchQualifier,
   stateFilter,
   subjectTypeFilter,
   userTypeFilter,
@@ -24,8 +24,16 @@ export function filterBaseNotifications(
   return notifications.filter((notification) => {
     let passesFilters = true;
 
-    passesFilters =
-      passesFilters && passesOrganizationFilters(notification, settings);
+    // Apply base qualifier include/exclude filters (org, repo, etc.)
+    for (const qualifier of BASE_SEARCH_QUALIFIERS) {
+      if (!passesFilters) {
+        break;
+      }
+
+      passesFilters =
+        passesFilters &&
+        passesSearchTokenFiltersForQualifier(notification, settings, qualifier);
+    }
 
     if (subjectTypeFilter.hasFilters(settings)) {
       passesFilters =
@@ -69,69 +77,77 @@ export function filterDetailedNotifications(
 export function hasAnyFiltersSet(settings: SettingsState): boolean {
   return (
     userTypeFilter.hasFilters(settings) ||
-    hasIncludeHandleFilters(settings) ||
-    hasExcludeHandleFilters(settings) ||
-    hasIncludeOrganizationFilters(settings) ||
-    hasExcludeOrganizationFilters(settings) ||
+    hasIncludeSearchFilters(settings) ||
+    hasExcludeSearchFilters(settings) ||
     subjectTypeFilter.hasFilters(settings) ||
     stateFilter.hasFilters(settings) ||
     reasonFilter.hasFilters(settings)
   );
 }
 
-function passesUserFilters(
+/**
+ * Apply include/exclude search token logic for a specific search qualifier prefix.
+ */
+function passesSearchTokenFiltersForQualifier(
   notification: Notification,
   settings: SettingsState,
+  qualifier: SearchQualifier,
 ): boolean {
-  let passesFilters = true;
-
-  if (userTypeFilter.hasFilters(settings)) {
-    passesFilters =
-      passesFilters &&
-      settings.filterUserTypes.some((userType) =>
-        userTypeFilter.filterNotification(notification, userType),
-      );
-  }
+  let passes = true;
+  const prefix = qualifier.prefix;
 
-  if (hasIncludeHandleFilters(settings)) {
-    passesFilters =
-      passesFilters &&
-      settings.filterIncludeHandles.some((handle) =>
-        filterNotificationByHandle(notification, handle),
-      );
+  if (hasIncludeSearchFilters(settings)) {
+    const includeTokens = settings.filterIncludeSearchTokens.filter((t) =>
+      t.startsWith(prefix),
+    );
+    if (includeTokens.length > 0) {
+      passes =
+        passes &&
+        includeTokens.some((token) =>
+          filterNotificationBySearchTerm(notification, token),
+        );
+    }
   }
 
-  if (hasExcludeHandleFilters(settings)) {
-    passesFilters =
-      passesFilters &&
-      !settings.filterExcludeHandles.some((handle) =>
-        filterNotificationByHandle(notification, handle),
-      );
+  if (hasExcludeSearchFilters(settings)) {
+    const excludeTokens = settings.filterExcludeSearchTokens.filter((t) =>
+      t.startsWith(prefix),
+    );
+    if (excludeTokens.length > 0) {
+      passes =
+        passes &&
+        !excludeTokens.some((token) =>
+          filterNotificationBySearchTerm(notification, token),
+        );
+    }
   }
 
-  return passesFilters;
+  return passes;
 }
 
-function passesOrganizationFilters(
+function passesUserFilters(
   notification: Notification,
   settings: SettingsState,
 ): boolean {
   let passesFilters = true;
 
-  if (hasIncludeOrganizationFilters(settings)) {
+  if (userTypeFilter.hasFilters(settings)) {
     passesFilters =
       passesFilters &&
-      settings.filterIncludeOrganizations.some((organization) =>
-        filterNotificationByOrganization(notification, organization),
+      settings.filterUserTypes.some((userType) =>
+        userTypeFilter.filterNotification(notification, userType),
       );
   }
 
-  if (hasExcludeOrganizationFilters(settings)) {
+  // Apply detailed-only qualifier search token filters (e.g. author)
+  for (const qualifier of DETAILED_ONLY_SEARCH_QUALIFIERS) {
+    if (!passesFilters) {
+      break;
+    }
+
     passesFilters =
       passesFilters &&
-      !settings.filterExcludeOrganizations.some((organization) =>
-        filterNotificationByOrganization(notification, organization),
-      );
+      passesSearchTokenFiltersForQualifier(notification, settings, qualifier);
   }
 
   return passesFilters;
diff --git a/src/renderer/utils/notifications/filters/handles.ts b/src/renderer/utils/notifications/filters/handles.ts
deleted file mode 100644
index 2fe743d29..000000000
--- a/src/renderer/utils/notifications/filters/handles.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { SettingsState } from '../../../types';
-import type { Notification } from '../../../typesGitHub';
-
-export function hasIncludeHandleFilters(settings: SettingsState) {
-  return settings.filterIncludeHandles.length > 0;
-}
-
-export function hasExcludeHandleFilters(settings: SettingsState) {
-  return settings.filterExcludeHandles.length > 0;
-}
-
-export function filterNotificationByHandle(
-  notification: Notification,
-  handleName: string,
-): boolean {
-  return notification.subject?.user?.login === handleName;
-}
diff --git a/src/renderer/utils/notifications/filters/index.ts b/src/renderer/utils/notifications/filters/index.ts
index 422bd4e12..f630337d9 100644
--- a/src/renderer/utils/notifications/filters/index.ts
+++ b/src/renderer/utils/notifications/filters/index.ts
@@ -1,6 +1,5 @@
-export * from './handles';
-export * from './organizations';
 export * from './reason';
+export * from './search';
 export * from './state';
 export * from './subjectType';
 export * from './types';
diff --git a/src/renderer/utils/notifications/filters/organizations.test.ts b/src/renderer/utils/notifications/filters/organizations.test.ts
deleted file mode 100644
index d520e1653..000000000
--- a/src/renderer/utils/notifications/filters/organizations.test.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { mockSettings } from '../../../__mocks__/state-mocks';
-import type { Notification } from '../../../typesGitHub';
-import {
-  filterNotificationByOrganization,
-  hasExcludeOrganizationFilters,
-  hasIncludeOrganizationFilters,
-} from './organizations';
-
-describe('utils/notifications/filters/organizations.ts', () => {
-  it('should check if include organization filters exist', () => {
-    const settingsWithInclude = {
-      ...mockSettings,
-      filterIncludeOrganizations: ['microsoft'],
-    };
-
-    expect(hasIncludeOrganizationFilters(mockSettings)).toBe(false);
-    expect(hasIncludeOrganizationFilters(settingsWithInclude)).toBe(true);
-  });
-
-  it('should check if exclude organization filters exist', () => {
-    const settingsWithExclude = {
-      ...mockSettings,
-      filterExcludeOrganizations: ['github'],
-    };
-
-    expect(hasExcludeOrganizationFilters(mockSettings)).toBe(false);
-    expect(hasExcludeOrganizationFilters(settingsWithExclude)).toBe(true);
-  });
-
-  it('should filter notification by organization', () => {
-    const notification = {
-      repository: {
-        owner: {
-          login: 'microsoft',
-        },
-      },
-    } as Notification;
-
-    expect(filterNotificationByOrganization(notification, 'microsoft')).toBe(
-      true,
-    );
-    expect(filterNotificationByOrganization(notification, 'github')).toBe(
-      false,
-    );
-  });
-});
diff --git a/src/renderer/utils/notifications/filters/organizations.ts b/src/renderer/utils/notifications/filters/organizations.ts
deleted file mode 100644
index 5084fa574..000000000
--- a/src/renderer/utils/notifications/filters/organizations.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import type { SettingsState } from '../../../types';
-import type { Notification } from '../../../typesGitHub';
-
-export function hasIncludeOrganizationFilters(settings: SettingsState) {
-  return settings.filterIncludeOrganizations.length > 0;
-}
-
-export function hasExcludeOrganizationFilters(settings: SettingsState) {
-  return settings.filterExcludeOrganizations.length > 0;
-}
-
-export function filterNotificationByOrganization(
-  notification: Notification,
-  organizationName: string,
-): boolean {
-  return (
-    notification.repository.owner.login.toLowerCase() ===
-    organizationName.toLowerCase()
-  );
-}
diff --git a/src/renderer/utils/notifications/filters/search.test.ts b/src/renderer/utils/notifications/filters/search.test.ts
new file mode 100644
index 000000000..3b590925b
--- /dev/null
+++ b/src/renderer/utils/notifications/filters/search.test.ts
@@ -0,0 +1,122 @@
+import { partialMockNotification } from '../../../__mocks__/partial-mocks';
+import type { Link } from '../../../types';
+import type { Owner } from '../../../typesGitHub';
+import {
+  ALL_SEARCH_QUALIFIERS,
+  filterNotificationBySearchTerm,
+  parseSearchInput,
+} from './search';
+
+// (helper removed – no longer used)
+
+describe('renderer/utils/notifications/filters/search.ts', () => {
+  describe('parseSearchInput (prefix matching behavior)', () => {
+    it('returns null for empty string', () => {
+      expect(parseSearchInput('')).toBeNull();
+    });
+
+    it('returns null when no qualifier prefix matches', () => {
+      expect(parseSearchInput('unknown:value')).toBeNull();
+      expect(parseSearchInput('auth:foo')).toBeNull(); // near miss
+    });
+
+    it('matches each known qualifier by its exact prefix and additional value', () => {
+      for (const q of ALL_SEARCH_QUALIFIERS) {
+        const token = q.prefix + 'someValue';
+        const parsed = parseSearchInput(token);
+        expect(parsed).not.toBeNull();
+        expect(parsed?.qualifier).toBe(q);
+      }
+    });
+
+    it('does not match when prefix appears later in the token', () => {
+      expect(parseSearchInput('xauthor:foo')).toBeNull();
+      expect(parseSearchInput('xxorg:bar')).toBeNull();
+    });
+  });
+
+  describe('filterNotificationBySearchTerm', () => {
+    const mockNotification = partialMockNotification(
+      {
+        title: 'User authored notification',
+        user: {
+          login: 'github-user',
+          html_url: 'https://github.com/user' as Link,
+          avatar_url:
+            'https://avatars.githubusercontent.com/u/133795385?s=200&v=4' as Link,
+          type: 'User',
+        },
+      },
+      {
+        owner: {
+          login: 'gitify-app',
+        } as Owner,
+        full_name: 'gitify-app/gitify',
+      },
+    );
+
+    it('matches author qualifier (case-insensitive)', () => {
+      expect(
+        filterNotificationBySearchTerm(mockNotification, 'author:github-user'),
+      ).toBe(true);
+
+      expect(
+        filterNotificationBySearchTerm(mockNotification, 'author:GITHUB-USER'),
+      ).toBe(true);
+
+      expect(
+        filterNotificationBySearchTerm(mockNotification, 'author:some-bot'),
+      ).toBe(false);
+    });
+
+    it('matches org qualifier (case-insensitive)', () => {
+      expect(
+        filterNotificationBySearchTerm(mockNotification, 'org:gitify-app'),
+      ).toBe(true);
+
+      expect(
+        filterNotificationBySearchTerm(mockNotification, 'org:GITIFY-APP'),
+      ).toBe(true);
+
+      expect(
+        filterNotificationBySearchTerm(mockNotification, 'org:github'),
+      ).toBe(false);
+    });
+
+    it('matches repo qualifier (case-insensitive full_name)', () => {
+      expect(
+        filterNotificationBySearchTerm(
+          mockNotification,
+          'repo:gitify-app/gitify',
+        ),
+      ).toBe(true);
+
+      expect(
+        filterNotificationBySearchTerm(
+          mockNotification,
+          'repo:Gitify-App/Gitify',
+        ),
+      ).toBe(true);
+
+      expect(
+        filterNotificationBySearchTerm(mockNotification, 'repo:github/other'),
+      ).toBe(false);
+    });
+
+    it('returns false for unknown qualifier', () => {
+      expect(
+        filterNotificationBySearchTerm(mockNotification, 'unknown:thing'),
+      ).toBe(false);
+    });
+
+    it('returns false for empty value', () => {
+      expect(filterNotificationBySearchTerm(mockNotification, 'repo:')).toBe(
+        false,
+      );
+    });
+
+    it('returns false for empty token', () => {
+      expect(filterNotificationBySearchTerm(mockNotification, '')).toBe(false);
+    });
+  });
+});
diff --git a/src/renderer/utils/notifications/filters/search.ts b/src/renderer/utils/notifications/filters/search.ts
new file mode 100644
index 000000000..16e8ce87a
--- /dev/null
+++ b/src/renderer/utils/notifications/filters/search.ts
@@ -0,0 +1,95 @@
+import type { SettingsState } from '../../../types';
+import type { Notification } from '../../../typesGitHub';
+
+export const SEARCH_DELIMITER = ':';
+
+const SEARCH_QUALIFIERS = {
+  author: {
+    prefix: 'author:',
+    description: 'filter by notification author',
+    requiresDetailsNotifications: true,
+    extract: (n: Notification) => n.subject?.user?.login,
+  },
+  org: {
+    prefix: 'org:',
+    description: 'filter by organization owner',
+    requiresDetailsNotifications: false,
+    extract: (n: Notification) => n.repository?.owner?.login,
+  },
+  repo: {
+    prefix: 'repo:',
+    description: 'filter by repository full name',
+    requiresDetailsNotifications: false,
+    extract: (n: Notification) => n.repository?.full_name,
+  },
+} as const;
+
+export type SearchQualifierKey = keyof typeof SEARCH_QUALIFIERS;
+export type SearchQualifier = (typeof SEARCH_QUALIFIERS)[SearchQualifierKey];
+export type SearchPrefix = SearchQualifier['prefix'];
+
+export const ALL_SEARCH_QUALIFIERS: readonly SearchQualifier[] = Object.values(
+  SEARCH_QUALIFIERS,
+) as readonly SearchQualifier[];
+
+export const BASE_SEARCH_QUALIFIERS: readonly SearchQualifier[] =
+  ALL_SEARCH_QUALIFIERS.filter((q) => !q.requiresDetailsNotifications);
+
+export const DETAILED_ONLY_SEARCH_QUALIFIERS: readonly SearchQualifier[] =
+  ALL_SEARCH_QUALIFIERS.filter((q) => q.requiresDetailsNotifications);
+
+export function hasIncludeSearchFilters(settings: SettingsState) {
+  return settings.filterIncludeSearchTokens.length > 0;
+}
+
+export function hasExcludeSearchFilters(settings: SettingsState) {
+  return settings.filterExcludeSearchTokens.length > 0;
+}
+
+export interface ParsedSearchToken {
+  qualifier: SearchQualifier; // matched qualifier
+  value: string; // original-case value after prefix
+  valueLower: string; // lowercase cached
+  token: string; // canonical stored token (prefix + value)
+}
+
+export function parseSearchInput(raw: string): ParsedSearchToken | null {
+  const trimmed = raw.trim();
+  if (!trimmed) {
+    return null;
+  }
+
+  const lower = trimmed.toLowerCase();
+
+  for (const qualifier of ALL_SEARCH_QUALIFIERS) {
+    if (lower.startsWith(qualifier.prefix)) {
+      const valuePart = trimmed.slice(qualifier.prefix.length).trim();
+      if (!valuePart) {
+        return null;
+      }
+
+      const token = qualifier.prefix + valuePart;
+      return {
+        qualifier,
+        value: valuePart,
+        valueLower: valuePart.toLowerCase(),
+        token,
+      };
+    }
+  }
+  return null;
+}
+
+export function filterNotificationBySearchTerm(
+  notification: Notification,
+  token: string,
+): boolean {
+  const parsed = parseSearchInput(token);
+
+  if (!parsed) {
+    return false;
+  }
+
+  const fieldValue = parsed.qualifier.extract(notification);
+  return fieldValue?.toLowerCase() === parsed.valueLower;
+}
diff --git a/src/renderer/utils/notifications/handlers/checkSuite.ts b/src/renderer/utils/notifications/handlers/checkSuite.ts
index df38346b5..e4a6fcf36 100644
--- a/src/renderer/utils/notifications/handlers/checkSuite.ts
+++ b/src/renderer/utils/notifications/handlers/checkSuite.ts
@@ -77,7 +77,7 @@ export function getCheckSuiteAttributes(
 
   return {
     workflowName,
-    attemptNumber: attemptNumber ? Number.parseInt(attemptNumber) : null,
+    attemptNumber: attemptNumber ? Number.parseInt(attemptNumber, 10) : null,
     status: getCheckSuiteStatus(statusDisplayName),
     statusDisplayName,
     branchName,
diff --git a/src/renderer/utils/notifications/native.test.ts b/src/renderer/utils/notifications/native.test.ts
index b1626dd43..37933406f 100644
--- a/src/renderer/utils/notifications/native.test.ts
+++ b/src/renderer/utils/notifications/native.test.ts
@@ -5,11 +5,6 @@ import {
 import { mockAuth } from '../../__mocks__/state-mocks';
 import { defaultSettings } from '../../context/defaults';
 import type { SettingsState } from '../../types';
-import {
-  mockGitHubNotifications,
-  mockSingleNotification,
-} from '../api/__mocks__/response-mocks';
-import * as links from '../links';
 import * as native from './native';
 
 const raiseSoundNotificationMock = jest.spyOn(native, 'raiseSoundNotification');
@@ -33,6 +28,17 @@ describe('renderer/utils/notifications/native.ts', () => {
       });
 
       expect(window.gitify.raiseNativeNotification).toHaveBeenCalledTimes(1);
+      expect(window.gitify.raiseNativeNotification).toHaveBeenCalledWith(
+        expect.stringContaining(
+          mockSingleAccountNotifications[0].notifications[0].repository
+            .full_name,
+        ),
+        expect.stringContaining(
+          mockSingleAccountNotifications[0].notifications[0].subject.title,
+        ),
+        null,
+      );
+
       expect(raiseSoundNotificationMock).toHaveBeenCalledTimes(1);
       expect(raiseSoundNotificationMock).toHaveBeenCalledWith(0.2);
     });
@@ -50,6 +56,12 @@ describe('renderer/utils/notifications/native.ts', () => {
       });
 
       expect(window.gitify.raiseNativeNotification).toHaveBeenCalledTimes(1);
+      expect(window.gitify.raiseNativeNotification).toHaveBeenCalledWith(
+        'Gitify',
+        'You have 4 notifications',
+        null,
+      );
+
       expect(raiseSoundNotificationMock).toHaveBeenCalledTimes(1);
       expect(raiseSoundNotificationMock).toHaveBeenCalledWith(0.2);
     });
@@ -104,30 +116,4 @@ describe('renderer/utils/notifications/native.ts', () => {
       expect(window.gitify.raiseNativeNotification).not.toHaveBeenCalled();
     });
   });
-
-  describe.skip('raiseNativeNotification', () => {
-    it('should click on a native notification (with 1 notification)', () => {
-      jest.spyOn(links, 'openNotification');
-
-      const nativeNotification: Notification = native.raiseNativeNotification([
-        mockSingleNotification,
-      ]);
-      nativeNotification.onclick(null);
-
-      expect(links.openNotification).toHaveBeenCalledTimes(1);
-      expect(links.openNotification).toHaveBeenLastCalledWith(
-        mockSingleNotification,
-      );
-      expect(window.gitify.app.hide).toHaveBeenCalledTimes(1);
-    });
-
-    it('should click on a native notification (with more than 1 notification)', () => {
-      const nativeNotification = native.raiseNativeNotification(
-        mockGitHubNotifications,
-      );
-      nativeNotification.onclick(null);
-
-      expect(window.gitify.app.show).toHaveBeenCalledTimes(1);
-    });
-  });
 });
diff --git a/src/renderer/utils/notifications/native.ts b/src/renderer/utils/notifications/native.ts
index fcf804c4c..cee3e8638 100644
--- a/src/renderer/utils/notifications/native.ts
+++ b/src/renderer/utils/notifications/native.ts
@@ -65,7 +65,7 @@ export const raiseNativeNotification = (notifications: Notification[]) => {
     // TODO FIXME = set url to notification url
   } else {
     title = APPLICATION.NAME;
-    body = `You have ${notifications.length} notifications.`;
+    body = `You have ${notifications.length} notifications`;
   }
 
   return window.gitify.raiseNativeNotification(title, body, url);
diff --git a/src/renderer/utils/zoom.ts b/src/renderer/utils/zoom.ts
index 17bdbf8ec..290e9edb8 100644
--- a/src/renderer/utils/zoom.ts
+++ b/src/renderer/utils/zoom.ts
@@ -7,7 +7,10 @@ const MULTIPLIER = 2;
  * @returns zoomLevel -2 to 0.5
  */
 export const zoomPercentageToLevel = (percentage: number): number => {
-  if (typeof percentage === 'undefined') return 0;
+  if (typeof percentage === 'undefined') {
+    return 0;
+  }
+
   return ((percentage - RECOMMENDED) * MULTIPLIER) / 100;
 };
 
@@ -17,6 +20,9 @@ export const zoomPercentageToLevel = (percentage: number): number => {
  * @returns percentage 0-150
  */
 export const zoomLevelToPercentage = (zoom: number): number => {
-  if (typeof zoom === 'undefined') return 100;
+  if (typeof zoom === 'undefined') {
+    return 100;
+  }
+
   return (zoom / MULTIPLIER) * 100 + RECOMMENDED;
 };