add group id and fix popup