diff --git a/src/search/dolphinquerymodel.h b/src/search/dolphinquerymodel.h
--- a/src/search/dolphinquerymodel.h
+++ b/src/search/dolphinquerymodel.h
@@ -41,6 +41,7 @@
     QStringList searchTerms() const {return m_searchTerms;};
     QString customDir() const {return m_customDir;};
     bool isGlobalSearch() const {return m_customDir.isEmpty();};
+    bool isContentSearch() const {return !m_hasFileName;};
 
     static bool isSearchTerm(const QString& term);
 
@@ -50,6 +51,7 @@
     QString m_searchType;
     QStringList m_searchTerms;
     QString m_customDir;
+    bool m_hasFileName = false;
 };
 
 #endif //DOLPHINQUERYMODEL_H
diff --git a/src/search/dolphinquerymodel.cpp b/src/search/dolphinquerymodel.cpp
--- a/src/search/dolphinquerymodel.cpp
+++ b/src/search/dolphinquerymodel.cpp
@@ -43,15 +43,36 @@
     const QStringList types = query.types();
     model.m_searchType = types.isEmpty() ? QString() : types.first();
 
+    QStringList textParts;
+
     const QStringList subTerms = query.searchString().split(' ', QString::SkipEmptyParts);
     foreach (const QString& subTerm, subTerms) {
+        QString value;
         if (subTerm.startsWith(QLatin1String("filename:"))) {
-            const QString value = subTerm.mid(9);
-            model.m_searchText = value;
+            value = subTerm.mid(9);
+            model.m_hasFileName = true;
         } else if (DolphinQueryModel::isSearchTerm(subTerm)) {
             model.m_searchTerms << subTerm;
+            continue;
+        } else if (subTerm == QLatin1String("AND") && subTerm != subTerms.at(0) && subTerm != subTerms.back()) {
+            continue;
+        } else {
+            value = subTerm;
+        }
+
+        if (!value.isEmpty() && value.at(0) == QLatin1Char('"')) {
+            value = value.mid(1);
+        }
+        if (!value.isEmpty() && value.back() == QLatin1Char('"')) {
+            value = value.mid(0, value.size() - 1);
+        }
+        if (!value.isEmpty()) {
+            textParts << value;
         }
     }
+
+    model.m_searchText = textParts.join(QLatin1Char(' '));
+
 #endif
     return model;
 }
diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -520,6 +520,12 @@
         m_facetsWidget->setRatingTerm(searchTerm);
     }
 
+    if (queryModel->isContentSearch()) {
+        m_contentButton->setChecked(true);
+    } else {
+        m_fileNameButton->setChecked(true);
+    }
+
     m_startSearchTimer->stop();
     blockSignals(false);
 }
diff --git a/src/tests/dolphinsearchboxtest.cpp b/src/tests/dolphinsearchboxtest.cpp
--- a/src/tests/dolphinsearchboxtest.cpp
+++ b/src/tests/dolphinsearchboxtest.cpp
@@ -166,24 +166,6 @@
     QStringList searchTerms = queryModel.searchTerms();
     searchTerms.sort();
 
-    // FIXME: Current parsing bugs
-    QEXPECT_FAIL("content/singleQuote", "Quotes around text are shown", Continue);
-    QEXPECT_FAIL("content/doubleQuote", "Quotes around text are shown", Continue);
-
-    QEXPECT_FAIL("filename",             "Quotes around text are shown", Continue);
-    QEXPECT_FAIL("filename/singleQuote", "Quotes around text are shown", Continue);
-    QEXPECT_FAIL("filename/doubleQuote", "Quotes around text are shown", Continue);
-
-    QEXPECT_FAIL("rating"                  , "Text includes also search terms", Continue);
-    QEXPECT_FAIL("rating+content"          , "Text includes also search terms", Continue);
-    QEXPECT_FAIL("rating+filename"         , "Text includes also search terms", Continue);
-    QEXPECT_FAIL("modified"                , "Text includes also search terms", Continue);
-    QEXPECT_FAIL("modified+content"        , "Text includes also search terms", Continue);
-    QEXPECT_FAIL("modified+filename"       , "Text includes also search terms", Continue);
-    QEXPECT_FAIL("rating+modified"         , "Text includes also search terms", Continue);
-    QEXPECT_FAIL("rating+modified+content" , "Text includes also search terms", Continue);
-    QEXPECT_FAIL("rating+modified+filename", "Text includes also search terms", Continue);
-
     // Check for parsed text (would be displayed on the input search bar)
     QCOMPARE(queryModel.text(), expectedText);