Fix group filtering