[RFR] Fix sorting during infinite scroll