Fix system note comparison and standardize note setup

Closes #32551

See merge request !11532