reparse with more accurate order_by