updated eager loading of album data