diff --git a/ippisite/ippidb/models.py b/ippisite/ippidb/models.py
index 4758dfe32a8fbdbbc9a56789b2966b659099ed47..ed714f81a798af8198f85deb0eb09185b95e15d2 100644
--- a/ippisite/ippidb/models.py
+++ b/ippisite/ippidb/models.py
@@ -410,14 +410,14 @@ class Compound(models.Model):
 
     @property
     def best_pXC50_activity(self):
-        return self.compoundactivityresult_set.filter(activity_type__in=['pIC50','pEC50']).aggregate(Max('activity'))['activity__max']
+        return self.compoundactivityresult_set.aggregate(Max('activity'))['activity__max']
 
     @property
     def best_pXC50_compound_activity_result(self):
         best_pXC50_activity = self.best_pXC50_activity
         if best_pXC50_activity is None:
             return None
-        return self.compoundactivityresult_set.filter(activity_type__in=['pIC50','pEC50'], activity=best_pXC50_activity)[0]
+        return self.compoundactivityresult_set.filter(activity=best_pXC50_activity)[0]
 
     @property
     def le(self):