Yes, the tracklist is slightly muddled (at least on the 2CD edition). Only a minor inconvenience, however.
What a lovely album. The tracks that originally featured on 'Kurt' take a little adjustment to get used to, but the whole thing flows beautifully.