diff --git a/app/models/search.rb b/app/models/search.rb
index 335194d..3a10a6a 100644
--- a/app/models/search.rb
+++ b/app/models/search.rb
@@ -93,8 +93,7 @@ class Search
         []
       end
 
-    # escape sphinx special chars (using Riddle.escape removes boolean support)
-    query = words.gsub(/(['\/~"@])/, '\\\\\1')
+    query = Riddle.escape(words)
 
     # go go gadget search
     self.results = []