adding search and more