Change default behavior to use order_by_type