Fixing issues with paging (browsing & depaging)