Search bug fix and UI update