diff --git a/src/main/webapp/WEB-INF/orig/view/error/header.jsp b/src/main/webapp/WEB-INF/orig/view/error/header.jsp
index 786076cf3..34344739b 100755
--- a/src/main/webapp/WEB-INF/orig/view/error/header.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/error/header.jsp
@@ -48,7 +48,7 @@
 										<la:message key="labels.administration" />
 									</la:link>
 								</c:if>
-								<la:link href="/logout" styleClass="dropdown-item">
+								<la:link href="/logout/" styleClass="dropdown-item">
 									<la:message key="labels.logout" />
 								</la:link>
 							</div>
@@ -73,115 +73,22 @@
 	</nav>
 	<div id="searchOptions" class="control-options">
 		<div class="container">
-			<h4 id="searchOptionsLabel">
-				<la:message key="labels.search_options" />
-			</h4>
+			<jsp:include page="../common/searchOptions.jsp" />
 			<div>
-				<fieldset class="form-group">
-					<label for="contentNum"><la:message key="labels.index_num" /></label>
-					<la:select property="num" styleId="numSearchOption"
-							   styleClass="form-control">
-						<option value="">
-							<la:message key="labels.search_result_select_num" />
-						</option>
-						<la:option value="10">10</la:option>
-						<la:option value="20">20</la:option>
-						<la:option value="30">30</la:option>
-						<la:option value="40">40</la:option>
-						<la:option value="50">50</la:option>
-						<la:option value="100">100</la:option>
-					</la:select>
-				</fieldset>
-				<fieldset class="form-group">
-					<label for="contentSort"><la:message
-							key="labels.index_sort" /></label>
-					<la:select property="sort" styleId="sortSearchOption"
-							   styleClass="form-control">
-						<option value="">
-							<la:message key="labels.search_result_select_sort" />
-						</option>
-						<la:option value="score.desc">
-							<la:message key="labels.search_result_sort_score_desc" />
-						</la:option>
-						<la:option value="created.asc">
-							<la:message key="labels.search_result_sort_created_asc" />
-						</la:option>
-						<la:option value="created.desc">
-							<la:message key="labels.search_result_sort_created_desc" />
-						</la:option>
-						<la:option value="content_length.asc">
-							<la:message key="labels.search_result_sort_content_length_asc" />
-						</la:option>
-						<la:option value="content_length.desc">
-							<la:message key="labels.search_result_sort_content_length_desc" />
-						</la:option>
-						<la:option value="last_modified.asc">
-							<la:message key="labels.search_result_sort_last_modified_asc" />
-						</la:option>
-						<la:option value="last_modified.desc">
-							<la:message key="labels.search_result_sort_last_modified_desc" />
-						</la:option>
-						<c:if test="${searchLogSupport}">
-							<la:option value="click_count.asc">
-								<la:message key="labels.search_result_sort_click_count_asc" />
-							</la:option>
-							<la:option value="click_count.desc">
-								<la:message key="labels.search_result_sort_click_count_desc" />
-							</la:option>
-						</c:if>
-						<c:if test="${favoriteSupport}">
-							<la:option value="favorite_count.asc">
-								<la:message key="labels.search_result_sort_favorite_count_asc" />
-							</la:option>
-							<la:option value="favorite_count.desc">
-								<la:message key="labels.search_result_sort_favorite_count_desc" />
-							</la:option>
-						</c:if>
-					</la:select>
-				</fieldset>
-				<fieldset class="form-group">
-					<label for="contentLang"><la:message
-							key="labels.index_lang" /></label>
-					<la:select property="lang" styleId="langSearchOption"
-							   multiple="true" styleClass="form-control">
-						<c:forEach var="item" items="${langItems}">
-							<la:option value="${f:u(item.value)}">
-								${f:h(item.label)}
-							</la:option>
-						</c:forEach>
-					</la:select>
-				</fieldset>
-				<c:if test="${displayLabelTypeItems}">
-					<fieldset class="form-group">
-						<label for="contentLabelType"><la:message
-								key="labels.index_label" /></label>
-						<la:select property="fields.label" styleId="labelTypeSearchOption"
-								   multiple="true" styleClass="form-control">
-							<c:forEach var="item" items="${labelTypeItems}">
-								<la:option value="${f:u(item.value)}">
-									${f:h(item.label)}
-								</la:option>
-							</c:forEach>
-						</la:select>
-					</fieldset>
-				</c:if>
-			</div>
-			<div>
-				<button class="btn btn-secondary" id="searchOptionsClearButton">
+				<button type="button" class="btn btn-secondary" id="searchOptionsClearButton">
 					<la:message key="labels.search_options_clear" />
 				</button>
-				<button class="btn btn-primary" type="submit">
+				<button type="submit" class="btn btn-primary">
 					<i class="fa fa-search"></i>
 					<la:message key="labels.search" />
 				</button>
-				<button class="btn btn-secondary pull-right"
-						data-toggle="control-options" data-target="#searchOptions"
-						id="searchOptionsCloseButton">
-					<i class="fa fa-angle-double-right"></i>
+				<button type="button" class="btn btn-secondary pull-right"
+					data-toggle="control-options" data-target="#searchOptions"
+					id="searchOptionsCloseButton">
+					<i class="fa fa-times-circle"></i>
 					<la:message key="labels.search_options_close" />
 				</button>
 			</div>
 		</div>
 	</div>
-	<!--  /#searchOptions -->
 </la:form>
diff --git a/src/main/webapp/WEB-INF/orig/view/header.jsp b/src/main/webapp/WEB-INF/orig/view/header.jsp
index 84c41d79a..cf6f4aa7f 100755
--- a/src/main/webapp/WEB-INF/orig/view/header.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/header.jsp
@@ -48,7 +48,7 @@ ${fe:facetForm()}${fe:geoForm()}
 										<la:message key="labels.administration" />
 									</la:link>
 								</c:if>
-								<la:link href="/logout" styleClass="dropdown-item">
+								<la:link href="/logout/" styleClass="dropdown-item">
 									<la:message key="labels.logout" />
 								</la:link>
 							</div>
@@ -73,115 +73,22 @@ ${fe:facetForm()}${fe:geoForm()}
 	</nav>
 	<div id="searchOptions" class="control-options">
 		<div class="container">
-			<h4 id="searchOptionsLabel">
-				<la:message key="labels.search_options" />
-			</h4>
+			<jsp:include page="common/searchOptions.jsp" />
 			<div>
-				<fieldset class="form-group">
-					<label for="contentNum"><la:message key="labels.index_num" /></label>
-					<la:select property="num" styleId="numSearchOption"
-						styleClass="form-control">
-						<option value="">
-							<la:message key="labels.search_result_select_num" />
-						</option>
-						<la:option value="10">10</la:option>
-						<la:option value="20">20</la:option>
-						<la:option value="30">30</la:option>
-						<la:option value="40">40</la:option>
-						<la:option value="50">50</la:option>
-						<la:option value="100">100</la:option>
-					</la:select>
-				</fieldset>
-				<fieldset class="form-group">
-					<label for="contentSort"><la:message
-							key="labels.index_sort" /></label>
-					<la:select property="sort" styleId="sortSearchOption"
-						styleClass="form-control">
-						<option value="">
-							<la:message key="labels.search_result_select_sort" />
-						</option>
-						<la:option value="score.desc">
-							<la:message key="labels.search_result_sort_score_desc" />
-						</la:option>
-						<la:option value="created.asc">
-							<la:message key="labels.search_result_sort_created_asc" />
-						</la:option>
-						<la:option value="created.desc">
-							<la:message key="labels.search_result_sort_created_desc" />
-						</la:option>
-						<la:option value="content_length.asc">
-							<la:message key="labels.search_result_sort_content_length_asc" />
-						</la:option>
-						<la:option value="content_length.desc">
-							<la:message key="labels.search_result_sort_content_length_desc" />
-						</la:option>
-						<la:option value="last_modified.asc">
-							<la:message key="labels.search_result_sort_last_modified_asc" />
-						</la:option>
-						<la:option value="last_modified.desc">
-							<la:message key="labels.search_result_sort_last_modified_desc" />
-						</la:option>
-						<c:if test="${searchLogSupport}">
-							<la:option value="click_count.asc">
-								<la:message key="labels.search_result_sort_click_count_asc" />
-							</la:option>
-							<la:option value="click_count.desc">
-								<la:message key="labels.search_result_sort_click_count_desc" />
-							</la:option>
-						</c:if>
-						<c:if test="${favoriteSupport}">
-							<la:option value="favorite_count.asc">
-								<la:message key="labels.search_result_sort_favorite_count_asc" />
-							</la:option>
-							<la:option value="favorite_count.desc">
-								<la:message key="labels.search_result_sort_favorite_count_desc" />
-							</la:option>
-						</c:if>
-					</la:select>
-				</fieldset>
-				<fieldset class="form-group">
-					<label for="contentLang"><la:message
-							key="labels.index_lang" /></label>
-					<la:select property="lang" styleId="langSearchOption"
-						multiple="true" styleClass="form-control">
-						<c:forEach var="item" items="${langItems}">
-							<la:option value="${f:u(item.value)}">
-													${f:h(item.label)}
-												</la:option>
-						</c:forEach>
-					</la:select>
-				</fieldset>
-				<c:if test="${displayLabelTypeItems}">
-					<fieldset class="form-group">
-						<label for="contentLabelType"><la:message
-								key="labels.index_label" /></label>
-						<la:select property="fields.label" styleId="labelTypeSearchOption"
-							multiple="true" styleClass="form-control">
-							<c:forEach var="item" items="${labelTypeItems}">
-								<la:option value="${f:u(item.value)}">
-														${f:h(item.label)}
-													</la:option>
-							</c:forEach>
-						</la:select>
-					</fieldset>
-				</c:if>
-			</div>
-			<div>
-				<button class="btn btn-secondary" id="searchOptionsClearButton">
+				<button type="button" class="btn btn-secondary" id="searchOptionsClearButton">
 					<la:message key="labels.search_options_clear" />
 				</button>
-				<button class="btn btn-primary" type="submit">
+				<button type="submit" class="btn btn-primary">
 					<i class="fa fa-search"></i>
 					<la:message key="labels.search" />
 				</button>
-				<button class="btn btn-secondary pull-right"
+				<button type="button" class="btn btn-secondary pull-right"
 					data-toggle="control-options" data-target="#searchOptions"
 					id="searchOptionsCloseButton">
-					<i class="fa fa-angle-double-right"></i>
+					<i class="fa fa-times-circle"></i>
 					<la:message key="labels.search_options_close" />
 				</button>
 			</div>
 		</div>
 	</div>
-	<!--  /#searchOptions -->
 </la:form>
diff --git a/src/main/webapp/WEB-INF/orig/view/index.jsp b/src/main/webapp/WEB-INF/orig/view/index.jsp
index 0ee1bad37..3ebf54863 100644
--- a/src/main/webapp/WEB-INF/orig/view/index.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/index.jsp
@@ -18,71 +18,71 @@
 	type="text/css" />
 </head>
 <body>
-	<nav class="navbar navbar-dark bg-inverse navbar-static-top pos-f-t">
-		<div class="container">
-			<ul class="nav navbar-nav pull-right">
-				<c:choose>
-					<c:when test="${!empty username && username != 'guest'}">
-						<li class="nav-item">
-							<div class="dropdown">
-								<a class="nav-link dropdown-toggle" data-toggle="dropdown"
-									href="#" role="button" aria-haspopup="true"
-									aria-expanded="false"> <i class="fa fa-user"></i>${username}
-								</a>
-								<div class="dropdown-menu" aria-labelledby="userMenu">
-									<c:if test="${editableUser == true}">
-										<la:link href="/profile" styleClass="dropdown-item">
-											<la:message key="labels.profile" />
+	<la:form styleClass="form-stacked" action="search" method="get"
+		styleId="searchForm">
+		${fe:facetForm()}${fe:geoForm()}
+		<nav class="navbar navbar-dark bg-inverse navbar-static-top pos-f-t">
+			<div id="content" class="container">
+				<ul class="nav navbar-nav pull-right">
+					<c:choose>
+						<c:when test="${!empty username && username != 'guest'}">
+							<li class="nav-item">
+								<div class="dropdown">
+									<a class="nav-link dropdown-toggle" data-toggle="dropdown"
+										href="#" role="button" aria-haspopup="true"
+										aria-expanded="false"> <i class="fa fa-user"></i>${username}
+									</a>
+									<div class="dropdown-menu" aria-labelledby="userMenu">
+										<c:if test="${editableUser == true}">
+											<la:link href="/profile" styleClass="dropdown-item">
+												<la:message key="labels.profile" />
+											</la:link>
+										</c:if>
+										<c:if test="${adminUser == true}">
+											<la:link href="/admin" styleClass="dropdown-item">
+												<la:message key="labels.administration" />
+											</la:link>
+										</c:if>
+										<la:link href="/logout/" styleClass="dropdown-item">
+											<la:message key="labels.logout" />
 										</la:link>
-									</c:if>
-									<c:if test="${adminUser == true}">
-										<la:link href="/admin" styleClass="dropdown-item">
-											<la:message key="labels.administration" />
-										</la:link>
-									</c:if>
-									<la:link href="/logout" styleClass="dropdown-item">
-										<la:message key="labels.logout" />
-									</la:link>
+									</div>
 								</div>
-							</div>
-						</li>
-					</c:when>
-					<c:when test="${ pageLoginLink }">
-						<li class="nav-item username"><la:link href="/login"
-								styleClass="nav-link" role="button" aria-haspopup="true"
-								aria-expanded="false">
-								<i class="fa fa-sign-in"></i>
-								<la:message key="labels.login" />
-							</la:link></li>
-					</c:when>
-				</c:choose>
-				<li class="nav-item"><la:link href="/help"
-						styleClass="nav-link help-link">
-						<i class="fa fa-question-circle"></i>
-						<la:message key="labels.index_help" />
-					</la:link></li>
-			</ul>
-		</div>
-	</nav>
-	<div class="container">
-		<div class="row content">
-			<div class="center-block searchFormBox">
-				<h1 class="mainLogo">
-					<img src="${f:url('/images/logo.png')}"
-						alt="<la:message key="labels.index_title" />" />
-				</h1>
-				<div class="notification">${notification}</div>
-				<div>
-					<la:info id="msg" message="true">
-						<div class="alert alert-info">${msg}</div>
-					</la:info>
-					<la:errors header="errors.front_header"
-						footer="errors.front_footer" prefix="errors.front_prefix"
-						suffix="errors.front_suffix" />
-				</div>
-				<la:form styleClass="form-stacked" action="search" method="get"
-					styleId="searchForm">
-					${fe:facetForm()}${fe:geoForm()}
+							</li>
+						</c:when>
+						<c:when test="${ pageLoginLink }">
+							<li class="nav-item username"><la:link href="/login"
+									styleClass="nav-link" role="button" aria-haspopup="true"
+									aria-expanded="false">
+									<i class="fa fa-sign-in"></i>
+									<la:message key="labels.login" />
+								</la:link></li>
+						</c:when>
+					</c:choose>
+					<li class="nav-item"><la:link href="/help"
+							styleClass="nav-link help-link">
+							<i class="fa fa-question-circle"></i>
+							<la:message key="labels.index_help" />
+						</la:link></li>
+				</ul>
+			</div>
+		</nav>
+		<div class="container">
+			<div class="row content">
+				<div class="center-block searchFormBox">
+					<h1 class="mainLogo">
+						<img src="${f:url('/images/logo.png')}"
+							alt="<la:message key="labels.index_title" />" />
+					</h1>
+					<div class="notification">${notification}</div>
+					<div>
+						<la:info id="msg" message="true">
+							<div class="alert alert-info">${msg}</div>
+						</la:info>
+						<la:errors header="errors.front_header"
+							footer="errors.front_footer" prefix="errors.front_prefix"
+							suffix="errors.front_suffix" />
+					</div>
 					<fieldset>
 						<div class="clearfix">
 							<div class="centered col-lg-5 col-md-6 col-sm-6 col-xs-8">
@@ -115,141 +115,34 @@
 								<la:message key="labels.index_form_search_btn" />
 							</button>
 							<button type="button" class="btn btn-secondary"
-								data-toggle="modal" data-target="#searchOptions">
+								data-toggle="control-options" data-target="#searchOptions"
+								id="searchOptionsButton">
 								<i class="fa fa-cog"></i>
 								<la:message key="labels.index_form_option_btn" />
 							</button>
 						</div>
 					</fieldset>
-					<div class="modal fade" id="searchOptions" tabindex="-1"
-						role="dialog" aria-labelledby="searchOptionsLabel"
-						aria-hidden="true">
-						<div class="modal-dialog" role="document">
-							<div class="modal-content">
-								<div class="modal-header">
-									<button type="button" class="close" data-dismiss="modal"
-										aria-label="Close">
-										<span aria-hidden="true">&times;</span> <span class="sr-only">Close</span>
-									</button>
-									<h4 class="modal-title" id="searchOptionsLabel">
-										<la:message key="labels.search_options" />
-									</h4>
-								</div>
-								<div class="modal-body">
-									<fieldset class="form-group">
-										<label for="contentNum"><la:message
-												key="labels.index_num" /></label>
-										<la:select property="num" styleId="numSearchOption"
-											styleClass="form-control">
-											<option value="">
-												<la:message key="labels.search_result_select_num" />
-											</option>
-											<la:option value="10">10</la:option>
-											<la:option value="20">20</la:option>
-											<la:option value="30">30</la:option>
-											<la:option value="40">40</la:option>
-											<la:option value="50">50</la:option>
-											<la:option value="100">100</la:option>
-										</la:select>
-									</fieldset>
-									<fieldset class="form-group">
-										<label for="contentSort"><la:message
-												key="labels.index_sort" /></label>
-										<la:select property="sort" styleId="sortSearchOption"
-											styleClass="form-control">
-											<option value="">
-												<la:message key="labels.search_result_select_sort" />
-											</option>
-											<la:option value="score.desc">
-												<la:message key="labels.search_result_sort_score_desc" />
-											</la:option>
-											<la:option value="created.asc">
-												<la:message key="labels.search_result_sort_created_asc" />
-											</la:option>
-											<la:option value="created.desc">
-												<la:message key="labels.search_result_sort_created_desc" />
-											</la:option>
-											<la:option value="content_length.asc">
-												<la:message
-													key="labels.search_result_sort_content_length_asc" />
-											</la:option>
-											<la:option value="content_length.desc">
-												<la:message
-													key="labels.search_result_sort_content_length_desc" />
-											</la:option>
-											<la:option value="last_modified.asc">
-												<la:message
-													key="labels.search_result_sort_last_modified_asc" />
-											</la:option>
-											<la:option value="last_modified.desc">
-												<la:message
-													key="labels.search_result_sort_last_modified_desc" />
-											</la:option>
-											<c:if test="${searchLogSupport}">
-												<la:option value="click_count.asc">
-													<la:message key="labels.search_result_sort_click_count_asc" />
-												</la:option>
-												<la:option value="click_count.desc">
-													<la:message
-														key="labels.search_result_sort_click_count_desc" />
-												</la:option>
-											</c:if>
-											<c:if test="${favoriteSupport}">
-												<la:option value="favorite_count.asc">
-													<la:message
-														key="labels.search_result_sort_favorite_count_asc" />
-												</la:option>
-												<la:option value="favorite_count.desc">
-													<la:message
-														key="labels.search_result_sort_favorite_count_desc" />
-												</la:option>
-											</c:if>
-										</la:select>
-									</fieldset>
-									<fieldset class="form-group">
-										<label for="contentLang"><la:message
-												key="labels.index_lang" /></label>
-										<la:select property="lang" styleId="langSearchOption"
-											multiple="true" styleClass="form-control">
-											<c:forEach var="item" items="${langItems}">
-												<la:option value="${f:u(item.value)}">
-																	${f:h(item.label)}
-																</la:option>
-											</c:forEach>
-										</la:select>
-									</fieldset>
-									<c:if test="${displayLabelTypeItems}">
-										<fieldset class="form-group">
-											<label for="contentLabelType"><la:message
-													key="labels.index_label" /></label>
-											<la:select property="fields.label"
-												styleId="labelTypeSearchOption" multiple="true"
-												styleClass="form-control">
-												<c:forEach var="item" items="${labelTypeItems}">
-													<la:option value="${f:u(item.value)}">
-														${f:h(item.label)}
-													</la:option>
-												</c:forEach>
-											</la:select>
-										</fieldset>
-									</c:if>
-								</div>
-								<div class="modal-footer">
-									<button class="btn btn-secondary" id="searchOptionsClearButton">
-										<la:message key="labels.search_options_clear" />
-									</button>
-									<button class="btn btn-secondary" data-dismiss="modal">
-										<la:message key="labels.search_options_close" />
-									</button>
-								</div>
-							</div>
-						</div>
-					</div>
-				</la:form>
+				</div>
+			</div>
+			<jsp:include page="footer.jsp" />
+		</div>
+		<div id="searchOptions" class="control-options">
+			<div class="container">
+				<jsp:include page="common/searchOptions.jsp" />
+				<div>
+					<button type="button" class="btn btn-secondary" id="searchOptionsClearButton">
+						<la:message key="labels.search_options_clear" />
+					</button>
+					<button type="button" class="btn btn-secondary pull-right"
+						data-toggle="control-options" data-target="#searchOptions"
+						id="searchOptionsCloseButton">
+						<i class="fa fa-times-circle"></i>
+						<la:message key="labels.search_options_close" />
+					</button>
+				</div>
 			</div>
 		</div>
-		<jsp:include page="footer.jsp" />
-	</div>
+	</la:form>
 	<input type="hidden" id="contextPath" value="${contextPath}" />
 	<script type="text/javascript"
 		src="${f:url('/js/jquery-2.2.4.min.js')}"></script>
diff --git a/src/main/webapp/WEB-INF/orig/view/search.jsp b/src/main/webapp/WEB-INF/orig/view/search.jsp
index c31c528ed..ecfd7c8c9 100644
--- a/src/main/webapp/WEB-INF/orig/view/search.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/search.jsp
@@ -20,7 +20,7 @@
 </head>
 <body class="search">
 	<jsp:include page="header.jsp" />
-	<div class="container">
+	<div id="content" class="container">
 		<div class="row">
 			<div class="col-md-12">
 				<ul class="searchOptionLabels">
@@ -30,6 +30,10 @@
 								<la:message key="labels.searchoptions_score" />
 							</c:if> <c:if test="${sort=='score.desc'}">
 								<la:message key="labels.searchoptions_score" />
+							</c:if> <c:if test="${sort=='filename.asc'}">
+								<la:message key="labels.search_result_sort_filename_asc" />
+							</c:if> <c:if test="${sort=='filename.desc'}">
+								<la:message key="labels.search_result_sort_filename_desc" />
 							</c:if> <c:if test="${sort=='created.asc'}">
 								<la:message key="labels.search_result_sort_created_asc" />
 							</c:if> <c:if test="${sort=='created.desc'}">
diff --git a/src/main/webapp/WEB-INF/orig/view/searchResults.jsp b/src/main/webapp/WEB-INF/orig/view/searchResults.jsp
index 84c9e76b0..6bf037ee9 100644
--- a/src/main/webapp/WEB-INF/orig/view/searchResults.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/searchResults.jsp
@@ -32,7 +32,8 @@
 							<div class="thumbnailBox media-left hidden-xs-down">
 								<a class="link" href="${doc.url_link}"
 									data-uri="${doc.url_link}" data-id="${doc.doc_id}"
-                                    data-order="${s.index}"> <img src="${f:url('/images/blank.png')}"
+									data-order="${s.index}"> <img
+									src="${f:url('/images/blank.png')}"
 									data-src="${f:url('/thumbnail/')}?docId=${f:u(doc.doc_id)}&queryId=${f:u(queryId)}"
 									class="thumbnail">
 								</a>
diff --git a/src/main/webapp/WEB-INF/view/error/header.jsp b/src/main/webapp/WEB-INF/view/error/header.jsp
index ec3610d97..34344739b 100755
--- a/src/main/webapp/WEB-INF/view/error/header.jsp
+++ b/src/main/webapp/WEB-INF/view/error/header.jsp
@@ -73,115 +73,22 @@
 	</nav>
 	<div id="searchOptions" class="control-options">
 		<div class="container">
-			<h4 id="searchOptionsLabel">
-				<la:message key="labels.search_options" />
-			</h4>
+			<jsp:include page="../common/searchOptions.jsp" />
 			<div>
-				<fieldset class="form-group">
-					<label for="contentNum"><la:message key="labels.index_num" /></label>
-					<la:select property="num" styleId="numSearchOption"
-							   styleClass="form-control">
-						<option value="">
-							<la:message key="labels.search_result_select_num" />
-						</option>
-						<la:option value="10">10</la:option>
-						<la:option value="20">20</la:option>
-						<la:option value="30">30</la:option>
-						<la:option value="40">40</la:option>
-						<la:option value="50">50</la:option>
-						<la:option value="100">100</la:option>
-					</la:select>
-				</fieldset>
-				<fieldset class="form-group">
-					<label for="contentSort"><la:message
-							key="labels.index_sort" /></label>
-					<la:select property="sort" styleId="sortSearchOption"
-							   styleClass="form-control">
-						<option value="">
-							<la:message key="labels.search_result_select_sort" />
-						</option>
-						<la:option value="score.desc">
-							<la:message key="labels.search_result_sort_score_desc" />
-						</la:option>
-						<la:option value="created.asc">
-							<la:message key="labels.search_result_sort_created_asc" />
-						</la:option>
-						<la:option value="created.desc">
-							<la:message key="labels.search_result_sort_created_desc" />
-						</la:option>
-						<la:option value="content_length.asc">
-							<la:message key="labels.search_result_sort_content_length_asc" />
-						</la:option>
-						<la:option value="content_length.desc">
-							<la:message key="labels.search_result_sort_content_length_desc" />
-						</la:option>
-						<la:option value="last_modified.asc">
-							<la:message key="labels.search_result_sort_last_modified_asc" />
-						</la:option>
-						<la:option value="last_modified.desc">
-							<la:message key="labels.search_result_sort_last_modified_desc" />
-						</la:option>
-						<c:if test="${searchLogSupport}">
-							<la:option value="click_count.asc">
-								<la:message key="labels.search_result_sort_click_count_asc" />
-							</la:option>
-							<la:option value="click_count.desc">
-								<la:message key="labels.search_result_sort_click_count_desc" />
-							</la:option>
-						</c:if>
-						<c:if test="${favoriteSupport}">
-							<la:option value="favorite_count.asc">
-								<la:message key="labels.search_result_sort_favorite_count_asc" />
-							</la:option>
-							<la:option value="favorite_count.desc">
-								<la:message key="labels.search_result_sort_favorite_count_desc" />
-							</la:option>
-						</c:if>
-					</la:select>
-				</fieldset>
-				<fieldset class="form-group">
-					<label for="contentLang"><la:message
-							key="labels.index_lang" /></label>
-					<la:select property="lang" styleId="langSearchOption"
-							   multiple="true" styleClass="form-control">
-						<c:forEach var="item" items="${langItems}">
-							<la:option value="${f:u(item.value)}">
-								${f:h(item.label)}
-							</la:option>
-						</c:forEach>
-					</la:select>
-				</fieldset>
-				<c:if test="${displayLabelTypeItems}">
-					<fieldset class="form-group">
-						<label for="contentLabelType"><la:message
-								key="labels.index_label" /></label>
-						<la:select property="fields.label" styleId="labelTypeSearchOption"
-								   multiple="true" styleClass="form-control">
-							<c:forEach var="item" items="${labelTypeItems}">
-								<la:option value="${f:u(item.value)}">
-									${f:h(item.label)}
-								</la:option>
-							</c:forEach>
-						</la:select>
-					</fieldset>
-				</c:if>
-			</div>
-			<div>
-				<button class="btn btn-secondary" id="searchOptionsClearButton">
+				<button type="button" class="btn btn-secondary" id="searchOptionsClearButton">
 					<la:message key="labels.search_options_clear" />
 				</button>
-				<button class="btn btn-primary" type="submit">
+				<button type="submit" class="btn btn-primary">
 					<i class="fa fa-search"></i>
 					<la:message key="labels.search" />
 				</button>
-				<button class="btn btn-secondary pull-right"
-						data-toggle="control-options" data-target="#searchOptions"
-						id="searchOptionsCloseButton">
-					<i class="fa fa-angle-double-right"></i>
+				<button type="button" class="btn btn-secondary pull-right"
+					data-toggle="control-options" data-target="#searchOptions"
+					id="searchOptionsCloseButton">
+					<i class="fa fa-times-circle"></i>
 					<la:message key="labels.search_options_close" />
 				</button>
 			</div>
 		</div>
 	</div>
-	<!--  /#searchOptions -->
 </la:form>
diff --git a/src/main/webapp/WEB-INF/view/index.jsp b/src/main/webapp/WEB-INF/view/index.jsp
index 5a9792643..3ebf54863 100644
--- a/src/main/webapp/WEB-INF/view/index.jsp
+++ b/src/main/webapp/WEB-INF/view/index.jsp
@@ -126,22 +126,22 @@
 			</div>
 			<jsp:include page="footer.jsp" />
 		</div>
-	<div id="searchOptions" class="control-options">
-		<div class="container">
-			<jsp:include page="common/searchOptions.jsp" />
-			<div>
-				<button type="button" class="btn btn-secondary" id="searchOptionsClearButton">
-					<la:message key="labels.search_options_clear" />
-				</button>
-				<button type="button" class="btn btn-secondary pull-right"
-					data-toggle="control-options" data-target="#searchOptions"
-					id="searchOptionsCloseButton">
-					<i class="fa fa-times-circle"></i>
-					<la:message key="labels.search_options_close" />
-				</button>
+		<div id="searchOptions" class="control-options">
+			<div class="container">
+				<jsp:include page="common/searchOptions.jsp" />
+				<div>
+					<button type="button" class="btn btn-secondary" id="searchOptionsClearButton">
+						<la:message key="labels.search_options_clear" />
+					</button>
+					<button type="button" class="btn btn-secondary pull-right"
+						data-toggle="control-options" data-target="#searchOptions"
+						id="searchOptionsCloseButton">
+						<i class="fa fa-times-circle"></i>
+						<la:message key="labels.search_options_close" />
+					</button>
+				</div>
 			</div>
 		</div>
-	</div>
 	</la:form>
 	<input type="hidden" id="contextPath" value="${contextPath}" />
 	<script type="text/javascript"
diff --git a/src/main/webapp/WEB-INF/view/searchResults.jsp b/src/main/webapp/WEB-INF/view/searchResults.jsp
index 84c9e76b0..6bf037ee9 100644
--- a/src/main/webapp/WEB-INF/view/searchResults.jsp
+++ b/src/main/webapp/WEB-INF/view/searchResults.jsp
@@ -32,7 +32,8 @@
 							<div class="thumbnailBox media-left hidden-xs-down">
 								<a class="link" href="${doc.url_link}"
 									data-uri="${doc.url_link}" data-id="${doc.doc_id}"
-                                    data-order="${s.index}"> <img src="${f:url('/images/blank.png')}"
+									data-order="${s.index}"> <img
+									src="${f:url('/images/blank.png')}"
 									data-src="${f:url('/thumbnail/')}?docId=${f:u(doc.doc_id)}&queryId=${f:u(queryId)}"
 									class="thumbnail">
 								</a>
diff --git a/src/main/webapp/js/index.js b/src/main/webapp/js/index.js
index 3816f9fef..5044e2e39 100644
--- a/src/main/webapp/js/index.js
+++ b/src/main/webapp/js/index.js
@@ -19,6 +19,7 @@ $(function() {
 	});
 
 	$("[data-toggle='control-options']").click(function(e) {
+		e.preventDefault();
 		var target = $(this).attr('data-target') || $(this).attr('href');
 		if (target) {
 			$(target).toggleClass("active");