Further rewrite to make the way that we allow multiple index fallbacks make more sense