diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 7723c50..1a3a309 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -12,6 +12,6 @@ module SearchHelper
   end
 
   def remove_stop_words(query)
-    (query.downcase.split(/[ '".]/) - STOP_WORDS[Locale.current.to_s]).join(' ')
+     (query.downcase.scan(/"[^"]*"?|'[^']*'?|[^'"\s]+/) - STOP_WORDS[Locale.current.to_s]).join(' ')
   end
 end
diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb
index 4d5ff68..e578f87 100644
--- a/test/functional/search_controller_test.rb
+++ b/test/functional/search_controller_test.rb
@@ -22,6 +22,7 @@ class SearchControllerTest < Test::Unit::TestCase
   end
 
   should 'filter stop words' do
+    Locale.current = Locale::Object.new('pt_BR')
     get 'index', :query => 'a carne da vaca'
     assert_response :success
     assert_template 'index'
--
libgit2 0.21.2