Alexander Pace
--- a/gracedb/search/constants.py
+++ b/gracedb/search/constants.py
+# /year value for use in tables and such. 
+
+def display_far_hr_to_yr(display_far):
+
+    # Determine "human-readable" FAR to display
+    display_far_hr = display_far
+    if display_far:
+        # FAR in units of yr^-1
+        far_yr = display_far * far_hr_to_yr
+        if (far_yr < 1):
+            display_far_hr = "1 per {0:0.5g} years".format(1.0/far_yr)
+        else:
+            display_far_hr = "{0:0.5g} per year".format(far_yr)
+
+    return display_far_hr
+
--- a/gracedb/superevents/views.py
+++ b/gracedb/superevents/views.py
    # Modify get_queryset() to filter for significant vs insignificant:
    def get_queryset(self, showall=False, **kwargs):
        if showall:
-            return self.get_public_superevents()
+            return self.get_public_superevents()\
+                .prefetch_related('voevent_set', 'log_set') \
+                .select_related('preferred_event')
        else:
-            return self.significant_events(self.get_public_superevents())
+            return self.significant_events(self.get_public_superevents())\
+                .prefetch_related('voevent_set', 'log_set') \
+                .select_related('preferred_event')
--- a/gracedb/superevents/views.py
+++ b/gracedb/superevents/views.py
+        # Construct a list of unique superevent ids that have public analyst comments.
+        # This hits the database once:
+        public_comments_sids = list(public_comments_set.values_list('superevent__superevent_id', flat=True).distinct())

-        # Filter and loop over exposed superevents for the given run:
+        # Construct a dictionary where the key is a superevent_id and the value is the
+        # associated concatenated comment. This hits the database once for each value
+        # in public_comments_sids. But again this is less than O(1%) or less than the
+        # total number of public superevents:
+
+        comments_dict = {}
+
+        for sid in public_comments_sids:
+             comments_dict.update(
+                 {sid: ' ** '.join(list(public_comments_set.filter(superevent__superevent_id=sid)\
+                                             .values_list('comment', flat=True)))})