adding search and clustering