diff --git a/astrid/src/com/todoroo/astrid/dao/Database.java b/astrid/src/com/todoroo/astrid/dao/Database.java
index 744633033..1f242ef9d 100644
--- a/astrid/src/com/todoroo/astrid/dao/Database.java
+++ b/astrid/src/com/todoroo/astrid/dao/Database.java
@@ -137,7 +137,7 @@ public class Database extends AbstractDatabase {
         database.execSQL(sql.toString());
         sql.setLength(0);
 
-        sql.append("CREATE INDEX IF NOT EXISTS up_pid ON ").
+        sql.append("CREATE INDEX IF NOT EXISTS up_tgl ON ").
         append(Update.TABLE).append('(').
         append(Update.TAGS_LOCAL.name).
         append(')');
@@ -151,7 +151,7 @@ public class Database extends AbstractDatabase {
         database.execSQL(sql.toString());
         sql.setLength(0);
 
-        sql.append("CREATE UNIQUE INDEX IF NOT EXISTS t_rid ON ").
+        sql.append("CREATE UNIQUE INDEX IF NOT EXISTS tg_rid ON ").
         append(TagData.TABLE).append('(').
         append(TagData.REMOTE_ID.name).
         append(')');
@@ -301,6 +301,8 @@ public class Database extends AbstractDatabase {
                 database.execSQL(changeZeroes);
             }
 
+            onCreateTables();
+
         } catch (SQLiteException e) {
             Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
         }