fixes for empty albums and large albums