diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/FetchHistory.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/FetchHistory.java
index cda80379d..0d1508f13 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/FetchHistory.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/FetchHistory.java
@@ -124,7 +124,9 @@ public class FetchHistory<TYPE extends RemoteModel> {
                                     taskObj.put(uuid);
                                     taskObj.put(taskTitle);
                                     history.setValue(History.TASK, taskObj.toString());
-                                } else if (NameMaps.TABLE_ID_TAGS.equals(table)) {
+                                }
+
+                                if (NameMaps.TABLE_ID_TAGS.equals(table)) {
                                     history.setValue(History.TAG_ID, uuid);
                                 }
 
diff --git a/astrid/src/com/todoroo/astrid/dao/Database.java b/astrid/src/com/todoroo/astrid/dao/Database.java
index fed975156..a9b2deef5 100644
--- a/astrid/src/com/todoroo/astrid/dao/Database.java
+++ b/astrid/src/com/todoroo/astrid/dao/Database.java
@@ -153,7 +153,7 @@ public class Database extends AbstractDatabase {
         append(')');
         database.execSQL(sql.toString());
         sql.setLength(0);
-
+        
         sql.append("CREATE INDEX IF NOT EXISTS hist_tag_id ON ").
         append(History.TABLE).append('(').
         append(History.TAG_ID.name).
diff --git a/astrid/src/com/todoroo/astrid/service/TagDataService.java b/astrid/src/com/todoroo/astrid/service/TagDataService.java
index 58bd139a7..414abf52e 100644
--- a/astrid/src/com/todoroo/astrid/service/TagDataService.java
+++ b/astrid/src/com/todoroo/astrid/service/TagDataService.java
@@ -23,6 +23,7 @@ import com.todoroo.andlib.sql.Order;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.astrid.actfm.sync.ActFmSyncService;
+import com.todoroo.astrid.actfm.sync.messages.NameMaps;
 import com.todoroo.astrid.adapter.UpdateAdapter;
 import com.todoroo.astrid.api.PermaSql;
 import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria;