including the instances you're noting...sound like the right thing to do?
Consent Management Privacy Settings