diff --git a/plugins/elasticsearch/public/style.css b/plugins/elasticsearch/public/style.css
index f312b95..bf8dceb 100644
--- a/plugins/elasticsearch/public/style.css
+++ b/plugins/elasticsearch/public/style.css
@@ -13,7 +13,8 @@
 .controller-elasticsearch_plugin .search_form .search_field {
   margin-top: 5px;
 }
-.controller-elasticsearch_plugin .search_form .search_field #q {
+
+.controller-elasticsearch_plugin .search_form .search_field input[type='text'] {
   width: 500px;
 }
 
diff --git a/plugins/elasticsearch/views/elasticsearch_plugin/search.html.erb b/plugins/elasticsearch/views/elasticsearch_plugin/search.html.erb
index 6c55498..c9c0c60 100644
--- a/plugins/elasticsearch/views/elasticsearch_plugin/search.html.erb
+++ b/plugins/elasticsearch/views/elasticsearch_plugin/search.html.erb
@@ -7,7 +7,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}&q=#{@query}&selected_filter_field=#{@selected_filter_field}"%>
+          <%= link_to  value[:label], "?selected_type=#{type}&query=#{@query}&selected_filter_field=#{@selected_filter_field}"%>
         </li>
       <% end %>
     </ul>
@@ -27,7 +27,7 @@
         <%= form_tag '/plugin/elasticsearch/search', method: :get  do %>
             <%= hidden_field_tag  "selected_type", @selected_type %>
             <%= hidden_field_tag  "selected_filter_field", @selected_filter_field  %>
-            <%= text_field_tag :q, @query %>
+            <%= text_field_tag :query, @query %>
             <%= submit_tag _("Send") %>
         <% end %>
       </div>
--
libgit2 0.21.2