diff --git a/.github/workflows/macos-apple-silicon.yml b/.github/workflows/macos-apple-silicon.yml
index 1ec445fc10..040cc41bec 100644
--- a/.github/workflows/macos-apple-silicon.yml
+++ b/.github/workflows/macos-apple-silicon.yml
@@ -7,6 +7,7 @@ on:
 
 jobs:
   build:
+    if: github.ref == 'refs/heads/develop'
     name: Build macOS ${{ matrix.arch }} nightly
     runs-on: ${{ matrix.runner }}
     strategy:
@@ -125,6 +126,7 @@ jobs:
           aws --endpoint-url "https://${S3_ENDPOINT}" s3 cp "target/media/${FILE_NAME}.sha512" "s3://${S3_BUCKET}/${FILE_NAME}.sha512"
 
   build-windows-arm64:
+    if: github.ref == 'refs/heads/develop'
     name: Build Windows ARM64 nightly
     runs-on: windows-11-arm
 
@@ -223,6 +225,7 @@ jobs:
           aws --endpoint-url $endpoint s3 cp "target\media\$zipName.sha512" "s3://$bucket/$zipName.sha512"
 
   build-windows-amd64:
+    if: github.ref == 'refs/heads/develop'
     name: Build Windows AMD64 nightly
     runs-on: windows-latest
 
diff --git a/src/main/java/mediathek/gui/tabs/tab_film/filter/SwingFilterDialog.java b/src/main/java/mediathek/gui/tabs/tab_film/filter/SwingFilterDialog.java
index 89b09bc130..f821d1cd24 100644
--- a/src/main/java/mediathek/gui/tabs/tab_film/filter/SwingFilterDialog.java
+++ b/src/main/java/mediathek/gui/tabs/tab_film/filter/SwingFilterDialog.java
@@ -269,7 +269,7 @@ private void setupThemaComboBox() {
         jcbThema.setSelectedItem(thema);
         jcbThema.addActionListener(_ -> {
             var sel = (String) jcbThema.getSelectedItem();
-            if (sel != null) {
+            if (sel != null && !sel.isEmpty()) {
                 filterConfig.setThema(sel);
             }
             MessageBus.getMessageBus().publish(new ReloadTableDataEvent());
@@ -303,11 +303,14 @@ private void restoreConfigSettings() {
         cbDontShowAudioVersions.setSelected(filterConfig.isDontShowAudioVersions());
         cbDontShowDuplicates.setSelected(filterConfig.isDontShowDuplicates());
 
+        //setSelectedItem wird 2x benötigt, da sonst entweder das Thema gar nicht geladen wird aus der Config, bzw. nicht in der Combobox angezeigt wird
         jcbThema.setSelectedItem(filterConfig.getThema());
 
         ((SenderCheckBoxList) senderList).restoreFilterConfig();
         ((FilmLengthSlider) filmLengthSlider).restoreFilterConfig(filterConfig);
+
         spZeitraum.restoreFilterConfig(filterConfig);
+        jcbThema.setSelectedItem(filterConfig.getThema());
     }
 
     private void enableControls(boolean enable) {
@@ -613,8 +616,9 @@ public void actionPerformed(ActionEvent e) {
                         existingFilter.ifPresentOrElse(_ -> {
                             //if a filter already exists we cannot rename...
                             JOptionPane.showMessageDialog(MediathekGui.ui(),
-                                    String.format("Filter %s existiert bereits.\nAktion wird abgebrochen", fName),
-                                    Konstanten.PROGRAMMNAME, JOptionPane.ERROR_MESSAGE);
+                                String.format(
+                                    "Filter %s existiert bereits.\nAktion wird abgebrochen", fName),
+                                Konstanten.PROGRAMMNAME, JOptionPane.ERROR_MESSAGE);
                         }, () -> {
                             // no existing name...
                             Configuration config = ApplicationConfiguration.getConfiguration();
@@ -626,9 +630,9 @@ public void actionPerformed(ActionEvent e) {
                             config.unlock(LockMode.WRITE);
                             logger.trace("Renamed filter \"{}\" to \"{}\"", fltName, fName);
                         });
-                    }
-                    else
+                    } else {
                         logger.warn("New and old filter name are identical...doing nothing");
+                    }
                 }
                 else {
                     JOptionPane.showMessageDialog(MediathekGui.ui(), "Filtername darf nicht leer sein!",