Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -2347,30 +2347,32 @@
 	 (pktsdirs  (if pktsdirs-str
 			(string-split pktsdirs-str " ")
 			#f)))
     pktsdirs))
 
-(define (common:save-pkt pktalist-in mtconf use-lt)
-  (let* ((parent   (hash-table-ref/default *pkts-info* 'last-parent #f))
-	 (pktalist (if parent
-		       (cons `(parent . ,parent)
-			     pktalist-in)
-		       pktalist-in)))
-    (let-values (((uuid pkt)
-		  (alist->pkt pktalist common:pkts-spec)))
-      (hash-table-set! *pkts-info* 'last-parent uuid)
-      (let ((pktsdir (or (hash-table-ref/default *pkts-info* 'pkts-dir #f)
-			 (let* ((pktsdirs (common:get-pkts-dirs mtconf use-lt))
-			       (pktsdir   (car pktsdirs))) ;; assume it is there
-			   (hash-table-set! *pkts-info* 'pkts-dir pktsdir)
-			   pktsdir))))
-	(if (not (file-exists? pktsdir))
-	    (create-directory pktsdir #t))
-	(with-output-to-file
-	    (conc pktsdir "/" uuid ".pkt")
-	  (lambda ()
-	    (print pkt)))))))
+(define (common:save-pkt pktalist-in mtconf use-lt #!key (add-only #f)) ;; add-only saves the pkt only if there is a parent already
+  (if (or (not add-only)
+	  (hash-table-exists? *pkts-info* 'last-parent))
+      (let* ((parent   (hash-table-ref/default *pkts-info* 'last-parent #f))
+	     (pktalist (if parent
+			   (cons `(parent . ,parent)
+				 pktalist-in)
+			   pktalist-in)))
+	(let-values (((uuid pkt)
+		      (alist->pkt pktalist common:pkts-spec)))
+	  (hash-table-set! *pkts-info* 'last-parent uuid)
+	  (let ((pktsdir (or (hash-table-ref/default *pkts-info* 'pkts-dir #f)
+			     (let* ((pktsdirs (common:get-pkts-dirs mtconf use-lt))
+				    (pktsdir   (car pktsdirs))) ;; assume it is there
+			       (hash-table-set! *pkts-info* 'pkts-dir pktsdir)
+			       pktsdir))))
+	    (if (not (file-exists? pktsdir))
+		(create-directory pktsdir #t))
+	    (with-output-to-file
+		(conc pktsdir "/" uuid ".pkt")
+	      (lambda ()
+		(print pkt))))))))
 	
 (define (common:with-queue-db mtconf proc #!key (use-lt #f)(toppath-in #f))
   (let* ((pktsdirs (common:get-pkts-dirs mtconf use-lt))
 	 (pktsdir  (if pktsdirs (car pktsdirs) #f))
 	 (toppath  (or (configf:lookup mtconf "scratchdat" "toppath")

Index: configf.scm
==================================================================
--- configf.scm
+++ configf.scm
@@ -227,10 +227,14 @@
 ;;
 (define (read-config path ht allow-system #!key (environ-patt #f)            (curr-section #f)
 		     (sections #f)              (settings (make-hash-table)) (keep-filenames #f)
 		     (post-section-procs '())   (apply-wildcards #t))
   (debug:print 9 *default-log-port* "START: " path)
+  (if *configdat*
+      (common:save-pkt `((action . read-config)
+			 (f      . path))
+		       *configdat* #t add-only: #t))
   (if (and (not (port? path))
 	   (not (file-exists? path))) ;; for case where we are handed a port
       (begin 
 	(debug:print-info 1 *default-log-port* "read-config - file not found " path " current path: " (current-directory))
 	;; WARNING: This is a risky change but really, we should not return an empty hash table if no file read?

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -111,10 +111,11 @@
 	     (< (http-transport:server-dat-get-last-access (remote-conndat runremote)) expire-time)))
       (debug:print-info 0 *default-log-port* "Connection to " (remote-server-url runremote) " expired due to no accesses, forcing new connection.")
       (remote-conndat-set! runremote #f) ;; invalidate the connection, thus forcing a new connection.
       (mutex-unlock! *rmt-mutex*)
       (rmt:send-receive cmd rid params attemptnum: attemptnum))
+
      ;; on homehost and this is a read
      ((and (not (remote-force-server runremote))      ;; honor forced use of server
 	   (cdr (remote-hh-dat runremote))     ;; on homehost
            (member cmd api:read-only-queries)) ;; this is a read
       (mutex-unlock! *rmt-mutex*)