diff --git a/wax-prosemirror-components/src/components/images/ImageUpload.js b/wax-prosemirror-components/src/components/images/ImageUpload.js
index 0cde24a0d0a052d5040a9147692468a49a9c48b2..ac9c5be5eda221afef2d28c56e5d3927b2fdb7e3 100644
--- a/wax-prosemirror-components/src/components/images/ImageUpload.js
+++ b/wax-prosemirror-components/src/components/images/ImageUpload.js
@@ -85,7 +85,10 @@ const ImageUpload = ({ item, fileUpload, view }) => {
 
           <input
             id="file-upload"
-            onChange={e => fileUpload(e.target.files[0])}
+            onChange={e => {
+              fileUpload(e.target.files[0]);
+              if (inputRef.current) inputRef.current.value = '';
+            }}
             ref={inputRef}
             type="file"
           />
diff --git a/wax-prosemirror-services/src/ImageService/fileUpload.js b/wax-prosemirror-services/src/ImageService/fileUpload.js
index de699b77a9b795bb671faa723a61f4ab18f8dfcb..584c9c82b5abaa8729fc5bf8d34c298d7fc230a9 100644
--- a/wax-prosemirror-services/src/ImageService/fileUpload.js
+++ b/wax-prosemirror-services/src/ImageService/fileUpload.js
@@ -22,7 +22,14 @@ export default (view, fileUpload, placeholderPlugin) => file => {
   view.dispatch(tr);
 
   fileUpload(file).then(
-    (url, extraData = {}) => {
+    fileData => {
+      let url = fileData;
+      let extraData = {};
+      if (typeof fileData === 'object') {
+        url = fileData.url;
+        extraData = fileData.extraData;
+      }
+
       const pos = findPlaceholder(view.state, id, placeholderPlugin);
       // If the content around the placeholder has been deleted, drop
       // the image
diff --git a/wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/DropDownComponent.js b/wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/DropDownComponent.js
index c017952ab83768755b1eba2e7e1cda5de0e39f2b..db18e8ebfc3302c9095d239cf2780716765eadb2 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/DropDownComponent.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/DropDownComponent.js
@@ -53,42 +53,42 @@ const DropDownComponent = ({ view, tools }) => {
 
   const dropDownOptions = [
     {
-      label: '1. Multiple Choice',
+      label: 'Multiple Choice',
       value: '0',
       item: tools[0],
     },
     {
-      label: '2. Multiple Choice (single correct)',
+      label: 'Multiple Choice (single correct)',
       value: '1',
       item: tools[1],
     },
     {
-      label: '3. True/False',
+      label: 'True/False',
       value: '2',
       item: tools[2],
     },
     {
-      label: '4. True/False (single correct)',
+      label: 'True/False (single correct)',
       value: '3',
       item: tools[3],
     },
     {
-      label: '5. Matching',
+      label: 'Matching',
       value: '4',
       item: tools[4],
     },
     {
-      label: '6. Essay',
+      label: 'Essay',
       value: '5',
       item: tools[5],
     },
     {
-      label: '7. Multiple DropDown',
+      label: 'Multiple DropDown',
       value: '6',
       item: tools[6],
     },
     {
-      label: '8. Fill The Gap',
+      label: 'Fill The Gap',
       value: '7',
       item: tools[7],
     },