diff --git a/src/app/search/controller/search_criteria_controller.js b/src/app/search/controller/search_criteria_controller.js
index b23ad92c..4952e581 100644
--- a/src/app/search/controller/search_criteria_controller.js
+++ b/src/app/search/controller/search_criteria_controller.js
@@ -80,7 +80,7 @@ angular.module('sb.search').controller('SearchCriteriaController',
                     continue;
                 }
 
-                if (item.type === cItem.type) {
+                if (item.type === cItem.type && item.type !== 'Tags') {
                     $scope.criteria.splice(i, 1);
                 }
             }
diff --git a/src/app/services/criteria/criteria.js b/src/app/services/criteria/criteria.js
index b2b0faa9..65bce048 100644
--- a/src/app/services/criteria/criteria.js
+++ b/src/app/services/criteria/criteria.js
@@ -183,7 +183,15 @@ angular.module('sb.services').service('Criteria',
 
                     criteria.forEach(function (item) {
                         if (parameterMap.hasOwnProperty(item.type)) {
-                            params[parameterMap[item.type]] = item.value;
+                            if (parameterMap[item.type] === 'tags') {
+                                if (!('tags' in params)) {
+                                    params.tags = [item.value];
+                                } else {
+                                    params.tags.push(item.value);
+                                }
+                            } else {
+                                params[parameterMap[item.type]] = item.value;
+                            }
                         }
                     });
                     return params;