Add pagination on the client