diff --git a/wax-prosemirror-components/src/components/images/ImageUpload.js b/wax-prosemirror-components/src/components/images/ImageUpload.js
index 146f4cb4fac25291ef15336c29e0d98a140b243e..9371fbd4dad737b6af87674a96f221f05a969fd1 100644
--- a/wax-prosemirror-components/src/components/images/ImageUpload.js
+++ b/wax-prosemirror-components/src/components/images/ImageUpload.js
@@ -42,7 +42,7 @@ const ImageUpload = ({ item, fileUpload, view }) => {
             new TextSelection(
               main.state.tr.doc.resolve(
                 nodeFound.pos +
-                  2 +
+                  1 +
                   context.pmViews[activeViewId].state.selection.to,
               ),
             ),
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/questionSingleNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/questionSingleNode.js
index 92912ce68d36c2b9dde81385f0f4a2156f144eee..4c1231444efe4cca40564e03d62510b6f583d7b4 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/questionSingleNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/questionSingleNode.js
@@ -4,7 +4,7 @@ const questionSingleNode = {
     class: { default: 'multiple-choice-question-single' },
   },
   group: 'block questions',
-  content: 'paragraph* bulletlist* orderedlist*',
+  content: 'block+',
   defining: true,
 
   // atom: true,
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/questionTrueFalseNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/questionTrueFalseNode.js
index 992f9625f5da6f44beb4fcdd42ece1d1612bc3e2..fde65c6fdda9a1cd9025dd8f4905ef58ecf2b62c 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/questionTrueFalseNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/questionTrueFalseNode.js
@@ -4,7 +4,8 @@ const questionTrueFalseNode = {
     class: { default: 'true-false-question' },
   },
   group: 'block questions',
-  content: 'paragraph* bulletlist* orderedlist*',
+  // content: 'paragraph* bulletlist* orderedlist*',
+  content: 'block+',
   defining: true,
 
   // atom: true,
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/questionTrueFalseSingleNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/questionTrueFalseSingleNode.js
index f4c1503664b27b546cab4c171f46ec3d62ac321f..ee82a9170f2edb7067c13a97986d1c9e0435a6de 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/questionTrueFalseSingleNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/questionTrueFalseSingleNode.js
@@ -4,7 +4,7 @@ const questionTrueFalseNode = {
     class: { default: 'true-false-question-single' },
   },
   group: 'block questions',
-  content: 'paragraph* bulletlist* orderedlist*',
+  content: 'block+',
   defining: true,
 
   // atom: true,
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/QuestionEditorComponent.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/QuestionEditorComponent.js
index 6c57c169b1bad3b44afc305416b5a32c37762700..abbe5724afa7f185037be528417fecb51c368a03 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/QuestionEditorComponent.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/QuestionEditorComponent.js
@@ -155,7 +155,7 @@ const QuestionEditorComponent = ({ node, view, getPos }) => {
                   new TextSelection(
                     main.state.tr.doc.resolve(
                       getPos() +
-                        2 +
+                        1 +
                         context.pmViews[questionId].state.selection.to,
                     ),
                   ),
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js
index 8e556bf26298a432513a1cc15d4a38b7b4c95631..35033cb0edf56181615d4bf2b4b288aa6f7d34bc 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js
@@ -5,7 +5,7 @@ const multipleChoiceContainerNode = {
   },
   group: 'block questions',
   atom: true,
-  content: 'block*',
+  content: 'block+',
   parseDOM: [
     {
       tag: 'div.multiple-choice',
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
index daf0168fab9ba5dfdcb57788072292fa1f4c7ec3..5eea97cc09e8e5255771803c2f4cc866d3306062 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
@@ -7,7 +7,7 @@ const multipleChoiceNode = {
     feedback: { default: '' },
   },
   group: 'block questions',
-  content: 'block*',
+  content: 'block+',
   defining: true,
   parseDOM: [
     {
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/questionNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/questionNode.js
index 99012468f07b19cce85d463e9b91e033ac715f93..05dc969d5c6fb9e79d10ef69f19fbf72b02d0250 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/questionNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/questionNode.js
@@ -4,7 +4,7 @@ const questionNode = {
     id: { default: '' },
   },
   group: 'block questions',
-  content: 'paragraph* bulletlist* orderedlist*',
+  content: 'block+',
   defining: true,
 
   parseDOM: [