Search no longer crashes