Yet more fixes for setting class selectors in current match tab