diff --git a/src/modules/pages/connection/list/list_item/list_item.ts b/src/modules/pages/connection/list/list_item/list_item.ts
index e101629..b072ebd 100644
--- a/src/modules/pages/connection/list/list_item/list_item.ts
+++ b/src/modules/pages/connection/list/list_item/list_item.ts
@@ -58,7 +58,7 @@ export class ListItem extends BI.BasicButton {
                     {
                         type: SignEditor,
                         value: name,
-                        width: 100,
+                        width: 200,
                         invisible: !this.model.isEdit,
                         ref: (_ref: any) => {
                             this.nameEditor = _ref;
diff --git a/src/modules/pages/maintain/forms/components/form.jndi.ts b/src/modules/pages/maintain/forms/components/form.jndi.ts
index e76a278..d1a65ce 100644
--- a/src/modules/pages/maintain/forms/components/form.jndi.ts
+++ b/src/modules/pages/maintain/forms/components/form.jndi.ts
@@ -371,6 +371,12 @@ export class FormJndi extends BI.Widget {
             'java.naming.language': this.form.language.getValue(),
             'java.naming.applet': this.form.applet.getValue(),
         };
+
+        for (const propName in contextHashtable) {
+            if (contextHashtable[propName] === null || contextHashtable[propName] === undefined || contextHashtable[propName] === '') {
+                delete contextHashtable[propName];
+            }
+        }
         
         return {
             connectionId: this.form.connectionName.getValue(),
@@ -378,10 +384,10 @@ export class FormJndi extends BI.Widget {
             connectionType: connectionType.JNDI,
             connectionData: {
                 jndiname: this.form.jndiname.getValue(),
-                originalCharsetName: this.form.newCharsetName.getValue(),
-                newCharsetName: this.form.newCharsetName.getValue(),
+                newCharsetName: this.form.newCharsetName.getValue()[0] || '',
+                originalCharsetName: this.form.newCharsetName.getValue()[0] || '',
                 creator: Dec ? Dec.personal.username : '',
-                contextHashtable: BI.pick(contextHashtable) as ContextHashtable,
+                contextHashtable: contextHashtable as ContextHashtable,
             },
         };
     }