Fixed URL Escaping Bug