Filters & icons

Two issues:

1) When using filters it ignores the icon added to the stories and instead uses a clock one. This is only once the filter button has been clicked. Correct one shows on page load of first filter.

2) Is there a way to control which filters are displayed? I’ve tried using sub category with the categories inside that I wish to be filters but it then displays the parent category label as a filter too. I need to create a lot of timelines so having them all the same level may get complicated with similar named categories.