fixes #6463 improve how we group contacts