diff --git a/mojotrollz/api/database/tags/tags.php b/mojotrollz/api/database/tags/tags.php
index b7a7650..c07c19f 100644
--- a/mojotrollz/api/database/tags/tags.php
+++ b/mojotrollz/api/database/tags/tags.php
@@ -7,6 +7,10 @@ class tags {
     const TAG_TABLE_SPELLS      = 5;
     const TAG_TABLE_PLAYERS     = 6;
     const TAG_TABLE_TOPICS      = 7;
+    
+    public static function statistics($table,$type){   
+    }
+    
     public static function get($table, $id, $type = null){
         if($type){
             return \DBD\TAGS_GET_TYPE::Q1(array($table, $id, $type));}
diff --git a/mojotrollz/api/database/tooltip/tpl/tooltip_object.tpl b/mojotrollz/api/database/tooltip/tpl/tooltip_object.tpl
index bb3d896..99c6d31 100644
--- a/mojotrollz/api/database/tooltip/tpl/tooltip_object.tpl
+++ b/mojotrollz/api/database/tooltip/tpl/tooltip_object.tpl
@@ -1,5 +1 @@
-Player: ${name}(${guid})<br/>
-Race: ${race}<br/>
-Class: ${class}<br/>
-Gender: ${gender}<br/>
-Level: ${level}
\ No newline at end of file
+Object ${name}(${guid})<br/>
\ No newline at end of file
diff --git a/mojotrollz/api/map/qq/MAP_OBJECTS.php b/mojotrollz/api/map/qq/MAP_OBJECTS.php
index c525345..b609363 100644
--- a/mojotrollz/api/map/qq/MAP_OBJECTS.php
+++ b/mojotrollz/api/map/qq/MAP_OBJECTS.php
@@ -8,8 +8,8 @@ class MAP_OBJECTS extends \SYSTEM\DB\QP {
 '',
 //mys
 'SELECT guid as id,map,position_x as x,position_y as y,position_z as z,orientation as o, value as map_name FROM gameobject'.
-' LEFT JOIN host_mojotrollz.mojotrollz_tags_value ON id = map'.
-' WHERE type=1 AND map = ? AND entry=? LIMIT 100;',
+' LEFT JOIN host_mojotrollz.mojotrollz_tags_value ON host_mojotrollz.mojotrollz_tags_value.id = map'.
+' WHERE type=1 AND map = ? AND guid=? LIMIT 100;',
 new \DBD\mangos_world()
 );}}
 
diff --git a/mojotrollz/api/map/qq/MAP_OBJECTS_MAPS.php b/mojotrollz/api/map/qq/MAP_OBJECTS_MAPS.php
index 2f6607a..f17f36f 100644
--- a/mojotrollz/api/map/qq/MAP_OBJECTS_MAPS.php
+++ b/mojotrollz/api/map/qq/MAP_OBJECTS_MAPS.php
@@ -1,15 +1,15 @@
 <?php
 namespace DBD;
 
-class MAP_PLAYERS_MAPS extends \SYSTEM\DB\QP {
+class MAP_OBJECTS_MAPS extends \SYSTEM\DB\QP {
     protected static function query(){
         return new \SYSTEM\DB\QQuery(get_class(),
 //pg            
 '',
 //mys
 'SELECT map, value as map_name FROM gameobject'.
-' LEFT JOIN host_mojotrollz.mojotrollz_tags_value ON id = map'.
-' WHERE type=1 AND creature.id=? GROUP BY map;',
+' LEFT JOIN host_mojotrollz.mojotrollz_tags_value ON host_mojotrollz.mojotrollz_tags_value.id = map'.
+' WHERE type=1 AND gameobject.id=? GROUP BY map;',
 new \DBD\mangos_world()
 );}}
 
diff --git a/mojotrollz/page/user_achievements_menu/tpl/user_achievements_menu.tpl b/mojotrollz/page/user_achievements_menu/tpl/user_achievements_menu.tpl
index 9aa5251..060d2fd 100644
--- a/mojotrollz/page/user_achievements_menu/tpl/user_achievements_menu.tpl
+++ b/mojotrollz/page/user_achievements_menu/tpl/user_achievements_menu.tpl
@@ -17,7 +17,7 @@
 
 <div class="window_bg2" style="float: left; padding: 20px; width: 70%;" id="achievement_list">
     <div style="float: left; width: 50%;">
-        <img width="400" src="http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=default_start&id=help_gnome.png"/>
+        <img width="400" src="http://www.mojotrollz.eu/web/mojotrollz/api.php?call=files&cat=wizard_start&id=help_gnome.png"/>
     </div>
     
     <div style="float: left; width: 50%;">
diff --git a/mojotrollz/sai/autoload.inc b/mojotrollz/sai/autoload.inc
index 9f1dc64..3c54909 100644
--- a/mojotrollz/sai/autoload.inc
+++ b/mojotrollz/sai/autoload.inc
@@ -3,13 +3,12 @@ SYSTEM\autoload::registerFolder(dirname(__FILE__).'','');
 
 SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saimod_mojotrollz_server_handling','');
 \SYSTEM\SAI\sai::register('saimod_mojotrollz_server_handling');
-require_once dirname(__FILE__).'/saimod_mojotrollz_db_creature/autoload.inc.php';
+require_once dirname(__FILE__).'/saimod_mojotrollz_db_creature/autoload.inc';
 SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saimod_mojotrollz_db_item','');
 \SYSTEM\SAI\sai::register('saimod_mojotrollz_db_item');
 SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saimod_mojotrollz_db_quest','');
 \SYSTEM\SAI\sai::register('saimod_mojotrollz_db_quest');
-SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saimod_mojotrollz_db_object','');
-\SYSTEM\SAI\sai::register('saimod_mojotrollz_db_object');
+require_once dirname(__FILE__).'/saimod_mojotrollz_db_object/autoload.inc';
 require_once dirname(__FILE__).'/saimod_mojotrollz_db_player/autoload.inc';
 SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saimod_mojotrollz_db_spell','');
 \SYSTEM\SAI\sai::register('saimod_mojotrollz_db_spell');
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_creature/autoload.inc.php b/mojotrollz/sai/saimod_mojotrollz_db_creature/autoload.inc
similarity index 100%
rename from mojotrollz/sai/saimod_mojotrollz_db_creature/autoload.inc.php
rename to mojotrollz/sai/saimod_mojotrollz_db_creature/autoload.inc
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 5f88857..75e516e 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
@@ -28,7 +28,7 @@ class saimod_mojotrollz_db_creature extends \SYSTEM\SAI\SaiModule {
         $vars = array();
         $vars['entries'] = $vars['tag_entries'] = '';
         
-        $vars['map'] = map::generate(1,$id);
+        $vars['map'] = map::generate(tags::TAG_TABLE_CREATURE,$id);
         
         $base_row = \DBD\DB_CREATURE_TEMPLATE_CREATURE::Q1(array($id));
         foreach($base_row as $key=>$value){
@@ -82,7 +82,6 @@ class saimod_mojotrollz_db_creature extends \SYSTEM\SAI\SaiModule {
         $vars['entries'] = $vars['tag_entries'] = '';
         
         $tags = json_decode($tags,true);
-        new INFO(print_r($tags,true));
         if(!$tags){
             $tags = array();}
         
@@ -100,19 +99,14 @@ class saimod_mojotrollz_db_creature extends \SYSTEM\SAI\SaiModule {
         
         $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 ';
+            $sql_where .= 't'.$type.'.`table` = '.tags::TAG_TABLE_CREATURE.' 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 '.
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_object/autoload.inc b/mojotrollz/sai/saimod_mojotrollz_db_object/autoload.inc
new file mode 100644
index 0000000..5ff040b
--- /dev/null
+++ b/mojotrollz/sai/saimod_mojotrollz_db_object/autoload.inc
@@ -0,0 +1,4 @@
+<?php
+SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
+SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq','DBD');
+\SYSTEM\SAI\sai::register('saimod_mojotrollz_db_object');
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_object/db_objects.sql b/mojotrollz/sai/saimod_mojotrollz_db_object/db_objects.sql
new file mode 100644
index 0000000..6910ff6
--- /dev/null
+++ b/mojotrollz/sai/saimod_mojotrollz_db_object/db_objects.sql
@@ -0,0 +1,9 @@
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (5500, 42, 0, 0, 'saimod_mojotrollz_db_object', 'action', NULL); 
+
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (5510, 42, 3, 5500, 'search', 'search', 'STRING');
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (5511, 42, 3, 5500, 'search', 'tags', 'JSON');
+
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (5515, 42, 3, 5500, 'object', 'id', 'UINT');
+
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (5520, 42, 2, 5500, 'tag', 'id', 'UINT');
+INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (5521, 42, 2, 5500, 'tag', 'tags', 'JSON');
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_object/js/saimod_mojotrollz_db_object.js b/mojotrollz/sai/saimod_mojotrollz_db_object/js/saimod_mojotrollz_db_object.js
new file mode 100644
index 0000000..965d4ed
--- /dev/null
+++ b/mojotrollz/sai/saimod_mojotrollz_db_object/js/saimod_mojotrollz_db_object.js
@@ -0,0 +1,39 @@
+function init_saimod_mojotrollz_db_object(){
+    $('#search').click(function(e){
+        e.preventDefault();
+        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_object&action=search&search=' + $('#filter').val()+'&tags='+ JSON.stringify(tags),function(){
+            init_saimod_mojotrollz_db_object();
+        });
+    });
+    $('.wow_object').click(function(){
+        load_object($(this).attr('_id'));
+    });
+}
+
+function load_object(id){
+    $('#content-wrapper').load(SAI_ENDPOINT + 'sai_mod=saimod_mojotrollz_db_object&action=object&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_object&action=tag'+
+                                '&id='+id+
+                                '&tags='+JSON.stringify(tags),
+                    success : function(data) {
+                        if(data.status){
+                            load_object(id);
+                        }else{
+                            alert('Problem: '+data);}
+                    }
+            });
+        });
+        map(2,id);
+    });
+}
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_object/qq/DB_OBJECT_TEMPLATE_OBJECT.php b/mojotrollz/sai/saimod_mojotrollz_db_object/qq/DB_OBJECT_TEMPLATE_OBJECT.php
new file mode 100644
index 0000000..e50eb17
--- /dev/null
+++ b/mojotrollz/sai/saimod_mojotrollz_db_object/qq/DB_OBJECT_TEMPLATE_OBJECT.php
@@ -0,0 +1,13 @@
+<?php
+namespace DBD;
+
+class DB_OBJECT_TEMPLATE_OBJECT extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+//pg            
+'',
+//mys
+'SELECT * FROM gameobject_template WHERE `Entry` = ?;',
+new \DBD\mangos_world()
+);}}
+
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_object/saimod_mojotrollz_db_object.php b/mojotrollz/sai/saimod_mojotrollz_db_object/saimod_mojotrollz_db_object.php
index 134f8b3..5d9b85f 100644
--- a/mojotrollz/sai/saimod_mojotrollz_db_object/saimod_mojotrollz_db_object.php
+++ b/mojotrollz/sai/saimod_mojotrollz_db_object/saimod_mojotrollz_db_object.php
@@ -1,23 +1,99 @@
 <?php
 class saimod_mojotrollz_db_object extends \SYSTEM\SAI\SaiModule {    
-    public static function sai_mod_saimod_mojotrollz_db_object(){
-        $con = new \SYSTEM\DB\Connection(new \DBD\mangos_world());
-        $res = $con->query('SELECT * FROM gameobject_template LIMIT 100;');
-               
-        $result =   '<table><tr>
-                        <th>entry</th>
-                    </tr>';
-        while($row = $res->next()){
-            $result .= '<tr>
-                        <td>'.$row['entry'].'</td>
-                        </tr>';
+    public static function sai_mod_saimod_mojotrollz_db_object_action_search($search,$tags=null){
+        return self::sai_mod_saimod_mojotrollz_db_object($search,$tags);}
+    
+    public static function sai_mod_saimod_mojotrollz_db_object_action_tag($id,$tags){
+        $tags = json_decode($tags,true);
+        foreach ($tags as $type=>$value){
+            if($value == -2){
+                tags::del(tags::TAG_TABLE_OBJECT, $id, $type);}
+            tags::set(tags::TAG_TABLE_OBJECT, $id, $type, $value);}
+        return JsonResult::ok();
+    }
+        
+    public static function sai_mod_saimod_mojotrollz_db_object_action_object($id){
+        $vars = array();
+        $vars['entries'] = $vars['tag_entries'] = '';
+        
+        $vars['map'] = map::generate(tags::TAG_TABLE_OBJECT,$id);
+        
+        $base_row = \DBD\DB_OBJECT_TEMPLATE_OBJECT::Q1(array($id));
+        foreach($base_row as $key=>$value){
+            $vars['entries'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_object/tpl/object_base.tpl'), array('key' => $key, 'value' => $value));}
+        
+        //Object Tags
+        $tags_res = tags::get(tags::TAG_TABLE_OBJECT, $base_row['entry']);
+        $tags = array();
+        while($tag = $tags_res->next()){
+            $tags[$tag['type']] = $tag;}
+        
+        //Tag Types
+        $tags_types = tags::get_type(tags::TAG_TABLE_OBJECT);
+        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_object/tpl/tag_entry_option.tpl'), $value);}
+            $vars['tag_entries'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_object/tpl/tag_object_entry.tpl'), $tag);}
+
+        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_object/tpl/object.tpl'), $vars);
+    }
+    public static function sai_mod_saimod_mojotrollz_db_object($search='%',$tags=null){
+        $vars = array();
+        $vars['search'] = $search;
+        $vars['entries'] = $vars['tag_entries'] = '';
+        
+        $tags = json_decode($tags,true);
+        if(!$tags){
+            $tags = array();}
+        
+        $tags_types = tags::get_type(tags::TAG_TABLE_OBJECT);
+        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_object/tpl/tag_entry_option.tpl'), $value);}
+            $vars['tag_entries'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_object/tpl/tag_entry.tpl'), $tag);}
+        
+        $sql_join = $sql_where = '';
+        foreach($tags as $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_OBJECT.' AND `type` = '.$type.') AND ';
+                continue;}
+            $sql_join  .= 'LEFT JOIN host_mojotrollz.mojotrollz_tags as t'.$type.' ON gameobject_template.entry = t'.$type.'.id ';
+            $sql_where .= 't'.$type.'.`table` = '.tags::TAG_TABLE_OBJECT.' AND t'.$type.'.`type` = '.$type.' AND t'.$type.'.value = '.$value.' AND ';
         }
-        $result .= '</table>';
-        return $result;}            
+        $con = new \SYSTEM\DB\Connection(new \DBD\mangos_world());
+        $res = $con->prepare(   'search-object',
+                                'SELECT gameobject_template.* FROM gameobject_template '.
+                                $sql_join.
+                                ' WHERE '.$sql_where.
+                                ' (`entry` LIKE ? OR `name` LIKE ?) LIMIT 100;',
+                                array($search,$search));
+        while($row = $res->next()){
+            $vars['entries'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_object/tpl/search_entry.tpl'), $row);}
+            
+        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_object/tpl/search.tpl'), $vars);
+    }            
     public static function html_li_menu(){return '<li><a href="#" saimenu="saimod_mojotrollz_db_object">DB:Objects</a></li><li class="divider"></li>';}
     public static function right_public(){return false;}    
     public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);}
-    public static function sai_mod_saimod_mojotrollz_db_object_flag_js(){return \SYSTEM\LOG\JsonResult::toString(array());}        
-    public static function sai_mod_saimod_mojotrollz_db_object_flag_css(){}
+    public static function sai_mod_saimod_mojotrollz_db_object_flag_js(){return \SYSTEM\LOG\JsonResult::toString(array(
+            \SYSTEM\WEBPATH(new PAPI(),'database/js/wow.js'),
+            \SYSTEM\WEBPATH(new PAPI(),'map/js/map.js'),
+            \SYSTEM\WEBPATH(new PSAI(),'saimod_mojotrollz_db_object/js/saimod_mojotrollz_db_object.js')));}          
+    public static function sai_mod_saimod_mojotrollz_db_object_flag_css(){return \SYSTEM\LOG\JsonResult::toString(array(
+            \SYSTEM\WEBPATH(new PAPI(),'map/css/map.css')));}
 
 }
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_object/tpl/object.tpl b/mojotrollz/sai/saimod_mojotrollz_db_object/tpl/object.tpl
new file mode 100644
index 0000000..ba4a1aa
--- /dev/null
+++ b/mojotrollz/sai/saimod_mojotrollz_db_object/tpl/object.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_object/tpl/object_base.tpl b/mojotrollz/sai/saimod_mojotrollz_db_object/tpl/object_base.tpl
new file mode 100644
index 0000000..7a42d83
--- /dev/null
+++ b/mojotrollz/sai/saimod_mojotrollz_db_object/tpl/object_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_object/tpl/search.tpl b/mojotrollz/sai/saimod_mojotrollz_db_object/tpl/search.tpl
new file mode 100644
index 0000000..326cd76
--- /dev/null
+++ b/mojotrollz/sai/saimod_mojotrollz_db_object/tpl/search.tpl
@@ -0,0 +1,24 @@
+<div id="filter_container">
+    <input id="filter" value="${search}" type="text"/>
+    <table class="sai_table">
+        <tr>
+            <th>TagType</th>
+            <th>TagTypeValue</th>
+        </tr>
+        ${tag_entries}
+    </table>
+    <button class="btn btn-primary" type="button" id="search">Search</button>
+</div>
+<hr/>
+<table class="sai_table">
+    <tr>
+        <th>Entry</th>
+        <th>Name</th>
+        <th>Type</th>
+        <th>DisplayId</th>
+        <th>Faction</th>
+        <th>MinGold</th>
+        <th>MaxGold</th>
+    </tr>
+    ${entries}
+</table>
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_object/tpl/search_entry.tpl b/mojotrollz/sai/saimod_mojotrollz_db_object/tpl/search_entry.tpl
new file mode 100644
index 0000000..c9ba05c
--- /dev/null
+++ b/mojotrollz/sai/saimod_mojotrollz_db_object/tpl/search_entry.tpl
@@ -0,0 +1,9 @@
+<tr class="wow_object" _id="${entry}">
+    <td>${entry}</td>
+    <td>${name}</td>
+    <td>${type}</td>
+    <td>${displayId}</td>
+    <td>${faction}</td>
+    <td>${mingold}</td>
+    <td>${maxgold}</td>
+</tr>
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_object/tpl/tag_entry.tpl b/mojotrollz/sai/saimod_mojotrollz_db_object/tpl/tag_entry.tpl
new file mode 100644
index 0000000..4cc4f83
--- /dev/null
+++ b/mojotrollz/sai/saimod_mojotrollz_db_object/tpl/tag_entry.tpl
@@ -0,0 +1,10 @@
+<tr>
+    <td>${name}</td>
+    <td>
+        <select class="tag_filter">
+            <option value="-1" _type="${id}">No Filter</option>
+            <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_object/tpl/tag_entry_option.tpl b/mojotrollz/sai/saimod_mojotrollz_db_object/tpl/tag_entry_option.tpl
new file mode 100644
index 0000000..4950b9b
--- /dev/null
+++ b/mojotrollz/sai/saimod_mojotrollz_db_object/tpl/tag_entry_option.tpl
@@ -0,0 +1 @@
+<option ${selected} _type="${type}" value="${id}">${value}</option>
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_object/tpl/tag_object_entry.tpl b/mojotrollz/sai/saimod_mojotrollz_db_object/tpl/tag_object_entry.tpl
new file mode 100644
index 0000000..535a1b8
--- /dev/null
+++ b/mojotrollz/sai/saimod_mojotrollz_db_object/tpl/tag_object_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_tags/saimod_mojotrollz_db_tags.php b/mojotrollz/sai/saimod_mojotrollz_db_tags/saimod_mojotrollz_db_tags.php
index 30abc43..140c765 100644
--- a/mojotrollz/sai/saimod_mojotrollz_db_tags/saimod_mojotrollz_db_tags.php
+++ b/mojotrollz/sai/saimod_mojotrollz_db_tags/saimod_mojotrollz_db_tags.php
@@ -5,6 +5,7 @@ class saimod_mojotrollz_db_tags extends \SYSTEM\SAI\SaiModule {
         $elements = '';
         $res = \DBD\DB_TAGS_TYPE_LIST::QQ(array($table));
         while($row = $res->next()){
+            $row['statistics'] = tags::statistics($table,$row['id']);
             $elements .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_tags/tpl/type_list_element.tpl'),$row);}
         return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_tags/tpl/type_list.tpl'),array('table' => $table, 'elements' => $elements));}
     
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_tags/tpl/type_list.tpl b/mojotrollz/sai/saimod_mojotrollz_db_tags/tpl/type_list.tpl
index 7db3e4c..7a31907 100644
--- a/mojotrollz/sai/saimod_mojotrollz_db_tags/tpl/type_list.tpl
+++ b/mojotrollz/sai/saimod_mojotrollz_db_tags/tpl/type_list.tpl
@@ -5,6 +5,7 @@
         <th>table</th>
         <th>name</th>
         <th>description</th>
+        <th>statistic</th>
         <th>action</th>
     </tr>
     <tr>
@@ -12,6 +13,7 @@
         <td>${table}</td>
         <td><input id="input_type_name" type="text"/></td>
         <td><input id="input_type_description" type="text"/></td>
+        <td></td>
         <td><button class="btn btn-danger" id="btn_type_add" _table="${table}">Add</button></td>
     </tr>
     ${elements}
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_tags/tpl/type_list_element.tpl b/mojotrollz/sai/saimod_mojotrollz_db_tags/tpl/type_list_element.tpl
index 33acf02..09ab4fb 100644
--- a/mojotrollz/sai/saimod_mojotrollz_db_tags/tpl/type_list_element.tpl
+++ b/mojotrollz/sai/saimod_mojotrollz_db_tags/tpl/type_list_element.tpl
@@ -3,6 +3,7 @@
     <td>${table}</td>
     <td>${name}</td>
     <td>${description}</td>
+    <td>${statistics}</td>
     <td>
         <button class="btn btn-success btn_type_edit" _id="${id}" _name="${name}" _description="${description}">Edit</button>
         <button class="btn btn-danger btn_type_del" _id="${id}" _table="${table}">Del</button>