Pagination fix

More work to be done ...