diff --git a/src/main/webapp/WEB-INF/view/header.jsp b/src/main/webapp/WEB-INF/view/header.jsp
index af1616974..f0558f809 100755
--- a/src/main/webapp/WEB-INF/view/header.jsp
+++ b/src/main/webapp/WEB-INF/view/header.jsp
@@ -9,7 +9,7 @@ ${fe:facetForm()}${fe:mltForm()}${fe:geoForm()}
 						alt="<bean:message key="labels.header_brand_name" />" />
 				</s:link>
 				<div class="navbar-form pull-right">
-					<html:text property="query" maxlength="1000" styleId="query" />
+					<html:text property="query" maxlength="1000" styleId="query" autocomplete="off"/>
 					<button class="btn medium btn-primary" type="submit" name="search"
 						id="searchButton">
 						<i class="icon-search icon-white"></i><span class="hidden-phone"><bean:message
diff --git a/src/main/webapp/WEB-INF/view/index.jsp b/src/main/webapp/WEB-INF/view/index.jsp
index f6aa2225d..ad33caabd 100644
--- a/src/main/webapp/WEB-INF/view/index.jsp
+++ b/src/main/webapp/WEB-INF/view/index.jsp
@@ -52,7 +52,7 @@
 						<div class="clearfix">
 							<div class="input">
 								<html:text styleClass="query" property="query" size="50"
-									maxlength="1000" styleId="contentQuery" />
+									maxlength="1000" styleId="contentQuery" autocomplete="off" />
 							</div>
 						</div>
 						<c:if test="${fe:hswsize(null) != 0}">
@@ -174,37 +174,11 @@
 		</div>
 		<jsp:include page="footer.jsp" />
 	</div>
+	<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
 	<script type="text/javascript"
 		src="${f:url('/js/jquery-1.8.3.min.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/index.js')}"></script>
 	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
-	<script type="text/javascript" src="js/suggestor.js"></script>
-	<script>
-	    $(function(){
-	        $("#contentQuery").suggestor( {
-	            ajaxinfo: {
-	                url: "/fess/json",
-	                fn: "content",
-	                num: 10
-	            },
-	            boxCssInfo: {
-	                border: "1px solid rgba(82, 168, 236, 0.5)",
-	                "-webkit-box-shadow": "0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)",
-	                "-moz-box-shadow": "0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)",
-	                "box-shadow": "0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)",
-	                "background-color": "#fff"
-	            },
-	            listSelectedCssInfo: {
-	                "background-color": "rgba(82, 168, 236, 0.1)"
-	            },
-	            listDeselectedCssInfo: {
-	                "background-color": "#ffffff"
-	            },
-	            minturm: 1,
-	            adjustWidthVal: 11,
-	            searchForm: $('#searchForm')
-	        });
-	    });
-	</script>
+	<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
+	<script type="text/javascript" src="${f:url('/js/index.js')}"></script>
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/view/search.jsp b/src/main/webapp/WEB-INF/view/search.jsp
index 615c93efd..614c15a5c 100644
--- a/src/main/webapp/WEB-INF/view/search.jsp
+++ b/src/main/webapp/WEB-INF/view/search.jsp
@@ -45,9 +45,11 @@
 		</c:choose>
 		<jsp:include page="footer.jsp" />
 	</div>
+	<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
 	<script type="text/javascript"
 		src="${f:url('/js/jquery-1.8.3.min.js')}"></script>
-	<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
 	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
+	<script type="text/javascript" src="${f:url('/js/suggestor.js')}"></script>
+	<script type="text/javascript" src="${f:url('/js/search.js')}"></script>
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/view/searchResults.jsp b/src/main/webapp/WEB-INF/view/searchResults.jsp
index a3cedc054..76931ee73 100644
--- a/src/main/webapp/WEB-INF/view/searchResults.jsp
+++ b/src/main/webapp/WEB-INF/view/searchResults.jsp
@@ -23,7 +23,6 @@
 </c:if>
 <div id="result" class="row content">
 	<input type="hidden" id="queryId" value="${f:u(queryId)}" />
-	<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
 	<input type="hidden" id="rt" value="${f:u(rt)}" />
 	<div class="span8">
 		<ol>
diff --git a/src/main/webapp/js/index.js b/src/main/webapp/js/index.js
index 659f8e007..5353b1bdb 100644
--- a/src/main/webapp/js/index.js
+++ b/src/main/webapp/js/index.js
@@ -1,5 +1,6 @@
 $(function(){
 	var $searchButton = $('#searchButton');
+	var contextPath = $('#contextPath').val();
 
 	$('#searchForm').on('submit', function(e) {
 		$searchButton.attr('disabled', true);
@@ -16,4 +17,28 @@ $(function(){
 		return false;
 	});
 
+    $('#contentQuery').suggestor( {
+        ajaxinfo: {
+            url: contextPath + '/json',
+            fn: 'content',
+            num: 10
+        },
+        boxCssInfo: {
+            border: '1px solid rgba(82, 168, 236, 0.5)',
+            '-webkit-box-shadow': '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
+            '-moz-box-shadow': '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
+            'box-shadow': '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
+            'background-color': '#fff'
+        },
+        listSelectedCssInfo: {
+            'background-color': 'rgba(82, 168, 236, 0.1)'
+        },
+        listDeselectedCssInfo: {
+            'background-color': '#ffffff'
+        },
+        minturm: 1,
+        adjustWidthVal: 11,
+        searchForm: $('#searchForm')
+    });
+
 });
diff --git a/src/main/webapp/js/search.js b/src/main/webapp/js/search.js
index 804278e98..2594d3555 100644
--- a/src/main/webapp/js/search.js
+++ b/src/main/webapp/js/search.js
@@ -4,6 +4,7 @@ $(function(){
 	var $favorites = $('.favorite', $result);
 	var $screenshot = $('#screenshot', $result);
 	var $searchButton = $('#searchButton');
+	var contextPath = $('#contextPath').val();
 
 	$('#searchForm').on('submit', function(e) {
 		$searchButton.attr('disabled', true);
@@ -57,7 +58,6 @@ $(function(){
 		var $favorite = $(this);
 		var values = $favorite.attr('href').split('#');
 		if(values.length === 2 && $queryId.size() > 0){
-			var contextPath = $('#contextPath').val();
 			var actionUrl = contextPath + '/json';
 			var docId = values[1];
 			$.ajax({
@@ -88,7 +88,6 @@ $(function(){
 	});
 
 	if($favorites.size() > 0) {
-		var contextPath = $('#contextPath').val();
 		$.ajax({
 			dataType: 'json',
 			cache: false,
@@ -141,4 +140,29 @@ $(function(){
 		}
 		return false;
 	});
+
+    $('#query').suggestor( {
+        ajaxinfo: {
+            url: contextPath + '/json',
+            fn: 'content',
+            num: 10
+        },
+        boxCssInfo: {
+            border: '1px solid rgba(82, 168, 236, 0.5)',
+            '-webkit-box-shadow': '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
+            '-moz-box-shadow': '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
+            'box-shadow': '0 1px 1px 0px rgba(0, 0, 0, 0.1), 0 3px 2px 0px rgba(82, 168, 236, 0.2)',
+            'background-color': '#fff'
+        },
+        listSelectedCssInfo: {
+            'background-color': 'rgba(82, 168, 236, 0.1)'
+        },
+        listDeselectedCssInfo: {
+            'background-color': '#ffffff'
+        },
+        minturm: 1,
+        adjustWidthVal: 11,
+        searchForm: $('#searchForm')
+    });
+
 });
diff --git a/src/main/webapp/js/suggestor.js b/src/main/webapp/js/suggestor.js
index 8b8518a97..e914e2bdb 100644
--- a/src/main/webapp/js/suggestor.js
+++ b/src/main/webapp/js/suggestor.js
@@ -167,7 +167,6 @@ $.fn.suggestor = function(setting) {
 							var str = $(this).html();
 							suggestor.fixList();
 							$textArea.val(str);
-							//BEGIN: N2 SEARCH 検索開始
 							if(typeof $settingSearchForm !== "undefined") {
 								$settingSearchForm.submit();
 								//$settingSearchForm.trigger("submit");