diff --git a/webui/controller/message/note.php b/webui/controller/message/note.php
index 9eab0c97..54a7807f 100644
--- a/webui/controller/message/note.php
+++ b/webui/controller/message/note.php
@@ -20,7 +20,7 @@ class ControllerMessageNote extends Controller {
       if(isset($this->request->post['note']) && isset($this->request->post['id'])) {
 
          if($this->model_search_search->check_your_permission_by_id($this->request->post['id']) == 1) {
-            $this->model_search_message->add_message_note($this->request->post['id'], $_SESSION['uid'], $this->request->post['note']);
+            $this->model_search_message->add_message_note($this->request->post['id'], $_SESSION['uid'], urldecode($this->request->post['note']));
          }
       }
    }
diff --git a/webui/controller/search/helper.php b/webui/controller/search/helper.php
index 301b450a..25f96839 100644
--- a/webui/controller/search/helper.php
+++ b/webui/controller/search/helper.php
@@ -48,7 +48,7 @@ class ControllerSearchHelper extends Controller {
 
       if($this->request->post['searchtype'] == 'expert'){
 
-         if(isset($this->request->post['search']) && preg_match("/(from|to|subject|body|direction|size|date1|date2|attachment|tagnote)\:/", $this->request->post['search'])) {
+         if(isset($this->request->post['search']) && preg_match("/(from|to|subject|body|direction|size|date1|date2|attachment|tag|note)\:/", $this->request->post['search'])) {
             $this->preprocess_post_expert_request($this->request->post);
          }
          else {
diff --git a/webui/controller/search/tag.php b/webui/controller/search/tag.php
index 6e257994..0f03025d 100644
--- a/webui/controller/search/tag.php
+++ b/webui/controller/search/tag.php
@@ -29,7 +29,7 @@ class ControllerSearchTag extends Controller {
             for($i=0; $i<count($ids); $i++) { $q .= ",?"; }
             $q = preg_replace("/^\,/", "", $q);
 
-            $this->model_search_message->bulk_add_message_tag($ids, $_SESSION['uid'], $this->request->post['tag'], $q);
+            $this->model_search_message->bulk_add_message_tag($ids, $_SESSION['uid'], urldecode($this->request->post['tag']), $q);
          }
       }
    }
diff --git a/webui/model/search/search.php b/webui/model/search/search.php
index bea7c740..d507a2a5 100644
--- a/webui/model/search/search.php
+++ b/webui/model/search/search.php
@@ -521,8 +521,8 @@ class ModelSearchSearch extends Model {
             if(isset($tag[$m['id']])) { $m['tag'] = $tag[$m['id']]; } else { $m['tag'] = ''; }
             if(isset($note[$m['id']])) { $m['note'] = $note[$m['id']]; } else { $m['note'] = ''; }
 
-            $m['note'] = strip_tags(urldecode($m['note']));
-            $m['tag'] = strip_tags(urldecode($m['tag']));
+            $m['note'] = preg_replace("/\"/", "*", strip_tags($m['note']));
+            $m['tag'] = preg_replace("/\"/", "*", strip_tags($m['tag']));
 
             array_push($messages, $m);
          }
diff --git a/webui/view/theme/default/templates/search/helper.tpl b/webui/view/theme/default/templates/search/helper.tpl
index 8f583644..bd392989 100644
--- a/webui/view/theme/default/templates/search/helper.tpl
+++ b/webui/view/theme/default/templates/search/helper.tpl
@@ -53,8 +53,8 @@
             <td id="c7_r<?php print $i; ?>" class="resultcell size"><?php print $message['size']; ?></td>
             <td id="c8_r<?php print $i; ?>" class="resultcell end"><?php if($message['spam'] == 1) { ?><i class="spam icon-warning-sign icon-large" title="<?php print $text_spam_flag; ?>"></i><?php } else { ?>&nbsp;<?php } ?></td>
             <td id="c9_r<?php print $i; ?>" class="resultcell end"><?php if($message['attachments'] > 0) { ?><i class="attachment icon-paper-clip icon-large" title="<?php print $text_attachment_flag; ?>"></i><?php } else { ?>&nbsp;<?php } ?></td>
-            <td id="c10_r<?php print $i; ?>" class="resultcell end"><?php if($message['note']) { ?><i class="note icon-file-alt icon-large" title="<?php print $text_notes_flag; ?>"></i><?php } else { ?>&nbsp;<?php } ?></td>
-            <td id="c11_r<?php print $i; ?>" class="resultcell end"><?php if($message['tag']) { ?><i class="tag icon-tags icon-large" title="<?php print $text_tag_flag; ?>"></i><?php } else { ?>&nbsp;<?php } ?></td>
+            <td id="c10_r<?php print $i; ?>" class="resultcell end"><?php if($message['note']) { ?><i class="note icon-file-alt icon-large" title="<?php print $message['note']; ?>"></i><?php } else { ?>&nbsp;<?php } ?></td>
+            <td id="c11_r<?php print $i; ?>" class="resultcell end"><?php if($message['tag']) { ?><i class="tag icon-tags icon-large" title="<?php print $message['tag']; ?>"></i><?php } else { ?>&nbsp;<?php } ?></td>
          <?php if(ENABLE_ON_THE_FLY_VERIFICATION == 1) { if ($message['verification'] == 1) {?>
             <td id="c12_r<?php print $i; ?>" class="resultcell end"><i class="verified icon-ok-sign icon-large" title="<?php print $text_verified_flag; ?>"></i></td>
          <?php } else { ?>