diff --git a/include/constants.php b/include/constants.php
index 33bb680c..48e969e8 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -1,6 +1,6 @@
 <?php
 defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.7.23');
-defined('RELEASE_DATE') || define('RELEASE_DATE', '2022-08-21');
+defined('RELEASE_DATE') || define('RELEASE_DATE', '2022-08-22');
 defined('IN_TRACKER') || define('IN_TRACKER', false);
 defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
 defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");
diff --git a/include/functions.php b/include/functions.php
index 13d4e8ad..e9fcbed7 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -216,6 +216,10 @@ function formatAdUrl($adid, $url, $content, $newWindow=true)
 	return formatUrl("adredir.php?id=".$adid."&amp;url=".rawurlencode($url), $newWindow, $content);
 }
 function formatUrl($url, $newWindow = false, $text = '', $linkClass = '') {
+    //Exclude youtube, because [youtube] bbcode
+    if (str_contains($url, 'youtube')) {
+        return $url;
+    }
 	if (!$text) {
 		$text = $url;
 	}
diff --git a/nexus/Field/Field.php b/nexus/Field/Field.php
index 8637d0e0..034b99ad 100644
--- a/nexus/Field/Field.php
+++ b/nexus/Field/Field.php
@@ -420,7 +420,7 @@ JS;
         }
         $result = $rowByRowHtml;
         if (!empty($mixedRowContent)) {
-            $result .= tr($displayName, $mixedRowContent, 1);
+            $result .= tr($displayName, format_comment($mixedRowContent), 1);
         }
         return $result;
     }