clean up querystring handling
further cleanup