diff --git a/source/net/yacy/cora/storage/ConfigurationSet.java b/source/net/yacy/cora/storage/ConfigurationSet.java
index 6ac64ff30..de025bfea 100644
--- a/source/net/yacy/cora/storage/ConfigurationSet.java
+++ b/source/net/yacy/cora/storage/ConfigurationSet.java
@@ -121,13 +121,13 @@ public class ConfigurationSet extends AbstractSet<String> implements Set<String>
         return false;
     }
 
-    public void fill(final ConfigurationSet other) {
+    public void fill(final ConfigurationSet other, final boolean defaultActivated) {
         final Iterator<Entry> i = other.allIterator();
         Entry e;
         while (i.hasNext()) {
             e = i.next();
             if (contains(e.key) || containsDisabled(e.key)) continue;
-            this.add(e.key(), other.commentHeadline(e.key()), e.enabled());
+            this.add(e.key(), other.commentHeadline(e.key()), defaultActivated && e.enabled());
         }
     }
 
diff --git a/source/net/yacy/search/Switchboard.java b/source/net/yacy/search/Switchboard.java
index 4a34e54c8..2a76c74e1 100644
--- a/source/net/yacy/search/Switchboard.java
+++ b/source/net/yacy/search/Switchboard.java
@@ -295,7 +295,7 @@ public final class Switchboard extends serverSwitch
         }
 
         // init TrayIcon if possible
-        tray = new Tray(this);
+        this.tray = new Tray(this);
 
         // remote proxy configuration
         initRemoteProxy();
@@ -650,7 +650,7 @@ public final class Switchboard extends serverSwitch
 
         // update the working scheme with the backup scheme. This is necessary to include new features.
         // new features are always activated by default
-        workingScheme.fill(backupScheme);
+        workingScheme.fill(backupScheme, false);
 
         // set up the solr interface
         final String solrurls =
@@ -1598,7 +1598,7 @@ public final class Switchboard extends serverSwitch
         Domains.close();
         AccessTracker.dumpLog(new File("DATA/LOG/queries.log"));
         UPnP.deletePortMapping();
-        tray.remove();
+        this.tray.remove();
         try {
             HTTPClient.closeConnectionManager();
         } catch ( final InterruptedException e ) {