fix some paginator and listing problems