Add filter per group type and change display of output