fix group filtering