diff --git a/djangae/contrib/search/query.py b/djangae/contrib/search/query.py
index aa49884d..ae9cbcca 100644
--- a/djangae/contrib/search/query.py
+++ b/djangae/contrib/search/query.py
@@ -2,6 +2,8 @@
 
 from .constants import (
     STOP_WORDS,
+    SPACE,
+    EMPTY,
 )
 
 from .models import (
@@ -107,7 +109,7 @@ def finalize_token(token):
                 continue
 
             # Split on punctuation, remove double-spaces
-            content = [x.replace(" ", "") for x in tokenize_content(content)]
+            content = [x.replace(SPACE, EMPTY) for x in tokenize_content(content)]
 
             if len(content) == 1:
                 # Do nothing, this was a single token