fix query sting parsing