diff --git a/src/components/Controls/Link.vue b/src/components/Controls/Link.vue
index 6dcdbdb5..5adf5cd3 100644
--- a/src/components/Controls/Link.vue
+++ b/src/components/Controls/Link.vue
@@ -137,14 +137,31 @@ export default {
     },
     async getCreateFilters() {
       const { schemaName, fieldname } = this.df;
-      const getFilters = fyo.models[schemaName]?.createFilters?.[fieldname];
-      const filters = await getFilters?.(this.doc);
+      const getCreateFilters =
+        fyo.models[schemaName]?.createFilters?.[fieldname];
+      let createFilters = await getCreateFilters?.(this.doc);
 
-      if (filters === undefined) {
-        return await this.getFilters();
+      if (createFilters !== undefined) {
+        return createFilters;
       }
 
-      return filters;
+      createFilters = {};
+
+      const filters = await this.getFilters();
+      for (const key of Object.keys(filters)) {
+        const value = filters[key];
+        if (value === undefined) {
+          continue;
+        }
+
+        if (Array.isArray(value)) {
+          continue;
+        }
+
+        createFilters[key] = value;
+      }
+
+      return createFilters;
     },
     async getFilters() {
       const { schemaName, fieldname } = this.df;
diff --git a/tests/helpers.ts b/tests/helpers.ts
index dd8bf5e5..244e08b8 100644
--- a/tests/helpers.ts
+++ b/tests/helpers.ts
@@ -17,8 +17,8 @@ export function getTestSetupWizardOptions(): SetupWizardOptions {
     email: 'test@testmyfantasy.com',
     bankName: 'Test Bank of Scriptia',
     currency: 'INR',
-    fiscalYearStart: getFiscalYear('04-01', true)!.toISOString(),
-    fiscalYearEnd: getFiscalYear('04-01', false)!.toISOString(),
+    fiscalYearStart: getFiscalYear('04-01', true)!.toISOString().split('T')[0],
+    fiscalYearEnd: getFiscalYear('04-01', false)!.toISOString().split('T')[0],
     chartOfAccounts: 'India - Chart of Accounts',
   };
 }