Bug Fixes II

Pagination Errors