Changed approach to api mismatch - fixed here for search.