diff --git a/ippisite/ippidb/templates/add.html b/ippisite/ippidb/templates/add.html
index baddb157c1fa72f23117a8991474aca5235310fe..4ef0fccc8ead0d8f028c108ee253f55e64f6c87c 100644
--- a/ippisite/ippidb/templates/add.html
+++ b/ippisite/ippidb/templates/add.html
@@ -57,7 +57,7 @@ $(document).ready(function(){
 												<div class="view-content">
 													<ul class="nav nav-tabs wizard_step_nav">
 														{%for step in wizard.steps.all %}
-														{% if not step|startswith:"Test" %}
+														{% if not step|endswith:"DescriptionFormSet" %}
 														<li class="nav-item">
 															<a
 																	class="nav-link {% if step == wizard.steps.current %}active{%else%}{% if forloop.counter0 <= wizard.steps.step0 %}
@@ -74,7 +74,7 @@ $(document).ready(function(){
 														</li>
 														{%endif%}
 														{%endfor%}
-														{% if wizard.steps.current|startswith:"Test" %}
+														{% if wizard.steps.current|endswith:"DescriptionFormSet" %}
 														<li class="nav-item">
 															<a class="nav-link active"
 																	href="{% url 'ippidb_step' step=step %}">Tests ({{ "-7"|add:wizard.steps.step1 }}/3)
diff --git a/ippisite/ippidb/templatetags/customtags.py b/ippisite/ippidb/templatetags/customtags.py
index bcf5f4f1a25fc6459f37adcdc284947a829ba008..69ccd2370640573d9517680d4be26f672dad4765 100644
--- a/ippisite/ippidb/templatetags/customtags.py
+++ b/ippisite/ippidb/templatetags/customtags.py
@@ -145,6 +145,10 @@ def bootstrap_core(object):
 def startswith(text, starts):
     return text.startswith(starts)
 
+@register.filter('endswith')
+def endswith(text, starts):
+    return text.endswith(starts)
+
 
 @register.filter
 def verbose_name(obj, field_name=None):