Index: trunk/grails-app/views/assetDetailed/search.gsp
===================================================================
--- trunk/grails-app/views/assetDetailed/search.gsp	(revision 355)
+++ trunk/grails-app/views/assetDetailed/search.gsp	(revision 356)
@@ -87,7 +87,9 @@
 
             <g:if test="${assetInstanceList.size() > 10}">
-                <div class="paginateButtons">
-                    <g:paginate total="${assetInstanceTotal}" params="${filterParams}" />
-                </div>
+                <g:if test="${assetInstanceTotal > assetInstanceList.size()}">
+                    <div class="paginateButtons">
+                        <g:paginate total="${assetInstanceTotal}" params="${filterParams}" />
+                    </div>
+                </g:if>
             </g:if>
 
Index: trunk/grails-app/views/assetSubItemDetailed/search.gsp
===================================================================
--- trunk/grails-app/views/assetSubItemDetailed/search.gsp	(revision 355)
+++ trunk/grails-app/views/assetSubItemDetailed/search.gsp	(revision 356)
@@ -31,4 +31,48 @@
                 </span>
             </div>
+
+            <jsUtil:toggleControl toggleId="options"
+                                                    imageId="optionsImg"
+                                                    closedImgUrl="${resource(dir:'images/skin',file:'bullet_arrow_right.png')}"
+                                                    openImgUrl="${resource(dir:'images/skin',file:'bullet_arrow_down.png')}"
+                                                    text="${g.message(code: 'default.options.text')}"
+                                                    />
+
+            <div id="options" style="display:none;">
+                <g:form method="post">
+                    <g:hiddenField name="params" value="${filterParams}" />
+                    <div class="dialog">
+                        <table>
+                            <tbody>
+
+                                <tr class="prop">
+                                    <td valign="top" class="name">
+                                        <label for="max">Results per page:</label>
+                                    </td>
+                                    <td valign="top" class="value">
+                                        <input type="text" maxlength="4" id="description" name="newMax" value="${params.max}"/>
+
+                                        <span class="buttons">
+                                            <g:actionSubmit action="setSearchParamsMax" class="go" value="Update" />
+                                        </span>
+                                    </td>
+                                </tr>
+
+                            </tbody>
+                        </table>
+                    </div>
+                </g:form>
+                <export:formats  params="${filterParams}" formats="['csv', 'excel', 'pdf', 'rtf']"/>
+            </div>
+
+            <br />
+
+            <g:if test="${assetSubItemInstanceList.size() > 10}">
+                <g:if test="${assetSubItemInstanceTotal > assetSubItemInstanceList.size()}">
+                    <div class="paginateButtons">
+                        <g:paginate total="${assetSubItemInstanceTotal}" params="${filterParams}" />
+                    </div>
+                </g:if>
+            </g:if>
 
             <div class="list">
@@ -76,6 +120,4 @@
             </div>
 
-            <export:formats  params="${filterParams}" formats="['csv', 'excel', 'pdf', 'rtf']"/>
-
             <filterpane:filterPane domainBean="AssetSubItem"
                                     title="Search"
Index: trunk/grails-app/views/taskDetailed/search.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/search.gsp	(revision 355)
+++ trunk/grails-app/views/taskDetailed/search.gsp	(revision 356)
@@ -79,7 +79,9 @@
 
             <g:if test="${taskInstanceList.size() > 10}">
-                <div class="paginateButtons">
-                    <g:paginate total="${taskInstanceTotal}" params="${filterParams}" />
-                </div>
+                <g:if test="${taskInstanceTotal > taskInstanceList.size()}">
+                    <div class="paginateButtons">
+                        <g:paginate total="${taskInstanceTotal}" params="${filterParams}" />
+                    </div>
+                </g:if>
             </g:if>