diff --git a/django_files/observatory/views.py b/django_files/observatory/views.py
index 1c5d87ed..8a46784b 100644
--- a/django_files/observatory/views.py
+++ b/django_files/observatory/views.py
@@ -459,12 +459,6 @@ def explore(request, app_name, trade_flow, country1, country2, product, year="20
 
   # Return page without visualization data
 
-  # Making sure we return the product list every time
-  if prod_class == "sitc4":
-    product_list = Sitc4.objects.get_all(lang)
-  else:
-    product_list = Hs4.objects.get_all(lang)
-
   # Record views in redis for "newest viewed pages" visualization
   if settings.REDIS:
     views_image_path = settings.STATIC_URL + "data/" + request_hash_string + ".png"
@@ -506,6 +500,7 @@ def explore(request, app_name, trade_flow, country1, country2, product, year="20
     "country1_3char": countries[0].name_3char if countries[0] else "",
     "country2_3char": countries[1].name_3char if countries[1] else "",
     "product": product,
+    "product_code": product.code if not isinstance(product, basestring) else product,
     "years_available": years_available,
     "year": year,
     "year_start": year_start,
@@ -514,7 +509,6 @@ def explore(request, app_name, trade_flow, country1, country2, product, year="20
     "year2_list": year2_list,
     "year_interval_list": year_interval_list,
     "trade_flow_list": trade_flow_list,
-    "product_list": product_list,
     "api_uri": api_uri,
     "app_type": app_type,
     "redesign_api_uri": redesign_api_uri,
diff --git a/html/explore/index.html b/html/explore/index.html
index c725e048..84bce2df 100644
--- a/html/explore/index.html
+++ b/html/explore/index.html
@@ -40,15 +40,13 @@
   <link rel="stylesheet" href="{{ STATIC_URL }}css/normalize.css">
   <link rel="stylesheet" href="{{ STATIC_URL }}css/style.css?{{ VERSION }}">
   <link rel="stylesheet" href="{{ STATIC_URL }}js/libs/toastr/toastr.min.css" />
-  <link rel="stylesheet" href="{{ STATIC_URL }}js/libs/chosen/chosen.min.css" />
+  <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/select2/3.4.8/select2.css" />
   <link rel="stylesheet" href="{{ STATIC_URL }}js/libs/vizwiz/src/utils.slider.css?{{ VERSION }}" />
   <link rel="stylesheet" href="{{ STATIC_URL }}js/libs/bootstro/bootstro.min.css"/>
   <link rel='stylesheet' type='text/css' href='../media/js/libs/tipsy/tipsy.css'>
 
   <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
 
-  <link rel="stylesheet" href="{{ STATIC_URL }}css/countries.css?{{ VERSION }}" />
-
   <link rel="stylesheet" href="{{ STATIC_URL }}js/libs/jquery-ui/jquery-ui.css" type="text/css" media="all" />
   <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/widgets.css?{{ VERSION }}">
   <!-- VizWiz -->
@@ -142,7 +140,7 @@ <h2 style="margin-left:10px; width:700px;" id="text_title" >{% if title %}{{titl
 
               <button type="button" onclick="update_viz()" class="glyphicon glyphicon-refresh show-partner tooltipbs" data-toggle="tooltip" title="Refresh" data-placement="top" style="float:right; margin-right:10px; width:25px; height:20px; font-size:8px; visibility:hidden;"></button>
 
-                <select data-placeholder="All Countries" id="country1_select" class="chosen-select-deselect" tabindex="-1" style="width:130px">
+                <select data-placeholder="All Countries" id="country1_select" style="width:130px">
 
                 <option value=""></option>
               </select>
@@ -184,7 +182,7 @@ <h2 style="margin-left:10px; width:700px;" id="text_title" >{% if title %}{{titl
 
                 <button type="button" onclick="update_viz();" class="glyphicon glyphicon-refresh show-country-product tooltipbs"  data-toggle="tooltip" title="Refresh" data-placement="top" style="float:right; margin-right:10px; width:25px; height:20px; font-size:8px; visibility:hidden;"></button>
 
-                <select data-placeholder="All Products" id="country_product_select" class="chosen-select-deselect" tabindex="-1" style="width:130px">
+                <select data-placeholder="All Products" id="country_product_select" " style="width:130px">
                 <option value=""></option>
 
                 </select>
@@ -197,7 +195,7 @@ <h2 style="margin-left:10px; width:700px;" id="text_title" >{% if title %}{{titl
 
                  <button type="button" onclick="update_viz();" class="glyphicon glyphicon-refresh show-trade-partner tooltipbs"  data-toggle="tooltip" title="Refresh" data-placement="top" style="float:right; margin-right:10px; width:25px; height:20px; font-size:8px; visibility:hidden;"></button>
 
-                  <select data-placeholder="All Countries" id="country_trade_partner_select" class="chosen-select-deselect" tabindex="-1" style="width:130px;">
+                  <select data-placeholder="All Countries" id="country_trade_partner_select" style="width:130px;">
                     <option value=""></option>
                   </select>
               </div>
@@ -274,8 +272,7 @@ <h2 style="margin-left:10px; width:700px;" id="text_title" >{% if title %}{{titl
 
         <button type="button" onclick="update_viz();" class="glyphicon glyphicon-refresh over-time tooltipbs"  data-toggle="tooltip" title="Refresh" data-placement="top"style="float:right; margin-right:10px; width:25px; height:20px; font-size:8px; visibility:hidden;"></button>
 
-        <div id="year1" style="float:left; margin-left:10px;">
-           <select data-url_pos="5" id="year1_select" class="chosen-select-deselect" data-placeholder="All Countries" style="width:80px;">
+           <select id="year1_select" style="margin-left: 10px;">
             {% for y in year1_list %}
             {% if y == year or y == year_start %}
             <option value="{{y}}" selected="selected">{{ y }}</option>
@@ -284,10 +281,8 @@ <h2 style="margin-left:10px; width:700px;" id="text_title" >{% if title %}{{titl
             {% endif %}
             {% endfor %}
           </select>
-        </div>
 
-        <div id="year2" style="float:left; margin-left:10px;">
-          <select data-placeholder="End" class="chosen-select-deselect" id="year2_select" tabindex="-1" style="display: none;">
+          <select data-placeholder="End " id="year2_select" style="margin-left: 10px;">
             <option value=""></option>
             {% for y in year1_list %}
             {% if y == year_end %}
@@ -297,7 +292,6 @@ <h2 style="margin-left:10px; width:700px;" id="text_title" >{% if title %}{{titl
             {% endif %}
             {% endfor %}
           </select>
-        </div>
       </div>
 
     </div>
@@ -580,17 +574,9 @@ <h1>Click Here To Refresh The Visualization</h1>
               </div>
               <div class="vizControl col-md-4" style="float:left; margin-top:10px; position:relative; z-index:100;">
                 <span class="definition" style="font-weight:bold; display:inline;">Highlight:</span>
-
                 <span id="highlight">
-                {% if app_type = "casy" or app_type = "ccsy" %}
-                    <select data-placeholder="All Producs" id="highlight_select" class="chosen-select-deselect" tabindex="-1" style="display:none;" onchange="highlight();" >
-                    </select>
-                 {% elif app_type = "csay" or app_type = "cspy" or app_type = "sapy" %}
-                  <select data-placeholder="All Countries" id="highlight_select" class="chosen-select-deselect" tabindex="-1" style="display: none;" onchange="highlight();">
-                </select>
-                {% endif %}
+                    <select id="highlight_select" onchange="highlight();" style="width: 140px"><option/></select>
                 </span>
-
               </div>
 
           </div>
@@ -790,9 +776,9 @@ <h1>Click Here To Refresh The Visualization</h1>
 
                    function highlight(value) {
 
+                var v = value ? value : $("#highlight_select").select2("val").trim();
               {% if app_name == "product_space" or app_name == "rings" or app_type = "cspy" %}
 
-                var v = value ? value : $("#highlight").find(":selected").val().trim();
                 d3.select("#viz").call(chart.highlight([]));
                 d3.select("#viz").call(chart.highlight(v));
 
@@ -804,8 +790,6 @@ <h1>Click Here To Refresh The Visualization</h1>
 
               {% if app_name == "pie_scatter" or app_name == "tree_map" or app_name == "stacked"  %}
 
-                var v = value ? value : $("#highlight").find(":selected").val().trim();
-
                 {% if app_type = "casy" %}
 
                 if(v.length>0)
@@ -835,8 +819,7 @@ <h1>Click Here To Refresh The Visualization</h1>
 
               function reset_highlight() {
 
-                $("#highlight").find(":selected").prop("selected", false);
-                $("#highlight_select").trigger("chosen:updated");
+                $("#highlight_select").select2("val", "");
                 queryParameters["highlight"] = "";
                 if(queryActivated)
                   updateURLQueryParameters();
@@ -849,15 +832,7 @@ <h1>Click Here To Refresh The Visualization</h1>
                 <span class="definition" style="font-weight:bold; display:inline;">Highlight:</span>
 
                 <span id="highlight">
-                {% if app_type = "casy" or app_type = "ccsy" %}
-                    <select data-placeholder="All Products" id="highlight_select" class="chosen-select-deselect" tabindex="-1" style="display:none;" onchange="highlight();" >
-                      <option value=""></option>
-                    </select>
-                 {% elif app_type = "csay" or app_type = "cspy" or app_type = "sapy" %}
-                  <select data-placeholder="All Countries" id="highlight_select" class="chosen-select-deselect" tabindex="-1" style="display: none;" onchange="highlight();">
-                  <option value=""></option>
-                </select>
-                {% endif %}
+                    <select id="highlight_select" onchange="highlight();" style="width: 140px"><option/></select>
                 </span>
 
               </div>
@@ -904,7 +879,6 @@ <h1>Click Here To Refresh The Visualization</h1>
         <a style=" margin-left:150px; float:left;" href="http://www.hks.harvard.edu/centers/cid"><img src="media/img/all/logo_cid.png" alt="Center for International Development Logo"/></a>
 
         <div class="language_select" style="float:right; margin-right:150px;">
-
           <div class="text">
             Language:
           </div>
@@ -1044,7 +1018,7 @@ <h4 style="border-bottom: solid 1px #999; font-family:'PT Sans Narrow',Helvetica
   <script src="//s7.addthis.com/js/300/addthis_widget.js"></script>
   <script src="{{ STATIC_URL }}js/libs/bootstrap/js/bootstrap.js"></script>
   <script src="{{ STATIC_URL }}js/libs/bootstro/bootstro.min.js"></script>
-  <script src="{{ STATIC_URL }}js/libs/chosen/chosen.jquery.min.js" ></script>
+  <script src="//cdnjs.cloudflare.com/ajax/libs/select2/3.4.8/select2.min.js" ></script>
 
   <!-- App -->
   <script src="{{ STATIC_URL }}js/explore/general.js?{{ VERSION }}"></script>
@@ -1182,13 +1156,8 @@ <h4 style="border-bottom: solid 1px #999; font-family:'PT Sans Narrow',Helvetica
     previous_image = "{{ STATIC_URL }}/img/empty_static.png",
     static_url = "{{STATIC_URL}}";
 
-  // Use chosen plugin to make dropdowns look fancy
-  $(".dropdown_container select").chosen()
-  $(".nesting select").chosen()
   // language select dropdown
-  $(".language_select select").chosen();
-  $(".language_select .chzn-search").hide();
-  $(".language_select select").chosen().change(function(){
+  $(".language_select select").on("change", function(){
     // set session data to new language
     var language = $(this).val();
     window.location = "/set_language/"+language+"/";
@@ -1222,8 +1191,7 @@ <h4 style="border-bottom: solid 1px #999; font-family:'PT Sans Narrow',Helvetica
     updateURLQueryParameters();
 
     // Put once the visualization is loaded
-    $("#highlight_select").find('[value="'+queryParameters['highlight']+'"]').prop("selected", true);
-    $("#highlight_select").trigger("chosen:updated")
+    $("#highlight_select").select2("val", queryParameters['highlight']);
 
 //    $("input[name='level_detail']").prop("selected", false);
 
@@ -1276,45 +1244,6 @@ <h4 style="border-bottom: solid 1px #999; font-family:'PT Sans Narrow',Helvetica
     // Be sure we came back to the top of the page
     $(this).scrollTop(0);
 
-    $('.chosen-container').css('width', '150px');
-    $('#country1_select_chosen').css('width', '170px');
-    //$('#country1_select_chosen').css('font-size', '18px');
-    $('#year1_select_chosen').css('width', '60px');
-    $('#year2_select_chosen').css('width', '80px');
-
-    $('#country_trade_partner_select_chosen').css('width', '140px');
-    $('#country_product_select_chosen').css('width', '140px');
-
-    $("#country1 select").change(function() {
-      $("#country1_select_chosen .chosen-single span").css("background", "url('{{ STATIC_URL }}img/icons/flag_"+$(this).val()+".png') no-repeat");
-      $("#country1_select_chosen .chosen-single span").css("background-size", "25px");
-      $("#country1_select_chosen .chosen-single span").css("padding-left", "30px");
-      $("#country1_select_chosen .chosen-single span").css("margin-top", "-2px");
-      $("#country1_select_chosen .chosen-single span").css("color", "black");
-    });
-
-    $("#country-trade-partner select").change(function() {
-      $("#country_trade_partner_select_chosen .chosen-single span").css("background", "url('{{ STATIC_URL }}img/icons/flag_"+$(this).val()+".png') no-repeat");
-      $("#country_trade_partner_select_chosen .chosen-single span").css("background-size", "25px");
-      $("#country_trade_partner_select_chosen .chosen-single span").css("padding-left", "30px");
-      $("#country_trade_partner_select_chosen .chosen-single span").css("margin-top", "-2px");
-    });
-
-  // For some reason, $("#country1_select_chosen select").trigger("chosen:updated"); does not work
-  $("#country1_select_chosen .chosen-single span").css("background", "url('{{ STATIC_URL }}img/icons/flag_"+$("#country1 select").val()+".png') no-repeat");
-  $("#country1_select_chosen .chosen-single span").css("background-size", "25px");
-  $("#country1_select_chosen .chosen-single span").css("padding-left", "30px");
-  $("#country1_select_chosen .chosen-single span").css("margin-top", "-2px");
-
-  $("#country1_select_chosen .chosen-results").hover(function() {
-    $("#country1_select_chosen .chosen-results").css("color", "black");
-  });
-
-  $("#country_trade_partner_select_chosen .chosen-single span").css("background", "url('{{ STATIC_URL }}img/icons/flag_"+$("#country-trade-partner select").val()+".png') no-repeat");
-  $("#country_trade_partner_select_chosen .chosen-single span").css("background-size", "25px");
-  $("#country_trade_partner_select_chosen .chosen-single span").css("padding-left", "30px");
-  $("#country_trade_partner_select_chosen .chosen-single span").css("margin-top", "-2px");
-
   $('#myTab a').click(function (e) {
     e.preventDefault()
     $(this).tab('show')
diff --git a/html/template.html b/html/template.html
index 90cf3c45..de9dd424 100644
--- a/html/template.html
+++ b/html/template.html
@@ -16,9 +16,9 @@
   <link href='http://fonts.googleapis.com/css?family=Open+Sans+Condensed:300' rel='stylesheet' type='text/css'>
   <link href='http://fonts.googleapis.com/css?family=PT+Sans+Narrow' rel='stylesheet' type='text/css' />
   <link href='http://fonts.googleapis.com/css?family=Cardo' rel='stylesheet' type='text/css' />
+  <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/select2/3.4.8/select2.css" />
   <link rel="stylesheet" href="media/css/normalize.css">
   <link rel="stylesheet" href="media/css/style.css">	
-  <link rel="stylesheet" href="media/js/libs/chosen/chosen.css" />
 
   <!--[if lt IE 9]>
     <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
@@ -66,20 +66,18 @@ <h2 style="font-size:18px; margin-top:-33px; text-align:center; margin-left:0px;
   </div> <!-- END #container -->
 
   <script src="media/js/libs/jquery/jquery-1.10.2.min.js"></script>	
-	<script src="media/js/libs/chosen/chosen.jquery.min.js" ></script>
   <script src="media/js/libs/bootstrap/js/bootstrap.js"></script>
+  <script src="//cdnjs.cloudflare.com/ajax/libs/select2/3.4.8/select2.min.js" ></script>
 
   <script>
-	
-  	// language select dropdown
-  	$(".language_select select").chosen();
-  	$(".language_select .chzn-search").hide();
-  	$(".language_select select").chosen().change(function(){
-  		// set session data to new language
-  		var language = $(this).val();
-  		window.location = "/set_language/"+language+"/";
-  	});
-  	
+
+  // language select dropdown
+  $(".language_select select").select2();
+  $(".language_select select").on("change", function(){
+    // set session data to new language
+    var language = $(this).val();
+    window.location = "/set_language/"+language+"/";
+  });
     // google analytics
   
     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
diff --git a/media/css/style.css b/media/css/style.css
index b898ced3..9ee8ce8b 100644
--- a/media/css/style.css
+++ b/media/css/style.css
@@ -445,9 +445,6 @@ text-decoration: none;
   float: left;
   z-index: 10000;
 
-}
-.app #main #tool_pane > *{
-
 }
 .app #main #tool_pane h3 {
   font-weight: normal;
@@ -460,31 +457,6 @@ text-decoration: none;
 .app #main .ui-button-text{
   padding: 2px 6px
 }
-.app #main #tool_pane .dropdown_container {
-  clear: both;
-}
-.app #main #tool_pane .dropdown_container select {
-  margin: 0 0 14px 0;
-  width: 163px;
-}
-.app #main #tool_pane .dropdown_container#year_start {
-  float: left;
-  padding-right: 5px;
-  clear: none;
-}
-.app #main #tool_pane .dropdown_container#year_end {
-  float: left;
-  padding-left: 5px;
-  clear: none;
-}
-.app #main #tool_pane .dropdown_container#year_start select,
-.app #main #tool_pane .dropdown_container#year_end select {
-  width: 75px;
-}
-.app #main #tool_pane .chzn-container {
-  cursor: pointer;
-  margin: 0 0 5px 0;
-}
 .app #main #tool_pane button {
   background:#888;
   background:-webkit-gradient(linear, 0% 0%, 0% 100%, from(#888), to(#999));
@@ -500,6 +472,12 @@ text-decoration: none;
   margin: 12px 0;
   height: 0.5px;
 }
+.app #main #tool_pane hr {
+  background: #cccccc;
+  clear: both;
+  margin: 12px 0;
+  height: 0.5px;
+}
 .app #main #tool_pane .control_container {
   margin: 10px 0;
 }
@@ -526,50 +504,6 @@ text-decoration: none;
 .product_class select {
   width: 52px
 }
-.product_class .chzn-container-single .chzn-single {
-  height: 18px;
-  line-height: 18px;
-  padding: 0 0 0 3px;
-}
-.product_class .chzn-container-single .chzn-single div {
-  width: 15px;
-}
-.product_class .chzn-container-single .chzn-single div b {
-  background-position: -1px -3px;
-}
-.product_class .chzn-container-single .chzn-single span {
-  margin-right: 15px;
-}
-.product_class .chzn-container-single .chzn-search {
-  display: none;
-}
-.product_class .chzn-container .chzn-results li {
-  padding: 3px 7px 4px;
-}
-/* Nesting */
-.nesting select {
-  width: 52px
-}
-.nesting .chzn-container-single .chzn-single {
-  height: 18px;
-  line-height: 18px;
-  padding: 0 0 0 3px;
-}
-.nesting .chzn-container-single .chzn-single div {
-  width: 15px;
-}
-.nesting .chzn-container-single .chzn-single div b {
-  background-position: -1px -3px;
-}
-.nesting .chzn-container-single .chzn-single span {
-  margin-right: 15px;
-}
-.nesting .chzn-container-single .chzn-search {
-  display: none;
-}
-.nesting .chzn-container .chzn-results li {
-  padding: 3px 7px 4px;
-}
 
 
 
@@ -1887,18 +1821,6 @@ div.btn_label {
   color: #333333;
 }
 
-#country1 .chosen-results li.active-result, #country-trade-partner .chosen-results li.active-result {
-  background-size:25px;
-  padding-left: 25px;
-  margin-top:-4px;
-}
-
-#country1 .chosen-results li:hover, #country-trade-partner .chosen-results li:hover {
-  background-size:25px;
-  padding-left: 25px;
-  margin-top:-4px;
-  background-color: lightblue;
-}
 
 .divBtn{
   width: 100%;
@@ -1971,16 +1893,6 @@ p .gTerm{
   position:relative;
   z-index:1;
 }
-#highlight{
-
-}
-#highlight .chosen-drop{
-  max-height: 110px;
-}
-#highlight .chosen-drop .chosen-results{
-  max-height: 75px;
-}
-
 table {
   margin: 0px 0 30px 0;
   width: 100%;
diff --git a/media/js/explore/dropdowns.js b/media/js/explore/dropdowns.js
index 9f5352b0..23963351 100644
--- a/media/js/explore/dropdowns.js
+++ b/media/js/explore/dropdowns.js
@@ -7,18 +7,30 @@ $(document).ready(function(){
         url: "http://localhost:8000/api/dropdowns/products/"
     })
     .done(function( data ){
-        for(var i = 0; i < data.length; i++){
-            $("#country_product_select").append("<option value='"+data[i][1]+"'>"+data[i][0]+"</option>");
 
-            if(app_type == "casy" || app_type == "ccsy"){
-                $("#highlight_select").append("<option value='"+data[i][1]+"'>"+data[i][0]+"</option>");
-            }
+        var product_dropdowns = ["#country_product_select"];
+        var highlight_contains_products = (app_type == "casy" || app_type == "ccsy");
+        if(highlight_contains_products){
+            product_dropdowns.push("#highlight_select");
         }
-        $('#country_product_select, #highlight_select').chosen({ allow_single_deselect: true });
-        $("#country_product_select_chosen, #highlight_select_chosen").css("width", "140px");
-        $("#highlight_select").trigger("chosen:updated");
 
+        for(var i = 0; i < data.length; i++){
+            $(product_dropdowns.join(", ")).append($('<option/>').val(data[i][1]).text(data[i][0]));
+        }
+
+        var product_options = {
+            placeholder:"All Products",
+            allowClear: true,
+        };
+
+        $("#country_product_select")
+            .select2(product_options)
+            .select2("val", product_code);
 
+        if (highlight_contains_products){
+            $("#highlight_select")
+                .select2(product_options);
+        }
     })
 
     $.ajax({
@@ -26,32 +38,47 @@ $(document).ready(function(){
         url: "http://localhost:8000/api/dropdowns/countries/"
     })
     .done(function( data ){
+
+        // Calculate which dropdowns to populate
+        var country_dropdowns = ["#country1_select", "#country_trade_partner_select"];
+        var highlight_contains_countries = (app_type == "cspy" || app_type == "csay" || app_type == "sapy");
+        if(highlight_contains_countries){
+            country_dropdowns.push("#highlight_select");
+        }
+
+        for(var i = 0; i < data.length; i++){
+            $(country_dropdowns.join(", ")).append($('<option/>').val(data[i][1]).text(data[i][0]));
+        }
+
         var c1 = country1_3char.toLowerCase();
         var c2 = country2_3char.toLowerCase();
-        for(var i = 0; i < data.length; i++){
-            if (c1 == data[i][1]){
-                $("#country1_select").append("<option value='"+data[i][1]+"' selected>"+data[i][0]+"</option>");
-            } else {
-                $("#country1_select").append("<option value='"+data[i][1]+"'>"+data[i][0]+"</option>");
-            }
-            if (c2 == data[i][1]){
-                $("#country_trade_partner_select").append("<option value='"+data[i][1]+"' selected>"+data[i][0]+"</option>");
-            } else {
-                $("#country_trade_partner_select").append("<option value='"+data[i][1]+"'>"+data[i][0]+"</option>");
-            }
-            if(app_type == "cspy" || app_type == "csay" || app_type == "sapy"){
-                $("#highlight_select").append("<option value='"+data[i][1]+"'>"+data[i][0]+"</option>");
-            }
+
+        function format_country_dropdown(country){
+            return "<img class='flag' src='media/img/icons/flag_" + country.id + ".png' width='20%'/> " + country.text;
         }
 
-        $('#country1_select, #country_trade_partner_select, #highlight_select').chosen({ allow_single_deselect: true });
-        $("#country1_select_chosen .chosen-single span").css("background", "url('media/img/icons/flag_"+$("#country1 select").val()+".png') no-repeat")
-        .css("background-size", "25px")
-        .css("padding-left", "30px")
-        .css("margin-top", "-2px");
-        $('#country_trade_partner_select_chosen').css("width", "140px");
+        var country_options = {
+            placeholder:"All Countries",
+            formatResult: format_country_dropdown,
+            formatSelection: format_country_dropdown,
+            allowClear: true,
+        };
+
+        $("#country1_select")
+            .select2(country_options)
+            .select2("val", c1);
+
+        $("#country_trade_partner_select")
+            .select2(country_options)
+            .select2("val", c2);
+
+        if (highlight_contains_countries){
+            $("#highlight_select")
+                .select2(country_options);
+        }
 
     });
 
-    $('#year1_select, #year2_select').chosen({ allow_single_deselect: true });
+    $('#year1_select, #year2_select').select2();
+    $('.language_select select').select2();
 });
diff --git a/media/js/explore/general.js b/media/js/explore/general.js
index d68f3cfc..300d90db 100644
--- a/media/js/explore/general.js
+++ b/media/js/explore/general.js
@@ -190,7 +190,7 @@ function update_viz(viz) {
 
   var current_viz = (typeof viz != "undefined" )  ? viz : $("#viz_apps").find(".active").attr("value");
   current_viz = (typeof current_viz == "undefined" || current_viz == "") ? "tree_map" : current_viz;
-  var current_year1 = $("#year1").find(":selected").val();
+  var current_year1 = $("#year1_select").val();
 
   // Import or Export
   var current_flow = $(".flow-direction").find(".active").index() == 0 ? "export": "import";