Got search to respond to the no-cleanup flag