Fix: Pagination at bottom not work correctly with filters applied

Cherrypick