simplify wrapper, fix pagination