Bugfix for the query string args not being set the right place

Sorry about the bug. Updated the testcases also.