Paginator enhancement