Fix for empty groups
Fixes for emailaddress field renamed