diff --git a/dojo/templates/dojo/add_findings_as_accepted.html b/dojo/templates/dojo/add_findings_as_accepted.html
index b4fb90661cd..c77b1613037 100644
--- a/dojo/templates/dojo/add_findings_as_accepted.html
+++ b/dojo/templates/dojo/add_findings_as_accepted.html
@@ -16,7 +16,7 @@
           </td>
           <td>
             {% if finding.title %}
-                <a title="{{ finding.title }}" href="{% url 'view_finding' finding.id %}">{{ finding.title|truncatechars_html:60 }}</a>
+                <a title="{{ finding.title }}" href="{% url 'view_finding' finding.id %}">{{ finding.title|truncatechars:60 }}</a>
             {% else %}
                 <a title="{{ finding.id }}" href="{% url 'view_finding' finding.id %}">{{ finding.id }}</a>
             {% endif %}
diff --git a/dojo/templates/dojo/breadcrumbs/finding_breadcrumb.html b/dojo/templates/dojo/breadcrumbs/finding_breadcrumb.html
index 2e23be490f7..95be65b8d45 100644
--- a/dojo/templates/dojo/breadcrumbs/finding_breadcrumb.html
+++ b/dojo/templates/dojo/breadcrumbs/finding_breadcrumb.html
@@ -3,7 +3,7 @@
   <ol class="breadcrumb">
   <li><a data-toggle="tooltip" data-placement="top" title="Engagement" href="{% url 'view_engagement' finding.test.engagement.id %}">{{finding.test.engagement.name}}</a></li>
   <li><a data-toggle="tooltip" data-placement="top" title="Test" href="{% url 'view_test' finding.test.id %}">{{finding.test}}</a></li>
-  <li><a data-toggle="tooltip" data-placement="top" title="Finding" href="{% url 'view_finding' finding.id %}">{{finding.title|truncatechars_html:60}}</a></li>
+  <li><a data-toggle="tooltip" data-placement="top" title="Finding" href="{% url 'view_finding' finding.id %}">{{finding.title|truncatechars:60}}</a></li>
   {% if product_tab.title %}
     <li class="breadcrumb-item active" aria-current="page">{{product_tab.title}}</li>
   {% endif %}
diff --git a/dojo/templates/dojo/finding_related_row.html b/dojo/templates/dojo/finding_related_row.html
index d02e884100b..4cbe4858443 100644
--- a/dojo/templates/dojo/finding_related_row.html
+++ b/dojo/templates/dojo/finding_related_row.html
@@ -19,7 +19,7 @@
         </span>
     </td>
     <td>
-        <a title="{{ similar_finding.title }}" href="{% url 'view_finding' similar_finding.id %}">{{ similar_finding.title|truncatechars_html:80 }}</a>
+        <a title="{{ similar_finding.title }}" href="{% url 'view_finding' similar_finding.id %}">{{ similar_finding.title|truncatechars:80 }}</a>
         {% if similar_finding.tags %}
         <small>
             {% include "dojo/snippets/tags.html" with tags=similar_finding.tags.all %}
diff --git a/dojo/templates/dojo/findings_list_snippet.html b/dojo/templates/dojo/findings_list_snippet.html
index 6d037c5564e..a3e93b5483a 100644
--- a/dojo/templates/dojo/findings_list_snippet.html
+++ b/dojo/templates/dojo/findings_list_snippet.html
@@ -543,7 +543,7 @@ <h3 class="has-filters">
                                         </td>
                                         <td>
                                             {% if finding.title %}
-                                                <a title="{{ finding.title }}" href="{% url 'view_finding' finding.id %}">{{ finding.title|truncatechars_html:60 }}</a>
+                                                <a title="{{ finding.title }}" href="{% url 'view_finding' finding.id %}">{{ finding.title|truncatechars:60 }}</a>
                                             {% else %}
                                                 <a title="{{ finding.id }}" href="{% url 'view_finding' finding.id %}">{{ finding.id }}</a>
                                             {% endif %}
diff --git a/dojo/templates/dojo/metrics.html b/dojo/templates/dojo/metrics.html
index 10092a7fda2..98fc4548dc6 100644
--- a/dojo/templates/dojo/metrics.html
+++ b/dojo/templates/dojo/metrics.html
@@ -554,7 +554,7 @@ <h3>{% trans "Metric Counts" %}</h3>
                                                         {{ finding.epss_percentile|format_epss }}
                                                     </td>
                                                     <td><a href="{% url 'view_finding' finding.id %}"
-                                                           title="{{ finding.title }}">{{ finding.title|truncatechars_html:20 }}</a>
+                                                           title="{{ finding.title }}">{{ finding.title|truncatechars:20 }}</a>
                                                     </td>
                                                     <td class="text-right">{{ finding.age }}</td>
                                                     <td>{{ finding.status }}</td>
diff --git a/dojo/templates/dojo/request_report.html b/dojo/templates/dojo/request_report.html
index 5ca50efdbe3..1ff363bd79e 100644
--- a/dojo/templates/dojo/request_report.html
+++ b/dojo/templates/dojo/request_report.html
@@ -79,7 +79,7 @@ <h3 class="has-filters">
                         {% for finding in paged_findings %}
                             <tr>
                                 <td>
-                                    <a title="{{ finding.title }}" href="{% url 'view_finding' finding.id %}">{{ finding.title|truncatechars_html:50 }}</a>
+                                    <a title="{{ finding.title }}" href="{% url 'view_finding' finding.id %}">{{ finding.title|truncatechars:50 }}</a>
                                     {% include "dojo/snippets/tags.html" with tags=finding.tags.all %}
                                 </td>
                                 <td class="nowrap">{{ finding.date }}</td>
diff --git a/dojo/templates/dojo/templates.html b/dojo/templates/dojo/templates.html
index 0abe328aa00..b61e1e952e8 100644
--- a/dojo/templates/dojo/templates.html
+++ b/dojo/templates/dojo/templates.html
@@ -79,7 +79,7 @@ <h3 class="has-filters">
                                     {% if add_from_template %}
                                         <a href="{% url 'add_finding_from_template' tid finding.id %}"
                                            class="template-popover" data-placement="auto bottom" data-toggle="popover"
-                                           data-trigger="hover" title="{{ finding.title|truncatechars_html:100 }}"
+                                           data-trigger="hover" title="{{ finding.title|truncatechars:100 }}"
                                            data-content="{{ finding.description|truncatechars_html:500 }}">
                                             {{ finding.title }}
                                             {% include "dojo/snippets/tags.html" with tags=finding.tags.all %}
@@ -87,7 +87,7 @@ <h3 class="has-filters">
                                     {% elif apply_template %}
                                         <a href="{% url 'choose_finding_template_options' finding.id fid %}"
                                            class="template-popover" data-placement="auto bottom" data-toggle="popover"
-                                           data-trigger="hover" title="{{ finding.title|truncatechars_html:100 }}"
+                                           data-trigger="hover" title="{{ finding.title|truncatechars:100 }}"
                                            data-content="{{ finding.description|truncatechars_html:500 }}">
                                             {{ finding.title }}
                                             {% include "dojo/snippets/tags.html" with tags=finding.tags.all %}
diff --git a/dojo/templates/dojo/view_risk_acceptance.html b/dojo/templates/dojo/view_risk_acceptance.html
index 16c43b579a4..f2879819eb2 100644
--- a/dojo/templates/dojo/view_risk_acceptance.html
+++ b/dojo/templates/dojo/view_risk_acceptance.html
@@ -185,7 +185,7 @@ <h3>Findings Accepted</h3>
                             {{ finding.epss_percentile|format_epss }}
                         </td>
                         <td><a href="{% url 'view_finding' finding.id %}"
-                               title="{{ finding.title }}">{{ finding.title|truncatechars_html:140 }}</a></td>
+                               title="{{ finding.title }}">{{ finding.title|truncatechars:140 }}</a></td>
                         <td>{{ finding.date }}</td>
                         <td>{{ finding.active }}</td>
 
diff --git a/dojo/templates/dojo/view_test.html b/dojo/templates/dojo/view_test.html
index 6f12f17675b..43e0b754d7c 100644
--- a/dojo/templates/dojo/view_test.html
+++ b/dojo/templates/dojo/view_test.html
@@ -1145,7 +1145,7 @@ <h4 class="has-filters">
                                     </td>
                                     <td>
                                         {% if finding.title %}
-                                            <a title="{{ finding.title }}" href="{% url 'view_finding' finding.id %}">{{ finding.title|truncatechars_html:60 }}</a>
+                                            <a title="{{ finding.title }}" href="{% url 'view_finding' finding.id %}">{{ finding.title|truncatechars:60 }}</a>
                                         {% else %}
                                             <a title="{{ finding.id }}" href="{% url 'view_finding' finding.id %}">{{ finding.id }}</a>
                                         {% endif %}