Changes to group like roles together in display, account for roleTerm w/o required role, and all uppercase text roleTerms