diff --git a/interface/billing/billing_report.php b/interface/billing/billing_report.php
index ee72b905c67..07a7a443559 100644
--- a/interface/billing/billing_report.php
+++ b/interface/billing/billing_report.php
@@ -347,7 +347,8 @@ function toencounter(pid, pubpid, pname, enc, datestr, dobstr) {
             top.restoreSession();
             encurl = 'patient_file/encounter/encounter_top.php?set_encounter=' + encodeURIComponent(enc) +
                 '&pid=' + encodeURIComponent(pid);
-            paturl = 'patient_file/summary/demographics_full.php?pid=' + encodeURIComponent(pid);
+            paturl = 'patient_file/summary/demographics.php?pid=' + encodeURIComponent(pid);
+            parent.clearPatient();
             parent.left_nav.setPatient(pname, pid, pubpid, '', dobstr);
             parent.left_nav.setEncounter(datestr, enc, 'enc');
             parent.left_nav.loadFrame('enc2', 'enc', encurl);
@@ -359,9 +360,9 @@ function topatient(pid, pubpid, pname, enc, datestr, dobstr) {
             top.restoreSession();
             paturl = 'patient_file/summary/insurance_edit.php?pid=' + encodeURIComponent(pid);
             parent.left_nav.setPatient(pname, pid, pubpid, '', dobstr);
-            parent.left_nav.loadFrame('ens1', 'enc',
-                'patient_file/history/encounters.php?pid=' + encodeURIComponent(pid));
+            parent.left_nav.loadFrame('ens1', 'enc', 'patient_file/history/encounters.php?pid=' + encodeURIComponent(pid));
             parent.left_nav.loadFrame('dem1', 'pat', paturl);
+            parent.activateTabByName('pat', true);
         }
 
         function popMBO(pid, enc, mboid) {
diff --git a/interface/modules/custom_modules/oe-module-faxsms/library/rc_sms_notification.php b/interface/modules/custom_modules/oe-module-faxsms/library/rc_sms_notification.php
index 6949df52c46..0227c947fb4 100644
--- a/interface/modules/custom_modules/oe-module-faxsms/library/rc_sms_notification.php
+++ b/interface/modules/custom_modules/oe-module-faxsms/library/rc_sms_notification.php
@@ -52,6 +52,7 @@
 $sessionAllowWrite = true;
 require_once(__DIR__ . "/../../../../globals.php");
 require_once("$srcdir/appointments.inc.php");
+require_once __DIR__ . "/../vendor/autoload.php";
 
 // Check for help argument
 if ($argc > 1 && (in_array('--help', $argv) || in_array('-h', $argv))) {
@@ -184,6 +185,7 @@
                             );
                             if (stripos($error, 'error') !== false) {
                                 $strMsg .= " | " . xlt("Error:") . "<strong> " . text($error) . "</strong> \n";
+                                error_log($strMsg); // text
                                 echo(nl2br($strMsg));
                                 continue;
                             } else {
diff --git a/interface/patient_file/history/encounters.php b/interface/patient_file/history/encounters.php
index 06d668821e2..a5c793f6dae 100644
--- a/interface/patient_file/history/encounters.php
+++ b/interface/patient_file/history/encounters.php
@@ -29,10 +29,14 @@
 use OpenEMR\Billing\BillingUtilities;
 use OpenEMR\Billing\InvoiceSummary;
 use OpenEMR\Common\Csrf\CsrfUtils;
+use OpenEMR\Common\Session\PatientSessionUtil;
 use OpenEMR\Core\Header;
 
 $is_group = ($attendant_type == 'gid') ? true : false;
 
+if (isset($_GET['pid']) && $_GET['pid'] != $_SESSION['pid']) {
+    PatientSessionUtil::setPid($_GET['pid']);
+}
 // "issue" parameter exists if we are being invoked by clicking an issue title
 // in the left_nav menu.  Currently that is just for athletic teams.  In this
 // case we only display encounters that are linked to the specified issue.