diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 54325f97ed4..24afafbb83c 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -448,6 +448,7 @@ if (!empty($force_install_noedit)) {
 			<input type="checkbox"
 				   id="db_create_database"
 				   name="db_create_database"
+				   value="on"
 				<?php
 				$checked = 0;
 				if ($force_install_createdatabase) {
@@ -507,6 +508,7 @@ if (!empty($force_install_noedit)) {
 			<input type="checkbox"
 				   id="db_create_user"
 				   name="db_create_user"
+				   value="on"
 				<?php
 				$checked = 0;
 				if (!empty($force_install_createuser)) {
@@ -596,49 +598,12 @@ if (!empty($force_install_noedit)) {
 </div>
 
 <script type="text/javascript">
-jQuery(document).ready(function() {
-
-	var dbtype = jQuery("#db_type");
-
-	dbtype.change(function () {
-		if (dbtype.val() == 'sqlite' || dbtype.val() == 'sqlite3') {
-			jQuery(".hidesqlite").hide();
-		} else {
-			jQuery(".hidesqlite").show();
-		}
-
-		// Automatically set default database ports and admin user
-		if (dbtype.val() == 'mysql' || dbtype.val() == 'mysqli') {
-			jQuery("#db_port").val(3306);
-			jQuery("#db_user_root").val('root');
-		} else if (dbtype.val() == 'pgsql') {
-			jQuery("#db_port").val(5432);
-			jQuery("#db_user_root").val('postgres');
-		} else if (dbtype.val() == 'mssql') {
-			jQuery("#db_port").val(1433);
-			jQuery("#db_user_root").val('sa');
-		}
-
-	});
-
-	init_needroot();
-	jQuery("#db_create_database").click(function() {
-		console.log("click on db_create_database");
-		init_needroot();
-	});
-	jQuery("#db_create_user").click(function() {
-		console.log("click on db_create_user");
-		init_needroot();
-	});
-	<?php if ($force_install_noedit == 2 && empty($force_install_databasepass)) { ?>
-	jQuery("#db_pass").focus();
-	<?php } ?>
-});
-
 function init_needroot()
 {
 	console.log("init_needroot force_install_noedit=<?php echo $force_install_noedit?>");
-	/*alert(jQuery("#db_create_database").prop("checked")); */
+	console.log(jQuery("#db_create_database").is(":checked"));
+	console.log(jQuery("#db_create_user").is(":checked"));
+
 	if (jQuery("#db_create_database").is(":checked") || jQuery("#db_create_user").is(":checked"))
 	{
 		console.log("init_needroot show root section");
@@ -714,6 +679,47 @@ function jscheckparam()
 
 	return ok;
 }
+
+
+jQuery(document).ready(function() {	// TODO Test $( window ).load(function() to see if the init_needroot work better after a back
+
+	var dbtype = jQuery("#db_type");
+
+	dbtype.change(function () {
+		if (dbtype.val() == 'sqlite' || dbtype.val() == 'sqlite3') {
+			jQuery(".hidesqlite").hide();
+		} else {
+			jQuery(".hidesqlite").show();
+		}
+
+		// Automatically set default database ports and admin user
+		if (dbtype.val() == 'mysql' || dbtype.val() == 'mysqli') {
+			jQuery("#db_port").val(3306);
+			jQuery("#db_user_root").val('root');
+		} else if (dbtype.val() == 'pgsql') {
+			jQuery("#db_port").val(5432);
+			jQuery("#db_user_root").val('postgres');
+		} else if (dbtype.val() == 'mssql') {
+			jQuery("#db_port").val(1433);
+			jQuery("#db_user_root").val('sa');
+		}
+
+	});
+
+	jQuery("#db_create_database").click(function() {
+		console.log("click on db_create_database");
+		init_needroot();
+	});
+	jQuery("#db_create_user").click(function() {
+		console.log("click on db_create_user");
+		init_needroot();
+	});
+	<?php if ($force_install_noedit == 2 && empty($force_install_databasepass)) { ?>
+	jQuery("#db_pass").focus();
+	<?php } ?>
+
+	init_needroot();
+});
 </script>
 
 
diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php
index db93d14b4c7..c107ba9e492 100644
--- a/htdocs/intracommreport/list.php
+++ b/htdocs/intracommreport/list.php
@@ -209,8 +209,8 @@ $formother = new FormOther($db);
 
 $title = $langs->trans('IntracommReportList'.$type);
 
-$sqlfields = 'i.rowid, i.type_declaration, i.type_export, i.periods, i.mode, i.entity';
-$sql = 'SELECT '.$sqlfields;
+$sql = 'SELECT i.rowid, i.type_declaration, i.type_export, i.periods, i.mode, i.entity';
+
 /*
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -220,7 +220,12 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 // Add fields from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
+$sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= $hookmanager->resPrint;
+
+$sqlfields = $sql;
+
 $sql .= ' FROM '.MAIN_DB_PREFIX.'intracommreport as i';
 // if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."intracommreport_extrafields as ef on (i.rowid = ef.fk_object)";
 $sql .= ' WHERE i.entity IN ('.getEntity('intracommreport').')';