fix query string issue