diff --git a/common/locales/en/tasks.json b/common/locales/en/tasks.json
index 0e683a91a4..8ee8d1cd50 100644
--- a/common/locales/en/tasks.json
+++ b/common/locales/en/tasks.json
@@ -44,6 +44,7 @@
     "remaining": "Active",
     "complete": "Done",
     "dated": "Dated",
+    "datedNotSorted": "Dated To-Dos are NOT sorted by date. Sorting will probably be implemented in future.",
     "due": "Due",
     "grey": "Grey",
     "score": "Score",
diff --git a/website/public/js/controllers/tasksCtrl.js b/website/public/js/controllers/tasksCtrl.js
index c070727f8f..b8a99ead34 100644
--- a/website/public/js/controllers/tasksCtrl.js
+++ b/website/public/js/controllers/tasksCtrl.js
@@ -84,9 +84,9 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N
       }
     };
 
-    $scope.removeTask = function(task) {
+    $scope.removeTask = function(list, $index) {
       if (!confirm(window.env.t('sureDelete'))) return;
-      User.user.ops.deleteTask({params:{id:task.id}})
+      User.user.ops.deleteTask({params:{id:list[$index].id}})
     };
 
     $scope.saveTask = function(task, stayOpen, isSaveAndClose) {
diff --git a/website/views/shared/tasks/lists.jade b/website/views/shared/tasks/lists.jade
index b4487d690e..b1cf70c740 100644
--- a/website/views/shared/tasks/lists.jade
+++ b/website/views/shared/tasks/lists.jade
@@ -66,7 +66,7 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
               ul.task-filter
                 li(ng-class='{active: list.view == "remaining"}')
                   a(ng-click='list.view = "remaining"')=env.t('remaining')
-                li(ng-class='{active: list.view == "dated"}')
+                li(ng-class='{active: list.view == "dated"}', tooltip=env.t('datedNotSorted'))
                   a(ng-click='list.view = "dated"')=env.t('dated')
                 li(ng-class='{active: list.view == "complete"}')
                   a(ng-click='list.view = "complete"')=env.t('complete')
diff --git a/website/views/shared/tasks/task.jade b/website/views/shared/tasks/task.jade
index 9d0c032bef..13e810e092 100644
--- a/website/views/shared/tasks/task.jade
+++ b/website/views/shared/tasks/task.jade
@@ -1,4 +1,4 @@
-li(bindonce='list', id='task-{{::task.id}}', ng-repeat='task in obj[list.type+"s"] | orderBy:(list.view == "dated" ? "date" : null)', class='task {{Shared.taskClasses(task, user.filters, user.preferences.dayStart, user.lastCron, list.showCompleted, main)}}', ng-click='spell && (list.type != "reward") && castEnd(task, "task", $event)', ng-class='{"cast-target":spell && (list.type != "reward"), "locked-task":obj._locked === true}', popover-trigger='mouseenter', data-popover-html="{{task.notes | markdown}}", popover-placement="top", popover-append-to-body='{{::modal ? "false":"true"}}', ng-show='shouldShow(task, list, user.preferences)')
+li(bindonce='list', id='task-{{::task.id}}', ng-repeat='task in obj[list.type+"s"]', class='task {{Shared.taskClasses(task, user.filters, user.preferences.dayStart, user.lastCron, list.showCompleted, main)}}', ng-click='spell && (list.type != "reward") && castEnd(task, "task", $event)', ng-class='{"cast-target":spell && (list.type != "reward"), "locked-task":obj._locked === true}', popover-trigger='mouseenter', data-popover-html="{{task.notes | markdown}}", popover-placement="top", popover-append-to-body='{{::modal ? "false":"true"}}', ng-show='shouldShow(task, list, user.preferences)')
   // right-hand side control buttons
   .task-meta-controls
 
@@ -44,7 +44,7 @@ li(bindonce='list', id='task-{{::task.id}}', ng-repeat='task in obj[list.type+"s
           span.glyphicon.glyphicon-bullhorn(tooltip=env.t('challenge'))
           |  
       // delete
-      a(ng-if='!task.challenge.id', ng-click='removeTask(task)', tooltip=env.t('delete'))
+      a(ng-if='!task.challenge.id', ng-click='removeTask(obj[list.type+"s"], $index)', tooltip=env.t('delete'))
         span.glyphicon.glyphicon-trash
         |  
 
@@ -101,7 +101,7 @@ li(bindonce='list', id='task-{{::task.id}}', ng-repeat='task in obj[list.type+"s
           p
             a(ng-click='unlink(task, "keep")')=env.t('keepIt')
             |   
-            a(ng-click="removeTask(task)")=env.t('removeIt')
+            a(ng-click="removeTask(obj[list.type+'s'], $index)")=env.t('removeIt')
         div(ng-if='task.challenge.broken=="CHALLENGE_DELETED"')
           p
             |