Moved the search into the Repositories. Created a BaseSearchHandler