diff --git a/lib/nesting_unique_head.rb b/lib/nesting_unique_head.rb
index 0acd7ebe417..01278371c17 100644
--- a/lib/nesting_unique_head.rb
+++ b/lib/nesting_unique_head.rb
@@ -8,7 +8,7 @@ def initialize
   end
 
   def header(text, header_level)
-    friendly_text = text.parameterize
+    friendly_text = text.gsub(/<[^>]*>/,"").parameterize
     @@headers_history[header_level] = text.parameterize
 
     if header_level > 1
diff --git a/lib/toc_data.rb b/lib/toc_data.rb
index f4663cd2655..4a04efee26f 100644
--- a/lib/toc_data.rb
+++ b/lib/toc_data.rb
@@ -9,6 +9,7 @@ def toc_data(page_content)
     headers.push({
       id: header.attribute('id').to_s,
       content: header.children,
+      title: header.children.to_s.gsub(/<[^>]*>/, ''),
       level: header.name[1].to_i,
       children: []
     })
@@ -27,4 +28,4 @@ def toc_data(page_content)
     end
   end
   headers
-end
\ No newline at end of file
+end
diff --git a/lib/unique_head.rb b/lib/unique_head.rb
index e422217309e..d42bab2aa9d 100644
--- a/lib/unique_head.rb
+++ b/lib/unique_head.rb
@@ -7,7 +7,7 @@ def initialize
     @head_count = {}
   end
   def header(text, header_level)
-    friendly_text = text.gsub(/<[^<]+>/,"").parameterize
+    friendly_text = text.gsub(/<[^>]*>/,"").parameterize
     if friendly_text.strip.length == 0
       # Looks like parameterize removed the whole thing! It removes many unicode
       # characters like Chinese and Russian. To get a unique URL, let's just
diff --git a/source/javascripts/app/_toc.js b/source/javascripts/app/_toc.js
index b298dc3fe97..eb20fef93f2 100644
--- a/source/javascripts/app/_toc.js
+++ b/source/javascripts/app/_toc.js
@@ -3,7 +3,7 @@
 ;(function () {
   'use strict';
 
-  var htmlPattern = /<[^>]*>/g;  
+  var htmlPattern = /<[^>]*>/g;
   var loaded = false;
 
   var debounce = function(func, waitTime) {
@@ -67,7 +67,6 @@
       }
 
       var $best = $toc.find("[href='" + best + "']").first();
-      var joinedTitle = $best.data("title") + " – " + originalTitle;
       if (!$best.hasClass("active")) {
         // .active is applied to the ToC link we're currently on, and its parent <ul>s selected by tocListSelector
         // .active-expanded is applied to the ToC links that are parents of this one
@@ -81,8 +80,12 @@
         if (window.history.replaceState) {
           window.history.replaceState(null, "", best);
         }
-        // TODO remove classnames
-        document.title = joinedTitle.replace(htmlPattern, '');
+        var thisTitle = $best.data("title")
+        if (thisTitle !== undefined && thisTitle.length > 0) {
+          document.title = thisTitle + " – " + originalTitle;
+        } else {
+          document.title = originalTitle;
+        }
       }
     };
 
diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
index 040b9d7ff91..29b80d72a32 100644
--- a/source/layouts/layout.erb
+++ b/source/layouts/layout.erb
@@ -72,12 +72,12 @@ under the License.
       <ul id="toc" class="toc-list-h1">
         <% toc_data(page_content).each do |h1| %>
           <li>
-            <a href="#<%= h1[:id] %>" class="toc-h1 toc-link" data-title="<%= h1[:content].to_s.parameterize %>"><%= h1[:content] %></a>
+            <a href="#<%= h1[:id] %>" class="toc-h1 toc-link" data-title="<%= h1[:title] %>"><%= h1[:content] %></a>
             <% if h1[:children].length > 0 %>
               <ul class="toc-list-h2">
                 <% h1[:children].each do |h2| %>
                   <li>
-                    <a href="#<%= h2[:id] %>" class="toc-h2 toc-link" data-title="<%= h2[:content].to_s.parameterize %>"><%= h2[:content] %></a>
+                    <a href="#<%= h2[:id] %>" class="toc-h2 toc-link" data-title="<%= h2[:title] %>"><%= h2[:content] %></a>
                   </li>
                 <% end %>
               </ul>