Contacts: Make looking up group name less hackish
Contacts: Minor changes to groups.