diff --git a/PROMS/Formats/epall/EPFormatTST1.xml b/PROMS/Formats/epall/EPFormatTST1.xml
index cd99e3c7..ac38208e 100644
Binary files a/PROMS/Formats/epall/EPFormatTST1.xml and b/PROMS/Formats/epall/EPFormatTST1.xml differ
diff --git a/PROMS/VEPROMS.CSLA.Library/Format/EPFormatFile.cs b/PROMS/VEPROMS.CSLA.Library/Format/EPFormatFile.cs
index 456f043d..0d2253d2 100644
--- a/PROMS/VEPROMS.CSLA.Library/Format/EPFormatFile.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Format/EPFormatFile.cs
@@ -288,7 +288,11 @@ namespace VEPROMS.CSLA.Library
 			try
 			{
 				string tmp = LazyLoad(ref _returncols, "@returncols");
-				return tmp.Split(',').Select(p => p.Trim()).ToList();
+
+				if (string.IsNullOrEmpty(tmp))
+					return new List<string>();
+				else
+					return tmp.Split(',').Select(p => p.Trim()).ToList();
 			}
 			catch
 			{
diff --git a/PROMS/Volian.Controls.Library/frmEPAnnotationDetails.cs b/PROMS/Volian.Controls.Library/frmEPAnnotationDetails.cs
index 540eb713..8017d256 100644
--- a/PROMS/Volian.Controls.Library/frmEPAnnotationDetails.cs
+++ b/PROMS/Volian.Controls.Library/frmEPAnnotationDetails.cs
@@ -47,7 +47,7 @@ namespace Volian.Controls.Library
 			myEPFields = _CurrentAnnotation.MyItem.GetValidEPFields(_CurrentAnnotation.TypeID);
 			MyConfig =  new AnnotationConfig(currAnn.Config);
 
-			int MaxCharsInLabel = myEPFields.Max(x => x.label.Length);
+			int MaxCharsInLabel = myEPFields.Where(y => y.type.ToLower() != "tableinput").Max(x => x.label.Length);
 			//font size 8 - make labels slightly bigger than largest label
 			panelEP.ColumnStyles[0].SizeType = SizeType.Absolute;
 			panelEP.ColumnStyles[0].Width = (8 * MaxCharsInLabel) + 5;
@@ -59,12 +59,16 @@ namespace Volian.Controls.Library
 				panelEP.RowCount = RowCount;
 				panelEP.Top = 20;
 
-				Label wlbl = new Label();
-				wlbl.Text = EP.label;
-				wlbl.Visible = true;
-				wlbl.TextAlign = ContentAlignment.MiddleLeft;
-				wlbl.Anchor = AnchorStyles.Left | AnchorStyles.Top;
-				panelEP.Controls.Add(wlbl, 0, panelEP.RowCount - 1);
+				if (EP.type.ToLower() != "tableinput")
+				{
+					Label wlbl = new Label();
+					wlbl.Text = EP.label;
+					wlbl.Visible = true;
+					wlbl.TextAlign = ContentAlignment.MiddleLeft;
+					wlbl.Anchor = AnchorStyles.Left | AnchorStyles.Top;
+					wlbl.Width = (8 * MaxCharsInLabel) + 5;
+					panelEP.Controls.Add(wlbl, 0, panelEP.RowCount - 1);
+				}
 
 				if (EP.type.ToLower() == "text")
 				{
@@ -163,7 +167,7 @@ namespace Volian.Controls.Library
 				if (EP.type.ToLower() == "tableinput" && _TablePropControl == null)
 				{
 					string val = MyConfig.GetValue("EP", EP.name);
-					_TablePropControl = new TablePropertiesControl(EP.name, EP.text, val);
+					_TablePropControl = new TablePropertiesControl(EP.name, EP.label, val);
 					_TablePropControl.Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top;
 					panelEP.Controls.Add(_TablePropControl, 1, panelEP.RowCount - 1);