Reduce tag highlight to just name
Merge branch 'master' into ST2