2 files changed, 16 insertions, 10 deletions
diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb
index ff9fbadb3..62229a441 100644
--- a/app/controllers/public_body_controller.rb
+++ b/app/controllers/public_body_controller.rb
@@ -185,11 +185,14 @@ class PublicBodyController < ApplicationController
     def search_typeahead
         # Since acts_as_xapian doesn't support the Partial match flag, we work around it
         # by making the last work a wildcard, which is quite the same
-        query = params[:q] + '*'
-
-        query = query.split(' ').join(' OR ')       # XXX: HACK for OR instead of default AND!
-        @xapian_requests = perform_search([PublicBody], query, 'relevant', nil, 5)
-
+        query = params[:q]
+        query = query.split(' ')
+        if query.last.nil? || query.last.strip.length < 3
+            @xapian_requests = nil
+        else
+            query = query.join(' OR ')       # XXX: HACK for OR instead of default AND!
+            @xapian_requests = perform_search([PublicBody], query, 'relevant', nil, 5)
+        end
         render :partial => "public_body/search_ahead"
     end
 end
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
index 1801648ca..d91df3780 100644
--- a/app/controllers/request_controller.rb
+++ b/app/controllers/request_controller.rb
@@ -754,11 +754,14 @@ class RequestController < ApplicationController
     def search_typeahead
         # Since acts_as_xapian doesn't support the Partial match flag, we work around it
         # by making the last work a wildcard, which is quite the same
-        query = params[:q] + '*'
-
-        query = query.split(' ').join(' OR ')       # XXX: HACK for OR instead of default AND!
-        @xapian_requests = perform_search([InfoRequestEvent], query, 'relevant', 'request_collapse', 5)
-
+        query = params[:q]
+        query = query.split(' ')
+        if query.last.nil? || query.last.strip.length < 3
+            @xapian_requests = nil
+        else
+            query = query.join(' OR ')       # XXX: HACK for OR instead of default AND!
+            @xapian_requests = perform_search([InfoRequestEvent], query, 'relevant', 'request_collapse', 5)
+        end
         render :partial => "request/search_ahead.rhtml"
     end