refactor Search in manager