diff --git a/src/core/song.cpp b/src/core/song.cpp
index b13e6583..29c37ebb 100644
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -157,7 +157,9 @@ const QStringList Song::kTextSearchColumns = QStringList()      << QStringLitera
                                                                 << QStringLiteral("performer")
                                                                 << QStringLiteral("grouping")
                                                                 << QStringLiteral("genre")
-                                                                << QStringLiteral("comment");
+                                                                << QStringLiteral("comment")
+                                                                << QStringLiteral("filename")
+                                                                << QStringLiteral("url");
 
 const QStringList Song::kIntSearchColumns = QStringList()       << QStringLiteral("track")
                                                                 << QStringLiteral("year")
diff --git a/src/filterparser/filtertree.cpp b/src/filterparser/filtertree.cpp
index d3481363..ab6d5fb3 100644
--- a/src/filterparser/filtertree.cpp
+++ b/src/filterparser/filtertree.cpp
@@ -46,6 +46,8 @@ QVariant FilterTree::DataFromColumn(const QString &column, const Song &metadata)
   if (column == QLatin1String("rating"))      return metadata.rating();
   if (column == QLatin1String("playcount"))   return metadata.playcount();
   if (column == QLatin1String("skipcount"))   return metadata.skipcount();
+  if (column == QLatin1String("filename"))    return metadata.basefilename();
+  if (column == QLatin1String("url"))         return metadata.effective_stream_url().toString();
 
   return QVariant();