Searcher Setup

Optional setup of searcher moved to setup function