diff --git a/app/build.gradle b/app/build.gradle
index 5a3d6c9ec..8e84ac91a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,7 +21,7 @@ android {
     defaultConfig {
         testApplicationId "org.tasks.test"
         applicationId "org.tasks"
-        versionCode 584
+        versionCode 585
         versionName "6.7"
         targetSdkVersion 28
         minSdkVersion 16
diff --git a/app/src/main/java/com/todoroo/astrid/service/Upgrader.java b/app/src/main/java/com/todoroo/astrid/service/Upgrader.java
index bfdad91eb..ae0ff879e 100644
--- a/app/src/main/java/com/todoroo/astrid/service/Upgrader.java
+++ b/app/src/main/java/com/todoroo/astrid/service/Upgrader.java
@@ -40,7 +40,7 @@ public class Upgrader {
   private static final int V6_0_beta_1 = 522;
   private static final int V6_0_beta_2 = 523;
   private static final int V6_4 = 546;
-  private static final int V6_7 = 584;
+  private static final int V6_7 = 585;
   private final Preferences preferences;
   private final Tracker tracker;
   private final TagDataDao tagDataDao;
@@ -204,8 +204,10 @@ public class Upgrader {
 
   private String migrateGoogleTaskFilters(String input) {
     return input
-        .replace("list_id", "gt_list_id")
-        .replace("SELECT task FROM google_tasks", "SELECT gt_task as task FROM google_tasks");
+        .replace("SELECT task FROM google_tasks", "SELECT gt_task as task FROM google_tasks")
+        .replace("(list_id", "(gt_list_id")
+        .replace("google_tasks.list_id", "google_tasks.gt_list_id")
+        .replace("google_tasks.task", "google_tasks.gt_task");
   }
 
   private String migrateMetadata(String input) {