Index: trunk/grails-app/views/taskDetailed/search.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/search.gsp	(revision 585)
+++ trunk/grails-app/views/taskDetailed/search.gsp	(revision 586)
@@ -92,13 +92,13 @@
                                                                                                 params="${filterParams}" />
 
-                                <g:sortableColumn property="id" title="Id" params="${filterParams}" />
-
                                 <g:sortableColumn property="targetStartDate" title="Target Start Date" params="${filterParams}" />
 
                                 <g:sortableColumn property="description" title="Description" params="${filterParams}" />
 
+                                <g:sortableColumn property="taskGroup" title="Group" params="${filterParams}" />
+
+                                <g:sortableColumn  property="taskType" title="Type" params="${filterParams}" />
+
                                 <g:sortableColumn  property="taskPriority" title="Priority" params="${filterParams}" />
-
-                                <g:sortableColumn  property="taskType" title="Type" params="${filterParams}" />
 
                                 <g:sortableColumn  property="taskStatus" title="Status" params="${filterParams}" />
@@ -123,8 +123,4 @@
                                 </td>
 
-                                <td class="idColumn" onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'>
-                                    ${fieldValue(bean:taskInstance, field:'id')}
-                                </td>
-
                                 <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'>
                                     <g:formatDate date="${taskInstance.targetStartDate}" format="EEE, dd-MMM-yyyy"/>
@@ -132,5 +128,8 @@
 
                                 <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'>
-                                    <b>${fieldValue(bean:taskInstance, field:'description')}</b>
+                                    <b>
+                                        Task #${fieldValue(bean:taskInstance, field:'id')}<br />
+                                        ${fieldValue(bean:taskInstance, field:'description')}
+                                    </b>
                                     <br />
                                     <br />
@@ -138,5 +137,4 @@
                                         ${fieldValue(bean:taskInstance, field:'primaryAsset')}<br />
                                     </g:if>
-                                    ${fieldValue(bean:taskInstance, field:'taskGroup')}<br />
                                     <g:each in="${taskInstance.assignedGroups}" status="j" var="assignedGroup">
                                         ${assignedGroup.encodeAsHTML()}<br />
@@ -145,12 +143,24 @@
                                         ${assignedPerson.encodeAsHTML()}<br />
                                     </g:each>
+                                    <g:each in="${taskInstance.entries}" status="m" var="entry">
+                                        <g:if test="${entry.entryType.id == 3}">
+                                            <em>${'WD: ' +entry.toShortString().encodeAsHTML()}</em><br />
+                                        </g:if>
+                                    </g:each>
+                                    <g:if test="${taskInstance.subTasks}">
+                                        Sub Tasks: ${taskInstance.subTasks.size()}<br />
+                                    </g:if>
+                                </td>
+
+                                <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'>
+                                    ${fieldValue(bean:taskInstance, field:'taskGroup')}
+                                </td>
+
+                                <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'>
+                                    ${fieldValue(bean:taskInstance, field:'taskType')}
                                 </td>
 
                                 <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'>
                                     ${fieldValue(bean:taskInstance, field:'taskPriority')}
-                                </td>
-
-                                <td onclick='window.location = "${request.getContextPath()}/taskDetailed/show/${taskInstance.id}"'>
-                                    ${fieldValue(bean:taskInstance, field:'taskType')}
                                 </td>