Update search classes to with the new search system

Add a Contact search result type to distinguish these results within a search view.

reformat code