Appear to have fixed the URL escaping issues this time without regression