Fixed URI Encoding issue