diff --git a/CHANGELOG b/CHANGELOG
index e7bee4677..eb7ea57d7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -239,6 +239,7 @@
 - do not use logger in notification service if it was not initialized
 - fix editing of custom date fields
 - fix listing files/folders with umlauts when using webdav
+- fix upload with fine-uploader
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.25
diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php b/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
index d9a793974..d6ba6b6a7 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/Search.php
@@ -130,14 +130,14 @@ class SeedDMS_SQliteFTS_Search {
 				$querystr .= ' AND ';
 			$querystr .= '(path:';
 			$querystr .= str_replace(':', 'x', $fields['rootFolder']->getFolderList().$fields['rootFolder']->getID().':');
-			$querystr .= ')';
+			$querystr .= '*)';
 		}
 		if(!empty($fields['startFolder']) && $fields['startFolder']->getFolderList()) {
 			if($querystr)
 				$querystr .= ' AND ';
 			$querystr .= '(path:';
 			$querystr .= str_replace(':', 'x', $fields['startFolder']->getFolderList().$fields['startFolder']->getID().':');
-			$querystr .= ')';
+			$querystr .= '*)';
 		}
 		try {
 			$result = $this->index->find($querystr, $limit);
diff --git a/SeedDMS_SQLiteFTS/package.xml b/SeedDMS_SQLiteFTS/package.xml
index a0d990920..a862245cf 100644
--- a/SeedDMS_SQLiteFTS/package.xml
+++ b/SeedDMS_SQLiteFTS/package.xml
@@ -24,6 +24,7 @@
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
 - throw exeption in find() instead of returning false
+- fix query if rootFolder or startFolder is set
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index 86d8f74bb..0b6df64de 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -1040,7 +1040,7 @@ switch($command) {
 									$ires = $index->addDocument($idoc);
 								header('Content-Type: application/json');
 								if(false === $ires) {
-									echo json_encode(array('success'=>false, 'message'=>getMLText('error_document_indexed'), 'data'=>$prefix.$object->getID()));
+									echo json_encode(array('success'=>false, 'message'=>getMLText('error_document_indexed'), 'data'=>$prefix.$object->getID(), 'mimetype'=>$idoc->getMimeType(), 'cmd'=>$idoc->getCmd()));
 								} else {
 									echo json_encode(array('success'=>true, 'message'=>getMLText('splash_document_indexed'), 'data'=>$prefix.$object->getID(), 'cmd'=>$idoc->getCmd()));
 								}
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index f1c186da3..fede0d9f1 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -3502,11 +3502,13 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 	<div class="qq-total-progress-bar-container-selector qq-total-progress-bar-container">
 		<div role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" class="qq-total-progress-bar-selector qq-progress-bar qq-total-progress-bar"></div>
 		</div>
-	<div class="input-append">
-	<div class="qq-upload-drop-area-selector qq-upload-drop-area" _qq-hide-dropzone>
+	<div class="input-group">
+	<div class="form-control qq-upload-drop-area-selector qq-upload-drop-area" _qq-hide-dropzone>
 		<span class="qq-upload-drop-area-text-selector"></span>
 	</div>
-	<span class="btn qq-upload-button-selector qq-upload-button">'.getMLText('browse').'&hellip;</span>
+	<div class="input-group-append">
+	<span class="btn btn-secondary qq-upload-button-selector qq-upload-button">'.getMLText('choose_target_file').'&hellip;</span>
+	</div>
 	</div>
 	<span class="qq-drop-processing-selector qq-drop-processing">
 		<span class="qq-drop-processing-spinner-selector qq-drop-processing-spinner"></span>
@@ -3520,22 +3522,22 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 			<img class="qq-thumbnail-selector" qq-max-size="100" qq-server-scale>
 			<span class="qq-upload-file-selector qq-upload-file"></span>
 			<span class="qq-upload-size-selector qq-upload-size"></span>
-			<button class="btn btn-mini qq-btn qq-upload-cancel-selector qq-upload-cancel">Cancel</button>
+			<button class="btn btn-sm btn-danger qq-btn qq-upload-cancel-selector qq-upload-cancel">Cancel</button>
 			<span role="status" class="qq-upload-status-text-selector qq-upload-status-text"></span>
 		</li>
 	</ul>
 	<dialog class="qq-alert-dialog-selector">
 		<div class="qq-dialog-message-selector"></div>
 		<div class="qq-dialog-buttons">
-			<button class="btn qq-cancel-button-selector">Cancel</button>
+			<button class="btn btn-sm btn-secondary qq-cancel-button-selector">Cancel</button>
 		</div>
 	</dialog>
 
 	<dialog class="qq-confirm-dialog-selector">
 		<div class="qq-dialog-message-selector"></div>
 		<div class="qq-dialog-buttons">
-			<button class="btn qq-cancel-button-selector">Cancel</button>
-			<button class="btn qq-ok-button-selector">Ok</button>
+			<button class="btn btn-sm btn-secondary qq-cancel-button-selector">Cancel</button>
+			<button class="btn btn-sm btn-primary qq-ok-button-selector">Ok</button>
 		</div>
 	</dialog>
 
diff --git a/views/bootstrap4/styles/application.css b/views/bootstrap4/styles/application.css
index 2dde7e119..51ef35ded 100644
--- a/views/bootstrap4/styles/application.css
+++ b/views/bootstrap4/styles/application.css
@@ -425,15 +425,6 @@ ul.qq-upload-list li span {
 	display: inline-block;
 }
 
-.qq-upload-drop-area {
-	display: inline-block;
-	width: 200px;
-	height: 22px;
-	padding: 3px;
-	background-color: #fff;
-	border: 1px solid #cccccc;
-	border-radius: 4px;
-}
 .qq-hide, .qq-uploader dialog {
 	display: none;
 }