Changeset 17714 in main

Timestamp:

01/07/19 12:02:40 (8 months ago)

Author:

LoisHaggard_NM

Message:

NM ibisph-view-content final commit for new yrrs query

Location:

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs

Files:

• AlcBinge.xml (modified) (1 diff)
• AlcDrnk13.xml (modified) (1 diff)
• AlcDrnk30.xml (modified) (1 diff)
• AlcDrnkScl.xml (modified) (1 diff)
• BodyObese.xml (modified) (1 diff)
• BodyOwt.xml (modified) (1 diff)
• BodyOwtObese.xml (modified) (1 diff)
• DrugCoca30.xml (modified) (1 diff)
• DrugCocaEvr.xml (modified) (1 diff)
• DrugDrgScl.xml (modified) (1 diff)
• DrugEcs30.xml (modified) (1 diff)
• DrugEcsLife.xml (modified) (1 diff)
• DrugHer30.xml (modified) (1 diff)
• DrugHerEvr.xml (modified) (1 diff)
• DrugInh30.xml (modified) (1 diff)
• DrugInjLife.xml (modified) (1 diff)
• DrugMari13.xml (modified) (1 diff)
• DrugMari30.xml (modified) (1 diff)
• DrugMeth30.xml (modified) (1 diff)
• DrugMethLife.xml (modified) (1 diff)
• DrugPain30.xml (modified) (1 diff)
• DrugPresLife.xml (modified) (1 diff)
• DrugSynMar30.xml (modified) (1 diff)
• InjBully.xml (modified) (1 diff)
• InjCBully.xml (modified) (1 diff)
• InjConcuss.xml (modified) (1 diff)
• InjDateForce.xml (modified) (1 diff)
• InjDateForce1.xml (modified) (1 diff)
• InjDroveDui.xml (modified) (1 diff)
• InjFight.xml (modified) (1 diff)
• InjFightScl.xml (modified) (1 diff)
• InjForceSex.xml (modified) (1 diff)
• InjGun.xml (modified) (1 diff)
• InjHelmet.xml (modified) (1 diff)
• InjHurtDate.xml (modified) (1 diff)
• InjHurtDate1.xml (modified) (1 diff)
• InjRodeDui.xml (modified) (1 diff)
• InjSeatBelt.xml (modified) (1 diff)
• InjSkipSafe.xml (modified) (1 diff)
• InjText.xml (modified) (1 diff)
• InjWeapScl.xml (modified) (1 diff)
• InjWeapon.xml (modified) (1 diff)
• MentNSSI.xml (modified) (1 diff)
• MentSad.xml (modified) (1 diff)
• MentSuiAtt.xml (modified) (1 diff)
• MentSuiCons.xml (modified) (1 diff)
• MentSuiInj.xml (modified) (1 diff)
• MentSuiPlan.xml (modified) (1 diff)
• NutrBrkfstWeekNo.xml (modified) (1 diff)
• NutrBrkfstWeekYes.xml (modified) (1 diff)
• NutrFiveaDay.xml (modified) (1 diff)
• NutrSoda.xml (modified) (1 diff)
• OthAsthCurr.xml (modified) (1 diff)
• OthAsthEvr.xml (modified) (1 diff)
• OthGamble.xml (modified) (1 diff)
• PhysComp3.xml (modified) (1 diff)
• PhysDlyPE.xml (modified) (1 diff)
• PhysPA0.xml (modified) (1 diff)
• PhysPA5.xml (modified) (1 diff)
• PhysPA7.xml (modified) (1 diff)
• PhysPE0.xml (modified) (1 diff)
• PhysScreen3.xml (modified) (1 diff)
• PhysTV3.xml (modified) (1 diff)
• ResCmCare.xml (modified) (1 diff)
• ResCmGroup.xml (modified) (1 diff)
• ResCmHobby.xml (modified) (1 diff)
• ResCmJob.xml (modified) (1 diff)
• ResCollege.xml (modified) (1 diff)
• ResGrades.xml (modified) (1 diff)
• ResPeerCare.xml (modified) (1 diff)
• ResPrKnow.xml (modified) (1 diff)
• ResPrSclWk.xml (modified) (1 diff)
• ResPrSuc.xml (modified) (1 diff)
• ResScBnd.xml (modified) (1 diff)
• ResScInv.xml (modified) (1 diff)
• ResScListen.xml (modified) (1 diff)
• ResScSuc.xml (modified) (1 diff)
• SexuBCMeth13.xml (modified) (1 diff)
• SexuCondom.xml (modified) (1 diff)
• SexuDualBC.xml (modified) (1 diff)
• SexuRelyBC.xml (modified) (1 diff)
• SexuSex13.xml (modified) (1 diff)
• SexuSex4Evr.xml (modified) (1 diff)
• SexuSexAct.xml (modified) (1 diff)
• SexuSexDrg.xml (modified) (1 diff)
• SexuSexGndr1.xml (modified) (1 diff)
• SexuSexOr.xml (modified) (1 diff)
• SexuSexSame.xml (modified) (1 diff)
• SurvDemoFrgnBrn.xml (modified) (1 diff)
• SurvDemoHomeless.xml (modified) (1 diff)
• SurvDemoPhysDisabl.xml (modified) (1 diff)
• Template.xml (modified) (1 diff)
• TobAnyTob3.xml (modified) (1 diff)
• TobAnyTob4.xml (modified) (1 diff)
• TobAnyTob5.xml (modified) (1 diff)
• TobChew30.xml (modified) (1 diff)
• TobCig13.xml (modified) (1 diff)
• TobCig30.xml (modified) (1 diff)
• TobCigEvr.xml (modified) (1 diff)
• TobCigQuit.xml (modified) (1 diff)
• TobCigScl.xml (modified) (1 diff)
• TobCigar30.xml (modified) (1 diff)
• TobEnvSmoke.xml (modified) (1 diff)
• TobFrCig.xml (modified) (1 diff)
• TobHookah30.xml (modified) (1 diff)
• TobVape30.xml (modified) (1 diff)
• TobVapeEvr.xml (modified) (1 diff)
• dimension/SurvDemoFrgnBrn.xml (modified) (1 diff)
• dimension/SurvDemoHomeless.xml (modified) (1 diff)
• dimension/SurvDemoPhysDisabl.xml (modified) (1 diff)
• dimension/SurvDemoUSABrn.xml (modified) (1 diff)
• section/Year.xml (modified) (1 diff)
• text/InjDroveDui.xml (modified) (1 diff)
• text/InjRodeDui.xml (modified) (1 diff)
• text/TobAnyTob3.xml (modified) (1 diff)
• text/TobAnyTob4.xml (modified) (1 diff)
• zTemplate.xml (modified) (1 diff)

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/AlcBinge.xml

@@ -70 +70 @@
                         <TITLE>Binge drinking</TITLE>
                         <DESCRIPTION><ibis:include href='text/AlcBinge.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/AlcDrnk13.xml

@@ -70 +70 @@
                         <TITLE>First drank alcohol before age 13</TITLE>
                         <DESCRIPTION><ibis:include href='text/AlcDrnk13.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/AlcDrnk30.xml

@@ -70 +70 @@
                         <TITLE>Current drinking</TITLE>
                         <DESCRIPTION><ibis:include href='text/AlcDrnk30.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/AlcDrnkScl.xml

@@ -70 +70 @@
                         <TITLE>Drank alcohol on school property in the past 30 days</TITLE>
                         <DESCRIPTION><ibis:include href='text/AlcDrnkScl.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/BodyObese.xml

@@ -70 +70 @@
                         <TITLE>Obese</TITLE>
                         <DESCRIPTION><ibis:include href='text/BodyObese.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/BodyOwt.xml

@@ -70 +70 @@
                         <TITLE>Overweight</TITLE>
                         <DESCRIPTION><ibis:include href='text/BodyOwt.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/BodyOwtObese.xml

@@ -70 +70 @@
                         <TITLE>Overweight or obese</TITLE>
                         <DESCRIPTION><ibis:include href='text/BodyOwtObese.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/DrugCoca30.xml

@@ -70 +70 @@
                         <TITLE>Current cocaine use</TITLE>
                         <DESCRIPTION><ibis:include href='text/DrugCoca30.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/DrugCocaEvr.xml

@@ -70 +70 @@
                         <TITLE>Ever used cocaine</TITLE>
                         <DESCRIPTION><ibis:include href='text/DrugCocaEvr.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/DrugDrgScl.xml

@@ -70 +70 @@
                         <TITLE>Offered drugs on school property in the past 12 months</TITLE>
                         <DESCRIPTION><ibis:include href='text/DrugDrgScl.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/DrugEcs30.xml

@@ -70 +70 @@
                         <TITLE>Current ecstasy use</TITLE>
                         <DESCRIPTION><ibis:include href='text/DrugEcs30.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/DrugEcsLife.xml

@@ -70 +70 @@
                         <TITLE>Ever used ecstasy</TITLE>
                         <DESCRIPTION><ibis:include href='text/DrugEcsLife.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/DrugHer30.xml

@@ -70 +70 @@
                         <TITLE>Current heroin use</TITLE>
                         <DESCRIPTION><ibis:include href='text/DrugHer30.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/DrugHerEvr.xml

@@ -70 +70 @@
                         <TITLE>Ever used heroin</TITLE>
                         <DESCRIPTION><ibis:include href='text/DrugHerEvr.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/DrugInh30.xml

@@ -70 +70 @@
                         <TITLE>Current inhalant use</TITLE>
                         <DESCRIPTION><ibis:include href='text/DrugInh30.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/DrugInjLife.xml

@@ -70 +70 @@
                         <TITLE>Ever injected illegal drugs</TITLE>
                         <DESCRIPTION><ibis:include href='text/DrugInjLife.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/DrugMari13.xml

@@ -70 +70 @@
                         <TITLE>First used marijuana before age 13</TITLE>
                         <DESCRIPTION><ibis:include href='text/DrugMari13.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/DrugMari30.xml

@@ -70 +70 @@
                         <TITLE>Current marijuana use</TITLE>
                         <DESCRIPTION><ibis:include href='text/DrugMari30.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/DrugMeth30.xml

@@ -70 +70 @@
                         <TITLE>Current methamphetamine use</TITLE>
                         <DESCRIPTION><ibis:include href='text/DrugMeth30.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/DrugMethLife.xml

@@ -70 +70 @@
                         <TITLE>Ever used methamphetamine use</TITLE>
                         <DESCRIPTION><ibis:include href='text/DrugMethLife.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/DrugPain30.xml

@@ -70 +70 @@
                         <TITLE>Current pain killer use to get high</TITLE>
                         <DESCRIPTION><ibis:include href='text/DrugPain30.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/DrugPresLife.xml

@@ -70 +70 @@
                         <TITLE>Ever used prescription drugs without a doctor's prescription</TITLE>
                         <DESCRIPTION><ibis:include href='text/DrugPresLife.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/DrugSynMar30.xml

@@ -70 +70 @@
                         <TITLE>Current synthetic marijuana use</TITLE>
                         <DESCRIPTION><ibis:include href='text/DrugSynMar30.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/InjBully.xml

@@ -70 +70 @@
                         <TITLE>Bullied on school property in the past 12 months</TITLE>
                         <DESCRIPTION><ibis:include href='text/InjBully.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/InjCBully.xml

@@ -70 +70 @@
                         <TITLE>Electronically bullied</TITLE>
                         <DESCRIPTION><ibis:include href='text/InjCBully.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/InjConcuss.xml

@@ -70 +70 @@
                         <TITLE>Sports-related concussion</TITLE>
                         <DESCRIPTION><ibis:include href='text/InjConcuss.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/InjDateForce.xml

@@ -70 +70 @@
                         <TITLE>Sexual dating violence in the past 12 months, among those who dated</TITLE>
                         <DESCRIPTION><ibis:include href='text/InjDateForce.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/InjDateForce1.xml

@@ -70 +70 @@
                         <TITLE>Sexual dating violence in the past 12 months</TITLE>
                         <DESCRIPTION><ibis:include href='text/InjDateForce1.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/InjDroveDui.xml

@@ -70 +70 @@
                         <TITLE>Drinking and driving in the past 30 days, among those who drove</TITLE>
                         <DESCRIPTION><ibis:include href='text/InjDroveDui.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/InjFight.xml

@@ -70 +70 @@
                         <TITLE>In a physical fight in the past 12 months</TITLE>
                         <DESCRIPTION><ibis:include href='text/InjFight.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/InjFightScl.xml

@@ -70 +70 @@
                         <TITLE>In a physical fight on school property in the past 12 months</TITLE>
                         <DESCRIPTION><ibis:include href='text/InjFightScl.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/InjForceSex.xml

@@ -70 +70 @@
                         <TITLE>Ever physically forced to have sexual intercourse</TITLE>
                         <DESCRIPTION><ibis:include href='text/InjForceSex.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/InjGun.xml

@@ -70 +70 @@
                         <TITLE>Carried a gun in the past 30 days</TITLE>
                         <DESCRIPTION><ibis:include href='text/InjGun.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/InjHelmet.xml

@@ -70 +70 @@
                         <TITLE>Wore a bicycle helmet during past 12 months, among those who rode a bicycle</TITLE>
                         <DESCRIPTION><ibis:include href='text/InjHelmet.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/InjHurtDate.xml

@@ -70 +70 @@
                         <TITLE>Physical dating violence in the past 12 months, among those who dated</TITLE>
                         <DESCRIPTION><ibis:include href='text/InjHurtDate.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/InjHurtDate1.xml

@@ -70 +70 @@
                         <TITLE>Physical dating violence in the past 12 months</TITLE>
                         <DESCRIPTION><ibis:include href='text/InjHurtDate1.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/InjRodeDui.xml

@@ -70 +70 @@
                         <TITLE>Rode with a drinking driver in the past 30 days</TITLE>
                         <DESCRIPTION><ibis:include href='text/InjRodeDui.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/InjSeatBelt.xml

@@ -70 +70 @@
                         <TITLE>Rarely or never wore a seatbelt</TITLE>
                         <DESCRIPTION><ibis:include href='text/InjSeatBelt.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <DEFAULT_MAP_NAME>ReverseColor</DEFAULT_MAP_NAME>
                         <MEASURES>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/InjSkipSafe.xml

@@ -70 +70 @@
                         <TITLE>Skipped school because of safety concerns in the past 30 days</TITLE>
                         <DESCRIPTION><ibis:include href='text/InjSkipSafe.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/InjText.xml

@@ -70 +70 @@
                         <TITLE>Texted or emailed while driving in the past 30 days, among those who drove</TITLE>
                         <DESCRIPTION><ibis:include href='text/InjText.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/InjWeapScl.xml

@@ -70 +70 @@
                         <TITLE>Carried a weapon on school property in the past 30 days</TITLE>
                         <DESCRIPTION><ibis:include href='text/InjWeapScl.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/InjWeapon.xml

@@ -70 +70 @@
                         <TITLE>Carried a weapon in the past 30 days</TITLE>
                         <DESCRIPTION><ibis:include href='text/InjWeapon.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/MentNSSI.xml

@@ -70 +70 @@
                         <TITLE>Non-suicidal self injury</TITLE>
                         <DESCRIPTION><ibis:include href='text/MentNSSI.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/MentSad.xml

@@ -70 +70 @@
                         <TITLE>Sadness or hopelessness</TITLE>
                         <DESCRIPTION><ibis:include href='text/MentSad.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/MentSuiAtt.xml

@@ -70 +70 @@
                         <TITLE>Attempted suicide in the past 12 months</TITLE>
                         <DESCRIPTION><ibis:include href='text/MentSuiAtt.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/MentSuiCons.xml

@@ -70 +70 @@
                         <TITLE>Seriously considered suicided in the past 12 months</TITLE>
                         <DESCRIPTION><ibis:include href='text/MentSuiCons.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/MentSuiInj.xml

@@ -70 +70 @@
                         <TITLE>Injured in a suicide attempt in the past 12 months</TITLE>
                         <DESCRIPTION><ibis:include href='text/MentSuiInj.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/MentSuiPlan.xml

@@ -70 +70 @@
                         <TITLE>Made a suicide plan in the past 12 months</TITLE>
                         <DESCRIPTION><ibis:include href='text/MentSuiPlan.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/NutrBrkfstWeekNo.xml

@@ -70 +70 @@
                         <TITLE>Did not eat breakfast on any of last 7 days</TITLE>
                         <DESCRIPTION><ibis:include href='text/NutrBrkfstWeekNo.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/NutrBrkfstWeekYes.xml

@@ -70 +70 @@
                         <TITLE>Ate breakfast daily</TITLE>
                         <DESCRIPTION><ibis:include href='text/NutrBrkfstWeekYes.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/NutrFiveaDay.xml

@@ -70 +70 @@
                         <TITLE>Five or more servings of fruits or vegetables per day</TITLE>
                         <DESCRIPTION><ibis:include href='text/NutrFiveaDay.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <DEFAULT_MAP_NAME>ReverseColor</DEFAULT_MAP_NAME>
                         <MEASURES>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/NutrSoda.xml

@@ -70 +70 @@
                         <TITLE>Daily soda consumption</TITLE>
                         <DESCRIPTION><ibis:include href='text/NutrSoda.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/OthAsthCurr.xml

@@ -70 +70 @@
                         <TITLE>Currently has asthma</TITLE>
                         <DESCRIPTION><ibis:include href='text/OthAsthCurr.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/OthAsthEvr.xml

@@ -70 +70 @@
                         <TITLE>Ever told has asthma</TITLE>
                         <DESCRIPTION><ibis:include href='text/OthAsthEvr.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/OthGamble.xml

@@ -70 +70 @@
                         <TITLE>Gambled in the last 12 months</TITLE>
                         <DESCRIPTION><ibis:include href='text/OthGamble.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/PhysComp3.xml

@@ -70 +70 @@
                         <TITLE>Used a computer or played video games three or more hours per day on an average school day</TITLE>
                         <DESCRIPTION><ibis:include href='text/PhysComp3.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/PhysDlyPE.xml

@@ -70 +70 @@
                         <TITLE>Attended physical education (PE) classes daily</TITLE>
                         <DESCRIPTION><ibis:include href='text/PhysDlyPE.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <DEFAULT_MAP_NAME>ReverseColor</DEFAULT_MAP_NAME>
                         <MEASURES>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/PhysPA0.xml

@@ -70 +70 @@
                         <TITLE>Physically active on no days per week</TITLE>
                         <DESCRIPTION><ibis:include href='text/PhysPA0.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/PhysPA5.xml

@@ -70 +70 @@
                         <TITLE>Physically active 5 days per week</TITLE>
                         <DESCRIPTION><ibis:include href='text/PhysPA5.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <DEFAULT_MAP_NAME>ReverseColor</DEFAULT_MAP_NAME>
                         <MEASURES>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/PhysPA7.xml

@@ -70 +70 @@
                         <TITLE>Physically active 7 days per week</TITLE>
                         <DESCRIPTION><ibis:include href='text/PhysPA7.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <DEFAULT_MAP_NAME>ReverseColor</DEFAULT_MAP_NAME>
                         <MEASURES>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/PhysPE0.xml

@@ -70 +70 @@
                         <TITLE>Did not attend physical education (PE) classes in an average school week</TITLE>
                         <DESCRIPTION><ibis:include href='text/PhysPE0.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/PhysScreen3.xml

@@ -70 +70 @@
                         <TITLE>Three or more hours per day of total screen time, on an average school day</TITLE>
                         <DESCRIPTION><ibis:include href='text/PhysScreen3.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/PhysTV3.xml

@@ -70 +70 @@
                         <TITLE>Watched TV three or more hours per day on an average school day</TITLE>
                         <DESCRIPTION><ibis:include href='text/PhysTV3.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/ResCmCare.xml

@@ -70 +70 @@
                         <TITLE>How true: Outside my home and school, there is an adult who cares about me</TITLE>
                         <DESCRIPTION><ibis:include href='text/ResCmCare.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <DEFAULT_MAP_NAME>ReverseColor</DEFAULT_MAP_NAME>
                         <MEASURES>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/ResCmGroup.xml

@@ -70 +70 @@
                         <TITLE>How true: Outside my home and school, I am involved in group activities</TITLE>
                         <DESCRIPTION><ibis:include href='text/ResCmGroup.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <DEFAULT_MAP_NAME>ReverseColor</DEFAULT_MAP_NAME>
                         <MEASURES>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/ResCmHobby.xml

@@ -70 +70 @@
                         <TITLE>How true: Outside my home and school, I am involved in music, ar, literature, sports, or a hobby</TITLE>
                         <DESCRIPTION><ibis:include href='text/ResCmHobby.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <DEFAULT_MAP_NAME>ReverseColor</DEFAULT_MAP_NAME>
                         <MEASURES>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/ResCmJob.xml

@@ -70 +70 @@
                         <TITLE>How true: Outside my home and school, there is an adult who tells me when I do a good job</TITLE>
                         <DESCRIPTION><ibis:include href='text/ResCmJob.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <DEFAULT_MAP_NAME>ReverseColor</DEFAULT_MAP_NAME>
                         <MEASURES>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/ResCollege.xml

@@ -70 +70 @@
                         <TITLE>How true: I plan to continue my education after high school</TITLE>
                         <DESCRIPTION><ibis:include href='text/ResCollege.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <DEFAULT_MAP_NAME>ReverseColor</DEFAULT_MAP_NAME>
                         <MEASURES>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/ResGrades.xml

@@ -70 +70 @@
                         <TITLE>Grades earned in school</TITLE>
                         <DESCRIPTION><ibis:include href='text/ResGrades.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <DEFAULT_MAP_NAME>ReverseColor</DEFAULT_MAP_NAME>
                         <MEASURES>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/ResPeerCare.xml

@@ -70 +70 @@
                         <TITLE>How true: I have a friend who really cares about me</TITLE>
                         <DESCRIPTION><ibis:include href='text/ResPeerCare.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <DEFAULT_MAP_NAME>ReverseColor</DEFAULT_MAP_NAME>
                         <MEASURES>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/ResPrKnow.xml

@@ -70 +70 @@
                         <TITLE>How true: A parent knows where I am when I'm not home</TITLE>
                         <DESCRIPTION><ibis:include href='text/ResPrKnow.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <DEFAULT_MAP_NAME>ReverseColor</DEFAULT_MAP_NAME>
                         <MEASURES>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/ResPrSclWk.xml

@@ -70 +70 @@
                         <TITLE>How true: A parent is interested in my school work</TITLE>
                         <DESCRIPTION><ibis:include href='text/ResPrSclWk.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <DEFAULT_MAP_NAME>ReverseColor</DEFAULT_MAP_NAME>
                         <MEASURES>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/ResPrSuc.xml

@@ -70 +70 @@
                         <TITLE>How true: A parent believes I'll be a success</TITLE>
                         <DESCRIPTION><ibis:include href='text/ResPrSuc.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <DEFAULT_MAP_NAME>ReverseColor</DEFAULT_MAP_NAME>
                         <MEASURES>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/ResScBnd.xml

@@ -70 +70 @@
                         <TITLE>How true: At school, there are clear rules about behavior</TITLE>
                         <DESCRIPTION><ibis:include href='text/ResScBnd.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <DEFAULT_MAP_NAME>ReverseColor</DEFAULT_MAP_NAME>
                         <MEASURES>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/ResScInv.xml

@@ -70 +70 @@
                         <TITLE>How true: At school, I'm involved in extra-curricular activities</TITLE>
                         <DESCRIPTION><ibis:include href='text/ResScInv.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <DEFAULT_MAP_NAME>ReverseColor</DEFAULT_MAP_NAME>
                         <MEASURES>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/ResScListen.xml

@@ -70 +70 @@
                         <TITLE>How true: At school, a teacher or other adult listens to me</TITLE>
                         <DESCRIPTION><ibis:include href='text/ResScListen.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <DEFAULT_MAP_NAME>ReverseColor</DEFAULT_MAP_NAME>
                         <MEASURES>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/ResScSuc.xml

@@ -70 +70 @@
                         <TITLE>How true: At school, a teacher or other adult believes I'll be a success</TITLE>
                         <DESCRIPTION><ibis:include href='text/ResScSuc.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <DEFAULT_MAP_NAME>ReverseColor</DEFAULT_MAP_NAME>
                         <MEASURES>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/SexuBCMeth13.xml

@@ -70 +70 @@
                         <TITLE>Birth control method, among sexually active students</TITLE>
                         <DESCRIPTION><ibis:include href='text/SexuBCMeth13.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <DEFAULT_MAP_NAME>ReverseColor</DEFAULT_MAP_NAME>
                         <MEASURES>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/SexuCondom.xml

@@ -70 +70 @@
                         <TITLE>Condom use, among sexually active students</TITLE>
                         <DESCRIPTION><ibis:include href='text/SexuCondom.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <DEFAULT_MAP_NAME>ReverseColor</DEFAULT_MAP_NAME>
                         <MEASURES>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/SexuDualBC.xml

@@ -70 +70 @@
                         <TITLE>Used both a condom and highly effective birth control, among sexually active students</TITLE>
                         <DESCRIPTION><ibis:include href='text/SexuDualBC.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <DEFAULT_MAP_NAME>ReverseColor</DEFAULT_MAP_NAME>
                         <MEASURES>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/SexuRelyBC.xml

@@ -70 +70 @@
                         <TITLE>Highly effective birth control method</TITLE>
                         <DESCRIPTION><ibis:include href='text/SexuRelyBC.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <DEFAULT_MAP_NAME>ReverseColor</DEFAULT_MAP_NAME>
                         <MEASURES>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/SexuSex13.xml

@@ -70 +70 @@
                         <TITLE>First had sexual intercourse before age 13</TITLE>
                         <DESCRIPTION><ibis:include href='text/SexuSex13.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/SexuSex4Evr.xml

@@ -70 +70 @@
                         <TITLE>Four or more lifetime sexual partners</TITLE>
                         <DESCRIPTION><ibis:include href='text/SexuSex4Evr.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/SexuSexAct.xml

@@ -70 +70 @@
                         <TITLE>Sexually active</TITLE>
                         <DESCRIPTION><ibis:include href='text/SexuSexAct.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/SexuSexDrg.xml

@@ -70 +70 @@
                         <TITLE>Used alcohol or drugs before sexual intercourse, among sexually active students</TITLE>
                         <DESCRIPTION><ibis:include href='text/SexuSexDrg.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/SexuSexGndr1.xml

@@ -70 +70 @@
                         <TITLE>Ever had sexual contact with someone of the same sex</TITLE>
                         <DESCRIPTION><ibis:include href='text/SexuSexGndr1.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/SexuSexOr.xml

@@ -70 +70 @@
                         <TITLE>Sexual Orientation</TITLE>
                         <DESCRIPTION><ibis:include href='text/SexuSexOr.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/SexuSexSame.xml

@@ -70 +70 @@
                         <TITLE>Had sexual contact with someone of the same sex at least once in lifetime</TITLE>
                         <DESCRIPTION><ibis:include href='text/SexuSexSame.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/SurvDemoFrgnBrn.xml

@@ -70 +70 @@
                         <TITLE>Born outside the United States</TITLE>
                         <DESCRIPTION><ibis:include href='text/SurvDemoFrgnBrn.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/SurvDemoHomeless.xml

@@ -70 +70 @@
                         <TITLE>Unstable housing/homeless</TITLE>
                         <DESCRIPTION><ibis:include href='text/SurvDemoHomeless.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/SurvDemoPhysDisabl.xml

@@ -70 +70 @@
                         <TITLE>Physical disabilities or long-term health problems</TITLE>
                         <DESCRIPTION><ibis:include href='text/SurvDemoPhysDisabl.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/Template.xml

@@ -70 +70 @@
                         <TITLE>ShortTitle</TITLE>
                         <DESCRIPTION><ibis:include href='text/DimName.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/TobAnyTob3.xml

@@ -70 +70 @@
                         <TITLE>Current (last 30 days) use of at least one of cigarettes, cigars, or spit tobacco</TITLE>
                         <DESCRIPTION><ibis:include href='text/TobAnyTob3.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/TobAnyTob4.xml

@@ -70 +70 @@
                         <TITLE>Current (last 30 days) use of at least one of cigarettes, cigars, hookah or spit tobacco</TITLE>
                         <DESCRIPTION><ibis:include href='text/TobAnyTob4.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/TobAnyTob5.xml

@@ -70 +70 @@
                         <TITLE>Current (last 30 days) use at least one form of tobacco (cigarettes, cigars, hookah, spit tobacco, or e-cigarettes)</TITLE>
                         <DESCRIPTION><ibis:include href='text/TobAnyTob5.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/TobChew30.xml

@@ -70 +70 @@
                         <TITLE>Current (last 30 days) spit tobacco use</TITLE>
                         <DESCRIPTION><ibis:include href='text/TobChew30.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/TobCig13.xml

@@ -70 +70 @@
                         <TITLE>First smoked cigarettes before age 13</TITLE>
                         <DESCRIPTION><ibis:include href='text/TobCig13.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/TobCig30.xml

@@ -70 +70 @@
                         <TITLE>Current (last 30 days) cigarette use</TITLE>
                         <DESCRIPTION><ibis:include href='text/TobCig30.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/TobCigEvr.xml

@@ -70 +70 @@
                         <TITLE>Ever tried cigarette smoking</TITLE>
                         <DESCRIPTION><ibis:include href='text/TobCigEvr.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/TobCigQuit.xml

@@ -70 +70 @@
                         <TITLE>Tried to quit smoking cigarettes in the past 12 months, among students who smoked</TITLE>
                         <DESCRIPTION><ibis:include href='text/TobCigQuit.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <DEFAULT_MAP_NAME>ReverseColor</DEFAULT_MAP_NAME>
                         <MEASURES>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/TobCigScl.xml

@@ -70 +70 @@
                         <TITLE>Smoked cigarettes on school property</TITLE>
                         <DESCRIPTION><ibis:include href='text/TobCigScl.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/TobCigar30.xml

@@ -70 +70 @@
                         <TITLE>Current (last 30 days) cigar use</TITLE>
                         <DESCRIPTION><ibis:include href='text/TobCigar30.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/TobEnvSmoke.xml

@@ -70 +70 @@
                         <TITLE>In the same room with someone smoking cigarettes at least once in the last 7 days</TITLE>
                         <DESCRIPTION><ibis:include href='text/TobEnvSmoke.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/TobFrCig.xml

@@ -70 +70 @@
                         <TITLE>Frequent cigarette smoker</TITLE>
                         <DESCRIPTION><ibis:include href='text/TobFrCig.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/TobHookah30.xml

@@ -70 +70 @@
                         <TITLE>Current (last 30 days) hookah use</TITLE>
                         <DESCRIPTION><ibis:include href='text/TobHookah30.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/TobVape30.xml

@@ -70 +70 @@
                         <TITLE>Current (last 30 days) e-cigarette use</TITLE>
                         <DESCRIPTION><ibis:include href='text/TobVape30.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/TobVapeEvr.xml

@@ -70 +70 @@
                         <TITLE>Ever used e-cigarettes in lifetime</TITLE>
                         <DESCRIPTION><ibis:include href='text/TobVapeEvr.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/dimension/SurvDemoFrgnBrn.xml

@@ -3 +3 @@
 <DIMENSION>
         <NAME>SurvDemoFrgnBrn</NAME>
-        <TITLE>Born outside the United States (choose year 2017 only)</TITLE>
+        <TITLE>Born outside the United States (available in 2017 only)</TITLE>
         <VALUES>
                 <VALUE>0<TITLE>Born in the US</TITLE></VALUE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/dimension/SurvDemoHomeless.xml

@@ -3 +3 @@
 <DIMENSION>
         <NAME>SurvDemoHomeless</NAME>
-        <TITLE>Unstable housing/homeless (choose from years 2015-forward only)</TITLE>
+        <TITLE>Unstable housing/homeless (only years 2015-forward are included)</TITLE>
         <VALUES>
                 <VALUE>1<TITLE>Stable housing</TITLE></VALUE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/dimension/SurvDemoPhysDisabl.xml

@@ -3 +3 @@
 <DIMENSION>
         <NAME>SurvDemoPhysDisabl</NAME>
-        <TITLE>Physical disabilities (choose from years 2015-forward only)</TITLE>
+        <TITLE>Physical disabilities (only years 2015-forward are included)</TITLE>
         <VALUES>
                 <VALUE>1<TITLE>No physical disability or long-term health problem</TITLE></VALUE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/dimension/SurvDemoUSABrn.xml

@@ -3 +3 @@
 <DIMENSION>
         <NAME>SurvDemoUSABrn</NAME>
-        <TITLE>Born inside the United States (choose from years 2015-forward only)</TITLE>
+        <TITLE>Born inside the United States (only years 2015-forward are included)</TITLE>
         <VALUES>
                 <VALUE>1<TITLE>Foreign born</TITLE></VALUE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/section/Year.xml

@@ -9 +9 @@
                         <NAME>Year</NAME>
                         <VALUES>
-                                <VALUE>2013</VALUE>
                                 <VALUE>2015</VALUE>
                                 <VALUE>2017</VALUE>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/text/InjDroveDui.xml

@@ -2 +2 @@
 
 <TEXT xmlns:ibis='http://www.ibisph.org'>
-        Answered one or more times to the question, "During the past 30 days, how many 
-        times did you drive a car or other vehicle when you had been drinking alcohol?", 
-        among those who drove a vehicle in the past 30 days.
+        Answered one or more times to the question, "During the past 30 days, 
+        how many times did you drive a car or other vehicle when you had been 
+        drinking alcohol?"
 </TEXT>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/text/InjRodeDui.xml

@@ -4 +4 @@
         Answered one or more times to the question, "During the past 30 days, 
         how many times did you ride in a car or other vehicle driven by someone who 
-        had been drinking alcohol?", among those who rode with a drinking driver 
-        in the past 30 days.
+        had been drinking alcohol?"
 </TEXT>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/text/TobAnyTob3.xml

@@ -2 +2 @@
 
 <TEXT xmlns:ibis='http://www.ibisph.org'>
-        Used at least one of cigarettes, cigars,  or spit tobacco in the past 30 days
+        Used at least one of three tobacco products (cigarettes, cigars, 
+        or spit tobacco) on at least one of the past 30 days
 </TEXT>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/text/TobAnyTob4.xml

@@ -2 +2 @@
 
 <TEXT xmlns:ibis='http://www.ibisph.org'>
-        Used at least one of cigarettes, cigars, hookah, or spit tobacco in the past 30 days
+        Used at least one of the four tobacco products (cigarettes, 
+        cigars, hookah, or spit tobacco) in the past 30 days
 </TEXT>

adopters/nm/branches/2.3/src/main/webapps/ibisph-view-content/xml/query/module/yrrs/zTemplate.xml

@@ -70 +70 @@
                         <TITLE>ShortTitle</TITLE>
                         <DESCRIPTION><ibis:include href='text/DimName.xml'/></DESCRIPTION>
-                        <DEFAULT_CATEGORY_DIMENSION_NAME>Year</DEFAULT_CATEGORY_DIMENSION_NAME>
+                        <DEFAULT_CATEGORY_DIMENSION_NAME>SurvDemoGrade</DEFAULT_CATEGORY_DIMENSION_NAME>
                         <MEASURES>
                                 <MEASURE>