Fix sort order computation when None