fix query string parsing issue