diff --git a/platformcode/config.py b/platformcode/config.py
index eb1e09f1..b76b6c8f 100644
--- a/platformcode/config.py
+++ b/platformcode/config.py
@@ -147,9 +147,9 @@ def get_all_settings_addon():
         data = infile.read().decode('utf-8')
 
     ret = {}
-    matches = scrapertools.find_multiple_matches(data, '<setting id=\"([^\"]+)\"[^>]*>([^<]*)</setting>')
+    matches = scrapertools.find_multiple_matches(data, '<setting id=\"([^\"]+)\"[^>]*>')
 
-    for _id, value in matches:
+    for _id in matches:
         ret[_id] = get_setting(_id)
 
     return ret
diff --git a/service.py b/service.py
index 323b12dc..199dec5f 100644
--- a/service.py
+++ b/service.py
@@ -402,7 +402,7 @@ class AddonMonitor(xbmc.Monitor):
                     config.set_setting('elementum_on_seed', False)
             if self.settings_pre.get("shortcut_key", '') != settings_post.get("shortcut_key", ''):
                 xbmc.executebuiltin('Action(reloadkeymaps)')
-            self.settings_pre = settings_post
+            self.settings_pre.update(settings_post)
 
     def onNotification(self, sender, method, data):
         if method == 'VideoLibrary.OnUpdate':