diff --git a/snprc_ehr/src/org/labkey/snprc_ehr/data/WhitespacePreservingDisplayColumnFactory.java b/snprc_ehr/src/org/labkey/snprc_ehr/data/WhitespacePreservingDisplayColumnFactory.java
new file mode 100644
index 000000000..20cc1277f
--- /dev/null
+++ b/snprc_ehr/src/org/labkey/snprc_ehr/data/WhitespacePreservingDisplayColumnFactory.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2015-2026 LabKey Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.labkey.snprc_ehr.data;
+
+import org.jetbrains.annotations.NotNull;
+import org.labkey.api.data.ColumnInfo;
+import org.labkey.api.data.DataColumn;
+import org.labkey.api.data.DisplayColumn;
+import org.labkey.api.data.DisplayColumnFactory;
+import org.labkey.api.data.RenderContext;
+import org.labkey.api.util.HtmlString;
+
+/**
+ * Renders the value in HTML preserving whitespace, including spaces and newlines.
+ *
+ * User: jeckels
+ * Date: 10/9/2015
+ */
+public class WhitespacePreservingDisplayColumnFactory implements DisplayColumnFactory
+{
+    @Override
+    public DisplayColumn createRenderer(ColumnInfo col)
+    {
+        return new WhitespacePreservingDisplayColumn(col);
+    }
+
+    public static class WhitespacePreservingDisplayColumn extends DataColumn
+    {
+        public WhitespacePreservingDisplayColumn(ColumnInfo col)
+        {
+            super(col);
+        }
+
+        @NotNull
+        @Override
+        public HtmlString getFormattedHtml(RenderContext ctx)
+        {
+            Object value = ctx.get(getDisplayColumn().getFieldKey());
+            if (value == null)
+            {
+                // If we couldn't find it by FieldKey, check by alias as well
+                value = getDisplayColumn().getValue(ctx);
+            }
+
+            if (value == null)
+            {
+                return HtmlString.NBSP;
+            }
+            return HtmlString.of(value.toString(), true);
+        }
+    }
+}
diff --git a/snprc_ehr/src/org/labkey/snprc_ehr/table/SNPRC_EHRCustomizer.java b/snprc_ehr/src/org/labkey/snprc_ehr/table/SNPRC_EHRCustomizer.java
index 9148a5364..47e211c8d 100644
--- a/snprc_ehr/src/org/labkey/snprc_ehr/table/SNPRC_EHRCustomizer.java
+++ b/snprc_ehr/src/org/labkey/snprc_ehr/table/SNPRC_EHRCustomizer.java
@@ -26,7 +26,6 @@
 import org.labkey.api.data.MutableColumnInfo;
 import org.labkey.api.data.SQLFragment;
 import org.labkey.api.data.TableInfo;
-import org.labkey.api.data.WhitespacePreservingDisplayColumnFactory;
 import org.labkey.api.data.WrappedColumn;
 
 import org.labkey.api.ehr.EHRService;
@@ -43,6 +42,7 @@
 import org.labkey.api.study.DatasetTable;
 import org.labkey.api.util.logging.LogHelper;
 import org.labkey.snprc_ehr.SNPRC_EHRSchema;
+import org.labkey.snprc_ehr.data.WhitespacePreservingDisplayColumnFactory;
 import org.labkey.snprc_ehr.helpers.CustomizerQueryProvider;
 import org.labkey.snprc_ehr.model.CalculatedColumn;
 import static org.labkey.snprc_ehr.constants.QueryConstants.*;