Fixed an issue with URL Encoding