Update #304 - Added ordering to the groups
Update #304 - Minor refactoring
Update #304 - Fix null reference exception that was picked up when no group is found