Refactored CHDSearchViewController to use CHDDatasourceManager
fixed merge conflicts