diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 5400987d..0d54b75f 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -228,9 +228,6 @@ class ApplicationController < ActionController::Base
   end
     
   def init_data_for_sidebar
-    @projects = @projects || current_user.projects.find(:all, :include => [:default_context ])
-    @contexts = @contexts || current_user.contexts
-
     @completed_projects = current_user.projects.completed
     @hidden_projects = current_user.projects.hidden
     @active_projects = current_user.projects.active
@@ -246,13 +243,13 @@ class ApplicationController < ActionController::Base
   
   def init_not_done_counts(parents = ['project','context'])
     parents.each do |parent|
-      eval("@#{parent}_not_done_counts = @#{parent}_not_done_counts || Todo.count(:conditions => ['user_id = ? and state = ?', current_user.id, 'active'], :group => :#{parent}_id)")
+      eval("@#{parent}_not_done_counts = @#{parent}_not_done_counts || current_user.todos.active.count(:group => :#{parent}_id)")
     end
   end
   
   def init_project_hidden_todo_counts(parents = ['project','context'])
     parents.each do |parent|
-      eval("@#{parent}_project_hidden_todo_counts = @#{parent}_project_hidden_todo_counts || Todo.count(:conditions => ['user_id = ? and (state = ? or state = ?)', current_user.id, 'project_hidden', 'active'], :group => :#{parent}_id)")
+      eval("@#{parent}_project_hidden_todo_counts = @#{parent}_project_hidden_todo_counts || current_user.todos.count(:conditions => ['state = ? or state = ?', 'project_hidden', 'active'], :group => :#{parent}_id)")
     end
   end  
   
diff --git a/app/views/projects/_default_context_autocomplete.rhtml b/app/views/projects/_default_context_autocomplete.rhtml
index 178336b5..cd92380e 100644
--- a/app/views/projects/_default_context_autocomplete.rhtml
+++ b/app/views/projects/_default_context_autocomplete.rhtml
@@ -1,6 +1,6 @@
 <div class="page_name_auto_complete" id="default_context_list" style="display:none;z-index:9999"></div>
 <script type="text/javascript">
-defaultContextAutoCompleter = new Autocompleter.Local('project[default_context_name]', 'default_context_list', <%= context_names_for_autocomplete %>, {choices:100,autoSelect:false});
-Event.observe($('project[default_context_name]'), "focus", defaultContextAutoCompleter.activate.bind(defaultContextAutoCompleter));
-Event.observe($('project[default_context_name]'), "click", defaultContextAutoCompleter.activate.bind(defaultContextAutoCompleter));
+defaultContextAutoCompleter = new Autocompleter.Local('project_default_context_name', 'default_context_list', <%= context_names_for_autocomplete %>, {choices:100,autoSelect:false});
+Event.observe($('project_default_context_name'), "focus", defaultContextAutoCompleter.activate.bind(defaultContextAutoCompleter));
+Event.observe($('project_default_context_name'), "click", defaultContextAutoCompleter.activate.bind(defaultContextAutoCompleter));
 </script>
\ No newline at end of file