Merge "Misc fixes to search and UI."