Problem with iTunes sorting tv episodes

So in the way iTunes sorts episodes, usually everything is fine. They sort by season and then episodes number.

Except when I bought Friends I did it buy buying two collections available in the iTunes store, Seasons 1-5 and Seasons 1-6. Now, iTunes doesn't recognize these as separate seasons and they end up looking like this:

As you can see 1) the seasons aren't separated like they are for other shows and 2) the Seasons 1-6 collection starts numbering the episodes with "1" so the seasons are jumbled. This is driving my organized self CRAZY. Any solution to this?