Refactored keyword search (transitional) for new ingest API