diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index f107356e6..be43f0db2 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -74,7 +74,6 @@ export default {
     data() {
         return {
             selectedAnswer: [],
-            // TODO This shouldn't be an object with property `capabilityQuestions`
             capabilityQuestionsData: store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS).partsOrQuestions,
             selectedAnswers: {},
             currentQuestionChainIndex: 0,
@@ -108,11 +107,8 @@ export default {
             return this.currentQuestionChainIndex === i || part.answerData?.answerResult?.length > 0
         },
         arePagePrerequisitesValid() {
-            return true;
-
-            // TODO UNCOMMENT
-            // const capabilityQuestionsPageData = store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS);
-            // return capabilityQuestionsPageData && Object.keys(capabilityQuestionsPageData).length > 0;
+            const capabilityQuestionsPageData = store.getters.pageData(fmgPageValues.CAPABILITY_QUESTIONS);
+            return capabilityQuestionsPageData && Object.keys(capabilityQuestionsPageData).length > 0;
         },
         async forwardButtonAction() {
             const capabilityQuestionsAnswersArray = this.capabilityQuestionsData.map((item) => {
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 6c0c56dad..cdfc5f261 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -72,9 +72,7 @@ export default {
             const hasPartQuestions = this.hasPartQuestions(partsOrQuestions)
             const hasGlassLocationWithMultipleParts = this.hasGlassLocationWithMultipleParts(partsOrQuestions);
             const hasChildPartQuestions = this.hasChildPartQuestions(partsOrQuestions);
-
-            // TODO REMOVE
-            const hasCapabilityQuestions = true //this.hasCapabilityQuestions(partsOrQuestions);
+            const hasCapabilityQuestions = this.hasCapabilityQuestions(partsOrQuestions);
 
             if (hasPartQuestions && this.currentPageComesBeforePage(currentPage, fmgPageValues.PART_QUESTIONS)) {
                 self.$router.navigateWithSaving(self.navigationScenarios.HAS_PART_QUESTIONS, self.$route, {}, {}, { partsOrQuestions: partsOrQuestions });
diff --git a/src/router/index.js b/src/router/index.js
index b45e0b403..5c4b6ca75 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -224,7 +224,7 @@ function navigateToUrl(url, optionalQuery = {}) {
   for (const queryKey in optionalQuery) {
     externalUrl.searchParams.append(queryKey, optionalQuery[queryKey]);
   }
-
+  
   window.location.assign(externalUrl);
 }