fix pagination conflict with filters, #22
Merge pull request #173 from YanshuoH/pagination

fix pagination conflict with filters, #22