Stories index refactoring