Fix toggle and better handling around null labels