diff --git a/src/accounting/static/js/account-selector.js b/src/accounting/static/js/account-selector.js
index 20f7922..8ebc416 100644
--- a/src/accounting/static/js/account-selector.js
+++ b/src/accounting/static/js/account-selector.js
@@ -151,8 +151,8 @@ class AccountSelector {
      */
     #getCodesUsedInForm() {
         const inUse = this.#entryEditor.getTransactionForm().getAccountCodesUsed(this.#entryType);
-        if (this.#entryEditor.getAccountCode() !== null) {
-            inUse.push(this.#entryEditor.getAccountCode());
+        if (this.#entryEditor.accountCode !== null) {
+            inUse.push(this.#entryEditor.accountCode);
         }
         return inUse
     }
@@ -199,13 +199,13 @@ class AccountSelector {
         this.#more.classList.remove("d-none");
         this.#filterOptions();
         for (const option of this.#options) {
-            if (option.dataset.code === entryEditor.getAccountCode()) {
+            if (option.dataset.code === entryEditor.accountCode) {
                 option.classList.add("active");
             } else {
                 option.classList.remove("active");
             }
         }
-        if (entryEditor.getAccountCode() === null) {
+        if (entryEditor.accountCode === null) {
             this.#clearButton.classList.add("btn-secondary");
             this.#clearButton.classList.remove("btn-danger");
             this.#clearButton.disabled = true;
diff --git a/src/accounting/static/js/journal-entry-editor.js b/src/accounting/static/js/journal-entry-editor.js
index 35404d4..4804303 100644
--- a/src/accounting/static/js/journal-entry-editor.js
+++ b/src/accounting/static/js/journal-entry-editor.js
@@ -153,6 +153,42 @@ class JournalEntryEditor {
      */
     isNeedOffset = false;
 
+    /**
+     * The ID of the original entry
+     * @type {string|null}
+     */
+    originalEntryId = null;
+
+    /**
+     * The date of the original entry
+     * @type {string|null}
+     */
+    originalEntryDate = null;
+
+    /**
+     * The text of the original entry
+     * @type {string|null}
+     */
+    originalEntryText = null;
+
+    /**
+     * The account code
+     * @type {string|null}
+     */
+    accountCode = null;
+
+    /**
+     * The account text
+     * @type {string|null}
+     */
+    accountText = null;
+
+    /**
+     * The summary
+     * @type {string|null}
+     */
+    summary = null;
+
     /**
      * Constructs a new journal entry editor.
      *
@@ -173,11 +209,9 @@ class JournalEntryEditor {
         this.#accountError = document.getElementById(this.#prefix + "-account-error")
         this.#amount = document.getElementById(this.#prefix + "-amount");
         this.#amountError = document.getElementById(this.#prefix + "-amount-error");
-        this.#originalEntryControl.onclick = () => OriginalEntrySelector.start(this, this.#originalEntry.dataset.id);
+        this.#originalEntryControl.onclick = () => OriginalEntrySelector.start(this, this.originalEntryId);
         this.#originalEntryDelete.onclick = () => this.clearOriginalEntry();
-        this.#summaryControl.onclick = () => {
-            SummaryEditor.start(this, this.#summary.dataset.value);
-        };
+        this.#summaryControl.onclick = () => SummaryEditor.start(this, this.summary);
         this.#accountControl.onclick = () => {
             AccountSelector.start(this, this.entryType);
         }
@@ -189,7 +223,7 @@ class JournalEntryEditor {
                 if (this.entry === null) {
                     this.entry = this.#side.addJournalEntry();
                 }
-                this.entry.save(this.isNeedOffset, this.#originalEntry.dataset.id, this.#originalEntry.dataset.date, this.#originalEntry.dataset.text, this.#account.dataset.code, this.#account.dataset.text, this.#summary.dataset.value, this.#amount.value);
+                this.entry.save(this.isNeedOffset, this.originalEntryId, this.originalEntryDate, this.originalEntryText, this.accountCode, this.accountText, this.summary, this.#amount.value);
                 bootstrap.Modal.getInstance(this.#modal).hide();
             }
             return false;
@@ -205,9 +239,9 @@ class JournalEntryEditor {
         this.isNeedOffset = false;
         this.#originalEntryContainer.classList.remove("d-none");
         this.#originalEntryControl.classList.add("accounting-not-empty");
-        this.#originalEntry.dataset.id = originalEntry.id;
-        this.#originalEntry.dataset.date = originalEntry.date;
-        this.#originalEntry.dataset.text = originalEntry.text;
+        this.originalEntryId = originalEntry.id;
+        this.originalEntryDate = originalEntry.date;
+        this.originalEntryText = originalEntry.text;
         this.#originalEntry.innerText = originalEntry.text;
         this.#setEnableSummaryAccount(false);
         if (originalEntry.summary === "") {
@@ -215,11 +249,11 @@ class JournalEntryEditor {
         } else {
             this.#summaryControl.classList.add("accounting-not-empty");
         }
-        this.#summary.dataset.value = originalEntry.summary;
+        this.summary = originalEntry.summary === ""? null: originalEntry.summary;
         this.#summary.innerText = originalEntry.summary;
         this.#accountControl.classList.add("accounting-not-empty");
-        this.#account.dataset.code = originalEntry.accountCode;
-        this.#account.dataset.text = originalEntry.accountText;
+        this.accountCode = originalEntry.accountCode;
+        this.accountText = originalEntry.accountText
         this.#account.innerText = originalEntry.accountText;
         this.#amount.value = String(originalEntry.netBalance);
         this.#amount.max = String(originalEntry.netBalance);
@@ -235,14 +269,14 @@ class JournalEntryEditor {
         this.isNeedOffset = false;
         this.#originalEntryContainer.classList.add("d-none");
         this.#originalEntryControl.classList.remove("accounting-not-empty");
-        this.#originalEntry.dataset.id = "";
-        this.#originalEntry.dataset.date = "";
-        this.#originalEntry.dataset.text = "";
+        this.originalEntryId = null;
+        this.originalEntryDate = null;
+        this.originalEntryText = null;
         this.#originalEntry.innerText = "";
         this.#setEnableSummaryAccount(true);
         this.#accountControl.classList.remove("accounting-not-empty");
-        this.#account.dataset.code = "";
-        this.#account.dataset.text = "";
+        this.accountCode = null;
+        this.accountText = null;
         this.#account.innerText = "";
         this.#amount.max = "";
     }
@@ -276,7 +310,7 @@ class JournalEntryEditor {
         } else {
             this.#summaryControl.classList.add("accounting-not-empty");
         }
-        this.#summary.dataset.value = summary;
+        this.summary = summary === ""? null: summary;
         this.#summary.innerText = summary;
         this.#validateSummary();
         bootstrap.Modal.getOrCreateInstance(this.#modal).show();
@@ -293,22 +327,13 @@ class JournalEntryEditor {
     saveSummaryWithAccount(summary, accountCode, accountText, isAccountOffsetNeeded) {
         this.isNeedOffset = isAccountOffsetNeeded;
         this.#accountControl.classList.add("accounting-not-empty");
-        this.#account.dataset.code = accountCode;
-        this.#account.dataset.text = accountText;
+        this.accountCode = accountCode;
+        this.accountText = accountText;
         this.#account.innerText = accountText;
         this.#validateAccount();
         this.saveSummary(summary)
     }
 
-    /**
-     * Returns the account code.
-     *
-     * @return {string|null} the account code
-     */
-    getAccountCode() {
-        return this.#account.dataset.code === "" ? null : this.#account.dataset.code;
-    }
-
     /**
      * Clears the account.
      *
@@ -316,8 +341,8 @@ class JournalEntryEditor {
     clearAccount() {
         this.isNeedOffset = false;
         this.#accountControl.classList.remove("accounting-not-empty");
-        this.#account.dataset.code = "";
-        this.#account.dataset.text = "";
+        this.accountCode = null;
+        this.accountText = null;
         this.#account.innerText = "";
         this.#validateAccount();
     }
@@ -332,8 +357,8 @@ class JournalEntryEditor {
     saveAccount(code, text, isOffsetNeeded) {
         this.isNeedOffset = isOffsetNeeded;
         this.#accountControl.classList.add("accounting-not-empty");
-        this.#account.dataset.code = code;
-        this.#account.dataset.text = text;
+        this.accountCode = code;
+        this.accountText = text;
         this.#account.innerText = text;
         this.#validateAccount();
     }
@@ -382,7 +407,7 @@ class JournalEntryEditor {
      * @return {boolean} true if valid, or false otherwise
      */
     #validateAccount() {
-        if (this.#account.dataset.code === "") {
+        if (this.accountCode === null) {
             this.#accountControl.classList.add("is-invalid");
             this.#accountError.innerText = A_("Please select the account.");
             return false;
@@ -446,20 +471,20 @@ class JournalEntryEditor {
         this.#originalEntryContainer.classList.add("d-none");
         this.#originalEntryControl.classList.remove("accounting-not-empty");
         this.#originalEntryControl.classList.remove("is-invalid");
-        this.#originalEntry.dataset.id = "";
-        this.#originalEntry.dataset.date = "";
-        this.#originalEntry.dataset.text = "";
+        this.originalEntryId = null;
+        this.originalEntryDate = null;
+        this.originalEntryText = null;
         this.#originalEntry.innerText = "";
         this.#setEnableSummaryAccount(true);
         this.#summaryControl.classList.remove("accounting-not-empty");
         this.#summaryControl.classList.remove("is-invalid");
-        this.#summary.dataset.value = "";
+        this.summary = null;
         this.#summary.innerText = ""
         this.#summaryError.innerText = ""
         this.#accountControl.classList.remove("accounting-not-empty");
         this.#accountControl.classList.remove("is-invalid");
-        this.#account.dataset.code = "";
-        this.#account.dataset.text = "";
+        this.accountCode = null;
+        this.accountText = null;
         this.#account.innerText = "";
         this.#accountError.innerText = "";
         this.#amount.value = "";
@@ -495,9 +520,9 @@ class JournalEntryEditor {
             this.#originalEntryContainer.classList.remove("d-none");
             this.#originalEntryControl.classList.add("accounting-not-empty");
         }
-        this.#originalEntry.dataset.id = originalEntryId;
-        this.#originalEntry.dataset.date = originalEntryDate;
-        this.#originalEntry.dataset.text = originalEntryText;
+        this.originalEntryId = originalEntryId === ""? null: originalEntryId;
+        this.originalEntryDate = originalEntryDate === ""? null: originalEntryDate;
+        this.originalEntryText = originalEntryText === ""? null: originalEntryText;
         this.#originalEntry.innerText = originalEntryText;
         this.#setEnableSummaryAccount(!entry.isMatched && originalEntryId === "");
         if (summary === "") {
@@ -505,15 +530,15 @@ class JournalEntryEditor {
         } else {
             this.#summaryControl.classList.add("accounting-not-empty");
         }
-        this.#summary.dataset.value = summary;
+        this.summary = summary === ""? null: summary;
         this.#summary.innerText = summary;
         if (accountCode === "") {
             this.#accountControl.classList.remove("accounting-not-empty");
         } else {
             this.#accountControl.classList.add("accounting-not-empty");
         }
-        this.#account.dataset.code = accountCode;
-        this.#account.dataset.text = accountText;
+        this.accountCode = accountCode;
+        this.accountText = accountText;
         this.#account.innerText = accountText;
         this.#amount.value = amount;
         const maxAmount = this.#getMaxAmount();
@@ -528,10 +553,10 @@ class JournalEntryEditor {
      * @return {Decimal|null} the max amount
      */
     #getMaxAmount() {
-        if (this.#originalEntry.dataset.id === "") {
+        if (this.originalEntryId === null) {
             return null;
         }
-        return OriginalEntrySelector.getNetBalance(this.entry, this.getTransactionForm(), this.#originalEntry.dataset.id);
+        return OriginalEntrySelector.getNetBalance(this.entry, this.getTransactionForm(), this.originalEntryId);
     }
 
     /**
diff --git a/src/accounting/static/js/summary-editor.js b/src/accounting/static/js/summary-editor.js
index d0badd0..a538bfe 100644
--- a/src/accounting/static/js/summary-editor.js
+++ b/src/accounting/static/js/summary-editor.js
@@ -228,12 +228,12 @@ class SummaryEditor {
      * The callback when the summary editor is shown.
      *
      * @param entryEditor {JournalEntryEditor} the journal entry editor
-     * @param summary {string} the summary
+     * @param summary {string|null} the summary
      */
     #onOpen(entryEditor, summary) {
         this.#entryEditor = entryEditor;
         this.#reset();
-        this.summary.value = summary;
+        this.summary.value = summary === null? "": summary;
         this.#onSummaryChange();
     }
 
@@ -271,7 +271,7 @@ class SummaryEditor {
      * The callback when the summary editor is shown.
      *
      * @param entryEditor {JournalEntryEditor} the journal entry editor
-     * @param summary {string} the summary
+     * @param summary {string|null} the summary
      */
     static start(entryEditor, summary) {
         this.#editors[entryEditor.entryType].#onOpen(entryEditor, summary);
diff --git a/src/accounting/static/js/transaction-form.js b/src/accounting/static/js/transaction-form.js
index 2ff1827..1325790 100644
--- a/src/accounting/static/js/transaction-form.js
+++ b/src/accounting/static/js/transaction-form.js
@@ -961,12 +961,12 @@ class JournalEntrySubForm {
      * Stores the data into the journal entry sub-form.
      *
      * @param isOriginalEntry {boolean} true if this is an original entry, or false otherwise
-     * @param originalEntryId {string} the ID of the original entry
-     * @param originalEntryDate {string} the date of the original entry
-     * @param originalEntryText {string} the text of the original entry
-     * @param accountCode {string} the account code
-     * @param accountText {string} the account text
-     * @param summary {string} the summary
+     * @param originalEntryId {string|null} the ID of the original entry
+     * @param originalEntryDate {string|null} the date of the original entry
+     * @param originalEntryText {string|null} the text of the original entry
+     * @param accountCode {string|null} the account code
+     * @param accountText {string|null} the account text
+     * @param summary {string|null} the summary
      * @param amount {string} the amount
      */
     save(isOriginalEntry, originalEntryId, originalEntryDate, originalEntryText, accountCode, accountText, summary, amount) {
@@ -975,21 +975,21 @@ class JournalEntrySubForm {
         } else {
             this.#offsets.classList.add("d-none");
         }
-        this.#originalEntryId.value = originalEntryId;
-        this.#originalEntryId.dataset.date = originalEntryDate;
-        this.#originalEntryId.dataset.text = originalEntryText;
-        if (originalEntryText === "") {
+        this.#originalEntryId.value = originalEntryId === null? "": originalEntryId;
+        this.#originalEntryId.dataset.date = originalEntryDate === null? "": originalEntryDate;
+        this.#originalEntryId.dataset.text = originalEntryText === null? "": originalEntryText;
+        if (originalEntryText === null) {
             this.#originalEntryText.classList.add("d-none");
             this.#originalEntryText.innerText = "";
         } else {
             this.#originalEntryText.classList.remove("d-none");
             this.#originalEntryText.innerText = A_("Offset %(entry)s", {entry: originalEntryText});
         }
-        this.#accountCode.value = accountCode;
-        this.#accountCode.dataset.text = accountText;
-        this.#accountText.innerText = accountText;
-        this.#summary.value = summary;
-        this.#summaryText.innerText = summary;
+        this.#accountCode.value = accountCode === null? "": accountCode;
+        this.#accountCode.dataset.text = accountText === null? "": accountText;
+        this.#accountText.innerText = accountText === null? "": accountText;
+        this.#summary.value = summary === null? "": summary;
+        this.#summaryText.innerText = summary === null? "": summary;
         this.#amount.value = amount;
         this.#amountText.innerText = formatDecimal(new Decimal(amount));
         this.validate();
diff --git a/src/accounting/templates/accounting/transaction/include/journal-entry-editor-modal.html b/src/accounting/templates/accounting/transaction/include/journal-entry-editor-modal.html
index feac192..4aaff95 100644
--- a/src/accounting/templates/accounting/transaction/include/journal-entry-editor-modal.html
+++ b/src/accounting/templates/accounting/transaction/include/journal-entry-editor-modal.html
@@ -32,7 +32,7 @@ First written: 2023/2/25
             <div class="accounting-entry-editor-original-entry-content">
               <div id="accounting-entry-editor-original-entry-control" class="form-control accounting-clickable accounting-material-text-field" data-bs-toggle="modal" data-bs-target="#accounting-original-entry-selector-modal">
                 <label class="form-label" for="accounting-entry-editor-original-entry">{{ A_("Original Entry") }}</label>
-                <div id="accounting-entry-editor-original-entry" data-id="" data-date="" data-text=""></div>
+                <div id="accounting-entry-editor-original-entry"></div>
               </div>
               <div id="accounting-entry-editor-original-entry-error" class="invalid-feedback"></div>
             </div>
@@ -47,7 +47,7 @@ First written: 2023/2/25
           <div class="mb-3">
             <div id="accounting-entry-editor-summary-control" class="form-control accounting-clickable accounting-material-text-field" data-bs-toggle="modal" data-bs-target="">
               <label class="form-label" for="accounting-entry-editor-summary">{{ A_("Summary") }}</label>
-              <div id="accounting-entry-editor-summary" data-value=""></div>
+              <div id="accounting-entry-editor-summary"></div>
             </div>
             <div id="accounting-entry-editor-summary-error" class="invalid-feedback"></div>
           </div>
@@ -55,7 +55,7 @@ First written: 2023/2/25
           <div class="mb-3">
             <div id="accounting-entry-editor-account-control" class="form-control accounting-clickable accounting-material-text-field" data-bs-toggle="modal" data-bs-target="">
               <label class="form-label" for="accounting-entry-editor-account">{{ A_("Account") }}</label>
-              <div id="accounting-entry-editor-account" data-code="" data-text=""></div>
+              <div id="accounting-entry-editor-account"></div>
             </div>
             <div id="accounting-entry-editor-account-error" class="invalid-feedback"></div>
           </div>