Cleanup of search and search results code.

Allows for instant return to search results without the same results
for the last search term having to be re-downloaded.

Change-Id: If64a8e8660d8232e6d2e1f03764e5a464421b6ea