Index: trunk/grails-app/services/AssetReportService.groovy
===================================================================
--- trunk/grails-app/services/AssetReportService.groovy	(revision 677)
+++ trunk/grails-app/services/AssetReportService.groovy	(revision 678)
@@ -64,5 +64,5 @@
                 // Add all attribType columns.
                 result.attribTypes.each { column ->
-                    rows[assetResult.name][column] = null
+                    rows[assetResult.name][column] = '-'
                 }
             }
@@ -181,5 +181,5 @@
                 // Add all attribType columns.
                 result.attribTypes.each { column ->
-                    rows[rowKey][column] = null
+                    rows[rowKey][column] = '-'
                 }
             }
Index: trunk/grails-app/services/CreateDataService.groovy
===================================================================
--- trunk/grails-app/services/CreateDataService.groovy	(revision 677)
+++ trunk/grails-app/services/CreateDataService.groovy	(revision 678)
@@ -1382,9 +1382,9 @@
 
         //ExtendedAttributeType #9
-        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Hazards Identified")
+        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "ecr")
         saveAndTest(extendedAttributeTypeInstance)
 
         //ExtendedAttributeType #10
-        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Risk Assesment")
+        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Risk Level")
         saveAndTest(extendedAttributeTypeInstance)
 
@@ -1394,9 +1394,9 @@
 
         //ExtendedAttributeType #12
-        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Maintenance Frequency")
+        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Regulatory Requirement")
         saveAndTest(extendedAttributeTypeInstance)
 
         //ExtendedAttributeType #13
-        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Maintenance Date")
+        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Maintenance % Completion")
         saveAndTest(extendedAttributeTypeInstance)
 
@@ -1600,5 +1600,5 @@
 
         //AssetExtendedAttribute #5
-        assetExtendedAttributeInstance = new AssetExtendedAttribute(value: "Crushing, Electrical, Pinch Points, Trip/Fall, High Pressure Air",
+        assetExtendedAttributeInstance = new AssetExtendedAttribute(value: "3",
                                                                                                                     asset: Asset.get(1),
                                                                                                                     extendedAttributeType: ExtendedAttributeType.get(9))