diff --git a/api/src/org/labkey/api/action/QueryViewAction.java b/api/src/org/labkey/api/action/QueryViewAction.java
index 9ebb9540eac..42a02c7bae6 100644
--- a/api/src/org/labkey/api/action/QueryViewAction.java
+++ b/api/src/org/labkey/api/action/QueryViewAction.java
@@ -16,6 +16,7 @@
 
 package org.labkey.api.action;
 
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.data.ColumnHeaderType;
 import org.labkey.api.data.ExcelWriter;
@@ -135,7 +136,9 @@ protected ModelAndView getHtmlView(Form form, BindException errors) throws Excep
     /**
      * Correctly configures the QueryView to use the QueryViewAction for export purposes
      * @param dataRegion null as a convenience when only a single QueryView is being used
+     * @throws NotFoundException if passed a dataRegion name that doesn't exist
      */
+    @NotNull
     protected final ViewType createInitializedQueryView(Form form, BindException errors, boolean forExport, @Nullable String dataRegion) throws Exception
     {
         ViewType result = createQueryView(form, errors, forExport, dataRegion);
@@ -164,6 +167,7 @@ protected final ViewType createInitializedQueryView(Form form, BindException err
      * Create the specially configured query view.
      * @param dataRegion null as a convenience when only a single QueryView is being used
      */
+    @Nullable
     protected abstract ViewType createQueryView(Form form, BindException errors, boolean forExport, @Nullable String dataRegion) throws Exception;
 
     public static class QueryExportForm extends QueryForm
diff --git a/api/src/org/labkey/api/data/AJAXDetailsDisplayColumn.java b/api/src/org/labkey/api/data/AJAXDetailsDisplayColumn.java
index c750658316f..f6e52614f42 100644
--- a/api/src/org/labkey/api/data/AJAXDetailsDisplayColumn.java
+++ b/api/src/org/labkey/api/data/AJAXDetailsDisplayColumn.java
@@ -23,6 +23,7 @@
 import org.labkey.api.util.ContainerContext;
 import org.labkey.api.util.DOM;
 import org.labkey.api.util.GUID;
+import org.labkey.api.util.HtmlString;
 import org.labkey.api.util.JavaScriptFragment;
 import org.labkey.api.util.StringExpression;
 import org.labkey.api.view.ActionURL;
@@ -38,6 +39,7 @@
 
 import static org.labkey.api.util.DOM.SPAN;
 import static org.labkey.api.util.DOM.id;
+import static org.labkey.api.util.DOM.Attribute.style;
 
 /**
  * Uses LABKEY.Ext.CalloutTip to provide additional details, summoned via AJAX
@@ -106,7 +108,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
             props.put("target", divId);
 
             SPAN(
-                id(divId),
+                id(divId).at(style, "display:inline-flex;flex-wrap:nowrap"),
                 (DOM.Renderable) ret -> {
                     super.renderGridCellContents(ctx, out);
                     return ret;