Change grouping to take subdomain into account on grouping.
Tidy up some mongo field label constants.