Added default group when empty