Updates to SearchProvider

Done at work last week.