Updated how the pagination is handled;
Prepared hot fix for pagination;