removed peristent search, adds better search error handling