diff --git a/src/org/labkey/targetedms/TargetedMSManager.java b/src/org/labkey/targetedms/TargetedMSManager.java
index 2266b4faf..986230427 100644
--- a/src/org/labkey/targetedms/TargetedMSManager.java
+++ b/src/org/labkey/targetedms/TargetedMSManager.java
@@ -1272,7 +1272,7 @@ public List<InstrumentNickname> getNickname(String name, TargetedMSSchema schema
                     "FROM targetedms.SampleFile WHERE InstrumentNickname = " +
                     new StandardDialectStringHandler().quoteStringLiteral(name) +
                     " ORDER By InstrumentNickname, InstrumentId.Model, InstrumentSerialNumber";
-            TableSelector selector = QueryService.get().selector(schema, sql);
+            SqlSelector selector = QueryService.get().getSelectBuilder(schema, sql).buildSqlSelector();
             result = selector.getArrayList(InstrumentNickname.class);
             Container targetContainer;
             if (shared.hasPermission(schema.getUser(), UpdatePermission.class))
diff --git a/src/org/labkey/targetedms/folderImport/PanoramaQCSettings.java b/src/org/labkey/targetedms/folderImport/PanoramaQCSettings.java
index 4a43e4608..81780ac31 100644
--- a/src/org/labkey/targetedms/folderImport/PanoramaQCSettings.java
+++ b/src/org/labkey/targetedms/folderImport/PanoramaQCSettings.java
@@ -89,7 +89,7 @@ public void exportSettings(VirtualFile vf, Container container, User user) throw
                             .append(TargetedMSManager.getTableInfoQCMetricConfiguration(), "qcMetricConfig")
                             .append(" ON qcEnabledMetrics.metric = qcMetricConfig.Id");
 
-                    try (Results results = QueryService.get().selectResults(schema, sql.getSQL(), null, null, true, true))
+                    try (Results results = QueryService.get().getSelectBuilder(schema, sql.getSQL(), true).select())
                     {
                         exportSettingsToTSV(vf, results, getSettingsFileName(), getTableName());
                     }
@@ -146,7 +146,7 @@ public void exportSettings(VirtualFile vf, Container container, User user) throw
                             .append(" ) qcAnnotationType")
                             .append(" ON qcAnnotation.QCAnnotationTypeId = qcAnnotationType.Id");
 
-                    try (Results results = QueryService.get().selectResults(schema, sql.getSQL(), null, null, true, true))
+                    try (Results results = QueryService.get().getSelectBuilder(schema, sql.getSQL(), true).select())
                     {
                         exportSettingsToTSV(vf, results, getSettingsFileName(), getTableName());
                     }
@@ -188,7 +188,7 @@ public void exportSettings(VirtualFile vf, Container container, User user) throw
                             .append(TargetedMSManager.getTableInfoRuns(), "runs")
                             .append(" ON replicate.RunId = runs.Id");
 
-                    try (Results results = QueryService.get().selectResults(schema, sql.getSQL(), null, null, true, true))
+                    try (Results results = QueryService.get().getSelectBuilder(schema, sql.getSQL(), true).select())
                     {
                         exportSettingsToTSV(vf, results, getSettingsFileName(), getTableName());
                     }