diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index c3339a0a138..a7fcf6f0d0f 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -920,7 +920,7 @@ class ImportXlsx extends ModeleImports
 								if (empty($keyfield)) {
 									$keyfield = 'rowid';
 								}
-								$sqlSelect .= "WHERE ".$keyfield." = ".((int) $lastinsertid);
+								$sqlSelect .= " WHERE ".$keyfield." = ".((int) $lastinsertid);
 
 								$resql = $this->db->query($sqlSelect);
 								if ($resql) {
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index c4eb34ce1e5..05d1dd89a88 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -1120,7 +1120,7 @@ if ($step == 4 && $datatoimport) {
 		$j = 0;
 		foreach ($optionsall as $tmpcode => $tmpval) {	// Loop on each entry to add into each combo list.
 			$label = '';
-			if ($tmpval['picto']) {
+			if (!empty($tmpval['picto'])) {
 				$label .= img_picto('', $tmpval['picto'], 'class="pictofixedwidth"');
 			}
 			$label .= $tmpval['required'] ? '<strong>' : '';