Integrated tag highlight as well