diff --git a/src/kioslaves/search/kio_search.cpp b/src/kioslaves/search/kio_search.cpp
index 54246f10..4758c40c 100644
--- a/src/kioslaves/search/kio_search.cpp
+++ b/src/kioslaves/search/kio_search.cpp
@@ -1,149 +1,180 @@
 /*
    Copyright (C) 2008-2010 by Sebastian Trueg <trueg at kde.org>
    Copyright (C) 2012-2014 by Vishesh Handa <me@vhanda.in>
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 #include "kio_search.h"
 
 #include "query.h"
 #include "resultiterator.h"
 #include "idutils.h"
 
 #include <QUrl>
 #include <QUrlQuery>
 #include <KUser>
 #include <QDebug>
 #include <QCoreApplication>
 #include <KLocalizedString>
 
 #include <KIO/Job>
 
 using namespace Baloo;
 
 namespace
 {
 
 KIO::UDSEntry statSearchFolder(const QUrl& url)
 {
     KIO::UDSEntry uds;
     uds.insert(KIO::UDSEntry::UDS_ACCESS, 0700);
     uds.insert(KIO::UDSEntry::UDS_USER, KUser().loginName());
     uds.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR);
     uds.insert(KIO::UDSEntry::UDS_MIME_TYPE, QStringLiteral("inode/directory"));
     uds.insert(KIO::UDSEntry::UDS_ICON_OVERLAY_NAMES, QStringLiteral("baloo"));
     uds.insert(KIO::UDSEntry::UDS_DISPLAY_TYPE, i18n("Search Folder"));
     uds.insert(KIO::UDSEntry::UDS_URL, url.url());
 
     QUrlQuery query(url);
     QString title = query.queryItemValue(QStringLiteral("title"), QUrl::FullyDecoded);
     if (!title.isEmpty()) {
         uds.insert(KIO::UDSEntry::UDS_NAME, title);
         uds.insert(KIO::UDSEntry::UDS_DISPLAY_NAME, title);
     }
 
     return uds;
 }
 
 }
 
 SearchProtocol::SearchProtocol(const QByteArray& poolSocket, const QByteArray& appSocket)
     : KIO::SlaveBase("baloosearch", poolSocket, appSocket)
 {
 }
 
 
 SearchProtocol::~SearchProtocol()
 {
 }
 
+static QString jsonQueryForType(const QString &type)
+{
+    const QString jsonQuery(QStringLiteral("{\"dayFilter\": 0,\
+                                             \"monthFilter\": 0, \
+                                             \"yearFilter\": 0, \
+                                             \"type\": [ \"%1\"]}"));
+    return jsonQuery.arg(type);
+}
+
+static QString jsonQueryFromUrl(const QUrl &url)
+{
+    const QString path = url.path();
+
+    if (path == QLatin1String("/documents")) {
+        return jsonQueryForType(QStringLiteral("Document"));
+    } else if (path.endsWith(QLatin1String("/images"))) {
+        return jsonQueryForType(QStringLiteral("Image"));
+    } else if (path.endsWith(QLatin1String("/audio"))) {
+        return jsonQueryForType(QStringLiteral("Audio"));
+    } else if (path.endsWith(QLatin1String("/videos"))) {
+        return jsonQueryForType(QStringLiteral("Video"));
+    }
+
+    return QString();
+}
+
 void SearchProtocol::listDir(const QUrl& url)
 {
     Query q;
 
     QUrlQuery urlQuery(url);
     if (urlQuery.hasQueryItem(QStringLiteral("json"))) {
         QString jsonString = urlQuery.queryItemValue(QStringLiteral("json"), QUrl::FullyDecoded);
         q = Query::fromJSON(jsonString.toUtf8());
     } else if (urlQuery.hasQueryItem(QStringLiteral("query"))) {
         QString queryString = urlQuery.queryItemValue(QStringLiteral("query"), QUrl::FullyDecoded);
 
         q.setSearchString(queryString);
+    } else {
+        const QString jsonString = jsonQueryFromUrl(url);
+        if (!jsonString.isEmpty()) {
+            q = Query::fromJSON(jsonString.toUtf8());
+        }
     }
 
     q.setSortingOption(Query::SortNone);
     ResultIterator it = q.exec();
 
     while (it.next()) {
         KIO::UDSEntry uds;
         const QString filePath(it.filePath());
 
         // Code from kdelibs/kioslaves/file.cpp
         QT_STATBUF statBuf;
         const QByteArray ba = QFile::encodeName(filePath);
         if (filePathToStat(ba, statBuf) == 0) {
             uds.insert(KIO::UDSEntry::UDS_MODIFICATION_TIME, statBuf.st_mtime);
             uds.insert(KIO::UDSEntry::UDS_ACCESS_TIME, statBuf.st_atime);
             uds.insert(KIO::UDSEntry::UDS_SIZE, statBuf.st_size);
             uds.insert(KIO::UDSEntry::UDS_USER, statBuf.st_uid);
             uds.insert(KIO::UDSEntry::UDS_GROUP, statBuf.st_gid);
 
             mode_t type = statBuf.st_mode & S_IFMT;
             mode_t access = statBuf.st_mode & 07777;
 
             uds.insert(KIO::UDSEntry::UDS_FILE_TYPE, type);
             uds.insert(KIO::UDSEntry::UDS_ACCESS, access);
         }
         else {
             continue;
         }
 
         QUrl url = QUrl::fromLocalFile(filePath);
         uds.insert(KIO::UDSEntry::UDS_NAME, url.fileName());
         uds.insert(KIO::UDSEntry::UDS_URL, url.url());
         uds.insert(KIO::UDSEntry::UDS_LOCAL_PATH, filePath);
 
         listEntry(uds);
     }
 
     finished();
 }
 
 
 void SearchProtocol::mimetype(const QUrl&)
 {
     mimeType(QStringLiteral("inode/directory"));
     finished();
 }
 
 
 void SearchProtocol::stat(const QUrl& url)
 {
     statEntry(statSearchFolder(url));
     finished();
 }
 
 extern "C"
 {
     Q_DECL_EXPORT int kdemain(int argc, char** argv)
     {
         QCoreApplication app(argc, argv);
         app.setApplicationName(QStringLiteral("kio_baloosearch"));
         Baloo::SearchProtocol slave(argv[2], argv[3]);
         slave.dispatchLoop();
         return 0;
     }
 }