search and UI enhancements