Hightlight feature fixed bug