making the selectors for highlighting a bit more explicit, should fix problems