Fix adding stash group and applying defaults