fixed the uri decoding patch, need to decode after I parse the uri