Selection highlighting bug fixed