Fix sorting for screen