reorg storage, fix default group clear