Fix: Pager & filter