diff --git a/gracedb/events/templatetags/mediaviews.py b/gracedb/events/templatetags/mediaviews.py
index b58ed72fc0ed3c6904189adaac80a2224f24821f..fa17997f7852ca62df57a5f2de1cc17b8ae9c153 100644
--- a/gracedb/events/templatetags/mediaviews.py
+++ b/gracedb/events/templatetags/mediaviews.py
@@ -273,9 +273,14 @@ def tag_selecter(name, autoescape=None):
 def is_in_rrt_subcategory(event, rrt_subcategory):
     if rrt_subcategory == "CBC":
         if event.search:
+
             return (
                 event.group.name == "CBC"
                 and not event.search.name == "EarlyWarning"
+            ) | (
+                    event.group.name == "Burst"
+                    and event.pipeline.name =="CWB"
+                    and event.search.name == "BBH"
             )
         else:
             return (
@@ -283,7 +288,11 @@ def is_in_rrt_subcategory(event, rrt_subcategory):
             )
 
     elif rrt_subcategory == "Burst":
-        return event.group.name == "Burst"
+        return (
+            event.group.name == "Burst"
+            and not( event.pipeline.name == "CWB" and
+                 event.search.name == "BBH")
+            )
 
     elif rrt_subcategory == "EarlyWarning" and event.search:
         return event.search.name == "EarlyWarning"
diff --git a/gracedb/superevents/templatetags/rrt_info.py b/gracedb/superevents/templatetags/rrt_info.py
index ea87812560db08af6fb2fa9bd412c74fdca6ed0f..aff2d708ce9fe66fc638c48878eb6922257d2c22 100644
--- a/gracedb/superevents/templatetags/rrt_info.py
+++ b/gracedb/superevents/templatetags/rrt_info.py
@@ -29,7 +29,10 @@ def get_template_from_label(sevent):
     # Get filename based on label, or return the advreq message:
     if sevent.labels.filter(name='ADVOK'):
         notice_filename = '{}-initial.json'.format(sevent.superevent_id)
-        circular_filename = 'initial-circular.txt'
+        if sevent.labels.filter(name='RAVEN_ALERT'):
+            circular_filename = 'initial-emcoinc-circular.txt'
+        else:
+            circular_filename = 'initial-circular.txt'
 
     elif sevent.labels.filter(name='ADVNO'):
         notice_filename = '{}-retraction.json'.format(sevent.superevent_id)