Fix #364

Fix the issue #364 that not hihglight correctly when toggle the eventList