Add substring search + highlighting