UI changes and fixes for search-api call