diff --git a/modules/torrents/client/controllers/admin/admin-list.client.controller.js b/modules/torrents/client/controllers/admin/admin-list.client.controller.js
index 6f6f52c4..ecc97a4a 100644
--- a/modules/torrents/client/controllers/admin/admin-list.client.controller.js
+++ b/modules/torrents/client/controllers/admin/admin-list.client.controller.js
@@ -210,24 +210,8 @@
     vm.getTagTitle = function (tag) {
       var tmp = tag;
       var find = false;
-      var r = undefined;
 
-      switch (vm.selectedType) {
-        case 'tvserial':
-          r = vm.resourcesTags.tv;
-          break;
-        case 'music':
-          r = vm.resourcesTags.music;
-          break;
-        case 'other':
-          r = vm.resourcesTags.other;
-          break;
-        default:
-          r = vm.resourcesTags.movie;
-      }
-
-
-      angular.forEach(r.radio, function (item) {
+      angular.forEach(vm.resourcesTags.radio, function (item) {
         angular.forEach(item.value, function (sitem) {
           if (sitem.name === tag) {
             tmp = item.name;
@@ -237,7 +221,7 @@
       });
 
       if (!find) {
-        angular.forEach(r.checkbox, function (item) {
+        angular.forEach(vm.resourcesTags.checkbox, function (item) {
           angular.forEach(item.value, function (sitem) {
             if (sitem.name === tag) {
               tmp = item.name;
diff --git a/modules/torrents/client/views/admin/admin-list.client.view.html b/modules/torrents/client/views/admin/admin-list.client.view.html
index 6316066a..e5e68ed6 100644
--- a/modules/torrents/client/views/admin/admin-list.client.view.html
+++ b/modules/torrents/client/views/admin/admin-list.client.view.html
@@ -79,62 +79,31 @@
                     </dd>
 
                     <div class="more-tags panel-collapsed" style="display: none;">
-                        <div ng-if="vm.selectedType=='movie'">
-                            <div ng-repeat="item in vm.resourcesTags.movie.radio">
-                                <dt class="h-line">{{ 'RESOURCESTAGS.'+item.name+'.SELF' | translate}}：</dt>
-                                <dd class="h-line">
-                                    <div class="btn-group btn-group-xs" role="group">
-                                        <button ng-repeat="sitem in item.value" id="tag_{{sitem.name}}"
-                                                class="btn btn-xs btn-default btn-tag" value="{{sitem.name}}"
-                                                ng-click="vm.onRadioTagClicked($event, sitem.name)">
-                                            {{ 'RESOURCESTAGS.' + item.name + '.' + sitem.name | translate}}
-                                        </button>
-                                    </div>
-                                </dd>
-                            </div>
-
-                            <div ng-repeat="item in vm.resourcesTags.movie.checkbox">
-                                <dt class="h-line">{{ 'RESOURCESTAGS.'+item.name+'.SELF' | translate}}：</dt>
-                                <dd class="h-line">
-                                    <div class="btn-group btn-group-xs" role="group">
-                                        <button ng-repeat="sitem in item.value" id="tag_{{sitem.name}}"
-                                                class="btn btn-xs btn-default btn-tag" value="{{sitem.name}}"
-                                                ng-click="vm.onCheckboxTagClicked($event, sitem.name)"
-                                                toggle-class="btn-success" base-class="btn-default" onclick="this.blur();">
-                                            {{ 'RESOURCESTAGS.' + item.name + '.' + sitem.name | translate}}
-                                        </button>
-                                    </div>
-                                </dd>
-                            </div>
+                        <div ng-repeat="item in vm.resourcesTags.radio | filter:vm.selectedType">
+                            <dt class="h-line">{{ 'RESOURCESTAGS.'+item.name+'.SELF' | translate}}：</dt>
+                            <dd class="h-line">
+                                <div class="btn-group btn-group-xs" role="group">
+                                    <button ng-repeat="sitem in item.value" id="tag_{{sitem.name}}"
+                                            class="btn btn-xs btn-default btn-tag" value="{{sitem.name}}"
+                                            ng-click="vm.onRadioTagClicked($event, sitem.name)">
+                                        {{ 'RESOURCESTAGS.' + item.name + '.' + sitem.name | translate}}
+                                    </button>
+                                </div>
+                            </dd>
                         </div>
 
-                        <div ng-if="vm.selectedType=='tvserial'">
-                            <div ng-repeat="item in vm.resourcesTags.tv.radio">
-                                <dt class="h-line">{{ 'RESOURCESTAGS.'+item.name+'.SELF' | translate}}：</dt>
-                                <dd class="h-line">
-                                    <div class="btn-group btn-group-xs" role="group">
-                                        <button ng-repeat="sitem in item.value" id="tag_{{sitem.name}}"
-                                                class="btn btn-xs btn-default btn-tag" value="{{sitem.name}}"
-                                                ng-click="vm.onRadioTagClicked($event, sitem.name)">
-                                            {{ 'RESOURCESTAGS.' + item.name + '.' + sitem.name | translate}}
-                                        </button>
-                                    </div>
-                                </dd>
-                            </div>
-
-                            <div ng-repeat="item in vm.resourcesTags.tv.checkbox">
-                                <dt class="h-line">{{ 'RESOURCESTAGS.'+item.name+'.SELF' | translate}}：</dt>
-                                <dd class="h-line">
-                                    <div class="btn-group btn-group-xs" role="group">
-                                        <button ng-repeat="sitem in item.value" id="tag_{{sitem.name}}"
-                                                class="btn btn-xs btn-default btn-tag" value="{{sitem.name}}"
-                                                ng-click="vm.onCheckboxTagClicked($event, sitem.name)"
-                                                toggle-class="btn-success" base-class="btn-default" onclick="this.blur();">
-                                            {{ 'RESOURCESTAGS.' + item.name + '.' + sitem.name | translate}}
-                                        </button>
-                                    </div>
-                                </dd>
-                            </div>
+                        <div ng-repeat="item in vm.resourcesTags.checkbox | filter:vm.selectedType">
+                            <dt class="h-line">{{ 'RESOURCESTAGS.'+item.name+'.SELF' | translate}}：</dt>
+                            <dd class="h-line">
+                                <div class="btn-group btn-group-xs" role="group">
+                                    <button ng-repeat="sitem in item.value" id="tag_{{sitem.name}}"
+                                            class="btn btn-xs btn-default btn-tag" value="{{sitem.name}}"
+                                            ng-click="vm.onCheckboxTagClicked($event, sitem.name)"
+                                            toggle-class="btn-success" base-class="btn-default" onclick="this.blur();">
+                                        {{ 'RESOURCESTAGS.' + item.name + '.' + sitem.name | translate}}
+                                    </button>
+                                </div>
+                            </dd>
                         </div>
                     </div>
                 </dl>