diff --git a/src/applications/maniphest/controller/report/ManiphestReportController.php b/src/applications/maniphest/controller/report/ManiphestReportController.php
index 4b67a19386..683253ca0f 100644
--- a/src/applications/maniphest/controller/report/ManiphestReportController.php
+++ b/src/applications/maniphest/controller/report/ManiphestReportController.php
@@ -753,7 +753,7 @@ final class ManiphestReportController extends ManiphestController {
     }
 
     if ($oldest === null) {
-      return '-';
+      return array('-', 0);
     }
 
     $oldest = $tasks[$oldest];
diff --git a/src/applications/maniphest/controller/tasklist/ManiphestTaskListController.php b/src/applications/maniphest/controller/tasklist/ManiphestTaskListController.php
index 1cd0ccd3a3..507ff0377c 100644
--- a/src/applications/maniphest/controller/tasklist/ManiphestTaskListController.php
+++ b/src/applications/maniphest/controller/tasklist/ManiphestTaskListController.php
@@ -452,14 +452,14 @@ final class ManiphestTaskListController extends ManiphestController {
             $out['Unassigned'] = $tasks;
           }
         }
-        if (isset($out['Unassigned'])) {
-          // If any tasks are unassigned, move them to the front of the list.
-          $data = array('Unassigned' => $out['Unassigned']) + $out;
-        } else {
-          $data = $out;
-        }
 
+        $data = $out;
         ksort($data);
+
+        // Move "Unassigned" to the top of the list.
+        if (isset($data['Unassigned'])) {
+          $data = array('Unassigned' => $out['Unassigned']) + $out;
+        }
         break;
       case 'project':
         $grouped = array();
@@ -480,6 +480,14 @@ final class ManiphestTaskListController extends ManiphestController {
           }
         }
         $data = $grouped;
+        ksort($data);
+
+        // Move "No Project" to the end of the list.
+        if (isset($data['No Project'])) {
+          $noproject = $data['No Project'];
+          unset($data['No Project']);
+          $data += array('No Project' => $noproject);
+        }
         break;
       default:
         $data = array(