New filters should be highlighted when added to a CIC

[RoyMudie]

Describe the bug
When adding a filter to a catalogue that isn't expanded, the AggregateFilterContainer gets highlighted rather than the filter itself so you end up with the below.

Expected behavior
When a new filter is added it should correctly highlight the filter itself rather than the AggregateFilterContainer