diff --git a/padaos.py b/padaos.py
index <HASH>..<HASH> 100644
--- a/padaos.py
+++ b/padaos.py
@@ -61,7 +61,7 @@ class IntentContainer:
                 (r'(\\[^\w ])', r'\1?'),
 
                 # === Force 1+ Space Between Words ===
-                (r'(?<=\w)(\\\s|\s)+(?=\w)', r'\\W+'),
+                (r'(?<=\w)(\\\s|\s)+', r'\\W+'),
 
                 # === Force 0+ Space Between Everything Else ===
                 (r'\s+', r'\\W*'),
@@ -121,6 +121,7 @@ class IntentContainer:
                 }
 
     def calc_intents(self, query):
+        query = ' ' + query + ' '
         if self.must_compile:
             self.compile()
         for intent_name, regexes in self.intents.items():
Fix words not requiring any space in between