Added the no-cleanup flag for search