diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb
index 37c3a4cd..c19b56d1 100644
--- a/app/controllers/todos_controller.rb
+++ b/app/controllers/todos_controller.rb
@@ -685,6 +685,7 @@ class TodosController < ApplicationController
     respond_to do |format|
       format.html do
         init_not_done_counts
+        init_project_hidden_todo_counts
         @active_projects = current_user.projects.active
         @active_contexts = current_user.contexts.active
         @hidden_projects = current_user.projects.hidden
diff --git a/app/views/contexts/_context.html.erb b/app/views/contexts/_context.html.erb
index fd0f895a..fdd23a1f 100644
--- a/app/views/contexts/_context.html.erb
+++ b/app/views/contexts/_context.html.erb
@@ -1,4 +1,4 @@
-<% @not_done = @not_done_todos.select {|t| t.context_id == context.id } %>
+<% @not_done = @not_done_todos.select {|t| t.context_id == context.id } -%>
 <div id="c<%= context.id %>" class="container context" style="display:<%= (collapsible && @not_done.empty?) ? "none" : "block" %>">
   <h2>
     <% if collapsible -%>
diff --git a/app/views/todos/create_multiple.js.erb b/app/views/todos/create_multiple.js.erb
index 0de67336..6118cfde 100644
--- a/app/views/todos/create_multiple.js.erb
+++ b/app/views/todos/create_multiple.js.erb
@@ -15,7 +15,7 @@
   TracksPages.show_errors_for_multi_add(html_for_error_messages());
 <% end -%>
 
-<% if @saved 
+<% if @saved
    # the following functions assume a todo is saved or at least not nil,
    # so leave them out in case of an error
 -%>
@@ -68,11 +68,10 @@ function html_for_error_messages() {
   error_messages = @multiple_error || ""
   # add errors of individual @todos
   @todos.each do |todo|
-    @todo_i = todo
-    error_messages += error_messages_for('todo_i', :object_name => 'action')
+    error_messages += get_list_of_error_messages_for(todo)
   end
   -%>
-  return "<%= escape_javascript(error_messages)%>";
+  return "<%= escape_javascript(error_messages.html_safe)%>";
 }
 
 <% end # if @saved -%>
\ No newline at end of file