diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index cd8bf09c3..7181a2b62 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -706,7 +706,7 @@
          **/
         function transContent($content) {
             // 에디터 컴포넌트를 찾아서 결과 코드로 변환
-            $content = preg_replace_callback('!<div([^\>]*)editor_component=([^\>]*?)>([^\>]*?)\<\/div\>!is', array($this,'_transEditorComponent'), $content);
+            $content = preg_replace_callback('!<div([^\>]*)editor_component=([^\>]*)>(.*?)\<\/div\>!is', array($this,'_transEditorComponent'), $content);
             $content = preg_replace_callback('!<img([^\>]*)editor_component=([^\>]*?)\>!is', array($this,'_transEditorComponent'), $content);
 
             // <br> 코드 변환
@@ -726,6 +726,7 @@
             // IE에서는 태그의 특성중에서 " 를 빼어 버리는 경우가 있기에 정규표현식으로 추가해줌
             $buff = $matches[0];
             $buff = preg_replace('/([^=^"^ ]*)=([^"])([^=^ ]*)/i', '$1="$2$3"', $buff);
+            $buff = str_replace("&","&amp;",$buff);
 
             // 플러그인에서 생성된 코드 (img, div태그내에 plugin코드 존재)의 parameter를 추출
             $oXmlParser = new XmlParser();
diff --git a/modules/editor/components/naver_map/naver_map.class.php b/modules/editor/components/naver_map/naver_map.class.php
index 085670eb7..5eefe367f 100644
--- a/modules/editor/components/naver_map/naver_map.class.php
+++ b/modules/editor/components/naver_map/naver_map.class.php
@@ -139,7 +139,8 @@
 
             if($x&&$y) $html .= 'mapObj.setCenterAndZoom(new NPoint('.$x.','.$y.'),3);';
 
-            $html .= 'mapObj.enableWheelZoom();'.
+            $html .= ''.
+                     //'mapObj.enableWheelZoom();'.
                      'NEvent.addListener(mapObj, "click", function(pos) { if(typeof(top.mapClicked)!="undefined") top.mapClicked(pos); });'.
                      'NEvent.addListener(mapObj, "mouseup", function(pos) { if(typeof(top.mapClicked)!="undefined") top.mapClicked(pos); });'.
                      '</script>'.
diff --git a/modules/editor/tpl/js/editor.js b/modules/editor/tpl/js/editor.js
index 87aaae5ff..0d00128a9 100755
--- a/modules/editor/tpl/js/editor.js
+++ b/modules/editor/tpl/js/editor.js
@@ -150,7 +150,6 @@ function editorGetSelectedNode(upload_target_srl) {
 
 // 에디터 내의 선택된 부분의 html코드를 변경
 function editorReplaceHTML(iframe_obj, html) {
-    html += "\n";
     iframe_obj.contentWindow.focus();
     if(xIE4Up) {
         var range = iframe_obj.contentWindow.document.selection.createRange();