diff --git a/ietf/doc/feeds.py b/ietf/doc/feeds.py
index 9fec1a4b5..b3789a90e 100644
--- a/ietf/doc/feeds.py
+++ b/ietf/doc/feeds.py
@@ -12,7 +12,7 @@ from django.utils.text import truncate_words
 
 from ietf.doc.models import *
 from ietf.doc.utils import augment_events_with_revision
-from ietf.idtracker.templatetags.ietf_filters import format_textarea
+from ietf.doc.templatetags.ietf_filters import format_textarea
 
 class DocumentChanges(Feed):
     feed_type = Atom1Feed
diff --git a/ietf/idtracker/templatetags/ietf_filters.py b/ietf/doc/templatetags/ietf_filters.py
similarity index 100%
rename from ietf/idtracker/templatetags/ietf_filters.py
rename to ietf/doc/templatetags/ietf_filters.py
diff --git a/ietf/doc/tests.py b/ietf/doc/tests.py
index f4c9e67b1..d9bfa7f81 100644
--- a/ietf/doc/tests.py
+++ b/ietf/doc/tests.py
@@ -285,3 +285,10 @@ class AddCommentTestCase(django.test.TestCase):
         q = PyQuery(r.content)
         self.assertEquals(len(q('form textarea[name=comment]')), 1)
 
+
+class TemplateTagTest(unittest.TestCase):
+    def test_template_tags(self):
+        import doctest
+        from ietf.doc.templatetags import ietf_filters
+        failures, tests = doctest.testmod(ietf_filters)
+        self.assertEqual(failures, 0)
diff --git a/ietf/idindex/index.py b/ietf/idindex/index.py
index 6b686936c..ec4745c69 100644
--- a/ietf/idindex/index.py
+++ b/ietf/idindex/index.py
@@ -8,7 +8,7 @@ import pytz
 from django.conf import settings
 from django.template.loader import render_to_string
 
-from ietf.idtracker.templatetags.ietf_filters import clean_whitespace
+from ietf.doc.templatetags.ietf_filters import clean_whitespace
 from ietf.doc.models import *
 
 def all_id_txt():
diff --git a/ietf/idtracker/tests.py b/ietf/idtracker/tests.py
deleted file mode 100644
index 7c2c3aaa7..000000000
--- a/ietf/idtracker/tests.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright The IETF Trust 2007, All Rights Reserved
-#
-import doctest, unittest
-
-from ietf.idtracker.templatetags import ietf_filters
-
-class TemplateTagTest(unittest.TestCase):
-    def test_template_tags(self):
-        failures, tests = doctest.testmod(ietf_filters)
-        self.assertEqual(failures, 0)
diff --git a/ietf/iesg/views.py b/ietf/iesg/views.py
index 797479375..f534312d5 100644
--- a/ietf/iesg/views.py
+++ b/ietf/iesg/views.py
@@ -51,8 +51,8 @@ from ietf.iesg.models import TelechatDates, TelechatAgendaItem, WGAction
 from ietf.idrfc.idrfc_wrapper import IdWrapper, RfcWrapper
 from ietf.doc.utils import update_telechat
 from ietf.ietfauth.decorators import group_required, role_required
-from ietf.idtracker.templatetags.ietf_filters import in_group
-from ietf.ipr.models import IprDocAlias 
+from ietf.ietfauth.utils import has_role
+from ietf.ipr.models import IprDocAlias
 from ietf.doc.models import Document, TelechatDocEvent, LastCallDocEvent, ConsensusDocEvent
 from ietf.group.models import Group, GroupMilestone
 
@@ -712,7 +712,7 @@ def get_possible_wg_actions():
 def working_group_actions(request):
     current_items = WGAction.objects.order_by('status_date').select_related()
 
-    if request.method == 'POST' and in_group(request.user, 'Secretariat'):
+    if request.method == 'POST' and has_role(request.user, 'Secretariat'):
         filename = request.POST.get('filename')
         if filename and filename in os.listdir(settings.IESG_WG_EVALUATION_DIR):
             if 'delete' in request.POST:
diff --git a/ietf/nomcom/templatetags/nomcom_tags.py b/ietf/nomcom/templatetags/nomcom_tags.py
index 84a5d3d4f..f9f98feaa 100644
--- a/ietf/nomcom/templatetags/nomcom_tags.py
+++ b/ietf/nomcom/templatetags/nomcom_tags.py
@@ -7,7 +7,7 @@ from django.template.defaultfilters import linebreaksbr, force_escape
 
 from ietf.utils.pipe import pipe
 from ietf.ietfauth.decorators import has_role
-from ietf.idtracker.templatetags.ietf_filters import wrap_text
+from ietf.doc.templatetags.ietf_filters import wrap_text
 
 from ietf.person.models import Person
 from ietf.nomcom.models import Feedback