Use new search provider in 'lib'