Fixed Some URI escape Bugs