adding search / text highlight support