diff --git a/src/__tests__/users.api.test.js b/src/__tests__/users.api.test.js
index 89e9c58..f05ab09 100644
--- a/src/__tests__/users.api.test.js
+++ b/src/__tests__/users.api.test.js
@@ -36,6 +36,7 @@ jest.unstable_mockModule('../database/ceph.js', () => ({
 jest.unstable_mockModule('../services/management/users.js', () => ({
   listUsersRouteHandler: jest.fn((req, res) => res.send([{ id: '1', name: 'Mock User' }])),
   listUsersByPropertiesRouteHandler: jest.fn(),
+  searchUsersRouteHandler: jest.fn(),
   getUserRouteHandler: jest.fn((req, res) => res.send({ id: req.params.id, name: 'Mock User' })),
   editUserRouteHandler: jest.fn(),
   getUserStatsRouteHandler: jest.fn(),
diff --git a/src/services/finance/__tests__/invoices.test.js b/src/services/finance/__tests__/invoices.test.js
index 576b5ad..837d235 100644
--- a/src/services/finance/__tests__/invoices.test.js
+++ b/src/services/finance/__tests__/invoices.test.js
@@ -2,6 +2,7 @@ import { jest } from '@jest/globals';
 
 // Mock dependencies
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/finance/__tests__/payments.test.js b/src/services/finance/__tests__/payments.test.js
index e57a1ef..bbe97b9 100644
--- a/src/services/finance/__tests__/payments.test.js
+++ b/src/services/finance/__tests__/payments.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/finance/__tests__/taxrecords.test.js b/src/services/finance/__tests__/taxrecords.test.js
index 95acab7..dd336c4 100644
--- a/src/services/finance/__tests__/taxrecords.test.js
+++ b/src/services/finance/__tests__/taxrecords.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/inventory/__tests__/filamentstocks.test.js b/src/services/inventory/__tests__/filamentstocks.test.js
index b3731a9..b164b49 100644
--- a/src/services/inventory/__tests__/filamentstocks.test.js
+++ b/src/services/inventory/__tests__/filamentstocks.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/inventory/__tests__/orderitems.test.js b/src/services/inventory/__tests__/orderitems.test.js
index c790167..deb6dce 100644
--- a/src/services/inventory/__tests__/orderitems.test.js
+++ b/src/services/inventory/__tests__/orderitems.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/inventory/__tests__/partstocks.test.js b/src/services/inventory/__tests__/partstocks.test.js
index 7a98e7e..8ac8ec4 100644
--- a/src/services/inventory/__tests__/partstocks.test.js
+++ b/src/services/inventory/__tests__/partstocks.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/inventory/__tests__/purchaseorders.test.js b/src/services/inventory/__tests__/purchaseorders.test.js
index 14b6d97..e57c356 100644
--- a/src/services/inventory/__tests__/purchaseorders.test.js
+++ b/src/services/inventory/__tests__/purchaseorders.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/inventory/__tests__/shipments.test.js b/src/services/inventory/__tests__/shipments.test.js
index cad08c6..0faf86f 100644
--- a/src/services/inventory/__tests__/shipments.test.js
+++ b/src/services/inventory/__tests__/shipments.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/inventory/__tests__/stockaudits.test.js b/src/services/inventory/__tests__/stockaudits.test.js
index 80689f3..583518c 100644
--- a/src/services/inventory/__tests__/stockaudits.test.js
+++ b/src/services/inventory/__tests__/stockaudits.test.js
@@ -5,6 +5,7 @@ jest.unstable_mockModule('../../../utils.js', () => ({
 }));
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   getModelStats: jest.fn(),
   getModelHistory: jest.fn(),
 }));
diff --git a/src/services/inventory/__tests__/stockevents.test.js b/src/services/inventory/__tests__/stockevents.test.js
index e500895..0e8853b 100644
--- a/src/services/inventory/__tests__/stockevents.test.js
+++ b/src/services/inventory/__tests__/stockevents.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/management/__tests__/auditlogs.test.js b/src/services/management/__tests__/auditlogs.test.js
index 49d3fd6..54b137f 100644
--- a/src/services/management/__tests__/auditlogs.test.js
+++ b/src/services/management/__tests__/auditlogs.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   getModelStats: jest.fn(),
   getModelHistory: jest.fn(),
 }));
diff --git a/src/services/management/__tests__/courier.test.js b/src/services/management/__tests__/courier.test.js
index 6c39530..af2c26d 100644
--- a/src/services/management/__tests__/courier.test.js
+++ b/src/services/management/__tests__/courier.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/management/__tests__/courierservice.test.js b/src/services/management/__tests__/courierservice.test.js
index aadfb83..705fe7b 100644
--- a/src/services/management/__tests__/courierservice.test.js
+++ b/src/services/management/__tests__/courierservice.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/management/__tests__/documentjobs.test.js b/src/services/management/__tests__/documentjobs.test.js
index 9d8203f..8d7544c 100644
--- a/src/services/management/__tests__/documentjobs.test.js
+++ b/src/services/management/__tests__/documentjobs.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/management/__tests__/documentprinters.test.js b/src/services/management/__tests__/documentprinters.test.js
index b9e8040..19c8f5d 100644
--- a/src/services/management/__tests__/documentprinters.test.js
+++ b/src/services/management/__tests__/documentprinters.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/management/__tests__/documentsizes.test.js b/src/services/management/__tests__/documentsizes.test.js
index d40eea8..ddfcb96 100644
--- a/src/services/management/__tests__/documentsizes.test.js
+++ b/src/services/management/__tests__/documentsizes.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/management/__tests__/documenttemplates.test.js b/src/services/management/__tests__/documenttemplates.test.js
index 2f0cf0e..0718b47 100644
--- a/src/services/management/__tests__/documenttemplates.test.js
+++ b/src/services/management/__tests__/documenttemplates.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/management/__tests__/filaments.test.js b/src/services/management/__tests__/filaments.test.js
index 35b0961..b550aa2 100644
--- a/src/services/management/__tests__/filaments.test.js
+++ b/src/services/management/__tests__/filaments.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/management/__tests__/files.test.js b/src/services/management/__tests__/files.test.js
index d03ea51..829a52c 100644
--- a/src/services/management/__tests__/files.test.js
+++ b/src/services/management/__tests__/files.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/management/__tests__/hosts.test.js b/src/services/management/__tests__/hosts.test.js
index d9e4156..90dbd0e 100644
--- a/src/services/management/__tests__/hosts.test.js
+++ b/src/services/management/__tests__/hosts.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/management/__tests__/materials.test.js b/src/services/management/__tests__/materials.test.js
index 5fc1d1d..50d4abf 100644
--- a/src/services/management/__tests__/materials.test.js
+++ b/src/services/management/__tests__/materials.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   listObjectsByProperties: jest.fn(),
   getObject: jest.fn(),
diff --git a/src/services/management/__tests__/notetypes.test.js b/src/services/management/__tests__/notetypes.test.js
index 19f27c3..a6076f9 100644
--- a/src/services/management/__tests__/notetypes.test.js
+++ b/src/services/management/__tests__/notetypes.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/management/__tests__/parts.test.js b/src/services/management/__tests__/parts.test.js
index 7718822..a062a36 100644
--- a/src/services/management/__tests__/parts.test.js
+++ b/src/services/management/__tests__/parts.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/management/__tests__/products.test.js b/src/services/management/__tests__/products.test.js
index db4cbec..c1bee1d 100644
--- a/src/services/management/__tests__/products.test.js
+++ b/src/services/management/__tests__/products.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/management/__tests__/taxrates.test.js b/src/services/management/__tests__/taxrates.test.js
index 20aeef7..02ee0c3 100644
--- a/src/services/management/__tests__/taxrates.test.js
+++ b/src/services/management/__tests__/taxrates.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/management/__tests__/users.test.js b/src/services/management/__tests__/users.test.js
index eef3167..f942278 100644
--- a/src/services/management/__tests__/users.test.js
+++ b/src/services/management/__tests__/users.test.js
@@ -2,6 +2,7 @@ import { jest } from '@jest/globals';
 
 // Mock dependencies MUST be done before importing the module under test
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   listObjectsByProperties: jest.fn(),
   getObject: jest.fn(),
diff --git a/src/services/management/__tests__/vendors.test.js b/src/services/management/__tests__/vendors.test.js
index 12388c4..58af1f3 100644
--- a/src/services/management/__tests__/vendors.test.js
+++ b/src/services/management/__tests__/vendors.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/misc/__tests__/notes.test.js b/src/services/misc/__tests__/notes.test.js
index db1a1fe..d52473c 100644
--- a/src/services/misc/__tests__/notes.test.js
+++ b/src/services/misc/__tests__/notes.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/production/__tests__/gcodefiles.test.js b/src/services/production/__tests__/gcodefiles.test.js
index d6053dc..7531fbc 100644
--- a/src/services/production/__tests__/gcodefiles.test.js
+++ b/src/services/production/__tests__/gcodefiles.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/production/__tests__/jobs.test.js b/src/services/production/__tests__/jobs.test.js
index 76c9490..c40f175 100644
--- a/src/services/production/__tests__/jobs.test.js
+++ b/src/services/production/__tests__/jobs.test.js
@@ -2,6 +2,7 @@ import { jest } from '@jest/globals';
 
 // Mock dependencies
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   newObject: jest.fn(),
diff --git a/src/services/production/__tests__/printers.test.js b/src/services/production/__tests__/printers.test.js
index e74f860..c972f7e 100644
--- a/src/services/production/__tests__/printers.test.js
+++ b/src/services/production/__tests__/printers.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/production/__tests__/subjobs.test.js b/src/services/production/__tests__/subjobs.test.js
index ee7f366..2b0ef73 100644
--- a/src/services/production/__tests__/subjobs.test.js
+++ b/src/services/production/__tests__/subjobs.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   listObjectsByProperties: jest.fn(),
diff --git a/src/services/sales/__tests__/clients.test.js b/src/services/sales/__tests__/clients.test.js
index 9a3986c..8fde4da 100644
--- a/src/services/sales/__tests__/clients.test.js
+++ b/src/services/sales/__tests__/clients.test.js
@@ -1,6 +1,7 @@
 import { jest } from '@jest/globals';
 
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),
diff --git a/src/services/sales/__tests__/salesorders.test.js b/src/services/sales/__tests__/salesorders.test.js
index f6a0339..63f1597 100644
--- a/src/services/sales/__tests__/salesorders.test.js
+++ b/src/services/sales/__tests__/salesorders.test.js
@@ -2,6 +2,7 @@ import { jest } from '@jest/globals';
 
 // Mock dependencies
 jest.unstable_mockModule('../../../database/database.js', () => ({
+  searchObjects: jest.fn(),
   listObjects: jest.fn(),
   getObject: jest.fn(),
   editObject: jest.fn(),