Index: main/manager.c
===================================================================
--- main/manager.c	(revision 344438)
+++ main/manager.c	(working copy)
@@ -5600,9 +5600,10 @@
 		}
 
 		if (in_data) {
-			/* Process data field in Opaque mode */
+			/* Process data field in Opaque mode. This is a
+			 * followup, so we re-add line feeds. */
+			ast_str_append(out, 0, xml ? "\n" : "<br>\n");
 			xml_copy_escape(out, val, 0);   /* data field */
-			ast_str_append(out, 0, xml ? "\n" : "<br>\n");
 			continue;
 		}
 
@@ -5638,7 +5639,9 @@
 		ao2_ref(vc, -1);
 		ast_str_append(out, 0, xml ? "='" : "</td><td>");
 		xml_copy_escape(out, val, 0);	/* data field */
-		ast_str_append(out, 0, xml ? "'" : "</td></tr>\n");
+		if (!in_data || !*in) {
+			ast_str_append(out, 0, xml ? "'" : "</td></tr>\n");
+		}
 	}
 
 	if (inobj) {