diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksUpdater.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksUpdater.java
index c01960374..c901b4c68 100644
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksUpdater.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksUpdater.java
@@ -96,9 +96,9 @@ public class SubtasksUpdater extends OrderedListUpdater<String> {
         if(!query.contains(subtaskJoin)) {
             query = subtaskJoin + query;
             query = query.replaceAll("ORDER BY .*", "");
-            query = query + String.format(" ORDER BY %s, %s, CAST(%s AS LONG), %s",
+            query = query + String.format(" ORDER BY %s, %s, IFNULL(CAST(%s AS LONG), %s)",
                     Task.DELETION_DATE, Task.COMPLETION_DATE,
-                    SubtasksMetadata.ORDER, Task.ID);
+                    SubtasksMetadata.ORDER, Task.CREATION_DATE);
             query = query.replace(TaskCriteria.isVisible().toString(),
                     Criterion.all.toString());
 
diff --git a/astrid/src/com/todoroo/astrid/ui/DraggableListView.java b/astrid/src/com/todoroo/astrid/ui/DraggableListView.java
index 489804702..410403d06 100644
--- a/astrid/src/com/todoroo/astrid/ui/DraggableListView.java
+++ b/astrid/src/com/todoroo/astrid/ui/DraggableListView.java
@@ -386,7 +386,7 @@ public class DraggableListView extends ListView {
         mLowerBound = Math.max(y + touchSlop, mHeight * 2 / 3);
 
         Vibrator v = (Vibrator) getContext().getSystemService(Context.VIBRATOR_SERVICE);
-        v.vibrate(100);
+        v.vibrate(50);
 
         return true;
     }