Are the TPBs/HCs volume 1 and 2 in the correct reading order?

Or...

The omnibus in the version with the correct reading order only?