diff --git a/src/main/java/org/olat/ims/qti21/model/xml/AssessmentItemMetadata.java b/src/main/java/org/olat/ims/qti21/model/xml/AssessmentItemMetadata.java
index 6be87465999a592b1176c2a57a7f005232c1df76..d1075655b69ce76b2708dcaadb96b2950b46a400 100644
--- a/src/main/java/org/olat/ims/qti21/model/xml/AssessmentItemMetadata.java
+++ b/src/main/java/org/olat/ims/qti21/model/xml/AssessmentItemMetadata.java
@@ -255,7 +255,7 @@ public class AssessmentItemMetadata {
 		}
 		
 		//qti metadata
-		QTIMetadataType qtiMetadata = metadata.getQtiMetadata(false);
+		QTIMetadataType qtiMetadata = metadata.getQtiMetadata(true);
 		if(qtiMetadata.getToolName() != null) {
 			editor = qtiMetadata.getToolName();
 		}
diff --git a/src/main/java/org/olat/ims/qti21/pool/QTI21ImportProcessor.java b/src/main/java/org/olat/ims/qti21/pool/QTI21ImportProcessor.java
index 7e9099b45571e930de0b31ce8b9b2f7e4b71b218..1eccd9781d85a0442f6e47b8361f0b9d96308f00 100644
--- a/src/main/java/org/olat/ims/qti21/pool/QTI21ImportProcessor.java
+++ b/src/main/java/org/olat/ims/qti21/pool/QTI21ImportProcessor.java
@@ -155,6 +155,9 @@ public class QTI21ImportProcessor {
 			//storage
 			File itemStorage = qpoolFileStorage.getDirectory(dir);
 			File outputFile = new File(itemStorage, href);
+			if(!outputFile.getParentFile().exists()) {
+				outputFile.getParentFile().mkdirs();
+			}
 			convertXmlFile(assessmentItemPath, outputFile.toPath());
 
 			QtiXmlReader qtiXmlReader = new QtiXmlReader(qtiService.jqtiExtensionManager());
@@ -194,7 +197,7 @@ public class QTI21ImportProcessor {
 			for(String material:materials) {
 				if(material.indexOf("://") < 0) {// material can be an external URL
 					Path materialFile = assessmentItemPath.getParent().resolve(material);
-					PathUtils.copyFileToDir(materialFile, itemStorage, material);
+					PathUtils.copyFileToDir(materialFile, outputFile.getParentFile(), material);
 				}
 			}
 			return qitem;
diff --git a/src/main/java/org/olat/ims/qti21/ui/components/_content/graphicGapMatchInteraction.html b/src/main/java/org/olat/ims/qti21/ui/components/_content/graphicGapMatchInteraction.html
index f3ff461dba67fdc5fb6435f28a791ab9d92eb6b8..1379ee19e0f1949deae0e91fa54365ca390d39c3 100644
--- a/src/main/java/org/olat/ims/qti21/ui/components/_content/graphicGapMatchInteraction.html
+++ b/src/main/java/org/olat/ims/qti21/ui/components/_content/graphicGapMatchInteraction.html
@@ -36,8 +36,10 @@
 		jQuery(function() {
 			var map = jQuery('#${containerId}_img').maphilight({
 				fillColor: '888888',
-				strokeColor: '0000ff',
-				strokeWidth: 3
+				strokeColor: '333333',
+				strokeOpacity: 0.5,
+				strokeWidth: 3,
+				alwaysOn: true
 			});
 
 			jQuery('#${containerId}').graphicGapInteraction({