Improve add interactions around groups; fix #346