diff --git a/src/main/scala/gitbucket/core/service/IssuesService.scala b/src/main/scala/gitbucket/core/service/IssuesService.scala
index ab1fffa..86103d2 100644
--- a/src/main/scala/gitbucket/core/service/IssuesService.scala
+++ b/src/main/scala/gitbucket/core/service/IssuesService.scala
@@ -351,11 +351,11 @@
     implicit s: Session
   ) =
     Issues filter { t1 =>
-      if (repos.size == 1) {
-        ((t1.userName === repos.head._1) && (t1.repositoryName === repos.head._2))
-      } else {
-        ((t1.userName ++ "/" ++ t1.repositoryName) inSetBind (repos.map { case (owner, repo) => s"$owner/$repo" }))
-      } &&
+      (if (repos.size == 1) {
+         t1.byRepository(repos.head._1, repos.head._2)
+       } else {
+         ((t1.userName ++ "/" ++ t1.repositoryName) inSetBind (repos.map { case (owner, repo) => s"$owner/$repo" }))
+       }) &&
       (t1.closed === (condition.state == "closed").bind) &&
       (t1.milestoneId.? isEmpty, condition.milestone == Some(None)) &&
       (t1.priorityId.? isEmpty, condition.priority == Some(None)) &&