diff --git a/src/main/java/org/genesys2/server/servlet/controller/SearchController.java b/src/main/java/org/genesys2/server/servlet/controller/SearchController.java
index 2cc3a229c5d832bf508ad2bd7881c2fc8f9461f6..3ca50c357dcbd057b6cbebcc5e36da60887bd729 100644
--- a/src/main/java/org/genesys2/server/servlet/controller/SearchController.java
+++ b/src/main/java/org/genesys2/server/servlet/controller/SearchController.java
@@ -181,6 +181,6 @@ public class SearchController {
 			}
 		}
 
-		return "/search2/index";
+		return "/search/index2";
 	}
 }
diff --git a/src/main/java/org/genesys2/server/servlet/controller/admin/ElasticSearchController.java b/src/main/java/org/genesys2/server/servlet/controller/admin/ElasticSearchController.java
index 980da0ca3a0ec56e568663eee81923785c54119e..404847aa8f0f406a75275b17352beb6f51cff444 100644
--- a/src/main/java/org/genesys2/server/servlet/controller/admin/ElasticSearchController.java
+++ b/src/main/java/org/genesys2/server/servlet/controller/admin/ElasticSearchController.java
@@ -106,7 +106,7 @@ public class ElasticSearchController {
 		elasticService.regenerateIndexes();
 		return "redirect:/admin/elastic/";
 	}
-	
+
 	/**
 	 * Completely recreate Elasticsearch indexes: create, index, re-alias.
 	 *
@@ -126,24 +126,15 @@ public class ElasticSearchController {
 	 * @throws IOException
 	 */
 	@RequestMapping(method = RequestMethod.POST, value = "/action", params = { "reindex=accn", "filter" })
-	public String reindexElasticFiltered(@RequestParam(value = "filter", required = true) String jsonFilter,
-										 @RequestParam(value = "type", required = true) String type) throws IOException {
+	public String reindexElasticFiltered(@RequestParam(value = "filter", required = true) String jsonFilter) throws IOException {
 
 		FilterHandler.AppliedFilters filters = mapper.readValue(jsonFilter, FilterHandler.AppliedFilters.class);
 
-		if (type.equals("All")) {
-			elasticService.reindex(filters);
-			fullTextSearchService.regenerateIndexes();
-		} else if (type.equals(Accession.class.getName())) {
-			elasticService.reindex(filters);
-		} else {
-			fullTextSearchService.reindex(type);
-		}
+		elasticService.reindex(filters);
 
 		return "redirect:/admin/elastic/";
 	}
 
-
 	/**
 	 * This method refreshes data in the currently active index. It is very
 	 * handy when having to refresh part of ES after direct database update.
@@ -163,7 +154,6 @@ public class ElasticSearchController {
 		return "redirect:/admin/elastic/";
 	}
 
-	
 	/**
 	 * Clear ES queue
 	 *
diff --git a/src/main/webapp/WEB-INF/jsp/search2/index.jsp b/src/main/webapp/WEB-INF/jsp/search/index2.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/jsp/search2/index.jsp
rename to src/main/webapp/WEB-INF/jsp/search/index2.jsp