Fixes querystring bug