Better fix for URL escaping