backport oldURL fix to AF UI