resolve query string issue