Ensuring activities with entities can be aggregated into activities without entities