Task 5454 - Fixed pagination bugs and related features.