fix pagination support