Strip non-word characters from question search strings

solvers.py

@@ -19,7 +19,10 @@ def build_queries(question_text, answers):
 
     def build_urls(self, question_text, answers):
         """ build URLs with search queries """
-        queries = self.build_queries(question_text.replace(' NOT ', ' ').replace(' NEVER ', ' '), answers)
+        parsed_question_text = get_raw_words(
+            question_text.replace(' NOT ', ' ').replace(' NEVER ', ' ')
+        , lowercase=False)
+        queries = self.build_queries('{}?'.format(parsed_question_text), answers)
         return [self.service_url.format(quote_plus(query)) for query in queries]
 
     @staticmethod

utils.py

@@ -32,8 +32,8 @@ def get_significant_words(question_words):
     return list(filter(lambda word: word not in our_stopwords, question_words.split(' ')))
 
 
-def get_raw_words(data):
+def get_raw_words(data, lowercase=True):
     """ Extract raw words from data """
-    data = re.sub(r'[^\w ]', '', data).replace(' and ', ' ').strip()
-    words = data.replace('  ', ' ').lower()
-    return words
+    data = re.sub(r'[^A-Za-z0-9 ]', '', data).replace(' and ', ' ').strip()
+    words = data.replace('  ', ' ')
+    return words.lower() if lowercase else words