diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ba63b3f1cc6019f5949eb6110b7fb5013487e85..4eaabcb3310986e30d0cb0ccacbf1b20a4964a53 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -299,8 +299,8 @@ add_executable(testISRQueryTuple
 
 add_executable(query-queryLanguage-tests
         query/queryLanguage/QueryParser.cpp
-
-
+        query/queryLanguage/QueryParser.h
+        util/DataStructureLib/tuple.cpp
         )
 
 
diff --git a/query/queryLanguage/QueryParser.cpp b/query/queryLanguage/QueryParser.cpp
index a89c5fcf6f37197bb7029de22c0dbcd019808b5c..525b63ff22c578149a3ea6e7cda6703267ce77d6 100644
--- a/query/queryLanguage/QueryParser.cpp
+++ b/query/queryLanguage/QueryParser.cpp
@@ -4,7 +4,7 @@
 
 #include "QueryParser.h"
 #include<unordered_set>
-#include "../../util/stringProcessing.h"
+//#include "../../util/stringProcessing.h"
 #include<iostream>
 /***
  *  QUERY PARSER CLASS
@@ -47,6 +47,10 @@ Token QueryParser::FindNextToken( int &index ){
 			}
 		else if ( stopChars.count( query[ start + size ] ) > 0)
 			{
+			while( query[start] == ' ')
+				{
+				++start;
+				}
 			index = start + size;
 			string text = query.substr ( start, size );
 			cout << "horse" << text;
diff --git a/util/DataStructureLib/tuple.cpp b/util/DataStructureLib/tuple.cpp
index 4b95ab4e9b9297a20d8b9238c99c89f5d6e5e9f3..bd1336ff0b2cb25ef235a487952080576d733fb5 100644
--- a/util/DataStructureLib/tuple.cpp
+++ b/util/DataStructureLib/tuple.cpp
@@ -76,4 +76,9 @@ public:
 			}
 		}
 
+	int getNumberOfChildren()
+		{
+		return Next.size();
+		}
+
 	};
\ No newline at end of file