Restored client side pagination functionality