[RFR] Preserve filter during pagination

Fixes #39