diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
index c917ce351..8b43995d9 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
@@ -170,6 +170,7 @@ public class SearchAction
         searchFields.put( "artifactId", "Artifact ID" );
         searchFields.put( "version", "Version" );
         searchFields.put( "className", "Class/Package Name" ); 
+        searchFields.put( "rowCount", "Row Count" );
         
         super.clearErrorsAndMessages();       
         clearSearchFields();
@@ -182,18 +183,14 @@ public class SearchAction
         groupId = "";
         version = "";
         className = "";     
+        rowCount = 30;
         currentPage = 0;
     }
 
     // advanced search MRM-90 -- filtered search
     public String filteredSearch()
         throws MalformedURLException, RepositoryIndexException, RepositoryIndexSearchException
-    {   
-        // TODO: 
-        // - repositories must be provided as a select box instead of as a textfield!
-        // - what about the row count?
-        // - remove advancedSearch.jsp
-        
+    {           
         if ( ( groupId == null || "".equals( groupId ) ) &&
             ( artifactId == null || "".equals( artifactId ) ) && ( className == null || "".equals( className ) ) &&
             ( version == null || "".equals( version ) ) )
@@ -210,7 +207,6 @@ public class SearchAction
         }
 
         SearchResultLimits limits = new SearchResultLimits( currentPage );
-
         limits.setPageSize( rowCount );
         List<String> selectedRepos = new ArrayList<String>();
         
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
index ef195644d..d577b716c 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/results.jsp
@@ -76,57 +76,35 @@
   <div id="searchBoxResults">
 
     <c:if test="${fromFilterSearch == true}">
-    <table>
-    <tr>
-      <td>
-        <b>*</b> To do a filtered or advanced search, select the criteria from the list below and click the <img src="${iconCreateUrl}"/> icon. Specify the term you want to be matched in the created text field.
-      </td>
-    </tr>
-    <tr>
-      <td>
-      <s:form id="filteredSearch" method="get" action="filteredSearch" validate="true">
-         <s:hidden name="fromFilterSearch" value="%{#attr.fromFilterSearch}" theme="simple"/>  
-         <label><strong>Advanced Search Fields: </strong></label><s:select name="searchField" list="searchFields" theme="simple"/> 
-         <s:a href="#" title="Add Search Field" onclick="addSearchField( document.filteredSearch.searchField.options[document.filteredSearch.searchField.selectedIndex].text, document.filteredSearch.searchField.value, 'dynamicFields' )" theme="simple">
-            <img src="${iconCreateUrl}" />
-         </s:a>
-         <table id="dynamicTable">
-           <tr>
-             <td><label>Repository: </td>
-             <td><s:select name="repositoryId" list="managedRepositoryList" theme="simple"/></td> 
-           </tr>          
-           <tr>
-             <td/>
-             <td/>  
-           </tr>
-         </table> 
-         <s:submit value="Search" theme="simple"/>  
-       </s:form>  
-       </td>
-     </tr>
-     </table>
-
-      <%--
-      <s:form method="get" action="filteredSearch" validate="true">
-        <s:textfield label="Row Count" size="50" name="rowCount"/>
-        <s:textfield label="Group Id" size="50" name="groupId"/>
-        <s:textfield label="Artifact Id" size="50" name="artifactId"/>
-        <s:textfield label="Version" size="50" name="version"/>
-        <s:textfield label="Class / Package" size="50" name="className"/>
-        <s:select name="repositoryId" label="Repository ID" list="managedRepositoryList"/>
-        <s:hidden name="completeQueryString" value="%{#attr.completeQueryString}"/>
-        <s:hidden name="fromFilterSearch" value="%{#attr.fromFilterSearch}"/>
-        <s:submit label="Go!"/>
-      </s:form>
-  
-      <s:url id="indexUrl" action="index"/>
-      <s:a href="%{indexUrl}">
-        Quick Search Page
-      </s:a>
-      <script type="text/javascript">
-        document.getElementById("filteredSearch_groupId").focus();
-      </script>
-      --%>
+      <table>
+        <tr>
+          <td>
+            <b>*</b> To do a filtered or advanced search, select the criteria from the list below and click the <img src="${iconCreateUrl}"/> icon. Specify the term you want to be matched in the created text field.
+          </td>
+        </tr>
+        <tr>
+          <td>
+          <s:form id="filteredSearch" method="get" action="filteredSearch" validate="true">
+            <s:hidden name="fromFilterSearch" value="%{#attr.fromFilterSearch}" theme="simple"/>  
+            <label><strong>Advanced Search Fields: </strong></label><s:select name="searchField" list="searchFields" theme="simple"/> 
+            <s:a href="#" title="Add Search Field" onclick="addSearchField( document.filteredSearch.searchField.options[document.filteredSearch.searchField.selectedIndex].text, document.filteredSearch.searchField.value, 'dynamicFields' )" theme="simple">
+              <img src="${iconCreateUrl}" />
+            </s:a>
+            <table id="dynamicTable">
+              <tr>
+                <td><label>Repository: </td>
+                <td><s:select name="repositoryId" list="managedRepositoryList" theme="simple"/></td> 
+              </tr>          
+              <tr>
+                <td/>
+                <td/>  
+              </tr>
+            </table> 
+            <s:submit value="Search" theme="simple"/>  
+          </s:form>  
+          </td>
+        </tr>
+      </table>
     </c:if>
     <c:if test="${fromFilterSearch == false}">
       <s:form method="get" action="quickSearch" validate="true">