diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
index 2ccb2c0dd..566c344b7 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
@@ -683,8 +683,11 @@ public class TagViewActivity extends TaskListActivity implements OnTabChangeList
                 picture.setImageBitmap(bitmap);
                 uploadTagPicture(bitmap);
             }
-        } else if(requestCode == REQUEST_ACTFM_LOGIN && resultCode == Activity.RESULT_OK)
+        } else if(requestCode == REQUEST_ACTFM_LOGIN && resultCode == Activity.RESULT_OK) {
             saveSettings();
+        } else {
+            super.onActivityResult(requestCode, resultCode, data);
+        }
     }
 
     private void uploadTagPicture(final Bitmap bitmap) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksLegacyMigrator.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksLegacyMigrator.java
index d3586d855..3eced32f1 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksLegacyMigrator.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksLegacyMigrator.java
@@ -127,6 +127,7 @@ public class GtasksLegacyMigrator {
                         if (!foundMatch) {
                             System.err.println("Resetting metadata");
                             //For non-matches, make the task look newly created
+                            container.gtaskMetadata = GtasksMetadata.createEmptyMetadata(container.task.getId());
                             container.gtaskMetadata.setValue(GtasksMetadata.ID, ""); //$NON-NLS-1$
                             if (originalListId != null) {
                                 // set the list-id based on the original listname, saved above during for-loop
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
index 2144c49b6..c5ab2ab8c 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
@@ -167,7 +167,7 @@ public final class TagService {
      */
     public TodorooCursor<Metadata> getTags(long taskId) {
         Query query = Query.select(TAG, REMOTE_ID).where(Criterion.and(MetadataCriteria.withKey(KEY),
-                MetadataCriteria.byTask(taskId)));
+                MetadataCriteria.byTask(taskId))).orderBy(Order.asc(TAG));
         return metadataDao.query(query);
     }