Updated to match master branch, Global search provider