diff --git a/out/out.Search.php b/out/out.Search.php
index 08c626762..8110dfc26 100644
--- a/out/out.Search.php
+++ b/out/out.Search.php
@@ -374,7 +374,6 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 	if($resArr['folders']) {
 		foreach ($resArr['folders'] as $entry) {
 			if ($entry->getAccessMode($user) >= M_READ) {
-				$entry->verifyLastestContentExpriry();
 				$entries[] = $entry;
 				$fcount++;
 			}
@@ -384,6 +383,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe
 	if($resArr['docs']) {
 		foreach ($resArr['docs'] as $entry) {
 			if ($entry->getAccessMode($user) >= M_READ) {
+				$entry->verifyLastestContentExpriry();
 				$entries[] = $entry;
 				$dcount++;
 			}
diff --git a/views/bootstrap/class.AddFile.php b/views/bootstrap/class.AddFile.php
index 924c66474..3c0daa52e 100644
--- a/views/bootstrap/class.AddFile.php
+++ b/views/bootstrap/class.AddFile.php
@@ -32,6 +32,7 @@ require_once("class.Bootstrap.php");
 class SeedDMS_View_AddFile extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
+		header('Content-Type: application/javascript');
 ?>
 function checkForm()
 {
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 881c60957..ba092dd7b 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1048,11 +1048,10 @@ $(document).ready(function () {
 
 	function printDocumentChooserJs($formName) { /* {{{ */
 ?>
-modalDocChooser<?php echo $formName ?> = $('#docChooser<?php echo $formName ?>');
 function documentSelected<?php echo $formName ?>(id, name) {
 	$('#docid<?php echo $formName ?>').val(id);
 	$('#choosedocsearch').val(name);
-	modalDocChooser<?php echo $formName ?>.modal('hide');
+	$('#docChooser<?php echo $formName ?>').modal('hide');
 }
 function folderSelected<?php echo $formName ?>(id, name) {
 }
@@ -1097,11 +1096,10 @@ function folderSelected<?php echo $formName ?>(id, name) {
 
 	function printFolderChooserJs($formName) { /* {{{ */
 ?>
-modalFolderChooser<?php echo $formName ?> = $('#folderChooser<?php echo $formName ?>');
 function folderSelected<?php echo $formName ?>(id, name) {
 	$('#targetid<?php echo $formName ?>').val(id);
 	$('#choosefoldersearch<?php echo $formName ?>').val(name);
-	modalFolderChooser<?php echo $formName ?>.modal('hide');
+	$('#folderChooser<?php echo $formName ?>').modal('hide');
 }
 <?php
 	} /* }}} */
diff --git a/views/bootstrap/class.Categories.php b/views/bootstrap/class.Categories.php
index fbc3513f9..ae5ae0c52 100644
--- a/views/bootstrap/class.Categories.php
+++ b/views/bootstrap/class.Categories.php
@@ -33,6 +33,7 @@ class SeedDMS_View_Categories extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
 		$selcat = $this->params['selcategory'];
+		header('Content-Type: application/javascript');
 ?>
 $(document).ready( function() {
 	$( "#selector" ).change(function() {
diff --git a/views/bootstrap/class.DefaultKeywords.php b/views/bootstrap/class.DefaultKeywords.php
index ff71eba4c..ea1987812 100644
--- a/views/bootstrap/class.DefaultKeywords.php
+++ b/views/bootstrap/class.DefaultKeywords.php
@@ -32,6 +32,7 @@ require_once("class.Bootstrap.php");
 class SeedDMS_View_DefaultKeywords extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
+		header('Content-Type: application/javascript');
 ?>
 function checkForm()
 {
diff --git a/views/bootstrap/class.DropFolderChooser.php b/views/bootstrap/class.DropFolderChooser.php
index c1223e23b..553191dc5 100644
--- a/views/bootstrap/class.DropFolderChooser.php
+++ b/views/bootstrap/class.DropFolderChooser.php
@@ -32,6 +32,7 @@ require_once("class.Bootstrap.php");
 class SeedDMS_View_DropFolderChooser extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
+		header('Content-Type: application/javascript');
 ?>
 $('#fileselect').click(function(ev) {
 	attr_filename = $(ev.currentTarget).attr('filename');
diff --git a/views/bootstrap/class.EditDocument.php b/views/bootstrap/class.EditDocument.php
index 4d936a2a7..58c1026d6 100644
--- a/views/bootstrap/class.EditDocument.php
+++ b/views/bootstrap/class.EditDocument.php
@@ -33,6 +33,7 @@ class SeedDMS_View_EditDocument extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
 		$strictformcheck = $this->params['strictformcheck'];
+		header('Content-Type: application/javascript');
 		$this->printKeywordChooserJs('form1');
 ?>
 function checkForm()
diff --git a/views/bootstrap/class.EditUserData.php b/views/bootstrap/class.EditUserData.php
index a9b860be7..27acf2464 100644
--- a/views/bootstrap/class.EditUserData.php
+++ b/views/bootstrap/class.EditUserData.php
@@ -32,6 +32,7 @@ require_once("class.Bootstrap.php");
 class SeedDMS_View_EditUserData extends SeedDMS_Bootstrap_Style {
 
 	function js() { /* {{{ */
+		header('Content-Type: application/javascript');
 ?>
 function checkForm()
 {
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index b2b3e1719..93bc24cf4 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -50,6 +50,8 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style {
 	} /* }}} */
 
 	function js() { /* {{{ */
+
+		header('Content-Type: application/javascript');
 ?>
 		$(document).ready( function() {
 			$('#settingstab li a').click(function(event) {
diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php
index 49006df64..affe77df8 100644
--- a/views/bootstrap/class.UpdateDocument.php
+++ b/views/bootstrap/class.UpdateDocument.php
@@ -53,6 +53,7 @@ $(document).ready( function() {
 	function js() { /* {{{ */
 		$strictformcheck = $this->params['strictformcheck'];
 		$dropfolderdir = $this->params['dropfolderdir'];
+		header('Content-Type: application/javascript');
 		$this->printDropFolderChooserJs("form1");
 ?>
 function checkForm()
diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index cef71a25a..344f063a4 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -35,6 +35,8 @@ class SeedDMS_View_UsrMgr extends SeedDMS_Bootstrap_Style {
 		$seluser = $this->params['seluser'];
 		$strictformcheck = $this->params['strictformcheck'];
 
+		header('Content-Type: application/javascript');
+
 		$this->printFolderChooserJs("form");
 ?>
 function checkForm()