diff --git a/lms/djangoapps/django_comment_client/forum/views.py b/lms/djangoapps/django_comment_client/forum/views.py
index dd009f09df..2880225ca5 100644
--- a/lms/djangoapps/django_comment_client/forum/views.py
+++ b/lms/djangoapps/django_comment_client/forum/views.py
@@ -49,7 +49,6 @@ def render_accordion(request, course, discussion_id):
     return render_to_string('discussion/_accordion.html', context)
 
 def render_discussion(request, course_id, threads, *args, **kwargs):
-
     discussion_id = kwargs.get('discussion_id')
     user_id = kwargs.get('user_id')
     discussion_type = kwargs.get('discussion_type', 'inline')
@@ -182,13 +181,13 @@ def inline_discussion(request, course_id, discussion_id):
 
 def forum_form_discussion(request, course_id):
     """
-    Renders the main Discussion page
+    Renders the main Discussion page, potentially filtered by a search query
     """
     course = get_course_with_access(request.user, course_id, 'load')
     category_map = utils.get_discussion_category_map(course)
 
     try:
-        unsafethreads, query_params = get_threads(request, course_id)
+        unsafethreads, query_params = get_threads(request, course_id)   # This might process a search query
         threads = [utils.safe_content(thread) for thread in unsafethreads]
     except (cc.utils.CommentClientError, cc.utils.CommentClientUnknownError) as err:
         raise Http404
@@ -201,11 +200,16 @@ def forum_form_discussion(request, course_id):
         return utils.get_annotated_content_infos(course_id, thread, request.user, user_info)
 
     annotated_content_info = reduce(merge_dict, map(infogetter, threads), {})
-
+    for thread in threads:
+        courseware_context = get_courseware_context(thread, course)
+        if courseware_context:
+            thread['courseware_location']  = courseware_context['courseware_location']
+            thread['courseware_title']  = courseware_context['courseware_title']
     if request.is_ajax():
         return utils.JsonResponse({
             #'html': content,
             'discussion_data': threads,
+            'annotated_content_info': annotated_content_info,
         })
     else:
         #recent_active_threads = cc.search_recent_active_threads(
@@ -217,6 +221,7 @@ def forum_form_discussion(request, course_id):
         #trending_tags = cc.search_trending_tags(
         #    course_id,
         #)
+
         escapedict = {'"': '"'}
         context = {
             'csrf': csrf(request)['csrf_token'],
diff --git a/lms/djangoapps/django_comment_client/utils.py b/lms/djangoapps/django_comment_client/utils.py
index a7f303abf4..1a24bdf565 100644
--- a/lms/djangoapps/django_comment_client/utils.py
+++ b/lms/djangoapps/django_comment_client/utils.py
@@ -273,6 +273,7 @@ def safe_content(content):
         'created_at', 'updated_at', 'depth', 'type',
         'commentable_id', 'comments_count', 'at_position_list',
         'children', 'highlighted_title', 'highlighted_body',
+        'courseware_title', 'courseware_location'
     ]
 
     if content.get('anonymous') is False:
diff --git a/lms/static/coffee/src/discussion/utils.coffee b/lms/static/coffee/src/discussion/utils.coffee
index 7c388d6d20..07a23a4ca6 100644
--- a/lms/static/coffee/src/discussion/utils.coffee
+++ b/lms/static/coffee/src/discussion/utils.coffee
@@ -15,13 +15,9 @@ class @DiscussionUtil
   @getTemplate: (id) ->
     $("script##{id}").html()
 
-  @addContent: (id, content) -> window.$$contents[id] = content
-
-  @getContent: (id) -> window.$$contents[id]
-
   @bulkUpdateContentInfo: (infos) ->
     for id, info of infos
-      @getContent(id).updateInfo(info)
+      Content.getContent(id).updateInfo(info)
 
   @generateDiscussionLink: (cls, txt, handler) ->
     $("<a>").addClass("discussion-link")
diff --git a/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee b/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
index f1c4620182..33a61f1a01 100644
--- a/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
+++ b/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
@@ -229,6 +229,10 @@ if Backbone?
           success: (response, textStatus) =>
             if textStatus == 'success'
               @collection.reset(response.discussion_data)
+              Content.loadContentInfos(response.content_info)
+              # TODO: Perhaps reload user info so that votes can be updated.
+              # In the future we might not load all of a user's votes at once
+              # so this would probably be necessary anyway
               @displayedCollection.reset(@collection.models)
 
     setActiveItem: (event) ->