diff --git a/modules/torrents/client/controllers/torrents.client.controller.js b/modules/torrents/client/controllers/torrents.client.controller.js
index aab6edb4..73a3f723 100644
--- a/modules/torrents/client/controllers/torrents.client.controller.js
+++ b/modules/torrents/client/controllers/torrents.client.controller.js
@@ -78,8 +78,14 @@
     vm.getMoviePageInfo = function (p) {
       vm.currPageNumber = p;
 
+      //if searchKey or searchTags has value, the skip=0
+      var skip = vm.topNumber;
+      if (vm.searchKey.trim().length > 0 || vm.searchTags.length > 0) {
+        skip = 0;
+      }
+
       TorrentsService.query({
-        skip: (p - 1) * vm.pageNumber + 0, //vm.topNumber,
+        skip: (p - 1) * vm.pageNumber + skip,
         limit: p * vm.pageNumber,
         keys: vm.searchKey,
         torrent_status: 'reviewed',
diff --git a/modules/torrents/client/controllers/uploads.client.controller.js b/modules/torrents/client/controllers/uploads.client.controller.js
index b03510ed..16ec5cc5 100644
--- a/modules/torrents/client/controllers/uploads.client.controller.js
+++ b/modules/torrents/client/controllers/uploads.client.controller.js
@@ -197,5 +197,9 @@
       $state.reload('torrents.uploads');
       document.body.scrollTop = document.documentElement.scrollTop = 0;
     };
+
+    vm.clearAllCondition = function () {
+      vm.tags = [];
+    };
   }
 }());
diff --git a/modules/torrents/client/views/uploads-torrents.client.view.html b/modules/torrents/client/views/uploads-torrents.client.view.html
index 389ee7f6..6739ae4e 100644
--- a/modules/torrents/client/views/uploads-torrents.client.view.html
+++ b/modules/torrents/client/views/uploads-torrents.client.view.html
@@ -41,7 +41,7 @@
         </div>
     </div>
 
-    <div ng-show="vm.successfully == true" class="row" style="margin-top: 40px;">
+    <div class="row" style="margin-top: 40px;">
         <div class="col-md-12 col-sm-12 col-xs-12">
             <legend class="small-legend" translate="ENTER_TMDB_ID"></legend>
             <div class="col-lg-3 col-md-4 col-sm-5 col-xs-6">
@@ -210,6 +210,11 @@
                         </label>
                     </dd>
                 </div>
+                <div class="margin-top-10">
+                    <dt class="h-line"></dt>
+                    <dd class="h-line"><span class="label label-tag text-uppercase"
+                                             ng-click="vm.clearAllCondition();">{{ 'CLEAR_ALL_CONDITION' | translate}}</span></dd>
+                </div>
             </dl>
         </div>
     </div>