Update searcher, combine & documentation