Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20210714.sql
===================================================================
diff -u
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20210714.sql	(revision 0)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20210714.sql	(revision a8dc5beef635a2dbbc6ae9c0143ba641e2522fa7)
@@ -0,0 +1,15 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+-- Put all sql statements below here
+
+-- LDEV-4868 Bump version so content version filter kicks in
+
+UPDATE lams_tool SET tool_version='20210714' WHERE tool_signature='lascrt11';
+
+-- Put all sql statements above here
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java
===================================================================
diff -u -re8a7110708b15579af2c6b31ac52a6da427fef6d -ra8dc5beef635a2dbbc6ae9c0143ba641e2522fa7
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java	(.../ScratchieImportContentVersionFilter.java)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java	(.../ScratchieImportContentVersionFilter.java)	(revision a8dc5beef635a2dbbc6ae9c0143ba641e2522fa7)
@@ -99,7 +99,7 @@
 	this.removeField(ScratchieItem.class, "userMark");
 	this.removeField(ScratchieItem.class, "userAttempts");
     }
-    
+
     /**
      * Migration to Question Bank
      */
@@ -184,4 +184,18 @@
 	    }
 	});
     }
+
+    /**
+     * Change Scratchie items collection type
+     */
+    public void up20190809To20210714(String toolFilePath) throws IOException {
+	transformXML(toolFilePath, toolRoot -> {
+	    NodeList scratchieItems = toolRoot.getElementsByTagName("scratchieItems");
+	    if (scratchieItems.getLength() == 0) {
+		return;
+	    }
+
+	    ((Element) scratchieItems.item(0)).setAttribute("class", "sorted-set");
+	});
+    }
 }