diff --git a/src/main/webapp/WEB-INF/orig/view/index.jsp b/src/main/webapp/WEB-INF/orig/view/index.jsp
index fe7df9b80..5e406544c 100644
--- a/src/main/webapp/WEB-INF/orig/view/index.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/index.jsp
@@ -81,11 +81,11 @@
 									<c:forEach var="item" varStatus="s" items="${popularWords}">
 										<c:if test="${s.index < 3}">
 											<la:link
-												href="/search/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
+												href="/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
 										</c:if>
 										<c:if test="${3 <= s.index}">
 											<la:link styleClass="hidden-xs"
-												href="/search/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
+												href="/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
 										</c:if>
 									</c:forEach>
 								</p>
diff --git a/src/main/webapp/WEB-INF/orig/view/search.jsp b/src/main/webapp/WEB-INF/orig/view/search.jsp
index 74357f889..279d513ae 100644
--- a/src/main/webapp/WEB-INF/orig/view/search.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/search.jsp
@@ -97,11 +97,11 @@
 						<c:forEach var="item" varStatus="s" items="${popularWords}">
 							<c:if test="${s.index < 3}">
 								<la:link
-									href="/search/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
+									href="/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
 							</c:if>
 							<c:if test="${3 <= s.index}">
 								<la:link styleClass="hidden-xs"
-									href="/search/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
+									href="/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
 							</c:if>
 						</c:forEach>
 					</p>
diff --git a/src/main/webapp/WEB-INF/orig/view/searchResults.jsp b/src/main/webapp/WEB-INF/orig/view/searchResults.jsp
index b838a3b1f..7742f617b 100644
--- a/src/main/webapp/WEB-INF/orig/view/searchResults.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/searchResults.jsp
@@ -118,7 +118,7 @@
 							<c:if
 								test="${countEntry.value != 0 && fe:labelexists(countEntry.key)}">
 								<li class="list-group-item"><la:link
-										href="/search/search?q=${f:u(q)}&ex_q=label%3a${f:u(countEntry.key)}${fe:pagingQuery(null)}${fe:facetQuery()}${fe:geoQuery()}">
+										href="/search?q=${f:u(q)}&ex_q=label%3a${f:u(countEntry.key)}${fe:pagingQuery(null)}${fe:facetQuery()}${fe:geoQuery()}">
 											${f:h(fe:label(countEntry.key))} 
 											<span class="label label-default label-pill pull-right">${f:h(countEntry.value)}</span>
 									</la:link></li>
@@ -134,7 +134,7 @@
 					<c:forEach var="queryEntry" items="${facetQueryView.queryMap}">
 						<c:if test="${facetResponse.queryCountMap[queryEntry.value] != 0}">
 							<li class="list-group-item p-l-md"><la:link
-									href="/search/search?q=${f:u(q)}&ex_q=${f:u(queryEntry.value)}${fe:pagingQuery(queryEntry.value)}${fe:facetQuery()}${fe:geoQuery()}">
+									href="/search?q=${f:u(q)}&ex_q=${f:u(queryEntry.value)}${fe:pagingQuery(queryEntry.value)}${fe:facetQuery()}${fe:geoQuery()}">
 									<la:message key="${queryEntry.key}" />
 									<span class="label label-default label-pill pull-right">${f:h(facetResponse.queryCountMap[queryEntry.value])}</span>
 								</la:link></li>
@@ -144,7 +144,7 @@
 			</c:forEach>
 			<c:if test="${!empty ex_q}">
 				<div class="pull-right">
-					<la:link href="/search/search?q=${f:u(q)}"
+					<la:link href="/search?q=${f:u(q)}"
 						styleClass="btn btn-secondary btn-sm">
 						<la:message key="labels.facet_label_reset" />
 					</la:link>
diff --git a/src/main/webapp/WEB-INF/view/index.jsp b/src/main/webapp/WEB-INF/view/index.jsp
index fe7df9b80..5e406544c 100644
--- a/src/main/webapp/WEB-INF/view/index.jsp
+++ b/src/main/webapp/WEB-INF/view/index.jsp
@@ -81,11 +81,11 @@
 									<c:forEach var="item" varStatus="s" items="${popularWords}">
 										<c:if test="${s.index < 3}">
 											<la:link
-												href="/search/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
+												href="/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
 										</c:if>
 										<c:if test="${3 <= s.index}">
 											<la:link styleClass="hidden-xs"
-												href="/search/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
+												href="/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
 										</c:if>
 									</c:forEach>
 								</p>
diff --git a/src/main/webapp/WEB-INF/view/search.jsp b/src/main/webapp/WEB-INF/view/search.jsp
index 74357f889..279d513ae 100644
--- a/src/main/webapp/WEB-INF/view/search.jsp
+++ b/src/main/webapp/WEB-INF/view/search.jsp
@@ -97,11 +97,11 @@
 						<c:forEach var="item" varStatus="s" items="${popularWords}">
 							<c:if test="${s.index < 3}">
 								<la:link
-									href="/search/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
+									href="/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
 							</c:if>
 							<c:if test="${3 <= s.index}">
 								<la:link styleClass="hidden-xs"
-									href="/search/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
+									href="/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)}</la:link>
 							</c:if>
 						</c:forEach>
 					</p>
diff --git a/src/main/webapp/WEB-INF/view/searchResults.jsp b/src/main/webapp/WEB-INF/view/searchResults.jsp
index b838a3b1f..7742f617b 100644
--- a/src/main/webapp/WEB-INF/view/searchResults.jsp
+++ b/src/main/webapp/WEB-INF/view/searchResults.jsp
@@ -118,7 +118,7 @@
 							<c:if
 								test="${countEntry.value != 0 && fe:labelexists(countEntry.key)}">
 								<li class="list-group-item"><la:link
-										href="/search/search?q=${f:u(q)}&ex_q=label%3a${f:u(countEntry.key)}${fe:pagingQuery(null)}${fe:facetQuery()}${fe:geoQuery()}">
+										href="/search?q=${f:u(q)}&ex_q=label%3a${f:u(countEntry.key)}${fe:pagingQuery(null)}${fe:facetQuery()}${fe:geoQuery()}">
 											${f:h(fe:label(countEntry.key))} 
 											<span class="label label-default label-pill pull-right">${f:h(countEntry.value)}</span>
 									</la:link></li>
@@ -134,7 +134,7 @@
 					<c:forEach var="queryEntry" items="${facetQueryView.queryMap}">
 						<c:if test="${facetResponse.queryCountMap[queryEntry.value] != 0}">
 							<li class="list-group-item p-l-md"><la:link
-									href="/search/search?q=${f:u(q)}&ex_q=${f:u(queryEntry.value)}${fe:pagingQuery(queryEntry.value)}${fe:facetQuery()}${fe:geoQuery()}">
+									href="/search?q=${f:u(q)}&ex_q=${f:u(queryEntry.value)}${fe:pagingQuery(queryEntry.value)}${fe:facetQuery()}${fe:geoQuery()}">
 									<la:message key="${queryEntry.key}" />
 									<span class="label label-default label-pill pull-right">${f:h(facetResponse.queryCountMap[queryEntry.value])}</span>
 								</la:link></li>
@@ -144,7 +144,7 @@
 			</c:forEach>
 			<c:if test="${!empty ex_q}">
 				<div class="pull-right">
-					<la:link href="/search/search?q=${f:u(q)}"
+					<la:link href="/search?q=${f:u(q)}"
 						styleClass="btn btn-secondary btn-sm">
 						<la:message key="labels.facet_label_reset" />
 					</la:link>