diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestion.js b/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
index ab90228b636c032245f8bf13d456cab0d90f89bb..735ab1857f2a37ae33269e5306d192000d09d350 100644
--- a/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
+++ b/editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
@@ -3,11 +3,8 @@ import { isEmpty } from 'lodash';
 import { injectable } from 'inversify';
 import { Tools } from 'wax-prosemirror-services';
 import { Commands } from 'wax-prosemirror-utilities';
-import { Fragment } from 'prosemirror-model';
-import { findWrapping } from 'prosemirror-transform';
 
 import { v4 as uuidv4 } from 'uuid';
-import helpers from './helpers/helpers';
 import ToolBarBtn from './components/ToolBarBtn';
 
 const checkifEmpty = view => {
diff --git a/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/ToolBarBtn.js b/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/ToolBarBtn.js
index 2aa66bb1398227c2f96da6739c3056b24e0aa4f7..180b1787e4acfc66c4d42a31ef3563290c5dd7b2 100644
--- a/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/ToolBarBtn.js
+++ b/editors/demo/src/HHMI/MultipleChoiceQuestionService/components/ToolBarBtn.js
@@ -3,13 +3,12 @@ import React, { useContext, useMemo } from 'react';
 import { WaxContext } from 'wax-prosemirror-core';
 import styled, { css } from 'styled-components';
 import { MenuButton } from 'wax-prosemirror-components';
-import { Commands } from 'wax-prosemirror-utilities';
+import { v4 as uuidv4 } from 'uuid';
 import { Fragment } from 'prosemirror-model';
 import { TextSelection } from 'prosemirror-state';
 import { wrapIn } from 'prosemirror-commands';
 import helpers from '../helpers/helpers';
 
-import { v4 as uuidv4 } from 'uuid';
 const activeStyles = css`
   pointer-events: none;
 `;
@@ -48,10 +47,9 @@ const ToolBarBtn = ({ view = {}, item }) => {
     let { $from, $to } = state.selection;
     let range = $from.blockRange($to);
 
-    wrapIn(state.config.schema.nodes.multiple_choice_container)(
-      state,
-      dispatch,
-    );
+    wrapIn(state.config.schema.nodes.multiple_choice_container, {
+      id: uuidv4(),
+    })(state, dispatch);
 
     /* set New Selection */
     dispatch(