refs #6016 additional fixes for notes in search builder to backport correctly