diff --git a/comprehensive/lms/templates/courseware/course_about.html b/comprehensive/lms/templates/courseware/course_about.html
index 31404f8..af66cb9 100644
--- a/comprehensive/lms/templates/courseware/course_about.html
+++ b/comprehensive/lms/templates/courseware/course_about.html
@@ -12,7 +12,7 @@ from openedx.core.djangoapps.site_configuration import helpers as configuration_
 <%
    my_course_org_filter = configuration_helpers.get_value('course_org_filter')
 %>
-% if course.display_org_with_default in my_course_org_filter:
+% if my_course_org_filter == course.display_org_with_default:
 <%block name="headextra">
   ## OG (Open Graph) title and description added below to give social media info to display
   ## (https://developers.facebook.com/docs/opengraph/howtos/maximizing-distribution-media-content#tags)
diff --git a/comprehensive/lms/templates/courseware/courseware.html b/comprehensive/lms/templates/courseware/courseware.html
index d5d4cbf..8ff0698 100644
--- a/comprehensive/lms/templates/courseware/courseware.html
+++ b/comprehensive/lms/templates/courseware/courseware.html
@@ -14,7 +14,7 @@ from openedx.core.djangoapps.site_configuration import helpers as configuration_
 <%
    my_course_org_filter = configuration_helpers.get_value('course_org_filter')
 %>
-% if course.display_org_with_default in my_course_org_filter:
+% if my_course_org_filter == course.display_org_with_default:
 <%
   include_special_exams = settings.FEATURES.get('ENABLE_SPECIAL_EXAMS', False) and (course.enable_proctored_exams or course.enable_timed_exams)
 %>
diff --git a/comprehensive/lms/templates/courseware/info.html b/comprehensive/lms/templates/courseware/info.html
index 5508f93..1ba6b3d 100644
--- a/comprehensive/lms/templates/courseware/info.html
+++ b/comprehensive/lms/templates/courseware/info.html
@@ -16,7 +16,7 @@ from openedx.core.djangoapps.site_configuration import helpers as configuration_
 <%
    my_course_org_filter = configuration_helpers.get_value('course_org_filter')
 %>
-% if course.display_org_with_default in my_course_org_filter:
+% if my_course_org_filter == course.display_org_with_default:
 <%block name="pagetitle">${_("{course_number} Course Info").format(course_number=course.display_number_with_default)}</%block>
 
 <%block name="headextra">
diff --git a/courses/lms/templates/courseware/course_about.html b/courses/lms/templates/courseware/course_about.html
index 72e0720..978f1c0 100644
--- a/courses/lms/templates/courseware/course_about.html
+++ b/courses/lms/templates/courseware/course_about.html
@@ -12,7 +12,7 @@ from openedx.core.djangoapps.site_configuration import helpers as configuration_
 <%
    my_course_org_filter = configuration_helpers.get_value('course_org_filter')
 %>
-% if course.display_org_with_default in my_course_org_filter and user.is_authenticated():
+% if my_course_org_filter == course.display_org_with_default and user.is_authenticated():
 <%block name="headextra">
   ## OG (Open Graph) title and description added below to give social media info to display
   ## (https://developers.facebook.com/docs/opengraph/howtos/maximizing-distribution-media-content#tags)
diff --git a/courses/lms/templates/courseware/courseware.html b/courses/lms/templates/courseware/courseware.html
index 4632d56..600caf1 100644
--- a/courses/lms/templates/courseware/courseware.html
+++ b/courses/lms/templates/courseware/courseware.html
@@ -14,7 +14,7 @@ from openedx.core.djangoapps.site_configuration import helpers as configuration_
 <%
    my_course_org_filter = configuration_helpers.get_value('course_org_filter')
 %>
-% if course.display_org_with_default in my_course_org_filter and user.is_authenticated():
+% if my_course_org_filter == course.display_org_with_default:
 <%
   include_special_exams = settings.FEATURES.get('ENABLE_SPECIAL_EXAMS', False) and (course.enable_proctored_exams or course.enable_timed_exams)
 %>
diff --git a/courses/lms/templates/courseware/info.html b/courses/lms/templates/courseware/info.html
index 1e35649..f17b359 100644
--- a/courses/lms/templates/courseware/info.html
+++ b/courses/lms/templates/courseware/info.html
@@ -16,7 +16,7 @@ from openedx.core.djangoapps.site_configuration import helpers as configuration_
 <%
    my_course_org_filter = configuration_helpers.get_value('course_org_filter')
 %>
-% if course.display_org_with_default in my_course_org_filter and user.is_authenticated():
+% if my_course_org_filter == course.display_org_with_default and user.is_authenticated():
 <%block name="pagetitle">${_("{course_number} Course Info").format(course_number=course.display_number_with_default)}</%block>
 
 <%block name="headextra">
diff --git a/courses/lms/templates/login.html b/courses/lms/templates/login.html
index e3a7ef8..12df452 100644
--- a/courses/lms/templates/login.html
+++ b/courses/lms/templates/login.html
@@ -64,7 +64,7 @@ from third_party_auth import provider, pipeline
 
       $('#login-form').on('ajax:success', function(event, json, xhr) {
         if(json.success) {
-          var nextUrl = "${login_redirect_url}";
+          var nextUrl = "${login_redirect_url | u}";
           if (json.redirect_url) {
             nextUrl = json.redirect_url; // Most likely third party auth completion. This trumps 'nextUrl' above.
           }
diff --git a/courses/lms/templates/register.html b/courses/lms/templates/register.html
index b6a0b84..e15e5e2 100644
--- a/courses/lms/templates/register.html
+++ b/courses/lms/templates/register.html
@@ -52,7 +52,7 @@ import calendar
       });
 
       $('#register-form').on('ajax:success', function(event, json, xhr) {
-        var nextUrl = "${login_redirect_url}";
+        var nextUrl = "${login_redirect_url | u}";
         if (json.redirect_url) {
           nextUrl = json.redirect_url; // Most likely third party auth completion. This trumps 'nextUrl' above.
         }