diff --git a/editors/demo/src/HHMI/HHMI.js b/editors/demo/src/HHMI/HHMI.js
index a232017d224a2e7f00137867d29435d4ec89bb56..2b562b31325db1591767e853b2675f6131a2025d 100644
--- a/editors/demo/src/HHMI/HHMI.js
+++ b/editors/demo/src/HHMI/HHMI.js
@@ -170,7 +170,7 @@ const Hhmi = () => {
         value={content}
         readonly={readOnly}
         layout={HhmiLayout}
-        onChange={source => console.log(source)}
+        // onChange={source => console.log(source)}
       />
     </>
   );
diff --git a/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js b/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js
index 21e525157cf85ee3323fc28a6c992d58707dcf4d..bfffd485b39a6d3820dffb326f91235f40e790de 100644
--- a/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js
+++ b/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js
@@ -139,12 +139,14 @@ export default ({ node, view, getPos }) => {
     const listener = event => {
       if (event.code === 'Enter') {
         event.preventDefault();
-        addOptionBtnRef.current.click();
+        if (addOptionBtnRef.current) addOptionBtnRef.current.click();
       }
     };
-    addOptionBtnRef.current.addEventListener('keydown', listener);
+    if (addOptionBtnRef.current)
+      addOptionBtnRef.current.addEventListener('keydown', listener);
     return () => {
-      addOptionBtnRef.current.removeEventListener('keydown', listener);
+      if (addOptionBtnRef.current)
+        addOptionBtnRef.current.removeEventListener('keydown', listener);
     };
   }, []);
 
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/SwitchComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/SwitchComponent.js
index 5ba5ce37ddbf2e9ba4170d771d27abe9482995d9..2fb008ce43b7538ff692f141516ed70e299e0307 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/SwitchComponent.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/SwitchComponent.js
@@ -69,7 +69,7 @@ const CustomSwitch = ({ node, getPos }) => {
         });
       } else if (
         element.type.name === 'multiple_choice_single_correct' &&
-        element.attrs.correct
+        element.attrs[key]
       ) {
         tr.setNodeMarkup(parentPosition + position + 1, undefined, {
           ...element.attrs,
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/SwitchComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/SwitchComponent.js
index 50e7360b717905a720769fc27089a39e987779ec..73aeb1ac79295b4482d873c4527e25007f3ceb45 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/SwitchComponent.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/SwitchComponent.js
@@ -69,7 +69,7 @@ const CustomSwitch = ({ node, getPos }) => {
         });
       } else if (
         element.type.name === 'true_false_single_correct' &&
-        element.attrs.correct
+        element.attrs[key]
       ) {
         tr.setNodeMarkup(parentPosition + position + 1, undefined, {
           ...element.attrs,