Fix the URL escaping