Search and add working