diff --git a/xCAT-server/lib/xcat/plugins/blade.pm b/xCAT-server/lib/xcat/plugins/blade.pm
index 896072ef7..2360c2f6d 100644
--- a/xCAT-server/lib/xcat/plugins/blade.pm
+++ b/xCAT-server/lib/xcat/plugins/blade.pm
@@ -428,10 +428,10 @@ sub eventlog { #Tried various optimizations, but MM seems not to do bulk-request
       my $matchstring;
       if ($slot > 0) {
         #$matchstring=sprintf("BLADE_%02d",$slot);
-        $matchstring=sprintf("NODE_%02d",$slot);
+        $matchstring=sprintf("(NODE_%02d|BLADE_%02d)",$slot,$slot);
       } else {
         #$matchstring="^(?!BLADE).*";
-        $matchstring="^(?!NODE).*";
+        $matchstring="^(?!(NODE|BLADE)).*";
       }
       if ($source =~ m/$matchstring$/i) { #MM guys changed their minds on capitalization
         if (defined($order)) {
@@ -446,7 +446,7 @@ sub eventlog { #Tried various optimizations, but MM seems not to do bulk-request
       } else {
           foreach (@moreslots) {
             #$matchstring=sprintf("BLADE_%02d",$_);
-            $matchstring=sprintf("NODE_%02d",$_);
+            $matchstring=sprintf("(NODE_%02d|BLADE_%02d",$_,$_);
             if ($source =~ m/$matchstring$/i) { #MM guys changed their minds on capitalization
                 if (defined($order)) {
                     $numentries++;