Correctly order by the order fields