diff --git a/samples/AccelerometerPlay/_index.jd b/samples/AccelerometerPlay/_index.jd
index 197e453..cdca3a6 100644
--- a/samples/AccelerometerPlay/_index.jd
+++ b/samples/AccelerometerPlay/_index.jd
@@ -1,6 +1,5 @@
-page.tags="Sensor", "Accelerometer"
-sample.tags="Accelerometer", "Games"
-sample.groups="Sensors"
+page.tags="Sensor", "Games", "Accelerometer"
+sample.group=Sensors
 @jd:body
 
 <p>Example code that shows how to use the device accelerometer in apps and games.</p>
diff --git a/samples/ActionBarCompat/_index.jd b/samples/ActionBarCompat/_index.jd
index 946570b..61b5e5e 100644
--- a/samples/ActionBarCompat/_index.jd
+++ b/samples/ActionBarCompat/_index.jd
@@ -1,6 +1,5 @@
-page.tags="ActionBar", "Compatibility", "Support Library"
-sample.tags="UI", "ActionBar", "Support Library"
-sample.group="Input"
+page.tags="ActionBar", "UI", "Compatibility", "Support Library"
+sample.group=Input
 @jd:body
 
 <p>This sample shows how to use the action bar design pattern on pre-API 11 devices and the built-in
diff --git a/samples/BluetoothHDP/_index.jd b/samples/BluetoothHDP/_index.jd
index cf5f555..526e318 100644
--- a/samples/BluetoothHDP/_index.jd
+++ b/samples/BluetoothHDP/_index.jd
@@ -1,6 +1,5 @@
-page.tags="Bluetooth", "HDP"
-sample.tags="Bluetooth", "Health"
-sample.group="Connectivity"
+page.tags="Bluetooth", "HDP", "Health"
+sample.group=Connectivity
 @jd:body
 
 <p>A sample application that demonstrates how to communicate with a Bluetooth Health Device Profile (HDP) device.  This feature is available on Android 4.0 (API level 14) or above platforms. The Android Bluetooth Health API lets you create
diff --git a/samples/BluetoothLeGatt/_index.jd b/samples/BluetoothLeGatt/_index.jd
index b73d519..110ca4a 100644
--- a/samples/BluetoothLeGatt/_index.jd
+++ b/samples/BluetoothLeGatt/_index.jd
@@ -1,6 +1,5 @@
 page.tags="Bluetooth", "LE", "SMART"
-sample.tags="Bluetooth", "LE"
-sample.group="Connectivity"
+sample.group=Connectivity
 @jd:body
 
 <p>A sample application that demonstrates how to communicate with