GPII-625: Fixed a bug with the query string