NORMAL CHANGE: Search Manager refactored