Fix to duplicate roles being listed in popup