Operation Note ID fixes