diff --git a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
index bb19b908..eb12f809 100644
--- a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
+++ b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
@@ -76,26 +76,30 @@
                             </div>
 
                             <!-- filter for Pending Export tab -->
-                            <div v-if="stage === 4">
-                                <div class="row pt-3 pb-3">
-                                    <div class="col-5 col-md-3 ">
-                                        <validation-wrapper-component :validator="$v.parameters.startDate">
-                                            <label class="all-caps">Start Date</label>
-                                            <date-picker-component :parameters="parameters" v-model.lazy="parameters.startDate"></date-picker-component>
-                                        </validation-wrapper-component>
-                                    </div>
-                                    <div class="col-5 col-md-3 ">
-                                        <validation-wrapper-component :validator="$v.parameters.endDate">
-                                            <label class="all-caps">End Date</label>
-                                            <date-picker-component :parameters="parameters" v-model.lazy="parameters.endDate"></date-picker-component>
-                                        </validation-wrapper-component>
-                                    </div>
-                                    <div class="col-2 col-md-auto">
-                                        <div class="btn btn-lg btn-primary fs-11 w-100 h-100 d-flex justify-content-center align-items-center" @click="startMapping(4)">
-                                            <span>
-                                                Search
-                                            </span>
-                                        </div>
+                            <div class="row pt-3 pb-3">
+                                <div class="col-5 col-md-3 ">
+                                    <validation-wrapper-component :validator="$v.parameters.account" selectable>
+                                        <label class="all-caps">Account</label>
+                                        <select-component :options="['CIEF WORLDWIDE SDN. BHD. (568603010762)', 'CIEF WORLDWIDE SDN. BHD. AMBANK (8881040198515)']" v-model="parameters.account"></select-component>
+                                    </validation-wrapper-component>
+                                </div>
+                                <div class="col-5 col-md-3 ">
+                                    <validation-wrapper-component :validator="$v.parameters.startDate">
+                                        <label class="all-caps">Start Date</label>
+                                        <date-picker-component :parameters="parameters" v-model.lazy="parameters.startDate"></date-picker-component>
+                                    </validation-wrapper-component>
+                                </div>
+                                <div class="col-5 col-md-3 ">
+                                    <validation-wrapper-component :validator="$v.parameters.endDate">
+                                        <label class="all-caps">End Date</label>
+                                        <date-picker-component :parameters="parameters" v-model.lazy="parameters.endDate"></date-picker-component>
+                                    </validation-wrapper-component>
+                                </div>
+                                <div class="col-2 col-md-auto">
+                                    <div class="btn btn-lg btn-primary fs-11 w-100 h-100 d-flex justify-content-center align-items-center" @click="startMapping(stage)">
+                                        <span>
+                                            Search
+                                        </span>
                                     </div>
                                 </div>
                             </div>
@@ -231,6 +235,7 @@ export default {
             parameters: {
                 startDate: '',
                 endDate: '',
+                account: '',
             },
             type: null,
             stage: null,
@@ -252,6 +257,7 @@ export default {
             endDate: {
                 required
             },
+            account: {},
         },
         files: {
             // required // todo-new: set required if is pdf section
@@ -300,6 +306,17 @@ export default {
             this.files = [];
             this.parameters = {};
         },
+        getAccountId(){
+            if (this.parameters.account) {
+                if (this.parameters.account.includes('568603010762')) {
+                    return 4;
+                }
+                if (this.parameters.account.includes('8881040198515')) {
+                    return 5;
+                }
+            }
+            return false;
+        },
         startMapping(stage){
 
             this.stage = stage;
@@ -307,16 +324,17 @@ export default {
             if(this.type === 1){
                 switch(this.stage){
                     case 1:
-                        this.filter = {min_amount: 0, is_mapped: true, is_mapped_with_multiple: false, statement_transaction_owner_type_in: [1, 2], statement_transaction_owner_status_in: [1], per_page: 100, order_by: {column: 'posting_date', DESC: true}}
+                        this.filter = {min_amount: 0, is_mapped: true, is_mapped_with_multiple: false, statement_transaction_owner_type_in: [1, 2], statement_transaction_owner_status_in: [1], ...this.parameters.account && {statement_transaction_account_id: this.getAccountId()}, ...this.parameters.startDate && {statement_transaction_posting_start: this.parameters.startDate}, ...this.parameters.endDate && {statement_transaction_posting_end: this.parameters.endDate}, per_page: 100, order_by: {column: 'posting_date', DESC: true}}
+
                         break;
                     case 2:
-                        this.filter = {min_amount: 0, is_mapped: true, is_mapped_with_multiple: true, statement_transaction_owner_type_in: [1, 2], statement_transaction_owner_status_in: [1], per_page: 100, order_by: {column: 'posting_date', DESC: true}}
+                        this.filter = {min_amount: 0, is_mapped: true, is_mapped_with_multiple: true, statement_transaction_owner_type_in: [1, 2], statement_transaction_owner_status_in: [1], ...this.parameters.account && {statement_transaction_account_id: this.getAccountId()}, ...this.parameters.startDate && {statement_transaction_posting_start: this.parameters.startDate}, ...this.parameters.endDate && {statement_transaction_posting_end: this.parameters.endDate}, per_page: 100, order_by: {column: 'posting_date', DESC: true}}
                         break;
                     case 3:
-                        this.filter = {min_amount: 0, is_mapped_false_or_mapped_but_status_in: [4], per_page: 100, order_by: {column: 'posting_date', DESC: true}}
+                        this.filter = {min_amount: 0, is_mapped_false_or_mapped_but_status_in: [4], ...this.parameters.account && {statement_transaction_account_id: this.getAccountId()}, ...this.parameters.startDate && {statement_transaction_posting_start: this.parameters.startDate}, ...this.parameters.endDate && {statement_transaction_posting_end: this.parameters.endDate}, per_page: 100, order_by: {column: 'posting_date', DESC: true}}
                         break;
                     case 4:
-                        this.filter = {min_amount: 0, is_mapped: true, statement_transaction_owner_type_in: [1, 2], statement_transaction_owner_status_in: [2], per_page: 100, order_by: {column: 'posting_date', DESC: true}}
+                        this.filter = {min_amount: 0, is_mapped: true, statement_transaction_owner_type_in: [1, 2], statement_transaction_owner_status_in: [2], ...this.parameters.account && {statement_transaction_account_id: this.getAccountId()}, per_page: 100, order_by: {column: 'posting_date', DESC: true}}
 
                         if (typeof this.parameters.startDate != 'undefined' && this.parameters.startDate != '') this.filter = {...this.filter, ...{statement_transaction_posting_start: this.parameters.startDate}};
 
@@ -328,16 +346,16 @@ export default {
             if(this.type === 2){
                 switch(this.stage){
                     case 1:
-                        this.filter = {max_amount: 0, is_mapped: true, is_mapped_with_multiple: false, statement_transaction_owner_type_in: [3, 5],statement_transaction_owner_status_in: [1], per_page: 100, order_by: {column: 'posting_date', DESC: true}}
+                        this.filter = {max_amount: 0, is_mapped: true, is_mapped_with_multiple: false, statement_transaction_owner_type_in: [3, 5],statement_transaction_owner_status_in: [1], ...this.parameters.account && {statement_transaction_account_id: this.getAccountId()}, ...this.parameters.startDate && {statement_transaction_posting_start: this.parameters.startDate}, ...this.parameters.endDate && {statement_transaction_posting_end: this.parameters.endDate}, per_page: 100, order_by: {column: 'posting_date', DESC: true}}
                         break;
                     case 2:
-                        this.filter = {max_amount: 0, is_mapped: true, is_mapped_with_multiple: true, statement_transaction_owner_type_in: [3, 5], statement_transaction_owner_status_in: [1], per_page: 100, order_by: {column: 'posting_date', DESC: true}}
+                        this.filter = {max_amount: 0, is_mapped: true, is_mapped_with_multiple: true, statement_transaction_owner_type_in: [3, 5], statement_transaction_owner_status_in: [1], ...this.parameters.account && {statement_transaction_account_id: this.getAccountId()}, ...this.parameters.startDate && {statement_transaction_posting_start: this.parameters.startDate}, ...this.parameters.endDate && {statement_transaction_posting_end: this.parameters.endDate}, per_page: 100, order_by: {column: 'posting_date', DESC: true}}
                         break;
                     case 3:
-                        this.filter = {max_amount: 0, is_mapped: false, per_page: 100, order_by: {column: 'posting_date', DESC: true}}
+                        this.filter = {max_amount: 0, is_mapped: false, ...this.parameters.account && {statement_transaction_account_id: this.getAccountId()}, ...this.parameters.startDate && {statement_transaction_posting_start: this.parameters.startDate}, ...this.parameters.endDate && {statement_transaction_posting_end: this.parameters.endDate}, per_page: 100, order_by: {column: 'posting_date', DESC: true}}
                         break;
                     case 4:
-                        this.filter = {max_amount: 0, is_mapped: true, statement_transaction_owner_type_in: [3, 5], statement_transaction_owner_status_in: [2], per_page: 100, order_by: {column: 'posting_date', DESC: true}}
+                        this.filter = {max_amount: 0, is_mapped: true, statement_transaction_owner_type_in: [3, 5], statement_transaction_owner_status_in: [2], ...this.parameters.account && {statement_transaction_account_id: this.getAccountId()}, per_page: 100, order_by: {column: 'posting_date', DESC: true}}
 
                         if (typeof this.parameters.startDate != 'undefined' && this.parameters.startDate != '') this.filter = {...this.filter, ...{statement_transaction_posting_start: this.parameters.startDate}};