Minor updates to the search

Updates to GUI search and search handler