diff --git a/res/js/util/statehandler.js b/res/js/util/statehandler.js
index 0e5e2682197bfa56171ff1424eabf84b3c673256..eef91090301c0c045329fedfbf420576651bd097 100644
--- a/res/js/util/statehandler.js
+++ b/res/js/util/statehandler.js
@@ -47,7 +47,7 @@ class StateHandler extends Component {
         }
 
         let query = [];
-        const words = this.state.split(" ");
+        const words = this.state.match(/"[^"]+"|\S+/g);
         words.forEach((word) => {
             const parts = split(word, ":", 2);
             console.log(parts);