tidy up everything search related