Add album slugs, improve pagination