Pagination and translation fix