Refactor RepositorySearchEngine