Fixes #7948 - order containers index by name