diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/QuizLookupList.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/QuizLookupList.java
index 374c6704..4ba77093 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/QuizLookupList.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/exam/QuizLookupList.java
@@ -451,7 +451,7 @@ public class QuizLookupList implements TemplateComposer {
         }
     }
 
-    private boolean showingFetchNote = false;
+    private Composite warningPanel = null;
 
     private void handelPageReload(
             final Composite notePanel,
@@ -459,29 +459,28 @@ public class QuizLookupList implements TemplateComposer {
 
         if (table.isComplete()) {
             PageService.clearComposite(notePanel);
-            this.showingFetchNote = false;
-        } else {
-            if (!this.showingFetchNote) {
-                final Composite warningPanel = this.widgetFactory.createWarningPanel(notePanel, 15, true);
-                GridData gridData = new GridData(SWT.CENTER, SWT.CENTER, false, true);
-                gridData.heightHint = 28;
-                gridData.widthHint = 25;
-                gridData.verticalIndent = 5;
-
-                this.widgetFactory.imageButton(
-                        ImageIcon.SWITCH,
-                        warningPanel,
-                        TEXT_FETCH_NOTE_TOOLTIP,
-                        event -> table.applyFilter());
-
-                final Label text = new Label(warningPanel, SWT.NONE);
-                text.setData(RWT.MARKUP_ENABLED, Boolean.TRUE);
-                text.setText(this.pageService.getI18nSupport().getText(TEXT_FETCH_NOTE));
-                gridData = new GridData(SWT.LEFT, SWT.FILL, true, true);
-                gridData.heightHint = 16;
-                text.setLayoutData(gridData);
-                this.showingFetchNote = true;
+            if (this.warningPanel != null) {
+                this.warningPanel.dispose();
             }
+            this.warningPanel = null;
+        } else {
+            if (this.warningPanel != null && !this.warningPanel.isDisposed()) {
+                this.warningPanel.dispose();
+            }
+
+            this.warningPanel = this.widgetFactory.createWarningPanel(notePanel, 15, true);
+            this.widgetFactory.imageButton(
+                    ImageIcon.SWITCH,
+                    this.warningPanel,
+                    TEXT_FETCH_NOTE_TOOLTIP,
+                    event -> table.applyFilter());
+
+            final Label text = new Label(this.warningPanel, SWT.NONE);
+            text.setData(RWT.MARKUP_ENABLED, Boolean.TRUE);
+            text.setText(this.pageService.getI18nSupport().getText(TEXT_FETCH_NOTE));
+            final GridData gridData = new GridData(SWT.LEFT, SWT.FILL, true, true);
+            gridData.heightHint = 28;
+            text.setLayoutData(gridData);
         }
         notePanel.getParent().layout(true, true);
     }
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringRunningExam.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringRunningExam.java
index ea3664ac..c33c5e50 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringRunningExam.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringRunningExam.java
@@ -154,7 +154,7 @@ public class MonitoringRunningExam implements TemplateComposer {
                 pageContext.getParent(),
                 new LocTextKey(
                         "sebserver.monitoring.exam",
-                        StringEscapeUtils.escapeHtml4(exam.name)));
+                        StringEscapeUtils.escapeXml11(exam.name)));
 
         final Composite tablePane = new Composite(content, SWT.NONE);
         tablePane.setLayout(new GridLayout());
diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/PolyglotPageServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/PolyglotPageServiceImpl.java
index 1ddf4989..bc1beaf2 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/PolyglotPageServiceImpl.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/PolyglotPageServiceImpl.java
@@ -270,7 +270,16 @@ public final class PolyglotPageServiceImpl implements PolyglotPageService {
 
         return label -> {
             if (locTextKey != null) {
-                label.setText(i18nSupport.getText(locTextKey));
+                try {
+                    label.setText(i18nSupport.getText(locTextKey));
+                } catch (final Exception e) {
+                    label.setData(RWT.MARKUP_ENABLED, false);
+                    try {
+                        label.setText(i18nSupport.getText(locTextKey));
+                    } catch (final Exception ee) {
+                        label.setText(locTextKey.name);
+                    }
+                }
             }
             if (i18nSupport.hasText(locToolTipKey)) {
                 label.setToolTipText(Utils.formatLineBreaks(i18nSupport.getText(locToolTipKey)));
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/mockup/MockCourseAccessAPI.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/mockup/MockCourseAccessAPI.java
index c8bf545a..e5db1a9b 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/mockup/MockCourseAccessAPI.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/mockup/MockCourseAccessAPI.java
@@ -63,7 +63,8 @@ public class MockCourseAccessAPI implements CourseAccessAPI {
                 "quiz1", institutionId, lmsSetupId, lmsType, "Demo Quiz 1 (MOCKUP)", "<p>Demo Quiz Mockup</p>",
                 "2020-01-01T09:00:00Z", null, "http://lms.mockup.com/api/"));
         this.mockups.add(new QuizData(
-                "quiz2", institutionId, lmsSetupId, lmsType, "Demo Quiz 2 (MOCKUP)", "<p>Demo Quiz Mockup</p>",
+                "quiz2", institutionId, lmsSetupId, lmsType, "Demo Quiz 2 (MOCKUP) äöüèÜÄÖ ?< ",
+                "<p>Demo Quiz Mockup</p>",
                 "2020-01-01T09:00:00Z", "2025-01-01T09:00:00Z", "http://lms.mockup.com/api/"));
         this.mockups.add(new QuizData(
                 "quiz3", institutionId, lmsSetupId, lmsType, "Demo Quiz 3 (MOCKUP)", "<p>Demo Quiz Mockup</p>",
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MoodlePluginCourseAccess.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MoodlePluginCourseAccess.java
index 9148964e..2321adeb 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MoodlePluginCourseAccess.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MoodlePluginCourseAccess.java
@@ -93,6 +93,7 @@ public class MoodlePluginCourseAccess extends AbstractCachedCourseAccess impleme
     private final int pageSize;
     private final int maxSize;
     private final int cutoffTimeOffset;
+    private final boolean applyNameCriteria;
 
     private MoodleAPIRestTemplate restTemplate;
 
@@ -101,11 +102,13 @@ public class MoodlePluginCourseAccess extends AbstractCachedCourseAccess impleme
             final AsyncService asyncService,
             final MoodleRestTemplateFactory restTemplateFactory,
             final CacheManager cacheManager,
-            final Environment environment) {
+            final Environment environment,
+            final boolean applyNameCriteria) {
 
         super(cacheManager);
         this.jsonMapper = jsonMapper;
         this.restTemplateFactory = restTemplateFactory;
+        this.applyNameCriteria = applyNameCriteria;
 
         this.prependShortCourseName = BooleanUtils.toBoolean(environment.getProperty(
                 "sebserver.webservice.lms.moodle.prependShortCourseName",
@@ -433,7 +436,9 @@ public class MoodlePluginCourseAccess extends AbstractCachedCourseAccess impleme
             final String fromElement = String.valueOf(page * size);
             final LinkedMultiValueMap<String, String> attributes = new LinkedMultiValueMap<>();
 
-            if (StringUtils.isNotBlank(nameCondition)) {
+            // TODO clarify with Amr and Luca if this is OK
+            //      and if it is possible to apply the nameCondition also the the course name (shortname)
+            if (this.applyNameCriteria && StringUtils.isNotBlank(nameCondition)) {
                 sqlCondition = sqlCondition + " AND (m.name LIKE '" +
                         Utils.toSQLWildcard(nameCondition) +
                         "')";
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MooldePluginLmsAPITemplateFactory.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MooldePluginLmsAPITemplateFactory.java
index b455e7b8..7b027a1e 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MooldePluginLmsAPITemplateFactory.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MooldePluginLmsAPITemplateFactory.java
@@ -46,6 +46,7 @@ public class MooldePluginLmsAPITemplateFactory implements LmsAPITemplateFactory
     private final ExamConfigurationValueService examConfigurationValueService;
     private final ClientHttpRequestFactoryService clientHttpRequestFactoryService;
     private final String[] alternativeTokenRequestPaths;
+    private final boolean applyNameCriteria;
 
     protected MooldePluginLmsAPITemplateFactory(
             final JSONMapper jsonMapper,
@@ -55,7 +56,8 @@ public class MooldePluginLmsAPITemplateFactory implements LmsAPITemplateFactory
             final ClientCredentialService clientCredentialService,
             final ExamConfigurationValueService examConfigurationValueService,
             final ClientHttpRequestFactoryService clientHttpRequestFactoryService,
-            @Value("${sebserver.webservice.lms.moodle.api.token.request.paths:}") final String alternativeTokenRequestPaths) {
+            @Value("${sebserver.webservice.lms.moodle.api.token.request.paths:}") final String alternativeTokenRequestPaths,
+            @Value("${sebserver.webservice.lms.moodle.fetch.applyNameCriteria:false}") final boolean applyNameCriteria) {
 
         this.jsonMapper = jsonMapper;
         this.cacheManager = cacheManager;
@@ -67,6 +69,7 @@ public class MooldePluginLmsAPITemplateFactory implements LmsAPITemplateFactory
         this.alternativeTokenRequestPaths = (alternativeTokenRequestPaths != null)
                 ? StringUtils.split(alternativeTokenRequestPaths, Constants.LIST_SEPARATOR)
                 : null;
+        this.applyNameCriteria = applyNameCriteria;
     }
 
     @Override
@@ -90,7 +93,8 @@ public class MooldePluginLmsAPITemplateFactory implements LmsAPITemplateFactory
                     this.asyncService,
                     moodleRestTemplateFactory,
                     this.cacheManager,
-                    this.environment);
+                    this.environment,
+                    this.applyNameCriteria);
 
             final MoodlePluginCourseRestriction moodlePluginCourseRestriction = new MoodlePluginCourseRestriction(
                     this.jsonMapper,
diff --git a/src/main/resources/config/application-ws.properties b/src/main/resources/config/application-ws.properties
index f215b762..f3568646 100644
--- a/src/main/resources/config/application-ws.properties
+++ b/src/main/resources/config/application-ws.properties
@@ -81,6 +81,7 @@ sebserver.webservice.lms.openedx.api.token.request.paths=/oauth2/access_token
 sebserver.webservice.lms.moodle.api.token.request.paths=/login/token.php
 sebserver.webservice.lms.moodle.prependShortCourseName=true
 sebserver.webservice.lms.moodle.fetch.cutoffdate.yearsBeforeNow=2
+sebserver.webservice.lms.moodle.fetch.applyNameCriteria=false
 sebserver.webservice.lms.olat.sendAdditionalAttributesWithRestriction=false
 sebserver.webservice.lms.address.alias=
 sebserver.webservice.lms.datafetch.validity.seconds=600
diff --git a/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MoodlePluginCourseAccessTest.java b/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MoodlePluginCourseAccessTest.java
index 924b8875..75a659be 100644
--- a/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MoodlePluginCourseAccessTest.java
+++ b/src/test/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MoodlePluginCourseAccessTest.java
@@ -324,7 +324,8 @@ public class MoodlePluginCourseAccessTest {
                 asyncService,
                 moodleMockupRestTemplateFactory,
                 new NoOpCacheManager(),
-                mockEnvironment);
+                mockEnvironment,
+                false);
     }
 
 }