Finish Paged List

and minor fix