Further addressed notes from reviewers.
Fixed issues with pagination.
Further work at addressing comments from upstream.