diff --git a/Gemfile b/Gemfile
index 02dff5995..44d8c428d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -51,7 +51,6 @@ gem 'meta-tags', '~> 1.2.5', :require => 'meta_tags'
 gem "haml-rails", '~> 0.3.4'
 gem 'jquery-rails', '~> 2.0.2'
 gem 'ruby-haml-js', '~> 0.0.3'
-gem 'rails-backbone', '~> 0.7.2'
 
 gem 'rack-throttle'
 gem 'rest-client', '~> 1.6.6'
@@ -60,6 +59,7 @@ gem 'attr_encrypted', '1.2.1'
 gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
 
 # AngularJS related stuff
+gem 'underscore-rails'
 gem 'angularjs-rails'
 gem 'ng-rails-csrf'
 gem 'momentjs-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index cac3b44ec..ec77c2116 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -114,7 +114,6 @@ GEM
       warden (~> 1.2.1)
     diff-display (0.0.1)
     diff-lcs (1.1.3)
-    ejs (1.0.0)
     encryptor (1.1.3)
     erubis (2.7.0)
     escape_utils (0.2.4)
@@ -274,10 +273,6 @@ GEM
       activesupport (= 3.2.13)
       bundler (~> 1.0)
       railties (= 3.2.13)
-    rails-backbone (0.7.2)
-      coffee-script (~> 2.2.0)
-      ejs (~> 1.0.0)
-      railties (>= 3.1.0)
     rails3-generators (1.0.0)
       railties (>= 3.0.0)
     rails3-jquery-autocomplete (1.0.11)
@@ -407,6 +402,7 @@ GEM
     uglifier (1.2.7)
       execjs (>= 0.3.0)
       multi_json (~> 1.3)
+    underscore-rails (1.5.1)
     unicorn (4.3.1)
       kgio (~> 2.6)
       rack
@@ -477,7 +473,6 @@ DEPENDENCIES
   pg (~> 0.14.0)
   rack-throttle
   rails (= 3.2.13)
-  rails-backbone (~> 0.7.2)
   rails3-generators
   rails3-jquery-autocomplete (~> 1.0.7)
   rake
@@ -504,6 +499,7 @@ DEPENDENCIES
   trinidad (~> 1.0.2)
   turbo-sprockets-rails3
   uglifier (~> 1.2.4)
+  underscore-rails
   unicorn (~> 4.3.1)
   whenever (~> 0.7.3)
   wikicloth
diff --git a/app/assets/javascripts/angularjs/controllers/build_list_controller.js.erb b/app/assets/javascripts/angularjs/controllers/build_list_controller.js.erb
index 8d0755906..8a3e0754d 100644
--- a/app/assets/javascripts/angularjs/controllers/build_list_controller.js.erb
+++ b/app/assets/javascripts/angularjs/controllers/build_list_controller.js.erb
@@ -26,7 +26,7 @@ RosaABF.controller('BuildListController', ['$scope', '$http', function($scope, $
 
   $scope.updateTypeChanged = function() {
     if (_.indexOf($scope.advisoriable_types, $scope.build_list.update_type) != -1) {
-      if ($scope.advisory) { $scope.search(); }
+      if ($scope.advisory || $scope.term.length > 0) { $scope.search(); }
     } else {
       $scope.attach_advisory = 'no';
     }
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index c662d0421..da4b48c1a 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -9,10 +9,6 @@
 //= require_tree ./lib
 
 //= require underscore
-//= require backbone
-//= require backbone_rails_sync
-//= require backbone_datalink
-//= require backbone/rosa
 
 //= require js-routes
 // require angular
diff --git a/app/models/ability.rb b/app/models/ability.rb
index fd5962a9e..94247a47f 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -173,7 +173,7 @@ class Ability
       cannot [:create, :update, :destroy, :clone], Product, :platform => {:platform_type => 'personal'}
       cannot [:clone], Platform, :platform_type => 'personal'
 
-      # cannot :publish, BuildList, :new_core => false
+      cannot :publish, BuildList, :new_core => false
       cannot :create_container, BuildList, :new_core => false
       cannot(:publish, BuildList) {|build_list| !build_list.can_publish? }