diff --git a/src/main/scala/service/MilestonesService.scala b/src/main/scala/service/MilestonesService.scala
index 01160c3..1a702af 100644
--- a/src/main/scala/service/MilestonesService.scala
+++ b/src/main/scala/service/MilestonesService.scala
@@ -31,7 +31,7 @@
 
   def getMilestonesWithIssueCount(owner: String, repository: String): List[(Milestone, Int, Int)] = {
     val counts = Issues
-      .filter  { t => (t.byRepository(owner, repository)) && (t.milestoneId isNotNull) }
+      .filter  { t => t.byRepository(owner, repository) && (t.milestoneId isNotNull) }
       .groupBy { t => t.milestoneId ~ t.closed }
       .map     { case (t1, t2) => (t1._1 ~ t1._2) -> t2.length }
       .toMap
@@ -42,5 +42,5 @@
   }
 
   def getMilestones(owner: String, repository: String): List[Milestone] =
-    Query(Milestones).filter(_.byRepository(owner, repository)).sortBy(_.milestoneId asc).list
+    Query(Milestones).filter(_.byRepository(owner, repository)).sortBy(_.dueDate.asc).sortBy(_.closedDate.desc).list
 }