fixed api calls with pagination