diff --git a/CHANGELOG b/CHANGELOG
index e4dd01a38..98f9dfb58 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+                     Changes in version 5.0.2
+--------------------------------------------------------------------------------
+- merged changes from 4.3.26
+
 --------------------------------------------------------------------------------
                      Changes in version 5.0.1
 --------------------------------------------------------------------------------
@@ -18,6 +23,13 @@
 - add .xml to online file types by default
 - add home folder for users
 
+--------------------------------------------------------------------------------
+                     Changes in version 4.3.26
+--------------------------------------------------------------------------------
+- move some left over javascript from html code into application.js (Closes #253)
+- take out last empty line from view/bootstrap/class.Search.php which causes a
+  header to be send to early (Closes: #252, #254) 
+
 --------------------------------------------------------------------------------
                      Changes in version 4.3.25
 --------------------------------------------------------------------------------
diff --git a/SeedDMS_Lucene/Lucene/IndexedDocument.php b/SeedDMS_Lucene/Lucene/IndexedDocument.php
index c9d5c6a1e..2a90a39b1 100644
--- a/SeedDMS_Lucene/Lucene/IndexedDocument.php
+++ b/SeedDMS_Lucene/Lucene/IndexedDocument.php
@@ -42,7 +42,7 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 		do {
 			$timeleft = $timeout - time();
 			$read = array($pipes[1]);
-			stream_select($read, $write = NULL, $exeptions = NULL, $timeleft, NULL);
+			stream_select($read, $write = NULL, $exeptions = NULL, $timeleft, 200000);
 					 
 			if (!empty($read)) {
 				$output .= fread($pipes[1], 8192);
diff --git a/SeedDMS_Lucene/package.xml b/SeedDMS_Lucene/package.xml
index b7dee2403..c37770104 100644
--- a/SeedDMS_Lucene/package.xml
+++ b/SeedDMS_Lucene/package.xml
@@ -11,10 +11,10 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2016-02-01</date>
- <time>09:14:07</time>
+ <date>2016-03-29</date>
+ <time>08:11:19</time>
  <version>
-  <release>1.1.7</release>
+  <release>1.1.8</release>
   <api>1.1.7</api>
  </version>
  <stability>
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-add command for indexing postѕcript files
+set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -202,5 +202,21 @@ declare SeeDMS_Lucene_Indexer::open() static
 run external commands with a timeout
    </notes>
   </release>
+  <release>
+   <date>2016-02-01</date>
+   <time>09:14:07</time>
+   <version>
+    <release>1.1.7</release>
+    <api>1.1.7</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+add command for indexing postѕcript files
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php
index cc493c588..33160489f 100644
--- a/SeedDMS_Preview/Preview/Previewer.php
+++ b/SeedDMS_Preview/Preview/Previewer.php
@@ -75,7 +75,7 @@ class SeedDMS_Preview_Previewer {
 		do {
 			$timeleft = $timeout - time();
 			$read = array($pipes[1]);
-			stream_select($read, $write = NULL, $exeptions = NULL, $timeleft, NULL);
+			stream_select($read, $write = NULL, $exeptions = NULL, $timeleft, 200000);
 					 
 			if (!empty($read)) {
 				$output .= fread($pipes[1], 8192);
diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml
index 3bf524a76..f2d964f76 100644
--- a/SeedDMS_Preview/package.xml
+++ b/SeedDMS_Preview/package.xml
@@ -11,11 +11,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2016-03-08</date>
- <time>09:36:57</time>
+ <date>2016-03-29</date>
+ <time>08:07:14</time>
  <version>
-  <release>1.1.6</release>
-  <api>1.1.6</api>
+  <release>1.1.7</release>
+  <api>1.1.7</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-check if object passed to createPreview(), hasPreview() is not null
+set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -164,5 +164,21 @@ add method getFilesize()
 timeout for external commands can be passed to contructor of SeedDMS_Preview_Previewer
    </notes>
   </release>
+  <release>
+   <date>2016-03-08</date>
+   <time>09:36:57</time>
+   <version>
+    <release>1.1.6</release>
+    <api>1.1.6</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+check if object passed to createPreview(), hasPreview() is not null
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
index d28e254d0..5228570ca 100644
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
@@ -47,7 +47,7 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 		do {
 			$timeleft = $timeout - time();
 			$read = array($pipes[1]);
-			stream_select($read, $write = NULL, $exeptions = NULL, $timeleft, NULL);
+			stream_select($read, $write = NULL, $exeptions = NULL, $timeleft, 200000);
 					 
 			if (!empty($read)) {
 				$output .= fread($pipes[1], 8192);
diff --git a/SeedDMS_SQLiteFTS/package.xml b/SeedDMS_SQLiteFTS/package.xml
index 4425ba1ea..c55c1ced0 100644
--- a/SeedDMS_SQLiteFTS/package.xml
+++ b/SeedDMS_SQLiteFTS/package.xml
@@ -11,10 +11,10 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2016-03-15</date>
- <time>15:59:07</time>
+ <date>2016-03-29</date>
+ <time>08:09:48</time>
  <version>
-  <release>1.0.4</release>
+  <release>1.0.5</release>
   <api>1.0.1</api>
  </version>
  <stability>
@@ -23,7 +23,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-make it work with sqlite3 &lt; 3.8.0
+set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -130,5 +130,21 @@ check if index exists before removing it when creating a new one
 add command for indexing postѕcript files
    </notes>
   </release>
+  <release>
+   <date>2016-03-15</date>
+   <time>15:59:07</time>
+   <version>
+    <release>1.0.4</release>
+    <api>1.0.1</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+make it work with sqlite3 &lt; 3.8.0
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/styles/bootstrap/application.css b/styles/bootstrap/application.css
index b1ab5ff61..858b0629d 100644
--- a/styles/bootstrap/application.css
+++ b/styles/bootstrap/application.css
@@ -106,6 +106,11 @@ div.statusbar a.btn {
 	margin-bottom: 10px;
 }
 
+#database .chosen-container,
+#fulltext .chosen-container {
+	width: 95% !important;
+}
+
 .chosen-container-multi .chosen-choices {
 	border: 1px solid #cccccc;
 	border-radius: 4px;
diff --git a/styles/bootstrap/application.js b/styles/bootstrap/application.js
index 189f9d77d..1d4c8f63e 100644
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@@ -382,6 +382,9 @@ $(document).ready( function() {
 		});
 	});
 
+	$('button.history-back').on('click', function(event) {
+		window.history.back();
+	});
 });
 
 function onAddClipboard(ev) { /* {{{ */
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 2dff3ad47..1ed802bbe 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1008,6 +1008,10 @@ function folderSelected<?php echo $formName ?>(id, name) {
 <?php
 	} /* }}} */
 
+	/**
+	 * Do not use anymore. Was previously used to show the category
+	 * chooser. It has been replaced by a select box
+	 */
 	function printCategoryChooser($formName, $categories=array()) { /* {{{ */
 ?>
 <script language="JavaScript">
@@ -1110,7 +1114,7 @@ $('#acceptkeywords').click(function(ev) {
 				$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
 ?>
         <span class="input-append date datepicker" style="display: inline;" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
-					<input class="span4" size="16" name="<?= $fieldname ?>[<?= $attrdef->getId() ?>]" type="text" value="<?php if($objvalue) echo $objvalue; else echo "" /*date('Y-m-d')*/; ?>">
+					<input class="span4" size="16" name="<?php echo $fieldname ?>[<?php echo $attrdef->getId() ?>]" type="text" value="<?php if($objvalue) echo $objvalue; else echo "" /*date('Y-m-d')*/; ?>">
           <span class="add-on"><i class="icon-calendar"></i></span>
 				</span>
 <?php
@@ -1168,7 +1172,6 @@ $('#acceptkeywords').click(function(ev) {
   </div>
   <div class="modal-footer">
     <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true"><?php printMLText("close") ?></button>
-<!--    <button class="btn" data-dismiss="modal" aria-hidden="true" onClick="acceptCategories();"><i class="icon-save"></i> <?php printMLText("save") ?></button> -->
   </div>
 </div>
 <?php
@@ -1258,7 +1261,7 @@ $('#clearfilename<?php print $formName ?>').click(function(ev) {
 		print "<h4>".getMLText('error')."!</h4>";
 		print htmlspecialchars($error);
 		print "</div>";
-		print "<div><button class=\"btn\" onclick=\"window.history.back();\">".getMLText('back')."</button></div>";
+		print "<div><button class=\"btn history-back\">".getMLText('back')."</button></div>";
 		
 		$this->contentEnd();
 		$this->htmlEndPage();
@@ -2366,7 +2369,7 @@ mayscript>
 			'editable': false,
 			'selectable': true,
 			'style': 'box',
-			'locale': '<?= $this->params['session']->getLanguage() ?>'
+			'locale': '<?php echo $this->params['session']->getLanguage() ?>'
 		};
 
 		function onselect() {
@@ -2385,7 +2388,7 @@ mayscript>
 		timeline = new links.Timeline(document.getElementById('timeline'), options);
 		links.events.addListener(timeline, 'select', onselect);
 		$.getJSON(
-			'<?= $timelineurl ?>', 
+			'<?php echo $timelineurl ?>', 
 			function(data) {
 				$.each( data, function( key, val ) {
 					val.start = new Date(val.start);
@@ -2399,7 +2402,7 @@ mayscript>
 
 	protected function printTimelineHtml($height) { /* {{{ */
 ?>
-	<div id="timeline" style="height: <?= $height ?>px;"></div>
+	<div id="timeline" style="height: <?php echo $height ?>px;"></div>
 <?php
 	} /* }}} */
 
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index c6b9d9c2c..1cb71a9a2 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -633,4 +633,3 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 	} /* }}} */
 }
 ?>
-
diff --git a/views/bootstrap/class.Timeline.php b/views/bootstrap/class.Timeline.php
index f5d941104..4832ffb61 100644
--- a/views/bootstrap/class.Timeline.php
+++ b/views/bootstrap/class.Timeline.php
@@ -205,7 +205,7 @@ $(document).ready(function () {
 ?>
 <form action="../out/out.Timeline.php" class="form form-inline" name="form1" id="form1">
 	<div class="control-group">
-		<label class="control-label" for="startdate"><?= getMLText('date') ?></label>
+		<label class="control-label" for="startdate"><?php printMLText('date') ?></label>
 		<div class="controls">
        <span class="input-append date" style="display: inline;" id="fromdate" data-date="<?php echo date('Y-m-d', $from); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
 			 <input type="text" class="input-small" name="fromdate" value="<?php echo date('Y-m-d', $from); ?>"/>
@@ -218,15 +218,15 @@ $(document).ready(function () {
 		</div>
 	</div>
 	<div class="control-group">
-		<label class="control-label" for="skip"><?= getMLText('exclude_items') ?></label>
+		<label class="control-label" for="skip"><?php printMLText('exclude_items') ?></label>
 		<div class="controls">
-			<input type="checkbox" name="skip[]" value="add_file" <?= ($skip &&  in_array('add_file', $skip)) ? 'checked' : '' ?>> <?= getMLText('timeline_skip_add_file') ?><br />
-			<input type="checkbox" name="skip[]" value="status_change_0" <?= ($skip && in_array('status_change_0', $skip)) ? 'checked' : '' ?>> <?= getMLText('timeline_skip_status_change_0') ?><br />
-			<input type="checkbox" name="skip[]" value="status_change_1" <?= ($skip && in_array('status_change_1', $skip)) ? 'checked' : '' ?>> <?= getMLText('timeline_skip_status_change_1') ?><br />
-			<input type="checkbox" name="skip[]" value="status_change_2" <?= ($skip && in_array('status_change_2', $skip)) ? 'checked' : '' ?>> <?= getMLText('timeline_skip_status_change_2') ?><br />
-			<input type="checkbox" name="skip[]" value="status_change_3" <?= ($skip && in_array('status_change_3', $skip)) ? 'checked' : '' ?>> <?= getMLText('timeline_skip_status_change_3') ?><br />
-			<input type="checkbox" name="skip[]" value="status_change_-1" <?= ($skip && in_array('status_change_-1', $skip)) ? 'checked' : '' ?>> <?= getMLText('timeline_skip_status_change_-1') ?><br />
-			<input type="checkbox" name="skip[]" value="status_change_-3" <?= ($skip && in_array('status_change_-3', $skip)) ? 'checked' : '' ?>> <?= getMLText('timeline_skip_status_change_-3') ?><br />
+			<input type="checkbox" name="skip[]" value="add_file" <?php echo ($skip &&  in_array('add_file', $skip)) ? 'checked' : '' ?>> <?php printMLText('timeline_skip_add_file') ?><br />
+			<input type="checkbox" name="skip[]" value="status_change_0" <?php echo ($skip && in_array('status_change_0', $skip)) ? 'checked' : '' ?>> <?php printMLText('timeline_skip_status_change_0') ?><br />
+			<input type="checkbox" name="skip[]" value="status_change_1" <?php echo ($skip && in_array('status_change_1', $skip)) ? 'checked' : '' ?>> <?php printMLText('timeline_skip_status_change_1') ?><br />
+			<input type="checkbox" name="skip[]" value="status_change_2" <?php echo ($skip && in_array('status_change_2', $skip)) ? 'checked' : '' ?>> <?php printMLText('timeline_skip_status_change_2') ?><br />
+			<input type="checkbox" name="skip[]" value="status_change_3" <?php echo ($skip && in_array('status_change_3', $skip)) ? 'checked' : '' ?>> <?php printMLText('timeline_skip_status_change_3') ?><br />
+			<input type="checkbox" name="skip[]" value="status_change_-1" <?php echo ($skip && in_array('status_change_-1', $skip)) ? 'checked' : '' ?>> <?php printMLText('timeline_skip_status_change_-1') ?><br />
+			<input type="checkbox" name="skip[]" value="status_change_-3" <?php echo ($skip && in_array('status_change_-3', $skip)) ? 'checked' : '' ?>> <?php printMLText('timeline_skip_status_change_-3') ?><br />
 		</div>
 	</div>
 	<div class="control-group">