diff --git a/bbs/write_comment_update.php b/bbs/write_comment_update.php
index 474083ec2..cdf1b1679 100644
--- a/bbs/write_comment_update.php
+++ b/bbs/write_comment_update.php
@@ -20,6 +20,8 @@ if (substr_count($wr_content, "&#") > 50) {
 $w = $_POST["w"];
 $wr_name  = trim($_POST['wr_name']);
 $wr_email = '';
+$reply_array = array();
+
 if (!empty($_POST['wr_email']))
     $wr_email = get_email_address(trim($_POST['wr_email']));
 
@@ -85,9 +87,7 @@ if ($w == 'c') // 댓글 입력
     // 댓글 답변
     if ($comment_id)
     {
-        $sql = " select wr_id, wr_parent, wr_comment, wr_comment_reply from $write_table
-                    where wr_id = '$comment_id' ";
-        $reply_array = sql_fetch($sql);
+        $reply_array = get_write($write_table, $comment_id, true);
         if (!$reply_array['wr_id'])
             alert('답변할 댓글이 없습니다.\\n\\n답변하는 동안 댓글이 삭제되었을 수 있습니다.');
 
@@ -341,7 +341,7 @@ delete_cache_latest($bo_table);
 
 $redirect_url = short_url_clean(G5_HTTP_BBS_URL.'/board.php?bo_table='.$bo_table.'&wr_id='.$wr['wr_parent'].'&'.$qstr.'&#c_'.$comment_id);
 
-run_event('comment_update_after', $board, $wr_id, $w, $qstr, $redirect_url, $comment_id);
+run_event('comment_update_after', $board, $wr_id, $w, $qstr, $redirect_url, $comment_id, $reply_array);
 
 goto_url($redirect_url);
 ?>
diff --git a/config.php b/config.php
index 6d7fc1fa9..1d6ae9407 100644
--- a/config.php
+++ b/config.php
@@ -5,7 +5,7 @@
 ********************/
 
 define('G5_VERSION', '그누보드5');
-define('G5_GNUBOARD_VER', '5.4.0.6');
+define('G5_GNUBOARD_VER', '5.4.0.7');
 
 // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음
 define('_GNUBOARD_', true);
diff --git a/css/mobile.css b/css/mobile.css
index 25fc8e3a9..e37088e53 100644
--- a/css/mobile.css
+++ b/css/mobile.css
@@ -215,7 +215,7 @@ a.btn_b03, .btn_b03 {display:inline-block;line-height:28px;border:0;background:t
 a.btn_b03:hover, .btn_b03:hover {}
 a.btn_admin {display:inline-block;color:#d13f4a;font-size:1.4em;text-decoration:none;vertical-align:middle} /* 관리자 전용 버튼 */
 a.btn_admin:focus, a.btn_admin:hover {}
-.fix_btn {position:fixed;bottom:65px;right:15px;background:#3a8afd;width:50px;height:50px;color:#fff;text-align:center;border-radius:50% !important;font-size:1.8em;line-height:50px !important;-webkit-box-shadow:1px 2px 5px rgba(191, 191, 191, 0.4);
+.fix_btn {position:fixed;z-index:99;bottom:65px;right:15px;background:#3a8afd;width:50px;height:50px;color:#fff;text-align:center;border-radius:50% !important;font-size:1.8em;line-height:50px !important;-webkit-box-shadow:1px 2px 5px rgba(191, 191, 191, 0.4);
 -moz-box-shadow:1px 2px 5px rgba(191, 191, 191, 0.4);
 box-shadow:1px 2px 5px rgba(191, 191, 191, 0.4)}
 a.btn,.btn {line-height:35px;width:30px;height:35px;padding:0 5px;text-align:center;font-weight:bold;border:0;font-size:1.4em;
diff --git a/lib/get_data.lib.php b/lib/get_data.lib.php
index 321119471..16f91d4fa 100644
--- a/lib/get_data.lib.php
+++ b/lib/get_data.lib.php
@@ -50,6 +50,8 @@ function get_board_names(){
     global $g5;
 
     static $boards = array();
+	
+	$boards = run_replace('get_board_names_cache', $boards);
 
     if( ! $boards ){
         $sql = " select bo_table from {$g5['board_table']} ";
diff --git a/skin/member/basic/register_form.skin.php b/skin/member/basic/register_form.skin.php
index 506cc2b82..0b38f3653 100644
--- a/skin/member/basic/register_form.skin.php
+++ b/skin/member/basic/register_form.skin.php
@@ -468,10 +468,10 @@ function fregisterform_submit(f)
     return true;
 }
 
-$(function(){
+jQuery(function($){
 	//tooltip
     $(".tooltip_icon").click(function(){
-        $(this).next(".tooltip").fadeIn(400);
+        $(this).next(".tooltip").fadeIn(400).css("display","inline-block");
     }).mouseout(function(){
         $(this).next(".tooltip").fadeOut();
     });
diff --git a/theme/basic/css/mobile.css b/theme/basic/css/mobile.css
index 25fc8e3a9..e37088e53 100644
--- a/theme/basic/css/mobile.css
+++ b/theme/basic/css/mobile.css
@@ -215,7 +215,7 @@ a.btn_b03, .btn_b03 {display:inline-block;line-height:28px;border:0;background:t
 a.btn_b03:hover, .btn_b03:hover {}
 a.btn_admin {display:inline-block;color:#d13f4a;font-size:1.4em;text-decoration:none;vertical-align:middle} /* 관리자 전용 버튼 */
 a.btn_admin:focus, a.btn_admin:hover {}
-.fix_btn {position:fixed;bottom:65px;right:15px;background:#3a8afd;width:50px;height:50px;color:#fff;text-align:center;border-radius:50% !important;font-size:1.8em;line-height:50px !important;-webkit-box-shadow:1px 2px 5px rgba(191, 191, 191, 0.4);
+.fix_btn {position:fixed;z-index:99;bottom:65px;right:15px;background:#3a8afd;width:50px;height:50px;color:#fff;text-align:center;border-radius:50% !important;font-size:1.8em;line-height:50px !important;-webkit-box-shadow:1px 2px 5px rgba(191, 191, 191, 0.4);
 -moz-box-shadow:1px 2px 5px rgba(191, 191, 191, 0.4);
 box-shadow:1px 2px 5px rgba(191, 191, 191, 0.4)}
 a.btn,.btn {line-height:35px;width:30px;height:35px;padding:0 5px;text-align:center;font-weight:bold;border:0;font-size:1.4em;
diff --git a/theme/basic/skin/member/basic/register_form.skin.php b/theme/basic/skin/member/basic/register_form.skin.php
index 506cc2b82..0b38f3653 100644
--- a/theme/basic/skin/member/basic/register_form.skin.php
+++ b/theme/basic/skin/member/basic/register_form.skin.php
@@ -468,10 +468,10 @@ function fregisterform_submit(f)
     return true;
 }
 
-$(function(){
+jQuery(function($){
 	//tooltip
     $(".tooltip_icon").click(function(){
-        $(this).next(".tooltip").fadeIn(400);
+        $(this).next(".tooltip").fadeIn(400).css("display","inline-block");
     }).mouseout(function(){
         $(this).next(".tooltip").fadeOut();
     });
diff --git a/theme/basic/skin/member/basic/style.css b/theme/basic/skin/member/basic/style.css
index 1b5666278..39a474a98 100644
--- a/theme/basic/skin/member/basic/style.css
+++ b/theme/basic/skin/member/basic/style.css
@@ -164,7 +164,7 @@
 
 .tooltip_icon {display:inline-block;vertical-align:baseline;color:#b3b5b8;border:0;font-size:1.4em;background:transparent;cursor:pointer}
 .tooltip_icon:hover {color:#448bf5}
-.tooltip {position:relative;width:auto;color:#fff;background:#000;padding:10px;font-size:small;line-height:18px;display:none;position:absolute;z-index:9;font-weight:normal;margin-left:15px;margin-top:10px}
+.tooltip {position:absolute;width:auto;color:#fff;background:#000;padding:10px;font-size:small;line-height:18px;display:none;z-index:9;font-weight:normal;margin-left:15px;margin-top:10px}
 .tooltip:before {content:"";position:absolute;top:0;left:-10px;width:0;height:0;border-style:solid;border-top:0px solid transparent;border-bottom:10px solid transparent;border-left:0;border-right:10px solid #000}