3 files changed, 31 insertions, 5 deletions
diff --git a/UI/form-dynatable.csv b/UI/form-dynatable.csv
index 9b65baba..d7691bf4 100644
--- a/UI/form-dynatable.csv
+++ b/UI/form-dynatable.csv
@@ -1,3 +1,29 @@
-<?lsmb FOREACH column IN columns ?><?lsmb IF heading.$column.text; heading.$column.text; ELSE; heading.$column; END ?><?lsmb IF NOT loop.last ?>,<?lsmb END ?><?lsmb END ?>
-<?lsmb FOREACH row IN rows ?><?lsmb FOREACH column IN columns ?><?lsmb IF row.$column.text; row.$column.text; ELSE; row.$column; END ?><?lsmb IF NOT loop.last ?>,<?lsmb END ?><?lsmb END ?>
-<?lsmb END ?><?lsmb IF totals; t = []; FOREACH column IN columns; t.push(totals.$column); END; t.join(','); END ?>
+<?lsmb FOREACH column IN columns;
+	IF heading.$column.text;
+		heading.$column.text;
+	ELSE;
+		heading.$column;
+	END;
+	IF NOT loop.last
+		?>,<?lsmb
+	END;
+END ?>
+<?lsmb FOREACH row IN rows;
+	FOREACH column IN columns;
+		IF row.$column.text.defined;
+			row.$column.text;
+		ELSE;
+			row.$column;
+		END;
+		IF NOT loop.last
+			?>,<?lsmb
+		END;
+	END ?>
+<?lsmb END;
+IF totals;
+	t = [];
+	FOREACH column IN columns;
+		t.push(totals.$column);
+	END;
+	t.join(',');
+END ?>
diff --git a/UI/form-dynatable.odst b/UI/form-dynatable.odst
index 7a4cdfdc..30badba3 100644
--- a/UI/form-dynatable.odst
+++ b/UI/form-dynatable.odst
@@ -17,7 +17,7 @@
 		<?lsmb FOREACH column IN columns ?>
 		<?lsmb IF loop.first ?><format num_format="3">
 		<?lsmb END ?>
-			<?lsmb IF row.$column.href ?>
+			<?lsmb IF row.$column.text.defined ?>
 			<italic>
 			<cell text="<?lsmb row.$column.text ?>" />
 			</italic>
diff --git a/UI/form-dynatable.xlst b/UI/form-dynatable.xlst
index 7c00fb67..9e71bf54 100644
--- a/UI/form-dynatable.xlst
+++ b/UI/form-dynatable.xlst
@@ -11,7 +11,7 @@
 	<?lsmb FOREACH row IN rows ?>
 		<row>
 		<?lsmb FOREACH column IN columns ?>
-			<?lsmb IF row.$column.href ?>
+			<?lsmb IF row.$column.text.defined ?>
 			<cell text="<?lsmb row.$column.text ?>" />
 			<?lsmb ELSE ?>
 			<cell text="<?lsmb row.$column ?>" />