Switched to using a search-provider system, to make it more extensible