improve paginator on list. Should closes bug #14