Index: trunk/grails-app/views/inventoryItemDetailed/search.gsp
===================================================================
--- trunk/grails-app/views/inventoryItemDetailed/search.gsp	(revision 552)
+++ trunk/grails-app/views/inventoryItemDetailed/search.gsp	(revision 554)
@@ -187,8 +187,8 @@
                                                                             preferredManufacturer.name,
                                                                             preferredSupplier.name"
-                                    filterPropertyValues="${['inventoryLocation.name':[values:InventoryLocation.findAllByIsActive(true, [max:10000, sort:'name'])],
-                                                                                'spareFor.name':[values:Asset.findAllByIsActive(true, [max:10000, sort:'name'])],
-                                                                                'preferredManufacturer.name':[values:Manufacturer.findAllByIsActive(true, [max:10000, sort:'name'])],
-                                                                                'preferredSupplier.name':[values:Supplier.findAllByIsActive(true, [max:10000, sort:'name'])],
+                                    filterPropertyValues="${['inventoryLocation.name':[values: associatedPropertyValues.inventoryLocationList],
+                                                                                'spareFor.name':[values: associatedPropertyValues.assetList],
+                                                                                'preferredManufacturer.name':[values: associatedPropertyValues.manufacturerList],
+                                                                                'preferredSupplier.name':[values: associatedPropertyValues.supplierList]
                                                                                 ]}"/>
         </div> <!-- end body div -->