add short cut
modify paginator