Fixed issue with long groups list