diff --git a/src/layouts/vehicle-make/make-question/make-question.vue b/src/layouts/vehicle-make/make-question/make-question.vue
index eaa6b7306..7af0ceb83 100644
--- a/src/layouts/vehicle-make/make-question/make-question.vue
+++ b/src/layouts/vehicle-make/make-question/make-question.vue
@@ -1,10 +1,10 @@
 <template>
 <buttonQuestion class="radioQuestion"
+    isVehicleQuestion
     :questionText="questionText"
     :answers="makes"
     groupName="Choose Vehicle Make"
     textPosition="text-start"
-    :isVehicleQuestion="true"
     :loaderEnabled="true"
     v-model="modelValue"
   />
diff --git a/src/layouts/vehicle-model/model-question/model-question.vue b/src/layouts/vehicle-model/model-question/model-question.vue
index bb50872d6..763372d53 100644
--- a/src/layouts/vehicle-model/model-question/model-question.vue
+++ b/src/layouts/vehicle-model/model-question/model-question.vue
@@ -1,10 +1,10 @@
 <template>
 <buttonQuestion class="radioQuestion"
+    isVehicleQuestion
     :questionText="questionText"
     :answers="models"
     groupName="Choose Vehicle Model"
     textPosition="text-start"
-    :isVehicleQuestion="true"
     :loaderEnabled="true"
     v-model="modelValue"
   />
diff --git a/src/layouts/vehicle-style/style-question/style-question.vue b/src/layouts/vehicle-style/style-question/style-question.vue
index d14b39599..f64ed4476 100644
--- a/src/layouts/vehicle-style/style-question/style-question.vue
+++ b/src/layouts/vehicle-style/style-question/style-question.vue
@@ -1,10 +1,10 @@
 <template>
 <buttonQuestion class="radioQuestion"
+    isVehicleQuestion
     :questionText="questionText"
     :answers="styles"
     groupName="Choose Vehicle Style"
     textPosition="text-start"
-    :isVehicleQuestion="true"
     :loaderEnabled="true"
     v-model="modelValue"
   />
diff --git a/src/layouts/vehicle-year/year-question/year-question.vue b/src/layouts/vehicle-year/year-question/year-question.vue
index 523a25bb3..11c9bd7af 100644
--- a/src/layouts/vehicle-year/year-question/year-question.vue
+++ b/src/layouts/vehicle-year/year-question/year-question.vue
@@ -1,9 +1,9 @@
 <template>
 <buttonQuestion class="radioQuestion"
+    isVehicleQuestion
     :questionText="questionText"
     :answers="years"
     groupName="Choose Vehicle Year"
-    :isVehicleQuestion="true"
     textPosition="text-start"
     :loaderEnabled="true"
     v-model="modelValue"
@@ -26,6 +26,7 @@ export default {
   props: {
     modelValue: String,
   },
+  emits: ['update:modelValue'],
   components: {
     buttonQuestion,
   },
diff --git a/src/ux-components/replace-options-question/replace-options-question.vue b/src/ux-components/replace-options-question/replace-options-question.vue
index e8c14a42d..699e9bddc 100644
--- a/src/ux-components/replace-options-question/replace-options-question.vue
+++ b/src/ux-components/replace-options-question/replace-options-question.vue
@@ -1,7 +1,17 @@
+<template>
+    <div class="replace-options-question">
+        <buttonQestion
+            v-if="isAvailable"
+            :isMultiSelect="isMultiSelect"
+         />
+    </div>
+</template>
+
 <script>
+import buttonQuestion from "@/common-components/button-question/button-question";
 
 export default ({
-    name: "replace-options-question",
+    name: "replaceOptionsQuestion",
     data(){
         return {
             questionText: String,
@@ -13,6 +23,16 @@ export default ({
         isMultiSelect: Boolean,
         isAvailable: Boolean,
         filterByVehicleCategory: Boolean
+    },
+    methods: {
+        initializeComponent(cmsContent, replaceOptions){
+            this.questionText = cmsContent.QuestionText;
+            this.answersFromCms = cmsContent.Answers;
+            this.replaceOptions = replaceOptions;
+        }
+    },
+    components: {
+        buttonQuestion,
     }
 })
 </script>