PAHMA-943: Agency list now uses refnames; other fixes