small changes and fix sort
Merge branch 'people_groups' into testing