Fix tree + pagination