adding search support