diff --git a/src/main/resources/META-INF/orm.xml b/src/main/resources/META-INF/orm.xml
index d7a96c5d..315854ad 100644
--- a/src/main/resources/META-INF/orm.xml
+++ b/src/main/resources/META-INF/orm.xml
@@ -31,6 +31,6 @@
 	</named-query>
 	
 	<named-query name="Entry.allByKeywords">
-		<query>select e, s from FeedEntry e LEFT JOIN e.statuses s WITH (s.user.id=:userId) where exists (select s2 from FeedSubscription s2 where s2.user=:user and s2.feed = e.feed) and lower(e.content) like :keywords order by e.updated desc</query>
+		<query>select e, s from FeedEntry e LEFT JOIN e.statuses s WITH (s.user.id=:userId) where exists (select s2 from FeedSubscription s2 where s2.user=:user and s2.feed = e.feed) and (lower(e.content) like :keywords or lower(e.title) like :keywords) order by e.updated desc</query>
 	</named-query>
 </entity-mappings>
\ No newline at end of file
diff --git a/src/main/webapp/js/directives.js b/src/main/webapp/js/directives.js
index 7e3a382a..8613ee9e 100644
--- a/src/main/webapp/js/directives.js
+++ b/src/main/webapp/js/directives.js
@@ -221,7 +221,7 @@ module.directive('toolbar', function($state, $stateParams, $route, $location,
 			};
 			$scope.showButtons = function() {
 				return !$stateParams._keywords;
-			}
+			};
 
 			$scope.toAdmin = function() {
 				$location.path('admin');