diff --git a/editors/demo/src/HHMI/HHMI.js b/editors/demo/src/HHMI/HHMI.js
index 1db12ab4362fe08c088bd9fa1817cb2e7008dc60..4111f98a60ebdd11ae5b28f087ce674d173f02e8 100644
--- a/editors/demo/src/HHMI/HHMI.js
+++ b/editors/demo/src/HHMI/HHMI.js
@@ -59,10 +59,12 @@ const initialContent = `<p class="paragraph"></p>
    <p class="paragraph">first <span id="16ec8f33-db5b-4839-9567-8aa73b776bcf" class="fill-the-gap" answer="">answer1; answer2; answer3</span> second <span id="72f23a71-e774-4834-acba-f357afb6a243" class="fill-the-gap" answer="">answer 4; answer5;</span></p>
 </div>`;
 
+const val = `<p class="paragraph"></p><div id="9703faf4-523d-49b2-a719-3f4ecfff65b2" class="matching-container" options="[{&quot;label&quot;:&quot;dsdsd&quot;,&quot;value&quot;:&quot;633b428e-4fda-4b6d-a660-8e3f1f221391&quot;}]" feedback=""><p class="paragraph"><div id="60ccd550-7f65-4624-9e1e-eef7e4e68a73" class="matching-option" isfirst="true" answer="" correct="">dsdsdd</div></p><p class="paragraph"></p></div>`;
+
 const Hhmi = () => {
   const [submited, isSubmited] = useState(false);
   const [readOnly, isReadOnly] = useState(false);
-  const [content, setContent] = useState(initialContent);
+  const [content, setContent] = useState(val);
 
   const readOnlyQuestions = () => {
     setContent(editorRef.current.getContent());
diff --git a/wax-prosemirror-services/src/MatchingService/components/DropDownComponent.js b/wax-prosemirror-services/src/MatchingService/components/DropDownComponent.js
index d3b3ee1507b8ccdbdb2e92653f7ed6dc56214744..09ca74eb81f60397379152f13697f8ece77717a3 100644
--- a/wax-prosemirror-services/src/MatchingService/components/DropDownComponent.js
+++ b/wax-prosemirror-services/src/MatchingService/components/DropDownComponent.js
@@ -51,7 +51,6 @@ const DropComponent = ({ getPos, node, view }) => {
 
   const onChange = option => {
     setSelectedOption(option);
-
     const allNodes = getNodes(main);
     allNodes.forEach(singleNode => {
       if (singleNode.node.attrs.id === node.attrs.id) {
diff --git a/wax-prosemirror-services/src/MatchingService/components/MatchingOptionComponent.js b/wax-prosemirror-services/src/MatchingService/components/MatchingOptionComponent.js
index 9d1a46eb1d753f02e9253de5752ba1ee95c625a0..162276143503a4f6cdf15083e5c2bb17d9e4c34d 100644
--- a/wax-prosemirror-services/src/MatchingService/components/MatchingOptionComponent.js
+++ b/wax-prosemirror-services/src/MatchingService/components/MatchingOptionComponent.js
@@ -8,6 +8,7 @@ import { Icon } from 'wax-prosemirror-components';
 import { WaxContext } from 'wax-prosemirror-core';
 import EditorComponent from './EditorComponent';
 import DropDownComponent from './DropDownComponent';
+import ReadOnlyDropDownComponent from './ReadOnlyDropDownComponent';
 
 const Option = styled.div`
   display: flex;
@@ -105,13 +106,17 @@ export default ({ node, view, getPos }) => {
       )}
       <EditorComponent getPos={getPos} node={node} view={view} />
       <DropDownContainer>
-        {readOnly && customProps && customProps.showFeedBack && (
-          <span>Submit</span>
-        )}
         {!readOnly && (
           <DropDownComponent getPos={getPos} node={node} view={view} />
         )}
-        {readOnly && !customProps.showFeedBack && <span> READ ONLY </span>}
+
+        {readOnly && customProps && !customProps.showFeedBack && (
+          <ReadOnlyDropDownComponent getPos={getPos} node={node} view={view} />
+        )}
+
+        {readOnly && customProps && customProps.showFeedBack && (
+          <span> Submit </span>
+        )}
       </DropDownContainer>
     </Option>
   );
diff --git a/wax-prosemirror-services/src/MatchingService/schema/matchingOptionNode.js b/wax-prosemirror-services/src/MatchingService/schema/matchingOptionNode.js
index 5b8b51b14b31d2c7554c3d19ad1d2a46cfc49a16..7b3d0294e814235a7a0275fca2523f8785097875 100644
--- a/wax-prosemirror-services/src/MatchingService/schema/matchingOptionNode.js
+++ b/wax-prosemirror-services/src/MatchingService/schema/matchingOptionNode.js
@@ -35,7 +35,6 @@ const matchingOptionNode = {
         isfirst: node.attrs.isfirst,
         answer: node.attrs.answer,
         correct: node.attrs.correct,
-        feedback: node.attrs.feedback,
       },
       0,
     ];