diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
index 3d56a5a1..bc5c833a 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
@@ -1579,7 +1579,21 @@ namespace VEPROMS.CSLA.Library
 				return ((FirstSibling.ItemPartCount > 0) && (FirstSibling.ItemParts[0].PartType == E_FromType.Note));
 			}
 		}
-
+		// B2017-004 check to see if step part is inside a Caution or Note (used to determin which Table types to include in the change step type list)
+		public bool IsInCautionOrNote
+		{
+			get
+			{
+				bool rval = false;
+				ItemInfo itm = this;
+				while (itm != null &&!itm.IsHigh && !rval)
+				{
+					rval = itm.IsCautionOrNotePart;
+					if (!rval) itm = itm.MyParent;
+				}
+				return rval;
+			}
+		}
 		public bool IsType(string type)
 		{
 			if ((int)MyContent.Type < 20000) return false;
diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
index 4ce881a4..3cdfb798 100644
--- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
@@ -632,12 +632,14 @@ namespace VEPROMS.CSLA.Library
 				{
 					// if equation type && in single column mode, put out the rnomenu list, and skip the AER items
 					bool singleColEq = (topType.Type.ToUpper().Contains("EQUATION") && _CurItemInfo.ColumnMode == 0);
+					// B2017-004 if a Table type && in single column mode or in a Note or Caution, don't list the AER Table option
+					bool singleColTable = (_CurItemInfo.IsTable && _CurItemInfo.ColumnMode == 0) || _CurItemInfo.IsInCautionOrNote;
 					if ((singleColEq ||_CurItemInfo.IsInRNO || _CurItemInfo.IsCaution || _CurItemInfo.IsNote) && topType.StepEditData.TypeMenu.RnoMenuItem != null && topType.StepEditData.TypeMenu.RnoMenuItem != "")
 						sds.Add(new StepDataRetval(topType.StepEditData.TypeMenu.RnoMenuItem, Convert.ToInt32(topType.Index)));
-					else if (!singleColEq)
+					else if (!singleColEq && !singleColTable)
 						sds.Add(new StepDataRetval(topType.StepEditData.TypeMenu.MenuItem, Convert.ToInt32(topType.Index)));
 
-					if (!singleColEq || (singleColEq && topType.StepEditData.TypeMenu.RnoMenuItem != null && topType.StepEditData.TypeMenu.RnoMenuItem != ""))
+					if (!singleColTable && (!singleColEq || (singleColEq && topType.StepEditData.TypeMenu.RnoMenuItem != null && topType.StepEditData.TypeMenu.RnoMenuItem != "")))
 					{
 						if (topType.Type == curType) retval = cntitm;
 						cntitm++;