diff --git a/src/main/scala/service/IssuesService.scala b/src/main/scala/service/IssuesService.scala
index 8740d9e..cf7ac00 100644
--- a/src/main/scala/service/IssuesService.scala
+++ b/src/main/scala/service/IssuesService.scala
@@ -139,11 +139,16 @@
         .map { case (owner, repository) => t1.byRepository(owner, repository) }
         .foldLeft[Column[Boolean]](false) ( _ || _ ) &&
       (t1.closed           === (condition.state == "closed").bind) &&
-      (t1.milestoneId      === condition.milestoneId.get.get.bind, condition.milestoneId.flatten.isDefined) &&
-      (t1.milestoneId.?    isEmpty, condition.milestoneId == Some(None)) &&
+      //(t1.milestoneId      === condition.milestoneId.get.get.bind, condition.milestoneId.flatten.isDefined) &&
+      (t1.milestoneId.?    isEmpty, condition.milestone == Some(None)) &&
       (t1.assignedUserName === condition.assigned.get.bind, condition.assigned.isDefined) &&
       (t1.openedUserName   === condition.author.get.bind, condition.author.isDefined) &&
       (t1.pullRequest      === pullRequest.bind) &&
+      // Milestone filter
+      (Milestones filter { t2 =>
+        (t2.byPrimaryKey(t1.userName, t1.repositoryName, t1.milestoneId)) &&
+        (t2.title === condition.milestone.get.get.bind)
+      } exists, condition.milestone.flatten.isDefined) &&
       // Label filter
       (IssueLabels filter { t2 =>
         (t2.byIssue(t1.userName, t1.repositoryName, t1.issueId)) &&
@@ -322,7 +327,7 @@
 
   case class IssueSearchCondition(
       labels: Set[String] = Set.empty,
-      milestoneId: Option[Option[Int]] = None,
+      milestone: Option[Option[String]] = None,
       author: Option[String] = None,
       assigned: Option[String] = None,
       mentioned: Option[String] = None,
@@ -333,7 +338,7 @@
       groups: Set[String] = Set.empty){
 
     def isEmpty: Boolean = {
-      labels.isEmpty && milestoneId.isEmpty && author.isEmpty && assigned.isEmpty &&
+      labels.isEmpty && milestone.isEmpty && author.isEmpty && assigned.isEmpty &&
         state == "open" && sort == "created" && direction == "desc" && visibility.isEmpty
     }
 
@@ -348,8 +353,8 @@
       ).flatten ++
       labels.map(label => s"label:${label}") ++
       List(
-        milestoneId.map { _ match {
-          case Some(x) => s"milestone:${milestoneId}"
+        milestone.map { _ match {
+          case Some(x) => s"milestone:${x}"
           case None    => "no:milestone"
         }},
         (sort, direction) match {
@@ -368,8 +373,8 @@
     def toURL: String =
       "?" + List(
         if(labels.isEmpty) None else Some("labels=" + urlEncode(labels.mkString(","))),
-        milestoneId.map { _ match {
-          case Some(x) => "milestone=" + x
+        milestone.map { _ match {
+          case Some(x) => "milestone=" + urlEncode(x)
           case None    => "milestone=none"
         }},
         author   .map(x => "author="    + urlEncode(x)),
@@ -416,7 +421,7 @@
         conditions.get("milestone").flatMap(_.headOption) match {
           case None         => None
           case Some("none") => Some(None)
-          case Some(x)      => milestones.get(x).map(x => Some(x))
+          case Some(x)      => Some(Some(x)) //milestones.get(x).map(x => Some(x))
         },
         conditions.get("author").flatMap(_.headOption),
         conditions.get("assignee").flatMap(_.headOption),
@@ -437,7 +442,7 @@
         param(request, "labels").map(_.split(",").toSet).getOrElse(Set.empty),
         param(request, "milestone").map {
           case "none" => None
-          case x      => x.toIntOpt
+          case x      => Some(x)
         },
         param(request, "author"),
         param(request, "assigned"),
diff --git a/src/main/twirl/dashboard/issueslist.scala.html b/src/main/twirl/dashboard/issueslist.scala.html
index 42b5f95..f2afaa0 100644
--- a/src/main/twirl/dashboard/issueslist.scala.html
+++ b/src/main/twirl/dashboard/issueslist.scala.html
@@ -48,7 +48,7 @@
       <div class="small muted" style="margin-left: 20px; margin-top: 5px;">
         #@issue.issueId opened by @user(issue.openedUserName, styleClass="username") @datetime(issue.registeredDate)
         @milestone.map { milestone =>
-          <span style="margin: 20px;"><a href="@condition.copy(milestoneId = Some(Some(1))).toURL" class="username"><img src="@assets/common/images/milestone.png"> @milestone</a></span>
+          <span style="margin: 20px;"><a href="@condition.copy(milestone = Some(Some(milestone))).toURL" class="username"><img src="@assets/common/images/milestone.png"> @milestone</a></span>
         }
       </div>
     </td>
diff --git a/src/main/twirl/issues/listparts.scala.html b/src/main/twirl/issues/listparts.scala.html
index 1ff944f..6c93789 100644
--- a/src/main/twirl/issues/listparts.scala.html
+++ b/src/main/twirl/issues/listparts.scala.html
@@ -60,14 +60,14 @@
         }
         @helper.html.dropdown("Milestone", flat = true) {
           <li>
-            <a href="@condition.copy(milestoneId = Some(None)).toURL">
-              @helper.html.checkicon(condition.milestoneId == Some(None)) Issues with no milestone
+            <a href="@condition.copy(milestone = Some(None)).toURL">
+              @helper.html.checkicon(condition.milestone == Some(None)) Issues with no milestone
             </a>
           </li>
           @milestones.filter(_.closedDate.isEmpty).map { milestone =>
             <li>
-              <a href="@condition.copy(milestoneId = Some(Some(milestone.milestoneId))).toURL">
-                @helper.html.checkicon(condition.milestoneId == Some(Some(milestone.milestoneId))) @milestone.title
+              <a href="@condition.copy(milestone = Some(Some(milestone.title))).toURL">
+                @helper.html.checkicon(condition.milestone == Some(Some(milestone.title))) @milestone.title
               </a>
             </li>
           }
@@ -156,8 +156,8 @@
         } else {
           No pull requests to show.
         }
-        @if(condition.labels.nonEmpty || condition.milestoneId.isDefined){
-          <a href="@condition.copy(labels = Set.empty, milestoneId = None).toURL">Clear active filters.</a>
+        @if(condition.labels.nonEmpty || condition.milestone.isDefined){
+          <a href="@condition.copy(labels = Set.empty, milestone = None).toURL">Clear active filters.</a>
         } else {
           @if(repository.isDefined){
             @if(target == "issues"){
@@ -205,7 +205,7 @@
         <div class="small muted" style="margin-left: 40px; margin-top: 5px;">
           #@issue.issueId opened  @helper.html.datetimeago(issue.registeredDate) by @user(issue.openedUserName, styleClass="username")
           @milestone.map { milestone =>
-            <span style="margin: 20px;"><a href="@condition.copy(milestoneId = Some(Some(1))).toURL" class="username"><img src="@assets/common/images/milestone.png"> @milestone</a></span>
+            <span style="margin: 20px;"><a href="@condition.copy(milestone = Some(Some(milestone))).toURL" class="username"><img src="@assets/common/images/milestone.png"> @milestone</a></span>
           }
         </div>
       </td>