diff --git a/src/registrar/templates/includes/domain_request_status_manage.html b/src/registrar/templates/includes/domain_request_status_manage.html
index 395bc9c9c..997bf5bd5 100644
--- a/src/registrar/templates/includes/domain_request_status_manage.html
+++ b/src/registrar/templates/includes/domain_request_status_manage.html
@@ -146,7 +146,7 @@
{% block request_summary %}
{% with heading_level='h3' %}
- {% with org_type=DomainRequest.generic_org_type %}
+ {% with org_type=DomainRequest.get_generic_org_type %}
{% include "includes/summary_item.html" with title='Type of organization' value=org_type heading_level=heading_level %}
{% endwith %}
@@ -164,7 +164,7 @@
{% endif %}
{% if DomainRequest.get_federal_type_display %}
- {% include "includes/summary_item.html" with title='Federal government branch' value=DomainRequest.federal_type heading_level=heading_level %}
+ {% include "includes/summary_item.html" with title='Federal government branch' value=DomainRequest.get_federal_type_display heading_level=heading_level %}
{% endif %}
{% if DomainRequest.is_election_board %}
diff --git a/src/registrar/templates/includes/organization_address.html b/src/registrar/templates/includes/organization_address.html
index c332faaba..ecfc6f47e 100644
--- a/src/registrar/templates/includes/organization_address.html
+++ b/src/registrar/templates/includes/organization_address.html
@@ -3,16 +3,16 @@
{{ organization.federal_agency }}
{% endif %}
{% if organization.organization_name %}
- {{ organization.organization_name }}
+ {{ organization.organization_name }}
{% endif %}
{% if organization.address_line1 %}
{{ organization.address_line1 }}
{% endif %}
{% if organization.address_line2 %}
-
{{ organization.address_line2 }}
+
{{ organization.address_line2 }}
{% endif %}
- {% if organization.city %}
-
{{ organization.city}}{% if organization.state_territory %},
+ {% if organization.city %}
+
{{ organization.city }}{% if organization.state_territory %},
{% else %}
{% endif %}
{% endif %}
diff --git a/src/registrar/templates/includes/request_review_steps.html b/src/registrar/templates/includes/request_review_steps.html
index b3ef6dc67..3540be48f 100644
--- a/src/registrar/templates/includes/request_review_steps.html
+++ b/src/registrar/templates/includes/request_review_steps.html
@@ -9,7 +9,7 @@
{% if step == Step.ORGANIZATION_TYPE %}
{% if domain_request.generic_org_type is not None %}
- {% with title=form_titles|get_item:step value=domain_request.generic_org_type_display|default:"Incomplete"|safe %}
+ {% with title=form_titles|get_item:step value=domain_request.get_generic_org_type_display|default:"Incomplete"|safe %}
{% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url %}
{% endwith %}
{% else %}
@@ -29,7 +29,7 @@
{% if step == Step.ORGANIZATION_FEDERAL %}
- {% with title=form_titles|get_item:step value=domain_request.federal_type|default:"Incomplete"|safe %}
+ {% with title=form_titles|get_item:step value=domain_request..get_federal_type_display|default:"Incomplete"|safe %}
{% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url %}
{% endwith %}
{% endif %}
diff --git a/src/registrar/templates/includes/request_status_manage.html b/src/registrar/templates/includes/request_status_manage.html
index 48ea057f1..efb7be2e0 100644
--- a/src/registrar/templates/includes/request_status_manage.html
+++ b/src/registrar/templates/includes/request_status_manage.html
@@ -146,7 +146,7 @@
{% block request_summary %}
{% with heading_level='h3' %}
- {% with org_type=DomainRequest.generic_org_type_display %}
+ {% with org_type=DomainRequest.get_generic_org_type_display %}
{% include "includes/summary_item.html" with title='Type of organization' value=org_type heading_level=heading_level %}
{% endwith %}
diff --git a/src/registrar/tests/common.py b/src/registrar/tests/common.py
index c22fc753c..4edfbe680 100644
--- a/src/registrar/tests/common.py
+++ b/src/registrar/tests/common.py
@@ -191,7 +191,6 @@ class GenericTestHelper(TestCase):
# Use changelist_view to get the sorted queryset
response = self.admin.changelist_view(dummy_request)
-
response.render() # Render the response before accessing its content
returned_sort_order = list(response.context_data["cl"].result_list)