Better tag highlight fix