clean up of search (#9).