diff --git a/public/_includes/_footer.jade b/public/_includes/_footer.jade
index 1cb22a54d2..5da35ef23f 100644
--- a/public/_includes/_footer.jade
+++ b/public/_includes/_footer.jade
@@ -7,7 +7,7 @@ if version && language
 else
   - var styleguide = "/docs/ts/latest/styleguide.html"
 
-.main-footer
+div(class="main-footer" data-swiftype-index="false")
   nav.background-midnight.grid-fluid
 
     .c3.main-footer-branding
diff --git a/public/_includes/_head-include.jade b/public/_includes/_head-include.jade
index a0c7429fa1..489ba51bd2 100644
--- a/public/_includes/_head-include.jade
+++ b/public/_includes/_head-include.jade
@@ -1,14 +1,21 @@
 - var language = current.path[1]
 - var version = ''
+- var section = ''
 
 if current.path[2]
   - var version = current.path[2].replace(/\_+/gm, ".")
 
+if current.path[3]
+  - var section = current.path[3].toUpperCase()
+
+
 if language == 'js'
 if language == 'dart'
 
 if title == "Angular"
   title #{title}
+else if section
+  title #{title} - #{language} - #{section}
 else if language
   title #{title} - #{language}
 else
diff --git a/public/_includes/_main-nav.jade b/public/_includes/_main-nav.jade
index 677d081d8d..dfc809a289 100644
--- a/public/_includes/_main-nav.jade
+++ b/public/_includes/_main-nav.jade
@@ -1,7 +1,7 @@
 - var language = current.path[1] || 'ts'
 - if (language !== 'ts' || language !== 'js' || language !== 'dart') { language = 'ts'; }
 
-nav(class="main-nav l-pinned-top l-layer-5", scroll-y-offset-element)
+nav(data-swiftype-index="false" class="main-nav l-pinned-top l-layer-5", scroll-y-offset-element)
   h1 <a href="/" md-button>Angular <sup>by Google</sup></a>
 
   button(class="main-nav-button main-nav-mobile-trigger l-right" aria-label="View Menu" ng-click="appCtrl.toggleMainMenu($event)" md-button) Site Menu <span class="icon icon-arrow-drop-down"></span>
diff --git a/public/docs/_includes/_side-nav.jade b/public/docs/_includes/_side-nav.jade
index 13c432ce08..c56857448f 100644
--- a/public/docs/_includes/_side-nav.jade
+++ b/public/docs/_includes/_side-nav.jade
@@ -60,7 +60,7 @@
 - if (language !== 'ts' || language !== 'js' || language !== 'dart') { language = 'ts'; }
 
 
-nav(class="sidenav l-pinned-left l-layer-4 l-offset-nav"  ng-class="appCtrl.showDocsNav ? 'is-visible' : ''")
+nav(class="sidenav l-pinned-left l-layer-4 l-offset-nav"  data-swiftype-index="false"  ng-class="appCtrl.showDocsNav ? 'is-visible' : ''")
   // SEARCH BAR
   header.sidenav-search.st-input-wrapper
     .st-input-inner