fix breaking changes in index refactor