Correct querystring handling