diff --git a/apps/web/app/lib/survey-builder.ts b/apps/web/app/lib/survey-builder.ts
index 17bf48b2de..64bc6c766e 100644
--- a/apps/web/app/lib/survey-builder.ts
+++ b/apps/web/app/lib/survey-builder.ts
@@ -309,7 +309,7 @@ export const createJumpLogic = (
 // Helper function to create jump logic based on choice selection
 export const createChoiceJumpLogic = (
   sourceQuestionId: string,
-  choiceId: string,
+  choiceId: string | number,
   targetId: string
 ): TSurveyLogic => ({
   id: createId(),
diff --git a/apps/web/app/lib/templates.ts b/apps/web/app/lib/templates.ts
index 690fad10d8..3f0917864f 100644
--- a/apps/web/app/lib/templates.ts
+++ b/apps/web/app/lib/templates.ts
@@ -1210,6 +1210,7 @@ const feedbackBox = (t: TFnType): TTemplate => {
             t("templates.feedback_box_question_1_choice_1"),
             t("templates.feedback_box_question_1_choice_2"),
           ],
+          choiceIds: [reusableOptionIds[0], reusableOptionIds[1]],
           headline: t("templates.feedback_box_question_1_headline"),
           required: true,
           subheader: t("templates.feedback_box_question_1_subheader"),
@@ -2054,7 +2055,7 @@ const professionalDevelopmentSurvey = (t: TFnType): TTemplate => {
           shuffleOption: "none",
           choices: [
             t("templates.professional_development_survey_question_1_choice_1"),
-            t("templates.professional_development_survey_question_1_choice_1"),
+            t("templates.professional_development_survey_question_1_choice_2"),
           ],
           t,
         }),
@@ -2381,6 +2382,7 @@ const measureTaskAccomplishment = (t: TFnType): TTemplate => {
             t("templates.measure_task_accomplishment_question_1_option_2_label"),
             t("templates.measure_task_accomplishment_question_1_option_3_label"),
           ],
+          choiceIds: [reusableOptionIds[0], reusableOptionIds[1], reusableOptionIds[2]],
           headline: t("templates.measure_task_accomplishment_question_1_headline"),
           required: true,
           t,
@@ -2739,10 +2741,10 @@ const understandPurchaseIntention = (t: TFnType): TTemplate => {
         buildRatingQuestion({
           id: reusableQuestionIds[0],
           logic: [
-            createChoiceJumpLogic(reusableQuestionIds[0], "2", reusableQuestionIds[1]),
-            createChoiceJumpLogic(reusableQuestionIds[0], "3", reusableQuestionIds[2]),
-            createChoiceJumpLogic(reusableQuestionIds[0], "4", reusableQuestionIds[2]),
-            createChoiceJumpLogic(reusableQuestionIds[0], "5", localSurvey.endings[0].id),
+            createChoiceJumpLogic(reusableQuestionIds[0], 2, reusableQuestionIds[1]),
+            createChoiceJumpLogic(reusableQuestionIds[0], 3, reusableQuestionIds[2]),
+            createChoiceJumpLogic(reusableQuestionIds[0], 4, reusableQuestionIds[2]),
+            createChoiceJumpLogic(reusableQuestionIds[0], 5, localSurvey.endings[0].id),
           ],
           range: 5,
           scale: "number",
@@ -2795,7 +2797,7 @@ const improveNewsletterContent = (t: TFnType): TTemplate => {
         buildRatingQuestion({
           id: reusableQuestionIds[0],
           logic: [
-            createChoiceJumpLogic(reusableQuestionIds[0], "5", reusableQuestionIds[2]),
+            createChoiceJumpLogic(reusableQuestionIds[0], 5, reusableQuestionIds[2]),
             {
               id: createId(),
               conditions: {
@@ -2895,8 +2897,8 @@ const evaluateAProductIdea = (t: TFnType): TTemplate => {
         buildRatingQuestion({
           id: reusableQuestionIds[1],
           logic: [
-            createChoiceJumpLogic(reusableQuestionIds[1], "3", reusableQuestionIds[2]),
-            createChoiceJumpLogic(reusableQuestionIds[1], "4", reusableQuestionIds[3]),
+            createChoiceJumpLogic(reusableQuestionIds[1], 3, reusableQuestionIds[2]),
+            createChoiceJumpLogic(reusableQuestionIds[1], 4, reusableQuestionIds[3]),
           ],
           range: 5,
           scale: "number",
@@ -2928,8 +2930,8 @@ const evaluateAProductIdea = (t: TFnType): TTemplate => {
         buildRatingQuestion({
           id: reusableQuestionIds[4],
           logic: [
-            createChoiceJumpLogic(reusableQuestionIds[4], "3", reusableQuestionIds[5]),
-            createChoiceJumpLogic(reusableQuestionIds[4], "4", reusableQuestionIds[6]),
+            createChoiceJumpLogic(reusableQuestionIds[4], 3, reusableQuestionIds[5]),
+            createChoiceJumpLogic(reusableQuestionIds[4], 4, reusableQuestionIds[6]),
           ],
           range: 5,
           scale: "number",
@@ -3004,6 +3006,12 @@ const understandLowEngagement = (t: TFnType): TTemplate => {
             t("templates.understand_low_engagement_question_1_choice_4"),
             t("templates.understand_low_engagement_question_1_choice_5"),
           ],
+          choiceIds: [
+            reusableOptionIds[0],
+            reusableOptionIds[1],
+            reusableOptionIds[2],
+            reusableOptionIds[3],
+          ],
           headline: t("templates.understand_low_engagement_question_1_headline"),
           required: true,
           containsOther: true,
diff --git a/apps/web/locales/de-DE.json b/apps/web/locales/de-DE.json
index a682ff88a1..71a6c067b8 100644
--- a/apps/web/locales/de-DE.json
+++ b/apps/web/locales/de-DE.json
@@ -2651,6 +2651,7 @@
     "professional_development_survey_description": "Bewerte die Zufriedenheit der Mitarbeiter mit beruflichen Entwicklungsmöglichkeiten.",
     "professional_development_survey_name": "Berufliche Entwicklungsbewertung",
     "professional_development_survey_question_1_choice_1": "Ja",
+    "professional_development_survey_question_1_choice_2": "Nein",
     "professional_development_survey_question_1_headline": "Sind Sie an beruflichen Entwicklungsmöglichkeiten interessiert?",
     "professional_development_survey_question_2_choice_1": "Networking-Veranstaltungen",
     "professional_development_survey_question_2_choice_2": "Konferenzen oder Seminare",
diff --git a/apps/web/locales/en-US.json b/apps/web/locales/en-US.json
index 59d6c544ec..93f56459f6 100644
--- a/apps/web/locales/en-US.json
+++ b/apps/web/locales/en-US.json
@@ -2651,6 +2651,7 @@
     "professional_development_survey_description": "Assess employee satisfaction with professional growth and development opportunities.",
     "professional_development_survey_name": "Professional Development Survey",
     "professional_development_survey_question_1_choice_1": "Yes",
+    "professional_development_survey_question_1_choice_2": "No",
     "professional_development_survey_question_1_headline": "Are you interested in professional development activities?",
     "professional_development_survey_question_2_choice_1": "Networking events",
     "professional_development_survey_question_2_choice_2": "Conferences or seminars",
diff --git a/apps/web/locales/fr-FR.json b/apps/web/locales/fr-FR.json
index 863329fd47..ba3ec36910 100644
--- a/apps/web/locales/fr-FR.json
+++ b/apps/web/locales/fr-FR.json
@@ -2651,6 +2651,7 @@
     "professional_development_survey_description": "Évaluer la satisfaction des employés concernant les opportunités de croissance et de développement professionnel.",
     "professional_development_survey_name": "Sondage sur le développement professionnel",
     "professional_development_survey_question_1_choice_1": "Oui",
+    "professional_development_survey_question_1_choice_2": "Non",
     "professional_development_survey_question_1_headline": "Êtes-vous intéressé par des activités de développement professionnel ?",
     "professional_development_survey_question_2_choice_1": "Événements de réseautage",
     "professional_development_survey_question_2_choice_2": "Conférences ou séminaires",
diff --git a/apps/web/locales/pt-BR.json b/apps/web/locales/pt-BR.json
index dbb8528201..4781e66c10 100644
--- a/apps/web/locales/pt-BR.json
+++ b/apps/web/locales/pt-BR.json
@@ -2651,6 +2651,7 @@
     "professional_development_survey_description": "Avalie a satisfação dos funcionários com oportunidades de desenvolvimento profissional.",
     "professional_development_survey_name": "Avaliação de Desenvolvimento Profissional",
     "professional_development_survey_question_1_choice_1": "Sim",
+    "professional_development_survey_question_1_choice_2": "Não",
     "professional_development_survey_question_1_headline": "Você está interessado em atividades de desenvolvimento profissional?",
     "professional_development_survey_question_2_choice_1": "Eventos de networking",
     "professional_development_survey_question_2_choice_2": "Conferencias ou seminários",
diff --git a/apps/web/locales/pt-PT.json b/apps/web/locales/pt-PT.json
index 05d57604d7..999932b2b9 100644
--- a/apps/web/locales/pt-PT.json
+++ b/apps/web/locales/pt-PT.json
@@ -2651,6 +2651,7 @@
     "professional_development_survey_description": "Avaliar a satisfação dos funcionários com as oportunidades de crescimento e desenvolvimento profissional.",
     "professional_development_survey_name": "Inquérito de Desenvolvimento Profissional",
     "professional_development_survey_question_1_choice_1": "Sim",
+    "professional_development_survey_question_1_choice_2": "Não",
     "professional_development_survey_question_1_headline": "Está interessado em atividades de desenvolvimento profissional?",
     "professional_development_survey_question_2_choice_1": "Eventos de networking",
     "professional_development_survey_question_2_choice_2": "Conferências ou seminários",
diff --git a/apps/web/locales/zh-Hant-TW.json b/apps/web/locales/zh-Hant-TW.json
index 4fc60ecd5b..82d4836653 100644
--- a/apps/web/locales/zh-Hant-TW.json
+++ b/apps/web/locales/zh-Hant-TW.json
@@ -2651,6 +2651,7 @@
     "professional_development_survey_description": "評估員工對專業成長和發展機會的滿意度。",
     "professional_development_survey_name": "專業發展問卷",
     "professional_development_survey_question_1_choice_1": "是",
+    "professional_development_survey_question_1_choice_2": "否",
     "professional_development_survey_question_1_headline": "您對專業發展活動感興趣嗎？",
     "professional_development_survey_question_2_choice_1": "人脈交流活動",
     "professional_development_survey_question_2_choice_2": "研討會或研討會",