Fix cut and paste error in sorting upgrades.
Porting of data model continues.