Dont move completed to end of manual ordered list

src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java

@@ -78,9 +78,8 @@ public class SubtasksHelper {
             }
 
             query = query.replaceAll("ORDER BY .*", "");
-            query = query + String.format(" ORDER BY %s, %s, %s, %s",
+            query = query + String.format(" ORDER BY %s, %s, %s",
-                    Task.DELETION_DATE, Task.COMPLETION_DATE,
+                    Task.DELETION_DATE, getOrderString(tagData, tlm), Task.CREATION_DATE);
-                    getOrderString(tagData, tlm), Task.CREATION_DATE);
             if (limit > 0) {
                 query = query + " LIMIT " + limit;
             }

src/main/java/com/todoroo/astrid/subtasks/SubtasksUpdater.java

@@ -31,9 +31,8 @@ public abstract class SubtasksUpdater<T> extends AstridOrderedListUpdater<T> {
         String query = filter.getSqlQuery();
 
         query = query.replaceAll("ORDER BY .*", "");
-        query = query + String.format(" ORDER BY %s, %s, %s, %s",
+        query = query + String.format(" ORDER BY %s, %s, %s",
-                Task.DELETION_DATE, Task.COMPLETION_DATE,
+                Task.DELETION_DATE, getOrderString(), Task.CREATION_DATE);
-                getOrderString(), Task.CREATION_DATE);
         query = query.replace(TaskCriteria.isVisible().toString(),
                 Criterion.all.toString());