Add back 'team' (users) reporting

Temporary fix until we've thought out what to do with tags in the more general case.