diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java
index 6c2f32172..5b918af2c 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java
@@ -118,8 +118,11 @@ public class MakeChanges<TYPE extends RemoteModel> extends ServerToClientMessage
     }
 
     private Criterion getMatchCriterion(TYPE model) {
-        if (NameMaps.TABLE_ID_TASK_LIST_METADATA.equals(table) && model.getSetValues().containsKey(TaskListMetadata.FILTER.name)) {
-            return TaskListMetadata.FILTER.eq(model.getSetValues().getAsString(TaskListMetadata.FILTER.name));
+        if (NameMaps.TABLE_ID_TASK_LIST_METADATA.equals(table)) {
+            if (model.getSetValues().containsKey(TaskListMetadata.FILTER.name))
+                return TaskListMetadata.FILTER.eq(model.getSetValues().getAsString(TaskListMetadata.FILTER.name));
+            else if (model.getSetValues().containsKey(TaskListMetadata.TAG_UUID.name))
+                return TaskListMetadata.TAG_UUID.eq(model.getSetValues().getAsString(TaskListMetadata.TAG_UUID.name));
         }
         return null;
     }
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
index 4cfbb837a..f9df46355 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
@@ -540,8 +540,14 @@ public final class TagService {
     }
 
     public int rename(String uuid, String newName) {
+        return rename(uuid, newName, false);
+    }
+
+    public int rename(String uuid, String newName, boolean suppressSync) {
         TagData template = new TagData();
         template.setValue(TagData.NAME, newName);
+        if (suppressSync)
+            template.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
         tagDataDao.update(TagData.UUID.eq(uuid), template);
 
         Metadata metadataTemplate = new Metadata();
diff --git a/astrid/src/com/todoroo/astrid/service/TagDataService.java b/astrid/src/com/todoroo/astrid/service/TagDataService.java
index e8aef80bc..8dab16665 100644
--- a/astrid/src/com/todoroo/astrid/service/TagDataService.java
+++ b/astrid/src/com/todoroo/astrid/service/TagDataService.java
@@ -197,7 +197,7 @@ public class TagDataService {
             if (!cursor.isAfterLast()) {
                 tagData.readFromCursor(cursor);
                 if(!tagData.getValue(TagData.NAME).equals(featObject.getString("name")))
-                    TagService.getInstance().rename(tagData.getUuid(), featObject.getString("name"));
+                    TagService.getInstance().rename(tagData.getUuid(), featObject.getString("name"), true);
                 cursor.moveToNext();
             }
             ActFmSyncService.JsonHelper.featuredListFromJson(featObject, tagData);