SS & HD5 not sorting tracks based on Disc 1/Disc 2 ID3 Tags

[undesign]

Has anyone noticed that if there is a 2CD album, the HD5 (not sure about other units) does not organize them properly?

Suppose its the ID3 tag info is as follows:

Artist: Paul Oakenfold

Album: Great Wall

Track: Nugen - Darksides

Track #: 1

Disc: 1 of 2

and then there is

Artist: Paul Oakenfold

Album: Great Wall

Track: Paul Godfrey - Fear

Track #: 1

Disc: 2 of 2

When i look at my library in my HD5, the first track of disc two is played immediately after the first track of disc one. Why doesnt it organize it by discs? Should the first disc entirely be played first in proper order and then the second one as opposed going back and forth between discs? The only solution ive found to this is renaming albums to "Great Wall CD1" and "Great Wall CD2"....not a big issue but id prefer not to.