Lazy search (faster!), tore out XLS support