diff --git a/orte/mca/gpr/replica/functional_layer/gpr_replica_dict_fn.c b/orte/mca/gpr/replica/functional_layer/gpr_replica_dict_fn.c
index 133773580a..e37fd0d412 100644
--- a/orte/mca/gpr/replica/functional_layer/gpr_replica_dict_fn.c
+++ b/orte/mca/gpr/replica/functional_layer/gpr_replica_dict_fn.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2005 The University of Tennessee and The University
+ * Copyright (c) 2004-2007 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
@@ -28,29 +28,26 @@
 #include "orte_config.h"
 
 #include "opal/util/trace.h"
-
-#include "orte/class/orte_bitmap.h"
 #include "orte/mca/errmgr/errmgr.h"
-
 #include "orte/mca/gpr/replica/functional_layer/gpr_replica_fn.h"
 
 /*
  */
-bool orte_gpr_replica_check_itag_list(orte_gpr_replica_addr_mode_t addr_mode,
-                    orte_std_cntr_t num_itags_search,
-                    orte_gpr_replica_itag_t *itags,
-                    orte_std_cntr_t num_itags_entry,
-                    orte_gpr_replica_itag_t *entry_itags)
+bool orte_gpr_replica_check_itag_list( orte_gpr_replica_addr_mode_t addr_mode,
+                                       orte_std_cntr_t num_itags_search,
+                                       orte_gpr_replica_itag_t *itags,
+                                       orte_std_cntr_t num_itags_entry,
+                                       orte_gpr_replica_itag_t *entry_itags )
 {
     orte_std_cntr_t i, j;
-    bool exclusive, match, found_one, not_set;
-    int rc, bit_is_set;
+    bool exclusive, match, not_set;
+    int found_some;
 
     OPAL_TRACE(3);
     
     /* check for trivial case */
     if (NULL == itags || 0 == num_itags_search) {  /* wildcard case - automatically true */
-	   return true;
+        return true;
     }
 
     if (ORTE_GPR_REPLICA_NOT & addr_mode) { /* NOT flag set */
@@ -65,44 +62,26 @@ bool orte_gpr_replica_check_itag_list(orte_gpr_replica_addr_mode_t addr_mode,
         exclusive = false;
     }
     
-    if (ORTE_SUCCESS != (rc = orte_bitmap_clear_all_bits(&(orte_gpr_replica_globals.srch_itag)))) {
-        ORTE_ERROR_LOG(rc);
-        return false;
-    }
-    
     /* run the search  - check the container's tags to see which search tags are found */
-    found_one = false;
+    found_some = 0;
     for (i=0; i < num_itags_entry; i++) {  /* for each container tag */
         match = false;
     	for (j=0; j < num_itags_search; j++) {  /* check each search tag and see if it is present */
-            /* need to explicitly extend the bit array here to ensure
-             * it covers the specified itags. Otherwise, when
-             * we check to see if the bit was set (in the logic down
-             * below), we could potentially go outside the range of
-             * the array
-             */
-            if (ORTE_SUCCESS != (rc = orte_bitmap_resize(&(orte_gpr_replica_globals.srch_itag), itags[j]))) {
-                ORTE_ERROR_LOG(rc);
-                return false;
-            }
-    	    if (entry_itags[i] == itags[j]) { /* found a match */
-        		if (ORTE_SUCCESS != (rc = orte_bitmap_set_bit(&(orte_gpr_replica_globals.srch_itag), itags[j]))) {
-                    ORTE_ERROR_LOG(rc);
-                    return false;
+            if (entry_itags[i] == itags[j]) { /* found a match */
+                if (ORTE_GPR_REPLICA_OR & addr_mode) { /* only need one match */
+                    return (!not_set);
                 }
-        		if (ORTE_GPR_REPLICA_OR & addr_mode) { /* only need one match */
-        		    return (!not_set);
-        		}
                 match = true;
-                found_one = true;
+                found_some++;
+                break;  /* we're done for this i */
     	    }
     	}
         if (!match && exclusive) {
-             /* if it was exclusive, then I'm not allowed to have any tags outside
-              * of those in the search list. Since I checked the search list and
-              * found at least one that didn't match, this violates the exclusive requirement.
-              */
-             return (not_set);
+            /* if it was exclusive, then I'm not allowed to have any tags outside
+             * of those in the search list. Since I checked the search list and
+             * found at least one that didn't match, this violates the exclusive requirement.
+             */
+            return (not_set);
         }
     }
 
@@ -110,21 +89,17 @@ bool orte_gpr_replica_check_itag_list(orte_gpr_replica_addr_mode_t addr_mode,
      * that we would have already returned in the OR case. So, first check the XOR
      * case
      */
-     if ((ORTE_GPR_REPLICA_XOR & addr_mode) && found_one) {
+    if ((ORTE_GPR_REPLICA_XOR & addr_mode) && (0 < found_some) ) {
         return (!not_set);
-     }
-     
-     /* Only thing we have left to check is AND */
-    /* check if any search tag was not found */
-    for (i=0; i < num_itags_search; i++) {
-        if (0 > (bit_is_set = orte_bitmap_is_set_bit(&(orte_gpr_replica_globals.srch_itag), itags[i]))) {
-            ORTE_ERROR_LOG(bit_is_set);
-            return false;
-        } else if (1 != bit_is_set) {
-            /* this tag was NOT found - required to find them all */
-            return (not_set);
-        }
     }
+    
+    /* As we counted the number of matched itags we can simply compare this
+     * number with the total number of itags for the AND operation.
+     */
+    if( found_some != num_itags_search ) {
+        return (not_set);
+    }
+
     /* okay, all the tags are there, so we now passed the AND test */
     return (!not_set);
 }