more order ordering, and work around rails/rails#10303