New changes to search and UI