diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 1d8b3836071..dd1b9fbaa95 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -942,12 +942,19 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 		// We discard showing according to filters
 		if ($search_keyword) {
 			$qualified = 0;
-			if (preg_match('/'.preg_quote($search_keyword, '/').'/i', $modulename)
-				|| preg_match('/'.preg_quote($search_keyword, '/').'/i', $moduletechnicalname)
-				|| ($moduledesc && preg_match('/'.preg_quote($search_keyword, '/').'/i', $moduledesc))
-				|| ($moduledesclong && preg_match('/'.preg_quote($search_keyword, '/').'/i', $moduledesclong))
-				|| ($moduleauthor && preg_match('/'.preg_quote($search_keyword, '/').'/i', $moduleauthor))
-			) {
+			$search_keyword_array = explode(' ', $search_keyword);
+			$foundkeyword = 1;
+			foreach ($search_keyword_array as $word) {
+				if (!preg_match('/'.preg_quote($word, '/').'/i', $modulename)
+					&& !preg_match('/'.preg_quote($word, '/').'/i', $moduletechnicalname)
+					&& !($moduledesc && preg_match('/'.preg_quote($word, '/').'/i', $moduledesc))
+					&& !($moduledesclong && preg_match('/'.preg_quote($word, '/').'/i', $moduledesclong))
+					&& !($moduleauthor && preg_match('/'.preg_quote($word, '/').'/i', $moduleauthor))
+				) {
+					$foundkeyword = 0;
+				}
+			}
+			if ($foundkeyword) {
 				$qualified = 1;
 			}
 			if (!$qualified) {
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index 6d65c5a0eff..df98a34250b 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -352,7 +352,15 @@ class modBlockedLog extends DolibarrModules
 			// Special message for France
 			if ($mysoc->country_code == 'FR') {
 				$islne = isALNEQualifiedVersion(1, 1);
-				$versionbadge = '<span class="badge-text badge-secondary">'.DOL_VERSION.'</span>';
+
+				$versionbadge = '<span class="badge-text badge-secondary">'.getBlockedLogVersionToShow();
+				/*
+				if ($mysoc->country_code == 'FR' && !constant('CERTIF_LNE')) {
+					// Can add an edditional mention
+					$versionbadge .= ' - '.$langs->trans("NeedAThirdPartyStatement");
+				}
+				*/
+				$versionbadge .= '</span>';
 				if ($islne) {
 					if (preg_match('/\-/', DOL_VERSION)) {
 						// This is an alpha or beta version