fix AMF wrt group changes