From d7faef1c13b65eb26a36b6af957495dd701e92db Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 09:04:42 -0500
Subject: [PATCH 01/50] add columns button

---
 assets/images/columns.svg                     | 14 +++++++
 src/components/Icon/Expensicons.ts            |  2 +
 .../Icon/chunks/expensify-icons.chunk.ts      |  2 +
 .../SearchPageHeader/SearchFiltersBar.tsx     | 41 +++++++++++++------
 4 files changed, 46 insertions(+), 13 deletions(-)
 create mode 100644 assets/images/columns.svg

diff --git a/assets/images/columns.svg b/assets/images/columns.svg
new file mode 100644
index 000000000000..13e1224da6db
--- /dev/null
+++ b/assets/images/columns.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 20 20">
+  <!-- Generator: Adobe Illustrator 30.0.0, SVG Export Plug-In . SVG Version: 2.1.1 Build 123)  -->
+  <defs>
+    <style>
+      .st0 {
+        fill-rule: evenodd;
+      }
+    </style>
+  </defs>
+  <path class="st0" d="M18,4H2v12h16V4ZM2,2c-1.105,0-2,.895-2,2v12c0,1.105.895,2,2,2h16c1.105,0,2-.895,2-2V4c0-1.105-.895-2-2-2H2Z"/>
+  <path d="M6,4h2v12h-2V4Z"/>
+  <path d="M12,4h2v12h-2V4Z"/>
+</svg>
\ No newline at end of file
diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts
index b66b17b32bdc..aec8abbfecec 100644
--- a/src/components/Icon/Expensicons.ts
+++ b/src/components/Icon/Expensicons.ts
@@ -47,6 +47,7 @@ import Close from '@assets/images/close.svg';
 import ClosedSign from '@assets/images/closed-sign.svg';
 import Coins from '@assets/images/coins.svg';
 import Collapse from '@assets/images/collapse.svg';
+import Columns from '@assets/images/columns.svg';
 import CommentBubbles from '@assets/images/comment-bubbles.svg';
 import Concierge from '@assets/images/concierge.svg';
 import Connect from '@assets/images/connect.svg';
@@ -216,6 +217,7 @@ export {
     ConciergeAvatar,
     Connect,
     ConnectionComplete,
+    Columns,
     Copy,
     CreditCard,
     CreditCardHourglass,
diff --git a/src/components/Icon/chunks/expensify-icons.chunk.ts b/src/components/Icon/chunks/expensify-icons.chunk.ts
index 68d8253c0977..10a0c7fada65 100644
--- a/src/components/Icon/chunks/expensify-icons.chunk.ts
+++ b/src/components/Icon/chunks/expensify-icons.chunk.ts
@@ -54,6 +54,7 @@ import Close from '@assets/images/close.svg';
 import ClosedSign from '@assets/images/closed-sign.svg';
 import Coins from '@assets/images/coins.svg';
 import Collapse from '@assets/images/collapse.svg';
+import Columns from '@assets/images/columns.svg';
 import CommentBubbles from '@assets/images/comment-bubbles.svg';
 import Concierge from '@assets/images/concierge.svg';
 import Connect from '@assets/images/connect.svg';
@@ -266,6 +267,7 @@ const Expensicons = {
     Clock,
     ClosedSign,
     Collapse,
+    Columns,
     CommentBubbles,
     Concierge,
     ConciergeAvatar,
diff --git a/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx b/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
index e64e015a73ca..33fc6366ef4f 100644
--- a/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
+++ b/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
@@ -100,7 +100,7 @@ function SearchFiltersBar({
 
     const {isOffline} = useNetwork();
     const personalDetails = usePersonalDetails();
-    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const {shouldUseNarrowLayout, isLargeScreenWidth} = useResponsiveLayout();
     const {selectedTransactions, selectAllMatchingItems, areAllMatchingItemsSelected, showSelectAllMatchingItems, shouldShowFiltersBarLoading} = useSearchContext();
 
     const [email] = useOnyx(ONYXKEYS.SESSION, {canBeMissing: true, selector: emailSelector});
@@ -114,7 +114,7 @@ function SearchFiltersBar({
     const [allFeeds] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER, {canBeMissing: true});
     const {isAccountLocked, showLockedAccountModal} = useContext(LockedAccountContext);
     const [searchResultsErrors] = useOnyx(`${ONYXKEYS.COLLECTION.SNAPSHOT}${hash}`, {canBeMissing: true, selector: searchResultsErrorSelector});
-    const expensifyIcons = useMemoizedLazyExpensifyIcons(['Filter'] as const);
+    const expensifyIcons = useMemoizedLazyExpensifyIcons(['Filter', 'Columns'] as const);
     const {isDelegateAccessRestricted, showDelegateNoAccessModal} = useContext(DelegateNoAccessContext);
 
     const taxRates = getAllTaxRates(allPolicies);
@@ -786,17 +786,32 @@ function SearchFiltersBar({
 
     const renderListFooter = useCallback(
         () => (
-            <Button
-                link
-                small
-                shouldUseDefaultHover={false}
-                text={filterButtonText}
-                iconFill={theme.link}
-                iconHoverFill={theme.linkHover}
-                icon={expensifyIcons.Filter}
-                textStyles={[styles.textMicroBold]}
-                onPress={openAdvancedFilters}
-            />
+            <View style={[styles.flexRow, styles.gap2]}>
+                <Button
+                    link
+                    small
+                    shouldUseDefaultHover={false}
+                    text={filterButtonText}
+                    iconFill={theme.link}
+                    iconHoverFill={theme.linkHover}
+                    icon={expensifyIcons.Filter}
+                    textStyles={[styles.textMicroBold]}
+                    onPress={openAdvancedFilters}
+                />
+                {isLargeScreenWidth && (
+                    <Button
+                        link
+                        small
+                        shouldUseDefaultHover={false}
+                        text={filterButtonText}
+                        iconFill={theme.link}
+                        iconHoverFill={theme.linkHover}
+                        icon={expensifyIcons.Columns}
+                        textStyles={[styles.textMicroBold]}
+                        onPress={openAdvancedFilters}
+                    />
+                )}
+            </View>
         ),
         [filterButtonText, theme.link, theme.linkHover, styles.textMicroBold, openAdvancedFilters, expensifyIcons],
     );

From 763542afd8682b1fedbd85be72c21d0d3a2dd753 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 09:09:46 -0500
Subject: [PATCH 02/50] add faux translations

---
 .../Search/SearchPageHeader/SearchFiltersBar.tsx | 16 ++++++++++++++--
 src/languages/de.ts                              |  1 +
 src/languages/en.ts                              |  1 +
 src/languages/es.ts                              |  1 +
 src/languages/fr.ts                              |  1 +
 src/languages/it.ts                              |  1 +
 src/languages/ja.ts                              |  1 +
 src/languages/nl.ts                              |  1 +
 src/languages/pl.ts                              |  1 +
 src/languages/pt-BR.ts                           |  1 +
 src/languages/zh-hans.ts                         |  1 +
 11 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx b/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
index 33fc6366ef4f..d7dabbd0e605 100644
--- a/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
+++ b/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
@@ -803,7 +803,7 @@ function SearchFiltersBar({
                         link
                         small
                         shouldUseDefaultHover={false}
-                        text={filterButtonText}
+                        text={translate('search.columms')}
                         iconFill={theme.link}
                         iconHoverFill={theme.linkHover}
                         icon={expensifyIcons.Columns}
@@ -813,7 +813,19 @@ function SearchFiltersBar({
                 )}
             </View>
         ),
-        [filterButtonText, theme.link, theme.linkHover, styles.textMicroBold, openAdvancedFilters, expensifyIcons],
+        [
+            styles.flexRow,
+            styles.gap2,
+            styles.textMicroBold,
+            filterButtonText,
+            theme.link,
+            theme.linkHover,
+            expensifyIcons.Filter,
+            expensifyIcons.Columns,
+            openAdvancedFilters,
+            isLargeScreenWidth,
+            translate,
+        ],
     );
 
     if (hasErrors) {
diff --git a/src/languages/de.ts b/src/languages/de.ts
index 17a8ce7837ad..be043da2764d 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -6758,6 +6758,7 @@ Fordere Spesendetails wie Belege und Beschreibungen an, lege Limits und Standard
                 subtitle: 'Null Spesen. Maximale Entspannung. Gut gemacht!',
             },
         },
+        columms: 'Columns',
         statements: 'Abrechnungen',
         unapprovedCash: 'Nicht genehmigtes Bargeld',
         unapprovedCard: 'Nicht genehmigte Karte',
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 2a0c49a8c371..a1d3f5a0e846 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -6614,6 +6614,7 @@ const translations = {
                 subtitle: 'Zero expenses. Maximum chill. Well done!',
             },
         },
+        columms: 'Columns',
         statements: 'Statements',
         unapprovedCash: 'Unapproved cash',
         unapprovedCard: 'Unapproved card',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 3c6951e98526..a031387485bc 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -6239,6 +6239,7 @@ ${amount} para ${merchant} - ${date}`,
                 subtitle: 'Cero gastos. Máxima relajación. ¡Bien hecho!',
             },
         },
+        columms: 'Columns',
         statements: 'Extractos',
         unapprovedCash: 'Efectivo no aprobado',
         unapprovedCard: 'Tarjeta no aprobada',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index b0d7d8eacdbd..5305928101b8 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -6766,6 +6766,7 @@ Exigez des informations de dépense comme les reçus et les descriptions, défin
                 subtitle: 'Zéro note de frais. Détente maximale. Bien joué !',
             },
         },
+        columms: 'Columns',
         statements: 'Relevés',
         unapprovedCash: 'Espèces non approuvées',
         unapprovedCard: 'Carte non approuvée',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 5dabffde6c6f..3239435e6d19 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -6738,6 +6738,7 @@ Richiedi dettagli di spesa come ricevute e descrizioni, imposta limiti e valori
                 subtitle: 'Zero spese. Massimo relax. Ben fatto!',
             },
         },
+        columms: 'Columns',
         statements: 'Estratti conto',
         unapprovedCash: 'Contanti non approvati',
         unapprovedCard: 'Carta non approvata',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 7cf3e98dc08a..04bc2787e958 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -6689,6 +6689,7 @@ ${reportName}
                 subtitle: '経費はゼロ。くつろぎはマックス。お見事です！',
             },
         },
+        columms: 'Columns',
         statements: 'ステートメント',
         unapprovedCash: '未承認の現金',
         unapprovedCard: '未承認のカード',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 3602c495a1be..f79cf3a4b709 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -6724,6 +6724,7 @@ Vraag verplichte uitgavedetails zoals bonnetjes en beschrijvingen, stel limieten
                 subtitle: 'Nul onkosten. Maximale ontspanning. Goed gedaan!',
             },
         },
+        columms: 'Columns',
         statements: 'Afschriften',
         unapprovedCash: 'Niet-goedgekeurde contanten',
         unapprovedCard: 'Niet-goedgekeurde kaart',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 27a70e1213ff..20b9d2bef8ba 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -6715,6 +6715,7 @@ Wymagaj szczegółów wydatków, takich jak paragony i opisy, ustawiaj limity i
                 subtitle: 'Zero wydatków. Maksymalny luz. Dobra robota!',
             },
         },
+        columms: 'Columns',
         statements: 'Wyciągi',
         unapprovedCash: 'Niezaakceptowana gotówka',
         unapprovedCard: 'Niezatwierdzona karta',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 7ed99fde4c02..b2d9cdf5e69f 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -6719,6 +6719,7 @@ Exija detalhes de despesas como recibos e descrições, defina limites e padrõe
                 subtitle: 'Zero despesas. Máxima tranquilidade. Muito bem!',
             },
         },
+        columms: 'Columns',
         statements: 'Extratos',
         unapprovedCash: 'Dinheiro não aprovado',
         unapprovedCard: 'Cartão não aprovado',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 17768371d99e..a4c675643cdc 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -6589,6 +6589,7 @@ ${reportName}
                 subtitle: '报销为零，轻松满分。干得好！',
             },
         },
+        columms: 'Columns',
         statements: '对账单',
         unapprovedCash: '未批准的现金',
         unapprovedCard: '未批准的卡片',

From a39ee548db2d9a1e6d0da2af77c15bbf9277b79e Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 09:18:48 -0500
Subject: [PATCH 03/50] create columns page

---
 src/pages/Search/SearchColumnsPage.tsx | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 src/pages/Search/SearchColumnsPage.tsx

diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
new file mode 100644
index 000000000000..b77382472304
--- /dev/null
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+function SearchColumnsPage() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    return (
+        <ScreenWrapper
+            testID={SearchColumnsPage.displayName}
+            shouldShowOfflineIndicatorInWideScreen
+            offlineIndicatorStyle={styles.mtAuto}
+            includeSafeAreaPaddingBottom
+        >
+            <HeaderWithBackButton title={translate('search.columns')} />
+        </ScreenWrapper>
+    );
+}
+
+SearchColumnsPage.displayName = 'SearchColumnsPage';
+
+export default SearchColumnsPage;

From 9cfa9bb26833d6f8eef948ae153ca74d70317f7d Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 09:24:54 -0500
Subject: [PATCH 04/50] add route for rhp

---
 src/ROUTES.ts                                               | 3 +++
 src/SCREENS.ts                                              | 2 ++
 .../Navigation/AppNavigator/ModalStackNavigators/index.tsx  | 6 ++++++
 .../Navigation/linkingConfig/RELATIONS/SEARCH_TO_RHP.ts     | 1 +
 src/libs/Navigation/linkingConfig/config.ts                 | 5 +++++
 src/libs/Navigation/types.ts                                | 6 ++++++
 6 files changed, 23 insertions(+)

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 3b7d7253be31..ad5120eff277 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -66,6 +66,9 @@ const ROUTES = {
         route: 'search/saved-search/rename',
         getRoute: ({name, jsonQuery}: {name: string; jsonQuery: SearchQueryString}) => `search/saved-search/rename?name=${name}&q=${jsonQuery}` as const,
     },
+    SEARCH_COLUMNS: {
+        route: 'search/columns',
+    },
     SEARCH_ADVANCED_FILTERS: {
         route: 'search/filters/:filterKey?',
         getRoute: (filterKey?: SearchFilterKey | UserFriendlyKey) => {
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index 8ac4f48c7614..da77476dd62b 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -48,6 +48,7 @@ const SCREENS = {
         MONEY_REQUEST_REPORT_HOLD_TRANSACTIONS: 'Search_Money_Request_Report_Hold_Transactions',
         MONEY_REQUEST_REPORT_REJECT_TRANSACTIONS: 'Search_Money_Request_Report_Reject_Transactions',
         REPORT_RHP: 'Search_Report_RHP',
+        COLUMNS_RHP: 'Search_Columns_RHP',
         REPORT_VERIFY_ACCOUNT: 'Search_Report_Verify_Account',
         ADVANCED_FILTERS_RHP: 'Search_Advanced_Filters_RHP',
         ADVANCED_FILTERS_TYPE_RHP: 'Search_Advanced_Filters_Type_RHP',
@@ -253,6 +254,7 @@ const SCREENS = {
         EXPENSE_REPORT: 'ExpenseReport',
         SEARCH_MONEY_REQUEST_REPORT: 'SearchMoneyRequestReport',
 
+        SEARCH_COLUMNS: 'SearchColumns',
         SEARCH_ADVANCED_FILTERS: 'SearchAdvancedFilters',
         SEARCH_SAVED_SEARCH: 'SearchSavedSearch',
         SETTINGS_CATEGORIES: 'SettingsCategories',
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index 4d664d831c9c..c23c77a8fa73 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -44,6 +44,7 @@ import type {
     RoomMembersNavigatorParamList,
     ScheduleCallParamList,
     SearchAdvancedFiltersParamList,
+    SearchColumnsParamList,
     SearchReportActionsParamList,
     SearchReportParamList,
     SearchSavedSearchParamList,
@@ -976,6 +977,10 @@ const RestrictedActionModalStackNavigator = createModalStackNavigator<SearchRepo
     [SCREENS.RESTRICTED_ACTION_ROOT]: () => require<ReactComponentModule>('../../../../pages/RestrictedAction/Workspace/WorkspaceRestrictedActionPage').default,
 });
 
+const SearchColumnsModalStackNavigator = createModalStackNavigator<SearchColumnsParamList>({
+    [SCREENS.SEARCH.COLUMNS_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchColumnsPage').default,
+});
+
 const ShareModalStackNavigator = createModalStackNavigator<ShareNavigatorParamList>({
     [SCREENS.SHARE.ROOT]: () => require<ReactComponentModule>('@pages/Share/ShareRootPage').default,
     [SCREENS.SHARE.SHARE_DETAILS]: () => require<ReactComponentModule>('@pages/Share/ShareDetailsPage').default,
@@ -1066,4 +1071,5 @@ export {
     MergeTransactionStackNavigator,
     ReportCardActivateStackNavigator,
     WorkspacesDomainModalStackNavigator,
+    SearchColumnsModalStackNavigator,
 };
diff --git a/src/libs/Navigation/linkingConfig/RELATIONS/SEARCH_TO_RHP.ts b/src/libs/Navigation/linkingConfig/RELATIONS/SEARCH_TO_RHP.ts
index 05caeb60b3de..7c034c8b4b1e 100644
--- a/src/libs/Navigation/linkingConfig/RELATIONS/SEARCH_TO_RHP.ts
+++ b/src/libs/Navigation/linkingConfig/RELATIONS/SEARCH_TO_RHP.ts
@@ -13,6 +13,7 @@ const SEARCH_TO_RHP: Partial<Record<keyof SearchFullscreenNavigatorParamList, st
         SCREENS.SEARCH.TRANSACTION_HOLD_REASON_RHP,
         SCREENS.SEARCH.SEARCH_REJECT_REASON_RHP,
         SCREENS.SEARCH.TRANSACTIONS_CHANGE_REPORT_SEARCH_RHP,
+        SCREENS.SEARCH.COLUMNS_RHP,
         SCREENS.SEARCH.ADVANCED_FILTERS_RHP,
         SCREENS.SEARCH.ADVANCED_FILTERS_CURRENCY_RHP,
         SCREENS.SEARCH.ADVANCED_FILTERS_GROUP_CURRENCY_RHP,
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index a7e5f5530599..a9ff56f5cb14 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -1592,6 +1592,11 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
                         [SCREENS.TRAVEL.VERIFY_ACCOUNT]: ROUTES.TRAVEL_VERIFY_ACCOUNT.route,
                     },
                 },
+                [SCREENS.RIGHT_MODAL.SEARCH_COLUMNS]: {
+                    screens: {
+                        [SCREENS.SEARCH.COLUMNS_RHP]: ROUTES.SEARCH_COLUMNS.route,
+                    },
+                },
                 [SCREENS.RIGHT_MODAL.SEARCH_REPORT]: {
                     screens: {
                         [SCREENS.SEARCH.REPORT_RHP]: ROUTES.SEARCH_REPORT.route,
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index 1ca59f3f441a..10a0186d3db8 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -2178,6 +2178,7 @@ type RightModalNavigatorParamList = {
     [SCREENS.RIGHT_MODAL.REPORT_CHANGE_APPROVER]: NavigatorScreenParams<ReportChangeApproverParamList>;
     [SCREENS.RIGHT_MODAL.MERGE_TRANSACTION]: NavigatorScreenParams<MergeTransactionNavigatorParamList>;
     [SCREENS.RIGHT_MODAL.DOMAIN]: NavigatorScreenParams<WorkspacesDomainModalNavigatorParamList>;
+    [SCREENS.RIGHT_MODAL.SEARCH_COLUMNS]: NavigatorScreenParams<SearchColumnsParamList>;
 };
 
 type TravelNavigatorParamList = {
@@ -2710,6 +2711,10 @@ type SearchSavedSearchParamList = {
     [SCREENS.SEARCH.SAVED_SEARCH_RENAME_RHP]: SaveSearchParams;
 };
 
+type SearchColumnsParamList = {
+    [SCREENS.SEARCH.COLUMNS_RHP]: Record<string, never>;
+};
+
 type RestrictedActionParamList = {
     [SCREENS.RESTRICTED_ACTION_ROOT]: {
         policyID: string;
@@ -2919,4 +2924,5 @@ export type {
     WorkspacesDomainModalNavigatorParamList,
     DomainSplitNavigatorParamList,
     DomainScreenName,
+    SearchColumnsParamList,
 };

From 1a8f90005ef008bcaa4c9e22be9efb717ae0e483 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 09:27:10 -0500
Subject: [PATCH 05/50] navigate on click

---
 src/ROUTES.ts                                               | 4 +---
 src/components/Search/SearchPageHeader/SearchFiltersBar.tsx | 6 +++++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index ad5120eff277..9cbc13be2f56 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -66,9 +66,7 @@ const ROUTES = {
         route: 'search/saved-search/rename',
         getRoute: ({name, jsonQuery}: {name: string; jsonQuery: SearchQueryString}) => `search/saved-search/rename?name=${name}&q=${jsonQuery}` as const,
     },
-    SEARCH_COLUMNS: {
-        route: 'search/columns',
-    },
+    SEARCH_COLUMNS: 'search/columns',
     SEARCH_ADVANCED_FILTERS: {
         route: 'search/filters/:filterKey?',
         getRoute: (filterKey?: SearchFilterKey | UserFriendlyKey) => {
diff --git a/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx b/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
index d7dabbd0e605..29ed7eb2d343 100644
--- a/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
+++ b/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
@@ -326,6 +326,10 @@ function SearchFiltersBar({
         Navigation.navigate(ROUTES.SEARCH_ADVANCED_FILTERS.getRoute());
     }, [filterFormValues]);
 
+    const openSearchColumns = () => {
+        Navigation.navigate(ROUTES.SEARCH_COLUMNS);
+    };
+
     const isFormInitializedRef = useRef(false);
 
     useEffect(() => {
@@ -808,7 +812,7 @@ function SearchFiltersBar({
                         iconHoverFill={theme.linkHover}
                         icon={expensifyIcons.Columns}
                         textStyles={[styles.textMicroBold]}
-                        onPress={openAdvancedFilters}
+                        onPress={openSearchColumns}
                     />
                 )}
             </View>

From 4c84d0542c76f2e79d06389ab8db67addfff904e Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 09:37:17 -0500
Subject: [PATCH 06/50] finish column RHP

---
 .../AppNavigator/Navigators/RightModalNavigator.tsx           | 4 ++++
 src/libs/Navigation/linkingConfig/config.ts                   | 2 +-
 src/pages/Search/SearchColumnsPage.tsx                        | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
index 597293716f4b..8136743290da 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
@@ -337,6 +337,10 @@ function RightModalNavigator({navigation, route}: RightModalNavigatorProps) {
                             name={SCREENS.RIGHT_MODAL.DOMAIN}
                             component={ModalStackNavigators.WorkspacesDomainModalStackNavigator}
                         />
+                        <Stack.Screen
+                            name={SCREENS.RIGHT_MODAL.SEARCH_COLUMNS}
+                            component={ModalStackNavigators.SearchColumnsModalStackNavigator}
+                        />
                     </Stack.Navigator>
                 </Animated.View>
                 {/* The third and second overlays are displayed here to cover RHP screens wider than the currently focused screen. */}
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index a9ff56f5cb14..48ccaa0b7eef 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -1594,7 +1594,7 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
                 },
                 [SCREENS.RIGHT_MODAL.SEARCH_COLUMNS]: {
                     screens: {
-                        [SCREENS.SEARCH.COLUMNS_RHP]: ROUTES.SEARCH_COLUMNS.route,
+                        [SCREENS.SEARCH.COLUMNS_RHP]: ROUTES.SEARCH_COLUMNS,
                     },
                 },
                 [SCREENS.RIGHT_MODAL.SEARCH_REPORT]: {
diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index b77382472304..55883b7e187d 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -15,7 +15,7 @@ function SearchColumnsPage() {
             offlineIndicatorStyle={styles.mtAuto}
             includeSafeAreaPaddingBottom
         >
-            <HeaderWithBackButton title={translate('search.columns')} />
+            <HeaderWithBackButton title={translate('search.columms')} />
         </ScreenWrapper>
     );
 }

From 6ad72b07dd0ee44c111105620813989839ebd88e Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 09:42:56 -0500
Subject: [PATCH 07/50] add columns as search advanced filter

---
 src/CONST/index.ts                          | 2 ++
 src/libs/SearchQueryUtils.ts                | 3 ++-
 src/types/form/SearchAdvancedFiltersForm.ts | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index a1628d228e49..c1aa8a06f3b6 100755
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -6822,6 +6822,7 @@ const CONST = {
             ATTENDEE: 'attendee',
             IS: 'is',
             REPORT_FIELD: 'reportField',
+            COLUMNS: 'columns',
         },
         REPORT_FIELD: {
             // All report fields start with this, so use this to check if a search key is a report field
@@ -6886,6 +6887,7 @@ const CONST = {
             ATTENDEE: 'attendee',
             IS: 'is',
             REPORT_FIELD: 'report-field',
+            COLUMNS: 'columns',
         },
         get SEARCH_USER_FRIENDLY_VALUES_MAP() {
             return {
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index d908a8e4fd16..c281f74c9918 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -678,7 +678,8 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
                     filterKey === FILTER_KEYS.HAS ||
                     filterKey === FILTER_KEYS.IS ||
                     filterKey === FILTER_KEYS.EXPORTER ||
-                    filterKey === FILTER_KEYS.ATTENDEE) &&
+                    filterKey === FILTER_KEYS.ATTENDEE ||
+                    filterKey === FILTER_KEYS.COLUMNS) &&
                 Array.isArray(filterValue) &&
                 filterValue.length > 0
             ) {
diff --git a/src/types/form/SearchAdvancedFiltersForm.ts b/src/types/form/SearchAdvancedFiltersForm.ts
index 43ef6a175942..d775dabf2f02 100644
--- a/src/types/form/SearchAdvancedFiltersForm.ts
+++ b/src/types/form/SearchAdvancedFiltersForm.ts
@@ -164,6 +164,8 @@ const FILTER_KEYS = {
     ATTENDEE_NOT: 'attendeeNot',
     ATTENDEE: 'attendee',
     REPORT_FIELD: 'reportField',
+
+    COLUMNS: 'columns',
 } as const;
 
 const ALLOWED_TYPE_FILTERS = {
@@ -261,6 +263,7 @@ const ALLOWED_TYPE_FILTERS = {
         FILTER_KEYS.ATTENDEE,
         FILTER_KEYS.REPORT_FIELD,
         FILTER_KEYS.ATTENDEE_NOT,
+        FILTER_KEYS.COLUMNS,
     ],
     [CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT]: [
         FILTER_KEYS.TYPE,
@@ -316,6 +319,7 @@ const ALLOWED_TYPE_FILTERS = {
         FILTER_KEYS.TITLE,
         FILTER_KEYS.TITLE_NOT,
         FILTER_KEYS.REPORT_FIELD,
+        FILTER_KEYS.COLUMNS,
     ],
     [CONST.SEARCH.DATA_TYPES.INVOICE]: [
         FILTER_KEYS.TYPE,
@@ -399,6 +403,7 @@ const ALLOWED_TYPE_FILTERS = {
         FILTER_KEYS.TITLE,
         FILTER_KEYS.REPORT_FIELD,
         FILTER_KEYS.TITLE_NOT,
+        FILTER_KEYS.COLUMNS,
     ],
 
     [CONST.SEARCH.DATA_TYPES.TRIP]: [
@@ -667,6 +672,7 @@ type SearchAdvancedFiltersForm = Form<
         [FILTER_KEYS.IS]: string[];
         [FILTER_KEYS.HAS]: string[];
         [FILTER_KEYS.REPORT_FIELD]: string;
+        [FILTER_KEYS.COLUMNS]: string[];
     } & Record<ReportFieldTextKey, string> &
         Record<ReportFieldDateKey, string> &
         Record<ReportFieldNegatedKey, string>

From 6a1c1aa5212c3b15b430d8e0b7e1311ae6392fea Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 09:50:49 -0500
Subject: [PATCH 08/50] add translation for col names

---
 src/CONST/index.ts                          |  9 +++++++++
 src/libs/SearchUIUtils.ts                   | 21 +++++++++++++++++++++
 src/pages/Search/SearchColumnsPage.tsx      | 11 +++++++++++
 src/types/form/SearchAdvancedFiltersForm.ts |  1 +
 4 files changed, 42 insertions(+)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index c1aa8a06f3b6..533544d16b92 100755
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -6696,6 +6696,15 @@ const CONST = {
             CARD: 'card',
             WITHDRAWAL_ID: 'withdrawal-id',
         },
+        COLUMNS: {
+            DATE: 'date',
+            STATUS: 'status',
+            TITLE: 'title',
+            FROM: 'from',
+            TO: 'to',
+            TOTAL: 'total',
+            ACTION: 'action',
+        },
         BOOLEAN: {
             YES: 'yes',
             NO: 'no',
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index caf32aa867c2..23a075e3ab36 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -2051,6 +2051,26 @@ function getExpenseTypeTranslationKey(expenseType: ValueOf<typeof CONST.SEARCH.T
     }
 }
 
+function getSearchColumnTranslationKey(columnId: ValueOf<typeof CONST.SEARCH.COLUMNS>): TranslationPaths {
+    // eslint-disable-next-line default-case
+    switch (columnId) {
+        case CONST.SEARCH.COLUMNS.DATE:
+            return 'common.date';
+        case CONST.SEARCH.COLUMNS.STATUS:
+            return 'common.status';
+        case CONST.SEARCH.COLUMNS.TITLE:
+            return 'common.title';
+        case CONST.SEARCH.COLUMNS.FROM:
+            return 'common.from';
+        case CONST.SEARCH.COLUMNS.TO:
+            return 'common.to';
+        case CONST.SEARCH.COLUMNS.TOTAL:
+            return 'common.total';
+        case CONST.SEARCH.COLUMNS.ACTION:
+            return 'common.action';
+    }
+}
+
 type OverflowMenuIconsType = Record<'Pencil', IconAsset>;
 
 /**
@@ -2711,5 +2731,6 @@ export {
     getSettlementStatus,
     getSettlementStatusBadgeProps,
     getTransactionFromTransactionListItem,
+    getSearchColumnTranslationKey,
 };
 export type {SavedSearchMenuItem, SearchTypeMenuSection, SearchTypeMenuItem, SearchDateModifier, SearchDateModifierLower, SearchKey, ArchivedReportsIDSet};
diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 55883b7e187d..62ece3de434c 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -1,13 +1,24 @@
 import React from 'react';
+import {useOnyx} from 'react-native-onyx';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 
 function SearchColumnsPage() {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
+    const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, {canBeMissing: true});
+
+    const allColumns = Object.values(CONST.SEARCH.COLUMNS);
+
+    const columnItems = allColumns.map((column) => {
+        const columnName = translate();
+    });
+
     return (
         <ScreenWrapper
             testID={SearchColumnsPage.displayName}
diff --git a/src/types/form/SearchAdvancedFiltersForm.ts b/src/types/form/SearchAdvancedFiltersForm.ts
index d775dabf2f02..873b758424bc 100644
--- a/src/types/form/SearchAdvancedFiltersForm.ts
+++ b/src/types/form/SearchAdvancedFiltersForm.ts
@@ -481,6 +481,7 @@ const ALLOWED_TYPE_FILTERS = {
         FILTER_KEYS.TITLE,
         FILTER_KEYS.TITLE_NOT,
         FILTER_KEYS.REPORT_FIELD,
+        FILTER_KEYS.COLUMNS,
     ],
 
     [CONST.SEARCH.DATA_TYPES.CHAT]: [

From 582f325de3d4410f51773cd266b3c5fa9c0d393f Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 09:54:36 -0500
Subject: [PATCH 09/50] add initial selected item

---
 src/pages/Search/SearchColumnsPage.tsx | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 62ece3de434c..54558076496f 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -1,9 +1,13 @@
 import React from 'react';
-import {useOnyx} from 'react-native-onyx';
+import {View} from 'react-native';
+import type {ValueOf} from 'type-fest';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
+import SearchMultipleSelectionPicker from '@components/Search/SearchMultipleSelectionPicker';
 import useLocalize from '@hooks/useLocalize';
+import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
+import {getSearchColumnTranslationKey} from '@libs/SearchUIUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 
@@ -15,8 +19,16 @@ function SearchColumnsPage() {
 
     const allColumns = Object.values(CONST.SEARCH.COLUMNS);
 
-    const columnItems = allColumns.map((column) => {
-        const columnName = translate();
+    const initiallySelectedColumns = searchAdvancedFiltersForm?.columns
+        ?.filter((columnId) => Object.values(CONST.SEARCH.COLUMNS).includes(columnId as ValueOf<typeof CONST.SEARCH.COLUMNS>))
+        .map((columnId) => {
+            const columnName = translate(getSearchColumnTranslationKey(columnId as ValueOf<typeof CONST.SEARCH.COLUMNS>));
+            return {name: columnName, value: columnId};
+        });
+
+    const columnItems = allColumns.map((columnId) => {
+        const columnName = translate(getSearchColumnTranslationKey(columnId));
+        return {name: columnName, value: columnId};
     });
 
     return (
@@ -27,6 +39,14 @@ function SearchColumnsPage() {
             includeSafeAreaPaddingBottom
         >
             <HeaderWithBackButton title={translate('search.columms')} />
+            <View style={[styles.flex1]}>
+                <SearchMultipleSelectionPicker
+                    items={columnItems}
+                    initiallySelectedItems={initiallySelectedColumns}
+                    onSaveSelection={() => {}}
+                    shouldShowTextInput={false}
+                />
+            </View>
         </ScreenWrapper>
     );
 }

From e9b9080b2797c75a456e9cfacb214fb70a09eb50 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 10:04:36 -0500
Subject: [PATCH 10/50] remove jump to top behavior

---
 .../Search/SearchMultipleSelectionPicker.tsx  | 31 +++++++++++++++++--
 src/pages/Search/SearchColumnsPage.tsx        |  1 +
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/components/Search/SearchMultipleSelectionPicker.tsx b/src/components/Search/SearchMultipleSelectionPicker.tsx
index 36738dc454f3..8980d8355457 100644
--- a/src/components/Search/SearchMultipleSelectionPicker.tsx
+++ b/src/components/Search/SearchMultipleSelectionPicker.tsx
@@ -19,10 +19,18 @@ type SearchMultipleSelectionPickerProps = {
     initiallySelectedItems: SearchMultipleSelectionPickerItem[] | undefined;
     pickerTitle?: string;
     onSaveSelection: (values: string[]) => void;
+    disableScrollToTopOnSelect?: boolean;
     shouldShowTextInput?: boolean;
 };
 
-function SearchMultipleSelectionPicker({items, initiallySelectedItems, pickerTitle, onSaveSelection, shouldShowTextInput = true}: SearchMultipleSelectionPickerProps) {
+function SearchMultipleSelectionPicker({
+    items,
+    initiallySelectedItems,
+    pickerTitle,
+    onSaveSelection,
+    disableScrollToTopOnSelect,
+    shouldShowTextInput = true,
+}: SearchMultipleSelectionPickerProps) {
     const {translate, localeCompare} = useLocalize();
 
     const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
@@ -33,6 +41,24 @@ function SearchMultipleSelectionPicker({items, initiallySelectedItems, pickerTit
     }, [initiallySelectedItems]);
 
     const {sections, noResultsFound} = useMemo(() => {
+        if (disableScrollToTopOnSelect) {
+            return {
+                sections: [
+                    {
+                        title: undefined,
+                        data: items
+                            .sort((a, b) => sortOptionsWithEmptyValue(a.value.toString(), b.value.toString(), localeCompare))
+                            .map((item) => ({
+                                text: item.name,
+                                keyForList: item.name,
+                                isSelected: selectedItems.some((selectedItem) => selectedItem.value.toString() === item.value.toString()),
+                                value: item.value,
+                            })),
+                    },
+                ],
+            };
+        }
+
         const selectedItemsSection = selectedItems
             .filter((item) => item?.name.toLowerCase().includes(debouncedSearchTerm?.toLowerCase()))
             .sort((a, b) => sortOptionsWithEmptyValue(a.value.toString(), b.value.toString(), localeCompare))
@@ -42,6 +68,7 @@ function SearchMultipleSelectionPicker({items, initiallySelectedItems, pickerTit
                 isSelected: true,
                 value: item.value,
             }));
+
         const remainingItemsSection = items
             .filter(
                 (item) =>
@@ -72,7 +99,7 @@ function SearchMultipleSelectionPicker({items, initiallySelectedItems, pickerTit
                   ],
             noResultsFound: isEmpty,
         };
-    }, [selectedItems, items, pickerTitle, debouncedSearchTerm, localeCompare]);
+    }, [disableScrollToTopOnSelect, selectedItems, items, pickerTitle, debouncedSearchTerm, localeCompare]);
 
     const onSelectItem = useCallback(
         (item: Partial<OptionData & SearchMultipleSelectionPickerItem>) => {
diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 54558076496f..00a9d47ce198 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -41,6 +41,7 @@ function SearchColumnsPage() {
             <HeaderWithBackButton title={translate('search.columms')} />
             <View style={[styles.flex1]}>
                 <SearchMultipleSelectionPicker
+                    disableScrollToTopOnSelect
                     items={columnItems}
                     initiallySelectedItems={initiallySelectedColumns}
                     onSaveSelection={() => {}}

From fa938b44e95b841dd20dc75340c8648815cb85db Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 10:09:08 -0500
Subject: [PATCH 11/50] add new selection list

---
 src/pages/Search/SearchColumnsPage.tsx | 43 ++++++++++++++++----------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 00a9d47ce198..2a4cc531b1ef 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -3,7 +3,9 @@ import {View} from 'react-native';
 import type {ValueOf} from 'type-fest';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
-import SearchMultipleSelectionPicker from '@components/Search/SearchMultipleSelectionPicker';
+import SearchFilterPageFooterButtons from '@components/Search/SearchFilterPageFooterButtons';
+import SelectionList from '@components/SelectionList';
+import MultiSelectListItem from '@components/SelectionListWithSections/MultiSelectListItem';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -19,17 +21,22 @@ function SearchColumnsPage() {
 
     const allColumns = Object.values(CONST.SEARCH.COLUMNS);
 
-    const initiallySelectedColumns = searchAdvancedFiltersForm?.columns
-        ?.filter((columnId) => Object.values(CONST.SEARCH.COLUMNS).includes(columnId as ValueOf<typeof CONST.SEARCH.COLUMNS>))
-        .map((columnId) => {
-            const columnName = translate(getSearchColumnTranslationKey(columnId as ValueOf<typeof CONST.SEARCH.COLUMNS>));
-            return {name: columnName, value: columnId};
-        });
+    const initiallySelectedColumns = searchAdvancedFiltersForm?.columns?.filter((columnId) => Object.values(CONST.SEARCH.COLUMNS).includes(columnId as ValueOf<typeof CONST.SEARCH.COLUMNS>));
+
+    const sections = [
+        {
+            title: undefined,
+            data: allColumns.map((columnId) => ({
+                text: translate(getSearchColumnTranslationKey(columnId)),
+                value: columnId,
+                keyForList: columnId,
+                isSelected: initiallySelectedColumns?.includes(columnId),
+            })),
+        },
+    ];
+
+    const applyChanges = () => {};
 
-    const columnItems = allColumns.map((columnId) => {
-        const columnName = translate(getSearchColumnTranslationKey(columnId));
-        return {name: columnName, value: columnId};
-    });
 
     return (
         <ScreenWrapper
@@ -40,12 +47,14 @@ function SearchColumnsPage() {
         >
             <HeaderWithBackButton title={translate('search.columms')} />
             <View style={[styles.flex1]}>
-                <SearchMultipleSelectionPicker
-                    disableScrollToTopOnSelect
-                    items={columnItems}
-                    initiallySelectedItems={initiallySelectedColumns}
-                    onSaveSelection={() => {}}
-                    shouldShowTextInput={false}
+                <SelectionList
+                    sections={sections}
+                    onSelectRow={onSelectItem}
+                    shouldStopPropagation
+                    shouldShowTooltips
+                    canSelectMultiple
+                    ListItem={MultiSelectListItem}
+                    footerContent={<SearchFilterPageFooterButtons applyChanges={applyChanges} />}
                 />
             </View>
         </ScreenWrapper>

From 201a4badc3f2259982d6ae9f84cbadb870073ad6 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 10:20:37 -0500
Subject: [PATCH 12/50] more logic for cols

---
 src/pages/Search/SearchColumnsPage.tsx | 45 ++++++++++++++++++++------
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 2a4cc531b1ef..4cc36d3d7a39 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -1,27 +1,34 @@
-import React from 'react';
+import React, {useState} from 'react';
 import {View} from 'react-native';
 import type {ValueOf} from 'type-fest';
+import Button from '@components/Button';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
-import SearchFilterPageFooterButtons from '@components/Search/SearchFilterPageFooterButtons';
-import SelectionList from '@components/SelectionList';
+import type {SearchMultipleSelectionPickerItem} from '@components/Search/SearchMultipleSelectionPicker';
+import {ListItem} from '@components/SelectionList/types';
+import SelectionList from '@components/SelectionListWithSections';
 import MultiSelectListItem from '@components/SelectionListWithSections/MultiSelectListItem';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
+import type {OptionData} from '@libs/ReportUtils';
 import {getSearchColumnTranslationKey} from '@libs/SearchUIUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 
+type ColumnId = ValueOf<typeof CONST.SEARCH.COLUMNS>;
+
+const allColumns = Object.values(CONST.SEARCH.COLUMNS);
+
 function SearchColumnsPage() {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
     const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, {canBeMissing: true});
-
-    const allColumns = Object.values(CONST.SEARCH.COLUMNS);
-
-    const initiallySelectedColumns = searchAdvancedFiltersForm?.columns?.filter((columnId) => Object.values(CONST.SEARCH.COLUMNS).includes(columnId as ValueOf<typeof CONST.SEARCH.COLUMNS>));
+    const [selectedItems, setSelectedItems] = useState<ColumnId[]>(() => {
+        const columnIds = searchAdvancedFiltersForm?.columns?.filter((columnId) => Object.values(CONST.SEARCH.COLUMNS).includes(columnId as ColumnId)) ?? [];
+        return columnIds as ColumnId[];
+    });
 
     const sections = [
         {
@@ -30,13 +37,22 @@ function SearchColumnsPage() {
                 text: translate(getSearchColumnTranslationKey(columnId)),
                 value: columnId,
                 keyForList: columnId,
-                isSelected: initiallySelectedColumns?.includes(columnId),
+                isSelected: selectedItems?.includes(columnId),
             })),
         },
     ];
 
-    const applyChanges = () => {};
+    const onSelectItem = (item: ListItem) => {
+        const updatedColumnId = item.keyForList as ColumnId;
+
+        if (item.isSelected) {
+            setSelectedItems(selectedItems.filter((columnId) => columnId !== item.keyForList));
+        } else {
+            setSelectedItems([...selectedItems, item.keyForList]);
+        }
+    };
 
+    const applyChanges = () => {};
 
     return (
         <ScreenWrapper
@@ -54,7 +70,16 @@ function SearchColumnsPage() {
                     shouldShowTooltips
                     canSelectMultiple
                     ListItem={MultiSelectListItem}
-                    footerContent={<SearchFilterPageFooterButtons applyChanges={applyChanges} />}
+                    footerContent={
+                        <Button
+                            large
+                            success
+                            pressOnEnter
+                            style={[styles.mt3]}
+                            text={translate('common.save')}
+                            onPress={applyChanges}
+                        />
+                    }
                 />
             </View>
         </ScreenWrapper>

From 3b61518eac0d981e36bb47cbdf1eacdf3247c3f9 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 10:21:07 -0500
Subject: [PATCH 13/50] cleanup search page

---
 src/pages/Search/SearchColumnsPage.tsx | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 4cc36d3d7a39..17f90e82a350 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -4,14 +4,12 @@ import type {ValueOf} from 'type-fest';
 import Button from '@components/Button';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
-import type {SearchMultipleSelectionPickerItem} from '@components/Search/SearchMultipleSelectionPicker';
-import {ListItem} from '@components/SelectionList/types';
+import type {ListItem} from '@components/SelectionList/types';
 import SelectionList from '@components/SelectionListWithSections';
 import MultiSelectListItem from '@components/SelectionListWithSections/MultiSelectListItem';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
-import type {OptionData} from '@libs/ReportUtils';
 import {getSearchColumnTranslationKey} from '@libs/SearchUIUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -46,9 +44,9 @@ function SearchColumnsPage() {
         const updatedColumnId = item.keyForList as ColumnId;
 
         if (item.isSelected) {
-            setSelectedItems(selectedItems.filter((columnId) => columnId !== item.keyForList));
+            setSelectedItems(selectedItems.filter((columnId) => columnId !== updatedColumnId));
         } else {
-            setSelectedItems([...selectedItems, item.keyForList]);
+            setSelectedItems([...selectedItems, updatedColumnId]);
         }
     };
 

From 1dc9ea6aa94c6723286b1b44b42588e8db60ba24 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 10:22:18 -0500
Subject: [PATCH 14/50] set the advanced filter form

---
 src/pages/Search/SearchColumnsPage.tsx | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 17f90e82a350..d1078d2f8298 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -10,6 +10,7 @@ import MultiSelectListItem from '@components/SelectionListWithSections/MultiSele
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
+import {updateAdvancedFilters} from '@libs/actions/Search';
 import {getSearchColumnTranslationKey} from '@libs/SearchUIUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -23,7 +24,7 @@ function SearchColumnsPage() {
     const {translate} = useLocalize();
 
     const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, {canBeMissing: true});
-    const [selectedItems, setSelectedItems] = useState<ColumnId[]>(() => {
+    const [selectedColumnIds, setSelectedColumnIds] = useState<ColumnId[]>(() => {
         const columnIds = searchAdvancedFiltersForm?.columns?.filter((columnId) => Object.values(CONST.SEARCH.COLUMNS).includes(columnId as ColumnId)) ?? [];
         return columnIds as ColumnId[];
     });
@@ -35,7 +36,7 @@ function SearchColumnsPage() {
                 text: translate(getSearchColumnTranslationKey(columnId)),
                 value: columnId,
                 keyForList: columnId,
-                isSelected: selectedItems?.includes(columnId),
+                isSelected: selectedColumnIds?.includes(columnId),
             })),
         },
     ];
@@ -44,13 +45,15 @@ function SearchColumnsPage() {
         const updatedColumnId = item.keyForList as ColumnId;
 
         if (item.isSelected) {
-            setSelectedItems(selectedItems.filter((columnId) => columnId !== updatedColumnId));
+            setSelectedColumnIds(selectedColumnIds.filter((columnId) => columnId !== updatedColumnId));
         } else {
-            setSelectedItems([...selectedItems, updatedColumnId]);
+            setSelectedColumnIds([...selectedColumnIds, updatedColumnId]);
         }
     };
 
-    const applyChanges = () => {};
+    const applyChanges = () => {
+        updateAdvancedFilters({columns: selectedColumnIds});
+    };
 
     return (
         <ScreenWrapper

From 6d453edb07a20a1502963d10559dd025c79e8466 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 10:26:20 -0500
Subject: [PATCH 15/50] save to query

---
 src/pages/Search/SearchColumnsPage.tsx | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index d1078d2f8298..e3f898c0b5b1 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -10,10 +10,14 @@ import MultiSelectListItem from '@components/SelectionListWithSections/MultiSele
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
-import {updateAdvancedFilters} from '@libs/actions/Search';
+import {clearAllFilters} from '@libs/actions/Search';
+import Navigation from '@libs/Navigation/Navigation';
+import {buildQueryStringFromFilterFormValues} from '@libs/SearchQueryUtils';
 import {getSearchColumnTranslationKey} from '@libs/SearchUIUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type {SearchAdvancedFiltersForm} from '@src/types/form';
 
 type ColumnId = ValueOf<typeof CONST.SEARCH.COLUMNS>;
 
@@ -24,6 +28,9 @@ function SearchColumnsPage() {
     const {translate} = useLocalize();
 
     const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, {canBeMissing: true});
+
+    console.log(searchAdvancedFiltersForm);
+
     const [selectedColumnIds, setSelectedColumnIds] = useState<ColumnId[]>(() => {
         const columnIds = searchAdvancedFiltersForm?.columns?.filter((columnId) => Object.values(CONST.SEARCH.COLUMNS).includes(columnId as ColumnId)) ?? [];
         return columnIds as ColumnId[];
@@ -52,7 +59,10 @@ function SearchColumnsPage() {
     };
 
     const applyChanges = () => {
-        updateAdvancedFilters({columns: selectedColumnIds});
+        const updatedAdvancedFilters: Partial<SearchAdvancedFiltersForm> = {...searchAdvancedFiltersForm, columns: selectedColumnIds};
+        const queryString = buildQueryStringFromFilterFormValues(updatedAdvancedFilters);
+        clearAllFilters();
+        Navigation.navigate(ROUTES.SEARCH_ROOT.getRoute({query: queryString}), {forceReplace: true});
     };
 
     return (

From 95b240659c5be1c8aef20f1a8191742e5cdbe3d0 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 10:28:40 -0500
Subject: [PATCH 16/50] add highlight via syntax

---
 src/libs/SearchAutocompleteUtils.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/libs/SearchAutocompleteUtils.ts b/src/libs/SearchAutocompleteUtils.ts
index 6786a156beb9..c0966672d646 100644
--- a/src/libs/SearchAutocompleteUtils.ts
+++ b/src/libs/SearchAutocompleteUtils.ts
@@ -1,6 +1,7 @@
 import type {MarkdownRange} from '@expensify/react-native-live-markdown';
 import type {OnyxCollection} from 'react-native-onyx';
 import type {SharedValue} from 'react-native-reanimated/lib/typescript/commonTypes';
+import type {ValueOf} from 'type-fest';
 import type {SubstitutionMap} from '@components/Search/SearchRouter/getQueryWithSubstitutions';
 import type {SearchAutocompleteQueryRange, SearchAutocompleteResult} from '@components/Search/types';
 import CONST from '@src/CONST';
@@ -227,6 +228,8 @@ function filterOutRangesWithCorrectValue(
         case CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT:
             // This uses the same regex as the AmountWithoutCurrencyInput component (allowing for 3 digit decimals as some currencies support that)
             return /^-?(?!.*[.,].*[.,])\d{0,8}(?:[.,]\d{0,2})?$/.test(range.value);
+        case CONST.SEARCH.SYNTAX_FILTER_KEYS.COLUMNS:
+            return Object.values(CONST.SEARCH.COLUMNS).includes(range.value as ValueOf<typeof CONST.SEARCH.COLUMNS>);
         case CONST.SEARCH.SYNTAX_FILTER_KEYS.IS:
             return isList.includes(range.value);
         default:

From 9bc6c592cb6f0be01bcac4b43c28687f0c34cc95 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 10:29:50 -0500
Subject: [PATCH 17/50] parser updates

---
 src/libs/SearchParser/autocompleteParser.js   | 310 ++++++++++--------
 .../SearchParser/autocompleteParser.peggy     |   1 +
 src/libs/SearchParser/baseRules.peggy         |   1 +
 src/libs/SearchParser/searchParser.js         | 310 ++++++++++--------
 src/libs/SearchParser/searchParser.peggy      |   1 +
 5 files changed, 339 insertions(+), 284 deletions(-)

diff --git a/src/libs/SearchParser/autocompleteParser.js b/src/libs/SearchParser/autocompleteParser.js
index a404845a0a66..ce1f5d3157dd 100644
--- a/src/libs/SearchParser/autocompleteParser.js
+++ b/src/libs/SearchParser/autocompleteParser.js
@@ -246,18 +246,19 @@ function peg$parse(input, options) {
   var peg$c60 = "purchase-amount";
   var peg$c61 = "purchasecurrency";
   var peg$c62 = "purchase-currency";
-  var peg$c63 = "perdiem";
-  var peg$c64 = "per-diem";
-  var peg$c65 = "drafts";
-  var peg$c66 = "draft";
-  var peg$c67 = "!=";
-  var peg$c68 = ">=";
-  var peg$c69 = ">";
-  var peg$c70 = "<=";
-  var peg$c71 = "<";
-  var peg$c72 = "\u201C";
-  var peg$c73 = "\u201D";
-  var peg$c74 = "\"";
+  var peg$c63 = "columns";
+  var peg$c64 = "perdiem";
+  var peg$c65 = "per-diem";
+  var peg$c66 = "drafts";
+  var peg$c67 = "draft";
+  var peg$c68 = "!=";
+  var peg$c69 = ">=";
+  var peg$c70 = ">";
+  var peg$c71 = "<=";
+  var peg$c72 = "<";
+  var peg$c73 = "\u201C";
+  var peg$c74 = "\u201D";
+  var peg$c75 = "\"";
 
   var peg$r0 = /^[ \t\r\n\xA0,:=<>!]/;
   var peg$r1 = /^[:=]/;
@@ -338,33 +339,34 @@ function peg$parse(input, options) {
   var peg$e63 = peg$literalExpectation("purchase-amount", true);
   var peg$e64 = peg$literalExpectation("purchaseCurrency", true);
   var peg$e65 = peg$literalExpectation("purchase-currency", true);
-  var peg$e66 = peg$literalExpectation("perDiem", true);
-  var peg$e67 = peg$literalExpectation("per-diem", true);
-  var peg$e68 = peg$literalExpectation("drafts", true);
-  var peg$e69 = peg$literalExpectation("draft", true);
-  var peg$e70 = peg$otherExpectation("operator");
-  var peg$e71 = peg$classExpectation([":", "="], false, false);
-  var peg$e72 = peg$literalExpectation("!=", false);
-  var peg$e73 = peg$literalExpectation(">=", false);
-  var peg$e74 = peg$literalExpectation(">", false);
-  var peg$e75 = peg$literalExpectation("<=", false);
-  var peg$e76 = peg$literalExpectation("<", false);
-  var peg$e77 = peg$otherExpectation("word");
-  var peg$e78 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e79 = peg$otherExpectation("whitespace");
-  var peg$e80 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
-  var peg$e81 = peg$otherExpectation("quote");
-  var peg$e82 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e83 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
-  var peg$e84 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
-  var peg$e85 = peg$literalExpectation("\u201C", false);
-  var peg$e86 = peg$literalExpectation("\u201D", false);
-  var peg$e87 = peg$literalExpectation("\"", false);
-  var peg$e88 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e89 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e90 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
-  var peg$e91 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
-  var peg$e92 = peg$classExpectation([","], false, false);
+  var peg$e66 = peg$literalExpectation("columns", true);
+  var peg$e67 = peg$literalExpectation("perDiem", true);
+  var peg$e68 = peg$literalExpectation("per-diem", true);
+  var peg$e69 = peg$literalExpectation("drafts", true);
+  var peg$e70 = peg$literalExpectation("draft", true);
+  var peg$e71 = peg$otherExpectation("operator");
+  var peg$e72 = peg$classExpectation([":", "="], false, false);
+  var peg$e73 = peg$literalExpectation("!=", false);
+  var peg$e74 = peg$literalExpectation(">=", false);
+  var peg$e75 = peg$literalExpectation(">", false);
+  var peg$e76 = peg$literalExpectation("<=", false);
+  var peg$e77 = peg$literalExpectation("<", false);
+  var peg$e78 = peg$otherExpectation("word");
+  var peg$e79 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e80 = peg$otherExpectation("whitespace");
+  var peg$e81 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
+  var peg$e82 = peg$otherExpectation("quote");
+  var peg$e83 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e84 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
+  var peg$e85 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
+  var peg$e86 = peg$literalExpectation("\u201C", false);
+  var peg$e87 = peg$literalExpectation("\u201D", false);
+  var peg$e88 = peg$literalExpectation("\"", false);
+  var peg$e89 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e90 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e91 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
+  var peg$e92 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
+  var peg$e93 = peg$classExpectation([","], false, false);
 
   var peg$f0 = function(ranges) { return { autocomplete, ranges }; };
   var peg$f1 = function(filters) { return filters.filter(Boolean).flat(); };
@@ -473,30 +475,31 @@ function peg$parse(input, options) {
   var peg$f49 = function() {return "is"; };
   var peg$f50 = function() {return "purchaseAmount"};
   var peg$f51 = function() {return "purchaseCurrency"};
-  var peg$f52 = function() { return "perDiem"; };
-  var peg$f53 = function() {return "drafts"; };
-  var peg$f54 = function() { return "eq"; };
-  var peg$f55 = function() { return "neq"; };
-  var peg$f56 = function() { return "gte"; };
-  var peg$f57 = function() { return "gt"; };
-  var peg$f58 = function() { return "lte"; };
-  var peg$f59 = function() { return "lt"; };
-  var peg$f60 = function(o) {
+  var peg$f52 = function() {return "columns"};
+  var peg$f53 = function() { return "perDiem"; };
+  var peg$f54 = function() {return "drafts"; };
+  var peg$f55 = function() { return "eq"; };
+  var peg$f56 = function() { return "neq"; };
+  var peg$f57 = function() { return "gte"; };
+  var peg$f58 = function() { return "gt"; };
+  var peg$f59 = function() { return "lte"; };
+  var peg$f60 = function() { return "lt"; };
+  var peg$f61 = function(o) {
       if (nameOperator) {
         expectingNestedQuote = (o === "eq"); // Use simple parser if no valid operator is found
       }
       return o;
   };
-  var peg$f61 = function(chars) { return chars.join("").trim(); };
-  var peg$f62 = function() { return "and"; };
-  var peg$f63 = function() { return expectingNestedQuote; };
-  var peg$f64 = function(start, inner, end) { //handle no-breaking space
+  var peg$f62 = function(chars) { return chars.join("").trim(); };
+  var peg$f63 = function() { return "and"; };
+  var peg$f64 = function() { return expectingNestedQuote; };
+  var peg$f65 = function(start, inner, end) { //handle no-breaking space
       return [...start, '"', ...inner, '"', ...end].join("");
     };
-  var peg$f65 = function(start) {return "“"};
-  var peg$f66 = function(start) {return "”"};
-  var peg$f67 = function(start) {return "\""};
-  var peg$f68 = function(start, inner, end) {
+  var peg$f66 = function(start) {return "“"};
+  var peg$f67 = function(start) {return "”"};
+  var peg$f68 = function(start) {return "\""};
+  var peg$f69 = function(start, inner, end) {
     return [...start, '"', ...inner, '"'].join("");
 };
   var peg$currPos = options.peg$currPos | 0;
@@ -994,6 +997,9 @@ function peg$parse(input, options) {
                                                                                       s1 = peg$parsetitle();
                                                                                       if (s1 === peg$FAILED) {
                                                                                         s1 = peg$parsereportFieldDynamic();
+                                                                                        if (s1 === peg$FAILED) {
+                                                                                          s1 = peg$parsecolumns();
+                                                                                        }
                                                                                       }
                                                                                     }
                                                                                   }
@@ -2153,6 +2159,26 @@ function peg$parse(input, options) {
     return s0;
   }
 
+  function peg$parsecolumns() {
+    var s0, s1;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 7);
+    if (s1.toLowerCase() === peg$c63) {
+      peg$currPos += 7;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e66); }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f52();
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
   function peg$parsevalues() {
     var s0;
 
@@ -2168,24 +2194,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
-    if (s0.toLowerCase() === peg$c63) {
+    if (s0.toLowerCase() === peg$c64) {
       peg$currPos += 7;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e66); }
+      if (peg$silentFails === 0) { peg$fail(peg$e67); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
-      if (s1.toLowerCase() === peg$c64) {
+      if (s1.toLowerCase() === peg$c65) {
         peg$currPos += 8;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e67); }
+        if (peg$silentFails === 0) { peg$fail(peg$e68); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f52();
+        s1 = peg$f53();
       }
       s0 = s1;
     }
@@ -2197,24 +2223,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 6);
-    if (s0.toLowerCase() === peg$c65) {
+    if (s0.toLowerCase() === peg$c66) {
       peg$currPos += 6;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e68); }
+      if (peg$silentFails === 0) { peg$fail(peg$e69); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 5);
-      if (s1.toLowerCase() === peg$c66) {
+      if (s1.toLowerCase() === peg$c67) {
         peg$currPos += 5;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e69); }
+        if (peg$silentFails === 0) { peg$fail(peg$e70); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f53();
+        s1 = peg$f54();
       }
       s0 = s1;
     }
@@ -2232,81 +2258,81 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e71); }
+      if (peg$silentFails === 0) { peg$fail(peg$e72); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f54();
+      s1 = peg$f55();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c67) {
-        s1 = peg$c67;
+      if (input.substr(peg$currPos, 2) === peg$c68) {
+        s1 = peg$c68;
         peg$currPos += 2;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e72); }
+        if (peg$silentFails === 0) { peg$fail(peg$e73); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f55();
+        s1 = peg$f56();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c68) {
-          s1 = peg$c68;
+        if (input.substr(peg$currPos, 2) === peg$c69) {
+          s1 = peg$c69;
           peg$currPos += 2;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e73); }
+          if (peg$silentFails === 0) { peg$fail(peg$e74); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f56();
+          s1 = peg$f57();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
           if (input.charCodeAt(peg$currPos) === 62) {
-            s1 = peg$c69;
+            s1 = peg$c70;
             peg$currPos++;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e74); }
+            if (peg$silentFails === 0) { peg$fail(peg$e75); }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f57();
+            s1 = peg$f58();
           }
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c70) {
-              s1 = peg$c70;
+            if (input.substr(peg$currPos, 2) === peg$c71) {
+              s1 = peg$c71;
               peg$currPos += 2;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e75); }
+              if (peg$silentFails === 0) { peg$fail(peg$e76); }
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$f58();
+              s1 = peg$f59();
             }
             s0 = s1;
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
               if (input.charCodeAt(peg$currPos) === 60) {
-                s1 = peg$c71;
+                s1 = peg$c72;
                 peg$currPos++;
               } else {
                 s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e76); }
+                if (peg$silentFails === 0) { peg$fail(peg$e77); }
               }
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$f59();
+                s1 = peg$f60();
               }
               s0 = s1;
             }
@@ -2317,7 +2343,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e70); }
+      if (peg$silentFails === 0) { peg$fail(peg$e71); }
     }
 
     return s0;
@@ -2330,7 +2356,7 @@ function peg$parse(input, options) {
     s1 = peg$parseoperator();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f60(s1);
+      s1 = peg$f61(s1);
     }
     s0 = s1;
 
@@ -2348,7 +2374,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e78); }
+      if (peg$silentFails === 0) { peg$fail(peg$e79); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
@@ -2358,7 +2384,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e78); }
+          if (peg$silentFails === 0) { peg$fail(peg$e79); }
         }
       }
     } else {
@@ -2366,13 +2392,13 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f61(s1);
+      s1 = peg$f62(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e77); }
+      if (peg$silentFails === 0) { peg$fail(peg$e78); }
     }
 
     return s0;
@@ -2384,7 +2410,7 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parse_();
     peg$savedPos = s0;
-    s1 = peg$f62();
+    s1 = peg$f63();
     s0 = s1;
 
     return s0;
@@ -2400,7 +2426,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e80); }
+      if (peg$silentFails === 0) { peg$fail(peg$e81); }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
@@ -2409,12 +2435,12 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e80); }
+        if (peg$silentFails === 0) { peg$fail(peg$e81); }
       }
     }
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e79); }
+    if (peg$silentFails === 0) { peg$fail(peg$e80); }
 
     return s0;
   }
@@ -2424,7 +2450,7 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f63();
+    s1 = peg$f64();
     if (s1) {
       s1 = undefined;
     } else {
@@ -2461,7 +2487,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e82); }
+      if (peg$silentFails === 0) { peg$fail(peg$e83); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -2470,7 +2496,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e82); }
+        if (peg$silentFails === 0) { peg$fail(peg$e83); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -2478,7 +2504,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e83); }
+      if (peg$silentFails === 0) { peg$fail(peg$e84); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -2487,7 +2513,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e84); }
+        if (peg$silentFails === 0) { peg$fail(peg$e85); }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
@@ -2496,7 +2522,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e84); }
+          if (peg$silentFails === 0) { peg$fail(peg$e85); }
         }
       }
       s4 = input.charAt(peg$currPos);
@@ -2504,7 +2530,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e83); }
+        if (peg$silentFails === 0) { peg$fail(peg$e84); }
       }
       if (s4 !== peg$FAILED) {
         s5 = [];
@@ -2513,7 +2539,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e78); }
+          if (peg$silentFails === 0) { peg$fail(peg$e79); }
         }
         while (s6 !== peg$FAILED) {
           s5.push(s6);
@@ -2522,11 +2548,11 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e78); }
+            if (peg$silentFails === 0) { peg$fail(peg$e79); }
           }
         }
         peg$savedPos = s0;
-        s0 = peg$f64(s1, s3, s5);
+        s0 = peg$f65(s1, s3, s5);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2538,7 +2564,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e81); }
+      if (peg$silentFails === 0) { peg$fail(peg$e82); }
     }
 
     return s0;
@@ -2555,7 +2581,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e82); }
+      if (peg$silentFails === 0) { peg$fail(peg$e83); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -2564,7 +2590,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e82); }
+        if (peg$silentFails === 0) { peg$fail(peg$e83); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -2572,7 +2598,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e83); }
+      if (peg$silentFails === 0) { peg$fail(peg$e84); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -2581,7 +2607,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e84); }
+        if (peg$silentFails === 0) { peg$fail(peg$e85); }
       }
       if (s4 === peg$FAILED) {
         s4 = peg$currPos;
@@ -2597,15 +2623,15 @@ function peg$parse(input, options) {
         }
         if (s5 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 8220) {
-            s6 = peg$c72;
+            s6 = peg$c73;
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e85); }
+            if (peg$silentFails === 0) { peg$fail(peg$e86); }
           }
           if (s6 !== peg$FAILED) {
             peg$savedPos = s4;
-            s4 = peg$f65(s1);
+            s4 = peg$f66(s1);
           } else {
             peg$currPos = s4;
             s4 = peg$FAILED;
@@ -2628,15 +2654,15 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8221) {
-              s6 = peg$c73;
+              s6 = peg$c74;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e86); }
+              if (peg$silentFails === 0) { peg$fail(peg$e87); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f66(s1);
+              s4 = peg$f67(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -2659,15 +2685,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 34) {
-                s6 = peg$c74;
+                s6 = peg$c75;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e87); }
+                if (peg$silentFails === 0) { peg$fail(peg$e88); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f67(s1);
+                s4 = peg$f68(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -2686,7 +2712,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e84); }
+          if (peg$silentFails === 0) { peg$fail(peg$e85); }
         }
         if (s4 === peg$FAILED) {
           s4 = peg$currPos;
@@ -2702,15 +2728,15 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8220) {
-              s6 = peg$c72;
+              s6 = peg$c73;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e85); }
+              if (peg$silentFails === 0) { peg$fail(peg$e86); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f65(s1);
+              s4 = peg$f66(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -2733,15 +2759,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 8221) {
-                s6 = peg$c73;
+                s6 = peg$c74;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e86); }
+                if (peg$silentFails === 0) { peg$fail(peg$e87); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f66(s1);
+                s4 = peg$f67(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -2764,15 +2790,15 @@ function peg$parse(input, options) {
               }
               if (s5 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 34) {
-                  s6 = peg$c74;
+                  s6 = peg$c75;
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e87); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e88); }
                 }
                 if (s6 !== peg$FAILED) {
                   peg$savedPos = s4;
-                  s4 = peg$f67(s1);
+                  s4 = peg$f68(s1);
                 } else {
                   peg$currPos = s4;
                   s4 = peg$FAILED;
@@ -2788,7 +2814,7 @@ function peg$parse(input, options) {
       s4 = peg$parseclosingQuote();
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f68(s1, s3, s4);
+        s0 = peg$f69(s1, s3, s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2800,7 +2826,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e81); }
+      if (peg$silentFails === 0) { peg$fail(peg$e82); }
     }
 
     return s0;
@@ -2815,7 +2841,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e83); }
+      if (peg$silentFails === 0) { peg$fail(peg$e84); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -2853,7 +2879,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e88); }
+      if (peg$silentFails === 0) { peg$fail(peg$e89); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -2862,7 +2888,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e88); }
+        if (peg$silentFails === 0) { peg$fail(peg$e89); }
       }
     }
     s2 = [];
@@ -2871,7 +2897,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e89); }
+      if (peg$silentFails === 0) { peg$fail(peg$e90); }
     }
     while (s3 !== peg$FAILED) {
       s2.push(s3);
@@ -2880,7 +2906,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e89); }
+        if (peg$silentFails === 0) { peg$fail(peg$e90); }
       }
     }
     s3 = [];
@@ -2889,7 +2915,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s4 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e90); }
+      if (peg$silentFails === 0) { peg$fail(peg$e91); }
     }
     while (s4 !== peg$FAILED) {
       s3.push(s4);
@@ -2898,7 +2924,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e90); }
+        if (peg$silentFails === 0) { peg$fail(peg$e91); }
       }
     }
     s4 = peg$parseoperator();
@@ -2917,7 +2943,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e91); }
+        if (peg$silentFails === 0) { peg$fail(peg$e92); }
       }
       while (s2 !== peg$FAILED) {
         s1.push(s2);
@@ -2926,7 +2952,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e91); }
+          if (peg$silentFails === 0) { peg$fail(peg$e92); }
         }
       }
       s2 = peg$currPos;
@@ -2973,7 +2999,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e92); }
+          if (peg$silentFails === 0) { peg$fail(peg$e93); }
         }
       }
     }
diff --git a/src/libs/SearchParser/autocompleteParser.peggy b/src/libs/SearchParser/autocompleteParser.peggy
index a07cb01c80fc..6eeb7bd2d1a5 100644
--- a/src/libs/SearchParser/autocompleteParser.peggy
+++ b/src/libs/SearchParser/autocompleteParser.peggy
@@ -118,6 +118,7 @@ autocompleteKey "key"
       / withdrawalID
       / title
       / reportFieldDynamic
+      / columns
     )
 
 filterKey
diff --git a/src/libs/SearchParser/baseRules.peggy b/src/libs/SearchParser/baseRules.peggy
index 60fbc69ec304..d9662ad6d2d9 100644
--- a/src/libs/SearchParser/baseRules.peggy
+++ b/src/libs/SearchParser/baseRules.peggy
@@ -78,6 +78,7 @@ has = "has"i {return "has"; }
 is = "is"i {return "is"; }
 purchaseAmount = "purchaseAmount"i / "purchase-amount"i {return "purchaseAmount"}
 purchaseCurrency = "purchaseCurrency"i / "purchase-currency"i {return "purchaseCurrency"}
+columns = "columns"i {return "columns"}
 
 // Value transformation rules
 values
diff --git a/src/libs/SearchParser/searchParser.js b/src/libs/SearchParser/searchParser.js
index 433fd21614dd..547c1f7426cc 100644
--- a/src/libs/SearchParser/searchParser.js
+++ b/src/libs/SearchParser/searchParser.js
@@ -247,18 +247,19 @@ function peg$parse(input, options) {
   var peg$c60 = "purchase-amount";
   var peg$c61 = "purchasecurrency";
   var peg$c62 = "purchase-currency";
-  var peg$c63 = "perdiem";
-  var peg$c64 = "per-diem";
-  var peg$c65 = "drafts";
-  var peg$c66 = "draft";
-  var peg$c67 = "!=";
-  var peg$c68 = ">=";
-  var peg$c69 = ">";
-  var peg$c70 = "<=";
-  var peg$c71 = "<";
-  var peg$c72 = "\u201C";
-  var peg$c73 = "\u201D";
-  var peg$c74 = "\"";
+  var peg$c63 = "columns";
+  var peg$c64 = "perdiem";
+  var peg$c65 = "per-diem";
+  var peg$c66 = "drafts";
+  var peg$c67 = "draft";
+  var peg$c68 = "!=";
+  var peg$c69 = ">=";
+  var peg$c70 = ">";
+  var peg$c71 = "<=";
+  var peg$c72 = "<";
+  var peg$c73 = "\u201C";
+  var peg$c74 = "\u201D";
+  var peg$c75 = "\"";
 
   var peg$r0 = /^[^ \t\r\n\xA0]/;
   var peg$r1 = /^[ \t\r\n\xA0,:=<>!]/;
@@ -342,33 +343,34 @@ function peg$parse(input, options) {
   var peg$e65 = peg$literalExpectation("purchase-amount", true);
   var peg$e66 = peg$literalExpectation("purchaseCurrency", true);
   var peg$e67 = peg$literalExpectation("purchase-currency", true);
-  var peg$e68 = peg$literalExpectation("perDiem", true);
-  var peg$e69 = peg$literalExpectation("per-diem", true);
-  var peg$e70 = peg$literalExpectation("drafts", true);
-  var peg$e71 = peg$literalExpectation("draft", true);
-  var peg$e72 = peg$otherExpectation("operator");
-  var peg$e73 = peg$classExpectation([":", "="], false, false);
-  var peg$e74 = peg$literalExpectation("!=", false);
-  var peg$e75 = peg$literalExpectation(">=", false);
-  var peg$e76 = peg$literalExpectation(">", false);
-  var peg$e77 = peg$literalExpectation("<=", false);
-  var peg$e78 = peg$literalExpectation("<", false);
-  var peg$e79 = peg$otherExpectation("word");
-  var peg$e80 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e81 = peg$otherExpectation("whitespace");
-  var peg$e82 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
-  var peg$e83 = peg$otherExpectation("quote");
-  var peg$e84 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
-  var peg$e85 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
-  var peg$e86 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
-  var peg$e87 = peg$literalExpectation("\u201C", false);
-  var peg$e88 = peg$literalExpectation("\u201D", false);
-  var peg$e89 = peg$literalExpectation("\"", false);
-  var peg$e90 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e91 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
-  var peg$e92 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
-  var peg$e93 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
-  var peg$e94 = peg$classExpectation([","], false, false);
+  var peg$e68 = peg$literalExpectation("columns", true);
+  var peg$e69 = peg$literalExpectation("perDiem", true);
+  var peg$e70 = peg$literalExpectation("per-diem", true);
+  var peg$e71 = peg$literalExpectation("drafts", true);
+  var peg$e72 = peg$literalExpectation("draft", true);
+  var peg$e73 = peg$otherExpectation("operator");
+  var peg$e74 = peg$classExpectation([":", "="], false, false);
+  var peg$e75 = peg$literalExpectation("!=", false);
+  var peg$e76 = peg$literalExpectation(">=", false);
+  var peg$e77 = peg$literalExpectation(">", false);
+  var peg$e78 = peg$literalExpectation("<=", false);
+  var peg$e79 = peg$literalExpectation("<", false);
+  var peg$e80 = peg$otherExpectation("word");
+  var peg$e81 = peg$classExpectation([" ", ",", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e82 = peg$otherExpectation("whitespace");
+  var peg$e83 = peg$classExpectation([" ", "\t", "\r", "\n", "\xA0"], false, false);
+  var peg$e84 = peg$otherExpectation("quote");
+  var peg$e85 = peg$classExpectation([" ", ",", "\"", "\u201D", "\u201C", "\t", "\n", "\r", "\xA0"], true, false);
+  var peg$e86 = peg$classExpectation(["\"", ["\u201C", "\u201D"]], false, false);
+  var peg$e87 = peg$classExpectation(["\"", "\u201D", "\u201C", "\r", "\n"], true, false);
+  var peg$e88 = peg$literalExpectation("\u201C", false);
+  var peg$e89 = peg$literalExpectation("\u201D", false);
+  var peg$e90 = peg$literalExpectation("\"", false);
+  var peg$e91 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e92 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"]], false, false);
+  var peg$e93 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0"], false, false);
+  var peg$e94 = peg$classExpectation([" ", "\t", "\n", "\r", "\xA0", ["a", "z"], ["A", "Z"]], false, false);
+  var peg$e95 = peg$classExpectation([","], false, false);
 
   var peg$f0 = function(filters) { return applyDefaults(filters); };
   var peg$f1 = function(head, tail) {
@@ -500,30 +502,31 @@ function peg$parse(input, options) {
   var peg$f50 = function() {return "is"; };
   var peg$f51 = function() {return "purchaseAmount"};
   var peg$f52 = function() {return "purchaseCurrency"};
-  var peg$f53 = function() { return "perDiem"; };
-  var peg$f54 = function() {return "drafts"; };
-  var peg$f55 = function() { return "eq"; };
-  var peg$f56 = function() { return "neq"; };
-  var peg$f57 = function() { return "gte"; };
-  var peg$f58 = function() { return "gt"; };
-  var peg$f59 = function() { return "lte"; };
-  var peg$f60 = function() { return "lt"; };
-  var peg$f61 = function(o) {
+  var peg$f53 = function() {return "columns"};
+  var peg$f54 = function() { return "perDiem"; };
+  var peg$f55 = function() {return "drafts"; };
+  var peg$f56 = function() { return "eq"; };
+  var peg$f57 = function() { return "neq"; };
+  var peg$f58 = function() { return "gte"; };
+  var peg$f59 = function() { return "gt"; };
+  var peg$f60 = function() { return "lte"; };
+  var peg$f61 = function() { return "lt"; };
+  var peg$f62 = function(o) {
       if (nameOperator) {
         expectingNestedQuote = (o === "eq"); // Use simple parser if no valid operator is found
       }
       return o;
   };
-  var peg$f62 = function(chars) { return chars.join("").trim(); };
-  var peg$f63 = function() { return "and"; };
-  var peg$f64 = function() { return expectingNestedQuote; };
-  var peg$f65 = function(start, inner, end) { //handle no-breaking space
+  var peg$f63 = function(chars) { return chars.join("").trim(); };
+  var peg$f64 = function() { return "and"; };
+  var peg$f65 = function() { return expectingNestedQuote; };
+  var peg$f66 = function(start, inner, end) { //handle no-breaking space
       return [...start, '"', ...inner, '"', ...end].join("");
     };
-  var peg$f66 = function(start) {return "“"};
-  var peg$f67 = function(start) {return "”"};
-  var peg$f68 = function(start) {return "\""};
-  var peg$f69 = function(start, inner, end) {
+  var peg$f67 = function(start) {return "“"};
+  var peg$f68 = function(start) {return "”"};
+  var peg$f69 = function(start) {return "\""};
+  var peg$f70 = function(start, inner, end) {
     return [...start, '"', ...inner, '"'].join("");
 };
   var peg$currPos = options.peg$currPos | 0;
@@ -1084,6 +1087,9 @@ function peg$parse(input, options) {
                                                                                 s1 = peg$parsepurchaseAmount();
                                                                                 if (s1 === peg$FAILED) {
                                                                                   s1 = peg$parsereportFieldDynamic();
+                                                                                  if (s1 === peg$FAILED) {
+                                                                                    s1 = peg$parsecolumns();
+                                                                                  }
                                                                                 }
                                                                               }
                                                                             }
@@ -2337,6 +2343,26 @@ function peg$parse(input, options) {
     return s0;
   }
 
+  function peg$parsecolumns() {
+    var s0, s1;
+
+    s0 = peg$currPos;
+    s1 = input.substr(peg$currPos, 7);
+    if (s1.toLowerCase() === peg$c63) {
+      peg$currPos += 7;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e68); }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f53();
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
   function peg$parsevalues() {
     var s0;
 
@@ -2352,24 +2378,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 7);
-    if (s0.toLowerCase() === peg$c63) {
+    if (s0.toLowerCase() === peg$c64) {
       peg$currPos += 7;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e68); }
+      if (peg$silentFails === 0) { peg$fail(peg$e69); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 8);
-      if (s1.toLowerCase() === peg$c64) {
+      if (s1.toLowerCase() === peg$c65) {
         peg$currPos += 8;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e69); }
+        if (peg$silentFails === 0) { peg$fail(peg$e70); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f53();
+        s1 = peg$f54();
       }
       s0 = s1;
     }
@@ -2381,24 +2407,24 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = input.substr(peg$currPos, 6);
-    if (s0.toLowerCase() === peg$c65) {
+    if (s0.toLowerCase() === peg$c66) {
       peg$currPos += 6;
     } else {
       s0 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e70); }
+      if (peg$silentFails === 0) { peg$fail(peg$e71); }
     }
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
       s1 = input.substr(peg$currPos, 5);
-      if (s1.toLowerCase() === peg$c66) {
+      if (s1.toLowerCase() === peg$c67) {
         peg$currPos += 5;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e71); }
+        if (peg$silentFails === 0) { peg$fail(peg$e72); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f54();
+        s1 = peg$f55();
       }
       s0 = s1;
     }
@@ -2416,81 +2442,81 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e73); }
+      if (peg$silentFails === 0) { peg$fail(peg$e74); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f55();
+      s1 = peg$f56();
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
       s0 = peg$currPos;
-      if (input.substr(peg$currPos, 2) === peg$c67) {
-        s1 = peg$c67;
+      if (input.substr(peg$currPos, 2) === peg$c68) {
+        s1 = peg$c68;
         peg$currPos += 2;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e74); }
+        if (peg$silentFails === 0) { peg$fail(peg$e75); }
       }
       if (s1 !== peg$FAILED) {
         peg$savedPos = s0;
-        s1 = peg$f56();
+        s1 = peg$f57();
       }
       s0 = s1;
       if (s0 === peg$FAILED) {
         s0 = peg$currPos;
-        if (input.substr(peg$currPos, 2) === peg$c68) {
-          s1 = peg$c68;
+        if (input.substr(peg$currPos, 2) === peg$c69) {
+          s1 = peg$c69;
           peg$currPos += 2;
         } else {
           s1 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e75); }
+          if (peg$silentFails === 0) { peg$fail(peg$e76); }
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f57();
+          s1 = peg$f58();
         }
         s0 = s1;
         if (s0 === peg$FAILED) {
           s0 = peg$currPos;
           if (input.charCodeAt(peg$currPos) === 62) {
-            s1 = peg$c69;
+            s1 = peg$c70;
             peg$currPos++;
           } else {
             s1 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e76); }
+            if (peg$silentFails === 0) { peg$fail(peg$e77); }
           }
           if (s1 !== peg$FAILED) {
             peg$savedPos = s0;
-            s1 = peg$f58();
+            s1 = peg$f59();
           }
           s0 = s1;
           if (s0 === peg$FAILED) {
             s0 = peg$currPos;
-            if (input.substr(peg$currPos, 2) === peg$c70) {
-              s1 = peg$c70;
+            if (input.substr(peg$currPos, 2) === peg$c71) {
+              s1 = peg$c71;
               peg$currPos += 2;
             } else {
               s1 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e77); }
+              if (peg$silentFails === 0) { peg$fail(peg$e78); }
             }
             if (s1 !== peg$FAILED) {
               peg$savedPos = s0;
-              s1 = peg$f59();
+              s1 = peg$f60();
             }
             s0 = s1;
             if (s0 === peg$FAILED) {
               s0 = peg$currPos;
               if (input.charCodeAt(peg$currPos) === 60) {
-                s1 = peg$c71;
+                s1 = peg$c72;
                 peg$currPos++;
               } else {
                 s1 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e78); }
+                if (peg$silentFails === 0) { peg$fail(peg$e79); }
               }
               if (s1 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s1 = peg$f60();
+                s1 = peg$f61();
               }
               s0 = s1;
             }
@@ -2501,7 +2527,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e72); }
+      if (peg$silentFails === 0) { peg$fail(peg$e73); }
     }
 
     return s0;
@@ -2514,7 +2540,7 @@ function peg$parse(input, options) {
     s1 = peg$parseoperator();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f61(s1);
+      s1 = peg$f62(s1);
     }
     s0 = s1;
 
@@ -2532,7 +2558,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e80); }
+      if (peg$silentFails === 0) { peg$fail(peg$e81); }
     }
     if (s2 !== peg$FAILED) {
       while (s2 !== peg$FAILED) {
@@ -2542,7 +2568,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e80); }
+          if (peg$silentFails === 0) { peg$fail(peg$e81); }
         }
       }
     } else {
@@ -2550,13 +2576,13 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f62(s1);
+      s1 = peg$f63(s1);
     }
     s0 = s1;
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e79); }
+      if (peg$silentFails === 0) { peg$fail(peg$e80); }
     }
 
     return s0;
@@ -2568,7 +2594,7 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$parse_();
     peg$savedPos = s0;
-    s1 = peg$f63();
+    s1 = peg$f64();
     s0 = s1;
 
     return s0;
@@ -2584,7 +2610,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e82); }
+      if (peg$silentFails === 0) { peg$fail(peg$e83); }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
@@ -2593,12 +2619,12 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e82); }
+        if (peg$silentFails === 0) { peg$fail(peg$e83); }
       }
     }
     peg$silentFails--;
     s1 = peg$FAILED;
-    if (peg$silentFails === 0) { peg$fail(peg$e81); }
+    if (peg$silentFails === 0) { peg$fail(peg$e82); }
 
     return s0;
   }
@@ -2608,7 +2634,7 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f64();
+    s1 = peg$f65();
     if (s1) {
       s1 = undefined;
     } else {
@@ -2645,7 +2671,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e84); }
+      if (peg$silentFails === 0) { peg$fail(peg$e85); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -2654,7 +2680,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e84); }
+        if (peg$silentFails === 0) { peg$fail(peg$e85); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -2662,7 +2688,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e85); }
+      if (peg$silentFails === 0) { peg$fail(peg$e86); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -2671,7 +2697,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e86); }
+        if (peg$silentFails === 0) { peg$fail(peg$e87); }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
@@ -2680,7 +2706,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e86); }
+          if (peg$silentFails === 0) { peg$fail(peg$e87); }
         }
       }
       s4 = input.charAt(peg$currPos);
@@ -2688,7 +2714,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e85); }
+        if (peg$silentFails === 0) { peg$fail(peg$e86); }
       }
       if (s4 !== peg$FAILED) {
         s5 = [];
@@ -2697,7 +2723,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e80); }
+          if (peg$silentFails === 0) { peg$fail(peg$e81); }
         }
         while (s6 !== peg$FAILED) {
           s5.push(s6);
@@ -2706,11 +2732,11 @@ function peg$parse(input, options) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e80); }
+            if (peg$silentFails === 0) { peg$fail(peg$e81); }
           }
         }
         peg$savedPos = s0;
-        s0 = peg$f65(s1, s3, s5);
+        s0 = peg$f66(s1, s3, s5);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2722,7 +2748,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e83); }
+      if (peg$silentFails === 0) { peg$fail(peg$e84); }
     }
 
     return s0;
@@ -2739,7 +2765,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e84); }
+      if (peg$silentFails === 0) { peg$fail(peg$e85); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -2748,7 +2774,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e84); }
+        if (peg$silentFails === 0) { peg$fail(peg$e85); }
       }
     }
     s2 = input.charAt(peg$currPos);
@@ -2756,7 +2782,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e85); }
+      if (peg$silentFails === 0) { peg$fail(peg$e86); }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
@@ -2765,7 +2791,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e86); }
+        if (peg$silentFails === 0) { peg$fail(peg$e87); }
       }
       if (s4 === peg$FAILED) {
         s4 = peg$currPos;
@@ -2781,15 +2807,15 @@ function peg$parse(input, options) {
         }
         if (s5 !== peg$FAILED) {
           if (input.charCodeAt(peg$currPos) === 8220) {
-            s6 = peg$c72;
+            s6 = peg$c73;
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e87); }
+            if (peg$silentFails === 0) { peg$fail(peg$e88); }
           }
           if (s6 !== peg$FAILED) {
             peg$savedPos = s4;
-            s4 = peg$f66(s1);
+            s4 = peg$f67(s1);
           } else {
             peg$currPos = s4;
             s4 = peg$FAILED;
@@ -2812,15 +2838,15 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8221) {
-              s6 = peg$c73;
+              s6 = peg$c74;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e88); }
+              if (peg$silentFails === 0) { peg$fail(peg$e89); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f67(s1);
+              s4 = peg$f68(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -2843,15 +2869,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 34) {
-                s6 = peg$c74;
+                s6 = peg$c75;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e89); }
+                if (peg$silentFails === 0) { peg$fail(peg$e90); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f68(s1);
+                s4 = peg$f69(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -2870,7 +2896,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e86); }
+          if (peg$silentFails === 0) { peg$fail(peg$e87); }
         }
         if (s4 === peg$FAILED) {
           s4 = peg$currPos;
@@ -2886,15 +2912,15 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             if (input.charCodeAt(peg$currPos) === 8220) {
-              s6 = peg$c72;
+              s6 = peg$c73;
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e87); }
+              if (peg$silentFails === 0) { peg$fail(peg$e88); }
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s4;
-              s4 = peg$f66(s1);
+              s4 = peg$f67(s1);
             } else {
               peg$currPos = s4;
               s4 = peg$FAILED;
@@ -2917,15 +2943,15 @@ function peg$parse(input, options) {
             }
             if (s5 !== peg$FAILED) {
               if (input.charCodeAt(peg$currPos) === 8221) {
-                s6 = peg$c73;
+                s6 = peg$c74;
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e88); }
+                if (peg$silentFails === 0) { peg$fail(peg$e89); }
               }
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s4;
-                s4 = peg$f67(s1);
+                s4 = peg$f68(s1);
               } else {
                 peg$currPos = s4;
                 s4 = peg$FAILED;
@@ -2948,15 +2974,15 @@ function peg$parse(input, options) {
               }
               if (s5 !== peg$FAILED) {
                 if (input.charCodeAt(peg$currPos) === 34) {
-                  s6 = peg$c74;
+                  s6 = peg$c75;
                   peg$currPos++;
                 } else {
                   s6 = peg$FAILED;
-                  if (peg$silentFails === 0) { peg$fail(peg$e89); }
+                  if (peg$silentFails === 0) { peg$fail(peg$e90); }
                 }
                 if (s6 !== peg$FAILED) {
                   peg$savedPos = s4;
-                  s4 = peg$f68(s1);
+                  s4 = peg$f69(s1);
                 } else {
                   peg$currPos = s4;
                   s4 = peg$FAILED;
@@ -2972,7 +2998,7 @@ function peg$parse(input, options) {
       s4 = peg$parseclosingQuote();
       if (s4 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f69(s1, s3, s4);
+        s0 = peg$f70(s1, s3, s4);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2984,7 +3010,7 @@ function peg$parse(input, options) {
     peg$silentFails--;
     if (s0 === peg$FAILED) {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e83); }
+      if (peg$silentFails === 0) { peg$fail(peg$e84); }
     }
 
     return s0;
@@ -2999,7 +3025,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e85); }
+      if (peg$silentFails === 0) { peg$fail(peg$e86); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
@@ -3037,7 +3063,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e90); }
+      if (peg$silentFails === 0) { peg$fail(peg$e91); }
     }
     while (s2 !== peg$FAILED) {
       s1.push(s2);
@@ -3046,7 +3072,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e90); }
+        if (peg$silentFails === 0) { peg$fail(peg$e91); }
       }
     }
     s2 = [];
@@ -3055,7 +3081,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s3 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e91); }
+      if (peg$silentFails === 0) { peg$fail(peg$e92); }
     }
     while (s3 !== peg$FAILED) {
       s2.push(s3);
@@ -3064,7 +3090,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e91); }
+        if (peg$silentFails === 0) { peg$fail(peg$e92); }
       }
     }
     s3 = [];
@@ -3073,7 +3099,7 @@ function peg$parse(input, options) {
       peg$currPos++;
     } else {
       s4 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e92); }
+      if (peg$silentFails === 0) { peg$fail(peg$e93); }
     }
     while (s4 !== peg$FAILED) {
       s3.push(s4);
@@ -3082,7 +3108,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e92); }
+        if (peg$silentFails === 0) { peg$fail(peg$e93); }
       }
     }
     s4 = peg$parseoperator();
@@ -3101,7 +3127,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s2 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e93); }
+        if (peg$silentFails === 0) { peg$fail(peg$e94); }
       }
       while (s2 !== peg$FAILED) {
         s1.push(s2);
@@ -3110,7 +3136,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s2 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e93); }
+          if (peg$silentFails === 0) { peg$fail(peg$e94); }
         }
       }
       s2 = peg$currPos;
@@ -3157,7 +3183,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s0 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e94); }
+          if (peg$silentFails === 0) { peg$fail(peg$e95); }
         }
       }
     }
diff --git a/src/libs/SearchParser/searchParser.peggy b/src/libs/SearchParser/searchParser.peggy
index feaebbde833d..88c58438121d 100644
--- a/src/libs/SearchParser/searchParser.peggy
+++ b/src/libs/SearchParser/searchParser.peggy
@@ -202,6 +202,7 @@ key "key"
       / purchaseCurrency
       / purchaseAmount
       / reportFieldDynamic
+      / columns
     )
 
 filterKey

From 96f5cb8bd03cc42bf69db64ca4e3eb9f81d17ebe Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 10:39:58 -0500
Subject: [PATCH 18/50] add all columns by default

---
 src/pages/Search/SearchColumnsPage.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index e3f898c0b5b1..692cb374ed2b 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -29,10 +29,14 @@ function SearchColumnsPage() {
 
     const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, {canBeMissing: true});
 
-    console.log(searchAdvancedFiltersForm);
-
     const [selectedColumnIds, setSelectedColumnIds] = useState<ColumnId[]>(() => {
         const columnIds = searchAdvancedFiltersForm?.columns?.filter((columnId) => Object.values(CONST.SEARCH.COLUMNS).includes(columnId as ColumnId)) ?? [];
+
+        // We dont allow the user to unselect all columns, so we can assume that no columns = all columns/none configured yet
+        if (!columnIds) {
+            return allColumns;
+        }
+
         return columnIds as ColumnId[];
     });
 

From 2a3696815d215d47235557283b3c607718f1a251 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 10:47:11 -0500
Subject: [PATCH 19/50] add errors

---
 src/languages/de.ts                    |  1 +
 src/languages/en.ts                    |  1 +
 src/languages/es.ts                    |  1 +
 src/languages/fr.ts                    |  1 +
 src/languages/it.ts                    |  1 +
 src/languages/ja.ts                    |  1 +
 src/languages/nl.ts                    |  1 +
 src/languages/pl.ts                    |  1 +
 src/languages/pt-BR.ts                 |  1 +
 src/languages/zh-hans.ts               |  1 +
 src/pages/Search/SearchColumnsPage.tsx | 30 +++++++++++++++++++-------
 11 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index be043da2764d..15f7e81969b5 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -6759,6 +6759,7 @@ Fordere Spesendetails wie Belege und Beschreibungen an, lege Limits und Standard
             },
         },
         columms: 'Columns',
+        noColumnsError: 'Please select at least one column before saving',
         statements: 'Abrechnungen',
         unapprovedCash: 'Nicht genehmigtes Bargeld',
         unapprovedCard: 'Nicht genehmigte Karte',
diff --git a/src/languages/en.ts b/src/languages/en.ts
index a1d3f5a0e846..b5cecc31794e 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -6615,6 +6615,7 @@ const translations = {
             },
         },
         columms: 'Columns',
+        noColumnsError: 'Please select at least one column before saving',
         statements: 'Statements',
         unapprovedCash: 'Unapproved cash',
         unapprovedCard: 'Unapproved card',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index a031387485bc..cb91c68f09f6 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -6240,6 +6240,7 @@ ${amount} para ${merchant} - ${date}`,
             },
         },
         columms: 'Columns',
+        noColumnsError: 'Please select at least one column before saving',
         statements: 'Extractos',
         unapprovedCash: 'Efectivo no aprobado',
         unapprovedCard: 'Tarjeta no aprobada',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 5305928101b8..05f9c33eb26c 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -6767,6 +6767,7 @@ Exigez des informations de dépense comme les reçus et les descriptions, défin
             },
         },
         columms: 'Columns',
+        noColumnsError: 'Please select at least one column before saving',
         statements: 'Relevés',
         unapprovedCash: 'Espèces non approuvées',
         unapprovedCard: 'Carte non approuvée',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 3239435e6d19..e4b6427032d5 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -6739,6 +6739,7 @@ Richiedi dettagli di spesa come ricevute e descrizioni, imposta limiti e valori
             },
         },
         columms: 'Columns',
+        noColumnsError: 'Please select at least one column before saving',
         statements: 'Estratti conto',
         unapprovedCash: 'Contanti non approvati',
         unapprovedCard: 'Carta non approvata',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 04bc2787e958..719c63129f19 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -6690,6 +6690,7 @@ ${reportName}
             },
         },
         columms: 'Columns',
+        noColumnsError: 'Please select at least one column before saving',
         statements: 'ステートメント',
         unapprovedCash: '未承認の現金',
         unapprovedCard: '未承認のカード',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index f79cf3a4b709..4c053e99a4fd 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -6725,6 +6725,7 @@ Vraag verplichte uitgavedetails zoals bonnetjes en beschrijvingen, stel limieten
             },
         },
         columms: 'Columns',
+        noColumnsError: 'Please select at least one column before saving',
         statements: 'Afschriften',
         unapprovedCash: 'Niet-goedgekeurde contanten',
         unapprovedCard: 'Niet-goedgekeurde kaart',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 20b9d2bef8ba..9565ff723c2f 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -6716,6 +6716,7 @@ Wymagaj szczegółów wydatków, takich jak paragony i opisy, ustawiaj limity i
             },
         },
         columms: 'Columns',
+        noColumnsError: 'Please select at least one column before saving',
         statements: 'Wyciągi',
         unapprovedCash: 'Niezaakceptowana gotówka',
         unapprovedCard: 'Niezatwierdzona karta',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index b2d9cdf5e69f..d63bc720e8f5 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -6720,6 +6720,7 @@ Exija detalhes de despesas como recibos e descrições, defina limites e padrõe
             },
         },
         columms: 'Columns',
+        noColumnsError: 'Please select at least one column before saving',
         statements: 'Extratos',
         unapprovedCash: 'Dinheiro não aprovado',
         unapprovedCard: 'Cartão não aprovado',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index a4c675643cdc..d3e2cabdb292 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -6590,6 +6590,7 @@ ${reportName}
             },
         },
         columms: 'Columns',
+        noColumnsError: 'Please select at least one column before saving',
         statements: '对账单',
         unapprovedCash: '未批准的现金',
         unapprovedCard: '未批准的卡片',
diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 692cb374ed2b..4db384bd8c41 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -2,6 +2,7 @@ import React, {useState} from 'react';
 import {View} from 'react-native';
 import type {ValueOf} from 'type-fest';
 import Button from '@components/Button';
+import DotIndicatorMessage from '@components/DotIndicatorMessage';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
 import type {ListItem} from '@components/SelectionList/types';
@@ -63,6 +64,10 @@ function SearchColumnsPage() {
     };
 
     const applyChanges = () => {
+        if (!selectedColumnIds.length) {
+            return;
+        }
+
         const updatedAdvancedFilters: Partial<SearchAdvancedFiltersForm> = {...searchAdvancedFiltersForm, columns: selectedColumnIds};
         const queryString = buildQueryStringFromFilterFormValues(updatedAdvancedFilters);
         clearAllFilters();
@@ -86,14 +91,23 @@ function SearchColumnsPage() {
                     canSelectMultiple
                     ListItem={MultiSelectListItem}
                     footerContent={
-                        <Button
-                            large
-                            success
-                            pressOnEnter
-                            style={[styles.mt3]}
-                            text={translate('common.save')}
-                            onPress={applyChanges}
-                        />
+                        <View style={[styles.gap2]}>
+                            {!selectedColumnIds.length && (
+                                <DotIndicatorMessage
+                                    type="error"
+                                    messages={{error: translate('search.noColumnsError')}}
+                                />
+                            )}
+
+                            <Button
+                                large
+                                success
+                                pressOnEnter
+                                style={[styles.mt3]}
+                                text={translate('common.save')}
+                                onPress={applyChanges}
+                            />
+                        </View>
                     }
                 />
             </View>

From 2b80f8c34a9af701c491d227f9db0926a03268b0 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 11:10:58 -0500
Subject: [PATCH 20/50] update custom column types

---
 src/CONST/index.ts                     |  2 +-
 src/components/Search/types.ts         |  3 +++
 src/libs/SearchAutocompleteUtils.ts    |  2 +-
 src/libs/SearchUIUtils.ts              | 16 ++++++++--------
 src/pages/Search/SearchColumnsPage.tsx | 16 +++++++---------
 5 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index 533544d16b92..1dbfdd1722c6 100755
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -6696,7 +6696,7 @@ const CONST = {
             CARD: 'card',
             WITHDRAWAL_ID: 'withdrawal-id',
         },
-        COLUMNS: {
+        CUSTOM_COLUMNS: {
             DATE: 'date',
             STATUS: 'status',
             TITLE: 'title',
diff --git a/src/components/Search/types.ts b/src/components/Search/types.ts
index 8f5beab5e9c6..8ae22a8dabf9 100644
--- a/src/components/Search/types.ts
+++ b/src/components/Search/types.ts
@@ -107,6 +107,7 @@ type TableColumnSize = ValueOf<typeof CONST.SEARCH.TABLE_COLUMN_SIZES>;
 type SearchDatePreset = ValueOf<typeof CONST.SEARCH.DATE_PRESETS>;
 type SearchWithdrawalType = ValueOf<typeof CONST.SEARCH.WITHDRAWAL_TYPE>;
 type SearchAction = ValueOf<typeof CONST.SEARCH.ACTION_FILTERS>;
+type SearchCustomColumnIds = ValueOf<typeof CONST.SEARCH.CUSTOM_COLUMNS>;
 
 type SearchContextData = {
     currentSearchHash: number;
@@ -222,6 +223,7 @@ type SearchQueryAST = {
     status: SearchStatus;
     sortBy: SearchColumnType;
     sortOrder: SortOrder;
+    columns: SearchCustomColumnIds[];
     groupBy?: SearchGroupBy;
     filters: ASTNode;
     policyID?: string[];
@@ -310,4 +312,5 @@ export type {
     SelectedReports,
     SearchTextFilterKeys,
     BankAccountMenuItem,
+    SearchCustomColumnIds,
 };
diff --git a/src/libs/SearchAutocompleteUtils.ts b/src/libs/SearchAutocompleteUtils.ts
index c0966672d646..0d7ad6f013fa 100644
--- a/src/libs/SearchAutocompleteUtils.ts
+++ b/src/libs/SearchAutocompleteUtils.ts
@@ -229,7 +229,7 @@ function filterOutRangesWithCorrectValue(
             // This uses the same regex as the AmountWithoutCurrencyInput component (allowing for 3 digit decimals as some currencies support that)
             return /^-?(?!.*[.,].*[.,])\d{0,8}(?:[.,]\d{0,2})?$/.test(range.value);
         case CONST.SEARCH.SYNTAX_FILTER_KEYS.COLUMNS:
-            return Object.values(CONST.SEARCH.COLUMNS).includes(range.value as ValueOf<typeof CONST.SEARCH.COLUMNS>);
+            return Object.values(CONST.SEARCH.CUSTOM_COLUMNS).includes(range.value as ValueOf<typeof CONST.SEARCH.CUSTOM_COLUMNS>);
         case CONST.SEARCH.SYNTAX_FILTER_KEYS.IS:
             return isList.includes(range.value);
         default:
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 23a075e3ab36..4f040fd7f957 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -2051,22 +2051,22 @@ function getExpenseTypeTranslationKey(expenseType: ValueOf<typeof CONST.SEARCH.T
     }
 }
 
-function getSearchColumnTranslationKey(columnId: ValueOf<typeof CONST.SEARCH.COLUMNS>): TranslationPaths {
+function getSearchColumnTranslationKey(columnId: ValueOf<typeof CONST.SEARCH.CUSTOM_COLUMNS>): TranslationPaths {
     // eslint-disable-next-line default-case
     switch (columnId) {
-        case CONST.SEARCH.COLUMNS.DATE:
+        case CONST.SEARCH.CUSTOM_COLUMNS.DATE:
             return 'common.date';
-        case CONST.SEARCH.COLUMNS.STATUS:
+        case CONST.SEARCH.CUSTOM_COLUMNS.STATUS:
             return 'common.status';
-        case CONST.SEARCH.COLUMNS.TITLE:
+        case CONST.SEARCH.CUSTOM_COLUMNS.TITLE:
             return 'common.title';
-        case CONST.SEARCH.COLUMNS.FROM:
+        case CONST.SEARCH.CUSTOM_COLUMNS.FROM:
             return 'common.from';
-        case CONST.SEARCH.COLUMNS.TO:
+        case CONST.SEARCH.CUSTOM_COLUMNS.TO:
             return 'common.to';
-        case CONST.SEARCH.COLUMNS.TOTAL:
+        case CONST.SEARCH.CUSTOM_COLUMNS.TOTAL:
             return 'common.total';
-        case CONST.SEARCH.COLUMNS.ACTION:
+        case CONST.SEARCH.CUSTOM_COLUMNS.ACTION:
             return 'common.action';
     }
 }
diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 4db384bd8c41..0882de56bc7c 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -1,10 +1,10 @@
 import React, {useState} from 'react';
 import {View} from 'react-native';
-import type {ValueOf} from 'type-fest';
 import Button from '@components/Button';
 import DotIndicatorMessage from '@components/DotIndicatorMessage';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
+import type {SearchCustomColumnIds} from '@components/Search/types';
 import type {ListItem} from '@components/SelectionList/types';
 import SelectionList from '@components/SelectionListWithSections';
 import MultiSelectListItem from '@components/SelectionListWithSections/MultiSelectListItem';
@@ -20,9 +20,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {SearchAdvancedFiltersForm} from '@src/types/form';
 
-type ColumnId = ValueOf<typeof CONST.SEARCH.COLUMNS>;
-
-const allColumns = Object.values(CONST.SEARCH.COLUMNS);
+const allColumns = Object.values(CONST.SEARCH.CUSTOM_COLUMNS);
 
 function SearchColumnsPage() {
     const styles = useThemeStyles();
@@ -30,15 +28,15 @@ function SearchColumnsPage() {
 
     const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, {canBeMissing: true});
 
-    const [selectedColumnIds, setSelectedColumnIds] = useState<ColumnId[]>(() => {
-        const columnIds = searchAdvancedFiltersForm?.columns?.filter((columnId) => Object.values(CONST.SEARCH.COLUMNS).includes(columnId as ColumnId)) ?? [];
+    const [selectedColumnIds, setSelectedColumnIds] = useState<SearchCustomColumnIds[]>(() => {
+        const columnIds = searchAdvancedFiltersForm?.columns?.filter((columnId) => Object.values(CONST.SEARCH.CUSTOM_COLUMNS).includes(columnId as SearchCustomColumnIds)) ?? [];
 
         // We dont allow the user to unselect all columns, so we can assume that no columns = all columns/none configured yet
-        if (!columnIds) {
+        if (!columnIds.length) {
             return allColumns;
         }
 
-        return columnIds as ColumnId[];
+        return columnIds as SearchCustomColumnIds[];
     });
 
     const sections = [
@@ -54,7 +52,7 @@ function SearchColumnsPage() {
     ];
 
     const onSelectItem = (item: ListItem) => {
-        const updatedColumnId = item.keyForList as ColumnId;
+        const updatedColumnId = item.keyForList as SearchCustomColumnIds;
 
         if (item.isSelected) {
             setSelectedColumnIds(selectedColumnIds.filter((columnId) => columnId !== updatedColumnId));

From 29c0d61015ec2cc46a743dcd6921130d2b616144 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 11:11:54 -0500
Subject: [PATCH 21/50] new parsers

---
 src/libs/SearchParser/autocompleteParser.js    | 2 +-
 src/libs/SearchParser/autocompleteParser.peggy | 2 +-
 src/libs/SearchParser/searchParser.js          | 3 +++
 src/libs/SearchParser/searchParser.peggy       | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/libs/SearchParser/autocompleteParser.js b/src/libs/SearchParser/autocompleteParser.js
index ce1f5d3157dd..742f854ddcef 100644
--- a/src/libs/SearchParser/autocompleteParser.js
+++ b/src/libs/SearchParser/autocompleteParser.js
@@ -3012,7 +3012,7 @@ function peg$parse(input, options) {
 
   // List fields where you cannot prefix it with "-" to negate it
   const nonNegatableKeys = new Set([
-    "type", "keyword", "groupCurrency", "groupBy"
+    "type", "keyword", "groupCurrency", "groupBy", "columns"
   ]);
 
  
diff --git a/src/libs/SearchParser/autocompleteParser.peggy b/src/libs/SearchParser/autocompleteParser.peggy
index 6eeb7bd2d1a5..cda2b7c8c888 100644
--- a/src/libs/SearchParser/autocompleteParser.peggy
+++ b/src/libs/SearchParser/autocompleteParser.peggy
@@ -23,7 +23,7 @@
 
   // List fields where you cannot prefix it with "-" to negate it
   const nonNegatableKeys = new Set([
-    "type", "keyword", "groupCurrency", "groupBy"
+    "type", "keyword", "groupCurrency", "groupBy", "columns"
   ]);
 }
 
diff --git a/src/libs/SearchParser/searchParser.js b/src/libs/SearchParser/searchParser.js
index 547c1f7426cc..d4b49f8b69bf 100644
--- a/src/libs/SearchParser/searchParser.js
+++ b/src/libs/SearchParser/searchParser.js
@@ -1174,6 +1174,9 @@ function peg$parse(input, options) {
             s1 = peg$parsepolicyID();
             if (s1 === peg$FAILED) {
               s1 = peg$parsegroupBy();
+              if (s1 === peg$FAILED) {
+                s1 = peg$parsecolumns();
+              }
             }
           }
         }
diff --git a/src/libs/SearchParser/searchParser.peggy b/src/libs/SearchParser/searchParser.peggy
index 88c58438121d..0fbd235ecef4 100644
--- a/src/libs/SearchParser/searchParser.peggy
+++ b/src/libs/SearchParser/searchParser.peggy
@@ -211,7 +211,7 @@ filterKey
       return k;
     }
     
-defaultKey "default key" = @(type / status / sortBy / sortOrder / policyID / groupBy)
+defaultKey "default key" = @(type / status / sortBy / sortOrder / policyID / groupBy / columns)
 
 identifier
   = (","+)? parts:(values / quotedString / alphanumeric)|1.., ","+| empty:(","+)? {

From 28803620e4a971f49496a4e8b9bb59cb3dbe684d Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 11:22:10 -0500
Subject: [PATCH 22/50] update more to use query json

---
 src/CONST/index.ts                          |  2 +-
 src/components/Search/types.ts              |  3 ++-
 src/libs/SearchAutocompleteUtils.ts         |  2 +-
 src/libs/SearchQueryUtils.ts                | 10 +++++++++-
 src/libs/actions/Search.ts                  |  2 ++
 src/types/form/SearchAdvancedFiltersForm.ts |  4 ----
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index 1dbfdd1722c6..7a7676a1b1ac 100755
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -6787,6 +6787,7 @@ const CONST = {
             SORT_BY: 'sortBy',
             SORT_ORDER: 'sortOrder',
             GROUP_BY: 'groupBy',
+            COLUMNS: 'columns',
         },
         SYNTAX_FILTER_KEYS: {
             TYPE: 'type',
@@ -6831,7 +6832,6 @@ const CONST = {
             ATTENDEE: 'attendee',
             IS: 'is',
             REPORT_FIELD: 'reportField',
-            COLUMNS: 'columns',
         },
         REPORT_FIELD: {
             // All report fields start with this, so use this to check if a search key is a report field
diff --git a/src/components/Search/types.ts b/src/components/Search/types.ts
index 8ae22a8dabf9..affc001c6ee4 100644
--- a/src/components/Search/types.ts
+++ b/src/components/Search/types.ts
@@ -197,7 +197,8 @@ type SearchFilterKey =
     | ValueOf<typeof CONST.SEARCH.SYNTAX_FILTER_KEYS>
     | typeof CONST.SEARCH.SYNTAX_ROOT_KEYS.TYPE
     | typeof CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS
-    | typeof CONST.SEARCH.SYNTAX_ROOT_KEYS.GROUP_BY;
+    | typeof CONST.SEARCH.SYNTAX_ROOT_KEYS.GROUP_BY
+    | typeof CONST.SEARCH.SYNTAX_ROOT_KEYS.COLUMNS;
 
 type UserFriendlyKey = ValueOf<typeof CONST.SEARCH.SEARCH_USER_FRIENDLY_KEYS>;
 type UserFriendlyValue = ValueOf<typeof CONST.SEARCH.SEARCH_USER_FRIENDLY_VALUES_MAP>;
diff --git a/src/libs/SearchAutocompleteUtils.ts b/src/libs/SearchAutocompleteUtils.ts
index 0d7ad6f013fa..f4c9886caddf 100644
--- a/src/libs/SearchAutocompleteUtils.ts
+++ b/src/libs/SearchAutocompleteUtils.ts
@@ -228,7 +228,7 @@ function filterOutRangesWithCorrectValue(
         case CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT:
             // This uses the same regex as the AmountWithoutCurrencyInput component (allowing for 3 digit decimals as some currencies support that)
             return /^-?(?!.*[.,].*[.,])\d{0,8}(?:[.,]\d{0,2})?$/.test(range.value);
-        case CONST.SEARCH.SYNTAX_FILTER_KEYS.COLUMNS:
+        case CONST.SEARCH.SYNTAX_ROOT_KEYS.COLUMNS:
             return Object.values(CONST.SEARCH.CUSTOM_COLUMNS).includes(range.value as ValueOf<typeof CONST.SEARCH.CUSTOM_COLUMNS>);
         case CONST.SEARCH.SYNTAX_FILTER_KEYS.IS:
             return isList.includes(range.value);
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index c281f74c9918..69460aa4c651 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -560,7 +560,7 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
     }
 
     // We separate type and status filters from other filters to maintain hashes consistency for saved searches
-    const {type, status, groupBy, ...otherFilters} = supportedFilterValues;
+    const {type, status, groupBy, columns, ...otherFilters} = supportedFilterValues;
     const filtersString: string[] = [];
 
     filtersString.push(`${CONST.SEARCH.SYNTAX_ROOT_KEYS.SORT_BY}:${CONST.SEARCH.TABLE_COLUMNS.DATE}`);
@@ -586,6 +586,11 @@ function buildQueryStringFromFilterFormValues(filterValues: Partial<SearchAdvanc
         filtersString.push(`${CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS}:${filterValueArray.map(sanitizeSearchValue).join(',')}`);
     }
 
+    if (columns?.length) {
+        const filterValueArray = [...new Set<string>(columns)];
+        filtersString.push(`${CONST.SEARCH.SYNTAX_ROOT_KEYS.COLUMNS}:${filterValueArray.map(sanitizeSearchValue).join(',')}`);
+    }
+
     const mappedFilters = Object.entries(otherFilters)
         .map(([filterKey, filterValue]) => {
             const isNegated = filterKey.endsWith(CONST.SEARCH.NOT_MODIFIER);
@@ -1151,6 +1156,9 @@ function formatDefaultRawFilterSegment(rawFilter: RawQueryFilter, policies: Onyx
         case CONST.SEARCH.SYNTAX_ROOT_KEYS.GROUP_BY:
             userFriendlyKey = getUserFriendlyKey(CONST.SEARCH.SYNTAX_ROOT_KEYS.GROUP_BY);
             break;
+        case CONST.SEARCH.SYNTAX_ROOT_KEYS.COLUMNS:
+            userFriendlyKey = getUserFriendlyKey(CONST.SEARCH.SYNTAX_ROOT_KEYS.COLUMNS);
+            break;
         default:
             userFriendlyKey = getUserFriendlyKey(rawFilter.key as SearchFilterKey);
             break;
diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index f98c0c83bdd0..d1d5ee6b28f4 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -961,6 +961,8 @@ function clearAdvancedFilters() {
         switch (key) {
             case FILTER_KEYS.GROUP_BY:
                 continue;
+            case FILTER_KEYS.COLUMNS:
+                continue;
             case FILTER_KEYS.TYPE:
                 values[key] = CONST.SEARCH.DATA_TYPES.EXPENSE;
                 continue;
diff --git a/src/types/form/SearchAdvancedFiltersForm.ts b/src/types/form/SearchAdvancedFiltersForm.ts
index 873b758424bc..a962646858fd 100644
--- a/src/types/form/SearchAdvancedFiltersForm.ts
+++ b/src/types/form/SearchAdvancedFiltersForm.ts
@@ -263,7 +263,6 @@ const ALLOWED_TYPE_FILTERS = {
         FILTER_KEYS.ATTENDEE,
         FILTER_KEYS.REPORT_FIELD,
         FILTER_KEYS.ATTENDEE_NOT,
-        FILTER_KEYS.COLUMNS,
     ],
     [CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT]: [
         FILTER_KEYS.TYPE,
@@ -319,7 +318,6 @@ const ALLOWED_TYPE_FILTERS = {
         FILTER_KEYS.TITLE,
         FILTER_KEYS.TITLE_NOT,
         FILTER_KEYS.REPORT_FIELD,
-        FILTER_KEYS.COLUMNS,
     ],
     [CONST.SEARCH.DATA_TYPES.INVOICE]: [
         FILTER_KEYS.TYPE,
@@ -403,7 +401,6 @@ const ALLOWED_TYPE_FILTERS = {
         FILTER_KEYS.TITLE,
         FILTER_KEYS.REPORT_FIELD,
         FILTER_KEYS.TITLE_NOT,
-        FILTER_KEYS.COLUMNS,
     ],
 
     [CONST.SEARCH.DATA_TYPES.TRIP]: [
@@ -481,7 +478,6 @@ const ALLOWED_TYPE_FILTERS = {
         FILTER_KEYS.TITLE,
         FILTER_KEYS.TITLE_NOT,
         FILTER_KEYS.REPORT_FIELD,
-        FILTER_KEYS.COLUMNS,
     ],
 
     [CONST.SEARCH.DATA_TYPES.CHAT]: [

From 69e8e9cdd864fdfb90b6909312700145abb0c2c4 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 11:31:44 -0500
Subject: [PATCH 23/50] parser updates

---
 src/libs/SearchParser/searchParser.js       | 5 +----
 src/libs/SearchParser/searchParser.peggy    | 3 +--
 src/libs/SearchQueryUtils.ts                | 4 ++++
 src/pages/Search/SearchColumnsPage.tsx      | 5 +++--
 src/types/form/SearchAdvancedFiltersForm.ts | 8 ++++++--
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/libs/SearchParser/searchParser.js b/src/libs/SearchParser/searchParser.js
index d4b49f8b69bf..955bbae945ea 100644
--- a/src/libs/SearchParser/searchParser.js
+++ b/src/libs/SearchParser/searchParser.js
@@ -1087,9 +1087,6 @@ function peg$parse(input, options) {
                                                                                 s1 = peg$parsepurchaseAmount();
                                                                                 if (s1 === peg$FAILED) {
                                                                                   s1 = peg$parsereportFieldDynamic();
-                                                                                  if (s1 === peg$FAILED) {
-                                                                                    s1 = peg$parsecolumns();
-                                                                                  }
                                                                                 }
                                                                               }
                                                                             }
@@ -3205,7 +3202,7 @@ function peg$parse(input, options) {
 
   // List fields where you cannot prefix it with "-" to negate it
   const nonNegatableKeys = new Set([
-    "type", "keyword", "groupCurrency", "groupBy"
+    "type", "keyword", "groupCurrency", "groupBy", "columns"
   ]);
 
   function applyDefaults(filters) {
diff --git a/src/libs/SearchParser/searchParser.peggy b/src/libs/SearchParser/searchParser.peggy
index 0fbd235ecef4..67a8a76455a3 100644
--- a/src/libs/SearchParser/searchParser.peggy
+++ b/src/libs/SearchParser/searchParser.peggy
@@ -38,7 +38,7 @@
 
   // List fields where you cannot prefix it with "-" to negate it
   const nonNegatableKeys = new Set([
-    "type", "keyword", "groupCurrency", "groupBy"
+    "type", "keyword", "groupCurrency", "groupBy", "columns"
   ]);
 
   function applyDefaults(filters) {
@@ -202,7 +202,6 @@ key "key"
       / purchaseCurrency
       / purchaseAmount
       / reportFieldDynamic
-      / columns
     )
 
 filterKey
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index 69460aa4c651..1383a82e58f1 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -970,6 +970,10 @@ function buildFilterFormValuesFromQuery(
         filtersForm[FILTER_KEYS.GROUP_BY] = queryJSON.groupBy;
     }
 
+    if (queryJSON.columns) {
+        filtersForm[FILTER_KEYS.COLUMNS] = queryJSON.columns;
+    }
+
     return filtersForm;
 }
 
diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 0882de56bc7c..9cc886555939 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -29,14 +29,14 @@ function SearchColumnsPage() {
     const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, {canBeMissing: true});
 
     const [selectedColumnIds, setSelectedColumnIds] = useState<SearchCustomColumnIds[]>(() => {
-        const columnIds = searchAdvancedFiltersForm?.columns?.filter((columnId) => Object.values(CONST.SEARCH.CUSTOM_COLUMNS).includes(columnId as SearchCustomColumnIds)) ?? [];
+        const columnIds = searchAdvancedFiltersForm?.columns?.filter((columnId) => Object.values(CONST.SEARCH.CUSTOM_COLUMNS).includes(columnId)) ?? [];
 
         // We dont allow the user to unselect all columns, so we can assume that no columns = all columns/none configured yet
         if (!columnIds.length) {
             return allColumns;
         }
 
-        return columnIds as SearchCustomColumnIds[];
+        return columnIds;
     });
 
     const sections = [
@@ -68,6 +68,7 @@ function SearchColumnsPage() {
 
         const updatedAdvancedFilters: Partial<SearchAdvancedFiltersForm> = {...searchAdvancedFiltersForm, columns: selectedColumnIds};
         const queryString = buildQueryStringFromFilterFormValues(updatedAdvancedFilters);
+
         clearAllFilters();
         Navigation.navigate(ROUTES.SEARCH_ROOT.getRoute({query: queryString}), {forceReplace: true});
     };
diff --git a/src/types/form/SearchAdvancedFiltersForm.ts b/src/types/form/SearchAdvancedFiltersForm.ts
index a962646858fd..b87cc82af563 100644
--- a/src/types/form/SearchAdvancedFiltersForm.ts
+++ b/src/types/form/SearchAdvancedFiltersForm.ts
@@ -5,6 +5,7 @@ import type {
     ReportFieldNegatedKey,
     ReportFieldTextKey,
     SearchAmountFilterKeys,
+    SearchCustomColumnIds,
     SearchDateFilterKeys,
     SearchGroupBy,
     SearchWithdrawalType,
@@ -263,6 +264,7 @@ const ALLOWED_TYPE_FILTERS = {
         FILTER_KEYS.ATTENDEE,
         FILTER_KEYS.REPORT_FIELD,
         FILTER_KEYS.ATTENDEE_NOT,
+        FILTER_KEYS.COLUMNS,
     ],
     [CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT]: [
         FILTER_KEYS.TYPE,
@@ -318,6 +320,7 @@ const ALLOWED_TYPE_FILTERS = {
         FILTER_KEYS.TITLE,
         FILTER_KEYS.TITLE_NOT,
         FILTER_KEYS.REPORT_FIELD,
+        FILTER_KEYS.COLUMNS,
     ],
     [CONST.SEARCH.DATA_TYPES.INVOICE]: [
         FILTER_KEYS.TYPE,
@@ -401,6 +404,7 @@ const ALLOWED_TYPE_FILTERS = {
         FILTER_KEYS.TITLE,
         FILTER_KEYS.REPORT_FIELD,
         FILTER_KEYS.TITLE_NOT,
+        FILTER_KEYS.COLUMNS,
     ],
 
     [CONST.SEARCH.DATA_TYPES.TRIP]: [
@@ -478,6 +482,7 @@ const ALLOWED_TYPE_FILTERS = {
         FILTER_KEYS.TITLE,
         FILTER_KEYS.TITLE_NOT,
         FILTER_KEYS.REPORT_FIELD,
+        FILTER_KEYS.COLUMNS,
     ],
 
     [CONST.SEARCH.DATA_TYPES.CHAT]: [
@@ -526,8 +531,8 @@ type SearchAdvancedFiltersForm = Form<
     SearchAdvancedFiltersKey,
     {
         [FILTER_KEYS.GROUP_BY]: SearchGroupBy;
-
         [FILTER_KEYS.TYPE]: SearchDataTypes;
+        [FILTER_KEYS.COLUMNS]: SearchCustomColumnIds[];
 
         [FILTER_KEYS.STATUS]: string[] | string;
 
@@ -669,7 +674,6 @@ type SearchAdvancedFiltersForm = Form<
         [FILTER_KEYS.IS]: string[];
         [FILTER_KEYS.HAS]: string[];
         [FILTER_KEYS.REPORT_FIELD]: string;
-        [FILTER_KEYS.COLUMNS]: string[];
     } & Record<ReportFieldTextKey, string> &
         Record<ReportFieldDateKey, string> &
         Record<ReportFieldNegatedKey, string>

From a49926889f91f1f05e1f9dbf4835b1c10a556b5b Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 11:58:47 -0500
Subject: [PATCH 24/50] add defaults and reset columns

---
 src/CONST/index.ts                     | 13 +++++++++++++
 src/libs/SearchUIUtils.ts              | 10 ++++++++++
 src/pages/Search/SearchColumnsPage.tsx | 11 +++++++++--
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index 7a7676a1b1ac..b33a79c6a774 100755
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -6705,6 +6705,19 @@ const CONST = {
             TOTAL: 'total',
             ACTION: 'action',
         },
+        get DEFAULT_COLUMNS() {
+            return {
+                EXPENSE: [
+                    this.CUSTOM_COLUMNS.DATE,
+                    this.CUSTOM_COLUMNS.STATUS,
+                    this.CUSTOM_COLUMNS.TITLE,
+                    this.CUSTOM_COLUMNS.FROM,
+                    this.CUSTOM_COLUMNS.TO,
+                    this.CUSTOM_COLUMNS.TOTAL,
+                    this.CUSTOM_COLUMNS.ACTION,
+                ],
+            };
+        },
         BOOLEAN: {
             YES: 'yes',
             NO: 'no',
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 4f040fd7f957..2248350750e3 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -10,6 +10,7 @@ import type {SingleSelectItem} from '@components/Search/FilterDropdowns/SingleSe
 import type {
     SearchAction,
     SearchColumnType,
+    SearchCustomColumnIds,
     SearchDateFilterKeys,
     SearchDatePreset,
     SearchGroupBy,
@@ -2448,6 +2449,7 @@ function getActionOptions(translate: LocaleContextProps['translate']) {
 function getColumnsToShow(
     currentAccountID: number | undefined,
     data: OnyxTypes.SearchResults['data'] | OnyxTypes.Transaction[],
+    visibleColumns: SearchCustomColumnIds[],
     isExpenseReportView = false,
     type?: SearchDataTypes,
 ): ColumnVisibility {
@@ -2516,6 +2518,7 @@ function getColumnsToShow(
           };
 
     const {moneyRequestReportActionsByTransactionID} = Array.isArray(data) ? {} : createReportActionsLookupMaps(data);
+
     // eslint-disable-next-line @typescript-eslint/no-deprecated
     const updateColumns = (transaction: OnyxTypes.Transaction | SearchTransaction) => {
         const merchant = transaction.modifiedMerchant ? transaction.modifiedMerchant : (transaction.merchant ?? '');
@@ -2574,6 +2577,13 @@ function getColumnsToShow(
         }
     }
 
+    if (!visibleColumns.length) {
+        return columns;
+    }
+
+    for (const columnId of Object.values(CONST.REPORT.TRANSACTION_LIST.COLUMNS)) {
+    }
+
     return columns;
 }
 
diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 9cc886555939..9c981dc6178d 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -8,6 +8,7 @@ import type {SearchCustomColumnIds} from '@components/Search/types';
 import type {ListItem} from '@components/SelectionList/types';
 import SelectionList from '@components/SelectionListWithSections';
 import MultiSelectListItem from '@components/SelectionListWithSections/MultiSelectListItem';
+import TextLink from '@components/TextLink';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -33,7 +34,7 @@ function SearchColumnsPage() {
 
         // We dont allow the user to unselect all columns, so we can assume that no columns = all columns/none configured yet
         if (!columnIds.length) {
-            return allColumns;
+            return Object.values(CONST.SEARCH.DEFAULT_COLUMNS.EXPENSE);
         }
 
         return columnIds;
@@ -51,6 +52,8 @@ function SearchColumnsPage() {
         },
     ];
 
+    const shouldShowResetColumns = false;
+
     const onSelectItem = (item: ListItem) => {
         const updatedColumnId = item.keyForList as SearchCustomColumnIds;
 
@@ -61,6 +64,8 @@ function SearchColumnsPage() {
         }
     };
 
+    const resetColumns = () => {};
+
     const applyChanges = () => {
         if (!selectedColumnIds.length) {
             return;
@@ -80,7 +85,9 @@ function SearchColumnsPage() {
             offlineIndicatorStyle={styles.mtAuto}
             includeSafeAreaPaddingBottom
         >
-            <HeaderWithBackButton title={translate('search.columms')} />
+            <HeaderWithBackButton title={translate('search.columms')}>
+                {shouldShowResetColumns && <TextLink onPress={resetColumns}>{translate('search.resetColumns')}</TextLink>}
+            </HeaderWithBackButton>
             <View style={[styles.flex1]}>
                 <SelectionList
                     sections={sections}

From 24c69e71456621705b8bb6abc886f9fd8ff3a976 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 12:04:53 -0500
Subject: [PATCH 25/50] reset columns functionality

---
 src/languages/en.ts                    |  1 +
 src/languages/es.ts                    |  1 +
 src/languages/fr.ts                    |  1 +
 src/languages/it.ts                    |  1 +
 src/languages/ja.ts                    |  1 +
 src/languages/nl.ts                    |  1 +
 src/languages/pl.ts                    |  1 +
 src/languages/pt-BR.ts                 |  1 +
 src/languages/zh-hans.ts               |  1 +
 src/pages/Search/SearchColumnsPage.tsx | 10 +++++++---
 10 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index b5cecc31794e..8ec1fe235447 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -6615,6 +6615,7 @@ const translations = {
             },
         },
         columms: 'Columns',
+        resetColumns: 'Reset columns',
         noColumnsError: 'Please select at least one column before saving',
         statements: 'Statements',
         unapprovedCash: 'Unapproved cash',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index cb91c68f09f6..5e6c1d550b5b 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -6240,6 +6240,7 @@ ${amount} para ${merchant} - ${date}`,
             },
         },
         columms: 'Columns',
+        resetColumns: 'Reset columns',
         noColumnsError: 'Please select at least one column before saving',
         statements: 'Extractos',
         unapprovedCash: 'Efectivo no aprobado',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 05f9c33eb26c..4332e67b067c 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -6767,6 +6767,7 @@ Exigez des informations de dépense comme les reçus et les descriptions, défin
             },
         },
         columms: 'Columns',
+        resetColumns: 'Reset columns',
         noColumnsError: 'Please select at least one column before saving',
         statements: 'Relevés',
         unapprovedCash: 'Espèces non approuvées',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index e4b6427032d5..e017a8e61e48 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -6739,6 +6739,7 @@ Richiedi dettagli di spesa come ricevute e descrizioni, imposta limiti e valori
             },
         },
         columms: 'Columns',
+        resetColumns: 'Reset columns',
         noColumnsError: 'Please select at least one column before saving',
         statements: 'Estratti conto',
         unapprovedCash: 'Contanti non approvati',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 719c63129f19..6254da80a2d3 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -6690,6 +6690,7 @@ ${reportName}
             },
         },
         columms: 'Columns',
+        resetColumns: 'Reset columns',
         noColumnsError: 'Please select at least one column before saving',
         statements: 'ステートメント',
         unapprovedCash: '未承認の現金',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 4c053e99a4fd..c18b1bd8d4a6 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -6725,6 +6725,7 @@ Vraag verplichte uitgavedetails zoals bonnetjes en beschrijvingen, stel limieten
             },
         },
         columms: 'Columns',
+        resetColumns: 'Reset columns',
         noColumnsError: 'Please select at least one column before saving',
         statements: 'Afschriften',
         unapprovedCash: 'Niet-goedgekeurde contanten',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 9565ff723c2f..21dece7069a1 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -6716,6 +6716,7 @@ Wymagaj szczegółów wydatków, takich jak paragony i opisy, ustawiaj limity i
             },
         },
         columms: 'Columns',
+        resetColumns: 'Reset columns',
         noColumnsError: 'Please select at least one column before saving',
         statements: 'Wyciągi',
         unapprovedCash: 'Niezaakceptowana gotówka',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index d63bc720e8f5..3906cfd7b42e 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -6720,6 +6720,7 @@ Exija detalhes de despesas como recibos e descrições, defina limites e padrõe
             },
         },
         columms: 'Columns',
+        resetColumns: 'Reset columns',
         noColumnsError: 'Please select at least one column before saving',
         statements: 'Extratos',
         unapprovedCash: 'Dinheiro não aprovado',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index d3e2cabdb292..10c3dc872387 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -6590,6 +6590,7 @@ ${reportName}
             },
         },
         columms: 'Columns',
+        resetColumns: 'Reset columns',
         noColumnsError: 'Please select at least one column before saving',
         statements: '对账单',
         unapprovedCash: '未批准的现金',
diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 9c981dc6178d..2041ac0b809b 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -22,6 +22,7 @@ import ROUTES from '@src/ROUTES';
 import type {SearchAdvancedFiltersForm} from '@src/types/form';
 
 const allColumns = Object.values(CONST.SEARCH.CUSTOM_COLUMNS);
+const defaultColumns = Object.values(CONST.SEARCH.DEFAULT_COLUMNS.EXPENSE);
 
 function SearchColumnsPage() {
     const styles = useThemeStyles();
@@ -34,7 +35,7 @@ function SearchColumnsPage() {
 
         // We dont allow the user to unselect all columns, so we can assume that no columns = all columns/none configured yet
         if (!columnIds.length) {
-            return Object.values(CONST.SEARCH.DEFAULT_COLUMNS.EXPENSE);
+            return defaultColumns;
         }
 
         return columnIds;
@@ -52,7 +53,8 @@ function SearchColumnsPage() {
         },
     ];
 
-    const shouldShowResetColumns = false;
+    // JACK TODO
+    const shouldShowResetColumns = true;
 
     const onSelectItem = (item: ListItem) => {
         const updatedColumnId = item.keyForList as SearchCustomColumnIds;
@@ -64,7 +66,9 @@ function SearchColumnsPage() {
         }
     };
 
-    const resetColumns = () => {};
+    const resetColumns = () => {
+        setSelectedColumnIds(defaultColumns);
+    };
 
     const applyChanges = () => {
         if (!selectedColumnIds.length) {

From 9cad1675597d19f3e5faf9ae382dfef8038627c4 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 12:13:19 -0500
Subject: [PATCH 26/50] add logic for filtering out columns

---
 src/languages/de.ts                    |  1 +
 src/libs/SearchUIUtils.ts              | 23 ++++++++++++++++-------
 src/pages/Search/SearchColumnsPage.tsx |  2 +-
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index 15f7e81969b5..b24a7d360bd0 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -6759,6 +6759,7 @@ Fordere Spesendetails wie Belege und Beschreibungen an, lege Limits und Standard
             },
         },
         columms: 'Columns',
+        resetColumns: 'Reset columns',
         noColumnsError: 'Please select at least one column before saving',
         statements: 'Abrechnungen',
         unapprovedCash: 'Nicht genehmigtes Bargeld',
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 2248350750e3..31a8bc26396d 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -60,6 +60,7 @@ import type {
     SearchWithdrawalIDGroup,
 } from '@src/types/onyx/SearchResults';
 import type IconAsset from '@src/types/utils/IconAsset';
+import arraysEqual from '@src/utils/arraysEqual';
 import {hasSynchronizationErrorMessage} from './actions/connections';
 import {canApproveIOU, canIOUBePaid, canSubmitReport, startMoneyRequest} from './actions/IOU';
 import {setIsOpenConfirmNavigateExpensifyClassicModalOpen} from './actions/isOpenConfirmNavigateExpensifyClassicModal';
@@ -2564,6 +2565,21 @@ function getColumnsToShow(
         }
     };
 
+    const defaultColumns = Object.values(CONST.SEARCH.DEFAULT_COLUMNS.EXPENSE);
+
+    // If the user has set custom columns, we only need to control the visibility of those
+    if (!arraysEqual(defaultColumns, visibleColumns)) {
+        for (const column of Object.keys(columns)) {
+            columns[column as keyof ColumnVisibility] = false;
+        }
+
+        for (const column of visibleColumns) {
+            columns[column as keyof ColumnVisibility] = true;
+        }
+
+        return columns;
+    }
+
     if (Array.isArray(data)) {
         for (const item of data) {
             updateColumns(item);
@@ -2577,13 +2593,6 @@ function getColumnsToShow(
         }
     }
 
-    if (!visibleColumns.length) {
-        return columns;
-    }
-
-    for (const columnId of Object.values(CONST.REPORT.TRANSACTION_LIST.COLUMNS)) {
-    }
-
     return columns;
 }
 
diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 2041ac0b809b..841b224de5ce 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -53,7 +53,7 @@ function SearchColumnsPage() {
         },
     ];
 
-    // JACK TODO
+    // JACK_TODO
     const shouldShowResetColumns = true;
 
     const onSelectItem = (item: ListItem) => {

From 27d0c8fde7feab208155b53125ae1449b9d11821 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 12:19:49 -0500
Subject: [PATCH 27/50] add visiible columns

---
 .../MoneyRequestReportTransactionList.tsx                  | 7 +++++--
 src/components/Search/index.tsx                            | 7 +++++--
 .../Search/TransactionGroupListExpanded.tsx                | 7 +++++--
 src/libs/SearchUIUtils.ts                                  | 2 +-
 src/selectors/AdvancedSearchFiltersForm.ts                 | 7 +++++++
 tests/unit/Search/SearchUIUtilsTest.ts                     | 1 +
 6 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 src/selectors/AdvancedSearchFiltersForm.ts

diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx
index 286103142f7e..01d3dc21d238 100644
--- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx
+++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx
@@ -65,6 +65,7 @@ import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
+import {columnsSelector} from '@src/selectors/AdvancedSearchFiltersForm';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {PendingAction} from '@src/types/onyx/OnyxCommon';
 import MoneyRequestReportGroupHeader from './MoneyRequestReportGroupHeader';
@@ -183,6 +184,8 @@ function MoneyRequestReportTransactionList({
     const shouldShowAddExpenseButton = canAddTransaction(report, isReportArchived) && isCurrentUserSubmitter(report);
     const [lastDistanceExpenseType] = useOnyx(ONYXKEYS.NVP_LAST_DISTANCE_EXPENSE_TYPE, {canBeMissing: true});
     const [reportLayoutGroupBy] = useOnyx(ONYXKEYS.NVP_REPORT_LAYOUT_GROUP_BY, {canBeMissing: true});
+    const [visibleColumns] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, {canBeMissing: true, selector: columnsSelector});
+
     const shouldShowGroupedTransactions = isExpenseReport(report) && !isIOUReport(report);
 
     const addExpenseDropdownOptions = useMemo(
@@ -265,9 +268,9 @@ function MoneyRequestReportTransactionList({
     }, [newTransactions, sortBy, sortOrder, transactions, localeCompare, report]);
 
     const columnsToShow = useMemo(() => {
-        const columns = getColumnsToShow(currentUserDetails?.accountID, transactions, true);
+        const columns = getColumnsToShow(currentUserDetails?.accountID, transactions, visibleColumns, true);
         return (Object.keys(columns) as SearchColumnType[]).filter((column) => columns[column]);
-    }, [transactions, currentUserDetails?.accountID]);
+    }, [transactions, currentUserDetails?.accountID, visibleColumns]);
 
     const currentGroupBy = getReportLayoutGroupBy(reportLayoutGroupBy);
 
diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
index 5c8482a536fb..7fd61665744f 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -66,6 +66,7 @@ import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
+import {columnsSelector} from '@src/selectors/AdvancedSearchFiltersForm';
 import {isActionLoadingSetSelector} from '@src/selectors/ReportMetaData';
 import type {OutstandingReportsByPolicyIDDerivedValue, Transaction} from '@src/types/onyx';
 import type SearchResults from '@src/types/onyx/SearchResults';
@@ -283,6 +284,8 @@ function Search({
     const [violations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS, {canBeMissing: true});
     const {accountID, email} = useCurrentUserPersonalDetails();
     const [isActionLoadingSet = new Set<string>()] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_METADATA}`, {canBeMissing: true, selector: isActionLoadingSetSelector});
+    const [visibleColumns] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, {canBeMissing: true, selector: columnsSelector});
+
     const isExpenseReportType = type === CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT;
 
     // Filter violations based on user visibility
@@ -824,10 +827,10 @@ function Search({
         if (!searchResults?.data) {
             return [];
         }
-        const columns = getColumnsToShow(accountID, searchResults?.data, false, searchResults?.search?.type);
+        const columns = getColumnsToShow(accountID, searchResults?.data, visibleColumns, false, searchResults?.search?.type);
 
         return (Object.keys(columns) as SearchColumnType[]).filter((col) => columns[col]);
-    }, [accountID, searchResults?.data, searchResults?.search?.type]);
+    }, [accountID, searchResults?.data, searchResults?.search?.type, visibleColumns]);
 
     const opacity = useSharedValue(1);
     const animatedStyle = useAnimatedStyle(() => ({
diff --git a/src/components/SelectionListWithSections/Search/TransactionGroupListExpanded.tsx b/src/components/SelectionListWithSections/Search/TransactionGroupListExpanded.tsx
index 2c9fbc305432..c01e009660b0 100644
--- a/src/components/SelectionListWithSections/Search/TransactionGroupListExpanded.tsx
+++ b/src/components/SelectionListWithSections/Search/TransactionGroupListExpanded.tsx
@@ -24,6 +24,7 @@ import {setActiveTransactionIDs} from '@userActions/TransactionThreadNavigation'
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
+import {columnsSelector} from '@src/selectors/AdvancedSearchFiltersForm';
 
 function TransactionGroupListExpanded<TItem extends ListItem>({
     transactionsQueryJSON,
@@ -52,6 +53,8 @@ function TransactionGroupListExpanded<TItem extends ListItem>({
     const currentUserDetails = useCurrentUserPersonalDetails();
     const {translate} = useLocalize();
     const [isMobileSelectionModeEnabled] = useOnyx(ONYXKEYS.MOBILE_SELECTION_MODE, {canBeMissing: true});
+    const [visibleColumns] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, {canBeMissing: true, selector: columnsSelector});
+
     const transactionsSnapshotMetadata = useMemo(() => {
         return transactionsSnapshot?.search;
     }, [transactionsSnapshot?.search]);
@@ -77,10 +80,10 @@ function TransactionGroupListExpanded<TItem extends ListItem>({
         if (!transactionsSnapshot?.data) {
             return [];
         }
-        const columnsToShow = getColumnsToShow(accountID, transactionsSnapshot?.data, false, transactionsSnapshot?.search.type);
+        const columnsToShow = getColumnsToShow(accountID, transactionsSnapshot?.data, visibleColumns, false, transactionsSnapshot?.search.type);
 
         return (Object.keys(columnsToShow) as SearchColumnType[]).filter((col) => columnsToShow[col]);
-    }, [accountID, columns, isExpenseReportType, transactionsSnapshot?.data, transactionsSnapshot?.search.type]);
+    }, [accountID, columns, isExpenseReportType, transactionsSnapshot?.data, transactionsSnapshot?.search.type, visibleColumns]);
 
     const areAllOptionalColumnsHidden = useMemo(() => {
         if (isExpenseReportType) {
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 31a8bc26396d..f0d0ca4f358a 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -2450,7 +2450,7 @@ function getActionOptions(translate: LocaleContextProps['translate']) {
 function getColumnsToShow(
     currentAccountID: number | undefined,
     data: OnyxTypes.SearchResults['data'] | OnyxTypes.Transaction[],
-    visibleColumns: SearchCustomColumnIds[],
+    visibleColumns: SearchCustomColumnIds[] = [],
     isExpenseReportView = false,
     type?: SearchDataTypes,
 ): ColumnVisibility {
diff --git a/src/selectors/AdvancedSearchFiltersForm.ts b/src/selectors/AdvancedSearchFiltersForm.ts
new file mode 100644
index 000000000000..6ff050d3e7b6
--- /dev/null
+++ b/src/selectors/AdvancedSearchFiltersForm.ts
@@ -0,0 +1,7 @@
+import type {OnyxEntry} from 'react-native-onyx';
+import type {SearchAdvancedFiltersForm} from '@src/types/form';
+
+const columnsSelector = (form: OnyxEntry<SearchAdvancedFiltersForm>) => form?.columns;
+
+// eslint-disable-next-line import/prefer-default-export
+export {columnsSelector};
diff --git a/tests/unit/Search/SearchUIUtilsTest.ts b/tests/unit/Search/SearchUIUtilsTest.ts
index fc6bb19fe607..630ea1098b77 100644
--- a/tests/unit/Search/SearchUIUtilsTest.ts
+++ b/tests/unit/Search/SearchUIUtilsTest.ts
@@ -2565,6 +2565,7 @@ describe('SearchUIUtils', () => {
         });
     });
 
+    // JACK_TODO: tests here
     describe('Test getColumnsToShow', () => {
         test('Should only show columns when at least one transaction has a value for them', () => {
             // Use the existing transaction as a base and modify only the fields we need to test

From d0f39dde9900f8baf8ebb1518adc1d0fbded2c8c Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 12:23:36 -0500
Subject: [PATCH 28/50] update to expense report, not expense

---
 src/CONST/index.ts                     | 2 +-
 src/libs/SearchUIUtils.ts              | 4 ++--
 src/pages/Search/SearchColumnsPage.tsx | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index b33a79c6a774..76d0cf894da9 100755
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -6707,7 +6707,7 @@ const CONST = {
         },
         get DEFAULT_COLUMNS() {
             return {
-                EXPENSE: [
+                EXPENSE_REPORT: [
                     this.CUSTOM_COLUMNS.DATE,
                     this.CUSTOM_COLUMNS.STATUS,
                     this.CUSTOM_COLUMNS.TITLE,
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index f0d0ca4f358a..fb6bf27066bc 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -2565,10 +2565,10 @@ function getColumnsToShow(
         }
     };
 
-    const defaultColumns = Object.values(CONST.SEARCH.DEFAULT_COLUMNS.EXPENSE);
+    const defaultColumns = Object.values(CONST.SEARCH.DEFAULT_COLUMNS.EXPENSE_REPORT);
 
     // If the user has set custom columns, we only need to control the visibility of those
-    if (!arraysEqual(defaultColumns, visibleColumns)) {
+    if (!arraysEqual(defaultColumns, visibleColumns) && visibleColumns.length > 0) {
         for (const column of Object.keys(columns)) {
             columns[column as keyof ColumnVisibility] = false;
         }
diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 841b224de5ce..c2a9555b4d0a 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -22,7 +22,7 @@ import ROUTES from '@src/ROUTES';
 import type {SearchAdvancedFiltersForm} from '@src/types/form';
 
 const allColumns = Object.values(CONST.SEARCH.CUSTOM_COLUMNS);
-const defaultColumns = Object.values(CONST.SEARCH.DEFAULT_COLUMNS.EXPENSE);
+const defaultColumns = Object.values(CONST.SEARCH.DEFAULT_COLUMNS.EXPENSE_REPORT);
 
 function SearchColumnsPage() {
     const styles = useThemeStyles();

From 04dd680f31d6d9b1cb0be6cddd3803fb734fdd65 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 12:26:54 -0500
Subject: [PATCH 29/50] update search ui logic for expens e reports

---
 src/libs/SearchUIUtils.ts | 52 ++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index fb6bf27066bc..c147131a10ab 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -2455,16 +2455,33 @@ function getColumnsToShow(
     type?: SearchDataTypes,
 ): ColumnVisibility {
     if (type === CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT) {
-        return {
-            [CONST.SEARCH.TABLE_COLUMNS.AVATAR]: true,
-            [CONST.SEARCH.TABLE_COLUMNS.DATE]: true,
-            [CONST.SEARCH.TABLE_COLUMNS.STATUS]: true,
-            [CONST.SEARCH.TABLE_COLUMNS.TITLE]: true,
-            [CONST.SEARCH.TABLE_COLUMNS.FROM]: true,
-            [CONST.SEARCH.TABLE_COLUMNS.TO]: true,
-            [CONST.SEARCH.TABLE_COLUMNS.TOTAL]: true,
-            [CONST.SEARCH.TABLE_COLUMNS.ACTION]: true,
-        };
+        const reportColumns = [
+            CONST.SEARCH.TABLE_COLUMNS.AVATAR,
+            CONST.SEARCH.TABLE_COLUMNS.DATE,
+            CONST.SEARCH.TABLE_COLUMNS.STATUS,
+            CONST.SEARCH.TABLE_COLUMNS.TITLE,
+            CONST.SEARCH.TABLE_COLUMNS.FROM,
+            CONST.SEARCH.TABLE_COLUMNS.TO,
+            CONST.SEARCH.TABLE_COLUMNS.TOTAL,
+            CONST.SEARCH.TABLE_COLUMNS.ACTION,
+        ];
+
+        const defaultColumns = Object.values(CONST.SEARCH.DEFAULT_COLUMNS.EXPENSE_REPORT);
+
+        // If the user has set custom columns, toggle the visible columns on, with all other
+        // columns hidden by default
+        if (!arraysEqual(defaultColumns, visibleColumns) && visibleColumns.length > 0) {
+            const columns = Object.fromEntries(reportColumns.map((column) => [column, false]));
+
+            for (const column of visibleColumns) {
+                columns[column as keyof ColumnVisibility] = true;
+            }
+
+            return columns;
+        }
+
+        // All columns should be visible otherwise
+        return Object.fromEntries(reportColumns.map((column) => [column, true]));
     }
 
     if (type === CONST.SEARCH.DATA_TYPES.TASK) {
@@ -2565,21 +2582,6 @@ function getColumnsToShow(
         }
     };
 
-    const defaultColumns = Object.values(CONST.SEARCH.DEFAULT_COLUMNS.EXPENSE_REPORT);
-
-    // If the user has set custom columns, we only need to control the visibility of those
-    if (!arraysEqual(defaultColumns, visibleColumns) && visibleColumns.length > 0) {
-        for (const column of Object.keys(columns)) {
-            columns[column as keyof ColumnVisibility] = false;
-        }
-
-        for (const column of visibleColumns) {
-            columns[column as keyof ColumnVisibility] = true;
-        }
-
-        return columns;
-    }
-
     if (Array.isArray(data)) {
         for (const item of data) {
             updateColumns(item);

From b7ea9ae4fad0e36031f300023829a756f2f5c8b7 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 12:39:33 -0500
Subject: [PATCH 30/50] add visibility logic to reports

---
 .../Search/ExpenseReportListItem.tsx          |   2 +
 .../Search/ExpenseReportListItemRow.tsx       | 131 ++++++++++--------
 .../SelectionListWithSections/types.ts        |   3 +
 src/libs/SearchUIUtils.ts                     |   2 +-
 4 files changed, 82 insertions(+), 56 deletions(-)

diff --git a/src/components/SelectionListWithSections/Search/ExpenseReportListItem.tsx b/src/components/SelectionListWithSections/Search/ExpenseReportListItem.tsx
index 2d36a161f7a3..32554281ddd4 100644
--- a/src/components/SelectionListWithSections/Search/ExpenseReportListItem.tsx
+++ b/src/components/SelectionListWithSections/Search/ExpenseReportListItem.tsx
@@ -26,6 +26,7 @@ function ExpenseReportListItem<TItem extends ListItem>({
     isLoading,
     isFocused,
     showTooltip,
+    columns,
     canSelectMultiple,
     onSelectRow,
     onFocus,
@@ -175,6 +176,7 @@ function ExpenseReportListItem<TItem extends ListItem>({
                 <View style={[styles.flex1]}>
                     <ExpenseReportListItemRow
                         item={reportItem}
+                        columns={columns}
                         policy={snapshotPolicy}
                         isActionLoading={isActionLoading ?? isLoading}
                         showTooltip={showTooltip}
diff --git a/src/components/SelectionListWithSections/Search/ExpenseReportListItemRow.tsx b/src/components/SelectionListWithSections/Search/ExpenseReportListItemRow.tsx
index 4bc87033dc2e..cc2909079e9f 100644
--- a/src/components/SelectionListWithSections/Search/ExpenseReportListItemRow.tsx
+++ b/src/components/SelectionListWithSections/Search/ExpenseReportListItemRow.tsx
@@ -5,6 +5,7 @@ import Checkbox from '@components/Checkbox';
 import Icon from '@components/Icon';
 import ReportActionAvatars from '@components/ReportActionAvatars';
 import ReportSearchHeader from '@components/ReportSearchHeader';
+import type {SearchColumnType} from '@components/Search/types';
 import type {ExpenseReportListItemType} from '@components/SelectionListWithSections/types';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
@@ -36,6 +37,7 @@ type ExpenseReportListItemRowProps = {
     isDisabledCheckbox?: boolean;
     isHovered?: boolean;
     isFocused?: boolean;
+    columns?: SearchColumnType[];
 };
 
 function ExpenseReportListItemRow({
@@ -50,6 +52,7 @@ function ExpenseReportListItemRow({
     isSelectAllChecked,
     isIndeterminate,
     isDisabledCheckbox,
+    columns = [],
     isHovered = false,
     isFocused = false,
 }: ExpenseReportListItemRowProps) {
@@ -75,6 +78,78 @@ function ExpenseReportListItemRow({
         return {total: reportTotal, currency: reportCurrency};
     }, [item.type, item.total, item.currency]);
 
+    const columnComponents = {
+        [CONST.SEARCH.CUSTOM_COLUMNS.DATE]: (
+            <View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.DATE, item.shouldShowYear)]}>
+                <DateCell
+                    created={item.created ?? ''}
+                    showTooltip
+                    isLargeScreenWidth
+                />
+            </View>
+        ),
+        [CONST.SEARCH.CUSTOM_COLUMNS.STATUS]: (
+            <View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.STATUS)]}>
+                <StatusCell
+                    stateNum={item.stateNum}
+                    statusNum={item.statusNum}
+                />
+            </View>
+        ),
+        [CONST.SEARCH.CUSTOM_COLUMNS.TITLE]: (
+            <View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.TITLE)]}>
+                <TitleCell
+                    text={item.reportName ?? ''}
+                    isLargeScreenWidth={isLargeScreenWidth}
+                />
+            </View>
+        ),
+        [CONST.SEARCH.CUSTOM_COLUMNS.FROM]: (
+            <View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.FROM)]}>
+                {!!item.from && (
+                    <UserInfoCell
+                        accountID={item.from.accountID}
+                        avatar={item.from.avatar}
+                        displayName={item.from.displayName ?? item.from.login ?? ''}
+                    />
+                )}
+            </View>
+        ),
+        [CONST.SEARCH.CUSTOM_COLUMNS.TO]: (
+            <View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.TO)]}>
+                {!!item.to && (
+                    <UserInfoCell
+                        accountID={item.to.accountID}
+                        avatar={item.to.avatar}
+                        displayName={item.to.displayName ?? item.to.login ?? ''}
+                    />
+                )}
+            </View>
+        ),
+        [CONST.SEARCH.CUSTOM_COLUMNS.TOTAL]: (
+            <View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.TOTAL)]}>
+                <TotalCell
+                    total={total}
+                    currency={currency}
+                />
+            </View>
+        ),
+        [CONST.SEARCH.CUSTOM_COLUMNS.ACTION]: (
+            <View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.ACTION)]}>
+                <ActionCell
+                    action={item.action}
+                    goToItem={onButtonPress}
+                    isSelected={item.isSelected}
+                    isLoading={isActionLoading}
+                    policyID={item.policyID}
+                    reportID={item.reportID}
+                    hash={item.hash}
+                    amount={item.total}
+                />
+            </View>
+        ),
+    };
+
     const thereIsFromAndTo = !!item?.from && !!item?.to;
     const showUserInfo = (item.type === CONST.REPORT.TYPE.IOU && thereIsFromAndTo) || (item.type === CONST.REPORT.TYPE.EXPENSE && !!item?.from);
 
@@ -151,61 +226,7 @@ function ExpenseReportListItemRow({
                         subscriptAvatarBorderColor={finalAvatarBorderColor}
                     />
                 </View>
-                <View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.DATE, item.shouldShowYear)]}>
-                    <DateCell
-                        created={item.created ?? ''}
-                        showTooltip
-                        isLargeScreenWidth
-                    />
-                </View>
-                <View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.STATUS)]}>
-                    <StatusCell
-                        stateNum={item.stateNum}
-                        statusNum={item.statusNum}
-                    />
-                </View>
-                <View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.TITLE)]}>
-                    <TitleCell
-                        text={item.reportName ?? ''}
-                        isLargeScreenWidth={isLargeScreenWidth}
-                    />
-                </View>
-                <View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.FROM)]}>
-                    {!!item.from && (
-                        <UserInfoCell
-                            accountID={item.from.accountID}
-                            avatar={item.from.avatar}
-                            displayName={item.from.displayName ?? item.from.login ?? ''}
-                        />
-                    )}
-                </View>
-                <View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.TO)]}>
-                    {!!item.to && (
-                        <UserInfoCell
-                            accountID={item.to.accountID}
-                            avatar={item.to.avatar}
-                            displayName={item.to.displayName ?? item.to.login ?? ''}
-                        />
-                    )}
-                </View>
-                <View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.TOTAL)]}>
-                    <TotalCell
-                        total={total}
-                        currency={currency}
-                    />
-                </View>
-                <View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.ACTION)]}>
-                    <ActionCell
-                        action={item.action}
-                        goToItem={onButtonPress}
-                        isSelected={item.isSelected}
-                        isLoading={isActionLoading}
-                        policyID={item.policyID}
-                        reportID={item.reportID}
-                        hash={item.hash}
-                        amount={item.total}
-                    />
-                </View>
+                {columns.map((column) => columnComponents[column as keyof typeof columnComponents]).filter(Boolean)}
             </View>
             <View style={styles.ml2}>
                 <Icon
diff --git a/src/components/SelectionListWithSections/types.ts b/src/components/SelectionListWithSections/types.ts
index d7d04dc9c4f5..7677b797bd0c 100644
--- a/src/components/SelectionListWithSections/types.ts
+++ b/src/components/SelectionListWithSections/types.ts
@@ -565,6 +565,9 @@ type TaskListItemProps<TItem extends ListItem> = ListItemProps<TItem> & {
 };
 
 type ExpenseReportListItemProps<TItem extends ListItem> = ListItemProps<TItem> & {
+    /** The visible columns for the report */
+    columns?: SearchColumnType[];
+
     /** Whether the item's action is loading */
     isLoading?: boolean;
 
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index c147131a10ab..531aa848804a 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -2471,7 +2471,7 @@ function getColumnsToShow(
         // If the user has set custom columns, toggle the visible columns on, with all other
         // columns hidden by default
         if (!arraysEqual(defaultColumns, visibleColumns) && visibleColumns.length > 0) {
-            const columns = Object.fromEntries(reportColumns.map((column) => [column, false]));
+            const columns = Object.fromEntries(reportColumns.map((column) => [column, true]));
 
             for (const column of visibleColumns) {
                 columns[column as keyof ColumnVisibility] = true;

From 9fb1bc84e55af3e69b893f463042077f62299ec5 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 12:48:25 -0500
Subject: [PATCH 31/50] fix visibility not working for avatars

---
 src/libs/SearchUIUtils.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 531aa848804a..2a80c94b0a74 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -2471,7 +2471,12 @@ function getColumnsToShow(
         // If the user has set custom columns, toggle the visible columns on, with all other
         // columns hidden by default
         if (!arraysEqual(defaultColumns, visibleColumns) && visibleColumns.length > 0) {
-            const columns = Object.fromEntries(reportColumns.map((column) => [column, true]));
+            const columns: ColumnVisibility = {};
+            const requiredColumns = new Set<keyof ColumnVisibility>([CONST.SEARCH.TABLE_COLUMNS.AVATAR]);
+
+            for (const columnId of reportColumns) {
+                columns[columnId] = requiredColumns.has(columnId);
+            }
 
             for (const column of visibleColumns) {
                 columns[column as keyof ColumnVisibility] = true;

From 4135929cce4064af6f0e7f7396d70ad3ebe5bb68 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 12:52:25 -0500
Subject: [PATCH 32/50] fix reset filters showing up incorrectly

---
 src/pages/Search/SearchColumnsPage.tsx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index c2a9555b4d0a..549d70d5de1a 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -1,4 +1,4 @@
-import React, {useState} from 'react';
+import React, {useMemo, useState} from 'react';
 import {View} from 'react-native';
 import Button from '@components/Button';
 import DotIndicatorMessage from '@components/DotIndicatorMessage';
@@ -20,6 +20,7 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {SearchAdvancedFiltersForm} from '@src/types/form';
+import arraysEqual from '@src/utils/arraysEqual';
 
 const allColumns = Object.values(CONST.SEARCH.CUSTOM_COLUMNS);
 const defaultColumns = Object.values(CONST.SEARCH.DEFAULT_COLUMNS.EXPENSE_REPORT);
@@ -53,8 +54,11 @@ function SearchColumnsPage() {
         },
     ];
 
-    // JACK_TODO
-    const shouldShowResetColumns = true;
+    const shouldShowResetColumns = useMemo(() => {
+        const sortedSelectedColumnIds = [...selectedColumnIds].sort();
+        const sortedDefaultColumns = [...defaultColumns].sort();
+        return !arraysEqual(sortedSelectedColumnIds, sortedDefaultColumns);
+    }, [selectedColumnIds]);
 
     const onSelectItem = (item: ListItem) => {
         const updatedColumnId = item.keyForList as SearchCustomColumnIds;

From 830162a491ab75f63f4fc6040d32d97239f60239 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 13:19:09 -0500
Subject: [PATCH 33/50] add spanish translations, revert changes to search
 selection picker

---
 .../Search/SearchMultipleSelectionPicker.tsx  | 31 ++-----------------
 src/languages/es.ts                           |  6 ++--
 2 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/src/components/Search/SearchMultipleSelectionPicker.tsx b/src/components/Search/SearchMultipleSelectionPicker.tsx
index 8980d8355457..36738dc454f3 100644
--- a/src/components/Search/SearchMultipleSelectionPicker.tsx
+++ b/src/components/Search/SearchMultipleSelectionPicker.tsx
@@ -19,18 +19,10 @@ type SearchMultipleSelectionPickerProps = {
     initiallySelectedItems: SearchMultipleSelectionPickerItem[] | undefined;
     pickerTitle?: string;
     onSaveSelection: (values: string[]) => void;
-    disableScrollToTopOnSelect?: boolean;
     shouldShowTextInput?: boolean;
 };
 
-function SearchMultipleSelectionPicker({
-    items,
-    initiallySelectedItems,
-    pickerTitle,
-    onSaveSelection,
-    disableScrollToTopOnSelect,
-    shouldShowTextInput = true,
-}: SearchMultipleSelectionPickerProps) {
+function SearchMultipleSelectionPicker({items, initiallySelectedItems, pickerTitle, onSaveSelection, shouldShowTextInput = true}: SearchMultipleSelectionPickerProps) {
     const {translate, localeCompare} = useLocalize();
 
     const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
@@ -41,24 +33,6 @@ function SearchMultipleSelectionPicker({
     }, [initiallySelectedItems]);
 
     const {sections, noResultsFound} = useMemo(() => {
-        if (disableScrollToTopOnSelect) {
-            return {
-                sections: [
-                    {
-                        title: undefined,
-                        data: items
-                            .sort((a, b) => sortOptionsWithEmptyValue(a.value.toString(), b.value.toString(), localeCompare))
-                            .map((item) => ({
-                                text: item.name,
-                                keyForList: item.name,
-                                isSelected: selectedItems.some((selectedItem) => selectedItem.value.toString() === item.value.toString()),
-                                value: item.value,
-                            })),
-                    },
-                ],
-            };
-        }
-
         const selectedItemsSection = selectedItems
             .filter((item) => item?.name.toLowerCase().includes(debouncedSearchTerm?.toLowerCase()))
             .sort((a, b) => sortOptionsWithEmptyValue(a.value.toString(), b.value.toString(), localeCompare))
@@ -68,7 +42,6 @@ function SearchMultipleSelectionPicker({
                 isSelected: true,
                 value: item.value,
             }));
-
         const remainingItemsSection = items
             .filter(
                 (item) =>
@@ -99,7 +72,7 @@ function SearchMultipleSelectionPicker({
                   ],
             noResultsFound: isEmpty,
         };
-    }, [disableScrollToTopOnSelect, selectedItems, items, pickerTitle, debouncedSearchTerm, localeCompare]);
+    }, [selectedItems, items, pickerTitle, debouncedSearchTerm, localeCompare]);
 
     const onSelectItem = useCallback(
         (item: Partial<OptionData & SearchMultipleSelectionPickerItem>) => {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index e5443e61aa6e..2fa1cdd70edb 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -6244,9 +6244,9 @@ ${amount} para ${merchant} - ${date}`,
                 subtitle: 'Cero gastos. Máxima relajación. ¡Bien hecho!',
             },
         },
-        columms: 'Columns',
-        resetColumns: 'Reset columns',
-        noColumnsError: 'Please select at least one column before saving',
+        columms: 'Columnas',
+        resetColumns: 'Restablecer columnas',
+        noColumnsError: 'Por favor selecciona al menos una columna antes de guardar',
         statements: 'Extractos',
         unapprovedCash: 'Efectivo no aprobado',
         unapprovedCard: 'Tarjeta no aprobada',

From e8e2bc6fc528bffba8a34825a8ac096650deb91d Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 13:20:02 -0500
Subject: [PATCH 34/50] all other translations

---
 src/languages/de.ts      | 6 +++---
 src/languages/fr.ts      | 6 +++---
 src/languages/it.ts      | 6 +++---
 src/languages/ja.ts      | 6 +++---
 src/languages/nl.ts      | 6 +++---
 src/languages/pl.ts      | 6 +++---
 src/languages/pt-BR.ts   | 6 +++---
 src/languages/zh-hans.ts | 6 +++---
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/languages/de.ts b/src/languages/de.ts
index df486e90f49d..78c058d3ea6a 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -6735,9 +6735,9 @@ Fordere Spesendetails wie Belege und Beschreibungen an, lege Limits und Standard
                 subtitle: 'Null Spesen. Maximale Entspannung. Gut gemacht!',
             },
         },
-        columms: 'Columns',
-        resetColumns: 'Reset columns',
-        noColumnsError: 'Please select at least one column before saving',
+        columms: 'Spalten',
+        resetColumns: 'Spalten zurücksetzen',
+        noColumnsError: 'Bitte wählen Sie vor dem Speichern mindestens eine Spalte aus',
         statements: 'Abrechnungen',
         unapprovedCash: 'Nicht genehmigtes Bargeld',
         unapprovedCard: 'Nicht genehmigte Karte',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index bf34535db57f..ad52c0261f7f 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -6744,9 +6744,9 @@ Exigez des informations de dépense comme les reçus et les descriptions, défin
                 subtitle: 'Zéro note de frais. Détente maximale. Bien joué !',
             },
         },
-        columms: 'Columns',
-        resetColumns: 'Reset columns',
-        noColumnsError: 'Please select at least one column before saving',
+        columms: 'Colonnes',
+        resetColumns: 'Réinitialiser les colonnes',
+        noColumnsError: 'Veuillez sélectionner au moins une colonne avant d’enregistrer',
         statements: 'Relevés',
         unapprovedCash: 'Espèces non approuvées',
         unapprovedCard: 'Carte non approuvée',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 42cc6bef0ab5..b55485c8d086 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -6717,9 +6717,9 @@ Richiedi dettagli di spesa come ricevute e descrizioni, imposta limiti e valori
                 subtitle: 'Zero spese. Massimo relax. Ben fatto!',
             },
         },
-        columms: 'Columns',
-        resetColumns: 'Reset columns',
-        noColumnsError: 'Please select at least one column before saving',
+        columms: 'Colonne',
+        resetColumns: 'Reimposta colonne',
+        noColumnsError: 'Seleziona almeno una colonna prima di salvare',
         statements: 'Estratti conto',
         unapprovedCash: 'Contanti non approvati',
         unapprovedCard: 'Carta non approvata',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 225f42ee9703..45ba18a31db9 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -6667,9 +6667,9 @@ ${reportName}
                 subtitle: '経費はゼロ。くつろぎはマックス。お見事です！',
             },
         },
-        columms: 'Columns',
-        resetColumns: 'Reset columns',
-        noColumnsError: 'Please select at least one column before saving',
+        columms: '列',
+        resetColumns: '列をリセット',
+        noColumnsError: '保存する前に、少なくとも 1 つの列を選択してください',
         statements: 'ステートメント',
         unapprovedCash: '未承認の現金',
         unapprovedCard: '未承認のカード',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index b568e22682c7..b089a0a61065 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -6703,9 +6703,9 @@ Vraag verplichte uitgavedetails zoals bonnetjes en beschrijvingen, stel limieten
                 subtitle: 'Nul onkosten. Maximale ontspanning. Goed gedaan!',
             },
         },
-        columms: 'Columns',
-        resetColumns: 'Reset columns',
-        noColumnsError: 'Please select at least one column before saving',
+        columms: 'Kolommen',
+        resetColumns: 'Kolommen resetten',
+        noColumnsError: 'Selecteer minstens één kolom voordat je opslaat',
         statements: 'Afschriften',
         unapprovedCash: 'Niet-goedgekeurde contanten',
         unapprovedCard: 'Niet-goedgekeurde kaart',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index ec6913fc3232..9b244a77e8e5 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -6693,9 +6693,9 @@ Wymagaj szczegółów wydatków, takich jak paragony i opisy, ustawiaj limity i
                 subtitle: 'Zero wydatków. Maksymalny luz. Dobra robota!',
             },
         },
-        columms: 'Columns',
-        resetColumns: 'Reset columns',
-        noColumnsError: 'Please select at least one column before saving',
+        columms: 'Kolumny',
+        resetColumns: 'Resetuj kolumny',
+        noColumnsError: 'Proszę wybrać co najmniej jedną kolumnę przed zapisaniem',
         statements: 'Wyciągi',
         unapprovedCash: 'Niezaakceptowana gotówka',
         unapprovedCard: 'Niezatwierdzona karta',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 66969808146c..2e49bf603a0d 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -6698,9 +6698,9 @@ Exija detalhes de despesas como recibos e descrições, defina limites e padrõe
                 subtitle: 'Zero despesas. Máxima tranquilidade. Muito bem!',
             },
         },
-        columms: 'Columns',
-        resetColumns: 'Reset columns',
-        noColumnsError: 'Please select at least one column before saving',
+        columms: 'Colunas',
+        resetColumns: 'Redefinir colunas',
+        noColumnsError: 'Selecione pelo menos uma coluna antes de salvar',
         statements: 'Extratos',
         unapprovedCash: 'Dinheiro não aprovado',
         unapprovedCard: 'Cartão não aprovado',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index a15c1ced4e55..187e6cf2eb63 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -6567,9 +6567,9 @@ ${reportName}
                 subtitle: '报销为零，轻松满分。干得好！',
             },
         },
-        columms: 'Columns',
-        resetColumns: 'Reset columns',
-        noColumnsError: 'Please select at least one column before saving',
+        columms: '列',
+        resetColumns: '重置列',
+        noColumnsError: '请在保存前至少选择一列',
         statements: '对账单',
         unapprovedCash: '未批准的现金',
         unapprovedCard: '未批准的卡片',

From 396325cc9fef0ed857b98d8c30044bde80dbdd22 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 13:26:06 -0500
Subject: [PATCH 35/50] compress svg and search  columns page comment updates

---
 assets/images/columns.svg              | 15 +--------------
 src/pages/Search/SearchColumnsPage.tsx |  2 +-
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/assets/images/columns.svg b/assets/images/columns.svg
index 13e1224da6db..6921bb4895dd 100644
--- a/assets/images/columns.svg
+++ b/assets/images/columns.svg
@@ -1,14 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 20 20">
-  <!-- Generator: Adobe Illustrator 30.0.0, SVG Export Plug-In . SVG Version: 2.1.1 Build 123)  -->
-  <defs>
-    <style>
-      .st0 {
-        fill-rule: evenodd;
-      }
-    </style>
-  </defs>
-  <path class="st0" d="M18,4H2v12h16V4ZM2,2c-1.105,0-2,.895-2,2v12c0,1.105.895,2,2,2h16c1.105,0,2-.895,2-2V4c0-1.105-.895-2-2-2H2Z"/>
-  <path d="M6,4h2v12h-2V4Z"/>
-  <path d="M12,4h2v12h-2V4Z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" viewBox="0 0 20 20"><defs><style>.st0{fill-rule:evenodd}</style></defs><path d="M18 4H2v12h16zM2 2a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2z" class="st0"/><path d="M6 4h2v12H6zm6 0h2v12h-2z"/></svg>
\ No newline at end of file
diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 549d70d5de1a..bc83657c6906 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -34,7 +34,7 @@ function SearchColumnsPage() {
     const [selectedColumnIds, setSelectedColumnIds] = useState<SearchCustomColumnIds[]>(() => {
         const columnIds = searchAdvancedFiltersForm?.columns?.filter((columnId) => Object.values(CONST.SEARCH.CUSTOM_COLUMNS).includes(columnId)) ?? [];
 
-        // We dont allow the user to unselect all columns, so we can assume that no columns = all columns/none configured yet
+        // We dont allow the user to unselect all columns, so we can assume that no columns = default columns
         if (!columnIds.length) {
             return defaultColumns;
         }

From 4ffe323511da8697d622daf922b5d7f539ab454b Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 13:29:24 -0500
Subject: [PATCH 36/50] fix react checks and misspelled words

---
 .../Search/SearchPageHeader/SearchFiltersBar.tsx       |  2 +-
 src/languages/de.ts                                    |  2 +-
 src/languages/en.ts                                    |  2 +-
 src/languages/es.ts                                    |  2 +-
 src/languages/fr.ts                                    |  2 +-
 src/languages/it.ts                                    |  2 +-
 src/languages/ja.ts                                    |  2 +-
 src/languages/nl.ts                                    |  2 +-
 src/languages/pl.ts                                    |  2 +-
 src/languages/pt-BR.ts                                 |  2 +-
 src/languages/zh-hans.ts                               |  2 +-
 src/pages/Search/SearchColumnsPage.tsx                 | 10 ++++------
 12 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx b/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
index 29ed7eb2d343..8c6f872f576a 100644
--- a/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
+++ b/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
@@ -807,7 +807,7 @@ function SearchFiltersBar({
                         link
                         small
                         shouldUseDefaultHover={false}
-                        text={translate('search.columms')}
+                        text={translate('search.columns')}
                         iconFill={theme.link}
                         iconHoverFill={theme.linkHover}
                         icon={expensifyIcons.Columns}
diff --git a/src/languages/de.ts b/src/languages/de.ts
index 78c058d3ea6a..30f483b71a78 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -6735,7 +6735,7 @@ Fordere Spesendetails wie Belege und Beschreibungen an, lege Limits und Standard
                 subtitle: 'Null Spesen. Maximale Entspannung. Gut gemacht!',
             },
         },
-        columms: 'Spalten',
+        columns: 'Spalten',
         resetColumns: 'Spalten zurücksetzen',
         noColumnsError: 'Bitte wählen Sie vor dem Speichern mindestens eine Spalte aus',
         statements: 'Abrechnungen',
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 9fcbb00ea5bd..8f20c1f98ff5 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -6590,7 +6590,7 @@ const translations = {
                 subtitle: 'Zero expenses. Maximum chill. Well done!',
             },
         },
-        columms: 'Columns',
+        columns: 'Columns',
         resetColumns: 'Reset columns',
         noColumnsError: 'Please select at least one column before saving',
         statements: 'Statements',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 2fa1cdd70edb..174909a22936 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -6244,7 +6244,7 @@ ${amount} para ${merchant} - ${date}`,
                 subtitle: 'Cero gastos. Máxima relajación. ¡Bien hecho!',
             },
         },
-        columms: 'Columnas',
+        columns: 'Columnas',
         resetColumns: 'Restablecer columnas',
         noColumnsError: 'Por favor selecciona al menos una columna antes de guardar',
         statements: 'Extractos',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index ad52c0261f7f..ae7522060d88 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -6744,7 +6744,7 @@ Exigez des informations de dépense comme les reçus et les descriptions, défin
                 subtitle: 'Zéro note de frais. Détente maximale. Bien joué !',
             },
         },
-        columms: 'Colonnes',
+        columns: 'Colonnes',
         resetColumns: 'Réinitialiser les colonnes',
         noColumnsError: 'Veuillez sélectionner au moins une colonne avant d’enregistrer',
         statements: 'Relevés',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index b55485c8d086..f60d9a6e83ff 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -6717,7 +6717,7 @@ Richiedi dettagli di spesa come ricevute e descrizioni, imposta limiti e valori
                 subtitle: 'Zero spese. Massimo relax. Ben fatto!',
             },
         },
-        columms: 'Colonne',
+        columns: 'Colonne',
         resetColumns: 'Reimposta colonne',
         noColumnsError: 'Seleziona almeno una colonna prima di salvare',
         statements: 'Estratti conto',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 45ba18a31db9..6bcbcba270c1 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -6667,7 +6667,7 @@ ${reportName}
                 subtitle: '経費はゼロ。くつろぎはマックス。お見事です！',
             },
         },
-        columms: '列',
+        columns: '列',
         resetColumns: '列をリセット',
         noColumnsError: '保存する前に、少なくとも 1 つの列を選択してください',
         statements: 'ステートメント',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index b089a0a61065..396f75b963bd 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -6703,7 +6703,7 @@ Vraag verplichte uitgavedetails zoals bonnetjes en beschrijvingen, stel limieten
                 subtitle: 'Nul onkosten. Maximale ontspanning. Goed gedaan!',
             },
         },
-        columms: 'Kolommen',
+        columns: 'Kolommen',
         resetColumns: 'Kolommen resetten',
         noColumnsError: 'Selecteer minstens één kolom voordat je opslaat',
         statements: 'Afschriften',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 9b244a77e8e5..9646789eeb38 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -6693,7 +6693,7 @@ Wymagaj szczegółów wydatków, takich jak paragony i opisy, ustawiaj limity i
                 subtitle: 'Zero wydatków. Maksymalny luz. Dobra robota!',
             },
         },
-        columms: 'Kolumny',
+        columns: 'Kolumny',
         resetColumns: 'Resetuj kolumny',
         noColumnsError: 'Proszę wybrać co najmniej jedną kolumnę przed zapisaniem',
         statements: 'Wyciągi',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 2e49bf603a0d..ea50d4c11e42 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -6698,7 +6698,7 @@ Exija detalhes de despesas como recibos e descrições, defina limites e padrõe
                 subtitle: 'Zero despesas. Máxima tranquilidade. Muito bem!',
             },
         },
-        columms: 'Colunas',
+        columns: 'Colunas',
         resetColumns: 'Redefinir colunas',
         noColumnsError: 'Selecione pelo menos uma coluna antes de salvar',
         statements: 'Extratos',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 187e6cf2eb63..28c1c108c05c 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -6567,7 +6567,7 @@ ${reportName}
                 subtitle: '报销为零，轻松满分。干得好！',
             },
         },
-        columms: '列',
+        columns: '列',
         resetColumns: '重置列',
         noColumnsError: '请在保存前至少选择一列',
         statements: '对账单',
diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index bc83657c6906..4bd296d4f870 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -54,11 +54,9 @@ function SearchColumnsPage() {
         },
     ];
 
-    const shouldShowResetColumns = useMemo(() => {
-        const sortedSelectedColumnIds = [...selectedColumnIds].sort();
-        const sortedDefaultColumns = [...defaultColumns].sort();
-        return !arraysEqual(sortedSelectedColumnIds, sortedDefaultColumns);
-    }, [selectedColumnIds]);
+    const sortedDefaultColumns = [...defaultColumns].sort();
+    const sortedSelectedColumnIds = [...selectedColumnIds].sort();
+    const shouldShowResetColumns = !arraysEqual(sortedSelectedColumnIds, sortedDefaultColumns);
 
     const onSelectItem = (item: ListItem) => {
         const updatedColumnId = item.keyForList as SearchCustomColumnIds;
@@ -93,7 +91,7 @@ function SearchColumnsPage() {
             offlineIndicatorStyle={styles.mtAuto}
             includeSafeAreaPaddingBottom
         >
-            <HeaderWithBackButton title={translate('search.columms')}>
+            <HeaderWithBackButton title={translate('search.columns')}>
                 {shouldShowResetColumns && <TextLink onPress={resetColumns}>{translate('search.resetColumns')}</TextLink>}
             </HeaderWithBackButton>
             <View style={[styles.flex1]}>

From 1aa10596dfb539d5ec79629c63ecb1f0a9365e65 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 13:42:44 -0500
Subject: [PATCH 37/50] update canned search query logic

---
 src/components/Search/types.ts         | 2 +-
 src/libs/SearchQueryUtils.ts           | 6 +++++-
 src/pages/Search/SearchColumnsPage.tsx | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/Search/types.ts b/src/components/Search/types.ts
index affc001c6ee4..ca6a7b532ddf 100644
--- a/src/components/Search/types.ts
+++ b/src/components/Search/types.ts
@@ -224,7 +224,7 @@ type SearchQueryAST = {
     status: SearchStatus;
     sortBy: SearchColumnType;
     sortOrder: SortOrder;
-    columns: SearchCustomColumnIds[];
+    columns?: SearchCustomColumnIds[];
     groupBy?: SearchGroupBy;
     filters: ASTNode;
     policyID?: string[];
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index 1383a82e58f1..e3c9cd93867a 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -31,6 +31,7 @@ import FILTER_KEYS, {ALLOWED_TYPE_FILTERS, AMOUNT_FILTER_KEYS, DATE_FILTER_KEYS}
 import type {SearchAdvancedFiltersKey} from '@src/types/form/SearchAdvancedFiltersForm';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
+import arraysEqual from '@src/utils/arraysEqual';
 import {getCardFeedsForDisplay} from './CardFeedUtils';
 import {getCardDescription} from './CardUtils';
 import {convertToBackendAmount, convertToFrontendAmountAsInteger} from './CurrencyUtils';
@@ -1316,7 +1317,10 @@ function buildCannedSearchQuery({
  * For example: "type:trip" is a canned query.
  */
 function isCannedSearchQuery(queryJSON: SearchQueryJSON) {
-    return !queryJSON.filters && !queryJSON.policyID && !queryJSON.status;
+    const selectedColumns = queryJSON.columns ?? [];
+    const defaultColumns = Object.values(CONST.SEARCH.DEFAULT_COLUMNS.EXPENSE_REPORT);
+    const hasCustomColumns = !arraysEqual(defaultColumns, selectedColumns) && selectedColumns.length > 0;
+    return !queryJSON.filters && !queryJSON.policyID && !queryJSON.status && !hasCustomColumns;
 }
 
 function isDefaultExpensesQuery(queryJSON: SearchQueryJSON) {
diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 4bd296d4f870..a837bc02124e 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -1,4 +1,4 @@
-import React, {useMemo, useState} from 'react';
+import React, {useState} from 'react';
 import {View} from 'react-native';
 import Button from '@components/Button';
 import DotIndicatorMessage from '@components/DotIndicatorMessage';

From 733be8788c29a8a27702c55b6d5aee0df4c8a890 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 13:45:40 -0500
Subject: [PATCH 38/50] hash the columns as well

---
 src/libs/SearchQueryUtils.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index e3c9cd93867a..ece9576cdfff 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -337,6 +337,7 @@ function getQueryHashes(query: SearchQueryJSON): {primaryHash: number; recentSea
     orderedQuery += `${CONST.SEARCH.SYNTAX_ROOT_KEYS.TYPE}:${query.type}`;
     orderedQuery += ` ${CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS}:${Array.isArray(query.status) ? query.status.join(',') : query.status}`;
     orderedQuery += ` ${CONST.SEARCH.SYNTAX_ROOT_KEYS.GROUP_BY}:${query.groupBy}`;
+    orderedQuery += ` ${CONST.SEARCH.SYNTAX_ROOT_KEYS.COLUMNS}:${query.columns?.join(',')}`;
 
     const filterSet = new Set<string>(orderedQuery);
 

From b8cade960e83c9023eed9d403a5b24b227dcfd02 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 14:06:50 -0500
Subject: [PATCH 39/50] fix hash crash

---
 .../Search/ExpenseReportListItemRow.tsx                      | 1 +
 src/libs/SearchQueryUtils.ts                                 | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/SelectionListWithSections/Search/ExpenseReportListItemRow.tsx b/src/components/SelectionListWithSections/Search/ExpenseReportListItemRow.tsx
index e8ac09644eef..1fbad5423ef3 100644
--- a/src/components/SelectionListWithSections/Search/ExpenseReportListItemRow.tsx
+++ b/src/components/SelectionListWithSections/Search/ExpenseReportListItemRow.tsx
@@ -226,6 +226,7 @@ function ExpenseReportListItemRow({
                         subscriptAvatarBorderColor={finalAvatarBorderColor}
                     />
                 </View>
+
                 {columns.map((column) => columnComponents[column as keyof typeof columnComponents]).filter(Boolean)}
             </View>
             <View style={styles.ml2}>
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index ece9576cdfff..28c2ffa9cfe4 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -337,7 +337,7 @@ function getQueryHashes(query: SearchQueryJSON): {primaryHash: number; recentSea
     orderedQuery += `${CONST.SEARCH.SYNTAX_ROOT_KEYS.TYPE}:${query.type}`;
     orderedQuery += ` ${CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS}:${Array.isArray(query.status) ? query.status.join(',') : query.status}`;
     orderedQuery += ` ${CONST.SEARCH.SYNTAX_ROOT_KEYS.GROUP_BY}:${query.groupBy}`;
-    orderedQuery += ` ${CONST.SEARCH.SYNTAX_ROOT_KEYS.COLUMNS}:${query.columns?.join(',')}`;
+    orderedQuery += ` ${CONST.SEARCH.SYNTAX_ROOT_KEYS.COLUMNS}:${Array.isArray(query.columns) ? query.columns.join(',') : query.columns}`;
 
     const filterSet = new Set<string>(orderedQuery);
 
@@ -973,7 +973,8 @@ function buildFilterFormValuesFromQuery(
     }
 
     if (queryJSON.columns) {
-        filtersForm[FILTER_KEYS.COLUMNS] = queryJSON.columns;
+        const columns = [queryJSON.columns].flat();
+        filtersForm[FILTER_KEYS.COLUMNS] = columns;
     }
 
     return filtersForm;

From e172776601eef685e13f9b7f69ccc1384c66fc33 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 15:01:07 -0500
Subject: [PATCH 40/50] add disabled logic

---
 .../SelectionListWithSections/MultiSelectListItem.tsx        | 3 ++-
 src/pages/Search/SearchColumnsPage.tsx                       | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/SelectionListWithSections/MultiSelectListItem.tsx b/src/components/SelectionListWithSections/MultiSelectListItem.tsx
index f6b3b5e42f07..59a86673dd69 100644
--- a/src/components/SelectionListWithSections/MultiSelectListItem.tsx
+++ b/src/components/SelectionListWithSections/MultiSelectListItem.tsx
@@ -35,10 +35,11 @@ function MultiSelectListItem<TItem extends ListItem>({
                 accessibilityLabel={item.text ?? ''}
                 onPress={() => onSelectRow(item)}
                 isIndeterminate={item.isIndeterminate}
+                disabled={!!isDisabled}
                 style={[isMultilineSupported ? styles.ml3 : null]}
             />
         );
-    }, [isMultilineSupported, isSelected, item, onSelectRow, styles.ml3]);
+    }, [isDisabled, isMultilineSupported, isSelected, item, onSelectRow, styles.ml3]);
 
     return (
         <RadioListItem
diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index a837bc02124e..3ae078f2939f 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -8,6 +8,7 @@ import type {SearchCustomColumnIds} from '@components/Search/types';
 import type {ListItem} from '@components/SelectionList/types';
 import SelectionList from '@components/SelectionListWithSections';
 import MultiSelectListItem from '@components/SelectionListWithSections/MultiSelectListItem';
+import type {SectionListDataType} from '@components/SelectionListWithSections/types';
 import TextLink from '@components/TextLink';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
@@ -42,13 +43,15 @@ function SearchColumnsPage() {
         return columnIds;
     });
 
-    const sections = [
+    const sections: Array<SectionListDataType<ListItem>> = [
         {
             title: undefined,
             data: allColumns.map((columnId) => ({
                 text: translate(getSearchColumnTranslationKey(columnId)),
                 value: columnId,
                 keyForList: columnId,
+                // We do not allow the user to unselect the total column, but we want to inform them that it will be in their column selection
+                isDisabled: columnId === CONST.SEARCH.CUSTOM_COLUMNS.TOTAL,
                 isSelected: selectedColumnIds?.includes(columnId),
             })),
         },

From 8c4e9e740e28cc16050d6f30221efc9c979ecda3 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 15:08:54 -0500
Subject: [PATCH 41/50] rename consts for search to re-use table columns

---
 src/CONST/index.ts                            | 27 +++++++------------
 .../Search/ExpenseReportListItemRow.tsx       | 14 +++++-----
 src/libs/SearchUIUtils.ts                     |  2 --
 src/pages/Search/SearchColumnsPage.tsx        |  2 --
 src/styles/utils/index.ts                     |  2 +-
 5 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index fd3bccfada6c..511ed2b1e134 100755
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -6699,26 +6699,19 @@ const CONST = {
             CARD: 'card',
             WITHDRAWAL_ID: 'withdrawal-id',
         },
-        CUSTOM_COLUMNS: {
-            DATE: 'date',
-            STATUS: 'status',
-            TITLE: 'title',
-            FROM: 'from',
-            TO: 'to',
-            TOTAL: 'total',
-            ACTION: 'action',
+        get CUSTOM_COLUMNS() {
+            return {
+                DATE: this.TABLE_COLUMNS.DATE,
+                STATUS: this.TABLE_COLUMNS.STATUS,
+                TITLE: this.TABLE_COLUMNS.TITLE,
+                FROM: this.TABLE_COLUMNS.FROM,
+                TO: this.TABLE_COLUMNS.TO,
+                ACTION: this.TABLE_COLUMNS.ACTION,
+            };
         },
         get DEFAULT_COLUMNS() {
             return {
-                EXPENSE_REPORT: [
-                    this.CUSTOM_COLUMNS.DATE,
-                    this.CUSTOM_COLUMNS.STATUS,
-                    this.CUSTOM_COLUMNS.TITLE,
-                    this.CUSTOM_COLUMNS.FROM,
-                    this.CUSTOM_COLUMNS.TO,
-                    this.CUSTOM_COLUMNS.TOTAL,
-                    this.CUSTOM_COLUMNS.ACTION,
-                ],
+                EXPENSE_REPORT: [this.TABLE_COLUMNS.DATE, this.TABLE_COLUMNS.STATUS, this.TABLE_COLUMNS.TITLE, this.TABLE_COLUMNS.FROM, this.TABLE_COLUMNS.TO, this.TABLE_COLUMNS.TOTAL],
             };
         },
         BOOLEAN: {
diff --git a/src/components/SelectionListWithSections/Search/ExpenseReportListItemRow.tsx b/src/components/SelectionListWithSections/Search/ExpenseReportListItemRow.tsx
index 1fbad5423ef3..a79f2cad1368 100644
--- a/src/components/SelectionListWithSections/Search/ExpenseReportListItemRow.tsx
+++ b/src/components/SelectionListWithSections/Search/ExpenseReportListItemRow.tsx
@@ -79,7 +79,7 @@ function ExpenseReportListItemRow({
     }, [item.type, item.total, item.currency]);
 
     const columnComponents = {
-        [CONST.SEARCH.CUSTOM_COLUMNS.DATE]: (
+        [CONST.SEARCH.TABLE_COLUMNS.DATE]: (
             <View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.DATE, item.shouldShowYear)]}>
                 <DateCell
                     date={item.created ?? ''}
@@ -88,7 +88,7 @@ function ExpenseReportListItemRow({
                 />
             </View>
         ),
-        [CONST.SEARCH.CUSTOM_COLUMNS.STATUS]: (
+        [CONST.SEARCH.TABLE_COLUMNS.STATUS]: (
             <View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.STATUS)]}>
                 <StatusCell
                     stateNum={item.stateNum}
@@ -96,7 +96,7 @@ function ExpenseReportListItemRow({
                 />
             </View>
         ),
-        [CONST.SEARCH.CUSTOM_COLUMNS.TITLE]: (
+        [CONST.SEARCH.TABLE_COLUMNS.TITLE]: (
             <View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.TITLE)]}>
                 <TitleCell
                     text={item.reportName ?? ''}
@@ -104,7 +104,7 @@ function ExpenseReportListItemRow({
                 />
             </View>
         ),
-        [CONST.SEARCH.CUSTOM_COLUMNS.FROM]: (
+        [CONST.SEARCH.TABLE_COLUMNS.FROM]: (
             <View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.FROM)]}>
                 {!!item.from && (
                     <UserInfoCell
@@ -115,7 +115,7 @@ function ExpenseReportListItemRow({
                 )}
             </View>
         ),
-        [CONST.SEARCH.CUSTOM_COLUMNS.TO]: (
+        [CONST.SEARCH.TABLE_COLUMNS.TO]: (
             <View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.TO)]}>
                 {!!item.to && (
                     <UserInfoCell
@@ -126,7 +126,7 @@ function ExpenseReportListItemRow({
                 )}
             </View>
         ),
-        [CONST.SEARCH.CUSTOM_COLUMNS.TOTAL]: (
+        [CONST.SEARCH.TABLE_COLUMNS.TOTAL]: (
             <View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.TOTAL)]}>
                 <TotalCell
                     total={total}
@@ -134,7 +134,7 @@ function ExpenseReportListItemRow({
                 />
             </View>
         ),
-        [CONST.SEARCH.CUSTOM_COLUMNS.ACTION]: (
+        [CONST.SEARCH.TABLE_COLUMNS.ACTION]: (
             <View style={[StyleUtils.getReportTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.ACTION)]}>
                 <ActionCell
                     action={item.action}
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 1743432fb010..46581e8ae76d 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -2063,8 +2063,6 @@ function getSearchColumnTranslationKey(columnId: ValueOf<typeof CONST.SEARCH.CUS
             return 'common.from';
         case CONST.SEARCH.CUSTOM_COLUMNS.TO:
             return 'common.to';
-        case CONST.SEARCH.CUSTOM_COLUMNS.TOTAL:
-            return 'common.total';
         case CONST.SEARCH.CUSTOM_COLUMNS.ACTION:
             return 'common.action';
     }
diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 3ae078f2939f..791557426ad7 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -50,8 +50,6 @@ function SearchColumnsPage() {
                 text: translate(getSearchColumnTranslationKey(columnId)),
                 value: columnId,
                 keyForList: columnId,
-                // We do not allow the user to unselect the total column, but we want to inform them that it will be in their column selection
-                isDisabled: columnId === CONST.SEARCH.CUSTOM_COLUMNS.TOTAL,
                 isSelected: selectedColumnIds?.includes(columnId),
             })),
         },
diff --git a/src/styles/utils/index.ts b/src/styles/utils/index.ts
index 710200c6c7d7..7545089a2520 100644
--- a/src/styles/utils/index.ts
+++ b/src/styles/utils/index.ts
@@ -1747,7 +1747,7 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
                 break;
             case CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT:
             case CONST.SEARCH.TABLE_COLUMNS.TOTAL:
-                columnWidth = {...getWidthStyle(isAmountColumnWide ? variables.w130 : variables.w96), ...styles.alignItemsEnd};
+                columnWidth = {...getWidthStyle(isAmountColumnWide ? variables.w130 : variables.w96), ...styles.flex1, ...styles.alignItemsEnd};
                 break;
             case CONST.SEARCH.TABLE_COLUMNS.TYPE:
                 columnWidth = {...getWidthStyle(variables.w20), ...styles.alignItemsCenter};

From badd8b2a74b34f61233da228ea8cd728a5c2a76d Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 15:11:25 -0500
Subject: [PATCH 42/50] use new consts everywhere

---
 src/CONST/index.ts                     |  2 +-
 src/libs/SearchUIUtils.ts              |  2 +-
 src/pages/Search/SearchColumnsPage.tsx | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/CONST/index.ts b/src/CONST/index.ts
index 511ed2b1e134..7f2b5f5767a3 100755
--- a/src/CONST/index.ts
+++ b/src/CONST/index.ts
@@ -6711,7 +6711,7 @@ const CONST = {
         },
         get DEFAULT_COLUMNS() {
             return {
-                EXPENSE_REPORT: [this.TABLE_COLUMNS.DATE, this.TABLE_COLUMNS.STATUS, this.TABLE_COLUMNS.TITLE, this.TABLE_COLUMNS.FROM, this.TABLE_COLUMNS.TO, this.TABLE_COLUMNS.TOTAL],
+                EXPENSE_REPORT: [this.TABLE_COLUMNS.DATE, this.TABLE_COLUMNS.STATUS, this.TABLE_COLUMNS.TITLE, this.TABLE_COLUMNS.FROM, this.TABLE_COLUMNS.TO, this.TABLE_COLUMNS.ACTION],
             };
         },
         BOOLEAN: {
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 46581e8ae76d..411271217518 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -2459,7 +2459,7 @@ function getColumnsToShow(
         // columns hidden by default
         if (!arraysEqual(defaultColumns, visibleColumns) && visibleColumns.length > 0) {
             const columns: ColumnVisibility = {};
-            const requiredColumns = new Set<keyof ColumnVisibility>([CONST.SEARCH.TABLE_COLUMNS.AVATAR]);
+            const requiredColumns = new Set<keyof ColumnVisibility>([CONST.SEARCH.TABLE_COLUMNS.AVATAR, CONST.SEARCH.TABLE_COLUMNS.TOTAL]);
 
             for (const columnId of reportColumns) {
                 columns[columnId] = requiredColumns.has(columnId);
diff --git a/src/pages/Search/SearchColumnsPage.tsx b/src/pages/Search/SearchColumnsPage.tsx
index 791557426ad7..736a2466a7eb 100644
--- a/src/pages/Search/SearchColumnsPage.tsx
+++ b/src/pages/Search/SearchColumnsPage.tsx
@@ -23,8 +23,8 @@ import ROUTES from '@src/ROUTES';
 import type {SearchAdvancedFiltersForm} from '@src/types/form';
 import arraysEqual from '@src/utils/arraysEqual';
 
-const allColumns = Object.values(CONST.SEARCH.CUSTOM_COLUMNS);
-const defaultColumns = Object.values(CONST.SEARCH.DEFAULT_COLUMNS.EXPENSE_REPORT);
+const allCustomColumns = Object.values(CONST.SEARCH.CUSTOM_COLUMNS);
+const defaultCustomColumns = Object.values(CONST.SEARCH.DEFAULT_COLUMNS.EXPENSE_REPORT);
 
 function SearchColumnsPage() {
     const styles = useThemeStyles();
@@ -37,7 +37,7 @@ function SearchColumnsPage() {
 
         // We dont allow the user to unselect all columns, so we can assume that no columns = default columns
         if (!columnIds.length) {
-            return defaultColumns;
+            return defaultCustomColumns;
         }
 
         return columnIds;
@@ -46,7 +46,7 @@ function SearchColumnsPage() {
     const sections: Array<SectionListDataType<ListItem>> = [
         {
             title: undefined,
-            data: allColumns.map((columnId) => ({
+            data: allCustomColumns.map((columnId) => ({
                 text: translate(getSearchColumnTranslationKey(columnId)),
                 value: columnId,
                 keyForList: columnId,
@@ -55,7 +55,7 @@ function SearchColumnsPage() {
         },
     ];
 
-    const sortedDefaultColumns = [...defaultColumns].sort();
+    const sortedDefaultColumns = [...defaultCustomColumns].sort();
     const sortedSelectedColumnIds = [...selectedColumnIds].sort();
     const shouldShowResetColumns = !arraysEqual(sortedSelectedColumnIds, sortedDefaultColumns);
 
@@ -70,7 +70,7 @@ function SearchColumnsPage() {
     };
 
     const resetColumns = () => {
-        setSelectedColumnIds(defaultColumns);
+        setSelectedColumnIds(defaultCustomColumns);
     };
 
     const applyChanges = () => {

From ff3c20b888dff40eaafea3803ef7b2b7dab1b4d5 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 15:33:44 -0500
Subject: [PATCH 43/50] add tests for search ui utils

---
 src/libs/SearchUIUtils.ts              | 27 ++++++++++------------
 tests/unit/Search/SearchUIUtilsTest.ts | 31 +++++++++++++++++++++++++-
 2 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
index 411271217518..288907d98c7c 100644
--- a/src/libs/SearchUIUtils.ts
+++ b/src/libs/SearchUIUtils.ts
@@ -58,7 +58,6 @@ import type {
     SearchWithdrawalIDGroup,
 } from '@src/types/onyx/SearchResults';
 import type IconAsset from '@src/types/utils/IconAsset';
-import arraysEqual from '@src/utils/arraysEqual';
 import {hasSynchronizationErrorMessage} from './actions/connections';
 import {canApproveIOU, canIOUBePaid, canSubmitReport, startMoneyRequest} from './actions/IOU';
 import {setIsOpenConfirmNavigateExpensifyClassicModalOpen} from './actions/isOpenConfirmNavigateExpensifyClassicModal';
@@ -2453,27 +2452,25 @@ function getColumnsToShow(
             CONST.SEARCH.TABLE_COLUMNS.ACTION,
         ];
 
-        const defaultColumns = Object.values(CONST.SEARCH.DEFAULT_COLUMNS.EXPENSE_REPORT);
+        // If there are no visible columns, everything should be visible
+        if (!visibleColumns.length) {
+            return Object.fromEntries(reportColumns.map((column) => [column, true]));
+        }
 
         // If the user has set custom columns, toggle the visible columns on, with all other
         // columns hidden by default
-        if (!arraysEqual(defaultColumns, visibleColumns) && visibleColumns.length > 0) {
-            const columns: ColumnVisibility = {};
-            const requiredColumns = new Set<keyof ColumnVisibility>([CONST.SEARCH.TABLE_COLUMNS.AVATAR, CONST.SEARCH.TABLE_COLUMNS.TOTAL]);
-
-            for (const columnId of reportColumns) {
-                columns[columnId] = requiredColumns.has(columnId);
-            }
+        const columns: ColumnVisibility = {};
+        const requiredColumns = new Set<keyof ColumnVisibility>([CONST.SEARCH.TABLE_COLUMNS.AVATAR, CONST.SEARCH.TABLE_COLUMNS.TOTAL]);
 
-            for (const column of visibleColumns) {
-                columns[column as keyof ColumnVisibility] = true;
-            }
+        for (const columnId of reportColumns) {
+            columns[columnId] = requiredColumns.has(columnId);
+        }
 
-            return columns;
+        for (const column of visibleColumns) {
+            columns[column as keyof ColumnVisibility] = true;
         }
 
-        // All columns should be visible otherwise
-        return Object.fromEntries(reportColumns.map((column) => [column, true]));
+        return columns;
     }
 
     if (type === CONST.SEARCH.DATA_TYPES.TASK) {
diff --git a/tests/unit/Search/SearchUIUtilsTest.ts b/tests/unit/Search/SearchUIUtilsTest.ts
index 630ea1098b77..54ebc979c380 100644
--- a/tests/unit/Search/SearchUIUtilsTest.ts
+++ b/tests/unit/Search/SearchUIUtilsTest.ts
@@ -2565,8 +2565,37 @@ describe('SearchUIUtils', () => {
         });
     });
 
-    // JACK_TODO: tests here
     describe('Test getColumnsToShow', () => {
+        test('Should show all columns when no custom columns are saved & viewing expense reports', () => {
+            expect(SearchUIUtils.getColumnsToShow(1, [], [])).toEqual({
+                [CONST.SEARCH.TABLE_COLUMNS.AVATAR]: true,
+                [CONST.SEARCH.TABLE_COLUMNS.DATE]: true,
+                [CONST.SEARCH.TABLE_COLUMNS.STATUS]: true,
+                [CONST.SEARCH.TABLE_COLUMNS.TITLE]: true,
+                [CONST.SEARCH.TABLE_COLUMNS.FROM]: true,
+                [CONST.SEARCH.TABLE_COLUMNS.TO]: true,
+                [CONST.SEARCH.TABLE_COLUMNS.TOTAL]: true,
+                [CONST.SEARCH.TABLE_COLUMNS.ACTION]: true,
+            });
+        });
+
+        test('Should show specific columns when custom columns are saved & viewing expense reports', () => {
+            const visibleColumns = [CONST.SEARCH.TABLE_COLUMNS.DATE, CONST.SEARCH.TABLE_COLUMNS.STATUS, CONST.SEARCH.TABLE_COLUMNS.TITLE];
+
+            expect(SearchUIUtils.getColumnsToShow(1, [], visibleColumns)).toEqual({
+                // Avatar should always be visible
+                [CONST.SEARCH.TABLE_COLUMNS.AVATAR]: true,
+                [CONST.SEARCH.TABLE_COLUMNS.DATE]: true,
+                [CONST.SEARCH.TABLE_COLUMNS.STATUS]: true,
+                [CONST.SEARCH.TABLE_COLUMNS.TITLE]: true,
+                [CONST.SEARCH.TABLE_COLUMNS.FROM]: false,
+                [CONST.SEARCH.TABLE_COLUMNS.TO]: false,
+                // Total should always be visible
+                [CONST.SEARCH.TABLE_COLUMNS.TOTAL]: true,
+                [CONST.SEARCH.TABLE_COLUMNS.ACTION]: false,
+            });
+        });
+
         test('Should only show columns when at least one transaction has a value for them', () => {
             // Use the existing transaction as a base and modify only the fields we need to test
             const baseTransaction = searchResults.data[`transactions_${transactionID}`];

From 1db948bedaa35bb3b74d77c882dc49c25c0a8ff7 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 15:49:43 -0500
Subject: [PATCH 44/50] fix tests

---
 tests/unit/Search/SearchUIUtilsTest.ts | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/unit/Search/SearchUIUtilsTest.ts b/tests/unit/Search/SearchUIUtilsTest.ts
index 54ebc979c380..ae7fcb2156aa 100644
--- a/tests/unit/Search/SearchUIUtilsTest.ts
+++ b/tests/unit/Search/SearchUIUtilsTest.ts
@@ -2567,7 +2567,7 @@ describe('SearchUIUtils', () => {
 
     describe('Test getColumnsToShow', () => {
         test('Should show all columns when no custom columns are saved & viewing expense reports', () => {
-            expect(SearchUIUtils.getColumnsToShow(1, [], [])).toEqual({
+            expect(SearchUIUtils.getColumnsToShow(1, [], [], false, CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT)).toEqual({
                 [CONST.SEARCH.TABLE_COLUMNS.AVATAR]: true,
                 [CONST.SEARCH.TABLE_COLUMNS.DATE]: true,
                 [CONST.SEARCH.TABLE_COLUMNS.STATUS]: true,
@@ -2582,7 +2582,7 @@ describe('SearchUIUtils', () => {
         test('Should show specific columns when custom columns are saved & viewing expense reports', () => {
             const visibleColumns = [CONST.SEARCH.TABLE_COLUMNS.DATE, CONST.SEARCH.TABLE_COLUMNS.STATUS, CONST.SEARCH.TABLE_COLUMNS.TITLE];
 
-            expect(SearchUIUtils.getColumnsToShow(1, [], visibleColumns)).toEqual({
+            expect(SearchUIUtils.getColumnsToShow(1, [], visibleColumns, false, CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT)).toEqual({
                 // Avatar should always be visible
                 [CONST.SEARCH.TABLE_COLUMNS.AVATAR]: true,
                 [CONST.SEARCH.TABLE_COLUMNS.DATE]: true,
@@ -2679,7 +2679,7 @@ describe('SearchUIUtils', () => {
             };
 
             // Test 1: No optional fields should be shown when all transactions are empty
-            let columns = SearchUIUtils.getColumnsToShow(submitterAccountID, [emptyTransaction, emptyTransaction], false);
+            let columns = SearchUIUtils.getColumnsToShow(submitterAccountID, [emptyTransaction, emptyTransaction], [], false);
             expect(columns[CONST.SEARCH.TABLE_COLUMNS.MERCHANT]).toBe(false);
             expect(columns[CONST.SEARCH.TABLE_COLUMNS.CATEGORY]).toBe(false);
             expect(columns[CONST.SEARCH.TABLE_COLUMNS.TAG]).toBe(false);
@@ -2688,22 +2688,22 @@ describe('SearchUIUtils', () => {
             expect(columns[CONST.SEARCH.TABLE_COLUMNS.TO]).toBe(false);
 
             // Test 2: Merchant column should show when at least one transaction has merchant
-            columns = SearchUIUtils.getColumnsToShow(submitterAccountID, [emptyTransaction, merchantTransaction], false);
+            columns = SearchUIUtils.getColumnsToShow(submitterAccountID, [emptyTransaction, merchantTransaction], [], false);
             expect(columns[CONST.SEARCH.TABLE_COLUMNS.MERCHANT]).toBe(true);
             expect(columns[CONST.SEARCH.TABLE_COLUMNS.CATEGORY]).toBe(false);
 
             // Test 3: Category column should show when at least one transaction has category
-            columns = SearchUIUtils.getColumnsToShow(submitterAccountID, [emptyTransaction, categoryTransaction], false);
+            columns = SearchUIUtils.getColumnsToShow(submitterAccountID, [emptyTransaction, categoryTransaction], [], false);
             expect(columns[CONST.SEARCH.TABLE_COLUMNS.CATEGORY]).toBe(true);
             expect(columns[CONST.SEARCH.TABLE_COLUMNS.MERCHANT]).toBe(false);
 
             // Test 4: Tag column should show when at least one transaction has tag
-            columns = SearchUIUtils.getColumnsToShow(submitterAccountID, [emptyTransaction, tagTransaction], false);
+            columns = SearchUIUtils.getColumnsToShow(submitterAccountID, [emptyTransaction, tagTransaction], [], false);
             expect(columns[CONST.SEARCH.TABLE_COLUMNS.TAG]).toBe(true);
             expect(columns[CONST.SEARCH.TABLE_COLUMNS.CATEGORY]).toBe(false);
 
             // Test 5: Description column should show when at least one transaction has description
-            columns = SearchUIUtils.getColumnsToShow(submitterAccountID, [emptyTransaction, descriptionTransaction], false);
+            columns = SearchUIUtils.getColumnsToShow(submitterAccountID, [emptyTransaction, descriptionTransaction], [], false);
             expect(columns[CONST.SEARCH.TABLE_COLUMNS.DESCRIPTION]).toBe(true);
             expect(columns[CONST.SEARCH.TABLE_COLUMNS.MERCHANT]).toBe(false);
 
@@ -2716,12 +2716,12 @@ describe('SearchUIUtils', () => {
                 [`reportActions_${reportID2}`]: {[differentUsersTransactionIOUAction.reportActionID]: differentUsersTransactionIOUAction},
                 personalDetailsList: searchResults.data.personalDetailsList,
             };
-            columns = SearchUIUtils.getColumnsToShow(submitterAccountID, data, false);
+            columns = SearchUIUtils.getColumnsToShow(submitterAccountID, data, [], false);
             expect(columns[CONST.SEARCH.TABLE_COLUMNS.FROM]).toBe(true);
             expect(columns[CONST.SEARCH.TABLE_COLUMNS.TO]).toBe(true);
 
             // Test 7: Multiple columns should show when transactions have different fields
-            columns = SearchUIUtils.getColumnsToShow(submitterAccountID, [merchantTransaction, categoryTransaction, tagTransaction], false);
+            columns = SearchUIUtils.getColumnsToShow(submitterAccountID, [merchantTransaction, categoryTransaction, tagTransaction], [], false);
             expect(columns[CONST.SEARCH.TABLE_COLUMNS.MERCHANT]).toBe(true);
             expect(columns[CONST.SEARCH.TABLE_COLUMNS.CATEGORY]).toBe(true);
             expect(columns[CONST.SEARCH.TABLE_COLUMNS.TAG]).toBe(true);
@@ -2744,7 +2744,7 @@ describe('SearchUIUtils', () => {
             };
 
             // In expense report view, From/To columns should not be shown
-            const columns = SearchUIUtils.getColumnsToShow(submitterAccountID, [testTransaction], true);
+            const columns = SearchUIUtils.getColumnsToShow(submitterAccountID, [testTransaction], [], true);
 
             // These columns should be shown based on data
             expect(columns[CONST.REPORT.TRANSACTION_LIST.COLUMNS.MERCHANT]).toBe(true);
@@ -2771,7 +2771,7 @@ describe('SearchUIUtils', () => {
                 managerID: adminAccountID,
             };
 
-            const columns = SearchUIUtils.getColumnsToShow(submitterAccountID, [testTransaction], false);
+            const columns = SearchUIUtils.getColumnsToShow(submitterAccountID, [testTransaction], [], false);
 
             // Should show merchant column because modifiedMerchant has value
             expect(columns[CONST.SEARCH.TABLE_COLUMNS.MERCHANT]).toBe(true);

From be8487df277e257dc23c59eec149a8da82cde7b8 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 16:06:46 -0500
Subject: [PATCH 45/50] fix style issues with date

---
 src/styles/utils/index.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/styles/utils/index.ts b/src/styles/utils/index.ts
index 7545089a2520..5e2e98089d5f 100644
--- a/src/styles/utils/index.ts
+++ b/src/styles/utils/index.ts
@@ -1732,9 +1732,10 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
                 columnWidth = {...getWidthStyle(variables.w80), ...styles.alignItemsCenter};
                 break;
             case CONST.SEARCH.TABLE_COLUMNS.DATE:
+                // We will remove this variable & param, but in a follow up PR. We are duplicating the logic here to "use" the variable
+                // to prevent eslint errors. This will be removed
                 if (isDateColumnFullWidth) {
-                    columnWidth = styles.flex1;
-                    break;
+                    columnWidth = {...getWidthStyle(isDateColumnWide ? variables.w92 : variables.w52)};
                 }
                 columnWidth = {...getWidthStyle(isDateColumnWide ? variables.w92 : variables.w52)};
                 break;

From 9ef52845da85f9184d656966d5826d737e8dfc85 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 16:17:58 -0500
Subject: [PATCH 46/50] fix react key errors

---
 .../Search/ExpenseReportListItemRow.tsx                    | 7 +++++--
 src/libs/SearchQueryUtils.ts                               | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/SelectionListWithSections/Search/ExpenseReportListItemRow.tsx b/src/components/SelectionListWithSections/Search/ExpenseReportListItemRow.tsx
index a79f2cad1368..02e91d487f53 100644
--- a/src/components/SelectionListWithSections/Search/ExpenseReportListItemRow.tsx
+++ b/src/components/SelectionListWithSections/Search/ExpenseReportListItemRow.tsx
@@ -1,4 +1,4 @@
-import React, {useMemo} from 'react';
+import React, {Fragment, useMemo} from 'react';
 import {View} from 'react-native';
 import type {StyleProp, ViewStyle} from 'react-native';
 import Checkbox from '@components/Checkbox';
@@ -227,7 +227,10 @@ function ExpenseReportListItemRow({
                     />
                 </View>
 
-                {columns.map((column) => columnComponents[column as keyof typeof columnComponents]).filter(Boolean)}
+                {columns.map((column) => {
+                    const CellComponent = columnComponents[column as keyof typeof columnComponents];
+                    return <Fragment key={column}>{CellComponent}</Fragment>;
+                })}
             </View>
             <View style={styles.ml2}>
                 <Icon
diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index 28c2ffa9cfe4..dc0846796532 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -1197,7 +1197,7 @@ function buildUserReadableQueryString(
     currentUserAccountID: number,
     autoCompleteWithSpace = false,
 ) {
-    const {type, status, groupBy, policyID, rawFilterList, flatFilters: filters} = queryJSON;
+    const {type, status, groupBy, policyID, rawFilterList, flatFilters: filters = []} = queryJSON;
 
     if (rawFilterList && rawFilterList.length > 0) {
         const segments: string[] = [];

From 95f6e767bedea2280dac0b997912a8b61e163343 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 16:25:34 -0500
Subject: [PATCH 47/50] fix hashing method

---
 src/libs/SearchQueryUtils.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libs/SearchQueryUtils.ts b/src/libs/SearchQueryUtils.ts
index dc0846796532..65e7905174cb 100644
--- a/src/libs/SearchQueryUtils.ts
+++ b/src/libs/SearchQueryUtils.ts
@@ -337,7 +337,6 @@ function getQueryHashes(query: SearchQueryJSON): {primaryHash: number; recentSea
     orderedQuery += `${CONST.SEARCH.SYNTAX_ROOT_KEYS.TYPE}:${query.type}`;
     orderedQuery += ` ${CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS}:${Array.isArray(query.status) ? query.status.join(',') : query.status}`;
     orderedQuery += ` ${CONST.SEARCH.SYNTAX_ROOT_KEYS.GROUP_BY}:${query.groupBy}`;
-    orderedQuery += ` ${CONST.SEARCH.SYNTAX_ROOT_KEYS.COLUMNS}:${Array.isArray(query.columns) ? query.columns.join(',') : query.columns}`;
 
     const filterSet = new Set<string>(orderedQuery);
 
@@ -375,6 +374,8 @@ function getQueryHashes(query: SearchQueryJSON): {primaryHash: number; recentSea
 
     orderedQuery += ` ${CONST.SEARCH.SYNTAX_ROOT_KEYS.SORT_BY}:${query.sortBy}`;
     orderedQuery += ` ${CONST.SEARCH.SYNTAX_ROOT_KEYS.SORT_ORDER}:${query.sortOrder}`;
+    orderedQuery += ` ${CONST.SEARCH.SYNTAX_ROOT_KEYS.COLUMNS}:${Array.isArray(query.columns) ? query.columns.join(',') : query.columns}`;
+
     if (query.policyID) {
         orderedQuery += ` ${CONST.SEARCH.SYNTAX_FILTER_KEYS.POLICY_ID}:${Array.isArray(query.policyID) ? query.policyID.join(',') : query.policyID} `;
     }

From 00445e50aea3dea4c162779bf95472b812d4f3e4 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 16:30:16 -0500
Subject: [PATCH 48/50] only show for reports

---
 src/components/Search/SearchPageHeader/SearchFiltersBar.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx b/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
index 59ce901b2d2f..b978ffc872a3 100644
--- a/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
+++ b/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
@@ -781,6 +781,8 @@ function SearchFiltersBar({
         [],
     );
 
+    const shouldShowColumnsButton = isLargeScreenWidth && queryJSON.type === CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT;
+
     const filterButtonText = useMemo(
         () => translate('search.filtersHeader') + (hiddenSelectedFilters.length > 0 ? ` (${hiddenSelectedFilters.length})` : ''),
         [translate, hiddenSelectedFilters.length],
@@ -800,7 +802,7 @@ function SearchFiltersBar({
                     textStyles={[styles.textMicroBold]}
                     onPress={openAdvancedFilters}
                 />
-                {isLargeScreenWidth && (
+                {shouldShowColumnsButton && (
                     <Button
                         link
                         small

From 958d410d12269a07e6db289221ff75ca93f639c7 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 16:36:24 -0500
Subject: [PATCH 49/50] update reportName to title

---
 src/components/SelectionListWithSections/SearchTableHeader.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/SelectionListWithSections/SearchTableHeader.tsx b/src/components/SelectionListWithSections/SearchTableHeader.tsx
index 8965f6b59c4c..498137946e8e 100644
--- a/src/components/SelectionListWithSections/SearchTableHeader.tsx
+++ b/src/components/SelectionListWithSections/SearchTableHeader.tsx
@@ -146,7 +146,7 @@ const getExpenseReportHeaders = (profileIcon?: IconAsset): SearchColumnConfig[]
     },
     {
         columnName: CONST.SEARCH.TABLE_COLUMNS.TITLE,
-        translationKey: 'common.reportName',
+        translationKey: 'common.title',
     },
     {
         columnName: CONST.SEARCH.TABLE_COLUMNS.FROM,

From cd41d5ba72c2efa0a62a79ae6025e4d52d044707 Mon Sep 17 00:00:00 2001
From: Jack Senyitko <jsenyitko@expensify.com>
Date: Mon, 15 Dec 2025 17:22:30 -0500
Subject: [PATCH 50/50] remove dead code

---
 src/components/Search/SearchPageHeader/SearchFiltersBar.tsx    | 2 +-
 .../SelectionListWithSections/MultiSelectListItem.tsx          | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx b/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
index b978ffc872a3..04d602e9e8d6 100644
--- a/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
+++ b/src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
@@ -827,7 +827,7 @@ function SearchFiltersBar({
             expensifyIcons.Filter,
             expensifyIcons.Columns,
             openAdvancedFilters,
-            isLargeScreenWidth,
+            shouldShowColumnsButton,
             translate,
         ],
     );
diff --git a/src/components/SelectionListWithSections/MultiSelectListItem.tsx b/src/components/SelectionListWithSections/MultiSelectListItem.tsx
index 59a86673dd69..f6b3b5e42f07 100644
--- a/src/components/SelectionListWithSections/MultiSelectListItem.tsx
+++ b/src/components/SelectionListWithSections/MultiSelectListItem.tsx
@@ -35,11 +35,10 @@ function MultiSelectListItem<TItem extends ListItem>({
                 accessibilityLabel={item.text ?? ''}
                 onPress={() => onSelectRow(item)}
                 isIndeterminate={item.isIndeterminate}
-                disabled={!!isDisabled}
                 style={[isMultilineSupported ? styles.ml3 : null]}
             />
         );
-    }, [isDisabled, isMultilineSupported, isSelected, item, onSelectRow, styles.ml3]);
+    }, [isMultilineSupported, isSelected, item, onSelectRow, styles.ml3]);
 
     return (
         <RadioListItem