Added ability to collapse groups as well as filter by group label