add ChangeDetection on/off switches

Prevents false change detections.