diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 824f25995..af9cc874f 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -771,7 +771,10 @@
             $content = preg_replace('/<br([^>\/]*)(\/>|>)/i','<br$1 />', $content);
 
             // <img ...> 코드를 <img ... /> 코드로 변환
-            $content = preg_replace('/<img([^>^\/]*)(\/>|>)/i','<img$1 />', $content);
+            $content = preg_replace('/<img(.*?)(\/){0,1}>/i','<img$1 />', $content);
+
+            // blogapi tool에서 삽입된 코드 삭제
+            //$content = str_replace('atomicselection="true"','',$content);
 
             return $content;
         }
diff --git a/modules/blog/skins/default/view_document.html b/modules/blog/skins/default/view_document.html
index ad07358e3..86af2650b 100644
--- a/modules/blog/skins/default/view_document.html
+++ b/modules/blog/skins/default/view_document.html
@@ -38,7 +38,7 @@
         <div style="color:#888888;float:left;">
             {$lang->tag} :
             <!--@foreach($document->tag_list as $val)-->
-                <a href="{getUrl('search_target','tag','search_keyword',$val,'document_srl','')}">{htmlspecialchars($val)}</a>
+                <a href="{getUrl('search_target','tag','search_keyword',urlencode($val),'document_srl','')}">{htmlspecialchars($val)}</a>
             <!--@end-->
         </div>
         <!--@end-->
diff --git a/modules/board/skins/default/view_document.html b/modules/board/skins/default/view_document.html
index a4bfe96b4..2cdfd5f4f 100644
--- a/modules/board/skins/default/view_document.html
+++ b/modules/board/skins/default/view_document.html
@@ -66,7 +66,7 @@
         <th>{$lang->tag}</th>
         <td>
             <!--@foreach($document->tag_list as $val)-->
-                <a href="{getUrl('search_target','tag','search_keyword',$val,'document_srl','')}">{htmlspecialchars($val)}</a>
+                <a href="{getUrl('search_target','tag','search_keyword',urlencode($val),'document_srl','')}">{htmlspecialchars($val)}</a>
             <!--@end-->
         </td>
     </tr>
diff --git a/plugins/tag_list/skins/blog_tag_list/list.html b/plugins/tag_list/skins/blog_tag_list/list.html
index 9998ead31..70d3a2c99 100644
--- a/plugins/tag_list/skins/blog_tag_list/list.html
+++ b/plugins/tag_list/skins/blog_tag_list/list.html
@@ -16,7 +16,7 @@
         <div class="tag_box">
             <!--@foreach($plugin_info->tag_list as $val)-->
             <div class="tag">
-                <a href="{getUrl('mid',$mid,'search_target','tag','search_keyword',$val->tag)}">{cut_str($val->tag,15,'...')}</a>
+                <a href="{getUrl('mid',$mid,'search_target','tag','search_keyword',urlencode($val->tag))}">{cut_str($val->tag,15,'...')}</a>
             </div>
             <!--@end-->
         </div>