diff --git a/fuelmenu/modules/feature_groups.py b/fuelmenu/modules/feature_groups.py
index 5d9d749..ce07d7b 100644
--- a/fuelmenu/modules/feature_groups.py
+++ b/fuelmenu/modules/feature_groups.py
@@ -90,13 +90,14 @@ class feature_groups(urwid.WidgetWrap):
                 log.warning("unexpected error: %s", e.message)
 
     def save(self, responses):
-        settings = self.parent.settings
-        newsettings = ModuleHelper.make_settings_from_responses(responses)
-        settings.merge(newsettings)
-
-        for setting in self.defaults:
+        newsettings = {}
+        for setting in responses:
             part1, part2 = setting.split("/")
-            self.defaults[setting]["value"] = part2 in settings[part1]
+            if part1 not in newsettings:
+                newsettings[part1] = []
+            if responses[setting]:
+                newsettings[part1].append(part2)
+        self.parent.settings.merge(newsettings)
 
     def cancel(self, button):
         ModuleHelper.cancel(self, button)
diff --git a/fuelmenu/settings.yaml b/fuelmenu/settings.yaml
index e41f917..6f22cab 100644
--- a/fuelmenu/settings.yaml
+++ b/fuelmenu/settings.yaml
@@ -65,4 +65,4 @@ BOOTSTRAP:
     suite: "mos${mos_version}-holdback"
     type: "deb"
 PRODUCTION: docker
-FEATURE_GROUPS: {}
+FEATURE_GROUPS: []