Add more support for grouping by socionics club.