diff --git a/src/org/labkey/test/components/ui/grids/ParentDetailPanel.java b/src/org/labkey/test/components/ui/grids/ParentDetailPanel.java
index 0ff070e9b1..f247b056e5 100644
--- a/src/org/labkey/test/components/ui/grids/ParentDetailPanel.java
+++ b/src/org/labkey/test/components/ui/grids/ParentDetailPanel.java
@@ -165,13 +165,13 @@ public Optional<WebElement> optionalEditBtn()
         public WebElement editBtn = editBtnLoc.findWhenNeeded(panelHeading);
 
         public WebElement panelBody = Locator.tagWithClass("div", "panel-body").findWhenNeeded(this);
-        public WebElement parentsForElement = Locator.tagWithClass("div", "bottom-spacing").child("b")
+        public WebElement parentsForElement = Locator.tagWithClass("div", "bottom-padding").child("b")
                 .findWhenNeeded(panelBody);
 
         // finds a webElement that will contain the detailTable and responsiveGrid for the specified source or parent type
         public WebElement detailGroupContainer(String containingType)
         {
-            return Locator.tagWithClass("div", "top-spacing")
+            return Locator.tagWithClass("div", "top-padding")
                     .withChild(Locator.tagWithClass("table", "detail-component--table__fixed")
                             .withDescendant(Locator.tag("td").withChild(Locator.linkWithText(containingType))))
                     .waitForElement(panelBody, 2000);
@@ -179,7 +179,7 @@ public WebElement detailGroupContainer(String containingType)
         // finds the first link in each detail table in each detailGroupContainer; used to get a list of parent types
         public List<WebElement> gridParentTypesLinks()
         {
-            Locator detailGroupContainers = Locator.tagWithClass("div", "top-spacing")
+            Locator detailGroupContainers = Locator.tagWithClass("div", "top-padding")
                     .child(Locator.tagWithClass("table", "detail-component--table__fixed")
                             .descendant(Locator.tag("td").child(Locator.tag("a"))));
             return detailGroupContainers.findElements(elementCache().panelBody);
diff --git a/src/org/labkey/test/components/ui/pipeline/ImportsPage.java b/src/org/labkey/test/components/ui/pipeline/ImportsPage.java
index 8e51c241e6..5f0e9f4093 100644
--- a/src/org/labkey/test/components/ui/pipeline/ImportsPage.java
+++ b/src/org/labkey/test/components/ui/pipeline/ImportsPage.java
@@ -56,7 +56,9 @@ public String getPageHeader()
 
     public QueryGrid getImportsGrid()
     {
-        return elementCache().pipelineJobsGrid();
+        QueryGrid grid = elementCache().pipelineJobsGrid();
+        waitFor(grid::isLoaded, "Imports grid did not become active in time.", 2_500);
+        return grid;
     }
 
     @Override
diff --git a/src/org/labkey/test/util/URLBuilder.java b/src/org/labkey/test/util/URLBuilder.java
index dc067e4067..c911bd3899 100644
--- a/src/org/labkey/test/util/URLBuilder.java
+++ b/src/org/labkey/test/util/URLBuilder.java
@@ -107,7 +107,7 @@ public URLBuilder setQuery(Map<String, ?> query)
     public URLBuilder setAppResourcePath(Object... pathParts)
     {
         List<String> encodedParts = Arrays.stream(pathParts).map(Objects::requireNonNull).map(String::valueOf)
-                .map(URIUtil::encodePath).collect(Collectors.toList());
+                .map(s -> EscapeUtil.encode(s).replace("+", " ")).collect(Collectors.toList());
         setFragment("/" + String.join("/", encodedParts));
         return this;
     }
@@ -212,11 +212,11 @@ private void appendQueryString(StringBuilder url, Map<String, ?> params)
                 if (null != param.getKey())
                 {
                     url.append(firstParam ? "?" : "&");
-                    url.append(param.getKey());
+                    url.append(EscapeUtil.encode(param.getKey()));
                     if (null != param.getValue())
                     {
                         url.append("=");
-                        url.append(param.getValue());
+                        url.append(EscapeUtil.encode(String.valueOf(param.getValue())));
                     }
                     firstParam = false;
                 }