diff --git a/xCAT-client/bin/pasu b/xCAT-client/bin/pasu
index 08b77e746..f4270bea8 100755
--- a/xCAT-client/bin/pasu
+++ b/xCAT-client/bin/pasu
@@ -215,10 +215,13 @@ sub processoutput {      #This way, one arbiter handles output, no interrupting
                     $line !~ /Lenovo ToolsCenterSuite CLI/i &&
                     $line !~ /Lenovo XClarity Essentials OneCLI/i &&
                     $line !~ /Invoking SHOW command .../i &&
+                    $line !~ /start to convert cmd./i &&
                     $line !~ /Invoking SET command .../i &&
-                    $line !~ /Connected to BMC by IP address/i &&
-                    $line !~ /Succeeded running the command /i &&
                     $line !~ /Based on module version /i &&
+                    $line !~ /Connected to BMC by IP address/i &&
+                    $line !~ /Connected to BMC at IP address/i &&
+                    $line !~ /Succeeded running the command /i &&
+                    $line !~ /Succeed in running the command:/i &&
                     $line !~ /Succeed running command /i)) {
                 print $nodehdl{$readyh} . ": " . $line . "\n";
             }
diff --git a/xCAT-client/pods/man1/rcons.1.pod b/xCAT-client/pods/man1/rcons.1.pod
index f6b80b19f..06c21f3f5 100644
--- a/xCAT-client/pods/man1/rcons.1.pod
+++ b/xCAT-client/pods/man1/rcons.1.pod
@@ -18,6 +18,10 @@ If I<conserver-host> is specified, the conserver daemon on that host will be con
 
 To exit the console session, enter:  <ctrl>e c .
 
+For confluent backed consoles, an extended outage of connectivity to the endpoint will result in an automated retry
+of a randomized interval between 2 to 4 minutes.  You can either close and reopen the console to force a quicker
+reconnect, or `<ctrl>e o`a to request an immediate reconnect attempt.
+
 =head1 B<Options>
 
 =over 5
diff --git a/xCAT-server/lib/xcat/plugins/confluent.pm b/xCAT-server/lib/xcat/plugins/confluent.pm
index 34923dc1c..c05c51d6e 100644
--- a/xCAT-server/lib/xcat/plugins/confluent.pm
+++ b/xCAT-server/lib/xcat/plugins/confluent.pm
@@ -276,7 +276,12 @@ sub makeconfluentcfg {
         @cfgents1 = $hmtab->getAllNodeAttribs([ 'cons', 'serialport', 'mgt', 'conserver', 'termserver', 'termport', 'consoleondemand' ]);
         @cfgents2 = $nodepostab->getAllNodeAttribs([ 'rack', 'u', 'chassis', 'slot', 'room' ]);
         @cfgents3 = $nodepostab->getAllNodeAttribs([ 'mpa', 'id' ]);
-        @cfgents4 = $nodepostab->getAllNodeAttribs([ 'node', 'switch', 'port', 'interface' ]);
+        @cfgents4 = $switchtab->getAllNodeAttribs([ 'node', 'switch', 'port', 'interface' ]);
+        my @switchnodes;
+        foreach my $ent (@cfgents4) {
+            if ($ent->{node}) { push @switchnodes, $ent->{node} }
+        }
+        @cfgents4 = $switchtab->getNodesAttribs(\@switchnodes, [ 'node', 'switch', 'port', 'interface' ]);
     }