diff --git a/src/main/java/org/olat/core/commons/services/video/MovieServiceImpl.java b/src/main/java/org/olat/core/commons/services/video/MovieServiceImpl.java
index b10255b707f98794d49decc253d527470ff2065d..2b4ec40245e65700e73da71e6e405d7a34226146 100644
--- a/src/main/java/org/olat/core/commons/services/video/MovieServiceImpl.java
+++ b/src/main/java/org/olat/core/commons/services/video/MovieServiceImpl.java
@@ -39,6 +39,7 @@ import org.olat.core.commons.services.thumbnail.ThumbnailSPI;
 import org.olat.core.commons.services.video.spi.FLVParser;
 import org.olat.core.logging.OLog;
 import org.olat.core.logging.Tracing;
+import org.olat.core.util.WorkThreadInformations;
 import org.olat.core.util.vfs.LocalFileImpl;
 import org.olat.core.util.vfs.VFSLeaf;
 import org.olat.ims.cp.ui.VFSCPNamedItem;
@@ -115,6 +116,9 @@ public class MovieServiceImpl implements MovieService, ThumbnailSPI {
 		FinalSize size = null;
 		if(file instanceof LocalFileImpl && thumbnailFile instanceof LocalFileImpl) {
 			try {
+				WorkThreadInformations.setInfoFiles(null, file);
+				WorkThreadInformations.set("Generate thumbnail (video) VFSLeaf=" + file);
+				
 				File baseFile = ((LocalFileImpl)file).getBasefile();
 				File scaledImage = ((LocalFileImpl)thumbnailFile).getBasefile();
 				BufferedImage frame = FrameGrab.getFrame(baseFile, 20);
@@ -126,6 +130,8 @@ public class MovieServiceImpl implements MovieService, ThumbnailSPI {
 			//ArrayIndexOutOfBoundsException
 			} catch (Exception | AssertionError e) {
 				log.error("", e);
+			} finally {
+				WorkThreadInformations.unset();
 			}
 		}
 		return size;
diff --git a/src/main/java/org/olat/search/service/indexer/FolderIndexerWorker.java b/src/main/java/org/olat/search/service/indexer/FolderIndexerWorker.java
index a4f071e43e7d4f65c9b0a9e9a64e0fa8f5efdea6..7924b868a80374432d32e3a54912aee5d770c2c2 100644
--- a/src/main/java/org/olat/search/service/indexer/FolderIndexerWorker.java
+++ b/src/main/java/org/olat/search/service/indexer/FolderIndexerWorker.java
@@ -111,7 +111,6 @@ public class FolderIndexerWorker implements Callable<Boolean> {
 			if (docFactory.isFileSupported(leaf)) {
 				String myFilePath = fPath + "/" + leaf.getName();
 				leafResourceContext.setFilePath(myFilePath);
-				//fxdiff FXOLAT-97: high CPU load tracker
 				WorkThreadInformations.setInfoFiles(myFilePath, leaf);
 				WorkThreadInformations.set("Index VFSLeaf=" + myFilePath + " at " + leafResourceContext.getResourceUrl());
 				Document document = docFactory.createDocument(leafResourceContext, leaf);
diff --git a/src/test/java/org/olat/selenium/page/course/CourseEditorPageFragment.java b/src/test/java/org/olat/selenium/page/course/CourseEditorPageFragment.java
index 1727d57ca96083bae2464e7a210585b86faffe41..80556a10d53ae575ff1404700473bef9c8e02a44 100644
--- a/src/test/java/org/olat/selenium/page/course/CourseEditorPageFragment.java
+++ b/src/test/java/org/olat/selenium/page/course/CourseEditorPageFragment.java
@@ -59,6 +59,7 @@ public class CourseEditorPageFragment {
 	public static final By changeNodeToolsMenu = By.cssSelector("ul.o_sel_course_editor_change_node");
 	public static final By changeNodeToolsMenuCaret = By.cssSelector("a.o_sel_course_editor_change_node");
 	
+	public static final By tabNavTabsBy = By.cssSelector("ul.nav.nav-tabs");
 	
 	public static final List<By> chooseRepoEntriesButtonList = new ArrayList<>();
 	static {
@@ -155,6 +156,7 @@ public class CourseEditorPageFragment {
 		for(WebElement tabLink:tabLinks) {
 			tabLink.click();
 			OOGraphene.waitBusy(browser);
+			OOGraphene.waitElement(tabNavTabsBy, 5, browser);
 			List<WebElement> chooseRepoEntry = browser.findElements(tabBy);
 			if(chooseRepoEntry.size() > 0) {
 				found = true;