Revert "Revert "Not cleaning histories of Searcher""

This reverts commit 94ac33c45a2506533bfd60f899950aec22f1f585.