Fix grouping on mentions and tracking too