diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksDecorationExposer.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksDecorationExposer.java
index a210efc9d..587fe1f5b 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksDecorationExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksDecorationExposer.java
@@ -35,7 +35,7 @@ public class GtasksDecorationExposer implements TaskDecorationExposer {
         if(!gtasksPreferenceService.isLoggedIn())
             return null;
 
-        if(Flags.checkAndClear(Flags.GTASKS))
+        if(Flags.check(Flags.GTASKS))
             return null;
 
         return createDecoration(task);
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadata.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadata.java
index 97859a53a..e34253939 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadata.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadata.java
@@ -45,7 +45,12 @@ public class GtasksMetadata {
         Metadata metadata = new Metadata();
         metadata.setValue(Metadata.KEY, GtasksMetadata.METADATA_KEY);
         metadata.setValue(ID, ""); //$NON-NLS-1$
-        metadata.setValue(LIST_ID, Preferences.getStringValue(GtasksPreferenceService.PREF_DEFAULT_LIST));
+
+        String defaultList = Preferences.getStringValue(GtasksPreferenceService.PREF_DEFAULT_LIST);
+        if(defaultList == null)
+            throw new NullPointerException("No default list has been set."); //$NON-NLS-1$
+
+        metadata.setValue(LIST_ID, defaultList);
         metadata.setValue(PARENT_TASK, (long)VALUE_UNSET);
         metadata.setValue(INDENT, 0);
         metadata.setValue(ORDER, VALUE_UNSET);
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadataService.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadataService.java
index 8652761dc..2edd7d0f9 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadataService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadataService.java
@@ -57,4 +57,9 @@ public final class GtasksMetadataService extends SyncMetadataService<GtasksTaskC
         return gtasksPreferenceService;
     }
 
+    @Override
+    public Criterion getMetadataWithRemoteId() {
+        return GtasksMetadata.ID.neq(""); //$NON-NLS-1$
+    }
+
 }
diff --git a/astrid/rmilk-src/org/weloveastrid/rmilk/data/MilkMetadataService.java b/astrid/rmilk-src/org/weloveastrid/rmilk/data/MilkMetadataService.java
index fba0fc4ff..ae61eca73 100644
--- a/astrid/rmilk-src/org/weloveastrid/rmilk/data/MilkMetadataService.java
+++ b/astrid/rmilk-src/org/weloveastrid/rmilk/data/MilkMetadataService.java
@@ -14,8 +14,8 @@ import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.sql.Criterion;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.astrid.data.Metadata;
-import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.data.MetadataApiDao.MetadataCriteria;
+import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.sync.SyncMetadataService;
 import com.todoroo.astrid.sync.SyncProviderUtilities;
 
@@ -67,4 +67,9 @@ public final class MilkMetadataService extends SyncMetadataService<MilkTaskConta
         return cursor;
     }
 
+    @Override
+    public Criterion getMetadataWithRemoteId() {
+        return MilkTaskFields.TASK_ID.neq(""); //$NON-NLS-1$
+    }
+
 }
diff --git a/astrid/src/com/todoroo/astrid/utility/Constants.java b/astrid/src/com/todoroo/astrid/utility/Constants.java
index 810e38189..7f5e820a9 100644
--- a/astrid/src/com/todoroo/astrid/utility/Constants.java
+++ b/astrid/src/com/todoroo/astrid/utility/Constants.java
@@ -30,7 +30,7 @@ public final class Constants {
     /**
      * Whether to turn on debugging logging and UI
      */
-    public static final boolean DEBUG = false;
+    public static final boolean DEBUG = true;
 
     /**
      * Upgrade time
diff --git a/astrid/src/com/todoroo/astrid/utility/Preferences.java b/astrid/src/com/todoroo/astrid/utility/Preferences.java
index f1a5e15a1..88a918ab7 100644
--- a/astrid/src/com/todoroo/astrid/utility/Preferences.java
+++ b/astrid/src/com/todoroo/astrid/utility/Preferences.java
@@ -88,6 +88,12 @@ public class Preferences {
         return PreferenceManager.getDefaultSharedPreferences(context);
     }
 
+    /** @return true if given preference is set */
+    public static boolean isSet(String key) {
+        Context context = ContextManager.getContext();
+        return getPrefs(context).contains(key);
+    }
+
     // --- preference fetching (string)
 
     /** Gets an string value from a string preference. Returns null
@@ -276,6 +282,4 @@ public class Preferences {
         editor.commit();
     }
 
-
-
 }
diff --git a/tests/src/com/todoroo/astrid/gtasks/GtasksDecorationExposerTest.java b/tests/src/com/todoroo/astrid/gtasks/GtasksDecorationExposerTest.java
index 77d6b6e8b..71aa5071f 100644
--- a/tests/src/com/todoroo/astrid/gtasks/GtasksDecorationExposerTest.java
+++ b/tests/src/com/todoroo/astrid/gtasks/GtasksDecorationExposerTest.java
@@ -11,6 +11,8 @@ import com.todoroo.astrid.data.Metadata;
 import com.todoroo.astrid.data.StoreObject;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.test.DatabaseTestCase;
+import com.todoroo.astrid.utility.Flags;
+import com.todoroo.astrid.utility.Preferences;
 
 public class GtasksDecorationExposerTest extends DatabaseTestCase {
 
@@ -93,6 +95,7 @@ public class GtasksDecorationExposerTest extends DatabaseTestCase {
         StoreObject list = new StoreObject();
         list.setValue(GtasksList.REMOTE_ID, "1");
         list.setValue(GtasksList.NAME, "lamo");
+        Flags.set(Flags.GTASKS);
         return GtasksFilterExposer.filterFromList(list);
     }
 
@@ -106,6 +109,7 @@ public class GtasksDecorationExposerTest extends DatabaseTestCase {
     }
 
     private Filter nonGtasksFilter() {
+        Flags.checkAndClear(Flags.GTASKS);
         return CoreFilterExposer.buildInboxFilter(getContext().getResources());
     }
 
@@ -127,4 +131,11 @@ public class GtasksDecorationExposerTest extends DatabaseTestCase {
         preferences.setLoggedIn(status);
     }
 
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        if(!Preferences.isSet(GtasksPreferenceService.PREF_DEFAULT_LIST))
+            Preferences.setString(GtasksPreferenceService.PREF_DEFAULT_LIST, "list");
+    }
+
 }
diff --git a/tests/src/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java b/tests/src/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java
index 6e3993b22..eaa36a39f 100644
--- a/tests/src/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java
+++ b/tests/src/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java
@@ -65,6 +65,7 @@ public class GtasksIndentActionTest extends DatabaseTestCase {
         PluginServices.getTaskService().save(task);
         Metadata metadata = GtasksMetadata.createEmptyMetadata(task.getId());
         metadata.setValue(GtasksMetadata.INDENT, indentation);
+        metadata.setValue(GtasksMetadata.LIST_ID, "list");
         metadata.setValue(Metadata.TASK, task.getId());
         PluginServices.getMetadataService().save(metadata);
         return task;
@@ -85,12 +86,10 @@ public class GtasksIndentActionTest extends DatabaseTestCase {
         action.onReceive(getContext(), intent);
     }
 
-
     private void givenTask(Task taskToTest) {
         task = taskToTest;
     }
 
-
     private Task taskWithoutMetadata() {
         Task task = new Task();
         PluginServices.getTaskService().save(task);
diff --git a/tests/src/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java b/tests/src/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java
index 62dddfb6b..bc82494be 100644
--- a/tests/src/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java
+++ b/tests/src/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java
@@ -1,5 +1,7 @@
 package com.todoroo.astrid.gtasks;
 
+import android.content.Context;
+
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.utility.DateUtilities;
@@ -7,6 +9,7 @@ import com.todoroo.astrid.core.PluginServices;
 import com.todoroo.astrid.data.Metadata;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.test.DatabaseTestCase;
+import com.todoroo.astrid.utility.Preferences;
 
 public class GtasksMetadataServiceTest extends DatabaseTestCase {
 
@@ -149,4 +152,11 @@ public class GtasksMetadataServiceTest extends DatabaseTestCase {
         testInjector.addInjectable("gtasksPreferenceService", preferences);
     }
 
+    @Override
+    public void setContext(Context context) {
+        super.setContext(context);
+        if(!Preferences.isSet(GtasksPreferenceService.PREF_DEFAULT_LIST))
+            Preferences.setString(GtasksPreferenceService.PREF_DEFAULT_LIST, "list");
+    }
+
 }