Updated search view and search logic