Fix filtering by group type