Use group selection form for #775