diff --git a/src/org/labkey/test/WebDriverWrapper.java b/src/org/labkey/test/WebDriverWrapper.java
index 28cca5bc2f..fe0077f074 100644
--- a/src/org/labkey/test/WebDriverWrapper.java
+++ b/src/org/labkey/test/WebDriverWrapper.java
@@ -1631,14 +1631,12 @@ public boolean isTextPresent(String... texts)
             if (htmlSource == null || !htmlSource.contains(text))
                 present.setFalse();
 
-            return present.getValue();
+            return present.get();
         };
         TextSearcher searcher = new TextSearcher(this);
-        searcher.setSearchTransformer(TextSearcher.TextTransformers.IDENTITY);
-        searcher.setSourceTransformer(TextSearcher.TextTransformers.IDENTITY);
         searcher.searchForTexts(handler, Arrays.asList(texts));
 
-        return present.getValue();
+        return present.get();
     }
 
     public List<String> getTextOrder(TextSearcher searcher, String... texts)
@@ -1729,12 +1727,12 @@ public boolean isAnyTextPresent(String... texts)
             if (htmlSource.contains(text))
                 found.setTrue();
 
-            return !found.getValue(); // stop searching if any value is found
+            return !found.get(); // stop searching if any value is found
         };
         TextSearcher searcher = new TextSearcher(this);
         searcher.searchForTexts(handler, Arrays.asList(texts));
 
-        return found.getValue();
+        return found.get();
     }
 
     /**
diff --git a/src/org/labkey/test/params/FieldInfo.java b/src/org/labkey/test/params/FieldInfo.java
index 073eaa5ca4..22077fbf95 100644
--- a/src/org/labkey/test/params/FieldInfo.java
+++ b/src/org/labkey/test/params/FieldInfo.java
@@ -24,7 +24,6 @@ public class FieldInfo implements CharSequence, WrapsFieldKey
     private final Consumer<FieldDefinition> _fieldDefinitionMutator;
     private final String _namePart; // used for random field generation to track the name part used
     private final CachingSupplier<String> _label = new CachingSupplier<>(() -> Objects.requireNonNullElseGet(getRawLabel(), () -> FieldDefinition.labelFromName(getName())));
-    private final CachingSupplier<String> _uiLabel = new CachingSupplier<>(() -> TextUtils.normalizeSpace(getLabel()));
 
     private FieldInfo(FieldKey fieldKey, String label, ColumnType columnType, Consumer<FieldDefinition> fieldDefinitionMutator, String namePart)
     {
@@ -106,7 +105,7 @@ public String getLabel()
     @Contract(pure = true)
     public String getUiLabel()
     {
-        return _uiLabel.get();
+        return TextUtils.normalizeSpace(getLabel());
     }
 
     @Override
@@ -122,6 +121,15 @@ public String getName()
         return _fieldKey.getName();
     }
 
+    /**
+     * Get column name quoted for use in queries and calculated field expressions
+     */
+    @Contract(pure = true)
+    public String getSqlName()
+    {
+        return EscapeUtil.getSqlQuotedValue(_fieldKey.getName());
+    }
+
     /**
      * Get name escaped for use in sample or source name expressions
      */
diff --git a/src/org/labkey/test/util/TextSearcher.java b/src/org/labkey/test/util/TextSearcher.java
index f52763f2e3..3ed4a79f06 100644
--- a/src/org/labkey/test/util/TextSearcher.java
+++ b/src/org/labkey/test/util/TextSearcher.java
@@ -22,6 +22,7 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
@@ -59,10 +60,7 @@ public TextSearcher(final WebDriverWrapper test)
 
     public final TextSearcher setSourceTransformer(Function<String, String> sourceTransformer)
     {
-        if (sourceTransformer == null)
-            this.sourceTransformer = TextTransformers.IDENTITY;
-        else
-            this.sourceTransformer = sourceTransformer;
+        this.sourceTransformer = Objects.requireNonNullElse(sourceTransformer, TextTransformers.IDENTITY);
         return this;
     }
 
@@ -73,10 +71,7 @@ public final TextSearcher clearSourceTransformer()
 
     public final TextSearcher setSearchTransformer(Function<String, String> searchTransformer)
     {
-        if (searchTransformer == null)
-            this.searchTransformer = TextTransformers.IDENTITY;
-        else
-            this.searchTransformer = searchTransformer;
+        this.searchTransformer = Objects.requireNonNullElse(searchTransformer, TextTransformers.IDENTITY);
         return this;
     }