Searcher module update and Some minor updates