diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue
index e1fee1e40..d86dcd2ce 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@@ -10,7 +10,8 @@
         <legend class="sr-only">{{groupName}}</legend>
           <listButton v-for="answer in answers" :key="answer"
             :buttonID="answer"
-            @click="chooseAnswer(answer)"
+            @mouseup="chooseAnswer(answer)"
+            @keyup.space="chooseAnswer(answer)"
             loaderColor="blue"
             loaderPosition="right"
             sizeInRem="1.5"
diff --git a/src/common-components/funnel-sub-header/funnel-sub-header.vue b/src/common-components/funnel-sub-header/funnel-sub-header.vue
index 5e3bcc7e3..3f1414e56 100644
--- a/src/common-components/funnel-sub-header/funnel-sub-header.vue
+++ b/src/common-components/funnel-sub-header/funnel-sub-header.vue
@@ -6,6 +6,7 @@
         v-if="hasBackButton"
         :backButtonAccessibleText="backButtonAccessibleText"
         :backButtonAction="backButtonAction"
+        :backButtonUrl="backButtonUrl"
       />
     </div>
   </div>
diff --git a/src/layouts/vehicle-make/vehicle-make.spec.js b/src/layouts/vehicle-make/vehicle-make.spec.js
index 87df24e38..9cae9966f 100644
--- a/src/layouts/vehicle-make/vehicle-make.spec.js
+++ b/src/layouts/vehicle-make/vehicle-make.spec.js
@@ -44,6 +44,7 @@ describe("vehicle-make.vue", () => {
     //Assert
     const header = await wrapper.find(".Header");
     apiPromise.finally(() => {
+      console.log(header)
       expect(header.attributes("text")).toEqual("Select a make to get started");
       done();
     });
diff --git a/src/layouts/vehicle-model/model-question/model-question.vue b/src/layouts/vehicle-model/model-question/model-question.vue
index 32b5b72b4..95b72909b 100644
--- a/src/layouts/vehicle-model/model-question/model-question.vue
+++ b/src/layouts/vehicle-model/model-question/model-question.vue
@@ -30,7 +30,7 @@ export default {
   },
   methods: {
     loadInitialData() {
-      return store.dispatch(storeActions.GET_VEHICLE_MODELS, {year: store.getters.vehicle.year, make: store.getters.vehicle.make});
+      return store.dispatch(storeActions.GET_VEHICLE_MODELS, {year: store.getters.vehicle.year, make: encodeURIComponent(store.getters.vehicle.make)});
     },
     initializeComponent(cmsContent, initialData) {
       this.questionText = cmsContent.QuestionText;