efficient paginator handle fixes