album index refactoring