Merge in fixes to searching, etc.

Fix searches.  Works for the dashboard browser and the main browser.