fixes #7198 cleanup activity entity tags on delete