Fixed search to use latest search functionality. Jira Issue: CWRC-24