efficient paginator fixes