remove unused querystring dependency
minor fixes