Fixed multiple duplicate highlight issues