Add pagination in a few more places