Updated URL Escaping