Hopefully fixed tag highlighting bug