Fix issue regarding top groups list