fix task order + pagination