Update to fix pagination and other issues