many changes, including showing contacts in search results, and a tokenised search