Collapse entries in combat tracker

With the recent changes, the Combat Tracker gets very long very fast - with 20 combatants on vehicles it now takes up three full 5K iMac screen heights if (for example) everyone is on vehicles and has a couple of effects. That's a whole lot of screen for a relatively normal encounter.

I know the old collapse group code presented issues, but it would be great if some way to compact this could be found.

My preferences would be:
1) Hide applied effects for non-current combatant, or non-current group, if effects are set to off in the selector for the whole tracker.
2) Allow group collapse again, because four goons in a helicopter take up an awful lot of screen real-estate when it isn't their go.