Fix for exceptions on re-search.