update of the 'index' and 'fallback' according to #78ac1bb