Fix #154654
Fix Indexing of notes #154660