For a group, a simple enable/disable for entities would be nice instead of having to remove and add again.