Fixed parsing the querystring