diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f9f1f5a684cdae3261943ad3d22f95bfba66e8f..d3c18d07da13df794c92d5596cd28cb37c29e78a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -237,6 +237,7 @@ add_executable(ISRMultiWordORTest
         constraintSolver/ISRWord.cpp
         constraintSolver/ISRAnd.cpp
         constraintSolver/ISREndDoc.cpp
+        util/DataStructureLib/tuple.cpp
         indexer/Corpus.cpp
         indexer/Chunk.cpp
         util/stringProcessing.cpp
diff --git a/ISRMultiWordORTest b/ISRMultiWordORTest
new file mode 100755
index 0000000000000000000000000000000000000000..839a20af122bcb657c6889913e9587306fe69bd7
Binary files /dev/null and b/ISRMultiWordORTest differ
diff --git a/ISROR-tests b/ISROR-tests
index 320049734c88f46f379eeca2f547c4ae39fd1a4d..92b856594106028fd469838551f614bd625254cd 100755
Binary files a/ISROR-tests and b/ISROR-tests differ
diff --git a/ISRWord-Multi-Test b/ISRWord-Multi-Test
index c29f3a5e6f67d2f14331a627c85cec1458c58279..3e1ed5f71cd2b3e97d667fcd74daddb4f150cc83 100755
Binary files a/ISRWord-Multi-Test and b/ISRWord-Multi-Test differ
diff --git a/ISRWord-tests b/ISRWord-tests
index e112101c8250144e0a6f42a5570c7c524dba5b12..c8f31b75cc872f2672d53ba47bd72925707dc47d 100755
Binary files a/ISRWord-tests and b/ISRWord-tests differ
diff --git a/URLTEST b/URLTEST
index f6458e8ce890059323a7714c36a600ad62f7b039..6b49d0ce2dcd8751a456e8bea8630fb904946634 100755
Binary files a/URLTEST and b/URLTEST differ
diff --git a/constraintSolver/tests/ISRMultiWordORTest.cpp b/constraintSolver/tests/ISRMultiWordORTest.cpp
index 8bc21ace14b6cdc0f42e48f299288299c3fa517e..c88c4bfa3f29ca94134a40dd089ee3ec91de7c25 100644
--- a/constraintSolver/tests/ISRMultiWordORTest.cpp
+++ b/constraintSolver/tests/ISRMultiWordORTest.cpp
@@ -31,8 +31,8 @@ int main ( )
 	static const char HOST = '=';
 	*/
 
-	ISRWord q1 = ISRWord("moment");
-	ISRWord q2 = ISRWord("life");
+	ISRWord q1 = ISRWord("$trump");
+	ISRWord q2 = ISRWord("$russia");
 
 
 	queries.push_back(q2);
diff --git a/constraintSolver/tests/ISRWordMultiTest.cpp b/constraintSolver/tests/ISRWordMultiTest.cpp
index 43ef3432279fd34139344fae7e3df41ce954b2b4..e5001cac64c5f8a206c6a156a3f9668880971fa3 100644
--- a/constraintSolver/tests/ISRWordMultiTest.cpp
+++ b/constraintSolver/tests/ISRWordMultiTest.cpp
@@ -27,8 +27,8 @@ int main ( )
 	static const char HOST = '=';
 	*/
 
-	ISRWord q1 = ISRWord("moment");
-	ISRWord q2 = ISRWord("life");
+	ISRWord q1 = ISRWord("$trump");
+	ISRWord q2 = ISRWord("$russia");
 
 
 	queries.push_back(q2);
diff --git a/constraintSolver/tests/ISRWordTests.cpp b/constraintSolver/tests/ISRWordTests.cpp
index d35b768b7bda64df41c708d77b9b78ef49c5d5b4..efaddb2b70d5dc22dfc2e6cf1c470750a7018499 100644
--- a/constraintSolver/tests/ISRWordTests.cpp
+++ b/constraintSolver/tests/ISRWordTests.cpp
@@ -32,7 +32,7 @@ int main ( ) {
 		queries.push_back(queryWord);
 		}
 */
-	ISRWord queryWord( "%night" ) ;
+	ISRWord queryWord( "$trump" ) ;
 	queries.push_back(queryWord);
 	vector<size_t> locations;
 	set<string> urls;
diff --git a/shared/url.h b/shared/url.h
index 641f86dd33226ed6bd5450878632dfabcf3d9a9b..2258a1127070bdd0d3f6932ba2e07c9fcd831a05 100644
--- a/shared/url.h
+++ b/shared/url.h
@@ -122,6 +122,11 @@ public:
 
 
 					CompleteUrl = string(temp_CompleteUrl, strlen(temp_CompleteUrl));
+					//remove question marks
+					size_t found = CompleteUrl.find("?");
+					if(found < CompleteUrl.size( ) )
+						CompleteUrl.erase(found, CompleteUrl.size( ));
+
 					Service = string(temp_Service, strlen(temp_Service));
 					Host = string(temp_Host, strlen(temp_Host));
 
diff --git a/testISRQueryTuple b/testISRQueryTuple
deleted file mode 100755
index d68a0ff580f287eb2ecf185b45674bf750c1b15d..0000000000000000000000000000000000000000
Binary files a/testISRQueryTuple and /dev/null differ