Add single query sort column rebalance support