Add pagination on tracker