Fixed URL escaping