Added search match highlighting