Changes to text and sorting org unit list and fix usergroups