diff --git a/src/kits/tracker/FindPanel.cpp b/src/kits/tracker/FindPanel.cpp
index a55ead2134..60bc610c54 100644
--- a/src/kits/tracker/FindPanel.cpp
+++ b/src/kits/tracker/FindPanel.cpp
@@ -3674,11 +3674,11 @@ DeleteTransientQueriesTask::Initialize()
 	PRINT(("starting up transient query killer\n"));
 	BPath path;
 	status_t result = find_directory(B_USER_DIRECTORY, &path, false);
-	if (result != B_OK) {
+	if (result != B_OK || path.Append("queries") != B_OK) {
 		state = kError;
 		return;
 	}
-	fWalker = new BTrackerPrivate::TQueryWalker(kAttrQueryLastChange " != 0");
+	fWalker = new BTrackerPrivate::TNodeWalker(path.Path());
 	state = kAllocatedWalker;
 }
 
diff --git a/src/kits/tracker/FindPanel.h b/src/kits/tracker/FindPanel.h
index cb88c6367d..bf3ae2d7c8 100644
--- a/src/kits/tracker/FindPanel.h
+++ b/src/kits/tracker/FindPanel.h
@@ -379,7 +379,7 @@ private:
 			static const int32 kBatchCount = 100;
 			static const int32 kDaysToExpire = 7;
 
-			BTrackerPrivate::TQueryWalker* fWalker;
+			BTrackerPrivate::TNodeWalker* fWalker;
 };