diff --git a/src/static/js/pluginfw/installer.js b/src/static/js/pluginfw/installer.js
index 6cc043b77..127a95aa7 100644
--- a/src/static/js/pluginfw/installer.js
+++ b/src/static/js/pluginfw/installer.js
@@ -64,7 +64,7 @@ exports.search = function(pattern, cb) {
           if (er) return cb(er);
           var res = {};
           for (key in data) {
-              if (/*key.indexOf(plugins.prefix) == 0 &&*/ key.indexOf(pattern) != -1)
+            if (key.indexOf(plugins.prefix) == 0 && key.indexOf(pattern) != -1)
               res[key] = data[key];
           }
           cb(null, {results:res});
diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html
index a0822e87e..7dcb6fa3e 100644
--- a/src/templates/admin/plugins.html
+++ b/src/templates/admin/plugins.html
@@ -60,22 +60,22 @@
         var doUpdate = false;
 
         function updateHandlers() {
-          $("#progress.dialog .close").click(function () {
+          $("#progress.dialog .close").unbind('click').click(function () {
             $("#progress.dialog").hide();
           });
 
-          $("#do-search").click(function () {
+          $("#do-search").unbind('click').click(function () {
             if ($("#search-query")[0].value != "")
               socket.emit("search", $("#search-query")[0].value);
           });
 
-          $(".do-install").click(function (e) {
+          $(".do-install").unbind('click').click(function (e) {
             var row = $(e.target).closest("tr");
             doUpdate = true;
             socket.emit("install", row.find(".name").html());
           });
 
-          $(".do-uninstall").click(function (e) {
+          $(".do-uninstall").unbind('click').click(function (e) {
             var row = $(e.target).closest("tr");
             doUpdate = true;
             socket.emit("uninstall", row.find(".name").html());