diff --git a/Resources/views/Report/export.csv.twig b/Resources/views/Report/export.csv.twig
index 90217f1db..e2dcb15c6 100644
--- a/Resources/views/Report/export.csv.twig
+++ b/Resources/views/Report/export.csv.twig
@@ -4,7 +4,7 @@
 #}"{{ 'Date'|trans }}",{#
 #}"{{ 'User'|trans }}",{#
 #}"{{ 'Report type'|trans }}",{#
-#}{% for customField in cf_group.customFields %}{#
+#}{% for customField in cf_group.activeCustomFields %}{#
     #}"{{ chill_custom_field_label(customField) }}"{% if not loop.last %},{% endif %}{#
 #}{% endfor %}{#
 
@@ -16,7 +16,7 @@
     #}"{{ report.date|localizeddate('short', 'none') }}",{#
     #}"{{ report.user|csv_cell }}",{#
     #}"{{ report.cFGroup.getName(app.request.locale)|csv_cell }}",{#
-    #}{% for customField in report.cFGroup.customFields %}{#
+    #}{% for customField in report.cFGroup.activeCustomFields %}{#
         #}{% if customField.type == 'title' %}{#
             #}""{#
         #}{% else %}{#
diff --git a/Resources/views/Report/view.html.twig b/Resources/views/Report/view.html.twig
index 0d964007a..b344219c9 100644
--- a/Resources/views/Report/view.html.twig
+++ b/Resources/views/Report/view.html.twig
@@ -39,14 +39,7 @@
         <dt class="inline">{{ 'Report type'|trans }}</dt>
         <dd>{{ entity.cFGroup.getName(app.request.locale) }}</dd>
 
-        {% for customField in entity.cFGroup.customFields %}
-            {% if customField.type == 'title' %}
-                {{ chill_custom_field_widget(entity.cFData , customField) }}
-            {% else %}
-                <dt>{{ chill_custom_field_label(customField) }}</dt>
-                <dd>{{ chill_custom_field_widget(entity.cFData , customField) }}</dd>
-            {% endif %}
-        {% endfor %}
+        {{ chill_custom_fields_group_widget(entity.cFData, entity.cFGroup) }}
     </dl>
 
     <a href="{{ path('report_edit', { 'person_id': entity.person.id, 'report_id': entity.id }) }}"><i class="fa fa-pencil"></i> {{ 'Update the report' | trans }}</a>