diff --git a/helpdesk/templates/helpdesk/filters/owner.html b/helpdesk/templates/helpdesk/filters/owner.html
index 20ed9446..0e7b64cc 100644
--- a/helpdesk/templates/helpdesk/filters/owner.html
+++ b/helpdesk/templates/helpdesk/filters/owner.html
@@ -14,7 +14,7 @@
             {% endwith %}
             {% for u in user_choices %}
             <option value='{{ u.id }}'{% if u.id|in_list:query_params.filtering.assigned_to__id__in %} selected='selected'{% endif %}>
-                {{ u.get_username }}{% ifequal u user %} {% trans "(ME)" %}{% endifequal %}
+                {{ u.get_username }}{% if u==user %} {% trans "(ME)" %}{% endif %}
             </option>
             {% endfor %}
         </select>
diff --git a/helpdesk/templates/helpdesk/filters/sorting.html b/helpdesk/templates/helpdesk/filters/sorting.html
index b9295fad..9115b1ce 100644
--- a/helpdesk/templates/helpdesk/filters/sorting.html
+++ b/helpdesk/templates/helpdesk/filters/sorting.html
@@ -6,22 +6,22 @@
     </div>
     <div class="col col-sm-3">
             <select id='id_sortx' name='sortx' class="">
-                <option value='created'{% ifequal query_params.sorting "created"%} selected='selected'{% endifequal %}>
+                <option value='created'{% if query_params.sorting == "created"%} selected='selected'{% endif %}>
                     {% trans "Created" %}
                 </option>
-                <option value='title'{% ifequal query_params.sorting "title"%} selected='selected'{% endifequal %}>
+                <option value='title'{% if query_params.sorting == "title"%} selected='selected'{% endif %}>
                     {% trans "Title" %}
                 </option>
-                <option value='queue'{% ifequal query_params.sorting "queue"%} selected='selected'{% endifequal %}>
+                <option value='queue'{% if query_params.sorting == "queue"%} selected='selected'{% endif %}>
                     {% trans "Queue" %}
                 </option>
-                <option value='status'{% ifequal query_params.sorting "status"%} selected='selected'{% endifequal %}>
+                <option value='status'{% if query_params.sorting == "status"%} selected='selected'{% endif %}>
                     {% trans "Status" %}
                 </option>
-                <option value='priority'{% ifequal query_params.sorting "priority"%} selected='selected'{% endifequal %}>
+                <option value='priority'{% if query_params.sorting == "priority"%} selected='selected'{% endif %}>
                     {% trans "Priority" %}
                 </option>
-                <option value='assigned_to'{% ifequal query_params.sorting "assigned_to"%} selected='selected'{% endifequal %}>
+                <option value='assigned_to'{% if query_params.sorting == "assigned_to"%} selected='selected'{% endif %}>
                     {% trans "Owner" %}
                 </option>
             </select>
diff --git a/helpdesk/templates/helpdesk/public_view_ticket.html b/helpdesk/templates/helpdesk/public_view_ticket.html
index 2d28c2f9..c293427d 100644
--- a/helpdesk/templates/helpdesk/public_view_ticket.html
+++ b/helpdesk/templates/helpdesk/public_view_ticket.html
@@ -99,34 +99,34 @@
         <dd class='form_help_text'>{% trans "You can insert ticket and queue details in your message. For more information, see the <a href='../../help/context/'>context help page</a>." %}</dd>
 
         {% if not ticket.can_be_resolved %}<dd>{% trans "This ticket cannot be resolved or closed until the tickets it depends on are resolved." %}</dd>{% endif %}
-        {% ifequal ticket.status 1 %}
+        {% if ticket.status == 1 %}
         <input type="hidden" name="new_status" value="{{ ticket.status }}" />
-        {% endifequal %}
-        {% ifequal ticket.status 2 %}
+        {% endif %}
+        {% if ticket.status == 2 %}
         <dd><div class="form-group">
             <label for='st_reopened' class='active radio-inline'><input type='radio' name='new_status' value='2' id='st_reopened' checked='checked'>{% trans "Reopened" %} &raquo;</label>
             <label class="radio-inline" for='st_resolved'><input type='radio' name='new_status' value='3' id='st_resolved'{% if not ticket.can_be_resolved %} disabled='disabled'{% endif %}>{% trans "Resolved" %} &raquo;</label>
             <label class="radio-inline" for='st_closed'><input type='radio' name='new_status' value='4' id='st_closed'{% if not ticket.can_be_resolved %} disabled='disabled'{% endif %}>{% trans "Closed" %} &raquo;</label>
             <label class="radio-inline" for='st_duplicate'><input type='radio' name='new_status' value='5' id='st_duplicate'>{% trans "Duplicate" %}</label>
         </div></dd>
-        {% endifequal %}
-        {% ifequal ticket.status 3 %}
+        {% endif %}
+        {% if ticket.status == 3 %}
         <dd><div class="form-group">
             <label for='st_reopened' class="radio-inline"><input type='radio' name='new_status' value='2' id='st_reopened'>{% trans "Reopened" %} &laquo;</label>
             <label for='st_resolved' class='active radio-inline'><input type='radio' name='new_status' value='3' id='st_resolved' checked='checked'>{% trans "Resolved" %} &raquo;</label>
             <label class="radio-inline" for='st_closed'><input type='radio' name='new_status' value='4' id='st_closed'>{% trans "Closed" %}</label>
         </div></dd>
-        {% endifequal %}
-        {% ifequal ticket.status 4 %}
+        {% endif %}
+        {% if ticket.status == 4 %}
         <dd><div class="form-group"><label for='st_reopened' class="radio-inline"><input type='radio' name='new_status' value='2' id='st_reopened'>{% trans "Reopened" %} &laquo;</label>
         <label class="radio-inline" for='st_closed'><input type='radio' name='new_status' value='4' id='st_closed' checked='checked'>{% trans "Closed" %}</label></div></dd>
-        {% endifequal %}
-        {% ifequal ticket.status 5 %}
+        {% endif %}
+        {% if ticket.status == 5 %}
         <dd><div class="form-group">
             <label class="radio-inline" for='st_reopened'><input type='radio' name='new_status' value='2' id='st_reopened'>{% trans "Reopened" %} &laquo;</label>
             <label class="radio-inline" for='st_duplicate'><input type='radio' name='new_status' value='5' id='st_duplicate' checked='checked'>{% trans "Duplicate" %}</label>
         </div></dd>
-        {% endifequal %}
+        {% endif %}
 
         <input type='hidden' name='public' value='1'>
 
diff --git a/helpdesk/templates/helpdesk/report_output.html b/helpdesk/templates/helpdesk/report_output.html
index 69497b03..cd50fe0b 100644
--- a/helpdesk/templates/helpdesk/report_output.html
+++ b/helpdesk/templates/helpdesk/report_output.html
@@ -29,7 +29,7 @@
                 <label for='saved_query'>{% trans "Select Query:" %}</label>
                 <select name='saved_query'>
                     <option value="">--------</option>{% for q in user_saved_queries_ %}
-                    <option value="{{ q.id }}"{% ifequal saved_query q %} selected{% endifequal %}>{{ q.title }}</option>{% endfor %}
+                    <option value="{{ q.id }}"{% if saved_query==q %} selected{% endif %}>{{ q.title }}</option>{% endfor %}
                 </select>
                 <input class="btn btn-primary" type='submit' value='{% trans "Filter Report" %}'>
             </form>
diff --git a/helpdesk/templates/helpdesk/ticket.html b/helpdesk/templates/helpdesk/ticket.html
index 5eade600..54324f3b 100644
--- a/helpdesk/templates/helpdesk/ticket.html
+++ b/helpdesk/templates/helpdesk/ticket.html
@@ -112,39 +112,39 @@
 
                 <dt><label>{% trans "New Status" %}</label></dt>
                 {% if not ticket.can_be_resolved %}<dd>{% trans "This ticket cannot be resolved or closed until the tickets it depends on are resolved." %}</dd>{% endif %}
-                {% ifequal ticket.status 1 %}
+                {% if ticket.status == 1 %}
                 <dd><div class="form-group">
                     <label for='st_open' class='active radio-inline'><input type='radio' name='new_status' value='1' id='st_open' checked='checked'>{% trans "Open" %} &raquo;</label>
                     <label for='st_resolved' class="radio-inline"><input type='radio' name='new_status' value='3' id='st_resolved'{% if not ticket.can_be_resolved %} disabled='disabled'{% endif %}>{% trans "Resolved" %} &raquo;</label>
                     <label for='st_closed' class="radio-inline"><input type='radio' name='new_status' value='4' id='st_closed'{% if not ticket.can_be_resolved %} disabled='disabled'{% endif %}>{% trans "Closed" %} &raquo;</label>
                     <label class="radio-inline" for='st_duplicate'><input type='radio' name='new_status' value='5' id='st_duplicate'>{% trans "Duplicate" %}</label>
                 </div></dd>
-                {% endifequal %}
-                {% ifequal ticket.status 2 %}
+                {% endif %}
+                {% if ticket.status == 2 %}
                 <dd><div class="form-group">
                     <label for='st_reopened' class='active radio-inline'><input type='radio' name='new_status' value='2' id='st_reopened' checked='checked'>{% trans "Reopened" %} &raquo;</label>
                     <label class="radio-inline" for='st_resolved'><input type='radio' name='new_status' value='3' id='st_resolved'{% if not ticket.can_be_resolved %} disabled='disabled'{% endif %}>{% trans "Resolved" %} &raquo;</label>
                     <label class="radio-inline" for='st_closed'><input type='radio' name='new_status' value='4' id='st_closed'{% if not ticket.can_be_resolved %} disabled='disabled'{% endif %}>{% trans "Closed" %} &raquo;</label>
                     <label class="radio-inline" for='st_duplicate'><input type='radio' name='new_status' value='5' id='st_duplicate'>{% trans "Duplicate" %}</label>
                 </div></dd>
-                {% endifequal %}
-                {% ifequal ticket.status 3 %}
+                {% endif %}
+                {% if ticket.status == 3 %}
                 <dd><div class="form-group">
                     <label for='st_reopened' class="radio-inline"><input type='radio' name='new_status' value='2' id='st_reopened'>{% trans "Reopened" %} &laquo;</label>
                     <label for='st_resolved' class='active radio-inline'><input type='radio' name='new_status' value='3' id='st_resolved' checked='checked'>{% trans "Resolved" %} &raquo;</label>
                     <label class="radio-inline" for='st_closed'><input type='radio' name='new_status' value='4' id='st_closed'>{% trans "Closed" %}</label>
                 </div></dd>
-                {% endifequal %}
-                {% ifequal ticket.status 4 %}
+                {% endif %}
+                {% if ticket.status == 4 %}
                 <dd><div class="form-group"><label for='st_reopened' class="radio-inline"><input type='radio' name='new_status' value='2' id='st_reopened'>{% trans "Reopened" %} &laquo;</label>
                 <label class="radio-inline" for='st_closed'><input type='radio' name='new_status' value='4' id='st_closed' checked='checked'>{% trans "Closed" %}</label></div></dd>
-                {% endifequal %}
-                {% ifequal ticket.status 5 %}
+                {% endif %}
+                {% if ticket.status == 5 %}
                 <dd><div class="form-group">
                     <label class="radio-inline" for='st_reopened'><input type='radio' name='new_status' value='2' id='st_reopened'>{% trans "Reopened" %} &laquo;</label>
                     <label class="radio-inline" for='st_duplicate'><input type='radio' name='new_status' value='5' id='st_duplicate' checked='checked'>{% trans "Duplicate" %}</label>
                 </div></dd>
-                {% endifequal %}
+                {% endif %}
 
                 {% if helpdesk_settings.HELPDESK_UPDATE_PUBLIC_DEFAULT %}
                 <input type='hidden' name='public' value='1'>