diff --git a/app/assets/javascripts/tracks.js.erb b/app/assets/javascripts/tracks.js.erb
index dc8c4455..fa8192bc 100644
--- a/app/assets/javascripts/tracks.js.erb
+++ b/app/assets/javascripts/tracks.js.erb
@@ -648,7 +648,7 @@ var ContextListPage = {
         }
     },
     save_context_name: function(value, settings) {
-        var context_id = $(this).parents('.container.context').get(0).id.split('c')[1];
+        var context_id = $(this).parents('.container.context').get(0).id.split('_')[1];
         var highlight = function(){
             $('div.context span#context_name').effect('highlight', {}, 500);
         };
diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index e0343135..8426bd8e 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -120,6 +120,7 @@ module TodosHelper
       toggle = settings[:collapsible] ? container_toggle("toggle_#{settings[:id]}") : ""
       "#{toggle} #{settings[:title]} #{settings[:append_descriptor]}".html_safe
     end
+    header += content_tag(:div, nil, :id => settings[:id] + "_target", :class => "context_target drop_target")
     header.html_safe
   end
 
diff --git a/app/views/contexts/_context.html.erb b/app/views/contexts/_context.html.erb
index 1263d671..a0921254 100644
--- a/app/views/contexts/_context.html.erb
+++ b/app/views/contexts/_context.html.erb
@@ -8,7 +8,7 @@ cache [context, source_view_key, current_user.date.strftime("%Y%m%d"), @tag_name
     render :partial => 'todos/collection',
       :object => @not_done,
       :locals => { :settings => {
-        :id => "c#{context.id}",
+        :id => "context_#{context.id}",
         :collapsible => settings[:collapsible],
         :container_name => 'context',
         :title => show_context_name(context),