diff --git a/app/controllers/my_profile/cms_controller.rb b/app/controllers/my_profile/cms_controller.rb
index 10f36e5..54555fb 100644
--- a/app/controllers/my_profile/cms_controller.rb
+++ b/app/controllers/my_profile/cms_controller.rb
@@ -29,6 +29,8 @@ class CmsController < MyProfileController
 
   def edit
     @article = profile.articles.find(params[:id])
+    @parent_id = params[:parent_id]
+    @type = params[:type]
     if request.post?
       @article.last_changed_by = user
       if @article.update_attributes(params[:article])
@@ -50,6 +52,7 @@ class CmsController < MyProfileController
           :description => type.description
         })
       end
+      @parent_id = params[:parent_id]
       render :action => 'select_article_type', :layout => false
       return
     end
diff --git a/app/views/cms/edit.rhtml b/app/views/cms/edit.rhtml
index 3e8cdd3..ac22745 100644
--- a/app/views/cms/edit.rhtml
+++ b/app/views/cms/edit.rhtml
@@ -2,9 +2,9 @@
 
 <% labelled_form_for 'article', @article, :html => { :multipart => true } do |f| %>
 
-  <%= hidden_field_tag("type", params[:type]) if params[:type] %>
+  <%= hidden_field_tag("type", @type) if @type %>
 
-  <%= hidden_field_tag('parent_id', params[:parent_id]) if params[:parent_id] %>
+  <%= hidden_field_tag('parent_id', @parent_id) if @parent_id %>
 
   <%= render :partial => partial_for_class(@article.class), :locals => { :f => f } %>
 
diff --git a/app/views/cms/select_article_type.rhtml b/app/views/cms/select_article_type.rhtml
index 26b89b0..6121063 100644
--- a/app/views/cms/select_article_type.rhtml
+++ b/app/views/cms/select_article_type.rhtml
@@ -3,7 +3,7 @@
 <ul id="article_types">
   <% for type in @article_types %>
     <li>
-    <%= link_to type[:short_description], :action => 'new', :type => type[:name], :parent_id => params[:parent_id] %>
+    <%= link_to type[:short_description], :action => 'new', :type => type[:name], :parent_id => @parent_id %>
     <br/> <%= type[:description] %>
     </li>
   <% end %>
diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml
index fd792d2..a9aced1 100644
--- a/app/views/layouts/application.rhtml
+++ b/app/views/layouts/application.rhtml
@@ -39,7 +39,7 @@
     <%= javascript_include_tag 'auto-open-menu' %>
     <%= include_lightbox_header %>
     <%# cms stuff %>
-    <% if params[:controller] == 'cms' %>
+    <% if @controller.controller_name == 'cms' %>
       <%= javascript_include_tag 'cms' %>
     <% end %>
   </head>
diff --git a/app/views/search/_display_results.rhtml b/app/views/search/_display_results.rhtml
index cbb86a6..90737a1 100644
--- a/app/views/search/_display_results.rhtml
+++ b/app/views/search/_display_results.rhtml
@@ -3,7 +3,7 @@
 <% @results.each do |name,results| %>
   <% if !results.nil? and !results.empty? %>
     <div class="search-results-<%= name %> search-results-box <%= pos==:odd ? pos=:even : pos=:odd %>">
-      <% if params[:action] != 'assets' %>
+      <% if @controller.action_name != 'assets' %>
         <h3><%= @names[name] %></h3>
       <% end %>
       <% partial = partial_for_class results.first.class %>
@@ -17,7 +17,7 @@
     </div><!-- end class="search-results-<%= name %>" -->
   <% else %>
     <div class="search-results-<%= name %> search-results-empty search-results-box <%= pos==:odd ? pos=:even : pos=:odd %>">
-      <% if params[:action] != 'assets' %>
+      <% if @controller.action_name != 'assets' %>
         <h3><%= @names[name] %></h3>
       <% end %>
       <div class="search-results-innerbox search-results-type-empty">
diff --git a/app/views/search/index.rhtml b/app/views/search/index.rhtml
index fa5bdbb..f77c70f 100644
--- a/app/views/search/index.rhtml
+++ b/app/views/search/index.rhtml
@@ -1,4 +1,4 @@
-<h2> <%= @category ? (_('Search results for "%{query}" in %{category}') % { :query => @query, :category => @category.full_name}) : (_('Search results for "%s"') % @query) %> </h2>
+<h2> <%=h @category ? (_('Search results for "%{query}" in %{category}') % { :query => @query, :category => @category.full_name}) : (_('Search results for "%s"') % @query) %> </h2>
 
 <%= render :partial => 'display_results' %>
 
diff --git a/app/views/shared/categories_menu.rhtml b/app/views/shared/categories_menu.rhtml
index fc9bc3d..2473edb 100644
--- a/app/views/shared/categories_menu.rhtml
+++ b/app/views/shared/categories_menu.rhtml
@@ -5,8 +5,8 @@
       <%= item.name %>
       <ul>
         <% item.all_children.each do |child| %>
-          <% if (params[:controller] == 'search') && (params[:action] == 'assets') %>
-            <li><%= link_to(content_tag('span', child.name), :controller => 'search', :action => 'assets', :asset => params[:asset], :category_path => child.explode_path) %></li>
+          <% if (@controller.controller_name == 'search') && (@controller.action_name == 'assets') %>
+            <li><%=h link_to(content_tag('span', child.name), :controller => 'search', :action => 'assets', :asset => params[:asset], :category_path => child.explode_path) %></li>
           <% else %>
             <li><%= link_to(content_tag('span', child.name), :controller => 'search', :action => 'category_index', :category_path => child.explode_path) %></li>
           <% end %>
--
libgit2 0.21.2