diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index cf1d2eba4..15f36ea49 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -21,7 +21,6 @@
 //= require d3
 //= require c3
 //= require c3ext
-//= require qp
 //= require app
 //= require_tree .
 
@@ -32,7 +31,6 @@ var initialize_modules = function() {
   App.Tags.initialize();
   App.Stats.initialize();
   App.LocationChanger.initialize();
-  App.DebatesOrderSelector.initialize();
 };
 
 $(function(){
diff --git a/app/assets/javascripts/debates_order_selector.js.coffee b/app/assets/javascripts/debates_order_selector.js.coffee
deleted file mode 100644
index 94002f5ac..000000000
--- a/app/assets/javascripts/debates_order_selector.js.coffee
+++ /dev/null
@@ -1,17 +0,0 @@
-App.DebatesOrderSelector =
-
-  href_with_params: (query_params) ->
-    loc = window.location
-
-    loc.protocol + "//" + loc.hostname +
-      (if loc.port then ':' + loc.port else '') +
-      loc.pathname +
-      loc.hash +
-      '?' + $.param(query_params)
-
-  initialize: ->
-    $('.js-order-selector').on 'change', ->
-      query_params = window.getQueryParameters()
-      query_params['order'] = $(this).val()
-      window.location.assign(App.DebatesOrderSelector.href_with_params(query_params))
-
diff --git a/app/assets/javascripts/qp.js b/app/assets/javascripts/qp.js
deleted file mode 100644
index 5e2b4f02d..000000000
--- a/app/assets/javascripts/qp.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- *  getQueryParameters.js
- *  Copyright (c) 2014 Nicholas Ortenzio
- *  The MIT License (MIT)
- *
- */
-
-window.getQueryParameters = function(str) {
-  str = (str || document.location.search).replace(/(^\?)/,'');
-  if(!str) { return {}; }
-  return str.split("&").reduce(function(o,n){n=n.split('=');o[n[0]]=n[1];return o},{});
-};
diff --git a/app/helpers/debates_helper.rb b/app/helpers/debates_helper.rb
deleted file mode 100644
index c594a8fa6..000000000
--- a/app/helpers/debates_helper.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module DebatesHelper
-  def available_options_for_order_selector(valid_orders, current_order)
-    options_for_select(available_order_filters_array(valid_orders), current_order)
-  end
-
-  private
-
-    def available_order_filters_array(orders)
-      orders.map { |f| [t("debates.index.orders.#{f}"), f] }
-    end
-
-end
diff --git a/app/views/debates/_order_selector.erb b/app/views/debates/_order_selector.erb
deleted file mode 100644
index de18cfc45..000000000
--- a/app/views/debates/_order_selector.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<form class="inline-block">
-   <select class="js-order-selector" name="order-selector"> 
-     <%= available_options_for_order_selector(@valid_orders, @order) %>
-   </select>
-</form>
diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index 13600160c..ebe932ec3 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -4,7 +4,16 @@
   <div class="filters row">
     <div class="small-12 column">
       <h2><%= t("debates.index.showing") %></h2>
-      <%= render 'order_selector' %>
+      <form class="inline-block">
+         <select class="js-location-changer" name="order-selector">
+           <% @valid_orders.each do |order| %>
+             <option <%= 'selected' if order == @order %>
+                     value='<%= url_for(request.query_parameters.merge(order: order))%>'>
+               <%= t("debates.index.orders.#{order}") %>
+             </option>
+           <% end %>
+         </select>
+      </form>
     </div>
   </div>
   <!-- /. Filters -->