WIP fixing querystring bugs