Updated SearchHandler

Updates made to search handler