diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/QuestionComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/QuestionComponent.js
index 6cb99bb06687e6dd23777caa7fed83c9def2265b..e2be5c890e1876d28c38af8fbad3a1ac9a54d440 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/QuestionComponent.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/QuestionComponent.js
@@ -104,7 +104,7 @@ export default ({ node, view, getPos }) => {
             ),
           );
 
-          const answerOption = context.view.main.state.config.schema.nodes.multiple_choice.create(
+          const answerOption = context.view.main.state.config.schema.nodes.true_false.create(
             { id: newAnswerId },
             Fragment.empty,
           );
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/FeedbackComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/FeedbackComponent.js
index 0fa301ce2d1b4e3dfc97930b8528c9e1f27d29af..ce6248364514b317fce896059b5f98aac8a67c17 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/FeedbackComponent.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/FeedbackComponent.js
@@ -6,7 +6,6 @@ import styled from 'styled-components';
 import { TextSelection } from 'prosemirror-state';
 import { WaxContext } from 'wax-prosemirror-core';
 import { DocumentHelpers } from 'wax-prosemirror-utilities';
-import { CopyPasteCommentPlugin } from 'wax-prosemirror-plugins';
 
 const FeedBack = styled.div`
   color: black;
@@ -34,9 +33,7 @@ export default ({ node, view, getPos }) => {
     const allNodes = getNodes(context.view.main);
     allNodes.forEach(singleNode => {
       if (singleNode.node.attrs.id === node.attrs.id) {
-        if (!typing) {
-          setFeedBack(singleNode.node.attrs.feedback);
-        } else if (context.transaction.meta.inputType === 'Redo') {
+        if (!typing || context.transaction.meta.inputType === 'Redo') {
           setFeedBack(singleNode.node.attrs.feedback);
         }
         if (!isFirstRun) {
@@ -107,7 +104,12 @@ const getNodes = view => {
   const allNodes = DocumentHelpers.findBlockNodes(view.state.doc);
   const multipleChoiceNodes = [];
   allNodes.forEach(node => {
-    if (node.node.type.name === 'multiple_choice') {
+    if (
+      node.node.type.name === 'multiple_choice' ||
+      node.node.type.name === 'multiple_choice_single_correct' ||
+      node.node.type.name === 'true_false' ||
+      node.node.type.name === 'true_false_single_correct'
+    ) {
       multipleChoiceNodes.push(node);
     }
   });