diff --git a/src/components/FundManagement/FundAllocationFormAdd.vue b/src/components/FundManagement/FundAllocationFormAdd.vue
index a2ad1f9..936da41 100644
--- a/src/components/FundManagement/FundAllocationFormAdd.vue
+++ b/src/components/FundManagement/FundAllocationFormAdd.vue
@@ -13,22 +13,16 @@
                             <label for="fund_allocation_fund_id" class="required"
                                 >Fund:</label
                             >
-                            <v-select
+                            <InfiniteScrollSelect
                                 id="fund_allocation_fund_id"
                                 v-model="fund_allocation.fund_id"
-                                :reduce="av => av.fund_id"
-                                :options="funds"
+                                :selectedData="selectedFund"
+                                dataType="funds"
+                                dataIdentifier="fund_id"
                                 label="name"
-                            >
-                                <template #search="{ attributes, events }">
-                                    <input
-                                        :required="!fund_allocation.fund_id"
-                                        class="vs__search"
-                                        v-bind="attributes"
-                                        v-on="events"
-                                    />
-                                </template>
-                            </v-select>
+                                apiClient="acquisition"
+                                :required="true"
+                            />
                             <span class="required">Required</span>
                         </li>
                         <li>
@@ -86,6 +80,7 @@
 import { inject } from "vue"
 import { APIClient } from "../../fetch/api-client.js"
 import { setMessage, setWarning } from "../../messages"
+import InfiniteScrollSelect from "../InfiniteScrollSelect.vue"
 
 export default {
     setup() {
@@ -123,7 +118,7 @@ export default {
     methods: {
         async getDataRequiredForPageLoad(route) {
             const { params } = route
-            this.getFunds(params).then(() => {
+            this.getFund(params).then(() => {
                 if(params.fund_allocation_id) {
                     this.getFundAllocation(params.fund_allocation_id)
                 }
@@ -136,12 +131,10 @@ export default {
                 this.fund_allocation = fund_allocation
             })
         },
-        async getFunds(params) {
+        async getFund(params) {
             const client = APIClient.acquisition
-            await client.funds.getAll(null, {}).then(
-                funds => {
-                    this.funds = funds
-                    const fund = funds.find(fund => fund.fund_id = params.fund_id)
+            await client.funds.get(params.fund_id).then(
+                fund => {
                     this.selectedFund = fund
                     this.fund_allocation.fund_id = fund.fund_id
                     this.fund_allocation.ledger_id = fund.ledger_id
@@ -188,6 +181,9 @@ export default {
                     )
             }
         }
+    },
+    components: {
+        InfiniteScrollSelect
     }
 }
 </script>
diff --git a/src/components/FundManagement/FundFormAdd.vue b/src/components/FundManagement/FundFormAdd.vue
index 1af7006..fa5933a 100644
--- a/src/components/FundManagement/FundFormAdd.vue
+++ b/src/components/FundManagement/FundFormAdd.vue
@@ -49,23 +49,17 @@
                             <label for="fund_fiscal_yr_id" class="required"
                                 >Fiscal year:</label
                             >
-                            <v-select
+                            <InfiniteScrollSelect
                                 id="fund_fiscal_yr_id"
                                 v-model="fund.fiscal_yr_id"
-                                :reduce="av => av.fiscal_yr_id"
-                                :options="fiscal_years"
+                                :selectedData="fund"
+                                dataType="fiscal_years"
+                                dataIdentifier="fiscal_yr_id"
                                 label="code"
+                                apiClient="acquisition"
+                                :required="true"
                                 @update:modelValue="filterLedgersBySelectedFiscalYear($event)"
-                            >
-                                <template #search="{ attributes, events }">
-                                    <input
-                                        :required="!fund.fiscal_yr_id"
-                                        class="vs__search"
-                                        v-bind="attributes"
-                                        v-on="events"
-                                    />
-                                </template>
-                            </v-select>
+                            />
                             <span class="required">Required</span>
                         </li>
                         <li>
@@ -191,6 +185,7 @@ import { inject } from "vue"
 import { storeToRefs } from "pinia"
 import { APIClient } from "../../fetch/api-client.js"
 import { setMessage, setWarning } from "../../messages"
+import InfiniteScrollSelect from "../InfiniteScrollSelect.vue"
 
 export default {
     setup() {
@@ -248,7 +243,7 @@ export default {
                 fund_type: '',
                 visible_to: [],
             },
-            fiscal_years: [],
+            fiscalYear: null,
             ledgers: [],
             ledger_groups: [],
         }
@@ -260,13 +255,13 @@ export default {
     },
     methods: {
         async getDataRequiredForPageLoad(fund_id) {
-            this.getFiscalYears().then(() => {
-                if(fund_id) {
-                    this.getFund(fund_id)
-                } else {
-                    this.initialized = true
-                }
-            })
+            if(fund_id) {
+                this.getFund(fund_id).then(() => {
+                    this.getFiscalYear(this.fund.fiscal_yr_id)
+                })
+            } else {
+                this.initialized = true
+            }
         },
         async getFund(fund_id) {
             const client = APIClient.acquisition
@@ -274,15 +269,15 @@ export default {
                 this.fund = fund
                 this.fund.visible_to = this.formatLibraryGroupIds(fund.visible_to)
                 this.filterLedgersBySelectedFiscalYear(fund.fiscal_yr_id)
-                this.filterGroupsBySelectedLedger(fund.ledger_id)
-                this.initialized = true
             })
         },
-        async getFiscalYears() {
+        async getFiscalYear(fiscal_yr_id) {
             const client = APIClient.acquisition
-            await client.fiscal_years.getAll(null, {}, "koha_plugin_acquire_ledgers").then(
-                fiscal_years => {
-                    this.fiscal_years = fiscal_years
+            await client.fiscal_years.get(fiscal_yr_id, { "x-koha-embed": "koha_plugin_acquire_ledgers" }).then(
+                fiscalYear => {
+                    this.fiscalYear = fiscalYear
+                    this.filterGroupsBySelectedLedger(this.fund.ledger_id)
+                    this.initialized = true
                 },
                 error => {}
             )
@@ -294,24 +289,28 @@ export default {
                 this.fund.visible_to = []
                 return
             }
-            const fiscalYear = this.fiscal_years.find(fy => fy.fiscal_yr_id === e)
-            const { koha_plugin_acquire_ledgers: ledgers } = fiscalYear
-            if(!ledgers || ledgers.length === 0) {
-                setWarning("There are no ledgers attached to this fiscal year. Please create one or select a different fiscal year.")
-                this.ledger.fiscal_yr_id = null
-                return
-            }
-            this.ledgers = ledgers
+
+            this.getFiscalYear(e).then(() => {
+                const { koha_plugin_acquire_ledgers: ledgers } = this.fiscalYear
+                if(!ledgers || ledgers.length === 0) {
+                    setWarning("There are no ledgers attached to this fiscal year. Please create one or select a different fiscal year.")
+                    this.ledger.fiscal_yr_id = null
+                    return
+                }
+                this.ledgers = ledgers
+            })
             if(e !== this.fund.fiscal_yr_id) {
                 this.fund.ledger_id = null
                 this.fund.visible_to = []
             }
         },
         filterGroupsBySelectedLedger(e) {
-            const selectedLedger = this.ledgers.find(ledger => ledger.ledger_id === e)
-            const applicableGroups = this.formatLibraryGroupIds(selectedLedger.visible_to)
-            this.ledger_groups = applicableGroups
-            this.resetOwnersAndVisibleGroups(applicableGroups)
+            const selectedLedger = this.fiscalYear.koha_plugin_acquire_ledgers.find(ledger => ledger.ledger_id === e)
+            if(selectedLedger) {
+                const applicableGroups = this.formatLibraryGroupIds(selectedLedger.visible_to)
+                this.ledger_groups = applicableGroups
+                this.resetOwnersAndVisibleGroups(applicableGroups)
+            }
         },
         onSubmit(e) {
             e.preventDefault()
@@ -354,6 +353,9 @@ export default {
     },
     unmounted() {
         this.resetOwnersAndVisibleGroups()
+    },
+    components: {
+        InfiniteScrollSelect
     }
 }
 </script>
diff --git a/src/components/FundManagement/FundManagementHome.vue b/src/components/FundManagement/FundManagementHome.vue
index 4fd79b0..545ed65 100644
--- a/src/components/FundManagement/FundManagementHome.vue
+++ b/src/components/FundManagement/FundManagementHome.vue
@@ -93,41 +93,31 @@
                     <label for="fiscal_year" class="filter-label"
                         >Fiscal year:</label
                     >
-                    <v-select
+                    <InfiniteScrollSelect
                         id="fiscal_year"
                         v-model="filters.fiscal_yr_id"
-                        :reduce="av => av.fiscal_yr_id"
-                        :options="fiscal_years"
+                        :selectedData="null"
+                        dataType="fiscal_years"
+                        dataIdentifier="fiscal_yr_id"
                         label="code"
-                    >
-                        <template #search="{ attributes, events }">
-                            <input
-                                class="vs__search"
-                                v-bind="attributes"
-                                v-on="events"
-                            />
-                        </template>
-                    </v-select>
+                        apiClient="acquisition"
+                        :filters="filterLimitations"
+                    />
                 </div>
                 <div class="filter-grid-cell">
                     <label for="ledger" class="filter-label"
                         >Ledger:</label
                     >
-                    <v-select
+                    <InfiniteScrollSelect
                         id="ledger"
                         v-model="filters.ledger_id"
-                        :reduce="av => av.ledger_id"
-                        :options="ledgers"
+                        :selectedData="null"
+                        dataType="ledgers"
+                        dataIdentifier="ledger_id"
                         label="name"
-                    >
-                        <template #search="{ attributes, events }">
-                            <input
-                                class="vs__search"
-                                v-bind="attributes"
-                                v-on="events"
-                            />
-                        </template>
-                    </v-select>
+                        apiClient="acquisition"
+                        :filters="filterLimitations"
+                    />
                 </div>
             </div>
             <input
@@ -167,6 +157,7 @@
 import Toolbar from "../Toolbar.vue"
 import ToolbarLink from "../ToolbarLink.vue"
 import KohaTable from "../KohaTable.vue"
+import InfiniteScrollSelect from "../InfiniteScrollSelect.vue"
 import { inject, ref } from "vue"
 import { storeToRefs } from "pinia"
 import { APIClient } from "../../fetch/api-client.js"
@@ -233,6 +224,17 @@ export default {
             initialized: false
         }
     },
+    computed: {
+        filterLimitations() {
+            const filterLimitations = {}
+            Object.keys(this.filters).forEach(key => {
+                if(this.filters[key]) {
+                    filterLimitations[key] = this.filters[key]
+                }
+            })
+            return filterLimitations
+        }
+    },
     beforeRouteEnter(to, from, next) {
         next(vm => {
             vm.getDataRequiredForPageLoad()
@@ -309,7 +311,7 @@ export default {
             this.$refs.ledgersTable.redraw(this.tableUrl('ledgers', filters))
         },
         clearFilters() {
-            this.filters = {
+            this.filters =  {
                 status: null,
                 fund_type: null,
                 owner: null,
@@ -321,7 +323,8 @@ export default {
     components: {
         Toolbar,
         ToolbarLink,
-        KohaTable
+        KohaTable,
+        InfiniteScrollSelect
     }
 }
 </script>
diff --git a/src/components/FundManagement/FundShow.vue b/src/components/FundManagement/FundShow.vue
index 2cf9e5d..072b99c 100644
--- a/src/components/FundManagement/FundShow.vue
+++ b/src/components/FundManagement/FundShow.vue
@@ -111,7 +111,7 @@ export default {
     methods: {
         async getFund(fund_id) {
             const client = APIClient.acquisition
-            await client.funds.get(fund_id, "fiscal_yr,ledger,koha_plugin_acquire_fund_allocations").then(
+            await client.funds.get(fund_id, { "x-koha-embed": "fiscal_yr,ledger,koha_plugin_acquire_fund_allocations" }).then(
                 fund => {
                     this.fund = fund
                     this.initialized = true
diff --git a/src/components/FundManagement/LedgerFormAdd.vue b/src/components/FundManagement/LedgerFormAdd.vue
index b46a153..f951fb3 100644
--- a/src/components/FundManagement/LedgerFormAdd.vue
+++ b/src/components/FundManagement/LedgerFormAdd.vue
@@ -49,23 +49,17 @@
                             <label for="ledger_fiscal_yr_id" class="required"
                                 >Fiscal year:</label
                             >
-                            <v-select
+                            <InfiniteScrollSelect
                                 id="ledger_fiscal_yr_id"
                                 v-model="ledger.fiscal_yr_id"
-                                :reduce="av => av.fiscal_yr_id"
-                                :options="fiscal_years"
+                                :selectedData="fiscal_year"
+                                dataType="fiscal_years"
+                                dataIdentifier="fiscal_yr_id"
                                 label="code"
+                                apiClient="acquisition"
+                                :required="true"
                                 @update:modelValue="filterGroupsBySelectedFiscalYear($event)"
-                            >
-                                <template #search="{ attributes, events }">
-                                    <input
-                                        :required="!ledger.fiscal_yr_id"
-                                        class="vs__search"
-                                        v-bind="attributes"
-                                        v-on="events"
-                                    />
-                                </template>
-                            </v-select>
+                            />
                             <span class="required">Required</span>
                         </li>
                         <li>
@@ -286,6 +280,7 @@ import { inject } from "vue"
 import { storeToRefs } from "pinia"
 import { APIClient } from "../../fetch/api-client.js"
 import { setMessage, setWarning } from "../../messages"
+import InfiniteScrollSelect from "../InfiniteScrollSelect.vue"
 
 export default {
     setup() {
@@ -343,7 +338,7 @@ export default {
                 os_warning_sum: null,
                 os_limit_sum: null,
             },
-            fiscal_years: [],
+            fiscal_year: null,
             currencies: [],
             fiscal_year_groups: [],
         }
@@ -354,14 +349,15 @@ export default {
         })
     },
     methods: {
-        async getDataRequiredForPageLoad(ledger_id) {
-            this.getFiscalYears().then(() => {
-                this.getCurrencies().then(() => {
-                    if(ledger_id) {
-                        this.getLedger(ledger_id)
-                    }
+    async getDataRequiredForPageLoad(ledger_id) {
+            this.getCurrencies().then(() => {
+                if(ledger_id) {
+                    this.getLedger(ledger_id).then(() => {
+                        this.getFiscalYear(this.ledger.fiscal_yr_id)
+                    })
+                } else {
                     this.initialized = true
-                })
+                }
             })
         },
         async getLedger(ledger_id) {
@@ -373,11 +369,12 @@ export default {
                 this.filterGroupsBySelectedFiscalYear(ledger.fiscal_yr_id)
             })
         },
-        async getFiscalYears() {
+        async getFiscalYear(fiscal_yr_id) {
             const client = APIClient.acquisition
-            await client.fiscal_years.getAll().then(
-                fiscal_years => {
-                    this.fiscal_years = fiscal_years
+            await client.fiscal_years.get(fiscal_yr_id).then(
+                fiscal_year => {
+                    this.fiscal_year = fiscal_year
+                    this.initialized = true
                 },
                 error => {}
             )
@@ -397,10 +394,11 @@ export default {
                 this.ledger.visible_to = []
                 return
             }
-            const selectedFiscalyear = this.fiscal_years.find(fy => fy.fiscal_yr_id === e)
-            const applicableGroups = this.formatLibraryGroupIds(selectedFiscalyear.visible_to)
-            this.fiscal_year_groups = applicableGroups
-            this.resetOwnersAndVisibleGroups(applicableGroups)
+            this.getFiscalYear(e).then(() => {
+                const applicableGroups = this.formatLibraryGroupIds(this.fiscal_year.visible_to)
+                this.fiscal_year_groups = applicableGroups
+                this.resetOwnersAndVisibleGroups(applicableGroups)
+            })
             if(e !== this.ledger.fiscal_yr_id) {
                 this.ledger.visible_to = []
             }
@@ -448,6 +446,9 @@ export default {
     },
     unmounted() {
         this.resetOwnersAndVisibleGroups()
+    },
+    components: {
+        InfiniteScrollSelect
     }
 }
 </script>
diff --git a/src/components/InfiniteScrollSelect.vue b/src/components/InfiniteScrollSelect.vue
index 1e8966c..5d84fbe 100644
--- a/src/components/InfiniteScrollSelect.vue
+++ b/src/components/InfiniteScrollSelect.vue
@@ -10,6 +10,7 @@
         @option:selected="onSelected"
         @search="searchFilter($event)"
         ref="select"
+        :disabled="disabled"
     >
         <template v-if="required" #search="{ attributes, events }">
             <input
@@ -42,17 +43,23 @@ export default {
         dataIdentifier: String,
         label: String,
         required: Boolean,
+        apiClient: String,
+        filters: Object,
+        headers: Object,
+        disabled: Boolean
     },
     emits: ["update:modelValue"],
     data() {
+        const data = this.selectedData ? [this.selectedData] : []
+        const selectedOptionLabel = this.selectedData ? this.selectedData[this.label] : ''
         return {
             observer: null,
             limit: null,
             search: "",
             scrollPage: null,
-            data: [this.selectedData],
+            data,
             paginationRequired: false,
-            selectedOptionLabel: this.selectedData[this.label],
+            selectedOptionLabel,
         }
     },
     computed: {
@@ -80,16 +87,19 @@ export default {
         this.observer = new IntersectionObserver(this.infiniteScroll)
     },
     methods: {
-        async fetchInitialData(dataType) {
-            const client = APIClient.erm
+        async fetchInitialData(dataType, filters) {
+            const filterOptions = filters ? filters : {}
+            const headers = this.headers ? this.headers : []
+            const client = APIClient[this.apiClient]
             await client[dataType]
                 .getAll(
-                    {},
+                    filterOptions,
                     {
                         _page: 1,
                         _per_page: 20,
                         _match: "contains",
-                    }
+                    },
+                    headers
                 )
                 .then(
                     items => {
@@ -107,14 +117,15 @@ export default {
                 this.observer.disconnect()
                 this.data = []
                 this.search = e
-                const client = APIClient.erm
+                const client = APIClient[this.apiClient]
                 const attribute = "me." + this.label
-                const q = {}
+                const headers = this.headers ? this.headers : []
+                const q = this.filters ? this.filters : {}
                 q[attribute] = { like: `%${e}%` }
                 await client[this.dataType]
                     .getAll(q, {
                         _per_page: -1,
-                    })
+                    }, headers)
                     .then(
                         items => {
                             this.data = [...items]
@@ -127,7 +138,7 @@ export default {
         },
         async onOpen() {
             this.paginationRequired = true
-            await this.fetchInitialData(this.dataType)
+            await this.fetchInitialData(this.dataType, this.filters)
             if (this.hasNextPage) {
                 await this.$nextTick()
                 this.observer.observe(this.$refs.load)
@@ -147,16 +158,19 @@ export default {
                     this.limit += 20
                     this.scrollPage++
                     await this.$nextTick()
-                    const client = APIClient.erm
+                    const client = APIClient[this.apiClient]
                     ul.scrollTop = scrollTop
+                    const filterOptions = this.filters ? this.filters : {}
+                    const headers = this.headers ? this.headers : []
                     await client[this.dataType]
                         .getAll(
-                            {},
+                            filterOptions,
                             {
                                 _page: this.scrollPage,
                                 _per_page: 20,
                                 _match: "contains",
-                            }
+                            },
+                            headers
                         )
                         .then(
                             items => {
diff --git a/src/fetch/acquisition-api-client.js b/src/fetch/acquisition-api-client.js
index 15d9de0..9d443c1 100644
--- a/src/fetch/acquisition-api-client.js
+++ b/src/fetch/acquisition-api-client.js
@@ -75,24 +75,20 @@ export class AcquisitionAPIClient extends HttpClient {
 
     get fiscal_years() {
         return {
-            get: (id, embed) =>
+            get: (id, headers) =>
                 this.get({
                     endpoint: "fiscal_years/" + id,
-                    ...(embed && {
-                        headers: {
-                            "x-koha-embed": embed
-                        }
+                    ...(headers && {
+                        headers
                     })
                 }),
-            getAll: (query, params, embed) =>
+            getAll: (query, params, headers) =>
                 this.getAll({
                     endpoint: "fiscal_years",
                     query,
                     params,
-                    ...(embed && {
-                        headers: {
-                            "x-koha-embed": embed
-                        }
+                    ...(headers && {
+                        headers
                     })
                 }),
             delete: id =>
@@ -124,22 +120,18 @@ export class AcquisitionAPIClient extends HttpClient {
 
     get ledgers() {
         return {
-            get: (id, embed) =>
+            get: (id, headers) =>
                 this.get({
                     endpoint: "ledgers/" + id,
-                    ...(embed && { headers: {
-                        "x-koha-embed": embed
-                    }})
+                    ...(headers && { headers })
                 }),
-            getAll: (query, params, embed) =>
+            getAll: (query, params, headers) =>
                 this.getAll({
                     endpoint: "ledgers",
                     query,
                     params,
-                    ...(embed && {
-                        headers: {
-                            "x-koha-embed": embed
-                        }
+                    ...(headers && {
+                        headers
                     })
                 }),
             delete: id =>
@@ -171,22 +163,18 @@ export class AcquisitionAPIClient extends HttpClient {
 
     get funds() {
         return {
-            get: (id, embed) =>
+            get: (id, headers) =>
                 this.get({
                     endpoint: "funds/" + id,
-                    ...(embed && { headers: {
-                        "x-koha-embed": embed
-                    }})
+                    ...(headers && { headers })
                 }),
-            getAll: (query, params, embed) =>
+            getAll: (query, params, headers) =>
                 this.getAll({
                     endpoint: "funds",
                     query,
                     params,
-                    ...(embed && {
-                        headers: {
-                            "x-koha-embed": embed
-                        }
+                    ...(headers && {
+                        headers
                     })
                 }),
             delete: id =>
@@ -218,24 +206,20 @@ export class AcquisitionAPIClient extends HttpClient {
 
     get fund_allocations() {
         return {
-            get: (id, embed) =>
+            get: (id, headers) =>
                 this.get({
                     endpoint: "fund_allocations/" + id,
-                    ...(embed && {
-                        headers: {
-                            "x-koha-embed": embed
-                        }
+                    ...(headers && {
+                        headers
                     })
                 }),
-            getAll: (query, params, embed) =>
+            getAll: (query, params, headers) =>
                 this.getAll({
                     endpoint: "fund_allocations",
                     query,
                     params,
-                    ...(embed && {
-                        headers: {
-                            "x-koha-embed": embed
-                        }
+                    ...(headers && {
+                        headers
                     })
                 }),
             delete: id =>