Search highlighting working again