diff --git a/src/stores/transactionTag.ts b/src/stores/transactionTag.ts
index 2f958906..25789b44 100644
--- a/src/stores/transactionTag.ts
+++ b/src/stores/transactionTag.ts
@@ -757,7 +757,6 @@ export const useTransactionTagsStore = defineStore('transactionTags', () => {
         // states
         allTransactionTagGroups,
         allTransactionTagGroupsMap,
-        allTransactionTags,
         allTransactionTagsMap,
         allTransactionTagsByGroupMap,
         transactionTagGroupListStateInvalid,
diff --git a/src/views/desktop/transactions/import/dialogs/BatchReplaceAllTypesDialog.vue b/src/views/desktop/transactions/import/dialogs/BatchReplaceAllTypesDialog.vue
index d33afad6..41877a0e 100644
--- a/src/views/desktop/transactions/import/dialogs/BatchReplaceAllTypesDialog.vue
+++ b/src/views/desktop/transactions/import/dialogs/BatchReplaceAllTypesDialog.vue
@@ -164,7 +164,7 @@
                                         <v-autocomplete density="compact" variant="underlined"
                                                         item-title="name" item-value="id"
                                                         persistent-placeholder chips
-                                                        :disabled="loading" :items="allTags"
+                                                        :disabled="loading" :items="allTagsWithGroupHeader"
                                                         :no-data-text="tt('No available tag')"
                                                         v-model="newRule.targetId"
                                                         v-if="newRule.dataType == 'tag'">
@@ -172,8 +172,12 @@
                                                 <v-chip :prepend-icon="mdiPound" :text="item.title" v-bind="props" v-if="newRule.targetId"/>
                                             </template>
 
+                                            <template #subheader="{ props }">
+                                                <v-list-subheader>{{ props['title'] }}</v-list-subheader>
+                                            </template>
+
                                             <template #item="{ props, item }">
-                                                <v-list-item :value="item.value" v-bind="props" v-if="!item.raw.hidden">
+                                                <v-list-item :value="item.value" v-bind="props" v-if="item.raw instanceof TransactionTag && !item.raw.hidden">
                                                     <template #title>
                                                         <v-list-item-title>
                                                             <div class="d-flex align-center">
@@ -215,6 +219,7 @@ import SnackBar from '@/components/desktop/SnackBar.vue';
 import { ref, computed, useTemplateRef } from 'vue';
 
 import { useI18n } from '@/locales/helpers.ts';
+import { useTransactionTagSelectionBase } from '@/components/base/TransactionTagSelectionBase.ts';
 
 import { useSettingsStore } from '@/stores/setting.ts';
 import { useAccountsStore } from '@/stores/account.ts';
@@ -228,7 +233,7 @@ import { KnownFileType } from '@/core/file.ts';
 
 import { Account, type CategorizedAccountWithDisplayBalance } from '@/models/account.ts';
 import type { TransactionCategory } from '@/models/transaction_category.ts';
-import type { TransactionTag } from '@/models/transaction_tag.ts';
+import { TransactionTag } from '@/models/transaction_tag.ts';
 
 import {
     getTransactionPrimaryCategoryName,
@@ -257,6 +262,8 @@ interface BatchReplaceAllTypesDialogResponse {
 
 const { tt, getCategorizedAccountsWithDisplayBalance } = useI18n();
 
+const { allTagsWithGroupHeader } = useTransactionTagSelectionBase({ modelValue: [] }, false);
+
 const settingsStore = useSettingsStore();
 const accountsStore = useAccountsStore();
 const transactionCategoriesStore = useTransactionCategoriesStore();
@@ -284,7 +291,7 @@ const allAccounts = computed<Account[]>(() => accountsStore.allPlainAccounts);
 const allVisibleAccounts = computed<Account[]>(() => accountsStore.allVisiblePlainAccounts);
 const allVisibleCategorizedAccounts = computed<CategorizedAccountWithDisplayBalance[]>(() => getCategorizedAccountsWithDisplayBalance(allVisibleAccounts.value, showAccountBalance.value, customAccountCategoryOrder.value));
 const allCategories = computed<Record<number, TransactionCategory[]>>(() => transactionCategoriesStore.allTransactionCategories);
-const allTags = computed<TransactionTag[]>(() => transactionTagsStore.allTransactionTags);
+const allTagsMap = computed<Record<string, TransactionTag>>(() => transactionTagsStore.allTransactionTagsMap);
 
 const hasVisibleExpenseCategories = computed<boolean>(() => transactionCategoriesStore.hasVisibleExpenseCategories);
 const hasVisibleIncomeCategories = computed<boolean>(() => transactionCategoriesStore.hasVisibleIncomeCategories);
@@ -352,13 +359,7 @@ function getRuleTargetValueDisplayName(rule: ImportTransactionReplaceRule): stri
         case 'account':
             return getAccountDisplayName(rule.targetId);
         case 'tag':
-            for (const tag of allTags.value) {
-                if (tag.id === rule.targetId) {
-                    return tag.name;
-                }
-            }
-
-            return '';
+            return allTagsMap.value[rule.targetId]?.name ?? '';
         default:
             return '';
     }
diff --git a/src/views/desktop/transactions/import/dialogs/BatchReplaceDialog.vue b/src/views/desktop/transactions/import/dialogs/BatchReplaceDialog.vue
index aa37cbff..8709b5ef 100644
--- a/src/views/desktop/transactions/import/dialogs/BatchReplaceDialog.vue
+++ b/src/views/desktop/transactions/import/dialogs/BatchReplaceDialog.vue
@@ -168,7 +168,7 @@
                             :disabled="loading || removeTag"
                             :label="tt('Target Tag')"
                             :placeholder="tt('Target Tag')"
-                            :items="allTags"
+                            :items="allTagsWithGroupHeader"
                             :no-data-text="tt('No available tag')"
                             v-model="targetItem"
                         >
@@ -176,8 +176,12 @@
                                 <v-chip :prepend-icon="mdiPound" :text="item.title" v-bind="props"/>
                             </template>
 
+                            <template #subheader="{ props }">
+                                <v-list-subheader>{{ props['title'] }}</v-list-subheader>
+                            </template>
+
                             <template #item="{ props, item }">
-                                <v-list-item :value="item.value" v-bind="props" v-if="!item.raw.hidden">
+                                <v-list-item :value="item.value" v-bind="props" v-if="item.raw instanceof TransactionTag && !item.raw.hidden">
                                     <template #title>
                                         <v-list-item-title>
                                             <div class="d-flex align-center">
@@ -214,6 +218,7 @@ import SnackBar from '@/components/desktop/SnackBar.vue';
 import { ref, computed, useTemplateRef, watch } from 'vue';
 
 import { useI18n } from '@/locales/helpers.ts';
+import { useTransactionTagSelectionBase } from '@/components/base/TransactionTagSelectionBase.ts';
 
 import { useSettingsStore } from '@/stores/setting.ts';
 import { useAccountsStore } from '@/stores/account.ts';
@@ -224,7 +229,7 @@ import type { NameValue } from '@/core/base.ts';
 import { CategoryType } from '@/core/category.ts';
 import { Account, type CategorizedAccountWithDisplayBalance } from '@/models/account.ts';
 import type { TransactionCategory } from '@/models/transaction_category.ts';
-import type { TransactionTag } from '@/models/transaction_tag.ts';
+import { TransactionTag } from '@/models/transaction_tag.ts';
 
 import {
     getTransactionPrimaryCategoryName,
@@ -248,6 +253,8 @@ interface BatchReplaceDialogResponse {
 
 const { tt, getCategorizedAccountsWithDisplayBalance } = useI18n();
 
+const { allTagsWithGroupHeader } = useTransactionTagSelectionBase({ modelValue: [] }, false);
+
 const settingsStore = useSettingsStore();
 const accountsStore = useAccountsStore();
 const transactionCategoriesStore = useTransactionCategoriesStore();
@@ -274,7 +281,6 @@ const allAccounts = computed<Account[]>(() => accountsStore.allPlainAccounts);
 const allVisibleAccounts = computed<Account[]>(() => accountsStore.allVisiblePlainAccounts);
 const allVisibleCategorizedAccounts = computed<CategorizedAccountWithDisplayBalance[]>(() => getCategorizedAccountsWithDisplayBalance(allVisibleAccounts.value, showAccountBalance.value, customAccountCategoryOrder.value));
 const allCategories = computed<Record<number, TransactionCategory[]>>(() => transactionCategoriesStore.allTransactionCategories);
-const allTags = computed<TransactionTag[]>(() => transactionTagsStore.allTransactionTags);
 
 const hasVisibleExpenseCategories = computed<boolean>(() => transactionCategoriesStore.hasVisibleExpenseCategories);
 const hasVisibleIncomeCategories = computed<boolean>(() => transactionCategoriesStore.hasVisibleIncomeCategories);
diff --git a/src/views/desktop/transactions/import/tabs/ImportTransactionCheckDataTab.vue b/src/views/desktop/transactions/import/tabs/ImportTransactionCheckDataTab.vue
index 932fff1d..f502deba 100644
--- a/src/views/desktop/transactions/import/tabs/ImportTransactionCheckDataTab.vue
+++ b/src/views/desktop/transactions/import/tabs/ImportTransactionCheckDataTab.vue
@@ -265,7 +265,7 @@
                     density="compact" variant="plain"
                     :disabled="!!disabled"
                     :placeholder="tt('None')"
-                    :items="allTags"
+                    :items="allTagsWithGroupHeader"
                     :no-data-text="tt('No available tag')"
                     v-model="editingTags"
                 >
@@ -277,8 +277,12 @@
                                 v-bind="props"/>
                     </template>
 
+                    <template #subheader="{ props }">
+                        <v-list-subheader>{{ props['title'] }}</v-list-subheader>
+                    </template>
+
                     <template #item="{ props, item }">
-                        <v-list-item :value="item.value" v-bind="props" v-if="!item.raw.hidden">
+                        <v-list-item :value="item.value" v-bind="props" v-if="item.raw instanceof TransactionTag && !item.raw.hidden">
                             <template #title>
                                 <v-list-item-title>
                                     <div class="d-flex align-center">
@@ -403,6 +407,7 @@ import BatchCreateDialog, { type BatchCreateDialogDataType } from '../dialogs/Ba
 import { ref, computed, useTemplateRef } from 'vue';
 
 import { useI18n } from '@/locales/helpers.ts';
+import { useTransactionTagSelectionBase } from '@/components/base/TransactionTagSelectionBase.ts';
 
 import { useSettingsStore } from '@/stores/setting.ts';
 import { useUserStore } from '@/stores/user.ts';
@@ -417,7 +422,7 @@ import { TransactionType } from '@/core/transaction.ts';
 
 import { Account, type CategorizedAccountWithDisplayBalance } from '@/models/account.ts';
 import type { TransactionCategory } from '@/models/transaction_category.ts';
-import type { TransactionTag } from '@/models/transaction_tag.ts';
+import { TransactionTag } from '@/models/transaction_tag.ts';
 import { ImportTransaction } from '@/models/imported_transaction.ts';
 
 import {
@@ -503,6 +508,8 @@ const {
     getCategorizedAccountsWithDisplayBalance
 } = useI18n();
 
+const { allTagsWithGroupHeader } = useTransactionTagSelectionBase({ modelValue: [] }, false);
+
 const settingsStore = useSettingsStore();
 const userStore = useUserStore();
 const accountsStore = useAccountsStore();
@@ -551,7 +558,6 @@ const allAccountsMap = computed<Record<string, Account>>(() => accountsStore.all
 const allAccountsMapByName = computed<Record<string, Account>>(() => getAccountMapByName(accountsStore.allAccounts));
 const allCategories = computed<Record<number, TransactionCategory[]>>(() => transactionCategoriesStore.allTransactionCategories);
 const allCategoriesMap = computed<Record<string, TransactionCategory>>(() => transactionCategoriesStore.allTransactionCategoriesMap);
-const allTags = computed<TransactionTag[]>(() => transactionTagsStore.allTransactionTags);
 const allTagsMap = computed<Record<string, TransactionTag>>(() => transactionTagsStore.allTransactionTagsMap);
 
 const hasVisibleExpenseCategories = computed<boolean>(() => transactionCategoriesStore.hasVisibleExpenseCategories);