all fixes except new paginator