diff --git a/app/models/form/sales/questions/address_line1.rb b/app/models/form/sales/questions/address_line1.rb
index 3ea041de4..5d47bce23 100644
--- a/app/models/form/sales/questions/address_line1.rb
+++ b/app/models/form/sales/questions/address_line1.rb
@@ -7,7 +7,7 @@ class Form::Sales::Questions::AddressLine1 < ::Form::Question
     @type = "text"
     @plain_label = true
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @hide_question_number_on_page = true
   end
 
diff --git a/app/models/form/sales/questions/address_search.rb b/app/models/form/sales/questions/address_search.rb
index d93419f22..a429e4071 100644
--- a/app/models/form/sales/questions/address_search.rb
+++ b/app/models/form/sales/questions/address_search.rb
@@ -6,7 +6,7 @@ class Form::Sales::Questions::AddressSearch < ::Form::Question
     @copy_key = "sales.property_information.address_search"
     @plain_label = true
     @bottom_guidance_partial = "address_search"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @hide_question_number_on_page = true
   end
 
diff --git a/app/models/form/sales/questions/age1.rb b/app/models/form/sales/questions/age1.rb
index 811bc2271..01872c04a 100644
--- a/app/models/form/sales/questions/age1.rb
+++ b/app/models/form/sales/questions/age1.rb
@@ -19,7 +19,7 @@ class Form::Sales::Questions::Age1 < ::Form::Question
     @min = 16
     @max = 110
     @step = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   QUESTION_NUMBER_FROM_YEAR = { 2023 => 20, 2024 => 22, 2025 => 20, 2026 => 21 }.freeze
diff --git a/app/models/form/sales/questions/age2.rb b/app/models/form/sales/questions/age2.rb
index 94d97dcef..ecdaada48 100644
--- a/app/models/form/sales/questions/age2.rb
+++ b/app/models/form/sales/questions/age2.rb
@@ -13,7 +13,7 @@ class Form::Sales::Questions::Age2 < ::Form::Question
     @max = 110
     @min = 16
     @step = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   QUESTION_NUMBER_FROM_YEAR = { 2023 => 28, 2024 => 30, 2025 => 28, 2026 => 30 }.freeze
diff --git a/app/models/form/sales/questions/armed_forces.rb b/app/models/form/sales/questions/armed_forces.rb
index cd12c254e..9b55f2de8 100644
--- a/app/models/form/sales/questions/armed_forces.rb
+++ b/app/models/form/sales/questions/armed_forces.rb
@@ -4,7 +4,7 @@ class Form::Sales::Questions::ArmedForces < ::Form::Question
     @id = "hhregres"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/armed_forces_spouse.rb b/app/models/form/sales/questions/armed_forces_spouse.rb
index 283cfb654..44201aabc 100644
--- a/app/models/form/sales/questions/armed_forces_spouse.rb
+++ b/app/models/form/sales/questions/armed_forces_spouse.rb
@@ -4,7 +4,7 @@ class Form::Sales::Questions::ArmedForcesSpouse < ::Form::Question
     @id = "armedforcesspouse"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/building_height_class.rb b/app/models/form/sales/questions/building_height_class.rb
index 016245fbc..51e2c3623 100644
--- a/app/models/form/sales/questions/building_height_class.rb
+++ b/app/models/form/sales/questions/building_height_class.rb
@@ -4,7 +4,7 @@ class Form::Sales::Questions::BuildingHeightClass < ::Form::Question
     @id = "buildheightclass"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer1_age_known.rb b/app/models/form/sales/questions/buyer1_age_known.rb
index a4ccd5969..fd87e9c8d 100644
--- a/app/models/form/sales/questions/buyer1_age_known.rb
+++ b/app/models/form/sales/questions/buyer1_age_known.rb
@@ -22,7 +22,7 @@ class Form::Sales::Questions::Buyer1AgeKnown < ::Form::Question
       ],
     }
     @check_answers_card_number = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer1_ethnic_background_arab.rb b/app/models/form/sales/questions/buyer1_ethnic_background_arab.rb
index 849002767..b8359b7bd 100644
--- a/app/models/form/sales/questions/buyer1_ethnic_background_arab.rb
+++ b/app/models/form/sales/questions/buyer1_ethnic_background_arab.rb
@@ -6,7 +6,7 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundArab < ::Form::Question
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer1_ethnic_background_asian.rb b/app/models/form/sales/questions/buyer1_ethnic_background_asian.rb
index a8d4e9bb5..c10b90048 100644
--- a/app/models/form/sales/questions/buyer1_ethnic_background_asian.rb
+++ b/app/models/form/sales/questions/buyer1_ethnic_background_asian.rb
@@ -6,7 +6,7 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundAsian < ::Form::Question
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer1_ethnic_background_black.rb b/app/models/form/sales/questions/buyer1_ethnic_background_black.rb
index ad4ce51e5..6ba3ddab5 100644
--- a/app/models/form/sales/questions/buyer1_ethnic_background_black.rb
+++ b/app/models/form/sales/questions/buyer1_ethnic_background_black.rb
@@ -6,7 +6,7 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundBlack < ::Form::Question
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer1_ethnic_background_mixed.rb b/app/models/form/sales/questions/buyer1_ethnic_background_mixed.rb
index 5bef71553..70748baf8 100644
--- a/app/models/form/sales/questions/buyer1_ethnic_background_mixed.rb
+++ b/app/models/form/sales/questions/buyer1_ethnic_background_mixed.rb
@@ -6,7 +6,7 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundMixed < ::Form::Question
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer1_ethnic_background_white.rb b/app/models/form/sales/questions/buyer1_ethnic_background_white.rb
index b161673b1..871139944 100644
--- a/app/models/form/sales/questions/buyer1_ethnic_background_white.rb
+++ b/app/models/form/sales/questions/buyer1_ethnic_background_white.rb
@@ -5,7 +5,7 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundWhite < ::Form::Question
     @copy_key = "sales.household_characteristics.ethnic.ethnic_background_white"
     @type = "radio"
     @check_answers_card_number = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
diff --git a/app/models/form/sales/questions/buyer1_ethnic_group.rb b/app/models/form/sales/questions/buyer1_ethnic_group.rb
index 1c61fcd90..5afd80b48 100644
--- a/app/models/form/sales/questions/buyer1_ethnic_group.rb
+++ b/app/models/form/sales/questions/buyer1_ethnic_group.rb
@@ -5,7 +5,7 @@ class Form::Sales::Questions::Buyer1EthnicGroup < ::Form::Question
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer1_income.rb b/app/models/form/sales/questions/buyer1_income.rb
index d56de9b07..b06a1ca1f 100644
--- a/app/models/form/sales/questions/buyer1_income.rb
+++ b/app/models/form/sales/questions/buyer1_income.rb
@@ -10,7 +10,7 @@ class Form::Sales::Questions::Buyer1Income < ::Form::Question
     @width = 5
     @prefix = "£"
     @check_answers_card_number = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
diff --git a/app/models/form/sales/questions/buyer1_income_known.rb b/app/models/form/sales/questions/buyer1_income_known.rb
index 43ffebfe3..512a3b281 100644
--- a/app/models/form/sales/questions/buyer1_income_known.rb
+++ b/app/models/form/sales/questions/buyer1_income_known.rb
@@ -9,7 +9,7 @@ class Form::Sales::Questions::Buyer1IncomeKnown < ::Form::Question
       "income1" => [0],
     }
     @check_answers_card_number = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @hidden_in_check_answers = {
       "depends_on" => [
         {
diff --git a/app/models/form/sales/questions/buyer1_live_in_property.rb b/app/models/form/sales/questions/buyer1_live_in_property.rb
index 688eca016..a690f4967 100644
--- a/app/models/form/sales/questions/buyer1_live_in_property.rb
+++ b/app/models/form/sales/questions/buyer1_live_in_property.rb
@@ -5,7 +5,7 @@ class Form::Sales::Questions::Buyer1LiveInProperty < ::Form::Question
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer1_mortgage.rb b/app/models/form/sales/questions/buyer1_mortgage.rb
index e9f525b21..7449ca9b0 100644
--- a/app/models/form/sales/questions/buyer1_mortgage.rb
+++ b/app/models/form/sales/questions/buyer1_mortgage.rb
@@ -5,7 +5,7 @@ class Form::Sales::Questions::Buyer1Mortgage < ::Form::Question
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer1_nationality.rb b/app/models/form/sales/questions/buyer1_nationality.rb
index 1a0f4d523..1cdccfecc 100644
--- a/app/models/form/sales/questions/buyer1_nationality.rb
+++ b/app/models/form/sales/questions/buyer1_nationality.rb
@@ -11,7 +11,7 @@ class Form::Sales::Questions::Buyer1Nationality < ::Form::Question
       },
       "value" => "Prefers not to say",
     }]
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer1_previous_tenure.rb b/app/models/form/sales/questions/buyer1_previous_tenure.rb
index 4872f45d1..a74a4bd24 100644
--- a/app/models/form/sales/questions/buyer1_previous_tenure.rb
+++ b/app/models/form/sales/questions/buyer1_previous_tenure.rb
@@ -4,7 +4,7 @@ class Form::Sales::Questions::Buyer1PreviousTenure < ::Form::Question
     @id = "prevten"
     @type = "radio"
     @answer_options = answer_options
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
diff --git a/app/models/form/sales/questions/buyer1_working_situation.rb b/app/models/form/sales/questions/buyer1_working_situation.rb
index c8a47d25a..1e9faa916 100644
--- a/app/models/form/sales/questions/buyer1_working_situation.rb
+++ b/app/models/form/sales/questions/buyer1_working_situation.rb
@@ -11,7 +11,7 @@ class Form::Sales::Questions::Buyer1WorkingSituation < ::Form::Question
       },
       "value" => "Prefers not to say",
     }]
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
diff --git a/app/models/form/sales/questions/buyer2_age_known.rb b/app/models/form/sales/questions/buyer2_age_known.rb
index fdd22408f..1aac63734 100644
--- a/app/models/form/sales/questions/buyer2_age_known.rb
+++ b/app/models/form/sales/questions/buyer2_age_known.rb
@@ -19,7 +19,7 @@ class Form::Sales::Questions::Buyer2AgeKnown < ::Form::Question
       ],
     }
     @check_answers_card_number = 2
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer2_ethnic_background_arab.rb b/app/models/form/sales/questions/buyer2_ethnic_background_arab.rb
index 6531034f8..05fd7154c 100644
--- a/app/models/form/sales/questions/buyer2_ethnic_background_arab.rb
+++ b/app/models/form/sales/questions/buyer2_ethnic_background_arab.rb
@@ -6,7 +6,7 @@ class Form::Sales::Questions::Buyer2EthnicBackgroundArab < ::Form::Question
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer2_ethnic_background_asian.rb b/app/models/form/sales/questions/buyer2_ethnic_background_asian.rb
index 5f85eb36a..4217697b8 100644
--- a/app/models/form/sales/questions/buyer2_ethnic_background_asian.rb
+++ b/app/models/form/sales/questions/buyer2_ethnic_background_asian.rb
@@ -6,7 +6,7 @@ class Form::Sales::Questions::Buyer2EthnicBackgroundAsian < ::Form::Question
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer2_ethnic_background_black.rb b/app/models/form/sales/questions/buyer2_ethnic_background_black.rb
index 3190c8918..282f8b8a9 100644
--- a/app/models/form/sales/questions/buyer2_ethnic_background_black.rb
+++ b/app/models/form/sales/questions/buyer2_ethnic_background_black.rb
@@ -6,7 +6,7 @@ class Form::Sales::Questions::Buyer2EthnicBackgroundBlack < ::Form::Question
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer2_ethnic_background_mixed.rb b/app/models/form/sales/questions/buyer2_ethnic_background_mixed.rb
index 3546603a1..1f5da29d9 100644
--- a/app/models/form/sales/questions/buyer2_ethnic_background_mixed.rb
+++ b/app/models/form/sales/questions/buyer2_ethnic_background_mixed.rb
@@ -6,7 +6,7 @@ class Form::Sales::Questions::Buyer2EthnicBackgroundMixed < ::Form::Question
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer2_ethnic_background_white.rb b/app/models/form/sales/questions/buyer2_ethnic_background_white.rb
index aac824fe2..ada54f282 100644
--- a/app/models/form/sales/questions/buyer2_ethnic_background_white.rb
+++ b/app/models/form/sales/questions/buyer2_ethnic_background_white.rb
@@ -5,7 +5,7 @@ class Form::Sales::Questions::Buyer2EthnicBackgroundWhite < ::Form::Question
     @copy_key = "sales.household_characteristics.ethnicbuy2.ethnic_background_white"
     @type = "radio"
     @check_answers_card_number = 2
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
diff --git a/app/models/form/sales/questions/buyer2_ethnic_group.rb b/app/models/form/sales/questions/buyer2_ethnic_group.rb
index 04d4699e5..cfae8ea43 100644
--- a/app/models/form/sales/questions/buyer2_ethnic_group.rb
+++ b/app/models/form/sales/questions/buyer2_ethnic_group.rb
@@ -5,7 +5,7 @@ class Form::Sales::Questions::Buyer2EthnicGroup < ::Form::Question
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer2_income.rb b/app/models/form/sales/questions/buyer2_income.rb
index e5f56856b..6da0bc220 100644
--- a/app/models/form/sales/questions/buyer2_income.rb
+++ b/app/models/form/sales/questions/buyer2_income.rb
@@ -10,7 +10,7 @@ class Form::Sales::Questions::Buyer2Income < ::Form::Question
     @width = 5
     @prefix = "£"
     @check_answers_card_number = 2
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
diff --git a/app/models/form/sales/questions/buyer2_income_known.rb b/app/models/form/sales/questions/buyer2_income_known.rb
index 6984291f7..61c1583cf 100644
--- a/app/models/form/sales/questions/buyer2_income_known.rb
+++ b/app/models/form/sales/questions/buyer2_income_known.rb
@@ -9,7 +9,7 @@ class Form::Sales::Questions::Buyer2IncomeKnown < ::Form::Question
       "income2" => [0],
     }
     @check_answers_card_number = 2
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @hidden_in_check_answers = {
       "depends_on" => [
         {
diff --git a/app/models/form/sales/questions/buyer2_live_in_property.rb b/app/models/form/sales/questions/buyer2_live_in_property.rb
index 20ac61eda..de9924941 100644
--- a/app/models/form/sales/questions/buyer2_live_in_property.rb
+++ b/app/models/form/sales/questions/buyer2_live_in_property.rb
@@ -5,7 +5,7 @@ class Form::Sales::Questions::Buyer2LiveInProperty < ::Form::Question
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer2_living_in.rb b/app/models/form/sales/questions/buyer2_living_in.rb
index 7aaf3b72b..170154b39 100644
--- a/app/models/form/sales/questions/buyer2_living_in.rb
+++ b/app/models/form/sales/questions/buyer2_living_in.rb
@@ -4,7 +4,7 @@ class Form::Sales::Questions::Buyer2LivingIn < ::Form::Question
     @id = "buy2living"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer2_mortgage.rb b/app/models/form/sales/questions/buyer2_mortgage.rb
index b5518163d..39fa45024 100644
--- a/app/models/form/sales/questions/buyer2_mortgage.rb
+++ b/app/models/form/sales/questions/buyer2_mortgage.rb
@@ -5,7 +5,7 @@ class Form::Sales::Questions::Buyer2Mortgage < ::Form::Question
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer2_nationality.rb b/app/models/form/sales/questions/buyer2_nationality.rb
index 93bb127aa..377729788 100644
--- a/app/models/form/sales/questions/buyer2_nationality.rb
+++ b/app/models/form/sales/questions/buyer2_nationality.rb
@@ -5,7 +5,7 @@ class Form::Sales::Questions::Buyer2Nationality < ::Form::Question
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @inferred_check_answers_value = [{
       "condition" => {
         "national" => 13,
diff --git a/app/models/form/sales/questions/buyer2_relationship_to_buyer1.rb b/app/models/form/sales/questions/buyer2_relationship_to_buyer1.rb
index 2f863b1d2..8084415e3 100644
--- a/app/models/form/sales/questions/buyer2_relationship_to_buyer1.rb
+++ b/app/models/form/sales/questions/buyer2_relationship_to_buyer1.rb
@@ -12,7 +12,7 @@ class Form::Sales::Questions::Buyer2RelationshipToBuyer1 < ::Form::Question
       },
       "value" => "Prefers not to say",
     }]
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
diff --git a/app/models/form/sales/questions/buyer2_relationship_to_buyer1_yes_no.rb b/app/models/form/sales/questions/buyer2_relationship_to_buyer1_yes_no.rb
index f6639782e..72b0f196e 100644
--- a/app/models/form/sales/questions/buyer2_relationship_to_buyer1_yes_no.rb
+++ b/app/models/form/sales/questions/buyer2_relationship_to_buyer1_yes_no.rb
@@ -16,7 +16,7 @@ class Form::Sales::Questions::Buyer2RelationshipToBuyer1YesNo < ::Form::Question
       "value" => "Prefers not to say",
     }]
     @check_answers_card_number = 2
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   QUESTION_NUMBER_FROM_YEAR = { 2025 => 27, 2026 => 29 }.freeze
diff --git a/app/models/form/sales/questions/buyer2_working_situation.rb b/app/models/form/sales/questions/buyer2_working_situation.rb
index 82e14ab31..2165c7023 100644
--- a/app/models/form/sales/questions/buyer2_working_situation.rb
+++ b/app/models/form/sales/questions/buyer2_working_situation.rb
@@ -12,7 +12,7 @@ class Form::Sales::Questions::Buyer2WorkingSituation < ::Form::Question
       },
       "value" => "Prefers not to say",
     }]
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def displayed_answer_options(_log, _user = nil)
diff --git a/app/models/form/sales/questions/buyer_company.rb b/app/models/form/sales/questions/buyer_company.rb
index 631c7f906..5acbdba89 100644
--- a/app/models/form/sales/questions/buyer_company.rb
+++ b/app/models/form/sales/questions/buyer_company.rb
@@ -4,7 +4,7 @@ class Form::Sales::Questions::BuyerCompany < ::Form::Question
     @id = "companybuy"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer_interview.rb b/app/models/form/sales/questions/buyer_interview.rb
index 83963f78d..d5fc02353 100644
--- a/app/models/form/sales/questions/buyer_interview.rb
+++ b/app/models/form/sales/questions/buyer_interview.rb
@@ -5,7 +5,7 @@ class Form::Sales::Questions::BuyerInterview < ::Form::Question
     @copy_key = "sales.#{subsection.copy_key}.noint.#{joint_purchase ? 'joint_purchase' : 'not_joint_purchase'}"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer_live.rb b/app/models/form/sales/questions/buyer_live.rb
index c17ef1be5..011fc8a89 100644
--- a/app/models/form/sales/questions/buyer_live.rb
+++ b/app/models/form/sales/questions/buyer_live.rb
@@ -4,7 +4,7 @@ class Form::Sales::Questions::BuyerLive < ::Form::Question
     @id = "buylivein"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer_previous.rb b/app/models/form/sales/questions/buyer_previous.rb
index 4daf963bf..7c8718eaa 100644
--- a/app/models/form/sales/questions/buyer_previous.rb
+++ b/app/models/form/sales/questions/buyer_previous.rb
@@ -5,7 +5,7 @@ class Form::Sales::Questions::BuyerPrevious < ::Form::Question
     @copy_key = "sales.sale_information.soctenant.#{joint_purchase ? 'joint_purchase' : 'not_joint_purchase'}"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyer_still_serving.rb b/app/models/form/sales/questions/buyer_still_serving.rb
index dfc6e4f48..3f2d9d8d9 100644
--- a/app/models/form/sales/questions/buyer_still_serving.rb
+++ b/app/models/form/sales/questions/buyer_still_serving.rb
@@ -4,7 +4,7 @@ class Form::Sales::Questions::BuyerStillServing < ::Form::Question
     @id = "hhregresstill"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/buyers_organisations.rb b/app/models/form/sales/questions/buyers_organisations.rb
index 727a65ad0..f5fbccf93 100644
--- a/app/models/form/sales/questions/buyers_organisations.rb
+++ b/app/models/form/sales/questions/buyers_organisations.rb
@@ -4,7 +4,7 @@ class Form::Sales::Questions::BuyersOrganisations < ::Form::Question
     @id = "buyers_organisations"
     @type = "checkbox"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/county.rb b/app/models/form/sales/questions/county.rb
index e3a06449a..0f45b6b0a 100644
--- a/app/models/form/sales/questions/county.rb
+++ b/app/models/form/sales/questions/county.rb
@@ -6,7 +6,7 @@ class Form::Sales::Questions::County < ::Form::Question
     @type = "text"
     @plain_label = true
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @hide_question_number_on_page = true
   end
 
diff --git a/app/models/form/sales/questions/deposit_discount.rb b/app/models/form/sales/questions/deposit_discount.rb
index 5948bcd43..db1841419 100644
--- a/app/models/form/sales/questions/deposit_discount.rb
+++ b/app/models/form/sales/questions/deposit_discount.rb
@@ -8,7 +8,7 @@ class Form::Sales::Questions::DepositDiscount < ::Form::Question
     @step = 1
     @width = 5
     @prefix = "£"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @top_guidance_partial = "financial_calculations_shared_ownership"
     @strip_commas = true
   end
diff --git a/app/models/form/sales/questions/discount.rb b/app/models/form/sales/questions/discount.rb
index 0f9591f08..0927510a5 100644
--- a/app/models/form/sales/questions/discount.rb
+++ b/app/models/form/sales/questions/discount.rb
@@ -8,7 +8,7 @@ class Form::Sales::Questions::Discount < ::Form::Question
     @step = 0.1
     @width = 5
     @suffix = "%"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @top_guidance_partial = "financial_calculations_discounted_ownership"
   end
 
diff --git a/app/models/form/sales/questions/discounted_ownership_type.rb b/app/models/form/sales/questions/discounted_ownership_type.rb
index dd79f5026..6b1b40cea 100644
--- a/app/models/form/sales/questions/discounted_ownership_type.rb
+++ b/app/models/form/sales/questions/discounted_ownership_type.rb
@@ -6,7 +6,7 @@ class Form::Sales::Questions::DiscountedOwnershipType < ::Form::Question
     @type = "radio"
     @top_guidance_partial = guidance_partial
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/exchange_date.rb b/app/models/form/sales/questions/exchange_date.rb
index a29a7a6c7..5d829826b 100644
--- a/app/models/form/sales/questions/exchange_date.rb
+++ b/app/models/form/sales/questions/exchange_date.rb
@@ -4,7 +4,7 @@ class Form::Sales::Questions::ExchangeDate < ::Form::Question
     @id = "exdate"
     @copy_key = "sales.sale_information.exchange_date"
     @type = "date"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   QUESTION_NUMBER_FROM_YEAR = { 2023 => 81, 2024 => 83 }.freeze
diff --git a/app/models/form/sales/questions/fromprop.rb b/app/models/form/sales/questions/fromprop.rb
index 7b3d0255f..2bf20d0da 100644
--- a/app/models/form/sales/questions/fromprop.rb
+++ b/app/models/form/sales/questions/fromprop.rb
@@ -5,7 +5,7 @@ class Form::Sales::Questions::Fromprop < ::Form::Question
     @type = "radio"
     @page = page
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/gender_identity1.rb b/app/models/form/sales/questions/gender_identity1.rb
index 9d825dfdd..ecaa5fda2 100644
--- a/app/models/form/sales/questions/gender_identity1.rb
+++ b/app/models/form/sales/questions/gender_identity1.rb
@@ -5,7 +5,7 @@ class Form::Sales::Questions::GenderIdentity1 < ::Form::Question
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/gender_identity2.rb b/app/models/form/sales/questions/gender_identity2.rb
index eb864d29e..e81abfd75 100644
--- a/app/models/form/sales/questions/gender_identity2.rb
+++ b/app/models/form/sales/questions/gender_identity2.rb
@@ -12,7 +12,7 @@ class Form::Sales::Questions::GenderIdentity2 < ::Form::Question
       },
       "value" => "Prefers not to say",
     }]
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/grant.rb b/app/models/form/sales/questions/grant.rb
index 1ffe67c13..9a739d0f4 100644
--- a/app/models/form/sales/questions/grant.rb
+++ b/app/models/form/sales/questions/grant.rb
@@ -8,7 +8,7 @@ class Form::Sales::Questions::Grant < ::Form::Question
     @step = 1
     @width = 5
     @prefix = "£"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @top_guidance_partial = "financial_calculations_discounted_ownership"
     @strip_commas = true
   end
diff --git a/app/models/form/sales/questions/handover_date.rb b/app/models/form/sales/questions/handover_date.rb
index 5dda250d2..f1f0602af 100644
--- a/app/models/form/sales/questions/handover_date.rb
+++ b/app/models/form/sales/questions/handover_date.rb
@@ -4,7 +4,7 @@ class Form::Sales::Questions::HandoverDate < ::Form::Question
     @id = "hodate"
     @copy_key = "sales.sale_information.handover_date"
     @type = "date"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   QUESTION_NUMBER_FROM_YEAR = { 2023 => 82, 2024 => 84, 2025 => 76, 2026 => 84 }.freeze
diff --git a/app/models/form/sales/questions/has_management_fee.rb b/app/models/form/sales/questions/has_management_fee.rb
index 3446a2c90..873241579 100644
--- a/app/models/form/sales/questions/has_management_fee.rb
+++ b/app/models/form/sales/questions/has_management_fee.rb
@@ -15,7 +15,7 @@ class Form::Sales::Questions::HasManagementFee < ::Form::Question
         },
       ],
     }
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/has_service_charges_changed.rb b/app/models/form/sales/questions/has_service_charges_changed.rb
index 601bafaee..bbc4abcd4 100644
--- a/app/models/form/sales/questions/has_service_charges_changed.rb
+++ b/app/models/form/sales/questions/has_service_charges_changed.rb
@@ -15,7 +15,7 @@ class Form::Sales::Questions::HasServiceChargesChanged < ::Form::Question
       ],
     }
     @copy_key = "sales.sale_information.servicecharges_changed.has_service_charges_changed"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/household_disability.rb b/app/models/form/sales/questions/household_disability.rb
index f7f26c8d8..b4b2ecc0d 100644
--- a/app/models/form/sales/questions/household_disability.rb
+++ b/app/models/form/sales/questions/household_disability.rb
@@ -4,7 +4,7 @@ class Form::Sales::Questions::HouseholdDisability < ::Form::Question
     @id = "disabled"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/household_wheelchair.rb b/app/models/form/sales/questions/household_wheelchair.rb
index 6934484fc..a94206879 100644
--- a/app/models/form/sales/questions/household_wheelchair.rb
+++ b/app/models/form/sales/questions/household_wheelchair.rb
@@ -4,7 +4,7 @@ class Form::Sales::Questions::HouseholdWheelchair < ::Form::Question
     @id = "wheel"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/housing_benefits.rb b/app/models/form/sales/questions/housing_benefits.rb
index bb332bfa7..d3c27e872 100644
--- a/app/models/form/sales/questions/housing_benefits.rb
+++ b/app/models/form/sales/questions/housing_benefits.rb
@@ -6,7 +6,7 @@ class Form::Sales::Questions::HousingBenefits < ::Form::Question
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_title = "All buyers" if form.start_year_2026_or_later?
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/joint_purchase.rb b/app/models/form/sales/questions/joint_purchase.rb
index 82b59c184..afb50ca13 100644
--- a/app/models/form/sales/questions/joint_purchase.rb
+++ b/app/models/form/sales/questions/joint_purchase.rb
@@ -4,7 +4,7 @@ class Form::Sales::Questions::JointPurchase < ::Form::Question
     @id = "jointpur"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/la_nominations.rb b/app/models/form/sales/questions/la_nominations.rb
index 8b880210e..75ad85c71 100644
--- a/app/models/form/sales/questions/la_nominations.rb
+++ b/app/models/form/sales/questions/la_nominations.rb
@@ -5,7 +5,7 @@ class Form::Sales::Questions::LaNominations < ::Form::Question
     @copy_key = "sales.sale_information.la_nominations"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/management_fee.rb b/app/models/form/sales/questions/management_fee.rb
index ad9cb6f74..af7ff574f 100644
--- a/app/models/form/sales/questions/management_fee.rb
+++ b/app/models/form/sales/questions/management_fee.rb
@@ -8,7 +8,7 @@ class Form::Sales::Questions::ManagementFee < ::Form::Question
     @step = 0.01
     @width = 5
     @prefix = "£"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
diff --git a/app/models/form/sales/questions/managing_organisation.rb b/app/models/form/sales/questions/managing_organisation.rb
index a9acfd0f7..995604eaa 100644
--- a/app/models/form/sales/questions/managing_organisation.rb
+++ b/app/models/form/sales/questions/managing_organisation.rb
@@ -4,7 +4,7 @@ class Form::Sales::Questions::ManagingOrganisation < ::Form::Question
     @id = "managing_organisation_id"
     @derived = true
     @type = "select"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options(log = nil, user = nil)
diff --git a/app/models/form/sales/questions/monthly_rent.rb b/app/models/form/sales/questions/monthly_rent.rb
index f6c8595e1..4cfaac93a 100644
--- a/app/models/form/sales/questions/monthly_rent.rb
+++ b/app/models/form/sales/questions/monthly_rent.rb
@@ -7,7 +7,7 @@ class Form::Sales::Questions::MonthlyRent < ::Form::Question
     @step = 0.01
     @width = 5
     @prefix = "£"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
diff --git a/app/models/form/sales/questions/monthly_rent_after_staircasing.rb b/app/models/form/sales/questions/monthly_rent_after_staircasing.rb
index 912549126..53e178f3a 100644
--- a/app/models/form/sales/questions/monthly_rent_after_staircasing.rb
+++ b/app/models/form/sales/questions/monthly_rent_after_staircasing.rb
@@ -8,7 +8,7 @@ class Form::Sales::Questions::MonthlyRentAfterStaircasing < ::Form::Question
     @step = 0.01
     @width = 5
     @prefix = "£"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
diff --git a/app/models/form/sales/questions/monthly_rent_before_staircasing.rb b/app/models/form/sales/questions/monthly_rent_before_staircasing.rb
index c96b6ff56..042e2be32 100644
--- a/app/models/form/sales/questions/monthly_rent_before_staircasing.rb
+++ b/app/models/form/sales/questions/monthly_rent_before_staircasing.rb
@@ -8,7 +8,7 @@ class Form::Sales::Questions::MonthlyRentBeforeStaircasing < ::Form::Question
     @step = 0.01
     @width = 5
     @prefix = "£"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
diff --git a/app/models/form/sales/questions/new_service_charges.rb b/app/models/form/sales/questions/new_service_charges.rb
index a1c0d4193..c754b000c 100644
--- a/app/models/form/sales/questions/new_service_charges.rb
+++ b/app/models/form/sales/questions/new_service_charges.rb
@@ -9,7 +9,7 @@ class Form::Sales::Questions::NewServiceCharges < ::Form::Question
     @width = 5
     @prefix = "£"
     @copy_key = "sales.sale_information.servicecharges_changed.new_service_charges"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
diff --git a/app/models/form/sales/questions/number_joint_buyers.rb b/app/models/form/sales/questions/number_joint_buyers.rb
index c8c66bd4d..6382651bb 100644
--- a/app/models/form/sales/questions/number_joint_buyers.rb
+++ b/app/models/form/sales/questions/number_joint_buyers.rb
@@ -4,7 +4,7 @@ class Form::Sales::Questions::NumberJointBuyers < ::Form::Question
     @id = "jointmore"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/number_of_others_in_property.rb b/app/models/form/sales/questions/number_of_others_in_property.rb
index 23bd28afc..f7bdf0072 100644
--- a/app/models/form/sales/questions/number_of_others_in_property.rb
+++ b/app/models/form/sales/questions/number_of_others_in_property.rb
@@ -8,7 +8,7 @@ class Form::Sales::Questions::NumberOfOthersInProperty < ::Form::Question
     @min = 0
     @max = 15
     @step = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   QUESTION_NUMBER_FROM_YEAR = { 2023 => 35, 2024 => 37, 2025 => 35, 2026 => 38 }.freeze
diff --git a/app/models/form/sales/questions/other_ownership_type.rb b/app/models/form/sales/questions/other_ownership_type.rb
index 84742b7ea..e516f045d 100644
--- a/app/models/form/sales/questions/other_ownership_type.rb
+++ b/app/models/form/sales/questions/other_ownership_type.rb
@@ -5,7 +5,7 @@ class Form::Sales::Questions::OtherOwnershipType < ::Form::Question
     @copy_key = "sales.setup.type.outright_ownership.othtype"
     @type = "text"
     @width = 10
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   QUESTION_NUMBER_FROM_YEAR = { 2023 => 6, 2024 => 8 }.freeze
diff --git a/app/models/form/sales/questions/outright_ownership_type.rb b/app/models/form/sales/questions/outright_ownership_type.rb
index f56b63d78..d944963e7 100644
--- a/app/models/form/sales/questions/outright_ownership_type.rb
+++ b/app/models/form/sales/questions/outright_ownership_type.rb
@@ -9,7 +9,7 @@ class Form::Sales::Questions::OutrightOwnershipType < ::Form::Question
     @conditional_for = {
       "othtype" => [12],
     }
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/ownership_scheme.rb b/app/models/form/sales/questions/ownership_scheme.rb
index 679414154..6b938b57c 100644
--- a/app/models/form/sales/questions/ownership_scheme.rb
+++ b/app/models/form/sales/questions/ownership_scheme.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::OwnershipScheme < ::Form::Question
     super
     @id = "ownershipsch"
     @type = "radio"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
diff --git a/app/models/form/sales/questions/owning_organisation_id.rb b/app/models/form/sales/questions/owning_organisation_id.rb
index e1eb050ef..902d2ff29 100644
--- a/app/models/form/sales/questions/owning_organisation_id.rb
+++ b/app/models/form/sales/questions/owning_organisation_id.rb
@@ -4,7 +4,7 @@ class Form::Sales::Questions::OwningOrganisationId < ::Form::Question
     @id = "owning_organisation_id"
     @derived = true
     @type = "select"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options(log = nil, user = nil)
diff --git a/app/models/form/sales/questions/postcode_for_full_address.rb b/app/models/form/sales/questions/postcode_for_full_address.rb
index 3fb9aa721..49170c07c 100644
--- a/app/models/form/sales/questions/postcode_for_full_address.rb
+++ b/app/models/form/sales/questions/postcode_for_full_address.rb
@@ -18,7 +18,7 @@ class Form::Sales::Questions::PostcodeForFullAddress < ::Form::Question
     }
     @plain_label = true
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @hide_question_number_on_page = true
     @bottom_guidance_partial = "address_fallback"
   end
diff --git a/app/models/form/sales/questions/previous_bedrooms.rb b/app/models/form/sales/questions/previous_bedrooms.rb
index 0dc6a2ddf..2051e4cf7 100644
--- a/app/models/form/sales/questions/previous_bedrooms.rb
+++ b/app/models/form/sales/questions/previous_bedrooms.rb
@@ -7,7 +7,7 @@ class Form::Sales::Questions::PreviousBedrooms < ::Form::Question
     @min = 1
     @max = 6
     @step = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   QUESTION_NUMBER_FROM_YEAR = { 2023 => 85, 2024 => 86, 2025 => 77, 2026 => 85 }.freeze
diff --git a/app/models/form/sales/questions/previous_la_known.rb b/app/models/form/sales/questions/previous_la_known.rb
index a22aad414..6f4bd4478 100644
--- a/app/models/form/sales/questions/previous_la_known.rb
+++ b/app/models/form/sales/questions/previous_la_known.rb
@@ -18,7 +18,7 @@ class Form::Sales::Questions::PreviousLaKnown < ::Form::Question
     @conditional_for = {
       "prevloc" => [1],
     }
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true
   end
 
diff --git a/app/models/form/sales/questions/previous_postcode.rb b/app/models/form/sales/questions/previous_postcode.rb
index 05a660976..d8fbc9b48 100644
--- a/app/models/form/sales/questions/previous_postcode.rb
+++ b/app/models/form/sales/questions/previous_postcode.rb
@@ -16,7 +16,7 @@ class Form::Sales::Questions::PreviousPostcode < ::Form::Question
         "is_previous_la_inferred" => true,
       },
     }
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true
   end
 
diff --git a/app/models/form/sales/questions/previous_postcode_known.rb b/app/models/form/sales/questions/previous_postcode_known.rb
index 478d29184..4e70b7ef2 100644
--- a/app/models/form/sales/questions/previous_postcode_known.rb
+++ b/app/models/form/sales/questions/previous_postcode_known.rb
@@ -18,7 +18,7 @@ class Form::Sales::Questions::PreviousPostcodeKnown < ::Form::Question
         },
       ],
     }
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true
   end
 
diff --git a/app/models/form/sales/questions/previous_tenure.rb b/app/models/form/sales/questions/previous_tenure.rb
index 1d1949a43..0e845cfe6 100644
--- a/app/models/form/sales/questions/previous_tenure.rb
+++ b/app/models/form/sales/questions/previous_tenure.rb
@@ -5,7 +5,7 @@ class Form::Sales::Questions::PreviousTenure < ::Form::Question
     @type = "radio"
     @page = page
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/previous_tenure_buyer2.rb b/app/models/form/sales/questions/previous_tenure_buyer2.rb
index 3a4d25c64..71629252b 100644
--- a/app/models/form/sales/questions/previous_tenure_buyer2.rb
+++ b/app/models/form/sales/questions/previous_tenure_buyer2.rb
@@ -4,7 +4,7 @@ class Form::Sales::Questions::PreviousTenureBuyer2 < ::Form::Question
     @id = "prevtenbuy2"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/prevloc.rb b/app/models/form/sales/questions/prevloc.rb
index 307cf9ac2..e516d78c4 100644
--- a/app/models/form/sales/questions/prevloc.rb
+++ b/app/models/form/sales/questions/prevloc.rb
@@ -10,7 +10,7 @@ class Form::Sales::Questions::Prevloc < ::Form::Question
       },
       "value" => "Not known",
     }]
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true
   end
 
diff --git a/app/models/form/sales/questions/prevown.rb b/app/models/form/sales/questions/prevown.rb
index 636b709b8..922d55546 100644
--- a/app/models/form/sales/questions/prevown.rb
+++ b/app/models/form/sales/questions/prevown.rb
@@ -5,7 +5,7 @@ class Form::Sales::Questions::Prevown < ::Form::Question
     @copy_key = "sales.income_benefits_and_savings.prevown.#{joint_purchase ? 'joint_purchase' : 'not_joint_purchase'}"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/prevshared.rb b/app/models/form/sales/questions/prevshared.rb
index 352b2a1eb..8d6902119 100644
--- a/app/models/form/sales/questions/prevshared.rb
+++ b/app/models/form/sales/questions/prevshared.rb
@@ -4,7 +4,7 @@ class Form::Sales::Questions::Prevshared < ::Form::Question
     @id = "prevshared"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/privacy_notice.rb b/app/models/form/sales/questions/privacy_notice.rb
index ac1e431f9..aac52baca 100644
--- a/app/models/form/sales/questions/privacy_notice.rb
+++ b/app/models/form/sales/questions/privacy_notice.rb
@@ -4,7 +4,7 @@ class Form::Sales::Questions::PrivacyNotice < ::Form::Question
     @id = "privacynotice"
     @copy_key = "sales.#{subsection.copy_key}.privacynotice.#{joint_purchase ? 'joint_purchase' : 'not_joint_purchase'}"
     @type = "checkbox"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @joint_purchase = joint_purchase
     @top_guidance_partial = guidance
   end
diff --git a/app/models/form/sales/questions/property_building_type.rb b/app/models/form/sales/questions/property_building_type.rb
index 7c79006e2..a1bc3a7d8 100644
--- a/app/models/form/sales/questions/property_building_type.rb
+++ b/app/models/form/sales/questions/property_building_type.rb
@@ -5,7 +5,7 @@ class Form::Sales::Questions::PropertyBuildingType < ::Form::Question
     @copy_key = "sales.property_information.builtype"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/property_local_authority.rb b/app/models/form/sales/questions/property_local_authority.rb
index a9f68f9b1..a4848ec6d 100644
--- a/app/models/form/sales/questions/property_local_authority.rb
+++ b/app/models/form/sales/questions/property_local_authority.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::PropertyLocalAuthority < ::Form::Question
     super
     @id = "la"
     @type = "select"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true
   end
 
diff --git a/app/models/form/sales/questions/property_number_of_bedrooms.rb b/app/models/form/sales/questions/property_number_of_bedrooms.rb
index 399d01028..3d130b1c8 100644
--- a/app/models/form/sales/questions/property_number_of_bedrooms.rb
+++ b/app/models/form/sales/questions/property_number_of_bedrooms.rb
@@ -8,7 +8,7 @@ class Form::Sales::Questions::PropertyNumberOfBedrooms < ::Form::Question
     @min = 1
     @max = 9
     @step = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   QUESTION_NUMBER_FROM_YEAR = { 2023 => 11, 2024 => 18, 2025 => 17, 2026 => 18 }.freeze
diff --git a/app/models/form/sales/questions/property_unit_type.rb b/app/models/form/sales/questions/property_unit_type.rb
index 340a13534..9854b5c81 100644
--- a/app/models/form/sales/questions/property_unit_type.rb
+++ b/app/models/form/sales/questions/property_unit_type.rb
@@ -5,7 +5,7 @@ class Form::Sales::Questions::PropertyUnitType < ::Form::Question
     @copy_key = "sales.property_information.proptype"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/property_wheelchair_accessible.rb b/app/models/form/sales/questions/property_wheelchair_accessible.rb
index 13309c0ce..2858fb0c0 100644
--- a/app/models/form/sales/questions/property_wheelchair_accessible.rb
+++ b/app/models/form/sales/questions/property_wheelchair_accessible.rb
@@ -5,7 +5,7 @@ class Form::Sales::Questions::PropertyWheelchairAccessible < ::Form::Question
     @copy_key = "sales.property_information.wchair"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/purchaser_code.rb b/app/models/form/sales/questions/purchaser_code.rb
index 6c5cb8996..4eb8259e6 100644
--- a/app/models/form/sales/questions/purchaser_code.rb
+++ b/app/models/form/sales/questions/purchaser_code.rb
@@ -4,7 +4,7 @@ class Form::Sales::Questions::PurchaserCode < ::Form::Question
     @id = "purchid"
     @type = "text"
     @width = 10
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   QUESTION_NUMBER_FROM_YEAR = { 2023 => 2, 2024 => 4, 2025 => 4, 2026 => 4 }.freeze
diff --git a/app/models/form/sales/questions/resale.rb b/app/models/form/sales/questions/resale.rb
index fad64075b..c0fcb6059 100644
--- a/app/models/form/sales/questions/resale.rb
+++ b/app/models/form/sales/questions/resale.rb
@@ -4,7 +4,7 @@ class Form::Sales::Questions::Resale < ::Form::Question
     @id = "resale"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/sale_date.rb b/app/models/form/sales/questions/sale_date.rb
index f1362de41..8878a9ff2 100644
--- a/app/models/form/sales/questions/sale_date.rb
+++ b/app/models/form/sales/questions/sale_date.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::SaleDate < ::Form::Question
     super
     @id = "saledate"
     @type = "date"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   QUESTION_NUMBER_FROM_YEAR = { 2023 => 1, 2024 => 3, 2025 => 3, 2026 => 3 }.freeze
diff --git a/app/models/form/sales/questions/savings.rb b/app/models/form/sales/questions/savings.rb
index 897a164b7..fd351ae23 100644
--- a/app/models/form/sales/questions/savings.rb
+++ b/app/models/form/sales/questions/savings.rb
@@ -8,7 +8,7 @@ class Form::Sales::Questions::Savings < ::Form::Question
     @prefix = "£"
     @step = 10
     @min = 0
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @strip_commas = true
   end
 
diff --git a/app/models/form/sales/questions/savings_nk.rb b/app/models/form/sales/questions/savings_nk.rb
index 21f8fdbd5..f3e2220a5 100644
--- a/app/models/form/sales/questions/savings_nk.rb
+++ b/app/models/form/sales/questions/savings_nk.rb
@@ -15,7 +15,7 @@ class Form::Sales::Questions::SavingsNk < ::Form::Question
         },
       ],
     }
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/sex_registered_at_birth1.rb b/app/models/form/sales/questions/sex_registered_at_birth1.rb
index 4c9ff820d..ebc67c71e 100644
--- a/app/models/form/sales/questions/sex_registered_at_birth1.rb
+++ b/app/models/form/sales/questions/sex_registered_at_birth1.rb
@@ -5,7 +5,7 @@ class Form::Sales::Questions::SexRegisteredAtBirth1 < ::Form::Question
     @type = "radio"
     @check_answers_card_number = 1
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/sex_registered_at_birth2.rb b/app/models/form/sales/questions/sex_registered_at_birth2.rb
index e5a84de81..4f9a48612 100644
--- a/app/models/form/sales/questions/sex_registered_at_birth2.rb
+++ b/app/models/form/sales/questions/sex_registered_at_birth2.rb
@@ -6,7 +6,7 @@ class Form::Sales::Questions::SexRegisteredAtBirth2 < ::Form::Question
     @copy_key = "sales.household_characteristics.sexrab2.buyer"
     @check_answers_card_number = 2
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/shared_ownership_type.rb b/app/models/form/sales/questions/shared_ownership_type.rb
index 946acb7b6..ee226b26c 100644
--- a/app/models/form/sales/questions/shared_ownership_type.rb
+++ b/app/models/form/sales/questions/shared_ownership_type.rb
@@ -6,7 +6,7 @@ class Form::Sales::Questions::SharedOwnershipType < ::Form::Question
     @top_guidance_partial = "shared_ownership_type_definitions"
     @type = "radio"
     @answer_options = answer_options
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
diff --git a/app/models/form/sales/questions/staircase.rb b/app/models/form/sales/questions/staircase.rb
index 895cceea6..d55a8dfa7 100644
--- a/app/models/form/sales/questions/staircase.rb
+++ b/app/models/form/sales/questions/staircase.rb
@@ -4,7 +4,7 @@ class Form::Sales::Questions::Staircase < ::Form::Question
     @id = "staircase"
     @copy_key = "sales.#{page.subsection.copy_key}.staircasing"
     @type = "radio"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   def answer_options
diff --git a/app/models/form/sales/questions/staircase_bought.rb b/app/models/form/sales/questions/staircase_bought.rb
index 20f62d81e..87e9d5ab0 100644
--- a/app/models/form/sales/questions/staircase_bought.rb
+++ b/app/models/form/sales/questions/staircase_bought.rb
@@ -9,7 +9,7 @@ class Form::Sales::Questions::StaircaseBought < ::Form::Question
     @max = 100
     @step = 0.1
     @suffix = "%"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @top_guidance_partial = "financial_calculations_shared_ownership"
   end
 
diff --git a/app/models/form/sales/questions/staircase_count.rb b/app/models/form/sales/questions/staircase_count.rb
index 8a71872b7..50d217412 100644
--- a/app/models/form/sales/questions/staircase_count.rb
+++ b/app/models/form/sales/questions/staircase_count.rb
@@ -8,7 +8,7 @@ class Form::Sales::Questions::StaircaseCount < ::Form::Question
     @min = 2
     @max = 10
     @step = 1
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   QUESTION_NUMBER_FROM_YEAR = { 2025 => 94, 2026 => 102 }.freeze
diff --git a/app/models/form/sales/questions/staircase_first_time.rb b/app/models/form/sales/questions/staircase_first_time.rb
index 2f9618297..dceff17b9 100644
--- a/app/models/form/sales/questions/staircase_first_time.rb
+++ b/app/models/form/sales/questions/staircase_first_time.rb
@@ -4,7 +4,7 @@ class Form::Sales::Questions::StaircaseFirstTime < ::Form::Question
     @id = "firststair"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/staircase_initial_date.rb b/app/models/form/sales/questions/staircase_initial_date.rb
index 3b322bb0f..eb03a8b2f 100644
--- a/app/models/form/sales/questions/staircase_initial_date.rb
+++ b/app/models/form/sales/questions/staircase_initial_date.rb
@@ -4,7 +4,7 @@ class Form::Sales::Questions::StaircaseInitialDate < ::Form::Question
     @id = "initialpurchase"
     @copy_key = "sales.sale_information.stairprevious.initialpurchase"
     @type = "date"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   QUESTION_NUMBER_FROM_YEAR = { 2025 => 96, 2026 => 104 }.freeze
diff --git a/app/models/form/sales/questions/staircase_last_date.rb b/app/models/form/sales/questions/staircase_last_date.rb
index 1aa131705..2dcf94f45 100644
--- a/app/models/form/sales/questions/staircase_last_date.rb
+++ b/app/models/form/sales/questions/staircase_last_date.rb
@@ -4,7 +4,7 @@ class Form::Sales::Questions::StaircaseLastDate < ::Form::Question
     @id = "lasttransaction"
     @copy_key = "sales.sale_information.stairprevious.lasttransaction"
     @type = "date"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   QUESTION_NUMBER_FROM_YEAR = { 2025 => 95, 2026 => 103 }.freeze
diff --git a/app/models/form/sales/questions/staircase_owned.rb b/app/models/form/sales/questions/staircase_owned.rb
index 62d471506..f2cac1b23 100644
--- a/app/models/form/sales/questions/staircase_owned.rb
+++ b/app/models/form/sales/questions/staircase_owned.rb
@@ -9,7 +9,7 @@ class Form::Sales::Questions::StaircaseOwned < ::Form::Question
     @max = 100
     @step = 0.1
     @suffix = "%"
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   QUESTION_NUMBER_FROM_YEAR = { 2023 => 78, 2024 => 80, 2025 => 91, 2026 => 99 }.freeze
diff --git a/app/models/form/sales/questions/staircase_sale.rb b/app/models/form/sales/questions/staircase_sale.rb
index c9c2dbee4..22fbf7e0b 100644
--- a/app/models/form/sales/questions/staircase_sale.rb
+++ b/app/models/form/sales/questions/staircase_sale.rb
@@ -5,7 +5,7 @@ class Form::Sales::Questions::StaircaseSale < ::Form::Question
     @copy_key = form.start_year_2025_or_later? ? "sales.sale_information.staircasesale" : "sales.sale_information.about_staircasing.staircasesale"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/sales/questions/town_or_city.rb b/app/models/form/sales/questions/town_or_city.rb
index 4968b61ee..6483a6780 100644
--- a/app/models/form/sales/questions/town_or_city.rb
+++ b/app/models/form/sales/questions/town_or_city.rb
@@ -6,7 +6,7 @@ class Form::Sales::Questions::TownOrCity < ::Form::Question
     @type = "text"
     @plain_label = true
     @disable_clearing_if_not_routed_or_dynamic_answer_options = true
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @hide_question_number_on_page = true
   end
 
diff --git a/app/models/form/sales/questions/uprn.rb b/app/models/form/sales/questions/uprn.rb
index 37cc5c3fc..841818d58 100644
--- a/app/models/form/sales/questions/uprn.rb
+++ b/app/models/form/sales/questions/uprn.rb
@@ -5,7 +5,7 @@ class Form::Sales::Questions::Uprn < ::Form::Question
     @copy_key = "sales.property_information.uprn.uprn"
     @type = "text"
     @width = 10
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
     @inferred_check_answers_value = [
       {
         "condition" => { "uprn_known" => 0 },
diff --git a/app/models/form/sales/questions/uprn_known.rb b/app/models/form/sales/questions/uprn_known.rb
index e5da17911..af84c09f9 100644
--- a/app/models/form/sales/questions/uprn_known.rb
+++ b/app/models/form/sales/questions/uprn_known.rb
@@ -18,7 +18,7 @@ class Form::Sales::Questions::UprnKnown < ::Form::Question
         { "uprn_known" => 1 },
       ],
     }
-    @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
+    @question_number = get_question_number_from_hash(QUESTION_NUMBER_FROM_YEAR)
   end
 
   ANSWER_OPTIONS = {