diff --git a/app/Support/Http/Api/AccountFilter.php b/app/Support/Http/Api/AccountFilter.php
index b44dc3df6a..73eecbbd5e 100644
--- a/app/Support/Http/Api/AccountFilter.php
+++ b/app/Support/Http/Api/AccountFilter.php
@@ -47,6 +47,14 @@ trait AccountFilter
                 AccountTypeEnum::DEBT->value,
                 AccountTypeEnum::MORTGAGE->value,
             ],
+            'normal' => [
+                AccountTypeEnum::ASSET->value,
+                AccountTypeEnum::EXPENSE->value,
+                AccountTypeEnum::REVENUE->value,
+                AccountTypeEnum::LOAN->value,
+                AccountTypeEnum::DEBT->value,
+                AccountTypeEnum::MORTGAGE->value,
+            ],
             'asset'                                 => [AccountTypeEnum::DEFAULT->value, AccountTypeEnum::ASSET->value],
             'cash'                                  => [AccountTypeEnum::CASH->value],
             'expense'                               => [AccountTypeEnum::EXPENSE->value, AccountTypeEnum::BENEFICIARY->value],
@@ -89,6 +97,16 @@ trait AccountFilter
      */
     protected function mapAccountTypes(string $type): array
     {
-        return $this->types[$type] ?? $this->types['all'];
+        $return = [];
+        $parts  = explode(',', $type);
+        foreach ($parts as $part) {
+            if (array_key_exists($part, $this->types)) {
+                $return = array_merge($return, $this->types[$part]);
+            }
+        }
+        if(0 === count($return)) {
+            $return = $this->types['normal'];
+        }
+        return $return;
     }
 }
diff --git a/app/Support/Http/Api/TransactionFilter.php b/app/Support/Http/Api/TransactionFilter.php
index 45734abf75..8ef8e5960d 100644
--- a/app/Support/Http/Api/TransactionFilter.php
+++ b/app/Support/Http/Api/TransactionFilter.php
@@ -74,6 +74,9 @@ trait TransactionFilter
                 $return = array_merge($return, $this->transactionTypes[$part]);
             }
         }
+        if(0 === count($return)) {
+            $return = $this->transactionTypes['all'];
+        }
 
         return array_unique($return);
     }
diff --git a/changelog.md b/changelog.md
index f5b6cbce9e..b179845987 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 6.4.7
+
+### Fixed
+
+- #11172
+
 ## 6.4.6 - 2025-11-09
 
 ### Fixed