Fix group bugs

Some fields don't play so nice with groups. Should probably take a look at that.

I thought it was best to open a pull request for all this whilst I was working on this.