updated simple and complex ingest to fix ids with -