diff --git a/beat/web/search/models.py b/beat/web/search/models.py
index db4809593ce422395db96f4935bceea9005543f1..54c95ed7669dc00e64a404419bb58161818bd9bf 100644
--- a/beat/web/search/models.py
+++ b/beat/web/search/models.py
@@ -179,8 +179,7 @@ class Leaderboard(models.Model):
             header = []
             for block in blocks:
 
-                analyzer_output = Result.objects.filter(block=block,
-                    type__in=Result.SIMPLE_TYPE_NAMES).order_by('name')
+                analyzer_output = Result.objects.filter(cache__in=block.outputs.all(), type__in=Result.SIMPLE_TYPE_NAMES).order_by('name')
 
                 if not header: #first row, set order
                     header = [k.name for k in analyzer_output]