Fix optional '?' bug for groups