Fix selectors for highlighting