diff --git a/src/admin/templets/tags_main.htm b/src/admin/templets/tags_main.htm
index a91f0098..87c3b9fa 100644
--- a/src/admin/templets/tags_main.htm
+++ b/src/admin/templets/tags_main.htm
@@ -58,7 +58,7 @@
 								<tr>
 									<td><input type="checkbox" name="ids[]" value="<?php echo $fields['id'];?>"></td>
 									<td>{dede:field.id/}</td>
-									<td><a href="<?php echo $cfg_phpurl;?>/tags.php?/<?php echo $fields['id'];?>/" target="_blank">{dede:field.tag/}</a></td>
+									<td><a href="<?php echo $cfg_phpurl;?>/tags.php?/<?php echo $fields['id'];?>/" target="_blank">{dede:sfield.tag/}</a></td>
 									<td><input type="text" value="<?php echo $fields['count'];?>" id="count<?php echo $fields['id'];?>" class="admin-input-sm"></td>
 									<td><?php echo $fields['total'];?></td>
 									<td><?php echo $fields['addtime'];?></td>
diff --git a/src/system/datalistcp.class.php b/src/system/datalistcp.class.php
index 2bce14dd..91e74138 100755
--- a/src/system/datalistcp.class.php
+++ b/src/system/datalistcp.class.php
@@ -147,59 +147,9 @@ class DataListCP
             }
             return $val;
         }
-        return $this->RemoveXss($val);
+        return RemoveXss($val);
     }
-    function RemoveXss($val)
-    {
-        global $cfg_soft_lang;
-        if ($cfg_soft_lang == 'gb2312') $val = gb2utf8($val);
-        $val = preg_replace('/([\x00-\x08|\x0b-\x0c|\x0e-\x19])/', '', $val);
-        $search = 'abcdefghijklmnopqrstuvwxyz';
-        $search .= 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
-        $search .= '1234567890!@#$%^&*()';
-        $search .= '~`";:?+/={}[]-_|\'\\';
-        for ($i = 0; $i < strlen($search); $i++) {
-            $val = preg_replace('/(&#[xX]0{0,8}'.dechex(ord($search[$i])).';?)/i', $search[$i], $val); //with a ;
-            $val = preg_replace('/(&#0{0,8}'.ord($search[$i]).';?)/', $search[$i], $val); //with a ;
-        }
-        $val = str_replace("`", "‘", $val);
-        $val = str_replace("'", "‘", $val);
-        $val = str_replace("\"", "“", $val);
-        $val = str_replace(",", "，", $val);
-        $val = str_replace("(", "（", $val);
-        $val = str_replace(")", "）", $val);
-        $val = str_replace("flink", "fl*&k", $val);
 
-        $ra1 = array('javascript', 'vbscript', 'expression', 'applet', 'meta', 'xml', 'blink', 'link', 'style', 'script', 'embed', 'object', 'iframe', 'frame', 'frameset', 'ilayer', 'layer', 'bgsound', 'title', 'base');
-        $ra2 = array('onabort', 'onactivate', 'onafterprint', 'onafterupdate', 'onbeforeactivate', 'onbeforecopy', 'onbeforecut', 'onbeforedeactivate', 'onbeforeeditfocus', 'onbeforepaste', 'onbeforeprint', 'onbeforeunload', 'onbeforeupdate', 'onblur', 'onbounce', 'oncellchange', 'onchange', 'onclick', 'oncontrolselect', 'oncopy', 'oncut', 'ondataavailable', 'ondatasetchanged', 'ondatasetcomplete', 'ondblclick', 'ondeactivate', 'ondrag', 'ondragend', 'ondragenter', 'ondragleave', 'ondragover', 'ondragstart', 'ondrop', 'onerror', 'onerrorupdate', 'onfilterchange', 'onfinish', 'onfocus', 'onfocusin', 'onfocusout', 'onhelp', 'onkeydown', 'onkeypress', 'onkeyup', 'onlayoutcomplete', 'onload', 'onlosecapture', 'onmousedown', 'onmouseenter', 'onmouseleave', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onmousewheel', 'onmove', 'onmoveend', 'onmovestart', 'onpaste', 'onpropertychange', 'onreadystatechange', 'onreset', 'onresize', 'onresizeend', 'onresizestart', 'onrowenter', 'onrowexit', 'onrowsdelete', 'onrowsinserted', 'onscroll', 'onselect', 'onselectionchange', 'onselectstart', 'onstart', 'onstop', 'onsubmit', 'onunload');
-        $ra = array_merge($ra1, $ra2);
-        $found = true;
-        while ($found == true) {
-            $val_before = $val;
-            for ($i = 0; $i < sizeof($ra); $i++) {
-                $pattern = '/';
-                for ($j = 0; $j < strlen($ra[$i]); $j++) {
-                    if ($j > 0) {
-                        $pattern .= '(';
-                        $pattern .= '(&#[xX]0{0,8}([9ab]);)';
-                        $pattern .= '|';
-                        $pattern .= '|(&#0{0,8}([9|10|13]);)';
-                        $pattern .= ')*';
-                    }
-                    $pattern .= $ra[$i][$j];
-                }
-                $pattern .= '/i';
-                $replacement = substr($ra[$i], 0, 2).'<x>'.substr($ra[$i], 2);
-                $val = preg_replace($pattern, $replacement, $val);
-                if ($val_before == $val) {
-                    $found = false;
-                }
-            }
-        }
-        $val = str_replace("fl*&k","flink", $val);
-        if ($cfg_soft_lang == 'gb2312') $val = utf82gb($val);
-        return $val;
-    }
     //获取当前页数据列表
     function GetArcList($atts, $refObj = '', $fields = array())
     {
@@ -210,6 +160,7 @@ class DataListCP
         while ($arr = $this->dsql->GetArray('dlist')) {
             $i++;
             $rsArray[$i]  =  $this->XSSClean($arr);
+            $rsArray[$i]['__safe']  =  $arr;
             if ($i >= $this->pagesize) {
                 break;
             }
diff --git a/src/system/dedetemplate.class.php b/src/system/dedetemplate.class.php
index 8ba1a1b5..69ae4260 100755
--- a/src/system/dedetemplate.class.php
+++ b/src/system/dedetemplate.class.php
@@ -710,7 +710,13 @@ class DedeTemplate
                 $cTag->tagValue = $this->CompilerFunction($cTag->GetAtt('function'), $cTag->tagValue);
             }
             $cTag->tagValue = '<'.'?php echo '.$cTag->tagValue.'; ?'.'>';
-        } else if (preg_match("/^key[0-9]{0,}/", $tagname) || preg_match("/^value[0-9]{0,}/", $tagname)) {
+        } else if ($tagname == 'sfield') {
+            $cTag->tagValue = '$fields[\'__safe\'][\''.$varname.'\']';
+            if ($cTag->GetAtt('function') != '') {
+                $cTag->tagValue = $this->CompilerFunction($cTag->GetAtt('function'), $cTag->tagValue);
+            }
+            $cTag->tagValue = '<'.'?php echo '.$cTag->tagValue.'; ?'.'>';
+        }  else if (preg_match("/^key[0-9]{0,}/", $tagname) || preg_match("/^value[0-9]{0,}/", $tagname)) {
             if (preg_match("/^value[0-9]{0,}/", $tagname) && $varname != '') {
                 $cTag->tagValue = '<'.'?php echo '.$this->CompilerArrayVar($tagname, $varname).'; ?'.'>';
             } else {