Fixed the querystring problem