diff --git a/web/app/assets/javascripts/genreSelector.js b/web/app/assets/javascripts/genreSelector.js
index 0aaed1ff0..b92f84fab 100644
--- a/web/app/assets/javascripts/genreSelector.js
+++ b/web/app/assets/javascripts/genreSelector.js
@@ -46,7 +46,7 @@
                 var genreOptionHtml = context.JK.fillTemplate(template, value);
                 $('select', parentSelector).append(genreOptionHtml);
             });
-
+            context.JK.dropdown($('select', parentSelector));
         }
 
         function getSelectedGenres(parentSelector) {
@@ -66,7 +66,8 @@
             $.each(genreList, function(index, value) {
                 values.push(value.toLowerCase());
             });
-            var selectedVal = $('select', parentSelector).val(values);
+
+            $('select', parentSelector).val(values[0]);
         }
 
         function initialize() {
diff --git a/web/app/assets/javascripts/instrumentSelector.js b/web/app/assets/javascripts/instrumentSelector.js
index 10dbd0837..ee53bff13 100644
--- a/web/app/assets/javascripts/instrumentSelector.js
+++ b/web/app/assets/javascripts/instrumentSelector.js
@@ -7,13 +7,13 @@
     "use strict";
 
     context.JK = context.JK || {};
-    context.JK.GenreSelectorHelper = (function() {
+    context.JK.InstrumentSelectorHelper = (function() {
 
         var logger = context.JK.logger;
         var _genres = [];  // will be list of structs: [ {label:xxx, value:yyy}, {...}, ... ]
 
         function loadGenres() {
-            var url = "/api/genres";
+            var url = "/api/instruments";
             $.ajax({
                 type: "GET",
                 url: url,
@@ -39,7 +39,7 @@
 
         function render(parentSelector) {
             $('select', parentSelector).empty();
-            $('select', parentSelector).append('<option value="" class="label">Select Genre</option>');
+            $('select', parentSelector).append('<option value="" class="label">Select Instrument</option>');
             var template = $('#template-genre-option').html();
             $.each(_genres, function(index, value) {
                 // value will be a dictionary entry from _genres: