fixed issues with the paginator