diff --git a/webapp/src/Controller/Team/MiscController.php b/webapp/src/Controller/Team/MiscController.php
index 00b2b1e0b1..4c79f9df16 100644
--- a/webapp/src/Controller/Team/MiscController.php
+++ b/webapp/src/Controller/Team/MiscController.php
@@ -99,12 +99,10 @@ public function homeAction(Request $request): Response
             $clarifications = $this->em->createQueryBuilder()
                 ->from(Clarification::class, 'c')
                 ->leftJoin('c.problem', 'p')
-                ->leftJoin('p.contest_problems', 'cp')
                 ->leftJoin('c.sender', 's')
                 ->leftJoin('c.recipient', 'r')
-                ->select('c', 'cp', 'p')
+                ->select('c', 'p')
                 ->andWhere('c.contest = :contest')
-                ->andWhere('cp.contest = :contest')
                 ->andWhere('c.sender IS NULL')
                 ->andWhere('c.recipient = :team OR c.recipient IS NULL')
                 ->setParameter('contest', $contest)
@@ -118,12 +116,10 @@ public function homeAction(Request $request): Response
             $clarificationRequests = $this->em->createQueryBuilder()
                 ->from(Clarification::class, 'c')
                 ->leftJoin('c.problem', 'p')
-                ->leftJoin('p.contest_problems', 'cp')
                 ->leftJoin('c.sender', 's')
                 ->leftJoin('c.recipient', 'r')
-                ->select('c', 'cp', 'p')
+                ->select('c', 'p')
                 ->andWhere('c.contest = :contest')
-                ->andWhere('cp.contest = :contest')
                 ->andWhere('c.sender = :team')
                 ->setParameter('contest', $contest)
                 ->setParameter('team', $team)
diff --git a/webapp/src/Entity/Clarification.php b/webapp/src/Entity/Clarification.php
index d30e261751..e848bde630 100644
--- a/webapp/src/Entity/Clarification.php
+++ b/webapp/src/Entity/Clarification.php
@@ -239,6 +239,14 @@ public function getProblem(): ?Problem
         return $this->problem;
     }
 
+    public function getContestProblem(): ?ContestProblem
+    {
+        if (!$this->problem) {
+            return null;
+        }
+        return $this->contest->getContestProblem($this->problem);
+    }
+
     public function getProblemId(): ?int
     {
         return $this->getProblem()?->getProbid();
diff --git a/webapp/src/Entity/Contest.php b/webapp/src/Entity/Contest.php
index cfe97b382a..936c005629 100644
--- a/webapp/src/Entity/Contest.php
+++ b/webapp/src/Entity/Contest.php
@@ -915,6 +915,16 @@ public function getProblems(): Collection
         return $this->problems;
     }
 
+    public function getContestProblem(Problem $problem): ?ContestProblem
+    {
+        foreach ($this->getProblems() as $contestProblem) {
+            if ($contestProblem->getProblem() === $problem) {
+                return $contestProblem;
+            }
+        }
+        return null;
+    }
+
     public function addClarification(Clarification $clarification): Contest
     {
         $this->clarifications[] = $clarification;
diff --git a/webapp/src/Twig/TwigExtension.php b/webapp/src/Twig/TwigExtension.php
index 565d03074d..c81026a0ad 100644
--- a/webapp/src/Twig/TwigExtension.php
+++ b/webapp/src/Twig/TwigExtension.php
@@ -109,7 +109,7 @@ public function getFilters(): array
             new TwigFilter('tsvField', $this->toTsvField(...)),
             new TwigFilter('fileTypeIcon', $this->fileTypeIcon(...)),
             new TwigFilter('problemBadge', $this->problemBadge(...), ['is_safe' => ['html']]),
-            new TwigFilter('problemBadgeForProblemAndContest', $this->problemBadgeForProblemAndContest(...), ['is_safe' => ['html']]),
+            new TwigFilter('problemBadgeForContest', $this->problemBadgeForContest(...), ['is_safe' => ['html']]),
             new TwigFilter('printMetadata', $this->printMetadata(...), ['is_safe' => ['html']]),
             new TwigFilter('printWarningContent', $this->printWarningContent(...), ['is_safe' => ['html']]),
             new TwigFilter('entityIdBadge', $this->entityIdBadge(...), ['is_safe' => ['html']]),
@@ -1084,14 +1084,11 @@ public function problemBadge(ContestProblem $problem): string
         );
     }
 
-    public function problemBadgeForProblemAndContest(Problem $problem, ?Contest $contest): string
+    public function problemBadgeForContest(Problem $problem, ?Contest $contest = null): string
     {
-        foreach ($problem->getContestProblems() as $contestProblem) {
-            if ($contestProblem->getContest() === $contest) {
-                return $this->problemBadge($contestProblem);
-            }
-        }
-        return '';
+        $contest ??= $this->dj->getCurrentContest();
+        $contestProblem = $contest?->getContestProblem($problem);
+        return $contestProblem === null ? '' : $this->problemBadge($contestProblem);
     }
 
     public function printMetadata(?string $metadata): string
diff --git a/webapp/templates/jury/executable.html.twig b/webapp/templates/jury/executable.html.twig
index 95cbe3956e..0cf94b261c 100644
--- a/webapp/templates/jury/executable.html.twig
+++ b/webapp/templates/jury/executable.html.twig
@@ -48,14 +48,14 @@
                         {% if executable.type == 'compare' %}
                             {% for problem in executable.problemsCompare %}
                                 <a href="{{ path('jury_problem', {'probId': problem.probid}) }}">
-                                    p{{ problem.probid }} {{ problem | problemBadgeForProblemAndContest(current_contest) }}
+                                    p{{ problem.probid }} {{ problem | problemBadgeForContest }}
                                 </a>
                                 {% set used = true %}
                             {% endfor %}
                         {% elseif executable.type == 'run' %}
                             {% for problem in executable.problemsRun %}
                                 <a href="{{ path('jury_problem', {'probId': problem.probid}) }}">
-                                    p{{ problem.probid }} {{ problem | problemBadgeForProblemAndContest(current_contest) }}
+                                    p{{ problem.probid }} {{ problem | problemBadgeForContest }}
                                 </a>
                                 {% set used = true %}
                             {% endfor %}
diff --git a/webapp/templates/jury/partials/clarification_list.html.twig b/webapp/templates/jury/partials/clarification_list.html.twig
index d849ac0f0f..33ffcbcf3e 100644
--- a/webapp/templates/jury/partials/clarification_list.html.twig
+++ b/webapp/templates/jury/partials/clarification_list.html.twig
@@ -71,7 +71,7 @@
 
             <td><a href="{{ link }}">
                     {%- if clarification.problem -%}
-                        problem {{ clarification.problem.contestProblems.first | problemBadge -}}
+                        problem {{ clarification.contestProblem | problemBadge -}}
                     {%- elseif clarification.category -%}
                         {{- categories[clarification.category]|default('general') -}}
                     {%- else -%}
diff --git a/webapp/templates/team/partials/clarification.html.twig b/webapp/templates/team/partials/clarification.html.twig
index eda98ce293..5004e4c0d4 100644
--- a/webapp/templates/team/partials/clarification.html.twig
+++ b/webapp/templates/team/partials/clarification.html.twig
@@ -4,7 +4,7 @@
             <div class="col-sm">
                 Subject:
                 {% if clarification.problem %}
-                    Problem {{ clarification.problem.contestProblems.first.shortname }}: {{ clarification.problem.name }}
+                    Problem {{ clarification.contestProblem.shortname }}: {{ clarification.problem.name }}
                 {% elseif clarification.category %}
                     {{ categories[clarification.category]|default('general') }}
                 {% else %}
diff --git a/webapp/templates/team/partials/clarification_list.html.twig b/webapp/templates/team/partials/clarification_list.html.twig
index a36c1e0f30..47b154c542 100644
--- a/webapp/templates/team/partials/clarification_list.html.twig
+++ b/webapp/templates/team/partials/clarification_list.html.twig
@@ -44,7 +44,7 @@
                 <td>
                     <a data-ajax-modal data-ajax-modal-after="markSeen" href="{{ link }}">
                         {%- if clarification.problem -%}
-                            problem {{ clarification.problem.contestProblems.first | problemBadge -}}
+                            problem {{ clarification.contestProblem | problemBadge -}}
                         {%- elseif clarification.category -%}
                             {{- categories[clarification.category]|default('general') -}}
                         {%- else -%}