diff --git a/ippisite/ippidb/models.py b/ippisite/ippidb/models.py
index 181f149b55adb336479967b8c2a980f4e8616a42..3bb8468c323936cb3354b634091fed7007634259 100644
--- a/ippisite/ippidb/models.py
+++ b/ippisite/ippidb/models.py
@@ -1556,11 +1556,6 @@ def update_compound_cached_properties(compounds_queryset=None):
         )
         c.save()
     compounds_queryset.update(
-        pubs=Subquery(
-            compounds_queryset.filter(id=OuterRef("id"))
-            .annotate(_pubs=Count("refcompoundbiblio", distinct=True))
-            .values("_pubs")[:1]
-        ),
         best_activity=Subquery(
             compounds_queryset.filter(id=OuterRef("id"))
             .annotate(
@@ -1571,11 +1566,18 @@ def update_compound_cached_properties(compounds_queryset=None):
             )
             .values("_best_activity")[:1]
         ),
+    )
+    compounds_queryset.update(
+        pubs=Subquery(
+            compounds_queryset.filter(id=OuterRef("id"))
+            .annotate(_pubs=Count("refcompoundbiblio", distinct=True))
+            .values("_pubs")[:1]
+        ),
         le=Subquery(
             compounds_queryset.filter(id=OuterRef("id"))
             .annotate(
                 _le=Cast(
-                    1.37 * Max("compoundactivityresult__activity") / F("nb_atom_non_h"),
+                    1.37 * F("best_activity") / F("nb_atom_non_h"),
                     FloatField(),
                 )
             )
@@ -1585,7 +1587,7 @@ def update_compound_cached_properties(compounds_queryset=None):
             compounds_queryset.filter(id=OuterRef("id"))
             .annotate(
                 _lle=Cast(
-                    Max("compoundactivityresult__activity") - F("a_log_p"), FloatField()
+                    F("best_activity") - F("a_log_p"), FloatField()
                 )
             )
             .values("_lle")[:1]