Updated paginator current page calculation