Finished filters
Merge highlighting with reset/new buttons