adapt new index layout