#948 - added optimization for membership roster page