diff --git a/functions.js b/functions.js
index 72d35dbb..cc8a5fbd 100644
--- a/functions.js
+++ b/functions.js
@@ -128,7 +128,8 @@ function cleanSelectedList(element) {
 	var content = document.getElementById(element);
 
 	for (i = 0; i < content.childNodes.length; i++) {
-		content.childNodes[i].className = content.childNodes[i].className.replace("Selected", "");
+		content.childNodes[i].className = 
+			content.childNodes[i].className.replace("Selected", "");
 	}
 
 }
diff --git a/tt-rss.js b/tt-rss.js
index 422cd6aa..3725ab43 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -274,12 +274,7 @@ function resetSearch() {
 }
 
 function search() {
-	checkActiveFeedId();
-	if (getActiveFeedId()) {
-		viewfeed(getActiveFeedId(), 0, "");
-	} else {
-		notify("Please select some feed first.");
-	}
+	viewCurrentFeed(0, "");
 }
 
 function localPiggieFunction(enable) {
diff --git a/tt-rss.php b/tt-rss.php
index de1bec37..89ff4076 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -72,11 +72,13 @@
 			&nbsp;
 		</td></tr> -->
 		<tr><td class="headlinesToolbar" id="headlinesToolbar">
-			Search: <input id="searchbox"
+			<input id="searchbox"
 			onblur="javascript:enableHotkeys()" onfocus="javascript:disableHotkeys()"
 			onchange="javascript:search()">
 		<input type="submit" 
-			class="button" onclick="javascript:resetSearch()" value="Reset">
+			class="button" onclick="javascript:search()" value="Search">
+		<!-- <input type="submit" 
+			class="button" onclick="javascript:resetSearch()" value="Reset"> -->
 
 		&nbsp;View: