NAWQAAN-334

Think we finally have the sorting issue beat.  Reviewers beware.