Fixed full lists for orgs and groups.
Merge branch 'test' into dev