Optimize a query

judge/views/organization.py

@@ -477,7 +477,7 @@ class OrganizationSubmissions(
         return (
             super()
             ._get_entire_queryset()
-            .filter(user__organizations=self.organization, problem__in=problems)
+            .filter(user__in=self.organization.members.all(), problem__in=problems)
         )
 
     def get_context_data(self, **kwargs):

judge/views/submission.py

@@ -420,7 +420,8 @@ class SubmissionsListBase(DiggPaginatorMixin, TitleMixin, ListView):
                     self.request, self.request.organization
                 )
                 queryset = queryset.filter(
-                    user__organizations=self.request.organization, problem__in=problems
+                    user__in=self.request.organization.members.all(),
+                    problem__in=problems,
                 )
             join_sql_subquery(
                 queryset,