Add pagination list support and fix a few bugs