Handle self titled albums better