Fully preserve legacy album matching logic.