US5996: Further (and hopefully final) changes to top level edorg private data extract ATs