Index: trunk/ippTools/src/warptool.c
===================================================================
--- trunk/ippTools/src/warptool.c	(revision 23873)
+++ trunk/ippTools/src/warptool.c	(revision 23921)
@@ -230,6 +230,6 @@
     PXOPT_COPY_F32(config->args, where, "-solang_min",         "rawExp.solang",         ">=");
     PXOPT_COPY_F32(config->args, where, "-solang_max",         "rawExp.solang",         "<");
-    PXOPT_COPY_STR(config->args, where, "-reduction", "fakeRun.reduction", "==");
-    PXOPT_COPY_STR(config->args, where, "-label",     "fakeRun.label",     "==");
+    PXOPT_COPY_STR(config->args, where, "-reduction",          "fakeRun.reduction",     "==");
+    pxAddLabelSearchArgs (config, where, "-label",             "fakeRun.label",         "==");
 
     if (!psListLength(where->list) &&
@@ -556,5 +556,5 @@
     psMetadata *where = psMetadataAlloc();
     PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "==");
-    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
+    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
@@ -828,5 +828,5 @@
     psMetadata *where = psMetadataAlloc();
     PXOPT_COPY_S64(config->args, where, "-warp_id", "warpSkyCellMap.warp_id", "==");
-    PXOPT_COPY_STR(config->args, where, "-label", "warpRun.label", "==");
+    pxAddLabelSearchArgs (config, where, "-label", "warpRun.label", "==");
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
@@ -1318,5 +1318,5 @@
 
     psMetadata *where = psMetadataAlloc();
-    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
+    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
 
     psString query = pxDataGet("warptool_pendingcleanuprun.sql");
@@ -1381,5 +1381,5 @@
     psMetadata *where = psMetadataAlloc();
     PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "==");
-    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
+    pxAddLabelSearchArgs (config, where, "-label", "label", "==");
 
     psString query = pxDataGet("warptool_pendingcleanupskyfile.sql");