diff --git a/src/database/models/AppPassword.js b/src/database/models/AppPassword.js
index 6afb91f..f87519e 100644
--- a/src/database/models/AppPassword.js
+++ b/src/database/models/AppPassword.js
@@ -72,7 +72,16 @@ export const AppPassword = {
     }
   ],
   columns: ['_reference', 'name', 'user', 'active', 'createdAt', 'updatedAt'],
-  filters: ['_id', 'name', 'user', 'active', 'user._id'],
+  filters: [
+    '_id',
+    'name',
+    'user',
+    'active',
+    'user._id',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
   sorters: ['name', 'user', 'active', 'createdAt', 'updatedAt'],
   properties: [
     {
diff --git a/src/database/models/AuditLog.js b/src/database/models/AuditLog.js
index 11b2bac..a778b65 100644
--- a/src/database/models/AuditLog.js
+++ b/src/database/models/AuditLog.js
@@ -16,8 +16,15 @@ export const AuditLog = {
     'changes',
     'createdAt'
   ],
-  filters: ['_id', 'owner', 'parent', 'operation'],
-  sorters: ['createdAt'],
+  filters: [
+    'parent._id',
+    'owner._id',
+    'operation',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
+  sorters: ['createdAt','updatedAt'],
   properties: [
     {
       name: '_id',
diff --git a/src/database/models/Client.js b/src/database/models/Client.js
index 23e1fc7..bb1032f 100644
--- a/src/database/models/Client.js
+++ b/src/database/models/Client.js
@@ -72,15 +72,12 @@ export const Client = {
     'updatedAt'
   ],
   filters: [
-    'name',
-    '_id',
     'country',
-    'email',
-    'phone',
     'active',
-    'marketplace',
     'createdAt',
-    'updatedAt'
+    'updatedAt',
+    'name',
+    '_reference'
   ],
   sorters: [
     'name',
diff --git a/src/database/models/Courier.js b/src/database/models/Courier.js
index 0785c22..1416f9d 100644
--- a/src/database/models/Courier.js
+++ b/src/database/models/Courier.js
@@ -63,8 +63,25 @@ export const Courier = {
     }
   ],
   columns: ['_reference', 'name', 'country', 'email', 'website', 'createdAt'],
-  filters: ['name', '_id', 'country', 'email'],
-  sorters: ['name', 'country', 'email', 'createdAt', '_id'],
+  filters: [
+    'name',
+    'website',
+    'email',
+    'phone',
+    'contact',
+    'country',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
+  sorters: [
+    'name',
+    'country',
+    'email',
+    'createdAt',
+    '_id',
+    'updatedAt'
+  ],
   group: ['country'],
   properties: [
     {
diff --git a/src/database/models/CourierService.js b/src/database/models/CourierService.js
index 9ba61bd..655ed3b 100644
--- a/src/database/models/CourierService.js
+++ b/src/database/models/CourierService.js
@@ -74,14 +74,18 @@ export const CourierService = {
     'active'
   ],
   filters: [
-    'name',
     '_id',
     'courier',
+    'courier._id',
+    'name',
     'active',
-    'deliveryTime',
     'tracked',
+    'deliveryTime',
     'cost',
-    'costWithTax'
+    'costWithTax',
+    'createdAt',
+    'updatedAt',
+    '_reference'
   ],
   sorters: [
     'name',
@@ -92,7 +96,8 @@ export const CourierService = {
     'costWithTax',
     'estimatedDeliveryTime',
     'createdAt',
-    '_id'
+    '_id',
+    'updatedAt'
   ],
   group: ['courier'],
   properties: [
diff --git a/src/database/models/DocumentJob.js b/src/database/models/DocumentJob.js
index e646b00..3fa6c94 100644
--- a/src/database/models/DocumentJob.js
+++ b/src/database/models/DocumentJob.js
@@ -56,7 +56,15 @@ export const DocumentJob = {
     }
   ],
   columns: ['_reference', 'name', 'state', 'createdAt', 'updatedAt'],
-  filters: ['name', '_id', 'state'],
+  filters: [
+    'name',
+    'width',
+    'height',
+    'state',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
   sorters: ['name', 'state', 'createdAt', 'updatedAt'],
   properties: [
     {
diff --git a/src/database/models/DocumentPrinter.js b/src/database/models/DocumentPrinter.js
index 9a76194..3be89a9 100644
--- a/src/database/models/DocumentPrinter.js
+++ b/src/database/models/DocumentPrinter.js
@@ -63,8 +63,24 @@ export const DocumentPrinter = {
     'connectedAt',
     'updatedAt'
   ],
-  filters: ['name', '_id'],
-  sorters: ['name', 'documentSize', 'connectedAt', 'updatedAt'],
+  filters: [
+    'name',
+    'tags',
+    'active',
+    'isGlobal',
+    'state',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
+  sorters: [
+    'name',
+    'documentSize',
+    'connectedAt',
+    'updatedAt',
+    'state',
+    'createdAt'
+  ],
   properties: [
     {
       name: '_id',
diff --git a/src/database/models/DocumentSize.js b/src/database/models/DocumentSize.js
index c28875b..4a3eb5e 100644
--- a/src/database/models/DocumentSize.js
+++ b/src/database/models/DocumentSize.js
@@ -63,7 +63,14 @@ export const DocumentSize = {
     'createdAt',
     'updatedAt'
   ],
-  filters: ['name', '_id', 'width', 'height', 'infiniteHeight'],
+  filters: [
+    'name',
+    'width',
+    'height',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
   sorters: [
     'name',
     'width',
diff --git a/src/database/models/DocumentTemplate.js b/src/database/models/DocumentTemplate.js
index 443eb58..f2f695d 100644
--- a/src/database/models/DocumentTemplate.js
+++ b/src/database/models/DocumentTemplate.js
@@ -75,7 +75,16 @@ export const DocumentTemplate = {
     'createdAt',
     'updatedAt'
   ],
-  filters: ['name', '_id', 'active', 'tags', 'objectType'],
+  filters: [
+    'name',
+    'tags',
+    'active',
+    'global',
+    'objectType',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
   group: ['documentSize', 'tags'],
   sorters: [
     'name',
diff --git a/src/database/models/Filament.js b/src/database/models/Filament.js
index ae30d7b..272ea04 100644
--- a/src/database/models/Filament.js
+++ b/src/database/models/Filament.js
@@ -90,7 +90,17 @@ export const Filament = {
     'createdAt',
     'updatedAt'
   ],
-  filters: ['_id', 'name', 'vendor', 'material', 'cost', 'costWithTax'],
+  filters: [
+    '_id',
+    'material',
+    'material._id',
+    'diameter',
+    'name',
+    'cost',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
   sorters: [
     'name',
     'createdAt',
diff --git a/src/database/models/FilamentProfile.js b/src/database/models/FilamentProfile.js
index 97af3f9..90b2d12 100644
--- a/src/database/models/FilamentProfile.js
+++ b/src/database/models/FilamentProfile.js
@@ -59,7 +59,7 @@ export const FilamentProfile = {
     }
   ],
   columns: ['_reference', 'name', 'filamentType', 'filament', 'updatedAt'],
-  filters: ['_id', 'name', 'filamentType', 'filament'],
+  filters: ['_id','name','createdAt','updatedAt','_reference'],
   sorters: ['name', 'createdAt', 'updatedAt'],
   properties: [
     {
diff --git a/src/database/models/FilamentSku.js b/src/database/models/FilamentSku.js
index a03d768..3870629 100644
--- a/src/database/models/FilamentSku.js
+++ b/src/database/models/FilamentSku.js
@@ -83,7 +83,10 @@ export const FilamentSku = {
     'name',
     'color',
     'cost',
-    'costWithTax'
+    'costWithTax',
+    'createdAt',
+    'updatedAt',
+    '_reference'
   ],
   sorters: [
     'barcode',
diff --git a/src/database/models/FilamentStock.js b/src/database/models/FilamentStock.js
index 0cb74da..dffc4cd 100644
--- a/src/database/models/FilamentStock.js
+++ b/src/database/models/FilamentStock.js
@@ -31,13 +31,26 @@ export const FilamentStock = {
     'updatedAt'
   ],
   filters: [
-    '_id',
     'filament',
     'filament._id',
     'filamentSku',
-    'filamentSku._id'
+    'state',
+    'startingWeight',
+    'currentWeight',
+    'filamentSku._id',
+    'stockLocation',
+    'stockLocation._id',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
+  sorters: [
+    'createdAt',
+    'updatedAt',
+    'filament',
+    'filamentSku',
+    'state'
   ],
-  sorters: ['createdAt', 'updatedAt', 'filament', 'filamentSku'],
   group: ['filament', 'filamentSku'],
   properties: [
     {
diff --git a/src/database/models/File.js b/src/database/models/File.js
index d429b1d..728d8fe 100644
--- a/src/database/models/File.js
+++ b/src/database/models/File.js
@@ -80,8 +80,24 @@ export const File = {
     'createdAt',
     'updatedAt'
   ],
-  filters: ['name', '_id', 'type', 'temp'],
-  sorters: ['name', 'type', 'size', 'createdAt', 'temp'],
+  filters: [
+    '_id',
+    'name',
+    'type',
+    'size',
+    'extension',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
+  sorters: [
+    'name',
+    'type',
+    'size',
+    'createdAt',
+    'temp',
+    'updatedAt'
+  ],
   group: ['type'],
   properties: [
     {
diff --git a/src/database/models/GCodeFile.js b/src/database/models/GCodeFile.js
index fdb749f..824a066 100644
--- a/src/database/models/GCodeFile.js
+++ b/src/database/models/GCodeFile.js
@@ -90,8 +90,10 @@ export const GCodeFile = {
     'filament',
     'filament._id',
     'filamentSku',
-    'cost',
-    'updatedAt'
+    'filamentSku._id',
+    'createdAt',
+    'updatedAt',
+    '_reference'
   ],
   sorters: [
     'name',
diff --git a/src/database/models/Host.js b/src/database/models/Host.js
index 4f82798..87e7764 100644
--- a/src/database/models/Host.js
+++ b/src/database/models/Host.js
@@ -74,8 +74,22 @@ export const Host = {
     }
   ],
   columns: ['_reference', 'name', 'state', 'tags', 'connectedAt'],
-  filters: ['name', '_id', 'state', 'tags'],
-  sorters: ['name', 'state', 'connectedAt'],
+  filters: [
+    'name',
+    '_id',
+    'state',
+    'tags',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
+  sorters: [
+    'name',
+    'state',
+    'connectedAt',
+    'createdAt',
+    'updatedAt'
+  ],
   group: ['tags'],
   properties: [
     {
diff --git a/src/database/models/Invoice.js b/src/database/models/Invoice.js
index 8df0f63..2919f59 100644
--- a/src/database/models/Invoice.js
+++ b/src/database/models/Invoice.js
@@ -132,7 +132,19 @@ export const Invoice = {
     }
   ],
   group: ['orderType'],
-  filters: ['to', 'from', 'orderType'],
+  filters: [
+    'vendor',
+    'client',
+    'state',
+    'vendor._id',
+    'client._id',
+    'order',
+    'order._id',
+    'orderType',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
   sorters: ['createdAt', 'state', 'updatedAt', 'invoiceDate', 'dueDate'],
   columns: [
     '_reference',
diff --git a/src/database/models/Job.js b/src/database/models/Job.js
index d3e7b9b..ea82626 100644
--- a/src/database/models/Job.js
+++ b/src/database/models/Job.js
@@ -87,8 +87,22 @@ export const Job = {
     }
   ],
   columns: ['_reference', 'quantity', 'state', 'gcodeFile', 'createdAt'],
-  filters: ['state', '_id', 'gcodeFile', 'quantity'],
-  sorters: ['createdAt', 'state', 'quantity', 'gcodeFile'],
+  filters: [
+    'state',
+    'gcodeFile._id',
+    'quantity',
+    '_id',
+    '_reference',
+    'createdAt',
+    'updatedAt'
+  ],
+  sorters: [
+    'createdAt',
+    'state',
+    'quantity',
+    'gcodeFile',
+    'updatedAt'
+  ],
   properties: [
     {
       name: '_id',
diff --git a/src/database/models/Listing.js b/src/database/models/Listing.js
index b0d2669..14e22c0 100644
--- a/src/database/models/Listing.js
+++ b/src/database/models/Listing.js
@@ -112,16 +112,16 @@ export const Listing = {
     'updatedAt'
   ],
   filters: [
-    'title',
-    '_id',
     'product',
     'vendor',
     'stockLocation',
     'marketplace',
     'courierServices',
     'state',
+    'state.type',
     'createdAt',
-    'updatedAt'
+    'updatedAt',
+    '_reference'
   ],
   sorters: [
     'title',
diff --git a/src/database/models/ListingVarient.js b/src/database/models/ListingVarient.js
index 8141988..33c7134 100644
--- a/src/database/models/ListingVarient.js
+++ b/src/database/models/ListingVarient.js
@@ -99,13 +99,15 @@ export const ListingVarient = {
     'updatedAt'
   ],
   filters: [
-    '_id',
     'listing',
+    'listing._id',
     'product',
     'productSku',
     'state',
+    'state.type',
     'createdAt',
-    'updatedAt'
+    'updatedAt',
+    '_reference'
   ],
   sorters: ['state', 'price', 'lastSyncedAt', 'createdAt', 'updatedAt', '_id'],
   group: ['listing', 'state'],
diff --git a/src/database/models/Marketplace.js b/src/database/models/Marketplace.js
index a885278..ce324b4 100644
--- a/src/database/models/Marketplace.js
+++ b/src/database/models/Marketplace.js
@@ -139,13 +139,14 @@ export const Marketplace = {
   ],
   filters: [
     'name',
-    '_id',
     'provider',
     'active',
     'connected',
-    'state',
+    'state.type',
     'createdAt',
-    'updatedAt'
+    'updatedAt',
+    'state',
+    '_reference'
   ],
   sorters: [
     'name',
diff --git a/src/database/models/Material.js b/src/database/models/Material.js
index 4dfc8ab..1757b85 100644
--- a/src/database/models/Material.js
+++ b/src/database/models/Material.js
@@ -63,7 +63,14 @@ export const Material = {
     }
   ],
   columns: ['_reference', 'name', 'tags', 'createdAt', 'updatedAt'],
-  filters: ['_id', 'name', 'tags'],
+  filters: [
+    '_id',
+    'name',
+    'tags',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
   sorters: ['name', 'createdAt', 'updatedAt', '_id'],
   group: ['tags'],
   properties: [
diff --git a/src/database/models/NoteType.js b/src/database/models/NoteType.js
index 0e26cbe..a593060 100644
--- a/src/database/models/NoteType.js
+++ b/src/database/models/NoteType.js
@@ -53,7 +53,15 @@ export const NoteType = {
     }
   ],
   columns: ['_reference', 'name', 'color', 'active', 'createdAt', 'updatedAt'],
-  filters: ['name', '_id', 'color', 'active'],
+  filters: [
+    'name',
+    '_id',
+    'color',
+    'active',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
   sorters: ['name', 'color', 'active', 'createdAt', 'updatedAt'],
   properties: [
     {
diff --git a/src/database/models/OrderItem.js b/src/database/models/OrderItem.js
index 8d1170e..72eab8a 100644
--- a/src/database/models/OrderItem.js
+++ b/src/database/models/OrderItem.js
@@ -80,8 +80,29 @@ export const OrderItem = {
     }
   ],
   group: [],
-  filters: ['itemType', 'item', 'sku', 'order'],
-  sorters: ['createdAt', 'updatedAt', 'itemAmount', 'quantity'],
+  filters: [
+    'name',
+    'itemType',
+    'item',
+    'item._id',
+    'order',
+    'order._id',
+    'orderType',
+    'shipment',
+    'shipment._id',
+    'state',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
+  sorters: [
+    'createdAt',
+    'updatedAt',
+    'itemAmount',
+    'quantity',
+    'state',
+    'name'
+  ],
   columns: [
     '_reference',
     'name',
diff --git a/src/database/models/Part.js b/src/database/models/Part.js
index 57e0e90..c88600b 100644
--- a/src/database/models/Part.js
+++ b/src/database/models/Part.js
@@ -77,13 +77,12 @@ export const Part = {
     'updatedAt'
   ],
   filters: [
-    'name',
+    'product._id',
     '_id',
-    'priceMode',
-    'cost',
-    'costWithTax',
-    'price',
-    'priceWithTax'
+    'name',
+    'createdAt',
+    'updatedAt',
+    '_reference'
   ],
   sorters: [
     'name',
diff --git a/src/database/models/PartSku.js b/src/database/models/PartSku.js
index 2a317d2..c409c11 100644
--- a/src/database/models/PartSku.js
+++ b/src/database/models/PartSku.js
@@ -83,9 +83,10 @@ export const PartSku = {
     'part._id',
     'name',
     'cost',
-    'costWithTax',
     'price',
-    'priceWithTax'
+    'createdAt',
+    'updatedAt',
+    '_reference'
   ],
   sorters: [
     'barcode',
diff --git a/src/database/models/PartStock.js b/src/database/models/PartStock.js
index fa39b68..e66cfb7 100644
--- a/src/database/models/PartStock.js
+++ b/src/database/models/PartStock.js
@@ -18,8 +18,26 @@ export const PartStock = {
       url: (_id) => `/dashboard/inventory/partstocks/info?partStockId=${_id}`
     }
   ],
-  filters: ['_id', 'partSku', 'startingQuantity', 'currentQuantity'],
-  sorters: ['partSku', 'startingQuantity', 'currentQuantity'],
+  filters: [
+    'partSku',
+    'state',
+    'startingQuantity',
+    'currentQuantity',
+    'partSku._id',
+    'stockLocation',
+    'stockLocation._id',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
+  sorters: [
+    'partSku',
+    'startingQuantity',
+    'currentQuantity',
+    'state',
+    'createdAt',
+    'updatedAt'
+  ],
   columns: [
     '_reference',
     'state',
diff --git a/src/database/models/Payment.js b/src/database/models/Payment.js
index ac7b376..390dbed 100644
--- a/src/database/models/Payment.js
+++ b/src/database/models/Payment.js
@@ -130,7 +130,18 @@ export const Payment = {
     }
   ],
   group: ['vendor', 'client', 'invoice'],
-  filters: ['vendor', 'client', 'invoice'],
+  filters: [
+    'vendor',
+    'client',
+    'state',
+    'vendor._id',
+    'client._id',
+    'invoice',
+    'invoice._id',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
   sorters: ['createdAt', 'state', 'updatedAt', 'paymentDate'],
   columns: [
     '_reference',
diff --git a/src/database/models/Printer.js b/src/database/models/Printer.js
index 9f30d89..1ab15b7 100644
--- a/src/database/models/Printer.js
+++ b/src/database/models/Printer.js
@@ -226,8 +226,25 @@ export const Printer = {
     'connectedAt',
     'updatedAt'
   ],
-  filters: ['name', '_reference', 'state', 'tags'],
-  sorters: ['name', 'state', 'connectedAt'],
+  filters: [
+    'tags',
+    'host._id',
+    'active',
+    'online',
+    'name',
+    '_id',
+    '_reference',
+    'state',
+    'createdAt',
+    'updatedAt'
+  ],
+  sorters: [
+    'name',
+    'state',
+    'connectedAt',
+    'createdAt',
+    'updatedAt'
+  ],
   group: ['tags'],
   properties: [
     {
diff --git a/src/database/models/PrinterProfile.js b/src/database/models/PrinterProfile.js
index 18ba492..d5c106b 100644
--- a/src/database/models/PrinterProfile.js
+++ b/src/database/models/PrinterProfile.js
@@ -337,7 +337,7 @@ export const PrinterProfile = {
     'auxiliaryFan',
     'updatedAt'
   ],
-  filters: ['_id', 'name', 'printer'],
+  filters: ['_id','name','createdAt','updatedAt','_reference'],
   sorters: [
     'name',
     'printBedWidth',
diff --git a/src/database/models/Product.js b/src/database/models/Product.js
index 3cffd91..cd9f584 100644
--- a/src/database/models/Product.js
+++ b/src/database/models/Product.js
@@ -83,14 +83,12 @@ export const Product = {
   filters: [
     '_id',
     'name',
+    'globalPrice',
     'productCategory',
-    'type',
-    'color',
-    'vendor',
-    'cost',
-    'costWithTax',
-    'price',
-    'priceWithTax'
+    'productCategory._id',
+    'createdAt',
+    'updatedAt',
+    '_reference'
   ],
   sorters: [
     'name',
diff --git a/src/database/models/ProductCategory.js b/src/database/models/ProductCategory.js
index 6561c2a..21aaa60 100644
--- a/src/database/models/ProductCategory.js
+++ b/src/database/models/ProductCategory.js
@@ -65,7 +65,7 @@ export const ProductCategory = {
     }
   ],
   columns: ['_reference', 'name', 'createdAt', 'updatedAt'],
-  filters: ['_id', 'name'],
+  filters: ['_id','name','createdAt','updatedAt','_reference'],
   sorters: ['name', 'createdAt', 'updatedAt', '_id'],
   properties: [
     {
diff --git a/src/database/models/ProductSku.js b/src/database/models/ProductSku.js
index 96b1315..fba329b 100644
--- a/src/database/models/ProductSku.js
+++ b/src/database/models/ProductSku.js
@@ -83,9 +83,10 @@ export const ProductSku = {
     'product._id',
     'name',
     'cost',
-    'costWithTax',
     'price',
-    'priceWithTax'
+    'createdAt',
+    'updatedAt',
+    '_reference'
   ],
   sorters: [
     'barcode',
diff --git a/src/database/models/ProductStock.js b/src/database/models/ProductStock.js
index a01b6b5..7c14299 100644
--- a/src/database/models/ProductStock.js
+++ b/src/database/models/ProductStock.js
@@ -86,8 +86,24 @@ export const ProductStock = {
       }
     }
   ],
-  filters: ['_id', 'productSku', 'currentQuantity'],
-  sorters: ['productSku', 'currentQuantity'],
+  filters: [
+    'productSku',
+    'state',
+    'currentQuantity',
+    'productSku._id',
+    'stockLocation',
+    'stockLocation._id',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
+  sorters: [
+    'productSku',
+    'currentQuantity',
+    'state',
+    'createdAt',
+    'updatedAt'
+  ],
   columns: [
     '_reference',
     'state',
diff --git a/src/database/models/PurchaseOrder.js b/src/database/models/PurchaseOrder.js
index 6a29212..3986326 100644
--- a/src/database/models/PurchaseOrder.js
+++ b/src/database/models/PurchaseOrder.js
@@ -176,12 +176,18 @@ export const PurchaseOrder = {
   group: ['vendor'],
   filters: [
     'vendor',
+    'state',
+    'value',
+    'vendor._id',
     'totalAmount',
     'totalAmountWithTax',
     'totalTaxAmount',
     'shippingAmount',
     'shippingAmountWithTax',
-    'grandTotalAmount'
+    'grandTotalAmount',
+    'createdAt',
+    'updatedAt',
+    '_reference'
   ],
   sorters: [
     'createdAt',
diff --git a/src/database/models/SalesOrder.js b/src/database/models/SalesOrder.js
index eb7bdf5..e322f46 100644
--- a/src/database/models/SalesOrder.js
+++ b/src/database/models/SalesOrder.js
@@ -173,7 +173,15 @@ export const SalesOrder = {
     }
   ],
   group: ['client'],
-  filters: ['client', 'marketplace'],
+  filters: [
+    'client',
+    'state',
+    'value',
+    'client._id',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
   sorters: ['createdAt', 'state', 'updatedAt'],
   columns: [
     '_reference',
diff --git a/src/database/models/Shipment.js b/src/database/models/Shipment.js
index 0f6be53..d381f9c 100644
--- a/src/database/models/Shipment.js
+++ b/src/database/models/Shipment.js
@@ -115,7 +115,17 @@ export const Shipment = {
     }
   ],
   group: [],
-  filters: ['orderType', 'order', 'state', 'courierService'],
+  filters: [
+    'orderType',
+    'order',
+    'state',
+    'courierService',
+    'order._id',
+    'taxRate',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
   sorters: [
     'createdAt',
     'state',
diff --git a/src/database/models/StockAudit.js b/src/database/models/StockAudit.js
index 234b519..614fab4 100644
--- a/src/database/models/StockAudit.js
+++ b/src/database/models/StockAudit.js
@@ -19,8 +19,16 @@ export const StockAudit = {
     }
   ],
   columns: ['_reference', 'state', 'createdAt', 'updatedAt'],
-  filters: ['_id'],
-  sorters: ['createdAt', 'updatedAt'],
+  filters: [
+    'status',
+    'type',
+    'createdBy',
+    'state',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
+  sorters: ['createdAt','updatedAt','state'],
   group: ['state'],
   properties: [
     {
diff --git a/src/database/models/StockEvent.js b/src/database/models/StockEvent.js
index 8927902..2e66537 100644
--- a/src/database/models/StockEvent.js
+++ b/src/database/models/StockEvent.js
@@ -9,8 +9,14 @@ export const StockEvent = {
   icon: StockEventIcon,
   actions: [],
   columns: ['_reference', 'owner', 'parent', 'value', 'createdAt', 'updatedAt'],
-  filters: ['_id', 'owner', 'parent'],
-  sorters: ['createdAt'],
+  filters: [
+    'owner._id',
+    'parent._id',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
+  sorters: ['createdAt','updatedAt'],
   properties: [
     {
       name: '_id',
diff --git a/src/database/models/StockLocation.js b/src/database/models/StockLocation.js
index c3bb7b1..06674f8 100644
--- a/src/database/models/StockLocation.js
+++ b/src/database/models/StockLocation.js
@@ -19,8 +19,8 @@ export const StockLocation = {
         `/dashboard/inventory/stocklocations/info?stockLocationId=${_id}`
     }
   ],
-  filters: ['_id', 'name'],
-  sorters: ['name', 'createdAt'],
+  filters: ['name','createdAt','updatedAt','_reference'],
+  sorters: ['name','createdAt','updatedAt'],
   columns: ['_reference', 'name', 'address', 'createdAt', 'updatedAt'],
   properties: [
     {
diff --git a/src/database/models/StockTransfer.js b/src/database/models/StockTransfer.js
index e9b374b..328bd02 100644
--- a/src/database/models/StockTransfer.js
+++ b/src/database/models/StockTransfer.js
@@ -86,8 +86,22 @@ export const StockTransfer = {
       }
     }
   ],
-  filters: ['_id', 'name', 'state'],
-  sorters: ['name', 'createdAt', 'postedAt'],
+  filters: [
+    'state',
+    'state.type',
+    'postedAt',
+    'name',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
+  sorters: [
+    'name',
+    'createdAt',
+    'postedAt',
+    'state',
+    'updatedAt'
+  ],
   columns: [
     '_reference',
     'name',
diff --git a/src/database/models/SubJob.js b/src/database/models/SubJob.js
index 17f3a3a..07440f1 100644
--- a/src/database/models/SubJob.js
+++ b/src/database/models/SubJob.js
@@ -40,8 +40,16 @@ export const SubJob = {
     'finishedAt',
     'createdAt'
   ],
-  filters: ['state', '_id', 'job', 'printer'],
-  sorters: ['createdAt', 'state'],
+  filters: [
+    '_id',
+    'job._id',
+    'printer._id',
+    '_reference',
+    'state',
+    'createdAt',
+    'updatedAt'
+  ],
+  sorters: ['createdAt','state','updatedAt'],
   group: ['job'],
   properties: [
     {
diff --git a/src/database/models/TaxRate.js b/src/database/models/TaxRate.js
index 06c189c..eebc8bb 100644
--- a/src/database/models/TaxRate.js
+++ b/src/database/models/TaxRate.js
@@ -71,7 +71,16 @@ export const TaxRate = {
     'country',
     'createdAt'
   ],
-  filters: ['name', '_id', 'rate', 'rateType', 'active', 'country'],
+  filters: [
+    'name',
+    'rate',
+    'rateType',
+    'active',
+    'country',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
   sorters: [
     'name',
     'rate',
@@ -79,7 +88,8 @@ export const TaxRate = {
     'active',
     'country',
     'createdAt',
-    '_id'
+    '_id',
+    'updatedAt'
   ],
   group: ['country', 'rateType'],
   properties: [
diff --git a/src/database/models/TaxRecord.js b/src/database/models/TaxRecord.js
index 5a5dec3..4027923 100644
--- a/src/database/models/TaxRecord.js
+++ b/src/database/models/TaxRecord.js
@@ -72,8 +72,23 @@ export const TaxRecord = {
     'transactionDate',
     'createdAt'
   ],
-  filters: ['taxRate', 'transactionType', 'transaction', 'transactionDate'],
-  sorters: ['transactionDate', 'amount', 'taxAmount', 'createdAt', '_id'],
+  filters: [
+    'taxRate',
+    'transactionType',
+    'transaction',
+    'transactionDate',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
+  sorters: [
+    'transactionDate',
+    'amount',
+    'taxAmount',
+    'createdAt',
+    '_id',
+    'updatedAt'
+  ],
   group: ['transactionType'],
   properties: [
     {
diff --git a/src/database/models/User.js b/src/database/models/User.js
index 208f290..39f7a01 100644
--- a/src/database/models/User.js
+++ b/src/database/models/User.js
@@ -39,8 +39,24 @@ export const User = {
     }
   ],
   columns: ['_reference', 'name', 'username', 'email', 'role', 'createdAt'],
-  filters: ['name', '_id', 'email', 'role'],
-  sorters: ['name', 'email', 'role', 'createdAt', '_id'],
+  filters: [
+    'name',
+    'username',
+    'firstName',
+    'lastName',
+    'email',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
+  sorters: [
+    'name',
+    'email',
+    'role',
+    'createdAt',
+    '_id',
+    'updatedAt'
+  ],
   properties: [
     {
       name: '_id',
diff --git a/src/database/models/Vendor.js b/src/database/models/Vendor.js
index a5e5483..5975e36 100644
--- a/src/database/models/Vendor.js
+++ b/src/database/models/Vendor.js
@@ -73,13 +73,12 @@ export const Vendor = {
     'updatedAt'
   ],
   filters: [
-    'name',
-    '_id',
     'country',
-    'email',
     'active',
     'createdAt',
-    'updatedAt'
+    'updatedAt',
+    'name',
+    '_reference'
   ],
   sorters: [
     'name',