fix highlight matching