diff --git a/editors/demo/src/HHMI/HHMI.js b/editors/demo/src/HHMI/HHMI.js
index 1baf671f6dc2e4885b2bfe82bf6cf02f0176c567..58e26fb8cf0939141047a8e97f1609070ce149dc 100644
--- a/editors/demo/src/HHMI/HHMI.js
+++ b/editors/demo/src/HHMI/HHMI.js
@@ -183,7 +183,7 @@ const Hhmi = () => {
         config={config}
         autoFocus
         fileUpload={file => renderImage(file)}
-        value=""
+        value={initialValue}
         targetFormat="JSON"
         // readonly
         layout={HhmiLayout}
diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/QuestionComponent.js b/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/QuestionComponent.js
index face78635b144c9c595921259ed032926a78f19c..e4675a6ca55733936cb3bde6d7ff008844d74936 100644
--- a/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/QuestionComponent.js
+++ b/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/QuestionComponent.js
@@ -60,7 +60,6 @@ const Question = styled.div`
 `;
 
 export default ({ node, view, getPos }) => {
-  console.log(node);
   const context = useContext(WaxContext);
   const [showExplanation, setShowExplanation] = useState(false);
   const [explanationValue, setExplanationValue] = useState('');
diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/schema/multipleChoiceNode.js b/editors/demo/src/HHMI/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
index ad3a371ebf51b69e13a62d354f6fe4c384efe2de..adfd3e60ebf28956ba8369d17c29f404bb434e46 100644
--- a/editors/demo/src/HHMI/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
+++ b/editors/demo/src/HHMI/MultipleChoiceQuestionService/schema/multipleChoiceNode.js
@@ -1,6 +1,6 @@
 const multipleChoiceNode = {
   group: 'inline',
-  content: 'inline*',
+  content: 'block*',
   inline: true,
   // atom: true,
   attrs: {
diff --git a/wax-prosemirror-core/src/PortalContext.js b/wax-prosemirror-core/src/PortalContext.js
index 193cc1d36f4e603db1d233bc8d162664e2afdf83..4a8f32447b0c11604a280c109de9f3722a3bc840 100644
--- a/wax-prosemirror-core/src/PortalContext.js
+++ b/wax-prosemirror-core/src/PortalContext.js
@@ -27,16 +27,18 @@ export default props => {
       decorations,
       context,
     ) => {
-      setPortal({
-        ...portal,
-        id: uuidv4(),
-        element,
-        component,
-        node,
-        view,
-        getPos,
-        decorations,
-        context,
+      setTimeout(() => {
+        setPortal({
+          ...portal,
+          id: uuidv4(),
+          element,
+          component,
+          node,
+          view,
+          getPos,
+          decorations,
+          context,
+        });
       });
     },
   });
diff --git a/wax-prosemirror-services/src/PortalService/components/PortalComponent.js b/wax-prosemirror-services/src/PortalService/components/PortalComponent.js
index 983fdfb4749f426944491c726c567fc20be98a33..520c5d3911a94b53d0d1b4f491204a1861036d5e 100644
--- a/wax-prosemirror-services/src/PortalService/components/PortalComponent.js
+++ b/wax-prosemirror-services/src/PortalService/components/PortalComponent.js
@@ -30,6 +30,7 @@ export default () => {
         portals.map(({ dom, component: Component, id }) => {
           return ReactDOM.createPortal(
             <Component
+              key={id}
               decorations={decorations}
               getPos={getPos}
               node={node}