diff --git a/mojotrollz/api/database/tags/qq/TAGS_DEL.php b/mojotrollz/api/database/tags/qq/TAGS_DEL.php
new file mode 100644
index 0000000..6cf6b7b
--- /dev/null
+++ b/mojotrollz/api/database/tags/qq/TAGS_DEL.php
@@ -0,0 +1,10 @@
+<?php
+namespace DBD;
+
+class TAGS_DEL extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+'',
+'DELETE FROM mojotrollz_tags WHERE `table` = ? AND id = ? AND type = ?;'
+);}}
+
diff --git a/mojotrollz/api/database/tags/qq/TAGS_GET.php b/mojotrollz/api/database/tags/qq/TAGS_GET.php
index d2753bb..ca2823e 100644
--- a/mojotrollz/api/database/tags/qq/TAGS_GET.php
+++ b/mojotrollz/api/database/tags/qq/TAGS_GET.php
@@ -4,9 +4,10 @@ namespace DBD;
 class TAGS_GET extends \SYSTEM\DB\QP {
     protected static function query(){
         return new \SYSTEM\DB\QQuery(get_class(),
-'SELECT * FROM mojotrollz_tags 
- LEFT JOIN mojotrollz_tags_type ON mojotrollz_tags.type=mojotrollz_tags_type.id
- LEFT JOIN mojotrollz_tags_value ON mojotrollz_tags.type=mojotrollz_tags_value.type, mojotrollz_tags.value=mojotrollz_tags_value.id
- WHERE table = ? and id = ?;'
+'',
+'SELECT mojotrollz_tags.id,mojotrollz_tags.`table`,mojotrollz_tags.`type`,mojotrollz_tags.`value`,mojotrollz_tags.`comment`,mojotrollz_tags_type.`name` as type_name, mojotrollz_tags_type.`description` as type_desc, mojotrollz_tags_value.`value` as value_name, mojotrollz_tags_value.`description` as value_desc FROM mojotrollz_tags '.
+' LEFT JOIN mojotrollz_tags_type ON mojotrollz_tags.type=mojotrollz_tags_type.id '.
+' LEFT JOIN mojotrollz_tags_value ON mojotrollz_tags.type=mojotrollz_tags_value.type AND mojotrollz_tags.value=mojotrollz_tags_value.id '.
+' WHERE mojotrollz_tags_type.`table` = ? AND mojotrollz_tags.id = ?;'
 );}}
 
diff --git a/mojotrollz/api/database/tags/qq/TAGS_SET.php b/mojotrollz/api/database/tags/qq/TAGS_SET.php
index 3f97ea9..1445547 100644
--- a/mojotrollz/api/database/tags/qq/TAGS_SET.php
+++ b/mojotrollz/api/database/tags/qq/TAGS_SET.php
@@ -4,6 +4,7 @@ namespace DBD;
 class TAGS_SET extends \SYSTEM\DB\QP {
     protected static function query(){
         return new \SYSTEM\DB\QQuery(get_class(),
-'INSERT INTO mojotrollz_tags (table, id, type, value) VALUES(?,?,?,?) ON DUPLICATE KEY UPDATE value=VALUES(value);'
+'',
+'INSERT INTO mojotrollz_tags (`table`, id, type, value) VALUES(?,?,?,?) ON DUPLICATE KEY UPDATE value=VALUES(value);'
 );}}
 
diff --git a/mojotrollz/api/database/tags/tags.php b/mojotrollz/api/database/tags/tags.php
index 2de9e65..1edf77f 100644
--- a/mojotrollz/api/database/tags/tags.php
+++ b/mojotrollz/api/database/tags/tags.php
@@ -17,6 +17,9 @@ class tags {
         if($comment){
             return \DBD\TAGS_SET_COMMENT::QI(array($table, $id, $type, $value, $comment));}
         return \DBD\TAGS_SET::QI(array($table, $id, $type, $value));}
+    
+    public static function del($table, $id, $type){
+        return \DBD\TAGS_DEL::QI(array($table, $id, $type));}
         
     public static function comment($table, $id, $type, $comment){
         return \DBD\TAGS_COMMENT::QI(array($table, $id, $type, $comment));}
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_creature/db_creatures.sql b/mojotrollz/sai/saimod_mojotrollz_db_creature/db_creatures.sql
index 74e2171..1841a61 100644
--- a/mojotrollz/sai/saimod_mojotrollz_db_creature/db_creatures.sql
+++ b/mojotrollz/sai/saimod_mojotrollz_db_creature/db_creatures.sql
@@ -1,3 +1,9 @@
 INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (5300, 42, 0, 0, 'saimod_mojotrollz_db_creature', 'action', NULL); 
+
 INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (5310, 42, 3, 5300, 'search', 'search', 'STRING');
-INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (5315, 42, 3, 5300, 'creature', 'id', 'UINT');
\ No newline at end of file
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (5311, 42, 3, 5300, 'search', 'tags', 'JSON');
+
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (5315, 42, 3, 5300, 'creature', 'id', 'UINT');
+
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (5320, 42, 2, 5300, 'tag', 'id', 'UINT');
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (5321, 42, 2, 5300, 'tag', 'tags', 'JSON');
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_creature/js/saimod_mojotrollz_db_creature.js b/mojotrollz/sai/saimod_mojotrollz_db_creature/js/saimod_mojotrollz_db_creature.js
index c2beef2..0ea8ce9 100644
--- a/mojotrollz/sai/saimod_mojotrollz_db_creature/js/saimod_mojotrollz_db_creature.js
+++ b/mojotrollz/sai/saimod_mojotrollz_db_creature/js/saimod_mojotrollz_db_creature.js
@@ -1,14 +1,39 @@
 function init_saimod_mojotrollz_db_creature(){
     $('#search').click(function(e){
         e.preventDefault();
-        $('#content-wrapper').load(SAI_ENDPOINT + 'sai_mod=saimod_mojotrollz_db_creature&action=search&search=' + $('#filter').val(),function(){
+        var tags = {};
+        $('.tag_filter option:selected').each(function(){
+            var type = $(this).attr('_type');
+            tags[type] = $(this).val();});
+        $('#content-wrapper').load(SAI_ENDPOINT + 'sai_mod=saimod_mojotrollz_db_creature&action=search&search=' + $('#filter').val()+'&tags='+ JSON.stringify(tags),function(){
             init_saimod_mojotrollz_db_creature();
         });
     });
-    $('.sai_table_row').click(function(){
-        var entry = $(this).attr('sai_table_row');
-        $('#content-wrapper').load(SAI_ENDPOINT + 'sai_mod=saimod_mojotrollz_db_creature&action=creature&id=' + entry,function(){
-            map(1,entry);
-        });
+    $('.wow_creature').click(function(){
+        load_creature($(this).attr('_id'));
+    });
+}
+
+function load_creature(id){
+    $('#content-wrapper').load(SAI_ENDPOINT + 'sai_mod=saimod_mojotrollz_db_creature&action=creature&id=' + id,function(){
+        $('#btn_edit').click(function(e){
+            e.preventDefault();
+            var tags = {};
+            $('.tag_filter option:selected').each(function(){
+                var type = $(this).attr('_type');
+                tags[type] = $(this).val();});
+            $.ajax({    type :'GET',
+                        url  : SAI_ENDPOINT+'sai_mod=saimod_mojotrollz_db_creature&action=tag'+
+                                '&id='+id+
+                                '&tags='+JSON.stringify(tags),
+                    success : function(data) {
+                        if(data.status){
+                            load_creature(id);
+                        }else{
+                            alert('Problem: '+data);}
+                    }
+            });
+        });
+        map(1,id);
     });
 }
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_creature/saimod_mojotrollz_db_creature.php b/mojotrollz/sai/saimod_mojotrollz_db_creature/saimod_mojotrollz_db_creature.php
index 095f8f2..5f88857 100644
--- a/mojotrollz/sai/saimod_mojotrollz_db_creature/saimod_mojotrollz_db_creature.php
+++ b/mojotrollz/sai/saimod_mojotrollz_db_creature/saimod_mojotrollz_db_creature.php
@@ -1,10 +1,19 @@
 <?php
 class saimod_mojotrollz_db_creature extends \SYSTEM\SAI\SaiModule {
     public static function sai_mod_saimod_mojotrollz_db_creature_action_search($search,$tags=null){
-        return self::sai_mod_saimod_mojotrollz_db_creature('%'.$search.'%',$tags);}
+        return self::sai_mod_saimod_mojotrollz_db_creature($search,$tags);}
     
+    public static function sai_mod_saimod_mojotrollz_db_creature_action_tag($id,$tags){
+        $tags = json_decode($tags,true);
+        foreach ($tags as $type=>$value){
+            if($value == -2){
+                tags::del(tags::TAG_TABLE_CREATURE, $id, $type);}
+            tags::set(tags::TAG_TABLE_CREATURE, $id, $type, $value);}
+        return JsonResult::ok();
+    }
+        
     public static function sai_mod_saimod_mojotrollz_db_creature_action_creature($id){
-        $def = array('additional_tables' => array(  '\DBD\DB_CREATURE_TEMPLATE_CREATURE_LOOT' => array('key' => 'LootId', 'caption' => 'Loot'),
+        /*$def = array('additional_tables' => array(  '\DBD\DB_CREATURE_TEMPLATE_CREATURE_LOOT' => array('key' => 'LootId', 'caption' => 'Loot'),
                                                     '\DBD\DB_CREATURE_TEMPLATE_CREATURE_TEMPLATE_ADDON' => array('key' => 'Entry', 'caption' => 'Template Addon'),
                                                     '\DBD\DB_CREATURE_TEMPLATE_CREATURE_TEMPLATE_SPELLS' => array('key' => 'Entry', 'caption' => 'Template Spells'),
                                                     '\DBD\DB_CREATURE_TEMPLATE_CREATURE_QUESTRELATION' => array('key' => 'Entry', 'caption' => 'Questrelation'),
@@ -15,16 +24,36 @@ class saimod_mojotrollz_db_creature extends \SYSTEM\SAI\SaiModule {
                                                     '\DBD\DB_CREATURE_TEMPLATE_CREATURE_EQUIP_TEMPLATE_RAW' => array('key' => 'Entry', 'caption' => 'Equip Template Raw'),
                                                     '\DBD\DB_CREATURE_TEMPLATE_CREATURE_EQUIP_TEMPLATE' => array('key' => 'Entry', 'caption' => 'Equip Template'),
                                                     '\DBD\DB_CREATURE_TEMPLATE_CREATURE_AI_SCRIPTS' => array('key' => 'Entry', 'caption' => 'AI Scripts'),
-                                                    '\DBD\DB_CREATURE_TEMPLATE_CREATURE_MOVEMENT_TEMPLATE' => array('key' => 'Entry', 'caption' => 'Movement Template'),));
+                                                    '\DBD\DB_CREATURE_TEMPLATE_CREATURE_MOVEMENT_TEMPLATE' => array('key' => 'Entry', 'caption' => 'Movement Template'),));*/        
+        $vars = array();
+        $vars['entries'] = $vars['tag_entries'] = '';
+        
+        $vars['map'] = map::generate(1,$id);
         
-        $result = map::generate(1,$id).'<table class="sai_table">';
         $base_row = \DBD\DB_CREATURE_TEMPLATE_CREATURE::Q1(array($id));
         foreach($base_row as $key=>$value){
-            $result .= '<tr><td>'.$key.'</td><td>'.$value.'</td></tr>';}
-        $result .= '</table>';
+            $vars['entries'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_creature/tpl/creature_base.tpl'), array('key' => $key, 'value' => $value));}        
         
+        //Creature Tags
+        $tags_res = tags::get(tags::TAG_TABLE_CREATURE, $base_row['Entry']);
+        $tags = array();
+        while($tag = $tags_res->next()){
+            $tags[$tag['type']] = $tag;}
         
-        foreach($def['additional_tables'] as $key=>$value){
+        //Tag Types
+        $tags_types = tags::get_type(tags::TAG_TABLE_CREATURE);
+        while($tag = $tags_types->next()){
+            $tag['options'] = '';
+            $tags_values = tags::get_value($tag['id']);
+            while($value = $tags_values->next()){
+                $value['selected'] = '';
+                if( array_key_exists($value['type'], $tags) &&
+                    $tags[$value['type']]['value'] == $value['id']){
+                    $value['selected'] = 'selected';}
+                $tag['options'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_creature/tpl/tag_entry_option.tpl'), $value);}
+            $vars['tag_entries'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_creature/tpl/tag_creature_entry.tpl'), $tag);}
+            
+        /*foreach($def['additional_tables'] as $key=>$value){
             $result .= '<h4>'.$value['caption'].'</h4><table class="sai_table">';
             $res = \call_user_func($key.'::QQ',array($base_row[$value['key']]));
             $first = true;
@@ -43,25 +72,58 @@ class saimod_mojotrollz_db_creature extends \SYSTEM\SAI\SaiModule {
             }
             $result .= '</table>';
             
-        }
+        }*/
         
-        return $result;
+        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_creature/tpl/creature.tpl'), $vars);
     }
     public static function sai_mod_saimod_mojotrollz_db_creature($search='%',$tags=null){        
         $vars = array();
+        $vars['search'] = $search;
         $vars['entries'] = $vars['tag_entries'] = '';
         
-        $tags = tags::get_type(tags::TAG_TABLE_CREATURE);
-        while($tag = $tags->next()){
+        $tags = json_decode($tags,true);
+        new INFO(print_r($tags,true));
+        if(!$tags){
+            $tags = array();}
+        
+        $tags_types = tags::get_type(tags::TAG_TABLE_CREATURE);
+        while($tag = $tags_types->next()){
             $tag['options'] = '';
             $tags_values = tags::get_value($tag['id']);
             while($value = $tags_values->next()){
+                $value['selected'] = '';
+                if( array_key_exists($value['type'], $tags) &&
+                    $tags[$value['type']] == $value['id']){
+                    $value['selected'] = 'selected';}
                 $tag['options'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_creature/tpl/tag_entry_option.tpl'), $value);}
             $vars['tag_entries'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_creature/tpl/tag_entry.tpl'), $tag);}
         
-        $res = \DBD\DB_CREATURE_TEMPLATE_SEARCH::QQ(array($search,$search,$search));
+        $sql_join = $sql_where = '';
+        foreach($tags as $type=>$value){
+            new INFO($type.' '.$value);
+            if($value == -1){
+                continue;}
+            if($value == -2){
+                $sql_where .= 'entry NOT IN (SELECT id FROM host_mojotrollz.mojotrollz_tags WHERE `table` = '.tags::TAG_TABLE_CREATURE.' AND `type` = '.$type.') AND ';
+                continue;}
+            $sql_join  .= 'LEFT JOIN host_mojotrollz.mojotrollz_tags as t'.$type.' ON creature_template.Entry = t'.$type.'.id ';
+            $sql_where .= 't'.$type.'.`table` = 1 AND t'.$type.'.`type` = '.$type.' AND t'.$type.'.value = '.$value.' AND ';
+        }
+        new INFO('SELECT creature_template.* FROM creature_template '.
+                                $sql_join.
+                                ' WHERE '.$sql_where.
+                                ' (`Entry` LIKE ? OR `Name` LIKE ? OR `Subname` LIKE ?) LIMIT 100;');
+        $con = new \SYSTEM\DB\Connection(new \DBD\mangos_world());
+        $res = $con->prepare(   'search-creature',
+                                'SELECT creature_template.* FROM creature_template '.
+                                $sql_join.
+                                ' WHERE '.$sql_where.
+                                ' (`Entry` LIKE ? OR `Name` LIKE ? OR `Subname` LIKE ?) LIMIT 100;',
+                                array($search,$search,$search));
+        //$res = \DBD\DB_CREATURE_TEMPLATE_SEARCH::QQ(array($search,$search,$search));
         while($row = $res->next()){
             $vars['entries'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_creature/tpl/search_entry.tpl'), $row);}
+            
         return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_creature/tpl/search.tpl'), $vars);
     }
     
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_creature/tpl/creature.tpl b/mojotrollz/sai/saimod_mojotrollz_db_creature/tpl/creature.tpl
new file mode 100644
index 0000000..ba4a1aa
--- /dev/null
+++ b/mojotrollz/sai/saimod_mojotrollz_db_creature/tpl/creature.tpl
@@ -0,0 +1,15 @@
+<div style="float: left;">
+    ${map}
+</div>
+<table class="sai_table" style="float: left; margin-left: 25px;">
+    <tr>
+        <th>TagType</th>
+        <th>TagTypeValue</th>
+    </tr>
+    ${tag_entries}
+</table>
+<button class="btn btn-danger" type="button" id="btn_edit">Edit</button>
+<div style="clear: both"></div>
+<table class="sai_table">
+${entries}
+</table>
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_creature/tpl/creature_base.tpl b/mojotrollz/sai/saimod_mojotrollz_db_creature/tpl/creature_base.tpl
new file mode 100644
index 0000000..7a42d83
--- /dev/null
+++ b/mojotrollz/sai/saimod_mojotrollz_db_creature/tpl/creature_base.tpl
@@ -0,0 +1,4 @@
+<tr>
+    <td>${key}</td>
+    <td>${value}</td>
+</tr>
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_creature/tpl/search.tpl b/mojotrollz/sai/saimod_mojotrollz_db_creature/tpl/search.tpl
index fff5936..24e4fed 100644
--- a/mojotrollz/sai/saimod_mojotrollz_db_creature/tpl/search.tpl
+++ b/mojotrollz/sai/saimod_mojotrollz_db_creature/tpl/search.tpl
@@ -1,5 +1,5 @@
 <div id="filter_container">
-    <input id="filter" type="text"/>
+    <input id="filter" value="${search}" type="text"/>
     <table class="sai_table">
         <tr>
             <th>TagType</th>
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_creature/tpl/search_entry.tpl b/mojotrollz/sai/saimod_mojotrollz_db_creature/tpl/search_entry.tpl
index 918c32f..85222fb 100644
--- a/mojotrollz/sai/saimod_mojotrollz_db_creature/tpl/search_entry.tpl
+++ b/mojotrollz/sai/saimod_mojotrollz_db_creature/tpl/search_entry.tpl
@@ -1,4 +1,4 @@
-<tr>
+<tr class="wow_creature" _id="${Entry}">
     <td>${Entry}</td>
     <td>${Name}</td>
     <td>${SubName}</td>
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_creature/tpl/tag_creature_entry.tpl b/mojotrollz/sai/saimod_mojotrollz_db_creature/tpl/tag_creature_entry.tpl
new file mode 100644
index 0000000..535a1b8
--- /dev/null
+++ b/mojotrollz/sai/saimod_mojotrollz_db_creature/tpl/tag_creature_entry.tpl
@@ -0,0 +1,9 @@
+<tr>
+    <td>${name}</td>
+    <td>
+        <select class="tag_filter">
+            <option value="-2" _type="${id}">No Tag</option>
+            ${options}
+        </select>
+    </td>
+</tr>
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_creature/tpl/tag_entry.tpl b/mojotrollz/sai/saimod_mojotrollz_db_creature/tpl/tag_entry.tpl
index 036d90c..4cc4f83 100644
--- a/mojotrollz/sai/saimod_mojotrollz_db_creature/tpl/tag_entry.tpl
+++ b/mojotrollz/sai/saimod_mojotrollz_db_creature/tpl/tag_entry.tpl
@@ -1,8 +1,9 @@
 <tr>
     <td>${name}</td>
     <td>
-        <select>
-            <option value="-1">No Filter</option>
+        <select class="tag_filter">
+            <option value="-1" _type="${id}">No Filter</option>
+            <option value="-2" _type="${id}">No Tag</option>
             ${options}
         </select>
     </td>
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_creature/tpl/tag_entry_option.tpl b/mojotrollz/sai/saimod_mojotrollz_db_creature/tpl/tag_entry_option.tpl
index f611c31..4950b9b 100644
--- a/mojotrollz/sai/saimod_mojotrollz_db_creature/tpl/tag_entry_option.tpl
+++ b/mojotrollz/sai/saimod_mojotrollz_db_creature/tpl/tag_entry_option.tpl
@@ -1 +1 @@
-<option value="${id}">${value}</option>
\ No newline at end of file
+<option ${selected} _type="${type}" value="${id}">${value}</option>
\ No newline at end of file