refactoring: use new - insteed of old index fields