More multi-album tweaks