Fix: duplicate entries for groups add/delete