Minor updates to search handler

Minor updates