Some updates to search and search tooltip