Fix pagination, temporarily disable persistence