Speed-up attempt for group page. Added option to return package count for group.