fix hightlight bugs