Fix SimpleSearch broken in f6884b45