Index: lams_common/src/flash/org/lamsfoundation/lams/common/dict/Dictionary.as
===================================================================
diff -u -r24e0021a16e0db090e51d9af0b700ce838b95591 -r287f10e65058b7ad8688c2b767bdc64c372b701a
--- lams_common/src/flash/org/lamsfoundation/lams/common/dict/Dictionary.as	(.../Dictionary.as)	(revision 24e0021a16e0db090e51d9af0b700ce838b95591)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/dict/Dictionary.as	(.../Dictionary.as)	(revision 287f10e65058b7ad8688c2b767bdc64c372b701a)
@@ -72,9 +72,16 @@
     /**
     * @returns a string holding the text requested
     */
-    public static function getValue(id:Number):String{
+    public static function getValue(key:String):String{
         //Debugger.log('returning item-' +id + '-' + items.get(id).value,Debugger.GEN,'getItemById','org.lamsfoundation.lams.dict.Dictionary');
-        return _instance.items.get(id).value;
+        var v:String = _instance.items.get(key).value;
+		if(v!=null){
+			return v;
+		}else{
+			Debugger.log('Entry not found in '+_currentLanguage+' dictionary, key='+key,Debugger.CRITICAL,'createFromData','Dictionary');
+		}
+		
+		
     }
     
     /**
@@ -91,7 +98,7 @@
         //Go through hash of dictionary items and get data objects for each
         for(var i=0;i<hashKeys.length;i++){
             obj.dictionaryItems[i] = hashValues[i].toData();
-            obj.dictionaryItems[i].hashKey = hashKeys[i];
+            obj.dictionaryItems[i].key = hashKeys[i];
         }
         return obj;
     }
@@ -109,8 +116,8 @@
         //Go through data object and copy values to items hash
         for(var i=0;i<dataObj.dictionaryItems.length;i++){
             //Create hashKey object and then prune hashkey from dataObject before adding dictionary item to hashtable 
-            var hashKey = dataObj.dictionaryItems[i].hashKey;
-            delete dataObj.dictionaryItems[i].hashKey;
+            var hashKey = dataObj.dictionaryItems[i].key;
+            delete dataObj.dictionaryItems[i].key;
             //Create the dictionary item from the data object
             var dictItem:DictionaryItem = DictionaryItem.createFromData(dataObj.dictionaryItems[i]);
             items.put(hashKey,dictItem);
@@ -145,7 +152,7 @@
         //Create the dictionary from the data obj
         createFromData(dictionaryDataObj);
 		
-        //Now that theme has been loaded by server, cache it 
+        //Now that dict has been loaded by server, cache it 
         saveToDisk();		
     }
 
@@ -163,7 +170,8 @@
     * REMOVE WHEN NO LONGER REQUIRED
     */
     public function createDictionaryFromCode(lang:String) {
-        //_global.breakpoint();
+        Debugger.log('SHOULD NOT BE CALLED _ NO LONGER USED!!',Debugger.CRITICAL,'createDictionaryFromCode','Dictionary');
+		//_global.breakpoint();
         //Clear the dictionary + set language
         items.clear();
         _currentLanguage = lang;
Index: lams_common/src/flash/org/lamsfoundation/lams/common/dict/DictionaryItem.as
===================================================================
diff -u -r8d4ee1f2a11e764d400d8103e4bef7daef1fce0b -r287f10e65058b7ad8688c2b767bdc64c372b701a
--- lams_common/src/flash/org/lamsfoundation/lams/common/dict/DictionaryItem.as	(.../DictionaryItem.as)	(revision 8d4ee1f2a11e764d400d8103e4bef7daef1fce0b)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/dict/DictionaryItem.as	(.../DictionaryItem.as)	(revision 287f10e65058b7ad8688c2b767bdc64c372b701a)
@@ -6,14 +6,14 @@
 */
 class DictionaryItem {
     
-	private var _id:Number;
-	private var _name:String;
+	private var _key:String;
+	private var _description:String;
 	private var _value:String;
 
-	public function DictionaryItem(id:Number,name:String,value:String) {
+	public function DictionaryItem(key:String, value:String,description:String) {
 		//constructor 
-        _id = id;
-        _name = name;
+        _key = key;
+        _description = description;
         _value = value;
 	}
     
@@ -22,8 +22,8 @@
     */
     public function toData():Object{
         var obj:Object = {};
-        obj.id = _id;
-        obj.name = _name;
+        obj.key = _key;
+        obj.description = _description;
         obj.value = _value;
         return obj;
     }
@@ -32,7 +32,7 @@
     * Create Dictionary item from dataObject
     */
     public static function createFromData(dataobj:Object):DictionaryItem{
-        var dictionaryItem:DictionaryItem =  new DictionaryItem(dataobj.id,dataobj.name,dataobj.value)
+        var dictionaryItem:DictionaryItem =  new DictionaryItem(dataobj.key,dataobj.description,dataobj.value)
         return dictionaryItem;
     }