Fixing issues with showing Group name.