diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59c98d66a..1b4a7a83f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,7 +82,7 @@ add_subdirectory( shell )
 add_subdirectory( generators )
 add_subdirectory( autotests )
 
-add_subdirectory(doc)
+#add_subdirectory(doc)
 
 include(OkularConfigureChecks.cmake)
 
diff --git a/active/app/package/contents/ui/Documents.qml b/active/app/package/contents/ui/Documents.qml
index 4902c0ed0..91886f405 100644
--- a/active/app/package/contents/ui/Documents.qml
+++ b/active/app/package/contents/ui/Documents.qml
@@ -36,14 +36,13 @@ PlasmaComponents.Page {
         id: toolBarContent
         width: root.width
         height: searchField.height
-        MobileComponents.ViewSearch {
+        PlasmaComponents.TextField {
             id: searchField
             enabled: documentItem.supportsSearch
             anchors.centerIn: parent
-            busy: documentItem.searchInProgress
-            onSearchQueryChanged: {
-                if (searchQuery.length > 2) {
-                    filterModel.filterRegExp = ".*" + searchQuery + ".*";
+            onTextChanged: {
+                if (text.length > 2) {
+                    filterModel.filterRegExp = ".*" + text + ".*";
                 } else {
                     filterModel.filterRegExp = "";
                 }
diff --git a/active/app/package/contents/ui/Thumbnails.qml b/active/app/package/contents/ui/Thumbnails.qml
index 8260619c1..e755fbfed 100644
--- a/active/app/package/contents/ui/Thumbnails.qml
+++ b/active/app/package/contents/ui/Thumbnails.qml
@@ -31,17 +31,17 @@ ThumbnailsBase {
         id: toolBarContent
         width: root.width
         height: searchField.height
-        MobileComponents.ViewSearch {
+        PlasmaComponents.TextField {
             id: searchField
             enabled: documentItem.supportsSearch
             anchors.centerIn: parent
             busy: documentItem.searchInProgress
-            onSearchQueryChanged: {
-                if (searchQuery.length > 2) {
-                    documentItem.searchText(searchQuery)
+            onTextChanged: {
+                if (text.length > 2) {
+                    documentItem.searchText(text);
                 } else {
-                    view.currentIndex = pageArea.delegate.pageNumber
-                    documentItem.resetSearch()
+                    view.currentIndex = pageArea.delegate.pageNumber;
+                    documentItem.resetSearch();
                 }
             }
         }