diff --git a/plugins/elasticsearch/public/javascripts/categories.js b/plugins/elasticsearch/public/javascripts/categories.js
index de2eeef..62a82d1 100644
--- a/plugins/elasticsearch/public/javascripts/categories.js
+++ b/plugins/elasticsearch/public/javascripts/categories.js
@@ -19,7 +19,6 @@ var main = function() {
       dataParams[item[0]] = item[1];
     });
 
-
     var idx = categories.indexOf(this.value);
     if (idx == -1) {
       categories.push(this.value);
@@ -27,15 +26,12 @@ var main = function() {
       categories.splice(idx, 1);
     }
 
+    dataParams['categories'] = categories.join(",")
+
     $.ajax({
       method: "GET",
       url: "/search?format=js",
-      data: {
-        categories: categories.join(","),
-        selected_type: dataParams["selected_type"],
-        filter: dataParams["filter"],
-        query: dataParams["query"]
-      }
+      data: dataParams
     });
   });
 };
diff --git a/plugins/elasticsearch/public/style.css b/plugins/elasticsearch/public/style.css
index 900de26..47eeea5 100644
--- a/plugins/elasticsearch/public/style.css
+++ b/plugins/elasticsearch/public/style.css
@@ -52,7 +52,7 @@
 
 .controller-elasticsearch_plugin #content-inner .categories,
 .controller-elasticsearch_plugin #content-inner .search-filter,
-.controller-elasticsearch_plugin #content-inner ul.search-options {
+.controller-elasticsearch_plugin #content-inner .search-options ul {
   background: #fff;
   overflow: hidden;
   border-radius: 5px;
diff --git a/plugins/elasticsearch/views/elasticsearch_plugin/_results_count.html.erb b/plugins/elasticsearch/views/elasticsearch_plugin/_results_count.html.erb
new file mode 100644
index 0000000..7ddbcd5
--- /dev/null
+++ b/plugins/elasticsearch/views/elasticsearch_plugin/_results_count.html.erb
@@ -0,0 +1,8 @@
+<p>
+  <strong><%= @hits %></strong>
+  <% if not @query.blank? %>
+    <%= _(" results for ") %><%= @query %>
+  <% else %>
+    <%= _(" total results") %>
+  <% end %>
+</p>
diff --git a/plugins/elasticsearch/views/elasticsearch_plugin/_search_field.html.erb b/plugins/elasticsearch/views/elasticsearch_plugin/_search_field.html.erb
new file mode 100644
index 0000000..288f331
--- /dev/null
+++ b/plugins/elasticsearch/views/elasticsearch_plugin/_search_field.html.erb
@@ -0,0 +1,12 @@
+<%= form_tag '/plugin/elasticsearch/search', method: :get  do %>
+
+  <%= hidden_field_tag("selected_type", @selected_type) if @selected_type %>
+
+  <%= hidden_field_tag("filter", @selected_sort) if @selected_sort %>
+
+  <%= hidden_field_tag("categories", @selected_categories.join(",")) if @selected_categories %>
+
+  <%= text_field_tag :query, @query %>
+
+  <%= submit_tag _("Send") %>
+<% end %>
diff --git a/plugins/elasticsearch/views/elasticsearch_plugin/_search_filter.html.erb b/plugins/elasticsearch/views/elasticsearch_plugin/_search_filter.html.erb
new file mode 100644
index 0000000..095a172
--- /dev/null
+++ b/plugins/elasticsearch/views/elasticsearch_plugin/_search_filter.html.erb
@@ -0,0 +1,8 @@
+<h3 class="box-title"><%= _("Sort by") %></h3>
+<ul>
+<% for type, value in @sort_types %>
+  <li class="select-search-type <%= "active" if type == @selected_sort %>">
+    <%= link_to value[:label], "?selected_type=#{@selected_type}&query=#{@query}&filter=#{type}&categories=#{@selected_categories.join(',')}" %>
+  </li>
+<% end %>
+</ul>
diff --git a/plugins/elasticsearch/views/elasticsearch_plugin/_search_option.html.erb b/plugins/elasticsearch/views/elasticsearch_plugin/_search_option.html.erb
new file mode 100644
index 0000000..b85cbbb
--- /dev/null
+++ b/plugins/elasticsearch/views/elasticsearch_plugin/_search_option.html.erb
@@ -0,0 +1,7 @@
+<ul>
+  <% for type,value in @searchable_types %>
+    <li class="select-search-type <%= "active" if type == @selected_type %>">
+      <%= link_to value[:label], "?selected_type=#{type}&query=#{@query}&categories=#{@selected_categories.join(',')}"%>
+    </li>
+  <% end %>
+</ul>
diff --git a/plugins/elasticsearch/views/elasticsearch_plugin/search.html.erb b/plugins/elasticsearch/views/elasticsearch_plugin/search.html.erb
index 6f477cc..1f907b4 100644
--- a/plugins/elasticsearch/views/elasticsearch_plugin/search.html.erb
+++ b/plugins/elasticsearch/views/elasticsearch_plugin/search.html.erb
@@ -1,45 +1,22 @@
 <div class="wrapper">
   <div class="search_form">
     <div class="search_field">
-      <%= form_tag '/plugin/elasticsearch/search', method: :get  do %>
-        <%= hidden_field_tag  "selected_type", @selected_type %>
-        <% if @selected_filter %>
-          <%= hidden_field_tag  "filter", @selected_filter %>
-        <% end %>
-        <%= text_field_tag :query, @query %>
-        <%= submit_tag _("Send") %>
-      <% end %>
+      <%= render :partial => "search_field" %>
     </div>
     <div class="results-count">
-      <p>
-        <strong><%= @hits %></strong>
-        <% if not @query.blank? %>
-          <%= _(" results for ") %><%= @query %>
-        <% else %>
-          <%= _(" total results") %>
-        <% end %>
-      </p>
+      <%= render :partial => "results_count" %>
     </div>
   </div>
 
   <div class="results-wrapper">
     <div class="sidebar">
-      <ul class="search-options">
-        <% for type,value in @searchable_types %>
-          <li class="select-search-type <%= "active" if type == @selected_type %>">
-            <%= link_to value[:label], "?selected_type=#{type}&query=#{@query}&categories=#{@selected_categories.join(',')}"%>
-          </li>
-        <% end %>
-      </ul>
+
+      <div class="search-options">
+        <%= render :partial => "search_option.html.erb" %>
+      </div>
+
       <div class="search-filter">
-        <h3 class="box-title"><%= _("Sort by") %></h3>
-        <ul>
-          <% for type, value in @sort_types %>
-            <li class="select-search-type <%= "active" if type == @selected_sort %>">
-              <%= link_to value[:label], "?selected_type=#{@selected_type}&query=#{@query}&filter=#{type}&categories=#{@selected_categories.join(',')}" %>
-            </li>
-          <% end %>
-        </ul>
+        <%= render :partial => "search_filter.html.erb" %>
       </div>
 
       <div class="categories">
diff --git a/plugins/elasticsearch/views/elasticsearch_plugin/search.js.erb b/plugins/elasticsearch/views/elasticsearch_plugin/search.js.erb
index 3cdf965..9eb8ccd 100644
--- a/plugins/elasticsearch/views/elasticsearch_plugin/search.js.erb
+++ b/plugins/elasticsearch/views/elasticsearch_plugin/search.js.erb
@@ -1,2 +1,5 @@
 $(".results").html("<%= escape_javascript(render partial: 'search_collection') %>");
-
+$(".results-count").html("<%= escape_javascript(render partial: 'results_count') %>");
+$(".search-options").html("<%= escape_javascript(render partial: 'search_option') %>");
+$(".search-filter").html("<%= escape_javascript(render partial: 'search_filter') %>");
+$(".search_field").html("<%= escape_javascript(render partial: 'search_field') %>");
--
libgit2 0.21.2