diff --git a/editors/demo/src/Editoria/Editoria.js b/editors/demo/src/Editoria/Editoria.js
index 98a5f9cb5ebc16a5cdfa4a1dc366b826689f87b7..42a6908606b13ce6fcb91d68ce0900f3443c2ff1 100644
--- a/editors/demo/src/Editoria/Editoria.js
+++ b/editors/demo/src/Editoria/Editoria.js
@@ -50,7 +50,7 @@ const Editoria = () => {
           value={demo}
           // readonly
           layout={layout}
-          onChange={source => console.log(source)}
+          // onChange={source => console.log(source)}
           user={user}
         />
       </>
diff --git a/wax-prosemirror-components/src/components/findAndReplace/helpers.js b/wax-prosemirror-components/src/components/findAndReplace/helpers.js
index 2100e93dd9de31c1405c8d212b5f4e9725d60809..5aee17bcde206c7f092b7115ce79b85c6d5dd19e 100644
--- a/wax-prosemirror-components/src/components/findAndReplace/helpers.js
+++ b/wax-prosemirror-components/src/components/findAndReplace/helpers.js
@@ -32,14 +32,24 @@ const getAllResultsByView = (view, searchValue, matchCaseSearch) => {
 
 const getNotesIds = main => {
   const notesIds = [];
-  const notes = DocumentHelpers.findChildrenByType(
-    main.state.doc,
-    main.state.schema.nodes.footnote,
-    true,
-  );
-  notes.forEach(note => {
-    notesIds.push(note.node.attrs.id);
+  const schemaNotes = [];
+  each(main.state.schema.nodes, node => {
+    if (node.groups.includes('notes')) schemaNotes.push(node);
   });
+
+  if (schemaNotes.length > 0) {
+    schemaNotes.forEach(schemaNote => {
+      const notes = DocumentHelpers.findChildrenByType(
+        main.state.doc,
+        main.state.schema.nodes[schemaNote.name],
+        true,
+      );
+      notes.forEach(note => {
+        notesIds.push(note.node.attrs.id);
+      });
+    });
+  }
+
   return notesIds;
 };