diff --git a/daemon/wiretap_utils.go b/daemon/wiretap_utils.go
index 467f942..6153b4f 100644
--- a/daemon/wiretap_utils.go
+++ b/daemon/wiretap_utils.go
@@ -80,7 +80,7 @@ func cloneRequest(request CloneRequest) *http.Request {
 
 	// if the auth value is set, we need to base64 encode it and add it to the header.
 	if request.Auth != "" {
-		encoded := base64.StdEncoding.EncodeToString([]byte(request.Auth))
+		encoded := base64.StdEncoding.EncodeToString([]byte(ReplaceWithVariables(request.Variables, request.Auth)))
 		// this will overwrite any existing auth header.
 		newReq.Header.Set("Authorization", fmt.Sprintf("Basic %s", encoded))
 	}
diff --git a/ui/src/components/transaction/transaction-item.ts b/ui/src/components/transaction/transaction-item.ts
index 3a0dce9..7604a9d 100644
--- a/ui/src/components/transaction/transaction-item.ts
+++ b/ui/src/components/transaction/transaction-item.ts
@@ -139,7 +139,10 @@ export class HttpTransactionItemComponent extends LitElement {
             reqTime = req.timestamp;
         }
 
-        const totalTime = respTime - reqTime;
+        let totalTime = respTime - reqTime;
+        if (totalTime < 0) {
+            totalTime = 0;
+        }
 
         return html`
             <div class="${tClass}" @click="${this.setActive}">
@@ -150,7 +153,9 @@ export class HttpTransactionItemComponent extends LitElement {
                 </header>
                 ${delay}
                 <div class="request-time">
-                    ${totalTime}ms <sl-icon name="arrow-left-right"></sl-icon>
+                    ${(totalTime > 10000) ? html`${(totalTime/1000).toFixed(1)}s` : 
+                            html`${totalTime>0 ? totalTime : null}${totalTime>0 ? 'ms' : null}`} 
+                    <sl-icon name="arrow-left-right"></sl-icon>
                 </div>
                 <div class="transaction-status">
                     ${this.hideControls? '' : chainLink}
diff --git a/ui/src/model/extract_status.ts b/ui/src/model/extract_status.ts
index 49ba273..0e88d70 100644
--- a/ui/src/model/extract_status.ts
+++ b/ui/src/model/extract_status.ts
@@ -1,15 +1,16 @@
 import {HttpResponse} from "@/model/http_transaction";
 
 export function ExtractStatusStyleFromCode(response: HttpResponse): string {
-    if (response.statusCode >= 200 && response.statusCode < 400) {
+    if (response?.statusCode >= 200 && response?.statusCode < 400) {
         return "http200"
     }
-    if (response.statusCode >= 400 && response.statusCode < 500) {
+    if (response?.statusCode >= 400 && response?.statusCode < 500) {
         return "http400"
     }
-    if (response.statusCode >= 500) {
+    if (response?.statusCode >= 500) {
         return "http500"
     }
+    return "pending"
 }
 
 export function ExtractHTTPCodeDefinition(response: HttpResponse): string {