Big fixes for DataRepo indexing on collection and DI container not respecting order of modules.