diff --git a/app/Lib/Tools/ComplexTypeTool.php b/app/Lib/Tools/ComplexTypeTool.php
index 8dfa9aded..2fbb68af8 100644
--- a/app/Lib/Tools/ComplexTypeTool.php
+++ b/app/Lib/Tools/ComplexTypeTool.php
@@ -3,20 +3,77 @@
 class ComplexTypeTool
 {
     private $__refangRegexTable = array(
-        '/^hxxp/i' => 'http',
-        '/^meow/i' => 'http',
-        '/^h\[tt\]p/i' => 'http',
-        '/\[\.\]/' => '.',
-        '/\[dot\]/' => '.',
-        '/\(dot\)/' => '.',
-        '/\\\\\./' => '.',
-        '/\.+/' => '.',
-        '/\[hxxp:\/\/\]/' => 'http://',
-        '/\\\/' => '',
-        '/[\@]/' => '@',
-        '/\[:\]/' => ':'
+        array(
+            'from' => '/^hxxp/i',
+            'to' => 'http',
+            'types' => array('link', 'url')
+        ),
+        array(
+            'from' => '/^meow/i',
+            'to' => 'http',
+            'types' => array('link', 'url')
+        ),
+        array(
+            'from' => '/^h\[tt\]p/i',
+            'to' => 'http',
+            'types' => array('link', 'url')
+        ),
+        array(
+            'from' => '/\[\.\]/',
+            'to' => '.',
+            'types' => array('link', 'url', 'ip-dst', 'ip-src', 'domain|ip', 'domain', 'hostname')
+        ),
+        array(
+            'from' => '/\[dot\]/',
+            'to' => '.',
+            'types' => array('link', 'url', 'ip-dst', 'ip-src', 'domain|ip', 'domain', 'hostname')
+        ),
+        array(
+            'from' => '/\(dot\)/',
+            'to' => '.',
+            'types' => array('link', 'url', 'ip-dst', 'ip-src', 'domain|ip', 'domain', 'hostname')
+        ),
+        array(
+            'from' => '/\\\\\./',
+            'to' => '.',
+            'types' => array('link', 'url', 'ip-dst', 'ip-src', 'domain|ip', 'domain', 'hostname')
+        ),
+        array(
+            'from' => '/\.+/',
+            'to' => '.',
+            'types' => array('link', 'url', 'ip-dst', 'ip-src', 'domain|ip', 'domain', 'hostname')
+        ),
+        array(
+            'from' => '/\[hxxp:\/\/\]/',
+            'to' => 'http://',
+            'types' => array('link', 'url')
+        ),
+        array(
+            'from' => '/\\\/',
+            'to' => ''
+        ),
+        array(
+            'from' => '/[\@]/',
+            'to' => '@',
+            'types' => array('email-src', 'email-dst')
+        ),
+        array(
+            'from' => '/\[:\]/',
+            'to' => ':',
+            'types' => array('url', 'link')
+        )
     );
 
+    public function refangValue($value, $type)
+    {
+        foreach ($this->__refangRegexTable as $regex) {
+            if (!isset($regex['type']) || in_array($type, $regex['types'])) {
+                $value = preg_replace($regex['from'], $regex['to'], $value);
+            }
+        }
+        return $value;
+    }
+
     private $__tlds = array();
 
     public function setTLDs($tlds = array())
@@ -329,8 +386,8 @@ class ComplexTypeTool
     private function __refangInput($input)
     {
         $input['refanged'] = $input['raw'];
-        foreach ($this->__refangRegexTable as $regex => $replacement) {
-            $input['refanged'] = preg_replace($regex, $replacement, $input['refanged']);
+        foreach ($this->__refangRegexTable as $regex) {
+            $input['refanged'] = preg_replace($regex['from'], $regex['to'], $input['refanged']);
         }
         $input['refanged'] = rtrim($input['refanged'], ".");
 		$input['refanged'] = preg_replace_callback(
diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php
index c5ef4005c..8059ee126 100644
--- a/app/Model/Attribute.php
+++ b/app/Model/Attribute.php
@@ -774,6 +774,10 @@ class Attribute extends AppModel
         if (is_array($this->data['Attribute']['value'])) {
             return false;
         }
+        App::uses('ComplexTypeTool', 'Tools');
+        $this->complexTypeTool = new ComplexTypeTool();
+        $this->data['Attribute']['value'] = $this->complexTypeTool->refangValue($this->data['Attribute']['value'], $this->data['Attribute']['type']);
+
 
         if (!empty($this->data['Attribute']['object_id']) && empty($this->data['Attribute']['object_relation'])) {
             return false;