Made it so search responds to the no-cleanup parameter