diff --git a/docs/html/support.jd b/docs/html/support.jd
index 3f2b762..bbed7df 100644
--- a/docs/html/support.jd
+++ b/docs/html/support.jd
@@ -30,7 +30,8 @@
 </p>
 
 <p><b>
-<a href="https://helpouts.google.com/partner/ask?vertical=programming&tags=android&origin=http:%2F%2Fdeveloper.android.com%2Fsupport.html">Ask a question in Google Helpouts</a>
+<a target="_blank"
+href="https://helpouts.google.com/partner/ask?vertical=programming&tags=android&origin=http:%2F%2Fdeveloper.android.com%2Fsupport.html">Ask a question in Google Helpouts</a>
 </b></p>
 
 
diff --git a/docs/html/training/basics/firstapp/building-ui.jd b/docs/html/training/basics/firstapp/building-ui.jd
index 2f7276c..c082642 100644
--- a/docs/html/training/basics/firstapp/building-ui.jd
+++ b/docs/html/training/basics/firstapp/building-ui.jd
@@ -1,7 +1,7 @@
 page.title=Building a Simple User Interface
 trainingnavtop=true
 
-page.tags=ui, views, layout, widgets, string resources
+page.tags=ui, views, layouts, widgets, string resources
 helpoutsWidget=true
 
 @jd:body
diff --git a/docs/html/training/basics/firstapp/creating-project.jd b/docs/html/training/basics/firstapp/creating-project.jd
index 53b8f33..418eb68 100644
--- a/docs/html/training/basics/firstapp/creating-project.jd
+++ b/docs/html/training/basics/firstapp/creating-project.jd
@@ -1,6 +1,6 @@
 page.title=Creating an Android Project
 
-page.tags=eclipse, sdk, project setup, adt
+page.tags=eclipse adt, sdk tools, project setup
 helpoutsWidget=true
 
 trainingnavtop=true
diff --git a/docs/html/training/basics/firstapp/running-app.jd b/docs/html/training/basics/firstapp/running-app.jd
index fe631ef..96b7172 100644
--- a/docs/html/training/basics/firstapp/running-app.jd
+++ b/docs/html/training/basics/firstapp/running-app.jd
@@ -4,7 +4,7 @@
 
 trainingnavtop=true
 
-page.tags=emulator, virtual device
+page.tags=emulator
 helpoutsWidget=true
 
 @jd:body