diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index b2e93b48b..d0dd6a53c 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -17,6 +17,14 @@
       <option name="KEEP_RPAREN_AND_LBRACE_ON_ONE_LINE" value="true" />
       <option name="PHPDOC_USE_FQCN" value="true" />
     </PHPCodeStyleSettings>
+    <codeStyleSettings language="JavaScript">
+      <option name="BRACE_STYLE" value="2" />
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="IF_BRACE_FORCE" value="3" />
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
     <codeStyleSettings language="PHP">
       <option name="RIGHT_MARGIN" value="320" />
       <option name="BLANK_LINES_AFTER_PACKAGE" value="1" />
diff --git a/application/applicationextension.inc.php b/application/applicationextension.inc.php
index 0a7cf585f..d92e41e49 100644
--- a/application/applicationextension.inc.php
+++ b/application/applicationextension.inc.php
@@ -830,6 +830,10 @@ class RestResult
 
 	/**
 	 * Default constructor - ok!
+	 * 	 
+	 * @param DBObject $oObject The object being reported
+	 * @param string $sAttCode The attribute code (must be valid)
+	 * @return string A scalar representation of the value
 	 */
 	public function __construct()
 	{
diff --git a/core/spreadsheetbulkexport.class.inc.php b/core/spreadsheetbulkexport.class.inc.php
index ad64e6add..a742bc780 100644
--- a/core/spreadsheetbulkexport.class.inc.php
+++ b/core/spreadsheetbulkexport.class.inc.php
@@ -234,7 +234,6 @@ EOF
 			}
 		}
 		$sData = '';
-		$sData .= '<style>table br {mso-data-placement:same-cell;}</style>'; // Trick for Excel: keep line breaks inside the same cell !
 		$sData .= "<table border=\"1\">\n";
 		$sData .= "<tr>\n";
 		foreach($aData as $sLabel)
diff --git a/datamodels/2.x/itop-hub-connector/js/hub.js b/datamodels/2.x/itop-hub-connector/js/hub.js
index cf4387d52..b5f468c3b 100644
--- a/datamodels/2.x/itop-hub-connector/js/hub.js
+++ b/datamodels/2.x/itop-hub-connector/js/hub.js
@@ -138,7 +138,7 @@ $(function()
 				if (this.options.redirect_after_completion_url != '')
 				{
 					var sUrl = this.options.redirect_after_completion_url;
-					window.setTimeout(function() { window.location.href = sUrl; }, 500);					
+					window.setTimeout(function() { window.location.href = sUrl; }, 3000);					
 				}
 			}
 			else
diff --git a/dictionaries/de.dictionary.itop.ui.php b/dictionaries/de.dictionary.itop.ui.php
index 21f13aef2..37f502da5 100644
--- a/dictionaries/de.dictionary.itop.ui.php
+++ b/dictionaries/de.dictionary.itop.ui.php
@@ -1177,7 +1177,7 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
     // Search form
     'UI:Search:Toggle' => 'Ein-/Ausklappen',
     'UI:Search:AutoSubmit:DisabledHint' => 'Automatische Eingabe für diese Klasse deaktiviert',
-	'UI:Search:NoAutoSubmit:ExplainText' => 'Add some criterion on the search box or click the search button to view the objects.~~',
+	'UI:Search:NoAutoSubmit:ExplainText' => 'Fügen Sie ein Kriterium in das Suchfeld ein oder klicken Sie auf die Suchschaltfläche, um die Objekte anzuzeigen.',
     'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Kriterium hinzufügen',
     // - Add new criteria button
     'UI:Search:AddCriteria:List:RecentlyUsed:Title' => 'Kürzlich verwendet',
diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index e64f5056f..2929eea63 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -229,32 +229,38 @@ $(function()
 				}]
 			};
 			// - Retrieve criterion
-			this.elements.criterion_area.find('.sf_criterion_row').each(function(iIdx){
-				var oCriterionRowElem = $(this);
+			var iCurrentCriterionRow = 0;
+			this.elements.criterion_area.find('.sf_criterion_row').each(function (iDomCriterionRowIdx) {
+				var isFirstRow = (iDomCriterionRowIdx === 0),
+					oCriterionRowElem = $(this),
+					oCriteriaRowCriterias = oCriterionRowElem.find('.search_form_criteria');
 
-				if (oCriterionRowElem.find('.search_form_criteria').length == 0 && iIdx > 0)
+				if (oCriteriaRowCriterias.length === 0)
 				{
-					$(this).remove();
+					if (!isFirstRow)
+					{
+						$(this).remove();
+					}
 				}
 				else
 				{
-					oCriterionRowElem.find('.search_form_criteria').each(function ()
-					{
+					oCriteriaRowCriterias.each(function () {
 						var oCriteriaData = $(this).triggerHandler('itop.search.criteria.get_data');
 
 						if (null != oCriteriaData)
 						{
-							if (!oCriterion['or'][iIdx])
+							if (!oCriterion['or'][iCurrentCriterionRow])
 							{
-								oCriterion['or'][iIdx] = {'and': []};
+								oCriterion['or'][iCurrentCriterionRow] = {'and': []};
 							}
-							oCriterion['or'][iIdx]['and'].push(oCriteriaData);
+							oCriterion['or'][iCurrentCriterionRow]['and'].push(oCriteriaData);
 						}
 						else
 						{
 							$(this).remove();
 						}
 					});
+					iCurrentCriterionRow++;
 				}
 			});
 			// - Update search
diff --git a/webservices/export-v2.php b/webservices/export-v2.php
index ef7a70fa6..ae5857aff 100644
--- a/webservices/export-v2.php
+++ b/webservices/export-v2.php
@@ -740,6 +740,7 @@ try
 			else
 			{
 				$oP = new WebPage('iTop export');
+                $oP->add_style("table br { mso-data-placement:same-cell; }"); // Trick for Excel: keep line breaks inside the same cell !
 			}
 			$oP->add_style("body { overflow: auto; }");
 		}