diff --git a/cara/apps/calculator/templates/report.html.j2 b/cara/apps/calculator/templates/report.html.j2
index b716814f..205bbdd9 100644
--- a/cara/apps/calculator/templates/report.html.j2
+++ b/cara/apps/calculator/templates/report.html.j2
@@ -24,7 +24,7 @@
 	<p class="data_title">Ventilation data:</p>
 	<ul>
 		<li><p class="data_text">Mechanical ventilation:
-		{% if ventilation_type == "mechanical_ventilation"%}
+		{% if ventilation_type == "mechanical"%}
 		Yes </p></li>
 		<ul>
 			<li><p class="data_subtext">Air supply flow rate: {{ air_supply }}</p></li>
@@ -34,7 +34,7 @@
 		No </li>
 		{% endif %}
 		<li><p class="data_text">Natural ventilation:
-		{% if ventilation_type == "natural_ventilation"%}
+		{% if ventilation_type == "natural"%}
 		Yes </p></li>
 		<ul>
 			<li><p class="data_subtext">Number of windows: {{ windows_number }}</p></li>
@@ -61,7 +61,7 @@
 		{% endif %}
 		infected.</p></li>
 		<li><p class="data_text">Activity type: 
-		{% if activity_type == "office work" %}
+		{% if activity_type == "office" %}
 		Office work – typical scenario with all persons seated, talking.
 		{% elif activity_type == "workshop" %}
 		Workshop = assembly workshop environment, all persons doing light exercise, talking.