Update the tag highlighter code to handle multiple tag highlighting