7 files changed, 16 insertions, 12 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index caf613f8d..cb7f3b23d 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -383,7 +383,7 @@ class ApplicationController < ActionController::Base
                 params[:latest_status] = [params[:latest_status]]
             end
             if params[:latest_status].include?("recent") ||  params[:latest_status].include?("all")
-                query += " (variety:sent)"
+                query += " variety:sent"
             end
             if params[:latest_status].include? "successful"
                 statuses << ['latest_status:successful', 'latest_status:partially_successful']
diff --git a/app/views/admin_public_body/edit.rhtml b/app/views/admin_public_body/edit.rhtml
index 1883eb083..b91f15a2e 100644
--- a/app/views/admin_public_body/edit.rhtml
+++ b/app/views/admin_public_body/edit.rhtml
@@ -1,6 +1,6 @@
 <h1><%=@title%></h1>
 
-<script>
+<script type="text/javascript">
     $(function() {
         $("#div-locales").tabs();
     });
diff --git a/app/views/admin_public_body/new.rhtml b/app/views/admin_public_body/new.rhtml
index 11186ee47..b859fdf6a 100644
--- a/app/views/admin_public_body/new.rhtml
+++ b/app/views/admin_public_body/new.rhtml
@@ -2,7 +2,7 @@
 
 <h1><%=@title%></h1>
 
-<script>
+<script type="text/javascript">
     $(function() {
         $("#div-locales").tabs();
     });
diff --git a/app/views/general/blog.rhtml b/app/views/general/blog.rhtml
index c9387c24f..f5bd66ebd 100644
--- a/app/views/general/blog.rhtml
+++ b/app/views/general/blog.rhtml
@@ -6,7 +6,7 @@
 <% if !@twitter_user.empty? %>
 <div id="twitter">
 <script src="http://widgets.twimg.com/j/2/widget.js"></script>
-<script>
+<script type="text/javascript">
 new TWTR.Widget({
   version: 2,
   type: 'profile',
diff --git a/app/views/general/search.rhtml b/app/views/general/search.rhtml
index 853765a8a..694ab932f 100644
--- a/app/views/general/search.rhtml
+++ b/app/views/general/search.rhtml
@@ -10,7 +10,7 @@
 <% @include_request_link_in_authority_listing = true %>
 
 <h1><%=@title%></h1>
-<script>
+<script type="text/javascript">
   $(function() {
      $(".use-datepicker").datepicker({dateFormat: 'yy-mm-dd'});
   });
@@ -28,9 +28,9 @@
 
 <% else %>
 
+<% form_tag(request.url, :method => "get") do %>
 <div id="list-filter">
  <div id="simple-search-box">
-  <% form_tag(request.url, :method => "get") do %>
   <%= label_tag(:query, _("Search for:")) %>
   <%= text_field_tag(:query, params[:query], { :size => 40 }) %>
   <%= submit_tag("Search") %>
@@ -109,9 +109,9 @@
 </div>
 <% end %>
    <%= submit_tag("Filter") %>
-<% end %>
  </fieldset>
 </div>
+<% end %>
 
 
 <p><%= link_to(_("Advanced search"), advanced_search_url) %></p>
diff --git a/app/views/public_body/list.rhtml b/app/views/public_body/list.rhtml
index b3e945907..c8a89ed3a 100644
--- a/app/views/public_body/list.rhtml
+++ b/app/views/public_body/list.rhtml
@@ -39,9 +39,11 @@
 <h1><%=@title%></h1>
 
 <% form_tag(request.url, :method => "get") do %>
+ <div>
   <%= label_tag(:public_body_query, _("Search:")) %>
   <%= text_field_tag(:public_body_query, params[:public_body_query]) %> 
   <%= submit_tag(_("Search")) %>
+ </div>
 <% end %>
 
 <p class="subtitle">
diff --git a/app/views/request/_request_filter_form.rhtml b/app/views/request/_request_filter_form.rhtml
index fd1fc5910..122da9d33 100644
--- a/app/views/request/_request_filter_form.rhtml
+++ b/app/views/request/_request_filter_form.rhtml
@@ -1,4 +1,4 @@
-<script>
+<script type="text/javascript">
   $(function() {
      $(".use-datepicker").datepicker();
   });
@@ -14,10 +14,12 @@
                        ["awaiting", _("unresolved requests")]] %>
     <li>
     <% if params[:view] != status %>
-      <% if params[:controller] == "public_body" %>
-        <%= link_to label, url_for(:controller => "public_body", :action => "show", :view => status, :url_name => @public_body.url_name) + "?#{request.query_string}"  %> 
+      <% if params[:controller] == "public_body"
+
+ %>
+        <%= link_to label, url_for(:controller => "public_body", :action => "show", :view => status, :url_name => @public_body.url_name) + "?" + request.query_string  %> 
       <% else %>
-        <%= link_to label, url_for(:controller => "request", :action => "list", :view => status) + "?#{request.query_string}"  %> 
+        <%= link_to label, url_for(:controller => "request", :action => "list", :view => status) + "?" + request.query_string %> 
       <% end %>
     <% else %>
       <%= label %>
@@ -26,8 +28,8 @@
     <% end %>
    </ul>
  </div>
+  <% form_tag(request.path, :method => "get") do %>
  <div class="list-filter-item">
-  <% form_tag({}, :method => "get") do %>
   <%= label_tag(:query, _("Search for:")) %>
   <%= text_field_tag(:query, params[:query]) %> 
  </div>