diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
index 274c9d6394de0938de0c49774482af1de0edda0f..163779b6891088d67582b248e3176675ba9e52b1 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
@@ -35,15 +35,24 @@ const createOption = (main, context) => {
     ),
   );
 
+  /* create First Option */
+  const firstOption = main.state.config.schema.nodes.multiple_choice.create(
+    { id: uuidv4() },
+    Fragment.empty,
+  );
+  dispatch(main.state.tr.replaceSelectionWith(firstOption));
+  setTimeout(() => {
+    helpers.createEmptyParagraph(context, firstOption.attrs.id);
+  }, 50);
+
   /* create Second Option */
-  const newAnswerId = uuidv4();
-  const answerOption = main.state.config.schema.nodes.multiple_choice.create(
-    { id: newAnswerId },
+  const secondOption = main.state.config.schema.nodes.multiple_choice.create(
+    { id: uuidv4() },
     Fragment.empty,
   );
-  dispatch(main.state.tr.replaceSelectionWith(answerOption));
+  dispatch(main.state.tr.replaceSelectionWith(secondOption));
   setTimeout(() => {
-    helpers.createEmptyParagraph(context, newAnswerId);
+    helpers.createEmptyParagraph(context, secondOption.attrs.id);
   }, 50);
 };
 
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectQuestion.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectQuestion.js
index eaa9c65282ca876245b9b1729ddbccc99eb8243e..fda78ebf5d72ef37f92f472e61d8685b300c3369 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectQuestion.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectQuestion.js
@@ -35,15 +35,24 @@ const createOption = (main, context) => {
     ),
   );
 
+  /* create First Option */
+  const firstOption = main.state.config.schema.nodes.multiple_choice_single_correct.create(
+    { id: uuidv4() },
+    Fragment.empty,
+  );
+  dispatch(main.state.tr.replaceSelectionWith(firstOption));
+  setTimeout(() => {
+    helpers.createEmptyParagraph(context, firstOption.attrs.id);
+  }, 50);
+
   /* create Second Option */
-  const newAnswerId = uuidv4();
-  const answerOption = main.state.config.schema.nodes.multiple_choice_single_correct.create(
-    { id: newAnswerId },
+  const secondOption = main.state.config.schema.nodes.multiple_choice_single_correct.create(
+    { id: uuidv4() },
     Fragment.empty,
   );
-  dispatch(main.state.tr.replaceSelectionWith(answerOption));
+  dispatch(main.state.tr.replaceSelectionWith(secondOption));
   setTimeout(() => {
-    helpers.createEmptyParagraph(context, newAnswerId);
+    helpers.createEmptyParagraph(context, secondOption.attrs.id);
   }, 50);
 };
 
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js
index ab224fb26658ad80c4733265b4fff7e0105643f1..8113386e89f13067cafb21beab1bc9529664c751 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js
@@ -10,7 +10,7 @@ const multipleChoiceSingleCorrectContainerNode = {
   atom: true,
   selectable: true,
   draggable: true,
-  content: 'multiple_choice_single_correct+',
+  content: 'block+',
   parseDOM: [
     {
       tag: 'div.multiple-choice-single-correct',
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseQuestion.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseQuestion.js
index d4fe0a31179f016931f21a6b0b1233b56479d25b..073a04b9efe4753cdac617175b66a167dfb088b6 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseQuestion.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseQuestion.js
@@ -35,15 +35,24 @@ const createOption = (main, context) => {
     ),
   );
 
+  /* create First Option */
+  const firstOption = main.state.config.schema.nodes.true_false.create(
+    { id: uuidv4() },
+    Fragment.empty,
+  );
+  dispatch(main.state.tr.replaceSelectionWith(firstOption));
+  setTimeout(() => {
+    helpers.createEmptyParagraph(context, firstOption.attrs.id);
+  }, 50);
+
   /* create Second Option */
-  const newAnswerId = uuidv4();
-  const answerOption = main.state.config.schema.nodes.true_false.create(
-    { id: newAnswerId },
+  const secondOption = main.state.config.schema.nodes.true_false.create(
+    { id: uuidv4() },
     Fragment.empty,
   );
-  dispatch(main.state.tr.replaceSelectionWith(answerOption));
+  dispatch(main.state.tr.replaceSelectionWith(secondOption));
   setTimeout(() => {
-    helpers.createEmptyParagraph(context, newAnswerId);
+    helpers.createEmptyParagraph(context, secondOption.attrs.id);
   }, 50);
 };
 
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseContainerNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseContainerNode.js
index 23f5a11e51aee942eb7ca051cba2584db691fe39..c71293a24bddbbed00856b25d677d06699c49634 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseContainerNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseContainerNode.js
@@ -7,7 +7,7 @@ const trueFalseContainerNode = {
   atom: true,
   selectable: true,
   draggable: true,
-  content: 'true_false+',
+  content: 'block+',
   parseDOM: [
     {
       tag: 'div.true-false',
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js
index 0ac8dba15570f6946c7c536fbeacf7cf6f83c732..b3d00706b9c1b181145b669dfb74f6ae172f8b02 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js
@@ -7,7 +7,7 @@ const multipleChoiceContainerNode = {
   atom: true,
   selectable: true,
   draggable: true,
-  content: 'multiple_choice+',
+  content: 'block+',
   parseDOM: [
     {
       tag: 'div.multiple-choice',