Fix up last part of album matching