EZP-22564: replace unreliable natural order ContentId sort clauses