From 40fba3e26be2380846fb528eee81a461383c9309 Mon Sep 17 00:00:00 2001
From: Adam Setch <adam.setch@outlook.com>
Date: Sat, 8 Nov 2025 15:07:43 -0500
Subject: [PATCH] refactor(filters): sort sections by title

Signed-off-by: Adam Setch <adam.setch@outlook.com>
---
 .../components/filters/FilterSection.tsx      |  59 +-
 .../__snapshots__/FilterSection.test.tsx.snap | 514 +++++++++---------
 .../__snapshots__/ReasonFilter.test.tsx.snap  | 308 +++++------
 .../__snapshots__/StateFilter.test.tsx.snap   | 172 +++---
 .../SubjectTypeFilter.test.tsx.snap           | 116 ++--
 .../UserTypeFilter.test.tsx.snap              | 108 ++--
 .../__snapshots__/Filters.test.tsx.snap       | 338 ++++++------
 7 files changed, 813 insertions(+), 802 deletions(-)

diff --git a/src/renderer/components/filters/FilterSection.tsx b/src/renderer/components/filters/FilterSection.tsx
index 9fc98e521..6173d89cd 100644
--- a/src/renderer/components/filters/FilterSection.tsx
+++ b/src/renderer/components/filters/FilterSection.tsx
@@ -53,31 +53,42 @@ export const FilterSection = <T extends FilterValue>({
         direction={layout}
         gap={layout === 'horizontal' ? 'normal' : 'condensed'}
       >
-        {(Object.keys(filter.FILTER_TYPES) as T[]).map((type) => {
-          const typeDetails = filter.getTypeDetails(type);
-          const typeTitle = typeDetails.title;
-          const typeDescription = typeDetails.description;
-          const isChecked = filter.isFilterSet(settings, type);
-          const count = filter.getFilterCount(notifications, type);
+        {(Object.keys(filter.FILTER_TYPES) as T[])
+          .sort((a, b) =>
+            filter
+              .getTypeDetails(a)
+              .title.toLocaleLowerCase()
+              .localeCompare(
+                filter.getTypeDetails(b).title.toLocaleLowerCase(),
+              ),
+          )
+          .map((type) => {
+            const typeDetails = filter.getTypeDetails(type);
+            const typeTitle = typeDetails.title;
+            const typeDescription = typeDetails.description;
+            const isChecked = filter.isFilterSet(settings, type);
+            const count = filter.getFilterCount(notifications, type);
 
-          return (
-            <Checkbox
-              checked={isChecked}
-              counter={count}
-              disabled={
-                filter.requiresDetailsNotifications &&
-                !settings.detailedNotifications
-              }
-              key={type as string}
-              label={typeTitle}
-              name={typeTitle}
-              onChange={(evt) =>
-                updateFilter(filterSetting, type, evt.target.checked)
-              }
-              tooltip={typeDescription ? <Text>{typeDescription}</Text> : null}
-            />
-          );
-        })}
+            return (
+              <Checkbox
+                checked={isChecked}
+                counter={count}
+                disabled={
+                  filter.requiresDetailsNotifications &&
+                  !settings.detailedNotifications
+                }
+                key={type as string}
+                label={typeTitle}
+                name={typeTitle}
+                onChange={(evt) =>
+                  updateFilter(filterSetting, type, evt.target.checked)
+                }
+                tooltip={
+                  typeDescription ? <Text>{typeDescription}</Text> : null
+                }
+              />
+            );
+          })}
       </Stack>
     </fieldset>
   );
diff --git a/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap b/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap
index 4ce63e022..965a83f10 100644
--- a/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap
@@ -21,49 +21,22 @@ exports[`renderer/components/filters/FilterSection.tsx should be able to toggle
   >
     <input
       class="size-2 rounded-sm cursor-pointer"
-      data-testid="checkbox-Draft"
-      id="Draft"
-      type="checkbox"
-    />
-    <label
-      class="font-medium text-gitify-font cursor-pointer"
-      for="Draft"
-    >
-      Draft
-    </label>
-    <span
-      class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-    >
-      0
-    </span>
-  </div>
-  <div
-    class="text-sm prc-Stack-Stack-WJVsK"
-    data-align="center"
-    data-direction="horizontal"
-    data-gap="condensed"
-    data-justify="start"
-    data-padding="none"
-    data-wrap="nowrap"
-  >
-    <input
-      class="size-2 rounded-sm cursor-pointer"
-      data-testid="checkbox-Open"
-      id="Open"
+      data-testid="checkbox-Closed"
+      id="Closed"
       type="checkbox"
     />
     <label
       class="font-medium text-gitify-font cursor-pointer"
-      for="Open"
+      for="Closed"
     >
-      Open
+      Closed
     </label>
     <button
       aria-expanded="false"
       aria-haspopup="true"
-      aria-label="tooltip-Open"
-      data-testid="tooltip-tooltip-Open"
-      id="tooltip-Open"
+      aria-label="tooltip-Closed"
+      data-testid="tooltip-tooltip-Closed"
+      id="tooltip-Closed"
       tabindex="0"
       type="button"
     >
@@ -90,6 +63,33 @@ exports[`renderer/components/filters/FilterSection.tsx should be able to toggle
       0
     </span>
   </div>
+  <div
+    class="text-sm prc-Stack-Stack-WJVsK"
+    data-align="center"
+    data-direction="horizontal"
+    data-gap="condensed"
+    data-justify="start"
+    data-padding="none"
+    data-wrap="nowrap"
+  >
+    <input
+      class="size-2 rounded-sm cursor-pointer"
+      data-testid="checkbox-Draft"
+      id="Draft"
+      type="checkbox"
+    />
+    <label
+      class="font-medium text-gitify-font cursor-pointer"
+      for="Draft"
+    >
+      Draft
+    </label>
+    <span
+      class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+    >
+      0
+    </span>
+  </div>
   <div
     class="text-sm prc-Stack-Stack-WJVsK"
     data-align="center"
@@ -128,22 +128,22 @@ exports[`renderer/components/filters/FilterSection.tsx should be able to toggle
   >
     <input
       class="size-2 rounded-sm cursor-pointer"
-      data-testid="checkbox-Closed"
-      id="Closed"
+      data-testid="checkbox-Open"
+      id="Open"
       type="checkbox"
     />
     <label
       class="font-medium text-gitify-font cursor-pointer"
-      for="Closed"
+      for="Open"
     >
-      Closed
+      Open
     </label>
     <button
       aria-expanded="false"
       aria-haspopup="true"
-      aria-label="tooltip-Closed"
-      data-testid="tooltip-tooltip-Closed"
-      id="tooltip-Closed"
+      aria-label="tooltip-Open"
+      data-testid="tooltip-tooltip-Open"
+      id="tooltip-Open"
       tabindex="0"
       type="button"
     >
@@ -247,50 +247,22 @@ exports[`renderer/components/filters/FilterSection.tsx should be able to toggle
   >
     <input
       class="size-2 rounded-sm cursor-pointer"
-      data-testid="checkbox-Draft"
-      id="Draft"
-      type="checkbox"
-    />
-    <label
-      class="font-medium text-gitify-font cursor-pointer"
-      for="Draft"
-    >
-      Draft
-    </label>
-    <span
-      class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-    >
-      0
-    </span>
-  </div>
-  <div
-    class="text-sm prc-Stack-Stack-WJVsK"
-    data-align="center"
-    data-direction="horizontal"
-    data-gap="condensed"
-    data-justify="start"
-    data-padding="none"
-    data-wrap="nowrap"
-  >
-    <input
-      checked=""
-      class="size-2 rounded-sm cursor-pointer"
-      data-testid="checkbox-Open"
-      id="Open"
+      data-testid="checkbox-Closed"
+      id="Closed"
       type="checkbox"
     />
     <label
       class="font-medium text-gitify-font cursor-pointer"
-      for="Open"
+      for="Closed"
     >
-      Open
+      Closed
     </label>
     <button
       aria-expanded="false"
       aria-haspopup="true"
-      aria-label="tooltip-Open"
-      data-testid="tooltip-tooltip-Open"
-      id="tooltip-Open"
+      aria-label="tooltip-Closed"
+      data-testid="tooltip-tooltip-Closed"
+      id="tooltip-Closed"
       tabindex="0"
       type="button"
     >
@@ -312,7 +284,34 @@ exports[`renderer/components/filters/FilterSection.tsx should be able to toggle
       </svg>
     </button>
     <span
-      class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-primary prc-Text-Text-0ima0"
+      class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+    >
+      0
+    </span>
+  </div>
+  <div
+    class="text-sm prc-Stack-Stack-WJVsK"
+    data-align="center"
+    data-direction="horizontal"
+    data-gap="condensed"
+    data-justify="start"
+    data-padding="none"
+    data-wrap="nowrap"
+  >
+    <input
+      class="size-2 rounded-sm cursor-pointer"
+      data-testid="checkbox-Draft"
+      id="Draft"
+      type="checkbox"
+    />
+    <label
+      class="font-medium text-gitify-font cursor-pointer"
+      for="Draft"
+    >
+      Draft
+    </label>
+    <span
+      class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
     >
       0
     </span>
@@ -354,23 +353,24 @@ exports[`renderer/components/filters/FilterSection.tsx should be able to toggle
     data-wrap="nowrap"
   >
     <input
+      checked=""
       class="size-2 rounded-sm cursor-pointer"
-      data-testid="checkbox-Closed"
-      id="Closed"
+      data-testid="checkbox-Open"
+      id="Open"
       type="checkbox"
     />
     <label
       class="font-medium text-gitify-font cursor-pointer"
-      for="Closed"
+      for="Open"
     >
-      Closed
+      Open
     </label>
     <button
       aria-expanded="false"
       aria-haspopup="true"
-      aria-label="tooltip-Closed"
-      data-testid="tooltip-tooltip-Closed"
-      id="tooltip-Closed"
+      aria-label="tooltip-Open"
+      data-testid="tooltip-tooltip-Open"
+      id="tooltip-Open"
       tabindex="0"
       type="button"
     >
@@ -392,7 +392,7 @@ exports[`renderer/components/filters/FilterSection.tsx should be able to toggle
       </svg>
     </button>
     <span
-      class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+      class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-primary prc-Text-Text-0ima0"
     >
       0
     </span>
@@ -520,49 +520,22 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Draft"
-              id="Draft"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Draft"
-            >
-              Draft
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Open"
-              id="Open"
+              data-testid="checkbox-Closed"
+              id="Closed"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Open"
+              for="Closed"
             >
-              Open
+              Closed
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Open"
-              data-testid="tooltip-tooltip-Open"
-              id="tooltip-Open"
+              aria-label="tooltip-Closed"
+              data-testid="tooltip-tooltip-Closed"
+              id="tooltip-Closed"
               tabindex="0"
               type="button"
             >
@@ -586,7 +559,34 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
             <span
               class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
             >
-              1
+              0
+            </span>
+          </div>
+          <div
+            class="text-sm prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <input
+              class="size-2 rounded-sm cursor-pointer"
+              data-testid="checkbox-Draft"
+              id="Draft"
+              type="checkbox"
+            />
+            <label
+              class="font-medium text-gitify-font cursor-pointer"
+              for="Draft"
+            >
+              Draft
+            </label>
+            <span
+              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+            >
+              0
             </span>
           </div>
           <div
@@ -627,22 +627,22 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Closed"
-              id="Closed"
+              data-testid="checkbox-Open"
+              id="Open"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Closed"
+              for="Open"
             >
-              Closed
+              Open
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Closed"
-              data-testid="tooltip-tooltip-Closed"
-              id="tooltip-Closed"
+              aria-label="tooltip-Open"
+              data-testid="tooltip-tooltip-Open"
+              id="tooltip-Open"
               tabindex="0"
               type="button"
             >
@@ -666,7 +666,7 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
             <span
               class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
             >
-              0
+              1
             </span>
           </div>
           <div
@@ -789,49 +789,22 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
         >
           <input
             class="size-2 rounded-sm cursor-pointer"
-            data-testid="checkbox-Draft"
-            id="Draft"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Draft"
-          >
-            Draft
-          </label>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-2 rounded-sm cursor-pointer"
-            data-testid="checkbox-Open"
-            id="Open"
+            data-testid="checkbox-Closed"
+            id="Closed"
             type="checkbox"
           />
           <label
             class="font-medium text-gitify-font cursor-pointer"
-            for="Open"
+            for="Closed"
           >
-            Open
+            Closed
           </label>
           <button
             aria-expanded="false"
             aria-haspopup="true"
-            aria-label="tooltip-Open"
-            data-testid="tooltip-tooltip-Open"
-            id="tooltip-Open"
+            aria-label="tooltip-Closed"
+            data-testid="tooltip-tooltip-Closed"
+            id="tooltip-Closed"
             tabindex="0"
             type="button"
           >
@@ -855,7 +828,34 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
           <span
             class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
           >
-            1
+            0
+          </span>
+        </div>
+        <div
+          class="text-sm prc-Stack-Stack-WJVsK"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-wrap="nowrap"
+        >
+          <input
+            class="size-2 rounded-sm cursor-pointer"
+            data-testid="checkbox-Draft"
+            id="Draft"
+            type="checkbox"
+          />
+          <label
+            class="font-medium text-gitify-font cursor-pointer"
+            for="Draft"
+          >
+            Draft
+          </label>
+          <span
+            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+          >
+            0
           </span>
         </div>
         <div
@@ -896,22 +896,22 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
         >
           <input
             class="size-2 rounded-sm cursor-pointer"
-            data-testid="checkbox-Closed"
-            id="Closed"
+            data-testid="checkbox-Open"
+            id="Open"
             type="checkbox"
           />
           <label
             class="font-medium text-gitify-font cursor-pointer"
-            for="Closed"
+            for="Open"
           >
-            Closed
+            Open
           </label>
           <button
             aria-expanded="false"
             aria-haspopup="true"
-            aria-label="tooltip-Closed"
-            data-testid="tooltip-tooltip-Closed"
-            id="tooltip-Closed"
+            aria-label="tooltip-Open"
+            data-testid="tooltip-tooltip-Open"
+            id="tooltip-Open"
             tabindex="0"
             type="button"
           >
@@ -935,7 +935,7 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
           <span
             class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
           >
-            0
+            1
           </span>
         </div>
         <div
@@ -1115,49 +1115,22 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Draft"
-              id="Draft"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Draft"
-            >
-              Draft
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Open"
-              id="Open"
+              data-testid="checkbox-Closed"
+              id="Closed"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Open"
+              for="Closed"
             >
-              Open
+              Closed
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Open"
-              data-testid="tooltip-tooltip-Open"
-              id="tooltip-Open"
+              aria-label="tooltip-Closed"
+              data-testid="tooltip-tooltip-Closed"
+              id="tooltip-Closed"
               tabindex="0"
               type="button"
             >
@@ -1181,7 +1154,34 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
             <span
               class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
             >
-              1
+              0
+            </span>
+          </div>
+          <div
+            class="text-sm prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <input
+              class="size-2 rounded-sm cursor-pointer"
+              data-testid="checkbox-Draft"
+              id="Draft"
+              type="checkbox"
+            />
+            <label
+              class="font-medium text-gitify-font cursor-pointer"
+              for="Draft"
+            >
+              Draft
+            </label>
+            <span
+              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+            >
+              0
             </span>
           </div>
           <div
@@ -1222,22 +1222,22 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Closed"
-              id="Closed"
+              data-testid="checkbox-Open"
+              id="Open"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Closed"
+              for="Open"
             >
-              Closed
+              Open
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Closed"
-              data-testid="tooltip-tooltip-Closed"
-              id="tooltip-Closed"
+              aria-label="tooltip-Open"
+              data-testid="tooltip-tooltip-Open"
+              id="tooltip-Open"
               tabindex="0"
               type="button"
             >
@@ -1261,7 +1261,7 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
             <span
               class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
             >
-              0
+              1
             </span>
           </div>
           <div
@@ -1384,49 +1384,22 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
         >
           <input
             class="size-2 rounded-sm cursor-pointer"
-            data-testid="checkbox-Draft"
-            id="Draft"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Draft"
-          >
-            Draft
-          </label>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-2 rounded-sm cursor-pointer"
-            data-testid="checkbox-Open"
-            id="Open"
+            data-testid="checkbox-Closed"
+            id="Closed"
             type="checkbox"
           />
           <label
             class="font-medium text-gitify-font cursor-pointer"
-            for="Open"
+            for="Closed"
           >
-            Open
+            Closed
           </label>
           <button
             aria-expanded="false"
             aria-haspopup="true"
-            aria-label="tooltip-Open"
-            data-testid="tooltip-tooltip-Open"
-            id="tooltip-Open"
+            aria-label="tooltip-Closed"
+            data-testid="tooltip-tooltip-Closed"
+            id="tooltip-Closed"
             tabindex="0"
             type="button"
           >
@@ -1450,7 +1423,34 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
           <span
             class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
           >
-            1
+            0
+          </span>
+        </div>
+        <div
+          class="text-sm prc-Stack-Stack-WJVsK"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-wrap="nowrap"
+        >
+          <input
+            class="size-2 rounded-sm cursor-pointer"
+            data-testid="checkbox-Draft"
+            id="Draft"
+            type="checkbox"
+          />
+          <label
+            class="font-medium text-gitify-font cursor-pointer"
+            for="Draft"
+          >
+            Draft
+          </label>
+          <span
+            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+          >
+            0
           </span>
         </div>
         <div
@@ -1491,22 +1491,22 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
         >
           <input
             class="size-2 rounded-sm cursor-pointer"
-            data-testid="checkbox-Closed"
-            id="Closed"
+            data-testid="checkbox-Open"
+            id="Open"
             type="checkbox"
           />
           <label
             class="font-medium text-gitify-font cursor-pointer"
-            for="Closed"
+            for="Open"
           >
-            Closed
+            Open
           </label>
           <button
             aria-expanded="false"
             aria-haspopup="true"
-            aria-label="tooltip-Closed"
-            data-testid="tooltip-tooltip-Closed"
-            id="tooltip-Closed"
+            aria-label="tooltip-Open"
+            data-testid="tooltip-tooltip-Open"
+            id="tooltip-Open"
             tabindex="0"
             type="button"
           >
@@ -1530,7 +1530,7 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
           <span
             class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
           >
-            0
+            1
           </span>
         </div>
         <div
diff --git a/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap
index d97307d44..4754f182e 100644
--- a/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap
@@ -252,22 +252,22 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Workflow Run Completed"
-              id="Workflow Run Completed"
+              data-testid="checkbox-Commented"
+              id="Commented"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Workflow Run Completed"
+              for="Commented"
             >
-              Workflow Run Completed
+              Commented
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Workflow Run Completed"
-              data-testid="tooltip-tooltip-Workflow Run Completed"
-              id="tooltip-Workflow Run Completed"
+              aria-label="tooltip-Commented"
+              data-testid="tooltip-tooltip-Commented"
+              id="tooltip-Commented"
               tabindex="0"
               type="button"
             >
@@ -305,22 +305,22 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Commented"
-              id="Commented"
+              data-testid="checkbox-Invitation Received"
+              id="Invitation Received"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Commented"
+              for="Invitation Received"
             >
-              Commented
+              Invitation Received
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Commented"
-              data-testid="tooltip-tooltip-Commented"
-              id="tooltip-Commented"
+              aria-label="tooltip-Invitation Received"
+              data-testid="tooltip-tooltip-Invitation Received"
+              id="tooltip-Invitation Received"
               tabindex="0"
               type="button"
             >
@@ -358,22 +358,22 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Invitation Received"
-              id="Invitation Received"
+              data-testid="checkbox-Member Feature Requested"
+              id="Member Feature Requested"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Invitation Received"
+              for="Member Feature Requested"
             >
-              Invitation Received
+              Member Feature Requested
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Invitation Received"
-              data-testid="tooltip-tooltip-Invitation Received"
-              id="tooltip-Invitation Received"
+              aria-label="tooltip-Member Feature Requested"
+              data-testid="tooltip-tooltip-Member Feature Requested"
+              id="tooltip-Member Feature Requested"
               tabindex="0"
               type="button"
             >
@@ -411,22 +411,22 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Updated"
-              id="Updated"
+              data-testid="checkbox-Mentioned"
+              id="Mentioned"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Updated"
+              for="Mentioned"
             >
-              Updated
+              Mentioned
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Updated"
-              data-testid="tooltip-tooltip-Updated"
-              id="tooltip-Updated"
+              aria-label="tooltip-Mentioned"
+              data-testid="tooltip-tooltip-Mentioned"
+              id="tooltip-Mentioned"
               tabindex="0"
               type="button"
             >
@@ -464,22 +464,22 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Member Feature Requested"
-              id="Member Feature Requested"
+              data-testid="checkbox-Review Requested"
+              id="Review Requested"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Member Feature Requested"
+              for="Review Requested"
             >
-              Member Feature Requested
+              Review Requested
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Member Feature Requested"
-              data-testid="tooltip-tooltip-Member Feature Requested"
-              id="tooltip-Member Feature Requested"
+              aria-label="tooltip-Review Requested"
+              data-testid="tooltip-tooltip-Review Requested"
+              id="tooltip-Review Requested"
               tabindex="0"
               type="button"
             >
@@ -517,22 +517,22 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Mentioned"
-              id="Mentioned"
+              data-testid="checkbox-Security Advisory Credit Received"
+              id="Security Advisory Credit Received"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Mentioned"
+              for="Security Advisory Credit Received"
             >
-              Mentioned
+              Security Advisory Credit Received
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Mentioned"
-              data-testid="tooltip-tooltip-Mentioned"
-              id="tooltip-Mentioned"
+              aria-label="tooltip-Security Advisory Credit Received"
+              data-testid="tooltip-tooltip-Security Advisory Credit Received"
+              id="tooltip-Security Advisory Credit Received"
               tabindex="0"
               type="button"
             >
@@ -570,22 +570,22 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Review Requested"
-              id="Review Requested"
+              data-testid="checkbox-Security Alert Received"
+              id="Security Alert Received"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Review Requested"
+              for="Security Alert Received"
             >
-              Review Requested
+              Security Alert Received
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Review Requested"
-              data-testid="tooltip-tooltip-Review Requested"
-              id="tooltip-Review Requested"
+              aria-label="tooltip-Security Alert Received"
+              data-testid="tooltip-tooltip-Security Alert Received"
+              id="tooltip-Security Alert Received"
               tabindex="0"
               type="button"
             >
@@ -623,22 +623,22 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Security Advisory Credit Received"
-              id="Security Advisory Credit Received"
+              data-testid="checkbox-State Changed"
+              id="State Changed"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Security Advisory Credit Received"
+              for="State Changed"
             >
-              Security Advisory Credit Received
+              State Changed
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Security Advisory Credit Received"
-              data-testid="tooltip-tooltip-Security Advisory Credit Received"
-              id="tooltip-Security Advisory Credit Received"
+              aria-label="tooltip-State Changed"
+              data-testid="tooltip-tooltip-State Changed"
+              id="tooltip-State Changed"
               tabindex="0"
               type="button"
             >
@@ -676,22 +676,22 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Security Alert Received"
-              id="Security Alert Received"
+              data-testid="checkbox-Team Mentioned"
+              id="Team Mentioned"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Security Alert Received"
+              for="Team Mentioned"
             >
-              Security Alert Received
+              Team Mentioned
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Security Alert Received"
-              data-testid="tooltip-tooltip-Security Alert Received"
-              id="tooltip-Security Alert Received"
+              aria-label="tooltip-Team Mentioned"
+              data-testid="tooltip-tooltip-Team Mentioned"
+              id="tooltip-Team Mentioned"
               tabindex="0"
               type="button"
             >
@@ -729,22 +729,22 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-State Changed"
-              id="State Changed"
+              data-testid="checkbox-Updated"
+              id="Updated"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="State Changed"
+              for="Updated"
             >
-              State Changed
+              Updated
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-State Changed"
-              data-testid="tooltip-tooltip-State Changed"
-              id="tooltip-State Changed"
+              aria-label="tooltip-Updated"
+              data-testid="tooltip-tooltip-Updated"
+              id="tooltip-Updated"
               tabindex="0"
               type="button"
             >
@@ -835,22 +835,22 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Team Mentioned"
-              id="Team Mentioned"
+              data-testid="checkbox-Workflow Run Completed"
+              id="Workflow Run Completed"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Team Mentioned"
+              for="Workflow Run Completed"
             >
-              Team Mentioned
+              Workflow Run Completed
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Team Mentioned"
-              data-testid="tooltip-tooltip-Team Mentioned"
-              id="tooltip-Team Mentioned"
+              aria-label="tooltip-Workflow Run Completed"
+              data-testid="tooltip-tooltip-Workflow Run Completed"
+              id="tooltip-Workflow Run Completed"
               tabindex="0"
               type="button"
             >
@@ -1129,22 +1129,22 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
         >
           <input
             class="size-2 rounded-sm cursor-pointer"
-            data-testid="checkbox-Workflow Run Completed"
-            id="Workflow Run Completed"
+            data-testid="checkbox-Commented"
+            id="Commented"
             type="checkbox"
           />
           <label
             class="font-medium text-gitify-font cursor-pointer"
-            for="Workflow Run Completed"
+            for="Commented"
           >
-            Workflow Run Completed
+            Commented
           </label>
           <button
             aria-expanded="false"
             aria-haspopup="true"
-            aria-label="tooltip-Workflow Run Completed"
-            data-testid="tooltip-tooltip-Workflow Run Completed"
-            id="tooltip-Workflow Run Completed"
+            aria-label="tooltip-Commented"
+            data-testid="tooltip-tooltip-Commented"
+            id="tooltip-Commented"
             tabindex="0"
             type="button"
           >
@@ -1182,22 +1182,22 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
         >
           <input
             class="size-2 rounded-sm cursor-pointer"
-            data-testid="checkbox-Commented"
-            id="Commented"
+            data-testid="checkbox-Invitation Received"
+            id="Invitation Received"
             type="checkbox"
           />
           <label
             class="font-medium text-gitify-font cursor-pointer"
-            for="Commented"
+            for="Invitation Received"
           >
-            Commented
+            Invitation Received
           </label>
           <button
             aria-expanded="false"
             aria-haspopup="true"
-            aria-label="tooltip-Commented"
-            data-testid="tooltip-tooltip-Commented"
-            id="tooltip-Commented"
+            aria-label="tooltip-Invitation Received"
+            data-testid="tooltip-tooltip-Invitation Received"
+            id="tooltip-Invitation Received"
             tabindex="0"
             type="button"
           >
@@ -1235,22 +1235,22 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
         >
           <input
             class="size-2 rounded-sm cursor-pointer"
-            data-testid="checkbox-Invitation Received"
-            id="Invitation Received"
+            data-testid="checkbox-Member Feature Requested"
+            id="Member Feature Requested"
             type="checkbox"
           />
           <label
             class="font-medium text-gitify-font cursor-pointer"
-            for="Invitation Received"
+            for="Member Feature Requested"
           >
-            Invitation Received
+            Member Feature Requested
           </label>
           <button
             aria-expanded="false"
             aria-haspopup="true"
-            aria-label="tooltip-Invitation Received"
-            data-testid="tooltip-tooltip-Invitation Received"
-            id="tooltip-Invitation Received"
+            aria-label="tooltip-Member Feature Requested"
+            data-testid="tooltip-tooltip-Member Feature Requested"
+            id="tooltip-Member Feature Requested"
             tabindex="0"
             type="button"
           >
@@ -1288,22 +1288,22 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
         >
           <input
             class="size-2 rounded-sm cursor-pointer"
-            data-testid="checkbox-Updated"
-            id="Updated"
+            data-testid="checkbox-Mentioned"
+            id="Mentioned"
             type="checkbox"
           />
           <label
             class="font-medium text-gitify-font cursor-pointer"
-            for="Updated"
+            for="Mentioned"
           >
-            Updated
+            Mentioned
           </label>
           <button
             aria-expanded="false"
             aria-haspopup="true"
-            aria-label="tooltip-Updated"
-            data-testid="tooltip-tooltip-Updated"
-            id="tooltip-Updated"
+            aria-label="tooltip-Mentioned"
+            data-testid="tooltip-tooltip-Mentioned"
+            id="tooltip-Mentioned"
             tabindex="0"
             type="button"
           >
@@ -1341,22 +1341,22 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
         >
           <input
             class="size-2 rounded-sm cursor-pointer"
-            data-testid="checkbox-Member Feature Requested"
-            id="Member Feature Requested"
+            data-testid="checkbox-Review Requested"
+            id="Review Requested"
             type="checkbox"
           />
           <label
             class="font-medium text-gitify-font cursor-pointer"
-            for="Member Feature Requested"
+            for="Review Requested"
           >
-            Member Feature Requested
+            Review Requested
           </label>
           <button
             aria-expanded="false"
             aria-haspopup="true"
-            aria-label="tooltip-Member Feature Requested"
-            data-testid="tooltip-tooltip-Member Feature Requested"
-            id="tooltip-Member Feature Requested"
+            aria-label="tooltip-Review Requested"
+            data-testid="tooltip-tooltip-Review Requested"
+            id="tooltip-Review Requested"
             tabindex="0"
             type="button"
           >
@@ -1394,22 +1394,22 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
         >
           <input
             class="size-2 rounded-sm cursor-pointer"
-            data-testid="checkbox-Mentioned"
-            id="Mentioned"
+            data-testid="checkbox-Security Advisory Credit Received"
+            id="Security Advisory Credit Received"
             type="checkbox"
           />
           <label
             class="font-medium text-gitify-font cursor-pointer"
-            for="Mentioned"
+            for="Security Advisory Credit Received"
           >
-            Mentioned
+            Security Advisory Credit Received
           </label>
           <button
             aria-expanded="false"
             aria-haspopup="true"
-            aria-label="tooltip-Mentioned"
-            data-testid="tooltip-tooltip-Mentioned"
-            id="tooltip-Mentioned"
+            aria-label="tooltip-Security Advisory Credit Received"
+            data-testid="tooltip-tooltip-Security Advisory Credit Received"
+            id="tooltip-Security Advisory Credit Received"
             tabindex="0"
             type="button"
           >
@@ -1447,22 +1447,22 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
         >
           <input
             class="size-2 rounded-sm cursor-pointer"
-            data-testid="checkbox-Review Requested"
-            id="Review Requested"
+            data-testid="checkbox-Security Alert Received"
+            id="Security Alert Received"
             type="checkbox"
           />
           <label
             class="font-medium text-gitify-font cursor-pointer"
-            for="Review Requested"
+            for="Security Alert Received"
           >
-            Review Requested
+            Security Alert Received
           </label>
           <button
             aria-expanded="false"
             aria-haspopup="true"
-            aria-label="tooltip-Review Requested"
-            data-testid="tooltip-tooltip-Review Requested"
-            id="tooltip-Review Requested"
+            aria-label="tooltip-Security Alert Received"
+            data-testid="tooltip-tooltip-Security Alert Received"
+            id="tooltip-Security Alert Received"
             tabindex="0"
             type="button"
           >
@@ -1500,22 +1500,22 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
         >
           <input
             class="size-2 rounded-sm cursor-pointer"
-            data-testid="checkbox-Security Advisory Credit Received"
-            id="Security Advisory Credit Received"
+            data-testid="checkbox-State Changed"
+            id="State Changed"
             type="checkbox"
           />
           <label
             class="font-medium text-gitify-font cursor-pointer"
-            for="Security Advisory Credit Received"
+            for="State Changed"
           >
-            Security Advisory Credit Received
+            State Changed
           </label>
           <button
             aria-expanded="false"
             aria-haspopup="true"
-            aria-label="tooltip-Security Advisory Credit Received"
-            data-testid="tooltip-tooltip-Security Advisory Credit Received"
-            id="tooltip-Security Advisory Credit Received"
+            aria-label="tooltip-State Changed"
+            data-testid="tooltip-tooltip-State Changed"
+            id="tooltip-State Changed"
             tabindex="0"
             type="button"
           >
@@ -1553,22 +1553,22 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
         >
           <input
             class="size-2 rounded-sm cursor-pointer"
-            data-testid="checkbox-Security Alert Received"
-            id="Security Alert Received"
+            data-testid="checkbox-Team Mentioned"
+            id="Team Mentioned"
             type="checkbox"
           />
           <label
             class="font-medium text-gitify-font cursor-pointer"
-            for="Security Alert Received"
+            for="Team Mentioned"
           >
-            Security Alert Received
+            Team Mentioned
           </label>
           <button
             aria-expanded="false"
             aria-haspopup="true"
-            aria-label="tooltip-Security Alert Received"
-            data-testid="tooltip-tooltip-Security Alert Received"
-            id="tooltip-Security Alert Received"
+            aria-label="tooltip-Team Mentioned"
+            data-testid="tooltip-tooltip-Team Mentioned"
+            id="tooltip-Team Mentioned"
             tabindex="0"
             type="button"
           >
@@ -1606,22 +1606,22 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
         >
           <input
             class="size-2 rounded-sm cursor-pointer"
-            data-testid="checkbox-State Changed"
-            id="State Changed"
+            data-testid="checkbox-Updated"
+            id="Updated"
             type="checkbox"
           />
           <label
             class="font-medium text-gitify-font cursor-pointer"
-            for="State Changed"
+            for="Updated"
           >
-            State Changed
+            Updated
           </label>
           <button
             aria-expanded="false"
             aria-haspopup="true"
-            aria-label="tooltip-State Changed"
-            data-testid="tooltip-tooltip-State Changed"
-            id="tooltip-State Changed"
+            aria-label="tooltip-Updated"
+            data-testid="tooltip-tooltip-Updated"
+            id="tooltip-Updated"
             tabindex="0"
             type="button"
           >
@@ -1712,22 +1712,22 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
         >
           <input
             class="size-2 rounded-sm cursor-pointer"
-            data-testid="checkbox-Team Mentioned"
-            id="Team Mentioned"
+            data-testid="checkbox-Workflow Run Completed"
+            id="Workflow Run Completed"
             type="checkbox"
           />
           <label
             class="font-medium text-gitify-font cursor-pointer"
-            for="Team Mentioned"
+            for="Workflow Run Completed"
           >
-            Team Mentioned
+            Workflow Run Completed
           </label>
           <button
             aria-expanded="false"
             aria-haspopup="true"
-            aria-label="tooltip-Team Mentioned"
-            data-testid="tooltip-tooltip-Team Mentioned"
-            id="tooltip-Team Mentioned"
+            aria-label="tooltip-Workflow Run Completed"
+            data-testid="tooltip-tooltip-Workflow Run Completed"
+            id="tooltip-Workflow Run Completed"
             tabindex="0"
             type="button"
           >
diff --git a/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap
index 7376d2aef..df7dd70d8 100644
--- a/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap
@@ -96,49 +96,22 @@ exports[`renderer/components/filters/StateFilter.tsx should render itself & its
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Draft"
-              id="Draft"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Draft"
-            >
-              Draft
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Open"
-              id="Open"
+              data-testid="checkbox-Closed"
+              id="Closed"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Open"
+              for="Closed"
             >
-              Open
+              Closed
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Open"
-              data-testid="tooltip-tooltip-Open"
-              id="tooltip-Open"
+              aria-label="tooltip-Closed"
+              data-testid="tooltip-tooltip-Closed"
+              id="tooltip-Closed"
               tabindex="0"
               type="button"
             >
@@ -162,7 +135,34 @@ exports[`renderer/components/filters/StateFilter.tsx should render itself & its
             <span
               class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
             >
-              1
+              0
+            </span>
+          </div>
+          <div
+            class="text-sm prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <input
+              class="size-2 rounded-sm cursor-pointer"
+              data-testid="checkbox-Draft"
+              id="Draft"
+              type="checkbox"
+            />
+            <label
+              class="font-medium text-gitify-font cursor-pointer"
+              for="Draft"
+            >
+              Draft
+            </label>
+            <span
+              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+            >
+              0
             </span>
           </div>
           <div
@@ -203,22 +203,22 @@ exports[`renderer/components/filters/StateFilter.tsx should render itself & its
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Closed"
-              id="Closed"
+              data-testid="checkbox-Open"
+              id="Open"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Closed"
+              for="Open"
             >
-              Closed
+              Open
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Closed"
-              data-testid="tooltip-tooltip-Closed"
-              id="tooltip-Closed"
+              aria-label="tooltip-Open"
+              data-testid="tooltip-tooltip-Open"
+              id="tooltip-Open"
               tabindex="0"
               type="button"
             >
@@ -242,7 +242,7 @@ exports[`renderer/components/filters/StateFilter.tsx should render itself & its
             <span
               class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
             >
-              0
+              1
             </span>
           </div>
           <div
@@ -394,49 +394,22 @@ exports[`renderer/components/filters/StateFilter.tsx should render itself & its
         >
           <input
             class="size-2 rounded-sm cursor-pointer"
-            data-testid="checkbox-Draft"
-            id="Draft"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Draft"
-          >
-            Draft
-          </label>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-2 rounded-sm cursor-pointer"
-            data-testid="checkbox-Open"
-            id="Open"
+            data-testid="checkbox-Closed"
+            id="Closed"
             type="checkbox"
           />
           <label
             class="font-medium text-gitify-font cursor-pointer"
-            for="Open"
+            for="Closed"
           >
-            Open
+            Closed
           </label>
           <button
             aria-expanded="false"
             aria-haspopup="true"
-            aria-label="tooltip-Open"
-            data-testid="tooltip-tooltip-Open"
-            id="tooltip-Open"
+            aria-label="tooltip-Closed"
+            data-testid="tooltip-tooltip-Closed"
+            id="tooltip-Closed"
             tabindex="0"
             type="button"
           >
@@ -460,7 +433,34 @@ exports[`renderer/components/filters/StateFilter.tsx should render itself & its
           <span
             class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
           >
-            1
+            0
+          </span>
+        </div>
+        <div
+          class="text-sm prc-Stack-Stack-WJVsK"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-wrap="nowrap"
+        >
+          <input
+            class="size-2 rounded-sm cursor-pointer"
+            data-testid="checkbox-Draft"
+            id="Draft"
+            type="checkbox"
+          />
+          <label
+            class="font-medium text-gitify-font cursor-pointer"
+            for="Draft"
+          >
+            Draft
+          </label>
+          <span
+            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+          >
+            0
           </span>
         </div>
         <div
@@ -501,22 +501,22 @@ exports[`renderer/components/filters/StateFilter.tsx should render itself & its
         >
           <input
             class="size-2 rounded-sm cursor-pointer"
-            data-testid="checkbox-Closed"
-            id="Closed"
+            data-testid="checkbox-Open"
+            id="Open"
             type="checkbox"
           />
           <label
             class="font-medium text-gitify-font cursor-pointer"
-            for="Closed"
+            for="Open"
           >
-            Closed
+            Open
           </label>
           <button
             aria-expanded="false"
             aria-haspopup="true"
-            aria-label="tooltip-Closed"
-            data-testid="tooltip-tooltip-Closed"
-            id="tooltip-Closed"
+            aria-label="tooltip-Open"
+            data-testid="tooltip-tooltip-Open"
+            id="tooltip-Open"
             tabindex="0"
             type="button"
           >
@@ -540,7 +540,7 @@ exports[`renderer/components/filters/StateFilter.tsx should render itself & its
           <span
             class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
           >
-            0
+            1
           </span>
         </div>
         <div
diff --git a/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap
index 90a772b5c..9f68653af 100644
--- a/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap
@@ -147,15 +147,15 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx should render itself
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Discussion"
-              id="Discussion"
+              data-testid="checkbox-Dependabot Alert"
+              id="Dependabot Alert"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Discussion"
+              for="Dependabot Alert"
             >
-              Discussion
+              Dependabot Alert
             </label>
             <span
               class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
@@ -174,20 +174,20 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx should render itself
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Issue"
-              id="Issue"
+              data-testid="checkbox-Discussion"
+              id="Discussion"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Issue"
+              for="Discussion"
             >
-              Issue
+              Discussion
             </label>
             <span
               class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
             >
-              2
+              0
             </span>
           </div>
           <div
@@ -201,20 +201,20 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx should render itself
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Pull Request"
-              id="Pull Request"
+              data-testid="checkbox-Invitation"
+              id="Invitation"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Pull Request"
+              for="Invitation"
             >
-              Pull Request
+              Invitation
             </label>
             <span
               class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
             >
-              1
+              0
             </span>
           </div>
           <div
@@ -228,20 +228,20 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx should render itself
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Release"
-              id="Release"
+              data-testid="checkbox-Issue"
+              id="Issue"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Release"
+              for="Issue"
             >
-              Release
+              Issue
             </label>
             <span
               class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
             >
-              1
+              2
             </span>
           </div>
           <div
@@ -255,20 +255,20 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx should render itself
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Dependabot Alert"
-              id="Dependabot Alert"
+              data-testid="checkbox-Pull Request"
+              id="Pull Request"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Dependabot Alert"
+              for="Pull Request"
             >
-              Dependabot Alert
+              Pull Request
             </label>
             <span
               class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
             >
-              0
+              1
             </span>
           </div>
           <div
@@ -282,20 +282,20 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx should render itself
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Invitation"
-              id="Invitation"
+              data-testid="checkbox-Release"
+              id="Release"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Invitation"
+              for="Release"
             >
-              Invitation
+              Release
             </label>
             <span
               class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
             >
-              0
+              1
             </span>
           </div>
           <div
@@ -499,15 +499,15 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx should render itself
         >
           <input
             class="size-2 rounded-sm cursor-pointer"
-            data-testid="checkbox-Discussion"
-            id="Discussion"
+            data-testid="checkbox-Dependabot Alert"
+            id="Dependabot Alert"
             type="checkbox"
           />
           <label
             class="font-medium text-gitify-font cursor-pointer"
-            for="Discussion"
+            for="Dependabot Alert"
           >
-            Discussion
+            Dependabot Alert
           </label>
           <span
             class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
@@ -526,20 +526,20 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx should render itself
         >
           <input
             class="size-2 rounded-sm cursor-pointer"
-            data-testid="checkbox-Issue"
-            id="Issue"
+            data-testid="checkbox-Discussion"
+            id="Discussion"
             type="checkbox"
           />
           <label
             class="font-medium text-gitify-font cursor-pointer"
-            for="Issue"
+            for="Discussion"
           >
-            Issue
+            Discussion
           </label>
           <span
             class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
           >
-            2
+            0
           </span>
         </div>
         <div
@@ -553,20 +553,20 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx should render itself
         >
           <input
             class="size-2 rounded-sm cursor-pointer"
-            data-testid="checkbox-Pull Request"
-            id="Pull Request"
+            data-testid="checkbox-Invitation"
+            id="Invitation"
             type="checkbox"
           />
           <label
             class="font-medium text-gitify-font cursor-pointer"
-            for="Pull Request"
+            for="Invitation"
           >
-            Pull Request
+            Invitation
           </label>
           <span
             class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
           >
-            1
+            0
           </span>
         </div>
         <div
@@ -580,20 +580,20 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx should render itself
         >
           <input
             class="size-2 rounded-sm cursor-pointer"
-            data-testid="checkbox-Release"
-            id="Release"
+            data-testid="checkbox-Issue"
+            id="Issue"
             type="checkbox"
           />
           <label
             class="font-medium text-gitify-font cursor-pointer"
-            for="Release"
+            for="Issue"
           >
-            Release
+            Issue
           </label>
           <span
             class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
           >
-            1
+            2
           </span>
         </div>
         <div
@@ -607,20 +607,20 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx should render itself
         >
           <input
             class="size-2 rounded-sm cursor-pointer"
-            data-testid="checkbox-Dependabot Alert"
-            id="Dependabot Alert"
+            data-testid="checkbox-Pull Request"
+            id="Pull Request"
             type="checkbox"
           />
           <label
             class="font-medium text-gitify-font cursor-pointer"
-            for="Dependabot Alert"
+            for="Pull Request"
           >
-            Dependabot Alert
+            Pull Request
           </label>
           <span
             class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
           >
-            0
+            1
           </span>
         </div>
         <div
@@ -634,20 +634,20 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx should render itself
         >
           <input
             class="size-2 rounded-sm cursor-pointer"
-            data-testid="checkbox-Invitation"
-            id="Invitation"
+            data-testid="checkbox-Release"
+            id="Release"
             type="checkbox"
           />
           <label
             class="font-medium text-gitify-font cursor-pointer"
-            for="Invitation"
+            for="Release"
           >
-            Invitation
+            Release
           </label>
           <span
             class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
           >
-            0
+            1
           </span>
         </div>
         <div
diff --git a/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap
index bfda081a8..0239f400c 100644
--- a/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap
@@ -82,33 +82,6 @@ exports[`renderer/components/filters/UserTypeFilter.tsx should render itself & i
           data-padding="none"
           data-wrap="nowrap"
         >
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-2 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="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              1
-            </span>
-          </div>
           <div
             class="text-sm prc-Stack-Stack-WJVsK"
             data-align="center"
@@ -189,6 +162,33 @@ exports[`renderer/components/filters/UserTypeFilter.tsx should render itself & i
               0
             </span>
           </div>
+          <div
+            class="text-sm prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <input
+              class="size-2 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="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+            >
+              1
+            </span>
+          </div>
         </div>
       </fieldset>
     </div>
@@ -271,33 +271,6 @@ exports[`renderer/components/filters/UserTypeFilter.tsx should render itself & i
         data-padding="none"
         data-wrap="nowrap"
       >
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-2 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="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            1
-          </span>
-        </div>
         <div
           class="text-sm prc-Stack-Stack-WJVsK"
           data-align="center"
@@ -378,6 +351,33 @@ exports[`renderer/components/filters/UserTypeFilter.tsx should render itself & i
             0
           </span>
         </div>
+        <div
+          class="text-sm prc-Stack-Stack-WJVsK"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-wrap="nowrap"
+        >
+          <input
+            class="size-2 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="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+          >
+            1
+          </span>
+        </div>
       </div>
     </fieldset>
   </div>,
diff --git a/src/renderer/routes/__snapshots__/Filters.test.tsx.snap b/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
index f6b3da3f8..f2502dbad 100644
--- a/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
@@ -396,33 +396,6 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           data-padding="none"
           data-wrap="nowrap"
         >
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-2 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="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
           <div
             class="text-sm prc-Stack-Stack-WJVsK"
             data-align="center"
@@ -503,6 +476,33 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
               0
             </span>
           </div>
+          <div
+            class="text-sm prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <input
+              class="size-2 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="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+            >
+              0
+            </span>
+          </div>
         </div>
       </fieldset>
       <fieldset
@@ -647,15 +647,15 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Discussion"
-              id="Discussion"
+              data-testid="checkbox-Dependabot Alert"
+              id="Dependabot Alert"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Discussion"
+              for="Dependabot Alert"
             >
-              Discussion
+              Dependabot Alert
             </label>
             <span
               class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
@@ -674,15 +674,15 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Issue"
-              id="Issue"
+              data-testid="checkbox-Discussion"
+              id="Discussion"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Issue"
+              for="Discussion"
             >
-              Issue
+              Discussion
             </label>
             <span
               class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
@@ -701,15 +701,15 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Pull Request"
-              id="Pull Request"
+              data-testid="checkbox-Invitation"
+              id="Invitation"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Pull Request"
+              for="Invitation"
             >
-              Pull Request
+              Invitation
             </label>
             <span
               class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
@@ -728,15 +728,15 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Release"
-              id="Release"
+              data-testid="checkbox-Issue"
+              id="Issue"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Release"
+              for="Issue"
             >
-              Release
+              Issue
             </label>
             <span
               class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
@@ -755,15 +755,15 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Dependabot Alert"
-              id="Dependabot Alert"
+              data-testid="checkbox-Pull Request"
+              id="Pull Request"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Dependabot Alert"
+              for="Pull Request"
             >
-              Dependabot Alert
+              Pull Request
             </label>
             <span
               class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
@@ -782,15 +782,15 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Invitation"
-              id="Invitation"
+              data-testid="checkbox-Release"
+              id="Release"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Invitation"
+              for="Release"
             >
-              Invitation
+              Release
             </label>
             <span
               class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
@@ -945,49 +945,22 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Draft"
-              id="Draft"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Draft"
-            >
-              Draft
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Open"
-              id="Open"
+              data-testid="checkbox-Closed"
+              id="Closed"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Open"
+              for="Closed"
             >
-              Open
+              Closed
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Open"
-              data-testid="tooltip-tooltip-Open"
-              id="tooltip-Open"
+              aria-label="tooltip-Closed"
+              data-testid="tooltip-tooltip-Closed"
+              id="tooltip-Closed"
               tabindex="0"
               type="button"
             >
@@ -1014,6 +987,33 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
               0
             </span>
           </div>
+          <div
+            class="text-sm prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <input
+              class="size-2 rounded-sm cursor-pointer"
+              data-testid="checkbox-Draft"
+              id="Draft"
+              type="checkbox"
+            />
+            <label
+              class="font-medium text-gitify-font cursor-pointer"
+              for="Draft"
+            >
+              Draft
+            </label>
+            <span
+              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+            >
+              0
+            </span>
+          </div>
           <div
             class="text-sm prc-Stack-Stack-WJVsK"
             data-align="center"
@@ -1052,22 +1052,22 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Closed"
-              id="Closed"
+              data-testid="checkbox-Open"
+              id="Open"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Closed"
+              for="Open"
             >
-              Closed
+              Open
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Closed"
-              data-testid="tooltip-tooltip-Closed"
-              id="tooltip-Closed"
+              aria-label="tooltip-Open"
+              data-testid="tooltip-tooltip-Open"
+              id="tooltip-Open"
               tabindex="0"
               type="button"
             >
@@ -1396,22 +1396,22 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Workflow Run Completed"
-              id="Workflow Run Completed"
+              data-testid="checkbox-Commented"
+              id="Commented"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Workflow Run Completed"
+              for="Commented"
             >
-              Workflow Run Completed
+              Commented
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Workflow Run Completed"
-              data-testid="tooltip-tooltip-Workflow Run Completed"
-              id="tooltip-Workflow Run Completed"
+              aria-label="tooltip-Commented"
+              data-testid="tooltip-tooltip-Commented"
+              id="tooltip-Commented"
               tabindex="0"
               type="button"
             >
@@ -1449,22 +1449,22 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Commented"
-              id="Commented"
+              data-testid="checkbox-Invitation Received"
+              id="Invitation Received"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Commented"
+              for="Invitation Received"
             >
-              Commented
+              Invitation Received
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Commented"
-              data-testid="tooltip-tooltip-Commented"
-              id="tooltip-Commented"
+              aria-label="tooltip-Invitation Received"
+              data-testid="tooltip-tooltip-Invitation Received"
+              id="tooltip-Invitation Received"
               tabindex="0"
               type="button"
             >
@@ -1502,22 +1502,22 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Invitation Received"
-              id="Invitation Received"
+              data-testid="checkbox-Member Feature Requested"
+              id="Member Feature Requested"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Invitation Received"
+              for="Member Feature Requested"
             >
-              Invitation Received
+              Member Feature Requested
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Invitation Received"
-              data-testid="tooltip-tooltip-Invitation Received"
-              id="tooltip-Invitation Received"
+              aria-label="tooltip-Member Feature Requested"
+              data-testid="tooltip-tooltip-Member Feature Requested"
+              id="tooltip-Member Feature Requested"
               tabindex="0"
               type="button"
             >
@@ -1555,22 +1555,22 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Updated"
-              id="Updated"
+              data-testid="checkbox-Mentioned"
+              id="Mentioned"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Updated"
+              for="Mentioned"
             >
-              Updated
+              Mentioned
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Updated"
-              data-testid="tooltip-tooltip-Updated"
-              id="tooltip-Updated"
+              aria-label="tooltip-Mentioned"
+              data-testid="tooltip-tooltip-Mentioned"
+              id="tooltip-Mentioned"
               tabindex="0"
               type="button"
             >
@@ -1608,22 +1608,22 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Member Feature Requested"
-              id="Member Feature Requested"
+              data-testid="checkbox-Review Requested"
+              id="Review Requested"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Member Feature Requested"
+              for="Review Requested"
             >
-              Member Feature Requested
+              Review Requested
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Member Feature Requested"
-              data-testid="tooltip-tooltip-Member Feature Requested"
-              id="tooltip-Member Feature Requested"
+              aria-label="tooltip-Review Requested"
+              data-testid="tooltip-tooltip-Review Requested"
+              id="tooltip-Review Requested"
               tabindex="0"
               type="button"
             >
@@ -1661,22 +1661,22 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Mentioned"
-              id="Mentioned"
+              data-testid="checkbox-Security Advisory Credit Received"
+              id="Security Advisory Credit Received"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Mentioned"
+              for="Security Advisory Credit Received"
             >
-              Mentioned
+              Security Advisory Credit Received
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Mentioned"
-              data-testid="tooltip-tooltip-Mentioned"
-              id="tooltip-Mentioned"
+              aria-label="tooltip-Security Advisory Credit Received"
+              data-testid="tooltip-tooltip-Security Advisory Credit Received"
+              id="tooltip-Security Advisory Credit Received"
               tabindex="0"
               type="button"
             >
@@ -1714,22 +1714,22 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Review Requested"
-              id="Review Requested"
+              data-testid="checkbox-Security Alert Received"
+              id="Security Alert Received"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Review Requested"
+              for="Security Alert Received"
             >
-              Review Requested
+              Security Alert Received
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Review Requested"
-              data-testid="tooltip-tooltip-Review Requested"
-              id="tooltip-Review Requested"
+              aria-label="tooltip-Security Alert Received"
+              data-testid="tooltip-tooltip-Security Alert Received"
+              id="tooltip-Security Alert Received"
               tabindex="0"
               type="button"
             >
@@ -1767,22 +1767,22 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Security Advisory Credit Received"
-              id="Security Advisory Credit Received"
+              data-testid="checkbox-State Changed"
+              id="State Changed"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Security Advisory Credit Received"
+              for="State Changed"
             >
-              Security Advisory Credit Received
+              State Changed
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Security Advisory Credit Received"
-              data-testid="tooltip-tooltip-Security Advisory Credit Received"
-              id="tooltip-Security Advisory Credit Received"
+              aria-label="tooltip-State Changed"
+              data-testid="tooltip-tooltip-State Changed"
+              id="tooltip-State Changed"
               tabindex="0"
               type="button"
             >
@@ -1820,22 +1820,22 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Security Alert Received"
-              id="Security Alert Received"
+              data-testid="checkbox-Team Mentioned"
+              id="Team Mentioned"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Security Alert Received"
+              for="Team Mentioned"
             >
-              Security Alert Received
+              Team Mentioned
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Security Alert Received"
-              data-testid="tooltip-tooltip-Security Alert Received"
-              id="tooltip-Security Alert Received"
+              aria-label="tooltip-Team Mentioned"
+              data-testid="tooltip-tooltip-Team Mentioned"
+              id="tooltip-Team Mentioned"
               tabindex="0"
               type="button"
             >
@@ -1873,22 +1873,22 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-State Changed"
-              id="State Changed"
+              data-testid="checkbox-Updated"
+              id="Updated"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="State Changed"
+              for="Updated"
             >
-              State Changed
+              Updated
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-State Changed"
-              data-testid="tooltip-tooltip-State Changed"
-              id="tooltip-State Changed"
+              aria-label="tooltip-Updated"
+              data-testid="tooltip-tooltip-Updated"
+              id="tooltip-Updated"
               tabindex="0"
               type="button"
             >
@@ -1979,22 +1979,22 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
           >
             <input
               class="size-2 rounded-sm cursor-pointer"
-              data-testid="checkbox-Team Mentioned"
-              id="Team Mentioned"
+              data-testid="checkbox-Workflow Run Completed"
+              id="Workflow Run Completed"
               type="checkbox"
             />
             <label
               class="font-medium text-gitify-font cursor-pointer"
-              for="Team Mentioned"
+              for="Workflow Run Completed"
             >
-              Team Mentioned
+              Workflow Run Completed
             </label>
             <button
               aria-expanded="false"
               aria-haspopup="true"
-              aria-label="tooltip-Team Mentioned"
-              data-testid="tooltip-tooltip-Team Mentioned"
-              id="tooltip-Team Mentioned"
+              aria-label="tooltip-Workflow Run Completed"
+              data-testid="tooltip-tooltip-Workflow Run Completed"
+              id="tooltip-Workflow Run Completed"
               tabindex="0"
               type="button"
             >