Fixes #5300 'update', 'group' not being triggered multiple times now