diff --git a/client/src/components/modules/Module.vue b/client/src/components/modules/Module.vue
index 4604315c..8df4e046 100644
--- a/client/src/components/modules/Module.vue
+++ b/client/src/components/modules/Module.vue
@@ -71,7 +71,7 @@
                 if (data.objective.objectiveProgress.edges.length > 0) {
                   data.objective.objectiveProgress.edges[0].node.done = done;
                 }
-                store.writeQuery({query: OBJECTIVE_QUERY, data});
+                store.writeQuery({query: OBJECTIVE_QUERY, data, variables});
               }
             } catch (e) {
               // Query did not exist in the cache, and apollo throws a generic Error. Do nothing
diff --git a/client/src/components/modules/ObjectiveGroupControl.vue b/client/src/components/modules/ObjectiveGroupControl.vue
index 3b2ae1b0..3aa68918 100644
--- a/client/src/components/modules/ObjectiveGroupControl.vue
+++ b/client/src/components/modules/ObjectiveGroupControl.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="objective-group objective-group--control objective-group-control">
+  <div class="objective-group objective-group-control">
     <h4>{{group.title}}</h4>
 
     <ul class="objective-group__objective-list objective-group__objective-list--no-list">
@@ -52,6 +52,10 @@
   @import "@/styles/_variables.scss";
   @import "@/styles/_functions.scss";
 
+  .objective-group-control {
+    background-color: $color-brand-light;
+  }
+
   .objective-group__objective-list /deep/ {
     .base-input-container {
 
diff --git a/client/src/styles/_objective-group.scss b/client/src/styles/_objective-group.scss
index 686f1de8..f61ffbc1 100644
--- a/client/src/styles/_objective-group.scss
+++ b/client/src/styles/_objective-group.scss
@@ -5,10 +5,6 @@
   padding: 17px;
   margin-bottom: 35px;
 
-  &--control {
-    background-color: $color-brand-light;
-  }
-
   &__objective-list {
     padding-left: 20px;
     list-style: disc;