More filter work

Works fine if there is only one match, otherwise, it will only highlight
the last one.