Improvements in tag highlighting.