Index: trunk/grails-app/views/taskDetailed/searchCalendar.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/searchCalendar.gsp	(revision 588)
+++ trunk/grails-app/views/taskDetailed/searchCalendar.gsp	(revision 589)
@@ -115,10 +115,24 @@
                                     class="overlayPane"
                                     additionalProperties="id"
-                                    excludeProperties="trash, comment, targetCompletionDate"
-                                    associatedProperties="leadPerson.lastName, leadPerson.firstName, taskPriority.name"
-                                    filterPropertyValues="${['taskPriority.name':[values:TaskPriority.list()],
-                                                                                'leadPerson.lastName':[values:Person.executeQuery('select t.lastName from Person t')],
-                                                                                'leadPerson.firstName':[values:Person.executeQuery('select distinct t.firstName from Person t')],
-                                                                                targetStartDate:[years:2020..2000,precision:'day']]}"/>
+                                    excludeProperties="trash, targetCompletionDate"
+                                    associatedProperties="taskPriority.name,
+                                                                                leadPerson.lastName,
+                                                                                leadPerson.firstName,
+                                                                                taskGroup.name,
+                                                                                associatedAssets.name,
+                                                                                primaryAsset.name,
+                                                                                taskStatus.name,
+                                                                                taskType.name"
+                                    filterPropertyValues="${['taskPriority.name':[values: associatedPropertyValues.taskPriorityList],
+                                                                                'leadPerson.lastName':[values: associatedPropertyValues.lastNameList],
+                                                                                'leadPerson.firstName':[values: associatedPropertyValues.firstNameList],
+                                                                                'taskGroup.name':[values: associatedPropertyValues.taskGroupList],
+                                                                                'associatedAssets.name':[values: associatedPropertyValues.assetList],
+                                                                                'primaryAsset.name':[values: associatedPropertyValues.assetList],
+                                                                                'taskStatus.name':[values: associatedPropertyValues.taskStatusList],
+                                                                                'taskType.name':[values: associatedPropertyValues.taskTypeList],
+                                                                                targetCompletionDate:[years: associatedPropertyValues.yearRange,precision:'day'],
+                                                                                targetStartDate:[years: associatedPropertyValues.yearRange,precision:'day']
+                                                                                ]}"/>
 
             <g:render template="quickSearchPane" />