Fixed searcher routines to be more random.