Fixed order_by's for heroku