diff --git a/ehr/test/src/org/labkey/test/pages/ehr/NotificationAdminPage.java b/ehr/test/src/org/labkey/test/pages/ehr/NotificationAdminPage.java
index 7eba6ebe6..ef494bb64 100644
--- a/ehr/test/src/org/labkey/test/pages/ehr/NotificationAdminPage.java
+++ b/ehr/test/src/org/labkey/test/pages/ehr/NotificationAdminPage.java
@@ -97,7 +97,7 @@ public void clickRunReportInBrowser(String name)
     {
         log("Clicking Run Report in browser for " + name);
         name = name.replace(" ", "");
-        clickAndWait(Locator.tagWithAttributeContaining("a", "href", name).withText("Run Report In Browser"));
+        waitAndClickAndWait(Locator.tagWithAttributeContaining("a", "href", name).withText("Run Report In Browser"));
     }
 
     public void clickManuallyTriggerEmail(String name)
diff --git a/snd/src/org/labkey/snd/SNDServiceImpl.java b/snd/src/org/labkey/snd/SNDServiceImpl.java
index 9cfeb2b5d..ff44daa53 100644
--- a/snd/src/org/labkey/snd/SNDServiceImpl.java
+++ b/snd/src/org/labkey/snd/SNDServiceImpl.java
@@ -474,7 +474,10 @@ private JSONArray lookupValuesToJson(Container c, User u, String schema, String
                             Object displayable = rs.getObject("displayable");
                             jsonObject.put("displayable",displayable);
                         }
-
+                        if(colNames.contains("sortOrder")) {
+                            Object sortOrder = rs.getObject("sortOrder");
+                            jsonObject.put("sortOrder",sortOrder);
+                        }
                         array.put(jsonObject);
                     }
                 }