Merge "Refactor SearchManager:"