diff --git a/templates/repo/modelsafety/show.tmpl b/templates/repo/modelsafety/show.tmpl
index e98d283c1..a51b8a7f5 100644
--- a/templates/repo/modelsafety/show.tmpl
+++ b/templates/repo/modelsafety/show.tmpl
@@ -819,6 +819,9 @@
             $(`[vvalue="${key}"]`).val(res[key]);
             $(`[vdatajobid="${key}"]`).attr('data-jobid', res[key]);
           }
+          
+          $(`[vfield="Description"]`).text(res['Description'] || '--');
+          $(`[vfield="Parameters"]`).text(res['Parameters'] || '--');
 
           var imageName = res['Image'] || res['EngineName'];
           $(`[vimagetitle="Image"] span`).hide();
diff --git a/web_src/js/standalone/cloudbrainNew.js b/web_src/js/standalone/cloudbrainNew.js
index 170344f7a..aa014802a 100644
--- a/web_src/js/standalone/cloudbrainNew.js
+++ b/web_src/js/standalone/cloudbrainNew.js
@@ -89,7 +89,7 @@
           identifier: "job_name",
           rules: [
             {
-              type: "regExp[/^[a-zA-Z0-9-_]{1,36}$/]",
+              type: "regExp[/^[a-z0-9][a-z0-9-_]{1,34}[a-z0-9-]$/]",
             },
           ],
         },
@@ -97,7 +97,7 @@
           identifier: "display_job_name",
           rules: [
             {
-              type: "regExp[/^[a-zA-Z0-9-_]{1,36}$/]",
+              type: "regExp[/^[a-z0-9][a-z0-9-_]{1,34}[a-z0-9-]$/]",
             },
           ],
         },