Pagination and numeration fixes