diff --git a/admin/custom-fields.php b/admin/custom-fields.php
index 15742406..d857b074 100644
--- a/admin/custom-fields.php
+++ b/admin/custom-fields.php
@@ -1,7 +1,7 @@
 <?php if(!defined('__TYPECHO_ROOT_DIR__')) exit; ?>
 <?php
 $fields = isset($post) ? $post->getFieldItems() : $page->getFieldItems();
-$defaultFields = isset($post) ? $post->getDefaultFieldItems() : $post->getDefaultFieldItems();
+$defaultFields = isset($post) ? $post->getDefaultFieldItems() : $page->getDefaultFieldItems();
 ?>
                     <section id="custom-field" class="typecho-post-option<?php if (empty($defaultFields) && empty($fields)): ?> fold<?php endif; ?>">
                         <label id="custom-field-expand" class="typecho-label"><i class="i-caret-right"></i> <?php _e('自定义字段'); ?></label>
diff --git a/admin/write-page.php b/admin/write-page.php
index f260728e..92acb854 100644
--- a/admin/write-page.php
+++ b/admin/write-page.php
@@ -38,7 +38,7 @@ Typecho_Widget::widget('Widget_Contents_Page_Edit')->to($page);
                         <textarea style="height: <?php $options->editorSize(); ?>px" autocomplete="off" id="text" name="text" class="w-100 mono"><?php echo htmlspecialchars($page->text); ?></textarea>
                     </p>
                         
-                    <?php Typecho_Plugin::factory('admin/write-page.php')->content($page); ?>
+                    <?php include 'custom-fields.php'; ?>
                     <p class="submit clearfix">
                         <span class="right">
                             <input type="hidden" name="cid" value="<?php $page->cid(); ?>" />
@@ -49,6 +49,8 @@ Typecho_Widget::widget('Widget_Contents_Page_Edit')->to($page);
                             <?php endif; ?>
                         </span>
                     </p>
+                    
+                    <?php Typecho_Plugin::factory('admin/write-page.php')->content($page); ?>
                 </div>
                 <div id="edit-secondary" class="col-mb-12 col-tb-3" role="complementary">
                     <ul class="typecho-option-tabs clearfix">
@@ -141,6 +143,7 @@ if (!$plugged) {
 }
 
 include 'file-upload-js.php';
+include 'custom-fields-js.php';
 Typecho_Plugin::factory('admin/write-page.php')->bottom($page);
 include 'footer.php';
 ?>
diff --git a/var/Typecho/Common.php b/var/Typecho/Common.php
index eb766d8e..4c964c80 100644
--- a/var/Typecho/Common.php
+++ b/var/Typecho/Common.php
@@ -578,9 +578,12 @@ EOF;
 
         if (empty($dom)) {
             $dom = new DOMDocument('1.0', self::$charset);
+            $dom->encoding = self::$charset;
             $dom->xmlStandalone = false;
         }
-        @$dom->loadHTML('<?xml encoding="UTF-8">' . $html);
+        @$dom->loadHTML('<?xml encoding="' . self::$charset . '">'
+            . '<head><meta http-equiv="Content-Type" content="text/html; charset=' . self::$charset . '"/></head><body>' 
+            . $html . '</body>');
 
         foreach($dom->getElementsByTagName('*') as $node){
             $tagName = strtolower($node->tagName);
