diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index cef929ed9..c0281c90d 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -441,6 +441,7 @@ foreach($file_ary as $file) {
 	}
 
 	$controller->setParam('documentsource', $file['source']);
+	$controller->setParam('documentsourcedetails', !empty($file['source_details']) ? $file['source_details'] : null);
 	$controller->setParam('folder', $folder);
 	$controller->setParam('fulltextservice', $fulltextservice);
 	$controller->setParam('name', $name);
diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php
index d8ac3fcac..f21053ae8 100644
--- a/op/op.UpdateDocument.php
+++ b/op/op.UpdateDocument.php
@@ -348,6 +348,8 @@ default:
 		$attributes = array();
 	}
 
+	$controller->setParam('documentsource', $file['source']);
+	$controller->setParam('documentsourcedetails', !empty($file['source_details']) ? $file['source_details'] : null);
 	$controller->setParam('folder', $folder);
 	$controller->setParam('document', $document);
 	$controller->setParam('fulltextservice', $fulltextservice);
diff --git a/out/out.Search.php b/out/out.Search.php
index 7bbdf06c7..f70021334 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -55,7 +55,8 @@ $includecontent = false;
 if (isset($_GET["includecontent"]) && $_GET["includecontent"])
 	$includecontent = true;
 
-if(((!isset($_GET["fullsearch"]) && $settings->_defaultSearchMethod == 'fulltext') || !empty($_GET["fullsearch"])) && $settings->_enableFullSearch) {
+$fullsearch = ((!isset($_GET["fullsearch"]) && $settings->_defaultSearchMethod == 'fulltext') || !empty($_GET["fullsearch"])) && $settings->_enableFullSearch;
+if($fullsearch) {
 // Search in Fulltext {{{
 	if (isset($_GET["query"]) && is_string($_GET["query"])) {
 		$query = $_GET["query"];
@@ -591,7 +592,7 @@ if($settings->_showSingleSearchHit && count($entries) == 1) {
 		$view->setParam('total', $total);
 		$view->setParam('totaldocs', $dcount /*resArr['totalDocs']*/);
 		$view->setParam('totalfolders', $fcount /*resArr['totalFolders']*/);
-		$view->setParam('fullsearch', (!empty($_GET["fullsearch"]) && $settings->_enableFullSearch) ? true : false);
+		$view->setParam('fullsearch', $fullsearch);
 		$view->setParam('mode', isset($mode) ? $mode : '');
 		$view->setParam('orderby', isset($orderby) ? $orderby : '');
 		$view->setParam('defaultsearchmethod', !empty($_GET["fullsearch"]) || $settings->_defaultSearchMethod);