fixed query string issue