diff --git a/editors/demo/src/HHMI/HHMI.js b/editors/demo/src/HHMI/HHMI.js
index 09c338aa8b24e039827db5350327ba3330ae5cec..08eff7d3058b02837202e9a0d9fa912d28d2d478 100644
--- a/editors/demo/src/HHMI/HHMI.js
+++ b/editors/demo/src/HHMI/HHMI.js
@@ -40,7 +40,7 @@ const t = `<p class="paragraph"></p>
       <p class="paragraph">answer 2</p>
    </div>
 </div>
-<div id="" class="fill-the-gap"><p class="paragraph">some text with a <span id="e88faa82-ff79-4b5a-9aa5-cb10b4236e98" class="fill-the-gap">gap</span> and </p></div>
+<p class="paragraph"></p><div id="d4fa43fc-3a92-4591-a8a4-e6271e42fc02" class="fill-the-gap" feedback=""><p class="paragraph">sdsd</p></div>
 `;
 
 const Hhmi = () => {
@@ -67,7 +67,7 @@ const Hhmi = () => {
         fileUpload={file => renderImage(file)}
         value={t}
         readonly={readOnly}
-        layout={HhmiLayout}
+        // layout={HhmiLayout}
         onChange={source => console.log(source)}
       />
     </>
diff --git a/wax-prosemirror-services/src/EssayService/schema/essayContainerNode.js b/wax-prosemirror-services/src/EssayService/schema/essayContainerNode.js
index 72f12448c30df37ab51b8eb8851148a35a4ca56d..0afacd6dd44cdf719ee660e23957898a34dcf670 100644
--- a/wax-prosemirror-services/src/EssayService/schema/essayContainerNode.js
+++ b/wax-prosemirror-services/src/EssayService/schema/essayContainerNode.js
@@ -13,7 +13,7 @@ const essayContainerNode = {
       tag: 'div.essay',
       getAttrs(dom) {
         return {
-          id: dom.dataset.id,
+          id: dom.getAttribute('id'),
           class: dom.getAttribute('class'),
         };
       },
diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapContainerNode.js b/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapContainerNode.js
index 11b09b05f4f111763fdf5dc3da2d6a1b2612281a..ff020897e8c0f669b0f2caebb0e70409d5203b07 100644
--- a/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapContainerNode.js
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapContainerNode.js
@@ -2,7 +2,6 @@ const fillTheGapContainerNode = {
   attrs: {
     id: { default: '' },
     class: { default: 'fill-the-gap' },
-    answer: { default: false },
     feedback: { default: '' },
   },
   group: 'block questions',
@@ -16,9 +15,8 @@ const fillTheGapContainerNode = {
       tag: 'div.fill-the-gap',
       getAttrs(dom) {
         return {
-          id: dom.dataset.id,
+          id: dom.getAttribute('id'),
           class: dom.getAttribute('class'),
-          answer: JSON.parse(dom.getAttribute('answer').toLowerCase()),
           feedback: dom.getAttribute('feedback'),
         };
       },
diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapNode.js b/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapNode.js
index d8b64096ce1f976ce46918ee953e6673c735a757..c437d1b3bbbb0fbdb24e0357502c3464aad2bd0f 100644
--- a/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapNode.js
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapNode.js
@@ -2,6 +2,7 @@ const fillTheGapNode = {
   attrs: {
     id: { default: '' },
     class: { default: 'fill-the-gap' },
+    anser: { default: '' },
   },
   group: 'inline',
   content: 'text*',
@@ -15,6 +16,7 @@ const fillTheGapNode = {
         return {
           id: dom.getAttribute('id'),
           class: dom.getAttribute('class'),
+          answer: dom.getAttribute('answer'),
         };
       },
     },
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js
index e599b8c6d0594b00247291e2f2544713269e4e7a..832cb0404d37fd271e8c18aaeb5c03aae53d5814 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js
@@ -14,7 +14,7 @@ const multipleChoiceSingleCorrectContainerNode = {
       tag: 'div.multiple-choice-single-correct',
       getAttrs(dom) {
         return {
-          id: dom.dataset.id,
+          id: dom.getAttribute('id'),
           class: dom.getAttribute('class'),
           correctId: dom.getAttribute('correctId'),
         };
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseContainerNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseContainerNode.js
index e8ef98456dc902cb2168e5f3ebf2f6e3c1eb0e2a..1964b6413176229c0e3a1854f8637aac2f6f406a 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseContainerNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseContainerNode.js
@@ -13,7 +13,7 @@ const trueFalseContainerNode = {
       tag: 'div.true-false',
       getAttrs(dom) {
         return {
-          id: dom.dataset.id,
+          id: dom.getAttribute('id'),
           class: dom.getAttribute('class'),
         };
       },
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/trueFalseSingleCorrectContainerNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/trueFalseSingleCorrectContainerNode.js
index c4dbe99b0f3814f96dcf172a4d7dd66cd6d000cf..b3be9922b001b43c07ce75fba5f674da6179675e 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/trueFalseSingleCorrectContainerNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/trueFalseSingleCorrectContainerNode.js
@@ -13,7 +13,7 @@ const trueFalseSingleCorrectContainerNode = {
       tag: 'div.true-false-single-correct',
       getAttrs(dom) {
         return {
-          id: dom.dataset.id,
+          id: dom.getAttribute('id'),
           class: dom.getAttribute('class'),
         };
       },
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js
index ffe3c980123a5237b68f0e8a1ecd5ef0df5ca563..8e556bf26298a432513a1cc15d4a38b7b4c95631 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js
@@ -11,7 +11,7 @@ const multipleChoiceContainerNode = {
       tag: 'div.multiple-choice',
       getAttrs(dom) {
         return {
-          id: dom.dataset.id,
+          id: dom.getAttribute('id'),
           class: dom.getAttribute('class'),
         };
       },