Pagination module case fixed
Updates and fixes from master