diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs
index ff875044..a52baa65 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs
@@ -403,7 +403,6 @@ namespace VEPROMS.CSLA.Library
 			if (value == "?")
 			{
 				retval = this.ConvertROToText(rousg, value, rotype, origROFstInfo);
-				if (retval == null) Console.WriteLine("null");
 				Annotation.MakeAnnotation(this.ContentItems[0].MyItem, ItemInfo.VolianCommentType, "", string.Format("RO value ({0}) converted to text", ItemInfo.ConvertToDisplayText(retval)), null);
 				RoUsage.Delete(rousg.ROUsageID);
 				return retval;
@@ -590,8 +589,24 @@ namespace VEPROMS.CSLA.Library
 					if ((gg.Contains("\\u8209?") ? gg.Replace("\\u8209?", "-") : gg) != (newvalue.Contains("\\u8209?") ? newvalue.Replace("\\u8209?", "-") : newvalue))
           {
             _Text = Text.Substring(0, myIndex) + newvalue + Text.Substring(myIndex + myLength);
-						OnStaticContentInfoChange(ii, new StaticContentInfoEventArgs(gg, newvalue,"TX"));
-            break; // Text has been processed
+						if (newvalue == "?")
+						{
+							gg = ItemInfo.ConvertToDisplayText(gg);
+							newvalue = "Invalid Transition";
+							OnStaticContentInfoChange(ii, new StaticContentInfoEventArgs(gg, newvalue, "TX"));
+							break;
+						}
+						if (newvalue.StartsWith(gg) && (newvalue.ToUpper().Contains("BMP") || newvalue.ToUpper().Contains("GIF") || newvalue.ToUpper().Contains("TIF")))
+						{
+							break; // Text has been processed
+						}
+						else
+						{
+							gg = ItemInfo.ConvertToDisplayText(gg);
+							newvalue = ItemInfo.ConvertToDisplayText(newvalue);
+							OnStaticContentInfoChange(ii, new StaticContentInfoEventArgs(gg, newvalue, "TX"));
+							break; // Text has been processed
+						}
           }
         }
       }
@@ -704,8 +719,24 @@ namespace VEPROMS.CSLA.Library
           if ((gg.Replace(@"\'b0", @"\'B0") != newvalue.Replace(@"\'b0", @"\'B0")))
           {
             _Text = Text.Substring(0, myIndex) + newvalue + _Text.Substring(myIndex + myLength);
-						OnStaticContentInfoChange(ii, new StaticContentInfoEventArgs(gg, newvalue, "RO"));
-						break; // Text has been processed
+						if (newvalue == "?")
+						{
+							gg = ItemInfo.ConvertToDisplayText(gg);
+							newvalue = "Deleted RO";
+							OnStaticContentInfoChange(ii, new StaticContentInfoEventArgs(gg, newvalue, "RO"));
+							break;
+						}
+						if (newvalue.StartsWith(gg) && (newvalue.ToUpper().Contains("BMP") || newvalue.ToUpper().Contains("GIF") || newvalue.ToUpper().Contains("TIF")))
+						{
+							break; // Text has been processed
+						}
+						else
+						{
+							gg = ItemInfo.ConvertToDisplayText(gg);
+							newvalue = ItemInfo.ConvertToDisplayText(newvalue);
+							OnStaticContentInfoChange(ii, new StaticContentInfoEventArgs(gg, newvalue, "RO"));
+							break; // Text has been processed
+						}
           }
         }
 			}