fix map and add augroup