PMD + Pagination-Fix