diff --git a/app/controllers/case_logs_controller.rb b/app/controllers/case_logs_controller.rb
index 90f06413b..268d1b9b3 100644
--- a/app/controllers/case_logs_controller.rb
+++ b/app/controllers/case_logs_controller.rb
@@ -101,11 +101,7 @@ private
 
   def responses_for_page(page)
     form = FormHandler.instance.get_form("2021_2022")
-    initial_questions_for_page = form.questions_for_page(page)
-    soft_validations = form.soft_validations_for_page(page)
-    questions_for_page = initial_questions_for_page.merge(soft_validations || {})
-
-    questions_for_page.each_with_object({}) do |(question_key, question_info), result|
+    form.expected_responses_for_page(page).each_with_object({}) do |(question_key, question_info), result|
       question_params = params["case_log"][question_key]
       next unless question_params
 
diff --git a/app/models/form.rb b/app/models/form.rb
index d819a1b6c..ea803e5b6 100644
--- a/app/models/form.rb
+++ b/app/models/form.rb
@@ -46,6 +46,10 @@ class Form
     all_pages[page]["soft_validations"]
   end
 
+  def expected_responses_for_page(page)
+    questions_for_page(page).merge(soft_validations_for_page(page) || {})
+  end
+
   def first_page_for_subsection(subsection)
     pages_for_subsection(subsection).keys.first
   end