diff --git a/app/src/main/java/org/tasks/data/TaskDao.kt b/app/src/main/java/org/tasks/data/TaskDao.kt
index 317eee8f5..087e1d45d 100644
--- a/app/src/main/java/org/tasks/data/TaskDao.kt
+++ b/app/src/main/java/org/tasks/data/TaskDao.kt
@@ -101,10 +101,10 @@ abstract class TaskDao(private val database: Database) {
     abstract suspend fun clearCompletedCalendarEvents(): Int
 
     open suspend fun fetchTasks(callback: suspend (SubtaskInfo) -> List<String>): List<TaskContainer> {
-        return fetchTasks(callback, getSubtaskInfo())
+        return fetchTasks(getSubtaskInfo(), callback)
     }
 
-    open suspend fun fetchTasks(callback: suspend (SubtaskInfo) -> List<String>, subtasks: SubtaskInfo): List<TaskContainer> =
+    open suspend fun fetchTasks(subtasks: SubtaskInfo, callback: suspend (SubtaskInfo) -> List<String>): List<TaskContainer> =
             database.withTransaction {
                 val start = if (BuildConfig.DEBUG) now() else 0
                 val queries = callback(subtasks)
diff --git a/app/src/main/java/org/tasks/ui/TaskListViewModel.kt b/app/src/main/java/org/tasks/ui/TaskListViewModel.kt
index 3dd3be636..41f830fe9 100644
--- a/app/src/main/java/org/tasks/ui/TaskListViewModel.kt
+++ b/app/src/main/java/org/tasks/ui/TaskListViewModel.kt
@@ -1,6 +1,11 @@
 package org.tasks.ui
 
-import androidx.lifecycle.*
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import androidx.paging.LivePagedListBuilder
 import androidx.paging.PagedList
 import androidx.sqlite.db.SimpleSQLiteQuery
@@ -70,10 +75,7 @@ class TaskListViewModel @Inject constructor(
     }
 
     private suspend fun performNonPagedQuery(subtasks: SubtaskInfo) {
-        tasks.value =
-                taskDao.fetchTasks(
-                        { s: SubtaskInfo -> getQuery(preferences, filter!!, s) },
-                        subtasks)
+        tasks.value = taskDao.fetchTasks(subtasks) { getQuery(preferences, filter!!, it) }
     }
 
     private fun performPagedListQuery() {