diff --git a/ietf/community/templatetags/community_tags.py b/ietf/community/templatetags/community_tags.py
index dd430b8d3..c88e6b289 100644
--- a/ietf/community/templatetags/community_tags.py
+++ b/ietf/community/templatetags/community_tags.py
@@ -16,10 +16,10 @@ def get_user_managed_lists(user):
     try:
         person = user.person
         groups = []
-        managed_areas = [i.group for i in Role.objects.filter(name__slug='ad', email__in=person.email_set.all())]
+        managed_areas = [i.group for i in Role.objects.filter(name__slug='ad', group__type__slug='area', group__state__slug='active', email__in=person.email_set.all())]
         for area in managed_areas:
             groups.append(CommunityList.objects.get_or_create(group=area)[0])
-        managed_wg = [i.group for i in Role.objects.filter(name__slug='chair', group__type__slug='wg', email__in=person.email_set.all())]
+        managed_wg = [i.group for i in Role.objects.filter(name__slug='chair', group__type__slug='wg', group__state__slug__in=('active','bof'), email__in=person.email_set.all())]
         for wg in managed_wg:
             groups.append(CommunityList.objects.get_or_create(group=wg)[0])
         lists['group'] = groups
diff --git a/ietf/templates/base/menu.html b/ietf/templates/base/menu.html
index 6f1a208e4..2033c3e75 100644
--- a/ietf/templates/base/menu.html
+++ b/ietf/templates/base/menu.html
@@ -53,7 +53,7 @@
   {% if community_lists %}
     <li><a href="{{ community_lists.personal.get_manage_url }}">My tracked docs</a></li>
     {% for cl in community_lists.group %}
-      <li><a href="{{ cl.get_manage_url }}">WG {{ cl.short_name }} docs</a></li>
+      <li><a href="{{ cl.get_manage_url }}">{{ cl.short_name }} {{cl.group.type.slug}} docs</a></li>
     {% endfor %}
   {% else %}
     <li><a rel="nofollow" href="/accounts/login/?next={{request.get_full_path|urlencode}}">Sign in to track docs</a></li>