diff --git a/out/out.Calendar.php b/out/out.Calendar.php
index 6104b96ba..1d7f98f3b 100644
--- a/out/out.Calendar.php
+++ b/out/out.Calendar.php
@@ -92,6 +92,7 @@ if($view) {
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
+	$view->setParam('convertToPdf', $settings->_convertToPdf);
 	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('accessobject', $accessop);
diff --git a/out/out.Dashboard.php b/out/out.Dashboard.php
index 73d272179..1f18aace8 100644
--- a/out/out.Dashboard.php
+++ b/out/out.Dashboard.php
@@ -22,6 +22,7 @@ if($view) {
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
+	$view->setParam('convertToPdf', $settings->_convertToPdf);
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('accessobject', $accessop);
 	$view->setParam('xsendfile', $settings->_enableXsendfile);
diff --git a/out/out.DropFolderChooser.php b/out/out.DropFolderChooser.php
index f7bbef11f..345d57390 100644
--- a/out/out.DropFolderChooser.php
+++ b/out/out.DropFolderChooser.php
@@ -61,6 +61,7 @@ if($view) {
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthMenuList', $settings->_previewWidthMenuList);
 	$view->setParam('previewWidthList', $settings->_previewWidthDropFolderList);
+	$view->setParam('convertToPdf', $settings->_convertToPdf);
 	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('xsendfile', $settings->_enableXsendfile);
diff --git a/out/out.MyDocuments.php b/out/out.MyDocuments.php
index 743ba8c49..77471bd33 100644
--- a/out/out.MyDocuments.php
+++ b/out/out.MyDocuments.php
@@ -68,6 +68,7 @@ if($view) {
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('conversionmgr', $conversionmgr);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('convertToPdf', $settings->_convertToPdf);
 	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('accessobject', $accessop);
diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php
index 47f345a0c..e0b8067da 100644
--- a/out/out.ObjectCheck.php
+++ b/out/out.ObjectCheck.php
@@ -266,6 +266,7 @@ if($view) {
 	$view->setParam('accessobject', $accessop);
 	$view->setParam('conversionmgr', $conversionmgr);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
+	$view->setParam('convertToPdf', $settings->_convertToPdf);
 	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('xsendfile', $settings->_enableXsendfile);
diff --git a/out/out.Search.php b/out/out.Search.php
index 7d0dbad29..8ad5c4d58 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -217,7 +217,7 @@ if($fullsearch) {
 		$total = 0;
 		$index = $fulltextservice->Indexer();
 		if($index) {
-			if(!empty($settings->_suggestTerms)) {
+			if(!empty($settings->_suggestTerms) && !empty($_GET['query'])) {
 				$terms = $index->terms($_GET['query'], $settings->_suggestTerms);
 			}
 			$lucenesearch = $fulltextservice->Search();
@@ -691,6 +691,7 @@ if($settings->_showSingleSearchHit && count($entries) == 1) {
 		$view->setParam('workflowmode', $settings->_workflowMode);
 		$view->setParam('enablefullsearch', $settings->_enableFullSearch);
 		$view->setParam('previewWidthList', $settings->_previewWidthList);
+		$view->setParam('convertToPdf', $settings->_convertToPdf);
 		$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 		$view->setParam('conversionmgr', $conversionmgr);
 		$view->setParam('timeout', $settings->_cmdTimeout);
diff --git a/out/out.Timeline.php b/out/out.Timeline.php
index 4866af560..eab8e49e1 100644
--- a/out/out.Timeline.php
+++ b/out/out.Timeline.php
@@ -65,6 +65,7 @@ if($view) {
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
+	$view->setParam('convertToPdf', $settings->_convertToPdf);
 	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('accessobject', $accessop);
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 2b79f8ddc..9b15ebef6 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -373,7 +373,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
 <?php $this->showConfigOption('settings_fullSearchEngine', 'fullSearchEngine', $fullsearchengines, false, true); ?>
 <?php $this->showConfigOption('settings_defaultSearchMethod', 'defaultSearchMethod', array('database'=>'settings_defaultSearchMethod_valdatabase', 'fulltext'=>'settings_defaultSearchMethod_valfulltext'), false, true); ?>
 <?php $this->showConfigCheckbox('settings_showSingleSearchHit', 'showSingleSearchHit'); ?>
-<?php $this->showConfigOption('settings_suggestTerms', 'suggestTerms', array('title','comment', 'keywords'), true, true); ?>
+<?php $this->showConfigOption('settings_suggestTerms', 'suggestTerms', array('title','comment', 'keywords', 'content'), true, true); ?>
 <?php $this->showConfigText('settings_stopWordsFile', 'stopWordsFile'); ?>
 <?php $this->showConfigCheckbox('settings_enableClipboard', 'enableClipboard'); ?>
 <?php $this->showConfigCheckbox('settings_enableMenuTasks', 'enableMenuTasks'); ?>
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 67a541700..dce16f440 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -455,7 +455,7 @@ $(document).ready( function() {
 		if($document->getComment()) {
 			if($settings->_markdownComments) {
 				$Parsedown = new Parsedown();
-				$comment = $Parsedown->text($document->getComment());
+				$comment = $Parsedown->text(htmlspecialchars($document->getComment()));
 			} else {
 				$comment = htmlspecialchars($document->getComment());
 			}
@@ -810,7 +810,7 @@ $(document).ready( function() {
 			if($latestContent->getComment())
 				if($settings->_markdownComments) {
 					$Parsedown = new Parsedown();
-					$comment = $Parsedown->text($latestContent->getComment());
+					$comment = $Parsedown->text(htmlspecialchars($latestContent->getComment()));
 					print "<div class=\"content-comment\">".$comment."</div>";
 				} else {
 					$comment = htmlspecialchars($latestContent->getComment());