Add highlights on returned result without breaking API