fixed filtering through the groups