search tweak and UI changes