diff --git a/www/borders.js b/www/borders.js
index 07839ed..3599005 100644
--- a/www/borders.js
+++ b/www/borders.js
@@ -329,13 +329,13 @@ function countRings( rings, polygon ) {
 }
 
 function doSearch() {
-  var query = $('#fsearch').val();
-  if( query.length() > 1 ) {
-	$.ajax(getServer('search'), {
-		data: { 'q': query },
-		success: zoomToFound
-	});
-  }
+	var query = $('#fsearch').val();
+	if( query.length > 1 ) {
+		$.ajax(getServer('search'), {
+			data: { 'q': query },
+			success: zoomToFound
+		});
+	}
 }
 
 function zoomToFound(result) {
@@ -343,9 +343,9 @@ function zoomToFound(result) {
 	if( !('bounds' in result))
 		return;
 	var b = result['bounds'];
-	if( b.size() != 4 )
+	if( b.length != 4 )
 		return;
-	map.fitBounds([[b[0], b[1]], [b[2], b[3]]]);
+	map.fitBounds([[b[1], b[0]], [b[3], b[2]]]);
 }
 
 function bUpdateColors() {
diff --git a/www/index.html b/www/index.html
index aaee5f4..46ded2e 100644
--- a/www/index.html
+++ b/www/index.html
@@ -20,7 +20,7 @@
 			#info { margin-top: 2em; }
 			#b_delete, #b_clear, .back_del { font-size: 8pt; }
 			#rename, #split, #join, #point, #divide, #backup, #fixcross { display: none; }
-			.actions input[type='text'], .search input[type='text'] { width: 150px; }
+			.actions input[type='text'], #search input[type='text'] { width: 150px; }
 			#header { border-bottom: 1px solid gray; margin-bottom: 1em; padding-bottom: 1em; }
 			#f_topo, #f_chars, #f_comments, #links { font-size: 10pt; }
 			#backup_saving, #backup_restoring { margin-bottom: 1em; }
@@ -73,6 +73,9 @@
 					<a href="#" id="poly_bbox">Скачать в poly видимое</a>,
 					<a href="#" id="poly_all">всё</a>
 				</div>
+				<div id="search">
+					Поиск <input type="text" id="fsearch"><button onclick="doSearch()">&#x1f50d;</button>
+				</div>
 			</div>
 			<div id="actions" class="actions">
 				<div id="action_buttons">
@@ -171,9 +174,6 @@
 				</div>
 				<button onclick="bFixCrossCancel()">Вернуться</button>
 			</div>
-			<div id="search">
-				Поиск <input type="text" id="fsearch"><button onclick="doSearch()">&#x1f50d;</button>
-			</div>
 		</div>
 		<div id="map"></div>
 	</body>