diff --git a/app/models/concerns/tc_hat_calculations.rb b/app/models/concerns/tc_hat_calculations.rb
index 18a0e2cea..c4b05a112 100644
--- a/app/models/concerns/tc_hat_calculations.rb
+++ b/app/models/concerns/tc_hat_calculations.rb
@@ -84,7 +84,7 @@ def date_of_birth
           label: '60 - 61',
         },
         '62' => {
-          range: 62..,
+          range: 62..90,
           label: '62 or older',
         },
       }
@@ -539,10 +539,6 @@ def form_fields
           as: :pretty_checkboxes_group,
           number: 'F-3',
         },
-        _housing_rank_preamble: {
-          as: :partial,
-          partial: 'non_hmis_assessments/tc_hat/housing_rank_preamble',
-        },
         notes: {
           label: 'Client Note',
           number: 'F-12',
diff --git a/app/views/non_hmis_clients/assessments/_common_tc_hat_questions.haml b/app/views/non_hmis_clients/assessments/_common_tc_hat_questions.haml
index 60b78b9e0..54a3f6f19 100644
--- a/app/views/non_hmis_clients/assessments/_common_tc_hat_questions.haml
+++ b/app/views/non_hmis_clients/assessments/_common_tc_hat_questions.haml
@@ -49,7 +49,7 @@
               = render 'non_hmis_clients/assessments/common_description_display', options: options
         - else
           .c-question__number= options[:number]
-          - if disabled
+          - if disabled && @assessment.respond_to?(field_name)
             - val = @assessment.public_send(field_name)
             - if options[:collection].present?
               - if val.is_a?(Array)