Sort fixes to support displayOrder