BN-1025 Modified paginator