Index: trunk/ippTools/src/chiptool.c
===================================================================
--- trunk/ippTools/src/chiptool.c	(revision 9539)
+++ trunk/ippTools/src/chiptool.c	(revision 9764)
@@ -168,8 +168,18 @@
     // XXX does this need to be constrained so that it won't return any results
     // if a match p2PendingExp hasn't been registered?
-    psString query = psStringCopy("SELECT * FROM p2PendingImfile");
+    psString query = psStringCopy(
+            "SELECT"
+            "   p2PendingImfile.*"
+            " FROM p2PendingImfile"
+            " JOIN p2PendingExp"
+            "   USING(exp_tag)"
+            " LEFT JOIN p2Mask"
+            "   ON p2PendingExp.label = p2Mask.label"
+            " WHERE"
+            "   p2Mask.label IS NULL"
+        );
 
     if (config->where) {
-        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "rawImfile");
+        psString whereClause = psDBGenerateWhereConditionSQL(config->where, "p2PendingImfile");
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
@@ -583,9 +593,10 @@
 {
     PS_ASSERT_PTR_NON_NULL(pendingExp, NULL);
-
+ 
     return p2ProcessedExpRowAlloc(
         pendingExp->exp_tag,
         pendingExp->p1_version,
-        pendingExp->p2_version
+        pendingExp->p2_version,
+        pendingExp->label
     );
 }