diff --git a/admin/admin_conn.php b/admin/admin_conn.php
index 782d7e0..cc49129 100644
--- a/admin/admin_conn.php
+++ b/admin/admin_conn.php
@@ -2,7 +2,7 @@
 define('MAC_ADMIN', preg_replace("|[/\\\]{1,}|",'/',dirname(__FILE__) ) );
 require(MAC_ADMIN."/../inc/conn.php");
 require(MAC_ADMIN.'/../inc/common/phplib.php');
-define('MAC_VERSION','2022.3002');
+define('MAC_VERSION','2022.3003');
 define('MAC_MODULE','admin');
 
 if(strpos($_SERVER["SCRIPT_NAME"],'/admin/')>0){
diff --git a/inc/common/template.php b/inc/common/template.php
index 192e250..bf2c4e7 100644
--- a/inc/common/template.php
+++ b/inc/common/template.php
@@ -58,11 +58,10 @@ function getLink($f,$l,$t,$d,$pg='')
 	    		}
 	    		$strpg='';
 	    		$colarr=array('pg','wd','year','starring','directed','pinyin','letter','ids','area','lang','tag','typeid','classid','order','by');
-	    		
 	    		$valarr=array();
 	    		foreach($colarr as $k=>$v){
 	    			$c = $colarr[$k];
-	    			$valarr[$c] = rawurlencode($this->P[$c]);
+	    			$valarr[$c] = $this->P[$c];
 	    		}
 	    		foreach($d as $k=>$v){
 					$valarr[$k]=$v;
@@ -90,7 +89,7 @@ function getLink($f,$l,$t,$d,$pg='')
 					$str = $r;
 				}
 				$colarr = array('{id}','{pg}','{order}','{by}','{class}','{year}','{letter}','{area}','{lang}');
-				$valarr = array('id'=>$this->P['id'],'pg'=>'1','order'=>$this->P['order'],'by'=>$this->P['by'],'class'=>rawurlencode($this->P['class']),'year'=>rawurlencode($this->P['year']),'letter'=>rawurlencode($this->P['letter']),'area'=>rawurlencode($this->P['area']),'lang'=>rawurlencode($this->P['lang']));
+				$valarr = array('id'=>$this->P['id'],'pg'=>'1','order'=>$this->P['order'],'by'=>$this->P['by'],'class'=>urlencode($this->P['class']),'year'=>urlencode($this->P['year']),'letter'=>urlencode($this->P['letter']),'area'=>urlencode($this->P['area']),'lang'=>urlencode($this->P['lang']));
 				foreach($d as $k=>$v){
 					$valarr[$k]= $v;
 				}