diff --git a/README.md b/README.md
index db5b0eaa6..cce7e4e7d 100644
--- a/README.md
+++ b/README.md
@@ -60,6 +60,8 @@ How to debug/test on a USB device: (JoshuaGross Jan 14, 2011)
 
 4. When running unit tests: make sure to *close all JUnit windows* before running tests. JUnit/Eclipse/Android work together in a very, very janky way. You may get incorrect results if you do not close the window out before running tests. You have been warned.
 
+5. Make sure to commit changes both to the "astrid" project and the "astridApi" project while developing.
+
 Contributors workflow
 ---------------
 
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index e2741a4c9..732ef6b31 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -209,6 +209,9 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
         if(database == null)
             return;
 
+        // TODO: document debug code
+        //AndroidUtilities.copyDatabases(this, "/sdcard/dump"); // adb pull /sdcard/dump/database database
+
         database.openForWriting();
         setUpUiComponents();
         onNewIntent(getIntent());
diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
index 53ddffa0b..58849d39c 100644
--- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
@@ -7,13 +7,16 @@ import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 
 import com.timsu.astrid.R;
+import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
+import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.activity.TaskListActivity;
 import com.todoroo.astrid.core.SortHelper;
 import com.todoroo.astrid.dao.Database;
+import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.utility.AstridPreferences;
 
 
@@ -34,6 +37,8 @@ public final class UpgradeService {
     @Autowired
     private Database database;
 
+    @Autowired private TaskService taskService;
+
     public UpgradeService() {
         DependencyInjectionService.getInstance().inject(this);
     }
@@ -211,6 +216,21 @@ public final class UpgradeService {
 
     // --- upgrade functions
 
+    /**
+     * Fixes task filter missing tasks bug
+     */
+    private void upgrade3To3_7(final Context context) {
+        TodorooCursor<Task> t = taskService.query(Query.select(Task.ID, Task.DUE_DATE).where(Task.DUE_DATE.gt(0)));
+        Task task = new Task();
+        for(t.moveToFirst(); !t.isAfterLast(); t.moveToNext()) {
+            task.readFromCursor(t);
+            if(task.hasDueDate()) {
+                task.setValue(Task.DUE_DATE, task.getValue(Task.DUE_DATE) / 1000L * 1000L);
+                taskService.save(task);
+            }
+        }
+    }
+
     /**
      * Moves sorting prefs to public pref store
      * @param context