fixing new index layout